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/IEFSY2hpdmUpXG5cCi0gICAgIGluIGEgZGlyZWN0b3J5IG5hbWVkICJwbHVnaW5zIi5cblwKLSAgIC0gQSBGZWF0dXJlIGlzIGEgYnVuZGxlIG9mIG9uZSBvciBtb3JlIFBsdWctaW5zIGFuZC9vciBGcmFnbWVudHMgYW5kIGFzc29jaWF0ZWQgbWF0ZXJpYWwuXG5cCi0gICAgIEVhY2ggRmVhdHVyZSBtYXkgYmUgcGFja2FnZWQgYXMgYSBzdWItZGlyZWN0b3J5IGluIGEgZGlyZWN0b3J5IG5hbWVkICJmZWF0dXJlcyIuXG5cCi0gICAgIFdpdGhpbiBhIEZlYXR1cmUsIGZpbGVzIG5hbWVkICJmZWF0dXJlLnhtbCIgbWF5IGNvbnRhaW4gYSBsaXN0IG9mIHRoZSBuYW1lcyBhbmQgdmVyc2lvblxuXAotICAgICBudW1iZXJzIG9mIHRoZSBQbHVnLWlucyBhbmQvb3IgRnJhZ21lbnRzIGFzc29jaWF0ZWQgd2l0aCB0aGF0IEZlYXR1cmUuXG5cCi0gICAtIEZlYXR1cmVzIG1heSBhbHNvIGluY2x1ZGUgb3RoZXIgRmVhdHVyZXMgKCJJbmNsdWRlZCBGZWF0dXJlcyIpLiBXaXRoaW4gYSBGZWF0dXJlLCBmaWxlc1xuXAotICAgICBuYW1lZCAiZmVhdHVyZS54bWwiIG1heSBjb250YWluIGEgbGlzdCBvZiB0aGUgbmFtZXMgYW5kIHZlcnNpb24gbnVtYmVycyBvZiBJbmNsdWRlZCBGZWF0dXJlcy5cblwKLVxuXAotRmVhdHVyZXMgbWF5IGFsc28gaW5jbHVkZSBvdGhlciBGZWF0dXJlcyAoIkluY2x1ZGVkIEZlYXR1cmVzIikuIEZpbGVzIG5hbWVkXG5cCi0iZmVhdHVyZS54bWwiIG1heSBjb250YWluIGEgbGlzdCBvZiB0aGUgbmFtZXMgYW5kIHZlcnNpb24gbnVtYmVycyBvZlxuXAotSW5jbHVkZWQgRmVhdHVyZXMuXG5cCisgICAgICAgLSBDb250ZW50IG1heSBiZSBzdHJ1Y3R1cmVkIGFuZCBwYWNrYWdlZCBpbnRvIG1vZHVsZXMgdG8gZmFjaWxpdGF0ZSBkZWxpdmVyaW5nLFxuXAorICAgICAgICAgZXh0ZW5kaW5nLCBhbmQgdXBncmFkaW5nIHRoZSBDb250ZW50LiBUeXBpY2FsIG1vZHVsZXMgbWF5IGluY2x1ZGUgcGx1Zy1pbnMgKCJQbHVnLWlucyIpLFxuXAorICAgICAgICAgcGx1Zy1pbiBmcmFnbWVudHMgKCJGcmFnbWVudHMiKSwgYW5kIGZlYXR1cmVzICgiRmVhdHVyZXMiKS5cblwKKyAgICAgICAtIEVhY2ggUGx1Zy1pbiBvciBGcmFnbWVudCBtYXkgYmUgcGFja2FnZWQgYXMgYSBzdWItZGlyZWN0b3J5IG9yIEpBUiAoSmF2YShUTSkgQVJjaGl2ZSlcblwKKyAgICAgICAgIGluIGEgZGlyZWN0b3J5IG5hbWVkICJwbHVnaW5zIi5cblwKKyAgICAgICAtIEEgRmVhdHVyZSBpcyBhIGJ1bmRsZSBvZiBvbmUgb3IgbW9yZSBQbHVnLWlucyBhbmQvb3IgRnJhZ21lbnRzIGFuZCBhc3NvY2lhdGVkIG1hdGVyaWFsLlxuXAorICAgICAgICAgRWFjaCBGZWF0dXJlIG1heSBiZSBwYWNrYWdlZCBhcyBhIHN1Yi1kaXJlY3RvcnkgaW4gYSBkaXJlY3RvcnkgbmFtZWQgImZlYXR1cmVzIi5cblwKKyAgICAgICAgIFdpdGhpbiBhIEZlYXR1cmUsIGZpbGVzIG5hbWVkICJmZWF0dXJlLnhtbCIgbWF5IGNvbnRhaW4gYSBsaXN0IG9mIHRoZSBuYW1lcyBhbmQgdmVyc2lvblxuXAorICAgICAgICAgbnVtYmVycyBvZiB0aGUgUGx1Zy1pbnMgYW5kL29yIEZyYWdtZW50cyBhc3NvY2lhdGVkIHdpdGggdGhhdCBGZWF0dXJlLlxuXAorICAgICAgIC0gRmVhdHVyZXMgbWF5IGFsc28gaW5jbHVkZSBvdGhlciBGZWF0dXJlcyAoIkluY2x1ZGVkIEZlYXR1cmVzIikuIFdpdGhpbiBhIEZlYXR1cmUsIGZpbGVzXG5cCisgICAgICAgICBuYW1lZCAiZmVhdHVyZS54bWwiIG1heSBjb250YWluIGEgbGlzdCBvZiB0aGUgbmFtZXMgYW5kIHZlcnNpb24gbnVtYmVycyBvZiBJbmNsdWRlZCBGZWF0dXJlcy5cblwKIFxuXAogVGhlIHRlcm1zIGFuZCBjb25kaXRpb25zIGdvdmVybmluZyBQbHVnLWlucyBhbmQgRnJhZ21lbnRzIHNob3VsZCBiZVxuXAogY29udGFpbmVkIGluIGZpbGVzIG5hbWVkICJhYm91dC5odG1sIiAoIkFib3V0cyIpLiBUaGUgdGVybXMgYW5kXG5cCkBAIC05OCw0OCArOTIsNzcgQEAKIExpY2Vuc2VzIG1heSBiZSBsb2NhdGVkIGluIGFueSBkaXJlY3Rvcnkgb2YgYSBEb3dubG9hZCBvciBNb2R1bGVcblwKIGluY2x1ZGluZywgYnV0IG5vdCBsaW1pdGVkIHRvIHRoZSBmb2xsb3dpbmcgbG9jYXRpb25zOlxuXAogXG5cCi0gICAtIFRoZSB0b3AtbGV2ZWwgKHJvb3QpIGRpcmVjdG9yeVxuXAotICAgLSBQbHVnLWluIGFuZCBGcmFnbWVudCBkaXJlY3Rvcmllc1xuXAotICAgLSBJbnNpZGUgUGx1Zy1pbnMgYW5kIEZyYWdtZW50cyBwYWNrYWdlZCBhcyBKQVJzXG5cCi0gICAtIFN1Yi1kaXJlY3RvcmllcyBvZiB0aGUgZGlyZWN0b3J5IG5hbWVkICJzcmMiIG9mIGNlcnRhaW4gUGx1Zy1pbnNcblwKLSAgIC0gRmVhdHVyZSBkaXJlY3Rvcmllc1xuXAorICAgICAgIC0gVGhlIHRvcC1sZXZlbCAocm9vdCkgZGlyZWN0b3J5XG5cCisgICAgICAgLSBQbHVnLWluIGFuZCBGcmFnbWVudCBkaXJlY3Rvcmllc1xuXAorICAgICAgIC0gSW5zaWRlIFBsdWctaW5zIGFuZCBGcmFnbWVudHMgcGFja2FnZWQgYXMgSkFSc1xuXAorICAgICAgIC0gU3ViLWRpcmVjdG9yaWVzIG9mIHRoZSBkaXJlY3RvcnkgbmFtZWQgInNyYyIgb2YgY2VydGFpbiBQbHVnLWluc1xuXAorICAgICAgIC0gRmVhdHVyZSBkaXJlY3Rvcmllc1xuXAogXG5cCiBOb3RlOiBpZiBhIEZlYXR1cmUgbWFkZSBhdmFpbGFibGUgYnkgdGhlIEVjbGlwc2UgRm91bmRhdGlvbiBpcyBpbnN0YWxsZWQgdXNpbmcgdGhlXG5cCi1FY2xpcHNlIFVwZGF0ZSBNYW5hZ2VyLCB5b3UgbXVzdCBhZ3JlZSB0byBhIGxpY2Vuc2UgKCJGZWF0dXJlIFVwZGF0ZVxuXAotTGljZW5zZSIpIGR1cmluZyB0aGUgaW5zdGFsbGF0aW9uIHByb2Nlc3MuIElmIHRoZSBGZWF0dXJlIGNvbnRhaW5zXG5cCitQcm92aXNpb25pbmcgVGVjaG5vbG9neSAoYXMgZGVmaW5lZCBiZWxvdyksIHlvdSBtdXN0IGFncmVlIHRvIGEgbGljZW5zZSAoIkZlYXR1cmUgXG5cCitVcGRhdGUgTGljZW5zZSIpIGR1cmluZyB0aGUgaW5zdGFsbGF0aW9uIHByb2Nlc3MuIElmIHRoZSBGZWF0dXJlIGNvbnRhaW5zXG5cCiBJbmNsdWRlZCBGZWF0dXJlcywgdGhlIEZlYXR1cmUgVXBkYXRlIExpY2Vuc2Ugc2hvdWxkIGVpdGhlciBwcm92aWRlIHlvdVxuXAogd2l0aCB0aGUgdGVybXMgYW5kIGNvbmRpdGlvbnMgZ292ZXJuaW5nIHRoZSBJbmNsdWRlZCBGZWF0dXJlcyBvciBpbmZvcm1cblwKIHlvdSB3aGVyZSB5b3UgY2FuIGxvY2F0ZSB0aGVtLiBGZWF0dXJlIFVwZGF0ZSBMaWNlbnNlcyBtYXkgYmUgZm91bmQgaW5cblwKLXRoZSAibGljZW5zZSIgcHJvcGVydHkgb2YgZmlsZXMgbmFtZWQgImZlYXR1cmUucHJvcGVydGllcyIuIFN1Y2ggQWJvdXRzLFxuXAotRmVhdHVyZSBMaWNlbnNlcyBhbmQgRmVhdHVyZSBVcGRhdGUgTGljZW5zZXMgY29udGFpbiB0aGUgdGVybXMgYW5kXG5cCi1jb25kaXRpb25zIChvciByZWZlcmVuY2VzIHRvIHN1Y2ggdGVybXMgYW5kIGNvbmRpdGlvbnMpIHRoYXQgZ292ZXJuIHlvdXJcblwKLXVzZSBvZiB0aGUgYXNzb2NpYXRlZCBDb250ZW50IGluIHRoYXQgZGlyZWN0b3J5LlxuXAordGhlICJsaWNlbnNlIiBwcm9wZXJ0eSBvZiBmaWxlcyBuYW1lZCAiZmVhdHVyZS5wcm9wZXJ0aWVzIiBmb3VuZCB3aXRoaW4gYSBGZWF0dXJlLlxuXAorU3VjaCBBYm91dHMsIEZlYXR1cmUgTGljZW5zZXMsIGFuZCBGZWF0dXJlIFVwZGF0ZSBMaWNlbnNlcyBjb250YWluIHRoZVxuXAordGVybXMgYW5kIGNvbmRpdGlvbnMgKG9yIHJlZmVyZW5jZXMgdG8gc3VjaCB0ZXJtcyBhbmQgY29uZGl0aW9ucykgdGhhdFxuXAorZ292ZXJuIHlvdXIgdXNlIG9mIHRoZSBhc3NvY2lhdGVkIENvbnRlbnQgaW4gdGhhdCBkaXJlY3RvcnkuXG5cCiBcblwKLVRIRSBBQk9VVFMsIEZFQVRVUkUgTElDRU5TRVMgQU5EIEZFQVRVUkUgVVBEQVRFIExJQ0VOU0VTIE1BWSBSRUZFUlxuXAorVEhFIEFCT1VUUywgRkVBVFVSRSBMSUNFTlNFUywgQU5EIEZFQVRVUkUgVVBEQVRFIExJQ0VOU0VTIE1BWSBSRUZFUlxuXAogVE8gVEhFIEVQTCBPUiBPVEhFUiBMSUNFTlNFIEFHUkVFTUVOVFMsIE5PVElDRVMgT1IgVEVSTVMgQU5EIENPTkRJVElPTlMuXG5cCiBTT01FIE9GIFRIRVNFIE9USEVSIExJQ0VOU0UgQUdSRUVNRU5UUyBNQVkgSU5DTFVERSAoQlVUIEFSRSBOT1QgTElNSVRFRCBUTyk6XG5cCiBcblwKLSAgICAtIENvbW1vbiBQdWJsaWMgTGljZW5zZSBWZXJzaW9uIDEuMCAoYXZhaWxhYmxlIGF0IGh0dHA6Ly93d3cuZWNsaXBzZS5vcmcvbGVnYWwvY3BsLXYxMC5odG1sKVxuXAotICAgIC0gQXBhY2hlIFNvZnR3YXJlIExpY2Vuc2UgMS4xIChhdmFpbGFibGUgYXQgaHR0cDovL3d3dy5hcGFjaGUub3JnL2xpY2Vuc2VzL0xJQ0VOU0UpXG5cCi0gICAgLSBBcGFjaGUgU29mdHdhcmUgTGljZW5zZSAyLjAgKGF2YWlsYWJsZSBhdCBodHRwOi8vd3d3LmFwYWNoZS5vcmcvbGljZW5zZXMvTElDRU5TRS0yLjApXG5cCi0gICAgLSBJQk0gUHVibGljIExpY2Vuc2UgMS4wIChhdmFpbGFibGUgYXQgaHR0cDovL29zcy5zb2Z0d2FyZS5pYm0uY29tL2RldmVsb3BlcndvcmtzL29wZW5zb3VyY2UvbGljZW5zZTEwLmh0bWwpXG5cCi0gICAgLSBNZXRybyBMaW5rIFB1YmxpYyBMaWNlbnNlIDEuMDAgKGF2YWlsYWJsZSBhdCBodHRwOi8vd3d3Lm9wZW5ncm91cC5vcmcvb3Blbm1vdGlmL3N1cHBvcnRlcnMvbWV0cm9saW5rL2xpY2Vuc2UuaHRtbClcblwKLSAgICAtIE1vemlsbGEgUHVibGljIExpY2Vuc2UgVmVyc2lvbiAxLjEgKGF2YWlsYWJsZSBhdCBodHRwOi8vd3d3Lm1vemlsbGEub3JnL01QTC9NUEwtMS4xLmh0bWwpXG5cCi0gICAgLSBDb21tb24gRGV2ZWxvcG1lbnQgYW5kIERpc3RyaWJ1dGlvbiBMaWNlbnNlIChDRERMKSBWZXJzaW9uIDEuMCAoYXZhaWxhYmxlIGF0IGh0dHA6Ly93d3cuc3VuLmNvbS9jZGRsL2NkZGwuaHRtbClcblwKKyAgICAgICAtIENvbW1vbiBQdWJsaWMgTGljZW5zZSBWZXJzaW9uIDEuMCAoYXZhaWxhYmxlIGF0IGh0dHA6Ly93d3cuZWNsaXBzZS5vcmcvbGVnYWwvY3BsLXYxMC5odG1sKVxuXAorICAgICAgIC0gQXBhY2hlIFNvZnR3YXJlIExpY2Vuc2UgMS4xIChhdmFpbGFibGUgYXQgaHR0cDovL3d3dy5hcGFjaGUub3JnL2xpY2Vuc2VzL0xJQ0VOU0UpXG5cCisgICAgICAgLSBBcGFjaGUgU29mdHdhcmUgTGljZW5zZSAyLjAgKGF2YWlsYWJsZSBhdCBodHRwOi8vd3d3LmFwYWNoZS5vcmcvbGljZW5zZXMvTElDRU5TRS0yLjApXG5cCisgICAgICAgLSBNZXRybyBMaW5rIFB1YmxpYyBMaWNlbnNlIDEuMDAgKGF2YWlsYWJsZSBhdCBodHRwOi8vd3d3Lm9wZW5ncm91cC5vcmcvb3Blbm1vdGlmL3N1cHBvcnRlcnMvbWV0cm9saW5rL2xpY2Vuc2UuaHRtbClcblwKKyAgICAgICAtIE1vemlsbGEgUHVibGljIExpY2Vuc2UgVmVyc2lvbiAxLjEgKGF2YWlsYWJsZSBhdCBodHRwOi8vd3d3Lm1vemlsbGEub3JnL01QTC9NUEwtMS4xLmh0bWwpXG5cCiBcblwKIElUIElTIFlPVVIgT0JMSUdBVElPTiBUTyBSRUFEIEFORCBBQ0NFUFQgQUxMIFNVQ0ggVEVSTVMgQU5EIENPTkRJVElPTlMgUFJJT1JcblwKLVRPIFVTRSBPRiBUSEUgQ09OVEVOVC4gSWYgbm8gQWJvdXQsIEZlYXR1cmUgTGljZW5zZSBvciBGZWF0dXJlIFVwZGF0ZSBMaWNlbnNlXG5cCitUTyBVU0UgT0YgVEhFIENPTlRFTlQuIElmIG5vIEFib3V0LCBGZWF0dXJlIExpY2Vuc2UsIG9yIEZlYXR1cmUgVXBkYXRlIExpY2Vuc2VcblwKIGlzIHByb3ZpZGVkLCBwbGVhc2UgY29udGFjdCB0aGUgRWNsaXBzZSBGb3VuZGF0aW9uIHRvIGRldGVybWluZSB3aGF0IHRlcm1zIGFuZCBjb25kaXRpb25zXG5cCiBnb3Zlcm4gdGhhdCBwYXJ0aWN1bGFyIENvbnRlbnQuXG5cCiBcblwKK1xuXFVzZSBvZiBQcm92aXNpb25pbmcgVGVjaG5vbG9neVxuXAorXG5cCitUaGUgRWNsaXBzZSBGb3VuZGF0aW9uIG1ha2VzIGF2YWlsYWJsZSBwcm92aXNpb25pbmcgc29mdHdhcmUsIGV4YW1wbGVzIG9mIHdoaWNoIGluY2x1ZGUsXG5cCitidXQgYXJlIG5vdCBsaW1pdGVkIHRvLCBwMiBhbmQgdGhlIEVjbGlwc2UgVXBkYXRlIE1hbmFnZXIgKCJQcm92aXNpb25pbmcgVGVjaG5vbG9neSIpIGZvclxuXAordGhlIHB1cnBvc2Ugb2YgYWxsb3dpbmcgdXNlcnMgdG8gaW5zdGFsbCBzb2Z0d2FyZSwgZG9jdW1lbnRhdGlvbiwgaW5mb3JtYXRpb24gYW5kL29yXG5cCitvdGhlciBtYXRlcmlhbHMgKGNvbGxlY3RpdmVseSAiSW5zdGFsbGFibGUgU29mdHdhcmUiKS4gVGhpcyBjYXBhYmlsaXR5IGlzIHByb3ZpZGVkIHdpdGhcblwKK3RoZSBpbnRlbnQgb2YgYWxsb3dpbmcgc3VjaCB1c2VycyB0byBpbnN0YWxsLCBleHRlbmQgYW5kIHVwZGF0ZSBFY2xpcHNlLWJhc2VkIHByb2R1Y3RzLlxuXAorSW5mb3JtYXRpb24gYWJvdXQgcGFja2FnaW5nIEluc3RhbGxhYmxlIFNvZnR3YXJlIGlzIGF2YWlsYWJsZSBhdFxuXAoraHR0cDovL2VjbGlwc2Uub3JnL2VxdWlub3gvcDIvcmVwb3NpdG9yeV9wYWNrYWdpbmcuaHRtbCAoIlNwZWNpZmljYXRpb24iKS5cblwKK1xuXAorWW91IG1heSB1c2UgUHJvdmlzaW9uaW5nIFRlY2hub2xvZ3kgdG8gYWxsb3cgb3RoZXIgcGFydGllcyB0byBpbnN0YWxsIEluc3RhbGxhYmxlIFNvZnR3YXJlLlxuXAorWW91IHNoYWxsIGJlIHJlc3BvbnNpYmxlIGZvciBlbmFibGluZyB0aGUgYXBwbGljYWJsZSBsaWNlbnNlIGFncmVlbWVudHMgcmVsYXRpbmcgdG8gdGhlXG5cCitJbnN0YWxsYWJsZSBTb2Z0d2FyZSB0byBiZSBwcmVzZW50ZWQgdG8sIGFuZCBhY2NlcHRlZCBieSwgdGhlIHVzZXJzIG9mIHRoZSBQcm92aXNpb25pbmcgVGVjaG5vbG9neVxuXAoraW4gYWNjb3JkYW5jZSB3aXRoIHRoZSBTcGVjaWZpY2F0aW9uLiBCeSB1c2luZyBQcm92aXNpb25pbmcgVGVjaG5vbG9neSBpbiBzdWNoIGEgbWFubmVyIGFuZFxuXAorbWFraW5nIGl0IGF2YWlsYWJsZSBpbiBhY2NvcmRhbmNlIHdpdGggdGhlIFNwZWNpZmljYXRpb24sIHlvdSBmdXJ0aGVyIGFja25vd2xlZGdlIHlvdXJcblwKK2FncmVlbWVudCB0bywgYW5kIHRoZSBhY3F1aXNpdGlvbiBvZiBhbGwgbmVjZXNzYXJ5IHJpZ2h0cyB0byBwZXJtaXQgdGhlIGZvbGxvd2luZzpcblwKK1xuXAorICAgICAgIDEuIEEgc2VyaWVzIG9mIGFjdGlvbnMgbWF5IG9jY3VyICgiUHJvdmlzaW9uaW5nIFByb2Nlc3MiKSBpbiB3aGljaCBhIHVzZXIgbWF5IGV4ZWN1dGVcblwKKyAgICAgICAgICB0aGUgUHJvdmlzaW9uaW5nIFRlY2hub2xvZ3kgb24gYSBtYWNoaW5lICgiVGFyZ2V0IE1hY2hpbmUiKSB3aXRoIHRoZSBpbnRlbnQgb2YgaW5zdGFsbGluZyxcblwKKyAgICAgICAgICBleHRlbmRpbmcgb3IgdXBkYXRpbmcgdGhlIGZ1bmN0aW9uYWxpdHkgb2YgYW4gRWNsaXBzZS1iYXNlZCBwcm9kdWN0LlxuXAorICAgICAgIDIuIER1cmluZyB0aGUgUHJvdmlzaW9uaW5nIFByb2Nlc3MsIHRoZSBQcm92aXNpb25pbmcgVGVjaG5vbG9neSBtYXkgY2F1c2UgdGhpcmQgcGFydHlcblwKKyAgICAgICAgICBJbnN0YWxsYWJsZSBTb2Z0d2FyZSBvciBhIHBvcnRpb24gdGhlcmVvZiB0byBiZSBhY2Nlc3NlZCBhbmQgY29waWVkIHRvIHRoZSBUYXJnZXQgTWFjaGluZS5cblwKKyAgICAgICAzLiBQdXJzdWFudCB0byB0aGUgU3BlY2lmaWNhdGlvbiwgeW91IHdpbGwgcHJvdmlkZSB0byB0aGUgdXNlciB0aGUgdGVybXMgYW5kIGNvbmRpdGlvbnMgdGhhdFxuXAorICAgICAgICAgIGdvdmVybiB0aGUgdXNlIG9mIHRoZSBJbnN0YWxsYWJsZSBTb2Z0d2FyZSAoIkluc3RhbGxhYmxlIFNvZnR3YXJlIEFncmVlbWVudCIpIGFuZCBzdWNoXG5cCisgICAgICAgICAgSW5zdGFsbGFibGUgU29mdHdhcmUgQWdyZWVtZW50IHNoYWxsIGJlIGFjY2Vzc2VkIGZyb20gdGhlIFRhcmdldCBNYWNoaW5lIGluIGFjY29yZGFuY2VcblwKKyAgICAgICAgICB3aXRoIHRoZSBTcGVjaWZpY2F0aW9uLiBTdWNoIEluc3RhbGxhYmxlIFNvZnR3YXJlIEFncmVlbWVudCBtdXN0IGluZm9ybSB0aGUgdXNlciBvZiB0aGVcblwKKyAgICAgICAgICB0ZXJtcyBhbmQgY29uZGl0aW9ucyB0aGF0IGdvdmVybiB0aGUgSW5zdGFsbGFibGUgU29mdHdhcmUgYW5kIG11c3Qgc29saWNpdCBhY2NlcHRhbmNlIGJ5XG5cCisgICAgICAgICAgdGhlIGVuZCB1c2VyIGluIHRoZSBtYW5uZXIgcHJlc2NyaWJlZCBpbiBzdWNoIEluc3RhbGxhYmxlIFNvZnR3YXJlIEFncmVlbWVudC4gVXBvbiBzdWNoXG5cCisgICAgICAgICAgaW5kaWNhdGlvbiBvZiBhZ3JlZW1lbnQgYnkgdGhlIHVzZXIsIHRoZSBwcm92aXNpb25pbmcgVGVjaG5vbG9neSB3aWxsIGNvbXBsZXRlIGluc3RhbGxhdGlvblxuXAorICAgICAgICAgIG9mIHRoZSBJbnN0YWxsYWJsZSBTb2Z0d2FyZS5cblwKK1xuXAogQ3J5cHRvZ3JhcGh5XG5cCiBcblwKIENvbnRlbnQgbWF5IGNvbnRhaW4gZW5jcnlwdGlvbiBzb2Z0d2FyZS4gVGhlIGNvdW50cnkgaW4gd2hpY2ggeW91IGFyZVxuXAogY3VycmVudGx5IG1heSBoYXZlIHJlc3RyaWN0aW9ucyBvbiB0aGUgaW1wb3J0LCBwb3NzZXNzaW9uLCBhbmQgdXNlLFxuXAogYW5kL29yIHJlLWV4cG9ydCB0byBhbm90aGVyIGNvdW50cnksIG9mIGVuY3J5cHRpb24gc29mdHdhcmUuIEJFRk9SRVxuXAogdXNpbmcgYW55IGVuY3J5cHRpb24gc29mdHdhcmUsIHBsZWFzZSBjaGVjayB0aGUgY291bnRyeSdzIGxhd3MsXG5cCi1yZWd1bGF0aW9ucyBhbmQgcG9saWNpZXMgY29uY2VybmluZyB0aGUgaW1wb3J0LCBwb3NzZXNzaW9uLCBvciB1c2UsXG5cCi1hbmQgcmUtZXhwb3J0IG9mIGVuY3J5cHRpb24gc29mdHdhcmUsIHRvIHNlZSBpZiB0aGlzIGlzIHBlcm1pdHRlZC5cblwKK3JlZ3VsYXRpb25zIGFuZCBwb2xpY2llcyBjb25jZXJuaW5nIHRoZSBpbXBvcnQsIHBvc3Nlc3Npb24sIG9yIHVzZSwgYW5kXG5cCityZS1leHBvcnQgb2YgZW5jcnlwdGlvbiBzb2Z0d2FyZSwgdG8gc2VlIGlmIHRoaXMgaXMgcGVybWl0dGVkLlxuXAogXG5cCi1KYXZhIGFuZCBhbGwgSmF2YS1iYXNlZCB0cmFkZW1hcmtzIGFyZSB0cmFkZW1hcmtzIG9mIFN1biBNaWNyb3N5c3RlbXMsIEluYy4gaW4gdGhlIFVuaXRlZCBTdGF0ZXMsIG90aGVyIGNvdW50cmllcywgb3IgYm90aC5cbgorSmF2YSBhbmQgYWxsIEphdmEtYmFzZWQgdHJhZGVtYXJrcyBhcmUgdHJhZGVtYXJrcyBvZiBPcmFjbGUgQ29ycG9yYXRpb24gaW4gdGhlIFVuaXRlZCBTdGF0ZXMsIG90aGVyIGNvdW50cmllcywgb3IgYm90aC5cbgogIyMjIyMjIyMjIyMgZW5kIG9mIGxpY2Vuc2UgcHJvcGVydHkgIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjCmRpZmYgLS1naXQgYS9mZWF0dXJlcy9vcmcuZWNsaXBzZS53c3QuY29tbW9uX2NvcmUuZmVhdHVyZS9mZWF0dXJlLnhtbCBiL2ZlYXR1cmVzL29yZy5lY2xpcHNlLndzdC5jb21tb25fY29yZS5mZWF0dXJlL2ZlYXR1cmUueG1sCmluZGV4IGY4MmFkNTQuLjMzMGRhMjYgMTAwNjQ0Ci0tLSBhL2ZlYXR1cmVzL29yZy5lY2xpcHNlLndzdC5jb21tb25fY29yZS5mZWF0dXJlL2ZlYXR1cmUueG1sCisrKyBiL2ZlYXR1cmVzL29yZy5lY2xpcHNlLndzdC5jb21tb25fY29yZS5mZWF0dXJlL2ZlYXR1cmUueG1sCkBAIC0yLDcgKzIsNyBAQAogPGZlYXR1cmUKICAgICAgIGlkPSJvcmcuZWNsaXBzZS53c3QuY29tbW9uX2NvcmUuZmVhdHVyZSIKICAgICAgIGxhYmVsPSIlZmVhdHVyZU5hbWUiCi0gICAgICB2ZXJzaW9uPSIzLjAuMC5xdWFsaWZpZXIiCisgICAgICB2ZXJzaW9uPSIzLjIuMS5xdWFsaWZpZXIiCiAgICAgICBwcm92aWRlci1uYW1lPSIlcHJvdmlkZXJOYW1lIj4KIAogICAgPGRlc2NyaXB0aW9uPgpAQCAtMTcsMTYgKzE3LDYgQEAKICAgICAgICVsaWNlbnNlCiAgICA8L2xpY2Vuc2U+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+PC9wPgogPC9ib2R5PgogPC9odG1sPgpkaWZmIC0tZ2l0IGEvZmVhdHVyZXMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbl9zZGsuZmVhdHVyZS9mZWF0dXJlLnByb3BlcnRpZXMgYi9mZWF0dXJlcy9vcmcuZWNsaXBzZS53c3QuY29tbW9uX3Nkay5mZWF0dXJlL2ZlYXR1cmUucHJvcGVydGllcwppbmRleCA0NDZlMDBlLi40ODM2YWY0IDEwMDY0NAotLS0gYS9mZWF0dXJlcy9vcmcuZWNsaXBzZS53c3QuY29tbW9uX3Nkay5mZWF0dXJlL2ZlYXR1cmUucHJvcGVydGllcworKysgYi9mZWF0dXJlcy9vcmcuZWNsaXBzZS53c3QuY29tbW9uX3Nkay5mZWF0dXJlL2ZlYXR1cmUucHJvcGVydGllcwpAQCAtMTgsMTAgKzE4LDggQEAKIGZlYXR1cmVOYW1lPVdTVCBDb21tb24gUGx1Zy1pbiBEZXZlbG9wZXIgUmVzb3VyY2VzCiAKICMgInByb3ZpZGVyTmFtZSIgcHJvcGVydHkgLSBuYW1lIG9mIHRoZSBjb21wYW55IHRoYXQgcHJvdmlkZXMgdGhlIGZlYXR1cmUKLXByb3ZpZGVyTmFtZT1FY2xpcHNlLm9yZworcHJvdmlkZXJOYW1lPUVjbGlwc2UgV2ViIFRvb2xzIFBsYXRmb3JtCiAKLSMgInVwZGF0ZVNpdGVOYW1lIiBwcm9wZXJ0eSAtIGxhYmVsIGZvciB0aGUgdXBkYXRlIHNpdGUKLXVwZGF0ZVNpdGVOYW1lPVRoZSBFY2xpcHNlIFdlYiBUb29scyBQbGF0Zm9ybSAoV1RQKSBQcm9qZWN0IHVwZGF0ZSBzaXRlCiAKICMgImRlc2NyaXB0aW9uIiBwcm9wZXJ0eSAtIGRlc2NyaXB0aW9uIG9mIHRoZSBmZWF0dXJlCiBkZXNjcmlwdGlvbj1Tb3VyY2UgY29kZSB6aXBzIGZvciBXU1QgY29tbW9uIHRvb2xzCkBAIC00NSw4ICs0Myw4IEBACiAjICJsaWNlbnNlIiBwcm9wZXJ0eSAtIHRleHQgb2YgdGhlICJGZWF0dXJlIFVwZGF0ZSBMaWNlbnNlIgogIyBzaG91bGQgYmUgcGxhaW4gdGV4dCB2ZXJzaW9uIG9mIGxpY2Vuc2UgYWdyZWVtZW50IHBvaW50ZWQgdG8gYmUgImxpY2Vuc2VVUkwiCiBsaWNlbnNlPVwKLUVDTElQU0UgRk9VTkRBVElPTiBTT0ZUV0FSRSBVU0VSIEFHUkVFTUVOVFxuXAotSnVuZSAwNiwgMjAwN1xuXAorRWNsaXBzZSBGb3VuZGF0aW9uIFNvZnR3YXJlIFVzZXIgQWdyZWVtZW50XG5cCitBcHJpbCAxNCwgMjAxMFxuXAogXG5cCiBVc2FnZSBPZiBDb250ZW50XG5cCiBcblwKQEAgLTU0LDQyICs1MiwzOCBAQAogT1RIRVIgTUFURVJJQUxTIEZPUiBPUEVOIFNPVVJDRSBQUk9KRUNUUyAoQ09MTEVDVElWRUxZICJDT05URU5UIikuXG5cCiBVU0UgT0YgVEhFIENPTlRFTlQgSVMgR09WRVJORUQgQlkgVEhFIFRFUk1TIEFORCBDT05ESVRJT05TIE9GIFRISVNcblwKIEFHUkVFTUVOVCBBTkQvT1IgVEhFIFRFUk1TIEFORCBDT05ESVRJT05TIE9GIExJQ0VOU0UgQUdSRUVNRU5UUyBPUlxuXAotTk9USUNFUyBJTkRJQ0FURUQgT1IgUkVGRVJFTkNFRCBCRUxPVy4gQlkgVVNJTkcgVEhFIENPTlRFTlQsIFlPVVxuXAorTk9USUNFUyBJTkRJQ0FURUQgT1IgUkVGRVJFTkNFRCBCRUxPVy4gIEJZIFVTSU5HIFRIRSBDT05URU5ULCBZT1VcblwKIEFHUkVFIFRIQVQgWU9VUiBVU0UgT0YgVEhFIENPTlRFTlQgSVMgR09WRVJORUQgQlkgVEhJUyBBR1JFRU1FTlRcblwKIEFORC9PUiBUSEUgVEVSTVMgQU5EIENPTkRJVElPTlMgT0YgQU5ZIEFQUExJQ0FCTEUgTElDRU5TRSBBR1JFRU1FTlRTXG5cCi1PUiBOT1RJQ0VTIElORElDQVRFRCBPUiBSRUZFUkVOQ0VEIEJFTE9XLiBJRiBZT1UgRE8gTk9UIEFHUkVFIFRPIFRIRVxuXAorT1IgTk9USUNFUyBJTkRJQ0FURUQgT1IgUkVGRVJFTkNFRCBCRUxPVy4gIElGIFlPVSBETyBOT1QgQUdSRUUgVE8gVEhFXG5cCiBURVJNUyBBTkQgQ09ORElUSU9OUyBPRiBUSElTIEFHUkVFTUVOVCBBTkQgVEhFIFRFUk1TIEFORCBDT05ESVRJT05TXG5cCiBPRiBBTlkgQVBQTElDQUJMRSBMSUNFTlNFIEFHUkVFTUVOVFMgT1IgTk9USUNFUyBJTkRJQ0FURUQgT1IgUkVGRVJFTkNFRFxuXAogQkVMT1csIFRIRU4gWU9VIE1BWSBOT1QgVVNFIFRIRSBDT05URU5ULlxuXAogXG5cCiBBcHBsaWNhYmxlIExpY2Vuc2VzXG5cCiBcblwKLVVubGVzcyBvdGhlcndpc2UgaW5kaWNhdGVkLCBhbGwgQ29udGVudCBtYWRlIGF2YWlsYWJsZSBieSB0aGUgRWNsaXBzZSBGb3VuZGF0aW9uXG5cCi1pcyBwcm92aWRlZCB0byB5b3UgdW5kZXIgdGhlIHRlcm1zIGFuZCBjb25kaXRpb25zIG9mIHRoZSBFY2xpcHNlIFB1YmxpY1xuXAotTGljZW5zZSBWZXJzaW9uIDEuMCAoIkVQTCIpLiBBIGNvcHkgb2YgdGhlIEVQTCBpcyBwcm92aWRlZCB3aXRoIHRoaXNcblwKLUNvbnRlbnQgYW5kIGlzIGFsc28gYXZhaWxhYmxlIGF0IGh0dHA6Ly93d3cuZWNsaXBzZS5vcmcvbGVnYWwvZXBsLXYxMC5odG1sLlxuXAorVW5sZXNzIG90aGVyd2lzZSBpbmRpY2F0ZWQsIGFsbCBDb250ZW50IG1hZGUgYXZhaWxhYmxlIGJ5IHRoZVxuXAorRWNsaXBzZSBGb3VuZGF0aW9uIGlzIHByb3ZpZGVkIHRvIHlvdSB1bmRlciB0aGUgdGVybXMgYW5kIGNvbmRpdGlvbnMgb2ZcblwKK3RoZSBFY2xpcHNlIFB1YmxpYyBMaWNlbnNlIFZlcnNpb24gMS4wICgiRVBMIikuIEEgY29weSBvZiB0aGUgRVBMIGlzXG5cCitwcm92aWRlZCB3aXRoIHRoaXMgQ29udGVudCBhbmQgaXMgYWxzbyBhdmFpbGFibGUgYXQgaHR0cDovL3d3dy5lY2xpcHNlLm9yZy9sZWdhbC9lcGwtdjEwLmh0bWwuXG5cCiBGb3IgcHVycG9zZXMgb2YgdGhlIEVQTCwgIlByb2dyYW0iIHdpbGwgbWVhbiB0aGUgQ29udGVudC5cblwKIFxuXAogQ29udGVudCBpbmNsdWRlcywgYnV0IGlzIG5vdCBsaW1pdGVkIHRvLCBzb3VyY2UgY29kZSwgb2JqZWN0IGNvZGUsXG5cCi1kb2N1bWVudGF0aW9uIGFuZCBvdGhlciBmaWxlcyBtYWludGFpbmVkIGluIHRoZSBFY2xpcHNlLm9yZyBDVlNcblwKLXJlcG9zaXRvcnkgKCJSZXBvc2l0b3J5IikgaW4gQ1ZTIG1vZHVsZXMgKCJNb2R1bGVzIikgYW5kIG1hZGUgYXZhaWxhYmxlXG5cCitkb2N1bWVudGF0aW9uIGFuZCBvdGhlciBmaWxlcyBtYWludGFpbmVkIGluIHRoZSBFY2xpcHNlIEZvdW5kYXRpb24gc291cmNlIGNvZGVcblwKK3JlcG9zaXRvcnkgKCJSZXBvc2l0b3J5IikgaW4gc29mdHdhcmUgbW9kdWxlcyAoIk1vZHVsZXMiKSBhbmQgbWFkZSBhdmFpbGFibGVcblwKIGFzIGRvd25sb2FkYWJsZSBhcmNoaXZlcyAoIkRvd25sb2FkcyIpLlxuXAogXG5cCi0gICAtIENvbnRlbnQgbWF5IGJlIHN0cnVjdHVyZWQgYW5kIHBhY2thZ2VkIGludG8gbW9kdWxlcyB0byBmYWNpbGl0YXRlIGRlbGl2ZXJpbmcsXG5cCi0gICAgIGV4dGVuZGluZywgYW5kIHVwZ3JhZGluZyB0aGUgQ29udGVudC4gVHlwaWNhbCBtb2R1bGVzIG1heSBpbmNsdWRlIHBsdWctaW5zICgiUGx1Zy1pbnMiKSxcblwKLSAgICAgcGx1Zy1pbiBmcmFnbWVudHMgKCJGcmFnbWVudHMiKSwgYW5kIGZlYXR1cmVzICgiRmVhdHVyZXMiKS5cblwKLSAgIC0gRWFjaCBQbHVnLWluIG9yIEZyYWdtZW50IG1heSBiZSBwYWNrYWdlZCBhcyBhIHN1Yi1kaXJlY3Rvcnkgb3IgSkFSIChKYXZhPyBBUmNoaXZlKVxuXAotICAgICBpbiBhIGRpcmVjdG9yeSBuYW1lZCAicGx1Z2lucyIuXG5cCi0gICAtIEEgRmVhdHVyZSBpcyBhIGJ1bmRsZSBvZiBvbmUgb3IgbW9yZSBQbHVnLWlucyBhbmQvb3IgRnJhZ21lbnRzIGFuZCBhc3NvY2lhdGVkIG1hdGVyaWFsLlxuXAotICAgICBFYWNoIEZlYXR1cmUgbWF5IGJlIHBhY2thZ2VkIGFzIGEgc3ViLWRpcmVjdG9yeSBpbiBhIGRpcmVjdG9yeSBuYW1lZCAiZmVhdHVyZXMiLlxuXAotICAgICBXaXRoaW4gYSBGZWF0dXJlLCBmaWxlcyBuYW1lZCAiZmVhdHVyZS54bWwiIG1heSBjb250YWluIGEgbGlzdCBvZiB0aGUgbmFtZXMgYW5kIHZlcnNpb25cblwKLSAgICAgbnVtYmVycyBvZiB0aGUgUGx1Zy1pbnMgYW5kL29yIEZyYWdtZW50cyBhc3NvY2lhdGVkIHdpdGggdGhhdCBGZWF0dXJlLlxuXAotICAgLSBGZWF0dXJlcyBtYXkgYWxzbyBpbmNsdWRlIG90aGVyIEZlYXR1cmVzICgiSW5jbHVkZWQgRmVhdHVyZXMiKS4gV2l0aGluIGEgRmVhdHVyZSwgZmlsZXNcblwKLSAgICAgbmFtZWQgImZlYXR1cmUueG1sIiBtYXkgY29udGFpbiBhIGxpc3Qgb2YgdGhlIG5hbWVzIGFuZCB2ZXJzaW9uIG51bWJlcnMgb2YgSW5jbHVkZWQgRmVhdHVyZXMuXG5cCi1cblwKLUZlYXR1cmVzIG1heSBhbHNvIGluY2x1ZGUgb3RoZXIgRmVhdHVyZXMgKCJJbmNsdWRlZCBGZWF0dXJlcyIpLiBGaWxlcyBuYW1lZFxuXAotImZlYXR1cmUueG1sIiBtYXkgY29udGFpbiBhIGxpc3Qgb2YgdGhlIG5hbWVzIGFuZCB2ZXJzaW9uIG51bWJlcnMgb2ZcblwKLUluY2x1ZGVkIEZlYXR1cmVzLlxuXAorICAgICAgIC0gQ29udGVudCBtYXkgYmUgc3RydWN0dXJlZCBhbmQgcGFja2FnZWQgaW50byBtb2R1bGVzIHRvIGZhY2lsaXRhdGUgZGVsaXZlcmluZyxcblwKKyAgICAgICAgIGV4dGVuZGluZywgYW5kIHVwZ3JhZGluZyB0aGUgQ29udGVudC4gVHlwaWNhbCBtb2R1bGVzIG1heSBpbmNsdWRlIHBsdWctaW5zICgiUGx1Zy1pbnMiKSxcblwKKyAgICAgICAgIHBsdWctaW4gZnJhZ21lbnRzICgiRnJhZ21lbnRzIiksIGFuZCBmZWF0dXJlcyAoIkZlYXR1cmVzIikuXG5cCisgICAgICAgLSBFYWNoIFBsdWctaW4gb3IgRnJhZ21lbnQgbWF5IGJlIHBhY2thZ2VkIGFzIGEgc3ViLWRpcmVjdG9yeSBvciBKQVIgKEphdmEoVE0pIEFSY2hpdmUpXG5cCisgICAgICAgICBpbiBhIGRpcmVjdG9yeSBuYW1lZCAicGx1Z2lucyIuXG5cCisgICAgICAgLSBBIEZlYXR1cmUgaXMgYSBidW5kbGUgb2Ygb25lIG9yIG1vcmUgUGx1Zy1pbnMgYW5kL29yIEZyYWdtZW50cyBhbmQgYXNzb2NpYXRlZCBtYXRlcmlhbC5cblwKKyAgICAgICAgIEVhY2ggRmVhdHVyZSBtYXkgYmUgcGFja2FnZWQgYXMgYSBzdWItZGlyZWN0b3J5IGluIGEgZGlyZWN0b3J5IG5hbWVkICJmZWF0dXJlcyIuXG5cCisgICAgICAgICBXaXRoaW4gYSBGZWF0dXJlLCBmaWxlcyBuYW1lZCAiZmVhdHVyZS54bWwiIG1heSBjb250YWluIGEgbGlzdCBvZiB0aGUgbmFtZXMgYW5kIHZlcnNpb25cblwKKyAgICAgICAgIG51bWJlcnMgb2YgdGhlIFBsdWctaW5zIGFuZC9vciBGcmFnbWVudHMgYXNzb2NpYXRlZCB3aXRoIHRoYXQgRmVhdHVyZS5cblwKKyAgICAgICAtIEZlYXR1cmVzIG1heSBhbHNvIGluY2x1ZGUgb3RoZXIgRmVhdHVyZXMgKCJJbmNsdWRlZCBGZWF0dXJlcyIpLiBXaXRoaW4gYSBGZWF0dXJlLCBmaWxlc1xuXAorICAgICAgICAgbmFtZWQgImZlYXR1cmUueG1sIiBtYXkgY29udGFpbiBhIGxpc3Qgb2YgdGhlIG5hbWVzIGFuZCB2ZXJzaW9uIG51bWJlcnMgb2YgSW5jbHVkZWQgRmVhdHVyZXMuXG5cCiBcblwKIFRoZSB0ZXJtcyBhbmQgY29uZGl0aW9ucyBnb3Zlcm5pbmcgUGx1Zy1pbnMgYW5kIEZyYWdtZW50cyBzaG91bGQgYmVcblwKIGNvbnRhaW5lZCBpbiBmaWxlcyBuYW1lZCAiYWJvdXQuaHRtbCIgKCJBYm91dHMiKS4gVGhlIHRlcm1zIGFuZFxuXApAQCAtOTgsNDggKzkyLDc3IEBACiBMaWNlbnNlcyBtYXkgYmUgbG9jYXRlZCBpbiBhbnkgZGlyZWN0b3J5IG9mIGEgRG93bmxvYWQgb3IgTW9kdWxlXG5cCiBpbmNsdWRpbmcsIGJ1dCBub3QgbGltaXRlZCB0byB0aGUgZm9sbG93aW5nIGxvY2F0aW9uczpcblwKIFxuXAotICAgLSBUaGUgdG9wLWxldmVsIChyb290KSBkaXJlY3RvcnlcblwKLSAgIC0gUGx1Zy1pbiBhbmQgRnJhZ21lbnQgZGlyZWN0b3JpZXNcblwKLSAgIC0gSW5zaWRlIFBsdWctaW5zIGFuZCBGcmFnbWVudHMgcGFja2FnZWQgYXMgSkFSc1xuXAotICAgLSBTdWItZGlyZWN0b3JpZXMgb2YgdGhlIGRpcmVjdG9yeSBuYW1lZCAic3JjIiBvZiBjZXJ0YWluIFBsdWctaW5zXG5cCi0gICAtIEZlYXR1cmUgZGlyZWN0b3JpZXNcblwKKyAgICAgICAtIFRoZSB0b3AtbGV2ZWwgKHJvb3QpIGRpcmVjdG9yeVxuXAorICAgICAgIC0gUGx1Zy1pbiBhbmQgRnJhZ21lbnQgZGlyZWN0b3JpZXNcblwKKyAgICAgICAtIEluc2lkZSBQbHVnLWlucyBhbmQgRnJhZ21lbnRzIHBhY2thZ2VkIGFzIEpBUnNcblwKKyAgICAgICAtIFN1Yi1kaXJlY3RvcmllcyBvZiB0aGUgZGlyZWN0b3J5IG5hbWVkICJzcmMiIG9mIGNlcnRhaW4gUGx1Zy1pbnNcblwKKyAgICAgICAtIEZlYXR1cmUgZGlyZWN0b3JpZXNcblwKIFxuXAogTm90ZTogaWYgYSBGZWF0dXJlIG1hZGUgYXZhaWxhYmxlIGJ5IHRoZSBFY2xpcHNlIEZvdW5kYXRpb24gaXMgaW5zdGFsbGVkIHVzaW5nIHRoZVxuXAotRWNsaXBzZSBVcGRhdGUgTWFuYWdlciwgeW91IG11c3QgYWdyZWUgdG8gYSBsaWNlbnNlICgiRmVhdHVyZSBVcGRhdGVcblwKLUxpY2Vuc2UiKSBkdXJpbmcgdGhlIGluc3RhbGxhdGlvbiBwcm9jZXNzLiBJZiB0aGUgRmVhdHVyZSBjb250YWluc1xuXAorUHJvdmlzaW9uaW5nIFRlY2hub2xvZ3kgKGFzIGRlZmluZWQgYmVsb3cpLCB5b3UgbXVzdCBhZ3JlZSB0byBhIGxpY2Vuc2UgKCJGZWF0dXJlIFxuXAorVXBkYXRlIExpY2Vuc2UiKSBkdXJpbmcgdGhlIGluc3RhbGxhdGlvbiBwcm9jZXNzLiBJZiB0aGUgRmVhdHVyZSBjb250YWluc1xuXAogSW5jbHVkZWQgRmVhdHVyZXMsIHRoZSBGZWF0dXJlIFVwZGF0ZSBMaWNlbnNlIHNob3VsZCBlaXRoZXIgcHJvdmlkZSB5b3VcblwKIHdpdGggdGhlIHRlcm1zIGFuZCBjb25kaXRpb25zIGdvdmVybmluZyB0aGUgSW5jbHVkZWQgRmVhdHVyZXMgb3IgaW5mb3JtXG5cCiB5b3Ugd2hlcmUgeW91IGNhbiBsb2NhdGUgdGhlbS4gRmVhdHVyZSBVcGRhdGUgTGljZW5zZXMgbWF5IGJlIGZvdW5kIGluXG5cCi10aGUgImxpY2Vuc2UiIHByb3BlcnR5IG9mIGZpbGVzIG5hbWVkICJmZWF0dXJlLnByb3BlcnRpZXMiLiBTdWNoIEFib3V0cyxcblwKLUZlYXR1cmUgTGljZW5zZXMgYW5kIEZlYXR1cmUgVXBkYXRlIExpY2Vuc2VzIGNvbnRhaW4gdGhlIHRlcm1zIGFuZFxuXAotY29uZGl0aW9ucyAob3IgcmVmZXJlbmNlcyB0byBzdWNoIHRlcm1zIGFuZCBjb25kaXRpb25zKSB0aGF0IGdvdmVybiB5b3VyXG5cCi11c2Ugb2YgdGhlIGFzc29jaWF0ZWQgQ29udGVudCBpbiB0aGF0IGRpcmVjdG9yeS5cblwKK3RoZSAibGljZW5zZSIgcHJvcGVydHkgb2YgZmlsZXMgbmFtZWQgImZlYXR1cmUucHJvcGVydGllcyIgZm91bmQgd2l0aGluIGEgRmVhdHVyZS5cblwKK1N1Y2ggQWJvdXRzLCBGZWF0dXJlIExpY2Vuc2VzLCBhbmQgRmVhdHVyZSBVcGRhdGUgTGljZW5zZXMgY29udGFpbiB0aGVcblwKK3Rlcm1zIGFuZCBjb25kaXRpb25zIChvciByZWZlcmVuY2VzIHRvIHN1Y2ggdGVybXMgYW5kIGNvbmRpdGlvbnMpIHRoYXRcblwKK2dvdmVybiB5b3VyIHVzZSBvZiB0aGUgYXNzb2NpYXRlZCBDb250ZW50IGluIHRoYXQgZGlyZWN0b3J5LlxuXAogXG5cCi1USEUgQUJPVVRTLCBGRUFUVVJFIExJQ0VOU0VTIEFORCBGRUFUVVJFIFVQREFURSBMSUNFTlNFUyBNQVkgUkVGRVJcblwKK1RIRSBBQk9VVFMsIEZFQVRVUkUgTElDRU5TRVMsIEFORCBGRUFUVVJFIFVQREFURSBMSUNFTlNFUyBNQVkgUkVGRVJcblwKIFRPIFRIRSBFUEwgT1IgT1RIRVIgTElDRU5TRSBBR1JFRU1FTlRTLCBOT1RJQ0VTIE9SIFRFUk1TIEFORCBDT05ESVRJT05TLlxuXAogU09NRSBPRiBUSEVTRSBPVEhFUiBMSUNFTlNFIEFHUkVFTUVOVFMgTUFZIElOQ0xVREUgKEJVVCBBUkUgTk9UIExJTUlURUQgVE8pOlxuXAogXG5cCi0gICAgLSBDb21tb24gUHVibGljIExpY2Vuc2UgVmVyc2lvbiAxLjAgKGF2YWlsYWJsZSBhdCBodHRwOi8vd3d3LmVjbGlwc2Uub3JnL2xlZ2FsL2NwbC12MTAuaHRtbClcblwKLSAgICAtIEFwYWNoZSBTb2Z0d2FyZSBMaWNlbnNlIDEuMSAoYXZhaWxhYmxlIGF0IGh0dHA6Ly93d3cuYXBhY2hlLm9yZy9saWNlbnNlcy9MSUNFTlNFKVxuXAotICAgIC0gQXBhY2hlIFNvZnR3YXJlIExpY2Vuc2UgMi4wIChhdmFpbGFibGUgYXQgaHR0cDovL3d3dy5hcGFjaGUub3JnL2xpY2Vuc2VzL0xJQ0VOU0UtMi4wKVxuXAotICAgIC0gSUJNIFB1YmxpYyBMaWNlbnNlIDEuMCAoYXZhaWxhYmxlIGF0IGh0dHA6Ly9vc3Muc29mdHdhcmUuaWJtLmNvbS9kZXZlbG9wZXJ3b3Jrcy9vcGVuc291cmNlL2xpY2Vuc2UxMC5odG1sKVxuXAotICAgIC0gTWV0cm8gTGluayBQdWJsaWMgTGljZW5zZSAxLjAwIChhdmFpbGFibGUgYXQgaHR0cDovL3d3dy5vcGVuZ3JvdXAub3JnL29wZW5tb3RpZi9zdXBwb3J0ZXJzL21ldHJvbGluay9saWNlbnNlLmh0bWwpXG5cCi0gICAgLSBNb3ppbGxhIFB1YmxpYyBMaWNlbnNlIFZlcnNpb24gMS4xIChhdmFpbGFibGUgYXQgaHR0cDovL3d3dy5tb3ppbGxhLm9yZy9NUEwvTVBMLTEuMS5odG1sKVxuXAotICAgIC0gQ29tbW9uIERldmVsb3BtZW50IGFuZCBEaXN0cmlidXRpb24gTGljZW5zZSAoQ0RETCkgVmVyc2lvbiAxLjAgKGF2YWlsYWJsZSBhdCBodHRwOi8vd3d3LnN1bi5jb20vY2RkbC9jZGRsLmh0bWwpXG5cCisgICAgICAgLSBDb21tb24gUHVibGljIExpY2Vuc2UgVmVyc2lvbiAxLjAgKGF2YWlsYWJsZSBhdCBodHRwOi8vd3d3LmVjbGlwc2Uub3JnL2xlZ2FsL2NwbC12MTAuaHRtbClcblwKKyAgICAgICAtIEFwYWNoZSBTb2Z0d2FyZSBMaWNlbnNlIDEuMSAoYXZhaWxhYmxlIGF0IGh0dHA6Ly93d3cuYXBhY2hlLm9yZy9saWNlbnNlcy9MSUNFTlNFKVxuXAorICAgICAgIC0gQXBhY2hlIFNvZnR3YXJlIExpY2Vuc2UgMi4wIChhdmFpbGFibGUgYXQgaHR0cDovL3d3dy5hcGFjaGUub3JnL2xpY2Vuc2VzL0xJQ0VOU0UtMi4wKVxuXAorICAgICAgIC0gTWV0cm8gTGluayBQdWJsaWMgTGljZW5zZSAxLjAwIChhdmFpbGFibGUgYXQgaHR0cDovL3d3dy5vcGVuZ3JvdXAub3JnL29wZW5tb3RpZi9zdXBwb3J0ZXJzL21ldHJvbGluay9saWNlbnNlLmh0bWwpXG5cCisgICAgICAgLSBNb3ppbGxhIFB1YmxpYyBMaWNlbnNlIFZlcnNpb24gMS4xIChhdmFpbGFibGUgYXQgaHR0cDovL3d3dy5tb3ppbGxhLm9yZy9NUEwvTVBMLTEuMS5odG1sKVxuXAogXG5cCiBJVCBJUyBZT1VSIE9CTElHQVRJT04gVE8gUkVBRCBBTkQgQUNDRVBUIEFMTCBTVUNIIFRFUk1TIEFORCBDT05ESVRJT05TIFBSSU9SXG5cCi1UTyBVU0UgT0YgVEhFIENPTlRFTlQuIElmIG5vIEFib3V0LCBGZWF0dXJlIExpY2Vuc2Ugb3IgRmVhdHVyZSBVcGRhdGUgTGljZW5zZVxuXAorVE8gVVNFIE9GIFRIRSBDT05URU5ULiBJZiBubyBBYm91dCwgRmVhdHVyZSBMaWNlbnNlLCBvciBGZWF0dXJlIFVwZGF0ZSBMaWNlbnNlXG5cCiBpcyBwcm92aWRlZCwgcGxlYXNlIGNvbnRhY3QgdGhlIEVjbGlwc2UgRm91bmRhdGlvbiB0byBkZXRlcm1pbmUgd2hhdCB0ZXJtcyBhbmQgY29uZGl0aW9uc1xuXAogZ292ZXJuIHRoYXQgcGFydGljdWxhciBDb250ZW50LlxuXAogXG5cCitcblxVc2Ugb2YgUHJvdmlzaW9uaW5nIFRlY2hub2xvZ3lcblwKK1xuXAorVGhlIEVjbGlwc2UgRm91bmRhdGlvbiBtYWtlcyBhdmFpbGFibGUgcHJvdmlzaW9uaW5nIHNvZnR3YXJlLCBleGFtcGxlcyBvZiB3aGljaCBpbmNsdWRlLFxuXAorYnV0IGFyZSBub3QgbGltaXRlZCB0bywgcDIgYW5kIHRoZSBFY2xpcHNlIFVwZGF0ZSBNYW5hZ2VyICgiUHJvdmlzaW9uaW5nIFRlY2hub2xvZ3kiKSBmb3JcblwKK3RoZSBwdXJwb3NlIG9mIGFsbG93aW5nIHVzZXJzIHRvIGluc3RhbGwgc29mdHdhcmUsIGRvY3VtZW50YXRpb24sIGluZm9ybWF0aW9uIGFuZC9vclxuXAorb3RoZXIgbWF0ZXJpYWxzIChjb2xsZWN0aXZlbHkgIkluc3RhbGxhYmxlIFNvZnR3YXJlIikuIFRoaXMgY2FwYWJpbGl0eSBpcyBwcm92aWRlZCB3aXRoXG5cCit0aGUgaW50ZW50IG9mIGFsbG93aW5nIHN1Y2ggdXNlcnMgdG8gaW5zdGFsbCwgZXh0ZW5kIGFuZCB1cGRhdGUgRWNsaXBzZS1iYXNlZCBwcm9kdWN0cy5cblwKK0luZm9ybWF0aW9uIGFib3V0IHBhY2thZ2luZyBJbnN0YWxsYWJsZSBTb2Z0d2FyZSBpcyBhdmFpbGFibGUgYXRcblwKK2h0dHA6Ly9lY2xpcHNlLm9yZy9lcXVpbm94L3AyL3JlcG9zaXRvcnlfcGFja2FnaW5nLmh0bWwgKCJTcGVjaWZpY2F0aW9uIikuXG5cCitcblwKK1lvdSBtYXkgdXNlIFByb3Zpc2lvbmluZyBUZWNobm9sb2d5IHRvIGFsbG93IG90aGVyIHBhcnRpZXMgdG8gaW5zdGFsbCBJbnN0YWxsYWJsZSBTb2Z0d2FyZS5cblwKK1lvdSBzaGFsbCBiZSByZXNwb25zaWJsZSBmb3IgZW5hYmxpbmcgdGhlIGFwcGxpY2FibGUgbGljZW5zZSBhZ3JlZW1lbnRzIHJlbGF0aW5nIHRvIHRoZVxuXAorSW5zdGFsbGFibGUgU29mdHdhcmUgdG8gYmUgcHJlc2VudGVkIHRvLCBhbmQgYWNjZXB0ZWQgYnksIHRoZSB1c2VycyBvZiB0aGUgUHJvdmlzaW9uaW5nIFRlY2hub2xvZ3lcblwKK2luIGFjY29yZGFuY2Ugd2l0aCB0aGUgU3BlY2lmaWNhdGlvbi4gQnkgdXNpbmcgUHJvdmlzaW9uaW5nIFRlY2hub2xvZ3kgaW4gc3VjaCBhIG1hbm5lciBhbmRcblwKK21ha2luZyBpdCBhdmFpbGFibGUgaW4gYWNjb3JkYW5jZSB3aXRoIHRoZSBTcGVjaWZpY2F0aW9uLCB5b3UgZnVydGhlciBhY2tub3dsZWRnZSB5b3VyXG5cCithZ3JlZW1lbnQgdG8sIGFuZCB0aGUgYWNxdWlzaXRpb24gb2YgYWxsIG5lY2Vzc2FyeSByaWdodHMgdG8gcGVybWl0IHRoZSBmb2xsb3dpbmc6XG5cCitcblwKKyAgICAgICAxLiBBIHNlcmllcyBvZiBhY3Rpb25zIG1heSBvY2N1ciAoIlByb3Zpc2lvbmluZyBQcm9jZXNzIikgaW4gd2hpY2ggYSB1c2VyIG1heSBleGVjdXRlXG5cCisgICAgICAgICAgdGhlIFByb3Zpc2lvbmluZyBUZWNobm9sb2d5IG9uIGEgbWFjaGluZSAoIlRhcmdldCBNYWNoaW5lIikgd2l0aCB0aGUgaW50ZW50IG9mIGluc3RhbGxpbmcsXG5cCisgICAgICAgICAgZXh0ZW5kaW5nIG9yIHVwZGF0aW5nIHRoZSBmdW5jdGlvbmFsaXR5IG9mIGFuIEVjbGlwc2UtYmFzZWQgcHJvZHVjdC5cblwKKyAgICAgICAyLiBEdXJpbmcgdGhlIFByb3Zpc2lvbmluZyBQcm9jZXNzLCB0aGUgUHJvdmlzaW9uaW5nIFRlY2hub2xvZ3kgbWF5IGNhdXNlIHRoaXJkIHBhcnR5XG5cCisgICAgICAgICAgSW5zdGFsbGFibGUgU29mdHdhcmUgb3IgYSBwb3J0aW9uIHRoZXJlb2YgdG8gYmUgYWNjZXNzZWQgYW5kIGNvcGllZCB0byB0aGUgVGFyZ2V0IE1hY2hpbmUuXG5cCisgICAgICAgMy4gUHVyc3VhbnQgdG8gdGhlIFNwZWNpZmljYXRpb24sIHlvdSB3aWxsIHByb3ZpZGUgdG8gdGhlIHVzZXIgdGhlIHRlcm1zIGFuZCBjb25kaXRpb25zIHRoYXRcblwKKyAgICAgICAgICBnb3Zlcm4gdGhlIHVzZSBvZiB0aGUgSW5zdGFsbGFibGUgU29mdHdhcmUgKCJJbnN0YWxsYWJsZSBTb2Z0d2FyZSBBZ3JlZW1lbnQiKSBhbmQgc3VjaFxuXAorICAgICAgICAgIEluc3RhbGxhYmxlIFNvZnR3YXJlIEFncmVlbWVudCBzaGFsbCBiZSBhY2Nlc3NlZCBmcm9tIHRoZSBUYXJnZXQgTWFjaGluZSBpbiBhY2NvcmRhbmNlXG5cCisgICAgICAgICAgd2l0aCB0aGUgU3BlY2lmaWNhdGlvbi4gU3VjaCBJbnN0YWxsYWJsZSBTb2Z0d2FyZSBBZ3JlZW1lbnQgbXVzdCBpbmZvcm0gdGhlIHVzZXIgb2YgdGhlXG5cCisgICAgICAgICAgdGVybXMgYW5kIGNvbmRpdGlvbnMgdGhhdCBnb3Zlcm4gdGhlIEluc3RhbGxhYmxlIFNvZnR3YXJlIGFuZCBtdXN0IHNvbGljaXQgYWNjZXB0YW5jZSBieVxuXAorICAgICAgICAgIHRoZSBlbmQgdXNlciBpbiB0aGUgbWFubmVyIHByZXNjcmliZWQgaW4gc3VjaCBJbnN0YWxsYWJsZSBTb2Z0d2FyZSBBZ3JlZW1lbnQuIFVwb24gc3VjaFxuXAorICAgICAgICAgIGluZGljYXRpb24gb2YgYWdyZWVtZW50IGJ5IHRoZSB1c2VyLCB0aGUgcHJvdmlzaW9uaW5nIFRlY2hub2xvZ3kgd2lsbCBjb21wbGV0ZSBpbnN0YWxsYXRpb25cblwKKyAgICAgICAgICBvZiB0aGUgSW5zdGFsbGFibGUgU29mdHdhcmUuXG5cCitcblwKIENyeXB0b2dyYXBoeVxuXAogXG5cCiBDb250ZW50IG1heSBjb250YWluIGVuY3J5cHRpb24gc29mdHdhcmUuIFRoZSBjb3VudHJ5IGluIHdoaWNoIHlvdSBhcmVcblwKIGN1cnJlbnRseSBtYXkgaGF2ZSByZXN0cmljdGlvbnMgb24gdGhlIGltcG9ydCwgcG9zc2Vzc2lvbiwgYW5kIHVzZSxcblwKIGFuZC9vciByZS1leHBvcnQgdG8gYW5vdGhlciBjb3VudHJ5LCBvZiBlbmNyeXB0aW9uIHNvZnR3YXJlLiBCRUZPUkVcblwKIHVzaW5nIGFueSBlbmNyeXB0aW9uIHNvZnR3YXJlLCBwbGVhc2UgY2hlY2sgdGhlIGNvdW50cnkncyBsYXdzLFxuXAotcmVndWxhdGlvbnMgYW5kIHBvbGljaWVzIGNvbmNlcm5pbmcgdGhlIGltcG9ydCwgcG9zc2Vzc2lvbiwgb3IgdXNlLFxuXAotYW5kIHJlLWV4cG9ydCBvZiBlbmNyeXB0aW9uIHNvZnR3YXJlLCB0byBzZWUgaWYgdGhpcyBpcyBwZXJtaXR0ZWQuXG5cCityZWd1bGF0aW9ucyBhbmQgcG9saWNpZXMgY29uY2VybmluZyB0aGUgaW1wb3J0LCBwb3NzZXNzaW9uLCBvciB1c2UsIGFuZFxuXAorcmUtZXhwb3J0IG9mIGVuY3J5cHRpb24gc29mdHdhcmUsIHRvIHNlZSBpZiB0aGlzIGlzIHBlcm1pdHRlZC5cblwKIFxuXAotSmF2YSBhbmQgYWxsIEphdmEtYmFzZWQgdHJhZGVtYXJrcyBhcmUgdHJhZGVtYXJrcyBvZiBTdW4gTWljcm9zeXN0ZW1zLCBJbmMuIGluIHRoZSBVbml0ZWQgU3RhdGVzLCBvdGhlciBjb3VudHJpZXMsIG9yIGJvdGguXG4KK0phdmEgYW5kIGFsbCBKYXZhLWJhc2VkIHRyYWRlbWFya3MgYXJlIHRyYWRlbWFya3Mgb2YgT3JhY2xlIENvcnBvcmF0aW9uIGluIHRoZSBVbml0ZWQgU3RhdGVzLCBvdGhlciBjb3VudHJpZXMsIG9yIGJvdGguXG4KICMjIyMjIyMjIyMjIGVuZCBvZiBsaWNlbnNlIHByb3BlcnR5ICMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIwpkaWZmIC0tZ2l0IGEvZmVhdHVyZXMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbl9zZGsuZmVhdHVyZS9mZWF0dXJlLnhtbCBiL2ZlYXR1cmVzL29yZy5lY2xpcHNlLndzdC5jb21tb25fc2RrLmZlYXR1cmUvZmVhdHVyZS54bWwKaW5kZXggZWIxODZiMi4uNzVlYzhhYSAxMDA2NDQKLS0tIGEvZmVhdHVyZXMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbl9zZGsuZmVhdHVyZS9mZWF0dXJlLnhtbAorKysgYi9mZWF0dXJlcy9vcmcuZWNsaXBzZS53c3QuY29tbW9uX3Nkay5mZWF0dXJlL2ZlYXR1cmUueG1sCkBAIC0yLDcgKzIsNyBAQAogPGZlYXR1cmUKICAgICAgIGlkPSJvcmcuZWNsaXBzZS53c3QuY29tbW9uX3Nkay5mZWF0dXJlIgogICAgICAgbGFiZWw9IiVmZWF0dXJlTmFtZSIKLSAgICAgIHZlcnNpb249IjMuMC4wLnF1YWxpZmllciIKKyAgICAgIHZlcnNpb249IjMuMi4xLnF1YWxpZmllciIKICAgICAgIHByb3ZpZGVyLW5hbWU9IiVwcm92aWRlck5hbWUiPgogCiAgICA8ZGVzY3JpcHRpb24+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+PC9wPgorPC9ib2R5PgorPC9odG1sPgpkaWZmIC0tZ2l0IGEvZmVhdHVyZXMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbl91aS5mZWF0dXJlL2ZlYXR1cmUucHJvcGVydGllcyBiL2ZlYXR1cmVzL29yZy5lY2xpcHNlLndzdC5jb21tb25fdWkuZmVhdHVyZS9mZWF0dXJlLnByb3BlcnRpZXMKaW5kZXggNDRkODdhOS4uZTEwZmJhMiAxMDA2NDQKLS0tIGEvZmVhdHVyZXMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbl91aS5mZWF0dXJlL2ZlYXR1cmUucHJvcGVydGllcworKysgYi9mZWF0dXJlcy9vcmcuZWNsaXBzZS53c3QuY29tbW9uX3VpLmZlYXR1cmUvZmVhdHVyZS5wcm9wZXJ0aWVzCkBAIC0xOCwxMCArMTgsOCBAQAogZmVhdHVyZU5hbWU9V1NUIENvbW1vbiBVSQogCiAjICJwcm92aWRlck5hbWUiIHByb3BlcnR5IC0gbmFtZSBvZiB0aGUgY29tcGFueSB0aGF0IHByb3ZpZGVzIHRoZSBmZWF0dXJlCi1wcm92aWRlck5hbWU9RWNsaXBzZS5vcmcKK3Byb3ZpZGVyTmFtZT1FY2xpcHNlIFdlYiBUb29scyBQbGF0Zm9ybQogCi0jICJ1cGRhdGVTaXRlTmFtZSIgcHJvcGVydHkgLSBsYWJlbCBmb3IgdGhlIHVwZGF0ZSBzaXRlCi11cGRhdGVTaXRlTmFtZT1UaGUgRWNsaXBzZSBXZWIgVG9vbHMgUGxhdGZvcm0gKFdUUCkgUHJvamVjdCB1cGRhdGUgc2l0ZQogCiAjICJkZXNjcmlwdGlvbiIgcHJvcGVydHkgLSBkZXNjcmlwdGlvbiBvZiB0aGUgZmVhdHVyZQogZGVzY3JpcHRpb249V1NUIGNvbW1vbiBVSSBmdW5jdGlvbmFsaXR5LgpAQCAtNDUsOCArNDMsOCBAQAogIyAibGljZW5zZSIgcHJvcGVydHkgLSB0ZXh0IG9mIHRoZSAiRmVhdHVyZSBVcGRhdGUgTGljZW5zZSIKICMgc2hvdWxkIGJlIHBsYWluIHRleHQgdmVyc2lvbiBvZiBsaWNlbnNlIGFncmVlbWVudCBwb2ludGVkIHRvIGJlICJsaWNlbnNlVVJMIgogbGljZW5zZT1cCi1FQ0xJUFNFIEZPVU5EQVRJT04gU09GVFdBUkUgVVNFUiBBR1JFRU1FTlRcblwKLUp1bmUgMDYsIDIwMDdcblwKK0VjbGlwc2UgRm91bmRhdGlvbiBTb2Z0d2FyZSBVc2VyIEFncmVlbWVudFxuXAorQXByaWwgMTQsIDIwMTBcblwKIFxuXAogVXNhZ2UgT2YgQ29udGVudFxuXAogXG5cCkBAIC01NCw0MiArNTIsMzggQEAKIE9USEVSIE1BVEVSSUFMUyBGT1IgT1BFTiBTT1VSQ0UgUFJPSkVDVFMgKENPTExFQ1RJVkVMWSAiQ09OVEVOVCIpLlxuXAogVVNFIE9GIFRIRSBDT05URU5UIElTIEdPVkVSTkVEIEJZIFRIRSBURVJNUyBBTkQgQ09ORElUSU9OUyBPRiBUSElTXG5cCiBBR1JFRU1FTlQgQU5EL09SIFRIRSBURVJNUyBBTkQgQ09ORElUSU9OUyBPRiBMSUNFTlNFIEFHUkVFTUVOVFMgT1JcblwKLU5PVElDRVMgSU5ESUNBVEVEIE9SIFJFRkVSRU5DRUQgQkVMT1cuIEJZIFVTSU5HIFRIRSBDT05URU5ULCBZT1VcblwKK05PVElDRVMgSU5ESUNBVEVEIE9SIFJFRkVSRU5DRUQgQkVMT1cuICBCWSBVU0lORyBUSEUgQ09OVEVOVCwgWU9VXG5cCiBBR1JFRSBUSEFUIFlPVVIgVVNFIE9GIFRIRSBDT05URU5UIElTIEdPVkVSTkVEIEJZIFRISVMgQUdSRUVNRU5UXG5cCiBBTkQvT1IgVEhFIFRFUk1TIEFORCBDT05ESVRJT05TIE9GIEFOWSBBUFBMSUNBQkxFIExJQ0VOU0UgQUdSRUVNRU5UU1xuXAotT1IgTk9USUNFUyBJTkRJQ0FURUQgT1IgUkVGRVJFTkNFRCBCRUxPVy4gSUYgWU9VIERPIE5PVCBBR1JFRSBUTyBUSEVcblwKK09SIE5PVElDRVMgSU5ESUNBVEVEIE9SIFJFRkVSRU5DRUQgQkVMT1cuICBJRiBZT1UgRE8gTk9UIEFHUkVFIFRPIFRIRVxuXAogVEVSTVMgQU5EIENPTkRJVElPTlMgT0YgVEhJUyBBR1JFRU1FTlQgQU5EIFRIRSBURVJNUyBBTkQgQ09ORElUSU9OU1xuXAogT0YgQU5ZIEFQUExJQ0FCTEUgTElDRU5TRSBBR1JFRU1FTlRTIE9SIE5PVElDRVMgSU5ESUNBVEVEIE9SIFJFRkVSRU5DRURcblwKIEJFTE9XLCBUSEVOIFlPVSBNQVkgTk9UIFVTRSBUSEUgQ09OVEVOVC5cblwKIFxuXAogQXBwbGljYWJsZSBMaWNlbnNlc1xuXAogXG5cCi1Vbmxlc3Mgb3RoZXJ3aXNlIGluZGljYXRlZCwgYWxsIENvbnRlbnQgbWFkZSBhdmFpbGFibGUgYnkgdGhlIEVjbGlwc2UgRm91bmRhdGlvblxuXAotaXMgcHJvdmlkZWQgdG8geW91IHVuZGVyIHRoZSB0ZXJtcyBhbmQgY29uZGl0aW9ucyBvZiB0aGUgRWNsaXBzZSBQdWJsaWNcblwKLUxpY2Vuc2UgVmVyc2lvbiAxLjAgKCJFUEwiKS4gQSBjb3B5IG9mIHRoZSBFUEwgaXMgcHJvdmlkZWQgd2l0aCB0aGlzXG5cCi1Db250ZW50IGFuZCBpcyBhbHNvIGF2YWlsYWJsZSBhdCBodHRwOi8vd3d3LmVjbGlwc2Uub3JnL2xlZ2FsL2VwbC12MTAuaHRtbC5cblwKK1VubGVzcyBvdGhlcndpc2UgaW5kaWNhdGVkLCBhbGwgQ29udGVudCBtYWRlIGF2YWlsYWJsZSBieSB0aGVcblwKK0VjbGlwc2UgRm91bmRhdGlvbiBpcyBwcm92aWRlZCB0byB5b3UgdW5kZXIgdGhlIHRlcm1zIGFuZCBjb25kaXRpb25zIG9mXG5cCit0aGUgRWNsaXBzZSBQdWJsaWMgTGljZW5zZSBWZXJzaW9uIDEuMCAoIkVQTCIpLiBBIGNvcHkgb2YgdGhlIEVQTCBpc1xuXAorcHJvdmlkZWQgd2l0aCB0aGlzIENvbnRlbnQgYW5kIGlzIGFsc28gYXZhaWxhYmxlIGF0IGh0dHA6Ly93d3cuZWNsaXBzZS5vcmcvbGVnYWwvZXBsLXYxMC5odG1sLlxuXAogRm9yIHB1cnBvc2VzIG9mIHRoZSBFUEwsICJQcm9ncmFtIiB3aWxsIG1lYW4gdGhlIENvbnRlbnQuXG5cCiBcblwKIENvbnRlbnQgaW5jbHVkZXMsIGJ1dCBpcyBub3QgbGltaXRlZCB0bywgc291cmNlIGNvZGUsIG9iamVjdCBjb2RlLFxuXAotZG9jdW1lbnRhdGlvbiBhbmQgb3RoZXIgZmlsZXMgbWFpbnRhaW5lZCBpbiB0aGUgRWNsaXBzZS5vcmcgQ1ZTXG5cCi1yZXBvc2l0b3J5ICgiUmVwb3NpdG9yeSIpIGluIENWUyBtb2R1bGVzICgiTW9kdWxlcyIpIGFuZCBtYWRlIGF2YWlsYWJsZVxuXAorZG9jdW1lbnRhdGlvbiBhbmQgb3RoZXIgZmlsZXMgbWFpbnRhaW5lZCBpbiB0aGUgRWNsaXBzZSBGb3VuZGF0aW9uIHNvdXJjZSBjb2RlXG5cCityZXBvc2l0b3J5ICgiUmVwb3NpdG9yeSIpIGluIHNvZnR3YXJlIG1vZHVsZXMgKCJNb2R1bGVzIikgYW5kIG1hZGUgYXZhaWxhYmxlXG5cCiBhcyBkb3dubG9hZGFibGUgYXJjaGl2ZXMgKCJEb3dubG9hZHMiKS5cblwKIFxuXAotICAgLSBDb250ZW50IG1heSBiZSBzdHJ1Y3R1cmVkIGFuZCBwYWNrYWdlZCBpbnRvIG1vZHVsZXMgdG8gZmFjaWxpdGF0ZSBkZWxpdmVyaW5nLFxuXAotICAgICBleHRlbmRpbmcsIGFuZCB1cGdyYWRpbmcgdGhlIENvbnRlbnQuIFR5cGljYWwgbW9kdWxlcyBtYXkgaW5jbHVkZSBwbHVnLWlucyAoIlBsdWctaW5zIiksXG5cCi0gICAgIHBsdWctaW4gZnJhZ21lbnRzICgiRnJhZ21lbnRzIiksIGFuZCBmZWF0dXJlcyAoIkZlYXR1cmVzIikuXG5cCi0gICAtIEVhY2ggUGx1Zy1pbiBvciBGcmFnbWVudCBtYXkgYmUgcGFja2FnZWQgYXMgYSBzdWItZGlyZWN0b3J5IG9yIEpBUiAoSmF2YT8gQVJjaGl2ZSlcblwKLSAgICAgaW4gYSBkaXJlY3RvcnkgbmFtZWQgInBsdWdpbnMiLlxuXAotICAgLSBBIEZlYXR1cmUgaXMgYSBidW5kbGUgb2Ygb25lIG9yIG1vcmUgUGx1Zy1pbnMgYW5kL29yIEZyYWdtZW50cyBhbmQgYXNzb2NpYXRlZCBtYXRlcmlhbC5cblwKLSAgICAgRWFjaCBGZWF0dXJlIG1heSBiZSBwYWNrYWdlZCBhcyBhIHN1Yi1kaXJlY3RvcnkgaW4gYSBkaXJlY3RvcnkgbmFtZWQgImZlYXR1cmVzIi5cblwKLSAgICAgV2l0aGluIGEgRmVhdHVyZSwgZmlsZXMgbmFtZWQgImZlYXR1cmUueG1sIiBtYXkgY29udGFpbiBhIGxpc3Qgb2YgdGhlIG5hbWVzIGFuZCB2ZXJzaW9uXG5cCi0gICAgIG51bWJlcnMgb2YgdGhlIFBsdWctaW5zIGFuZC9vciBGcmFnbWVudHMgYXNzb2NpYXRlZCB3aXRoIHRoYXQgRmVhdHVyZS5cblwKLSAgIC0gRmVhdHVyZXMgbWF5IGFsc28gaW5jbHVkZSBvdGhlciBGZWF0dXJlcyAoIkluY2x1ZGVkIEZlYXR1cmVzIikuIFdpdGhpbiBhIEZlYXR1cmUsIGZpbGVzXG5cCi0gICAgIG5hbWVkICJmZWF0dXJlLnhtbCIgbWF5IGNvbnRhaW4gYSBsaXN0IG9mIHRoZSBuYW1lcyBhbmQgdmVyc2lvbiBudW1iZXJzIG9mIEluY2x1ZGVkIEZlYXR1cmVzLlxuXAotXG5cCi1GZWF0dXJlcyBtYXkgYWxzbyBpbmNsdWRlIG90aGVyIEZlYXR1cmVzICgiSW5jbHVkZWQgRmVhdHVyZXMiKS4gRmlsZXMgbmFtZWRcblwKLSJmZWF0dXJlLnhtbCIgbWF5IGNvbnRhaW4gYSBsaXN0IG9mIHRoZSBuYW1lcyBhbmQgdmVyc2lvbiBudW1iZXJzIG9mXG5cCi1JbmNsdWRlZCBGZWF0dXJlcy5cblwKKyAgICAgICAtIENvbnRlbnQgbWF5IGJlIHN0cnVjdHVyZWQgYW5kIHBhY2thZ2VkIGludG8gbW9kdWxlcyB0byBmYWNpbGl0YXRlIGRlbGl2ZXJpbmcsXG5cCisgICAgICAgICBleHRlbmRpbmcsIGFuZCB1cGdyYWRpbmcgdGhlIENvbnRlbnQuIFR5cGljYWwgbW9kdWxlcyBtYXkgaW5jbHVkZSBwbHVnLWlucyAoIlBsdWctaW5zIiksXG5cCisgICAgICAgICBwbHVnLWluIGZyYWdtZW50cyAoIkZyYWdtZW50cyIpLCBhbmQgZmVhdHVyZXMgKCJGZWF0dXJlcyIpLlxuXAorICAgICAgIC0gRWFjaCBQbHVnLWluIG9yIEZyYWdtZW50IG1heSBiZSBwYWNrYWdlZCBhcyBhIHN1Yi1kaXJlY3Rvcnkgb3IgSkFSIChKYXZhKFRNKSBBUmNoaXZlKVxuXAorICAgICAgICAgaW4gYSBkaXJlY3RvcnkgbmFtZWQgInBsdWdpbnMiLlxuXAorICAgICAgIC0gQSBGZWF0dXJlIGlzIGEgYnVuZGxlIG9mIG9uZSBvciBtb3JlIFBsdWctaW5zIGFuZC9vciBGcmFnbWVudHMgYW5kIGFzc29jaWF0ZWQgbWF0ZXJpYWwuXG5cCisgICAgICAgICBFYWNoIEZlYXR1cmUgbWF5IGJlIHBhY2thZ2VkIGFzIGEgc3ViLWRpcmVjdG9yeSBpbiBhIGRpcmVjdG9yeSBuYW1lZCAiZmVhdHVyZXMiLlxuXAorICAgICAgICAgV2l0aGluIGEgRmVhdHVyZSwgZmlsZXMgbmFtZWQgImZlYXR1cmUueG1sIiBtYXkgY29udGFpbiBhIGxpc3Qgb2YgdGhlIG5hbWVzIGFuZCB2ZXJzaW9uXG5cCisgICAgICAgICBudW1iZXJzIG9mIHRoZSBQbHVnLWlucyBhbmQvb3IgRnJhZ21lbnRzIGFzc29jaWF0ZWQgd2l0aCB0aGF0IEZlYXR1cmUuXG5cCisgICAgICAgLSBGZWF0dXJlcyBtYXkgYWxzbyBpbmNsdWRlIG90aGVyIEZlYXR1cmVzICgiSW5jbHVkZWQgRmVhdHVyZXMiKS4gV2l0aGluIGEgRmVhdHVyZSwgZmlsZXNcblwKKyAgICAgICAgIG5hbWVkICJmZWF0dXJlLnhtbCIgbWF5IGNvbnRhaW4gYSBsaXN0IG9mIHRoZSBuYW1lcyBhbmQgdmVyc2lvbiBudW1iZXJzIG9mIEluY2x1ZGVkIEZlYXR1cmVzLlxuXAogXG5cCiBUaGUgdGVybXMgYW5kIGNvbmRpdGlvbnMgZ292ZXJuaW5nIFBsdWctaW5zIGFuZCBGcmFnbWVudHMgc2hvdWxkIGJlXG5cCiBjb250YWluZWQgaW4gZmlsZXMgbmFtZWQgImFib3V0Lmh0bWwiICgiQWJvdXRzIikuIFRoZSB0ZXJtcyBhbmRcblwKQEAgLTk4LDQ4ICs5Miw3NyBAQAogTGljZW5zZXMgbWF5IGJlIGxvY2F0ZWQgaW4gYW55IGRpcmVjdG9yeSBvZiBhIERvd25sb2FkIG9yIE1vZHVsZVxuXAogaW5jbHVkaW5nLCBidXQgbm90IGxpbWl0ZWQgdG8gdGhlIGZvbGxvd2luZyBsb2NhdGlvbnM6XG5cCiBcblwKLSAgIC0gVGhlIHRvcC1sZXZlbCAocm9vdCkgZGlyZWN0b3J5XG5cCi0gICAtIFBsdWctaW4gYW5kIEZyYWdtZW50IGRpcmVjdG9yaWVzXG5cCi0gICAtIEluc2lkZSBQbHVnLWlucyBhbmQgRnJhZ21lbnRzIHBhY2thZ2VkIGFzIEpBUnNcblwKLSAgIC0gU3ViLWRpcmVjdG9yaWVzIG9mIHRoZSBkaXJlY3RvcnkgbmFtZWQgInNyYyIgb2YgY2VydGFpbiBQbHVnLWluc1xuXAotICAgLSBGZWF0dXJlIGRpcmVjdG9yaWVzXG5cCisgICAgICAgLSBUaGUgdG9wLWxldmVsIChyb290KSBkaXJlY3RvcnlcblwKKyAgICAgICAtIFBsdWctaW4gYW5kIEZyYWdtZW50IGRpcmVjdG9yaWVzXG5cCisgICAgICAgLSBJbnNpZGUgUGx1Zy1pbnMgYW5kIEZyYWdtZW50cyBwYWNrYWdlZCBhcyBKQVJzXG5cCisgICAgICAgLSBTdWItZGlyZWN0b3JpZXMgb2YgdGhlIGRpcmVjdG9yeSBuYW1lZCAic3JjIiBvZiBjZXJ0YWluIFBsdWctaW5zXG5cCisgICAgICAgLSBGZWF0dXJlIGRpcmVjdG9yaWVzXG5cCiBcblwKIE5vdGU6IGlmIGEgRmVhdHVyZSBtYWRlIGF2YWlsYWJsZSBieSB0aGUgRWNsaXBzZSBGb3VuZGF0aW9uIGlzIGluc3RhbGxlZCB1c2luZyB0aGVcblwKLUVjbGlwc2UgVXBkYXRlIE1hbmFnZXIsIHlvdSBtdXN0IGFncmVlIHRvIGEgbGljZW5zZSAoIkZlYXR1cmUgVXBkYXRlXG5cCi1MaWNlbnNlIikgZHVyaW5nIHRoZSBpbnN0YWxsYXRpb24gcHJvY2Vzcy4gSWYgdGhlIEZlYXR1cmUgY29udGFpbnNcblwKK1Byb3Zpc2lvbmluZyBUZWNobm9sb2d5IChhcyBkZWZpbmVkIGJlbG93KSwgeW91IG11c3QgYWdyZWUgdG8gYSBsaWNlbnNlICgiRmVhdHVyZSBcblwKK1VwZGF0ZSBMaWNlbnNlIikgZHVyaW5nIHRoZSBpbnN0YWxsYXRpb24gcHJvY2Vzcy4gSWYgdGhlIEZlYXR1cmUgY29udGFpbnNcblwKIEluY2x1ZGVkIEZlYXR1cmVzLCB0aGUgRmVhdHVyZSBVcGRhdGUgTGljZW5zZSBzaG91bGQgZWl0aGVyIHByb3ZpZGUgeW91XG5cCiB3aXRoIHRoZSB0ZXJtcyBhbmQgY29uZGl0aW9ucyBnb3Zlcm5pbmcgdGhlIEluY2x1ZGVkIEZlYXR1cmVzIG9yIGluZm9ybVxuXAogeW91IHdoZXJlIHlvdSBjYW4gbG9jYXRlIHRoZW0uIEZlYXR1cmUgVXBkYXRlIExpY2Vuc2VzIG1heSBiZSBmb3VuZCBpblxuXAotdGhlICJsaWNlbnNlIiBwcm9wZXJ0eSBvZiBmaWxlcyBuYW1lZCAiZmVhdHVyZS5wcm9wZXJ0aWVzIi4gU3VjaCBBYm91dHMsXG5cCi1GZWF0dXJlIExpY2Vuc2VzIGFuZCBGZWF0dXJlIFVwZGF0ZSBMaWNlbnNlcyBjb250YWluIHRoZSB0ZXJtcyBhbmRcblwKLWNvbmRpdGlvbnMgKG9yIHJlZmVyZW5jZXMgdG8gc3VjaCB0ZXJtcyBhbmQgY29uZGl0aW9ucykgdGhhdCBnb3Zlcm4geW91clxuXAotdXNlIG9mIHRoZSBhc3NvY2lhdGVkIENvbnRlbnQgaW4gdGhhdCBkaXJlY3RvcnkuXG5cCit0aGUgImxpY2Vuc2UiIHByb3BlcnR5IG9mIGZpbGVzIG5hbWVkICJmZWF0dXJlLnByb3BlcnRpZXMiIGZvdW5kIHdpdGhpbiBhIEZlYXR1cmUuXG5cCitTdWNoIEFib3V0cywgRmVhdHVyZSBMaWNlbnNlcywgYW5kIEZlYXR1cmUgVXBkYXRlIExpY2Vuc2VzIGNvbnRhaW4gdGhlXG5cCit0ZXJtcyBhbmQgY29uZGl0aW9ucyAob3IgcmVmZXJlbmNlcyB0byBzdWNoIHRlcm1zIGFuZCBjb25kaXRpb25zKSB0aGF0XG5cCitnb3Zlcm4geW91ciB1c2Ugb2YgdGhlIGFzc29jaWF0ZWQgQ29udGVudCBpbiB0aGF0IGRpcmVjdG9yeS5cblwKIFxuXAotVEhFIEFCT1VUUywgRkVBVFVSRSBMSUNFTlNFUyBBTkQgRkVBVFVSRSBVUERBVEUgTElDRU5TRVMgTUFZIFJFRkVSXG5cCitUSEUgQUJPVVRTLCBGRUFUVVJFIExJQ0VOU0VTLCBBTkQgRkVBVFVSRSBVUERBVEUgTElDRU5TRVMgTUFZIFJFRkVSXG5cCiBUTyBUSEUgRVBMIE9SIE9USEVSIExJQ0VOU0UgQUdSRUVNRU5UUywgTk9USUNFUyBPUiBURVJNUyBBTkQgQ09ORElUSU9OUy5cblwKIFNPTUUgT0YgVEhFU0UgT1RIRVIgTElDRU5TRSBBR1JFRU1FTlRTIE1BWSBJTkNMVURFIChCVVQgQVJFIE5PVCBMSU1JVEVEIFRPKTpcblwKIFxuXAotICAgIC0gQ29tbW9uIFB1YmxpYyBMaWNlbnNlIFZlcnNpb24gMS4wIChhdmFpbGFibGUgYXQgaHR0cDovL3d3dy5lY2xpcHNlLm9yZy9sZWdhbC9jcGwtdjEwLmh0bWwpXG5cCi0gICAgLSBBcGFjaGUgU29mdHdhcmUgTGljZW5zZSAxLjEgKGF2YWlsYWJsZSBhdCBodHRwOi8vd3d3LmFwYWNoZS5vcmcvbGljZW5zZXMvTElDRU5TRSlcblwKLSAgICAtIEFwYWNoZSBTb2Z0d2FyZSBMaWNlbnNlIDIuMCAoYXZhaWxhYmxlIGF0IGh0dHA6Ly93d3cuYXBhY2hlLm9yZy9saWNlbnNlcy9MSUNFTlNFLTIuMClcblwKLSAgICAtIElCTSBQdWJsaWMgTGljZW5zZSAxLjAgKGF2YWlsYWJsZSBhdCBodHRwOi8vb3NzLnNvZnR3YXJlLmlibS5jb20vZGV2ZWxvcGVyd29ya3Mvb3BlbnNvdXJjZS9saWNlbnNlMTAuaHRtbClcblwKLSAgICAtIE1ldHJvIExpbmsgUHVibGljIExpY2Vuc2UgMS4wMCAoYXZhaWxhYmxlIGF0IGh0dHA6Ly93d3cub3Blbmdyb3VwLm9yZy9vcGVubW90aWYvc3VwcG9ydGVycy9tZXRyb2xpbmsvbGljZW5zZS5odG1sKVxuXAotICAgIC0gTW96aWxsYSBQdWJsaWMgTGljZW5zZSBWZXJzaW9uIDEuMSAoYXZhaWxhYmxlIGF0IGh0dHA6Ly93d3cubW96aWxsYS5vcmcvTVBML01QTC0xLjEuaHRtbClcblwKLSAgICAtIENvbW1vbiBEZXZlbG9wbWVudCBhbmQgRGlzdHJpYnV0aW9uIExpY2Vuc2UgKENEREwpIFZlcnNpb24gMS4wIChhdmFpbGFibGUgYXQgaHR0cDovL3d3dy5zdW4uY29tL2NkZGwvY2RkbC5odG1sKVxuXAorICAgICAgIC0gQ29tbW9uIFB1YmxpYyBMaWNlbnNlIFZlcnNpb24gMS4wIChhdmFpbGFibGUgYXQgaHR0cDovL3d3dy5lY2xpcHNlLm9yZy9sZWdhbC9jcGwtdjEwLmh0bWwpXG5cCisgICAgICAgLSBBcGFjaGUgU29mdHdhcmUgTGljZW5zZSAxLjEgKGF2YWlsYWJsZSBhdCBodHRwOi8vd3d3LmFwYWNoZS5vcmcvbGljZW5zZXMvTElDRU5TRSlcblwKKyAgICAgICAtIEFwYWNoZSBTb2Z0d2FyZSBMaWNlbnNlIDIuMCAoYXZhaWxhYmxlIGF0IGh0dHA6Ly93d3cuYXBhY2hlLm9yZy9saWNlbnNlcy9MSUNFTlNFLTIuMClcblwKKyAgICAgICAtIE1ldHJvIExpbmsgUHVibGljIExpY2Vuc2UgMS4wMCAoYXZhaWxhYmxlIGF0IGh0dHA6Ly93d3cub3Blbmdyb3VwLm9yZy9vcGVubW90aWYvc3VwcG9ydGVycy9tZXRyb2xpbmsvbGljZW5zZS5odG1sKVxuXAorICAgICAgIC0gTW96aWxsYSBQdWJsaWMgTGljZW5zZSBWZXJzaW9uIDEuMSAoYXZhaWxhYmxlIGF0IGh0dHA6Ly93d3cubW96aWxsYS5vcmcvTVBML01QTC0xLjEuaHRtbClcblwKIFxuXAogSVQgSVMgWU9VUiBPQkxJR0FUSU9OIFRPIFJFQUQgQU5EIEFDQ0VQVCBBTEwgU1VDSCBURVJNUyBBTkQgQ09ORElUSU9OUyBQUklPUlxuXAotVE8gVVNFIE9GIFRIRSBDT05URU5ULiBJZiBubyBBYm91dCwgRmVhdHVyZSBMaWNlbnNlIG9yIEZlYXR1cmUgVXBkYXRlIExpY2Vuc2VcblwKK1RPIFVTRSBPRiBUSEUgQ09OVEVOVC4gSWYgbm8gQWJvdXQsIEZlYXR1cmUgTGljZW5zZSwgb3IgRmVhdHVyZSBVcGRhdGUgTGljZW5zZVxuXAogaXMgcHJvdmlkZWQsIHBsZWFzZSBjb250YWN0IHRoZSBFY2xpcHNlIEZvdW5kYXRpb24gdG8gZGV0ZXJtaW5lIHdoYXQgdGVybXMgYW5kIGNvbmRpdGlvbnNcblwKIGdvdmVybiB0aGF0IHBhcnRpY3VsYXIgQ29udGVudC5cblwKIFxuXAorXG5cVXNlIG9mIFByb3Zpc2lvbmluZyBUZWNobm9sb2d5XG5cCitcblwKK1RoZSBFY2xpcHNlIEZvdW5kYXRpb24gbWFrZXMgYXZhaWxhYmxlIHByb3Zpc2lvbmluZyBzb2Z0d2FyZSwgZXhhbXBsZXMgb2Ygd2hpY2ggaW5jbHVkZSxcblwKK2J1dCBhcmUgbm90IGxpbWl0ZWQgdG8sIHAyIGFuZCB0aGUgRWNsaXBzZSBVcGRhdGUgTWFuYWdlciAoIlByb3Zpc2lvbmluZyBUZWNobm9sb2d5IikgZm9yXG5cCit0aGUgcHVycG9zZSBvZiBhbGxvd2luZyB1c2VycyB0byBpbnN0YWxsIHNvZnR3YXJlLCBkb2N1bWVudGF0aW9uLCBpbmZvcm1hdGlvbiBhbmQvb3JcblwKK290aGVyIG1hdGVyaWFscyAoY29sbGVjdGl2ZWx5ICJJbnN0YWxsYWJsZSBTb2Z0d2FyZSIpLiBUaGlzIGNhcGFiaWxpdHkgaXMgcHJvdmlkZWQgd2l0aFxuXAordGhlIGludGVudCBvZiBhbGxvd2luZyBzdWNoIHVzZXJzIHRvIGluc3RhbGwsIGV4dGVuZCBhbmQgdXBkYXRlIEVjbGlwc2UtYmFzZWQgcHJvZHVjdHMuXG5cCitJbmZvcm1hdGlvbiBhYm91dCBwYWNrYWdpbmcgSW5zdGFsbGFibGUgU29mdHdhcmUgaXMgYXZhaWxhYmxlIGF0XG5cCitodHRwOi8vZWNsaXBzZS5vcmcvZXF1aW5veC9wMi9yZXBvc2l0b3J5X3BhY2thZ2luZy5odG1sICgiU3BlY2lmaWNhdGlvbiIpLlxuXAorXG5cCitZb3UgbWF5IHVzZSBQcm92aXNpb25pbmcgVGVjaG5vbG9neSB0byBhbGxvdyBvdGhlciBwYXJ0aWVzIHRvIGluc3RhbGwgSW5zdGFsbGFibGUgU29mdHdhcmUuXG5cCitZb3Ugc2hhbGwgYmUgcmVzcG9uc2libGUgZm9yIGVuYWJsaW5nIHRoZSBhcHBsaWNhYmxlIGxpY2Vuc2UgYWdyZWVtZW50cyByZWxhdGluZyB0byB0aGVcblwKK0luc3RhbGxhYmxlIFNvZnR3YXJlIHRvIGJlIHByZXNlbnRlZCB0bywgYW5kIGFjY2VwdGVkIGJ5LCB0aGUgdXNlcnMgb2YgdGhlIFByb3Zpc2lvbmluZyBUZWNobm9sb2d5XG5cCitpbiBhY2NvcmRhbmNlIHdpdGggdGhlIFNwZWNpZmljYXRpb24uIEJ5IHVzaW5nIFByb3Zpc2lvbmluZyBUZWNobm9sb2d5IGluIHN1Y2ggYSBtYW5uZXIgYW5kXG5cCittYWtpbmcgaXQgYXZhaWxhYmxlIGluIGFjY29yZGFuY2Ugd2l0aCB0aGUgU3BlY2lmaWNhdGlvbiwgeW91IGZ1cnRoZXIgYWNrbm93bGVkZ2UgeW91clxuXAorYWdyZWVtZW50IHRvLCBhbmQgdGhlIGFjcXVpc2l0aW9uIG9mIGFsbCBuZWNlc3NhcnkgcmlnaHRzIHRvIHBlcm1pdCB0aGUgZm9sbG93aW5nOlxuXAorXG5cCisgICAgICAgMS4gQSBzZXJpZXMgb2YgYWN0aW9ucyBtYXkgb2NjdXIgKCJQcm92aXNpb25pbmcgUHJvY2VzcyIpIGluIHdoaWNoIGEgdXNlciBtYXkgZXhlY3V0ZVxuXAorICAgICAgICAgIHRoZSBQcm92aXNpb25pbmcgVGVjaG5vbG9neSBvbiBhIG1hY2hpbmUgKCJUYXJnZXQgTWFjaGluZSIpIHdpdGggdGhlIGludGVudCBvZiBpbnN0YWxsaW5nLFxuXAorICAgICAgICAgIGV4dGVuZGluZyBvciB1cGRhdGluZyB0aGUgZnVuY3Rpb25hbGl0eSBvZiBhbiBFY2xpcHNlLWJhc2VkIHByb2R1Y3QuXG5cCisgICAgICAgMi4gRHVyaW5nIHRoZSBQcm92aXNpb25pbmcgUHJvY2VzcywgdGhlIFByb3Zpc2lvbmluZyBUZWNobm9sb2d5IG1heSBjYXVzZSB0aGlyZCBwYXJ0eVxuXAorICAgICAgICAgIEluc3RhbGxhYmxlIFNvZnR3YXJlIG9yIGEgcG9ydGlvbiB0aGVyZW9mIHRvIGJlIGFjY2Vzc2VkIGFuZCBjb3BpZWQgdG8gdGhlIFRhcmdldCBNYWNoaW5lLlxuXAorICAgICAgIDMuIFB1cnN1YW50IHRvIHRoZSBTcGVjaWZpY2F0aW9uLCB5b3Ugd2lsbCBwcm92aWRlIHRvIHRoZSB1c2VyIHRoZSB0ZXJtcyBhbmQgY29uZGl0aW9ucyB0aGF0XG5cCisgICAgICAgICAgZ292ZXJuIHRoZSB1c2Ugb2YgdGhlIEluc3RhbGxhYmxlIFNvZnR3YXJlICgiSW5zdGFsbGFibGUgU29mdHdhcmUgQWdyZWVtZW50IikgYW5kIHN1Y2hcblwKKyAgICAgICAgICBJbnN0YWxsYWJsZSBTb2Z0d2FyZSBBZ3JlZW1lbnQgc2hhbGwgYmUgYWNjZXNzZWQgZnJvbSB0aGUgVGFyZ2V0IE1hY2hpbmUgaW4gYWNjb3JkYW5jZVxuXAorICAgICAgICAgIHdpdGggdGhlIFNwZWNpZmljYXRpb24uIFN1Y2ggSW5zdGFsbGFibGUgU29mdHdhcmUgQWdyZWVtZW50IG11c3QgaW5mb3JtIHRoZSB1c2VyIG9mIHRoZVxuXAorICAgICAgICAgIHRlcm1zIGFuZCBjb25kaXRpb25zIHRoYXQgZ292ZXJuIHRoZSBJbnN0YWxsYWJsZSBTb2Z0d2FyZSBhbmQgbXVzdCBzb2xpY2l0IGFjY2VwdGFuY2UgYnlcblwKKyAgICAgICAgICB0aGUgZW5kIHVzZXIgaW4gdGhlIG1hbm5lciBwcmVzY3JpYmVkIGluIHN1Y2ggSW5zdGFsbGFibGUgU29mdHdhcmUgQWdyZWVtZW50LiBVcG9uIHN1Y2hcblwKKyAgICAgICAgICBpbmRpY2F0aW9uIG9mIGFncmVlbWVudCBieSB0aGUgdXNlciwgdGhlIHByb3Zpc2lvbmluZyBUZWNobm9sb2d5IHdpbGwgY29tcGxldGUgaW5zdGFsbGF0aW9uXG5cCisgICAgICAgICAgb2YgdGhlIEluc3RhbGxhYmxlIFNvZnR3YXJlLlxuXAorXG5cCiBDcnlwdG9ncmFwaHlcblwKIFxuXAogQ29udGVudCBtYXkgY29udGFpbiBlbmNyeXB0aW9uIHNvZnR3YXJlLiBUaGUgY291bnRyeSBpbiB3aGljaCB5b3UgYXJlXG5cCiBjdXJyZW50bHkgbWF5IGhhdmUgcmVzdHJpY3Rpb25zIG9uIHRoZSBpbXBvcnQsIHBvc3Nlc3Npb24sIGFuZCB1c2UsXG5cCiBhbmQvb3IgcmUtZXhwb3J0IHRvIGFub3RoZXIgY291bnRyeSwgb2YgZW5jcnlwdGlvbiBzb2Z0d2FyZS4gQkVGT1JFXG5cCiB1c2luZyBhbnkgZW5jcnlwdGlvbiBzb2Z0d2FyZSwgcGxlYXNlIGNoZWNrIHRoZSBjb3VudHJ5J3MgbGF3cyxcblwKLXJlZ3VsYXRpb25zIGFuZCBwb2xpY2llcyBjb25jZXJuaW5nIHRoZSBpbXBvcnQsIHBvc3Nlc3Npb24sIG9yIHVzZSxcblwKLWFuZCByZS1leHBvcnQgb2YgZW5jcnlwdGlvbiBzb2Z0d2FyZSwgdG8gc2VlIGlmIHRoaXMgaXMgcGVybWl0dGVkLlxuXAorcmVndWxhdGlvbnMgYW5kIHBvbGljaWVzIGNvbmNlcm5pbmcgdGhlIGltcG9ydCwgcG9zc2Vzc2lvbiwgb3IgdXNlLCBhbmRcblwKK3JlLWV4cG9ydCBvZiBlbmNyeXB0aW9uIHNvZnR3YXJlLCB0byBzZWUgaWYgdGhpcyBpcyBwZXJtaXR0ZWQuXG5cCiBcblwKLUphdmEgYW5kIGFsbCBKYXZhLWJhc2VkIHRyYWRlbWFya3MgYXJlIHRyYWRlbWFya3Mgb2YgU3VuIE1pY3Jvc3lzdGVtcywgSW5jLiBpbiB0aGUgVW5pdGVkIFN0YXRlcywgb3RoZXIgY291bnRyaWVzLCBvciBib3RoLlxuCitKYXZhIGFuZCBhbGwgSmF2YS1iYXNlZCB0cmFkZW1hcmtzIGFyZSB0cmFkZW1hcmtzIG9mIE9yYWNsZSBDb3Jwb3JhdGlvbiBpbiB0aGUgVW5pdGVkIFN0YXRlcywgb3RoZXIgY291bnRyaWVzLCBvciBib3RoLlxuCiAjIyMjIyMjIyMjIyBlbmQgb2YgbGljZW5zZSBwcm9wZXJ0eSAjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMKZGlmZiAtLWdpdCBhL2ZlYXR1cmVzL29yZy5lY2xpcHNlLndzdC5jb21tb25fdWkuZmVhdHVyZS9mZWF0dXJlLnhtbCBiL2ZlYXR1cmVzL29yZy5lY2xpcHNlLndzdC5jb21tb25fdWkuZmVhdHVyZS9mZWF0dXJlLnhtbAppbmRleCA2ZWIyY2Y5Li43YjFhY2Y1IDEwMDY0NAotLS0gYS9mZWF0dXJlcy9vcmcuZWNsaXBzZS53c3QuY29tbW9uX3VpLmZlYXR1cmUvZmVhdHVyZS54bWwKKysrIGIvZmVhdHVyZXMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbl91aS5mZWF0dXJlL2ZlYXR1cmUueG1sCkBAIC0yLDcgKzIsNyBAQAogPGZlYXR1cmUKICAgICAgIGlkPSJvcmcuZWNsaXBzZS53c3QuY29tbW9uX3VpLmZlYXR1cmUiCiAgICAgICBsYWJlbD0iJWZlYXR1cmVOYW1lIgotICAgICAgdmVyc2lvbj0iMy4wLjAucXVhbGlmaWVyIgorICAgICAgdmVyc2lvbj0iMy4yLjEucXVhbGlmaWVyIgogICAgICAgcHJvdmlkZXItbmFtZT0iJXByb3ZpZGVyTmFtZSI+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+PC9wPgogPC9ib2R5PgogPC9odG1sPgpkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS5qZW0udXRpbC8uY3ZzaWdub3JlIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS5qZW0udXRpbC8uY3ZzaWdub3JlCmluZGV4IGUwNDNjYzQuLjI4ZWJkYzUgMTAwNjQ0Ci0tLSBhL3BsdWdpbnMvb3JnLmVjbGlwc2UuamVtLnV0aWwvLmN2c2lnbm9yZQorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLmplbS51dGlsLy5jdnNpZ25vcmUKQEAgLTEsMyArMSw1IEBACiBiaW4KIGJ1aWxkLnhtbAogamF2YUNvbXBpbGVyLi4uYXJncworQGRvdAordGVtcC5mb2xkZXIKZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2UuamVtLnV0aWwvTUVUQS1JTkYvTUFOSUZFU1QuTUYgYi9wbHVnaW5zL29yZy5lY2xpcHNlLmplbS51dGlsL01FVEEtSU5GL01BTklGRVNULk1GCmluZGV4IDdkODUxYmEuLjFjZmU3ZDMgMTAwNjQ0Ci0tLSBhL3BsdWdpbnMvb3JnLmVjbGlwc2UuamVtLnV0aWwvTUVUQS1JTkYvTUFOSUZFU1QuTUYKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS5qZW0udXRpbC9NRVRBLUlORi9NQU5JRkVTVC5NRgpAQCAtMiw3ICsyLDcgQEAKIEJ1bmRsZS1NYW5pZmVzdFZlcnNpb246IDIKIEJ1bmRsZS1OYW1lOiAlcGx1Z2luTmFtZQogQnVuZGxlLVN5bWJvbGljTmFtZTogb3JnLmVjbGlwc2UuamVtLnV0aWw7IHNpbmdsZXRvbjo9dHJ1ZQotQnVuZGxlLVZlcnNpb246IDIuMC4xMDAucXVhbGlmaWVyCitCdW5kbGUtVmVyc2lvbjogMi4xLjEucXVhbGlmaWVyCiBCdW5kbGUtQWN0aXZhdG9yOiBvcmcuZWNsaXBzZS5qZW0udXRpbC5wbHVnaW4uSkVNVXRpbFBsdWdpbgogQnVuZGxlLVZlbmRvcjogJXByb3ZpZGVyTmFtZQogQnVuZGxlLUxvY2FsaXphdGlvbjogcGx1Z2luCkBAIC0yMCw3ICsyMCw4IEBACiAgb3JnLmVjbGlwc2UuY29yZS5yZXNvdXJjZXM7YnVuZGxlLXZlcnNpb249IlszLjQuMCw0LjAuMCkiLAogIG9yZy5lY2xpcHNlLmVtZi5lY29yZTtidW5kbGUtdmVyc2lvbj0iWzIuNC4wLDMuMC4wKSIsCiAgb3JnLmVjbGlwc2UuZW1mLmVjb3JlLnhtaTtidW5kbGUtdmVyc2lvbj0iWzIuNC4wLDMuMC4wKSIsCi0gb3JnLmVjbGlwc2UucGVyZm1zci5jb3JlO2J1bmRsZS12ZXJzaW9uPSIxLjAuMCI7cmVzb2x1dGlvbjo9b3B0aW9uYWwsCi0gY29tLmlibS5pY3U7YnVuZGxlLXZlcnNpb249IlszLjguMS4xLDQuMC4wKSIKKyBjb20uaWJtLmljdTtidW5kbGUtdmVyc2lvbj0iMy44LjEiLAorIG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29yZTtidW5kbGUtdmVyc2lvbj0iWzEuMS4yMDEsMi4wLjApIjt2aXNpYmlsaXR5Oj1yZWV4cG9ydAogRWNsaXBzZS1MYXp5U3RhcnQ6IHRydWUKIEJ1bmRsZS1SZXF1aXJlZEV4ZWN1dGlvbkVudmlyb25tZW50OiBKMlNFLTEuNQorQnVuZGxlLUFjdGl2YXRpb25Qb2xpY3k6IGxhenkKZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2UuamVtLnV0aWwvUEVSRk1TUl9SRUFETUUudHh0IGIvcGx1Z2lucy9vcmcuZWNsaXBzZS5qZW0udXRpbC9QRVJGTVNSX1JFQURNRS50eHQKaW5kZXggZWE1MTI1OC4uOTkwZTJkZiAxMDA2NDQKLS0tIGEvcGx1Z2lucy9vcmcuZWNsaXBzZS5qZW0udXRpbC9QRVJGTVNSX1JFQURNRS50eHQKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS5qZW0udXRpbC9QRVJGTVNSX1JFQURNRS50eHQKQEAgLTksNCArOSwxNiBAQAogCiBUaGUgamFyIGlzIGluIHRoaXMgcHJvamVjdCdzIGNsYXNzcGF0aCwgYnV0IGl0IGlzIG5vdCBleHBvcnRlZCBhbmQgaXMgbm90IGluCiB0aGUgcGx1Z2luLnhtbCBvciBidWlsZC5wcm9wZXJ0aWVzLiBUaGlzIG1lYW5zIGl0IHdpbGwgYmUgYXZhaWxhYmxlIGZvciBjb21waWxhdGlvbgotYnV0IGl0IHdvbid0IHNob3cgdXAgaW4gdGhlIHJ1bnRpbWUgd29ya2JlbmNoLgpcIE5vIG5ld2xpbmUgYXQgZW5kIG9mIGZpbGUKK2J1dCBpdCB3b24ndCBzaG93IHVwIGluIHRoZSBydW50aW1lIHdvcmtiZW5jaC4KKworMDUvMTMvMjAwOSBTZWUgYnVnIDI3NDUzNCAiQ2FuIHdlIHJlbW92ZSBvcmcuZWNsaXBzZS5wZXJmbXNyLmNvcmUiCitOb3RlOiB0aGUgb3B0aW9uYWwgcHJlcmVxLCAKKyBvcmcuZWNsaXBzZS5wZXJmbXNyLmNvcmU7YnVuZGxlLXZlcnNpb249IjEuMC4wIjtyZXNvbHV0aW9uOj1vcHRpb25hbCwKK3dhcyByZW1vdmVkIHNpbmNlIGl0IHdhcyBjb25mdXNpbmcgdG8gYnVpbGQgb3IgcmVsZW5nIHRlYW1zLCB3aG8gd2FudCB0byBtYWtlIAorc3VyZSB0aGV5IF9jb3VsZF8gZ2V0IGFsbCB0aGUgYnVuZGxlcywgb3B0aW9uYWwgb3Igbm90LCBpZiB0aGV5IHdhbnRlZCB0by4gCitXaGVyZWFzIHRoaXMgamFyIGlzIG1vcmUgZm9yIGRpYWdub3Npbmcgb3IgY2hlY2tpbmcgcGVyZm9ybWFuY2UgaXNzdWVzIC4uLiBub3RoaW5nIAordGhhdCBpcyBkb25lIGFueSBsb25nZXIgb24gdGhpcyBjb2RlLiBUaGUgY29kZSBpdHNlbGYgaGFzbid0IGJlZW4gY2hhbmdlZCwgc28gc2hvdWxkIGJlIAorZWFzeSB0byByZXN1cmVjdCBpZiBldmVyIHJlcXVpcmVkIGluIHRoZSBmdXR1cmUuIElmIHRoaXMgY29kZSBpcyBldmVyIGNoYW5nZWQgZHJhc3RpY2FsbHksIAorc3VjaCBhcyByZWZhY3RvcmVkLCBJJ20gbm90IHN1cmUgdGhlIG9sZCBwZXJmb3JtYW5jZSBtZWFzdXJlbWVudCBjb2RlIG5lZWRzIHRvIGJlIGNhcnJpZWQgCitmb3J3YXJkLCBhcyBJIHRoaW5rIHRoZXJlIGFyZSBuZXdlciBtZXRob2RzIG9mIGRvaW5nIHNpbWlsYXIgdGhpbmdzLCB0aGF0IHdvdWxkbid0IHJlcXVpcmUKK2EgImRldmVsb3BtZW50IHRpbWUgb25seSIgYnVuZGxlIGFzIGFuIG9wdGlvbmFsIHByZS1yZXEuICAKZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2UuamVtLnV0aWwvamVtdXRpbC1ub253b3JrYm5lY2gvb3JnL2VjbGlwc2UvamVtL3V0aWwvbG9nZ2VyL0xvZ0VudHJ5LmphdmEgYi9wbHVnaW5zL29yZy5lY2xpcHNlLmplbS51dGlsL2plbXV0aWwtbm9ud29ya2JuZWNoL29yZy9lY2xpcHNlL2plbS91dGlsL2xvZ2dlci9Mb2dFbnRyeS5qYXZhCmluZGV4IGY1MGJhZTcuLmM3OTcyZjAgMTAwNjQ0Ci0tLSBhL3BsdWdpbnMvb3JnLmVjbGlwc2UuamVtLnV0aWwvamVtdXRpbC1ub253b3JrYm5lY2gvb3JnL2VjbGlwc2UvamVtL3V0aWwvbG9nZ2VyL0xvZ0VudHJ5LmphdmEKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS5qZW0udXRpbC9qZW11dGlsLW5vbndvcmtibmVjaC9vcmcvZWNsaXBzZS9qZW0vdXRpbC9sb2dnZXIvTG9nRW50cnkuamF2YQpAQCAtMTgsNiArMTgsNyBAQAogaW1wb3J0IGphdmEuaW8uUHJpbnRXcml0ZXI7CiAKIC8qKgorICogQGRlcHJlY2F0ZWQgUGx1Z2luIGVycm9yIGxvZ2dpbmcgc2hvdWxkIGJlIHVzZWQgaW5zdGVhZAogICogVGhpcyBjbGFzcyBzaG91bGQgYmUgdXNlZCB3aGVuIGxvZ2dpbmcgaW5mb3JtYXRpb24gd2hpY2ggc2hvdWxkIGJlIGdyb3VwZWQgdG9nZXRoZXIuIEluc3RlYWQgb2YgY3JlYXRpbmcgYSBuZXcgaW5zdGFuY2Ugb2YgdGhpcyBjbGFzcyBldmVyeSB0aW1lIGl0CiAgKiBpcyBuZWVkZWQsIGZvciBwZXJmb3JtYW5jZSByZWFzb25zLCBjcmVhdGUgYW4gaW5zdGFuY2UgYW5kIHJldXNlIGl0LgogICogPHA+CmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLmplbS51dGlsL2plbXV0aWwtbm9ud29ya2JuZWNoL29yZy9lY2xpcHNlL2plbS91dGlsL2xvZ2dlci9wcm94eS9JTG9nUmVuZGVyZXIuamF2YSBiL3BsdWdpbnMvb3JnLmVjbGlwc2UuamVtLnV0aWwvamVtdXRpbC1ub253b3JrYm5lY2gvb3JnL2VjbGlwc2UvamVtL3V0aWwvbG9nZ2VyL3Byb3h5L0lMb2dSZW5kZXJlci5qYXZhCmluZGV4IDVkMWU5NTEuLjMyN2ZkYTEgMTAwNjQ0Ci0tLSBhL3BsdWdpbnMvb3JnLmVjbGlwc2UuamVtLnV0aWwvamVtdXRpbC1ub253b3JrYm5lY2gvb3JnL2VjbGlwc2UvamVtL3V0aWwvbG9nZ2VyL3Byb3h5L0lMb2dSZW5kZXJlci5qYXZhCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2UuamVtLnV0aWwvamVtdXRpbC1ub253b3JrYm5lY2gvb3JnL2VjbGlwc2UvamVtL3V0aWwvbG9nZ2VyL3Byb3h5L0lMb2dSZW5kZXJlci5qYXZhCkBAIC0xNSw2ICsxNSw3IEBACiBwYWNrYWdlIG9yZy5lY2xpcHNlLmplbS51dGlsLmxvZ2dlci5wcm94eTsKIAogLyoqCisgKiBAZGVwcmVjYXRlZCBQbHVnaW4gZXJyb3IgbG9nZ2luZyBzaG91bGQgYmUgdXNlZCBpbnN0ZWFkCiAgKiBCYXNpYyBsb2cgcmVuZGVyZXIgaW50ZXJmYWNlLiBJdCBpcyByZXBsYWNlZCBieSB0aGUgZXh0ZW5zaW9uIDxjb2RlPklMb2dSZW5kZXJlcjIuPC9jb2RlPgogICogCiAgKiBAc2luY2UgMS4wLjAKZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2UuamVtLnV0aWwvamVtdXRpbC1ub253b3JrYm5lY2gvb3JnL2VjbGlwc2UvamVtL3V0aWwvbG9nZ2VyL3Byb3h5L0lMb2dSZW5kZXJlcjIuamF2YSBiL3BsdWdpbnMvb3JnLmVjbGlwc2UuamVtLnV0aWwvamVtdXRpbC1ub253b3JrYm5lY2gvb3JnL2VjbGlwc2UvamVtL3V0aWwvbG9nZ2VyL3Byb3h5L0lMb2dSZW5kZXJlcjIuamF2YQppbmRleCBmNWE2NzBmLi4zZjdiMTNjIDEwMDY0NAotLS0gYS9wbHVnaW5zL29yZy5lY2xpcHNlLmplbS51dGlsL2plbXV0aWwtbm9ud29ya2JuZWNoL29yZy9lY2xpcHNlL2plbS91dGlsL2xvZ2dlci9wcm94eS9JTG9nUmVuZGVyZXIyLmphdmEKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS5qZW0udXRpbC9qZW11dGlsLW5vbndvcmtibmVjaC9vcmcvZWNsaXBzZS9qZW0vdXRpbC9sb2dnZXIvcHJveHkvSUxvZ1JlbmRlcmVyMi5qYXZhCkBAIC0xNyw2ICsxNyw3IEBACiBpbXBvcnQgamF2YS51dGlsLmxvZ2dpbmcuTGV2ZWw7CiAgCiAvKioKKyAqIEBkZXByZWNhdGVkIFBsdWdpbiBlcnJvciBsb2dnaW5nIHNob3VsZCBiZSB1c2VkIGluc3RlYWQKICAqIExvZyByZW5kZXJlciB0aGF0IHByb3ZpZGVzIG1vcmUgZnVuY3Rpb24uIEJhc2ljYWxseSBpdCBjYW4gaGFuZGxlCiAgKiB0aGUgbG9nZ2luZyBvZiBzcGVjaWZpYyB0eXBlcyBpbiBhIGRpZmZlcmVudCBtYW5uZXIgdGhhbiB0aGUgZGVmYXVsdAogICogY29udmVyc2lvbiB0byBzdHJpbmcgc3VwcGxpZWQgYnkgTG9nZ2VyLgpkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS5qZW0udXRpbC9qZW11dGlsLW5vbndvcmtibmVjaC9vcmcvZWNsaXBzZS9qZW0vdXRpbC9sb2dnZXIvcHJveHkvSkRLQ29uc29sZVJlbmRlcmVyLmphdmEgYi9wbHVnaW5zL29yZy5lY2xpcHNlLmplbS51dGlsL2plbXV0aWwtbm9ud29ya2JuZWNoL29yZy9lY2xpcHNlL2plbS91dGlsL2xvZ2dlci9wcm94eS9KREtDb25zb2xlUmVuZGVyZXIuamF2YQppbmRleCBjN2M5ZDc1Li5mNGEzOTZmIDEwMDY0NAotLS0gYS9wbHVnaW5zL29yZy5lY2xpcHNlLmplbS51dGlsL2plbXV0aWwtbm9ud29ya2JuZWNoL29yZy9lY2xpcHNlL2plbS91dGlsL2xvZ2dlci9wcm94eS9KREtDb25zb2xlUmVuZGVyZXIuamF2YQorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLmplbS51dGlsL2plbXV0aWwtbm9ud29ya2JuZWNoL29yZy9lY2xpcHNlL2plbS91dGlsL2xvZ2dlci9wcm94eS9KREtDb25zb2xlUmVuZGVyZXIuamF2YQpAQCAtMTcsNiArMTcsNyBAQAogaW1wb3J0IGphdmEudXRpbC5sb2dnaW5nLkxldmVsOwogCiAvKioKKyAqIEBkZXByZWNhdGVkIFBsdWdpbiBlcnJvciBsb2dnaW5nIHNob3VsZCBiZSB1c2VkIGluc3RlYWQKICAqIERlZmF1bHQgbG9nIHJlbmRlcmVyIHRvIHVzZSB3aGVuIG5vdCBydW5uaW5nIHVuZGVyIEVjbGlwc2UuIEl0IGxvZ3MgdG8gc3lzb3V0IGFuZCBzeXNlcnIuCiAgKiAKICAqIEBzaW5jZSAxLjEuMApkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS5qZW0udXRpbC9qZW11dGlsLW5vbndvcmtibmVjaC9vcmcvZWNsaXBzZS9qZW0vdXRpbC9sb2dnZXIvcHJveHkvTG9nZ2VyLmphdmEgYi9wbHVnaW5zL29yZy5lY2xpcHNlLmplbS51dGlsL2plbXV0aWwtbm9ud29ya2JuZWNoL29yZy9lY2xpcHNlL2plbS91dGlsL2xvZ2dlci9wcm94eS9Mb2dnZXIuamF2YQppbmRleCBiODZhZDA1Li43NzlkOTYzIDEwMDY0NAotLS0gYS9wbHVnaW5zL29yZy5lY2xpcHNlLmplbS51dGlsL2plbXV0aWwtbm9ud29ya2JuZWNoL29yZy9lY2xpcHNlL2plbS91dGlsL2xvZ2dlci9wcm94eS9Mb2dnZXIuamF2YQorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLmplbS51dGlsL2plbXV0aWwtbm9ud29ya2JuZWNoL29yZy9lY2xpcHNlL2plbS91dGlsL2xvZ2dlci9wcm94eS9Mb2dnZXIuamF2YQpAQCAtMjAsNiArMjAsNyBAQAogaW1wb3J0IGphdmEudXRpbC5sb2dnaW5nLkxldmVsOwogCiAvKioKKyAqIEBkZXByZWNhdGVkIFBsdWdpbiBlcnJvciBsb2dnaW5nIHNob3VsZCBiZSB1c2VkIGluc3RlYWQKICAqIFRoaXMgaXMgYSBiYXNlLCBVSSBpbmRlcGVuZGVudCBsb2dnZXIuICAgSXQgd2lsbAogICogY29uc3RydWN0IGEgY29uc2lzdGVudCBtc2cuIGJvZHksIGFuZCBjYWxsIGFuIGVuZmlyb25tZW50IHNwZWNpZmljIElMb2dSZW5kZXJlci4KICAqIEJ5IGRlZmF1bHQsIHRoaXMgbG9nZ2VyIHdpbGwgdXNlIGEgY29uc29sZSBiYXNlZCBJTG9nUmVuZGVyZXIsCmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLmplbS51dGlsL2plbXV0aWwvb3JnL2VjbGlwc2UvamVtL2ludGVybmFsL3V0aWwvZW1mL3dvcmtiZW5jaC9Qcm9qZWN0UmVzb3VyY2VTZXRJbXBsLmphdmEgYi9wbHVnaW5zL29yZy5lY2xpcHNlLmplbS51dGlsL2plbXV0aWwvb3JnL2VjbGlwc2UvamVtL2ludGVybmFsL3V0aWwvZW1mL3dvcmtiZW5jaC9Qcm9qZWN0UmVzb3VyY2VTZXRJbXBsLmphdmEKaW5kZXggYjQzNjhkNC4uNTI1MGI1NCAxMDA2NDQKLS0tIGEvcGx1Z2lucy9vcmcuZWNsaXBzZS5qZW0udXRpbC9qZW11dGlsL29yZy9lY2xpcHNlL2plbS9pbnRlcm5hbC91dGlsL2VtZi93b3JrYmVuY2gvUHJvamVjdFJlc291cmNlU2V0SW1wbC5qYXZhCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2UuamVtLnV0aWwvamVtdXRpbC9vcmcvZWNsaXBzZS9qZW0vaW50ZXJuYWwvdXRpbC9lbWYvd29ya2JlbmNoL1Byb2plY3RSZXNvdXJjZVNldEltcGwuamF2YQpAQCAtMTAsNyArMTAsNyBAQAogICoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKiovCiAvKgogICogICQkUkNTZmlsZTogUHJvamVjdFJlc291cmNlU2V0SW1wbC5qYXZhLHYgJCQKLSAqICAkJFJldmlzaW9uOiAxLjIxICQkICAkJERhdGU6IDIwMDgvMDQvMjEgMTQ6NTA6MTYgJCQgCisgKiAgJCRSZXZpc2lvbjogMS4zMiAkJCAgJCREYXRlOiAyMDEwLzA3LzI5IDE4OjIwOjM0ICQkIAogICovCiBwYWNrYWdlIG9yZy5lY2xpcHNlLmplbS5pbnRlcm5hbC51dGlsLmVtZi53b3JrYmVuY2g7CiAKQEAgLTIwLDggKzIwLDEyIEBACiBpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5yZXNvdXJjZXMuKjsKIGltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJ1bnRpbWUuKjsKIGltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJ1bnRpbWUuY29udGVudC5JQ29udGVudERlc2NyaXB0aW9uOworaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucnVudGltZS5qb2JzLklMb2NrOworaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucnVudGltZS5qb2JzLkpvYjsKK2ltcG9ydCBvcmcuZWNsaXBzZS5lbWYuY29tbW9uLm5vdGlmeS5BZGFwdGVyOwogaW1wb3J0IG9yZy5lY2xpcHNlLmVtZi5jb21tb24ubm90aWZ5Lk5vdGlmaWNhdGlvbjsKIGltcG9ydCBvcmcuZWNsaXBzZS5lbWYuY29tbW9uLm5vdGlmeS5pbXBsLk5vdGlmaWNhdGlvbkltcGw7CitpbXBvcnQgb3JnLmVjbGlwc2UuZW1mLmNvbW1vbi51dGlsLkVMaXN0OwogaW1wb3J0IG9yZy5lY2xpcHNlLmVtZi5jb21tb24udXRpbC5VUkk7CiBpbXBvcnQgb3JnLmVjbGlwc2UuZW1mLmVjb3JlLkVPYmplY3Q7CiBpbXBvcnQgb3JnLmVjbGlwc2UuZW1mLmVjb3JlLnJlc291cmNlLio7CkBAIC00MiwxMCArNDYsMzE1IEBACiAJCXB1YmxpYyBzdGF0aWMgZmluYWwgaW50IE1PRFVMRV9OQU1FX0lORFggPSAyOwogCQlwdWJsaWMgc3RhdGljIGZpbmFsIGludCBDT05URU5UX1RZUEVfSU5EWCA9IDM7CiAJfQorCQorCXB1YmxpYyBjbGFzcyBTeW5jaHJvbml6ZWRSZXNvdXJjZXNFTGlzdDxFIGV4dGVuZHMgT2JqZWN0ICYgUmVzb3VyY2U+IGV4dGVuZHMgUmVzb3VyY2VzRUxpc3Q8RT4gaW1wbGVtZW50cyBFTGlzdDxFPiB7CisKKwkJLyoqCisJCSAqIAorCQkgKi8KKwkJcHJpdmF0ZSBzdGF0aWMgZmluYWwgbG9uZyBzZXJpYWxWZXJzaW9uVUlEID0gMUw7CisJCXByaXZhdGUgZmluYWwgSUxvY2sgbG9jayA9IEpvYi5nZXRKb2JNYW5hZ2VyKCkubmV3TG9jaygpOworCisJCXB1YmxpYyB2b2lkIGNvcHlJbnRvKExpc3QgbGlzdCl7CisJCQl0cnkgeworCQkJCWxvY2suYWNxdWlyZSgpOworCQkJCWxpc3QuYWRkQWxsKHRoaXMpOworCQkJfSBmaW5hbGx5IHsKKwkJCQlsb2NrLnJlbGVhc2UoKTsKKwkJCX0KKwkJfQorCQkKKwkJcHVibGljIHZvaWQgbW92ZShpbnQgbmV3UG9zaXRpb24sIEUgb2JqZWN0KSB7CisJCQkKKwkJCXRyeSB7CisJCQkJbG9jay5hY3F1aXJlKCk7CisJCQkJc3VwZXIubW92ZShuZXdQb3NpdGlvbiwgb2JqZWN0KTsKKwkJCX0gZmluYWxseSB7CisJCQkJbG9jay5yZWxlYXNlKCk7CisJCQl9CisJCX0KKworCQlwdWJsaWMgRSBtb3ZlKGludCBuZXdQb3NpdGlvbiwgaW50IG9sZFBvc2l0aW9uKSB7CisKKwkJCXRyeSB7CisJCQkJbG9jay5hY3F1aXJlKCk7CisJCQkJcmV0dXJuIHN1cGVyLm1vdmUobmV3UG9zaXRpb24sIG9sZFBvc2l0aW9uKTsKKwkJCX0gZmluYWxseSB7CisJCQkJbG9jay5yZWxlYXNlKCk7CisJCQl9CisJCX0KKworCQlwdWJsaWMgYm9vbGVhbiBhZGQoRSBvKSB7CisJCQkKKwkJCXRyeSB7CisJCQkJbG9jay5hY3F1aXJlKCk7CisJCQkJcmV0dXJuIHN1cGVyLmFkZChvKTsKKwkJCX0gZmluYWxseSB7CisJCQkJbG9jay5yZWxlYXNlKCk7CisJCQl9CisJCX0KKworCQlwdWJsaWMgdm9pZCBhZGQoaW50IGluZGV4LCBFIGVsZW1lbnQpIHsKKwkJCQorCQkJdHJ5IHsKKwkJCQlsb2NrLmFjcXVpcmUoKTsKKwkJCQlzdXBlci5hZGQoaW5kZXgsIGVsZW1lbnQpOworCQkJfSBmaW5hbGx5IHsKKwkJCQlsb2NrLnJlbGVhc2UoKTsKKwkJCX0KKwkJfQorCisJCXB1YmxpYyBib29sZWFuIGFkZEFsbChDb2xsZWN0aW9uPD8gZXh0ZW5kcyBFPiBjKSB7CisJCQkKKwkJCXRyeSB7CisJCQkJbG9jay5hY3F1aXJlKCk7CisJCQkJcmV0dXJuIHN1cGVyLmFkZEFsbChjKTsKKwkJCX0gZmluYWxseSB7CisJCQkJbG9jay5yZWxlYXNlKCk7CisJCQl9CisJCX0KKworCQlwdWJsaWMgYm9vbGVhbiBhZGRBbGwoaW50IGluZGV4LCBDb2xsZWN0aW9uPD8gZXh0ZW5kcyBFPiBjKSB7CisJCQkKKwkJCXRyeSB7CisJCQkJbG9jay5hY3F1aXJlKCk7CisJCQkJcmV0dXJuIHN1cGVyLmFkZEFsbChpbmRleCwgYyk7CisJCQl9IGZpbmFsbHkgeworCQkJCWxvY2sucmVsZWFzZSgpOworCQkJfQorCQl9CisKKwkJcHVibGljIHZvaWQgY2xlYXIoKSB7CisJCQkKKwkJCXRyeSB7CisJCQkJbG9jay5hY3F1aXJlKCk7CisJCQkJc3VwZXIuY2xlYXIoKTsKKwkJCX0gZmluYWxseSB7CisJCQkJbG9jay5yZWxlYXNlKCk7CisJCQl9CisJCX0KKworCQlwdWJsaWMgYm9vbGVhbiBjb250YWlucyhPYmplY3QgbykgeworCQkJCisJCQl0cnkgeworCQkJCWxvY2suYWNxdWlyZSgpOworCQkJCXJldHVybiBzdXBlci5jb250YWlucyhvKTsKKwkJCX0gZmluYWxseSB7CisJCQkJbG9jay5yZWxlYXNlKCk7CisJCQl9CisJCX0KKworCQlwdWJsaWMgYm9vbGVhbiBjb250YWluc0FsbChDb2xsZWN0aW9uPD8+IGMpIHsKKwkJCQorCQkJdHJ5IHsKKwkJCQlsb2NrLmFjcXVpcmUoKTsKKwkJCQlyZXR1cm4gc3VwZXIuY29udGFpbnNBbGwoYyk7CisJCQl9IGZpbmFsbHkgeworCQkJCWxvY2sucmVsZWFzZSgpOworCQkJfQorCQl9CisKKwkJcHVibGljIGJvb2xlYW4gZXF1YWxzKE9iamVjdCBvKSB7CisJCQkKKwkJCXRyeSB7CisJCQkJbG9jay5hY3F1aXJlKCk7CisJCQkJcmV0dXJuIHN1cGVyLmVxdWFscyhvKTsKKwkJCX0gZmluYWxseSB7CisJCQkJbG9jay5yZWxlYXNlKCk7CisJCQl9CisJCX0KKworCQlwdWJsaWMgRSBnZXQoaW50IGluZGV4KSB7CisJCQkKKwkJCXRyeSB7CisJCQkJbG9jay5hY3F1aXJlKCk7CisJCQkJcmV0dXJuIHN1cGVyLmdldChpbmRleCk7CisJCQl9IGZpbmFsbHkgeworCQkJCWxvY2sucmVsZWFzZSgpOworCQkJfQorCQl9CisKKwkJcHVibGljIGludCBoYXNoQ29kZSgpIHsKKwkJCQorCQkJdHJ5IHsKKwkJCQlsb2NrLmFjcXVpcmUoKTsKKwkJCQlyZXR1cm4gc3VwZXIuaGFzaENvZGUoKTsKKwkJCX0gZmluYWxseSB7CisJCQkJbG9jay5yZWxlYXNlKCk7CisJCQl9CisJCX0KKworCQlwdWJsaWMgaW50IGluZGV4T2YoT2JqZWN0IG8pIHsKKwkJCQorCQkJdHJ5IHsKKwkJCQlsb2NrLmFjcXVpcmUoKTsKKwkJCQlyZXR1cm4gc3VwZXIuaW5kZXhPZihvKTsKKwkJCX0gZmluYWxseSB7CisJCQkJbG9jay5yZWxlYXNlKCk7CisJCQl9CisJCX0KKworCQlwdWJsaWMgYm9vbGVhbiBpc0VtcHR5KCkgeworCQkJCisJCQl0cnkgeworCQkJCWxvY2suYWNxdWlyZSgpOworCQkJCXJldHVybiBzdXBlci5pc0VtcHR5KCk7CisJCQl9IGZpbmFsbHkgeworCQkJCWxvY2sucmVsZWFzZSgpOworCQkJfQorCQl9CisKKwkJcHVibGljIEl0ZXJhdG9yPEU+IGl0ZXJhdG9yKCkgeworCQkJCisJCQl0cnkgeworCQkJCWxvY2suYWNxdWlyZSgpOworCQkJCXJldHVybiBzdXBlci5pdGVyYXRvcigpOworCQkJfSBmaW5hbGx5IHsKKwkJCQlsb2NrLnJlbGVhc2UoKTsKKwkJCX0KKwkJfQorCisJCXB1YmxpYyBpbnQgbGFzdEluZGV4T2YoT2JqZWN0IG8pIHsKKwkJCQorCQkJdHJ5IHsKKwkJCQlsb2NrLmFjcXVpcmUoKTsKKwkJCQlyZXR1cm4gc3VwZXIubGFzdEluZGV4T2Yobyk7CisJCQl9IGZpbmFsbHkgeworCQkJCWxvY2sucmVsZWFzZSgpOworCQkJfQorCQl9CisKKwkJcHVibGljIExpc3RJdGVyYXRvcjxFPiBsaXN0SXRlcmF0b3IoKSB7CisJCQkKKwkJCXRyeSB7CisJCQkJbG9jay5hY3F1aXJlKCk7CisJCQkJcmV0dXJuIHN1cGVyLmxpc3RJdGVyYXRvcigpOworCQkJfSBmaW5hbGx5IHsKKwkJCQlsb2NrLnJlbGVhc2UoKTsKKwkJCX0KKwkJfQorCisJCXB1YmxpYyBMaXN0SXRlcmF0b3I8RT4gbGlzdEl0ZXJhdG9yKGludCBpbmRleCkgeworCQkJCisJCQl0cnkgeworCQkJCWxvY2suYWNxdWlyZSgpOworCQkJCXJldHVybiBzdXBlci5saXN0SXRlcmF0b3IoaW5kZXgpOworCQkJfSBmaW5hbGx5IHsKKwkJCQlsb2NrLnJlbGVhc2UoKTsKKwkJCX0KKwkJfQorCisJCXB1YmxpYyBib29sZWFuIHJlbW92ZShPYmplY3QgbykgeworCQkJCisJCQl0cnkgeworCQkJCWxvY2suYWNxdWlyZSgpOworCQkJCXJldHVybiBzdXBlci5yZW1vdmUobyk7CisJCQl9IGZpbmFsbHkgeworCQkJCWxvY2sucmVsZWFzZSgpOworCQkJfQorCQl9CisKKwkJcHVibGljIEUgcmVtb3ZlKGludCBpbmRleCkgeworCQkJCisJCQl0cnkgeworCQkJCWxvY2suYWNxdWlyZSgpOworCQkJCXJldHVybiBzdXBlci5yZW1vdmUoaW5kZXgpOworCQkJfSBmaW5hbGx5IHsKKwkJCQlsb2NrLnJlbGVhc2UoKTsKKwkJCX0KKwkJfQorCisJCXB1YmxpYyBib29sZWFuIHJlbW92ZUFsbChDb2xsZWN0aW9uPD8+IGMpIHsKKwkJCQorCQkJdHJ5IHsKKwkJCQlsb2NrLmFjcXVpcmUoKTsKKwkJCQlyZXR1cm4gc3VwZXIucmVtb3ZlQWxsKGMpOworCQkJfSBmaW5hbGx5IHsKKwkJCQlsb2NrLnJlbGVhc2UoKTsKKwkJCX0KKwkJfQorCisJCXB1YmxpYyBib29sZWFuIHJldGFpbkFsbChDb2xsZWN0aW9uPD8+IGMpIHsKKwkJCQorCQkJdHJ5IHsKKwkJCQlsb2NrLmFjcXVpcmUoKTsKKwkJCQlyZXR1cm4gc3VwZXIucmV0YWluQWxsKGMpOworCQkJfSBmaW5hbGx5IHsKKwkJCQlsb2NrLnJlbGVhc2UoKTsKKwkJCX0KKwkJfQorCisJCXB1YmxpYyBFIHNldChpbnQgaW5kZXgsIEUgZWxlbWVudCkgeworCQkJCisJCQl0cnkgeworCQkJCWxvY2suYWNxdWlyZSgpOworCQkJCXJldHVybiBzdXBlci5zZXQoaW5kZXgsIGVsZW1lbnQpOworCQkJfSBmaW5hbGx5IHsKKwkJCQlsb2NrLnJlbGVhc2UoKTsKKwkJCX0KKwkJfQorCisJCXB1YmxpYyBpbnQgc2l6ZSgpIHsKKwkJCQorCQkJdHJ5IHsKKwkJCQlsb2NrLmFjcXVpcmUoKTsKKwkJCQlyZXR1cm4gc3VwZXIuc2l6ZSgpOworCQkJfSBmaW5hbGx5IHsKKwkJCQlsb2NrLnJlbGVhc2UoKTsKKwkJCX0KKwkJfQorCisJCXB1YmxpYyBMaXN0PEU+IHN1Ykxpc3QoaW50IGZyb21JbmRleCwgaW50IHRvSW5kZXgpIHsKKwkJCQorCQkJdHJ5IHsKKwkJCQlsb2NrLmFjcXVpcmUoKTsKKwkJCQlyZXR1cm4gc3VwZXIuc3ViTGlzdChmcm9tSW5kZXgsIHRvSW5kZXgpOworCQkJfSBmaW5hbGx5IHsKKwkJCQlsb2NrLnJlbGVhc2UoKTsKKwkJCX0KKwkJfQorCisJCXB1YmxpYyBPYmplY3RbXSB0b0FycmF5KCkgeworCQkJCisJCQl0cnkgeworCQkJCWxvY2suYWNxdWlyZSgpOworCQkJCXJldHVybiBzdXBlci50b0FycmF5KCk7CisJCQl9IGZpbmFsbHkgeworCQkJCWxvY2sucmVsZWFzZSgpOworCQkJfQorCQl9CisKKwkJcHVibGljIDxUPiBUW10gdG9BcnJheShUW10gYSkgeworCQkJCisJCQl0cnkgeworCQkJCWxvY2suYWNxdWlyZSgpOworCQkJCXJldHVybiBzdXBlci50b0FycmF5KGEpOworCQkJfSBmaW5hbGx5IHsKKwkJCQlsb2NrLnJlbGVhc2UoKTsKKwkJCX0KKwkJfQorCisJCS8vIHJlbGVhc2UgbG9jayBkdXJpbmcgbm90aWZpY2F0aW9ucworCQlwcm90ZWN0ZWQgdm9pZCBkaXNwYXRjaE5vdGlmaWNhdGlvbihOb3RpZmljYXRpb24gbm90aWZpY2F0aW9uKSB7CisKKwkJCWludCBsb2NrRGVwdGg7CisJCQlsb2NrRGVwdGggPSBsb2NrLmdldERlcHRoKCk7CisJCQl0cnkgeworCQkJCWZvcihpbnQgaT0wOyBpPGxvY2tEZXB0aDsgaSsrKQorICAgICAgICAgICAgICAgICAgICBsb2NrLnJlbGVhc2UoKTsKKwkJCQlzdXBlci5kaXNwYXRjaE5vdGlmaWNhdGlvbihub3RpZmljYXRpb24pOworCQkJfSBmaW5hbGx5IHsKKwkJCQlmb3IoaW50IGk9MDsgaTxsb2NrRGVwdGg7IGkrKykKKyAgICAgICAgICAgICAgICAgICAgbG9jay5hY3F1aXJlKCk7ICAvLyBSZS1hY3F1aXJlIGxvY2sgYWZ0ZXIgbm90aWZ5CisJCQl9CisJCX0KKworCX0KIAogCXByaXZhdGUgYm9vbGVhbiBpc1JlbGVhc2luZyA9IGZhbHNlOwogCXByaXZhdGUgSVByb2plY3QgcHJvamVjdDsKIAlwcm90ZWN0ZWQgTGlzdCByZXNvdXJjZUhhbmRsZXJzID0gbmV3IEFycmF5TGlzdCgpOworCXByaXZhdGUgT2JqZWN0IHJlc291cmNlc0xvY2sgPSBuZXcgT2JqZWN0KCk7CiAJcHJvdGVjdGVkIFJlc291cmNlU2V0V29ya2JlbmNoU3luY2hyb25pemVyIHN5bmNocm9uaXplcjsKIAlwcm90ZWN0ZWQgUHJvamVjdFJlc291cmNlU2V0SW1wbCgpIHsKIAkJc2V0VVJJUmVzb3VyY2VNYXAobmV3IEhhc2hNYXAoMTApKTsJLy8gVGVsbCBpdCB0byBjYWNoZSB1cmktPnJlc291cmNlIGFjY2Vzcy4KQEAgLTc3LDE2ICszODYsNTEgQEAKIAkJLy9DaGVjayB0aGUgbWFwIGZpcnN0IHdoZW4gY3JlYXRpbmcgdGhlIHJlc291cmNlIGFuZCBkbyBub3QKIAkJLy9ub3JtYWxpemUgaWYgYSB2YWx1ZSBpcyBmb3VuZC4KIAkJYm9vbGVhbiBpc01hcHBlZCA9IGRldGVjdFVSSU1hcHBpbmcodXJpKTsKLQkJYm9vbGVhbiBoYXNDb250ZW50VHlwZSA9IChnZXRDb250ZW50VHlwZU5hbWUodXJpKSAhPSBudWxsKTsKKwkJU3RyaW5nIGNvbnRlbnRUeXBlTmFtZSA9IGdldENvbnRlbnRUeXBlTmFtZSh1cmkpOworCQlib29sZWFuIGhhc0NvbnRlbnRUeXBlID0gKGNvbnRlbnRUeXBlTmFtZSAhPSBudWxsKTsKIAkJVVJJIGNvbnZlcnRlZCA9IHVyaTsKIAkJaWYgKCFpc01hcHBlZCkKIAkJCWNvbnZlcnRlZCA9IGdldFVSSUNvbnZlcnRlcigpLm5vcm1hbGl6ZSh1cmkpOwogCQllbHNlIGlmIChoYXNDb250ZW50VHlwZSkKIAkJCWNvbnZlcnRlZCA9IGdldFVSSUNvbnZlcnRlcigpLm5vcm1hbGl6ZSh1cmkpOwogCQkKKwkJaWYgKCFoYXNDb250ZW50VHlwZSkgey8vIENoZWNrIGlmIGFjdHVhbCBwcm9qZWN0IGZpbGUgZXhpc3RzLCBhbmQgY2FuIGRldGVybWluZSBjb250ZW50dHlwZQorCQkJSUNvbnRlbnREZXNjcmlwdGlvbiBkZXNjcmlwdGlvbiA9IG51bGw7CisJCQlJRmlsZSBmaWxlID0gV29ya2JlbmNoUmVzb3VyY2VIZWxwZXJCYXNlLmdldElGaWxlKHVyaSk7CisJCQlpZiAoZmlsZSAhPSBudWxsICYmIGZpbGUuZXhpc3RzKCkpIHsKKwkJCQl0cnkgeworCQkJCQlkZXNjcmlwdGlvbiA9IGZpbGUuZ2V0Q29udGVudERlc2NyaXB0aW9uKCk7CisJCQkJCWlmIChkZXNjcmlwdGlvbiAhPSBudWxsKQorCQkJCQkJY29udGVudFR5cGVOYW1lID0gZGVzY3JpcHRpb24uZ2V0Q29udGVudFR5cGUoKS5nZXRJZCgpOworCQkJCX0gY2F0Y2ggKENvcmVFeGNlcHRpb24gZSkgeworCQkJCQlKRU1VdGlsUGx1Z2luLmdldExvZ2dlcigpLmxvZ0Vycm9yKGUpOworCQkJCX0KKwkJCX0gZWxzZSB7Ly8gTm93IGNoZWNrIGlmIHVyaSBjb250YWlucyBwcm9qZWN0LCB0aGVuIGFkZCBpZiBuZWVkZWQKKwkJCQlVUklDb252ZXJ0ZXIgY29udmVydGVyID0gZ2V0VVJJQ29udmVydGVyKCk7CisJCQkJVVJJIGNvbnZlcnRlZFVyaSA9IGNvbnZlcnRlci5ub3JtYWxpemUodXJpKTsKKwkJCQlpZiAoIXVyaS5lcXVhbHMoY29udmVydGVkVXJpKSkgeworCQkJCQlmaWxlID0gV29ya2JlbmNoUmVzb3VyY2VIZWxwZXJCYXNlLmdldElGaWxlKGNvbnZlcnRlZFVyaSk7CisJCQkJCWlmIChmaWxlICE9IG51bGwgJiYgZmlsZS5leGlzdHMoKSkgeworCQkJCQkJdHJ5IHsKKwkJCQkJCQlkZXNjcmlwdGlvbiA9IGZpbGUuZ2V0Q29udGVudERlc2NyaXB0aW9uKCk7CisJCQkJCQkJaWYgKGRlc2NyaXB0aW9uICE9IG51bGwpCisJCQkJCQkJCWNvbnRlbnRUeXBlTmFtZSA9IGRlc2NyaXB0aW9uLmdldENvbnRlbnRUeXBlKCkuZ2V0SWQoKTsKKwkJCQkJCX0gY2F0Y2ggKENvcmVFeGNlcHRpb24gZSkgeworCQkJCQkJCUpFTVV0aWxQbHVnaW4uZ2V0TG9nZ2VyKCkubG9nRXJyb3IoZSk7CisJCQkJCQl9CisJCQkJCX0KKwkJCQl9CisJCQl9CisJCX0KKwkJCQorCQkKKwkJCiAJCVJlc291cmNlIHJlc3VsdCA9IGNyZWF0ZVJlc291cmNlRnJvbUhhbmRsZXJzKGNvbnZlcnRlZCk7CiAJCWlmIChyZXN1bHQgPT0gbnVsbCkgewotCQkgICAgUmVzb3VyY2UuRmFjdG9yeSByZXNvdXJjZUZhY3RvcnkgPSBnZXRSZXNvdXJjZUZhY3RvcnlSZWdpc3RyeSgpLmdldEZhY3RvcnkodXJpKTsKKwkJCVJlc291cmNlLkZhY3RvcnkgcmVzb3VyY2VGYWN0b3J5ID0gKGNvbnRlbnRUeXBlTmFtZSA9PSBudWxsKSA/IAorCQkJCQlnZXRSZXNvdXJjZUZhY3RvcnlSZWdpc3RyeSgpLmdldEZhY3RvcnkodXJpKToKKwkJCQkJZ2V0UmVzb3VyY2VGYWN0b3J5UmVnaXN0cnkoKS5nZXRGYWN0b3J5KHVyaSxjb250ZW50VHlwZU5hbWUpOworCQkJCQkJCiAJCSAgICBpZiAocmVzb3VyY2VGYWN0b3J5ICE9IG51bGwpCiAJCSAgICB7Ly9XZSBnb3QgdGhlIHJpZ2h0IGZhY3RvcnksIG5vdyB1c2UgdGhlIHJpZ2h0IFVSSQogCQkgICAgICByZXN1bHQgPSByZXNvdXJjZUZhY3RvcnkuY3JlYXRlUmVzb3VyY2UoY29udmVydGVkKTsKQEAgLTEzNiw3ICs0ODAsOSBAQAogCQkgICAgewogCQkgICAgICByZXN1bHQgPSByZXNvdXJjZUZhY3RvcnkuY3JlYXRlUmVzb3VyY2UoY29udmVydGVkKTsKIAkJICAgICAgZ2V0UmVzb3VyY2VzKCkuYWRkKHJlc3VsdCk7Ci0JCSAgICAgIGdldFVSSVJlc291cmNlTWFwKCkucHV0KHVyaSwgcmVzdWx0KTsKKwkJICAgICAgc3luY2hyb25pemVkIChyZXNvdXJjZXNMb2NrKSB7CisJCSAgICAgICAgICBnZXRVUklSZXNvdXJjZU1hcCgpLnB1dCh1cmksIHJlc3VsdCk7CisJCSAgICAgIH0KIAkJICAgICAgcmV0dXJuIHJlc3VsdDsKIAkJICAgIH0KIAkJICAgIGVsc2UKQEAgLTIxNSw5ICs1NjEsMTIgQEAKIAl9CiAJcHJvdGVjdGVkIHZvaWQgcmVtb3ZlQW5kVW5sb2FkQWxsUmVzb3VyY2VzKCkgewogCQlib29sZWFuIGNhdWdodEV4Y2VwdGlvbiA9IGZhbHNlOwotCQlpZiAoZ2V0UmVzb3VyY2VzKCkuaXNFbXB0eSgpKSByZXR1cm47Ci0JCUxpc3QgbGlzdCA9IG5ldyBBcnJheUxpc3QoZ2V0UmVzb3VyY2VzKCkpOwotCQlnZXRSZXNvdXJjZXMoKS5jbGVhcigpOworCQlMaXN0IGxpc3QgPSBudWxsOworCQlzeW5jaHJvbml6ZWQgKHJlc291cmNlc0xvY2spIHsKKwkJCWlmIChnZXRSZXNvdXJjZXMoKS5pc0VtcHR5KCkpIHJldHVybjsKKwkJCWxpc3QgPSBuZXcgQXJyYXlMaXN0KGdldFJlc291cmNlcygpKTsJCisJCQlnZXRSZXNvdXJjZXMoKS5jbGVhcigpOworCQl9CiAJCVJlc291cmNlIHJlczsKIAkJaW50IHNpemUgPSBsaXN0LnNpemUoKTsKIAkJZm9yIChpbnQgaSA9IDA7IGkgPCBzaXplOyBpKyspIHsKQEAgLTM0OSw1OSArNjk4LDM1IEBACiAJICAgIFVSSUNvbnZlcnRlciB0aGVVUklDb252ZXJ0ZXIgPSBnZXRVUklDb252ZXJ0ZXIoKTsKIAkgICAgVVJJIG5vcm1hbGl6ZWRVUkkgPSB0aGVVUklDb252ZXJ0ZXIubm9ybWFsaXplKHVyaSk7CiAJICAgIExpc3QgcmVzb3VyY2VzVG9SZW1vdmUgPSBuZXcgQXJyYXlMaXN0KCk7Ci0JICAgIGZvciAoUmVzb3VyY2UgcmVzb3VyY2UgOiBnZXRSZXNvdXJjZXMoKSkKLQkgICAgewotCSAgICAgIGlmICh0aGVVUklDb252ZXJ0ZXIubm9ybWFsaXplKHJlc291cmNlLmdldFVSSSgpKS5lcXVhbHMobm9ybWFsaXplZFVSSSkpIHsKLQkgICAgCQkgIAotCSAgICAJaWYgKGdldENvbnRlbnRUeXBlTmFtZSh1cmkpID09IG51bGwpIHsgLy8gbG9hZGluZyBmcm9tIGxlZ2FjeSBhcmNoaXZlIGFwaSBvciBub24tdHlwZWQgcmVzb3VyY2UKLQkJICAgICAgICBpZiAobG9hZE9uRGVtYW5kICYmICFyZXNvdXJjZS5pc0xvYWRlZCgpKQotCQkgICAgICAgIHsKLQkJICAgICAgICAgIGRlbWFuZExvYWRIZWxwZXIocmVzb3VyY2UpOwotCQkgICAgICAgIH0KLQkJICAgICAgICAKLQkJICAgICAgICBpZiAobWFwICE9IG51bGwpCi0JCSAgICAgICAgewotCQkgICAgICAgICAgbWFwLnB1dCh1cmksIHJlc291cmNlKTsKLQkJICAgICAgICB9IAotCQkgICAgICAgIHJldHVybiByZXNvdXJjZTsKLQkgICAgCX0gZWxzZSAgey8vIGNvbnRlbnQgdHlwZSBpcyBrbm93bgotCSAgICAJCWJvb2xlYW4gcmVzb3VyY2VFeGlzdHMgPSBmYWxzZTsKLQkgICAgCQlJRmlsZSBmaWxlID0gZ2V0UGxhdGZvcm1GaWxlKHJlc291cmNlKTsKLQkgICAgCQlpZiAoZmlsZSAhPSBudWxsKQotCSAgICAJCQlyZXNvdXJjZUV4aXN0cyA9IGZpbGUuZXhpc3RzKCk7Ci0JICAgIAkJU3RyaW5nIHJlc291cmNlQ29udGVudFR5cGVJRCA9IGdldENvbnRlbnRUeXBlSUQocmVzb3VyY2UpOwotCSAgICAJCVN0cmluZyB1cmlDb250ZW50VHlwZUlEID0gZ2V0Q29udGVudFR5cGVOYW1lKHVyaSk7Ci0JICAgIAkJU3RyaW5nIGV4aXN0aW5nTWFwS2V5VHlwZSA9IChmaW5kS2V5KHJlc291cmNlKSAhPSBudWxsKSA/IGdldENvbnRlbnRUeXBlTmFtZShmaW5kS2V5KHJlc291cmNlKSkgOiBudWxsOwotCSAgICAJCWlmKCghbWFwLmNvbnRhaW5zVmFsdWUocmVzb3VyY2UpIHx8ICgobWFwLmdldCh1cmkpICE9IG51bGwpICYmIG1hcC5nZXQodXJpKS5lcXVhbHMocmVzb3VyY2UpKSkgLy8gZXhpc3RpbmcgcmVzb3VyY2UgIHdpdGggYWx0ZXJuYXRlIG1hcHBpbmcgZG9lc24ndCBleGlzdCBpbiBtYXAKLQkgICAgCQkJfHwgICgocmVzb3VyY2VDb250ZW50VHlwZUlEICE9IG51bGwgJiYgcmVzb3VyY2VDb250ZW50VHlwZUlELmVxdWFscyh1cmlDb250ZW50VHlwZUlEKSkpKSB7Ci0JCQkJCQlpZiAobG9hZE9uRGVtYW5kICYmICFyZXNvdXJjZS5pc0xvYWRlZCgpKSB7Ci0JCQkJCQkJZGVtYW5kTG9hZEhlbHBlcihyZXNvdXJjZSk7Ci0JCQkJCQl9IC8vIGlmIGVtYmVkZGVkIHVyaSBjb250ZW50IHR5cGUgaXMgZGlmZmVyZW50IHRoYW4gcmVzb3VyY2UgY29udGVudCB0eXBlLCBjb250aW51ZSBzZWFyY2hpbmcKLQkJCQkJCWlmIChyZXNvdXJjZUNvbnRlbnRUeXBlSUQgIT0gbnVsbAotCQkJCQkJCQkmJiB1cmlDb250ZW50VHlwZUlEICE9IG51bGwpIHsKLQkJCQkJCQlpZiAoKHJlc291cmNlQ29udGVudFR5cGVJRC5lcXVhbHModXJpQ29udGVudFR5cGVJRCkpICYmIGV4aXN0aW5nTWFwS2V5VHlwZSA9PSBudWxsKSBjb250aW51ZTsKLQkJCQkJCQlpZiAoKCFyZXNvdXJjZUNvbnRlbnRUeXBlSUQuZXF1YWxzKHVyaUNvbnRlbnRUeXBlSUQpKSB8fCAoZXhpc3RpbmdNYXBLZXlUeXBlICE9IG51bGwgJiYgIWV4aXN0aW5nTWFwS2V5VHlwZQotCQkJCQkJCQkJLmVxdWFscyh1cmlDb250ZW50VHlwZUlEKSkpCi0JCQkJCQkJCWNvbnRpbnVlOwotCQkJCQkJCWVsc2UgaWYgKGV4aXN0aW5nTWFwS2V5VHlwZSA9PSBudWxsICYmICFyZXNvdXJjZUV4aXN0cykgewotCQkJCQkJCQlyZXNvdXJjZXNUb1JlbW92ZS5hZGQocmVzb3VyY2UpOwotCQkJCQkJCQljb250aW51ZTsKKwkgICAgc3luY2hyb25pemVkIChyZXNvdXJjZXNMb2NrKSB7CisJICAgIAlMaXN0PFJlc291cmNlPiBjID0gZ2V0SW1tdXRhYmxlUmVzb3VyY2VzKCk7CisJICAgICAgICAKKwkgICAgICAgIHN5bmNocm9uaXplZChjKSB7CisJCQkJZm9yIChSZXNvdXJjZSByZXNvdXJjZSA6IGMpIHsKKwkJCQkJaWYgKHRoZVVSSUNvbnZlcnRlci5ub3JtYWxpemUocmVzb3VyY2UuZ2V0VVJJKCkpLmVxdWFscyhub3JtYWxpemVkVVJJKSkgeworCQorCQkJCQkJaWYgKGdldENvbnRlbnRUeXBlTmFtZSh1cmkpID09IG51bGwpIHsgLy8gbG9hZGluZyBmcm9tIGxlZ2FjeSBhcmNoaXZlIGFwaSBvciBub24tdHlwZWQgcmVzb3VyY2UKKwkJCQkJCQlpZiAobG9hZE9uRGVtYW5kICYmICFyZXNvdXJjZS5pc0xvYWRlZCgpKSB7CisJCQkJCQkJCWRlbWFuZExvYWRIZWxwZXIocmVzb3VyY2UpOwogCQkJCQkJCX0KLQkJCQkJCX0gZWxzZSBpZiAodXJpQ29udGVudFR5cGVJRCAhPSBudWxsICYmIHJlc291cmNlQ29udGVudFR5cGVJRCA9PSBudWxsICYmICFyZXNvdXJjZUV4aXN0cykgewotCQkJCQkJCXJlc291cmNlc1RvUmVtb3ZlLmFkZChyZXNvdXJjZSk7Ci0JCQkJCQkJY29udGludWU7CisJCisJCQkJCQkJaWYgKG1hcCAhPSBudWxsKSB7CisJCQkJCQkJCW1hcC5wdXQodXJpLCByZXNvdXJjZSk7CisJCQkJCQkJfQorCQkJCQkJCXJldHVybiByZXNvdXJjZTsKKwkJCQkJCX0gZWxzZSB7CisJCQkJCQkJUmVzb3VyY2UgbG9hZGVkUmVzID0gbG9hZFdpdGhDb250ZW50VHlwZShyZXNvdXJjZSwgdXJpLCBtYXAsIGxvYWRPbkRlbWFuZCwgcmVzb3VyY2VzVG9SZW1vdmUpOworCQkJCQkJCWlmIChsb2FkZWRSZXMgIT0gbnVsbCkKKwkJCQkJCQkJcmV0dXJuIGxvYWRlZFJlczsKIAkJCQkJCX0KLQkJCQkJCQkJCi0JCQkJCQlpZiAobWFwICE9IG51bGwgJiYgKG1hcC5nZXQodXJpKSA9PSBudWxsKSkgewotCQkJCQkJCW1hcC5wdXQodXJpLCByZXNvdXJjZSk7Ci0JCQkJCQl9Ci0JCQkJCQlyZXR1cm4gcmVzb3VyY2U7CiAJCQkJCX0KLQkgICAgCX0KLQkgICAgICB9Ci0JICAgIH0KKwkJCQl9CisJICAgICAgICB9CisJCX0KKwkgICAgc3luY2hyb25pemVkIChyZXNvdXJjZXNMb2NrKSB7CiAJICAgIC8vIENsZWFudXAgaW52YWxpZCByZXNvdXJjZXMKLQkgICAgZ2V0UmVzb3VyY2VzKCkucmVtb3ZlQWxsKHJlc291cmNlc1RvUmVtb3ZlKTsKKwkgICAgCWdldFJlc291cmNlcygpLnJlbW92ZUFsbChyZXNvdXJjZXNUb1JlbW92ZSk7CisJICAgIH0KIAkgICAgUmVzb3VyY2UgZGVsZWdhdGVkUmVzb3VyY2UgPSBkZWxlZ2F0ZWRHZXRSZXNvdXJjZSh1cmksIGxvYWRPbkRlbWFuZCk7CiAJICAgIGlmIChkZWxlZ2F0ZWRSZXNvdXJjZSAhPSBudWxsKQogCSAgICB7CkBAIC00MzQsNiArNzU5LDQxIEBACiAJICAgIHJldHVybiBudWxsOwogCSAgCiAJfQorCXByaXZhdGUgUmVzb3VyY2UgbG9hZFdpdGhDb250ZW50VHlwZShSZXNvdXJjZSByZXNvdXJjZSwgVVJJIHVyaSwgTWFwPFVSSSwgUmVzb3VyY2U+IG1hcCwgYm9vbGVhbiBsb2FkT25EZW1hbmQsIExpc3QgcmVzb3VyY2VzVG9SZW1vdmUpIHsKKwkJLy8gY29udGVudCB0eXBlIGlzIGtub3duCisJCWJvb2xlYW4gcmVzb3VyY2VFeGlzdHMgPSBmYWxzZTsKKwkJSUZpbGUgZmlsZSA9IGdldFBsYXRmb3JtRmlsZShyZXNvdXJjZSk7CisJCWlmIChmaWxlICE9IG51bGwpCisJCQlyZXNvdXJjZUV4aXN0cyA9IGZpbGUuZXhpc3RzKCk7CisJCVN0cmluZyByZXNvdXJjZUNvbnRlbnRUeXBlSUQgPSBnZXRDb250ZW50VHlwZUlEKHJlc291cmNlKTsKKwkJU3RyaW5nIHVyaUNvbnRlbnRUeXBlSUQgPSBnZXRDb250ZW50VHlwZU5hbWUodXJpKTsKKwkJU3RyaW5nIGV4aXN0aW5nTWFwS2V5VHlwZSA9IChmaW5kS2V5KHJlc291cmNlKSAhPSBudWxsKSA/IGdldENvbnRlbnRUeXBlTmFtZShmaW5kS2V5KHJlc291cmNlKSkgOiBudWxsOworCQlpZigoIW1hcC5jb250YWluc1ZhbHVlKHJlc291cmNlKSB8fCAoKG1hcC5nZXQodXJpKSAhPSBudWxsKSAmJiBtYXAuZ2V0KHVyaSkuZXF1YWxzKHJlc291cmNlKSkpIC8vIGV4aXN0aW5nIHJlc291cmNlICB3aXRoIGFsdGVybmF0ZSBtYXBwaW5nIGRvZXNuJ3QgZXhpc3QgaW4gbWFwCisJCQl8fCAgKChyZXNvdXJjZUNvbnRlbnRUeXBlSUQgIT0gbnVsbCAmJiByZXNvdXJjZUNvbnRlbnRUeXBlSUQuZXF1YWxzKHVyaUNvbnRlbnRUeXBlSUQpKSkpIHsKKwkJCQlpZiAobG9hZE9uRGVtYW5kICYmICFyZXNvdXJjZS5pc0xvYWRlZCgpKSB7CisJCQkJCWRlbWFuZExvYWRIZWxwZXIocmVzb3VyY2UpOworCQkJCX0gLy8gaWYgZW1iZWRkZWQgdXJpIGNvbnRlbnQgdHlwZSBpcyBkaWZmZXJlbnQgdGhhbiByZXNvdXJjZSBjb250ZW50IHR5cGUsIGNvbnRpbnVlIHNlYXJjaGluZworCQkJCWlmIChyZXNvdXJjZUNvbnRlbnRUeXBlSUQgIT0gbnVsbAorCQkJCQkJJiYgdXJpQ29udGVudFR5cGVJRCAhPSBudWxsKSB7CisJCQkJCWlmICgocmVzb3VyY2VDb250ZW50VHlwZUlELmVxdWFscyh1cmlDb250ZW50VHlwZUlEKSkgJiYgZXhpc3RpbmdNYXBLZXlUeXBlID09IG51bGwpIHJldHVybiBudWxsOworCQkJCQlpZiAoKCFyZXNvdXJjZUNvbnRlbnRUeXBlSUQuZXF1YWxzKHVyaUNvbnRlbnRUeXBlSUQpKSB8fCAoZXhpc3RpbmdNYXBLZXlUeXBlICE9IG51bGwgJiYgIWV4aXN0aW5nTWFwS2V5VHlwZQorCQkJCQkJCS5lcXVhbHModXJpQ29udGVudFR5cGVJRCkpKQorCQkJCQkJcmV0dXJuIG51bGw7CisJCQkJCWVsc2UgaWYgKGV4aXN0aW5nTWFwS2V5VHlwZSA9PSBudWxsICYmICFyZXNvdXJjZUV4aXN0cykgeworCQkJCQkJcmVzb3VyY2VzVG9SZW1vdmUuYWRkKHJlc291cmNlKTsKKwkJCQkJCXJldHVybiBudWxsOworCQkJCQl9CisJCQkJfSBlbHNlIGlmICh1cmlDb250ZW50VHlwZUlEICE9IG51bGwgJiYgcmVzb3VyY2VDb250ZW50VHlwZUlEID09IG51bGwgJiYgIXJlc291cmNlRXhpc3RzKSB7CisJCQkJCXJlc291cmNlc1RvUmVtb3ZlLmFkZChyZXNvdXJjZSk7CisJCQkJCXJldHVybiBudWxsOworCQkJCX0JCQorCQkJCWlmIChtYXAgIT0gbnVsbCAmJiAobWFwLmdldCh1cmkpID09IG51bGwpKSB7CisJCQkJCW1hcC5wdXQodXJpLCByZXNvdXJjZSk7CisJCQkJfQorCQkJCXJldHVybiByZXNvdXJjZTsKKwkJCX0KKwkJcmV0dXJuIG51bGw7CisJfQogCXByaXZhdGUgSUZpbGUgZ2V0UGxhdGZvcm1GaWxlKFJlc291cmNlIHJlcykgewogCQlJRmlsZSBmaWxlID0gbnVsbDsKIAkJZmlsZSA9IGdldFBsYXRmb3JtRmlsZShyZXMuZ2V0VVJJKCkpOwpAQCAtNDU5LDYgKzgxOSw3IEBACiAJCQlyZXR1cm4gZGVzYy5nZXRDb250ZW50VHlwZSgpLmdldElkKCk7CiAJCXJldHVybiBudWxsOwogCX0KKwkKIAlwcml2YXRlIFVSSSBmaW5kS2V5KFJlc291cmNlIHJlc291cmNlKSB7CiAJCU1hcCBhTWFwID0gZ2V0VVJJUmVzb3VyY2VNYXAoKTsKIAkJU2V0IGtleXMgPSBhTWFwLmtleVNldCgpOwpAQCAtNTA4LDIyICs4NjksMjUgQEAKIAkgICAgCiAJICAgIFVSSUNvbnZlcnRlciB0aGVVUklDb252ZXJ0ZXIgPSBnZXRVUklDb252ZXJ0ZXIoKTsKIAkgICAgVVJJIG5vcm1hbGl6ZWRVUkkgPSB0aGVVUklDb252ZXJ0ZXIubm9ybWFsaXplKHVyaSk7Ci0JICAgIGZvciAoUmVzb3VyY2UgcmVzb3VyY2UgOiBnZXRSZXNvdXJjZXMoKSkKLQkgICAgewotCSAgICAgIGlmICh0aGVVUklDb252ZXJ0ZXIubm9ybWFsaXplKHJlc291cmNlLmdldFVSSSgpKS5lcXVhbHMobm9ybWFsaXplZFVSSSkpCi0JICAgICAgewotCSAgICAgICAgaWYgKGxvYWRPbkRlbWFuZCAmJiAhcmVzb3VyY2UuaXNMb2FkZWQoKSkKLQkgICAgICAgIHsKLQkgICAgICAgICAgZGVtYW5kTG9hZEhlbHBlcihyZXNvdXJjZSk7Ci0JICAgICAgICB9CisJICAgIHN5bmNocm9uaXplZCAocmVzb3VyY2VzTG9jaykgeworCSAgICAJTGlzdDxSZXNvdXJjZT4gYyA9IGdldEltbXV0YWJsZVJlc291cmNlcygpOwogCSAgICAgICAgCi0JICAgICAgICBpZiAobWFwICE9IG51bGwpCi0JICAgICAgICB7Ci0JICAgICAgICAgIG1hcC5wdXQodXJpLCByZXNvdXJjZSk7Ci0JICAgICAgICB9IAotCSAgICAgICAgcmV0dXJuIHJlc291cmNlOwotCSAgICAgIH0KLQkgICAgfQorCSAgICAgICAgc3luY2hyb25pemVkKGMpIHsKKwkgICAgICAgIAkKKwkJCQlmb3IgKFJlc291cmNlIHJlc291cmNlIDogYykgeworCQkJCQlpZiAodGhlVVJJQ29udmVydGVyLm5vcm1hbGl6ZShyZXNvdXJjZS5nZXRVUkkoKSkuZXF1YWxzKG5vcm1hbGl6ZWRVUkkpKSB7CisJCQkJCQlpZiAobG9hZE9uRGVtYW5kICYmICFyZXNvdXJjZS5pc0xvYWRlZCgpKSB7CisJCQkJCQkJZGVtYW5kTG9hZEhlbHBlcihyZXNvdXJjZSk7CisJCQkJCQl9CisJCisJCQkJCQlpZiAobWFwICE9IG51bGwpIHsKKwkJCQkJCQltYXAucHV0KHVyaSwgcmVzb3VyY2UpOworCQkJCQkJfQorCQkJCQkJcmV0dXJuIHJlc291cmNlOworCQkJCQl9CisJCQkJfQorCSAgICAgICAgfQorCQl9CiAJICAgIAogCSAgICBSZXNvdXJjZSBkZWxlZ2F0ZWRSZXNvdXJjZSA9IGRlbGVnYXRlZEdldFJlc291cmNlKHVyaSwgbG9hZE9uRGVtYW5kKTsKIAkgICAgaWYgKGRlbGVnYXRlZFJlc291cmNlICE9IG51bGwpCkBAIC01NjYsOCArOTMwLDQ1IEBACiAJfQogCQogCXByb3RlY3RlZCBSZXNvdXJjZSBkZW1hbmRDcmVhdGVSZXNvdXJjZShVUkkgdXJpLCBGYWN0b3J5IHJlc291cmNlRmFjdG9yeSkgewotCQkvLyBUT0RPIEF1dG8tZ2VuZXJhdGVkIG1ldGhvZCBzdHViCiAJCXJldHVybiBjcmVhdGVSZXNvdXJjZSh1cmkscmVzb3VyY2VGYWN0b3J5KTsKIAl9CisJCisJcHVibGljIEVMaXN0PFJlc291cmNlPiBnZXRSZXNvdXJjZXMoKSB7CisJCSBpZiAocmVzb3VyY2VzID09IG51bGwpCisJCSAgICB7CisJCSAgICAgIHJlc291cmNlcyA9IG5ldyBTeW5jaHJvbml6ZWRSZXNvdXJjZXNFTGlzdDxSZXNvdXJjZT4oKTsKKwkJICAgIH0KKwkJICAgIHJldHVybiByZXNvdXJjZXM7CisJfQorCS8qKgorCSAqIENyZWF0aW5nIGEgY29weSBvZiB0aGUgcmVzb3VyY2VzIGxpc3QKKwkgKiBAcmV0dXJuCisJICovCisJcHVibGljIExpc3Q8UmVzb3VyY2U+IGdldEltbXV0YWJsZVJlc291cmNlcygpIHsKKwkJIExpc3QgPFJlc291cmNlPiBsaXN0ID0gbmV3IEFycmF5TGlzdDxSZXNvdXJjZT4oKTsKKwkJIEVMaXN0IHJlc291cmNlcyA9IGdldFJlc291cmNlcygpOworCQkgaWYgKHJlc291cmNlcyBpbnN0YW5jZW9mIFN5bmNocm9uaXplZFJlc291cmNlc0VMaXN0KQorCQkgeworCQkJICgoU3luY2hyb25pemVkUmVzb3VyY2VzRUxpc3QpcmVzb3VyY2VzKS5jb3B5SW50byhsaXN0KTsKKwkJIH0KKwkJIGVsc2UKKwkJIHsKKwkJCSBsaXN0ID0gQ29sbGVjdGlvbnMuc3luY2hyb25pemVkTGlzdChyZXNvdXJjZXMpOworCQkgfQorCQkgcmV0dXJuIGxpc3Q7CisJfQorCUBPdmVycmlkZQorCXB1YmxpYyB2b2lkIGVOb3RpZnkoTm90aWZpY2F0aW9uIG5vdGlmaWNhdGlvbikgeworCSAgICBBZGFwdGVyW10gZUFkYXB0ZXJzID0gZUJhc2ljQWRhcHRlckFycmF5KCk7CisJICAgIGlmIChlQWRhcHRlcnMgIT0gbnVsbCAmJiBlRGVsaXZlcigpKQorCSAgICB7CisJICAgICAgZm9yIChpbnQgaSA9IDAsIHNpemUgPSBlQWRhcHRlcnMubGVuZ3RoOyBpIDwgc2l6ZTsgKytpKQorCSAgICAgIHsKKwkgICAgICAJQWRhcHRlciB0ZW1wOworCSAgICAJICBpZiAoKHRlbXAgPSBlQWRhcHRlcnNbaV0pICE9IG51bGwpCisJICAgIAkJICB0ZW1wLm5vdGlmeUNoYW5nZWQobm90aWZpY2F0aW9uKTsKKwkgICAgICB9CisJICAgIH0KKwkgIH0KIAogfQpkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS5qZW0udXRpbC9qZW11dGlsL29yZy9lY2xpcHNlL2plbS91dGlsL1JlZ2lzdHJ5UmVhZGVyLmphdmEgYi9wbHVnaW5zL29yZy5lY2xpcHNlLmplbS51dGlsL2plbXV0aWwvb3JnL2VjbGlwc2UvamVtL3V0aWwvUmVnaXN0cnlSZWFkZXIuamF2YQppbmRleCAzN2U4Mjc3Li4xODNmNmNlIDEwMDY0NAotLS0gYS9wbHVnaW5zL29yZy5lY2xpcHNlLmplbS51dGlsL2plbXV0aWwvb3JnL2VjbGlwc2UvamVtL3V0aWwvUmVnaXN0cnlSZWFkZXIuamF2YQorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLmplbS51dGlsL2plbXV0aWwvb3JnL2VjbGlwc2UvamVtL3V0aWwvUmVnaXN0cnlSZWFkZXIuamF2YQpAQCAtMTAsNDYgKzEwLDM1IEBACiAgKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKi8KIC8qCiAgKiAgJCRSQ1NmaWxlOiBSZWdpc3RyeVJlYWRlci5qYXZhLHYgJCQKLSAqICAkJFJldmlzaW9uOiAxLjUgJCQgICQkRGF0ZTogMjAwNi8wNS8xNyAyMDoxMzo0NSAkJCAKKyAqICAkJFJldmlzaW9uOiAxLjcgJCQgICQkRGF0ZTogMjAwOS8wOC8xMSAxNTozMDozMiAkJCAKICAqLwogcGFja2FnZSBvcmcuZWNsaXBzZS5qZW0udXRpbDsKIGltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJ1bnRpbWUuKjsKIGltcG9ydCBvcmcub3NnaS5mcmFtZXdvcmsuQnVuZGxlOwogCi1pbXBvcnQgb3JnLmVjbGlwc2UuamVtLnV0aWwubG9nZ2VyLnByb3h5LkxvZ2dlcjsKLQogCiAvKioKICAqIENsYXNzIHRvIHJlYWQgYSByZWdpc3RyeS4gSXQgaXMgbWVhbnQgdG8gYmUgc3ViY2xhc3NlZCB0byBwcm92aWRlIHNwZWNpZmljIGZ1bmN0aW9uLgogICogCisgKiBAZGVwcmVjYXRlZCBSZXBsYWNlZCBieSB7QGxpbmsgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb3JlLnV0aWwuUmVnaXN0cnlSZWFkZXIpCiAgKiBAc2luY2UgMS4wLjAKICAqLwotcHVibGljIGFic3RyYWN0IGNsYXNzIFJlZ2lzdHJ5UmVhZGVyIHsKK3B1YmxpYyBhYnN0cmFjdCBjbGFzcyBSZWdpc3RyeVJlYWRlciBleHRlbmRzIG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29yZS51dGlsLlJlZ2lzdHJ5UmVhZGVyIHsKIAotCVN0cmluZyBwbHVnaW5JZDsKLQotCVN0cmluZyBleHRlbnNpb25Qb2ludElkOwotCi0JcHJpdmF0ZSBzdGF0aWMgQnVuZGxlIHN5c3RlbUJ1bmRsZTsKKwlwdWJsaWMgUmVnaXN0cnlSZWFkZXIoU3RyaW5nIHBsdWdpbklELCBTdHJpbmcgZXh0ZW5zaW9uUG9pbnQpIHsKKwkJc3VwZXIocGx1Z2luSUQsIGV4dGVuc2lvblBvaW50KTsKKwl9CiAKIAkvKioKIAkgKiBVdGlsaXR5IG1ldGhvZCB0byBnZXQgdGhlIHBsdWdpbiBpZCBvZiBhIGNvbmZpZ3VhdGlvbiBlbGVtZW50CiAJICogCiAJICogQHBhcmFtIGNvbmZpZ3VyYXRpb25FbGVtZW50CiAJICogQHJldHVybiBwbHVnaW4gaWQgb2YgY29uZmlndXJhdGlvbiBlbGVtZW50CisJICogQGRlcHJlY2F0ZWQgUmVwbGFjZWQgYnkgKEBsaW5rIG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29yZS51dGlsLlJlZ2lzdHJ5UmVhZGVyLmdldFBsdWdpbklkKCkpCiAJICogQHNpbmNlIDEuMC4wCiAJICovCiAJcHVibGljIHN0YXRpYyBTdHJpbmcgZ2V0UGx1Z2luSWQoSUNvbmZpZ3VyYXRpb25FbGVtZW50IGNvbmZpZ3VyYXRpb25FbGVtZW50KSB7Ci0JCVN0cmluZyBwbHVnaW5JZCA9IG51bGw7Ci0KLQkJaWYgKGNvbmZpZ3VyYXRpb25FbGVtZW50ICE9IG51bGwpIHsKLQkJCUlFeHRlbnNpb24gZXh0ZW5zaW9uID0gY29uZmlndXJhdGlvbkVsZW1lbnQuZ2V0RGVjbGFyaW5nRXh0ZW5zaW9uKCk7Ci0KLQkJCWlmIChleHRlbnNpb24gIT0gbnVsbCkKLQkJCQlwbHVnaW5JZCA9IGV4dGVuc2lvbi5nZXRDb250cmlidXRvcigpLmdldE5hbWUoKTsKLQkJfQotCi0JCXJldHVybiBwbHVnaW5JZDsKKwkJcmV0dXJuIG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29yZS51dGlsLlJlZ2lzdHJ5UmVhZGVyLmdldFBsdWdpbklkKGNvbmZpZ3VyYXRpb25FbGVtZW50KTsKIAl9CiAKIAkvKioKQEAgLTY3LDc4ICs1NiwxNyBAQAogCX0KIAogCS8qKgotCSAqIENvbnN0cnVjdG9yIGZvciBSZWdpc3RyeVJlYWRlciB0YWtpbmcgdGhlIHBsdWdpbiBpZCBhbmQgZXh0ZW5zaW9uIHBvaW50IGlkLgotCSAqIAotCSAqIEBwYXJhbSBwbHVnaW5JRAotCSAqIEBwYXJhbSBleHRlbnNpb25Qb2ludAotCSAqIAotCSAqIEBzaW5jZSAxLjAuMAotCSAqLwotCXB1YmxpYyBSZWdpc3RyeVJlYWRlcihTdHJpbmcgcGx1Z2luSUQsIFN0cmluZyBleHRlbnNpb25Qb2ludCkgewotCQlzdXBlcigpOwotCQl0aGlzLnBsdWdpbklkID0gcGx1Z2luSUQ7Ci0JCWV4dGVuc2lvblBvaW50SWQgPSBleHRlbnNpb25Qb2ludDsKLQl9Ci0KLQlwcml2YXRlIHZvaWQgaW50ZXJuYWxSZWFkRWxlbWVudChJQ29uZmlndXJhdGlvbkVsZW1lbnQgZWxlbWVudCkgewotCQlib29sZWFuIHJlY29nbml6ZWQgPSB0aGlzLnJlYWRFbGVtZW50KGVsZW1lbnQpOwotCQlpZiAoIXJlY29nbml6ZWQpIHsKLQkJCWxvZ0Vycm9yKGVsZW1lbnQsICJFcnJvciBwcm9jZXNzaW5nIGV4dGVuc2lvbjogIiArIGVsZW1lbnQpOyAvLyROT04tTkxTLTEkCi0JCX0KLQl9Ci0KLQkvKgotCSAqIExvZ3MgdGhlIGVycm9yIGluIHRoZSBkZXNrdG9wIGxvZyB1c2luZyB0aGUgcHJvdmlkZWQgdGV4dCBhbmQgdGhlIGluZm9ybWF0aW9uIGluIHRoZSBjb25maWd1cmF0aW9uIGVsZW1lbnQuCi0JICovCi0JcHJvdGVjdGVkIHZvaWQgbG9nRXJyb3IoSUNvbmZpZ3VyYXRpb25FbGVtZW50IGVsZW1lbnQsIFN0cmluZyB0ZXh0KSB7Ci0JCUlFeHRlbnNpb24gZXh0ZW5zaW9uID0gZWxlbWVudC5nZXREZWNsYXJpbmdFeHRlbnNpb24oKTsKLQkJU3RyaW5nQnVmZmVyIGJ1ZiA9IG5ldyBTdHJpbmdCdWZmZXIoKTsKLQkJYnVmLmFwcGVuZCgiUGx1Z2luICIgKyBleHRlbnNpb24uZ2V0Q29udHJpYnV0b3IoKS5nZXROYW1lKCkgKyAiLCBleHRlbnNpb24gIiArIGV4dGVuc2lvbi5nZXRFeHRlbnNpb25Qb2ludFVuaXF1ZUlkZW50aWZpZXIoKSk7IC8vJE5PTi1OTFMtMSQgLy8kTk9OLU5MUy0yJAotCQlidWYuYXBwZW5kKCJcbiIgKyB0ZXh0KTsgLy8kTk9OLU5MUy0xJAotCQlMb2dnZXIuZ2V0TG9nZ2VyKCkubG9nRXJyb3IoYnVmLnRvU3RyaW5nKCkpOwotCX0KLQotCS8qCi0JICogTG9ncyBhIHZlcnkgY29tbW9uIHJlZ2lzdHJ5IGVycm9yIHdoZW4gYSByZXF1aXJlZCBhdHRyaWJ1dGUgaXMgbWlzc2luZy4KLQkgKi8KLQlwcm90ZWN0ZWQgdm9pZCBsb2dNaXNzaW5nQXR0cmlidXRlKElDb25maWd1cmF0aW9uRWxlbWVudCBlbGVtZW50LCBTdHJpbmcgYXR0cmlidXRlTmFtZSkgewotCQlsb2dFcnJvcihlbGVtZW50LCAiUmVxdWlyZWQgYXR0cmlidXRlICciICsgYXR0cmlidXRlTmFtZSArICInIG5vdCBkZWZpbmVkIik7IC8vJE5PTi1OTFMtMSQgLy8kTk9OLU5MUy0yJAotCX0KLQotCS8qCi0JICogSW1wbGVtZW50IHRoaXMgbWV0aG9kIHRvIHJlYWQgZWxlbWVudCBhdHRyaWJ1dGVzLiBJZiB0aGlzIGVsZW1lbnQgaGFzIHN1YmVsZW1lbnRzLCB0aGUgcmVhZGVyIHdpbGwgcmVjdXJzaXZlbHkgY3ljbGUgdGhyb3VnaCB0aGVtIGFuZCBjYWxsIHRoaXMKLQkgKiBtZXRob2Qgc28gZG9uJ3QgZG8gaXQgaGVyZS4KLQkgKi8KLQlwdWJsaWMgYWJzdHJhY3QgYm9vbGVhbiByZWFkRWxlbWVudChJQ29uZmlndXJhdGlvbkVsZW1lbnQgZWxlbWVudCk7Ci0KLQkvKioKLQkgKiBSZWFkIHRoZSBleHRlbnNpb24gcG9pbnQgYW5kIHBhcnNlIGl0LgotCSAqIAotCSAqIEBzaW5jZSAxLjAuMAotCSAqLwotCXB1YmxpYyB2b2lkIHJlYWRSZWdpc3RyeSgpIHsKLQkJSUV4dGVuc2lvblBvaW50IHBvaW50ID0gUGxhdGZvcm0uZ2V0RXh0ZW5zaW9uUmVnaXN0cnkoKS5nZXRFeHRlbnNpb25Qb2ludChwbHVnaW5JZCwgZXh0ZW5zaW9uUG9pbnRJZCk7Ci0JCWlmIChwb2ludCA9PSBudWxsKQotCQkJcmV0dXJuOwotCQlJQ29uZmlndXJhdGlvbkVsZW1lbnRbXSBlbGVtZW50cyA9IHBvaW50LmdldENvbmZpZ3VyYXRpb25FbGVtZW50cygpOwotCQlmb3IgKGludCBpID0gMDsgaSA8IGVsZW1lbnRzLmxlbmd0aDsgaSsrKSB7Ci0JCQlpbnRlcm5hbFJlYWRFbGVtZW50KGVsZW1lbnRzW2ldKTsKLQkJfQotCX0KLQotCS8qKgogCSAqIFRlc3RzIHRvIHNlZSBpZiBpdCBpcyB2YWxpZCBhdCB0aGlzIHBvaW50IGluIHRpbWUgdG8gY3JlYXRlIGFuIGV4ZWN1dGFibGUgZXh0ZW5zaW9uLiBBIHZhbGlkIHJlYXNvbiBub3QgdG8gd291bGQgYmUgdGhhdCB0aGUgd29ya3NwYWNlIGlzCiAJICogc2h1dHRpbmcgZG9udy4KIAkgKiAKIAkgKiBAcGFyYW0gZWxlbWVudAogCSAqIEByZXR1cm4gPGNvZGU+dHJ1ZTwvY29kZT4gaWYgaXQgaXMgdmFsaWQgcG9pbnQgdG8gY3JlYXRlIGFuIGV4ZWN1dGFibGUgZXh0ZW5zaW9uLgogCSAqIAorCSAqIEBkZXByZWNhdGVkIFJlcGxhY2VkIGJ5IChAbGluayBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvcmUudXRpbC5SZWdpc3RyeVJlYWRlci5jYW5DcmVhdGVFeGVjdXRhYmxlRXh0ZW5zaW9uKCkpCiAJICogQHNpbmNlIDEuMC4wCiAJICovCiAJcHVibGljIHN0YXRpYyBib29sZWFuIGNhbkNyZWF0ZUV4ZWN1dGFibGVFeHRlbnNpb24oSUNvbmZpZ3VyYXRpb25FbGVtZW50IGVsZW1lbnQpIHsKLQkJaWYgKFBsYXRmb3JtLmlzUnVubmluZygpICYmIGdldFN5c3RlbUJ1bmRsZSgpLmdldFN0YXRlKCkgIT0gQnVuZGxlLlNUT1BQSU5HKQotCQkJcmV0dXJuIHRydWU7Ci0JCXJldHVybiBmYWxzZTsKKwkJcmV0dXJuIG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29yZS51dGlsLlJlZ2lzdHJ5UmVhZGVyLmNhbkNyZWF0ZUV4ZWN1dGFibGVFeHRlbnNpb24oZWxlbWVudCk7CiAJfQogCiAJLyoqCkBAIC0xNDksOCArNzcsNiBAQAogCSAqIEBzaW5jZSAxLjAuMAogCSAqLwogCXByb3RlY3RlZCBzdGF0aWMgQnVuZGxlIGdldFN5c3RlbUJ1bmRsZSgpIHsKLQkJaWYgKHN5c3RlbUJ1bmRsZSA9PSBudWxsKQotCQkJc3lzdGVtQnVuZGxlID0gUGxhdGZvcm0uZ2V0QnVuZGxlKCJvcmcuZWNsaXBzZS5vc2dpIik7IC8vJE5PTi1OTFMtMSQKLQkJcmV0dXJuIHN5c3RlbUJ1bmRsZTsKKwkJcmV0dXJuIG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29yZS51dGlsLlJlZ2lzdHJ5UmVhZGVyLmdldFN5c3RlbUJ1bmRsZSgpOwogCX0KIH0KZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2UuamVtLnV0aWwvamVtdXRpbC9vcmcvZWNsaXBzZS9qZW0vdXRpbC9VSUNvbnRleHREZXRlcm1pbmF0aW9uLmphdmEgYi9wbHVnaW5zL29yZy5lY2xpcHNlLmplbS51dGlsL2plbXV0aWwvb3JnL2VjbGlwc2UvamVtL3V0aWwvVUlDb250ZXh0RGV0ZXJtaW5hdGlvbi5qYXZhCmluZGV4IDg5NTU4ODIuLmNjY2Q2NjIgMTAwNjQ0Ci0tLSBhL3BsdWdpbnMvb3JnLmVjbGlwc2UuamVtLnV0aWwvamVtdXRpbC9vcmcvZWNsaXBzZS9qZW0vdXRpbC9VSUNvbnRleHREZXRlcm1pbmF0aW9uLmphdmEKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS5qZW0udXRpbC9qZW11dGlsL29yZy9lY2xpcHNlL2plbS91dGlsL1VJQ29udGV4dERldGVybWluYXRpb24uamF2YQpAQCAtMTAsNDEgKzEwLDI3IEBACiAgKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKi8KIC8qCiAgKiAgJCRSQ1NmaWxlOiBVSUNvbnRleHREZXRlcm1pbmF0aW9uLmphdmEsdiAkJAotICogICQkUmV2aXNpb246IDEuNSAkJCAgJCREYXRlOiAyMDA3LzA0LzEwIDAxOjA5OjM2ICQkIAorICogICQkUmV2aXNpb246IDEuNiAkJCAgJCREYXRlOiAyMDA5LzA3LzMwIDIyOjExOjIzICQkIAogICovCiBwYWNrYWdlIG9yZy5lY2xpcHNlLmplbS51dGlsOwotaW1wb3J0IGphdmEudXRpbC5IYXNoTWFwOwotaW1wb3J0IGphdmEudXRpbC5NYXA7Ci0KLWltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJ1bnRpbWUuKjsKLQotaW1wb3J0IG9yZy5lY2xpcHNlLmplbS51dGlsLmxvZ2dlci5wcm94eS5Mb2dnZXI7Ci1pbXBvcnQgb3JnLmVjbGlwc2UuamVtLnV0aWwucGx1Z2luLkpFTVV0aWxQbHVnaW47Ci0KIAogLyoqCiAgKiBTdGF0aWMgdXRpbGl0eSBjbGFzcyBmb3IgVUlDb250ZXh0IGRldGVybWluYXRpb24uCiAgKiAKKyAqIEBkZXByZWNhdGVkIFJlcGxhY2VkIGJ5IChAbGluayBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvcmUudXRpbC5VSUNvbnRleHREZXRlcm1pbmF0aW9uKQogICogQHNpbmNlIDEuMC4wCiAgKi8KLXB1YmxpYyBjbGFzcyBVSUNvbnRleHREZXRlcm1pbmF0aW9uIHsKK3B1YmxpYyBjbGFzcyBVSUNvbnRleHREZXRlcm1pbmF0aW9uIGV4dGVuZHMgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb3JlLnV0aWwuVUlDb250ZXh0RGV0ZXJtaW5hdGlvbiB7CiAKLQlwcml2YXRlIHN0YXRpYyBmaW5hbCBpbnQgVU5LTk9XTiA9IDEwMDsKKwlwdWJsaWMgc3RhdGljIGZpbmFsIFN0cmluZyBIRUFETEVTU19DT05URVhUX0xJVEVSQUwgPSBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvcmUudXRpbC5VSUNvbnRleHREZXRlcm1pbmF0aW9uLkhFQURMRVNTX0NPTlRFWFRfTElURVJBTDsKIAotCXB1YmxpYyBzdGF0aWMgZmluYWwgU3RyaW5nIEhFQURMRVNTX0NPTlRFWFRfTElURVJBTCA9ICJIZWFkbGVzcyI7IC8vJE5PTi1OTFMtMSQKKwlwdWJsaWMgc3RhdGljIGZpbmFsIFN0cmluZyBVSV9DT05URVhUX0xJVEVSQUwgPSBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvcmUudXRpbC5VSUNvbnRleHREZXRlcm1pbmF0aW9uLlVJX0NPTlRFWFRfTElURVJBTDsKIAotCXB1YmxpYyBzdGF0aWMgZmluYWwgU3RyaW5nIFVJX0NPTlRFWFRfTElURVJBTCA9ICJVSSI7IC8vJE5PTi1OTFMtMSQKKwlwdWJsaWMgc3RhdGljIGZpbmFsIGludCBIRUFETEVTU19DT05URVhUID0gb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb3JlLnV0aWwuVUlDb250ZXh0RGV0ZXJtaW5hdGlvbi5IRUFETEVTU19DT05URVhUOwogCi0JcHVibGljIHN0YXRpYyBmaW5hbCBpbnQgSEVBRExFU1NfQ09OVEVYVCA9IDEwMjsKKwlwdWJsaWMgc3RhdGljIGZpbmFsIGludCBVSV9DT05URVhUID0gb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb3JlLnV0aWwuVUlDb250ZXh0RGV0ZXJtaW5hdGlvbi5VSV9DT05URVhUOwogCi0JcHVibGljIHN0YXRpYyBmaW5hbCBpbnQgVUlfQ09OVEVYVCA9IDEwMTsKLQotCXByaXZhdGUgc3RhdGljIE1hcCBjYWNoZWRFeHRlbnNpb25zID0gbnVsbDsKLQotCXByaXZhdGUgc3RhdGljIGludCBjdXJyZW50Q29udGV4dCA9IFVOS05PV047Ci0KLQlwcml2YXRlIFVJQ29udGV4dERldGVybWluYXRpb24oKSB7Ci0JfQorCXByaXZhdGUgVUlDb250ZXh0RGV0ZXJtaW5hdGlvbigpe30KIAogCS8qKgogCSAqIFJldHVybnMgYW4gaW5zdGFuY2Ugb2YgYSBnaXZlbiBjbGFzcyBiYXNlZCBvbiB0aGUgVUkgb3IgSGVhZGxlc3MgY29udGV4dC4KQEAgLTUzLDIzICszOSwxMCBAQAogCSAqIEByZXR1cm4gbmV3IGNsYXNzIGluc3RhbmNlIGZvciB0aGUgZ2l2ZW4ga2V5LgogCSAqIEB0aHJvd3MgSWxsZWdhbEFyZ3VtZW50RXhjZXB0aW9uCiAJICogICAgICAgICAgICAgSWYgdGhlIGtleSBpcyBpbnZhbGlkIChlLmcuIG5vIGV4dGVuc2lvbiBpcyBmb3VuZCBmb3IgdGhlIGtleSkKKwkgKiBAZGVwcmVjYXRlZCBSZXBsYWNlZCBieSAoQGxpbmsgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb3JlLnV0aWwuVUlDb250ZXh0RGV0ZXJtaW5hdGlvbi5jcmVhdGVJbnN0YW5jZSgpKQogCSAqLwogCXB1YmxpYyBzdGF0aWMgT2JqZWN0IGNyZWF0ZUluc3RhbmNlKFN0cmluZyBrZXkpIHsKLQkJT2JqZWN0IHJlc3VsdCA9IG51bGw7Ci0JCWlmIChjYWNoZWRFeHRlbnNpb25zID09IG51bGwpCi0JCQlpbml0RXh0ZW5zaW9ucygpOwotCQlJQ29uZmlndXJhdGlvbkVsZW1lbnQgY29udGV4dFNlbnNpdGl2ZUNsYXNzID0gKElDb25maWd1cmF0aW9uRWxlbWVudCkgY2FjaGVkRXh0ZW5zaW9ucy5nZXQoa2V5KTsKLQkJdHJ5IHsKLQkJCWlmIChjb250ZXh0U2Vuc2l0aXZlQ2xhc3MgIT0gbnVsbCkKLQkJCQlyZXN1bHQgPSBjb250ZXh0U2Vuc2l0aXZlQ2xhc3MKLQkJCQkJCS5jcmVhdGVFeGVjdXRhYmxlRXh0ZW5zaW9uKFVJQ29udGV4dERldGVybWluYXRpb25SZWdpc3RyeVJlYWRlci5VSV9DT05URVhUX1NFTlNUSVZFX0NMQVNTX0NMQVNTTkFNRV9BVFRSKTsKLQkJfSBjYXRjaCAoQ29yZUV4Y2VwdGlvbiBlKSB7Ci0JCQlMb2dnZXIuZ2V0TG9nZ2VyKCkubG9nRXJyb3IoIlByb2JsZW0gbG9hZGluZyBleHRlbnNpb24gbm90IGZvdW5kIGZvciBrZXkgXCIiICsga2V5ICsgIlwiLiIpOyAvLyROT04tTkxTLTEkIC8vJE5PTi1OTFMtMiQKLQkJCUxvZ2dlci5nZXRMb2dnZXIoKS5sb2dFcnJvcihlKTsKLQkJfQotCQlpZiAocmVzdWx0ID09IG51bGwpCi0JCQlMb2dnZXIuZ2V0TG9nZ2VyKCkubG9nRXJyb3IoIkV4dGVuc2lvbiBub3QgZm91bmQgZm9yIGtleSBcIiIgKyBrZXkgKyAiXCIuIik7IC8vJE5PTi1OTFMtMSQgLy8kTk9OLU5MUy0yJAotCQlyZXR1cm4gcmVzdWx0OworCQlyZXR1cm4gb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb3JlLnV0aWwuVUlDb250ZXh0RGV0ZXJtaW5hdGlvbi5jcmVhdGVJbnN0YW5jZShrZXkpOwogCX0KIAogCS8qKgpAQCAtNzgsMTEzICs1MSw5IEBACiAJICogQHJldHVybiBjdXJyZW50IGNvbnRleHQKIAkgKiBAc2VlICNIRUFETEVTU19DT05URVhUCiAJICogQHNlZSAjVUlfQ09OVEVYVAorCSAqIEBkZXByZWNhdGVkIFJlcGxhY2VkIGJ5IChAbGluayBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvcmUudXRpbC5VSUNvbnRleHREZXRlcm1pbmF0aW9uLmdldEN1cnJlbnRDb250ZXh0KCkpCiAJICovCiAJcHVibGljIHN0YXRpYyBpbnQgZ2V0Q3VycmVudENvbnRleHQoKSB7Ci0JCWlmIChjdXJyZW50Q29udGV4dCA9PSBVTktOT1dOKSB7Ci0JCQljdXJyZW50Q29udGV4dCA9IEhFQURMRVNTX0NPTlRFWFQ7Ci0JCQluZXcgVUlUZXN0ZXJSZWdpc3RyeVJlYWRlcigpLnJlYWRSZWdpc3RyeSgpOwotCQl9Ci0JCXJldHVybiBjdXJyZW50Q29udGV4dDsKLQl9Ci0KLQkvKgotCSAqIEludm9rZXMgdGhlIFVJQ29udGV4dERldGVybWluYXRpb25SZWdpc3RyeVJlYWRlciB0byBjYWNoZSBhbGwgb2YgdGhlIGV4dGVuc2lvbnMsIGlmIG5lY2Vzc2FyeS4KLQkgKiAgCi0JICovCi0JcHJpdmF0ZSBzdGF0aWMgdm9pZCBpbml0RXh0ZW5zaW9ucygpIHsKLQkJaWYgKGNhY2hlZEV4dGVuc2lvbnMgPT0gbnVsbCkgewotCQkJY2FjaGVkRXh0ZW5zaW9ucyA9IG5ldyBIYXNoTWFwKCk7Ci0JCQluZXcgVUlDb250ZXh0RGV0ZXJtaW5hdGlvblJlZ2lzdHJ5UmVhZGVyKCkucmVhZFJlZ2lzdHJ5KCk7Ci0JCX0KLQl9Ci0KLQkvKgotCSAqIENvbnZlcnRzIHRoZSBpbnB1dCB0byBvbmUgb2YgVUlfQ09OVEVYVCBvciBIRUFETEVTU19DT05URVhULiBEZWZhdWx0cyB0byBIRUFETEVTUyBvbiBpbnZhbGlkIGlucHV0Ci0JICogCi0JICogQHBhcmFtIGxpdGVyYWwgQHJldHVybgotCSAqLwotCXByaXZhdGUgc3RhdGljIGludCBjb252ZXJ0TGl0ZXJhbChTdHJpbmcgbGl0ZXJhbCkgewotCQlyZXR1cm4gKFVJX0NPTlRFWFRfTElURVJBTC5lcXVhbHMobGl0ZXJhbCkpID8gVUlfQ09OVEVYVCA6IEhFQURMRVNTX0NPTlRFWFQ7Ci0JfQotCi0JLyoKLQkgKiBSZWFkcyB0aGUgcmVnaXN0cmF0aW9uIG9mIFVJIENvbnRleHQtc2Vuc2l0aXZlIGNsYXNzIGV4dGVuc2lvbnMgYW5kIGluaXRpYWxpemVzIHRoZSBjYWNoZSBvZiB0aGUgVUlDb250ZXh0RGV0ZXJtaW5hdGlvbiBvYmplY3QuCi0JICogCi0JICogQGF1dGhvciBtZGVsZGVyCi0JICovCi0JcHJpdmF0ZSBzdGF0aWMgY2xhc3MgVUlDb250ZXh0RGV0ZXJtaW5hdGlvblJlZ2lzdHJ5UmVhZGVyIGV4dGVuZHMgUmVnaXN0cnlSZWFkZXIgewotCi0JCXB1YmxpYyBzdGF0aWMgZmluYWwgU3RyaW5nIFVJX0NPTlRFWFRfU0VOU1RJVkVfQ0xBU1NfRUxFTUVOVCA9ICJ1aUNvbnRleHRTZW5zaXRpdmVDbGFzcyI7IC8vJE5PTi1OTFMtMSQKLQotCQlwdWJsaWMgc3RhdGljIGZpbmFsIFN0cmluZyBVSV9DT05URVhUX1NFTlNUSVZFX0NMQVNTX0tFWV9BVFRSID0gImtleSI7IC8vJE5PTi1OTFMtMSQKLQotCQlwdWJsaWMgc3RhdGljIGZpbmFsIFN0cmluZyBVSV9DT05URVhUX1NFTlNUSVZFX0NMQVNTX0NMQVNTTkFNRV9BVFRSID0gImNsYXNzTmFtZSI7IC8vJE5PTi1OTFMtMSQKLQotCQlwdWJsaWMgc3RhdGljIGZpbmFsIFN0cmluZyBVSV9DT05URVhUX1NFTlNUSVZFX0NMQVNTX0NPTlRFWFRfQVRUUiA9ICJjb250ZXh0IjsgLy8kTk9OLU5MUy0xJAotCi0JCXB1YmxpYyBVSUNvbnRleHREZXRlcm1pbmF0aW9uUmVnaXN0cnlSZWFkZXIoKSB7Ci0JCQlzdXBlcihKRU1VdGlsUGx1Z2luLlBMVUdJTl9JRCwgSkVNVXRpbFBsdWdpbi5VSV9DT05URVhUX0VYVEVOU0lPTl9QT0lOVCk7Ci0JCX0KLQotCQkvKgotCQkgKiAobm9uLUphdmFkb2MpCi0JCSAqIAotCQkgKiBAc2VlIG9yZy5lY2xpcHNlLmplbS51dGlsLlJlZ2lzdHJ5UmVhZGVyI3JlYWRFbGVtZW50KG9yZy5lY2xpcHNlLmNvcmUucnVudGltZS5JQ29uZmlndXJhdGlvbkVsZW1lbnQpCi0JCSAqLwotCQlwdWJsaWMgYm9vbGVhbiByZWFkRWxlbWVudChJQ29uZmlndXJhdGlvbkVsZW1lbnQgZWxlbWVudCkgewotCQkJYm9vbGVhbiByZXN1bHQgPSBmYWxzZTsKLQkJCWlmIChlbGVtZW50LmdldE5hbWUoKS5lcXVhbHMoVUlfQ09OVEVYVF9TRU5TVElWRV9DTEFTU19FTEVNRU5UKSkgewotCi0JCQkJU3RyaW5nIGtleSA9IGVsZW1lbnQuZ2V0QXR0cmlidXRlKFVJX0NPTlRFWFRfU0VOU1RJVkVfQ0xBU1NfS0VZX0FUVFIpOwotCQkJCVN0cmluZyBjb250ZXh0ID0gZWxlbWVudC5nZXRBdHRyaWJ1dGUoVUlfQ09OVEVYVF9TRU5TVElWRV9DTEFTU19DT05URVhUX0FUVFIpOwotCi0JCQkJaWYgKCFjYWNoZWRFeHRlbnNpb25zLmNvbnRhaW5zS2V5KGtleSkgfHwgZ2V0Q3VycmVudENvbnRleHQoKSA9PSBjb252ZXJ0TGl0ZXJhbChjb250ZXh0KSkKLQkJCQkJY2FjaGVkRXh0ZW5zaW9ucy5wdXQoa2V5LCBlbGVtZW50KTsKLQkJCQlyZXN1bHQgPSB0cnVlOwotCQkJfQotCQkJcmV0dXJuIHJlc3VsdDsKLQkJfQotCX0KLQotCS8qCi0JICogUmVhZHMgdGhlIHVpVGVzdGVyIGV4dGVuc2lvbiBhbmQgaW5zdGFudGlhdGUgdGhlIGFueSBvZiB0aGUgVUlUZXN0ZXIgY2xhc3NlcyBpdCBmaW5kcy4KLQkgKiAKLQkgKiBUaGUgaW1wbGVtZW50YXRpb24gaGFzIHRoZSBzaWRlIGVmZmVjdCB0aGF0IGlmIG11bHRpcGxlIFVJVGVzdGVycyBhcmUgcmVnaXN0ZXJlZCwgYW55IG9mIHRoZW0gY2FuIHRyaXAgdGhlIGN1cnJlbnRDb250ZXh0IGludG8gdGhlIFVJX0NPTlRFWFQKLQkgKiBzdGF0ZS4KLQkgKiAKLQkgKiBAYXV0aG9yIG1kZWxkZXIKLQkgKi8KLQlwcml2YXRlIHN0YXRpYyBjbGFzcyBVSVRlc3RlclJlZ2lzdHJ5UmVhZGVyIGV4dGVuZHMgUmVnaXN0cnlSZWFkZXIgewotCi0JCXB1YmxpYyBzdGF0aWMgZmluYWwgU3RyaW5nIFVJX1RFU1RFUl9FTEVNRU5UID0gInVpVGVzdGVyIjsgLy8kTk9OLU5MUy0xJAotCi0JCXB1YmxpYyBzdGF0aWMgZmluYWwgU3RyaW5nIFVJX1RFU1RFUl9DTEFTU05BTUVfQVRUUiA9ICJjbGFzc05hbWUiOyAvLyROT04tTkxTLTEkCi0KLQkJcHVibGljIFVJVGVzdGVyUmVnaXN0cnlSZWFkZXIoKSB7Ci0JCQlzdXBlcihKRU1VdGlsUGx1Z2luLlBMVUdJTl9JRCwgSkVNVXRpbFBsdWdpbi5VSV9URVNURVJfRVhURU5TSU9OX1BPSU5UKTsKLQkJfQotCi0JCS8qCi0JCSAqIChub24tSmF2YWRvYykKLQkJICogCi0JCSAqIEBzZWUgY29tLmlibS5ldG9vbHMuZW1mLndvcmtiZW5jaC5SZWdpc3RyeVJlYWRlciNyZWFkRWxlbWVudChvcmcuZWNsaXBzZS5jb3JlLnJ1bnRpbWUuSUNvbmZpZ3VyYXRpb25FbGVtZW50KQotCQkgKi8KLQkJcHVibGljIGJvb2xlYW4gcmVhZEVsZW1lbnQoSUNvbmZpZ3VyYXRpb25FbGVtZW50IGVsZW1lbnQpIHsKLQkJCWJvb2xlYW4gcmVzdWx0ID0gZmFsc2U7Ci0JCQlpZiAoZWxlbWVudC5nZXROYW1lKCkuZXF1YWxzKFVJX1RFU1RFUl9FTEVNRU5UKSkgewotCQkJCXJlc3VsdCA9IHRydWU7Ci0JCQkJdHJ5IHsKLQkJCQkJLy8gRG9uJ3QgYm90aGVyIHJ1bm5pbmcgdGVzdGVyIGl0IGlmIHdlIGFscmVhZHkgcHJvY2Vzc2VkIG9uZSBleHRlbnNpb24gdGhhdCByZXR1cm5lZCB0cnVlLgotCQkJCQlpZiAoY3VycmVudENvbnRleHQgIT0gVUlfQ09OVEVYVCAmJiBjYW5DcmVhdGVFeGVjdXRhYmxlRXh0ZW5zaW9uKGVsZW1lbnQpKSB7Ci0JCQkJCQlVSVRlc3RlciB0ZXN0ZXIgPSAoVUlUZXN0ZXIpIGVsZW1lbnQuY3JlYXRlRXhlY3V0YWJsZUV4dGVuc2lvbihVSV9URVNURVJfQ0xBU1NOQU1FX0FUVFIpOwotCQkJCQkJaWYgKHRlc3Rlci5pc0N1cnJlbnRDb250ZXh0VUkoKSkKLQkJCQkJCQljdXJyZW50Q29udGV4dCA9IFVJX0NPTlRFWFQ7Ci0JCQkJCX0KLQkJCQl9IGNhdGNoIChFeGNlcHRpb24gdCkgewotCQkJCQlMb2dnZXIuZ2V0TG9nZ2VyKCkubG9nKCJVSUNvbnRleHREZXRlcm1pbmF0aW9uIGlzIHByb2NlZWRpbmcgaW4gSEVBRExFU1MgbW9kZSIpOyAvLyROT04tTkxTLTEkCi0JCQkJfQotCQkJfQotCQkJcmV0dXJuIHJlc3VsdDsKLQkJfQorCQlyZXR1cm4gb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb3JlLnV0aWwuVUlDb250ZXh0RGV0ZXJtaW5hdGlvbi5nZXRDdXJyZW50Q29udGV4dCgpOwogCX0KIH0KXCBObyBuZXdsaW5lIGF0IGVuZCBvZiBmaWxlCmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLmplbS51dGlsL2plbXV0aWwvb3JnL2VjbGlwc2UvamVtL3V0aWwvVUlUZXN0ZXIuamF2YSBiL3BsdWdpbnMvb3JnLmVjbGlwc2UuamVtLnV0aWwvamVtdXRpbC9vcmcvZWNsaXBzZS9qZW0vdXRpbC9VSVRlc3Rlci5qYXZhCmluZGV4IDU0NTE3ZTguLmNkMWIyMzUgMTAwNjQ0Ci0tLSBhL3BsdWdpbnMvb3JnLmVjbGlwc2UuamVtLnV0aWwvamVtdXRpbC9vcmcvZWNsaXBzZS9qZW0vdXRpbC9VSVRlc3Rlci5qYXZhCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2UuamVtLnV0aWwvamVtdXRpbC9vcmcvZWNsaXBzZS9qZW0vdXRpbC9VSVRlc3Rlci5qYXZhCkBAIC05LDIzICs5LDEzIEBACiAgKiBDb250cmlidXRvcnM6CiAgKiAgICAgSUJNIENvcnBvcmF0aW9uIC0gaW5pdGlhbCBBUEkgYW5kIGltcGxlbWVudGF0aW9uCiAgKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKi8KLS8qCi0gKiAgJCRSQ1NmaWxlOiBVSVRlc3Rlci5qYXZhLHYgJCQKLSAqICAkJFJldmlzaW9uOiAxLjIgJCQgICQkRGF0ZTogMjAwNS8wMi8xNSAyMzowNDoxNCAkJCAKLSAqLworCiAvKioKICAqIEludGVyZmFjZSBmb3IgYSBVSVRlc3Rlci4gVGhlICJjbGFzc25hbWUiIGF0dHJpYnV0ZSBvbiB0aGUgInVpVGVzdGVyIiBleHRlbnNpb24gcG9pbnQgc2hvdWxkIGltcGxlbWVudCB0aGlzIGNsYXNzLgotICogCisgKgorICogQGRlcHJlY2F0ZWQgUmVwbGFjZWQgYnkge0BsaW5rIG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29yZS51dGlsLlVJVGVzdGVyKQogICogQHNpbmNlIDEuMC4wCiAgKi8KLXB1YmxpYyBpbnRlcmZhY2UgVUlUZXN0ZXIgeworcHVibGljIGludGVyZmFjZSBVSVRlc3RlciBleHRlbmRzIG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29yZS51dGlsLlVJVGVzdGVyIHsKIAotCS8qKgotCSAqIEFuc3dlciBpZiB0aGUgY3VycmVudCBjb250ZXh0IGlzIGFuIFVJIGNvbnRleHQuCi0JICogCi0JICogQHJldHVybiA8Y29kZT50cnVlPC9jb2RlPiBpZiBhbiBVSSBjb250ZXh0LgotCSAqIAotCSAqIEBzaW5jZSAxLjAuMAotCSAqLwotCXB1YmxpYyBib29sZWFuIGlzQ3VycmVudENvbnRleHRVSSgpOwogfQpcIE5vIG5ld2xpbmUgYXQgZW5kIG9mIGZpbGUKZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2UuamVtLnV0aWwvamVtdXRpbC9vcmcvZWNsaXBzZS9qZW0vdXRpbC9lbWYvd29ya2JlbmNoL1Jlc291cmNlU2V0V29ya2JlbmNoU3luY2hyb25pemVyLmphdmEgYi9wbHVnaW5zL29yZy5lY2xpcHNlLmplbS51dGlsL2plbXV0aWwvb3JnL2VjbGlwc2UvamVtL3V0aWwvZW1mL3dvcmtiZW5jaC9SZXNvdXJjZVNldFdvcmtiZW5jaFN5bmNocm9uaXplci5qYXZhCmluZGV4IDFjZWM1OTcuLjAyYjUwNTQgMTAwNjQ0Ci0tLSBhL3BsdWdpbnMvb3JnLmVjbGlwc2UuamVtLnV0aWwvamVtdXRpbC9vcmcvZWNsaXBzZS9qZW0vdXRpbC9lbWYvd29ya2JlbmNoL1Jlc291cmNlU2V0V29ya2JlbmNoU3luY2hyb25pemVyLmphdmEKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS5qZW0udXRpbC9qZW11dGlsL29yZy9lY2xpcHNlL2plbS91dGlsL2VtZi93b3JrYmVuY2gvUmVzb3VyY2VTZXRXb3JrYmVuY2hTeW5jaHJvbml6ZXIuamF2YQpAQCAtMTAsMTMgKzEwLDEyIEBACiAgKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKi8KIC8qCiAgKiAgJCRSQ1NmaWxlOiBSZXNvdXJjZVNldFdvcmtiZW5jaFN5bmNocm9uaXplci5qYXZhLHYgJCQKLSAqICAkJFJldmlzaW9uOiAxLjQgJCQgICQkRGF0ZTogMjAwNi8wNS8xNyAyMDoxMzo0NSAkJCAKKyAqICAkJFJldmlzaW9uOiAxLjkgJCQgICQkRGF0ZTogMjAxMC8wNS8xMiAyMjo0Nzo0NSAkJCAKICAqLwogCiBwYWNrYWdlIG9yZy5lY2xpcHNlLmplbS51dGlsLmVtZi53b3JrYmVuY2g7CiAKLWltcG9ydCBqYXZhLnV0aWwuQXJyYXlMaXN0OwotaW1wb3J0IGphdmEudXRpbC5MaXN0OworaW1wb3J0IGphdmEudXRpbC4qOwogCiBpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5yZXNvdXJjZXMuKjsKIGltcG9ydCBvcmcuZWNsaXBzZS5lbWYuZWNvcmUucmVzb3VyY2UuUmVzb3VyY2VTZXQ7CkBAIC0zNyw3ICszNiwxMDkgQEAKIAlwcm90ZWN0ZWQgUmVzb3VyY2VTZXQgcmVzb3VyY2VTZXQ7CiAKIAkvKiogRXh0ZW5kZXJzIHRoYXQgd2lsbCBiZSBub3RpZmllZCBhZnRlciBhIHByZSBidWlsZCByZXNvdXJjZSBjaGFuZ2UgKi8KLQlwcm90ZWN0ZWQgTGlzdCBleHRlbmRlcnM7CisJcHJvdGVjdGVkIFF1ZXVpbmdIYXNoU2V0IDxJU3luY2hyb25pemVyRXh0ZW5kZXI+IGV4dGVuZGVyczsKKworCS8qKgorCSAqIFRoaXMgSGFzaFNldCBpcyBzaW1pbGFyIHRvIGEgcmVndWxhciBIYXNoU2V0IGV4Y2VwdCBpdCBjYW4gYmUgcHV0IGluCisJICogcXVldWluZyBtb2RlIHdpdGggYSBjYWxsIHRvIHRoZSB7QGxpbmsgI3N0YXJ0UXVldWluZygpfSBtZXRob2QuCisJICogV2hpbGUgaW4gcXVldWluZyBtb2RlIGFueSBhZGRzIG9yIHJlbW92ZXMgd2lsbCBub3QgYmUgY29tbWl0dGVkIHRvIAorCSAqIHRoZSBzZXQgdW50aWwgYSBjYWxsIHRvIHtAbGluayAjc3RvcFF1ZXVpbmcoKX0gaXMgbWFkZS4gVGhpcyBhbGxvd3MKKwkgKiB0aGUgUXVldWluZ0hhc1NldCB0byBiZSBwdXQgaW4gcXVldWluZyBtb2RlIHByaW9yIHRvIGl0ZXJhdGluZyBvdmVyCisJICogdGhlIGNvbnRlbnRzIHdpdGhvdXQgbmVlZGluZyB0byB3b3JyeSBhYm91dCBjaGFuZ2VzIGNvbWluZyBpbiBhbmQKKwkgKiB0aHJvd2luZyBDb25jdXJyZW50TW9kaWZpY2F0aW9uRXhjZXB0aW9ucy4KKwkgKiAKKwkgKiBAYXV0aG9yIGpzaG9sbAorCSAqCisJICogQHBhcmFtIDxFPgorCSAqLworCXByb3RlY3RlZCBjbGFzcyBRdWV1aW5nSGFzaFNldCA8RT4gZXh0ZW5kcyBIYXNoU2V0IDxFPiB7CisKKwkJcHJpdmF0ZSBzdGF0aWMgZmluYWwgbG9uZyBzZXJpYWxWZXJzaW9uVUlEID0gNjk1OTM1NDA2MDk1MDgxNjc4NEw7CisJCisJCXByaXZhdGUgT2JqZWN0IGxvY2sgPSBuZXcgT2JqZWN0KCk7CisJCQorCQlwcml2YXRlIGJvb2xlYW4gcXVldWluZyA9IGZhbHNlOworCQlwcml2YXRlIFNldCA8RT4gYWRkUXVldWUgPSBudWxsOworCQlwcml2YXRlIFNldCByZW1vdmVRdWV1ZSA9IG51bGw7CisJCXByaXZhdGUgaW50IGluaXRpYWxDYXBhY2l0eSA9IDM7CisJCQorCQlwdWJsaWMgUXVldWluZ0hhc2hTZXQoaW50IGNhcGFjaXR5KSB7CisJCQlzdXBlcihjYXBhY2l0eSk7CisJCQlhZGRRdWV1ZSA9IG5ldyBIYXNoU2V0PEU+KGNhcGFjaXR5KTsKKwkJCXJlbW92ZVF1ZXVlID0gbmV3IEhhc2hTZXQoY2FwYWNpdHkpOworCQkJaW5pdGlhbENhcGFjaXR5ID0gY2FwYWNpdHk7CisJCX0KKworCQlwdWJsaWMgdm9pZCBzdGFydFF1ZXVpbmcoKSB7CisJCQlzeW5jaHJvbml6ZWQobG9jayl7CisJCQkJaWYocXVldWluZyl7CisJCQkJCXRocm93IG5ldyBVbnN1cHBvcnRlZE9wZXJhdGlvbkV4Y2VwdGlvbigic3RhcnRRdWV1aW5nIG1heSBvbmx5IGJlIGNhbGxlZCB3aGlsZSBub3QgYWxyZWFkeSBxdWV1aW5nIik7CisJCQkJfQorCQkJCXRoaXMucXVldWluZyA9IHRydWU7CisJCQkJYWRkUXVldWUuY2xlYXIoKTsKKwkJCQlyZW1vdmVRdWV1ZS5jbGVhcigpOworCQkJfQorCQl9CisKKwkJLyoqCisJCSAqIFJldHVybnMgdGhlIHNldCBvZiBhZGRzIHdoaWNoIG9jY3VycmVkIHdoaWxlIGluIHF1ZXVpbmcgbW9kZS4KKwkJICogQHJldHVybgorCQkgKi8KKwkJcHVibGljIFNldCA8RT4gc3RvcFF1ZXVpbmcoKSB7CisJCQlzeW5jaHJvbml6ZWQobG9jayl7CisJCQkJaWYoIXF1ZXVpbmcpeworCQkJCQl0aHJvdyBuZXcgVW5zdXBwb3J0ZWRPcGVyYXRpb25FeGNlcHRpb24oInN0b3BRdWV1aW5nIG1heSBvbmx5IGJlIGNhbGxlZCB3aGlsZSBxdWV1aW5nIik7CisJCQkJfQorCQkJCXF1ZXVpbmcgPSBmYWxzZTsKKwkJCQlyZW1vdmVBbGwocmVtb3ZlUXVldWUpOworCQkJCWFkZEFsbChhZGRRdWV1ZSk7CisJCQkJaWYoIWFkZFF1ZXVlLmlzRW1wdHkoKSl7CisJCQkJCVNldCA8RT4gcXVldWUgPSBhZGRRdWV1ZTsKKwkJCQkJYWRkUXVldWUgPSBuZXcgSGFzaFNldDxFPihpbml0aWFsQ2FwYWNpdHkpOworCQkJCQlyZXR1cm4gcXVldWU7CisJCQkJfQorCQkJCXJldHVybiBDb2xsZWN0aW9ucy5lbXB0eVNldCgpOworCQkJfQorCQl9CisJCQorCQlAT3ZlcnJpZGUKKwkJcHVibGljIGJvb2xlYW4gYWRkKEUgb2JqZWN0KSB7CisJCQlzeW5jaHJvbml6ZWQgKGxvY2spIHsKKwkJCQlpZihxdWV1aW5nKXsKKwkJCQkJaWYoY29udGFpbnMob2JqZWN0KSl7CisJCQkJCQlyZXR1cm4gZmFsc2U7CisJCQkJCX0KKwkJCQkJcmV0dXJuIGFkZFF1ZXVlLmFkZChvYmplY3QpOworCQkJCX0gZWxzZXsKKwkJCQkJcmV0dXJuIHN1cGVyLmFkZChvYmplY3QpOworCQkJCX0KKwkJCX0KKwkJfQorCQkKKwkJQE92ZXJyaWRlCisJCXB1YmxpYyBib29sZWFuIHJlbW92ZShPYmplY3Qgb2JqZWN0KSB7CisJCQlzeW5jaHJvbml6ZWQgKGxvY2spIHsKKwkJCQlpZihxdWV1aW5nKXsKKwkJCQkJaWYoY29udGFpbnMob2JqZWN0KSl7CisJCQkJCQlyZXR1cm4gcmVtb3ZlUXVldWUuYWRkKG9iamVjdCk7CisJCQkJCX0gZWxzZSB7CisJCQkJCQlyZXR1cm4gZmFsc2U7CisJCQkJCX0KKwkJCQl9IGVsc2UgeworCQkJCQlyZXR1cm4gc3VwZXIucmVtb3ZlKG9iamVjdCk7CisJCQkJfQorCQkJfQorCQl9CisJCQorCQlAT3ZlcnJpZGUKKwkJcHVibGljIGJvb2xlYW4gaXNFbXB0eSgpIHsKKwkJCXN5bmNocm9uaXplZCAobG9jaykgeworCQkJCXJldHVybiBzdXBlci5pc0VtcHR5KCk7CQorCQkJfQorCQl9CisJCQorCX07CisJCiAKIAkvKiogVGhlIGRlbHRhIGZvciB0aGlzIHByb2plY3QgdGhhdCB3aWxsIGJlIGJyb2FkY2FzdCB0byB0aGUgZXh0ZW5kZXJzICovCiAJcHJvdGVjdGVkIElSZXNvdXJjZURlbHRhIGN1cnJlbnRQcm9qZWN0RGVsdGE7CkBAIC04NiwxOSArMTg3LDM3IEBACiAKIAogCXByb3RlY3RlZCB2b2lkIG5vdGlmeUV4dGVuZGVyc0lmTmVjZXNzYXJ5KCkgewotCQlpZiAoY3VycmVudEV2ZW50VHlwZSAhPSBJUmVzb3VyY2VDaGFuZ2VFdmVudC5QT1NUX0NIQU5HRSB8fCBleHRlbmRlcnMgPT0gbnVsbCB8fCBjdXJyZW50UHJvamVjdERlbHRhID09IG51bGwpCisJCWlmIChjdXJyZW50RXZlbnRUeXBlICE9IElSZXNvdXJjZUNoYW5nZUV2ZW50LlBPU1RfQ0hBTkdFIHx8IGN1cnJlbnRQcm9qZWN0RGVsdGEgPT0gbnVsbCkKIAkJCXJldHVybjsKLQkJZm9yIChpbnQgaSA9IDA7IGkgPCBleHRlbmRlcnMuc2l6ZSgpOyBpKyspIHsKLQkJCUlTeW5jaHJvbml6ZXJFeHRlbmRlciBleHRlbmRlciA9IChJU3luY2hyb25pemVyRXh0ZW5kZXIpIGV4dGVuZGVycy5nZXQoaSk7Ci0JCQlleHRlbmRlci5wcm9qZWN0Q2hhbmdlZChjdXJyZW50UHJvamVjdERlbHRhKTsKKwkJaWYoZXh0ZW5kZXJzICE9IG51bGwpeworCQkJU2V0IDxJU3luY2hyb25pemVyRXh0ZW5kZXI+IGV4dGVuZGVyc1RvTm90aWZ5ID0gZXh0ZW5kZXJzOworCQkJd2hpbGUoIWV4dGVuZGVyc1RvTm90aWZ5LmlzRW1wdHkoKSl7CisJCQkJdHJ5eworCQkJCQlleHRlbmRlcnMuc3RhcnRRdWV1aW5nKCk7CisJCQkJCWZvciAoSXRlcmF0b3IgPElTeW5jaHJvbml6ZXJFeHRlbmRlcj4gaXRlcmF0b3IgPSBleHRlbmRlcnNUb05vdGlmeS5pdGVyYXRvcigpOyBpdGVyYXRvci5oYXNOZXh0KCk7KSB7CisJCQkJCQlJU3luY2hyb25pemVyRXh0ZW5kZXIgZXh0ZW5kZXIgPSBpdGVyYXRvci5uZXh0KCk7CisJCQkJCQlleHRlbmRlci5wcm9qZWN0Q2hhbmdlZChjdXJyZW50UHJvamVjdERlbHRhKTsKKwkJCQkJfQorCQkJCX0gZmluYWxseSB7CisJCQkJCWV4dGVuZGVyc1RvTm90aWZ5ID0gZXh0ZW5kZXJzLnN0b3BRdWV1aW5nKCk7CisJCQkJfQorCQkJfQogCQl9CiAJfQogCiAJcHJvdGVjdGVkIHZvaWQgbm90aWZ5RXh0ZW5kZXJzT2ZDbG9zZSgpIHsKLQkJaWYgKGV4dGVuZGVycyAhPSBudWxsICYmICFleHRlbmRlcnMuaXNFbXB0eSgpKSB7Ci0JCQlmb3IgKGludCBpID0gMDsgaSA8IGV4dGVuZGVycy5zaXplKCk7IGkrKykgewotCQkJCUlTeW5jaHJvbml6ZXJFeHRlbmRlciBleHRlbmRlciA9IChJU3luY2hyb25pemVyRXh0ZW5kZXIpIGV4dGVuZGVycy5nZXQoaSk7Ci0JCQkJZXh0ZW5kZXIucHJvamVjdENsb3NlZCgpOworCQlpZihleHRlbmRlcnMgIT0gbnVsbCl7CisJCQlTZXQgPElTeW5jaHJvbml6ZXJFeHRlbmRlcj4gZXh0ZW5kZXJzVG9Ob3RpZnkgPSBleHRlbmRlcnM7CisJCQl3aGlsZSghZXh0ZW5kZXJzVG9Ob3RpZnkuaXNFbXB0eSgpKXsKKwkJCQl0cnl7CisJCQkJCWV4dGVuZGVycy5zdGFydFF1ZXVpbmcoKTsKKwkJCQkJZm9yIChJdGVyYXRvciA8SVN5bmNocm9uaXplckV4dGVuZGVyPiBpdGVyYXRvciA9IGV4dGVuZGVyc1RvTm90aWZ5Lml0ZXJhdG9yKCk7IGl0ZXJhdG9yLmhhc05leHQoKTspIHsKKwkJCQkJCUlTeW5jaHJvbml6ZXJFeHRlbmRlciBleHRlbmRlciA9IGl0ZXJhdG9yLm5leHQoKTsKKwkJCQkJCWV4dGVuZGVyLnByb2plY3RDbG9zZWQoKTsKKwkJCQkJfQorCQkJCX0gZmluYWxseSB7CisJCQkJCWV4dGVuZGVyc1RvTm90aWZ5ID0gZXh0ZW5kZXJzLnN0b3BRdWV1aW5nKCk7CisJCQkJfQogCQkJfQogCQl9CiAJfQpAQCAtMTQ3LDggKzI2Niw5IEBACiAJICogQHNpbmNlIDEuMC4wCiAJICovCiAJcHVibGljIHZvaWQgYWRkRXh0ZW5kZXIoSVN5bmNocm9uaXplckV4dGVuZGVyIGV4dGVuZGVyKSB7Ci0JCWlmIChleHRlbmRlcnMgPT0gbnVsbCkKLQkJCWV4dGVuZGVycyA9IG5ldyBBcnJheUxpc3QoMyk7CisJCWlmIChleHRlbmRlcnMgPT0gbnVsbCl7CisJCQlleHRlbmRlcnMgPSBuZXcgUXVldWluZ0hhc2hTZXQgPElTeW5jaHJvbml6ZXJFeHRlbmRlcj4oMyk7CisJCX0KIAkJZXh0ZW5kZXJzLmFkZChleHRlbmRlcik7CiAJfQogCmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLmplbS51dGlsL2plbXV0aWwvb3JnL2VjbGlwc2UvamVtL3V0aWwvbG9nZ2VyL3Byb3h5cmVuZGVyL0Fic3RyYWN0V29ya0JlbmNoUmVuZGVyZXIuamF2YSBiL3BsdWdpbnMvb3JnLmVjbGlwc2UuamVtLnV0aWwvamVtdXRpbC9vcmcvZWNsaXBzZS9qZW0vdXRpbC9sb2dnZXIvcHJveHlyZW5kZXIvQWJzdHJhY3RXb3JrQmVuY2hSZW5kZXJlci5qYXZhCmluZGV4IGIyYzE0NzMuLjE1YTU0NGYgMTAwNjQ0Ci0tLSBhL3BsdWdpbnMvb3JnLmVjbGlwc2UuamVtLnV0aWwvamVtdXRpbC9vcmcvZWNsaXBzZS9qZW0vdXRpbC9sb2dnZXIvcHJveHlyZW5kZXIvQWJzdHJhY3RXb3JrQmVuY2hSZW5kZXJlci5qYXZhCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2UuamVtLnV0aWwvamVtdXRpbC9vcmcvZWNsaXBzZS9qZW0vdXRpbC9sb2dnZXIvcHJveHlyZW5kZXIvQWJzdHJhY3RXb3JrQmVuY2hSZW5kZXJlci5qYXZhCkBAIC0yNCw2ICsyNCw3IEBACiAKIAogLyoqCisgKiBAZGVwcmVjYXRlZCBQbHVnaW4gZXJyb3IgbG9nZ2luZyBzaG91bGQgYmUgdXNlZCBpbnN0ZWFkCiAgKiBCYXNlIGxvZyByZW5kZXJlciB0aGF0IGxvZ3MgdG8gdGhlIHdvcmtiZW5jaC4KICAqIAogICogQHNpbmNlIDEuMS4wCmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLmplbS51dGlsL2plbXV0aWwvb3JnL2VjbGlwc2UvamVtL3V0aWwvbG9nZ2VyL3Byb3h5cmVuZGVyL0NvbnNvbGVMb2dSZW5kZXJlci5qYXZhIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS5qZW0udXRpbC9qZW11dGlsL29yZy9lY2xpcHNlL2plbS91dGlsL2xvZ2dlci9wcm94eXJlbmRlci9Db25zb2xlTG9nUmVuZGVyZXIuamF2YQppbmRleCAwODEwZTJkLi5iZmRjYWJhIDEwMDY0NAotLS0gYS9wbHVnaW5zL29yZy5lY2xpcHNlLmplbS51dGlsL2plbXV0aWwvb3JnL2VjbGlwc2UvamVtL3V0aWwvbG9nZ2VyL3Byb3h5cmVuZGVyL0NvbnNvbGVMb2dSZW5kZXJlci5qYXZhCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2UuamVtLnV0aWwvamVtdXRpbC9vcmcvZWNsaXBzZS9qZW0vdXRpbC9sb2dnZXIvcHJveHlyZW5kZXIvQ29uc29sZUxvZ1JlbmRlcmVyLmphdmEKQEAgLTIxLDYgKzIxLDcgQEAKIAogCiAvKioKKyAqIEBkZXByZWNhdGVkIFBsdWdpbiBlcnJvciBsb2dnaW5nIHNob3VsZCBiZSB1c2VkIGluc3RlYWQKICAqIExvZyByZW5kZXJlciB0byB0aGUgY29uc29sZS4KICAqIAogICogQHNpbmNlIDEuMC4wCmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLmplbS51dGlsL2plbXV0aWwvb3JnL2VjbGlwc2UvamVtL3V0aWwvbG9nZ2VyL3Byb3h5cmVuZGVyL0RlZmF1bHRQbHVnaW5UcmFjZVJlbmRlcmVyLmphdmEgYi9wbHVnaW5zL29yZy5lY2xpcHNlLmplbS51dGlsL2plbXV0aWwvb3JnL2VjbGlwc2UvamVtL3V0aWwvbG9nZ2VyL3Byb3h5cmVuZGVyL0RlZmF1bHRQbHVnaW5UcmFjZVJlbmRlcmVyLmphdmEKaW5kZXggMDQ3MzMxOC4uYzQyZmFhNiAxMDA2NDQKLS0tIGEvcGx1Z2lucy9vcmcuZWNsaXBzZS5qZW0udXRpbC9qZW11dGlsL29yZy9lY2xpcHNlL2plbS91dGlsL2xvZ2dlci9wcm94eXJlbmRlci9EZWZhdWx0UGx1Z2luVHJhY2VSZW5kZXJlci5qYXZhCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2UuamVtLnV0aWwvamVtdXRpbC9vcmcvZWNsaXBzZS9qZW0vdXRpbC9sb2dnZXIvcHJveHlyZW5kZXIvRGVmYXVsdFBsdWdpblRyYWNlUmVuZGVyZXIuamF2YQpAQCAtMjMsNiArMjMsNyBAQAogCiAKIC8qKgorICogQGRlcHJlY2F0ZWQgUGx1Z2luIGVycm9yIGxvZ2dpbmcgc2hvdWxkIGJlIHVzZWQgaW5zdGVhZAogICogTG9nZ2VyIHRoYXQgYWxzbyBsb2dzIHRvIGEgdHJhY2UgZmlsZSBpbiB0aGUgcGx1Z2luJ3MgbWV0YWRhdGEgYXJlYS4KICAqIAogICogQHNpbmNlIDEuMC4wCmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLmplbS51dGlsL2plbXV0aWwvb3JnL2VjbGlwc2UvamVtL3V0aWwvbG9nZ2VyL3Byb3h5cmVuZGVyL0VjbGlwc2VMb2dnZXIuamF2YSBiL3BsdWdpbnMvb3JnLmVjbGlwc2UuamVtLnV0aWwvamVtdXRpbC9vcmcvZWNsaXBzZS9qZW0vdXRpbC9sb2dnZXIvcHJveHlyZW5kZXIvRWNsaXBzZUxvZ2dlci5qYXZhCmluZGV4IDg1OTEyNjcuLjg1ZjU2Y2EgMTAwNjQ0Ci0tLSBhL3BsdWdpbnMvb3JnLmVjbGlwc2UuamVtLnV0aWwvamVtdXRpbC9vcmcvZWNsaXBzZS9qZW0vdXRpbC9sb2dnZXIvcHJveHlyZW5kZXIvRWNsaXBzZUxvZ2dlci5qYXZhCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2UuamVtLnV0aWwvamVtdXRpbC9vcmcvZWNsaXBzZS9qZW0vdXRpbC9sb2dnZXIvcHJveHlyZW5kZXIvRWNsaXBzZUxvZ2dlci5qYXZhCkBAIC0yNSw2ICsyNSw3IEBACiAKICAKIC8qKgorICogQGRlcHJlY2F0ZWQgUGx1Z2luIGVycm9yIGxvZ2dpbmcgc2hvdWxkIGJlIHVzZWQgaW5zdGVhZAogICogR2V0IGFuIEVjbGlwc2UgbG9nZ2VyLiBUaGlzIGdldHMgYSBsb2dnZXIgdGhhdCBrbm93cyBpdCBpcyBmb3IgYSBwbHVnaW4uIAogICogCiAgKiBGb3IgZWFjaCBwbHVnaW4sIHRoZSBmb2xsb3dpbmcgY2FuIGJlIHNwZWNpZmllZCBpbiB0aGUgLm9wdGlvbiBmaWxlOgpkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS5qZW0udXRpbC9qZW11dGlsL29yZy9lY2xpcHNlL2plbS91dGlsL2xvZ2dlci9wcm94eXJlbmRlci9JTXNnTG9nZ2VyLmphdmEgYi9wbHVnaW5zL29yZy5lY2xpcHNlLmplbS51dGlsL2plbXV0aWwvb3JnL2VjbGlwc2UvamVtL3V0aWwvbG9nZ2VyL3Byb3h5cmVuZGVyL0lNc2dMb2dnZXIuamF2YQppbmRleCA1OGY0NWQ1Li40YWQ1MDI0IDEwMDY0NAotLS0gYS9wbHVnaW5zL29yZy5lY2xpcHNlLmplbS51dGlsL2plbXV0aWwvb3JnL2VjbGlwc2UvamVtL3V0aWwvbG9nZ2VyL3Byb3h5cmVuZGVyL0lNc2dMb2dnZXIuamF2YQorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLmplbS51dGlsL2plbXV0aWwvb3JnL2VjbGlwc2UvamVtL3V0aWwvbG9nZ2VyL3Byb3h5cmVuZGVyL0lNc2dMb2dnZXIuamF2YQpAQCAtMTcsNiArMTcsNyBAQAogaW1wb3J0IG9yZy5lY2xpcHNlLmplbS51dGlsLmxvZ2dlci5wcm94eS5Mb2dnZXI7CiAKIC8qKgorICogQGRlcHJlY2F0ZWQgUGx1Z2luIGVycm9yIGxvZ2dpbmcgc2hvdWxkIGJlIHVzZWQgaW5zdGVhZAogICogSW50ZXJmYWNlIGZvciBhIG1lc3NhZ2UgbG9nZ2VyLgogICogCiAgKiBAc2luY2UgMS4wLjAKZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2UuanN0LmNvbW1vbi51aS8uY2xhc3NwYXRoIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS5qc3QuY29tbW9uLnVpLy5jbGFzc3BhdGgKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uNjRjNWUzMQotLS0gL2Rldi9udWxsCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2UuanN0LmNvbW1vbi51aS8uY2xhc3NwYXRoCkBAIC0wLDAgKzEsNyBAQAorPD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KKzxjbGFzc3BhdGg+CisJPGNsYXNzcGF0aGVudHJ5IGtpbmQ9ImNvbiIgcGF0aD0ib3JnLmVjbGlwc2UuamR0LmxhdW5jaGluZy5KUkVfQ09OVEFJTkVSL29yZy5lY2xpcHNlLmpkdC5pbnRlcm5hbC5kZWJ1Zy51aS5sYXVuY2hlci5TdGFuZGFyZFZNVHlwZS9KMlNFLTEuNSIvPgorCTxjbGFzc3BhdGhlbnRyeSBraW5kPSJjb24iIHBhdGg9Im9yZy5lY2xpcHNlLnBkZS5jb3JlLnJlcXVpcmVkUGx1Z2lucyIvPgorCTxjbGFzc3BhdGhlbnRyeSBraW5kPSJzcmMiIHBhdGg9InNyYyIvPgorCTxjbGFzc3BhdGhlbnRyeSBraW5kPSJvdXRwdXQiIHBhdGg9ImJpbiIvPgorPC9jbGFzc3BhdGg+CmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLmpzdC5jb21tb24udWkvLnByb2plY3QgYi9wbHVnaW5zL29yZy5lY2xpcHNlLmpzdC5jb21tb24udWkvLnByb2plY3QKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uYjg4NmQyNwotLS0gL2Rldi9udWxsCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2UuanN0LmNvbW1vbi51aS8ucHJvamVjdApAQCAtMCwwICsxLDI4IEBACis8P3htbCB2ZXJzaW9uPSIxLjAiIGVuY29kaW5nPSJVVEYtOCI/PgorPHByb2plY3REZXNjcmlwdGlvbj4KKwk8bmFtZT5vcmcuZWNsaXBzZS5qc3QuY29tbW9uLnVpPC9uYW1lPgorCTxjb21tZW50PjwvY29tbWVudD4KKwk8cHJvamVjdHM+CisJPC9wcm9qZWN0cz4KKwk8YnVpbGRTcGVjPgorCQk8YnVpbGRDb21tYW5kPgorCQkJPG5hbWU+b3JnLmVjbGlwc2UuamR0LmNvcmUuamF2YWJ1aWxkZXI8L25hbWU+CisJCQk8YXJndW1lbnRzPgorCQkJPC9hcmd1bWVudHM+CisJCTwvYnVpbGRDb21tYW5kPgorCQk8YnVpbGRDb21tYW5kPgorCQkJPG5hbWU+b3JnLmVjbGlwc2UucGRlLk1hbmlmZXN0QnVpbGRlcjwvbmFtZT4KKwkJCTxhcmd1bWVudHM+CisJCQk8L2FyZ3VtZW50cz4KKwkJPC9idWlsZENvbW1hbmQ+CisJCTxidWlsZENvbW1hbmQ+CisJCQk8bmFtZT5vcmcuZWNsaXBzZS5wZGUuU2NoZW1hQnVpbGRlcjwvbmFtZT4KKwkJCTxhcmd1bWVudHM+CisJCQk8L2FyZ3VtZW50cz4KKwkJPC9idWlsZENvbW1hbmQ+CisJPC9idWlsZFNwZWM+CisJPG5hdHVyZXM+CisJCTxuYXR1cmU+b3JnLmVjbGlwc2UucGRlLlBsdWdpbk5hdHVyZTwvbmF0dXJlPgorCQk8bmF0dXJlPm9yZy5lY2xpcHNlLmpkdC5jb3JlLmphdmFuYXR1cmU8L25hdHVyZT4KKwk8L25hdHVyZXM+Cis8L3Byb2plY3REZXNjcmlwdGlvbj4KZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2UuanN0LmNvbW1vbi51aS8uc2V0dGluZ3Mvb3JnLmVjbGlwc2UuamR0LmNvcmUucHJlZnMgYi9wbHVnaW5zL29yZy5lY2xpcHNlLmpzdC5jb21tb24udWkvLnNldHRpbmdzL29yZy5lY2xpcHNlLmpkdC5jb3JlLnByZWZzCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLmJmMDI5MDgKLS0tIC9kZXYvbnVsbAorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLmpzdC5jb21tb24udWkvLnNldHRpbmdzL29yZy5lY2xpcHNlLmpkdC5jb3JlLnByZWZzCkBAIC0wLDAgKzEsNzQgQEAKKyNGcmkgU2VwIDExIDE5OjI0OjQ3IFBEVCAyMDA5CitlY2xpcHNlLnByZWZlcmVuY2VzLnZlcnNpb249MQorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIuY29kZWdlbi5pbmxpbmVKc3JCeXRlY29kZT1lbmFibGVkCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5jb2RlZ2VuLnRhcmdldFBsYXRmb3JtPTEuNQorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIuY29kZWdlbi51bnVzZWRMb2NhbD1wcmVzZXJ2ZQorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIuY29tcGxpYW5jZT0xLjUKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLmRlYnVnLmxpbmVOdW1iZXI9Z2VuZXJhdGUKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLmRlYnVnLmxvY2FsVmFyaWFibGU9Z2VuZXJhdGUKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLmRlYnVnLnNvdXJjZUZpbGU9Z2VuZXJhdGUKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0uYW5ub3RhdGlvblN1cGVySW50ZXJmYWNlPWlnbm9yZQorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5hc3NlcnRJZGVudGlmaWVyPWVycm9yCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLmF1dG9ib3hpbmc9aWdub3JlCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLmNvbXBhcmluZ0lkZW50aWNhbD13YXJuaW5nCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLmRlYWRDb2RlPXdhcm5pbmcKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0uZGVwcmVjYXRpb249d2FybmluZworb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5kZXByZWNhdGlvbkluRGVwcmVjYXRlZENvZGU9ZGlzYWJsZWQKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0uZGVwcmVjYXRpb25XaGVuT3ZlcnJpZGluZ0RlcHJlY2F0ZWRNZXRob2Q9ZGlzYWJsZWQKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0uZGlzY291cmFnZWRSZWZlcmVuY2U9d2FybmluZworb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5lbXB0eVN0YXRlbWVudD1pZ25vcmUKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0uZW51bUlkZW50aWZpZXI9ZXJyb3IKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0uZmFsbHRocm91Z2hDYXNlPWlnbm9yZQorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5mYXRhbE9wdGlvbmFsRXJyb3I9ZW5hYmxlZAorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5maWVsZEhpZGluZz1pZ25vcmUKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0uZmluYWxQYXJhbWV0ZXJCb3VuZD1pZ25vcmUKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0uZmluYWxseUJsb2NrTm90Q29tcGxldGluZ05vcm1hbGx5PWVycm9yCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLmZvcmJpZGRlblJlZmVyZW5jZT1lcnJvcgorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5oaWRkZW5DYXRjaEJsb2NrPWVycm9yCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLmluY29tcGF0aWJsZU5vbkluaGVyaXRlZEludGVyZmFjZU1ldGhvZD1lcnJvcgorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5pbmNvbXBsZXRlRW51bVN3aXRjaD1pZ25vcmUKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0uaW5kaXJlY3RTdGF0aWNBY2Nlc3M9aWdub3JlCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLmxvY2FsVmFyaWFibGVIaWRpbmc9aWdub3JlCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLm1ldGhvZFdpdGhDb25zdHJ1Y3Rvck5hbWU9ZXJyb3IKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0ubWlzc2luZ0RlcHJlY2F0ZWRBbm5vdGF0aW9uPWlnbm9yZQorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5taXNzaW5nSGFzaENvZGVNZXRob2Q9aWdub3JlCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLm1pc3NpbmdPdmVycmlkZUFubm90YXRpb249aWdub3JlCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLm1pc3NpbmdTZXJpYWxWZXJzaW9uPXdhcm5pbmcKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0ubWlzc2luZ1N5bmNocm9uaXplZE9uSW5oZXJpdGVkTWV0aG9kPWlnbm9yZQorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5ub0VmZmVjdEFzc2lnbm1lbnQ9d2FybmluZworb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5ub0ltcGxpY2l0U3RyaW5nQ29udmVyc2lvbj1lcnJvcgorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5ub25FeHRlcm5hbGl6ZWRTdHJpbmdMaXRlcmFsPXdhcm5pbmcKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0ubnVsbFJlZmVyZW5jZT1pZ25vcmUKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0ub3ZlcnJpZGluZ1BhY2thZ2VEZWZhdWx0TWV0aG9kPWVycm9yCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLnBhcmFtZXRlckFzc2lnbm1lbnQ9aWdub3JlCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLnBvc3NpYmxlQWNjaWRlbnRhbEJvb2xlYW5Bc3NpZ25tZW50PWlnbm9yZQorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5wb3RlbnRpYWxOdWxsUmVmZXJlbmNlPWlnbm9yZQorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5yYXdUeXBlUmVmZXJlbmNlPWlnbm9yZQorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5yZWR1bmRhbnROdWxsQ2hlY2s9aWdub3JlCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLnJlZHVuZGFudFN1cGVyaW50ZXJmYWNlPWlnbm9yZQorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5zcGVjaWFsUGFyYW1ldGVySGlkaW5nRmllbGQ9ZGlzYWJsZWQKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0uc3RhdGljQWNjZXNzUmVjZWl2ZXI9ZXJyb3IKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0uc3VwcHJlc3NXYXJuaW5ncz1lbmFibGVkCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLnN5bnRoZXRpY0FjY2Vzc0VtdWxhdGlvbj1pZ25vcmUKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0udHlwZVBhcmFtZXRlckhpZGluZz1lcnJvcgorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS51bmNoZWNrZWRUeXBlT3BlcmF0aW9uPWlnbm9yZQorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS51bmRvY3VtZW50ZWRFbXB0eUJsb2NrPWlnbm9yZQorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS51bmhhbmRsZWRXYXJuaW5nVG9rZW49aWdub3JlCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLnVubmVjZXNzYXJ5RWxzZT13YXJuaW5nCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLnVubmVjZXNzYXJ5VHlwZUNoZWNrPWVycm9yCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLnVucXVhbGlmaWVkRmllbGRBY2Nlc3M9aWdub3JlCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLnVudXNlZERlY2xhcmVkVGhyb3duRXhjZXB0aW9uPWlnbm9yZQorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS51bnVzZWREZWNsYXJlZFRocm93bkV4Y2VwdGlvbkV4ZW1wdEV4Y2VwdGlvbkFuZFRocm93YWJsZT1lbmFibGVkCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLnVudXNlZERlY2xhcmVkVGhyb3duRXhjZXB0aW9uSW5jbHVkZURvY0NvbW1lbnRSZWZlcmVuY2U9ZW5hYmxlZAorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS51bnVzZWREZWNsYXJlZFRocm93bkV4Y2VwdGlvbldoZW5PdmVycmlkaW5nPWRpc2FibGVkCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLnVudXNlZEltcG9ydD1lcnJvcgorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS51bnVzZWRMYWJlbD1lcnJvcgorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS51bnVzZWRMb2NhbD1pZ25vcmUKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0udW51c2VkUGFyYW1ldGVyPWlnbm9yZQorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS51bnVzZWRQYXJhbWV0ZXJJbmNsdWRlRG9jQ29tbWVudFJlZmVyZW5jZT1lbmFibGVkCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLnVudXNlZFBhcmFtZXRlcldoZW5JbXBsZW1lbnRpbmdBYnN0cmFjdD1kaXNhYmxlZAorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS51bnVzZWRQYXJhbWV0ZXJXaGVuT3ZlcnJpZGluZ0NvbmNyZXRlPWRpc2FibGVkCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLnVudXNlZFByaXZhdGVNZW1iZXI9ZXJyb3IKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0udW51c2VkV2FybmluZ1Rva2VuPXdhcm5pbmcKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0udmFyYXJnc0FyZ3VtZW50TmVlZENhc3Q9aWdub3JlCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5zb3VyY2U9MS41CmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLmpzdC5jb21tb24udWkvTUVUQS1JTkYvTUFOSUZFU1QuTUYgYi9wbHVnaW5zL29yZy5lY2xpcHNlLmpzdC5jb21tb24udWkvTUVUQS1JTkYvTUFOSUZFU1QuTUYKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uZjNmMGI0NQotLS0gL2Rldi9udWxsCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2UuanN0LmNvbW1vbi51aS9NRVRBLUlORi9NQU5JRkVTVC5NRgpAQCAtMCwwICsxLDIxIEBACitNYW5pZmVzdC1WZXJzaW9uOiAxLjAKK0J1bmRsZS1NYW5pZmVzdFZlcnNpb246IDIKK0J1bmRsZS1OYW1lOiAlQnVuZGxlLU5hbWUuMAorQnVuZGxlLVZlbmRvcjogJXByb3ZpZGVyCitCdW5kbGUtU3ltYm9saWNOYW1lOiBvcmcuZWNsaXBzZS5qc3QuY29tbW9uLnVpO3NpbmdsZXRvbjo9dHJ1ZQorQnVuZGxlLVZlcnNpb246IDEuMC4xLnF1YWxpZmllcgorQnVuZGxlLUxvY2FsaXphdGlvbjogcGx1Z2luCitCdW5kbGUtQWN0aXZhdG9yOiBvcmcuZWNsaXBzZS5qc3QuY29tbW9uLnVpLmludGVybmFsLkpzdENvbW1vblVJUGx1Z2luCitSZXF1aXJlLUJ1bmRsZTogb3JnLmVjbGlwc2UudWk7YnVuZGxlLXZlcnNpb249IlszLjUuMCw0LjAuMCkiLAorIG9yZy5lY2xpcHNlLmNvcmUucnVudGltZTtidW5kbGUtdmVyc2lvbj0iWzMuNS4wLDQuMC4wKSIsCisgb3JnLmVjbGlwc2UuamR0LmNvcmU7YnVuZGxlLXZlcnNpb249IlszLjUuMCw0LjAuMCkiLAorIG9yZy5lY2xpcHNlLmpkdC51aTtidW5kbGUtdmVyc2lvbj0iWzMuNS4wLDQuMC4wKSIsCisgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlO2J1bmRsZS12ZXJzaW9uPSJbMS4xLjMwMCwyLjAuMCkiLAorIG9yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS51aTtidW5kbGUtdmVyc2lvbj0iWzEuMC4wLDIuMC4wKSIsCisgb3JnLmVjbGlwc2UuY29yZS5yZXNvdXJjZXM7YnVuZGxlLXZlcnNpb249IlszLjUuMCw0LjAuMCkiLAorIG9yZy5lY2xpcHNlLmpzdC5jb21tb24uZnJhbWV3b3JrcztidW5kbGUtdmVyc2lvbj0iMS4xLjQwMCIsCisgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzO2J1bmRsZS12ZXJzaW9uPSIxLjIuMCIsCisgb3JnLmVjbGlwc2UudWkuaWRlO2J1bmRsZS12ZXJzaW9uPSJbMy4yLjAsNC4wLjApIgorQnVuZGxlLUFjdGl2YXRpb25Qb2xpY3k6IGxhenkKK0J1bmRsZS1SZXF1aXJlZEV4ZWN1dGlvbkVudmlyb25tZW50OiBKMlNFLTEuNQorRXhwb3J0LVBhY2thZ2U6IG9yZy5lY2xpcHNlLmpzdC5jb21tb24udWkuaW50ZXJuYWwuYXNzZW1ibHkud2l6YXJkO3gtaW50ZXJuYWw6PXRydWUKZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2UuanN0LmNvbW1vbi51aS9hYm91dC5odG1sIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS5qc3QuY29tbW9uLnVpL2Fib3V0Lmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uYjZlZDViMAotLS0gL2Rldi9udWxsCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2UuanN0LmNvbW1vbi51aS9hYm91dC5odG1sCkBAIC0wLDAgKzEsMzQgQEAKKzwhRE9DVFlQRSBIVE1MIFBVQkxJQyAiLS8vVzNDLy9EVEQgSFRNTCA0LjAvL0VOIj4KKzxIVE1MPgorCis8aGVhZD4KKzx0aXRsZT5BYm91dDwvdGl0bGU+Cis8bWV0YSBodHRwLWVxdWl2PUNvbnRlbnQtVHlwZSBjb250ZW50PSJ0ZXh0L2h0bWw7IGNoYXJzZXQ9SVNPLTg4NTktMSI+Cis8L2hlYWQ+CisKKzxCT0RZIGxhbmc9IkVOLVVTIj4KKworPEgzPkFib3V0IFRoaXMgQ29udGVudDwvSDM+CisKKzxQPkF1Z3VzdCwgMjAwOTwvUD4KKworPEgzPkxpY2Vuc2U8L0gzPgorCis8UD5UaGUgRWNsaXBzZSBGb3VuZGF0aW9uIG1ha2VzIGF2YWlsYWJsZSBhbGwgY29udGVudCBpbiB0aGlzIHBsdWctaW4gCisoIkNvbnRlbnQiKS4gVW5sZXNzIG90aGVyd2lzZSBpbmRpY2F0ZWQgYmVsb3csIHRoZSBDb250ZW50IGlzIHByb3ZpZGVkIHRvIHlvdSAKK3VuZGVyIHRoZSB0ZXJtcyBhbmQgY29uZGl0aW9ucyBvZiB0aGUgRWNsaXBzZSBQdWJsaWMgTGljZW5zZSBWZXJzaW9uIDEuMCAKKygiRVBMIikuIEEgY29weSBvZiB0aGUgRVBMIGlzIGF2YWlsYWJsZSBhdAorPEEgaHJlZj0iaHR0cDovL3d3dy5lY2xpcHNlLm9yZy9vcmcvZG9jdW1lbnRzL2VwbC12MTAucGhwIj5odHRwOi8vd3d3LmVjbGlwc2Uub3JnL29yZy9kb2N1bWVudHMvZXBsLXYxMC5waHA8L0E+LiAKK0ZvciBwdXJwb3NlcyBvZiB0aGUgRVBMLCAiUHJvZ3JhbSIgd2lsbCBtZWFuIHRoZSBDb250ZW50LjwvUD4KKworPFA+SWYgeW91IGRpZCBub3QgcmVjZWl2ZSB0aGlzIENvbnRlbnQgZGlyZWN0bHkgZnJvbSB0aGUgRWNsaXBzZSBGb3VuZGF0aW9uLCB0aGUgCitDb250ZW50IGlzIGJlaW5nIHJlZGlzdHJpYnV0ZWQgYnkgYW5vdGhlciBwYXJ0eSAoIlJlZGlzdHJpYnV0b3IiKSBhbmQgZGlmZmVyZW50IAordGVybXMgYW5kIGNvbmRpdGlvbnMgbWF5IGFwcGx5IHRvIHlvdXIgdXNlIG9mIGFueSBvYmplY3QgY29kZSBpbiB0aGUgQ29udGVudC4gCitDaGVjayB0aGUgUmVkaXN0cmlidXRvcpJzIGxpY2Vuc2UgdGhhdCB3YXMgcHJvdmlkZWQgd2l0aCB0aGUgQ29udGVudC4gSWYgbm8gc3VjaCAKK2xpY2Vuc2UgZXhpc3RzLCBjb250YWN0IHRoZSBSZWRpc3RyaWJ1dG9yLiBVbmxlc3Mgb3RoZXJ3aXNlIGluZGljYXRlZCBiZWxvdywgdGhlIAordGVybXMgYW5kIGNvbmRpdGlvbnMgb2YgdGhlIEVQTCBzdGlsbCBhcHBseSB0byBhbnkgc291cmNlIGNvZGUgaW4gdGhlIENvbnRlbnQgCithbmQgc3VjaCBzb3VyY2UgY29kZSBtYXkgYmUgb2J0YWluZWQgYXQKKzxBIGhyZWY9Imh0dHA6Ly93d3cuZWNsaXBzZS5vcmcvIj5odHRwOi8vd3d3LmVjbGlwc2Uub3JnLzwvQT4uPC9QPgorCis8L0JPRFk+Cis8L0hUTUw+CmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLmpzdC5jb21tb24udWkvYnVpbGQucHJvcGVydGllcyBiL3BsdWdpbnMvb3JnLmVjbGlwc2UuanN0LmNvbW1vbi51aS9idWlsZC5wcm9wZXJ0aWVzCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLjRiMTQ3ZjAKLS0tIC9kZXYvbnVsbAorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLmpzdC5jb21tb24udWkvYnVpbGQucHJvcGVydGllcwpAQCAtMCwwICsxLDE4IEBACisjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjCisjIENvcHlyaWdodCAoYykgMjAwOSBJQk0gQ29ycG9yYXRpb24gYW5kIG90aGVycy4KKyMgQWxsIHJpZ2h0cyByZXNlcnZlZC4gVGhpcyBwcm9ncmFtIGFuZCB0aGUgYWNjb21wYW55aW5nIG1hdGVyaWFscworIyBhcmUgbWFkZSBhdmFpbGFibGUgdW5kZXIgdGhlIHRlcm1zIG9mIHRoZSBFY2xpcHNlIFB1YmxpYyBMaWNlbnNlIHYxLjAKKyMgd2hpY2ggYWNjb21wYW5pZXMgdGhpcyBkaXN0cmlidXRpb24sIGFuZCBpcyBhdmFpbGFibGUgYXQKKyMgaHR0cDovL3d3dy5lY2xpcHNlLm9yZy9sZWdhbC9lcGwtdjEwLmh0bWwKKyMKKyMgQ29udHJpYnV0b3JzOgorIyBJQk0gQ29ycG9yYXRpb24gLSBpbml0aWFsIEFQSSBhbmQgaW1wbGVtZW50YXRpb24KKyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMKK3NvdXJjZS4uID0gc3JjLworb3V0cHV0Li4gPSBiaW4vCitiaW4uaW5jbHVkZXMgPSBwbHVnaW4ueG1sLFwKKyAgICAgICAgICAgICAgIC4sXAorICAgICAgICAgICAgICAgaWNvbnMvLFwKKyAgICAgICAgICAgICAgIE1FVEEtSU5GLyxcCisgICAgICAgICAgICAgICBhYm91dC5odG1sLFwKKyAgICAgICAgICAgICAgIHBsdWdpbi5wcm9wZXJ0aWVzCmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLmpzdC5jb21tb24udWkvaWNvbnMvamFyX29iai5naWYgYi9wbHVnaW5zL29yZy5lY2xpcHNlLmpzdC5jb21tb24udWkvaWNvbnMvamFyX29iai5naWYKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uMmZhMWQ3NwotLS0gL2Rldi9udWxsCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2UuanN0LmNvbW1vbi51aS9pY29ucy9qYXJfb2JqLmdpZgpCaW5hcnkgZmlsZXMgZGlmZmVyCmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLmpzdC5jb21tb24udWkvaWNvbnMvdXRpbC13aXotaWNvbi5naWYgYi9wbHVnaW5zL29yZy5lY2xpcHNlLmpzdC5jb21tb24udWkvaWNvbnMvdXRpbC13aXotaWNvbi5naWYKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uMjAzOGIyMgotLS0gL2Rldi9udWxsCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2UuanN0LmNvbW1vbi51aS9pY29ucy91dGlsLXdpei1pY29uLmdpZgpCaW5hcnkgZmlsZXMgZGlmZmVyCmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLmpzdC5jb21tb24udWkvcGx1Z2luLnByb3BlcnRpZXMgYi9wbHVnaW5zL29yZy5lY2xpcHNlLmpzdC5jb21tb24udWkvcGx1Z2luLnByb3BlcnRpZXMKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uNGI1YzhmZgotLS0gL2Rldi9udWxsCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2UuanN0LmNvbW1vbi51aS9wbHVnaW4ucHJvcGVydGllcwpAQCAtMCwwICsxLDE3IEBACisjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjCisjIENvcHlyaWdodCAoYykgMjAwOSBJQk0gQ29ycG9yYXRpb24gYW5kIG90aGVycy4KKyMgQWxsIHJpZ2h0cyByZXNlcnZlZC4gVGhpcyBwcm9ncmFtIGFuZCB0aGUgYWNjb21wYW55aW5nIG1hdGVyaWFscworIyBhcmUgbWFkZSBhdmFpbGFibGUgdW5kZXIgdGhlIHRlcm1zIG9mIHRoZSBFY2xpcHNlIFB1YmxpYyBMaWNlbnNlIHYxLjAKKyMgd2hpY2ggYWNjb21wYW5pZXMgdGhpcyBkaXN0cmlidXRpb24sIGFuZCBpcyBhdmFpbGFibGUgYXQKKyMgaHR0cDovL3d3dy5lY2xpcHNlLm9yZy9sZWdhbC9lcGwtdjEwLmh0bWwKKyMKKyMgQ29udHJpYnV0b3JzOgorIyBJQk0gQ29ycG9yYXRpb24gLSBpbml0aWFsIEFQSSBhbmQgaW1wbGVtZW50YXRpb24KKyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMKK3Byb3ZpZGVyPUVjbGlwc2Uub3JnCisKK0J1bmRsZS1OYW1lLjAgPSBDb21tb24gSlNUIFVJIFBsdWctaW4KK0FyY2hpdmU9QXJjaGl2ZQorRXh0ZXJuYWxfQXJjaGl2ZT1FeHRlcm5hbCBBcmNoaXZlCitWYXJpYWJsZT1WYXJpYWJsZQorQ2xhc3NwYXRoX0NvbnRhaW5lcj1DbGFzc3BhdGggQ29udGFpbmVyClwgTm8gbmV3bGluZSBhdCBlbmQgb2YgZmlsZQpkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS5qc3QuY29tbW9uLnVpL3BsdWdpbi54bWwgYi9wbHVnaW5zL29yZy5lY2xpcHNlLmpzdC5jb21tb24udWkvcGx1Z2luLnhtbApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi5kYjY5NTE1Ci0tLSAvZGV2L251bGwKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS5qc3QuY29tbW9uLnVpL3BsdWdpbi54bWwKQEAgLTAsMCArMSwzNSBAQAorPD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KKzw/ZWNsaXBzZSB2ZXJzaW9uPSIzLjQiPz4KKzxwbHVnaW4+CisKKyAgICA8ZXh0ZW5zaW9uCisgICAgICAgICAgcG9pbnQ9Im9yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS51aS5yZWZlcmVuY2VXaXphcmRGcmFnbWVudCI+CisgICAgICAgPHJlZmVyZW5jZUZyYWdtZW50CisgICAgICAgICAgICAgY2xhc3M9Im9yZy5lY2xpcHNlLmpzdC5jb21tb24udWkuaW50ZXJuYWwuYXNzZW1ibHkud2l6YXJkLkphclJlZmVyZW5jZVdpemFyZEZyYWdtZW50IgorICAgICAgICAgICAgIGljb249Imljb25zL2phcl9vYmouZ2lmIgorICAgICAgICAgICAgIGlkPSJvcmcuZWNsaXBzZS5qc3QuY29tbW9uLnVpLmphclJlZmVyZW5jZSIKKyAgICAgICAgICAgICBuYW1lPSIlQXJjaGl2ZSI+CisgICAgICAgPC9yZWZlcmVuY2VGcmFnbWVudD4KKyAgICAgICA8cmVmZXJlbmNlRnJhZ21lbnQKKyAgICAgICAgICAgICBjbGFzcz0ib3JnLmVjbGlwc2UuanN0LmNvbW1vbi51aS5pbnRlcm5hbC5hc3NlbWJseS53aXphcmQuRXh0ZXJuYWxKYXJSZWZlcmVuY2VXaXphcmRGcmFnbWVudCIKKyAgICAgICAgICAgICBpY29uPSJpY29ucy9qYXJfb2JqLmdpZiIKKyAgICAgICAgICAgICBpZD0ib3JnLmVjbGlwc2UuanN0LmNvbW1vbi51aS5leHRlcm5hbEphclJlZmVyZW5jZSIKKyAgICAgICAgICAgICBuYW1lPSIlRXh0ZXJuYWxfQXJjaGl2ZSI+CisgICAgICAgPC9yZWZlcmVuY2VGcmFnbWVudD4KKyAgICAgICA8cmVmZXJlbmNlRnJhZ21lbnQKKyAgICAgICAgICAgICBjbGFzcz0ib3JnLmVjbGlwc2UuanN0LmNvbW1vbi51aS5pbnRlcm5hbC5hc3NlbWJseS53aXphcmQuVmFyaWFibGVSZWZlcmVuY2VXaXphcmRGcmFnbWVudCIKKyAgICAgICAgICAgICBpY29uPSJpY29ucy9qYXJfb2JqLmdpZiIKKyAgICAgICAgICAgICBpZD0ib3JnLmVjbGlwc2UuanN0LmNvbW1vbi51aS52YXJpYWJsZVJlZmVyZW5jZSIKKyAgICAgICAgICAgICBuYW1lPSIlVmFyaWFibGUiPgorICAgICAgIDwvcmVmZXJlbmNlRnJhZ21lbnQ+CisgICAgICAgPHJlZmVyZW5jZUZyYWdtZW50CisgICAgICAgICAgICAgY2xhc3M9Im9yZy5lY2xpcHNlLmpzdC5jb21tb24udWkuaW50ZXJuYWwuYXNzZW1ibHkud2l6YXJkLkNsYXNzcGF0aENvbnRhaW5lcldpemFyZEZyYWdtZW50IgorICAgICAgICAgICAgIGljb249Imljb25zL3V0aWwtd2l6LWljb24uZ2lmIgorICAgICAgICAgICAgIGlkPSJvcmcuZWNsaXBzZS5qc3QuY29tbW9uLnVpLmNsYXNzcGF0aENvbnRhaW5lciIKKyAgICAgICAgICAgICBuYW1lPSIlQ2xhc3NwYXRoX0NvbnRhaW5lciI+CisgICAgICAgPC9yZWZlcmVuY2VGcmFnbWVudD4KKyAgICA8L2V4dGVuc2lvbj4KKyAgICA8ZXh0ZW5zaW9uIHBvaW50PSJvcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUudWkudmlydHVhbENvbXBvbmVudExhYmVsUHJvdmlkZXIiPgorICAgICAgIDxwcm92aWRlciBjbGFzcz0ib3JnLmVjbGlwc2UuanN0LmNvbW1vbi51aS5pbnRlcm5hbC5hc3NlbWJseS53aXphcmQuQ2xhc3NwYXRoQ29udGFpbmVyUmVmTGFiZWxQcm92aWRlciIgd2VpZ2h0PSIzIi8+CisgICAgPC9leHRlbnNpb24+ICAgICAgIAorPC9wbHVnaW4+CmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLmpzdC5jb21tb24udWkvc3JjL29yZy9lY2xpcHNlL2pzdC9jb21tb24vdWkvaW50ZXJuYWwvSUpzdENvbW1vblVJQ29uc3RhbnRzLmphdmEgYi9wbHVnaW5zL29yZy5lY2xpcHNlLmpzdC5jb21tb24udWkvc3JjL29yZy9lY2xpcHNlL2pzdC9jb21tb24vdWkvaW50ZXJuYWwvSUpzdENvbW1vblVJQ29uc3RhbnRzLmphdmEKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uYmIxNGZiNwotLS0gL2Rldi9udWxsCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2UuanN0LmNvbW1vbi51aS9zcmMvb3JnL2VjbGlwc2UvanN0L2NvbW1vbi91aS9pbnRlcm5hbC9JSnN0Q29tbW9uVUlDb25zdGFudHMuamF2YQpAQCAtMCwwICsxLDE5IEBACisvKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKgorICogQ29weXJpZ2h0IChjKSAyMDA5IElCTSBDb3Jwb3JhdGlvbiBhbmQgb3RoZXJzLgorICogQWxsIHJpZ2h0cyByZXNlcnZlZC4gVGhpcyBwcm9ncmFtIGFuZCB0aGUgYWNjb21wYW55aW5nIG1hdGVyaWFscworICogYXJlIG1hZGUgYXZhaWxhYmxlIHVuZGVyIHRoZSB0ZXJtcyBvZiB0aGUgRWNsaXBzZSBQdWJsaWMgTGljZW5zZSB2MS4wCisgKiB3aGljaCBhY2NvbXBhbmllcyB0aGlzIGRpc3RyaWJ1dGlvbiwgYW5kIGlzIGF2YWlsYWJsZSBhdAorICogaHR0cDovL3d3dy5lY2xpcHNlLm9yZy9sZWdhbC9lcGwtdjEwLmh0bWwKKyAqCisgKiBDb250cmlidXRvcnM6CisgKiBJQk0gQ29ycG9yYXRpb24gLSBpbml0aWFsIEFQSSBhbmQgaW1wbGVtZW50YXRpb24KKyAqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqLworcGFja2FnZSBvcmcuZWNsaXBzZS5qc3QuY29tbW9uLnVpLmludGVybmFsOworCisKKy8qKgorICogQGF1dGhvcjogQWlkeWwgS2FyZWgKKyAqLworcHVibGljIGludGVyZmFjZSBJSnN0Q29tbW9uVUlDb25zdGFudHMgeworCXB1YmxpYyBzdGF0aWMgZmluYWwgU3RyaW5nIERJQUxPR1NUT1JFX0xBU1RFWFRBUkNISVZFPSBKc3RDb21tb25VSVBsdWdpbi5QTFVHSU5fSUQgKyAiLmxhc3RleHRhcmNoaXZlIjsgLy8kTk9OLU5MUy0xJAorfQpkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS5qc3QuY29tbW9uLnVpL3NyYy9vcmcvZWNsaXBzZS9qc3QvY29tbW9uL3VpL2ludGVybmFsL0lKc3RDb21tb25VSUNvbnRleHRJZHMuamF2YSBiL3BsdWdpbnMvb3JnLmVjbGlwc2UuanN0LmNvbW1vbi51aS9zcmMvb3JnL2VjbGlwc2UvanN0L2NvbW1vbi91aS9pbnRlcm5hbC9JSnN0Q29tbW9uVUlDb250ZXh0SWRzLmphdmEKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uYTA0YWZhZAotLS0gL2Rldi9udWxsCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2UuanN0LmNvbW1vbi51aS9zcmMvb3JnL2VjbGlwc2UvanN0L2NvbW1vbi91aS9pbnRlcm5hbC9JSnN0Q29tbW9uVUlDb250ZXh0SWRzLmphdmEKQEAgLTAsMCArMSwyMiBAQAorLyoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioKKyAqIENvcHlyaWdodCAoYykgMjAwMywgMjAxMCBJQk0gQ29ycG9yYXRpb24gYW5kIG90aGVycy4KKyAqIEFsbCByaWdodHMgcmVzZXJ2ZWQuIFRoaXMgcHJvZ3JhbSBhbmQgdGhlIGFjY29tcGFueWluZyBtYXRlcmlhbHMKKyAqIGFyZSBtYWRlIGF2YWlsYWJsZSB1bmRlciB0aGUgdGVybXMgb2YgdGhlIEVjbGlwc2UgUHVibGljIExpY2Vuc2UgdjEuMAorICogd2hpY2ggYWNjb21wYW5pZXMgdGhpcyBkaXN0cmlidXRpb24sIGFuZCBpcyBhdmFpbGFibGUgYXQKKyAqIGh0dHA6Ly93d3cuZWNsaXBzZS5vcmcvbGVnYWwvZXBsLXYxMC5odG1sCisgKgorICogQ29udHJpYnV0b3JzOgorICogSUJNIENvcnBvcmF0aW9uIC0gaW5pdGlhbCBBUEkgYW5kIGltcGxlbWVudGF0aW9uCisgKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKi8KK3BhY2thZ2Ugb3JnLmVjbGlwc2UuanN0LmNvbW1vbi51aS5pbnRlcm5hbDsKKworLyoqCisgKiBAYXV0aG9yOiBBaWR5bCBLYXJlaAorICovCitwdWJsaWMgaW50ZXJmYWNlIElKc3RDb21tb25VSUNvbnRleHRJZHMgeworCS8vCSBOZXcgcmVmZXJlbmNlcyB3aXphcmRzCisJcHVibGljIHN0YXRpYyBmaW5hbCBTdHJpbmcgREVQTE9ZTUVOVF9BU1NFTUJMWV9ORVdfVkFSSUFCTEVfUkVGRVJFTkNFX1AxID0gSnN0Q29tbW9uVUlQbHVnaW4uUExVR0lOX0lEICsgIi5ERVBMT1lNRU5UX0FTU0VNQkxZX05FV19WQVJJQUJMRV9SRUZFUkVOQ0VfUDEiOyAvLyROT04tTkxTLTEkCisJcHVibGljIHN0YXRpYyBmaW5hbCBTdHJpbmcgREVQTE9ZTUVOVF9BU1NFTUJMWV9ORVdfRVhURVJOQUxfQVJDSElWRV9SRUZFUkVOQ0VfUDEgPSBKc3RDb21tb25VSVBsdWdpbi5QTFVHSU5fSUQgKyAiLkRFUExPWU1FTlRfQVNTRU1CTFlfTkVXX0VYVEVSTkFMX0FSQ0hJVkVfUkVGRVJFTkNFX1AxIjsgLy8kTk9OLU5MUy0xJAorCXB1YmxpYyBzdGF0aWMgZmluYWwgU3RyaW5nIERFUExPWU1FTlRfQVNTRU1CTFlfTkVXX0FSQ0hJVkVfUkVGRVJFTkNFX1AxID0gSnN0Q29tbW9uVUlQbHVnaW4uUExVR0lOX0lEICsgIi5ERVBMT1lNRU5UX0FTU0VNQkxZX05FV19BUkNISVZFX1JFRkVSRU5DRV9QMSI7IC8vJE5PTi1OTFMtMSQKKwlwdWJsaWMgc3RhdGljIGZpbmFsIFN0cmluZyBERVBMT1lNRU5UX0FTU0VNQkxZX1BSRUZFUkVOQ0VfUEFHRV9NQU5JRkVTVF9FTlRSSUVTX1RBQiA9IEpzdENvbW1vblVJUGx1Z2luLlBMVUdJTl9JRCArICIuREVQTE9ZTUVOVF9BU1NFTUJMWV9QUkVGRVJFTkNFX1BBR0VfTUFOSUZFU1RfRU5UUklFU19UQUIiOyAvLyROT04tTkxTLTEkCit9CmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLmpzdC5jb21tb24udWkvc3JjL29yZy9lY2xpcHNlL2pzdC9jb21tb24vdWkvaW50ZXJuYWwvSnN0Q29tbW9uVUlQbHVnaW4uamF2YSBiL3BsdWdpbnMvb3JnLmVjbGlwc2UuanN0LmNvbW1vbi51aS9zcmMvb3JnL2VjbGlwc2UvanN0L2NvbW1vbi91aS9pbnRlcm5hbC9Kc3RDb21tb25VSVBsdWdpbi5qYXZhCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLjU3YjllZjAKLS0tIC9kZXYvbnVsbAorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLmpzdC5jb21tb24udWkvc3JjL29yZy9lY2xpcHNlL2pzdC9jb21tb24vdWkvaW50ZXJuYWwvSnN0Q29tbW9uVUlQbHVnaW4uamF2YQpAQCAtMCwwICsxLDYwIEBACisvKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKgorICogQ29weXJpZ2h0IChjKSAyMDA5IElCTSBDb3Jwb3JhdGlvbiBhbmQgb3RoZXJzLgorICogQWxsIHJpZ2h0cyByZXNlcnZlZC4gVGhpcyBwcm9ncmFtIGFuZCB0aGUgYWNjb21wYW55aW5nIG1hdGVyaWFscworICogYXJlIG1hZGUgYXZhaWxhYmxlIHVuZGVyIHRoZSB0ZXJtcyBvZiB0aGUgRWNsaXBzZSBQdWJsaWMgTGljZW5zZSB2MS4wCisgKiB3aGljaCBhY2NvbXBhbmllcyB0aGlzIGRpc3RyaWJ1dGlvbiwgYW5kIGlzIGF2YWlsYWJsZSBhdAorICogaHR0cDovL3d3dy5lY2xpcHNlLm9yZy9sZWdhbC9lcGwtdjEwLmh0bWwKKyAqCisgKiBDb250cmlidXRvcnM6CisgKiBJQk0gQ29ycG9yYXRpb24gLSBpbml0aWFsIEFQSSBhbmQgaW1wbGVtZW50YXRpb24KKyAqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqLworcGFja2FnZSBvcmcuZWNsaXBzZS5qc3QuY29tbW9uLnVpLmludGVybmFsOworCitpbXBvcnQgb3JnLmVjbGlwc2UudWkucGx1Z2luLkFic3RyYWN0VUlQbHVnaW47CitpbXBvcnQgb3JnLm9zZ2kuZnJhbWV3b3JrLkJ1bmRsZUNvbnRleHQ7CisKKy8qKgorICogVGhlIGFjdGl2YXRvciBjbGFzcyBjb250cm9scyB0aGUgcGx1Zy1pbiBsaWZlIGN5Y2xlCisgKi8KK3B1YmxpYyBjbGFzcyBKc3RDb21tb25VSVBsdWdpbiBleHRlbmRzIEFic3RyYWN0VUlQbHVnaW4geworCisJLy8gVGhlIHBsdWctaW4gSUQKKwlwdWJsaWMgc3RhdGljIGZpbmFsIFN0cmluZyBQTFVHSU5fSUQgPSAib3JnLmVjbGlwc2UuanN0LmNvbW1vbi51aSI7IC8vJE5PTi1OTFMtMSQKKworCS8vIFRoZSBzaGFyZWQgaW5zdGFuY2UKKwlwcml2YXRlIHN0YXRpYyBKc3RDb21tb25VSVBsdWdpbiBwbHVnaW47CisJCisJLyoqCisJICogVGhlIGNvbnN0cnVjdG9yCisJICovCisJcHVibGljIEpzdENvbW1vblVJUGx1Z2luKCkgeworCX0KKworCS8qCisJICogKG5vbi1KYXZhZG9jKQorCSAqIEBzZWUgb3JnLmVjbGlwc2UudWkucGx1Z2luLkFic3RyYWN0VUlQbHVnaW4jc3RhcnQob3JnLm9zZ2kuZnJhbWV3b3JrLkJ1bmRsZUNvbnRleHQpCisJICovCisJcHVibGljIHZvaWQgc3RhcnQoQnVuZGxlQ29udGV4dCBjb250ZXh0KSB0aHJvd3MgRXhjZXB0aW9uIHsKKwkJc3VwZXIuc3RhcnQoY29udGV4dCk7CisJCXBsdWdpbiA9IHRoaXM7CisJfQorCisJLyoKKwkgKiAobm9uLUphdmFkb2MpCisJICogQHNlZSBvcmcuZWNsaXBzZS51aS5wbHVnaW4uQWJzdHJhY3RVSVBsdWdpbiNzdG9wKG9yZy5vc2dpLmZyYW1ld29yay5CdW5kbGVDb250ZXh0KQorCSAqLworCXB1YmxpYyB2b2lkIHN0b3AoQnVuZGxlQ29udGV4dCBjb250ZXh0KSB0aHJvd3MgRXhjZXB0aW9uIHsKKwkJcGx1Z2luID0gbnVsbDsKKwkJc3VwZXIuc3RvcChjb250ZXh0KTsKKwl9CisKKwkvKioKKwkgKiBSZXR1cm5zIHRoZSBzaGFyZWQgaW5zdGFuY2UKKwkgKgorCSAqIEByZXR1cm4gdGhlIHNoYXJlZCBpbnN0YW5jZQorCSAqLworCXB1YmxpYyBzdGF0aWMgSnN0Q29tbW9uVUlQbHVnaW4gZ2V0RGVmYXVsdCgpIHsKKwkJcmV0dXJuIHBsdWdpbjsKKwl9CisKK30KZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2UuanN0LmNvbW1vbi51aS9zcmMvb3JnL2VjbGlwc2UvanN0L2NvbW1vbi91aS9pbnRlcm5hbC9NZXNzYWdlcy5qYXZhIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS5qc3QuY29tbW9uLnVpL3NyYy9vcmcvZWNsaXBzZS9qc3QvY29tbW9uL3VpL2ludGVybmFsL01lc3NhZ2VzLmphdmEKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uMDM5ZTdlOAotLS0gL2Rldi9udWxsCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2UuanN0LmNvbW1vbi51aS9zcmMvb3JnL2VjbGlwc2UvanN0L2NvbW1vbi91aS9pbnRlcm5hbC9NZXNzYWdlcy5qYXZhCkBAIC0wLDAgKzEsNDcgQEAKKy8qKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqCisgKiBDb3B5cmlnaHQgKGMpIDIwMDkgSUJNIENvcnBvcmF0aW9uIGFuZCBvdGhlcnMuCisgKiBBbGwgcmlnaHRzIHJlc2VydmVkLiBUaGlzIHByb2dyYW0gYW5kIHRoZSBhY2NvbXBhbnlpbmcgbWF0ZXJpYWxzCisgKiBhcmUgbWFkZSBhdmFpbGFibGUgdW5kZXIgdGhlIHRlcm1zIG9mIHRoZSBFY2xpcHNlIFB1YmxpYyBMaWNlbnNlIHYxLjAKKyAqIHdoaWNoIGFjY29tcGFuaWVzIHRoaXMgZGlzdHJpYnV0aW9uLCBhbmQgaXMgYXZhaWxhYmxlIGF0CisgKiBodHRwOi8vd3d3LmVjbGlwc2Uub3JnL2xlZ2FsL2VwbC12MTAuaHRtbAorICoKKyAqIENvbnRyaWJ1dG9yczoKKyAqIElCTSBDb3Jwb3JhdGlvbiAtIGluaXRpYWwgQVBJIGFuZCBpbXBsZW1lbnRhdGlvbgorICoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKiovCitwYWNrYWdlIG9yZy5lY2xpcHNlLmpzdC5jb21tb24udWkuaW50ZXJuYWw7CisKK2ltcG9ydCBvcmcuZWNsaXBzZS5vc2dpLnV0aWwuTkxTOworCitwdWJsaWMgY2xhc3MgTWVzc2FnZXMgZXh0ZW5kcyBOTFMgeworCXByaXZhdGUgc3RhdGljIGZpbmFsIFN0cmluZyBCVU5ETEVfTkFNRSA9ICJvcmcuZWNsaXBzZS5qc3QuY29tbW9uLnVpLmludGVybmFsIjsgLy8kTk9OLU5MUy0xJAorCXB1YmxpYyBzdGF0aWMgU3RyaW5nIEFyY2hpdmVUaXRsZTsKKwlwdWJsaWMgc3RhdGljIFN0cmluZyBBcmNoaXZlRGVzY3JpcHRpb247CisJcHVibGljIHN0YXRpYyBTdHJpbmcgRXh0ZXJuYWxBcmNoaXZlVGl0bGU7CisJcHVibGljIHN0YXRpYyBTdHJpbmcgRXh0ZXJuYWxBcmNoaXZlRGVzY3JpcHRpb247CisJcHVibGljIHN0YXRpYyBTdHJpbmcgQXJjaGl2ZURpYWxvZ05ld1RpdGxlOworCXB1YmxpYyBzdGF0aWMgU3RyaW5nIEFyY2hpdmVEaWFsb2dOZXdEZXNjcmlwdGlvbjsKKwlwdWJsaWMgc3RhdGljIFN0cmluZyBCcm93c2U7CisJcHVibGljIHN0YXRpYyBTdHJpbmcgVmFyaWFibGVSZWZlcmVuY2VUaXRsZTsKKwlwdWJsaWMgc3RhdGljIFN0cmluZyBWYXJpYWJsZVJlZmVyZW5jZURlc2NyaXB0aW9uOworCXB1YmxpYyBzdGF0aWMgU3RyaW5nIEFkZE1hbmlmZXN0RW50cnlUYXNrV2l6YXJkVGl0bGU7CisJcHVibGljIHN0YXRpYyBTdHJpbmcgQWRkTWFuaWZlc3RFbnRyeVRhc2tXaXphcmREZXNjOworCXB1YmxpYyBzdGF0aWMgU3RyaW5nIFBhcmVudFByb2plY3RzOworCXB1YmxpYyBzdGF0aWMgU3RyaW5nIEN1c3RvbUVudHJ5QnV0dG9uOworCXB1YmxpYyBzdGF0aWMgU3RyaW5nIEFkZDsKKwlwdWJsaWMgc3RhdGljIFN0cmluZyBSZW1vdmU7CisJcHVibGljIHN0YXRpYyBTdHJpbmcgTW92ZVVwOworCXB1YmxpYyBzdGF0aWMgU3RyaW5nIE1vdmVEb3duOworCXB1YmxpYyBzdGF0aWMgU3RyaW5nIE1hbmlmZXN0RW50cmllczsKKwlwdWJsaWMgc3RhdGljIFN0cmluZyBNYW5pZmVzdEVudHJ5Q29sdW1uOworCXB1YmxpYyBzdGF0aWMgU3RyaW5nIE1hbmlmZXN0RW50cnlTb3VyY2VDb2x1bW47CisJcHVibGljIHN0YXRpYyBTdHJpbmcgQ29uZmlndXJlUGFyZW50TGluazsKKwlwdWJsaWMgc3RhdGljIFN0cmluZyBJbnZhbGlkQXJjaGl2ZXNXYXJuaW5nOworCQorCXN0YXRpYyB7CisJCS8vIGluaXRpYWxpemUgcmVzb3VyY2UgYnVuZGxlCisJCU5MUy5pbml0aWFsaXplTWVzc2FnZXMoQlVORExFX05BTUUgKyAiLm1lc3NhZ2VzIiwgTWVzc2FnZXMuY2xhc3MpOyAvLyROT04tTkxTLTEkCisJfQorCisJcHJpdmF0ZSBNZXNzYWdlcygpIHsKKwl9Cit9CmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLmpzdC5jb21tb24udWkvc3JjL29yZy9lY2xpcHNlL2pzdC9jb21tb24vdWkvaW50ZXJuYWwvYXNzZW1ibHkvd2l6YXJkL0FkZE1hbmlmZXN0RW50cnlUYXNrV2l6YXJkLmphdmEgYi9wbHVnaW5zL29yZy5lY2xpcHNlLmpzdC5jb21tb24udWkvc3JjL29yZy9lY2xpcHNlL2pzdC9jb21tb24vdWkvaW50ZXJuYWwvYXNzZW1ibHkvd2l6YXJkL0FkZE1hbmlmZXN0RW50cnlUYXNrV2l6YXJkLmphdmEKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uMDQ0Zjc0ZgotLS0gL2Rldi9udWxsCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2UuanN0LmNvbW1vbi51aS9zcmMvb3JnL2VjbGlwc2UvanN0L2NvbW1vbi91aS9pbnRlcm5hbC9hc3NlbWJseS93aXphcmQvQWRkTWFuaWZlc3RFbnRyeVRhc2tXaXphcmQuamF2YQpAQCAtMCwwICsxLDIwNSBAQAorLyoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKgorICogQ29weXJpZ2h0IChjKSAyMDA5IFJlZCBIYXQKKyAqIEFsbCByaWdodHMgcmVzZXJ2ZWQuIFRoaXMgcHJvZ3JhbSBhbmQgdGhlIGFjY29tcGFueWluZyBtYXRlcmlhbHMKKyAqIGFyZSBtYWRlIGF2YWlsYWJsZSB1bmRlciB0aGUgdGVybXMgb2YgdGhlIEVjbGlwc2UgUHVibGljIExpY2Vuc2UgdjEuMAorICogd2hpY2ggYWNjb21wYW5pZXMgdGhpcyBkaXN0cmlidXRpb24sIGFuZCBpcyBhdmFpbGFibGUgYXQKKyAqIGh0dHA6Ly93d3cuZWNsaXBzZS5vcmcvbGVnYWwvZXBsLXYxMC5odG1sCisgKgorICogQ29udHJpYnV0b3JzOgorICogICAgUm9iIFN0cnlrZXIgLSBpbml0aWFsIGltcGxlbWVudGF0aW9uIGFuZCBvbmdvaW5nIG1haW50ZW5hbmNlCisgKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqLworcGFja2FnZSBvcmcuZWNsaXBzZS5qc3QuY29tbW9uLnVpLmludGVybmFsLmFzc2VtYmx5LndpemFyZDsKKworaW1wb3J0IGphdmEubGFuZy5yZWZsZWN0Lkludm9jYXRpb25UYXJnZXRFeGNlcHRpb247CitpbXBvcnQgamF2YS51dGlsLkFycmF5TGlzdDsKK2ltcG9ydCBqYXZhLnV0aWwuQXJyYXlzOworCitpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5yZXNvdXJjZXMuSVByb2plY3Q7CitpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5yZXNvdXJjZXMuUmVzb3VyY2VzUGx1Z2luOworaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucnVudGltZS5Db3JlRXhjZXB0aW9uOworaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucnVudGltZS5JUHJvZ3Jlc3NNb25pdG9yOworaW1wb3J0IG9yZy5lY2xpcHNlLmpmYWNlLnByZWZlcmVuY2UuUHJlZmVyZW5jZURpYWxvZzsKK2ltcG9ydCBvcmcuZWNsaXBzZS5qZmFjZS52aWV3ZXJzLkFycmF5Q29udGVudFByb3ZpZGVyOworaW1wb3J0IG9yZy5lY2xpcHNlLmpmYWNlLnZpZXdlcnMuSVNlbGVjdGlvbkNoYW5nZWRMaXN0ZW5lcjsKK2ltcG9ydCBvcmcuZWNsaXBzZS5qZmFjZS52aWV3ZXJzLklTdHJ1Y3R1cmVkU2VsZWN0aW9uOworaW1wb3J0IG9yZy5lY2xpcHNlLmpmYWNlLnZpZXdlcnMuU2VsZWN0aW9uQ2hhbmdlZEV2ZW50OworaW1wb3J0IG9yZy5lY2xpcHNlLmpmYWNlLnZpZXdlcnMuVGFibGVWaWV3ZXI7CitpbXBvcnQgb3JnLmVjbGlwc2UuamZhY2Uudmlld2Vycy5WaWV3ZXI7CitpbXBvcnQgb3JnLmVjbGlwc2UuanN0LmNvbW1vbi5pbnRlcm5hbC5tb2R1bGVjb3JlLnV0aWwuSmF2YU1vZHVsZUNvbXBvbmVudFV0aWxpdHk7CitpbXBvcnQgb3JnLmVjbGlwc2UuanN0LmNvbW1vbi51aS5pbnRlcm5hbC5NZXNzYWdlczsKK2ltcG9ydCBvcmcuZWNsaXBzZS5qc3QuY29tbW9uLnVpLmludGVybmFsLmFzc2VtYmx5LndpemFyZC5NYW5pZmVzdE1vZHVsZURlcGVuZGVuY3lDb250cm9sLk1hbmlmZXN0TGFiZWxQcm92aWRlcjsKK2ltcG9ydCBvcmcuZWNsaXBzZS5vc2dpLnV0aWwuTkxTOworaW1wb3J0IG9yZy5lY2xpcHNlLnN3dC5TV1Q7CitpbXBvcnQgb3JnLmVjbGlwc2Uuc3d0LmV2ZW50cy5TZWxlY3Rpb25FdmVudDsKK2ltcG9ydCBvcmcuZWNsaXBzZS5zd3QuZXZlbnRzLlNlbGVjdGlvbkxpc3RlbmVyOworaW1wb3J0IG9yZy5lY2xpcHNlLnN3dC5sYXlvdXQuRm9ybUxheW91dDsKK2ltcG9ydCBvcmcuZWNsaXBzZS5zd3Qud2lkZ2V0cy5CdXR0b247CitpbXBvcnQgb3JnLmVjbGlwc2Uuc3d0LndpZGdldHMuQ29tcG9zaXRlOworaW1wb3J0IG9yZy5lY2xpcHNlLnN3dC53aWRnZXRzLkxhYmVsOworaW1wb3J0IG9yZy5lY2xpcHNlLnN3dC53aWRnZXRzLkxpbms7CitpbXBvcnQgb3JnLmVjbGlwc2Uuc3d0LndpZGdldHMuVGV4dDsKK2ltcG9ydCBvcmcuZWNsaXBzZS51aS5pbnRlcm5hbC5kaWFsb2dzLlByb3BlcnR5RGlhbG9nOworaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS5Db21wb25lbnRDb3JlOworaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS5pbnRlcm5hbC5pbXBsLlRhc2tNb2RlbDsKK2ltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUucmVzb3VyY2VzLklWaXJ0dWFsUmVmZXJlbmNlOworaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS51aS5pbnRlcm5hbC50YXNrd2l6YXJkLklXaXphcmRIYW5kbGU7CitpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb21wb25lbnRjb3JlLnVpLmludGVybmFsLnRhc2t3aXphcmQuVGFza1dpemFyZDsKK2ltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUudWkuaW50ZXJuYWwudGFza3dpemFyZC5XaXphcmRGcmFnbWVudDsKKworcHVibGljIGNsYXNzIEFkZE1hbmlmZXN0RW50cnlUYXNrV2l6YXJkIGV4dGVuZHMgVGFza1dpemFyZCB7CisJcHVibGljIHN0YXRpYyBmaW5hbCBTdHJpbmcgUEFSRU5UX1BST0pFQ1QgPSAiUEFSRU5UX1BST0pFQ1QiOyAvLyBkYXRhIG1vZGVsIGtleSAvLyROT04tTkxTLTEkCisJcHVibGljIHN0YXRpYyBmaW5hbCBTdHJpbmcgQ0hJTERfUFJPSkVDVCA9ICJDSElMRF9QUk9KRUNUIjsgLy8gZGF0YSBtb2RlbCBrZXkgLy8kTk9OLU5MUy0xJAorCXB1YmxpYyBzdGF0aWMgZmluYWwgU3RyaW5nIENVUlJFTlRfUkVGRVJFTkNFUyA9ICJDVVJSRU5UX1JFRkVSRU5DRVMiOyAvLyBkYXRhIG1vZGVsIGtleSBmb3IgcmV0dXJuIHZhbCAvLyROT04tTkxTLTEkCisJcHVibGljIHN0YXRpYyBmaW5hbCBTdHJpbmcgUkVUVVJORURfUkVGRVJFTkNFUyA9ICJSRVRVUk5FRF9SRUZFUkVOQ0VTIjsgLy8gZGF0YSBtb2RlbCBrZXkgZm9yIHJldHVybiB2YWwgLy8kTk9OLU5MUy0xJAorCXB1YmxpYyBBZGRNYW5pZmVzdEVudHJ5VGFza1dpemFyZCgpIHsKKwkJc3VwZXIoTWVzc2FnZXMuQWRkTWFuaWZlc3RFbnRyeVRhc2tXaXphcmRUaXRsZSwgbmV3IE1hbmlmZXN0Um9vdEZyYWdtZW50KCkpOworCX0KKwkKKwlwdWJsaWMgc3RhdGljIGNsYXNzIE1hbmlmZXN0Um9vdEZyYWdtZW50IGV4dGVuZHMgV2l6YXJkRnJhZ21lbnQgeworCQlwcml2YXRlIFRhYmxlVmlld2VyIHZpZXdlcjsKKwkJcHJpdmF0ZSBCdXR0b24gYWRkQ3VzdG9tOworCQlwcml2YXRlIFRleHQgY3VzdG9tRW50cnlUZXh0OworCQlwcm90ZWN0ZWQgSVByb2plY3QgcGFyZW50UHJvamVjdCwgY2hpbGRQcm9qZWN0OworCQlwcml2YXRlIElWaXJ0dWFsUmVmZXJlbmNlW10gc2VsZWN0ZWQ7CisJCXByaXZhdGUgU2hvd1Bvc3NpYmxlTWFuaWZlc3RFbnRyeUNvbnRlbnRQcm92aWRlciBjb250ZW50UHJvdmlkZXI7CisJCXByaXZhdGUgTGluayBwYXJlbnRDb250YWluZXJMaW5rOworCQlwdWJsaWMgYm9vbGVhbiBoYXNDb21wb3NpdGUoKSB7CisJCQlyZXR1cm4gdHJ1ZTsKKwkJfQorCQlwcml2YXRlIHZvaWQgdXBkYXRlV2lkZ2V0cygpIHRocm93cyBJbnZvY2F0aW9uVGFyZ2V0RXhjZXB0aW9uIHsKKwkJCisJCQl2aWV3ZXIuc2V0SW5wdXQoUmVzb3VyY2VzUGx1Z2luLmdldFdvcmtzcGFjZSgpKTsKKwkJCXZpZXdlci5yZWZyZXNoKCk7CisJCX0KKworCQlwdWJsaWMgQ29tcG9zaXRlIGNyZWF0ZUNvbXBvc2l0ZShDb21wb3NpdGUgcGFyZW50LCBJV2l6YXJkSGFuZGxlIGhhbmRsZSkgeworCQkJcGFyZW50UHJvamVjdCA9IChJUHJvamVjdClnZXRUYXNrTW9kZWwoKS5nZXRPYmplY3QoUEFSRU5UX1BST0pFQ1QpOworCQkJY2hpbGRQcm9qZWN0ID0gKElQcm9qZWN0KWdldFRhc2tNb2RlbCgpLmdldE9iamVjdChDSElMRF9QUk9KRUNUKTsKKwkJCWhhbmRsZS5zZXRUaXRsZShNZXNzYWdlcy5BZGRNYW5pZmVzdEVudHJ5VGFza1dpemFyZFRpdGxlKTsKKwkJCWhhbmRsZS5zZXREZXNjcmlwdGlvbihOTFMuYmluZChNZXNzYWdlcy5BZGRNYW5pZmVzdEVudHJ5VGFza1dpemFyZERlc2MsIHBhcmVudFByb2plY3QuZ2V0TmFtZSgpKSk7CisJCQlDb21wb3NpdGUgcm9vdCA9IG5ldyBDb21wb3NpdGUocGFyZW50LCBTV1QuTk9ORSk7CisJCQlyb290LnNldExheW91dChuZXcgRm9ybUxheW91dCgpKTsKKwkJCQorCQkJY3JlYXRlQ29uZmlnTGluayhyb290KTsKKwkJCXBhcmVudENvbnRhaW5lckxpbmsuc2V0TGF5b3V0RGF0YShNYW5pZmVzdE1vZHVsZURlcGVuZGVuY3lDb250cm9sLmNyZWF0ZUZvcm1EYXRhKDAsIDUsIG51bGwsIDUsIDAsIDUsIDEwMCwgLTUpKTsKKwkJCQorCQkJTGFiZWwgdGFibGVMYWJlbCA9IG5ldyBMYWJlbChyb290LCBTV1QuTk9ORSk7CisJCQl0YWJsZUxhYmVsLnNldFRleHQoTWVzc2FnZXMuTWFuaWZlc3RFbnRyaWVzKTsKKwkJCXRhYmxlTGFiZWwuc2V0TGF5b3V0RGF0YShNYW5pZmVzdE1vZHVsZURlcGVuZGVuY3lDb250cm9sLmNyZWF0ZUZvcm1EYXRhKDEwLCA1LCBudWxsLCAwLCAwLCA1LCAxMDAsIC01KSk7CisJCQkKKwkJCXZpZXdlciA9IE1hbmlmZXN0TW9kdWxlRGVwZW5kZW5jeUNvbnRyb2wuY3JlYXRlTWFuaWZlc3RSZWZlcmVuY2VUYWJsZVZpZXdlcihyb290LCBTV1QuTVVMVEkpOworCQkJY29udGVudFByb3ZpZGVyID0gbmV3IFNob3dQb3NzaWJsZU1hbmlmZXN0RW50cnlDb250ZW50UHJvdmlkZXIocGFyZW50UHJvamVjdCwgY2hpbGRQcm9qZWN0LCBnZXRUYXNrTW9kZWwoKSk7CisJCQl2aWV3ZXIuc2V0Q29udGVudFByb3ZpZGVyKGNvbnRlbnRQcm92aWRlcik7CisJCQl2aWV3ZXIuc2V0TGFiZWxQcm92aWRlcihuZXcgTWFuaWZlc3RMYWJlbFByb3ZpZGVyKCkpOworCQkJdmlld2VyLnNldElucHV0KFJlc291cmNlc1BsdWdpbi5nZXRXb3Jrc3BhY2UoKSk7CisJCQl2aWV3ZXIuYWRkU2VsZWN0aW9uQ2hhbmdlZExpc3RlbmVyKG5ldyBJU2VsZWN0aW9uQ2hhbmdlZExpc3RlbmVyKCkgeworCQkJCXB1YmxpYyB2b2lkIHNlbGVjdGlvbkNoYW5nZWQoU2VsZWN0aW9uQ2hhbmdlZEV2ZW50IGV2ZW50KSB7CisJCQkJCXZpZXdlclNlbGVjdGlvbkNoYW5nZWQoKTsKKwkJCQl9CisJCQl9KTsKKwkJCQorCQkJY3VzdG9tRW50cnlUZXh0ID0gbmV3IFRleHQocm9vdCwgU1dULkJPUkRFUik7CisJCQlhZGRDdXN0b20gPSBuZXcgQnV0dG9uKHJvb3QsIFNXVC5QVVNIKTsKKwkJCWFkZEN1c3RvbS5zZXRUZXh0KE1lc3NhZ2VzLkN1c3RvbUVudHJ5QnV0dG9uKTsKKwkJCWFkZEN1c3RvbS5zZXRMYXlvdXREYXRhKE1hbmlmZXN0TW9kdWxlRGVwZW5kZW5jeUNvbnRyb2wuY3JlYXRlRm9ybURhdGEobnVsbCwgMCwgMTAwLCAtNSwgbnVsbCwgMCwgMTAwLCAtNSkpOworCQkJYWRkQ3VzdG9tLmFkZFNlbGVjdGlvbkxpc3RlbmVyKG5ldyBTZWxlY3Rpb25MaXN0ZW5lcigpIHsKKwkJCQlwdWJsaWMgdm9pZCB3aWRnZXRTZWxlY3RlZChTZWxlY3Rpb25FdmVudCBlKSB7CisJCQkJCWFkZEN1c3RvbVByZXNzZWQoKTsKKwkJCQl9CisJCQkJcHVibGljIHZvaWQgd2lkZ2V0RGVmYXVsdFNlbGVjdGVkKFNlbGVjdGlvbkV2ZW50IGUpIHsKKwkJCQl9CisJCQl9KTsKKwkJCQorCQkJY3VzdG9tRW50cnlUZXh0LnNldExheW91dERhdGEoTWFuaWZlc3RNb2R1bGVEZXBlbmRlbmN5Q29udHJvbC5jcmVhdGVGb3JtRGF0YShudWxsLCAwLCAxMDAsIC01LCAwLCA1LCBhZGRDdXN0b20sIC01KSk7CQkJCisJCQl2aWV3ZXIuZ2V0VGFibGUoKS5zZXRMYXlvdXREYXRhKE1hbmlmZXN0TW9kdWxlRGVwZW5kZW5jeUNvbnRyb2wuY3JlYXRlRm9ybURhdGEodGFibGVMYWJlbCwgNSwgYWRkQ3VzdG9tLCAwLCAwLCA1LCAxMDAsIC01KSk7CisJCQlyZXR1cm4gcm9vdDsKKwkJfQorCQkKKwkJcHJpdmF0ZSB2b2lkIGFkZEN1c3RvbVByZXNzZWQoKSB7CisJCQlJVmlydHVhbFJlZmVyZW5jZSByZWYgPSBNYW5pZmVzdE1vZHVsZURlcGVuZGVuY3lDb250cm9sLmNyZWF0ZUR1bW15UmVmZXJlbmNlKAorCQkJCQljdXN0b21FbnRyeVRleHQuZ2V0VGV4dCgpLCBwYXJlbnRQcm9qZWN0LCBDb21wb25lbnRDb3JlLmNyZWF0ZUNvbXBvbmVudChwYXJlbnRQcm9qZWN0KSk7CisJCQljb250ZW50UHJvdmlkZXIuYWRkUG9zc2libGVSZWZlcmVuY2UocmVmKTsKKwkJCWN1c3RvbUVudHJ5VGV4dC5zZXRUZXh0KCIiKTsgLy8kTk9OLU5MUy0xJAorCQkJdmlld2VyLnJlZnJlc2goKTsKKwkJfQorCQkKKwkJcHJpdmF0ZSB2b2lkIHZpZXdlclNlbGVjdGlvbkNoYW5nZWQoKSB7CisJCQlJU3RydWN0dXJlZFNlbGVjdGlvbiBzZWwgPSAoSVN0cnVjdHVyZWRTZWxlY3Rpb24pdmlld2VyLmdldFNlbGVjdGlvbigpOworCQkJT2JqZWN0W10gb2JqID0gc2VsLnRvQXJyYXkoKTsKKwkJCUlWaXJ0dWFsUmVmZXJlbmNlW10gcmV0ID0gbmV3IElWaXJ0dWFsUmVmZXJlbmNlW29iai5sZW5ndGhdOworCQkJZm9yKCBpbnQgaSA9IDA7IGkgPCByZXQubGVuZ3RoOyBpKysgKSB7CisJCQkJcmV0W2ldID0gKElWaXJ0dWFsUmVmZXJlbmNlKW9ialtpXTsKKwkJCX0KKwkJCXNlbGVjdGVkID0gcmV0OworCQl9CisJCQorCQlwcml2YXRlIHZvaWQgY3JlYXRlQ29uZmlnTGluayhDb21wb3NpdGUgYUdyb3VwKXsKKwkJCXBhcmVudENvbnRhaW5lckxpbmsgPSBuZXcgTGluayhhR3JvdXAsU1dULk5vbmUpOworCQkJcGFyZW50Q29udGFpbmVyTGluay5zZXRUZXh0KCI8QT4iKyAvLyROT04tTkxTLTEkCisJCQkJCU1lc3NhZ2VzLkNvbmZpZ3VyZVBhcmVudExpbmsrIjwvQT4iKTsgLy8kTk9OLU5MUy0xJAorCQkJcGFyZW50Q29udGFpbmVyTGluay5hZGRTZWxlY3Rpb25MaXN0ZW5lcihuZXcgU2VsZWN0aW9uTGlzdGVuZXIoKSB7CisJCQkJCisJCQkJcHVibGljIHZvaWQgZG9MaW5rQWN0aXZhdGVkKExpbmsgZSkgeworCQkJCQlJUHJvamVjdCBwYXJlbnRQcm9qZWN0ID0gTWFuaWZlc3RSb290RnJhZ21lbnQudGhpcy5wYXJlbnRQcm9qZWN0OworCQkJCQlQcmVmZXJlbmNlRGlhbG9nIGRpYWxvZyA9IFByb3BlcnR5RGlhbG9nLmNyZWF0ZURpYWxvZ09uKE1hbmlmZXN0Um9vdEZyYWdtZW50LnRoaXMuZ2V0UGFnZSgpLmdldENvbnRyb2woKS5nZXRTaGVsbCgpLAorCQkJCQkJCSJvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUudWkuRGVwbG95bWVudEFzc2VtYmx5UGFnZSIsIHBhcmVudFByb2plY3QpOyAvLyROT04tTkxTLTEkCisJCQkJCWlmIChkaWFsb2cgIT0gbnVsbCkgeworCQkJCQkJZGlhbG9nLm9wZW4oKTsKKwkJCQkJfQorCQkJCQl0cnkgeworCQkJCQkJdXBkYXRlV2lkZ2V0cygpOworCQkJCQl9IGNhdGNoIChJbnZvY2F0aW9uVGFyZ2V0RXhjZXB0aW9uIGllKSB7CisKKwkJCQkJfQorCQkJCX0KKworCQkJCXB1YmxpYyB2b2lkIHdpZGdldERlZmF1bHRTZWxlY3RlZChTZWxlY3Rpb25FdmVudCBlKSB7CisJCQkJCWRvTGlua0FjdGl2YXRlZCgoTGluaykgZS53aWRnZXQpOwkJCQkJCisJCQkJfQorCisJCQkJcHVibGljIHZvaWQgd2lkZ2V0U2VsZWN0ZWQoU2VsZWN0aW9uRXZlbnQgZSkgeworCQkJCQlkb0xpbmtBY3RpdmF0ZWQoKExpbmspIGUud2lkZ2V0KTsJCQkJCQorCQkJCX0KKwkJCX0pOworCQkJCisJCX0KKwkJCisJCQorCQkvLyBqdXN0IHJldHVybiB0aGUgc2VsZWN0ZWQgcmVmcworCQlwdWJsaWMgdm9pZCBwZXJmb3JtRmluaXNoKElQcm9ncmVzc01vbml0b3IgbW9uaXRvcikgdGhyb3dzIENvcmVFeGNlcHRpb24geworCQkJZ2V0VGFza01vZGVsKCkucHV0T2JqZWN0KFJFVFVSTkVEX1JFRkVSRU5DRVMsIHNlbGVjdGVkKTsKKwkJfQorCX0KKwkKKwlwdWJsaWMgc3RhdGljIGNsYXNzIFNob3dQb3NzaWJsZU1hbmlmZXN0RW50cnlDb250ZW50UHJvdmlkZXIgZXh0ZW5kcyBBcnJheUNvbnRlbnRQcm92aWRlciB7CisJCXByaXZhdGUgSVByb2plY3QgcGFyZW50LCBjaGlsZDsKKwkJcHJpdmF0ZSBUYXNrTW9kZWwgbW9kZWw7CisJCXByaXZhdGUgSVZpcnR1YWxSZWZlcmVuY2VbXSBwb3NzaWJsZTsKKwkJcHVibGljIFNob3dQb3NzaWJsZU1hbmlmZXN0RW50cnlDb250ZW50UHJvdmlkZXIoSVByb2plY3QgcGFyZW50LCBJUHJvamVjdCBjaGlsZCwgVGFza01vZGVsIHRhc2tNb2RlbCkgeworCQkJdGhpcy5wYXJlbnQgPSBwYXJlbnQ7CisJCQl0aGlzLmNoaWxkID0gY2hpbGQ7CisJCQl0aGlzLm1vZGVsID0gdGFza01vZGVsOworCQl9CisJCXB1YmxpYyBPYmplY3RbXSBnZXRFbGVtZW50cyhPYmplY3QgaW5wdXRFbGVtZW50KSB7CisJCQlpZiggcG9zc2libGUgPT0gbnVsbCApIHsKKwkJCQlJVmlydHVhbFJlZmVyZW5jZVtdIGN1cnJlbnQgPSAoSVZpcnR1YWxSZWZlcmVuY2VbXSltb2RlbC5nZXRPYmplY3QoQ1VSUkVOVF9SRUZFUkVOQ0VTKTsKKwkJCQlwb3NzaWJsZSA9IEphdmFNb2R1bGVDb21wb25lbnRVdGlsaXR5LmZpbmRQb3NzaWJsZU1hbmlmZXN0RW50cmllcyhwYXJlbnQsIGNoaWxkLCBjdXJyZW50KTsKKwkJCX0KKwkJCXJldHVybiBwb3NzaWJsZTsKKwkJfQorCQlwdWJsaWMgdm9pZCBhZGRQb3NzaWJsZVJlZmVyZW5jZShJVmlydHVhbFJlZmVyZW5jZSByZWYpIHsKKwkJCUFycmF5TGlzdDxJVmlydHVhbFJlZmVyZW5jZT4gbmV3UmVmcyA9IG5ldyBBcnJheUxpc3Q8SVZpcnR1YWxSZWZlcmVuY2U+KCk7CisJCQluZXdSZWZzLmFkZEFsbChBcnJheXMuYXNMaXN0KHBvc3NpYmxlKSk7CisJCQluZXdSZWZzLmFkZChyZWYpOworCQkJcG9zc2libGUgPSBuZXdSZWZzLnRvQXJyYXkobmV3IElWaXJ0dWFsUmVmZXJlbmNlW25ld1JlZnMuc2l6ZSgpXSk7CisJCX0KKwkJQE92ZXJyaWRlCisJCXB1YmxpYyB2b2lkIGlucHV0Q2hhbmdlZChWaWV3ZXIgdmlld2VyLCBPYmplY3Qgb2xkSW5wdXQsIE9iamVjdCBuZXdJbnB1dCkgeworCQkJaWYgKG5ld0lucHV0ICE9IG51bGwpIHsKKwkJCQlwb3NzaWJsZSA9IG51bGw7CisJCQkJdmlld2VyLnJlZnJlc2goKTsKKwkJCX0KKwkJfQorCQkKKwl9Cit9CmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLmpzdC5jb21tb24udWkvc3JjL29yZy9lY2xpcHNlL2pzdC9jb21tb24vdWkvaW50ZXJuYWwvYXNzZW1ibHkvd2l6YXJkL0NsYXNzcGF0aENvbnRhaW5lclJlZkxhYmVsUHJvdmlkZXIuamF2YSBiL3BsdWdpbnMvb3JnLmVjbGlwc2UuanN0LmNvbW1vbi51aS9zcmMvb3JnL2VjbGlwc2UvanN0L2NvbW1vbi91aS9pbnRlcm5hbC9hc3NlbWJseS93aXphcmQvQ2xhc3NwYXRoQ29udGFpbmVyUmVmTGFiZWxQcm92aWRlci5qYXZhCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLjIyMzhhOGMKLS0tIC9kZXYvbnVsbAorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLmpzdC5jb21tb24udWkvc3JjL29yZy9lY2xpcHNlL2pzdC9jb21tb24vdWkvaW50ZXJuYWwvYXNzZW1ibHkvd2l6YXJkL0NsYXNzcGF0aENvbnRhaW5lclJlZkxhYmVsUHJvdmlkZXIuamF2YQpAQCAtMCwwICsxLDU4IEBACisvKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqCisgKiBDb3B5cmlnaHQgKGMpIDIwMDkgUmVkIEhhdAorICogQWxsIHJpZ2h0cyByZXNlcnZlZC4gVGhpcyBwcm9ncmFtIGFuZCB0aGUgYWNjb21wYW55aW5nIG1hdGVyaWFscworICogYXJlIG1hZGUgYXZhaWxhYmxlIHVuZGVyIHRoZSB0ZXJtcyBvZiB0aGUgRWNsaXBzZSBQdWJsaWMgTGljZW5zZSB2MS4wCisgKiB3aGljaCBhY2NvbXBhbmllcyB0aGlzIGRpc3RyaWJ1dGlvbiwgYW5kIGlzIGF2YWlsYWJsZSBhdAorICogaHR0cDovL3d3dy5lY2xpcHNlLm9yZy9sZWdhbC9lcGwtdjEwLmh0bWwKKyAqCisgKiBDb250cmlidXRvcnM6CisgKiAgICBSb2IgU3RyeWtlciAtIGluaXRpYWwgaW1wbGVtZW50YXRpb24gYW5kIG9uZ29pbmcgbWFpbnRlbmFuY2UKKyAqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKiovCitwYWNrYWdlIG9yZy5lY2xpcHNlLmpzdC5jb21tb24udWkuaW50ZXJuYWwuYXNzZW1ibHkud2l6YXJkOworCitpbXBvcnQgamF2YS5uZXQuTWFsZm9ybWVkVVJMRXhjZXB0aW9uOworaW1wb3J0IGphdmEubmV0LlVSTDsKKworaW1wb3J0IG9yZy5lY2xpcHNlLmpmYWNlLnJlc291cmNlLkltYWdlRGVzY3JpcHRvcjsKK2ltcG9ydCBvcmcuZWNsaXBzZS5qc3QuY29tbW9uLmludGVybmFsLm1vZHVsZWNvcmUuQ2xhc3NwYXRoQ29udGFpbmVyVmlydHVhbENvbXBvbmVudDsKK2ltcG9ydCBvcmcuZWNsaXBzZS5qc3QuY29tbW9uLnVpLmludGVybmFsLkpzdENvbW1vblVJUGx1Z2luOworaW1wb3J0IG9yZy5lY2xpcHNlLnN3dC5ncmFwaGljcy5JbWFnZTsKK2ltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUucmVzb3VyY2VzLklWaXJ0dWFsQ29tcG9uZW50OworaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS51aS5pbnRlcm5hbC5wcm9wZXJ0eXBhZ2UuSVZpcnR1YWxDb21wb25lbnRMYWJlbFByb3ZpZGVyOworCitwdWJsaWMgY2xhc3MgQ2xhc3NwYXRoQ29udGFpbmVyUmVmTGFiZWxQcm92aWRlciBpbXBsZW1lbnRzCisJCUlWaXJ0dWFsQ29tcG9uZW50TGFiZWxQcm92aWRlciB7CisKKwlwdWJsaWMgQ2xhc3NwYXRoQ29udGFpbmVyUmVmTGFiZWxQcm92aWRlcigpIHsKKwkJLy8gVE9ETyBBdXRvLWdlbmVyYXRlZCBjb25zdHJ1Y3RvciBzdHViCisJfQorCisJcHVibGljIGJvb2xlYW4gY2FuSGFuZGxlKElWaXJ0dWFsQ29tcG9uZW50IGNvbXBvbmVudCkgeworCQlyZXR1cm4gKGNvbXBvbmVudCBpbnN0YW5jZW9mIENsYXNzcGF0aENvbnRhaW5lclZpcnR1YWxDb21wb25lbnQpOworCX0KKworCXB1YmxpYyBTdHJpbmcgZ2V0U291cmNlVGV4dChJVmlydHVhbENvbXBvbmVudCBjb21wb25lbnQpIHsKKwkJcmV0dXJuICgoQ2xhc3NwYXRoQ29udGFpbmVyVmlydHVhbENvbXBvbmVudCljb21wb25lbnQpLmdldENsYXNzcGF0aENvbnRhaW5lclBhdGgoKTsKKwl9CisKKwlwcml2YXRlIEltYWdlIGltYWdlOworCXB1YmxpYyBJbWFnZSBnZXRTb3VyY2VJbWFnZShJVmlydHVhbENvbXBvbmVudCBjb21wb25lbnQpIHsKKwkJaWYoIGltYWdlID09IG51bGwgKSB7CisJCQl0cnkgeworCQkJCVVSTCB1cmwgPSBuZXcgVVJMKCBKc3RDb21tb25VSVBsdWdpbi5nZXREZWZhdWx0KCkuZ2V0QnVuZGxlKCkuZ2V0RW50cnkoIi8iKSwgImljb25zL3V0aWwtd2l6LWljb24uZ2lmIik7IC8vJE5PTi1OTFMtMSQgLy8kTk9OLU5MUy0yJAorCQkJCUltYWdlRGVzY3JpcHRvciBpbWFnZURlc2NyaXB0b3IgPSBudWxsOworCQkJCWlmICh1cmwgIT0gbnVsbCkKKwkJCQkJaW1hZ2VEZXNjcmlwdG9yID0gSW1hZ2VEZXNjcmlwdG9yLmNyZWF0ZUZyb21VUkwodXJsKTsKKwkJCQlpZiggaW1hZ2VEZXNjcmlwdG9yICE9IG51bGwgKSAKKwkJCQkJaW1hZ2UgPSBpbWFnZURlc2NyaXB0b3IuY3JlYXRlSW1hZ2UoKTsKKwkJCX0gY2F0Y2goIE1hbGZvcm1lZFVSTEV4Y2VwdGlvbiBtdXJsZSApIHsKKwkJCQkvLyBkbyBub3RoaW5nCisJCQl9CisJCX0KKwkJcmV0dXJuIGltYWdlOworCX0KKwkKKwlwdWJsaWMgdm9pZCBkaXNwb3NlKCkgeworCQlpbWFnZS5kaXNwb3NlKCk7CisJfQorfQpkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS5qc3QuY29tbW9uLnVpL3NyYy9vcmcvZWNsaXBzZS9qc3QvY29tbW9uL3VpL2ludGVybmFsL2Fzc2VtYmx5L3dpemFyZC9DbGFzc3BhdGhDb250YWluZXJXaXphcmRGcmFnbWVudC5qYXZhIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS5qc3QuY29tbW9uLnVpL3NyYy9vcmcvZWNsaXBzZS9qc3QvY29tbW9uL3VpL2ludGVybmFsL2Fzc2VtYmx5L3dpemFyZC9DbGFzc3BhdGhDb250YWluZXJXaXphcmRGcmFnbWVudC5qYXZhCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLjU1NzYwMDYKLS0tIC9kZXYvbnVsbAorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLmpzdC5jb21tb24udWkvc3JjL29yZy9lY2xpcHNlL2pzdC9jb21tb24vdWkvaW50ZXJuYWwvYXNzZW1ibHkvd2l6YXJkL0NsYXNzcGF0aENvbnRhaW5lcldpemFyZEZyYWdtZW50LmphdmEKQEAgLTAsMCArMSw2MyBAQAorLyoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKgorICogQ29weXJpZ2h0IChjKSAyMDA5IFJlZCBIYXQKKyAqIEFsbCByaWdodHMgcmVzZXJ2ZWQuIFRoaXMgcHJvZ3JhbSBhbmQgdGhlIGFjY29tcGFueWluZyBtYXRlcmlhbHMKKyAqIGFyZSBtYWRlIGF2YWlsYWJsZSB1bmRlciB0aGUgdGVybXMgb2YgdGhlIEVjbGlwc2UgUHVibGljIExpY2Vuc2UgdjEuMAorICogd2hpY2ggYWNjb21wYW5pZXMgdGhpcyBkaXN0cmlidXRpb24sIGFuZCBpcyBhdmFpbGFibGUgYXQKKyAqIGh0dHA6Ly93d3cuZWNsaXBzZS5vcmcvbGVnYWwvZXBsLXYxMC5odG1sCisgKgorICogQ29udHJpYnV0b3JzOgorICogICAgUm9iIFN0cnlrZXIgLSBpbml0aWFsIGltcGxlbWVudGF0aW9uIGFuZCBvbmdvaW5nIG1haW50ZW5hbmNlCisgKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqLworcGFja2FnZSBvcmcuZWNsaXBzZS5qc3QuY29tbW9uLnVpLmludGVybmFsLmFzc2VtYmx5LndpemFyZDsKKworaW1wb3J0IGphdmEudXRpbC5BcnJheUxpc3Q7CisKK2ltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJlc291cmNlcy5JUHJvamVjdDsKK2ltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJ1bnRpbWUuQ29yZUV4Y2VwdGlvbjsKK2ltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJ1bnRpbWUuSVByb2dyZXNzTW9uaXRvcjsKK2ltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJ1bnRpbWUuUGF0aDsKK2ltcG9ydCBvcmcuZWNsaXBzZS5qZHQuY29yZS5JQ2xhc3NwYXRoRW50cnk7CitpbXBvcnQgb3JnLmVjbGlwc2UuamR0LmNvcmUuSUphdmFQcm9qZWN0OworaW1wb3J0IG9yZy5lY2xpcHNlLmpkdC5jb3JlLkphdmFDb3JlOworaW1wb3J0IG9yZy5lY2xpcHNlLmpkdC5pbnRlcm5hbC51aS53aXphcmRzLmJ1aWxkcGF0aHMuQ2xhc3NwYXRoQ29udGFpbmVyV2l6YXJkOworaW1wb3J0IG9yZy5lY2xpcHNlLmpmYWNlLndpbmRvdy5XaW5kb3c7CitpbXBvcnQgb3JnLmVjbGlwc2UuanN0LmNvbW1vbi5pbnRlcm5hbC5tb2R1bGVjb3JlLkNsYXNzcGF0aENvbnRhaW5lclZpcnR1YWxDb21wb25lbnQ7CitpbXBvcnQgb3JnLmVjbGlwc2Uuc3d0LndpZGdldHMuRGlzcGxheTsKK2ltcG9ydCBvcmcuZWNsaXBzZS5zd3Qud2lkZ2V0cy5TaGVsbDsKK2ltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUuaW50ZXJuYWwucmVzb3VyY2VzLlZpcnR1YWxSZWZlcmVuY2U7CitpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb21wb25lbnRjb3JlLnJlc291cmNlcy5JVmlydHVhbENvbXBvbmVudDsKK2ltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUucmVzb3VyY2VzLklWaXJ0dWFsUmVmZXJlbmNlOworaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS51aS5pbnRlcm5hbC50YXNrd2l6YXJkLldpemFyZEZyYWdtZW50OworaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS51aS5wcm9wZXJ0eXBhZ2UuSVJlZmVyZW5jZVdpemFyZENvbnN0YW50czsKKworcHVibGljIGNsYXNzIENsYXNzcGF0aENvbnRhaW5lcldpemFyZEZyYWdtZW50IGV4dGVuZHMgV2l6YXJkRnJhZ21lbnQgeworCXB1YmxpYyBib29sZWFuIGhhc0NvbXBvc2l0ZSgpIHsKKwkJcmV0dXJuIGZhbHNlOworCX0KKwlwdWJsaWMgdm9pZCBwZXJmb3JtRmluaXNoKElQcm9ncmVzc01vbml0b3IgbW9uaXRvcikgdGhyb3dzIENvcmVFeGNlcHRpb24geworCQlmaW5hbCBJUHJvamVjdCBwcm9qZWN0ID0gKElQcm9qZWN0KWdldFRhc2tNb2RlbCgpLmdldE9iamVjdChJUmVmZXJlbmNlV2l6YXJkQ29uc3RhbnRzLlBST0pFQ1QpOworCQlmaW5hbCBJVmlydHVhbENvbXBvbmVudCByb290Q29tcCA9IChJVmlydHVhbENvbXBvbmVudClnZXRUYXNrTW9kZWwoKS5nZXRPYmplY3QoSVJlZmVyZW5jZVdpemFyZENvbnN0YW50cy5ST09UX0NPTVBPTkVOVCk7CisJCURpc3BsYXkuZ2V0RGVmYXVsdCgpLnN5bmNFeGVjKG5ldyBSdW5uYWJsZSgpIHsgCisJCQlwdWJsaWMgdm9pZCBydW4oKSB7CisJCQkJSUphdmFQcm9qZWN0IGpwID0gSmF2YUNvcmUuY3JlYXRlKHByb2plY3QpOworCQkJCUlDbGFzc3BhdGhFbnRyeVtdIGVudHJpZXMgPSBuZXcgSUNsYXNzcGF0aEVudHJ5W117fTsKKwkJCQlDbGFzc3BhdGhDb250YWluZXJXaXphcmQgd2l6YXJkID0gbmV3IENsYXNzcGF0aENvbnRhaW5lcldpemFyZCgoSUNsYXNzcGF0aEVudHJ5KW51bGwsIGpwLCBlbnRyaWVzKTsKKwkJCQlpbnQgcmVzdWx0ID0gQ2xhc3NwYXRoQ29udGFpbmVyV2l6YXJkLm9wZW5XaXphcmQobmV3IFNoZWxsKCksIHdpemFyZCk7CisJCQkJaWYoIHJlc3VsdCA9PSBXaW5kb3cuT0sgKSB7CisJCQkJCUFycmF5TGlzdDxJVmlydHVhbFJlZmVyZW5jZT4gcmVmZXJlbmNlcyA9IG5ldyBBcnJheUxpc3Q8SVZpcnR1YWxSZWZlcmVuY2U+KCk7CisJCQkJCUlDbGFzc3BhdGhFbnRyeVtdIHJlc3VsdHMgPSB3aXphcmQuZ2V0TmV3RW50cmllcygpOworCQkJCQlmb3IoIGludCBpID0gMDsgaSA8IHJlc3VsdHMubGVuZ3RoOyBpKysgKSB7CisJCQkJCQlTdHJpbmcgZGVmYXVsdFBhdGggPSAoU3RyaW5nKWdldFRhc2tNb2RlbCgpLmdldE9iamVjdChJUmVmZXJlbmNlV2l6YXJkQ29uc3RhbnRzLkRFRkFVTFRfTElCUkFSWV9MT0NBVElPTik7CisJCQkJCQlkZWZhdWx0UGF0aCA9IGRlZmF1bHRQYXRoID09IG51bGwgPyAiL2xpYiIgOiBkZWZhdWx0UGF0aDsKKwkJCQkJCUlWaXJ0dWFsQ29tcG9uZW50IGNoaWxkQ29tcCA9IG5ldyBDbGFzc3BhdGhDb250YWluZXJWaXJ0dWFsQ29tcG9uZW50KHByb2plY3QsIHJvb3RDb21wLCByZXN1bHRzW2ldLmdldFBhdGgoKS50b1N0cmluZygpKTsKKwkJCQkJCVZpcnR1YWxSZWZlcmVuY2UgcmVmID0gbmV3IFZpcnR1YWxSZWZlcmVuY2Uocm9vdENvbXAsIGNoaWxkQ29tcCwgbmV3IFBhdGgoZGVmYXVsdFBhdGgpLm1ha2VBYnNvbHV0ZSgpKTsKKwkJCQkJCXJlZi5zZXREZXBlbmRlbmN5VHlwZShJVmlydHVhbFJlZmVyZW5jZS5ERVBFTkRFTkNZX1RZUEVfQ09OU1VNRVMpOworCQkJCQkJcmVmZXJlbmNlcy5hZGQocmVmKTsKKwkJCQkJfQorCQkJCQlnZXRUYXNrTW9kZWwoKS5wdXRPYmplY3QoSVJlZmVyZW5jZVdpemFyZENvbnN0YW50cy5GSU5BTF9SRUZFUkVOQ0UsIAorCQkJCQkJCXJlZmVyZW5jZXMudG9BcnJheShuZXcgSVZpcnR1YWxSZWZlcmVuY2VbcmVmZXJlbmNlcy5zaXplKCldKSk7CisJCQkJfQorCQkJfQorCQl9KTsKKwl9Cit9CmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLmpzdC5jb21tb24udWkvc3JjL29yZy9lY2xpcHNlL2pzdC9jb21tb24vdWkvaW50ZXJuYWwvYXNzZW1ibHkvd2l6YXJkL0V4dGVybmFsSmFyUmVmZXJlbmNlV2l6YXJkRnJhZ21lbnQuamF2YSBiL3BsdWdpbnMvb3JnLmVjbGlwc2UuanN0LmNvbW1vbi51aS9zcmMvb3JnL2VjbGlwc2UvanN0L2NvbW1vbi91aS9pbnRlcm5hbC9hc3NlbWJseS93aXphcmQvRXh0ZXJuYWxKYXJSZWZlcmVuY2VXaXphcmRGcmFnbWVudC5qYXZhCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLmQwZDk1NzcKLS0tIC9kZXYvbnVsbAorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLmpzdC5jb21tb24udWkvc3JjL29yZy9lY2xpcHNlL2pzdC9jb21tb24vdWkvaW50ZXJuYWwvYXNzZW1ibHkvd2l6YXJkL0V4dGVybmFsSmFyUmVmZXJlbmNlV2l6YXJkRnJhZ21lbnQuamF2YQpAQCAtMCwwICsxLDExNSBAQAorLyoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKgorICogQ29weXJpZ2h0IChjKSAyMDA5IFJlZCBIYXQKKyAqIEFsbCByaWdodHMgcmVzZXJ2ZWQuIFRoaXMgcHJvZ3JhbSBhbmQgdGhlIGFjY29tcGFueWluZyBtYXRlcmlhbHMKKyAqIGFyZSBtYWRlIGF2YWlsYWJsZSB1bmRlciB0aGUgdGVybXMgb2YgdGhlIEVjbGlwc2UgUHVibGljIExpY2Vuc2UgdjEuMAorICogd2hpY2ggYWNjb21wYW5pZXMgdGhpcyBkaXN0cmlidXRpb24sIGFuZCBpcyBhdmFpbGFibGUgYXQKKyAqIGh0dHA6Ly93d3cuZWNsaXBzZS5vcmcvbGVnYWwvZXBsLXYxMC5odG1sCisgKgorICogQ29udHJpYnV0b3JzOgorICogICAgUm9iIFN0cnlrZXIgLSBpbml0aWFsIGltcGxlbWVudGF0aW9uIGFuZCBvbmdvaW5nIG1haW50ZW5hbmNlCisgKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqLworcGFja2FnZSBvcmcuZWNsaXBzZS5qc3QuY29tbW9uLnVpLmludGVybmFsLmFzc2VtYmx5LndpemFyZDsKKworaW1wb3J0IGphdmEudXRpbC5BcnJheUxpc3Q7CisKK2ltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJ1bnRpbWUuQ29yZUV4Y2VwdGlvbjsKK2ltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJ1bnRpbWUuSVBhdGg7CitpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5ydW50aW1lLklQcm9ncmVzc01vbml0b3I7CitpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5ydW50aW1lLlBhdGg7CitpbXBvcnQgb3JnLmVjbGlwc2UuanN0LmNvbW1vbi51aS5pbnRlcm5hbC5JSnN0Q29tbW9uVUlDb25zdGFudHM7CitpbXBvcnQgb3JnLmVjbGlwc2UuanN0LmNvbW1vbi51aS5pbnRlcm5hbC5JSnN0Q29tbW9uVUlDb250ZXh0SWRzOworaW1wb3J0IG9yZy5lY2xpcHNlLmpzdC5jb21tb24udWkuaW50ZXJuYWwuSnN0Q29tbW9uVUlQbHVnaW47CitpbXBvcnQgb3JnLmVjbGlwc2UuanN0LmNvbW1vbi51aS5pbnRlcm5hbC5NZXNzYWdlczsKK2ltcG9ydCBvcmcuZWNsaXBzZS5zd3QuU1dUOworaW1wb3J0IG9yZy5lY2xpcHNlLnN3dC53aWRnZXRzLkNvbXBvc2l0ZTsKK2ltcG9ydCBvcmcuZWNsaXBzZS5zd3Qud2lkZ2V0cy5GaWxlRGlhbG9nOworaW1wb3J0IG9yZy5lY2xpcHNlLnN3dC53aWRnZXRzLlNoZWxsOworaW1wb3J0IG9yZy5lY2xpcHNlLnVpLlBsYXRmb3JtVUk7CitpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb21wb25lbnRjb3JlLkNvbXBvbmVudENvcmU7CitpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb21wb25lbnRjb3JlLmludGVybmFsLnJlc291cmNlcy5WaXJ0dWFsQXJjaGl2ZUNvbXBvbmVudDsKK2ltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUuaW50ZXJuYWwucmVzb3VyY2VzLlZpcnR1YWxSZWZlcmVuY2U7CitpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb21wb25lbnRjb3JlLnJlc291cmNlcy5JVmlydHVhbENvbXBvbmVudDsKK2ltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUucmVzb3VyY2VzLklWaXJ0dWFsUmVmZXJlbmNlOworaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS51aS5pbnRlcm5hbC50YXNrd2l6YXJkLklXaXphcmRIYW5kbGU7CitpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb21wb25lbnRjb3JlLnVpLnByb3BlcnR5cGFnZS5JUmVmZXJlbmNlV2l6YXJkQ29uc3RhbnRzOworCitwdWJsaWMgY2xhc3MgRXh0ZXJuYWxKYXJSZWZlcmVuY2VXaXphcmRGcmFnbWVudCBleHRlbmRzIEphclJlZmVyZW5jZVdpemFyZEZyYWdtZW50IHsJCisJcHVibGljIENvbXBvc2l0ZSBjcmVhdGVDb21wb3NpdGUoQ29tcG9zaXRlIHBhcmVudCwgSVdpemFyZEhhbmRsZSBoYW5kbGUpIHsKKwkJQ29tcG9zaXRlIGMgPSBzdXBlci5jcmVhdGVDb21wb3NpdGUocGFyZW50LCBoYW5kbGUpOworCQloYW5kbGUuc2V0VGl0bGUoTWVzc2FnZXMuRXh0ZXJuYWxBcmNoaXZlVGl0bGUpOworCQloYW5kbGUuc2V0RGVzY3JpcHRpb24oTWVzc2FnZXMuRXh0ZXJuYWxBcmNoaXZlRGVzY3JpcHRpb24pOworCQlQbGF0Zm9ybVVJLmdldFdvcmtiZW5jaCgpLmdldEhlbHBTeXN0ZW0oKS5zZXRIZWxwKGMsIElKc3RDb21tb25VSUNvbnRleHRJZHMuREVQTE9ZTUVOVF9BU1NFTUJMWV9ORVdfRVhURVJOQUxfQVJDSElWRV9SRUZFUkVOQ0VfUDEpOworCQlyZXR1cm4gYzsKKwl9CisKKwlwcm90ZWN0ZWQgdm9pZCBidXR0b25QcmVzc2VkKCkgeworCQlzZWxlY3RlZCA9IGNob29zZUV4dGVybmFsQXJjaGl2ZUVudHJpZXMoYnJvd3NlLmdldFNoZWxsKCkpOworCQkKKwkJaWYoc2VsZWN0ZWQgIT0gbnVsbCkgeworCQkJcmVtb3ZlSW52YWxpZEFyY2hpdmVGaWxlcygpOworCQl9CisJCQorCQl2aWV3ZXIucmVmcmVzaCgpOworCQlpZihzZWxlY3RlZCAhPSBudWxsICYmIHNlbGVjdGVkLmxlbmd0aCA+IDApIHsKKwkJCWlzQ29tcGxldGUgPSB0cnVlOwkJCQorCQl9IGVsc2UgeworCQkJaXNDb21wbGV0ZSA9IGZhbHNlOworCQl9CisJCWhhbmRsZS51cGRhdGUoKTsKKwl9CisKKwlwdWJsaWMgdm9pZCBwZXJmb3JtRmluaXNoKElQcm9ncmVzc01vbml0b3IgbW9uaXRvcikgdGhyb3dzIENvcmVFeGNlcHRpb24geworCQlJVmlydHVhbENvbXBvbmVudCByb290Q29tcG9uZW50ID0gKElWaXJ0dWFsQ29tcG9uZW50KWdldFRhc2tNb2RlbCgpLmdldE9iamVjdChJUmVmZXJlbmNlV2l6YXJkQ29uc3RhbnRzLlJPT1RfQ09NUE9ORU5UKTsKKwkJU3RyaW5nIHJ1bnRpbWVMb2MgPSAoU3RyaW5nKWdldFRhc2tNb2RlbCgpLmdldE9iamVjdChJUmVmZXJlbmNlV2l6YXJkQ29uc3RhbnRzLkRFRkFVTFRfTElCUkFSWV9MT0NBVElPTik7CisJCWlmIChzZWxlY3RlZCAhPSBudWxsICYmIHNlbGVjdGVkLmxlbmd0aCA+IDApIHsKKwkJCUFycmF5TGlzdDxJVmlydHVhbFJlZmVyZW5jZT4gcmVmTGlzdCA9IG5ldyBBcnJheUxpc3Q8SVZpcnR1YWxSZWZlcmVuY2U+KCk7CisJCQlBcnJheUxpc3Q8U3RyaW5nPiBwYXRocyA9IG5ldyBBcnJheUxpc3Q8U3RyaW5nPigpOworCQkJZm9yIChpbnQgaSA9IDA7IGkgPCBzZWxlY3RlZC5sZW5ndGg7IGkrKykgeworCQkJCS8vIElQYXRoIGZ1bGxQYXRoID0gcHJvamVjdC5nZXRGaWxlKHNlbGVjdGVkW2ldKS5nZXRGdWxsUGF0aCgpOworCQkJCVN0cmluZyB0eXBlID0gVmlydHVhbEFyY2hpdmVDb21wb25lbnQuTElCQVJDSElWRVRZUEUKKwkJCQkJCSsgSVBhdGguU0VQQVJBVE9SOworCQkJCUlWaXJ0dWFsQ29tcG9uZW50IGFyY2hpdmUgPSBDb21wb25lbnRDb3JlCisJCQkJCQkuY3JlYXRlQXJjaGl2ZUNvbXBvbmVudChyb290Q29tcG9uZW50LmdldFByb2plY3QoKSwKKwkJCQkJCQkJdHlwZSArIHNlbGVjdGVkW2ldLnRvU3RyaW5nKCkpOworCQkJCVZpcnR1YWxSZWZlcmVuY2UgcmVmID0gbmV3IFZpcnR1YWxSZWZlcmVuY2Uocm9vdENvbXBvbmVudCwgYXJjaGl2ZSk7CisJCQkJcmVmLnNldEFyY2hpdmVOYW1lKHNlbGVjdGVkW2ldLmxhc3RTZWdtZW50KCkpOworCQkJCWlmIChydW50aW1lTG9jICE9IG51bGwpIHsKKwkJCQkJcmVmLnNldFJ1bnRpbWVQYXRoKG5ldyBQYXRoKHJ1bnRpbWVMb2MpLm1ha2VBYnNvbHV0ZSgpKTsKKwkJCQl9CisJCQkJcmVmTGlzdC5hZGQocmVmKTsKKwkJCX0KKwkJCUlWaXJ0dWFsUmVmZXJlbmNlW10gZmluYWxSZWZzID0gcmVmTGlzdC50b0FycmF5KG5ldyBJVmlydHVhbFJlZmVyZW5jZVtyZWZMaXN0LnNpemUoKV0pOworCQkJZ2V0VGFza01vZGVsKCkucHV0T2JqZWN0KElSZWZlcmVuY2VXaXphcmRDb25zdGFudHMuRklOQUxfUkVGRVJFTkNFLCBmaW5hbFJlZnMpOworCQl9CisJfQorCQorCXByaXZhdGUgc3RhdGljIElQYXRoW10gY2hvb3NlRXh0ZXJuYWxBcmNoaXZlRW50cmllcyhTaGVsbCBzaGVsbCkgeworCQlTdHJpbmcgbGFzdFVzZWRQYXRoPSBKc3RDb21tb25VSVBsdWdpbi5nZXREZWZhdWx0KCkuZ2V0RGlhbG9nU2V0dGluZ3MoKS5nZXQoSUpzdENvbW1vblVJQ29uc3RhbnRzLkRJQUxPR1NUT1JFX0xBU1RFWFRBUkNISVZFKTsKKwkJaWYgKGxhc3RVc2VkUGF0aCA9PSBudWxsKSB7CisJCQlsYXN0VXNlZFBhdGg9ICIiOyAvLyROT04tTkxTLTEkCisJCX0KKwkJCisJCUZpbGVEaWFsb2cgZGlhbG9nPSBuZXcgRmlsZURpYWxvZyhzaGVsbCwgU1dULk1VTFRJKTsKKwkJZGlhbG9nLnNldFRleHQoTWVzc2FnZXMuQXJjaGl2ZURpYWxvZ05ld1RpdGxlKTsKKwkJU3RyaW5nIFtdIGV4dGVuc2lvbnMgPSBuZXcgU3RyaW5nW10geyIqLmphcjsqLndhcjsqLnJhcjsqLnppcCIsICIqLioifTsgIC8vJE5PTi1OTFMtMSQvLyROT04tTkxTLTIkCisJCWRpYWxvZy5zZXRGaWx0ZXJFeHRlbnNpb25zKGV4dGVuc2lvbnMpOworCQlkaWFsb2cuc2V0RmlsdGVyUGF0aChsYXN0VXNlZFBhdGgpOworCisJCVN0cmluZyByZXM9IGRpYWxvZy5vcGVuKCk7CisJCWlmIChyZXMgPT0gbnVsbCkgeworCQkJcmV0dXJuIG51bGw7CisJCX0KKwkJU3RyaW5nW10gZmlsZU5hbWVzPSBkaWFsb2cuZ2V0RmlsZU5hbWVzKCk7CisJCWludCBuQ2hvc2VuPSBmaWxlTmFtZXMubGVuZ3RoOworCisJCUlQYXRoIGZpbHRlclBhdGg9IFBhdGguZnJvbU9TU3RyaW5nKGRpYWxvZy5nZXRGaWx0ZXJQYXRoKCkpOworCQlJUGF0aFtdIGVsZW1zPSBuZXcgSVBhdGhbbkNob3Nlbl07CisJCWZvciAoaW50IGk9IDA7IGkgPCBuQ2hvc2VuOyBpKyspIHsKKwkJCWVsZW1zW2ldPSBmaWx0ZXJQYXRoLmFwcGVuZChmaWxlTmFtZXNbaV0pLm1ha2VBYnNvbHV0ZSgpOworCQl9CisJCQorCQlKc3RDb21tb25VSVBsdWdpbi5nZXREZWZhdWx0KCkuZ2V0RGlhbG9nU2V0dGluZ3MoKS5wdXQoSUpzdENvbW1vblVJQ29uc3RhbnRzLkRJQUxPR1NUT1JFX0xBU1RFWFRBUkNISVZFLCBkaWFsb2cuZ2V0RmlsdGVyUGF0aCgpKTsKKwkJCisJCXJldHVybiBlbGVtczsKKwl9Cit9CmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLmpzdC5jb21tb24udWkvc3JjL29yZy9lY2xpcHNlL2pzdC9jb21tb24vdWkvaW50ZXJuYWwvYXNzZW1ibHkvd2l6YXJkL0phclJlZmVyZW5jZVdpemFyZEZyYWdtZW50LmphdmEgYi9wbHVnaW5zL29yZy5lY2xpcHNlLmpzdC5jb21tb24udWkvc3JjL29yZy9lY2xpcHNlL2pzdC9jb21tb24vdWkvaW50ZXJuYWwvYXNzZW1ibHkvd2l6YXJkL0phclJlZmVyZW5jZVdpemFyZEZyYWdtZW50LmphdmEKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uN2NlM2U5YwotLS0gL2Rldi9udWxsCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2UuanN0LmNvbW1vbi51aS9zcmMvb3JnL2VjbGlwc2UvanN0L2NvbW1vbi91aS9pbnRlcm5hbC9hc3NlbWJseS93aXphcmQvSmFyUmVmZXJlbmNlV2l6YXJkRnJhZ21lbnQuamF2YQpAQCAtMCwwICsxLDM1MSBAQAorLyoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKgorICogQ29weXJpZ2h0IChjKSAyMDA5IFJlZCBIYXQKKyAqIEFsbCByaWdodHMgcmVzZXJ2ZWQuIFRoaXMgcHJvZ3JhbSBhbmQgdGhlIGFjY29tcGFueWluZyBtYXRlcmlhbHMKKyAqIGFyZSBtYWRlIGF2YWlsYWJsZSB1bmRlciB0aGUgdGVybXMgb2YgdGhlIEVjbGlwc2UgUHVibGljIExpY2Vuc2UgdjEuMAorICogd2hpY2ggYWNjb21wYW5pZXMgdGhpcyBkaXN0cmlidXRpb24sIGFuZCBpcyBhdmFpbGFibGUgYXQKKyAqIGh0dHA6Ly93d3cuZWNsaXBzZS5vcmcvbGVnYWwvZXBsLXYxMC5odG1sCisgKgorICogQ29udHJpYnV0b3JzOgorICogICAgUm9iIFN0cnlrZXIgLSBpbml0aWFsIGltcGxlbWVudGF0aW9uIGFuZCBvbmdvaW5nIG1haW50ZW5hbmNlCisgKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqLworcGFja2FnZSBvcmcuZWNsaXBzZS5qc3QuY29tbW9uLnVpLmludGVybmFsLmFzc2VtYmx5LndpemFyZDsKKworaW1wb3J0IGphdmEuaW8uRmlsZTsKK2ltcG9ydCBqYXZhLmlvLklPRXhjZXB0aW9uOworaW1wb3J0IGphdmEudXRpbC5BcnJheUxpc3Q7CitpbXBvcnQgamF2YS51dGlsLkhhc2hNYXA7CitpbXBvcnQgamF2YS51dGlsLnppcC5aaXBFeGNlcHRpb247CitpbXBvcnQgamF2YS51dGlsLnppcC5aaXBGaWxlOworCitpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5yZXNvdXJjZXMuSUNvbnRhaW5lcjsKK2ltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJlc291cmNlcy5JRmlsZTsKK2ltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJlc291cmNlcy5JRm9sZGVyOworaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucmVzb3VyY2VzLklQcm9qZWN0OworaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucmVzb3VyY2VzLklSZXNvdXJjZTsKK2ltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJlc291cmNlcy5JV29ya3NwYWNlUm9vdDsKK2ltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJlc291cmNlcy5SZXNvdXJjZXNQbHVnaW47CitpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5ydW50aW1lLkNvcmVFeGNlcHRpb247CitpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5ydW50aW1lLklQYXRoOworaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucnVudGltZS5JUHJvZ3Jlc3NNb25pdG9yOworaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucnVudGltZS5JU3RhdHVzOworaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucnVudGltZS5QYXRoOworaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucnVudGltZS5TdGF0dXM7CitpbXBvcnQgb3JnLmVjbGlwc2UuamR0LmludGVybmFsLnVpLkphdmFQbHVnaW47CitpbXBvcnQgb3JnLmVjbGlwc2UuamR0LmludGVybmFsLnVpLnZpZXdzdXBwb3J0LkZpbHRlcmVkRWxlbWVudFRyZWVTZWxlY3Rpb25EaWFsb2c7CitpbXBvcnQgb3JnLmVjbGlwc2UuamR0LmludGVybmFsLnVpLndpemFyZHMuVHlwZWRFbGVtZW50U2VsZWN0aW9uVmFsaWRhdG9yOworaW1wb3J0IG9yZy5lY2xpcHNlLmpmYWNlLmRpYWxvZ3MuTWVzc2FnZURpYWxvZzsKK2ltcG9ydCBvcmcuZWNsaXBzZS5qZmFjZS52aWV3ZXJzLklUcmVlQ29udGVudFByb3ZpZGVyOworaW1wb3J0IG9yZy5lY2xpcHNlLmpmYWNlLnZpZXdlcnMuTGFiZWxQcm92aWRlcjsKK2ltcG9ydCBvcmcuZWNsaXBzZS5qZmFjZS52aWV3ZXJzLlRyZWVWaWV3ZXI7CitpbXBvcnQgb3JnLmVjbGlwc2UuamZhY2Uudmlld2Vycy5WaWV3ZXI7CitpbXBvcnQgb3JnLmVjbGlwc2UuamZhY2Uudmlld2Vycy5WaWV3ZXJGaWx0ZXI7CitpbXBvcnQgb3JnLmVjbGlwc2UuamZhY2Uud2luZG93LldpbmRvdzsKK2ltcG9ydCBvcmcuZWNsaXBzZS5qc3QuY29tbW9uLnVpLmludGVybmFsLklKc3RDb21tb25VSUNvbnRleHRJZHM7CitpbXBvcnQgb3JnLmVjbGlwc2UuanN0LmNvbW1vbi51aS5pbnRlcm5hbC5Kc3RDb21tb25VSVBsdWdpbjsKK2ltcG9ydCBvcmcuZWNsaXBzZS5qc3QuY29tbW9uLnVpLmludGVybmFsLk1lc3NhZ2VzOworaW1wb3J0IG9yZy5lY2xpcHNlLnN3dC5TV1Q7CitpbXBvcnQgb3JnLmVjbGlwc2Uuc3d0LmV2ZW50cy5TZWxlY3Rpb25FdmVudDsKK2ltcG9ydCBvcmcuZWNsaXBzZS5zd3QuZXZlbnRzLlNlbGVjdGlvbkxpc3RlbmVyOworaW1wb3J0IG9yZy5lY2xpcHNlLnN3dC5ncmFwaGljcy5JbWFnZTsKK2ltcG9ydCBvcmcuZWNsaXBzZS5zd3QubGF5b3V0LkZvcm1BdHRhY2htZW50OworaW1wb3J0IG9yZy5lY2xpcHNlLnN3dC5sYXlvdXQuRm9ybURhdGE7CitpbXBvcnQgb3JnLmVjbGlwc2Uuc3d0LmxheW91dC5Gb3JtTGF5b3V0OworaW1wb3J0IG9yZy5lY2xpcHNlLnN3dC53aWRnZXRzLkJ1dHRvbjsKK2ltcG9ydCBvcmcuZWNsaXBzZS5zd3Qud2lkZ2V0cy5Db21wb3NpdGU7CitpbXBvcnQgb3JnLmVjbGlwc2Uuc3d0LndpZGdldHMuU2hlbGw7CitpbXBvcnQgb3JnLmVjbGlwc2UudWkuUGxhdGZvcm1VSTsKK2ltcG9ydCBvcmcuZWNsaXBzZS51aS5tb2RlbC5Xb3JrYmVuY2hDb250ZW50UHJvdmlkZXI7CitpbXBvcnQgb3JnLmVjbGlwc2UudWkubW9kZWwuV29ya2JlbmNoTGFiZWxQcm92aWRlcjsKK2ltcG9ydCBvcmcuZWNsaXBzZS51aS52aWV3cy5uYXZpZ2F0b3IuUmVzb3VyY2VDb21wYXJhdG9yOworaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS5Db21wb25lbnRDb3JlOworaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS5pbnRlcm5hbC5yZXNvdXJjZXMuVmlydHVhbEFyY2hpdmVDb21wb25lbnQ7CitpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb21wb25lbnRjb3JlLmludGVybmFsLnJlc291cmNlcy5WaXJ0dWFsUmVmZXJlbmNlOworaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS5yZXNvdXJjZXMuSVZpcnR1YWxDb21wb25lbnQ7CitpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb21wb25lbnRjb3JlLnJlc291cmNlcy5JVmlydHVhbFJlZmVyZW5jZTsKK2ltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUudWkuaW50ZXJuYWwudGFza3dpemFyZC5JV2l6YXJkSGFuZGxlOworaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS51aS5pbnRlcm5hbC50YXNrd2l6YXJkLldpemFyZEZyYWdtZW50OworaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS51aS5wcm9wZXJ0eXBhZ2UuSVJlZmVyZW5jZVdpemFyZENvbnN0YW50czsKKworcHVibGljIGNsYXNzIEphclJlZmVyZW5jZVdpemFyZEZyYWdtZW50IGV4dGVuZHMgV2l6YXJkRnJhZ21lbnQgeworCXByb3RlY3RlZCBMYWJlbFByb3ZpZGVyIGxhYmVsUHJvdmlkZXIgPSBudWxsOworCXByb3RlY3RlZCBJVHJlZUNvbnRlbnRQcm92aWRlciBjb250ZW50UHJvdmlkZXIgPSBudWxsOworCXByb3RlY3RlZCBUcmVlVmlld2VyIHZpZXdlcjsKKwlwcm90ZWN0ZWQgQnV0dG9uIGJyb3dzZTsKKwlwcm90ZWN0ZWQgSVBhdGhbXSBwYXRoczsKKwlwcm90ZWN0ZWQgSVdpemFyZEhhbmRsZSBoYW5kbGU7CisJcHJvdGVjdGVkIElQYXRoW10gc2VsZWN0ZWQgPSBuZXcgSVBhdGhbXXt9OworCWJvb2xlYW4gaXNDb21wbGV0ZSA9IGZhbHNlOworCisJcHVibGljIGJvb2xlYW4gaXNDb21wbGV0ZSgpIHsKKwkJcmV0dXJuIGlzQ29tcGxldGU7CisJfQorCQorCXB1YmxpYyBib29sZWFuIGhhc0NvbXBvc2l0ZSgpIHsKKwkJcmV0dXJuIHRydWU7CisJfQorCisJcHVibGljIENvbXBvc2l0ZSBjcmVhdGVDb21wb3NpdGUoQ29tcG9zaXRlIHBhcmVudCwgSVdpemFyZEhhbmRsZSBoYW5kbGUpIHsKKwkJdGhpcy5oYW5kbGUgPSBoYW5kbGU7CisJCWhhbmRsZS5zZXRUaXRsZShNZXNzYWdlcy5BcmNoaXZlVGl0bGUpOworCQloYW5kbGUuc2V0RGVzY3JpcHRpb24oTWVzc2FnZXMuQXJjaGl2ZURlc2NyaXB0aW9uKTsKKwkJCQkKKwkJQ29tcG9zaXRlIGMgPSBuZXcgQ29tcG9zaXRlKHBhcmVudCwgU1dULk5PTkUpOworCQlQbGF0Zm9ybVVJLmdldFdvcmtiZW5jaCgpLmdldEhlbHBTeXN0ZW0oKS5zZXRIZWxwKGMsIElKc3RDb21tb25VSUNvbnRleHRJZHMuREVQTE9ZTUVOVF9BU1NFTUJMWV9ORVdfQVJDSElWRV9SRUZFUkVOQ0VfUDEpOworCQljLnNldExheW91dChuZXcgRm9ybUxheW91dCgpKTsKKwkJdmlld2VyID0gbmV3IFRyZWVWaWV3ZXIoYywgU1dULlNJTkdMRSB8IFNXVC5CT1JERVIpOworCQl2aWV3ZXIuc2V0Q29udGVudFByb3ZpZGVyKGdldENvbnRlbnRQcm92aWRlcigpKTsKKwkJdmlld2VyLnNldExhYmVsUHJvdmlkZXIoZ2V0TGFiZWxQcm92aWRlcigpKTsKKwkJdmlld2VyLnNldElucHV0KFJlc291cmNlc1BsdWdpbi5nZXRXb3Jrc3BhY2UoKSk7CisKKwkJYnJvd3NlID0gbmV3IEJ1dHRvbihjLCBTV1QuTk9ORSk7CisJCWJyb3dzZS5zZXRUZXh0KE1lc3NhZ2VzLkJyb3dzZSk7CisJCUZvcm1EYXRhIGZkID0gbmV3IEZvcm1EYXRhKCk7CisJCWZkLmxlZnQgPSBuZXcgRm9ybUF0dGFjaG1lbnQoMCwgNSk7CisJCWZkLmJvdHRvbSA9IG5ldyBGb3JtQXR0YWNobWVudCgxMDAsIC01KTsKKwkJYnJvd3NlLnNldExheW91dERhdGEoZmQpOworCisJCWZkID0gbmV3IEZvcm1EYXRhKCk7CisJCWZkLmxlZnQgPSBuZXcgRm9ybUF0dGFjaG1lbnQoMCwgNSk7CisJCWZkLnRvcCA9IG5ldyBGb3JtQXR0YWNobWVudCgwLCA1KTsKKwkJZmQucmlnaHQgPSBuZXcgRm9ybUF0dGFjaG1lbnQoMTAwLCAtNSk7CisJCWZkLmJvdHRvbSA9IG5ldyBGb3JtQXR0YWNobWVudChicm93c2UsIC01KTsKKwkJdmlld2VyLmdldFRyZWUoKS5zZXRMYXlvdXREYXRhKGZkKTsKKworCQlicm93c2UuYWRkU2VsZWN0aW9uTGlzdGVuZXIobmV3IFNlbGVjdGlvbkxpc3RlbmVyKCkgeworCQkJcHVibGljIHZvaWQgd2lkZ2V0U2VsZWN0ZWQoU2VsZWN0aW9uRXZlbnQgZSkgeworCQkJCWJ1dHRvblByZXNzZWQoKTsKKwkJCX0KKworCQkJcHVibGljIHZvaWQgd2lkZ2V0RGVmYXVsdFNlbGVjdGVkKFNlbGVjdGlvbkV2ZW50IGUpIHsKKwkJCQl3aWRnZXRTZWxlY3RlZChlKTsKKwkJCX0KKwkJfSk7CisJCXJldHVybiBjOworCX0KKworCXByb3RlY3RlZCB2b2lkIGJ1dHRvblByZXNzZWQoKSB7CisJCUlQcm9qZWN0IHByb2plY3QgPSAoSVByb2plY3QpZ2V0VGFza01vZGVsKCkuZ2V0T2JqZWN0KElSZWZlcmVuY2VXaXphcmRDb25zdGFudHMuUFJPSkVDVCk7CisJCXNlbGVjdGVkID0gY2hvb3NlRW50cmllcygKKwkJCQlicm93c2UuZ2V0U2hlbGwoKSwgCisJCQkJcHJvamVjdC5nZXRGdWxsUGF0aCgpKTsKKworCQlpZihzZWxlY3RlZCAhPSBudWxsKSB7CisJCQlyZW1vdmVJbnZhbGlkQXJjaGl2ZUZpbGVzKCk7CisJCX0KKwkJCisJCXZpZXdlci5yZWZyZXNoKCk7CisJCWlmKHNlbGVjdGVkICE9IG51bGwgJiYgc2VsZWN0ZWQubGVuZ3RoID4gMCkgeworCQkJaXNDb21wbGV0ZSA9IHRydWU7CisJCX0gZWxzZSB7CisJCQlpc0NvbXBsZXRlID0gZmFsc2U7CisJCX0KKwkJaGFuZGxlLnVwZGF0ZSgpOworCX0KKworCXB1YmxpYyB2b2lkIHBlcmZvcm1GaW5pc2goSVByb2dyZXNzTW9uaXRvciBtb25pdG9yKSB0aHJvd3MgQ29yZUV4Y2VwdGlvbiB7CisJCUlWaXJ0dWFsQ29tcG9uZW50IHJvb3RDb21wb25lbnQgPSAoSVZpcnR1YWxDb21wb25lbnQpZ2V0VGFza01vZGVsKCkuZ2V0T2JqZWN0KElSZWZlcmVuY2VXaXphcmRDb25zdGFudHMuUk9PVF9DT01QT05FTlQpOworCQlTdHJpbmcgcnVudGltZUxvYyA9IChTdHJpbmcpZ2V0VGFza01vZGVsKCkuZ2V0T2JqZWN0KElSZWZlcmVuY2VXaXphcmRDb25zdGFudHMuREVGQVVMVF9MSUJSQVJZX0xPQ0FUSU9OKTsKKwkJaWYgKHNlbGVjdGVkICE9IG51bGwgJiYgc2VsZWN0ZWQubGVuZ3RoID4gMCkgeworCQkJQXJyYXlMaXN0PElWaXJ0dWFsUmVmZXJlbmNlPiByZWZMaXN0ID0gbmV3IEFycmF5TGlzdDxJVmlydHVhbFJlZmVyZW5jZT4oKTsKKwkJCWZvciAoaW50IGkgPSAwOyBpIDwgc2VsZWN0ZWQubGVuZ3RoOyBpKyspIHsKKwkJCQkvLyBJUGF0aCBmdWxsUGF0aCA9IHByb2plY3QuZ2V0RmlsZShzZWxlY3RlZFtpXSkuZ2V0RnVsbFBhdGgoKTsKKwkJCQlTdHJpbmcgdHlwZSA9IFZpcnR1YWxBcmNoaXZlQ29tcG9uZW50LkxJQkFSQ0hJVkVUWVBFCisJCQkJCQkrIElQYXRoLlNFUEFSQVRPUjsKKwkJCQlJVmlydHVhbENvbXBvbmVudCBhcmNoaXZlID0gQ29tcG9uZW50Q29yZQorCQkJCQkJLmNyZWF0ZUFyY2hpdmVDb21wb25lbnQocm9vdENvbXBvbmVudC5nZXRQcm9qZWN0KCksCisJCQkJCQkJCXR5cGUgKyBzZWxlY3RlZFtpXS5tYWtlUmVsYXRpdmUoKS50b1N0cmluZygpKTsKKwkJCQlWaXJ0dWFsUmVmZXJlbmNlIHJlZiA9IG5ldyBWaXJ0dWFsUmVmZXJlbmNlKHJvb3RDb21wb25lbnQsIGFyY2hpdmUpOworCQkJCXJlZi5zZXRBcmNoaXZlTmFtZShzZWxlY3RlZFtpXS5sYXN0U2VnbWVudCgpKTsKKwkJCQlpZiAocnVudGltZUxvYyAhPSBudWxsKSB7CisJCQkJCXJlZi5zZXRSdW50aW1lUGF0aChuZXcgUGF0aChydW50aW1lTG9jKS5tYWtlQWJzb2x1dGUoKSk7CisJCQkJfQorCQkJCXJlZkxpc3QuYWRkKHJlZik7CisJCQl9CisJCQlJVmlydHVhbFJlZmVyZW5jZVtdIGZpbmFsUmVmcyA9IHJlZkxpc3QudG9BcnJheShuZXcgSVZpcnR1YWxSZWZlcmVuY2VbcmVmTGlzdC5zaXplKCldKTsKKwkJCWdldFRhc2tNb2RlbCgpLnB1dE9iamVjdChJUmVmZXJlbmNlV2l6YXJkQ29uc3RhbnRzLkZJTkFMX1JFRkVSRU5DRSwgZmluYWxSZWZzKTsKKwkJfQorCX0KKworCXByb3RlY3RlZCBMYWJlbFByb3ZpZGVyIGdldExhYmVsUHJvdmlkZXIoKSB7CisJCWlmIChsYWJlbFByb3ZpZGVyID09IG51bGwpIHsKKwkJCWxhYmVsUHJvdmlkZXIgPSBuZXcgTGFiZWxQcm92aWRlcigpIHsKKwkJCQlwdWJsaWMgSW1hZ2UgZ2V0SW1hZ2UoT2JqZWN0IGVsZW1lbnQpIHsKKwkJCQkJcmV0dXJuIG51bGw7CisJCQkJfQorCisJCQkJcHVibGljIFN0cmluZyBnZXRUZXh0KE9iamVjdCBlbGVtZW50KSB7CisJCQkJCXJldHVybiBlbGVtZW50ID09IG51bGwgPyAiIiA6IGVsZW1lbnQudG9TdHJpbmcoKTsvLyROT04tTkxTLTEkCisJCQkJfQorCQkJfTsKKwkJfQorCQlyZXR1cm4gbGFiZWxQcm92aWRlcjsKKwl9CisKKwlwcm90ZWN0ZWQgSVRyZWVDb250ZW50UHJvdmlkZXIgZ2V0Q29udGVudFByb3ZpZGVyKCkgeworCQlpZiAoY29udGVudFByb3ZpZGVyID09IG51bGwpIHsKKwkJCWNvbnRlbnRQcm92aWRlciA9IG5ldyBJVHJlZUNvbnRlbnRQcm92aWRlcigpIHsKKwkJCQlwdWJsaWMgT2JqZWN0W10gZ2V0RWxlbWVudHMoT2JqZWN0IGlucHV0RWxlbWVudCkgeworCQkJCQlyZXR1cm4gc2VsZWN0ZWQgPT0gbnVsbCA/IG5ldyBPYmplY3RbXXt9IDogc2VsZWN0ZWQ7CisJCQkJfQorCQkJCXB1YmxpYyB2b2lkIGlucHV0Q2hhbmdlZChWaWV3ZXIgdmlld2VyLCBPYmplY3Qgb2xkSW5wdXQsIE9iamVjdCBuZXdJbnB1dCkgeworCQkJCX0KKwkJCQlwdWJsaWMgdm9pZCBkaXNwb3NlKCkgeworCQkJCX0KKwkJCQlwdWJsaWMgYm9vbGVhbiBoYXNDaGlsZHJlbihPYmplY3QgZWxlbWVudCkgeworCQkJCQlyZXR1cm4gZmFsc2U7CisJCQkJfQorCQkJCXB1YmxpYyBPYmplY3QgZ2V0UGFyZW50KE9iamVjdCBlbGVtZW50KSB7CisJCQkJCXJldHVybiBudWxsOworCQkJCX0KKwkJCQlwdWJsaWMgT2JqZWN0W10gZ2V0Q2hpbGRyZW4oT2JqZWN0IHBhcmVudEVsZW1lbnQpIHsKKwkJCQkJcmV0dXJuIG51bGw7CisJCQkJfQorCQkJfTsKKwkJfQorCQlyZXR1cm4gY29udGVudFByb3ZpZGVyOworCX0KKwkKKwlwcml2YXRlIHN0YXRpYyBJUGF0aFtdIGNob29zZUVudHJpZXMoU2hlbGwgc2hlbGwsIElQYXRoIGluaXRpYWxTZWxlY3Rpb24pIHsKKwkJQ2xhc3NbXSBhY2NlcHRlZENsYXNzZXM9IG5ldyBDbGFzc1tdIHsgSUZpbGUuY2xhc3MgfTsKKwkJVHlwZWRFbGVtZW50U2VsZWN0aW9uVmFsaWRhdG9yIHZhbGlkYXRvcj0gbmV3IFR5cGVkRWxlbWVudFNlbGVjdGlvblZhbGlkYXRvcihhY2NlcHRlZENsYXNzZXMsIHRydWUpOworCQlJV29ya3NwYWNlUm9vdCByb290PSBSZXNvdXJjZXNQbHVnaW4uZ2V0V29ya3NwYWNlKCkuZ2V0Um9vdCgpOworCisJCUZpbHRlcmVkRWxlbWVudFRyZWVTZWxlY3Rpb25EaWFsb2cgZGlhbG9nID0gIG5ldyBGaWx0ZXJlZEVsZW1lbnRUcmVlU2VsZWN0aW9uRGlhbG9nKHNoZWxsLCBuZXcgV29ya2JlbmNoTGFiZWxQcm92aWRlcigpLCBuZXcgV29ya2JlbmNoQ29udGVudFByb3ZpZGVyKCkpOworCQlkaWFsb2cuc2V0SGVscEF2YWlsYWJsZShmYWxzZSk7CisJCWRpYWxvZy5zZXRWYWxpZGF0b3IodmFsaWRhdG9yKTsKKwkJZGlhbG9nLnNldFRpdGxlKE1lc3NhZ2VzLkFyY2hpdmVEaWFsb2dOZXdUaXRsZSk7CisJCWRpYWxvZy5zZXRNZXNzYWdlKE1lc3NhZ2VzLkFyY2hpdmVEaWFsb2dOZXdEZXNjcmlwdGlvbik7CisJCWRpYWxvZy5hZGRGaWx0ZXIoZ2V0RGlhbG9nVmlld2VyRmlsdGVyKCkpOworCQlkaWFsb2cuc2V0SW5wdXQocm9vdCk7CisJCWRpYWxvZy5zZXRDb21wYXJhdG9yKG5ldyBSZXNvdXJjZUNvbXBhcmF0b3IoUmVzb3VyY2VDb21wYXJhdG9yLk5BTUUpKTsKKwkJZGlhbG9nLnNldEluaXRpYWxGaWx0ZXIoIiouamFyLCoud2FyLCoucmFyLCouemlwIik7IC8vJE5PTi1OTFMtMSQKKwkJZGlhbG9nLmNyZWF0ZSgpOwkJCisKKwkJaWYgKGRpYWxvZy5vcGVuKCkgPT0gV2luZG93Lk9LKSB7CisJCQlPYmplY3RbXSBlbGVtZW50cz0gZGlhbG9nLmdldFJlc3VsdCgpOworCQkJSVBhdGhbXSByZXM9IG5ldyBJUGF0aFtlbGVtZW50cy5sZW5ndGhdOworCQkJZm9yIChpbnQgaT0gMDsgaSA8IHJlcy5sZW5ndGg7IGkrKykgeworCQkJCUlSZXNvdXJjZSBlbGVtPSAoSVJlc291cmNlKWVsZW1lbnRzW2ldOworCQkJCXJlc1tpXT0gZWxlbS5nZXRGdWxsUGF0aCgpOworCQkJfQorCQkJcmV0dXJuIHJlczsKKwkJfQorCQlyZXR1cm4gbnVsbDsKKwl9CisJCisJcHJvdGVjdGVkIHZvaWQgcmVtb3ZlSW52YWxpZEFyY2hpdmVGaWxlcygpeworCQkvLyBUcmllcyB0byBvcGVuIGFyY2hpdmUgdG8gdmVyaWZ5IGl0J3MgdmFsaWQKKwkJLy8gSWYgaXQgaXMgbm90IGEgdmFsaWQgYXJjaGl2ZSwgYSBkaWFsb2cgaXMgc2hvd24gaW5mb3JtaW5nIHRoZSB1c2VyIG9mIHRoZSBpbnZhbGlkIGFyY2hpdmVzCisJCUFycmF5TGlzdDxJUGF0aD4gaW52YWxpZEFyY2hpdmVGaWxlcyA9IG5ldyBBcnJheUxpc3Q8SVBhdGg+KCk7CisJCUFycmF5TGlzdDxJUGF0aD4gdmFsaWRBcmNoaXZlRmlsZXMgPSBuZXcgQXJyYXlMaXN0PElQYXRoPigpOworCQlaaXBGaWxlIHppcEZpbGUgPSBudWxsOworCQlmb3IoSVBhdGggcGF0aDpzZWxlY3RlZCl7CisJCQl0cnkgeworCQkJCVN0cmluZyBvc1BhdGggPSBudWxsOworCQkJCWlmKHBhdGguc2VnbWVudENvdW50KCkgPiAxKXsKKwkJCQkJSUZpbGUgZmlsZSA9IFJlc291cmNlc1BsdWdpbi5nZXRXb3Jrc3BhY2UoKS5nZXRSb290KCkuZ2V0RmlsZShwYXRoKTsKKwkJCQkJaWYoZmlsZS5leGlzdHMoKSkgeworCQkJCQkJSVBhdGggbG9jID0gZmlsZS5nZXRMb2NhdGlvbigpOworCQkJCQkJaWYobG9jICE9IG51bGwpIHsgCisJCQkJCQkJb3NQYXRoID0gbG9jLnRvT1NTdHJpbmcoKTsKKwkJCQkJCX0KKwkJCQkJfQorCQkJCX0KKwkJCQlpZihvc1BhdGggPT0gbnVsbCl7CisJCQkJCW9zUGF0aCA9IHBhdGgudG9PU1N0cmluZygpOworCQkJCX0KKwkJCQl6aXBGaWxlID0gbmV3IFppcEZpbGUobmV3IEZpbGUob3NQYXRoKSk7CisJCQkJdmFsaWRBcmNoaXZlRmlsZXMuYWRkKHBhdGgpOworCQkJfSBjYXRjaCAoWmlwRXhjZXB0aW9uIGUxKXsKKwkJCQlpbnZhbGlkQXJjaGl2ZUZpbGVzLmFkZChwYXRoKTsKKwkJCX0gY2F0Y2ggKElPRXhjZXB0aW9uIGUyKXsKKwkJCQlpbnZhbGlkQXJjaGl2ZUZpbGVzLmFkZChwYXRoKTsKKwkJCX1maW5hbGx5IHsKKwkJCQlpZiAoemlwRmlsZSAhPSBudWxsKXsKKwkJCQkJdHJ5IHsKKwkJCQkJCXppcEZpbGUuY2xvc2UoKTsKKwkJCQkJfSBjYXRjaCAoSU9FeGNlcHRpb24gZSkgeworCQkJCQkJSnN0Q29tbW9uVUlQbHVnaW4uZ2V0RGVmYXVsdCgpLmdldExvZygpLmxvZyhuZXcgU3RhdHVzKElTdGF0dXMuRVJST1IsIEpzdENvbW1vblVJUGx1Z2luLlBMVUdJTl9JRCwgZS5nZXRNZXNzYWdlKCksIGUpKTsKKwkJCQkJfQorCQkJCX0KKwkJCX0KKwkJfQorCQlpZihpbnZhbGlkQXJjaGl2ZUZpbGVzLnNpemUoKSA+IDApIHsKKwkJCXNlbGVjdGVkID0gdmFsaWRBcmNoaXZlRmlsZXMudG9BcnJheShuZXcgSVBhdGhbdmFsaWRBcmNoaXZlRmlsZXMuc2l6ZSgpXSk7CisJCQlzaG93SW52YWxpZEFyY2hpdmVGaWxlc0FzV2FybmluZyhpbnZhbGlkQXJjaGl2ZUZpbGVzKTsKKwkJfQorCX0KKwkKKwlwcml2YXRlIHZvaWQgc2hvd0ludmFsaWRBcmNoaXZlRmlsZXNBc1dhcm5pbmcoQXJyYXlMaXN0PElQYXRoPmludmFsaWRBcmNoaXZlRmlsZXMpIHsKKwkJU3RyaW5nIG1lc3NhZ2UgPSBNZXNzYWdlcy5JbnZhbGlkQXJjaGl2ZXNXYXJuaW5nOworCQlib29sZWFuIGZpcnN0ID0gdHJ1ZTsKKwkJZm9yKElQYXRoIHBhdGg6IGludmFsaWRBcmNoaXZlRmlsZXMpIHsKKwkJCWlmKCFmaXJzdCkgeworCQkJCW1lc3NhZ2UgKz0gIiwgXCciOyAvLyROT04tTkxTLTEkCisJCQl9IGVsc2UgeworCQkJCW1lc3NhZ2UgKz0gIlwnIjsgLy8kTk9OLU5MUy0xJAorCQkJCWZpcnN0ID0gZmFsc2U7CisJCQl9CisJCQltZXNzYWdlICs9IHBhdGgubGFzdFNlZ21lbnQoKSArICJcJyI7IC8vJE5PTi1OTFMtMSQKKwkJfQorCQlNZXNzYWdlRGlhbG9nLm9wZW5XYXJuaW5nKFBsYXRmb3JtVUkuZ2V0V29ya2JlbmNoKCkuZ2V0QWN0aXZlV29ya2JlbmNoV2luZG93KCkuZ2V0U2hlbGwoKSwgIldhcm5pbmciLCBtZXNzYWdlKTsgLy8kTk9OLU5MUy0xJAorCX0KKwkKKwlwcml2YXRlIHN0YXRpYyBWaWV3ZXJGaWx0ZXIgZ2V0RGlhbG9nVmlld2VyRmlsdGVyKCkgeworCQlyZXR1cm4gbmV3IFZpZXdlckZpbHRlcigpIHsKKwkJCXByaXZhdGUgZmluYWwgU3RyaW5nW10gZXhjbHVkZWRFeHRlbnNpb25zPSB7ICJ0eHQiLCAiY3NzIiwgImRsbCIsICJodG0iLCAiaHRtbCIsICJjbGFzcyIsICJqYXZhIiwgImNsYXNzcGF0aCIsICAgICAgLy8kTk9OLU5MUy0xJC8vJE5PTi1OTFMtMiQvLyROT04tTkxTLTMkIC8vJE5PTi1OTFMtNCQvLyROT04tTkxTLTUkIC8vJE5PTi1OTFMtNiQvLyROT04tTkxTLTckIC8vJE5PTi1OTFMtOCQKKwkJCQkiY29tcGF0aWJpbGl0eSIsICJjb21wb25lbnQiLCAiY29udGFpbmVyIiwgImN2c2lnbm9yZSIsICJkZWwiLCAiZG54IiwgLy8kTk9OLU5MUy0xJC8vJE5PTi1OTFMtMiQvLyROT04tTkxTLTMkIC8vJE5PTi1OTFMtNCQvLyROT04tTkxTLTUkIC8vJE5PTi1OTFMtNiQKKwkJCQkiZHRkIiwgIm1mIiwgInByb2plY3QiLCAicHJvcGVydGllcyIsICJwc2YiLCAicmMiLCAicnVudGltZSIsICJzaCIsIC8vJE5PTi1OTFMtMSQvLyROT04tTkxTLTIkLy8kTk9OLU5MUy0zJCAvLyROT04tTkxTLTQkLy8kTk9OLU5MUy01JCAvLyROT04tTkxTLTYkLy8kTk9OLU5MUy03JCAvLyROT04tTkxTLTgkCisJCQkJInNwZWMiLCAic3FsIiwgInRsZCIsICJ4bWkiLCAieG1sIiwgInhzZCIsICJnaWYiLCAianBnIiwgImpzIiwgInZzZCIsIC8vJE5PTi1OTFMtMSQvLyROT04tTkxTLTIkLy8kTk9OLU5MUy0zJCAvLyROT04tTkxTLTQkLy8kTk9OLU5MUy01JCAvLyROT04tTkxTLTYkLy8kTk9OLU5MUy03JCAvLyROT04tTkxTLTgkIC8vJE5PTi1OTFMtOSQgLy8kTk9OLU5MUy0xMCQKKwkJCQkicG5nIiwgImJhdCIsICJ4c2wiLCAiZmFjdG9yeXBhdGgifTsgLy8kTk9OLU5MUy0xJC8vJE5PTi1OTFMtMiQvLyROT04tTkxTLTMkIC8vJE5PTi1OTFMtNCQgCisKKwkJCXByaXZhdGUgSGFzaE1hcDxTdHJpbmcsU3RyaW5nPiBleGNsdWRlZEV4dGVuc2lvbnNNYXAgPSBudWxsOworCisJCQlAT3ZlcnJpZGUKKwkJCXB1YmxpYyBib29sZWFuIHNlbGVjdChWaWV3ZXIgdmlld2VyLCBPYmplY3QgcGFyZW50LCBPYmplY3QgZWxlbWVudCkgeworCQkJCWlmKGV4Y2x1ZGVkRXh0ZW5zaW9uc01hcCA9PSBudWxsKSB7CisJCQkJCWluaXRpYWxpemVFeGx1ZGVNYXAoKTsKKwkJCQl9CisJCQkJaWYgKGVsZW1lbnQgaW5zdGFuY2VvZiBJRmlsZSkgeworCQkJCQlJRmlsZSBmaWxlID0gKElGaWxlKSBlbGVtZW50OworCQkJCQlTdHJpbmcgZXh0ID0gZmlsZS5nZXRGaWxlRXh0ZW5zaW9uKCk7CisJCQkJCWlmKGV4dCAhPSBudWxsKSB7CisJCQkJCQlleHQgPSBleHQudG9Mb3dlckNhc2UoKTsKKwkJCQkJCWlmKGV4Y2x1ZGVkRXh0ZW5zaW9uc01hcC5nZXQoZXh0KSAhPSBudWxsKSB7CisJCQkJCQkJcmV0dXJuIGZhbHNlOworCQkJCQkJfQorCQkJCQl9CisJCQkJCXJldHVybiB0cnVlOworCQkJCX0gZWxzZSBpZiAoZWxlbWVudCBpbnN0YW5jZW9mIElDb250YWluZXIpIHsgLy8gSVByb2plY3QsIElGb2xkZXIKKwkJCQkJLy8gaWdub3JlIGNsb3NlZCBwcm9qZWN0cworCQkJCQlpZiAoZWxlbWVudCBpbnN0YW5jZW9mIElQcm9qZWN0ICYmICEoKElQcm9qZWN0KWVsZW1lbnQpLmlzT3BlbigpKQorCQkJCQkJcmV0dXJuIGZhbHNlOworCQkJCQkvLyBpZ25vcmUgLnNldHRpbmdzIGZvbGRlcgorCQkJCQlpZiAoZWxlbWVudCBpbnN0YW5jZW9mIElGb2xkZXIpIHsKKwkJCQkJCUlGb2xkZXIgZm9sZGVyID0gKElGb2xkZXIpIGVsZW1lbnQ7CisJCQkJCQlpZiAoZm9sZGVyLmdldE5hbWUoKS5lcXVhbHMoIi5zZXR0aW5ncyIpKQorCQkJCQkJCXJldHVybiBmYWxzZTsKKwkJCQkJfQorCQkJCQl0cnkgeworCQkJCQkJSVJlc291cmNlW10gcmVzb3VyY2VzPSAoKElDb250YWluZXIpZWxlbWVudCkubWVtYmVycygpOworCQkJCQkJZm9yIChpbnQgaT0gMDsgaSA8IHJlc291cmNlcy5sZW5ndGg7IGkrKykgeworCQkJCQkJCS8vIE9ubHkgc2hvdyBjb250YWluZXJzIHRoYXQgY29udGFpbiBhbiBhcmNoaXZlCisJCQkJCQkJaWYgKHNlbGVjdCh2aWV3ZXIsIHBhcmVudCwgcmVzb3VyY2VzW2ldKSkgeworCQkJCQkJCQlyZXR1cm4gdHJ1ZTsKKwkJCQkJCQl9CisJCQkJCQl9CisJCQkJCX0gY2F0Y2ggKENvcmVFeGNlcHRpb24gZSkgeworCQkJCQkJSmF2YVBsdWdpbi5sb2coZS5nZXRTdGF0dXMoKSk7CisJCQkJCX0KKwkJCQl9CisJCQkJcmV0dXJuIGZhbHNlOworCQkJfQorCQkJCisJCQlwcml2YXRlIHZvaWQgaW5pdGlhbGl6ZUV4bHVkZU1hcCgpIHsKKwkJCQlleGNsdWRlZEV4dGVuc2lvbnNNYXAgPSBuZXcgSGFzaE1hcDxTdHJpbmcsIFN0cmluZz4oKTsKKwkJCQlmb3IoaW50IGkgPSAwOyBpIDwgZXhjbHVkZWRFeHRlbnNpb25zLmxlbmd0aDsgaSsrKQorCQkJCWV4Y2x1ZGVkRXh0ZW5zaW9uc01hcC5wdXQoZXhjbHVkZWRFeHRlbnNpb25zW2ldLCBleGNsdWRlZEV4dGVuc2lvbnNbaV0pOworCQkJfQorCQl9OworCX0KK30KZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2UuanN0LmNvbW1vbi51aS9zcmMvb3JnL2VjbGlwc2UvanN0L2NvbW1vbi91aS9pbnRlcm5hbC9hc3NlbWJseS93aXphcmQvTWFuaWZlc3RNb2R1bGVEZXBlbmRlbmN5Q29udHJvbC5qYXZhIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS5qc3QuY29tbW9uLnVpL3NyYy9vcmcvZWNsaXBzZS9qc3QvY29tbW9uL3VpL2ludGVybmFsL2Fzc2VtYmx5L3dpemFyZC9NYW5pZmVzdE1vZHVsZURlcGVuZGVuY3lDb250cm9sLmphdmEKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uYmJlNjZjNwotLS0gL2Rldi9udWxsCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2UuanN0LmNvbW1vbi51aS9zcmMvb3JnL2VjbGlwc2UvanN0L2NvbW1vbi91aS9pbnRlcm5hbC9hc3NlbWJseS93aXphcmQvTWFuaWZlc3RNb2R1bGVEZXBlbmRlbmN5Q29udHJvbC5qYXZhCkBAIC0wLDAgKzEsNTQyIEBACisvKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqCisgKiBDb3B5cmlnaHQgKGMpIDIwMDkgUmVkIEhhdAorICogQWxsIHJpZ2h0cyByZXNlcnZlZC4gVGhpcyBwcm9ncmFtIGFuZCB0aGUgYWNjb21wYW55aW5nIG1hdGVyaWFscworICogYXJlIG1hZGUgYXZhaWxhYmxlIHVuZGVyIHRoZSB0ZXJtcyBvZiB0aGUgRWNsaXBzZSBQdWJsaWMgTGljZW5zZSB2MS4wCisgKiB3aGljaCBhY2NvbXBhbmllcyB0aGlzIGRpc3RyaWJ1dGlvbiwgYW5kIGlzIGF2YWlsYWJsZSBhdAorICogaHR0cDovL3d3dy5lY2xpcHNlLm9yZy9sZWdhbC9lcGwtdjEwLmh0bWwKKyAqCisgKiBDb250cmlidXRvcnM6CisgKiAgICBSb2IgU3RyeWtlciAtIGluaXRpYWwgaW1wbGVtZW50YXRpb24gYW5kIG9uZ29pbmcgbWFpbnRlbmFuY2UKKyAqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKiovCitwYWNrYWdlIG9yZy5lY2xpcHNlLmpzdC5jb21tb24udWkuaW50ZXJuYWwuYXNzZW1ibHkud2l6YXJkOworCitpbXBvcnQgamF2YS51dGlsLkFycmF5TGlzdDsKK2ltcG9ydCBqYXZhLnV0aWwuQXJyYXlzOworaW1wb3J0IGphdmEudXRpbC5IYXNoTWFwOworaW1wb3J0IGphdmEudXRpbC5JdGVyYXRvcjsKK2ltcG9ydCBqYXZhLnV0aWwuTGlzdDsKKworaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUuY29tbWFuZHMuRXhlY3V0aW9uRXhjZXB0aW9uOworaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucmVzb3VyY2VzLklDb250YWluZXI7CitpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5yZXNvdXJjZXMuSUZpbGU7CitpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5yZXNvdXJjZXMuSVByb2plY3Q7CitpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5yZXNvdXJjZXMuSVJlc291cmNlOworaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucmVzb3VyY2VzLlJlc291cmNlc1BsdWdpbjsKK2ltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJ1bnRpbWUuSVBhdGg7CitpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5ydW50aW1lLk51bGxQcm9ncmVzc01vbml0b3I7CitpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5ydW50aW1lLlBhdGg7CitpbXBvcnQgb3JnLmVjbGlwc2UuamZhY2Uudmlld2Vycy5CYXNlTGFiZWxQcm92aWRlcjsKK2ltcG9ydCBvcmcuZWNsaXBzZS5qZmFjZS52aWV3ZXJzLkNvbHVtbldlaWdodERhdGE7CitpbXBvcnQgb3JnLmVjbGlwc2UuamZhY2Uudmlld2Vycy5JU2VsZWN0aW9uQ2hhbmdlZExpc3RlbmVyOworaW1wb3J0IG9yZy5lY2xpcHNlLmpmYWNlLnZpZXdlcnMuSVN0cnVjdHVyZWRDb250ZW50UHJvdmlkZXI7CitpbXBvcnQgb3JnLmVjbGlwc2UuamZhY2Uudmlld2Vycy5JU3RydWN0dXJlZFNlbGVjdGlvbjsKK2ltcG9ydCBvcmcuZWNsaXBzZS5qZmFjZS52aWV3ZXJzLklUYWJsZUxhYmVsUHJvdmlkZXI7CitpbXBvcnQgb3JnLmVjbGlwc2UuamZhY2Uudmlld2Vycy5TZWxlY3Rpb25DaGFuZ2VkRXZlbnQ7CitpbXBvcnQgb3JnLmVjbGlwc2UuamZhY2Uudmlld2Vycy5UYWJsZUxheW91dDsKK2ltcG9ydCBvcmcuZWNsaXBzZS5qZmFjZS52aWV3ZXJzLlRhYmxlVmlld2VyOworaW1wb3J0IG9yZy5lY2xpcHNlLmpmYWNlLnZpZXdlcnMuVmlld2VyOworaW1wb3J0IG9yZy5lY2xpcHNlLmpmYWNlLndpbmRvdy5XaW5kb3c7CitpbXBvcnQgb3JnLmVjbGlwc2UuamZhY2Uud2l6YXJkLldpemFyZERpYWxvZzsKK2ltcG9ydCBvcmcuZWNsaXBzZS5qc3QuY29tbW9uLmludGVybmFsLm1vZHVsZWNvcmUudXRpbC5BcmNoaXZlTWFuaWZlc3Q7CitpbXBvcnQgb3JnLmVjbGlwc2UuanN0LmNvbW1vbi5pbnRlcm5hbC5tb2R1bGVjb3JlLnV0aWwuSmF2YU1vZHVsZUNvbXBvbmVudFV0aWxpdHk7CitpbXBvcnQgb3JnLmVjbGlwc2UuanN0LmNvbW1vbi5pbnRlcm5hbC5tb2R1bGVjb3JlLnV0aWwuTWFuaWZlc3RVdGlsaXRpZXM7CitpbXBvcnQgb3JnLmVjbGlwc2UuanN0LmNvbW1vbi5pbnRlcm5hbC5tb2R1bGVjb3JlLnV0aWwuVXBkYXRlTWFuaWZlc3REYXRhTW9kZWxQcm9wZXJ0aWVzOworaW1wb3J0IG9yZy5lY2xpcHNlLmpzdC5jb21tb24uaW50ZXJuYWwubW9kdWxlY29yZS51dGlsLlVwZGF0ZU1hbmlmZXN0RGF0YU1vZGVsUHJvdmlkZXI7CitpbXBvcnQgb3JnLmVjbGlwc2UuanN0LmNvbW1vbi51aS5pbnRlcm5hbC5JSnN0Q29tbW9uVUlDb250ZXh0SWRzOworaW1wb3J0IG9yZy5lY2xpcHNlLmpzdC5jb21tb24udWkuaW50ZXJuYWwuTWVzc2FnZXM7CitpbXBvcnQgb3JnLmVjbGlwc2Uuc3d0LlNXVDsKK2ltcG9ydCBvcmcuZWNsaXBzZS5zd3QuZXZlbnRzLk1vZGlmeUV2ZW50OworaW1wb3J0IG9yZy5lY2xpcHNlLnN3dC5ldmVudHMuTW9kaWZ5TGlzdGVuZXI7CitpbXBvcnQgb3JnLmVjbGlwc2Uuc3d0LmV2ZW50cy5TZWxlY3Rpb25FdmVudDsKK2ltcG9ydCBvcmcuZWNsaXBzZS5zd3QuZXZlbnRzLlNlbGVjdGlvbkxpc3RlbmVyOworaW1wb3J0IG9yZy5lY2xpcHNlLnN3dC5ncmFwaGljcy5JbWFnZTsKK2ltcG9ydCBvcmcuZWNsaXBzZS5zd3QubGF5b3V0LkZvcm1BdHRhY2htZW50OworaW1wb3J0IG9yZy5lY2xpcHNlLnN3dC5sYXlvdXQuRm9ybURhdGE7CitpbXBvcnQgb3JnLmVjbGlwc2Uuc3d0LmxheW91dC5Gb3JtTGF5b3V0OworaW1wb3J0IG9yZy5lY2xpcHNlLnN3dC53aWRnZXRzLkJ1dHRvbjsKK2ltcG9ydCBvcmcuZWNsaXBzZS5zd3Qud2lkZ2V0cy5Db21ibzsKK2ltcG9ydCBvcmcuZWNsaXBzZS5zd3Qud2lkZ2V0cy5Db21wb3NpdGU7CitpbXBvcnQgb3JnLmVjbGlwc2Uuc3d0LndpZGdldHMuQ29udHJvbDsKK2ltcG9ydCBvcmcuZWNsaXBzZS5zd3Qud2lkZ2V0cy5MYWJlbDsKK2ltcG9ydCBvcmcuZWNsaXBzZS5zd3Qud2lkZ2V0cy5UYWJsZTsKK2ltcG9ydCBvcmcuZWNsaXBzZS5zd3Qud2lkZ2V0cy5UYWJsZUNvbHVtbjsKK2ltcG9ydCBvcmcuZWNsaXBzZS51aS5QbGF0Zm9ybVVJOworaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS5Db21wb25lbnRDb3JlOworaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS5pbnRlcm5hbC5yZXNvdXJjZXMuQWJzdHJhY3RSZXNvdXJjZUxpc3RWaXJ0dWFsQ29tcG9uZW50OworaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS5yZXNvdXJjZXMuSVZpcnR1YWxDb21wb25lbnQ7CitpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb21wb25lbnRjb3JlLnJlc291cmNlcy5JVmlydHVhbEZpbGU7CitpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb21wb25lbnRjb3JlLnJlc291cmNlcy5JVmlydHVhbEZvbGRlcjsKK2ltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUucmVzb3VyY2VzLklWaXJ0dWFsUmVmZXJlbmNlOworaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS51aS5Nb2R1bGVDb3JlVUlQbHVnaW47CitpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb21wb25lbnRjb3JlLnVpLmludGVybmFsLnByb3BlcnR5cGFnZS5EZXBlbmRlbmN5UGFnZUV4dGVuc2lvbk1hbmFnZXI7CitpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb21wb25lbnRjb3JlLnVpLmludGVybmFsLnByb3BlcnR5cGFnZS5JVmlydHVhbENvbXBvbmVudExhYmVsUHJvdmlkZXI7CitpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb21wb25lbnRjb3JlLnVpLnByb3BlcnR5cGFnZS5JTW9kdWxlRGVwZW5kZW5jaWVzQ29udHJvbDsKK2ltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUudWkucHJvcGVydHlwYWdlLk1vZHVsZUFzc2VtYmx5Um9vdFBhZ2U7CitpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzLmRhdGFtb2RlbC5EYXRhTW9kZWxGYWN0b3J5OworaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy5kYXRhbW9kZWwuSURhdGFNb2RlbDsKKworcHVibGljIGNsYXNzIE1hbmlmZXN0TW9kdWxlRGVwZW5kZW5jeUNvbnRyb2wgaW1wbGVtZW50cworCQlJTW9kdWxlRGVwZW5kZW5jaWVzQ29udHJvbCB7CisJCisJcHJvdGVjdGVkIElQcm9qZWN0IHByb2plY3Q7CisJcHJvdGVjdGVkIElWaXJ0dWFsQ29tcG9uZW50IHJvb3RDb21wb25lbnQ7CisJcHJvdGVjdGVkIElQcm9qZWN0IHBhcmVudFByb2plY3Q7CisJcHJvdGVjdGVkIE1vZHVsZUFzc2VtYmx5Um9vdFBhZ2UgcHJvcFBhZ2U7CisJcHJvdGVjdGVkIEJ1dHRvbiBhZGRCdXR0b24sIHJlbW92ZUJ1dHRvbiwgbW92ZVVwQnV0dG9uLCBtb3ZlRG93bkJ1dHRvbjsKKwlwcm90ZWN0ZWQgQ29tYm8gcGFyZW50U2VsZWN0aW9uOworCXByb3RlY3RlZCBUYWJsZVZpZXdlciBtYW5pZmVzdEVudHJ5Vmlld2VyOworCXByaXZhdGUgQXJyYXlMaXN0PElWaXJ0dWFsUmVmZXJlbmNlPiBsaXN0ID0gbmV3IEFycmF5TGlzdDxJVmlydHVhbFJlZmVyZW5jZT4oKTsKKwlwcml2YXRlIFN0cmluZyBwcmV2aW91c01hbmlmZXN0ID0gbnVsbDsKKwkKKwlwdWJsaWMgTWFuaWZlc3RNb2R1bGVEZXBlbmRlbmN5Q29udHJvbChmaW5hbCBJUHJvamVjdCBwcm9qZWN0LAorCQkJZmluYWwgTW9kdWxlQXNzZW1ibHlSb290UGFnZSBwYWdlKSB7CisJCXRoaXMucHJvamVjdCA9IHByb2plY3Q7CisJCXRoaXMucHJvcFBhZ2UgPSBwYWdlOworCQlyb290Q29tcG9uZW50ID0gQ29tcG9uZW50Q29yZS5jcmVhdGVDb21wb25lbnQocHJvamVjdCk7CisJfQorCisJLyoKKwkgKiBDb252ZW5pZW5jZSBtZXRob2QgdG8gcXVpY2tseSBjcmVhdGUgZm9ybSBkYXRhcywgCisJICogcmVmZXJlbmNpbmcgZWl0aGVyIHBpeGVsIGNvdW50cyAodmlhIGF1dG9ib3hpbmcpIG9yIGNvbnRyb2xzLgorCSAqIElmIHRoZSBvYmplY3QgaXMgbnVsbCwgbm8gYXR0YWNobWVudCB3aWxsIGJlIGNyZWF0ZWQgZm9yIHRoYXQgc2lkZQorCSAqLworCXB1YmxpYyBzdGF0aWMgRm9ybURhdGEgY3JlYXRlRm9ybURhdGEoT2JqZWN0IHRvcCwgaW50IHRvcERpZiwgT2JqZWN0IGJvdHRvbSwgaW50IGJvdHRvbURpZiwKKwkJCQkJCU9iamVjdCBsZWZ0LCBpbnQgbGVmdERpZiwgT2JqZWN0IHJpZ2h0LCBpbnQgcmlnaHREaWYpIHsKKwkJRm9ybURhdGEgZmQgPSBuZXcgRm9ybURhdGEoKTsKKwkJaWYoIHRvcCBpbnN0YW5jZW9mIENvbnRyb2wgKSBmZC50b3AgPSBuZXcgRm9ybUF0dGFjaG1lbnQoKENvbnRyb2wpdG9wLCB0b3BEaWYpOworCQllbHNlIGlmKCB0b3AgIT0gbnVsbCApIGZkLnRvcCA9IG5ldyBGb3JtQXR0YWNobWVudCgoKEludGVnZXIpdG9wKS5pbnRWYWx1ZSgpLCB0b3BEaWYpOworCQkKKwkJaWYoIGJvdHRvbSBpbnN0YW5jZW9mIENvbnRyb2wgKSBmZC5ib3R0b20gPSBuZXcgRm9ybUF0dGFjaG1lbnQoKENvbnRyb2wpYm90dG9tLCBib3R0b21EaWYpOworCQllbHNlIGlmKCBib3R0b20gIT0gbnVsbCApIGZkLmJvdHRvbSA9IG5ldyBGb3JtQXR0YWNobWVudCgoKEludGVnZXIpYm90dG9tKS5pbnRWYWx1ZSgpLCBib3R0b21EaWYpOworCQkKKwkJaWYoIGxlZnQgaW5zdGFuY2VvZiBDb250cm9sICkgZmQubGVmdCA9IG5ldyBGb3JtQXR0YWNobWVudCgoQ29udHJvbClsZWZ0LCBsZWZ0RGlmKTsKKwkJZWxzZSBpZiggbGVmdCAhPSBudWxsICkgZmQubGVmdCA9IG5ldyBGb3JtQXR0YWNobWVudCgoKEludGVnZXIpbGVmdCkuaW50VmFsdWUoKSwgbGVmdERpZik7CisJCQorCQlpZiggcmlnaHQgaW5zdGFuY2VvZiBDb250cm9sICkgZmQucmlnaHQgPSBuZXcgRm9ybUF0dGFjaG1lbnQoKENvbnRyb2wpcmlnaHQsIHJpZ2h0RGlmKTsKKwkJZWxzZSBpZiggcmlnaHQgIT0gbnVsbCApIGZkLnJpZ2h0ID0gbmV3IEZvcm1BdHRhY2htZW50KCgoSW50ZWdlcilyaWdodCkuaW50VmFsdWUoKSwgcmlnaHREaWYpOworCQkKKwkJcmV0dXJuIGZkOworCX0KKwkKKwlwdWJsaWMgQ29tcG9zaXRlIGNyZWF0ZUNvbnRlbnRzKENvbXBvc2l0ZSBwYXJlbnQpIHsKKwkJQ29tcG9zaXRlIHJvb3QgPSBuZXcgQ29tcG9zaXRlKHBhcmVudCwgU1dULk5PTkUpOworCQlQbGF0Zm9ybVVJLmdldFdvcmtiZW5jaCgpLmdldEhlbHBTeXN0ZW0oKS5zZXRIZWxwKHJvb3QsIElKc3RDb21tb25VSUNvbnRleHRJZHMuREVQTE9ZTUVOVF9BU1NFTUJMWV9QUkVGRVJFTkNFX1BBR0VfTUFOSUZFU1RfRU5UUklFU19UQUIpOworCQlyb290LnNldExheW91dChuZXcgRm9ybUxheW91dCgpKTsKKwkJTGFiZWwgbCA9IG5ldyBMYWJlbChyb290LCBTV1QuTk9ORSk7CisJCWwuc2V0VGV4dChNZXNzYWdlcy5QYXJlbnRQcm9qZWN0cyk7CisJCWwuc2V0TGF5b3V0RGF0YShjcmVhdGVGb3JtRGF0YSgwLDEwLG51bGwsMCwgMCwgNSwgbnVsbCwwKSk7CisJCXBhcmVudFNlbGVjdGlvbiA9IG5ldyBDb21ibyhyb290LCBTV1QuUkVBRF9PTkxZKTsKKwkJcGFyZW50U2VsZWN0aW9uLnNldExheW91dERhdGEoY3JlYXRlRm9ybURhdGEoMCw1LG51bGwsMCxsLDUsMTAwLC01KSk7CisJCXBhcmVudFNlbGVjdGlvbi5zZXRJdGVtcyhnZXRQb3NzaWJsZVBhcmVudFByb2plY3RzKCkpOworCQlwYXJlbnRTZWxlY3Rpb24uYWRkTW9kaWZ5TGlzdGVuZXIobmV3IE1vZGlmeUxpc3RlbmVyKCl7CisJCQlwdWJsaWMgdm9pZCBtb2RpZnlUZXh0KE1vZGlmeUV2ZW50IGUpIHsKKwkJCQlyZWZyZXNoVmlld2VyRnJvbU5ld1BhcmVudFByb2plY3QoKTsKKwkJCX0KKwkJfSk7CisJCUxhYmVsIHRhYmxlTGFiZWwgPSBuZXcgTGFiZWwocm9vdCwgU1dULk5PTkUpOworCQl0YWJsZUxhYmVsLnNldFRleHQoTWVzc2FnZXMuTWFuaWZlc3RFbnRyaWVzKTsKKwkJdGFibGVMYWJlbC5zZXRMYXlvdXREYXRhKGNyZWF0ZUZvcm1EYXRhKHBhcmVudFNlbGVjdGlvbiw1LG51bGwsMCwgMCwgNSwgbnVsbCwwKSk7CisJCW1hbmlmZXN0RW50cnlWaWV3ZXIgPSBjcmVhdGVNYW5pZmVzdFJlZmVyZW5jZVRhYmxlVmlld2VyKHJvb3QsIFNXVC5TSU5HTEUpOworCQkKKwkJQ29tcG9zaXRlIGJ1dHRvbkNvbHVtbiA9IG5ldyBDb21wb3NpdGUocm9vdCwgU1dULk5PTkUpOworCQlidXR0b25Db2x1bW4uc2V0TGF5b3V0KG5ldyBGb3JtTGF5b3V0KCkpOworCQlidXR0b25Db2x1bW4uc2V0TGF5b3V0RGF0YShjcmVhdGVGb3JtRGF0YSh0YWJsZUxhYmVsLDUsbnVsbCwwLG51bGwsMCwgMTAwLC01KSk7CisJCWFkZEJ1dHRvbiA9IG5ldyBCdXR0b24oYnV0dG9uQ29sdW1uLCBTV1QuUFVTSCk7CisJCXJlbW92ZUJ1dHRvbiA9IG5ldyBCdXR0b24oYnV0dG9uQ29sdW1uLCBTV1QuUFVTSCk7CisJCW1vdmVVcEJ1dHRvbiA9IG5ldyBCdXR0b24oYnV0dG9uQ29sdW1uLCBTV1QuUFVTSCk7CisJCW1vdmVEb3duQnV0dG9uID0gbmV3IEJ1dHRvbihidXR0b25Db2x1bW4sIFNXVC5QVVNIKTsKKwkJCisJCWFkZEJ1dHRvbi5zZXRUZXh0KE1lc3NhZ2VzLkFkZCk7CisJCXJlbW92ZUJ1dHRvbi5zZXRUZXh0KE1lc3NhZ2VzLlJlbW92ZSk7CisJCW1vdmVVcEJ1dHRvbi5zZXRUZXh0KE1lc3NhZ2VzLk1vdmVVcCk7CisJCW1vdmVEb3duQnV0dG9uLnNldFRleHQoTWVzc2FnZXMuTW92ZURvd24pOworCQkKKwkJSUZpbGUgbWFuaWZlc3QgPSBnZXRNYW5pZmVzdElGaWxlKHJvb3RDb21wb25lbnQpOworCQlpZihtYW5pZmVzdCA9PSBudWxsKSB7CisJCQlhZGRCdXR0b24uc2V0RW5hYmxlZChmYWxzZSk7CisJCX0gZWxzZSB7CisJCQlhZGRCdXR0b24uc2V0RW5hYmxlZCh0cnVlKTsKKwkJCXByZXZpb3VzTWFuaWZlc3QgPSBtYW5pZmVzdC5nZXRGdWxsUGF0aCgpLnRvT1NTdHJpbmcoKTsKKwkJfQorCQlyZW1vdmVCdXR0b24uc2V0RW5hYmxlZChmYWxzZSk7CisJCW1vdmVVcEJ1dHRvbi5zZXRFbmFibGVkKGZhbHNlKTsKKwkJbW92ZURvd25CdXR0b24uc2V0RW5hYmxlZChmYWxzZSk7CisJCQorCQlhZGRCdXR0b24uc2V0TGF5b3V0RGF0YShjcmVhdGVGb3JtRGF0YShudWxsLDAsbnVsbCwwLG1hbmlmZXN0RW50cnlWaWV3ZXIuZ2V0VGFibGUoKSw1LDEwMCwwKSk7CisJCXJlbW92ZUJ1dHRvbi5zZXRMYXlvdXREYXRhKGNyZWF0ZUZvcm1EYXRhKGFkZEJ1dHRvbiw1LG51bGwsMCxtYW5pZmVzdEVudHJ5Vmlld2VyLmdldFRhYmxlKCksNSwxMDAsMCkpOworCQltb3ZlVXBCdXR0b24uc2V0TGF5b3V0RGF0YShjcmVhdGVGb3JtRGF0YShyZW1vdmVCdXR0b24sNSxudWxsLDAsbWFuaWZlc3RFbnRyeVZpZXdlci5nZXRUYWJsZSgpLDUsMTAwLDApKTsKKwkJbW92ZURvd25CdXR0b24uc2V0TGF5b3V0RGF0YShjcmVhdGVGb3JtRGF0YShtb3ZlVXBCdXR0b24sNSxudWxsLDAsbWFuaWZlc3RFbnRyeVZpZXdlci5nZXRUYWJsZSgpLDUsMTAwLDApKTsKKwkJCisJCWFkZEJ1dHRvbi5hZGRTZWxlY3Rpb25MaXN0ZW5lcihuZXcgU2VsZWN0aW9uTGlzdGVuZXIoKSB7CisJCQlwdWJsaWMgdm9pZCB3aWRnZXRTZWxlY3RlZChTZWxlY3Rpb25FdmVudCBlKSB7CisJCQkJYWRkUHJlc3NlZCgpOworCQkJfQorCQkJcHVibGljIHZvaWQgd2lkZ2V0RGVmYXVsdFNlbGVjdGVkKFNlbGVjdGlvbkV2ZW50IGUpIHsKKwkJCX0KKwkJfSk7CisJCXJlbW92ZUJ1dHRvbi5hZGRTZWxlY3Rpb25MaXN0ZW5lcihuZXcgU2VsZWN0aW9uTGlzdGVuZXIoKSB7CisJCQlwdWJsaWMgdm9pZCB3aWRnZXRTZWxlY3RlZChTZWxlY3Rpb25FdmVudCBlKSB7CisJCQkJcmVtb3ZlUHJlc3NlZCgpOworCQkJfQorCQkJcHVibGljIHZvaWQgd2lkZ2V0RGVmYXVsdFNlbGVjdGVkKFNlbGVjdGlvbkV2ZW50IGUpIHsKKwkJCX0KKwkJfSk7CisJCW1vdmVVcEJ1dHRvbi5hZGRTZWxlY3Rpb25MaXN0ZW5lcihuZXcgU2VsZWN0aW9uTGlzdGVuZXIoKSB7CisJCQlwdWJsaWMgdm9pZCB3aWRnZXRTZWxlY3RlZChTZWxlY3Rpb25FdmVudCBlKSB7CisJCQkJbW92ZVVwKCk7CisJCQl9CisJCQlwdWJsaWMgdm9pZCB3aWRnZXREZWZhdWx0U2VsZWN0ZWQoU2VsZWN0aW9uRXZlbnQgZSkgeworCQkJfQorCQl9KTsKKwkJbW92ZURvd25CdXR0b24uYWRkU2VsZWN0aW9uTGlzdGVuZXIobmV3IFNlbGVjdGlvbkxpc3RlbmVyKCkgeworCQkJcHVibGljIHZvaWQgd2lkZ2V0U2VsZWN0ZWQoU2VsZWN0aW9uRXZlbnQgZSkgeworCQkJCW1vdmVEb3duKCk7CisJCQl9CisJCQlwdWJsaWMgdm9pZCB3aWRnZXREZWZhdWx0U2VsZWN0ZWQoU2VsZWN0aW9uRXZlbnQgZSkgeworCQkJfQorCQl9KTsKKwkJCisJCW1hbmlmZXN0RW50cnlWaWV3ZXIuZ2V0VGFibGUoKS5zZXRMYXlvdXREYXRhKGNyZWF0ZUZvcm1EYXRhKAorCQkJCXRhYmxlTGFiZWwsIDUsIDEwMCwgLTUsIDAsIDUsIGJ1dHRvbkNvbHVtbiwgMCkpOworCQltYW5pZmVzdEVudHJ5Vmlld2VyLnNldExhYmVsUHJvdmlkZXIobmV3IE1hbmlmZXN0TGFiZWxQcm92aWRlcigpKTsKKwkJbWFuaWZlc3RFbnRyeVZpZXdlci5zZXRDb250ZW50UHJvdmlkZXIobmV3IE1hbmlmZXN0Q29udGVudFByb3ZpZGVyKCkpOworCQltYW5pZmVzdEVudHJ5Vmlld2VyLnNldElucHV0KFJlc291cmNlc1BsdWdpbi5nZXRXb3Jrc3BhY2UoKSk7CisJCXBhcmVudFNlbGVjdGlvbi5zZWxlY3QoMCk7CisJCQorCQltYW5pZmVzdEVudHJ5Vmlld2VyLmFkZFNlbGVjdGlvbkNoYW5nZWRMaXN0ZW5lcihuZXcgSVNlbGVjdGlvbkNoYW5nZWRMaXN0ZW5lcigpIHsKKwkJCXB1YmxpYyB2b2lkIHNlbGVjdGlvbkNoYW5nZWQoU2VsZWN0aW9uQ2hhbmdlZEV2ZW50IGV2ZW50KSB7CisJCQkJdmlld2VyU2VsZWN0aW9uQ2hhbmdlZCgpOworCQkJfQorCQl9KTsKKwkJcmV0dXJuIHJvb3Q7CisJfQorCQorCXByb3RlY3RlZCB2b2lkIHZpZXdlclNlbGVjdGlvbkNoYW5nZWQoKSB7CisJCXVwZGF0ZUJ1dHRvbnMoKTsKKwl9CisJCisJcHJvdGVjdGVkIHZvaWQgdXBkYXRlQnV0dG9ucygpIHsKKwkJaWYoIWFkZEJ1dHRvbi5pc0VuYWJsZWQoKSkgeworCQkJcmVtb3ZlQnV0dG9uLnNldEVuYWJsZWQoZmFsc2UpOworCQkJbW92ZVVwQnV0dG9uLnNldEVuYWJsZWQoZmFsc2UpOworCQkJbW92ZURvd25CdXR0b24uc2V0RW5hYmxlZChmYWxzZSk7CisJCX0gZWxzZSB7CisJCQlpbnQgaW5kZXggPSBtYW5pZmVzdEVudHJ5Vmlld2VyLmdldFRhYmxlKCkuZ2V0U2VsZWN0aW9uSW5kZXgoKTsKKwkJCWludCBzaXplID0gbWFuaWZlc3RFbnRyeVZpZXdlci5nZXRUYWJsZSgpLmdldEl0ZW1zKCkubGVuZ3RoOworCQkJcmVtb3ZlQnV0dG9uLnNldEVuYWJsZWQoaW5kZXggIT0gLTEpOworCQkJbW92ZVVwQnV0dG9uLnNldEVuYWJsZWQoaW5kZXggIT0gLTEgJiYgaW5kZXggIT0gMCk7CisJCQltb3ZlRG93bkJ1dHRvbi5zZXRFbmFibGVkKGluZGV4ICE9IHNpemUtMSk7CisJCX0KKwl9CisJCisJcHJvdGVjdGVkIHZvaWQgbW92ZVVwKCkgeworCQlpbnQgaW5kZXggPSBtYW5pZmVzdEVudHJ5Vmlld2VyLmdldFRhYmxlKCkuZ2V0U2VsZWN0aW9uSW5kZXgoKTsKKwkJSVZpcnR1YWxSZWZlcmVuY2UgcmVmID0gbGlzdC5yZW1vdmUoaW5kZXgpOworCQlsaXN0LmFkZChpbmRleC0xLHJlZik7CisJCXJlZnJlc2hWaWV3ZXIoKTsKKwkJdXBkYXRlQnV0dG9ucygpOworCX0KKwlwcm90ZWN0ZWQgdm9pZCBtb3ZlRG93bigpIHsKKwkJaW50IGluZGV4ID0gbWFuaWZlc3RFbnRyeVZpZXdlci5nZXRUYWJsZSgpLmdldFNlbGVjdGlvbkluZGV4KCk7CisJCUlWaXJ0dWFsUmVmZXJlbmNlIHJlZiA9IGxpc3QucmVtb3ZlKGluZGV4KTsKKwkJbGlzdC5hZGQoaW5kZXgrMSxyZWYpOworCQlyZWZyZXNoVmlld2VyKCk7CisJCXVwZGF0ZUJ1dHRvbnMoKTsKKwl9CisJCisJcHJvdGVjdGVkIHZvaWQgYWRkUHJlc3NlZCgpIHsKKwkJQWRkTWFuaWZlc3RFbnRyeVRhc2tXaXphcmQgd2l6YXJkID0gbmV3IEFkZE1hbmlmZXN0RW50cnlUYXNrV2l6YXJkKCk7CisJCXdpemFyZC5nZXRUYXNrTW9kZWwoKS5wdXRPYmplY3QoQWRkTWFuaWZlc3RFbnRyeVRhc2tXaXphcmQuQ0hJTERfUFJPSkVDVCwgcHJvamVjdCk7CisJCXdpemFyZC5nZXRUYXNrTW9kZWwoKS5wdXRPYmplY3QoQWRkTWFuaWZlc3RFbnRyeVRhc2tXaXphcmQuUEFSRU5UX1BST0pFQ1QsIHBhcmVudFByb2plY3QpOworCQl3aXphcmQuZ2V0VGFza01vZGVsKCkucHV0T2JqZWN0KEFkZE1hbmlmZXN0RW50cnlUYXNrV2l6YXJkLkNVUlJFTlRfUkVGRVJFTkNFUywgbGlzdC50b0FycmF5KG5ldyBJVmlydHVhbFJlZmVyZW5jZVtsaXN0LnNpemUoKV0pKTsKKwkJV2l6YXJkRGlhbG9nIHdkID0gbmV3IFdpemFyZERpYWxvZyhhZGRCdXR0b24uZ2V0U2hlbGwoKSwgd2l6YXJkKTsKKwkJaWYoIHdkLm9wZW4oKSAhPSBXaW5kb3cuQ0FOQ0VMKSB7CisJCQlJVmlydHVhbFJlZmVyZW5jZVtdIHJldCA9IChJVmlydHVhbFJlZmVyZW5jZVtdKXdpemFyZC5nZXRUYXNrTW9kZWwoKS5nZXRPYmplY3QoQWRkTWFuaWZlc3RFbnRyeVRhc2tXaXphcmQuUkVUVVJORURfUkVGRVJFTkNFUyk7CisJCQlpZiAocmV0ICE9IG51bGwpCisJCQkJbGlzdC5hZGRBbGwoQXJyYXlzLmFzTGlzdChyZXQpKTsKKwkJCXJlZnJlc2hWaWV3ZXIoKTsKKwkJCXVwZGF0ZUJ1dHRvbnMoKTsKKwkJfQorCX0KKworCXByb3RlY3RlZCB2b2lkIHJlbW92ZVByZXNzZWQoKSB7CisJCUlTdHJ1Y3R1cmVkU2VsZWN0aW9uIHNlbCA9IChJU3RydWN0dXJlZFNlbGVjdGlvbiltYW5pZmVzdEVudHJ5Vmlld2VyLmdldFNlbGVjdGlvbigpOworCQlJdGVyYXRvciBpID0gc2VsLml0ZXJhdG9yKCk7CisJCXdoaWxlKGkuaGFzTmV4dCgpKSB7CisJCQlsaXN0LnJlbW92ZShpLm5leHQoKSk7CisJCX0KKwkJcmVmcmVzaFZpZXdlcigpOworCQl1cGRhdGVCdXR0b25zKCk7CisJfQorCQorCXB1YmxpYyBzdGF0aWMgY2xhc3MgTWFuaWZlc3RMYWJlbFByb3ZpZGVyIGV4dGVuZHMgQmFzZUxhYmVsUHJvdmlkZXIgaW1wbGVtZW50cyBJVGFibGVMYWJlbFByb3ZpZGVyIHsKKwkJcHJpdmF0ZSBJVmlydHVhbENvbXBvbmVudExhYmVsUHJvdmlkZXJbXSBkZWxlZ2F0ZXM7CisJCXByb3RlY3RlZCB2b2lkIGdldERlbGVnYXRlcygpIHsKKwkJCWlmKCBkZWxlZ2F0ZXMgPT0gbnVsbCApCisJCQkJZGVsZWdhdGVzID0gRGVwZW5kZW5jeVBhZ2VFeHRlbnNpb25NYW5hZ2VyLmxvYWREZWxlZ2F0ZXMoKTsKKwkJfQorCQlwdWJsaWMgSW1hZ2UgZ2V0Q29sdW1uSW1hZ2UoT2JqZWN0IGVsZW1lbnQsIGludCBjb2x1bW5JbmRleCkgeworCQkJZ2V0RGVsZWdhdGVzKCk7CisJCQlpZiggY29sdW1uSW5kZXggPT0gMSApIHsKKwkJCQlpZiggZWxlbWVudCBpbnN0YW5jZW9mIElWaXJ0dWFsUmVmZXJlbmNlICkgeworCQkJCQlmb3IoIGludCBpID0gMDsgaSA8IGRlbGVnYXRlcy5sZW5ndGg7IGkrKyApCisJCQkJCQlpZiggZGVsZWdhdGVzW2ldLmNhbkhhbmRsZSgoKElWaXJ0dWFsUmVmZXJlbmNlKWVsZW1lbnQpLmdldFJlZmVyZW5jZWRDb21wb25lbnQoKSkpCisJCQkJCQkJcmV0dXJuIGRlbGVnYXRlc1tpXS5nZXRTb3VyY2VJbWFnZSgoKElWaXJ0dWFsUmVmZXJlbmNlKWVsZW1lbnQpLmdldFJlZmVyZW5jZWRDb21wb25lbnQoKSk7CisJCQkJfQorCQkJfQorCQkJcmV0dXJuIE1vZHVsZUNvcmVVSVBsdWdpbi5nZXRJbnN0YW5jZSgpLmdldEltYWdlKCJqYXJfb2JqIik7CisJCX0KKwkJCisJCXB1YmxpYyBTdHJpbmcgZ2V0Q29sdW1uVGV4dChPYmplY3QgZWxlbWVudCwgaW50IGNvbHVtbkluZGV4KSB7CisJCQlpZiggZWxlbWVudCBpbnN0YW5jZW9mIElWaXJ0dWFsUmVmZXJlbmNlICkgeworCQkJCUlWaXJ0dWFsUmVmZXJlbmNlIHJlZiA9IChJVmlydHVhbFJlZmVyZW5jZSllbGVtZW50OworCQkJCWlmKCBjb2x1bW5JbmRleCA9PSAwICYmIHJlZi5nZXRBcmNoaXZlTmFtZSgpICE9IG51bGwpCisJCQkJCXJldHVybiByZWYuZ2V0UnVudGltZVBhdGgoKS5hcHBlbmQocmVmLmdldEFyY2hpdmVOYW1lKCkpLnRvU3RyaW5nKCk7CisJCQkJaWYoIGNvbHVtbkluZGV4ID09IDEgKQorCQkJCQlyZXR1cm4gaGFuZGxlU291cmNlVGV4dChyZWYuZ2V0UmVmZXJlbmNlZENvbXBvbmVudCgpKTsKKwkJCX0KKwkJCXJldHVybiBudWxsOworCQl9CisJCQorCQlwcml2YXRlIFN0cmluZyBoYW5kbGVTb3VyY2VUZXh0KElWaXJ0dWFsQ29tcG9uZW50IGNvbXBvbmVudCkgeworCQkJZ2V0RGVsZWdhdGVzKCk7CisJCQlmb3IoIGludCBpID0gMDsgaSA8IGRlbGVnYXRlcy5sZW5ndGg7IGkrKyApCisJCQkJaWYoIGRlbGVnYXRlc1tpXS5jYW5IYW5kbGUoY29tcG9uZW50KSkKKwkJCQkJcmV0dXJuIGRlbGVnYXRlc1tpXS5nZXRTb3VyY2VUZXh0KGNvbXBvbmVudCk7CisKKwkJCS8vIGRlZmF1bHQgaW1wbAorCQkJaWYoIGNvbXBvbmVudC5pc0JpbmFyeSgpICkgeworCQkJCUlQYXRoIHAgPSAoSVBhdGgpY29tcG9uZW50LmdldEFkYXB0ZXIoSVBhdGguY2xhc3MpOworCQkJCXJldHVybiBwID09IG51bGwgPyBudWxsIDogcC50b1N0cmluZygpOworCQkJfQorCQkJcmV0dXJuIGNvbXBvbmVudC5nZXRQcm9qZWN0KCkuZ2V0TmFtZSgpOworCQl9CisJfQorCQorCQorCXByaXZhdGUgY2xhc3MgTWFuaWZlc3RDb250ZW50UHJvdmlkZXIgaW1wbGVtZW50cyBJU3RydWN0dXJlZENvbnRlbnRQcm92aWRlciB7CisJCXB1YmxpYyB2b2lkIGRpc3Bvc2UoKSB7CisJCX0KKwkJcHVibGljIHZvaWQgaW5wdXRDaGFuZ2VkKFZpZXdlciB2aWV3ZXIsIE9iamVjdCBvbGRJbnB1dCwgT2JqZWN0IG5ld0lucHV0KSB7CisJCX0KKwkJcHVibGljIE9iamVjdFtdIGdldEVsZW1lbnRzKE9iamVjdCBpbnB1dEVsZW1lbnQpIHsKKwkJCXJldHVybiByZWZzRm9yQ3VycmVudFByb2plY3QgPT0gbnVsbCA/IG5ldyBPYmplY3RbXXt9IDogcmVmc0ZvckN1cnJlbnRQcm9qZWN0OworCQl9CisJfQorCQorCXB1YmxpYyBzdGF0aWMgVGFibGVWaWV3ZXIgY3JlYXRlTWFuaWZlc3RSZWZlcmVuY2VUYWJsZVZpZXdlcihDb21wb3NpdGUgcGFyZW50LCBpbnQgc3R5bGUpIHsKKwkJaW50IGZsYWdzID0gU1dULkJPUkRFUiB8IHN0eWxlOworCisJCVRhYmxlIHRhYmxlID0gbmV3IFRhYmxlKHBhcmVudCwgZmxhZ3MpOworCQlUYWJsZVZpZXdlciB2aWV3ZXIgPSBuZXcgVGFibGVWaWV3ZXIodGFibGUpOworCisJCS8vIHNldCB1cCB0YWJsZSBsYXlvdXQKKwkJVGFibGVMYXlvdXQgdGFibGVMYXlvdXQgPSBuZXcgb3JnLmVjbGlwc2UuamZhY2Uudmlld2Vycy5UYWJsZUxheW91dCgpOworCQl0YWJsZUxheW91dC5hZGRDb2x1bW5EYXRhKG5ldyBDb2x1bW5XZWlnaHREYXRhKDIwMCwgdHJ1ZSkpOworCQl0YWJsZUxheW91dC5hZGRDb2x1bW5EYXRhKG5ldyBDb2x1bW5XZWlnaHREYXRhKDIwMCwgdHJ1ZSkpOworCQl0YWJsZS5zZXRMYXlvdXQodGFibGVMYXlvdXQpOworCQl0YWJsZS5zZXRIZWFkZXJWaXNpYmxlKHRydWUpOworCQl0YWJsZS5zZXRMaW5lc1Zpc2libGUodHJ1ZSk7CisJCQorCQkvLyB0YWJsZSBjb2x1bW5zCisJCVRhYmxlQ29sdW1uIGZpbGVOYW1lQ29sdW1uID0gbmV3IFRhYmxlQ29sdW1uKHRhYmxlLCBTV1QuTk9ORSwgMCk7CisJCWZpbGVOYW1lQ29sdW1uLnNldFRleHQoTWVzc2FnZXMuTWFuaWZlc3RFbnRyeUNvbHVtbik7CisJCWZpbGVOYW1lQ29sdW1uLnNldFJlc2l6YWJsZSh0cnVlKTsKKworCQlUYWJsZUNvbHVtbiBwcm9qZWN0Q29sdW1uID0gbmV3IFRhYmxlQ29sdW1uKHRhYmxlLCBTV1QuTk9ORSwgMSk7CisJCXByb2plY3RDb2x1bW4uc2V0VGV4dChNZXNzYWdlcy5NYW5pZmVzdEVudHJ5U291cmNlQ29sdW1uKTsKKwkJcHJvamVjdENvbHVtbi5zZXRSZXNpemFibGUodHJ1ZSk7CisJCXRhYmxlTGF5b3V0LmxheW91dCh0YWJsZSwgdHJ1ZSk7CisJCXJldHVybiB2aWV3ZXI7CisJfQorCisJcHJpdmF0ZSBJVmlydHVhbFJlZmVyZW5jZVtdIHJlZnNGb3JDdXJyZW50UHJvamVjdDsKKwlwcm90ZWN0ZWQgdm9pZCByZWZyZXNoVmlld2VyRnJvbU5ld1BhcmVudFByb2plY3QoKSB7CisJCVN0cmluZyBwYXJlbnRTdHJpbmcgPSBwYXJlbnRTZWxlY3Rpb24uZ2V0VGV4dCgpOworCQlyZWZzRm9yQ3VycmVudFByb2plY3QgPSBuZXcgSVZpcnR1YWxSZWZlcmVuY2VbXXt9OworCQlpZiggcGFyZW50U3RyaW5nICE9IG51bGwgJiYgISIiLmVxdWFscyhwYXJlbnRTdHJpbmcpKSB7IC8vJE5PTi1OTFMtMSQKKwkJCXBhcmVudFByb2plY3QgPSBSZXNvdXJjZXNQbHVnaW4uZ2V0V29ya3NwYWNlKCkuZ2V0Um9vdCgpLmdldFByb2plY3QocGFyZW50U3RyaW5nKTsKKwkJCUlWaXJ0dWFsUmVmZXJlbmNlW10gY3VycmVudCAgPSBKYXZhTW9kdWxlQ29tcG9uZW50VXRpbGl0eS5maW5kQ3VycmVudE1hbmlmZXN0RW50cmllcyhwYXJlbnRQcm9qZWN0LCBwcm9qZWN0KTsKKwkJCXJlZnNGb3JDdXJyZW50UHJvamVjdCA9IHNvcnRSZWZzRm9yQ3VycmVudFByb2plY3QoYWRkTWlzc2luZ0R1bW15RW50cmllcyhjdXJyZW50KSk7CisJCQlmb3IoIGludCBpID0gMDsgaSA8IHJlZnNGb3JDdXJyZW50UHJvamVjdC5sZW5ndGg7IGkrKyApIHsKKwkJCQlsaXN0LmFkZChyZWZzRm9yQ3VycmVudFByb2plY3RbaV0pOworCQkJfQorCQl9CisJCW1hbmlmZXN0RW50cnlWaWV3ZXIucmVmcmVzaCgpOworCX0KKwkKKwlwcml2YXRlIElWaXJ0dWFsUmVmZXJlbmNlW10gc29ydFJlZnNGb3JDdXJyZW50UHJvamVjdChJVmlydHVhbFJlZmVyZW5jZVtdIGN1cnJlbnRSZWZzKSB7CisJCUlGaWxlIG1hbmlmZXN0RmlsZSA9IGdldE1hbmlmZXN0SUZpbGUocm9vdENvbXBvbmVudCk7CisJCWlmIChtYW5pZmVzdEZpbGUgPT0gbnVsbCkKKwkJCXJldHVybiBjdXJyZW50UmVmczsKKwkJCisJCUhhc2hNYXA8U3RyaW5nLCBJVmlydHVhbFJlZmVyZW5jZT4gdW5zb3J0ZWRSZWZNYXAgPSBuZXcgSGFzaE1hcDxTdHJpbmcsIElWaXJ0dWFsUmVmZXJlbmNlPigpOworCQlmb3IgKGludCBpID0gMDsgaSA8IGN1cnJlbnRSZWZzLmxlbmd0aDsgaSsrKSB7CisJCQlJVmlydHVhbFJlZmVyZW5jZSByZWYgPSBjdXJyZW50UmVmc1tpXTsKKwkJCVN0cmluZyBlbnRyeU5hbWUgPSByZWYuZ2V0UnVudGltZVBhdGgoKS5hcHBlbmQocmVmLmdldEFyY2hpdmVOYW1lKCkpLnRvU3RyaW5nKCk7CisJCQl1bnNvcnRlZFJlZk1hcC5wdXQoZW50cnlOYW1lLCByZWYpOworCQl9CisJCUxpc3Q8SVZpcnR1YWxSZWZlcmVuY2U+IHNvcnRlZFJlZnMgPSBuZXcgQXJyYXlMaXN0PElWaXJ0dWFsUmVmZXJlbmNlPigpOworCQlBcmNoaXZlTWFuaWZlc3QgbWFuaWZlc3QgPSBNYW5pZmVzdFV0aWxpdGllcy5nZXRNYW5pZmVzdChtYW5pZmVzdEZpbGUpOworCQlTdHJpbmdbXSBlbnRyaWVzID0gbWFuaWZlc3QuZ2V0Q2xhc3NQYXRoVG9rZW5pemVkKCk7CisJCWZvciAoaW50IGkgPSAwOyBpIDwgZW50cmllcy5sZW5ndGg7IGkrKykgeworCQkJSVZpcnR1YWxSZWZlcmVuY2UgcmVmID0gdW5zb3J0ZWRSZWZNYXAuZ2V0KGVudHJpZXNbaV0pOworCQkJaWYgKHJlZiAhPSBudWxsKSB7CisJCQkJc29ydGVkUmVmcy5hZGQocmVmKTsKKwkJCX0KKwkJfQorCQlyZXR1cm4gc29ydGVkUmVmcy50b0FycmF5KG5ldyBJVmlydHVhbFJlZmVyZW5jZVtzb3J0ZWRSZWZzLnNpemUoKV0pOworCX0KKwkKKwlwcm90ZWN0ZWQgdm9pZCByZWZyZXNoVmlld2VyKCkgeworCQlyZWZzRm9yQ3VycmVudFByb2plY3QgPSBsaXN0LnRvQXJyYXkobmV3IElWaXJ0dWFsUmVmZXJlbmNlW2xpc3Quc2l6ZSgpXSk7CisJCW1hbmlmZXN0RW50cnlWaWV3ZXIucmVmcmVzaCgpOworCX0KKwkKKwlwcm90ZWN0ZWQgSVZpcnR1YWxSZWZlcmVuY2VbXSBhZGRNaXNzaW5nRHVtbXlFbnRyaWVzKElWaXJ0dWFsUmVmZXJlbmNlW10gY3VycmVudCkgeworCQlJRmlsZSBtYW5pZmVzdEZpbGUgPSBnZXRNYW5pZmVzdElGaWxlKHJvb3RDb21wb25lbnQpOworCQlpZiggbWFuaWZlc3RGaWxlICE9IG51bGwgKSB7CisJCQlBcnJheUxpc3Q8SVZpcnR1YWxSZWZlcmVuY2U+IHJlZnMgPSBuZXcgQXJyYXlMaXN0PElWaXJ0dWFsUmVmZXJlbmNlPigpOworCQkJcmVmcy5hZGRBbGwoQXJyYXlzLmFzTGlzdChjdXJyZW50KSk7CisJCQlBcmNoaXZlTWFuaWZlc3QgbWFuaWZlc3QgPSBNYW5pZmVzdFV0aWxpdGllcy5nZXRNYW5pZmVzdChtYW5pZmVzdEZpbGUpOworCQkJU3RyaW5nW10gZW50cmllcyA9IG1hbmlmZXN0LmdldENsYXNzUGF0aFRva2VuaXplZCgpOworCQkJU3RyaW5nW10gdW51c2VkRW50cmllcyA9IGZpbmRVbnVzZWRFbnRyaWVzKGN1cnJlbnQsIGVudHJpZXMpOworCQkJZm9yKCBpbnQgaSA9IDA7IGkgPCB1bnVzZWRFbnRyaWVzLmxlbmd0aDsgaSsrICkgeworCQkJCXJlZnMuYWRkKGNyZWF0ZUR1bW15UmVmZXJlbmNlKHVudXNlZEVudHJpZXNbaV0pKTsKKwkJCX0KKwkJCXJldHVybiByZWZzLnRvQXJyYXkobmV3IElWaXJ0dWFsUmVmZXJlbmNlW3JlZnMuc2l6ZSgpXSk7CisJCX0KKwkJcmV0dXJuIGN1cnJlbnQ7CisJfQorCQorCQorCXB1YmxpYyBzdGF0aWMgY2xhc3MgRHVtbXlWaXJ0dWFsQ29tcG9uZW50IGV4dGVuZHMgQWJzdHJhY3RSZXNvdXJjZUxpc3RWaXJ0dWFsQ29tcG9uZW50IHsKKwkJcHJpdmF0ZSBzdGF0aWMgZmluYWwgU3RyaW5nIERVTU1ZX0ZJUlNUX1NFR01FTlQgPSAiZHVtbXlWaXJ0dWFsQ29tcG9uZW50IjsgLy8kTk9OLU5MUy0xJAorCQlwdWJsaWMgRHVtbXlWaXJ0dWFsQ29tcG9uZW50KElQcm9qZWN0IHAsIElWaXJ0dWFsQ29tcG9uZW50IHJlZmVyZW5jaW5nQ29tcG9uZW50KSB7CisJCQlzdXBlcihwLCByZWZlcmVuY2luZ0NvbXBvbmVudCk7CisJCX0KKworCQlwcm90ZWN0ZWQgU3RyaW5nIGdldEZpcnN0SWRTZWdtZW50KCkgeworCQkJcmV0dXJuIERVTU1ZX0ZJUlNUX1NFR01FTlQ7CisJCX0KKworCQlwcm90ZWN0ZWQgSUNvbnRhaW5lcltdIGdldFVuZGVybHlpbmdDb250YWluZXJzKCkgeworCQkJcmV0dXJuIG5ldyBJQ29udGFpbmVyW117fTsKKwkJfQorCisJCXByb3RlY3RlZCBJUmVzb3VyY2VbXSBnZXRMb29zZVJlc291cmNlcygpIHsKKwkJCXJldHVybiBuZXcgSVJlc291cmNlW117fTsKKwkJfQorCX0KKwkKKwlwcml2YXRlIElWaXJ0dWFsUmVmZXJlbmNlIGNyZWF0ZUR1bW15UmVmZXJlbmNlKFN0cmluZyBwYXRoKSB7CisJCXJldHVybiBjcmVhdGVEdW1teVJlZmVyZW5jZShwYXRoLCBwYXJlbnRQcm9qZWN0LCBDb21wb25lbnRDb3JlLmNyZWF0ZUNvbXBvbmVudChwYXJlbnRQcm9qZWN0KSk7CisJfQorCQorCXB1YmxpYyBzdGF0aWMgSVZpcnR1YWxSZWZlcmVuY2UgY3JlYXRlRHVtbXlSZWZlcmVuY2UoU3RyaW5nIHBhdGgsIElQcm9qZWN0IHByb2plY3QsIElWaXJ0dWFsQ29tcG9uZW50IHJvb3RDb21wb25lbnQpIHsKKwkJSVZpcnR1YWxDb21wb25lbnQgY29tcCA9IG5ldyBEdW1teVZpcnR1YWxDb21wb25lbnQocHJvamVjdCwgcm9vdENvbXBvbmVudCk7CisJCUlWaXJ0dWFsUmVmZXJlbmNlIHJlZiA9IENvbXBvbmVudENvcmUuY3JlYXRlUmVmZXJlbmNlKHJvb3RDb21wb25lbnQsIGNvbXApOworCQlJUGF0aCBwYXRoMiA9IG5ldyBQYXRoKHBhdGgpOworCQlJUGF0aCBydW50aW1lUGF0aCA9IHBhdGgyLnNlZ21lbnRDb3VudCgpID4gMSA/IHBhdGgyLnJlbW92ZUxhc3RTZWdtZW50cygxKSA6IG5ldyBQYXRoKCIvIik7IC8vJE5PTi1OTFMtMSQKKwkJcnVudGltZVBhdGggPSBydW50aW1lUGF0aC5tYWtlUmVsYXRpdmUoKTsKKwkJcmVmLnNldFJ1bnRpbWVQYXRoKHJ1bnRpbWVQYXRoKTsKKwkJcmVmLnNldEFyY2hpdmVOYW1lKHBhdGgyLmxhc3RTZWdtZW50KCkpOworCQlyZXR1cm4gcmVmOworCX0KKwkKKwlwcml2YXRlIFN0cmluZ1tdIGZpbmRVbnVzZWRFbnRyaWVzKElWaXJ0dWFsUmVmZXJlbmNlW10gY3VycmVudCwgU3RyaW5nW10gZW50cmllcykgeworCQlBcnJheUxpc3Q8U3RyaW5nPiBsaXN0ID0gbmV3IEFycmF5TGlzdDxTdHJpbmc+KCk7CisJCWxpc3QuYWRkQWxsKEFycmF5cy5hc0xpc3QoZW50cmllcykpOworCQlmb3IoIGludCBpID0gMDsgaSA8IGN1cnJlbnQubGVuZ3RoOyBpKysgKSB7CisJCQlTdHJpbmcgY3VycmVudEVudHJ5ID0gY3VycmVudFtpXS5nZXRSdW50aW1lUGF0aCgpLmFwcGVuZChjdXJyZW50W2ldLmdldEFyY2hpdmVOYW1lKCkpLnRvU3RyaW5nKCk7CisJCQlsaXN0LnJlbW92ZShjdXJyZW50RW50cnkpOworCQl9CisJCXJldHVybiBsaXN0LnRvQXJyYXkobmV3IFN0cmluZ1tsaXN0LnNpemUoKV0pOworCX0KKwkKKwkvKioKKwkgKiBDbGllbnRzIHdobyBmaW5kIHRoaXMgdW5hY2NlcHRhYmxlIHNob3VsZCBvdmVycmlkZQorCSAqIEBwYXJhbSByb290CisJICogQHJldHVybgorCSAqLworCXB1YmxpYyBJRmlsZSBnZXRNYW5pZmVzdElGaWxlKElWaXJ0dWFsQ29tcG9uZW50IHJvb3QpIHsKKwkJSVZpcnR1YWxGb2xkZXIgcm9vdEZvbGRlciA9IHJvb3QuZ2V0Um9vdEZvbGRlcigpOworCQlJVmlydHVhbEZpbGUgdmYgPSByb290Rm9sZGVyLmdldEZpbGUobmV3IFBhdGgoIk1FVEEtSU5GL01BTklGRVNULk1GIikpOworCQlpZiggdmYuZXhpc3RzKCkgKQorCQkJcmV0dXJuIHZmLmdldFVuZGVybHlpbmdGaWxlKCk7CisJCXJldHVybiBudWxsOworCX0KKwkKKwlwcm90ZWN0ZWQgU3RyaW5nW10gZ2V0UG9zc2libGVQYXJlbnRQcm9qZWN0cygpIHsKKwkJSVByb2plY3RbXSBwcm9qZWN0cyA9IEphdmFNb2R1bGVDb21wb25lbnRVdGlsaXR5LmZpbmRQYXJlbnRQcm9qZWN0cyhwcm9qZWN0KTsKKwkJU3RyaW5nW10gc3RyaW5ncyA9IG5ldyBTdHJpbmdbcHJvamVjdHMubGVuZ3RoXTsKKwkJZm9yKCBpbnQgaSA9IDA7IGkgPCBwcm9qZWN0cy5sZW5ndGg7IGkrKyApIHsKKwkJCXN0cmluZ3NbaV0gPSBwcm9qZWN0c1tpXS5nZXROYW1lKCk7CisJCX0KKwkJcmV0dXJuIHN0cmluZ3M7CisJfQorCisKKwlwdWJsaWMgYm9vbGVhbiBwZXJmb3JtT2soKSB7CisJCWlmKGFkZEJ1dHRvbiAhPSBudWxsICYmIGFkZEJ1dHRvbi5pc0VuYWJsZWQoKSkgeworCQkJSURhdGFNb2RlbCB1cGRhdGVNYW5pZmVzdERhdGFNb2RlbCA9IERhdGFNb2RlbEZhY3RvcnkuY3JlYXRlRGF0YU1vZGVsKG5ldyBVcGRhdGVNYW5pZmVzdERhdGFNb2RlbFByb3ZpZGVyKCkpOworCQkJdXBkYXRlTWFuaWZlc3REYXRhTW9kZWwuc2V0UHJvcGVydHkoVXBkYXRlTWFuaWZlc3REYXRhTW9kZWxQcm9wZXJ0aWVzLlBST0pFQ1RfTkFNRSwgcHJvamVjdC5nZXROYW1lKCkpOworCQkJdXBkYXRlTWFuaWZlc3REYXRhTW9kZWwuc2V0Qm9vbGVhblByb3BlcnR5KFVwZGF0ZU1hbmlmZXN0RGF0YU1vZGVsUHJvcGVydGllcy5NRVJHRSwgZmFsc2UpOworCQkJdXBkYXRlTWFuaWZlc3REYXRhTW9kZWwuc2V0UHJvcGVydHkoVXBkYXRlTWFuaWZlc3REYXRhTW9kZWxQcm9wZXJ0aWVzLk1BTklGRVNUX0ZJTEUsIGdldE1hbmlmZXN0SUZpbGUocm9vdENvbXBvbmVudCkpOworCQkJQXJyYXlMaXN0PFN0cmluZz4gYXNTdHJpbmdzID0gbmV3IEFycmF5TGlzdDxTdHJpbmc+KCk7CisJCQlJdGVyYXRvcjxJVmlydHVhbFJlZmVyZW5jZT4gaSA9IGxpc3QuaXRlcmF0b3IoKTsKKwkJCUlWaXJ0dWFsUmVmZXJlbmNlIHRtcDsKKwkJCXdoaWxlKGkuaGFzTmV4dCgpKSB7CisJCQkJdG1wID0gaS5uZXh0KCk7CisJCQkJYXNTdHJpbmdzLmFkZCh0bXAuZ2V0UnVudGltZVBhdGgoKS5hcHBlbmQodG1wLmdldEFyY2hpdmVOYW1lKCkpLnRvU3RyaW5nKCkpOworCQkJfQorCQkJdXBkYXRlTWFuaWZlc3REYXRhTW9kZWwuc2V0UHJvcGVydHkoVXBkYXRlTWFuaWZlc3REYXRhTW9kZWxQcm9wZXJ0aWVzLkpBUl9MSVNULCBhc1N0cmluZ3MpOworCQkJdHJ5IHsKKwkJCQl1cGRhdGVNYW5pZmVzdERhdGFNb2RlbC5nZXREZWZhdWx0T3BlcmF0aW9uKCkuZXhlY3V0ZShuZXcgTnVsbFByb2dyZXNzTW9uaXRvcigpLCBudWxsICk7CisJCQl9IGNhdGNoIChFeGVjdXRpb25FeGNlcHRpb24gZSkgeworCQkJCS8vIFRPRE8gbG9nIEoyRUVVSVBsdWdpbi5sb2dFcnJvcihlKTsKKwkJCX0KKwkJfQorCisJCXJldHVybiB0cnVlOworCX0KKworCXB1YmxpYyB2b2lkIHBlcmZvcm1EZWZhdWx0cygpIHsKKwkJbGlzdC5jbGVhcigpOworCQlyZWZyZXNoVmlld2VyRnJvbU5ld1BhcmVudFByb2plY3QoKTsKKwl9CisKKwlwdWJsaWMgYm9vbGVhbiBwZXJmb3JtQ2FuY2VsKCkgeworCQlyZXR1cm4gZmFsc2U7CisJfQorCisJcHVibGljIHZvaWQgc2V0VmlzaWJsZShib29sZWFuIHZpc2libGUpIHsKKwl9CisKKwlwdWJsaWMgdm9pZCBkaXNwb3NlKCkgeworCX0KKworCXB1YmxpYyB2b2lkIHBlcmZvcm1BcHBseSgpIHsKKwkJSUZpbGUgbWFuaWZlc3QgPSBnZXRNYW5pZmVzdElGaWxlKHJvb3RDb21wb25lbnQpOworCQlpZihtYW5pZmVzdCA9PSBudWxsKSB7CisJCQlwcmV2aW91c01hbmlmZXN0ID0gbnVsbDsKKwkJCWFkZEJ1dHRvbi5zZXRFbmFibGVkKGZhbHNlKTsKKwkJCXBlcmZvcm1EZWZhdWx0cygpOworCQl9IGVsc2UgeworCQkJaWYocHJldmlvdXNNYW5pZmVzdCA9PSBudWxsKSB7CisJCQkJcGVyZm9ybURlZmF1bHRzKCk7CisJCQl9IGVsc2UgeworCQkJCVN0cmluZyBjdXJyZW50TWFuaWZlc3QgPSBtYW5pZmVzdC5nZXRGdWxsUGF0aCgpLnRvT1NTdHJpbmcoKTsKKwkJCQlpZighcHJldmlvdXNNYW5pZmVzdC5lcXVhbHMoY3VycmVudE1hbmlmZXN0KSkgeworCQkJCQlwZXJmb3JtRGVmYXVsdHMoKTsKKwkJCQl9CisJCQl9CisJCQlwcmV2aW91c01hbmlmZXN0ID0gbWFuaWZlc3QuZ2V0RnVsbFBhdGgoKS50b09TU3RyaW5nKCk7CisJCQlhZGRCdXR0b24uc2V0RW5hYmxlZCh0cnVlKTsKKwkJCQorCQl9CisJCXVwZGF0ZUJ1dHRvbnMoKTsKKwkJcGVyZm9ybU9rKCk7CisJfQorCit9CmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLmpzdC5jb21tb24udWkvc3JjL29yZy9lY2xpcHNlL2pzdC9jb21tb24vdWkvaW50ZXJuYWwvYXNzZW1ibHkvd2l6YXJkL1ZhcmlhYmxlUmVmZXJlbmNlV2l6YXJkRnJhZ21lbnQuamF2YSBiL3BsdWdpbnMvb3JnLmVjbGlwc2UuanN0LmNvbW1vbi51aS9zcmMvb3JnL2VjbGlwc2UvanN0L2NvbW1vbi91aS9pbnRlcm5hbC9hc3NlbWJseS93aXphcmQvVmFyaWFibGVSZWZlcmVuY2VXaXphcmRGcmFnbWVudC5qYXZhCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLmRjNGRlYTYKLS0tIC9kZXYvbnVsbAorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLmpzdC5jb21tb24udWkvc3JjL29yZy9lY2xpcHNlL2pzdC9jb21tb24vdWkvaW50ZXJuYWwvYXNzZW1ibHkvd2l6YXJkL1ZhcmlhYmxlUmVmZXJlbmNlV2l6YXJkRnJhZ21lbnQuamF2YQpAQCAtMCwwICsxLDI5NiBAQAorLyoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKgorICogQ29weXJpZ2h0IChjKSAyMDA5IFJlZCBIYXQKKyAqIEFsbCByaWdodHMgcmVzZXJ2ZWQuIFRoaXMgcHJvZ3JhbSBhbmQgdGhlIGFjY29tcGFueWluZyBtYXRlcmlhbHMKKyAqIGFyZSBtYWRlIGF2YWlsYWJsZSB1bmRlciB0aGUgdGVybXMgb2YgdGhlIEVjbGlwc2UgUHVibGljIExpY2Vuc2UgdjEuMAorICogd2hpY2ggYWNjb21wYW5pZXMgdGhpcyBkaXN0cmlidXRpb24sIGFuZCBpcyBhdmFpbGFibGUgYXQKKyAqIGh0dHA6Ly93d3cuZWNsaXBzZS5vcmcvbGVnYWwvZXBsLXYxMC5odG1sCisgKgorICogQ29udHJpYnV0b3JzOgorICogICAgUm9iIFN0cnlrZXIgLSBpbml0aWFsIGltcGxlbWVudGF0aW9uIGFuZCBvbmdvaW5nIG1haW50ZW5hbmNlCisgKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqLworcGFja2FnZSBvcmcuZWNsaXBzZS5qc3QuY29tbW9uLnVpLmludGVybmFsLmFzc2VtYmx5LndpemFyZDsKKworaW1wb3J0IGphdmEuaW8uRmlsZTsKK2ltcG9ydCBqYXZhLmlvLklPRXhjZXB0aW9uOworaW1wb3J0IGphdmEudXRpbC5BcnJheUxpc3Q7CitpbXBvcnQgamF2YS51dGlsLnppcC5aaXBFeGNlcHRpb247CitpbXBvcnQgamF2YS51dGlsLnppcC5aaXBGaWxlOworCitpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5yZXNvdXJjZXMuSUZpbGU7CitpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5yZXNvdXJjZXMuUmVzb3VyY2VzUGx1Z2luOworaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucnVudGltZS5Db3JlRXhjZXB0aW9uOworaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucnVudGltZS5JUGF0aDsKK2ltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJ1bnRpbWUuSVByb2dyZXNzTW9uaXRvcjsKK2ltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJ1bnRpbWUuSVN0YXR1czsKK2ltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJ1bnRpbWUuUGF0aDsKK2ltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJ1bnRpbWUuU3RhdHVzOworaW1wb3J0IG9yZy5lY2xpcHNlLmpkdC5jb3JlLkphdmFDb3JlOworaW1wb3J0IG9yZy5lY2xpcHNlLmpkdC5pbnRlcm5hbC51aS53aXphcmRzLmJ1aWxkcGF0aHMuQ1BWYXJpYWJsZUVsZW1lbnQ7CitpbXBvcnQgb3JnLmVjbGlwc2UuamR0LmludGVybmFsLnVpLndpemFyZHMuYnVpbGRwYXRocy5DUFZhcmlhYmxlRWxlbWVudExhYmVsUHJvdmlkZXI7CitpbXBvcnQgb3JnLmVjbGlwc2UuamZhY2Uudmlld2Vycy5JU2VsZWN0aW9uQ2hhbmdlZExpc3RlbmVyOworaW1wb3J0IG9yZy5lY2xpcHNlLmpmYWNlLnZpZXdlcnMuSVN0cnVjdHVyZWRTZWxlY3Rpb247CitpbXBvcnQgb3JnLmVjbGlwc2UuamZhY2Uudmlld2Vycy5JVHJlZUNvbnRlbnRQcm92aWRlcjsKK2ltcG9ydCBvcmcuZWNsaXBzZS5qZmFjZS52aWV3ZXJzLkxhYmVsUHJvdmlkZXI7CitpbXBvcnQgb3JnLmVjbGlwc2UuamZhY2Uudmlld2Vycy5TZWxlY3Rpb25DaGFuZ2VkRXZlbnQ7CitpbXBvcnQgb3JnLmVjbGlwc2UuamZhY2Uudmlld2Vycy5UcmVlVmlld2VyOworaW1wb3J0IG9yZy5lY2xpcHNlLmpmYWNlLnZpZXdlcnMuVmlld2VyOworaW1wb3J0IG9yZy5lY2xpcHNlLmpzdC5jb21tb24udWkuaW50ZXJuYWwuSUpzdENvbW1vblVJQ29udGV4dElkczsKK2ltcG9ydCBvcmcuZWNsaXBzZS5qc3QuY29tbW9uLnVpLmludGVybmFsLkpzdENvbW1vblVJUGx1Z2luOworaW1wb3J0IG9yZy5lY2xpcHNlLmpzdC5jb21tb24udWkuaW50ZXJuYWwuTWVzc2FnZXM7CitpbXBvcnQgb3JnLmVjbGlwc2Uuc3d0LlNXVDsKK2ltcG9ydCBvcmcuZWNsaXBzZS5zd3QuZ3JhcGhpY3MuSW1hZ2U7CitpbXBvcnQgb3JnLmVjbGlwc2Uuc3d0LmxheW91dC5Gb3JtQXR0YWNobWVudDsKK2ltcG9ydCBvcmcuZWNsaXBzZS5zd3QubGF5b3V0LkZvcm1EYXRhOworaW1wb3J0IG9yZy5lY2xpcHNlLnN3dC5sYXlvdXQuRm9ybUxheW91dDsKK2ltcG9ydCBvcmcuZWNsaXBzZS5zd3Qud2lkZ2V0cy5Db21wb3NpdGU7CitpbXBvcnQgb3JnLmVjbGlwc2UudWkuSVNoYXJlZEltYWdlczsKK2ltcG9ydCBvcmcuZWNsaXBzZS51aS5QbGF0Zm9ybVVJOworaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS5Db21wb25lbnRDb3JlOworaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS5pbnRlcm5hbC5yZXNvdXJjZXMuVmlydHVhbEFyY2hpdmVDb21wb25lbnQ7CitpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb21wb25lbnRjb3JlLmludGVybmFsLnJlc291cmNlcy5WaXJ0dWFsUmVmZXJlbmNlOworaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS5yZXNvdXJjZXMuSVZpcnR1YWxDb21wb25lbnQ7CitpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb21wb25lbnRjb3JlLnJlc291cmNlcy5JVmlydHVhbFJlZmVyZW5jZTsKK2ltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUudWkuaW50ZXJuYWwudGFza3dpemFyZC5JV2l6YXJkSGFuZGxlOworaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS51aS5pbnRlcm5hbC50YXNrd2l6YXJkLldpemFyZEZyYWdtZW50OworaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS51aS5wcm9wZXJ0eXBhZ2UuSVJlZmVyZW5jZVdpemFyZENvbnN0YW50czsKKworcHVibGljIGNsYXNzIFZhcmlhYmxlUmVmZXJlbmNlV2l6YXJkRnJhZ21lbnQgZXh0ZW5kcyBXaXphcmRGcmFnbWVudCB7CisJcHJvdGVjdGVkIExhYmVsUHJvdmlkZXIgbGFiZWxQcm92aWRlciA9IG51bGw7CisJcHJvdGVjdGVkIElUcmVlQ29udGVudFByb3ZpZGVyIGNvbnRlbnRQcm92aWRlciA9IG51bGw7CisJcHJvdGVjdGVkIFRyZWVWaWV3ZXIgdmlld2VyOworCXByb3RlY3RlZCBJUGF0aFtdIHBhdGhzOworCXByb3RlY3RlZCBJV2l6YXJkSGFuZGxlIGhhbmRsZTsKKwlwcm90ZWN0ZWQgT2JqZWN0IHNlbGVjdGVkID0gbnVsbDsKKwlib29sZWFuIGlzQ29tcGxldGUgPSBmYWxzZTsKKworCXB1YmxpYyBib29sZWFuIGlzQ29tcGxldGUoKSB7CisJCXJldHVybiBpc0NvbXBsZXRlOworCX0KKwkKKwlwdWJsaWMgYm9vbGVhbiBoYXNDb21wb3NpdGUoKSB7CisJCXJldHVybiB0cnVlOworCX0KKworCUBPdmVycmlkZQorCXB1YmxpYyBDb21wb3NpdGUgY3JlYXRlQ29tcG9zaXRlKENvbXBvc2l0ZSBwYXJlbnQsIElXaXphcmRIYW5kbGUgaGFuZGxlKSB7CisJCXRoaXMuaGFuZGxlID0gaGFuZGxlOworCQloYW5kbGUuc2V0VGl0bGUoTWVzc2FnZXMuVmFyaWFibGVSZWZlcmVuY2VUaXRsZSk7CisJCWhhbmRsZS5zZXREZXNjcmlwdGlvbihNZXNzYWdlcy5WYXJpYWJsZVJlZmVyZW5jZURlc2NyaXB0aW9uKTsKKwkJCQkKKwkJQ29tcG9zaXRlIGMgPSBuZXcgQ29tcG9zaXRlKHBhcmVudCwgU1dULk5PTkUpOworCQlQbGF0Zm9ybVVJLmdldFdvcmtiZW5jaCgpLmdldEhlbHBTeXN0ZW0oKS5zZXRIZWxwKGMsIElKc3RDb21tb25VSUNvbnRleHRJZHMuREVQTE9ZTUVOVF9BU1NFTUJMWV9ORVdfVkFSSUFCTEVfUkVGRVJFTkNFX1AxKTsKKwkJYy5zZXRMYXlvdXQobmV3IEZvcm1MYXlvdXQoKSk7CisJCXZpZXdlciA9IG5ldyBUcmVlVmlld2VyKGMsIFNXVC5TSU5HTEUgfCBTV1QuQk9SREVSKTsKKwkJdmlld2VyLnNldENvbnRlbnRQcm92aWRlcihnZXRDb250ZW50UHJvdmlkZXIoKSk7CisJCXZpZXdlci5zZXRMYWJlbFByb3ZpZGVyKGdldExhYmVsUHJvdmlkZXIoKSk7CisJCXZpZXdlci5zZXRJbnB1dChSZXNvdXJjZXNQbHVnaW4uZ2V0V29ya3NwYWNlKCkpOworCQl2aWV3ZXIuYWRkU2VsZWN0aW9uQ2hhbmdlZExpc3RlbmVyKG5ldyBJU2VsZWN0aW9uQ2hhbmdlZExpc3RlbmVyKCkgeworCQkJcHVibGljIHZvaWQgc2VsZWN0aW9uQ2hhbmdlZChTZWxlY3Rpb25DaGFuZ2VkRXZlbnQgZXZlbnQpIHsKKwkJCQloYW5kbGVOZXdTZWxlY3Rpb24oKTsKKwkJCX0KKwkJfSk7CisJCUZvcm1EYXRhIGZkID0gbmV3IEZvcm1EYXRhKCk7CisJCWZkLndpZHRoID0gMzkwOworCQlmZC5oZWlnaHQgPSAxODU7CisJCWZkLmxlZnQgPSBuZXcgRm9ybUF0dGFjaG1lbnQoMCwgNSk7CisJCWZkLnRvcCA9IG5ldyBGb3JtQXR0YWNobWVudCgwLCA1KTsKKwkJZmQucmlnaHQgPSBuZXcgRm9ybUF0dGFjaG1lbnQoMTAwLCAtNSk7CisJCWZkLmJvdHRvbSA9IG5ldyBGb3JtQXR0YWNobWVudCgxMDAsIC01KTsKKwkJdmlld2VyLmdldFRyZWUoKS5zZXRMYXlvdXREYXRhKGZkKTsKKwkJcmV0dXJuIGM7CisJfQorCQorCXByb3RlY3RlZCB2b2lkIGhhbmRsZU5ld1NlbGVjdGlvbigpIHsKKwkJaXNDb21wbGV0ZSA9IHRydWU7CisJCUlTdHJ1Y3R1cmVkU2VsZWN0aW9uIHNlbCA9IChJU3RydWN0dXJlZFNlbGVjdGlvbil2aWV3ZXIuZ2V0U2VsZWN0aW9uKCk7CisJCU9iamVjdCBvID0gc2VsLmdldEZpcnN0RWxlbWVudCgpOworCQlpZiggbyA9PSBudWxsICkgeworCQkJaXNDb21wbGV0ZSA9IGZhbHNlOworCQkJc2VsZWN0ZWQgPSBudWxsOworCQl9IGVsc2UgeworCQkJc2VsZWN0ZWQgPSBvOworCQkJSVBhdGggcCA9IG51bGw7CisJCQlpZiggbyBpbnN0YW5jZW9mIENQVmFyaWFibGVFbGVtZW50KSB7CisJCQkJcCA9ICgoQ1BWYXJpYWJsZUVsZW1lbnQpbykuZ2V0UGF0aCgpOworCQkJfSBlbHNlIGlmKCBvIGluc3RhbmNlb2YgRXh0ZW5kZWRWYXJpYWJsZSkgeworCQkJCXAgPSAoKEV4dGVuZGVkVmFyaWFibGUpbykuZWxlbWVudC5nZXRQYXRoKCkuYXBwZW5kKCgoRXh0ZW5kZWRWYXJpYWJsZSlvKS5wYXRoQWZ0ZXJFbGVtZW50KTsKKwkJCX0KKwkJCWlmKHAgPT0gbnVsbCB8fCBwLmlzRW1wdHkoKSB8fCBwLnRvRmlsZSgpLmlzRGlyZWN0b3J5KCkgfHwgIWlzVmFsaWRBcmNoaXZlKHApKSB7CisJCQkJaXNDb21wbGV0ZSA9IGZhbHNlOworCQkJfQorCQl9CisJCWhhbmRsZS51cGRhdGUoKTsKKwl9CisJCisJcHJvdGVjdGVkIExhYmVsUHJvdmlkZXIgZ2V0TGFiZWxQcm92aWRlcigpIHsKKwkJaWYgKGxhYmVsUHJvdmlkZXIgPT0gbnVsbCkgeworCQkJbGFiZWxQcm92aWRlcj0gbmV3IFZhcmlhYmxlc0xhYmVsUHJvdmlkZXIoKTsKKwkJfQorCQlyZXR1cm4gbGFiZWxQcm92aWRlcjsKKwl9CisJCisJcHVibGljIHN0YXRpYyBjbGFzcyBWYXJpYWJsZXNMYWJlbFByb3ZpZGVyIGV4dGVuZHMgTGFiZWxQcm92aWRlciB7CisJCXByaXZhdGUgQ1BWYXJpYWJsZUVsZW1lbnRMYWJlbFByb3ZpZGVyIGRlbGVnYXRlID0gbmV3IENQVmFyaWFibGVFbGVtZW50TGFiZWxQcm92aWRlcihmYWxzZSk7CisJCXB1YmxpYyBJbWFnZSBnZXRJbWFnZShPYmplY3QgZWxlbWVudCkgeworCQkJaWYoIGVsZW1lbnQgaW5zdGFuY2VvZiBDUFZhcmlhYmxlRWxlbWVudCkKKwkJCQlyZXR1cm4gZGVsZWdhdGUuZ2V0SW1hZ2UoZWxlbWVudCk7CisJCQlpZiggZWxlbWVudCBpbnN0YW5jZW9mIEV4dGVuZGVkVmFyaWFibGUpIHsKKwkJCQlpZigoKEV4dGVuZGVkVmFyaWFibGUpZWxlbWVudCkuaXNGb2xkZXIoKSkgCisJCQkJCXJldHVybiBQbGF0Zm9ybVVJLmdldFdvcmtiZW5jaCgpLmdldFNoYXJlZEltYWdlcygpLmdldEltYWdlKElTaGFyZWRJbWFnZXMuSU1HX09CSl9GT0xERVIpOworCQkJCXJldHVybiBQbGF0Zm9ybVVJLmdldFdvcmtiZW5jaCgpLmdldFNoYXJlZEltYWdlcygpLmdldEltYWdlKElTaGFyZWRJbWFnZXMuSU1HX09CSl9GSUxFKTsKKwkJCX0KKwkJCXJldHVybiBudWxsOworCQl9CisJCXB1YmxpYyBTdHJpbmcgZ2V0VGV4dChPYmplY3QgZWxlbWVudCkgeworCQkJaWYoIGVsZW1lbnQgaW5zdGFuY2VvZiBDUFZhcmlhYmxlRWxlbWVudCkKKwkJCQlyZXR1cm4gZGVsZWdhdGUuZ2V0VGV4dChlbGVtZW50KTsKKwkJCWlmKCBlbGVtZW50IGluc3RhbmNlb2YgRXh0ZW5kZWRWYXJpYWJsZSkgCisJCQkJcmV0dXJuICgoRXh0ZW5kZWRWYXJpYWJsZSllbGVtZW50KS5wYXRoQWZ0ZXJFbGVtZW50Lmxhc3RTZWdtZW50KCk7CisJCQlyZXR1cm4gZWxlbWVudCA9PSBudWxsID8gIiIgOiBlbGVtZW50LnRvU3RyaW5nKCk7Ly8kTk9OLU5MUy0xJAorCQl9CQorCX0KKwkKKwlwdWJsaWMgc3RhdGljIGNsYXNzIEV4dGVuZGVkVmFyaWFibGUgeworCQlwdWJsaWMgQ1BWYXJpYWJsZUVsZW1lbnQgZWxlbWVudDsKKwkJcHVibGljIElQYXRoIHBhdGhBZnRlckVsZW1lbnQ7CisJCXB1YmxpYyBFeHRlbmRlZFZhcmlhYmxlKENQVmFyaWFibGVFbGVtZW50IGUsIElQYXRoIHApIHsKKwkJCWVsZW1lbnQgPSBlOworCQkJcGF0aEFmdGVyRWxlbWVudCA9IHA7CisJCX0KKwkJcHVibGljIGJvb2xlYW4gaXNGb2xkZXIoKSB7CisJCQlyZXR1cm4gZWxlbWVudC5nZXRQYXRoKCkuYXBwZW5kKHBhdGhBZnRlckVsZW1lbnQpLnRvRmlsZSgpLmlzRGlyZWN0b3J5KCk7CisJCX0KKwl9CisJCisJcHJpdmF0ZSBDUFZhcmlhYmxlRWxlbWVudFtdIGVsZW1lbnRzOworCXByaXZhdGUgQ1BWYXJpYWJsZUVsZW1lbnRbXSBpbml0aWFsaXplRWxlbWVudHMoKSB7CisJCVN0cmluZ1tdIGVudHJpZXM9IEphdmFDb3JlLmdldENsYXNzcGF0aFZhcmlhYmxlTmFtZXMoKTsKKwkJQXJyYXlMaXN0IGVsZW1lbnRzPSBuZXcgQXJyYXlMaXN0KGVudHJpZXMubGVuZ3RoKTsKKwkJZm9yIChpbnQgaT0gMDsgaSA8IGVudHJpZXMubGVuZ3RoOyBpKyspIHsKKwkJCVN0cmluZyBuYW1lPSBlbnRyaWVzW2ldOworCQkJSVBhdGggZW50cnlQYXRoPSBKYXZhQ29yZS5nZXRDbGFzc3BhdGhWYXJpYWJsZShuYW1lKTsKKwkJCWlmIChlbnRyeVBhdGggIT0gbnVsbCkgeworCQkJCWVsZW1lbnRzLmFkZChuZXcgQ1BWYXJpYWJsZUVsZW1lbnQobmFtZSwgZW50cnlQYXRoKSk7CisJCQl9CisJCX0KKwkJcmV0dXJuIChDUFZhcmlhYmxlRWxlbWVudFtdKSBlbGVtZW50cy50b0FycmF5KG5ldyBDUFZhcmlhYmxlRWxlbWVudFtlbGVtZW50cy5zaXplKCldKTsKKwl9CisKKwkKKwlwcm90ZWN0ZWQgSVRyZWVDb250ZW50UHJvdmlkZXIgZ2V0Q29udGVudFByb3ZpZGVyKCkgeworCQlpZiAoY29udGVudFByb3ZpZGVyID09IG51bGwpIHsKKwkJCWNvbnRlbnRQcm92aWRlciA9IG5ldyBJVHJlZUNvbnRlbnRQcm92aWRlcigpIHsKKwkJCQlwdWJsaWMgT2JqZWN0W10gZ2V0RWxlbWVudHMoT2JqZWN0IGlucHV0RWxlbWVudCkgeworCQkJCQlpZiggZWxlbWVudHMgPT0gbnVsbCApCisJCQkJCQllbGVtZW50cyA9IGluaXRpYWxpemVFbGVtZW50cygpOworCQkJCQlyZXR1cm4gZWxlbWVudHM7CisJCQkJfQorCQkJCXB1YmxpYyB2b2lkIGlucHV0Q2hhbmdlZChWaWV3ZXIgdmlld2VyLCBPYmplY3Qgb2xkSW5wdXQsIE9iamVjdCBuZXdJbnB1dCkgeworCQkJCX0KKwkJCQlwdWJsaWMgdm9pZCBkaXNwb3NlKCkgeworCQkJCX0KKwkJCQlwdWJsaWMgYm9vbGVhbiBoYXNDaGlsZHJlbihPYmplY3QgZWxlbWVudCkgeworCQkJCQlyZXR1cm4gZ2V0Q2hpbGRyZW4oZWxlbWVudCkubGVuZ3RoID4gMDsKKwkJCQl9CisJCQkJcHVibGljIE9iamVjdCBnZXRQYXJlbnQoT2JqZWN0IGVsZW1lbnQpIHsKKwkJCQkJcmV0dXJuIG51bGw7CisJCQkJfQorCQkJCXB1YmxpYyBPYmplY3RbXSBnZXRDaGlsZHJlbihPYmplY3QgcGFyZW50RWxlbWVudCkgeworCQkJCQlpZiggcGFyZW50RWxlbWVudCBpbnN0YW5jZW9mIENQVmFyaWFibGVFbGVtZW50KSB7CisJCQkJCQlpZigoKENQVmFyaWFibGVFbGVtZW50KXBhcmVudEVsZW1lbnQpLmdldFBhdGgoKS50b0ZpbGUoKS5pc0RpcmVjdG9yeSgpKSB7CisJCQkJCQkJU3RyaW5nW10gbmFtZXMgPSAoKENQVmFyaWFibGVFbGVtZW50KXBhcmVudEVsZW1lbnQpLmdldFBhdGgoKS50b0ZpbGUoKS5saXN0KCk7CisJCQkJCQkJRXh0ZW5kZWRWYXJpYWJsZVtdIGV4dGVuc2lvbnMgPSBuZXcgRXh0ZW5kZWRWYXJpYWJsZVtuYW1lcy5sZW5ndGhdOworCQkJCQkJCWZvciggaW50IGkgPSAwOyBpIDwgZXh0ZW5zaW9ucy5sZW5ndGg7IGkrKyApCisJCQkJCQkJCWV4dGVuc2lvbnNbaV0gPSBuZXcgRXh0ZW5kZWRWYXJpYWJsZSgoQ1BWYXJpYWJsZUVsZW1lbnQpcGFyZW50RWxlbWVudCwgbmV3IFBhdGgobmFtZXNbaV0pKTsKKwkJCQkJCQlyZXR1cm4gZXh0ZW5zaW9uczsKKwkJCQkJCX0KKwkJCQkJfQorCQkJCQlpZiggcGFyZW50RWxlbWVudCBpbnN0YW5jZW9mIEV4dGVuZGVkVmFyaWFibGUpIHsKKwkJCQkJCUV4dGVuZGVkVmFyaWFibGUgcDEgPSAoRXh0ZW5kZWRWYXJpYWJsZSlwYXJlbnRFbGVtZW50OworCQkJCQkJSVBhdGggcGFyZW50TG9jID0gcDEuZWxlbWVudC5nZXRQYXRoKCk7CisJCQkJCQlwYXJlbnRMb2MgPSBwYXJlbnRMb2MuYXBwZW5kKHAxLnBhdGhBZnRlckVsZW1lbnQpOworCQkJCQkJU3RyaW5nW10gbmFtZXMgPSBwYXJlbnRMb2MudG9GaWxlKCkubGlzdCgpOworCQkJCQkJaWYoIG5hbWVzICE9IG51bGwgKSB7CisJCQkJCQkJRXh0ZW5kZWRWYXJpYWJsZVtdIGV4dGVuc2lvbnMgPSBuZXcgRXh0ZW5kZWRWYXJpYWJsZVtuYW1lcy5sZW5ndGhdOworCQkJCQkJCWZvciggaW50IGkgPSAwOyBpIDwgZXh0ZW5zaW9ucy5sZW5ndGg7IGkrKyApCisJCQkJCQkJCWV4dGVuc2lvbnNbaV0gPSBuZXcgRXh0ZW5kZWRWYXJpYWJsZShwMS5lbGVtZW50LCBwMS5wYXRoQWZ0ZXJFbGVtZW50LmFwcGVuZChuYW1lc1tpXSkpOworCQkJCQkJCXJldHVybiBleHRlbnNpb25zOworCQkJCQkJfQorCQkJCQl9CisJCQkJCXJldHVybiBuZXcgT2JqZWN0W117fTsKKwkJCQl9CisJCQl9OworCQl9CisJCXJldHVybiBjb250ZW50UHJvdmlkZXI7CisJfQorCisJcHVibGljIHZvaWQgcGVyZm9ybUZpbmlzaChJUHJvZ3Jlc3NNb25pdG9yIG1vbml0b3IpIHRocm93cyBDb3JlRXhjZXB0aW9uIHsKKwkJSVZpcnR1YWxDb21wb25lbnQgcm9vdENvbXBvbmVudCA9IChJVmlydHVhbENvbXBvbmVudClnZXRUYXNrTW9kZWwoKS5nZXRPYmplY3QoSVJlZmVyZW5jZVdpemFyZENvbnN0YW50cy5ST09UX0NPTVBPTkVOVCk7CisJCVN0cmluZyBydW50aW1lTG9jID0gKFN0cmluZylnZXRUYXNrTW9kZWwoKS5nZXRPYmplY3QoSVJlZmVyZW5jZVdpemFyZENvbnN0YW50cy5ERUZBVUxUX0xJQlJBUllfTE9DQVRJT04pOworCQlpZiAoc2VsZWN0ZWQgIT0gbnVsbCApIHsKKwkJCUFycmF5TGlzdDxJVmlydHVhbFJlZmVyZW5jZT4gcmVmTGlzdCA9IG5ldyBBcnJheUxpc3Q8SVZpcnR1YWxSZWZlcmVuY2U+KCk7CisvLwkJCWZvciAoaW50IGkgPSAwOyBpIDwgc2VsZWN0ZWQubGVuZ3RoOyBpKyspIHsKKwkJCQlJUGF0aCB2YXJpYWJsZVBhdGggPSBnZXRWYXJpYWJsZVBhdGgoc2VsZWN0ZWQpOworCQkJCUlQYXRoIHJlc29sdmVkUGF0aCA9IEphdmFDb3JlLmdldFJlc29sdmVkVmFyaWFibGVQYXRoKHZhcmlhYmxlUGF0aCk7CisJCQkJamF2YS5pby5GaWxlIGZpbGUgPSBuZXcgamF2YS5pby5GaWxlKHJlc29sdmVkUGF0aC50b09TU3RyaW5nKCkpOworCQkJCWlmIChmaWxlLmlzRmlsZSgpICYmIGZpbGUuZXhpc3RzKCkpIHsKKwkJCQkJU3RyaW5nIHR5cGUgPSBWaXJ0dWFsQXJjaGl2ZUNvbXBvbmVudC5WQVJBUkNISVZFVFlQRQorCQkJCQkJCSsgSVBhdGguU0VQQVJBVE9SOworCQkJCQlJVmlydHVhbENvbXBvbmVudCBhcmNoaXZlID0gQ29tcG9uZW50Q29yZQorCQkJCQkJCS5jcmVhdGVBcmNoaXZlQ29tcG9uZW50KHJvb3RDb21wb25lbnQuZ2V0UHJvamVjdCgpLAorCQkJCQkJCQkJdHlwZSArIHZhcmlhYmxlUGF0aC50b1N0cmluZygpKTsKKwkJCQkJVmlydHVhbFJlZmVyZW5jZSByZWYgPSBuZXcgVmlydHVhbFJlZmVyZW5jZShyb290Q29tcG9uZW50LCBhcmNoaXZlKTsKKwkJCQkJcmVmLnNldEFyY2hpdmVOYW1lKHJlc29sdmVkUGF0aC5sYXN0U2VnbWVudCgpKTsKKwkJCQkJaWYgKHJ1bnRpbWVMb2MgIT0gbnVsbCkgeworCQkJCQkJcmVmLnNldFJ1bnRpbWVQYXRoKG5ldyBQYXRoKHJ1bnRpbWVMb2MpLm1ha2VBYnNvbHV0ZSgpKTsKKwkJCQkJfQorCQkJCQlyZWZMaXN0LmFkZChyZWYpOworCQkJCX0KKy8vCQkJfQorCQkJSVZpcnR1YWxSZWZlcmVuY2VbXSBmaW5hbFJlZnMgPSByZWZMaXN0LnRvQXJyYXkobmV3IElWaXJ0dWFsUmVmZXJlbmNlW3JlZkxpc3Quc2l6ZSgpXSk7CisJCQlnZXRUYXNrTW9kZWwoKS5wdXRPYmplY3QoSVJlZmVyZW5jZVdpemFyZENvbnN0YW50cy5GSU5BTF9SRUZFUkVOQ0UsIGZpbmFsUmVmcyk7CisJCX0KKwl9CisJCisJcHJpdmF0ZSBJUGF0aCBnZXRWYXJpYWJsZVBhdGgoT2JqZWN0IHNlbGVjdGVkKSB7CisJCWlmKCBzZWxlY3RlZCBpbnN0YW5jZW9mIEV4dGVuZGVkVmFyaWFibGUpIHsKKwkJCUV4dGVuZGVkVmFyaWFibGUgczEgPSAoRXh0ZW5kZWRWYXJpYWJsZSlzZWxlY3RlZDsKKwkJCXJldHVybiBuZXcgUGF0aChzMS5lbGVtZW50LmdldE5hbWUoKSkuYXBwZW5kKHMxLnBhdGhBZnRlckVsZW1lbnQpOworCQl9CisJCXJldHVybiBuZXcgUGF0aCgoKENQVmFyaWFibGVFbGVtZW50KXNlbGVjdGVkKS5nZXROYW1lKCkpOworCX0KKwkKKwlwcml2YXRlIGJvb2xlYW4gaXNWYWxpZEFyY2hpdmUoSVBhdGggcGF0aCkgeworCQlib29sZWFuIHZhbGlkID0gdHJ1ZTsKKwkJWmlwRmlsZSB6aXBGaWxlID0gbnVsbDsKKwkJdHJ5IHsKKwkJCVN0cmluZyBvc1BhdGggPSBudWxsOworCQkJaWYocGF0aC5zZWdtZW50Q291bnQoKSA+IDEpeworCQkJCUlGaWxlIGZpbGUgPSBSZXNvdXJjZXNQbHVnaW4uZ2V0V29ya3NwYWNlKCkuZ2V0Um9vdCgpLmdldEZpbGUocGF0aCk7CisJCQkJaWYoZmlsZS5leGlzdHMoKSkgeworCQkJCQlJUGF0aCBsb2MgPSBmaWxlLmdldExvY2F0aW9uKCk7CisJCQkJCWlmKGxvYyAhPSBudWxsKSB7IAorCQkJCQkJb3NQYXRoID0gbG9jLnRvT1NTdHJpbmcoKTsKKwkJCQkJfQorCQkJCX0KKwkJCX0KKwkJCWlmKG9zUGF0aCA9PSBudWxsKXsKKwkJCQlvc1BhdGggPSBwYXRoLnRvT1NTdHJpbmcoKTsKKwkJCX0KKwkJCXppcEZpbGUgPSBuZXcgWmlwRmlsZShuZXcgRmlsZShvc1BhdGgpKTsKKwkJfSBjYXRjaCAoWmlwRXhjZXB0aW9uIGUxKXsKKwkJCXZhbGlkID0gZmFsc2U7CisJCX0gY2F0Y2ggKElPRXhjZXB0aW9uIGUyKXsKKwkJCXZhbGlkID0gZmFsc2U7CisJCX1maW5hbGx5IHsKKwkJCWlmICh6aXBGaWxlICE9IG51bGwpeworCQkJCXRyeSB7CisJCQkJCXppcEZpbGUuY2xvc2UoKTsKKwkJCQl9IGNhdGNoIChJT0V4Y2VwdGlvbiBlKSB7CisJCQkJCUpzdENvbW1vblVJUGx1Z2luLmdldERlZmF1bHQoKS5nZXRMb2coKS5sb2cobmV3IFN0YXR1cyhJU3RhdHVzLkVSUk9SLCBKc3RDb21tb25VSVBsdWdpbi5QTFVHSU5fSUQsIGUuZ2V0TWVzc2FnZSgpLCBlKSk7CisJCQkJfQorCQkJfQorCQl9CisJCXJldHVybiB2YWxpZDsKKwl9Cit9CmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLmpzdC5jb21tb24udWkvc3JjL29yZy9lY2xpcHNlL2pzdC9jb21tb24vdWkvaW50ZXJuYWwvbWVzc2FnZXMucHJvcGVydGllcyBiL3BsdWdpbnMvb3JnLmVjbGlwc2UuanN0LmNvbW1vbi51aS9zcmMvb3JnL2VjbGlwc2UvanN0L2NvbW1vbi91aS9pbnRlcm5hbC9tZXNzYWdlcy5wcm9wZXJ0aWVzCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLmE0M2U2ZjcKLS0tIC9kZXYvbnVsbAorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLmpzdC5jb21tb24udWkvc3JjL29yZy9lY2xpcHNlL2pzdC9jb21tb24vdWkvaW50ZXJuYWwvbWVzc2FnZXMucHJvcGVydGllcwpAQCAtMCwwICsxLDIyIEBACitBcmNoaXZlVGl0bGU9QWRkIGFuIEFyY2hpdmUgUmVmZXJlbmNlCitBcmNoaXZlRGVzY3JpcHRpb249SGVyZSB5b3UgY2FuIHJlZmVyZW5jZSBhIHdvcmtzcGFjZSBhcmNoaXZlCitBcmNoaXZlRGlhbG9nTmV3VGl0bGU9QXJjaGl2ZSBTZWxlY3Rpb24KK0FyY2hpdmVEaWFsb2dOZXdEZXNjcmlwdGlvbj0mQ2hvb3NlIHRoZSBhcmNoaXZlcyB0byBiZSBhZGRlZCB0byB0aGUgYnVpbGQgcGF0aDoKK0V4dGVybmFsQXJjaGl2ZVRpdGxlPUFkZCBhbiBFeHRlcm5hbCBBcmNoaXZlIFJlZmVyZW5jZQorRXh0ZXJuYWxBcmNoaXZlRGVzY3JpcHRpb249SGVyZSB5b3UgY2FuIHJlZmVyZW5jZSBhIGZpbGVzeXN0ZW0gYXJjaGl2ZQorQnJvd3NlPUJyJm93c2UuLi4KK1ZhcmlhYmxlUmVmZXJlbmNlVGl0bGU9QWRkIGEgVmFyaWFibGUgUmVmZXJlbmNlCitWYXJpYWJsZVJlZmVyZW5jZURlc2NyaXB0aW9uPUhlcmUgeW91IGNhbiByZWZlcmVuY2UgYSB2YXJpYWJsZSB3aGljaCBtYXBzIHRvIGEgc2luZ2xlIGphcgorQWRkTWFuaWZlc3RFbnRyeVRhc2tXaXphcmRUaXRsZT1BZGQgTWFuaWZlc3QgRW50cnkKK0FkZE1hbmlmZXN0RW50cnlUYXNrV2l6YXJkRGVzYz1UbyBhZGQgbWFuaWZlc3QgZW50cmllcyB0aGF0IHNob3VsZCBiZSBhY2Nlc3NpYmxlIGF0IHJ1bnRpbWUsXG5zZWxlY3Qgb25lIG9yIG1vcmUgZGVzaXJlZCBlbnRyaWVzIGFuZCBwcmVzcyAiRmluaXNoIgorUGFyZW50UHJvamVjdHM9JlBhcmVudCBQcm9qZWN0czogCitDdXN0b21FbnRyeUJ1dHRvbj0mQWRkIEN1c3RvbSBFbnRyeQorQWRkPSZBZGQuLi4KK1JlbW92ZT0mUmVtb3ZlCitNb3ZlVXA9TW92ZSAmVXAKK01vdmVEb3duPU1vdmUgJkRvd24KK01hbmlmZXN0RW50cmllcz0mTWFuaWZlc3QgRW50cmllczoKK01hbmlmZXN0RW50cnlDb2x1bW49TWFuaWZlc3QgRW50cnkKK01hbmlmZXN0RW50cnlTb3VyY2VDb2x1bW49U291cmNlCitDb25maWd1cmVQYXJlbnRMaW5rPUNvbmZpZ3VyZSBBdmFpbGFibGUgTWFuaWZlc3QgRW50cmllcworSW52YWxpZEFyY2hpdmVzV2FybmluZz1UaGUgZm9sbG93aW5nIGZpbGVzIHdlcmUgbm90IGFkZGVkIGJlY2F1c2UgdGhleSBhcmUgbm90IGFyY2hpdmUgZmlsZXMgb3IgYXJlIGNvcnJ1cHRlZDogClwgTm8gbmV3bGluZSBhdCBlbmQgb2YgZmlsZQpkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvcmUvTUVUQS1JTkYvTUFOSUZFU1QuTUYgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uY29yZS9NRVRBLUlORi9NQU5JRkVTVC5NRgppbmRleCAzNGRiODRjLi5hMWU2ZTJmIDEwMDY0NAotLS0gYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uY29yZS9NRVRBLUlORi9NQU5JRkVTVC5NRgorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uY29yZS9NRVRBLUlORi9NQU5JRkVTVC5NRgpAQCAtMiw3ICsyLDcgQEAKIEJ1bmRsZS1NYW5pZmVzdFZlcnNpb246IDIKIEJ1bmRsZS1OYW1lOiAlcGx1Z2luTmFtZQogQnVuZGxlLVN5bWJvbGljTmFtZTogb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb3JlOyBzaW5nbGV0b246PXRydWUKLUJ1bmRsZS1WZXJzaW9uOiAxLjEuMjAxLnF1YWxpZmllcgorQnVuZGxlLVZlcnNpb246IDEuMi4wLnF1YWxpZmllcgogQnVuZGxlLUFjdGl2YXRvcjogb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb3JlLnNlYXJjaC5TZWFyY2hQbHVnaW4KIEJ1bmRsZS1Mb2NhbGl6YXRpb246IHBsdWdpbgogRXhwb3J0LVBhY2thZ2U6IG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29yZS5zZWFyY2gsCkBAIC0xMCw3ICsxMCw4IEBACiAgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb3JlLnNlYXJjaC5pbnRlcm5hbDt4LWludGVybmFsOj10cnVlLAogIG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29yZS5zZWFyY2gucGF0dGVybiwKICBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvcmUuc2VhcmNoLnNjb3BlLAotIG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29yZS5zZWFyY2gudXRpbAorIG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29yZS5zZWFyY2gudXRpbCwKKyBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvcmUudXRpbAogUmVxdWlyZS1CdW5kbGU6IG9yZy5lY2xpcHNlLmNvcmUucnVudGltZTtidW5kbGUtdmVyc2lvbj0iWzMuNC4wLDQuMC4wKSIsCiAgb3JnLmVjbGlwc2UuY29yZS5yZXNvdXJjZXM7YnVuZGxlLXZlcnNpb249IlszLjQuMCw0LjAuMCkiLAogIG9yZy5lY2xpcHNlLmNvcmUuZXhwcmVzc2lvbnM7YnVuZGxlLXZlcnNpb249IlszLjQuMCw0LjAuMCkiCmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uY29yZS9wbHVnaW4ueG1sIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvcmUvcGx1Z2luLnhtbAppbmRleCBjODJmNmEwLi41ZDJhNjIxIDEwMDY0NAotLS0gYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uY29yZS9wbHVnaW4ueG1sCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb3JlL3BsdWdpbi54bWwKQEAgLTEsNyArMSw5IEBACiA8P3htbCB2ZXJzaW9uPSIxLjAiIGVuY29kaW5nPSJVVEYtOCI/PgogPD9lY2xpcHNlIHZlcnNpb249IjMuMCI/PgogPHBsdWdpbj4KLSAgIDxleHRlbnNpb24tcG9pbnQgaWQ9InNlYXJjaFBhcnRpY2lwYW50cyIgbmFtZT0iJXNlYXJjaFBhcnRpY2lwYW50cyIgLz4gICAgICAKKyAgIDxleHRlbnNpb24tcG9pbnQgaWQ9InNlYXJjaFBhcnRpY2lwYW50cyIgbmFtZT0iJXNlYXJjaFBhcnRpY2lwYW50cyIgLz4KKyAgIDxleHRlbnNpb24tcG9pbnQgaWQ9InVpVGVzdGVyIiBuYW1lPSJVSSBUZXN0ZXIiIHNjaGVtYT0ic2NoZW1hL3VpVGVzdGVyLmV4c2QiLz4KKyAgIDxleHRlbnNpb24tcG9pbnQgaWQ9InVpQ29udGV4dFNlbnNpdGl2ZUNsYXNzIiBuYW1lPSJVSSBDb250ZXh0IFNlbnNpdGl2ZSBDbGFzcyIgc2NoZW1hPSJzY2hlbWEvdWlDb250ZXh0U2Vuc2l0aXZlQ2xhc3MuZXhzZCIvPgogPC9wbHVnaW4+CiAKIApkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvcmUvc2NoZW1hL3VpQ29udGV4dFNlbnNpdGl2ZUNsYXNzLmV4c2QgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uY29yZS9zY2hlbWEvdWlDb250ZXh0U2Vuc2l0aXZlQ2xhc3MuZXhzZApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi5jMThjZjFhCi0tLSAvZGV2L251bGwKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvcmUvc2NoZW1hL3VpQ29udGV4dFNlbnNpdGl2ZUNsYXNzLmV4c2QKQEAgLTAsMCArMSwxNjUgQEAKKzw/eG1sIHZlcnNpb249JzEuMCcgZW5jb2Rpbmc9J1VURi04Jz8+Cis8IS0tIFNjaGVtYSBmaWxlIHdyaXR0ZW4gYnkgUERFIC0tPgorPHNjaGVtYSB0YXJnZXROYW1lc3BhY2U9Im9yZy5lY2xpcHNlLndzdC5jb21tb24uY29yZSIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDEvWE1MU2NoZW1hIj4KKzxhbm5vdGF0aW9uPgorICAgICAgPGFwcGluZm8+CisgICAgICAgICA8bWV0YS5zY2hlbWEgcGx1Z2luPSJvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvcmUiIGlkPSJ1aUNvbnRleHRTZW5zaXRpdmVDbGFzcyIgbmFtZT0iVUkgQ29udGV4dCBTZW5zaXRpdmUgQ2xhc3MiLz4KKyAgICAgIDwvYXBwaW5mbz4KKyAgICAgIDxkb2N1bWVudGF0aW9uPgorICAgICAgICAgQ29tcG9uZW50cyBhcmUgb2Z0ZW4gZGVzaWduZWQgaW4gc3VjaCBhIHdheSB0aGF0IHRoZSAmcXVvdDtIZWFkbGVzcyZxdW90OyBvciBub24tZ3JhcGhpY2FsIHBvcnRpb25zIGFyZSBzZXBhcmF0ZSBmcm9tIHRoZSBHcmFwaGljYWwgVXNlciBJbnRlcmZhY2UgKEdVSSkgcG9ydGlvbnMuIFNvbWV0aW1lcyB0aGlzIGlzIGRvbmUgdG8gZm9sbG93IGdvb2QgZGVzaWduIHByaW5jaXBsZXMsIG90aGVyIHRpbWVzIHRoZXJlIGlzIGEgc3BlY2lmaWMgdXNlIGNhc2UgZm9yIGRvaW5nIHNvLiBXaGVuIHBsdWdpbnMgZm9sbG93IHRoaXMgcHJhY3RpY2UgYmVjYXVzZSB0aGV5IG11c3QgdmFyeSB0aGVpciBiZWhhdmlvciBiYXNlZCBvbiB3aGV0aGVyIHRoZXkgYXJlIHJ1bm5pbmcgaW4gYSBoZWFkbGVzcyBlbnZpcm9ubWVudCBvciBhIGdyYXBoaWNhbCBlbnZpcm9ubWVudCwgdGhleSBvZnRlbiBuZWVkIHRvIGNob29zZSB0aGUgY29ycmVjdCBpbXBsZW1lbnRhdGlvbiBvZiBhIHBhcnRpY3VsYXIgdHlwZS4gVGhlIG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29yZS51aUNvbnRleHRTZW5zaXRpdmVDbGFzcyBleHRlbnNpb24gcG9pbnQgcHJvdmlkZWQgYnkgdGhlIFdTVCBjb21wb25lbnQgc29sdmVzIGV4YWN0bHkgdGhpcyBwcm9ibGVtLgorJmx0O3AmZ3Q7ICAgIAorVG8gdXNlIHRoZSBleHRlbnNpb24gcG9pbnQsIHlvdSBtdXN0IHByb3ZpZGUgdHdvIGV4dGVuc2lvbnMgdGhhdCBhcmUgbGlua2VkIGJ5IGEga2V5LiBUaGUga2V5IGlzIGEgdW5pcXVlIFN0cmluZy1iYXNlZCB2YWx1ZSB0aGF0IHlvdSB3aWxsIGxhdGVyIHVzZSB0byBpbnN0YW5pdGF0ZSB5b3VyIGNsYXNzLgorJmx0O3AmZ3Q7CitUaGUgZmlyc3QgdXNhZ2Ugb2YgdGhlIGV4dGVuc2lvbiBzcGVjaWZpZXMgeW91ciBrZXksIGFuZCB0aGUgSGVhZGxlc3MgY29udGV4dCwgYW5kIHRoZSBjbGFzcyB0aGF0IHNob3VsZCBiZSBpbnN0YW50aWF0ZWQgZm9yIHRoaXMgKGtleSwgY29udGV4dCkgcGFpci4gVGhpcyBtZWFucyBpbiB0aGUgaGVhZGxlc3MgZW52aXJvbm1lbnQgdGhpcyBjbGFzcyB3aWxsIGJlIGluc3RhbnRpYXRlZCB3aGVuIHJlcXVlc3RlZC4KKyZsdDtwJmd0OworVGhlIHNlY29uZCBleHRlbnNpb24gc3BlY2lmaWVzIHRoZSBVSSBjb250ZXh0IGFuZCB0aGUgc2FtZSBrZXksIGJ1dCBhIGRpZmZlcmVudCBpbXBsZW1lbnRhdGlvbiBkZXNpZ25lZCBmb3IgZ3JhcGhpY2FsIGVudmlyb25tZW50cy4gVGhpcyBtZWFucyBpbiB0aGUgVUkgZW52aXJvbm1lbnQgdGhpcyBvdGhlciBjbGFzcyB3aWxsIGJlIGluc3RhbnRpYXRlZCB3aGVuIHJlcXVlc3RlZC4KKyZsdDtwJmd0OworVGhlIGFjdHVhbCByZXF1ZXN0IGlzIGRvbmUgaW4geW91ciBjb2RlIHZpYToKKyZsdDtwcmUmZ3Q7CitJTXlJbnRlcmZhY2UgaW5zdGFuY2UgPSAoSU15SW50ZXJmYWNlKSBVSUNvbnRleHREZXRlcm1pbmF0aW9uLmNyZWF0ZUluc3RhbmNlKCZxdW90O215S2V5JnF1b3Q7KTsKKyZsdDsvcHJlJmd0Oword2hlcmUgJmx0O2NvZGUmZ3Q7JnF1b3Q7bXlLZXkmcXVvdDsmbHQ7L2NvZGUmZ3Q7IGlzIHRoZSBrZXkgdXNlZCBvbiBib3RoIGV4dGVuc2lvbnMuIEl0IHdpbGwgdGhlbiBjaG9vc2UgZWl0aGVyIHRoZSBVSSBvciB0aGUgSGVhZGxlc3MgZXh0ZW5zaW9uIGRlcGVuZGluZyB1cG9uIHRoZSBjb250ZXh0LgorICAgICAgPC9kb2N1bWVudGF0aW9uPgorICAgPC9hbm5vdGF0aW9uPgorCisgICA8ZWxlbWVudCBuYW1lPSJleHRlbnNpb24iPgorICAgICAgPGFubm90YXRpb24+CisgICAgICAgICA8YXBwaW5mbz4KKyAgICAgICAgICAgIDxtZXRhLmVsZW1lbnQgLz4KKyAgICAgICAgIDwvYXBwaW5mbz4KKyAgICAgIDwvYW5ub3RhdGlvbj4KKyAgICAgIDxjb21wbGV4VHlwZT4KKyAgICAgICAgIDxzZXF1ZW5jZT4KKyAgICAgICAgICAgIDxlbGVtZW50IHJlZj0idWlDb250ZXh0U2Vuc2l0aXZlQ2xhc3MiIG1pbk9jY3Vycz0iMSIgbWF4T2NjdXJzPSJ1bmJvdW5kZWQiLz4KKyAgICAgICAgIDwvc2VxdWVuY2U+CisgICAgICAgICA8YXR0cmlidXRlIG5hbWU9InBvaW50IiB0eXBlPSJzdHJpbmciIHVzZT0icmVxdWlyZWQiPgorICAgICAgICAgICAgPGFubm90YXRpb24+CisgICAgICAgICAgICAgICA8ZG9jdW1lbnRhdGlvbj4KKyAgICAgICAgICAgICAgICAgIAorICAgICAgICAgICAgICAgPC9kb2N1bWVudGF0aW9uPgorICAgICAgICAgICAgPC9hbm5vdGF0aW9uPgorICAgICAgICAgPC9hdHRyaWJ1dGU+CisgICAgICAgICA8YXR0cmlidXRlIG5hbWU9ImlkIiB0eXBlPSJzdHJpbmciPgorICAgICAgICAgICAgPGFubm90YXRpb24+CisgICAgICAgICAgICAgICA8ZG9jdW1lbnRhdGlvbj4KKyAgICAgICAgICAgICAgICAgIAorICAgICAgICAgICAgICAgPC9kb2N1bWVudGF0aW9uPgorICAgICAgICAgICAgPC9hbm5vdGF0aW9uPgorICAgICAgICAgPC9hdHRyaWJ1dGU+CisgICAgICAgICA8YXR0cmlidXRlIG5hbWU9Im5hbWUiIHR5cGU9InN0cmluZyI+CisgICAgICAgICAgICA8YW5ub3RhdGlvbj4KKyAgICAgICAgICAgICAgIDxkb2N1bWVudGF0aW9uPgorICAgICAgICAgICAgICAgICAgCisgICAgICAgICAgICAgICA8L2RvY3VtZW50YXRpb24+CisgICAgICAgICAgICA8L2Fubm90YXRpb24+CisgICAgICAgICA8L2F0dHJpYnV0ZT4KKyAgICAgIDwvY29tcGxleFR5cGU+CisgICA8L2VsZW1lbnQ+CisKKyAgIDxlbGVtZW50IG5hbWU9InVpQ29udGV4dFNlbnNpdGl2ZUNsYXNzIj4KKyAgICAgIDxhbm5vdGF0aW9uPgorICAgICAgICAgPGRvY3VtZW50YXRpb24+CisgICAgICAgICAgICBBbiBleHRlbnNpb24gcG9pbnQgdGhhdCBkZWZpbmVzIGFuIGluc3RhbmNlIG9mIGEgY2xhc3MgYW5kIGl0cyBhcHByb3ByaWF0ZSBjb250ZXh0IChVSSBvciBIZWFkbGVzcykKKyAgICAgICAgIDwvZG9jdW1lbnRhdGlvbj4KKyAgICAgIDwvYW5ub3RhdGlvbj4KKyAgICAgIDxjb21wbGV4VHlwZT4KKyAgICAgICAgIDxhdHRyaWJ1dGUgbmFtZT0ia2V5IiB0eXBlPSJzdHJpbmciIHVzZT0icmVxdWlyZWQiPgorICAgICAgICAgICAgPGFubm90YXRpb24+CisgICAgICAgICAgICAgICA8ZG9jdW1lbnRhdGlvbj4KKyAgICAgICAgICAgICAgICAgIFRoZSBrZXkgdGhhdCBzaG91bGQgYmUgdXNlZCB0byBjcmVhdGUgYW4gaW5zdGFuY2Ugb2YgdGhlIENvbnRleHQgU2Vuc2l0aXZlIHN1cGVyIGNsYXNzL2ludGVyZmFjZS4KKyAgICAgICAgICAgICAgIDwvZG9jdW1lbnRhdGlvbj4KKyAgICAgICAgICAgIDwvYW5ub3RhdGlvbj4KKyAgICAgICAgIDwvYXR0cmlidXRlPgorICAgICAgICAgPGF0dHJpYnV0ZSBuYW1lPSJjbGFzc05hbWUiIHR5cGU9InN0cmluZyIgdXNlPSJyZXF1aXJlZCI+CisgICAgICAgICAgICA8YW5ub3RhdGlvbj4KKyAgICAgICAgICAgICAgIDxkb2N1bWVudGF0aW9uPgorICAgICAgICAgICAgICAgICAgQSBjb25jcmV0ZSBpbXBsZW1lbnRhdGlvbiBmb3IgZWl0aGVyIGEgVUkgb3IgSGVhZGxlc3MgY29udGV4dC4KKyAgICAgICAgICAgICAgIDwvZG9jdW1lbnRhdGlvbj4KKyAgICAgICAgICAgIDwvYW5ub3RhdGlvbj4KKyAgICAgICAgIDwvYXR0cmlidXRlPgorICAgICAgICAgPGF0dHJpYnV0ZSBuYW1lPSJjb250ZXh0IiB1c2U9InJlcXVpcmVkIj4KKyAgICAgICAgICAgIDxhbm5vdGF0aW9uPgorICAgICAgICAgICAgICAgPGRvY3VtZW50YXRpb24+CisgICAgICAgICAgICAgICAgICBPbmUgb2YgJnF1b3Q7VUkmcXVvdDsgb3IgJnF1b3Q7SGVhZGxlc3MmcXVvdDsgVGhpcyBpcyBjYXNlLXNlbnNpdGl2ZS4gSXQgbXVzdCBtYXRjaCBleGFjdGx5IGFzIHNob3duIGhlcmUuCisgICAgICAgICAgICAgICA8L2RvY3VtZW50YXRpb24+CisgICAgICAgICAgICA8L2Fubm90YXRpb24+CisgICAgICAgICAgICA8c2ltcGxlVHlwZT4KKyAgICAgICAgICAgICAgIDxyZXN0cmljdGlvbiBiYXNlPSJzdHJpbmciPgorICAgICAgICAgICAgICAgICAgPGVudW1lcmF0aW9uIHZhbHVlPSJVSSI+CisgICAgICAgICAgICAgICAgICA8L2VudW1lcmF0aW9uPgorICAgICAgICAgICAgICAgICAgPGVudW1lcmF0aW9uIHZhbHVlPSJIZWFkbGVzcyI+CisgICAgICAgICAgICAgICAgICA8L2VudW1lcmF0aW9uPgorICAgICAgICAgICAgICAgPC9yZXN0cmljdGlvbj4KKyAgICAgICAgICAgIDwvc2ltcGxlVHlwZT4KKyAgICAgICAgIDwvYXR0cmlidXRlPgorICAgICAgPC9jb21wbGV4VHlwZT4KKyAgIDwvZWxlbWVudD4KKworICAgPGFubm90YXRpb24+CisgICAgICA8YXBwaW5mbz4KKyAgICAgICAgIDxtZXRhLnNlY3Rpb24gdHlwZT0iYXBpSW5mbyIvPgorICAgICAgPC9hcHBpbmZvPgorICAgICAgPGRvY3VtZW50YXRpb24+CisgICAgICAgICBTZWUgJmx0O2NvZGUmZ3Q7b3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb3JlLnV0aWwuVUlDb250ZXh0RGV0ZXJtaW5hdGlvbiZsdDsvY29kZSZndDsKKyAgICAgIDwvZG9jdW1lbnRhdGlvbj4KKyAgIDwvYW5ub3RhdGlvbj4KKworICAgPGFubm90YXRpb24+CisgICAgICA8YXBwaW5mbz4KKyAgICAgICAgIDxtZXRhLnNlY3Rpb24gdHlwZT0ic2luY2UiLz4KKyAgICAgIDwvYXBwaW5mbz4KKyAgICAgIDxkb2N1bWVudGF0aW9uPgorICAgICAgICAgNi4wCisgICAgICA8L2RvY3VtZW50YXRpb24+CisgICA8L2Fubm90YXRpb24+CisKKyAgIDxhbm5vdGF0aW9uPgorICAgICAgPGFwcGluZm8+CisgICAgICAgICA8bWV0YS5zZWN0aW9uIHR5cGU9ImV4YW1wbGVzIi8+CisgICAgICA8L2FwcGluZm8+CisgICAgICA8ZG9jdW1lbnRhdGlvbj4KKyAgICAgICAgIFVzYWdlIGZvciB0aGUgVUkgY29udGV4dDoKKyZsdDtwcmUmZ3Q7CisgICAmbHQ7ZXh0ZW5zaW9uCisgICAgICAgaWQ9JnF1b3Q7Y29udGV4dC5TZW5zaXRpdmUuQ2xhc3Mud29ya2luZ0NvcHlNYW5hZ2VyJnF1b3Q7CisgICAgICAgbmFtZT0mcXVvdDtXb3JraW5nIENvcHkgTWFuYWdlciAtIFVJIENvbnRleHQgQ2xhc3MmcXVvdDsKKyAgICAgICBwb2ludD0mcXVvdDtvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvcmUuQ29udGV4dFNlbnNpdGl2ZUNsYXNzJnF1b3Q7Jmd0OworICAgICAmbHQ7dWlDb250ZXh0U2Vuc2l0aXZlQ2xhc3MKKyAgICAgICBjb250ZXh0PSZxdW90O1VJJnF1b3Q7CisgICAgICAga2V5PSZxdW90O3dvcmtpbmdDb3B5TWFuYWdlciZxdW90OworICAgICAgIGNsYXNzTmFtZT0mcXVvdDtjb20uaWJtLnd0cC5jb21tb24udWkuV1RQVUlXb3JraW5nQ29weU1hbmFnZXImcXVvdDsvJmd0OworICAgJmx0Oy9leHRlbnNpb24mZ3Q7CismbHQ7L3ByZSZndDsKKyZsdDticiZndDsKK1VzYWdlIGZvciB0aGUgSGVhZGxlc3MgY29udGV4dDoKKyZsdDtwcmUmZ3Q7CisgICAmbHQ7ZXh0ZW5zaW9uCisgICAgICAgaWQ9JnF1b3Q7Y29udGV4dC5TZW5zaXRpdmUuQ2xhc3Mud29ya2luZ0NvcHlNYW5hZ2VyJnF1b3Q7CisgICAgICAgbmFtZT0mcXVvdDtXb3JraW5nIENvcHkgTWFuYWdlciAtIEhlYWRsZXNzIENvbnRleHQgQ2xhc3MmcXVvdDsKKyAgICAgICBwb2ludD0mcXVvdDtvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvcmUuQ29udGV4dFNlbnNpdGl2ZUNsYXNzJnF1b3Q7Jmd0OworICAgICAmbHQ7dWlDb250ZXh0U2Vuc2l0aXZlQ2xhc3MKKyAgICAgICAgIGNvbnRleHQ9JnF1b3Q7SGVhZGxlc3MmcXVvdDsKKyAgICAgICAgIGtleT0mcXVvdDt3b3JraW5nQ29weU1hbmFnZXImcXVvdDsKKyAgICAgICAgIGNsYXNzTmFtZT0mcXVvdDtjb20uaWJtLnd0cC5jb21tb24udWkuV1RQSGVhZGxlc3NXb3JraW5nQ29weU1hbmFnZXImcXVvdDsvJmd0OworICAgJmx0Oy9leHRlbnNpb24mZ3Q7CismbHQ7L3ByZSZndDsKKyZsdDticiZndDsKK0FuZCBmaW5hbGx5IHRoZSByZXRyaWV2YWwgb2YgdGhlIGNsYXNzIGZvciB0aGUgY3VycmVudCBjb250ZXh0OgorCismbHQ7cHJlJmd0OworSVdvcmtpbmdDb3B5TWFuYWdlciBtYW5hZ2VyID0gKElXb3JraW5nQ29weU1hbmFnZXIpIFVJQ29udGV4dERldGVybWluYXRpb24uY3JlYXRlSW5zdGFuY2UoJnF1b3Q7d29ya2luZ0NvcHlNYW5hZ2VyJnF1b3Q7KTsKKyZsdDsvcHJlJmd0OworICAgICAgPC9kb2N1bWVudGF0aW9uPgorICAgPC9hbm5vdGF0aW9uPgorCisKKyAgIDxhbm5vdGF0aW9uPgorICAgICAgPGFwcGluZm8+CisgICAgICAgICA8bWV0YS5zZWN0aW9uIHR5cGU9ImNvcHlyaWdodCIvPgorICAgICAgPC9hcHBpbmZvPgorICAgICAgPGRvY3VtZW50YXRpb24+CisgICAgICAgICBDb3B5cmlnaHQgKGMpIElCTSAyMDAzLgorICAgICAgPC9kb2N1bWVudGF0aW9uPgorICAgPC9hbm5vdGF0aW9uPgorCis8L3NjaGVtYT4KZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb3JlL3NjaGVtYS91aVRlc3Rlci5leHNkIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvcmUvc2NoZW1hL3VpVGVzdGVyLmV4c2QKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uZGY4YmI0OAotLS0gL2Rldi9udWxsCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb3JlL3NjaGVtYS91aVRlc3Rlci5leHNkCkBAIC0wLDAgKzEsMTMzIEBACis8P3htbCB2ZXJzaW9uPScxLjAnIGVuY29kaW5nPSdVVEYtOCc/PgorPCEtLSBTY2hlbWEgZmlsZSB3cml0dGVuIGJ5IFBERSAtLT4KKzxzY2hlbWEgdGFyZ2V0TmFtZXNwYWNlPSJvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvcmUiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAxL1hNTFNjaGVtYSI+Cis8YW5ub3RhdGlvbj4KKyAgICAgIDxhcHBpbmZvPgorICAgICAgICAgPG1ldGEuc2NoZW1hIHBsdWdpbj0ib3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb3JlIiBpZD0idWlUZXN0ZXIiIG5hbWU9IlVJIFRlc3RlciIvPgorICAgICAgPC9hcHBpbmZvPgorICAgICAgPGRvY3VtZW50YXRpb24+CisgICAgICAgICBUaGlzIGlzIHVzZWQgdG8gdGVsbCBXU1QgdGhhdCBpdCBpcyBydW5uaW5nIGluIGEgbm9uLUhFQURMRVNTIGVudmlyb25tZW50LiBUeXBpY2FsbHkgVUkgZW52aXJvbm1lbnQgaXMgbm9uLUhFQURMRVNTLiBUaGUgZGVmYXVsdCBpZiB0aGVyZSBhcmUgbm8gaW1wbGVtZW50ZXJzIG9mIHRoaXMgZXh0ZW5zaW9uIHBvaW50IHRoYXQgcmV0dXJuIHRydWUgaXMgSEVBRExFU1MuCismbHQ7cCZndDsKK0EgSEVBRExFU1MgZW52aXJvbm1lbnQgaXMgdHlwaWNhbGx5IGEgYmF0Y2ggc2l0dWF0aW9uIHdoZXJlIHRoZXJlIGlzIG5vIFVJIGFuZCB0aGUgd29ya3NwYWNlIGlzIHVzZWQgZm9yIG9uZSBvcGVyYXRpb24gYW5kIHRoZW4gdGVybWluYXRlZC4gTW9zdCBoZWFkbGVzcyB0YXNrcyBhcmUgZG9uZSB1bmRlciBvbmUgb3BlcmF0aW9uIGFuZCB0aGUgSmF2YVJlZmxlY3Rpb25TeW5jaHJvbml6ZXIgbWF5IG5vdCBoYXZlIGEgY2hhbmNlIHRvIGZsdXNoIGEgYmFkIHJlZmxlY3Rpb24gYmVmb3JlIHRoZSByZWFsIHR5cGUgbmVlZHMgdG8gYmUgZm91bmQgYW5kIGNhbiBiZSBmb3VuZC4gU28gd2hhdCB3b3VsZCBoYXBwZW4gaXMgaWYgYSBjbGFzcyB3YXMgY3JlYXRlZCBkdXJpbmcgdGhpcyBvbmUgb3BlcmF0aW9uIGl0IHdvdWxkIG5vdCBiZSBmb3VuZCBiZWNhdXNlIHRoZSBub3RpZmljYXRpb25zIGhhZCBub3QgeWV0IGdvbmUgb3V0LiAKKyZsdDtwJmd0OworSW4gYSBVSSBlbnZpcm9ubWVudCB0aGUgb3BlcmF0aW9ucyBhcmUgdHlwaWNhbGx5IHNob3J0IGFuZCBkbyBvbmx5IGEgZmV3IHRoaW5ncyBhbmQgdGhlIHJlc3VsdHMgYXJlbiZhcG9zO3QgbmVlZGVkIHVudGlsIGFmdGVyIHRoZSBvcGVyYXRpb24gaGFzIGNvbXBsZXRlZC4gSW4gdGhhdCBjYXNlIGl0IGlzIG1vcmUgZWZmaWNpZW50IHRvIG5vdCBrZWVwIGNoZWNraW5nIGlmIGEgY2xhc3MgaGFzIGFwcGVhcmVkIGV2ZXJ5dGltZSBhIHJlcXVlc3QgaXMgbWFkZSwgaW5zdGVhZCBpdCB3aWxsIHdhaXQgZm9yIHRoZSBub3RpZmljYXRpb24gb2YgdGhlIGFkZGVkIGNsYXNzIHRvIGFwcGVhciBiZWZvcmUgcmVzZXR0aW5nIHRoZSBkZWZpbml0aW9uIHRvIGFsbG93IGNoZWNraW5nIGFnYWluIGxhdGVyLgorJmx0O3AmZ3Q7CitJZiB0aGVyZSBpcyBtb3JlIHRoYW4gb25lIGltcGxlbWVudGVyIG9mIHRoaXMgaW50ZXJmYWNlIGluIHRoZSBhcHBsaWNhdGlvbiwgdGhlbiBpdCB3aWxsIGdvIHRocm91Z2ggZWFjaCBvZiB0aGVtIG9uY2UgdW50aWwgb25lIHJldHVybnMgdHJ1ZS4gQXMgc29vbiBhcyBvbmUgcmV0dXJucyB0cnVlIGl0IHdpbGwgc3RvcCBhbmQgbWFyayB0aGUgYXBwbGljYXRpb24gYXMgYmVpbmcgbm9uLUhFQURMRVNTLiBUaGlzIHdpbGwgYmUgZG9uZSBvbmx5IG9uY2UgZm9yIHRoZSBhcHBsaWNhdGlvbi4gSXQgd2lsbCBub3QgYmUgYWdhaW4gdW50aWwgdGhlIG5leHQgc2Vzc2lvbiBvZiB0aGUgYXBwbGljYXRpb24uCismbHQ7cCZndDsKK1RoaXMgaXMgdHlwaWNhbGx5IGFuIGludGVybmFsIGV4dGVuc2lvbiBwb2ludCBvbmx5LiBUaGUgV1NUIFVJIHBsdWdpbiB3aWxsIHByb3ZpZGUgYW4gaW1wbGVtZW50YXRpb24gdGhhdCB3aWxsIHJldHVybiB0cnVlIGlmIHRoZSBQbGF0Zm9ybSBVSSBpcyBhY3RpdmUuIFNvIHRoaXMgd2lsbCBub3JtYWxseSBub3QgYmUgbmVlZGVkIHRvIGJlIGltcGxlbWVudGVkIGJ5IG1vc3QgY3VzdG9tZXJzLgorICAgICAgPC9kb2N1bWVudGF0aW9uPgorICAgPC9hbm5vdGF0aW9uPgorCisgICA8ZWxlbWVudCBuYW1lPSJleHRlbnNpb24iPgorICAgICAgPGFubm90YXRpb24+CisgICAgICAgICA8YXBwaW5mbz4KKyAgICAgICAgICAgIDxtZXRhLmVsZW1lbnQgLz4KKyAgICAgICAgIDwvYXBwaW5mbz4KKyAgICAgIDwvYW5ub3RhdGlvbj4KKyAgICAgIDxjb21wbGV4VHlwZT4KKyAgICAgICAgIDxzZXF1ZW5jZT4KKyAgICAgICAgICAgIDxlbGVtZW50IHJlZj0idWlUZXN0ZXIiLz4KKyAgICAgICAgIDwvc2VxdWVuY2U+CisgICAgICAgICA8YXR0cmlidXRlIG5hbWU9InBvaW50IiB0eXBlPSJzdHJpbmciIHVzZT0icmVxdWlyZWQiPgorICAgICAgICAgICAgPGFubm90YXRpb24+CisgICAgICAgICAgICAgICA8ZG9jdW1lbnRhdGlvbj4KKyAgICAgICAgICAgICAgICAgIAorICAgICAgICAgICAgICAgPC9kb2N1bWVudGF0aW9uPgorICAgICAgICAgICAgPC9hbm5vdGF0aW9uPgorICAgICAgICAgPC9hdHRyaWJ1dGU+CisgICAgICAgICA8YXR0cmlidXRlIG5hbWU9ImlkIiB0eXBlPSJzdHJpbmciPgorICAgICAgICAgICAgPGFubm90YXRpb24+CisgICAgICAgICAgICAgICA8ZG9jdW1lbnRhdGlvbj4KKyAgICAgICAgICAgICAgICAgIAorICAgICAgICAgICAgICAgPC9kb2N1bWVudGF0aW9uPgorICAgICAgICAgICAgPC9hbm5vdGF0aW9uPgorICAgICAgICAgPC9hdHRyaWJ1dGU+CisgICAgICAgICA8YXR0cmlidXRlIG5hbWU9Im5hbWUiIHR5cGU9InN0cmluZyI+CisgICAgICAgICAgICA8YW5ub3RhdGlvbj4KKyAgICAgICAgICAgICAgIDxkb2N1bWVudGF0aW9uPgorICAgICAgICAgICAgICAgICAgCisgICAgICAgICAgICAgICA8L2RvY3VtZW50YXRpb24+CisgICAgICAgICAgICA8L2Fubm90YXRpb24+CisgICAgICAgICA8L2F0dHJpYnV0ZT4KKyAgICAgIDwvY29tcGxleFR5cGU+CisgICA8L2VsZW1lbnQ+CisKKyAgIDxlbGVtZW50IG5hbWU9InVpVGVzdGVyIj4KKyAgICAgIDxhbm5vdGF0aW9uPgorICAgICAgICAgPGRvY3VtZW50YXRpb24+CisgICAgICAgICAgICBUaGUgdWlUZXN0ZXIgZGVmaW5pdGlvbiBlbGVtZW50LgorICAgICAgICAgPC9kb2N1bWVudGF0aW9uPgorICAgICAgPC9hbm5vdGF0aW9uPgorICAgICAgPGNvbXBsZXhUeXBlPgorICAgICAgICAgPGF0dHJpYnV0ZSBuYW1lPSJjbGFzc05hbWUiIHR5cGU9InN0cmluZyIgdXNlPSJyZXF1aXJlZCI+CisgICAgICAgICAgICA8YW5ub3RhdGlvbj4KKyAgICAgICAgICAgICAgIDxkb2N1bWVudGF0aW9uPgorICAgICAgICAgICAgICAgICAgVGhlIGNsYXNzIG5hbWUgb2YgdGhlIFVJVGVzdGVyIGZvciB0aGlzIGV4dGVuc2lvbi4gSXQgbXVzdCBpbXBsZW1lbnQgJmx0O3NhbXAmZ3Q7b3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb3JlLnV0aWwuVUlUZXN0ZXImbHQ7L3NhbXAmZ3Q7LgorICAgICAgICAgICAgICAgPC9kb2N1bWVudGF0aW9uPgorICAgICAgICAgICAgICAgPGFwcGluZm8+CisgICAgICAgICAgICAgICAgICA8bWV0YS5hdHRyaWJ1dGUga2luZD0iamF2YSIgYmFzZWRPbj0ib3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb3JlLnV0aWwuVUlUZXN0ZXIiLz4KKyAgICAgICAgICAgICAgIDwvYXBwaW5mbz4KKyAgICAgICAgICAgIDwvYW5ub3RhdGlvbj4KKyAgICAgICAgIDwvYXR0cmlidXRlPgorICAgICAgPC9jb21wbGV4VHlwZT4KKyAgIDwvZWxlbWVudD4KKworICAgPGFubm90YXRpb24+CisgICAgICA8YXBwaW5mbz4KKyAgICAgICAgIDxtZXRhLnNlY3Rpb24gdHlwZT0iYXBpSW5mbyIvPgorICAgICAgPC9hcHBpbmZvPgorICAgICAgPGRvY3VtZW50YXRpb24+CisgICAgICAgICBUaGUgJmx0O3NhbXAmZ3Q7Y2xhc3NOYW1lJmx0Oy9zYW1wJmd0OyBhdHRyaWJ1dGUgbXVzdCBiZSBhIGZ1bGx5LXF1YWxpZmllZCBjbGFzcyB0aGF0IGltcGxlbWVudHMgdGhlICZsdDtzYW1wJmd0O29yZy5lY2xpcHNlLndzdC5jb21tb24uY29yZS51dGlsLlVJVGVzdGVyJmx0Oy9zYW1wJmd0OyBpbnRlcmZhY2UgZm9yIHRoZSB0ZXN0ZXIuCisgICAgICA8L2RvY3VtZW50YXRpb24+CisgICA8L2Fubm90YXRpb24+CisKKyAgIDxhbm5vdGF0aW9uPgorICAgICAgPGFwcGluZm8+CisgICAgICAgICA8bWV0YS5zZWN0aW9uIHR5cGU9InNpbmNlIi8+CisgICAgICA8L2FwcGluZm8+CisgICAgICA8ZG9jdW1lbnRhdGlvbj4KKyAgICAgICAgIDEuMC4wCisgICAgICA8L2RvY3VtZW50YXRpb24+CisgICA8L2Fubm90YXRpb24+CisKKyAgIDxhbm5vdGF0aW9uPgorICAgICAgPGFwcGluZm8+CisgICAgICAgICA8bWV0YS5zZWN0aW9uIHR5cGU9ImV4YW1wbGVzIi8+CisgICAgICA8L2FwcGluZm8+CisgICAgICA8ZG9jdW1lbnRhdGlvbj4KKyAgICAgICAgIFRoZSBmb2xsb3dpbmcgaXMgYW4gZXhhbXBsZSBvZiBhbiBpbXBsZW1lbnRlcjogCisKKyZsdDtwJmd0OworJmx0O3ByZSZndDsKKyAmbHQ7ZXh0ZW5zaW9uIHBvaW50PSZxdW90O29yZy5lY2xpcHNlLndzdC5jb21tb24uY29yZS51aVRlc3RlciZxdW90OyZndDsKKyAgJmx0O3VpVGVzdGVyCisgICBjbGFzc05hbWU9JnF1b3Q7Y29tLmV4YW1wbGUuVUlUZXN0ZXJJbXBsZW1lbnRhdGlvbiZxdW90Oy8mZ3Q7CisgJmx0Oy9leHRlbnNpb24mZ3Q7CismbHQ7L3ByZSZndDsKKyZsdDsvcCZndDsKKyAgICAgIDwvZG9jdW1lbnRhdGlvbj4KKyAgIDwvYW5ub3RhdGlvbj4KKworICAgPGFubm90YXRpb24+CisgICAgICA8YXBwaW5mbz4KKyAgICAgICAgIDxtZXRhLnNlY3Rpb24gdHlwZT0iaW1wbGVtZW50YXRpb24iLz4KKyAgICAgIDwvYXBwaW5mbz4KKyAgICAgIDxkb2N1bWVudGF0aW9uPgorICAgICAgICAgVGhlcmUgaXMgbm8gZGVmYXVsdCBpbXBsZW1lbnRhdGlvbiBmb3IgdGhpcyBjbGFzcy4KKyAgICAgIDwvZG9jdW1lbnRhdGlvbj4KKyAgIDwvYW5ub3RhdGlvbj4KKworICAgPGFubm90YXRpb24+CisgICAgICA8YXBwaW5mbz4KKyAgICAgICAgIDxtZXRhLnNlY3Rpb24gdHlwZT0iY29weXJpZ2h0Ii8+CisgICAgICA8L2FwcGluZm8+CisgICAgICA8ZG9jdW1lbnRhdGlvbj4KKyAgICAgICAgIENvcHlyaWdodCAoYykgMjAwNCwgMjAwNiBJQk0gQ29ycG9yYXRpb24gYW5kIG90aGVycy4mbHQ7YnImZ3Q7CitBbGwgcmlnaHRzIHJlc2VydmVkLiBUaGlzIHByb2dyYW0gYW5kIHRoZSBhY2NvbXBhbnlpbmcgbWF0ZXJpYWxzIGFyZSBtYWRlIAorYXZhaWxhYmxlIHVuZGVyIHRoZSB0ZXJtcyBvZiB0aGUgRWNsaXBzZSBQdWJsaWMgTGljZW5zZSB2MS4wIHdoaWNoIGFjY29tcGFuaWVzIAordGhpcyBkaXN0cmlidXRpb24sIGFuZCBpcyBhdmFpbGFibGUgYXQgCismbHQ7YSBocmVmPSZxdW90O2h0dHA6Ly93d3cuZWNsaXBzZS5vcmcvbGVnYWwvZXBsLXYxMC5odG1sJnF1b3Q7Jmd0O2h0dHA6Ly93d3cuZWNsaXBzZS5vcmcvbGVnYWwvZXBsLXYxMC5odG1sJmx0Oy9hJmd0OworICAgICAgPC9kb2N1bWVudGF0aW9uPgorICAgPC9hbm5vdGF0aW9uPgorCis8L3NjaGVtYT4KZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb3JlL3NyYy1zZWFyY2gvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9jb3JlL3NlYXJjaC9TZWFyY2hQbHVnaW4uamF2YSBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb3JlL3NyYy1zZWFyY2gvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9jb3JlL3NlYXJjaC9TZWFyY2hQbHVnaW4uamF2YQppbmRleCBjZjdhOWZjLi41ZDhjMzAzIDEwMDY0NAotLS0gYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uY29yZS9zcmMtc2VhcmNoL29yZy9lY2xpcHNlL3dzdC9jb21tb24vY29yZS9zZWFyY2gvU2VhcmNoUGx1Z2luLmphdmEKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvcmUvc3JjLXNlYXJjaC9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2NvcmUvc2VhcmNoL1NlYXJjaFBsdWdpbi5qYXZhCkBAIC0xMyw3ICsxMywxMSBAQAogCiBpbXBvcnQgamF2YS51dGlsLk1hcDsKIAoraW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucnVudGltZS5Db3JlRXhjZXB0aW9uOworaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucnVudGltZS5JU3RhdHVzOworaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucnVudGltZS5QbGF0Zm9ybTsKIGltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJ1bnRpbWUuUGx1Z2luOworaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucnVudGltZS5TdGF0dXM7CiBpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb3JlLnNlYXJjaC5pbnRlcm5hbC5TZWFyY2hQYXJ0aWNpcGFudFJlZ2lzdHJ5OwogaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29yZS5zZWFyY2guaW50ZXJuYWwuU2VhcmNoUGFydGljaXBhbnRSZWdpc3RyeVJlYWRlcjsKIGltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvcmUuc2VhcmNoLnBhdHRlcm4uU2VhcmNoUGF0dGVybjsKQEAgLTMwLDYgKzM0LDIxIEBACiAgKi8KIHB1YmxpYyBjbGFzcyBTZWFyY2hQbHVnaW4gZXh0ZW5kcyBQbHVnaW4gaW1wbGVtZW50cyBJU2VhcmNoT3B0aW9ucwogeworCS8vdGhlIElEIGZvciB0aGlzIHBsdWdpbiAoYWRkZWQgYXV0b21hdGljYWxseSBieSBsb2dnaW5nIHF1aWNrZml4KQorCXB1YmxpYyBzdGF0aWMgZmluYWwgU3RyaW5nIFBMVUdJTl9JRCA9ICJvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvcmUiOyAvLyROT04tTkxTLTEkCisKKwkvKioKKwkgKiBVSSBDb250ZXh0IGV4dGVuc2lvbiBwb2ludC4KKwkgKiAKKwkgKiBAc2luY2UgMS4wLjAKKwkgKi8KKwlwdWJsaWMgc3RhdGljIGZpbmFsIFN0cmluZyBVSV9DT05URVhUX0VYVEVOU0lPTl9QT0lOVCA9ICJ1aUNvbnRleHRTZW5zaXRpdmVDbGFzcyI7IC8vJE5PTi1OTFMtMSQKKwkvKioKKwkgKiBVSVRlc3RlciBlbGVtZW50IG5hbWUuCisJICogCisJICogQHNpbmNlIDEuMC4wCisJICovCisJcHVibGljIHN0YXRpYyBmaW5hbCBTdHJpbmcgVUlfVEVTVEVSX0VYVEVOU0lPTl9QT0lOVCA9ICJ1aVRlc3RlciI7IC8vJE5PTi1OTFMtMSQKIAogCXByaXZhdGUgU2VhcmNoUGFydGljaXBhbnRSZWdpc3RyeSBzZWFyY2hQYXJ0aWNpcGFudFJlZ2lzdHJ5OwogCkBAIC0xMDAsNCArMTE5LDMxIEBACiAJCXJldHVybiBnZXRTZWFyY2hQYXJ0aWNpcGFudFJlZ2lzdHJ5KCkuZ2V0UGFydGljaXBhbnRzKHBhdHRlcm4sIHNlYXJjaE9wdGlvbnMpOwogCX0KIAorCXB1YmxpYyBzdGF0aWMgSVN0YXR1cyBjcmVhdGVTdGF0dXMoaW50IHNldmVyaXR5LCBTdHJpbmcgbWVzc2FnZSwgVGhyb3dhYmxlIGV4Y2VwdGlvbikgeworCQlyZXR1cm4gbmV3IFN0YXR1cyhzZXZlcml0eSwgUExVR0lOX0lELCBtZXNzYWdlLCBleGNlcHRpb24pOworCX0KKworCXB1YmxpYyBzdGF0aWMgSVN0YXR1cyBjcmVhdGVTdGF0dXMoaW50IHNldmVyaXR5LCBTdHJpbmcgbWVzc2FnZSkgeworCQlyZXR1cm4gY3JlYXRlU3RhdHVzKHNldmVyaXR5LCBtZXNzYWdlLCBudWxsKTsKKwl9CisKKwlwdWJsaWMgc3RhdGljIHZvaWQgbG9nRXJyb3IoVGhyb3dhYmxlIGV4Y2VwdGlvbikgeworCQlQbGF0Zm9ybS5nZXRMb2coUGxhdGZvcm0uZ2V0QnVuZGxlKFBMVUdJTl9JRCkpLmxvZyggY3JlYXRlU3RhdHVzKElTdGF0dXMuRVJST1IsIGV4Y2VwdGlvbi5nZXRNZXNzYWdlKCksIGV4Y2VwdGlvbikpOworCX0KKworCXB1YmxpYyBzdGF0aWMgdm9pZCBsb2dFcnJvcihDb3JlRXhjZXB0aW9uIGV4Y2VwdGlvbikgeworCQlQbGF0Zm9ybS5nZXRMb2coUGxhdGZvcm0uZ2V0QnVuZGxlKFBMVUdJTl9JRCkpLmxvZyggZXhjZXB0aW9uLmdldFN0YXR1cygpICk7CisJfQorCisJcHVibGljIHN0YXRpYyB2b2lkIGxvZ1dhcm5pbmcoU3RyaW5nIG1lc3NhZ2UpIHsKKwkJUGxhdGZvcm0uZ2V0TG9nKFBsYXRmb3JtLmdldEJ1bmRsZShQTFVHSU5fSUQpKS5sb2coY3JlYXRlU3RhdHVzKElTdGF0dXMuV0FSTklORywgbWVzc2FnZSkpOworCX0KKworCXB1YmxpYyBzdGF0aWMgdm9pZCBsb2dXYXJuaW5nKFRocm93YWJsZSBleGNlcHRpb24pIHsKKwkJUGxhdGZvcm0uZ2V0TG9nKFBsYXRmb3JtLmdldEJ1bmRsZShQTFVHSU5fSUQpKS5sb2coIGNyZWF0ZVN0YXR1cyhJU3RhdHVzLldBUk5JTkcsIGV4Y2VwdGlvbi5nZXRNZXNzYWdlKCksIGV4Y2VwdGlvbikpOworCX0KKworCXB1YmxpYyBzdGF0aWMgdm9pZCBsb2dFcnJvcihTdHJpbmcgbWVzc2FnZSkgeworCQlQbGF0Zm9ybS5nZXRMb2coUGxhdGZvcm0uZ2V0QnVuZGxlKFBMVUdJTl9JRCkpLmxvZyggY3JlYXRlU3RhdHVzKElTdGF0dXMuRVJST1IsIG1lc3NhZ2UpKTsKKwl9CiB9CmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uY29yZS9zcmMtc2VhcmNoL29yZy9lY2xpcHNlL3dzdC9jb21tb24vY29yZS91dGlsL1JlZ2lzdHJ5UmVhZGVyLmphdmEgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uY29yZS9zcmMtc2VhcmNoL29yZy9lY2xpcHNlL3dzdC9jb21tb24vY29yZS91dGlsL1JlZ2lzdHJ5UmVhZGVyLmphdmEKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uYWJmM2UyYgotLS0gL2Rldi9udWxsCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb3JlL3NyYy1zZWFyY2gvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9jb3JlL3V0aWwvUmVnaXN0cnlSZWFkZXIuamF2YQpAQCAtMCwwICsxLDE2NiBAQAorLyoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioKKyAqIENvcHlyaWdodCAoYykgMjAwNSwgMjAwNiBJQk0gQ29ycG9yYXRpb24gYW5kIG90aGVycy4KKyAqIEFsbCByaWdodHMgcmVzZXJ2ZWQuIFRoaXMgcHJvZ3JhbSBhbmQgdGhlIGFjY29tcGFueWluZyBtYXRlcmlhbHMKKyAqIGFyZSBtYWRlIGF2YWlsYWJsZSB1bmRlciB0aGUgdGVybXMgb2YgdGhlIEVjbGlwc2UgUHVibGljIExpY2Vuc2UgdjEuMAorICogd2hpY2ggYWNjb21wYW5pZXMgdGhpcyBkaXN0cmlidXRpb24sIGFuZCBpcyBhdmFpbGFibGUgYXQKKyAqIGh0dHA6Ly93d3cuZWNsaXBzZS5vcmcvbGVnYWwvZXBsLXYxMC5odG1sCisgKgorICogQ29udHJpYnV0b3JzOgorICogICAgIElCTSBDb3Jwb3JhdGlvbiAtIGluaXRpYWwgQVBJIGFuZCBpbXBsZW1lbnRhdGlvbgorICoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKiovCitwYWNrYWdlIG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29yZS51dGlsOworaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucnVudGltZS4qOworaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29yZS5zZWFyY2guU2VhcmNoUGx1Z2luOworaW1wb3J0IG9yZy5vc2dpLmZyYW1ld29yay5CdW5kbGU7CisKKworLyoqCisgKiBDbGFzcyB0byByZWFkIGEgcmVnaXN0cnkuIEl0IGlzIG1lYW50IHRvIGJlIHN1YmNsYXNzZWQgdG8gcHJvdmlkZSBzcGVjaWZpYyBmdW5jdGlvbi4KKyAqIAorICogQHNpbmNlIDEuMC4wCisgKi8KK3B1YmxpYyBhYnN0cmFjdCBjbGFzcyBSZWdpc3RyeVJlYWRlciB7CisKKwlwcml2YXRlIHN0YXRpYyBmaW5hbCBTdHJpbmcgSkVNX1BMVUdJTl9JRCA9ICJvcmcuZWNsaXBzZS5qZW0udXRpbCI7IC8vJE5PTi1OTFMtMSQKKwkKKwlTdHJpbmcgcGx1Z2luSWQ7CisKKwlTdHJpbmcgZXh0ZW5zaW9uUG9pbnRJZDsKKworCXByaXZhdGUgc3RhdGljIEJ1bmRsZSBzeXN0ZW1CdW5kbGU7CisKKwkvKioKKwkgKiBVdGlsaXR5IG1ldGhvZCB0byBnZXQgdGhlIHBsdWdpbiBpZCBvZiBhIGNvbmZpZ3VhdGlvbiBlbGVtZW50CisJICogCisJICogQHBhcmFtIGNvbmZpZ3VyYXRpb25FbGVtZW50CisJICogQHJldHVybiBwbHVnaW4gaWQgb2YgY29uZmlndXJhdGlvbiBlbGVtZW50CisJICogQHNpbmNlIDEuMC4wCisJICovCisJcHVibGljIHN0YXRpYyBTdHJpbmcgZ2V0UGx1Z2luSWQoSUNvbmZpZ3VyYXRpb25FbGVtZW50IGNvbmZpZ3VyYXRpb25FbGVtZW50KSB7CisJCVN0cmluZyBwbHVnaW5JZCA9IG51bGw7CisKKwkJaWYgKGNvbmZpZ3VyYXRpb25FbGVtZW50ICE9IG51bGwpIHsKKwkJCUlFeHRlbnNpb24gZXh0ZW5zaW9uID0gY29uZmlndXJhdGlvbkVsZW1lbnQuZ2V0RGVjbGFyaW5nRXh0ZW5zaW9uKCk7CisKKwkJCWlmIChleHRlbnNpb24gIT0gbnVsbCkKKwkJCQlwbHVnaW5JZCA9IGV4dGVuc2lvbi5nZXRDb250cmlidXRvcigpLmdldE5hbWUoKTsKKwkJfQorCisJCXJldHVybiBwbHVnaW5JZDsKKwl9CisKKwkvKioKKwkgKiBDb25zdHJ1Y3RvciBmb3IgUmVnaXN0cnlSZWFkZXIgdGFraW5nIGEgcmVnaXN0cnksIHBsdWdpbiBpZCwgYW5kIGV4dGVuc2lvbiBwb2ludCBpZC4KKwkgKiAKKwkgKiBAcGFyYW0gcmVnaXN0cnkKKwkgKiBAcGFyYW0gcGx1Z2luSUQKKwkgKiBAcGFyYW0gZXh0ZW5zaW9uUG9pbnQKKwkgKiAKKwkgKiBAZGVwcmVjYXRlZCBVc2UgUmVnaXN0cnlSZWFkZXIocGx1Z2luLCBleHRlbnNpb25Qb2ludCkgaW5zdGVhZC4gVGhlIHJlZ2lzdHJ5IHBhc3NlZCBpbiBpcyBpZ25vcmVkLgorCSAqIEBzaW5jZSAxLjAuMAorCSAqLworCXB1YmxpYyBSZWdpc3RyeVJlYWRlcihJUGx1Z2luUmVnaXN0cnkgcmVnaXN0cnksIFN0cmluZyBwbHVnaW5JRCwgU3RyaW5nIGV4dGVuc2lvblBvaW50KSB7CisJCXRoaXMocGx1Z2luSUQsIGV4dGVuc2lvblBvaW50KTsKKwl9CisKKwkvKioKKwkgKiBDb25zdHJ1Y3RvciBmb3IgUmVnaXN0cnlSZWFkZXIgdGFraW5nIHRoZSBwbHVnaW4gaWQgYW5kIGV4dGVuc2lvbiBwb2ludCBpZC4KKwkgKiAKKwkgKiBAcGFyYW0gcGx1Z2luSUQKKwkgKiBAcGFyYW0gZXh0ZW5zaW9uUG9pbnQKKwkgKiAKKwkgKiBAc2luY2UgMS4wLjAKKwkgKi8KKwlwdWJsaWMgUmVnaXN0cnlSZWFkZXIoU3RyaW5nIHBsdWdpbklELCBTdHJpbmcgZXh0ZW5zaW9uUG9pbnQpIHsKKwkJc3VwZXIoKTsKKwkJdGhpcy5wbHVnaW5JZCA9IHBsdWdpbklEOworCQlleHRlbnNpb25Qb2ludElkID0gZXh0ZW5zaW9uUG9pbnQ7CisJfQorCisJcHJpdmF0ZSB2b2lkIGludGVybmFsUmVhZEVsZW1lbnQoSUNvbmZpZ3VyYXRpb25FbGVtZW50IGVsZW1lbnQpIHsKKwkJYm9vbGVhbiByZWNvZ25pemVkID0gdGhpcy5yZWFkRWxlbWVudChlbGVtZW50KTsKKwkJaWYgKCFyZWNvZ25pemVkKSB7CisJCQlsb2dFcnJvcihlbGVtZW50LCAiRXJyb3IgcHJvY2Vzc2luZyBleHRlbnNpb246ICIgKyBlbGVtZW50KTsgLy8kTk9OLU5MUy0xJAorCQl9CisJfQorCisJLyoKKwkgKiBMb2dzIHRoZSBlcnJvciBpbiB0aGUgZGVza3RvcCBsb2cgdXNpbmcgdGhlIHByb3ZpZGVkIHRleHQgYW5kIHRoZSBpbmZvcm1hdGlvbiBpbiB0aGUgY29uZmlndXJhdGlvbiBlbGVtZW50LgorCSAqLworCXByb3RlY3RlZCB2b2lkIGxvZ0Vycm9yKElDb25maWd1cmF0aW9uRWxlbWVudCBlbGVtZW50LCBTdHJpbmcgdGV4dCkgeworCQlJRXh0ZW5zaW9uIGV4dGVuc2lvbiA9IGVsZW1lbnQuZ2V0RGVjbGFyaW5nRXh0ZW5zaW9uKCk7CisJCVN0cmluZ0J1ZmZlciBidWYgPSBuZXcgU3RyaW5nQnVmZmVyKCk7CisJCWJ1Zi5hcHBlbmQoIlBsdWdpbiAiICsgZXh0ZW5zaW9uLmdldENvbnRyaWJ1dG9yKCkuZ2V0TmFtZSgpICsgIiwgZXh0ZW5zaW9uICIgKyBleHRlbnNpb24uZ2V0RXh0ZW5zaW9uUG9pbnRVbmlxdWVJZGVudGlmaWVyKCkpOyAvLyROT04tTkxTLTEkIC8vJE5PTi1OTFMtMiQKKwkJYnVmLmFwcGVuZCgiXG4iICsgdGV4dCk7IC8vJE5PTi1OTFMtMSQKKwkJU2VhcmNoUGx1Z2luLmxvZ0Vycm9yKGJ1Zi50b1N0cmluZygpKTsKKwl9CisKKwkvKgorCSAqIExvZ3MgYSB2ZXJ5IGNvbW1vbiByZWdpc3RyeSBlcnJvciB3aGVuIGEgcmVxdWlyZWQgYXR0cmlidXRlIGlzIG1pc3NpbmcuCisJICovCisJcHJvdGVjdGVkIHZvaWQgbG9nTWlzc2luZ0F0dHJpYnV0ZShJQ29uZmlndXJhdGlvbkVsZW1lbnQgZWxlbWVudCwgU3RyaW5nIGF0dHJpYnV0ZU5hbWUpIHsKKwkJbG9nRXJyb3IoZWxlbWVudCwgIlJlcXVpcmVkIGF0dHJpYnV0ZSAnIiArIGF0dHJpYnV0ZU5hbWUgKyAiJyBub3QgZGVmaW5lZCIpOyAvLyROT04tTkxTLTEkIC8vJE5PTi1OTFMtMiQKKwl9CisKKwkvKgorCSAqIEltcGxlbWVudCB0aGlzIG1ldGhvZCB0byByZWFkIGVsZW1lbnQgYXR0cmlidXRlcy4gSWYgdGhpcyBlbGVtZW50IGhhcyBzdWJlbGVtZW50cywgdGhlIHJlYWRlciB3aWxsIHJlY3Vyc2l2ZWx5IGN5Y2xlIHRocm91Z2ggdGhlbSBhbmQgY2FsbCB0aGlzCisJICogbWV0aG9kIHNvIGRvbid0IGRvIGl0IGhlcmUuCisJICovCisJcHVibGljIGFic3RyYWN0IGJvb2xlYW4gcmVhZEVsZW1lbnQoSUNvbmZpZ3VyYXRpb25FbGVtZW50IGVsZW1lbnQpOworCisJLyoqCisJICogUmVhZCB0aGUgZXh0ZW5zaW9uIHBvaW50IGFuZCBwYXJzZSBpdC4KKwkgKiAKKwkgKiBAc2luY2UgMS4wLjAKKwkgKi8KKwlwdWJsaWMgdm9pZCByZWFkUmVnaXN0cnkoKSB7CisJCUlFeHRlbnNpb25Qb2ludCBwb2ludCA9IFBsYXRmb3JtLmdldEV4dGVuc2lvblJlZ2lzdHJ5KCkuZ2V0RXh0ZW5zaW9uUG9pbnQocGx1Z2luSWQsIGV4dGVuc2lvblBvaW50SWQpOworCQlpZiAocG9pbnQgIT0gbnVsbCkKKwkJeworCQkJSUNvbmZpZ3VyYXRpb25FbGVtZW50W10gZWxlbWVudHMgPSBwb2ludC5nZXRDb25maWd1cmF0aW9uRWxlbWVudHMoKTsKKwkJCWZvciAoaW50IGkgPSAwOyBpIDwgZWxlbWVudHMubGVuZ3RoOyBpKyspIHsKKwkJCQlpbnRlcm5hbFJlYWRFbGVtZW50KGVsZW1lbnRzW2ldKTsKKwkJCX0KKwkJfQorCQkvLyB0aGUgZm9sbG93aW5nIGNvZGUgaXMgdG8gaGFuZGxlIHRoZSBjb250cmlidXRpb25zIHRvIHRoZSBkZXByZWNhdGVkIG9yZy5lY2xpcHNlLmplbS51dGlsIGV4dGVuc2lvbnMKKwkJaWYgKCFKRU1fUExVR0lOX0lELmVxdWFscyhwbHVnaW5JZCkpCisJCXsKKwkJCXBvaW50ID0gUGxhdGZvcm0uZ2V0RXh0ZW5zaW9uUmVnaXN0cnkoKS5nZXRFeHRlbnNpb25Qb2ludChKRU1fUExVR0lOX0lELCBleHRlbnNpb25Qb2ludElkKTsKKwkJCWlmIChwb2ludCAhPSBudWxsKQorCQkJeworCQkJCUlDb25maWd1cmF0aW9uRWxlbWVudFtdIGVsZW1lbnRzID0gcG9pbnQuZ2V0Q29uZmlndXJhdGlvbkVsZW1lbnRzKCk7CisJCQkJZm9yIChpbnQgaSA9IDA7IGkgPCBlbGVtZW50cy5sZW5ndGg7IGkrKykgeworCQkJCQlpbnRlcm5hbFJlYWRFbGVtZW50KGVsZW1lbnRzW2ldKTsKKwkJCQl9CisJCQl9CisJCX0KKwl9CisKKwkvKioKKwkgKiBUZXN0cyB0byBzZWUgaWYgaXQgaXMgdmFsaWQgYXQgdGhpcyBwb2ludCBpbiB0aW1lIHRvIGNyZWF0ZSBhbiBleGVjdXRhYmxlIGV4dGVuc2lvbi4gQSB2YWxpZCByZWFzb24gbm90IHRvIHdvdWxkIGJlIHRoYXQgdGhlIHdvcmtzcGFjZSBpcworCSAqIHNodXR0aW5nIGRvbncuCisJICogCisJICogQHBhcmFtIGVsZW1lbnQKKwkgKiBAcmV0dXJuIDxjb2RlPnRydWU8L2NvZGU+IGlmIGl0IGlzIHZhbGlkIHBvaW50IHRvIGNyZWF0ZSBhbiBleGVjdXRhYmxlIGV4dGVuc2lvbi4KKwkgKiAKKwkgKiBAc2luY2UgMS4wLjAKKwkgKi8KKwlwdWJsaWMgc3RhdGljIGJvb2xlYW4gY2FuQ3JlYXRlRXhlY3V0YWJsZUV4dGVuc2lvbihJQ29uZmlndXJhdGlvbkVsZW1lbnQgZWxlbWVudCkgeworCQlpZiAoUGxhdGZvcm0uaXNSdW5uaW5nKCkgJiYgZ2V0U3lzdGVtQnVuZGxlKCkuZ2V0U3RhdGUoKSAhPSBCdW5kbGUuU1RPUFBJTkcpCisJCQlyZXR1cm4gdHJ1ZTsKKwkJcmV0dXJuIGZhbHNlOworCX0KKworCS8qKgorCSAqIEdldCB0aGUgc3lzdGVtIGJ1bmRsZQorCSAqIAorCSAqIEByZXR1cm4gc3lzdGVtIGJ1bmRsZS4KKwkgKiAKKwkgKiBAc2luY2UgMS4wLjAKKwkgKi8KKwlwcm90ZWN0ZWQgc3RhdGljIEJ1bmRsZSBnZXRTeXN0ZW1CdW5kbGUoKSB7CisJCWlmIChzeXN0ZW1CdW5kbGUgPT0gbnVsbCkKKwkJCXN5c3RlbUJ1bmRsZSA9IFBsYXRmb3JtLmdldEJ1bmRsZSgib3JnLmVjbGlwc2Uub3NnaSIpOyAvLyROT04tTkxTLTEkCisJCXJldHVybiBzeXN0ZW1CdW5kbGU7CisJfQorfQpkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvcmUvc3JjLXNlYXJjaC9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2NvcmUvdXRpbC9VSUNvbnRleHREZXRlcm1pbmF0aW9uLmphdmEgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uY29yZS9zcmMtc2VhcmNoL29yZy9lY2xpcHNlL3dzdC9jb21tb24vY29yZS91dGlsL1VJQ29udGV4dERldGVybWluYXRpb24uamF2YQpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi42OWMwYmJjCi0tLSAvZGV2L251bGwKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvcmUvc3JjLXNlYXJjaC9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2NvcmUvdXRpbC9VSUNvbnRleHREZXRlcm1pbmF0aW9uLmphdmEKQEAgLTAsMCArMSwyMDEgQEAKKy8qKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqCisgKiBDb3B5cmlnaHQgKGMpIDIwMDUgSUJNIENvcnBvcmF0aW9uIGFuZCBvdGhlcnMuCisgKiBBbGwgcmlnaHRzIHJlc2VydmVkLiBUaGlzIHByb2dyYW0gYW5kIHRoZSBhY2NvbXBhbnlpbmcgbWF0ZXJpYWxzIAorICogYXJlIG1hZGUgYXZhaWxhYmxlIHVuZGVyIHRoZSB0ZXJtcyBvZiB0aGUgRWNsaXBzZSBQdWJsaWMgTGljZW5zZSB2MS4wCisgKiB3aGljaCBhY2NvbXBhbmllcyB0aGlzIGRpc3RyaWJ1dGlvbiwgYW5kIGlzIGF2YWlsYWJsZSBhdAorICogaHR0cDovL3d3dy5lY2xpcHNlLm9yZy9sZWdhbC9lcGwtdjEwLmh0bWwKKyAqIAorICogQ29udHJpYnV0b3JzOgorICogICAgIElCTSBDb3Jwb3JhdGlvbiAtIGluaXRpYWwgQVBJIGFuZCBpbXBsZW1lbnRhdGlvbgorICoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKiovCitwYWNrYWdlIG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29yZS51dGlsOworaW1wb3J0IGphdmEudXRpbC5IYXNoTWFwOworaW1wb3J0IGphdmEudXRpbC5NYXA7CisKK2ltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJ1bnRpbWUuKjsKK2ltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvcmUuc2VhcmNoLlNlYXJjaFBsdWdpbjsKKworCisvKioKKyAqIFN0YXRpYyB1dGlsaXR5IGNsYXNzIGZvciBVSUNvbnRleHQgZGV0ZXJtaW5hdGlvbi4KKyAqIAorICogQHNpbmNlIDEuMC4wCisgKi8KK3B1YmxpYyBjbGFzcyBVSUNvbnRleHREZXRlcm1pbmF0aW9uIHsKKworCXByaXZhdGUgc3RhdGljIGZpbmFsIGludCBVTktOT1dOID0gMTAwOworCisJcHVibGljIHN0YXRpYyBmaW5hbCBTdHJpbmcgSEVBRExFU1NfQ09OVEVYVF9MSVRFUkFMID0gIkhlYWRsZXNzIjsgLy8kTk9OLU5MUy0xJAorCisJcHVibGljIHN0YXRpYyBmaW5hbCBTdHJpbmcgVUlfQ09OVEVYVF9MSVRFUkFMID0gIlVJIjsgLy8kTk9OLU5MUy0xJAorCisJcHVibGljIHN0YXRpYyBmaW5hbCBpbnQgSEVBRExFU1NfQ09OVEVYVCA9IDEwMjsKKworCXB1YmxpYyBzdGF0aWMgZmluYWwgaW50IFVJX0NPTlRFWFQgPSAxMDE7CisKKwlwcml2YXRlIHN0YXRpYyBNYXAgY2FjaGVkRXh0ZW5zaW9ucyA9IG51bGw7CisKKwlwcml2YXRlIHN0YXRpYyBpbnQgY3VycmVudENvbnRleHQgPSBVTktOT1dOOworCisJLyoqCisJICogRG8gbm90IHVzZS0gdGhpcyBjbGFzcyBzaG91bGQgbm90IGJlIGluc3RhbnRpYXRlZCwgYnV0IHNob3VsZCBiZSBhY2Nlc3NlZCB2aWEgaXRzIHN0YXRpYyBtZXRob2RzIG9ubHkuCisJICovCisJcHJvdGVjdGVkIFVJQ29udGV4dERldGVybWluYXRpb24oKSB7CisJfQorCisJLyoqCisJICogUmV0dXJucyBhbiBpbnN0YW5jZSBvZiBhIGdpdmVuIGNsYXNzIGJhc2VkIG9uIHRoZSBVSSBvciBIZWFkbGVzcyBjb250ZXh0LgorCSAqIAorCSAqIEBwYXJhbSBrZXkKKwkgKiBAcmV0dXJuIG5ldyBjbGFzcyBpbnN0YW5jZSBmb3IgdGhlIGdpdmVuIGtleS4KKwkgKiBAdGhyb3dzIElsbGVnYWxBcmd1bWVudEV4Y2VwdGlvbgorCSAqICAgICAgICAgICAgIElmIHRoZSBrZXkgaXMgaW52YWxpZCAoZS5nLiBubyBleHRlbnNpb24gaXMgZm91bmQgZm9yIHRoZSBrZXkpCisJICovCisJcHVibGljIHN0YXRpYyBPYmplY3QgY3JlYXRlSW5zdGFuY2UoU3RyaW5nIGtleSkgeworCQlPYmplY3QgcmVzdWx0ID0gbnVsbDsKKwkJaWYgKGNhY2hlZEV4dGVuc2lvbnMgPT0gbnVsbCkKKwkJCWluaXRFeHRlbnNpb25zKCk7CisJCUlDb25maWd1cmF0aW9uRWxlbWVudCBjb250ZXh0U2Vuc2l0aXZlQ2xhc3MgPSAoSUNvbmZpZ3VyYXRpb25FbGVtZW50KSBjYWNoZWRFeHRlbnNpb25zLmdldChrZXkpOworCQl0cnkgeworCQkJaWYgKGNvbnRleHRTZW5zaXRpdmVDbGFzcyAhPSBudWxsKQorCQkJCXJlc3VsdCA9IGNvbnRleHRTZW5zaXRpdmVDbGFzcworCQkJCQkJLmNyZWF0ZUV4ZWN1dGFibGVFeHRlbnNpb24oVUlDb250ZXh0RGV0ZXJtaW5hdGlvblJlZ2lzdHJ5UmVhZGVyLlVJX0NPTlRFWFRfU0VOU1RJVkVfQ0xBU1NfQ0xBU1NOQU1FX0FUVFIpOworCQl9IGNhdGNoIChDb3JlRXhjZXB0aW9uIGUpIHsKKwkJCVNlYXJjaFBsdWdpbi5sb2dFcnJvcigiUHJvYmxlbSBsb2FkaW5nIGV4dGVuc2lvbiBub3QgZm91bmQgZm9yIGtleSBcIiIgKyBrZXkgKyAiXCIuIik7IC8vJE5PTi1OTFMtMSQgLy8kTk9OLU5MUy0yJAorCQkJU2VhcmNoUGx1Z2luLmxvZ0Vycm9yKGUpOworCQl9CisJCWlmIChyZXN1bHQgPT0gbnVsbCkKKwkJCVNlYXJjaFBsdWdpbi5sb2dFcnJvcigiRXh0ZW5zaW9uIG5vdCBmb3VuZCBmb3Iga2V5IFwiIiArIGtleSArICJcIi4iKTsgLy8kTk9OLU5MUy0xJCAvLyROT04tTkxTLTIkCisJCXJldHVybiByZXN1bHQ7CisJfQorCisJLyoqCisJICogUmV0dXJucyB0aGUgY3VycmVudCBjb250ZXh0IC0tIGRldGVybWluZXMgdGhlIHZhbHVlIGlmIG5lY2Vzc2FyeS4KKwkgKiAKKwkgKiBAcmV0dXJuIGN1cnJlbnQgY29udGV4dAorCSAqIEBzZWUgI0hFQURMRVNTX0NPTlRFWFQKKwkgKiBAc2VlICNVSV9DT05URVhUCisJICovCisJcHVibGljIHN0YXRpYyBpbnQgZ2V0Q3VycmVudENvbnRleHQoKSB7CisJCWlmIChjdXJyZW50Q29udGV4dCA9PSBVTktOT1dOKSB7CisJCQljdXJyZW50Q29udGV4dCA9IEhFQURMRVNTX0NPTlRFWFQ7CisJCQluZXcgVUlUZXN0ZXJSZWdpc3RyeVJlYWRlcigpLnJlYWRSZWdpc3RyeSgpOworCQl9CisJCXJldHVybiBjdXJyZW50Q29udGV4dDsKKwl9CisKKwkvKgorCSAqIEludm9rZXMgdGhlIFVJQ29udGV4dERldGVybWluYXRpb25SZWdpc3RyeVJlYWRlciB0byBjYWNoZSBhbGwgb2YgdGhlIGV4dGVuc2lvbnMsIGlmIG5lY2Vzc2FyeS4KKwkgKiAgCisJICovCisJcHJpdmF0ZSBzdGF0aWMgdm9pZCBpbml0RXh0ZW5zaW9ucygpIHsKKwkJaWYgKGNhY2hlZEV4dGVuc2lvbnMgPT0gbnVsbCkgeworCQkJY2FjaGVkRXh0ZW5zaW9ucyA9IG5ldyBIYXNoTWFwKCk7CisJCQluZXcgVUlDb250ZXh0RGV0ZXJtaW5hdGlvblJlZ2lzdHJ5UmVhZGVyKCkucmVhZFJlZ2lzdHJ5KCk7CisJCX0KKwl9CisKKwkvKgorCSAqIENvbnZlcnRzIHRoZSBpbnB1dCB0byBvbmUgb2YgVUlfQ09OVEVYVCBvciBIRUFETEVTU19DT05URVhULiBEZWZhdWx0cyB0byBIRUFETEVTUyBvbiBpbnZhbGlkIGlucHV0CisJICogCisJICogQHBhcmFtIGxpdGVyYWwgQHJldHVybgorCSAqLworCXByaXZhdGUgc3RhdGljIGludCBjb252ZXJ0TGl0ZXJhbChTdHJpbmcgbGl0ZXJhbCkgeworCQlyZXR1cm4gKFVJX0NPTlRFWFRfTElURVJBTC5lcXVhbHMobGl0ZXJhbCkpID8gVUlfQ09OVEVYVCA6IEhFQURMRVNTX0NPTlRFWFQ7CisJfQorCisJLyoKKwkgKiBSZWFkcyB0aGUgcmVnaXN0cmF0aW9uIG9mIFVJIENvbnRleHQtc2Vuc2l0aXZlIGNsYXNzIGV4dGVuc2lvbnMgYW5kIGluaXRpYWxpemVzIHRoZSBjYWNoZSBvZiB0aGUgVUlDb250ZXh0RGV0ZXJtaW5hdGlvbiBvYmplY3QuCisJICogCisJICogQGF1dGhvciBtZGVsZGVyCisJICovCisJcHJpdmF0ZSBzdGF0aWMgY2xhc3MgVUlDb250ZXh0RGV0ZXJtaW5hdGlvblJlZ2lzdHJ5UmVhZGVyIGV4dGVuZHMgUmVnaXN0cnlSZWFkZXIgeworCisJCXB1YmxpYyBzdGF0aWMgZmluYWwgU3RyaW5nIFVJX0NPTlRFWFRfU0VOU1RJVkVfQ0xBU1NfRUxFTUVOVCA9ICJ1aUNvbnRleHRTZW5zaXRpdmVDbGFzcyI7IC8vJE5PTi1OTFMtMSQKKworCQlwdWJsaWMgc3RhdGljIGZpbmFsIFN0cmluZyBVSV9DT05URVhUX1NFTlNUSVZFX0NMQVNTX0tFWV9BVFRSID0gImtleSI7IC8vJE5PTi1OTFMtMSQKKworCQlwdWJsaWMgc3RhdGljIGZpbmFsIFN0cmluZyBVSV9DT05URVhUX1NFTlNUSVZFX0NMQVNTX0NMQVNTTkFNRV9BVFRSID0gImNsYXNzTmFtZSI7IC8vJE5PTi1OTFMtMSQKKworCQlwdWJsaWMgc3RhdGljIGZpbmFsIFN0cmluZyBVSV9DT05URVhUX1NFTlNUSVZFX0NMQVNTX0NPTlRFWFRfQVRUUiA9ICJjb250ZXh0IjsgLy8kTk9OLU5MUy0xJAorCisJCXB1YmxpYyBVSUNvbnRleHREZXRlcm1pbmF0aW9uUmVnaXN0cnlSZWFkZXIoKSB7CisJCQlzdXBlcihTZWFyY2hQbHVnaW4uUExVR0lOX0lELCBTZWFyY2hQbHVnaW4uVUlfQ09OVEVYVF9FWFRFTlNJT05fUE9JTlQpOworCQl9CisKKwkJLyoKKwkJICogKG5vbi1KYXZhZG9jKQorCQkgKiAKKwkJICogQHNlZSBvcmcuZWNsaXBzZS5qZW0udXRpbC5SZWdpc3RyeVJlYWRlciNyZWFkRWxlbWVudChvcmcuZWNsaXBzZS5jb3JlLnJ1bnRpbWUuSUNvbmZpZ3VyYXRpb25FbGVtZW50KQorCQkgKi8KKwkJcHVibGljIGJvb2xlYW4gcmVhZEVsZW1lbnQoSUNvbmZpZ3VyYXRpb25FbGVtZW50IGVsZW1lbnQpIHsKKwkJCWJvb2xlYW4gcmVzdWx0ID0gZmFsc2U7CisJCQlpZiAoZWxlbWVudC5nZXROYW1lKCkuZXF1YWxzKFVJX0NPTlRFWFRfU0VOU1RJVkVfQ0xBU1NfRUxFTUVOVCkpIHsKKworCQkJCVN0cmluZyBrZXkgPSBlbGVtZW50LmdldEF0dHJpYnV0ZShVSV9DT05URVhUX1NFTlNUSVZFX0NMQVNTX0tFWV9BVFRSKTsKKwkJCQlTdHJpbmcgY29udGV4dCA9IGVsZW1lbnQuZ2V0QXR0cmlidXRlKFVJX0NPTlRFWFRfU0VOU1RJVkVfQ0xBU1NfQ09OVEVYVF9BVFRSKTsKKworCQkJCWlmICghY2FjaGVkRXh0ZW5zaW9ucy5jb250YWluc0tleShrZXkpIHx8IGdldEN1cnJlbnRDb250ZXh0KCkgPT0gY29udmVydExpdGVyYWwoY29udGV4dCkpCisJCQkJCWNhY2hlZEV4dGVuc2lvbnMucHV0KGtleSwgZWxlbWVudCk7CisJCQkJcmVzdWx0ID0gdHJ1ZTsKKwkJCX0KKwkJCXJldHVybiByZXN1bHQ7CisJCX0KKwl9CisKKwkvKgorCSAqIFJlYWRzIHRoZSB1aVRlc3RlciBleHRlbnNpb24gYW5kIGluc3RhbnRpYXRlIHRoZSBhbnkgb2YgdGhlIFVJVGVzdGVyIGNsYXNzZXMgaXQgZmluZHMuCisJICogCisJICogVGhlIGltcGxlbWVudGF0aW9uIGhhcyB0aGUgc2lkZSBlZmZlY3QgdGhhdCBpZiBtdWx0aXBsZSBVSVRlc3RlcnMgYXJlIHJlZ2lzdGVyZWQsIGFueSBvZiB0aGVtIGNhbiB0cmlwIHRoZSBjdXJyZW50Q29udGV4dCBpbnRvIHRoZSBVSV9DT05URVhUCisJICogc3RhdGUuCisJICogCisJICogQGF1dGhvciBtZGVsZGVyCisJICovCisJcHJpdmF0ZSBzdGF0aWMgY2xhc3MgVUlUZXN0ZXJSZWdpc3RyeVJlYWRlciBleHRlbmRzIFJlZ2lzdHJ5UmVhZGVyIHsKKworCQlwdWJsaWMgc3RhdGljIGZpbmFsIFN0cmluZyBVSV9URVNURVJfRUxFTUVOVCA9ICJ1aVRlc3RlciI7IC8vJE5PTi1OTFMtMSQKKworCQlwdWJsaWMgc3RhdGljIGZpbmFsIFN0cmluZyBVSV9URVNURVJfQ0xBU1NOQU1FX0FUVFIgPSAiY2xhc3NOYW1lIjsgLy8kTk9OLU5MUy0xJAorCisJCXB1YmxpYyBVSVRlc3RlclJlZ2lzdHJ5UmVhZGVyKCkgeworCQkJc3VwZXIoU2VhcmNoUGx1Z2luLlBMVUdJTl9JRCwgU2VhcmNoUGx1Z2luLlVJX1RFU1RFUl9FWFRFTlNJT05fUE9JTlQpOworCQl9CisKKwkJLyoKKwkJICogKG5vbi1KYXZhZG9jKQorCQkgKiAKKwkJICogQHNlZSBjb20uaWJtLmV0b29scy5lbWYud29ya2JlbmNoLlJlZ2lzdHJ5UmVhZGVyI3JlYWRFbGVtZW50KG9yZy5lY2xpcHNlLmNvcmUucnVudGltZS5JQ29uZmlndXJhdGlvbkVsZW1lbnQpCisJCSAqLworCQlwdWJsaWMgYm9vbGVhbiByZWFkRWxlbWVudChJQ29uZmlndXJhdGlvbkVsZW1lbnQgZWxlbWVudCkgeworCQkJYm9vbGVhbiByZXN1bHQgPSBmYWxzZTsKKwkJCWlmIChlbGVtZW50LmdldE5hbWUoKS5lcXVhbHMoVUlfVEVTVEVSX0VMRU1FTlQpKSB7CisJCQkJcmVzdWx0ID0gdHJ1ZTsKKwkJCQl0cnkgeworCQkJCQkvLyBEb24ndCBib3RoZXIgcnVubmluZyB0ZXN0ZXIgaXQgaWYgd2UgYWxyZWFkeSBwcm9jZXNzZWQgb25lIGV4dGVuc2lvbiB0aGF0IHJldHVybmVkIHRydWUuCisJCQkJCWlmIChjdXJyZW50Q29udGV4dCAhPSBVSV9DT05URVhUICYmIGNhbkNyZWF0ZUV4ZWN1dGFibGVFeHRlbnNpb24oZWxlbWVudCkpIHsKKwkJCQkJCVVJVGVzdGVyIHRlc3RlciA9IChVSVRlc3RlcikgZWxlbWVudC5jcmVhdGVFeGVjdXRhYmxlRXh0ZW5zaW9uKFVJX1RFU1RFUl9DTEFTU05BTUVfQVRUUik7CisJCQkJCQlpZiAodGVzdGVyLmlzQ3VycmVudENvbnRleHRVSSgpKQorCQkJCQkJCWN1cnJlbnRDb250ZXh0ID0gVUlfQ09OVEVYVDsKKwkJCQkJfQorCQkJCX0gY2F0Y2ggKEV4Y2VwdGlvbiB0KSB7CisJCQkJCVNlYXJjaFBsdWdpbi5sb2dXYXJuaW5nKCJVSUNvbnRleHREZXRlcm1pbmF0aW9uIGlzIHByb2NlZWRpbmcgaW4gSEVBRExFU1MgbW9kZSIpOyAvLyROT04tTkxTLTEkCisJCQkJfQorCQkJfQorCQkJcmV0dXJuIHJlc3VsdDsKKwkJfQorCisJCXB1YmxpYyB2b2lkIHJlYWRSZWdpc3RyeSgpIHsKKwkJCXN1cGVyLnJlYWRSZWdpc3RyeSgpOworCQkJSUV4dGVuc2lvblBvaW50IHBvaW50ID0gUGxhdGZvcm0uZ2V0RXh0ZW5zaW9uUmVnaXN0cnkoKS5nZXRFeHRlbnNpb25Qb2ludCgib3JnLmVjbGlwc2UuamVtLnV0aWwiLCBleHRlbnNpb25Qb2ludElkKTsKKwkJCWlmIChwb2ludCA9PSBudWxsKQorCQkJCXJldHVybjsKKwkJCUlDb25maWd1cmF0aW9uRWxlbWVudFtdIGVsZW1lbnRzID0gcG9pbnQuZ2V0Q29uZmlndXJhdGlvbkVsZW1lbnRzKCk7CisJCQlmb3IgKGludCBpID0gMDsgaSA8IGVsZW1lbnRzLmxlbmd0aDsgaSsrKSB7CisJCQkJYm9vbGVhbiByZWNvZ25pemVkID0gdGhpcy5yZWFkRWxlbWVudChlbGVtZW50c1tpXSk7CisJCQkJaWYgKCFyZWNvZ25pemVkKSB7CisJCQkJCWxvZ0Vycm9yKGVsZW1lbnRzW2ldLCAiRXJyb3IgcHJvY2Vzc2luZyBleHRlbnNpb246ICIgKyBlbGVtZW50c1tpXSk7IC8vJE5PTi1OTFMtMSQKKwkJCQl9CisJCQl9CisJCX0KKwl9Cit9CmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uY29yZS9zcmMtc2VhcmNoL29yZy9lY2xpcHNlL3dzdC9jb21tb24vY29yZS91dGlsL1VJVGVzdGVyLmphdmEgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uY29yZS9zcmMtc2VhcmNoL29yZy9lY2xpcHNlL3dzdC9jb21tb24vY29yZS91dGlsL1VJVGVzdGVyLmphdmEKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uNzY4ZWQxMAotLS0gL2Rldi9udWxsCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb3JlL3NyYy1zZWFyY2gvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9jb3JlL3V0aWwvVUlUZXN0ZXIuamF2YQpAQCAtMCwwICsxLDI4IEBACitwYWNrYWdlIG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29yZS51dGlsOworLyoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioKKyAqIENvcHlyaWdodCAoYykgMjAwNSBJQk0gQ29ycG9yYXRpb24gYW5kIG90aGVycy4KKyAqIEFsbCByaWdodHMgcmVzZXJ2ZWQuIFRoaXMgcHJvZ3JhbSBhbmQgdGhlIGFjY29tcGFueWluZyBtYXRlcmlhbHMgCisgKiBhcmUgbWFkZSBhdmFpbGFibGUgdW5kZXIgdGhlIHRlcm1zIG9mIHRoZSBFY2xpcHNlIFB1YmxpYyBMaWNlbnNlIHYxLjAKKyAqIHdoaWNoIGFjY29tcGFuaWVzIHRoaXMgZGlzdHJpYnV0aW9uLCBhbmQgaXMgYXZhaWxhYmxlIGF0CisgKiBodHRwOi8vd3d3LmVjbGlwc2Uub3JnL2xlZ2FsL2VwbC12MTAuaHRtbAorICogCisgKiBDb250cmlidXRvcnM6CisgKiAgICAgSUJNIENvcnBvcmF0aW9uIC0gaW5pdGlhbCBBUEkgYW5kIGltcGxlbWVudGF0aW9uCisgKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKi8KKworLyoqCisgKiBJbnRlcmZhY2UgZm9yIGEgVUlUZXN0ZXIuIFRoZSAiY2xhc3NuYW1lIiBhdHRyaWJ1dGUgb24gdGhlICJ1aVRlc3RlciIgZXh0ZW5zaW9uIHBvaW50IHNob3VsZCBpbXBsZW1lbnQgdGhpcyBjbGFzcy4KKyAqIAorICogQHNpbmNlIDEuMC4wCisgKi8KK3B1YmxpYyBpbnRlcmZhY2UgVUlUZXN0ZXIgeworCisJLyoqCisJICogQW5zd2VyIGlmIHRoZSBjdXJyZW50IGNvbnRleHQgaXMgYW4gVUkgY29udGV4dC4KKwkgKiAKKwkgKiBAcmV0dXJuIDxjb2RlPnRydWU8L2NvZGU+IGlmIGFuIFVJIGNvbnRleHQuCisJICogCisJICogQHNpbmNlIDEuMC4wCisJICovCisJcHVibGljIGJvb2xlYW4gaXNDdXJyZW50Q29udGV4dFVJKCk7Cit9CmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW1mLy5jbGFzc3BhdGggYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW1mLy5jbGFzc3BhdGgKaW5kZXggOTYyMDJkOC4uMzAyYTc4NiAxMDA2NDQKLS0tIGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVtZi8uY2xhc3NwYXRoCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbWYvLmNsYXNzcGF0aApAQCAtMiw3ICsyLDcgQEAKIDxjbGFzc3BhdGg+CiAJPGNsYXNzcGF0aGVudHJ5IGtpbmQ9InNyYyIgcGF0aD0id3RwZW1mLyIvPgogCTxjbGFzc3BhdGhlbnRyeSBraW5kPSJzcmMiIHBhdGg9IndvcmtiZW5jaC8iLz4KLQk8Y2xhc3NwYXRoZW50cnkga2luZD0iY29uIiBwYXRoPSJvcmcuZWNsaXBzZS5qZHQubGF1bmNoaW5nLkpSRV9DT05UQUlORVIvb3JnLmVjbGlwc2UuamR0LmludGVybmFsLmRlYnVnLnVpLmxhdW5jaGVyLlN0YW5kYXJkVk1UeXBlL0oyU0UtMS40Ii8+CisJPGNsYXNzcGF0aGVudHJ5IGtpbmQ9ImNvbiIgcGF0aD0ib3JnLmVjbGlwc2UuamR0LmxhdW5jaGluZy5KUkVfQ09OVEFJTkVSL29yZy5lY2xpcHNlLmpkdC5pbnRlcm5hbC5kZWJ1Zy51aS5sYXVuY2hlci5TdGFuZGFyZFZNVHlwZS9KMlNFLTEuNSIvPgogCTxjbGFzc3BhdGhlbnRyeSBraW5kPSJjb24iIHBhdGg9Im9yZy5lY2xpcHNlLnBkZS5jb3JlLnJlcXVpcmVkUGx1Z2lucyI+CiAJCTxhY2Nlc3NydWxlcz4KIAkJCTxhY2Nlc3NydWxlIGtpbmQ9ImFjY2Vzc2libGUiIHBhdHRlcm49Im9yZy9lY2xpcHNlL3dzdC9jb21tb24vKioiLz4KZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbWYvLnNldHRpbmdzL29yZy5lY2xpcHNlLmpkdC5jb3JlLnByZWZzIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVtZi8uc2V0dGluZ3Mvb3JnLmVjbGlwc2UuamR0LmNvcmUucHJlZnMKaW5kZXggNmM3NDE4Zi4uYzI5NmMwOCAxMDA2NDQKLS0tIGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVtZi8uc2V0dGluZ3Mvb3JnLmVjbGlwc2UuamR0LmNvcmUucHJlZnMKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVtZi8uc2V0dGluZ3Mvb3JnLmVjbGlwc2UuamR0LmNvcmUucHJlZnMKQEAgLTEsNjMgKzEsOTUgQEAKLSNTYXQgTWFyIDI0IDAyOjA2OjAyIEVEVCAyMDA3Ci1lY2xpcHNlLnByZWZlcmVuY2VzLnZlcnNpb249MQotb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIuY29kZWdlbi5pbmxpbmVKc3JCeXRlY29kZT1lbmFibGVkCi1vcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5jb2RlZ2VuLnRhcmdldFBsYXRmb3JtPTEuMgotb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIuY29kZWdlbi51bnVzZWRMb2NhbD1wcmVzZXJ2ZQotb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIuY29tcGxpYW5jZT0xLjQKLW9yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLmRlYnVnLmxpbmVOdW1iZXI9Z2VuZXJhdGUKLW9yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLmRlYnVnLmxvY2FsVmFyaWFibGU9Z2VuZXJhdGUKLW9yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLmRlYnVnLnNvdXJjZUZpbGU9Z2VuZXJhdGUKLW9yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0uYW5ub3RhdGlvblN1cGVySW50ZXJmYWNlPWlnbm9yZQotb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5hc3NlcnRJZGVudGlmaWVyPXdhcm5pbmcKLW9yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0uYXV0b2JveGluZz1pZ25vcmUKLW9yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0uZGVwcmVjYXRpb249d2FybmluZwotb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5kZXByZWNhdGlvbkluRGVwcmVjYXRlZENvZGU9ZGlzYWJsZWQKLW9yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0uZGVwcmVjYXRpb25XaGVuT3ZlcnJpZGluZ0RlcHJlY2F0ZWRNZXRob2Q9ZGlzYWJsZWQKLW9yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0uZGlzY291cmFnZWRSZWZlcmVuY2U9ZXJyb3IKLW9yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0uZW1wdHlTdGF0ZW1lbnQ9aWdub3JlCi1vcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLmVudW1JZGVudGlmaWVyPXdhcm5pbmcKLW9yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0uZmFsbHRocm91Z2hDYXNlPWlnbm9yZQotb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5maWVsZEhpZGluZz1pZ25vcmUKLW9yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0uZmluYWxQYXJhbWV0ZXJCb3VuZD1pZ25vcmUKLW9yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0uZmluYWxseUJsb2NrTm90Q29tcGxldGluZ05vcm1hbGx5PWVycm9yCi1vcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLmZvcmJpZGRlblJlZmVyZW5jZT1lcnJvcgotb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5oaWRkZW5DYXRjaEJsb2NrPWVycm9yCi1vcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLmluY29tcGF0aWJsZU5vbkluaGVyaXRlZEludGVyZmFjZU1ldGhvZD1lcnJvcgotb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5pbmNvbXBsZXRlRW51bVN3aXRjaD1pZ25vcmUKLW9yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0uaW5kaXJlY3RTdGF0aWNBY2Nlc3M9aWdub3JlCi1vcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLmxvY2FsVmFyaWFibGVIaWRpbmc9aWdub3JlCi1vcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLm1ldGhvZFdpdGhDb25zdHJ1Y3Rvck5hbWU9ZXJyb3IKLW9yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0ubWlzc2luZ0RlcHJlY2F0ZWRBbm5vdGF0aW9uPWlnbm9yZQotb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5taXNzaW5nT3ZlcnJpZGVBbm5vdGF0aW9uPWlnbm9yZQotb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5taXNzaW5nU2VyaWFsVmVyc2lvbj13YXJuaW5nCi1vcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLm5vRWZmZWN0QXNzaWdubWVudD13YXJuaW5nCi1vcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLm5vSW1wbGljaXRTdHJpbmdDb252ZXJzaW9uPWVycm9yCi1vcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLm5vbkV4dGVybmFsaXplZFN0cmluZ0xpdGVyYWw9aWdub3JlCi1vcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLm51bGxSZWZlcmVuY2U9aWdub3JlCi1vcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLm92ZXJyaWRpbmdQYWNrYWdlRGVmYXVsdE1ldGhvZD1lcnJvcgotb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5wYXJhbWV0ZXJBc3NpZ25tZW50PWlnbm9yZQotb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5wb3NzaWJsZUFjY2lkZW50YWxCb29sZWFuQXNzaWdubWVudD1pZ25vcmUKLW9yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0ucmF3VHlwZVJlZmVyZW5jZT1pZ25vcmUKLW9yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0ucmVkdW5kYW50TnVsbENoZWNrPWlnbm9yZQotb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5zcGVjaWFsUGFyYW1ldGVySGlkaW5nRmllbGQ9ZGlzYWJsZWQKLW9yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0uc3RhdGljQWNjZXNzUmVjZWl2ZXI9ZXJyb3IKLW9yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0uc3VwcHJlc3NXYXJuaW5ncz1lbmFibGVkCi1vcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLnN5bnRoZXRpY0FjY2Vzc0VtdWxhdGlvbj1pZ25vcmUKLW9yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0udHlwZVBhcmFtZXRlckhpZGluZz1lcnJvcgotb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS51bmNoZWNrZWRUeXBlT3BlcmF0aW9uPWlnbm9yZQotb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS51bmRvY3VtZW50ZWRFbXB0eUJsb2NrPWlnbm9yZQotb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS51bmhhbmRsZWRXYXJuaW5nVG9rZW49aWdub3JlCi1vcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLnVubmVjZXNzYXJ5RWxzZT1pZ25vcmUKLW9yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0udW5uZWNlc3NhcnlUeXBlQ2hlY2s9aWdub3JlCi1vcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLnVucXVhbGlmaWVkRmllbGRBY2Nlc3M9aWdub3JlCi1vcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLnVudXNlZERlY2xhcmVkVGhyb3duRXhjZXB0aW9uPWlnbm9yZQotb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS51bnVzZWREZWNsYXJlZFRocm93bkV4Y2VwdGlvbldoZW5PdmVycmlkaW5nPWRpc2FibGVkCi1vcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLnVudXNlZEltcG9ydD1lcnJvcgotb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS51bnVzZWRMYWJlbD1lcnJvcgotb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS51bnVzZWRMb2NhbD1pZ25vcmUKLW9yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0udW51c2VkUGFyYW1ldGVyPWlnbm9yZQorI1dlZCBKdW4gMjQgMTA6MTM6MTYgRURUIDIwMDkKIG9yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0udW51c2VkUGFyYW1ldGVyV2hlbkltcGxlbWVudGluZ0Fic3RyYWN0PWRpc2FibGVkCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLmNvbXBhcmluZ0lkZW50aWNhbD1lcnJvcgorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS51bm5lY2Vzc2FyeUVsc2U9ZXJyb3IKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0ucmVkdW5kYW50U3VwZXJpbnRlcmZhY2U9ZXJyb3IKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0udW51c2VkTG9jYWw9ZXJyb3IKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0uZW1wdHlTdGF0ZW1lbnQ9ZXJyb3IKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0udW51c2VkTGFiZWw9ZXJyb3IKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0udW51c2VkUGFyYW1ldGVyPXdhcm5pbmcKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0ucmF3VHlwZVJlZmVyZW5jZT13YXJuaW5nCitvcmcuZWNsaXBzZS5qZHQuY29yZS5pbmNvbXBhdGlibGVKREtMZXZlbD1pZ25vcmUKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0uaW5jb21wYXRpYmxlTm9uSW5oZXJpdGVkSW50ZXJmYWNlTWV0aG9kPWVycm9yCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5kZWJ1Zy5saW5lTnVtYmVyPWdlbmVyYXRlCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLnVudXNlZERlY2xhcmVkVGhyb3duRXhjZXB0aW9uPXdhcm5pbmcKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmJ1aWxkZXIuY2xlYW5PdXRwdXRGb2xkZXI9Y2xlYW4KK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0udW51c2VkV2FybmluZ1Rva2VuPXdhcm5pbmcKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0ubm9JbXBsaWNpdFN0cmluZ0NvbnZlcnNpb249ZXJyb3IKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0uZGVwcmVjYXRpb25JbkRlcHJlY2F0ZWRDb2RlPWVuYWJsZWQKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0uZGVwcmVjYXRpb249d2FybmluZwogb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS51bnVzZWRQYXJhbWV0ZXJXaGVuT3ZlcnJpZGluZ0NvbmNyZXRlPWRpc2FibGVkCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLm1pc3NpbmdTeW5jaHJvbml6ZWRPbkluaGVyaXRlZE1ldGhvZD1lcnJvcgorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5kZXByZWNhdGlvbldoZW5PdmVycmlkaW5nRGVwcmVjYXRlZE1ldGhvZD1lbmFibGVkCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLnJlZHVuZGFudE51bGxDaGVjaz1lcnJvcgorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS51bnVzZWRJbXBvcnQ9ZXJyb3IKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmJ1aWxkZXIucmVjcmVhdGVNb2RpZmllZENsYXNzRmlsZUluT3V0cHV0Rm9sZGVyPWlnbm9yZQorb3JnLmVjbGlwc2UuamR0LmNvcmUuYnVpbGRlci5yZXNvdXJjZUNvcHlFeGNsdXNpb25GaWx0ZXI9Ki5sYXVuY2gKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNsYXNzcGF0aC5tdWx0aXBsZU91dHB1dExvY2F0aW9ucz1lbmFibGVkCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLnN1cHByZXNzV2FybmluZ3M9ZW5hYmxlZAorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS50eXBlUGFyYW1ldGVySGlkaW5nPWVycm9yCitvcmcuZWNsaXBzZS5qZHQuY29yZS5idWlsZGVyLmludmFsaWRDbGFzc3BhdGg9YWJvcnQKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0ubG9jYWxWYXJpYWJsZUhpZGluZz13YXJuaW5nCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLnBvc3NpYmxlQWNjaWRlbnRhbEJvb2xlYW5Bc3NpZ25tZW50PWVycm9yCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLm1pc3NpbmdIYXNoQ29kZU1ldGhvZD1lcnJvcgorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29kZUNvbXBsZXRlLmFyZ3VtZW50U3VmZml4ZXM9CitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb2RlQ29tcGxldGUuYXJndW1lbnRQcmVmaXhlcz0KK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0uaW5kaXJlY3RTdGF0aWNBY2Nlc3M9aWdub3JlCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLnBvdGVudGlhbE51bGxSZWZlcmVuY2U9ZXJyb3IKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLmNvZGVnZW4uaW5saW5lSnNyQnl0ZWNvZGU9ZW5hYmxlZAorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5maW5hbFBhcmFtZXRlckJvdW5kPXdhcm5pbmcKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0ubWlzc2luZ1NlcmlhbFZlcnNpb249ZXJyb3IKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0ubnVsbFJlZmVyZW5jZT1lcnJvcgorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIuc291cmNlPTEuNQorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5lbnVtSWRlbnRpZmllcj1lcnJvcgorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5zeW50aGV0aWNBY2Nlc3NFbXVsYXRpb249aWdub3JlCitvcmcuZWNsaXBzZS5qZHQuY29yZS5idWlsZGVyLmR1cGxpY2F0ZVJlc291cmNlVGFzaz13YXJuaW5nCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLmZpZWxkSGlkaW5nPXdhcm5pbmcKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0udW51c2VkRGVjbGFyZWRUaHJvd25FeGNlcHRpb25FeGVtcHRFeGNlcHRpb25BbmRUaHJvd2FibGU9ZW5hYmxlZAorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5taXNzaW5nT3ZlcnJpZGVBbm5vdGF0aW9uPWVycm9yCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLmhpZGRlbkNhdGNoQmxvY2s9ZXJyb3IKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0ub3ZlcnJpZGluZ1BhY2thZ2VEZWZhdWx0TWV0aG9kPWVycm9yCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLmZpbmFsbHlCbG9ja05vdENvbXBsZXRpbmdOb3JtYWxseT1lcnJvcgorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS51bmRvY3VtZW50ZWRFbXB0eUJsb2NrPXdhcm5pbmcKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNsYXNzcGF0aC5leGNsdXNpb25QYXR0ZXJucz1lbmFibGVkCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLm1ldGhvZFdpdGhDb25zdHJ1Y3Rvck5hbWU9ZXJyb3IKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0uZGlzY291cmFnZWRSZWZlcmVuY2U9d2FybmluZworb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS51bnF1YWxpZmllZEZpZWxkQWNjZXNzPWlnbm9yZQorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5pbmNvbXBsZXRlRW51bVN3aXRjaD1lcnJvcgorZWNsaXBzZS5wcmVmZXJlbmNlcy52ZXJzaW9uPTEKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmluY29tcGxldGVDbGFzc3BhdGg9ZXJyb3IKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0udW5uZWNlc3NhcnlUeXBlQ2hlY2s9ZXJyb3IKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0uZGVhZENvZGU9ZXJyb3IKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0uc3BlY2lhbFBhcmFtZXRlckhpZGluZ0ZpZWxkPWVuYWJsZWQKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0uZmF0YWxPcHRpb25hbEVycm9yPWVuYWJsZWQKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0ubm9FZmZlY3RBc3NpZ25tZW50PWVycm9yCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5kZWJ1Zy5zb3VyY2VGaWxlPWdlbmVyYXRlCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLnVudXNlZERlY2xhcmVkVGhyb3duRXhjZXB0aW9uSW5jbHVkZVVuY2hlY2tlZEV4Y2VwdGlvbnM9ZGlzYWJsZWQKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0ubWlzc2luZ0RlcHJlY2F0ZWRBbm5vdGF0aW9uPXdhcm5pbmcKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvZGVDb21wbGV0ZS5maWVsZFByZWZpeGVzPQorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5mYWxsdGhyb3VnaENhc2U9d2FybmluZworb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIuY29kZWdlbi50YXJnZXRQbGF0Zm9ybT0xLjUKIG9yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0udW51c2VkUHJpdmF0ZU1lbWJlcj1lcnJvcgotb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS52YXJhcmdzQXJndW1lbnROZWVkQ2FzdD1pZ25vcmUKLW9yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnNvdXJjZT0xLjMKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0uYXV0b2JveGluZz13YXJuaW5nCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jaXJjdWxhckNsYXNzcGF0aD1lcnJvcgorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5hbm5vdGF0aW9uU3VwZXJJbnRlcmZhY2U9d2FybmluZworb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5ub25FeHRlcm5hbGl6ZWRTdHJpbmdMaXRlcmFsPWVycm9yCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb2RlQ29tcGxldGUuZmllbGRTdWZmaXhlcz0KK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvZGVDb21wbGV0ZS5sb2NhbFN1ZmZpeGVzPQorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5wYXJhbWV0ZXJBc3NpZ25tZW50PWVycm9yCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLnN0YXRpY0FjY2Vzc1JlY2VpdmVyPWVycm9yCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb2RlQ29tcGxldGUubG9jYWxQcmVmaXhlcz0KK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0udW51c2VkRGVjbGFyZWRUaHJvd25FeGNlcHRpb25JbmNsdWRlRG9jQ29tbWVudFJlZmVyZW5jZT1lbmFibGVkCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5tYXhQcm9ibGVtUGVyVW5pdD0xMDAKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0udmFyYXJnc0FyZ3VtZW50TmVlZENhc3Q9ZXJyb3IKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0uYXNzZXJ0SWRlbnRpZmllcj1lcnJvcgorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIuY29tcGxpYW5jZT0xLjUKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0udW51c2VkUGFyYW1ldGVySW5jbHVkZURvY0NvbW1lbnRSZWZlcmVuY2U9ZW5hYmxlZAorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29kZUNvbXBsZXRlLnN0YXRpY0ZpZWxkUHJlZml4ZXM9CitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5kZWJ1Zy5sb2NhbFZhcmlhYmxlPWdlbmVyYXRlCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLnVuaGFuZGxlZFdhcm5pbmdUb2tlbj13YXJuaW5nCitpbnN0YW5jZS9vcmcuZWNsaXBzZS5jb3JlLm5ldC9vcmcuZWNsaXBzZS5jb3JlLm5ldC5oYXNNaWdyYXRlZD10cnVlCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLmZvcmJpZGRlblJlZmVyZW5jZT1lcnJvcgorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIuY29kZWdlbi51bnVzZWRMb2NhbD1wcmVzZXJ2ZQorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS51bmNoZWNrZWRUeXBlT3BlcmF0aW9uPXdhcm5pbmcKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0udW51c2VkRGVjbGFyZWRUaHJvd25FeGNlcHRpb25XaGVuT3ZlcnJpZGluZz1kaXNhYmxlZAorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29kZUNvbXBsZXRlLnN0YXRpY0ZpZWxkU3VmZml4ZXM9CmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW1mL01FVEEtSU5GL01BTklGRVNULk1GIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVtZi9NRVRBLUlORi9NQU5JRkVTVC5NRgppbmRleCAxODJhZWU4Li41NGRlODRmIDEwMDY0NAotLS0gYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW1mL01FVEEtSU5GL01BTklGRVNULk1GCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbWYvTUVUQS1JTkYvTUFOSUZFU1QuTUYKQEAgLTIsNyArMiw3IEBACiBCdW5kbGUtTWFuaWZlc3RWZXJzaW9uOiAyCiBCdW5kbGUtTmFtZTogJXBsdWdpbk5hbWUKIEJ1bmRsZS1TeW1ib2xpY05hbWU6IG9yZy5lY2xpcHNlLndzdC5jb21tb24uZW1mOyBzaW5nbGV0b246PXRydWUKLUJ1bmRsZS1WZXJzaW9uOiAxLjEuMjAxLnF1YWxpZmllcgorQnVuZGxlLVZlcnNpb246IDEuMi4wLnF1YWxpZmllcgogQnVuZGxlLUFjdGl2YXRvcjogb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5pbnRlcm5hbC5lbWYucGx1Z2luLkVjb3JlVXRpbGl0aWVzUGx1Z2luCiBCdW5kbGUtVmVuZG9yOiAlcGx1Z2luUHJvdmlkZXIKIEJ1bmRsZS1Mb2NhbGl6YXRpb246IHBsdWdpbgpAQCAtMTMsNyArMTMsNyBAQAogIG9yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3JrcztidW5kbGUtdmVyc2lvbj0iWzEuMS4yMDAsMi4wLjApIiwKICBvcmcuZWNsaXBzZS5jb3JlLnJ1bnRpbWU7YnVuZGxlLXZlcnNpb249IlszLjQuMCw0LjAuMCkiLAogIG9yZy5lY2xpcHNlLmNvcmUucmVzb3VyY2VzO2J1bmRsZS12ZXJzaW9uPSJbMy40LjAsNC4wLjApIiwKLSBvcmcuZWNsaXBzZS5qZW0udXRpbDtidW5kbGUtdmVyc2lvbj0iWzIuMC4xMDAsMy4wLjApIgorIG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29yZTtidW5kbGUtdmVyc2lvbj0iWzEuMS4yMDEsMi4wLjApIgogRWNsaXBzZS1MYXp5U3RhcnQ6IHRydWUKLUJ1bmRsZS1SZXF1aXJlZEV4ZWN1dGlvbkVudmlyb25tZW50OiBKMlNFLTEuNAorQnVuZGxlLVJlcXVpcmVkRXhlY3V0aW9uRW52aXJvbm1lbnQ6IEoyU0UtMS41CiBCdW5kbGUtQWN0aXZhdGlvblBvbGljeTogbGF6eQpkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVtZi9wbHVnaW4ueG1sIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVtZi9wbHVnaW4ueG1sCmluZGV4IGRkZTZhZDguLjVkYzEzYTYgMTAwNjQ0Ci0tLSBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbWYvcGx1Z2luLnhtbAorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW1mL3BsdWdpbi54bWwKQEAgLTI0LDcgKzI0LDcgQEAKICAgIDwvZXh0ZW5zaW9uPgogICAgCiAgICAgICA8ZXh0ZW5zaW9uCi0gICAgICAgICBwb2ludD0ib3JnLmVjbGlwc2UuamVtLnV0aWwudWlDb250ZXh0U2Vuc2l0aXZlQ2xhc3MiPgorICAgICAgICAgcG9pbnQ9Im9yZy5lY2xpcHNlLndzdC5jb21tb24uY29yZS51aUNvbnRleHRTZW5zaXRpdmVDbGFzcyI+CiAgICAgICA8dWlDb250ZXh0U2Vuc2l0aXZlQ2xhc3MKICAgICAgICAgICAgIGNvbnRleHQ9IkhlYWRsZXNzIgogICAgICAgICAgICAga2V5PSJyZW5kZXJlckZhY3RvcnkiCmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW1mL3dvcmtiZW5jaC9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2VtZi9SZXNvdXJjZVN5bmNocm9uaXplZElzTG9hZGluZ0FkYXB0ZXIuamF2YSBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbWYvd29ya2JlbmNoL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW1mL1Jlc291cmNlU3luY2hyb25pemVkSXNMb2FkaW5nQWRhcHRlci5qYXZhCmluZGV4IDUwMzRjN2EuLmY3YzY5MTkgMTAwNjQ0Ci0tLSBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbWYvd29ya2JlbmNoL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW1mL1Jlc291cmNlU3luY2hyb25pemVkSXNMb2FkaW5nQWRhcHRlci5qYXZhCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbWYvd29ya2JlbmNoL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW1mL1Jlc291cmNlU3luY2hyb25pemVkSXNMb2FkaW5nQWRhcHRlci5qYXZhCkBAIC0xLDUgKzEsNSBAQAogLyoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioKLSAqIENvcHlyaWdodCAoYykgMjAwNSwgMjAwNyBJQk0gQ29ycG9yYXRpb24gYW5kIG90aGVycy4KKyAqIENvcHlyaWdodCAoYykgMjAwNSwgMjAwOSBJQk0gQ29ycG9yYXRpb24gYW5kIG90aGVycy4KICAqIEFsbCByaWdodHMgcmVzZXJ2ZWQuIFRoaXMgcHJvZ3JhbSBhbmQgdGhlIGFjY29tcGFueWluZyBtYXRlcmlhbHMKICAqIGFyZSBtYWRlIGF2YWlsYWJsZSB1bmRlciB0aGUgdGVybXMgb2YgdGhlIEVjbGlwc2UgUHVibGljIExpY2Vuc2UgdjEuMAogICogd2hpY2ggYWNjb21wYW5pZXMgdGhpcyBkaXN0cmlidXRpb24sIGFuZCBpcyBhdmFpbGFibGUgYXQKQEAgLTEwLDE4ICsxMCwxNiBAQAogICoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKiovCiAvKgogICogQ3JlYXRlZCBvbiBPY3QgMjYsIDIwMDQKLSAqCi0gKiBUT0RPIFRvIGNoYW5nZSB0aGUgdGVtcGxhdGUgZm9yIHRoaXMgZ2VuZXJhdGVkIGZpbGUgZ28gdG8KLSAqIFdpbmRvdyAtIFByZWZlcmVuY2VzIC0gSmF2YSAtIENvZGUgU3R5bGUgLSBDb2RlIFRlbXBsYXRlcwogICovCiBwYWNrYWdlIG9yZy5lY2xpcHNlLndzdC5jb21tb24uaW50ZXJuYWwuZW1mOwogCi1pbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5ydW50aW1lLlBsYXRmb3JtOwogaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucnVudGltZS5qb2JzLklMb2NrOworaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucnVudGltZS5qb2JzLkpvYjsKIGltcG9ydCBvcmcuZWNsaXBzZS5lbWYuY29tbW9uLm5vdGlmeS5Ob3RpZmljYXRpb247CiBpbXBvcnQgb3JnLmVjbGlwc2UuZW1mLmNvbW1vbi5ub3RpZnkuTm90aWZpZXI7CiBpbXBvcnQgb3JnLmVjbGlwc2UuZW1mLmVjb3JlLnJlc291cmNlLlJlc291cmNlOwogaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uaW50ZXJuYWwuZW1mLnV0aWxpdGllcy5SZXNvdXJjZUlzTG9hZGluZ0FkYXB0ZXI7CitpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5pbnRlcm5hbC5lbWYucGx1Z2luLkVjb3JlVXRpbGl0aWVzUGx1Z2luOwogCiAKIApAQCAtNDQsMTMgKzQyLDEzIEBACiAJICogVGhlIGRlbGF5IGlzIGRlZmF1bHQgdG8gNSBtaW51dGVzLiBUaGlzIGlzIHRoZSB1cHdhcmQgdGhyZXNoaG9sZC4gVGhlCiAJICogbG9jayB3aWxsIHdhaXQgdXAgdG8gREVMQVkgbWlsbGlzZWNvbmRzIHRvIGFjcXVpcmUgdGhlIGxvY2ssIGFuZCBiYWlsCiAJICogaWYgbm90LiBJdCBkb2VzIG5vdCBtZWFuIHRoYXQgaXQgd2lsbCB3YWl0IERFTEFZIG1pbGxpc2Vjb25kcyBhbHdheXMuCi0JICogSW4gZ2VuZXJhbCwgdGhlIHdhaXQgc2hvdWxkIGJlIGFsbW9zdCBpbnN0YW50ZW91cyAtLSBqdXN0IGFzIGxvbmcgYXMKKwkgKiBJbiBnZW5lcmFsLCB0aGUgd2FpdCBzaG91bGQgYmUgYWxtb3N0IGluc3RhbnRhbmVvdXMgLS0ganVzdCBhcyBsb25nIGFzCiAJICogZG9jdW1lbnQgbG9hZGluZyByZW1haW5zIHNwZWVkeS4KIAkgKi8KIAlwcml2YXRlIHN0YXRpYyBmaW5hbCBsb25nIERFTEFZID0gMzAwMDAwOwogCiAJcHVibGljIFJlc291cmNlU3luY2hyb25pemVkSXNMb2FkaW5nQWRhcHRlcigpIHsKLQkJbG9hZGluZ0xvY2sgPSBQbGF0Zm9ybS5nZXRKb2JNYW5hZ2VyKCkubmV3TG9jaygpOworCQlsb2FkaW5nTG9jayA9IEpvYi5nZXRKb2JNYW5hZ2VyKCkubmV3TG9jaygpOwogCQlpZiAobG9hZGluZ0xvY2sgIT0gbnVsbCkKIAkJCWxvYWRpbmdMb2NrLmFjcXVpcmUoKTsKIAl9CkBAIC02MSw2ICs1OSw3IEBACiAJICogCiAJICogQHNlZSBjb20uaWJtLnd0cC5pbnRlcm5hbC5lbWYudXRpbGl0aWVzLlJlc291cmNlSXNMb2FkaW5nQWRhcHRlciN3YWl0Rm9yUmVzb3VyY2VUb0xvYWQoKQogCSAqLworCUBPdmVycmlkZQogCXB1YmxpYyB2b2lkIHdhaXRGb3JSZXNvdXJjZVRvTG9hZCgpIHsKIAogCQlpZiAobG9hZGluZ0xvY2sgPT0gbnVsbCkKQEAgLTkwLDkgKzg5LDggQEAKIAkJTm90aWZpZXIgdGFyZ2V0ID0gZ2V0VGFyZ2V0KCk7CiAJCWlmICh0YXJnZXQgPT0gbnVsbCB8fCAhKHRhcmdldCBpbnN0YW5jZW9mIFJlc291cmNlKSkgewogCQkJUmVzb3VyY2UgcmVzb3VyY2UgPSAoUmVzb3VyY2UpIHRhcmdldDsKLQkJCVN5c3RlbS5lcnIucHJpbnRsbigiW1dBUk5JTkddIENvdWxkIG5vdCBhY3F1aXJlIFNlbWFwaG9yZSBMb2NrIGZvciBSZXNvdXJjZTogXCIiICsgcmVzb3VyY2UuZ2V0VVJJKCkgKyAiXCIgaW4gIiArIGdldENsYXNzKCkpOworCQkJRWNvcmVVdGlsaXRpZXNQbHVnaW4ubG9nRXJyb3IoIltXQVJOSU5HXSBDb3VsZCBub3QgYWNxdWlyZSBTZW1hcGhvcmUgTG9jayBmb3IgUmVzb3VyY2U6IFwiIiArIHJlc291cmNlLmdldFVSSSgpICsgIlwiIGluICIgKyBnZXRDbGFzcygpKTsgIC8vJE5PTi1OTFMtMSQvLyROT04tTkxTLTIkCiAJCX0KLQogCX0KIAogCkBAIC0xMDEsNiArOTksNyBAQAogCSAqIAogCSAqIEBzZWUgY29tLmlibS53dHAuaW50ZXJuYWwuZW1mLnV0aWxpdGllcy5SZXNvdXJjZUlzTG9hZGluZ0FkYXB0ZXIjbm90aWZ5Q2hhbmdlZChvcmcuZWNsaXBzZS5lbWYuY29tbW9uLm5vdGlmeS5Ob3RpZmljYXRpb24pCiAJICovCisJQE92ZXJyaWRlCiAJcHVibGljIHZvaWQgbm90aWZ5Q2hhbmdlZChOb3RpZmljYXRpb24gbm90aWZpY2F0aW9uKSB7CiAKIAkJaWYgKG5vdGlmaWNhdGlvbi5nZXROb3RpZmllcigpICE9IG51bGwpIHsKQEAgLTExOSw2ICsxMTgsNyBAQAogCSAqIAogCSAqIEBzZWUgY29tLmlibS53dHAuaW50ZXJuYWwuZW1mLnV0aWxpdGllcy5SZXNvdXJjZUlzTG9hZGluZ0FkYXB0ZXIjZm9yY2VSZWxlYXNlKCkKIAkgKi8KKwlAT3ZlcnJpZGUKIAlwdWJsaWMgdm9pZCBmb3JjZVJlbGVhc2UoKSB7CiAJCWlmIChsb2FkaW5nTG9jayAhPSBudWxsICYmIGxvYWRpbmdMb2NrLmdldERlcHRoKCkgPiAwKQogCQkJbG9hZGluZ0xvY2sucmVsZWFzZSgpOwpkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVtZi93b3JrYmVuY2gvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbWYvUmVzb3VyY2VTeW5jaHJvbml6ZWRJc0xvYWRpbmdBZGFwdGVyRmFjdG9yeS5qYXZhIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVtZi93b3JrYmVuY2gvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbWYvUmVzb3VyY2VTeW5jaHJvbml6ZWRJc0xvYWRpbmdBZGFwdGVyRmFjdG9yeS5qYXZhCmluZGV4IDE5OTBlOGEuLjkwMWIzYjYgMTAwNjQ0Ci0tLSBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbWYvd29ya2JlbmNoL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW1mL1Jlc291cmNlU3luY2hyb25pemVkSXNMb2FkaW5nQWRhcHRlckZhY3RvcnkuamF2YQorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW1mL3dvcmtiZW5jaC9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2VtZi9SZXNvdXJjZVN5bmNocm9uaXplZElzTG9hZGluZ0FkYXB0ZXJGYWN0b3J5LmphdmEKQEAgLTEwLDkgKzEwLDYgQEAKICAqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqLwogLyoKICAqIENyZWF0ZWQgb24gT2N0IDI2LCAyMDA0Ci0gKgotICogVE9ETyBUbyBjaGFuZ2UgdGhlIHRlbXBsYXRlIGZvciB0aGlzIGdlbmVyYXRlZCBmaWxlIGdvIHRvCi0gKiBXaW5kb3cgLSBQcmVmZXJlbmNlcyAtIEphdmEgLSBDb2RlIFN0eWxlIC0gQ29kZSBUZW1wbGF0ZXMKICAqLwogcGFja2FnZSBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmludGVybmFsLmVtZjsKIApAQCAtMjIsOSArMTksNiBAQAogCiAvKioKICAqIEBhdXRob3IgbWRlbGRlcgotICoKLSAqIFRPRE8gVG8gY2hhbmdlIHRoZSB0ZW1wbGF0ZSBmb3IgdGhpcyBnZW5lcmF0ZWQgdHlwZSBjb21tZW50IGdvIHRvCi0gKiBXaW5kb3cgLSBQcmVmZXJlbmNlcyAtIEphdmEgLSBDb2RlIFN0eWxlIC0gQ29kZSBUZW1wbGF0ZXMKICAqLwogcHVibGljIGNsYXNzIFJlc291cmNlU3luY2hyb25pemVkSXNMb2FkaW5nQWRhcHRlckZhY3RvcnkgZXh0ZW5kcyBSZXNvdXJjZUlzTG9hZGluZ0FkYXB0ZXJGYWN0b3J5IHsKIApAQCAtMzIsNyArMjYsOCBAQAogICAgIC8qIChub24tSmF2YWRvYykKICAgICAgKiBAc2VlIGNvbS5pYm0ud3RwLmludGVybmFsLmVtZi51dGlsaXRpZXMuUmVzb3VyY2VJc0xvYWRpbmdBZGFwdGVyRmFjdG9yeSNjcmVhdGVSZXNvdXJjZUlzTG9hZGluZ0FkYXB0ZXIoKQogICAgICAqLwotICAgIHB1YmxpYyBSZXNvdXJjZUlzTG9hZGluZ0FkYXB0ZXIgY3JlYXRlUmVzb3VyY2VJc0xvYWRpbmdBZGFwdGVyKCkgeyAKKyAgICBAT3ZlcnJpZGUKKwlwdWJsaWMgUmVzb3VyY2VJc0xvYWRpbmdBZGFwdGVyIGNyZWF0ZVJlc291cmNlSXNMb2FkaW5nQWRhcHRlcigpIHsgCiAgICAgICAgIHJldHVybiBuZXcgUmVzb3VyY2VTeW5jaHJvbml6ZWRJc0xvYWRpbmdBZGFwdGVyKCk7CiAgICAgfQogfQpkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVtZi93b3JrYmVuY2gvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbWYvcGx1Z2luL0Vjb3JlVXRpbGl0aWVzUGx1Z2luLmphdmEgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW1mL3dvcmtiZW5jaC9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2VtZi9wbHVnaW4vRWNvcmVVdGlsaXRpZXNQbHVnaW4uamF2YQppbmRleCAxYzI0YzA1Li4xZjE5NDM3IDEwMDY0NAotLS0gYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW1mL3dvcmtiZW5jaC9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2VtZi9wbHVnaW4vRWNvcmVVdGlsaXRpZXNQbHVnaW4uamF2YQorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW1mL3dvcmtiZW5jaC9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2VtZi9wbHVnaW4vRWNvcmVVdGlsaXRpZXNQbHVnaW4uamF2YQpAQCAtMjEsNiArMjEsMTEgQEAKIGltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmludGVybmFsLmVtZi5yZXNvdXJjZS5SZW5kZXJlckZhY3Rvcnk7CiBpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5pbnRlcm5hbC5lbWYudXRpbGl0aWVzLlJlc291cmNlSXNMb2FkaW5nQWRhcHRlckZhY3Rvcnk7CiBpbXBvcnQgb3JnLm9zZ2kuZnJhbWV3b3JrLkJ1bmRsZUNvbnRleHQ7CitpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5ydW50aW1lLlN0YXR1czsKK2ltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJ1bnRpbWUuSVN0YXR1czsKK2ltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJ1bnRpbWUuUGxhdGZvcm07CitpbXBvcnQgamF2YS5sYW5nLlRocm93YWJsZTsKK2ltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJ1bnRpbWUuQ29yZUV4Y2VwdGlvbjsKIAogLyoqCiAgKiBAYXV0aG9yIERBQkVSRwpAQCAtMjksNiArMzQsOCBAQAogICogR2VuZXJhdGlvbj5Db2RlIGFuZCBDb21tZW50cwogICovCiBwdWJsaWMgY2xhc3MgRWNvcmVVdGlsaXRpZXNQbHVnaW4gZXh0ZW5kcyBQbHVnaW4geworCS8vdGhlIElEIGZvciB0aGlzIHBsdWdpbiAoYWRkZWQgYXV0b21hdGljYWxseSBieSBsb2dnaW5nIHF1aWNrZml4KQorCXB1YmxpYyBzdGF0aWMgZmluYWwgU3RyaW5nIFBMVUdJTl9JRCA9ICJvcmcuZWNsaXBzZS53c3QuY29tbW9uLmVtZiI7IC8vJE5PTi1OTFMtMSQKIAlwdWJsaWMgc3RhdGljIGZpbmFsIFN0cmluZyBJRCA9ICJvcmcuZWNsaXBzZS53c3QuY29tbW9uLmVtZiI7IC8vJE5PTi1OTFMtMSQKIAlwdWJsaWMgc3RhdGljIGZpbmFsIFN0cmluZyBUUkFOU0xBVE9SX0VYVEVOU1RJT05fUE9JTlQgPSAidHJhbnNsYXRvckV4dGVuc2lvbiI7IC8vJE5PTi1OTFMtMSQKIApAQCAtNDQsNiArNTEsNyBAQAogCSAqIAogCSAqIEBzZWUgb3JnLmVjbGlwc2UuY29yZS5ydW50aW1lLlBsdWdpbiNzdGFydHVwKCkKIAkgKi8KKwlAT3ZlcnJpZGUKIAlwdWJsaWMgdm9pZCBzdGFydChCdW5kbGVDb250ZXh0IGNvbnRleHQpIHRocm93cyBFeGNlcHRpb24gewogCQlzdXBlci5zdGFydChjb250ZXh0KTsKIAkJUmVuZGVyZXJGYWN0b3J5LnNldERlZmF1bHRIYW5kbGVyKFBsdWdpblJlbmRlcmVyRmFjdG9yeURlZmF1bHRIYW5kbGVyLklOU1RBTkNFKTsKQEAgLTUyLDQgKzYwLDMzIEBACiAJCS8vdXNlIGEgc3luY2hyb25pemVkIGxvYWRpbmcgYWRhcHRlciBmYWN0b3J5CiAJCVJlc291cmNlSXNMb2FkaW5nQWRhcHRlckZhY3RvcnkuSU5TVEFOQ0UgPSBuZXcgUmVzb3VyY2VTeW5jaHJvbml6ZWRJc0xvYWRpbmdBZGFwdGVyRmFjdG9yeSgpOwogCX0KKworCXB1YmxpYyBzdGF0aWMgSVN0YXR1cyBjcmVhdGVTdGF0dXMoaW50IHNldmVyaXR5LCBTdHJpbmcgbWVzc2FnZSwgVGhyb3dhYmxlIGV4Y2VwdGlvbikgeworCQlyZXR1cm4gbmV3IFN0YXR1cyhzZXZlcml0eSwgUExVR0lOX0lELCBtZXNzYWdlLCBleGNlcHRpb24pOworCX0KKworCXB1YmxpYyBzdGF0aWMgSVN0YXR1cyBjcmVhdGVTdGF0dXMoaW50IHNldmVyaXR5LCBTdHJpbmcgbWVzc2FnZSkgeworCQlyZXR1cm4gY3JlYXRlU3RhdHVzKHNldmVyaXR5LCBtZXNzYWdlLCBudWxsKTsKKwl9CisKKwlwdWJsaWMgc3RhdGljIHZvaWQgbG9nRXJyb3IoVGhyb3dhYmxlIGV4Y2VwdGlvbikgeworCQlQbGF0Zm9ybS5nZXRMb2coUGxhdGZvcm0uZ2V0QnVuZGxlKFBMVUdJTl9JRCkpLmxvZyggY3JlYXRlU3RhdHVzKElTdGF0dXMuRVJST1IsIGV4Y2VwdGlvbi5nZXRNZXNzYWdlKCksIGV4Y2VwdGlvbikpOworCX0KKworCXB1YmxpYyBzdGF0aWMgdm9pZCBsb2dFcnJvcihDb3JlRXhjZXB0aW9uIGV4Y2VwdGlvbikgeworCQlQbGF0Zm9ybS5nZXRMb2coUGxhdGZvcm0uZ2V0QnVuZGxlKFBMVUdJTl9JRCkpLmxvZyggZXhjZXB0aW9uLmdldFN0YXR1cygpICk7CisJfQorCisJcHVibGljIHN0YXRpYyB2b2lkIGxvZ0Vycm9yKFN0cmluZyBtZXNzYWdlKSB7CisJCVBsYXRmb3JtLmdldExvZyhQbGF0Zm9ybS5nZXRCdW5kbGUoUExVR0lOX0lEKSkubG9nKCBjcmVhdGVTdGF0dXMoSVN0YXR1cy5FUlJPUiwgbWVzc2FnZSkpOworCX0KKworCXB1YmxpYyBzdGF0aWMgdm9pZCBsb2dXYXJuaW5nKFN0cmluZyBtZXNzYWdlKSB7CisJCVBsYXRmb3JtLmdldExvZyhQbGF0Zm9ybS5nZXRCdW5kbGUoUExVR0lOX0lEKSkubG9nKGNyZWF0ZVN0YXR1cyhJU3RhdHVzLldBUk5JTkcsIG1lc3NhZ2UpKTsKKwl9CisJCisJcHVibGljIHN0YXRpYyB2b2lkIGxvZ1dhcm5pbmcoVGhyb3dhYmxlIGV4Y2VwdGlvbikgeworCQlQbGF0Zm9ybS5nZXRMb2coUGxhdGZvcm0uZ2V0QnVuZGxlKFBMVUdJTl9JRCkpLmxvZyggY3JlYXRlU3RhdHVzKElTdGF0dXMuV0FSTklORywgZXhjZXB0aW9uLmdldE1lc3NhZ2UoKSwgZXhjZXB0aW9uKSk7CisJfQorCiB9CmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW1mL3dvcmtiZW5jaC9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2VtZi9wbHVnaW4vUGx1Z2luUmVuZGVyZXJGYWN0b3J5RGVmYXVsdEhhbmRsZXIuamF2YSBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbWYvd29ya2JlbmNoL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW1mL3BsdWdpbi9QbHVnaW5SZW5kZXJlckZhY3RvcnlEZWZhdWx0SGFuZGxlci5qYXZhCmluZGV4IGVlODA3NTcuLjRhZDlkYzkgMTAwNjQ0Ci0tLSBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbWYvd29ya2JlbmNoL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW1mL3BsdWdpbi9QbHVnaW5SZW5kZXJlckZhY3RvcnlEZWZhdWx0SGFuZGxlci5qYXZhCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbWYvd29ya2JlbmNoL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW1mL3BsdWdpbi9QbHVnaW5SZW5kZXJlckZhY3RvcnlEZWZhdWx0SGFuZGxlci5qYXZhCkBAIC04LDI0ICs4LDEyIEBACiAgKiBDb250cmlidXRvcnM6CiAgKiBJQk0gQ29ycG9yYXRpb24gLSBpbml0aWFsIEFQSSBhbmQgaW1wbGVtZW50YXRpb24KICAqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqLwotLyoKLSAqIENyZWF0ZWQgb24gRGVjIDEsIDIwMDMKLSAqCi0gKiBUbyBjaGFuZ2UgdGhlIHRlbXBsYXRlIGZvciB0aGlzIGdlbmVyYXRlZCBmaWxlIGdvIHRvCi0gKiBXaW5kb3cmZ3Q7UHJlZmVyZW5jZXMmZ3Q7SmF2YSZndDtDb2RlIEdlbmVyYXRpb24mZ3Q7Q29kZSBhbmQgQ29tbWVudHMKLSAqLwogcGFja2FnZSBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmludGVybmFsLmVtZi5wbHVnaW47CiAKLWltcG9ydCBvcmcuZWNsaXBzZS5qZW0udXRpbC5VSUNvbnRleHREZXRlcm1pbmF0aW9uOworaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29yZS51dGlsLlVJQ29udGV4dERldGVybWluYXRpb247CiBpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5pbnRlcm5hbC5lbWYucmVzb3VyY2UuRU1GMkRPTVJlbmRlcmVyRmFjdG9yeURlZmF1bHRIYW5kbGVyOwogaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uaW50ZXJuYWwuZW1mLnJlc291cmNlLlJlbmRlcmVyRmFjdG9yeTsKIAotLyoqCi0gKiBAYXV0aG9yIHNjaGFjaGVyCi0gKiAKLSAqIFRvIGNoYW5nZSB0aGUgdGVtcGxhdGUgZm9yIHRoaXMgZ2VuZXJhdGVkIHR5cGUgY29tbWVudCBnbyB0bwotICogV2luZG93Jmd0O1ByZWZlcmVuY2VzJmd0O0phdmEmZ3Q7Q29kZSBHZW5lcmF0aW9uJmd0O0NvZGUgYW5kIENvbW1lbnRzCi0gKi8KIHB1YmxpYyBjbGFzcyBQbHVnaW5SZW5kZXJlckZhY3RvcnlEZWZhdWx0SGFuZGxlciBleHRlbmRzIEVNRjJET01SZW5kZXJlckZhY3RvcnlEZWZhdWx0SGFuZGxlciB7CiAKIAlzdGF0aWMgZmluYWwgUGx1Z2luUmVuZGVyZXJGYWN0b3J5RGVmYXVsdEhhbmRsZXIgSU5TVEFOQ0UgPSBuZXcgUGx1Z2luUmVuZGVyZXJGYWN0b3J5RGVmYXVsdEhhbmRsZXIoKTsKQEAgLTQzLDYgKzMxLDcgQEAKIAkgKiAKIAkgKiBAc2VlIGNvbS5pYm0uZXRvb2xzLmVtZjJ4bWwuRU1GMkRPTVJlbmRlcmVyRmFjdG9yeURlZmF1bHRIYW5kbGVyI2dldERlZmF1bHRSZW5kZXJlckZhY3RvcnkoKQogCSAqLworCUBPdmVycmlkZQogCXB1YmxpYyBSZW5kZXJlckZhY3RvcnkgZ2V0RGVmYXVsdFJlbmRlcmVyRmFjdG9yeSgpIHsKIAkJUmVuZGVyZXJGYWN0b3J5IGFGYWN0b3J5ID0gKFJlbmRlcmVyRmFjdG9yeSkgVUlDb250ZXh0RGV0ZXJtaW5hdGlvbi5jcmVhdGVJbnN0YW5jZShFWFRfUE9JTlRfTkFNRSk7CiAJCXJldHVybiBhRmFjdG9yeSA9PSBudWxsID8gc3VwZXIuZ2V0RGVmYXVsdFJlbmRlcmVyRmFjdG9yeSgpIDogYUZhY3Rvcnk7CmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW1mL3d0cGVtZi9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2VtZi9yZXNvdXJjZS9BYnN0cmFjdFJlbmRlcmVySW1wbC5qYXZhIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVtZi93dHBlbWYvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbWYvcmVzb3VyY2UvQWJzdHJhY3RSZW5kZXJlckltcGwuamF2YQppbmRleCBjZmY4M2I3Li43YTk1NDViIDEwMDY0NAotLS0gYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW1mL3d0cGVtZi9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2VtZi9yZXNvdXJjZS9BYnN0cmFjdFJlbmRlcmVySW1wbC5qYXZhCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbWYvd3RwZW1mL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW1mL3Jlc291cmNlL0Fic3RyYWN0UmVuZGVyZXJJbXBsLmphdmEKQEAgLTE1MSw0ICsxNTEsOCBAQAogCXB1YmxpYyBib29sZWFuIGlzQmF0Y2hNb2RlKCkgewogCQlyZXR1cm4gZmFsc2U7CiAJfQorCisJcHVibGljIGJvb2xlYW4gaXNSZXZlcnRpbmcoKSB7CisJCXJldHVybiBmYWxzZTsKKwl9CiB9CmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW1mL3d0cGVtZi9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2VtZi9yZXNvdXJjZS9BdHRyaWJ1dGVUcmFuc2xhdG9yRmlsdGVyLmphdmEgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW1mL3d0cGVtZi9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2VtZi9yZXNvdXJjZS9BdHRyaWJ1dGVUcmFuc2xhdG9yRmlsdGVyLmphdmEKaW5kZXggYjBkMDg2OS4uMzJkZWJjOSAxMDA2NDQKLS0tIGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVtZi93dHBlbWYvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbWYvcmVzb3VyY2UvQXR0cmlidXRlVHJhbnNsYXRvckZpbHRlci5qYXZhCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbWYvd3RwZW1mL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW1mL3Jlc291cmNlL0F0dHJpYnV0ZVRyYW5zbGF0b3JGaWx0ZXIuamF2YQpAQCAtMjMsNiArMjMsNyBAQAogCQlzdXBlcih0cmFucywgdmVyc2lvbik7CiAJfQogCisJQE92ZXJyaWRlCiAJcHVibGljIGZpbmFsIGludCBzY2FuTmV4dFRyYW5zbGF0b3IoVHJhbnNsYXRvcltdIGNoaWxkcmVuLCBpbnQgc3RhcnQpIHsKIAkJaW50IGZvdW5kID0gc3RhcnQgKyAxOwogCQlmb3IgKDsgZm91bmQgPCBjaGlsZHJlbi5sZW5ndGg7ICsrZm91bmQpIHsKZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbWYvd3RwZW1mL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW1mL3Jlc291cmNlL0NhY2hlRXZlbnROb2RlLmphdmEgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW1mL3d0cGVtZi9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2VtZi9yZXNvdXJjZS9DYWNoZUV2ZW50Tm9kZS5qYXZhCmluZGV4IGU1NzU4MzMuLjE4YWViY2QgMTAwNjQ0Ci0tLSBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbWYvd3RwZW1mL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW1mL3Jlc291cmNlL0NhY2hlRXZlbnROb2RlLmphdmEKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVtZi93dHBlbWYvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbWYvcmVzb3VyY2UvQ2FjaGVFdmVudE5vZGUuamF2YQpAQCAtMzE1LDYgKzMxNSw3IEBACiAJCXJldHVybiByZXN1bHQ7CiAJfQogCisJQE92ZXJyaWRlCiAJcHVibGljIFN0cmluZyB0b1N0cmluZygpIHsKIAkJU3RyaW5nQnVmZmVyIG91dHB1dCA9IG5ldyBTdHJpbmdCdWZmZXIoIkNhY2hlRXZlbnROb2RlWyIpOy8vJE5PTi1OTFMtMSQKIAkJb3V0cHV0LmFwcGVuZCgibm9kZU5hbWU9Iik7Ly8kTk9OLU5MUy0xJApkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVtZi93dHBlbWYvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbWYvcmVzb3VyY2UvQ2FjaGVFdmVudFN0YWNrLmphdmEgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW1mL3d0cGVtZi9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2VtZi9yZXNvdXJjZS9DYWNoZUV2ZW50U3RhY2suamF2YQppbmRleCAwM2Y0MTk4Li4wY2U4Yzg1IDEwMDY0NAotLS0gYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW1mL3d0cGVtZi9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2VtZi9yZXNvdXJjZS9DYWNoZUV2ZW50U3RhY2suamF2YQorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW1mL3d0cGVtZi9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2VtZi9yZXNvdXJjZS9DYWNoZUV2ZW50U3RhY2suamF2YQpAQCAtMjcsNiArMjcsMTEgQEAKIAogCS8qKgogCSAqIAorCSAqLworCXByaXZhdGUgc3RhdGljIGZpbmFsIGxvbmcgc2VyaWFsVmVyc2lvblVJRCA9IDEyMDg4OTUzMjAxNDkwNTQxMDNMOworCisJLyoqCisJICogCiAJICogQHJldHVybiB0aGUgdG9wIG9mIHRoZSBzdGFjayB3aXRob3V0IHJlbW92aW5nIGl0CiAJICovCiAJcHVibGljIENhY2hlRXZlbnROb2RlIHBlZWsoKSB7CmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW1mL3d0cGVtZi9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2VtZi9yZXNvdXJjZS9Db21wYXRpYmlsaXR5UmVzb3VyY2VGYWN0b3J5LmphdmEgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW1mL3d0cGVtZi9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2VtZi9yZXNvdXJjZS9Db21wYXRpYmlsaXR5UmVzb3VyY2VGYWN0b3J5LmphdmEKaW5kZXggZjgyNGRlMy4uNmFjNGJiYSAxMDA2NDQKLS0tIGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVtZi93dHBlbWYvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbWYvcmVzb3VyY2UvQ29tcGF0aWJpbGl0eVJlc291cmNlRmFjdG9yeS5qYXZhCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbWYvd3RwZW1mL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW1mL3Jlc291cmNlL0NvbXBhdGliaWxpdHlSZXNvdXJjZUZhY3RvcnkuamF2YQpAQCAtNTMsNiArNTMsNyBAQAogCSAqIAogCSAqIEBzZWUgb3JnLmVjbGlwc2UuZW1mLmVjb3JlLnhtaS5pbXBsLlhNSVJlc291cmNlRmFjdG9yeUltcGwjY3JlYXRlUmVzb3VyY2Uob3JnLmVjbGlwc2UuZW1mLmNvbW1vbi51dGlsLlVSSSkKIAkgKi8KKwlAT3ZlcnJpZGUKIAlwdWJsaWMgUmVzb3VyY2UgY3JlYXRlUmVzb3VyY2UoVVJJIHVyaSkgewogCQlyZXR1cm4gbmV3IENvbXBhdGliaWxpdHlYTUlSZXNvdXJjZUltcGwodXJpKTsKIAl9CmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW1mL3d0cGVtZi9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2VtZi9yZXNvdXJjZS9Db21wYXRpYmlsaXR5U0FYWE1JSGFuZGxlci5qYXZhIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVtZi93dHBlbWYvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbWYvcmVzb3VyY2UvQ29tcGF0aWJpbGl0eVNBWFhNSUhhbmRsZXIuamF2YQppbmRleCBlZTZmZjNlLi5mMjZjYThlIDEwMDY0NAotLS0gYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW1mL3d0cGVtZi9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2VtZi9yZXNvdXJjZS9Db21wYXRpYmlsaXR5U0FYWE1JSGFuZGxlci5qYXZhCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbWYvd3RwZW1mL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW1mL3Jlc291cmNlL0NvbXBhdGliaWxpdHlTQVhYTUlIYW5kbGVyLmphdmEKQEAgLTQ1LDYgKzQ1LDcgQEAKIAkgKiAKIAkgKiBAc2VlIG9yZy5lY2xpcHNlLmVtZi5lY29yZS54bWkuaW1wbC5YTUxIYW5kbGVyI2lzTnVsbCgpCiAJICovCisJQE92ZXJyaWRlCiAJcHJvdGVjdGVkIGJvb2xlYW4gaXNOdWxsKCkgewogCQlib29sZWFuIGlzbnVsbCA9IHN1cGVyLmlzTnVsbCgpOwogCQlpZiAoIWlzbnVsbCkKZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbWYvd3RwZW1mL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW1mL3Jlc291cmNlL0NvbXBhdGliaWxpdHlYTUlMb2FkSW1wbC5qYXZhIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVtZi93dHBlbWYvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbWYvcmVzb3VyY2UvQ29tcGF0aWJpbGl0eVhNSUxvYWRJbXBsLmphdmEKaW5kZXggNWYxN2E0Ni4uMjZlYmZmNyAxMDA2NDQKLS0tIGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVtZi93dHBlbWYvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbWYvcmVzb3VyY2UvQ29tcGF0aWJpbGl0eVhNSUxvYWRJbXBsLmphdmEKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVtZi93dHBlbWYvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbWYvcmVzb3VyY2UvQ29tcGF0aWJpbGl0eVhNSUxvYWRJbXBsLmphdmEKQEAgLTQxLDYgKzQxLDcgQEAKIAkgKiAKIAkgKiBAc2VlIG9yZy5lY2xpcHNlLmVtZi5lY29yZS54bWkuaW1wbC5YTUxMb2FkSW1wbCNtYWtlRGVmYXVsdEhhbmRsZXIoKQogCSAqLworCUBPdmVycmlkZQogCXByb3RlY3RlZCBEZWZhdWx0SGFuZGxlciBtYWtlRGVmYXVsdEhhbmRsZXIoKSB7CiAJCXJldHVybiBuZXcgU0FYV3JhcHBlcihuZXcgQ29tcGF0aWJpbGl0eVNBWFhNSUhhbmRsZXIocmVzb3VyY2UsIGhlbHBlciwgb3B0aW9ucykpOwogCX0KZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbWYvd3RwZW1mL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW1mL3Jlc291cmNlL0NvbXBhdGliaWxpdHlYTUlSZXNvdXJjZUltcGwuamF2YSBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbWYvd3RwZW1mL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW1mL3Jlc291cmNlL0NvbXBhdGliaWxpdHlYTUlSZXNvdXJjZUltcGwuamF2YQppbmRleCAxYjM0ODA0Li5iYjk1Zjk2IDEwMDY0NAotLS0gYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW1mL3d0cGVtZi9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2VtZi9yZXNvdXJjZS9Db21wYXRpYmlsaXR5WE1JUmVzb3VyY2VJbXBsLmphdmEKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVtZi93dHBlbWYvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbWYvcmVzb3VyY2UvQ29tcGF0aWJpbGl0eVhNSVJlc291cmNlSW1wbC5qYXZhCkBAIC01NCw2ICs1NCw3IEBACiAJLyoqCiAJICogQHNlZSBvcmcuZWNsaXBzZS5lbWYuZWNvcmUueG1pLmltcGwuWE1JUmVzb3VyY2VJbXBsI2NyZWF0ZVhNTEhlbHBlcigpCiAJICovCisJQE92ZXJyaWRlCiAJcHJvdGVjdGVkIGZpbmFsIFhNTEhlbHBlciBjcmVhdGVYTUxIZWxwZXIoKSB7CiAJCU1hcHBlZFhNSUhlbHBlciBoZWxwZXIgPSBkb0NyZWF0ZVhNTEhlbHBlcigpOwogCQloZWxwZXIuc2V0UGFja2FnZVVSSXNUb1ByZWZpeGVzKGdldFBhY2thZ2VVUklzVG9QcmVmaXhlcygpKTsKQEAgLTEwNCw2ICsxMDUsNyBAQAogCS8qKgogCSAqIEBzZWUgb3JnLmVjbGlwc2UuZW1mLmVjb3JlLnJlc291cmNlLlJlc291cmNlI2dldFVSSUZyYWdtZW50KEVPYmplY3QpCiAJICovCisJQE92ZXJyaWRlCiAJcHVibGljIFN0cmluZyBnZXRVUklGcmFnbWVudChFT2JqZWN0IGVPYmplY3QpIHsKIAkJaWYgKHVzZXNEZWZhdWx0Rm9ybWF0KCkpCiAJCQlyZXR1cm4gc3VwZXIuZ2V0VVJJRnJhZ21lbnQoZU9iamVjdCk7CkBAIC0xMTcsNiArMTE5LDcgQEAKIAkvKioKIAkgKiBAc2VlIG9yZy5lY2xpcHNlLmVtZi5lY29yZS54bWkuaW1wbC5YTUlSZXNvdXJjZUltcGwjY3JlYXRlWE1MU2F2ZSgpCiAJICovCisJQE92ZXJyaWRlCiAJcHJvdGVjdGVkIFhNTFNhdmUgY3JlYXRlWE1MU2F2ZSgpIHsKIAkJaWYgKHVzZXNEZWZhdWx0Rm9ybWF0KCkpCiAJCQlyZXR1cm4gc3VwZXIuY3JlYXRlWE1MU2F2ZSgpOwpAQCAtMTI2LDYgKzEyOSw3IEBACiAJLyoqCiAJICogQHNlZSBvcmcuZWNsaXBzZS5lbWYuZWNvcmUueG1pLmltcGwuWE1MUmVzb3VyY2VJbXBsI2RvU2F2ZShPdXRwdXRTdHJlYW0sIE1hcCkKIAkgKi8KKwlAT3ZlcnJpZGUKIAlwdWJsaWMgdm9pZCBkb1NhdmUoT3V0cHV0U3RyZWFtIG91dHB1dFN0cmVhbSwgTWFwIG9wdGlvbnMpIHRocm93cyBJT0V4Y2VwdGlvbiB7CiAJCXN1cGVyLmRvU2F2ZShvdXRwdXRTdHJlYW0sIG9wdGlvbnMpOwogCX0KQEAgLTE0Miw5ICsxNDYsMTAgQEAKIAkvKioKIAkgKiBAc2VlIG9yZy5lY2xpcHNlLmVtZi5lY29yZS5yZXNvdXJjZS5pbXBsLlJlc291cmNlSW1wbCNnZXRFT2JqZWN0QnlJRChTdHJpbmcpCiAJICovCisJQE92ZXJyaWRlCiAJcHJvdGVjdGVkIEVPYmplY3QgZ2V0RU9iamVjdEJ5SUQoU3RyaW5nIGlkKSB7CiAJCWlmIChpZFRvRU9iamVjdE1hcCAhPSBudWxsKSB7Ci0JCQlFT2JqZWN0IGVPYmplY3QgPSAoRU9iamVjdCkgaWRUb0VPYmplY3RNYXAuZ2V0KGlkKTsKKwkJCUVPYmplY3QgZU9iamVjdCA9IGlkVG9FT2JqZWN0TWFwLmdldChpZCk7CiAJCQlpZiAoZU9iamVjdCAhPSBudWxsKSB7CiAJCQkJcmV0dXJuIGVPYmplY3Q7CiAJCQl9CkBAIC0xNTcsNiArMTYyLDcgQEAKIAkgKiB7QGxpbmsgSW50ZXJuYWxFT2JqZWN0I2VTZXRQcm94eVVSSSBzZXRzfXRoZSBvYmplY3QgdG8gYmUgYSBwcm94eSBhbmQgY2xlYXJzIHRoZQogCSAqIHtAbGluayAjZUFkYXB0ZXJzIGFkYXB0ZXJzfS4KIAkgKi8KKwlAT3ZlcnJpZGUKIAlwcm90ZWN0ZWQgdm9pZCB1bmxvYWRlZChJbnRlcm5hbEVPYmplY3QgaW50ZXJuYWxFT2JqZWN0KSB7CiAJCS8vb3ZlcnJpZGRlbiBmcm9tIHRoZSBzdXBlciBjbGFzczsgY2FsbCBzdXBlci5nZXRVUklGcmFnbWVudCBpbnN0ZWFkIG9mIHRoZSBpbXBsZW1lbnRhdGlvbgogCQkvL2F0IHRoaXMgbGV2ZWwsIHRvIGF2b2lkIElEIGdlbmVyYXRpb24gZHVyaW5nIHVubG9hZApAQCAtMTcxLDYgKzE3Nyw3IEBACiAJICogQHNlZSBvcmcuZWNsaXBzZS5lbWYuZWNvcmUueG1pLmltcGwuWE1MUmVzb3VyY2VJbXBsI2RvTG9hZChqYXZhLmlvLklucHV0U3RyZWFtLAogCSAqICAgICAgamF2YS51dGlsLk1hcCkKIAkgKi8KKwlAT3ZlcnJpZGUKIAlwdWJsaWMgZmluYWwgdm9pZCBkb0xvYWQoSW5wdXRTdHJlYW0gaW5wdXRTdHJlYW0sIE1hcCBvcHRpb25zKSB0aHJvd3MgSU9FeGNlcHRpb24gewogCQliYXNpY0RvTG9hZChpbnB1dFN0cmVhbSwgb3B0aW9ucyk7CiAJfQpAQCAtMTg3LDExICsxOTQsMTMgQEAKIAkgKiAKIAkgKiBAc2VlIG9yZy5lY2xpcHNlLmVtZi5lY29yZS54bWkuaW1wbC5YTUxSZXNvdXJjZUltcGwjaW5pdCgpCiAJICovCisJQE92ZXJyaWRlCiAJcHJvdGVjdGVkIHZvaWQgaW5pdCgpIHsKIAkJc3VwZXIuaW5pdCgpOwogCQlzZXRFbmNvZGluZyhERUZBVUxUX0VOQ09ESU5HKTsKIAl9CiAKKwlAT3ZlcnJpZGUKIAlwcm90ZWN0ZWQgWE1MTG9hZCBjcmVhdGVYTUxMb2FkKCkgewogCQlyZXR1cm4gbmV3IENvbXBhdGliaWxpdHlYTUlMb2FkSW1wbChjcmVhdGVYTUxIZWxwZXIoKSk7CiAJfQpAQCAtMjI2LDYgKzIzNSw3IEBACiAJICogCiAJICogQHNlZSBvcmcuZWNsaXBzZS5lbWYuZWNvcmUueG1pLmltcGwuWE1MUmVzb3VyY2VJbXBsI2RldGFjaGVkSGVscGVyKG9yZy5lY2xpcHNlLmVtZi5lY29yZS5FT2JqZWN0KQogCSAqLworCUBPdmVycmlkZQogCXByb3RlY3RlZCB2b2lkIGRldGFjaGVkSGVscGVyKEVPYmplY3QgZU9iamVjdCkgewogCQlpZiAobW9kaWZpY2F0aW9uVHJhY2tpbmdBZGFwdGVyICE9IG51bGwpIHsKIAkJCWVPYmplY3QuZUFkYXB0ZXJzKCkucmVtb3ZlKG1vZGlmaWNhdGlvblRyYWNraW5nQWRhcHRlcik7CkBAIC0yNDAsNiArMjUwLDcgQEAKIAkJfQogCX0KIAkKKwlAT3ZlcnJpZGUKIAlwdWJsaWMgdm9pZCBsb2FkKE1hcCBvcHRpb25zKSB0aHJvd3MgSU9FeGNlcHRpb24gewogCiAgICAgICAgIFJlc291cmNlSXNMb2FkaW5nQWRhcHRlciBhZGFwdGVyID0gbnVsbDsKQEAgLTI3MSwxMyArMjgyLDQ3IEBACiAgICAgICAgICAgICB9CiAgICAgICAgIH0KICAgICB9CisJcHVibGljIHZvaWQgbG9hZEV4aXN0aW5nKE1hcCBvcHRpb25zKSB0aHJvd3MgSU9FeGNlcHRpb24geworCisJCQorICAgICAgICBSZXNvdXJjZUlzTG9hZGluZ0FkYXB0ZXIgYWRhcHRlciA9IG51bGw7CisgICAgICAgIGlmIChpc0xvYWRlZCkgeworICAgICAgICAgICAgYWRhcHRlciA9IFJlc291cmNlSXNMb2FkaW5nQWRhcHRlci5maW5kQWRhcHRlcih0aGlzKTsKKyAgICAgICAgICAgIGlmIChhZGFwdGVyICE9IG51bGwpIAorICAgICAgICAgICAgICAgIGFkYXB0ZXIud2FpdEZvclJlc291cmNlVG9Mb2FkKCk7CisgICAgICAgICAgICByZXR1cm47CisgICAgICAgIH0KKyAgICAgICAgc3luY2hyb25pemVkICh0aGlzKSB7ICAgICAgICAgICAgCisgICAgICAgICAgICBhZGFwdGVyID0gUmVzb3VyY2VJc0xvYWRpbmdBZGFwdGVyLmZpbmRBZGFwdGVyKHRoaXMpOworICAgICAgICAgICAgaWYgKGFkYXB0ZXIgPT0gbnVsbCAmJiAhaXNMb2FkZWQpIAorICAgICAgICAgICAgICAgIGFkZFN5bmNocm9uaXphdGlvbkxvYWRpbmdBZGFwdGVyKCk7CisgICAgICAgIH0KKyAgICAgICAgaWYoYWRhcHRlciAhPSBudWxsKQorICAgICAgICAgICAgYWRhcHRlci53YWl0Rm9yUmVzb3VyY2VUb0xvYWQoKTsKKyAgICAgICAgZWxzZSB7CisgICAgICAgICAgICB0cnkgeworICAgICAgICAgICAgICAgIGxvYWQoKElucHV0U3RyZWFtKSBudWxsLCBvcHRpb25zKTsKKyAgICAgICAgICAgIH0gY2F0Y2goSU9FeGNlcHRpb24gaW9lKSB7CisgICAgICAgICAgICAgICAgcmVtb3ZlTG9hZGluZ1N5bmNocm9uaXphdGlvbkFkYXB0ZXIoKTsKKyAgICAgICAgICAgICAgICB0aHJvdyBpb2U7CisgICAgICAgICAgICB9IGNhdGNoKFJ1bnRpbWVFeGNlcHRpb24gcmUpIHsKKyAgICAgICAgICAgICAgICByZW1vdmVMb2FkaW5nU3luY2hyb25pemF0aW9uQWRhcHRlcigpOworICAgICAgICAgICAgICAgIHRocm93IHJlOworICAgICAgICAgICAgfSBjYXRjaChFcnJvciBlKSB7CisgICAgICAgICAgICAgICAgcmVtb3ZlTG9hZGluZ1N5bmNocm9uaXphdGlvbkFkYXB0ZXIoKTsKKyAgICAgICAgICAgICAgICB0aHJvdyBlOworICAgICAgICAgICAgfQorICAgICAgICB9CisgICAgfQogCQogCSAgLyoqCiAgICAgICogCiAgICAgICovCiAgICAgcHJvdGVjdGVkIHZvaWQgYWRkU3luY2hyb25pemF0aW9uTG9hZGluZ0FkYXB0ZXIoKSB7CisgICAgCXN5bmNocm9uaXplZCAoZUFkYXB0ZXJzKCkpIHsKICAgICAgICAgaWYgKFJlc291cmNlSXNMb2FkaW5nQWRhcHRlci5maW5kQWRhcHRlcih0aGlzKSA9PSBudWxsKQogICAgICAgICAgICAgZUFkYXB0ZXJzKCkuYWRkKFJlc291cmNlSXNMb2FkaW5nQWRhcHRlckZhY3RvcnkuSU5TVEFOQ0UuY3JlYXRlUmVzb3VyY2VJc0xvYWRpbmdBZGFwdGVyKCkpOworICAgIAl9CiAgICAgfQogCiAgICAgLyoqCkBAIC0zMTIsNyArMzU3LDggQEAKICAgICAgKiAKICAgICAgKiBAc2VlIG9yZy5lY2xpcHNlLmVtZi5lY29yZS5yZXNvdXJjZS5SZXNvdXJjZSNnZXRDb250ZW50cygpCiAgICAgICovCi0gICAgcHVibGljIEVMaXN0IGdldENvbnRlbnRzKCkgeworICAgIEBPdmVycmlkZQorCXB1YmxpYyBFTGlzdCBnZXRDb250ZW50cygpIHsKICAgICAgICAgd2FpdEZvclJlc291cmNlVG9Mb2FkSWZOZWNlc3NhcnkoKTsKICAgICAgICAgcmV0dXJuIHN1cGVyLmdldENvbnRlbnRzKCk7CiAgICAgfQpAQCAtMzIyLDcgKzM2OCw4IEBACiAgICAgICogCiAgICAgICogQHNlZSBvcmcuZWNsaXBzZS5lbWYuZWNvcmUucmVzb3VyY2UuaW1wbC5SZXNvdXJjZUltcGwjaXNMb2FkZWQoKQogICAgICAqLwotICAgIHB1YmxpYyBib29sZWFuIGlzTG9hZGVkKCkgeworICAgIEBPdmVycmlkZQorCXB1YmxpYyBib29sZWFuIGlzTG9hZGVkKCkgewogICAgICAgICB3YWl0Rm9yUmVzb3VyY2VUb0xvYWRJZk5lY2Vzc2FyeSgpOwogICAgICAgICByZXR1cm4gc3VwZXIuaXNMb2FkZWQoKTsKICAgICB9CmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW1mL3d0cGVtZi9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2VtZi9yZXNvdXJjZS9Db21wYXRpYmlsaXR5WE1JU2F2ZUltcGwuamF2YSBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbWYvd3RwZW1mL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW1mL3Jlc291cmNlL0NvbXBhdGliaWxpdHlYTUlTYXZlSW1wbC5qYXZhCmluZGV4IGMxYTdiZjIuLjJhZjc0YzMgMTAwNjQ0Ci0tLSBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbWYvd3RwZW1mL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW1mL3Jlc291cmNlL0NvbXBhdGliaWxpdHlYTUlTYXZlSW1wbC5qYXZhCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbWYvd3RwZW1mL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW1mL3Jlc291cmNlL0NvbXBhdGliaWxpdHlYTUlTYXZlSW1wbC5qYXZhCkBAIC00Nyw2ICs0Nyw3IEBACiAJLyoqCiAJICogQHNlZSBvcmcuZWNsaXBzZS5lbWYuZWNvcmUueG1pLmltcGwuWE1JU2F2ZUltcGwjaW5pdChYTUxSZXNvdXJjZSwgTWFwKQogCSAqLworCUBPdmVycmlkZQogCXByb3RlY3RlZCB2b2lkIGluaXQoWE1MUmVzb3VyY2UgcmVzb3VyY2UsIE1hcCBvcHRpb25zKSB7CiAJCXN1cGVyLmluaXQocmVzb3VyY2UsIG9wdGlvbnMpOwogCQl4bWlUeXBlID0gdHJ1ZTsKQEAgLTU1LDYgKzU2LDcgQEAKIAkvKioKIAkgKiBAc2VlIG9yZy5lY2xpcHNlLmVtZi5lY29yZS54bWkuaW1wbC5YTUlTYXZlSW1wbCNhZGROYW1lc3BhY2VEZWNsYXJhdGlvbnMoKQogCSAqLworCUBPdmVycmlkZQogCXB1YmxpYyB2b2lkIGFkZE5hbWVzcGFjZURlY2xhcmF0aW9ucygpIHsKIAkJZG9jLmFkZEF0dHJpYnV0ZShYTUlfVkVSX05TLCBYTUlSZXNvdXJjZS5WRVJTSU9OX1ZBTFVFKTsKIAkJZG9jLmFkZEF0dHJpYnV0ZShYTUlfWE1MTlMsIFhNSVJlc291cmNlLlhNSV9VUkkpOwpAQCAtMTA1LDYgKzEwNyw3IEBACiAJCX0KIAl9CiAKKwlAT3ZlcnJpZGUKIAlwcm90ZWN0ZWQgdm9pZCBzYXZlSHJlZihFT2JqZWN0IHJlbW90ZSwgRVN0cnVjdHVyYWxGZWF0dXJlIGYpIHsKIAkJU3RyaW5nIG5hbWUgPSBoZWxwZXIuZ2V0UU5hbWUoZik7CiAJCVN0cmluZyBocmVmID0gaGVscGVyLmdldEhSRUYocmVtb3RlKTsKZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbWYvd3RwZW1mL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW1mL3Jlc291cmNlL0NvbnN0YW50QXR0cmlidXRlVHJhbnNsYXRvci5qYXZhIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVtZi93dHBlbWYvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbWYvcmVzb3VyY2UvQ29uc3RhbnRBdHRyaWJ1dGVUcmFuc2xhdG9yLmphdmEKaW5kZXggMzU2ZjEwMi4uY2VhYTlmOCAxMDA2NDQKLS0tIGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVtZi93dHBlbWYvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbWYvcmVzb3VyY2UvQ29uc3RhbnRBdHRyaWJ1dGVUcmFuc2xhdG9yLmphdmEKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVtZi93dHBlbWYvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbWYvcmVzb3VyY2UvQ29uc3RhbnRBdHRyaWJ1dGVUcmFuc2xhdG9yLmphdmEKQEAgLTM3LDYgKzM3LDcgQEAKIAkgKiAKIAkgKiBAc2VlIGNvbS5pYm0uZXRvb2xzLmVtZjJ4bWwuaW1wbC5UcmFuc2xhdG9yI2dldE1PRlZhbHVlKG9yZy5lY2xpcHNlLmVtZi5lY29yZS5FT2JqZWN0KQogCSAqLworCUBPdmVycmlkZQogCXB1YmxpYyBPYmplY3QgZ2V0TU9GVmFsdWUoRU9iamVjdCBtb2ZPYmplY3QpIHsKIAkJcmV0dXJuIGF0dHJpYnV0ZVZhbHVlOwogCX0KQEAgLTQ2LDYgKzQ3LDcgQEAKIAkgKiAKIAkgKiBAc2VlIGNvbS5pYm0uZXRvb2xzLmVtZjJ4bWwuaW1wbC5UcmFuc2xhdG9yI2lzU2V0TU9GVmFsdWUob3JnLmVjbGlwc2UuZW1mLmVjb3JlLkVPYmplY3QpCiAJICovCisJQE92ZXJyaWRlCiAJcHVibGljIGJvb2xlYW4gaXNTZXRNT0ZWYWx1ZShFT2JqZWN0IGVtZk9iamVjdCkgewogCQlyZXR1cm4gdHJ1ZTsKIAl9CmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW1mL3d0cGVtZi9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2VtZi9yZXNvdXJjZS9EZXBlbmRlbmN5VHJhbnNsYXRvci5qYXZhIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVtZi93dHBlbWYvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbWYvcmVzb3VyY2UvRGVwZW5kZW5jeVRyYW5zbGF0b3IuamF2YQppbmRleCBjN2QxYzYyLi4zZjQ4MjIxIDEwMDY0NAotLS0gYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW1mL3d0cGVtZi9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2VtZi9yZXNvdXJjZS9EZXBlbmRlbmN5VHJhbnNsYXRvci5qYXZhCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbWYvd3RwZW1mL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW1mL3Jlc291cmNlL0RlcGVuZGVuY3lUcmFuc2xhdG9yLmphdmEKQEAgLTQ4LDQ1ICs0OCw1NSBAQAogCQlyZXR1cm4gY2hpbGQ7CiAJfQogCisJQE92ZXJyaWRlCiAJcHVibGljIExpc3QgZ2V0TU9GQ2hpbGRyZW4oRU9iamVjdCBtb2ZPYmplY3QpIHsKIAkJLy9yZXR1cm4gc3VwZXIuZ2V0TU9GQ2hpbGRyZW4oZ2V0Q2hpbGQobW9mT2JqZWN0KSk7CiAJCXJldHVybiBzdXBlci5nZXRNT0ZDaGlsZHJlbihtb2ZPYmplY3QpOwogCX0KIAorCUBPdmVycmlkZQogCXB1YmxpYyBPYmplY3QgZ2V0TU9GVmFsdWUoRU9iamVjdCBtb2ZPYmplY3QpIHsKIAkJcmV0dXJuIHN1cGVyLmdldE1PRlZhbHVlKGdldENoaWxkKG1vZk9iamVjdCkpOwogCX0KIAorCUBPdmVycmlkZQogCXB1YmxpYyB2b2lkIHNldE1PRlZhbHVlKEVPYmplY3QgZW1mT2JqZWN0LCBPYmplY3QgdmFsdWUpIHsKIAkJLy9zdXBlci5zZXRNT0ZWYWx1ZShnZXRDaGlsZChlbWZPYmplY3QpLCB2YWx1ZSk7CiAJCXN1cGVyLnNldE1PRlZhbHVlKGdldENoaWxkKGVtZk9iamVjdCksIHZhbHVlLCAtMSk7CiAJfQogCisJQE92ZXJyaWRlCiAJcHVibGljIHZvaWQgc2V0TU9GVmFsdWUoTm90aWZpZXIgb3duZXIsIE9iamVjdCB2YWx1ZSwgaW50IG5ld0luZGV4KSB7CiAJCXN1cGVyLnNldE1PRlZhbHVlKGdldENoaWxkKChFT2JqZWN0KSBvd25lciksIHZhbHVlLCBuZXdJbmRleCk7CiAJfQogCisJQE92ZXJyaWRlCiAJcHVibGljIHZvaWQgcmVtb3ZlTU9GVmFsdWUoTm90aWZpZXIgb3duZXIsIE9iamVjdCB2YWx1ZSkgewogCQlzdXBlci5yZW1vdmVNT0ZWYWx1ZShnZXRDaGlsZCgoRU9iamVjdCkgb3duZXIpLCB2YWx1ZSk7CiAJfQogCisJQE92ZXJyaWRlCiAJcHVibGljIGJvb2xlYW4gaXNTZXRNT0ZWYWx1ZShFT2JqZWN0IGVtZk9iamVjdCkgewogCQlyZXR1cm4gc3VwZXIuaXNTZXRNT0ZWYWx1ZShnZXRDaGlsZChlbWZPYmplY3QpKTsKIAl9CiAKKwlAT3ZlcnJpZGUKIAlwdWJsaWMgdm9pZCB1blNldE1PRlZhbHVlKEVPYmplY3QgZW1mT2JqZWN0KSB7CiAJCXN1cGVyLnVuU2V0TU9GVmFsdWUoZ2V0Q2hpbGQoZW1mT2JqZWN0KSk7CiAJfQogCiAKKwlAT3ZlcnJpZGUKIAlwdWJsaWMgYm9vbGVhbiBpc0RlcGVuZGVuY3lDaGlsZCgpIHsKIAkJcmV0dXJuIHRydWU7CiAJfQogCisJQE92ZXJyaWRlCiAJcHVibGljIGJvb2xlYW4gZmVhdHVyZUV4aXN0cyhFT2JqZWN0IGVtZk9iamVjdCkgewogCQlyZXR1cm4gc3VwZXIuZmVhdHVyZUV4aXN0cyhnZXRDaGlsZChlbWZPYmplY3QpKTsKIAl9CiAKKwlAT3ZlcnJpZGUKIAlwdWJsaWMgdm9pZCBjbGVhckxpc3QoRU9iamVjdCBtb2ZPYmplY3QpIHsKIAkJc3VwZXIuY2xlYXJMaXN0KGdldENoaWxkKG1vZk9iamVjdCkpOwogCX0KZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbWYvd3RwZW1mL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW1mL3Jlc291cmNlL0VNRjJET01BZGFwdGVySW1wbC5qYXZhIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVtZi93dHBlbWYvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbWYvcmVzb3VyY2UvRU1GMkRPTUFkYXB0ZXJJbXBsLmphdmEKaW5kZXggZTAxNDRmOC4uOGI2ZGNjMSAxMDA2NDQKLS0tIGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVtZi93dHBlbWYvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbWYvcmVzb3VyY2UvRU1GMkRPTUFkYXB0ZXJJbXBsLmphdmEKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVtZi93dHBlbWYvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbWYvcmVzb3VyY2UvRU1GMkRPTUFkYXB0ZXJJbXBsLmphdmEKQEAgLTMwLDYgKzMwLDcgQEAKIGltcG9ydCBvcmcuZWNsaXBzZS5lbWYuZWNvcmUuSW50ZXJuYWxFT2JqZWN0OwogaW1wb3J0IG9yZy5lY2xpcHNlLmVtZi5lY29yZS5yZXNvdXJjZS5SZXNvdXJjZTsKIGltcG9ydCBvcmcuZWNsaXBzZS5lbWYuZWNvcmUudXRpbC5FY29yZVV0aWw7CitpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5pbnRlcm5hbC5lbWYucGx1Z2luLkVjb3JlVXRpbGl0aWVzUGx1Z2luOwogaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uaW50ZXJuYWwuZW1mLnV0aWxpdGllcy5Bc3NlcnQ7CiBpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5pbnRlcm5hbC5lbWYudXRpbGl0aWVzLkRPTVV0aWxpdGllczsKIGltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmludGVybmFsLmVtZi51dGlsaXRpZXMuRXRvb2xzQ29weVNlc3Npb247CkBAIC03Miw2ICs3Myw3IEBACiAKIAkJc3RhdGljIGZpbmFsIFN0cmluZyBLRVkgPSAiRU1GMkRPTURlcGVuZGVuY3lBZGFwdGVyIjsgLy8kTk9OLU5MUy0xJAogCisJCUBPdmVycmlkZQogCQlwdWJsaWMgdm9pZCBub3RpZnlDaGFuZ2VkKE5vdGlmaWNhdGlvbiBtc2cpIHsKIAkJCUVNRjJET01BZGFwdGVySW1wbC50aGlzLm5vdGlmeUNoYW5nZWQobXNnKTsKIAkJfQpAQCAtNzksNiArODEsNyBAQAogCQkvKioKIAkJICogQHNlZSBvcmcuZWNsaXBzZS5lbWYuY29tbW9uLm5vdGlmeS5pbXBsLkFkYXB0ZXJJbXBsI2lzQWRhcHRlckZvclR5cGUoT2JqZWN0KQogCQkgKi8KKwkJQE92ZXJyaWRlCiAJCXB1YmxpYyBib29sZWFuIGlzQWRhcHRlckZvclR5cGUoT2JqZWN0IHR5cGUpIHsKIAkJCXJldHVybiBLRVkuZXF1YWxzKHR5cGUpOwogCQl9CkBAIC0xMzYsOCArMTM5LDggQEAKIAkJdHJ5IHsKIAkJCS8vIElmIHRoZSBQbGF0Zm9ybSBjbGFzcyBjYW4gYmUgZm91bmQsIHRoZW4gY29udGludWUgdG8gY2hlY2sgaWYgdGhlIE9TR0kgcGxhdGZvcm0gaXMgcnVubmluZwogCQkJQ2xhc3MgY2xhenogPSBDbGFzcy5mb3JOYW1lKFBMQVRGT1JNKTsKLQkJCU1ldGhvZCBtID0gY2xhenouZ2V0TWV0aG9kKElTUlVOTklORywgbnVsbCk7Ci0JCQlpc1J1bm5pbmcgPSAoKEJvb2xlYW4pbS5pbnZva2UoY2xhenosIG51bGwpKS5ib29sZWFuVmFsdWUoKTsKKwkJCU1ldGhvZCBtID0gY2xhenouZ2V0TWV0aG9kKElTUlVOTklORyk7CisJCQlpc1J1bm5pbmcgPSAoKEJvb2xlYW4pbS5pbnZva2UoY2xhenopKS5ib29sZWFuVmFsdWUoKTsKIAkJfSBjYXRjaCAoQ2xhc3NOb3RGb3VuZEV4Y2VwdGlvbiBlKSB7CiAJCSAgICAgLy8gSWdub3JlIGJlY2F1c2UgdGhpcyBtdXN0IGJlIGluIGEgbm9uX09TR0kgZW52aXJvbm1lbnQKIAkJfSBjYXRjaCAoU2VjdXJpdHlFeGNlcHRpb24gZSkgewpAQCAtMjAzLDYgKzIwNiw3IEBACiAJCWZOb3RpZmljYXRpb25FbmFibGVkID0gaXNFbmFibGVkOwogCX0KIAorCUBPdmVycmlkZQogCXB1YmxpYyBib29sZWFuIGlzQWRhcHRlckZvclR5cGUoT2JqZWN0IHR5cGUpIHsKIAkJcmV0dXJuIEVNRjJET01BZGFwdGVyLkFEQVBURVJfQ0xBU1MgPT0gdHlwZTsKIAl9CkBAIC0yMTEsNiArMjE1LDcgQEAKIAkJdGFyZ2V0LmVBZGFwdGVycygpLmFkZCh0aGlzKTsKIAl9CiAKKwlAT3ZlcnJpZGUKIAlwdWJsaWMgU3RyaW5nIHRvU3RyaW5nKCkgewogCQlTdHJpbmdCdWZmZXIgc2IgPSBuZXcgU3RyaW5nQnVmZmVyKCk7CiAJCXNiLmFwcGVuZChzaG9ydENsYXNzTmFtZSh0aGlzKSk7CkBAIC0yNjIsMTEgKzI2NywxMSBAQAogCQkJCQlicmVhazsKIAkJCX0KIAotCQkJb3JnLmVjbGlwc2UuamVtLnV0aWwubG9nZ2VyLnByb3h5LkxvZ2dlci5nZXRMb2dnZXIoKS5sb2dFcnJvcigiTU9GIENoYW5nZTogIiArIG5vdGlmVHlwZSk7IC8vJE5PTi1OTFMtMSQKLQkJCW9yZy5lY2xpcHNlLmplbS51dGlsLmxvZ2dlci5wcm94eS5Mb2dnZXIuZ2V0TG9nZ2VyKCkubG9nRXJyb3IoIlx0bm90aWZpZXIgICAgICA6ICIgKyBtc2cuZ2V0Tm90aWZpZXIoKSk7IC8vJE5PTi1OTFMtMSQKLQkJCW9yZy5lY2xpcHNlLmplbS51dGlsLmxvZ2dlci5wcm94eS5Mb2dnZXIuZ2V0TG9nZ2VyKCkubG9nRXJyb3IoIlx0Y2hhbmdlZEZlYXR1cmU6ICIgKyBtc2cuZ2V0RmVhdHVyZSgpKTsgLy8kTk9OLU5MUy0xJAotCQkJb3JnLmVjbGlwc2UuamVtLnV0aWwubG9nZ2VyLnByb3h5LkxvZ2dlci5nZXRMb2dnZXIoKS5sb2dFcnJvcigiXHRvbGRWYWx1ZSAgICAgIDogIiArIG1zZy5nZXRPbGRWYWx1ZSgpKTsgLy8kTk9OLU5MUy0xJAotCQkJb3JnLmVjbGlwc2UuamVtLnV0aWwubG9nZ2VyLnByb3h5LkxvZ2dlci5nZXRMb2dnZXIoKS5sb2dFcnJvcigiXHRuZXdWYWx1ZSAgICAgIDogIiArIG1zZy5nZXROZXdWYWx1ZSgpKTsgLy8kTk9OLU5MUy0xJAorCQkJRWNvcmVVdGlsaXRpZXNQbHVnaW4ubG9nRXJyb3IoIk1PRiBDaGFuZ2U6ICIgKyBub3RpZlR5cGUpOyAvLyROT04tTkxTLTEkCisJCQlFY29yZVV0aWxpdGllc1BsdWdpbi5sb2dFcnJvcigiXHRub3RpZmllciAgICAgIDogIiArIG1zZy5nZXROb3RpZmllcigpKTsgLy8kTk9OLU5MUy0xJAorCQkJRWNvcmVVdGlsaXRpZXNQbHVnaW4ubG9nRXJyb3IoIlx0Y2hhbmdlZEZlYXR1cmU6ICIgKyBtc2cuZ2V0RmVhdHVyZSgpKTsgLy8kTk9OLU5MUy0xJAorCQkJRWNvcmVVdGlsaXRpZXNQbHVnaW4ubG9nRXJyb3IoIlx0b2xkVmFsdWUgICAgICA6ICIgKyBtc2cuZ2V0T2xkVmFsdWUoKSk7IC8vJE5PTi1OTFMtMSQKKwkJCUVjb3JlVXRpbGl0aWVzUGx1Z2luLmxvZ0Vycm9yKCJcdG5ld1ZhbHVlICAgICAgOiAiICsgbXNnLmdldE5ld1ZhbHVlKCkpOyAvLyROT04tTkxTLTEkCiAJCX0KIAl9CiAKQEAgLTI4Nyw2ICsyOTIsNTIgQEAKIAkJfQogCQlyZXR1cm4gbnVsbDsKIAl9CisJCisJLyoqCisJICogQ2hlY2tzIHRvIGVuc3VyZSB0aGF0IG9ubHkgb25lIE1PRiBub2RlIGhhcyBiZWVuIHJlbW92ZWQgYW5kIHdpbGwgcmVtb3ZlIHRoZSBkb20gZXF1aXZhbGVudC4KKwkgKiBJZiBtdWx0aXBsZSBkaWZmZXJlbmNlcyBhcmUgZm91bmQsIHdpbGwgcmV0dXJuIHRoZSBpbmRleCBvZiB0aGUgZmlyc3QgZGlmZmVyZW5jZS4KKwkgKiAKKwkgKiBAcGFyYW0gcGFyZW50CisJICogQHBhcmFtIG1vZkNoaWxkcmVuCisJICogQHBhcmFtIGRvbUNoaWxkcmVuCisJICogQHJldHVybgorCSAqLworCXByaXZhdGUgaW50IHVwZGF0ZURPTVNpbmdsZVJlbW92ZShOb2RlIHBhcmVudCwgTGlzdCBtb2ZDaGlsZHJlbiwgTGlzdCBkb21DaGlsZHJlbil7CisJCWludCBkb21JbmRleCA9IDA7CisJCWludCBmaXJzdERpZmZlcmVuY2UgPSAtMTsKKwkJZm9yIChPYmplY3QgbW9mQ2hpbGQgOiBtb2ZDaGlsZHJlbil7CisJCQlpZiAobW9mQ2hpbGQgaW5zdGFuY2VvZiBFT2JqZWN0KQorCQkJeworCQkJCUVNRjJET01BZGFwdGVyIGFkYXB0ZXIgPSBnZXRFeGlzdGluZ0FkYXB0ZXIoKEVPYmplY3QpbW9mQ2hpbGQpOworCQkJCWlmKGFkYXB0ZXIuZ2V0Tm9kZSgpICE9IGRvbUNoaWxkcmVuLmdldChkb21JbmRleCkpeworCQkJCQlpZihmaXJzdERpZmZlcmVuY2UgIT0gLTEpeworCQkJCQkJLy9zZWNvbmQgZGlmZmVyZW5jZTsgcmV0dXJuCisJCQkJCQlyZXR1cm4gZmlyc3REaWZmZXJlbmNlOworCQkJCQl9CisJCQkJCS8vd2UgZm91bmQgc29tZXRoaW5nIHRoYXQgaXMgZGlmZmVyZW50CisJCQkJCWZpcnN0RGlmZmVyZW5jZSA9IGRvbUluZGV4OworCQkJCQkvL3NraXAgb3ZlciBvbmUgaW5kZXggYW5kIGNoZWNrIGFnYWluc3QgbmV4dAorCQkJCQlkb21JbmRleCArKzsKKwkJCQkJaWYoYWRhcHRlci5nZXROb2RlKCkgIT0gZG9tQ2hpbGRyZW4uZ2V0KGRvbUluZGV4KSl7CisJCQkJCQkvL2lmIHRoZXNlIGFyZSBkaWZmZXJlbnQgdGhlbiB0aGVyZSBhcmUgbXVsdGlwbGUgY2hhbmdlcworCQkJCQkJcmV0dXJuIGZpcnN0RGlmZmVyZW5jZTsKKwkJCQkJfQorCQkJCX0KKwkJCQlkb21JbmRleCsrOworCQkJfQorCQl9CisJCWlmKGZpcnN0RGlmZmVyZW5jZSAhPSAtMSl7CisJCQlyZW1vdmVET01DaGlsZChwYXJlbnQsIChFbGVtZW50KSBkb21DaGlsZHJlbi5nZXQoZmlyc3REaWZmZXJlbmNlKSk7CisJCQkvL2lmIHdlIGFyZSBoZXJlLCBhbmQgZmlyc3REaWZmZXJlbmNlIGlzIG5vdCAtMSwgdGhhdCBtZWFucyB3ZSBoYXZlIGl0ZXJhdGVkCisJCQkvL3Rocm91Z2ggdGhlIGVudGlyZSBtb2YgbGlzdCwgYW5kIGFsbCBlbGVtZW50cyBoYXZlIGJlZW4gcHJvY2Vzc2VkLiBSZXR1cm4KKwkJCS8vZG9tY2hpbGRyZW4uc2l6ZSwgc28gdGhhdCBubyBtb3JlIHByb2Nlc3NpbmcgaXMgZG9uZSBpbiBjYWxsaW5nIG1ldGhvZC4KKwkJCXJldHVybiBkb21DaGlsZHJlbi5zaXplKCk7CisJCX0KKwkJLy9pZiB3ZSBhcmUgaGVyZSwgdGhlbiBmaXJzdERpZmZlcmVuY2Ugd2FzIC0xLiBPdXIgYWxnbyBoYXMgZmFpbGVkLiBMZXQgb3JpZ2luYWwgYWxnbyBydW4uCisJCXJldHVybiAwOworCX0KKworCQogCiAJLyoqCiAJICogVXBkYXRlIGFsbCB0aGUgY2hpbGRyZW4gb2YgdGhlIHRhcmdldCBNT0Ygb2JqZWN0IGluIHRoZSByZWxhdGlvbnNoaXAgZGVzY3JpYmVkIGJ5CkBAIC0yOTksMTggKzM1MCwyMyBAQAogCSAqLwogCXByb3RlY3RlZCB2b2lkIHByaW1VcGRhdGVET01NdWx0aUZlYXR1cmUoVHJhbnNsYXRvciBtYXAsIE5vZGUgbm9kZSwgTGlzdCBtb2ZDaGlsZHJlbiwgTGlzdCBkb21DaGlsZHJlbiwgTm90aWZpZXIgb3duZXIpIHsKIAorCQlpbnQgaSA9IDA7CisJCU5vZGUgcGFyZW50ID0gZmluZERPTVBhdGgobm9kZSwgbWFwLCBmYWxzZSk7CisJCWlmKGRvbUNoaWxkcmVuLnNpemUoKSAtIG1vZkNoaWxkcmVuLnNpemUoKSA9PSAxKXsKKwkJCS8vYW4gZW1mIG9iamVjdCBoYXMgYmVlbiBkZWxldGVkLiBSZW1vdmUgaXQgZnJvbSB0aGUgZG9tIGFzIHdlbGwKKwkJCWkgPSB1cGRhdGVET01TaW5nbGVSZW1vdmUocGFyZW50LCBtb2ZDaGlsZHJlbiwgZG9tQ2hpbGRyZW4pOworCQl9CiAJCS8vVXNlZCBmb3IgaW5zZXJ0aW5nIHByaW1pdGl2ZXMKIAkJTGlzdCBpbm9yZGVyRE9NQ2hpbGRyZW4gPSBudWxsOwotCQlpZiAoIW1hcC5pc09iamVjdE1hcCgpIHx8IG1hcC5pc01hbmFnZWRCeVBhcmVudCgpKSB7Ci0JCQlpbm9yZGVyRE9NQ2hpbGRyZW4gPSBuZXcgQXJyYXlMaXN0KCk7Ci0JCQlpbm9yZGVyRE9NQ2hpbGRyZW4uYWRkQWxsKGRvbUNoaWxkcmVuKTsKKwkJaWYoaSA8IG1vZkNoaWxkcmVuLnNpemUoKSl7CisJCQlpZiAoIW1hcC5pc09iamVjdE1hcCgpIHx8IG1hcC5pc01hbmFnZWRCeVBhcmVudCgpKSB7CisJCQkJaW5vcmRlckRPTUNoaWxkcmVuID0gbmV3IEFycmF5TGlzdCgpOworCQkJCWlub3JkZXJET01DaGlsZHJlbi5hZGRBbGwoZG9tQ2hpbGRyZW4pOworCQkJfQogCQl9Ci0JCU5vZGUgcGFyZW50ID0gZmluZERPTVBhdGgobm9kZSwgbWFwLCBmYWxzZSk7Ci0KIAkJLy8gR28gdGhvdWdoIHRoZSBNT0YgY2hpbGRyZW4gY2hlY2tpbmcgdG8gc2VlIGlmIHRoZSBjb3JyZXNwb25kaW5nCiAJCS8vIE1PRiBBZGFwdGVyIGNoaWxkcmVuIGV4aXN0cy4gSWYgbm90LCBjcmVhdGUgdGhlIGFkYXB0ZXIuCiAJCS8vIEFsc28gaGFuZGxlcyByZW9yZGVyaW5nIGNoaWxkcmVuIHRoYXQgaGF2ZSBtb3ZlZC4KLQkJaW50IGkgPSAwOwogCQlmb3IgKDsgaSA8IG1vZkNoaWxkcmVuLnNpemUoKTsgaSsrKSB7CiAJCQlPYmplY3QgY2hpbGQgPSBtb2ZDaGlsZHJlbi5nZXQoaSk7CiAJCQlFT2JqZWN0IG1vZkNoaWxkID0gbnVsbDsKQEAgLTM2NSw3ICs0MjEsOSBAQAogCQkJCQlpbmRlbnQobmV3Tm9kZSwgbWFwKTsKIAkJCQkJYWRkRE9NQWRhcHRlcihuZXdOb2RlKTsgLy8gSG9vayB1cCBsaXN0ZW5lcnMKIAkJCQkJZG9tQ2hpbGRyZW4uYWRkKGksIG5ld05vZGUpOwotCQkJCQlpbm9yZGVyRE9NQ2hpbGRyZW4uYWRkKG5ld05vZGUpOworCQkJCQlpZihpbm9yZGVyRE9NQ2hpbGRyZW4gIT0gbnVsbCl7CisJCQkJCQlpbm9yZGVyRE9NQ2hpbGRyZW4uYWRkKG5ld05vZGUpOworCQkJCQl9CiAJCQkJCVRleHQgbmV3VGV4dCA9IHBhcmVudC5nZXRPd25lckRvY3VtZW50KCkuY3JlYXRlVGV4dE5vZGUobWFwLmNvbnZlcnRWYWx1ZVRvU3RyaW5nKGNoaWxkLCAoRU9iamVjdCkgb3duZXIpKTsKIAkJCQkJRE9NVXRpbGl0aWVzLmluc2VydEJlZm9yZU5vZGUobmV3Tm9kZSwgbmV3VGV4dCwgbnVsbCk7CiAJCQkJfQpAQCAtNjQxLDggKzY5OSw4IEBACiAJCQkJcmVtb3ZlRE9NQWRhcHRlcihjaGlsZE5vZGUsIGF0dHJBZGFwdGVyKTsKIAogCQkJCWlmIChmRGVidWcpIHsKLQkJCQkJb3JnLmVjbGlwc2UuamVtLnV0aWwubG9nZ2VyLnByb3h5LkxvZ2dlci5nZXRMb2dnZXIoKS5sb2dFcnJvcigiXHRDSElMRDogQWRkaW5nIERPTSBhZGFwdGVyOiAiICsgdGhpcyk7IC8vJE5PTi1OTFMtMSQKLQkJCQkJb3JnLmVjbGlwc2UuamVtLnV0aWwubG9nZ2VyLnByb3h5LkxvZ2dlci5nZXRMb2dnZXIoKS5sb2dFcnJvcigiXHRcdHRvOiAiICsgY2hpbGROb2RlKTsgLy8kTk9OLU5MUy0xJAorCQkJCQlFY29yZVV0aWxpdGllc1BsdWdpbi5sb2dFcnJvcigiXHRDSElMRDogQWRkaW5nIERPTSBhZGFwdGVyOiAiICsgdGhpcyk7IC8vJE5PTi1OTFMtMSQKKwkJCQkJRWNvcmVVdGlsaXRpZXNQbHVnaW4ubG9nRXJyb3IoIlx0XHR0bzogIiArIGNoaWxkTm9kZSk7IC8vJE5PTi1OTFMtMSQKIAkJCQl9CiAJCQkJcHJpbUFkZERPTUFkYXB0ZXIoY2hpbGROb2RlLCB0aGlzKTsKIAkJCX0KQEAgLTY1Nyw3ICs3MTUsNyBAQAogCQkJcmVtb3ZlRE9NQ2hpbGQocGFyZW50Tm9kZSwgY2hpbGROb2RlLCBmYWxzZSk7CiAJCQlwYXJlbnROb2RlLmluc2VydEJlZm9yZShjaGlsZE5vZGUsIGluc2VydEJlZm9yZU5vZGUpOwogCQl9IGNhdGNoIChFeGNlcHRpb24gZSkgewotCQkJZS5wcmludFN0YWNrVHJhY2UoKTsKKwkJCUVjb3JlVXRpbGl0aWVzUGx1Z2luLmxvZ0Vycm9yKGUpOwogCQl9CiAJfQogCkBAIC02OTQsNyArNzUyLDcgQEAKIAkJCQlyZW1vdmVBZGFwdGVycyhjaGlsZE5vZGUpOwogCQkJcGFyZW50Tm9kZS5yZW1vdmVDaGlsZChjaGlsZE5vZGUpOwogCQl9IGNhdGNoIChFeGNlcHRpb24gZSkgeyAKLQkJCWUucHJpbnRTdGFja1RyYWNlKCk7CisJCQlFY29yZVV0aWxpdGllc1BsdWdpbi5sb2dFcnJvcihlKTsKIAkJfQogCX0KIApAQCAtNzAyLDEyICs3NjAsNiBAQAogCSAqIFJlbW92ZSB0aGUgRE9NIGFkYXB0ZXJzIGZyb20gdGhlIG5vZGUgQU5EIGFsbCBpdHMgY2hpbGQgbm9kZXMsIHJlY3Vyc2l2ZWx5LgogCSAqLwogCXB1YmxpYyB2b2lkIHJlbW92ZUFkYXB0ZXJzKE5vZGUgbm9kZSkgewotCQlOb2RlTGlzdCBubCA9IG5vZGUuZ2V0Q2hpbGROb2RlcygpOwotCQlmb3IgKGludCBpID0gMDsgaSA8IG5sLmdldExlbmd0aCgpOyBpKyspIHsKLQkJCU5vZGUgbiA9IG5sLml0ZW0oaSk7Ci0JCQlyZW1vdmVBZGFwdGVycyhuKTsKLQkJfQotCQkKIAkJRU1GMkRPTUFkYXB0ZXIgYWRhcHRlciA9IHByaW1HZXRFeGlzdGluZ0FkYXB0ZXIobm9kZSk7CiAJCWlmIChhZGFwdGVyICE9IG51bGwpIHsKIAkJCS8vIFJlbW92ZSB0aGUgYWRhcHRlciBmcm9tIGJvdGggdGhlIERPTSBub2RlIGFuZCB0aGUgTU9GIE9iamVjdC4KQEAgLTcxOCw2ICs3NzAsMTEgQEAKIAkJCQkJbG9jYWxUYXJnZXQuZUFkYXB0ZXJzKCkucmVtb3ZlKGFkYXB0ZXIpOwogCQkJfQogCQl9CisJCU5vZGVMaXN0IG5sID0gbm9kZS5nZXRDaGlsZE5vZGVzKCk7CisJCWZvciAoaW50IGkgPSAwOyBpIDwgbmwuZ2V0TGVuZ3RoKCk7IGkrKykgeworCQkJTm9kZSBuID0gbmwuaXRlbShpKTsKKwkJCXJlbW92ZUFkYXB0ZXJzKG4pOworCQl9CiAJfQogCiAJLyoqCkBAIC05ODQsOSArMTA0MSw5IEBACiAJCWlmIChyZXNvdXJjZSAhPSBudWxsKSB7CiAJCQlwdWJsaWNJZCA9IHJlc291cmNlLmdldFB1YmxpY0lkKCk7CiAJCQlzeXN0ZW1JZCA9IHJlc291cmNlLmdldFN5c3RlbUlkKCk7CisJCQlpZiAoIShTdHJpbmdVdGlsLnN0cmluZ3NFcXVhbChwdWJsaWNJZCwgb2xkUHVibGljSWQpICYmIFN0cmluZ1V0aWwuc3RyaW5nc0VxdWFsKHN5c3RlbUlkLCBvbGRTeXN0ZW1JZCkpKQorCQkJCWZSZW5kZXJlci5yZXBsYWNlRG9jdW1lbnRUeXBlKHJlc291cmNlLmdldERvY3R5cGUoKSwgcHVibGljSWQsIHN5c3RlbUlkKTsKIAkJfQotCQlpZiAoIShTdHJpbmdVdGlsLnN0cmluZ3NFcXVhbChwdWJsaWNJZCwgb2xkUHVibGljSWQpICYmIFN0cmluZ1V0aWwuc3RyaW5nc0VxdWFsKHN5c3RlbUlkLCBvbGRTeXN0ZW1JZCkpKQotCQkJZlJlbmRlcmVyLnJlcGxhY2VEb2N1bWVudFR5cGUocmVzb3VyY2UuZ2V0RG9jdHlwZSgpLCBwdWJsaWNJZCwgc3lzdGVtSWQpOwogCX0KIAogCXByb3RlY3RlZCB2b2lkIHVwZGF0ZURPTURvY3VtZW50VHlwZShOb3RpZmljYXRpb24gbXNnKSB7CkBAIC0xMDEyLDYgKzEwNjksNyBAQAogCQkJcmVzb3VyY2Uuc2V0RG9jdHlwZVZhbHVlcyhwdWJsaWNJZCwgc3lzdGVtSWQpOwogCX0KIAorCUBPdmVycmlkZQogCXB1YmxpYyB2b2lkIG5vdGlmeUNoYW5nZWQoTm90aWZpY2F0aW9uIG1zZykgewogCiAJCWlmIChpc1Jvb3QpIHsKQEAgLTEwNzgsOCArMTEzNiw4IEBACiAKIAkJcHJpbUFkZERPTUFkYXB0ZXIoZk5vZGUsIHRoaXMpOwogCQlpZiAoZkRlYnVnKSB7Ci0JCQlvcmcuZWNsaXBzZS5qZW0udXRpbC5sb2dnZXIucHJveHkuTG9nZ2VyLmdldExvZ2dlcigpLmxvZ0Vycm9yKCJBZGRpbmcgRE9NIGFkYXB0ZXI6ICIgKyB0aGlzKTsgLy8kTk9OLU5MUy0xJAotCQkJb3JnLmVjbGlwc2UuamVtLnV0aWwubG9nZ2VyLnByb3h5LkxvZ2dlci5nZXRMb2dnZXIoKS5sb2dFcnJvcigiXHR0bzogIiArIGZOb2RlKTsgLy8kTk9OLU5MUy0xJAorCQkJRWNvcmVVdGlsaXRpZXNQbHVnaW4ubG9nRXJyb3IoIkFkZGluZyBET00gYWRhcHRlcjogIiArIHRoaXMpOyAvLyROT04tTkxTLTEkCisJCQlFY29yZVV0aWxpdGllc1BsdWdpbi5sb2dFcnJvcigiXHR0bzogIiArIGZOb2RlKTsgLy8kTk9OLU5MUy0xJAogCQl9CiAKIAkJLy8gR28gdGhyb3VnaCB0aGUgbWFwcy4gQWxsIG9mIHRoZSBET00gbm9kZXMgdGhhdCBhcmUgbm90IGxpc3RlbmVkCkBAIC0xMTU0LDcgKzEyMTIsNiBAQAogCQl0cnkgewogCQkJcmV0dXJuIG1hcC5jb252ZXJ0U3RyaW5nVG9WYWx1ZSh0cmltbWVkVmFsdWUsIGVtZk9iamVjdCk7CiAJCX0gY2F0Y2ggKEZlYXR1cmVWYWx1ZUNvbnZlcnNpb25FeGNlcHRpb24gZXgpIHsKLQkJCW9yZy5lY2xpcHNlLmplbS51dGlsLmxvZ2dlci5wcm94eS5Mb2dnZXIuZ2V0TG9nZ2VyKCkubG9nRXJyb3IoZXgpOwogCQkJaGFuZGxlRmVhdHVyZVZhbHVlQ29udmVyc2lvbkV4Y2VwdGlvbihleCk7CiAJCQlyZXR1cm4gbnVsbDsKIAkJfQpAQCAtMTIwMyw3ICsxMjYwLDcgQEAKIAkJCQkJaGFuZGxlSW52YWxpZE11bHRpTm9kZXMobm9kZU5hbWUpOwogCQkJCW5vZGUgPSAoTm9kZSkgbm9kZXMuZ2V0KDApOwogCQkJCWlmIChub2RlICE9IG51bGwpIHsKLQkJCQkJaWYgKGFkZEFkYXB0ZXJzICYmIChtYXAgIT0gbnVsbCB8fCBtYXAuaXNNYW5hZ2VkQnlQYXJlbnQoKSkpCisJCQkJCWlmIChhZGRBZGFwdGVycykKIAkJCQkJCWFkZERPTUFkYXB0ZXIoY3VyTm9kZSk7CiAJCQkJCWJyZWFrOwogCQkJCX0KQEAgLTEzNzUsNyArMTQzMiwxMyBAQAogCQkJQXR0ciBkb21BdHRyID0gKEF0dHIpIGNoaWxkLmdldEF0dHJpYnV0ZXMoKS5nZXROYW1lZEl0ZW0obWFwLmdldERPTU5hbWUobW9mT2JqZWN0KSk7CiAJCQlpZiAoZG9tQXR0ciAhPSBudWxsKSB7CiAJCQkJZG9tVmFsdWUgPSBkb21BdHRyLmdldFZhbHVlKCk7Ci0JCQkJZG9tVmFsdWUgPSBtYXAuY29udmVydFN0cmluZ1RvVmFsdWUoKFN0cmluZykgZG9tVmFsdWUsIG1vZk9iamVjdCk7CisJCQkJdHJ5IHsKKwkJCQkJZG9tVmFsdWUgPSBtYXAuY29udmVydFN0cmluZ1RvVmFsdWUoKFN0cmluZykgZG9tVmFsdWUsIG1vZk9iamVjdCk7CisJCQkJfSBjYXRjaCAoRmVhdHVyZVZhbHVlQ29udmVyc2lvbkV4Y2VwdGlvbiBlKSB7CisJCQkJCWhhbmRsZUZlYXR1cmVWYWx1ZUNvbnZlcnNpb25FeGNlcHRpb24oZSk7CisJCQkJCWRvbVZhbHVlID0gbnVsbDsKKwkJCQl9CisKIAkJCX0gZWxzZQogCQkJCWlzVW5zZXQgPSB0cnVlOwogCQl9IGVsc2UgewpAQCAtMTQ0MSw3ICsxNTA0LDcgQEAKIAkJCQkJLy8gZW51bQogCQkJCQkvLyBmZWF0dXJlcwogCi0JCQkJCWlmICh1cGRhdGVNT0ZBdHRBZGFwdGVyKQorCQkJCQlpZiAodXBkYXRlTU9GQXR0QWRhcHRlciAmJiBhdHRyQWRhcHRlciAhPSBudWxsKQogCQkJCQkJYXR0ckFkYXB0ZXIudXBkYXRlTU9GKCk7CiAJCQkJfQogCQkJfQpAQCAtMTU0NSw5ICsxNjA4LDkgQEAKIAkJCX0KIAogCQkJaWYgKGZEZWJ1ZykgewotCQkJCW9yZy5lY2xpcHNlLmplbS51dGlsLmxvZ2dlci5wcm94eS5Mb2dnZXIuZ2V0TG9nZ2VyKCkubG9nRXJyb3IoIlVwZGF0aW5nIERPTSBOb2RlOiAiICsgbm9kZSk7IC8vJE5PTi1OTFMtMSQKLQkJCQlvcmcuZWNsaXBzZS5qZW0udXRpbC5sb2dnZXIucHJveHkuTG9nZ2VyLmdldExvZ2dlcigpLmxvZ0Vycm9yKCJcdGZyb206ICIgKyBtb2ZPYmplY3QpOyAvLyROT04tTkxTLTEkCi0JCQkJb3JnLmVjbGlwc2UuamVtLnV0aWwubG9nZ2VyLnByb3h5LkxvZ2dlci5nZXRMb2dnZXIoKS5sb2dFcnJvcigiXHRtYXAgOiAiICsgbWFwKTsgLy8kTk9OLU5MUy0xJAorCQkJCUVjb3JlVXRpbGl0aWVzUGx1Z2luLmxvZ0Vycm9yKCJVcGRhdGluZyBET00gTm9kZTogIiArIG5vZGUpOyAvLyROT04tTkxTLTEkCisJCQkJRWNvcmVVdGlsaXRpZXNQbHVnaW4ubG9nRXJyb3IoIlx0ZnJvbTogIiArIG1vZk9iamVjdCk7IC8vJE5PTi1OTFMtMSQKKwkJCQlFY29yZVV0aWxpdGllc1BsdWdpbi5sb2dFcnJvcigiXHRtYXAgOiAiICsgbWFwKTsgLy8kTk9OLU5MUy0xJAogCQkJfQogCQkJYm9vbGVhbiBub3RpZmljYXRpb25GbGFnID0gaXNOb3RpZmljYXRpb25FbmFibGVkKCk7CiAJCQl0cnkgewpAQCAtMTU3Niw5ICsxNjM5LDkgQEAKIAkgKi8KIAlmaW5hbCBwcm90ZWN0ZWQgdm9pZCB1cGRhdGVET01MaW5rRmVhdHVyZShUcmFuc2xhdG9yIG1hcCwgTm9kZSBub2RlLCBFT2JqZWN0IG1vZk9iamVjdCkgewogCQlpZiAoZkRlYnVnKSB7Ci0JCQlvcmcuZWNsaXBzZS5qZW0udXRpbC5sb2dnZXIucHJveHkuTG9nZ2VyLmdldExvZ2dlcigpLmxvZ0Vycm9yKCJVcGRhdGluZyBET00gTm9kZSAobGluayk6ICIgKyBub2RlKTsgLy8kTk9OLU5MUy0xJAotCQkJb3JnLmVjbGlwc2UuamVtLnV0aWwubG9nZ2VyLnByb3h5LkxvZ2dlci5nZXRMb2dnZXIoKS5sb2dFcnJvcigiXHRmcm9tOiAiICsgbW9mT2JqZWN0KTsgLy8kTk9OLU5MUy0xJAotCQkJb3JnLmVjbGlwc2UuamVtLnV0aWwubG9nZ2VyLnByb3h5LkxvZ2dlci5nZXRMb2dnZXIoKS5sb2dFcnJvcigiXHRtYXAgOiAiICsgbWFwKTsgLy8kTk9OLU5MUy0xJAorCQkJRWNvcmVVdGlsaXRpZXNQbHVnaW4ubG9nRXJyb3IoIlVwZGF0aW5nIERPTSBOb2RlIChsaW5rKTogIiArIG5vZGUpOyAvLyROT04tTkxTLTEkCisJCQlFY29yZVV0aWxpdGllc1BsdWdpbi5sb2dFcnJvcigiXHRmcm9tOiAiICsgbW9mT2JqZWN0KTsgLy8kTk9OLU5MUy0xJAorCQkJRWNvcmVVdGlsaXRpZXNQbHVnaW4ubG9nRXJyb3IoIlx0bWFwIDogIiArIG1hcCk7IC8vJE5PTi1OTFMtMSQKIAkJfQogCQlwcmltVXBkYXRlRE9NTGlua0ZlYXR1cmUobWFwLCBub2RlLCBtb2ZPYmplY3QpOwogCX0KQEAgLTE1OTQsOSArMTY1Nyw5IEBACiAJICovCiAJZmluYWwgcHJvdGVjdGVkIHZvaWQgdXBkYXRlRE9NTXVsdGlGZWF0dXJlKFRyYW5zbGF0b3IgbWFwLCBOb2RlIG5vZGUsIEVPYmplY3QgbW9mT2JqZWN0KSB7CiAJCWlmIChmRGVidWcpIHsKLQkJCW9yZy5lY2xpcHNlLmplbS51dGlsLmxvZ2dlci5wcm94eS5Mb2dnZXIuZ2V0TG9nZ2VyKCkubG9nRXJyb3IoIlVwZGF0aW5nIERPTSBOb2RlIChtdWx0aSk6ICIgKyBub2RlKTsgLy8kTk9OLU5MUy0xJAotCQkJb3JnLmVjbGlwc2UuamVtLnV0aWwubG9nZ2VyLnByb3h5LkxvZ2dlci5nZXRMb2dnZXIoKS5sb2dFcnJvcigiXHRmcm9tOiAiICsgbW9mT2JqZWN0KTsgLy8kTk9OLU5MUy0xJAotCQkJb3JnLmVjbGlwc2UuamVtLnV0aWwubG9nZ2VyLnByb3h5LkxvZ2dlci5nZXRMb2dnZXIoKS5sb2dFcnJvcigiXHRtYXAgOiAiICsgbWFwKTsgLy8kTk9OLU5MUy0xJAorCQkJRWNvcmVVdGlsaXRpZXNQbHVnaW4ubG9nRXJyb3IoIlVwZGF0aW5nIERPTSBOb2RlIChtdWx0aSk6ICIgKyBub2RlKTsgLy8kTk9OLU5MUy0xJAorCQkJRWNvcmVVdGlsaXRpZXNQbHVnaW4ubG9nRXJyb3IoIlx0ZnJvbTogIiArIG1vZk9iamVjdCk7IC8vJE5PTi1OTFMtMSQKKwkJCUVjb3JlVXRpbGl0aWVzUGx1Z2luLmxvZ0Vycm9yKCJcdG1hcCA6ICIgKyBtYXApOyAvLyROT04tTkxTLTEkCiAJCX0KIAkJYm9vbGVhbiBub3RpZmljYXRpb25GbGFnID0gaXNOb3RpZmljYXRpb25FbmFibGVkKCk7CiAJCXRyeSB7CkBAIC0xNjEyLDE1ICsxNjc1LDE1IEBACiAJICogdXBkYXRlZC4KIAkgKi8KIAlwcm90ZWN0ZWQgdm9pZCB1cGRhdGVET01TdWJ0cmVlKFRyYW5zbGF0b3IgbWFwLCBOb2RlIG5vZGUsIEVPYmplY3QgbW9mT2JqZWN0LCBPYmplY3QgYXR0clZhbHVlKSB7Ci0KKwkJT2JqZWN0IGlubmVyQXR0clZhbHVlID0gYXR0clZhbHVlOwogCQlpZiAobWFwLmZlYXR1cmVFeGlzdHMobW9mT2JqZWN0KSkgewogCQkJaWYgKChtYXAuaXNFbnVtRmVhdHVyZSgpIHx8IG1hcC5pc0Jvb2xlYW5GZWF0dXJlKCkpICYmIChtYXAuaXNVbnNldHRhYmxlKCkgJiYgIW1hcC5pc1NldE1PRlZhbHVlKG1vZk9iamVjdCkpKQotCQkJCWF0dHJWYWx1ZSA9IG51bGw7CisJCQkJaW5uZXJBdHRyVmFsdWUgPSBudWxsOwogCQl9IGVsc2UKLQkJCWF0dHJWYWx1ZSA9IG1hcC5leHRyYWN0U3RyaW5nVmFsdWUobW9mT2JqZWN0KTsKKwkJCWlubmVyQXR0clZhbHVlID0gbWFwLmV4dHJhY3RTdHJpbmdWYWx1ZShtb2ZPYmplY3QpOwogCiAJCS8vIENyZWF0ZSBhbmQvb3IgdXBkYXRlIHRoZSBET00gc3VidHJlZQotCQlpZiAoYXR0clZhbHVlICE9IG51bGwpIHsKKwkJaWYgKGlubmVyQXR0clZhbHVlICE9IG51bGwpIHsKIAkJCU5vZGUgcGFyZW50ID0gY3JlYXRlRE9NUGF0aChub2RlLCBtYXApOwogCQkJaWYgKG1hcC5pc01hbmFnZWRCeVBhcmVudCgpKSB7CiAJCQkJLy8gSGFuZGxlIHRoZSBjYXNlIHdoZXJlIHRoZSBtb2YgdmFsdWUgaXMgbm90IGFub3RoZXIKQEAgLTE2MzAsMTAgKzE2OTMsMTAgQEAKIAogCQkJCUVsZW1lbnQgY2hpbGQgPSBtYXAuaXNET01UZXh0VmFsdWUoKSA/IChFbGVtZW50KSBwYXJlbnQgOiBmaW5kT3JDcmVhdGVOb2RlKHBhcmVudCwgbWFwLCBtYXAuZ2V0RE9NTmFtZShtb2ZPYmplY3QpKTsKIAotCQkJCWZpbmRPckNyZWF0ZVRleHROb2RlKGNoaWxkLCBtYXAsIG1hcC5jb252ZXJ0VmFsdWVUb1N0cmluZyhhdHRyVmFsdWUsIG1vZk9iamVjdCkpOworCQkJCWZpbmRPckNyZWF0ZVRleHROb2RlKGNoaWxkLCBtYXAsIG1hcC5jb252ZXJ0VmFsdWVUb1N0cmluZyhpbm5lckF0dHJWYWx1ZSwgbW9mT2JqZWN0KSk7CiAJCQl9IGVsc2UgewogCQkJCS8vIEhhbmRsZSB0aGUgY2FzZSB3ZXJlIHRoZSBtb2YgdmFsdWUgaXMgYSBtb2Ygb2JqZWN0LgotCQkJCUVPYmplY3QgbW9mVmFsdWUgPSAoRU9iamVjdCkgYXR0clZhbHVlOworCQkJCUVPYmplY3QgbW9mVmFsdWUgPSAoRU9iamVjdCkgaW5uZXJBdHRyVmFsdWU7CiAJCQkJRU1GMkRPTUFkYXB0ZXIgdmFsdWVBZGFwdGVyID0gKEVNRjJET01BZGFwdGVyKSBFY29yZVV0aWwuZ2V0RXhpc3RpbmdBZGFwdGVyKG1vZlZhbHVlLCBFTUYyRE9NQWRhcHRlci5BREFQVEVSX0NMQVNTKTsKIAkJCQlpZiAodmFsdWVBZGFwdGVyICE9IG51bGwpCiAJCQkJCXZhbHVlQWRhcHRlci51cGRhdGVET00oKTsKQEAgLTE2NzAsOSArMTczMyw5IEBACiAJICovCiAJZmluYWwgcHJvdGVjdGVkIHZvaWQgdXBkYXRlTU9GTGlua0ZlYXR1cmUoVHJhbnNsYXRvciBtYXAsIE5vZGUgbm9kZSwgRU9iamVjdCBtb2ZPYmplY3QpIHsKIAkJaWYgKGZEZWJ1ZykgewotCQkJb3JnLmVjbGlwc2UuamVtLnV0aWwubG9nZ2VyLnByb3h5LkxvZ2dlci5nZXRMb2dnZXIoKS5sb2dFcnJvcigiVXBkYXRpbmcgTU9GT2JqZWN0IChsaW5rKTogIiArIG1vZk9iamVjdCk7IC8vJE5PTi1OTFMtMSQKLQkJCW9yZy5lY2xpcHNlLmplbS51dGlsLmxvZ2dlci5wcm94eS5Mb2dnZXIuZ2V0TG9nZ2VyKCkubG9nRXJyb3IoIlx0ZnJvbTogIiArIG5vZGUpOyAvLyROT04tTkxTLTEkCi0JCQlvcmcuZWNsaXBzZS5qZW0udXRpbC5sb2dnZXIucHJveHkuTG9nZ2VyLmdldExvZ2dlcigpLmxvZ0Vycm9yKCJcdG1hcCA6ICIgKyBtYXApOyAvLyROT04tTkxTLTEkCisJCQlFY29yZVV0aWxpdGllc1BsdWdpbi5sb2dFcnJvcigiVXBkYXRpbmcgTU9GT2JqZWN0IChsaW5rKTogIiArIG1vZk9iamVjdCk7IC8vJE5PTi1OTFMtMSQKKwkJCUVjb3JlVXRpbGl0aWVzUGx1Z2luLmxvZ0Vycm9yKCJcdGZyb206ICIgKyBub2RlKTsgLy8kTk9OLU5MUy0xJAorCQkJRWNvcmVVdGlsaXRpZXNQbHVnaW4ubG9nRXJyb3IoIlx0bWFwIDogIiArIG1hcCk7IC8vJE5PTi1OTFMtMSQKIAkJfQogCQlib29sZWFuIG5vdGlmaWNhdGlvbkZsYWcgPSBpc05vdGlmaWNhdGlvbkVuYWJsZWQoKTsKIAkJdHJ5IHsKQEAgLTE2OTQsOSArMTc1Nyw5IEBACiAJICovCiAJZmluYWwgcHJvdGVjdGVkIHZvaWQgdXBkYXRlTU9GTXVsdGlGZWF0dXJlKFRyYW5zbGF0b3IgbWFwLCBOb2RlIG5vZGUsIEVPYmplY3QgbW9mT2JqZWN0KSB7CiAJCWlmIChmRGVidWcpIHsKLQkJCW9yZy5lY2xpcHNlLmplbS51dGlsLmxvZ2dlci5wcm94eS5Mb2dnZXIuZ2V0TG9nZ2VyKCkubG9nRXJyb3IoIlVwZGF0aW5nIE1PRk9iamVjdCAobXVsdGkpOiAiICsgbW9mT2JqZWN0KTsgLy8kTk9OLU5MUy0xJAotCQkJb3JnLmVjbGlwc2UuamVtLnV0aWwubG9nZ2VyLnByb3h5LkxvZ2dlci5nZXRMb2dnZXIoKS5sb2dFcnJvcigiXHRmcm9tOiAiICsgbm9kZSk7IC8vJE5PTi1OTFMtMSQKLQkJCW9yZy5lY2xpcHNlLmplbS51dGlsLmxvZ2dlci5wcm94eS5Mb2dnZXIuZ2V0TG9nZ2VyKCkubG9nRXJyb3IoIlx0bWFwIDogIiArIG1hcCk7IC8vJE5PTi1OTFMtMSQKKwkJCUVjb3JlVXRpbGl0aWVzUGx1Z2luLmxvZ0Vycm9yKCJVcGRhdGluZyBNT0ZPYmplY3QgKG11bHRpKTogIiArIG1vZk9iamVjdCk7IC8vJE5PTi1OTFMtMSQKKwkJCUVjb3JlVXRpbGl0aWVzUGx1Z2luLmxvZ0Vycm9yKCJcdGZyb206ICIgKyBub2RlKTsgLy8kTk9OLU5MUy0xJAorCQkJRWNvcmVVdGlsaXRpZXNQbHVnaW4ubG9nRXJyb3IoIlx0bWFwIDogIiArIG1hcCk7IC8vJE5PTi1OTFMtMSQKIAkJfQogCQlib29sZWFuIG5vdGlmaWNhdGlvbkZsYWcgPSBpc05vdGlmaWNhdGlvbkVuYWJsZWQoKTsKIAkJdHJ5IHsKQEAgLTE3MjcsNyArMTc5MCw3IEBACiAJCQkJaWYobWFwLmdldEZlYXR1cmUoKSAhPSBudWxsICYmIG1hcC5nZXRGZWF0dXJlKCkuaXNVbmlxdWUoKSAmJiBtb2ZPYmplY3QuZUdldChtYXAuZ2V0RmVhdHVyZSgpKSAhPSBudWxsICYmIG1vZk9iamVjdC5lR2V0KG1hcC5nZXRGZWF0dXJlKCkpIGluc3RhbmNlb2YgTGlzdCAmJiAoKExpc3QpIG1vZk9iamVjdC5lR2V0KG1hcC5nZXRGZWF0dXJlKCkpKS5jb250YWlucyhhdHRyaWJ1dGVWYWx1ZSkpewogCQkJCQlhZHZhbmNlQWRkSW5kZXggPSBmYWxzZTsKIAkJCQkJU3RyaW5nIGRvbU5hbWUgPSBtYXAuZG9tTmFtZUFuZFBhdGggIT0gbnVsbCA/IG1hcC5kb21OYW1lQW5kUGF0aCA6ICJhdHRyaWJ1dGUiOyAvLyROT04tTkxTLTEkCi0JCQkJCW9yZy5lY2xpcHNlLmplbS51dGlsLmxvZ2dlci5wcm94eS5Mb2dnZXIuZ2V0TG9nZ2VyKCkubG9nRXJyb3IobmV3IElsbGVnYWxBcmd1bWVudEV4Y2VwdGlvbigiVGhlICdubyBkdXBsaWNhdGVzJyBjb25zdHJhaW50IGlzIHZpb2xhdGVkIGJ5ICIrZG9tTmFtZSsiID0gIithdHRyaWJ1dGVWYWx1ZSkpOworCQkJCQlFY29yZVV0aWxpdGllc1BsdWdpbi5sb2dFcnJvcihuZXcgSWxsZWdhbEFyZ3VtZW50RXhjZXB0aW9uKCJUaGUgJ25vIGR1cGxpY2F0ZXMnIGNvbnN0cmFpbnQgaXMgdmlvbGF0ZWQgYnkgIitkb21OYW1lKyIgPSAiK2F0dHJpYnV0ZVZhbHVlKSk7IC8vJE5PTi1OTFMtMSQgLy8kTk9OLU5MUy0yJAogCQkJCQloYW5kbGVJbnZhbGlkTXVsdGlOb2RlcyhjaGlsZC5nZXROb2RlTmFtZSgpKTsKIAkJCQl9IGVsc2UgewogCQkJCQltYXAuc2V0TU9GVmFsdWUobW9mT2JqZWN0LCBhdHRyaWJ1dGVWYWx1ZSwgYWRkSW5kZXgpOwpAQCAtMTc2Niw5ICsxODI5LDkgQEAKIAkJLy8gVE9ETyBNREUgQWRkIGEgbWFwLmlzQ29tbWVudCgpIGFuZCB1cGRhdGVNT0ZDb21tZW50RmVhdHVyZShtYXAsIG5vZGUsIG1vZk9iamVjdCk7CiAKIAkJaWYgKGZEZWJ1ZykgewotCQkJb3JnLmVjbGlwc2UuamVtLnV0aWwubG9nZ2VyLnByb3h5LkxvZ2dlci5nZXRMb2dnZXIoKS5sb2dFcnJvcigiVXBkYXRpbmcgTU9GT2JqZWN0OiAiICsgbW9mT2JqZWN0KTsgLy8kTk9OLU5MUy0xJAotCQkJb3JnLmVjbGlwc2UuamVtLnV0aWwubG9nZ2VyLnByb3h5LkxvZ2dlci5nZXRMb2dnZXIoKS5sb2dFcnJvcigiXHRmcm9tOiAiICsgbm9kZSk7IC8vJE5PTi1OTFMtMSQKLQkJCW9yZy5lY2xpcHNlLmplbS51dGlsLmxvZ2dlci5wcm94eS5Mb2dnZXIuZ2V0TG9nZ2VyKCkubG9nRXJyb3IoIlx0bWFwIDogIiArIG1hcCk7IC8vJE5PTi1OTFMtMSQKKwkJCUVjb3JlVXRpbGl0aWVzUGx1Z2luLmxvZ0Vycm9yKCJVcGRhdGluZyBNT0ZPYmplY3Q6ICIgKyBtb2ZPYmplY3QpOyAvLyROT04tTkxTLTEkCisJCQlFY29yZVV0aWxpdGllc1BsdWdpbi5sb2dFcnJvcigiXHRmcm9tOiAiICsgbm9kZSk7IC8vJE5PTi1OTFMtMSQKKwkJCUVjb3JlVXRpbGl0aWVzUGx1Z2luLmxvZ0Vycm9yKCJcdG1hcCA6ICIgKyBtYXApOyAvLyROT04tTkxTLTEkCiAJCX0KIAkJYm9vbGVhbiBub3RpZmljYXRpb25GbGFnID0gaXNOb3RpZmljYXRpb25FbmFibGVkKCk7CiAJCWJvb2xlYW4gaGFzQ2hhbmdlZCA9IGZhbHNlOwpkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVtZi93dHBlbWYvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbWYvcmVzb3VyY2UvRU1GMkRPTVJlbmRlcmVyLmphdmEgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW1mL3d0cGVtZi9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2VtZi9yZXNvdXJjZS9FTUYyRE9NUmVuZGVyZXIuamF2YQppbmRleCA1M2ZiZGM3Li5kMDdlM2M0IDEwMDY0NAotLS0gYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW1mL3d0cGVtZi9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2VtZi9yZXNvdXJjZS9FTUYyRE9NUmVuZGVyZXIuamF2YQorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW1mL3d0cGVtZi9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2VtZi9yZXNvdXJjZS9FTUYyRE9NUmVuZGVyZXIuamF2YQpAQCAtMjgsNyArMjgsNyBAQAogCiBpbXBvcnQgb3JnLmVjbGlwc2UuZW1mLmNvbW1vbi51dGlsLldyYXBwZWRFeGNlcHRpb247CiBpbXBvcnQgb3JnLmVjbGlwc2UuZW1mLmVjb3JlLnV0aWwuRWNvcmVVdGlsOwotaW1wb3J0IG9yZy5lY2xpcHNlLmplbS51dGlsLmxvZ2dlci5wcm94eS5Mb2dnZXI7CitpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5pbnRlcm5hbC5lbWYucGx1Z2luLkVjb3JlVXRpbGl0aWVzUGx1Z2luOwogaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uaW50ZXJuYWwuZW1mLnV0aWxpdGllcy5ET01Mb2FkT3B0aW9uczsKIGltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmludGVybmFsLmVtZi51dGlsaXRpZXMuRE9NVXRpbGl0aWVzOwogaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uaW50ZXJuYWwuZW1mLnV0aWxpdGllcy5SZXZpc2l0OwpAQCAtMzksNyArMzksNyBAQAogCiAKIAotcHVibGljIGNsYXNzIEVNRjJET01SZW5kZXJlciBleHRlbmRzIEFic3RyYWN0UmVuZGVyZXJJbXBsIGltcGxlbWVudHMgUmVuZGVyZXIgeworcHVibGljIGNsYXNzIEVNRjJET01SZW5kZXJlciBleHRlbmRzIEFic3RyYWN0UmVuZGVyZXJJbXBsIHsKIAogCXByb3RlY3RlZCBNYXAgZG9tQWRhcHRlclJlZ2lzdHJ5OwogCXByb3RlY3RlZCBib29sZWFuIG5lZWRzVG9DcmVhdGVET00gPSB0cnVlOwpAQCAtMTkxLDExICsxOTEsMTEgQEAKIAkJCS8qIHNvdXJjZS5zZXRTeXN0ZW1JZChnZXRSZXNvdXJjZSgpLmdldFN5c3RlbUlkKCkpOyAqLwogCQkJdHJhbnNmb3JtZXIudHJhbnNmb3JtKHNvdXJjZSwgbmV3IFN0cmVhbVJlc3VsdChvdXQpKTsKIAkJfSBjYXRjaCAoVHJhbnNmb3JtZXJDb25maWd1cmF0aW9uRXhjZXB0aW9uIGUpIHsKLQkJCUxvZ2dlci5nZXRMb2dnZXIoKS5sb2dFcnJvcihlKTsKKwkJCUVjb3JlVXRpbGl0aWVzUGx1Z2luLmxvZ0Vycm9yKGUpOwogCQl9IGNhdGNoIChUcmFuc2Zvcm1lckZhY3RvcnlDb25maWd1cmF0aW9uRXJyb3IgZSkgewotCQkJTG9nZ2VyLmdldExvZ2dlcigpLmxvZ0Vycm9yKGUpOworCQkJRWNvcmVVdGlsaXRpZXNQbHVnaW4ubG9nRXJyb3IoZSk7CiAJCX0gY2F0Y2ggKFRyYW5zZm9ybWVyRXhjZXB0aW9uIGUpIHsKLQkJCUxvZ2dlci5nZXRMb2dnZXIoKS5sb2dFcnJvcihlKTsKKwkJCUVjb3JlVXRpbGl0aWVzUGx1Z2luLmxvZ0Vycm9yKGUpOwogCQl9IGZpbmFsbHkgewogCQl9CiAJfQpAQCAtMjQxLDYgKzI0MSw3IEBACiAJCX0KIAl9CiAKKwlAT3ZlcnJpZGUKIAlwdWJsaWMgdm9pZCBwcmVVbmxvYWQoKSB7CiAJCUVNRjJET01BZGFwdGVyIGFkYXB0ZXIgPSAoRU1GMkRPTUFkYXB0ZXIpIEVjb3JlVXRpbC5nZXRBZGFwdGVyKHJlc291cmNlLmVBZGFwdGVycygpLCBFTUYyRE9NQWRhcHRlci5BREFQVEVSX0NMQVNTKTsKIAkJaWYgKGFkYXB0ZXIgIT0gbnVsbCkgewpkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVtZi93dHBlbWYvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbWYvcmVzb3VyY2UvRU1GMkRPTVJlbmRlcmVyRmFjdG9yeS5qYXZhIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVtZi93dHBlbWYvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbWYvcmVzb3VyY2UvRU1GMkRPTVJlbmRlcmVyRmFjdG9yeS5qYXZhCmluZGV4IGZjZTU2MDMuLmZmNGZiYmIgMTAwNjQ0Ci0tLSBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbWYvd3RwZW1mL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW1mL3Jlc291cmNlL0VNRjJET01SZW5kZXJlckZhY3RvcnkuamF2YQorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW1mL3d0cGVtZi9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2VtZi9yZXNvdXJjZS9FTUYyRE9NUmVuZGVyZXJGYWN0b3J5LmphdmEKQEAgLTIwLDYgKzIwLDcgQEAKIAkvKioKIAkgKiBAc2VlIGNvbS5pYm0uZXRvb2xzLmVtZjJ4bWwuUmVuZGVyZXJGYWN0b3J5I2NyZWF0ZVJlbmRlcmVyKCkKIAkgKi8KKwlAT3ZlcnJpZGUKIAlwdWJsaWMgUmVuZGVyZXIgY3JlYXRlUmVuZGVyZXIoKSB7CiAJCUVNRjJET01SZW5kZXJlciByZW5kZXJlciA9IG5ldyBFTUYyRE9NUmVuZGVyZXIoKTsKIAkJcmVuZGVyZXIuc2V0VmFsaWRhdGluZyhpc1ZhbGlkYXRpbmcoKSk7CmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW1mL3d0cGVtZi9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2VtZi9yZXNvdXJjZS9FTUYyU0FYRG9jdW1lbnRIYW5kbGVyLmphdmEgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW1mL3d0cGVtZi9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2VtZi9yZXNvdXJjZS9FTUYyU0FYRG9jdW1lbnRIYW5kbGVyLmphdmEKaW5kZXggYTI1YmI2My4uNTQwYzJhZiAxMDA2NDQKLS0tIGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVtZi93dHBlbWYvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbWYvcmVzb3VyY2UvRU1GMlNBWERvY3VtZW50SGFuZGxlci5qYXZhCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbWYvd3RwZW1mL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW1mL3Jlc291cmNlL0VNRjJTQVhEb2N1bWVudEhhbmRsZXIuamF2YQpAQCAtMTMsNyArMTMsNyBAQAogCiBpbXBvcnQgamF2YS5pby5JT0V4Y2VwdGlvbjsKIAotaW1wb3J0IG9yZy5lY2xpcHNlLmplbS51dGlsLmxvZ2dlci5wcm94eS5Mb2dnZXI7CitpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5pbnRlcm5hbC5lbWYucGx1Z2luLkVjb3JlVXRpbGl0aWVzUGx1Z2luOwogaW1wb3J0IG9yZy54bWwuc2F4LkF0dHJpYnV0ZXM7CiBpbXBvcnQgb3JnLnhtbC5zYXguRW50aXR5UmVzb2x2ZXI7CiBpbXBvcnQgb3JnLnhtbC5zYXguSW5wdXRTb3VyY2U7CkBAIC00NCw2ICs0NCw3IEBACiAJLyoqCiAJICogQHNlZSBvcmcueG1sLnNheC5oZWxwZXJzLkRlZmF1bHRIYW5kbGVyI3Jlc29sdmVFbnRpdHkoamF2YS5sYW5nLlN0cmluZywgamF2YS5sYW5nLlN0cmluZykKIAkgKi8KKwlAT3ZlcnJpZGUKIAlwdWJsaWMgSW5wdXRTb3VyY2UgcmVzb2x2ZUVudGl0eShTdHJpbmcgcHVibGljSWQsIFN0cmluZyBzeXN0ZW1JZCkgdGhyb3dzIFNBWEV4Y2VwdGlvbiB7CiAJCUlucHV0U291cmNlIHJlc3VsdCA9IG51bGw7CiAJCXRoaXMucmVzb3VyY2Uuc2V0RG9jdHlwZVZhbHVlcyhwdWJsaWNJZCwgc3lzdGVtSWQpOwpAQCAtNjUsNiArNjYsNyBAQAogCS8qKgogCSAqIEBzZWUgb3JnLnhtbC5zYXguQ29udGVudEhhbmRsZXIjc3RhcnREb2N1bWVudCgpCiAJICovCisJQE92ZXJyaWRlCiAJcHVibGljIHZvaWQgc3RhcnREb2N1bWVudCgpIHRocm93cyBTQVhFeGNlcHRpb24gewogCQkvKgogCQkgKiBUaGUgZW5kRG9jdW1lbnQoKSBtZXRob2Qgc2hvdWxkIGhhdmUgZnJvemVuIHRoZSBwb29sLCBvciBpdCBtYXkgbm90IGJlIHdhcm1lZCB5ZXQuIEluCkBAIC04Miw2ICs4NCw3IEBACiAJICogQHNlZSBvcmcueG1sLnNheC5Db250ZW50SGFuZGxlciNzdGFydEVsZW1lbnQoamF2YS5sYW5nLlN0cmluZywgamF2YS5sYW5nLlN0cmluZywKIAkgKiAgICAgIGphdmEubGFuZy5TdHJpbmcsIG9yZy54bWwuc2F4LkF0dHJpYnV0ZXMpCiAJICovCisJQE92ZXJyaWRlCiAJcHVibGljIHZvaWQgc3RhcnRFbGVtZW50KFN0cmluZyB1cmksIFN0cmluZyBsb2NhbE5hbWUsIFN0cmluZyBxTmFtZSwgQXR0cmlidXRlcyBhdHRyaWJ1dGVzKSB0aHJvd3MgU0FYRXhjZXB0aW9uIHsKIAkJYWRkVG9TdGFjayhxTmFtZSwgYXR0cmlidXRlcyk7CiAJfQpAQCAtODksNiArOTIsNyBAQAogCS8qKgogCSAqIEBzZWUgb3JnLnhtbC5zYXguQ29udGVudEhhbmRsZXIjY2hhcmFjdGVycyhjaGFyW10sIGludCwgaW50KQogCSAqLworCUBPdmVycmlkZQogCXB1YmxpYyB2b2lkIGNoYXJhY3RlcnMoY2hhcltdIGRhdGEsIGludCBzdGFydCwgaW50IGxlbmd0aCkgdGhyb3dzIFNBWEV4Y2VwdGlvbiB7CiAKIAkJQ2FjaGVFdmVudE5vZGUgY3VycmVudFJlY29yZCA9IGdldEN1cnJlbnRSZWNvcmQoKTsKQEAgLTEwMSw2ICsxMDUsNyBAQAogCSAqIEBzZWUgb3JnLnhtbC5zYXguQ29udGVudEhhbmRsZXIjZW5kRWxlbWVudChqYXZhLmxhbmcuU3RyaW5nLCBqYXZhLmxhbmcuU3RyaW5nLAogCSAqICAgICAgamF2YS5sYW5nLlN0cmluZykKIAkgKi8KKwlAT3ZlcnJpZGUKIAlwdWJsaWMgdm9pZCBlbmRFbGVtZW50KFN0cmluZyB1cmksIFN0cmluZyBsb2NhbE5hbWUsIFN0cmluZyBxTmFtZSkgdGhyb3dzIFNBWEV4Y2VwdGlvbiB7CiAKIAkJQ2FjaGVFdmVudE5vZGUgY3VycmVudFJlY29yZCA9IG51bGw7CkBAIC0xMjAsNiArMTI1LDcgQEAKIAkvKioKIAkgKiBAc2VlIG9yZy54bWwuc2F4LkNvbnRlbnRIYW5kbGVyI2VuZERvY3VtZW50KCkKIAkgKi8KKwlAT3ZlcnJpZGUKIAlwdWJsaWMgdm9pZCBlbmREb2N1bWVudCgpIHRocm93cyBTQVhFeGNlcHRpb24gewogCQlDYWNoZUV2ZW50Tm9kZSBsYXN0UmVjb3JkID0gdGhpcy5yZW1vdmVDdXJyZW50UmVjb3JkKCk7CiAJCWxhc3RSZWNvcmQuY29tbWl0KCk7CkBAIC0xMjksNiArMTM1LDcgQEAKIAkvKioKIAkgKiBAc2VlIG9yZy54bWwuc2F4LkVycm9ySGFuZGxlciNlcnJvcihvcmcueG1sLnNheC5TQVhQYXJzZUV4Y2VwdGlvbikKIAkgKi8KKwlAT3ZlcnJpZGUKIAlwdWJsaWMgdm9pZCBlcnJvcihTQVhQYXJzZUV4Y2VwdGlvbiBleCkgdGhyb3dzIFNBWEV4Y2VwdGlvbiB7CiAJCXRocm93IGV4OwogCX0KQEAgLTEzNiw2ICsxNDMsNyBAQAogCS8qKgogCSAqIEBzZWUgb3JnLnhtbC5zYXguRXJyb3JIYW5kbGVyI2ZhdGFsRXJyb3Iob3JnLnhtbC5zYXguU0FYUGFyc2VFeGNlcHRpb24pCiAJICovCisJQE92ZXJyaWRlCiAJcHVibGljIHZvaWQgZmF0YWxFcnJvcihTQVhQYXJzZUV4Y2VwdGlvbiBleCkgdGhyb3dzIFNBWEV4Y2VwdGlvbiB7CiAJCXRocm93IGV4OwogCX0KQEAgLTE0Myw4ICsxNTEsOSBAQAogCS8qKgogCSAqIEBzZWUgb3JnLnhtbC5zYXguRXJyb3JIYW5kbGVyI3dhcm5pbmcob3JnLnhtbC5zYXguU0FYUGFyc2VFeGNlcHRpb24pCiAJICovCisJQE92ZXJyaWRlCiAJcHVibGljIHZvaWQgd2FybmluZyhTQVhQYXJzZUV4Y2VwdGlvbiBleCkgdGhyb3dzIFNBWEV4Y2VwdGlvbiB7Ci0JCUxvZ2dlci5nZXRMb2dnZXIoKS5sb2dXYXJuaW5nKGV4KTsKKwkJRWNvcmVVdGlsaXRpZXNQbHVnaW4ubG9nV2FybmluZyhleCk7CiAJfQogCiAJLyoqCmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW1mL3d0cGVtZi9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2VtZi9yZXNvdXJjZS9FTUYyU0FYUmVuZGVyZXIuamF2YSBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbWYvd3RwZW1mL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW1mL3Jlc291cmNlL0VNRjJTQVhSZW5kZXJlci5qYXZhCmluZGV4IDg2ZjcyMWYuLjIxMDY0ZjcgMTAwNjQ0Ci0tLSBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbWYvd3RwZW1mL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW1mL3Jlc291cmNlL0VNRjJTQVhSZW5kZXJlci5qYXZhCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbWYvd3RwZW1mL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW1mL3Jlc291cmNlL0VNRjJTQVhSZW5kZXJlci5qYXZhCkBAIC0yNyw3ICsyNyw3IEBACiBpbXBvcnQgamF2YXgueG1sLnRyYW5zZm9ybS5zdHJlYW0uU3RyZWFtUmVzdWx0OwogCiBpbXBvcnQgb3JnLmVjbGlwc2UuZW1mLmNvbW1vbi51dGlsLldyYXBwZWRFeGNlcHRpb247Ci1pbXBvcnQgb3JnLmVjbGlwc2UuamVtLnV0aWwubG9nZ2VyLnByb3h5LkxvZ2dlcjsKK2ltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmludGVybmFsLmVtZi5wbHVnaW4uRWNvcmVVdGlsaXRpZXNQbHVnaW47CiBpbXBvcnQgb3JnLnhtbC5zYXguSW5wdXRTb3VyY2U7CiBpbXBvcnQgb3JnLnhtbC5zYXguU0FYRXhjZXB0aW9uOwogaW1wb3J0IG9yZy54bWwuc2F4LlNBWE5vdFJlY29nbml6ZWRFeGNlcHRpb247CkBAIC03NCwxMiArNzQsMTIgQEAKIAkJCQlyZWFkZXIuc2V0RmVhdHVyZSgiaHR0cDovL2FwYWNoZS5vcmcveG1sL2ZlYXR1cmVzL3ZhbGlkYXRpb24vc2NoZW1hIiwgaXNWYWxpZGF0aW5nKCkpOyAvLyROT04tTkxTLTEkCiAJCQl9IGNhdGNoIChTQVhOb3RSZWNvZ25pemVkRXhjZXB0aW9uIGUpIHsKIAkJCQlyZWFkZXIuc2V0RmVhdHVyZSgiaHR0cDovL3htbC5vcmcvc2F4L2ZlYXR1cmVzL3ZhbGlkYXRpb24iLCBmYWxzZSk7IC8vJE5PTi1OTFMtMSQKLQkJCQlMb2dnZXIuZ2V0TG9nZ2VyKCkubG9nKCJXYXJuaW5nOiBQYXJzZXIgZG9lcyBub3Qgc3VwcG9ydCBcImh0dHA6Ly9hcGFjaGUub3JnL3htbC9mZWF0dXJlcy92YWxpZGF0aW9uL3NjaGVtYVwiLiBWYWxpZGF0aW9uIHdpbGwgYmUgZGlzYWJsZWQuIik7IC8vJE5PTi1OTFMtMSQKKwkJCQlFY29yZVV0aWxpdGllc1BsdWdpbi5sb2dXYXJuaW5nKCJXYXJuaW5nOiBQYXJzZXIgZG9lcyBub3Qgc3VwcG9ydCBcImh0dHA6Ly9hcGFjaGUub3JnL3htbC9mZWF0dXJlcy92YWxpZGF0aW9uL3NjaGVtYVwiLiBWYWxpZGF0aW9uIHdpbGwgYmUgZGlzYWJsZWQuIik7IC8vJE5PTi1OTFMtMSQKIAkJCX0KIAkJCXRyeSB7CiAJCQkJcmVhZGVyLnNldEZlYXR1cmUoImh0dHA6Ly9hcGFjaGUub3JnL3htbC9mZWF0dXJlcy9hbGxvdy1qYXZhLWVuY29kaW5ncyIsIHRydWUpOyAvLyROT04tTkxTLTEkCiAJCQl9IGNhdGNoIChTQVhOb3RSZWNvZ25pemVkRXhjZXB0aW9uIGUpIHsKLQkJCQlMb2dnZXIuZ2V0TG9nZ2VyKCkubG9nKCJXYXJuaW5nOiBQYXJzZXIgZG9lcyBub3Qgc3VwcG9ydCBcImh0dHA6Ly9hcGFjaGUub3JnL3htbC9mZWF0dXJlcy9hbGxvdy1qYXZhLWVuY29kaW5nc1wiLiIpOyAvLyROT04tTkxTLTEkCisJCQkJRWNvcmVVdGlsaXRpZXNQbHVnaW4ubG9nV2FybmluZygiV2FybmluZzogUGFyc2VyIGRvZXMgbm90IHN1cHBvcnQgXCJodHRwOi8vYXBhY2hlLm9yZy94bWwvZmVhdHVyZXMvYWxsb3ctamF2YS1lbmNvZGluZ3NcIi4iKTsgLy8kTk9OLU5MUy0xJAogCQkJfQogCQkJLyoKIAkJCSAqIHRyeSB7IHJlYWRlci5zZXRQcm9wZXJ0eSgiaHR0cDovL3htbC5vcmcvc2F4L3Byb3BlcnRpZXMvbGV4aWNhbC1oYW5kbGVyIiwgaGFuZGxlcik7IH0KQEAgLTEzMywxMiArMTMzLDEyIEBACiAJCQkJCXRyYW5zZm9ybWVyLnNldE91dHB1dFByb3BlcnR5KE91dHB1dEtleXMuRE9DVFlQRV9TWVNURU0sIGdldFJlc291cmNlKCkuZ2V0U3lzdGVtSWQoKSk7CiAKIAkJCX0gY2F0Y2ggKFRyYW5zZm9ybWVyQ29uZmlndXJhdGlvbkV4Y2VwdGlvbiBlKSB7Ci0JCQkJTG9nZ2VyLmdldExvZ2dlcigpLmxvZ0Vycm9yKGUpOworCQkJCUVjb3JlVXRpbGl0aWVzUGx1Z2luLmxvZ0Vycm9yKGUpOwogCQkJfSBjYXRjaCAoVHJhbnNmb3JtZXJGYWN0b3J5Q29uZmlndXJhdGlvbkVycm9yIGUpIHsKLQkJCQlMb2dnZXIuZ2V0TG9nZ2VyKCkubG9nRXJyb3IoZSk7CisJCQkJRWNvcmVVdGlsaXRpZXNQbHVnaW4ubG9nRXJyb3IoZSk7CiAJCQl9CiAJCQlpZiAoaGFuZGxlciA9PSBudWxsKSB7Ci0JCQkJTG9nZ2VyLmdldExvZ2dlcigiU0FYIFdyaXRlciBpcyBudWxsIik7IC8vJE5PTi1OTFMtMSQKKwkJCQlFY29yZVV0aWxpdGllc1BsdWdpbi5sb2dFcnJvcigiU0FYIFdyaXRlciBpcyBudWxsIik7IC8vJE5PTi1OTFMtMSQKIAkJCQlyZXR1cm47CiAJCQl9CiAJCQlFTUYyU0FYV3JpdGVyIHdyaXRlciA9IG5ldyBFTUYyU0FYV3JpdGVyKCk7CmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW1mL3d0cGVtZi9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2VtZi9yZXNvdXJjZS9FTUYyU0FYUmVuZGVyZXJGYWN0b3J5LmphdmEgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW1mL3d0cGVtZi9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2VtZi9yZXNvdXJjZS9FTUYyU0FYUmVuZGVyZXJGYWN0b3J5LmphdmEKaW5kZXggZDNmZDVkOS4uYTI1NDRkNiAxMDA2NDQKLS0tIGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVtZi93dHBlbWYvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbWYvcmVzb3VyY2UvRU1GMlNBWFJlbmRlcmVyRmFjdG9yeS5qYXZhCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbWYvd3RwZW1mL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW1mL3Jlc291cmNlL0VNRjJTQVhSZW5kZXJlckZhY3RvcnkuamF2YQpAQCAtMzMsNiArMzMsNyBAQAogCSAqIAogCSAqIEBzZWUgY29tLmlibS5ldG9vbHMuZW1mMnhtbC5SZW5kZXJlckZhY3RvcnkjY3JlYXRlUmVuZGVyZXIoKQogCSAqLworCUBPdmVycmlkZQogCXB1YmxpYyBSZW5kZXJlciBjcmVhdGVSZW5kZXJlcigpIHsKIAkJRU1GMlNBWFJlbmRlcmVyIHJlbmRlcmVyID0gbmV3IEVNRjJTQVhSZW5kZXJlcigpOwogCQlyZW5kZXJlci5zZXRWYWxpZGF0aW5nKGlzVmFsaWRhdGluZygpKTsKZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbWYvd3RwZW1mL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW1mL3Jlc291cmNlL0ZpbGVOYW1lUmVzb3VyY2VGYWN0b3J5UmVnaXN0cnkuamF2YSBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbWYvd3RwZW1mL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW1mL3Jlc291cmNlL0ZpbGVOYW1lUmVzb3VyY2VGYWN0b3J5UmVnaXN0cnkuamF2YQppbmRleCA0MWIzZGFiLi5mZjdiM2EyIDEwMDY0NAotLS0gYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW1mL3d0cGVtZi9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2VtZi9yZXNvdXJjZS9GaWxlTmFtZVJlc291cmNlRmFjdG9yeVJlZ2lzdHJ5LmphdmEKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVtZi93dHBlbWYvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbWYvcmVzb3VyY2UvRmlsZU5hbWVSZXNvdXJjZUZhY3RvcnlSZWdpc3RyeS5qYXZhCkBAIC00NiwxMCArNDYsMTIgQEAKIAkJCiAJfQogCisJQE92ZXJyaWRlCiAJcHVibGljIHN5bmNocm9uaXplZCBSZXNvdXJjZS5GYWN0b3J5IGdldEZhY3RvcnkoVVJJIHVyaSkgewogCQlyZXR1cm4gZ2V0RmFjdG9yeSh1cmksIG51bGwpOwogCX0KIAorCUBPdmVycmlkZQogCXB1YmxpYyBSZXNvdXJjZS5GYWN0b3J5IGdldEZhY3RvcnkoVVJJIHVyaSwgU3RyaW5nIGNvbnRlbnRUeXBlKQogCXsKIAkJUmVzb3VyY2UuRmFjdG9yeSByZXNvdXJjZUZhY3RvcnkgPSBudWxsOwpkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVtZi93dHBlbWYvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbWYvcmVzb3VyY2UvR2VuZXJpY1RyYW5zbGF0b3IuamF2YSBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbWYvd3RwZW1mL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW1mL3Jlc291cmNlL0dlbmVyaWNUcmFuc2xhdG9yLmphdmEKaW5kZXggZWFmZTA5Zi4uYzcxNGYyMyAxMDA2NDQKLS0tIGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVtZi93dHBlbWYvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbWYvcmVzb3VyY2UvR2VuZXJpY1RyYW5zbGF0b3IuamF2YQorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW1mL3d0cGVtZi9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2VtZi9yZXNvdXJjZS9HZW5lcmljVHJhbnNsYXRvci5qYXZhCkBAIC03OSw2ICs3OSw3IEBACiAJLyoqCiAJICogQHJldHVybiBUcmFuc2xhdG9yW10KIAkgKi8KKwlAT3ZlcnJpZGUKIAlwdWJsaWMgVHJhbnNsYXRvcltdIGdldENoaWxkcmVuKCkgewogCQlyZXR1cm4gY2hpbGRyZW47CiAJfQpkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVtZi93dHBlbWYvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbWYvcmVzb3VyY2UvSURUcmFuc2xhdG9yLmphdmEgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW1mL3d0cGVtZi9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2VtZi9yZXNvdXJjZS9JRFRyYW5zbGF0b3IuamF2YQppbmRleCA2NGJmNmEwLi41MjBmN2YwIDEwMDY0NAotLS0gYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW1mL3d0cGVtZi9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2VtZi9yZXNvdXJjZS9JRFRyYW5zbGF0b3IuamF2YQorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW1mL3d0cGVtZi9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2VtZi9yZXNvdXJjZS9JRFRyYW5zbGF0b3IuamF2YQpAQCAtMjUsNiArMjUsMTEgQEAKIHB1YmxpYyBjbGFzcyBJRFRyYW5zbGF0b3IgZXh0ZW5kcyBUcmFuc2xhdG9yIHsKIAlwdWJsaWMgY2xhc3MgTm9SZXNvdXJjZUV4Y2VwdGlvbiBleHRlbmRzIFJ1bnRpbWVFeGNlcHRpb24gewogCisJCS8qKgorCQkgKiAKKwkJICovCisJCXByaXZhdGUgc3RhdGljIGZpbmFsIGxvbmcgc2VyaWFsVmVyc2lvblVJRCA9IDg2MzMyMDEyOTEyODgyMzc1MzBMOworCiAJCXB1YmxpYyBOb1Jlc291cmNlRXhjZXB0aW9uKCkgewogCQkJc3VwZXIoKTsKIAkJfQpAQCAtNDEsNiArNDYsNyBAQAogCQlzdXBlcigiaWQiLCBJRF9GRUFUVVJFLCBET01fQVRUUklCVVRFKTsgLy8kTk9OLU5MUy0xJAogCX0KIAorCUBPdmVycmlkZQogCXB1YmxpYyB2b2lkIHNldE1PRlZhbHVlKEVPYmplY3QgZW1mT2JqZWN0LCBPYmplY3QgdmFsdWUpIHsKIAkJWE1JUmVzb3VyY2UgcmVzID0gKFhNSVJlc291cmNlKSBlbWZPYmplY3QuZVJlc291cmNlKCk7CiAJCWlmIChyZXMgPT0gbnVsbCkKQEAgLTUyLDYgKzU4LDcgQEAKIAkJCXJlcy5zZXRJRChlbWZPYmplY3QsIChTdHJpbmcpIHZhbHVlKTsKIAl9CiAKKwlAT3ZlcnJpZGUKIAlwdWJsaWMgT2JqZWN0IGdldE1PRlZhbHVlKEVPYmplY3QgZW1mT2JqZWN0KSB7CiAJCWlmIChlbWZPYmplY3QgPT0gbnVsbCkKIAkJCXRocm93IG5ldyBOb1Jlc291cmNlRXhjZXB0aW9uKCk7CkBAIC02MiwxMCArNjksMTIgQEAKIAl9CiAKIAorCUBPdmVycmlkZQogCXB1YmxpYyBib29sZWFuIGZlYXR1cmVFeGlzdHMoRU9iamVjdCBlbWZPYmplY3QpIHsKIAkJcmV0dXJuIHRydWU7CiAJfQogCisJQE92ZXJyaWRlCiAJcHVibGljIGJvb2xlYW4gaXNJRE1hcCgpIHsKIAkJcmV0dXJuIHRydWU7CiAJfQpkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVtZi93dHBlbWYvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbWYvcmVzb3VyY2UvTWFwcGVkWE1JSGVscGVyLmphdmEgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW1mL3d0cGVtZi9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2VtZi9yZXNvdXJjZS9NYXBwZWRYTUlIZWxwZXIuamF2YQppbmRleCBmMDkzOWEyLi5mMTQ2YWYxIDEwMDY0NAotLS0gYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW1mL3d0cGVtZi9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2VtZi9yZXNvdXJjZS9NYXBwZWRYTUlIZWxwZXIuamF2YQorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW1mL3d0cGVtZi9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2VtZi9yZXNvdXJjZS9NYXBwZWRYTUlIZWxwZXIuamF2YQpAQCAtNTcsNiArNTcsNyBAQAogCiAJfQogCisJQE92ZXJyaWRlCiAJcHVibGljIFVSSSByZXNvbHZlKFVSSSByZWxhdGl2ZSwgVVJJIGJhc2UpIHsKIAkJVVJJIHJlc29sdmVkID0gbnVsbDsKIAkJYm9vbGVhbiBpc01hcHBlZCA9IGZhbHNlOwpAQCAtODcsNiArODgsNyBAQAogCQlyZXR1cm4gKChDb21wYXRpYmlsaXR5WE1JUmVzb3VyY2UpIHJlc291cmNlKS5nZXRGb3JtYXQoKSA9PSBDb21wYXRpYmlsaXR5WE1JUmVzb3VyY2UuRk9STUFUX01PRjUgfHwgdXNpbmdNYXBzOwogCX0KIAorCUBPdmVycmlkZQogCXB1YmxpYyB2b2lkIGFkZFByZWZpeChTdHJpbmcgcHJlZml4LCBTdHJpbmcgdXJpKSB7CiAJCS8qCiAJCSAqIHByb2JsZW0gLSB0aGUgaW5jb21pbmcga2V5IHZhbHVlIHBhaXIgaXMgZWpiYm5kLT5lamJibmQueG1pOyBob3dldmVyLCB0aGUgbWFwIGFscmVhZHkgaGFzCkBAIC05NSw3ICs5Nyw3IEBACiAJCWlmICh1cmkuZW5kc1dpdGgoIi5lY29yZSIpKSB7IC8vJE5PTi1OTFMtMSQKIAkJCXVzaW5nTWFwcyA9IGZhbHNlOwogCQl9Ci0JCVN0cmluZyBleGlzdGluZyA9IChTdHJpbmcpIHByZWZpeGVzVG9VUklzLmdldChwcmVmaXgpOworCQlTdHJpbmcgZXhpc3RpbmcgPSBwcmVmaXhlc1RvVVJJcy5nZXQocHJlZml4KTsKIAkJaWYgKGV4aXN0aW5nID09IG51bGwpIHsKIAkJCXByZWZpeGVzVG9VUklzLnB1dChwcmVmaXgsIHVyaSk7CiAJCQluYW1lc3BhY2VTdXBwb3J0LmRlY2xhcmVQcmVmaXgocHJlZml4LCB1cmkpOwpAQCAtMTEyLDYgKzExNCw3IEBACiAJLyoqCiAJICogQHNlZSBvcmcuZWNsaXBzZS5lbWYuZWNvcmUueG1pLmltcGwuWE1MSGVscGVySW1wbCNnZXRIUkVGKEVPYmplY3QpCiAJICovCisJQE92ZXJyaWRlCiAJcHVibGljIFN0cmluZyBnZXRIUkVGKEVPYmplY3Qgb2JqKSB7CiAJCWlmICghZ2V0Q29tcGF0aWJpbGl0eVJlc291cmNlKCkudXNlc0RlZmF1bHRGb3JtYXQoKSkgewogCQkJVVJJQ29udmVydGVyIGNvbnYgPSBnZXRVUklDb252ZXJ0ZXIoKTsKQEAgLTE1OCwxMyArMTYxLDE0IEBACiAJfQogCiAJcHJvdGVjdGVkIFVSSSBtYWtlUmVsYXRpdmUoVVJJIG9iamVjdFVSSSwgQ29tcGF0aWJpbGl0eVVSSUNvbnZlcnRlciBjb252KSB7Ci0JCVN0cmluZyBmcmFnbWVudCA9IG9iamVjdFVSSS5mcmFnbWVudCgpOwotCQlvYmplY3RVUkkgPSBvYmplY3RVUkkudHJpbUZyYWdtZW50KCk7Ci0JCVVSSSByZWxhdGl2ZSA9IChVUkkpIGdldENhY2hlZFJlbGF0aXZlVVJJcygpLmdldChvYmplY3RVUkkpOworCQlVUkkgaW5uZXJPYmplY3RVUkkgPSBvYmplY3RVUkk7CisJCVN0cmluZyBmcmFnbWVudCA9IGlubmVyT2JqZWN0VVJJLmZyYWdtZW50KCk7CisJCWlubmVyT2JqZWN0VVJJID0gaW5uZXJPYmplY3RVUkkudHJpbUZyYWdtZW50KCk7CisJCVVSSSByZWxhdGl2ZSA9IChVUkkpIGdldENhY2hlZFJlbGF0aXZlVVJJcygpLmdldChpbm5lck9iamVjdFVSSSk7CiAJCWlmIChyZWxhdGl2ZSA9PSBudWxsKSB7Ci0JCQlyZWxhdGl2ZSA9IGNvbnYuZGVOb3JtYWxpemUob2JqZWN0VVJJKTsKKwkJCXJlbGF0aXZlID0gY29udi5kZU5vcm1hbGl6ZShpbm5lck9iamVjdFVSSSk7CiAJCQlpZiAocmVsYXRpdmUuaXNSZWxhdGl2ZSgpKQotCQkJCWNhY2hlZFJlbGF0aXZlVVJJcy5wdXQob2JqZWN0VVJJLCByZWxhdGl2ZSk7CisJCQkJY2FjaGVkUmVsYXRpdmVVUklzLnB1dChpbm5lck9iamVjdFVSSSwgcmVsYXRpdmUpOwogCQl9CiAJCXJldHVybiByZWxhdGl2ZS5hcHBlbmRGcmFnbWVudChmcmFnbWVudCk7CiAJfQpAQCAtMTg1LDYgKzE4OSw3IEBACiAJLyoqCiAJICogQHNlZSBvcmcuZWNsaXBzZS5lbWYuZWNvcmUueG1pLmltcGwuWE1MSGVscGVySW1wbCNnZXRJRChFT2JqZWN0KQogCSAqLworCUBPdmVycmlkZQogCXB1YmxpYyBTdHJpbmcgZ2V0SUQoRU9iamVjdCBvYmopIHsKIAkJaWYgKGdldENvbXBhdGliaWxpdHlSZXNvdXJjZSgpLnVzZXNEZWZhdWx0Rm9ybWF0KCkpCiAJCQlyZXR1cm4gc3VwZXIuZ2V0SUQob2JqKTsKQEAgLTIzMCw2ICsyMzUsNyBAQAogCQl0aGlzLnBhY2thZ2VVUklzVG9QcmVmaXhlcyA9IHBhY2thZ2VVUklzVG9QcmVmaXhlczsKIAl9CiAKKwlAT3ZlcnJpZGUKIAlwdWJsaWMgU3RyaW5nIGdldFFOYW1lKEVDbGFzcyBjKSB7CiAJCVN0cmluZyBuYW1lID0gZ2V0TmFtZShjKTsKIApAQCAtMjU3LDYgKzI2Myw3IEBACiAJICogQHNlZSBvcmcuZWNsaXBzZS5lbWYuZWNvcmUueG1pLmltcGwuWE1MSGVscGVySW1wbCNzZXRWYWx1ZShFT2JqZWN0LCBFU3RydWN0dXJhbEZlYXR1cmUsCiAJICogICAgICBPYmplY3QsIGludCkKIAkgKi8KKwlAT3ZlcnJpZGUKIAlwdWJsaWMgdm9pZCBzZXRWYWx1ZShFT2JqZWN0IG9iamVjdCwgRVN0cnVjdHVyYWxGZWF0dXJlIGZlYXR1cmUsIE9iamVjdCB2YWx1ZSwgaW50IHBvc2l0aW9uKSB7CiAJCWlmIChmZWF0dXJlID09IE5VTExfRkVBVFVSRSkKIAkJCXJldHVybjsKQEAgLTI3OCw2ICsyODUsNyBAQAogCSAqIEBzZWUgb3JnLmVjbGlwc2UuZW1mLmVjb3JlLnhtaS5YTUxIZWxwZXIjZ2V0RmVhdHVyZShvcmcuZWNsaXBzZS5lbWYuZWNvcmUuRUNsYXNzLAogCSAqICAgICAgamF2YS5sYW5nLlN0cmluZywgamF2YS5sYW5nLlN0cmluZywgYm9vbGVhbikKIAkgKi8KKwlAT3ZlcnJpZGUKIAlwdWJsaWMgRVN0cnVjdHVyYWxGZWF0dXJlIGdldEZlYXR1cmUoRUNsYXNzIGVDbGFzcywgU3RyaW5nIG5hbWVzcGFjZVVSSSwgU3RyaW5nIG5hbWUsIGJvb2xlYW4gaXNFbGVtZW50KSB7CiAJCWlmIChVbnN1cHBvcnRlZEZlYXR1cmUuaXNVbnN1cHBvcnRlZChlQ2xhc3MsIG5hbWUpKQogCQkJcmV0dXJuIE5VTExfRkVBVFVSRTsKQEAgLTI4OSw2ICsyOTcsNyBAQAogCSAqIAogCSAqIEBzZWUgb3JnLmVjbGlwc2UuZW1mLmVjb3JlLnhtaS5YTUxIZWxwZXIjZ2V0RmVhdHVyZUtpbmQob3JnLmVjbGlwc2UuZW1mLmVjb3JlLkVTdHJ1Y3R1cmFsRmVhdHVyZSkKIAkgKi8KKwlAT3ZlcnJpZGUKIAlwdWJsaWMgaW50IGdldEZlYXR1cmVLaW5kKEVTdHJ1Y3R1cmFsRmVhdHVyZSBmZWF0dXJlKSB7CiAJCWlmIChmZWF0dXJlID09IE5VTExfRkVBVFVSRSkKIAkJCXJldHVybiBYTUxIZWxwZXIuREFUQVRZUEVfU0lOR0xFOwpkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVtZi93dHBlbWYvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbWYvcmVzb3VyY2UvTXVsdGlPYmplY3RUcmFuc2xhdG9yLmphdmEgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW1mL3d0cGVtZi9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2VtZi9yZXNvdXJjZS9NdWx0aU9iamVjdFRyYW5zbGF0b3IuamF2YQppbmRleCA5MWVkNWJjLi43OTIyNmY2IDEwMDY0NAotLS0gYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW1mL3d0cGVtZi9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2VtZi9yZXNvdXJjZS9NdWx0aU9iamVjdFRyYW5zbGF0b3IuamF2YQorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW1mL3d0cGVtZi9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2VtZi9yZXNvdXJjZS9NdWx0aU9iamVjdFRyYW5zbGF0b3IuamF2YQpAQCAtNDUsNiArNDUsNyBAQAogCSAqIEBzZWUgY29tLmlibS5ldG9vbHMuZW1mMnhtbC5pbXBsLlRyYW5zbGF0b3IjY3JlYXRlRU1GT2JqZWN0KGphdmEubGFuZy5TdHJpbmcsCiAJICogICAgICBqYXZhLmxhbmcuU3RyaW5nKQogCSAqLworCUBPdmVycmlkZQogCXB1YmxpYyBFT2JqZWN0IGNyZWF0ZUVNRk9iamVjdChTdHJpbmcgbm9kZU5hbWUsIFN0cmluZyByZWFkQWhlYWROYW1lKSB7CiAJCXJldHVybiBnZXREZWxlZ2F0ZUZvcihub2RlTmFtZSwgcmVhZEFoZWFkTmFtZSkuY3JlYXRlRU1GT2JqZWN0KG5vZGVOYW1lLCByZWFkQWhlYWROYW1lKTsKIAl9CkBAIC01NCw2ICs1NSw3IEBACiAJICogCiAJICogQHNlZSBjb20uaWJtLmV0b29scy5lbWYyeG1sLmltcGwuVHJhbnNsYXRvciNnZXRDaGlsZHJlbihqYXZhLmxhbmcuT2JqZWN0KQogCSAqLworCUBPdmVycmlkZQogCXB1YmxpYyBUcmFuc2xhdG9yW10gZ2V0Q2hpbGRyZW4oT2JqZWN0IG8sIGludCB2ZXJzaW9uKSB7CiAJCWlmIChvID09IG51bGwpCiAJCQlyZXR1cm4gRU1QVFlfVFJBTlNMQVRPUlM7CkBAIC02NSw2ICs2Nyw3IEBACiAJICogCiAJICogQHNlZSBjb20uaWJtLmV0b29scy5lbWYyeG1sLmltcGwuVHJhbnNsYXRvciNnZXRET01OYW1lKGphdmEubGFuZy5PYmplY3QpCiAJICovCisJQE92ZXJyaWRlCiAJcHVibGljIFN0cmluZyBnZXRET01OYW1lKE9iamVjdCB2YWx1ZSkgewogCQlyZXR1cm4gZ2V0RGVsZWdhdGVGb3IoKEVPYmplY3QpIHZhbHVlKS5nZXRET01OYW1lKHZhbHVlKTsKIAl9CkBAIC03NSwxMCArNzgsMTIgQEAKIAkgKiAKIAkgKiBAc2VlIGNvbS5pYm0uZXRvb2xzLmVtZjJ4bWwuaW1wbC5UcmFuc2xhdG9yI2lzTWFuYWdlZEJ5UGFyZW50KCkKIAkgKi8KKwlAT3ZlcnJpZGUKIAlwdWJsaWMgYm9vbGVhbiBpc01hbmFnZWRCeVBhcmVudCgpIHsKIAkJcmV0dXJuIGZhbHNlOwogCX0KIAorCUBPdmVycmlkZQogCXB1YmxpYyBib29sZWFuIHNob3VsZEluZGVudEVuZFRhZyhOb2RlIG5vZGUpIHsKIAkJaWYgKG5vZGUuZ2V0Tm9kZU5hbWUoKS5lcXVhbHMoZ2V0RE9NUGF0aCgpKSkgewogCQkJcmV0dXJuIHN1cGVyLnNob3VsZEluZGVudEVuZFRhZyhub2RlKTsKZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbWYvd3RwZW1mL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW1mL3Jlc291cmNlL05hbWVzcGFjZVRyYW5zbGF0b3IuamF2YSBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbWYvd3RwZW1mL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW1mL3Jlc291cmNlL05hbWVzcGFjZVRyYW5zbGF0b3IuamF2YQppbmRleCAzYzIzZWQ0Li5lYTRjYzM4IDEwMDY0NAotLS0gYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW1mL3d0cGVtZi9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2VtZi9yZXNvdXJjZS9OYW1lc3BhY2VUcmFuc2xhdG9yLmphdmEKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVtZi93dHBlbWYvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbWYvcmVzb3VyY2UvTmFtZXNwYWNlVHJhbnNsYXRvci5qYXZhCkBAIC00Niw2ICs0Niw3IEBACiAJICogQHNlZSBjb20uaWJtLmV0b29scy5lbWYyeG1sLmltcGwuVHJhbnNsYXRvciNzZXRNT0ZWYWx1ZShvcmcuZWNsaXBzZS5lbWYuZWNvcmUuRU9iamVjdCwKIAkgKiAgICAgIGphdmEubGFuZy5PYmplY3QpCiAJICovCisJQE92ZXJyaWRlCiAJcHVibGljIHZvaWQgc2V0TU9GVmFsdWUoRU9iamVjdCBlbWZPYmplY3QsIE9iamVjdCB2YWx1ZSkgewogCQlOYW1lc3BhY2VBZGFwdGVyLmFkZE5hbWVzcGFjZShwcmVmaXgsIChTdHJpbmcpIHZhbHVlLCBlbWZPYmplY3QpOwogCX0KQEAgLTU1LDYgKzU2LDcgQEAKIAkgKiAKIAkgKiBAc2VlIGNvbS5pYm0uZXRvb2xzLmVtZjJ4bWwuaW1wbC5UcmFuc2xhdG9yI2lzU2V0TU9GVmFsdWUob3JnLmVjbGlwc2UuZW1mLmVjb3JlLkVPYmplY3QpCiAJICovCisJQE92ZXJyaWRlCiAJcHVibGljIGJvb2xlYW4gaXNTZXRNT0ZWYWx1ZShFT2JqZWN0IGVtZk9iamVjdCkgewogCQlyZXR1cm4gZ2V0TU9GVmFsdWUoZW1mT2JqZWN0KSAhPSBudWxsOwogCX0KQEAgLTY0LDYgKzY2LDcgQEAKIAkgKiAKIAkgKiBAc2VlIGNvbS5pYm0uZXRvb2xzLmVtZjJ4bWwuaW1wbC5UcmFuc2xhdG9yI2dldE1PRlZhbHVlKG9yZy5lY2xpcHNlLmVtZi5lY29yZS5FT2JqZWN0KQogCSAqLworCUBPdmVycmlkZQogCXB1YmxpYyBPYmplY3QgZ2V0TU9GVmFsdWUoRU9iamVjdCBtb2ZPYmplY3QpIHsKIAkJcmV0dXJuIE5hbWVzcGFjZUFkYXB0ZXIuZ2V0TmFtZXNwYWNlVVJJQXRUaGlzTGV2ZWwocHJlZml4LCBtb2ZPYmplY3QpOwogCX0KQEAgLTczLDYgKzc2LDcgQEAKIAkgKiAKIAkgKiBAc2VlIGNvbS5pYm0uZXRvb2xzLmVtZjJ4bWwuaW1wbC5UcmFuc2xhdG9yI3VuU2V0TU9GVmFsdWUob3JnLmVjbGlwc2UuZW1mLmVjb3JlLkVPYmplY3QpCiAJICovCisJQE92ZXJyaWRlCiAJcHVibGljIHZvaWQgdW5TZXRNT0ZWYWx1ZShFT2JqZWN0IGVtZk9iamVjdCkgewogCQlOYW1lc3BhY2VBZGFwdGVyLnJlbW92ZU5hbWVzcGFjZShwcmVmaXgsIGVtZk9iamVjdCk7CiAJfQpAQCAtODIsNiArODYsNyBAQAogCSAqIAogCSAqIEBzZWUgY29tLmlibS5ldG9vbHMuZW1mMnhtbC5pbXBsLlRyYW5zbGF0b3IjZmVhdHVyZUV4aXN0cyhvcmcuZWNsaXBzZS5lbWYuZWNvcmUuRU9iamVjdCkKIAkgKi8KKwlAT3ZlcnJpZGUKIAlwdWJsaWMgYm9vbGVhbiBmZWF0dXJlRXhpc3RzKEVPYmplY3QgZW1mT2JqZWN0KSB7CiAJCXJldHVybiB0cnVlOwogCX0KQEAgLTkxLDYgKzk2LDcgQEAKIAkgKiAKIAkgKiBAc2VlIGNvbS5pYm0uZXRvb2xzLmVtZjJ4bWwuaW1wbC5UcmFuc2xhdG9yI2lzRGF0YVR5cGUoKQogCSAqLworCUBPdmVycmlkZQogCXB1YmxpYyBib29sZWFuIGlzRGF0YVR5cGUoKSB7CiAJCXJldHVybiB0cnVlOwogCX0KQEAgLTEwMSw2ICsxMDcsNyBAQAogCSAqIEBzZWUgY29tLmlibS5ldG9vbHMuZW1mMnhtbC5pbXBsLlRyYW5zbGF0b3IjaXNNYXBGb3IoamF2YS5sYW5nLk9iamVjdCwgamF2YS5sYW5nLk9iamVjdCwKIAkgKiAgICAgIGphdmEubGFuZy5PYmplY3QpCiAJICovCisJQE92ZXJyaWRlCiAJcHVibGljIGJvb2xlYW4gaXNNYXBGb3IoT2JqZWN0IGFGZWF0dXJlLCBPYmplY3Qgb2xkVmFsdWUsIE9iamVjdCBuZXdWYWx1ZSkgewogCQlpZiAoYUZlYXR1cmUgPT0gZmVhdHVyZSkgewogCQkJTmFtZXNwYWNlIG5hbWVzcGFjZSA9IChOYW1lc3BhY2UpIChvbGRWYWx1ZSA9PSBudWxsID8gbmV3VmFsdWUgOiBvbGRWYWx1ZSk7CmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW1mL3d0cGVtZi9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2VtZi9yZXNvdXJjZS9PYmplY3RUcmFuc2xhdG9yRmlsdGVyLmphdmEgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW1mL3d0cGVtZi9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2VtZi9yZXNvdXJjZS9PYmplY3RUcmFuc2xhdG9yRmlsdGVyLmphdmEKaW5kZXggOTE4YjljZS4uM2U0NzlmNSAxMDA2NDQKLS0tIGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVtZi93dHBlbWYvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbWYvcmVzb3VyY2UvT2JqZWN0VHJhbnNsYXRvckZpbHRlci5qYXZhCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbWYvd3RwZW1mL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW1mL3Jlc291cmNlL09iamVjdFRyYW5zbGF0b3JGaWx0ZXIuamF2YQpAQCAtMjMsNiArMjMsNyBAQAogCQlzdXBlcih0cmFucywgdmVyc2lvbik7CiAJfQogCisJQE92ZXJyaWRlCiAJcHVibGljIGZpbmFsIGludCBzY2FuTmV4dFRyYW5zbGF0b3IoVHJhbnNsYXRvcltdIGNoaWxkcmVuLCBpbnQgc3RhcnQpIHsKIAkJaW50IGZvdW5kID0gc3RhcnQgKyAxOwogCQlmb3IgKDsgZm91bmQgPCBjaGlsZHJlbi5sZW5ndGg7ICsrZm91bmQpIHsKZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbWYvd3RwZW1mL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW1mL3Jlc291cmNlL1JlZmVyZW5jZWRSZXNvdXJjZS5qYXZhIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVtZi93dHBlbWYvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbWYvcmVzb3VyY2UvUmVmZXJlbmNlZFJlc291cmNlLmphdmEKaW5kZXggNDVmYWYyYi4uMGE0ODE4YSAxMDA2NDQKLS0tIGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVtZi93dHBlbWYvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbWYvcmVzb3VyY2UvUmVmZXJlbmNlZFJlc291cmNlLmphdmEKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVtZi93dHBlbWYvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbWYvcmVzb3VyY2UvUmVmZXJlbmNlZFJlc291cmNlLmphdmEKQEAgLTEyLDkgKzEyLDggQEAKIAogCiAKLWltcG9ydCBvcmcuZWNsaXBzZS5lbWYuZWNvcmUucmVzb3VyY2UuUmVzb3VyY2U7CiAKLXB1YmxpYyBpbnRlcmZhY2UgUmVmZXJlbmNlZFJlc291cmNlIGV4dGVuZHMgUmVzb3VyY2UsIENvbXBhdGliaWxpdHlYTUlSZXNvdXJjZSB7CitwdWJsaWMgaW50ZXJmYWNlIFJlZmVyZW5jZWRSZXNvdXJjZSBleHRlbmRzIENvbXBhdGliaWxpdHlYTUlSZXNvdXJjZSB7CiAJLy9UT0RPIC0gcmVuYW1lIHBhY2thZ2VkCiAKIAlwdWJsaWMgc3RhdGljIGZpbmFsIFN0cmluZyBERUxFVEVEX0VSUk9SX01TRyA9ICJUaGlzIHJlc291cmNlIGhhcyBiZWVuIGRlbGV0ZWQgYW5kIGNhbiBubyBsb25nZXIgYmUgdXNlZC4iOyAvLyROT04tTkxTLTEkCmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW1mL3d0cGVtZi9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2VtZi9yZXNvdXJjZS9SZWZlcmVuY2VkWE1JRmFjdG9yeUltcGwuamF2YSBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbWYvd3RwZW1mL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW1mL3Jlc291cmNlL1JlZmVyZW5jZWRYTUlGYWN0b3J5SW1wbC5qYXZhCmluZGV4IGQ4OTFjMmMuLjJhOWZlNzYgMTAwNjQ0Ci0tLSBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbWYvd3RwZW1mL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW1mL3Jlc291cmNlL1JlZmVyZW5jZWRYTUlGYWN0b3J5SW1wbC5qYXZhCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbWYvd3RwZW1mL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW1mL3Jlc291cmNlL1JlZmVyZW5jZWRYTUlGYWN0b3J5SW1wbC5qYXZhCkBAIC00Miw2ICs0Miw3IEBACiAJLyoqCiAJICogQHNlZSBvcmcuZWNsaXBzZS5lbWYuZWNvcmUucmVzb3VyY2UuaW1wbC5SZXNvdXJjZUZhY3RvcnlJbXBsI2NyZWF0ZVJlc291cmNlKFVSSSkKIAkgKi8KKwlAT3ZlcnJpZGUKIAlwdWJsaWMgZmluYWwgUmVzb3VyY2UgY3JlYXRlUmVzb3VyY2UoVVJJIHVyaSkgewogCQlSZXNvdXJjZSByZXMgPSBkb0NyZWF0ZVJlc291cmNlKHVyaSk7CiAJCWFkYXB0TmV3KHJlcyk7CmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW1mL3d0cGVtZi9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2VtZi9yZXNvdXJjZS9SZWZlcmVuY2VkWE1JUmVzb3VyY2VJbXBsLmphdmEgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW1mL3d0cGVtZi9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2VtZi9yZXNvdXJjZS9SZWZlcmVuY2VkWE1JUmVzb3VyY2VJbXBsLmphdmEKaW5kZXggNTdjZDM5Ni4uMzNkZTI4ZCAxMDA2NDQKLS0tIGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVtZi93dHBlbWYvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbWYvcmVzb3VyY2UvUmVmZXJlbmNlZFhNSVJlc291cmNlSW1wbC5qYXZhCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbWYvd3RwZW1mL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW1mL3Jlc291cmNlL1JlZmVyZW5jZWRYTUlSZXNvdXJjZUltcGwuamF2YQpAQCAtMjYsNyArMjYsNyBAQAogaW1wb3J0IG9yZy5lY2xpcHNlLmVtZi5jb21tb24udXRpbC5FTGlzdDsKIGltcG9ydCBvcmcuZWNsaXBzZS5lbWYuY29tbW9uLnV0aWwuVVJJOwogaW1wb3J0IG9yZy5lY2xpcHNlLmVtZi5lY29yZS5FT2JqZWN0OwotaW1wb3J0IG9yZy5lY2xpcHNlLmplbS51dGlsLmxvZ2dlci5wcm94eS5Mb2dnZXI7CitpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5pbnRlcm5hbC5lbWYucGx1Z2luLkVjb3JlVXRpbGl0aWVzUGx1Z2luOwogaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uaW50ZXJuYWwuZW1mLnV0aWxpdGllcy5JRFV0aWw7CiAKIHB1YmxpYyBjbGFzcyBSZWZlcmVuY2VkWE1JUmVzb3VyY2VJbXBsIGV4dGVuZHMgQ29tcGF0aWJpbGl0eVhNSVJlc291cmNlSW1wbCBpbXBsZW1lbnRzIFJlZmVyZW5jZWRSZXNvdXJjZSB7CkBAIC00Myw1NyArNDMsNzIgQEAKIAkgIHB1YmxpYyBzdGF0aWMgY2xhc3MgRVN5bmNocm9uaXplZEFkYXB0ZXJMaXN0IGV4dGVuZHMgRUFkYXB0ZXJMaXN0CiAJICB7CiAKLQkgICAgcHVibGljIEVTeW5jaHJvbml6ZWRBZGFwdGVyTGlzdChOb3RpZmllciBub3RpZmllcikgeworCSAgICAvKioKKwkJICogCisJCSAqLworCQlwcml2YXRlIHN0YXRpYyBmaW5hbCBsb25nIHNlcmlhbFZlcnNpb25VSUQgPSA3ODU1NDM4MzM5MTg3NTQwNzE4TDsKKworCQlwdWJsaWMgRVN5bmNocm9uaXplZEFkYXB0ZXJMaXN0KE5vdGlmaWVyIG5vdGlmaWVyKSB7CiAJCQlzdXBlcihub3RpZmllcik7CiAJCX0KIAorCQlAT3ZlcnJpZGUKIAkJcHVibGljIHN5bmNocm9uaXplZCBib29sZWFuIGFkZChPYmplY3Qgb2JqZWN0KQogCSAgICB7CiAJICAgIHJldHVybiBzdXBlci5hZGQob2JqZWN0KTsKIAkgICAgfQogCi0JICAgIHB1YmxpYyBzeW5jaHJvbml6ZWQgdm9pZCBhZGQoaW50IGluZGV4LCBPYmplY3Qgb2JqZWN0KQorCSAgICBAT3ZlcnJpZGUKKwkJcHVibGljIHN5bmNocm9uaXplZCB2b2lkIGFkZChpbnQgaW5kZXgsIE9iamVjdCBvYmplY3QpCiAJICAgIHsKIAkgICAgc3VwZXIuYWRkKGluZGV4LCBvYmplY3QpOwogCSAgICB9CiAKLQkgICAgcHVibGljIHN5bmNocm9uaXplZCBib29sZWFuIGFkZEFsbChDb2xsZWN0aW9uIGNvbGxlY3Rpb24pCisJICAgIEBPdmVycmlkZQorCQlwdWJsaWMgc3luY2hyb25pemVkIGJvb2xlYW4gYWRkQWxsKENvbGxlY3Rpb24gY29sbGVjdGlvbikKIAkgICAgewogCSAgICByZXR1cm4gc3VwZXIuYWRkQWxsKGNvbGxlY3Rpb24pOwogCSAgICB9CiAKLQkgICAgcHVibGljIHN5bmNocm9uaXplZCBib29sZWFuIHJlbW92ZShPYmplY3Qgb2JqZWN0KQorCSAgICBAT3ZlcnJpZGUKKwkJcHVibGljIHN5bmNocm9uaXplZCBib29sZWFuIHJlbW92ZShPYmplY3Qgb2JqZWN0KQogCSAgICB7CiAJICAgIHJldHVybiBzdXBlci5yZW1vdmUob2JqZWN0KTsKIAkgICAgfQogCi0JICAgIHB1YmxpYyBzeW5jaHJvbml6ZWQgT2JqZWN0IHJlbW92ZShpbnQgaW5kZXgpCisJICAgIEBPdmVycmlkZQorCQlwdWJsaWMgc3luY2hyb25pemVkIE9iamVjdCByZW1vdmUoaW50IGluZGV4KQogCSAgICB7CiAJICAgIHJldHVybiBzdXBlci5yZW1vdmUoaW5kZXgpOwogCSAgICB9CiAKLQkgICAgcHVibGljIHN5bmNocm9uaXplZCBib29sZWFuIHJlbW92ZUFsbChDb2xsZWN0aW9uIGNvbGxlY3Rpb24pCisJICAgIEBPdmVycmlkZQorCQlwdWJsaWMgc3luY2hyb25pemVkIGJvb2xlYW4gcmVtb3ZlQWxsKENvbGxlY3Rpb24gY29sbGVjdGlvbikKIAkgICAgewogCSAgICByZXR1cm4gc3VwZXIucmVtb3ZlQWxsKGNvbGxlY3Rpb24pOwogCSAgICB9CiAKLQkgICAgcHVibGljIHN5bmNocm9uaXplZCB2b2lkIGNsZWFyKCkKKwkgICAgQE92ZXJyaWRlCisJCXB1YmxpYyBzeW5jaHJvbml6ZWQgdm9pZCBjbGVhcigpCiAJICAgIHsKIAkgICAgIHN1cGVyLmNsZWFyKCk7CiAJICAgIH0KIAogCi0JICAgIHB1YmxpYyBzeW5jaHJvbml6ZWQgT2JqZWN0IHNldChpbnQgaW5kZXgsIE9iamVjdCBvYmplY3QpCisJICAgIEBPdmVycmlkZQorCQlwdWJsaWMgc3luY2hyb25pemVkIE9iamVjdCBzZXQoaW50IGluZGV4LCBPYmplY3Qgb2JqZWN0KQogCSAgICB7CiAJICAgIHJldHVybiBzdXBlci5zZXQoaW5kZXgsIG9iamVjdCk7CiAJICAgIH0KIAotCSAgICBwdWJsaWMgc3luY2hyb25pemVkIHZvaWQgbW92ZShpbnQgbmV3UG9zaXRpb24sIE9iamVjdCBvYmplY3QpCisJICAgIEBPdmVycmlkZQorCQlwdWJsaWMgc3luY2hyb25pemVkIHZvaWQgbW92ZShpbnQgbmV3UG9zaXRpb24sIE9iamVjdCBvYmplY3QpCiAJICAgIHsKIAkgICAgc3VwZXIubW92ZShuZXdQb3NpdGlvbiwgb2JqZWN0KTsKIAkgICAgfQogCi0JICAgIHB1YmxpYyBzeW5jaHJvbml6ZWQgT2JqZWN0IG1vdmUoaW50IG5ld1Bvc2l0aW9uLCBpbnQgb2xkUG9zaXRpb24pCisJICAgIEBPdmVycmlkZQorCQlwdWJsaWMgc3luY2hyb25pemVkIE9iamVjdCBtb3ZlKGludCBuZXdQb3NpdGlvbiwgaW50IG9sZFBvc2l0aW9uKQogCSAgICB7CiAJICAgIHJldHVybiBzdXBlci5tb3ZlKG5ld1Bvc2l0aW9uLCBvbGRQb3NpdGlvbik7CiAJICAgIH0KQEAgLTI3Miw2ICsyODcsNyBAQAogCQkJc2F2ZShDb2xsZWN0aW9ucy5FTVBUWV9NQVApOwogCX0KIAorCUBPdmVycmlkZQogCXB1YmxpYyBTdHJpbmcgdG9TdHJpbmcoKSB7CiAJCXJldHVybiBUT19TVFJJTkcgKyBnZXRVUkkoKS50b1N0cmluZygpICsgUkVBRF9DT1VOVF9UT19TVFJJTkcgKyBuZXcgSW50ZWdlcihyZWFkUmVmZXJlbmNlQ291bnQpICsgV1JJVEVfQ09VTlRfVE9fU1RSSU5HICsgbmV3IEludGVnZXIoZWRpdFJlZmVyZW5jZUNvdW50KTsKIAl9CkBAIC0yOTgsNiArMzE0LDcgQEAKIAkJcmV0dXJuIGZvcmNlUmVmcmVzaDsKIAl9CiAKKwlAT3ZlcnJpZGUKIAlwcm90ZWN0ZWQgdm9pZCBiYXNpY0RvTG9hZChJbnB1dFN0cmVhbSBhcmcwLCBNYXAgYXJnMSkgdGhyb3dzIElPRXhjZXB0aW9uIHsKIAkJYm9vbGVhbiBpc1RyYWNraW5nTW9kcyA9IGlzVHJhY2tpbmdNb2RpZmljYXRpb24oKTsKIAkJdHJ5IHsKQEAgLTMxMyw2ICszMzAsNyBAQAogCS8qKgogCSAqIEBzZWUgb3JnLmVjbGlwc2UuZW1mLmVjb3JlLnhtaS5pbXBsLlhNTFJlc291cmNlSW1wbCNkb1VubG9hZCgpCiAJICovCisJQE92ZXJyaWRlCiAJcHJvdGVjdGVkIHZvaWQgZG9VbmxvYWQoKSB7CiAJCQogCQl0cnkgewpAQCAtMzI3LDcgKzM0NSw3IEBACiAJCQlzZXRGb3JjZVJlZnJlc2goZmFsc2UpOwogCQkJc2V0TW9kaWZpZWQoZmFsc2UpOyAvL2RjYiAtIHRoaXMgaXMgcmVxdWlyZWQgdG8gZW5zdXJlIHRoYXQgcmVzb3VyY2VzIHdpdGhvdXQgZmlsZXMgYXJlCiAJCQkvLyBtYXJrZWQgYXMgbm90IG1vZGlmaWVkLgotCQkJaWYgKHJlYWRSZWZlcmVuY2VDb3VudCA9PSAwICYmIGVkaXRSZWZlcmVuY2VDb3VudCA9PSAwKSB7CisJCQlpZiAocmVhZFJlZmVyZW5jZUNvdW50ID09IDAgJiYgZWRpdFJlZmVyZW5jZUNvdW50ID09IDAgJiYgZ2V0UmVzb3VyY2VTZXQoKSAhPSBudWxsKSB7CiAJCQkJZ2V0UmVzb3VyY2VTZXQoKS5nZXRSZXNvdXJjZXMoKS5yZW1vdmUodGhpcyk7CiAJCQl9CiAJCQpAQCAtMzUyLDYgKzM3MCw3IEBACiAJLyoqCiAJICogQHNlZSBvcmcuZWNsaXBzZS5lbWYuZWNvcmUucmVzb3VyY2UuUmVzb3VyY2Ujc2F2ZShPYmplY3QpCiAJICovCisJQE92ZXJyaWRlCiAJcHVibGljIHZvaWQgc2F2ZShNYXAgb3B0aW9ucykgdGhyb3dzIElPRXhjZXB0aW9uIHsKIAkJbm90aWZ5QWJvdXRUb1NhdmUoKTsKICAgICAgICAgdHJ5IHsKQEAgLTM2MCw4ICszNzksNyBAQAogICAgICAgICAgICAgbm90aWZ5U2F2ZUZhaWxlZCgpOwogICAgICAgICAgICAgaWYgKGUgaW5zdGFuY2VvZiBJT0V4Y2VwdGlvbikKICAgICAgICAgICAgICAgICB0aHJvdyAoSU9FeGNlcHRpb24pIGU7Ci0gICAgICAgICAgICBlbHNlCi0gICAgICAgICAgICAgICAgTG9nZ2VyLmdldExvZ2dlcigpLndyaXRlKGUpOworICAgICAgICAgICAgRWNvcmVVdGlsaXRpZXNQbHVnaW4ubG9nRXJyb3IoZSk7CiAgICAgICAgIH0KICAgICAgICAgbm90aWZ5U2F2ZWQoKTsKIAl9CkBAIC0zODMsMTEgKzQwMSwxMyBAQAogCQkgIE5vdGlmaWNhdGlvbiBub3RpZmljYXRpb24gPQogCQkJbmV3IE5vdGlmaWNhdGlvbkltcGwoZXZlbnRUeXBlLCB0aGlzLCB0aGlzKQogCQkJewotCQkJICBwdWJsaWMgT2JqZWN0IGdldE5vdGlmaWVyKCkKKwkJCSAgQE92ZXJyaWRlCisJCQlwdWJsaWMgT2JqZWN0IGdldE5vdGlmaWVyKCkKIAkJCSAgewogCQkJCXJldHVybiBSZWZlcmVuY2VkWE1JUmVzb3VyY2VJbXBsLnRoaXM7CiAJCQkgIH0KLQkJCSAgcHVibGljIGludCBnZXRGZWF0dXJlSUQoQ2xhc3MgZXhwZWN0ZWRDbGFzcykKKwkJCSAgQE92ZXJyaWRlCisJCQlwdWJsaWMgaW50IGdldEZlYXR1cmVJRChDbGFzcyBleHBlY3RlZENsYXNzKQogCQkJICB7CiAJCQkJcmV0dXJuIGV2ZW50VHlwZTsKIAkJCSAgfQpAQCAtNDAzLDYgKzQyMyw3IEBACiAJCXJldHVybiBmYWxzZTsKIAl9CiAJCisJQE92ZXJyaWRlCiAJcHVibGljIEVMaXN0IGVBZGFwdGVycygpCiAJICB7CiAJICAgIGlmIChlQWRhcHRlcnMgPT0gbnVsbCkKZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbWYvd3RwZW1mL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW1mL3Jlc291cmNlL1JlbmRlcmVyRmFjdG9yeS5qYXZhIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVtZi93dHBlbWYvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbWYvcmVzb3VyY2UvUmVuZGVyZXJGYWN0b3J5LmphdmEKaW5kZXggOWYyOTRkMy4uMzU2YzA1ZiAxMDA2NDQKLS0tIGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVtZi93dHBlbWYvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbWYvcmVzb3VyY2UvUmVuZGVyZXJGYWN0b3J5LmphdmEKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVtZi93dHBlbWYvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbWYvcmVzb3VyY2UvUmVuZGVyZXJGYWN0b3J5LmphdmEKQEAgLTgsMTAgKzgsOSBAQAogICoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqLwogcGFja2FnZSBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmludGVybmFsLmVtZi5yZXNvdXJjZTsKIAotaW1wb3J0IGphdmEubGFuZy5yZWYuV2Vha1JlZmVyZW5jZTsKLWltcG9ydCBqYXZhLnV0aWwuQXJyYXlMaXN0OwotaW1wb3J0IGphdmEudXRpbC5Db2xsZWN0aW9uOwogaW1wb3J0IGphdmEudXRpbC5JdGVyYXRvcjsKK2ltcG9ydCBqYXZhLnV0aWwuTWFwOworaW1wb3J0IGphdmEudXRpbC5XZWFrSGFzaE1hcDsKIAogCiBwdWJsaWMgYWJzdHJhY3QgY2xhc3MgUmVuZGVyZXJGYWN0b3J5IHsKQEAgLTQ4LDYgKzQ3LDcgQEAKIAkJZGVmYXVsdFJlbmRlcmVyRmFjdG9yeSA9IGZhY3Rvcnk7CiAJfQogCisJQE92ZXJyaWRlCiAJcHVibGljIFN0cmluZyB0b1N0cmluZygpIHsKIAkJcmV0dXJuICJSZW5kZXJlckZhY3RvcnkgaW5zdGFuY2U6ICIgKyBnZXRDbGFzcygpLmdldE5hbWUoKTsgLy8kTk9OLU5MUy0xJAogCX0KQEAgLTU2LDcgKzU2LDggQEAKIAogCQlwcml2YXRlIHN0YXRpYyBmaW5hbCBOb3RpZmllciBJTlNUQU5DRSA9IG5ldyBOb3RpZmllcigpOwogCi0JCXByaXZhdGUgZmluYWwgQ29sbGVjdGlvbiByZXNvdXJjZUZhY3RvcnlMaXN0ZW5lcnMgPSBuZXcgQXJyYXlMaXN0KCk7CisJCS8vIHVzZSBhIFdlYWtIYXNoTWFwIGZvciBhIHdlYWsgSGFzaFNldAorCQlwcml2YXRlIGZpbmFsIE1hcCByZXNvdXJjZUZhY3RvcnlMaXN0ZW5lcnMgPSBuZXcgV2Vha0hhc2hNYXAoKTsKIAogCQlwcml2YXRlIE5vdGlmaWVyKCkgewogCQl9CkBAIC03MiwxNyArNzMsMTEgQEAKIAkJCQkgKiB3b3JrCiAJCQkJICovCiAJCQkJaWYgKHJlbmRlcmVyRmFjdG9yeSAhPSBSZW5kZXJlckZhY3RvcnkuZ2V0RGVmYXVsdFJlbmRlcmVyRmFjdG9yeSgpKSB7Ci0JCQkJCVdlYWtSZWZlcmVuY2Ugd3JlZiA9IG51bGw7Ci0JCQkJCUxpc3RlbmVyIGxpc3RlbmVyID0gbnVsbDsKIAkJCQkJc3luY2hyb25pemVkIChyZXNvdXJjZUZhY3RvcnlMaXN0ZW5lcnMpIHsKLQkJCQkJCWZvciAoSXRlcmF0b3IgaSA9IHJlc291cmNlRmFjdG9yeUxpc3RlbmVycy5pdGVyYXRvcigpOyBpLmhhc05leHQoKTspIHsKLQkJCQkJCQl3cmVmID0gKFdlYWtSZWZlcmVuY2UpIGkubmV4dCgpOwotCQkJCQkJCWxpc3RlbmVyID0gKExpc3RlbmVyKSB3cmVmLmdldCgpOworCQkJCQkJZm9yIChJdGVyYXRvciBpID0gcmVzb3VyY2VGYWN0b3J5TGlzdGVuZXJzLmtleVNldCgpLml0ZXJhdG9yKCk7IGkuaGFzTmV4dCgpOykgeworCQkJCQkJCUxpc3RlbmVyIGxpc3RlbmVyID0gKExpc3RlbmVyKSBpLm5leHQoKTsKIAkJCQkJCQkvL1N5c3RlbS5vdXQucHJpbnRsbigiTm90aWZ5aW5nIExpc3RlbmVyOiAiICsgbGlzdGVuZXIpOwotCQkJCQkJCWlmIChsaXN0ZW5lciAhPSBudWxsKQotCQkJCQkJCQlsaXN0ZW5lci51cGRhdGVSZW5kZXJlckZhY3RvcnkocmVuZGVyZXJGYWN0b3J5KTsKLQkJCQkJCQllbHNlCi0JCQkJCQkJCWkucmVtb3ZlKCk7CisJCQkJCQkJbGlzdGVuZXIudXBkYXRlUmVuZGVyZXJGYWN0b3J5KHJlbmRlcmVyRmFjdG9yeSk7CiAJCQkJCQl9CiAJCQkJCX0KIAkJCQl9CkBAIC05MiwyOSArODcsMTMgQEAKIAkJcHVibGljIHZvaWQgYWRkTGlzdGVuZXIoTGlzdGVuZXIgbCkgewogCQkJLy9TeXN0ZW0ub3V0LnByaW50bG4oIkFkZGluZyBsaXN0ZW5lcjogIiArIGwpOwogCQkJc3luY2hyb25pemVkIChyZXNvdXJjZUZhY3RvcnlMaXN0ZW5lcnMpIHsKLQkJCQlyZXNvdXJjZUZhY3RvcnlMaXN0ZW5lcnMuYWRkKG5ldyBXZWFrUmVmZXJlbmNlKGwpKTsKKwkJCQlyZXNvdXJjZUZhY3RvcnlMaXN0ZW5lcnMucHV0KGwsIG51bGwpOwogCQkJfQogCQl9CiAKIAkJcHVibGljIHZvaWQgcmVtb3ZlTGlzdGVuZXIoTGlzdGVuZXIgbGlzdGVuZXJUb1JlbW92ZSkgewotCQkJZmluYWwgaW50IGxlbmd0aCA9IHJlc291cmNlRmFjdG9yeUxpc3RlbmVycy5zaXplKCk7Ci0JCQlpZiAobGVuZ3RoID4gMCkgewotCQkJCVdlYWtSZWZlcmVuY2Ugd3JlZiA9IG51bGw7Ci0JCQkJTGlzdGVuZXIgbGlzdGVuZXIgPSBudWxsOwotCQkJCXN5bmNocm9uaXplZCAocmVzb3VyY2VGYWN0b3J5TGlzdGVuZXJzKSB7Ci0JCQkJCWZvciAoSXRlcmF0b3IgaSA9IHJlc291cmNlRmFjdG9yeUxpc3RlbmVycy5pdGVyYXRvcigpOyBpLmhhc05leHQoKTspIHsKLQkJCQkJCXdyZWYgPSAoV2Vha1JlZmVyZW5jZSkgaS5uZXh0KCk7Ci0JCQkJCQlsaXN0ZW5lciA9IChMaXN0ZW5lcikgd3JlZi5nZXQoKTsKLQkJCQkJCWlmIChsaXN0ZW5lciAhPSBudWxsKSB7Ci0JCQkJCQkJaWYgKGxpc3RlbmVyID09IGxpc3RlbmVyVG9SZW1vdmUpIHsKLQkJCQkJCQkJaS5yZW1vdmUoKTsKLQkJCQkJCQkJYnJlYWs7Ci0JCQkJCQkJfQotCQkJCQkJfSBlbHNlIHsKLQkJCQkJCQlpLnJlbW92ZSgpOwotCQkJCQkJfQotCQkJCQl9Ci0JCQkJfQorCQkJc3luY2hyb25pemVkIChyZXNvdXJjZUZhY3RvcnlMaXN0ZW5lcnMpIHsKKwkJCQlyZXNvdXJjZUZhY3RvcnlMaXN0ZW5lcnMucmVtb3ZlKGxpc3RlbmVyVG9SZW1vdmUpOwogCQkJfQogCQl9CiAKZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbWYvd3RwZW1mL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW1mL3Jlc291cmNlL1Jlc291cmNlRmFjdG9yeURlc2NyaXB0b3IuamF2YSBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbWYvd3RwZW1mL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW1mL3Jlc291cmNlL1Jlc291cmNlRmFjdG9yeURlc2NyaXB0b3IuamF2YQppbmRleCA3Nzk4NGMzLi42OTdiNTE2IDEwMDY0NAotLS0gYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW1mL3d0cGVtZi9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2VtZi9yZXNvdXJjZS9SZXNvdXJjZUZhY3RvcnlEZXNjcmlwdG9yLmphdmEKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVtZi93dHBlbWYvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbWYvcmVzb3VyY2UvUmVzb3VyY2VGYWN0b3J5RGVzY3JpcHRvci5qYXZhCkBAIC01Niw3ICs1Niw4IEBACiAJICogaW5zdGVhZCBvZiBjb21wYXJpbmcgdGhlIHNob3J0IHNlZ21lbnRzIHdoZW4gc2VhcmNoaW5nIGZvciBhbgogCSAqIGFwcGxpY2FibGUgZGVzY3JpcHRvciBmcm9tIGEgc2V0LiAgCiAJICogCi0JICogPHA+PGI+U3ViY2xhc3NlcyBtYXkgTk9UIHJldHVybiBudWxsLjwvYj48L3A+CisJICogPHA+PGI+U3ViY2xhc3NlcyBtYXkgTk9UIHJldHVybiBudWxsIHVubGVzcyB0aGV5IGFsc28gb3ZlcnJpZGUKKwkgKiB7QGxpbmsgI2hhc2hDb2RlKCl9IGFuZCB7QGxpbmsgI2VxdWFscyhPYmplY3QpfS48L2I+PC9wPgogCSAqICAKIAkgKiBAcmV0dXJuIFRoZSBzaG9ydCBzZWdtZW50IHRoYXQgdGhpcyBkZXNjcmlwdG9yIGlzIGFwcGxpY2FibGUgdG8uCiAJICovCkBAIC03MywxMCArNzQsMTIgQEAKIAkgKi8KIAlwdWJsaWMgYWJzdHJhY3QgUmVzb3VyY2UuRmFjdG9yeSBjcmVhdGVGYWN0b3J5KCk7CiAJCisJQE92ZXJyaWRlCiAJcHVibGljIGludCBoYXNoQ29kZSgpIHsKIAkJcmV0dXJuIGdldFNob3J0U2VnbWVudCgpLmhhc2hDb2RlKCk7CiAJfQogCQorCUBPdmVycmlkZQogCXB1YmxpYyBib29sZWFuIGVxdWFscyhPYmplY3QgbykgewogCQlpZihvIGluc3RhbmNlb2YgUmVzb3VyY2VGYWN0b3J5RGVzY3JpcHRvcikKIAkJCXJldHVybiBnZXRTaG9ydFNlZ21lbnQoKS5lcXVhbHMoKChSZXNvdXJjZUZhY3RvcnlEZXNjcmlwdG9yKW8pLmdldFNob3J0U2VnbWVudCgpKTsKZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbWYvd3RwZW1mL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW1mL3Jlc291cmNlL1Jvb3RUcmFuc2xhdG9yLmphdmEgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW1mL3d0cGVtZi9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2VtZi9yZXNvdXJjZS9Sb290VHJhbnNsYXRvci5qYXZhCmluZGV4IGY1NjQwZTkuLmJiYmEyZjMgMTAwNjQ0Ci0tLSBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbWYvd3RwZW1mL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW1mL3Jlc291cmNlL1Jvb3RUcmFuc2xhdG9yLmphdmEKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVtZi93dHBlbWYvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbWYvcmVzb3VyY2UvUm9vdFRyYW5zbGF0b3IuamF2YQpAQCAtMzAsNiArMzAsNyBAQAogCS8qKgogCSAqIEBzZWUgY29tLmlibS5ldG9vbHMuZW1mMnhtbC5pbXBsLlRyYW5zbGF0b3Ijc2V0TU9GVmFsdWUoTm90aWZpZXIsIE9iamVjdCwgaW50KQogCSAqLworCUBPdmVycmlkZQogCXB1YmxpYyB2b2lkIHNldE1PRlZhbHVlKE5vdGlmaWVyIG93bmVyLCBPYmplY3QgdmFsdWUsIGludCBuZXdJbmRleCkgewogCQkoKFJlc291cmNlKSBvd25lcikuZ2V0Q29udGVudHMoKS5hZGQobmV3SW5kZXgsIChFT2JqZWN0KXZhbHVlKTsKIAl9CkBAIC0zNyw2ICszOCw3IEBACiAJLyoqCiAJICogQHNlZSBjb20uaWJtLmV0b29scy5lbWYyeG1sLmltcGwuVHJhbnNsYXRvciNyZW1vdmVNT0ZWYWx1ZShOb3RpZmllciwgT2JqZWN0KQogCSAqLworCUBPdmVycmlkZQogCXB1YmxpYyB2b2lkIHJlbW92ZU1PRlZhbHVlKE5vdGlmaWVyIG93bmVyLCBPYmplY3QgdmFsdWUpIHsKIAkJKChSZXNvdXJjZSkgb3duZXIpLmdldENvbnRlbnRzKCkucmVtb3ZlKHZhbHVlKTsKIAl9CkBAIC00Nyw2ICs0OSw3IEBACiAJICogQHNlZSBjb20uaWJtLmV0b29scy5lbWYyeG1sLmltcGwuVHJhbnNsYXRvciNzZXRNT0ZWYWx1ZShvcmcuZWNsaXBzZS5lbWYuZWNvcmUuRU9iamVjdCwKIAkgKiAgICAgIGphdmEubGFuZy5PYmplY3QpCiAJICovCisJQE92ZXJyaWRlCiAJcHVibGljIHZvaWQgc2V0TU9GVmFsdWUoUmVzb3VyY2UgcmVzLCBPYmplY3QgdmFsdWUpIHsKIAkJaWYgKHJlcyAhPSBudWxsICYmIHZhbHVlICE9IG51bGwpCiAJCQlyZXMuZ2V0Q29udGVudHMoKS5hZGQoKEVPYmplY3QpdmFsdWUpOwpAQCAtNTcsNiArNjAsNyBAQAogCSAqIAogCSAqIEBzZWUgY29tLmlibS5ldG9vbHMuZW1mMnhtbC5pbXBsLlRyYW5zbGF0b3IjaXNNdWx0aVZhbHVlZCgpCiAJICovCisJQE92ZXJyaWRlCiAJcHVibGljIGJvb2xlYW4gaXNNdWx0aVZhbHVlZCgpIHsKIAkJcmV0dXJuIHRydWU7CiAJfQpkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVtZi93dHBlbWYvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbWYvcmVzb3VyY2UvU291cmNlTGlua1RyYW5zbGF0b3IuamF2YSBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbWYvd3RwZW1mL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW1mL3Jlc291cmNlL1NvdXJjZUxpbmtUcmFuc2xhdG9yLmphdmEKaW5kZXggZDVkNjk3Yi4uMzcxZTBkOCAxMDA2NDQKLS0tIGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVtZi93dHBlbWYvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbWYvcmVzb3VyY2UvU291cmNlTGlua1RyYW5zbGF0b3IuamF2YQorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW1mL3d0cGVtZi9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2VtZi9yZXNvdXJjZS9Tb3VyY2VMaW5rVHJhbnNsYXRvci5qYXZhCkBAIC01MSw2ICs1MSw3IEBACiAJCXN1cGVyKGRvbU5hbWVBbmRQYXRoLCBhRmVhdHVyZSwgc3R5bGUpOwogCX0KIAorCUBPdmVycmlkZQogCXB1YmxpYyBPYmplY3QgY29udmVydFN0cmluZ1RvVmFsdWUoU3RyaW5nIHN0clZhbHVlLCBFT2JqZWN0IG93bmVyKSB7CiAKIAkJT2JqZWN0IHZhbHVlID0gbnVsbDsKQEAgLTYyLDYgKzYzLDcgQEAKIAkJcmV0dXJuIHZhbHVlOwogCX0KIAorCUBPdmVycmlkZQogCXB1YmxpYyBTdHJpbmcgY29udmVydFZhbHVlVG9TdHJpbmcoT2JqZWN0IHZhbHVlLCBFT2JqZWN0IG93bmVyKSB7CiAJCVRyYW5zbGF0b3JQYXRoIHBhdGggPSBmVHJhbnNsYXRvclBhdGhzWzBdOwogCQlPYmplY3QgYXR0clZhbHVlID0gcGF0aC5nZXRMYXN0TWFwKCkuZ2V0TU9GVmFsdWUoKEVPYmplY3QpIHZhbHVlKTsKZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbWYvd3RwZW1mL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW1mL3Jlc291cmNlL1N0YXRpY1Jlc291cmNlRmFjdG9yeURlc2NyaXB0b3IuamF2YSBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbWYvd3RwZW1mL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW1mL3Jlc291cmNlL1N0YXRpY1Jlc291cmNlRmFjdG9yeURlc2NyaXB0b3IuamF2YQppbmRleCA4Y2FmNGVhLi5lMmY0NmZjIDEwMDY0NAotLS0gYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW1mL3d0cGVtZi9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2VtZi9yZXNvdXJjZS9TdGF0aWNSZXNvdXJjZUZhY3RvcnlEZXNjcmlwdG9yLmphdmEKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVtZi93dHBlbWYvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbWYvcmVzb3VyY2UvU3RhdGljUmVzb3VyY2VGYWN0b3J5RGVzY3JpcHRvci5qYXZhCkBAIC0zNCw2ICszNCw3IEBACiAJCXRoaXMuZmFjdG9yeSA9IGZhY3Rvcnk7CiAJfSAgCiAKKwlAT3ZlcnJpZGUKIAlwdWJsaWMgYm9vbGVhbiBpc0VuYWJsZWRGb3IoVVJJIGZpbGVVUkkpIHsKIAkJLyogc2hvcnRTZWdtZW50IG11c3QgYmUgbm9uLW51bGwgZm9yIHRoZSBkZXNjcmlwdG9yIHRvIGJlIGNyZWF0ZWQsIAogCQkgKiBhIHZhbGlkYXRpb24gY2hlY2sgaW4gaW5pdCgpIHZlcmlmaWVzIHRoaXMgcmVxdWlyZW1lbnQgKi8KQEAgLTQyLDEwICs0MywxMiBAQAogCQlyZXR1cm4gZmFsc2U7CiAJfSAKIAkKKwlAT3ZlcnJpZGUKIAlwdWJsaWMgUmVzb3VyY2UuRmFjdG9yeSBjcmVhdGVGYWN0b3J5KCkgewogCQkgcmV0dXJuIGZhY3Rvcnk7CQkJCiAJfQogCisJQE92ZXJyaWRlCiAJcHVibGljIFN0cmluZyBnZXRTaG9ydFNlZ21lbnQoKSB7CiAJCXJldHVybiBzaG9ydFNlZ21lbnQ7CiAJfSAgCmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW1mL3d0cGVtZi9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2VtZi9yZXNvdXJjZS9UcmFuc2xhdG9yLmphdmEgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW1mL3d0cGVtZi9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2VtZi9yZXNvdXJjZS9UcmFuc2xhdG9yLmphdmEKaW5kZXggYWIyODA3NC4uMGNlZTkxZiAxMDA2NDQKLS0tIGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVtZi93dHBlbWYvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbWYvcmVzb3VyY2UvVHJhbnNsYXRvci5qYXZhCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbWYvd3RwZW1mL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW1mL3Jlc291cmNlL1RyYW5zbGF0b3IuamF2YQpAQCAtMzgwLDYgKzM4MCw3IEBACiAJCXJldHVybiAoU3RyaW5nW10pIHJlc3VsdHMudG9BcnJheShuZXcgU3RyaW5nW3Jlc3VsdHMuc2l6ZSgpXSk7CiAJfQogCisJQE92ZXJyaWRlCiAJcHVibGljIFN0cmluZyB0b1N0cmluZygpIHsKIAkJU3RyaW5nQnVmZmVyIHNiID0gbmV3IFN0cmluZ0J1ZmZlcigpOwogCQlTdHJpbmcgY24gPSBnZXRDbGFzcygpLmdldE5hbWUoKTsKQEAgLTQxMCwxMiArNDExLDE4IEBACiAJLyoKIAkgKiBAc2VlIE9iamVjdCNlcXVhbHMoT2JqZWN0KQogCSAqLworCUBPdmVycmlkZQogCXB1YmxpYyBib29sZWFuIGVxdWFscyhPYmplY3Qgb2JqZWN0KSB7CiAJCWlmICghKG9iamVjdCBpbnN0YW5jZW9mIFRyYW5zbGF0b3IpKQogCQkJcmV0dXJuIGZhbHNlOwogCQlUcmFuc2xhdG9yIG1hcEluZm8gPSAoVHJhbnNsYXRvcikgb2JqZWN0OwogCQlyZXR1cm4gZkRPTU5hbWVzLmVxdWFscyhtYXBJbmZvLmdldERPTU5hbWVzKCkpICYmIChmZWF0dXJlID09IG51bGwgJiYgbWFwSW5mby5nZXRGZWF0dXJlKCkgPT0gbnVsbCB8fCBmZWF0dXJlLmVxdWFscyhtYXBJbmZvLmdldEZlYXR1cmUoKSkpOwogCX0KKwkKKwlAT3ZlcnJpZGUKKwlwdWJsaWMgaW50IGhhc2hDb2RlKCkgeworCQlyZXR1cm4gc3VwZXIuaGFzaENvZGUoKSArZkRPTU5hbWVzLmhhc2hDb2RlKCk7CisJfQogCiAJLyoqCiAJICogUmV0dXJucyB0aGUgaXNNYW5hZ2VkQnlQYXJlbnQuCkBAIC01MTAsMjAgKzUxNywyMSBAQAogCXB1YmxpYyBPYmplY3QgY29udmVydFN0cmluZ1RvVmFsdWUoU3RyaW5nIHN0clZhbHVlLCBFT2JqZWN0IG93bmVyKSB7CiAJCWlmIChmZWF0dXJlID09IG51bGwpCiAJCQlyZXR1cm4gc3RyVmFsdWU7Ci0JCWlmIChzdHJWYWx1ZSAhPSBudWxsKSB7CisJCVN0cmluZyBpbm5lclN0clZhbHVlID0gc3RyVmFsdWU7CisJCWlmIChpbm5lclN0clZhbHVlICE9IG51bGwpIHsKIAkJCWlmIChpc0VudW1XaXRoSHlwaGVucygpKQotCQkJCXN0clZhbHVlID0gc3RyVmFsdWUucmVwbGFjZSgnLScsICdfJyk7CisJCQkJaW5uZXJTdHJWYWx1ZSA9IGlubmVyU3RyVmFsdWUucmVwbGFjZSgnLScsICdfJyk7CiAJCQlpZiAoIWlzQ0RBVEFDb250ZW50KCkpIHsKLQkJCQlzdHJWYWx1ZSA9IHN0clZhbHVlLnRyaW0oKTsKKwkJCQlpbm5lclN0clZhbHVlID0gaW5uZXJTdHJWYWx1ZS50cmltKCk7CiAJCQl9CiAJCX0KLQkJT2JqZWN0IHZhbHVlID0gRmVhdHVyZVZhbHVlQ29udmVydGVyLkRFRkFVTFQuY29udmVydFZhbHVlKHN0clZhbHVlLCBmZWF0dXJlKTsKKwkJT2JqZWN0IHZhbHVlID0gRmVhdHVyZVZhbHVlQ29udmVydGVyLkRFRkFVTFQuY29udmVydFZhbHVlKGlubmVyU3RyVmFsdWUsIGZlYXR1cmUpOwogCQlpZiAodmFsdWUgPT0gbnVsbCkgewogCQkJaWYgKGlzRW1wdHlUYWcoKSAmJiAhaXNET01BdHRyaWJ1dGUoKSAmJiAhaXNET01UZXh0VmFsdWUoKSAmJiBpc0Jvb2xlYW5GZWF0dXJlKCkpCiAJCQkJcmV0dXJuIEJvb2xlYW4uVFJVRTsKIAkJCUVPYmplY3QgY29udmVydFRvVHlwZSA9IGZlYXR1cmUuZ2V0RVR5cGUoKTsKIAkJCWlmIChjb252ZXJ0VG9UeXBlID09IG51bGwpCi0JCQkJdmFsdWUgPSBzdHJWYWx1ZTsKKwkJCQl2YWx1ZSA9IGlubmVyU3RyVmFsdWU7CiAJCQllbHNlIGlmIChjb252ZXJ0VG9UeXBlLmVxdWFscyhnZXRFY29yZVBhY2thZ2UoKS5nZXRFU3RyaW5nKCkpKSB7CiAJCQkJdmFsdWUgPSAiIjsgLy8kTk9OLU5MUy0xJAogCQkJfQpkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVtZi93dHBlbWYvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbWYvcmVzb3VyY2UvVHJhbnNsYXRvckZpbHRlci5qYXZhIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVtZi93dHBlbWYvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbWYvcmVzb3VyY2UvVHJhbnNsYXRvckZpbHRlci5qYXZhCmluZGV4IGIxMjA2N2QuLmEzOGI4M2IgMTAwNjQ0Ci0tLSBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbWYvd3RwZW1mL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW1mL3Jlc291cmNlL1RyYW5zbGF0b3JGaWx0ZXIuamF2YQorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW1mL3d0cGVtZi9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2VtZi9yZXNvdXJjZS9UcmFuc2xhdG9yRmlsdGVyLmphdmEKQEAgLTEwNCw2ICsxMDQsNyBAQAogCQkJCSAqIHVwZGF0ZSB0aGUgbW9kZSB0byBWQVJJQUJMRV9UUkFOU0xBVE9SUyBzbyB3ZSBjYW4gc2tpcCB0byBpdCBkaXJlY3RseSBuZXh0IHRpbWUKIAkJCQkgKi8KIAkJCQl0aGlzLm1vZGUgPSBWQVJJQUJMRV9UUkFOU0xBVE9SU19NT0RFOworCQkJLy8kRkFMTC1USFJPVUdIJAogCQkJY2FzZSBWQVJJQUJMRV9UUkFOU0xBVE9SU19NT0RFIDoKIAkJCQljaGlsZHJlbiA9IHRoaXMudHJhbnNsYXRvci5nZXRWYXJpYWJsZUNoaWxkcmVuKHRhcmdldCwgdGhpcy52ZXJzaW9uKTsKIAkJCQlmb3VuZCA9IHNjYW5OZXh0VHJhbnNsYXRvcihjaGlsZHJlbiwgdGhpcy5pbmRleCk7CkBAIC0xNTQsMTQgKzE1NSwxNSBAQAogCXB1YmxpYyBzdGF0aWMgZmluYWwgVHJhbnNsYXRvciBnZXROZXh0Q2hpbGQoVHJhbnNsYXRvciB0cmFuc2xhdG9yLCBpbnQgc3RhcnRIaW50LCBpbnRbXSBoaW50cywgRU9iamVjdCB0YXJnZXQsIGludCB2ZXJzaW9uLCBUcmFuc2xhdG9yRmlsdGVyIHRyYW5zbGF0b3JGaWx0ZXIpIHsKIAogCQlUcmFuc2xhdG9yIHJlc3VsdCA9IG51bGw7Ci0KLQkJaW50IGluZGV4ID0gc3RhcnRIaW50OworCQkKKwkJaW50IGlubmVyU3RhcnRIaW50ID0gc3RhcnRIaW50OworCQlpbnQgaW5kZXggPSBpbm5lclN0YXJ0SGludDsKIAkJVHJhbnNsYXRvciBjaGlsZHJlbltdID0gbnVsbDsKIAogCQlzd2l0Y2ggKGhpbnRzW01PREVfSElOVF9JTkRYXSkgewogCQkJY2FzZSBTVEFOREFSRF9UUkFOU0xBVE9SU19NT0RFIDoKIAkJCQljaGlsZHJlbiA9IHRyYW5zbGF0b3IuZ2V0Q2hpbGRyZW4odGFyZ2V0LCB2ZXJzaW9uKTsKLQkJCQlpZiAoY2hpbGRyZW4gIT0gbnVsbCAmJiBzdGFydEhpbnQgPCBjaGlsZHJlbi5sZW5ndGgpIHsKKwkJCQlpZiAoY2hpbGRyZW4gIT0gbnVsbCAmJiBpbm5lclN0YXJ0SGludCA8IGNoaWxkcmVuLmxlbmd0aCkgewogCiAJCQkJCS8qIExvb2sgZm9yIHRoZSBuZXh0IEF0dHJpYnV0ZSBUcmFuc2xhdG9yICovCiAJCQkJCWluZGV4ID0gdHJhbnNsYXRvckZpbHRlci5zY2FuTmV4dFRyYW5zbGF0b3IoY2hpbGRyZW4sIGluZGV4KTsKQEAgLTE3OSwxNyArMTgxLDE4IEBACiAJCQkJCSAqIERPIE5PVCBCUkVBSyB3ZSB3aWxsIGRlZmF1bHQgdG8gVkFSSUFCTEUgVFJBTlNMQVRPUlMgTU9ERSBzbyB3ZSBtdXN0IHJlc2V0CiAJCQkJCSAqIHRoZSBzdGFydEhpbnQgYXBwcm9wcmlhdGVseQogCQkJCQkgKi8KLQkJCQkJc3RhcnRIaW50ID0gLTE7CisJCQkJCWlubmVyU3RhcnRIaW50ID0gLTE7CiAJCQkJfQogCisJCQkvLyRGQUxMLVRIUk9VR0gkCiAJCQljYXNlIFZBUklBQkxFX1RSQU5TTEFUT1JTX01PREUgOgogCQkJCWhpbnRzW01PREVfSElOVF9JTkRYXSA9IFZBUklBQkxFX1RSQU5TTEFUT1JTX01PREU7CiAJCQkJLyoKIAkJCQkgKiBSZXNldCB0aGUgaW5kZXguCiAJCQkJICovCi0JCQkJaW5kZXggPSBzdGFydEhpbnQ7CisJCQkJaW5kZXggPSBpbm5lclN0YXJ0SGludDsKIAkJCQljaGlsZHJlbiA9IHRyYW5zbGF0b3IuZ2V0VmFyaWFibGVDaGlsZHJlbih0YXJnZXQsIHZlcnNpb24pOwotCQkJCWlmIChjaGlsZHJlbiAhPSBudWxsICYmIGNoaWxkcmVuLmxlbmd0aCA+IDAgJiYgc3RhcnRIaW50IDwgY2hpbGRyZW4ubGVuZ3RoKSB7CisJCQkJaWYgKGNoaWxkcmVuICE9IG51bGwgJiYgY2hpbGRyZW4ubGVuZ3RoID4gMCAmJiBpbm5lclN0YXJ0SGludCA8IGNoaWxkcmVuLmxlbmd0aCkgewogCQkJCQlpbmRleCA9IHRyYW5zbGF0b3JGaWx0ZXIuc2Nhbk5leHRUcmFuc2xhdG9yKGNoaWxkcmVuLCBpbmRleCk7CiAJCQkJCXJlc3VsdCA9IChpbmRleCA+PSAwKSA/IGNoaWxkcmVuW2luZGV4XSA6IG51bGw7CiAJCQkJfQpkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVtZi93dHBlbWYvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbWYvcmVzb3VyY2UvVHJhbnNsYXRvclBhdGguamF2YSBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbWYvd3RwZW1mL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW1mL3Jlc291cmNlL1RyYW5zbGF0b3JQYXRoLmphdmEKaW5kZXggYTJkODQzZS4uNjY3OGI1MSAxMDA2NDQKLS0tIGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVtZi93dHBlbWYvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbWYvcmVzb3VyY2UvVHJhbnNsYXRvclBhdGguamF2YQorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW1mL3d0cGVtZi9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2VtZi9yZXNvdXJjZS9UcmFuc2xhdG9yUGF0aC5qYXZhCkBAIC03NSw2ICs3NSw3IEBACiAJICogCiAJICogQHNlZSBqYXZhLmxhbmcuT2JqZWN0I3RvU3RyaW5nKCkKIAkgKi8KKwlAT3ZlcnJpZGUKIAlwdWJsaWMgU3RyaW5nIHRvU3RyaW5nKCkgewogCQlTdHJpbmdCdWZmZXIgc2IgPSBuZXcgU3RyaW5nQnVmZmVyKCk7CiAJCVN0cmluZyBjbiA9IGdldENsYXNzKCkuZ2V0TmFtZSgpOwpkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVtZi93dHBlbWYvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbWYvcmVzb3VyY2UvVHJhbnNsYXRvclJlc291cmNlRmFjdG9yeS5qYXZhIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVtZi93dHBlbWYvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbWYvcmVzb3VyY2UvVHJhbnNsYXRvclJlc291cmNlRmFjdG9yeS5qYXZhCmluZGV4IDIwYTQ1MGIuLjk0MjdmYjcgMTAwNjQ0Ci0tLSBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbWYvd3RwZW1mL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW1mL3Jlc291cmNlL1RyYW5zbGF0b3JSZXNvdXJjZUZhY3RvcnkuamF2YQorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW1mL3d0cGVtZi9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2VtZi9yZXNvdXJjZS9UcmFuc2xhdG9yUmVzb3VyY2VGYWN0b3J5LmphdmEKQEAgLTQ4LDYgKzQ4LDcgQEAKIAkJcmV0dXJuIHRoaXMubGlzdGVuaW5nRm9yVXBkYXRlczsKIAl9CiAKKwlAT3ZlcnJpZGUKIAlwdWJsaWMgUmVzb3VyY2UgZG9DcmVhdGVSZXNvdXJjZShVUkkgdXJpKSB7CiAJCVJlbmRlcmVyIGFSZW5kZXJlciA9IHJlbmRlcmVyRmFjdG9yeS5jcmVhdGVSZW5kZXJlcigpOwogCQlyZXR1cm4gY3JlYXRlUmVzb3VyY2UodXJpLCBhUmVuZGVyZXIpOwpkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVtZi93dHBlbWYvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbWYvcmVzb3VyY2UvVHJhbnNsYXRvclJlc291cmNlSW1wbC5qYXZhIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVtZi93dHBlbWYvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbWYvcmVzb3VyY2UvVHJhbnNsYXRvclJlc291cmNlSW1wbC5qYXZhCmluZGV4IGQ5MjUyNDUuLjc4ZmJjZTAgMTAwNjQ0Ci0tLSBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbWYvd3RwZW1mL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW1mL3Jlc291cmNlL1RyYW5zbGF0b3JSZXNvdXJjZUltcGwuamF2YQorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW1mL3d0cGVtZi9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2VtZi9yZXNvdXJjZS9UcmFuc2xhdG9yUmVzb3VyY2VJbXBsLmphdmEKQEAgLTE2LDYgKzE2LDcgQEAKIGltcG9ydCBqYXZhLnV0aWwuQ29sbGVjdGlvbjsKIGltcG9ydCBqYXZhLnV0aWwuTWFwOwogCitpbXBvcnQgb3JnLmVjbGlwc2UuZW1mLmNvbW1vbi5ub3RpZnkuQWRhcHRlcjsKIGltcG9ydCBvcmcuZWNsaXBzZS5lbWYuY29tbW9uLm5vdGlmeS5Ob3RpZmljYXRpb247CiBpbXBvcnQgb3JnLmVjbGlwc2UuZW1mLmNvbW1vbi5ub3RpZnkuaW1wbC5Ob3RpZmljYXRpb25JbXBsOwogaW1wb3J0IG9yZy5lY2xpcHNlLmVtZi5jb21tb24udXRpbC5FTGlzdDsKQEAgLTI2LDcgKzI3LDcgQEAKIGltcG9ydCBvcmcuZWNsaXBzZS5lbWYuZWNvcmUuSW50ZXJuYWxFT2JqZWN0OwogaW1wb3J0IG9yZy5lY2xpcHNlLmVtZi5lY29yZS5pbXBsLkVOb3RpZmljYXRpb25JbXBsOwogaW1wb3J0IG9yZy5lY2xpcHNlLmVtZi5lY29yZS5yZXNvdXJjZS5pbXBsLlJlc291cmNlSW1wbDsKLWltcG9ydCBvcmcuZWNsaXBzZS5qZW0udXRpbC5sb2dnZXIucHJveHkuTG9nZ2VyOworaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uaW50ZXJuYWwuZW1mLnBsdWdpbi5FY29yZVV0aWxpdGllc1BsdWdpbjsKIGltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmludGVybmFsLmVtZi51dGlsaXRpZXMuU3RyaW5nVXRpbDsKIGltcG9ydCBvcmcueG1sLnNheC5FbnRpdHlSZXNvbHZlcjsKIApAQCAtNzQsMTIgKzc1LDE0IEBACiAJCXNldFJlbmRlcmVyKGFSZW5kZXJlcik7CiAJfQogCisJQE92ZXJyaWRlCiAJcHVibGljIGphdmEubGFuZy5TdHJpbmcgZ2V0RW5jb2RpbmcoKSB7CiAJCWlmIChzdXBlci5nZXRFbmNvZGluZygpID09IG51bGwpCiAJCQlzZXRFbmNvZGluZyhERUZBVUxUX0VOQ09ESU5HKTsKIAkJcmV0dXJuIHN1cGVyLmdldEVuY29kaW5nKCk7CiAJfQogCisJQE92ZXJyaWRlCiAJcHVibGljIFN0cmluZyBnZXRQdWJsaWNJZCgpIHsKIAkJcmV0dXJuIHB1YmxpY0lkOwogCX0KQEAgLTkzLDYgKzk2LDcgQEAKIAkJcmV0dXJuIChFT2JqZWN0KSBnZXRDb250ZW50cygpLmdldCgwKTsKIAl9CiAKKwlAT3ZlcnJpZGUKIAlwdWJsaWMgU3RyaW5nIGdldFN5c3RlbUlkKCkgewogCQlyZXR1cm4gc3lzdGVtSWQ7CiAJfQpAQCAtMTAzLDEwICsxMDcsMTIgQEAKIAkJc3lzdGVtSWQgPSBhU3lzdGVtSWQ7CiAJCWlmIChjaGFuZ2VkKSB7CiAJCQllTm90aWZ5KG5ldyBOb3RpZmljYXRpb25JbXBsKE5vdGlmaWNhdGlvbi5TRVQsIG51bGwsIG51bGwpIHsKKwkJCQlAT3ZlcnJpZGUKIAkJCQlwdWJsaWMgT2JqZWN0IGdldEZlYXR1cmUoKSB7CiAJCQkJCXJldHVybiBET0NfVFlQRV9GRUFUVVJFOwogCQkJCX0KIAorCQkJCUBPdmVycmlkZQogCQkJCXB1YmxpYyBPYmplY3QgZ2V0Tm90aWZpZXIoKSB7CiAJCQkJCXJldHVybiBUcmFuc2xhdG9yUmVzb3VyY2VJbXBsLnRoaXM7CiAJCQkJfQpAQCAtMTE5LDYgKzEyNSw3IEBACiAJICogCiAJICogQHJldHVybiBTdHJpbmcKIAkgKi8KKwlAT3ZlcnJpZGUKIAlwdWJsaWMgU3RyaW5nIGdldFhNTFZlcnNpb24oKSB7CiAJCWlmICh4bWxWZXJzaW9uID09IG51bGwpCiAJCQl4bWxWZXJzaW9uID0gREVGQVVMVF9WRVJTSU9OOwpAQCAtMTMxLDEwICsxMzgsMTIgQEAKIAkgKiBAcGFyYW0geG1sVmVyc2lvbgogCSAqICAgICAgICAgICAgVGhlIHhtbFZlcnNpb24gdG8gc2V0CiAJICovCisJQE92ZXJyaWRlCiAJcHVibGljIHZvaWQgc2V0WE1MVmVyc2lvbihTdHJpbmcgeG1sVmVyc2lvbikgewogCQl0aGlzLnhtbFZlcnNpb24gPSB4bWxWZXJzaW9uOwogCX0KIAorCUBPdmVycmlkZQogCXByb3RlY3RlZCB2b2lkIGJhc2ljRG9Mb2FkKElucHV0U3RyZWFtIGlucHV0U3RyZWFtLCBNYXAgb3B0aW9ucykgdGhyb3dzIElPRXhjZXB0aW9uIHsKIAkJLy8gbG9uZyBzdGFydCA9IFN5c3RlbS5jdXJyZW50VGltZU1pbGxpcygpOwogCQlib29sZWFuIGlzVHJhY2tpbmdNb2RzID0gaXNUcmFja2luZ01vZGlmaWNhdGlvbigpOwpAQCAtMTUxLDYgKzE2MCw3IEBACiAJCS8vIHJlY29yZFRpbWUoIkxvYWQiLCBzdGFydCwgZW5kKTsKIAl9CiAKKwlAT3ZlcnJpZGUKIAlwdWJsaWMgdm9pZCBzYXZlKE1hcCBvcHRpb25zKSB0aHJvd3MgSU9FeGNlcHRpb24gewogICAgICAgICBpZiAocmVuZGVyZXIudXNlU3RyZWFtc0ZvcklPKCkpIHsKICAgICAgICAgICAgIHN1cGVyLnNhdmUob3B0aW9ucyk7CkBAIC0xNjMsOCArMTczLDcgQEAKICAgICAgICAgICAgICAgICAgbm90aWZ5U2F2ZUZhaWxlZCgpOwogICAgICAgICAgICAgICAgIGlmIChlIGluc3RhbmNlb2YgSU9FeGNlcHRpb24pCiAgICAgICAgICAgICAgICAgICAgIHRocm93IChJT0V4Y2VwdGlvbikgZTsKLSAgICAgICAgICAgICAgICBlbHNlCi0gICAgICAgICAgICAgICAgICAgIExvZ2dlci5nZXRMb2dnZXIoKS53cml0ZShlKTsKKyAgICAgICAgICAgICAgICBFY29yZVV0aWxpdGllc1BsdWdpbi5sb2dFcnJvcihlKTsKICAgICAgICAgICAgIH0KICAgICAgICAgICAgIG5vdGlmeVNhdmVkKCk7CiAgICAgICAgIH0KQEAgLTE3NSw2ICsxODQsNyBAQAogCSAqIEBzZWUgY29tLmlibS5ldG9vbHMueG1pLmhlbHBlcnMuQ29tcGF0aWJpbGl0eVhNSVJlc291cmNlSW1wbCNkb1NhdmUoT3V0cHV0U3RyZWFtLAogCSAqICAgICAgTWFwKQogCSAqLworCUBPdmVycmlkZQogCXB1YmxpYyB2b2lkIGRvU2F2ZShPdXRwdXRTdHJlYW0gb3V0cHV0U3RyZWFtLCBNYXAgb3B0aW9ucykgdGhyb3dzIElPRXhjZXB0aW9uIHsKIAkJLy8gbG9uZyBzdGFydCA9IFN5c3RlbS5jdXJyZW50VGltZU1pbGxpcygpOwogCQlyZW5kZXJlci5kb1NhdmUob3V0cHV0U3RyZWFtLCBvcHRpb25zKTsKQEAgLTE5NCwxMSArMjA0LDEzIEBACiAJLyoqCiAJICogQHNlZSBvcmcuZWNsaXBzZS5lbWYuZWNvcmUueG1pLmltcGwuWE1MUmVzb3VyY2VJbXBsI2RvVW5sb2FkKCkKIAkgKi8KKwlAT3ZlcnJpZGUKIAlwcm90ZWN0ZWQgdm9pZCBkb1VubG9hZCgpIHsKIAkJcmVuZGVyZXIucHJlVW5sb2FkKCk7CiAJCXN1cGVyLmRvVW5sb2FkKCk7CiAJfQogCisJQE92ZXJyaWRlCiAJcHVibGljIFN0cmluZyB0b1N0cmluZygpIHsKIAkJcmV0dXJuIGdldENsYXNzKCkuZ2V0TmFtZSgpICsgZ2V0VVJJKCkudG9TdHJpbmcoKTsKIAl9CkBAIC0yMzQsNiArMjQ2LDcgQEAKIAkJcmV0dXJuIHN1cGVyLmdldENvbnRlbnRzKCk7CiAJfQogCisJQE92ZXJyaWRlCiAJcHVibGljIEVMaXN0IGdldENvbnRlbnRzKCkgewogCQl3YWl0Rm9yUmVzb3VyY2VUb0xvYWRJZk5lY2Vzc2FyeSgpOwogCQlpZiAoY29udGVudHMgPT0gbnVsbCkgewpAQCAtMjQ0LDExICsyNTcsMTggQEAKIAogCXByb3RlY3RlZCB2b2lkIGluaXRpYWxpemVDb250ZW50cygpIHsKIAkJY29udGVudHMgPSBuZXcgUmVzb3VyY2VJbXBsLkNvbnRlbnRzRUxpc3QoKSB7CisJCQkvKioKKwkJCSAqIAorCQkJICovCisJCQlwcml2YXRlIHN0YXRpYyBmaW5hbCBsb25nIHNlcmlhbFZlcnNpb25VSUQgPSAxTDsKKworCQkJQE92ZXJyaWRlCiAJCQlwdWJsaWMgYm9vbGVhbiBhZGQoT2JqZWN0IG9iamVjdCkgewogCQkJCXJlbmRlcmVyLnByZXBhcmVUb0FkZENvbnRlbnRzKCk7CiAJCQkJcmV0dXJuIHN1cGVyLmFkZChvYmplY3QpOwogCQkJfQogCisJCQlAT3ZlcnJpZGUKIAkJCXB1YmxpYyBib29sZWFuIGFkZEFsbChDb2xsZWN0aW9uIGNvbGxlY3Rpb24pIHsKIAkJCQlyZW5kZXJlci5wcmVwYXJlVG9BZGRDb250ZW50cygpOwogCQkJCXJldHVybiBzdXBlci5hZGRBbGwoY29sbGVjdGlvbik7CkBAIC0yNjcsNiArMjg3LDcgQEAKIAkvKioKIAkgKiBAc2VlIG9yZy5lY2xpcHNlLmVtZi5lY29yZS54bWkuaW1wbC5YTUxSZXNvdXJjZUltcGwjaW5pdCgpCiAJICovCisJQE92ZXJyaWRlCiAJcHJvdGVjdGVkIHZvaWQgaW5pdCgpIHsKIAkJc3VwZXIuaW5pdCgpOwogCQlzZXRFbmNvZGluZyhERUZBVUxUX0VOQ09ESU5HKTsKQEAgLTMxNiw2ICszMzcsNyBAQAogCSAqIAogCSAqIEBzZWUgb3JnLmVjbGlwc2UuZW1mLmVjb3JlLnhtaS5YTUxSZXNvdXJjZSNzZXRJRChFT2JqZWN0LCBTdHJpbmcpCiAJICovCisJQE92ZXJyaWRlCiAJcHVibGljIHZvaWQgc2V0SUQoRU9iamVjdCBlT2JqZWN0LCBTdHJpbmcgaWQpIHsKIAkJU3RyaW5nIG9sZElkID0gZ2V0SUQoZU9iamVjdCk7CiAJCXN1cGVyLnNldElEKGVPYmplY3QsIGlkKTsKQEAgLTMyOCwxNSArMzUwLDIwIEBACiAJICogCiAJICogQHJldHVybiBib29sZWFuCiAJICovCisJQE92ZXJyaWRlCiAJcHVibGljIGJvb2xlYW4gaXNNb2RpZmllZCgpIHsKIAkJcmV0dXJuIHN1cGVyLmlzTW9kaWZpZWQoKSB8fCByZW5kZXJlci5pc01vZGlmaWVkKCk7CiAJfQorCXB1YmxpYyBib29sZWFuIGlzUmV2ZXJ0aW5nKCkgeworCQlyZXR1cm4gKChBYnN0cmFjdFJlbmRlcmVySW1wbClyZW5kZXJlcikuaXNSZXZlcnRpbmcoKTsKKwl9CiAKIAkvKgogCSAqIE92ZXJyaWRlbiB0byBnaXZlIHRoZSByZW5kZXJlciBhIGhvb2sKIAkgKiAKIAkgKiBAc2VlIG9yZy5lY2xpcHNlLndzdC5jb21tb24uaW50ZXJuYWwuZW1mLnJlc291cmNlLlJlZmVyZW5jZWRSZXNvdXJjZSNhY2Nlc3NGb3JXcml0ZSgpCiAJICovCisJQE92ZXJyaWRlCiAJcHVibGljIHZvaWQgYWNjZXNzRm9yV3JpdGUoKSB7CiAJCXJlbmRlcmVyLmFjY2Vzc0ZvcldyaXRlKCk7CiAJCXN1cGVyLmFjY2Vzc0ZvcldyaXRlKCk7CkBAIC0zNDcsMTYgKzM3NCwxOSBAQAogCSAqIAogCSAqIEBzZWUgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5pbnRlcm5hbC5lbWYucmVzb3VyY2UuUmVmZXJlbmNlZFJlc291cmNlI2FjY2Vzc0ZvclJlYWQoKQogCSAqLworCUBPdmVycmlkZQogCXB1YmxpYyB2b2lkIGFjY2Vzc0ZvclJlYWQoKSB7CiAJCXJlbmRlcmVyLmFjY2Vzc0ZvclJlYWQoKTsKIAkJc3VwZXIuYWNjZXNzRm9yUmVhZCgpOwogCX0KIAorCUBPdmVycmlkZQogCXB1YmxpYyB2b2lkIHJlbGVhc2VGcm9tUmVhZCgpIHsKIAkJcmVuZGVyZXIucmVsZWFzZUZyb21SZWFkKCk7CiAJCXN1cGVyLnJlbGVhc2VGcm9tUmVhZCgpOwogCX0KIAorCUBPdmVycmlkZQogCXB1YmxpYyB2b2lkIHJlbGVhc2VGcm9tV3JpdGUoKSB7CiAJCXJlbmRlcmVyLnJlbGVhc2VGcm9tV3JpdGUoKTsKIAkJc3VwZXIucmVsZWFzZUZyb21Xcml0ZSgpOwpAQCAtMzY3LDMyICszOTcsNDggQEAKIAkgKiAKIAkgKiBAc2VlIGNvbS5pYm0uZXRvb2xzLmVtZi53b3JrYmVuY2guUmVmZXJlbmNlZFhNSVJlc291cmNlSW1wbCNwcmVEZWxldGUoKQogCSAqLworCUBPdmVycmlkZQogCXB1YmxpYyB2b2lkIHByZURlbGV0ZSgpIHsKIAkJc3VwZXIucHJlRGVsZXRlKCk7CiAJCXJlbmRlcmVyLnByZURlbGV0ZSgpOwogCX0KIAorCUBPdmVycmlkZQogCXB1YmxpYyBib29sZWFuIGlzU2hhcmVkKCkgewogCQlyZXR1cm4gc3VwZXIuaXNTaGFyZWQoKSB8fCByZW5kZXJlci5pc1NoYXJlZCgpOwogCX0KIAorCUBPdmVycmlkZQogCXB1YmxpYyBib29sZWFuIGlzU2hhcmVkRm9yV3JpdGUoKSB7CiAJCXJldHVybiBzdXBlci5pc1NoYXJlZEZvcldyaXRlKCkgfHwgcmVuZGVyZXIuaXNTaGFyZWRGb3JXcml0ZSgpOwogCX0KIAorCUBPdmVycmlkZQogCXB1YmxpYyB2b2lkIGxvYWQoTWFwIG9wdGlvbnMpIHRocm93cyBJT0V4Y2VwdGlvbiB7Ci0JCXN5bmNocm9uaXplZCAodGhpcykgewotCQkJaWYgKGlzTG9hZGVkKQorCQkKKwkJCWlmIChpc0xvYWRlZCgpKQogCQkJCXJldHVybjsKLQkJCS8vIFN5c3RlbS5vdXQucHJpbnRsbihUaHJlYWQuY3VycmVudFRocmVhZCgpICsgIgotCQkJLy8gVHJhbnNsYXRvclJlc291cmNlLmxvYWQoKTogIiArIHRoaXMpOworCQkJCiAJCQlpZiAocmVuZGVyZXIudXNlU3RyZWFtc0ZvcklPKCkpIHsKIAkJCQlzdXBlci5sb2FkKG9wdGlvbnMpOwogCQkJfQotCQkJZWxzZSBpZiAoIWlzTG9hZGVkKSB7Ci0JCQkJbG9hZCgoSW5wdXRTdHJlYW0pIG51bGwsIG9wdGlvbnMpOworCQkJZWxzZSBpZiAoIWlzTG9hZGVkKCkpIHsKKwkJCQlpc1NoYXJlZCgpOworCQkJCWxvYWRFeGlzdGluZyhvcHRpb25zKTsKIAkJCX0KLQkJfQotCiAJfQorCisJQE92ZXJyaWRlCisJcHVibGljIHZvaWQgZU5vdGlmeShOb3RpZmljYXRpb24gbm90aWZpY2F0aW9uKSB7CisJICAgIEFkYXB0ZXJbXSBlQWRhcHRlcnMgPSBlQmFzaWNBZGFwdGVyQXJyYXkoKTsKKwkgICAgaWYgKGVBZGFwdGVycyAhPSBudWxsICYmIGVEZWxpdmVyKCkpCisJICAgIHsKKwkgICAgICBmb3IgKGludCBpID0gMCwgc2l6ZSA9IGVBZGFwdGVycy5sZW5ndGg7IGkgPCBzaXplOyArK2kpCisJICAgICAgeworCSAgICAgIAlBZGFwdGVyIHRlbXA7CisJICAgIAkgIGlmICgodGVtcCA9IGVBZGFwdGVyc1tpXSkgIT0gbnVsbCkKKwkgICAgCQkgIHRlbXAubm90aWZ5Q2hhbmdlZChub3RpZmljYXRpb24pOworCSAgICAgIH0KKwkgICAgfQorCSAgfQogfQpkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVtZi93dHBlbWYvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbWYvcmVzb3VyY2UvVW5zdXBwb3J0ZWRGZWF0dXJlLmphdmEgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW1mL3d0cGVtZi9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2VtZi9yZXNvdXJjZS9VbnN1cHBvcnRlZEZlYXR1cmUuamF2YQppbmRleCA0M2M1ODY0Li40MjQyNDFjIDEwMDY0NAotLS0gYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW1mL3d0cGVtZi9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2VtZi9yZXNvdXJjZS9VbnN1cHBvcnRlZEZlYXR1cmUuamF2YQorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW1mL3d0cGVtZi9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2VtZi9yZXNvdXJjZS9VbnN1cHBvcnRlZEZlYXR1cmUuamF2YQpAQCAtMTAsOSArMTAsNiBAQAogICoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKiovCiAvKgogICogQ3JlYXRlZCBvbiBBcHIgMTMsIDIwMDQKLSAqCi0gKiBUT0RPIFRvIGNoYW5nZSB0aGUgdGVtcGxhdGUgZm9yIHRoaXMgZ2VuZXJhdGVkIGZpbGUgZ28gdG8KLSAqIFdpbmRvdyAtIFByZWZlcmVuY2VzIC0gSmF2YSAtIENvZGUgR2VuZXJhdGlvbiAtIENvZGUgYW5kIENvbW1lbnRzCiAgKi8KIHBhY2thZ2Ugb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5pbnRlcm5hbC5lbWYucmVzb3VyY2U7CiAKQEAgLTIxLDkgKzE4LDYgQEAKIAogLyoqCiAgKiBAYXV0aG9yIGNicmlkZ2hhCi0gKiAKLSAqIFRPRE8gVG8gY2hhbmdlIHRoZSB0ZW1wbGF0ZSBmb3IgdGhpcyBnZW5lcmF0ZWQgdHlwZSBjb21tZW50IGdvIHRvIFdpbmRvdyAtIFByZWZlcmVuY2VzIC0gSmF2YSAtCi0gKiBDb2RlIEdlbmVyYXRpb24gLSBDb2RlIGFuZCBDb21tZW50cwogICovCiBwdWJsaWMgY2xhc3MgVW5zdXBwb3J0ZWRGZWF0dXJlIGV4dGVuZHMgRUF0dHJpYnV0ZUltcGwgewogCS8qKgpAQCAtMzgsNiArMzIsNSBAQAogCiAJcHVibGljIFVuc3VwcG9ydGVkRmVhdHVyZSgpIHsKIAkJc3VwZXIoKTsKLQkJLy8gVE9ETyBBdXRvLWdlbmVyYXRlZCBjb25zdHJ1Y3RvciBzdHViCiAJfQogfQpcIE5vIG5ld2xpbmUgYXQgZW5kIG9mIGZpbGUKZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbWYvd3RwZW1mL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW1mL3V0aWxpdGllcy9Bc3NlcnQuamF2YSBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbWYvd3RwZW1mL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW1mL3V0aWxpdGllcy9Bc3NlcnQuamF2YQppbmRleCAzYTQ0NzUxLi5mNjYzNWE3IDEwMDY0NAotLS0gYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW1mL3d0cGVtZi9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2VtZi91dGlsaXRpZXMvQXNzZXJ0LmphdmEKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVtZi93dHBlbWYvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbWYvdXRpbGl0aWVzL0Fzc2VydC5qYXZhCkBAIC0xMCw3ICsxMCw3IEBACiAgKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKi8KIHBhY2thZ2Ugb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5pbnRlcm5hbC5lbWYudXRpbGl0aWVzOwogCi1pbXBvcnQgb3JnLmVjbGlwc2UuamVtLnV0aWwubG9nZ2VyLnByb3h5LkxvZ2dlcjsKK2ltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmludGVybmFsLmVtZi5wbHVnaW4uRWNvcmVVdGlsaXRpZXNQbHVnaW47CiAKIAogCkBAIC05Myw3ICs5Myw3IEBACiAJICovCiAJcHVibGljIHN0YXRpYyB2b2lkIGlzTm90TnVsbChPYmplY3Qgb2JqZWN0LCBTdHJpbmcgbWVzc2FnZSkgewogCQlpZiAob2JqZWN0ID09IG51bGwpIHsKLQkJCUxvZ2dlci5nZXRMb2dnZXIoKS5sb2dFcnJvcigibnVsbF9hcmd1bWVudDogIiArIG1lc3NhZ2UpOy8vJE5PTi1OTFMtMSQKKwkJCUVjb3JlVXRpbGl0aWVzUGx1Z2luLmxvZ0Vycm9yKCJudWxsX2FyZ3VtZW50OiAiICsgbWVzc2FnZSk7Ly8kTk9OLU5MUy0xJAogCQkJdGhyb3cgbmV3IEFzc2VydGlvbkZhaWxlZEV4Y2VwdGlvbigpOwogCQl9CiAJfQpAQCAtMTIzLDcgKzEyMyw3IEBACiAJICovCiAJcHVibGljIHN0YXRpYyBib29sZWFuIGlzVHJ1ZShib29sZWFuIGV4cHJlc3Npb24sIFN0cmluZyBtZXNzYWdlKSB7CiAJCWlmICghZXhwcmVzc2lvbikgewotCQkJTG9nZ2VyLmdldExvZ2dlcigpLmxvZ0Vycm9yKCJhc3NlcnRpb24gZmFpbGVkOiAiICsgbWVzc2FnZSk7Ly8kTk9OLU5MUy0xJAorCQkJRWNvcmVVdGlsaXRpZXNQbHVnaW4ubG9nRXJyb3IoImFzc2VydGlvbiBmYWlsZWQ6ICIgKyBtZXNzYWdlKTsvLyROT04tTkxTLTEkCiAJCQl0aHJvdyBuZXcgQXNzZXJ0aW9uRmFpbGVkRXhjZXB0aW9uKCk7CiAJCX0KIAkJcmV0dXJuIGV4cHJlc3Npb247CmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW1mL3d0cGVtZi9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2VtZi91dGlsaXRpZXMvQXNzZXJ0aW9uRmFpbGVkRXhjZXB0aW9uLmphdmEgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW1mL3d0cGVtZi9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2VtZi91dGlsaXRpZXMvQXNzZXJ0aW9uRmFpbGVkRXhjZXB0aW9uLmphdmEKaW5kZXggMDQ0YzYwZC4uNWRlNDkyZSAxMDA2NDQKLS0tIGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVtZi93dHBlbWYvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbWYvdXRpbGl0aWVzL0Fzc2VydGlvbkZhaWxlZEV4Y2VwdGlvbi5qYXZhCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbWYvd3RwZW1mL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW1mL3V0aWxpdGllcy9Bc3NlcnRpb25GYWlsZWRFeGNlcHRpb24uamF2YQpAQCAtMjUsNiArMjUsMTEgQEAKIC8vIG9uIG90aGVyIHBhY2thZ2VzIGFuZCBpbnRlcm5hbCBBUElzLgogY2xhc3MgQXNzZXJ0aW9uRmFpbGVkRXhjZXB0aW9uIGV4dGVuZHMgUnVudGltZUV4Y2VwdGlvbiB7CiAJLyoqCisJICogCisJICovCisJcHJpdmF0ZSBzdGF0aWMgZmluYWwgbG9uZyBzZXJpYWxWZXJzaW9uVUlEID0gMzQwODI4NDAwODM0MjY4MzYyMUw7CisKKwkvKioKIAkgKiBDb25zdHJ1Y3RzIGEgbmV3IGV4Y2VwdGlvbi4KIAkgKi8KIAlwdWJsaWMgQXNzZXJ0aW9uRmFpbGVkRXhjZXB0aW9uKCkgewpkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVtZi93dHBlbWYvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbWYvdXRpbGl0aWVzL0RPTVV0aWxpdGllcy5qYXZhIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVtZi93dHBlbWYvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbWYvdXRpbGl0aWVzL0RPTVV0aWxpdGllcy5qYXZhCmluZGV4IDQ0Zjk2NjkuLjRkNDIyNWQgMTAwNjQ0Ci0tLSBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbWYvd3RwZW1mL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW1mL3V0aWxpdGllcy9ET01VdGlsaXRpZXMuamF2YQorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW1mL3d0cGVtZi9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2VtZi91dGlsaXRpZXMvRE9NVXRpbGl0aWVzLmphdmEKQEAgLTI2LDcgKzI2LDcgQEAKIGltcG9ydCBqYXZheC54bWwucGFyc2Vycy5Eb2N1bWVudEJ1aWxkZXJGYWN0b3J5OwogaW1wb3J0IGphdmF4LnhtbC5wYXJzZXJzLlBhcnNlckNvbmZpZ3VyYXRpb25FeGNlcHRpb247CiAKLWltcG9ydCBvcmcuZWNsaXBzZS5qZW0udXRpbC5sb2dnZXIucHJveHkuTG9nZ2VyOworaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uaW50ZXJuYWwuZW1mLnBsdWdpbi5FY29yZVV0aWxpdGllc1BsdWdpbjsKIGltcG9ydCBvcmcudzNjLmRvbS5Eb2N1bWVudDsKIGltcG9ydCBvcmcudzNjLmRvbS5Ob2RlOwogaW1wb3J0IG9yZy53M2MuZG9tLk5vZGVMaXN0OwpAQCAtNDk0LDEzICs0OTQsMTggQEAKIAkJdHJ5IHsKIAkJCWRiZi5zZXRBdHRyaWJ1dGUoImh0dHA6Ly9hcGFjaGUub3JnL3htbC9mZWF0dXJlcy9hbGxvdy1qYXZhLWVuY29kaW5ncyIsIG5ldyBCb29sZWFuKG9wdGlvbnMuaXNBbGxvd0phdmFFbmNvZGluZ3MoKSkpOyAvLyROT04tTkxTLTEkCSAgICAgICAgCiAJCX0gY2F0Y2ggKElsbGVnYWxBcmd1bWVudEV4Y2VwdGlvbiBpZ25vcmUpIHsKLQkJCUxvZ2dlci5nZXRMb2dnZXIoKS5sb2coIldhcm5pbmc6IFBhcnNlciBkb2VzIG5vdCBzdXBwb3J0IFwiaHR0cDovL2FwYWNoZS5vcmcveG1sL2ZlYXR1cmVzL2FsbG93LWphdmEtZW5jb2RpbmdzXCIuIik7IC8vJE5PTi1OTFMtMSQKKwkJCUVjb3JlVXRpbGl0aWVzUGx1Z2luLmxvZ1dhcm5pbmcoIldhcm5pbmc6IFBhcnNlciBkb2VzIG5vdCBzdXBwb3J0IFwiaHR0cDovL2FwYWNoZS5vcmcveG1sL2ZlYXR1cmVzL2FsbG93LWphdmEtZW5jb2RpbmdzXCIuIik7IC8vJE5PTi1OTFMtMSQKIAkJfQogCQl0cnkgewogCQkJZGJmLnNldEF0dHJpYnV0ZSgiaHR0cDovL2FwYWNoZS5vcmcveG1sL2ZlYXR1cmVzL3ZhbGlkYXRpb24vc2NoZW1hIiwgbmV3IEJvb2xlYW4ob3B0aW9ucy5pc1ZhbGlkYXRlKCkpKTsgLy8kTk9OLU5MUy0xJAogCQl9IGNhdGNoIChJbGxlZ2FsQXJndW1lbnRFeGNlcHRpb24gaWdub3JlKSB7CiAJCQlkYmYuc2V0VmFsaWRhdGluZyhmYWxzZSk7Ci0JCQlMb2dnZXIuZ2V0TG9nZ2VyKCkubG9nKCJXYXJuaW5nOiBQYXJzZXIgZG9lcyBub3Qgc3VwcG9ydCBcImh0dHA6Ly9hcGFjaGUub3JnL3htbC9mZWF0dXJlcy92YWxpZGF0aW9uL3NjaGVtYVwiLiBWYWxpZGF0aW9uIHdpbGwgYmUgZGlzYWJsZWQuIik7IC8vJE5PTi1OTFMtMSQKKwkJCUVjb3JlVXRpbGl0aWVzUGx1Z2luLmxvZ1dhcm5pbmcoIldhcm5pbmc6IFBhcnNlciBkb2VzIG5vdCBzdXBwb3J0IFwiaHR0cDovL2FwYWNoZS5vcmcveG1sL2ZlYXR1cmVzL3ZhbGlkYXRpb24vc2NoZW1hXCIuIFZhbGlkYXRpb24gd2lsbCBiZSBkaXNhYmxlZC4iKTsgLy8kTk9OLU5MUy0xJAorCQl9CisJCXRyeSB7CisJCQlkYmYuc2V0QXR0cmlidXRlKCJodHRwOi8vYXBhY2hlLm9yZy94bWwvZmVhdHVyZXMvZG9tL2RlZmVyLW5vZGUtZXhwYW5zaW9uIiwgQm9vbGVhbi5GQUxTRSk7IC8vJE5PTi1OTFMtMSQKKwkJfSBjYXRjaCAoSWxsZWdhbEFyZ3VtZW50RXhjZXB0aW9uIGlnbm9yZSkgeworCQkJRWNvcmVVdGlsaXRpZXNQbHVnaW4ubG9nV2FybmluZygiV2FybmluZzogUGFyc2VyIGRvZXMgbm90IHN1cHBvcnQgXCJodHRwOi8vYXBhY2hlLm9yZy94bWwvZmVhdHVyZXMvZG9tL2RlZmVyLW5vZGUtZXhwYW5zaW9uXCIuIik7IC8vJE5PTi1OTFMtMSQKIAkJfQogCQlkYmYuc2V0RXhwYW5kRW50aXR5UmVmZXJlbmNlcyhvcHRpb25zLmlzRXhwYW5kRW50aXR5UmVmZXJlcmVuY2VzKCkpOwogCQlEb2N1bWVudEJ1aWxkZXIgcmVzdWx0ID0gZGJmLm5ld0RvY3VtZW50QnVpbGRlcigpOwpAQCAtNTI0LDcgKzUyOSw3IEBACiAJCQl9CiAKIAkJCXB1YmxpYyB2b2lkIHdhcm5pbmcoU0FYUGFyc2VFeGNlcHRpb24gYXJnMCkgdGhyb3dzIFNBWEV4Y2VwdGlvbiB7Ci0JCQkJTG9nZ2VyLmdldExvZ2dlcigpLmxvZ1dhcm5pbmcoYXJnMCk7CisJCQkJRWNvcmVVdGlsaXRpZXNQbHVnaW4ubG9nV2FybmluZyhhcmcwKTsKIAkJCX0KIAogCQl9KTsKZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbWYvd3RwZW1mL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW1mL3V0aWxpdGllcy9EYW5nbGluZ0hSRUZFeGNlcHRpb24uamF2YSBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbWYvd3RwZW1mL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW1mL3V0aWxpdGllcy9EYW5nbGluZ0hSRUZFeGNlcHRpb24uamF2YQppbmRleCBkZWJkMDA2Li45MjA3NzEwIDEwMDY0NAotLS0gYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW1mL3d0cGVtZi9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2VtZi91dGlsaXRpZXMvRGFuZ2xpbmdIUkVGRXhjZXB0aW9uLmphdmEKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVtZi93dHBlbWYvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbWYvdXRpbGl0aWVzL0RhbmdsaW5nSFJFRkV4Y2VwdGlvbi5qYXZhCkBAIC0yMCw2ICsyMCwxMSBAQAogcHVibGljIGNsYXNzIERhbmdsaW5nSFJFRkV4Y2VwdGlvbiBleHRlbmRzIEV4Y2VwdGlvbiB7CiAKIAorCS8qKgorCSAqIAorCSAqLworCXByaXZhdGUgc3RhdGljIGZpbmFsIGxvbmcgc2VyaWFsVmVyc2lvblVJRCA9IC0zMzY5MTI4NzQyODk5MjYzMzI3TDsKKwogCXB1YmxpYyBEYW5nbGluZ0hSRUZFeGNlcHRpb24oKSB7CiAJCXN1cGVyKCk7CiAJfQpkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVtZi93dHBlbWYvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbWYvdXRpbGl0aWVzL0RlZmF1bHRGZWF0dXJlVmFsdWVDb252ZXJ0ZXIuamF2YSBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbWYvd3RwZW1mL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW1mL3V0aWxpdGllcy9EZWZhdWx0RmVhdHVyZVZhbHVlQ29udmVydGVyLmphdmEKaW5kZXggZWE1NjY5Ny4uNzZlNTk2MiAxMDA2NDQKLS0tIGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVtZi93dHBlbWYvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbWYvdXRpbGl0aWVzL0RlZmF1bHRGZWF0dXJlVmFsdWVDb252ZXJ0ZXIuamF2YQorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW1mL3d0cGVtZi9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2VtZi91dGlsaXRpZXMvRGVmYXVsdEZlYXR1cmVWYWx1ZUNvbnZlcnRlci5qYXZhCkBAIC0zNDgsNyArMzQ4LDcgQEAKIAkgKiBAYVZhbHVlLgogCSAqLwogCXByb3RlY3RlZCBPYmplY3QgZmFpbGVkVG9Db252ZXJ0KE9iamVjdCBhVmFsdWUsIFN0cmluZyBhU3RyaW5nKSB7Ci0JCVN0cmluZyBlcnJvclN0cmluZyA9IGphdmEudGV4dC5NZXNzYWdlRm9ybWF0LmZvcm1hdChGQUlMRURfQ09OVkVSU0lPTl9QQVRURVJOLCBuZXcgU3RyaW5nW117YVZhbHVlLnRvU3RyaW5nKCksIGFTdHJpbmd9KTsKKwkJU3RyaW5nIGVycm9yU3RyaW5nID0gamF2YS50ZXh0Lk1lc3NhZ2VGb3JtYXQuZm9ybWF0KEZBSUxFRF9DT05WRVJTSU9OX1BBVFRFUk4sIG5ldyBPYmplY3RbXXthVmFsdWUudG9TdHJpbmcoKSwgYVN0cmluZ30pOwogCQl0aHJvdyBuZXcgRmVhdHVyZVZhbHVlQ29udmVyc2lvbkV4Y2VwdGlvbihlcnJvclN0cmluZyk7CiAJfQogfQpkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVtZi93dHBlbWYvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbWYvdXRpbGl0aWVzL0RlZmF1bHRPdmVycmlkYWJsZVJlc291cmNlRmFjdG9yeVJlZ2lzdHJ5LmphdmEgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW1mL3d0cGVtZi9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2VtZi91dGlsaXRpZXMvRGVmYXVsdE92ZXJyaWRhYmxlUmVzb3VyY2VGYWN0b3J5UmVnaXN0cnkuamF2YQppbmRleCA5MjdjMGE0Li40NTZlZGI1IDEwMDY0NAotLS0gYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW1mL3d0cGVtZi9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2VtZi91dGlsaXRpZXMvRGVmYXVsdE92ZXJyaWRhYmxlUmVzb3VyY2VGYWN0b3J5UmVnaXN0cnkuamF2YQorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW1mL3d0cGVtZi9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2VtZi91dGlsaXRpZXMvRGVmYXVsdE92ZXJyaWRhYmxlUmVzb3VyY2VGYWN0b3J5UmVnaXN0cnkuamF2YQpAQCAtMzYsMzEgKzM2LDMxIEBACiAJCXN1cGVyKCk7CiAJfQogCisJQE92ZXJyaWRlCiAJcHVibGljIFJlc291cmNlLkZhY3RvcnkgZ2V0RmFjdG9yeShVUkkgdXJpKSB7CiAJCXJldHVybiBnZXRGYWN0b3J5KHVyaSwgbnVsbCk7CiAJfQogCisJQE92ZXJyaWRlCiAJcHVibGljIFJlc291cmNlLkZhY3RvcnkgZ2V0RmFjdG9yeShVUkkgdXJpLCBTdHJpbmcgY29udGVudFR5cGUpCiAJewogCQlPYmplY3QgcmVzb3VyY2VGYWN0b3J5ID0gbnVsbDsKKwkJU3RyaW5nIHByb3RvY29sID0gdXJpLnNjaGVtZSgpOworCQlyZXNvdXJjZUZhY3RvcnkgPSBwcm90b2NvbFRvRmFjdG9yeU1hcC5nZXQocHJvdG9jb2wpOwogCQlpZiAocmVzb3VyY2VGYWN0b3J5ID09IG51bGwpIHsKLQkJCVN0cmluZyBwcm90b2NvbCA9IHVyaS5zY2hlbWUoKTsKLQkJCXJlc291cmNlRmFjdG9yeSA9IHByb3RvY29sVG9GYWN0b3J5TWFwLmdldChwcm90b2NvbCk7CisJCQlTdHJpbmcgZXh0ZW5zaW9uID0gdXJpLmZpbGVFeHRlbnNpb24oKTsKKwkJCXJlc291cmNlRmFjdG9yeSA9IGV4dGVuc2lvblRvRmFjdG9yeU1hcC5nZXQoZXh0ZW5zaW9uKTsKIAkJCWlmIChyZXNvdXJjZUZhY3RvcnkgPT0gbnVsbCkgewotCQkJCVN0cmluZyBleHRlbnNpb24gPSB1cmkuZmlsZUV4dGVuc2lvbigpOwotCQkJCXJlc291cmNlRmFjdG9yeSA9IGV4dGVuc2lvblRvRmFjdG9yeU1hcC5nZXQoZXh0ZW5zaW9uKTsKLQkJCQlpZiAocmVzb3VyY2VGYWN0b3J5ID09IG51bGwpIHsKLQkJCQkJcmVzb3VyY2VGYWN0b3J5ID0gZGVsZWdhdGVkR2V0RmFjdG9yeSh1cmkpOwotCQkJCQlpZiAocmVzb3VyY2VGYWN0b3J5ID09IEdMT0JBTF9GQUNUT1JZKSB7Ci0JCQkJCQlyZXNvdXJjZUZhY3RvcnkgPSBleHRlbnNpb25Ub0ZhY3RvcnlNYXAuZ2V0KFJlc291cmNlLkZhY3RvcnkuUmVnaXN0cnkuREVGQVVMVF9FWFRFTlNJT04pOwotCQkJCQkJaWYgKHJlc291cmNlRmFjdG9yeSA9PSBudWxsKQotCQkJCQkJCXJlc291cmNlRmFjdG9yeSA9IEdMT0JBTF9GQUNUT1JZOwotCQkJCQl9Ci0KKwkJCQlyZXNvdXJjZUZhY3RvcnkgPSBkZWxlZ2F0ZWRHZXRGYWN0b3J5KHVyaSk7CisJCQkJaWYgKHJlc291cmNlRmFjdG9yeSA9PSBHTE9CQUxfRkFDVE9SWSkgeworCQkJCQlyZXNvdXJjZUZhY3RvcnkgPSBleHRlbnNpb25Ub0ZhY3RvcnlNYXAuZ2V0KFJlc291cmNlLkZhY3RvcnkuUmVnaXN0cnkuREVGQVVMVF9FWFRFTlNJT04pOworCQkJCQlpZiAocmVzb3VyY2VGYWN0b3J5ID09IG51bGwpCisJCQkJCQlyZXNvdXJjZUZhY3RvcnkgPSBHTE9CQUxfRkFDVE9SWTsKIAkJCQl9CisKIAkJCX0KIAkJfQotCisJCQogCQlyZXR1cm4gcmVzb3VyY2VGYWN0b3J5IGluc3RhbmNlb2YgUmVzb3VyY2UuRmFjdG9yeS5EZXNjcmlwdG9yID8gKChSZXNvdXJjZS5GYWN0b3J5LkRlc2NyaXB0b3IpIHJlc291cmNlRmFjdG9yeSkuY3JlYXRlRmFjdG9yeSgpIDogKFJlc291cmNlLkZhY3RvcnkpIHJlc291cmNlRmFjdG9yeTsKIAl9CiAKQEAgLTY5LDYgKzY5LDcgQEAKIAkgKiAKIAkgKiBAc2VlIG9yZy5lY2xpcHNlLmVtZi5lY29yZS5yZXNvdXJjZS5pbXBsLlJlc291cmNlRmFjdG9yeVJlZ2lzdHJ5SW1wbCNkZWxlZ2F0ZWRHZXRGYWN0b3J5KG9yZy5lY2xpcHNlLmVtZi5jb21tb24udXRpbC5VUkkpCiAJICovCisJQE92ZXJyaWRlCiAJcHJvdGVjdGVkIEZhY3RvcnkgZGVsZWdhdGVkR2V0RmFjdG9yeShVUkkgdXJpKSB7CiAJCXJldHVybiBSZXNvdXJjZS5GYWN0b3J5LlJlZ2lzdHJ5LklOU1RBTkNFLmdldEZhY3RvcnkodXJpKTsKIAl9CmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW1mL3d0cGVtZi9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2VtZi91dGlsaXRpZXMvRXRvb2xzQ29weVNlc3Npb24uamF2YSBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbWYvd3RwZW1mL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW1mL3V0aWxpdGllcy9FdG9vbHNDb3B5U2Vzc2lvbi5qYXZhCmluZGV4IDAzMDgwNDEuLjFkZTk1MTMgMTAwNjQ0Ci0tLSBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbWYvd3RwZW1mL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW1mL3V0aWxpdGllcy9FdG9vbHNDb3B5U2Vzc2lvbi5qYXZhCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbWYvd3RwZW1mL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW1mL3V0aWxpdGllcy9FdG9vbHNDb3B5U2Vzc2lvbi5qYXZhCkBAIC00Niw2ICs0Niw3IEBACiAJICogCiAJICogQ29weSBSZXNvdXJjZXMgZmlyc3QgYW5kIHRoZW4gY29weSBSZWZPYmplY3RzLgogCSAqLworCUBPdmVycmlkZQogCXB1YmxpYyB2b2lkIGNvcHkoQ29weUdyb3VwIGFHcm91cCkgewogCQlpZiAoYUdyb3VwICE9IG51bGwpIHsKIAkJCWNvcHlSZXNvdXJjZXMoYUdyb3VwKTsKQEAgLTYwLDYgKzYxLDcgQEAKIAkgKiBUaGlzIG1ldGhvZCBzaG91bGQgYmUgdXNlZCBpZiB5b3UgYXJlIG9ubHkgZ29pbmcgdG8gY29weSA8Y29kZT5hUmVmT2JqZWN0PC9jb2RlPiBpbiB0aGlzCiAJICogY29weSBleGVjdXRpb24uCiAJICovCisJQE92ZXJyaWRlCiAJcHVibGljIEVPYmplY3QgY29weShFT2JqZWN0IGFSZWZPYmplY3QsIFN0cmluZyBpZFN1ZmZpeCkgewogCQlFT2JqZWN0IGNvcGllZCA9IGNvbnRhaW5tZW50Q29weShhUmVmT2JqZWN0LCBpZFN1ZmZpeCk7CiAJCWV4ZWN1dGVEZWZlcnJlZENvcHlBY3Rpb25zKCk7CkBAIC03MCw2ICs3Miw3IEBACiAJICogVGhpcyBtZXRob2Qgc2hvdWxkIGJlIHVzZWQgaWYgeW91IGFyZSBvbmx5IGdvaW5nIHRvIGNvcHkgPGNvZGU+YVJlZk9iamVjdDwvY29kZT4gaW4gdGhpcwogCSAqIGNvcHkgZXhlY3V0aW9uLiBUaGlzIG1ldGhvZCBvbmx5IGNvcGllcyA8Y29kZT5hUmVmT2JqZWN0PC9jb2RlPiBhdHRyaWJ1dGVzLgogCSAqLworCUBPdmVycmlkZQogCXB1YmxpYyBFT2JqZWN0IGNvcHlPYmplY3QoRU9iamVjdCBhUmVmT2JqZWN0LCBTdHJpbmcgaWRTdWZmaXgpIHsKIAkJRU9iamVjdCBjb3BpZWQgPSBjb250YWlubWVudENvcHlPYmplY3QoYVJlZk9iamVjdCwgaWRTdWZmaXgpOwogCQlleGVjdXRlRGVmZXJyZWRDb3B5QWN0aW9ucygpOwpAQCAtODAsNiArODMsNyBAQAogCSAqIFRoaXMgbWV0aG9kIHNob3VsZCBiZSB1c2VkIGlmIHlvdSBhcmUgb25seSBnb2luZyB0byBjb3B5IDxjb2RlPmFSZXNvdXJjZTwvY29kZT4gaW4gdGhpcwogCSAqIGNvcHkgZXhlY3V0aW9uLiBUaGUgY29waWVkIFJlc291cmNlIHdpbGwgaGF2ZSBhIFVSSSBlcXVhbCB0byA8Y29kZT5uZXdVcmk8L2NvZGU+LgogCSAqLworCUBPdmVycmlkZQogCXB1YmxpYyBSZXNvdXJjZSBjb3B5KFJlc291cmNlIGFSZXNvdXJjZSwgU3RyaW5nIG5ld1VyaSkgewogCQlSZXNvdXJjZSBjb3BpZWQgPSBjb250YWlubWVudENvcHkoYVJlc291cmNlLCBuZXdVcmkpOwogCQlleGVjdXRlRGVmZXJyZWRDb3B5QWN0aW9ucygpOwpAQCAtMTAzLDYgKzEwNyw3IEBACiAJICogQHNlZSBjb20uaWJtLmV0b29scy5lbWYuZWNvcmUudXRpbGl0aWVzLmNvcHkuRXRvb2xzQ29weVV0aWxpdHkjcHJpbUNvcHlPYmplY3QoRU9iamVjdCwKIAkgKiAgICAgIFN0cmluZykKIAkgKi8KKwlAT3ZlcnJpZGUKIAlwcm90ZWN0ZWQgRU9iamVjdCBwcmltQ29weU9iamVjdChFT2JqZWN0IGFSZWZPYmplY3QsIFN0cmluZyBpZFN1ZmZpeCkgewogCQlFT2JqZWN0IGNvcHkgPSBzdXBlci5wcmltQ29weU9iamVjdChhUmVmT2JqZWN0LCBpZFN1ZmZpeCk7CiAJCWNvcHlJZElmTmVjZXNzYXJ5KGFSZWZPYmplY3QsIGNvcHksIGlkU3VmZml4KTsKQEAgLTE0MCw2ICsxNDUsNyBAQAogCS8qKgogCSAqIFJldHVybiBhIGNhY2hlZCBjb3B5LgogCSAqLworCUBPdmVycmlkZQogCXB1YmxpYyBFT2JqZWN0IGdldENvcHkoRU9iamVjdCBhbk9iamVjdCkgewogCQlFT2JqZWN0IGNvcGllZCA9IHN1cGVyLmdldENvcHkoYW5PYmplY3QpOwogCQlpZiAoY29waWVkID09IG51bGwpCkBAIC0xNTksNiArMTY1LDcgQEAKIAkvKioKIAkgKiBSZXR1cm4gYW4gaW5zdGFuY2Ugb2YgRU9iamVjdCB0aGF0IGlzIHRoZSBzYW1lIHR5cGUgYXMgPGNvZGU+YVJlZk9iamVjdDwvY29kZT4uCiAJICovCisJQE92ZXJyaWRlCiAJcHVibGljIEVPYmplY3QgbmV3SW5zdGFuY2UoRU9iamVjdCBhUmVmT2JqZWN0KSB7CiAJCUVPYmplY3QgbmV3VHlwZSA9IHN1cGVyLm5ld0luc3RhbmNlKGFSZWZPYmplY3QpOwogCQluZXdUeXBlLmVTZXREZWxpdmVyKGZhbHNlKTsKQEAgLTE2OCw2ICsxNzUsNyBAQAogCS8qKgogCSAqIEBzZWUgY29tLmlibS5ldG9vbHMuZW1mLmVjb3JlLnV0aWxpdGllcy5jb3B5LkV0b29sc0NvcHlVdGlsaXR5I25ld0luc3RhbmNlKFJlc291cmNlLCBTdHJpbmcpCiAJICovCisJQE92ZXJyaWRlCiAJcHVibGljIFJlc291cmNlIG5ld0luc3RhbmNlKFJlc291cmNlIGFSZXNvdXJjZSwgU3RyaW5nIG5ld1VyaSkgewogCQlSZXNvdXJjZSBjb3B5ID0gc3VwZXIubmV3SW5zdGFuY2UoYVJlc291cmNlLCBuZXdVcmkpOwogCQlpZiAoYVJlc291cmNlIGluc3RhbmNlb2YgWE1MUmVzb3VyY2UpIHsKZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbWYvd3RwZW1mL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW1mL3V0aWxpdGllcy9FdG9vbHNDb3B5VXRpbGl0eS5qYXZhIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVtZi93dHBlbWYvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbWYvdXRpbGl0aWVzL0V0b29sc0NvcHlVdGlsaXR5LmphdmEKaW5kZXggMjJkOTFlMC4uYTg5YTdjNyAxMDA2NDQKLS0tIGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVtZi93dHBlbWYvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbWYvdXRpbGl0aWVzL0V0b29sc0NvcHlVdGlsaXR5LmphdmEKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVtZi93dHBlbWYvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbWYvdXRpbGl0aWVzL0V0b29sc0NvcHlVdGlsaXR5LmphdmEKQEAgLTUxLDYgKzUxLDcgQEAKIAkJCXN1cGVyKGFSZWZlcmVuY2UsIGFWYWx1ZSwgYVN1ZmZpeCwgYUNvcHlDb250YWluZXIpOwogCQl9CiAKKwkJQE92ZXJyaWRlCiAJCXB1YmxpYyB2b2lkIHBlcmZvcm1BY3Rpb24oKSB7CiAJCQlFT2JqZWN0IHZhbHVlID0gKEVPYmplY3QpIGdldFJlZmVyZW5jZVZhbHVlKCk7CiAJCQlnZXRDb3B5Q29udGFpbmVyKCkuZVNldChnZXRSZWZlcmVuY2UoKSwgZ2V0Q29weUlmRm91bmQodmFsdWUpKTsKQEAgLTYyLDYgKzYzLDcgQEAKIAkJCXN1cGVyKGFSZWZlcmVuY2UsIGFWYWx1ZSwgYVN1ZmZpeCwgYUNvcHlDb250YWluZXIpOwogCQl9CiAKKwkJQE92ZXJyaWRlCiAJCXB1YmxpYyB2b2lkIHBlcmZvcm1BY3Rpb24oKSB7CiAJCQlMaXN0IGNvcHlMaXN0ID0gKExpc3QpIGdldENvcHlDb250YWluZXIoKS5lR2V0KGdldFJlZmVyZW5jZSgpKTsKIAkJCUl0ZXJhdG9yIGl0ID0gKChMaXN0KSBnZXRSZWZlcmVuY2VWYWx1ZSgpKS5pdGVyYXRvcigpOwpAQCAtNTI5LDkgKzUzMSwxMCBAQAogCXB1YmxpYyBSZXNvdXJjZSBuZXdJbnN0YW5jZShSZXNvdXJjZSBhUmVzb3VyY2UsIFN0cmluZyBuZXdVcmkpIHsKIAkJaWYgKGFSZXNvdXJjZSA9PSBudWxsKQogCQkJcmV0dXJuIG51bGw7CisJCVN0cmluZyBpbm5lck5ld1VyaSA9IG5ld1VyaTsKIAkJUmVzb3VyY2UgbmV3UmVzb3VyY2U7CiAJCVN0cmluZyBvcmlnaW5hbFVyaSA9IGFSZXNvdXJjZS5nZXRVUkkoKS50b1N0cmluZygpOwotCQluZXdVcmkgPSBuZXdVcmkgPT0gbnVsbCA/IG9yaWdpbmFsVXJpIDogbmV3VXJpOworCQlpbm5lck5ld1VyaSA9IGlubmVyTmV3VXJpID09IG51bGwgPyBvcmlnaW5hbFVyaSA6IGlubmVyTmV3VXJpOwogCiAJCVJlc291cmNlLkZhY3RvcnkgZmFjdG9yeSA9IG51bGw7CiAJCWlmIChhUmVzb3VyY2UuZ2V0UmVzb3VyY2VTZXQoKSA9PSBudWxsKQpAQCAtNTQwLDcgKzU0Myw3IEBACiAJCQlmYWN0b3J5ID0gYVJlc291cmNlLmdldFJlc291cmNlU2V0KCkuZ2V0UmVzb3VyY2VGYWN0b3J5UmVnaXN0cnkoKS5nZXRGYWN0b3J5KFVSSS5jcmVhdGVVUkkob3JpZ2luYWxVcmkpKTsKIAogCi0JCW5ld1Jlc291cmNlID0gZmFjdG9yeS5jcmVhdGVSZXNvdXJjZShVUkkuY3JlYXRlVVJJKG5ld1VyaSkpOworCQluZXdSZXNvdXJjZSA9IGZhY3RvcnkuY3JlYXRlUmVzb3VyY2UoVVJJLmNyZWF0ZVVSSShpbm5lck5ld1VyaSkpOwogCQlyZXR1cm4gbmV3UmVzb3VyY2U7CiAJfQogCmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW1mL3d0cGVtZi9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2VtZi91dGlsaXRpZXMvRXh0ZW5kZWRFY29yZVV0aWwuamF2YSBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbWYvd3RwZW1mL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW1mL3V0aWxpdGllcy9FeHRlbmRlZEVjb3JlVXRpbC5qYXZhCmluZGV4IGU5Y2Y5MTQuLjgyM2YxOTEgMTAwNjQ0Ci0tLSBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbWYvd3RwZW1mL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW1mL3V0aWxpdGllcy9FeHRlbmRlZEVjb3JlVXRpbC5qYXZhCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbWYvd3RwZW1mL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW1mL3V0aWxpdGllcy9FeHRlbmRlZEVjb3JlVXRpbC5qYXZhCkBAIC0xMSwxMCArMTEsMTIgQEAKIHBhY2thZ2Ugb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5pbnRlcm5hbC5lbWYudXRpbGl0aWVzOwogCiBpbXBvcnQgamF2YS5pby5GaWxlTm90Rm91bmRFeGNlcHRpb247CitpbXBvcnQgamF2YS51dGlsLkNvbGxlY3Rpb247CiBpbXBvcnQgamF2YS51dGlsLkl0ZXJhdG9yOwogaW1wb3J0IGphdmEudXRpbC5MaXN0OwogCiBpbXBvcnQgb3JnLmVjbGlwc2UuZW1mLmNvbW1vbi5ub3RpZnkuQWRhcHRlcjsKK2ltcG9ydCBvcmcuZWNsaXBzZS5lbWYuY29tbW9uLm5vdGlmeS5Ob3RpZmllcjsKIGltcG9ydCBvcmcuZWNsaXBzZS5lbWYuY29tbW9uLm5vdGlmeS5pbXBsLkJhc2ljTm90aWZpZXJJbXBsLkVBZGFwdGVyTGlzdDsKIGltcG9ydCBvcmcuZWNsaXBzZS5lbWYuY29tbW9uLnV0aWwuVVJJOwogaW1wb3J0IG9yZy5lY2xpcHNlLmVtZi5jb21tb24udXRpbC5XcmFwcGVkRXhjZXB0aW9uOwpAQCAtMzQsNyArMzYsODAgQEAKIAlwcml2YXRlIHN0YXRpYyBGaWxlTm90Rm91bmREZXRlY3RvciBGSUxFX05PVF9GT1VORF9ERVRFQ1RPUjsKIAlwcml2YXRlIHN0YXRpYyBTdHJpbmcgTkFNRV9BVFRSSUJVVEVfU1RSSU5HID0gIm5hbWUiOyAvLyROT04tTkxTLTEkCiAKKwlwdWJsaWMgc3RhdGljIGNsYXNzIEVTeW5jaHJvbml6ZWRBZGFwdGVyTGlzdCBleHRlbmRzIEVBZGFwdGVyTGlzdAorCSAgewogCisJICAgIC8qKgorCQkgKiAKKwkJICovCisJCXByaXZhdGUgc3RhdGljIGZpbmFsIGxvbmcgc2VyaWFsVmVyc2lvblVJRCA9IDc4NTU0MzgzMzkxODc1NDA3MThMOworCisJCXB1YmxpYyBFU3luY2hyb25pemVkQWRhcHRlckxpc3QoTm90aWZpZXIgbm90aWZpZXIpIHsKKwkJCXN1cGVyKG5vdGlmaWVyKTsKKwkJfQorCisJCUBPdmVycmlkZQorCQlwdWJsaWMgc3luY2hyb25pemVkIGJvb2xlYW4gYWRkKE9iamVjdCBvYmplY3QpCisJICAgIHsKKwkgICAgcmV0dXJuIHN1cGVyLmFkZChvYmplY3QpOworCSAgICB9CisKKwkgICAgQE92ZXJyaWRlCisJCXB1YmxpYyBzeW5jaHJvbml6ZWQgdm9pZCBhZGQoaW50IGluZGV4LCBPYmplY3Qgb2JqZWN0KQorCSAgICB7CisJICAgIHN1cGVyLmFkZChpbmRleCwgb2JqZWN0KTsKKwkgICAgfQorCisJICAgIEBPdmVycmlkZQorCQlwdWJsaWMgc3luY2hyb25pemVkIGJvb2xlYW4gYWRkQWxsKENvbGxlY3Rpb24gY29sbGVjdGlvbikKKwkgICAgeworCSAgICByZXR1cm4gc3VwZXIuYWRkQWxsKGNvbGxlY3Rpb24pOworCSAgICB9CisKKwkgICAgQE92ZXJyaWRlCisJCXB1YmxpYyBzeW5jaHJvbml6ZWQgYm9vbGVhbiByZW1vdmUoT2JqZWN0IG9iamVjdCkKKwkgICAgeworCSAgICByZXR1cm4gc3VwZXIucmVtb3ZlKG9iamVjdCk7CisJICAgIH0KKworCSAgICBAT3ZlcnJpZGUKKwkJcHVibGljIHN5bmNocm9uaXplZCBPYmplY3QgcmVtb3ZlKGludCBpbmRleCkKKwkgICAgeworCSAgICByZXR1cm4gc3VwZXIucmVtb3ZlKGluZGV4KTsKKwkgICAgfQorCisJICAgIEBPdmVycmlkZQorCQlwdWJsaWMgc3luY2hyb25pemVkIGJvb2xlYW4gcmVtb3ZlQWxsKENvbGxlY3Rpb24gY29sbGVjdGlvbikKKwkgICAgeworCSAgICByZXR1cm4gc3VwZXIucmVtb3ZlQWxsKGNvbGxlY3Rpb24pOworCSAgICB9CisKKwkgICAgQE92ZXJyaWRlCisJCXB1YmxpYyBzeW5jaHJvbml6ZWQgdm9pZCBjbGVhcigpCisJICAgIHsKKwkgICAgIHN1cGVyLmNsZWFyKCk7CisJICAgIH0KKworCisJICAgIEBPdmVycmlkZQorCQlwdWJsaWMgc3luY2hyb25pemVkIE9iamVjdCBzZXQoaW50IGluZGV4LCBPYmplY3Qgb2JqZWN0KQorCSAgICB7CisJICAgIHJldHVybiBzdXBlci5zZXQoaW5kZXgsIG9iamVjdCk7CisJICAgIH0KKworCSAgICBAT3ZlcnJpZGUKKwkJcHVibGljIHN5bmNocm9uaXplZCB2b2lkIG1vdmUoaW50IG5ld1Bvc2l0aW9uLCBPYmplY3Qgb2JqZWN0KQorCSAgICB7CisJICAgIHN1cGVyLm1vdmUobmV3UG9zaXRpb24sIG9iamVjdCk7CisJICAgIH0KKworCSAgICBAT3ZlcnJpZGUKKwkJcHVibGljIHN5bmNocm9uaXplZCBPYmplY3QgbW92ZShpbnQgbmV3UG9zaXRpb24sIGludCBvbGRQb3NpdGlvbikKKwkgICAgeworCSAgICByZXR1cm4gc3VwZXIubW92ZShuZXdQb3NpdGlvbiwgb2xkUG9zaXRpb24pOworCSAgICB9CisJICB9CisJCiAJcHVibGljIGludGVyZmFjZSBGaWxlTm90Rm91bmREZXRlY3RvciB7CiAJCWJvb2xlYW4gaXNGaWxlTm90Rm91bmQoV3JhcHBlZEV4Y2VwdGlvbiB3cmFwcGVkRXgpOwogCX0KQEAgLTcxLDEwICsxNDYsMTEgQEAKIAogCXB1YmxpYyBzdGF0aWMgdm9pZCBlU2V0T3JBZGQoRU9iamVjdCBvYmosIEVTdHJ1Y3R1cmFsRmVhdHVyZSBmZWF0dXJlLCBPYmplY3QgdmFsdWUsIGludCBuZXdJbmRleCkgewogCQlpZiAoZmVhdHVyZS5pc01hbnkoKSAmJiB2YWx1ZSAhPSBudWxsKSB7Ci0JCQlpZiAobmV3SW5kZXggPj0gMCkKLQkJCQkoKExpc3QpIG9iai5lR2V0KGZlYXR1cmUpKS5hZGQobmV3SW5kZXgsIHZhbHVlKTsKKwkJCUxpc3QgZmVhdHVyZUxpc3QgPSAoKExpc3QpIG9iai5lR2V0KGZlYXR1cmUpKTsKKwkJCWlmIChuZXdJbmRleCA+PSAwICYmIG5ld0luZGV4IDwgZmVhdHVyZUxpc3Quc2l6ZSgpKQorCQkJCWZlYXR1cmVMaXN0LmFkZChuZXdJbmRleCwgdmFsdWUpOwogCQkJZWxzZQotCQkJCSgoTGlzdCkgb2JqLmVHZXQoZmVhdHVyZSkpLmFkZCh2YWx1ZSk7CisJCQkJZmVhdHVyZUxpc3QuYWRkKHZhbHVlKTsKIAkJfSBlbHNlIHsKIAkJCW9iai5lU2V0KGZlYXR1cmUsIHZhbHVlKTsKIAkJfQpAQCAtMTk0LDcgKzI3MCw3IEBACiAJCVJlc291cmNlIHJlcyA9IHJvb3QuZVJlc291cmNlKCk7CiAJCUVPYmplY3QgY29udGFpbmVyID0gcm9vdC5lQ29udGFpbmVyKCk7CiAJCS8qIE1ha2luZyBzdXJlIHRoZSBwcm94eSBpcyBjcmVhdGVkIGZpcnN0IGJlZm9yZSB1bmxvYWRpbmcgKi8KLQkJaWYgKHJvb3QgIT0gbnVsbCAmJiByZXMgIT0gbnVsbCkKKwkJaWYgKHJlcyAhPSBudWxsKQogCQkJYmVjb21lUHJveHkocm9vdCwgcmVzKTsKIAkJaWYgKGNvbnRhaW5lciA9PSBudWxsKQogCQkJaWYgKHJlcyAhPSBudWxsKQpkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVtZi93dHBlbWYvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbWYvdXRpbGl0aWVzL0ZlYXR1cmVWYWx1ZUNvbnZlcnNpb25FeGNlcHRpb24uamF2YSBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbWYvd3RwZW1mL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW1mL3V0aWxpdGllcy9GZWF0dXJlVmFsdWVDb252ZXJzaW9uRXhjZXB0aW9uLmphdmEKaW5kZXggMDUyNWExZi4uMzhjMjRkMSAxMDA2NDQKLS0tIGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVtZi93dHBlbWYvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbWYvdXRpbGl0aWVzL0ZlYXR1cmVWYWx1ZUNvbnZlcnNpb25FeGNlcHRpb24uamF2YQorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW1mL3d0cGVtZi9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2VtZi91dGlsaXRpZXMvRmVhdHVyZVZhbHVlQ29udmVyc2lvbkV4Y2VwdGlvbi5qYXZhCkBAIC0xMSw2ICsxMSwxMSBAQAogcHVibGljIGNsYXNzIEZlYXR1cmVWYWx1ZUNvbnZlcnNpb25FeGNlcHRpb24gZXh0ZW5kcyBSdW50aW1lRXhjZXB0aW9uIHsKIAogCS8qKgorCSAqIAorCSAqLworCXByaXZhdGUgc3RhdGljIGZpbmFsIGxvbmcgc2VyaWFsVmVyc2lvblVJRCA9IDgxOTA4OTE2NDgzMzM4MTQyMDFMOworCisJLyoqCiAJICogQ29uc3RydWN0b3IgZm9yIEZlYXR1cmVWYWx1ZUNvbnZlcnNpb25FeGNlcHRpb24uCiAJICovCiAJcHVibGljIEZlYXR1cmVWYWx1ZUNvbnZlcnNpb25FeGNlcHRpb24oKSB7CmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW1mL3d0cGVtZi9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2VtZi91dGlsaXRpZXMvSURVdGlsLmphdmEgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW1mL3d0cGVtZi9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2VtZi91dGlsaXRpZXMvSURVdGlsLmphdmEKaW5kZXggMzg4OTg2Yy4uMmFhMDIyYyAxMDA2NDQKLS0tIGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVtZi93dHBlbWYvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbWYvdXRpbGl0aWVzL0lEVXRpbC5qYXZhCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbWYvd3RwZW1mL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW1mL3V0aWxpdGllcy9JRFV0aWwuamF2YQpAQCAtNTIsMTQgKzUyLDE1IEBACiAJfQogCiAJcHJvdGVjdGVkIHN0YXRpYyBTdHJpbmcgZW5zdXJlVW5pcXVlSUQoWE1MUmVzb3VyY2UgYVJlc291cmNlLCBTdHJpbmcgYmFzZUlETmFtZSkgewotCQliYXNlSUROYW1lICs9ICJfIjsgLy8kTk9OLU5MUy0xJAorCQlTdHJpbmcgaW5uZXJCYXNlSUROYW1lID0gYmFzZUlETmFtZTsKKwkJaW5uZXJCYXNlSUROYW1lICs9ICJfIjsgLy8kTk9OLU5MUy0xJAogCQkvL0NoYW5nZSB0byB1c2UgdGhlIGN1cnJlbnQgdGltZSBpbnN0ZWFkIG9mIGluY3JlbWVudGFsIG51bWJlcnMgdG8gaGVscAogCQkvL3N1cHBvcnQgdGVhbSBkZXZlbG9wbWVudC4KIAkJbG9uZyBjdXJyZW50VGltZSA9IFN5c3RlbS5jdXJyZW50VGltZU1pbGxpcygpOwotCQlTdHJpbmcgaWQgPSBiYXNlSUROYW1lICsgY3VycmVudFRpbWU7CisJCVN0cmluZyBpZCA9IGlubmVyQmFzZUlETmFtZSArIGN1cnJlbnRUaW1lOwogCQl3aGlsZSAoYVJlc291cmNlLmdldEVPYmplY3QoaWQpICE9IG51bGwpIHsKIAkJCSsrY3VycmVudFRpbWU7Ci0JCQlpZCA9IGJhc2VJRE5hbWUgKyBjdXJyZW50VGltZTsKKwkJCWlkID0gaW5uZXJCYXNlSUROYW1lICsgY3VycmVudFRpbWU7CiAJCX0KIAkJcmV0dXJuIGlkOwogCX0KZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbWYvd3RwZW1mL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW1mL3V0aWxpdGllcy9JbnZhbGlkUGFzc3dvcmRDaXBoZXJFeGNlcHRpb24uamF2YSBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbWYvd3RwZW1mL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW1mL3V0aWxpdGllcy9JbnZhbGlkUGFzc3dvcmRDaXBoZXJFeGNlcHRpb24uamF2YQppbmRleCA1ZmY1MTNiLi4xOGI4ZDE0IDEwMDY0NAotLS0gYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW1mL3d0cGVtZi9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2VtZi91dGlsaXRpZXMvSW52YWxpZFBhc3N3b3JkQ2lwaGVyRXhjZXB0aW9uLmphdmEKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVtZi93dHBlbWYvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbWYvdXRpbGl0aWVzL0ludmFsaWRQYXNzd29yZENpcGhlckV4Y2VwdGlvbi5qYXZhCkBAIC0xMiw1ICsxMiwxMCBAQAogaW1wb3J0IG9yZy5vbWcuQ09SQkEuVXNlckV4Y2VwdGlvbjsKIAogcHVibGljIGNsYXNzIEludmFsaWRQYXNzd29yZENpcGhlckV4Y2VwdGlvbiBleHRlbmRzIFVzZXJFeGNlcHRpb24geworCisJLyoqCisJICogCisJICovCisJcHJpdmF0ZSBzdGF0aWMgZmluYWwgbG9uZyBzZXJpYWxWZXJzaW9uVUlEID0gLTE4Nzg1NzQ0MDEwMjE1OTA1NDVMOwogfQogCmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW1mL3d0cGVtZi9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2VtZi91dGlsaXRpZXMvSW52YWxpZFBhc3N3b3JkRGVjb2RpbmdFeGNlcHRpb24uamF2YSBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbWYvd3RwZW1mL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW1mL3V0aWxpdGllcy9JbnZhbGlkUGFzc3dvcmREZWNvZGluZ0V4Y2VwdGlvbi5qYXZhCmluZGV4IDJlMTY4MDguLjE2MWMwNjkgMTAwNjQ0Ci0tLSBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbWYvd3RwZW1mL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW1mL3V0aWxpdGllcy9JbnZhbGlkUGFzc3dvcmREZWNvZGluZ0V4Y2VwdGlvbi5qYXZhCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbWYvd3RwZW1mL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW1mL3V0aWxpdGllcy9JbnZhbGlkUGFzc3dvcmREZWNvZGluZ0V4Y2VwdGlvbi5qYXZhCkBAIC0xMiw1ICsxMiwxMCBAQAogaW1wb3J0IG9yZy5vbWcuQ09SQkEuVXNlckV4Y2VwdGlvbjsKIAogcHVibGljIGNsYXNzIEludmFsaWRQYXNzd29yZERlY29kaW5nRXhjZXB0aW9uIGV4dGVuZHMgVXNlckV4Y2VwdGlvbiB7CisKKwkvKioKKwkgKiAKKwkgKi8KKwlwcml2YXRlIHN0YXRpYyBmaW5hbCBsb25nIHNlcmlhbFZlcnNpb25VSUQgPSA2MjExOTQyODUzNzk2ODIzODQwTDsKIH0KIApkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVtZi93dHBlbWYvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbWYvdXRpbGl0aWVzL0ludmFsaWRQYXNzd29yZEVuY29kaW5nRXhjZXB0aW9uLmphdmEgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW1mL3d0cGVtZi9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2VtZi91dGlsaXRpZXMvSW52YWxpZFBhc3N3b3JkRW5jb2RpbmdFeGNlcHRpb24uamF2YQppbmRleCBkZDg4MmQ3Li5hMDNlNjUzIDEwMDY0NAotLS0gYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW1mL3d0cGVtZi9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2VtZi91dGlsaXRpZXMvSW52YWxpZFBhc3N3b3JkRW5jb2RpbmdFeGNlcHRpb24uamF2YQorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW1mL3d0cGVtZi9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2VtZi91dGlsaXRpZXMvSW52YWxpZFBhc3N3b3JkRW5jb2RpbmdFeGNlcHRpb24uamF2YQpAQCAtMTIsNSArMTIsMTAgQEAKIGltcG9ydCBvcmcub21nLkNPUkJBLlVzZXJFeGNlcHRpb247CiAKIHB1YmxpYyBjbGFzcyBJbnZhbGlkUGFzc3dvcmRFbmNvZGluZ0V4Y2VwdGlvbiBleHRlbmRzIFVzZXJFeGNlcHRpb24geworCisJLyoqCisJICogCisJICovCisJcHJpdmF0ZSBzdGF0aWMgZmluYWwgbG9uZyBzZXJpYWxWZXJzaW9uVUlEID0gLTEzMjA3NTk3NTI3MDY4OTgwOTVMOwogfQogCmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW1mL3d0cGVtZi9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2VtZi91dGlsaXRpZXMvSXNMb2FkaW5nUHJveHlBZGFwdGVyLmphdmEgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW1mL3d0cGVtZi9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2VtZi91dGlsaXRpZXMvSXNMb2FkaW5nUHJveHlBZGFwdGVyLmphdmEKaW5kZXggYTc1Yjg2NS4uYjUyZmU4YSAxMDA2NDQKLS0tIGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVtZi93dHBlbWYvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbWYvdXRpbGl0aWVzL0lzTG9hZGluZ1Byb3h5QWRhcHRlci5qYXZhCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbWYvd3RwZW1mL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW1mL3V0aWxpdGllcy9Jc0xvYWRpbmdQcm94eUFkYXB0ZXIuamF2YQpAQCAtNDMsNiArNDMsNyBAQAogCSAqIAogCSAqIEBzZWUgb3JnLmVjbGlwc2UuZW1mLmNvbW1vbi5ub3RpZnkuaW1wbC5BZGFwdGVySW1wbCNub3RpZnlDaGFuZ2VkKG9yZy5lY2xpcHNlLmVtZi5jb21tb24ubm90aWZ5Lk5vdGlmaWNhdGlvbikKIAkgKi8KKwlAT3ZlcnJpZGUKIAlwdWJsaWMgdm9pZCBub3RpZnlDaGFuZ2VkKE5vdGlmaWNhdGlvbiBtc2cpIHsKIAkJaWYgKHJlc291cmNlICE9IG51bGwpIHsKIAkJCS8vbGlzdGVuIGZvciB0aGUgcmVtb3ZlIG9mIHRoZSBsb2FkaW5nIGFkYXB0ZXIKZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbWYvd3RwZW1mL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW1mL3V0aWxpdGllcy9OYW1lc3BhY2VBZGFwdGVyLmphdmEgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW1mL3d0cGVtZi9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2VtZi91dGlsaXRpZXMvTmFtZXNwYWNlQWRhcHRlci5qYXZhCmluZGV4IDBiZGFjNzYuLjc4ODkyZmEgMTAwNjQ0Ci0tLSBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbWYvd3RwZW1mL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW1mL3V0aWxpdGllcy9OYW1lc3BhY2VBZGFwdGVyLmphdmEKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVtZi93dHBlbWYvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbWYvdXRpbGl0aWVzL05hbWVzcGFjZUFkYXB0ZXIuamF2YQpAQCAtNTcsNiArNTcsNyBAQAogCQkgKiAKIAkJICogQHNlZSBvcmcuZWNsaXBzZS5lbWYuY29tbW9uLm5vdGlmeS5pbXBsLk5vdGlmaWNhdGlvbkltcGwjZ2V0RmVhdHVyZSgpCiAJCSAqLworCQlAT3ZlcnJpZGUKIAkJcHVibGljIE9iamVjdCBnZXRGZWF0dXJlKCkgewogCQkJcmV0dXJuIE5PVElGSUNBVElPTl9GRUFUVVJFOwogCQl9CkBAIC0xNjksNiArMTcwLDcgQEAKIAkgKiAKIAkgKiBAc2VlIG9yZy5lY2xpcHNlLmVtZi5jb21tb24ubm90aWZ5LmltcGwuQWRhcHRlckltcGwjaXNBZGFwdGVyRm9yVHlwZShqYXZhLmxhbmcuT2JqZWN0KQogCSAqLworCUBPdmVycmlkZQogCXB1YmxpYyBib29sZWFuIGlzQWRhcHRlckZvclR5cGUoT2JqZWN0IHR5cGUpIHsKIAkJcmV0dXJuIEFEQVBURVJfVFlQRS5lcXVhbHModHlwZSk7CiAJfQpAQCAtMTkxLDYgKzE5Myw3IEBACiAJICogCiAJICogQHNlZSBjb20uaWJtLmV0b29scy5lbWYuZWNvcmUudXRpbGl0aWVzLkNsb25lYWJsZVB1YmxpYyNjbG9uZSgpCiAJICovCisJQE92ZXJyaWRlCiAJcHVibGljIE9iamVjdCBjbG9uZSgpIHsKIAkJTmFtZXNwYWNlQWRhcHRlciByZXN1bHQgPSBuZXcgTmFtZXNwYWNlQWRhcHRlcigpOwogCQlpZiAoaGFzTmFtZXNwYWNlcygpKSB7CmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW1mL3d0cGVtZi9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2VtZi91dGlsaXRpZXMvUGFzc3RocnVFbmNvZGVyRGVjb2Rlci5qYXZhIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVtZi93dHBlbWYvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbWYvdXRpbGl0aWVzL1Bhc3N0aHJ1RW5jb2RlckRlY29kZXIuamF2YQppbmRleCBlNjg0MDU5Li5kODY3N2ViIDEwMDY0NAotLS0gYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW1mL3d0cGVtZi9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2VtZi91dGlsaXRpZXMvUGFzc3RocnVFbmNvZGVyRGVjb2Rlci5qYXZhCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbWYvd3RwZW1mL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW1mL3V0aWxpdGllcy9QYXNzdGhydUVuY29kZXJEZWNvZGVyLmphdmEKQEAgLTE0LDcgKzE0LDcgQEAKIC8qKgogICogQSBwYXNzdGhydSBFbmNvZGVyRGVjb2RlciBpbXBsZW1lbnRhdGlvbgogICovCi1wdWJsaWMgY2xhc3MgUGFzc3RocnVFbmNvZGVyRGVjb2RlciBleHRlbmRzIEVuY29kZXJEZWNvZGVyQWRhcHRlciBpbXBsZW1lbnRzIEVuY29kZXJEZWNvZGVyIHsKK3B1YmxpYyBjbGFzcyBQYXNzdGhydUVuY29kZXJEZWNvZGVyIGV4dGVuZHMgRW5jb2RlckRlY29kZXJBZGFwdGVyIHsKIAlwdWJsaWMgc3RhdGljIGZpbmFsIFBhc3N0aHJ1RW5jb2RlckRlY29kZXIgSU5TVEFOQ0UgPSBuZXcgUGFzc3RocnVFbmNvZGVyRGVjb2RlcigpOwogCXB1YmxpYyBzdGF0aWMgZmluYWwgU3RyaW5nIEtFWSA9IFBhc3N0aHJ1RW5jb2RlckRlY29kZXIuY2xhc3MuZ2V0TmFtZSgpOwogCkBAIC0yOCw2ICsyOCw3IEBACiAJLyoqCiAJICogUmV0dXJucyBhIGRlY29kZWQgdmVyc2lvbiBvZiB0aGUgdmFsdWUuCiAJICovCisJQE92ZXJyaWRlCiAJcHVibGljIFN0cmluZyBkZWNvZGUoU3RyaW5nIHZhbHVlKSB7CiAJCXJldHVybiB2YWx1ZTsKIAl9CkBAIC0zNSw2ICszNiw3IEBACiAJLyoqCiAJICogUmV0dXJucyBhbiBlbmNvZGVkIHZlcnNpb24gb2YgdGhlIHZhbHVlLgogCSAqLworCUBPdmVycmlkZQogCXB1YmxpYyBTdHJpbmcgZW5jb2RlKFN0cmluZyB2YWx1ZSkgewogCQlyZXR1cm4gdmFsdWU7CiAJfQpkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVtZi93dHBlbWYvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbWYvdXRpbGl0aWVzL1Bhc3N3b3JkRW5jb2RlckRlY29kZXIuamF2YSBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbWYvd3RwZW1mL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW1mL3V0aWxpdGllcy9QYXNzd29yZEVuY29kZXJEZWNvZGVyLmphdmEKaW5kZXggMmM4MmNlZC4uMTMzNGVmYiAxMDA2NDQKLS0tIGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVtZi93dHBlbWYvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbWYvdXRpbGl0aWVzL1Bhc3N3b3JkRW5jb2RlckRlY29kZXIuamF2YQorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW1mL3d0cGVtZi9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2VtZi91dGlsaXRpZXMvUGFzc3dvcmRFbmNvZGVyRGVjb2Rlci5qYXZhCkBAIC04LDE2ICs4LDE4IEBACiAgKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKiovCiBwYWNrYWdlIG9yZy5lY2xpcHNlLndzdC5jb21tb24uaW50ZXJuYWwuZW1mLnV0aWxpdGllczsKIAotcHVibGljIGNsYXNzIFBhc3N3b3JkRW5jb2RlckRlY29kZXIgZXh0ZW5kcyBFbmNvZGVyRGVjb2RlckFkYXB0ZXIgaW1wbGVtZW50cyBFbmNvZGVyRGVjb2RlciB7CitwdWJsaWMgY2xhc3MgUGFzc3dvcmRFbmNvZGVyRGVjb2RlciBleHRlbmRzIEVuY29kZXJEZWNvZGVyQWRhcHRlciB7CiAJcHVibGljIHN0YXRpYyBmaW5hbCBTdHJpbmcgS0VZID0gInBhc3N3b3JkLXNlY3VyaXR5LWNvZGVyIjsgLy8kTk9OLU5MUy0xJAogCiAJcHVibGljIFBhc3N3b3JkRW5jb2RlckRlY29kZXIoKSB7CiAJfQogCisJQE92ZXJyaWRlCiAJcHVibGljIFN0cmluZyBkZWNvZGUoU3RyaW5nIHMpIHsKIAkJcmV0dXJuIFBhc3N3b3JkVXRpbC5wYXNzd29yZERlY29kZShzKTsKIAl9CiAKKwlAT3ZlcnJpZGUKIAlwdWJsaWMgU3RyaW5nIGVuY29kZShTdHJpbmcgcykgewogCQlyZXR1cm4gUGFzc3dvcmRVdGlsLnBhc3N3b3JkRW5jb2RlKHMpOwogCX0KZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbWYvd3RwZW1mL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW1mL3V0aWxpdGllcy9QYXNzd29yZFV0aWwuamF2YSBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbWYvd3RwZW1mL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW1mL3V0aWxpdGllcy9QYXNzd29yZFV0aWwuamF2YQppbmRleCAwMTJmMmMyLi5hNDZhOTdjIDEwMDY0NAotLS0gYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW1mL3d0cGVtZi9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2VtZi91dGlsaXRpZXMvUGFzc3dvcmRVdGlsLmphdmEKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVtZi93dHBlbWYvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbWYvdXRpbGl0aWVzL1Bhc3N3b3JkVXRpbC5qYXZhCkBAIC02MCwxNSArNjAsMTYgQEAKIAogCXB1YmxpYyBzdGF0aWMgU3RyaW5nIGdldENyeXB0b0FsZ29yaXRobShTdHJpbmcgcykgewogCQlTdHJpbmcgczEgPSBudWxsOwotCQlpZiAocyAhPSBudWxsKSB7Ci0JCQlzID0gcy50cmltKCk7Ci0JCQlpZiAocy5sZW5ndGgoKSA+PSAyKSB7Ci0JCQkJaW50IGkgPSBzLmluZGV4T2YoInsiKTsgLy8kTk9OLU5MUy0xJAorCQlTdHJpbmcgaW5uZXJTID0gczsKKwkJaWYgKGlubmVyUyAhPSBudWxsKSB7CisJCQlpbm5lclMgPSBpbm5lclMudHJpbSgpOworCQkJaWYgKGlubmVyUy5sZW5ndGgoKSA+PSAyKSB7CisJCQkJaW50IGkgPSBpbm5lclMuaW5kZXhPZigieyIpOyAvLyROT04tTkxTLTEkCiAJCQkJaWYgKGkgPT0gMCkgewotCQkJCQlpbnQgaiA9IHMuaW5kZXhPZigifSIsICsraSk7IC8vJE5PTi1OTFMtMSQKKwkJCQkJaW50IGogPSBpbm5lclMuaW5kZXhPZigifSIsICsraSk7IC8vJE5PTi1OTFMtMSQKIAkJCQkJaWYgKGogPiAwKQogCQkJCQkJaWYgKGkgPCBqKQotCQkJCQkJCXMxID0gcy5zdWJzdHJpbmcoaSwgaikudHJpbSgpOworCQkJCQkJCXMxID0gaW5uZXJTLnN1YnN0cmluZyhpLCBqKS50cmltKCk7CiAJCQkJCQllbHNlCiAJCQkJCQkJczEgPSBFTVBUWV9TVFJJTkc7CiAJCQkJfQpAQCAtOTEsMTIgKzkyLDEzIEBACiAJfQogCiAJcHVibGljIHN0YXRpYyBib29sZWFuIGlzVmFsaWRDcnlwdG9BbGdvcml0aG0oU3RyaW5nIHMpIHsKLQkJaWYgKHMgIT0gbnVsbCkgewotCQkJcyA9IHMudHJpbSgpOwotCQkJaWYgKHMubGVuZ3RoKCkgPT0gMCkKKwkJU3RyaW5nIGlubmVyUyA9IHM7CisJCWlmIChpbm5lclMgIT0gbnVsbCkgeworCQkJaW5uZXJTID0gaW5uZXJTLnRyaW0oKTsKKwkJCWlmIChpbm5lclMubGVuZ3RoKCkgPT0gMCkKIAkJCQlyZXR1cm4gdHJ1ZTsKIAkJCWZvciAoaW50IGkgPSAwOyBpIDwgU1VQUE9SVEVEX0NSWVBUT19BTEdPUklUSE1TLmxlbmd0aDsgaSsrKQotCQkJCWlmIChzLmVxdWFsc0lnbm9yZUNhc2UoU1VQUE9SVEVEX0NSWVBUT19BTEdPUklUSE1TW2ldKSkKKwkJCQlpZiAoaW5uZXJTLmVxdWFsc0lnbm9yZUNhc2UoU1VQUE9SVEVEX0NSWVBUT19BTEdPUklUSE1TW2ldKSkKIAkJCQkJcmV0dXJuIHRydWU7CiAJCX0KIAkJcmV0dXJuIGZhbHNlOwpAQCAtMTM3LDE1ICsxMzksMTYgQEAKIAogCXB1YmxpYyBzdGF0aWMgU3RyaW5nIHJlbW92ZUNyeXB0b0FsZ29yaXRobVRhZyhTdHJpbmcgcykgewogCQlTdHJpbmcgczEgPSBudWxsOwotCQlpZiAocyAhPSBudWxsKSB7Ci0JCQlzID0gcy50cmltKCk7Ci0JCQlpZiAocy5sZW5ndGgoKSA+PSAyKSB7Ci0JCQkJaW50IGkgPSBzLmluZGV4T2YoInsiKTsgLy8kTk9OLU5MUy0xJAorCQlTdHJpbmcgaW5uZXJTID0gczsKKwkJaWYgKGlubmVyUyAhPSBudWxsKSB7CisJCQlpbm5lclMgPSBpbm5lclMudHJpbSgpOworCQkJaWYgKGlubmVyUy5sZW5ndGgoKSA+PSAyKSB7CisJCQkJaW50IGkgPSBpbm5lclMuaW5kZXhPZigieyIpOyAvLyROT04tTkxTLTEkCiAJCQkJaWYgKGkgPT0gMCkgewotCQkJCQlpbnQgaiA9IHMuaW5kZXhPZigifSIsICsraSk7IC8vJE5PTi1OTFMtMSQKKwkJCQkJaW50IGogPSBpbm5lclMuaW5kZXhPZigifSIsICsraSk7IC8vJE5PTi1OTFMtMSQKIAkJCQkJaWYgKGogPiAwKQotCQkJCQkJaWYgKCsraiA8IHMubGVuZ3RoKCkpCi0JCQkJCQkJczEgPSBzLnN1YnN0cmluZyhqKS50cmltKCk7CisJCQkJCQlpZiAoKytqIDwgaW5uZXJTLmxlbmd0aCgpKQorCQkJCQkJCXMxID0gaW5uZXJTLnN1YnN0cmluZyhqKS50cmltKCk7CiAJCQkJCQllbHNlCiAJCQkJCQkJczEgPSBFTVBUWV9TVFJJTkc7CiAJCQkJfQpAQCAtMTYzLDcgKzE2Niw3IEBACiAJCQkJdHJ5IHsKIAkJCQkJYWJ5dGUwID0gcy5nZXRCeXRlcyhTVFJJTkdfQ09OVkVSU0lPTl9DT0RFKTsKIAkJCQl9IGNhdGNoIChVbnN1cHBvcnRlZEVuY29kaW5nRXhjZXB0aW9uIHVuc3VwcG9ydGVkZW5jb2RpbmdleGNlcHRpb24pIHsKLQkJCQkJYWJ5dGUwID0gbnVsbDsKKwkJCQkJLy9kbyBub3RoaW5nCiAJCQkJfQogCQlyZXR1cm4gYWJ5dGUwOwogCX0KQEAgLTE3Nyw3ICsxODAsNyBAQAogCQkJCXRyeSB7CiAJCQkJCXMgPSBuZXcgU3RyaW5nKGFieXRlMCwgU1RSSU5HX0NPTlZFUlNJT05fQ09ERSk7CiAJCQkJfSBjYXRjaCAoVW5zdXBwb3J0ZWRFbmNvZGluZ0V4Y2VwdGlvbiB1bnN1cHBvcnRlZGVuY29kaW5nZXhjZXB0aW9uKSB7Ci0JCQkJCXMgPSBudWxsOworCQkJCQkvL2RvIG5vdGhpbmcKIAkJCQl9CiAJCXJldHVybiBzOwogCX0KQEAgLTE5OCw3ICsyMDEsOSBAQAogCiAJcHJpdmF0ZSBzdGF0aWMgYnl0ZVtdIGJhc2U2NERlY29kZShieXRlIGFieXRlMFtdKSB7CiAJCWludCBpOwotCQlmb3IgKGkgPSBhYnl0ZTAubGVuZ3RoOyBhYnl0ZTBbLS1pXSA9PSA2MTspOworCQlmb3IgKGkgPSBhYnl0ZTAubGVuZ3RoOyBhYnl0ZTBbLS1pXSA9PSA2MTspeworCQkJLy9kbyBub3RoaW5nIGp1c3QgZmluZGluZyBpbmRleCBvZiA2MQorCQl9CiAJCWJ5dGUgYWJ5dGUxW10gPSBuZXcgYnl0ZVsoaSArIDEpIC0gYWJ5dGUwLmxlbmd0aCAvIDRdOwogCQlmb3IgKGludCBqID0gMDsgaiA8IGFieXRlMC5sZW5ndGg7IGorKykKIAkJCWFieXRlMFtqXSA9IEJBU0U2NF9ERUNPREVfTUFQW2FieXRlMFtqXV07CmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW1mL3d0cGVtZi9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2VtZi91dGlsaXRpZXMvUGxlYXNlTWlncmF0ZVlvdXJDb2RlRXJyb3IuamF2YSBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbWYvd3RwZW1mL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW1mL3V0aWxpdGllcy9QbGVhc2VNaWdyYXRlWW91ckNvZGVFcnJvci5qYXZhCmluZGV4IDVhNTQ4ZDYuLmJkNDc3NmUgMTAwNjQ0Ci0tLSBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbWYvd3RwZW1mL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW1mL3V0aWxpdGllcy9QbGVhc2VNaWdyYXRlWW91ckNvZGVFcnJvci5qYXZhCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbWYvd3RwZW1mL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW1mL3V0aWxpdGllcy9QbGVhc2VNaWdyYXRlWW91ckNvZGVFcnJvci5qYXZhCkBAIC0xOCw2ICsxOCwxMSBAQAogICovCiBwdWJsaWMgY2xhc3MgUGxlYXNlTWlncmF0ZVlvdXJDb2RlRXJyb3IgZXh0ZW5kcyBFcnJvciB7CiAKKwkvKioKKwkgKiAKKwkgKi8KKwlwcml2YXRlIHN0YXRpYyBmaW5hbCBsb25nIHNlcmlhbFZlcnNpb25VSUQgPSAxMTM3MDEwOTk5NDAwMjk4ODM5TDsKKwogCS8vVE9ETyBEZWxldGUgbWUKIAlwdWJsaWMgUGxlYXNlTWlncmF0ZVlvdXJDb2RlRXJyb3IoKSB7CiAJCXN1cGVyKFdGVFV0aWxzUmVzb3VyY2VIYW5kbGVyLlBsZWFzZU1pZ3JhdGVZb3VyQ29kZUVycm9yX0VSUk9SXzApOwpkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVtZi93dHBlbWYvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbWYvdXRpbGl0aWVzL1Jlc291cmNlRGVwZW5kZW5jeVJlZ2lzdGVyLmphdmEgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW1mL3d0cGVtZi9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2VtZi91dGlsaXRpZXMvUmVzb3VyY2VEZXBlbmRlbmN5UmVnaXN0ZXIuamF2YQppbmRleCAzNGZmNjQzLi43OWM4MDQ2IDEwMDY0NAotLS0gYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW1mL3d0cGVtZi9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2VtZi91dGlsaXRpZXMvUmVzb3VyY2VEZXBlbmRlbmN5UmVnaXN0ZXIuamF2YQorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW1mL3d0cGVtZi9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2VtZi91dGlsaXRpZXMvUmVzb3VyY2VEZXBlbmRlbmN5UmVnaXN0ZXIuamF2YQpAQCAtMzgsNiArMzgsNyBAQAogCQkgKiAKIAkJICogQHNlZSBvcmcuZWNsaXBzZS5lbWYuY29tbW9uLm5vdGlmeS5pbXBsLkFkYXB0ZXJJbXBsI2lzQWRhcHRlckZvclR5cGUoamF2YS5sYW5nLk9iamVjdCkKIAkJICovCisJCUBPdmVycmlkZQogCQlwdWJsaWMgYm9vbGVhbiBpc0FkYXB0ZXJGb3JUeXBlKE9iamVjdCB0eXBlKSB7CiAJCQlyZXR1cm4gUkVTT1VSQ0VfREVQRU5ERU5DWV9UWVBFLmVxdWFscyh0eXBlKTsKIAkJfQpAQCAtNDcsNiArNDgsNyBAQAogCQkgKiAKIAkJICogQHNlZSBvcmcuZWNsaXBzZS5lbWYuY29tbW9uLm5vdGlmeS5pbXBsLkFkYXB0ZXJJbXBsI25vdGlmeUNoYW5nZWQob3JnLmVjbGlwc2UuZW1mLmNvbW1vbi5ub3RpZnkuTm90aWZpY2F0aW9uKQogCQkgKi8KKwkJQE92ZXJyaWRlCiAJCXB1YmxpYyB2b2lkIG5vdGlmeUNoYW5nZWQoTm90aWZpY2F0aW9uIG1zZykgewogCQkJLy9MaXN0ZW4gZm9yIHVubG9hZHMgYW5kIHJlbW92ZXMKIAkJCXN3aXRjaCAobXNnLmdldEZlYXR1cmVJRChudWxsKSkgewpAQCAtNzUsNiArNzcsNyBAQAogCQkgKiAKIAkJICogQHNlZSBvcmcuZWNsaXBzZS5lbWYuY29tbW9uLm5vdGlmeS5pbXBsLkFkYXB0ZXJJbXBsI25vdGlmeUNoYW5nZWQob3JnLmVjbGlwc2UuZW1mLmNvbW1vbi5ub3RpZnkuTm90aWZpY2F0aW9uKQogCQkgKi8KKwkJQE92ZXJyaWRlCiAJCXB1YmxpYyB2b2lkIG5vdGlmeUNoYW5nZWQoTm90aWZpY2F0aW9uIG1zZykgewogCQkJaWYgKG1zZy5nZXRFdmVudFR5cGUoKSA9PSBOb3RpZmljYXRpb24uQUREKQogCQkJCXByb2NjZXNzQWRkZWRSZXNvdXJjZSgoUmVzb3VyY2VTZXQpIG1zZy5nZXROb3RpZmllcigpLCAoUmVzb3VyY2UpIG1zZy5nZXROZXdWYWx1ZSgpKTsKZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbWYvd3RwZW1mL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW1mL3V0aWxpdGllcy9SZXNvdXJjZUlzTG9hZGluZ0FkYXB0ZXIuamF2YSBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbWYvd3RwZW1mL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW1mL3V0aWxpdGllcy9SZXNvdXJjZUlzTG9hZGluZ0FkYXB0ZXIuamF2YQppbmRleCAzNWYxZjMzLi5hNWQ5NmVhIDEwMDY0NAotLS0gYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW1mL3d0cGVtZi9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2VtZi91dGlsaXRpZXMvUmVzb3VyY2VJc0xvYWRpbmdBZGFwdGVyLmphdmEKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVtZi93dHBlbWYvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbWYvdXRpbGl0aWVzL1Jlc291cmNlSXNMb2FkaW5nQWRhcHRlci5qYXZhCkBAIC0xMCwyMiArMTAsMjAgQEAKICAqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqLwogLyoKICAqIENyZWF0ZWQgb24gT2N0IDI2LCAyMDA0Ci0gKgotICogVE9ETyBUbyBjaGFuZ2UgdGhlIHRlbXBsYXRlIGZvciB0aGlzIGdlbmVyYXRlZCBmaWxlIGdvIHRvCi0gKiBXaW5kb3cgLSBQcmVmZXJlbmNlcyAtIEphdmEgLSBDb2RlIFN0eWxlIC0gQ29kZSBUZW1wbGF0ZXMKICAqLwogcGFja2FnZSBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmludGVybmFsLmVtZi51dGlsaXRpZXM7CiAKK2ltcG9ydCBqYXZhLnV0aWwuTGlzdDsKKwogaW1wb3J0IG9yZy5lY2xpcHNlLmVtZi5jb21tb24ubm90aWZ5LkFkYXB0ZXI7CiBpbXBvcnQgb3JnLmVjbGlwc2UuZW1mLmNvbW1vbi5ub3RpZnkuTm90aWZpY2F0aW9uOwogaW1wb3J0IG9yZy5lY2xpcHNlLmVtZi5jb21tb24ubm90aWZ5LmltcGwuQWRhcHRlckltcGw7CiBpbXBvcnQgb3JnLmVjbGlwc2UuZW1mLmVjb3JlLnJlc291cmNlLlJlc291cmNlOwotaW1wb3J0IG9yZy5lY2xpcHNlLmVtZi5lY29yZS51dGlsLkVjb3JlVXRpbDsKIAogLyoqCiAgKiBAYXV0aG9yIG1kZWxkZXIKICAqLwotcHVibGljIGNsYXNzIFJlc291cmNlSXNMb2FkaW5nQWRhcHRlciBleHRlbmRzIEFkYXB0ZXJJbXBsIGltcGxlbWVudHMgQWRhcHRlciB7CitwdWJsaWMgY2xhc3MgUmVzb3VyY2VJc0xvYWRpbmdBZGFwdGVyIGV4dGVuZHMgQWRhcHRlckltcGwgewogCiAgICAgcHJpdmF0ZSBzdGF0aWMgZmluYWwgQ2xhc3MgUkVTT1VSQ0VfSVNfTE9BRElOR19BREFQVEVSX0NMQVNTID0gUmVzb3VyY2VJc0xvYWRpbmdBZGFwdGVyLmNsYXNzOwogCkBAIC00Miw5ICs0MCwxMCBAQAogICAgICAgICAgKiByZW1vdmVJc0xvYWRpbmdTdXBwb3J0KCkgd2lsbCBjb29yZGluYXRlIHdpdGggdGhpcyAKICAgICAgICAgICogc3luY2hyb25pemF0aW9uLgogICAgICAgICAgKi8KLSAgICAgICAgc3luY2hyb25pemVkIChhUmVzb3VyY2UpIHsKLSAgICAgICAgICAgIGFkYXB0ZXIgPSAoUmVzb3VyY2VJc0xvYWRpbmdBZGFwdGVyKSBFY29yZVV0aWwuZ2V0QWRhcHRlcihhUmVzb3VyY2UuZUFkYXB0ZXJzKCksIFJlc291cmNlSXNMb2FkaW5nQWRhcHRlci5jbGFzcyk7CisgICAgICAgIHN5bmNocm9uaXplZChhUmVzb3VyY2UuZUFkYXB0ZXJzKCkpIHsKKyAgICAgICAgCWFkYXB0ZXIgPSAoUmVzb3VyY2VJc0xvYWRpbmdBZGFwdGVyKSBnZXRBZGFwdGVyKGFSZXNvdXJjZS5lQWRhcHRlcnMoKSwgUmVzb3VyY2VJc0xvYWRpbmdBZGFwdGVyLmNsYXNzKTsKICAgICAgICAgfQorICAgICAgICAKICAgICAgICAgcmV0dXJuIGFkYXB0ZXI7CiAgICAgfQogCkBAIC01Myw3ICs1Miw4IEBACiAgICAgICogCiAgICAgICogQHNlZSBvcmcuZWNsaXBzZS5lbWYuY29tbW9uLm5vdGlmeS5BZGFwdGVyI25vdGlmeUNoYW5nZWQob3JnLmVjbGlwc2UuZW1mLmNvbW1vbi5ub3RpZnkuTm90aWZpY2F0aW9uKQogICAgICAqLwotICAgIHB1YmxpYyB2b2lkIG5vdGlmeUNoYW5nZWQoTm90aWZpY2F0aW9uIG5vdGlmaWNhdGlvbikgeworICAgIEBPdmVycmlkZQorCXB1YmxpYyB2b2lkIG5vdGlmeUNoYW5nZWQoTm90aWZpY2F0aW9uIG5vdGlmaWNhdGlvbikgewogCiAgICAgICAgIGlmIChub3RpZmljYXRpb24uZ2V0Tm90aWZpZXIoKSAhPSBudWxsKSB7CiAKQEAgLTY4LDYgKzY4LDE4IEBACiAgICAgcHVibGljIHZvaWQgd2FpdEZvclJlc291cmNlVG9Mb2FkKCkgewogCiAgICAgfQorICAgIHB1YmxpYyBzdGF0aWMgQWRhcHRlciBnZXRBZGFwdGVyKExpc3Q8QWRhcHRlcj4gYWRhcHRlcnMsIE9iamVjdCB0eXBlKQorICAgIHsKKyAgICAgIGZvciAoaW50IGkgPSAwLCBzaXplID0gYWRhcHRlcnMuc2l6ZSgpOyBpIDwgc2l6ZTsgKytpKQorICAgICAgeworICAgICAgICBBZGFwdGVyIGFkYXB0ZXIgPSBhZGFwdGVycy5nZXQoaSk7CisgICAgICAgIGlmIChhZGFwdGVyICE9IG51bGwgJiYgYWRhcHRlci5pc0FkYXB0ZXJGb3JUeXBlKHR5cGUpKQorICAgICAgICB7CisgICAgICAgICAgcmV0dXJuIGFkYXB0ZXI7CisgICAgICAgIH0KKyAgICAgIH0KKyAgICAgIHJldHVybiBudWxsOworICAgIH0KIAogICAgIC8qKgogICAgICAqIEBwYXJhbSBub3RpZmljYXRpb24KQEAgLTg4LDcgKzEwMCw3IEBACiAgICAgICAgICAqLwogICAgICAgICBpZiAoZ2V0VGFyZ2V0KCkgIT0gbnVsbCkgewogICAgICAgICAgICAgLy9TeXN0ZW0ub3V0LnByaW50bG4oIlJlc291cmNlSXNMb2FkaW5nQWRhcHRlciBTeW5jaHJvbml6aW5nIG9uICIgKyBnZXRUYXJnZXQoKSk7Ci0gICAgICAgICAgICBzeW5jaHJvbml6ZWQgKGdldFRhcmdldCgpKSB7CisgICAgICAgICAgICBzeW5jaHJvbml6ZWQgKGdldFRhcmdldCgpLmVBZGFwdGVycygpKSB7CiAgICAgICAgICAgICAgICAgZ2V0VGFyZ2V0KCkuZUFkYXB0ZXJzKCkucmVtb3ZlKHRoaXMpOwogICAgICAgICAgICAgfQogICAgICAgICB9CkBAIC05OSw3ICsxMTEsOCBAQAogICAgICAqIAogICAgICAqIEBzZWUgb3JnLmVjbGlwc2UuZW1mLmNvbW1vbi5ub3RpZnkuQWRhcHRlciNpc0FkYXB0ZXJGb3JUeXBlKGphdmEubGFuZy5PYmplY3QpCiAgICAgICovCi0gICAgcHVibGljIGJvb2xlYW4gaXNBZGFwdGVyRm9yVHlwZShPYmplY3QgdHlwZSkgeworICAgIEBPdmVycmlkZQorCXB1YmxpYyBib29sZWFuIGlzQWRhcHRlckZvclR5cGUoT2JqZWN0IHR5cGUpIHsKICAgICAgICAgcmV0dXJuIHR5cGUgPT0gUkVTT1VSQ0VfSVNfTE9BRElOR19BREFQVEVSX0NMQVNTOwogICAgIH0KIApkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVtZi93dHBlbWYvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbWYvdXRpbGl0aWVzL1Jlc291cmNlSXNMb2FkaW5nQWRhcHRlckZhY3RvcnkuamF2YSBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbWYvd3RwZW1mL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW1mL3V0aWxpdGllcy9SZXNvdXJjZUlzTG9hZGluZ0FkYXB0ZXJGYWN0b3J5LmphdmEKaW5kZXggNTg5OWY1ZC4uNmUzMDQ5NiAxMDA2NDQKLS0tIGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVtZi93dHBlbWYvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbWYvdXRpbGl0aWVzL1Jlc291cmNlSXNMb2FkaW5nQWRhcHRlckZhY3RvcnkuamF2YQorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW1mL3d0cGVtZi9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2VtZi91dGlsaXRpZXMvUmVzb3VyY2VJc0xvYWRpbmdBZGFwdGVyRmFjdG9yeS5qYXZhCkBAIC0xMCw5ICsxMCw2IEBACiAgKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKi8KIC8qCiAgKiBDcmVhdGVkIG9uIE9jdCAyNiwgMjAwNAotICoKLSAqIFRPRE8gVG8gY2hhbmdlIHRoZSB0ZW1wbGF0ZSBmb3IgdGhpcyBnZW5lcmF0ZWQgZmlsZSBnbyB0bwotICogV2luZG93IC0gUHJlZmVyZW5jZXMgLSBKYXZhIC0gQ29kZSBTdHlsZSAtIENvZGUgVGVtcGxhdGVzCiAgKi8KIHBhY2thZ2Ugb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5pbnRlcm5hbC5lbWYudXRpbGl0aWVzOwogCmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW1mL3d0cGVtZi9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2VtZi91dGlsaXRpZXMvVHJhbnNsYXRvck1hbmFnZXIuamF2YSBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbWYvd3RwZW1mL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW1mL3V0aWxpdGllcy9UcmFuc2xhdG9yTWFuYWdlci5qYXZhCmluZGV4IDc5ZWU4YjguLjk3NWRiMjYgMTAwNjQ0Ci0tLSBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbWYvd3RwZW1mL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW1mL3V0aWxpdGllcy9UcmFuc2xhdG9yTWFuYWdlci5qYXZhCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbWYvd3RwZW1mL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW1mL3V0aWxpdGllcy9UcmFuc2xhdG9yTWFuYWdlci5qYXZhCkBAIC0xNiw4ICsxNiw3IEBACiAKIGltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJ1bnRpbWUuQ29yZUV4Y2VwdGlvbjsKIGltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJ1bnRpbWUuSUNvbmZpZ3VyYXRpb25FbGVtZW50OwotaW1wb3J0IG9yZy5lY2xpcHNlLmplbS51dGlsLlJlZ2lzdHJ5UmVhZGVyOwotaW1wb3J0IG9yZy5lY2xpcHNlLmplbS51dGlsLmxvZ2dlci5wcm94eS5Mb2dnZXI7CitpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb3JlLnV0aWwuUmVnaXN0cnlSZWFkZXI7CiBpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5pbnRlcm5hbC5lbWYucGx1Z2luLkVjb3JlVXRpbGl0aWVzUGx1Z2luOwogaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uaW50ZXJuYWwuZW1mLnJlc291cmNlLlRyYW5zbGF0b3I7CiAKQEAgLTc3LDYgKzc2LDcgQEAKIAkJLyoqCiAJCSAqIEFkZCB0aGUgY29uZmlndXJhdGlvbiBlbGVtZW50IGlmIGl0IG1hdGNocyB0aGUgZXhwZWN0ZWQgdHJhbnNsYXRvciBlbGVtZW50IG5hbWUKIAkJICovCisJCUBPdmVycmlkZQogCQlwdWJsaWMgYm9vbGVhbiByZWFkRWxlbWVudChJQ29uZmlndXJhdGlvbkVsZW1lbnQgZWxlbWVudCkgewogCQkJYm9vbGVhbiByZXN1bHQgPSBmYWxzZTsKIAkJCWlmIChUUkFOU0xBVE9SLmVxdWFscyhlbGVtZW50LmdldE5hbWUoKSkpIHsKQEAgLTEzNCw3ICsxMzQsNyBAQAogCQkJdHJ5IHsKIAkJCQlpbnN0YW5jZSA9IChUcmFuc2xhdG9yKSBjb25maWdFbGVtZW50LmNyZWF0ZUV4ZWN1dGFibGVFeHRlbnNpb24oQ0xBU1NOQU1FKTsKIAkJCX0gY2F0Y2ggKENvcmVFeGNlcHRpb24gZSkgewotCQkJCUxvZ2dlci5nZXRMb2dnZXIoKS5sb2dFcnJvcihlKTsKKwkJCQlFY29yZVV0aWxpdGllc1BsdWdpbi5sb2dFcnJvcihlKTsKIAkJCX0KIAkJCXJldHVybiBpbnN0YW5jZTsKIAkJfQpkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVtZi93dHBlbWYvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbWYvdXRpbGl0aWVzL1Vuc3VwcG9ydGVkQ3J5cHRvQWxnb3JpdGhtRXhjZXB0aW9uLmphdmEgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW1mL3d0cGVtZi9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2VtZi91dGlsaXRpZXMvVW5zdXBwb3J0ZWRDcnlwdG9BbGdvcml0aG1FeGNlcHRpb24uamF2YQppbmRleCBmNzFjNjZkLi41ODQ1OWJmIDEwMDY0NAotLS0gYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW1mL3d0cGVtZi9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2VtZi91dGlsaXRpZXMvVW5zdXBwb3J0ZWRDcnlwdG9BbGdvcml0aG1FeGNlcHRpb24uamF2YQorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW1mL3d0cGVtZi9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2VtZi91dGlsaXRpZXMvVW5zdXBwb3J0ZWRDcnlwdG9BbGdvcml0aG1FeGNlcHRpb24uamF2YQpAQCAtMTIsNSArMTIsMTAgQEAKIGltcG9ydCBvcmcub21nLkNPUkJBLlVzZXJFeGNlcHRpb247CiAKIHB1YmxpYyBjbGFzcyBVbnN1cHBvcnRlZENyeXB0b0FsZ29yaXRobUV4Y2VwdGlvbiBleHRlbmRzIFVzZXJFeGNlcHRpb24geworCisJLyoqCisJICogCisJICovCisJcHJpdmF0ZSBzdGF0aWMgZmluYWwgbG9uZyBzZXJpYWxWZXJzaW9uVUlEID0gLTM1MTA0NTM3Njc2MjQxNTU5OTFMOwogfQogCmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW1mL3d0cGVtZi9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2VtZi91dGlsaXRpZXMvWE1MVmFsdWVFbmNvZGVyRGVjb2Rlci5qYXZhIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVtZi93dHBlbWYvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbWYvdXRpbGl0aWVzL1hNTFZhbHVlRW5jb2RlckRlY29kZXIuamF2YQppbmRleCBkOWExZDJjLi43NTAzNTIzIDEwMDY0NAotLS0gYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW1mL3d0cGVtZi9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2VtZi91dGlsaXRpZXMvWE1MVmFsdWVFbmNvZGVyRGVjb2Rlci5qYXZhCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbWYvd3RwZW1mL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW1mL3V0aWxpdGllcy9YTUxWYWx1ZUVuY29kZXJEZWNvZGVyLmphdmEKQEAgLTE0LDcgKzE0LDcgQEAKIC8qKgogICogQW4gWE1MIHZhbHVlIGVzY2FwaW5nIEVuY29kZXJEZWNvZGVyIGltcGxlbWVudGF0aW9uCiAgKi8KLXB1YmxpYyBjbGFzcyBYTUxWYWx1ZUVuY29kZXJEZWNvZGVyIGV4dGVuZHMgRW5jb2RlckRlY29kZXJBZGFwdGVyIGltcGxlbWVudHMgRW5jb2RlckRlY29kZXIgeworcHVibGljIGNsYXNzIFhNTFZhbHVlRW5jb2RlckRlY29kZXIgZXh0ZW5kcyBFbmNvZGVyRGVjb2RlckFkYXB0ZXIgewogCS8qKgogCSAqIElkZW50aWZpZXMgdGhlIGxhc3QgcHJpbnRhYmxlIGNoYXJhY3RlciBpbiB0aGUgVW5pY29kZSByYW5nZSB0aGF0IGlzIHN1cHBvcnRlZCBieSB0aGUKIAkgKiBlbmNvZGluZyB1c2VkIHdpdGggdGhpcyBzZXJpYWxpemVyLiBGb3IgOC1iaXQgZW5jb2RpbmdzIHRoaXMgd2lsbCBiZSBlaXRoZXIgMHg3RSBvciAweEZGLiBGb3IKQEAgLTM0LDYgKzM0LDcgQEAKIAkvKioKIAkgKiBSZXR1cm5zIGEgZGVjb2RlZCB2ZXJzaW9uIG9mIHRoZSB2YWx1ZS4KIAkgKi8KKwlAT3ZlcnJpZGUKIAlwdWJsaWMgU3RyaW5nIGRlY29kZShTdHJpbmcgdmFsdWUpIHsKIAkJLy8gTk9UX0lNUExFTUVOVEVECiAJCXJldHVybiB2YWx1ZTsKQEAgLTQ3LDYgKzQ4LDcgQEAKIAkgKiBAcGFyYW0gc291cmNlCiAJICogICAgICAgICAgICBUaGUgc3RyaW5nIHRvIGVzY2FwZQogCSAqLworCUBPdmVycmlkZQogCXB1YmxpYyBTdHJpbmcgZW5jb2RlKFN0cmluZyB2YWx1ZSkgewogCQlTdHJpbmdCdWZmZXIgc2J1ZiA9IG5ldyBTdHJpbmdCdWZmZXIodmFsdWUubGVuZ3RoKCkpOwogCQlTdHJpbmcgY2hhclJlZiA9IG51bGw7CmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW1md29ya2JlbmNoLmludGVncmF0aW9uLy5jbGFzc3BhdGggYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW1md29ya2JlbmNoLmludGVncmF0aW9uLy5jbGFzc3BhdGgKaW5kZXggZmU0NTE1Mi4uNDRiM2RkYSAxMDA2NDQKLS0tIGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVtZndvcmtiZW5jaC5pbnRlZ3JhdGlvbi8uY2xhc3NwYXRoCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbWZ3b3JrYmVuY2guaW50ZWdyYXRpb24vLmNsYXNzcGF0aApAQCAtMiw3ICsyLDcgQEAKIDxjbGFzc3BhdGg+CiAJPGNsYXNzcGF0aGVudHJ5IGtpbmQ9InNyYyIgcGF0aD0ic3JjIi8+CiAJPGNsYXNzcGF0aGVudHJ5IGtpbmQ9InNyYyIgcGF0aD0icHJvcGVydHlfZmlsZSIvPgotCTxjbGFzc3BhdGhlbnRyeSBraW5kPSJjb24iIHBhdGg9Im9yZy5lY2xpcHNlLmpkdC5sYXVuY2hpbmcuSlJFX0NPTlRBSU5FUi9vcmcuZWNsaXBzZS5qZHQuaW50ZXJuYWwuZGVidWcudWkubGF1bmNoZXIuU3RhbmRhcmRWTVR5cGUvSjJTRS0xLjQiLz4KKwk8Y2xhc3NwYXRoZW50cnkga2luZD0iY29uIiBwYXRoPSJvcmcuZWNsaXBzZS5qZHQubGF1bmNoaW5nLkpSRV9DT05UQUlORVIvb3JnLmVjbGlwc2UuamR0LmludGVybmFsLmRlYnVnLnVpLmxhdW5jaGVyLlN0YW5kYXJkVk1UeXBlL0oyU0UtMS41Ii8+CiAJPGNsYXNzcGF0aGVudHJ5IGtpbmQ9ImNvbiIgcGF0aD0ib3JnLmVjbGlwc2UucGRlLmNvcmUucmVxdWlyZWRQbHVnaW5zIj4KIAkJPGFjY2Vzc3J1bGVzPgogCQkJPGFjY2Vzc3J1bGUga2luZD0iYWNjZXNzaWJsZSIgcGF0dGVybj0ib3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi8qKiIvPgpkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVtZndvcmtiZW5jaC5pbnRlZ3JhdGlvbi8uc2V0dGluZ3Mvb3JnLmVjbGlwc2UuamR0LmNvcmUucHJlZnMgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW1md29ya2JlbmNoLmludGVncmF0aW9uLy5zZXR0aW5ncy9vcmcuZWNsaXBzZS5qZHQuY29yZS5wcmVmcwppbmRleCA0NjQ2OGY5Li4wMzdhNGU1IDEwMDY0NAotLS0gYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW1md29ya2JlbmNoLmludGVncmF0aW9uLy5zZXR0aW5ncy9vcmcuZWNsaXBzZS5qZHQuY29yZS5wcmVmcworKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW1md29ya2JlbmNoLmludGVncmF0aW9uLy5zZXR0aW5ncy9vcmcuZWNsaXBzZS5qZHQuY29yZS5wcmVmcwpAQCAtMSw2MiArMSw5NSBAQAotI1NhdCBNYXIgMjQgMDI6MDY6NDUgRURUIDIwMDcKLWVjbGlwc2UucHJlZmVyZW5jZXMudmVyc2lvbj0xCi1vcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5jb2RlZ2VuLmlubGluZUpzckJ5dGVjb2RlPWVuYWJsZWQKLW9yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLmNvZGVnZW4udGFyZ2V0UGxhdGZvcm09MS4yCi1vcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5jb2RlZ2VuLnVudXNlZExvY2FsPXByZXNlcnZlCi1vcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5jb21wbGlhbmNlPTEuNAotb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIuZGVidWcubGluZU51bWJlcj1nZW5lcmF0ZQotb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIuZGVidWcubG9jYWxWYXJpYWJsZT1nZW5lcmF0ZQotb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIuZGVidWcuc291cmNlRmlsZT1nZW5lcmF0ZQotb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5hbm5vdGF0aW9uU3VwZXJJbnRlcmZhY2U9aWdub3JlCi1vcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLmFzc2VydElkZW50aWZpZXI9d2FybmluZwotb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5hdXRvYm94aW5nPWlnbm9yZQotb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5kZXByZWNhdGlvbj13YXJuaW5nCi1vcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLmRlcHJlY2F0aW9uSW5EZXByZWNhdGVkQ29kZT1kaXNhYmxlZAotb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5kZXByZWNhdGlvbldoZW5PdmVycmlkaW5nRGVwcmVjYXRlZE1ldGhvZD1kaXNhYmxlZAotb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5lbXB0eVN0YXRlbWVudD1pZ25vcmUKLW9yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0uZW51bUlkZW50aWZpZXI9d2FybmluZwotb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5mYWxsdGhyb3VnaENhc2U9aWdub3JlCi1vcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLmZpZWxkSGlkaW5nPWlnbm9yZQotb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5maW5hbFBhcmFtZXRlckJvdW5kPWlnbm9yZQotb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5maW5hbGx5QmxvY2tOb3RDb21wbGV0aW5nTm9ybWFsbHk9ZXJyb3IKLW9yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0uZm9yYmlkZGVuUmVmZXJlbmNlPWVycm9yCi1vcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLmhpZGRlbkNhdGNoQmxvY2s9ZXJyb3IKLW9yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0uaW5jb21wYXRpYmxlTm9uSW5oZXJpdGVkSW50ZXJmYWNlTWV0aG9kPWVycm9yCi1vcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLmluY29tcGxldGVFbnVtU3dpdGNoPWlnbm9yZQotb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5pbmRpcmVjdFN0YXRpY0FjY2Vzcz1pZ25vcmUKLW9yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0ubG9jYWxWYXJpYWJsZUhpZGluZz1pZ25vcmUKLW9yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0ubWV0aG9kV2l0aENvbnN0cnVjdG9yTmFtZT1lcnJvcgotb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5taXNzaW5nRGVwcmVjYXRlZEFubm90YXRpb249aWdub3JlCi1vcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLm1pc3NpbmdPdmVycmlkZUFubm90YXRpb249aWdub3JlCi1vcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLm1pc3NpbmdTZXJpYWxWZXJzaW9uPXdhcm5pbmcKLW9yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0ubm9FZmZlY3RBc3NpZ25tZW50PXdhcm5pbmcKLW9yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0ubm9JbXBsaWNpdFN0cmluZ0NvbnZlcnNpb249ZXJyb3IKLW9yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0ubm9uRXh0ZXJuYWxpemVkU3RyaW5nTGl0ZXJhbD1pZ25vcmUKLW9yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0ubnVsbFJlZmVyZW5jZT1pZ25vcmUKLW9yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0ub3ZlcnJpZGluZ1BhY2thZ2VEZWZhdWx0TWV0aG9kPWVycm9yCi1vcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLnBhcmFtZXRlckFzc2lnbm1lbnQ9aWdub3JlCi1vcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLnBvc3NpYmxlQWNjaWRlbnRhbEJvb2xlYW5Bc3NpZ25tZW50PWlnbm9yZQotb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5yYXdUeXBlUmVmZXJlbmNlPWlnbm9yZQotb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5yZWR1bmRhbnROdWxsQ2hlY2s9aWdub3JlCi1vcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLnNwZWNpYWxQYXJhbWV0ZXJIaWRpbmdGaWVsZD1kaXNhYmxlZAotb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5zdGF0aWNBY2Nlc3NSZWNlaXZlcj1lcnJvcgotb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5zdXBwcmVzc1dhcm5pbmdzPWVuYWJsZWQKLW9yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0uc3ludGhldGljQWNjZXNzRW11bGF0aW9uPWlnbm9yZQotb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS50eXBlUGFyYW1ldGVySGlkaW5nPWVycm9yCi1vcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLnVuY2hlY2tlZFR5cGVPcGVyYXRpb249aWdub3JlCi1vcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLnVuZG9jdW1lbnRlZEVtcHR5QmxvY2s9aWdub3JlCi1vcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLnVuaGFuZGxlZFdhcm5pbmdUb2tlbj1pZ25vcmUKLW9yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0udW5uZWNlc3NhcnlFbHNlPWlnbm9yZQotb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS51bm5lY2Vzc2FyeVR5cGVDaGVjaz1pZ25vcmUKLW9yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0udW5xdWFsaWZpZWRGaWVsZEFjY2Vzcz1pZ25vcmUKLW9yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0udW51c2VkRGVjbGFyZWRUaHJvd25FeGNlcHRpb249aWdub3JlCi1vcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLnVudXNlZERlY2xhcmVkVGhyb3duRXhjZXB0aW9uV2hlbk92ZXJyaWRpbmc9ZGlzYWJsZWQKLW9yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0udW51c2VkSW1wb3J0PWVycm9yCi1vcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLnVudXNlZExhYmVsPWVycm9yCi1vcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLnVudXNlZExvY2FsPWlnbm9yZQotb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS51bnVzZWRQYXJhbWV0ZXI9aWdub3JlCisjTW9uIEp1biAwOCAxNTozNTo0NSBFRFQgMjAwOQogb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS51bnVzZWRQYXJhbWV0ZXJXaGVuSW1wbGVtZW50aW5nQWJzdHJhY3Q9ZGlzYWJsZWQKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0uY29tcGFyaW5nSWRlbnRpY2FsPWVycm9yCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLnVubmVjZXNzYXJ5RWxzZT1lcnJvcgorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5yZWR1bmRhbnRTdXBlcmludGVyZmFjZT1lcnJvcgorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS51bnVzZWRMb2NhbD1lcnJvcgorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5lbXB0eVN0YXRlbWVudD1lcnJvcgorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS51bnVzZWRMYWJlbD1lcnJvcgorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS51bnVzZWRQYXJhbWV0ZXI9d2FybmluZworb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5yYXdUeXBlUmVmZXJlbmNlPXdhcm5pbmcKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmluY29tcGF0aWJsZUpES0xldmVsPWlnbm9yZQorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5pbmNvbXBhdGlibGVOb25Jbmhlcml0ZWRJbnRlcmZhY2VNZXRob2Q9ZXJyb3IKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLmRlYnVnLmxpbmVOdW1iZXI9Z2VuZXJhdGUKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0udW51c2VkRGVjbGFyZWRUaHJvd25FeGNlcHRpb249d2FybmluZworb3JnLmVjbGlwc2UuamR0LmNvcmUuYnVpbGRlci5jbGVhbk91dHB1dEZvbGRlcj1jbGVhbgorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS51bnVzZWRXYXJuaW5nVG9rZW49d2FybmluZworb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5ub0ltcGxpY2l0U3RyaW5nQ29udmVyc2lvbj1lcnJvcgorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5kZXByZWNhdGlvbkluRGVwcmVjYXRlZENvZGU9ZW5hYmxlZAorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5kZXByZWNhdGlvbj13YXJuaW5nCiBvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLnVudXNlZFBhcmFtZXRlcldoZW5PdmVycmlkaW5nQ29uY3JldGU9ZGlzYWJsZWQKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0ubWlzc2luZ1N5bmNocm9uaXplZE9uSW5oZXJpdGVkTWV0aG9kPWVycm9yCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLmRlcHJlY2F0aW9uV2hlbk92ZXJyaWRpbmdEZXByZWNhdGVkTWV0aG9kPWVuYWJsZWQKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0ucmVkdW5kYW50TnVsbENoZWNrPWVycm9yCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLnVudXNlZEltcG9ydD1lcnJvcgorb3JnLmVjbGlwc2UuamR0LmNvcmUuYnVpbGRlci5yZWNyZWF0ZU1vZGlmaWVkQ2xhc3NGaWxlSW5PdXRwdXRGb2xkZXI9aWdub3JlCitvcmcuZWNsaXBzZS5qZHQuY29yZS5idWlsZGVyLnJlc291cmNlQ29weUV4Y2x1c2lvbkZpbHRlcj0qLmxhdW5jaAorb3JnLmVjbGlwc2UuamR0LmNvcmUuY2xhc3NwYXRoLm11bHRpcGxlT3V0cHV0TG9jYXRpb25zPWVuYWJsZWQKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0uc3VwcHJlc3NXYXJuaW5ncz1lbmFibGVkCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLnR5cGVQYXJhbWV0ZXJIaWRpbmc9ZXJyb3IKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmJ1aWxkZXIuaW52YWxpZENsYXNzcGF0aD1hYm9ydAorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5sb2NhbFZhcmlhYmxlSGlkaW5nPXdhcm5pbmcKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0ucG9zc2libGVBY2NpZGVudGFsQm9vbGVhbkFzc2lnbm1lbnQ9ZXJyb3IKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0ubWlzc2luZ0hhc2hDb2RlTWV0aG9kPWVycm9yCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb2RlQ29tcGxldGUuYXJndW1lbnRTdWZmaXhlcz0KK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvZGVDb21wbGV0ZS5hcmd1bWVudFByZWZpeGVzPQorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5pbmRpcmVjdFN0YXRpY0FjY2Vzcz1pZ25vcmUKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0ucG90ZW50aWFsTnVsbFJlZmVyZW5jZT1lcnJvcgorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIuY29kZWdlbi5pbmxpbmVKc3JCeXRlY29kZT1lbmFibGVkCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLmZpbmFsUGFyYW1ldGVyQm91bmQ9d2FybmluZworb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5taXNzaW5nU2VyaWFsVmVyc2lvbj1lcnJvcgorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5udWxsUmVmZXJlbmNlPWVycm9yCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5zb3VyY2U9MS41CitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLmVudW1JZGVudGlmaWVyPWVycm9yCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLnN5bnRoZXRpY0FjY2Vzc0VtdWxhdGlvbj1pZ25vcmUKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmJ1aWxkZXIuZHVwbGljYXRlUmVzb3VyY2VUYXNrPXdhcm5pbmcKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0uZmllbGRIaWRpbmc9ZXJyb3IKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0udW51c2VkRGVjbGFyZWRUaHJvd25FeGNlcHRpb25FeGVtcHRFeGNlcHRpb25BbmRUaHJvd2FibGU9ZW5hYmxlZAorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5taXNzaW5nT3ZlcnJpZGVBbm5vdGF0aW9uPWVycm9yCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLmhpZGRlbkNhdGNoQmxvY2s9ZXJyb3IKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0ub3ZlcnJpZGluZ1BhY2thZ2VEZWZhdWx0TWV0aG9kPWVycm9yCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLmZpbmFsbHlCbG9ja05vdENvbXBsZXRpbmdOb3JtYWxseT1lcnJvcgorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS51bmRvY3VtZW50ZWRFbXB0eUJsb2NrPXdhcm5pbmcKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNsYXNzcGF0aC5leGNsdXNpb25QYXR0ZXJucz1lbmFibGVkCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLm1ldGhvZFdpdGhDb25zdHJ1Y3Rvck5hbWU9ZXJyb3IKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0uZGlzY291cmFnZWRSZWZlcmVuY2U9d2FybmluZworb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS51bnF1YWxpZmllZEZpZWxkQWNjZXNzPWlnbm9yZQorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5pbmNvbXBsZXRlRW51bVN3aXRjaD1lcnJvcgorZWNsaXBzZS5wcmVmZXJlbmNlcy52ZXJzaW9uPTEKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmluY29tcGxldGVDbGFzc3BhdGg9ZXJyb3IKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0udW5uZWNlc3NhcnlUeXBlQ2hlY2s9ZXJyb3IKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0uZGVhZENvZGU9ZXJyb3IKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0uc3BlY2lhbFBhcmFtZXRlckhpZGluZ0ZpZWxkPWVuYWJsZWQKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0uZmF0YWxPcHRpb25hbEVycm9yPWVuYWJsZWQKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0ubm9FZmZlY3RBc3NpZ25tZW50PWVycm9yCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5kZWJ1Zy5zb3VyY2VGaWxlPWdlbmVyYXRlCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLnVudXNlZERlY2xhcmVkVGhyb3duRXhjZXB0aW9uSW5jbHVkZVVuY2hlY2tlZEV4Y2VwdGlvbnM9ZGlzYWJsZWQKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0ubWlzc2luZ0RlcHJlY2F0ZWRBbm5vdGF0aW9uPXdhcm5pbmcKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvZGVDb21wbGV0ZS5maWVsZFByZWZpeGVzPQorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5mYWxsdGhyb3VnaENhc2U9ZXJyb3IKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLmNvZGVnZW4udGFyZ2V0UGxhdGZvcm09MS41CiBvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLnVudXNlZFByaXZhdGVNZW1iZXI9ZXJyb3IKLW9yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0udmFyYXJnc0FyZ3VtZW50TmVlZENhc3Q9aWdub3JlCi1vcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5zb3VyY2U9MS4zCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLmF1dG9ib3hpbmc9d2FybmluZworb3JnLmVjbGlwc2UuamR0LmNvcmUuY2lyY3VsYXJDbGFzc3BhdGg9ZXJyb3IKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0uYW5ub3RhdGlvblN1cGVySW50ZXJmYWNlPXdhcm5pbmcKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0ubm9uRXh0ZXJuYWxpemVkU3RyaW5nTGl0ZXJhbD1lcnJvcgorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29kZUNvbXBsZXRlLmZpZWxkU3VmZml4ZXM9CitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb2RlQ29tcGxldGUubG9jYWxTdWZmaXhlcz0KK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0ucGFyYW1ldGVyQXNzaWdubWVudD1lcnJvcgorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5zdGF0aWNBY2Nlc3NSZWNlaXZlcj1lcnJvcgorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29kZUNvbXBsZXRlLmxvY2FsUHJlZml4ZXM9CitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLnVudXNlZERlY2xhcmVkVGhyb3duRXhjZXB0aW9uSW5jbHVkZURvY0NvbW1lbnRSZWZlcmVuY2U9ZW5hYmxlZAorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIubWF4UHJvYmxlbVBlclVuaXQ9MTAwCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLnZhcmFyZ3NBcmd1bWVudE5lZWRDYXN0PWVycm9yCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLmFzc2VydElkZW50aWZpZXI9ZXJyb3IKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLmNvbXBsaWFuY2U9MS41CitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLnVudXNlZFBhcmFtZXRlckluY2x1ZGVEb2NDb21tZW50UmVmZXJlbmNlPWVuYWJsZWQKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvZGVDb21wbGV0ZS5zdGF0aWNGaWVsZFByZWZpeGVzPQorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIuZGVidWcubG9jYWxWYXJpYWJsZT1nZW5lcmF0ZQorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS51bmhhbmRsZWRXYXJuaW5nVG9rZW49d2FybmluZworaW5zdGFuY2Uvb3JnLmVjbGlwc2UuY29yZS5uZXQvb3JnLmVjbGlwc2UuY29yZS5uZXQuaGFzTWlncmF0ZWQ9dHJ1ZQorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5mb3JiaWRkZW5SZWZlcmVuY2U9ZXJyb3IKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLmNvZGVnZW4udW51c2VkTG9jYWw9cHJlc2VydmUKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0udW5jaGVja2VkVHlwZU9wZXJhdGlvbj13YXJuaW5nCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLnVudXNlZERlY2xhcmVkVGhyb3duRXhjZXB0aW9uV2hlbk92ZXJyaWRpbmc9ZGlzYWJsZWQKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvZGVDb21wbGV0ZS5zdGF0aWNGaWVsZFN1ZmZpeGVzPQpkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVtZndvcmtiZW5jaC5pbnRlZ3JhdGlvbi9NRVRBLUlORi9NQU5JRkVTVC5NRiBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbWZ3b3JrYmVuY2guaW50ZWdyYXRpb24vTUVUQS1JTkYvTUFOSUZFU1QuTUYKaW5kZXggYmYxYmUyOS4uMTkwNzk1OCAxMDA2NDQKLS0tIGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVtZndvcmtiZW5jaC5pbnRlZ3JhdGlvbi9NRVRBLUlORi9NQU5JRkVTVC5NRgorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW1md29ya2JlbmNoLmludGVncmF0aW9uL01FVEEtSU5GL01BTklGRVNULk1GCkBAIC0yLDcgKzIsNyBAQAogQnVuZGxlLU1hbmlmZXN0VmVyc2lvbjogMgogQnVuZGxlLU5hbWU6ICVwbHVnaW5OYW1lCiBCdW5kbGUtU3ltYm9saWNOYW1lOiBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmVtZndvcmtiZW5jaC5pbnRlZ3JhdGlvbjsgc2luZ2xldG9uOj10cnVlCi1CdW5kbGUtVmVyc2lvbjogMS4xLjIwMS5xdWFsaWZpZXIKK0J1bmRsZS1WZXJzaW9uOiAxLjIuMS5xdWFsaWZpZXIKIEJ1bmRsZS1BY3RpdmF0b3I6IG9yZy5lY2xpcHNlLndzdC5jb21tb24uaW50ZXJuYWwuZW1md29ya2JlbmNoLmludGVncmF0aW9uLkVNRldvcmtiZW5jaEVkaXRQbHVnaW4KIEJ1bmRsZS1WZW5kb3I6ICVwbHVnaW5WZW5kb3IKIEJ1bmRsZS1Mb2NhbGl6YXRpb246IHBsdWdpbgpAQCAtMTEsNyArMTEsNyBAQAogIG9yZy5lY2xpcHNlLndzdC5jb21tb24uaW50ZXJuYWwuZW1md29ya2JlbmNoLmludGVncmF0aW9uO3gtaW50ZXJuYWw6PXRydWUsCiAgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5pbnRlcm5hbC5lbWZ3b3JrYmVuY2gudmFsaWRhdGVlZGl0O3gtaW50ZXJuYWw6PXRydWUKIFJlcXVpcmUtQnVuZGxlOiBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3M7YnVuZGxlLXZlcnNpb249IlsxLjEuMjAwLDIuMC4wKSIsCi0gb3JnLmVjbGlwc2UuamVtLnV0aWw7YnVuZGxlLXZlcnNpb249IlsyLjAuMTAwLDMuMC4wKSIsCisgb3JnLmVjbGlwc2UuamVtLnV0aWw7YnVuZGxlLXZlcnNpb249IlsyLjEuMCwzLjAuMCkiLAogIG9yZy5lY2xpcHNlLmVtZi5lZGl0O2J1bmRsZS12ZXJzaW9uPSJbMi40LjAsMy4wLjApIiwKICBvcmcuZWNsaXBzZS5lbWYuZWNvcmUueG1pO2J1bmRsZS12ZXJzaW9uPSJbMi40LjAsMy4wLjApIiwKICBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmVtZjtidW5kbGUtdmVyc2lvbj0iWzEuMS4yMDAsMi4wLjApIiwKQEAgLTIxLDYgKzIxLDUgQEAKICBvcmcuZWNsaXBzZS53c3QuY29tbW9uLnByb2plY3QuZmFjZXQuY29yZTtidW5kbGUtdmVyc2lvbj0iWzEuMy4wLDIuMC4wKSIsCiAgb3JnLmVjbGlwc2UuY29yZS5leHByZXNzaW9ucztidW5kbGUtdmVyc2lvbj0iWzMuNC4wLDQuMC4wKSIKIEVjbGlwc2UtTGF6eVN0YXJ0OiB0cnVlCi1CdW5kbGUtUmVxdWlyZWRFeGVjdXRpb25FbnZpcm9ubWVudDogSjJTRS0xLjQsCi0gSjJTRS0xLjUKK0J1bmRsZS1SZXF1aXJlZEV4ZWN1dGlvbkVudmlyb25tZW50OiBKMlNFLTEuNQogQnVuZGxlLUFjdGl2YXRpb25Qb2xpY3k6IGxhenkKZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbWZ3b3JrYmVuY2guaW50ZWdyYXRpb24vcGx1Z2luLnByb3BlcnRpZXMgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW1md29ya2JlbmNoLmludGVncmF0aW9uL3BsdWdpbi5wcm9wZXJ0aWVzCmluZGV4IGNkYzFjZTcuLmE3Yjg0ZjEgMTAwNjQ0Ci0tLSBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbWZ3b3JrYmVuY2guaW50ZWdyYXRpb24vcGx1Z2luLnByb3BlcnRpZXMKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVtZndvcmtiZW5jaC5pbnRlZ3JhdGlvbi9wbHVnaW4ucHJvcGVydGllcwpAQCAtMTMsNCArMTMsNCBAQAogQWRhcHRlcl9GYWN0b3J5X0V4dGVuc2lvbj1BZGFwdGVyIEZhY3RvcnkgRXh0ZW5zaW9uCiBNb2RpZmllckhlbHBlckZhY3Rvcnk9TW9kaWZpZXJIZWxwZXJGYWN0b3J5CiBwbHVnaW5OYW1lPUVNRiBXb3JrYmVuY2ggRWRpdCBQbHVnLWluCi1wbHVnaW5WZW5kb3I9RWNsaXBzZS5vcmcKK3BsdWdpblZlbmRvcj1FY2xpcHNlIFdlYiBUb29scyBQbGF0Zm9ybQpkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVtZndvcmtiZW5jaC5pbnRlZ3JhdGlvbi9zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbWZ3b3JrYmVuY2gvRU1GV29ya2JlbmNoQ29udGV4dC5qYXZhIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVtZndvcmtiZW5jaC5pbnRlZ3JhdGlvbi9zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbWZ3b3JrYmVuY2gvRU1GV29ya2JlbmNoQ29udGV4dC5qYXZhCmluZGV4IDY2YzZiMzUuLjIxNjFmOTQgMTAwNjQ0Ci0tLSBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbWZ3b3JrYmVuY2guaW50ZWdyYXRpb24vc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW1md29ya2JlbmNoL0VNRldvcmtiZW5jaENvbnRleHQuamF2YQorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW1md29ya2JlbmNoLmludGVncmF0aW9uL3NyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2VtZndvcmtiZW5jaC9FTUZXb3JrYmVuY2hDb250ZXh0LmphdmEKQEAgLTM1LDExICszNSwxMSBAQAogaW1wb3J0IG9yZy5lY2xpcHNlLmplbS51dGlsLmVtZi53b3JrYmVuY2guSVN5bmNocm9uaXplckV4dGVuZGVyOwogaW1wb3J0IG9yZy5lY2xpcHNlLmplbS51dGlsLmVtZi53b3JrYmVuY2guUHJvamVjdFJlc291cmNlU2V0OwogaW1wb3J0IG9yZy5lY2xpcHNlLmplbS51dGlsLmVtZi53b3JrYmVuY2guV29ya2JlbmNoVVJJQ29udmVydGVyOwotaW1wb3J0IG9yZy5lY2xpcHNlLmplbS51dGlsLmxvZ2dlci5wcm94eS5Mb2dnZXI7CiBpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5pbnRlcm5hbC5lbWYucmVzb3VyY2UuQ29tcGF0aWJpbGl0eVhNSVJlc291cmNlOwogaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uaW50ZXJuYWwuZW1mLnJlc291cmNlLlJlZmVyZW5jZWRYTUlGYWN0b3J5SW1wbDsKIGltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmludGVybmFsLmVtZi51dGlsaXRpZXMuRGVmYXVsdE92ZXJyaWRhYmxlUmVzb3VyY2VGYWN0b3J5UmVnaXN0cnk7CiBpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5pbnRlcm5hbC5lbWZ3b3JrYmVuY2guZWRpdC5FZGl0TW9kZWxSZWdpc3RyeTsKK2ltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmludGVybmFsLmVtZndvcmtiZW5jaC5pbnRlZ3JhdGlvbi5FTUZXb3JrYmVuY2hFZGl0UGx1Z2luOwogaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uaW50ZXJuYWwuZW1md29ya2JlbmNoLmludGVncmF0aW9uLkVkaXRNb2RlbDsKIGltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmludGVybmFsLmVtZndvcmtiZW5jaC5pbnRlZ3JhdGlvbi5FZGl0TW9kZWxFdmVudDsKIGltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmludGVybmFsLmVtZndvcmtiZW5jaC5pbnRlZ3JhdGlvbi5Qcm9qZWN0UmVzb3VyY2VTZXRFZGl0SW1wbDsKQEAgLTcyLDYgKzcyLDcgQEAKIAkgKiAKIAkgKiBAc2VlIG9yZy5lY2xpcHNlLndzdC5jb21tb24uaW50ZXJuYWwuZW1md29ya2JlbmNoLkVNRldvcmtiZW5jaENvbnRleHQjaW5pdGlhbGl6ZVJlc291cmNlU2V0KG9yZy5lY2xpcHNlLndzdC5jb21tb24uaW50ZXJuYWwuZW1md29ya2JlbmNoLlByb2plY3RSZXNvdXJjZVNldCkKIAkgKi8KKwlAT3ZlcnJpZGUKIAlwcm90ZWN0ZWQgdm9pZCBpbml0aWFsaXplUmVzb3VyY2VTZXQoUHJvamVjdFJlc291cmNlU2V0IGFSZXNvdXJjZVNldCkgewogCQlzdXBlci5pbml0aWFsaXplUmVzb3VyY2VTZXQoYVJlc291cmNlU2V0KTsKIAkJUmVzb3VyY2UuRmFjdG9yeS5SZWdpc3RyeSByZWcgPSBuZXcgRGVmYXVsdE92ZXJyaWRhYmxlUmVzb3VyY2VGYWN0b3J5UmVnaXN0cnkoKTsKQEAgLTI3Niw3ICsyNzcsNyBAQAogCQkJdHJ5IHsKIAkJCQllZGl0TW9kZWwucmVzb3VyY2VDaGFuZ2VkKGFuRXZlbnQpOwogCQkJfSBjYXRjaCAoRXhjZXB0aW9uIGUpIHsKLQkJCQlMb2dnZXIuZ2V0TG9nZ2VyKCkubG9nRXJyb3IoZSk7CisJCQkJRU1GV29ya2JlbmNoRWRpdFBsdWdpbi5sb2dFcnJvcihlKTsKIAkJCX0KIAkJfQogCX0KQEAgLTMwMSw2ICszMDIsNyBAQAogCQkgKiBAc2VlIEFkYXB0ZXIjbm90aWZ5Q2hhbmdlZChuZXcgRU5vdGlmaWNhdGlvbkltcGwoKEludGVybmFsRU9iamVjdClOb3RpZmllciwKIAkJICogICAgICBpbnQsKEVTdHJ1Y3R1cmFsRmVhdHVyZSkgRU9iamVjdCwgT2JqZWN0LCBPYmplY3QsIGludCkpCiAJCSAqLworCQlAT3ZlcnJpZGUKIAkJcHVibGljIHZvaWQgbm90aWZ5Q2hhbmdlZChOb3RpZmljYXRpb24gbm90aWZpY2F0aW9uKSB7CiAJCQlzd2l0Y2ggKG5vdGlmaWNhdGlvbi5nZXRFdmVudFR5cGUoKSkgewogCQkJCWNhc2UgTm90aWZpY2F0aW9uLkFERCA6CkBAIC0zODAsMTAgKzM4MiwxMiBAQAogCSAqIAogCSAqIEBzZWUgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5pbnRlcm5hbC5lbWZ3b3JrYmVuY2guRU1GV29ya2JlbmNoQ29udGV4dEJhc2UjY3JlYXRlVVJJQ29udmVydGVyKG9yZy5lY2xpcHNlLndzdC5jb21tb24uaW50ZXJuYWwuZW1md29ya2JlbmNoLlByb2plY3RSZXNvdXJjZVNldCkKIAkgKi8KKwlAT3ZlcnJpZGUKIAlwcm90ZWN0ZWQgV29ya2JlbmNoVVJJQ29udmVydGVyIGNyZWF0ZVVSSUNvbnZlcnRlcihQcm9qZWN0UmVzb3VyY2VTZXQgYVJlc291cmNlU2V0KSB7CiAJCXJldHVybiBuZXcgQ29tcGF0aWJpbGl0eVdvcmtiZW5jaFVSSUNvbnZlcnRlckltcGwoZ2V0UHJvamVjdCgpLCBhUmVzb3VyY2VTZXQuZ2V0U3luY2hyb25pemVyKCkpOwogCX0KIAorCUBPdmVycmlkZQogCXByb3RlY3RlZCBQcm9qZWN0UmVzb3VyY2VTZXQgY3JlYXRlUmVzb3VyY2VTZXQoKSB7CiAJCWlmIChwcm9qZWN0ID09IG51bGwpCiAJCQl0aHJvdyBuZXcgSWxsZWdhbFN0YXRlRXhjZXB0aW9uKCJBdHRlbXB0IHRvIGNyZWF0ZSByZXNvdXJjZSBzZXQgd2l0aCBudWxsIHByb2plY3QiKTsgLy8kTk9OLU5MUy0xJApAQCAtMzk1LDExICszOTksMTIgQEAKIAkgKiAKIAkgKiBAc2VlIG9yZy5lY2xpcHNlLndzdC5jb21tb24uaW50ZXJuYWwuZW1md29ya2JlbmNoLkVNRldvcmtiZW5jaENvbnRleHRCYXNlI2RlbGV0ZUZpbGUob3JnLmVjbGlwc2UuZW1mLmVjb3JlLnJlc291cmNlLlJlc291cmNlKQogCSAqLworCUBPdmVycmlkZQogCXB1YmxpYyB2b2lkIGRlbGV0ZUZpbGUoUmVzb3VyY2UgcmVzb3VyY2UpIHsKIAkJdHJ5IHsKIAkJCVdvcmtiZW5jaFJlc291cmNlSGVscGVyLmRlbGV0ZVJlc291cmNlKHJlc291cmNlKTsKIAkJfSBjYXRjaCAoQ29yZUV4Y2VwdGlvbiBleCkgewotCQkJTG9nZ2VyLmdldExvZ2dlcigpLmxvZ0Vycm9yKGV4KTsKKwkJCUVNRldvcmtiZW5jaEVkaXRQbHVnaW4ubG9nRXJyb3IoZXgpOwogCQl9CiAKIAl9CmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW1md29ya2JlbmNoLmludGVncmF0aW9uL3NyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2VtZndvcmtiZW5jaC9FTUZXb3JrYmVuY2hFZGl0UmVzb3VyY2VIYW5kbGVyLmphdmEgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW1md29ya2JlbmNoLmludGVncmF0aW9uL3NyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2VtZndvcmtiZW5jaC9FTUZXb3JrYmVuY2hFZGl0UmVzb3VyY2VIYW5kbGVyLmphdmEKaW5kZXggOGJkMTA3My4uNWMwNTRiZSAxMDA2NDQKLS0tIGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVtZndvcmtiZW5jaC5pbnRlZ3JhdGlvbi9zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbWZ3b3JrYmVuY2gvRU1GV29ya2JlbmNoRWRpdFJlc291cmNlSGFuZGxlci5qYXZhCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbWZ3b3JrYmVuY2guaW50ZWdyYXRpb24vc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW1md29ya2JlbmNoL0VNRldvcmtiZW5jaEVkaXRSZXNvdXJjZUhhbmRsZXIuamF2YQpAQCAtMTAsOSArMTAsNiBAQAogICoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKiovCiAvKgogICogQ3JlYXRlZCBvbiBNYXkgMjUsIDIwMDQKLSAqCi0gKiBUT0RPIFRvIGNoYW5nZSB0aGUgdGVtcGxhdGUgZm9yIHRoaXMgZ2VuZXJhdGVkIGZpbGUgZ28gdG8KLSAqIFdpbmRvdyAtIFByZWZlcmVuY2VzIC0gSmF2YSAtIENvZGUgU3R5bGUgLSBDb2RlIFRlbXBsYXRlcwogICovCiBwYWNrYWdlIG9yZy5lY2xpcHNlLndzdC5jb21tb24uaW50ZXJuYWwuZW1md29ya2JlbmNoOwogCkBAIC0yMCw5ICsxNyw2IEBACiAKIC8qKgogICogQGF1dGhvciB2aWpheWIKLSAqIAotICogVE9ETyBUbyBjaGFuZ2UgdGhlIHRlbXBsYXRlIGZvciB0aGlzIGdlbmVyYXRlZCB0eXBlIGNvbW1lbnQgZ28gdG8gV2luZG93IC0gUHJlZmVyZW5jZXMgLSBKYXZhIC0KLSAqIENvZGUgU3R5bGUgLSBDb2RlIFRlbXBsYXRlcwogICovCiBwdWJsaWMgY2xhc3MgRU1GV29ya2JlbmNoRWRpdFJlc291cmNlSGFuZGxlciBleHRlbmRzIE5MUyB7CiAJcHJpdmF0ZSBzdGF0aWMgZmluYWwgU3RyaW5nIEJVTkRMRV9OQU1FID0gImVtZndvcmtiZW5jaGVkaXQiOy8vJE5PTi1OTFMtMSQKZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbWZ3b3JrYmVuY2guaW50ZWdyYXRpb24vc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW1md29ya2JlbmNoL1Bhc3N0aHJ1UmVzb3VyY2VTZXQuamF2YSBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbWZ3b3JrYmVuY2guaW50ZWdyYXRpb24vc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW1md29ya2JlbmNoL1Bhc3N0aHJ1UmVzb3VyY2VTZXQuamF2YQppbmRleCBkMWIzNmVhLi5hNGU5NTdkIDEwMDY0NAotLS0gYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW1md29ya2JlbmNoLmludGVncmF0aW9uL3NyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2VtZndvcmtiZW5jaC9QYXNzdGhydVJlc291cmNlU2V0LmphdmEKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVtZndvcmtiZW5jaC5pbnRlZ3JhdGlvbi9zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbWZ3b3JrYmVuY2gvUGFzc3RocnVSZXNvdXJjZVNldC5qYXZhCkBAIC0yMCw3ICsyMCw2IEBACiBpbXBvcnQgb3JnLmVjbGlwc2UuZW1mLmVjb3JlLkVPYmplY3Q7CiBpbXBvcnQgb3JnLmVjbGlwc2UuZW1mLmVjb3JlLnJlc291cmNlLlJlc291cmNlOwogaW1wb3J0IG9yZy5lY2xpcHNlLmVtZi5lY29yZS5yZXNvdXJjZS5SZXNvdXJjZVNldDsKLWltcG9ydCBvcmcuZWNsaXBzZS5lbWYuZWNvcmUucmVzb3VyY2UuaW1wbC5SZXNvdXJjZVNldEltcGw7CiBpbXBvcnQgb3JnLmVjbGlwc2UuamVtLmludGVybmFsLnV0aWwuZW1mLndvcmtiZW5jaC5Qcm9qZWN0UmVzb3VyY2VTZXRJbXBsOwogaW1wb3J0IG9yZy5lY2xpcHNlLmplbS51dGlsLmVtZi53b3JrYmVuY2guV29ya2JlbmNoUmVzb3VyY2VIZWxwZXJCYXNlOwogCkBAIC00MSw3ICs0MCwxNCBAQAogcHVibGljIGNsYXNzIFBhc3N0aHJ1UmVzb3VyY2VTZXQgZXh0ZW5kcyBQcm9qZWN0UmVzb3VyY2VTZXRJbXBsIHsKIAlwcm90ZWN0ZWQgYm9vbGVhbiBpc0lzb2xhdGVkID0gZmFsc2U7CiAKLQlwdWJsaWMgY2xhc3MgUGFzc3RocnVSZXNvdXJjZXNFTGlzdCBleHRlbmRzIFJlc291cmNlU2V0SW1wbC5SZXNvdXJjZXNFTGlzdCB7CisJcHVibGljIGNsYXNzIFBhc3N0aHJ1UmVzb3VyY2VzRUxpc3QgZXh0ZW5kcyBTeW5jaHJvbml6ZWRSZXNvdXJjZXNFTGlzdCB7CisJCS8qKgorCQkgKiAKKwkJICovCisJCXByaXZhdGUgc3RhdGljIGZpbmFsIGxvbmcgc2VyaWFsVmVyc2lvblVJRCA9IDI1MDQyMDcwNzAyNDQ2Mjc5ODBMOworCisKKwkJQE92ZXJyaWRlCiAJCXB1YmxpYyBib29sZWFuIGFkZChPYmplY3Qgb2JqZWN0KSB7CiAJCQlpZiAob2JqZWN0ID09IG51bGwpCiAJCQkJcmV0dXJuIGZhbHNlOwpAQCAtNTMsNiArNTksNyBAQAogCQl9CiAKIAorCQlAT3ZlcnJpZGUKIAkJcHVibGljIGJvb2xlYW4gYWRkQWxsKENvbGxlY3Rpb24gY29sbGVjdGlvbikgewogCQkJaWYgKGNvbGxlY3Rpb24uaXNFbXB0eSgpKQogCQkJCXJldHVybiBmYWxzZTsKQEAgLTg0LDYgKzkxLDcgQEAKIAkJcmV0dXJuIGlzSXNvbGF0ZWQ7CiAJfQogCisJQE92ZXJyaWRlCiAJcHVibGljIFJlc291cmNlIGNyZWF0ZVJlc291cmNlKFVSSSB1cmkpIHsKIAkJUmVzb3VyY2UgcmVzdWx0ID0gV29ya2JlbmNoUmVzb3VyY2VIZWxwZXJCYXNlLmdldEV4aXN0aW5nT3JDcmVhdGVSZXNvdXJjZSh1cmkpOwogCQlpZiAocmVzdWx0ID09IG51bGwpCkBAIC05NCw2ICsxMDIsNyBAQAogCS8qKgogCSAqIEBzZWUgb3JnLmVjbGlwc2UuZW1mLmVjb3JlLnJlc291cmNlLmltcGwuUmVzb3VyY2VTZXRJbXBsI2RlbWFuZENyZWF0ZVJlc291cmNlKFVSSSkKIAkgKi8KKwlAT3ZlcnJpZGUKIAlwcm90ZWN0ZWQgUmVzb3VyY2UgZGVtYW5kQ3JlYXRlUmVzb3VyY2UoVVJJIHVyaSkgewogCQlSZXNvdXJjZSByZXN1bHQgPSBXb3JrYmVuY2hSZXNvdXJjZUhlbHBlckJhc2UuY3JlYXRlUmVzb3VyY2UodXJpKTsKIAkJaWYgKHJlc3VsdCA9PSBudWxsKQpAQCAtMTA1LDYgKzExNCw3IEBACiAJLyoKIAkgKiBKYXZhZG9jIGNvcGllZCBmcm9tIGludGVyZmFjZS4KIAkgKi8KKwlAT3ZlcnJpZGUKIAlwdWJsaWMgRUxpc3QgZ2V0UmVzb3VyY2VzKCkgewogCQlpZiAoaXNJc29sYXRlZCkKIAkJCXJldHVybiBzdXBlci5nZXRSZXNvdXJjZXMoKTsKQEAgLTExNyw2ICsxMjcsNyBAQAogCS8qKgogCSAqIEBzZWUgb3JnLmVjbGlwc2UuamVtLmludGVybmFsLnV0aWwuZW1mLndvcmtiZW5jaC5Qcm9qZWN0UmVzb3VyY2VTZXRJbXBsI2NyZWF0ZVJlc291cmNlRnJvbUhhbmRsZXJzKFVSSSkKIAkgKi8KKwlAT3ZlcnJpZGUKIAlwcm90ZWN0ZWQgUmVzb3VyY2UgY3JlYXRlUmVzb3VyY2VGcm9tSGFuZGxlcnMoVVJJIHVyaSkgewogCQlpZiAoIWlzSXNvbGF0ZWQpCiAJCQlyZXR1cm4gc3VwZXIuY3JlYXRlUmVzb3VyY2VGcm9tSGFuZGxlcnModXJpKTsKQEAgLTEyNiw2ICsxMzcsNyBAQAogCS8qKgogCSAqIEBzZWUgb3JnLmVjbGlwc2UuamVtLmludGVybmFsLnV0aWwuZW1mLndvcmtiZW5jaC5Qcm9qZWN0UmVzb3VyY2VTZXRJbXBsI2dldFJlc291cmNlRnJvbUhhbmRsZXJzKFVSSSkKIAkgKi8KKwlAT3ZlcnJpZGUKIAlwcm90ZWN0ZWQgUmVzb3VyY2UgZ2V0UmVzb3VyY2VGcm9tSGFuZGxlcnMoVVJJIHVyaSkgewogCQlpZiAoIWlzSXNvbGF0ZWQpCiAJCQlyZXR1cm4gc3VwZXIuZ2V0UmVzb3VyY2VGcm9tSGFuZGxlcnModXJpKTsKQEAgLTEzNSw2ICsxNDcsNyBAQAogCS8qKgogCSAqIEBzZWUgY29tLmlibS5ldG9vbHMuZW1mLndvcmtiZW5jaC5Qcm9qZWN0UmVzb3VyY2VTZXRJbXBsI2dldEVPYmplY3RGcm9tSGFuZGxlcnMoVVJJLCBib29sZWFuKQogCSAqLworCUBPdmVycmlkZQogCXByb3RlY3RlZCBFT2JqZWN0IGdldEVPYmplY3RGcm9tSGFuZGxlcnMoVVJJIHVyaSwgYm9vbGVhbiBsb2FkT25EZW1hbmQpIHsKIAkJaWYgKCFpc0lzb2xhdGVkKQogCQkJcmV0dXJuIHN1cGVyLmdldEVPYmplY3RGcm9tSGFuZGxlcnModXJpLCBsb2FkT25EZW1hbmQpOwpkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVtZndvcmtiZW5jaC5pbnRlZ3JhdGlvbi9zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbWZ3b3JrYmVuY2gvV29ya2JlbmNoUmVzb3VyY2VIZWxwZXIuamF2YSBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbWZ3b3JrYmVuY2guaW50ZWdyYXRpb24vc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW1md29ya2JlbmNoL1dvcmtiZW5jaFJlc291cmNlSGVscGVyLmphdmEKaW5kZXggNjI5Njk4NC4uYTc0YWY5YSAxMDA2NDQKLS0tIGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVtZndvcmtiZW5jaC5pbnRlZ3JhdGlvbi9zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbWZ3b3JrYmVuY2gvV29ya2JlbmNoUmVzb3VyY2VIZWxwZXIuamF2YQorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW1md29ya2JlbmNoLmludGVncmF0aW9uL3NyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2VtZndvcmtiZW5jaC9Xb3JrYmVuY2hSZXNvdXJjZUhlbHBlci5qYXZhCkBAIC00MCwxMSArNDAsMTEgQEAKIGltcG9ydCBvcmcuZWNsaXBzZS5lbWYuZWNvcmUudXRpbC5FY29yZVV0aWw7CiBpbXBvcnQgb3JnLmVjbGlwc2UuamVtLnV0aWwuZW1mLndvcmtiZW5jaC5Xb3JrYmVuY2hSZXNvdXJjZUhlbHBlckJhc2U7CiBpbXBvcnQgb3JnLmVjbGlwc2UuamVtLnV0aWwuZW1mLndvcmtiZW5jaC5Xb3JrYmVuY2hVUklDb252ZXJ0ZXI7Ci1pbXBvcnQgb3JnLmVjbGlwc2UuamVtLnV0aWwubG9nZ2VyLnByb3h5LkxvZ2dlcjsKIGltcG9ydCBvcmcuZWNsaXBzZS5qZW0udXRpbC5wbHVnaW4uSkVNVXRpbFBsdWdpbjsKIGltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmludGVybmFsLmVtZi5yZXNvdXJjZS5SZWZlcmVuY2VkUmVzb3VyY2U7CiBpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5pbnRlcm5hbC5lbWYucmVzb3VyY2UuUmVmZXJlbmNlZFhNSUZhY3RvcnlJbXBsOwogaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uaW50ZXJuYWwuZW1mLnV0aWxpdGllcy5FeHRlbmRlZEVjb3JlVXRpbDsKK2ltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmludGVybmFsLmVtZndvcmtiZW5jaC5pbnRlZ3JhdGlvbi5FTUZXb3JrYmVuY2hFZGl0UGx1Z2luOwogCiAvKioKICAqIEBhdXRob3Igc2NoYWNoZXIKQEAgLTU4LDYgKzU4LDcgQEAKIAogCXByaXZhdGUgc3RhdGljIGNsYXNzIEZpbGVBZGFwdGVyRmFjdG9yeSBleHRlbmRzIEFkYXB0ZXJGYWN0b3J5SW1wbCB7CiAKKwkJQE92ZXJyaWRlCiAJCXB1YmxpYyBBZGFwdGVyIGFkYXB0TmV3KE5vdGlmaWVyIHRhcmdldCwgT2JqZWN0IHR5cGUpIHsKIAkJCUZpbGVBZGFwdGVyIGFkYXB0ZXIgPSBuZXcgRmlsZUFkYXB0ZXIoKTsKIAkJCWFkYXB0ZXIuc2V0VGFyZ2V0KHRhcmdldCk7CkBAIC04MCw2ICs4MSw3IEBACiAJCXB1YmxpYyBzdGF0aWMgZmluYWwgaW50IEZJTEVfTk9UX0xPQURFRCA9IDA7CiAJCXB1YmxpYyBzdGF0aWMgZmluYWwgaW50IEZJTEVfSU5BQ0NFU1NJQkxFID0gLTE7CiAKKwkJQE92ZXJyaWRlCiAJCXB1YmxpYyBib29sZWFuIGlzQWRhcHRlckZvclR5cGUoT2JqZWN0IHR5cGUpIHsKIAkJCXJldHVybiBBREFQVEVSX0tFWS5lcXVhbHModHlwZSk7CiAJCX0KQEAgLTg3LDYgKzg5LDcgQEAKIAkJLyoKIAkJICogVXBkYXRlIHRoZSBzeW5jaHJvbml6YXRpb24gc3RhbXAgd2hlcmUgYXBwcm9wcmlhdGUKIAkJICovCisJCUBPdmVycmlkZQogCQlwdWJsaWMgdm9pZCBub3RpZnlDaGFuZ2VkKE5vdGlmaWNhdGlvbiBtc2cpIHsKIAkJCXN3aXRjaCAobXNnLmdldEZlYXR1cmVJRChudWxsKSkgewogCQkJCWNhc2UgUmVzb3VyY2UuUkVTT1VSQ0VfX0lTX0xPQURFRCA6CkBAIC0xOTIsMTMgKzE5NSw2IEBACiAJCX0KIAogCQkvKioKLQkJICogQHBhcmFtIGZpbGUKLQkJICovCi0JCXB1YmxpYyB2b2lkIHNldEZpbGUoSUZpbGUgZmlsZSkgewotCQkJdGhpcy5maWxlID0gZmlsZTsKLQkJfQotCi0JCS8qKgogCQkgKiBAcGFyYW0gbAogCQkgKi8KIAkJcHVibGljIHZvaWQgc2V0U3luY2hyb25pemF0aW9uU3RhbXAobG9uZyBsKSB7CkBAIC0yMTYsNyArMjEyLDcgQEAKICAgICAgICAgICAgIHRyeSB7CiAgICAgICAgICAgICAgICAgaGFzTG9ja2VkID0gYXF1aXJlU2F2ZUxvY2soZGVsYXkpOwogICAgICAgICAgICAgfSBjYXRjaCAoSW50ZXJydXB0ZWRFeGNlcHRpb24gZSkgewotICAgICAgICAgICAgICAgIExvZ2dlci5nZXRMb2dnZXIoKS53cml0ZShlKTsKKyAgICAgICAgICAgIAlFTUZXb3JrYmVuY2hFZGl0UGx1Z2luLmxvZ0Vycm9yKGUpOwogICAgICAgICAgICAgfQogICAgICAgICAgICAgYm9vbGVhbiByZXN1bHQgPSBmYWxzZTsKICAgICAgICAgICAgIHRyeSB7CkBAIC0yMzEsNyArMjI3LDcgQEAKICAgICAgICAgICAgICAgICAgICAgfQogICAgICAgICAgICAgICAgIH0KICAgICAgICAgICAgIH0gY2F0Y2ggKEV4Y2VwdGlvbiBlKSB7Ci0gICAgICAgICAgICAgICAgTG9nZ2VyLmdldExvZ2dlcigpLndyaXRlKGUpOworICAgICAgICAgICAgCUVNRldvcmtiZW5jaEVkaXRQbHVnaW4ubG9nRXJyb3IoZSk7CiAgICAgICAgICAgICB9IGZpbmFsbHkgewogICAgICAgICAgICAgICAgIGlmIChoYXNMb2NrZWQpCiAgICAgICAgICAgICAgICAgICAgIHJlbGVhc2VTYXZlTG9jaygpOwpkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVtZndvcmtiZW5jaC5pbnRlZ3JhdGlvbi9zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbWZ3b3JrYmVuY2gvZWRpdC9BZGFwdGVyRmFjdG9yeURlc2NyaXB0b3IuamF2YSBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbWZ3b3JrYmVuY2guaW50ZWdyYXRpb24vc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW1md29ya2JlbmNoL2VkaXQvQWRhcHRlckZhY3RvcnlEZXNjcmlwdG9yLmphdmEKaW5kZXggZTcyMTUzZC4uMDA2OWI0YyAxMDA2NDQKLS0tIGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVtZndvcmtiZW5jaC5pbnRlZ3JhdGlvbi9zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbWZ3b3JrYmVuY2gvZWRpdC9BZGFwdGVyRmFjdG9yeURlc2NyaXB0b3IuamF2YQorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW1md29ya2JlbmNoLmludGVncmF0aW9uL3NyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2VtZndvcmtiZW5jaC9lZGl0L0FkYXB0ZXJGYWN0b3J5RGVzY3JpcHRvci5qYXZhCkBAIC0yMywxMCArMjMsMTAgQEAKIGltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJ1bnRpbWUuQ29yZUV4Y2VwdGlvbjsKIGltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJ1bnRpbWUuSUNvbmZpZ3VyYXRpb25FbGVtZW50OwogaW1wb3J0IG9yZy5lY2xpcHNlLmVtZi5jb21tb24ubm90aWZ5LkFkYXB0ZXJGYWN0b3J5OwotaW1wb3J0IG9yZy5lY2xpcHNlLmplbS51dGlsLnBsdWdpbi5KRU1VdGlsUGx1Z2luOwogaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy5pbnRlcm5hbC5BYnN0cmFjdFJlZ2lzdHJ5RGVzY3JpcHRvcjsKIGltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmludGVybmFsLmVtZi51dGlsaXRpZXMuQXNzZXJ0OwogaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uaW50ZXJuYWwuZW1md29ya2JlbmNoLkVNRldvcmtiZW5jaEVkaXRSZXNvdXJjZUhhbmRsZXI7CitpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5pbnRlcm5hbC5lbWZ3b3JrYmVuY2guaW50ZWdyYXRpb24uRU1GV29ya2JlbmNoRWRpdFBsdWdpbjsKIAogCiBwdWJsaWMgY2xhc3MgQWRhcHRlckZhY3RvcnlEZXNjcmlwdG9yIGV4dGVuZHMgQWJzdHJhY3RSZWdpc3RyeURlc2NyaXB0b3IgaW1wbGVtZW50cyBDb21wYXJhYmxlIHsKQEAgLTU0LDYgKzU0LDcgQEAKIAkgKiAKIAkgKiBAc2VlIGphdmEubGFuZy5PYmplY3QjdG9TdHJpbmcoKQogCSAqLworCUBPdmVycmlkZQogCXB1YmxpYyBTdHJpbmcgdG9TdHJpbmcoKSB7CiAJCVN0cmluZ0J1ZmZlciBzYiA9IG5ldyBTdHJpbmdCdWZmZXIoKTsKIAkJc2IuYXBwZW5kKCJBZGFwdGVyRmFjdG9yeURlc2NyaXB0b3IiKTsgLy8kTk9OLU5MUy0xJApAQCAtOTgsOCArOTksNyBAQAogCQl0cnkgewogCQkJZmFjdG9yeSA9IChBZGFwdGVyRmFjdG9yeSkgZWxlbWVudC5jcmVhdGVFeGVjdXRhYmxlRXh0ZW5zaW9uKEFkYXB0ZXJGYWN0b3J5UmVnaXN0cnkuQ0xBU1NfTkFNRSk7CiAJCX0gY2F0Y2ggKENvcmVFeGNlcHRpb24gZSkgewotCQkJSkVNVXRpbFBsdWdpbi5nZXRMb2dnZXIoKS5sb2dFcnJvcihlKTsKLQkJCWZhY3RvcnkgPSBudWxsOworCQkJRU1GV29ya2JlbmNoRWRpdFBsdWdpbi5sb2dFcnJvcihlKTsKIAkJfQogCQlyZXR1cm4gZmFjdG9yeTsKIAl9CkBAIC0xNDgsNiArMTQ4LDcgQEAKIAkgKiAKIAkgKiBAc2VlIG9yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy5pbnRlcm5hbC5BYnN0cmFjdFJlZ2lzdHJ5RGVzY3JpcHRvciNnZXRJRCgpCiAJICovCisJQE92ZXJyaWRlCiAJcHVibGljIFN0cmluZyBnZXRJRCgpIHsKIAkJcmV0dXJuIGlkOwogCX0KZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbWZ3b3JrYmVuY2guaW50ZWdyYXRpb24vc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW1md29ya2JlbmNoL2VkaXQvQWRhcHRlckZhY3RvcnlSZWdpc3RyeS5qYXZhIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVtZndvcmtiZW5jaC5pbnRlZ3JhdGlvbi9zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbWZ3b3JrYmVuY2gvZWRpdC9BZGFwdGVyRmFjdG9yeVJlZ2lzdHJ5LmphdmEKaW5kZXggZTk4Njk2Mi4uZmNlNGJhMiAxMDA2NDQKLS0tIGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVtZndvcmtiZW5jaC5pbnRlZ3JhdGlvbi9zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbWZ3b3JrYmVuY2gvZWRpdC9BZGFwdGVyRmFjdG9yeVJlZ2lzdHJ5LmphdmEKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVtZndvcmtiZW5jaC5pbnRlZ3JhdGlvbi9zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbWZ3b3JrYmVuY2gvZWRpdC9BZGFwdGVyRmFjdG9yeVJlZ2lzdHJ5LmphdmEKQEAgLTIyLDcgKzIyLDYgQEAKIGltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJ1bnRpbWUuSUNvbmZpZ3VyYXRpb25FbGVtZW50OwogaW1wb3J0IG9yZy5lY2xpcHNlLmVtZi5lY29yZS5FUGFja2FnZTsKIGltcG9ydCBvcmcuZWNsaXBzZS5qZW0udXRpbC5SZWdpc3RyeVJlYWRlcjsKLWltcG9ydCBvcmcuZWNsaXBzZS5qZW0udXRpbC5sb2dnZXIucHJveHkuTG9nZ2VyOwogaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uaW50ZXJuYWwuZW1md29ya2JlbmNoLmludGVncmF0aW9uLkVNRldvcmtiZW5jaEVkaXRQbHVnaW47CiAKIC8qKgpAQCAtNzksNiArNzgsNyBAQAogCSAqIAogCSAqIEBzZWUgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzLmludGVybmFsLlJlZ2lzdHJ5UmVhZGVyI3JlYWRFbGVtZW50KG9yZy5lY2xpcHNlLmNvcmUucnVudGltZS5JQ29uZmlndXJhdGlvbkVsZW1lbnQpCiAJICovCisJQE92ZXJyaWRlCiAJcHVibGljIGJvb2xlYW4gcmVhZEVsZW1lbnQoSUNvbmZpZ3VyYXRpb25FbGVtZW50IGVsZW1lbnQpIHsKIAkJdHJ5IHsKIAkJCWlmIChlbGVtZW50LmdldE5hbWUoKS5lcXVhbHMoQURBUFRFUl9GQUNUT1JZKSkgewpAQCAtODcsNyArODcsNyBAQAogCQkJCXJldHVybiB0cnVlOwogCQkJfQogCQl9IGNhdGNoIChSdW50aW1lRXhjZXB0aW9uIHJlKSB7Ci0JCQlMb2dnZXIuZ2V0TG9nZ2VyKCkubG9nRXJyb3IocmUpOworCQkJRU1GV29ya2JlbmNoRWRpdFBsdWdpbi5sb2dFcnJvcihyZSk7CiAJCX0KIAkJcmV0dXJuIGZhbHNlOwogCX0KZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbWZ3b3JrYmVuY2guaW50ZWdyYXRpb24vc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW1md29ya2JlbmNoL2VkaXQvQ2hpbGRDb21tYW5kLmphdmEgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW1md29ya2JlbmNoLmludGVncmF0aW9uL3NyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2VtZndvcmtiZW5jaC9lZGl0L0NoaWxkQ29tbWFuZC5qYXZhCmluZGV4IDZkZWM0MGUuLjc1ZTIzYjIgMTAwNjQ0Ci0tLSBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbWZ3b3JrYmVuY2guaW50ZWdyYXRpb24vc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW1md29ya2JlbmNoL2VkaXQvQ2hpbGRDb21tYW5kLmphdmEKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVtZndvcmtiZW5jaC5pbnRlZ3JhdGlvbi9zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbWZ3b3JrYmVuY2gvZWRpdC9DaGlsZENvbW1hbmQuamF2YQpAQCAtMzIsNiArMzIsNyBAQAogCQltb2RlbFJldHJpZXZlciA9IHJldHJpZXZlcjsKIAl9CiAKKwlAT3ZlcnJpZGUKIAlwdWJsaWMgYm9vbGVhbiBjYW5FeGVjdXRlKCkgewogCQlyZXR1cm4gdHJ1ZTsKIAl9CkBAIC00Myw2ICs0NCw3IEBACiAJCS8vZG9lcyBub3RoaW5nCiAJfQogCisJQE92ZXJyaWRlCiAJcHJvdGVjdGVkIHZvaWQgZXhlY3V0ZUluTW9kZWwoQWJzdHJhY3RFZGl0TW9kZWxDb21tYW5kIGNtZCkgewogCQlFZGl0TW9kZWwgbW9kZWwgPSBtb2RlbFJldHJpZXZlci5nZXRFZGl0TW9kZWxGb3JXcml0ZSh0aGlzKTsKIAkJdHJ5IHsKQEAgLTg2LDYgKzg4LDcgQEAKIAkJfQogCX0KIAorCUBPdmVycmlkZQogCXB1YmxpYyB2b2lkIHVuZG8oKSB7CiAJCXVuZG9Jbk1vZGVsKCk7CiAJCWdldFBhcmVudCgpLnVuZG9Gcm9tKHRoaXMpOwpkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVtZndvcmtiZW5jaC5pbnRlZ3JhdGlvbi9zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbWZ3b3JrYmVuY2gvZWRpdC9DbGllbnRBY2Nlc3NSZWdpc3RyeS5qYXZhIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVtZndvcmtiZW5jaC5pbnRlZ3JhdGlvbi9zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbWZ3b3JrYmVuY2gvZWRpdC9DbGllbnRBY2Nlc3NSZWdpc3RyeS5qYXZhCmluZGV4IDVmMGY4MmQuLjI2NGJjMTcgMTAwNjQ0Ci0tLSBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbWZ3b3JrYmVuY2guaW50ZWdyYXRpb24vc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW1md29ya2JlbmNoL2VkaXQvQ2xpZW50QWNjZXNzUmVnaXN0cnkuamF2YQorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW1md29ya2JlbmNoLmludGVncmF0aW9uL3NyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2VtZndvcmtiZW5jaC9lZGl0L0NsaWVudEFjY2Vzc1JlZ2lzdHJ5LmphdmEKQEAgLTg3LDYgKzg3LDcgQEAKIAkJdGhyb3cgbmV3IENsaWVudEFjY2Vzc1JlZ2lzdHJ5RXhjZXB0aW9uKEVNRldvcmtiZW5jaFJlc291cmNlSGFuZGxlci5nZXRTdHJpbmcoIkNsaWVudEFjY2Vzc1JlZ2lzdHJ5X0VSUk9SXzEiKSwgYWNjZXNzb3JLZXkpOyAvLyROT04tTkxTLTEkCiAJfQogCisJQE92ZXJyaWRlCiAJcHVibGljIFN0cmluZyB0b1N0cmluZygpIHsKIAkJU3RyaW5nQnVmZmVyIHJlc3VsdCA9IG5ldyBTdHJpbmdCdWZmZXIoIkNsaWVudEFjY2Vzc1JlZ2lzdHJ5OiBbIik7IC8vJE5PTi1OTFMtMSQKIAkJcmVzdWx0LmFwcGVuZCgoaXNTdGFibGUoKSkgPyAiU1RBQkxFIiA6ICJPVVQgT0YgU1lOQyIpOyAvLyROT04tTkxTLTEkIC8vJE5PTi1OTFMtMiQKZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbWZ3b3JrYmVuY2guaW50ZWdyYXRpb24vc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW1md29ya2JlbmNoL2VkaXQvQ2xpZW50QWNjZXNzUmVnaXN0cnlFeGNlcHRpb24uamF2YSBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbWZ3b3JrYmVuY2guaW50ZWdyYXRpb24vc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW1md29ya2JlbmNoL2VkaXQvQ2xpZW50QWNjZXNzUmVnaXN0cnlFeGNlcHRpb24uamF2YQppbmRleCBhNWFhMWNiLi5jMTc0MmE2IDEwMDY0NAotLS0gYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW1md29ya2JlbmNoLmludGVncmF0aW9uL3NyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2VtZndvcmtiZW5jaC9lZGl0L0NsaWVudEFjY2Vzc1JlZ2lzdHJ5RXhjZXB0aW9uLmphdmEKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVtZndvcmtiZW5jaC5pbnRlZ3JhdGlvbi9zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbWZ3b3JrYmVuY2gvZWRpdC9DbGllbnRBY2Nlc3NSZWdpc3RyeUV4Y2VwdGlvbi5qYXZhCkBAIC0zMyw2ICszMywxMCBAQAogICovCiBwdWJsaWMgY2xhc3MgQ2xpZW50QWNjZXNzUmVnaXN0cnlFeGNlcHRpb24gZXh0ZW5kcyBSdW50aW1lRXhjZXB0aW9uIHsKIAorCS8qKgorCSAqIAorCSAqLworCXByaXZhdGUgc3RhdGljIGZpbmFsIGxvbmcgc2VyaWFsVmVyc2lvblVJRCA9IC05MDE2ODI3MDIyMjg5Mzc3MjkyTDsKIAlwdWJsaWMgc3RhdGljIGZpbmFsIGludCBVTktOT1dOID0gMDsKIAlwdWJsaWMgc3RhdGljIGZpbmFsIGludCBEQU5HTElOR19SRUZFUkVOQ0UgPSAxOwogCXB1YmxpYyBzdGF0aWMgZmluYWwgaW50IElOVkFMSURfQUNDRVNTX0tFWSA9IDI7CkBAIC01OCw2ICs2Miw3IEBACiAJICogCiAJICogQHNlZSBqYXZhLmxhbmcuVGhyb3dhYmxlI3ByaW50U3RhY2tUcmFjZShqYXZhLmlvLlByaW50U3RyZWFtKQogCSAqLworCUBPdmVycmlkZQogCXB1YmxpYyB2b2lkIHByaW50U3RhY2tUcmFjZShQcmludFN0cmVhbSBzKSB7CiAKIAkJcy5wcmludGxuKHRvU3RyaW5nKCkpOwpAQCAtOTAsNiArOTUsNyBAQAogCSAqIAogCSAqIEBzZWUgamF2YS5sYW5nLlRocm93YWJsZSNwcmludFN0YWNrVHJhY2UoamF2YS5pby5QcmludFdyaXRlcikKIAkgKi8KKwlAT3ZlcnJpZGUKIAlwdWJsaWMgdm9pZCBwcmludFN0YWNrVHJhY2UoUHJpbnRXcml0ZXIgcykgewogCiAJCXMucHJpbnRsbih0b1N0cmluZygpKTsKQEAgLTEyNyw2ICsxMzMsNyBAQAogCQl9CiAJfQogCisJQE92ZXJyaWRlCiAJcHVibGljIFN0cmluZyB0b1N0cmluZygpIHsKIAkJU3RyaW5nQnVmZmVyIHJlc3VsdCA9IG5ldyBTdHJpbmdCdWZmZXIoc3VwZXIudG9TdHJpbmcoKSkuYXBwZW5kKCJcclxuIik7IC8vJE5PTi1OTFMtMSQKIAkJcmVzdWx0LmFwcGVuZChFTUZXb3JrYmVuY2hFZGl0UmVzb3VyY2VIYW5kbGVyLmdldFN0cmluZyhFTUZXb3JrYmVuY2hFZGl0UmVzb3VyY2VIYW5kbGVyLkNsaWVudEFjY2Vzc1JlZ2lzdHJ5RXhjZXB0aW9uX1VJXzEsIG5ldyBPYmplY3RbXXtnZXRUeXBlKCl9KSk7CmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW1md29ya2JlbmNoLmludGVncmF0aW9uL3NyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2VtZndvcmtiZW5jaC9lZGl0L0VNRldvcmtiZW5jaEVkaXRDb250ZXh0RmFjdG9yeS5qYXZhIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVtZndvcmtiZW5jaC5pbnRlZ3JhdGlvbi9zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbWZ3b3JrYmVuY2gvZWRpdC9FTUZXb3JrYmVuY2hFZGl0Q29udGV4dEZhY3RvcnkuamF2YQppbmRleCA2ZDc0OTgxLi5hODUzYTMwIDEwMDY0NAotLS0gYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW1md29ya2JlbmNoLmludGVncmF0aW9uL3NyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2VtZndvcmtiZW5jaC9lZGl0L0VNRldvcmtiZW5jaEVkaXRDb250ZXh0RmFjdG9yeS5qYXZhCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbWZ3b3JrYmVuY2guaW50ZWdyYXRpb24vc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW1md29ya2JlbmNoL2VkaXQvRU1GV29ya2JlbmNoRWRpdENvbnRleHRGYWN0b3J5LmphdmEKQEAgLTE5LDkgKzE5LDkgQEAKIGltcG9ydCBqYXZhLnV0aWwuSGFzaHRhYmxlOwogaW1wb3J0IGphdmEudXRpbC5NYXA7CiAKK2ltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLmludGVybmFsLmpvYnMuTG9ja01hbmFnZXI7CiBpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5yZXNvdXJjZXMuSVByb2plY3Q7CiBpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5ydW50aW1lLmpvYnMuSUxvY2s7Ci1pbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5ydW50aW1lLmpvYnMuSm9iOwogaW1wb3J0IG9yZy5lY2xpcHNlLmVtZi5lY29yZS5yZXNvdXJjZS5SZXNvdXJjZVNldDsKIGltcG9ydCBvcmcuZWNsaXBzZS5qZW0uaW50ZXJuYWwudXRpbC5lbWYud29ya2JlbmNoLkVNRldvcmtiZW5jaENvbnRleHRGYWN0b3J5OwogaW1wb3J0IG9yZy5lY2xpcHNlLmplbS51dGlsLmVtZi53b3JrYmVuY2guRU1GV29ya2JlbmNoQ29udGV4dEJhc2U7CkBAIC00NiwxNCArNDYsMTcgQEAKIAkJc3VwZXIoKTsKIAl9CiAKKwlAT3ZlcnJpZGUKIAlwcm90ZWN0ZWQgRU1GV29ya2JlbmNoQ29udGV4dEJhc2UgcHJpbUNyZWF0ZUVNRkNvbnRleHQoSVByb2plY3QgYVByb2plY3QpIHsKIAkJcmV0dXJuIG5ldyBFTUZXb3JrYmVuY2hDb250ZXh0KGFQcm9qZWN0KTsKIAl9CiAKKwlAT3ZlcnJpZGUKIAlwdWJsaWMgUmVzb3VyY2VTZXRXb3JrYmVuY2hTeW5jaHJvbml6ZXIgY3JlYXRlU3luY2hyb25pemVyKFJlc291cmNlU2V0IGFSZXNvdXJjZVNldCwgSVByb2plY3QgYVByb2plY3QpIHsKIAkJcmV0dXJuIG5ldyBSZXNvdXJjZVNldFdvcmtiZW5jaEVkaXRTeW5jaHJvbml6ZXIoYVJlc291cmNlU2V0LCBhUHJvamVjdCk7CiAJfQogCQorCXByb3RlY3RlZCBzdGF0aWMgTG9ja01hbmFnZXIgbG9ja01hbmFnZXIgPSBuZXcgTG9ja01hbmFnZXIoKTsKIAlwcm90ZWN0ZWQgc3RhdGljIE1hcCBwcm9qZWN0TG9ja3MgPSBuZXcgSGFzaHRhYmxlKCk7CiAKIAlwdWJsaWMgc3RhdGljIElMb2NrIGdldFByb2plY3RMb2NrT2JqZWN0KElQcm9qZWN0IGFQcm9qZWN0KXsKQEAgLTY0LDEzICs2NywxNCBAQAogCQlzeW5jaHJvbml6ZWQgKHByb2plY3RMb2NrcykgewogCQkJSUxvY2sgbG9jayA9IChJTG9jaylwcm9qZWN0TG9ja3MuZ2V0KGhhc2hDb2RlKTsKIAkJCWlmKGxvY2sgPT0gbnVsbCl7Ci0JCQkJbG9jayA9IEpvYi5nZXRKb2JNYW5hZ2VyKCkubmV3TG9jaygpOworCQkJCWxvY2sgPSBsb2NrTWFuYWdlci5uZXdMb2NrKCk7CiAJCQkJcHJvamVjdExvY2tzLnB1dChoYXNoQ29kZSwgbG9jayk7CiAJCQl9CiAJCQlyZXR1cm4gbG9jazsKIAkJfQogCX0KIAkKKwlAT3ZlcnJpZGUKIAlwdWJsaWMgRU1GV29ya2JlbmNoQ29udGV4dEJhc2UgY3JlYXRlRU1GQ29udGV4dChJUHJvamVjdCBhUHJvamVjdCwgSUVNRkNvbnRleHRDb250cmlidXRvciBjb250cmlidXRvcikgewogCQlJTG9jayBsb2NrID0gZ2V0UHJvamVjdExvY2tPYmplY3QoYVByb2plY3QpOwogCQl0cnl7CkBAIC04NSw2ICs4OSw3IEBACiAJCX0KIAl9CiAJCisJQE92ZXJyaWRlCiAJcHJvdGVjdGVkIEVNRldvcmtiZW5jaENvbnRleHRCYXNlIGdldENhY2hlZEVNRkNvbnRleHQoSVByb2plY3QgYVByb2plY3QpIHsKIAkJSUxvY2sgbG9jayA9IGdldFByb2plY3RMb2NrT2JqZWN0KGFQcm9qZWN0KTsKIAkJdHJ5ewpkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVtZndvcmtiZW5jaC5pbnRlZ3JhdGlvbi9zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbWZ3b3JrYmVuY2gvZWRpdC9FZGl0TW9kZWxFeHRlbnNpb24uamF2YSBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbWZ3b3JrYmVuY2guaW50ZWdyYXRpb24vc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW1md29ya2JlbmNoL2VkaXQvRWRpdE1vZGVsRXh0ZW5zaW9uLmphdmEKaW5kZXggNjA0MWRlZi4uZGRiMDg1NiAxMDA2NDQKLS0tIGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVtZndvcmtiZW5jaC5pbnRlZ3JhdGlvbi9zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbWZ3b3JrYmVuY2gvZWRpdC9FZGl0TW9kZWxFeHRlbnNpb24uamF2YQorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW1md29ya2JlbmNoLmludGVncmF0aW9uL3NyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2VtZndvcmtiZW5jaC9lZGl0L0VkaXRNb2RlbEV4dGVuc2lvbi5qYXZhCkBAIC0yMCw4ICsyMCw4IEBACiBpbXBvcnQgamF2YS51dGlsLkNvbGxlY3Rpb247CiAKIGltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJ1bnRpbWUuSUNvbmZpZ3VyYXRpb25FbGVtZW50OwotaW1wb3J0IG9yZy5lY2xpcHNlLmplbS51dGlsLmxvZ2dlci5wcm94eS5Mb2dnZXI7CiBpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzLmludGVybmFsLkNvbmZpZ3VyYXRpb25FbGVtZW50V3JhcHBlcjsKK2ltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmludGVybmFsLmVtZndvcmtiZW5jaC5pbnRlZ3JhdGlvbi5FTUZXb3JrYmVuY2hFZGl0UGx1Z2luOwogCiAKIHB1YmxpYyBjbGFzcyBFZGl0TW9kZWxFeHRlbnNpb24gZXh0ZW5kcyBDb25maWd1cmF0aW9uRWxlbWVudFdyYXBwZXIgewpAQCAtNDAsNyArNDAsNyBAQAogCXByaXZhdGUgdm9pZCBpbml0KCkgewogCQlpZCA9IGVsZW1lbnQuZ2V0QXR0cmlidXRlKElEX0FUVFIpOwogCQlpZiAoaWQgPT0gbnVsbCkgewotCQkJTG9nZ2VyLmdldExvZ2dlcigpLmxvZ0Vycm9yKCJJbmNvcnJlY3QgdXNhZ2Ugb2YgZWRpdE1vZGVsRXh0ZW5zaW9uIGV4dGVuc2lvbiBwb2ludC4gIEVsZW1lbnQgbXVzdCBjb250YWluIGlkIGF0dHJpYnV0ZS4gIFBsdWdpbjogIiArIGdldFBsdWdpbklkKCkpOyAvLyROT04tTkxTLTEkCisJCQlFTUZXb3JrYmVuY2hFZGl0UGx1Z2luLmxvZ0Vycm9yKCJJbmNvcnJlY3QgdXNhZ2Ugb2YgZWRpdE1vZGVsRXh0ZW5zaW9uIGV4dGVuc2lvbiBwb2ludC4gIEVsZW1lbnQgbXVzdCBjb250YWluIGlkIGF0dHJpYnV0ZS4gIFBsdWdpbjogIiArIGdldFBsdWdpbklkKCkpOyAvLyROT04tTkxTLTEkCiAJCQlyZXR1cm47CiAJCX0KIApkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVtZndvcmtiZW5jaC5pbnRlZ3JhdGlvbi9zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbWZ3b3JrYmVuY2gvZWRpdC9FZGl0TW9kZWxFeHRlbnNpb25SZWdpc3RyeS5qYXZhIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVtZndvcmtiZW5jaC5pbnRlZ3JhdGlvbi9zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbWZ3b3JrYmVuY2gvZWRpdC9FZGl0TW9kZWxFeHRlbnNpb25SZWdpc3RyeS5qYXZhCmluZGV4IDQ3YmM1MWIuLjE1MmZiYzQgMTAwNjQ0Ci0tLSBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbWZ3b3JrYmVuY2guaW50ZWdyYXRpb24vc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW1md29ya2JlbmNoL2VkaXQvRWRpdE1vZGVsRXh0ZW5zaW9uUmVnaXN0cnkuamF2YQorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW1md29ya2JlbmNoLmludGVncmF0aW9uL3NyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2VtZndvcmtiZW5jaC9lZGl0L0VkaXRNb2RlbEV4dGVuc2lvblJlZ2lzdHJ5LmphdmEKQEAgLTUzLDYgKzUzLDcgQEAKIAkgKiAKIAkgKiBAc2VlIG9yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy5pbnRlcm5hbC5SZWdpc3RyeVJlYWRlciNyZWFkRWxlbWVudChvcmcuZWNsaXBzZS5jb3JlLnJ1bnRpbWUuSUNvbmZpZ3VyYXRpb25FbGVtZW50KQogCSAqLworCUBPdmVycmlkZQogCXB1YmxpYyBib29sZWFuIHJlYWRFbGVtZW50KElDb25maWd1cmF0aW9uRWxlbWVudCBlbGVtZW50KSB7CiAKIAkJYm9vbGVhbiByZXN1bHQgPSBmYWxzZTsKZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbWZ3b3JrYmVuY2guaW50ZWdyYXRpb24vc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW1md29ya2JlbmNoL2VkaXQvRWRpdE1vZGVsUmVnaXN0cnkuamF2YSBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbWZ3b3JrYmVuY2guaW50ZWdyYXRpb24vc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW1md29ya2JlbmNoL2VkaXQvRWRpdE1vZGVsUmVnaXN0cnkuamF2YQppbmRleCBmYWNkOWNiLi45NzdmZmE0IDEwMDY0NAotLS0gYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW1md29ya2JlbmNoLmludGVncmF0aW9uL3NyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2VtZndvcmtiZW5jaC9lZGl0L0VkaXRNb2RlbFJlZ2lzdHJ5LmphdmEKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVtZndvcmtiZW5jaC5pbnRlZ3JhdGlvbi9zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbWZ3b3JrYmVuY2gvZWRpdC9FZGl0TW9kZWxSZWdpc3RyeS5qYXZhCkBAIC0yNCw3ICsyNCw2IEBACiBpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5ydW50aW1lLkNvcmVFeGNlcHRpb247CiBpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5ydW50aW1lLklDb25maWd1cmF0aW9uRWxlbWVudDsKIGltcG9ydCBvcmcuZWNsaXBzZS5qZW0udXRpbC5SZWdpc3RyeVJlYWRlcjsKLWltcG9ydCBvcmcuZWNsaXBzZS5qZW0udXRpbC5sb2dnZXIucHJveHkuTG9nZ2VyOwogaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uaW50ZXJuYWwuZW1md29ya2JlbmNoLkVNRldvcmtiZW5jaENvbnRleHQ7CiBpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5pbnRlcm5hbC5lbWZ3b3JrYmVuY2guRU1GV29ya2JlbmNoRWRpdFJlc291cmNlSGFuZGxlcjsKIGltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmludGVybmFsLmVtZndvcmtiZW5jaC5pbnRlZ3JhdGlvbi5FTUZXb3JrYmVuY2hFZGl0UGx1Z2luOwpAQCAtNzcsNiArNzYsNyBAQAogCSAqIAogCSAqIEBzZWUgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzLmludGVybmFsLlJlZ2lzdHJ5UmVhZGVyI3JlYWRFbGVtZW50KG9yZy5lY2xpcHNlLmNvcmUucnVudGltZS5JQ29uZmlndXJhdGlvbkVsZW1lbnQpCiAJICovCisJQE92ZXJyaWRlCiAJcHVibGljIGJvb2xlYW4gcmVhZEVsZW1lbnQoSUNvbmZpZ3VyYXRpb25FbGVtZW50IGVsZW1lbnQpIHsKIAkJLyoKIAkJICogVGhlIEVkaXRNb2RlbCBFeHRlbnNpb24gUG9pbnQgZGVmaW5lcyBDb25maWd1cmF0aW9uIGVsZW1lbnRzIG5hbWVkICJlZGl0TW9kZWwiIHdpdGgKQEAgLTEzOSw5ICsxMzksNyBAQAogCQl3aGlsZShuZXh0RWRpdE1vZGVsSW5mbyAhPSBudWxsICYmIChwYXJlbnRNb2RlbElEID0gbmV4dEVkaXRNb2RlbEluZm8uZ2V0UGFyZW50TW9kZWxJRCgpKSAhPSBudWxsKSB7CiAJCQlpZih2aXNpdGVkRWRpdE1vZGVscy5jb250YWluc0tleShwYXJlbnRNb2RlbElEKSkgCiAJCQkJdGhyb3cgbmV3IElsbGVnYWxTdGF0ZUV4Y2VwdGlvbihFTUZXb3JrYmVuY2hFZGl0UmVzb3VyY2VIYW5kbGVyLmdldFN0cmluZyhFTUZXb3JrYmVuY2hFZGl0UmVzb3VyY2VIYW5kbGVyLkVkaXRNb2RlbFJlZ2lzdHJ5X0VSUk9SXzAsbmV3IE9iamVjdCBbXSB7ZWRpdE1vZGVsSUR9KSk7IAotCQkJZWxzZSAKLQkJCQl2aXNpdGVkRWRpdE1vZGVscy5wdXQocGFyZW50TW9kZWxJRCwgbnVsbCk7Ci0JCQkKKwkJCXZpc2l0ZWRFZGl0TW9kZWxzLnB1dChwYXJlbnRNb2RlbElELCBudWxsKTsKIAkJCWV4dGVuc2lvbnMuYWRkQWxsKGdldEFsbEVkaXRNb2RlbEV4dGVuc2lvbnMocGFyZW50TW9kZWxJRCkpOwogCQkJbmV4dEVkaXRNb2RlbEluZm8gPSBnZXRFZGl0TW9kZWxJbmZvQnlJZChwYXJlbnRNb2RlbElEKTsKIAkJfQpAQCAtMjkzLDEwICsyOTEsMTAgQEAKIAkJCQkJCQl0aGlzLmZhY3Rvcnkuc2V0TG9hZEtub3duUmVzb3VyY2VzQXNSZWFkT25seSh2YWx1ZS5ib29sZWFuVmFsdWUoKSk7CiAJCQkJCQkJZGlzY2FyZENvbmZpZ3VyYXRpb25FbGVtZW50SWZOZWNlc3NhcnkoKTsKIAkJCQkJCX0gY2F0Y2ggKENvcmVFeGNlcHRpb24gZSkgewotCQkJCQkJCUxvZ2dlci5nZXRMb2dnZXIoRU1GV29ya2JlbmNoRWRpdFBsdWdpbi5JRCkubG9nRXJyb3IoZSk7CisJCQkJCQkJRU1GV29ya2JlbmNoRWRpdFBsdWdpbi5sb2dFcnJvcihlKTsKIAkJCQkJCX0KIAkJCQkJfSBlbHNlIHsKLQkJCQkJCUxvZ2dlci5nZXRMb2dnZXIoKS5sb2dFcnJvcihFTUZXb3JrYmVuY2hFZGl0UmVzb3VyY2VIYW5kbGVyLkVkaXRNb2RlbFJlZ2lzdHJ5X0VSUk9SXzEpOworCQkJCQkJRU1GV29ya2JlbmNoRWRpdFBsdWdpbi5sb2dFcnJvcihFTUZXb3JrYmVuY2hFZGl0UmVzb3VyY2VIYW5kbGVyLkVkaXRNb2RlbFJlZ2lzdHJ5X0VSUk9SXzEpOwogCQkJCQl9CiAJCQkgICAgICB9CiAJCQkgICAgfQpAQCAtMzM5LDYgKzMzNyw3IEBACiAJCQkJdGhpcy5jb25maWd1cmF0aW9uRWxlbWVudCA9IG51bGw7CiAJCX0KIAorCQlAT3ZlcnJpZGUKIAkJcHVibGljIFN0cmluZyB0b1N0cmluZygpIHsKIAkJCWlmICh0b3N0cmluZ0NhY2hlID09IG51bGwpCiAJCQkJdG9zdHJpbmdDYWNoZSA9ICJFZGl0TW9kZWxJRDogeyIgKyB0aGlzLmVkaXRNb2RlbElEICsgIn0sIFBhcmVudCBNb2RlbCBJRCB7IiArIHRoaXMucGFyZW50TW9kZWxJRCArICJ9LCBDb25maWd1cmF0aW9uIEVsZW1lbnQ6IFsiICsgdGhpcy5jb25maWd1cmF0aW9uRWxlbWVudCArICJdIjsgLy8kTk9OLU5MUy0xJCAvLyROT04tTkxTLTIkIC8vJE5PTi1OTFMtMyQvLyROT04tTkxTLTQkCmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW1md29ya2JlbmNoLmludGVncmF0aW9uL3NyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2VtZndvcmtiZW5jaC9lZGl0L0VkaXRNb2RlbFJlc291cmNlLmphdmEgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW1md29ya2JlbmNoLmludGVncmF0aW9uL3NyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2VtZndvcmtiZW5jaC9lZGl0L0VkaXRNb2RlbFJlc291cmNlLmphdmEKaW5kZXggYjU1NDNhYy4uNjI5OWJkNSAxMDA2NDQKLS0tIGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVtZndvcmtiZW5jaC5pbnRlZ3JhdGlvbi9zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbWZ3b3JrYmVuY2gvZWRpdC9FZGl0TW9kZWxSZXNvdXJjZS5qYXZhCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbWZ3b3JrYmVuY2guaW50ZWdyYXRpb24vc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW1md29ya2JlbmNoL2VkaXQvRWRpdE1vZGVsUmVzb3VyY2UuamF2YQpAQCAtNjgsNiArNjgsNyBAQAogCSAqIAogCSAqIEBzZWUgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzLmludGVybmFsLkFic3RyYWN0UmVnaXN0cnlEZXNjcmlwdG9yI2dldElEKCkKIAkgKi8KKwlAT3ZlcnJpZGUKIAlwdWJsaWMgU3RyaW5nIGdldElEKCkgewogCQlyZXR1cm4gZXh0ZW5zaW9uSUQ7CiAJfQpAQCAtNzcsNiArNzgsNyBAQAogCSAqIAogCSAqIEBzZWUgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzLmludGVybmFsLkFic3RyYWN0UmVnaXN0cnlEZXNjcmlwdG9yI2dldFByaW9yaXR5KCkKIAkgKi8KKwlAT3ZlcnJpZGUKIAlwdWJsaWMgaW50IGdldFByaW9yaXR5KCkgewogCQlpZiAoaXNDb3JlKQogCQkJcmV0dXJuIDA7CmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW1md29ya2JlbmNoLmludGVncmF0aW9uL3NyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2VtZndvcmtiZW5jaC9lZGl0L0V4dGVuZGVkQ29tcG9zZWRBZGFwdGVyRmFjdG9yeS5qYXZhIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVtZndvcmtiZW5jaC5pbnRlZ3JhdGlvbi9zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbWZ3b3JrYmVuY2gvZWRpdC9FeHRlbmRlZENvbXBvc2VkQWRhcHRlckZhY3RvcnkuamF2YQppbmRleCA4ZjI2Y2YzLi44MzM5MTk4IDEwMDY0NAotLS0gYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW1md29ya2JlbmNoLmludGVncmF0aW9uL3NyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2VtZndvcmtiZW5jaC9lZGl0L0V4dGVuZGVkQ29tcG9zZWRBZGFwdGVyRmFjdG9yeS5qYXZhCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbWZ3b3JrYmVuY2guaW50ZWdyYXRpb24vc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW1md29ya2JlbmNoL2VkaXQvRXh0ZW5kZWRDb21wb3NlZEFkYXB0ZXJGYWN0b3J5LmphdmEKQEAgLTI3LDcgKzI3LDcgQEAKIGltcG9ydCBvcmcuZWNsaXBzZS5lbWYuZWNvcmUuRU9iamVjdDsKIGltcG9ydCBvcmcuZWNsaXBzZS5lbWYuZWNvcmUuRVBhY2thZ2U7CiBpbXBvcnQgb3JnLmVjbGlwc2UuZW1mLmVkaXQucHJvdmlkZXIuQ29tcG9zZWRBZGFwdGVyRmFjdG9yeTsKLWltcG9ydCBvcmcuZWNsaXBzZS5qZW0udXRpbC5sb2dnZXIucHJveHkuTG9nZ2VyOworaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uaW50ZXJuYWwuZW1md29ya2JlbmNoLmludGVncmF0aW9uLkVNRldvcmtiZW5jaEVkaXRQbHVnaW47CiAKIC8qKgogICogQGF1dGhvciBzY2hhY2hlcgpAQCAtNjUsNiArNjUsNyBAQAogCSAqIEBzZWUgb3JnLmVjbGlwc2UuZW1mLmNvbW1vbi5ub3RpZnkuQWRhcHRlckZhY3RvcnkjYWRhcHQob3JnLmVjbGlwc2UuZW1mLmNvbW1vbi5ub3RpZnkuTm90aWZpZXIsCiAJICogICAgICBqYXZhLmxhbmcuT2JqZWN0KQogCSAqLworCUBPdmVycmlkZQogCXB1YmxpYyBBZGFwdGVyIGFkYXB0KE5vdGlmaWVyIHRhcmdldCwgT2JqZWN0IHR5cGUpIHsKIAkJQWRhcHRlciByZXN1bHQgPSBudWxsOwogCkBAIC04Nyw3ICs4OCw3IEBACiAJCQkJCQl0cnkgewogCQkJCQkJCXJlc3VsdCA9IGRlbGVnYXRlQWRhcHRlckZhY3RvcnkuYWRhcHQodGFyZ2V0LCB0eXBlKTsKIAkJCQkJCX0gY2F0Y2ggKFJ1bnRpbWVFeGNlcHRpb24gcmUpIHsKLQkJCQkJCQlMb2dnZXIuZ2V0TG9nZ2VyKCkubG9nRXJyb3IocmUpOworCQkJCQkJCUVNRldvcmtiZW5jaEVkaXRQbHVnaW4ubG9nRXJyb3IocmUpOwogCQkJCQkJCWFkYXB0ZXJGYWN0b3JpZXMucmVtb3ZlKGRlbGVnYXRlQWRhcHRlckZhY3RvcnkpOwogCQkJCQkJCWF0dGVtcHRBZGFwdEFnYWluID0gdHJ1ZTsKIAkJCQkJCX0KZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbWZ3b3JrYmVuY2guaW50ZWdyYXRpb24vc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW1md29ya2JlbmNoL2VkaXQvSW52ZXJ0ZWRDb21tYW5kLmphdmEgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW1md29ya2JlbmNoLmludGVncmF0aW9uL3NyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2VtZndvcmtiZW5jaC9lZGl0L0ludmVydGVkQ29tbWFuZC5qYXZhCmluZGV4IDJiYmNiMTEuLmViMjVhN2EgMTAwNjQ0Ci0tLSBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbWZ3b3JrYmVuY2guaW50ZWdyYXRpb24vc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW1md29ya2JlbmNoL2VkaXQvSW52ZXJ0ZWRDb21tYW5kLmphdmEKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVtZndvcmtiZW5jaC5pbnRlZ3JhdGlvbi9zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbWZ3b3JrYmVuY2gvZWRpdC9JbnZlcnRlZENvbW1hbmQuamF2YQpAQCAtMjYsMTAgKzI2LDEyIEBACiAJCXN1cGVyKHRhcmdldENvbW1hbmQpOwogCX0KIAorCUBPdmVycmlkZQogCXB1YmxpYyBib29sZWFuIGNhbkV4ZWN1dGUoKSB7CiAJCXJldHVybiBnZXRUYXJnZXQoKS5jYW5VbmRvKCk7CiAJfQogCisJQE92ZXJyaWRlCiAJcHVibGljIGJvb2xlYW4gY2FuVW5kbygpIHsKIAkJcmV0dXJuIGdldFRhcmdldCgpLmNhbkV4ZWN1dGUoKTsKIAl9CkBAIC00NCw2ICs0Niw3IEBACiAJLyoqCiAJICogZ2V0RWRpdE1vZGVsQ29tbWFuZCBtZXRob2QgY29tbWVudC4KIAkgKi8KKwlAT3ZlcnJpZGUKIAlwdWJsaWMgRWRpdE1vZGVsQ29tbWFuZCBnZXRFZGl0TW9kZWxDb21tYW5kKCkgewogCQlyZXR1cm4gKChBYnN0cmFjdEVkaXRNb2RlbENvbW1hbmQpIGdldFRhcmdldCgpKS5nZXRFZGl0TW9kZWxDb21tYW5kKCk7CiAJfQpAQCAtNjIsNiArNjUsNyBAQAogCQlnZXRUYXJnZXQoKS51bmRvKCk7CiAJfQogCisJQE92ZXJyaWRlCiAJcHVibGljIHZvaWQgdW5kbygpIHsKIAkJZ2V0VGFyZ2V0KCkucmVkbygpOwogCX0KZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbWZ3b3JrYmVuY2guaW50ZWdyYXRpb24vc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW1md29ya2JlbmNoL2VkaXQvUGFyZW50Q29tbWFuZC5qYXZhIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVtZndvcmtiZW5jaC5pbnRlZ3JhdGlvbi9zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbWZ3b3JrYmVuY2gvZWRpdC9QYXJlbnRDb21tYW5kLmphdmEKaW5kZXggOWM3ZGM5MC4uMWE4OGNiZiAxMDA2NDQKLS0tIGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVtZndvcmtiZW5jaC5pbnRlZ3JhdGlvbi9zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbWZ3b3JrYmVuY2gvZWRpdC9QYXJlbnRDb21tYW5kLmphdmEKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVtZndvcmtiZW5jaC5pbnRlZ3JhdGlvbi9zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbWZ3b3JrYmVuY2gvZWRpdC9QYXJlbnRDb21tYW5kLmphdmEKQEAgLTQyLDYgKzQyLDcgQEAKIAkJY2hpbGRyZW4gPSBuZXcgQXJyYXlMaXN0KDEpOwogCX0KIAorCUBPdmVycmlkZQogCXB1YmxpYyBib29sZWFuIGNhbkV4ZWN1dGUoKSB7CiAJCXJldHVybiBnZXRUYXJnZXQoKS5jYW5FeGVjdXRlKCk7CiAJfQpAQCAtOTIsNiArOTMsNyBAQAogCQlwdXNoQ2hpbGRyZW5Gb3JFeGVjdXRlKCk7CiAJfQogCisJQE92ZXJyaWRlCiAJcHJvdGVjdGVkIHZvaWQgZXhlY3V0ZUluTW9kZWwoQWJzdHJhY3RFZGl0TW9kZWxDb21tYW5kIGNtZCkgewogCQlnZXRFZGl0TW9kZWwoKS5nZXRDb21tYW5kU3RhY2soKS5leGVjdXRlKGNtZCk7CiAJfQpAQCAtMTQ1LDYgKzE0Nyw3IEBACiAJCWludmVydEZyb20oY2hpbGQpOwogCX0KIAorCUBPdmVycmlkZQogCXB1YmxpYyB2b2lkIHVuZG8oKSB7CiAJCWdldFRhcmdldCgpLnVuZG8oKTsKIAkJaW52ZXJ0Q2hpbGRyZW4oKTsKZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbWZ3b3JrYmVuY2guaW50ZWdyYXRpb24vc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW1md29ya2JlbmNoL2VkaXQvUmVhZE9ubHlDbGllbnRBY2Nlc3NSZWdpc3RyeS5qYXZhIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVtZndvcmtiZW5jaC5pbnRlZ3JhdGlvbi9zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbWZ3b3JrYmVuY2gvZWRpdC9SZWFkT25seUNsaWVudEFjY2Vzc1JlZ2lzdHJ5LmphdmEKaW5kZXggZTg0NTQyOC4uZTJmYzc2NyAxMDA2NDQKLS0tIGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVtZndvcmtiZW5jaC5pbnRlZ3JhdGlvbi9zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbWZ3b3JrYmVuY2gvZWRpdC9SZWFkT25seUNsaWVudEFjY2Vzc1JlZ2lzdHJ5LmphdmEKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVtZndvcmtiZW5jaC5pbnRlZ3JhdGlvbi9zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbWZ3b3JrYmVuY2gvZWRpdC9SZWFkT25seUNsaWVudEFjY2Vzc1JlZ2lzdHJ5LmphdmEKQEAgLTI1LDYgKzI1LDcgQEAKIAkJc3VwZXIoKTsKIAl9CiAKKwlAT3ZlcnJpZGUKIAlwdWJsaWMgc3luY2hyb25pemVkIHZvaWQgYWNjZXNzKE9iamVjdCBhY2Nlc3NvcktleSkgewogCQlpZiAoIXJlZ2lzdHJ5LmNvbnRhaW5zS2V5KGFjY2Vzc29yS2V5KSkgewogCQkJdGhpcy5yZWdpc3RyeS5wdXQoYWNjZXNzb3JLZXksIG51bGwpOwpAQCAtMzIsNiArMzMsNyBAQAogCQkJdGhyb3cgbmV3IENsaWVudEFjY2Vzc1JlZ2lzdHJ5RXhjZXB0aW9uKEVNRldvcmtiZW5jaEVkaXRSZXNvdXJjZUhhbmRsZXIuQ2xpZW50QWNjZXNzUmVnaXN0cnlfRVJST1JfMCwgYWNjZXNzb3JLZXkpOwogCX0KIAorCUBPdmVycmlkZQogCXB1YmxpYyBzeW5jaHJvbml6ZWQgdm9pZCByZWxlYXNlKE9iamVjdCBhY2Nlc3NvcktleSkgewogCiAJCS8qCkBAIC00Myw2ICs0NSw3IEBACiAJCQljb21wbGFpbihhY2Nlc3NvcktleSk7CiAJfQogCisJQE92ZXJyaWRlCiAJcHVibGljIHZvaWQgY29tcGxhaW4oT2JqZWN0IGFjY2Vzc29yS2V5KSB7CiAKIAkJdGhyb3cgbmV3IENsaWVudEFjY2Vzc1JlZ2lzdHJ5RXhjZXB0aW9uKEVNRldvcmtiZW5jaFJlc291cmNlSGFuZGxlci5nZXRTdHJpbmcoIkNsaWVudEFjY2Vzc1JlZ2lzdHJ5X0VSUk9SXzEiKSwgYWNjZXNzb3JLZXkpOyAvLyROT04tTkxTLTEkCmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW1md29ya2JlbmNoLmludGVncmF0aW9uL3NyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2VtZndvcmtiZW5jaC9lZGl0L1NuYXBzaG90LmphdmEgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW1md29ya2JlbmNoLmludGVncmF0aW9uL3NyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2VtZndvcmtiZW5jaC9lZGl0L1NuYXBzaG90LmphdmEKaW5kZXggYTJiNjRiNC4uNjY4MWEzZCAxMDA2NDQKLS0tIGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVtZndvcmtiZW5jaC5pbnRlZ3JhdGlvbi9zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbWZ3b3JrYmVuY2gvZWRpdC9TbmFwc2hvdC5qYXZhCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbWZ3b3JrYmVuY2guaW50ZWdyYXRpb24vc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW1md29ya2JlbmNoL2VkaXQvU25hcHNob3QuamF2YQpAQCAtMjcsNiArMjcsMTEgQEAKICAqLwogcHVibGljIGNsYXNzIFNuYXBzaG90IGV4dGVuZHMgUnVudGltZUV4Y2VwdGlvbiB7CiAKKwkvKioKKwkgKiAKKwkgKi8KKwlwcml2YXRlIHN0YXRpYyBmaW5hbCBsb25nIHNlcmlhbFZlcnNpb25VSUQgPSAtNjA0MTQ4ODAwMDY0Mjc1NzM0N0w7CisKIAlwdWJsaWMgU25hcHNob3QoKSB7CiAJCXN1cGVyKEVNRldvcmtiZW5jaEVkaXRSZXNvdXJjZUhhbmRsZXIuU25hcHNob3RfRVJST1JfMCk7CiAJfQpkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVtZndvcmtiZW5jaC5pbnRlZ3JhdGlvbi9zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbWZ3b3JrYmVuY2gvZWRpdC9XcmFwcGluZ0NvbW1hbmRTdGFjay5qYXZhIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVtZndvcmtiZW5jaC5pbnRlZ3JhdGlvbi9zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbWZ3b3JrYmVuY2gvZWRpdC9XcmFwcGluZ0NvbW1hbmRTdGFjay5qYXZhCmluZGV4IGJmMTUzNzEuLjdhNThkNjIgMTAwNjQ0Ci0tLSBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbWZ3b3JrYmVuY2guaW50ZWdyYXRpb24vc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW1md29ya2JlbmNoL2VkaXQvV3JhcHBpbmdDb21tYW5kU3RhY2suamF2YQorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW1md29ya2JlbmNoLmludGVncmF0aW9uL3NyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2VtZndvcmtiZW5jaC9lZGl0L1dyYXBwaW5nQ29tbWFuZFN0YWNrLmphdmEKQEAgLTMyLDYgKzMyLDcgQEAKIAkJZWRpdE1vZGVsID0gYW5FZGl0TW9kZWw7CiAJfQogCisJQE92ZXJyaWRlCiAJcHVibGljIHZvaWQgZXhlY3V0ZShDb21tYW5kIGNvbW1hbmQpIHsKIAkJUGFyZW50Q29tbWFuZCBwYXJlbnQgPSBuZXcgUGFyZW50Q29tbWFuZChjb21tYW5kLCBlZGl0TW9kZWwpOwogCQlzdXBlci5leGVjdXRlKHBhcmVudCk7CmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW1md29ya2JlbmNoLmludGVncmF0aW9uL3NyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2VtZndvcmtiZW5jaC9pbnRlZ3JhdGlvbi9Db21wb3NlZEFjY2Vzc29yS2V5LmphdmEgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW1md29ya2JlbmNoLmludGVncmF0aW9uL3NyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2VtZndvcmtiZW5jaC9pbnRlZ3JhdGlvbi9Db21wb3NlZEFjY2Vzc29yS2V5LmphdmEKaW5kZXggNzBjYWMxZS4uNDBjOThlZiAxMDA2NDQKLS0tIGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVtZndvcmtiZW5jaC5pbnRlZ3JhdGlvbi9zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbWZ3b3JrYmVuY2gvaW50ZWdyYXRpb24vQ29tcG9zZWRBY2Nlc3NvcktleS5qYXZhCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbWZ3b3JrYmVuY2guaW50ZWdyYXRpb24vc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW1md29ya2JlbmNoL2ludGVncmF0aW9uL0NvbXBvc2VkQWNjZXNzb3JLZXkuamF2YQpAQCAtMzUsNiArMzUsNyBAQAogCQl0aGlzLmFkZG9uS2V5ID0gYWRkb25LZXk7CiAJfQogCisJQE92ZXJyaWRlCiAJcHVibGljIGJvb2xlYW4gZXF1YWxzKE9iamVjdCBvdGhlcikgewogCQlpZiAob3RoZXIgPT0gbnVsbCB8fCAhKG90aGVyIGluc3RhbmNlb2YgQ29tcG9zZWRBY2Nlc3NvcktleSkpCiAJCQlyZXR1cm4gZmFsc2U7CkBAIC00OCw2ICs0OSw3IEBACiAJICogCiAJICogQHNlZSBqYXZhLmxhbmcuT2JqZWN0I2hhc2hDb2RlKCkKIAkgKi8KKwlAT3ZlcnJpZGUKIAlwdWJsaWMgaW50IGhhc2hDb2RlKCkgewogCQlyZXR1cm4gYWNjZXNzb3JLZXkuaGFzaENvZGUoKSBeIGFkZG9uS2V5Lmhhc2hDb2RlKCk7CiAJfQpkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVtZndvcmtiZW5jaC5pbnRlZ3JhdGlvbi9zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbWZ3b3JrYmVuY2gvaW50ZWdyYXRpb24vQ29tcG9zZWRFZGl0TW9kZWwuamF2YSBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbWZ3b3JrYmVuY2guaW50ZWdyYXRpb24vc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW1md29ya2JlbmNoL2ludGVncmF0aW9uL0NvbXBvc2VkRWRpdE1vZGVsLmphdmEKaW5kZXggZTQ2ZmE5YS4uZjNiNGVkNCAxMDA2NDQKLS0tIGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVtZndvcmtiZW5jaC5pbnRlZ3JhdGlvbi9zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbWZ3b3JrYmVuY2gvaW50ZWdyYXRpb24vQ29tcG9zZWRFZGl0TW9kZWwuamF2YQorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW1md29ya2JlbmNoLmludGVncmF0aW9uL3NyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2VtZndvcmtiZW5jaC9pbnRlZ3JhdGlvbi9Db21wb3NlZEVkaXRNb2RlbC5qYXZhCkBAIC0xMDksNiArMTA5LDcgQEAKIAkvKioKIAkgKiBSZXR1cm4gdGhlIENvbW1hbmRTdGFjay4KIAkgKi8KKwlAT3ZlcnJpZGUKIAlwcm90ZWN0ZWQgQmFzaWNDb21tYW5kU3RhY2sgY3JlYXRlQ29tbWFuZFN0YWNrKCkgewogCQlyZXR1cm4gbmV3IFdyYXBwaW5nQ29tbWFuZFN0YWNrKHRoaXMpOwogCX0KQEAgLTEyMSw2ICsxMjIsNyBAQAogCQkJbm90aWZ5TGlzdGVuZXJzKGFuRXZlbnQpOwogCX0KIAorCUBPdmVycmlkZQogCXB1YmxpYyBTZXQgZ2V0QWZmZWN0ZWRGaWxlcygpIHsKIAkJU2V0IGFTZXQgPSBuZXcgSGFzaFNldCgpOwogCQlMaXN0IG1vZGVscyA9IGdldENoaWxkcmVuKCk7CkBAIC0xNDYsNiArMTQ4LDcgQEAKIAkvKioKIAkgKiBQYXNzIGFsb25nIHRvIGNoaWxkcmVuLgogCSAqLworCUBPdmVycmlkZQogCXByb3RlY3RlZCB2b2lkIGhhbmRsZVNhdmVJZk5lY2Vzc2FyeURpZE5vdFNhdmUoSVByb2dyZXNzTW9uaXRvciBtb25pdG9yKSB7CiAJCUxpc3QgbGlzdCA9IGdldENoaWxkcmVuKCk7CiAJCUVkaXRNb2RlbCBlZGl0TW9kZWw7CkBAIC0xNTgsNiArMTYxLDcgQEAKIAkvKioKIAkgKiBSZXR1cm4gd2hldGhlciBhIHNhdmUgaXMgbmVlZGVkIG9uIHRoZSBDb21tYW5kU3RhY2sKIAkgKi8KKwlAT3ZlcnJpZGUKIAlwdWJsaWMgYm9vbGVhbiBpc0RpcnR5KCkgewogCQlJdGVyYXRvciBlZGl0TW9kZWxzID0gZ2V0Q2hpbGRyZW4oKS5pdGVyYXRvcigpOwogCQl3aGlsZSAoZWRpdE1vZGVscy5oYXNOZXh0KCkpIHsKQEAgLTE2OCw2ICsxNzIsNyBAQAogCQlyZXR1cm4gZmFsc2U7CiAJfQogCisJQE92ZXJyaWRlCiAJcHVibGljIGJvb2xlYW4gaXNSZWFkT25seSgpIHsKIAkJcmV0dXJuIGZhbHNlOwogCX0KQEAgLTE3NSw2ICsxODAsNyBAQAogCS8qKgogCSAqIFJldHVybiB3aGV0aGVyIGEgc2F2ZSBpcyBuZWVkZWQgb24gdGhlIENvbW1hbmRTdGFjawogCSAqLworCUBPdmVycmlkZQogCXB1YmxpYyBib29sZWFuIGlzSW50ZXJyZXN0ZWRJblJlc291cmNlKFJlc291cmNlIGFSZXNvdXJjZSkgewogCQlJdGVyYXRvciBlZGl0TW9kZWxzID0gZ2V0Q2hpbGRyZW4oKS5pdGVyYXRvcigpOwogCQl3aGlsZSAoZWRpdE1vZGVscy5oYXNOZXh0KCkpIHsKQEAgLTE4NSw2ICsxOTEsNyBAQAogCQlyZXR1cm4gZmFsc2U7CiAJfQogCisJQE92ZXJyaWRlCiAJcHVibGljIHZvaWQgcHJpbVNhdmUoSVByb2dyZXNzTW9uaXRvciBtb25pdG9yKSB7CiAJCUxpc3QgbGlzdCA9IGdldENoaWxkcmVuKCk7CiAJCWZvciAoaW50IGkgPSAwOyBpIDwgbGlzdC5zaXplKCk7IGkrKykKQEAgLTE5NSw2ICsyMDIsNyBAQAogCSAqIFRoaXMgb25seSBpbmNyZW1lbnRzIHRoZSByZWZlcmVuY2UgY291bnQgb2YgdGhlIGNoaWxkcmVuIGFuZCBzaG91bGQgb25seSBiZSBjYWxsZWQgaWYgeW91CiAJICoga25vdyB3aGF0IHlvdSBhcmUgZG9pbmcuCiAJICovCisJQE92ZXJyaWRlCiAJcHVibGljIHZvaWQgYWNjZXNzKE9iamVjdCBhY2Nlc3NvcktleSkgewogCQlDb21wb3NlZEFjY2Vzc29yS2V5IGNvbXBvc2VkQWNjZXNzb3JLZXkgPSBDb21wb3NlZEFjY2Vzc29yS2V5LmdldENvbXBvc2VkQWNjZXNzb3JLZXkoYWNjZXNzb3JLZXksIHRoaXMpOwogCQlpZiAoZ2V0Q2hpbGRyZW4oKS5zaXplKCkgPT0gMCkgewpAQCAtMjE2LDYgKzIyNCw3IEBACiAJICogVGhpcyBtZXRob2Qgc2hvdWxkIGJlIGNhbGxlZCBmcm9tIGVhY2ggY2xpZW50IHdoZW4gdGhleSBhcmUgZmluaXNoZWQgd29ya2luZyB3aXRoIHRoZQogCSAqIEVkaXRNb2RlbC4KIAkgKi8KKwlAT3ZlcnJpZGUKIAlwdWJsaWMgdm9pZCByZWxlYXNlQWNjZXNzKE9iamVjdCBhY2Nlc3NvcktleSkgewogCQlMaXN0IHRlbXBjaGlsZHJlbiA9IGdldENoaWxkcmVuKCk7CiAJCUNvbXBvc2VkQWNjZXNzb3JLZXkgY29tcG9zZWRBY2Nlc3NvcktleSA9IENvbXBvc2VkQWNjZXNzb3JLZXkuZ2V0Q29tcG9zZWRBY2Nlc3NvcktleShhY2Nlc3NvcktleSwgdGhpcyk7CkBAIC0yMzUsNiArMjQ0LDcgQEAKIAkvKioKIAkgKiBJZiBvbmUgc2hvdWxkIHNhdmUsIHRoZXkgYWxsIHNob3VsZCBzYXZlLgogCSAqLworCUBPdmVycmlkZQogCXByb3RlY3RlZCBib29sZWFuIHNob3VsZFNhdmUoKSB7CiAJCUxpc3QgbGlzdCA9IGdldENoaWxkcmVuKCk7CiAJCUVkaXRNb2RlbCBlZGl0TW9kZWw7CkBAIC0yNDksNiArMjU5LDcgQEAKIAkvKioKIAkgKiBJZiBvbmUgc2hvdWxkIHNhdmUsIHRoZXkgYWxsIHNob3VsZCBzYXZlLgogCSAqLworCUBPdmVycmlkZQogCXByb3RlY3RlZCBib29sZWFuIHNob3VsZFNhdmUoSU9wZXJhdGlvbkhhbmRsZXIgb3BlcmF0aW9uSGFuZGxlcikgewogCQlMaXN0IGxpc3QgPSBnZXRDaGlsZHJlbigpOwogCQlFZGl0TW9kZWwgZWRpdE1vZGVsOwpAQCAtMjYzLDYgKzI3NCw3IEBACiAJLyoqCiAJICogQHNlZSBjb20uaWJtLmV0b29scy5qMmVlLndvcmtiZW5jaC5FZGl0TW9kZWwjZ2V0Tm9uUmVzb3VyY2VGaWxlcygpCiAJICovCisJQE92ZXJyaWRlCiAJcHVibGljIExpc3QgZ2V0Tm9uUmVzb3VyY2VGaWxlcygpIHsKIAkJTGlzdCBsaXN0ID0gZ2V0Q2hpbGRyZW4oKTsKIAkJTGlzdCByZXN1bHQgPSBuZXcgQXJyYXlMaXN0KCk7CmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW1md29ya2JlbmNoLmludGVncmF0aW9uL3NyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2VtZndvcmtiZW5jaC9pbnRlZ3JhdGlvbi9EeW5hbWljQWRhcHRlckZhY3RvcnkuamF2YSBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbWZ3b3JrYmVuY2guaW50ZWdyYXRpb24vc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW1md29ya2JlbmNoL2ludGVncmF0aW9uL0R5bmFtaWNBZGFwdGVyRmFjdG9yeS5qYXZhCmluZGV4IDM3NTcxZWUuLjU2NTA1MGMgMTAwNjQ0Ci0tLSBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbWZ3b3JrYmVuY2guaW50ZWdyYXRpb24vc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW1md29ya2JlbmNoL2ludGVncmF0aW9uL0R5bmFtaWNBZGFwdGVyRmFjdG9yeS5qYXZhCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbWZ3b3JrYmVuY2guaW50ZWdyYXRpb24vc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW1md29ya2JlbmNoL2ludGVncmF0aW9uL0R5bmFtaWNBZGFwdGVyRmFjdG9yeS5qYXZhCkBAIC00MSw3ICs0MSw2IEBACiBpbXBvcnQgb3JnLmVjbGlwc2UuZW1mLmVkaXQucHJvdmlkZXIuSU5vdGlmeUNoYW5nZWRMaXN0ZW5lcjsKIGltcG9ydCBvcmcuZWNsaXBzZS5lbWYuZWRpdC5wcm92aWRlci5yZXNvdXJjZS5SZXNvdXJjZUl0ZW1Qcm92aWRlckFkYXB0ZXJGYWN0b3J5OwogaW1wb3J0IG9yZy5lY2xpcHNlLmplbS51dGlsLmVtZi53b3JrYmVuY2guUHJvamVjdFV0aWxpdGllczsKLWltcG9ydCBvcmcuZWNsaXBzZS5qZW0udXRpbC5sb2dnZXIucHJveHkuTG9nZ2VyOwogaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy5pbnRlcm5hbC5lbmFibGVtZW50LkVuYWJsZW1lbnRJZGVudGlmaWVyOwogaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy5pbnRlcm5hbC5lbmFibGVtZW50LkVuYWJsZW1lbnRJZGVudGlmaWVyRXZlbnQ7CiBpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzLmludGVybmFsLmVuYWJsZW1lbnQuRW5hYmxlbWVudE1hbmFnZXI7CkBAIC0yMTEsNyArMjEwLDcgQEAKIAkJCQllbHNlCiAJCQkJCWFkZEFkYXB0ZXJGYWN0b3J5KGFQcm9qZWN0LCBhUGFja2FnZSwgZmFjdG9yeSk7CiAJCQl9IGNhdGNoIChSdW50aW1lRXhjZXB0aW9uIHJlKSB7Ci0JCQkJTG9nZ2VyLmdldExvZ2dlcigpLmxvZ0Vycm9yKHJlKTsKKwkJCQlFTUZXb3JrYmVuY2hFZGl0UGx1Z2luLmxvZ0Vycm9yKHJlKTsKIAkJCX0KIAkJfQogCQlyZXR1cm4gZmFjdG9yeTsKQEAgLTQwOSw3ICs0MDgsNyBAQAogCQkJCQl0cnkgewogCQkJCQkJcmVzdWx0ID0gZGVsZWdhdGVBZGFwdGVyRmFjdG9yeS5hZGFwdCh0YXJnZXQsIHR5cGUpOwogCQkJCQl9IGNhdGNoIChSdW50aW1lRXhjZXB0aW9uIHJlKSB7Ci0JCQkJCQlMb2dnZXIuZ2V0TG9nZ2VyKCkubG9nRXJyb3IocmUpOworCQkJCQkJRU1GV29ya2JlbmNoRWRpdFBsdWdpbi5sb2dFcnJvcihyZSk7CiAJCQkJCQlyZW1vdmVGYWN0b3J5Rm9yVHlwZXMocCwgdHlwZXMpOwogCQkJCQkJYXR0ZW1wdEFkYXB0QWdhaW4gPSB0cnVlOwogCQkJCQl9CkBAIC02MjAsNiArNjE5LDcgQEAKIAkJCQkJICogCiAJCQkJCSAqIEBzZWUgb3JnLmVjbGlwc2UuZW1mLmNvbW1vbi5ub3RpZnkuaW1wbC5Ob3RpZmljYXRpb25JbXBsI2dldE5vdGlmaWVyKCkKIAkJCQkJICovCisJCQkJCUBPdmVycmlkZQogCQkJCQlwdWJsaWMgT2JqZWN0IGdldE5vdGlmaWVyKCkgewogCQkJCQkJcmV0dXJuIG51bGw7IC8vIG5vdGlmaWVyOwogCQkJCQl9CmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW1md29ya2JlbmNoLmludGVncmF0aW9uL3NyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2VtZndvcmtiZW5jaC9pbnRlZ3JhdGlvbi9FTUZXb3JrYmVuY2hFZGl0UGx1Z2luLmphdmEgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW1md29ya2JlbmNoLmludGVncmF0aW9uL3NyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2VtZndvcmtiZW5jaC9pbnRlZ3JhdGlvbi9FTUZXb3JrYmVuY2hFZGl0UGx1Z2luLmphdmEKaW5kZXggZTQwOWIzYi4uYzVhYjM3MyAxMDA2NDQKLS0tIGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVtZndvcmtiZW5jaC5pbnRlZ3JhdGlvbi9zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbWZ3b3JrYmVuY2gvaW50ZWdyYXRpb24vRU1GV29ya2JlbmNoRWRpdFBsdWdpbi5qYXZhCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbWZ3b3JrYmVuY2guaW50ZWdyYXRpb24vc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW1md29ya2JlbmNoL2ludGVncmF0aW9uL0VNRldvcmtiZW5jaEVkaXRQbHVnaW4uamF2YQpAQCAtMTMsNyArMTMsMTEgQEAKIGltcG9ydCBqYXZhLmlvLkZpbGVOb3RGb3VuZEV4Y2VwdGlvbjsKIAogaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucmVzb3VyY2VzLklQcm9qZWN0OworaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucnVudGltZS5Db3JlRXhjZXB0aW9uOworaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucnVudGltZS5JU3RhdHVzOworaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucnVudGltZS5QbGF0Zm9ybTsKIGltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJ1bnRpbWUuUGx1Z2luOworaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucnVudGltZS5TdGF0dXM7CiBpbXBvcnQgb3JnLmVjbGlwc2UuZW1mLmNvbW1vbi51dGlsLldyYXBwZWRFeGNlcHRpb247CiBpbXBvcnQgb3JnLmVjbGlwc2UuZW1mLmVjb3JlLnJlc291cmNlLlJlc291cmNlU2V0OwogaW1wb3J0IG9yZy5lY2xpcHNlLmplbS51dGlsLmVtZi53b3JrYmVuY2guV29ya2JlbmNoUmVzb3VyY2VIZWxwZXJCYXNlOwpAQCAtMjEsMTEgKzI1LDE1IEBACiBpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5pbnRlcm5hbC5lbWZ3b3JrYmVuY2guUGFzc3RocnVSZXNvdXJjZVNldDsKIGltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmludGVybmFsLmVtZndvcmtiZW5jaC5Xb3JrYmVuY2hSZXNvdXJjZUhlbHBlcjsKIGltcG9ydCBvcmcub3NnaS5mcmFtZXdvcmsuQnVuZGxlQ29udGV4dDsKK2ltcG9ydCBqYXZhLmxhbmcuVGhyb3dhYmxlOwogCiAvKioKICAqIFRoZSBtYWluIHBsdWdpbiBjbGFzcyB0byBiZSB1c2VkIGluIHRoZSBkZXNrdG9wLgogICovCiBwdWJsaWMgY2xhc3MgRU1GV29ya2JlbmNoRWRpdFBsdWdpbiBleHRlbmRzIFBsdWdpbiB7CisJLy90aGUgSUQgZm9yIHRoaXMgcGx1Z2luIChhZGRlZCBhdXRvbWF0aWNhbGx5IGJ5IGxvZ2dpbmcgcXVpY2tmaXgpCisJcHVibGljIHN0YXRpYyBmaW5hbCBTdHJpbmcgUExVR0lOX0lEID0gIm9yZy5lY2xpcHNlLndzdC5jb21tb24uZW1md29ya2JlbmNoLmludGVncmF0aW9uIjsgLy8kTk9OLU5MUy0xJAorCiAJcHVibGljIHN0YXRpYyBmaW5hbCBTdHJpbmcgSUQgPSAib3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbWZ3b3JrYmVuY2guaW50ZWdyYXRpb24iOyAvLyROT04tTkxTLTEkCiAKIAlwdWJsaWMgc3RhdGljIGZpbmFsIFN0cmluZyBFRElUX01PREVMX0ZBQ1RPUklFU19FWFRFTlNJT05fUE9JTlQgPSAiZWRpdE1vZGVsIjsgLy8kTk9OLU5MUy0xJApAQCAtNTYsNiArNjQsNyBAQAogCSAqIAogCSAqIEBzZWUgb3JnLmVjbGlwc2UuY29yZS5ydW50aW1lLlBsdWdpbiNzdGFydHVwKCkKIAkgKi8KKwlAT3ZlcnJpZGUKIAlwdWJsaWMgdm9pZCBzdGFydChCdW5kbGVDb250ZXh0IGNvbnRleHQpIHRocm93cyBFeGNlcHRpb24gewogCQlzdXBlci5zdGFydChjb250ZXh0KTsKIAkJRXh0ZW5kZWRFY29yZVV0aWwuc2V0RmlsZU5vdEZvdW5kRGV0ZWN0b3IobmV3IEV4dGVuZGVkRWNvcmVVdGlsLkZpbGVOb3RGb3VuZERldGVjdG9yKCkgewpAQCAtNzQsNSArODMsMzMgQEAKIAkJcmV0dXJuIG5ldyBQYXNzdGhydVJlc291cmNlU2V0KCk7CiAJfQogCisJcHVibGljIHN0YXRpYyBJU3RhdHVzIGNyZWF0ZVN0YXR1cyhpbnQgc2V2ZXJpdHksIFN0cmluZyBtZXNzYWdlLCBUaHJvd2FibGUgZXhjZXB0aW9uKSB7CisJCXJldHVybiBuZXcgU3RhdHVzKHNldmVyaXR5LCBQTFVHSU5fSUQsIG1lc3NhZ2UsIGV4Y2VwdGlvbik7CisJfQorCisJcHVibGljIHN0YXRpYyBJU3RhdHVzIGNyZWF0ZVN0YXR1cyhpbnQgc2V2ZXJpdHksIFN0cmluZyBtZXNzYWdlKSB7CisJCXJldHVybiBjcmVhdGVTdGF0dXMoc2V2ZXJpdHksIG1lc3NhZ2UsIG51bGwpOworCX0KKworCXB1YmxpYyBzdGF0aWMgdm9pZCBsb2dFcnJvcihUaHJvd2FibGUgZXhjZXB0aW9uKSB7CisJCVBsYXRmb3JtLmdldExvZyhQbGF0Zm9ybS5nZXRCdW5kbGUoUExVR0lOX0lEKSkubG9nKCBjcmVhdGVTdGF0dXMoSVN0YXR1cy5FUlJPUiwgZXhjZXB0aW9uLmdldE1lc3NhZ2UoKSwgZXhjZXB0aW9uKSk7CisJfQorCisJcHVibGljIHN0YXRpYyB2b2lkIGxvZ0Vycm9yKENvcmVFeGNlcHRpb24gZXhjZXB0aW9uKSB7CisJCVBsYXRmb3JtLmdldExvZyhQbGF0Zm9ybS5nZXRCdW5kbGUoUExVR0lOX0lEKSkubG9nKCBleGNlcHRpb24uZ2V0U3RhdHVzKCkgKTsKKwl9CisKKwlwdWJsaWMgc3RhdGljIHZvaWQgbG9nV2FybmluZyhTdHJpbmcgbWVzc2FnZSkgeworCQlQbGF0Zm9ybS5nZXRMb2coUGxhdGZvcm0uZ2V0QnVuZGxlKFBMVUdJTl9JRCkpLmxvZyhjcmVhdGVTdGF0dXMoSVN0YXR1cy5XQVJOSU5HLCBtZXNzYWdlKSk7CisJfQorCisJcHVibGljIHN0YXRpYyB2b2lkIGxvZ1dhcm5pbmcoVGhyb3dhYmxlIGV4Y2VwdGlvbikgeworCQlQbGF0Zm9ybS5nZXRMb2coUGxhdGZvcm0uZ2V0QnVuZGxlKFBMVUdJTl9JRCkpLmxvZyggY3JlYXRlU3RhdHVzKElTdGF0dXMuV0FSTklORywgZXhjZXB0aW9uLmdldE1lc3NhZ2UoKSwgZXhjZXB0aW9uKSk7CisJfQorCisJcHVibGljIHN0YXRpYyB2b2lkIGxvZ0Vycm9yKFN0cmluZyBtZXNzYWdlKSB7CisJCVBsYXRmb3JtLmdldExvZyhQbGF0Zm9ybS5nZXRCdW5kbGUoUExVR0lOX0lEKSkubG9nKCBjcmVhdGVTdGF0dXMoSVN0YXR1cy5FUlJPUiwgbWVzc2FnZSkpOworCX0KKwogCiB9CmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW1md29ya2JlbmNoLmludGVncmF0aW9uL3NyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2VtZndvcmtiZW5jaC9pbnRlZ3JhdGlvbi9FZGl0TW9kZWwuamF2YSBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbWZ3b3JrYmVuY2guaW50ZWdyYXRpb24vc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW1md29ya2JlbmNoL2ludGVncmF0aW9uL0VkaXRNb2RlbC5qYXZhCmluZGV4IGQyMmQ2NDUuLjFkNWEyNDggMTAwNjQ0Ci0tLSBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbWZ3b3JrYmVuY2guaW50ZWdyYXRpb24vc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW1md29ya2JlbmNoL2ludGVncmF0aW9uL0VkaXRNb2RlbC5qYXZhCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbWZ3b3JrYmVuY2guaW50ZWdyYXRpb24vc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW1md29ya2JlbmNoL2ludGVncmF0aW9uL0VkaXRNb2RlbC5qYXZhCkBAIC00OCw3ICs0OCw2IEBACiBpbXBvcnQgb3JnLmVjbGlwc2UuamVtLmludGVybmFsLnV0aWwuZW1mLndvcmtiZW5jaC5ubHMuRU1GV29ya2JlbmNoUmVzb3VyY2VIYW5kbGVyOwogaW1wb3J0IG9yZy5lY2xpcHNlLmplbS51dGlsLmVtZi53b3JrYmVuY2guUmVzb3VyY2VTZXRXb3JrYmVuY2hTeW5jaHJvbml6ZXI7CiBpbXBvcnQgb3JnLmVjbGlwc2UuamVtLnV0aWwuZW1mLndvcmtiZW5jaC5Xb3JrYmVuY2hSZXNvdXJjZUhlbHBlckJhc2U7Ci1pbXBvcnQgb3JnLmVjbGlwc2UuamVtLnV0aWwubG9nZ2VyLnByb3h5LkxvZ2dlcjsKIGltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3MuaW50ZXJuYWwuSVNhdmVIYW5kbGVyOwogaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy5pbnRlcm5hbC5TYXZlRmFpbGVkRXhjZXB0aW9uOwogaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy5pbnRlcm5hbC5TYXZlSGFuZGxlckhlYWRsZXNzOwpAQCAtNzMsNiArNzIsNyBAQAogaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uaW50ZXJuYWwuZW1md29ya2JlbmNoLnZhbGlkYXRlZWRpdC5SZXNvdXJjZVN0YXRlVmFsaWRhdG9yOwogaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uaW50ZXJuYWwuZW1md29ya2JlbmNoLnZhbGlkYXRlZWRpdC5SZXNvdXJjZVN0YXRlVmFsaWRhdG9ySW1wbDsKIGltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmludGVybmFsLmVtZndvcmtiZW5jaC52YWxpZGF0ZWVkaXQuUmVzb3VyY2VTdGF0ZVZhbGlkYXRvclByZXNlbnRlcjsKK2ltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmludGVybmFsLmVtZndvcmtiZW5jaC5pbnRlZ3JhdGlvbi5FTUZXb3JrYmVuY2hFZGl0UGx1Z2luOwogCiAKIHB1YmxpYyBjbGFzcyBFZGl0TW9kZWwgaW1wbGVtZW50cyBDb21tYW5kU3RhY2tMaXN0ZW5lciwgUmVzb3VyY2VTdGF0ZUlucHV0UHJvdmlkZXIsIFJlc291cmNlU3RhdGVWYWxpZGF0b3IsIElFbmFibGVtZW50SWRlbnRpZmllckxpc3RlbmVyIHsKQEAgLTExMCw2ICsxMTAsNyBAQAogCXByaXZhdGUgTGlzdCByZXNvdXJjZXNUYXJnZXRlZEZvclRlcm1pbmF0aW9uOwogCiAJcHJvdGVjdGVkIGNsYXNzIFJlc291cmNlQWRhcHRlciBleHRlbmRzIEFkYXB0ZXJJbXBsIHsKKwkJQE92ZXJyaWRlCiAJCXB1YmxpYyB2b2lkIG5vdGlmeUNoYW5nZWQoTm90aWZpY2F0aW9uIG5vdGlmaWNhdGlvbikgewogCQkJaWYgKCFpc0Rpc3Bvc2luZygpICYmIG5vdGlmaWNhdGlvbi5nZXRFdmVudFR5cGUoKSA9PSBOb3RpZmljYXRpb24uU0VUICYmIG5vdGlmaWNhdGlvbi5nZXRGZWF0dXJlSUQobnVsbCkgPT0gUmVzb3VyY2UuUkVTT1VSQ0VfX0lTX0xPQURFRCkgewogCQkJCXJlc291cmNlSXNMb2FkZWRDaGFuZ2VkKChSZXNvdXJjZSkgbm90aWZpY2F0aW9uLmdldE5vdGlmaWVyKCksIG5vdGlmaWNhdGlvbi5nZXRPbGRCb29sZWFuVmFsdWUoKSwgbm90aWZpY2F0aW9uLmdldE5ld0Jvb2xlYW5WYWx1ZSgpKTsKQEAgLTE3NCw3ICsxNzUsNyBAQAogCQkJcmVsZWFzZUlkZW50aWZpZXJzKCk7CiAJCQlkb0Rpc3Bvc2UoKTsKIAkJfSBjYXRjaCAoUnVudGltZUV4Y2VwdGlvbiByZSkgewotCQkJTG9nZ2VyLmdldExvZ2dlcigpLmxvZ0Vycm9yKHJlKTsKKwkJCUVNRldvcmtiZW5jaEVkaXRQbHVnaW4ubG9nRXJyb3IocmUpOwogCQl9IGZpbmFsbHkgewogCQkJZW1mQ29udGV4dCA9IG51bGw7CiAJCQlyZXNvdXJjZXMgPSBudWxsOwpAQCAtMzc2LDcgKzM3Nyw3IEBACiAJCX0gY2F0Y2ggKFNhdmVGYWlsZWRFeGNlcHRpb24gZXgpIHsKIAkJCWdldFNhdmVIYW5kbGVyKCkuaGFuZGxlU2F2ZUZhaWxlZChleCwgbW9uaXRvcik7CiAJCX0gY2F0Y2ggKEV4Y2VwdGlvbiBleCkgewotCQkJZXgucHJpbnRTdGFja1RyYWNlKCk7CisJCQlFTUZXb3JrYmVuY2hFZGl0UGx1Z2luLmxvZ0Vycm9yKGV4KTsKIAkJfSBmaW5hbGx5IHsKIAkJCWdldFNhdmVIYW5kbGVyKCkucmVsZWFzZSgpOwogCQl9CkBAIC01MzQsNyArNTM1LDcgQEAKIAkJCQllbmFibGVkID0gaWRlbnRpZmllci5pc0VuYWJsZWQoKTsKIAkJCX0KIAkJfSBjYXRjaCAoUnVudGltZUV4Y2VwdGlvbiByZSkgewotCQkJTG9nZ2VyLmdldExvZ2dlcigpLmxvZ1dhcm5pbmcocmUpOworCQkJRU1GV29ya2JlbmNoRWRpdFBsdWdpbi5sb2dXYXJuaW5nKHJlKTsKIAkJfQogCQlpZiAoZW5hYmxlZCkgewogCQkJVVJJIHVyaSA9IHJlcy5nZXRVUkkoKTsKQEAgLTEyMzAsNyArMTIzMSw3IEBACiAJICogQGFSZXNvdXJjZS4KIAkgKi8KIAlwcm90ZWN0ZWQgdm9pZCBwcmltSGFuZGxlU2F2ZUZhaWxlZChSZXNvdXJjZSBhUmVzb3VyY2UsIEV4Y2VwdGlvbiBlKSB7Ci0JCW9yZy5lY2xpcHNlLmplbS51dGlsLmxvZ2dlci5wcm94eS5Mb2dnZXIuZ2V0TG9nZ2VyKCkubG9nRXJyb3IoZSk7CisJCUVNRldvcmtiZW5jaEVkaXRQbHVnaW4ubG9nRXJyb3IoZSk7CiAJCUV4Y2VwdGlvbiBuZXN0ZWQgPSBudWxsOwogCQlpZiAoZSBpbnN0YW5jZW9mIElXRlRXcmFwcGVkRXhjZXB0aW9uKQogCQkJbmVzdGVkID0gKChJV0ZUV3JhcHBlZEV4Y2VwdGlvbikgZSkuZ2V0TmVzdGVkRXhjZXB0aW9uKCk7CkBAIC0xNDEyLDYgKzE0MTMsNyBAQAogCQlhY2Nlc3NBc1JlYWRGb3JVbktub3duVVJJcyA9IGI7CiAJfQogCisJQE92ZXJyaWRlCiAJcHVibGljIFN0cmluZyB0b1N0cmluZygpIHsKIAkJU3RyaW5nQnVmZmVyIGJ1ZmZlciA9IG5ldyBTdHJpbmdCdWZmZXIoZ2V0Q2xhc3MoKS5nZXROYW1lKCkpOwogCQlidWZmZXIuYXBwZW5kKCI6ICIpOyAvLyROT04tTkxTLTEkCkBAIC0xNDYwLDYgKzE0NjIsNyBAQAogCQkgKiAKIAkJICogQHNlZSBqYXZhLmxhbmcuT2JqZWN0I3RvU3RyaW5nKCkKIAkJICovCisJCUBPdmVycmlkZQogCQlwdWJsaWMgU3RyaW5nIHRvU3RyaW5nKCkgewogCQkJaWYgKHRvc3RyaW5nID09IG51bGwpIHsKIAkJCQlTdHJpbmdCdWZmZXIgcmVzdWx0ID0gbmV3IFN0cmluZ0J1ZmZlcigiRWRpdE1vZGVsLlJlZmVyZW5jZSBbIik7IC8vJE5PTi1OTFMtMSQKQEAgLTE0NzgsNiArMTQ4MSw3IEBACiAJCSAqIAogCQkgKiBAc2VlIGphdmEubGFuZy5PYmplY3QjaGFzaENvZGUoKQogCQkgKi8KKwkJQE92ZXJyaWRlCiAJCXB1YmxpYyBpbnQgaGFzaENvZGUoKSB7CiAJCQlyZXR1cm4gdG9TdHJpbmcoKS5oYXNoQ29kZSgpOwogCQl9CkBAIC0xNDkzLDcgKzE0OTcsNyBAQAogCQlSZXNvdXJjZSByZXMgPSBnZXRQcmltYXJ5UmVzb3VyY2UoKTsKIAkJaWYgKHJlcyA9PSBudWxsIHx8IHJlcy5nZXRDb250ZW50cygpLmlzRW1wdHkoKSkKIAkJCXJldHVybiBudWxsOwotCQlyZXR1cm4gKEVPYmplY3QpIHJlcy5nZXRDb250ZW50cygpLmdldCgwKTsKKwkJcmV0dXJuIHJlcy5nZXRDb250ZW50cygpLmdldCgwKTsKIAl9CiAKIAkvKioKQEAgLTE2MDgsNSArMTYxMiw1IEBACiAJCQkJbGlzdGVuZXIuZWRpdE1vZGVsQ2hhbmdlZChldmVudCk7IAogCQl9CiAJCQotCX07CisJfQogfQpkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVtZndvcmtiZW5jaC5pbnRlZ3JhdGlvbi9zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbWZ3b3JrYmVuY2gvaW50ZWdyYXRpb24vRWRpdE1vZGVsQ29tbWFuZC5qYXZhIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVtZndvcmtiZW5jaC5pbnRlZ3JhdGlvbi9zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbWZ3b3JrYmVuY2gvaW50ZWdyYXRpb24vRWRpdE1vZGVsQ29tbWFuZC5qYXZhCmluZGV4IDAwZWVkOTAuLjc0NzY2MzYgMTAwNjQ0Ci0tLSBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbWZ3b3JrYmVuY2guaW50ZWdyYXRpb24vc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW1md29ya2JlbmNoL2ludGVncmF0aW9uL0VkaXRNb2RlbENvbW1hbmQuamF2YQorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW1md29ya2JlbmNoLmludGVncmF0aW9uL3NyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2VtZndvcmtiZW5jaC9pbnRlZ3JhdGlvbi9FZGl0TW9kZWxDb21tYW5kLmphdmEKQEAgLTI4LDE2ICsyOCwxOSBAQAogCQlzdXBlcih0YXJnZXRDb21tYW5kKTsKIAl9CiAKKwlAT3ZlcnJpZGUKIAlwdWJsaWMgYm9vbGVhbiBjYW5VbmRvKCkgewogCQlyZXR1cm4gZ2V0VGFyZ2V0KCkuY2FuVW5kbygpOwogCX0KIAogCXByb3RlY3RlZCBhYnN0cmFjdCB2b2lkIGV4ZWN1dGVJbk1vZGVsKEFic3RyYWN0RWRpdE1vZGVsQ29tbWFuZCBjbWQpOwogCisJQE92ZXJyaWRlCiAJcHVibGljIEVkaXRNb2RlbENvbW1hbmQgZ2V0RWRpdE1vZGVsQ29tbWFuZCgpIHsKIAkJcmV0dXJuIHRoaXM7CiAJfQogCisJQE92ZXJyaWRlCiAJcHVibGljIFN0cmluZyBnZXRMYWJlbCgpIHsKIAkJcmV0dXJuIGdldFRhcmdldCgpLmdldExhYmVsKCk7CiAJfQpkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVtZndvcmtiZW5jaC5pbnRlZ3JhdGlvbi9zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbWZ3b3JrYmVuY2gvaW50ZWdyYXRpb24vTW9kZWxNb2RpZmllci5qYXZhIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVtZndvcmtiZW5jaC5pbnRlZ3JhdGlvbi9zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbWZ3b3JrYmVuY2gvaW50ZWdyYXRpb24vTW9kZWxNb2RpZmllci5qYXZhCmluZGV4IGMwZWQ4NmEuLmYwYjliNzIgMTAwNjQ0Ci0tLSBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbWZ3b3JrYmVuY2guaW50ZWdyYXRpb24vc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW1md29ya2JlbmNoL2ludGVncmF0aW9uL01vZGVsTW9kaWZpZXIuamF2YQorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW1md29ya2JlbmNoLmludGVncmF0aW9uL3NyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2VtZndvcmtiZW5jaC9pbnRlZ3JhdGlvbi9Nb2RlbE1vZGlmaWVyLmphdmEKQEAgLTI1OCw2ICsyNTgsNyBAQAogCX0KIAogCXByb3RlY3RlZCBDb21tYW5kIGNyZWF0ZUNvbW1hbmQoQ29tbWFuZCBjaGFpbmVkQ29tbWFuZCwgTGlzdCBoZWxwZXJzQXJnKSB7CisJCUNvbW1hbmQgaW5uZXJDaGFpbmVkQ29tbWFuZCA9IGNoYWluZWRDb21tYW5kOwogCQlpZiAobnVsbCA9PSBleHRlbmRlZEhlbHBlcnMpIHsKIAkJCWV4dGVuZGVkSGVscGVycyA9IG5ldyBBcnJheUxpc3QoKTsKIAkJfQpAQCAtMjY3LDMzICsyNjgsMzQgQEAKIAkJCUNvbW1hbmQgbmV4dENvbW1hbmQgPSBudWxsOwogCQkJd2hpbGUgKGl0Lmhhc05leHQoKSkgewogCQkJCW5leHRDb21tYW5kID0gY3JlYXRlQ29tbWFuZCgoTW9kaWZpZXJIZWxwZXIpIGl0Lm5leHQoKSk7Ci0JCQkJaWYgKGNoYWluZWRDb21tYW5kID09IG51bGwpCi0JCQkJCWNoYWluZWRDb21tYW5kID0gbmV4dENvbW1hbmQ7CisJCQkJaWYgKGlubmVyQ2hhaW5lZENvbW1hbmQgPT0gbnVsbCkKKwkJCQkJaW5uZXJDaGFpbmVkQ29tbWFuZCA9IG5leHRDb21tYW5kOwogCQkJCWVsc2UgaWYgKG5leHRDb21tYW5kICE9IG51bGwpCi0JCQkJCWNoYWluZWRDb21tYW5kID0gY2hhaW5lZENvbW1hbmQuY2hhaW4obmV4dENvbW1hbmQpOworCQkJCQlpbm5lckNoYWluZWRDb21tYW5kID0gaW5uZXJDaGFpbmVkQ29tbWFuZC5jaGFpbihuZXh0Q29tbWFuZCk7CiAJCQl9CiAJCX0KIAkJaWYgKCFleHRlbmRlZEhlbHBlcnMuaXNFbXB0eSgpKSB7CiAJCQlMaXN0IGNvcHkgPSBuZXcgQXJyYXlMaXN0KCk7CiAJCQljb3B5LmFkZEFsbChleHRlbmRlZEhlbHBlcnMpOwogCQkJZXh0ZW5kZWRIZWxwZXJzLmNsZWFyKCk7Ci0JCQljaGFpbmVkQ29tbWFuZCA9IGNyZWF0ZUNvbW1hbmQoY2hhaW5lZENvbW1hbmQsIGNvcHkpOworCQkJaW5uZXJDaGFpbmVkQ29tbWFuZCA9IGNyZWF0ZUNvbW1hbmQoaW5uZXJDaGFpbmVkQ29tbWFuZCwgY29weSk7CiAJCX0KLQkJcmV0dXJuIGNoYWluZWRDb21tYW5kOworCQlyZXR1cm4gaW5uZXJDaGFpbmVkQ29tbWFuZDsKIAl9CiAKIAlwcm90ZWN0ZWQgQ29tbWFuZCBhcHBlbmRBZGRpdGlvbmFsQ29tbWFuZHMoQ29tbWFuZCBjaGFpbmVkQ29tbWFuZCkgeworCQlDb21tYW5kIGlubmVyQ2hhaW5lZENvbW1hbmQgPSBjaGFpbmVkQ29tbWFuZDsKIAkJaWYgKGFkZGl0aW9uYWxDb21tYW5kcyAhPSBudWxsICYmICFhZGRpdGlvbmFsQ29tbWFuZHMuaXNFbXB0eSgpKSB7CiAJCQlDb21tYW5kIGNvbW1hbmQ7CiAJCQlmb3IgKGludCBpID0gMDsgaSA8IGFkZGl0aW9uYWxDb21tYW5kcy5zaXplKCk7IGkrKykgewogCQkJCWNvbW1hbmQgPSAoQ29tbWFuZCkgYWRkaXRpb25hbENvbW1hbmRzLmdldChpKTsKLQkJCQlpZiAoY2hhaW5lZENvbW1hbmQgPT0gbnVsbCkKLQkJCQkJY2hhaW5lZENvbW1hbmQgPSBjb21tYW5kOworCQkJCWlmIChpbm5lckNoYWluZWRDb21tYW5kID09IG51bGwpCisJCQkJCWlubmVyQ2hhaW5lZENvbW1hbmQgPSBjb21tYW5kOwogCQkJCWVsc2UKLQkJCQkJY2hhaW5lZENvbW1hbmQgPSBjaGFpbmVkQ29tbWFuZC5jaGFpbihjb21tYW5kKTsKKwkJCQkJaW5uZXJDaGFpbmVkQ29tbWFuZCA9IGlubmVyQ2hhaW5lZENvbW1hbmQuY2hhaW4oY29tbWFuZCk7CiAJCQl9CiAJCX0KLQkJcmV0dXJuIGNoYWluZWRDb21tYW5kOworCQlyZXR1cm4gaW5uZXJDaGFpbmVkQ29tbWFuZDsKIAl9CiAKIAkvKioKQEAgLTMyMSw3ICszMjMsNyBAQAogCiAJcHJvdGVjdGVkIFN0cmluZyBjcmVhdGVDb21tYW5kTGFiZWwoU3RyaW5nIGFQYXR0ZXJuLCBFU3RydWN0dXJhbEZlYXR1cmUgZmVhdHVyZSkgewogCQlTdHJpbmcgcmVwbGFjZW1lbnQgPSBmZWF0dXJlID09IG51bGwgPyBERUZBVUxUX0NPTU1BTkRfTEFCRUwgOiBmZWF0dXJlLmdldE5hbWUoKTsKLQkJcmV0dXJuIGphdmEudGV4dC5NZXNzYWdlRm9ybWF0LmZvcm1hdChhUGF0dGVybiwgbmV3IFN0cmluZ1tde3JlcGxhY2VtZW50fSk7CisJCXJldHVybiBqYXZhLnRleHQuTWVzc2FnZUZvcm1hdC5mb3JtYXQoYVBhdHRlcm4sIG5ldyBPYmplY3RbXXtyZXBsYWNlbWVudH0pOwogCX0KIAogCS8qKgpAQCAtMzU0LDYgKzM1Niw3IEBACiAJCQl0aGlzLnJlc291cmNlID0gZU9iamVjdC5lUmVzb3VyY2UoKTsKIAkJfQogCisJCUBPdmVycmlkZQogCQlwdWJsaWMgYm9vbGVhbiBjYW5FeGVjdXRlKCkgewogCQkJcmV0dXJuIGJhc2VDb21tYW5kLmNhbkV4ZWN1dGUoKTsKIAkJfQpAQCAtMzYzLDEwICszNjYsMTIgQEAKIAkJCWJhc2VDb21tYW5kLmV4ZWN1dGUoKTsKIAkJfQogCisJCUBPdmVycmlkZQogCQlwdWJsaWMgYm9vbGVhbiBjYW5VbmRvKCkgewogCQkJcmV0dXJuIGJhc2VDb21tYW5kLmNhblVuZG8oKTsKIAkJfQogCisJCUBPdmVycmlkZQogCQlwdWJsaWMgdm9pZCB1bmRvKCkgewogCQkJYmFzZUNvbW1hbmQudW5kbygpOwogCQkJRXh0ZW5kZWRFY29yZVV0aWwucmVtb3ZlUHJveHkoZU9iamVjdCwgcmVzb3VyY2UpOwpAQCAtMzc3LDIyICszODIsMjcgQEAKIAkJCWJhc2VDb21tYW5kLnJlZG8oKTsKIAkJfQogCisJCUBPdmVycmlkZQogCQlwdWJsaWMgQ29sbGVjdGlvbiBnZXRSZXN1bHQoKSB7CiAJCQlyZXR1cm4gYmFzZUNvbW1hbmQuZ2V0UmVzdWx0KCk7CiAJCX0KIAorCQlAT3ZlcnJpZGUKIAkJcHVibGljIENvbGxlY3Rpb24gZ2V0QWZmZWN0ZWRPYmplY3RzKCkgewogCQkJcmV0dXJuIGJhc2VDb21tYW5kLmdldEFmZmVjdGVkT2JqZWN0cygpOwogCQl9CiAKKwkJQE92ZXJyaWRlCiAJCXB1YmxpYyBTdHJpbmcgZ2V0TGFiZWwoKSB7CiAJCQlyZXR1cm4gYmFzZUNvbW1hbmQuZ2V0TGFiZWwoKTsKIAkJfQogCisJCUBPdmVycmlkZQogCQlwdWJsaWMgU3RyaW5nIGdldERlc2NyaXB0aW9uKCkgewogCQkJcmV0dXJuIGJhc2VDb21tYW5kLmdldERlc2NyaXB0aW9uKCk7CiAJCX0KIAorCQlAT3ZlcnJpZGUKIAkJcHVibGljIHZvaWQgZGlzcG9zZSgpIHsKIAkJCXN1cGVyLmRpc3Bvc2UoKTsKIAkJCWJhc2VDb21tYW5kLmRpc3Bvc2UoKTsKZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbWZ3b3JrYmVuY2guaW50ZWdyYXRpb24vc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW1md29ya2JlbmNoL2ludGVncmF0aW9uL01vZGlmaWVySGVscGVyLmphdmEgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW1md29ya2JlbmNoLmludGVncmF0aW9uL3NyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2VtZndvcmtiZW5jaC9pbnRlZ3JhdGlvbi9Nb2RpZmllckhlbHBlci5qYXZhCmluZGV4IGFkOTQ5YjMuLjVlYWJjODEgMTAwNjQ0Ci0tLSBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbWZ3b3JrYmVuY2guaW50ZWdyYXRpb24vc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW1md29ya2JlbmNoL2ludGVncmF0aW9uL01vZGlmaWVySGVscGVyLmphdmEKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVtZndvcmtiZW5jaC5pbnRlZ3JhdGlvbi9zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbWZ3b3JrYmVuY2gvaW50ZWdyYXRpb24vTW9kaWZpZXJIZWxwZXIuamF2YQpAQCAtMTksNyArMTksNiBAQAogaW1wb3J0IG9yZy5lY2xpcHNlLmVtZi5lY29yZS5FU3RydWN0dXJhbEZlYXR1cmU7CiBpbXBvcnQgb3JnLmVjbGlwc2UuZW1mLmVjb3JlLmltcGwuRUNsYXNzSW1wbDsKIGltcG9ydCBvcmcuZWNsaXBzZS5lbWYuZWRpdC5jb21tYW5kLlNldENvbW1hbmQ7Ci1pbXBvcnQgb3JnLmVjbGlwc2UuamVtLnV0aWwubG9nZ2VyLnByb3h5LkxvZ2dlcjsKIGltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmludGVybmFsLmVtZi51dGlsaXRpZXMuRmVhdHVyZVZhbHVlQ29udmVyc2lvbkV4Y2VwdGlvbjsKIGltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmludGVybmFsLmVtZi51dGlsaXRpZXMuRmVhdHVyZVZhbHVlQ29udmVydGVyOwogCkBAIC0zMjAsNyArMzE5LDcgQEAKIAkJdHJ5IHsKIAkJCXByaW1TZXRWYWx1ZShjb252ZXJ0VmFsdWUobmV3VmFsdWUpKTsKIAkJfSBjYXRjaCAoRmVhdHVyZVZhbHVlQ29udmVyc2lvbkV4Y2VwdGlvbiBmZWF0dXJlRXhjZXB0aW9uKSB7Ci0JCQlMb2dnZXIuZ2V0TG9nZ2VyKCkubG9nRXJyb3IoZmVhdHVyZUV4Y2VwdGlvbik7CisJCQlFTUZXb3JrYmVuY2hFZGl0UGx1Z2luLmxvZ0Vycm9yKGZlYXR1cmVFeGNlcHRpb24pOwogCQkJcHJpbVNldFZhbHVlKG51bGwpOwogCQl9CiAJfQpkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVtZndvcmtiZW5jaC5pbnRlZ3JhdGlvbi9zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbWZ3b3JrYmVuY2gvaW50ZWdyYXRpb24vTW9kaWZpZXJIZWxwZXJSZWdpc3RyeS5qYXZhIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVtZndvcmtiZW5jaC5pbnRlZ3JhdGlvbi9zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbWZ3b3JrYmVuY2gvaW50ZWdyYXRpb24vTW9kaWZpZXJIZWxwZXJSZWdpc3RyeS5qYXZhCmluZGV4IGIxZGE4YWQuLmNhZDc4YjcgMTAwNjQ0Ci0tLSBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbWZ3b3JrYmVuY2guaW50ZWdyYXRpb24vc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW1md29ya2JlbmNoL2ludGVncmF0aW9uL01vZGlmaWVySGVscGVyUmVnaXN0cnkuamF2YQorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW1md29ya2JlbmNoLmludGVncmF0aW9uL3NyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2VtZndvcmtiZW5jaC9pbnRlZ3JhdGlvbi9Nb2RpZmllckhlbHBlclJlZ2lzdHJ5LmphdmEKQEAgLTMxLDcgKzMxLDYgQEAKIGltcG9ydCBvcmcuZWNsaXBzZS5lbWYuZWNvcmUuRUNsYXNzaWZpZXI7CiBpbXBvcnQgb3JnLmVjbGlwc2UuZW1mLmVjb3JlLkVQYWNrYWdlOwogaW1wb3J0IG9yZy5lY2xpcHNlLmVtZi5lY29yZS5FU3RydWN0dXJhbEZlYXR1cmU7Ci1pbXBvcnQgb3JnLmVjbGlwc2UuamVtLnV0aWwubG9nZ2VyLnByb3h5LkxvZ2dlcjsKIAogLyoqCiAgKiBAYXV0aG9yIGpzaG9sbApAQCAtNzMsNyArNzIsNyBAQAogCQkJCQkJZmFjdG9yeSA9IChNb2RpZmllckhlbHBlckZhY3RvcnkpIGVsZW1lbnQuY3JlYXRlRXhlY3V0YWJsZUV4dGVuc2lvbihGQUNUT1JZX0NMQVNTKTsKIAkJCQkJCWZhY3RvcnlIYXNoLnB1dChoYXNoS2V5LCBmYWN0b3J5KTsKIAkJCQkJfSBjYXRjaCAoQ29yZUV4Y2VwdGlvbiBlKSB7Ci0JCQkJCQlMb2dnZXIuZ2V0TG9nZ2VyKCkubG9nRXJyb3IoZSk7CisJCQkJCQlFTUZXb3JrYmVuY2hFZGl0UGx1Z2luLmxvZ0Vycm9yKGUpOwogCQkJCQl9CiAJCQkJfQogCQkJCXJldHVybiBmYWN0b3J5OwpAQCAtODEsNiArODAsNyBAQAogCQkJcmV0dXJuIG51bGw7CiAJCX0KIAorCQlAT3ZlcnJpZGUKIAkJcHVibGljIGJvb2xlYW4gZXF1YWxzKE9iamVjdCBvYmopIHsKIAkJCWlmIChzdXBlci5lcXVhbHMob2JqKSkgewogCQkJCXJldHVybiB0cnVlOwpAQCAtODgsNiArODgsMTEgQEAKIAkJCUZhY3RvcnlIb2xkZXIgaG9sZGVyID0gKEZhY3RvcnlIb2xkZXIpIG9iajsKIAkJCXJldHVybiBnZXRGYWN0b3J5SGFzaChlbGVtZW50KS5lcXVhbHMoZ2V0RmFjdG9yeUhhc2goaG9sZGVyLmVsZW1lbnQpKTsKIAkJfQorCQkKKwkJQE92ZXJyaWRlCisJCXB1YmxpYyBpbnQgaGFzaENvZGUoKSB7CisJCQlyZXR1cm4gc3VwZXIuaGFzaENvZGUoKSArIGdldEZhY3RvcnlIYXNoKGVsZW1lbnQpLmhhc2hDb2RlKCk7CisJCX0KIAl9CiAKIAlwcml2YXRlIE1vZGlmaWVySGVscGVyUmVnaXN0cnkoKSB7CkBAIC0yMTgsNyArMjIzLDcgQEAKIAkJU3RyaW5nQnVmZmVyIGJ1ZiA9IG5ldyBTdHJpbmdCdWZmZXIoKTsKIAkJYnVmLmFwcGVuZCgiUGx1Z2luICIgKyBleHRlbnNpb24uZ2V0TmFtZXNwYWNlKCkgKyAiLCBleHRlbnNpb24gIiArIGV4dGVuc2lvbi5nZXRFeHRlbnNpb25Qb2ludFVuaXF1ZUlkZW50aWZpZXIoKSk7IC8vJE5PTi1OTFMtMSQgLy8kTk9OLU5MUy0yJAogCQlidWYuYXBwZW5kKCJcbiIgKyB0ZXh0KTsgLy8kTk9OLU5MUy0xJAotCQlMb2dnZXIuZ2V0TG9nZ2VyKCkubG9nRXJyb3IoYnVmLnRvU3RyaW5nKCkpOworCQlFTUZXb3JrYmVuY2hFZGl0UGx1Z2luLmxvZ0Vycm9yKGJ1Zi50b1N0cmluZygpKTsKIAl9CiAKIAlwdWJsaWMgc3RhdGljIE1vZGlmaWVySGVscGVyUmVnaXN0cnkgZ2V0SW5zdGFuY2UoKSB7CmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW1md29ya2JlbmNoLmludGVncmF0aW9uL3NyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2VtZndvcmtiZW5jaC9pbnRlZ3JhdGlvbi9Qcm9qZWN0UmVzb3VyY2VTZXRFZGl0SW1wbC5qYXZhIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVtZndvcmtiZW5jaC5pbnRlZ3JhdGlvbi9zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbWZ3b3JrYmVuY2gvaW50ZWdyYXRpb24vUHJvamVjdFJlc291cmNlU2V0RWRpdEltcGwuamF2YQppbmRleCAwN2EzMjZlLi4zMWM3ODMyIDEwMDY0NAotLS0gYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW1md29ya2JlbmNoLmludGVncmF0aW9uL3NyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2VtZndvcmtiZW5jaC9pbnRlZ3JhdGlvbi9Qcm9qZWN0UmVzb3VyY2VTZXRFZGl0SW1wbC5qYXZhCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbWZ3b3JrYmVuY2guaW50ZWdyYXRpb24vc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW1md29ya2JlbmNoL2ludGVncmF0aW9uL1Byb2plY3RSZXNvdXJjZVNldEVkaXRJbXBsLmphdmEKQEAgLTQ0LDYgKzQ0LDcgQEAKIAkgKiAKIAkgKiBAc2VlIG9yZy5lY2xpcHNlLmplbS5pbnRlcm5hbC51dGlsLmVtZi53b3JrYmVuY2guUHJvamVjdFJlc291cmNlU2V0SW1wbCNjcmVhdGVSZXNvdXJjZShvcmcuZWNsaXBzZS5lbWYuY29tbW9uLnV0aWwuVVJJKQogCSAqLworCUBPdmVycmlkZQogCXB1YmxpYyBSZXNvdXJjZSBjcmVhdGVSZXNvdXJjZShVUkkgdXJpLCBTdHJpbmcgY29udGVudFR5cGUpIHsKIAkJUmVzb3VyY2UgcmVzdWx0ID0gc3VwZXIuY3JlYXRlUmVzb3VyY2UodXJpLCBjb250ZW50VHlwZSk7CiAJCWlmIChyZXN1bHQgIT0gbnVsbCAmJiBXb3JrYmVuY2hSZXNvdXJjZUhlbHBlci5pc1JlZmVyZW5jZWRSZXNvdXJjZShyZXN1bHQpKQpAQCAtNTEsNiArNTIsNyBAQAogCQlyZXR1cm4gcmVzdWx0OwogCX0KIAorCUBPdmVycmlkZQogCXB1YmxpYyBSZXNvdXJjZSBjcmVhdGVSZXNvdXJjZShVUkkgdXJpKSB7CiAJCXJldHVybiBjcmVhdGVSZXNvdXJjZSh1cmksIENvbnRlbnRIYW5kbGVyLlVOU1BFQ0lGSUVEX0NPTlRFTlRfVFlQRSk7CiAJfQpkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVtZndvcmtiZW5jaC5pbnRlZ3JhdGlvbi9zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbWZ3b3JrYmVuY2gvaW50ZWdyYXRpb24vUmVzb3VyY2VTZXRXb3JrYmVuY2hFZGl0U3luY2hyb25pemVyLmphdmEgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW1md29ya2JlbmNoLmludGVncmF0aW9uL3NyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2VtZndvcmtiZW5jaC9pbnRlZ3JhdGlvbi9SZXNvdXJjZVNldFdvcmtiZW5jaEVkaXRTeW5jaHJvbml6ZXIuamF2YQppbmRleCBkNzI4Nzk4Li4zMmNmNmE4IDEwMDY0NAotLS0gYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW1md29ya2JlbmNoLmludGVncmF0aW9uL3NyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2VtZndvcmtiZW5jaC9pbnRlZ3JhdGlvbi9SZXNvdXJjZVNldFdvcmtiZW5jaEVkaXRTeW5jaHJvbml6ZXIuamF2YQorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW1md29ya2JlbmNoLmludGVncmF0aW9uL3NyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2VtZndvcmtiZW5jaC9pbnRlZ3JhdGlvbi9SZXNvdXJjZVNldFdvcmtiZW5jaEVkaXRTeW5jaHJvbml6ZXIuamF2YQpAQCAtMTYsNiArMTYsNyBAQAogICovCiBwYWNrYWdlIG9yZy5lY2xpcHNlLndzdC5jb21tb24uaW50ZXJuYWwuZW1md29ya2JlbmNoLmludGVncmF0aW9uOwogCitpbXBvcnQgamF2YS5sYW5nLnJlZi5XZWFrUmVmZXJlbmNlOwogaW1wb3J0IGphdmEudXRpbC5BcnJheUxpc3Q7CiBpbXBvcnQgamF2YS51dGlsLkhhc2hNYXA7CiBpbXBvcnQgamF2YS51dGlsLkhhc2hTZXQ7CkBAIC00NiwxMCArNDcsMTAgQEAKIGltcG9ydCBvcmcuZWNsaXBzZS5qZW0uaW50ZXJuYWwudXRpbC5lbWYud29ya2JlbmNoLkVNRldvcmtiZW5jaENvbnRleHRGYWN0b3J5OwogaW1wb3J0IG9yZy5lY2xpcHNlLmplbS51dGlsLmVtZi53b3JrYmVuY2guUHJvamVjdFJlc291cmNlU2V0OwogaW1wb3J0IG9yZy5lY2xpcHNlLmplbS51dGlsLmVtZi53b3JrYmVuY2guUmVzb3VyY2VTZXRXb3JrYmVuY2hTeW5jaHJvbml6ZXI7Ci1pbXBvcnQgb3JnLmVjbGlwc2UuamVtLnV0aWwubG9nZ2VyLnByb3h5LkxvZ2dlcjsKIGltcG9ydCBvcmcuZWNsaXBzZS5qZW0udXRpbC5wbHVnaW4uSkVNVXRpbFBsdWdpbjsKIGltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmludGVybmFsLmVtZi5yZXNvdXJjZS5SZWZlcmVuY2VkUmVzb3VyY2U7CiBpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5pbnRlcm5hbC5lbWZ3b3JrYmVuY2guV29ya2JlbmNoUmVzb3VyY2VIZWxwZXI7CitpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5pbnRlcm5hbC5lbWZ3b3JrYmVuY2guaW50ZWdyYXRpb24uRU1GV29ya2JlbmNoRWRpdFBsdWdpbjsKIAogLyoqCiAgKiBAYXV0aG9yIHNjaGFjaGVyCkBAIC02NCwzMyArNjUsMjYgQEAKIAlwcml2YXRlIFNldCByZWNlbnRseVNhdmVkRmlsZXMgPSBuZXcgSGFzaFNldCgpOwogCXByaXZhdGUgTWFwIGlnbm9yZWRGaWxlc0NhY2hlID0gbmV3IEhhc2hNYXAoKTsKIAlwcml2YXRlIGNsYXNzIFNhdmVkRmlsZUtleSB7Ci0JCXByaXZhdGUgUmVzb3VyY2UgcmVzOworCQlwcml2YXRlIFdlYWtSZWZlcmVuY2UgcmVzOwogCQlwcml2YXRlIElGaWxlIHNhdmVkRmlsZTsKIAkJcHVibGljIFNhdmVkRmlsZUtleShSZXNvdXJjZSByZXMsIElGaWxlIHNhdmVkRmlsZSkgewogCQkJc3VwZXIoKTsKLQkJCXRoaXMucmVzID0gcmVzOworCQkJdGhpcy5yZXMgPSBuZXcgV2Vha1JlZmVyZW5jZShyZXMpOwogCQkJdGhpcy5zYXZlZEZpbGUgPSBzYXZlZEZpbGU7CiAJCX0KIAkJcHVibGljIFJlc291cmNlIGdldFJlcygpIHsKLQkJCXJldHVybiByZXM7CisJCQlyZXR1cm4gdGhpcy5yZXMgPT0gbnVsbCA/IG51bGwgOiAoUmVzb3VyY2UpcmVzLmdldCgpOwogCQl9Ci0JCXB1YmxpYyB2b2lkIHNldFJlcyhSZXNvdXJjZSByZXMpIHsKLQkJCXRoaXMucmVzID0gcmVzOwotCQl9Ci0JCXB1YmxpYyBJRmlsZSBnZXRTYXZlZEZpbGUoKSB7Ci0JCQlyZXR1cm4gc2F2ZWRGaWxlOwotCQl9Ci0JCXB1YmxpYyB2b2lkIHNldFNhdmVkRmlsZShJRmlsZSBzYXZlZEZpbGUpIHsKLQkJCXRoaXMuc2F2ZWRGaWxlID0gc2F2ZWRGaWxlOwotCQl9CisJCUBPdmVycmlkZQogCQlwdWJsaWMgaW50IGhhc2hDb2RlKCkgewogCQkJZmluYWwgaW50IHByaW1lID0gMzE7CiAJCQlpbnQgcmVzdWx0ID0gMTsKIAkJCXJlc3VsdCA9IHByaW1lICogcmVzdWx0ICsgZ2V0T3V0ZXJUeXBlKCkuaGFzaENvZGUoKTsKLQkJCXJlc3VsdCA9IHByaW1lICogcmVzdWx0ICsgKChyZXMgPT0gbnVsbCkgPyAwIDogcmVzLmhhc2hDb2RlKCkpOworCQkJcmVzdWx0ID0gcHJpbWUgKiByZXN1bHQgKyAoKGdldFJlcygpID09IG51bGwpID8gMCA6IGdldFJlcygpLmhhc2hDb2RlKCkpOwogCQkJcmVzdWx0ID0gcHJpbWUgKiByZXN1bHQgKyAoKHNhdmVkRmlsZSA9PSBudWxsKSA/IDAgOiBzYXZlZEZpbGUuaGFzaENvZGUoKSk7CiAJCQlyZXR1cm4gcmVzdWx0OwogCQl9CisJCUBPdmVycmlkZQogCQlwdWJsaWMgYm9vbGVhbiBlcXVhbHMoT2JqZWN0IG9iaikgewogCQkJaWYgKHRoaXMgPT0gb2JqKQogCQkJCXJldHVybiB0cnVlOwpAQCAtMTAxLDEwICs5NSwxMCBAQAogCQkJU2F2ZWRGaWxlS2V5IG90aGVyID0gKFNhdmVkRmlsZUtleSkgb2JqOwogCQkJaWYgKCFnZXRPdXRlclR5cGUoKS5lcXVhbHMob3RoZXIuZ2V0T3V0ZXJUeXBlKCkpKQogCQkJCXJldHVybiBmYWxzZTsKLQkJCWlmIChyZXMgPT0gbnVsbCkgewotCQkJCWlmIChvdGhlci5yZXMgIT0gbnVsbCkKKwkJCWlmIChnZXRSZXMoKSA9PSBudWxsKSB7CisJCQkJaWYgKG90aGVyLmdldFJlcygpICE9IG51bGwpCiAJCQkJCXJldHVybiBmYWxzZTsKLQkJCX0gZWxzZSBpZiAoIXJlcy5lcXVhbHMob3RoZXIucmVzKSkKKwkJCX0gZWxzZSBpZiAoIWdldFJlcygpLmVxdWFscyhvdGhlci5nZXRSZXMoKSkpCiAJCQkJcmV0dXJuIGZhbHNlOwogCQkJaWYgKHNhdmVkRmlsZSA9PSBudWxsKSB7CiAJCQkJaWYgKG90aGVyLnNhdmVkRmlsZSAhPSBudWxsKQpAQCAtMTM0LDEyICsxMjgsMTMgQEAKIAlwdWJsaWMgUmVzb3VyY2VTZXRXb3JrYmVuY2hFZGl0U3luY2hyb25pemVyKFJlc291cmNlU2V0IGFSZXNvdXJjZVNldCwgSVByb2plY3QgYVByb2plY3QpIHsKIAkJc3VwZXIoYVJlc291cmNlU2V0LCBhUHJvamVjdCk7CiAJfQotCisJCQogCS8qCiAJICogKG5vbi1KYXZhZG9jKQogCSAqIAogCSAqIEBzZWUgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5pbnRlcm5hbC5lbWZ3b3JrYmVuY2guUmVzb3VyY2VTZXRXb3JrYmVuY2hTeW5jaHJvbml6ZXIjcmVzb3VyY2VDaGFuZ2VkKG9yZy5lY2xpcHNlLmNvcmUucmVzb3VyY2VzLklSZXNvdXJjZUNoYW5nZUV2ZW50KQogCSAqLworCUBPdmVycmlkZQogCXB1YmxpYyB2b2lkIHJlc291cmNlQ2hhbmdlZChJUmVzb3VyY2VDaGFuZ2VFdmVudCBldmVudCkgewogCQlzdXBlci5yZXNvdXJjZUNoYW5nZWQoZXZlbnQpOwogCQl0cnkgewpAQCAtMTQ3LDcgKzE0Miw3IEBACiAJCQlub3RpZnlFeHRlbmRlcnNJZk5lY2Vzc2FyeSgpOwogCQkJcHJvY2Vzc0RlZmVycmVkUmVzb3VyY2VzKCk7CiAJCX0gY2F0Y2ggKEV4Y2VwdGlvbiBlKSB7Ci0JCQllLnByaW50U3RhY2tUcmFjZSgpOworCQkJRU1GV29ya2JlbmNoRWRpdFBsdWdpbi5sb2dFcnJvcihlKTsKIAkJfSBmaW5hbGx5IHsKIAkJCWRlZmVycmVkUmVtb3ZlUmVzb3VyY2VzLmNsZWFyKCk7CiAJCQlkZWZlcnJlZFVubG9hZFJlc291cmNlcy5jbGVhcigpOwpAQCAtMTc5LDcgKzE3NCw3IEBACiAJCQl0cnkgewogCQkJCXJlc291cmNlU2V0LmdldFJlc291cmNlKHVyaSwgdHJ1ZSk7CiAJCQl9IGNhdGNoIChXcmFwcGVkRXhjZXB0aW9uIGV4KSB7Ci0JCQkJTG9nZ2VyLmdldExvZ2dlcigpLmxvZ0Vycm9yKGV4KTsKKwkJCQlFTUZXb3JrYmVuY2hFZGl0UGx1Z2luLmxvZ0Vycm9yKGV4KTsKIAkJCX0KIAogCQl9CkBAIC0yMDcsNyArMjAyLDcgQEAKIAkJdHJ5IHsKIAkJCWhhc0xvY2tlZCA9IGFxdWlyZUxvY2soKTsKIAkJfSBjYXRjaCAoSW50ZXJydXB0ZWRFeGNlcHRpb24gZSkgewotCQkJTG9nZ2VyLmdldExvZ2dlcigpLndyaXRlKGUpOworCQkJRU1GV29ya2JlbmNoRWRpdFBsdWdpbi5sb2dFcnJvcihlKTsKIAkJfQkJCiAJCQogCQl0cnl7CkBAIC0yMjUsOCArMjIwLDcgQEAKIAkJCQl0cnkgewogCQkJCQlSZXNvdXJjZXNQbHVnaW4uZ2V0V29ya3NwYWNlKCkucnVuKHJ1bm5hYmxlLCBwcm9qZWN0LCBJV29ya3NwYWNlLkFWT0lEX1VQREFURSwgbnVsbCk7CiAJCQkJfSBjYXRjaCAoQ29yZUV4Y2VwdGlvbiBlKSB7Ci0JCQkJCS8vIFRPRE8gQXV0by1nZW5lcmF0ZWQgY2F0Y2ggYmxvY2sKLQkJCQkJZS5wcmludFN0YWNrVHJhY2UoKTsKKwkJCQkJRU1GV29ya2JlbmNoRWRpdFBsdWdpbi5sb2dFcnJvcihlKTsKIAkJCQl9CiAJCQl9CiAJCX1maW5hbGx5ewpAQCAtMjQxLDcgKzIzNSw3IEBACiAJCQkJY3VycmVudFByb2plY3REZWx0YSA9IG51bGw7CiAJCQkJZGVsdGEuYWNjZXB0KFJlc291cmNlU2V0V29ya2JlbmNoRWRpdFN5bmNocm9uaXplci50aGlzKTsKIAkJCX0gY2F0Y2ggKEV4Y2VwdGlvbiBlKSB7Ci0JCQkJTG9nZ2VyLmdldExvZ2dlcigpLmxvZ0Vycm9yKGUpOworCQkJCUVNRldvcmtiZW5jaEVkaXRQbHVnaW4ubG9nRXJyb3IoZSk7CiAJCQl9CiAJCX0KIAl9CkBAIC0yNTAsNiArMjQ0LDcgQEAKIAkgKiBUaGUgcHJvamVjdCBpcyBnb2luZyBhd2F5IHNvIHdlIG5lZWQgdG8gY2xlYW51cCBvdXJzZWxmIGFuZCB0aGUgUmVzb3VyY2VTZXQuIFRPRE8gTmVlZCB0bwogCSAqIHB1c2ggdXAgdGhpcyBjb2RlIHRvIFJlc291cmNlU2V0V29ya2JlbmNoU3luY2hyb25pemVyIGluIG5leHQgcmVsZWFzZS4KIAkgKi8KKwlAT3ZlcnJpZGUKIAlwcm90ZWN0ZWQgdm9pZCByZWxlYXNlKCkgewogCQlpZiAoSkVNVXRpbFBsdWdpbi5pc0FjdGl2YXRlZCgpKSB7CiAJCQl0cnkgewpAQCAtMzE5LDIyICszMTQsMjYgQEAKIAkgKiBAcG9zdCBSZXR1cm4gdHJ1ZSBpZiBhIDxjb2RlPlJlc291cmNlPC9jb2RlPiB3YXMgcXVldWVkIHVwIHRvIGJlIHJlbG9hZGVkLgogCSAqLwogCXByb3RlY3RlZCBib29sZWFuIGFkZGVkUmVzb3VyY2UoSUZpbGUgYUZpbGUpIHsKLSAgICAgICAgYm9vbGVhbiBkaWRQcm9jZXNzID0gZmFsc2U7Ci0gICAgICAgIExpc3QgcmVzb3VyY2VzID0gZ2V0UmVzb3VyY2VzKGFGaWxlKTsKLSAgICAgICAgZm9yIChJdGVyYXRvciBpdGVyYXRvciA9IHJlc291cmNlcy5pdGVyYXRvcigpOyBpdGVyYXRvci5oYXNOZXh0KCk7KSB7CisJCWJvb2xlYW4gZGlkUHJvY2VzcyA9IGZhbHNlOworCQlMaXN0IHJlc291cmNlcyA9IGdldFJlc291cmNlcyhhRmlsZSk7CisJCWZvciAoSXRlcmF0b3IgaXRlcmF0b3IgPSByZXNvdXJjZXMuaXRlcmF0b3IoKTsgaXRlcmF0b3IuaGFzTmV4dCgpOykgewogCQkJUmVzb3VyY2UgcmVzb3VyY2UgPSAoUmVzb3VyY2UpIGl0ZXJhdG9yLm5leHQoKTsKIAotCQkJaWYgKChyZXNvdXJjZSAhPSBudWxsKSB8fCAocmVjZW50bHlTYXZlZEZpbGVzQ29udGFpbnMocmVzb3VyY2UpKSkgewotCQkJCS8qCi0JCQkJICogVGhlIElGaWxlIHdhcyBqdXN0IGFkZGVkIHRvIHRoZSB3b3Jrc3BhY2UgYnV0IHdlIGhhdmUgYQotCQkJCSAqIHJlc291cmNlIGluIG1lbW9yeS4gTmVlZCB0byBkZWNpZGUgaWYgaXQgc2hvdWxkIGJlIHVubG9hZGVkLgotCQkJCSAqLwotCQkJCWlmIChyZXNvdXJjZS5pc01vZGlmaWVkKCkpIHsKLQkJCQkJaWYgKFdvcmtiZW5jaFJlc291cmNlSGVscGVyLmlzUmVmZXJlbmNlZFJlc291cmNlKHJlc291cmNlKSkgewotCQkJCQkJUmVmZXJlbmNlZFJlc291cmNlIHJlZlJlcyA9IChSZWZlcmVuY2VkUmVzb3VyY2UpIHJlc291cmNlOwotCQkJCQkJaWYgKHJlZlJlcy5zaG91bGRGb3JjZVJlZnJlc2goKSkgewotCQkJCQkJCWRlZmVycmVkVW5sb2FkUmVzb3VyY2VzLmFkZChyZXNvdXJjZSk7Ci0JCQkJCQkJZGlkUHJvY2VzcyA9IHRydWU7CisJCQlpZiAocmVzb3VyY2UgIT0gbnVsbCkgeworCQkJCWlmIChyZWNlbnRseVNhdmVkRmlsZXNDb250YWlucyhyZXNvdXJjZSkpIHsKKworCQkJCQkvKgorCQkJCQkgKiBUaGUgSUZpbGUgd2FzIGp1c3QgYWRkZWQgdG8gdGhlIHdvcmtzcGFjZSBidXQgd2UgaGF2ZSBhCisJCQkJCSAqIGNoYW5nZWQgcmVzb3VyY2UgaW4gbWVtb3J5LiBOZWVkIHRvIGRlY2lkZSBpZiBpdCBzaG91bGQKKwkJCQkJICogYmUgdW5sb2FkZWQuCisJCQkJCSAqLworCQkJCQlpZiAocmVzb3VyY2UuaXNNb2RpZmllZCgpKSB7CisJCQkJCQlpZiAoV29ya2JlbmNoUmVzb3VyY2VIZWxwZXIuaXNSZWZlcmVuY2VkUmVzb3VyY2UocmVzb3VyY2UpKSB7CisJCQkJCQkJUmVmZXJlbmNlZFJlc291cmNlIHJlZlJlcyA9IChSZWZlcmVuY2VkUmVzb3VyY2UpIHJlc291cmNlOworCQkJCQkJCWlmIChyZWZSZXMuc2hvdWxkRm9yY2VSZWZyZXNoKCkpIHsKKwkJCQkJCQkJZGVmZXJyZWRVbmxvYWRSZXNvdXJjZXMuYWRkKHJlc291cmNlKTsKKwkJCQkJCQkJZGlkUHJvY2VzcyA9IHRydWU7CisJCQkJCQkJfQogCQkJCQkJfQogCQkJCQl9CiAJCQkJfSBlbHNlIHsKQEAgLTM0OSwyNCArMzQ4LDI0IEBACiAJCQkJCQkJZGVmZXJyZWRVbmxvYWRSZXNvdXJjZXMuYWRkKHJlc291cmNlKTsKIAkJCQkJCQlkaWRQcm9jZXNzID0gdHJ1ZTsKIAkJCQkJCX0KKwkJCQkJfSBlbHNlIHsKKwkJCQkJCS8qIFByb2Nlc3MgYXV0b2xvYWQgcmVzb3VyY2VzIG9uIGFkZGVkIGZpbGUgKi8KKwkJCQkJCVVSSSB1cmkgPSBVUkkuY3JlYXRlUGxhdGZvcm1SZXNvdXJjZVVSSShhRmlsZS5nZXRGdWxsUGF0aCgpLnRvU3RyaW5nKCkpOworCQkJCQkJaWYgKChhdXRvbG9hZFJlc291cmNlc1VSSXMuY29udGFpbnModXJpKSkgfHwgKGF1dG9sb2FkUmVzb3VyY2VzRXh0cy5jb250YWlucyhhRmlsZS5nZXRGaWxlRXh0ZW5zaW9uKCkpKSkgeworCQkJCQkJCWRlZmVycmVkTG9hZFJlc291cmNlcy5hZGQodXJpKTsKKwkJCQkJCQlkaWRQcm9jZXNzID0gdHJ1ZTsKKwkJCQkJCX0KIAkJCQkJfQogCQkJCX0KLQkJCX0gZWxzZSB7Ci0JCQkJLy8gUHJvY2VzcyByZXNvdXJjZSBhcyBhIHJlZnJlc2guCi0JCQkJVVJJIHVyaSA9IFVSSS5jcmVhdGVQbGF0Zm9ybVJlc291cmNlVVJJKGFGaWxlLmdldEZ1bGxQYXRoKCkudG9TdHJpbmcoKSk7Ci0JCQkJaWYgKChhdXRvbG9hZFJlc291cmNlc1VSSXMuY29udGFpbnModXJpKSkgfHwgKGF1dG9sb2FkUmVzb3VyY2VzRXh0cy5jb250YWlucyhhRmlsZS5nZXRGaWxlRXh0ZW5zaW9uKCkpKSkgewotCQkJCQlkZWZlcnJlZExvYWRSZXNvdXJjZXMuYWRkKHVyaSk7Ci0JCQkJCWRpZFByb2Nlc3MgPSB0cnVlOwotCQkJCX0KIAkJCX0KIAkJfQotICAgICAgICByZXR1cm4gZGlkUHJvY2VzczsKLX0KKwkJcmV0dXJuIGRpZFByb2Nlc3M7CisJfQogCiAJcHJpdmF0ZSBzeW5jaHJvbml6ZWQgYm9vbGVhbiByZWNlbnRseVNhdmVkRmlsZXNDb250YWlucyhSZXNvdXJjZSByZXNvdXJjZSkgewogCQlmb3IgKEl0ZXJhdG9yIGl0ZXJhdG9yID0gcmVjZW50bHlTYXZlZEZpbGVzLml0ZXJhdG9yKCk7IGl0ZXJhdG9yLmhhc05leHQoKTspIHsKIAkJCVNhdmVkRmlsZUtleSBrZXkgPSAoU2F2ZWRGaWxlS2V5KSBpdGVyYXRvci5uZXh0KCk7Ci0JCQlpZiAoa2V5LnJlcy5lcXVhbHMocmVzb3VyY2UpKSAKKwkJCWlmIChrZXkuZ2V0UmVzKCkgIT0gbnVsbCAmJiAoa2V5LmdldFJlcygpLmdldFVSSSgpLmVxdWFscyhyZXNvdXJjZS5nZXRVUkkoKSkgJiYga2V5LmdldFJlcygpLmdldENsYXNzKCkuZXF1YWxzKHJlc291cmNlLmdldENsYXNzKCkpKSkKIAkJCQlyZXR1cm4gdHJ1ZTsKIAkJCX0KIAkJcmV0dXJuIGZhbHNlOwpAQCAtMzc2LDE2ICszNzUsMTcgQEAKIAkJTGlzdCByZXNvdXJjZXMgPSBnZXRSZXNvdXJjZXMoYUZpbGUpOwogICAgICAgICBmb3IgKEl0ZXJhdG9yIGl0ZXJhdG9yID0gcmVzb3VyY2VzLml0ZXJhdG9yKCk7IGl0ZXJhdG9yLmhhc05leHQoKTspIHsKIAkJCVJlc291cmNlIHJlc291cmNlID0gKFJlc291cmNlKSBpdGVyYXRvci5uZXh0KCk7Ci0JCQlpZiAoKHJlc291cmNlICE9IG51bGwpIHx8IChyZWNlbnRseVNhdmVkRmlsZXNDb250YWlucyhyZXNvdXJjZSkpKSB7Ci0JCQkJaWYgKHJlc291cmNlLmlzTW9kaWZpZWQoKSkgewotCQkJCQlpZiAoV29ya2JlbmNoUmVzb3VyY2VIZWxwZXIuaXNSZWZlcmVuY2VkUmVzb3VyY2UocmVzb3VyY2UpKSB7Ci0JCQkJCQlSZWZlcmVuY2VkUmVzb3VyY2UgcmVmUmVzID0gKFJlZmVyZW5jZWRSZXNvdXJjZSkgcmVzb3VyY2U7Ci0JCQkJCQlpZiAoIXJlZlJlcy5zaG91bGRGb3JjZVJlZnJlc2goKSkKLQkJCQkJCQljb250aW51ZTsgLy8gRG8gbm90IGRvIGFueXRoaW5nCi0JCQkJCX0gZWxzZQotCQkJCQkJY29udGludWU7CisJCQlpZiAoKHJlc291cmNlICE9IG51bGwpKSB7CisJCQkJaWYgKHJlY2VudGx5U2F2ZWRGaWxlc0NvbnRhaW5zKHJlc291cmNlKSkgeworCQkJCQlpZiAocmVzb3VyY2UuaXNNb2RpZmllZCgpKSB7CisJCQkJCQlpZiAoV29ya2JlbmNoUmVzb3VyY2VIZWxwZXIuaXNSZWZlcmVuY2VkUmVzb3VyY2UocmVzb3VyY2UpKSB7CisJCQkJCQkJUmVmZXJlbmNlZFJlc291cmNlIHJlZlJlcyA9IChSZWZlcmVuY2VkUmVzb3VyY2UpIHJlc291cmNlOworCQkJCQkJCWlmICghcmVmUmVzLnNob3VsZEZvcmNlUmVmcmVzaCgpKQorCQkJCQkJCQljb250aW51ZTsgLy8gRG8gbm90IGRvIGFueXRoaW5nCisJCQkJCQl9IGVsc2UKKwkJCQkJCQljb250aW51ZTsKKwkJCQkJfQogCQkJCX0KLQogCQkJCWlmIChpc1JlbW92ZSkKIAkJCQkJZGVmZXJyZWRSZW1vdmVSZXNvdXJjZXMuYWRkKHJlc291cmNlKTsKIAkJCQllbHNlIGlmIChyZXNvdXJjZS5pc0xvYWRlZCgpKSB7CkBAIC00MjcsMTkgKzQyNywyMiBAQAogCX0KIAkKIAlwcm90ZWN0ZWQgTGlzdCBnZXRSZXNvdXJjZXMoSUZpbGUgYUZpbGUpIHsKLQkJCisKIAkJTGlzdCByZXNvdXJjZXMgPSBuZXcgQXJyYXlMaXN0KCk7CiAJCUxpc3QgYWxsUmVzb3VyY2VzID0gcmVzb3VyY2VTZXQuZ2V0UmVzb3VyY2VzKCk7CiAJCWZvciAoSXRlcmF0b3IgaXRlcmF0b3IgPSBhbGxSZXNvdXJjZXMuaXRlcmF0b3IoKTsgaXRlcmF0b3IuaGFzTmV4dCgpOykgewogCQkJUmVzb3VyY2UgcmVzID0gKFJlc291cmNlKSBpdGVyYXRvci5uZXh0KCk7CiAJCQlVUkkgcmVzVVJJID0gcmVzLmdldFVSSSgpOwotCQkJSVBhdGggcmVzVVJJUGF0aDsKLQkJCWlmIChXb3JrYmVuY2hSZXNvdXJjZUhlbHBlci5pc1BsYXRmb3JtUmVzb3VyY2VVUkkocmVzVVJJKSkgCi0JCQkJcmVzVVJJUGF0aCA9IG5ldyBQYXRoKFVSSS5kZWNvZGUocmVzVVJJLnBhdGgoKSkpLnJlbW92ZUZpcnN0U2VnbWVudHMoMik7Ci0JCQllbHNlIAotCQkJCXJlc1VSSVBhdGggPSBuZXcgUGF0aChVUkkuZGVjb2RlKHJlc1VSSS5wYXRoKCkpKS5yZW1vdmVGaXJzdFNlZ21lbnRzKDEpOwotCQkJU3RyaW5nIHJlc1VSSVN0cmluZyA9IHJlc1VSSVBhdGgudG9TdHJpbmcoKTsKLQkJCWlmICghcmVzVVJJU3RyaW5nLmVxdWFscygiIikgJiYgYUZpbGUuZ2V0RnVsbFBhdGgoKS50b1N0cmluZygpLmluZGV4T2YocmVzVVJJU3RyaW5nKSAhPSAtMSkKKwkJCVN0cmluZyByZXNVUklTdHJpbmcgPSAiIjsgLy8kTk9OLU5MUy0xJAorCQkJaWYgKHJlc1VSSS5wYXRoKCkgIT0gbnVsbCkgeworCQkJCUlQYXRoIHJlc1VSSVBhdGg7CisJCQkJaWYgKFdvcmtiZW5jaFJlc291cmNlSGVscGVyLmlzUGxhdGZvcm1SZXNvdXJjZVVSSShyZXNVUkkpKQorCQkJCQlyZXNVUklQYXRoID0gbmV3IFBhdGgoVVJJLmRlY29kZShyZXNVUkkucGF0aCgpKSkucmVtb3ZlRmlyc3RTZWdtZW50cygyKTsKKwkJCQllbHNlCisJCQkJCXJlc1VSSVBhdGggPSBuZXcgUGF0aChVUkkuZGVjb2RlKHJlc1VSSS5wYXRoKCkpKS5yZW1vdmVGaXJzdFNlZ21lbnRzKDEpOworCQkJCXJlc1VSSVN0cmluZyA9IHJlc1VSSVBhdGgudG9TdHJpbmcoKTsKKwkJCX0KKwkJCWlmICghcmVzVVJJU3RyaW5nLmVxdWFscygiIikgJiYgYUZpbGUuZ2V0RnVsbFBhdGgoKS50b1N0cmluZygpLmluZGV4T2YocmVzVVJJU3RyaW5nKSAhPSAtMSkgLy8kTk9OLU5MUy0xJAogCQkJCXJlc291cmNlcy5hZGQocmVzKTsKIAkJfQogCQlyZXR1cm4gcmVzb3VyY2VzOwpAQCAtNDQ5LDYgKzQ1Miw3IEBACiAJLyoqCiAJICogVGhpcyBtZXRob2Qgc2hvdWxkIGJlIGNhbGxlZCBwcmlvciB0byB3cml0aW5nIHRvIGFuIElGaWxlIGZyb20gYSBNT0YgcmVzb3VyY2UuCiAJICovCisJQE92ZXJyaWRlCiAJcHVibGljIHZvaWQgcHJlU2F2ZShJRmlsZSBhRmlsZSkgewogCQlpZiAoYUZpbGUgIT0gbnVsbCkgewogCQkJcmVjZW50bHlTYXZlZEZpbGVzQWRkKGFGaWxlLG51bGwpOwpAQCAtNDg3LDEwICs0OTEsOSBAQAogCQkJU2F2ZWRGaWxlS2V5IGtleSA9IChTYXZlZEZpbGVLZXkpIGl0ZXJhdG9yLm5leHQoKTsKIAkJCWlmIChrZXkuc2F2ZWRGaWxlICE9IG51bGwgJiYga2V5LnNhdmVkRmlsZS5lcXVhbHMoZmlsZSkpIHsKIAkJCQlMaXN0IHJlc291cmNlcyA9IGdldFJlc291cmNlcyhmaWxlKTsKLQkJCQlpZiAoa2V5LnJlcyA9PSBudWxsIHx8IHJlc291cmNlcy5jb250YWlucyhrZXkucmVzKSApIHsKKwkJCQlpZiAoa2V5LmdldFJlcygpID09IG51bGwgfHwgcmVzb3VyY2VzLmNvbnRhaW5zKGtleS5nZXRSZXMoKSkgKSB7CiAJCQkJCWl0ZXJhdG9yLnJlbW92ZSgpOwogCQkJCQlyZW1vdmVkRnJvbUxpc3QgPSB0cnVlOwotCQkJCQlicmVhazsKIAkJCQl9CiAJCQl9CiAJCX0KQEAgLTU4MCw2ICs1ODMsNyBAQAogCSAqIAogCSAqIEBzZWUgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5pbnRlcm5hbC5lbWZ3b3JrYmVuY2guUmVzb3VyY2VTZXRXb3JrYmVuY2hTeW5jaHJvbml6ZXIjaW5pdGlhbGl6ZSgpCiAJICovCisJQE92ZXJyaWRlCiAJcHJvdGVjdGVkIHZvaWQgaW5pdGlhbGl6ZSgpIHsKIAkJZ2V0V29ya3NwYWNlKCkuYWRkUmVzb3VyY2VDaGFuZ2VMaXN0ZW5lcih0aGlzLCBJUmVzb3VyY2VDaGFuZ2VFdmVudC5QUkVfQ0xPU0UgfCBJUmVzb3VyY2VDaGFuZ2VFdmVudC5QUkVfREVMRVRFIHwgSVJlc291cmNlQ2hhbmdlRXZlbnQuUE9TVF9DSEFOR0UpOwogCX0KQEAgLTU5MSw2ICs1OTUsNyBAQAogCQlhdXRvbG9hZFJlc291cmNlc0V4dHMucmVtb3ZlKGV4dGVuc2lvbik7CiAJfQogCisJQE92ZXJyaWRlCiAJcHVibGljIHZvaWQgZGlzcG9zZSgpIHsKIAkJc3VwZXIuZGlzcG9zZSgpOwogCQljdXJyZW50UHJvamVjdERlbHRhID0gbnVsbDsKZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbWZ3b3JrYmVuY2guaW50ZWdyYXRpb24vc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW1md29ya2JlbmNoL3ZhbGlkYXRlZWRpdC9WYWxpZGF0ZUVkaXRIZWFkbGVzc0NvbnRleHQuamF2YSBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbWZ3b3JrYmVuY2guaW50ZWdyYXRpb24vc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW1md29ya2JlbmNoL3ZhbGlkYXRlZWRpdC9WYWxpZGF0ZUVkaXRIZWFkbGVzc0NvbnRleHQuamF2YQppbmRleCAxMWVmZTAzLi41ZWM4ZWQ5IDEwMDY0NAotLS0gYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW1md29ya2JlbmNoLmludGVncmF0aW9uL3NyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2VtZndvcmtiZW5jaC92YWxpZGF0ZWVkaXQvVmFsaWRhdGVFZGl0SGVhZGxlc3NDb250ZXh0LmphdmEKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVtZndvcmtiZW5jaC5pbnRlZ3JhdGlvbi9zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbWZ3b3JrYmVuY2gvdmFsaWRhdGVlZGl0L1ZhbGlkYXRlRWRpdEhlYWRsZXNzQ29udGV4dC5qYXZhCkBAIC00NSw3ICs0NSw2IEBACiAJICogQHNlZSBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmludGVybmFsLmVtZndvcmtiZW5jaC52YWxpZGF0ZWVkaXQuUmVzb3VyY2VTdGF0ZVZhbGlkYXRvclByZXNlbnRlciNnZXRWYWxpZGF0ZUVkaXRDb250ZXh0KCkKIAkgKi8KIAlwdWJsaWMgT2JqZWN0IGdldFZhbGlkYXRlRWRpdENvbnRleHQoKSB7Ci0JCS8vIFRPRE8gQXV0by1nZW5lcmF0ZWQgbWV0aG9kIHN0dWIKIAkJcmV0dXJuIG51bGw7CiAJfQogCkBAIC01NSw3ICs1NCw2IEBACiAJICogQHNlZSBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmludGVybmFsLmVtZndvcmtiZW5jaC52YWxpZGF0ZWVkaXQuUmVzb3VyY2VTdGF0ZVZhbGlkYXRvclByZXNlbnRlciNwcm9tcHRGb3JJbmNvbnNpc3RlbnRGaWxlT3ZlcndyaXRlKGphdmEudXRpbC5MaXN0KQogCSAqLwogCXB1YmxpYyBib29sZWFuIHByb21wdEZvckluY29uc2lzdGVudEZpbGVPdmVyd3JpdGUoTGlzdCBpbmNvbnNpc3RlbnRGaWxlcykgewotCQkvLyBUT0RPIEF1dG8tZ2VuZXJhdGVkIG1ldGhvZCBzdHViCiAJCXJldHVybiBmYWxzZTsKIAl9CiAKQEAgLTY1LDcgKzYzLDYgQEAKIAkgKiBAc2VlIG9yZy5lY2xpcHNlLndzdC5jb21tb24uaW50ZXJuYWwuZW1md29ya2JlbmNoLnZhbGlkYXRlZWRpdC5SZXNvdXJjZVN0YXRlVmFsaWRhdG9yUHJlc2VudGVyI3Byb21wdEZvckluY29uc2lzdGVudEZpbGVSZWZyZXNoKGphdmEudXRpbC5MaXN0KQogCSAqLwogCXB1YmxpYyBib29sZWFuIHByb21wdEZvckluY29uc2lzdGVudEZpbGVSZWZyZXNoKExpc3QgaW5jb25zaXN0ZW50RmlsZXMpIHsKLQkJLy8gVE9ETyBBdXRvLWdlbmVyYXRlZCBtZXRob2Qgc3R1YgogCQlyZXR1cm4gZmFsc2U7CiAJfQogCmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW52aXJvbm1lbnQvLmNsYXNzcGF0aCBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbnZpcm9ubWVudC8uY2xhc3NwYXRoCmluZGV4IGNlNzM5MzMuLjMwNGU4NjEgMTAwNjQ0Ci0tLSBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbnZpcm9ubWVudC8uY2xhc3NwYXRoCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbnZpcm9ubWVudC8uY2xhc3NwYXRoCkBAIC0xLDcgKzEsNyBAQAogPD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KIDxjbGFzc3BhdGg+CiAJPGNsYXNzcGF0aGVudHJ5IGtpbmQ9InNyYyIgcGF0aD0ic3JjIi8+Ci0JPGNsYXNzcGF0aGVudHJ5IGtpbmQ9ImNvbiIgcGF0aD0ib3JnLmVjbGlwc2UuamR0LmxhdW5jaGluZy5KUkVfQ09OVEFJTkVSL29yZy5lY2xpcHNlLmpkdC5pbnRlcm5hbC5kZWJ1Zy51aS5sYXVuY2hlci5TdGFuZGFyZFZNVHlwZS9KMlNFLTEuNCIvPgorCTxjbGFzc3BhdGhlbnRyeSBraW5kPSJjb24iIHBhdGg9Im9yZy5lY2xpcHNlLmpkdC5sYXVuY2hpbmcuSlJFX0NPTlRBSU5FUi9vcmcuZWNsaXBzZS5qZHQuaW50ZXJuYWwuZGVidWcudWkubGF1bmNoZXIuU3RhbmRhcmRWTVR5cGUvSjJTRS0xLjUiLz4KIAk8Y2xhc3NwYXRoZW50cnkga2luZD0iY29uIiBwYXRoPSJvcmcuZWNsaXBzZS5wZGUuY29yZS5yZXF1aXJlZFBsdWdpbnMiLz4KIAk8Y2xhc3NwYXRoZW50cnkga2luZD0ib3V0cHV0IiBwYXRoPSJiaW4iLz4KIDwvY2xhc3NwYXRoPgpkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVudmlyb25tZW50Ly5zZXR0aW5ncy9vcmcuZWNsaXBzZS5qZHQuY29yZS5wcmVmcyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbnZpcm9ubWVudC8uc2V0dGluZ3Mvb3JnLmVjbGlwc2UuamR0LmNvcmUucHJlZnMKaW5kZXggZjVmNWY5My4uMDM3YTRlNSAxMDA2NDQKLS0tIGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVudmlyb25tZW50Ly5zZXR0aW5ncy9vcmcuZWNsaXBzZS5qZHQuY29yZS5wcmVmcworKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW52aXJvbm1lbnQvLnNldHRpbmdzL29yZy5lY2xpcHNlLmpkdC5jb3JlLnByZWZzCkBAIC0xLDU3ICsxLDk1IEBACi0jV2VkIEp1bCAwOSAxNjozMjoxNiBFRFQgMjAwOAotZWNsaXBzZS5wcmVmZXJlbmNlcy52ZXJzaW9uPTEKLW9yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLmNvZGVnZW4uaW5saW5lSnNyQnl0ZWNvZGU9ZW5hYmxlZAotb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIuY29kZWdlbi50YXJnZXRQbGF0Zm9ybT0xLjUKLW9yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLmNvZGVnZW4udW51c2VkTG9jYWw9cHJlc2VydmUKLW9yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLmNvbXBsaWFuY2U9MS41Ci1vcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5kZWJ1Zy5saW5lTnVtYmVyPWdlbmVyYXRlCi1vcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5kZWJ1Zy5sb2NhbFZhcmlhYmxlPWdlbmVyYXRlCi1vcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5kZWJ1Zy5zb3VyY2VGaWxlPWdlbmVyYXRlCi1vcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLmFubm90YXRpb25TdXBlckludGVyZmFjZT13YXJuaW5nCi1vcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLmFzc2VydElkZW50aWZpZXI9ZXJyb3IKLW9yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0uYXV0b2JveGluZz1pZ25vcmUKLW9yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0uZGVwcmVjYXRpb249aWdub3JlCi1vcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLmRlcHJlY2F0aW9uSW5EZXByZWNhdGVkQ29kZT1kaXNhYmxlZAotb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5kZXByZWNhdGlvbldoZW5PdmVycmlkaW5nRGVwcmVjYXRlZE1ldGhvZD1kaXNhYmxlZAotb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5kaXNjb3VyYWdlZFJlZmVyZW5jZT1pZ25vcmUKLW9yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0uZW1wdHlTdGF0ZW1lbnQ9aWdub3JlCi1vcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLmVudW1JZGVudGlmaWVyPWVycm9yCi1vcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLmZpZWxkSGlkaW5nPWlnbm9yZQotb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5maW5hbFBhcmFtZXRlckJvdW5kPXdhcm5pbmcKLW9yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0uZmluYWxseUJsb2NrTm90Q29tcGxldGluZ05vcm1hbGx5PXdhcm5pbmcKLW9yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0uZm9yYmlkZGVuUmVmZXJlbmNlPWVycm9yCi1vcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLmhpZGRlbkNhdGNoQmxvY2s9d2FybmluZwotb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5pbmNvbXBhdGlibGVOb25Jbmhlcml0ZWRJbnRlcmZhY2VNZXRob2Q9d2FybmluZwotb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5pbmNvbXBsZXRlRW51bVN3aXRjaD1pZ25vcmUKLW9yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0uaW5kaXJlY3RTdGF0aWNBY2Nlc3M9aWdub3JlCi1vcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLmxvY2FsVmFyaWFibGVIaWRpbmc9aWdub3JlCi1vcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLm1ldGhvZFdpdGhDb25zdHJ1Y3Rvck5hbWU9d2FybmluZwotb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5taXNzaW5nRGVwcmVjYXRlZEFubm90YXRpb249aWdub3JlCi1vcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLm1pc3NpbmdPdmVycmlkZUFubm90YXRpb249aWdub3JlCi1vcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLm1pc3NpbmdTZXJpYWxWZXJzaW9uPXdhcm5pbmcKLW9yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0ubm9FZmZlY3RBc3NpZ25tZW50PXdhcm5pbmcKLW9yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0ubm9JbXBsaWNpdFN0cmluZ0NvbnZlcnNpb249d2FybmluZwotb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5ub25FeHRlcm5hbGl6ZWRTdHJpbmdMaXRlcmFsPWlnbm9yZQotb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5vdmVycmlkaW5nUGFja2FnZURlZmF1bHRNZXRob2Q9d2FybmluZwotb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5wb3NzaWJsZUFjY2lkZW50YWxCb29sZWFuQXNzaWdubWVudD1pZ25vcmUKLW9yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0uc3BlY2lhbFBhcmFtZXRlckhpZGluZ0ZpZWxkPWRpc2FibGVkCi1vcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLnN0YXRpY0FjY2Vzc1JlY2VpdmVyPXdhcm5pbmcKLW9yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0uc3VwcHJlc3NXYXJuaW5ncz1lbmFibGVkCi1vcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLnN5bnRoZXRpY0FjY2Vzc0VtdWxhdGlvbj1pZ25vcmUKLW9yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0udHlwZVBhcmFtZXRlckhpZGluZz13YXJuaW5nCi1vcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLnVuY2hlY2tlZFR5cGVPcGVyYXRpb249d2FybmluZwotb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS51bmRvY3VtZW50ZWRFbXB0eUJsb2NrPWlnbm9yZQotb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS51bmhhbmRsZWRXYXJuaW5nVG9rZW49d2FybmluZwotb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS51bm5lY2Vzc2FyeUVsc2U9aWdub3JlCi1vcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLnVubmVjZXNzYXJ5VHlwZUNoZWNrPWlnbm9yZQotb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS51bnF1YWxpZmllZEZpZWxkQWNjZXNzPWlnbm9yZQotb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS51bnVzZWREZWNsYXJlZFRocm93bkV4Y2VwdGlvbj1pZ25vcmUKLW9yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0udW51c2VkRGVjbGFyZWRUaHJvd25FeGNlcHRpb25XaGVuT3ZlcnJpZGluZz1kaXNhYmxlZAotb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS51bnVzZWRJbXBvcnQ9d2FybmluZwotb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS51bnVzZWRMb2NhbD13YXJuaW5nCi1vcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLnVudXNlZFBhcmFtZXRlcj1pZ25vcmUKKyNNb24gSnVuIDA4IDE1OjM1OjQ1IEVEVCAyMDA5CiBvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLnVudXNlZFBhcmFtZXRlcldoZW5JbXBsZW1lbnRpbmdBYnN0cmFjdD1kaXNhYmxlZAorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5jb21wYXJpbmdJZGVudGljYWw9ZXJyb3IKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0udW5uZWNlc3NhcnlFbHNlPWVycm9yCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLnJlZHVuZGFudFN1cGVyaW50ZXJmYWNlPWVycm9yCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLnVudXNlZExvY2FsPWVycm9yCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLmVtcHR5U3RhdGVtZW50PWVycm9yCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLnVudXNlZExhYmVsPWVycm9yCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLnVudXNlZFBhcmFtZXRlcj13YXJuaW5nCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLnJhd1R5cGVSZWZlcmVuY2U9d2FybmluZworb3JnLmVjbGlwc2UuamR0LmNvcmUuaW5jb21wYXRpYmxlSkRLTGV2ZWw9aWdub3JlCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLmluY29tcGF0aWJsZU5vbkluaGVyaXRlZEludGVyZmFjZU1ldGhvZD1lcnJvcgorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIuZGVidWcubGluZU51bWJlcj1nZW5lcmF0ZQorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS51bnVzZWREZWNsYXJlZFRocm93bkV4Y2VwdGlvbj13YXJuaW5nCitvcmcuZWNsaXBzZS5qZHQuY29yZS5idWlsZGVyLmNsZWFuT3V0cHV0Rm9sZGVyPWNsZWFuCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLnVudXNlZFdhcm5pbmdUb2tlbj13YXJuaW5nCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLm5vSW1wbGljaXRTdHJpbmdDb252ZXJzaW9uPWVycm9yCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLmRlcHJlY2F0aW9uSW5EZXByZWNhdGVkQ29kZT1lbmFibGVkCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLmRlcHJlY2F0aW9uPXdhcm5pbmcKIG9yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0udW51c2VkUGFyYW1ldGVyV2hlbk92ZXJyaWRpbmdDb25jcmV0ZT1kaXNhYmxlZAotb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS51bnVzZWRQcml2YXRlTWVtYmVyPXdhcm5pbmcKLW9yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0udmFyYXJnc0FyZ3VtZW50TmVlZENhc3Q9d2FybmluZworb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5taXNzaW5nU3luY2hyb25pemVkT25Jbmhlcml0ZWRNZXRob2Q9ZXJyb3IKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0uZGVwcmVjYXRpb25XaGVuT3ZlcnJpZGluZ0RlcHJlY2F0ZWRNZXRob2Q9ZW5hYmxlZAorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5yZWR1bmRhbnROdWxsQ2hlY2s9ZXJyb3IKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0udW51c2VkSW1wb3J0PWVycm9yCitvcmcuZWNsaXBzZS5qZHQuY29yZS5idWlsZGVyLnJlY3JlYXRlTW9kaWZpZWRDbGFzc0ZpbGVJbk91dHB1dEZvbGRlcj1pZ25vcmUKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmJ1aWxkZXIucmVzb3VyY2VDb3B5RXhjbHVzaW9uRmlsdGVyPSoubGF1bmNoCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jbGFzc3BhdGgubXVsdGlwbGVPdXRwdXRMb2NhdGlvbnM9ZW5hYmxlZAorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5zdXBwcmVzc1dhcm5pbmdzPWVuYWJsZWQKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0udHlwZVBhcmFtZXRlckhpZGluZz1lcnJvcgorb3JnLmVjbGlwc2UuamR0LmNvcmUuYnVpbGRlci5pbnZhbGlkQ2xhc3NwYXRoPWFib3J0CitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLmxvY2FsVmFyaWFibGVIaWRpbmc9d2FybmluZworb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5wb3NzaWJsZUFjY2lkZW50YWxCb29sZWFuQXNzaWdubWVudD1lcnJvcgorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5taXNzaW5nSGFzaENvZGVNZXRob2Q9ZXJyb3IKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvZGVDb21wbGV0ZS5hcmd1bWVudFN1ZmZpeGVzPQorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29kZUNvbXBsZXRlLmFyZ3VtZW50UHJlZml4ZXM9CitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLmluZGlyZWN0U3RhdGljQWNjZXNzPWlnbm9yZQorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5wb3RlbnRpYWxOdWxsUmVmZXJlbmNlPWVycm9yCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5jb2RlZ2VuLmlubGluZUpzckJ5dGVjb2RlPWVuYWJsZWQKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0uZmluYWxQYXJhbWV0ZXJCb3VuZD13YXJuaW5nCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLm1pc3NpbmdTZXJpYWxWZXJzaW9uPWVycm9yCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLm51bGxSZWZlcmVuY2U9ZXJyb3IKIG9yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnNvdXJjZT0xLjUKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0uZW51bUlkZW50aWZpZXI9ZXJyb3IKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0uc3ludGhldGljQWNjZXNzRW11bGF0aW9uPWlnbm9yZQorb3JnLmVjbGlwc2UuamR0LmNvcmUuYnVpbGRlci5kdXBsaWNhdGVSZXNvdXJjZVRhc2s9d2FybmluZworb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5maWVsZEhpZGluZz1lcnJvcgorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS51bnVzZWREZWNsYXJlZFRocm93bkV4Y2VwdGlvbkV4ZW1wdEV4Y2VwdGlvbkFuZFRocm93YWJsZT1lbmFibGVkCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLm1pc3NpbmdPdmVycmlkZUFubm90YXRpb249ZXJyb3IKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0uaGlkZGVuQ2F0Y2hCbG9jaz1lcnJvcgorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5vdmVycmlkaW5nUGFja2FnZURlZmF1bHRNZXRob2Q9ZXJyb3IKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0uZmluYWxseUJsb2NrTm90Q29tcGxldGluZ05vcm1hbGx5PWVycm9yCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLnVuZG9jdW1lbnRlZEVtcHR5QmxvY2s9d2FybmluZworb3JnLmVjbGlwc2UuamR0LmNvcmUuY2xhc3NwYXRoLmV4Y2x1c2lvblBhdHRlcm5zPWVuYWJsZWQKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0ubWV0aG9kV2l0aENvbnN0cnVjdG9yTmFtZT1lcnJvcgorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5kaXNjb3VyYWdlZFJlZmVyZW5jZT13YXJuaW5nCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLnVucXVhbGlmaWVkRmllbGRBY2Nlc3M9aWdub3JlCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLmluY29tcGxldGVFbnVtU3dpdGNoPWVycm9yCitlY2xpcHNlLnByZWZlcmVuY2VzLnZlcnNpb249MQorb3JnLmVjbGlwc2UuamR0LmNvcmUuaW5jb21wbGV0ZUNsYXNzcGF0aD1lcnJvcgorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS51bm5lY2Vzc2FyeVR5cGVDaGVjaz1lcnJvcgorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5kZWFkQ29kZT1lcnJvcgorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5zcGVjaWFsUGFyYW1ldGVySGlkaW5nRmllbGQ9ZW5hYmxlZAorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5mYXRhbE9wdGlvbmFsRXJyb3I9ZW5hYmxlZAorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5ub0VmZmVjdEFzc2lnbm1lbnQ9ZXJyb3IKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLmRlYnVnLnNvdXJjZUZpbGU9Z2VuZXJhdGUKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0udW51c2VkRGVjbGFyZWRUaHJvd25FeGNlcHRpb25JbmNsdWRlVW5jaGVja2VkRXhjZXB0aW9ucz1kaXNhYmxlZAorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5taXNzaW5nRGVwcmVjYXRlZEFubm90YXRpb249d2FybmluZworb3JnLmVjbGlwc2UuamR0LmNvcmUuY29kZUNvbXBsZXRlLmZpZWxkUHJlZml4ZXM9CitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLmZhbGx0aHJvdWdoQ2FzZT1lcnJvcgorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIuY29kZWdlbi50YXJnZXRQbGF0Zm9ybT0xLjUKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0udW51c2VkUHJpdmF0ZU1lbWJlcj1lcnJvcgorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5hdXRvYm94aW5nPXdhcm5pbmcKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNpcmN1bGFyQ2xhc3NwYXRoPWVycm9yCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLmFubm90YXRpb25TdXBlckludGVyZmFjZT13YXJuaW5nCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLm5vbkV4dGVybmFsaXplZFN0cmluZ0xpdGVyYWw9ZXJyb3IKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvZGVDb21wbGV0ZS5maWVsZFN1ZmZpeGVzPQorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29kZUNvbXBsZXRlLmxvY2FsU3VmZml4ZXM9CitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLnBhcmFtZXRlckFzc2lnbm1lbnQ9ZXJyb3IKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0uc3RhdGljQWNjZXNzUmVjZWl2ZXI9ZXJyb3IKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvZGVDb21wbGV0ZS5sb2NhbFByZWZpeGVzPQorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS51bnVzZWREZWNsYXJlZFRocm93bkV4Y2VwdGlvbkluY2x1ZGVEb2NDb21tZW50UmVmZXJlbmNlPWVuYWJsZWQKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLm1heFByb2JsZW1QZXJVbml0PTEwMAorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS52YXJhcmdzQXJndW1lbnROZWVkQ2FzdD1lcnJvcgorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5hc3NlcnRJZGVudGlmaWVyPWVycm9yCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5jb21wbGlhbmNlPTEuNQorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS51bnVzZWRQYXJhbWV0ZXJJbmNsdWRlRG9jQ29tbWVudFJlZmVyZW5jZT1lbmFibGVkCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb2RlQ29tcGxldGUuc3RhdGljRmllbGRQcmVmaXhlcz0KK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLmRlYnVnLmxvY2FsVmFyaWFibGU9Z2VuZXJhdGUKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0udW5oYW5kbGVkV2FybmluZ1Rva2VuPXdhcm5pbmcKK2luc3RhbmNlL29yZy5lY2xpcHNlLmNvcmUubmV0L29yZy5lY2xpcHNlLmNvcmUubmV0Lmhhc01pZ3JhdGVkPXRydWUKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0uZm9yYmlkZGVuUmVmZXJlbmNlPWVycm9yCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5jb2RlZ2VuLnVudXNlZExvY2FsPXByZXNlcnZlCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLnVuY2hlY2tlZFR5cGVPcGVyYXRpb249d2FybmluZworb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS51bnVzZWREZWNsYXJlZFRocm93bkV4Y2VwdGlvbldoZW5PdmVycmlkaW5nPWRpc2FibGVkCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb2RlQ29tcGxldGUuc3RhdGljRmllbGRTdWZmaXhlcz0KZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbnZpcm9ubWVudC9NRVRBLUlORi9NQU5JRkVTVC5NRiBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbnZpcm9ubWVudC9NRVRBLUlORi9NQU5JRkVTVC5NRgppbmRleCBkNTI3ZjE4Li5hNTY5N2M2IDEwMDY0NAotLS0gYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW52aXJvbm1lbnQvTUVUQS1JTkYvTUFOSUZFU1QuTUYKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVudmlyb25tZW50L01FVEEtSU5GL01BTklGRVNULk1GCkBAIC0yLDcgKzIsNyBAQAogQnVuZGxlLU1hbmlmZXN0VmVyc2lvbjogMgogQnVuZGxlLU5hbWU6ICVwbHVnaW5OYW1lCiBCdW5kbGUtU3ltYm9saWNOYW1lOiBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmVudmlyb25tZW50Ci1CdW5kbGUtVmVyc2lvbjogMS4wLjIwMi5xdWFsaWZpZXIKK0J1bmRsZS1WZXJzaW9uOiAxLjAuNDAwLnF1YWxpZmllcgogQnVuZGxlLUFjdGl2YXRvcjogb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5pbnRlcm5hbC5lbnZpcm9ubWVudC5wbHVnaW4uRW52aXJvbm1lbnRQbHVnaW4KIEJ1bmRsZS1Mb2NhbGl6YXRpb246IHBsdWdpbgogRXhwb3J0LVBhY2thZ2U6IG9yZy5lY2xpcHNlLndzdC5jb21tb24uZW52aXJvbm1lbnQsCmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW52aXJvbm1lbnQvcGx1Z2luLnByb3BlcnRpZXMgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW52aXJvbm1lbnQvcGx1Z2luLnByb3BlcnRpZXMKaW5kZXggYzQxNTc1Zi4uMWUwMWFjOSAxMDA2NDQKLS0tIGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVudmlyb25tZW50L3BsdWdpbi5wcm9wZXJ0aWVzCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbnZpcm9ubWVudC9wbHVnaW4ucHJvcGVydGllcwpAQCAtMSw1ICsxLDUgQEAKICMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMKLSMgQ29weXJpZ2h0IChjKSAyMDA2IElCTSBDb3Jwb3JhdGlvbiBhbmQgb3RoZXJzLgorIyBDb3B5cmlnaHQgKGMpIDIwMDYsIDIwMDkgSUJNIENvcnBvcmF0aW9uIGFuZCBvdGhlcnMuCiAjIEFsbCByaWdodHMgcmVzZXJ2ZWQuIFRoaXMgcHJvZ3JhbSBhbmQgdGhlIGFjY29tcGFueWluZyBtYXRlcmlhbHMKICMgYXJlIG1hZGUgYXZhaWxhYmxlIHVuZGVyIHRoZSB0ZXJtcyBvZiB0aGUgRWNsaXBzZSBQdWJsaWMgTGljZW5zZSB2MS4wCiAjIHdoaWNoIGFjY29tcGFuaWVzIHRoaXMgZGlzdHJpYnV0aW9uLCBhbmQgaXMgYXZhaWxhYmxlIGF0CkBAIC05LDUgKzksNSBAQAogIyAgICAgSUJNIENvcnBvcmF0aW9uIC0gaW5pdGlhbCBBUEkgYW5kIGltcGxlbWVudGF0aW9uCiAjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjCiAKLXBsdWdpbk5hbWU9RW52aW9ybm1lbnQgUGx1Zy1pbgorcGx1Z2luTmFtZT1FbnZpcm9ubWVudCBQbHVnLWluCiBwcm92aWRlck5hbWU9RWNsaXBzZS5vcmcKXCBObyBuZXdsaW5lIGF0IGVuZCBvZiBmaWxlCmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW52aXJvbm1lbnQvc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vZW52aXJvbm1lbnQvRW52aXJvbm1lbnRTZXJ2aWNlLmphdmEgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW52aXJvbm1lbnQvc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vZW52aXJvbm1lbnQvRW52aXJvbm1lbnRTZXJ2aWNlLmphdmEKaW5kZXggNTY2M2ZlYy4uNTNjYWU3NCAxMDA2NDQKLS0tIGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVudmlyb25tZW50L3NyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2Vudmlyb25tZW50L0Vudmlyb25tZW50U2VydmljZS5qYXZhCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbnZpcm9ubWVudC9zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9lbnZpcm9ubWVudC9FbnZpcm9ubWVudFNlcnZpY2UuamF2YQpAQCAtNTgsNyArNTgsNyBAQAogICAgIAogICAgIHRyeQogICAgIHsKLSAgICAgIHNjaGVtZSA9IGVudmlyb25tZW50LmdldFVSSUZhY3RvcnkoKS5uZXdVUklTY2hlbWUoICJwbGF0Zm9ybSIgKTsKKyAgICAgIHNjaGVtZSA9IGVudmlyb25tZW50LmdldFVSSUZhY3RvcnkoKS5uZXdVUklTY2hlbWUoICJwbGF0Zm9ybSIgKTsgLy8kTk9OLU5MUy0xJAogICAgIH0KICAgICBjYXRjaCggVVJJRXhjZXB0aW9uIGV4YyApCiAgICAgeyAgICAKQEAgLTc4LDcgKzc4LDcgQEAKICAgICAKICAgICB0cnkKICAgICB7Ci0gICAgICBzY2hlbWUgPSBlbnZpcm9ubWVudC5nZXRVUklGYWN0b3J5KCkubmV3VVJJU2NoZW1lKCAiZmlsZSIgKTsKKyAgICAgIHNjaGVtZSA9IGVudmlyb25tZW50LmdldFVSSUZhY3RvcnkoKS5uZXdVUklTY2hlbWUoICJmaWxlIiApOyAvLyROT04tTkxTLTEkCiAgICAgfQogICAgIGNhdGNoKCBVUklFeGNlcHRpb24gZXhjICkKICAgICB7ICAgIApkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVudmlyb25tZW50L3NyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2Vudmlyb25tZW50L3VyaS9TaW1wbGVVUklGYWN0b3J5LmphdmEgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW52aXJvbm1lbnQvc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vZW52aXJvbm1lbnQvdXJpL1NpbXBsZVVSSUZhY3RvcnkuamF2YQppbmRleCBiY2NiMmUwLi4zZjMzYzY1IDEwMDY0NAotLS0gYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW52aXJvbm1lbnQvc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vZW52aXJvbm1lbnQvdXJpL1NpbXBsZVVSSUZhY3RvcnkuamF2YQorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW52aXJvbm1lbnQvc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vZW52aXJvbm1lbnQvdXJpL1NpbXBsZVVSSUZhY3RvcnkuamF2YQpAQCAtODYsOCArODYsOCBAQAogICAgIGlmKCBzY2hlbWVPclVSSSA9PSBudWxsICkKICAgICB7CiAgICAgICB0aHJvdyBuZXcgVVJJRXhjZXB0aW9uKCAKLSAgICAgICAgICAgICAgbmV3IFN0YXR1cyggSVN0YXR1cy5FUlJPUiwgImlkIiwgMCwgCi0gICAgICAgICAgICAgICAgIE5MUy5iaW5kKCBNZXNzYWdlcy5NU0dfTlVMTF9BUkdfU1BFQ0lGSUVELCAibmV3VVJJU2NoZW1lIiksIG51bGwgKSApOworICAgICAgICAgICAgICBuZXcgU3RhdHVzKCBJU3RhdHVzLkVSUk9SLCAiaWQiLCAwLCAvLyROT04tTkxTLTEkIAorICAgICAgICAgICAgICAgICBOTFMuYmluZCggTWVzc2FnZXMuTVNHX05VTExfQVJHX1NQRUNJRklFRCwgIm5ld1VSSVNjaGVtZSIpLCBudWxsICkgKTsgLy8kTk9OLU5MUy0xJAogICAgIH0KICAgICAKICAgICBpbnQgY29sb24gICAgPSBzY2hlbWVPclVSSS5pbmRleE9mKCc6Jyk7CkBAIC0xMDgsMTUgKzEwOCwxNSBAQAogICAgICAgaWYoIG5ld1NjaGVtZSA9PSBudWxsICkKICAgICAgIHsKICAgICAgICAgdGhyb3cgbmV3IFVSSUV4Y2VwdGlvbiggCi0gICAgICAgICAgICBuZXcgU3RhdHVzKCBJU3RhdHVzLkVSUk9SLCAiaWQiLCAwLCAKKyAgICAgICAgICAgIG5ldyBTdGF0dXMoIElTdGF0dXMuRVJST1IsICJpZCIsIDAsIC8vJE5PTi1OTFMtMSQgCiAgICAgICAgICAgICAgICAgTkxTLmJpbmQoIE1lc3NhZ2VzLk1TR19TQ0hFTUVfTk9UX0ZPVU5ELCBzY2hlbWVPclVSSSApLCBudWxsICkgKTsKICAgICAgICAgICAgICAgICAKICAgICAgIH0KICAgICB9Ci0gICAgZWxzZSBpZiggc2NoZW1lT3JVUkkuc3RhcnRzV2l0aCggIi8iKSApCisgICAgZWxzZSBpZiggc2NoZW1lT3JVUkkuc3RhcnRzV2l0aCggIi8iKSApIC8vJE5PTi1OTFMtMSQKICAgICB7CiAgICAgICB0aHJvdyBuZXcgVVJJRXhjZXB0aW9uKCAKLSAgICAgICAgICBuZXcgU3RhdHVzKCBJU3RhdHVzLkVSUk9SLCAiaWQiLCAwLAorICAgICAgICAgIG5ldyBTdGF0dXMoIElTdGF0dXMuRVJST1IsICJpZCIsIDAsIC8vJE5PTi1OTFMtMSQKICAgICAgICAgICAgICAgTkxTLmJpbmQoIE1lc3NhZ2VzLk1TR19BQlNPTFVURV9QQVRIX1dJVEhPVVRfU0NIRU1FLCBzY2hlbWVPclVSSSApLCBudWxsICkgKTsKICAgICAgIAogICAgIH0KZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbnZpcm9ubWVudC9zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbnZpcm9ubWVudC9lY2xpcHNlL0NvbnNvbGVFY2xpcHNlRW52aXJvbm1lbnQuamF2YSBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbnZpcm9ubWVudC9zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbnZpcm9ubWVudC9lY2xpcHNlL0NvbnNvbGVFY2xpcHNlRW52aXJvbm1lbnQuamF2YQppbmRleCAwYzljOTVlLi5iMDJmMzAzIDEwMDY0NAotLS0gYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW52aXJvbm1lbnQvc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW52aXJvbm1lbnQvZWNsaXBzZS9Db25zb2xlRWNsaXBzZUVudmlyb25tZW50LmphdmEKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVudmlyb25tZW50L3NyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2Vudmlyb25tZW50L2VjbGlwc2UvQ29uc29sZUVjbGlwc2VFbnZpcm9ubWVudC5qYXZhCkBAIC0zNyw4ICszNyw4IEBACiAJICB1cmlGYWN0b3J5XyAgICAgID0gbmV3IFNpbXBsZVVSSUZhY3RvcnkoKTsKIAkgIHN0YXR1c0hhbmRsZXJfICAgPSBzdGF0dXNIYW5kbGVyOwogCSAgICAKLQkgIHVyaUZhY3RvcnlfLnJlZ2lzdGVyU2NoZW1lKCAicGxhdGZvcm0iLCBuZXcgRWNsaXBzZVNjaGVtZSggdGhpcyApICk7Ci0JICB1cmlGYWN0b3J5Xy5yZWdpc3RlclNjaGVtZSggImZpbGUiLCBuZXcgRmlsZVNjaGVtZSgpICk7CisJICB1cmlGYWN0b3J5Xy5yZWdpc3RlclNjaGVtZSggInBsYXRmb3JtIiwgbmV3IEVjbGlwc2VTY2hlbWUoIHRoaXMgKSApOyAvLyROT04tTkxTLTEkCisJICB1cmlGYWN0b3J5Xy5yZWdpc3RlclNjaGVtZSggImZpbGUiLCBuZXcgRmlsZVNjaGVtZSgpICk7IC8vJE5PTi1OTFMtMSQKIAl9CiAJCQkKIAkvKiAobm9uLUphdmFkb2MpCmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW52aXJvbm1lbnQvc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW52aXJvbm1lbnQvZWNsaXBzZS9FY2xpcHNlTG9nLmphdmEgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW52aXJvbm1lbnQvc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW52aXJvbm1lbnQvZWNsaXBzZS9FY2xpcHNlTG9nLmphdmEKaW5kZXggZTFkNzVlNi4uZTU4NmY1MyAxMDA2NDQKLS0tIGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVudmlyb25tZW50L3NyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2Vudmlyb25tZW50L2VjbGlwc2UvRWNsaXBzZUxvZy5qYXZhCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbnZpcm9ubWVudC9zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbnZpcm9ubWVudC9lY2xpcHNlL0VjbGlwc2VMb2cuamF2YQpAQCAtNDMsNyArNDMsNyBAQAogCSAqIEBzZWUgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5FbnZpcm9ubWVudC5JTG9nI2lzRW5hYmxlZChqYXZhLmxhbmcuU3RyaW5nKQogCSAqLwogCXB1YmxpYyBib29sZWFuIGlzRW5hYmxlZChTdHJpbmcgb3B0aW9uKSB7Ci0JCXJldHVybiAidHJ1ZSIuZXF1YWxzKFBsYXRmb3JtLmdldERlYnVnT3B0aW9uKCJvcmcuZWNsaXBzZS53c3QuY29tbW9uLmVudmlyb25tZW50L3RyYWNlLyIKKwkJcmV0dXJuICJ0cnVlIi5lcXVhbHMoUGxhdGZvcm0uZ2V0RGVidWdPcHRpb24oIm9yZy5lY2xpcHNlLndzdC5jb21tb24uZW52aXJvbm1lbnQvdHJhY2UvIiAvLyROT04tTkxTLTEkIC8vJE5PTi1OTFMtMiQKIAkJCQkrIG9wdGlvbikpOwogCX0KIAkKQEAgLTU4LDEwICs1OCwxMCBAQAogCQkJc3dpdGNoIChzZXZlcml0eSkgewogCQkJCWNhc2UgSUxvZy5FUlJPUiA6CiAJCQkJewotCQkJCQlpZiAoaXNFbmFibGVkKCJlcnJvciIpKQorCQkJCQlpZiAoaXNFbmFibGVkKCJlcnJvciIpKSAvLyROT04tTkxTLTEkCiAJCQkJCXsKLQkJCQkJCVN0cmluZyBtZXNzYWdlID0gZ2V0TWVzc2FnZU51bVN0cmluZyhtZXNzYWdlTnVtKSArICJFICIKLQkJCQkJCQkrIGNhbGxlciArICI6OiIgKyBtZXRob2QgKyAiOiBvYmplY3Q9IgorCQkJCQkJU3RyaW5nIG1lc3NhZ2UgPSBnZXRNZXNzYWdlTnVtU3RyaW5nKG1lc3NhZ2VOdW0pICsgIkUgIiAvLyROT04tTkxTLTEkCisJCQkJCQkJKyBjYWxsZXIgKyAiOjoiICsgbWV0aG9kICsgIjogb2JqZWN0PSIgLy8kTk9OLU5MUy0xJCAvLyROT04tTkxTLTIkCiAJCQkJCQkJKyBvYmplY3Q7CiAJCQkJCQlsb2coIHNldmVyaXR5LCBtZXNzYWdlLCBudWxsICk7CiAJCQkJCX0KQEAgLTcwLDExICs3MCwxMSBAQAogCQkJCQogCQkJCWNhc2UgSUxvZy5XQVJOSU5HIDoKIAkJCQl7Ci0JCQkJCWlmIChpc0VuYWJsZWQoIndhcm5pbmciKSkKKwkJCQkJaWYgKGlzRW5hYmxlZCgid2FybmluZyIpKSAvLyROT04tTkxTLTEkCiAJCQkJCXsKIAkJCQkJCVN0cmluZyBtZXNzYWdlID0gZ2V0TWVzc2FnZU51bVN0cmluZyhtZXNzYWdlTnVtKQotCQkJCQkJCQkrICJXICIgKyBjYWxsZXIgKyAiOjoiICsgbWV0aG9kCi0JCQkJCQkJCSsgIjogb2JqZWN0PSIgKyBvYmplY3Q7CisJCQkJCQkJCSsgIlcgIiArIGNhbGxlciArICI6OiIgKyBtZXRob2QgLy8kTk9OLU5MUy0xJCAvLyROT04tTkxTLTIkCisJCQkJCQkJCSsgIjogb2JqZWN0PSIgKyBvYmplY3Q7IC8vJE5PTi1OTFMtMSQKIAkJCQkJCWxvZyggc2V2ZXJpdHksIG1lc3NhZ2UsIG51bGwgKTsKIAkJCQkJfQogCQkJCQlicmVhazsKQEAgLTgyLDEwICs4MiwxMCBAQAogCQkJCQogCQkJCWNhc2UgSUxvZy5JTkZPIDoKIAkJCQl7Ci0JCQkJCWlmIChpc0VuYWJsZWQoImluZm8iKSkKKwkJCQkJaWYgKGlzRW5hYmxlZCgiaW5mbyIpKSAvLyROT04tTkxTLTEkCiAJCQkJCXsKLQkJCQkJCVN0cmluZyBtZXNzYWdlID0gZ2V0TWVzc2FnZU51bVN0cmluZyhtZXNzYWdlTnVtKSArICJJICIKLQkJCQkJCQkJKyBjYWxsZXIgKyAiOjoiICsgbWV0aG9kICsgIjogb2JqZWN0PSIKKwkJCQkJCVN0cmluZyBtZXNzYWdlID0gZ2V0TWVzc2FnZU51bVN0cmluZyhtZXNzYWdlTnVtKSArICJJICIgLy8kTk9OLU5MUy0xJAorCQkJCQkJCQkrIGNhbGxlciArICI6OiIgKyBtZXRob2QgKyAiOiBvYmplY3Q9IiAvLyROT04tTkxTLTEkIC8vJE5PTi1OTFMtMiQKIAkJCQkJCQkJKyBvYmplY3Q7CiAJCQkJCQlsb2coIHNldmVyaXR5LCBtZXNzYWdlLCBudWxsICk7CiAJCQkJCX0KQEAgLTEyMCw4ICsxMjAsOCBAQAogCXsKIAkJaWYgKGlzRW5hYmxlZChvcHRpb24pKQogCQl7Ci0JCQlTdHJpbmcgbWVzc2FnZSA9IGdldE1lc3NhZ2VOdW1TdHJpbmcobWVzc2FnZU51bSkgKyAiSSAiICsgY2FsbGVyCi0JCQkJCSsgIjo6IiArIG1ldGhvZCArICI6IG9iamVjdD0iICsgb2JqZWN0OworCQkJU3RyaW5nIG1lc3NhZ2UgPSBnZXRNZXNzYWdlTnVtU3RyaW5nKG1lc3NhZ2VOdW0pICsgIkkgIiArIGNhbGxlciAvLyROT04tTkxTLTEkCisJCQkJCSsgIjo6IiArIG1ldGhvZCArICI6IG9iamVjdD0iICsgb2JqZWN0OyAvLyROT04tTkxTLTEkIC8vJE5PTi1OTFMtMiQKIAkJCWxvZyhzZXZlcml0eSwgbWVzc2FnZSwgbnVsbCApOwogCQl9CQogCX0KQEAgLTEzNCw4ICsxMzQsOCBAQAogCXsKIAkJaWYgKGlzRW5hYmxlZChvcHRpb24pKSAKIAkJewotCQkJU3RyaW5nIG1lc3NhZ2UgPSBnZXRNZXNzYWdlTnVtU3RyaW5nKG1lc3NhZ2VOdW0pICsgIkkgIiArIGNhbGxlcgotCQkJCQkrICI6OiIgKyBtZXRob2Q7CisJCQlTdHJpbmcgbWVzc2FnZSA9IGdldE1lc3NhZ2VOdW1TdHJpbmcobWVzc2FnZU51bSkgKyAiSSAiICsgY2FsbGVyIC8vJE5PTi1OTFMtMSQKKwkJCQkJKyAiOjoiICsgbWV0aG9kOyAvLyROT04tTkxTLTEkCiAJCQlsb2coIHNldmVyaXR5LCBtZXNzYWdlLCB0aHJvd2FibGUgKTsKIAkJfQogCX0KQEAgLTE0OSwxNyArMTQ5LDE4IEBACiAJCWxvZ2dlci5sb2coIHN0YXR1cyApOwogCX0KIAkKLQlwcml2YXRlIFN0cmluZyBnZXRNZXNzYWdlTnVtU3RyaW5nKGludCBtZXNzYWdlTnVtKSB7Ci0JCVN0cmluZyBtZXNzYWdlTnVtU3RyaW5nID0gIklXQUIiOwotCQlpZiAobWVzc2FnZU51bSA+IDk5OTkgfHwgbWVzc2FnZU51bSA8IDApCi0JCQltZXNzYWdlTnVtID0gOTk5OTsgLy9kZWZhdWx0IG1lc3NhZ2UgbnVtYmVyCi0JCW1lc3NhZ2VOdW1TdHJpbmcgKz0gKG5ldyBJbnRlZ2VyKG1lc3NhZ2VOdW0pKS50b1N0cmluZygpOworCXByaXZhdGUgU3RyaW5nIGdldE1lc3NhZ2VOdW1TdHJpbmcoZmluYWwgaW50IG1lc3NhZ2VOdW0pIHsKKwkJU3RyaW5nIG1lc3NhZ2VOdW1TdHJpbmcgPSAiSVdBQiI7IC8vJE5PTi1OTFMtMSQKKwkJaW50IGlubmVyTWVzc2FnZU51bSA9IG1lc3NhZ2VOdW07CisJCWlmIChpbm5lck1lc3NhZ2VOdW0gPiA5OTk5IHx8IGlubmVyTWVzc2FnZU51bSA8IDApCisJCQlpbm5lck1lc3NhZ2VOdW0gPSA5OTk5OyAvL2RlZmF1bHQgbWVzc2FnZSBudW1iZXIKKwkJbWVzc2FnZU51bVN0cmluZyArPSAobmV3IEludGVnZXIoaW5uZXJNZXNzYWdlTnVtKSkudG9TdHJpbmcoKTsKIAkJcmV0dXJuIG1lc3NhZ2VOdW1TdHJpbmc7CiAJfQogCQogCXByaXZhdGUgdm9pZCBsb2coIGludCBzZXZlcml0eSwgU3RyaW5nIG1lc3NhZ2UsIFRocm93YWJsZSBleGMgKQogCXsKLQkJU3RhdHVzIHN0YXR1cyA9IG5ldyBTdGF0dXMoIHNldmVyaXR5LCAiaWQiLCAwLCBtZXNzYWdlLCBleGMgKTsKKwkJU3RhdHVzIHN0YXR1cyA9IG5ldyBTdGF0dXMoIHNldmVyaXR5LCAiaWQiLCAwLCBtZXNzYWdlLCBleGMgKTsgLy8kTk9OLU5MUy0xJAogCQlsb2dnZXIubG9nKCBzdGF0dXMgKTsKIAl9CiB9CmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW52aXJvbm1lbnQvc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW52aXJvbm1lbnQvZWNsaXBzZS9FY2xpcHNlU2NoZW1lLmphdmEgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW52aXJvbm1lbnQvc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW52aXJvbm1lbnQvZWNsaXBzZS9FY2xpcHNlU2NoZW1lLmphdmEKaW5kZXggMDA0MmM0ZC4uNDFiNjVjMiAxMDA2NDQKLS0tIGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVudmlyb25tZW50L3NyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2Vudmlyb25tZW50L2VjbGlwc2UvRWNsaXBzZVNjaGVtZS5qYXZhCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbnZpcm9ubWVudC9zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbnZpcm9ubWVudC9lY2xpcHNlL0VjbGlwc2VTY2hlbWUuamF2YQpAQCAtMzIsOSArMzIsMTAgQEAKICAgICBlbnZpcm9ubWVudF8gPSBlbnZpcm9ubWVudDsKICAgfQogICAKLSAgcHVibGljIFN0cmluZyB0b1N0cmluZygpCisgIEBPdmVycmlkZQorcHVibGljIFN0cmluZyB0b1N0cmluZygpCiAgIHsKLSAgICByZXR1cm4gInBsYXRmb3JtIjsgIAorICAgIHJldHVybiAicGxhdGZvcm0iOyAvLyROT04tTkxTLTEkCiAgIH0KICAgCiAgIC8qKgpAQCAtNTYsNyArNTcsNyBAQAogICAgIHsKICAgICAgIElVUklTY2hlbWUgc2NoZW1lID0gdXJpLmdldFVSSVNjaGVtZSgpOwogICAgICAgCi0gICAgICBpZiggc2NoZW1lLnRvU3RyaW5nKCkuZXF1YWxzKCAicmVsYXRpdmUiKSApIHJldHVybiBzY2hlbWUuaXNWYWxpZCggdXJpICk7CisgICAgICBpZiggc2NoZW1lLnRvU3RyaW5nKCkuZXF1YWxzKCAicmVsYXRpdmUiKSApIHJldHVybiBzY2hlbWUuaXNWYWxpZCggdXJpICk7IC8vJE5PTi1OTFMtMSQKICAgICAgICAgCiAgICAgICBnZXRQYXRoRnJvbVBsYXRmb3JtVVJJKCB1cmkudG9TdHJpbmcoKSApOwogICAgIH0KQEAgLTc0LDMzICs3NSwzMCBAQAogICB7CiAgICAgU3RyaW5nIG5ld1VSSSA9IG51bGw7CiAgICAgCi0gICAgaWYoIHVyaSAhPSBudWxsICYmIHVyaS5zdGFydHNXaXRoKCAicGxhdGZvcm06IikgKQorICAgIGlmKCB1cmkgIT0gbnVsbCAmJiB1cmkuc3RhcnRzV2l0aCggInBsYXRmb3JtOiIpICkgLy8kTk9OLU5MUy0xJAogICAgIHsKICAgICAgIC8vIFRoZSBwbGF0Zm9ybSBoYXMgYmVlbiBzcGVjaWZpZWQgc28ga2VlcCBpdCBhcyBpcy4KICAgICAgIG5ld1VSSSA9IHVyaTsKICAgICB9Ci0gICAgZWxzZSBpZiggdXJpID09IG51bGwgfHwgdXJpLmluZGV4T2YoICI6IikgIT0gLTEgKQorICAgIGVsc2UgaWYoIHVyaSA9PSBudWxsIHx8IHVyaS5pbmRleE9mKCAiOiIpICE9IC0xICkgLy8kTk9OLU5MUy0xJAogICAgIHsKICAgICAgIC8vIFRoZSBwbGF0Zm9ybSB1cmkgaXMgbm90IGFsbG93ZWQgdG8gY29udGFpbiBzb21lIG90aGVyIHByb3RvY29sLiAKICAgICAgIHRocm93IG5ldyBVUklFeGNlcHRpb24oCi0gICAgICAgICAgbmV3IFN0YXR1cyggSVN0YXR1cy5FUlJPUiwgImlkIiwgMCwKKyAgICAgICAgICBuZXcgU3RhdHVzKCBJU3RhdHVzLkVSUk9SLCAiaWQiLCAwLCAvLyROT04tTkxTLTEkCiAgICAgICAgICAgICAgIE5MUy5iaW5kKCBNZXNzYWdlcy5NU0dfSU5WQUxJRF9QTEFURk9STV9VUkwsdXJpKSwgbnVsbCApICk7CiAgICAgICAgICAgICAgIAogICAgIH0KLSAgICBlbHNlIGlmKCB1cmkuc3RhcnRzV2l0aCggIi8iKSApCisgICAgZWxzZSBpZiggdXJpLnN0YXJ0c1dpdGgoICIvIikgKSAvLyROT04tTkxTLTEkCiAgICAgewogICAgICAgLy8gVGhlIHBsYXRmb3JtIHNjaGVtZSBoYXMgbm90IGJlZW4gc3BlY2lmaWVkIHNvIHdlIHdpbGwgYWRkIGl0LgotICAgICAgbmV3VVJJID0gInBsYXRmb3JtOi9yZXNvdXJjZSIgKyB1cmk7CisgICAgICBuZXdVUkkgPSAicGxhdGZvcm06L3Jlc291cmNlIiArIHVyaTsgLy8kTk9OLU5MUy0xJAogICAgIH0KICAgICAKICAgICBpZiggbmV3VVJJID09IG51bGwgKQogICAgIHsKICAgICAgIHJldHVybiBuZXcgUmVsYXRpdmVVUkkoIHVyaSApOwogICAgIH0KLSAgICBlbHNlCi0gICAgewotICAgICAgcmV0dXJuIG5ldyBFY2xpcHNlVVJJKCBuZXdVUkksIGVudmlyb25tZW50XyApOwotICAgIH0KKyAgICByZXR1cm4gbmV3IEVjbGlwc2VVUkkoIG5ld1VSSSwgZW52aXJvbm1lbnRfICk7CiAgIH0KIAogICAvKioKQEAgLTEyNyw3ICsxMjUsNyBAQAogICAgIHsKICAgICAgIElVUklTY2hlbWUgc2NoZW1lID0gdXJpLmdldFVSSVNjaGVtZSgpOwogICAgICAgCi0gICAgICBpZiggc2NoZW1lLnRvU3RyaW5nKCkuZXF1YWxzKCAicmVsYXRpdmUiKSApIHJldHVybiBzY2hlbWUudmFsaWRhdGUoIHVyaSApOworICAgICAgaWYoIHNjaGVtZS50b1N0cmluZygpLmVxdWFscyggInJlbGF0aXZlIikgKSByZXR1cm4gc2NoZW1lLnZhbGlkYXRlKCB1cmkgKTsgLy8kTk9OLU5MUy0xJAogICAgICAgCiAgICAgICBnZXRQYXRoRnJvbVBsYXRmb3JtVVJJKCB1cmkudG9TdHJpbmcoKSApOwogICAgICAgc3RhdHVzID0gU3RhdHVzLk9LX1NUQVRVUzsKQEAgLTE1NiwyMSArMTU0LDE1IEBACiAgICAgY2F0Y2goIE1hbGZvcm1lZFVSTEV4Y2VwdGlvbiBleGMgKQogICAgIHsgCiAgICAgICB0aHJvdyBuZXcgVVJJRXhjZXB0aW9uKAotICAgICAgICAgIG5ldyBTdGF0dXMoIElTdGF0dXMuRVJST1IsICJpZCIsIDAsCisgICAgICAgICAgbmV3IFN0YXR1cyggSVN0YXR1cy5FUlJPUiwgImlkIiwgMCwgLy8kTk9OLU5MUy0xJAogICAgICAgICAgICAgICBOTFMuYmluZCggTWVzc2FnZXMuTVNHX0lOVkFMSURfUExBVEZPUk1fVVJMLCB1cmkgKSwgZXhjICkgKTsKICAgICB9CiAgICAgCi0gICAgaWYoIHVybCA9PSBudWxsICkKLSAgICB7Ci0gICAgICB0aHJvdyBuZXcgVVJJRXhjZXB0aW9uKAotICAgICAgICAgIG5ldyBTdGF0dXMoIElTdGF0dXMuRVJST1IsICJpZCIsIDAsCi0gICAgICAgICAgICAgIE5MUy5iaW5kKCBNZXNzYWdlcy5NU0dfSU5WQUxJRF9QTEFURk9STV9VUkwsIHVyaSApLCBudWxsICkgKTsKLSAgICB9Ci0gICAgaWYoIHVybC5nZXRQcm90b2NvbCgpLmVxdWFscygicGxhdGZvcm0iKSApIAorICAgIGlmKCB1cmwuZ2V0UHJvdG9jb2woKS5lcXVhbHMoInBsYXRmb3JtIikgKSAgLy8kTk9OLU5MUy0xJAogICAgIHsKICAgICAgIFN0cmluZyByZXNvdXJjZVVSTCA9IHVybC5nZXRGaWxlKCk7CiAgICAgICAKLSAgICAgIGlmIChyZXNvdXJjZVVSTC5zdGFydHNXaXRoKCIvcmVzb3VyY2UiKSkgCisgICAgICBpZiAocmVzb3VyY2VVUkwuc3RhcnRzV2l0aCgiL3Jlc291cmNlIikpICAvLyROT04tTkxTLTEkCiAgICAgICB7CiAgICAgICAgIHJlc291cmNlRmlsZSA9IHJlc291cmNlVVJMLnN1YnN0cmluZygxMCk7ICAgLy8gb21pdCB0aGUgIi9yZXNvdXJjZSIgcG9ydGlvbgogICAgICAgfQpAQCAtMTc4LDcgKzE3MCw3IEBACiAgICAgZWxzZSAKICAgICB7CiAgICAgICB0aHJvdyBuZXcgVVJJRXhjZXB0aW9uKAotICAgICAgICAgIG5ldyBTdGF0dXMoIElTdGF0dXMuRVJST1IsICJpZCIsIDAsCisgICAgICAgICAgbmV3IFN0YXR1cyggSVN0YXR1cy5FUlJPUiwgImlkIiwgMCwgLy8kTk9OLU5MUy0xJAogICAgICAgICAgICAgICAgICAgICAgIE5MUy5iaW5kKCBNZXNzYWdlcy5NU0dfSU5WQUxJRF9QTEFURk9STV9VUkwsdXJsLmdldEZpbGUoKSApLCBudWxsICkgKTsKICAgICB9CiAgICAgCkBAIC0xOTIsNiArMTg0LDYgQEAKICAgICovCiAgIHB1YmxpYyBTdHJpbmcgZ2V0VVJMRnJvbVBhdGgoIElQYXRoIGFic29sdXRlUGF0aCApCiAgIHsKLSAgICByZXR1cm4gInBsYXRmb3JtOi9yZXNvdXJjZSIgKyBhYnNvbHV0ZVBhdGg7CisgICAgcmV0dXJuICJwbGF0Zm9ybTovcmVzb3VyY2UiICsgYWJzb2x1dGVQYXRoOyAvLyROT04tTkxTLTEkCiAgIH0KIH0KZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbnZpcm9ubWVudC9zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbnZpcm9ubWVudC9lY2xpcHNlL0VjbGlwc2VVUkkuamF2YSBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbnZpcm9ubWVudC9zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbnZpcm9ubWVudC9lY2xpcHNlL0VjbGlwc2VVUkkuamF2YQppbmRleCBkMDYyYTUzLi4zMjBmOWIxIDEwMDY0NAotLS0gYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW52aXJvbm1lbnQvc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW52aXJvbm1lbnQvZWNsaXBzZS9FY2xpcHNlVVJJLmphdmEKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVudmlyb25tZW50L3NyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2Vudmlyb25tZW50L2VjbGlwc2UvRWNsaXBzZVVSSS5qYXZhCkBAIC01MCw3ICs1MCw4IEBACiAgICAgZmlsZV8gICAgICAgICA9IGdldEZpbGUoKTsKICAgfQogICAKLSAgcHVibGljIFN0cmluZyB0b1N0cmluZygpCisgIEBPdmVycmlkZQorcHVibGljIFN0cmluZyB0b1N0cmluZygpCiAgIHsKICAgICByZXR1cm4gdXJpXzsKICAgfQpAQCAtNTgsNyArNTksOCBAQAogICAvKioKICAgICogQHNlZSBvcmcuZWNsaXBzZS5lbnYudXJpLklVUkkjZXJhc2UoKQogICAgKi8KLSAgcHVibGljIHZvaWQgZXJhc2UoKSB0aHJvd3MgVVJJRXhjZXB0aW9uCisgIEBPdmVycmlkZQorcHVibGljIHZvaWQgZXJhc2UoKSB0aHJvd3MgVVJJRXhjZXB0aW9uCiAgIHsKICAgICB0cnkgCiAgICAgewpAQCAtODEsMTQgKzgzLDE1IEBACiAgICAgfQogICAgIGNhdGNoKCBFeGNlcHRpb24gZXhjICkgCiAgICAgeyAgICAgIAotICAgICAgdGhyb3cgbmV3IFVSSUV4Y2VwdGlvbiggbmV3IFN0YXR1cyggSVN0YXR1cy5FUlJPUiwgImlkIiwgMCwgZXhjLmdldE1lc3NhZ2UoKSwgZXhjICksIHRoaXMgKTsKKyAgICAgIHRocm93IG5ldyBVUklFeGNlcHRpb24oIG5ldyBTdGF0dXMoIElTdGF0dXMuRVJST1IsICJpZCIsIDAsIGV4Yy5nZXRNZXNzYWdlKCksIGV4YyApLCB0aGlzICk7IC8vJE5PTi1OTFMtMSQKICAgICB9CiAgIH0KIAogICAvKioKICAgICogQHNlZSBvcmcuZWNsaXBzZS5lbnYudXJpLklVUkkjZ2V0SW5wdXRTdHJlYW0oKQogICAgKi8KLSAgcHVibGljIElucHV0U3RyZWFtIGdldElucHV0U3RyZWFtKCkgdGhyb3dzIFVSSUV4Y2VwdGlvbgorICBAT3ZlcnJpZGUKK3B1YmxpYyBJbnB1dFN0cmVhbSBnZXRJbnB1dFN0cmVhbSgpIHRocm93cyBVUklFeGNlcHRpb24KICAgewogICAgIHRyeSAKICAgICB7CkBAIC0xMDQsNyArMTA3LDcgQEAKICAgICB9CiAgICAgY2F0Y2goIFRocm93YWJsZSBleGMgKSAKICAgICB7Ci0gICAgICB0aHJvdyBuZXcgVVJJRXhjZXB0aW9uKCBuZXcgU3RhdHVzKCBJU3RhdHVzLkVSUk9SLCAiaWQiLCAwLCBleGMuZ2V0TWVzc2FnZSgpLCBleGMgKSwgdGhpcyApOworICAgICAgdGhyb3cgbmV3IFVSSUV4Y2VwdGlvbiggbmV3IFN0YXR1cyggSVN0YXR1cy5FUlJPUiwgImlkIiwgMCwgZXhjLmdldE1lc3NhZ2UoKSwgZXhjICksIHRoaXMgKTsgLy8kTk9OLU5MUy0xJAogICAgIH0KICAgICAKICAgICByZXR1cm4gbnVsbDsKQEAgLTExMyw3ICsxMTYsOCBAQAogICAvKioKICAgICogQHNlZSBvcmcuZWNsaXBzZS5lbnYudXJpLklVUkkjZ2V0T3V0cHV0U3RyZWFtKCkKICAgICovCi0gIHB1YmxpYyBPdXRwdXRTdHJlYW0gZ2V0T3V0cHV0U3RyZWFtKCkgdGhyb3dzIFVSSUV4Y2VwdGlvbgorICBAT3ZlcnJpZGUKK3B1YmxpYyBPdXRwdXRTdHJlYW0gZ2V0T3V0cHV0U3RyZWFtKCkgdGhyb3dzIFVSSUV4Y2VwdGlvbgogICB7CiAgICAgLy8gRW5zdXJlIHRoYXQgdGhlIHBhcmVudCBmb2xkZXIgZXhpc3RzLgogICAgIElVUkkgcGFyZW50ID0gcGFyZW50KCk7CkBAIC0xMjksNyArMTMzLDggQEAKICAgLyoqCiAgICAqIEBzZWUgb3JnLmVjbGlwc2UuZW52LnVyaS5JVVJJI2dldFVSSVNjaGVtZSgpCiAgICAqLwotICBwdWJsaWMgSVVSSVNjaGVtZSBnZXRVUklTY2hlbWUoKQorICBAT3ZlcnJpZGUKK3B1YmxpYyBJVVJJU2NoZW1lIGdldFVSSVNjaGVtZSgpCiAgIHsKICAgICByZXR1cm4gc2NoZW1lXzsKICAgfQpAQCAtMTM3LDcgKzE0Miw4IEBACiAgIC8qKgogICAgKiBAc2VlIG9yZy5lY2xpcHNlLmVudi51cmkuSVVSSSNpc0xlYWYoKQogICAgKi8KLSAgcHVibGljIGJvb2xlYW4gaXNMZWFmKCkKKyAgQE92ZXJyaWRlCitwdWJsaWMgYm9vbGVhbiBpc0xlYWYoKQogICB7CiAgICAgYm9vbGVhbiByZXN1bHQgPSBmYWxzZTsKICAgCkBAIC0xNjQsNyArMTcwLDggQEAKICAgLyoqCiAgICAqIEBzZWUgb3JnLmVjbGlwc2UuZW52LnVyaS5JVVJJI2lzUHJlc2VudCgpCiAgICAqLwotICBwdWJsaWMgYm9vbGVhbiBpc1ByZXNlbnQoKQorICBAT3ZlcnJpZGUKK3B1YmxpYyBib29sZWFuIGlzUHJlc2VudCgpCiAgIHsKICAgICBib29sZWFuIHJlc3VsdCA9IGZhbHNlOwogICAgIApAQCAtMTg5LDcgKzE5Niw4IEBACiAgIC8qKgogICAgKiBAc2VlIG9yZy5lY2xpcHNlLmVudi51cmkuSVVSSSNpc1JlYWRhYmxlKCkKICAgICovCi0gIHB1YmxpYyBib29sZWFuIGlzUmVhZGFibGUoKQorICBAT3ZlcnJpZGUKK3B1YmxpYyBib29sZWFuIGlzUmVhZGFibGUoKQogICB7CiAgICAgYm9vbGVhbiByZXN1bHQgPSBmYWxzZTsKICAgICAKQEAgLTIxNCw3ICsyMjIsOCBAQAogICAvKioKICAgICogQHNlZSBvcmcuZWNsaXBzZS5lbnYudXJpLklVUkkjaXNSZWxhdGl2ZSgpCiAgICAqLwotICBwdWJsaWMgYm9vbGVhbiBpc1JlbGF0aXZlKCkKKyAgQE92ZXJyaWRlCitwdWJsaWMgYm9vbGVhbiBpc1JlbGF0aXZlKCkKICAgeyAKICAgICByZXR1cm4gZmFsc2U7CiAgIH0KQEAgLTIyMiw3ICsyMzEsOCBAQAogICAvKioKICAgICogQHNlZSBvcmcuZWNsaXBzZS5lbnYudXJpLklVUkkjaXNXcml0YWJsZSgpCiAgICAqLwotICBwdWJsaWMgYm9vbGVhbiBpc1dyaXRhYmxlKCkKKyAgQE92ZXJyaWRlCitwdWJsaWMgYm9vbGVhbiBpc1dyaXRhYmxlKCkKICAgewogICAgIGJvb2xlYW4gcmVzdWx0ID0gZmFsc2U7CiAgICAgCkBAIC0yNDksNyArMjU5LDggQEAKICAgLyoqCiAgICAqIEBzZWUgb3JnLmVjbGlwc2UuZW52LnVyaS5JVVJJI2xpc3QoKQogICAgKi8KLSAgcHVibGljIElVUklbXSBsaXN0KCkgdGhyb3dzIFVSSUV4Y2VwdGlvbgorICBAT3ZlcnJpZGUKK3B1YmxpYyBJVVJJW10gbGlzdCgpIHRocm93cyBVUklFeGNlcHRpb24KICAgewogICAgIElSZXNvdXJjZSByZXNvdXJjZSAgICA9IGdldFJlc291cmNlKCk7CiAgICAgSVVSSVtdICAgICB1cmlDaGlsZHJlbiA9IG5ldyBJVVJJWzBdOwpAQCAtMjgxLDcgKzI5Miw4IEBACiAgIC8qKgogICAgKiBAc2VlIG9yZy5lY2xpcHNlLmVudi51cmkuSVVSSSNsaXN0KG9yZy5lY2xpcHNlLmVudi51cmkuSVVSSUZpbHRlcikKICAgICovCi0gIHB1YmxpYyBJVVJJW10gbGlzdChJVVJJRmlsdGVyIHVyaUZpbHRlcikgdGhyb3dzIFVSSUV4Y2VwdGlvbgorICBAT3ZlcnJpZGUKK3B1YmxpYyBJVVJJW10gbGlzdChJVVJJRmlsdGVyIHVyaUZpbHRlcikgdGhyb3dzIFVSSUV4Y2VwdGlvbgogICB7CiAgICAgSVJlc291cmNlIHJlc291cmNlID0gZ2V0UmVzb3VyY2UoKTsKICAgICBJVVJJW10gICAgIHJlc3VsdCAgID0gbmV3IElVUklbMF07CkBAIC0zMTksNyArMzMxLDggQEAKICAgLyoqCiAgICAqIEBzZWUgb3JnLmVjbGlwc2UuZW52LnVyaS5JVVJJI3JlbmFtZShvcmcuZWNsaXBzZS5lbnYudXJpLklVUkkpCiAgICAqLwotICBwdWJsaWMgdm9pZCByZW5hbWUoSVVSSSBuZXdVUkkgKSB0aHJvd3MgVVJJRXhjZXB0aW9uCisgIEBPdmVycmlkZQorcHVibGljIHZvaWQgcmVuYW1lKElVUkkgbmV3VVJJICkgdGhyb3dzIFVSSUV4Y2VwdGlvbgogICB7CiAgICAgaWYoIG5ld1VSSSA9PSBudWxsIHx8ICEobmV3VVJJIGluc3RhbmNlb2YgRWNsaXBzZVVSSSkgKSByZXR1cm47CiAgICAgCkBAIC0zMzcsMTQgKzM1MCwxNSBAQAogICAgIGNhdGNoKCBDb3JlRXhjZXB0aW9uIGV4YyApCiAgICAgewogICAgICAgZXhjLnByaW50U3RhY2tUcmFjZSgpOwotICAgICAgdGhyb3cgbmV3IFVSSUV4Y2VwdGlvbiggbmV3IFN0YXR1cyggSVN0YXR1cy5FUlJPUiwgImlkIiwgMCwgZXhjLmdldE1lc3NhZ2UoKSwgZXhjICkgKTsKKyAgICAgIHRocm93IG5ldyBVUklFeGNlcHRpb24oIG5ldyBTdGF0dXMoIElTdGF0dXMuRVJST1IsICJpZCIsIDAsIGV4Yy5nZXRNZXNzYWdlKCksIGV4YyApICk7IC8vJE5PTi1OTFMtMSQKICAgICB9CiAgIH0KIAogICAvKioKICAgICogQHNlZSBvcmcuZWNsaXBzZS5lbnYudXJpLklVUkkjdG91Y2hGb2xkZXIoKQogICAgKi8KLSAgcHVibGljIHZvaWQgdG91Y2hGb2xkZXIoKSB0aHJvd3MgVVJJRXhjZXB0aW9uCisgIEBPdmVycmlkZQorcHVibGljIHZvaWQgdG91Y2hGb2xkZXIoKSB0aHJvd3MgVVJJRXhjZXB0aW9uCiAgIHsKICAgICBJUmVzb3VyY2UgcmVzb3VyY2UgPSBnZXRSZXNvdXJjZSgpOwogICAgIApAQCAtMzU5LDcgKzM3Myw3IEBACiAgICAgICAgICAgaWYoIGZvbGRlci5tZW1iZXJzKCkubGVuZ3RoID4gMCApCiAgICAgICAgICAgewogICAgICAgICAgICAgdGhyb3cgbmV3IFVSSUV4Y2VwdGlvbiggCi0gICAgICAgICAgICAgICAgbmV3IFN0YXR1cyggSVN0YXR1cy5FUlJPUiwgImlkIiwgMCwgCisgICAgICAgICAgICAgICAgbmV3IFN0YXR1cyggSVN0YXR1cy5FUlJPUiwgImlkIiwgMCwgIC8vJE5PTi1OTFMtMSQKICAgICAgICAgICAgICAgICAgICAgTkxTLmJpbmQoIE1lc3NhZ2VzLk1TR19FUlJPUl9GT0xERVJfSEFTX0NISUxEUkVOLCBmb2xkZXIudG9TdHJpbmcoKSApLCBudWxsICksCiAgICAgICAgICAgICAgICAgdGhpcyApOwogCQkJCQkJCQkKQEAgLTM2Nyw3ICszODEsNyBAQAogICAgICAgICB9CiAgICAgICAgIGNhdGNoKCBDb3JlRXhjZXB0aW9uIGV4YyApCiAgICAgICAgIHsgICAgICAgIAotICAgICAgICAgIHRocm93IG5ldyBVUklFeGNlcHRpb24oIG5ldyBTdGF0dXMoIElTdGF0dXMuRVJST1IsICJpZCIsIDAsIGV4Yy5nZXRNZXNzYWdlKCksIGV4YyApLCB0aGlzICk7CisgICAgICAgICAgdGhyb3cgbmV3IFVSSUV4Y2VwdGlvbiggbmV3IFN0YXR1cyggSVN0YXR1cy5FUlJPUiwgImlkIiwgMCwgZXhjLmdldE1lc3NhZ2UoKSwgZXhjICksIHRoaXMgKTsgLy8kTk9OLU5MUy0xJAogICAgICAgICB9CiAgICAgICB9CiAgICAgICBlbHNlCkBAIC0zODYsNyArNDAwLDcgQEAKICAgICAgIH0KICAgICAgIGNhdGNoKCBDb3JlRXhjZXB0aW9uIGV4YyApCiAgICAgICB7Ci0gICAgICAgIHRocm93IG5ldyBVUklFeGNlcHRpb24oIG5ldyBTdGF0dXMoIElTdGF0dXMuRVJST1IsICJpZCIsIDAsIGV4Yy5nZXRNZXNzYWdlKCksIGV4YyApLCB0aGlzICk7CisgICAgICAgIHRocm93IG5ldyBVUklFeGNlcHRpb24oIG5ldyBTdGF0dXMoIElTdGF0dXMuRVJST1IsICJpZCIsIDAsIGV4Yy5nZXRNZXNzYWdlKCksIGV4YyApLCB0aGlzICk7IC8vJE5PTi1OTFMtMSQKICAgICAgIH0KICAgICB9CiAgIH0KQEAgLTM5NCw3ICs0MDgsOCBAQAogICAvKioKICAgICogQHNlZSBvcmcuZWNsaXBzZS5lbnYudXJpLklVUkkjdG91Y2hMZWFmKCkKICAgICovCi0gIHB1YmxpYyB2b2lkIHRvdWNoTGVhZigpIHRocm93cyBVUklFeGNlcHRpb24KKyAgQE92ZXJyaWRlCitwdWJsaWMgdm9pZCB0b3VjaExlYWYoKSB0aHJvd3MgVVJJRXhjZXB0aW9uCiAgIHsKICAgICBJUmVzb3VyY2UgcmVzb3VyY2UgPSBnZXRSZXNvdXJjZSgpOwogICAgIApAQCAtNDIwLDcgKzQzNSw3IEBACiAgICAgICB9CiAgICAgICBjYXRjaCggSU9FeGNlcHRpb24gZXhjICkKICAgICAgIHsKLSAgICAgICAgdGhyb3cgbmV3IFVSSUV4Y2VwdGlvbiggbmV3IFN0YXR1cyggSVN0YXR1cy5FUlJPUiwgImlkIiwgMCwgZXhjLmdldE1lc3NhZ2UoKSwgZXhjICksIHRoaXMgKTsKKyAgICAgICAgdGhyb3cgbmV3IFVSSUV4Y2VwdGlvbiggbmV3IFN0YXR1cyggSVN0YXR1cy5FUlJPUiwgImlkIiwgMCwgZXhjLmdldE1lc3NhZ2UoKSwgZXhjICksIHRoaXMgKTsgLy8kTk9OLU5MUy0xJAogICAgICAgfQogICAgIH0KIApAQCAtNDUzLDcgKzQ2OCw4IEBACiAgICAqIHdpbGwgZmFpbCBhbmQgdGhyb3cgYW4gZXhjZXB0aW9uLiBJdCBzaG91bGQgYmUgdXNlZCBvbmx5CiAgICAqIGluIGNhc2VzIHdoZXJlIFVSSXMgYXJlIGtub3duIHRvIGJlIGJhY2tlZCBieSBwaHlzaWNhbCBmaWxlcy4KICAgICovCi0gIHB1YmxpYyBGaWxlIGFzRmlsZSAoKQorICBAT3ZlcnJpZGUKK3B1YmxpYyBGaWxlIGFzRmlsZSAoKQogICB7CiAgIAlyZXR1cm4gZmlsZV87CiAgIH0KQEAgLTQ2MSw3ICs0NzcsOCBAQAogICAvKiAobm9uLUphdmFkb2MpCiAgICAqIEBzZWUgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbnZpcm9ubWVudC51cmkuSVVSSSNpc0F2YWlsYWJsZUFzRmlsZSgpCiAgICAqLwotICBwdWJsaWMgYm9vbGVhbiBpc0F2YWlsYWJsZUFzRmlsZSgpIAorICBAT3ZlcnJpZGUKK3B1YmxpYyBib29sZWFuIGlzQXZhaWxhYmxlQXNGaWxlKCkgCiAgIHsKICAgCXJldHVybiBmaWxlXyAhPSBudWxsOwogICB9CkBAIC00NjksNyArNDg2LDggQEAKICAgLyogKG5vbi1KYXZhZG9jKQogICAgKiBAc2VlIG9yZy5lY2xpcHNlLmVudi51cmkuVVJJI2FzVVJMKCkKICAgICovCi0gIHB1YmxpYyBVUkwgYXNVUkwoKSB0aHJvd3MgVVJJRXhjZXB0aW9uCisgIEBPdmVycmlkZQorcHVibGljIFVSTCBhc1VSTCgpIHRocm93cyBVUklFeGNlcHRpb24KICAgewogICAgIFVSTCB1cmwgPSBudWxsOwogICAgIApAQCAtNDc5LDcgKzQ5Nyw3IEBACiAgICAgfQogICAgIGNhdGNoKCBNYWxmb3JtZWRVUkxFeGNlcHRpb24gZXhjICkKICAgICB7Ci0gICAgICB0aHJvdyBuZXcgVVJJRXhjZXB0aW9uKCBuZXcgU3RhdHVzKCBJU3RhdHVzLkVSUk9SLCAiaWQiLCAwLCBleGMuZ2V0TWVzc2FnZSgpLCBleGMgKSwgdGhpcyApOyAKKyAgICAgIHRocm93IG5ldyBVUklFeGNlcHRpb24oIG5ldyBTdGF0dXMoIElTdGF0dXMuRVJST1IsICJpZCIsIDAsIGV4Yy5nZXRNZXNzYWdlKCksIGV4YyApLCB0aGlzICk7ICAvLyROT04tTkxTLTEkCiAgICAgfQogICAgIAogICAgIHJldHVybiB1cmw7CkBAIC00ODgsNyArNTA2LDggQEAKICAgLyogKG5vbi1KYXZhZG9jKQogICAgKiBAc2VlIG9yZy5lY2xpcHNlLmVudi51cmkuVVJJI2lzQXZhaWxhYmxlQXNVUkwoKQogICAgKi8KLSAgcHVibGljIGJvb2xlYW4gaXNBdmFpbGFibGVBc1VSTCgpCisgIEBPdmVycmlkZQorcHVibGljIGJvb2xlYW4gaXNBdmFpbGFibGVBc1VSTCgpCiAgIHsKICAgICBVUkwgdGhlVVJMID0gbnVsbDsKICAgICAKQEAgLTUwNSw3ICs1MjQsNyBAQAogCiAgIHByaXZhdGUgRmlsZSBnZXRGaWxlKCkKICAgewotICAgIFN0cmluZyBwbGF0Zm9ybVJlcyA9ICJwbGF0Zm9ybTovcmVzb3VyY2UiOworICAgIFN0cmluZyBwbGF0Zm9ybVJlcyA9ICJwbGF0Zm9ybTovcmVzb3VyY2UiOyAvLyROT04tTkxTLTEkCiAgICAgRmlsZSAgIHJlc3VsdCAgICAgID0gbnVsbDsKICAgICAKICAgICBpZiAodXJpXy5zdGFydHNXaXRoKHBsYXRmb3JtUmVzKSkKZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbnZpcm9ubWVudC9zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbnZpcm9ubWVudC9lY2xpcHNlL0ZpbGVSZXNvdXJjZU91dHB1dFN0cmVhbS5qYXZhIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVudmlyb25tZW50L3NyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2Vudmlyb25tZW50L2VjbGlwc2UvRmlsZVJlc291cmNlT3V0cHV0U3RyZWFtLmphdmEKaW5kZXggOGNmZWJiNS4uNGYzNTBmNyAxMDA2NDQKLS0tIGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVudmlyb25tZW50L3NyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2Vudmlyb25tZW50L2VjbGlwc2UvRmlsZVJlc291cmNlT3V0cHV0U3RyZWFtLmphdmEKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVudmlyb25tZW50L3NyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2Vudmlyb25tZW50L2VjbGlwc2UvRmlsZVJlc291cmNlT3V0cHV0U3RyZWFtLmphdmEKQEAgLTY3LDcgKzY3LDggQEAKICAgKiBhbmQgYSBmaWxlIG9mIHRoZSBzYW1lIG5hbWUgYWxyZWFkeSBleGlzdHMsIHRoZW4gYW4gSU9FeGNlcHRpb24gd2lsbAogICAqIGJlIHRocm93biBlaXRoZXIgbm93IG9yIGR1cmluZyBhbiBlYXJsaWVyIHtAbGluayAjd3JpdGUgd3JpdGV9LgogICAqLwotICBwdWJsaWMgdm9pZCBjbG9zZSAoKQorICBAT3ZlcnJpZGUKK3B1YmxpYyB2b2lkIGNsb3NlICgpCiAgIHRocm93cyBJT0V4Y2VwdGlvbgogICB7CiAgICAgaWYgKCFmT3BlbikgcmV0dXJuOwpAQCAtOTMsNyArOTQsOCBAQAogICAqIHNhbWUgbmFtZSBhbHJlYWR5IGV4aXN0cywgdGhlbiBhbiBJT0V4Y2VwdGlvbiBtYXkgYmUgdGhyb3duIGF0CiAgICogdGhpcyBwb2ludC4KICAgKi8KLSAgcHVibGljIHZvaWQgZmx1c2ggKCkKKyAgQE92ZXJyaWRlCitwdWJsaWMgdm9pZCBmbHVzaCAoKQogICB0aHJvd3MgSU9FeGNlcHRpb24KICAgewogICAgIGZCeXRlQXJyYXlPdXRwdXRTdHJlYW0uZmx1c2goKTsKQEAgLTEwNyw3ICsxMDksOCBAQAogICAqIHNhbWUgbmFtZSBhbHJlYWR5IGV4aXN0cywgdGhlbiBhbiBJT0V4Y2VwdGlvbiBtYXkgYmUgdGhyb3duIGF0CiAgICogdGhpcyBwb2ludC4KICAgKi8KLSAgcHVibGljIHZvaWQgd3JpdGUgKCBieXRlW10gYiApCisgIEBPdmVycmlkZQorcHVibGljIHZvaWQgd3JpdGUgKCBieXRlW10gYiApCiAgIHRocm93cyBJT0V4Y2VwdGlvbgogICB7CiAgICAgZkJ5dGVBcnJheU91dHB1dFN0cmVhbS53cml0ZShiKTsKQEAgLTEyNCw3ICsxMjcsOCBAQAogICAqIHNhbWUgbmFtZSBhbHJlYWR5IGV4aXN0cywgdGhlbiBhbiBJT0V4Y2VwdGlvbiBtYXkgYmUgdGhyb3duIGF0CiAgICogdGhpcyBwb2ludC4KICAgKi8KLSAgcHVibGljIHZvaWQgd3JpdGUgKCBieXRlW10gYiwgaW50IG9mZiwgaW50IGxlbiApCisgIEBPdmVycmlkZQorcHVibGljIHZvaWQgd3JpdGUgKCBieXRlW10gYiwgaW50IG9mZiwgaW50IGxlbiApCiAgIHsKICAgICBmQnl0ZUFycmF5T3V0cHV0U3RyZWFtLndyaXRlKGIsb2ZmLGxlbik7CiAgIH0KQEAgLTEzNyw3ICsxNDEsOCBAQAogICAqIHNhbWUgbmFtZSBhbHJlYWR5IGV4aXN0cywgdGhlbiBhbiBJT0V4Y2VwdGlvbiBtYXkgYmUgdGhyb3duIGF0CiAgICogdGhpcyBwb2ludC4KICAgKi8KLSAgcHVibGljIHZvaWQgd3JpdGUgKCBpbnQgYiApCisgIEBPdmVycmlkZQorcHVibGljIHZvaWQgd3JpdGUgKCBpbnQgYiApCiAgIHsKICAgICBmQnl0ZUFycmF5T3V0cHV0U3RyZWFtLndyaXRlKGIpOwogICB9CmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW52aXJvbm1lbnQvc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW52aXJvbm1lbnQvZWNsaXBzZS9GaWxlUmVzb3VyY2VVdGlscy5qYXZhIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVudmlyb25tZW50L3NyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2Vudmlyb25tZW50L2VjbGlwc2UvRmlsZVJlc291cmNlVXRpbHMuamF2YQppbmRleCA4ZDZhMmNkLi5hYmI2YjIxIDEwMDY0NAotLS0gYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW52aXJvbm1lbnQvc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW52aXJvbm1lbnQvZWNsaXBzZS9GaWxlUmVzb3VyY2VVdGlscy5qYXZhCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbnZpcm9ubWVudC9zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbnZpcm9ubWVudC9lY2xpcHNlL0ZpbGVSZXNvdXJjZVV0aWxzLmphdmEKQEAgLTI3OCw4ICsyNzgsNyBAQAogICAgICAgIGZvbGRlci5kZWxldGUodHJ1ZSwgdHJ1ZSwgbnVsbCk7CiAgICAgICAgcmV0dXJuIHRydWU7CiAgICAgIH0KLSAgICAgZWxzZQotICAgICAgIHJldHVybiBmYWxzZTsKKyAgICAgcmV0dXJuIGZhbHNlOwogICAgfQogCiAgIC8qKgpAQCAtMzA4LDE1ICszMDcsMTUgQEAKICAgeyAgICAKICAgICBpZiAoIWFic29sdXRlUGF0aC5pc0Fic29sdXRlKCkpCiAgICAgewotICAgICAgdGhyb3cgbmV3IENvcmVFeGNlcHRpb24obmV3IFN0YXR1cyhJU3RhdHVzLkVSUk9SLCAiUmVzb3VyY2VVdGlscyIsMCwgTkxTLmJpbmQoIE1lc3NhZ2VzLk1TR19FUlJPUl9QQVRIX05PVF9BQlNPTFVURSwgYWJzb2x1dGVQYXRoLnRvU3RyaW5nKCkgKSxudWxsKSk7CisgICAgICB0aHJvdyBuZXcgQ29yZUV4Y2VwdGlvbihuZXcgU3RhdHVzKElTdGF0dXMuRVJST1IsICJSZXNvdXJjZVV0aWxzIiwwLCBOTFMuYmluZCggTWVzc2FnZXMuTVNHX0VSUk9SX1BBVEhfTk9UX0FCU09MVVRFLCBhYnNvbHV0ZVBhdGgudG9TdHJpbmcoKSApLG51bGwpKTsgLy8kTk9OLU5MUy0xJAogICAgIH0KICAgICBpZiAoYWJzb2x1dGVQYXRoLnNlZ21lbnRDb3VudCgpIDwgMSkKICAgICB7Ci0gICAgICB0aHJvdyBuZXcgQ29yZUV4Y2VwdGlvbihuZXcgU3RhdHVzKElTdGF0dXMuRVJST1IsIlJlc291cmNlVXRpbHMiLDAsTkxTLmJpbmQoIE1lc3NhZ2VzLk1TR19FUlJPUl9QQVRIX0VNUFRZLCBhYnNvbHV0ZVBhdGgudG9TdHJpbmcoKSApLG51bGwpKTsKKyAgICAgIHRocm93IG5ldyBDb3JlRXhjZXB0aW9uKG5ldyBTdGF0dXMoSVN0YXR1cy5FUlJPUiwiUmVzb3VyY2VVdGlscyIsMCxOTFMuYmluZCggTWVzc2FnZXMuTVNHX0VSUk9SX1BBVEhfRU1QVFksIGFic29sdXRlUGF0aC50b1N0cmluZygpICksbnVsbCkpOyAvLyROT04tTkxTLTEkCiAgICAgfQogICAgIGlmIChhYnNvbHV0ZVBhdGguc2VnbWVudENvdW50KCkgPCAyKQogICAgIHsKLSAgICAgIHRocm93IG5ldyBDb3JlRXhjZXB0aW9uKG5ldyBTdGF0dXMoSVN0YXR1cy5FUlJPUiwiUmVzb3VyY2VVdGlscyIsMCxOTFMuYmluZCggTWVzc2FnZXMuTVNHX0VSUk9SX1BBVEhfTk9UX0ZPTERFUiwgYWJzb2x1dGVQYXRoLnRvU3RyaW5nKCkgKSxudWxsKSk7CisgICAgICB0aHJvdyBuZXcgQ29yZUV4Y2VwdGlvbihuZXcgU3RhdHVzKElTdGF0dXMuRVJST1IsIlJlc291cmNlVXRpbHMiLDAsTkxTLmJpbmQoIE1lc3NhZ2VzLk1TR19FUlJPUl9QQVRIX05PVF9GT0xERVIsIGFic29sdXRlUGF0aC50b1N0cmluZygpICksbnVsbCkpOyAvLyROT04tTkxTLTEkCiAgICAgfQogICAgIElDb250YWluZXIgcGFyZW50ICAgPSBtYWtlRm9sZGVyUGF0aChhYnNvbHV0ZVBhdGgucmVtb3ZlTGFzdFNlZ21lbnRzKDEpLCBzdGF0dXNIYW5kbGVyKTsKICAgICBTdHJpbmcgICAgIGZpbGVOYW1lID0gYWJzb2x1dGVQYXRoLmxhc3RTZWdtZW50KCk7CkBAIC00NDgsMTMgKzQ0NywxMCBAQAogICAgIHsKICAgICAgIHJldHVybiBnZXRXb3Jrc3BhY2VSb290KCkuZ2V0UHJvamVjdChhYnNvbHV0ZVBhdGguc2VnbWVudCgwKSk7CiAgICAgfQotICAgIGVsc2UKLSAgICB7CiAgICAgICBJQ29udGFpbmVyIHBhcmVudCA9IG1ha2VGb2xkZXJQYXRoKGFic29sdXRlUGF0aC5yZW1vdmVMYXN0U2VnbWVudHMoMSksIHN0YXR1c0hhbmRsZXIgKTsKICAgICAgIFN0cmluZyBmb2xkZXJOYW1lID0gYWJzb2x1dGVQYXRoLmxhc3RTZWdtZW50KCk7CiAgICAgICAKICAgICAgIHJldHVybiBtYWtlRm9sZGVyKHBhcmVudCxmb2xkZXJOYW1lLCBzdGF0dXNIYW5kbGVyICk7Ci0gICAgfQogICB9CiAgIC8vCiAgIC8vIENyZWF0ZXMgYSBmb2xkZXIgdW5kZXIgYSBjb250YWluZXIuCkBAIC00ODMsNyArNDc5LDcgQEAKICAgICB7CiAgICAgICB0aHJvdyBuZXcgQ29yZUV4Y2VwdGlvbigKICAgICAgICAgbmV3IFN0YXR1cyggSVN0YXR1cy5FUlJPUiwgCi0gICAgICAgICAgICAgICAgICAgICJSZXNvdXJjZVV0aWxzIiwKKyAgICAgICAgICAgICAgICAgICAgIlJlc291cmNlVXRpbHMiLCAvLyROT04tTkxTLTEkCiAgICAgICAgICAgICAgICAgICAgIDAsIAogCQkJCQlOTFMuYmluZCggTWVzc2FnZXMuTVNHX0VSUk9SX1JFU09VUkNFX05PVF9GT0xERVIsIHBhcmVudC5nZXRGdWxsUGF0aCgpLmFwcGVuZChmb2xkZXJOYW1lKS50b1N0cmluZygpKSwKIAkJCW51bGwgKSApOwpAQCAtNTAyLDcgKzQ5OCw4IEBACiAKICB0aHJvd3MgQ29yZUV4Y2VwdGlvbgogIHsKLQkgSUZpbGUgZmlsZSA9IHBhcmVudC5nZXRGaWxlKCBuZXcgUGF0aChmaWxlTmFtZSkgKTsKKwkgU3RyaW5nIGlubmVyRmlsZU5hbWUgPSBmaWxlTmFtZTsKKwkgSUZpbGUgZmlsZSA9IHBhcmVudC5nZXRGaWxlKCBuZXcgUGF0aChpbm5lckZpbGVOYW1lKSApOwogCiAJIC8vIGNyZWF0ZSB0aGUgZmlsZSBpZiBpdCBkb2Vzbid0IGV4aXN0CiAJIGlmICghZmlsZS5leGlzdHMoKSkgewpAQCAtNTE1LDExICs1MTIsMTEgQEAKIAkJCQkgYm9vbGVhbiBmb3VuZElnbm9yaW5nQ2FzZSA9IGZhbHNlOwogCiAJCQkJIGZvciAoSVJlc291cmNlIHJlc291cmNlIDogcGFyZW50Lm1lbWJlcnMoKSkgewotCQkJCQkgaWYgKHJlc291cmNlLmdldE5hbWUoKS5lcXVhbHNJZ25vcmVDYXNlKGZpbGVOYW1lKSkgeworCQkJCQkgaWYgKHJlc291cmNlLmdldE5hbWUoKS5lcXVhbHNJZ25vcmVDYXNlKGlubmVyRmlsZU5hbWUpKSB7CiAJCQkJCQkgLy8gZm91bmQgdGhlIGZpbGUKIAkJCQkJCSBmb3VuZElnbm9yaW5nQ2FzZSA9IHRydWU7Ci0JCQkJCQkgZmlsZU5hbWUgPSByZXNvdXJjZS5nZXROYW1lKCk7Ci0JCQkJCQkgZmlsZSA9IHBhcmVudC5nZXRGaWxlKCBuZXcgUGF0aChmaWxlTmFtZSkpOworCQkJCQkJIGlubmVyRmlsZU5hbWUgPSByZXNvdXJjZS5nZXROYW1lKCk7CisJCQkJCQkgZmlsZSA9IHBhcmVudC5nZXRGaWxlKCBuZXcgUGF0aChpbm5lckZpbGVOYW1lKSk7CiAJCQkJCQkgYnJlYWs7CiAJCQkJCSB9CiAJCQkJIH0KQEAgLTU2MSwxNCArNTU4LDExIEBACiAJCSByZXR1cm4gZmlsZTsKIAogCSB9Ci0JIGVsc2UKLQkgewotCQkgdGhyb3cgbmV3IENvcmVFeGNlcHRpb24oIAotCQkJCSBuZXcgU3RhdHVzKCBJU3RhdHVzLkVSUk9SLAotCQkJCQkJICJSZXNvdXJjZVV0aWxzIiwKLQkJCQkJCSAwLCAKLQkJCQkJCSBOTFMuYmluZCggTWVzc2FnZXMuTVNHX0VSUk9SX1JFU09VUkNFX05PVF9GSUxFLCBwYXJlbnQuZ2V0RnVsbFBhdGgoKS5hcHBlbmQoZmlsZU5hbWUpKSwKLQkJCQkJCSBudWxsICkgKTsKLQkgfQorCSB0aHJvdyBuZXcgQ29yZUV4Y2VwdGlvbiggCisJCQkgbmV3IFN0YXR1cyggSVN0YXR1cy5FUlJPUiwKKwkJCQkJICJSZXNvdXJjZVV0aWxzIiwgLy8kTk9OLU5MUy0xJAorCQkJCQkgMCwgCisJCQkJCSBOTFMuYmluZCggTWVzc2FnZXMuTVNHX0VSUk9SX1JFU09VUkNFX05PVF9GSUxFLCBwYXJlbnQuZ2V0RnVsbFBhdGgoKS5hcHBlbmQoaW5uZXJGaWxlTmFtZSkpLAorCQkJCQkgbnVsbCApICk7CiAgfQogfQpkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVudmlyb25tZW50L3NyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2Vudmlyb25tZW50L2VjbGlwc2UvTWVzc2FnZXMuamF2YSBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbnZpcm9ubWVudC9zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbnZpcm9ubWVudC9lY2xpcHNlL01lc3NhZ2VzLmphdmEKaW5kZXggNGMwOGVhMS4uNjM4YTNlMCAxMDA2NDQKLS0tIGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVudmlyb25tZW50L3NyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2Vudmlyb25tZW50L2VjbGlwc2UvTWVzc2FnZXMuamF2YQorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW52aXJvbm1lbnQvc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW52aXJvbm1lbnQvZWNsaXBzZS9NZXNzYWdlcy5qYXZhCkBAIC0xMiw3ICsxMiw3IEBACiAKIHB1YmxpYyBjbGFzcyBNZXNzYWdlcyBleHRlbmRzIE5MUwogewotICBwcml2YXRlIHN0YXRpYyBmaW5hbCBTdHJpbmcgQlVORExFX05BTUUgPSAib3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5pbnRlcm5hbC5lbnZpcm9ubWVudC5lY2xpcHNlLmVudmlyb25tZW50IjsKKyAgcHJpdmF0ZSBzdGF0aWMgZmluYWwgU3RyaW5nIEJVTkRMRV9OQU1FID0gIm9yZy5lY2xpcHNlLndzdC5jb21tb24uaW50ZXJuYWwuZW52aXJvbm1lbnQuZWNsaXBzZS5lbnZpcm9ubWVudCI7IC8vJE5PTi1OTFMtMSQKICAgCiAgIHB1YmxpYyBzdGF0aWMgU3RyaW5nIE1TR19OVUxMX0FSR19TUEVDSUZJRUQ7CiAgIHB1YmxpYyBzdGF0aWMgU3RyaW5nIE1TR19TQ0hFTUVfTk9UX0ZPVU5EOwpkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVudmlyb25tZW50L3NyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2Vudmlyb25tZW50L3JlbGF0aXZlL1JlbGF0aXZlU2NoZW1lLmphdmEgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW52aXJvbm1lbnQvc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW52aXJvbm1lbnQvcmVsYXRpdmUvUmVsYXRpdmVTY2hlbWUuamF2YQppbmRleCBiYjYwYzBlLi4zZmI5ODcyIDEwMDY0NAotLS0gYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW52aXJvbm1lbnQvc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW52aXJvbm1lbnQvcmVsYXRpdmUvUmVsYXRpdmVTY2hlbWUuamF2YQorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW52aXJvbm1lbnQvc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW52aXJvbm1lbnQvcmVsYXRpdmUvUmVsYXRpdmVTY2hlbWUuamF2YQpAQCAtMjEsOSArMjEsMTAgQEAKIHB1YmxpYyBjbGFzcyBSZWxhdGl2ZVNjaGVtZSBpbXBsZW1lbnRzIElVUklTY2hlbWUKIHsKIAotICBwdWJsaWMgU3RyaW5nIHRvU3RyaW5nKCkKKyAgQE92ZXJyaWRlCitwdWJsaWMgU3RyaW5nIHRvU3RyaW5nKCkKICAgewotICAgIHJldHVybiAicmVsYXRpdmUiOyAgCisgICAgcmV0dXJuICJyZWxhdGl2ZSI7IC8vJE5PTi1OTFMtMSQgIAogICB9CiAgIAogICAvKiAobm9uLUphdmFkb2MpCkBAIC0zOSw3ICs0MCw3IEBACiAgICAqLwogICBwdWJsaWMgYm9vbGVhbiBpc1ZhbGlkKElVUkkgdXJpKQogICB7Ci0gICAgcmV0dXJuICF1cmkudG9TdHJpbmcoKS5zdGFydHNXaXRoKCAiLyIgKTsKKyAgICByZXR1cm4gIXVyaS50b1N0cmluZygpLnN0YXJ0c1dpdGgoICIvIiApOyAvLyROT04tTkxTLTEkCiAgIH0KIAogICAvKiAobm9uLUphdmFkb2MpCkBAIC03OSw3ICs4MCw3IEBACiAgICAgfQogICAgIGVsc2UKICAgICB7Ci0gICAgICByZXN1bHQgPSBuZXcgU3RhdHVzKCBJU3RhdHVzLkVSUk9SLCAiaWQiLCAwLCAiIixudWxsICk7ICAgICAgCisgICAgICByZXN1bHQgPSBuZXcgU3RhdHVzKCBJU3RhdHVzLkVSUk9SLCAiaWQiLCAwLCAiIixudWxsICk7IC8vJE5PTi1OTFMtMSQgLy8kTk9OLU5MUy0yJCAgICAgCiAgICAgfQogICAgIAogICAgIHJldHVybiByZXN1bHQ7CmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW52aXJvbm1lbnQvc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW52aXJvbm1lbnQvcmVsYXRpdmUvUmVsYXRpdmVVUkkuamF2YSBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbnZpcm9ubWVudC9zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbnZpcm9ubWVudC9yZWxhdGl2ZS9SZWxhdGl2ZVVSSS5qYXZhCmluZGV4IDU5ZjNkMzYuLjA4Nzc0MDUgMTAwNjQ0Ci0tLSBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbnZpcm9ubWVudC9zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbnZpcm9ubWVudC9yZWxhdGl2ZS9SZWxhdGl2ZVVSSS5qYXZhCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbnZpcm9ubWVudC9zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbnZpcm9ubWVudC9yZWxhdGl2ZS9SZWxhdGl2ZVVSSS5qYXZhCkBAIC00MiwxMiArNDIsMTIgQEAKICAgICBpZiggIXJlbGF0aXZlVVJJLmlzUmVsYXRpdmUoKSkgCiAgICAgIHsgICAgICAKICAgICAgIHRocm93IG5ldyBVUklFeGNlcHRpb24oIAotICAgICAgICAgIG5ldyBTdGF0dXMoIElTdGF0dXMuRVJST1IsICJpZCIsIDAsCisgICAgICAgICAgbmV3IFN0YXR1cyggSVN0YXR1cy5FUlJPUiwgImlkIiwgMCwgLy8kTk9OLU5MUy0xJAogICAgICAgICAgICAgICBOTFMuYmluZCggTWVzc2FnZXMuTVNHX1VSSV9OT1RfUkVMQVRJVkUsIHJlbGF0aXZlVVJJLnRvU3RyaW5nKCkgKSwgbnVsbCApICk7CiAgICAgICAKICAgICB9CiAgICAgCi0gICAgU3RyaW5nIG5ld1VSSSA9IHVyaV8gKyAiLyIgKyByZWxhdGl2ZVVSSS50b1N0cmluZygpOworICAgIFN0cmluZyBuZXdVUkkgPSB1cmlfICsgIi8iICsgcmVsYXRpdmVVUkkudG9TdHJpbmcoKTsgLy8kTk9OLU5MUy0xJAogICAgIAogICAgIHJldHVybiBnZXRVUklTY2hlbWUoKS5uZXdVUkkoIG5ld1VSSSApOwogICB9CkBAIC03MSw3ICs3MSw4IEBACiAgIC8qIChub24tSmF2YWRvYykKICAgICogQHNlZSBvcmcuZWNsaXBzZS5lbnYudXJpLlVSSSN0b1N0cmluZygpCiAgICAqLwotICBwdWJsaWMgU3RyaW5nIHRvU3RyaW5nKCkKKyAgQE92ZXJyaWRlCitwdWJsaWMgU3RyaW5nIHRvU3RyaW5nKCkKICAgewogICAgIHJldHVybiB1cmlfOwogICB9CmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW52aXJvbm1lbnQvc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW52aXJvbm1lbnQvdXJpL2ZpbGUvRmlsZVNjaGVtZS5qYXZhIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVudmlyb25tZW50L3NyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2Vudmlyb25tZW50L3VyaS9maWxlL0ZpbGVTY2hlbWUuamF2YQppbmRleCAzZGQ0Zjg5Li5jYjMzMmJhIDEwMDY0NAotLS0gYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW52aXJvbm1lbnQvc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW52aXJvbm1lbnQvdXJpL2ZpbGUvRmlsZVNjaGVtZS5qYXZhCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbnZpcm9ubWVudC9zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbnZpcm9ubWVudC91cmkvZmlsZS9GaWxlU2NoZW1lLmphdmEKQEAgLTI0LDE1ICsyNCwxNyBAQAogCiBwdWJsaWMgY2xhc3MgRmlsZVNjaGVtZSBleHRlbmRzIFJlbGF0aXZlU2NoZW1lCiB7Ci0gIHB1YmxpYyBTdHJpbmcgdG9TdHJpbmcoKQorICBAT3ZlcnJpZGUKK3B1YmxpYyBTdHJpbmcgdG9TdHJpbmcoKQogICB7Ci0gICAgcmV0dXJuICJmaWxlIjsgIAorICAgIHJldHVybiAiZmlsZSI7IC8vJE5PTi1OTFMtMSQKICAgfQogICAKICAgLyogKG5vbi1KYXZhZG9jKQogICAgKiBAc2VlIG9yZy5lY2xpcHNlLmVudi51cmkuVVJJU2NoZW1lI2lzVmFsaWQob3JnLmVjbGlwc2UuZW52LnVyaS5VUkkpCiAgICAqLwotICBwdWJsaWMgYm9vbGVhbiBpc1ZhbGlkKElVUkkgdXJpKQorICBAT3ZlcnJpZGUKK3B1YmxpYyBib29sZWFuIGlzVmFsaWQoSVVSSSB1cmkpCiAgIHsgCiAgICAgYm9vbGVhbiByZXN1bHQgPSBmYWxzZTsKICAgICAKQEAgLTQwLDExICs0MiwxMSBAQAogICAgIAogICAgIElVUklTY2hlbWUgc2NoZW1lID0gdXJpLmdldFVSSVNjaGVtZSgpOwogICAgICAgCi0gICAgaWYoIHNjaGVtZS50b1N0cmluZygpLmVxdWFscyggInJlbGF0aXZlIikgKSByZXR1cm4gc2NoZW1lLmlzVmFsaWQoIHVyaSApOworICAgIGlmKCBzY2hlbWUudG9TdHJpbmcoKS5lcXVhbHMoICJyZWxhdGl2ZSIpICkgcmV0dXJuIHNjaGVtZS5pc1ZhbGlkKCB1cmkgKTsgLy8kTk9OLU5MUy0xJAogICAgICAgICAKICAgICBTdHJpbmcgdXJpU3RyaW5nID0gdXJpLnRvU3RyaW5nKCk7CiAgICAgICAKLSAgICBpZiggdXJpU3RyaW5nICE9IG51bGwgJiYgdXJpU3RyaW5nLnN0YXJ0c1dpdGgoICJmaWxlOiIgKSApCisgICAgaWYoIHVyaVN0cmluZyAhPSBudWxsICYmIHVyaVN0cmluZy5zdGFydHNXaXRoKCAiZmlsZToiICkgKSAvLyROT04tTkxTLTEkCiAgICAgewogICAgICAgcmVzdWx0ID0gdHJ1ZTsKICAgICB9ICAKQEAgLTU1LDQzICs1Nyw0MiBAQAogICAvKiAobm9uLUphdmFkb2MpCiAgICAqIEBzZWUgb3JnLmVjbGlwc2UuZW52LnVyaS5VUklTY2hlbWUjbmV3VVJJKGphdmEubGFuZy5TdHJpbmcpCiAgICAqLwotICBwdWJsaWMgSVVSSSBuZXdVUkkoU3RyaW5nIHVyaSkgdGhyb3dzIFVSSUV4Y2VwdGlvbgorICBAT3ZlcnJpZGUKK3B1YmxpYyBJVVJJIG5ld1VSSShTdHJpbmcgdXJpKSB0aHJvd3MgVVJJRXhjZXB0aW9uCiAgIHsKICAgICBTdHJpbmcgbmV3VVJJID0gbnVsbDsKICAgICAKLSAgICBpZiggdXJpICE9IG51bGwgJiYgdXJpLnN0YXJ0c1dpdGgoICJmaWxlOiIpICkKKyAgICBpZiggdXJpICE9IG51bGwgJiYgdXJpLnN0YXJ0c1dpdGgoICJmaWxlOiIpICkgLy8kTk9OLU5MUy0xJAogICAgIHsKICAgICAgIC8vIFRoZSBmaWxlIHByb3RvY29sIGhhcyBiZWVuIHNwZWNpZmllZCBzbyBrZWVwIGl0IGFzIGlzLgogICAgICAgbmV3VVJJID0gdXJpOwogICAgIH0KLSAgICBlbHNlIGlmKCB1cmkgPT0gbnVsbCB8fCB1cmkuaW5kZXhPZiggIjoiKSAhPSAtMSApCisgICAgZWxzZSBpZiggdXJpID09IG51bGwgfHwgdXJpLmluZGV4T2YoICI6IikgIT0gLTEgKSAvLyROT04tTkxTLTEkCiAgICAgewogICAgICAgLy8gVGhlIGZpbGUgdXJpIGlzIG5vdCBhbGxvd2VkIHRvIGNvbnRhaW4gc29tZSBvdGhlciBwcm90b2NvbC4gCiAgICAgICB0aHJvdyBuZXcgVVJJRXhjZXB0aW9uKAotICAgICAgICAgIG5ldyBTdGF0dXMoIElTdGF0dXMuRVJST1IsICJpZCIsIDAsCisgICAgICAgICAgbmV3IFN0YXR1cyggSVN0YXR1cy5FUlJPUiwgImlkIiwgMCwgLy8kTk9OLU5MUy0xJAogICAgICAgICAgICAgICBOTFMuYmluZCggTWVzc2FnZXMuTVNHX0lOVkFMSURfRklMRV9VUkwsdXJpKSwgbnVsbCApICk7CiAgICAgICAgICAgICAgIAogICAgIH0KLSAgICBlbHNlIGlmKCB1cmkuc3RhcnRzV2l0aCggIi8iKSApCisgICAgZWxzZSBpZiggdXJpLnN0YXJ0c1dpdGgoICIvIikgKSAvLyROT04tTkxTLTEkCiAgICAgewogICAgICAgLy8gVGhlIGZpbGUgc2NoZW1lIGhhcyBub3QgYmVlbiBzcGVjaWZpZWQgc28gd2Ugd2lsbCBhZGQgaXQuCi0gICAgICBuZXdVUkkgPSAiZmlsZToiICsgdXJpOworICAgICAgbmV3VVJJID0gImZpbGU6IiArIHVyaTsgLy8kTk9OLU5MUy0xJAogICAgIH0KICAgICAKICAgICBpZiggbmV3VVJJID09IG51bGwgKQogICAgIHsKICAgICAgIHJldHVybiBuZXcgUmVsYXRpdmVVUkkoIHVyaSApOwogICAgIH0KLSAgICBlbHNlCi0gICAgewotICAgICAgcmV0dXJuIG5ldyBGaWxlVVJJKCBuZXdVUkkgKTsKLSAgICB9CisgICAgcmV0dXJuIG5ldyBGaWxlVVJJKCBuZXdVUkkgKTsKICAgfQogCiAgIC8qIChub24tSmF2YWRvYykKICAgICogQHNlZSBvcmcuZWNsaXBzZS5lbnYudXJpLlVSSVNjaGVtZSNuZXdVUkkob3JnLmVjbGlwc2UuZW52LnVyaS5VUkkpCiAgICAqLwotICBwdWJsaWMgSVVSSSBuZXdVUkkoSVVSSSB1cmkpIHRocm93cyBVUklFeGNlcHRpb24KKyAgQE92ZXJyaWRlCitwdWJsaWMgSVVSSSBuZXdVUkkoSVVSSSB1cmkpIHRocm93cyBVUklFeGNlcHRpb24KICAgewogICAgIHJldHVybiBuZXdVUkkoIHVyaSA9PSBudWxsID8gbnVsbCA6IHVyaS50b1N0cmluZygpICk7CiAgIH0KQEAgLTk5LDcgKzEwMCw4IEBACiAgIC8qIChub24tSmF2YWRvYykKICAgICogQHNlZSBvcmcuZWNsaXBzZS5lbnYudXJpLlVSSVNjaGVtZSNuZXdVUkkoamF2YS5uZXQuVVJMKQogICAgKi8KLSAgcHVibGljIElVUkkgbmV3VVJJKFVSTCB1cmwpIHRocm93cyBVUklFeGNlcHRpb24KKyAgQE92ZXJyaWRlCitwdWJsaWMgSVVSSSBuZXdVUkkoVVJMIHVybCkgdGhyb3dzIFVSSUV4Y2VwdGlvbgogICB7CiAgICAgcmV0dXJuIG5ld1VSSSggdXJsID09IG51bGwgPyBudWxsIDogdXJsLnRvU3RyaW5nKCkgKTsKICAgfQpkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVudmlyb25tZW50L3NyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2Vudmlyb25tZW50L3VyaS9maWxlL0ZpbGVVUkkuamF2YSBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbnZpcm9ubWVudC9zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbnZpcm9ubWVudC91cmkvZmlsZS9GaWxlVVJJLmphdmEKaW5kZXggZWNjMTY2NC4uNjViM2QwNCAxMDA2NDQKLS0tIGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVudmlyb25tZW50L3NyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2Vudmlyb25tZW50L3VyaS9maWxlL0ZpbGVVUkkuamF2YQorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW52aXJvbm1lbnQvc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW52aXJvbm1lbnQvdXJpL2ZpbGUvRmlsZVVSSS5qYXZhCkBAIC00NSw3ICs0NSw4IEBACiAgIC8qIChub24tSmF2YWRvYykKICAgICogQHNlZSBvcmcuZWNsaXBzZS5lbnYudXJpLlVSSSNhc0ZpbGUoKQogICAgKi8KLSAgcHVibGljIEZpbGUgYXNGaWxlKCkgCisgIEBPdmVycmlkZQorcHVibGljIEZpbGUgYXNGaWxlKCkgCiAgIHsKICAgICByZXR1cm4gZmlsZV87CiAgIH0KQEAgLTUzLDcgKzU0LDggQEAKICAgLyogKG5vbi1KYXZhZG9jKQogICAgKiBAc2VlIG9yZy5lY2xpcHNlLmVudi51cmkuVVJJI2VyYXNlKCkKICAgICovCi0gIHB1YmxpYyB2b2lkIGVyYXNlKCkgdGhyb3dzIFVSSUV4Y2VwdGlvbgorICBAT3ZlcnJpZGUKK3B1YmxpYyB2b2lkIGVyYXNlKCkgdGhyb3dzIFVSSUV4Y2VwdGlvbgogICB7CiAgICAgZGVsZXRlRmlsZSggZmlsZV8gKTsKICAgfQpAQCAtODUsNyArODcsOCBAQAogICAvKiAobm9uLUphdmFkb2MpCiAgICAqIEBzZWUgb3JnLmVjbGlwc2UuZW52LnVyaS5VUkkjZ2V0SW5wdXRTdHJlYW0oKQogICAgKi8KLSAgcHVibGljIElucHV0U3RyZWFtIGdldElucHV0U3RyZWFtKCkgdGhyb3dzIFVSSUV4Y2VwdGlvbgorICBAT3ZlcnJpZGUKK3B1YmxpYyBJbnB1dFN0cmVhbSBnZXRJbnB1dFN0cmVhbSgpIHRocm93cyBVUklFeGNlcHRpb24KICAgewogICAgIEZpbGVJbnB1dFN0cmVhbSBzdHJlYW0gPSBudWxsOwogICAgIApAQCAtOTgsNyArMTAxLDcgQEAKICAgICB9CiAgICAgY2F0Y2goIElPRXhjZXB0aW9uIGV4YyApCiAgICAgewotICAgICAgdGhyb3cgbmV3IFVSSUV4Y2VwdGlvbiggbmV3IFN0YXR1cyggSVN0YXR1cy5FUlJPUiwgImlkIiwgMCwgZXhjLmdldE1lc3NhZ2UoKSwgZXhjICksIHRoaXMgKTsKKyAgICAgIHRocm93IG5ldyBVUklFeGNlcHRpb24oIG5ldyBTdGF0dXMoIElTdGF0dXMuRVJST1IsICJpZCIsIDAsIGV4Yy5nZXRNZXNzYWdlKCksIGV4YyApLCB0aGlzICk7IC8vJE5PTi1OTFMtMSQKICAgICB9CiAgICAgCiAgICAgcmV0dXJuIHN0cmVhbTsKQEAgLTEwNyw3ICsxMTAsOCBAQAogICAvKiAobm9uLUphdmFkb2MpCiAgICAqIEBzZWUgb3JnLmVjbGlwc2UuZW52LnVyaS5VUkkjZ2V0T3V0cHV0U3RyZWFtKCkKICAgICovCi0gIHB1YmxpYyBPdXRwdXRTdHJlYW0gZ2V0T3V0cHV0U3RyZWFtKCkgdGhyb3dzIFVSSUV4Y2VwdGlvbgorICBAT3ZlcnJpZGUKK3B1YmxpYyBPdXRwdXRTdHJlYW0gZ2V0T3V0cHV0U3RyZWFtKCkgdGhyb3dzIFVSSUV4Y2VwdGlvbgogICB7CiAgICAgRmlsZU91dHB1dFN0cmVhbSBzdHJlYW0gPSBudWxsOwogICAgIApAQCAtMTIwLDcgKzEyNCw3IEBACiAgICAgfQogICAgIGNhdGNoKCBJT0V4Y2VwdGlvbiBleGMgKQogICAgIHsKLSAgICAgIHRocm93IG5ldyBVUklFeGNlcHRpb24oIG5ldyBTdGF0dXMoIElTdGF0dXMuRVJST1IsICJpZCIsIDAsIGV4Yy5nZXRNZXNzYWdlKCksIGV4YyApLCB0aGlzICk7CisgICAgICB0aHJvdyBuZXcgVVJJRXhjZXB0aW9uKCBuZXcgU3RhdHVzKCBJU3RhdHVzLkVSUk9SLCAiaWQiLCAwLCBleGMuZ2V0TWVzc2FnZSgpLCBleGMgKSwgdGhpcyApOyAvLyROT04tTkxTLTEkCiAgICAgfQogICAgIAogICAgIHJldHVybiBzdHJlYW07CkBAIC0xMjksNyArMTMzLDggQEAKICAgLyogKG5vbi1KYXZhZG9jKQogICAgKiBAc2VlIG9yZy5lY2xpcHNlLmVudi51cmkuVVJJI2dldFVSSVNjaGVtZSgpCiAgICAqLwotICBwdWJsaWMgSVVSSVNjaGVtZSBnZXRVUklTY2hlbWUoKQorICBAT3ZlcnJpZGUKK3B1YmxpYyBJVVJJU2NoZW1lIGdldFVSSVNjaGVtZSgpCiAgIHsKICAgICByZXR1cm4gbmV3IEZpbGVTY2hlbWUoKTsKICAgfQpAQCAtMTM3LDcgKzE0Miw4IEBACiAgIC8qIChub24tSmF2YWRvYykKICAgICogQHNlZSBvcmcuZWNsaXBzZS5lbnYudXJpLlVSSSNpc0F2YWlsYWJsZUFzRmlsZSgpCiAgICAqLwotICBwdWJsaWMgYm9vbGVhbiBpc0F2YWlsYWJsZUFzRmlsZSgpCisgIEBPdmVycmlkZQorcHVibGljIGJvb2xlYW4gaXNBdmFpbGFibGVBc0ZpbGUoKQogICB7CiAgICAgcmV0dXJuIGZpbGVfICE9IG51bGw7CiAgIH0KQEAgLTE0NSw3ICsxNTEsOCBAQAogICAvKiAobm9uLUphdmFkb2MpCiAgICAqIEBzZWUgb3JnLmVjbGlwc2UuZW52LnVyaS5VUkkjaXNBdmFpbGFibGVBc1VSTCgpCiAgICAqLwotICBwdWJsaWMgYm9vbGVhbiBpc0F2YWlsYWJsZUFzVVJMKCkKKyAgQE92ZXJyaWRlCitwdWJsaWMgYm9vbGVhbiBpc0F2YWlsYWJsZUFzVVJMKCkKICAgewogICAgIHJldHVybiBmaWxlXyAhPSBudWxsOwogICB9CkBAIC0xNTMsNyArMTYwLDggQEAKICAgLyogKG5vbi1KYXZhZG9jKQogICAgKiBAc2VlIG9yZy5lY2xpcHNlLmVudi51cmkuVVJJI2FzVVJMKCkKICAgICovCi0gIHB1YmxpYyBVUkwgYXNVUkwoKSB0aHJvd3MgVVJJRXhjZXB0aW9uCisgIEBPdmVycmlkZQorcHVibGljIFVSTCBhc1VSTCgpIHRocm93cyBVUklFeGNlcHRpb24KICAgewogICAgIFVSTCB1cmwgPSBudWxsOwogICAgIApAQCAtMTYzLDcgKzE3MSw3IEBACiAgICAgfQogICAgIGNhdGNoKCBNYWxmb3JtZWRVUkxFeGNlcHRpb24gZXhjICkKICAgICB7Ci0gICAgICB0aHJvdyBuZXcgVVJJRXhjZXB0aW9uKCBuZXcgU3RhdHVzKCBJU3RhdHVzLkVSUk9SLCAiaWQiLCAwLCBleGMuZ2V0TWVzc2FnZSgpLCBleGMgKSwgdGhpcyApOyAgICAgIAorICAgICAgdGhyb3cgbmV3IFVSSUV4Y2VwdGlvbiggbmV3IFN0YXR1cyggSVN0YXR1cy5FUlJPUiwgImlkIiwgMCwgZXhjLmdldE1lc3NhZ2UoKSwgZXhjICksIHRoaXMgKTsgLy8kTk9OLU5MUy0xJCAgICAgIAogICAgIH0KICAgICAKICAgICByZXR1cm4gdXJsOwpAQCAtMTcyLDcgKzE4MCw4IEBACiAgIC8qIChub24tSmF2YWRvYykKICAgICogQHNlZSBvcmcuZWNsaXBzZS5lbnYudXJpLlVSSSNpc0xlYWYoKQogICAgKi8KLSAgcHVibGljIGJvb2xlYW4gaXNMZWFmKCkKKyAgQE92ZXJyaWRlCitwdWJsaWMgYm9vbGVhbiBpc0xlYWYoKQogICB7CiAgICAgcmV0dXJuIGZpbGVfLmlzRmlsZSgpOwogICB9CkBAIC0xODAsNyArMTg5LDggQEAKICAgLyogKG5vbi1KYXZhZG9jKQogICAgKiBAc2VlIG9yZy5lY2xpcHNlLmVudi51cmkuVVJJI2lzUHJlc2VudCgpCiAgICAqLwotICBwdWJsaWMgYm9vbGVhbiBpc1ByZXNlbnQoKQorICBAT3ZlcnJpZGUKK3B1YmxpYyBib29sZWFuIGlzUHJlc2VudCgpCiAgIHsKICAgICByZXR1cm4gZmlsZV8uZXhpc3RzKCk7CiAgIH0KQEAgLTE4OCw3ICsxOTgsOCBAQAogICAvKiAobm9uLUphdmFkb2MpCiAgICAqIEBzZWUgb3JnLmVjbGlwc2UuZW52LnVyaS5VUkkjaXNSZWFkYWJsZSgpCiAgICAqLwotICBwdWJsaWMgYm9vbGVhbiBpc1JlYWRhYmxlKCkKKyAgQE92ZXJyaWRlCitwdWJsaWMgYm9vbGVhbiBpc1JlYWRhYmxlKCkKICAgewogICAgIHJldHVybiBmaWxlXy5jYW5SZWFkKCk7CiAgIH0KQEAgLTE5Niw3ICsyMDcsOCBAQAogICAvKiAobm9uLUphdmFkb2MpCiAgICAqIEBzZWUgb3JnLmVjbGlwc2UuZW52LnVyaS5VUkkjaXNXcml0YWJsZSgpCiAgICAqLwotICBwdWJsaWMgYm9vbGVhbiBpc1dyaXRhYmxlKCkKKyAgQE92ZXJyaWRlCitwdWJsaWMgYm9vbGVhbiBpc1dyaXRhYmxlKCkKICAgewogICAgIHJldHVybiBmaWxlXy5jYW5Xcml0ZSgpOwogICB9CkBAIC0yMDQsNyArMjE2LDggQEAKICAgLyogKG5vbi1KYXZhZG9jKQogICAgKiBAc2VlIG9yZy5lY2xpcHNlLmVudi51cmkuVVJJI2xpc3QoKQogICAgKi8KLSAgcHVibGljIElVUklbXSBsaXN0KCkgdGhyb3dzIFVSSUV4Y2VwdGlvbgorICBAT3ZlcnJpZGUKK3B1YmxpYyBJVVJJW10gbGlzdCgpIHRocm93cyBVUklFeGNlcHRpb24KICAgewogICAgIEZpbGVbXSBjaGlsZHJlbiA9IGZpbGVfLmxpc3RGaWxlcygpOwogICAgIElVUklbXSAgVVJJcyAgICAgPSBuZXcgSVVSSVswXTsKQEAgLTIxNyw3ICsyMzAsNyBAQAogICAgIAogICAgICAgZm9yKCBpbnQgaW5kZXggPSAwOyBpbmRleCA8IGxlbmd0aDsgaW5kZXgrKyApCiAgICAgICB7Ci0gICAgICAgIFVSSXNbaW5kZXhdID0gbmV3IEZpbGVVUkkoICJmaWxlOiIgKyBjaGlsZHJlbltpbmRleF0uZ2V0QWJzb2x1dGVQYXRoKCkgKTsKKyAgICAgICAgVVJJc1tpbmRleF0gPSBuZXcgRmlsZVVSSSggImZpbGU6IiArIGNoaWxkcmVuW2luZGV4XS5nZXRBYnNvbHV0ZVBhdGgoKSApOyAvLyROT04tTkxTLTEkCiAgICAgICB9CiAgICAgfQogICAgIApAQCAtMjI3LDI5ICsyNDAsMzIgQEAKICAgLyogKG5vbi1KYXZhZG9jKQogICAgKiBAc2VlIG9yZy5lY2xpcHNlLmVudi51cmkuVVJJI2xpc3Qob3JnLmVjbGlwc2UuZW52LnVyaS5VUklGaWx0ZXIpCiAgICAqLwotICBwdWJsaWMgSVVSSVtdIGxpc3QoSVVSSUZpbHRlciB1cmlGaWx0ZXIpIHRocm93cyBVUklFeGNlcHRpb24KKyAgQE92ZXJyaWRlCitwdWJsaWMgSVVSSVtdIGxpc3QoSVVSSUZpbHRlciB1cmlGaWx0ZXIpIHRocm93cyBVUklFeGNlcHRpb24KICAgewogICAgIEZpbGVbXSAgIGNoaWxkcmVuID0gZmlsZV8ubGlzdEZpbGVzKCk7CiAgICAgaW50ICAgICAgbGVuZ3RoICAgPSBjaGlsZHJlbiA9PSBudWxsID8gMCA6IGNoaWxkcmVuLmxlbmd0aDsKICAgICBWZWN0b3IgICBVUklzICAgICA9IG5ldyBWZWN0b3IoKTsKICAgICAKLSAgICBmb3IoIGludCBpbmRleCA9IDA7IGluZGV4IDwgbGVuZ3RoOyBpbmRleCsrICkKLSAgICB7Ci0gICAgICBJVVJJIG5ld1VSSSA9IG5ldyBGaWxlVVJJKCAiZmlsZToiICsgY2hpbGRyZW5baW5kZXhdLmdldEFic29sdXRlUGF0aCgpICk7Ci0gICAgICAKLSAgICAgIGlmKCB1cmlGaWx0ZXIuYWNjZXB0cyggbmV3VVJJKSApCi0gICAgICB7Ci0gICAgICAgIFVSSXMuYWRkKCBuZXdVUkkgKTsKLSAgICAgIH0gCisgICAgaWYoY2hpbGRyZW4gIT0gbnVsbCl7CisJICAgIGZvciggaW50IGluZGV4ID0gMDsgaW5kZXggPCBsZW5ndGg7IGluZGV4KysgKQorCSAgICB7CisJICAgICAgSVVSSSBuZXdVUkkgPSBuZXcgRmlsZVVSSSggImZpbGU6IiArIGNoaWxkcmVuW2luZGV4XS5nZXRBYnNvbHV0ZVBhdGgoKSApOyAvLyROT04tTkxTLTEkCisJICAgICAgCisJICAgICAgaWYoIHVyaUZpbHRlci5hY2NlcHRzKCBuZXdVUkkpICkKKwkgICAgICB7CisJICAgICAgICBVUklzLmFkZCggbmV3VVJJICk7CisJICAgICAgfSAKKwkgICAgfQogICAgIH0KLSAgICAKICAgICByZXR1cm4gKElVUklbXSlVUklzLnRvQXJyYXkoIG5ldyBJVVJJWzBdICk7CiAgIH0KIAogICAvKiAobm9uLUphdmFkb2MpCiAgICAqIEBzZWUgb3JnLmVjbGlwc2UuZW52LnVyaS5VUkkjcmVuYW1lKG9yZy5lY2xpcHNlLmVudi51cmkuVVJJKQogICAgKi8KLSAgcHVibGljIHZvaWQgcmVuYW1lKElVUkkgbmV3VVJJKSB0aHJvd3MgVVJJRXhjZXB0aW9uCisgIEBPdmVycmlkZQorcHVibGljIHZvaWQgcmVuYW1lKElVUkkgbmV3VVJJKSB0aHJvd3MgVVJJRXhjZXB0aW9uCiAgIHsKICAgICB0cnkKICAgICB7CkBAIC0yNTksMTQgKzI3NSwxNSBAQAogICAgIH0KICAgICBjYXRjaCggTWFsZm9ybWVkVVJMRXhjZXB0aW9uIGV4YyApCiAgICAgewotICAgICAgdGhyb3cgbmV3IFVSSUV4Y2VwdGlvbiggbmV3IFN0YXR1cyggSVN0YXR1cy5FUlJPUiwgImlkIiwgMCwgZXhjLmdldE1lc3NhZ2UoKSwgZXhjICksIHRoaXMgKTsgICAgICAKKyAgICAgIHRocm93IG5ldyBVUklFeGNlcHRpb24oIG5ldyBTdGF0dXMoIElTdGF0dXMuRVJST1IsICJpZCIsIDAsIGV4Yy5nZXRNZXNzYWdlKCksIGV4YyApLCB0aGlzICk7IC8vJE5PTi1OTFMtMSQgICAgICAKICAgICB9CiAgIH0KIAogICAvKiAobm9uLUphdmFkb2MpCiAgICAqIEBzZWUgb3JnLmVjbGlwc2UuZW52LnVyaS5VUkkjdG91Y2hGb2xkZXIoKQogICAgKi8KLSAgcHVibGljIHZvaWQgdG91Y2hGb2xkZXIoKSB0aHJvd3MgVVJJRXhjZXB0aW9uCisgIEBPdmVycmlkZQorcHVibGljIHZvaWQgdG91Y2hGb2xkZXIoKSB0aHJvd3MgVVJJRXhjZXB0aW9uCiAgIHsKICAgICBmaWxlXy5ta2RpcnMoKTsKICAgfQpAQCAtMjc0LDcgKzI5MSw4IEBACiAgIC8qIChub24tSmF2YWRvYykKICAgICogQHNlZSBvcmcuZWNsaXBzZS5lbnYudXJpLlVSSSN0b3VjaExlYWYoKQogICAgKi8KLSAgcHVibGljIHZvaWQgdG91Y2hMZWFmKCkgdGhyb3dzIFVSSUV4Y2VwdGlvbgorICBAT3ZlcnJpZGUKK3B1YmxpYyB2b2lkIHRvdWNoTGVhZigpIHRocm93cyBVUklFeGNlcHRpb24KICAgewogICAgIHRyeQogICAgIHsKQEAgLTI4NiwxMSArMzA0LDEyIEBACiAgICAgfQogICAgIGNhdGNoKCBJT0V4Y2VwdGlvbiBleGMgKQogICAgIHsKLSAgICAgIHRocm93IG5ldyBVUklFeGNlcHRpb24oIG5ldyBTdGF0dXMoIElTdGF0dXMuRVJST1IsICJpZCIsIDAsIGV4Yy5nZXRNZXNzYWdlKCksIGV4YyApLCB0aGlzICk7ICAgICAgCisgICAgICB0aHJvdyBuZXcgVVJJRXhjZXB0aW9uKCBuZXcgU3RhdHVzKCBJU3RhdHVzLkVSUk9SLCAiaWQiLCAwLCBleGMuZ2V0TWVzc2FnZSgpLCBleGMgKSwgdGhpcyApOyAvLyROT04tTkxTLTEkICAgICAgCiAgICAgfQogICB9CiAKLSAgcHVibGljIGJvb2xlYW4gaXNSZWxhdGl2ZSgpCisgIEBPdmVycmlkZQorcHVibGljIGJvb2xlYW4gaXNSZWxhdGl2ZSgpCiAgIHsKICAgICByZXR1cm4gZmFsc2U7CiAgIH0gICAgCmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy51aS8uY2xhc3NwYXRoIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3MudWkvLmNsYXNzcGF0aAppbmRleCAwZWEwNjEwLi5mZTQwNTUyIDEwMDY0NAotLS0gYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy51aS8uY2xhc3NwYXRoCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzLnVpLy5jbGFzc3BhdGgKQEAgLTIsNyArMiw3IEBACiA8Y2xhc3NwYXRoPgogCTxjbGFzc3BhdGhlbnRyeSBraW5kPSJzcmMiIHBhdGg9Ind0cF91aS8iLz4KIAk8Y2xhc3NwYXRoZW50cnkga2luZD0ic3JjIiBwYXRoPSJwcm9wZXJ0eV9maWxlcyIvPgotCTxjbGFzc3BhdGhlbnRyeSBraW5kPSJjb24iIHBhdGg9Im9yZy5lY2xpcHNlLmpkdC5sYXVuY2hpbmcuSlJFX0NPTlRBSU5FUi9vcmcuZWNsaXBzZS5qZHQuaW50ZXJuYWwuZGVidWcudWkubGF1bmNoZXIuU3RhbmRhcmRWTVR5cGUvSjJTRS0xLjQiLz4KKwk8Y2xhc3NwYXRoZW50cnkga2luZD0iY29uIiBwYXRoPSJvcmcuZWNsaXBzZS5qZHQubGF1bmNoaW5nLkpSRV9DT05UQUlORVIvb3JnLmVjbGlwc2UuamR0LmludGVybmFsLmRlYnVnLnVpLmxhdW5jaGVyLlN0YW5kYXJkVk1UeXBlL0oyU0UtMS41Ii8+CiAJPGNsYXNzcGF0aGVudHJ5IGtpbmQ9ImNvbiIgcGF0aD0ib3JnLmVjbGlwc2UucGRlLmNvcmUucmVxdWlyZWRQbHVnaW5zIi8+CiAJPGNsYXNzcGF0aGVudHJ5IGtpbmQ9Im91dHB1dCIgcGF0aD0iYmluIi8+CiA8L2NsYXNzcGF0aD4KZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzLnVpLy5zZXR0aW5ncy9vcmcuZWNsaXBzZS5qZHQuY29yZS5wcmVmcyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzLnVpLy5zZXR0aW5ncy9vcmcuZWNsaXBzZS5qZHQuY29yZS5wcmVmcwppbmRleCAzNDE3MTNhLi4wMzdhNGU1IDEwMDY0NAotLS0gYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy51aS8uc2V0dGluZ3Mvb3JnLmVjbGlwc2UuamR0LmNvcmUucHJlZnMKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3MudWkvLnNldHRpbmdzL29yZy5lY2xpcHNlLmpkdC5jb3JlLnByZWZzCkBAIC0xLDYyICsxLDk1IEBACi0jU2F0IE1hciAzMSAxNjo1ODo0NSBFRFQgMjAwNwotZWNsaXBzZS5wcmVmZXJlbmNlcy52ZXJzaW9uPTEKLW9yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLmNvZGVnZW4uaW5saW5lSnNyQnl0ZWNvZGU9ZW5hYmxlZAotb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIuY29kZWdlbi50YXJnZXRQbGF0Zm9ybT0xLjIKLW9yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLmNvZGVnZW4udW51c2VkTG9jYWw9cHJlc2VydmUKLW9yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLmNvbXBsaWFuY2U9MS40Ci1vcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5kZWJ1Zy5saW5lTnVtYmVyPWdlbmVyYXRlCi1vcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5kZWJ1Zy5sb2NhbFZhcmlhYmxlPWdlbmVyYXRlCi1vcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5kZWJ1Zy5zb3VyY2VGaWxlPWdlbmVyYXRlCi1vcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLmFubm90YXRpb25TdXBlckludGVyZmFjZT1pZ25vcmUKLW9yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0uYXNzZXJ0SWRlbnRpZmllcj13YXJuaW5nCi1vcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLmF1dG9ib3hpbmc9aWdub3JlCi1vcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLmRlcHJlY2F0aW9uPXdhcm5pbmcKLW9yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0uZGVwcmVjYXRpb25JbkRlcHJlY2F0ZWRDb2RlPWRpc2FibGVkCi1vcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLmRlcHJlY2F0aW9uV2hlbk92ZXJyaWRpbmdEZXByZWNhdGVkTWV0aG9kPWRpc2FibGVkCi1vcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLmVtcHR5U3RhdGVtZW50PWlnbm9yZQotb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5lbnVtSWRlbnRpZmllcj13YXJuaW5nCi1vcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLmZhbGx0aHJvdWdoQ2FzZT1pZ25vcmUKLW9yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0uZmllbGRIaWRpbmc9aWdub3JlCi1vcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLmZpbmFsUGFyYW1ldGVyQm91bmQ9aWdub3JlCi1vcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLmZpbmFsbHlCbG9ja05vdENvbXBsZXRpbmdOb3JtYWxseT1lcnJvcgotb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5mb3JiaWRkZW5SZWZlcmVuY2U9ZXJyb3IKLW9yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0uaGlkZGVuQ2F0Y2hCbG9jaz1lcnJvcgotb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5pbmNvbXBhdGlibGVOb25Jbmhlcml0ZWRJbnRlcmZhY2VNZXRob2Q9ZXJyb3IKLW9yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0uaW5jb21wbGV0ZUVudW1Td2l0Y2g9aWdub3JlCi1vcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLmluZGlyZWN0U3RhdGljQWNjZXNzPWlnbm9yZQotb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5sb2NhbFZhcmlhYmxlSGlkaW5nPWlnbm9yZQotb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5tZXRob2RXaXRoQ29uc3RydWN0b3JOYW1lPWVycm9yCi1vcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLm1pc3NpbmdEZXByZWNhdGVkQW5ub3RhdGlvbj1pZ25vcmUKLW9yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0ubWlzc2luZ092ZXJyaWRlQW5ub3RhdGlvbj1pZ25vcmUKLW9yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0ubWlzc2luZ1NlcmlhbFZlcnNpb249d2FybmluZwotb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5ub0VmZmVjdEFzc2lnbm1lbnQ9d2FybmluZwotb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5ub0ltcGxpY2l0U3RyaW5nQ29udmVyc2lvbj1lcnJvcgotb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5ub25FeHRlcm5hbGl6ZWRTdHJpbmdMaXRlcmFsPWlnbm9yZQotb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5udWxsUmVmZXJlbmNlPWlnbm9yZQotb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5vdmVycmlkaW5nUGFja2FnZURlZmF1bHRNZXRob2Q9ZXJyb3IKLW9yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0ucGFyYW1ldGVyQXNzaWdubWVudD1pZ25vcmUKLW9yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0ucG9zc2libGVBY2NpZGVudGFsQm9vbGVhbkFzc2lnbm1lbnQ9aWdub3JlCi1vcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLnJhd1R5cGVSZWZlcmVuY2U9aWdub3JlCi1vcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLnJlZHVuZGFudE51bGxDaGVjaz1pZ25vcmUKLW9yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0uc3BlY2lhbFBhcmFtZXRlckhpZGluZ0ZpZWxkPWRpc2FibGVkCi1vcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLnN0YXRpY0FjY2Vzc1JlY2VpdmVyPWVycm9yCi1vcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLnN1cHByZXNzV2FybmluZ3M9ZW5hYmxlZAotb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5zeW50aGV0aWNBY2Nlc3NFbXVsYXRpb249aWdub3JlCi1vcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLnR5cGVQYXJhbWV0ZXJIaWRpbmc9ZXJyb3IKLW9yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0udW5jaGVja2VkVHlwZU9wZXJhdGlvbj1pZ25vcmUKLW9yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0udW5kb2N1bWVudGVkRW1wdHlCbG9jaz1pZ25vcmUKLW9yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0udW5oYW5kbGVkV2FybmluZ1Rva2VuPWlnbm9yZQotb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS51bm5lY2Vzc2FyeUVsc2U9aWdub3JlCi1vcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLnVubmVjZXNzYXJ5VHlwZUNoZWNrPWlnbm9yZQotb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS51bnF1YWxpZmllZEZpZWxkQWNjZXNzPWlnbm9yZQotb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS51bnVzZWREZWNsYXJlZFRocm93bkV4Y2VwdGlvbj1pZ25vcmUKLW9yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0udW51c2VkRGVjbGFyZWRUaHJvd25FeGNlcHRpb25XaGVuT3ZlcnJpZGluZz1kaXNhYmxlZAotb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS51bnVzZWRJbXBvcnQ9ZXJyb3IKLW9yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0udW51c2VkTGFiZWw9ZXJyb3IKLW9yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0udW51c2VkTG9jYWw9aWdub3JlCi1vcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLnVudXNlZFBhcmFtZXRlcj1pZ25vcmUKKyNNb24gSnVuIDA4IDE1OjM1OjQ1IEVEVCAyMDA5CiBvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLnVudXNlZFBhcmFtZXRlcldoZW5JbXBsZW1lbnRpbmdBYnN0cmFjdD1kaXNhYmxlZAorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5jb21wYXJpbmdJZGVudGljYWw9ZXJyb3IKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0udW5uZWNlc3NhcnlFbHNlPWVycm9yCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLnJlZHVuZGFudFN1cGVyaW50ZXJmYWNlPWVycm9yCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLnVudXNlZExvY2FsPWVycm9yCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLmVtcHR5U3RhdGVtZW50PWVycm9yCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLnVudXNlZExhYmVsPWVycm9yCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLnVudXNlZFBhcmFtZXRlcj13YXJuaW5nCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLnJhd1R5cGVSZWZlcmVuY2U9d2FybmluZworb3JnLmVjbGlwc2UuamR0LmNvcmUuaW5jb21wYXRpYmxlSkRLTGV2ZWw9aWdub3JlCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLmluY29tcGF0aWJsZU5vbkluaGVyaXRlZEludGVyZmFjZU1ldGhvZD1lcnJvcgorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIuZGVidWcubGluZU51bWJlcj1nZW5lcmF0ZQorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS51bnVzZWREZWNsYXJlZFRocm93bkV4Y2VwdGlvbj13YXJuaW5nCitvcmcuZWNsaXBzZS5qZHQuY29yZS5idWlsZGVyLmNsZWFuT3V0cHV0Rm9sZGVyPWNsZWFuCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLnVudXNlZFdhcm5pbmdUb2tlbj13YXJuaW5nCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLm5vSW1wbGljaXRTdHJpbmdDb252ZXJzaW9uPWVycm9yCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLmRlcHJlY2F0aW9uSW5EZXByZWNhdGVkQ29kZT1lbmFibGVkCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLmRlcHJlY2F0aW9uPXdhcm5pbmcKIG9yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0udW51c2VkUGFyYW1ldGVyV2hlbk92ZXJyaWRpbmdDb25jcmV0ZT1kaXNhYmxlZAorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5taXNzaW5nU3luY2hyb25pemVkT25Jbmhlcml0ZWRNZXRob2Q9ZXJyb3IKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0uZGVwcmVjYXRpb25XaGVuT3ZlcnJpZGluZ0RlcHJlY2F0ZWRNZXRob2Q9ZW5hYmxlZAorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5yZWR1bmRhbnROdWxsQ2hlY2s9ZXJyb3IKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0udW51c2VkSW1wb3J0PWVycm9yCitvcmcuZWNsaXBzZS5qZHQuY29yZS5idWlsZGVyLnJlY3JlYXRlTW9kaWZpZWRDbGFzc0ZpbGVJbk91dHB1dEZvbGRlcj1pZ25vcmUKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmJ1aWxkZXIucmVzb3VyY2VDb3B5RXhjbHVzaW9uRmlsdGVyPSoubGF1bmNoCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jbGFzc3BhdGgubXVsdGlwbGVPdXRwdXRMb2NhdGlvbnM9ZW5hYmxlZAorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5zdXBwcmVzc1dhcm5pbmdzPWVuYWJsZWQKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0udHlwZVBhcmFtZXRlckhpZGluZz1lcnJvcgorb3JnLmVjbGlwc2UuamR0LmNvcmUuYnVpbGRlci5pbnZhbGlkQ2xhc3NwYXRoPWFib3J0CitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLmxvY2FsVmFyaWFibGVIaWRpbmc9d2FybmluZworb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5wb3NzaWJsZUFjY2lkZW50YWxCb29sZWFuQXNzaWdubWVudD1lcnJvcgorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5taXNzaW5nSGFzaENvZGVNZXRob2Q9ZXJyb3IKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvZGVDb21wbGV0ZS5hcmd1bWVudFN1ZmZpeGVzPQorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29kZUNvbXBsZXRlLmFyZ3VtZW50UHJlZml4ZXM9CitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLmluZGlyZWN0U3RhdGljQWNjZXNzPWlnbm9yZQorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5wb3RlbnRpYWxOdWxsUmVmZXJlbmNlPWVycm9yCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5jb2RlZ2VuLmlubGluZUpzckJ5dGVjb2RlPWVuYWJsZWQKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0uZmluYWxQYXJhbWV0ZXJCb3VuZD13YXJuaW5nCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLm1pc3NpbmdTZXJpYWxWZXJzaW9uPWVycm9yCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLm51bGxSZWZlcmVuY2U9ZXJyb3IKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnNvdXJjZT0xLjUKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0uZW51bUlkZW50aWZpZXI9ZXJyb3IKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0uc3ludGhldGljQWNjZXNzRW11bGF0aW9uPWlnbm9yZQorb3JnLmVjbGlwc2UuamR0LmNvcmUuYnVpbGRlci5kdXBsaWNhdGVSZXNvdXJjZVRhc2s9d2FybmluZworb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5maWVsZEhpZGluZz1lcnJvcgorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS51bnVzZWREZWNsYXJlZFRocm93bkV4Y2VwdGlvbkV4ZW1wdEV4Y2VwdGlvbkFuZFRocm93YWJsZT1lbmFibGVkCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLm1pc3NpbmdPdmVycmlkZUFubm90YXRpb249ZXJyb3IKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0uaGlkZGVuQ2F0Y2hCbG9jaz1lcnJvcgorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5vdmVycmlkaW5nUGFja2FnZURlZmF1bHRNZXRob2Q9ZXJyb3IKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0uZmluYWxseUJsb2NrTm90Q29tcGxldGluZ05vcm1hbGx5PWVycm9yCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLnVuZG9jdW1lbnRlZEVtcHR5QmxvY2s9d2FybmluZworb3JnLmVjbGlwc2UuamR0LmNvcmUuY2xhc3NwYXRoLmV4Y2x1c2lvblBhdHRlcm5zPWVuYWJsZWQKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0ubWV0aG9kV2l0aENvbnN0cnVjdG9yTmFtZT1lcnJvcgorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5kaXNjb3VyYWdlZFJlZmVyZW5jZT13YXJuaW5nCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLnVucXVhbGlmaWVkRmllbGRBY2Nlc3M9aWdub3JlCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLmluY29tcGxldGVFbnVtU3dpdGNoPWVycm9yCitlY2xpcHNlLnByZWZlcmVuY2VzLnZlcnNpb249MQorb3JnLmVjbGlwc2UuamR0LmNvcmUuaW5jb21wbGV0ZUNsYXNzcGF0aD1lcnJvcgorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS51bm5lY2Vzc2FyeVR5cGVDaGVjaz1lcnJvcgorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5kZWFkQ29kZT1lcnJvcgorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5zcGVjaWFsUGFyYW1ldGVySGlkaW5nRmllbGQ9ZW5hYmxlZAorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5mYXRhbE9wdGlvbmFsRXJyb3I9ZW5hYmxlZAorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5ub0VmZmVjdEFzc2lnbm1lbnQ9ZXJyb3IKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLmRlYnVnLnNvdXJjZUZpbGU9Z2VuZXJhdGUKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0udW51c2VkRGVjbGFyZWRUaHJvd25FeGNlcHRpb25JbmNsdWRlVW5jaGVja2VkRXhjZXB0aW9ucz1kaXNhYmxlZAorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5taXNzaW5nRGVwcmVjYXRlZEFubm90YXRpb249d2FybmluZworb3JnLmVjbGlwc2UuamR0LmNvcmUuY29kZUNvbXBsZXRlLmZpZWxkUHJlZml4ZXM9CitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLmZhbGx0aHJvdWdoQ2FzZT1lcnJvcgorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIuY29kZWdlbi50YXJnZXRQbGF0Zm9ybT0xLjUKIG9yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0udW51c2VkUHJpdmF0ZU1lbWJlcj1lcnJvcgotb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS52YXJhcmdzQXJndW1lbnROZWVkQ2FzdD1pZ25vcmUKLW9yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnNvdXJjZT0xLjMKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0uYXV0b2JveGluZz13YXJuaW5nCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jaXJjdWxhckNsYXNzcGF0aD1lcnJvcgorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5hbm5vdGF0aW9uU3VwZXJJbnRlcmZhY2U9d2FybmluZworb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5ub25FeHRlcm5hbGl6ZWRTdHJpbmdMaXRlcmFsPWVycm9yCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb2RlQ29tcGxldGUuZmllbGRTdWZmaXhlcz0KK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvZGVDb21wbGV0ZS5sb2NhbFN1ZmZpeGVzPQorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5wYXJhbWV0ZXJBc3NpZ25tZW50PWVycm9yCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLnN0YXRpY0FjY2Vzc1JlY2VpdmVyPWVycm9yCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb2RlQ29tcGxldGUubG9jYWxQcmVmaXhlcz0KK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0udW51c2VkRGVjbGFyZWRUaHJvd25FeGNlcHRpb25JbmNsdWRlRG9jQ29tbWVudFJlZmVyZW5jZT1lbmFibGVkCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5tYXhQcm9ibGVtUGVyVW5pdD0xMDAKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0udmFyYXJnc0FyZ3VtZW50TmVlZENhc3Q9ZXJyb3IKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0uYXNzZXJ0SWRlbnRpZmllcj1lcnJvcgorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIuY29tcGxpYW5jZT0xLjUKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0udW51c2VkUGFyYW1ldGVySW5jbHVkZURvY0NvbW1lbnRSZWZlcmVuY2U9ZW5hYmxlZAorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29kZUNvbXBsZXRlLnN0YXRpY0ZpZWxkUHJlZml4ZXM9CitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5kZWJ1Zy5sb2NhbFZhcmlhYmxlPWdlbmVyYXRlCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLnVuaGFuZGxlZFdhcm5pbmdUb2tlbj13YXJuaW5nCitpbnN0YW5jZS9vcmcuZWNsaXBzZS5jb3JlLm5ldC9vcmcuZWNsaXBzZS5jb3JlLm5ldC5oYXNNaWdyYXRlZD10cnVlCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLmZvcmJpZGRlblJlZmVyZW5jZT1lcnJvcgorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIuY29kZWdlbi51bnVzZWRMb2NhbD1wcmVzZXJ2ZQorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS51bmNoZWNrZWRUeXBlT3BlcmF0aW9uPXdhcm5pbmcKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0udW51c2VkRGVjbGFyZWRUaHJvd25FeGNlcHRpb25XaGVuT3ZlcnJpZGluZz1kaXNhYmxlZAorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29kZUNvbXBsZXRlLnN0YXRpY0ZpZWxkU3VmZml4ZXM9CmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy51aS9NRVRBLUlORi9NQU5JRkVTVC5NRiBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzLnVpL01FVEEtSU5GL01BTklGRVNULk1GCmluZGV4IDU4NTc2MzUuLjRhOWZlODkgMTAwNjQ0Ci0tLSBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzLnVpL01FVEEtSU5GL01BTklGRVNULk1GCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzLnVpL01FVEEtSU5GL01BTklGRVNULk1GCkBAIC0zLDcgKzMsNyBAQAogQnVuZGxlLU5hbWU6ICVwbHVnaW5OYW1lCiBCdW5kbGUtVmVuZG9yOiAlcHJvdmlkZXJOYW1lCiBCdW5kbGUtU3ltYm9saWNOYW1lOiBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3MudWk7IHNpbmdsZXRvbjo9dHJ1ZQotQnVuZGxlLVZlcnNpb246IDEuMS4yMDAucXVhbGlmaWVyCitCdW5kbGUtVmVyc2lvbjogMS4yLjAucXVhbGlmaWVyCiBCdW5kbGUtQWN0aXZhdG9yOiBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3MuaW50ZXJuYWwudWkuV1RQVUlQbHVnaW4KIEJ1bmRsZS1Mb2NhbGl6YXRpb246IHBsdWdpbgogRXhwb3J0LVBhY2thZ2U6IG9yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy5pbnRlcm5hbC5kYXRhbW9kZWwudWk7eC1pbnRlcm5hbDo9dHJ1ZSwKQEAgLTE2LDcgKzE2LDggQEAKICBvcmcuZWNsaXBzZS51aTtidW5kbGUtdmVyc2lvbj0iWzMuNC4wLDQuMC4wKSIsCiAgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzO2J1bmRsZS12ZXJzaW9uPSJbMS4xLjIwMCwyLjAuMCkiO3Zpc2liaWxpdHk6PXJlZXhwb3J0LAogIG9yZy5lY2xpcHNlLmNvcmUucnVudGltZTtidW5kbGUtdmVyc2lvbj0iWzMuNC4wLDQuMC4wKSIsCi0gb3JnLmVjbGlwc2UuamVtLnV0aWw7YnVuZGxlLXZlcnNpb249IlsyLjAuMTAwLDMuMC4wKSIsCi0gb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbnZpcm9ubWVudDtidW5kbGUtdmVyc2lvbj0iWzEuMC4yMDAsMi4wLjApIgorIG9yZy5lY2xpcHNlLndzdC5jb21tb24uZW52aXJvbm1lbnQ7YnVuZGxlLXZlcnNpb249IlsxLjAuMjAwLDIuMC4wKSIsCisgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb3JlO2J1bmRsZS12ZXJzaW9uPSJbMS4yLjAsMi4wLjApIiwKKyBvcmcuZWNsaXBzZS5jb3JlLmV4cHJlc3Npb25zO2J1bmRsZS12ZXJzaW9uPSJbMy40LjEwMCw0LjAuMCkiCiBFY2xpcHNlLUxhenlTdGFydDogdHJ1ZQotQnVuZGxlLVJlcXVpcmVkRXhlY3V0aW9uRW52aXJvbm1lbnQ6IEoyU0UtMS40CitCdW5kbGUtUmVxdWlyZWRFeGVjdXRpb25FbnZpcm9ubWVudDogSjJTRS0xLjUKZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzLnVpL2J1aWxkLnByb3BlcnRpZXMgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy51aS9idWlsZC5wcm9wZXJ0aWVzCmluZGV4IGZlYjczZmIuLjRkN2VmOTUgMTAwNjQ0Ci0tLSBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzLnVpL2J1aWxkLnByb3BlcnRpZXMKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3MudWkvYnVpbGQucHJvcGVydGllcwpAQCAtMTYsNSArMTYsNCBAQAogICAgICAgICAgICAgICAgYWJvdXQuaHRtbAogc291cmNlLi4gPSB3dHBfdWkvLFwKICAgICAgICAgICAgICAgICAgICAgcHJvcGVydHlfZmlsZXMvCi1zcmMuaW5jbHVkZXMgPSBzY2hlbWEvLFwKLSAgICAgICAgICAgICAgIHBsdWdpbi5wcm9wZXJ0aWVzCitzcmMuaW5jbHVkZXMgPSBzY2hlbWEvCmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy51aS9wbHVnaW4ueG1sIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3MudWkvcGx1Z2luLnhtbAppbmRleCBmMWUzYWI3Li41ZjRkMWJkIDEwMDY0NAotLS0gYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy51aS9wbHVnaW4ueG1sCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzLnVpL3BsdWdpbi54bWwKQEAgLTcsMTAgKzcsMjQgQEAKICAgIDxleHRlbnNpb24tcG9pbnQgaWQ9ImV4dGVuZGFibGVXaXphcmQiIG5hbWU9IiVFeHRlbmRhYmxlX1dpemFyZCIgc2NoZW1hPSJzY2hlbWEvZXh0ZW5kYWJsZVdpemFyZC5leHNkIi8+CiAgICA8ZXh0ZW5zaW9uLXBvaW50IGlkPSJ3aXphcmRQYWdlR3JvdXAiIG5hbWU9IiVFeHRlbmRhYmxlX1dpemFyZF9QYWdlIiBzY2hlbWE9InNjaGVtYS9leHRlbmRhYmxlV2l6YXJkUGFnZS5leHNkIi8+CiAgICA8ZXh0ZW5zaW9uLXBvaW50IGlkPSJEYXRhTW9kZWxXaXphcmRFeHRlbnNpb24iIG5hbWU9IiVEYXRhTW9kZWxXaXphcmQiIHNjaGVtYT0ic2NoZW1hL0RhdGFNb2RlbFdpemFyZEV4dGVuc2lvbi5leHNkIi8+Ci0KKwkgCSAKKwk8ZXh0ZW5zaW9uLXBvaW50IGlkPSJNZW51RW5hYmxlciIgCisJIG5hbWU9Ik1lbnVFbmFibGVyIgorCSBzY2hlbWE9InNjaGVtYS9tZW51RW5hYmxlci5leHNkIi8+CisJIAorICAgPGV4dGVuc2lvbiBwb2ludD0ib3JnLmVjbGlwc2UuY29yZS5leHByZXNzaW9ucy5wcm9wZXJ0eVRlc3RlcnMiPgorICAgIDxwcm9wZXJ0eVRlc3RlcgorICAgICAgICAgIGNsYXNzPSJvcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3MuaW50ZXJuYWwudWkuTWVudUVuYWJsZW1lbnRQcm9wZXJ0eVRlc3RlciIKKyAgICAgICAgICBpZD0ib3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzLmludGVybmFsLnVpLk1lbnVFbmFibGVtZW50UHJvcGVydHlUZXN0ZXIiCisgICAgICAgICAgbmFtZXNwYWNlPSJvcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3MuYWN0aW9ucyIKKyAgICAgICAgICBwcm9wZXJ0aWVzPSJzaG93IgorICAgICAgICAgIHR5cGU9Im9yZy5lY2xpcHNlLmNvcmUucmVzb3VyY2VzLklSZXNvdXJjZSI+CisgICAgPC9wcm9wZXJ0eVRlc3Rlcj4KKyAgPC9leHRlbnNpb24+CisgIAkgCiAgICA8ZXh0ZW5zaW9uCiAgICAgICAgICBpZD0iVUlUZXN0ZXIiCi0gICAgICAgICBwb2ludD0ib3JnLmVjbGlwc2UuamVtLnV0aWwudWlUZXN0ZXIiPgorICAgICAgICAgcG9pbnQ9Im9yZy5lY2xpcHNlLndzdC5jb21tb24uY29yZS51aVRlc3RlciI+CiAgICAgICA8dWlUZXN0ZXIKICAgICAgICAgICAgIGNsYXNzTmFtZT0ib3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzLmludGVybmFsLnVpLlVJVGVzdGVySW1wbCI+CiAgICAgICA8L3VpVGVzdGVyPgpAQCAtMTgsNyArMzIsNyBAQAogICAgPGV4dGVuc2lvbgogICAgICAgICAgaWQ9ImNvbnRleHQuU2Vuc2l0aXZlLkNsYXNzLnNhdmVIYW5kbGVyIgogICAgICAgICAgbmFtZT0iU2F2ZSBIYW5kbGVyIC0gSGVhZGxlc3MgQ29udGV4dCBDbGFzcyIKLSAgICAgICAgIHBvaW50PSJvcmcuZWNsaXBzZS5qZW0udXRpbC51aUNvbnRleHRTZW5zaXRpdmVDbGFzcyI+CisgICAgICAgICBwb2ludD0ib3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb3JlLnVpQ29udGV4dFNlbnNpdGl2ZUNsYXNzIj4KICAgICAgIDx1aUNvbnRleHRTZW5zaXRpdmVDbGFzcwogICAgICAgICAgICAga2V5PSJzYXZlSGFuZGxlciIKICAgICAgICAgICAgIGNvbnRleHQ9IlVJIgpAQCAtMjgsNyArNDIsNyBAQAogICAgPGV4dGVuc2lvbgogICAgICAgICAgaWQ9Im9yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy5pbnRlcm5hbC51aS5FbmFibGVtZW50RGV0ZXJtaW5hdGlvbiIKICAgICAgICAgIG5hbWU9IlVJIEVuYWJsZW1lbnQgRGV0ZXJtaW5hdGlvbiIKLSAgICAgICAgIHBvaW50PSJvcmcuZWNsaXBzZS5qZW0udXRpbC51aUNvbnRleHRTZW5zaXRpdmVDbGFzcyI+CisgICAgICAgICBwb2ludD0ib3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb3JlLnVpQ29udGV4dFNlbnNpdGl2ZUNsYXNzIj4KICAgICAgIDx1aUNvbnRleHRTZW5zaXRpdmVDbGFzcwogICAgICAgICAgICAga2V5PSJvcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3MuaW50ZXJuYWwuRW5hYmxlbWVudERldGVybWluYXRpb24iCiAgICAgICAgICAgICBjb250ZXh0PSJVSSIKQEAgLTUwLDcgKzY0LDcgQEAKICAgIDwvZXh0ZW5zaW9uPgogICAgLS0+CiAgICA8ZXh0ZW5zaW9uIAotICAgICAgIHBvaW50PSJvcmcuZWNsaXBzZS5qZW0udXRpbC51aUNvbnRleHRTZW5zaXRpdmVDbGFzcyI+CisgICAgICAgcG9pbnQ9Im9yZy5lY2xpcHNlLndzdC5jb21tb24uY29yZS51aUNvbnRleHRTZW5zaXRpdmVDbGFzcyI+CiAgICAgICAgPHVpQ29udGV4dFNlbnNpdGl2ZUNsYXNzCiAgICAgICAgICAga2V5PSJJU2ltcGxlVmFsaWRhdGVFZGl0Q29udGV4dCIKICAgICAgICAgICBjbGFzc05hbWU9Im9yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy5pbnRlcm5hbC51aS5TaW1wbGVWYWxpZGF0ZUVkaXRDb250ZXh0VUkiCmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy51aS9wcm9wZXJ0eV9maWxlcy9tZXNzYWdlcy5wcm9wZXJ0aWVzIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3MudWkvcHJvcGVydHlfZmlsZXMvbWVzc2FnZXMucHJvcGVydGllcwppbmRleCBmYmRlZjEyLi5lMTQxMjhkIDEwMDY0NAotLS0gYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy51aS9wcm9wZXJ0eV9maWxlcy9tZXNzYWdlcy5wcm9wZXJ0aWVzCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzLnVpL3Byb3BlcnR5X2ZpbGVzL21lc3NhZ2VzLnByb3BlcnRpZXMKQEAgLTgsNiArOCw2IEBACiAjIENvbnRyaWJ1dG9yczoKICMgICAgIElCTSBDb3Jwb3JhdGlvbiAtIGluaXRpYWwgQVBJIGFuZCBpbXBsZW1lbnRhdGlvbgogIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIwotV2l6YXJkTmV3UHJvamVjdENyZWF0aW9uUGFnZV9wcm9qZWN0Q29udGVudHNMYWJlbCA9IFByb2plY3QgY29udGVudHM6Ci1XaXphcmROZXdQcm9qZWN0Q3JlYXRpb25QYWdlX3VzZURlZmF1bHRMYWJlbCA9IFVzZSAmZGVmYXVsdAotV2l6YXJkTmV3UHJvamVjdENyZWF0aW9uUGFnZV9sb2NhdGlvbkxhYmVsID0gRGlyZWN0b3ImeToKXCBObyBuZXdsaW5lIGF0IGVuZCBvZiBmaWxlCitXaXphcmROZXdQcm9qZWN0Q3JlYXRpb25QYWdlX3Byb2plY3RDb250ZW50c0xhYmVsID0gUHJvamVjdCBsb2NhdGlvbgorV2l6YXJkTmV3UHJvamVjdENyZWF0aW9uUGFnZV91c2VEZWZhdWx0TGFiZWwgPSBVc2UgJmRlZmF1bHQgbG9jYXRpb24KK1dpemFyZE5ld1Byb2plY3RDcmVhdGlvblBhZ2VfbG9jYXRpb25MYWJlbCA9ICZMb2NhdGlvbjoKXCBObyBuZXdsaW5lIGF0IGVuZCBvZiBmaWxlCmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy51aS9wcm9wZXJ0eV9maWxlcy93dHBjb21tb251aS5wcm9wZXJ0aWVzIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3MudWkvcHJvcGVydHlfZmlsZXMvd3RwY29tbW9udWkucHJvcGVydGllcwppbmRleCBkYzY2MWI4Li5kMzVlYTAwIDEwMDY0NAotLS0gYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy51aS9wcm9wZXJ0eV9maWxlcy93dHBjb21tb251aS5wcm9wZXJ0aWVzCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzLnVpL3Byb3BlcnR5X2ZpbGVzL3d0cGNvbW1vbnVpLnByb3BlcnRpZXMKQEAgLTMxLDcgKzMxLDggQEAKIFdpemFyZFBhZ2VFeHRlbnNpb25NYW5hZ2VyX1VJXzM9RWRpdG9yIGRvZXMgbm90IGFsbG93IHBhZ2UgaW5zZXJ0aW9ucwogV2l6YXJkUGFnZUV4dGVuc2lvbk1hbmFnZXJfVUlfND1QYXJlbnQgQ2xhc3MgTm90IEZvdW5kIEVycm9yOiB7MH0gXHJcbiBmb3IgYXR0cmlidXRlOiB7MX0gaW4gcGx1Z2luIHsyfSBcclxuUGFnZSBub3QgY3JlYXRlZAogRGVsZXRlX1VJXzA9RGVsZXRlCi1OYW1lXz1Qcm9qZWN0IG5hbWU6Ci1Ccm93c2VfPUJyb3dzZS4uLgorTmFtZV89UHJvamVjdCBuYSZtZToKK0Jyb3dzZV89QnJvdyZzZS4uLgogUHJvamVjdF9sb2NhdGlvbl89UHJvamVjdCBMb2NhdGlvbjoKIE1VTFRJUExFX01PRFVMRV9QUkVGX1RFWFQ9QWxsb3cgTXVsdGlwbGUgbW9kdWxlcyBwZXIgcHJvamVjdAorRGVmRGlyRGlhbG9nTGFiZWxfPVNlbGVjdCB0aGUgbG9jYXRpb24gZGlyZWN0b3J5LgpcIE5vIG5ld2xpbmUgYXQgZW5kIG9mIGZpbGUKZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzLnVpL3NjaGVtYS9tZW51RW5hYmxlci5leHNkIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3MudWkvc2NoZW1hL21lbnVFbmFibGVyLmV4c2QKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uMzMyZjEwNQotLS0gL2Rldi9udWxsCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzLnVpL3NjaGVtYS9tZW51RW5hYmxlci5leHNkCkBAIC0wLDAgKzEsMTA2IEBACis8P3htbCB2ZXJzaW9uPScxLjAnIGVuY29kaW5nPSdVVEYtOCc/PgorPCEtLSBTY2hlbWEgZmlsZSB3cml0dGVuIGJ5IFBERSAtLT4KKzxzY2hlbWEgdGFyZ2V0TmFtZXNwYWNlPSJvcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3MudWkiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAxL1hNTFNjaGVtYSI+Cis8YW5ub3RhdGlvbj4KKyAgICAgIDxhcHBJbmZvPgorICAgICAgICAgPG1ldGEuc2NoZW1hIHBsdWdpbj0ib3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzLnVpIiBpZD0iTWVudUVuYWJsZXIiIG5hbWU9Ik1lbnVFbmFibGVyIi8+CisgICAgICA8L2FwcEluZm8+CisgICAgICA8ZG9jdW1lbnRhdGlvbj4KKyAgICAgICAgIERlZmluZXMgZXh0ZW5zaW9uIHBvaW50IGZvciBzZXR0aW5nIGVuYWJsZW1lbnQgY29uZGl0aW9uIGZvciBhIG1lbnUgaXRlbS4gVGhpcyBleHRlbnNpb24gcG9pbnQgaXMgdXNlZCBpbgorb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzLmludGVybmFsLnVpLk1lbnVFbmFibGVtZW50UHJvcGVydHlUZXN0ZXIuCisgICAgICA8L2RvY3VtZW50YXRpb24+CisgICA8L2Fubm90YXRpb24+CisKKyAgIDxlbGVtZW50IG5hbWU9ImV4dGVuc2lvbiI+CisgICAgICA8YW5ub3RhdGlvbj4KKyAgICAgICAgIDxhcHBJbmZvPgorICAgICAgICAgICAgPG1ldGEuZWxlbWVudCAvPgorICAgICAgICAgPC9hcHBJbmZvPgorICAgICAgPC9hbm5vdGF0aW9uPgorICAgICAgPGNvbXBsZXhUeXBlPgorICAgICAgICAgPHNlcXVlbmNlPgorICAgICAgICAgICAgPGVsZW1lbnQgcmVmPSJtZW51ZW5hYmxlciIvPgorICAgICAgICAgPC9zZXF1ZW5jZT4KKyAgICAgICAgIDxhdHRyaWJ1dGUgbmFtZT0icG9pbnQiIHR5cGU9InN0cmluZyIgdXNlPSJyZXF1aXJlZCI+CisgICAgICAgICAgICA8YW5ub3RhdGlvbj4KKyAgICAgICAgICAgICAgIDxkb2N1bWVudGF0aW9uPgorICAgICAgICAgICAgICAgICAgCisgICAgICAgICAgICAgICA8L2RvY3VtZW50YXRpb24+CisgICAgICAgICAgICA8L2Fubm90YXRpb24+CisgICAgICAgICA8L2F0dHJpYnV0ZT4KKyAgICAgICAgIDxhdHRyaWJ1dGUgbmFtZT0iaWQiIHR5cGU9InN0cmluZyI+CisgICAgICAgICAgICA8YW5ub3RhdGlvbj4KKyAgICAgICAgICAgICAgIDxkb2N1bWVudGF0aW9uPgorICAgICAgICAgICAgICAgICAgCisgICAgICAgICAgICAgICA8L2RvY3VtZW50YXRpb24+CisgICAgICAgICAgICA8L2Fubm90YXRpb24+CisgICAgICAgICA8L2F0dHJpYnV0ZT4KKyAgICAgICAgIDxhdHRyaWJ1dGUgbmFtZT0ibmFtZSIgdHlwZT0ic3RyaW5nIj4KKyAgICAgICAgICAgIDxhbm5vdGF0aW9uPgorICAgICAgICAgICAgICAgPGRvY3VtZW50YXRpb24+CisgICAgICAgICAgICAgICAgICBPcHRpb25hbCBuYW1lIGZvciB0aGUgZXh0ZW5zaW9uIHBvaW50CisgICAgICAgICAgICAgICA8L2RvY3VtZW50YXRpb24+CisgICAgICAgICAgICAgICA8YXBwSW5mbz4KKyAgICAgICAgICAgICAgICAgIDxtZXRhLmF0dHJpYnV0ZSB0cmFuc2xhdGFibGU9InRydWUiLz4KKyAgICAgICAgICAgICAgIDwvYXBwSW5mbz4KKyAgICAgICAgICAgIDwvYW5ub3RhdGlvbj4KKyAgICAgICAgIDwvYXR0cmlidXRlPgorICAgICAgPC9jb21wbGV4VHlwZT4KKyAgIDwvZWxlbWVudD4KKworICAgPGVsZW1lbnQgbmFtZT0ibWVudWVuYWJsZXIiPgorICAgICAgPGNvbXBsZXhUeXBlPgorICAgICAgICAgPGF0dHJpYnV0ZSBuYW1lPSJjbGFzc05hbWUiIHR5cGU9InN0cmluZyIgdXNlPSJyZXF1aXJlZCI+CisgICAgICAgICAgICA8YW5ub3RhdGlvbj4KKyAgICAgICAgICAgICAgIDxkb2N1bWVudGF0aW9uPgorICAgICAgICAgICAgICAgICAgVGhlIGNsYXNzTmFtZSBpcyBhbiBpbXBsZW1lbnRhdGlvbiBvZiBpbnRlcmZhY2UgSVByb3BlcnR5VGVzdGVyCisgICAgICAgICAgICAgICA8L2RvY3VtZW50YXRpb24+CisgICAgICAgICAgICA8L2Fubm90YXRpb24+CisgICAgICAgICA8L2F0dHJpYnV0ZT4KKyAgICAgIDwvY29tcGxleFR5cGU+CisgICA8L2VsZW1lbnQ+CisKKyAgIDxhbm5vdGF0aW9uPgorICAgICAgPGFwcEluZm8+CisgICAgICAgICA8bWV0YS5zZWN0aW9uIHR5cGU9InNpbmNlIi8+CisgICAgICA8L2FwcEluZm8+CisgICAgICA8ZG9jdW1lbnRhdGlvbj4KKyAgICAgICAgIDMuMiBNNgorICAgICAgPC9kb2N1bWVudGF0aW9uPgorICAgPC9hbm5vdGF0aW9uPgorCisgICA8YW5ub3RhdGlvbj4KKyAgICAgIDxhcHBJbmZvPgorICAgICAgICAgPG1ldGEuc2VjdGlvbiB0eXBlPSJleGFtcGxlcyIvPgorICAgICAgPC9hcHBJbmZvPgorICAgICAgPGRvY3VtZW50YXRpb24+CisgICAgICAgICAmbHQ7ZXh0ZW5zaW9uCisgICAgcG9pbnQ9JnF1b3Q7b3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzLnVpLk1lbnVFbmFibGVyJnF1b3Q7Jmd0OworICAgICAmbHQ7bWVudWVuYWJsZXIKKyAgICAgICAgIGNsYXNzTmFtZT0mcXVvdDtvcmcuZWNsaXBzZS5mb28uQmFyUHJvcGVydHlUZXN0ZXImcXVvdDsmZ3Q7CisgICAgICZsdDsvbWVudWVuYWJsZXImZ3Q7CismbHQ7L2V4dGVuc2lvbiZndDsKKworVGhlIGNsYXNzIHNwZWNpZmllZCBpbiBjbGFzc05hbWUgc2hvdWxkIGltcGxlbWVudCBJUHJvcGVydHlUZXN0ZXIgaW50ZXJmYWNlCisgICAgICA8L2RvY3VtZW50YXRpb24+CisgICA8L2Fubm90YXRpb24+CisKKworCisgICA8YW5ub3RhdGlvbj4KKyAgICAgIDxhcHBJbmZvPgorICAgICAgICAgPG1ldGEuc2VjdGlvbiB0eXBlPSJjb3B5cmlnaHQiLz4KKyAgICAgIDwvYXBwSW5mbz4KKyAgICAgIDxkb2N1bWVudGF0aW9uPgorICAgICAgICAgQ29weXJpZ2h0IChjKSAyMDEwIElCTSBDb3Jwb3JhdGlvbiBhbmQgb3RoZXJzLgorICBBbGwgcmlnaHRzIHJlc2VydmVkLiBUaGlzIHByb2dyYW0gYW5kIHRoZSBhY2NvbXBhbnlpbmcgbWF0ZXJpYWxzCisgIGFyZSBtYWRlIGF2YWlsYWJsZSB1bmRlciB0aGUgdGVybXMgb2YgdGhlIEVjbGlwc2UgUHVibGljIExpY2Vuc2UgdjEuMAorICB3aGljaCBhY2NvbXBhbmllcyB0aGlzIGRpc3RyaWJ1dGlvbiwgYW5kIGlzIGF2YWlsYWJsZSBhdAorICBodHRwOi8vd3d3LmVjbGlwc2Uub3JnL2xlZ2FsL2VwbC12MTAuaHRtbAorIAorICBDb250cmlidXRvcnM6CisgICAgICBJQk0gQ29ycG9yYXRpb24gLSBpbml0aWFsIEFQSSBhbmQgaW1wbGVtZW50YXRpb24KKyAgICAgIDwvZG9jdW1lbnRhdGlvbj4KKyAgIDwvYW5ub3RhdGlvbj4KKworPC9zY2hlbWE+CmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy51aS93dHBfdWkvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9mcmFtZXdvcmtzL2ludGVybmFsL2RhdGFtb2RlbC91aS9EYXRhTW9kZWxTeW5jaEhlbHBlci5qYXZhIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3MudWkvd3RwX3VpL29yZy9lY2xpcHNlL3dzdC9jb21tb24vZnJhbWV3b3Jrcy9pbnRlcm5hbC9kYXRhbW9kZWwvdWkvRGF0YU1vZGVsU3luY2hIZWxwZXIuamF2YQppbmRleCBhMGVkMjc3Li40ZjE4YWJiIDEwMDY0NAotLS0gYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy51aS93dHBfdWkvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9mcmFtZXdvcmtzL2ludGVybmFsL2RhdGFtb2RlbC91aS9EYXRhTW9kZWxTeW5jaEhlbHBlci5qYXZhCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzLnVpL3d0cF91aS9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ZyYW1ld29ya3MvaW50ZXJuYWwvZGF0YW1vZGVsL3VpL0RhdGFNb2RlbFN5bmNoSGVscGVyLmphdmEKQEAgLTU0Niw2ICs1NDYsNyBAQAogCQkJCQlzZXRUZXh0UHJvcGVydHkocHJvcGVydHlOYW1lLCAoVGV4dCkgdyk7CiAJCQkJfQogCQkJfSkgeworCQkJCUBPdmVycmlkZQogCQkJCXB1YmxpYyB2b2lkIG1vZGlmeVRleHQoTW9kaWZ5RXZlbnQgZSkgewogCQkJCQlpZiAoaWdub3JlTW9kaWZ5RXZlbnQpCiAJCQkJCQlyZXR1cm47CmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy51aS93dHBfdWkvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9mcmFtZXdvcmtzL2ludGVybmFsL2RhdGFtb2RlbC91aS9EYXRhTW9kZWxXaXphcmQuamF2YSBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzLnVpL3d0cF91aS9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ZyYW1ld29ya3MvaW50ZXJuYWwvZGF0YW1vZGVsL3VpL0RhdGFNb2RlbFdpemFyZC5qYXZhCmluZGV4IDFhNmNiZjMuLjdiZGJiZTAgMTAwNjQ0Ci0tLSBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzLnVpL3d0cF91aS9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ZyYW1ld29ya3MvaW50ZXJuYWwvZGF0YW1vZGVsL3VpL0RhdGFNb2RlbFdpemFyZC5qYXZhCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzLnVpL3d0cF91aS9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ZyYW1ld29ya3MvaW50ZXJuYWwvZGF0YW1vZGVsL3VpL0RhdGFNb2RlbFdpemFyZC5qYXZhCkBAIC0xOSw3ICsxOSw2IEBACiBpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5ydW50aW1lLklQcm9ncmVzc01vbml0b3I7CiBpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5ydW50aW1lLklTdGF0dXM7CiBpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5ydW50aW1lLlN0YXR1czsKLWltcG9ydCBvcmcuZWNsaXBzZS5qZW0udXRpbC5sb2dnZXIucHJveHkuTG9nZ2VyOwogaW1wb3J0IG9yZy5lY2xpcHNlLmpmYWNlLm9wZXJhdGlvbi5JUnVubmFibGVXaXRoUHJvZ3Jlc3M7CiBpbXBvcnQgb3JnLmVjbGlwc2UuamZhY2Uud2l6YXJkLklXaXphcmRQYWdlOwogaW1wb3J0IG9yZy5lY2xpcHNlLmpmYWNlLndpemFyZC5XaXphcmQ7CkBAIC03OCw2ICs3Nyw3IEBACiAJICogVGhpcyBpcyBmaW5hbGl6ZWQgdG8gaGFuZGxlIHRoZSBhZGRpbmcgb2YgZXh0ZW5kZWQgcGFnZXMuIENsaWVudHMgc2hvdWxkIG92ZXJyaWRlCiAJICogZG9BZGRQYWdlcygpIHRvIGFkZCB0aGVpciBwYWdlcy4KIAkgKi8KKwlAT3ZlcnJpZGUKIAlwdWJsaWMgZmluYWwgdm9pZCBhZGRQYWdlcygpIHsKIAkJaW5pdCgpOwogCQlkb0FkZFBhZ2VzKCk7CkBAIC05MCw2ICs5MCw3IEBACiAJfQogCiAJLy8gVE9ETyBtYWtlIHRoaXMgZmluYWwKKwlAT3ZlcnJpZGUKIAlwdWJsaWMgSVdpemFyZFBhZ2UgZ2V0U3RhcnRpbmdQYWdlKCkgewogCQlwYWdlR3JvdXBNYW5hZ2VyLnJlc2V0KCk7CiAJCXJldHVybiBnZXROZXh0UGFnZShudWxsKTsKQEAgLTEwMyw2ICsxMDQsNyBAQAogCSAqIEBsaW5rICNnZXRQcmV2aW91c1BhZ2UoU3RyaW5nLCBTdHJpbmcpCiAJICovCiAJLy8gVE9ETyBtYWtlIHRoaXMgZmluYWwKKwlAT3ZlcnJpZGUKIAlwdWJsaWMgSVdpemFyZFBhZ2UgZ2V0TmV4dFBhZ2UoSVdpemFyZFBhZ2UgcGFnZSkgewogCiAJCUlXaXphcmRQYWdlIGN1cnJlbnRQYWdlID0gcGFnZUdyb3VwTWFuYWdlci5nZXRDdXJyZW50UGFnZSgpOwpAQCAtMTMyLDYgKzEzNCw3IEBACiAJICogQGxpbmsgI2dldFByZXZpb3VzUGFnZShTdHJpbmcsIFN0cmluZykKIAkgKi8KIAkvLyBUT0RPIG1ha2UgdGhpcyBmaW5hbAorCUBPdmVycmlkZQogCXB1YmxpYyBJV2l6YXJkUGFnZSBnZXRQcmV2aW91c1BhZ2UoSVdpemFyZFBhZ2UgcGFnZSkgewogCQlyZXR1cm4gcGFnZSAhPSBudWxsID8gcGFnZS5nZXRQcmV2aW91c1BhZ2UoKSA6IG51bGw7CiAJfQpAQCAtMTQwLDYgKzE0Myw3IEBACiAJCXJldHVybiBleHBlY3RlZFByZXZpb3VzUGFnZU5hbWU7CiAJfQogCisJQE92ZXJyaWRlCiAJcHVibGljIGJvb2xlYW4gY2FuRmluaXNoKCkgewogCQlpZiAoIXN1cGVyLmNhbkZpbmlzaCgpIHx8ICFnZXREYXRhTW9kZWwoKS5pc1ZhbGlkKCkpIHsKIAkJCXJldHVybiBmYWxzZTsKQEAgLTE3Nyw2ICsxODEsNyBAQAogCSAqIAogCSAqIEBzZWUgb3JnLmVjbGlwc2UuamZhY2Uud2l6YXJkLklXaXphcmQjcGVyZm9ybUZpbmlzaCgpCiAJICovCisJQE92ZXJyaWRlCiAJcHVibGljIGZpbmFsIGJvb2xlYW4gcGVyZm9ybUZpbmlzaCgpIHsKIAkJdHJ5IHsKIAkJCWV4ZWN1dGluZyA9IHRydWU7CkBAIC0xODcsNyArMTkyLDggQEAKIAogCQkJCWlmIChzdC5nZXRTZXZlcml0eSgpID09IElTdGF0dXMuRVJST1IpIHsKIAkJCQkJV1RQVUlQbHVnaW4ubG9nKHN0KTsKLQkJCQkJRXJyb3JEaWFsb2cub3BlbkVycm9yKGdldFNoZWxsKCksIFdUUENvbW1vblVJUmVzb3VyY2VIYW5kbGVyLmdldFN0cmluZyhXVFBDb21tb25VSVJlc291cmNlSGFuZGxlci5XVFBXaXphcmRfVUlfMCwgbmV3IE9iamVjdFtde2dldFdpbmRvd1RpdGxlKCl9KSwgV1RQQ29tbW9uVUlSZXNvdXJjZUhhbmRsZXIuZ2V0U3RyaW5nKFdUUENvbW1vblVJUmVzb3VyY2VIYW5kbGVyLldUUFdpemFyZF9VSV8xLCBuZXcgT2JqZWN0W117Z2V0V2luZG93VGl0bGUoKX0pLCBuZXcgQ29yZUV4Y2VwdGlvbihzdCksIDAsIGZhbHNlKTsKKwkJCQkJVGhyb3dhYmxlIHQgPSBzdC5nZXRFeGNlcHRpb24oKSA9PSBudWxsID8gbmV3IENvcmVFeGNlcHRpb24oc3QpIDogc3QuZ2V0RXhjZXB0aW9uKCk7CisJCQkJCUVycm9yRGlhbG9nLm9wZW5FcnJvcihnZXRTaGVsbCgpLCBXVFBDb21tb25VSVJlc291cmNlSGFuZGxlci5nZXRTdHJpbmcoV1RQQ29tbW9uVUlSZXNvdXJjZUhhbmRsZXIuV1RQV2l6YXJkX1VJXzAsIG5ldyBPYmplY3RbXXtnZXRXaW5kb3dUaXRsZSgpfSksIFdUUENvbW1vblVJUmVzb3VyY2VIYW5kbGVyLmdldFN0cmluZyhXVFBDb21tb25VSVJlc291cmNlSGFuZGxlci5XVFBXaXphcmRfVUlfMSwgbmV3IE9iamVjdFtde2dldFdpbmRvd1RpdGxlKCl9KSwgdCwgMCwgZmFsc2UpOwogCQkJCX0gZWxzZSBpZihzdC5nZXRTZXZlcml0eSgpID09IElTdGF0dXMuV0FSTklORyl7CiAJCQkJCVdhcm5pbmdEaWFsb2cub3Blbldhcm5pbmcoZ2V0U2hlbGwoKSwgV1RQQ29tbW9uVUlSZXNvdXJjZUhhbmRsZXIuZ2V0U3RyaW5nKFdUUENvbW1vblVJUmVzb3VyY2VIYW5kbGVyLldUUFdpemFyZF9VSV8yLCBuZXcgT2JqZWN0W117Z2V0V2luZG93VGl0bGUoKX0pLCBzdC5nZXRNZXNzYWdlKCksIHN0LCBJU3RhdHVzLldBUk5JTkcpOwogCQkJCX0KQEAgLTIzMCwxMyArMjM2LDE0IEBACiAJCQlydW5uYWJsZS5jYXVnaHQgPSBlOwogCQl9CiAJCWlmIChydW5uYWJsZS5jYXVnaHQgIT0gbnVsbCkgewotCQkJTG9nZ2VyLmdldExvZ2dlcigpLmxvZ0Vycm9yKHJ1bm5hYmxlLmNhdWdodCk7CisJCQlXVFBVSVBsdWdpbi5sb2dFcnJvcihydW5uYWJsZS5jYXVnaHQpOwogCQkJc3RhdHVzWzBdID0gbmV3IFN0YXR1cyhJU3RhdHVzLkVSUk9SLCAiaWQiLCAwLCBydW5uYWJsZS5jYXVnaHQuZ2V0TWVzc2FnZSgpLCBydW5uYWJsZS5jYXVnaHQpOyAvLyROT04tTkxTLTEkCiAJCQlFcnJvckRpYWxvZy5vcGVuRXJyb3IoZ2V0U2hlbGwoKSwgV1RQQ29tbW9uVUlSZXNvdXJjZUhhbmRsZXIuZ2V0U3RyaW5nKFdUUENvbW1vblVJUmVzb3VyY2VIYW5kbGVyLldUUFdpemFyZF9VSV8wLCBuZXcgT2JqZWN0W117Z2V0V2luZG93VGl0bGUoKX0pLCBXVFBDb21tb25VSVJlc291cmNlSGFuZGxlci5nZXRTdHJpbmcoV1RQQ29tbW9uVUlSZXNvdXJjZUhhbmRsZXIuV1RQV2l6YXJkX1VJXzEsIG5ldyBPYmplY3RbXXtnZXRXaW5kb3dUaXRsZSgpfSksIHJ1bm5hYmxlLmNhdWdodCwgMCwgZmFsc2UpOwogCQl9CiAJCXJldHVybiBzdGF0dXNbMF07CiAJfQogCisJQE92ZXJyaWRlCiAJcHVibGljIGJvb2xlYW4gcGVyZm9ybUNhbmNlbCgpIHsKIAkJcGFnZUdyb3VwTWFuYWdlci51bmRvQWxsQ3VycmVudE9wZXJhdGlvbnMoKTsKIApAQCAtMzE0LDYgKzMyMSw3IEBACiAJCXJldHVybiBkYXRhTW9kZWw7CiAJfQogCisJQE92ZXJyaWRlCiAJcHVibGljIHZvaWQgZGlzcG9zZSgpIHsKIAkJc3VwZXIuZGlzcG9zZSgpOwogCQlpZiAobnVsbCAhPSByb290UGFnZUdyb3VwKSB7CkBAIC0zNTUsNiArMzYzLDcgQEAKIAkJcmV0dXJuIG5ldyBFY2xpcHNlRW52aXJvbm1lbnQoKTsKIAl9CiAKKwlAT3ZlcnJpZGUKIAlwdWJsaWMgdm9pZCBhZGRQYWdlKElXaXphcmRQYWdlIHBhZ2UpIHsKIAkJcm9vdFBhZ2VHcm91cC5hZGRQYWdlKHBhZ2UpOwogCX0KQEAgLTM4MCw2ICszODksNyBAQAogCQlyZXR1cm4gZmFsc2U7CiAJfQogCisJQE92ZXJyaWRlCiAJcHVibGljIGJvb2xlYW4gbmVlZHNQcmV2aW91c0FuZE5leHRCdXR0b25zKCkgewogCQlyZXR1cm4gc3VwZXIubmVlZHNQcmV2aW91c0FuZE5leHRCdXR0b25zKCkgfHwgZ2V0UGFnZUdyb3VwTWFuYWdlcigpLmhhc011bHRpcGxlUGFnZXMoKTsKIAl9CmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy51aS93dHBfdWkvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9mcmFtZXdvcmtzL2ludGVybmFsL2RhdGFtb2RlbC91aS9EYXRhTW9kZWxXaXphcmRQYWdlLmphdmEgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy51aS93dHBfdWkvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9mcmFtZXdvcmtzL2ludGVybmFsL2RhdGFtb2RlbC91aS9EYXRhTW9kZWxXaXphcmRQYWdlLmphdmEKaW5kZXggNTc3YmY1ZC4uNjI2ZDc1YyAxMDA2NDQKLS0tIGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3MudWkvd3RwX3VpL29yZy9lY2xpcHNlL3dzdC9jb21tb24vZnJhbWV3b3Jrcy9pbnRlcm5hbC9kYXRhbW9kZWwvdWkvRGF0YU1vZGVsV2l6YXJkUGFnZS5qYXZhCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzLnVpL3d0cF91aS9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ZyYW1ld29ya3MvaW50ZXJuYWwvZGF0YW1vZGVsL3VpL0RhdGFNb2RlbFdpemFyZFBhZ2UuamF2YQpAQCAtMTI4LDYgKzEyOCw3IEBACiAJCX0KIAl9CiAKKwlAT3ZlcnJpZGUKIAlwdWJsaWMgYm9vbGVhbiBjYW5GbGlwVG9OZXh0UGFnZSgpIHsKIAkJLy8gVE9ETyB3aHkgaXMgdGhhdCBsYXN0IGdldE5leHRQYWdlKCkgY2FsbCBoZXJlPz8/CiAJCXJldHVybiBpc1BhZ2VDb21wbGV0ZSgpICYmICgobnVsbCAhPSB3aXphcmQgJiYgd2l6YXJkLmdldFBhZ2VHcm91cE1hbmFnZXIoKS5oYXNOZXh0UGFnZSgpIHx8IG51bGwgIT0gZ2V0TmV4dFBhZ2UoKSkpOwpAQCAtMTM2LDYgKzEzNyw3IEBACiAJLyoKIAkgKiAobm9uLUphdmFkb2MpIE1ldGhvZCBkZWNsYXJlZCBvbiBJV2l6YXJkUGFnZS4KIAkgKi8KKwlAT3ZlcnJpZGUKIAlwdWJsaWMgdm9pZCBzZXRXaXphcmQoSVdpemFyZCBuZXdXaXphcmQpIHsKIAkJc3VwZXIuc2V0V2l6YXJkKG5ld1dpemFyZCk7CiAJCWlmIChuZXdXaXphcmQgaW5zdGFuY2VvZiBEYXRhTW9kZWxXaXphcmQpIHsKQEAgLTE0MywxMCArMTQ1LDEyIEBACiAJCX0KIAl9CiAKKwlAT3ZlcnJpZGUKIAlwdWJsaWMgSVdpemFyZFBhZ2UgZ2V0UHJldmlvdXNQYWdlKCkgewogCQlyZXR1cm4gcHJldmlvdXNQYWdlOwogCX0KIAorCUBPdmVycmlkZQogCXB1YmxpYyB2b2lkIHNldFByZXZpb3VzUGFnZShJV2l6YXJkUGFnZSBwYWdlKSB7CiAJCXN1cGVyLnNldFByZXZpb3VzUGFnZShwYWdlKTsKIAkJcHJldmlvdXNQYWdlID0gcGFnZTsKQEAgLTMwMSw2ICszMDUsNyBAQAogCSAqIHRoZSBjb250cm9sIHRvIHRoZSBnaXZlbiB2aXNpYmlsaXR5IHN0YXRlLiBTdWJjbGFzc2VzIG1heSBleHRlbmQuCiAJICovCiAKKwlAT3ZlcnJpZGUKIAlwdWJsaWMgdm9pZCBzZXRWaXNpYmxlKGJvb2xlYW4gdmlzaWJsZSkgewogCQlzdXBlci5zZXRWaXNpYmxlKHZpc2libGUpOwogCQlpZiAodmlzaWJsZSkgewpAQCAtNDY4LDggKzQ3MywxMiBAQAogCQlyZXR1cm4gbW9kZWw7CiAJfQogCisJQE92ZXJyaWRlCiAJcHVibGljIHZvaWQgZGlzcG9zZSgpIHsKIAkJc3VwZXIuZGlzcG9zZSgpOworCQlpZiAobW9kZWwgIT0gbnVsbCkgeworCQkJbW9kZWwucmVtb3ZlTGlzdGVuZXIodGhpcyk7CisJCX0KIAkJaWYgKHN5bmNoSGVscGVyICE9IG51bGwpIHsKIAkJCXN5bmNoSGVscGVyLmRpc3Bvc2UoKTsKIAkJCXN5bmNoSGVscGVyID0gbnVsbDsKZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzLnVpL3d0cF91aS9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ZyYW1ld29ya3MvaW50ZXJuYWwvZGF0YW1vZGVsL3VpL1BhZ2VFeHRlbnNpb25NYW5hZ2VyLmphdmEgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy51aS93dHBfdWkvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9mcmFtZXdvcmtzL2ludGVybmFsL2RhdGFtb2RlbC91aS9QYWdlRXh0ZW5zaW9uTWFuYWdlci5qYXZhCmluZGV4IGZmMmVhOGMuLjgwNDIxMTkgMTAwNjQ0Ci0tLSBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzLnVpL3d0cF91aS9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ZyYW1ld29ya3MvaW50ZXJuYWwvZGF0YW1vZGVsL3VpL1BhZ2VFeHRlbnNpb25NYW5hZ2VyLmphdmEKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3MudWkvd3RwX3VpL29yZy9lY2xpcHNlL3dzdC9jb21tb24vZnJhbWV3b3Jrcy9pbnRlcm5hbC9kYXRhbW9kZWwvdWkvUGFnZUV4dGVuc2lvbk1hbmFnZXIuamF2YQpAQCAtODcsNyArODcsNyBAQAogCQlJRXh0ZW5zaW9uUG9pbnQgcG9pbnQgPSBQbGF0Zm9ybS5nZXRFeHRlbnNpb25SZWdpc3RyeSgpLmdldEV4dGVuc2lvblBvaW50KENvbW1vblVJUGx1Z2luQ29uc3RhbnRzLlBMVUdJTl9JRCwgUE9JTlRfV0laQVJEX1BBR0VfR1JPVVApOwogCQlJQ29uZmlndXJhdGlvbkVsZW1lbnRbXSBhbGxFbGVtZW50cyA9IHBvaW50LmdldENvbmZpZ3VyYXRpb25FbGVtZW50cygpOwogCQlmb3IgKGludCBpID0gMDsgaSA8IGFsbEVsZW1lbnRzLmxlbmd0aDsgaSsrKSB7Ci0JCQlJQ29uZmlndXJhdGlvbkVsZW1lbnQgZWxlbWVudCA9IChJQ29uZmlndXJhdGlvbkVsZW1lbnQpIGFsbEVsZW1lbnRzW2ldOworCQkJSUNvbmZpZ3VyYXRpb25FbGVtZW50IGVsZW1lbnQgPSBhbGxFbGVtZW50c1tpXTsKIAkJCWlmIChFTEVNRU5UX1dJWkFSRF9QQUdFLmVxdWFscyhlbGVtZW50LmdldE5hbWUoKSkpIHsKIAkJCQlyZXN1bHQuYWRkKG5ldyBETVdpemFyZFBhZ2VFbGVtZW50KGVsZW1lbnQpKTsKIAkJCX0KZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzLnVpL3d0cF91aS9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ZyYW1ld29ya3MvaW50ZXJuYWwvZGlhbG9nL3VpL0Vycm9yRGlhbG9nLmphdmEgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy51aS93dHBfdWkvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9mcmFtZXdvcmtzL2ludGVybmFsL2RpYWxvZy91aS9FcnJvckRpYWxvZy5qYXZhCmluZGV4IDYyMGQxMzYuLmQxODZmOTYgMTAwNjQ0Ci0tLSBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzLnVpL3d0cF91aS9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ZyYW1ld29ya3MvaW50ZXJuYWwvZGlhbG9nL3VpL0Vycm9yRGlhbG9nLmphdmEKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3MudWkvd3RwX3VpL29yZy9lY2xpcHNlL3dzdC9jb21tb24vZnJhbWV3b3Jrcy9pbnRlcm5hbC9kaWFsb2cvdWkvRXJyb3JEaWFsb2cuamF2YQpAQCAtNjcsNyArNjcsOCBAQAogICAvKgogICAgKiAobm9uLUphdmFkb2MpIFRoaXMgc2hvdWxkIGFsc28gYmUgb3ZlcndyaXR0ZW4gTWV0aG9kIGRlY2xhcmVkIG9uIERpYWxvZy4KICAgICovCi0gIHByb3RlY3RlZCB2b2lkIGNyZWF0ZUJ1dHRvbnNGb3JCdXR0b25CYXIoQ29tcG9zaXRlIHBhcmVudCkKKyAgQE92ZXJyaWRlCitwcm90ZWN0ZWQgdm9pZCBjcmVhdGVCdXR0b25zRm9yQnV0dG9uQmFyKENvbXBvc2l0ZSBwYXJlbnQpCiAgIHsKICAgICAvLyBjcmVhdGUgT0sgYW5kIERldGFpbHMgYnV0dG9ucwogICAgIGNyZWF0ZUJ1dHRvbigKQEAgLTkwLDcgKzkxLDggQEAKICAgICogVGhpcyBpcyBvbmUgb2YgdGhlIGZldyBtZXRob2RzIHRoYXQgbmVlZHMgdG8gYmUgb3ZlcndyaXR0ZW4gYnkgdGhlCiAgICAqIHN1YmNsYXNzZXMuIFRoZSBpbWFnZSBuYW1lcyBjYW4gYmUgZm91bmQgaW4gdGhlIERpYWxvZyBjbGFzcwogICAgKi8KLSAgcHJvdGVjdGVkIEltYWdlIGdldERpYWxvZ0ltYWdlKCkKKyAgQE92ZXJyaWRlCitwcm90ZWN0ZWQgSW1hZ2UgZ2V0RGlhbG9nSW1hZ2UoKQogICB7CiAgICAgLy8gY3JlYXRlIGltYWdlCiAgICAgcmV0dXJuIFBsYXRmb3JtVUkuZ2V0V29ya2JlbmNoKCkuZ2V0RGlzcGxheSgpLmdldFN5c3RlbUltYWdlKFNXVC5JQ09OX0VSUk9SKTsKZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzLnVpL3d0cF91aS9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ZyYW1ld29ya3MvaW50ZXJuYWwvZGlhbG9nL3VpL0luZm9EaWFsb2cuamF2YSBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzLnVpL3d0cF91aS9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ZyYW1ld29ya3MvaW50ZXJuYWwvZGlhbG9nL3VpL0luZm9EaWFsb2cuamF2YQppbmRleCBjZmM1NjVhLi5hZjE4OWMwIDEwMDY0NAotLS0gYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy51aS93dHBfdWkvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9mcmFtZXdvcmtzL2ludGVybmFsL2RpYWxvZy91aS9JbmZvRGlhbG9nLmphdmEKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3MudWkvd3RwX3VpL29yZy9lY2xpcHNlL3dzdC9jb21tb24vZnJhbWV3b3Jrcy9pbnRlcm5hbC9kaWFsb2cvdWkvSW5mb0RpYWxvZy5qYXZhCkBAIC02Niw3ICs2Niw4IEBACiAgIC8qCiAgICAqIChub24tSmF2YWRvYykgVGhpcyBzaG91bGQgYWxzbyBiZSBvdmVyd3JpdHRlbiBNZXRob2QgZGVjbGFyZWQgb24gRGlhbG9nLgogICAgKi8KLSAgcHJvdGVjdGVkIHZvaWQgY3JlYXRlQnV0dG9uc0ZvckJ1dHRvbkJhcihDb21wb3NpdGUgcGFyZW50KQorICBAT3ZlcnJpZGUKK3Byb3RlY3RlZCB2b2lkIGNyZWF0ZUJ1dHRvbnNGb3JCdXR0b25CYXIoQ29tcG9zaXRlIHBhcmVudCkKICAgewogICAgIC8vIGNyZWF0ZSBPSyBhbmQgRGV0YWlscyBidXR0b25zCiAgICAgY3JlYXRlQnV0dG9uKApAQCAtODksNyArOTAsOCBAQAogICAgKiBUaGlzIGlzIG9uZSBvZiB0aGUgZmV3IG1ldGhvZHMgdGhhdCBuZWVkcyB0byBiZSBvdmVyd3JpdHRlbiBieSB0aGUKICAgICogc3ViY2xhc3Nlcy4gVGhlIGltYWdlIG5hbWVzIGNhbiBiZSBmb3VuZCBpbiB0aGUgRGlhbG9nIGNsYXNzCiAgICAqLwotICBwcm90ZWN0ZWQgSW1hZ2UgZ2V0RGlhbG9nSW1hZ2UoKQorICBAT3ZlcnJpZGUKK3Byb3RlY3RlZCBJbWFnZSBnZXREaWFsb2dJbWFnZSgpCiAgIHsKICAgICAvLyBjcmVhdGUgaW1hZ2UKICAgICByZXR1cm4gUGxhdGZvcm1VSS5nZXRXb3JrYmVuY2goKS5nZXREaXNwbGF5KCkuZ2V0U3lzdGVtSW1hZ2UoU1dULklDT05fSU5GT1JNQVRJT04pOwpkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3MudWkvd3RwX3VpL29yZy9lY2xpcHNlL3dzdC9jb21tb24vZnJhbWV3b3Jrcy9pbnRlcm5hbC9kaWFsb2cvdWkvTWVzc2FnZURpYWxvZy5qYXZhIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3MudWkvd3RwX3VpL29yZy9lY2xpcHNlL3dzdC9jb21tb24vZnJhbWV3b3Jrcy9pbnRlcm5hbC9kaWFsb2cvdWkvTWVzc2FnZURpYWxvZy5qYXZhCmluZGV4IDhkNDg2MjIuLjk0NmFlYWIgMTAwNjQ0Ci0tLSBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzLnVpL3d0cF91aS9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ZyYW1ld29ya3MvaW50ZXJuYWwvZGlhbG9nL3VpL01lc3NhZ2VEaWFsb2cuamF2YQorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy51aS93dHBfdWkvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9mcmFtZXdvcmtzL2ludGVybmFsL2RpYWxvZy91aS9NZXNzYWdlRGlhbG9nLmphdmEKQEAgLTE0NSw3ICsxNDUsOCBAQAogICAgKiBvZiB0aGUgZXJyb3IgZGV0YWlscyBhcmVhLiBOb3RlIHRoYXQgdGhlIERldGFpbHMgYnV0dG9uIHdpbGwgb25seSBiZQogICAgKiB2aXNpYmxlIGlmIHRoZSBlcnJvciBiZWluZyBkaXNwbGF5ZWQgc3BlY2lmaWVzIGNoaWxkIGRldGFpbHMuCiAgICAqLwotICBwcm90ZWN0ZWQgdm9pZCBidXR0b25QcmVzc2VkKGludCBpZCkKKyAgQE92ZXJyaWRlCitwcm90ZWN0ZWQgdm9pZCBidXR0b25QcmVzc2VkKGludCBpZCkKICAgewogICAgIGlmIChpZCA9PSBTdGF0dXNEaWFsb2dDb25zdGFudHMuREVUQUlMU19JRCkKICAgICB7IC8vIHdhcyB0aGUgZGV0YWlscyBidXR0b24gcHJlc3NlZD8KQEAgLTE1OSw3ICsxNjAsOCBAQAogICAvKgogICAgKiAobm9uLUphdmFkb2MpIE1ldGhvZCBkZWNsYXJlZCBpbiBXaW5kb3cuCiAgICAqLwotICBwcm90ZWN0ZWQgdm9pZCBjb25maWd1cmVTaGVsbChTaGVsbCBzaGVsbCkKKyAgQE92ZXJyaWRlCitwcm90ZWN0ZWQgdm9pZCBjb25maWd1cmVTaGVsbChTaGVsbCBzaGVsbCkKICAgewogICAgIHN1cGVyLmNvbmZpZ3VyZVNoZWxsKHNoZWxsKTsKICAgICBzaGVsbC5zZXRUZXh0KHRpdGxlKTsKQEAgLTE2Nyw3ICsxNjksOCBAQAogICAvKgogICAgKiAobm9uLUphdmFkb2MpIFRoaXMgc2hvdWxkIGFsc28gYmUgb3ZlcndyaXR0ZW4gTWV0aG9kIGRlY2xhcmVkIG9uIERpYWxvZy4KICAgICovCi0gIHByb3RlY3RlZCB2b2lkIGNyZWF0ZUJ1dHRvbnNGb3JCdXR0b25CYXIoQ29tcG9zaXRlIHBhcmVudCkKKyAgQE92ZXJyaWRlCitwcm90ZWN0ZWQgdm9pZCBjcmVhdGVCdXR0b25zRm9yQnV0dG9uQmFyKENvbXBvc2l0ZSBwYXJlbnQpCiAgIHsKICAgICAvLyBjcmVhdGUgT0sgYW5kIERldGFpbHMgYnV0dG9ucwogICAgIGNyZWF0ZUJ1dHRvbigKQEAgLTIwMiw3ICsyMDUsOCBAQAogICAgKiAobm9uLUphdmFkb2MpIE1ldGhvZCBkZWNsYXJlZCBvbiBEaWFsb2cuIENyZWF0ZXMgYW5kIHJldHVybnMgdGhlIGNvbnRlbnRzCiAgICAqIG9mIHRoZSB1cHBlciBwYXJ0IG9mIHRoZSBkaWFsb2cgKGFib3ZlIHRoZSBidXR0b24gYmFyKS4KICAgICovCi0gIHByb3RlY3RlZCBDb250cm9sIGNyZWF0ZURpYWxvZ0FyZWEoQ29tcG9zaXRlIHBhcmVudCkKKyAgQE92ZXJyaWRlCitwcm90ZWN0ZWQgQ29udHJvbCBjcmVhdGVEaWFsb2dBcmVhKENvbXBvc2l0ZSBwYXJlbnQpCiAgIHsKICAgICB0aGlzLnBhcmVudCA9IHBhcmVudDsKIApAQCAtMjk1LDcgKzI5OSw4IEBACiAgICAqIGNoaWxkcmVuLCB0aGUgZXJyb3IgZGlhbG9nIHdpbGwgb25seSBiZSBkaXNwbGF5ZWQgaWYgdGhlcmUgaXMgYXQgbGVhc3Qgb25lCiAgICAqIGNoaWxkIHN0YXR1cyBtYXRjaGluZyB0aGUgbWFzay4KICAgICovCi0gIHB1YmxpYyBpbnQgb3BlbigpCisgIEBPdmVycmlkZQorcHVibGljIGludCBvcGVuKCkKICAgewogICAgIGlmIChzaG91bGREaXNwbGF5KHN0YXR1cywgZGlzcGxheU1hc2spKQogICAgIHsKZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzLnVpL3d0cF91aS9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ZyYW1ld29ya3MvaW50ZXJuYWwvZGlhbG9nL3VpL09wdGlvbnNEaWFsb2cuamF2YSBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzLnVpL3d0cF91aS9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ZyYW1ld29ya3MvaW50ZXJuYWwvZGlhbG9nL3VpL09wdGlvbnNEaWFsb2cuamF2YQppbmRleCAyMTg2OWIyLi4xM2FmOWMzIDEwMDY0NAotLS0gYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy51aS93dHBfdWkvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9mcmFtZXdvcmtzL2ludGVybmFsL2RpYWxvZy91aS9PcHRpb25zRGlhbG9nLmphdmEKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3MudWkvd3RwX3VpL29yZy9lY2xpcHNlL3dzdC9jb21tb24vZnJhbWV3b3Jrcy9pbnRlcm5hbC9kaWFsb2cvdWkvT3B0aW9uc0RpYWxvZy5qYXZhCkBAIC00Nyw3ICs0Nyw4IEBACiAgIC8qCiAgICAqIChub24tSmF2YWRvYykgVGhpcyBzaG91bGQgYWxzbyBiZSBvdmVyd3JpdHRlbiBNZXRob2QgZGVjbGFyZWQgb24gRGlhbG9nLgogICAgKi8KLSAgcHJvdGVjdGVkIHZvaWQgY3JlYXRlQnV0dG9uc0ZvckJ1dHRvbkJhcihDb21wb3NpdGUgcGFyZW50KQorICBAT3ZlcnJpZGUKK3Byb3RlY3RlZCB2b2lkIGNyZWF0ZUJ1dHRvbnNGb3JCdXR0b25CYXIoQ29tcG9zaXRlIHBhcmVudCkKICAgewogICAgIC8vIGNyZWF0ZSBhIGJ1dHRvbiBmb3IgZWFjaCBvcHRpb25zCiAgICAgZm9yIChpbnQgaSA9IDA7IGkgPCBjaG9pY2VzLmxlbmd0aDsgaSsrKQpAQCAtNjUsNyArNjYsOCBAQAogICAgIH0KICAgfQogCi0gIHByb3RlY3RlZCB2b2lkIGJ1dHRvblByZXNzZWQoaW50IGlkKQorICBAT3ZlcnJpZGUKK3Byb3RlY3RlZCB2b2lkIGJ1dHRvblByZXNzZWQoaW50IGlkKQogICB7CiAgICAgaWYgKGlkID09IFN0YXR1c0RpYWxvZ0NvbnN0YW50cy5ERVRBSUxTX0lEKQogICAgICAgLy8gd2FzIHRoZSBEZXRhaWxzIGJ1dHRvbiBwcmVzc2VkPwpAQCAtNzcsMTIgKzc5LDE0IEBACiAgICAgfQogICB9CiAKLSAgcHJvdGVjdGVkIHZvaWQgc2V0UmV0dXJuQ29kZShpbnQgaWQpCisgIEBPdmVycmlkZQorcHJvdGVjdGVkIHZvaWQgc2V0UmV0dXJuQ29kZShpbnQgaWQpCiAgIHsKICAgICByZXR1cm5Db2RlXyA9IGlkOwogICB9CiAKLSAgcHVibGljIGludCBnZXRSZXR1cm5Db2RlKCkKKyAgQE92ZXJyaWRlCitwdWJsaWMgaW50IGdldFJldHVybkNvZGUoKQogICB7CiAgICAgcmV0dXJuIHJldHVybkNvZGVfOwogICB9CkBAIC05MCw3ICs5NCw4IEBACiAgICAqIFRoaXMgaXMgb25lIG9mIHRoZSBmZXcgbWV0aG9kcyB0aGF0IG5lZWRzIHRvIGJlIG92ZXJ3cml0dGVuIGJ5IHRoZQogICAgKiBzdWJjbGFzc2VzLiBUaGUgaW1hZ2UgbmFtZXMgY2FuIGJlIGZvdW5kIGluIHRoZSBEaWFsb2cgY2xhc3MKICAgICovCi0gIHByb3RlY3RlZCBJbWFnZSBnZXREaWFsb2dJbWFnZSgpCisgIEBPdmVycmlkZQorcHJvdGVjdGVkIEltYWdlIGdldERpYWxvZ0ltYWdlKCkKICAgewogICAgIC8vIGNyZWF0ZSBpbWFnZQogICAgIHN3aXRjaCAoc3RhdHVzLmdldFNldmVyaXR5KCkpCmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy51aS93dHBfdWkvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9mcmFtZXdvcmtzL2ludGVybmFsL2RpYWxvZy91aS9XYXJuaW5nRGlhbG9nLmphdmEgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy51aS93dHBfdWkvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9mcmFtZXdvcmtzL2ludGVybmFsL2RpYWxvZy91aS9XYXJuaW5nRGlhbG9nLmphdmEKaW5kZXggNmM2NmQ4Mi4uZjJiZGEyMCAxMDA2NDQKLS0tIGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3MudWkvd3RwX3VpL29yZy9lY2xpcHNlL3dzdC9jb21tb24vZnJhbWV3b3Jrcy9pbnRlcm5hbC9kaWFsb2cvdWkvV2FybmluZ0RpYWxvZy5qYXZhCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzLnVpL3d0cF91aS9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ZyYW1ld29ya3MvaW50ZXJuYWwvZGlhbG9nL3VpL1dhcm5pbmdEaWFsb2cuamF2YQpAQCAtNjYsNyArNjYsOCBAQAogICAvKgogICAgKiAobm9uLUphdmFkb2MpIFRoaXMgc2hvdWxkIGFsc28gYmUgb3ZlcndyaXR0ZW4gTWV0aG9kIGRlY2xhcmVkIG9uIERpYWxvZy4KICAgICovCi0gIHByb3RlY3RlZCB2b2lkIGNyZWF0ZUJ1dHRvbnNGb3JCdXR0b25CYXIoQ29tcG9zaXRlIHBhcmVudCkKKyAgQE92ZXJyaWRlCitwcm90ZWN0ZWQgdm9pZCBjcmVhdGVCdXR0b25zRm9yQnV0dG9uQmFyKENvbXBvc2l0ZSBwYXJlbnQpCiAgIHsKICAgICAvLyBjcmVhdGUgT0ssIENhbmNlbCBhbmQgRGV0YWlscyBidXR0b25zCiAgICAgY3JlYXRlQnV0dG9uKApAQCAtOTQsNyArOTUsOCBAQAogICAgKiBUaGlzIGlzIG9uZSBvZiB0aGUgZmV3IG1ldGhvZHMgdGhhdCBuZWVkcyB0byBiZSBvdmVyd3JpdHRlbiBieSB0aGUKICAgICogc3ViY2xhc3Nlcy4gVGhlIGltYWdlIG5hbWVzIGNhbiBiZSBmb3VuZCBpbiB0aGUgRGlhbG9nIGNsYXNzCiAgICAqLwotICBwcm90ZWN0ZWQgSW1hZ2UgZ2V0RGlhbG9nSW1hZ2UoKQorICBAT3ZlcnJpZGUKK3Byb3RlY3RlZCBJbWFnZSBnZXREaWFsb2dJbWFnZSgpCiAgIHsKICAgICAvLyBjcmVhdGUgaW1hZ2UKICAgICByZXR1cm4gUGxhdGZvcm1VSS5nZXRXb3JrYmVuY2goKS5nZXREaXNwbGF5KCkuZ2V0U3lzdGVtSW1hZ2UoU1dULklDT05fV0FSTklORyk7CmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy51aS93dHBfdWkvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9mcmFtZXdvcmtzL2ludGVybmFsL2VjbGlwc2UvdWkvRWNsaXBzZUVudmlyb25tZW50LmphdmEgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy51aS93dHBfdWkvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9mcmFtZXdvcmtzL2ludGVybmFsL2VjbGlwc2UvdWkvRWNsaXBzZUVudmlyb25tZW50LmphdmEKaW5kZXggMjZiZmY0OC4uNzhhOTEyMCAxMDA2NDQKLS0tIGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3MudWkvd3RwX3VpL29yZy9lY2xpcHNlL3dzdC9jb21tb24vZnJhbWV3b3Jrcy9pbnRlcm5hbC9lY2xpcHNlL3VpL0VjbGlwc2VFbnZpcm9ubWVudC5qYXZhCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzLnVpL3d0cF91aS9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ZyYW1ld29ya3MvaW50ZXJuYWwvZWNsaXBzZS91aS9FY2xpcHNlRW52aXJvbm1lbnQuamF2YQpAQCAtNTYsNyArNTYsNyBAQAogCSAgaWYoIGxvZ2dlcl8gPT0gbnVsbCApCiAgICAgeyAgCiAgICAgICBsb2dnZXJfID0gRW52aXJvbm1lbnRTZXJ2aWNlLmdldEVjbGlwc2VMb2coKTsgCi0gICAgfTsKKyAgICB9CiAJCiAgICAgcmV0dXJuIGxvZ2dlcl87CiAgIH0KZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzLnVpL3d0cF91aS9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ZyYW1ld29ya3MvaW50ZXJuYWwvb3BlcmF0aW9uL2V4dGVuc2lvbnVpL0RNV2l6YXJkUGFnZUVsZW1lbnQuamF2YSBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzLnVpL3d0cF91aS9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ZyYW1ld29ya3MvaW50ZXJuYWwvb3BlcmF0aW9uL2V4dGVuc2lvbnVpL0RNV2l6YXJkUGFnZUVsZW1lbnQuamF2YQppbmRleCA3MDcwY2FmLi42YWVhYzZkIDEwMDY0NAotLS0gYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy51aS93dHBfdWkvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9mcmFtZXdvcmtzL2ludGVybmFsL29wZXJhdGlvbi9leHRlbnNpb251aS9ETVdpemFyZFBhZ2VFbGVtZW50LmphdmEKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3MudWkvd3RwX3VpL29yZy9lY2xpcHNlL3dzdC9jb21tb24vZnJhbWV3b3Jrcy9pbnRlcm5hbC9vcGVyYXRpb24vZXh0ZW5zaW9udWkvRE1XaXphcmRQYWdlRWxlbWVudC5qYXZhCkBAIC02MywxMCArNjMsMTEgQEAKIAkvKioKIAkgKiBAc2VlIElkZW50aWZpYWJsZSNnZXRJRCgpCiAJICovCisJQE92ZXJyaWRlCiAJcHVibGljIFN0cmluZyBnZXRJRCgpIHsKIAkJU3RyaW5nIGlkID0gd2l6YXJkSUQ7CiAJCWlmIChmYWN0b3J5RWxlbWVudCAhPSBudWxsKSB7Ci0JCQlpZCA9IGlkICsgIkAiICsgZmFjdG9yeUVsZW1lbnQuY2xhc3NOYW1lOworCQkJaWQgPSBpZCArICJAIiArIGZhY3RvcnlFbGVtZW50LmNsYXNzTmFtZTsgLy8kTk9OLU5MUy0xJAogCQl9CiAJCXJldHVybiBpZDsgCiAJfQpkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3MudWkvd3RwX3VpL29yZy9lY2xpcHNlL3dzdC9jb21tb24vZnJhbWV3b3Jrcy9pbnRlcm5hbC9vcGVyYXRpb24vZXh0ZW5zaW9udWkvRE1XaXphcmRQYWdlRXh0ZW5zaW9uTWFuYWdlci5qYXZhIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3MudWkvd3RwX3VpL29yZy9lY2xpcHNlL3dzdC9jb21tb24vZnJhbWV3b3Jrcy9pbnRlcm5hbC9vcGVyYXRpb24vZXh0ZW5zaW9udWkvRE1XaXphcmRQYWdlRXh0ZW5zaW9uTWFuYWdlci5qYXZhCmluZGV4IDcwZjkwYWUuLmQxNDdkNWUgMTAwNjQ0Ci0tLSBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzLnVpL3d0cF91aS9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ZyYW1ld29ya3MvaW50ZXJuYWwvb3BlcmF0aW9uL2V4dGVuc2lvbnVpL0RNV2l6YXJkUGFnZUV4dGVuc2lvbk1hbmFnZXIuamF2YQorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy51aS93dHBfdWkvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9mcmFtZXdvcmtzL2ludGVybmFsL29wZXJhdGlvbi9leHRlbnNpb251aS9ETVdpemFyZFBhZ2VFeHRlbnNpb25NYW5hZ2VyLmphdmEKQEAgLTIyLDEwICsyMiwxMCBAQAogaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucnVudGltZS5JQ29uZmlndXJhdGlvbkVsZW1lbnQ7CiBpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5ydW50aW1lLklFeHRlbnNpb25Qb2ludDsKIGltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJ1bnRpbWUuUGxhdGZvcm07Ci1pbXBvcnQgb3JnLmVjbGlwc2UuamVtLnV0aWwuUmVnaXN0cnlSZWFkZXI7Ci1pbXBvcnQgb3JnLmVjbGlwc2UuamVtLnV0aWwubG9nZ2VyLnByb3h5LkxvZ2dlcjsKK2ltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvcmUudXRpbC5SZWdpc3RyeVJlYWRlcjsKIGltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3MuaW50ZXJuYWwuZW5hYmxlbWVudC5FbmFibGVtZW50TWFuYWdlcjsKIGltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3MuaW50ZXJuYWwudWkuV1RQQ29tbW9uVUlSZXNvdXJjZUhhbmRsZXI7CitpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzLmludGVybmFsLnVpLldUUFVJUGx1Z2luOwogCiBwdWJsaWMgY2xhc3MgRE1XaXphcmRQYWdlRXh0ZW5zaW9uTWFuYWdlciB7CiAKQEAgLTg0LDYgKzg0LDcgQEAKIAkJCXN1cGVyKENvbW1vblVJUGx1Z2luQ29uc3RhbnRzLlBMVUdJTl9JRCwgRE1XaXphcmRQYWdlR3JvdXBFbGVtZW50LkVMRU1FTlRfUEFHRV9HUk9VUCk7CiAJCX0KIAorCQlAT3ZlcnJpZGUKIAkJcHVibGljIGJvb2xlYW4gcmVhZEVsZW1lbnQoSUNvbmZpZ3VyYXRpb25FbGVtZW50IGVsZW1lbnQpIHsKIAkJCWlmICghRE1XaXphcmRQYWdlR3JvdXBFbGVtZW50LkVMRU1FTlRfUEFHRV9HUk9VUC5lcXVhbHMoZWxlbWVudC5nZXROYW1lKCkpKQogCQkJCXJldHVybiBmYWxzZTsKQEAgLTEyMSw4ICsxMjIsOCBAQAogCQkJCXJldHVybjsKIAkJCX0KIAkJCWlmICghcGFyZW50RWxlbWVudC5hbGxvd3NFeHRlbmRlZFBhZ2VzQWZ0ZXIoKSkgewotCQkJCUxvZ2dlci5nZXRMb2dnZXIoKS5sb2dFcnJvcihXVFBDb21tb25VSVJlc291cmNlSGFuZGxlci5nZXRTdHJpbmcoV1RQQ29tbW9uVUlSZXNvdXJjZUhhbmRsZXIuV2l6YXJkUGFnZUV4dGVuc2lvbk1hbmFnZXJfVUlfMCwgbmV3IE9iamVjdFtde3BhcmVudEVsZW1lbnQuZ2V0UGFnZUlEKCl9KSk7Ci0JCQkJTG9nZ2VyLmdldExvZ2dlcigpLmxvZ0Vycm9yKFdUUENvbW1vblVJUmVzb3VyY2VIYW5kbGVyLmdldFN0cmluZyhXVFBDb21tb25VSVJlc291cmNlSGFuZGxlci5XaXphcmRQYWdlRXh0ZW5zaW9uTWFuYWdlcl9VSV8xLCBuZXcgT2JqZWN0W117bmV3RWxlbWVudC5nZXRQYWdlSUQoKX0pKTsKKwkJCQlXVFBVSVBsdWdpbi5sb2dFcnJvcihXVFBDb21tb25VSVJlc291cmNlSGFuZGxlci5nZXRTdHJpbmcoV1RQQ29tbW9uVUlSZXNvdXJjZUhhbmRsZXIuV2l6YXJkUGFnZUV4dGVuc2lvbk1hbmFnZXJfVUlfMCwgbmV3IE9iamVjdFtde3BhcmVudEVsZW1lbnQuZ2V0UGFnZUlEKCl9KSk7CisJCQkJV1RQVUlQbHVnaW4ubG9nRXJyb3IoV1RQQ29tbW9uVUlSZXNvdXJjZUhhbmRsZXIuZ2V0U3RyaW5nKFdUUENvbW1vblVJUmVzb3VyY2VIYW5kbGVyLldpemFyZFBhZ2VFeHRlbnNpb25NYW5hZ2VyX1VJXzEsIG5ldyBPYmplY3RbXXtuZXdFbGVtZW50LmdldFBhZ2VJRCgpfSkpOwogCQkJCXJldHVybjsKIAkJCX0KIAkJCVRyZWVTZXQgc2V0ID0gKFRyZWVTZXQpIHBhZ2VNYXAuZ2V0KHBhcmVudEVsZW1lbnQpOwpAQCAtMTk3LDcgKzE5OCw3IEBACiAJCWZvciAoSXRlcmF0b3IgaXRlciA9IHRyZWVTZXQuaXRlcmF0b3IoKTsgaXRlci5oYXNOZXh0KCk7KSB7CiAJCQlETVdpemFyZFBhZ2VHcm91cEVsZW1lbnQgZWxlbWVudCA9IChETVdpemFyZFBhZ2VHcm91cEVsZW1lbnQpIGl0ZXIubmV4dCgpOwogCQkJaWYgKGFscmVhZHlWaXN0ZWRMaXN0LmNvbnRhaW5zKGVsZW1lbnQpKSB7Ci0JCQkJTG9nZ2VyLmdldExvZ2dlcigpLmxvZ0Vycm9yKFdUUENvbW1vblVJUmVzb3VyY2VIYW5kbGVyLmdldFN0cmluZyhXVFBDb21tb25VSVJlc291cmNlSGFuZGxlci5XaXphcmRQYWdlRXh0ZW5zaW9uTWFuYWdlcl9VSV8yLCBuZXcgT2JqZWN0W117ZWxlbWVudC5nZXRQYWdlSUQoKSwgRE1XaXphcmRQYWdlR3JvdXBFbGVtZW50LkFUVF9QQUdFX0lOU0VSVElPTl9JRH0pKTsgCisJCQkJV1RQVUlQbHVnaW4ubG9nRXJyb3IoV1RQQ29tbW9uVUlSZXNvdXJjZUhhbmRsZXIuZ2V0U3RyaW5nKFdUUENvbW1vblVJUmVzb3VyY2VIYW5kbGVyLldpemFyZFBhZ2VFeHRlbnNpb25NYW5hZ2VyX1VJXzIsIG5ldyBPYmplY3RbXXtlbGVtZW50LmdldFBhZ2VJRCgpLCBETVdpemFyZFBhZ2VHcm91cEVsZW1lbnQuQVRUX1BBR0VfSU5TRVJUSU9OX0lEfSkpOyAKIAkJCQlyZXR1cm47CiAJCQl9CiAJCQlpZiAoYWxsUGFnZUVsZW1lbnRzTGlzdC5jb250YWlucyhlbGVtZW50KSkgewpAQCAtMjUwLDE3ICsyNTEsMTUgQEAKIAkJCX0KIAkJfQogCQlpZiAoaW5zZXJ0Tm90Rm91bmQpIHsKLQkJCUxvZ2dlciBsb2dnZXIgPSBMb2dnZXIuZ2V0TG9nZ2VyKCk7Ci0JCQlsb2dnZXIubG9nRXJyb3IoV1RQQ29tbW9uVUlSZXNvdXJjZUhhbmRsZXIuV2l6YXJkUGFnZUV4dGVuc2lvbk1hbmFnZXJfVUlfMyk7CisJCQlXVFBVSVBsdWdpbi5sb2dFcnJvcihXVFBDb21tb25VSVJlc291cmNlSGFuZGxlci5XaXphcmRQYWdlRXh0ZW5zaW9uTWFuYWdlcl9VSV8zKTsKIAkJfQogCiAJfQogCiAJcHJpdmF0ZSB2b2lkIGxvZ01pc3NpbmdDbGFzc0Vycm9yKCkgewotCQlMb2dnZXIgbG9nZ2VyID0gTG9nZ2VyLmdldExvZ2dlcigpOwogCQlmb3IgKGludCBpID0gMDsgaSA8IG5vblN5bmNlZFBhZ2VFbGVtZW50TGlzdC5zaXplKCk7IGkrKykgewogCQkJRE1XaXphcmRQYWdlR3JvdXBFbGVtZW50IGVsZW1lbnQgPSAoRE1XaXphcmRQYWdlR3JvdXBFbGVtZW50KSBub25TeW5jZWRQYWdlRWxlbWVudExpc3QuZ2V0KGkpOwotCQkJbG9nZ2VyLmxvZ0Vycm9yKFdUUENvbW1vblVJUmVzb3VyY2VIYW5kbGVyLmdldFN0cmluZyhXVFBDb21tb25VSVJlc291cmNlSGFuZGxlci5XaXphcmRQYWdlRXh0ZW5zaW9uTWFuYWdlcl9VSV80LCBuZXcgT2JqZWN0W117ZWxlbWVudC5wYWdlSW5zZXJ0aW9uSUQsIGVsZW1lbnQuZ2V0UGFnZUlEKCksIGVsZW1lbnQucGx1Z2luSUR9KSk7CisJCQlXVFBVSVBsdWdpbi5sb2dFcnJvcihXVFBDb21tb25VSVJlc291cmNlSGFuZGxlci5nZXRTdHJpbmcoV1RQQ29tbW9uVUlSZXNvdXJjZUhhbmRsZXIuV2l6YXJkUGFnZUV4dGVuc2lvbk1hbmFnZXJfVUlfNCwgbmV3IE9iamVjdFtde2VsZW1lbnQucGFnZUluc2VydGlvbklELCBlbGVtZW50LmdldFBhZ2VJRCgpLCBlbGVtZW50LnBsdWdpbklEfSkpOwogCQl9CiAJCW5vblN5bmNlZFBhZ2VFbGVtZW50TGlzdC5jbGVhcigpOwogCmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy51aS93dHBfdWkvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9mcmFtZXdvcmtzL2ludGVybmFsL29wZXJhdGlvbi9leHRlbnNpb251aS9ETVdpemFyZFBhZ2VGYWN0b3J5RWxlbWVudC5qYXZhIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3MudWkvd3RwX3VpL29yZy9lY2xpcHNlL3dzdC9jb21tb24vZnJhbWV3b3Jrcy9pbnRlcm5hbC9vcGVyYXRpb24vZXh0ZW5zaW9udWkvRE1XaXphcmRQYWdlRmFjdG9yeUVsZW1lbnQuamF2YQppbmRleCA0YjA5YThiLi4xZjBkNDdlIDEwMDY0NAotLS0gYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy51aS93dHBfdWkvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9mcmFtZXdvcmtzL2ludGVybmFsL29wZXJhdGlvbi9leHRlbnNpb251aS9ETVdpemFyZFBhZ2VGYWN0b3J5RWxlbWVudC5qYXZhCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzLnVpL3d0cF91aS9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ZyYW1ld29ya3MvaW50ZXJuYWwvb3BlcmF0aW9uL2V4dGVuc2lvbnVpL0RNV2l6YXJkUGFnZUZhY3RvcnlFbGVtZW50LmphdmEKQEAgLTEyLDEwICsxMiwxMCBAQAogCiBpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5ydW50aW1lLkNvcmVFeGNlcHRpb247CiBpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5ydW50aW1lLklDb25maWd1cmF0aW9uRWxlbWVudDsKLWltcG9ydCBvcmcuZWNsaXBzZS5qZW0udXRpbC5sb2dnZXIucHJveHkuTG9nZ2VyOwogaW1wb3J0IG9yZy5lY2xpcHNlLnN3dC53aWRnZXRzLkNvbXBvc2l0ZTsKIGltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3MuZGF0YW1vZGVsLklEYXRhTW9kZWw7CiBpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzLmludGVybmFsLkNvbmZpZ3VyYXRpb25FbGVtZW50V3JhcHBlcjsKK2ltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3MuaW50ZXJuYWwudWkuV1RQVUlQbHVnaW47CiAKIC8qKgogICogVGhpcyBjbGFzcyBwcm92aWRlcyBjb252ZW5pZW50IG1ldGhvZHMgZm9yIGFjY2Vzc2luZyB0aGUgc2VtYW50aWNzIG9mIHRoZQpAQCAtODYsOCArODYsOCBAQAogCQl0cnkgewogCQkJd2l6YXJkUGFnZUZhY3RvcnkgPSAoRE1XaXphcmRQYWdlRXh0ZW5zaW9uRmFjdG9yeSkgZWxlbWVudC5jcmVhdGVFeGVjdXRhYmxlRXh0ZW5zaW9uKEFUVF9DTEFTU19OQU1FKTsKIAkJfSBjYXRjaCAoQ29yZUV4Y2VwdGlvbiBlKSB7Ci0JCQlMb2dnZXIuZ2V0TG9nZ2VyKCkubG9nRXJyb3IoIkVycm9yIGdldHRpbmcgcGFnZSBmYWN0b3J5OiAiICsgY2xhc3NOYW1lKTsgLy8kTk9OLU5MUy0xJCAKLQkJCUxvZ2dlci5nZXRMb2dnZXIoKS5sb2dFcnJvcihlKTsKKwkJCVdUUFVJUGx1Z2luLmxvZ0Vycm9yKCJFcnJvciBnZXR0aW5nIHBhZ2UgZmFjdG9yeTogIiArIGNsYXNzTmFtZSk7IC8vJE5PTi1OTFMtMSQgCisJCQlXVFBVSVBsdWdpbi5sb2dFcnJvcihlKTsKIAkJfSBmaW5hbGx5IHsKIAkJCWlzUGFnZUZhY3RvcnlJbml0aWFsaXplZCA9IHRydWU7CiAJCX0KZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzLnVpL3d0cF91aS9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ZyYW1ld29ya3MvaW50ZXJuYWwvb3BlcmF0aW9uL2V4dGVuc2lvbnVpL0RNV2l6YXJkUGFnZUdyb3VwRWxlbWVudC5qYXZhIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3MudWkvd3RwX3VpL29yZy9lY2xpcHNlL3dzdC9jb21tb24vZnJhbWV3b3Jrcy9pbnRlcm5hbC9vcGVyYXRpb24vZXh0ZW5zaW9udWkvRE1XaXphcmRQYWdlR3JvdXBFbGVtZW50LmphdmEKaW5kZXggOGM3YWE3ZS4uZTk1ZjQzNSAxMDA2NDQKLS0tIGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3MudWkvd3RwX3VpL29yZy9lY2xpcHNlL3dzdC9jb21tb24vZnJhbWV3b3Jrcy9pbnRlcm5hbC9vcGVyYXRpb24vZXh0ZW5zaW9udWkvRE1XaXphcmRQYWdlR3JvdXBFbGVtZW50LmphdmEKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3MudWkvd3RwX3VpL29yZy9lY2xpcHNlL3dzdC9jb21tb24vZnJhbWV3b3Jrcy9pbnRlcm5hbC9vcGVyYXRpb24vZXh0ZW5zaW9udWkvRE1XaXphcmRQYWdlR3JvdXBFbGVtZW50LmphdmEKQEAgLTEzLDE0ICsxMywxNSBAQAogCiBpbXBvcnQgamF2YS51dGlsLkhhc2hTZXQ7CiBpbXBvcnQgamF2YS51dGlsLlNldDsKKwogaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucnVudGltZS5JQ29uZmlndXJhdGlvbkVsZW1lbnQ7Ci1pbXBvcnQgb3JnLmVjbGlwc2UuamVtLnV0aWwubG9nZ2VyLnByb3h5LkxvZ2dlcjsKIGltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3MuZGF0YW1vZGVsLklEYXRhTW9kZWw7CiBpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzLmludGVybmFsLkFic3RyYWN0UmVnaXN0cnlEZXNjcmlwdG9yOwogaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy5pbnRlcm5hbC5kYXRhbW9kZWwudWkuRGF0YU1vZGVsV2l6YXJkUGFnZTsKIGltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3MuaW50ZXJuYWwuZGF0YW1vZGVsLnVpLklETVBhZ2VHcm91cEhhbmRsZXI7CiBpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzLmludGVybmFsLmRhdGFtb2RlbC51aS5JRE1QYWdlSGFuZGxlcjsKIGltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3MuaW50ZXJuYWwuZW5hYmxlbWVudC5JZGVudGlmaWFibGVDb21wYXJhdG9yOworaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy5pbnRlcm5hbC51aS5XVFBVSVBsdWdpbjsKIAogcHVibGljIGNsYXNzIERNV2l6YXJkUGFnZUdyb3VwRWxlbWVudCBleHRlbmRzIEFic3RyYWN0UmVnaXN0cnlEZXNjcmlwdG9yIGltcGxlbWVudHMgQ29tcGFyYWJsZSB7CiAJc3RhdGljIGZpbmFsIFN0cmluZyBFTEVNRU5UX1BBR0VfR1JPVVAgPSAid2l6YXJkUGFnZUdyb3VwIjsgLy8kTk9OLU5MUy0xJApAQCAtODEsNyArODIsNyBAQAogICAKIAlwcml2YXRlIHZvaWQgdmFsaWRhdGVTZXR0aW5ncygpIHsKIAkJaWYgKHdpemFyZElEID09IG51bGwgfHwgd2l6YXJkUGFnZUZhY3RvcnlFbGVtZW50ID09IG51bGwpIHsKLQkJCUxvZ2dlci5nZXRMb2dnZXIoKS5sb2dFcnJvcigiSW5jb21wbGV0ZSBwYWdlIGV4dGVuc2lvbiBzcGVjaWZpY2F0aW9uLiIpOyAvLyROT04tTkxTLTEkCisJCQlXVFBVSVBsdWdpbi5sb2dFcnJvcigiSW5jb21wbGV0ZSBwYWdlIGV4dGVuc2lvbiBzcGVjaWZpY2F0aW9uLiIpOyAvLyROT04tTkxTLTEkCiAJCX0KIAl9CiAKQEAgLTI2NCw2ICsyNjUsNyBAQAogCSAqIAogCSAqIEBzZWUgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzLmludGVybmFsLkFic3RyYWN0UmVnaXN0cnlEZXNjcmlwdG9yI2dldElEKCkKIAkgKi8KKwlAT3ZlcnJpZGUKIAlwdWJsaWMgU3RyaW5nIGdldElEKCkgewogCQlyZXR1cm4gZ2V0UGFnZUlEKCk7CiAJfQpkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3MudWkvd3RwX3VpL29yZy9lY2xpcHNlL3dzdC9jb21tb24vZnJhbWV3b3Jrcy9pbnRlcm5hbC9vcGVyYXRpb24vZXh0ZW5zaW9udWkvRE1XaXphcmRQYWdlR3JvdXBGYWN0b3J5RWxlbWVudC5qYXZhIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3MudWkvd3RwX3VpL29yZy9lY2xpcHNlL3dzdC9jb21tb24vZnJhbWV3b3Jrcy9pbnRlcm5hbC9vcGVyYXRpb24vZXh0ZW5zaW9udWkvRE1XaXphcmRQYWdlR3JvdXBGYWN0b3J5RWxlbWVudC5qYXZhCmluZGV4IGYwNGJhMjIuLjEyZGE0NjMgMTAwNjQ0Ci0tLSBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzLnVpL3d0cF91aS9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ZyYW1ld29ya3MvaW50ZXJuYWwvb3BlcmF0aW9uL2V4dGVuc2lvbnVpL0RNV2l6YXJkUGFnZUdyb3VwRmFjdG9yeUVsZW1lbnQuamF2YQorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy51aS93dHBfdWkvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9mcmFtZXdvcmtzL2ludGVybmFsL29wZXJhdGlvbi9leHRlbnNpb251aS9ETVdpemFyZFBhZ2VHcm91cEZhY3RvcnlFbGVtZW50LmphdmEKQEAgLTIwLDEyICsyMCwxMiBAQAogCiBpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5ydW50aW1lLkNvcmVFeGNlcHRpb247CiBpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5ydW50aW1lLklDb25maWd1cmF0aW9uRWxlbWVudDsKLWltcG9ydCBvcmcuZWNsaXBzZS5qZW0udXRpbC5sb2dnZXIucHJveHkuTG9nZ2VyOwogaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy5kYXRhbW9kZWwuSURhdGFNb2RlbDsKIGltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3MuaW50ZXJuYWwuQ29uZmlndXJhdGlvbkVsZW1lbnRXcmFwcGVyOwogaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy5pbnRlcm5hbC5kYXRhbW9kZWwudWkuRGF0YU1vZGVsV2l6YXJkUGFnZTsKIGltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3MuaW50ZXJuYWwuZGF0YW1vZGVsLnVpLklETVBhZ2VHcm91cEhhbmRsZXI7CiBpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzLmludGVybmFsLmRhdGFtb2RlbC51aS5JRE1QYWdlSGFuZGxlcjsKK2ltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3MuaW50ZXJuYWwudWkuV1RQVUlQbHVnaW47CiAKIC8qKgogICogQGF1dGhvciBzY2hhY2hlcgpAQCAtODYsOCArODYsOCBAQAogCQl0cnkgewogCQkJd2l6YXJkUGFnZUdyb3VwRmFjdG9yeSA9IChETVdpemFyZEV4dGVuc2lvbkZhY3RvcnkpIGVsZW1lbnQuY3JlYXRlRXhlY3V0YWJsZUV4dGVuc2lvbihBVFRfQ0xBU1NfTkFNRSk7CiAJCX0gY2F0Y2ggKENvcmVFeGNlcHRpb24gZSkgewotCQkJTG9nZ2VyLmdldExvZ2dlcigpLmxvZ0Vycm9yKCJFcnJvciBnZXR0aW5nIHBhZ2UgZmFjdG9yeTogIiArIGNsYXNzTmFtZSk7IC8vJE5PTi1OTFMtMSQgCi0JCQlMb2dnZXIuZ2V0TG9nZ2VyKCkubG9nRXJyb3IoZSk7CisJCQlXVFBVSVBsdWdpbi5sb2dFcnJvcigiRXJyb3IgZ2V0dGluZyBwYWdlIGZhY3Rvcnk6ICIgKyBjbGFzc05hbWUpOyAvLyROT04tTkxTLTEkIAorCQkJV1RQVUlQbHVnaW4ubG9nRXJyb3IoZSk7CiAJCX0gZmluYWxseSB7CiAJCQlpc1BhZ2VHcm91cEZhY3RvcnlJbml0aWFsaXplZCA9IHRydWU7CiAJCX0KZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzLnVpL3d0cF91aS9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ZyYW1ld29ya3MvaW50ZXJuYWwvb3BlcmF0aW9uL2V4dGVuc2lvbnVpL0RhdGFNb2RlbFdpemFyZEV4dGVuc2lvblJlYWRlci5qYXZhIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3MudWkvd3RwX3VpL29yZy9lY2xpcHNlL3dzdC9jb21tb24vZnJhbWV3b3Jrcy9pbnRlcm5hbC9vcGVyYXRpb24vZXh0ZW5zaW9udWkvRGF0YU1vZGVsV2l6YXJkRXh0ZW5zaW9uUmVhZGVyLmphdmEKaW5kZXggNWNlN2I3My4uY2M1YzA0MSAxMDA2NDQKLS0tIGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3MudWkvd3RwX3VpL29yZy9lY2xpcHNlL3dzdC9jb21tb24vZnJhbWV3b3Jrcy9pbnRlcm5hbC9vcGVyYXRpb24vZXh0ZW5zaW9udWkvRGF0YU1vZGVsV2l6YXJkRXh0ZW5zaW9uUmVhZGVyLmphdmEKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3MudWkvd3RwX3VpL29yZy9lY2xpcHNlL3dzdC9jb21tb24vZnJhbWV3b3Jrcy9pbnRlcm5hbC9vcGVyYXRpb24vZXh0ZW5zaW9udWkvRGF0YU1vZGVsV2l6YXJkRXh0ZW5zaW9uUmVhZGVyLmphdmEKQEAgLTE0LDggKzE0LDcgQEAKIAogaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucnVudGltZS5Db3JlRXhjZXB0aW9uOwogaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucnVudGltZS5JQ29uZmlndXJhdGlvbkVsZW1lbnQ7Ci1pbXBvcnQgb3JnLmVjbGlwc2UuamVtLnV0aWwuUmVnaXN0cnlSZWFkZXI7Ci1pbXBvcnQgb3JnLmVjbGlwc2UuamVtLnV0aWwubG9nZ2VyLnByb3h5LkxvZ2dlcjsKK2ltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvcmUudXRpbC5SZWdpc3RyeVJlYWRlcjsKIGltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3MuZGF0YW1vZGVsLklEYXRhTW9kZWw7CiBpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzLmludGVybmFsLmRhdGFtb2RlbC51aS5EYXRhTW9kZWxXaXphcmQ7CiBpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzLmludGVybmFsLnVpLldUUFVJUGx1Z2luOwpAQCAtMzMsMTYgKzMyLDE3IEBACiAJCXN1cGVyKFdUUFVJUGx1Z2luLlBMVUdJTl9JRCwgRVhURU5TSU9OKTsKIAl9CiAKKwlAT3ZlcnJpZGUKIAlwdWJsaWMgYm9vbGVhbiByZWFkRWxlbWVudChJQ29uZmlndXJhdGlvbkVsZW1lbnQgZWxlbWVudCkgewogCQlpZiAoIWVsZW1lbnQuZ2V0TmFtZSgpLmVxdWFscyhFTEVNRU5UKSkKIAkJCXJldHVybiBmYWxzZTsKIAkJU3RyaW5nIGlkID0gZWxlbWVudC5nZXRBdHRyaWJ1dGUoQVRUUklCVVRFX0lEKTsKIAkJaWYgKG51bGwgPT0gaWQgfHwgaWQudHJpbSgpLmxlbmd0aCgpID09IDApIHsKLQkJCUxvZ2dlci5nZXRMb2dnZXIoKS5sb2dFcnJvcihuZXcgUnVudGltZUV4Y2VwdGlvbigiRXh0ZW5zaW9uOiIgKyBFWFRFTlNJT04gKyAiIEVsZW1lbnQ6IiArIEVMRU1FTlQgKyAiIGlzIG1pc3NpbmcgIiArIEFUVFJJQlVURV9JRCkpOyAvLyROT04tTkxTLTEkIC8vJE5PTi1OTFMtMiQgLy8kTk9OLU5MUy0zJAorCQkJV1RQVUlQbHVnaW4ubG9nRXJyb3IobmV3IFJ1bnRpbWVFeGNlcHRpb24oIkV4dGVuc2lvbjoiICsgRVhURU5TSU9OICsgIiBFbGVtZW50OiIgKyBFTEVNRU5UICsgIiBpcyBtaXNzaW5nICIgKyBBVFRSSUJVVEVfSUQpKTsgLy8kTk9OLU5MUy0xJCAvLyROT04tTkxTLTIkIC8vJE5PTi1OTFMtMyQKIAkJfQogCQlTdHJpbmcgY2xhc3NOYW1lID0gZWxlbWVudC5nZXRBdHRyaWJ1dGUoQVRUUklCVVRFX0NMQVNTKTsKIAkJaWYgKG51bGwgPT0gY2xhc3NOYW1lIHx8IGNsYXNzTmFtZS50cmltKCkubGVuZ3RoKCkgPT0gMCkgewotCQkJTG9nZ2VyLmdldExvZ2dlcigpLmxvZ0Vycm9yKG5ldyBSdW50aW1lRXhjZXB0aW9uKCJFeHRlbnNpb246IiArIEVYVEVOU0lPTiArICIgRWxlbWVudDoiICsgRUxFTUVOVCArICIgaXMgbWlzc2luZyAiICsgQVRUUklCVVRFX0NMQVNTKSk7IC8vJE5PTi1OTFMtMSQgLy8kTk9OLU5MUy0yJCAvLyROT04tTkxTLTMkCisJCQlXVFBVSVBsdWdpbi5sb2dFcnJvcihuZXcgUnVudGltZUV4Y2VwdGlvbigiRXh0ZW5zaW9uOiIgKyBFWFRFTlNJT04gKyAiIEVsZW1lbnQ6IiArIEVMRU1FTlQgKyAiIGlzIG1pc3NpbmcgIiArIEFUVFJJQlVURV9DTEFTUykpOyAvLyROT04tTkxTLTEkIC8vJE5PTi1OTFMtMiQgLy8kTk9OLU5MUy0zJAogCQl9CiAJCWFkZEV4dGVuc2lvbihpZCwgZWxlbWVudCk7CiAJCXJldHVybiB0cnVlOwpAQCAtNTAsNyArNTAsNyBAQAogCiAJcHJpdmF0ZSB2b2lkIGFkZEV4dGVuc2lvbihTdHJpbmcgaWQsIElDb25maWd1cmF0aW9uRWxlbWVudCBlbGVtZW50KSB7CiAJCWlmIChleHRlbnNpb25zLmNvbnRhaW5zS2V5KGlkKSkgewotCQkJTG9nZ2VyLmdldExvZ2dlcigpLmxvZ0Vycm9yKG5ldyBSdW50aW1lRXhjZXB0aW9uKCJEdXBsaWNhdGUgIiArIEVMRU1FTlQgKyAiICIgKyBBVFRSSUJVVEVfSUQgKyAiICIgKyBpZCkpOyAvLyROT04tTkxTLTEkIC8vJE5PTi1OTFMtMiQgLy8kTk9OLU5MUy0zJAorCQkJV1RQVUlQbHVnaW4ubG9nRXJyb3IobmV3IFJ1bnRpbWVFeGNlcHRpb24oIkR1cGxpY2F0ZSAiICsgRUxFTUVOVCArICIgIiArIEFUVFJJQlVURV9JRCArICIgIiArIGlkKSk7IC8vJE5PTi1OTFMtMSQgLy8kTk9OLU5MUy0yJCAvLyROT04tTkxTLTMkCiAJCX0KIAkJZXh0ZW5zaW9ucy5wdXQoaWQsIGVsZW1lbnQpOwogCX0KQEAgLTc1LDggKzc1LDcgQEAKIAkJCXdpemFyZCA9IChEYXRhTW9kZWxXaXphcmQpIGVsZW1lbnQuY3JlYXRlRXhlY3V0YWJsZUV4dGVuc2lvbihBVFRSSUJVVEVfQ0xBU1MpOwogCQkJd2l6YXJkLnNldERhdGFNb2RlbChkYXRhTW9kZWwpOwogCQl9IGNhdGNoIChDb3JlRXhjZXB0aW9uIGUpIHsKLQkJCS8vIFRPRE8gQXV0by1nZW5lcmF0ZWQgY2F0Y2ggYmxvY2sKLQkJCWUucHJpbnRTdGFja1RyYWNlKCk7CisJCQlXVFBVSVBsdWdpbi5sb2dFcnJvcihlKTsKIAkJfQogCiAJCXJldHVybiB3aXphcmQ7CmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy51aS93dHBfdWkvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9mcmFtZXdvcmtzL2ludGVybmFsL29wZXJhdGlvbi9leHRlbnNpb251aS9FeHRlbnNpYmxlVmlld1JlZ2lzdHJ5LmphdmEgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy51aS93dHBfdWkvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9mcmFtZXdvcmtzL2ludGVybmFsL29wZXJhdGlvbi9leHRlbnNpb251aS9FeHRlbnNpYmxlVmlld1JlZ2lzdHJ5LmphdmEKaW5kZXggYzZhZWUyYy4uZDg5NzUyYSAxMDA2NDQKLS0tIGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3MudWkvd3RwX3VpL29yZy9lY2xpcHNlL3dzdC9jb21tb24vZnJhbWV3b3Jrcy9pbnRlcm5hbC9vcGVyYXRpb24vZXh0ZW5zaW9udWkvRXh0ZW5zaWJsZVZpZXdSZWdpc3RyeS5qYXZhCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzLnVpL3d0cF91aS9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ZyYW1ld29ya3MvaW50ZXJuYWwvb3BlcmF0aW9uL2V4dGVuc2lvbnVpL0V4dGVuc2libGVWaWV3UmVnaXN0cnkuamF2YQpAQCAtMTUsMTMgKzE1LDkgQEAKIAogaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucnVudGltZS5Db3JlRXhjZXB0aW9uOwogaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucnVudGltZS5JQ29uZmlndXJhdGlvbkVsZW1lbnQ7Ci1pbXBvcnQgb3JnLmVjbGlwc2UuamVtLnV0aWwuUmVnaXN0cnlSZWFkZXI7CitpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb3JlLnV0aWwuUmVnaXN0cnlSZWFkZXI7CiBpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzLmludGVybmFsLnVpLldUUFVJUGx1Z2luOwogCi0KLS8qKgotICogQGF1dGhvciBtZGVsZGVyCi0gKi8KIHB1YmxpYyBjbGFzcyBFeHRlbnNpYmxlVmlld1JlZ2lzdHJ5IGV4dGVuZHMgUmVnaXN0cnlSZWFkZXIgewogCiAJcHJpdmF0ZSBzdGF0aWMgRXh0ZW5zaWJsZVZpZXdSZWdpc3RyeSBJTlNUQU5DRSA9IG51bGw7CkBAIC02Miw2ICs1OCw3IEBACiAJICogCiAJICogQHNlZSBvcmcuZWNsaXBzZS51aS5pbnRlcm5hbC5yZWdpc3RyeS5SZWdpc3RyeVJlYWRlciNyZWFkRWxlbWVudChvcmcuZWNsaXBzZS5jb3JlLnJ1bnRpbWUuSUNvbmZpZ3VyYXRpb25FbGVtZW50KQogCSAqLworCUBPdmVycmlkZQogCXB1YmxpYyBib29sZWFuIHJlYWRFbGVtZW50KElDb25maWd1cmF0aW9uRWxlbWVudCBlbGVtZW50KSB7CiAJCWlmIChlbGVtZW50LmdldE5hbWUoKS5lcXVhbHMoRWxlbWVudHMuRVhURU5ERURfVklFV0VSKSkgewogCQkJRGVzY3JpcHRvciBkZXNjcmlwdG9yID0gbmV3IERlc2NyaXB0b3IoZWxlbWVudCk7CkBAIC0xMjAsNyArMTE3LDcgQEAKIAkJCXRyeSB7CiAJCQkJZmFjdG9yeUluc3RhbmNlID0gKElFeHRlbnNpYmxlVmlld0ZhY3RvcnkpIHRoaXMuZWxlbWVudC5jcmVhdGVFeGVjdXRhYmxlRXh0ZW5zaW9uKGdldEZhY3RvcnlDbGFzcygpKTsKIAkJCX0gY2F0Y2ggKENvcmVFeGNlcHRpb24gZSkgewotCQkJCVdUUFVJUGx1Z2luLmdldExvZ2dlcigpLmxvZ0Vycm9yKGUpOworCQkJCVdUUFVJUGx1Z2luLmxvZ0Vycm9yKGUpOwogCQkJfQogCQkJcmV0dXJuIGZhY3RvcnlJbnN0YW5jZTsKIAkJfQpAQCAtMTY3LDYgKzE2NCw3IEBACiAJCQlyZXR1cm4gdmlld2VySUQ7CiAJCX0KIAorCQlAT3ZlcnJpZGUKIAkJcHVibGljIFN0cmluZyB0b1N0cmluZygpIHsKIAkJCWlmICh0b1N0cmluZ0NhY2hlID09IG51bGwpCiAJCQkJdG9TdHJpbmdDYWNoZSA9ICJFeHRlbnNpYmxlVmlld1JlZ2lzdHJ5LkluZm8gW3ZpZXdlcklEPVwiIiArIGdldFZpZXdlcklEKCkgKyAiXCIscGFyZW50Vmlld2VySUQ9XCIiICsgZ2V0UGFyZW50Vmlld2VySUQoKSArICJcIixmYWN0b3J5Q2xhc3M9IiArIGdldEZhY3RvcnlDbGFzcygpICsgIlwiLGZ1bmN0aW9uR3JvdXBJRD1cIiIgKyBnZXRGdW5jdGlvbkdyb3VwSUQoKSArICJcIl0iOyAvLyROT04tTkxTLTEkIC8vJE5PTi1OTFMtMiQgLy8kTk9OLU5MUy0zJCAvLyROT04tTkxTLTQkIC8vJE5PTi1OTFMtNSQKZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzLnVpL3d0cF91aS9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ZyYW1ld29ya3MvaW50ZXJuYWwvb3BlcmF0aW9uL2V4dGVuc2lvbnVpL0lPcGVyYXRpb25Ob2RlLmphdmEgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy51aS93dHBfdWkvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9mcmFtZXdvcmtzL2ludGVybmFsL29wZXJhdGlvbi9leHRlbnNpb251aS9JT3BlcmF0aW9uTm9kZS5qYXZhCmluZGV4IDc0N2I1Y2EuLjc5ZWVhN2IgMTAwNjQ0Ci0tLSBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzLnVpL3d0cF91aS9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ZyYW1ld29ya3MvaW50ZXJuYWwvb3BlcmF0aW9uL2V4dGVuc2lvbnVpL0lPcGVyYXRpb25Ob2RlLmphdmEKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3MudWkvd3RwX3VpL29yZy9lY2xpcHNlL3dzdC9jb21tb24vZnJhbWV3b3Jrcy9pbnRlcm5hbC9vcGVyYXRpb24vZXh0ZW5zaW9udWkvSU9wZXJhdGlvbk5vZGUuamF2YQpAQCAtMTAsMTcgKzEwLDExIEBACiAgKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKi8KIC8qCiAgKiBDcmVhdGVkIG9uIE1heSA1LCAyMDA0Ci0gKiAKLSAqIFRPRE8gVG8gY2hhbmdlIHRoZSB0ZW1wbGF0ZSBmb3IgdGhpcyBnZW5lcmF0ZWQgZmlsZSBnbyB0byBXaW5kb3cgLQotICogUHJlZmVyZW5jZXMgLSBKYXZhIC0gQ29kZSBHZW5lcmF0aW9uIC0gQ29kZSBhbmQgQ29tbWVudHMKICAqLwogcGFja2FnZSBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3MuaW50ZXJuYWwub3BlcmF0aW9uLmV4dGVuc2lvbnVpOwogCiAvKioKICAqIEBhdXRob3IgbWRlbGRlcgotICogCi0gKiBUT0RPIFRvIGNoYW5nZSB0aGUgdGVtcGxhdGUgZm9yIHRoaXMgZ2VuZXJhdGVkIHR5cGUgY29tbWVudCBnbyB0byBXaW5kb3cgLSBQcmVmZXJlbmNlcyAtIEphdmEgLQotICogQ29kZSBHZW5lcmF0aW9uIC0gQ29kZSBhbmQgQ29tbWVudHMKICAqLwogcHVibGljIGludGVyZmFjZSBJT3BlcmF0aW9uTm9kZSB7CiAKZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzLnVpL3d0cF91aS9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ZyYW1ld29ya3MvaW50ZXJuYWwvdWkvQWJzdHJhY3RXVFBVSVBsdWdpbi5qYXZhIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3MudWkvd3RwX3VpL29yZy9lY2xpcHNlL3dzdC9jb21tb24vZnJhbWV3b3Jrcy9pbnRlcm5hbC91aS9BYnN0cmFjdFdUUFVJUGx1Z2luLmphdmEKaW5kZXggNTgzZjI5OC4uZGU3MDM1ZCAxMDA2NDQKLS0tIGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3MudWkvd3RwX3VpL29yZy9lY2xpcHNlL3dzdC9jb21tb24vZnJhbWV3b3Jrcy9pbnRlcm5hbC91aS9BYnN0cmFjdFdUUFVJUGx1Z2luLmphdmEKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3MudWkvd3RwX3VpL29yZy9lY2xpcHNlL3dzdC9jb21tb24vZnJhbWV3b3Jrcy9pbnRlcm5hbC91aS9BYnN0cmFjdFdUUFVJUGx1Z2luLmphdmEKQEAgLTE4LDE0ICsxOCwxMCBAQAogCiBpbXBvcnQgamF2YS51dGlsLlJlc291cmNlQnVuZGxlOwogCi1pbXBvcnQgb3JnLmVjbGlwc2UuamVtLnV0aWwubG9nZ2VyLnByb3h5LkxvZ2dlcjsKLWltcG9ydCBvcmcuZWNsaXBzZS5qZW0udXRpbC5sb2dnZXIucHJveHlyZW5kZXIuRGVmYXVsdFBsdWdpblRyYWNlUmVuZGVyZXI7Ci1pbXBvcnQgb3JnLmVjbGlwc2UuamVtLnV0aWwubG9nZ2VyLnByb3h5cmVuZGVyLklNc2dMb2dnZXI7CiBpbXBvcnQgb3JnLmVjbGlwc2UudWkucGx1Z2luLkFic3RyYWN0VUlQbHVnaW47CiBpbXBvcnQgb3JnLm9zZ2kuZnJhbWV3b3JrLkJ1bmRsZUNvbnRleHQ7CiAKLXB1YmxpYyBhYnN0cmFjdCBjbGFzcyBBYnN0cmFjdFdUUFVJUGx1Z2luIGV4dGVuZHMgQWJzdHJhY3RVSVBsdWdpbiBpbXBsZW1lbnRzIElNc2dMb2dnZXIgewotCXByb3RlY3RlZCBzdGF0aWMgTG9nZ2VyIGxvZ2dlciA9IG51bGw7CitwdWJsaWMgYWJzdHJhY3QgY2xhc3MgQWJzdHJhY3RXVFBVSVBsdWdpbiBleHRlbmRzIEFic3RyYWN0VUlQbHVnaW4gewogCXB1YmxpYyBSZXNvdXJjZUJ1bmRsZSByZXNvdXJjZUJ1bmRsZTsKIAlwcm90ZWN0ZWQgc3RhdGljIEFic3RyYWN0V1RQVUlQbHVnaW4gaW5zdGFuY2UgPSBudWxsOyAKIApAQCAtMzcsMjkgKzMzLDE0IEBACiAJCWluc3RhbmNlID0gdGhpczsKIAl9CiAKLQlwdWJsaWMgTG9nZ2VyIGdldE1zZ0xvZ2dlcigpIHsKLQkJaWYgKGxvZ2dlciA9PSBudWxsKSB7Ci0JCQlsb2dnZXIgPSBMb2dnZXIuZ2V0TG9nZ2VyKGdldFBsdWdpbklEKCkpOwotCQkJc2V0UmVuZGVyZXIobG9nZ2VyKTsKLQkJfQotCQlyZXR1cm4gbG9nZ2VyOwotCX0KLQogCXB1YmxpYyBhYnN0cmFjdCBTdHJpbmcgZ2V0UGx1Z2luSUQoKTsKIAotCS8qKgotCSAqIEBwYXJhbSBhTG9nZ2VyCi0JICovCi0JcHJvdGVjdGVkIHZvaWQgc2V0UmVuZGVyZXIoTG9nZ2VyIGFMb2dnZXIpIHsKLQkJbmV3IERlZmF1bHRQbHVnaW5UcmFjZVJlbmRlcmVyKGFMb2dnZXIpOwotCX0KLQkKLQogCS8qCiAJICogKG5vbi1KYXZhZG9jKQogCSAqIAogCSAqIEBzZWUgb3JnLmVjbGlwc2UuY29yZS5ydW50aW1lLlBsdWdpbiNzdGFydHVwKCkKIAkgKi8KKwlAT3ZlcnJpZGUKIAlwdWJsaWMgdm9pZCBzdGFydChCdW5kbGVDb250ZXh0IGNvbnRleHQpIHRocm93cyBFeGNlcHRpb24gIHsKIAkJc3VwZXIuc3RhcnQoY29udGV4dCk7CiAJfQpkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3MudWkvd3RwX3VpL29yZy9lY2xpcHNlL3dzdC9jb21tb24vZnJhbWV3b3Jrcy9pbnRlcm5hbC91aS9EaXNwbGF5VXRpbGl0eS5qYXZhIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3MudWkvd3RwX3VpL29yZy9lY2xpcHNlL3dzdC9jb21tb24vZnJhbWV3b3Jrcy9pbnRlcm5hbC91aS9EaXNwbGF5VXRpbGl0eS5qYXZhCmluZGV4IDY0N2Y1OGUuLmRhY2E0MGUgMTAwNjQ0Ci0tLSBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzLnVpL3d0cF91aS9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ZyYW1ld29ya3MvaW50ZXJuYWwvdWkvRGlzcGxheVV0aWxpdHkuamF2YQorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy51aS93dHBfdWkvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9mcmFtZXdvcmtzL2ludGVybmFsL3VpL0Rpc3BsYXlVdGlsaXR5LmphdmEKQEAgLTEwLDkgKzEwLDYgQEAKICAqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqLwogLyoKICAqIENyZWF0ZWQgb24gQXByIDE5LCAyMDA0Ci0gKgotICogVE9ETyBUbyBjaGFuZ2UgdGhlIHRlbXBsYXRlIGZvciB0aGlzIGdlbmVyYXRlZCBmaWxlIGdvIHRvCi0gKiBXaW5kb3cgLSBQcmVmZXJlbmNlcyAtIEphdmEgLSBDb2RlIEdlbmVyYXRpb24gLSBDb2RlIGFuZCBDb21tZW50cwogICovCiBwYWNrYWdlIG9yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy5pbnRlcm5hbC51aTsKIApkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3MudWkvd3RwX3VpL29yZy9lY2xpcHNlL3dzdC9jb21tb24vZnJhbWV3b3Jrcy9pbnRlcm5hbC91aS9FcnJvckRpYWxvZy5qYXZhIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3MudWkvd3RwX3VpL29yZy9lY2xpcHNlL3dzdC9jb21tb24vZnJhbWV3b3Jrcy9pbnRlcm5hbC91aS9FcnJvckRpYWxvZy5qYXZhCmluZGV4IDZjMjQ0MjYuLmE0ZmEyNGUgMTAwNjQ0Ci0tLSBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzLnVpL3d0cF91aS9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ZyYW1ld29ya3MvaW50ZXJuYWwvdWkvRXJyb3JEaWFsb2cuamF2YQorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy51aS93dHBfdWkvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9mcmFtZXdvcmtzL2ludGVybmFsL3VpL0Vycm9yRGlhbG9nLmphdmEKQEAgLTYyLDYgKzYyLDcgQEAKIAogCS8vV29ya2Fyb3VuZC4gU1dUIGRvZXMgbm90IHNlZW0gdG8gc2V0IHJpZ3RoIHRoZSBkZWZhdWx0IGJ1dHRvbiBpZgogCS8vdGhlcmUgaXMgbm90IGNvbnRyb2wgd2l0aCBmb2N1cy4gQnVnOiAxNDY2OAorCUBPdmVycmlkZQogCXB1YmxpYyBpbnQgb3BlbigpIHsKIAkJY3JlYXRlKCk7CiAJCUJ1dHRvbiBiID0gZ2V0QnV0dG9uKGRlZmF1bHRCdXR0b25JbmRleCk7CkBAIC04MCw2ICs4MSw3IEBACiAJLyoKIAkgKiAobm9uLUphdmFkb2MpIE1ldGhvZCBkZWNsYXJlZCBvbiBEaWFsb2cuCiAJICovCisJQE92ZXJyaWRlCiAJcHJvdGVjdGVkIHZvaWQgYnV0dG9uUHJlc3NlZChpbnQgYnV0dG9uSWQpIHsKIAkJaWYgKGJ1dHRvbklkID09IGRldGFpbEJ1dHRvbklEKSB7CiAJCQl0b2dnbGVEZXRhaWxzQXJlYSgpOwpAQCAtMTU3LDYgKzE1OSw3IEBACiAJCXJldHVybiBkaWFsb2cub3BlbigpID09IDA7CiAJfQogCisJQE92ZXJyaWRlCiAJcHJvdGVjdGVkIENvbnRyb2wgY3JlYXRlRGlhbG9nQXJlYShDb21wb3NpdGUgcGFyZW50KSB7CiAJCS8vIGNyZWF0ZSBhIGNvbXBvc2l0ZSB3aXRoIHN0YW5kYXJkIG1hcmdpbnMgYW5kIHNwYWNpbmcKIAkJQ29tcG9zaXRlIGNvbXBvc2l0ZSA9IG5ldyBDb21wb3NpdGUocGFyZW50LCBTV1QuTk9ORSk7CmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy51aS93dHBfdWkvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9mcmFtZXdvcmtzL2ludGVybmFsL3VpL0xpc3RNZXNzYWdlRGlhbG9nLmphdmEgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy51aS93dHBfdWkvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9mcmFtZXdvcmtzL2ludGVybmFsL3VpL0xpc3RNZXNzYWdlRGlhbG9nLmphdmEKaW5kZXggYWVkMzhhZi4uNGMxMWNhZCAxMDA2NDQKLS0tIGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3MudWkvd3RwX3VpL29yZy9lY2xpcHNlL3dzdC9jb21tb24vZnJhbWV3b3Jrcy9pbnRlcm5hbC91aS9MaXN0TWVzc2FnZURpYWxvZy5qYXZhCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzLnVpL3d0cF91aS9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ZyYW1ld29ya3MvaW50ZXJuYWwvdWkvTGlzdE1lc3NhZ2VEaWFsb2cuamF2YQpAQCAtMTAsOSArMTAsNiBAQAogICoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKiovCiAvKgogICogQ3JlYXRlZCBvbiBBdWcgNSwgMjAwNAotICoKLSAqIFRPRE8gVG8gY2hhbmdlIHRoZSB0ZW1wbGF0ZSBmb3IgdGhpcyBnZW5lcmF0ZWQgZmlsZSBnbyB0bwotICogV2luZG93IC0gUHJlZmVyZW5jZXMgLSBKYXZhIC0gQ29kZSBHZW5lcmF0aW9uIC0gQ29kZSBhbmQgQ29tbWVudHMKICAqLwogcGFja2FnZSBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3MuaW50ZXJuYWwudWk7CiAKQEAgLTI4LDkgKzI1LDYgQEAKIAogLyoqCiAgKiBAYXV0aG9yIGRmaG9sdAotICogCi0gKiBUT0RPIFRvIGNoYW5nZSB0aGUgdGVtcGxhdGUgZm9yIHRoaXMgZ2VuZXJhdGVkIHR5cGUgY29tbWVudCBnbyB0byBXaW5kb3cgLSBQcmVmZXJlbmNlcyAtIEphdmEgLQotICogQ29kZSBHZW5lcmF0aW9uIC0gQ29kZSBhbmQgQ29tbWVudHMKICAqLwogcHVibGljIGNsYXNzIExpc3RNZXNzYWdlRGlhbG9nIGV4dGVuZHMgTWVzc2FnZURpYWxvZyB7CiAJcHJvdGVjdGVkIFN0cmluZ1tdIGxpc3RJdGVtczsKQEAgLTkzLDYgKzg3LDcgQEAKIAkgKiAgICAgICAgICAgIHBhcmVudCBjb21wb3NpdGUgdG8gY29udGFpbiB0aGUgY3VzdG9tIGFyZWEKIAkgKiBAcmV0dXJuIHRoZSBjdXN0b20gYXJlYSBjb250cm9sLCBvciA8Y29kZT5udWxsPC9jb2RlPgogCSAqLworCUBPdmVycmlkZQogCXByb3RlY3RlZCBDb250cm9sIGNyZWF0ZUN1c3RvbUFyZWEoQ29tcG9zaXRlIHBhcmVudCkgewogCiAJCUNvbXBvc2l0ZSBjb21wb3NpdGUgPSBuZXcgQ29tcG9zaXRlKHBhcmVudCwgMCk7CmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy51aS93dHBfdWkvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9mcmFtZXdvcmtzL2ludGVybmFsL3VpL01lbnVFbmFibGVtZW50UHJvcGVydHlUZXN0ZXIuamF2YSBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzLnVpL3d0cF91aS9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ZyYW1ld29ya3MvaW50ZXJuYWwvdWkvTWVudUVuYWJsZW1lbnRQcm9wZXJ0eVRlc3Rlci5qYXZhCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLmRjMWFmYmYKLS0tIC9kZXYvbnVsbAorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy51aS93dHBfdWkvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9mcmFtZXdvcmtzL2ludGVybmFsL3VpL01lbnVFbmFibGVtZW50UHJvcGVydHlUZXN0ZXIuamF2YQpAQCAtMCwwICsxLDM2IEBACisvKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKgorICogQ29weXJpZ2h0IChjKSAyMDEwIElCTSBDb3Jwb3JhdGlvbiBhbmQgb3RoZXJzLgorICogQWxsIHJpZ2h0cyByZXNlcnZlZC4gVGhpcyBwcm9ncmFtIGFuZCB0aGUgYWNjb21wYW55aW5nIG1hdGVyaWFscworICogYXJlIG1hZGUgYXZhaWxhYmxlIHVuZGVyIHRoZSB0ZXJtcyBvZiB0aGUgRWNsaXBzZSBQdWJsaWMgTGljZW5zZSB2MS4wCisgKiB3aGljaCBhY2NvbXBhbmllcyB0aGlzIGRpc3RyaWJ1dGlvbiwgYW5kIGlzIGF2YWlsYWJsZSBhdAorICogaHR0cDovL3d3dy5lY2xpcHNlLm9yZy9sZWdhbC9lcGwtdjEwLmh0bWwKKyAqCisgKiBDb250cmlidXRvcnM6CisgKiAgICAgSUJNIENvcnBvcmF0aW9uIC0gaW5pdGlhbCBBUEkgYW5kIGltcGxlbWVudGF0aW9uCisgKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKi8KKyAKK3BhY2thZ2Ugb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzLmludGVybmFsLnVpOworCitpbXBvcnQgamF2YS51dGlsLkxpc3Q7CisKK2ltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLmV4cHJlc3Npb25zLklQcm9wZXJ0eVRlc3RlcjsKK2ltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLmV4cHJlc3Npb25zLlByb3BlcnR5VGVzdGVyOworCitwdWJsaWMgY2xhc3MgTWVudUVuYWJsZW1lbnRQcm9wZXJ0eVRlc3RlciBleHRlbmRzIFByb3BlcnR5VGVzdGVyeworCisJc3RhdGljIHByaXZhdGUgTGlzdDxNZW51RW5hYmxlckV4dGVuc2lvbj4gIGxpc3QgPSBNZW51RW5hYmxlckV4dGVuc2lvblJlYWRlci5nZXRJbnN0YW5jZSgpLmdldE1lbnVFbmFibGVyKCk7CQorCXB1YmxpYyBib29sZWFuIHRlc3QoT2JqZWN0IHJlY2VpdmVyLCBTdHJpbmcgcHJvcGVydHksIE9iamVjdFtdIGFyZ3MsCisJCQlPYmplY3QgZXhwZWN0ZWRWYWx1ZSkgeworCisJCWlmKCBsaXN0ICE9IG51bGwgJiYgbGlzdC5zaXplKCkgPiAwICl7CisJCQlNZW51RW5hYmxlckV4dGVuc2lvbiBtZW51RW5hYmxlckV4dGVuc2lvbiA9IGxpc3QuZ2V0KCAwICk7CisJCQlJUHJvcGVydHlUZXN0ZXIgdGVzdGVyID0gIG1lbnVFbmFibGVyRXh0ZW5zaW9uLmdldEluc3RhbmNlKCk7CisJCQlpZiggdGVzdGVyICE9IG51bGwgKXsKKwkJCQlyZXR1cm4gdGVzdGVyLnRlc3QoIHJlY2VpdmVyLCBwcm9wZXJ0eSwgYXJncywgZXhwZWN0ZWRWYWx1ZSApOworCQkJfQorCQkJcmV0dXJuIHRydWU7CisJCX0KKwkJcmV0dXJuIHRydWU7CisJfQorCit9CmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy51aS93dHBfdWkvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9mcmFtZXdvcmtzL2ludGVybmFsL3VpL01lbnVFbmFibGVyRXh0ZW5zaW9uLmphdmEgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy51aS93dHBfdWkvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9mcmFtZXdvcmtzL2ludGVybmFsL3VpL01lbnVFbmFibGVyRXh0ZW5zaW9uLmphdmEKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uMmMxZGJiZAotLS0gL2Rldi9udWxsCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzLnVpL3d0cF91aS9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ZyYW1ld29ya3MvaW50ZXJuYWwvdWkvTWVudUVuYWJsZXJFeHRlbnNpb24uamF2YQpAQCAtMCwwICsxLDY2IEBACisvKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKgorICogQ29weXJpZ2h0IChjKSAyMDEwIElCTSBDb3Jwb3JhdGlvbiBhbmQgb3RoZXJzLgorICogQWxsIHJpZ2h0cyByZXNlcnZlZC4gVGhpcyBwcm9ncmFtIGFuZCB0aGUgYWNjb21wYW55aW5nIG1hdGVyaWFscworICogYXJlIG1hZGUgYXZhaWxhYmxlIHVuZGVyIHRoZSB0ZXJtcyBvZiB0aGUgRWNsaXBzZSBQdWJsaWMgTGljZW5zZSB2MS4wCisgKiB3aGljaCBhY2NvbXBhbmllcyB0aGlzIGRpc3RyaWJ1dGlvbiwgYW5kIGlzIGF2YWlsYWJsZSBhdAorICogaHR0cDovL3d3dy5lY2xpcHNlLm9yZy9sZWdhbC9lcGwtdjEwLmh0bWwKKyAqCisgKiBDb250cmlidXRvcnM6CisgKiAgICAgSUJNIENvcnBvcmF0aW9uIC0gaW5pdGlhbCBBUEkgYW5kIGltcGxlbWVudGF0aW9uCisgKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKi8KKworcGFja2FnZSBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3MuaW50ZXJuYWwudWk7CisKK2ltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLmV4cHJlc3Npb25zLklQcm9wZXJ0eVRlc3RlcjsKK2ltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJ1bnRpbWUuSUNvbmZpZ3VyYXRpb25FbGVtZW50OworCisKK3B1YmxpYyBjbGFzcyBNZW51RW5hYmxlckV4dGVuc2lvbiB7CisKKwlwdWJsaWMgc3RhdGljIGZpbmFsIFN0cmluZyBBVFRfSUQgPSAiaWQiOyAvLyROT04tTkxTLTEkCisJcHVibGljIHN0YXRpYyBmaW5hbCBTdHJpbmcgTUVOVV9FTkFCTEVSX0VYVEVOU0lPTiA9ICJtZW51ZW5hYmxlciI7IC8vJE5PTi1OTFMtMSQKKwkKKwlwcml2YXRlIFN0cmluZyBpZCA9IG51bGw7CisJcHJpdmF0ZSBJQ29uZmlndXJhdGlvbkVsZW1lbnQgZWxlbWVudDsKKwkvL3ByaXZhdGUgSU1lbnVFbmFibGVyIGluc3RhbmNlOworCXByaXZhdGUgSVByb3BlcnR5VGVzdGVyIGluc3RhbmNlOworCXByaXZhdGUgYm9vbGVhbiBlcnJvckNvbmRpdGlvbiA9IGZhbHNlOworCQorCXB1YmxpYyBNZW51RW5hYmxlckV4dGVuc2lvbigpeworCQlzdXBlcigpOworCX0KKwkKKwlwcml2YXRlIHZvaWQgaW5pdCgpIHsKKwkJaWQgPSBlbGVtZW50LmdldEF0dHJpYnV0ZShBVFRfSUQpOworCX0KKworCS8qKgorCSAqIEByZXR1cm4gUmV0dXJucyB0aGUgaWQuCisJICovCisJcHVibGljIFN0cmluZyBnZXRJZCgpIHsKKwkJcmV0dXJuIGlkOworCX0KKworCS8qKgorCSAqIEBwYXJhbSBpZAorCSAqICAgICAgICAgICAgVGhlIGlkIHRvIHNldC4KKwkgKi8KKwlwdWJsaWMgdm9pZCBzZXRJZChTdHJpbmcgaWQpIHsKKwkJdGhpcy5pZCA9IGlkOworCX0KKwkKKwlwdWJsaWMgTWVudUVuYWJsZXJFeHRlbnNpb24oSUNvbmZpZ3VyYXRpb25FbGVtZW50IGVsZW1lbnQpIHsKKwkJdGhpcy5lbGVtZW50ID0gZWxlbWVudDsKKwkJaW5pdCgpOworCX0KKwkKKwlwdWJsaWMgSVByb3BlcnR5VGVzdGVyIGdldEluc3RhbmNlKCkgeworCQl0cnkgeworCQkJaWYgKGluc3RhbmNlID09IG51bGwgJiYgIWVycm9yQ29uZGl0aW9uKQorCQkJCWluc3RhbmNlID0gKElQcm9wZXJ0eVRlc3RlcikgZWxlbWVudC5jcmVhdGVFeGVjdXRhYmxlRXh0ZW5zaW9uKCJjbGFzc05hbWUiKTsgLy8kTk9OLU5MUy0xJAorCQl9IGNhdGNoIChUaHJvd2FibGUgZSkgeworCQkJZXJyb3JDb25kaXRpb24gPSB0cnVlOworCQl9CisJCXJldHVybiBpbnN0YW5jZTsKKwl9CQorfQpkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3MudWkvd3RwX3VpL29yZy9lY2xpcHNlL3dzdC9jb21tb24vZnJhbWV3b3Jrcy9pbnRlcm5hbC91aS9NZW51RW5hYmxlckV4dGVuc2lvblJlYWRlci5qYXZhIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3MudWkvd3RwX3VpL29yZy9lY2xpcHNlL3dzdC9jb21tb24vZnJhbWV3b3Jrcy9pbnRlcm5hbC91aS9NZW51RW5hYmxlckV4dGVuc2lvblJlYWRlci5qYXZhCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLjY4NGI5NjQKLS0tIC9kZXYvbnVsbAorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy51aS93dHBfdWkvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9mcmFtZXdvcmtzL2ludGVybmFsL3VpL01lbnVFbmFibGVyRXh0ZW5zaW9uUmVhZGVyLmphdmEKQEAgLTAsMCArMSw1OSBAQAorLyoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioKKyAqIENvcHlyaWdodCAoYykgMjAxMCBJQk0gQ29ycG9yYXRpb24gYW5kIG90aGVycy4KKyAqIEFsbCByaWdodHMgcmVzZXJ2ZWQuIFRoaXMgcHJvZ3JhbSBhbmQgdGhlIGFjY29tcGFueWluZyBtYXRlcmlhbHMKKyAqIGFyZSBtYWRlIGF2YWlsYWJsZSB1bmRlciB0aGUgdGVybXMgb2YgdGhlIEVjbGlwc2UgUHVibGljIExpY2Vuc2UgdjEuMAorICogd2hpY2ggYWNjb21wYW5pZXMgdGhpcyBkaXN0cmlidXRpb24sIGFuZCBpcyBhdmFpbGFibGUgYXQKKyAqIGh0dHA6Ly93d3cuZWNsaXBzZS5vcmcvbGVnYWwvZXBsLXYxMC5odG1sCisgKgorICogQ29udHJpYnV0b3JzOgorICogICAgIElCTSBDb3Jwb3JhdGlvbiAtIGluaXRpYWwgQVBJIGFuZCBpbXBsZW1lbnRhdGlvbgorICoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKiovCisKK3BhY2thZ2Ugb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzLmludGVybmFsLnVpOworCitpbXBvcnQgamF2YS51dGlsLkFycmF5TGlzdDsKK2ltcG9ydCBqYXZhLnV0aWwuTGlzdDsKKworaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucnVudGltZS5JQ29uZmlndXJhdGlvbkVsZW1lbnQ7CitpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb3JlLnV0aWwuUmVnaXN0cnlSZWFkZXI7CisKKworCitwdWJsaWMgY2xhc3MgTWVudUVuYWJsZXJFeHRlbnNpb25SZWFkZXIgZXh0ZW5kcyBSZWdpc3RyeVJlYWRlciB7CisKKwlwcml2YXRlIHN0YXRpYyBNZW51RW5hYmxlckV4dGVuc2lvblJlYWRlciBpbnN0YW5jZSA9IG51bGw7CisJcHJpdmF0ZSBMaXN0PE1lbnVFbmFibGVyRXh0ZW5zaW9uPiBwYWdlRXh0ZW5kZXJzID0gbnVsbDsKKwkKKwlwdWJsaWMgTWVudUVuYWJsZXJFeHRlbnNpb25SZWFkZXIoKXsKKwkJc3VwZXIoIm9yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy51aSIsICJNZW51RW5hYmxlciIpOyAvLyROT04tTkxTLTEkIC8vJE5PTi1OTFMtMiQgCisJfQorCQorCisJcHVibGljIHN0YXRpYyBNZW51RW5hYmxlckV4dGVuc2lvblJlYWRlciBnZXRJbnN0YW5jZSgpIHsKKwkJaWYgKGluc3RhbmNlID09IG51bGwpIHsKKwkJCWluc3RhbmNlID0gbmV3IE1lbnVFbmFibGVyRXh0ZW5zaW9uUmVhZGVyKCk7CisJCQlpbnN0YW5jZS5yZWFkUmVnaXN0cnkoKTsKKwkJfQorCQlyZXR1cm4gaW5zdGFuY2U7CisJfQorCQorCUBPdmVycmlkZQorCXB1YmxpYyBib29sZWFuIHJlYWRFbGVtZW50KElDb25maWd1cmF0aW9uRWxlbWVudCBlbGVtZW50KSB7CisJCWlmIChNZW51RW5hYmxlckV4dGVuc2lvbi5NRU5VX0VOQUJMRVJfRVhURU5TSU9OLmVxdWFscyhlbGVtZW50LmdldE5hbWUoKSkpIHsKKwkJCWFkZEV4dGVuc2lvbihlbGVtZW50KTsKKwkJCXJldHVybiB0cnVlOworCQl9CisJCXJldHVybiBmYWxzZTsKKwl9CisJCisJcHJvdGVjdGVkIHZvaWQgYWRkRXh0ZW5zaW9uKElDb25maWd1cmF0aW9uRWxlbWVudCBuZXdFeHRlbnNpb24pIHsKKwkJZ2V0TWVudUVuYWJsZXIoKS5hZGQobmV3IE1lbnVFbmFibGVyRXh0ZW5zaW9uKG5ld0V4dGVuc2lvbikpOworCX0KKwkKKwlwdWJsaWMgTGlzdDxNZW51RW5hYmxlckV4dGVuc2lvbj4gZ2V0TWVudUVuYWJsZXIoKSB7CisJCWlmIChwYWdlRXh0ZW5kZXJzID09IG51bGwpCisJCQlwYWdlRXh0ZW5kZXJzID0gbmV3IEFycmF5TGlzdDxNZW51RW5hYmxlckV4dGVuc2lvbj4oKTsKKwkJcmV0dXJuIHBhZ2VFeHRlbmRlcnM7CisJfQkKKworfQpkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3MudWkvd3RwX3VpL29yZy9lY2xpcHNlL3dzdC9jb21tb24vZnJhbWV3b3Jrcy9pbnRlcm5hbC91aS9OZXdQcm9qZWN0R3JvdXAuamF2YSBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzLnVpL3d0cF91aS9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ZyYW1ld29ya3MvaW50ZXJuYWwvdWkvTmV3UHJvamVjdEdyb3VwLmphdmEKaW5kZXggNmJiMzNmNi4uMTUwNjdmMSAxMDA2NDQKLS0tIGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3MudWkvd3RwX3VpL29yZy9lY2xpcHNlL3dzdC9jb21tb24vZnJhbWV3b3Jrcy9pbnRlcm5hbC91aS9OZXdQcm9qZWN0R3JvdXAuamF2YQorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy51aS93dHBfdWkvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9mcmFtZXdvcmtzL2ludGVybmFsL3VpL05ld1Byb2plY3RHcm91cC5qYXZhCkBAIC0xLDUgKzEsNSBAQAogLyoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioKLSAqIENvcHlyaWdodCAoYykgMjAwMywgMjAwNiBJQk0gQ29ycG9yYXRpb24gYW5kIG90aGVycy4KKyAqIENvcHlyaWdodCAoYykgMjAwMywgMjAwOSBJQk0gQ29ycG9yYXRpb24gYW5kIG90aGVycy4KICAqIEFsbCByaWdodHMgcmVzZXJ2ZWQuIFRoaXMgcHJvZ3JhbSBhbmQgdGhlIGFjY29tcGFueWluZyBtYXRlcmlhbHMKICAqIGFyZSBtYWRlIGF2YWlsYWJsZSB1bmRlciB0aGUgdGVybXMgb2YgdGhlIEVjbGlwc2UgUHVibGljIExpY2Vuc2UgdjEuMAogICogd2hpY2ggYWNjb21wYW5pZXMgdGhpcyBkaXN0cmlidXRpb24sIGFuZCBpcyBhdmFpbGFibGUgYXQKQEAgLTEzLDYgKzEzLDcgQEAKIGltcG9ydCBqYXZhLmlvLkZpbGU7CiAKIGltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJ1bnRpbWUuUGF0aDsKK2ltcG9ydCBvcmcuZWNsaXBzZS5qZmFjZS5sYXlvdXQuR3JpZERhdGFGYWN0b3J5OwogaW1wb3J0IG9yZy5lY2xpcHNlLnN3dC5TV1Q7CiBpbXBvcnQgb3JnLmVjbGlwc2Uuc3d0LmV2ZW50cy5Nb2RpZnlFdmVudDsKIGltcG9ydCBvcmcuZWNsaXBzZS5zd3QuZXZlbnRzLk1vZGlmeUxpc3RlbmVyOwpAQCAtNDQsNyArNDUsNyBAQAogCS8vIGRlZmF1bHQgdmFsdWVzCiAJcHJpdmF0ZSBTdHJpbmcgZGVmUHJvamVjdE5hbWVMYWJlbCA9IFdUUENvbW1vblVJUmVzb3VyY2VIYW5kbGVyLk5hbWVfOwogCXByaXZhdGUgU3RyaW5nIGRlZkJyb3dzZUJ1dHRvbkxhYmVsID0gV1RQQ29tbW9uVUlSZXNvdXJjZUhhbmRsZXIuQnJvd3NlXzsKLQlwcml2YXRlIHN0YXRpYyBmaW5hbCBTdHJpbmcgZGVmRGlyRGlhbG9nTGFiZWwgPSAiRGlyZWN0b3J5IjsgLy8kTk9OLU5MUy0xJAorCXByaXZhdGUgU3RyaW5nIGRlZkRpckRpYWxvZ0xhYmVsID0gV1RQQ29tbW9uVUlSZXNvdXJjZUhhbmRsZXIuRGVmRGlyRGlhbG9nTGFiZWxfOwogCiAJcHJpdmF0ZSBEYXRhTW9kZWxTeW5jaEhlbHBlciBzeW5jaEhlbHBlcjsKIApAQCAtMTA1LDE0ICsxMDYsMTEgQEAKIAkJcHJvamVjdEdyb3VwLnNldFRleHQoSW50ZXJuYWxDb21tb25Xb3JrYmVuY2hNZXNzYWdlcy5XaXphcmROZXdQcm9qZWN0Q3JlYXRpb25QYWdlX3Byb2plY3RDb250ZW50c0xhYmVsKTsKIAogCQlmaW5hbCBCdXR0b24gdXNlRGVmYXVsdHNCdXR0b24gPSBuZXcgQnV0dG9uKHByb2plY3RHcm91cCwgU1dULkNIRUNLIHwgU1dULlJJR0hUKTsKKwkJR3JpZERhdGFGYWN0b3J5LmRlZmF1bHRzRm9yKHVzZURlZmF1bHRzQnV0dG9uKS5zcGFuKDMsMSkuYXBwbHlUbyh1c2VEZWZhdWx0c0J1dHRvbik7CiAJCXVzZURlZmF1bHRzQnV0dG9uLnNldFRleHQoSW50ZXJuYWxDb21tb25Xb3JrYmVuY2hNZXNzYWdlcy5XaXphcmROZXdQcm9qZWN0Q3JlYXRpb25QYWdlX3VzZURlZmF1bHRMYWJlbCk7CiAJCXVzZURlZmF1bHRzQnV0dG9uLnNldEZvbnQoZm9udCk7CiAJCXN5bmNoSGVscGVyLnN5bmNoQ2hlY2tib3godXNlRGVmYXVsdHNCdXR0b24sIFVTRV9ERUZBVUxUX0xPQ0FUSU9OLCBudWxsKTsKIAotCQlHcmlkRGF0YSBidXR0b25EYXRhID0gbmV3IEdyaWREYXRhKCk7Ci0JCWJ1dHRvbkRhdGEuaG9yaXpvbnRhbFNwYW4gPSAzOwotCQl1c2VEZWZhdWx0c0J1dHRvbi5zZXRMYXlvdXREYXRhKGJ1dHRvbkRhdGEpOwotCiAJCWNyZWF0ZVVzZXJTcGVjaWZpZWRQcm9qZWN0TG9jYXRpb25Hcm91cChwcm9qZWN0R3JvdXApOwogCX0KIApAQCAtMTMyLDkgKzEzMCwxMSBAQAogCiAJCS8vIGJyb3dzZSBidXR0b24KIAkJYnJvd3NlQnV0dG9uID0gbmV3IEJ1dHRvbihwcm9qZWN0R3JvdXAsIFNXVC5QVVNIKTsKKwkJR3JpZERhdGFGYWN0b3J5LmRlZmF1bHRzRm9yKGJyb3dzZUJ1dHRvbikuYXBwbHlUbyhicm93c2VCdXR0b24pOwogCQlicm93c2VCdXR0b24uc2V0Rm9udChmb250KTsKIAkJYnJvd3NlQnV0dG9uLnNldFRleHQoZGVmQnJvd3NlQnV0dG9uTGFiZWwpOwogCQlicm93c2VCdXR0b24uYWRkU2VsZWN0aW9uTGlzdGVuZXIobmV3IFNlbGVjdGlvbkFkYXB0ZXIoKSB7CisJCQlAT3ZlcnJpZGUKIAkJCXB1YmxpYyB2b2lkIHdpZGdldFNlbGVjdGVkKFNlbGVjdGlvbkV2ZW50IGV2ZW50KSB7CiAJCQkJaGFuZGxlTG9jYXRpb25Ccm93c2VCdXR0b25QcmVzc2VkKCk7CiAJCQl9CmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy51aS93dHBfdWkvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9mcmFtZXdvcmtzL2ludGVybmFsL3VpL092ZXJsYXlJY29uLmphdmEgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy51aS93dHBfdWkvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9mcmFtZXdvcmtzL2ludGVybmFsL3VpL092ZXJsYXlJY29uLmphdmEKaW5kZXggOGZmN2IwYS4uZjYyM2VkNCAxMDA2NDQKLS0tIGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3MudWkvd3RwX3VpL29yZy9lY2xpcHNlL3dzdC9jb21tb24vZnJhbWV3b3Jrcy9pbnRlcm5hbC91aS9PdmVybGF5SWNvbi5qYXZhCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzLnVpL3d0cF91aS9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ZyYW1ld29ya3MvaW50ZXJuYWwvdWkvT3ZlcmxheUljb24uamF2YQpAQCAtNjgsNiArNjgsNyBAQAogCQl9CiAJfQogCisJQE92ZXJyaWRlCiAJcHJvdGVjdGVkIHZvaWQgZHJhd0NvbXBvc2l0ZUltYWdlKGludCB3aWR0aCwgaW50IGhlaWdodCkgewogCQlJbWFnZURhdGEgYmcgPSBmQmFzZS5nZXRJbWFnZURhdGEoKTsKIAkJZHJhd0ltYWdlKGJnLCAwLCAwKTsKQEAgLTExNSw2ICsxMTYsNyBAQAogCQl9CiAJfQogCisJQE92ZXJyaWRlCiAJcHJvdGVjdGVkIFBvaW50IGdldFNpemUoKSB7CiAJCXJldHVybiBmU2l6ZTsKIAl9CmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy51aS93dHBfdWkvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9mcmFtZXdvcmtzL2ludGVybmFsL3VpL1BhZ2VHcm91cE1hbmFnZXIuamF2YSBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzLnVpL3d0cF91aS9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ZyYW1ld29ya3MvaW50ZXJuYWwvdWkvUGFnZUdyb3VwTWFuYWdlci5qYXZhCmluZGV4IDk5MTc1ODkuLmMzZmQ5MDIgMTAwNjQ0Ci0tLSBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzLnVpL3d0cF91aS9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ZyYW1ld29ya3MvaW50ZXJuYWwvdWkvUGFnZUdyb3VwTWFuYWdlci5qYXZhCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzLnVpL3d0cF91aS9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ZyYW1ld29ya3MvaW50ZXJuYWwvdWkvUGFnZUdyb3VwTWFuYWdlci5qYXZhCkBAIC0yNCw3ICsyNCw2IEBACiBpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5ydW50aW1lLklFeHRlbnNpb25Qb2ludDsKIGltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJ1bnRpbWUuSVN0YXR1czsKIGltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJ1bnRpbWUuUGxhdGZvcm07Ci1pbXBvcnQgb3JnLmVjbGlwc2UuamVtLnV0aWwubG9nZ2VyLnByb3h5LkxvZ2dlcjsKIGltcG9ydCBvcmcuZWNsaXBzZS5qZmFjZS53aXphcmQuSVdpemFyZFBhZ2U7CiBpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzLmRhdGFtb2RlbC5JRGF0YU1vZGVsOwogaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy5pbnRlcm5hbC5kYXRhbW9kZWwuSURhdGFNb2RlbFBhdXNpYmxlT3BlcmF0aW9uOwpAQCAtMTE3LDEyICsxMTYsMTIgQEAKIAkJdHJ5IHsKIAkJCXBhZ2VGb3VuZCA9IGZpbmROZXh0UGFnZSh0cnVlKTsKIAkJfSBjYXRjaCAoRXhjZXB0aW9uIGV4YykgewotCQkJTG9nZ2VyLmdldExvZ2dlcigpLmxvZ0Vycm9yKGV4Yyk7CisJCQlXVFBVSVBsdWdpbi5sb2dFcnJvcihleGMpOwogCQkJaWYgKHJvb3RPcGVyYXRpb24gIT0gbnVsbCkgewogCQkJCXRyeSB7CiAJCQkJCXJvb3RPcGVyYXRpb24ucm9sbEJhY2sobnVsbCwgbnVsbCk7CiAJCQkJfSBjYXRjaCAoRXhlY3V0aW9uRXhjZXB0aW9uIGUpIHsKLQkJCQkJTG9nZ2VyLmdldExvZ2dlcigpLmxvZ0Vycm9yKGUpOworCQkJCQlXVFBVSVBsdWdpbi5sb2dFcnJvcihlKTsKIAkJCQl9CiAJCQl9CiAJCQlwYWdlRm91bmQgPSBmYWxzZTsKQEAgLTE1NSw3ICsxNTQsNyBAQAogCQkJCQl0cnkgewogCQkJCQkJcm9vdE9wZXJhdGlvbi5yb2xsQmFjayhudWxsLCBudWxsKTsKIAkJCQkJfSBjYXRjaCAoRXhlY3V0aW9uRXhjZXB0aW9uIGUpIHsKLQkJCQkJCUxvZ2dlci5nZXRMb2dnZXIoKS5sb2dFcnJvcihlKTsKKwkJCQkJCVdUUFVJUGx1Z2luLmxvZ0Vycm9yKGUpOwogCQkJCQl9CiAJCQkJfQogCQkJfQpAQCAtMjI5LDcgKzIyOCw3IEBACiAJCUlFeHRlbnNpb25Qb2ludCBwb2ludCA9IFBsYXRmb3JtLmdldEV4dGVuc2lvblJlZ2lzdHJ5KCkuZ2V0RXh0ZW5zaW9uUG9pbnQoQ29tbW9uVUlQbHVnaW5Db25zdGFudHMuUExVR0lOX0lELCBFTEVNRU5UX1BBR0VfR1JPVVApOwogCQlJQ29uZmlndXJhdGlvbkVsZW1lbnRbXSBhbGxFbGVtZW50cyA9IHBvaW50LmdldENvbmZpZ3VyYXRpb25FbGVtZW50cygpOwogCQlmb3IgKGludCBpID0gMDsgaSA8IGFsbEVsZW1lbnRzLmxlbmd0aDsgaSsrKSB7Ci0JCQlJQ29uZmlndXJhdGlvbkVsZW1lbnQgZWxlbWVudCA9IChJQ29uZmlndXJhdGlvbkVsZW1lbnQpIGFsbEVsZW1lbnRzW2ldOworCQkJSUNvbmZpZ3VyYXRpb25FbGVtZW50IGVsZW1lbnQgPSBhbGxFbGVtZW50c1tpXTsKIAkJCWlmIChFTEVNRU5UX1BBR0VfR1JPVVAuZXF1YWxzKGVsZW1lbnQuZ2V0TmFtZSgpKSkgewogCQkJCXJlc3VsdC5hZGQoZWxlbWVudCk7CiAJCQl9CkBAIC0yNzQsMTIgKzI3MywxNCBAQAogCQkJCQl0cnkgewogCQkJCQkJc3RhdHVzID0gcm9vdE9wZXJhdGlvbi5yZXN1bWUobnVsbCwgbnVsbCk7CiAJCQkJCX0gY2F0Y2ggKEV4ZWN1dGlvbkV4Y2VwdGlvbiBlKSB7Ci0JCQkJCQlMb2dnZXIuZ2V0TG9nZ2VyKCkubG9nRXJyb3IoZSk7CisJCQkJCQlXVFBVSVBsdWdpbi5sb2dFcnJvcihlKTsKIAkJCQkJfQogCQkJCQluZXh0U3RhY2tFbnRyeS5yYW5PcGVyYXRpb25zID0gdHJ1ZTsKLQotCQkJCQlpZiAoc3RhdHVzLmdldFNldmVyaXR5KCkgPT0gSVN0YXR1cy5FUlJPUikgewotCQkJCQkJLy8gVE9ETyBuZWVkIGEgYmV0dGVyIGVycm9yIGZlZWRiYWNrIG1lY2hhbmlzbSBoZXJlLgorCQkJCQkKKwkJCQkJLy8gVE9ETyBuZWVkIGEgYmV0dGVyIGVycm9yIGZlZWRiYWNrIG1lY2hhbmlzbSBoZXJlLgorCQkJCQlpZihzdGF0dXMgPT0gbnVsbCl7CisJCQkJCQl0aHJvdyBuZXcgSWxsZWdhbEFyZ3VtZW50RXhjZXB0aW9uKCk7CisJCQkJCX0gZWxzZSBpZiAoc3RhdHVzLmdldFNldmVyaXR5KCkgPT0gSVN0YXR1cy5FUlJPUikgewogCQkJCQkJdGhyb3cgbmV3IElsbGVnYWxBcmd1bWVudEV4Y2VwdGlvbihzdGF0dXMuZ2V0TWVzc2FnZSgpKTsKIAkJCQkJfQogCQkJCX0KQEAgLTQwOSw3ICs0MTAsNyBAQAogCQkJCXRyeSB7CiAJCQkJCW5ld1BhZ2VJZCA9IHBhZ2VHcm91cEVudHJ5LmdldFBhZ2VIYW5kbGVyKCkuZ2V0TmV4dFBhZ2UocGFnZUlkLCBleHBlY3RlZElkKTsKIAkJCQl9IGNhdGNoIChFeGNlcHRpb24gZXhjKSB7Ci0JCQkJCUxvZ2dlci5nZXRMb2dnZXIoKS5sb2dFcnJvcihleGMpOworCQkJCQlXVFBVSVBsdWdpbi5sb2dFcnJvcihleGMpOwogCQkJCX0KIAogCQkJCWlmIChuZXdQYWdlSWQgIT0gbnVsbCAmJiBuZXdQYWdlSWQuZXF1YWxzKElETVBhZ2VIYW5kbGVyLlNLSVBfUEFHRSkgJiYgcGFnZUluZGV4ID49IDAgJiYgcGFnZUluZGV4IDwgcGFnZXMuc2l6ZSgpIC0gMikgewpAQCAtNDMwLDcgKzQzMSw3IEBACiAJCQl0cnkgewogCQkJCW5leHRHcm91cElEID0gcGFnZUdyb3VwRW50cnkuZ2V0UGFnZUdyb3VwSGFuZGxlcigpLmdldE5leHRQYWdlR3JvdXAoYWZ0ZXJJZCwgZ3JvdXBJRExpc3QpOwogCQkJfSBjYXRjaCAoRXhjZXB0aW9uIGV4YykgewotCQkJCUxvZ2dlci5nZXRMb2dnZXIoKS5sb2dFcnJvcihleGMpOworCQkJCVdUUFVJUGx1Z2luLmxvZ0Vycm9yKGV4Yyk7CiAJCQl9CiAKIAkJCWlmIChuZXh0R3JvdXBJRCAhPSBudWxsKSB7CkBAIC00OTcsMTkgKzQ5OCwxMiBAQAogCQkJcmV0dXJuIHBhZ2VHcm91cC5nZXRQYWdlcyhkYXRhTW9kZWwpOwogCQl9CiAKLQkJcHVibGljIFBhZ2VHcm91cEVudHJ5KFBhZ2VHcm91cEVudHJ5IG9yaWdpbmFsRW50cnkpIHsKLQkJCXBhZ2VHcm91cCA9IG9yaWdpbmFsRW50cnkucGFnZUdyb3VwOwotCQkJZ3JvdXBzVGhhdEZvbGxvdyA9IG9yaWdpbmFsRW50cnkuZ3JvdXBzVGhhdEZvbGxvdzsKLQkJCXBhZ2VIYW5kbGVyID0gb3JpZ2luYWxFbnRyeS5wYWdlSGFuZGxlcjsKLQkJCXBhZ2VHcm91cEhhbmRsZXIgPSBvcmlnaW5hbEVudHJ5LnBhZ2VHcm91cEhhbmRsZXI7Ci0JCX0KLQogCQlwcml2YXRlIHZvaWQgaW5pdCgpIHsKIAkJCXRyeSB7CiAJCQkJcGFnZUhhbmRsZXIgPSBwYWdlR3JvdXAuZ2V0UGFnZUhhbmRsZXIoZGF0YU1vZGVsKTsKIAkJCQlwYWdlR3JvdXBIYW5kbGVyID0gcGFnZUdyb3VwLmdldFBhZ2VHcm91cEhhbmRsZXIoZGF0YU1vZGVsKTsKIAkJCX0gY2F0Y2ggKEV4Y2VwdGlvbiBleGMpIHsKLQkJCQlMb2dnZXIuZ2V0TG9nZ2VyKCkubG9nRXJyb3IoZXhjKTsKKwkJCQlXVFBVSVBsdWdpbi5sb2dFcnJvcihleGMpOwogCQkJfQogCiAJCQlpZiAocGFnZUhhbmRsZXIgPT0gbnVsbCkKZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzLnVpL3d0cF91aS9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ZyYW1ld29ya3MvaW50ZXJuYWwvdWkvU2ltcGxlUGFnZUdyb3VwSGFuZGxlci5qYXZhIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3MudWkvd3RwX3VpL29yZy9lY2xpcHNlL3dzdC9jb21tb24vZnJhbWV3b3Jrcy9pbnRlcm5hbC91aS9TaW1wbGVQYWdlR3JvdXBIYW5kbGVyLmphdmEKaW5kZXggYzY4ZWU1Ny4uMjJhZDA1OSAxMDA2NDQKLS0tIGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3MudWkvd3RwX3VpL29yZy9lY2xpcHNlL3dzdC9jb21tb24vZnJhbWV3b3Jrcy9pbnRlcm5hbC91aS9TaW1wbGVQYWdlR3JvdXBIYW5kbGVyLmphdmEKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3MudWkvd3RwX3VpL29yZy9lY2xpcHNlL3dzdC9jb21tb24vZnJhbWV3b3Jrcy9pbnRlcm5hbC91aS9TaW1wbGVQYWdlR3JvdXBIYW5kbGVyLmphdmEKQEAgLTI2LDEwICsyNiw3IEBACiAJCQkJLy8gYXJyYXkgaWYgdGhlcmUgaXMgb25lLgogCQkJCWlmIChpbmRleCArIDEgPCBwYWdlR3JvdXBJRHMubGVuZ3RoKSB7CiAJCQkJCXJlc3VsdCA9IHBhZ2VHcm91cElEc1tpbmRleCArIDFdOwotCQkJCX0gZWxzZSB7Ci0JCQkJCXJlc3VsdCA9IG51bGw7CiAJCQkJfQotCiAJCQkJYnJlYWs7CiAJCQl9CiAJCX0KZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzLnVpL3d0cF91aS9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ZyYW1ld29ya3MvaW50ZXJuYWwvdWkvU2ltcGxlVmFsaWRhdGVFZGl0Q29udGV4dFVJLmphdmEgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy51aS93dHBfdWkvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9mcmFtZXdvcmtzL2ludGVybmFsL3VpL1NpbXBsZVZhbGlkYXRlRWRpdENvbnRleHRVSS5qYXZhCmluZGV4IGU5YmI1ODcuLmJlOTlhZjAgMTAwNjQ0Ci0tLSBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzLnVpL3d0cF91aS9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ZyYW1ld29ya3MvaW50ZXJuYWwvdWkvU2ltcGxlVmFsaWRhdGVFZGl0Q29udGV4dFVJLmphdmEKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3MudWkvd3RwX3VpL29yZy9lY2xpcHNlL3dzdC9jb21tb24vZnJhbWV3b3Jrcy9pbnRlcm5hbC91aS9TaW1wbGVWYWxpZGF0ZUVkaXRDb250ZXh0VUkuamF2YQpAQCAtMTQsMTEgKzE0LDExIEBACiBpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5yZXNvdXJjZXMuUmVzb3VyY2VzUGx1Z2luOwogaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucnVudGltZS5JU3RhdHVzOwogaW1wb3J0IG9yZy5lY2xpcHNlLnN3dC53aWRnZXRzLkRpc3BsYXk7Ci1pbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzLmludGVybmFsLklTaW1wbGVWYWxpZGF0ZUVkaXRDb250ZXh0OwogaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy5pbnRlcm5hbC5TaW1wbGVWYWxpZGF0ZUVkaXRDb250ZXh0SGVhZGxlc3M7CiAKLXB1YmxpYyBjbGFzcyBTaW1wbGVWYWxpZGF0ZUVkaXRDb250ZXh0VUkgZXh0ZW5kcyBTaW1wbGVWYWxpZGF0ZUVkaXRDb250ZXh0SGVhZGxlc3MgaW1wbGVtZW50cyBJU2ltcGxlVmFsaWRhdGVFZGl0Q29udGV4dCB7CitwdWJsaWMgY2xhc3MgU2ltcGxlVmFsaWRhdGVFZGl0Q29udGV4dFVJIGV4dGVuZHMgU2ltcGxlVmFsaWRhdGVFZGl0Q29udGV4dEhlYWRsZXNzIHsKIAorCUBPdmVycmlkZQogCXByb3RlY3RlZCBJU3RhdHVzIHZhbGlkYXRlRWRpdEltcGwoZmluYWwgSUZpbGVbXSBmaWxlc1RvVmFsaWRhdGUpIHsKIAkJZmluYWwgSVN0YXR1cyBbXSBzdGF0dXMgPSBuZXcgSVN0YXR1c1sxXTsKIAkJRGlzcGxheS5nZXREZWZhdWx0KCkuc3luY0V4ZWMobmV3IFJ1bm5hYmxlKCkgewpkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3MudWkvd3RwX3VpL29yZy9lY2xpcHNlL3dzdC9jb21tb24vZnJhbWV3b3Jrcy9pbnRlcm5hbC91aS9UaW1lZEtleUxpc3RlbmVyLmphdmEgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy51aS93dHBfdWkvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9mcmFtZXdvcmtzL2ludGVybmFsL3VpL1RpbWVkS2V5TGlzdGVuZXIuamF2YQppbmRleCA3ZjNjN2I0Li43ZWVlMTgxIDEwMDY0NAotLS0gYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy51aS93dHBfdWkvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9mcmFtZXdvcmtzL2ludGVybmFsL3VpL1RpbWVkS2V5TGlzdGVuZXIuamF2YQorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy51aS93dHBfdWkvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9mcmFtZXdvcmtzL2ludGVybmFsL3VpL1RpbWVkS2V5TGlzdGVuZXIuamF2YQpAQCAtMTE5LDYgKzExOSw3IEBACiAJICogCiAJICogQHNlZSBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3MuaW50ZXJuYWwudWkudXRpbC5UaW1lciNnZXRTb3VyY2UoKQogCSAqLworCUBPdmVycmlkZQogCXByb3RlY3RlZCBPYmplY3QgZ2V0U291cmNlKCkgewogCQlyZXR1cm4gbW9uaXRvcmluZ1RhcmdldDsKIAl9CmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy51aS93dHBfdWkvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9mcmFtZXdvcmtzL2ludGVybmFsL3VpL1RpbWVkTW9kaWZ5TGlzdGVuZXIuamF2YSBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzLnVpL3d0cF91aS9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ZyYW1ld29ya3MvaW50ZXJuYWwvdWkvVGltZWRNb2RpZnlMaXN0ZW5lci5qYXZhCmluZGV4IDk4MDQ1ZmUuLmM1NDBjNGUgMTAwNjQ0Ci0tLSBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzLnVpL3d0cF91aS9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ZyYW1ld29ya3MvaW50ZXJuYWwvdWkvVGltZWRNb2RpZnlMaXN0ZW5lci5qYXZhCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzLnVpL3d0cF91aS9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ZyYW1ld29ya3MvaW50ZXJuYWwvdWkvVGltZWRNb2RpZnlMaXN0ZW5lci5qYXZhCkBAIC0xOSwxMCArMTksOSBAQAogICovCiBpbXBvcnQgamF2YS5hd3QuZXZlbnQuQWN0aW9uTGlzdGVuZXI7CiAKLWltcG9ydCBvcmcuZWNsaXBzZS5zd3QuZXZlbnRzLk1vZGlmeUxpc3RlbmVyOwogaW1wb3J0IG9yZy5lY2xpcHNlLnN3dC53aWRnZXRzLldpZGdldDsKIAotcHVibGljIGNsYXNzIFRpbWVkTW9kaWZ5TGlzdGVuZXIgZXh0ZW5kcyBUaW1lZEtleUxpc3RlbmVyIGltcGxlbWVudHMgTW9kaWZ5TGlzdGVuZXIgeworcHVibGljIGNsYXNzIFRpbWVkTW9kaWZ5TGlzdGVuZXIgZXh0ZW5kcyBUaW1lZEtleUxpc3RlbmVyIHsKIAkvKioKIAkgKiBKMkVFVGltZWRNb2RlZnlMaXN0ZW5lciBjb25zdHJ1Y3RvciBjb21tZW50LgogCSAqIApAQCAtNDgsNiArNDcsNyBAQAogCS8qCiAJICogUmUvU3RhcnQgdGhlIHRpbWVyCiAJICovCisJQE92ZXJyaWRlCiAJcHVibGljIHZvaWQgbW9kaWZ5VGV4dChvcmcuZWNsaXBzZS5zd3QuZXZlbnRzLk1vZGlmeUV2ZW50IGUpIHsKIAkJbW9uaXRvcmluZ1RhcmdldCA9IChXaWRnZXQpIGUuZ2V0U291cmNlKCk7CiAJCXJlc3RhcnQoKTsKZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzLnVpL3d0cF91aS9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ZyYW1ld29ya3MvaW50ZXJuYWwvdWkvVGltZXJRdWV1ZS5qYXZhIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3MudWkvd3RwX3VpL29yZy9lY2xpcHNlL3dzdC9jb21tb24vZnJhbWV3b3Jrcy9pbnRlcm5hbC91aS9UaW1lclF1ZXVlLmphdmEKaW5kZXggNjI0NDJmNC4uYTg2YTBkOCAxMDA2NDQKLS0tIGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3MudWkvd3RwX3VpL29yZy9lY2xpcHNlL3dzdC9jb21tb24vZnJhbWV3b3Jrcy9pbnRlcm5hbC91aS9UaW1lclF1ZXVlLmphdmEKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3MudWkvd3RwX3VpL29yZy9lY2xpcHNlL3dzdC9jb21tb24vZnJhbWV3b3Jrcy9pbnRlcm5hbC91aS9UaW1lclF1ZXVlLmphdmEKQEAgLTIwOSw2ICsyMDksNyBAQAogCQlub3RpZnkoKTsKIAl9CiAKKwlAT3ZlcnJpZGUKIAlwdWJsaWMgc3luY2hyb25pemVkIFN0cmluZyB0b1N0cmluZygpIHsKIAkJU3RyaW5nQnVmZmVyIGJ1ZjsKIAkJVGltZXIgbmV4dFRpbWVyOwpkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3MudWkvd3RwX3VpL29yZy9lY2xpcHNlL3dzdC9jb21tb24vZnJhbWV3b3Jrcy9pbnRlcm5hbC91aS9VSUVuYWJsZW1lbnRJZGVudGlmaWVyLmphdmEgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy51aS93dHBfdWkvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9mcmFtZXdvcmtzL2ludGVybmFsL3VpL1VJRW5hYmxlbWVudElkZW50aWZpZXIuamF2YQppbmRleCA4YzdlNTRlLi4xZDk5OWY2IDEwMDY0NAotLS0gYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy51aS93dHBfdWkvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9mcmFtZXdvcmtzL2ludGVybmFsL3VpL1VJRW5hYmxlbWVudElkZW50aWZpZXIuamF2YQorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy51aS93dHBfdWkvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9mcmFtZXdvcmtzL2ludGVybmFsL3VpL1VJRW5hYmxlbWVudElkZW50aWZpZXIuamF2YQpAQCAtNjksMTIgKzY5LDEyIEBACiAJICogCiAJICogQHNlZSBvcmcuZWNsaXNwZS53c3QuY29tbW9uLmZyYW1ld29ya3MuaW50ZXJuYWwuZW5hYmxlbWVudC5FbmFibGVtZW50SWRlbnRpZmllciNnZXROZXdFbmFibGVkKCkKIAkgKi8KKwlAT3ZlcnJpZGUKIAlwcm90ZWN0ZWQgYm9vbGVhbiBnZXROZXdFbmFibGVkKCkgewogCQlJSWRlbnRpZmllciBpZGVudGlmaWVyID0gZ2V0QWN0aXZpdHlJZGVudGlmaWVyKCk7CiAJCWlmIChpZGVudGlmaWVyICE9IG51bGwpCiAJCQlyZXR1cm4gaWRlbnRpZmllci5pc0VuYWJsZWQoKSAmJiBzdXBlci5nZXROZXdFbmFibGVkKCk7Ci0JCWVsc2UKLQkJCXJldHVybiBmYWxzZTsKKwkJcmV0dXJuIGZhbHNlOwogCX0KIAogCQpkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3MudWkvd3RwX3VpL29yZy9lY2xpcHNlL3dzdC9jb21tb24vZnJhbWV3b3Jrcy9pbnRlcm5hbC91aS9VSUVuYWJsZW1lbnRNYW5hZ2VyLmphdmEgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy51aS93dHBfdWkvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9mcmFtZXdvcmtzL2ludGVybmFsL3VpL1VJRW5hYmxlbWVudE1hbmFnZXIuamF2YQppbmRleCBmNDI3NDIyLi43YTNmOTNiIDEwMDY0NAotLS0gYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy51aS93dHBfdWkvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9mcmFtZXdvcmtzL2ludGVybmFsL3VpL1VJRW5hYmxlbWVudE1hbmFnZXIuamF2YQorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy51aS93dHBfdWkvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9mcmFtZXdvcmtzL2ludGVybmFsL3VpL1VJRW5hYmxlbWVudE1hbmFnZXIuamF2YQpAQCAtMzgsOCArMzgsNyBAQAogCXByb3RlY3RlZCBJQWN0aXZpdHlNYW5hZ2VyIGdldEFjdGl2aXR5TWFuYWdlcigpIHsKIAkJaWYgKGdldEFjdGl2aXR5U3VwcG9ydCgpICE9IG51bGwpCiAJCQlyZXR1cm4gZ2V0QWN0aXZpdHlTdXBwb3J0KCkuZ2V0QWN0aXZpdHlNYW5hZ2VyKCk7Ci0JCWVsc2UKLQkJCXJldHVybiBudWxsOworCQlyZXR1cm4gbnVsbDsKIAl9CiAKIAkvKioKQEAgLTY3LDYgKzY2LDcgQEAKIAkgKiBAc2VlIG9yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy5pbnRlcm5hbC5lbmFibGVtZW50LkVuYWJsZW1lbnRNYW5hZ2VyI2NyZWF0ZUlkZW50aWZpZXIoamF2YS5sYW5nLlN0cmluZywKIAkgKiAgICAgIG9yZy5lY2xpcHNlLmNvcmUucmVzb3VyY2VzLklQcm9qZWN0KQogCSAqLworCUBPdmVycmlkZQogCXByb3RlY3RlZCBFbmFibGVtZW50SWRlbnRpZmllciBjcmVhdGVJZGVudGlmaWVyKFN0cmluZyBpZGVudGlmaWVySWQsIElQcm9qZWN0IHByb2plY3QpIHsKIAkJcmV0dXJuIG5ldyBVSUVuYWJsZW1lbnRJZGVudGlmaWVyKGlkZW50aWZpZXJJZCwgcHJvamVjdCk7CiAJfQpkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3MudWkvd3RwX3VpL29yZy9lY2xpcHNlL3dzdC9jb21tb24vZnJhbWV3b3Jrcy9pbnRlcm5hbC91aS9VSU9wZXJhdGlvbkhhbmRsZXIuamF2YSBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzLnVpL3d0cF91aS9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ZyYW1ld29ya3MvaW50ZXJuYWwvdWkvVUlPcGVyYXRpb25IYW5kbGVyLmphdmEKaW5kZXggNTNjY2Q1My4uMzQyMDZjOSAxMDA2NDQKLS0tIGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3MudWkvd3RwX3VpL29yZy9lY2xpcHNlL3dzdC9jb21tb24vZnJhbWV3b3Jrcy9pbnRlcm5hbC91aS9VSU9wZXJhdGlvbkhhbmRsZXIuamF2YQorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy51aS93dHBfdWkvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9mcmFtZXdvcmtzL2ludGVybmFsL3VpL1VJT3BlcmF0aW9uSGFuZGxlci5qYXZhCkBAIC0xMCw5ICsxMCw2IEBACiAgKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKi8KIC8qCiAgKiBDcmVhdGVkIG9uIEF1ZyA1LCAyMDA0Ci0gKgotICogVE9ETyBUbyBjaGFuZ2UgdGhlIHRlbXBsYXRlIGZvciB0aGlzIGdlbmVyYXRlZCBmaWxlIGdvIHRvCi0gKiBXaW5kb3cgLSBQcmVmZXJlbmNlcyAtIEphdmEgLSBDb2RlIEdlbmVyYXRpb24gLSBDb2RlIGFuZCBDb21tZW50cwogICovCiBwYWNrYWdlIG9yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy5pbnRlcm5hbC51aTsKIApAQCAtMjQsOSArMjEsNiBAQAogCiAvKioKICAqIEBhdXRob3IgZGZob2x0Ci0gKiAKLSAqIFRPRE8gVG8gY2hhbmdlIHRoZSB0ZW1wbGF0ZSBmb3IgdGhpcyBnZW5lcmF0ZWQgdHlwZSBjb21tZW50IGdvIHRvIFdpbmRvdyAtIFByZWZlcmVuY2VzIC0gSmF2YSAtCi0gKiBDb2RlIEdlbmVyYXRpb24gLSBDb2RlIGFuZCBDb21tZW50cwogICovCiBwdWJsaWMgY2xhc3MgVUlPcGVyYXRpb25IYW5kbGVyIGltcGxlbWVudHMgSU9wZXJhdGlvbkhhbmRsZXIgewogCXByb3RlY3RlZCBTaGVsbCBwYXJlbnRTaGVsbDsKZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzLnVpL3d0cF91aS9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ZyYW1ld29ya3MvaW50ZXJuYWwvdWkvVUlUZXN0ZXJJbXBsLmphdmEgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy51aS93dHBfdWkvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9mcmFtZXdvcmtzL2ludGVybmFsL3VpL1VJVGVzdGVySW1wbC5qYXZhCmluZGV4IGRiN2JhN2EuLmM4MmE2Y2MgMTAwNjQ0Ci0tLSBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzLnVpL3d0cF91aS9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ZyYW1ld29ya3MvaW50ZXJuYWwvdWkvVUlUZXN0ZXJJbXBsLmphdmEKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3MudWkvd3RwX3VpL29yZy9lY2xpcHNlL3dzdC9jb21tb24vZnJhbWV3b3Jrcy9pbnRlcm5hbC91aS9VSVRlc3RlckltcGwuamF2YQpAQCAtOCwyNCArOCwxMSBAQAogICogQ29udHJpYnV0b3JzOgogICogSUJNIENvcnBvcmF0aW9uIC0gaW5pdGlhbCBBUEkgYW5kIGltcGxlbWVudGF0aW9uCiAgKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKi8KLS8qCi0gKiBDcmVhdGVkIG9uIE9jdCAyNywgMjAwMwotICoKLSAqIFRvIGNoYW5nZSB0aGUgdGVtcGxhdGUgZm9yIHRoaXMgZ2VuZXJhdGVkIGZpbGUgZ28gdG8KLSAqIFdpbmRvdyZndDtQcmVmZXJlbmNlcyZndDtKYXZhJmd0O0NvZGUgR2VuZXJhdGlvbiZndDtDb2RlIGFuZCBDb21tZW50cwotICovCiBwYWNrYWdlIG9yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy5pbnRlcm5hbC51aTsKIAotaW1wb3J0IG9yZy5lY2xpcHNlLmplbS51dGlsLlVJVGVzdGVyOwogaW1wb3J0IG9yZy5lY2xpcHNlLnVpLlBsYXRmb3JtVUk7CitpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb3JlLnV0aWwuVUlUZXN0ZXI7CiAKLQotLyoqCi0gKiBAYXV0aG9yIHNjaGFjaGVyCi0gKiAKLSAqIFRvIGNoYW5nZSB0aGUgdGVtcGxhdGUgZm9yIHRoaXMgZ2VuZXJhdGVkIHR5cGUgY29tbWVudCBnbyB0bwotICogV2luZG93Jmd0O1ByZWZlcmVuY2VzJmd0O0phdmEmZ3Q7Q29kZSBHZW5lcmF0aW9uJmd0O0NvZGUgYW5kIENvbW1lbnRzCi0gKi8KIHB1YmxpYyBjbGFzcyBVSVRlc3RlckltcGwgaW1wbGVtZW50cyBVSVRlc3RlciB7CiAKIAkvKioKZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzLnVpL3d0cF91aS9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ZyYW1ld29ya3MvaW50ZXJuYWwvdWkvV1RQQ29tbW9uVUlSZXNvdXJjZUhhbmRsZXIuamF2YSBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzLnVpL3d0cF91aS9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ZyYW1ld29ya3MvaW50ZXJuYWwvdWkvV1RQQ29tbW9uVUlSZXNvdXJjZUhhbmRsZXIuamF2YQppbmRleCAzODA1NzE5Li4xNzE1MTNjIDEwMDY0NAotLS0gYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy51aS93dHBfdWkvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9mcmFtZXdvcmtzL2ludGVybmFsL3VpL1dUUENvbW1vblVJUmVzb3VyY2VIYW5kbGVyLmphdmEKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3MudWkvd3RwX3VpL29yZy9lY2xpcHNlL3dzdC9jb21tb24vZnJhbWV3b3Jrcy9pbnRlcm5hbC91aS9XVFBDb21tb25VSVJlc291cmNlSGFuZGxlci5qYXZhCkBAIC0xMCw5ICsxMCw2IEBACiAgKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKi8KIC8qCiAgKiBDcmVhdGVkIG9uIE1heSAyMywgMjAwNAotICoKLSAqIFRPRE8gVG8gY2hhbmdlIHRoZSB0ZW1wbGF0ZSBmb3IgdGhpcyBnZW5lcmF0ZWQgZmlsZSBnbyB0bwotICogV2luZG93IC0gUHJlZmVyZW5jZXMgLSBKYXZhIC0gQ29kZSBTdHlsZSAtIENvZGUgVGVtcGxhdGVzCiAgKi8KIHBhY2thZ2Ugb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzLmludGVybmFsLnVpOwogCkBAIC0yMCw5ICsxNyw2IEBACiAKIC8qKgogICogQGF1dGhvciB2aWpheWIKLSAqIAotICogVE9ETyBUbyBjaGFuZ2UgdGhlIHRlbXBsYXRlIGZvciB0aGlzIGdlbmVyYXRlZCB0eXBlIGNvbW1lbnQgZ28gdG8gV2luZG93IC0gUHJlZmVyZW5jZXMgLSBKYXZhIC0KLSAqIENvZGUgU3R5bGUgLSBDb2RlIFRlbXBsYXRlcwogICovCiBwdWJsaWMgY2xhc3MgV1RQQ29tbW9uVUlSZXNvdXJjZUhhbmRsZXIgZXh0ZW5kcyBOTFMgewogCXByaXZhdGUgc3RhdGljIGZpbmFsIFN0cmluZyBCVU5ETEVfTkFNRSA9ICJ3dHBjb21tb251aSI7Ly8kTk9OLU5MUy0xJApAQCAtNTgsNiArNTIsNyBAQAogCXB1YmxpYyBzdGF0aWMgU3RyaW5nIFdpemFyZFBhZ2VFeHRlbnNpb25NYW5hZ2VyX1VJXzE7CiAJcHVibGljIHN0YXRpYyBTdHJpbmcgV2l6YXJkUGFnZUV4dGVuc2lvbk1hbmFnZXJfVUlfMDsKIAlwdWJsaWMgc3RhdGljIFN0cmluZyBEZWxldGVfVUlfMDsKKwlwdWJsaWMgc3RhdGljIFN0cmluZyBEZWZEaXJEaWFsb2dMYWJlbF87CiAKIAlzdGF0aWMgewogCQlOTFMuaW5pdGlhbGl6ZU1lc3NhZ2VzKEJVTkRMRV9OQU1FLCBXVFBDb21tb25VSVJlc291cmNlSGFuZGxlci5jbGFzcyk7CmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy51aS93dHBfdWkvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9mcmFtZXdvcmtzL2ludGVybmFsL3VpL1dUUEdlbmVyaWNBY3Rpb25JZHMuamF2YSBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzLnVpL3d0cF91aS9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ZyYW1ld29ya3MvaW50ZXJuYWwvdWkvV1RQR2VuZXJpY0FjdGlvbklkcy5qYXZhCmluZGV4IGZhYWE0NTMuLmRjMWI4ZTQgMTAwNjQ0Ci0tLSBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzLnVpL3d0cF91aS9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ZyYW1ld29ya3MvaW50ZXJuYWwvdWkvV1RQR2VuZXJpY0FjdGlvbklkcy5qYXZhCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzLnVpL3d0cF91aS9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ZyYW1ld29ya3MvaW50ZXJuYWwvdWkvV1RQR2VuZXJpY0FjdGlvbklkcy5qYXZhCkBAIC0xMCwxNyArMTAsMTEgQEAKICAqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqLwogLyoKICAqIENyZWF0ZWQgb24gSnVuIDE2LCAyMDA0Ci0gKgotICogVE9ETyBUbyBjaGFuZ2UgdGhlIHRlbXBsYXRlIGZvciB0aGlzIGdlbmVyYXRlZCBmaWxlIGdvIHRvCi0gKiBXaW5kb3cgLSBQcmVmZXJlbmNlcyAtIEphdmEgLSBDb2RlIFN0eWxlIC0gQ29kZSBUZW1wbGF0ZXMKICAqLwogcGFja2FnZSBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3MuaW50ZXJuYWwudWk7CiAKIC8qKgogICogQGF1dGhvciBtZGVsZGVyCi0gKiAKLSAqIFRPRE8gVG8gY2hhbmdlIHRoZSB0ZW1wbGF0ZSBmb3IgdGhpcyBnZW5lcmF0ZWQgdHlwZSBjb21tZW50IGdvIHRvIFdpbmRvdyAtIFByZWZlcmVuY2VzIC0gSmF2YSAtCi0gKiBDb2RlIFN0eWxlIC0gQ29kZSBUZW1wbGF0ZXMKICAqLwogcHVibGljIGludGVyZmFjZSBXVFBHZW5lcmljQWN0aW9uSWRzIHsKIApkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3MudWkvd3RwX3VpL29yZy9lY2xpcHNlL3dzdC9jb21tb24vZnJhbWV3b3Jrcy9pbnRlcm5hbC91aS9XVFBVSVBsdWdpbi5qYXZhIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3MudWkvd3RwX3VpL29yZy9lY2xpcHNlL3dzdC9jb21tb24vZnJhbWV3b3Jrcy9pbnRlcm5hbC91aS9XVFBVSVBsdWdpbi5qYXZhCmluZGV4IDNmMjdjYjkuLjA1MTY5YTEgMTAwNjQ0Ci0tLSBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzLnVpL3d0cF91aS9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ZyYW1ld29ya3MvaW50ZXJuYWwvdWkvV1RQVUlQbHVnaW4uamF2YQorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy51aS93dHBfdWkvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9mcmFtZXdvcmtzL2ludGVybmFsL3VpL1dUUFVJUGx1Z2luLmphdmEKQEAgLTE4LDExICsxOCwxMyBAQAogaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucmVzb3VyY2VzLlJlc291cmNlc1BsdWdpbjsKIGltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJ1bnRpbWUuSVN0YXR1czsKIGltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJ1bnRpbWUuU3RhdHVzOwotaW1wb3J0IG9yZy5lY2xpcHNlLmplbS51dGlsLmxvZ2dlci5wcm94eS5Mb2dnZXI7CiBpbXBvcnQgb3JnLmVjbGlwc2UuamZhY2Uub3BlcmF0aW9uLklSdW5uYWJsZVdpdGhQcm9ncmVzczsKIGltcG9ydCBvcmcuZWNsaXBzZS51aS5JV29ya2JlbmNoOwogaW1wb3J0IG9yZy5lY2xpcHNlLnVpLnBsdWdpbi5BYnN0cmFjdFVJUGx1Z2luOwogaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy5pbnRlcm5hbC5vcGVyYXRpb25zLklIZWFkbGVzc1J1bm5hYmxlV2l0aFByb2dyZXNzOworaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucnVudGltZS5QbGF0Zm9ybTsKK2ltcG9ydCBqYXZhLmxhbmcuVGhyb3dhYmxlOworaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucnVudGltZS5Db3JlRXhjZXB0aW9uOwogCiAvKioKICAqIFRoZSBtYWluIHBsdWdpbiBjbGFzcyB0byBiZSB1c2VkIGluIHRoZSBkZXNrdG9wLgpAQCAtNzIsMTAgKzc0LDYgQEAKIAkJcmV0dXJuIHBsdWdpbjsKIAl9CiAKLQlwdWJsaWMgc3RhdGljIExvZ2dlciBnZXRMb2dnZXIoKSB7Ci0JCXJldHVybiBMb2dnZXIuZ2V0TG9nZ2VyKFBMVUdJTl9JRCk7Ci0JfQotCiAJLyoqCiAJICogUmV0dXJucyB0aGUgd29ya3NwYWNlIGluc3RhbmNlLgogCSAqLwpAQCAtMTM2LDUgKzEzNCwyNSBAQAogICAgIHsKICAgICAgICAgbG9nKCBuZXcgU3RhdHVzKCBJU3RhdHVzLkVSUk9SLCBQTFVHSU5fSUQsIElTdGF0dXMuT0ssIG1zZywgbnVsbCApICk7CiAgICAgfQorCisJcHVibGljIHN0YXRpYyBJU3RhdHVzIGNyZWF0ZVN0YXR1cyhpbnQgc2V2ZXJpdHksIFN0cmluZyBtZXNzYWdlLCBUaHJvd2FibGUgZXhjZXB0aW9uKSB7CisJCXJldHVybiBuZXcgU3RhdHVzKHNldmVyaXR5LCBQTFVHSU5fSUQsIG1lc3NhZ2UsIGV4Y2VwdGlvbik7CisJfQorCisJcHVibGljIHN0YXRpYyBJU3RhdHVzIGNyZWF0ZVN0YXR1cyhpbnQgc2V2ZXJpdHksIFN0cmluZyBtZXNzYWdlKSB7CisJCXJldHVybiBjcmVhdGVTdGF0dXMoc2V2ZXJpdHksIG1lc3NhZ2UsIG51bGwpOworCX0KKworCXB1YmxpYyBzdGF0aWMgdm9pZCBsb2dFcnJvcihUaHJvd2FibGUgZXhjZXB0aW9uKSB7CisJCVBsYXRmb3JtLmdldExvZyhQbGF0Zm9ybS5nZXRCdW5kbGUoUExVR0lOX0lEKSkubG9nKCBjcmVhdGVTdGF0dXMoSVN0YXR1cy5FUlJPUiwgZXhjZXB0aW9uLmdldE1lc3NhZ2UoKSwgZXhjZXB0aW9uKSk7CisJfQorCisJcHVibGljIHN0YXRpYyB2b2lkIGxvZ0Vycm9yKENvcmVFeGNlcHRpb24gZXhjZXB0aW9uKSB7CisJCVBsYXRmb3JtLmdldExvZyhQbGF0Zm9ybS5nZXRCdW5kbGUoUExVR0lOX0lEKSkubG9nKCBleGNlcHRpb24uZ2V0U3RhdHVzKCkgKTsKKwl9CisKKwlwdWJsaWMgc3RhdGljIHZvaWQgbG9nRXJyb3IoU3RyaW5nIG1lc3NhZ2UpIHsKKwkJUGxhdGZvcm0uZ2V0TG9nKFBsYXRmb3JtLmdldEJ1bmRsZShQTFVHSU5fSUQpKS5sb2coIGNyZWF0ZVN0YXR1cyhJU3RhdHVzLkVSUk9SLCBtZXNzYWdlKSk7CisJfQogICAgIAogfQpkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3MudWkvd3RwX3VpL29yZy9lY2xpcHNlL3dzdC9jb21tb24vZnJhbWV3b3Jrcy9pbnRlcm5hbC91aS9Xb3Jrc3BhY2VNb2RpZnlDb21wb3NlZE9wZXJhdGlvbi5qYXZhIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3MudWkvd3RwX3VpL29yZy9lY2xpcHNlL3dzdC9jb21tb24vZnJhbWV3b3Jrcy9pbnRlcm5hbC91aS9Xb3Jrc3BhY2VNb2RpZnlDb21wb3NlZE9wZXJhdGlvbi5qYXZhCmluZGV4IDU4Yzg0MTkuLmY0N2I2YjIgMTAwNjQ0Ci0tLSBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzLnVpL3d0cF91aS9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ZyYW1ld29ya3MvaW50ZXJuYWwvdWkvV29ya3NwYWNlTW9kaWZ5Q29tcG9zZWRPcGVyYXRpb24uamF2YQorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy51aS93dHBfdWkvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9mcmFtZXdvcmtzL2ludGVybmFsL3VpL1dvcmtzcGFjZU1vZGlmeUNvbXBvc2VkT3BlcmF0aW9uLmphdmEKQEAgLTY1LDYgKzY1LDcgQEAKIAkJcmV0dXJuIGdldFJ1bm5hYmxlcygpLmFkZChuZXN0ZWRPcCk7CiAJfQogCisJQE92ZXJyaWRlCiAJcHJvdGVjdGVkIHZvaWQgZXhlY3V0ZShJUHJvZ3Jlc3NNb25pdG9yIG1vbml0b3IpIHRocm93cyBJbnZvY2F0aW9uVGFyZ2V0RXhjZXB0aW9uLCBJbnRlcnJ1cHRlZEV4Y2VwdGlvbiB7CiAJCXRyeXsKIAkJCUxpc3QgcnVubmFibGVzID0gZ2V0UnVubmFibGVzKCk7CmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy8uY2xhc3NwYXRoIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3MvLmNsYXNzcGF0aAppbmRleCBiOWU5MTVjLi5mMzRkOTEyIDEwMDY0NAotLS0gYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy8uY2xhc3NwYXRoCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzLy5jbGFzc3BhdGgKQEAgLTIsNyArMiw3IEBACiA8Y2xhc3NwYXRoPgogCTxjbGFzc3BhdGhlbnRyeSBraW5kPSJzcmMiIHBhdGg9InNyYy8iLz4KIAk8Y2xhc3NwYXRoZW50cnkga2luZD0ic3JjIiBwYXRoPSJzcmMtbm9uX3dvcmtiZW5jaC8iLz4KLQk8Y2xhc3NwYXRoZW50cnkga2luZD0iY29uIiBwYXRoPSJvcmcuZWNsaXBzZS5qZHQubGF1bmNoaW5nLkpSRV9DT05UQUlORVIvb3JnLmVjbGlwc2UuamR0LmludGVybmFsLmRlYnVnLnVpLmxhdW5jaGVyLlN0YW5kYXJkVk1UeXBlL0oyU0UtMS40Ii8+CisJPGNsYXNzcGF0aGVudHJ5IGtpbmQ9ImNvbiIgcGF0aD0ib3JnLmVjbGlwc2UuamR0LmxhdW5jaGluZy5KUkVfQ09OVEFJTkVSL29yZy5lY2xpcHNlLmpkdC5pbnRlcm5hbC5kZWJ1Zy51aS5sYXVuY2hlci5TdGFuZGFyZFZNVHlwZS9KMlNFLTEuNSIvPgogCTxjbGFzc3BhdGhlbnRyeSBraW5kPSJjb24iIHBhdGg9Im9yZy5lY2xpcHNlLnBkZS5jb3JlLnJlcXVpcmVkUGx1Z2lucyIvPgogCTxjbGFzc3BhdGhlbnRyeSBraW5kPSJvdXRwdXQiIHBhdGg9ImJpbiIvPgogPC9jbGFzc3BhdGg+CmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy8uc2V0dGluZ3Mvb3JnLmVjbGlwc2UuamR0LmNvcmUucHJlZnMgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy8uc2V0dGluZ3Mvb3JnLmVjbGlwc2UuamR0LmNvcmUucHJlZnMKaW5kZXggYjI5MGI1Zi4uMDM3YTRlNSAxMDA2NDQKLS0tIGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3MvLnNldHRpbmdzL29yZy5lY2xpcHNlLmpkdC5jb3JlLnByZWZzCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzLy5zZXR0aW5ncy9vcmcuZWNsaXBzZS5qZHQuY29yZS5wcmVmcwpAQCAtMSw2MiArMSw5NSBAQAotI1NhdCBNYXIgMjQgMDI6MDc6MTggRURUIDIwMDcKLWVjbGlwc2UucHJlZmVyZW5jZXMudmVyc2lvbj0xCi1vcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5jb2RlZ2VuLmlubGluZUpzckJ5dGVjb2RlPWVuYWJsZWQKLW9yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLmNvZGVnZW4udGFyZ2V0UGxhdGZvcm09MS4yCi1vcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5jb2RlZ2VuLnVudXNlZExvY2FsPXByZXNlcnZlCi1vcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5jb21wbGlhbmNlPTEuNAotb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIuZGVidWcubGluZU51bWJlcj1nZW5lcmF0ZQotb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIuZGVidWcubG9jYWxWYXJpYWJsZT1nZW5lcmF0ZQotb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIuZGVidWcuc291cmNlRmlsZT1nZW5lcmF0ZQotb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5hbm5vdGF0aW9uU3VwZXJJbnRlcmZhY2U9aWdub3JlCi1vcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLmFzc2VydElkZW50aWZpZXI9d2FybmluZwotb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5hdXRvYm94aW5nPWlnbm9yZQotb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5kZXByZWNhdGlvbj13YXJuaW5nCi1vcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLmRlcHJlY2F0aW9uSW5EZXByZWNhdGVkQ29kZT1kaXNhYmxlZAotb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5kZXByZWNhdGlvbldoZW5PdmVycmlkaW5nRGVwcmVjYXRlZE1ldGhvZD1kaXNhYmxlZAotb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5lbXB0eVN0YXRlbWVudD1pZ25vcmUKLW9yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0uZW51bUlkZW50aWZpZXI9d2FybmluZwotb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5mYWxsdGhyb3VnaENhc2U9aWdub3JlCi1vcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLmZpZWxkSGlkaW5nPWlnbm9yZQotb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5maW5hbFBhcmFtZXRlckJvdW5kPWlnbm9yZQotb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5maW5hbGx5QmxvY2tOb3RDb21wbGV0aW5nTm9ybWFsbHk9ZXJyb3IKLW9yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0uZm9yYmlkZGVuUmVmZXJlbmNlPWVycm9yCi1vcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLmhpZGRlbkNhdGNoQmxvY2s9ZXJyb3IKLW9yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0uaW5jb21wYXRpYmxlTm9uSW5oZXJpdGVkSW50ZXJmYWNlTWV0aG9kPWVycm9yCi1vcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLmluY29tcGxldGVFbnVtU3dpdGNoPWlnbm9yZQotb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5pbmRpcmVjdFN0YXRpY0FjY2Vzcz1pZ25vcmUKLW9yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0ubG9jYWxWYXJpYWJsZUhpZGluZz1pZ25vcmUKLW9yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0ubWV0aG9kV2l0aENvbnN0cnVjdG9yTmFtZT1lcnJvcgotb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5taXNzaW5nRGVwcmVjYXRlZEFubm90YXRpb249aWdub3JlCi1vcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLm1pc3NpbmdPdmVycmlkZUFubm90YXRpb249aWdub3JlCi1vcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLm1pc3NpbmdTZXJpYWxWZXJzaW9uPXdhcm5pbmcKLW9yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0ubm9FZmZlY3RBc3NpZ25tZW50PXdhcm5pbmcKLW9yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0ubm9JbXBsaWNpdFN0cmluZ0NvbnZlcnNpb249ZXJyb3IKLW9yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0ubm9uRXh0ZXJuYWxpemVkU3RyaW5nTGl0ZXJhbD1pZ25vcmUKLW9yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0ubnVsbFJlZmVyZW5jZT1pZ25vcmUKLW9yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0ub3ZlcnJpZGluZ1BhY2thZ2VEZWZhdWx0TWV0aG9kPWVycm9yCi1vcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLnBhcmFtZXRlckFzc2lnbm1lbnQ9aWdub3JlCi1vcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLnBvc3NpYmxlQWNjaWRlbnRhbEJvb2xlYW5Bc3NpZ25tZW50PWlnbm9yZQotb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5yYXdUeXBlUmVmZXJlbmNlPWlnbm9yZQotb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5yZWR1bmRhbnROdWxsQ2hlY2s9aWdub3JlCi1vcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLnNwZWNpYWxQYXJhbWV0ZXJIaWRpbmdGaWVsZD1kaXNhYmxlZAotb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5zdGF0aWNBY2Nlc3NSZWNlaXZlcj1lcnJvcgotb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5zdXBwcmVzc1dhcm5pbmdzPWVuYWJsZWQKLW9yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0uc3ludGhldGljQWNjZXNzRW11bGF0aW9uPWlnbm9yZQotb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS50eXBlUGFyYW1ldGVySGlkaW5nPWVycm9yCi1vcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLnVuY2hlY2tlZFR5cGVPcGVyYXRpb249aWdub3JlCi1vcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLnVuZG9jdW1lbnRlZEVtcHR5QmxvY2s9aWdub3JlCi1vcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLnVuaGFuZGxlZFdhcm5pbmdUb2tlbj1pZ25vcmUKLW9yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0udW5uZWNlc3NhcnlFbHNlPWlnbm9yZQotb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS51bm5lY2Vzc2FyeVR5cGVDaGVjaz1pZ25vcmUKLW9yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0udW5xdWFsaWZpZWRGaWVsZEFjY2Vzcz1pZ25vcmUKLW9yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0udW51c2VkRGVjbGFyZWRUaHJvd25FeGNlcHRpb249aWdub3JlCi1vcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLnVudXNlZERlY2xhcmVkVGhyb3duRXhjZXB0aW9uV2hlbk92ZXJyaWRpbmc9ZGlzYWJsZWQKLW9yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0udW51c2VkSW1wb3J0PWVycm9yCi1vcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLnVudXNlZExhYmVsPWVycm9yCi1vcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLnVudXNlZExvY2FsPWlnbm9yZQotb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS51bnVzZWRQYXJhbWV0ZXI9aWdub3JlCisjTW9uIEp1biAwOCAxNTozNTo0NSBFRFQgMjAwOQogb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS51bnVzZWRQYXJhbWV0ZXJXaGVuSW1wbGVtZW50aW5nQWJzdHJhY3Q9ZGlzYWJsZWQKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0uY29tcGFyaW5nSWRlbnRpY2FsPWVycm9yCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLnVubmVjZXNzYXJ5RWxzZT1lcnJvcgorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5yZWR1bmRhbnRTdXBlcmludGVyZmFjZT1lcnJvcgorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS51bnVzZWRMb2NhbD1lcnJvcgorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5lbXB0eVN0YXRlbWVudD1lcnJvcgorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS51bnVzZWRMYWJlbD1lcnJvcgorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS51bnVzZWRQYXJhbWV0ZXI9d2FybmluZworb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5yYXdUeXBlUmVmZXJlbmNlPXdhcm5pbmcKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmluY29tcGF0aWJsZUpES0xldmVsPWlnbm9yZQorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5pbmNvbXBhdGlibGVOb25Jbmhlcml0ZWRJbnRlcmZhY2VNZXRob2Q9ZXJyb3IKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLmRlYnVnLmxpbmVOdW1iZXI9Z2VuZXJhdGUKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0udW51c2VkRGVjbGFyZWRUaHJvd25FeGNlcHRpb249d2FybmluZworb3JnLmVjbGlwc2UuamR0LmNvcmUuYnVpbGRlci5jbGVhbk91dHB1dEZvbGRlcj1jbGVhbgorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS51bnVzZWRXYXJuaW5nVG9rZW49d2FybmluZworb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5ub0ltcGxpY2l0U3RyaW5nQ29udmVyc2lvbj1lcnJvcgorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5kZXByZWNhdGlvbkluRGVwcmVjYXRlZENvZGU9ZW5hYmxlZAorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5kZXByZWNhdGlvbj13YXJuaW5nCiBvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLnVudXNlZFBhcmFtZXRlcldoZW5PdmVycmlkaW5nQ29uY3JldGU9ZGlzYWJsZWQKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0ubWlzc2luZ1N5bmNocm9uaXplZE9uSW5oZXJpdGVkTWV0aG9kPWVycm9yCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLmRlcHJlY2F0aW9uV2hlbk92ZXJyaWRpbmdEZXByZWNhdGVkTWV0aG9kPWVuYWJsZWQKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0ucmVkdW5kYW50TnVsbENoZWNrPWVycm9yCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLnVudXNlZEltcG9ydD1lcnJvcgorb3JnLmVjbGlwc2UuamR0LmNvcmUuYnVpbGRlci5yZWNyZWF0ZU1vZGlmaWVkQ2xhc3NGaWxlSW5PdXRwdXRGb2xkZXI9aWdub3JlCitvcmcuZWNsaXBzZS5qZHQuY29yZS5idWlsZGVyLnJlc291cmNlQ29weUV4Y2x1c2lvbkZpbHRlcj0qLmxhdW5jaAorb3JnLmVjbGlwc2UuamR0LmNvcmUuY2xhc3NwYXRoLm11bHRpcGxlT3V0cHV0TG9jYXRpb25zPWVuYWJsZWQKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0uc3VwcHJlc3NXYXJuaW5ncz1lbmFibGVkCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLnR5cGVQYXJhbWV0ZXJIaWRpbmc9ZXJyb3IKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmJ1aWxkZXIuaW52YWxpZENsYXNzcGF0aD1hYm9ydAorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5sb2NhbFZhcmlhYmxlSGlkaW5nPXdhcm5pbmcKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0ucG9zc2libGVBY2NpZGVudGFsQm9vbGVhbkFzc2lnbm1lbnQ9ZXJyb3IKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0ubWlzc2luZ0hhc2hDb2RlTWV0aG9kPWVycm9yCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb2RlQ29tcGxldGUuYXJndW1lbnRTdWZmaXhlcz0KK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvZGVDb21wbGV0ZS5hcmd1bWVudFByZWZpeGVzPQorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5pbmRpcmVjdFN0YXRpY0FjY2Vzcz1pZ25vcmUKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0ucG90ZW50aWFsTnVsbFJlZmVyZW5jZT1lcnJvcgorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIuY29kZWdlbi5pbmxpbmVKc3JCeXRlY29kZT1lbmFibGVkCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLmZpbmFsUGFyYW1ldGVyQm91bmQ9d2FybmluZworb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5taXNzaW5nU2VyaWFsVmVyc2lvbj1lcnJvcgorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5udWxsUmVmZXJlbmNlPWVycm9yCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5zb3VyY2U9MS41CitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLmVudW1JZGVudGlmaWVyPWVycm9yCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLnN5bnRoZXRpY0FjY2Vzc0VtdWxhdGlvbj1pZ25vcmUKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmJ1aWxkZXIuZHVwbGljYXRlUmVzb3VyY2VUYXNrPXdhcm5pbmcKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0uZmllbGRIaWRpbmc9ZXJyb3IKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0udW51c2VkRGVjbGFyZWRUaHJvd25FeGNlcHRpb25FeGVtcHRFeGNlcHRpb25BbmRUaHJvd2FibGU9ZW5hYmxlZAorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5taXNzaW5nT3ZlcnJpZGVBbm5vdGF0aW9uPWVycm9yCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLmhpZGRlbkNhdGNoQmxvY2s9ZXJyb3IKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0ub3ZlcnJpZGluZ1BhY2thZ2VEZWZhdWx0TWV0aG9kPWVycm9yCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLmZpbmFsbHlCbG9ja05vdENvbXBsZXRpbmdOb3JtYWxseT1lcnJvcgorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS51bmRvY3VtZW50ZWRFbXB0eUJsb2NrPXdhcm5pbmcKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNsYXNzcGF0aC5leGNsdXNpb25QYXR0ZXJucz1lbmFibGVkCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLm1ldGhvZFdpdGhDb25zdHJ1Y3Rvck5hbWU9ZXJyb3IKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0uZGlzY291cmFnZWRSZWZlcmVuY2U9d2FybmluZworb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS51bnF1YWxpZmllZEZpZWxkQWNjZXNzPWlnbm9yZQorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5pbmNvbXBsZXRlRW51bVN3aXRjaD1lcnJvcgorZWNsaXBzZS5wcmVmZXJlbmNlcy52ZXJzaW9uPTEKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmluY29tcGxldGVDbGFzc3BhdGg9ZXJyb3IKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0udW5uZWNlc3NhcnlUeXBlQ2hlY2s9ZXJyb3IKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0uZGVhZENvZGU9ZXJyb3IKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0uc3BlY2lhbFBhcmFtZXRlckhpZGluZ0ZpZWxkPWVuYWJsZWQKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0uZmF0YWxPcHRpb25hbEVycm9yPWVuYWJsZWQKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0ubm9FZmZlY3RBc3NpZ25tZW50PWVycm9yCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5kZWJ1Zy5zb3VyY2VGaWxlPWdlbmVyYXRlCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLnVudXNlZERlY2xhcmVkVGhyb3duRXhjZXB0aW9uSW5jbHVkZVVuY2hlY2tlZEV4Y2VwdGlvbnM9ZGlzYWJsZWQKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0ubWlzc2luZ0RlcHJlY2F0ZWRBbm5vdGF0aW9uPXdhcm5pbmcKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvZGVDb21wbGV0ZS5maWVsZFByZWZpeGVzPQorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5mYWxsdGhyb3VnaENhc2U9ZXJyb3IKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLmNvZGVnZW4udGFyZ2V0UGxhdGZvcm09MS41CiBvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLnVudXNlZFByaXZhdGVNZW1iZXI9ZXJyb3IKLW9yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0udmFyYXJnc0FyZ3VtZW50TmVlZENhc3Q9aWdub3JlCi1vcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5zb3VyY2U9MS4zCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLmF1dG9ib3hpbmc9d2FybmluZworb3JnLmVjbGlwc2UuamR0LmNvcmUuY2lyY3VsYXJDbGFzc3BhdGg9ZXJyb3IKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0uYW5ub3RhdGlvblN1cGVySW50ZXJmYWNlPXdhcm5pbmcKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0ubm9uRXh0ZXJuYWxpemVkU3RyaW5nTGl0ZXJhbD1lcnJvcgorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29kZUNvbXBsZXRlLmZpZWxkU3VmZml4ZXM9CitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb2RlQ29tcGxldGUubG9jYWxTdWZmaXhlcz0KK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0ucGFyYW1ldGVyQXNzaWdubWVudD1lcnJvcgorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5zdGF0aWNBY2Nlc3NSZWNlaXZlcj1lcnJvcgorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29kZUNvbXBsZXRlLmxvY2FsUHJlZml4ZXM9CitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLnVudXNlZERlY2xhcmVkVGhyb3duRXhjZXB0aW9uSW5jbHVkZURvY0NvbW1lbnRSZWZlcmVuY2U9ZW5hYmxlZAorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIubWF4UHJvYmxlbVBlclVuaXQ9MTAwCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLnZhcmFyZ3NBcmd1bWVudE5lZWRDYXN0PWVycm9yCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLmFzc2VydElkZW50aWZpZXI9ZXJyb3IKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLmNvbXBsaWFuY2U9MS41CitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLnVudXNlZFBhcmFtZXRlckluY2x1ZGVEb2NDb21tZW50UmVmZXJlbmNlPWVuYWJsZWQKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvZGVDb21wbGV0ZS5zdGF0aWNGaWVsZFByZWZpeGVzPQorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIuZGVidWcubG9jYWxWYXJpYWJsZT1nZW5lcmF0ZQorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS51bmhhbmRsZWRXYXJuaW5nVG9rZW49d2FybmluZworaW5zdGFuY2Uvb3JnLmVjbGlwc2UuY29yZS5uZXQvb3JnLmVjbGlwc2UuY29yZS5uZXQuaGFzTWlncmF0ZWQ9dHJ1ZQorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5mb3JiaWRkZW5SZWZlcmVuY2U9ZXJyb3IKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLmNvZGVnZW4udW51c2VkTG9jYWw9cHJlc2VydmUKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0udW5jaGVja2VkVHlwZU9wZXJhdGlvbj13YXJuaW5nCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLnVudXNlZERlY2xhcmVkVGhyb3duRXhjZXB0aW9uV2hlbk92ZXJyaWRpbmc9ZGlzYWJsZWQKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvZGVDb21wbGV0ZS5zdGF0aWNGaWVsZFN1ZmZpeGVzPQpkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3MvTUVUQS1JTkYvTUFOSUZFU1QuTUYgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy9NRVRBLUlORi9NQU5JRkVTVC5NRgppbmRleCAyNDQ5NGIxLi42YTI1YWQ3IDEwMDY0NAotLS0gYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy9NRVRBLUlORi9NQU5JRkVTVC5NRgorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy9NRVRBLUlORi9NQU5JRkVTVC5NRgpAQCAtMiw3ICsyLDcgQEAKIEJ1bmRsZS1NYW5pZmVzdFZlcnNpb246IDIKIEJ1bmRsZS1OYW1lOiAlcGx1Z2luTmFtZQogQnVuZGxlLVN5bWJvbGljTmFtZTogb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzOyBzaW5nbGV0b246PXRydWUKLUJ1bmRsZS1WZXJzaW9uOiAxLjEuMjAwLnF1YWxpZmllcgorQnVuZGxlLVZlcnNpb246IDEuMi4wLnF1YWxpZmllcgogQnVuZGxlLUFjdGl2YXRvcjogb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzLmludGVybmFsLnBsdWdpbi5XVFBDb21tb25QbHVnaW4KIEJ1bmRsZS1WZW5kb3I6ICVwcm92aWRlcgogQnVuZGxlLUxvY2FsaXphdGlvbjogcGx1Z2luCkBAIC0xOCw4ICsxOCw4IEBACiBSZXF1aXJlLUJ1bmRsZTogb3JnLmVjbGlwc2UuY29yZS5yZXNvdXJjZXM7YnVuZGxlLXZlcnNpb249IlszLjQuMCw0LjAuMCkiLAogIG9yZy5lY2xpcHNlLmNvcmUucnVudGltZTtidW5kbGUtdmVyc2lvbj0iWzMuNC4wLDQuMC4wKSIsCiAgb3JnLmVjbGlwc2UuY29yZS5jb21tYW5kcztidW5kbGUtdmVyc2lvbj0iWzMuNC4wLDQuMC4wKSIsCi0gb3JnLmVjbGlwc2UuamVtLnV0aWw7YnVuZGxlLXZlcnNpb249IlsyLjAuMTAwLDMuMC4wKSIsCiAgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbnZpcm9ubWVudDtidW5kbGUtdmVyc2lvbj0iWzEuMC4yMDAsMi4wLjApIjt2aXNpYmlsaXR5Oj1yZWV4cG9ydCwKLSBvcmcuZWNsaXBzZS5lbWYuZWNvcmU7YnVuZGxlLXZlcnNpb249IlsyLjQuMCwzLjAuMCkiCisgb3JnLmVjbGlwc2UuZW1mLmVjb3JlO2J1bmRsZS12ZXJzaW9uPSJbMi40LjAsMy4wLjApIiwKKyBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvcmU7YnVuZGxlLXZlcnNpb249IlsxLjIuMCwyLjAuMCkiCiBFY2xpcHNlLUxhenlTdGFydDogdHJ1ZQotQnVuZGxlLVJlcXVpcmVkRXhlY3V0aW9uRW52aXJvbm1lbnQ6IEoyU0UtMS40CitCdW5kbGUtUmVxdWlyZWRFeGVjdXRpb25FbnZpcm9ubWVudDogSjJTRS0xLjUKZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzL3BsdWdpbi54bWwgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy9wbHVnaW4ueG1sCmluZGV4IDBhYzIwNTUuLmI4MTdlNzMgMTAwNjQ0Ci0tLSBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzL3BsdWdpbi54bWwKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3MvcGx1Z2luLnhtbApAQCAtMTAsNyArMTAsNyBAQAogICAgPGV4dGVuc2lvbgogICAgICAgICAgaWQ9ImNvbnRleHQuU2Vuc2l0aXZlLkNsYXNzLnNhdmVIYW5kbGVyIgogICAgICAgICAgbmFtZT0iU2F2ZSBIYW5kbGVyIC0gSGVhZGxlc3MgQ29udGV4dCBDbGFzcyIKLSAgICAgICAgIHBvaW50PSJvcmcuZWNsaXBzZS5qZW0udXRpbC51aUNvbnRleHRTZW5zaXRpdmVDbGFzcyI+CisgICAgICAgICBwb2ludD0ib3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb3JlLnVpQ29udGV4dFNlbnNpdGl2ZUNsYXNzIj4KICAgICAgIDx1aUNvbnRleHRTZW5zaXRpdmVDbGFzcwogICAgICAgICAgICAga2V5PSJzYXZlSGFuZGxlciIKICAgICAgICAgICAgIGNvbnRleHQ9IkhlYWRsZXNzIgpAQCAtMTksNyArMTksNyBAQAogICAgPC9leHRlbnNpb24+CiAgICA8ZXh0ZW5zaW9uCiAgICAgICAgICBpZD0ib3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzLmludGVybmFsLmVuYWJsZW1lbnQiCi0gICAgICAgICBwb2ludD0ib3JnLmVjbGlwc2UuamVtLnV0aWwudWlDb250ZXh0U2Vuc2l0aXZlQ2xhc3MiPgorICAgICAgICAgcG9pbnQ9Im9yZy5lY2xpcHNlLndzdC5jb21tb24uY29yZS51aUNvbnRleHRTZW5zaXRpdmVDbGFzcyI+CiAgICAgICA8dWlDb250ZXh0U2Vuc2l0aXZlQ2xhc3MKICAgICAgICAgICAgIGtleT0ib3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzLmludGVybmFsLkVuYWJsZW1lbnREZXRlcm1pbmF0aW9uIgogICAgICAgICAgICAgY29udGV4dD0iSGVhZGxlc3MiCkBAIC0yNyw3ICsyNyw3IEBACiAgICAgICA8L3VpQ29udGV4dFNlbnNpdGl2ZUNsYXNzPgogICAgPC9leHRlbnNpb24+CiAgICA8ZXh0ZW5zaW9uIAotICAgICAgIHBvaW50PSJvcmcuZWNsaXBzZS5qZW0udXRpbC51aUNvbnRleHRTZW5zaXRpdmVDbGFzcyI+CisgICAgICAgcG9pbnQ9Im9yZy5lY2xpcHNlLndzdC5jb21tb24uY29yZS51aUNvbnRleHRTZW5zaXRpdmVDbGFzcyI+CiAgICAgICAgPHVpQ29udGV4dFNlbnNpdGl2ZUNsYXNzCiAgICAgICAgICAga2V5PSJJU2ltcGxlVmFsaWRhdGVFZGl0Q29udGV4dCIKICAgICAgICAgICBjbGFzc05hbWU9Im9yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy5pbnRlcm5hbC5TaW1wbGVWYWxpZGF0ZUVkaXRDb250ZXh0SGVhZGxlc3MiCmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy9zcmMtbm9uX3dvcmtiZW5jaC9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ZyYW1ld29ya3MvaW50ZXJuYWwvZW5hYmxlbWVudC9ub251aS9XRlRXcmFwcGVkRXhjZXB0aW9uLmphdmEgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy9zcmMtbm9uX3dvcmtiZW5jaC9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ZyYW1ld29ya3MvaW50ZXJuYWwvZW5hYmxlbWVudC9ub251aS9XRlRXcmFwcGVkRXhjZXB0aW9uLmphdmEKaW5kZXggOWE1OWM5NC4uNzA5OTBmNSAxMDA2NDQKLS0tIGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3Mvc3JjLW5vbl93b3JrYmVuY2gvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9mcmFtZXdvcmtzL2ludGVybmFsL2VuYWJsZW1lbnQvbm9udWkvV0ZUV3JhcHBlZEV4Y2VwdGlvbi5qYXZhCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzL3NyYy1ub25fd29ya2JlbmNoL29yZy9lY2xpcHNlL3dzdC9jb21tb24vZnJhbWV3b3Jrcy9pbnRlcm5hbC9lbmFibGVtZW50L25vbnVpL1dGVFdyYXBwZWRFeGNlcHRpb24uamF2YQpAQCAtNTcsNiArNTcsNyBAQAogCS8qKgogCSAqIFByaW50IG91dCBhIHN0YWNrIHRyYWNlIHRvIHRoZSBzeXN0ZW0gZXJyLgogCSAqLworCUBPdmVycmlkZQogCXB1YmxpYyB2b2lkIHByaW50U3RhY2tUcmFjZSgpIHsKIAkJcHJpbnRTdGFja1RyYWNlKFN5c3RlbS5lcnIpOwogCX0KQEAgLTY0LDYgKzY1LDcgQEAKIAkvKioKIAkgKiBQcmludHMgdGhlIGV4Y2VwdGlvbiB0byBTeXN0ZW0uZXJyLiBJZiB3ZSBoYXZlIGEgbmVzdGVkIGV4Y2VwdGlvbiwgcHJpbnQgaXRzIHN0YWNrLgogCSAqLworCUBPdmVycmlkZQogCXB1YmxpYyB2b2lkIHByaW50U3RhY2tUcmFjZShqYXZhLmlvLlByaW50U3RyZWFtIHMpIHsKIAkJaWYgKGdldFRhcmdldEV4Y2VwdGlvbigpICE9IG51bGwpIHsKIAkJCXMucHJpbnRsbih0aGlzKTsKQEAgLTc5LDYgKzgxLDcgQEAKIAkvKioKIAkgKiBQcmludHMgdGhlIGV4Y2VwdGlvbiB0byBTeXN0ZW0uZXJyLiBJZiB3ZSBoYXZlIGEgbmVzdGVkIGV4Y2VwdGlvbiwgcHJpbnQgaXRzIHN0YWNrLgogCSAqLworCUBPdmVycmlkZQogCXB1YmxpYyB2b2lkIHByaW50U3RhY2tUcmFjZShqYXZhLmlvLlByaW50V3JpdGVyIHMpIHsKIAkJaWYgKGdldFRhcmdldEV4Y2VwdGlvbigpICE9IG51bGwpIHsKIAkJCXMucHJpbnRsbih0aGlzKTsKZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzL3NyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ZyYW1ld29ya3MvZGF0YW1vZGVsL0Fic3RyYWN0RGF0YU1vZGVsT3BlcmF0aW9uLmphdmEgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy9zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9mcmFtZXdvcmtzL2RhdGFtb2RlbC9BYnN0cmFjdERhdGFNb2RlbE9wZXJhdGlvbi5qYXZhCmluZGV4IDcwNWIyMmEuLjAwZjg3N2YgMTAwNjQ0Ci0tLSBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzL3NyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ZyYW1ld29ya3MvZGF0YW1vZGVsL0Fic3RyYWN0RGF0YU1vZGVsT3BlcmF0aW9uLmphdmEKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3Mvc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vZnJhbWV3b3Jrcy9kYXRhbW9kZWwvQWJzdHJhY3REYXRhTW9kZWxPcGVyYXRpb24uamF2YQpAQCAtMTczLDYgKzE3Myw3IEBACiAJICogRGVmYXVsdCBlbXB0eSBpbXBsZW1lbnRhdGlvbiBvZiByZWRvLgogCSAqIDwvcD4KIAkgKi8KKwlAT3ZlcnJpZGUKIAlwdWJsaWMgSVN0YXR1cyByZWRvKElQcm9ncmVzc01vbml0b3IgbW9uaXRvciwgSUFkYXB0YWJsZSBpbmZvKSB0aHJvd3MgRXhlY3V0aW9uRXhjZXB0aW9uIHsKIAkJcmV0dXJuIFN0YXR1cy5PS19TVEFUVVM7CiAJfQpAQCAtMTgyLDYgKzE4Myw3IEBACiAJICogRGVmYXVsdCBlbXB0eSBpbXBsZW1lbnRhdGlvbiBvZiB1bmRvLgogCSAqIDwvcD4KIAkgKi8KKwlAT3ZlcnJpZGUKIAlwdWJsaWMgSVN0YXR1cyB1bmRvKElQcm9ncmVzc01vbml0b3IgbW9uaXRvciwgSUFkYXB0YWJsZSBpbmZvKSB0aHJvd3MgRXhlY3V0aW9uRXhjZXB0aW9uIHsKIAkJcmV0dXJuIFN0YXR1cy5PS19TVEFUVVM7CiAJfQpkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3Mvc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vZnJhbWV3b3Jrcy9kYXRhbW9kZWwvRGF0YU1vZGVsRmFjdG9yeS5qYXZhIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3Mvc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vZnJhbWV3b3Jrcy9kYXRhbW9kZWwvRGF0YU1vZGVsRmFjdG9yeS5qYXZhCmluZGV4IDVjYjA3MzIuLjM2ODJhNmQgMTAwNjQ0Ci0tLSBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzL3NyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ZyYW1ld29ya3MvZGF0YW1vZGVsL0RhdGFNb2RlbEZhY3RvcnkuamF2YQorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy9zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9mcmFtZXdvcmtzL2RhdGFtb2RlbC9EYXRhTW9kZWxGYWN0b3J5LmphdmEKQEAgLTEwLDkgKzEwLDkgQEAKICAqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqLwogcGFja2FnZSBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3MuZGF0YW1vZGVsOwogCi1pbXBvcnQgb3JnLmVjbGlwc2UuamVtLnV0aWwubG9nZ2VyLnByb3h5LkxvZ2dlcjsKIGltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3MuaW50ZXJuYWwuZGF0YW1vZGVsLkRhdGFNb2RlbEV4dGVuc2lvblJlYWRlcjsKIGltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3MuaW50ZXJuYWwuZGF0YW1vZGVsLkRhdGFNb2RlbEltcGw7CitpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzLmludGVybmFsLnBsdWdpbi5XVFBDb21tb25QbHVnaW47CiAKIC8qKgogICogPHA+CkBAIC05Niw3ICs5Niw3IEBACiAJcHVibGljIHN0YXRpYyBJRGF0YU1vZGVsIGNyZWF0ZURhdGFNb2RlbChDbGFzcyBhQ2xhc3MpIHsKIAkJaWYoYUNsYXNzLmlzSW50ZXJmYWNlKCkpewogCQkJCXRyeXsKLQkJCQkJQ2xhc3MgY2xhenogPSAoQ2xhc3MpYUNsYXNzLmdldEZpZWxkKCJfcHJvdmlkZXJfY2xhc3MiKS5nZXQobnVsbCk7CisJCQkJCUNsYXNzIGNsYXp6ID0gKENsYXNzKWFDbGFzcy5nZXRGaWVsZCgiX3Byb3ZpZGVyX2NsYXNzIikuZ2V0KG51bGwpOyAvLyROT04tTkxTLTEkCiAJCQkJCWlmKGNsYXp6ICE9IG51bGwpewogCQkJCQkJSURhdGFNb2RlbFByb3ZpZGVyIHByb3ZpZGVyID0gKElEYXRhTW9kZWxQcm92aWRlciljbGF6ei5uZXdJbnN0YW5jZSgpOwogCQkJCQkJcmV0dXJuIGNyZWF0ZURhdGFNb2RlbChwcm92aWRlcik7CkBAIC0xMDQsMTMgKzEwNCwxMyBAQAogCQkJCX0gY2F0Y2ggKE5vU3VjaEZpZWxkRXhjZXB0aW9uIGUpIHsKIAkJCQkJLy9pZ25vcmU7IHRoZSBpbnRlcmZhY2UgbWF5IG5vdCBoYXZlIGRlZmluZWQgdGhlIGZpZWxkIGFuZCBpcyByZWx5aW5nIG9uIGV4dGVuc2lvbnMuCiAJCQkJfSBjYXRjaCAoSWxsZWdhbEFyZ3VtZW50RXhjZXB0aW9uIGUpIHsKLQkJCQkJTG9nZ2VyLmdldExvZ2dlcigpLmxvZ0Vycm9yKGUpOworCQkJCQlXVFBDb21tb25QbHVnaW4ubG9nRXJyb3IoZSk7CiAJCQkJfSBjYXRjaCAoU2VjdXJpdHlFeGNlcHRpb24gZSkgewotCQkJCQlMb2dnZXIuZ2V0TG9nZ2VyKCkubG9nRXJyb3IoZSk7CisJCQkJCVdUUENvbW1vblBsdWdpbi5sb2dFcnJvcihlKTsKIAkJCQl9IGNhdGNoIChJbGxlZ2FsQWNjZXNzRXhjZXB0aW9uIGUpIHsKLQkJCQkJTG9nZ2VyLmdldExvZ2dlcigpLmxvZ0Vycm9yKGUpOworCQkJCQlXVFBDb21tb25QbHVnaW4ubG9nRXJyb3IoZSk7CiAJCQkJfSBjYXRjaCAoSW5zdGFudGlhdGlvbkV4Y2VwdGlvbiBlKSB7Ci0JCQkJCUxvZ2dlci5nZXRMb2dnZXIoKS5sb2dFcnJvcihlKTsKKwkJCQkJV1RQQ29tbW9uUGx1Z2luLmxvZ0Vycm9yKGUpOwogCQkJCX0gIAogCQl9CiAJCXJldHVybiBjcmVhdGVEYXRhTW9kZWwoYUNsYXNzLmdldE5hbWUoKSk7CmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy9zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9mcmFtZXdvcmtzL2RhdGFtb2RlbC9EYXRhTW9kZWxQcm9wZXJ0eURlc2NyaXB0b3IuamF2YSBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzL3NyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ZyYW1ld29ya3MvZGF0YW1vZGVsL0RhdGFNb2RlbFByb3BlcnR5RGVzY3JpcHRvci5qYXZhCmluZGV4IDIxNTRlY2MuLmRjNzU3ZGYgMTAwNjQ0Ci0tLSBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzL3NyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ZyYW1ld29ya3MvZGF0YW1vZGVsL0RhdGFNb2RlbFByb3BlcnR5RGVzY3JpcHRvci5qYXZhCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzL3NyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ZyYW1ld29ya3MvZGF0YW1vZGVsL0RhdGFNb2RlbFByb3BlcnR5RGVzY3JpcHRvci5qYXZhCkBAIC0xMzQsNiArMTM0LDcgQEAKIAkJcmV0dXJuIChudWxsICE9IHN0cikgPyBzdHIgOiAiIjsgLy8kTk9OLU5MUy0xJAogCX0KIAkKKwlAT3ZlcnJpZGUKIAlwdWJsaWMgU3RyaW5nIHRvU3RyaW5nKCl7CiAJCXJldHVybiBnZXRQcm9wZXJ0eURlc2NyaXB0aW9uKCk7CiAJfQpkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3Mvc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vZnJhbWV3b3Jrcy9pbnRlcm5hbC9TYXZlSGFuZGxlckhlYWRsZXNzLmphdmEgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy9zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9mcmFtZXdvcmtzL2ludGVybmFsL1NhdmVIYW5kbGVySGVhZGxlc3MuamF2YQppbmRleCBhOWMwN2NlLi4yYWUxNTBmIDEwMDY0NAotLS0gYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy9zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9mcmFtZXdvcmtzL2ludGVybmFsL1NhdmVIYW5kbGVySGVhZGxlc3MuamF2YQorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy9zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9mcmFtZXdvcmtzL2ludGVybmFsL1NhdmVIYW5kbGVySGVhZGxlc3MuamF2YQpAQCAtMTIsOCArMTIsOCBAQAogcGFja2FnZSBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3MuaW50ZXJuYWw7CiAKIGltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJ1bnRpbWUuQ29yZUV4Y2VwdGlvbjsKLWltcG9ydCBvcmcuZWNsaXBzZS5qZW0udXRpbC5sb2dnZXIucHJveHkuTG9nZ2VyOwogaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy5pbnRlcm5hbC5lbmFibGVtZW50Lm5vbnVpLklXRlRXcmFwcGVkRXhjZXB0aW9uOworaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy5pbnRlcm5hbC5wbHVnaW4uV1RQQ29tbW9uUGx1Z2luOwogCiAvKioKICAqIEluc2VydCB0aGUgdHlwZSdzIGRlc2NyaXB0aW9uIGhlcmUuIENyZWF0aW9uIGRhdGU6ICgxMC8xOS8yMDAxIDExOjQwOjU5IEFNKQpAQCAtODAsNyArODAsNyBAQAogCQlpZiAoYUZpbGUgPT0gbnVsbCkKIAkJCXJldHVybiBmYWxzZTsKIAkJU3RyaW5nIGVycm9yID0gV1RQUmVzb3VyY2VIYW5kbGVyLmdldFN0cmluZygiVW5hYmxlX3RvX3NhdmVfcmVhZC1vbmx5X2ZfRVJST1JfIiwgbmV3IE9iamVjdFtde2FGaWxlLmdldEZ1bGxQYXRoKCl9KTsgLy8kTk9OLU5MUy0xJCA9ICJVbmFibGUgdG8gc2F2ZSByZWFkLW9ubHkgZmlsZTogIgotCQlMb2dnZXIuZ2V0TG9nZ2VyKCkubG9nRXJyb3IoZXJyb3IpOworCQlXVFBDb21tb25QbHVnaW4ubG9nRXJyb3IoZXJyb3IpOwogCQlyZXR1cm4gZmFsc2U7CiAJfQogfQpcIE5vIG5ld2xpbmUgYXQgZW5kIG9mIGZpbGUKZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzL3NyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ZyYW1ld29ya3MvaW50ZXJuYWwvU2F2ZUhhbmRsZXJSZWdpc3Rlci5qYXZhIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3Mvc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vZnJhbWV3b3Jrcy9pbnRlcm5hbC9TYXZlSGFuZGxlclJlZ2lzdGVyLmphdmEKaW5kZXggN2RlZTI2ZC4uN2FhZWYwMCAxMDA2NDQKLS0tIGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3Mvc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vZnJhbWV3b3Jrcy9pbnRlcm5hbC9TYXZlSGFuZGxlclJlZ2lzdGVyLmphdmEKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3Mvc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vZnJhbWV3b3Jrcy9pbnRlcm5hbC9TYXZlSGFuZGxlclJlZ2lzdGVyLmphdmEKQEAgLTEwLDggKzEwLDcgQEAKICAqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqLwogcGFja2FnZSBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3MuaW50ZXJuYWw7CiAKLWltcG9ydCBvcmcuZWNsaXBzZS5qZW0udXRpbC5VSUNvbnRleHREZXRlcm1pbmF0aW9uOwotCitpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb3JlLnV0aWwuVUlDb250ZXh0RGV0ZXJtaW5hdGlvbjsKIAogLyoqCiAgKiBBIHJlZ2lzdHJ5IGZvciB0aGUgZGVmYXVsdCBJU2F2ZUhhbmRsZXIgdG8gdXNlIHdoZW4gc2F2aW5nIGVkaXQgbW9kZWxzCmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy9zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9mcmFtZXdvcmtzL2ludGVybmFsL1NpbXBsZVZhbGlkYXRlRWRpdC5qYXZhIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3Mvc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vZnJhbWV3b3Jrcy9pbnRlcm5hbC9TaW1wbGVWYWxpZGF0ZUVkaXQuamF2YQppbmRleCBlYzg0NDY4Li5mOGQ2YWNiIDEwMDY0NAotLS0gYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy9zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9mcmFtZXdvcmtzL2ludGVybmFsL1NpbXBsZVZhbGlkYXRlRWRpdC5qYXZhCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzL3NyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ZyYW1ld29ya3MvaW50ZXJuYWwvU2ltcGxlVmFsaWRhdGVFZGl0LmphdmEKQEAgLTE0LDcgKzE0LDcgQEAKIAogaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucmVzb3VyY2VzLklGaWxlOwogaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucnVudGltZS5JU3RhdHVzOwotaW1wb3J0IG9yZy5lY2xpcHNlLmplbS51dGlsLlVJQ29udGV4dERldGVybWluYXRpb247CitpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb3JlLnV0aWwuVUlDb250ZXh0RGV0ZXJtaW5hdGlvbjsKIAogcHVibGljIGNsYXNzIFNpbXBsZVZhbGlkYXRlRWRpdCB7CiAKZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzL3NyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ZyYW1ld29ya3MvaW50ZXJuYWwvV1RQUGx1Z2luLmphdmEgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy9zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9mcmFtZXdvcmtzL2ludGVybmFsL1dUUFBsdWdpbi5qYXZhCmluZGV4IGUzM2ZkZjYuLjdmNzk4YmEgMTAwNjQ0Ci0tLSBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzL3NyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ZyYW1ld29ya3MvaW50ZXJuYWwvV1RQUGx1Z2luLmphdmEKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3Mvc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vZnJhbWV3b3Jrcy9pbnRlcm5hbC9XVFBQbHVnaW4uamF2YQpAQCAtOCwyNiArOCwxNiBAQAogICogQ29udHJpYnV0b3JzOgogICogICAgIElCTSBDb3Jwb3JhdGlvbiAtIGluaXRpYWwgQVBJIGFuZCBpbXBsZW1lbnRhdGlvbgogICoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKiovCi0vKgotICogQ3JlYXRlZCBvbiBEZWMgMTAsIDIwMDMKLSAqIAotICogVG8gY2hhbmdlIHRoZSB0ZW1wbGF0ZSBmb3IgdGhpcyBnZW5lcmF0ZWQgZmlsZSBnbyB0byBXaW5kb3cgLSBQcmVmZXJlbmNlcyAtIEphdmEgLSBDb2RlCi0gKiBHZW5lcmF0aW9uIC0gQ29kZSBhbmQgQ29tbWVudHMKLSAqLwogcGFja2FnZSBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3MuaW50ZXJuYWw7CiAKIGltcG9ydCBqYXZhLnV0aWwuUmVzb3VyY2VCdW5kbGU7CiAKIGltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJ1bnRpbWUuUGxhdGZvcm07CiBpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5ydW50aW1lLlBsdWdpbjsKLWltcG9ydCBvcmcuZWNsaXBzZS5qZW0udXRpbC5sb2dnZXIucHJveHkuTG9nZ2VyOwotaW1wb3J0IG9yZy5lY2xpcHNlLmplbS51dGlsLmxvZ2dlci5wcm94eXJlbmRlci5EZWZhdWx0UGx1Z2luVHJhY2VSZW5kZXJlcjsKLWltcG9ydCBvcmcuZWNsaXBzZS5qZW0udXRpbC5sb2dnZXIucHJveHlyZW5kZXIuSU1zZ0xvZ2dlcjsKIGltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3MuaW50ZXJuYWwuZW5hYmxlbWVudC5ub251aS5Xb3JrYmVuY2hVdGlsOwogaW1wb3J0IG9yZy5vc2dpLmZyYW1ld29yay5CdW5kbGVDb250ZXh0OwogCi1wdWJsaWMgYWJzdHJhY3QgY2xhc3MgV1RQUGx1Z2luIGV4dGVuZHMgUGx1Z2luIGltcGxlbWVudHMgSU1zZ0xvZ2dlciB7Ci0JcHJvdGVjdGVkIHN0YXRpYyBMb2dnZXIgbG9nZ2VyID0gbnVsbDsKK3B1YmxpYyBhYnN0cmFjdCBjbGFzcyBXVFBQbHVnaW4gZXh0ZW5kcyBQbHVnaW4gewogCXByb3RlY3RlZCBzdGF0aWMgV1RQUGx1Z2luIGluc3RhbmNlID0gbnVsbDsgCiAJcHVibGljIFJlc291cmNlQnVuZGxlIHJlc291cmNlQnVuZGxlOwogCkBAIC0zOSwyNCArMjksNiBAQAogCQlpbnN0YW5jZSA9IHRoaXM7CiAJfQogCi0JcHVibGljIExvZ2dlciBnZXRNc2dMb2dnZXIoKSB7Ci0JCWlmIChsb2dnZXIgPT0gbnVsbCkgewotCQkJbG9nZ2VyID0gTG9nZ2VyLmdldExvZ2dlcihnZXRQbHVnaW5JRCgpKTsKLQkJCXNldFJlbmRlcmVyKGxvZ2dlcik7Ci0JCX0KLQkJcmV0dXJuIGxvZ2dlcjsKLQl9Ci0KLQkvKioKLQkgKiBAcGFyYW0gYUxvZ2dlcgotCSAqLwotCXByb3RlY3RlZCB2b2lkIHNldFJlbmRlcmVyKExvZ2dlciBhTG9nZ2VyKSB7Ci0JCW5ldyBEZWZhdWx0UGx1Z2luVHJhY2VSZW5kZXJlcihhTG9nZ2VyKTsKLQl9Ci0KLQlwdWJsaWMgTG9nZ2VyIGdldExvZ2dlcigpIHsKLQkJcmV0dXJuIGdldE1zZ0xvZ2dlcigpOwotCX0KIAlwdWJsaWMgc3RhdGljIGJvb2xlYW4gaXNQbGF0Zm9ybUNhc2VTZW5zaXRpdmUoKSB7CiAJCXJldHVybiBQbGF0Zm9ybS5PU19NQUNPU1guZXF1YWxzKFBsYXRmb3JtLmdldE9TKCkpID8gZmFsc2UgOiBuZXcKIAkJCQlqYXZhLmlvLkZpbGUoImEiKS5jb21wYXJlVG8obmV3IGphdmEuaW8uRmlsZSgiQSIpKSAhPSAwOyAgLy8kTk9OLU5MUy0xJC8vJE5PTi1OTFMtMiQKQEAgLTY5LDYgKzQxLDcgQEAKIAkgKiAKIAkgKiBAc2VlIG9yZy5lY2xpcHNlLmNvcmUucnVudGltZS5QbHVnaW4jc3RhcnR1cCgpCiAJICovCisJQE92ZXJyaWRlCiAJcHVibGljIHZvaWQgc3RhcnQoQnVuZGxlQ29udGV4dCBjb250ZXh0KSB0aHJvd3MgRXhjZXB0aW9uICB7CiAJCXN1cGVyLnN0YXJ0KGNvbnRleHQpOwogCQlXb3JrYmVuY2hVdGlsLnNldFdvcmtiZW5jaElzUnVubmluZyh0cnVlKTsKZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzL3NyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ZyYW1ld29ya3MvaW50ZXJuYWwvV3JhcHBlZEV4Y2VwdGlvbi5qYXZhIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3Mvc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vZnJhbWV3b3Jrcy9pbnRlcm5hbC9XcmFwcGVkRXhjZXB0aW9uLmphdmEKaW5kZXggY2QyYWJhOC4uM2MxODJkMSAxMDA2NDQKLS0tIGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3Mvc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vZnJhbWV3b3Jrcy9pbnRlcm5hbC9XcmFwcGVkRXhjZXB0aW9uLmphdmEKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3Mvc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vZnJhbWV3b3Jrcy9pbnRlcm5hbC9XcmFwcGVkRXhjZXB0aW9uLmphdmEKQEAgLTQ5LDYgKzQ5LDcgQEAKIAkvKioKIAkgKiBQcmludCBvdXQgYSBzdGFjayB0cmFjZSB0byB0aGUgc3lzdGVtIGVyci4KIAkgKi8KKwlAT3ZlcnJpZGUKIAlwdWJsaWMgdm9pZCBwcmludFN0YWNrVHJhY2UoKSB7CiAJCXByaW50U3RhY2tUcmFjZShTeXN0ZW0uZXJyKTsKIAl9CkBAIC01Niw2ICs1Nyw3IEBACiAJLyoqCiAJICogUHJpbnRzIHRoZSBleGNlcHRpb24gdG8gU3lzdGVtLmVyci4gSWYgd2UgaGF2ZSBhIG5lc3RlZCBleGNlcHRpb24sIHByaW50IGl0cyBzdGFjay4KIAkgKi8KKwlAT3ZlcnJpZGUKIAlwdWJsaWMgdm9pZCBwcmludFN0YWNrVHJhY2UoamF2YS5pby5QcmludFN0cmVhbSBzKSB7CiAJCWlmIChnZXRUYXJnZXRFeGNlcHRpb24oKSAhPSBudWxsKSB7CiAJCQlzLnByaW50bG4odGhpcyk7CkBAIC02OSw2ICs3MSw3IEBACiAJLyoqCiAJICogUHJpbnRzIHRoZSBleGNlcHRpb24gdG8gU3lzdGVtLmVyci4gSWYgd2UgaGF2ZSBhIG5lc3RlZCBleGNlcHRpb24sIHByaW50IGl0cyBzdGFjay4KIAkgKi8KKwlAT3ZlcnJpZGUKIAlwdWJsaWMgdm9pZCBwcmludFN0YWNrVHJhY2UoamF2YS5pby5QcmludFdyaXRlciBzKSB7CiAJCWlmIChnZXRUYXJnZXRFeGNlcHRpb24oKSAhPSBudWxsKSB7CiAJCQlzLnByaW50bG4odGhpcyk7CmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy9zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9mcmFtZXdvcmtzL2ludGVybmFsL1dyYXBwZWRSdW50aW1lRXhjZXB0aW9uLmphdmEgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy9zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9mcmFtZXdvcmtzL2ludGVybmFsL1dyYXBwZWRSdW50aW1lRXhjZXB0aW9uLmphdmEKaW5kZXggMzUxZGU4NC4uN2U5ODk1ZiAxMDA2NDQKLS0tIGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3Mvc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vZnJhbWV3b3Jrcy9pbnRlcm5hbC9XcmFwcGVkUnVudGltZUV4Y2VwdGlvbi5qYXZhCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzL3NyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ZyYW1ld29ya3MvaW50ZXJuYWwvV3JhcHBlZFJ1bnRpbWVFeGNlcHRpb24uamF2YQpAQCAtNzcsNiArNzcsNyBAQAogCSAqIDxjb2RlPlRocm93YWJsZS5nZXRDYXVzZSgpPC9jb2RlPi4KIAkgKiBAcmV0dXJuIFRoZSBuZXN0ZWQgZXhjZXB0aW9uIGhlbGQgYnkgdGhlIHJlY2VpdmVyLgogCSAqLworCUBPdmVycmlkZQogCXB1YmxpYyBqYXZhLmxhbmcuVGhyb3dhYmxlIGdldENhdXNlKCkgewogCQlyZXR1cm4gZ2V0TmVzdGVkRXhjZXB0aW9uKCk7CiAJfQpAQCAtODQsNiArODUsNyBAQAogCS8qKgogCSAqIFByaW50IG91dCBhIHN0YWNrIHRyYWNlIHRvIHRoZSBzeXN0ZW0gZXJyLgogCSAqLworCUBPdmVycmlkZQogCXB1YmxpYyB2b2lkIHByaW50U3RhY2tUcmFjZSgpIHsKIAkJcHJpbnRTdGFja1RyYWNlKFN5c3RlbS5lcnIpOwogCX0KQEAgLTkxLDYgKzkzLDcgQEAKIAkvKioKIAkgKiBQcmludHMgdGhlIGV4Y2VwdGlvbiB0byBTeXN0ZW0uZXJyLiBJZiB3ZSBoYXZlIGEgbmVzdGVkIGV4Y2VwdGlvbiwgcHJpbnQgaXRzIHN0YWNrLgogCSAqLworCUBPdmVycmlkZQogCXB1YmxpYyB2b2lkIHByaW50U3RhY2tUcmFjZShqYXZhLmlvLlByaW50U3RyZWFtIHMpIHsKIAkJaWYgKG5lc3RlZEV4Y2VwdGlvbiAhPSBudWxsKSB7CiAJCQlzLnByaW50bG4odGhpcyk7CkBAIC0xMDQsNiArMTA3LDcgQEAKIAkvKioKIAkgKiBQcmludHMgdGhlIGV4Y2VwdGlvbiB0byBTeXN0ZW0uZXJyLiBJZiB3ZSBoYXZlIGEgbmVzdGVkIGV4Y2VwdGlvbiwgcHJpbnQgaXRzIHN0YWNrLgogCSAqLworCUBPdmVycmlkZQogCXB1YmxpYyB2b2lkIHByaW50U3RhY2tUcmFjZShqYXZhLmlvLlByaW50V3JpdGVyIHMpIHsKIAkJaWYgKG5lc3RlZEV4Y2VwdGlvbiAhPSBudWxsKSB7CiAJCQlzLnByaW50bG4odGhpcyk7CmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy9zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9mcmFtZXdvcmtzL2ludGVybmFsL2FjdGl2aXRpZXMvV1RQQWN0aXZpdHlCcmlkZ2UuamF2YSBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzL3NyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ZyYW1ld29ya3MvaW50ZXJuYWwvYWN0aXZpdGllcy9XVFBBY3Rpdml0eUJyaWRnZS5qYXZhCmluZGV4IDM1MzhlYTQuLjZjN2ZhMjMgMTAwNjQ0Ci0tLSBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzL3NyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ZyYW1ld29ya3MvaW50ZXJuYWwvYWN0aXZpdGllcy9XVFBBY3Rpdml0eUJyaWRnZS5qYXZhCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzL3NyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ZyYW1ld29ya3MvaW50ZXJuYWwvYWN0aXZpdGllcy9XVFBBY3Rpdml0eUJyaWRnZS5qYXZhCkBAIC0yNCw3ICsyNCw3IEBACiBpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5ydW50aW1lLklFeHRlbnNpb247CiBpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5ydW50aW1lLklFeHRlbnNpb25Qb2ludDsKIGltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJ1bnRpbWUuUGxhdGZvcm07Ci1pbXBvcnQgb3JnLmVjbGlwc2UuamVtLnV0aWwubG9nZ2VyLnByb3h5LkxvZ2dlcjsKK2ltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3MuaW50ZXJuYWwucGx1Z2luLldUUENvbW1vblBsdWdpbjsKIAogLyoqCiAgKiBAYXV0aG9yIGpzaG9sbApAQCAtNTgsOCArNTgsOCBAQAogCX0KIAogCXB1YmxpYyBTZXQgZ2V0RW5hYmxlZEFjdGl2aXR5SWRzKCkgewotCQlmb3IgKGludCBpID0gMDsgaSA8IGxpc3RlbmVycy5sZW5ndGg7IGkrKykgewotCQkJcmV0dXJuIGxpc3RlbmVyc1tpXS5nZXRFbmFibGVkQWN0aXZpdHlJZHMoKTsKKwkJaWYobGlzdGVuZXJzLmxlbmd0aCA+IDApeworCQkJcmV0dXJuIGxpc3RlbmVyc1swXS5nZXRFbmFibGVkQWN0aXZpdHlJZHMoKTsKIAkJfQogCQlyZXR1cm4gQ29sbGVjdGlvbnMuRU1QVFlfU0VUOwogCX0KQEAgLTcxLDggKzcxLDggQEAKIAl9CiAKIAlwdWJsaWMgU2V0IGdldEFjdGl2aXR5SURzRnJvbUNvbnRyaWJ1dGlvbihTdHJpbmcgbG9jYWxJRCwgU3RyaW5nIHBsdWdpbklEKSB7Ci0JCWZvciAoaW50IGkgPSAwOyBpIDwgbGlzdGVuZXJzLmxlbmd0aDsgaSsrKSB7Ci0JCQlyZXR1cm4gbGlzdGVuZXJzW2ldLmdldEFjdGl2aXR5SURzRnJvbUNvbnRyaWJ1dGlvbihsb2NhbElELCBwbHVnaW5JRCk7CisJCWlmKGxpc3RlbmVycy5sZW5ndGggPiAwKSB7CisJCQlyZXR1cm4gbGlzdGVuZXJzWzBdLmdldEFjdGl2aXR5SURzRnJvbUNvbnRyaWJ1dGlvbihsb2NhbElELCBwbHVnaW5JRCk7CiAJCX0KIAkJcmV0dXJuIENvbGxlY3Rpb25zLkVNUFRZX1NFVDsKIAl9CkBAIC0xMDEsNiArMTAxLDYgQEAKIAkJU3RyaW5nQnVmZmVyIGJ1ZiA9IG5ldyBTdHJpbmdCdWZmZXIoKTsKIAkJYnVmLmFwcGVuZCgiUGx1Z2luICIgKyBleHRlbnNpb24uZ2V0TmFtZXNwYWNlKCkgKyAiLCBleHRlbnNpb24gIiArIGV4dGVuc2lvbi5nZXRFeHRlbnNpb25Qb2ludFVuaXF1ZUlkZW50aWZpZXIoKSk7IC8vJE5PTi1OTFMtMSQgLy8kTk9OLU5MUy0yJAogCQlidWYuYXBwZW5kKCJcbiIgKyB0ZXh0KTsgLy8kTk9OLU5MUy0xJAotCQlMb2dnZXIuZ2V0TG9nZ2VyKCkubG9nRXJyb3IoYnVmLnRvU3RyaW5nKCkpOworCQlXVFBDb21tb25QbHVnaW4ubG9nRXJyb3IoYnVmLnRvU3RyaW5nKCkpOwogCX0KIH0KZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzL3NyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ZyYW1ld29ya3MvaW50ZXJuYWwvZGF0YW1vZGVsL0RhdGFNb2RlbEV4dGVuc2lvblJlYWRlci5qYXZhIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3Mvc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vZnJhbWV3b3Jrcy9pbnRlcm5hbC9kYXRhbW9kZWwvRGF0YU1vZGVsRXh0ZW5zaW9uUmVhZGVyLmphdmEKaW5kZXggODZhZGJjNi4uNWIxZmUxNSAxMDA2NDQKLS0tIGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3Mvc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vZnJhbWV3b3Jrcy9pbnRlcm5hbC9kYXRhbW9kZWwvRGF0YU1vZGVsRXh0ZW5zaW9uUmVhZGVyLmphdmEKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3Mvc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vZnJhbWV3b3Jrcy9pbnRlcm5hbC9kYXRhbW9kZWwvRGF0YU1vZGVsRXh0ZW5zaW9uUmVhZGVyLmphdmEKQEAgLTE2LDggKzE2LDcgQEAKIAogaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucnVudGltZS5Db3JlRXhjZXB0aW9uOwogaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucnVudGltZS5JQ29uZmlndXJhdGlvbkVsZW1lbnQ7Ci1pbXBvcnQgb3JnLmVjbGlwc2UuamVtLnV0aWwuUmVnaXN0cnlSZWFkZXI7Ci1pbXBvcnQgb3JnLmVjbGlwc2UuamVtLnV0aWwubG9nZ2VyLnByb3h5LkxvZ2dlcjsKK2ltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvcmUudXRpbC5SZWdpc3RyeVJlYWRlcjsKIGltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3MuZGF0YW1vZGVsLklEYXRhTW9kZWxQcm92aWRlcjsKIGltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3MuaW50ZXJuYWwucGx1Z2luLldUUENvbW1vblBsdWdpbjsKIApAQCAtNDUsMzUgKzQ0LDM2IEBACiAJCXN1cGVyKFdUUENvbW1vblBsdWdpbi5QTFVHSU5fSUQsIEVYVEVOU0lPTik7CiAJfQogCisJQE92ZXJyaWRlCiAJcHVibGljIGJvb2xlYW4gcmVhZEVsZW1lbnQoSUNvbmZpZ3VyYXRpb25FbGVtZW50IGVsZW1lbnQpIHsKIAkJaWYgKGVsZW1lbnQuZ2V0TmFtZSgpLmVxdWFscyhQUk9WSURFUl9FTEVNRU5UKSkgewogCQkJU3RyaW5nIGlkID0gZWxlbWVudC5nZXRBdHRyaWJ1dGUoQVRUUklCVVRFX0lEKTsKIAkJCWlmIChudWxsID09IGlkIHx8IGlkLnRyaW0oKS5sZW5ndGgoKSA9PSAwKSB7Ci0JCQkJTG9nZ2VyLmdldExvZ2dlcigpLmxvZ0Vycm9yKG5ldyBSdW50aW1lRXhjZXB0aW9uKCJFeHRlbnNpb246IiArIEVYVEVOU0lPTiArICIgRWxlbWVudDoiICsgUFJPVklERVJfRUxFTUVOVCArICIgaXMgbWlzc2luZyAiICsgQVRUUklCVVRFX0lEKSk7IC8vJE5PTi1OTFMtMSQgLy8kTk9OLU5MUy0yJCAvLyROT04tTkxTLTMkCisJCQkJV1RQQ29tbW9uUGx1Z2luLmxvZ0Vycm9yKG5ldyBSdW50aW1lRXhjZXB0aW9uKCJFeHRlbnNpb246IiArIEVYVEVOU0lPTiArICIgRWxlbWVudDoiICsgUFJPVklERVJfRUxFTUVOVCArICIgaXMgbWlzc2luZyAiICsgQVRUUklCVVRFX0lEKSk7IC8vJE5PTi1OTFMtMSQgLy8kTk9OLU5MUy0yJCAvLyROT04tTkxTLTMkCiAJCQl9CiAJCQlTdHJpbmcgY2xhc3NOYW1lID0gZWxlbWVudC5nZXRBdHRyaWJ1dGUoQVRUUklCVVRFX0NMQVNTKTsKIAkJCWlmIChudWxsID09IGNsYXNzTmFtZSB8fCBjbGFzc05hbWUudHJpbSgpLmxlbmd0aCgpID09IDApIHsKLQkJCQlMb2dnZXIuZ2V0TG9nZ2VyKCkubG9nRXJyb3IobmV3IFJ1bnRpbWVFeGNlcHRpb24oIkV4dGVuc2lvbjoiICsgRVhURU5TSU9OICsgIiBFbGVtZW50OiIgKyBQUk9WSURFUl9FTEVNRU5UICsgIiBpcyBtaXNzaW5nICIgKyBBVFRSSUJVVEVfQ0xBU1MpKTsgLy8kTk9OLU5MUy0xJCAvLyROT04tTkxTLTIkIC8vJE5PTi1OTFMtMyQKKwkJCQlXVFBDb21tb25QbHVnaW4ubG9nRXJyb3IobmV3IFJ1bnRpbWVFeGNlcHRpb24oIkV4dGVuc2lvbjoiICsgRVhURU5TSU9OICsgIiBFbGVtZW50OiIgKyBQUk9WSURFUl9FTEVNRU5UICsgIiBpcyBtaXNzaW5nICIgKyBBVFRSSUJVVEVfQ0xBU1MpKTsgLy8kTk9OLU5MUy0xJCAvLyROT04tTkxTLTIkIC8vJE5PTi1OTFMtMyQKIAkJCX0KIAkJCWFkZFByb3ZpZGVyRXh0ZW5zaW9uKGlkLCBlbGVtZW50KTsKIAkJfSBlbHNlIGlmIChlbGVtZW50LmdldE5hbWUoKS5lcXVhbHMoREVGSU5FU19UWVBFX0VMRU1FTlQpKSB7CiAJCQlTdHJpbmcgdHlwZSA9IGVsZW1lbnQuZ2V0QXR0cmlidXRlKEFUVFJJQlVURV9QUk9WSURFUl9UWVBFKTsKIAkJCWlmIChudWxsID09IHR5cGUgfHwgdHlwZS50cmltKCkubGVuZ3RoKCkgPT0gMCkgewotCQkJCUxvZ2dlci5nZXRMb2dnZXIoKS5sb2dFcnJvcihuZXcgUnVudGltZUV4Y2VwdGlvbigiRXh0ZW5zaW9uOiIgKyBFWFRFTlNJT04gKyAiIEVsZW1lbnQ6IiArIERFRklORVNfVFlQRV9FTEVNRU5UICsgIiBpcyBtaXNzaW5nICIgKyBBVFRSSUJVVEVfUFJPVklERVJfVFlQRSkpOyAvLyROT04tTkxTLTEkIC8vJE5PTi1OTFMtMiQgLy8kTk9OLU5MUy0zJAorCQkJCVdUUENvbW1vblBsdWdpbi5sb2dFcnJvcihuZXcgUnVudGltZUV4Y2VwdGlvbigiRXh0ZW5zaW9uOiIgKyBFWFRFTlNJT04gKyAiIEVsZW1lbnQ6IiArIERFRklORVNfVFlQRV9FTEVNRU5UICsgIiBpcyBtaXNzaW5nICIgKyBBVFRSSUJVVEVfUFJPVklERVJfVFlQRSkpOyAvLyROT04tTkxTLTEkIC8vJE5PTi1OTFMtMiQgLy8kTk9OLU5MUy0zJAogCQkJfQogCQkJU3RyaW5nIGlkID0gZWxlbWVudC5nZXRBdHRyaWJ1dGUoQVRUUklCVVRFX1BST1ZJREVSX0lEKTsKIAkJCWlmIChudWxsID09IGlkIHx8IGlkLnRyaW0oKS5sZW5ndGgoKSA9PSAwKSB7Ci0JCQkJTG9nZ2VyLmdldExvZ2dlcigpLmxvZ0Vycm9yKG5ldyBSdW50aW1lRXhjZXB0aW9uKCJFeHRlbnNpb246IiArIEVYVEVOU0lPTiArICIgRWxlbWVudDoiICsgREVGSU5FU19UWVBFX0VMRU1FTlQgKyAiIGlzIG1pc3NpbmcgIiArIEFUVFJJQlVURV9QUk9WSURFUl9JRCkpOyAvLyROT04tTkxTLTEkIC8vJE5PTi1OTFMtMiQgLy8kTk9OLU5MUy0zJAorCQkJCVdUUENvbW1vblBsdWdpbi5sb2dFcnJvcihuZXcgUnVudGltZUV4Y2VwdGlvbigiRXh0ZW5zaW9uOiIgKyBFWFRFTlNJT04gKyAiIEVsZW1lbnQ6IiArIERFRklORVNfVFlQRV9FTEVNRU5UICsgIiBpcyBtaXNzaW5nICIgKyBBVFRSSUJVVEVfUFJPVklERVJfSUQpKTsgLy8kTk9OLU5MUy0xJCAvLyROT04tTkxTLTIkIC8vJE5PTi1OTFMtMyQKIAkJCX0KIAkJCWFkZERlZmluZXNFeHRlbnNpb24odHlwZSwgaWQpOwogCQl9IGVsc2UgaWYgKGVsZW1lbnQuZ2V0TmFtZSgpLmVxdWFscyhJTVBMRU1FTlRTX1RZUEVfRUxFTUVOVCkpIHsKIAkJCVN0cmluZyB0eXBlID0gZWxlbWVudC5nZXRBdHRyaWJ1dGUoQVRUUklCVVRFX1BST1ZJREVSX1RZUEUpOwogCQkJaWYgKG51bGwgPT0gdHlwZSB8fCB0eXBlLnRyaW0oKS5sZW5ndGgoKSA9PSAwKSB7Ci0JCQkJTG9nZ2VyLmdldExvZ2dlcigpLmxvZ0Vycm9yKG5ldyBSdW50aW1lRXhjZXB0aW9uKCJFeHRlbnNpb246IiArIEVYVEVOU0lPTiArICIgRWxlbWVudDoiICsgREVGSU5FU19UWVBFX0VMRU1FTlQgKyAiIGlzIG1pc3NpbmcgIiArIEFUVFJJQlVURV9QUk9WSURFUl9UWVBFKSk7IC8vJE5PTi1OTFMtMSQgLy8kTk9OLU5MUy0yJCAvLyROT04tTkxTLTMkCisJCQkJV1RQQ29tbW9uUGx1Z2luLmxvZ0Vycm9yKG5ldyBSdW50aW1lRXhjZXB0aW9uKCJFeHRlbnNpb246IiArIEVYVEVOU0lPTiArICIgRWxlbWVudDoiICsgREVGSU5FU19UWVBFX0VMRU1FTlQgKyAiIGlzIG1pc3NpbmcgIiArIEFUVFJJQlVURV9QUk9WSURFUl9UWVBFKSk7IC8vJE5PTi1OTFMtMSQgLy8kTk9OLU5MUy0yJCAvLyROT04tTkxTLTMkCiAJCQl9CiAJCQlTdHJpbmcgaWQgPSBlbGVtZW50LmdldEF0dHJpYnV0ZShBVFRSSUJVVEVfUFJPVklERVJfSUQpOwogCQkJaWYgKG51bGwgPT0gaWQgfHwgaWQudHJpbSgpLmxlbmd0aCgpID09IDApIHsKLQkJCQlMb2dnZXIuZ2V0TG9nZ2VyKCkubG9nRXJyb3IobmV3IFJ1bnRpbWVFeGNlcHRpb24oIkV4dGVuc2lvbjoiICsgRVhURU5TSU9OICsgIiBFbGVtZW50OiIgKyBERUZJTkVTX1RZUEVfRUxFTUVOVCArICIgaXMgbWlzc2luZyAiICsgQVRUUklCVVRFX1BST1ZJREVSX0lEKSk7IC8vJE5PTi1OTFMtMSQgLy8kTk9OLU5MUy0yJCAvLyROT04tTkxTLTMkCisJCQkJV1RQQ29tbW9uUGx1Z2luLmxvZ0Vycm9yKG5ldyBSdW50aW1lRXhjZXB0aW9uKCJFeHRlbnNpb246IiArIEVYVEVOU0lPTiArICIgRWxlbWVudDoiICsgREVGSU5FU19UWVBFX0VMRU1FTlQgKyAiIGlzIG1pc3NpbmcgIiArIEFUVFJJQlVURV9QUk9WSURFUl9JRCkpOyAvLyROT04tTkxTLTEkIC8vJE5PTi1OTFMtMiQgLy8kTk9OLU5MUy0zJAogCQkJfQogCQkJYWRkSW1wbGVtZW50c0V4dGVuc2lvbih0eXBlLCBpZCk7CiAJCX0KQEAgLTgyLDE0ICs4MiwxNCBAQAogCiAJcHJpdmF0ZSB2b2lkIGFkZFByb3ZpZGVyRXh0ZW5zaW9uKFN0cmluZyBpZCwgSUNvbmZpZ3VyYXRpb25FbGVtZW50IGVsZW1lbnQpIHsKIAkJaWYgKHByb3ZpZGVyRXh0ZW5zaW9ucy5jb250YWluc0tleShpZCkpIHsKLQkJCUxvZ2dlci5nZXRMb2dnZXIoKS5sb2dFcnJvcihuZXcgUnVudGltZUV4Y2VwdGlvbigiRHVwbGljYXRlICIgKyBQUk9WSURFUl9FTEVNRU5UICsgIiAiICsgQVRUUklCVVRFX0lEICsgIiAiICsgaWQpKTsgLy8kTk9OLU5MUy0xJCAvLyROT04tTkxTLTIkIC8vJE5PTi1OTFMtMyQKKwkJCVdUUENvbW1vblBsdWdpbi5sb2dFcnJvcihuZXcgUnVudGltZUV4Y2VwdGlvbigiRHVwbGljYXRlICIgKyBQUk9WSURFUl9FTEVNRU5UICsgIiAiICsgQVRUUklCVVRFX0lEICsgIiAiICsgaWQpKTsgLy8kTk9OLU5MUy0xJCAvLyROT04tTkxTLTIkIC8vJE5PTi1OTFMtMyQKIAkJfQogCQlwcm92aWRlckV4dGVuc2lvbnMucHV0KGlkLCBlbGVtZW50KTsKIAl9CiAKIAlwcml2YXRlIHZvaWQgYWRkRGVmaW5lc0V4dGVuc2lvbihTdHJpbmcgdHlwZSwgU3RyaW5nIGlkKSB7CiAJCWlmIChkZWZpbmVzRXh0ZW5zaW9ucy5jb250YWluc0tleSh0eXBlKSkgewotCQkJTG9nZ2VyLmdldExvZ2dlcigpLmxvZ0Vycm9yKG5ldyBSdW50aW1lRXhjZXB0aW9uKCJEdXBsaWNhdGUgIiArIFBST1ZJREVSX0VMRU1FTlQgKyAiICIgKyBBVFRSSUJVVEVfUFJPVklERVJfVFlQRSArICIgIiArIHR5cGUpKTsgLy8kTk9OLU5MUy0xJCAvLyROT04tTkxTLTIkIC8vJE5PTi1OTFMtMyQKKwkJCVdUUENvbW1vblBsdWdpbi5sb2dFcnJvcihuZXcgUnVudGltZUV4Y2VwdGlvbigiRHVwbGljYXRlICIgKyBQUk9WSURFUl9FTEVNRU5UICsgIiAiICsgQVRUUklCVVRFX1BST1ZJREVSX1RZUEUgKyAiICIgKyB0eXBlKSk7IC8vJE5PTi1OTFMtMSQgLy8kTk9OLU5MUy0yJCAvLyROT04tTkxTLTMkCiAJCX0KIAkJZGVmaW5lc0V4dGVuc2lvbnMucHV0KHR5cGUsIGlkKTsKIAl9CkBAIC0xMDgsNyArMTA4LDcgQEAKIAkJcmVhZFJlZ2lzdHJ5SWZOZWNlc3NhcnkoKTsKIAkJSUNvbmZpZ3VyYXRpb25FbGVtZW50IGVsZW1lbnQgPSAoSUNvbmZpZ3VyYXRpb25FbGVtZW50KSBwcm92aWRlckV4dGVuc2lvbnMuZ2V0KGlkKTsKIAkJaWYgKG51bGwgPT0gZWxlbWVudCkgewotCQkJTG9nZ2VyLmdldExvZ2dlcigpLmxvZyhuZXcgUnVudGltZUV4Y2VwdGlvbigiRXh0ZW5zaW9uOiIgKyBFWFRFTlNJT04gKyAiIEVsZW1lbnQ6IiArIFBST1ZJREVSX0VMRU1FTlQgKyAiIG5vdCBmb3VuZCBmb3IgIiArIEFUVFJJQlVURV9JRCArICI6ICIgKyBpZCkpOyAvLyROT04tTkxTLTEkIC8vJE5PTi1OTFMtMiQgLy8kTk9OLU5MUy0zJCAvLyROT04tTkxTLTQkCisJCQlXVFBDb21tb25QbHVnaW4ubG9nRXJyb3IobmV3IFJ1bnRpbWVFeGNlcHRpb24oIkV4dGVuc2lvbjoiICsgRVhURU5TSU9OICsgIiBFbGVtZW50OiIgKyBQUk9WSURFUl9FTEVNRU5UICsgIiBub3QgZm91bmQgZm9yICIgKyBBVFRSSUJVVEVfSUQgKyAiOiAiICsgaWQpKTsgLy8kTk9OLU5MUy0xJCAvLyROT04tTkxTLTIkIC8vJE5PTi1OTFMtMyQgLy8kTk9OLU5MUy00JAogCQl9CiAJCXJldHVybiBlbGVtZW50OwogCX0KQEAgLTExNyw3ICsxMTcsNyBAQAogCQlyZWFkUmVnaXN0cnlJZk5lY2Vzc2FyeSgpOwogCQlTdHJpbmcgZWxlbWVudCA9IChTdHJpbmcpIGRlZmluZXNFeHRlbnNpb25zLmdldChwcm92aWRlclR5cGUpOwogCQlpZiAobnVsbCA9PSBlbGVtZW50KSB7Ci0JCQlMb2dnZXIuZ2V0TG9nZ2VyKCkubG9nKG5ldyBSdW50aW1lRXhjZXB0aW9uKCJFeHRlbnNpb246IiArIEVYVEVOU0lPTiArICIgRWxlbWVudDoiICsgREVGSU5FU19UWVBFX0VMRU1FTlQgKyAiIG5vdCBmb3VuZCBmb3IgIiArIEFUVFJJQlVURV9QUk9WSURFUl9UWVBFICsgIjogIiArIHByb3ZpZGVyVHlwZSkpOyAvLyROT04tTkxTLTEkIC8vJE5PTi1OTFMtMiQgLy8kTk9OLU5MUy0zJCAvLyROT04tTkxTLTQkCisJCQlXVFBDb21tb25QbHVnaW4ubG9nRXJyb3IobmV3IFJ1bnRpbWVFeGNlcHRpb24oIkV4dGVuc2lvbjoiICsgRVhURU5TSU9OICsgIiBFbGVtZW50OiIgKyBERUZJTkVTX1RZUEVfRUxFTUVOVCArICIgbm90IGZvdW5kIGZvciAiICsgQVRUUklCVVRFX1BST1ZJREVSX1RZUEUgKyAiOiAiICsgcHJvdmlkZXJUeXBlKSk7IC8vJE5PTi1OTFMtMSQgLy8kTk9OLU5MUy0yJCAvLyROT04tTkxTLTMkIC8vJE5PTi1OTFMtNCQKIAkJfQogCQlyZXR1cm4gZWxlbWVudDsKIAl9CkBAIC0xNTcsNyArMTU3LDcgQEAKIAkJdHJ5IHsKIAkJCXByb3ZpZGVyID0gKElEYXRhTW9kZWxQcm92aWRlcikgZWxlbWVudC5jcmVhdGVFeGVjdXRhYmxlRXh0ZW5zaW9uKEFUVFJJQlVURV9DTEFTUyk7CiAJCX0gY2F0Y2ggKENvcmVFeGNlcHRpb24gZSkgewotCQkJTG9nZ2VyLmdldExvZ2dlcigpLmxvZ0Vycm9yKGUpOworCQkJV1RQQ29tbW9uUGx1Z2luLmxvZ0Vycm9yKGUpOwogCQl9CiAJCXJldHVybiBwcm92aWRlcjsKIAl9CmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy9zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9mcmFtZXdvcmtzL2ludGVybmFsL2RhdGFtb2RlbC9EYXRhTW9kZWxJbXBsLmphdmEgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy9zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9mcmFtZXdvcmtzL2ludGVybmFsL2RhdGFtb2RlbC9EYXRhTW9kZWxJbXBsLmphdmEKaW5kZXggN2E0ZGMzYS4uNDM0ZTMxMiAxMDA2NDQKLS0tIGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3Mvc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vZnJhbWV3b3Jrcy9pbnRlcm5hbC9kYXRhbW9kZWwvRGF0YU1vZGVsSW1wbC5qYXZhCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzL3NyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ZyYW1ld29ya3MvaW50ZXJuYWwvZGF0YW1vZGVsL0RhdGFNb2RlbEltcGwuamF2YQpAQCAtMzI3LDE0ICszMjcsMTUgQEAKIAkJcmV0dXJuIGRlc2NyaXB0b3IgPT0gbnVsbCA/IG5ldyBEYXRhTW9kZWxQcm9wZXJ0eURlc2NyaXB0b3IoZ2V0UHJvcGVydHkocHJvcGVydHlOYW1lKSkgOiBkZXNjcmlwdG9yOwogCX0KIAotCXB1YmxpYyB2b2lkIG5vdGlmeVByb3BlcnR5Q2hhbmdlKFN0cmluZyBwcm9wZXJ0eU5hbWUsIGludCBmbGFnKSB7Ci0JCWlmIChmbGFnID09IERFRkFVTFRfQ0hHKSB7CisJcHVibGljIHZvaWQgbm90aWZ5UHJvcGVydHlDaGFuZ2UoZmluYWwgU3RyaW5nIHByb3BlcnR5TmFtZSwgZmluYWwgaW50IGZsYWcpIHsKKwkJaW50IGlubmVyRmxhZyA9IGZsYWc7CisJCWlmIChpbm5lckZsYWcgPT0gREVGQVVMVF9DSEcpIHsKIAkJCWlmIChpc1Byb3BlcnR5U2V0KHByb3BlcnR5TmFtZSkpIHsKIAkJCQlyZXR1cm47CiAJCQl9Ci0JCQlmbGFnID0gVkFMVUVfQ0hHOworCQkJaW5uZXJGbGFnID0gVkFMVUVfQ0hHOwogCQl9Ci0JCW5vdGlmeUxpc3RlbmVycyhuZXcgRGF0YU1vZGVsRXZlbnQodGhpcywgcHJvcGVydHlOYW1lLCBmbGFnKSk7CisJCW5vdGlmeUxpc3RlbmVycyhuZXcgRGF0YU1vZGVsRXZlbnQodGhpcywgcHJvcGVydHlOYW1lLCBpbm5lckZsYWcpKTsKIAl9CiAKIAlwcml2YXRlIHZvaWQgbm90aWZ5TGlzdGVuZXJzKERhdGFNb2RlbEV2ZW50IGV2ZW50KSB7CkBAIC0zNzUsMTkgKzM3NiwxOSBAQAogCQkJCXByb3BOYW1lID0gKFN0cmluZykgaXQubmV4dCgpOwogCQkJCXByb3BTdGF0dXMgPSBwcm92aWRlci52YWxpZGF0ZShwcm9wTmFtZSk7CiAJCQkJaWYgKHByb3BTdGF0dXMgIT0gbnVsbCkgewotCQkJCQlpZiAoc3RhdHVzID09IG51bGwgfHwgc3RhdHVzLmlzT0soKSkKKwkJCQkJaWYgKHN0YXR1cyA9PSBudWxsIHx8IHN0YXR1cy5pc09LKCkpIHsKIAkJCQkJCXN0YXR1cyA9IHByb3BTdGF0dXM7Ci0JCQkJCWVsc2UgewotCQkJCQkJaWYgKHN0YXR1cy5pc011bHRpU3RhdHVzKCkpCisJCQkJCX0gZWxzZSB7CisJCQkJCQlpZiAoc3RhdHVzLmlzTXVsdGlTdGF0dXMoKSkgewogCQkJCQkJCSgoTXVsdGlTdGF0dXMpIHN0YXR1cykubWVyZ2UocHJvcFN0YXR1cyk7Ci0JCQkJCQllbHNlIHsKKwkJCQkJCX0gZWxzZSB7CiAJCQkJCQkJTXVsdGlTdGF0dXMgbXVsdGkgPSBuZXcgTXVsdGlTdGF0dXMoIm9yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy5pbnRlcm5hbCIsIDAsICIiLCBudWxsKTsgLy8kTk9OLU5MUy0xJCAvLyROT04tTkxTLTIkCiAJCQkJCQkJbXVsdGkubWVyZ2Uoc3RhdHVzKTsKIAkJCQkJCQltdWx0aS5tZXJnZShwcm9wU3RhdHVzKTsKIAkJCQkJCQlzdGF0dXMgPSBtdWx0aTsKIAkJCQkJCX0KIAkJCQkJfQotCQkJCQlpZiAoc3RvcE9uRmlyc3RGYWlsdXJlICYmIHN0YXR1cyAhPSBudWxsICYmICFzdGF0dXMuaXNPSygpICYmIHN0YXR1cy5nZXRTZXZlcml0eSgpID09IElTdGF0dXMuRVJST1IpCisJCQkJCWlmIChzdG9wT25GaXJzdEZhaWx1cmUgJiYgIXN0YXR1cy5pc09LKCkgJiYgc3RhdHVzLmdldFNldmVyaXR5KCkgPT0gSVN0YXR1cy5FUlJPUikKIAkJCQkJCXJldHVybiBzdGF0dXM7CiAJCQkJfQogCQkJfQpAQCAtNDQ1LDYgKzQ0Niw3IEBACiAJCUlEYXRhTW9kZWxPcGVyYXRpb24gcHJvdmlkZXJPcCA9IHByb3ZpZGVyLmdldERlZmF1bHRPcGVyYXRpb24oKTsKIAkJaWYgKG51bGwgPT0gcHJvdmlkZXJPcCkgewogCQkJcHJvdmlkZXJPcCA9IG5ldyBBYnN0cmFjdERhdGFNb2RlbE9wZXJhdGlvbih0aGlzKSB7CisJCQkJQE92ZXJyaWRlCiAJCQkJcHVibGljIElTdGF0dXMgZXhlY3V0ZShJUHJvZ3Jlc3NNb25pdG9yIG1vbml0b3IsIElBZGFwdGFibGUgaW5mbykgdGhyb3dzIEV4ZWN1dGlvbkV4Y2VwdGlvbiB7CiAJCQkJCXJldHVybiBPS19TVEFUVVM7CiAJCQkJfQpAQCAtNDU3LDYgKzQ1OSw3IEBACiAJCXJldHVybiBuZXcgRGF0YU1vZGVsUGF1c2libGVPcGVyYXRpb25JbXBsKGdldFJhd09wZXJhdGlvbigpKTsKIAl9CiAKKwlAT3ZlcnJpZGUKIAlwdWJsaWMgU3RyaW5nIHRvU3RyaW5nKCkgewogCQlyZXR1cm4gIklEYXRhTW9kZWwsIHByb3ZpZGVyPSIgKyBwcm92aWRlci50b1N0cmluZygpOyAvLyROT04tTkxTLTEkCiAJfQpkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3Mvc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vZnJhbWV3b3Jrcy9pbnRlcm5hbC9kYXRhbW9kZWwvRGF0YU1vZGVsUGF1c2libGVPcGVyYXRpb25JbXBsLmphdmEgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy9zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9mcmFtZXdvcmtzL2ludGVybmFsL2RhdGFtb2RlbC9EYXRhTW9kZWxQYXVzaWJsZU9wZXJhdGlvbkltcGwuamF2YQppbmRleCA2M2JjNGIzLi4zMWQwNzhhIDEwMDY0NAotLS0gYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy9zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9mcmFtZXdvcmtzL2ludGVybmFsL2RhdGFtb2RlbC9EYXRhTW9kZWxQYXVzaWJsZU9wZXJhdGlvbkltcGwuamF2YQorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy9zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9mcmFtZXdvcmtzL2ludGVybmFsL2RhdGFtb2RlbC9EYXRhTW9kZWxQYXVzaWJsZU9wZXJhdGlvbkltcGwuamF2YQpAQCAtMTIzLDEwICsxMjMsMTIgQEAKIAkJdGhyb3cgbmV3IFJ1bnRpbWVFeGNlcHRpb24oKTsKIAl9CiAKKwlAT3ZlcnJpZGUKIAlwdWJsaWMgYm9vbGVhbiBjYW5SZWRvKCkgewogCQlyZXR1cm4gKENPTVBMRVRFX1VORE8gPT0gZXhlY3V0aW9uU3RhdGUpICYmIHN1cGVyLmNhblJlZG8oKTsKIAl9CiAKKwlAT3ZlcnJpZGUKIAlwdWJsaWMgSVN0YXR1cyByZWRvKElQcm9ncmVzc01vbml0b3IgbW9uaXRvciwgSUFkYXB0YWJsZSBpbmZvKSB0aHJvd3MgRXhlY3V0aW9uRXhjZXB0aW9uIHsKIAkJcmV0dXJuIGNhY2hlVGhyZWFkQW5kQ29udGludWUobW9uaXRvciwgaW5mbywgUkVET19JTVBMKTsKIAl9CkBAIC0xNjAsMTAgKzE2MiwxMiBAQAogCQl9CiAJfQogCisJQE92ZXJyaWRlCiAJcHVibGljIGJvb2xlYW4gY2FuVW5kbygpIHsKIAkJcmV0dXJuIChleGVjdXRpb25TdGF0ZSA9PSBDT01QTEVURV9FWEVDVVRFIHx8IGV4ZWN1dGlvblN0YXRlID09IENPTVBMRVRFX1JFRE8pICYmIHN1cGVyLmNhblVuZG8oKTsKIAl9CiAKKwlAT3ZlcnJpZGUKIAlwdWJsaWMgSVN0YXR1cyB1bmRvKElQcm9ncmVzc01vbml0b3IgbW9uaXRvciwgSUFkYXB0YWJsZSBpbmZvKSB0aHJvd3MgRXhlY3V0aW9uRXhjZXB0aW9uIHsKIAkJcmV0dXJuIGNhY2hlVGhyZWFkQW5kQ29udGludWUobW9uaXRvciwgaW5mbywgVU5ET19JTVBMKTsKIAl9CkBAIC0xOTgsNiArMjAyLDcgQEAKIAkJfQogCX0KIAorCUBPdmVycmlkZQogCXB1YmxpYyBJU3RhdHVzIGV4ZWN1dGUoSVByb2dyZXNzTW9uaXRvciBtb25pdG9yLCBJQWRhcHRhYmxlIGluZm8pIHRocm93cyBFeGVjdXRpb25FeGNlcHRpb24gewogCQlyZXR1cm4gY2FjaGVUaHJlYWRBbmRDb250aW51ZShtb25pdG9yLCBpbmZvLCBFWEVDVVRFX0lNUEwpOwogCX0KQEAgLTMyOSw0NiArMzM0LDUwIEBACiAJfQogCiAJcHJvdGVjdGVkIE9wZXJhdGlvblN0YXR1cyBhZGRTdGF0dXMoT3BlcmF0aW9uU3RhdHVzIHJldHVyblN0YXR1cywgSVN0YXR1cyBzdGF0dXMpIHsKLQkJaWYgKHJldHVyblN0YXR1cyA9PSBudWxsKSB7Ci0JCQlyZXR1cm5TdGF0dXMgPSBuZXcgT3BlcmF0aW9uU3RhdHVzKHN0YXR1cy5nZXRNZXNzYWdlKCksIHN0YXR1cy5nZXRFeGNlcHRpb24oKSk7Ci0JCQlyZXR1cm5TdGF0dXMuc2V0U2V2ZXJpdHkoc3RhdHVzLmdldFNldmVyaXR5KCkpOwotCQkJcmV0dXJuU3RhdHVzLmFkZChzdGF0dXMpOworCQlPcGVyYXRpb25TdGF0dXMgaW5uZXJSZXR1cm5TdGF0dXMgPSByZXR1cm5TdGF0dXM7CisJCWlmIChpbm5lclJldHVyblN0YXR1cyA9PSBudWxsKSB7CisJCQlpbm5lclJldHVyblN0YXR1cyA9IG5ldyBPcGVyYXRpb25TdGF0dXMoc3RhdHVzLmdldE1lc3NhZ2UoKSwgc3RhdHVzLmdldEV4Y2VwdGlvbigpKTsKKwkJCWlubmVyUmV0dXJuU3RhdHVzLnNldFNldmVyaXR5KHN0YXR1cy5nZXRTZXZlcml0eSgpKTsKKwkJCWlubmVyUmV0dXJuU3RhdHVzLmFkZChzdGF0dXMpOwogCQl9IGVsc2UgewotCQkJcmV0dXJuU3RhdHVzLmFkZChzdGF0dXMpOworCQkJaW5uZXJSZXR1cm5TdGF0dXMuYWRkKHN0YXR1cyk7CiAJCX0KLQkJcmV0dXJuIHJldHVyblN0YXR1czsKKwkJcmV0dXJuIGlubmVyUmV0dXJuU3RhdHVzOwogCX0KIAogCXByaXZhdGUgT3BlcmF0aW9uU3RhdHVzIGFkZEV4dGVuZGVkU3RhdHVzKE9wZXJhdGlvblN0YXR1cyByZXR1cm5TdGF0dXMsIElTdGF0dXMgYVN0YXR1cykgewotCQlpZiAocmV0dXJuU3RhdHVzID09IG51bGwpIHsKLQkJCXJldHVyblN0YXR1cyA9IG5ldyBPcGVyYXRpb25TdGF0dXMobmV3IElTdGF0dXNbXXtXVFBDb21tb25QbHVnaW4uT0tfU1RBVFVTfSk7CisJCU9wZXJhdGlvblN0YXR1cyBpbm5lclJldHVyblN0YXR1cyA9IHJldHVyblN0YXR1czsKKwkJaWYgKGlubmVyUmV0dXJuU3RhdHVzID09IG51bGwpIHsKKwkJCWlubmVyUmV0dXJuU3RhdHVzID0gbmV3IE9wZXJhdGlvblN0YXR1cyhuZXcgSVN0YXR1c1tde1dUUENvbW1vblBsdWdpbi5PS19TVEFUVVN9KTsKIAkJfQotCQlyZXR1cm5TdGF0dXMuYWRkRXh0ZW5kZWRTdGF0dXMoYVN0YXR1cyk7Ci0JCXJldHVybiByZXR1cm5TdGF0dXM7CisJCWlubmVyUmV0dXJuU3RhdHVzLmFkZEV4dGVuZGVkU3RhdHVzKGFTdGF0dXMpOworCQlyZXR1cm4gaW5uZXJSZXR1cm5TdGF0dXM7CiAJfQogCiAJcHJpdmF0ZSBPcGVyYXRpb25TdGF0dXMgcnVuT3BlcmF0aW9uKGZpbmFsIElEYXRhTW9kZWxPcGVyYXRpb24gb3BlcmF0aW9uLCBmaW5hbCBJUHJvZ3Jlc3NNb25pdG9yIG1vbml0b3IsIGZpbmFsIElBZGFwdGFibGUgaW5mbywgZmluYWwgaW50IGV4ZWN1dGlvblR5cGUsIE9wZXJhdGlvblN0YXR1cyByZXR1cm5TdGF0dXMpIHsKKwkJT3BlcmF0aW9uU3RhdHVzIGlubmVyUmV0dXJuU3RhdHVzID0gcmV0dXJuU3RhdHVzOwogCQlpZiAocm9vdE9wZXJhdGlvbiA9PSBvcGVyYXRpb24pIHsKIAkJCUlTdGF0dXMgc3RhdHVzID0gcnVuT3BlcmF0aW9uKG9wZXJhdGlvbiwgbW9uaXRvciwgaW5mbywgSURhdGFNb2RlbFBhdXNpYmxlT3BlcmF0aW9uRXZlbnQuRVhFQ1VURSk7CiAJCQlpZiAoIXN0YXR1cy5pc09LKCkpIHsKLQkJCQlyZXR1cm5TdGF0dXMgPSBhZGRTdGF0dXMocmV0dXJuU3RhdHVzLCBzdGF0dXMpOworCQkJCWlubmVyUmV0dXJuU3RhdHVzID0gYWRkU3RhdHVzKGlubmVyUmV0dXJuU3RhdHVzLCBzdGF0dXMpOwogCQkJfQogCQl9IGVsc2UgewogCQkJdHJ5IHsKIAkJCQlJU3RhdHVzIHN0YXR1cyA9IHJ1bk9wZXJhdGlvbihvcGVyYXRpb24sIG1vbml0b3IsIGluZm8sIElEYXRhTW9kZWxQYXVzaWJsZU9wZXJhdGlvbkV2ZW50LkVYRUNVVEUpOwogCQkJCWlmICghc3RhdHVzLmlzT0soKSkgewotCQkJCQlyZXR1cm5TdGF0dXMgPSBhZGRFeHRlbmRlZFN0YXR1cyhyZXR1cm5TdGF0dXMsIHN0YXR1cyk7CisJCQkJCWlubmVyUmV0dXJuU3RhdHVzID0gYWRkRXh0ZW5kZWRTdGF0dXMoaW5uZXJSZXR1cm5TdGF0dXMsIHN0YXR1cyk7CiAJCQkJfQogCQkJfSBjYXRjaCAoRXhjZXB0aW9uIGUpIHsKIAkJCQlJU3RhdHVzIHN0YXR1cyA9IG5ldyBTdGF0dXMoSVN0YXR1cy5FUlJPUiwgV1RQQ29tbW9uUGx1Z2luLlBMVUdJTl9JRCwgMCwgV1RQUmVzb3VyY2VIYW5kbGVyLmdldFN0cmluZygiMjUiLCBuZXcgT2JqZWN0W117b3BlcmF0aW9uLmdldENsYXNzKCkuZ2V0TmFtZSgpfSksIGUpOyAvLyROT04tTkxTLTEkCi0JCQkJcmV0dXJuU3RhdHVzID0gYWRkRXh0ZW5kZWRTdGF0dXMocmV0dXJuU3RhdHVzLCBzdGF0dXMpOworCQkJCWlubmVyUmV0dXJuU3RhdHVzID0gYWRkRXh0ZW5kZWRTdGF0dXMoaW5uZXJSZXR1cm5TdGF0dXMsIHN0YXR1cyk7CiAJCQl9CiAJCX0KLQkJcmV0dXJuIHJldHVyblN0YXR1czsKKwkJcmV0dXJuIGlubmVyUmV0dXJuU3RhdHVzOwogCX0KIAogCXByaXZhdGUgSVN0YXR1cyBydW5PcGVyYXRpb24oZmluYWwgSURhdGFNb2RlbE9wZXJhdGlvbiBvcGVyYXRpb24sIGZpbmFsIElQcm9ncmVzc01vbml0b3IgbW9uaXRvciwgZmluYWwgSUFkYXB0YWJsZSBpbmZvLCBmaW5hbCBpbnQgZXhlY3V0aW9uVHlwZSkgewogCQlJV29ya3NwYWNlUnVubmFibGVXaXRoU3RhdHVzIHdvcmtzcGFjZVJ1bm5hYmxlID0gbmV3IElXb3Jrc3BhY2VSdW5uYWJsZVdpdGhTdGF0dXMoaW5mbykgeworCQkJQE92ZXJyaWRlCiAJCQlwdWJsaWMgdm9pZCBydW4oSVByb2dyZXNzTW9uaXRvciBwbSkgdGhyb3dzIENvcmVFeGNlcHRpb24gewogCQkJCXRyeSB7CiAJCQkJCXN3aXRjaCAoZXhlY3V0aW9uVHlwZSkgewpAQCAtMzg3LDcgKzM5Niw3IEBACiAJCQkJCX0KIAkJCQl9IGNhdGNoIChFeGNlcHRpb24gZSkgewogCQkJCQl0aGlzLnNldFN0YXR1cyhuZXcgU3RhdHVzKElTdGF0dXMuRVJST1IsIFdUUENvbW1vblBsdWdpbi5QTFVHSU5fSUQsIDAsIFdUUFJlc291cmNlSGFuZGxlci5nZXRTdHJpbmcoIjI1IiwgbmV3IE9iamVjdFtde29wZXJhdGlvbi5nZXRDbGFzcygpLmdldE5hbWUoKX0pLCBlKSk7IC8vJE5PTi1OTFMtMSQKLQkJCQkJV1RQQ29tbW9uUGx1Z2luLmdldERlZmF1bHQoKS5nZXRMb2dnZXIoKS5sb2dFcnJvcihlKTsKKwkJCQkJV1RQQ29tbW9uUGx1Z2luLmxvZ0Vycm9yKGUpOwogCQkJCX0KIAkJCX0KIAkJfTsKQEAgLTQ4NSw2ICs0OTQsNyBAQAogCQkJcmV0dXJuIG51bGw7CiAJCX0KIAorCQlAT3ZlcnJpZGUKIAkJcHVibGljIFN0cmluZyB0b1N0cmluZygpIHsKIAkJCXJldHVybiBnZXRPcGVyYXRpb25JRCgpOwogCQl9CmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy9zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9mcmFtZXdvcmtzL2ludGVybmFsL2VuYWJsZW1lbnQvRW5hYmxlbWVudElkZW50aWZpZXIuamF2YSBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzL3NyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ZyYW1ld29ya3MvaW50ZXJuYWwvZW5hYmxlbWVudC9FbmFibGVtZW50SWRlbnRpZmllci5qYXZhCmluZGV4IGE2ZGJiZDkuLjcxNDdhM2UgMTAwNjQ0Ci0tLSBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzL3NyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ZyYW1ld29ya3MvaW50ZXJuYWwvZW5hYmxlbWVudC9FbmFibGVtZW50SWRlbnRpZmllci5qYXZhCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzL3NyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ZyYW1ld29ya3MvaW50ZXJuYWwvZW5hYmxlbWVudC9FbmFibGVtZW50SWRlbnRpZmllci5qYXZhCkBAIC04Nyw2ICs4Nyw3IEBACiAKIAl9CiAKKwlAT3ZlcnJpZGUKIAlwdWJsaWMgYm9vbGVhbiBlcXVhbHMoT2JqZWN0IG9iamVjdCkgewogCQlpZiAoIShvYmplY3QgaW5zdGFuY2VvZiBFbmFibGVtZW50SWRlbnRpZmllcikpCiAJCQlyZXR1cm4gZmFsc2U7CkBAIC0xMTYsNiArMTE3LDcgQEAKIAkJcmV0dXJuIGlkOwogCX0KIAorCUBPdmVycmlkZQogCXB1YmxpYyBpbnQgaGFzaENvZGUoKSB7CiAJCWlmICghaGFzaENvZGVDb21wdXRlZCkgewogCQkJaGFzaENvZGUgPSBIQVNIX0lOSVRJQUw7CkBAIC0xNDIsMTAgKzE0NCwxMCBAQAogCX0KIAogCXByb3RlY3RlZCBib29sZWFuIHNldEZ1bmN0aW9uR3JvdXBJZHMoU2V0IGZ1bmN0aW9uR3JvdXBJZHMpIHsKLQkJZnVuY3Rpb25Hcm91cElkcyA9IFV0aWwuc2FmZUNvcHkoZnVuY3Rpb25Hcm91cElkcywgU3RyaW5nLmNsYXNzKTsKKwkJU2V0IHNhZmVGdW5jdGlvbkdyb3VwSWRzID0gVXRpbC5zYWZlQ29weShmdW5jdGlvbkdyb3VwSWRzLCBTdHJpbmcuY2xhc3MpOwogCi0JCWlmICghVXRpbC5lcXVhbHMoZnVuY3Rpb25Hcm91cElkcywgdGhpcy5mdW5jdGlvbkdyb3VwSWRzKSkgewotCQkJdGhpcy5mdW5jdGlvbkdyb3VwSWRzID0gZnVuY3Rpb25Hcm91cElkczsKKwkJaWYgKCFVdGlsLmVxdWFscyhzYWZlRnVuY3Rpb25Hcm91cElkcywgdGhpcy5mdW5jdGlvbkdyb3VwSWRzKSkgeworCQkJdGhpcy5mdW5jdGlvbkdyb3VwSWRzID0gc2FmZUZ1bmN0aW9uR3JvdXBJZHM7CiAJCQl0aGlzLmZ1bmN0aW9uR3JvdXBJZHNBc0FycmF5ID0gKFN0cmluZ1tdKSB0aGlzLmZ1bmN0aW9uR3JvdXBJZHMudG9BcnJheShuZXcgU3RyaW5nW3RoaXMuZnVuY3Rpb25Hcm91cElkcy5zaXplKCldKTsKIAogCQkJaGFzaENvZGVDb21wdXRlZCA9IGZhbHNlOwpAQCAtMTg5LDYgKzE5MSw3IEBACiAJCXJldHVybiBmYWxzZTsKIAl9CiAKKwlAT3ZlcnJpZGUKIAlwdWJsaWMgU3RyaW5nIHRvU3RyaW5nKCkgewogCQlpZiAoc3RyaW5nID09IG51bGwpIHsKIAkJCWZpbmFsIFN0cmluZ0J1ZmZlciBzdHJpbmdCdWZmZXIgPSBuZXcgU3RyaW5nQnVmZmVyKCk7CmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy9zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9mcmFtZXdvcmtzL2ludGVybmFsL2VuYWJsZW1lbnQvRW5hYmxlbWVudElkZW50aWZpZXJFdmVudC5qYXZhIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3Mvc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vZnJhbWV3b3Jrcy9pbnRlcm5hbC9lbmFibGVtZW50L0VuYWJsZW1lbnRJZGVudGlmaWVyRXZlbnQuamF2YQppbmRleCBkOTBiMTljLi41ZTA3N2I3IDEwMDY0NAotLS0gYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy9zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9mcmFtZXdvcmtzL2ludGVybmFsL2VuYWJsZW1lbnQvRW5hYmxlbWVudElkZW50aWZpZXJFdmVudC5qYXZhCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzL3NyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ZyYW1ld29ya3MvaW50ZXJuYWwvZW5hYmxlbWVudC9FbmFibGVtZW50SWRlbnRpZmllckV2ZW50LmphdmEKQEAgLTcyLDYgKzcyLDcgQEAKIAkgKiAKIAkgKiBAc2VlIGphdmEubGFuZy5PYmplY3QjdG9TdHJpbmcoKQogCSAqLworCUBPdmVycmlkZQogCXB1YmxpYyBTdHJpbmcgdG9TdHJpbmcoKSB7CiAJCXJldHVybiAiRW5hYmxlbWVudElkZW50aWZpZXJFdmVudCBbaWRlbnRpZmllcj0iICsgaWRlbnRpZmllci50b1N0cmluZygpICsgIiwgZnVuY3Rpb25Hcm91cElkc0NoYW5nZWQ9IiArIGhhc0Z1bmN0aW9uR3JvdXBJZHNDaGFuZ2VkKCkgKyAiLCBlbmFibGVkQ2hhbmdlZD0iICsgaGFzRW5hYmxlZENoYW5nZWQoKSArICJdIjsgLy8kTk9OLU5MUy0xJCAvLyROT04tTkxTLTIkIC8vJE5PTi1OTFMtMyQgLy8kTk9OLU5MUy00JAogCX0KZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzL3NyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ZyYW1ld29ya3MvaW50ZXJuYWwvZW5hYmxlbWVudC9FbmFibGVtZW50TWFuYWdlci5qYXZhIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3Mvc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vZnJhbWV3b3Jrcy9pbnRlcm5hbC9lbmFibGVtZW50L0VuYWJsZW1lbnRNYW5hZ2VyLmphdmEKaW5kZXggNGI0YjVlOC4uNWEyMWRlOCAxMDA2NDQKLS0tIGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3Mvc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vZnJhbWV3b3Jrcy9pbnRlcm5hbC9lbmFibGVtZW50L0VuYWJsZW1lbnRNYW5hZ2VyLmphdmEKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3Mvc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vZnJhbWV3b3Jrcy9pbnRlcm5hbC9lbmFibGVtZW50L0VuYWJsZW1lbnRNYW5hZ2VyLmphdmEKQEAgLTI4LDcgKzI4LDYgQEAKIGltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJ1bnRpbWUuQ29yZUV4Y2VwdGlvbjsKIGltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJ1bnRpbWUuSVN0YXR1czsKIGltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJ1bnRpbWUuTXVsdGlTdGF0dXM7Ci1pbXBvcnQgb3JnLmVjbGlwc2UuamVtLnV0aWwubG9nZ2VyLnByb3h5LkxvZ2dlcjsKIGltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3MuaW50ZXJuYWwucGx1Z2luLldUUENvbW1vbk1lc3NhZ2VzOwogaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy5pbnRlcm5hbC5wbHVnaW4uV1RQQ29tbW9uUGx1Z2luOwogCkBAIC02MCwxNyArNTksMjIgQEAKIAl9CiAKICAgICBwdWJsaWMgSUVuYWJsZW1lbnRJZGVudGlmaWVyIGdldElkZW50aWZpZXIoU3RyaW5nIGlkZW50aWZpZXJJZCwgSVByb2plY3QgcHJvamVjdCkgewotICAgICAgICBpZiAoaWRlbnRpZmllcklkID09IG51bGwpIHRocm93IG5ldyBOdWxsUG9pbnRlckV4Y2VwdGlvbigpOwotICAgICAgICBpZiAocHJvamVjdCAhPSBudWxsICYmICFwcm9qZWN0LmlzQWNjZXNzaWJsZSgpKSBwcm9qZWN0ID0gbnVsbDsKKyAgICAgICAgaWYgKGlkZW50aWZpZXJJZCA9PSBudWxsKXsKKyAgICAgICAgCXRocm93IG5ldyBOdWxsUG9pbnRlckV4Y2VwdGlvbigpOworICAgICAgICB9CisgICAgICAgIElQcm9qZWN0IGlubmVyUHJvamVjdCA9IHByb2plY3Q7CisgICAgICAgIGlmIChpbm5lclByb2plY3QgIT0gbnVsbCAmJiAhaW5uZXJQcm9qZWN0LmlzQWNjZXNzaWJsZSgpKXsKKyAgICAgICAgCWlubmVyUHJvamVjdCA9IG51bGw7CisgICAgICAgIH0KICAgICAgICAgCiAgICAgICAgIEVuYWJsZW1lbnRJZGVudGlmaWVyIGlkZW50aWZpZXIgPSBudWxsOwogICAgICAgICBib29sZWFuIGlkZW50aWZpZXJSZXF1aXJlc1VwZGF0ZSA9IGZhbHNlOwogICAgICAgICBzeW5jaHJvbml6ZWQodGhpcykgewotCSAgICAgICAgTWFwIGlkZW50aWZpZXJzQnlJZCA9IGdldElkZW50aWZpZXJzQnlJZChwcm9qZWN0KTsJCisJICAgICAgICBNYXAgaWRlbnRpZmllcnNCeUlkID0gZ2V0SWRlbnRpZmllcnNCeUlkKGlubmVyUHJvamVjdCk7CQogCSAgICAgICAgaWRlbnRpZmllciA9IChFbmFibGVtZW50SWRlbnRpZmllcikgaWRlbnRpZmllcnNCeUlkLmdldChpZGVudGlmaWVySWQpOwogCSAgICAgICAgaWYoaWRlbnRpZmllciA9PSBudWxsKXsKIAkgICAgICAgIAlpZGVudGlmaWVyUmVxdWlyZXNVcGRhdGUgPSB0cnVlOwotCSAgICAgICAgCWlkZW50aWZpZXIgPSBjcmVhdGVJZGVudGlmaWVyKGlkZW50aWZpZXJJZCwgcHJvamVjdCk7CisJICAgICAgICAJaWRlbnRpZmllciA9IGNyZWF0ZUlkZW50aWZpZXIoaWRlbnRpZmllcklkLCBpbm5lclByb2plY3QpOwogCSAgICAgICAgICAgIGlkZW50aWZpZXJzQnlJZC5wdXQoaWRlbnRpZmllcklkLCBpZGVudGlmaWVyKTsKIAkgICAgICAgIH0KIAkgICAgfQpAQCAtMTQxLDcgKzE0NSw3IEBACiAJCQl9IGNhdGNoIChFeGNlcHRpb24gZXgpIHsKIAkJCQkvL0RlZmVyIHRoZSBleGNlcHRpb24gc28gb3RoZXJzIGNhbiBoYW5kbGUgaXQuCiAJCQkJbmV4dFN0YXR1cyA9IFdUUENvbW1vblBsdWdpbi5jcmVhdGVFcnJvclN0YXR1cyhXVFBDb21tb25NZXNzYWdlcy5JTlRFUk5BTF9FUlJPUiwgZXgpOwotCQkJCUxvZ2dlci5nZXRMb2dnZXIoKS5sb2dFcnJvcihleCk7CisJCQkJV1RQQ29tbW9uUGx1Z2luLmxvZ0Vycm9yKGV4KTsKIAkJCQlpZiAoZXJyb3JTdGF0dXMgPT0gbnVsbCkKIAkJCQkJZXJyb3JTdGF0dXMgPSBuZXh0U3RhdHVzOwogCQkJCWVsc2UgaWYgKGVycm9yU3RhdHVzLmlzTXVsdGlTdGF0dXMoKSkKZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzL3NyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ZyYW1ld29ya3MvaW50ZXJuYWwvZW5hYmxlbWVudC9GdW5jdGlvbkdyb3VwLmphdmEgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy9zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9mcmFtZXdvcmtzL2ludGVybmFsL2VuYWJsZW1lbnQvRnVuY3Rpb25Hcm91cC5qYXZhCmluZGV4IDhmYjgyNTkuLmM0NzBiYmMgMTAwNjQ0Ci0tLSBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzL3NyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ZyYW1ld29ya3MvaW50ZXJuYWwvZW5hYmxlbWVudC9GdW5jdGlvbkdyb3VwLmphdmEKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3Mvc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vZnJhbWV3b3Jrcy9pbnRlcm5hbC9lbmFibGVtZW50L0Z1bmN0aW9uR3JvdXAuamF2YQpAQCAtMTYsOCArMTYsOCBAQAogaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucmVzb3VyY2VzLklQcm9qZWN0OwogaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucnVudGltZS5Db3JlRXhjZXB0aW9uOwogaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucnVudGltZS5JQ29uZmlndXJhdGlvbkVsZW1lbnQ7Ci1pbXBvcnQgb3JnLmVjbGlwc2UuamVtLnV0aWwubG9nZ2VyLnByb3h5LkxvZ2dlcjsKIGltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3MuaW50ZXJuYWwuV1RQUmVzb3VyY2VIYW5kbGVyOworaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy5pbnRlcm5hbC5wbHVnaW4uV1RQQ29tbW9uUGx1Z2luOwogCiAKIC8qKgpAQCAtODUsMTIgKzg1LDEzIEBACiAJCQl0cnkgewogCQkJCWdyb3VwSW50ZXJmYWNlID0gKElHcm91cEluaXRpYWxpemVyKSBlbGVtZW50LmNyZWF0ZUV4ZWN1dGFibGVFeHRlbnNpb24oR1JPVVBfSU5USUFMSVpFUl9DTEFTU19BVFRSKTsKIAkJCX0gY2F0Y2ggKENvcmVFeGNlcHRpb24gZSkgewotCQkJCUxvZ2dlci5nZXRMb2dnZXIoKS5sb2dFcnJvcihXVFBSZXNvdXJjZUhhbmRsZXIuZ2V0U3RyaW5nKCIyOSIsIG5ldyBPYmplY3RbXXtHUk9VUF9JTlRJQUxJWkVSX0NMQVNTX0FUVFIsIGdldEluaXRhbGl6ZXJDbGFzc05hbWUoKSwgZ2V0RGVjbGFyaW5nRXh0ZW5zaW9uTmFtZSgpfSkgKyAiXHJcbiIpOyAvLyROT04tTkxTLTEkLy8kTk9OLU5MUy0yJAotCQkJCUxvZ2dlci5nZXRMb2dnZXIoKS5sb2dFcnJvcihlKTsKKwkJCQlXVFBDb21tb25QbHVnaW4ubG9nRXJyb3IoV1RQUmVzb3VyY2VIYW5kbGVyLmdldFN0cmluZygiMjkiLCBuZXcgT2JqZWN0W117R1JPVVBfSU5USUFMSVpFUl9DTEFTU19BVFRSLCBnZXRJbml0YWxpemVyQ2xhc3NOYW1lKCksIGdldERlY2xhcmluZ0V4dGVuc2lvbk5hbWUoKX0pICsgIlxyXG4iKTsgLy8kTk9OLU5MUy0xJC8vJE5PTi1OTFMtMiQKKwkJCQlXVFBDb21tb25QbHVnaW4ubG9nRXJyb3IoZSk7CiAJCQl9CiAJCXJldHVybiBncm91cEludGVyZmFjZTsKIAl9CiAKKwlAT3ZlcnJpZGUKIAlwdWJsaWMgU3RyaW5nIHRvU3RyaW5nKCkgewogCQlyZXR1cm4gIlwiIiArIGdldE5hbWUoKSArICJcIiAoIiArIGdldEdyb3VwSUQoKSArICIpIjsgLy8kTk9OLU5MUy0xJCAvLyROT04tTkxTLTIkIC8vJE5PTi1OTFMtMyQKIAl9CkBAIC0xMzEsNyArMTMyLDcgQEAKIAlwdWJsaWMgYm9vbGVhbiBpc01hdGNoKFN0cmluZyBzdHJpbmcpIHsKIAkJaWYgKGZ1bmN0aW9uR3JvdXBQYXR0ZXJuQmluZGluZ3MgPT0gbnVsbCkgewogCQkJaWYgKCFlcnJvclJlcG9ydGVkKSB7Ci0JCQkJTG9nZ2VyLmdldExvZ2dlcigpLmxvZ0Vycm9yKFdUUFJlc291cmNlSGFuZGxlci5nZXRTdHJpbmcoIjMwIiwgbmV3IE9iamVjdFtde2dldEdyb3VwSUQoKX0pKTsgLy8kTk9OLU5MUy0xJAorCQkJCVdUUENvbW1vblBsdWdpbi5sb2dFcnJvcihXVFBSZXNvdXJjZUhhbmRsZXIuZ2V0U3RyaW5nKCIzMCIsIG5ldyBPYmplY3RbXXtnZXRHcm91cElEKCl9KSk7IC8vJE5PTi1OTFMtMSQKIAkJCQllcnJvclJlcG9ydGVkID0gdHJ1ZTsKIAkJCX0KIAkJCXJldHVybiBmYWxzZTsKQEAgLTE0NywxMiArMTQ4LDEwIEBACiAJfQogCiAJYm9vbGVhbiBzZXRGdW5jdGlvbkdyb3VwUGF0dGVybkJpbmRpbmdzKFNldCBmdW5jdGlvbkdyb3VwUGF0dGVybkJpbmRpbmdzKSB7Ci0JCWZ1bmN0aW9uR3JvdXBQYXR0ZXJuQmluZGluZ3MgPSBVdGlsLnNhZmVDb3B5KGZ1bmN0aW9uR3JvdXBQYXR0ZXJuQmluZGluZ3MsIEZ1bmN0aW9uR3JvdXBQYXR0ZXJuQmluZGluZy5jbGFzcyk7CisJCVNldCBzYWZlRnVuY3Rpb25Hcm91cFBhdHRlcm5CaW5kaW5ncyA9IFV0aWwuc2FmZUNvcHkoZnVuY3Rpb25Hcm91cFBhdHRlcm5CaW5kaW5ncywgRnVuY3Rpb25Hcm91cFBhdHRlcm5CaW5kaW5nLmNsYXNzKTsKIAotCQlpZiAoIVV0aWwuZXF1YWxzKGZ1bmN0aW9uR3JvdXBQYXR0ZXJuQmluZGluZ3MsIHRoaXMuZnVuY3Rpb25Hcm91cFBhdHRlcm5CaW5kaW5ncykpIHsKLQkJCXRoaXMuZnVuY3Rpb25Hcm91cFBhdHRlcm5CaW5kaW5ncyA9IGZ1bmN0aW9uR3JvdXBQYXR0ZXJuQmluZGluZ3M7Ci0vLwkJCXRoaXMuZnVuY3Rpb25Hcm91cFBhdHRlcm5CaW5kaW5nc0FzQXJyYXkgPSAoRnVuY3Rpb25Hcm91cFBhdHRlcm5CaW5kaW5nW10pIHRoaXMuZnVuY3Rpb25Hcm91cFBhdHRlcm5CaW5kaW5ncy50b0FycmF5KG5ldyBGdW5jdGlvbkdyb3VwUGF0dGVybkJpbmRpbmdbdGhpcy5mdW5jdGlvbkdyb3VwUGF0dGVybkJpbmRpbmdzLnNpemUoKV0pOwotCisJCWlmICghVXRpbC5lcXVhbHMoc2FmZUZ1bmN0aW9uR3JvdXBQYXR0ZXJuQmluZGluZ3MsIHRoaXMuZnVuY3Rpb25Hcm91cFBhdHRlcm5CaW5kaW5ncykpIHsKKwkJCXRoaXMuZnVuY3Rpb25Hcm91cFBhdHRlcm5CaW5kaW5ncyA9IHNhZmVGdW5jdGlvbkdyb3VwUGF0dGVybkJpbmRpbmdzOwogCQkJcmV0dXJuIHRydWU7CiAJCX0KIApkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3Mvc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vZnJhbWV3b3Jrcy9pbnRlcm5hbC9lbmFibGVtZW50L0Z1bmN0aW9uR3JvdXBQYXR0ZXJuQmluZGluZy5qYXZhIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3Mvc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vZnJhbWV3b3Jrcy9pbnRlcm5hbC9lbmFibGVtZW50L0Z1bmN0aW9uR3JvdXBQYXR0ZXJuQmluZGluZy5qYXZhCmluZGV4IGQzODc3NzEuLjQ2NGJjYzUgMTAwNjQ0Ci0tLSBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzL3NyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ZyYW1ld29ya3MvaW50ZXJuYWwvZW5hYmxlbWVudC9GdW5jdGlvbkdyb3VwUGF0dGVybkJpbmRpbmcuamF2YQorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy9zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9mcmFtZXdvcmtzL2ludGVybmFsL2VuYWJsZW1lbnQvRnVuY3Rpb25Hcm91cFBhdHRlcm5CaW5kaW5nLmphdmEKQEAgLTU2LDYgKzU2LDcgQEAKIAkJcmV0dXJuIGNvbXBhcmVUbzsKIAl9CiAKKwlAT3ZlcnJpZGUKIAlwdWJsaWMgYm9vbGVhbiBlcXVhbHMoT2JqZWN0IG9iamVjdCkgewogCQlpZiAoIShvYmplY3QgaW5zdGFuY2VvZiBGdW5jdGlvbkdyb3VwUGF0dGVybkJpbmRpbmcpKQogCQkJcmV0dXJuIGZhbHNlOwpAQCAtNzUsNiArNzYsNyBAQAogCQlyZXR1cm4gcGF0dGVybjsKIAl9CiAKKwlAT3ZlcnJpZGUKIAlwdWJsaWMgaW50IGhhc2hDb2RlKCkgewogCQlpZiAoIWhhc2hDb2RlQ29tcHV0ZWQpIHsKIAkJCWhhc2hDb2RlID0gSEFTSF9JTklUSUFMOwpAQCAtODYsNiArODgsNyBAQAogCQlyZXR1cm4gaGFzaENvZGU7CiAJfQogCisJQE92ZXJyaWRlCiAJcHVibGljIFN0cmluZyB0b1N0cmluZygpIHsKIAkJaWYgKHN0cmluZyA9PSBudWxsKSB7CiAJCQlmaW5hbCBTdHJpbmdCdWZmZXIgc3RyaW5nQnVmZmVyID0gbmV3IFN0cmluZ0J1ZmZlcigpOwpkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3Mvc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vZnJhbWV3b3Jrcy9pbnRlcm5hbC9lbmFibGVtZW50L0Z1bmN0aW9uR3JvdXBSZWdpc3RyeS5qYXZhIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3Mvc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vZnJhbWV3b3Jrcy9pbnRlcm5hbC9lbmFibGVtZW50L0Z1bmN0aW9uR3JvdXBSZWdpc3RyeS5qYXZhCmluZGV4IDk5NmM5MmMuLmNlNTVjYTkgMTAwNjQ0Ci0tLSBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzL3NyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ZyYW1ld29ya3MvaW50ZXJuYWwvZW5hYmxlbWVudC9GdW5jdGlvbkdyb3VwUmVnaXN0cnkuamF2YQorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy9zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9mcmFtZXdvcmtzL2ludGVybmFsL2VuYWJsZW1lbnQvRnVuY3Rpb25Hcm91cFJlZ2lzdHJ5LmphdmEKQEAgLTI1LDE2ICsyNSwxMyBAQAogCiBpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5yZXNvdXJjZXMuSVByb2plY3Q7CiBpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5ydW50aW1lLklDb25maWd1cmF0aW9uRWxlbWVudDsKLWltcG9ydCBvcmcuZWNsaXBzZS5qZW0udXRpbC5SZWdpc3RyeVJlYWRlcjsKLWltcG9ydCBvcmcuZWNsaXBzZS5qZW0udXRpbC5sb2dnZXIucHJveHkuTG9nZ2VyOworaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29yZS51dGlsLlJlZ2lzdHJ5UmVhZGVyOwogaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy5pbnRlcm5hbC5XVFBSZXNvdXJjZUhhbmRsZXI7CiBpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzLmludGVybmFsLnBsdWdpbi5XVFBDb21tb25QbHVnaW47CiAKIC8qKgogICogVGhlIEZ1bmN0aW9uR3JvdXBSZWdpc3RyeSB3aWxsIGNvbnN1bWUgQ29uZmlndXJhdGlvbiBlbGVtZW50cyBjb25mb3JtaW5nIHRvIHRoZSBGdW5jdGlvbkdyb3VwCiAgKiBFeHRlbnNpb24gUG9pbnQgc2NoZW1hLgotICogCi0gKiBAYXV0aG9yIG1kZWxkZXIvYmxhbmNldHQKICAqLwogcHVibGljIGNsYXNzIEZ1bmN0aW9uR3JvdXBSZWdpc3RyeSBleHRlbmRzIFJlZ2lzdHJ5UmVhZGVyIHsKIApAQCAtNjcsNiArNjQsNyBAQAogCSAqIChub24tSmF2YWRvYykgUmVhZCBhbGwgdGhlIGVsZW1lbnRzIGZpcnN0LCB0aGVuIHNldCB0aGUgcGF0dGVybiBiaW5kaW5ncyBvbiB0aGUgZnVuY3Rpb24KIAkgKiBncm91cHMKIAkgKi8KKwlAT3ZlcnJpZGUKIAlwdWJsaWMgdm9pZCByZWFkUmVnaXN0cnkoKSB7CiAJCXN1cGVyLnJlYWRSZWdpc3RyeSgpOwogCQlzZXRQYXR0ZXJuQmluZGluZ3MoKTsKQEAgLTg1LDYgKzgzLDcgQEAKIAogCX0KIAorCUBPdmVycmlkZQogCXB1YmxpYyBib29sZWFuIHJlYWRFbGVtZW50KElDb25maWd1cmF0aW9uRWxlbWVudCBlbGVtZW50KSB7CiAJCWlmIChlbGVtZW50LmdldE5hbWUoKS5lcXVhbHMoR1JPVVBfRUxFTUVOVCkpIHsKIAkJCXJlYWRHcm91cChlbGVtZW50KTsKQEAgLTIyNCwxMSArMjIzLDExIEBACiAJCUZ1bmN0aW9uR3JvdXAgZ3JvdXAxID0gZ2V0R3JvdXBCeUlEKGdyb3VwSUQxKTsKIAkJRnVuY3Rpb25Hcm91cCBncm91cDIgPSBnZXRHcm91cEJ5SUQoZ3JvdXBJRDIpOwogCQlpZiAoZ3JvdXAxID09IG51bGwpIHsKLQkJCUxvZ2dlci5nZXRMb2dnZXIoKS5sb2dFcnJvcihuZXcgSWxsZWdhbEFyZ3VtZW50RXhjZXB0aW9uKFdUUFJlc291cmNlSGFuZGxlci5nZXRTdHJpbmcoIjI4IiwgbmV3IE9iamVjdFtde2dyb3VwSUQxfSkpKTsgLy8kTk9OLU5MUy0xJAorCQkJV1RQQ29tbW9uUGx1Z2luLmxvZ0Vycm9yKG5ldyBJbGxlZ2FsQXJndW1lbnRFeGNlcHRpb24oV1RQUmVzb3VyY2VIYW5kbGVyLmdldFN0cmluZygiMjgiLCBuZXcgT2JqZWN0W117Z3JvdXBJRDF9KSkpOyAvLyROT04tTkxTLTEkCiAJCQlyZXR1cm4gLTE7CiAJCX0KIAkJaWYgKGdyb3VwMiA9PSBudWxsKSB7Ci0JCQlMb2dnZXIuZ2V0TG9nZ2VyKCkubG9nRXJyb3IobmV3IElsbGVnYWxBcmd1bWVudEV4Y2VwdGlvbihXVFBSZXNvdXJjZUhhbmRsZXIuZ2V0U3RyaW5nKCIyOCIsIG5ldyBPYmplY3RbXXtncm91cElEMn0pKSk7IC8vJE5PTi1OTFMtMSQKKwkJCVdUUENvbW1vblBsdWdpbi5sb2dFcnJvcihuZXcgSWxsZWdhbEFyZ3VtZW50RXhjZXB0aW9uKFdUUFJlc291cmNlSGFuZGxlci5nZXRTdHJpbmcoIjI4IiwgbmV3IE9iamVjdFtde2dyb3VwSUQyfSkpKTsgLy8kTk9OLU5MUy0xJAogCQkJcmV0dXJuIDE7CiAJCX0KIApkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3Mvc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vZnJhbWV3b3Jrcy9pbnRlcm5hbC9lbmFibGVtZW50L0lFbmFibGVtZW50TWFuYWdlci5qYXZhIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3Mvc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vZnJhbWV3b3Jrcy9pbnRlcm5hbC9lbmFibGVtZW50L0lFbmFibGVtZW50TWFuYWdlci5qYXZhCmluZGV4IDQ1NGM5NGMuLmFiNmZjZGMgMTAwNjQ0Ci0tLSBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzL3NyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ZyYW1ld29ya3MvaW50ZXJuYWwvZW5hYmxlbWVudC9JRW5hYmxlbWVudE1hbmFnZXIuamF2YQorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy9zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9mcmFtZXdvcmtzL2ludGVybmFsL2VuYWJsZW1lbnQvSUVuYWJsZW1lbnRNYW5hZ2VyLmphdmEKQEAgLTgsMjYgKzgsMTQgQEAKICAqIENvbnRyaWJ1dG9yczoKICAqIElCTSBDb3Jwb3JhdGlvbiAtIGluaXRpYWwgQVBJIGFuZCBpbXBsZW1lbnRhdGlvbgogICoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKiovCi0vKgotICogQ3JlYXRlZCBvbiBGZWIgMTIsIDIwMDQKLSAqCi0gKiBUbyBjaGFuZ2UgdGhlIHRlbXBsYXRlIGZvciB0aGlzIGdlbmVyYXRlZCBmaWxlIGdvIHRvCi0gKiBXaW5kb3cmZ3Q7UHJlZmVyZW5jZXMmZ3Q7SmF2YSZndDtDb2RlIEdlbmVyYXRpb24mZ3Q7Q29kZSBhbmQgQ29tbWVudHMKLSAqLwogcGFja2FnZSBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3MuaW50ZXJuYWwuZW5hYmxlbWVudDsKIAogaW1wb3J0IGphdmEudXRpbC5Db2xsZWN0aW9uOwogCiBpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5yZXNvdXJjZXMuSVByb2plY3Q7CiBpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5ydW50aW1lLkNvcmVFeGNlcHRpb247Ci1pbXBvcnQgb3JnLmVjbGlwc2UuamVtLnV0aWwuVUlDb250ZXh0RGV0ZXJtaW5hdGlvbjsKK2ltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvcmUudXRpbC5VSUNvbnRleHREZXRlcm1pbmF0aW9uOwogCi0vKioKLSAqIEBhdXRob3Igc2NoYWNoZXIKLSAqIAotICogVG8gY2hhbmdlIHRoZSB0ZW1wbGF0ZSBmb3IgdGhpcyBnZW5lcmF0ZWQgdHlwZSBjb21tZW50IGdvIHRvCi0gKiBXaW5kb3cmZ3Q7UHJlZmVyZW5jZXMmZ3Q7SmF2YSZndDtDb2RlIEdlbmVyYXRpb24mZ3Q7Q29kZSBhbmQgQ29tbWVudHMKLSAqLwogcHVibGljIGludGVyZmFjZSBJRW5hYmxlbWVudE1hbmFnZXIgewogCVN0cmluZyBJTlRFUk5BTF9FTkFCTEVNRU5UX0RFVEVSTUlOQVRJT05fSUQgPSAib3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzLmludGVybmFsLkVuYWJsZW1lbnREZXRlcm1pbmF0aW9uIjsgLy8kTk9OLU5MUy0xJAogCmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy9zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9mcmFtZXdvcmtzL2ludGVybmFsL2VuYWJsZW1lbnQvSWRlbnRpZmlhYmxlQ29tcGFyYXRvci5qYXZhIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3Mvc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vZnJhbWV3b3Jrcy9pbnRlcm5hbC9lbmFibGVtZW50L0lkZW50aWZpYWJsZUNvbXBhcmF0b3IuamF2YQppbmRleCAwZGYyNmNmLi5iNmQ5YTYxIDEwMDY0NAotLS0gYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy9zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9mcmFtZXdvcmtzL2ludGVybmFsL2VuYWJsZW1lbnQvSWRlbnRpZmlhYmxlQ29tcGFyYXRvci5qYXZhCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzL3NyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ZyYW1ld29ya3MvaW50ZXJuYWwvZW5hYmxlbWVudC9JZGVudGlmaWFibGVDb21wYXJhdG9yLmphdmEKQEAgLTYwLDkgKzYwLDE0IEBACiAJICogCiAJICogQHNlZSBqYXZhLnV0aWwuQ29tcGFyYXRvciNlcXVhbHMoamF2YS5sYW5nLk9iamVjdCkKIAkgKi8KKwlAT3ZlcnJpZGUKIAlwdWJsaWMgYm9vbGVhbiBlcXVhbHMoT2JqZWN0IG9iaikgewogCQlyZXR1cm4gb2JqIGluc3RhbmNlb2YgSWRlbnRpZmlhYmxlQ29tcGFyYXRvcjsKIAl9CisJQE92ZXJyaWRlCisJcHVibGljIGludCBoYXNoQ29kZSgpIHsKKwkJcmV0dXJuIHN1cGVyLmhhc2hDb2RlKCk7CisJfQogCiAJcHJpdmF0ZSBpbnQgY29tcGFyZUxvYWRPcmRlcihJZGVudGlmaWFibGUgbHZhbHVlLCBJZGVudGlmaWFibGUgcnZhbHVlKSB7CiAJCS8qIFIgLSBMIGltcGxpZXMgMCBpcyB0aGUgaGlnaGVzdCBwcmlvcml0eSAqLwpAQCAtNzQsNCArNzksNiBAQAogCQkJcmV0dXJuIEZ1bmN0aW9uR3JvdXBSZWdpc3RyeS5nZXRJbnN0YW5jZSgpLmdldEZ1bmN0aW9uUHJpb3JpdHkoaWRlbnRpZmlhYmxlLmdldElEKCkpOwogCQlyZXR1cm4gREVGQVVMVF9QUklPUklUWTsKIAl9CisKKwkKIH0KZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzL3NyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ZyYW1ld29ya3MvaW50ZXJuYWwvZW5hYmxlbWVudC9VdGlsLmphdmEgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy9zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9mcmFtZXdvcmtzL2ludGVybmFsL2VuYWJsZW1lbnQvVXRpbC5qYXZhCmluZGV4IDc0MDI3MGEuLjJjNDk3NzYgMTAwNjQ0Ci0tLSBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzL3NyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ZyYW1ld29ya3MvaW50ZXJuYWwvZW5hYmxlbWVudC9VdGlsLmphdmEKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3Mvc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vZnJhbWV3b3Jrcy9pbnRlcm5hbC9lbmFibGVtZW50L1V0aWwuamF2YQpAQCAtMjIwLDEzICsyMjAsMTMgQEAKIAkJaWYgKGxpc3QgPT0gbnVsbCB8fCBjID09IG51bGwpCiAJCQl0aHJvdyBuZXcgTnVsbFBvaW50ZXJFeGNlcHRpb24oKTsKIAotCQlsaXN0ID0gQ29sbGVjdGlvbnMudW5tb2RpZmlhYmxlTGlzdChuZXcgQXJyYXlMaXN0KGxpc3QpKTsKLQkJSXRlcmF0b3IgaXRlcmF0b3IgPSBsaXN0Lml0ZXJhdG9yKCk7CisJCUxpc3Qgc2FmZUxpc3QgPSBDb2xsZWN0aW9ucy51bm1vZGlmaWFibGVMaXN0KG5ldyBBcnJheUxpc3QobGlzdCkpOworCQlJdGVyYXRvciBpdGVyYXRvciA9IHNhZmVMaXN0Lml0ZXJhdG9yKCk7CiAKIAkJd2hpbGUgKGl0ZXJhdG9yLmhhc05leHQoKSkKIAkJCWFzc2VydEluc3RhbmNlKGl0ZXJhdG9yLm5leHQoKSwgYywgYWxsb3dOdWxsRWxlbWVudHMpOwogCi0JCXJldHVybiBsaXN0OworCQlyZXR1cm4gc2FmZUxpc3Q7CiAJfQogCiAJcHVibGljIHN0YXRpYyBNYXAgc2FmZUNvcHkoTWFwIG1hcCwgQ2xhc3Mga2V5Q2xhc3MsIENsYXNzIHZhbHVlQ2xhc3MpIHsKQEAgLTIzNyw4ICsyMzcsOCBAQAogCQlpZiAobWFwID09IG51bGwgfHwga2V5Q2xhc3MgPT0gbnVsbCB8fCB2YWx1ZUNsYXNzID09IG51bGwpCiAJCQl0aHJvdyBuZXcgTnVsbFBvaW50ZXJFeGNlcHRpb24oKTsKIAotCQltYXAgPSBDb2xsZWN0aW9ucy51bm1vZGlmaWFibGVNYXAobmV3IEhhc2hNYXAobWFwKSk7Ci0JCUl0ZXJhdG9yIGl0ZXJhdG9yID0gbWFwLmVudHJ5U2V0KCkuaXRlcmF0b3IoKTsKKwkJTWFwIHNhZmVNYXAgPSBDb2xsZWN0aW9ucy51bm1vZGlmaWFibGVNYXAobmV3IEhhc2hNYXAobWFwKSk7CisJCUl0ZXJhdG9yIGl0ZXJhdG9yID0gc2FmZU1hcC5lbnRyeVNldCgpLml0ZXJhdG9yKCk7CiAKIAkJd2hpbGUgKGl0ZXJhdG9yLmhhc05leHQoKSkgewogCQkJTWFwLkVudHJ5IGVudHJ5ID0gKE1hcC5FbnRyeSkgaXRlcmF0b3IubmV4dCgpOwpAQCAtMjQ2LDcgKzI0Niw3IEBACiAJCQlhc3NlcnRJbnN0YW5jZShlbnRyeS5nZXRWYWx1ZSgpLCB2YWx1ZUNsYXNzLCBhbGxvd051bGxWYWx1ZXMpOwogCQl9CiAKLQkJcmV0dXJuIG1hcDsKKwkJcmV0dXJuIHNhZmVNYXA7CiAJfQogCiAJcHVibGljIHN0YXRpYyBTZXQgc2FmZUNvcHkoU2V0IHNldCwgQ2xhc3MgYykgewpAQCAtMjU3LDEzICsyNTcsMTMgQEAKIAkJaWYgKHNldCA9PSBudWxsIHx8IGMgPT0gbnVsbCkKIAkJCXRocm93IG5ldyBOdWxsUG9pbnRlckV4Y2VwdGlvbigpOwogCi0JCXNldCA9IENvbGxlY3Rpb25zLnVubW9kaWZpYWJsZVNldChuZXcgSGFzaFNldChzZXQpKTsKLQkJSXRlcmF0b3IgaXRlcmF0b3IgPSBzZXQuaXRlcmF0b3IoKTsKKwkJU2V0IHNhZmVTZXQgPSBDb2xsZWN0aW9ucy51bm1vZGlmaWFibGVTZXQobmV3IEhhc2hTZXQoc2V0KSk7CisJCUl0ZXJhdG9yIGl0ZXJhdG9yID0gc2FmZVNldC5pdGVyYXRvcigpOwogCiAJCXdoaWxlIChpdGVyYXRvci5oYXNOZXh0KCkpCiAJCQlhc3NlcnRJbnN0YW5jZShpdGVyYXRvci5uZXh0KCksIGMsIGFsbG93TnVsbEVsZW1lbnRzKTsKIAotCQlyZXR1cm4gc2V0OworCQlyZXR1cm4gc2FmZVNldDsKIAl9CiAKIAlwdWJsaWMgc3RhdGljIFNvcnRlZE1hcCBzYWZlQ29weShTb3J0ZWRNYXAgc29ydGVkTWFwLCBDbGFzcyBrZXlDbGFzcywgQ2xhc3MgdmFsdWVDbGFzcykgewpAQCAtMjc0LDggKzI3NCw4IEBACiAJCWlmIChzb3J0ZWRNYXAgPT0gbnVsbCB8fCBrZXlDbGFzcyA9PSBudWxsIHx8IHZhbHVlQ2xhc3MgPT0gbnVsbCkKIAkJCXRocm93IG5ldyBOdWxsUG9pbnRlckV4Y2VwdGlvbigpOwogCi0JCXNvcnRlZE1hcCA9IENvbGxlY3Rpb25zLnVubW9kaWZpYWJsZVNvcnRlZE1hcChuZXcgVHJlZU1hcChzb3J0ZWRNYXApKTsKLQkJSXRlcmF0b3IgaXRlcmF0b3IgPSBzb3J0ZWRNYXAuZW50cnlTZXQoKS5pdGVyYXRvcigpOworCQlTb3J0ZWRNYXAgc2FmZVNvcnRlZE1hcCA9IENvbGxlY3Rpb25zLnVubW9kaWZpYWJsZVNvcnRlZE1hcChuZXcgVHJlZU1hcChzb3J0ZWRNYXApKTsKKwkJSXRlcmF0b3IgaXRlcmF0b3IgPSBzYWZlU29ydGVkTWFwLmVudHJ5U2V0KCkuaXRlcmF0b3IoKTsKIAogCQl3aGlsZSAoaXRlcmF0b3IuaGFzTmV4dCgpKSB7CiAJCQlNYXAuRW50cnkgZW50cnkgPSAoTWFwLkVudHJ5KSBpdGVyYXRvci5uZXh0KCk7CkBAIC0yODMsNyArMjgzLDcgQEAKIAkJCWFzc2VydEluc3RhbmNlKGVudHJ5LmdldFZhbHVlKCksIHZhbHVlQ2xhc3MsIGFsbG93TnVsbFZhbHVlcyk7CiAJCX0KIAotCQlyZXR1cm4gc29ydGVkTWFwOworCQlyZXR1cm4gc2FmZVNvcnRlZE1hcDsKIAl9CiAKIAlwdWJsaWMgc3RhdGljIFNvcnRlZFNldCBzYWZlQ29weShTb3J0ZWRTZXQgc29ydGVkU2V0LCBDbGFzcyBjKSB7CkBAIC0yOTQsMTMgKzI5NCwxMyBAQAogCQlpZiAoc29ydGVkU2V0ID09IG51bGwgfHwgYyA9PSBudWxsKQogCQkJdGhyb3cgbmV3IE51bGxQb2ludGVyRXhjZXB0aW9uKCk7CiAKLQkJc29ydGVkU2V0ID0gQ29sbGVjdGlvbnMudW5tb2RpZmlhYmxlU29ydGVkU2V0KG5ldyBUcmVlU2V0KHNvcnRlZFNldCkpOwotCQlJdGVyYXRvciBpdGVyYXRvciA9IHNvcnRlZFNldC5pdGVyYXRvcigpOworCQlTb3J0ZWRTZXQgc2FmZVNvcnRlZFNldCA9IENvbGxlY3Rpb25zLnVubW9kaWZpYWJsZVNvcnRlZFNldChuZXcgVHJlZVNldChzb3J0ZWRTZXQpKTsKKwkJSXRlcmF0b3IgaXRlcmF0b3IgPSBzYWZlU29ydGVkU2V0Lml0ZXJhdG9yKCk7CiAKIAkJd2hpbGUgKGl0ZXJhdG9yLmhhc05leHQoKSkKIAkJCWFzc2VydEluc3RhbmNlKGl0ZXJhdG9yLm5leHQoKSwgYywgYWxsb3dOdWxsRWxlbWVudHMpOwogCi0JCXJldHVybiBzb3J0ZWRTZXQ7CisJCXJldHVybiBzYWZlU29ydGVkU2V0OwogCX0KIAogCXB1YmxpYyBzdGF0aWMgYm9vbGVhbiBzdGFydHNXaXRoKExpc3QgbGVmdCwgTGlzdCByaWdodCwgYm9vbGVhbiBlcXVhbHMpIHsKZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzL3NyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ZyYW1ld29ya3MvaW50ZXJuYWwvb3BlcmF0aW9ucy9Db21wb3NlZEV4dGVuZGVkT3BlcmF0aW9uSG9sZGVyLmphdmEgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy9zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9mcmFtZXdvcmtzL2ludGVybmFsL29wZXJhdGlvbnMvQ29tcG9zZWRFeHRlbmRlZE9wZXJhdGlvbkhvbGRlci5qYXZhCmluZGV4IDhiNzU0YjUuLmIxNjc2ZDIgMTAwNjQ0Ci0tLSBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzL3NyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ZyYW1ld29ya3MvaW50ZXJuYWwvb3BlcmF0aW9ucy9Db21wb3NlZEV4dGVuZGVkT3BlcmF0aW9uSG9sZGVyLmphdmEKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3Mvc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vZnJhbWV3b3Jrcy9pbnRlcm5hbC9vcGVyYXRpb25zL0NvbXBvc2VkRXh0ZW5kZWRPcGVyYXRpb25Ib2xkZXIuamF2YQpAQCAtMTUsOCArMTUsOCBAQAogaW1wb3J0IGphdmEudXRpbC5JdGVyYXRvcjsKIAogaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucnVudGltZS5Db3JlRXhjZXB0aW9uOwotaW1wb3J0IG9yZy5lY2xpcHNlLmplbS51dGlsLmxvZ2dlci5wcm94eS5Mb2dnZXI7CiBpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzLmludGVybmFsLmVuYWJsZW1lbnQuRW5hYmxlbWVudE1hbmFnZXI7CitpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzLmludGVybmFsLnBsdWdpbi5XVFBDb21tb25QbHVnaW47CiAKIHB1YmxpYyBjbGFzcyBDb21wb3NlZEV4dGVuZGVkT3BlcmF0aW9uSG9sZGVyIHsKIApAQCAtNDYsNyArNDYsNyBAQAogCQkJCQkJZXh0T3BlcmF0aW9uSG9sZGVyLmFkZFByZU9wZXJhdGlvbihwcmVPcCk7CiAJCQkJCX0KIAkJCQl9IGNhdGNoIChDb3JlRXhjZXB0aW9uIGUpIHsKLQkJCQkJTG9nZ2VyLmdldExvZ2dlcigpLmxvZ0Vycm9yKGUpOworCQkJCQlXVFBDb21tb25QbHVnaW4ubG9nRXJyb3IoZSk7CiAJCQkJfQogCQkJCXRyeSB7CiAJCQkJCXBvc3RPcCA9IGN1cnJlbnRFeHQuZ2V0UG9zdE9wZXJhdGlvbigpOwpAQCAtNTQsNyArNTQsNyBAQAogCQkJCQkJZXh0T3BlcmF0aW9uSG9sZGVyLmFkZFBvc3RPcGVyYXRpb24ocG9zdE9wKTsKIAkJCQkJfQogCQkJCX0gY2F0Y2ggKENvcmVFeGNlcHRpb24gZSkgewotCQkJCQlMb2dnZXIuZ2V0TG9nZ2VyKCkubG9nRXJyb3IoZSk7CisJCQkJCVdUUENvbW1vblBsdWdpbi5sb2dFcnJvcihlKTsKIAkJCQl9CiAJCQl9CiAJCX0KZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzL3NyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ZyYW1ld29ya3MvaW50ZXJuYWwvb3BlcmF0aW9ucy9PcGVyYXRpb25FeHRlbnNpb25SZWFkZXIuamF2YSBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzL3NyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ZyYW1ld29ya3MvaW50ZXJuYWwvb3BlcmF0aW9ucy9PcGVyYXRpb25FeHRlbnNpb25SZWFkZXIuamF2YQppbmRleCAzMWYyNWRiLi4zMjI4MDM3IDEwMDY0NAotLS0gYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy9zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9mcmFtZXdvcmtzL2ludGVybmFsL29wZXJhdGlvbnMvT3BlcmF0aW9uRXh0ZW5zaW9uUmVhZGVyLmphdmEKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3Mvc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vZnJhbWV3b3Jrcy9pbnRlcm5hbC9vcGVyYXRpb25zL09wZXJhdGlvbkV4dGVuc2lvblJlYWRlci5qYXZhCkBAIC04LDEyICs4LDYgQEAKICAqIENvbnRyaWJ1dG9yczoKICAqICAgICBJQk0gQ29ycG9yYXRpb24gLSBpbml0aWFsIEFQSSBhbmQgaW1wbGVtZW50YXRpb24KICAqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqLwotLyoKLSAqIENyZWF0ZWQgb24gTm92IDMsIDIwMDMKLSAqIAotICogVG8gY2hhbmdlIHRoZSB0ZW1wbGF0ZSBmb3IgdGhpcyBnZW5lcmF0ZWQgZmlsZSBnbyB0byBXaW5kb3cmZ3Q7UHJlZmVyZW5jZXMmZ3Q7SmF2YSZndDtDb2RlCi0gKiBHZW5lcmF0aW9uJmd0O0NvZGUgYW5kIENvbW1lbnRzCi0gKi8KIHBhY2thZ2Ugb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzLmludGVybmFsLm9wZXJhdGlvbnM7CiAKIGltcG9ydCBqYXZhLnV0aWwuQXJyYXlMaXN0OwpAQCAtMjEsNyArMTUsNyBAQAogaW1wb3J0IGphdmEudXRpbC5IYXNoTWFwOwogCiBpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5ydW50aW1lLklDb25maWd1cmF0aW9uRWxlbWVudDsKLWltcG9ydCBvcmcuZWNsaXBzZS5qZW0udXRpbC5SZWdpc3RyeVJlYWRlcjsKK2ltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvcmUudXRpbC5SZWdpc3RyeVJlYWRlcjsKIGltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3MuaW50ZXJuYWwucGx1Z2luLldUUENvbW1vblBsdWdpbjsKIAogcHVibGljIGNsYXNzIE9wZXJhdGlvbkV4dGVuc2lvblJlYWRlciBleHRlbmRzIFJlZ2lzdHJ5UmVhZGVyIHsKQEAgLTQyLDYgKzM2LDcgQEAKIAkgKiBwb3N0T3BlcmF0aW9uQ2xhc3M9ImNvbS5pYm0uZXRvb2xzLi4uLlBvc3REZWxldGVPcGVyYXRpb24iPiA8L29wZXJhdGlvbkV4dGVuc2lvbj4KIAkgKi8KIAorCUBPdmVycmlkZQogCXB1YmxpYyBib29sZWFuIHJlYWRFbGVtZW50KElDb25maWd1cmF0aW9uRWxlbWVudCBlbGVtZW50KSB7CiAJCWlmICghZWxlbWVudC5nZXROYW1lKCkuZXF1YWxzKEVMRU1FTlRfSjJFRU9QRVhUKSkKIAkJCXJldHVybiBmYWxzZTsKZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzL3NyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ZyYW1ld29ya3MvaW50ZXJuYWwvb3BlcmF0aW9ucy9PcGVyYXRpb25TdGF0dXMuamF2YSBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzL3NyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ZyYW1ld29ya3MvaW50ZXJuYWwvb3BlcmF0aW9ucy9PcGVyYXRpb25TdGF0dXMuamF2YQppbmRleCBkOTBhNGM4Li4yMmJmMGYzIDEwMDY0NAotLS0gYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy9zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9mcmFtZXdvcmtzL2ludGVybmFsL29wZXJhdGlvbnMvT3BlcmF0aW9uU3RhdHVzLmphdmEKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3Mvc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vZnJhbWV3b3Jrcy9pbnRlcm5hbC9vcGVyYXRpb25zL09wZXJhdGlvblN0YXR1cy5qYXZhCkBAIC0zOSw2ICszOSw3IEBACiAJLyoqCiAJICogT3ZlcnJpZGRlbiB0byBleHBvc2UgYXMgcHVibGljIGluc3RlYWQgb2YgcHJvdGVjdGVkCiAJICovCisJQE92ZXJyaWRlCiAJcHVibGljIHZvaWQgc2V0Q29kZShpbnQgY29kZSkgewogCQlzdXBlci5zZXRDb2RlKGNvZGUpOwogCX0KQEAgLTQ2LDYgKzQ3LDcgQEAKIAkvKioKIAkgKiBPdmVycmlkZGVuIHRvIGV4cG9zZSBhcyBwdWJsaWMgaW5zdGVhZCBvZiBwcm90ZWN0ZWQKIAkgKi8KKwlAT3ZlcnJpZGUKIAlwdWJsaWMgdm9pZCBzZXRFeGNlcHRpb24oVGhyb3dhYmxlIGV4Y2VwdGlvbikgewogCQlzdXBlci5zZXRFeGNlcHRpb24oZXhjZXB0aW9uKTsKIAl9CkBAIC01Myw2ICs1NSw3IEBACiAJLyoqCiAJICogT3ZlcnJpZGRlbiB0byBleHBvc2UgYXMgcHVibGljIGluc3RlYWQgb2YgcHJvdGVjdGVkCiAJICovCisJQE92ZXJyaWRlCiAJcHVibGljIHZvaWQgc2V0TWVzc2FnZShTdHJpbmcgbWVzc2FnZSkgewogCQlzdXBlci5zZXRNZXNzYWdlKG1lc3NhZ2UpOwogCX0KQEAgLTYwLDEwICs2MywxMiBAQAogCS8qKgogCSAqIE92ZXJyaWRkZW4gdG8gZXhwb3NlIGFzIHB1YmxpYyBpbnN0ZWFkIG9mIHByb3RlY3RlZAogCSAqLworCUBPdmVycmlkZQogCXB1YmxpYyB2b2lkIHNldFNldmVyaXR5KGludCBzZXZlcml0eSkgewogCQlzdXBlci5zZXRTZXZlcml0eShzZXZlcml0eSk7CiAJfQogCisJQE92ZXJyaWRlCiAJcHVibGljIHZvaWQgYWRkKElTdGF0dXMgc3RhdHVzKSB7CiAJCWludCBuZXdTZXYgPSBzdGF0dXMuZ2V0U2V2ZXJpdHkoKTsKIAkJaWYgKG5ld1NldiA+IGdldFNldmVyaXR5KCkpIHsKZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzL3NyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ZyYW1ld29ya3MvaW50ZXJuYWwvb3BlcmF0aW9ucy9Qcm9qZWN0Q3JlYXRpb25EYXRhTW9kZWxQcm92aWRlck5ldy5qYXZhIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3Mvc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vZnJhbWV3b3Jrcy9pbnRlcm5hbC9vcGVyYXRpb25zL1Byb2plY3RDcmVhdGlvbkRhdGFNb2RlbFByb3ZpZGVyTmV3LmphdmEKaW5kZXggMzgyM2VkNy4uODc5NmY2OCAxMDA2NDQKLS0tIGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3Mvc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vZnJhbWV3b3Jrcy9pbnRlcm5hbC9vcGVyYXRpb25zL1Byb2plY3RDcmVhdGlvbkRhdGFNb2RlbFByb3ZpZGVyTmV3LmphdmEKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3Mvc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vZnJhbWV3b3Jrcy9pbnRlcm5hbC9vcGVyYXRpb25zL1Byb2plY3RDcmVhdGlvbkRhdGFNb2RlbFByb3ZpZGVyTmV3LmphdmEKQEAgLTMyLDE0ICszMiwxNyBAQAogCiBwdWJsaWMgY2xhc3MgUHJvamVjdENyZWF0aW9uRGF0YU1vZGVsUHJvdmlkZXJOZXcgZXh0ZW5kcyBBYnN0cmFjdERhdGFNb2RlbFByb3ZpZGVyIGltcGxlbWVudHMgSVByb2plY3RDcmVhdGlvblByb3BlcnRpZXNOZXcgewogCisJQE92ZXJyaWRlCiAJcHVibGljIElEYXRhTW9kZWxPcGVyYXRpb24gZ2V0RGVmYXVsdE9wZXJhdGlvbigpIHsKIAkJcmV0dXJuIG5ldyBQcm9qZWN0Q3JlYXRpb25PcGVyYXRpb25OZXcobW9kZWwpOwogCX0KIAorCUBPdmVycmlkZQogCXB1YmxpYyB2b2lkIGluaXQoKSB7CiAJCXN1cGVyLmluaXQoKTsKIAl9CiAKKwlAT3ZlcnJpZGUKIAlwdWJsaWMgU2V0IGdldFByb3BlcnR5TmFtZXMoKSB7CiAJCVNldCBwcm9wZXJ0eU5hbWVzID0gc3VwZXIuZ2V0UHJvcGVydHlOYW1lcygpOwogCQlwcm9wZXJ0eU5hbWVzLmFkZChQUk9KRUNUKTsKQEAgLTU0LDYgKzU3LDcgQEAKIAkJcmV0dXJuIHByb3BlcnR5TmFtZXM7CiAJfQogCisJQE92ZXJyaWRlCiAJcHVibGljIE9iamVjdCBnZXREZWZhdWx0UHJvcGVydHkoU3RyaW5nIHByb3BlcnR5TmFtZSkgewogCQlpZiAocHJvcGVydHlOYW1lLmVxdWFscyhQUk9KRUNUX0xPQ0FUSU9OKSkgewogCQkJaWYgKGdldEJvb2xlYW5Qcm9wZXJ0eShVU0VfREVGQVVMVF9MT0NBVElPTikpIHsKQEAgLTgxLDYgKzg1LDcgQEAKIAkJcmV0dXJuIHBhdGgudG9PU1N0cmluZygpOwogCX0KIAorCUBPdmVycmlkZQogCXB1YmxpYyBib29sZWFuIHByb3BlcnR5U2V0KFN0cmluZyBwcm9wZXJ0eU5hbWUsIE9iamVjdCBwcm9wZXJ0eVZhbHVlKSB7CiAJCWlmIChwcm9wZXJ0eU5hbWUuZXF1YWxzKFBST0pFQ1RfTE9DQVRJT04pIHx8IHByb3BlcnR5TmFtZS5lcXVhbHMoREVGQVVMVF9MT0NBVElPTikgfHwgcHJvcGVydHlOYW1lLmVxdWFscyhQUk9KRUNUX0RFU0NSSVBUSU9OKSkgewogCQkJdGhyb3cgbmV3IFJ1bnRpbWVFeGNlcHRpb24oKTsKQEAgLTExNyw2ICsxMjIsNyBAQAogCQlyZXR1cm4gKG51bGwgIT0gcHJvamVjdE5hbWUgJiYgcHJvamVjdE5hbWUubGVuZ3RoKCkgPiAwKSA/IFJlc291cmNlc1BsdWdpbi5nZXRXb3Jrc3BhY2UoKS5nZXRSb290KCkuZ2V0UHJvamVjdChwcm9qZWN0TmFtZSkgOiBudWxsOwogCX0KIAorCUBPdmVycmlkZQogCXB1YmxpYyBJU3RhdHVzIHZhbGlkYXRlKFN0cmluZyBwcm9wZXJ0eU5hbWUpIHsKIAkJaWYgKHByb3BlcnR5TmFtZS5lcXVhbHMoUFJPSkVDVF9OQU1FKSkgewogCQkJU3RyaW5nIG5hbWUgPSBtb2RlbC5nZXRTdHJpbmdQcm9wZXJ0eShQUk9KRUNUX05BTUUpOwpAQCAtMTc2LDYgKzE4Miw5IEBACiAJCQlyZXR1cm4gc3RhdHVzOwogCQlpZiAocHJvamVjdE5hbWUuZW5kc1dpdGgoIiAiKSkgLy8kTk9OLU5MUy0xJAogCQkJcmV0dXJuIFdUUENvbW1vblBsdWdpbi5jcmVhdGVFcnJvclN0YXR1cyhXVFBSZXNvdXJjZUhhbmRsZXIuZ2V0U3RyaW5nKCI0MSIpKTsgLy8kTk9OLU5MUy0xJAorCQkvL3NwZWNpYWwgRlJBR01FTlRfU0VQQVJBVE9SIGNoYXIgaW4gb3JnLmVjbGlwc2UuZW1mLmNvbW1vbi51dGlsLlVSSQorCQlpZiAocHJvamVjdE5hbWUuaW5kZXhPZignIycpICE9IC0xKSAKKwkJCXJldHVybiBXVFBDb21tb25QbHVnaW4uY3JlYXRlRXJyb3JTdGF0dXMoV1RQUmVzb3VyY2VIYW5kbGVyLmdldFN0cmluZygiOCIpKTsgLy8kTk9OLU5MUy0xJAogCQlyZXR1cm4gT0tfU1RBVFVTOwogCX0KIApkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3Mvc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vZnJhbWV3b3Jrcy9pbnRlcm5hbC9vcGVyYXRpb25zL1Byb2plY3RDcmVhdGlvbk9wZXJhdGlvbk5ldy5qYXZhIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3Mvc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vZnJhbWV3b3Jrcy9pbnRlcm5hbC9vcGVyYXRpb25zL1Byb2plY3RDcmVhdGlvbk9wZXJhdGlvbk5ldy5qYXZhCmluZGV4IGQ4MzdjZmUuLmExYmE3YmIgMTAwNjQ0Ci0tLSBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzL3NyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ZyYW1ld29ya3MvaW50ZXJuYWwvb3BlcmF0aW9ucy9Qcm9qZWN0Q3JlYXRpb25PcGVyYXRpb25OZXcuamF2YQorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy9zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9mcmFtZXdvcmtzL2ludGVybmFsL29wZXJhdGlvbnMvUHJvamVjdENyZWF0aW9uT3BlcmF0aW9uTmV3LmphdmEKQEAgLTI1LDkgKzI1LDkgQEAKIGltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJ1bnRpbWUuSVN0YXR1czsKIGltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJ1bnRpbWUuT3BlcmF0aW9uQ2FuY2VsZWRFeGNlcHRpb247CiBpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5ydW50aW1lLlN1YlByb2dyZXNzTW9uaXRvcjsKLWltcG9ydCBvcmcuZWNsaXBzZS5qZW0udXRpbC5sb2dnZXIucHJveHkuTG9nZ2VyOwogaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy5kYXRhbW9kZWwuQWJzdHJhY3REYXRhTW9kZWxPcGVyYXRpb247CiBpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzLmRhdGFtb2RlbC5JRGF0YU1vZGVsOworaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy5pbnRlcm5hbC5wbHVnaW4uV1RQQ29tbW9uUGx1Z2luOwogCiBwdWJsaWMgY2xhc3MgUHJvamVjdENyZWF0aW9uT3BlcmF0aW9uTmV3IGV4dGVuZHMgQWJzdHJhY3REYXRhTW9kZWxPcGVyYXRpb24gaW1wbGVtZW50cyBJUHJvamVjdENyZWF0aW9uUHJvcGVydGllc05ldyB7CiAKQEAgLTM1LDYgKzM1LDcgQEAKIAkJc3VwZXIoZGF0YU1vZGVsKTsKIAl9CiAKKwlAT3ZlcnJpZGUKIAlwdWJsaWMgSVN0YXR1cyBleGVjdXRlKElQcm9ncmVzc01vbml0b3IgbW9uaXRvciwgSUFkYXB0YWJsZSBpbmZvKSB0aHJvd3MgRXhlY3V0aW9uRXhjZXB0aW9uIHsKIAkJdHJ5IHsKIAkJCUlQcm9ncmVzc01vbml0b3Igc3ViTW9uaXRvciA9IG5ldyBTdWJQcm9ncmVzc01vbml0b3IobW9uaXRvciwgSVByb2dyZXNzTW9uaXRvci5VTktOT1dOKTsKQEAgLTU2LDcgKzU3LDcgQEAKIAkJCQlwcm9qZWN0LnNldERlc2NyaXB0aW9uKGRlc2MsIG1vbml0b3IpOwogCQkJfQogCQl9IGNhdGNoIChDb3JlRXhjZXB0aW9uIGUpIHsKLQkJCUxvZ2dlci5nZXRMb2dnZXIoKS5sb2dFcnJvcihlKTsKKwkJCVdUUENvbW1vblBsdWdpbi5sb2dFcnJvcihlKTsKIAkJfSBmaW5hbGx5IHsKIAkJCW1vbml0b3IuZG9uZSgpOwogCQl9CkBAIC02NSwxMCArNjYsMTIgQEAKIAkJcmV0dXJuIE9LX1NUQVRVUzsKIAl9CiAKKwlAT3ZlcnJpZGUKIAlwdWJsaWMgYm9vbGVhbiBjYW5VbmRvKCkgewogCQlyZXR1cm4gZmFsc2U7CiAJfQogCisJQE92ZXJyaWRlCiAJcHVibGljIGJvb2xlYW4gY2FuUmVkbygpIHsKIAkJcmV0dXJuIGZhbHNlOwogCX0KZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzL3NyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ZyYW1ld29ya3MvaW50ZXJuYWwvcGx1Z2luL1dUUENvbW1vbk1lc3NhZ2VzLmphdmEgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy9zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9mcmFtZXdvcmtzL2ludGVybmFsL3BsdWdpbi9XVFBDb21tb25NZXNzYWdlcy5qYXZhCmluZGV4IDhmYWRlODAuLjg1MTExZDYgMTAwNjQ0Ci0tLSBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzL3NyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ZyYW1ld29ya3MvaW50ZXJuYWwvcGx1Z2luL1dUUENvbW1vbk1lc3NhZ2VzLmphdmEKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3Mvc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vZnJhbWV3b3Jrcy9pbnRlcm5hbC9wbHVnaW4vV1RQQ29tbW9uTWVzc2FnZXMuamF2YQpAQCAtNTAsNCArNTAsNSBAQAogCXB1YmxpYyBzdGF0aWMgZmluYWwgU3RyaW5nIFdFQkNPTlRFTlRGT0xERVJfRU1QVFkgPSAiNDAiOyAvLyROT04tTkxTLTEkCiAJcHVibGljIHN0YXRpYyBmaW5hbCBTdHJpbmcgUFJPSkVDVF9FWElTVFNfU0FNRU5BTUVfRVJST1IgPSAiNDMiOyAvLyROT04tTkxTLTEkCiAJcHVibGljIHN0YXRpYyBmaW5hbCBTdHJpbmcgUlVOVElNRV9OT05FID0gIjQ0IjsgLy8kTk9OLU5MUy0xJAorCXB1YmxpYyBzdGF0aWMgZmluYWwgU3RyaW5nIEVBUl9XSUxMX0JFX0NSRUFURUQgPSAiNDUiOyAvLyROT04tTkxTLTEkCiB9CmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy9zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9mcmFtZXdvcmtzL2ludGVybmFsL3BsdWdpbi9XVFBDb21tb25QbHVnaW4uamF2YSBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzL3NyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ZyYW1ld29ya3MvaW50ZXJuYWwvcGx1Z2luL1dUUENvbW1vblBsdWdpbi5qYXZhCmluZGV4IDk5NGM3MjAuLmUzZmM4N2QgMTAwNjQ0Ci0tLSBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzL3NyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ZyYW1ld29ya3MvaW50ZXJuYWwvcGx1Z2luL1dUUENvbW1vblBsdWdpbi5qYXZhCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzL3NyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ZyYW1ld29ya3MvaW50ZXJuYWwvcGx1Z2luL1dUUENvbW1vblBsdWdpbi5qYXZhCkBAIC04LDEyICs4LDYgQEAKICAqIENvbnRyaWJ1dG9yczoKICAqIElCTSBDb3Jwb3JhdGlvbiAtIGluaXRpYWwgQVBJIGFuZCBpbXBsZW1lbnRhdGlvbgogICoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKiovCi0vKgotICogQ3JlYXRlZCBvbiBPY3QgMjksIDIwMDMKLSAqCi0gKiBUbyBjaGFuZ2UgdGhlIHRlbXBsYXRlIGZvciB0aGlzIGdlbmVyYXRlZCBmaWxlIGdvIHRvCi0gKiBXaW5kb3cmZ3Q7UHJlZmVyZW5jZXMmZ3Q7SmF2YSZndDtDb2RlIEdlbmVyYXRpb24mZ3Q7Q29kZSBhbmQgQ29tbWVudHMKLSAqLwogcGFja2FnZSBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3MuaW50ZXJuYWwucGx1Z2luOwogCiBpbXBvcnQgamF2YS50ZXh0Lk1lc3NhZ2VGb3JtYXQ7CkBAIC0yNSwxMyArMTksMTAgQEAKIGltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJ1bnRpbWUuSVN0YXR1czsKIGltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJ1bnRpbWUuU3RhdHVzOwogaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy5pbnRlcm5hbC5XVFBQbHVnaW47CitpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5ydW50aW1lLlBsYXRmb3JtOworaW1wb3J0IGphdmEubGFuZy5UaHJvd2FibGU7CitpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5ydW50aW1lLkNvcmVFeGNlcHRpb247CiAKLS8qKgotICogQGF1dGhvciBqc2hvbGwKLSAqIAotICogVG8gY2hhbmdlIHRoZSB0ZW1wbGF0ZSBmb3IgdGhpcyBnZW5lcmF0ZWQgdHlwZSBjb21tZW50IGdvIHRvCi0gKiBXaW5kb3cmZ3Q7UHJlZmVyZW5jZXMmZ3Q7SmF2YSZndDtDb2RlIEdlbmVyYXRpb24mZ3Q7Q29kZSBhbmQgQ29tbWVudHMKLSAqLwogcHVibGljIGNsYXNzIFdUUENvbW1vblBsdWdpbiBleHRlbmRzIFdUUFBsdWdpbiB7CiAKIAlwdWJsaWMgc3RhdGljIGZpbmFsIFN0cmluZyBQTFVHSU5fSUQgPSAib3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzIjsgLy8kTk9OLU5MUy0xJApAQCAtMTM4LDcgKzEyOSwyOCBAQAogCSAqIAogCSAqIEBzZWUgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzLmludGVybmFsLldUUFBsdWdpbiNnZXRQbHVnaW5JRCgpCiAJICovCisJQE92ZXJyaWRlCiAJcHVibGljIFN0cmluZyBnZXRQbHVnaW5JRCgpIHsKIAkJcmV0dXJuIFBMVUdJTl9JRDsKIAl9CisKKwlwdWJsaWMgc3RhdGljIElTdGF0dXMgY3JlYXRlU3RhdHVzKGludCBzZXZlcml0eSwgU3RyaW5nIG1lc3NhZ2UsIFRocm93YWJsZSBleGNlcHRpb24pIHsKKwkJcmV0dXJuIG5ldyBTdGF0dXMoc2V2ZXJpdHksIFBMVUdJTl9JRCwgbWVzc2FnZSwgZXhjZXB0aW9uKTsKKwl9CisKKwlwdWJsaWMgc3RhdGljIElTdGF0dXMgY3JlYXRlU3RhdHVzKGludCBzZXZlcml0eSwgU3RyaW5nIG1lc3NhZ2UpIHsKKwkJcmV0dXJuIGNyZWF0ZVN0YXR1cyhzZXZlcml0eSwgbWVzc2FnZSwgbnVsbCk7CisJfQorCisJcHVibGljIHN0YXRpYyB2b2lkIGxvZ0Vycm9yKFRocm93YWJsZSBleGNlcHRpb24pIHsKKwkJUGxhdGZvcm0uZ2V0TG9nKFBsYXRmb3JtLmdldEJ1bmRsZShQTFVHSU5fSUQpKS5sb2coIGNyZWF0ZVN0YXR1cyhJU3RhdHVzLkVSUk9SLCBleGNlcHRpb24uZ2V0TWVzc2FnZSgpLCBleGNlcHRpb24pKTsKKwl9CisKKwlwdWJsaWMgc3RhdGljIHZvaWQgbG9nRXJyb3IoQ29yZUV4Y2VwdGlvbiBleGNlcHRpb24pIHsKKwkJUGxhdGZvcm0uZ2V0TG9nKFBsYXRmb3JtLmdldEJ1bmRsZShQTFVHSU5fSUQpKS5sb2coIGV4Y2VwdGlvbi5nZXRTdGF0dXMoKSApOworCX0KKworCXB1YmxpYyBzdGF0aWMgdm9pZCBsb2dFcnJvcihTdHJpbmcgbWVzc2FnZSkgeworCQlQbGF0Zm9ybS5nZXRMb2coUGxhdGZvcm0uZ2V0QnVuZGxlKFBMVUdJTl9JRCkpLmxvZyggY3JlYXRlU3RhdHVzKElTdGF0dXMuRVJST1IsIG1lc3NhZ2UpKTsKKwl9CiB9CmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy9zcmMvd3RwX2NvbW1vbi5wcm9wZXJ0aWVzIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3Mvc3JjL3d0cF9jb21tb24ucHJvcGVydGllcwppbmRleCAzYWYzZGI3Li44MTA0NmNiIDEwMDY0NAotLS0gYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy9zcmMvd3RwX2NvbW1vbi5wcm9wZXJ0aWVzCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzL3NyYy93dHBfY29tbW9uLnByb3BlcnRpZXMKQEAgLTUyLDMgKzUyLDQgQEAKIDQyPVJlc291cmNlIGFscmVhZHkgZXhpc3RzIHdpdGggYSBkaWZmZXJlbnQgY2FzZS4KIDQzPUEgcHJvamVjdCBhbHJlYWR5IGV4aXN0cyB3aXRoIHRoaXMgbmFtZS4KIDQ0PTxOb25lPgorNDU9RUFSIHByb2plY3QgezB9IGRvZXMgbm90IGV4aXN0LiBJdCB3aWxsIGJlIGNyZWF0ZWQuCmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uaW5mb3BvcC9NRVRBLUlORi9NQU5JRkVTVC5NRiBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5pbmZvcG9wL01FVEEtSU5GL01BTklGRVNULk1GCmluZGV4IGY5ZDdjMmEuLjlkNWM4Y2UgMTAwNjQ0Ci0tLSBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5pbmZvcG9wL01FVEEtSU5GL01BTklGRVNULk1GCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5pbmZvcG9wL01FVEEtSU5GL01BTklGRVNULk1GCkBAIC0yLDcgKzIsNyBAQAogQnVuZGxlLU1hbmlmZXN0VmVyc2lvbjogMgogQnVuZGxlLU5hbWU6ICVCdW5kbGUtTmFtZS4wCiBCdW5kbGUtU3ltYm9saWNOYW1lOiBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmluZm9wb3A7IHNpbmdsZXRvbjo9dHJ1ZQotQnVuZGxlLVZlcnNpb246IDEuMC4xMDAucXVhbGlmaWVyCitCdW5kbGUtVmVyc2lvbjogMS4wLjMwMC5xdWFsaWZpZXIKIEJ1bmRsZS1WZW5kb3I6ICVCdW5kbGUtVmVuZG9yLjAKIEJ1bmRsZS1Mb2NhbGl6YXRpb246IHBsdWdpbgogRWNsaXBzZS1MYXp5U3RhcnQ6IHRydWUKZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5pbmZvcG9wL3BsdWdpbi5wcm9wZXJ0aWVzIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmluZm9wb3AvcGx1Z2luLnByb3BlcnRpZXMKaW5kZXggNzRmMDI2MC4uYjIxZThlYyAxMDA2NDQKLS0tIGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmluZm9wb3AvcGx1Z2luLnByb3BlcnRpZXMKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmluZm9wb3AvcGx1Z2luLnByb3BlcnRpZXMKQEAgLTEsMyArMSwzIEBACiAjIHByb3BlcnRpZXMgZmlsZSBmb3Igb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5pbmZvcG9wCiBCdW5kbGUtTmFtZS4wID0gQ29tbW9uIFdTVCBpbmZvcG9wcwotQnVuZGxlLVZlbmRvci4wID0gRWNsaXBzZS5vcmcKXCBObyBuZXdsaW5lIGF0IGVuZCBvZiBmaWxlCitCdW5kbGUtVmVuZG9yLjAgPSBFY2xpcHNlIFdlYiBUb29scyBQbGF0Zm9ybQpcIE5vIG5ld2xpbmUgYXQgZW5kIG9mIGZpbGUKZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlLnVpLy5jbGFzc3BhdGggYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS51aS8uY2xhc3NwYXRoCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLjY0YzVlMzEKLS0tIC9kZXYvbnVsbAorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS51aS8uY2xhc3NwYXRoCkBAIC0wLDAgKzEsNyBAQAorPD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KKzxjbGFzc3BhdGg+CisJPGNsYXNzcGF0aGVudHJ5IGtpbmQ9ImNvbiIgcGF0aD0ib3JnLmVjbGlwc2UuamR0LmxhdW5jaGluZy5KUkVfQ09OVEFJTkVSL29yZy5lY2xpcHNlLmpkdC5pbnRlcm5hbC5kZWJ1Zy51aS5sYXVuY2hlci5TdGFuZGFyZFZNVHlwZS9KMlNFLTEuNSIvPgorCTxjbGFzc3BhdGhlbnRyeSBraW5kPSJjb24iIHBhdGg9Im9yZy5lY2xpcHNlLnBkZS5jb3JlLnJlcXVpcmVkUGx1Z2lucyIvPgorCTxjbGFzc3BhdGhlbnRyeSBraW5kPSJzcmMiIHBhdGg9InNyYyIvPgorCTxjbGFzc3BhdGhlbnRyeSBraW5kPSJvdXRwdXQiIHBhdGg9ImJpbiIvPgorPC9jbGFzc3BhdGg+CmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS51aS8ucHJvamVjdCBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlLnVpLy5wcm9qZWN0Cm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLjQ5NzdlYTcKLS0tIC9kZXYvbnVsbAorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS51aS8ucHJvamVjdApAQCAtMCwwICsxLDI4IEBACis8P3htbCB2ZXJzaW9uPSIxLjAiIGVuY29kaW5nPSJVVEYtOCI/PgorPHByb2plY3REZXNjcmlwdGlvbj4KKwk8bmFtZT5vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUudWk8L25hbWU+CisJPGNvbW1lbnQ+PC9jb21tZW50PgorCTxwcm9qZWN0cz4KKwk8L3Byb2plY3RzPgorCTxidWlsZFNwZWM+CisJCTxidWlsZENvbW1hbmQ+CisJCQk8bmFtZT5vcmcuZWNsaXBzZS5qZHQuY29yZS5qYXZhYnVpbGRlcjwvbmFtZT4KKwkJCTxhcmd1bWVudHM+CisJCQk8L2FyZ3VtZW50cz4KKwkJPC9idWlsZENvbW1hbmQ+CisJCTxidWlsZENvbW1hbmQ+CisJCQk8bmFtZT5vcmcuZWNsaXBzZS5wZGUuTWFuaWZlc3RCdWlsZGVyPC9uYW1lPgorCQkJPGFyZ3VtZW50cz4KKwkJCTwvYXJndW1lbnRzPgorCQk8L2J1aWxkQ29tbWFuZD4KKwkJPGJ1aWxkQ29tbWFuZD4KKwkJCTxuYW1lPm9yZy5lY2xpcHNlLnBkZS5TY2hlbWFCdWlsZGVyPC9uYW1lPgorCQkJPGFyZ3VtZW50cz4KKwkJCTwvYXJndW1lbnRzPgorCQk8L2J1aWxkQ29tbWFuZD4KKwk8L2J1aWxkU3BlYz4KKwk8bmF0dXJlcz4KKwkJPG5hdHVyZT5vcmcuZWNsaXBzZS5wZGUuUGx1Z2luTmF0dXJlPC9uYXR1cmU+CisJCTxuYXR1cmU+b3JnLmVjbGlwc2UuamR0LmNvcmUuamF2YW5hdHVyZTwvbmF0dXJlPgorCTwvbmF0dXJlcz4KKzwvcHJvamVjdERlc2NyaXB0aW9uPgpkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUudWkvLnNldHRpbmdzL29yZy5lY2xpcHNlLmpkdC5jb3JlLnByZWZzIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUudWkvLnNldHRpbmdzL29yZy5lY2xpcHNlLmpkdC5jb3JlLnByZWZzCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLjQ0ZDgyZjYKLS0tIC9kZXYvbnVsbAorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS51aS8uc2V0dGluZ3Mvb3JnLmVjbGlwc2UuamR0LmNvcmUucHJlZnMKQEAgLTAsMCArMSw3NCBAQAorI0ZyaSBTZXAgMTEgMTc6MTM6MDggUERUIDIwMDkKK2VjbGlwc2UucHJlZmVyZW5jZXMudmVyc2lvbj0xCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5jb2RlZ2VuLmlubGluZUpzckJ5dGVjb2RlPWVuYWJsZWQKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLmNvZGVnZW4udGFyZ2V0UGxhdGZvcm09MS41CitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5jb2RlZ2VuLnVudXNlZExvY2FsPXByZXNlcnZlCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5jb21wbGlhbmNlPTEuNQorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIuZGVidWcubGluZU51bWJlcj1nZW5lcmF0ZQorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIuZGVidWcubG9jYWxWYXJpYWJsZT1nZW5lcmF0ZQorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIuZGVidWcuc291cmNlRmlsZT1nZW5lcmF0ZQorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5hbm5vdGF0aW9uU3VwZXJJbnRlcmZhY2U9aWdub3JlCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLmFzc2VydElkZW50aWZpZXI9ZXJyb3IKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0uYXV0b2JveGluZz1pZ25vcmUKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0uY29tcGFyaW5nSWRlbnRpY2FsPXdhcm5pbmcKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0uZGVhZENvZGU9d2FybmluZworb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5kZXByZWNhdGlvbj13YXJuaW5nCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLmRlcHJlY2F0aW9uSW5EZXByZWNhdGVkQ29kZT1kaXNhYmxlZAorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5kZXByZWNhdGlvbldoZW5PdmVycmlkaW5nRGVwcmVjYXRlZE1ldGhvZD1kaXNhYmxlZAorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5kaXNjb3VyYWdlZFJlZmVyZW5jZT13YXJuaW5nCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLmVtcHR5U3RhdGVtZW50PWlnbm9yZQorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5lbnVtSWRlbnRpZmllcj1lcnJvcgorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5mYWxsdGhyb3VnaENhc2U9aWdub3JlCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLmZhdGFsT3B0aW9uYWxFcnJvcj1lbmFibGVkCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLmZpZWxkSGlkaW5nPWlnbm9yZQorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5maW5hbFBhcmFtZXRlckJvdW5kPWlnbm9yZQorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5maW5hbGx5QmxvY2tOb3RDb21wbGV0aW5nTm9ybWFsbHk9ZXJyb3IKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0uZm9yYmlkZGVuUmVmZXJlbmNlPWVycm9yCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLmhpZGRlbkNhdGNoQmxvY2s9ZXJyb3IKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0uaW5jb21wYXRpYmxlTm9uSW5oZXJpdGVkSW50ZXJmYWNlTWV0aG9kPWVycm9yCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLmluY29tcGxldGVFbnVtU3dpdGNoPWlnbm9yZQorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5pbmRpcmVjdFN0YXRpY0FjY2Vzcz1pZ25vcmUKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0ubG9jYWxWYXJpYWJsZUhpZGluZz1pZ25vcmUKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0ubWV0aG9kV2l0aENvbnN0cnVjdG9yTmFtZT1lcnJvcgorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5taXNzaW5nRGVwcmVjYXRlZEFubm90YXRpb249aWdub3JlCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLm1pc3NpbmdIYXNoQ29kZU1ldGhvZD1pZ25vcmUKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0ubWlzc2luZ092ZXJyaWRlQW5ub3RhdGlvbj1pZ25vcmUKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0ubWlzc2luZ1NlcmlhbFZlcnNpb249d2FybmluZworb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5taXNzaW5nU3luY2hyb25pemVkT25Jbmhlcml0ZWRNZXRob2Q9aWdub3JlCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLm5vRWZmZWN0QXNzaWdubWVudD13YXJuaW5nCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLm5vSW1wbGljaXRTdHJpbmdDb252ZXJzaW9uPWVycm9yCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLm5vbkV4dGVybmFsaXplZFN0cmluZ0xpdGVyYWw9d2FybmluZworb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5udWxsUmVmZXJlbmNlPWlnbm9yZQorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5vdmVycmlkaW5nUGFja2FnZURlZmF1bHRNZXRob2Q9ZXJyb3IKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0ucGFyYW1ldGVyQXNzaWdubWVudD1pZ25vcmUKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0ucG9zc2libGVBY2NpZGVudGFsQm9vbGVhbkFzc2lnbm1lbnQ9aWdub3JlCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLnBvdGVudGlhbE51bGxSZWZlcmVuY2U9aWdub3JlCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLnJhd1R5cGVSZWZlcmVuY2U9aWdub3JlCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLnJlZHVuZGFudE51bGxDaGVjaz1pZ25vcmUKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0ucmVkdW5kYW50U3VwZXJpbnRlcmZhY2U9aWdub3JlCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLnNwZWNpYWxQYXJhbWV0ZXJIaWRpbmdGaWVsZD1kaXNhYmxlZAorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5zdGF0aWNBY2Nlc3NSZWNlaXZlcj1lcnJvcgorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5zdXBwcmVzc1dhcm5pbmdzPWVuYWJsZWQKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0uc3ludGhldGljQWNjZXNzRW11bGF0aW9uPWlnbm9yZQorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS50eXBlUGFyYW1ldGVySGlkaW5nPWVycm9yCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLnVuY2hlY2tlZFR5cGVPcGVyYXRpb249aWdub3JlCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLnVuZG9jdW1lbnRlZEVtcHR5QmxvY2s9aWdub3JlCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLnVuaGFuZGxlZFdhcm5pbmdUb2tlbj1pZ25vcmUKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0udW5uZWNlc3NhcnlFbHNlPWlnbm9yZQorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS51bm5lY2Vzc2FyeVR5cGVDaGVjaz1lcnJvcgorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS51bnF1YWxpZmllZEZpZWxkQWNjZXNzPWlnbm9yZQorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS51bnVzZWREZWNsYXJlZFRocm93bkV4Y2VwdGlvbj1pZ25vcmUKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0udW51c2VkRGVjbGFyZWRUaHJvd25FeGNlcHRpb25FeGVtcHRFeGNlcHRpb25BbmRUaHJvd2FibGU9ZW5hYmxlZAorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS51bnVzZWREZWNsYXJlZFRocm93bkV4Y2VwdGlvbkluY2x1ZGVEb2NDb21tZW50UmVmZXJlbmNlPWVuYWJsZWQKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0udW51c2VkRGVjbGFyZWRUaHJvd25FeGNlcHRpb25XaGVuT3ZlcnJpZGluZz1kaXNhYmxlZAorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS51bnVzZWRJbXBvcnQ9ZXJyb3IKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0udW51c2VkTGFiZWw9ZXJyb3IKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0udW51c2VkTG9jYWw9aWdub3JlCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLnVudXNlZFBhcmFtZXRlcj1pZ25vcmUKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0udW51c2VkUGFyYW1ldGVySW5jbHVkZURvY0NvbW1lbnRSZWZlcmVuY2U9ZW5hYmxlZAorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS51bnVzZWRQYXJhbWV0ZXJXaGVuSW1wbGVtZW50aW5nQWJzdHJhY3Q9ZGlzYWJsZWQKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0udW51c2VkUGFyYW1ldGVyV2hlbk92ZXJyaWRpbmdDb25jcmV0ZT1kaXNhYmxlZAorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS51bnVzZWRQcml2YXRlTWVtYmVyPWVycm9yCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLnVudXNlZFdhcm5pbmdUb2tlbj13YXJuaW5nCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLnZhcmFyZ3NBcmd1bWVudE5lZWRDYXN0PWlnbm9yZQorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIuc291cmNlPTEuNQpkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUudWkvTUVUQS1JTkYvTUFOSUZFU1QuTUYgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS51aS9NRVRBLUlORi9NQU5JRkVTVC5NRgpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi4yYzAzYWY4Ci0tLSAvZGV2L251bGwKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUudWkvTUVUQS1JTkYvTUFOSUZFU1QuTUYKQEAgLTAsMCArMSwyNyBAQAorTWFuaWZlc3QtVmVyc2lvbjogMS4wCitCdW5kbGUtTWFuaWZlc3RWZXJzaW9uOiAyCitCdW5kbGUtTmFtZTogJUJ1bmRsZS1OYW1lLjAKK0J1bmRsZS1WZW5kb3I6ICVwcm92aWRlcgorQnVuZGxlLVN5bWJvbGljTmFtZTogb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlLnVpOyBzaW5nbGV0b246PXRydWUKK0J1bmRsZS1WZXJzaW9uOiAxLjAuMS5xdWFsaWZpZXIKK0J1bmRsZS1Mb2NhbGl6YXRpb246IHBsdWdpbgorQnVuZGxlLUFjdGl2YXRvcjogb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb21wb25lbnRjb3JlLnVpLk1vZHVsZUNvcmVVSVBsdWdpbgorUmVxdWlyZS1CdW5kbGU6IG9yZy5lY2xpcHNlLnVpO2J1bmRsZS12ZXJzaW9uPSJbMy41LjAsNC4wLjApIiwKKyBvcmcuZWNsaXBzZS5jb3JlLnJ1bnRpbWU7YnVuZGxlLXZlcnNpb249IlszLjUuMCw0LjAuMCkiLAorIG9yZy5lY2xpcHNlLmNvcmUucmVzb3VyY2VzO2J1bmRsZS12ZXJzaW9uPSJbMy41LjAsNC4wLjApIiwKKyBvcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmU7YnVuZGxlLXZlcnNpb249IlsxLjEuMzAwLDIuMC4wKSIsCisgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzO2J1bmRsZS12ZXJzaW9uPSJbMS4xLjMwMCwyLjAuMCkiLAorIG9yZy5lY2xpcHNlLndzdC5jb21tb24ucHJvamVjdC5mYWNldC5jb3JlO2J1bmRsZS12ZXJzaW9uPSJbMS40LjAsMi4wLjApIiwKKyBvcmcuZWNsaXBzZS5qZW0udXRpbDtidW5kbGUtdmVyc2lvbj0iWzIuMC4yMDAsMy4wLjApIiwKKyBvcmcuZWNsaXBzZS5lbWYuZWNvcmU7YnVuZGxlLXZlcnNpb249IlsyLjUuMCwzLjAuMCkiLAorIG9yZy5lY2xpcHNlLnVpLmlkZTtidW5kbGUtdmVyc2lvbj0iWzMuNS4wLDQuMC4wKSIsCisgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbWZ3b3JrYmVuY2guaW50ZWdyYXRpb247YnVuZGxlLXZlcnNpb249IlsxLjIuMCwyLjAuMCkiLAorIG9yZy5lY2xpcHNlLndzdC5zZXJ2ZXIuY29yZTtidW5kbGUtdmVyc2lvbj0iWzEuMS4yMDIsMi4wLjApIgorQnVuZGxlLUFjdGl2YXRpb25Qb2xpY3k6IGxhenkKK0J1bmRsZS1SZXF1aXJlZEV4ZWN1dGlvbkVudmlyb25tZW50OiBKMlNFLTEuNQorRXhwb3J0LVBhY2thZ2U6IG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS5pbnRlcm5hbC5pbXBsO3gtaW50ZXJuYWw6PXRydWUsCisgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb21wb25lbnRjb3JlLnVpO3gtaW50ZXJuYWw6PXRydWUsCisgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb21wb25lbnRjb3JlLnVpLmludGVybmFsLnByb3BlcnR5cGFnZTt4LWludGVybmFsOj10cnVlLAorIG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS51aS5pbnRlcm5hbC5wcm9wZXJ0eXBhZ2UudmVyaWZpZXI7eC1pbnRlcm5hbDo9dHJ1ZSwKKyBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUudWkuaW50ZXJuYWwudGFza3dpemFyZDt4LWludGVybmFsOj10cnVlLAorIG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS51aS5wcm9wZXJ0eXBhZ2U7eC1pbnRlcm5hbDo9dHJ1ZQpkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUudWkvYWJvdXQuaHRtbCBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlLnVpL2Fib3V0Lmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uYjZlZDViMAotLS0gL2Rldi9udWxsCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlLnVpL2Fib3V0Lmh0bWwKQEAgLTAsMCArMSwzNCBAQAorPCFET0NUWVBFIEhUTUwgUFVCTElDICItLy9XM0MvL0RURCBIVE1MIDQuMC8vRU4iPgorPEhUTUw+CisKKzxoZWFkPgorPHRpdGxlPkFib3V0PC90aXRsZT4KKzxtZXRhIGh0dHAtZXF1aXY9Q29udGVudC1UeXBlIGNvbnRlbnQ9InRleHQvaHRtbDsgY2hhcnNldD1JU08tODg1OS0xIj4KKzwvaGVhZD4KKworPEJPRFkgbGFuZz0iRU4tVVMiPgorCis8SDM+QWJvdXQgVGhpcyBDb250ZW50PC9IMz4KKworPFA+QXVndXN0LCAyMDA5PC9QPgorCis8SDM+TGljZW5zZTwvSDM+CisKKzxQPlRoZSBFY2xpcHNlIEZvdW5kYXRpb24gbWFrZXMgYXZhaWxhYmxlIGFsbCBjb250ZW50IGluIHRoaXMgcGx1Zy1pbiAKKygiQ29udGVudCIpLiBVbmxlc3Mgb3RoZXJ3aXNlIGluZGljYXRlZCBiZWxvdywgdGhlIENvbnRlbnQgaXMgcHJvdmlkZWQgdG8geW91IAordW5kZXIgdGhlIHRlcm1zIGFuZCBjb25kaXRpb25zIG9mIHRoZSBFY2xpcHNlIFB1YmxpYyBMaWNlbnNlIFZlcnNpb24gMS4wIAorKCJFUEwiKS4gQSBjb3B5IG9mIHRoZSBFUEwgaXMgYXZhaWxhYmxlIGF0Cis8QSBocmVmPSJodHRwOi8vd3d3LmVjbGlwc2Uub3JnL29yZy9kb2N1bWVudHMvZXBsLXYxMC5waHAiPmh0dHA6Ly93d3cuZWNsaXBzZS5vcmcvb3JnL2RvY3VtZW50cy9lcGwtdjEwLnBocDwvQT4uIAorRm9yIHB1cnBvc2VzIG9mIHRoZSBFUEwsICJQcm9ncmFtIiB3aWxsIG1lYW4gdGhlIENvbnRlbnQuPC9QPgorCis8UD5JZiB5b3UgZGlkIG5vdCByZWNlaXZlIHRoaXMgQ29udGVudCBkaXJlY3RseSBmcm9tIHRoZSBFY2xpcHNlIEZvdW5kYXRpb24sIHRoZSAKK0NvbnRlbnQgaXMgYmVpbmcgcmVkaXN0cmlidXRlZCBieSBhbm90aGVyIHBhcnR5ICgiUmVkaXN0cmlidXRvciIpIGFuZCBkaWZmZXJlbnQgCit0ZXJtcyBhbmQgY29uZGl0aW9ucyBtYXkgYXBwbHkgdG8geW91ciB1c2Ugb2YgYW55IG9iamVjdCBjb2RlIGluIHRoZSBDb250ZW50LiAKK0NoZWNrIHRoZSBSZWRpc3RyaWJ1dG9yknMgbGljZW5zZSB0aGF0IHdhcyBwcm92aWRlZCB3aXRoIHRoZSBDb250ZW50LiBJZiBubyBzdWNoIAorbGljZW5zZSBleGlzdHMsIGNvbnRhY3QgdGhlIFJlZGlzdHJpYnV0b3IuIFVubGVzcyBvdGhlcndpc2UgaW5kaWNhdGVkIGJlbG93LCB0aGUgCit0ZXJtcyBhbmQgY29uZGl0aW9ucyBvZiB0aGUgRVBMIHN0aWxsIGFwcGx5IHRvIGFueSBzb3VyY2UgY29kZSBpbiB0aGUgQ29udGVudCAKK2FuZCBzdWNoIHNvdXJjZSBjb2RlIG1heSBiZSBvYnRhaW5lZCBhdAorPEEgaHJlZj0iaHR0cDovL3d3dy5lY2xpcHNlLm9yZy8iPmh0dHA6Ly93d3cuZWNsaXBzZS5vcmcvPC9BPi48L1A+CisKKzwvQk9EWT4KKzwvSFRNTD4KZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlLnVpL2J1aWxkLnByb3BlcnRpZXMgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS51aS9idWlsZC5wcm9wZXJ0aWVzCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLmVmMDc4N2UKLS0tIC9kZXYvbnVsbAorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS51aS9idWlsZC5wcm9wZXJ0aWVzCkBAIC0wLDAgKzEsMTkgQEAKKyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMKKyMgQ29weXJpZ2h0IChjKSAyMDA5IElCTSBDb3Jwb3JhdGlvbiBhbmQgb3RoZXJzLgorIyBBbGwgcmlnaHRzIHJlc2VydmVkLiBUaGlzIHByb2dyYW0gYW5kIHRoZSBhY2NvbXBhbnlpbmcgbWF0ZXJpYWxzCisjIGFyZSBtYWRlIGF2YWlsYWJsZSB1bmRlciB0aGUgdGVybXMgb2YgdGhlIEVjbGlwc2UgUHVibGljIExpY2Vuc2UgdjEuMAorIyB3aGljaCBhY2NvbXBhbmllcyB0aGlzIGRpc3RyaWJ1dGlvbiwgYW5kIGlzIGF2YWlsYWJsZSBhdAorIyBodHRwOi8vd3d3LmVjbGlwc2Uub3JnL2xlZ2FsL2VwbC12MTAuaHRtbAorIworIyBDb250cmlidXRvcnM6CisjIElCTSBDb3Jwb3JhdGlvbiAtIGluaXRpYWwgQVBJIGFuZCBpbXBsZW1lbnRhdGlvbgorIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIworc291cmNlLi4gPSBzcmMvCitvdXRwdXQuLiA9IGJpbi8KK2Jpbi5pbmNsdWRlcyA9IHBsdWdpbi54bWwsXAorICAgICAgICAgICAgICAgLixcCisgICAgICAgICAgICAgICBpY29ucy8sXAorICAgICAgICAgICAgICAgTUVUQS1JTkYvLFwKKyAgICAgICAgICAgICAgIGFib3V0Lmh0bWwsXAorICAgICAgICAgICAgICAgcGx1Z2luLnByb3BlcnRpZXMKK3NyYy5pbmNsdWRlcyA9IHNjaGVtYS8KZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlLnVpL2ljb25zL2ZvbGRlci5naWYgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS51aS9pY29ucy9mb2xkZXIuZ2lmCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLmM5MWIyNjcKLS0tIC9kZXYvbnVsbAorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS51aS9pY29ucy9mb2xkZXIuZ2lmCkJpbmFyeSBmaWxlcyBkaWZmZXIKZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlLnVpL2ljb25zL2phcl9vYmouZ2lmIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUudWkvaWNvbnMvamFyX29iai5naWYKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uZWMzMTVkNQotLS0gL2Rldi9udWxsCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlLnVpL2ljb25zL2phcl9vYmouZ2lmCkJpbmFyeSBmaWxlcyBkaWZmZXIKZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlLnVpL2ljb25zL3Byal9vYmouZ2lmIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUudWkvaWNvbnMvcHJqX29iai5naWYKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uYTRlYTU4MAotLS0gL2Rldi9udWxsCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlLnVpL2ljb25zL3Byal9vYmouZ2lmCkJpbmFyeSBmaWxlcyBkaWZmZXIKZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlLnVpL3BsdWdpbi5wcm9wZXJ0aWVzIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUudWkvcGx1Z2luLnByb3BlcnRpZXMKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uYThmYjBjNwotLS0gL2Rldi9udWxsCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlLnVpL3BsdWdpbi5wcm9wZXJ0aWVzCkBAIC0wLDAgKzEsMTUgQEAKKyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMKKyMgQ29weXJpZ2h0IChjKSAyMDA5IElCTSBDb3Jwb3JhdGlvbiBhbmQgb3RoZXJzLgorIyBBbGwgcmlnaHRzIHJlc2VydmVkLiBUaGlzIHByb2dyYW0gYW5kIHRoZSBhY2NvbXBhbnlpbmcgbWF0ZXJpYWxzCisjIGFyZSBtYWRlIGF2YWlsYWJsZSB1bmRlciB0aGUgdGVybXMgb2YgdGhlIEVjbGlwc2UgUHVibGljIExpY2Vuc2UgdjEuMAorIyB3aGljaCBhY2NvbXBhbmllcyB0aGlzIGRpc3RyaWJ1dGlvbiwgYW5kIGlzIGF2YWlsYWJsZSBhdAorIyBodHRwOi8vd3d3LmVjbGlwc2Uub3JnL2xlZ2FsL2VwbC12MTAuaHRtbAorIworIyBDb250cmlidXRvcnM6CisjIElCTSBDb3Jwb3JhdGlvbiAtIGluaXRpYWwgQVBJIGFuZCBpbXBsZW1lbnRhdGlvbgorIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIworcHJvdmlkZXI9RWNsaXBzZS5vcmcKK0J1bmRsZS1OYW1lLjAgPSBNb2R1bGVjb3JlIFVJIFBsdWctaW4KK01vZHVsZV9hc3NlbWJseS5uYW1lID0gRGVwbG95bWVudCBBc3NlbWJseQorUHJvamVjdD1Qcm9qZWN0CitGb2xkZXJfTWFwcGluZz1Gb2xkZXIgTWFwcGluZwpcIE5vIG5ld2xpbmUgYXQgZW5kIG9mIGZpbGUKZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlLnVpL3BsdWdpbi54bWwgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS51aS9wbHVnaW4ueG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLjBmYmZjNmQKLS0tIC9kZXYvbnVsbAorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS51aS9wbHVnaW4ueG1sCkBAIC0wLDAgKzEsNDIgQEAKKzw/eG1sIHZlcnNpb249IjEuMCIgZW5jb2Rpbmc9IlVURi04Ij8+Cis8P2VjbGlwc2UgdmVyc2lvbj0iMy4wIj8+Cis8cGx1Z2luPgorICAgPGV4dGVuc2lvbi1wb2ludCBpZD0ibW9kdWxlRGVwZW5kZW5jeVByb3BlcnR5UGFnZSIgbmFtZT0ibW9kdWxlRGVwZW5kZW5jeVByb3BlcnR5UGFnZSIgc2NoZW1hPSJzY2hlbWEvbW9kdWxlRGVwZW5kZW5jeVByb3BlcnR5UGFnZS5leHNkIi8+CisgICA8ZXh0ZW5zaW9uLXBvaW50IGlkPSJyZWZlcmVuY2VXaXphcmRGcmFnbWVudCIgbmFtZT0icmVmZXJlbmNlV2l6YXJkRnJhZ21lbnQiIHNjaGVtYT0ic2NoZW1hL3JlZmVyZW5jZVdpemFyZEZyYWdtZW50LmV4c2QiLz4KKyAgIDxleHRlbnNpb24tcG9pbnQgaWQ9InZpcnR1YWxDb21wb25lbnRMYWJlbFByb3ZpZGVyIiBuYW1lPSJ2aXJ0dWFsQ29tcG9uZW50TGFiZWxQcm92aWRlciIgc2NoZW1hPSJzY2hlbWEvdmlydHVhbENvbXBvbmVudExhYmVsUHJvdmlkZXIuZXhzZCIvPgorICAgPGV4dGVuc2lvbi1wb2ludCBpZD0iZGVwbG95bWVudEFzc2VtYmx5VmVyaWZpZXIiIG5hbWU9IkRlcGxveW1lbnQgQXNzZW1ibHkgVmVyaWZpZXIiIHNjaGVtYT0ic2NoZW1hL2RlcGxveW1lbnRBc3NlbWJseVZlcmlmaWVyLmV4c2QiLz4KKyAgIDwhLS0gPT09PT09PT09PT0gRGVwbG95bWVudEFzc2VtYmx5UGFnZSA9PT09PT09PT09PT0gLS0+CisgICA8ZXh0ZW5zaW9uCisgICAJCXBvaW50PSJvcmcuZWNsaXBzZS51aS5wcm9wZXJ0eVBhZ2VzIj4KKyAJPHBhZ2UKKyAgICAgIAkJbmFtZT0iJU1vZHVsZV9hc3NlbWJseS5uYW1lIgorICAgICAgICAgICAgY2xhc3M9Im9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS51aS5wcm9wZXJ0eXBhZ2UuTW9kdWxlQXNzZW1ibHlSb290UGFnZSIKKyAgICAgICAgICAgIGlkPSJvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUudWkuRGVwbG95bWVudEFzc2VtYmx5UGFnZSI+CisgICAgICAgICAgIDxlbmFibGVkV2hlbj4KKwkJCQk8YWRhcHQKKwkJCQkJdHlwZT0ib3JnLmVjbGlwc2UuY29yZS5yZXNvdXJjZXMuSVByb2plY3QiPgorCQkJCQk8dGVzdAorCQkJCQkJcHJvcGVydHk9Im9yZy5lY2xpcHNlLmNvcmUucmVzb3VyY2VzLnByb2plY3ROYXR1cmUiCisgICAgICAgICAgCQkJCXZhbHVlPSJvcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUuTW9kdWxlQ29yZU5hdHVyZSIvPgorCQkJCTwvYWRhcHQ+CisgICAgICAgICA8L2VuYWJsZWRXaGVuPiAgICAgICAgICAKKyAgICAgIDwvcGFnZT4KKyAgICAgIDwvZXh0ZW5zaW9uPgorCisKKyAgICA8ZXh0ZW5zaW9uCisgICAgICAgICAgcG9pbnQ9Im9yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS51aS5yZWZlcmVuY2VXaXphcmRGcmFnbWVudCI+CisgICAgICAgPHJlZmVyZW5jZUZyYWdtZW50CisgICAgICAgICAgICAgY2xhc3M9Im9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS51aS5pbnRlcm5hbC5wcm9wZXJ0eXBhZ2UuUHJvamVjdFJlZmVyZW5jZVdpemFyZEZyYWdtZW50IgorICAgICAgICAgICAgIGljb249Imljb25zL3Byal9vYmouZ2lmIgorICAgICAgICAgICAgIGlkPSJvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUudWkubmV3UHJvamVjdFJlZmVyZW5jZSIKKyAgICAgICAgICAgICBuYW1lPSIlUHJvamVjdCI+CisgICAgICAgPC9yZWZlcmVuY2VGcmFnbWVudD4KKyAgICAgICA8cmVmZXJlbmNlRnJhZ21lbnQKKyAgICAgICAgICAgICBjbGFzcz0ib3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb21wb25lbnRjb3JlLnVpLmludGVybmFsLnByb3BlcnR5cGFnZS5Gb2xkZXJNYXBwaW5nV2l6YXJkRnJhZ21lbnQiCisgICAgICAgICAgICAgaWNvbj0iaWNvbnMvZm9sZGVyLmdpZiIKKyAgICAgICAgICAgICBpZD0ib3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb21wb25lbnRjb3JlLnVpLnJlc291cmNlTWFwcGluZ1JlZmVyZW5jZSIKKyAgICAgICAgICAgICBuYW1lPSIlRm9sZGVyX01hcHBpbmciPgorICAgICAgIDwvcmVmZXJlbmNlRnJhZ21lbnQ+CisgICAgPC9leHRlbnNpb24+Cis8L3BsdWdpbj4KZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlLnVpL3NjaGVtYS9kZXBsb3ltZW50QXNzZW1ibHlWZXJpZmllci5leHNkIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUudWkvc2NoZW1hL2RlcGxveW1lbnRBc3NlbWJseVZlcmlmaWVyLmV4c2QKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uMzZlMjIwMwotLS0gL2Rldi9udWxsCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlLnVpL3NjaGVtYS9kZXBsb3ltZW50QXNzZW1ibHlWZXJpZmllci5leHNkCkBAIC0wLDAgKzEsMTE1IEBACis8P3htbCB2ZXJzaW9uPScxLjAnIGVuY29kaW5nPSdVVEYtOCc/PgorPCEtLSBTY2hlbWEgZmlsZSB3cml0dGVuIGJ5IFBERSAtLT4KKzxzY2hlbWEgdGFyZ2V0TmFtZXNwYWNlPSJvcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUudWkiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAxL1hNTFNjaGVtYSI+Cis8YW5ub3RhdGlvbj4KKyAgICAgIDxhcHBJbmZvPgorICAgICAgICAgPG1ldGEuc2NoZW1hIHBsdWdpbj0ib3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlLnVpIiBpZD0iRGVwbG95bWVudEFzc2VtYmx5VmVyaWZpZXIiIG5hbWU9IkRlcGxveW1lbnQgQXNzZW1ibHkgVmVyaWZpZXIiLz4KKyAgICAgIDwvYXBwSW5mbz4KKyAgICAgIDxkb2N1bWVudGF0aW9uPgorICAgICAgICAgVGhlIGV4dGVuc2lvbiBwb2ludCBnaXZlcyB0aGUgYWJpbGl0eSB0byBleHRlbmQgZGVwbG95bWVudCBhc3NlbWJseSB2YWxpZGF0aW9uIGR1cmluZyB0aGUgY3JlYXRpb24gb2YgcmVzb3VyY2UgYW5kIGRlcGVuZGVuY3kgbWFwcGluZ3MuIFJlZ2lzdHJhdGlvbiBvZiB0aGUgdmVyaWZpZXIgaXMgYmFzZWQgb24gY29tcG9uZW50IHR5cGUgYW5kIHNlcnZlciB0YXJnZXQuCisgICAgICA8L2RvY3VtZW50YXRpb24+CisgICA8L2Fubm90YXRpb24+CisKKyAgIDxlbGVtZW50IG5hbWU9ImV4dGVuc2lvbiI+CisgICAgICA8YW5ub3RhdGlvbj4KKyAgICAgICAgIDxhcHBJbmZvPgorICAgICAgICAgICAgPG1ldGEuZWxlbWVudCAvPgorICAgICAgICAgPC9hcHBJbmZvPgorICAgICAgPC9hbm5vdGF0aW9uPgorICAgICAgPGNvbXBsZXhUeXBlPgorICAgICAgICAgPHNlcXVlbmNlPgorICAgICAgICAgICAgPGVsZW1lbnQgcmVmPSJ2ZXJpZmllciIvPgorICAgICAgICAgPC9zZXF1ZW5jZT4KKyAgICAgICAgIDxhdHRyaWJ1dGUgbmFtZT0icG9pbnQiIHR5cGU9InN0cmluZyIgdXNlPSJyZXF1aXJlZCI+CisgICAgICAgICAgICA8YW5ub3RhdGlvbj4KKyAgICAgICAgICAgICAgIDxkb2N1bWVudGF0aW9uPgorICAgICAgICAgICAgICAgICAgYSBmdWxseSBxdWFsaWZpZWQgaWRlbnRpZmllciBvZiB0aGUgdGFyZ2V0IGV4dGVuc2lvbiBwb2ludAorICAgICAgICAgICAgICAgPC9kb2N1bWVudGF0aW9uPgorICAgICAgICAgICAgPC9hbm5vdGF0aW9uPgorICAgICAgICAgPC9hdHRyaWJ1dGU+CisgICAgICAgICA8YXR0cmlidXRlIG5hbWU9ImlkIiB0eXBlPSJzdHJpbmciPgorICAgICAgICAgICAgPGFubm90YXRpb24+CisgICAgICAgICAgICAgICA8ZG9jdW1lbnRhdGlvbj4KKyAgICAgICAgICAgICAgICAgIGFuIG9wdGlvbmFsIGlkZW50aWZpZXIgb2YgdGhlIGV4dGVuc2lvbiBpbnN0YW5jZQorICAgICAgICAgICAgICAgPC9kb2N1bWVudGF0aW9uPgorICAgICAgICAgICAgPC9hbm5vdGF0aW9uPgorICAgICAgICAgPC9hdHRyaWJ1dGU+CisgICAgICAgICA8YXR0cmlidXRlIG5hbWU9Im5hbWUiIHR5cGU9InN0cmluZyI+CisgICAgICAgICAgICA8YW5ub3RhdGlvbj4KKyAgICAgICAgICAgICAgIDxkb2N1bWVudGF0aW9uPgorICAgICAgICAgICAgICAgICAgYW4gb3B0aW9uYWwgbmFtZSBvZiB0aGUgZXh0ZW5zaW9uIGluc3RhbmNlCisgICAgICAgICAgICAgICA8L2RvY3VtZW50YXRpb24+CisgICAgICAgICAgICA8L2Fubm90YXRpb24+CisgICAgICAgICA8L2F0dHJpYnV0ZT4KKyAgICAgIDwvY29tcGxleFR5cGU+CisgICA8L2VsZW1lbnQ+CisKKyAgIDxlbGVtZW50IG5hbWU9InZlcmlmaWVyIj4KKyAgICAgIDxjb21wbGV4VHlwZT4KKyAgICAgICAgIDxzZXF1ZW5jZT4KKyAgICAgICAgICAgIDxlbGVtZW50IHJlZj0icnVudGltZSIgbWluT2NjdXJzPSIxIiBtYXhPY2N1cnM9InVuYm91bmRlZCIvPgorICAgICAgICAgICAgPGVsZW1lbnQgcmVmPSJjb21wb25lbnQiLz4KKyAgICAgICAgIDwvc2VxdWVuY2U+CisgICAgICAgICA8YXR0cmlidXRlIG5hbWU9ImNsYXNzIiB0eXBlPSJzdHJpbmciIHVzZT0icmVxdWlyZWQiPgorICAgICAgICAgICAgPGFubm90YXRpb24+CisgICAgICAgICAgICAgICA8ZG9jdW1lbnRhdGlvbj4KKyAgICAgICAgICAgICAgICAgIHRoZSBxdWFsaWZpZWQgbmFtZSBvZiB0aGUgY2xhc3MgdG8gYmUgdXNlZCBhcyB0aGUgdmVyaWZpZXIKKyAgICAgICAgICAgICAgIDwvZG9jdW1lbnRhdGlvbj4KKyAgICAgICAgICAgICAgIDxhcHBJbmZvPgorICAgICAgICAgICAgICAgICAgPG1ldGEuYXR0cmlidXRlIGtpbmQ9ImphdmEiIGJhc2VkT249IkFic3RyYWN0RGVwbG95bWVudEFzc2VtYmx5VmVyaWZpZXI6Ii8+CisgICAgICAgICAgICAgICA8L2FwcEluZm8+CisgICAgICAgICAgICA8L2Fubm90YXRpb24+CisgICAgICAgICA8L2F0dHJpYnV0ZT4KKyAgICAgIDwvY29tcGxleFR5cGU+CisgICA8L2VsZW1lbnQ+CisKKyAgIDxlbGVtZW50IG5hbWU9InJ1bnRpbWUiPgorICAgICAgPGNvbXBsZXhUeXBlPgorICAgICAgICAgPGF0dHJpYnV0ZSBuYW1lPSJydW50aW1lX3NlcnZlcl9pZCIgdHlwZT0ic3RyaW5nIiB1c2U9InJlcXVpcmVkIj4KKyAgICAgICAgICAgIDxhbm5vdGF0aW9uPgorICAgICAgICAgICAgICAgPGRvY3VtZW50YXRpb24+CisgICAgICAgICAgICAgICAgICB0aGUgcnVudGltZSBzZXJ2ZXIgaWQgZm9yIHRoaXMgdmVyaWZpZXIKKyAgICAgICAgICAgICAgIDwvZG9jdW1lbnRhdGlvbj4KKyAgICAgICAgICAgIDwvYW5ub3RhdGlvbj4KKyAgICAgICAgIDwvYXR0cmlidXRlPgorICAgICAgPC9jb21wbGV4VHlwZT4KKyAgIDwvZWxlbWVudD4KKworICAgPGVsZW1lbnQgbmFtZT0iY29tcG9uZW50Ij4KKyAgICAgIDxjb21wbGV4VHlwZT4KKyAgICAgICAgIDxhdHRyaWJ1dGUgbmFtZT0iY29tcG9uZW50X3R5cGUiIHR5cGU9InN0cmluZyIgdXNlPSJyZXF1aXJlZCI+CisgICAgICAgICAgICA8YW5ub3RhdGlvbj4KKyAgICAgICAgICAgICAgIDxkb2N1bWVudGF0aW9uPgorICAgICAgICAgICAgICAgICAgdGhlIHN1cHBvcnRlZCBjb21wb25lbnQgdHlwZSBmb3IgdGhpcyB2ZXJpZmllcih1c2VzIGZhY2V0IGlkKQorICAgICAgICAgICAgICAgPC9kb2N1bWVudGF0aW9uPgorICAgICAgICAgICAgPC9hbm5vdGF0aW9uPgorICAgICAgICAgPC9hdHRyaWJ1dGU+CisgICAgICA8L2NvbXBsZXhUeXBlPgorICAgPC9lbGVtZW50PgorCisgICA8YW5ub3RhdGlvbj4KKyAgICAgIDxhcHBJbmZvPgorICAgICAgICAgPG1ldGEuc2VjdGlvbiB0eXBlPSJzaW5jZSIvPgorICAgICAgPC9hcHBJbmZvPgorICAgICAgPGRvY3VtZW50YXRpb24+CisgICAgICAgICAmbHQ7YiZndDtUaGlzIGV4dGVuc2lvbiBwb2ludCBpcyBwYXJ0IG9mIGFuIGludGVyaW0gQVBJIHRoYXQgaXMgc3RpbGwgdW5kZXIgZGV2ZWxvcG1lbnQgYW5kIGV4cGVjdGVkIHRvIGNoYW5nZSBzaWduaWZpY2FudGx5IGJlZm9yZSByZWFjaGluZyBzdGFiaWxpdHkuIEl0IGlzIGJlaW5nIG1hZGUgYXZhaWxhYmxlIGF0IHRoaXMgZWFybHkgc3RhZ2UgdG8gc29saWNpdCBmZWVkYmFjayBmcm9tIHBpb25lZXJpbmcgYWRvcHRlcnMgb24gdGhlIHVuZGVyc3RhbmRpbmcgdGhhdCBhbnkgY29kZSB0aGF0IHVzZXMgdGhpcyBBUEkgd2lsbCBhbG1vc3QgY2VydGFpbmx5IGJlIGJyb2tlbiAocmVwZWF0ZWRseSkgYXMgdGhlIEFQSSBldm9sdmVzLiZsdDsvYiZndDsKKyAgICAgIDwvZG9jdW1lbnRhdGlvbj4KKyAgIDwvYW5ub3RhdGlvbj4KKworCisKKworICAgPGFubm90YXRpb24+CisgICAgICA8YXBwSW5mbz4KKyAgICAgICAgIDxtZXRhLnNlY3Rpb24gdHlwZT0iY29weXJpZ2h0Ii8+CisgICAgICA8L2FwcEluZm8+CisgICAgICA8ZG9jdW1lbnRhdGlvbj4KKyAgICAgICAgIENvcHlyaWdodCAoYykgMjAxMCBJQk0gQ29ycG9yYXRpb24gYW5kIG90aGVycy4mbHQ7YnImZ3Q7CitBbGwgcmlnaHRzIHJlc2VydmVkLiBUaGlzIHByb2dyYW0gYW5kIHRoZSBhY2NvbXBhbnlpbmcgbWF0ZXJpYWxzIGFyZSBtYWRlIAorYXZhaWxhYmxlIHVuZGVyIHRoZSB0ZXJtcyBvZiB0aGUgRWNsaXBzZSBQdWJsaWMgTGljZW5zZSB2MS4wIHdoaWNoIGFjY29tcGFuaWVzIAordGhpcyBkaXN0cmlidXRpb24sIGFuZCBpcyBhdmFpbGFibGUgYXQgJmx0O2EKK2hyZWY9JnF1b3Q7aHR0cDovL3d3dy5lY2xpcHNlLm9yZy9sZWdhbC9lcGwtdjEwLmh0bWwmcXVvdDsmZ3Q7aHR0cDovL3d3dy5lY2xpcHNlLm9yZy9sZWdhbC9lcGwtdjEwLmh0bWwmbHQ7L2EmZ3Q7CisgICAgICA8L2RvY3VtZW50YXRpb24+CisgICA8L2Fubm90YXRpb24+CisKKzwvc2NoZW1hPgpkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUudWkvc2NoZW1hL21vZHVsZURlcGVuZGVuY3lQcm9wZXJ0eVBhZ2UuZXhzZCBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlLnVpL3NjaGVtYS9tb2R1bGVEZXBlbmRlbmN5UHJvcGVydHlQYWdlLmV4c2QKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uNzU2MmE2OAotLS0gL2Rldi9udWxsCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlLnVpL3NjaGVtYS9tb2R1bGVEZXBlbmRlbmN5UHJvcGVydHlQYWdlLmV4c2QKQEAgLTAsMCArMSwxMDggQEAKKzw/eG1sIHZlcnNpb249JzEuMCcgZW5jb2Rpbmc9J1VURi04Jz8+Cis8IS0tIFNjaGVtYSBmaWxlIHdyaXR0ZW4gYnkgUERFIC0tPgorPHNjaGVtYSB0YXJnZXROYW1lc3BhY2U9Im9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS51aSIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDEvWE1MU2NoZW1hIj4KKzxhbm5vdGF0aW9uPgorICAgICAgPGFwcGluZm8+CisgICAgICAgICA8bWV0YS5zY2hlbWEgcGx1Z2luPSJvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUudWkiIGlkPSJtb2R1bGVEZXBlbmRlbmN5UHJvcGVydHlQYWdlIiBuYW1lPSJtb2R1bGVEZXBlbmRlbmN5UHJvcGVydHlQYWdlIi8+CisgICAgICA8L2FwcGluZm8+CisgICAgICA8ZG9jdW1lbnRhdGlvbj4KKyAgICAgICAgIFtFbnRlciBkZXNjcmlwdGlvbiBvZiB0aGlzIGV4dGVuc2lvbiBwb2ludC5dCisgICAgICA8L2RvY3VtZW50YXRpb24+CisgICA8L2Fubm90YXRpb24+CisKKyAgIDxlbGVtZW50IG5hbWU9ImV4dGVuc2lvbiI+CisgICAgICA8YW5ub3RhdGlvbj4KKyAgICAgICAgIDxhcHBpbmZvPgorICAgICAgICAgPC9hcHBpbmZvPgorICAgICAgPC9hbm5vdGF0aW9uPgorICAgICAgPGNvbXBsZXhUeXBlPgorICAgICAgICAgPHNlcXVlbmNlIG1pbk9jY3Vycz0iMSIgbWF4T2NjdXJzPSJ1bmJvdW5kZWQiPgorICAgICAgICAgICAgPGVsZW1lbnQgcmVmPSJkZXBlbmRlbmN5UGFnZSIvPgorICAgICAgICAgPC9zZXF1ZW5jZT4KKyAgICAgICAgIDxhdHRyaWJ1dGUgbmFtZT0icG9pbnQiIHR5cGU9InN0cmluZyIgdXNlPSJyZXF1aXJlZCI+CisgICAgICAgICAgICA8YW5ub3RhdGlvbj4KKyAgICAgICAgICAgICAgIDxkb2N1bWVudGF0aW9uPgorICAgICAgICAgICAgICAgICAgCisgICAgICAgICAgICAgICA8L2RvY3VtZW50YXRpb24+CisgICAgICAgICAgICA8L2Fubm90YXRpb24+CisgICAgICAgICA8L2F0dHJpYnV0ZT4KKyAgICAgICAgIDxhdHRyaWJ1dGUgbmFtZT0iaWQiIHR5cGU9InN0cmluZyI+CisgICAgICAgICAgICA8YW5ub3RhdGlvbj4KKyAgICAgICAgICAgICAgIDxkb2N1bWVudGF0aW9uPgorICAgICAgICAgICAgICAgICAgCisgICAgICAgICAgICAgICA8L2RvY3VtZW50YXRpb24+CisgICAgICAgICAgICA8L2Fubm90YXRpb24+CisgICAgICAgICA8L2F0dHJpYnV0ZT4KKyAgICAgICAgIDxhdHRyaWJ1dGUgbmFtZT0ibmFtZSIgdHlwZT0ic3RyaW5nIj4KKyAgICAgICAgICAgIDxhbm5vdGF0aW9uPgorICAgICAgICAgICAgICAgPGRvY3VtZW50YXRpb24+CisgICAgICAgICAgICAgICAgICAKKyAgICAgICAgICAgICAgIDwvZG9jdW1lbnRhdGlvbj4KKyAgICAgICAgICAgICAgIDxhcHBpbmZvPgorICAgICAgICAgICAgICAgICAgPG1ldGEuYXR0cmlidXRlIHRyYW5zbGF0YWJsZT0idHJ1ZSIvPgorICAgICAgICAgICAgICAgPC9hcHBpbmZvPgorICAgICAgICAgICAgPC9hbm5vdGF0aW9uPgorICAgICAgICAgPC9hdHRyaWJ1dGU+CisgICAgICA8L2NvbXBsZXhUeXBlPgorICAgPC9lbGVtZW50PgorCisgICA8ZWxlbWVudCBuYW1lPSJkZXBlbmRlbmN5UGFnZSI+CisgICAgICA8Y29tcGxleFR5cGU+CisgICAgICAgICA8YXR0cmlidXRlIG5hbWU9ImlkIiB0eXBlPSJzdHJpbmciIHVzZT0icmVxdWlyZWQiPgorICAgICAgICAgICAgPGFubm90YXRpb24+CisgICAgICAgICAgICAgICA8ZG9jdW1lbnRhdGlvbj4KKyAgICAgICAgICAgICAgICAgIAorICAgICAgICAgICAgICAgPC9kb2N1bWVudGF0aW9uPgorICAgICAgICAgICAgPC9hbm5vdGF0aW9uPgorICAgICAgICAgPC9hdHRyaWJ1dGU+CisgICAgICAgICA8YXR0cmlidXRlIG5hbWU9ImNsYXNzIiB0eXBlPSJzdHJpbmciIHVzZT0icmVxdWlyZWQiPgorICAgICAgICAgICAgPGFubm90YXRpb24+CisgICAgICAgICAgICAgICA8ZG9jdW1lbnRhdGlvbj4KKyAgICAgICAgICAgICAgICAgIAorICAgICAgICAgICAgICAgPC9kb2N1bWVudGF0aW9uPgorICAgICAgICAgICAgICAgPGFwcGluZm8+CisgICAgICAgICAgICAgICAgICA8bWV0YS5hdHRyaWJ1dGUga2luZD0iamF2YSIgYmFzZWRPbj0iOm9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS51aS5wcm9wZXJ0eXBhZ2UuSURlcGVuZGVuY3lQYWdlUHJvdmlkZXIiLz4KKyAgICAgICAgICAgICAgIDwvYXBwaW5mbz4KKyAgICAgICAgICAgIDwvYW5ub3RhdGlvbj4KKyAgICAgICAgIDwvYXR0cmlidXRlPgorICAgICAgPC9jb21wbGV4VHlwZT4KKyAgIDwvZWxlbWVudD4KKworICAgPGFubm90YXRpb24+CisgICAgICA8YXBwaW5mbz4KKyAgICAgICAgIDxtZXRhLnNlY3Rpb24gdHlwZT0ic2luY2UiLz4KKyAgICAgIDwvYXBwaW5mbz4KKyAgICAgIDxkb2N1bWVudGF0aW9uPgorICAgICAgICAgW0VudGVyIHRoZSBmaXJzdCByZWxlYXNlIGluIHdoaWNoIHRoaXMgZXh0ZW5zaW9uIHBvaW50IGFwcGVhcnMuXQorICAgICAgPC9kb2N1bWVudGF0aW9uPgorICAgPC9hbm5vdGF0aW9uPgorCisgICA8YW5ub3RhdGlvbj4KKyAgICAgIDxhcHBpbmZvPgorICAgICAgICAgPG1ldGEuc2VjdGlvbiB0eXBlPSJleGFtcGxlcyIvPgorICAgICAgPC9hcHBpbmZvPgorICAgICAgPGRvY3VtZW50YXRpb24+CisgICAgICAgICBbRW50ZXIgZXh0ZW5zaW9uIHBvaW50IHVzYWdlIGV4YW1wbGUgaGVyZS5dCisgICAgICA8L2RvY3VtZW50YXRpb24+CisgICA8L2Fubm90YXRpb24+CisKKyAgIDxhbm5vdGF0aW9uPgorICAgICAgPGFwcGluZm8+CisgICAgICAgICA8bWV0YS5zZWN0aW9uIHR5cGU9ImFwaWluZm8iLz4KKyAgICAgIDwvYXBwaW5mbz4KKyAgICAgIDxkb2N1bWVudGF0aW9uPgorICAgICAgICAgW0VudGVyIEFQSSBpbmZvcm1hdGlvbiBoZXJlLl0KKyAgICAgIDwvZG9jdW1lbnRhdGlvbj4KKyAgIDwvYW5ub3RhdGlvbj4KKworICAgPGFubm90YXRpb24+CisgICAgICA8YXBwaW5mbz4KKyAgICAgICAgIDxtZXRhLnNlY3Rpb24gdHlwZT0iaW1wbGVtZW50YXRpb24iLz4KKyAgICAgIDwvYXBwaW5mbz4KKyAgICAgIDxkb2N1bWVudGF0aW9uPgorICAgICAgICAgW0VudGVyIGluZm9ybWF0aW9uIGFib3V0IHN1cHBsaWVkIGltcGxlbWVudGF0aW9uIG9mIHRoaXMgZXh0ZW5zaW9uIHBvaW50Ll0KKyAgICAgIDwvZG9jdW1lbnRhdGlvbj4KKyAgIDwvYW5ub3RhdGlvbj4KKworCis8L3NjaGVtYT4KZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlLnVpL3NjaGVtYS9yZWZlcmVuY2VXaXphcmRGcmFnbWVudC5leHNkIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUudWkvc2NoZW1hL3JlZmVyZW5jZVdpemFyZEZyYWdtZW50LmV4c2QKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uZGJlMmRiNQotLS0gL2Rldi9udWxsCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlLnVpL3NjaGVtYS9yZWZlcmVuY2VXaXphcmRGcmFnbWVudC5leHNkCkBAIC0wLDAgKzEsMTMzIEBACis8P3htbCB2ZXJzaW9uPScxLjAnIGVuY29kaW5nPSdVVEYtOCc/PgorPCEtLSBTY2hlbWEgZmlsZSB3cml0dGVuIGJ5IFBERSAtLT4KKzxzY2hlbWEgdGFyZ2V0TmFtZXNwYWNlPSJvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUudWkiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAxL1hNTFNjaGVtYSI+Cis8YW5ub3RhdGlvbj4KKyAgICAgIDxhcHBpbmZvPgorICAgICAgICAgPG1ldGEuc2NoZW1hIHBsdWdpbj0ib3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb21wb25lbnRjb3JlLnVpIiBpZD0icmVmZXJlbmNlV2l6YXJkRnJhZ21lbnQiIG5hbWU9InJlZmVyZW5jZVdpemFyZEZyYWdtZW50Ii8+CisgICAgICA8L2FwcGluZm8+CisgICAgICA8ZG9jdW1lbnRhdGlvbj4KKyAgICAgICAgIFtFbnRlciBkZXNjcmlwdGlvbiBvZiB0aGlzIGV4dGVuc2lvbiBwb2ludC5dCisgICAgICA8L2RvY3VtZW50YXRpb24+CisgICA8L2Fubm90YXRpb24+CisKKyAgIDxlbGVtZW50IG5hbWU9ImV4dGVuc2lvbiI+CisgICAgICA8YW5ub3RhdGlvbj4KKyAgICAgICAgIDxhcHBpbmZvPgorICAgICAgICAgICAgPG1ldGEuZWxlbWVudCBpbnRlcm5hbD0idHJ1ZSIgLz4KKyAgICAgICAgIDwvYXBwaW5mbz4KKyAgICAgIDwvYW5ub3RhdGlvbj4KKyAgICAgIDxjb21wbGV4VHlwZT4KKyAgICAgICAgIDxzZXF1ZW5jZSBtaW5PY2N1cnM9IjEiIG1heE9jY3Vycz0idW5ib3VuZGVkIj4KKyAgICAgICAgICAgIDxlbGVtZW50IHJlZj0icmVmZXJlbmNlRnJhZ21lbnQiLz4KKyAgICAgICAgIDwvc2VxdWVuY2U+CisgICAgICAgICA8YXR0cmlidXRlIG5hbWU9InBvaW50IiB0eXBlPSJzdHJpbmciIHVzZT0icmVxdWlyZWQiPgorICAgICAgICAgICAgPGFubm90YXRpb24+CisgICAgICAgICAgICAgICA8ZG9jdW1lbnRhdGlvbj4KKyAgICAgICAgICAgICAgICAgIAorICAgICAgICAgICAgICAgPC9kb2N1bWVudGF0aW9uPgorICAgICAgICAgICAgPC9hbm5vdGF0aW9uPgorICAgICAgICAgPC9hdHRyaWJ1dGU+CisgICAgICAgICA8YXR0cmlidXRlIG5hbWU9ImlkIiB0eXBlPSJzdHJpbmciPgorICAgICAgICAgICAgPGFubm90YXRpb24+CisgICAgICAgICAgICAgICA8ZG9jdW1lbnRhdGlvbj4KKyAgICAgICAgICAgICAgICAgIAorICAgICAgICAgICAgICAgPC9kb2N1bWVudGF0aW9uPgorICAgICAgICAgICAgPC9hbm5vdGF0aW9uPgorICAgICAgICAgPC9hdHRyaWJ1dGU+CisgICAgICAgICA8YXR0cmlidXRlIG5hbWU9Im5hbWUiIHR5cGU9InN0cmluZyI+CisgICAgICAgICAgICA8YW5ub3RhdGlvbj4KKyAgICAgICAgICAgICAgIDxkb2N1bWVudGF0aW9uPgorICAgICAgICAgICAgICAgICAgCisgICAgICAgICAgICAgICA8L2RvY3VtZW50YXRpb24+CisgICAgICAgICAgICAgICA8YXBwaW5mbz4KKyAgICAgICAgICAgICAgICAgIDxtZXRhLmF0dHJpYnV0ZSB0cmFuc2xhdGFibGU9InRydWUiLz4KKyAgICAgICAgICAgICAgIDwvYXBwaW5mbz4KKyAgICAgICAgICAgIDwvYW5ub3RhdGlvbj4KKyAgICAgICAgIDwvYXR0cmlidXRlPgorICAgICAgPC9jb21wbGV4VHlwZT4KKyAgIDwvZWxlbWVudD4KKworICAgPGVsZW1lbnQgbmFtZT0icmVmZXJlbmNlRnJhZ21lbnQiPgorICAgICAgPGNvbXBsZXhUeXBlPgorICAgICAgICAgPGF0dHJpYnV0ZSBuYW1lPSJpZCIgdHlwZT0ic3RyaW5nIiB1c2U9InJlcXVpcmVkIj4KKyAgICAgICAgICAgIDxhbm5vdGF0aW9uPgorICAgICAgICAgICAgICAgPGRvY3VtZW50YXRpb24+CisgICAgICAgICAgICAgICAgICAKKyAgICAgICAgICAgICAgIDwvZG9jdW1lbnRhdGlvbj4KKyAgICAgICAgICAgIDwvYW5ub3RhdGlvbj4KKyAgICAgICAgIDwvYXR0cmlidXRlPgorICAgICAgICAgPGF0dHJpYnV0ZSBuYW1lPSJuYW1lIiB0eXBlPSJzdHJpbmciIHVzZT0icmVxdWlyZWQiPgorICAgICAgICAgICAgPGFubm90YXRpb24+CisgICAgICAgICAgICAgICA8ZG9jdW1lbnRhdGlvbj4KKyAgICAgICAgICAgICAgICAgIFRoZSBuYW1lIHdpbGwgYmUgZGlzcGxheWVkIGluIHRoZSBVSSwgaW5zaWRlIHRoZSB2aWV3ZXIKKyAgICAgICAgICAgICAgIDwvZG9jdW1lbnRhdGlvbj4KKyAgICAgICAgICAgIDwvYW5ub3RhdGlvbj4KKyAgICAgICAgIDwvYXR0cmlidXRlPgorICAgICAgICAgPGF0dHJpYnV0ZSBuYW1lPSJpY29uIiB0eXBlPSJzdHJpbmciPgorICAgICAgICAgICAgPGFubm90YXRpb24+CisgICAgICAgICAgICAgICA8ZG9jdW1lbnRhdGlvbj4KKyAgICAgICAgICAgICAgICAgIAorICAgICAgICAgICAgICAgPC9kb2N1bWVudGF0aW9uPgorICAgICAgICAgICAgICAgPGFwcGluZm8+CisgICAgICAgICAgICAgICAgICA8bWV0YS5hdHRyaWJ1dGUga2luZD0icmVzb3VyY2UiLz4KKyAgICAgICAgICAgICAgIDwvYXBwaW5mbz4KKyAgICAgICAgICAgIDwvYW5ub3RhdGlvbj4KKyAgICAgICAgIDwvYXR0cmlidXRlPgorICAgICAgICAgPGF0dHJpYnV0ZSBuYW1lPSJjbGFzcyIgdHlwZT0ic3RyaW5nIiB1c2U9InJlcXVpcmVkIj4KKyAgICAgICAgICAgIDxhbm5vdGF0aW9uPgorICAgICAgICAgICAgICAgPGRvY3VtZW50YXRpb24+CisgICAgICAgICAgICAgICAgICAKKyAgICAgICAgICAgICAgIDwvZG9jdW1lbnRhdGlvbj4KKyAgICAgICAgICAgICAgIDxhcHBpbmZvPgorICAgICAgICAgICAgICAgICAgPG1ldGEuYXR0cmlidXRlIGtpbmQ9ImphdmEiIGJhc2VkT249Im9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS51aS5pbnRlcm5hbC50YXNrd2l6YXJkLldpemFyZEZyYWdtZW50OiIvPgorICAgICAgICAgICAgICAgPC9hcHBpbmZvPgorICAgICAgICAgICAgPC9hbm5vdGF0aW9uPgorICAgICAgICAgPC9hdHRyaWJ1dGU+CisgICAgICAgICA8YXR0cmlidXRlIG5hbWU9ImhpZGRlbiIgdHlwZT0iYm9vbGVhbiI+CisgICAgICAgICAgICA8YW5ub3RhdGlvbj4KKyAgICAgICAgICAgICAgIDxkb2N1bWVudGF0aW9uPgorICAgICAgICAgICAgICAgICAgVHJ1ZSBpZiB0aGlzIHJlZmVyZW5jZSB0eXBlIHNob3VsZCBiZSBoaWRkZW4gYW5kIE5PVCBleHBvc2VkIGFzIGEgcG9zc2libGUgcmVmZXJlbmNlIGZvciBhbGwgdmlydHVhbCBjb21wb25lbnRzLCBmYWxzZSBpZiBpdCB3aWxsIGJlIGhpZGRlbiBhbmQgYWRkZWQgbWFudWFsbHkgdG8gcmVsZXZhbnQgY29tcG9uZW50cyZhcG9zOyByZWZlcmVuY2Ugd2l6YXJkcy4KKyAgICAgICAgICAgICAgIDwvZG9jdW1lbnRhdGlvbj4KKyAgICAgICAgICAgIDwvYW5ub3RhdGlvbj4KKyAgICAgICAgIDwvYXR0cmlidXRlPgorICAgICAgPC9jb21wbGV4VHlwZT4KKyAgIDwvZWxlbWVudD4KKworICAgPGFubm90YXRpb24+CisgICAgICA8YXBwaW5mbz4KKyAgICAgICAgIDxtZXRhLnNlY3Rpb24gdHlwZT0ic2luY2UiLz4KKyAgICAgIDwvYXBwaW5mbz4KKyAgICAgIDxkb2N1bWVudGF0aW9uPgorICAgICAgICAgW0VudGVyIHRoZSBmaXJzdCByZWxlYXNlIGluIHdoaWNoIHRoaXMgZXh0ZW5zaW9uIHBvaW50IGFwcGVhcnMuXQorICAgICAgPC9kb2N1bWVudGF0aW9uPgorICAgPC9hbm5vdGF0aW9uPgorCisgICA8YW5ub3RhdGlvbj4KKyAgICAgIDxhcHBpbmZvPgorICAgICAgICAgPG1ldGEuc2VjdGlvbiB0eXBlPSJleGFtcGxlcyIvPgorICAgICAgPC9hcHBpbmZvPgorICAgICAgPGRvY3VtZW50YXRpb24+CisgICAgICAgICBbRW50ZXIgZXh0ZW5zaW9uIHBvaW50IHVzYWdlIGV4YW1wbGUgaGVyZS5dCisgICAgICA8L2RvY3VtZW50YXRpb24+CisgICA8L2Fubm90YXRpb24+CisKKyAgIDxhbm5vdGF0aW9uPgorICAgICAgPGFwcGluZm8+CisgICAgICAgICA8bWV0YS5zZWN0aW9uIHR5cGU9ImFwaWluZm8iLz4KKyAgICAgIDwvYXBwaW5mbz4KKyAgICAgIDxkb2N1bWVudGF0aW9uPgorICAgICAgICAgW0VudGVyIEFQSSBpbmZvcm1hdGlvbiBoZXJlLl0KKyAgICAgIDwvZG9jdW1lbnRhdGlvbj4KKyAgIDwvYW5ub3RhdGlvbj4KKworICAgPGFubm90YXRpb24+CisgICAgICA8YXBwaW5mbz4KKyAgICAgICAgIDxtZXRhLnNlY3Rpb24gdHlwZT0iaW1wbGVtZW50YXRpb24iLz4KKyAgICAgIDwvYXBwaW5mbz4KKyAgICAgIDxkb2N1bWVudGF0aW9uPgorICAgICAgICAgW0VudGVyIGluZm9ybWF0aW9uIGFib3V0IHN1cHBsaWVkIGltcGxlbWVudGF0aW9uIG9mIHRoaXMgZXh0ZW5zaW9uIHBvaW50Ll0KKyAgICAgIDwvZG9jdW1lbnRhdGlvbj4KKyAgIDwvYW5ub3RhdGlvbj4KKworCis8L3NjaGVtYT4KZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlLnVpL3NjaGVtYS92aXJ0dWFsQ29tcG9uZW50TGFiZWxQcm92aWRlci5leHNkIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUudWkvc2NoZW1hL3ZpcnR1YWxDb21wb25lbnRMYWJlbFByb3ZpZGVyLmV4c2QKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uMDdkODdhOAotLS0gL2Rldi9udWxsCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlLnVpL3NjaGVtYS92aXJ0dWFsQ29tcG9uZW50TGFiZWxQcm92aWRlci5leHNkCkBAIC0wLDAgKzEsMTA5IEBACis8P3htbCB2ZXJzaW9uPScxLjAnIGVuY29kaW5nPSdVVEYtOCc/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+IHRvIHJlc2V0IChjbGVhcikgdGhlIGlkCisJICovCisJcHVibGljIHZvaWQgcHV0T2JqZWN0KFN0cmluZyBpZCwgT2JqZWN0IG9iaikgeworCQltYXAucHV0KGlkLCBvYmopOworCX0KK30KZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlLnVpL3NyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2NvbXBvbmVudGNvcmUvdWkvSU1vZHVsZUNvcmVVSUNvbnRleHRJZHMuamF2YSBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlLnVpL3NyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2NvbXBvbmVudGNvcmUvdWkvSU1vZHVsZUNvcmVVSUNvbnRleHRJZHMuamF2YQpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi5mNTI2YzY2Ci0tLSAvZGV2L251bGwKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUudWkvc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vY29tcG9uZW50Y29yZS91aS9JTW9kdWxlQ29yZVVJQ29udGV4dElkcy5qYXZhCkBAIC0wLDAgKzEsMjIgQEAKKy8qKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqCisgKiBDb3B5cmlnaHQgKGMpIDIwMDMsIDIwMTAgSUJNIENvcnBvcmF0aW9uIGFuZCBvdGhlcnMuCisgKiBBbGwgcmlnaHRzIHJlc2VydmVkLiBUaGlzIHByb2dyYW0gYW5kIHRoZSBhY2NvbXBhbnlpbmcgbWF0ZXJpYWxzCisgKiBhcmUgbWFkZSBhdmFpbGFibGUgdW5kZXIgdGhlIHRlcm1zIG9mIHRoZSBFY2xpcHNlIFB1YmxpYyBMaWNlbnNlIHYxLjAKKyAqIHdoaWNoIGFjY29tcGFuaWVzIHRoaXMgZGlzdHJpYnV0aW9uLCBhbmQgaXMgYXZhaWxhYmxlIGF0CisgKiBodHRwOi8vd3d3LmVjbGlwc2Uub3JnL2xlZ2FsL2VwbC12MTAuaHRtbAorICoKKyAqIENvbnRyaWJ1dG9yczoKKyAqIElCTSBDb3Jwb3JhdGlvbiAtIGluaXRpYWwgQVBJIGFuZCBpbXBsZW1lbnRhdGlvbgorICoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKiovCitwYWNrYWdlIG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS51aTsKKworLyoqCisgKiBAYXV0aG9yOiBBaWR5bCBLYXJlaAorICovCitwdWJsaWMgaW50ZXJmYWNlIElNb2R1bGVDb3JlVUlDb250ZXh0SWRzIHsKKwkvLwkgTmV3IHJlZmVyZW5jZXMgd2l6YXJkcworCXB1YmxpYyBzdGF0aWMgZmluYWwgU3RyaW5nIERFUExPWU1FTlRfQVNTRU1CTFlfUFJFRkVSRU5DRV9QQUdFX0FERF9ORVdfUkVGRVJFTkNFX1AxID0gTW9kdWxlQ29yZVVJUGx1Z2luLlBMVUdJTl9JRCArICIuREVQTE9ZTUVOVF9BU1NFTUJMWV9QUkVGRVJFTkNFX1BBR0VfQUREX05FV19SRUZFUkVOQ0VfUDEiOyAvLyROT04tTkxTLTEkCisJcHVibGljIHN0YXRpYyBmaW5hbCBTdHJpbmcgREVQTE9ZTUVOVF9BU1NFTUJMWV9QUkVGRVJFTkNFX1BBR0VfQUREX05FV19QUk9KRUNUX1JFRkVSRU5DRV9QMSA9IE1vZHVsZUNvcmVVSVBsdWdpbi5QTFVHSU5fSUQgKyAiLkRFUExPWU1FTlRfQVNTRU1CTFlfUFJFRkVSRU5DRV9QQUdFX0FERF9ORVdfUFJPSkVDVF9SRUZFUkVOQ0VfUDEiOyAvLyROT04tTkxTLTEkCisJcHVibGljIHN0YXRpYyBmaW5hbCBTdHJpbmcgREVQTE9ZTUVOVF9BU1NFTUJMWV9QUkVGRVJFTkNFX1BBR0VfQUREX05FV19GT0xERVJfTUFQUElOR19QMSA9IE1vZHVsZUNvcmVVSVBsdWdpbi5QTFVHSU5fSUQgKyAiLkRFUExPWU1FTlRfQVNTRU1CTFlfUFJFRkVSRU5DRV9QQUdFX0FERF9ORVdfRk9MREVSX01BUFBJTkdfUDEiOyAvLyROT04tTkxTLTEkCisJcHVibGljIHN0YXRpYyBmaW5hbCBTdHJpbmcgREVQTE9ZTUVOVF9BU1NFTUJMWV9QUkVGRVJFTkNFX1BBR0VfREVQTE9ZTUVOVF9BU1NFTUJMWV9UQUIgPSBNb2R1bGVDb3JlVUlQbHVnaW4uUExVR0lOX0lEICsgIi5ERVBMT1lNRU5UX0FTU0VNQkxZX1BSRUZFUkVOQ0VfUEFHRV9ERVBMT1lNRU5UX0FTU0VNQkxZX1RBQiI7IC8vJE5PTi1OTFMtMSQKK30KZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlLnVpL3NyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2NvbXBvbmVudGNvcmUvdWkvTWVzc2FnZXMuamF2YSBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlLnVpL3NyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2NvbXBvbmVudGNvcmUvdWkvTWVzc2FnZXMuamF2YQpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi5kNGMzYmU2Ci0tLSAvZGV2L251bGwKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUudWkvc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vY29tcG9uZW50Y29yZS91aS9NZXNzYWdlcy5qYXZhCkBAIC0wLDAgKzEsNTYgQEAKKy8qKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqCisgKiBDb3B5cmlnaHQgKGMpIDIwMDksIDIwMTAgSUJNIENvcnBvcmF0aW9uIGFuZCBvdGhlcnMuCisgKiBBbGwgcmlnaHRzIHJlc2VydmVkLiBUaGlzIHByb2dyYW0gYW5kIHRoZSBhY2NvbXBhbnlpbmcgbWF0ZXJpYWxzCisgKiBhcmUgbWFkZSBhdmFpbGFibGUgdW5kZXIgdGhlIHRlcm1zIG9mIHRoZSBFY2xpcHNlIFB1YmxpYyBMaWNlbnNlIHYxLjAKKyAqIHdoaWNoIGFjY29tcGFuaWVzIHRoaXMgZGlzdHJpYnV0aW9uLCBhbmQgaXMgYXZhaWxhYmxlIGF0CisgKiBodHRwOi8vd3d3LmVjbGlwc2Uub3JnL2xlZ2FsL2VwbC12MTAuaHRtbAorICoKKyAqIENvbnRyaWJ1dG9yczoKKyAqICAgICBJQk0gQ29ycG9yYXRpb24gLSBJbml0aWFsIEFQSSBhbmQgaW1wbGVtZW50YXRpb24KKyAqICAgICAKKyAqIEFQSSBpbiB0aGVzZSBwYWNrYWdlcyBpcyBwcm92aXNpb25hbCBpbiB0aGlzIHJlbGVhc2UKKyAqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqLworcGFja2FnZSBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUudWk7CisKK2ltcG9ydCBvcmcuZWNsaXBzZS5vc2dpLnV0aWwuTkxTOworCitwdWJsaWMgY2xhc3MgTWVzc2FnZXMgZXh0ZW5kcyBOTFMgeworCXByaXZhdGUgc3RhdGljIGZpbmFsIFN0cmluZyBCVU5ETEVfTkFNRSA9ICJvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUudWkubWVzc2FnZXMiOyAvLyROT04tTkxTLTEkCisJcHVibGljIHN0YXRpYyBTdHJpbmcgTW9kdWxlQXNzZW1ibHlSb290UGFnZURlc2NyaXB0aW9uOworCXB1YmxpYyBzdGF0aWMgU3RyaW5nIE1vZHVsZUFzc2VtYmx5OworCXB1YmxpYyBzdGF0aWMgU3RyaW5nIEVycm9yQ2hlY2tpbmdGYWNldHM7CisJcHVibGljIHN0YXRpYyBTdHJpbmcgRXJyb3JOb3RWaXJ0dWFsQ29tcG9uZW50OworCXB1YmxpYyBzdGF0aWMgU3RyaW5nIERlcGxveW1lbnRBc3NlbWJseVZlcmlmaWVySGVscGVyXzA7CisJcHVibGljIHN0YXRpYyBTdHJpbmcgRGVwbG95UGF0aENvbHVtbjsKKwlwdWJsaWMgc3RhdGljIFN0cmluZyBTb3VyY2VDb2x1bW47CisJcHVibGljIHN0YXRpYyBTdHJpbmcgSW50ZXJuYWxMaWJKYXJXYXJuaW5nOworCXB1YmxpYyBzdGF0aWMgU3RyaW5nIEFkZEZvbGRlcjsKKwlwdWJsaWMgc3RhdGljIFN0cmluZyBBZGRGb2xkZXJFbGlwc2VzOworCXB1YmxpYyBzdGF0aWMgU3RyaW5nIEFkZEZvbGRlck1hcHBpbmdzOworCXB1YmxpYyBzdGF0aWMgU3RyaW5nIEFkZEVsbGlwc2lzOworCXB1YmxpYyBzdGF0aWMgU3RyaW5nIEVkaXRFbGxpcHNpczsKKwlwdWJsaWMgc3RhdGljIFN0cmluZyBSZW1vdmVTZWxlY3RlZDsKKwlwdWJsaWMgc3RhdGljIFN0cmluZyBKYXJUaXRsZTsKKwlwdWJsaWMgc3RhdGljIFN0cmluZyBKYXJEZXNjcmlwdGlvbjsKKwlwdWJsaWMgc3RhdGljIFN0cmluZyBFeHRlcm5hbEphclRpdGxlOworCXB1YmxpYyBzdGF0aWMgU3RyaW5nIEV4dGVybmFsSmFyRGVzY3JpcHRpb247CisJcHVibGljIHN0YXRpYyBTdHJpbmcgQnJvd3NlOworCXB1YmxpYyBzdGF0aWMgU3RyaW5nIE5ld1JlZmVyZW5jZVRpdGxlOworCXB1YmxpYyBzdGF0aWMgU3RyaW5nIE5ld1JlZmVyZW5jZURlc2NyaXB0aW9uOworCXB1YmxpYyBzdGF0aWMgU3RyaW5nIE5ld1JlZmVyZW5jZVdpemFyZDsKKwlwdWJsaWMgc3RhdGljIFN0cmluZyBQcm9qZWN0UmVmZXJlbmNlVGl0bGU7CisJcHVibGljIHN0YXRpYyBTdHJpbmcgUHJvamVjdFJlZmVyZW5jZURlc2NyaXB0aW9uOworCXB1YmxpYyBzdGF0aWMgU3RyaW5nIFZhcmlhYmxlUmVmZXJlbmNlVGl0bGU7CisJcHVibGljIHN0YXRpYyBTdHJpbmcgVmFyaWFibGVSZWZlcmVuY2VEZXNjcmlwdGlvbjsKKwlwdWJsaWMgc3RhdGljIFN0cmluZyBXaXphcmRFcnJvcjsKKwlwdWJsaWMgc3RhdGljIFN0cmluZyBQcm9qZWN0Q29udmVyc2lvbkVycm9yOworCXB1YmxpYyBzdGF0aWMgU3RyaW5nIFJldmVydDsKKwkKKwlzdGF0aWMgeworCQkvLyBpbml0aWFsaXplIHJlc291cmNlIGJ1bmRsZQorCQlOTFMuaW5pdGlhbGl6ZU1lc3NhZ2VzKEJVTkRMRV9OQU1FLCBNZXNzYWdlcy5jbGFzcyk7CisJfQorCisJcHJpdmF0ZSBNZXNzYWdlcygpIHsKKwl9Cit9CmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS51aS9zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9jb21wb25lbnRjb3JlL3VpL01vZHVsZUNvcmVVSVBsdWdpbi5qYXZhIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUudWkvc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vY29tcG9uZW50Y29yZS91aS9Nb2R1bGVDb3JlVUlQbHVnaW4uamF2YQpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi4yNzM0NTE0Ci0tLSAvZGV2L251bGwKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUudWkvc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vY29tcG9uZW50Y29yZS91aS9Nb2R1bGVDb3JlVUlQbHVnaW4uamF2YQpAQCAtMCwwICsxLDE3NCBAQAorLyoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKgorICogQ29weXJpZ2h0IChjKSAyMDA5IFJlZCBIYXQKKyAqIEFsbCByaWdodHMgcmVzZXJ2ZWQuIFRoaXMgcHJvZ3JhbSBhbmQgdGhlIGFjY29tcGFueWluZyBtYXRlcmlhbHMKKyAqIGFyZSBtYWRlIGF2YWlsYWJsZSB1bmRlciB0aGUgdGVybXMgb2YgdGhlIEVjbGlwc2UgUHVibGljIExpY2Vuc2UgdjEuMAorICogd2hpY2ggYWNjb21wYW5pZXMgdGhpcyBkaXN0cmlidXRpb24sIGFuZCBpcyBhdmFpbGFibGUgYXQKKyAqIGh0dHA6Ly93d3cuZWNsaXBzZS5vcmcvbGVnYWwvZXBsLXYxMC5odG1sCisgKgorICogQ29udHJpYnV0b3JzOgorICogICAgUm9iIFN0cnlrZXIgLSBpbml0aWFsIGltcGxlbWVudGF0aW9uIGFuZCBvbmdvaW5nIG1haW50ZW5hbmNlCisgKiAgICAKKyAqIEFQSSBpbiB0aGVzZSBwYWNrYWdlcyBpcyBwcm92aXNpb25hbCBpbiB0aGlzIHJlbGVhc2UKKyAqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKiovCitwYWNrYWdlIG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS51aTsKKworaW1wb3J0IGphdmEubmV0Lk1hbGZvcm1lZFVSTEV4Y2VwdGlvbjsKK2ltcG9ydCBqYXZhLm5ldC5VUkw7CisKK2ltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJ1bnRpbWUuQ29yZUV4Y2VwdGlvbjsKK2ltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJ1bnRpbWUuSVBhdGg7CitpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5ydW50aW1lLklTdGF0dXM7CitpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5ydW50aW1lLlBhdGg7CitpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5ydW50aW1lLlBsYXRmb3JtOworaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucnVudGltZS5TdGF0dXM7CitpbXBvcnQgb3JnLmVjbGlwc2UuamZhY2UucmVzb3VyY2UuSW1hZ2VEZXNjcmlwdG9yOworaW1wb3J0IG9yZy5lY2xpcHNlLmpmYWNlLnJlc291cmNlLkltYWdlUmVnaXN0cnk7CitpbXBvcnQgb3JnLmVjbGlwc2Uuc3d0LmdyYXBoaWNzLkltYWdlOworaW1wb3J0IG9yZy5lY2xpcHNlLnVpLnBsdWdpbi5BYnN0cmFjdFVJUGx1Z2luOworaW1wb3J0IG9yZy5vc2dpLmZyYW1ld29yay5CdW5kbGU7CitpbXBvcnQgb3JnLm9zZ2kuZnJhbWV3b3JrLkJ1bmRsZUNvbnRleHQ7CisKKy8qKgorICogVGhlIGFjdGl2YXRvciBjbGFzcyBjb250cm9scyB0aGUgcGx1Zy1pbiBsaWZlIGN5Y2xlCisgKi8KK3B1YmxpYyBjbGFzcyBNb2R1bGVDb3JlVUlQbHVnaW4gZXh0ZW5kcyBBYnN0cmFjdFVJUGx1Z2luIHsKKworCS8vIFRoZSBwbHVnLWluIElECisJcHVibGljIHN0YXRpYyBmaW5hbCBTdHJpbmcgUExVR0lOX0lEID0gIm9yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS51aSI7IC8vJE5PTi1OTFMtMSQKKwkKKwlwdWJsaWMgc3RhdGljIGZpbmFsIFN0cmluZ1tdIElDT05fRElSUyA9IG5ldyBTdHJpbmdbXXsiaWNvbnMvZnVsbC9vYmoxNiIsIC8vJE5PTi1OTFMtMSQKKwkJImljb25zL2Z1bGwvY3ZpZXcxNiIsIC8vJE5PTi1OTFMtMSQKKwkJImljb25zL2Z1bGwvY3Rvb2wxNiIsIC8vJE5PTi1OTFMtMSQKKwkJImljb25zL2Z1bGwvY2xjbDE2IiwgLy8kTk9OLU5MUy0xJAorCQkiaWNvbnMvZnVsbC9vdnIxNiIsIC8vJE5PTi1OTFMtMSQKKwkJImljb25zL2Z1bGwvZXh0cmEiLCAvLyROT04tTkxTLTEkCisJCSJpY29ucy9mdWxsL3dpemJhbiIsIC8vJE5PTi1OTFMtMSQKKwkJImljb25zIiwgLy8kTk9OLU5MUy0xJAorCQkiIn07IC8vJE5PTi1OTFMtMSQKKworCS8vIFRoZSBzaGFyZWQgaW5zdGFuY2UKKwlwcml2YXRlIHN0YXRpYyBNb2R1bGVDb3JlVUlQbHVnaW4gcGx1Z2luOworCS8qKgorCSAqIFRoZSBjb25zdHJ1Y3RvciBmb3IgdGhpcyBwbHVnaW4KKwkgKi8KKwlwdWJsaWMgTW9kdWxlQ29yZVVJUGx1Z2luKCkgeworCQlzdXBlcigpOworCX0KKworCS8qKgorCSAqIFJldHVybnMgdGhlIHNpbmdsZXRvbiBpbnN0YW5jZSBvZiB0aGlzIHBsdWdpbi4KKwkgKgorCSAqIEByZXR1cm4gb3JnLmVjbGlwc2Uud3N0LnNlcnZlci51aS5pbnRlcm5hbC5wbHVnaW4uU2VydmVyVUlQbHVnaW4KKwkgKi8KKwlwdWJsaWMgc3RhdGljIE1vZHVsZUNvcmVVSVBsdWdpbiBnZXRJbnN0YW5jZSgpIHsKKwkJcmV0dXJuIHBsdWdpbjsKKwl9CisKKwkvKgorCSAqIChub24tSmF2YWRvYykKKwkgKiBAc2VlIG9yZy5lY2xpcHNlLnVpLnBsdWdpbi5BYnN0cmFjdFVJUGx1Z2luI3N0YXJ0KG9yZy5vc2dpLmZyYW1ld29yay5CdW5kbGVDb250ZXh0KQorCSAqLworCXB1YmxpYyB2b2lkIHN0YXJ0KEJ1bmRsZUNvbnRleHQgY29udGV4dCkgdGhyb3dzIEV4Y2VwdGlvbiB7CisJCXN1cGVyLnN0YXJ0KGNvbnRleHQpOworCQlwbHVnaW4gPSB0aGlzOworCX0KKworCS8qCisJICogKG5vbi1KYXZhZG9jKQorCSAqIEBzZWUgb3JnLmVjbGlwc2UudWkucGx1Z2luLkFic3RyYWN0VUlQbHVnaW4jc3RvcChvcmcub3NnaS5mcmFtZXdvcmsuQnVuZGxlQ29udGV4dCkKKwkgKi8KKwlwdWJsaWMgdm9pZCBzdG9wKEJ1bmRsZUNvbnRleHQgY29udGV4dCkgdGhyb3dzIEV4Y2VwdGlvbiB7CisJCXBsdWdpbiA9IG51bGw7CisJCXN1cGVyLnN0b3AoY29udGV4dCk7CisJfQorCisJLyoqCisJICogR2V0IGEgLmdpZiBmcm9tIHRoZSBpbWFnZSByZWdpc3RyeS4KKwkgKi8KKwlwdWJsaWMgSW1hZ2UgZ2V0SW1hZ2UoU3RyaW5nIGtleSkgeworCQlJbWFnZVJlZ2lzdHJ5IGltYWdlUmVnaXN0cnkgPSBnZXRJbWFnZVJlZ2lzdHJ5KCk7CisJCUltYWdlIGltYWdlID0gaW1hZ2VSZWdpc3RyeS5nZXQoa2V5KTsKKwkJaWYgKGltYWdlID09IG51bGwgfHwgaW1hZ2UuaXNEaXNwb3NlZCgpKSB7CisJCQlJbWFnZURlc2NyaXB0b3IgZGVzY3JpcHRvciA9IGdldEltYWdlRGVzY3JpcHRvcihrZXkpOworCQkJaWYgKGRlc2NyaXB0b3IgIT0gbnVsbCkgeworCQkJCWltYWdlID0gZGVzY3JpcHRvci5jcmVhdGVJbWFnZSgpOworCQkJCWltYWdlUmVnaXN0cnkucHV0KGtleSwgaW1hZ2UpOworCQkJfQorCQl9CisJCXJldHVybiBpbWFnZTsKKwl9CisKKwkvKioKKwkgKiBUaGlzIGdldHMgYSAuZ2lmIGZyb20gdGhlIGljb25zIGZvbGRlci4KKwkgKi8KKwlwdWJsaWMgSW1hZ2VEZXNjcmlwdG9yIGdldEltYWdlRGVzY3JpcHRvcihTdHJpbmcga2V5KSB7CisJCUltYWdlRGVzY3JpcHRvciBpbWFnZURlc2NyaXB0b3IgPSBudWxsOworCQlVUkwgZ2lmSW1hZ2VVUkwgPSBnZXRJbWFnZVVSTChrZXksZ2V0QnVuZGxlKCkpOworCQlpZiAoZ2lmSW1hZ2VVUkwgIT0gbnVsbCkKKwkJCWltYWdlRGVzY3JpcHRvciA9IEltYWdlRGVzY3JpcHRvci5jcmVhdGVGcm9tVVJMKGdpZkltYWdlVVJMKTsKKwkJcmV0dXJuIGltYWdlRGVzY3JpcHRvcjsKKwl9CisKKwkvKioKKwkgKiBUaGlzIGdldHMgYSAuZ2lmIGZyb20gdGhlIGljb25zIGZvbGRlci4KKwkgKi8KKwlwdWJsaWMgVVJMIGdldEltYWdlVVJMKFN0cmluZyBrZXksIEJ1bmRsZSBidW5kbGUpIHsKKwkJU3RyaW5nIGdpZiA9ICIvIiArIGtleSArICIuZ2lmIjsgLy8kTk9OLU5MUy0xJCAvLyROT04tTkxTLTIkCisJCUlQYXRoIHBhdGggPSBudWxsOworCQlmb3IgKGludCBpID0gMDsgaSA8IElDT05fRElSUy5sZW5ndGg7IGkrKykgeworCQkJcGF0aCA9IG5ldyBQYXRoKElDT05fRElSU1tpXSkuYXBwZW5kKGdpZik7CisJCQlpZiAoUGxhdGZvcm0uZmluZChidW5kbGUscGF0aCkgPT0gbnVsbCkKKwkJCQljb250aW51ZTsKKwkJCXRyeSB7CisJCQkJcmV0dXJuIG5ldyBVUkwoIGJ1bmRsZS5nZXRFbnRyeSgiLyIpLCBwYXRoLnRvU3RyaW5nKCkpOyAvLyROT04tTkxTLTEkIAorCQkJfSBjYXRjaCAoTWFsZm9ybWVkVVJMRXhjZXB0aW9uIGV4Y2VwdGlvbikgeworCQkJCWxvZ0Vycm9yKGV4Y2VwdGlvbik7CisJCQkJY29udGludWU7CisJCQl9CisJCX0KKwkJcmV0dXJuIG51bGw7CisJfQorCisJLyoqCisJICogUmV0dXJucyB0aGUgc2hhcmVkIGluc3RhbmNlCisJICoKKwkgKiBAcmV0dXJuIHRoZSBzaGFyZWQgaW5zdGFuY2UKKwkgKi8KKwlwdWJsaWMgc3RhdGljIE1vZHVsZUNvcmVVSVBsdWdpbiBnZXREZWZhdWx0KCkgeworCQlyZXR1cm4gcGx1Z2luOworCX0KKworCXB1YmxpYyBzdGF0aWMgdm9pZCBsb2coRXhjZXB0aW9uIGUpIHsKKwkJbG9nKGUuZ2V0TWVzc2FnZSgpLCBlKTsKKwl9CisJCisJcHVibGljIHN0YXRpYyB2b2lkIGxvZyhTdHJpbmcgbWVzc2FnZSwgRXhjZXB0aW9uIGUpIHsKKwkJSVN0YXR1cyBzdGF0dXMgPSBuZXcgU3RhdHVzKElTdGF0dXMuRVJST1IsIFBMVUdJTl9JRCwgbWVzc2FnZSwgZSk7CisJCWdldERlZmF1bHQoKS5nZXRMb2coKS5sb2coc3RhdHVzKTsKKwl9CisJcHVibGljIHN0YXRpYyBJU3RhdHVzIGNyZWF0ZVN0YXR1cyhpbnQgc2V2ZXJpdHksIGludCBhQ29kZSwKKwkJCVN0cmluZyBhTWVzc2FnZSwgVGhyb3dhYmxlIGV4Y2VwdGlvbikgeworCQlyZXR1cm4gbmV3IFN0YXR1cyhzZXZlcml0eSwgUExVR0lOX0lELCBhQ29kZSwKKwkJCQlhTWVzc2FnZSAhPSBudWxsID8gYU1lc3NhZ2UgOiAiTm8gbWVzc2FnZS4iLCBleGNlcHRpb24pOyAvLyROT04tTkxTLTEkCisJfQorCXB1YmxpYyBzdGF0aWMgSVN0YXR1cyBjcmVhdGVFcnJvclN0YXR1cyhpbnQgYUNvZGUsIFN0cmluZyBhTWVzc2FnZSwKKwkJCVRocm93YWJsZSBleGNlcHRpb24pIHsKKwkJcmV0dXJuIGNyZWF0ZVN0YXR1cyhJU3RhdHVzLkVSUk9SLCBhQ29kZSwgYU1lc3NhZ2UsIGV4Y2VwdGlvbik7CisJfQorCisJcHVibGljIHN0YXRpYyBJU3RhdHVzIGNyZWF0ZVN0YXR1cyhpbnQgc2V2ZXJpdHksIFN0cmluZyBtZXNzYWdlLCBUaHJvd2FibGUgZXhjZXB0aW9uKSB7CisJCXJldHVybiBuZXcgU3RhdHVzKHNldmVyaXR5LCBQTFVHSU5fSUQsIG1lc3NhZ2UsIGV4Y2VwdGlvbik7CisJfQorCisJcHVibGljIHN0YXRpYyBJU3RhdHVzIGNyZWF0ZVN0YXR1cyhpbnQgc2V2ZXJpdHksIFN0cmluZyBtZXNzYWdlKSB7CisJCXJldHVybiBjcmVhdGVTdGF0dXMoc2V2ZXJpdHksIG1lc3NhZ2UsIG51bGwpOworCX0KKwlwdWJsaWMgc3RhdGljIHZvaWQgbG9nRXJyb3IoVGhyb3dhYmxlIGV4Y2VwdGlvbikgeworCQlQbGF0Zm9ybS5nZXRMb2coUGxhdGZvcm0uZ2V0QnVuZGxlKFBMVUdJTl9JRCkpLmxvZyggY3JlYXRlU3RhdHVzKElTdGF0dXMuRVJST1IsIGV4Y2VwdGlvbi5nZXRNZXNzYWdlKCksIGV4Y2VwdGlvbikpOworCX0KKworCXB1YmxpYyBzdGF0aWMgdm9pZCBsb2dFcnJvcihDb3JlRXhjZXB0aW9uIGV4Y2VwdGlvbikgeworCQlQbGF0Zm9ybS5nZXRMb2coUGxhdGZvcm0uZ2V0QnVuZGxlKFBMVUdJTl9JRCkpLmxvZyggZXhjZXB0aW9uLmdldFN0YXR1cygpICk7CisJfQorCit9CmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS51aS9zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9jb21wb25lbnRjb3JlL3VpL1RyYWNlLmphdmEgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS51aS9zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9jb21wb25lbnRjb3JlL3VpL1RyYWNlLmphdmEKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uOTQxZDM3NQotLS0gL2Rldi9udWxsCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlLnVpL3NyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2NvbXBvbmVudGNvcmUvdWkvVHJhY2UuamF2YQpAQCAtMCwwICsxLDkzIEBACisvKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKgorICogQ29weXJpZ2h0IChjKSAyMDAzLCAyMDA3IElCTSBDb3Jwb3JhdGlvbiBhbmQgb3RoZXJzLgorICogQWxsIHJpZ2h0cyByZXNlcnZlZC4gVGhpcyBwcm9ncmFtIGFuZCB0aGUgYWNjb21wYW55aW5nIG1hdGVyaWFscworICogYXJlIG1hZGUgYXZhaWxhYmxlIHVuZGVyIHRoZSB0ZXJtcyBvZiB0aGUgRWNsaXBzZSBQdWJsaWMgTGljZW5zZSB2MS4wCisgKiB3aGljaCBhY2NvbXBhbmllcyB0aGlzIGRpc3RyaWJ1dGlvbiwgYW5kIGlzIGF2YWlsYWJsZSBhdAorICogaHR0cDovL3d3dy5lY2xpcHNlLm9yZy9sZWdhbC9lcGwtdjEwLmh0bWwKKyAqCisgKiBDb250cmlidXRvcnM6CisgKiAgICAgSUJNIENvcnBvcmF0aW9uIC0gSW5pdGlhbCBBUEkgYW5kIGltcGxlbWVudGF0aW9uCisgKiAgICAgCisgKiBBUEkgaW4gdGhlc2UgcGFja2FnZXMgaXMgcHJvdmlzaW9uYWwgaW4gdGhpcyByZWxlYXNlCisgKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKi8KK3BhY2thZ2Ugb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb21wb25lbnRjb3JlLnVpOworCitpbXBvcnQgamF2YS50ZXh0LlNpbXBsZURhdGVGb3JtYXQ7CitpbXBvcnQgamF2YS51dGlsLkRhdGU7CitpbXBvcnQgamF2YS51dGlsLkhhc2hTZXQ7CitpbXBvcnQgamF2YS51dGlsLlNldDsKKworaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucnVudGltZS5JU3RhdHVzOworaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucnVudGltZS5TdGF0dXM7CisvKioKKyAqIEhlbHBlciBjbGFzcyB0byByb3V0ZSB0cmFjZSBvdXRwdXQuCisgKi8KK3B1YmxpYyBjbGFzcyBUcmFjZSB7CisJcHVibGljIHN0YXRpYyBmaW5hbCBieXRlIENPTkZJRyA9IDA7CisJcHVibGljIHN0YXRpYyBmaW5hbCBieXRlIElORk8gPSAxOworCXB1YmxpYyBzdGF0aWMgZmluYWwgYnl0ZSBXQVJOSU5HID0gMjsKKwlwdWJsaWMgc3RhdGljIGZpbmFsIGJ5dGUgU0VWRVJFID0gMzsKKwlwdWJsaWMgc3RhdGljIGZpbmFsIGJ5dGUgRklORVNUID0gNDsKKwlwdWJsaWMgc3RhdGljIGZpbmFsIGJ5dGUgRklORVIgPSA1OworCXB1YmxpYyBzdGF0aWMgZmluYWwgYnl0ZSBQRVJGT1JNQU5DRSA9IDY7CisJcHVibGljIHN0YXRpYyBmaW5hbCBieXRlIEVYVEVOU0lPTl9QT0lOVCA9IDc7CisKKwlwcml2YXRlIHN0YXRpYyBmaW5hbCBTdHJpbmdbXSBsZXZlbE5hbWVzID0gbmV3IFN0cmluZ1tdIHsKKwkJIkNPTkZJRyAiLCAiSU5GTyAgICIsICJXQVJOSU5HIiwgIlNFVkVSRSAiLCAiRklORVIgICIsICJGSU5FU1QgIiwgIlBFUkYgICAiLCAiRVhURU5TSU9OIn07CisKKwlwcml2YXRlIHN0YXRpYyBmaW5hbCBTaW1wbGVEYXRlRm9ybWF0IHNkZiA9IG5ldyBTaW1wbGVEYXRlRm9ybWF0KCJkZC9NTS95eSBISDptbS5zcy5TU1MiKTsKKworCXByaXZhdGUgc3RhdGljIFNldDxTdHJpbmc+IGxvZ2dlZCA9IG5ldyBIYXNoU2V0PFN0cmluZz4oKTsKKworCS8qKgorCSAqIFRyYWNlIGNvbnN0cnVjdG9yIGNvbW1lbnQuCisJICovCisJcHJpdmF0ZSBUcmFjZSgpIHsKKwkJc3VwZXIoKTsKKwl9CisKKwkvKioKKwkgKiBUcmFjZSB0aGUgZ2l2ZW4gdGV4dC4KKwkgKgorCSAqIEBwYXJhbSBsZXZlbCBhIHRyYWNlIGxldmVsCisJICogQHBhcmFtIHMgYSBtZXNzYWdlCisJICovCisJcHVibGljIHN0YXRpYyB2b2lkIHRyYWNlKGJ5dGUgbGV2ZWwsIFN0cmluZyBzKSB7CisJCXRyYWNlKGxldmVsLCBzLCBudWxsKTsKKwl9CisKKwkvKioKKwkgKiBUcmFjZSB0aGUgZ2l2ZW4gbWVzc2FnZSBhbmQgZXhjZXB0aW9uLgorCSAqCisJICogQHBhcmFtIGxldmVsIGEgdHJhY2UgbGV2ZWwKKwkgKiBAcGFyYW0gcyBhIG1lc3NhZ2UKKwkgKiBAcGFyYW0gdCBhIHRocm93YWJsZQorCSAqLworCXB1YmxpYyBzdGF0aWMgdm9pZCB0cmFjZShieXRlIGxldmVsLCBTdHJpbmcgcywgVGhyb3dhYmxlIHQpIHsKKwkJaWYgKHMgPT0gbnVsbCkKKwkJCXJldHVybjsKKwkJCisJCWlmIChsZXZlbCA9PSBTRVZFUkUpIHsKKwkJCWlmICghbG9nZ2VkLmNvbnRhaW5zKHMpKSB7CisJCQkJTW9kdWxlQ29yZVVJUGx1Z2luLmdldEluc3RhbmNlKCkuZ2V0TG9nKCkubG9nKAorCQkJCQkJbmV3IFN0YXR1cyhJU3RhdHVzLkVSUk9SLCAKKwkJCQkJCQkJTW9kdWxlQ29yZVVJUGx1Z2luLlBMVUdJTl9JRCwgcywgdCkpOworCQkJCWxvZ2dlZC5hZGQocyk7CisJCQl9CisJCX0KKwkJCisJCWlmICghTW9kdWxlQ29yZVVJUGx1Z2luLmdldEluc3RhbmNlKCkuaXNEZWJ1Z2dpbmcoKSkKKwkJCXJldHVybjsKKwkJCisJCVN0cmluZ0J1ZmZlciBzYiA9IG5ldyBTdHJpbmdCdWZmZXIoTW9kdWxlQ29yZVVJUGx1Z2luLlBMVUdJTl9JRCk7CisJCXNiLmFwcGVuZCgiICIpOworCQlzYi5hcHBlbmQobGV2ZWxOYW1lc1tsZXZlbF0pOworCQlzYi5hcHBlbmQoIiAiKTsKKwkJc2IuYXBwZW5kKHNkZi5mb3JtYXQobmV3IERhdGUoKSkpOworCQlzYi5hcHBlbmQoIiAiKTsKKwkJc2IuYXBwZW5kKHMpOworCQlTeXN0ZW0ub3V0LnByaW50bG4oc2IudG9TdHJpbmcoKSk7CisJCWlmICh0ICE9IG51bGwpCisJCQl0LnByaW50U3RhY2tUcmFjZSgpOworCX0KK30KXCBObyBuZXdsaW5lIGF0IGVuZCBvZiBmaWxlCmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS51aS9zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9jb21wb25lbnRjb3JlL3VpL2ludGVybmFsL3Byb3BlcnR5cGFnZS9BZGRGb2xkZXJEaWFsb2cuamF2YSBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlLnVpL3NyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2NvbXBvbmVudGNvcmUvdWkvaW50ZXJuYWwvcHJvcGVydHlwYWdlL0FkZEZvbGRlckRpYWxvZy5qYXZhCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLjJjOTNhMzcKLS0tIC9kZXYvbnVsbAorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS51aS9zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9jb21wb25lbnRjb3JlL3VpL2ludGVybmFsL3Byb3BlcnR5cGFnZS9BZGRGb2xkZXJEaWFsb2cuamF2YQpAQCAtMCwwICsxLDE1MSBAQAorLyoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKgorICogQ29weXJpZ2h0IChjKSAyMDA5IFJlZCBIYXQKKyAqIEFsbCByaWdodHMgcmVzZXJ2ZWQuIFRoaXMgcHJvZ3JhbSBhbmQgdGhlIGFjY29tcGFueWluZyBtYXRlcmlhbHMKKyAqIGFyZSBtYWRlIGF2YWlsYWJsZSB1bmRlciB0aGUgdGVybXMgb2YgdGhlIEVjbGlwc2UgUHVibGljIExpY2Vuc2UgdjEuMAorICogd2hpY2ggYWNjb21wYW5pZXMgdGhpcyBkaXN0cmlidXRpb24sIGFuZCBpcyBhdmFpbGFibGUgYXQKKyAqIGh0dHA6Ly93d3cuZWNsaXBzZS5vcmcvbGVnYWwvZXBsLXYxMC5odG1sCisgKgorICogQ29udHJpYnV0b3JzOgorICogICAgUm9iIFN0cnlrZXIgLSBpbml0aWFsIGltcGxlbWVudGF0aW9uIGFuZCBvbmdvaW5nIG1haW50ZW5hbmNlCisgKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqLworcGFja2FnZSBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUudWkuaW50ZXJuYWwucHJvcGVydHlwYWdlOworCitpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5yZXNvdXJjZXMuSUNvbnRhaW5lcjsKK2ltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJlc291cmNlcy5JUHJvamVjdDsKK2ltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJlc291cmNlcy5JUmVzb3VyY2U7CitpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5ydW50aW1lLkNvcmVFeGNlcHRpb247CitpbXBvcnQgb3JnLmVjbGlwc2UuamZhY2UuZGlhbG9ncy5UaXRsZUFyZWFEaWFsb2c7CitpbXBvcnQgb3JnLmVjbGlwc2UuamZhY2Uudmlld2Vycy5JU2VsZWN0aW9uQ2hhbmdlZExpc3RlbmVyOworaW1wb3J0IG9yZy5lY2xpcHNlLmpmYWNlLnZpZXdlcnMuSVN0cnVjdHVyZWRTZWxlY3Rpb247CitpbXBvcnQgb3JnLmVjbGlwc2UuamZhY2Uudmlld2Vycy5JVHJlZUNvbnRlbnRQcm92aWRlcjsKK2ltcG9ydCBvcmcuZWNsaXBzZS5qZmFjZS52aWV3ZXJzLkxhYmVsUHJvdmlkZXI7CitpbXBvcnQgb3JnLmVjbGlwc2UuamZhY2Uudmlld2Vycy5TZWxlY3Rpb25DaGFuZ2VkRXZlbnQ7CitpbXBvcnQgb3JnLmVjbGlwc2UuamZhY2Uudmlld2Vycy5UcmVlVmlld2VyOworaW1wb3J0IG9yZy5lY2xpcHNlLmpmYWNlLnZpZXdlcnMuVmlld2VyOworaW1wb3J0IG9yZy5lY2xpcHNlLmpmYWNlLnZpZXdlcnMuVmlld2VyRmlsdGVyOworaW1wb3J0IG9yZy5lY2xpcHNlLnN3dC5TV1Q7CitpbXBvcnQgb3JnLmVjbGlwc2Uuc3d0LmdyYXBoaWNzLkltYWdlOworaW1wb3J0IG9yZy5lY2xpcHNlLnN3dC5sYXlvdXQuR3JpZERhdGE7CitpbXBvcnQgb3JnLmVjbGlwc2Uuc3d0LndpZGdldHMuQ29tcG9zaXRlOworaW1wb3J0IG9yZy5lY2xpcHNlLnN3dC53aWRnZXRzLkNvbnRyb2w7CitpbXBvcnQgb3JnLmVjbGlwc2Uuc3d0LndpZGdldHMuU2hlbGw7CitpbXBvcnQgb3JnLmVjbGlwc2UudWkuSVNoYXJlZEltYWdlczsKK2ltcG9ydCBvcmcuZWNsaXBzZS51aS5QbGF0Zm9ybVVJOworaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS51aS5NZXNzYWdlczsKKworQERlcHJlY2F0ZWQKK3B1YmxpYyBjbGFzcyBBZGRGb2xkZXJEaWFsb2cgZXh0ZW5kcyBUaXRsZUFyZWFEaWFsb2cgeworCXByaXZhdGUgSVByb2plY3QgcHJvamVjdDsKKwlwcml2YXRlIFRyZWVWaWV3ZXIgdmlld2VyOworCXByaXZhdGUgSUNvbnRhaW5lciBzZWxlY3RlZCA9IG51bGw7CisJcHVibGljIEFkZEZvbGRlckRpYWxvZyhTaGVsbCBwYXJlbnRTaGVsbCwgSVByb2plY3QgcHJvamVjdCkgeworCQlzdXBlcihwYXJlbnRTaGVsbCk7ICAgICAgICAKKyAgICAgICAgc2V0U2hlbGxTdHlsZSggZ2V0U2hlbGxTdHlsZSgpIHwgU1dULlJFU0laRSApOworCQl0aGlzLnByb2plY3QgPSBwcm9qZWN0OworCX0KKworCXByb3RlY3RlZCB2b2lkIGNvbmZpZ3VyZVNoZWxsKFNoZWxsIHNoZWxsKSB7CisJCXN1cGVyLmNvbmZpZ3VyZVNoZWxsKHNoZWxsKTsKKwkJCisJCXNoZWxsLnNldEJvdW5kcyhzaGVsbC5nZXRMb2NhdGlvbigpLngsIHNoZWxsLmdldExvY2F0aW9uKCkueSwgNDAwLDMwMCk7CisJCQorCX0KKwkKKwlwcm90ZWN0ZWQgQ29udHJvbCBjcmVhdGVEaWFsb2dBcmVhKENvbXBvc2l0ZSBwYXJlbnQpIHsKKwkJQ29tcG9zaXRlIGMgPSAoQ29tcG9zaXRlKXN1cGVyLmNyZWF0ZURpYWxvZ0FyZWEocGFyZW50KTsKKwkJcGFyZW50LmdldFNoZWxsKCkuc2V0VGV4dChNZXNzYWdlcy5BZGRGb2xkZXIpOworCQlzZXRUaXRsZShNZXNzYWdlcy5BZGRGb2xkZXIpOworCSAgICBzZXRNZXNzYWdlKE1lc3NhZ2VzLkFkZEZvbGRlck1hcHBpbmdzKTsKKwkgICAgLy9zZXRUaXRsZUltYWdlKCAgKTsKKwkJdGhpcy52aWV3ZXIgPSBuZXcgVHJlZVZpZXdlcihjLCBTV1QuU0lOR0xFIHwgU1dULkhfU0NST0xMIHwgU1dULlZfU0NST0xMIHwgU1dULkJPUkRFUik7CisJCXZpZXdlci5zZXRDb250ZW50UHJvdmlkZXIoZ2V0Q29udGVudFByb3ZpZGVyKCkpOworCQl2aWV3ZXIuc2V0TGFiZWxQcm92aWRlcihnZXRMYWJlbFByb3ZpZGVyKCkpOworCQl2aWV3ZXIuYWRkRmlsdGVyKGdldEZpbHRlcigpKTsKKwkJdmlld2VyLnNldElucHV0KHByb2plY3QpOworCQl2aWV3ZXIuZ2V0VHJlZSgpLnNldExheW91dERhdGEobmV3IEdyaWREYXRhKEdyaWREYXRhLkZJTExfQk9USCkpOworCQl2aWV3ZXIuYWRkU2VsZWN0aW9uQ2hhbmdlZExpc3RlbmVyKGdldExpc3RlbmVyKCkpOworCQlyZXR1cm4gYzsKKwl9CisJCisJcHJvdGVjdGVkIElTZWxlY3Rpb25DaGFuZ2VkTGlzdGVuZXIgZ2V0TGlzdGVuZXIoKSB7CisJCXJldHVybiBuZXcgSVNlbGVjdGlvbkNoYW5nZWRMaXN0ZW5lcigpIHsKKwkJCXB1YmxpYyB2b2lkIHNlbGVjdGlvbkNoYW5nZWQoU2VsZWN0aW9uQ2hhbmdlZEV2ZW50IGV2ZW50KSB7CisJCQkJSVN0cnVjdHVyZWRTZWxlY3Rpb24gc2VsID0gKElTdHJ1Y3R1cmVkU2VsZWN0aW9uKXZpZXdlci5nZXRTZWxlY3Rpb24oKTsKKwkJCQlPYmplY3QgZmlyc3QgPSBzZWwuZ2V0Rmlyc3RFbGVtZW50KCk7CisJCQkJaWYoIGZpcnN0IGluc3RhbmNlb2YgSUNvbnRhaW5lcikgCisJCQkJCXNlbGVjdGVkID0gKElDb250YWluZXIpZmlyc3Q7CisJCQl9CisJCX07CisJfQorCQorCXB1YmxpYyBJQ29udGFpbmVyIGdldFNlbGVjdGVkKCkgeworCQlyZXR1cm4gc2VsZWN0ZWQ7CisJfQorCQorCXByb3RlY3RlZCBWaWV3ZXJGaWx0ZXIgZ2V0RmlsdGVyKCkgeworCQlyZXR1cm4gbmV3IFZpZXdlckZpbHRlcigpIHsKKwkJCXB1YmxpYyBib29sZWFuIHNlbGVjdChWaWV3ZXIgdmlld2VyLCBPYmplY3QgcGFyZW50RWxlbWVudCwKKwkJCQkJT2JqZWN0IGVsZW1lbnQpIHsKKwkJCQlyZXR1cm4gZWxlbWVudCBpbnN0YW5jZW9mIElDb250YWluZXI7CisJCQl9CisJCX07CisJfQorCQorCXByb3RlY3RlZCBJVHJlZUNvbnRlbnRQcm92aWRlciBnZXRDb250ZW50UHJvdmlkZXIoKSB7CisJCXJldHVybiBuZXcgSVRyZWVDb250ZW50UHJvdmlkZXIoKSB7CisJCQkKKwkJCXB1YmxpYyB2b2lkIGlucHV0Q2hhbmdlZChWaWV3ZXIgdmlld2VyLCBPYmplY3Qgb2xkSW5wdXQsIE9iamVjdCBuZXdJbnB1dCkgeworCQkJfQorCQkJCisJCQlwdWJsaWMgdm9pZCBkaXNwb3NlKCkgeworCQkJfQorCQkJCisJCQlwdWJsaWMgT2JqZWN0W10gZ2V0RWxlbWVudHMoT2JqZWN0IGlucHV0RWxlbWVudCkgeworCQkJCXRyeSB7CisJCQkJCXJldHVybiBwcm9qZWN0Lm1lbWJlcnMoKTsKKwkJCQl9IGNhdGNoKCBDb3JlRXhjZXB0aW9uIGNlICkgeworCQkJCQlyZXR1cm4gbmV3IE9iamVjdFtde307CisJCQkJfQorCQkJfQorCQkJCisJCQlwdWJsaWMgYm9vbGVhbiBoYXNDaGlsZHJlbihPYmplY3QgZWxlbWVudCkgeworCQkJCWlmKCBlbGVtZW50IGluc3RhbmNlb2YgSUNvbnRhaW5lcikgeworCQkJCQl0cnkgeworCQkJCQkJcmV0dXJuICgoSUNvbnRhaW5lcillbGVtZW50KS5tZW1iZXJzKCkubGVuZ3RoID4gMDsKKwkJCQkJfSBjYXRjaCggQ29yZUV4Y2VwdGlvbiBjZSApIHsKKwkJCQkJfQorCQkJCX0KKwkJCQlyZXR1cm4gZmFsc2U7CisJCQl9CisJCQkKKwkJCXB1YmxpYyBPYmplY3QgZ2V0UGFyZW50KE9iamVjdCBlbGVtZW50KSB7CisJCQkJaWYoIGVsZW1lbnQgaW5zdGFuY2VvZiBJUmVzb3VyY2UpCisJCQkJCXJldHVybiAoKElSZXNvdXJjZSllbGVtZW50KS5nZXRQYXJlbnQoKTsKKwkJCQlyZXR1cm4gbnVsbDsKKwkJCX0KKwkJCQorCQkJcHVibGljIE9iamVjdFtdIGdldENoaWxkcmVuKE9iamVjdCBwYXJlbnRFbGVtZW50KSB7CisJCQkJaWYoIHBhcmVudEVsZW1lbnQgaW5zdGFuY2VvZiBJQ29udGFpbmVyKSB7CisJCQkJCXRyeSB7CisJCQkJCQlyZXR1cm4gKChJQ29udGFpbmVyKXBhcmVudEVsZW1lbnQpLm1lbWJlcnMoKTsKKwkJCQkJfSBjYXRjaCggQ29yZUV4Y2VwdGlvbiBjZSApIHsKKwkJCQkJfQorCQkJCX0KKwkJCQlyZXR1cm4gbmV3IE9iamVjdFtde307CisJCQl9CisJCX07CisJfQorCisJcHJvdGVjdGVkIExhYmVsUHJvdmlkZXIgZ2V0TGFiZWxQcm92aWRlcigpIHsKKwkJcmV0dXJuIG5ldyBMYWJlbFByb3ZpZGVyKCkgeworCQkJcHVibGljIEltYWdlIGdldEltYWdlKE9iamVjdCBlbGVtZW50KSB7CisJCQkJcmV0dXJuIFBsYXRmb3JtVUkuZ2V0V29ya2JlbmNoKCkuZ2V0U2hhcmVkSW1hZ2VzKCkuZ2V0SW1hZ2UoSVNoYXJlZEltYWdlcy5JTUdfT0JKX0ZPTERFUik7CisJCQl9CisJCQlwdWJsaWMgU3RyaW5nIGdldFRleHQoT2JqZWN0IGVsZW1lbnQpIHsKKwkJCQlpZiggZWxlbWVudCBpbnN0YW5jZW9mIElSZXNvdXJjZSkKKwkJCQkJcmV0dXJuICgoSVJlc291cmNlKWVsZW1lbnQpLmdldE5hbWUoKTsKKwkJCQlyZXR1cm4gZWxlbWVudC50b1N0cmluZygpOworCQkJfQorCQl9OworCX0KK30KZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlLnVpL3NyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2NvbXBvbmVudGNvcmUvdWkvaW50ZXJuYWwvcHJvcGVydHlwYWdlL0NvbXBvbmVudERlcGVuZGVuY3lDb250ZW50UHJvdmlkZXIuamF2YSBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlLnVpL3NyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2NvbXBvbmVudGNvcmUvdWkvaW50ZXJuYWwvcHJvcGVydHlwYWdlL0NvbXBvbmVudERlcGVuZGVuY3lDb250ZW50UHJvdmlkZXIuamF2YQpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi45YzE0MGJjCi0tLSAvZGV2L251bGwKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUudWkvc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vY29tcG9uZW50Y29yZS91aS9pbnRlcm5hbC9wcm9wZXJ0eXBhZ2UvQ29tcG9uZW50RGVwZW5kZW5jeUNvbnRlbnRQcm92aWRlci5qYXZhCkBAIC0wLDAgKzEsMTQ0IEBACisvKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqCisgKiBDb3B5cmlnaHQgKGMpIDIwMDkgUmVkIEhhdAorICogQWxsIHJpZ2h0cyByZXNlcnZlZC4gVGhpcyBwcm9ncmFtIGFuZCB0aGUgYWNjb21wYW55aW5nIG1hdGVyaWFscworICogYXJlIG1hZGUgYXZhaWxhYmxlIHVuZGVyIHRoZSB0ZXJtcyBvZiB0aGUgRWNsaXBzZSBQdWJsaWMgTGljZW5zZSB2MS4wCisgKiB3aGljaCBhY2NvbXBhbmllcyB0aGlzIGRpc3RyaWJ1dGlvbiwgYW5kIGlzIGF2YWlsYWJsZSBhdAorICogaHR0cDovL3d3dy5lY2xpcHNlLm9yZy9sZWdhbC9lcGwtdjEwLmh0bWwKKyAqCisgKiBDb250cmlidXRvcnM6CisgKiAgICBSb2IgU3RyeWtlciAtIGluaXRpYWwgaW1wbGVtZW50YXRpb24gYW5kIG9uZ29pbmcgbWFpbnRlbmFuY2UKKyAqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKiovCitwYWNrYWdlIG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS51aS5pbnRlcm5hbC5wcm9wZXJ0eXBhZ2U7CisKK2ltcG9ydCBqYXZhLnV0aWwuQXJyYXlMaXN0OworCitpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5yZXNvdXJjZXMuSVByb2plY3Q7CitpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5yZXNvdXJjZXMuSVdvcmtzcGFjZVJvb3Q7CitpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5ydW50aW1lLklQYXRoOworaW1wb3J0IG9yZy5lY2xpcHNlLmpmYWNlLnZpZXdlcnMuRGVjb3JhdGluZ0xhYmVsUHJvdmlkZXI7CitpbXBvcnQgb3JnLmVjbGlwc2UuamZhY2Uudmlld2Vycy5JU3RydWN0dXJlZENvbnRlbnRQcm92aWRlcjsKK2ltcG9ydCBvcmcuZWNsaXBzZS5qZmFjZS52aWV3ZXJzLklUYWJsZUxhYmVsUHJvdmlkZXI7CitpbXBvcnQgb3JnLmVjbGlwc2UuamZhY2Uudmlld2Vycy5MYWJlbFByb3ZpZGVyOworaW1wb3J0IG9yZy5lY2xpcHNlLmpmYWNlLnZpZXdlcnMuVmlld2VyOworaW1wb3J0IG9yZy5lY2xpcHNlLnN3dC5ncmFwaGljcy5JbWFnZTsKK2ltcG9ydCBvcmcuZWNsaXBzZS51aS5QbGF0Zm9ybVVJOworaW1wb3J0IG9yZy5lY2xpcHNlLnVpLm1vZGVsLldvcmtiZW5jaExhYmVsUHJvdmlkZXI7CitpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb21wb25lbnRjb3JlLnJlc291cmNlcy5JVmlydHVhbENvbXBvbmVudDsKK2ltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUucmVzb3VyY2VzLklWaXJ0dWFsUmVmZXJlbmNlOworaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS51aS5Nb2R1bGVDb3JlVUlQbHVnaW47CitpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb21wb25lbnRjb3JlLnVpLnByb3BlcnR5cGFnZS5BZGRNb2R1bGVEZXBlbmRlbmNpZXNQcm9wZXJ0aWVzUGFnZTsKK2ltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUudWkucHJvcGVydHlwYWdlLkFkZE1vZHVsZURlcGVuZGVuY2llc1Byb3BlcnRpZXNQYWdlLkNvbXBvbmVudFJlc291cmNlUHJveHk7CisKKworLyoKKyAqICBUaGUgb25seSB2YWxpZCBlbGVtZW50cyB0aGlzIGNvbnRlbnQgcHJvdmlkZXIgKHNob3VsZCkgcHJvdmlkZQorICogIGFyZSBJUHJvamVjdCBvciBJVmlydHVhbENvbXBvbmVudCBvYmplY3RzLiBUaGUgcnVudGltZSBwYXRocyBwb3J0aW9uIGlzIAorICogIHNoYXJlZCB3aXRoIHRoZSBwcmVmZXJlbmNlIHBhZ2UgaXRzZWxmIHdoZXJlIHRoZXkgY2FuIGJvdGggbW9kaWZ5IHRoZSBkYXRhLiAKKyAqIAorICogVGhpcyBwcm92aWRlciBubyBsb25nZXIgIm1lZGRsZXMiIGluIHRvIHRoZSBjb250ZW50IGFzIGl0IHVzZWQgdG8sIAorICogYnV0IHJhdGhlciBzZXJ2ZXMgYXMgb25seSBhIHZpZXcgb2YgaXQuIAorICovCitwdWJsaWMgY2xhc3MgQ29tcG9uZW50RGVwZW5kZW5jeUNvbnRlbnRQcm92aWRlciBleHRlbmRzIExhYmVsUHJvdmlkZXIgaW1wbGVtZW50cyBJU3RydWN0dXJlZENvbnRlbnRQcm92aWRlciwgSVRhYmxlTGFiZWxQcm92aWRlciB7CisJCisJZmluYWwgc3RhdGljIFN0cmluZyBQQVRIX1NFUEFSQVRPUiA9IFN0cmluZy52YWx1ZU9mKElQYXRoLlNFUEFSQVRPUik7CisJCisJcHJpdmF0ZSBBcnJheUxpc3Q8SVZpcnR1YWxSZWZlcmVuY2U+IHJ1bnRpbWVQYXRoczsKKwlwcml2YXRlIEFycmF5TGlzdDxDb21wb25lbnRSZXNvdXJjZVByb3h5PiByZXNvdXJjZU1hcHBpbmdzOworCXByaXZhdGUgRGVjb3JhdGluZ0xhYmVsUHJvdmlkZXIgZGVjUHJvdmlkZXIgPSBuZXcgRGVjb3JhdGluZ0xhYmVsUHJvdmlkZXIoCisJICAgICAgICAgICAgICAgIG5ldyBXb3JrYmVuY2hMYWJlbFByb3ZpZGVyKCksIFBsYXRmb3JtVUkuZ2V0V29ya2JlbmNoKCkuCisJICAgICAgICAgICAgICAgICBnZXREZWNvcmF0b3JNYW5hZ2VyKCkuZ2V0TGFiZWxEZWNvcmF0b3IoKSk7CisJcHJpdmF0ZSBJVmlydHVhbENvbXBvbmVudExhYmVsUHJvdmlkZXJbXSBkZWxlZ2F0ZXM7CisJcHVibGljIENvbXBvbmVudERlcGVuZGVuY3lDb250ZW50UHJvdmlkZXIoQWRkTW9kdWxlRGVwZW5kZW5jaWVzUHJvcGVydGllc1BhZ2UgYWRkTW9kdWxlRGVwZW5kZW5jaWVzUHJvcGVydGllc1BhZ2UpIHsKKwkJc3VwZXIoKTsKKwkJZGVjUHJvdmlkZXIuYWRkTGlzdGVuZXIoYWRkTW9kdWxlRGVwZW5kZW5jaWVzUHJvcGVydGllc1BhZ2UpOworCQlkZWxlZ2F0ZXMgPSBEZXBlbmRlbmN5UGFnZUV4dGVuc2lvbk1hbmFnZXIubG9hZERlbGVnYXRlcygpOworCX0KKworCXB1YmxpYyB2b2lkIHNldFJ1bnRpbWVQYXRocyhBcnJheUxpc3Q8SVZpcnR1YWxSZWZlcmVuY2U+IHJ1bnRpbWVQYXRocykgeworCQl0aGlzLnJ1bnRpbWVQYXRocyA9IHJ1bnRpbWVQYXRoczsKKwl9CisKKwlwdWJsaWMgdm9pZCBzZXRSZXNvdXJjZU1hcHBpbmdzKEFycmF5TGlzdDxDb21wb25lbnRSZXNvdXJjZVByb3h5PiBtYXBwaW5ncykgeworCQl0aGlzLnJlc291cmNlTWFwcGluZ3MgPSBtYXBwaW5nczsKKwl9CisJCisJcHVibGljIE9iamVjdFtdIGdldEVsZW1lbnRzKE9iamVjdCBpbnB1dEVsZW1lbnQpIHsKKwkJT2JqZWN0W10gZW1wdHkgPSBuZXcgT2JqZWN0WzBdOworCQlpZiggIShpbnB1dEVsZW1lbnQgaW5zdGFuY2VvZiBJV29ya3NwYWNlUm9vdCkpCisJCQlyZXR1cm4gZW1wdHk7CisJCUFycmF5TGlzdDxPYmplY3Q+IGxpc3QgPSBuZXcgQXJyYXlMaXN0PE9iamVjdD4oKTsKKwkJbGlzdC5hZGRBbGwocmVzb3VyY2VNYXBwaW5ncyk7CisJCWxpc3QuYWRkQWxsKHJ1bnRpbWVQYXRocyk7CisJCXJldHVybiBsaXN0LnRvQXJyYXkoKTsKKwl9CisJCisJcHVibGljIEltYWdlIGdldENvbHVtbkltYWdlKE9iamVjdCBlbGVtZW50LCBpbnQgY29sdW1uSW5kZXgpIHsKKwkJaWYoIGVsZW1lbnQgaW5zdGFuY2VvZiBDb21wb25lbnRSZXNvdXJjZVByb3h5KSB7CisJCQlyZXR1cm4gTW9kdWxlQ29yZVVJUGx1Z2luLmdldEluc3RhbmNlKCkuZ2V0SW1hZ2UoImZvbGRlciIpOworCQl9CisJCWlmIChlbGVtZW50IGluc3RhbmNlb2YgSVZpcnR1YWxSZWZlcmVuY2UpIHsKKwkJCWlmIChjb2x1bW5JbmRleCA9PSAwKQorCQkJCXJldHVybiBNb2R1bGVDb3JlVUlQbHVnaW4uZ2V0SW5zdGFuY2UoKS5nZXRJbWFnZSgiamFyX29iaiIpOworCQkJZWxzZQorCQkJCXJldHVybiBoYW5kbGVTb3VyY2VJbWFnZSgoKElWaXJ0dWFsUmVmZXJlbmNlKWVsZW1lbnQpLmdldFJlZmVyZW5jZWRDb21wb25lbnQoKSk7CisJCX0gCisJCWlmIChlbGVtZW50IGluc3RhbmNlb2YgSVByb2plY3QpeworCQkJcmV0dXJuIGRlY1Byb3ZpZGVyLmdldEltYWdlKGVsZW1lbnQpOworCQl9CisJCXJldHVybiBudWxsOworCX0KKworCXB1YmxpYyBTdHJpbmcgZ2V0Q29sdW1uVGV4dChPYmplY3QgZWxlbWVudCwgaW50IGNvbHVtbkluZGV4KSB7CisJCWlmKCBlbGVtZW50IGluc3RhbmNlb2YgQ29tcG9uZW50UmVzb3VyY2VQcm94eSkgeworCQkJaWYoIGNvbHVtbkluZGV4ID09IDAgKSAKKwkJCQlyZXR1cm4gKChDb21wb25lbnRSZXNvdXJjZVByb3h5KWVsZW1lbnQpLnJ1bnRpbWVQYXRoLnRvU3RyaW5nKCk7CisJCQllbHNlIGlmKCBjb2x1bW5JbmRleCA9PSAxICkgCisJCQkJcmV0dXJuICgoQ29tcG9uZW50UmVzb3VyY2VQcm94eSllbGVtZW50KS5zb3VyY2UudG9TdHJpbmcoKTsKKwkJfQorCQlpZiggZWxlbWVudCBpbnN0YW5jZW9mIElWaXJ0dWFsUmVmZXJlbmNlKSB7CisJCQlpZiAoY29sdW1uSW5kZXggPT0gMCkgeworCQkJCXJldHVybiBBZGRNb2R1bGVEZXBlbmRlbmNpZXNQcm9wZXJ0aWVzUGFnZS5nZXRTYWZlUnVudGltZVBhdGgoKElWaXJ0dWFsUmVmZXJlbmNlKWVsZW1lbnQpOworCQkJfSBlbHNlIGlmIChjb2x1bW5JbmRleCA9PSAxKSB7CisJCQkJcmV0dXJuIGhhbmRsZVNvdXJjZVRleHQoKChJVmlydHVhbFJlZmVyZW5jZSllbGVtZW50KS5nZXRSZWZlcmVuY2VkQ29tcG9uZW50KCkpOworCQkJfQorCQl9CisJCXJldHVybiBudWxsOworCX0KKworCQorCXByaXZhdGUgU3RyaW5nIGhhbmRsZVNvdXJjZVRleHQoSVZpcnR1YWxDb21wb25lbnQgY29tcG9uZW50KSB7CisJCWlmKCBkZWxlZ2F0ZXMgIT0gbnVsbCApIHsKKwkJCWZvciggaW50IGkgPSAwOyBpIDwgZGVsZWdhdGVzLmxlbmd0aDsgaSsrICkKKwkJCQlpZiggZGVsZWdhdGVzW2ldLmNhbkhhbmRsZShjb21wb25lbnQpKQorCQkJCQlyZXR1cm4gZGVsZWdhdGVzW2ldLmdldFNvdXJjZVRleHQoY29tcG9uZW50KTsKKwkJfQorCQkKKwkJLy8gZGVmYXVsdCBpbXBsCisJCWlmKCBjb21wb25lbnQuaXNCaW5hcnkoKSApIHsKKwkJCUlQYXRoIHAgPSAoSVBhdGgpY29tcG9uZW50LmdldEFkYXB0ZXIoSVBhdGguY2xhc3MpOworCQkJcmV0dXJuIHAgPT0gbnVsbCA/IG51bGwgOiBwLnRvU3RyaW5nKCk7CisJCX0KKwkJcmV0dXJuIGNvbXBvbmVudC5nZXRQcm9qZWN0KCkuZ2V0TmFtZSgpOworCX0KKworCXByaXZhdGUgSW1hZ2UgaGFuZGxlU291cmNlSW1hZ2UoSVZpcnR1YWxDb21wb25lbnQgY29tcG9uZW50KSB7CisJCWlmKCBkZWxlZ2F0ZXMgIT0gbnVsbCApIHsKKwkJCWZvciggaW50IGkgPSAwOyBpIDwgZGVsZWdhdGVzLmxlbmd0aDsgaSsrICkKKwkJCQlpZiggZGVsZWdhdGVzW2ldLmNhbkhhbmRsZShjb21wb25lbnQpKQorCQkJCQlyZXR1cm4gZGVsZWdhdGVzW2ldLmdldFNvdXJjZUltYWdlKGNvbXBvbmVudCk7CisJCX0KKwkJCisJCS8vIGRlZmF1bHQgaW1wbAorCQlpZihjb21wb25lbnQuaXNCaW5hcnkoKSkKKwkJCXJldHVybiBNb2R1bGVDb3JlVUlQbHVnaW4uZ2V0SW5zdGFuY2UoKS5nZXRJbWFnZSgiamFyX29iaiIpOworCQllbHNlIHJldHVybiBkZWNQcm92aWRlci5nZXRJbWFnZShjb21wb25lbnQuZ2V0UHJvamVjdCgpKTsKKwl9CisJCisJCisJcHVibGljIHZvaWQgaW5wdXRDaGFuZ2VkKFZpZXdlciB2aWV3ZXIsIE9iamVjdCBvbGRJbnB1dCwgT2JqZWN0IG5ld0lucHV0KSB7CisJCS8vIFRPRE8gQXV0by1nZW5lcmF0ZWQgbWV0aG9kIHN0dWIKKwkJCisJfQorCisJCit9CmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS51aS9zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9jb21wb25lbnRjb3JlL3VpL2ludGVybmFsL3Byb3BlcnR5cGFnZS9EZXBlbmRlbmN5UGFnZUV4dGVuc2lvbk1hbmFnZXIuamF2YSBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlLnVpL3NyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2NvbXBvbmVudGNvcmUvdWkvaW50ZXJuYWwvcHJvcGVydHlwYWdlL0RlcGVuZGVuY3lQYWdlRXh0ZW5zaW9uTWFuYWdlci5qYXZhCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLjA1ZWFkY2MKLS0tIC9kZXYvbnVsbAorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS51aS9zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9jb21wb25lbnRjb3JlL3VpL2ludGVybmFsL3Byb3BlcnR5cGFnZS9EZXBlbmRlbmN5UGFnZUV4dGVuc2lvbk1hbmFnZXIuamF2YQpAQCAtMCwwICsxLDIwMiBAQAorLyoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKgorICogQ29weXJpZ2h0IChjKSAyMDA5IFJlZCBIYXQKKyAqIEFsbCByaWdodHMgcmVzZXJ2ZWQuIFRoaXMgcHJvZ3JhbSBhbmQgdGhlIGFjY29tcGFueWluZyBtYXRlcmlhbHMKKyAqIGFyZSBtYWRlIGF2YWlsYWJsZSB1bmRlciB0aGUgdGVybXMgb2YgdGhlIEVjbGlwc2UgUHVibGljIExpY2Vuc2UgdjEuMAorICogd2hpY2ggYWNjb21wYW5pZXMgdGhpcyBkaXN0cmlidXRpb24sIGFuZCBpcyBhdmFpbGFibGUgYXQKKyAqIGh0dHA6Ly93d3cuZWNsaXBzZS5vcmcvbGVnYWwvZXBsLXYxMC5odG1sCisgKgorICogQ29udHJpYnV0b3JzOgorICogICAgUm9iIFN0cnlrZXIgLSBpbml0aWFsIGltcGxlbWVudGF0aW9uIGFuZCBvbmdvaW5nIG1haW50ZW5hbmNlCisgKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqLworcGFja2FnZSBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUudWkuaW50ZXJuYWwucHJvcGVydHlwYWdlOworCitpbXBvcnQgamF2YS51dGlsLkFycmF5TGlzdDsKK2ltcG9ydCBqYXZhLnV0aWwuQXJyYXlzOworaW1wb3J0IGphdmEudXRpbC5Db2xsZWN0aW9uczsKK2ltcG9ydCBqYXZhLnV0aWwuQ29tcGFyYXRvcjsKK2ltcG9ydCBqYXZhLnV0aWwuSGFzaE1hcDsKK2ltcG9ydCBqYXZhLnV0aWwuSXRlcmF0b3I7CitpbXBvcnQgamF2YS51dGlsLkxpc3Q7CisKK2ltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJ1bnRpbWUuQ29yZUV4Y2VwdGlvbjsKK2ltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJ1bnRpbWUuSUNvbmZpZ3VyYXRpb25FbGVtZW50OworaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucnVudGltZS5JRXh0ZW5zaW9uUmVnaXN0cnk7CitpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5ydW50aW1lLlBsYXRmb3JtOworaW1wb3J0IG9yZy5lY2xpcHNlLmpmYWNlLnJlc291cmNlLkltYWdlRGVzY3JpcHRvcjsKK2ltcG9ydCBvcmcuZWNsaXBzZS5zd3QuZ3JhcGhpY3MuSW1hZ2U7CitpbXBvcnQgb3JnLmVjbGlwc2UudWkucGx1Z2luLkFic3RyYWN0VUlQbHVnaW47CitpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb21wb25lbnRjb3JlLnVpLk1vZHVsZUNvcmVVSVBsdWdpbjsKK2ltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUudWkuaW50ZXJuYWwudGFza3dpemFyZC5XaXphcmRGcmFnbWVudDsKK2ltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUudWkucHJvcGVydHlwYWdlLklEZXBlbmRlbmN5UGFnZVByb3ZpZGVyOworaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24ucHJvamVjdC5mYWNldC5jb3JlLklGYWNldGVkUHJvamVjdDsKKworcHVibGljIGNsYXNzIERlcGVuZGVuY3lQYWdlRXh0ZW5zaW9uTWFuYWdlciB7CisJcHJpdmF0ZSBzdGF0aWMgRGVwZW5kZW5jeVBhZ2VFeHRlbnNpb25NYW5hZ2VyIG1hbmFnZXIgPSBudWxsOworCXB1YmxpYyBzdGF0aWMgRGVwZW5kZW5jeVBhZ2VFeHRlbnNpb25NYW5hZ2VyIGdldE1hbmFnZXIoKSB7CisJCWlmKCBtYW5hZ2VyID09IG51bGwgKQorCQkJbWFuYWdlciA9IG5ldyBEZXBlbmRlbmN5UGFnZUV4dGVuc2lvbk1hbmFnZXIoKTsKKwkJcmV0dXJuIG1hbmFnZXI7CisJfQorCQorCXByaXZhdGUgSGFzaE1hcDxTdHJpbmcsIElEZXBlbmRlbmN5UGFnZVByb3ZpZGVyPiBwcm92aWRlcnMgPSBudWxsOworCQorCXB1YmxpYyBJRGVwZW5kZW5jeVBhZ2VQcm92aWRlciBnZXRQcm92aWRlcihJRmFjZXRlZFByb2plY3QgcHJvamVjdCkgeworCQlpZiggcHJvdmlkZXJzID09IG51bGwgKQorCQkJbG9hZFByb3ZpZGVycygpOworCQlJdGVyYXRvcjxJRGVwZW5kZW5jeVBhZ2VQcm92aWRlcj4gaSA9IHByb3ZpZGVycy52YWx1ZXMoKS5pdGVyYXRvcigpOworCQlJRGVwZW5kZW5jeVBhZ2VQcm92aWRlciB0ZW1wOworCQl3aGlsZShpLmhhc05leHQoKSkgeworCQkJdGVtcCA9IGkubmV4dCgpOworCQkJaWYoIHRlbXAuY2FuSGFuZGxlKHByb2plY3QpKQorCQkJCXJldHVybiB0ZW1wOworCQl9CisJCXJldHVybiBudWxsOworCX0KKwkKKwlwcml2YXRlIHZvaWQgbG9hZFByb3ZpZGVycygpIHsKKwkJSGFzaE1hcDxTdHJpbmcsIElEZXBlbmRlbmN5UGFnZVByb3ZpZGVyPiB0ZW1wID0gbmV3IEhhc2hNYXA8U3RyaW5nLCBJRGVwZW5kZW5jeVBhZ2VQcm92aWRlcj4oKTsKKwkJSUV4dGVuc2lvblJlZ2lzdHJ5IHJlZ2lzdHJ5ID0gUGxhdGZvcm0uZ2V0RXh0ZW5zaW9uUmVnaXN0cnkoKTsKKwkJSUNvbmZpZ3VyYXRpb25FbGVtZW50W10gY2YgPSByZWdpc3RyeS5nZXRDb25maWd1cmF0aW9uRWxlbWVudHNGb3IoCisJCQkJTW9kdWxlQ29yZVVJUGx1Z2luLlBMVUdJTl9JRCwgIm1vZHVsZURlcGVuZGVuY3lQcm9wZXJ0eVBhZ2UiKTsgLy8kTk9OLU5MUy0xJAorCQlmb3IoIGludCBpID0gMDsgaSA8IGNmLmxlbmd0aDsgaSsrICkgeworCQkJdHJ5IHsKKwkJCQl0ZW1wLnB1dChjZltpXS5nZXRBdHRyaWJ1dGUoImlkIiksICAvLyROT04tTkxTLTEkCisJCQkJCShJRGVwZW5kZW5jeVBhZ2VQcm92aWRlciljZltpXS5jcmVhdGVFeGVjdXRhYmxlRXh0ZW5zaW9uKCJjbGFzcyIpKTsgIC8vJE5PTi1OTFMtMSQKKwkJCX0gY2F0Y2goIENvcmVFeGNlcHRpb24gY2UgKSB7fQorCQl9CisJCXByb3ZpZGVycyA9IHRlbXA7CisJfQorCQorCXB1YmxpYyBXaXphcmRGcmFnbWVudFtdIGxvYWRBbGxSZWZlcmVuY2VXaXphcmRGcmFnbWVudHMoKSB7CisJCUlFeHRlbnNpb25SZWdpc3RyeSByZWdpc3RyeSA9IFBsYXRmb3JtLmdldEV4dGVuc2lvblJlZ2lzdHJ5KCk7CisJCUlDb25maWd1cmF0aW9uRWxlbWVudFtdIGNmID0gcmVnaXN0cnkuZ2V0Q29uZmlndXJhdGlvbkVsZW1lbnRzRm9yKAorCQkJCU1vZHVsZUNvcmVVSVBsdWdpbi5QTFVHSU5fSUQsICJyZWZlcmVuY2VXaXphcmRGcmFnbWVudCIpOyAvLyROT04tTkxTLTEkCisJCUFycmF5TGlzdDxXaXphcmRGcmFnbWVudD4gbGlzdCA9IG5ldyBBcnJheUxpc3Q8V2l6YXJkRnJhZ21lbnQ+KCk7CisJCWZvciggaW50IGkgPSAwOyBpIDwgY2YubGVuZ3RoOyBpKysgKSB7CisJCQl0cnkgeworCQkJCWxpc3QuYWRkKChXaXphcmRGcmFnbWVudCljZltpXS5jcmVhdGVFeGVjdXRhYmxlRXh0ZW5zaW9uKCJjbGFzcyIpKTsKKwkJCX0gY2F0Y2goIENvcmVFeGNlcHRpb24gY2UpIHt9CisJCX0KKwkJcmV0dXJuIGxpc3QudG9BcnJheShuZXcgV2l6YXJkRnJhZ21lbnRbbGlzdC5zaXplKCldKTsKKwl9CisJCisJcHVibGljIFdpemFyZEZyYWdtZW50IGxvYWRSZWZlcmVuY2VXaXphcmRGcmFnbWVudChTdHJpbmcgaWQpIHsKKwkJSUV4dGVuc2lvblJlZ2lzdHJ5IHJlZ2lzdHJ5ID0gUGxhdGZvcm0uZ2V0RXh0ZW5zaW9uUmVnaXN0cnkoKTsKKwkJSUNvbmZpZ3VyYXRpb25FbGVtZW50W10gY2YgPSByZWdpc3RyeS5nZXRDb25maWd1cmF0aW9uRWxlbWVudHNGb3IoCisJCQkJTW9kdWxlQ29yZVVJUGx1Z2luLlBMVUdJTl9JRCwgInJlZmVyZW5jZVdpemFyZEZyYWdtZW50Iik7IC8vJE5PTi1OTFMtMSQKKwkJZm9yKCBpbnQgaSA9IDA7IGkgPCBjZi5sZW5ndGg7IGkrKyApIHsKKwkJCWlmKCBjZltpXS5nZXRBdHRyaWJ1dGUoImlkIikuZXF1YWxzKGlkKSkgLy8kTk9OLU5MUy0xJAorCQkJCXRyeSB7CisJCQkJCXJldHVybiAoV2l6YXJkRnJhZ21lbnQpY2ZbaV0uY3JlYXRlRXhlY3V0YWJsZUV4dGVuc2lvbigiY2xhc3MiKTsgLy8kTk9OLU5MUy0xJAorCQkJCX0gY2F0Y2goIENvcmVFeGNlcHRpb24gY2UpIHt9CisJCX0KKwkJcmV0dXJuIG51bGw7CisJfQorCQorCXB1YmxpYyBSZWZlcmVuY2VFeHRlbnNpb25bXSBnZXRFeHBvc2VkUmVmZXJlbmNlRXh0ZW5zaW9ucygpIHsKKwkJQXJyYXlMaXN0PFJlZmVyZW5jZUV4dGVuc2lvbj4gbGlzdCA9IG5ldyBBcnJheUxpc3Q8UmVmZXJlbmNlRXh0ZW5zaW9uPigpOworCQlsaXN0LmFkZEFsbChBcnJheXMuYXNMaXN0KGdldEFsbFJlZmVyZW5jZUV4dGVuc2lvbnMoKSkpOworCQlmb3IoSXRlcmF0b3I8UmVmZXJlbmNlRXh0ZW5zaW9uPiBpID0gbGlzdC5pdGVyYXRvcigpO2kuaGFzTmV4dCgpOykgeworCQkJaWYoaS5uZXh0KCkuaXNIaWRkZW4oKSkKKwkJCQlpLnJlbW92ZSgpOworCQl9CisJCXJldHVybiBsaXN0LnRvQXJyYXkobmV3IFJlZmVyZW5jZUV4dGVuc2lvbltsaXN0LnNpemUoKV0pOworCX0KKwkKKwlwdWJsaWMgUmVmZXJlbmNlRXh0ZW5zaW9uW10gZ2V0QWxsUmVmZXJlbmNlRXh0ZW5zaW9ucygpIHsKKwkJSUV4dGVuc2lvblJlZ2lzdHJ5IHJlZ2lzdHJ5ID0gUGxhdGZvcm0uZ2V0RXh0ZW5zaW9uUmVnaXN0cnkoKTsKKwkJSUNvbmZpZ3VyYXRpb25FbGVtZW50W10gY2YgPSByZWdpc3RyeS5nZXRDb25maWd1cmF0aW9uRWxlbWVudHNGb3IoCisJCQkJTW9kdWxlQ29yZVVJUGx1Z2luLlBMVUdJTl9JRCwgInJlZmVyZW5jZVdpemFyZEZyYWdtZW50Iik7IC8vJE5PTi1OTFMtMSQKKwkJQXJyYXlMaXN0PFJlZmVyZW5jZUV4dGVuc2lvbj4gbGlzdCA9IG5ldyBBcnJheUxpc3Q8UmVmZXJlbmNlRXh0ZW5zaW9uPigpOworCQlmb3IoIGludCBpID0gMDsgaSA8IGNmLmxlbmd0aDsgaSsrICkgeworCQkJbGlzdC5hZGQobmV3IFJlZmVyZW5jZUV4dGVuc2lvbihjZltpXSkpOworCQl9CisJCXJldHVybiBsaXN0LnRvQXJyYXkobmV3IFJlZmVyZW5jZUV4dGVuc2lvbltsaXN0LnNpemUoKV0pOworCX0KKwkKKwlwdWJsaWMgUmVmZXJlbmNlRXh0ZW5zaW9uIGZpbmRSZWZlcmVuY2VFeHRlbnNpb24oU3RyaW5nIGlkKSB7CisJCUlFeHRlbnNpb25SZWdpc3RyeSByZWdpc3RyeSA9IFBsYXRmb3JtLmdldEV4dGVuc2lvblJlZ2lzdHJ5KCk7CisJCUlDb25maWd1cmF0aW9uRWxlbWVudFtdIGNmID0gcmVnaXN0cnkuZ2V0Q29uZmlndXJhdGlvbkVsZW1lbnRzRm9yKAorCQkJCU1vZHVsZUNvcmVVSVBsdWdpbi5QTFVHSU5fSUQsICJyZWZlcmVuY2VXaXphcmRGcmFnbWVudCIpOyAvLyROT04tTkxTLTEkCisJCUFycmF5TGlzdDxSZWZlcmVuY2VFeHRlbnNpb24+IGxpc3QgPSBuZXcgQXJyYXlMaXN0PFJlZmVyZW5jZUV4dGVuc2lvbj4oKTsKKwkJZm9yKCBpbnQgaSA9IDA7IGkgPCBjZi5sZW5ndGg7IGkrKyApIHsKKwkJCWlmKGNmW2ldLmdldEF0dHJpYnV0ZSgiaWQiKS5lcXVhbHMoaWQpKSAvLyROT04tTkxTLTEkCisJCQkJcmV0dXJuIG5ldyBSZWZlcmVuY2VFeHRlbnNpb24oY2ZbaV0pOworCQl9CisJCXJldHVybiBudWxsOworCX0KKwkKKwlwdWJsaWMgY2xhc3MgUmVmZXJlbmNlRXh0ZW5zaW9uIHsKKwkJcHJpdmF0ZSBJQ29uZmlndXJhdGlvbkVsZW1lbnQgZWxlbWVudDsKKwkJcHJpdmF0ZSBTdHJpbmcgaWQsIG5hbWUsIGltYWdlTG9jOworCQlwcml2YXRlIEltYWdlIGltYWdlOworCQlwcml2YXRlIGJvb2xlYW4gaGlkZGVuOworCQlwdWJsaWMgUmVmZXJlbmNlRXh0ZW5zaW9uKElDb25maWd1cmF0aW9uRWxlbWVudCBlbGVtZW50KSB7CisJCQl0aGlzLmVsZW1lbnQgPSBlbGVtZW50OworCQkJdGhpcy5pZCA9IGVsZW1lbnQuZ2V0QXR0cmlidXRlKCJpZCIpOyAvLyROT04tTkxTLTEkCisJCQl0aGlzLm5hbWUgPSBlbGVtZW50LmdldEF0dHJpYnV0ZSgibmFtZSIpOyAvLyROT04tTkxTLTEkCisJCQl0aGlzLmltYWdlTG9jID0gZWxlbWVudC5nZXRBdHRyaWJ1dGUoImljb24iKTsgLy8kTk9OLU5MUy0xJAorCQkJdGhpcy5oaWRkZW4gPSBCb29sZWFuLnBhcnNlQm9vbGVhbihlbGVtZW50LmdldEF0dHJpYnV0ZSgiaGlkZGVuIikpOyAvLyROT04tTkxTLTEkCisJCX0KKwkJCisJCXB1YmxpYyBTdHJpbmcgZ2V0SWQoKSB7IHJldHVybiB0aGlzLmlkO30KKwkJcHVibGljIFN0cmluZyBnZXROYW1lKCkgeyByZXR1cm4gdGhpcy5uYW1lOyB9CisJCXB1YmxpYyBib29sZWFuIGlzSGlkZGVuKCkgeyByZXR1cm4gdGhpcy5oaWRkZW47IH0KKwkJcHVibGljIEltYWdlIGdldEltYWdlKCkgeyAKKwkJCWlmKCBpbWFnZSA9PSBudWxsICkgeworCQkJCWlmKCBpbWFnZUxvYyAhPSBudWxsICYmIGVsZW1lbnQuZ2V0Q29udHJpYnV0b3IoKS5nZXROYW1lKCkgIT0gbnVsbCkgeworCQkJCQlJbWFnZURlc2NyaXB0b3IgZGVzYyA9IEFic3RyYWN0VUlQbHVnaW4uaW1hZ2VEZXNjcmlwdG9yRnJvbVBsdWdpbihlbGVtZW50LmdldENvbnRyaWJ1dG9yKCkuZ2V0TmFtZSgpLCBpbWFnZUxvYyk7CisJCQkJCWltYWdlID0gZGVzYy5jcmVhdGVJbWFnZSgpOworCQkJCX0KKwkJCX0KKwkJCXJldHVybiBpbWFnZTsKKwkJfQorCQlwdWJsaWMgdm9pZCBkaXNwb3NlSW1hZ2UoKSB7CisJCQlpZiggaW1hZ2UgIT0gbnVsbCApIHsKKwkJCQlpbWFnZS5kaXNwb3NlKCk7CisJCQkJaW1hZ2UgPSBudWxsOworCQkJfQorCQl9CisJfQorCQorCXB1YmxpYyBzdGF0aWMgSVZpcnR1YWxDb21wb25lbnRMYWJlbFByb3ZpZGVyW10gbG9hZERlbGVnYXRlcygpIHsKKwkJSUV4dGVuc2lvblJlZ2lzdHJ5IHJlZ2lzdHJ5ID0gUGxhdGZvcm0uZ2V0RXh0ZW5zaW9uUmVnaXN0cnkoKTsKKwkJSUNvbmZpZ3VyYXRpb25FbGVtZW50W10gY2YgPSByZWdpc3RyeS5nZXRDb25maWd1cmF0aW9uRWxlbWVudHNGb3IoCisJCQkJTW9kdWxlQ29yZVVJUGx1Z2luLlBMVUdJTl9JRCwgInZpcnR1YWxDb21wb25lbnRMYWJlbFByb3ZpZGVyIik7IC8vJE5PTi1OTFMtMSQKKwkJTGlzdDxJQ29uZmlndXJhdGlvbkVsZW1lbnQ+IGxpc3QgPSBBcnJheXMuYXNMaXN0KGNmKTsKKwkJQ29tcGFyYXRvciBjID0gbmV3IENvbXBhcmF0b3I8SUNvbmZpZ3VyYXRpb25FbGVtZW50PigpIHsKKwkJCXB1YmxpYyBpbnQgY29tcGFyZShJQ29uZmlndXJhdGlvbkVsZW1lbnQgbzEsCisJCQkJCUlDb25maWd1cmF0aW9uRWxlbWVudCBvMikgeworCQkJCVN0cmluZyBvMVN0cmluZywgbzJTdHJpbmc7CisJCQkJaW50IG8xaW50LCBvMmludDsKKwkJCQlvMVN0cmluZz1vMS5nZXRBdHRyaWJ1dGUoIndlaWdodCIpOworCQkJCW8yU3RyaW5nPW8yLmdldEF0dHJpYnV0ZSgid2VpZ2h0Iik7CisJCQkJdHJ5IHsKKwkJCQkJbzFpbnQgPSBJbnRlZ2VyLnBhcnNlSW50KG8xU3RyaW5nKTsKKwkJCQl9IGNhdGNoKE51bWJlckZvcm1hdEV4Y2VwdGlvbiBuZmUgKSB7CisJCQkJCW8xaW50ID0gMDsKKwkJCQl9CisJCQkJdHJ5IHsKKwkJCQkJbzJpbnQgPSBJbnRlZ2VyLnBhcnNlSW50KG8yU3RyaW5nKTsKKwkJCQl9IGNhdGNoKE51bWJlckZvcm1hdEV4Y2VwdGlvbiBuZmUgKSB7CisJCQkJCW8yaW50ID0gMDsKKwkJCQl9CisJCQkJcmV0dXJuIG8xaW50LW8yaW50OworCQkJfQorCQl9OworCQlDb2xsZWN0aW9ucy5zb3J0KGxpc3QsIGMpOworCQlBcnJheUxpc3Q8SVZpcnR1YWxDb21wb25lbnRMYWJlbFByb3ZpZGVyPiByZXRMaXN0ID0gbmV3IEFycmF5TGlzdDxJVmlydHVhbENvbXBvbmVudExhYmVsUHJvdmlkZXI+KCk7CisJCUl0ZXJhdG9yPElDb25maWd1cmF0aW9uRWxlbWVudD4gaSA9IGxpc3QuaXRlcmF0b3IoKTsKKwkJd2hpbGUoaS5oYXNOZXh0KCkpIHsKKwkJCXRyeSB7CisJCQkJSUNvbmZpZ3VyYXRpb25FbGVtZW50IGVsID0gaS5uZXh0KCk7CisJCQkJU3RyaW5nIGNsYXNzTmFtZSA9IGVsLmdldEF0dHJpYnV0ZSgiY2xhc3MiKTsKKwkJCQlyZXRMaXN0LmFkZCgoSVZpcnR1YWxDb21wb25lbnRMYWJlbFByb3ZpZGVyKWVsLmNyZWF0ZUV4ZWN1dGFibGVFeHRlbnNpb24oImNsYXNzIikpOworCQkJfSBjYXRjaCggQ29yZUV4Y2VwdGlvbiBjZSkgeworCQkJCS8vIGxvZworCQkJfQorCQl9CisJCXJldHVybiByZXRMaXN0LnRvQXJyYXkobmV3IElWaXJ0dWFsQ29tcG9uZW50TGFiZWxQcm92aWRlcltyZXRMaXN0LnNpemUoKV0pOworCX0KKworfQpkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUudWkvc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vY29tcG9uZW50Y29yZS91aS9pbnRlcm5hbC9wcm9wZXJ0eXBhZ2UvRm9sZGVyTWFwcGluZ1dpemFyZEZyYWdtZW50LmphdmEgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS51aS9zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9jb21wb25lbnRjb3JlL3VpL2ludGVybmFsL3Byb3BlcnR5cGFnZS9Gb2xkZXJNYXBwaW5nV2l6YXJkRnJhZ21lbnQuamF2YQpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi40ZTg3YjM4Ci0tLSAvZGV2L251bGwKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUudWkvc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vY29tcG9uZW50Y29yZS91aS9pbnRlcm5hbC9wcm9wZXJ0eXBhZ2UvRm9sZGVyTWFwcGluZ1dpemFyZEZyYWdtZW50LmphdmEKQEAgLTAsMCArMSwxNzYgQEAKKy8qKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioKKyAqIENvcHlyaWdodCAoYykgMjAwOSBSZWQgSGF0CisgKiBBbGwgcmlnaHRzIHJlc2VydmVkLiBUaGlzIHByb2dyYW0gYW5kIHRoZSBhY2NvbXBhbnlpbmcgbWF0ZXJpYWxzCisgKiBhcmUgbWFkZSBhdmFpbGFibGUgdW5kZXIgdGhlIHRlcm1zIG9mIHRoZSBFY2xpcHNlIFB1YmxpYyBMaWNlbnNlIHYxLjAKKyAqIHdoaWNoIGFjY29tcGFuaWVzIHRoaXMgZGlzdHJpYnV0aW9uLCBhbmQgaXMgYXZhaWxhYmxlIGF0CisgKiBodHRwOi8vd3d3LmVjbGlwc2Uub3JnL2xlZ2FsL2VwbC12MTAuaHRtbAorICoKKyAqIENvbnRyaWJ1dG9yczoKKyAqICAgIFJvYiBTdHJ5a2VyIC0gaW5pdGlhbCBpbXBsZW1lbnRhdGlvbiBhbmQgb25nb2luZyBtYWludGVuYW5jZQorICoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKi8KK3BhY2thZ2Ugb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb21wb25lbnRjb3JlLnVpLmludGVybmFsLnByb3BlcnR5cGFnZTsKKworaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucmVzb3VyY2VzLklDb250YWluZXI7CitpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5yZXNvdXJjZXMuSVByb2plY3Q7CitpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5yZXNvdXJjZXMuSVJlc291cmNlOworaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucnVudGltZS5Db3JlRXhjZXB0aW9uOworaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucnVudGltZS5JUGF0aDsKK2ltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJ1bnRpbWUuSVByb2dyZXNzTW9uaXRvcjsKK2ltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJ1bnRpbWUuUGF0aDsKK2ltcG9ydCBvcmcuZWNsaXBzZS5qZmFjZS52aWV3ZXJzLklTZWxlY3Rpb25DaGFuZ2VkTGlzdGVuZXI7CitpbXBvcnQgb3JnLmVjbGlwc2UuamZhY2Uudmlld2Vycy5JU3RydWN0dXJlZFNlbGVjdGlvbjsKK2ltcG9ydCBvcmcuZWNsaXBzZS5qZmFjZS52aWV3ZXJzLklUcmVlQ29udGVudFByb3ZpZGVyOworaW1wb3J0IG9yZy5lY2xpcHNlLmpmYWNlLnZpZXdlcnMuTGFiZWxQcm92aWRlcjsKK2ltcG9ydCBvcmcuZWNsaXBzZS5qZmFjZS52aWV3ZXJzLlNlbGVjdGlvbkNoYW5nZWRFdmVudDsKK2ltcG9ydCBvcmcuZWNsaXBzZS5qZmFjZS52aWV3ZXJzLlRyZWVWaWV3ZXI7CitpbXBvcnQgb3JnLmVjbGlwc2UuamZhY2Uudmlld2Vycy5WaWV3ZXI7CitpbXBvcnQgb3JnLmVjbGlwc2UuamZhY2Uudmlld2Vycy5WaWV3ZXJGaWx0ZXI7CitpbXBvcnQgb3JnLmVjbGlwc2Uuc3d0LlNXVDsKK2ltcG9ydCBvcmcuZWNsaXBzZS5zd3QuZ3JhcGhpY3MuSW1hZ2U7CitpbXBvcnQgb3JnLmVjbGlwc2Uuc3d0LmxheW91dC5HcmlkRGF0YTsKK2ltcG9ydCBvcmcuZWNsaXBzZS5zd3QubGF5b3V0LkdyaWRMYXlvdXQ7CitpbXBvcnQgb3JnLmVjbGlwc2Uuc3d0LndpZGdldHMuQ29tcG9zaXRlOworaW1wb3J0IG9yZy5lY2xpcHNlLnVpLklTaGFyZWRJbWFnZXM7CitpbXBvcnQgb3JnLmVjbGlwc2UudWkuUGxhdGZvcm1VSTsKK2ltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUudWkuSU1vZHVsZUNvcmVVSUNvbnRleHRJZHM7CitpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb21wb25lbnRjb3JlLnVpLk1lc3NhZ2VzOworaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS51aS5pbnRlcm5hbC50YXNrd2l6YXJkLklXaXphcmRIYW5kbGU7CitpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb21wb25lbnRjb3JlLnVpLmludGVybmFsLnRhc2t3aXphcmQuV2l6YXJkRnJhZ21lbnQ7CitpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb21wb25lbnRjb3JlLnVpLnByb3BlcnR5cGFnZS5BZGRNb2R1bGVEZXBlbmRlbmNpZXNQcm9wZXJ0aWVzUGFnZS5Db21wb25lbnRSZXNvdXJjZVByb3h5OworaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS51aS5wcm9wZXJ0eXBhZ2UuSVJlZmVyZW5jZVdpemFyZENvbnN0YW50czsKKworcHVibGljIGNsYXNzIEZvbGRlck1hcHBpbmdXaXphcmRGcmFnbWVudCBleHRlbmRzIFdpemFyZEZyYWdtZW50IHsKKwlwcml2YXRlIElQcm9qZWN0IHByb2plY3Q7CisJcHJpdmF0ZSBUcmVlVmlld2VyIHZpZXdlcjsKKwlwcml2YXRlIElDb250YWluZXIgc2VsZWN0ZWQgPSBudWxsOworCXByb3RlY3RlZCBJV2l6YXJkSGFuZGxlIGhhbmRsZTsKKworCWJvb2xlYW4gaXNDb21wbGV0ZSA9IGZhbHNlOworCisJcHVibGljIGJvb2xlYW4gaXNDb21wbGV0ZSgpIHsKKwkJcmV0dXJuIGlzQ29tcGxldGU7CisJfQorCQorCXB1YmxpYyBib29sZWFuIGhhc0NvbXBvc2l0ZSgpIHsKKwkJcmV0dXJuIHRydWU7CisJfQorCisJcHVibGljIENvbXBvc2l0ZSBjcmVhdGVDb21wb3NpdGUoQ29tcG9zaXRlIHBhcmVudCwgSVdpemFyZEhhbmRsZSBoYW5kbGUpIHsKKwkJdGhpcy5oYW5kbGUgPSBoYW5kbGU7CisJCWhhbmRsZS5zZXRUaXRsZShNZXNzYWdlcy5BZGRGb2xkZXIpOworCQloYW5kbGUuc2V0RGVzY3JpcHRpb24oTWVzc2FnZXMuQWRkRm9sZGVyTWFwcGluZ3MpOworCQlwcm9qZWN0ID0gKElQcm9qZWN0KWdldFRhc2tNb2RlbCgpLmdldE9iamVjdChJUmVmZXJlbmNlV2l6YXJkQ29uc3RhbnRzLlBST0pFQ1QpOwkJCisJCUNvbXBvc2l0ZSBjID0gbmV3IENvbXBvc2l0ZShwYXJlbnQsIFNXVC5OT05FKTsKKwkJR3JpZExheW91dCBsYXlvdXQgPSBuZXcgR3JpZExheW91dCgpOworCQljLnNldExheW91dChsYXlvdXQpOworCQlQbGF0Zm9ybVVJLmdldFdvcmtiZW5jaCgpLmdldEhlbHBTeXN0ZW0oKS5zZXRIZWxwKGMsIElNb2R1bGVDb3JlVUlDb250ZXh0SWRzLkRFUExPWU1FTlRfQVNTRU1CTFlfUFJFRkVSRU5DRV9QQUdFX0FERF9ORVdfRk9MREVSX01BUFBJTkdfUDEpOworCQl0aGlzLnZpZXdlciA9IG5ldyBUcmVlVmlld2VyKGMsIFNXVC5TSU5HTEUgfCBTV1QuSF9TQ1JPTEwgfCBTV1QuVl9TQ1JPTEwgfCBTV1QuQk9SREVSKTsKKwkJdmlld2VyLnNldENvbnRlbnRQcm92aWRlcihnZXRDb250ZW50UHJvdmlkZXIoKSk7CisJCXZpZXdlci5zZXRMYWJlbFByb3ZpZGVyKGdldExhYmVsUHJvdmlkZXIoKSk7CisJCXZpZXdlci5hZGRGaWx0ZXIoZ2V0RmlsdGVyKCkpOworCQl2aWV3ZXIuc2V0SW5wdXQocHJvamVjdCk7CisJCXZpZXdlci5hZGRTZWxlY3Rpb25DaGFuZ2VkTGlzdGVuZXIoZ2V0TGlzdGVuZXIoKSk7CisJCUdyaWREYXRhIGRhdGEgPSBuZXcgR3JpZERhdGEoR3JpZERhdGEuRklMTF9CT1RIKTsKKwkJZGF0YS53aWR0aEhpbnQgPSAzOTA7CisJCWRhdGEuaGVpZ2h0SGludCA9IDE4NTsKKwkJdmlld2VyLmdldFRyZWUoKS5zZXRMYXlvdXREYXRhKGRhdGEpOworCQlyZXR1cm4gYzsKKwl9CisJCisJcHJvdGVjdGVkIElTZWxlY3Rpb25DaGFuZ2VkTGlzdGVuZXIgZ2V0TGlzdGVuZXIoKSB7CisJCXJldHVybiBuZXcgSVNlbGVjdGlvbkNoYW5nZWRMaXN0ZW5lcigpIHsKKwkJCXB1YmxpYyB2b2lkIHNlbGVjdGlvbkNoYW5nZWQoU2VsZWN0aW9uQ2hhbmdlZEV2ZW50IGV2ZW50KSB7CisJCQkJSVN0cnVjdHVyZWRTZWxlY3Rpb24gc2VsID0gKElTdHJ1Y3R1cmVkU2VsZWN0aW9uKXZpZXdlci5nZXRTZWxlY3Rpb24oKTsKKwkJCQlPYmplY3QgZmlyc3QgPSBzZWwuZ2V0Rmlyc3RFbGVtZW50KCk7CisJCQkJaWYoIGZpcnN0IGluc3RhbmNlb2YgSUNvbnRhaW5lcikgeworCQkJCQlzZWxlY3RlZCA9IChJQ29udGFpbmVyKWZpcnN0OworCQkJCQlpZighaXNDb21wbGV0ZSkgeworCQkJCQkJaXNDb21wbGV0ZSA9IHRydWU7CisJCQkJCQloYW5kbGUudXBkYXRlKCk7CisJCQkJCX0KKwkJCQl9CisJCQl9CisJCX07CisJfQorCQorCXB1YmxpYyBJQ29udGFpbmVyIGdldFNlbGVjdGVkKCkgeworCQlyZXR1cm4gc2VsZWN0ZWQ7CisJfQorCQorCXByb3RlY3RlZCBWaWV3ZXJGaWx0ZXIgZ2V0RmlsdGVyKCkgeworCQlyZXR1cm4gbmV3IFZpZXdlckZpbHRlcigpIHsKKwkJCXB1YmxpYyBib29sZWFuIHNlbGVjdChWaWV3ZXIgdmlld2VyLCBPYmplY3QgcGFyZW50RWxlbWVudCwKKwkJCQkJT2JqZWN0IGVsZW1lbnQpIHsKKwkJCQlyZXR1cm4gZWxlbWVudCBpbnN0YW5jZW9mIElDb250YWluZXI7CisJCQl9CisJCX07CisJfQorCQorCXByb3RlY3RlZCBJVHJlZUNvbnRlbnRQcm92aWRlciBnZXRDb250ZW50UHJvdmlkZXIoKSB7CisJCXJldHVybiBuZXcgSVRyZWVDb250ZW50UHJvdmlkZXIoKSB7CisJCQkKKwkJCXB1YmxpYyB2b2lkIGlucHV0Q2hhbmdlZChWaWV3ZXIgdmlld2VyLCBPYmplY3Qgb2xkSW5wdXQsIE9iamVjdCBuZXdJbnB1dCkgeworCQkJfQorCQkJCisJCQlwdWJsaWMgdm9pZCBkaXNwb3NlKCkgeworCQkJfQorCQkJCisJCQlwdWJsaWMgT2JqZWN0W10gZ2V0RWxlbWVudHMoT2JqZWN0IGlucHV0RWxlbWVudCkgeworCQkJCXRyeSB7CisJCQkJCXJldHVybiBwcm9qZWN0Lm1lbWJlcnMoKTsKKwkJCQl9IGNhdGNoKCBDb3JlRXhjZXB0aW9uIGNlICkgeworCQkJCQlyZXR1cm4gbmV3IE9iamVjdFtde307CisJCQkJfQorCQkJfQorCQkJCisJCQlwdWJsaWMgYm9vbGVhbiBoYXNDaGlsZHJlbihPYmplY3QgZWxlbWVudCkgeworCQkJCWlmKCBlbGVtZW50IGluc3RhbmNlb2YgSUNvbnRhaW5lcikgeworCQkJCQl0cnkgeworCQkJCQkJcmV0dXJuICgoSUNvbnRhaW5lcillbGVtZW50KS5tZW1iZXJzKCkubGVuZ3RoID4gMDsKKwkJCQkJfSBjYXRjaCggQ29yZUV4Y2VwdGlvbiBjZSApIHsKKwkJCQkJfQorCQkJCX0KKwkJCQlyZXR1cm4gZmFsc2U7CisJCQl9CisJCQkKKwkJCXB1YmxpYyBPYmplY3QgZ2V0UGFyZW50KE9iamVjdCBlbGVtZW50KSB7CisJCQkJaWYoIGVsZW1lbnQgaW5zdGFuY2VvZiBJUmVzb3VyY2UpCisJCQkJCXJldHVybiAoKElSZXNvdXJjZSllbGVtZW50KS5nZXRQYXJlbnQoKTsKKwkJCQlyZXR1cm4gbnVsbDsKKwkJCX0KKwkJCQorCQkJcHVibGljIE9iamVjdFtdIGdldENoaWxkcmVuKE9iamVjdCBwYXJlbnRFbGVtZW50KSB7CisJCQkJaWYoIHBhcmVudEVsZW1lbnQgaW5zdGFuY2VvZiBJQ29udGFpbmVyKSB7CisJCQkJCXRyeSB7CisJCQkJCQlyZXR1cm4gKChJQ29udGFpbmVyKXBhcmVudEVsZW1lbnQpLm1lbWJlcnMoKTsKKwkJCQkJfSBjYXRjaCggQ29yZUV4Y2VwdGlvbiBjZSApIHsKKwkJCQkJfQorCQkJCX0KKwkJCQlyZXR1cm4gbmV3IE9iamVjdFtde307CisJCQl9CisJCX07CisJfQorCisJcHJvdGVjdGVkIExhYmVsUHJvdmlkZXIgZ2V0TGFiZWxQcm92aWRlcigpIHsKKwkJcmV0dXJuIG5ldyBMYWJlbFByb3ZpZGVyKCkgeworCQkJcHVibGljIEltYWdlIGdldEltYWdlKE9iamVjdCBlbGVtZW50KSB7CisJCQkJcmV0dXJuIFBsYXRmb3JtVUkuZ2V0V29ya2JlbmNoKCkuZ2V0U2hhcmVkSW1hZ2VzKCkuZ2V0SW1hZ2UoSVNoYXJlZEltYWdlcy5JTUdfT0JKX0ZPTERFUik7CisJCQl9CisJCQlwdWJsaWMgU3RyaW5nIGdldFRleHQoT2JqZWN0IGVsZW1lbnQpIHsKKwkJCQlpZiggZWxlbWVudCBpbnN0YW5jZW9mIElSZXNvdXJjZSkKKwkJCQkJcmV0dXJuICgoSVJlc291cmNlKWVsZW1lbnQpLmdldE5hbWUoKTsKKwkJCQlyZXR1cm4gZWxlbWVudC50b1N0cmluZygpOworCQkJfQorCQl9OworCX0KKworCisJcHVibGljIHZvaWQgcGVyZm9ybUZpbmlzaChJUHJvZ3Jlc3NNb25pdG9yIG1vbml0b3IpIHRocm93cyBDb3JlRXhjZXB0aW9uIHsKKwkJSUNvbnRhaW5lciBjID0gZ2V0U2VsZWN0ZWQoKTsKKwkJaWYoIGMgIT0gbnVsbCApIHsKKwkJCUlQYXRoIHAgPSBjLmdldFByb2plY3RSZWxhdGl2ZVBhdGgoKTsKKwkJCUNvbXBvbmVudFJlc291cmNlUHJveHkgcHJveHkgPSBuZXcgQ29tcG9uZW50UmVzb3VyY2VQcm94eShwLCBuZXcgUGF0aCgiLyIpKTsgLy8kTk9OLU5MUy0xJAorCQkJZ2V0VGFza01vZGVsKCkucHV0T2JqZWN0KElSZWZlcmVuY2VXaXphcmRDb25zdGFudHMuRk9MREVSX01BUFBJTkcsIHByb3h5KTsKKwkJfQorCX0JCit9CmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS51aS9zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9jb21wb25lbnRjb3JlL3VpL2ludGVybmFsL3Byb3BlcnR5cGFnZS9JUmVmZXJlbmNlRWRpdG9yLmphdmEgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS51aS9zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9jb21wb25lbnRjb3JlL3VpL2ludGVybmFsL3Byb3BlcnR5cGFnZS9JUmVmZXJlbmNlRWRpdG9yLmphdmEKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uZWIwMGFiMwotLS0gL2Rldi9udWxsCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlLnVpL3NyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2NvbXBvbmVudGNvcmUvdWkvaW50ZXJuYWwvcHJvcGVydHlwYWdlL0lSZWZlcmVuY2VFZGl0b3IuamF2YQpAQCAtMCwwICsxLDMxIEBACisvKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqCisgKiBDb3B5cmlnaHQgKGMpIDIwMDkgUmVkIEhhdAorICogQWxsIHJpZ2h0cyByZXNlcnZlZC4gVGhpcyBwcm9ncmFtIGFuZCB0aGUgYWNjb21wYW55aW5nIG1hdGVyaWFscworICogYXJlIG1hZGUgYXZhaWxhYmxlIHVuZGVyIHRoZSB0ZXJtcyBvZiB0aGUgRWNsaXBzZSBQdWJsaWMgTGljZW5zZSB2MS4wCisgKiB3aGljaCBhY2NvbXBhbmllcyB0aGlzIGRpc3RyaWJ1dGlvbiwgYW5kIGlzIGF2YWlsYWJsZSBhdAorICogaHR0cDovL3d3dy5lY2xpcHNlLm9yZy9sZWdhbC9lcGwtdjEwLmh0bWwKKyAqCisgKiBDb250cmlidXRvcnM6CisgKiAgICBSb2IgU3RyeWtlciAtIGluaXRpYWwgaW1wbGVtZW50YXRpb24gYW5kIG9uZ29pbmcgbWFpbnRlbmFuY2UKKyAqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKiovCitwYWNrYWdlIG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS51aS5pbnRlcm5hbC5wcm9wZXJ0eXBhZ2U7CisKK2ltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUucmVzb3VyY2VzLklWaXJ0dWFsUmVmZXJlbmNlOworCisvKioKKyAqIFdpemFyZEZyYWdtZW50cyB0aGF0IGFyZSBwcm92aWRpbmcgcmVmZXJlbmNlIHdpemFyZCBleHRlbnNpb25zCisgKiBtYXkgYWxzbyBpbXBsZW1lbnQgSVJlZmVyZW5jZUVkaXRvciB0byBzaG93IHRoYXQgdGhpcyBwYXJ0aWN1bGFyCisgKiBmcmFnbWVudCBtYXkgYmUgYWJsZSB0byBlZGl0IGNvbXBvbmVudHMgaXQgaGFzIGNyZWF0ZWQuIAorICovCitwdWJsaWMgaW50ZXJmYWNlIElSZWZlcmVuY2VFZGl0b3IgeworCQorCS8qKgorCSAqIFRoZSB3aXphcmQgZnJhZ21lbnQgdGhhdCBpbXBsZW1lbnRzIHRoaXMgaW50ZXJmYWNlIAorCSAqIGFuZCBpcyBhYmxlIHRvIGVkaXQgdGhlIHByb3ZpZGVkIHJlZmVyZW5jZSBpcyBleHBlY3RlZCAKKwkgKiB0byBjYWNoZSB0aGlzIHJlZmVyZW5jZSBhdCB0aGUgdGltZSBjYW5FZGl0KGV0YykgaXMgY2FsbGVkCisJICogCisJICogQHBhcmFtIHZjCisJICogQHJldHVybgorCSAqLworCXB1YmxpYyBib29sZWFuIGNhbkVkaXQoSVZpcnR1YWxSZWZlcmVuY2UgcmVmZXJlbmNlKTsKK30KZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlLnVpL3NyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2NvbXBvbmVudGNvcmUvdWkvaW50ZXJuYWwvcHJvcGVydHlwYWdlL0lWaXJ0dWFsQ29tcG9uZW50TGFiZWxQcm92aWRlci5qYXZhIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUudWkvc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vY29tcG9uZW50Y29yZS91aS9pbnRlcm5hbC9wcm9wZXJ0eXBhZ2UvSVZpcnR1YWxDb21wb25lbnRMYWJlbFByb3ZpZGVyLmphdmEKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uNjAwN2MwMwotLS0gL2Rldi9udWxsCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlLnVpL3NyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2NvbXBvbmVudGNvcmUvdWkvaW50ZXJuYWwvcHJvcGVydHlwYWdlL0lWaXJ0dWFsQ29tcG9uZW50TGFiZWxQcm92aWRlci5qYXZhCkBAIC0wLDAgKzEsNDMgQEAKKy8qKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioKKyAqIENvcHlyaWdodCAoYykgMjAwOSBSZWQgSGF0CisgKiBBbGwgcmlnaHRzIHJlc2VydmVkLiBUaGlzIHByb2dyYW0gYW5kIHRoZSBhY2NvbXBhbnlpbmcgbWF0ZXJpYWxzCisgKiBhcmUgbWFkZSBhdmFpbGFibGUgdW5kZXIgdGhlIHRlcm1zIG9mIHRoZSBFY2xpcHNlIFB1YmxpYyBMaWNlbnNlIHYxLjAKKyAqIHdoaWNoIGFjY29tcGFuaWVzIHRoaXMgZGlzdHJpYnV0aW9uLCBhbmQgaXMgYXZhaWxhYmxlIGF0CisgKiBodHRwOi8vd3d3LmVjbGlwc2Uub3JnL2xlZ2FsL2VwbC12MTAuaHRtbAorICoKKyAqIENvbnRyaWJ1dG9yczoKKyAqICAgIFJvYiBTdHJ5a2VyIC0gaW5pdGlhbCBpbXBsZW1lbnRhdGlvbiBhbmQgb25nb2luZyBtYWludGVuYW5jZQorICoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKi8KK3BhY2thZ2Ugb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb21wb25lbnRjb3JlLnVpLmludGVybmFsLnByb3BlcnR5cGFnZTsKKworaW1wb3J0IG9yZy5lY2xpcHNlLnN3dC5ncmFwaGljcy5JbWFnZTsKK2ltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUucmVzb3VyY2VzLklWaXJ0dWFsQ29tcG9uZW50OworCitwdWJsaWMgaW50ZXJmYWNlIElWaXJ0dWFsQ29tcG9uZW50TGFiZWxQcm92aWRlciB7CisJLyoqCisJICogUmV0dXJuIHdoZXRoZXIgdGhpcyBsYWJlbCBwcm92aWRlciBjYW4gcHJvdmlkZQorCSAqIFVJIGVsZW1lbnRzIGZvciB0aGlzIGNvbXBvbmVudAorCSAqIEBwYXJhbSBjb21wb25lbnQKKwkgKiBAcmV0dXJuCisJICovCisJcHVibGljIGJvb2xlYW4gY2FuSGFuZGxlKElWaXJ0dWFsQ29tcG9uZW50IGNvbXBvbmVudCk7CisJCisJLyoqCisJICogUmV0dXJuIGEgc3RyaW5nIHJlcHJlc2VudGF0aW9uIGZvciB0aGlzIGNvbXBvbmVudAorCSAqIEBwYXJhbSBjb21wb25lbnQKKwkgKiBAcmV0dXJuCisJICovCisJcHVibGljIFN0cmluZyBnZXRTb3VyY2VUZXh0KElWaXJ0dWFsQ29tcG9uZW50IGNvbXBvbmVudCk7CisJCisJLyoqCisJICogUmV0dXJuIGFuIGltYWdlIHJlcHJlc2VudGluZyB0aGlzIGNvbXBvbmVudAorCSAqIEBwYXJhbSBjb21wb25lbnQKKwkgKiBAcmV0dXJuCisJICovCisJcHVibGljIEltYWdlIGdldFNvdXJjZUltYWdlKElWaXJ0dWFsQ29tcG9uZW50IGNvbXBvbmVudCk7CisJCisJLyoqCisJICogQ2xlYW4gdXAgYW55IGltYWdlcyB5b3UgY3JlYXRlZAorCSAqLworCXB1YmxpYyB2b2lkIGRpc3Bvc2UoKTsKK30KZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlLnVpL3NyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2NvbXBvbmVudGNvcmUvdWkvaW50ZXJuYWwvcHJvcGVydHlwYWdlL05ld1JlZmVyZW5jZVJvb3RXaXphcmRGcmFnbWVudC5qYXZhIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUudWkvc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vY29tcG9uZW50Y29yZS91aS9pbnRlcm5hbC9wcm9wZXJ0eXBhZ2UvTmV3UmVmZXJlbmNlUm9vdFdpemFyZEZyYWdtZW50LmphdmEKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uZTVjNjYwNAotLS0gL2Rldi9udWxsCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlLnVpL3NyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2NvbXBvbmVudGNvcmUvdWkvaW50ZXJuYWwvcHJvcGVydHlwYWdlL05ld1JlZmVyZW5jZVJvb3RXaXphcmRGcmFnbWVudC5qYXZhCkBAIC0wLDAgKzEsMTc0IEBACisvKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqCisgKiBDb3B5cmlnaHQgKGMpIDIwMDkgUmVkIEhhdAorICogQWxsIHJpZ2h0cyByZXNlcnZlZC4gVGhpcyBwcm9ncmFtIGFuZCB0aGUgYWNjb21wYW55aW5nIG1hdGVyaWFscworICogYXJlIG1hZGUgYXZhaWxhYmxlIHVuZGVyIHRoZSB0ZXJtcyBvZiB0aGUgRWNsaXBzZSBQdWJsaWMgTGljZW5zZSB2MS4wCisgKiB3aGljaCBhY2NvbXBhbmllcyB0aGlzIGRpc3RyaWJ1dGlvbiwgYW5kIGlzIGF2YWlsYWJsZSBhdAorICogaHR0cDovL3d3dy5lY2xpcHNlLm9yZy9sZWdhbC9lcGwtdjEwLmh0bWwKKyAqCisgKiBDb250cmlidXRvcnM6CisgKiAgICBSb2IgU3RyeWtlciAtIGluaXRpYWwgaW1wbGVtZW50YXRpb24gYW5kIG9uZ29pbmcgbWFpbnRlbmFuY2UKKyAqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKiovCitwYWNrYWdlIG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS51aS5pbnRlcm5hbC5wcm9wZXJ0eXBhZ2U7CisKK2ltcG9ydCBqYXZhLnV0aWwuQXJyYXlMaXN0OworaW1wb3J0IGphdmEudXRpbC5IYXNoTWFwOworaW1wb3J0IGphdmEudXRpbC5MaXN0OworaW1wb3J0IGphdmEudXRpbC5NYXA7CisKK2ltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJlc291cmNlcy5SZXNvdXJjZXNQbHVnaW47CitpbXBvcnQgb3JnLmVjbGlwc2UuamZhY2Uudmlld2Vycy5Eb3VibGVDbGlja0V2ZW50OworaW1wb3J0IG9yZy5lY2xpcHNlLmpmYWNlLnZpZXdlcnMuSURvdWJsZUNsaWNrTGlzdGVuZXI7CitpbXBvcnQgb3JnLmVjbGlwc2UuamZhY2Uudmlld2Vycy5JU2VsZWN0aW9uQ2hhbmdlZExpc3RlbmVyOworaW1wb3J0IG9yZy5lY2xpcHNlLmpmYWNlLnZpZXdlcnMuSVN0cnVjdHVyZWRTZWxlY3Rpb247CitpbXBvcnQgb3JnLmVjbGlwc2UuamZhY2Uudmlld2Vycy5JVHJlZUNvbnRlbnRQcm92aWRlcjsKK2ltcG9ydCBvcmcuZWNsaXBzZS5qZmFjZS52aWV3ZXJzLkxhYmVsUHJvdmlkZXI7CitpbXBvcnQgb3JnLmVjbGlwc2UuamZhY2Uudmlld2Vycy5TZWxlY3Rpb25DaGFuZ2VkRXZlbnQ7CitpbXBvcnQgb3JnLmVjbGlwc2UuamZhY2Uudmlld2Vycy5UcmVlVmlld2VyOworaW1wb3J0IG9yZy5lY2xpcHNlLmpmYWNlLnZpZXdlcnMuVmlld2VyOworaW1wb3J0IG9yZy5lY2xpcHNlLnN3dC5TV1Q7CitpbXBvcnQgb3JnLmVjbGlwc2Uuc3d0LmdyYXBoaWNzLkltYWdlOworaW1wb3J0IG9yZy5lY2xpcHNlLnN3dC5sYXlvdXQuRmlsbExheW91dDsKK2ltcG9ydCBvcmcuZWNsaXBzZS5zd3Qud2lkZ2V0cy5Db21wb3NpdGU7CitpbXBvcnQgb3JnLmVjbGlwc2UudWkuUGxhdGZvcm1VSTsKK2ltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUudWkuSU1vZHVsZUNvcmVVSUNvbnRleHRJZHM7CitpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb21wb25lbnRjb3JlLnVpLk1lc3NhZ2VzOworaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS51aS5pbnRlcm5hbC5wcm9wZXJ0eXBhZ2UuRGVwZW5kZW5jeVBhZ2VFeHRlbnNpb25NYW5hZ2VyLlJlZmVyZW5jZUV4dGVuc2lvbjsKK2ltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUudWkuaW50ZXJuYWwudGFza3dpemFyZC5JV2l6YXJkSGFuZGxlOworaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS51aS5pbnRlcm5hbC50YXNrd2l6YXJkLldpemFyZEZyYWdtZW50OworCitwdWJsaWMgY2xhc3MgTmV3UmVmZXJlbmNlUm9vdFdpemFyZEZyYWdtZW50IGV4dGVuZHMgV2l6YXJkRnJhZ21lbnQgeworCXByb3RlY3RlZCBNYXA8U3RyaW5nLCBXaXphcmRGcmFnbWVudD4gZnJhZ21lbnRNYXAgPSAKKwkJbmV3IEhhc2hNYXA8U3RyaW5nLCBXaXphcmRGcmFnbWVudD4oKTsKKwlwcml2YXRlIElXaXphcmRIYW5kbGUgd2l6YXJkOworCXByaXZhdGUgVHJlZVZpZXdlciB2aWV3ZXI7CisJcHJpdmF0ZSBSZWZlcmVuY2VFeHRlbnNpb25bXSBleHRlbnNpb25zID0gbnVsbDsKKwlwdWJsaWMgTmV3UmVmZXJlbmNlUm9vdFdpemFyZEZyYWdtZW50KFJlZmVyZW5jZUV4dGVuc2lvbltdIGV4dGVuc2lvbnMpIHsKKwkJdGhpcy5leHRlbnNpb25zID0gZXh0ZW5zaW9ucyAhPSBudWxsID8gZXh0ZW5zaW9ucyA6CisJCQkJRGVwZW5kZW5jeVBhZ2VFeHRlbnNpb25NYW5hZ2VyLmdldE1hbmFnZXIoKS5nZXRFeHBvc2VkUmVmZXJlbmNlRXh0ZW5zaW9ucygpOworCQlpZiggdGhpcy5leHRlbnNpb25zLmxlbmd0aCA9PSAwICkKKwkJCXNldENvbXBsZXRlKGZhbHNlKTsKKwl9CisJCisJcHVibGljIGJvb2xlYW4gaGFzQ29tcG9zaXRlKCkgeworCQlyZXR1cm4gdHJ1ZTsKKwl9CisKKwlwdWJsaWMgQ29tcG9zaXRlIGNyZWF0ZUNvbXBvc2l0ZShDb21wb3NpdGUgcGFyZW50LCBmaW5hbCBJV2l6YXJkSGFuZGxlIHdpemFyZCkgeworCQl0aGlzLndpemFyZCA9IHdpemFyZDsKKwkJd2l6YXJkLnNldFRpdGxlKE1lc3NhZ2VzLk5ld1JlZmVyZW5jZVRpdGxlKTsKKwkJd2l6YXJkLnNldERlc2NyaXB0aW9uKE1lc3NhZ2VzLk5ld1JlZmVyZW5jZURlc2NyaXB0aW9uKTsKKwkJQ29tcG9zaXRlIGMgPSBuZXcgQ29tcG9zaXRlKHBhcmVudCwgU1dULk5PTkUpOworCQlQbGF0Zm9ybVVJLmdldFdvcmtiZW5jaCgpLmdldEhlbHBTeXN0ZW0oKS5zZXRIZWxwKGMsIElNb2R1bGVDb3JlVUlDb250ZXh0SWRzLkRFUExPWU1FTlRfQVNTRU1CTFlfUFJFRkVSRU5DRV9QQUdFX0FERF9ORVdfUkVGRVJFTkNFX1AxKTsKKwkJYy5zZXRMYXlvdXQobmV3IEZpbGxMYXlvdXQoKSk7CisJCXZpZXdlciA9IG5ldyBUcmVlVmlld2VyKGMsIFNXVC5TSU5HTEUgfCBTV1QuQk9SREVSKTsKKwkJdmlld2VyLnNldExhYmVsUHJvdmlkZXIoZ2V0TGFiZWxQcm92aWRlcigpKTsKKwkJdmlld2VyLnNldENvbnRlbnRQcm92aWRlcihnZXRDb250ZW50UHJvdmlkZXIoKSk7CisJCXZpZXdlci5zZXRJbnB1dChSZXNvdXJjZXNQbHVnaW4uZ2V0V29ya3NwYWNlKCkpOworCQl2aWV3ZXIuYWRkU2VsZWN0aW9uQ2hhbmdlZExpc3RlbmVyKG5ldyBJU2VsZWN0aW9uQ2hhbmdlZExpc3RlbmVyKCkgeworCQkJcHVibGljIHZvaWQgc2VsZWN0aW9uQ2hhbmdlZChTZWxlY3Rpb25DaGFuZ2VkRXZlbnQgZXZlbnQpIHsKKwkJCQl2aWV3ZXJTZWxlY3Rpb25DaGFuZ2VkKCk7CisJCQl9CisJCX0pOworCQl2aWV3ZXIuYWRkRG91YmxlQ2xpY2tMaXN0ZW5lcihuZXcgSURvdWJsZUNsaWNrTGlzdGVuZXIoKSB7CisJCQlwdWJsaWMgdm9pZCBkb3VibGVDbGljayhEb3VibGVDbGlja0V2ZW50IGV2ZW50KSB7CisJCQkJYWR2YW5jZVRvTmV4dFBhZ2VPckZpbmlzaCgpOworCQkJfQorCQl9KTsKKwkJcmV0dXJuIGM7CisJfQorCisJcHJvdGVjdGVkIHZvaWQgdmlld2VyU2VsZWN0aW9uQ2hhbmdlZCgpIHsKKwkJd2l6YXJkLnVwZGF0ZSgpOworCX0KKwkKKwlwcm90ZWN0ZWQgV2l6YXJkRnJhZ21lbnQgZ2V0V2l6YXJkRnJhZ21lbnQoU3RyaW5nIGV4dGVuc2lvblBvaW50SUQpIHsKKwkJdHJ5IHsKKwkJCVdpemFyZEZyYWdtZW50IGZyYWdtZW50ID0gZnJhZ21lbnRNYXAuZ2V0KGV4dGVuc2lvblBvaW50SUQpOworCQkJaWYgKGZyYWdtZW50ICE9IG51bGwpCisJCQkJcmV0dXJuIGZyYWdtZW50OworCQl9IGNhdGNoIChFeGNlcHRpb24gZSkgeworCQkJLy8gaWdub3JlCisJCX0KKwkJCisJCVdpemFyZEZyYWdtZW50IGZyYWdtZW50ID0gRGVwZW5kZW5jeVBhZ2VFeHRlbnNpb25NYW5hZ2VyLmdldE1hbmFnZXIoKS5sb2FkUmVmZXJlbmNlV2l6YXJkRnJhZ21lbnQoZXh0ZW5zaW9uUG9pbnRJRCk7CisJCWlmIChmcmFnbWVudCAhPSBudWxsKQorCQkJZnJhZ21lbnRNYXAucHV0KGV4dGVuc2lvblBvaW50SUQsIGZyYWdtZW50KTsKKwkJcmV0dXJuIGZyYWdtZW50OworCX0KKworCXB1YmxpYyBMaXN0IGdldENoaWxkRnJhZ21lbnRzKCkgeworCQlMaXN0PFdpemFyZEZyYWdtZW50PiBsaXN0SW1wbCA9IG5ldyBBcnJheUxpc3Q8V2l6YXJkRnJhZ21lbnQ+KCk7CisJCWNyZWF0ZUNoaWxkRnJhZ21lbnRzKGxpc3RJbXBsKTsKKwkJcmV0dXJuIGxpc3RJbXBsOworCX0KKworCXByb3RlY3RlZCB2b2lkIGNyZWF0ZUNoaWxkRnJhZ21lbnRzKExpc3Q8V2l6YXJkRnJhZ21lbnQ+IGxpc3QpIHsKKwkJLy8gSW5zdGFudGlhdGUgYW5kIGFkZCB0aGUgZnJhZ21lbnQgZm9yIHRoZSBjdXJyZW50IElECisJCWlmKCB2aWV3ZXIgIT0gbnVsbCApIHsKKwkJCUlTdHJ1Y3R1cmVkU2VsZWN0aW9uIHNlbCA9IChJU3RydWN0dXJlZFNlbGVjdGlvbil2aWV3ZXIuZ2V0U2VsZWN0aW9uKCk7CisJCQlSZWZlcmVuY2VFeHRlbnNpb24gc2VsZWN0ZWQgPSAoUmVmZXJlbmNlRXh0ZW5zaW9uKXNlbC5nZXRGaXJzdEVsZW1lbnQoKTsKKwkJCWlmKCBzZWxlY3RlZCAhPSBudWxsICkgeworCQkJCVdpemFyZEZyYWdtZW50IGNoaWxkID0gZ2V0V2l6YXJkRnJhZ21lbnQoc2VsZWN0ZWQuZ2V0SWQoKSk7CisJCQkJaWYoIGNoaWxkICE9IG51bGwgKQorCQkJCQlsaXN0LmFkZChjaGlsZCk7CisJCQl9CisJCX0KKwl9CisKKwlwdWJsaWMgYm9vbGVhbiBpc0NvbXBsZXRlKCkgeworCQlyZXR1cm4gdHJ1ZTsKKwl9CisKKwkKKwlwcml2YXRlIExhYmVsUHJvdmlkZXIgbGFiZWxQcm92aWRlciA9IG51bGw7CisJcHJpdmF0ZSBJVHJlZUNvbnRlbnRQcm92aWRlciBjb250ZW50UHJvdmlkZXIgPSBudWxsOworCXByb3RlY3RlZCBMYWJlbFByb3ZpZGVyIGdldExhYmVsUHJvdmlkZXIoKSB7CisJCWlmKCBsYWJlbFByb3ZpZGVyID09IG51bGwgKSB7CisJCQlsYWJlbFByb3ZpZGVyID0gbmV3IExhYmVsUHJvdmlkZXIoKSB7CisJCQkJcHVibGljIEltYWdlIGdldEltYWdlKE9iamVjdCBlbGVtZW50KSB7CisJCQkJCWlmKCBlbGVtZW50IGluc3RhbmNlb2YgUmVmZXJlbmNlRXh0ZW5zaW9uKQorCQkJCQkJcmV0dXJuICgoUmVmZXJlbmNlRXh0ZW5zaW9uKWVsZW1lbnQpLmdldEltYWdlKCk7CisJCQkJCXJldHVybiBudWxsOworCQkJCX0KKwkJCQlwdWJsaWMgU3RyaW5nIGdldFRleHQoT2JqZWN0IGVsZW1lbnQpIHsKKwkJCQkJaWYoIGVsZW1lbnQgaW5zdGFuY2VvZiBSZWZlcmVuY2VFeHRlbnNpb24pCisJCQkJCQlyZXR1cm4gKChSZWZlcmVuY2VFeHRlbnNpb24pZWxlbWVudCkuZ2V0TmFtZSgpOworCQkJCQlyZXR1cm4gZWxlbWVudCA9PSBudWxsID8gIiIgOiBlbGVtZW50LnRvU3RyaW5nKCk7Ly8kTk9OLU5MUy0xJAorCQkJCX0KKwkJCSAgIHB1YmxpYyB2b2lkIGRpc3Bvc2UoKSB7CisJCQkgICAgCXN1cGVyLmRpc3Bvc2UoKTsKKwkJCSAgICAJaWYoIGV4dGVuc2lvbnMgIT0gbnVsbCApIHsKKwkJCSAgICAJCWZvciggaW50IGkgPSAwOyBpIDwgZXh0ZW5zaW9ucy5sZW5ndGg7IGkrKykgeworCQkJICAgIAkJCWV4dGVuc2lvbnNbaV0uZGlzcG9zZUltYWdlKCk7CisJCQkgICAgCQl9CisJCQkgICAgCX0KKwkJCSAgICB9CisJCQl9OworCQl9CisJCXJldHVybiBsYWJlbFByb3ZpZGVyOworCX0KKwkKKwlwcm90ZWN0ZWQgSVRyZWVDb250ZW50UHJvdmlkZXIgZ2V0Q29udGVudFByb3ZpZGVyKCkgeworCQlpZiggY29udGVudFByb3ZpZGVyID09IG51bGwgKSB7CisJCQljb250ZW50UHJvdmlkZXIgPSBuZXcgSVRyZWVDb250ZW50UHJvdmlkZXIoKSB7CisJCQkJcHVibGljIE9iamVjdFtdIGdldEVsZW1lbnRzKE9iamVjdCBpbnB1dEVsZW1lbnQpIHsKKwkJCQkJcmV0dXJuIGV4dGVuc2lvbnM7CisJCQkJfQorCQkJCXB1YmxpYyB2b2lkIGlucHV0Q2hhbmdlZChWaWV3ZXIgdmlld2VyLCBPYmplY3Qgb2xkSW5wdXQsIE9iamVjdCBuZXdJbnB1dCkgeworCQkJCX0KKwkJCQlwdWJsaWMgdm9pZCBkaXNwb3NlKCkgeworCQkJCX0KKwkJCQlwdWJsaWMgYm9vbGVhbiBoYXNDaGlsZHJlbihPYmplY3QgZWxlbWVudCkgeworCQkJCQlyZXR1cm4gZmFsc2U7CisJCQkJfQorCQkJCXB1YmxpYyBPYmplY3QgZ2V0UGFyZW50KE9iamVjdCBlbGVtZW50KSB7CisJCQkJCXJldHVybiBudWxsOworCQkJCX0KKwkJCQlwdWJsaWMgT2JqZWN0W10gZ2V0Q2hpbGRyZW4oT2JqZWN0IHBhcmVudEVsZW1lbnQpIHsKKwkJCQkJcmV0dXJuIG51bGw7CisJCQkJfQorCQkJfTsKKwkJfQorCQlyZXR1cm4gY29udGVudFByb3ZpZGVyOworCX0KK30KZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlLnVpL3NyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2NvbXBvbmVudGNvcmUvdWkvaW50ZXJuYWwvcHJvcGVydHlwYWdlL05ld1JlZmVyZW5jZVdpemFyZC5qYXZhIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUudWkvc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vY29tcG9uZW50Y29yZS91aS9pbnRlcm5hbC9wcm9wZXJ0eXBhZ2UvTmV3UmVmZXJlbmNlV2l6YXJkLmphdmEKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uYjRmMjQ0MAotLS0gL2Rldi9udWxsCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlLnVpL3NyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2NvbXBvbmVudGNvcmUvdWkvaW50ZXJuYWwvcHJvcGVydHlwYWdlL05ld1JlZmVyZW5jZVdpemFyZC5qYXZhCkBAIC0wLDAgKzEsNzEgQEAKKy8qKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioKKyAqIENvcHlyaWdodCAoYykgMjAwOSBSZWQgSGF0CisgKiBBbGwgcmlnaHRzIHJlc2VydmVkLiBUaGlzIHByb2dyYW0gYW5kIHRoZSBhY2NvbXBhbnlpbmcgbWF0ZXJpYWxzCisgKiBhcmUgbWFkZSBhdmFpbGFibGUgdW5kZXIgdGhlIHRlcm1zIG9mIHRoZSBFY2xpcHNlIFB1YmxpYyBMaWNlbnNlIHYxLjAKKyAqIHdoaWNoIGFjY29tcGFuaWVzIHRoaXMgZGlzdHJpYnV0aW9uLCBhbmQgaXMgYXZhaWxhYmxlIGF0CisgKiBodHRwOi8vd3d3LmVjbGlwc2Uub3JnL2xlZ2FsL2VwbC12MTAuaHRtbAorICoKKyAqIENvbnRyaWJ1dG9yczoKKyAqICAgIFJvYiBTdHJ5a2VyIC0gaW5pdGlhbCBpbXBsZW1lbnRhdGlvbiBhbmQgb25nb2luZyBtYWludGVuYW5jZQorICoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKi8KK3BhY2thZ2Ugb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb21wb25lbnRjb3JlLnVpLmludGVybmFsLnByb3BlcnR5cGFnZTsKKworaW1wb3J0IGphdmEudXRpbC5MaXN0OworCitpbXBvcnQgb3JnLmVjbGlwc2UuamZhY2Uudmlld2Vycy5JU3RydWN0dXJlZFNlbGVjdGlvbjsKK2ltcG9ydCBvcmcuZWNsaXBzZS51aS5JV29ya2JlbmNoOworaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS5yZXNvdXJjZXMuSVZpcnR1YWxSZWZlcmVuY2U7CitpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb21wb25lbnRjb3JlLnVpLk1lc3NhZ2VzOworaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS51aS5pbnRlcm5hbC5wcm9wZXJ0eXBhZ2UuRGVwZW5kZW5jeVBhZ2VFeHRlbnNpb25NYW5hZ2VyLlJlZmVyZW5jZUV4dGVuc2lvbjsKK2ltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUudWkuaW50ZXJuYWwudGFza3dpemFyZC5UYXNrV2l6YXJkOworaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS51aS5pbnRlcm5hbC50YXNrd2l6YXJkLldpemFyZEZyYWdtZW50OworaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS51aS5wcm9wZXJ0eXBhZ2UuSVJlZmVyZW5jZVdpemFyZENvbnN0YW50czsKKworcHVibGljIGNsYXNzIE5ld1JlZmVyZW5jZVdpemFyZCBleHRlbmRzIFRhc2tXaXphcmQgaW1wbGVtZW50cyBJUmVmZXJlbmNlV2l6YXJkQ29uc3RhbnRzIHsKKwlwcml2YXRlIHN0YXRpYyBmaW5hbCBPYmplY3QgUkVGRVJFTkNFX0ZBTUlMWSA9IG5ldyBPYmplY3QoKTsKKwlwdWJsaWMgTmV3UmVmZXJlbmNlV2l6YXJkKCkgeworCQl0aGlzKG51bGwpOworCX0KKwlwdWJsaWMgTmV3UmVmZXJlbmNlV2l6YXJkKFJlZmVyZW5jZUV4dGVuc2lvbltdIGV4dGVuc2lvbnMpIHsKKwkJc3VwZXIoTWVzc2FnZXMuTmV3UmVmZXJlbmNlV2l6YXJkLCBuZXcgUm9vdFdpemFyZEZyYWdtZW50KGV4dGVuc2lvbnMpKTsKKwkJc2V0RmluaXNoSm9iRmFtaWx5KFJFRkVSRU5DRV9GQU1JTFkpOworCQlnZXRSb290RnJhZ21lbnQoKS5zZXRUYXNrTW9kZWwoZ2V0VGFza01vZGVsKCkpOworCX0KKwlwcm90ZWN0ZWQgc3RhdGljIGNsYXNzIFJvb3RXaXphcmRGcmFnbWVudCBleHRlbmRzIFdpemFyZEZyYWdtZW50IHsKKwkJcHJpdmF0ZSBSZWZlcmVuY2VFeHRlbnNpb25bXSBleHRlbnNpb25zID0gbnVsbDsKKwkJcHVibGljIFJvb3RXaXphcmRGcmFnbWVudCgpIHt9CisJCXB1YmxpYyBSb290V2l6YXJkRnJhZ21lbnQoUmVmZXJlbmNlRXh0ZW5zaW9uW10gZXh0ZW5zaW9ucykgeworCQkJdGhpcy5leHRlbnNpb25zID0gZXh0ZW5zaW9uczsKKwkJfQorCisJCXByb3RlY3RlZCB2b2lkIGNyZWF0ZUNoaWxkRnJhZ21lbnRzKExpc3Q8V2l6YXJkRnJhZ21lbnQ+IGxpc3QpIHsKKwkJCUlWaXJ0dWFsUmVmZXJlbmNlIG9yaWdSZWYgPSAoSVZpcnR1YWxSZWZlcmVuY2UpZ2V0VGFza01vZGVsKCkuZ2V0T2JqZWN0KE9SSUdJTkFMX1JFRkVSRU5DRSk7CisJCQlpZiggb3JpZ1JlZiA9PSBudWxsICkKKwkJCQlsaXN0LmFkZChuZXcgTmV3UmVmZXJlbmNlUm9vdFdpemFyZEZyYWdtZW50KGV4dGVuc2lvbnMpKTsKKwkJCWVsc2UgeworCQkJCVdpemFyZEZyYWdtZW50IGZyYWdtZW50ID0gZ2V0Rmlyc3RFZGl0aW5nRnJhZ21lbnQob3JpZ1JlZik7CisJCQkJaWYoIGZyYWdtZW50ICE9IG51bGwgKQorCQkJCQlsaXN0LmFkZChmcmFnbWVudCk7CisJCQl9CisJCQlpZiggbGlzdC5zaXplKCkgPT0gMCApCisJCQkJc2V0Q29tcGxldGUoZmFsc2UpOworCQl9CisJfQorCisJcHVibGljIHN0YXRpYyBXaXphcmRGcmFnbWVudCBnZXRGaXJzdEVkaXRpbmdGcmFnbWVudChJVmlydHVhbFJlZmVyZW5jZSByZWZlcmVuY2UpIHsKKwkJV2l6YXJkRnJhZ21lbnRbXSBmcmFncyA9IERlcGVuZGVuY3lQYWdlRXh0ZW5zaW9uTWFuYWdlci5nZXRNYW5hZ2VyKCkubG9hZEFsbFJlZmVyZW5jZVdpemFyZEZyYWdtZW50cygpOworCQlmb3IoIGludCBpID0gMDsgaSA8IGZyYWdzLmxlbmd0aDsgaSsrICkgeworCQkJaWYoIGZyYWdzW2ldIGluc3RhbmNlb2YgSVJlZmVyZW5jZUVkaXRvciApIHsKKwkJCQlpZiggKChJUmVmZXJlbmNlRWRpdG9yKWZyYWdzW2ldKS5jYW5FZGl0KHJlZmVyZW5jZSkpIHsKKwkJCQkJLy8gYWNjZXB0IGZpcnN0IG9uZQorCQkJCQlyZXR1cm4gZnJhZ3NbaV07CisJCQkJfQorCQkJfQorCQl9CisJCXJldHVybiBudWxsOworCX0KKwkKKwlwdWJsaWMgdm9pZCBpbml0KElXb3JrYmVuY2ggbmV3V29ya2JlbmNoLCBJU3RydWN0dXJlZFNlbGVjdGlvbiBuZXdTZWxlY3Rpb24pIHsKKwkJLy8gZG8gbm90aGluZworCX0KK30KZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlLnVpL3NyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2NvbXBvbmVudGNvcmUvdWkvaW50ZXJuYWwvcHJvcGVydHlwYWdlL1Byb2plY3RSZWZlcmVuY2VXaXphcmRGcmFnbWVudC5qYXZhIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUudWkvc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vY29tcG9uZW50Y29yZS91aS9pbnRlcm5hbC9wcm9wZXJ0eXBhZ2UvUHJvamVjdFJlZmVyZW5jZVdpemFyZEZyYWdtZW50LmphdmEKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uNjE5MTE1OAotLS0gL2Rldi9udWxsCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlLnVpL3NyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2NvbXBvbmVudGNvcmUvdWkvaW50ZXJuYWwvcHJvcGVydHlwYWdlL1Byb2plY3RSZWZlcmVuY2VXaXphcmRGcmFnbWVudC5qYXZhCkBAIC0wLDAgKzEsMjI2IEBACisvKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqCisgKiBDb3B5cmlnaHQgKGMpIDIwMDkgUmVkIEhhdAorICogQWxsIHJpZ2h0cyByZXNlcnZlZC4gVGhpcyBwcm9ncmFtIGFuZCB0aGUgYWNjb21wYW55aW5nIG1hdGVyaWFscworICogYXJlIG1hZGUgYXZhaWxhYmxlIHVuZGVyIHRoZSB0ZXJtcyBvZiB0aGUgRWNsaXBzZSBQdWJsaWMgTGljZW5zZSB2MS4wCisgKiB3aGljaCBhY2NvbXBhbmllcyB0aGlzIGRpc3RyaWJ1dGlvbiwgYW5kIGlzIGF2YWlsYWJsZSBhdAorICogaHR0cDovL3d3dy5lY2xpcHNlLm9yZy9sZWdhbC9lcGwtdjEwLmh0bWwKKyAqCisgKiBDb250cmlidXRvcnM6CisgKiAgICBSb2IgU3RyeWtlciAtIGluaXRpYWwgaW1wbGVtZW50YXRpb24gYW5kIG9uZ29pbmcgbWFpbnRlbmFuY2UKKyAqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKiovCitwYWNrYWdlIG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS51aS5pbnRlcm5hbC5wcm9wZXJ0eXBhZ2U7CisKK2ltcG9ydCBqYXZhLnV0aWwuQXJyYXlMaXN0OworaW1wb3J0IGphdmEudXRpbC5BcnJheXM7CitpbXBvcnQgamF2YS51dGlsLkxpc3Q7CisKK2ltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLmNvbW1hbmRzLkV4ZWN1dGlvbkV4Y2VwdGlvbjsKK2ltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJlc291cmNlcy5JUHJvamVjdDsKK2ltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJlc291cmNlcy5SZXNvdXJjZXNQbHVnaW47CitpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5ydW50aW1lLkNvcmVFeGNlcHRpb247CitpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5ydW50aW1lLklQcm9ncmVzc01vbml0b3I7CitpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5ydW50aW1lLlBhdGg7CitpbXBvcnQgb3JnLmVjbGlwc2UuamZhY2Uudmlld2Vycy5Eb3VibGVDbGlja0V2ZW50OworaW1wb3J0IG9yZy5lY2xpcHNlLmpmYWNlLnZpZXdlcnMuSURvdWJsZUNsaWNrTGlzdGVuZXI7CitpbXBvcnQgb3JnLmVjbGlwc2UuamZhY2Uudmlld2Vycy5JU2VsZWN0aW9uQ2hhbmdlZExpc3RlbmVyOworaW1wb3J0IG9yZy5lY2xpcHNlLmpmYWNlLnZpZXdlcnMuSVN0cnVjdHVyZWRTZWxlY3Rpb247CitpbXBvcnQgb3JnLmVjbGlwc2UuamZhY2Uudmlld2Vycy5JVHJlZUNvbnRlbnRQcm92aWRlcjsKK2ltcG9ydCBvcmcuZWNsaXBzZS5qZmFjZS52aWV3ZXJzLkxhYmVsUHJvdmlkZXI7CitpbXBvcnQgb3JnLmVjbGlwc2UuamZhY2Uudmlld2Vycy5TZWxlY3Rpb25DaGFuZ2VkRXZlbnQ7CitpbXBvcnQgb3JnLmVjbGlwc2UuamZhY2Uudmlld2Vycy5UcmVlVmlld2VyOworaW1wb3J0IG9yZy5lY2xpcHNlLmpmYWNlLnZpZXdlcnMuVmlld2VyOworaW1wb3J0IG9yZy5lY2xpcHNlLm9zZ2kudXRpbC5OTFM7CitpbXBvcnQgb3JnLmVjbGlwc2Uuc3d0LlNXVDsKK2ltcG9ydCBvcmcuZWNsaXBzZS5zd3QuZ3JhcGhpY3MuSW1hZ2U7CitpbXBvcnQgb3JnLmVjbGlwc2Uuc3d0LmxheW91dC5HcmlkRGF0YTsKK2ltcG9ydCBvcmcuZWNsaXBzZS5zd3QubGF5b3V0LkdyaWRMYXlvdXQ7CitpbXBvcnQgb3JnLmVjbGlwc2Uuc3d0LndpZGdldHMuQ29tcG9zaXRlOworaW1wb3J0IG9yZy5lY2xpcHNlLnVpLlBsYXRmb3JtVUk7CitpbXBvcnQgb3JnLmVjbGlwc2UudWkuaWRlLklERTsKK2ltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUuQ29tcG9uZW50Q29yZTsKK2ltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUuTW9kdWxlQ29yZU5hdHVyZTsKK2ltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUuaW50ZXJuYWwuSU1vZHVsZUhhbmRsZXI7CitpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb21wb25lbnRjb3JlLmludGVybmFsLnJlc291cmNlcy5WaXJ0dWFsUmVmZXJlbmNlOworaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS5yZXNvdXJjZXMuSVZpcnR1YWxDb21wb25lbnQ7CitpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb21wb25lbnRjb3JlLnJlc291cmNlcy5JVmlydHVhbFJlZmVyZW5jZTsKK2ltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUudWkuSU1vZHVsZUNvcmVVSUNvbnRleHRJZHM7CitpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb21wb25lbnRjb3JlLnVpLk1lc3NhZ2VzOworaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS51aS5Nb2R1bGVDb3JlVUlQbHVnaW47CitpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb21wb25lbnRjb3JlLnVpLmludGVybmFsLnRhc2t3aXphcmQuSVdpemFyZEhhbmRsZTsKK2ltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUudWkuaW50ZXJuYWwudGFza3dpemFyZC5UYXNrV2l6YXJkUGFnZTsKK2ltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUudWkuaW50ZXJuYWwudGFza3dpemFyZC5XaXphcmRGcmFnbWVudDsKK2ltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUudWkucHJvcGVydHlwYWdlLklSZWZlcmVuY2VXaXphcmRDb25zdGFudHM7CitpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb21wb25lbnRjb3JlLnVpLnByb3BlcnR5cGFnZS5JUmVmZXJlbmNlV2l6YXJkQ29uc3RhbnRzLlByb2plY3RDb252ZXJ0ZXJPcGVyYXRpb25Qcm92aWRlcjsKK2ltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3MuZGF0YW1vZGVsLklEYXRhTW9kZWxPcGVyYXRpb247CitpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5wcm9qZWN0LmZhY2V0LmNvcmUuUHJvamVjdEZhY2V0c01hbmFnZXI7CisKK3B1YmxpYyBjbGFzcyBQcm9qZWN0UmVmZXJlbmNlV2l6YXJkRnJhZ21lbnQgZXh0ZW5kcyBXaXphcmRGcmFnbWVudCB7CisJcHJvdGVjdGVkIExhYmVsUHJvdmlkZXIgbGFiZWxQcm92aWRlciA9IG51bGw7CisJcHJvdGVjdGVkIElUcmVlQ29udGVudFByb3ZpZGVyIGNvbnRlbnRQcm92aWRlciA9IG51bGw7CisJcHJvdGVjdGVkIFRyZWVWaWV3ZXIgdmlld2VyOworCXByb3RlY3RlZCBJUHJvamVjdFtdIHNlbGVjdGVkOworCQorCXB1YmxpYyBQcm9qZWN0UmVmZXJlbmNlV2l6YXJkRnJhZ21lbnQoKSB7CisJCXN1cGVyKCk7CisJCXNldENvbXBsZXRlKGZhbHNlKTsKKwl9CisJcHVibGljIGJvb2xlYW4gaGFzQ29tcG9zaXRlKCkgeworCQlyZXR1cm4gdHJ1ZTsKKwl9CisKKwlwdWJsaWMgQ29tcG9zaXRlIGNyZWF0ZUNvbXBvc2l0ZShDb21wb3NpdGUgcGFyZW50LCBJV2l6YXJkSGFuZGxlIGhhbmRsZSkgeworCQloYW5kbGUuc2V0VGl0bGUoTWVzc2FnZXMuUHJvamVjdFJlZmVyZW5jZVRpdGxlKTsKKwkJaGFuZGxlLnNldERlc2NyaXB0aW9uKE1lc3NhZ2VzLlByb2plY3RSZWZlcmVuY2VEZXNjcmlwdGlvbik7CisJCQorCQlDb21wb3NpdGUgYyA9IG5ldyBDb21wb3NpdGUocGFyZW50LCBTV1QuTk9ORSk7CisJCWMuc2V0TGF5b3V0KG5ldyBHcmlkTGF5b3V0KCkpOworCQlQbGF0Zm9ybVVJLmdldFdvcmtiZW5jaCgpLmdldEhlbHBTeXN0ZW0oKS5zZXRIZWxwKGMsIElNb2R1bGVDb3JlVUlDb250ZXh0SWRzLkRFUExPWU1FTlRfQVNTRU1CTFlfUFJFRkVSRU5DRV9QQUdFX0FERF9ORVdfUFJPSkVDVF9SRUZFUkVOQ0VfUDEpOworCQl2aWV3ZXIgPSBuZXcgVHJlZVZpZXdlcihjLCBTV1QuTVVMVEkgfCBTV1QuQk9SREVSKTsKKwkJdmlld2VyLnNldENvbnRlbnRQcm92aWRlcihnZXRDb250ZW50UHJvdmlkZXIoKSk7CisJCXZpZXdlci5zZXRMYWJlbFByb3ZpZGVyKGdldExhYmVsUHJvdmlkZXIoKSk7CisJCXZpZXdlci5hZGRTZWxlY3Rpb25DaGFuZ2VkTGlzdGVuZXIobmV3IElTZWxlY3Rpb25DaGFuZ2VkTGlzdGVuZXIoKSB7CisJCQlwdWJsaWMgdm9pZCBzZWxlY3Rpb25DaGFuZ2VkKFNlbGVjdGlvbkNoYW5nZWRFdmVudCBldmVudCkgeworCQkJCXNlbENoYW5nZWQoKTsKKwkJCX0KKwkJfSk7CisJCXZpZXdlci5hZGREb3VibGVDbGlja0xpc3RlbmVyKG5ldyBJRG91YmxlQ2xpY2tMaXN0ZW5lcigpIHsKKwkJCXB1YmxpYyB2b2lkIGRvdWJsZUNsaWNrKERvdWJsZUNsaWNrRXZlbnQgZXZlbnQpIHsKKwkJCQlhZHZhbmNlVG9OZXh0UGFnZU9yRmluaXNoKCk7CisJCQl9CisJCX0pOworCQl2aWV3ZXIuc2V0SW5wdXQoUmVzb3VyY2VzUGx1Z2luLmdldFdvcmtzcGFjZSgpKTsKKwkJR3JpZERhdGEgZGF0YSA9IG5ldyBHcmlkRGF0YShHcmlkRGF0YS5GSUxMX0JPVEgpOworCQlkYXRhLndpZHRoSGludCA9IDM5MDsKKwkJZGF0YS5oZWlnaHRIaW50ID0gMTg1OworCQl2aWV3ZXIuZ2V0VHJlZSgpLnNldExheW91dERhdGEoZGF0YSk7CisJCXJldHVybiBjOworCX0KKwkKKwlwcm90ZWN0ZWQgdm9pZCBzZWxDaGFuZ2VkKCkgeworCQlpZiggdmlld2VyICE9IG51bGwgKSB7CisJCQlJU3RydWN0dXJlZFNlbGVjdGlvbiBzZWwgPSAoSVN0cnVjdHVyZWRTZWxlY3Rpb24pdmlld2VyLmdldFNlbGVjdGlvbigpOworCQkJaWYoIHNlbCAhPSBudWxsICkgeworCQkJCUxpc3Qgc2VsZWN0aW9uTGlzdCA9IHNlbC50b0xpc3QoKTsKKwkJCQlzZWxlY3RlZCA9IChJUHJvamVjdFtdKXNlbGVjdGlvbkxpc3QudG9BcnJheShuZXcgSVByb2plY3Rbc2VsZWN0aW9uTGlzdC5zaXplKCldKTsKKwkJCQlpZiAoc2VsZWN0ZWQubGVuZ3RoICE9IDApIHNldENvbXBsZXRlKHRydWUpOworCQkJCWVsc2Ugc2V0Q29tcGxldGUoZmFsc2UpOworCQkJfSBlbHNlIHNldENvbXBsZXRlKGZhbHNlKTsKKwkJfQorCQkoKFRhc2tXaXphcmRQYWdlKWdldFBhZ2UoKSkudXBkYXRlKCk7CisJfQorCQorCXB1YmxpYyB2b2lkIHBlcmZvcm1GaW5pc2goSVByb2dyZXNzTW9uaXRvciBtb25pdG9yKSB0aHJvd3MgQ29yZUV4Y2VwdGlvbiB7CisJCVZpcnR1YWxSZWZlcmVuY2VbXSByZWZzID0gbmV3IFZpcnR1YWxSZWZlcmVuY2Vbc2VsZWN0ZWQubGVuZ3RoXTsKKwkJU3RyaW5nIHJ1bnRpbWVMb2MgPSAoU3RyaW5nKSBnZXRUYXNrTW9kZWwoKS5nZXRPYmplY3QoSVJlZmVyZW5jZVdpemFyZENvbnN0YW50cy5ERUZBVUxUX0xJQlJBUllfTE9DQVRJT04pOworCQlQcm9qZWN0Q29udmVydGVyT3BlcmF0aW9uUHJvdmlkZXIgY29udmVydGVyID0gKFByb2plY3RDb252ZXJ0ZXJPcGVyYXRpb25Qcm92aWRlcilnZXRUYXNrTW9kZWwoKS5nZXRPYmplY3QoSVJlZmVyZW5jZVdpemFyZENvbnN0YW50cy5QUk9KRUNUX0NPTlZFUlRFUl9PUEVSQVRJT05fUFJPVklERVIpOworCQlydW50aW1lTG9jID0gcnVudGltZUxvYyAhPSBudWxsID8gcnVudGltZUxvYyA6ICIvIjsgLy8kTk9OLU5MUy0xJAorCQlmb3IgKGludCBpID0gMDsgaSA8IHNlbGVjdGVkLmxlbmd0aDsgaSsrKSB7CisJCQlJUHJvamVjdCBwcm9qID0gc2VsZWN0ZWRbaV07CisJCQkKKwkJCWlmKCAhTW9kdWxlQ29yZU5hdHVyZS5pc0ZsZXhpYmxlUHJvamVjdChwcm9qKSkgeworCQkJCWNvbnZlcnRQcm9qZWN0KHNlbGVjdGVkW2ldLCBjb252ZXJ0ZXIsIG1vbml0b3IpOworCQkJfQorCQkJU3RyaW5nIHBhdGggPSBudWxsOworCQkJcmVmc1tpXSA9IG5ldyBWaXJ0dWFsUmVmZXJlbmNlKAorCQkJCQkoSVZpcnR1YWxDb21wb25lbnQpZ2V0VGFza01vZGVsKCkuZ2V0T2JqZWN0KElSZWZlcmVuY2VXaXphcmRDb25zdGFudHMuUk9PVF9DT01QT05FTlQpLCAKKwkJCQkJQ29tcG9uZW50Q29yZS5jcmVhdGVDb21wb25lbnQocHJvaiwgZmFsc2UpKTsKKwkJCXJlZnNbaV0uc2V0QXJjaGl2ZU5hbWUobmV3IFBhdGgoZ2V0QXJjaGl2ZU5hbWUocHJvaiwgcmVmc1tpXS5nZXRSZWZlcmVuY2VkQ29tcG9uZW50KCkpKS5sYXN0U2VnbWVudCgpKTsKKwkJCXJlZnNbaV0uc2V0UnVudGltZVBhdGgobmV3IFBhdGgocnVudGltZUxvYykubWFrZUFic29sdXRlKCkpOworCQl9CisJCWdldFRhc2tNb2RlbCgpLnB1dE9iamVjdChJUmVmZXJlbmNlV2l6YXJkQ29uc3RhbnRzLkZJTkFMX1JFRkVSRU5DRSwgcmVmcyk7CisJfQorCisJcHJvdGVjdGVkIHZvaWQgY29udmVydFByb2plY3QoSVByb2plY3QgcHJvaiwgUHJvamVjdENvbnZlcnRlck9wZXJhdGlvblByb3ZpZGVyIGNvbnZlcnRlciwgSVByb2dyZXNzTW9uaXRvciBtb25pdG9yKSB7CisJCWlmKCBjb252ZXJ0ZXIgIT0gbnVsbCApIHsKKwkJCUlEYXRhTW9kZWxPcGVyYXRpb24gb3BlcmF0aW9uID0gY29udmVydGVyLmdldENvbnZlcnNpb25PcGVyYXRpb24ocHJvaik7CisJCQlpZiggb3BlcmF0aW9uICE9IG51bGwgKSB7CisJCQkJdHJ5IHsKKwkJCQkJb3BlcmF0aW9uLmV4ZWN1dGUobW9uaXRvciwgbnVsbCk7CisJCQkJCXJldHVybjsKKwkJCQl9IGNhdGNoKCBFeGVjdXRpb25FeGNlcHRpb24gZWUgKSB7CisJCQkJCU1vZHVsZUNvcmVVSVBsdWdpbi5sb2coTkxTLmJpbmQoTWVzc2FnZXMuUHJvamVjdENvbnZlcnNpb25FcnJvciwgcHJvai5nZXROYW1lKCkpLCBlZSk7CisJCQkJfQorCQkJfQorCQl9IAorCQl0cnkgeworCQkJaWYoICFNb2R1bGVDb3JlTmF0dXJlLmlzRmxleGlibGVQcm9qZWN0KHByb2opKSB7CisJCQkJTW9kdWxlQ29yZU5hdHVyZS5hZGRNb2R1bGVDb3JlTmF0dXJlSWZOZWNlc3NhcnkocHJvaiwgbW9uaXRvcik7CisJCQkJUHJvamVjdEZhY2V0c01hbmFnZXIuY3JlYXRlKHByb2osIHRydWUsIG1vbml0b3IpOworCQkJfQorCQl9IGNhdGNoKCBDb3JlRXhjZXB0aW9uIGNlKSB7CisJCQlNb2R1bGVDb3JlVUlQbHVnaW4ubG9nKE5MUy5iaW5kKE1lc3NhZ2VzLlByb2plY3RDb252ZXJzaW9uRXJyb3IsIHByb2ouZ2V0TmFtZSgpKSwgY2UpOworCQl9CisJfQorCQorCXByb3RlY3RlZCBTdHJpbmcgZ2V0QXJjaGl2ZU5hbWUoSVByb2plY3QgcHJvaiwgSVZpcnR1YWxDb21wb25lbnQgY29tcCkgeworCQlyZXR1cm4gZ2V0TW9kdWxlSGFuZGxlcigpLmdldEFyY2hpdmVOYW1lKHByb2osY29tcCk7CisJfQorCisJCisJcHJvdGVjdGVkIElNb2R1bGVIYW5kbGVyIGdldE1vZHVsZUhhbmRsZXIoKSB7CisJCXJldHVybiAoSU1vZHVsZUhhbmRsZXIpZ2V0VGFza01vZGVsKCkuZ2V0T2JqZWN0KElSZWZlcmVuY2VXaXphcmRDb25zdGFudHMuTU9EVUxFSEFORExFUik7CisJfQorCisJcHJvdGVjdGVkIExhYmVsUHJvdmlkZXIgZ2V0TGFiZWxQcm92aWRlcigpIHsKKwkJaWYoIGxhYmVsUHJvdmlkZXIgPT0gbnVsbCApIHsKKwkJCWxhYmVsUHJvdmlkZXIgPSBuZXcgTGFiZWxQcm92aWRlcigpIHsKKwkJCQlwdWJsaWMgSW1hZ2UgZ2V0SW1hZ2UoT2JqZWN0IGVsZW1lbnQpIHsKKwkJCQkJcmV0dXJuIFBsYXRmb3JtVUkuZ2V0V29ya2JlbmNoKCkuZ2V0U2hhcmVkSW1hZ2VzKCkuZ2V0SW1hZ2UoSURFLlNoYXJlZEltYWdlcy5JTUdfT0JKX1BST0pFQ1QpOworCQkJCX0KKwkJCQlwdWJsaWMgU3RyaW5nIGdldFRleHQoT2JqZWN0IGVsZW1lbnQpIHsKKwkJCQkJaWYoIGVsZW1lbnQgaW5zdGFuY2VvZiBJUHJvamVjdCApCisJCQkJCQlyZXR1cm4gKChJUHJvamVjdCllbGVtZW50KS5nZXROYW1lKCk7CisJCQkJCXJldHVybiBlbGVtZW50ID09IG51bGwgPyAiIiA6IGVsZW1lbnQudG9TdHJpbmcoKTsvLyROT04tTkxTLTEkCisJCQkJfQorCQkJfTsKKwkJfQorCQlyZXR1cm4gbGFiZWxQcm92aWRlcjsKKwl9CisJCisJcHJvdGVjdGVkIElUcmVlQ29udGVudFByb3ZpZGVyIGdldENvbnRlbnRQcm92aWRlcigpIHsKKwkJaWYoIGNvbnRlbnRQcm92aWRlciA9PSBudWxsICkgeworCQkJY29udGVudFByb3ZpZGVyID0gbmV3IElUcmVlQ29udGVudFByb3ZpZGVyKCkgeworCQkJCXB1YmxpYyBPYmplY3RbXSBnZXRFbGVtZW50cyhPYmplY3QgaW5wdXRFbGVtZW50KSB7CisJCQkJCUlQcm9qZWN0IHJvb3QgPSAoSVByb2plY3QpZ2V0VGFza01vZGVsKCkuZ2V0T2JqZWN0KElSZWZlcmVuY2VXaXphcmRDb25zdGFudHMuUFJPSkVDVCk7CisJCQkJCUlQcm9qZWN0W10gcHJvamVjdHMgPSBSZXNvdXJjZXNQbHVnaW4uZ2V0V29ya3NwYWNlKCkuZ2V0Um9vdCgpLmdldFByb2plY3RzKCk7CisJCQkJCUFycmF5TGlzdDxJVmlydHVhbFJlZmVyZW5jZT4gY3VycmVudFJlZnMgPSAoQXJyYXlMaXN0PElWaXJ0dWFsUmVmZXJlbmNlPilnZXRUYXNrTW9kZWwoKS5nZXRPYmplY3QoSVJlZmVyZW5jZVdpemFyZENvbnN0YW50cy5DVVJSRU5UX1JFRlMpOworCQkJCQlBcnJheUxpc3Q8SVByb2plY3Q+IGF2YWlsYWJsZUxpc3QgPSBnZXRBdmFpbGFibGVQcm9qZWN0cyhwcm9qZWN0cyxjdXJyZW50UmVmcyk7CisJCQkJCUlWaXJ0dWFsQ29tcG9uZW50IGNvbXAgPSAoSVZpcnR1YWxDb21wb25lbnQpZ2V0VGFza01vZGVsKCkuZ2V0T2JqZWN0KElSZWZlcmVuY2VXaXphcmRDb25zdGFudHMuUk9PVF9DT01QT05FTlQpOworCQkJCQlMaXN0IGZpbHRlcmVkID0gZ2V0TW9kdWxlSGFuZGxlcigpLmdldEZpbHRlcmVkUHJvamVjdExpc3RGb3JBZGQoY29tcCwgYXZhaWxhYmxlTGlzdCk7CisJCQkJCXJldHVybiBmaWx0ZXJlZC50b0FycmF5KG5ldyBJUHJvamVjdFtmaWx0ZXJlZC5zaXplKCldKTsKKwkJCQl9CisJCQkJcHJpdmF0ZSBBcnJheUxpc3Q8SVByb2plY3Q+IGdldEF2YWlsYWJsZVByb2plY3RzKElQcm9qZWN0W10gcHJvamVjdHMsIEFycmF5TGlzdDxJVmlydHVhbFJlZmVyZW5jZT4gY3VycmVudFJlZnMpIHsKKwkJCQkJaWYgKGN1cnJlbnRSZWZzLmlzRW1wdHkoKSkKKwkJCQkJCXJldHVybiBuZXcgQXJyYXlMaXN0PElQcm9qZWN0PihBcnJheXMuYXNMaXN0KHByb2plY3RzKSk7CisJCQkJCUFycmF5TGlzdCBhdmFpbFByb2plY3RzID0gbmV3IEFycmF5TGlzdCgpOworCQkJCQlmb3IgKGludCBpID0gMDsgaSA8IHByb2plY3RzLmxlbmd0aDsgaSsrKSB7CisJCQkJCQlJUHJvamVjdCBwcm9qID0gcHJvamVjdHNbaV07CisJCQkJCQlib29sZWFuIG1hdGNoZXMgPSBmYWxzZTsKKwkJCQkJCWZvciAoaW50IGogPSAwOyBqIDwgY3VycmVudFJlZnMuc2l6ZSgpICYmICFtYXRjaGVzOyBqKyspIHsKKwkJCQkJCQlJVmlydHVhbFJlZmVyZW5jZSByZWYgPSBjdXJyZW50UmVmcy5nZXQoaik7CisJCQkJCQkJaWYgKChyZWYuZ2V0UmVmZXJlbmNlZENvbXBvbmVudCgpLmdldFByb2plY3QoKS5lcXVhbHMocHJvaikpIHx8IGF2YWlsUHJvamVjdHMuY29udGFpbnMocHJvaikpCisJCQkJCQkJCW1hdGNoZXMgPSB0cnVlOworCQkJCQkJfQorCQkJCQkJaWYoICFtYXRjaGVzICkKKwkJCQkJCQlhdmFpbFByb2plY3RzLmFkZChwcm9qKTsKKwkJCQkJfQorCQkJCQlyZXR1cm4gYXZhaWxQcm9qZWN0czsKKwkJCQl9CisJCQkJcHVibGljIHZvaWQgaW5wdXRDaGFuZ2VkKFZpZXdlciB2aWV3ZXIsIE9iamVjdCBvbGRJbnB1dCwgT2JqZWN0IG5ld0lucHV0KSB7CisJCQkJfQorCQkJCXB1YmxpYyB2b2lkIGRpc3Bvc2UoKSB7CisJCQkJfQorCQkJCXB1YmxpYyBib29sZWFuIGhhc0NoaWxkcmVuKE9iamVjdCBlbGVtZW50KSB7CisJCQkJCXJldHVybiBmYWxzZTsKKwkJCQl9CisJCQkJcHVibGljIE9iamVjdCBnZXRQYXJlbnQoT2JqZWN0IGVsZW1lbnQpIHsKKwkJCQkJcmV0dXJuIG51bGw7CisJCQkJfQorCQkJCXB1YmxpYyBPYmplY3RbXSBnZXRDaGlsZHJlbihPYmplY3QgcGFyZW50RWxlbWVudCkgeworCQkJCQlyZXR1cm4gbnVsbDsKKwkJCQl9CisJCQl9OworCQl9CisJCXJldHVybiBjb250ZW50UHJvdmlkZXI7CisJfQorfQpkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUudWkvc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vY29tcG9uZW50Y29yZS91aS9pbnRlcm5hbC9wcm9wZXJ0eXBhZ2UvdmVyaWZpZXIvQWJzdHJhY3REZXBsb3ltZW50QXNzZW1ibHlWZXJpZmllci5qYXZhIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUudWkvc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vY29tcG9uZW50Y29yZS91aS9pbnRlcm5hbC9wcm9wZXJ0eXBhZ2UvdmVyaWZpZXIvQWJzdHJhY3REZXBsb3ltZW50QXNzZW1ibHlWZXJpZmllci5qYXZhCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLjdjYzQ4MzIKLS0tIC9kZXYvbnVsbAorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS51aS9zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9jb21wb25lbnRjb3JlL3VpL2ludGVybmFsL3Byb3BlcnR5cGFnZS92ZXJpZmllci9BYnN0cmFjdERlcGxveW1lbnRBc3NlbWJseVZlcmlmaWVyLmphdmEKQEAgLTAsMCArMSwyMyBAQAorLyoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioKKyAqIENvcHlyaWdodCAoYykgMjAxMCBJQk0gQ29ycG9yYXRpb24gYW5kIG90aGVycy4KKyAqIEFsbCByaWdodHMgcmVzZXJ2ZWQuIFRoaXMgcHJvZ3JhbSBhbmQgdGhlIGFjY29tcGFueWluZyBtYXRlcmlhbHMKKyAqIGFyZSBtYWRlIGF2YWlsYWJsZSB1bmRlciB0aGUgdGVybXMgb2YgdGhlIEVjbGlwc2UgUHVibGljIExpY2Vuc2UgdjEuMAorICogd2hpY2ggYWNjb21wYW5pZXMgdGhpcyBkaXN0cmlidXRpb24sIGFuZCBpcyBhdmFpbGFibGUgYXQKKyAqIGh0dHA6Ly93d3cuZWNsaXBzZS5vcmcvbGVnYWwvZXBsLXYxMC5odG1sCisgKgorICogQ29udHJpYnV0b3JzOgorICogSUJNIENvcnBvcmF0aW9uIC0gaW5pdGlhbCBBUEkgYW5kIGltcGxlbWVudGF0aW9uCisgKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKi8KK3BhY2thZ2Ugb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb21wb25lbnRjb3JlLnVpLmludGVybmFsLnByb3BlcnR5cGFnZS52ZXJpZmllcjsKKworaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucnVudGltZS5JU3RhdHVzOworCisvKioKKyAqIEFsbCBleHRlbmRlcnMgb2YgQWJzdHJhY3REZXBsb3ltZW50QXNzZW1ibHlWZXJpZmllciBtdXN0IGltcGxlbWVudCB0aGUgdmVyaWZ5IG1ldGhvZHMgdG8gcGVyZm9ybSBhbnkgdmVyaWZpY2F0aW9uIG9uIHRoZSBkZXBsb3ltZW50IGFzc2VtYmx5IHdpemFyZCBwYWdlCisgKgorICovCitwdWJsaWMgYWJzdHJhY3QgY2xhc3MgQWJzdHJhY3REZXBsb3ltZW50QXNzZW1ibHlWZXJpZmllciBpbXBsZW1lbnRzIElEZXBsb3ltZW50QXNzZW1ibHlWZXJpZmllciB7CisKKwlwdWJsaWMgYWJzdHJhY3QgSVN0YXR1cyB2ZXJpZnkoRGVwbG95bWVudEFzc2VtYmx5VmVyaWZpZXJEYXRhIGRhdGEpOworCit9CmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS51aS9zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9jb21wb25lbnRjb3JlL3VpL2ludGVybmFsL3Byb3BlcnR5cGFnZS92ZXJpZmllci9EZXBsb3ltZW50QXNzZW1ibHlWZXJpZmllckRhdGEuamF2YSBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlLnVpL3NyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2NvbXBvbmVudGNvcmUvdWkvaW50ZXJuYWwvcHJvcGVydHlwYWdlL3ZlcmlmaWVyL0RlcGxveW1lbnRBc3NlbWJseVZlcmlmaWVyRGF0YS5qYXZhCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLmMxODM4MzUKLS0tIC9kZXYvbnVsbAorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS51aS9zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9jb21wb25lbnRjb3JlL3VpL2ludGVybmFsL3Byb3BlcnR5cGFnZS92ZXJpZmllci9EZXBsb3ltZW50QXNzZW1ibHlWZXJpZmllckRhdGEuamF2YQpAQCAtMCwwICsxLDY3IEBACisvKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKgorICogQ29weXJpZ2h0IChjKSAyMDEwIElCTSBDb3Jwb3JhdGlvbiBhbmQgb3RoZXJzLgorICogQWxsIHJpZ2h0cyByZXNlcnZlZC4gVGhpcyBwcm9ncmFtIGFuZCB0aGUgYWNjb21wYW55aW5nIG1hdGVyaWFscworICogYXJlIG1hZGUgYXZhaWxhYmxlIHVuZGVyIHRoZSB0ZXJtcyBvZiB0aGUgRWNsaXBzZSBQdWJsaWMgTGljZW5zZSB2MS4wCisgKiB3aGljaCBhY2NvbXBhbmllcyB0aGlzIGRpc3RyaWJ1dGlvbiwgYW5kIGlzIGF2YWlsYWJsZSBhdAorICogaHR0cDovL3d3dy5lY2xpcHNlLm9yZy9sZWdhbC9lcGwtdjEwLmh0bWwKKyAqCisgKiBDb250cmlidXRvcnM6CisgKiBJQk0gQ29ycG9yYXRpb24gLSBpbml0aWFsIEFQSSBhbmQgaW1wbGVtZW50YXRpb24KKyAqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqLworcGFja2FnZSBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUudWkuaW50ZXJuYWwucHJvcGVydHlwYWdlLnZlcmlmaWVyOworCitpbXBvcnQgamF2YS51dGlsLkFycmF5TGlzdDsKKworaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS5yZXNvdXJjZXMuSVZpcnR1YWxDb21wb25lbnQ7CitpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb21wb25lbnRjb3JlLnJlc291cmNlcy5JVmlydHVhbFJlZmVyZW5jZTsKK2ltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUudWkucHJvcGVydHlwYWdlLkFkZE1vZHVsZURlcGVuZGVuY2llc1Byb3BlcnRpZXNQYWdlLkNvbXBvbmVudFJlc291cmNlUHJveHk7CitpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LnNlcnZlci5jb3JlLklSdW50aW1lOworCitwdWJsaWMgY2xhc3MgRGVwbG95bWVudEFzc2VtYmx5VmVyaWZpZXJEYXRhIHsKKwkKKwlwdWJsaWMgRGVwbG95bWVudEFzc2VtYmx5VmVyaWZpZXJEYXRhKElWaXJ0dWFsQ29tcG9uZW50IGNvbXBvbmVudCwgSVJ1bnRpbWUgcnVudGltZSwgQXJyYXlMaXN0PElWaXJ0dWFsUmVmZXJlbmNlPiBjdXJyZW50UmVmZXJlbmNlcywKKwkJCUFycmF5TGlzdDxDb21wb25lbnRSZXNvdXJjZVByb3h5PiByZXNvdXJjZU1hcHBpbmdzLCBib29sZWFuIHJlc291cmNlTWFwcGluZ3NDaGFuZ2VkKSB7CisJCXN1cGVyKCk7CisJCXRoaXMuY29tcG9uZW50ID0gY29tcG9uZW50OworCQl0aGlzLnJ1bnRpbWUgPSBydW50aW1lOworCQl0aGlzLmN1cnJlbnRSZWZlcmVuY2VzID0gY3VycmVudFJlZmVyZW5jZXM7CisJCXRoaXMucmVzb3VyY2VNYXBwaW5ncyA9IHJlc291cmNlTWFwcGluZ3M7CisJCXRoaXMucmVzb3VyY2VNYXBwaW5nc0NoYW5nZWQgPSByZXNvdXJjZU1hcHBpbmdzQ2hhbmdlZDsKKwl9CisJcHJpdmF0ZSBJVmlydHVhbENvbXBvbmVudCBjb21wb25lbnQ7CisJcHJpdmF0ZSBJUnVudGltZSBydW50aW1lOworCXByaXZhdGUgQXJyYXlMaXN0PElWaXJ0dWFsUmVmZXJlbmNlPiBjdXJyZW50UmVmZXJlbmNlczsKKwlwcml2YXRlIEFycmF5TGlzdDxDb21wb25lbnRSZXNvdXJjZVByb3h5PiByZXNvdXJjZU1hcHBpbmdzOworCXByaXZhdGUgYm9vbGVhbiByZXNvdXJjZU1hcHBpbmdzQ2hhbmdlZDsKKwlwdWJsaWMgSVZpcnR1YWxDb21wb25lbnQgZ2V0Q29tcG9uZW50KCkgeworCQlyZXR1cm4gY29tcG9uZW50OworCX0KKwlwdWJsaWMgdm9pZCBzZXRDb21wb25lbnQoSVZpcnR1YWxDb21wb25lbnQgY29tcG9uZW50KSB7CisJCXRoaXMuY29tcG9uZW50ID0gY29tcG9uZW50OworCX0KKwlwdWJsaWMgSVJ1bnRpbWUgZ2V0UnVudGltZSgpIHsKKwkJcmV0dXJuIHJ1bnRpbWU7CisJfQorCXB1YmxpYyB2b2lkIHNldFJ1bnRpbWUoSVJ1bnRpbWUgcnVudGltZSkgeworCQl0aGlzLnJ1bnRpbWUgPSBydW50aW1lOworCX0KKwlwdWJsaWMgQXJyYXlMaXN0PElWaXJ0dWFsUmVmZXJlbmNlPiBnZXRDdXJyZW50UmVmZXJlbmNlcygpIHsKKwkJcmV0dXJuIGN1cnJlbnRSZWZlcmVuY2VzOworCX0KKwlwdWJsaWMgdm9pZCBzZXRDdXJyZW50UmVmZXJlbmNlcyhBcnJheUxpc3Q8SVZpcnR1YWxSZWZlcmVuY2U+IGN1cnJlbnRSZWZlcmVuY2VzKSB7CisJCXRoaXMuY3VycmVudFJlZmVyZW5jZXMgPSBjdXJyZW50UmVmZXJlbmNlczsKKwl9CisJcHVibGljIEFycmF5TGlzdDxDb21wb25lbnRSZXNvdXJjZVByb3h5PiBnZXRSZXNvdXJjZU1hcHBpbmdzKCkgeworCQlyZXR1cm4gcmVzb3VyY2VNYXBwaW5nczsKKwl9CisJcHVibGljIHZvaWQgc2V0UmVzb3VyY2VNYXBwaW5ncyhBcnJheUxpc3Q8Q29tcG9uZW50UmVzb3VyY2VQcm94eT4gcmVzb3VyY2VNYXBwaW5ncykgeworCQl0aGlzLnJlc291cmNlTWFwcGluZ3MgPSByZXNvdXJjZU1hcHBpbmdzOworCX0KKwlwdWJsaWMgYm9vbGVhbiBpc1Jlc291cmNlTWFwcGluZ3NDaGFuZ2VkKCkgeworCQlyZXR1cm4gcmVzb3VyY2VNYXBwaW5nc0NoYW5nZWQ7CisJfQorCXB1YmxpYyB2b2lkIHNldFJlc291cmNlTWFwcGluZ3NDaGFuZ2VkKGJvb2xlYW4gcmVzb3VyY2VNYXBwaW5nc0NoYW5nZWQpIHsKKwkJdGhpcy5yZXNvdXJjZU1hcHBpbmdzQ2hhbmdlZCA9IHJlc291cmNlTWFwcGluZ3NDaGFuZ2VkOworCX0KKworfQpkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUudWkvc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vY29tcG9uZW50Y29yZS91aS9pbnRlcm5hbC9wcm9wZXJ0eXBhZ2UvdmVyaWZpZXIvRGVwbG95bWVudEFzc2VtYmx5VmVyaWZpZXJIZWxwZXIuamF2YSBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlLnVpL3NyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2NvbXBvbmVudGNvcmUvdWkvaW50ZXJuYWwvcHJvcGVydHlwYWdlL3ZlcmlmaWVyL0RlcGxveW1lbnRBc3NlbWJseVZlcmlmaWVySGVscGVyLmphdmEKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uZjczYjQ2YgotLS0gL2Rldi9udWxsCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlLnVpL3NyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2NvbXBvbmVudGNvcmUvdWkvaW50ZXJuYWwvcHJvcGVydHlwYWdlL3ZlcmlmaWVyL0RlcGxveW1lbnRBc3NlbWJseVZlcmlmaWVySGVscGVyLmphdmEKQEAgLTAsMCArMSw5NSBAQAorLyoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioKKyAqIENvcHlyaWdodCAoYykgMjAxMCBJQk0gQ29ycG9yYXRpb24gYW5kIG90aGVycy4KKyAqIEFsbCByaWdodHMgcmVzZXJ2ZWQuIFRoaXMgcHJvZ3JhbSBhbmQgdGhlIGFjY29tcGFueWluZyBtYXRlcmlhbHMKKyAqIGFyZSBtYWRlIGF2YWlsYWJsZSB1bmRlciB0aGUgdGVybXMgb2YgdGhlIEVjbGlwc2UgUHVibGljIExpY2Vuc2UgdjEuMAorICogd2hpY2ggYWNjb21wYW5pZXMgdGhpcyBkaXN0cmlidXRpb24sIGFuZCBpcyBhdmFpbGFibGUgYXQKKyAqIGh0dHA6Ly93d3cuZWNsaXBzZS5vcmcvbGVnYWwvZXBsLXYxMC5odG1sCisgKgorICogQ29udHJpYnV0b3JzOgorICogSUJNIENvcnBvcmF0aW9uIC0gaW5pdGlhbCBBUEkgYW5kIGltcGxlbWVudGF0aW9uCisgKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKi8KK3BhY2thZ2Ugb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb21wb25lbnRjb3JlLnVpLmludGVybmFsLnByb3BlcnR5cGFnZS52ZXJpZmllcjsKKworaW1wb3J0IGphdmEudXRpbC5BcnJheUxpc3Q7CitpbXBvcnQgamF2YS51dGlsLkNvbGxlY3Rpb25zOworaW1wb3J0IGphdmEudXRpbC5JdGVyYXRvcjsKK2ltcG9ydCBqYXZhLnV0aWwuTGlzdDsKK2ltcG9ydCBqYXZhLnV0aWwuU2V0OworCitpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5yZXNvdXJjZXMuSVByb2plY3Q7CitpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5ydW50aW1lLkNvcmVFeGNlcHRpb247CitpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5ydW50aW1lLklDb25maWd1cmF0aW9uRWxlbWVudDsKK2ltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJ1bnRpbWUuSVN0YXR1czsKK2ltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJ1bnRpbWUuTXVsdGlTdGF0dXM7CitpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5ydW50aW1lLlN0YXR1czsKK2ltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUucmVzb3VyY2VzLklWaXJ0dWFsQ29tcG9uZW50OworaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS5yZXNvdXJjZXMuSVZpcnR1YWxSZWZlcmVuY2U7CitpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb21wb25lbnRjb3JlLnVpLk1lc3NhZ2VzOworaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS51aS5Nb2R1bGVDb3JlVUlQbHVnaW47CitpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb21wb25lbnRjb3JlLnVpLnByb3BlcnR5cGFnZS5BZGRNb2R1bGVEZXBlbmRlbmNpZXNQcm9wZXJ0aWVzUGFnZS5Db21wb25lbnRSZXNvdXJjZVByb3h5OworaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24ucHJvamVjdC5mYWNldC5jb3JlLklGYWNldGVkUHJvamVjdDsKK2ltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLnByb2plY3QuZmFjZXQuY29yZS5JUHJvamVjdEZhY2V0VmVyc2lvbjsKK2ltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLnByb2plY3QuZmFjZXQuY29yZS5Qcm9qZWN0RmFjZXRzTWFuYWdlcjsKK2ltcG9ydCBvcmcuZWNsaXBzZS53c3Quc2VydmVyLmNvcmUuSVJ1bnRpbWU7CisKK3B1YmxpYyBjbGFzcyBEZXBsb3ltZW50QXNzZW1ibHlWZXJpZmllckhlbHBlciB7CisJCisJCisJLyoqCisJICogVGhpcyBtZXRob2Qgd2lsbCB1c2UgdGhlIGZhY2V0IGZyYW1ld29yayB0byBmaW5kIGFsbCByZWdpc3RlcmVkIHZlcmlmaWVycyBiYXNlZCBvbiBpbnN0YWxsZWQgZmFjZXRzIGFuZCBydW50aW1lcy4KKwkgKiBBbGwgdGhlIHZlcmlmaWVycyB3aWxsIGhhdmUgYW4gb3Bwb3J0dW5pdHkgdG8gdmVyaWZ5IGFuZCByZXR1cm4gc3RhdHVzIG9uIHRoZSBwcm9wb3NlZCBjb21wb25lbnQgbWFwcGluZ3MKKwkgKiBAcGFyYW0gY29tcG9uZW50CisJICogQHBhcmFtIHJ1bnRpbWUKKwkgKiBAcGFyYW0gcmVzb3VyY2VNYXBwaW5nc0NoYW5nZWQgCisJICogQHBhcmFtIHJlc291cmNlTWFwcGluZ3MgCisJICogQHBhcmFtIGN1cnJlbnRSZWZlcmVuY2VzIAorCSAqIEByZXR1cm4gSVN0YXR1cworCSAqLworCXB1YmxpYyBzdGF0aWMgSVN0YXR1cyB2ZXJpZnkoSVZpcnR1YWxDb21wb25lbnQgY29tcG9uZW50LElSdW50aW1lIHJ1bnRpbWUsIEFycmF5TGlzdDxJVmlydHVhbFJlZmVyZW5jZT4gY3VycmVudFJlZmVyZW5jZXMsIEFycmF5TGlzdDxDb21wb25lbnRSZXNvdXJjZVByb3h5PiByZXNvdXJjZU1hcHBpbmdzLCBib29sZWFuIHJlc291cmNlTWFwcGluZ3NDaGFuZ2VkKSB7CisJCUlQcm9qZWN0IHByb2plY3QgPSBjb21wb25lbnQuZ2V0UHJvamVjdCgpOworCQkKKwkJTGlzdCB2ZXJpZmllcnMgPSBjb2xsZWN0QWxsVmVyaWZpZXJzKHByb2plY3QscnVudGltZSk7CisJCWlmICh2ZXJpZmllcnMuaXNFbXB0eSgpKSByZXR1cm4gU3RhdHVzLk9LX1NUQVRVUzsKKwkJTXVsdGlTdGF0dXMgbWFzdGVyU3RhdHVzID0gbmV3IE11bHRpU3RhdHVzKE1vZHVsZUNvcmVVSVBsdWdpbi5QTFVHSU5fSUQsIElTdGF0dXMuT0ssIE1lc3NhZ2VzLkRlcGxveW1lbnRBc3NlbWJseVZlcmlmaWVySGVscGVyXzAsbnVsbCk7IAorCQkKKwkJZm9yIChpbnQgaSA9IDA7IGkgPCB2ZXJpZmllcnMuc2l6ZSgpOyBpKyspIHsKKwkJCWlmICghKHZlcmlmaWVycy5nZXQoaSkgaW5zdGFuY2VvZiBJQ29uZmlndXJhdGlvbkVsZW1lbnQpKQorCQkJCWNvbnRpbnVlOworCQkJSURlcGxveW1lbnRBc3NlbWJseVZlcmlmaWVyIHZlcmlmaWVyID0gbnVsbDsKKwkJCXRyeSB7CisJCQkJdmVyaWZpZXIgPSAoSURlcGxveW1lbnRBc3NlbWJseVZlcmlmaWVyKSAoKElDb25maWd1cmF0aW9uRWxlbWVudCkgdmVyaWZpZXJzLmdldChpKSkuY3JlYXRlRXhlY3V0YWJsZUV4dGVuc2lvbihWZXJpZmllclJlZ2lzdHJ5UmVhZGVyLlZFUklGSUVSX0NMQVNTKTsKKwkJCQlEZXBsb3ltZW50QXNzZW1ibHlWZXJpZmllckRhdGEgZGF0YSA9IG5ldyBEZXBsb3ltZW50QXNzZW1ibHlWZXJpZmllckRhdGEoY29tcG9uZW50LCBydW50aW1lLGN1cnJlbnRSZWZlcmVuY2VzLHJlc291cmNlTWFwcGluZ3MscmVzb3VyY2VNYXBwaW5nc0NoYW5nZWQpOworCQkJCUlTdGF0dXMgdmVyaWZ5U3RhdHVzID0gdmVyaWZpZXIudmVyaWZ5KGRhdGEpOworCQkJCW1hc3RlclN0YXR1cy5hZGQodmVyaWZ5U3RhdHVzKTsKKwkJCX0gY2F0Y2ggKEV4Y2VwdGlvbiBlKSB7CisJCQkJTW9kdWxlQ29yZVVJUGx1Z2luLmxvZyhlKTsKKwkJCQljb250aW51ZTsKKwkJCX0KKwkJCQorCQl9CisJCXJldHVybiBtYXN0ZXJTdGF0dXM7CisJfQorCisJLyoqCisJICogQHBhcmFtIHByb2plY3QKKwkgKiBAcGFyYW0gcnVudGltZQorCSAqIEByZXR1cm4gYWxsIHZlcmlmaWVycyBieSBpdGVyYXRpbmcgdGhyb3VnaCBwcm9qZWN0cyBpbnN0YWxsZWQgZmFjZXRzLCBhbmQgcXVlcnlpbmcgdGhlIHJlZ2lzdHJ5CisJICovCisJcHJpdmF0ZSBzdGF0aWMgTGlzdCBjb2xsZWN0QWxsVmVyaWZpZXJzKElQcm9qZWN0IHByb2plY3QsIElSdW50aW1lIHJ1bnRpbWUpIHsKKwkJSUZhY2V0ZWRQcm9qZWN0IGZQcm9qID0gbnVsbDsKKwkJdHJ5IHsKKwkJCWZQcm9qID0gUHJvamVjdEZhY2V0c01hbmFnZXIuY3JlYXRlKHByb2plY3QpOworCQl9IGNhdGNoIChDb3JlRXhjZXB0aW9uIGUpIHsKKwkJCU1vZHVsZUNvcmVVSVBsdWdpbi5sb2coZSk7CisJCQlyZXR1cm4gQ29sbGVjdGlvbnMuRU1QVFlfTElTVDsKKwkJfQorCQlTZXQ8SVByb2plY3RGYWNldFZlcnNpb24+IGZhY2V0cyA9IGZQcm9qLmdldFByb2plY3RGYWNldHMoKTsKKwkJTGlzdCB2ZXJpZmllcnMgPSBuZXcgQXJyYXlMaXN0KCk7CisJCWZvciAoSXRlcmF0b3IgaXRlcmF0b3IgPSBmYWNldHMuaXRlcmF0b3IoKTsgaXRlcmF0b3IuaGFzTmV4dCgpOykgeworCQkJSVByb2plY3RGYWNldFZlcnNpb24gZmFjZXQgPSAoSVByb2plY3RGYWNldFZlcnNpb24paXRlcmF0b3IubmV4dCgpOworCQkJdmVyaWZpZXJzLmFkZEFsbChWZXJpZmllclJlZ2lzdHJ5Lmluc3RhbmNlKCkuZ2V0VmVyaWZpZXJFeHRlbnNpb25zKGZhY2V0LmdldFByb2plY3RGYWNldCgpLmdldElkKCksIHJ1bnRpbWUpKTsJCisJCX0KKwkJcmV0dXJuIHZlcmlmaWVyczsKKwl9CisJCit9CmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS51aS9zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9jb21wb25lbnRjb3JlL3VpL2ludGVybmFsL3Byb3BlcnR5cGFnZS92ZXJpZmllci9JRGVwbG95bWVudEFzc2VtYmx5VmVyaWZpZXIuamF2YSBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlLnVpL3NyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2NvbXBvbmVudGNvcmUvdWkvaW50ZXJuYWwvcHJvcGVydHlwYWdlL3ZlcmlmaWVyL0lEZXBsb3ltZW50QXNzZW1ibHlWZXJpZmllci5qYXZhCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLmEzNTc2YjkKLS0tIC9kZXYvbnVsbAorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS51aS9zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9jb21wb25lbnRjb3JlL3VpL2ludGVybmFsL3Byb3BlcnR5cGFnZS92ZXJpZmllci9JRGVwbG95bWVudEFzc2VtYmx5VmVyaWZpZXIuamF2YQpAQCAtMCwwICsxLDMwIEBACisvKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKgorICogQ29weXJpZ2h0IChjKSAyMDEwIElCTSBDb3Jwb3JhdGlvbiBhbmQgb3RoZXJzLgorICogQWxsIHJpZ2h0cyByZXNlcnZlZC4gVGhpcyBwcm9ncmFtIGFuZCB0aGUgYWNjb21wYW55aW5nIG1hdGVyaWFscworICogYXJlIG1hZGUgYXZhaWxhYmxlIHVuZGVyIHRoZSB0ZXJtcyBvZiB0aGUgRWNsaXBzZSBQdWJsaWMgTGljZW5zZSB2MS4wCisgKiB3aGljaCBhY2NvbXBhbmllcyB0aGlzIGRpc3RyaWJ1dGlvbiwgYW5kIGlzIGF2YWlsYWJsZSBhdAorICogaHR0cDovL3d3dy5lY2xpcHNlLm9yZy9sZWdhbC9lcGwtdjEwLmh0bWwKKyAqCisgKiBDb250cmlidXRvcnM6CisgKiBJQk0gQ29ycG9yYXRpb24gLSBpbml0aWFsIEFQSSBhbmQgaW1wbGVtZW50YXRpb24KKyAqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqLworcGFja2FnZSBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUudWkuaW50ZXJuYWwucHJvcGVydHlwYWdlLnZlcmlmaWVyOworCitpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5ydW50aW1lLklTdGF0dXM7CisKKy8qKgorICogVGhpcyBpbnRlcmZhY2UgaXMgdXNlZCB0byBhbGxvdyB2ZXJpZmljYXRpb25zIGZyb20gZXh0ZW5kaW5nIHBsdWdpbnMgcmVnaXN0ZXJlZCBieSBydW50aW1lIHRhcmdldHMgYW5kIGNvbXBvbmVudCB0eXBlCisgKiBUaGlzIGludGVyZmFjZSBpbiBOT1QgbWVhbnQgdG8gYmUgaW1wbGVtZW50ZWQsIGJ1dCBpbnN0ZWFkIGV4dGVuZCB0aGUgYWJzdHJhY3QgY2xhc3MgQWJzdHJhY3REZXBsb3ltZW50QXNzZW1ibHlWZXJpZmllcgorICoKKyAqLworcHVibGljIGludGVyZmFjZSBJRGVwbG95bWVudEFzc2VtYmx5VmVyaWZpZXIgeworCS8qKgorCSAqIFZhbGlkYXRlIHRoZSBjdXJyZW50IHN0YXRlIG9mIHRoZSBjb21wb25lbnQgcmVzb3VyY2UgYW5kIHJlZmVyZW5jZSBtYXBwaW5ncworCSAqIAorCSAqIEBwYXJhbSBkYXRhIC0gQWxsIG9mIHRoZSByZWxldmFudCBkaWFsb2cgcHJvcGVydGllcy92YWx1ZXMgaXMgc2VudCB2aWEgYSBEZXBsb3ltZW50QXNzZW1ibHlWZXJpZmllckRhdGEgb2JqZWN0CisJICogQHJldHVybiBJU3RhdHVzIGluZGljYXRpbmcgT0ssIFdhcm5pbmcgLCBvciBFcnJvci4gIFdhcm5pbmcgdGV4dCB3aWxsIGRpc3BsYXkgaW4gdGhlIHdpemFyZCBkaWFsb2csIGJ1dCBub3QgcHJldmVudCBjb21wbGV0aW9uLiAKKwkgKiBFcnJvciBzdGF0dXMgd2lsbCBwcmV2ZW50IGNvbXBsZXRpb24KKwkgKi8KKwlJU3RhdHVzIHZlcmlmeShEZXBsb3ltZW50QXNzZW1ibHlWZXJpZmllckRhdGEgZGF0YSk7CisKK30KZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlLnVpL3NyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2NvbXBvbmVudGNvcmUvdWkvaW50ZXJuYWwvcHJvcGVydHlwYWdlL3ZlcmlmaWVyL1ZlcmlmaWVyUmVnaXN0cnkuamF2YSBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlLnVpL3NyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2NvbXBvbmVudGNvcmUvdWkvaW50ZXJuYWwvcHJvcGVydHlwYWdlL3ZlcmlmaWVyL1ZlcmlmaWVyUmVnaXN0cnkuamF2YQpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi4wYWYzNTI0Ci0tLSAvZGV2L251bGwKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUudWkvc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vY29tcG9uZW50Y29yZS91aS9pbnRlcm5hbC9wcm9wZXJ0eXBhZ2UvdmVyaWZpZXIvVmVyaWZpZXJSZWdpc3RyeS5qYXZhCkBAIC0wLDAgKzEsMTE4IEBACisvKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKgorICogQ29weXJpZ2h0IChjKSAyMDEwIElCTSBDb3Jwb3JhdGlvbiBhbmQgb3RoZXJzLgorICogQWxsIHJpZ2h0cyByZXNlcnZlZC4gVGhpcyBwcm9ncmFtIGFuZCB0aGUgYWNjb21wYW55aW5nIG1hdGVyaWFscworICogYXJlIG1hZGUgYXZhaWxhYmxlIHVuZGVyIHRoZSB0ZXJtcyBvZiB0aGUgRWNsaXBzZSBQdWJsaWMgTGljZW5zZSB2MS4wCisgKiB3aGljaCBhY2NvbXBhbmllcyB0aGlzIGRpc3RyaWJ1dGlvbiwgYW5kIGlzIGF2YWlsYWJsZSBhdAorICogaHR0cDovL3d3dy5lY2xpcHNlLm9yZy9sZWdhbC9lcGwtdjEwLmh0bWwKKyAqCisgKiBDb250cmlidXRvcnM6CisgKiBJQk0gQ29ycG9yYXRpb24gLSBpbml0aWFsIEFQSSBhbmQgaW1wbGVtZW50YXRpb24KKyAqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqLworCitwYWNrYWdlIG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS51aS5pbnRlcm5hbC5wcm9wZXJ0eXBhZ2UudmVyaWZpZXI7CisKK2ltcG9ydCBqYXZhLnV0aWwuQXJyYXlMaXN0OworaW1wb3J0IGphdmEudXRpbC5Db2xsZWN0aW9uczsKK2ltcG9ydCBqYXZhLnV0aWwuSGFzaE1hcDsKK2ltcG9ydCBqYXZhLnV0aWwuSXRlcmF0b3I7CitpbXBvcnQgamF2YS51dGlsLkxpc3Q7CisKK2ltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJ1bnRpbWUuSUNvbmZpZ3VyYXRpb25FbGVtZW50OworaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5zZXJ2ZXIuY29yZS5JUnVudGltZTsKKworcHVibGljIGNsYXNzIFZlcmlmaWVyUmVnaXN0cnkgeworCS8qKgorCSAqICAKKwkgKi8KKwlwcml2YXRlIHN0YXRpYyBWZXJpZmllclJlZ2lzdHJ5IElOU1RBTkNFOworCXByaXZhdGUgSGFzaE1hcCBhc3NlbWJseVZlcmlmaWVyRXh0ZW5zaW9ucyA9IG5ldyBIYXNoTWFwKCk7CisKKwlwdWJsaWMgVmVyaWZpZXJSZWdpc3RyeSgpIHsKKwkJc3VwZXIoKTsKKwl9CisKKwkvKioKKwkgKiBAcGFyYW0gdmVyaWZpZXIKKwkgKiBAcGFyYW0gc2VydmVyVGFyZ2V0cworCSAqIEBwYXJhbSBjb21wb25lbnRzCisJICovCisJcHJvdGVjdGVkIHZvaWQgcmVnaXN0ZXIoSUNvbmZpZ3VyYXRpb25FbGVtZW50IHZlcmlmaWVyLCBMaXN0IHNlcnZlclRhcmdldHMsIExpc3QgY29tcG9uZW50cykgeworCQlIYXNoTWFwIHRhcmdldFZlcmlmaWVyczsKKwkJZm9yIChJdGVyYXRvciBpdGVyID0gY29tcG9uZW50cy5pdGVyYXRvcigpOyBpdGVyLmhhc05leHQoKTspIHsKKwkJCVN0cmluZyBjb21wSUQgPSAoU3RyaW5nKSBpdGVyLm5leHQoKTsKKwkJCWZvciAoSXRlcmF0b3IgaXRlcmF0b3IgPSBzZXJ2ZXJUYXJnZXRzLml0ZXJhdG9yKCk7IGl0ZXJhdG9yLmhhc05leHQoKTspIHsKKwkJCQlTdHJpbmcgcnVudGltZUlEID0gKFN0cmluZykgaXRlcmF0b3IubmV4dCgpOworCQkJCXRhcmdldFZlcmlmaWVycyA9IGdldFZlcmlmaWVyRXh0ZW5zaW9ucyhjb21wSUQpOworCQkJCWdldFRhcmdldFZlcmlmaWVycyh0YXJnZXRWZXJpZmllcnMsIHJ1bnRpbWVJRCkuYWRkKHZlcmlmaWVyKTsKKwkJCX0KKwkJfQorCX0KKworCXByaXZhdGUgTGlzdCBnZXRWZXJpZmllcnMoU3RyaW5nIGNvbXBJRCwgU3RyaW5nIHNlcnZlclRhcmdldCkgeworCQlIYXNoTWFwIHRhcmdldFZlcmlmaWVycyA9IGdldFZlcmlmaWVyRXh0ZW5zaW9ucyhjb21wSUQpOworCQlyZXR1cm4gZ2V0VGFyZ2V0VmVyaWZpZXJzKHRhcmdldFZlcmlmaWVycywgc2VydmVyVGFyZ2V0KTsKKwl9CisKKwlwcm90ZWN0ZWQgc3RhdGljIFZlcmlmaWVyUmVnaXN0cnkgaW5zdGFuY2UoKSB7CisJCWlmIChJTlNUQU5DRSA9PSBudWxsKSB7CisJCQlJTlNUQU5DRSA9IG5ldyBWZXJpZmllclJlZ2lzdHJ5KCk7CisJCQlyZWFkUmVnaXN0cnkoKTsKKwkJfQorCQlyZXR1cm4gSU5TVEFOQ0U7CisJfQorCisJLyoqCisJICogIAorCSAqLworCXByaXZhdGUgc3RhdGljIHZvaWQgcmVhZFJlZ2lzdHJ5KCkgeworCQlWZXJpZmllclJlZ2lzdHJ5UmVhZGVyIHJlYWRlciA9IG5ldyBWZXJpZmllclJlZ2lzdHJ5UmVhZGVyKCk7CisJCXJlYWRlci5yZWFkUmVnaXN0cnkoKTsKKwl9CisKKwkvKioKKwkgKiBAcGFyYW0gdGFyZ2V0VmVyaWZpZXJzCisJICogQHBhcmFtIHNlcnZlclRhcmdldAorCSAqLworCXByaXZhdGUgTGlzdCBnZXRUYXJnZXRWZXJpZmllcnMoSGFzaE1hcCB0YXJnZXRWZXJpZmllcnMsIFN0cmluZyBzZXJ2ZXJUYXJnZXQpIHsKKwkJaWYgKHRhcmdldFZlcmlmaWVycy5nZXQoc2VydmVyVGFyZ2V0KSA9PSBudWxsKQorCQkJdGFyZ2V0VmVyaWZpZXJzLnB1dChzZXJ2ZXJUYXJnZXQsIG5ldyBBcnJheUxpc3QoKSk7CisJCXJldHVybiAoTGlzdCkgdGFyZ2V0VmVyaWZpZXJzLmdldChzZXJ2ZXJUYXJnZXQpOworCX0KKworCS8qKgorCSAqIEBwYXJhbSBjb21wSUQKKwkgKiBAcmV0dXJuCisJICovCisJcHJpdmF0ZSBIYXNoTWFwIGdldFZlcmlmaWVyRXh0ZW5zaW9ucyhTdHJpbmcgY29tcElEKSB7CisJCWlmIChnZXRWZXJpZmllckV4dGVuc2lvbnMoKS5nZXQoY29tcElEKSA9PSBudWxsKQorCQkJZ2V0VmVyaWZpZXJFeHRlbnNpb25zKCkucHV0KGNvbXBJRCwgbmV3IEhhc2hNYXAoKSk7CisJCXJldHVybiAoSGFzaE1hcCkgZ2V0VmVyaWZpZXJFeHRlbnNpb25zKCkuZ2V0KGNvbXBJRCk7CisJfQorCisJLyoqCisJICogQHJldHVybiBSZXR1cm5zIHRoZSB2ZXJpZmllckV4dGVuc2lvbnMuCisJICovCisJcHJpdmF0ZSBIYXNoTWFwIGdldFZlcmlmaWVyRXh0ZW5zaW9ucygpIHsKKwkJcmV0dXJuIGFzc2VtYmx5VmVyaWZpZXJFeHRlbnNpb25zOworCX0KKworCS8qKgorCSAqIEBwYXJhbSBmYWNldFR5cGVJRAorCSAqIEBwYXJhbSBydW50aW1lCisJICogQHJldHVybiBMaXN0IG9mIElDb25maWd1cmF0aW9uRWxlbWVudHMgcmVwcmVzZW50aW5nIGluc3RhbmNlcyBvZiBJRGVwbG95bWVudEFzc2VtYmx5VmVyaWZpZXIKKwkgKi8KKwlwdWJsaWMgTGlzdCBnZXRWZXJpZmllckV4dGVuc2lvbnMoU3RyaW5nIGZhY2V0VHlwZUlELCBJUnVudGltZSBydW50aW1lKSB7CisJCQorCQlTdHJpbmcgcnVudGltZUlEID0gbnVsbDsKKwkJaWYgKHJ1bnRpbWUgPT0gbnVsbCkKKwkJCXJ1bnRpbWVJRCA9ICJOb25lIjsgLy8kTk9OLU5MUy0xJAorCQllbHNlCisJCQlydW50aW1lSUQgPSBydW50aW1lLmdldFJ1bnRpbWVUeXBlKCkuZ2V0SWQoKTsKKwkJTGlzdCB2ZXJpZmllcnMgPSBnZXRWZXJpZmllcnMoZmFjZXRUeXBlSUQsIHJ1bnRpbWVJRCk7CisJCWlmICh2ZXJpZmllcnMgPT0gbnVsbCkKKwkJCXJldHVybiBDb2xsZWN0aW9ucy5FTVBUWV9MSVNUOworCQlyZXR1cm4gdmVyaWZpZXJzOworCX0KKworCit9CmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS51aS9zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9jb21wb25lbnRjb3JlL3VpL2ludGVybmFsL3Byb3BlcnR5cGFnZS92ZXJpZmllci9WZXJpZmllclJlZ2lzdHJ5UmVhZGVyLmphdmEgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS51aS9zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9jb21wb25lbnRjb3JlL3VpL2ludGVybmFsL3Byb3BlcnR5cGFnZS92ZXJpZmllci9WZXJpZmllclJlZ2lzdHJ5UmVhZGVyLmphdmEKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uMGE0NTRkMwotLS0gL2Rldi9udWxsCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlLnVpL3NyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2NvbXBvbmVudGNvcmUvdWkvaW50ZXJuYWwvcHJvcGVydHlwYWdlL3ZlcmlmaWVyL1ZlcmlmaWVyUmVnaXN0cnlSZWFkZXIuamF2YQpAQCAtMCwwICsxLDcyIEBACisvKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKgorICogQ29weXJpZ2h0IChjKSAyMDEwIElCTSBDb3Jwb3JhdGlvbiBhbmQgb3RoZXJzLgorICogQWxsIHJpZ2h0cyByZXNlcnZlZC4gVGhpcyBwcm9ncmFtIGFuZCB0aGUgYWNjb21wYW55aW5nIG1hdGVyaWFscworICogYXJlIG1hZGUgYXZhaWxhYmxlIHVuZGVyIHRoZSB0ZXJtcyBvZiB0aGUgRWNsaXBzZSBQdWJsaWMgTGljZW5zZSB2MS4wCisgKiB3aGljaCBhY2NvbXBhbmllcyB0aGlzIGRpc3RyaWJ1dGlvbiwgYW5kIGlzIGF2YWlsYWJsZSBhdAorICogaHR0cDovL3d3dy5lY2xpcHNlLm9yZy9sZWdhbC9lcGwtdjEwLmh0bWwKKyAqCisgKiBDb250cmlidXRvcnM6CisgKiBJQk0gQ29ycG9yYXRpb24gLSBpbml0aWFsIEFQSSBhbmQgaW1wbGVtZW50YXRpb24KKyAqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqLworCitwYWNrYWdlIG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS51aS5pbnRlcm5hbC5wcm9wZXJ0eXBhZ2UudmVyaWZpZXI7CisKK2ltcG9ydCBqYXZhLnV0aWwuQXJyYXlMaXN0OworaW1wb3J0IGphdmEudXRpbC5MaXN0OworCitpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5ydW50aW1lLklDb25maWd1cmF0aW9uRWxlbWVudDsKK2ltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUudWkuTW9kdWxlQ29yZVVJUGx1Z2luOworaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29yZS51dGlsLlJlZ2lzdHJ5UmVhZGVyOworCisKK3B1YmxpYyBjbGFzcyBWZXJpZmllclJlZ2lzdHJ5UmVhZGVyIGV4dGVuZHMgUmVnaXN0cnlSZWFkZXIgeworCS8qKgorCSAqIEBwYXJhbSByZWdpc3RyeQorCSAqIEBwYXJhbSBwbHVnaW4KKwkgKiBAcGFyYW0gZXh0ZW5zaW9uUG9pbnQKKwkgKi8KKwlzdGF0aWMgZmluYWwgU3RyaW5nIEFTU0VNQkxZX1ZFUklGSUVSX0VYVEVOU0lPTl9QT0lOVCA9ICJkZXBsb3ltZW50QXNzZW1ibHlWZXJpZmllciI7IC8vJE5PTi1OTFMtMSQKKwlzdGF0aWMgZmluYWwgU3RyaW5nIFRBUkdFVF9TRVJWRVJfUlVOVElNRV9JRCA9ICJydW50aW1lX3NlcnZlcl9pZCI7IC8vJE5PTi1OTFMtMSQKKwlzdGF0aWMgZmluYWwgU3RyaW5nIFJVTlRJTUUgPSAicnVudGltZSI7IC8vJE5PTi1OTFMtMSQKKwlzdGF0aWMgZmluYWwgU3RyaW5nIFZFUklGSUVSID0gInZlcmlmaWVyIjsgLy8kTk9OLU5MUy0xJAorCXB1YmxpYyBzdGF0aWMgZmluYWwgU3RyaW5nIFZFUklGSUVSX0NMQVNTID0gImNsYXNzIjsgLy8kTk9OLU5MUy0xJAorCXN0YXRpYyBmaW5hbCBTdHJpbmcgQ09NUE9ORU5UX1RZUEVfSUQgPSAiY29tcG9uZW50X3R5cGUiOyAvLyROT04tTkxTLTEkCisJc3RhdGljIGZpbmFsIFN0cmluZyBDT01QT05FTlQgPSAiY29tcG9uZW50IjsgLy8kTk9OLU5MUy0xJAorCisJcHVibGljIFZlcmlmaWVyUmVnaXN0cnlSZWFkZXIoKSB7CisJCXN1cGVyKE1vZHVsZUNvcmVVSVBsdWdpbi5QTFVHSU5fSUQsIEFTU0VNQkxZX1ZFUklGSUVSX0VYVEVOU0lPTl9QT0lOVCk7CisJfQorCisJLyoKKwkgKiAobm9uLUphdmFkb2MpCisJICogCisJICogQHNlZSBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3MuaW50ZXJuYWwuUmVnaXN0cnlSZWFkZXIjcmVhZEVsZW1lbnQob3JnLmVjbGlwc2UuY29yZS5ydW50aW1lLklDb25maWd1cmF0aW9uRWxlbWVudCkKKwkgKi8KKwlAT3ZlcnJpZGUKKwlwdWJsaWMgYm9vbGVhbiByZWFkRWxlbWVudChJQ29uZmlndXJhdGlvbkVsZW1lbnQgZWxlbWVudCkgeworCQlpZiAoIWVsZW1lbnQuZ2V0TmFtZSgpLmVxdWFscyhWRVJJRklFUikpCisJCQlyZXR1cm4gZmFsc2U7CisJCUxpc3QgcnVudGltZUxpc3QgPSBuZXcgQXJyYXlMaXN0KCk7CisJCUxpc3QgY29tcHMgPSBuZXcgQXJyYXlMaXN0KCk7CisJCUlDb25maWd1cmF0aW9uRWxlbWVudFtdIHJ1bnRpbWVzID0gZWxlbWVudC5nZXRDaGlsZHJlbihSVU5USU1FKTsKKwkJZm9yIChpbnQgaSA9IDA7IGkgPCBydW50aW1lcy5sZW5ndGg7IGkrKykgeworCQkJSUNvbmZpZ3VyYXRpb25FbGVtZW50IHJ1bnRpbWUgPSBydW50aW1lc1tpXTsKKwkJCVN0cmluZyBzZXJ2ZXJUYXJnZXQgPSBydW50aW1lLmdldEF0dHJpYnV0ZShUQVJHRVRfU0VSVkVSX1JVTlRJTUVfSUQpOworCQkJcnVudGltZUxpc3QuYWRkKHNlcnZlclRhcmdldCk7CisJCX0KKwkJSUNvbmZpZ3VyYXRpb25FbGVtZW50W10gY29tcG9uZW50cyA9IGVsZW1lbnQuZ2V0Q2hpbGRyZW4oQ09NUE9ORU5UKTsKKwkJZm9yIChpbnQgaSA9IDA7IGkgPCBjb21wb25lbnRzLmxlbmd0aDsgaSsrKSB7CisJCQlJQ29uZmlndXJhdGlvbkVsZW1lbnQgY29tcG9uZW50ID0gY29tcG9uZW50c1tpXTsKKwkJCVN0cmluZyBjb21wVHlwZSA9IGNvbXBvbmVudC5nZXRBdHRyaWJ1dGUoQ09NUE9ORU5UX1RZUEVfSUQpOworCQkJY29tcHMuYWRkKGNvbXBUeXBlKTsKKwkJfQorCisJCVN0cmluZyBkZXBsb3llciA9IGVsZW1lbnQuZ2V0QXR0cmlidXRlKFZFUklGSUVSX0NMQVNTKTsKKwkJaWYgKGRlcGxveWVyICE9IG51bGwpIHsKKwkJCVZlcmlmaWVyUmVnaXN0cnkuaW5zdGFuY2UoKS5yZWdpc3RlcihlbGVtZW50LCBydW50aW1lTGlzdCwgY29tcHMpOworCQkJcmV0dXJuIHRydWU7CisJCX0KKwkJcmV0dXJuIGZhbHNlOworCX0KKworfQpkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUudWkvc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vY29tcG9uZW50Y29yZS91aS9pbnRlcm5hbC90YXNrd2l6YXJkL0lXaXphcmRIYW5kbGUuamF2YSBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlLnVpL3NyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2NvbXBvbmVudGNvcmUvdWkvaW50ZXJuYWwvdGFza3dpemFyZC9JV2l6YXJkSGFuZGxlLmphdmEKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uNThmNzYzZAotLS0gL2Rldi9udWxsCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlLnVpL3NyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2NvbXBvbmVudGNvcmUvdWkvaW50ZXJuYWwvdGFza3dpemFyZC9JV2l6YXJkSGFuZGxlLmphdmEKQEAgLTAsMCArMSw3MSBAQAorLyoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioKKyAqIENvcHlyaWdodCAoYykgMjAwMywgMjAwNSBJQk0gQ29ycG9yYXRpb24gYW5kIG90aGVycy4KKyAqIEFsbCByaWdodHMgcmVzZXJ2ZWQuIFRoaXMgcHJvZ3JhbSBhbmQgdGhlIGFjY29tcGFueWluZyBtYXRlcmlhbHMKKyAqIGFyZSBtYWRlIGF2YWlsYWJsZSB1bmRlciB0aGUgdGVybXMgb2YgdGhlIEVjbGlwc2UgUHVibGljIExpY2Vuc2UgdjEuMAorICogd2hpY2ggYWNjb21wYW5pZXMgdGhpcyBkaXN0cmlidXRpb24sIGFuZCBpcyBhdmFpbGFibGUgYXQKKyAqIGh0dHA6Ly93d3cuZWNsaXBzZS5vcmcvbGVnYWwvZXBsLXYxMC5odG1sCisgKiAKKyAqIENvbnRyaWJ1dG9yczoKKyAqICAgICBJQk0gQ29ycG9yYXRpb24gLSBJbml0aWFsIEFQSSBhbmQgaW1wbGVtZW50YXRpb24KKyAqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqLworcGFja2FnZSBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUudWkuaW50ZXJuYWwudGFza3dpemFyZDsKKworaW1wb3J0IGphdmEubGFuZy5yZWZsZWN0Lkludm9jYXRpb25UYXJnZXRFeGNlcHRpb247CisKK2ltcG9ydCBvcmcuZWNsaXBzZS5qZmFjZS5kaWFsb2dzLklNZXNzYWdlUHJvdmlkZXI7CitpbXBvcnQgb3JnLmVjbGlwc2UuamZhY2Uub3BlcmF0aW9uLklSdW5uYWJsZVdpdGhQcm9ncmVzczsKK2ltcG9ydCBvcmcuZWNsaXBzZS5qZmFjZS5yZXNvdXJjZS5JbWFnZURlc2NyaXB0b3I7CisvKioKKyAqIEEgd2l6YXJkIGhhbmRsZS4KKyAqIAorICogQHNpbmNlIDEuMAorICovCitwdWJsaWMgaW50ZXJmYWNlIElXaXphcmRIYW5kbGUgZXh0ZW5kcyBJTWVzc2FnZVByb3ZpZGVyIHsKKwkvKioKKwkgKiBVcGRhdGVzIHRoZSB3aXphcmQgZXJyb3IgbWVzc2FnZXMgYW5kIGJ1dHRvbnMuCisJICovCisJcHVibGljIHZvaWQgdXBkYXRlKCk7CisKKwkvKioKKwkgKiBTZXRzIHRoZSB0aXRsZSBvZiB0aGlzIHdpemFyZCBwYWdlLgorCSAqICAKKwkgKiBAcGFyYW0gdGl0bGUgdGhlIHRpdGxlIG9mIHRoZSB3aXphcmQgcGFnZQorCSAqLworCXB1YmxpYyB2b2lkIHNldFRpdGxlKFN0cmluZyB0aXRsZSk7CisKKwkvKioKKwkgKiBUaGUgcGFnZSdzIGRlc2NyaXB0aW9uLgorCSAqIAorCSAqIEBwYXJhbSBkZXNjIHRoZSBwYWdlJ3MgZGVzY3JpcHRpb24KKwkgKi8KKwlwdWJsaWMgdm9pZCBzZXREZXNjcmlwdGlvbihTdHJpbmcgZGVzYyk7CisKKwkvKioKKwkgKiBUaGUgcGFnZSdzIGltYWdlIGRlc2NyaXB0b3IuCisJICogCisJICogQHBhcmFtIGltYWdlIHRoZSBwYWdlJ3MgaW1hZ2UgZGVzY3JpcHRvcgorCSAqLworCXB1YmxpYyB2b2lkIHNldEltYWdlRGVzY3JpcHRvcihJbWFnZURlc2NyaXB0b3IgaW1hZ2UpOworCisJLyoqCisJICogU2V0IGFuIGVycm9yIG9yIHdhcm5pbmcgbWVzc2FnZS4KKwkgKiAKKwkgKiBAcGFyYW0gbmV3TWVzc2FnZSB0aGUgbmV3IG1lc3NhZ2UKKwkgKiBAcGFyYW0gbmV3VHlwZSB0aGUgbmV3IHR5cGUsIGZyb20gSVN0YXR1cworCSAqLworCXB1YmxpYyB2b2lkIHNldE1lc3NhZ2UoU3RyaW5nIG5ld01lc3NhZ2UsIGludCBuZXdUeXBlKTsKKworCS8qKgorCSAqIEV4ZWN1dGUgYSBydW5uYWJsZSB3aXRoaW4gdGhlIGNvbnRleHQgb2YgdGhlIHdpemFyZC4gVGhpcyB3aWxsIHR5cGljYWxseQorCSAqIGRpc2FibGUgdGhlIHdpemFyZCB3aGlsZSB0aGUgcnVubmFibGUgaXMgcnVubmluZywgYW5kIHByb3ZpZGUgYSBwcm9ncmVzcworCSAqIG1vbml0b3IgZm9yIHRoZSB1c2VyLiAgCisJICogCisJICogQHBhcmFtIGZvcmsgdHJ1ZSBpZiBhIHNlcGFyYXRlIHRocmVhZCBzaG91bGQgYmUgdXNlZAorCSAqIEBwYXJhbSBjYW5jZWxhYmxlIHRydWUgaWYgaXQgc2hvdWxkIGJlIGNhbmNlbGFibGUKKwkgKiBAcGFyYW0gcnVubmFibGUgdGhlIHJ1bm5hYmxlCisJICogQHRocm93cyBJbnRlcnJ1cHRlZEV4Y2VwdGlvbiB0aHJvd24gaWYgaXQgaXMgaW50ZXJydXB0ZWQKKwkgKiBAdGhyb3dzIEludm9jYXRpb25UYXJnZXRFeGNlcHRpb24gdGhyb3duIGlmIHRoZXJlIGlzIGFuIGVycm9yCisJICovCisJcHVibGljIHZvaWQgcnVuKGJvb2xlYW4gZm9yaywgYm9vbGVhbiBjYW5jZWxhYmxlLCBJUnVubmFibGVXaXRoUHJvZ3Jlc3MgcnVubmFibGUpIHRocm93cyBJbnRlcnJ1cHRlZEV4Y2VwdGlvbiwgSW52b2NhdGlvblRhcmdldEV4Y2VwdGlvbjsKKwkKK30KXCBObyBuZXdsaW5lIGF0IGVuZCBvZiBmaWxlCmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS51aS9zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9jb21wb25lbnRjb3JlL3VpL2ludGVybmFsL3Rhc2t3aXphcmQvVGFza1dpemFyZC5qYXZhIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUudWkvc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vY29tcG9uZW50Y29yZS91aS9pbnRlcm5hbC90YXNrd2l6YXJkL1Rhc2tXaXphcmQuamF2YQpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi43OGEyNDEwCi0tLSAvZGV2L251bGwKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUudWkvc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vY29tcG9uZW50Y29yZS91aS9pbnRlcm5hbC90YXNrd2l6YXJkL1Rhc2tXaXphcmQuamF2YQpAQCAtMCwwICsxLDU4NyBAQAorLyoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioKKyAqIENvcHlyaWdodCAoYykgMjAwMywgMjAwNyBJQk0gQ29ycG9yYXRpb24gYW5kIG90aGVycy4KKyAqIEFsbCByaWdodHMgcmVzZXJ2ZWQuIFRoaXMgcHJvZ3JhbSBhbmQgdGhlIGFjY29tcGFueWluZyBtYXRlcmlhbHMKKyAqIGFyZSBtYWRlIGF2YWlsYWJsZSB1bmRlciB0aGUgdGVybXMgb2YgdGhlIEVjbGlwc2UgUHVibGljIExpY2Vuc2UgdjEuMAorICogd2hpY2ggYWNjb21wYW5pZXMgdGhpcyBkaXN0cmlidXRpb24sIGFuZCBpcyBhdmFpbGFibGUgYXQKKyAqIGh0dHA6Ly93d3cuZWNsaXBzZS5vcmcvbGVnYWwvZXBsLXYxMC5odG1sCisgKgorICogQ29udHJpYnV0b3JzOgorICogICAgIElCTSBDb3Jwb3JhdGlvbiAtIEluaXRpYWwgQVBJIGFuZCBpbXBsZW1lbnRhdGlvbgorICoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKiovCitwYWNrYWdlIG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS51aS5pbnRlcm5hbC50YXNrd2l6YXJkOworCitpbXBvcnQgamF2YS5sYW5nLnJlZmxlY3QuSW52b2NhdGlvblRhcmdldEV4Y2VwdGlvbjsKK2ltcG9ydCBqYXZhLnV0aWwuQXJyYXlMaXN0OworaW1wb3J0IGphdmEudXRpbC5IYXNoTWFwOworaW1wb3J0IGphdmEudXRpbC5JdGVyYXRvcjsKK2ltcG9ydCBqYXZhLnV0aWwuTGlzdDsKK2ltcG9ydCBqYXZhLnV0aWwuTWFwOworCitpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5yZXNvdXJjZXMuSVdvcmtzcGFjZVJ1bm5hYmxlOworaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucnVudGltZS5Db3JlRXhjZXB0aW9uOworaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucnVudGltZS5JUHJvZ3Jlc3NNb25pdG9yOworaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucnVudGltZS5JU3RhdHVzOworaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucnVudGltZS5OdWxsUHJvZ3Jlc3NNb25pdG9yOworaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucnVudGltZS5TdGF0dXM7CitpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5ydW50aW1lLmpvYnMuSm9iOworaW1wb3J0IG9yZy5lY2xpcHNlLmpmYWNlLmRpYWxvZ3MuRXJyb3JEaWFsb2c7CitpbXBvcnQgb3JnLmVjbGlwc2UuamZhY2UuZGlhbG9ncy5JRGlhbG9nU2V0dGluZ3M7CitpbXBvcnQgb3JnLmVjbGlwc2UuamZhY2UuZGlhbG9ncy5NZXNzYWdlRGlhbG9nOworaW1wb3J0IG9yZy5lY2xpcHNlLmpmYWNlLm9wZXJhdGlvbi5JUnVubmFibGVXaXRoUHJvZ3Jlc3M7CitpbXBvcnQgb3JnLmVjbGlwc2UuamZhY2Uud2l6YXJkLklXaXphcmQ7CitpbXBvcnQgb3JnLmVjbGlwc2UuamZhY2Uud2l6YXJkLklXaXphcmRDb250YWluZXI7CitpbXBvcnQgb3JnLmVjbGlwc2UuamZhY2Uud2l6YXJkLklXaXphcmRQYWdlOworaW1wb3J0IG9yZy5lY2xpcHNlLnN3dC5ncmFwaGljcy5JbWFnZTsKK2ltcG9ydCBvcmcuZWNsaXBzZS5zd3QuZ3JhcGhpY3MuUkdCOworaW1wb3J0IG9yZy5lY2xpcHNlLnN3dC53aWRnZXRzLkNvbXBvc2l0ZTsKK2ltcG9ydCBvcmcuZWNsaXBzZS5zd3Qud2lkZ2V0cy5EaXNwbGF5OworaW1wb3J0IG9yZy5lY2xpcHNlLnN3dC53aWRnZXRzLlNoZWxsOworaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS5pbnRlcm5hbC5pbXBsLlRhc2tNb2RlbDsKK2ltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUudWkuTWVzc2FnZXM7CitpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb21wb25lbnRjb3JlLnVpLk1vZHVsZUNvcmVVSVBsdWdpbjsKK2ltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUudWkuVHJhY2U7CisKKworCisvKioKKyAqIEEgd2l6YXJkIHVzZWQgdG8gZXhlY3V0ZSB0YXNrcy4KKyAqLworcHVibGljIGNsYXNzIFRhc2tXaXphcmQgaW1wbGVtZW50cyBJV2l6YXJkIHsKKwlwcml2YXRlIHN0YXRpYyBmaW5hbCBieXRlIEZJTklTSCA9IDI7CisJcHJpdmF0ZSBzdGF0aWMgZmluYWwgYnl0ZSBDQU5DRUwgPSAzOworCisJcHJpdmF0ZSBMaXN0PElXaXphcmRQYWdlPiBwYWdlczsKKwlwcml2YXRlIGJvb2xlYW4gYWRkaW5nUGFnZXM7CisJcHJpdmF0ZSBNYXA8V2l6YXJkRnJhZ21lbnQsIFRhc2tXaXphcmRQYWdlPiBmcmFnbWVudERhdGEgPSBuZXcgSGFzaE1hcDxXaXphcmRGcmFnbWVudCwgVGFza1dpemFyZFBhZ2U+KCk7CisJcHJvdGVjdGVkIFRhc2tNb2RlbCB0YXNrTW9kZWw7CisJCisJcHJpdmF0ZSBJV2l6YXJkQ29udGFpbmVyIGNvbnRhaW5lciA9IG51bGw7CisJCisJcHJpdmF0ZSBib29sZWFuIG5lZWRzUHJvZ3Jlc3NNb25pdG9yID0gZmFsc2U7CisJCisJcHJpdmF0ZSBib29sZWFuIGZvcmNlUHJldmlvdXNBbmROZXh0QnV0dG9ucyA9IGZhbHNlOworCisJcHJpdmF0ZSBib29sZWFuIGlzSGVscEF2YWlsYWJsZSA9IGZhbHNlOworCQorCXByaXZhdGUgSW1hZ2UgZGVmYXVsdEltYWdlID0gbnVsbDsKKwkKKwlwcml2YXRlIFJHQiB0aXRsZUJhckNvbG9yID0gbnVsbDsKKworCXByaXZhdGUgU3RyaW5nIHdpbmRvd1RpdGxlID0gbnVsbDsKKwkKKwlwcml2YXRlIElEaWFsb2dTZXR0aW5ncyBkaWFsb2dTZXR0aW5ncyA9IG51bGw7CisJCisJcHJpdmF0ZSBXaXphcmRGcmFnbWVudCByb290RnJhZ21lbnQ7CisJcHJpdmF0ZSBXaXphcmRGcmFnbWVudCBjdXJyZW50RnJhZ21lbnQ7CisJcHJpdmF0ZSBPYmplY3QgZmluaXNoRmFtaWx5OworCQorCS8qKgorCSAqIENyZWF0ZSBhIG5ldyBUYXNrV2l6YXJkIHdpdGggdGhlIGdpdmVuIHRpdGxlIGFuZCByb290IGZyYWdtZW50LgorCSAqIAorCSAqIEBwYXJhbSB0aXRsZSBhIHRpdGxlCisJICogQHBhcmFtIHJvb3RGcmFnbWVudCBhIHJvb3QgZnJhZ21lbnQKKwkgKi8KKwlwdWJsaWMgVGFza1dpemFyZChTdHJpbmcgdGl0bGUsIFdpemFyZEZyYWdtZW50IHJvb3RGcmFnbWVudCkgeworCQl0aGlzKHRpdGxlLCByb290RnJhZ21lbnQsIG51bGwpOworCQlzZXRXaW5kb3dUaXRsZSh0aXRsZSk7CisJfQorCisJLyoqCisJICogQ3JlYXRlIGEgbmV3IFRhc2tXaXphcmQgd2l0aCB0aGUgZ2l2ZW4gdGl0bGUsIHJvb3QgZnJhZ21lbnQsIGFuZCB0YXNrIG1vZGVsLgorCSAqIAorCSAqIEBwYXJhbSB0aXRsZSBhIHRpdGxlCisJICogQHBhcmFtIHJvb3RGcmFnbWVudCBhIHJvb3QgZnJhZ21lbnQKKwkgKiBAcGFyYW0gdGFza01vZGVsIGEgdGFzayBtb2RlbAorCSAqLworCXB1YmxpYyBUYXNrV2l6YXJkKFN0cmluZyB0aXRsZSwgV2l6YXJkRnJhZ21lbnQgcm9vdEZyYWdtZW50LCBUYXNrTW9kZWwgdGFza01vZGVsKSB7CisJCXN1cGVyKCk7CisJCWlmICh0aXRsZSAhPSBudWxsKQorCQkJc2V0V2luZG93VGl0bGUodGl0bGUpOworCQl0aGlzLnJvb3RGcmFnbWVudCA9IHJvb3RGcmFnbWVudDsKKwkJdGhpcy50YXNrTW9kZWwgPSB0YXNrTW9kZWw7CisJCWlmICh0YXNrTW9kZWwgPT0gbnVsbCkKKwkJCXRoaXMudGFza01vZGVsID0gbmV3IFRhc2tNb2RlbCgpOworCQkKKwkJc2V0TmVlZHNQcm9ncmVzc01vbml0b3IodHJ1ZSk7CisJCXNldEZvcmNlUHJldmlvdXNBbmROZXh0QnV0dG9ucyh0cnVlKTsKKwl9CisKKwlwdWJsaWMgdm9pZCBzZXRUYXNrTW9kZWwoVGFza01vZGVsIHRhc2tNb2RlbCkgeworCQl0aGlzLnRhc2tNb2RlbCA9IHRhc2tNb2RlbDsKKwl9CisJCisJcHVibGljIFRhc2tNb2RlbCBnZXRUYXNrTW9kZWwoKSB7CisJCXJldHVybiB0YXNrTW9kZWw7CisJfQorCisJcHVibGljIHZvaWQgc2V0Um9vdEZyYWdtZW50KFdpemFyZEZyYWdtZW50IHJvb3RGcmFnbWVudCkgeworCQl0aGlzLnJvb3RGcmFnbWVudCA9IHJvb3RGcmFnbWVudDsKKwl9CisJCisJcHVibGljIFdpemFyZEZyYWdtZW50IGdldFJvb3RGcmFnbWVudCgpIHsKKwkJcmV0dXJuIHJvb3RGcmFnbWVudDsKKwl9CisKKwkvKioKKwkgKiBDYW5jZWwgdGhlIGNsaWVudCBzZWxlY3Rpb24uCisJICoKKwkgKiBAcmV0dXJuIGJvb2xlYW4KKwkgKi8KKwlwdWJsaWMgYm9vbGVhbiBwZXJmb3JtQ2FuY2VsKCkgeworCQlmaW5hbCBMaXN0IGxpc3QgPSBnZXRBbGxXaXphcmRGcmFnbWVudHMoKTsKKwkJSVJ1bm5hYmxlV2l0aFByb2dyZXNzIHJ1bm5hYmxlID0gbmV3IElSdW5uYWJsZVdpdGhQcm9ncmVzcygpIHsKKwkJCXB1YmxpYyB2b2lkIHJ1bihJUHJvZ3Jlc3NNb25pdG9yIG1vbml0b3IpIHRocm93cyBJbnZvY2F0aW9uVGFyZ2V0RXhjZXB0aW9uIHsKKwkJCQl0cnkgeworCQkJCQlJdGVyYXRvciBpdGVyYXRvciA9IGxpc3QuaXRlcmF0b3IoKTsKKwkJCQkJd2hpbGUgKGl0ZXJhdG9yLmhhc05leHQoKSkKKwkJCQkJCWV4ZWN1dGVUYXNrKChXaXphcmRGcmFnbWVudCkgaXRlcmF0b3IubmV4dCgpLCBDQU5DRUwsIG1vbml0b3IpOworCQkJCX0gY2F0Y2ggKENvcmVFeGNlcHRpb24gY2UpIHsKKwkJCQkJdGhyb3cgbmV3IEludm9jYXRpb25UYXJnZXRFeGNlcHRpb24oY2UpOworCQkJCX0KKwkJCX0KKwkJfTsKKwkJCisJCVRocm93YWJsZSB0ID0gbnVsbDsKKwkJdHJ5IHsKKwkJCWlmIChnZXRDb250YWluZXIoKSAhPSBudWxsKQorCQkJCWdldENvbnRhaW5lcigpLnJ1bih0cnVlLCB0cnVlLCBydW5uYWJsZSk7CisJCQllbHNlCisJCQkJcnVubmFibGUucnVuKG5ldyBOdWxsUHJvZ3Jlc3NNb25pdG9yKCkpOworCQkJcmV0dXJuIHRydWU7CisJCX0gY2F0Y2ggKEludm9jYXRpb25UYXJnZXRFeGNlcHRpb24gdGUpIHsKKwkJCXQgPSB0ZS5nZXRDYXVzZSgpOworCQl9IGNhdGNoIChFeGNlcHRpb24gZSkgeworCQkJdCA9IGU7CisJCX0KKwkJVHJhY2UudHJhY2UoVHJhY2UuU0VWRVJFLCAiRXJyb3IgY2FuY2VsbGluZyB0YXNrIHdpemFyZCIsIHQpOworCQloYW5kbGVUaHJvd2FibGUodCk7CisJCXJldHVybiBmYWxzZTsKKwkJCisJfQorCisJcHVibGljIGJvb2xlYW4gcGVyZm9ybUZpbmlzaCgpIHsKKwkJaWYgKGN1cnJlbnRGcmFnbWVudCAhPSBudWxsKQorCQkJY3VycmVudEZyYWdtZW50LmV4aXQoKTsKKwkJCisJCWZpbmFsIFdpemFyZEZyYWdtZW50IGNGcmFnbWVudCA9IGN1cnJlbnRGcmFnbWVudDsKKworCQlmaW5hbCBMaXN0IGxpc3QgPSBnZXRBbGxXaXphcmRGcmFnbWVudHMoKTsKKwkJSVdvcmtzcGFjZVJ1bm5hYmxlIHJ1bm5hYmxlID0gbmV3IElXb3Jrc3BhY2VSdW5uYWJsZSgpIHsKKwkJCXB1YmxpYyB2b2lkIHJ1bihJUHJvZ3Jlc3NNb25pdG9yIG1vbml0b3IpIHRocm93cyBDb3JlRXhjZXB0aW9uIHsKKwkJCQkvLyBlbnRlciAmIGV4aXQgdGhlIHJlbWFpbmluZyBwYWdlcworCQkJCWludCBpbmRleCA9IGxpc3QuaW5kZXhPZihjRnJhZ21lbnQpOworCQkJCXdoaWxlIChpbmRleCA+IDAgJiYgaW5kZXggPCBsaXN0LnNpemUoKSAtIDEpIHsKKwkJCQkJZmluYWwgV2l6YXJkRnJhZ21lbnQgZnJhZ21lbnQgPSAoV2l6YXJkRnJhZ21lbnQpIGxpc3QuZ2V0KCsraW5kZXgpOworCQkJCQl0cnkgeworCQkJCQkJRGlzcGxheS5nZXREZWZhdWx0KCkuc3luY0V4ZWMobmV3IFJ1bm5hYmxlKCkgeworCQkJCQkJCXB1YmxpYyB2b2lkIHJ1bigpIHsKKwkJCQkJCQkJZnJhZ21lbnQuZW50ZXIoKTsKKwkJCQkJCQkJZnJhZ21lbnQuZXhpdCgpOworCQkJCQkJCX0KKwkJCQkJCX0pOworCQkJCQl9IGNhdGNoIChFeGNlcHRpb24gZSkgeworCQkJCQkJVHJhY2UudHJhY2UoVHJhY2UuV0FSTklORywgIkNvdWxkIG5vdCBlbnRlci9leGl0IHBhZ2UiLCBlKTsKKwkJCQkJfQorCQkJCX0KKwkJCQkKKwkJCQlpZiAodXNlSm9iKCkpIHsKKwkJCQkJY2xhc3MgRmluaXNoV2l6YXJkSm9iIGV4dGVuZHMgSm9iIHsKKwkJCQkJCXB1YmxpYyBGaW5pc2hXaXphcmRKb2IoKSB7CisJCQkJCQkJc3VwZXIoZ2V0Sm9iVGl0bGUoKSk7CisJCQkJCQl9CisJCQkJCQkKKwkJCQkJCXB1YmxpYyBib29sZWFuIGJlbG9uZ3NUbyhPYmplY3QgZmFtaWx5KSB7CisJCQkJCQkJcmV0dXJuIChnZXRGaW5pc2hKb2JGYW1pbHkoKSA9PSBudWxsICYmIGZhbWlseSA9PSBudWxsICkgCisJCQkJCQkJfHwgKGdldEZpbmlzaEpvYkZhbWlseSgpICE9IG51bGwgJiYgZ2V0RmluaXNoSm9iRmFtaWx5KCkuZXF1YWxzKGZhbWlseSkpOworCQkJCQkJfQorCisJCQkJCQlwdWJsaWMgSVN0YXR1cyBydW4oSVByb2dyZXNzTW9uaXRvciBtb25pdG9yMikgeworCQkJCQkJCXRyeSB7CisJCQkJCQkJCUl0ZXJhdG9yIGl0ZXJhdG9yID0gbGlzdC5pdGVyYXRvcigpOworCQkJCQkJCQl3aGlsZSAoaXRlcmF0b3IuaGFzTmV4dCgpKQorCQkJCQkJCQkJZXhlY3V0ZVRhc2soKFdpemFyZEZyYWdtZW50KSBpdGVyYXRvci5uZXh0KCksIEZJTklTSCwgbW9uaXRvcjIpOworCQkJCQkJCX0gY2F0Y2ggKENvcmVFeGNlcHRpb24gY2UpIHsKKwkJCQkJCQkJVHJhY2UudHJhY2UoVHJhY2UuU0VWRVJFLCAiRXJyb3IgZmluaXNoaW5nIHdpemFyZCBqb2IiLCBjZSk7CisJCQkJCQkJCXJldHVybiBuZXcgU3RhdHVzKElTdGF0dXMuRVJST1IsIE1vZHVsZUNvcmVVSVBsdWdpbi5QTFVHSU5fSUQsIDAsIGNlLmdldExvY2FsaXplZE1lc3NhZ2UoKSwgbnVsbCk7CisJCQkJCQkJfQorCQkJCQkJCXJldHVybiBTdGF0dXMuT0tfU1RBVFVTOworCQkJCQkJfQorCQkJCQl9CisJCQkJCQorCQkJCQlGaW5pc2hXaXphcmRKb2Igam9iID0gbmV3IEZpbmlzaFdpemFyZEpvYigpOworCQkJCQlqb2Iuc2V0VXNlcih0cnVlKTsKKwkJCQkJam9iLnNjaGVkdWxlKCk7CisJCQkJfSBlbHNlIHsKKwkJCQkJSXRlcmF0b3IgaXRlcmF0b3IgPSBsaXN0Lml0ZXJhdG9yKCk7CisJCQkJCXdoaWxlIChpdGVyYXRvci5oYXNOZXh0KCkpCisJCQkJCQlleGVjdXRlVGFzaygoV2l6YXJkRnJhZ21lbnQpIGl0ZXJhdG9yLm5leHQoKSwgRklOSVNILCBtb25pdG9yKTsKKwkJCQl9CisJCQl9CisJCX07CisJCQorCQlUaHJvd2FibGUgdCA9IG51bGw7CisJCXRyeSB7CisJCQlpZiAoZ2V0Q29udGFpbmVyKCkgIT0gbnVsbCkKKwkJCQlnZXRDb250YWluZXIoKS5ydW4odHJ1ZSwgdHJ1ZSwgbmV3IFdvcmtzcGFjZVJ1bm5hYmxlQWRhcHRlcihydW5uYWJsZSkpOworCQkJZWxzZQorCQkJCXJ1bm5hYmxlLnJ1bihuZXcgTnVsbFByb2dyZXNzTW9uaXRvcigpKTsKKwkJCXJldHVybiB0cnVlOworCQl9IGNhdGNoIChJbnZvY2F0aW9uVGFyZ2V0RXhjZXB0aW9uIHRlKSB7CisJCQlUcmFjZS50cmFjZShUcmFjZS5TRVZFUkUsICJFcnJvciBmaW5pc2hpbmcgdGFzayB3aXphcmQiLCB0ZSk7CisJCQl0ID0gdGUuZ2V0Q2F1c2UoKTsKKwkJfSBjYXRjaCAoRXhjZXB0aW9uIGUpIHsKKwkJCVRyYWNlLnRyYWNlKFRyYWNlLlNFVkVSRSwgIkVycm9yIGZpbmlzaGluZyB0YXNrIHdpemFyZCAyIiwgZSk7CisJCQl0ID0gZTsKKwkJfQorCQkKKwkJLy8gVE9ETzogc2hvdyBiZXR0ZXIgZXJyb3IgZGlhbG9nLCBlLmcuIHdoZW4gVG9tY2F0IGNvbmZpZyBpcyBjb3JydXB0IHdoaWxlIGRvaW5nIEFkZC9SZW1vdmUKKwkJLy8gaXQgY3VycmVudGx5IGRpc3BsYXlzIHRoZSBlcnJvciBtZXNzYWdlIHR3aWNlCisJCVRyYWNlLnRyYWNlKFRyYWNlLldBUk5JTkcsICJFcnJvciBjb21wbGV0aW5nIHdpemFyZCIsIHQpOworCQloYW5kbGVUaHJvd2FibGUodCk7CisJCQorCQlyZXR1cm4gZmFsc2U7CisJfQorCQorCXB1YmxpYyBPYmplY3QgZ2V0RmluaXNoSm9iRmFtaWx5KCkgeworCQlyZXR1cm4gZmluaXNoRmFtaWx5OworCX0KKwkKKwlwdWJsaWMgdm9pZCBzZXRGaW5pc2hKb2JGYW1pbHkoT2JqZWN0IG8pIHsKKwkJdGhpcy5maW5pc2hGYW1pbHkgPSBvOworCX0KKwkKKwlwdWJsaWMgdm9pZCBhZGRQYWdlKElXaXphcmRQYWdlIHBhZ2UpIHsKKwkJcGFnZXMuYWRkKHBhZ2UpOworCQlwYWdlLnNldFdpemFyZCh0aGlzKTsKKwl9CisJCisJcHJvdGVjdGVkIHZvaWQgZXhlY3V0ZVRhc2soV2l6YXJkRnJhZ21lbnQgZnJhZ21lbnQsIGJ5dGUgdHlwZSwgSVByb2dyZXNzTW9uaXRvciBtb25pdG9yKSB0aHJvd3MgQ29yZUV4Y2VwdGlvbiB7CisJCWlmIChmcmFnbWVudCA9PSBudWxsKQorCQkJcmV0dXJuOworCQkKKwkJaWYgKHR5cGUgPT0gRklOSVNIKQorCQkJZnJhZ21lbnQucGVyZm9ybUZpbmlzaChtb25pdG9yKTsKKwkJZWxzZSBpZiAodHlwZSA9PSBDQU5DRUwpCisJCQlmcmFnbWVudC5wZXJmb3JtQ2FuY2VsKG1vbml0b3IpOworCX0KKwkKKwlwcm90ZWN0ZWQgV2l6YXJkRnJhZ21lbnQgZ2V0Q3VycmVudFdpemFyZEZyYWdtZW50KCkgeworCQlyZXR1cm4gY3VycmVudEZyYWdtZW50OworCX0KKwkKKwlwcm90ZWN0ZWQgdm9pZCBzd2l0Y2hXaXphcmRGcmFnbWVudChXaXphcmRGcmFnbWVudCBuZXdGcmFnbWVudCkgeworCQlMaXN0IGxpc3QgPSBnZXRBbGxXaXphcmRGcmFnbWVudHMoKTsKKwkJaW50IG9sZEluZGV4ID0gbGlzdC5pbmRleE9mKGN1cnJlbnRGcmFnbWVudCk7CisJCWludCBuZXdJbmRleCA9IGxpc3QuaW5kZXhPZihuZXdGcmFnbWVudCk7CisJCWlmIChvbGRJbmRleCA9PSBuZXdJbmRleCkKKwkJCXJldHVybjsKKwkJCisJCS8vc2FmZUV4ZWN1dGVUYXNrKGN1cnJlbnRGcmFnbWVudCwgREVQQVJUVVJFKTsKKwkJaWYgKGN1cnJlbnRGcmFnbWVudCAhPSBudWxsKQorCQkJY3VycmVudEZyYWdtZW50LmV4aXQoKTsKKwkJCisJCWlmIChvbGRJbmRleCA8IG5ld0luZGV4KQorCQkJb2xkSW5kZXggKys7CisJCWVsc2UKKwkJCW9sZEluZGV4IC0tOworCQkKKwkJd2hpbGUgKG9sZEluZGV4ICE9IG5ld0luZGV4KSB7CisJCQlXaXphcmRGcmFnbWVudCBmcmFnbWVudCA9IChXaXphcmRGcmFnbWVudCkgbGlzdC5nZXQob2xkSW5kZXgpOworCQkJLy9zYWZlRXhlY3V0ZVRhc2soZnJhZ21lbnQsIEFSUklWQUwpOworCQkJLy9zYWZlRXhlY3V0ZVRhc2soZnJhZ21lbnQsIERFUEFSVFVSRSk7CisJCQlmcmFnbWVudC5lbnRlcigpOworCQkJZnJhZ21lbnQuZXhpdCgpOworCQkJaWYgKG9sZEluZGV4IDwgbmV3SW5kZXgpCisJCQkJb2xkSW5kZXggKys7CisJCQllbHNlCisJCQkJb2xkSW5kZXggLS07CisJCX0KKwkJCisJCWN1cnJlbnRGcmFnbWVudCA9IG5ld0ZyYWdtZW50OworCQkvL3NhZmVFeGVjdXRlVGFzayhjdXJyZW50RnJhZ21lbnQsIEFSUklWQUwpOworCQljdXJyZW50RnJhZ21lbnQuZW50ZXIoKTsKKwl9CisJCisJcHJpdmF0ZSBMaXN0PFdpemFyZEZyYWdtZW50PiBnZXRBbGxXaXphcmRGcmFnbWVudHMoKSB7CisJCUxpc3Q8V2l6YXJkRnJhZ21lbnQ+IGxpc3QgPSBuZXcgQXJyYXlMaXN0PFdpemFyZEZyYWdtZW50PigpOworCQlsaXN0LmFkZChyb290RnJhZ21lbnQpOworCQlhZGRTdWJXaXphcmRGcmFnbWVudHMocm9vdEZyYWdtZW50LCBsaXN0KTsKKwkJCisJCUl0ZXJhdG9yIGl0ZXJhdG9yID0gbGlzdC5pdGVyYXRvcigpOworCQl3aGlsZSAoaXRlcmF0b3IuaGFzTmV4dCgpKSB7CisJCQlXaXphcmRGcmFnbWVudCBmcmFnbWVudCA9IChXaXphcmRGcmFnbWVudCkgaXRlcmF0b3IubmV4dCgpOworCQkJaWYgKCF0YXNrTW9kZWwuZXF1YWxzKGZyYWdtZW50LmdldFRhc2tNb2RlbCgpKSkKKwkJCQlmcmFnbWVudC5zZXRUYXNrTW9kZWwodGFza01vZGVsKTsKKwkJfQorCQlyZXR1cm4gbGlzdDsKKwl9CisKKwlwcml2YXRlIHZvaWQgYWRkU3ViV2l6YXJkRnJhZ21lbnRzKFdpemFyZEZyYWdtZW50IGZyYWdtZW50LCBMaXN0PFdpemFyZEZyYWdtZW50PiBsaXN0KSB7CisJCUl0ZXJhdG9yIGl0ZXJhdG9yID0gZnJhZ21lbnQuZ2V0Q2hpbGRGcmFnbWVudHMoKS5pdGVyYXRvcigpOworCQl3aGlsZSAoaXRlcmF0b3IuaGFzTmV4dCgpKSB7CisJCQlXaXphcmRGcmFnbWVudCBjaGlsZCA9IChXaXphcmRGcmFnbWVudCkgaXRlcmF0b3IubmV4dCgpOworCQkJbGlzdC5hZGQoY2hpbGQpOworCQkJYWRkU3ViV2l6YXJkRnJhZ21lbnRzKGNoaWxkLCBsaXN0KTsKKwkJfQorCX0KKworCS8qIChub24tSmF2YWRvYykKKwkgKiBAc2VlIG9yZy5lY2xpcHNlLmpmYWNlLndpemFyZC5JV2l6YXJkI2FkZFBhZ2VzKCkKKwkgKi8KKwlwdWJsaWMgdm9pZCBhZGRQYWdlcygpIHsKKwkJaWYgKGFkZGluZ1BhZ2VzKQorCQkJcmV0dXJuOworCQkKKwkJdHJ5IHsKKwkJCWFkZGluZ1BhZ2VzID0gdHJ1ZTsKKwkJCXBhZ2VzID0gbmV3IEFycmF5TGlzdDxJV2l6YXJkUGFnZT4oKTsKKwkJCUl0ZXJhdG9yPFdpemFyZEZyYWdtZW50PiBpdGVyYXRvciA9IGdldEFsbFdpemFyZEZyYWdtZW50cygpLml0ZXJhdG9yKCk7CisJCQl3aGlsZSAoaXRlcmF0b3IuaGFzTmV4dCgpKSB7CisJCQkJV2l6YXJkRnJhZ21lbnQgZnJhZ21lbnQgPSBpdGVyYXRvci5uZXh0KCk7CisJCQkJVGFza1dpemFyZFBhZ2UgcGFnZSA9IGdldEZyYWdtZW50RGF0YShmcmFnbWVudCk7CisJCQkJaWYgKGZyYWdtZW50Lmhhc0NvbXBvc2l0ZSgpKSB7CisJCQkJCWlmIChwYWdlICE9IG51bGwpCisJCQkJCQlhZGRQYWdlKHBhZ2UpOworCQkJCQllbHNlIHsKKwkJCQkJCVRhc2tXaXphcmRQYWdlIHBhZ2UyID0gbmV3IFRhc2tXaXphcmRQYWdlKGZyYWdtZW50KTsKKwkJCQkJCWZyYWdtZW50RGF0YS5wdXQoZnJhZ21lbnQsIHBhZ2UyKTsKKwkJCQkJCWFkZFBhZ2UocGFnZTIpOworCQkJCQl9CisJCQkJfQorCQkJfQorCQl9IGNhdGNoIChFeGNlcHRpb24gZSkgeworCQkJVHJhY2UudHJhY2UoVHJhY2UuU0VWRVJFLCAiRXJyb3IgYWRkaW5nIGZyYWdtZW50cyB0byB3aXphcmQiLCBlKTsKKwkJfSBmaW5hbGx5IHsKKwkJCWFkZGluZ1BhZ2VzID0gZmFsc2U7CisJCX0KKwl9CisKKwkvKnByaXZhdGUgc3RhdGljIHZvaWQgdXBkYXRlV2l6YXJkUGFnZXMoKSB7CisJCXRyeSB7CisJCQljdXJyZW50LnVwZGF0ZVBhZ2VzKCk7CisJCQljdXJyZW50LmdldENvbnRhaW5lcigpLnVwZGF0ZUJ1dHRvbnMoKTsKKwkJfSBjYXRjaCAoRXhjZXB0aW9uIGUpIHsKKwkJCVRyYWNlLnRyYWNlKFRyYWNlLlNFVkVSRSwgIkVycm9yIHVwZGF0aW5nIHdpemFyZCBwYWdlcyIsIGUpOworCQl9CisJfSovCisKKwlwcml2YXRlIFRhc2tXaXphcmRQYWdlIGdldEZyYWdtZW50RGF0YShXaXphcmRGcmFnbWVudCBmcmFnbWVudCkgeworCQl0cnkgeworCQkJVGFza1dpemFyZFBhZ2UgcGFnZSA9IGZyYWdtZW50RGF0YS5nZXQoZnJhZ21lbnQpOworCQkJaWYgKHBhZ2UgIT0gbnVsbCkKKwkJCQlyZXR1cm4gcGFnZTsKKwkJfSBjYXRjaCAoRXhjZXB0aW9uIGUpIHsKKwkJCVRyYWNlLnRyYWNlKFRyYWNlLlNFVkVSRSwgIkVycm9yIGdldHRpbmcgZnJhZ21lbnQgZGF0YSIsIGUpOworCQl9CisJCQorCQlyZXR1cm4gbnVsbDsKKwl9CisKKwlwcm90ZWN0ZWQgdm9pZCB1cGRhdGVQYWdlcygpIHsKKwkJYWRkUGFnZXMoKTsKKwl9CisKKwkvKiAobm9uLUphdmFkb2MpCisJICogQHNlZSBvcmcuZWNsaXBzZS5qZmFjZS53aXphcmQuSVdpemFyZCNjYW5GaW5pc2goKQorCSAqLworCXB1YmxpYyBib29sZWFuIGNhbkZpbmlzaCgpIHsKKwkJLy8gRGVmYXVsdCBpbXBsZW1lbnRhdGlvbiBpcyB0byBjaGVjayBpZiBhbGwgcGFnZXMgYXJlIGNvbXBsZXRlLgorCQlmb3IgKGludCBpPSAwOyBpIDwgcGFnZXMuc2l6ZSgpOyBpKyspIHsKKwkJCWlmICghKHBhZ2VzLmdldChpKSkuaXNQYWdlQ29tcGxldGUoKSkKKwkJCQlyZXR1cm4gZmFsc2U7CisJCX0KKwkJcmV0dXJuIHRydWU7CisJfQorCisJLyogKG5vbi1KYXZhZG9jKQorCSAqIEBzZWUgb3JnLmVjbGlwc2UuamZhY2Uud2l6YXJkLklXaXphcmQjY3JlYXRlUGFnZUNvbnRyb2xzKG9yZy5lY2xpcHNlLnN3dC53aWRnZXRzLkNvbXBvc2l0ZSkKKwkgKi8KKwlwdWJsaWMgdm9pZCBjcmVhdGVQYWdlQ29udHJvbHMoQ29tcG9zaXRlIHBhZ2VDb250YWluZXIpIHsKKwkJLy8gdGhlIGRlZmF1bHQgYmVoYXZpb3IgaXMgdG8gY3JlYXRlIGFsbCB0aGUgcGFnZXMgY29udHJvbHMKKwkJZm9yIChpbnQgaSA9IDA7IGkgPCBwYWdlcy5zaXplKCk7IGkrKyl7CisJCQlJV2l6YXJkUGFnZSBwYWdlID0gcGFnZXMuZ2V0KGkpOworCQkJcGFnZS5jcmVhdGVDb250cm9sKHBhZ2VDb250YWluZXIpOworCQl9CisJfQorCisJLyogKG5vbi1KYXZhZG9jKQorCSAqIEBzZWUgb3JnLmVjbGlwc2UuamZhY2Uud2l6YXJkLklXaXphcmQjZGlzcG9zZSgpCisJICovCisJcHVibGljIHZvaWQgZGlzcG9zZSgpIHsKKwkJLy8gbm90aWZ5IHBhZ2VzCisJCWZvciAoaW50IGkgPSAwOyBpIDwgcGFnZXMuc2l6ZSgpOyBpKyspIHsKKwkJCXBhZ2VzLmdldChpKS5kaXNwb3NlKCk7CisJCX0KKworCQkvLyBkaXNwb3NlIG9mIGltYWdlCisJCWlmIChkZWZhdWx0SW1hZ2UgIT0gbnVsbCkgeworCQkJZGVmYXVsdEltYWdlLmRpc3Bvc2UoKTsKKwkJCWRlZmF1bHRJbWFnZSA9IG51bGw7CisJCX0KKwl9CisKKwkvKiAobm9uLUphdmFkb2MpCisJICogQHNlZSBvcmcuZWNsaXBzZS5qZmFjZS53aXphcmQuSVdpemFyZCNnZXRDb250YWluZXIoKQorCSAqLworCXB1YmxpYyBJV2l6YXJkQ29udGFpbmVyIGdldENvbnRhaW5lcigpIHsKKwkJcmV0dXJuIGNvbnRhaW5lcjsKKwl9CisKKwkvKiAobm9uLUphdmFkb2MpCisJICogQHNlZSBvcmcuZWNsaXBzZS5qZmFjZS53aXphcmQuSVdpemFyZCNnZXREZWZhdWx0UGFnZUltYWdlKCkKKwkgKi8KKwlwdWJsaWMgSW1hZ2UgZ2V0RGVmYXVsdFBhZ2VJbWFnZSgpIHsKKwkJcmV0dXJuIGRlZmF1bHRJbWFnZTsKKwl9CisKKwkvKiAobm9uLUphdmFkb2MpCisJICogQHNlZSBvcmcuZWNsaXBzZS5qZmFjZS53aXphcmQuSVdpemFyZCNnZXREaWFsb2dTZXR0aW5ncygpCisJICovCisJcHVibGljIElEaWFsb2dTZXR0aW5ncyBnZXREaWFsb2dTZXR0aW5ncygpIHsKKwkJcmV0dXJuIGRpYWxvZ1NldHRpbmdzOworCX0KKworCS8qIChub24tSmF2YWRvYykKKwkgKiBAc2VlIG9yZy5lY2xpcHNlLmpmYWNlLndpemFyZC5JV2l6YXJkI2dldE5leHRQYWdlKG9yZy5lY2xpcHNlLmpmYWNlLndpemFyZC5JV2l6YXJkUGFnZSkKKwkgKi8KKwlwdWJsaWMgSVdpemFyZFBhZ2UgZ2V0TmV4dFBhZ2UoSVdpemFyZFBhZ2UgcGFnZSkgeworCQlpbnQgaW5kZXggPSBwYWdlcy5pbmRleE9mKHBhZ2UpOworCQlpZiAoaW5kZXggPT0gcGFnZXMuc2l6ZSgpIC0gMSB8fCBpbmRleCA9PSAtMSkKKwkJCS8vIGxhc3QgcGFnZSBvciBwYWdlIG5vdCBmb3VuZAorCQkJcmV0dXJuIG51bGw7CisJCQorCQlyZXR1cm4gcGFnZXMuZ2V0KGluZGV4ICsgMSk7CisJfQorCisJLyogKG5vbi1KYXZhZG9jKQorCSAqIEBzZWUgb3JnLmVjbGlwc2UuamZhY2Uud2l6YXJkLklXaXphcmQjZ2V0UGFnZShqYXZhLmxhbmcuU3RyaW5nKQorCSAqLworCXB1YmxpYyBJV2l6YXJkUGFnZSBnZXRQYWdlKFN0cmluZyBuYW1lKSB7CisJCWZvciAoaW50IGk9IDA7IGkgPCBwYWdlcy5zaXplKCk7IGkrKykgeworCQkJSVdpemFyZFBhZ2UgcGFnZSA9IHBhZ2VzLmdldChpKTsKKwkJCVN0cmluZyBwYWdlTmFtZSA9IHBhZ2UuZ2V0TmFtZSgpOworCQkJaWYgKHBhZ2VOYW1lLmVxdWFscyhuYW1lKSkKKwkJCQlyZXR1cm4gcGFnZTsKKwkJfQorCQlyZXR1cm4gbnVsbDsKKwl9CisKKwkvKiAobm9uLUphdmFkb2MpCisJICogQHNlZSBvcmcuZWNsaXBzZS5qZmFjZS53aXphcmQuSVdpemFyZCNnZXRQYWdlQ291bnQoKQorCSAqLworCXB1YmxpYyBpbnQgZ2V0UGFnZUNvdW50KCkgeworCQlyZXR1cm4gcGFnZXMuc2l6ZSgpOworCX0KKworCS8qIChub24tSmF2YWRvYykKKwkgKiBAc2VlIG9yZy5lY2xpcHNlLmpmYWNlLndpemFyZC5JV2l6YXJkI2dldFBhZ2VzKCkKKwkgKi8KKwlwdWJsaWMgSVdpemFyZFBhZ2VbXSBnZXRQYWdlcygpIHsKKwkJcmV0dXJuIHBhZ2VzLnRvQXJyYXkobmV3IElXaXphcmRQYWdlW3BhZ2VzLnNpemUoKV0pOworCX0KKworCS8qIChub24tSmF2YWRvYykKKwkgKiBAc2VlIG9yZy5lY2xpcHNlLmpmYWNlLndpemFyZC5JV2l6YXJkI2dldFByZXZpb3VzUGFnZShvcmcuZWNsaXBzZS5qZmFjZS53aXphcmQuSVdpemFyZFBhZ2UpCisJICovCisJcHVibGljIElXaXphcmRQYWdlIGdldFByZXZpb3VzUGFnZShJV2l6YXJkUGFnZSBwYWdlKSB7CisJCWludCBpbmRleCA9IHBhZ2VzLmluZGV4T2YocGFnZSk7CisJCWlmIChpbmRleCA9PSAwIHx8IGluZGV4ID09IC0xKQorCQkJLy8gZmlyc3QgcGFnZSBvciBwYWdlIG5vdCBmb3VuZAorCQkJcmV0dXJuIG51bGw7CisJCXJldHVybiBwYWdlcy5nZXQoaW5kZXggLSAxKTsKKwl9CisKKwkvKiAobm9uLUphdmFkb2MpCisJICogQHNlZSBvcmcuZWNsaXBzZS5qZmFjZS53aXphcmQuSVdpemFyZCNnZXRTdGFydGluZ1BhZ2UoKQorCSAqLworCXB1YmxpYyBJV2l6YXJkUGFnZSBnZXRTdGFydGluZ1BhZ2UoKSB7CisJCWlmIChwYWdlcy5zaXplKCkgPT0gMCkKKwkJCXJldHVybiBudWxsOworCQkKKwkJcmV0dXJuIHBhZ2VzLmdldCgwKTsKKwl9CisKKwkvKiAobm9uLUphdmFkb2MpCisJICogQHNlZSBvcmcuZWNsaXBzZS5qZmFjZS53aXphcmQuSVdpemFyZCNnZXRUaXRsZUJhckNvbG9yKCkKKwkgKi8KKwlwdWJsaWMgUkdCIGdldFRpdGxlQmFyQ29sb3IoKSB7CisJCXJldHVybiB0aXRsZUJhckNvbG9yOworCX0KKworCS8qIChub24tSmF2YWRvYykKKwkgKiBAc2VlIG9yZy5lY2xpcHNlLmpmYWNlLndpemFyZC5JV2l6YXJkI2dldFdpbmRvd1RpdGxlKCkKKwkgKi8KKwlwdWJsaWMgU3RyaW5nIGdldFdpbmRvd1RpdGxlKCkgeworCQlyZXR1cm4gd2luZG93VGl0bGU7CisJfQorCisJLyogKG5vbi1KYXZhZG9jKQorCSAqIEBzZWUgb3JnLmVjbGlwc2UuamZhY2Uud2l6YXJkLklXaXphcmQjaXNIZWxwQXZhaWxhYmxlKCkKKwkgKi8KKwlwdWJsaWMgYm9vbGVhbiBpc0hlbHBBdmFpbGFibGUoKSB7CisJCXJldHVybiBpc0hlbHBBdmFpbGFibGU7CisJfQorCisJLyogKG5vbi1KYXZhZG9jKQorCSAqIEBzZWUgb3JnLmVjbGlwc2UuamZhY2Uud2l6YXJkLklXaXphcmQjbmVlZHNQcmV2aW91c0FuZE5leHRCdXR0b25zKCkKKwkgKi8KKwlwdWJsaWMgYm9vbGVhbiBuZWVkc1ByZXZpb3VzQW5kTmV4dEJ1dHRvbnMoKSB7CisJCXJldHVybiBmb3JjZVByZXZpb3VzQW5kTmV4dEJ1dHRvbnMgfHwgcGFnZXMuc2l6ZSgpID4gMTsKKwl9CisKKwkvKiAobm9uLUphdmFkb2MpCisJICogQHNlZSBvcmcuZWNsaXBzZS5qZmFjZS53aXphcmQuSVdpemFyZCNuZWVkc1Byb2dyZXNzTW9uaXRvcigpCisJICovCisJcHVibGljIGJvb2xlYW4gbmVlZHNQcm9ncmVzc01vbml0b3IoKSB7CisJCXJldHVybiBuZWVkc1Byb2dyZXNzTW9uaXRvcjsKKwl9CisKKwkvKiAobm9uLUphdmFkb2MpCisJICogQHNlZSBvcmcuZWNsaXBzZS5qZmFjZS53aXphcmQuSVdpemFyZCNzZXRDb250YWluZXIob3JnLmVjbGlwc2UuamZhY2Uud2l6YXJkLklXaXphcmRDb250YWluZXIpCisJICovCisJcHVibGljIHZvaWQgc2V0Q29udGFpbmVyKElXaXphcmRDb250YWluZXIgd2l6YXJkQ29udGFpbmVyKSB7CisJCXRoaXMuY29udGFpbmVyID0gd2l6YXJkQ29udGFpbmVyOworCX0KKwkKKwlwdWJsaWMgdm9pZCBzZXREaWFsb2dTZXR0aW5ncyhJRGlhbG9nU2V0dGluZ3Mgc2V0dGluZ3MpIHsKKwkJZGlhbG9nU2V0dGluZ3MgPSBzZXR0aW5nczsKKwl9CisJCisJcHVibGljIHZvaWQgc2V0TmVlZHNQcm9ncmVzc01vbml0b3IoYm9vbGVhbiBiKSB7CisJCW5lZWRzUHJvZ3Jlc3NNb25pdG9yID0gYjsKKwl9CisJCisJcHVibGljIHZvaWQgc2V0Rm9yY2VQcmV2aW91c0FuZE5leHRCdXR0b25zKGJvb2xlYW4gYikgeworCQlmb3JjZVByZXZpb3VzQW5kTmV4dEJ1dHRvbnMgPSBiOworCX0KKwkKKwlwdWJsaWMgdm9pZCBzZXRXaW5kb3dUaXRsZShTdHJpbmcgdGl0bGUpIHsKKwkJd2luZG93VGl0bGUgPSB0aXRsZTsKKwl9CisKKwlwcm90ZWN0ZWQgYm9vbGVhbiB1c2VKb2IoKSB7CisJCXJldHVybiBmYWxzZTsKKwl9CisKKwlwcm90ZWN0ZWQgU3RyaW5nIGdldEpvYlRpdGxlKCkgeworCQlyZXR1cm4gZ2V0V2luZG93VGl0bGUoKTsKKwl9CisJCisJcHJpdmF0ZSB2b2lkIGhhbmRsZVRocm93YWJsZShmaW5hbCBUaHJvd2FibGUgdCkgeworCQlEaXNwbGF5IGRpc3BsYXkgPSBEaXNwbGF5LmdldEN1cnJlbnQoKTsKKwkJaWYgKGRpc3BsYXkgPT0gbnVsbCkKKwkJCWRpc3BsYXkgPSBEaXNwbGF5LmdldERlZmF1bHQoKTsKKwkJZmluYWwgU2hlbGwgc2hlbGwgPSBkaXNwbGF5LmdldEFjdGl2ZVNoZWxsKCk7CisJCWZpbmFsIFN0cmluZyBtZXNzYWdlID0gdC5nZXRMb2NhbGl6ZWRNZXNzYWdlKCk7CisJCWZpbmFsIElTdGF0dXMgc3RhdHVzID0gKHQgaW5zdGFuY2VvZiBDb3JlRXhjZXB0aW9uKSA/ICgoQ29yZUV4Y2VwdGlvbil0KS5nZXRTdGF0dXMoKSA6IG51bGw7CisJCQorCQlEaXNwbGF5LmdldERlZmF1bHQoKS5hc3luY0V4ZWMobmV3IFJ1bm5hYmxlKCkgeworCQkJcHVibGljIHZvaWQgcnVuKCkgeworCQkJCWlmKCBzdGF0dXMgPT0gbnVsbCApCisJCQkJCU1lc3NhZ2VEaWFsb2cub3BlbkVycm9yKHNoZWxsLCBNZXNzYWdlcy5XaXphcmRFcnJvciwgbWVzc2FnZSk7CisJCQkJZWxzZQorCQkJCQlFcnJvckRpYWxvZy5vcGVuRXJyb3Ioc2hlbGwsIE1lc3NhZ2VzLldpemFyZEVycm9yLCBtZXNzYWdlLCBzdGF0dXMpOworCQkJfQorCQl9KTsKKwl9Cit9ClwgTm8gbmV3bGluZSBhdCBlbmQgb2YgZmlsZQpkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUudWkvc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vY29tcG9uZW50Y29yZS91aS9pbnRlcm5hbC90YXNrd2l6YXJkL1Rhc2tXaXphcmRQYWdlLmphdmEgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS51aS9zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9jb21wb25lbnRjb3JlL3VpL2ludGVybmFsL3Rhc2t3aXphcmQvVGFza1dpemFyZFBhZ2UuamF2YQpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi5kZWQ0NjYxCi0tLSAvZGV2L251bGwKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUudWkvc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vY29tcG9uZW50Y29yZS91aS9pbnRlcm5hbC90YXNrd2l6YXJkL1Rhc2tXaXphcmRQYWdlLmphdmEKQEAgLTAsMCArMSwxMjYgQEAKKy8qKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqCisgKiBDb3B5cmlnaHQgKGMpIDIwMDMsIDIwMDcgSUJNIENvcnBvcmF0aW9uIGFuZCBvdGhlcnMuCisgKiBBbGwgcmlnaHRzIHJlc2VydmVkLiBUaGlzIHByb2dyYW0gYW5kIHRoZSBhY2NvbXBhbnlpbmcgbWF0ZXJpYWxzCisgKiBhcmUgbWFkZSBhdmFpbGFibGUgdW5kZXIgdGhlIHRlcm1zIG9mIHRoZSBFY2xpcHNlIFB1YmxpYyBMaWNlbnNlIHYxLjAKKyAqIHdoaWNoIGFjY29tcGFuaWVzIHRoaXMgZGlzdHJpYnV0aW9uLCBhbmQgaXMgYXZhaWxhYmxlIGF0CisgKiBodHRwOi8vd3d3LmVjbGlwc2Uub3JnL2xlZ2FsL2VwbC12MTAuaHRtbAorICoKKyAqIENvbnRyaWJ1dG9yczoKKyAqICAgICBJQk0gQ29ycG9yYXRpb24gLSBJbml0aWFsIEFQSSBhbmQgaW1wbGVtZW50YXRpb24KKyAqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqLworcGFja2FnZSBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUudWkuaW50ZXJuYWwudGFza3dpemFyZDsKKworaW1wb3J0IGphdmEubGFuZy5yZWZsZWN0Lkludm9jYXRpb25UYXJnZXRFeGNlcHRpb247CisKK2ltcG9ydCBvcmcuZWNsaXBzZS5qZmFjZS5kaWFsb2dzLklNZXNzYWdlUHJvdmlkZXI7CitpbXBvcnQgb3JnLmVjbGlwc2UuamZhY2Uub3BlcmF0aW9uLklSdW5uYWJsZVdpdGhQcm9ncmVzczsKK2ltcG9ydCBvcmcuZWNsaXBzZS5qZmFjZS53aXphcmQuSVdpemFyZENvbnRhaW5lcjsKK2ltcG9ydCBvcmcuZWNsaXBzZS5qZmFjZS53aXphcmQuV2l6YXJkUGFnZTsKK2ltcG9ydCBvcmcuZWNsaXBzZS5zd3QuU1dUOworaW1wb3J0IG9yZy5lY2xpcHNlLnN3dC5sYXlvdXQuRmlsbExheW91dDsKK2ltcG9ydCBvcmcuZWNsaXBzZS5zd3QubGF5b3V0LkdyaWREYXRhOworaW1wb3J0IG9yZy5lY2xpcHNlLnN3dC53aWRnZXRzLkNvbXBvc2l0ZTsKK2ltcG9ydCBvcmcuZWNsaXBzZS5zd3Qud2lkZ2V0cy5MYWJlbDsKK2ltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUudWkuVHJhY2U7CisKKy8qKgorICogQSB0YXNrIHdpemFyZCBwYWdlLgorICovCitwdWJsaWMgY2xhc3MgVGFza1dpemFyZFBhZ2UgZXh0ZW5kcyBXaXphcmRQYWdlIGltcGxlbWVudHMgSVdpemFyZEhhbmRsZSB7CisJcHJvdGVjdGVkIFdpemFyZEZyYWdtZW50IGZyYWdtZW50OworCisJcHJvdGVjdGVkIGJvb2xlYW4gaXNDcmVhdGVkID0gZmFsc2U7CisKKwlwdWJsaWMgVGFza1dpemFyZFBhZ2UoV2l6YXJkRnJhZ21lbnQgZnJhZ21lbnQpIHsKKwkJc3VwZXIoZnJhZ21lbnQudG9TdHJpbmcoKSk7CisJCXRoaXMuZnJhZ21lbnQgPSBmcmFnbWVudDsKKwl9CisKKwlwdWJsaWMgdm9pZCBjcmVhdGVDb250cm9sKENvbXBvc2l0ZSBwYXJlbnRDb21wKSB7CisJCUNvbXBvc2l0ZSBjb21wID0gbnVsbDsKKwkJdHJ5IHsKKwkJCWZyYWdtZW50LnNldFBhZ2UodGhpcyk7CisJCQljb21wID0gZnJhZ21lbnQuY3JlYXRlQ29tcG9zaXRlKHBhcmVudENvbXAsIHRoaXMpOworCQl9IGNhdGNoIChFeGNlcHRpb24gZSkgeworCQkJVHJhY2UudHJhY2UoVHJhY2UuV0FSTklORywgIkNvdWxkIG5vdCBjcmVhdGUgd2l6YXJkIHBhZ2UgY29tcG9zaXRlIiwgZSk7CisJCX0KKwkJaWYgKGNvbXAgPT0gbnVsbCkgeworCQkJY29tcCA9IG5ldyBDb21wb3NpdGUocGFyZW50Q29tcCwgU1dULk5PTkUpOworCQkJY29tcC5zZXRMYXlvdXQobmV3IEZpbGxMYXlvdXQoU1dULlZFUlRJQ0FMKSk7CisJCQlMYWJlbCBsYWJlbCA9IG5ldyBMYWJlbChjb21wLCBTV1QuTk9ORSk7CisJCQlsYWJlbC5zZXRUZXh0KCJJbnRlcm5hbCBlcnJvciIpOworCQl9CisJCUdyaWREYXRhIGRhdGEgPSBuZXcgR3JpZERhdGEoR3JpZERhdGEuSE9SSVpPTlRBTF9BTElHTl9GSUxMKTsKKwkJZGF0YS53aWR0aEhpbnQgPSBjb252ZXJ0SG9yaXpvbnRhbERMVXNUb1BpeGVscygxNTApOworCQljb21wLnNldExheW91dERhdGEoZGF0YSk7CisJCXNldENvbnRyb2woY29tcCk7CisJCQorCQlpc0NyZWF0ZWQgPSB0cnVlOworCQl1cGRhdGUoKTsKKwl9CisKKwlwdWJsaWMgYm9vbGVhbiBpc1BhZ2VDb21wbGV0ZSgpIHsKKwkJdHJ5IHsKKwkJCWlmICghZnJhZ21lbnQuaXNDb21wbGV0ZSgpKQorCQkJCXJldHVybiBmYWxzZTsKKwkJfSBjYXRjaCAoRXhjZXB0aW9uIGUpIHsKKwkJCXJldHVybiBmYWxzZTsKKwkJfQorCQlyZXR1cm4gdHJ1ZTsKKwl9CisKKwlwdWJsaWMgYm9vbGVhbiBjYW5GbGlwVG9OZXh0UGFnZSgpIHsKKwkJaWYgKGdldE5leHRQYWdlKCkgPT0gbnVsbCkKKwkJCXJldHVybiBmYWxzZTsKKwkJdHJ5IHsKKwkJCWlmICghZnJhZ21lbnQuaXNDb21wbGV0ZSgpKQorCQkJCXJldHVybiBmYWxzZTsKKwkJfSBjYXRjaCAoRXhjZXB0aW9uIGUpIHsKKwkJCXJldHVybiBmYWxzZTsKKwkJfQorCQlyZXR1cm4gdHJ1ZTsKKwl9CisKKwlwdWJsaWMgdm9pZCBzZXRWaXNpYmxlKGJvb2xlYW4gdmlzaWJsZSkgeworCQlzdXBlci5zZXRWaXNpYmxlKHZpc2libGUpOworCQkKKwkJaWYgKHZpc2libGUpIHsKKwkJCVRhc2tXaXphcmQgd2l6YXJkID0gKFRhc2tXaXphcmQpIGdldFdpemFyZCgpOworCQkJd2l6YXJkLnN3aXRjaFdpemFyZEZyYWdtZW50KGZyYWdtZW50KTsKKwkJCQorCQkJaWYgKGdldENvbnRhaW5lcigpLmdldEN1cnJlbnRQYWdlKCkgIT0gbnVsbCkKKwkJCQlnZXRDb250YWluZXIoKS51cGRhdGVCdXR0b25zKCk7CisJCX0KKwl9CisKKwlwdWJsaWMgdm9pZCBzZXRNZXNzYWdlKFN0cmluZyBtZXNzYWdlLCBpbnQgdHlwZSkgeworCQlpZiAodHlwZSA9PSBJTWVzc2FnZVByb3ZpZGVyLkVSUk9SICYmICIiLmVxdWFscyhtZXNzYWdlKSkgeworCQkJbWVzc2FnZSA9IG51bGw7CisJCX0KKwkJc3VwZXIuc2V0TWVzc2FnZShtZXNzYWdlLCB0eXBlKTsKKwkJV2l6YXJkRnJhZ21lbnQgZnJhZyA9ICgoVGFza1dpemFyZCkgZ2V0V2l6YXJkKCkpLmdldEN1cnJlbnRXaXphcmRGcmFnbWVudCgpOworCQlpZiAoIWZyYWdtZW50LmVxdWFscyhmcmFnKSkKKwkJCXJldHVybjsKKwkJZ2V0Q29udGFpbmVyKCkudXBkYXRlQnV0dG9ucygpOworCX0KKworCXB1YmxpYyB2b2lkIHJ1bihib29sZWFuIGZvcmssIGJvb2xlYW4gY2FuY2VsYWJsZSwgSVJ1bm5hYmxlV2l0aFByb2dyZXNzIHJ1bm5hYmxlKSB0aHJvd3MgSW50ZXJydXB0ZWRFeGNlcHRpb24sIEludm9jYXRpb25UYXJnZXRFeGNlcHRpb24geworCQlnZXRXaXphcmQoKS5nZXRDb250YWluZXIoKS5ydW4oZm9yaywgY2FuY2VsYWJsZSwgcnVubmFibGUpOworCX0KKworCXB1YmxpYyB2b2lkIHVwZGF0ZSgpIHsKKwkJaWYgKCFpc0NyZWF0ZWQpCisJCQlyZXR1cm47CisJCQorCQlmaW5hbCBJV2l6YXJkQ29udGFpbmVyIGNvbnRhaW5lciA9IGdldENvbnRhaW5lcigpOworCQlnZXRTaGVsbCgpLmdldERpc3BsYXkoKS5zeW5jRXhlYyhuZXcgUnVubmFibGUoKSB7CisJCQlwdWJsaWMgdm9pZCBydW4oKSB7CisJCQkJZnJhZ21lbnQudXBkYXRlQ2hpbGRGcmFnbWVudHMoKTsKKwkJCQkoKFRhc2tXaXphcmQpIGdldFdpemFyZCgpKS51cGRhdGVQYWdlcygpOworCQkJCQorCQkJCWlmIChjb250YWluZXIuZ2V0Q3VycmVudFBhZ2UoKSAhPSBudWxsKQorCQkJCQljb250YWluZXIudXBkYXRlQnV0dG9ucygpOworCQkJfQorCQl9KTsKKwl9Cit9ClwgTm8gbmV3bGluZSBhdCBlbmQgb2YgZmlsZQpkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUudWkvc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vY29tcG9uZW50Y29yZS91aS9pbnRlcm5hbC90YXNrd2l6YXJkL1dpemFyZEZyYWdtZW50LmphdmEgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS51aS9zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9jb21wb25lbnRjb3JlL3VpL2ludGVybmFsL3Rhc2t3aXphcmQvV2l6YXJkRnJhZ21lbnQuamF2YQpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi5lN2M5NjM1Ci0tLSAvZGV2L251bGwKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUudWkvc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vY29tcG9uZW50Y29yZS91aS9pbnRlcm5hbC90YXNrd2l6YXJkL1dpemFyZEZyYWdtZW50LmphdmEKQEAgLTAsMCArMSwyNDQgQEAKKy8qKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqCisgKiBDb3B5cmlnaHQgKGMpIDIwMDMsIDIwMDcgSUJNIENvcnBvcmF0aW9uIGFuZCBvdGhlcnMuCisgKiBBbGwgcmlnaHRzIHJlc2VydmVkLiBUaGlzIHByb2dyYW0gYW5kIHRoZSBhY2NvbXBhbnlpbmcgbWF0ZXJpYWxzCisgKiBhcmUgbWFkZSBhdmFpbGFibGUgdW5kZXIgdGhlIHRlcm1zIG9mIHRoZSBFY2xpcHNlIFB1YmxpYyBMaWNlbnNlIHYxLjAKKyAqIHdoaWNoIGFjY29tcGFuaWVzIHRoaXMgZGlzdHJpYnV0aW9uLCBhbmQgaXMgYXZhaWxhYmxlIGF0CisgKiBodHRwOi8vd3d3LmVjbGlwc2Uub3JnL2xlZ2FsL2VwbC12MTAuaHRtbAorICoKKyAqIENvbnRyaWJ1dG9yczoKKyAqICAgICBJQk0gQ29ycG9yYXRpb24gLSBJbml0aWFsIEFQSSBhbmQgaW1wbGVtZW50YXRpb24KKyAqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqLworcGFja2FnZSBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUudWkuaW50ZXJuYWwudGFza3dpemFyZDsKKworaW1wb3J0IGphdmEudXRpbC5BcnJheUxpc3Q7CitpbXBvcnQgamF2YS51dGlsLkxpc3Q7CisKK2ltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJ1bnRpbWUuQ29yZUV4Y2VwdGlvbjsKK2ltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJ1bnRpbWUuSVByb2dyZXNzTW9uaXRvcjsKK2ltcG9ydCBvcmcuZWNsaXBzZS5qZmFjZS53aXphcmQuSVdpemFyZFBhZ2U7CitpbXBvcnQgb3JnLmVjbGlwc2UuamZhY2Uud2l6YXJkLldpemFyZERpYWxvZzsKK2ltcG9ydCBvcmcuZWNsaXBzZS5zd3Qud2lkZ2V0cy5Db21wb3NpdGU7CitpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb21wb25lbnRjb3JlLmludGVybmFsLmltcGwuVGFza01vZGVsOworCisvKioKKyAqIEEgd2l6YXJkIGZyYWdtZW50IGlzIGEgbm9kZSB3aXRoaW4gYSB3aXphcmQgdGhhdCBwcm92aWRlcyBhIGNvbXBsZXRlbHkKKyAqIGV4dGVuZGFibGUgd2l6YXJkIGZsb3cgYnkgc3VwcG9ydGluZyBhIGZsZXhpYmxlIHRyZWUgc3RydWN0dXJlIGZvciB0aGUKKyAqIHBhZ2VzLiBBcyB0aGUgdXNlciB3YWxrcyBwYWdlcyB0aHJvdWdoIHRoZSB3aXphcmQsIHRoZXkgYXJlIGFjdHVhbGx5CisgKiB0cmF2ZXJzaW5nIHRoZSBub2RlcyBvZiBhIHRyZWUsIGFuZCBlYWNoIG5vZGUgY2FuIGFkZCBvciByZW1vdmUgY2hpbGRyZW4KKyAqIGF0IGFueSB0aW1lLgorICogCisgKiBFYWNoIG5vZGUgbWF5IGJlIG5vbi1VSSAodXNlZnVsIGZvciBpbmplY3RpbmcgYmVoYXZpb3VyIGludG8gdGhlIHRyZWUpCisgKiBvciBjb250YWluIGEgc2luZ2xlIHdpemFyZCBwYWdlIChAc2VlIGhhc0NvbXBvc2l0ZSgpIGFuZAorICogY3JlYXRlQ29tcG9zaXRlKENvbXBvc2l0ZSwgSVdpemFyZEhhbmRsZSkpLiBUaGUgbm9kZSBtYXkgYWxzbyBoYXZlCisgKiBjaGlsZHJlbiAoQHNlZSBnZXRDaGlsZEZyYWdtZW50cygpLCB3aGljaCBzaG91bGQgYmUgdXBkYXRlZCBvciByZWZyZXNoZWQKKyAqIHdoZW5ldmVyIHRoZSB1cGRhdGVDaGlsZEZyYWdtZW50cygpIG1ldGhvZCBpcyBjYWxsZWQgYnkgYW5vdGhlciBub2RlIHRvCisgKiBsZXQgdGhpcyBub2RlIGtub3cgdGhhdCBpdCdzIHN0YXRlIG1heSBoYXZlIGNoYW5nZWQuCisgKiAKKyAqIFRoaXMgaW1wbGVtZW50YXRpb24gdXNlcyBhIGNyZWF0ZUNoaWxkRnJhZ21lbnRzKCkgbWV0aG9kIHRvIGFsbG93IHRoZQorICogZnJhZ21lbnQgdG8gYWRkIGl0J3MgY2hpbGRyZW4gaW50byB0aGUgdHJlZS4gTm90ZSB0aGF0IHRoaXMgbWV0aG9kIG1heQorICogYmUgY2FsbGVkIG11bHRpcGxlIHRpbWVzIGFzIHRoZSB0cmVlIGlzIHVwZGF0ZWQgYW5kIGl0IG11c3QgcmV0dXJuIHRoZQorICogc2FtZSBpbnN0YW5jZSBvZiBhbnkgY2hpbGRyZW4gdGhhdCBoYXZlIHByZXZpb3VzbHkgYmVlbiByZXR1cm5lZC4KKyAqIAorICogQHNpbmNlIDEuMAorICovCitwdWJsaWMgYWJzdHJhY3QgY2xhc3MgV2l6YXJkRnJhZ21lbnQgeworCXByaXZhdGUgVGFza1dpemFyZFBhZ2UgcGFnZTsKKwlwcml2YXRlIFRhc2tNb2RlbCB0YXNrTW9kZWw7CisJcHJpdmF0ZSBib29sZWFuIGlzQ29tcGxldGUgPSB0cnVlOworCXByaXZhdGUgTGlzdDxXaXphcmRGcmFnbWVudD4gbGlzdEltcGw7CisKKwkvKioKKwkgKiBSZXR1cm5zIDxjb2RlPnRydWU8L2NvZGU+IGlmIHRoaXMgZnJhZ21lbnQgaGFzIGFuIGFzc29jaWF0ZWQgVUksCisJICogYW5kIDxjb2RlPmZhbHNlPC9jb2RlPiBvdGhlcndpc2UuCisJICogCisJICogQHJldHVybiB0cnVlIGlmIHRoZSBmcmFnbWVudCBoYXMgYSBjb21wb3NpdGUKKwkgKi8KKwlwdWJsaWMgYm9vbGVhbiBoYXNDb21wb3NpdGUoKSB7CisJCXJldHVybiBmYWxzZTsKKwl9CisKKwkvKioKKwkgKiBDcmVhdGVzIHRoZSBjb21wb3NpdGUgYXNzb2NpYXRlZCB3aXRoIHRoaXMgZnJhZ21lbnQuCisJICogVGhpcyBtZXRob2QgaXMgb25seSBjYWxsZWQgd2hlbiBoYXNDb21wb3NpdGUoKSByZXR1cm5zIHRydWUuCisJICogCisJICogQHBhcmFtIHBhcmVudCBhIHBhcmVudCBjb21wb3NpdGUKKwkgKiBAcGFyYW0gaGFuZGxlIGEgd2l6YXJkIGhhbmRsZQorCSAqIEByZXR1cm4gdGhlIGNyZWF0ZWQgY29tcG9zaXRlCisJICovCisJcHVibGljIENvbXBvc2l0ZSBjcmVhdGVDb21wb3NpdGUoQ29tcG9zaXRlIHBhcmVudCwgSVdpemFyZEhhbmRsZSBoYW5kbGUpIHsKKwkJcmV0dXJuIG51bGw7CisJfQorCisJLyoqCisJICogU2V0cyB0aGUgd2l6YXJkIHRhc2sgbW9kZWwuCisJICogPHA+CisJICogQSB0YXNrIG1vZGVsIGlzIHNoYXJlZCBieSBhbGwgZnJhZ21lbnRzIGluIHRoZSB3aXphcmQgYW5kIGlzIHVzZWQgdG8gc2hhcmUKKwkgKiBkYXRhLiBJdCBjb250YWlucyBpbmZvcm1hdGlvbiBhYm91dCB0aGUgb3ZlcmFsbCB0YXNrIGZsb3cgYW5kIGFsbG93cworCSAqIGZyYWdtZW50cyB0byBzdG9yZSBhbmQgcmV0cmlldmUgZGF0YS4gSXRzIHVzYWdlIGFsbG93cyBtdWx0aXBsZSBmcmFnbWVudHMKKwkgKiB0byBiZSBjaGFpbmVkIHRvZ2V0aGVyIGFuZCBzaGFyZSBkYXRhIGZyb20gdGhlIG91dHB1dCBvZiBvbmUgZnJhZ21lbnQgdG8KKwkgKiB0aGUgaW5wdXQgb2YgYW5vdGhlci4KKwkgKiA8L3A+CisJICogCisJICogQHBhcmFtIHRhc2tNb2RlbCB0aGUgdGFzayBtb2RlbAorCSAqIEBzZWUgI2dldFRhc2tNb2RlbCgpCisJICovCisJcHVibGljIHZvaWQgc2V0VGFza01vZGVsKFRhc2tNb2RlbCB0YXNrTW9kZWwpIHsKKwkJdGhpcy50YXNrTW9kZWwgPSB0YXNrTW9kZWw7CisJfQorCisJLyoqCisJICogUmV0dXJucyB0aGUgd2l6YXJkIHRhc2sgbW9kZWwuCisJICogCisJICogQHJldHVybiB0aGUgdGFzayBtb2RlbAorCSAqIEBzZWUgI3NldFRhc2tNb2RlbChUYXNrTW9kZWwpCisJICovCisJcHVibGljIFRhc2tNb2RlbCBnZXRUYXNrTW9kZWwoKSB7CisJCXJldHVybiB0YXNrTW9kZWw7CisJfQorCQorCXB1YmxpYyB2b2lkIHNldFBhZ2UoVGFza1dpemFyZFBhZ2UgcGFnZSkgeworCQl0aGlzLnBhZ2UgPSBwYWdlOworCX0KKwkKKwlwdWJsaWMgSVdpemFyZFBhZ2UgZ2V0UGFnZSgpIHsKKwkJcmV0dXJuIHBhZ2U7CisJfQorCisJLyoqCisJICogQ2FsbGVkIHdoZW4gdGhlIHdpemFyZCB0aGF0IHRoaXMgZnJhZ21lbnQgYmVsb25ncyB0byBoYXMgdHJhdmVyc2VkCisJICogaW50byB0aGlzIHdpemFyZCBmcmFnbWVudC4gSXQgaXMgY2FsbGVkIHRvIGdpdmUgdGhlIGZyYWdtZW50IHRoZQorCSAqIG9wcG9ydHVuaXR5IHRvIGluaXRpYWxpemUgYW55IHZhbHVlcyBzaG93biBpbiB0aGUgY29tcG9zaXRlIG9yCisJICogdXBkYXRlIHRoZSB0YXNrIG1vZGVsLgorCSAqIDxwPgorCSAqIFdoZW4gZmluaXNoIGlzIHByZXNzZWQsIHRoZSBjdXJyZW50IGZyYWdtZW50IGlzIGV4aXQoKWVkLCBhbmQgdGhlbgorCSAqIHBlcmZvcm1GaW5pc2goKSBpcyBjYWxsZWQgb24gYWxsIG9mIHRoZSBmcmFnbWVudHMgaW4gdGhlIHRyZWUuCisJICogZW50ZXIoKSBhbmQgZXhpdCgpIGFyZSBub3QgY2FsbGVkIG9uIHRoZSByZW1haW5pbmcgZnJhZ21lbnRzLgorCSAqIDwvcD4KKwkgKi8KKwlwdWJsaWMgdm9pZCBlbnRlcigpIHsKKwkJLy8gZG8gbm90aGluZworCX0KKworCS8qKgorCSAqIENhbGxlZCB3aGVuIHRoZSB3aXphcmQgdGhhdCB0aGlzIGZyYWdtZW50IGJlbG9uZ3MgdG8gaGFzIHRyYXZlcnNlZAorCSAqIG91dCBvZiB0aGlzIHdpemFyZCBmcmFnbWVudC4gSXQgaXMgY2FsbGVkIHRvIGdpdmUgdGhlIGZyYWdtZW50IHRoZQorCSAqIG9wcG9ydHVuaXR5IHRvIHNhdmUgYW55IHZhbHVlcyBlbnRlcmVkIGludG8gdGhlIGNvbXBvc2l0ZSBvcgorCSAqIHVwZGF0ZSB0aGUgdGFzayBtb2RlbC4KKwkgKiA8cD4KKwkgKiBXaGVuIGZpbmlzaCBpcyBwcmVzc2VkLCB0aGUgY3VycmVudCBmcmFnbWVudCBpcyBleGl0KCllZCwgYW5kIHRoZW4KKwkgKiBwZXJmb3JtRmluaXNoKCkgaXMgY2FsbGVkIG9uIGFsbCBvZiB0aGUgZnJhZ21lbnRzIGluIHRoZSB0cmVlLgorCSAqIGVudGVyKCkgYW5kIGV4aXQoKSBhcmUgbm90IGNhbGxlZCBvbiB0aGUgcmVtYWluaW5nIGZyYWdtZW50cy4gCisJICogPC9wPgorCSAqLworCXB1YmxpYyB2b2lkIGV4aXQoKSB7CisJCS8vIGRvIG5vdGhpbmcKKwl9CisKKwkvKioKKwkgKiBDYWxsZWQgd2hlbiB0aGUgd2l6YXJkIHRoYXQgdGhpcyBmcmFnbWVudCBiZWxvbmdzIHRvIGlzIGZpbmlzaGVkLgorCSAqIEFmdGVyIGV4aXQoKWluZyB0aGUgY3VycmVudCBwYWdlLCBhbGwgZnJhZ21lbnQncyBwZXJmb3JtRmluaXNoKCkKKwkgKiBtZXRob2RzIGFyZSBjYWxsZWQgaW4gb3JkZXIuCisJICogPHA+CisJICogVGhpcyBtZXRob2QgaXMgbm90IGNhbGxlZCBvbiB0aGUgVUkgdGhyZWFkIGFuZCBtdXN0IG5vdCBhY2Nlc3MgdGhlCisJICogY29tcG9zaXRlLiBOb3Qgb25seSBtaWdodCB0aGUgdXNlciBuZXZlciBoYXZlIGFjY2Vzc2VkIHRoZSBmcmFnbWVudCdzCisJICogY29tcG9zaXRlLCBidXQgdGhpcyBtZXRob2QgbWF5IGJlIGNhbGxlZCBhc3luY2hyb25vdXNseSBvbiBhIGpvYgorCSAqIG9uY2UgdGhlIHdpemFyZCBoYXMgY2xvc2VkLgorCSAqIDwvcD4KKwkgKiAKKwkgKiBAcGFyYW0gbW9uaXRvciBhIHByb2dyZXNzIG1vbml0b3IsIG9yIDxjb2RlPm51bGw8L2NvZGU+IGlmIHByb2dyZXNzCisJICogICAgcmVwb3J0aW5nIGFuZCBjYW5jZWxsYXRpb24gYXJlIG5vdCBkZXNpcmVkCisJICogQHRocm93cyBDb3JlRXhjZXB0aW9uIGlmIHNvbWV0aGluZyBnb2VzIHdyb25nCisJICovCisJcHVibGljIHZvaWQgcGVyZm9ybUZpbmlzaChJUHJvZ3Jlc3NNb25pdG9yIG1vbml0b3IpIHRocm93cyBDb3JlRXhjZXB0aW9uIHsKKwkJLy8gZG8gbm90aGluZworCX0KKworCS8qKgorCSAqIENhbGxlZCB3aGVuIHRoZSB3aXphcmQgdGhhdCB0aGlzIGZyYWdtZW50IGJlbG9uZ3MgdG8gaXMgY2FuY2VsZWQuCisJICogQWZ0ZXIgZXhpdCgpaW5nIHRoZSBjdXJyZW50IHBhZ2UsIGFsbCBmcmFnbWVudCdzIHBlcmZvcm1DYW5jZWwoKQorCSAqIG1ldGhvZHMgYXJlIGNhbGxlZCBpbiBvcmRlci4KKwkgKiA8cD4KKwkgKiBUaGlzIG1ldGhvZCBpcyBub3QgY2FsbGVkIG9uIHRoZSBVSSB0aHJlYWQgYW5kIG11c3Qgbm90IGFjY2VzcyB0aGUKKwkgKiBjb21wb3NpdGUuIE5vdCBvbmx5IG1pZ2h0IHRoZSB1c2VyIG5ldmVyIGhhdmUgYWNjZXNzZWQgdGhlIGZyYWdtZW50J3MKKwkgKiBjb21wb3NpdGUsIGJ1dCB0aGlzIG1ldGhvZCBtYXkgYmUgY2FsbGVkIGFzeW5jaHJvbm91c2x5IG9uIGEgam9iCisJICogb25jZSB0aGUgd2l6YXJkIGhhcyBjbG9zZWQuCisJICogPC9wPgorCSAqIAorCSAqIEBwYXJhbSBtb25pdG9yIGEgcHJvZ3Jlc3MgbW9uaXRvciwgb3IgPGNvZGU+bnVsbDwvY29kZT4gaWYgcHJvZ3Jlc3MKKwkgKiAgICByZXBvcnRpbmcgYW5kIGNhbmNlbGxhdGlvbiBhcmUgbm90IGRlc2lyZWQKKwkgKiBAdGhyb3dzIENvcmVFeGNlcHRpb24gaWYgc29tZXRoaW5nIGdvZXMgd3JvbmcKKwkgKi8KKwlwdWJsaWMgdm9pZCBwZXJmb3JtQ2FuY2VsKElQcm9ncmVzc01vbml0b3IgbW9uaXRvcikgdGhyb3dzIENvcmVFeGNlcHRpb24geworCQkvLyBkbyBub3RoaW5nCisJfQorCisJLyoqCisJICogUmV0dXJucyB0aGUgY2hpbGQgZnJhZ21lbnRzLiBDaGlsZCBmcmFnbWVudHMgY29tZSBkaXJlY3RseSBhZnRlciB0aGlzIGZyYWdtZW50CisJICogaW4gdGhlIHdpemFyZCBmbG93LgorCSAqIAorCSAqIEByZXR1cm4gYSBsaXN0IG9mIGNoaWxkIGZyYWdtZW50cworCSAqLworCXB1YmxpYyBMaXN0IGdldENoaWxkRnJhZ21lbnRzKCkgeworCQlpZiAobGlzdEltcGwgPT0gbnVsbCkgeworCQkJbGlzdEltcGwgPSBuZXcgQXJyYXlMaXN0PFdpemFyZEZyYWdtZW50PigpOworCQkJY3JlYXRlQ2hpbGRGcmFnbWVudHMobGlzdEltcGwpOworCQl9CisJCXJldHVybiBsaXN0SW1wbDsKKwl9CisKKwkvKioKKwkgKiBDYWxsZWQgdG8gZ2l2ZSB0aGUgZnJhZ21lbnQgYSBjaGFuY2UgdG8gdXBkYXRlIGl0J3MgY2hpbGQgZnJhZ21lbnRzIGluCisJICogcmVzcG9uc2UgdG8gb3RoZXIgY2hhbmdlcyB3aXRoaW4gdGhlIHdpemFyZCBvciB0YXNrIG1vZGVsLgorCSAqLworCXB1YmxpYyB2b2lkIHVwZGF0ZUNoaWxkRnJhZ21lbnRzKCkgeworCQlsaXN0SW1wbCA9IG51bGw7CisJfQorCisJLyoqCisJICogVGhpcyBtZXRob2QgaXMgY2FsbGVkIGJ5IHRoZSBpbXBsZW1lbnRhdGlvbiBvZiBnZXRDaGlsZEZyYWdtZW50cygpIHRvCisJICogYWxsb3cgdGhpcyBmcmFnbWVudCB0byBhZGQgaXQncyBjaGlsZHJlbi4gVGhpcyBtZXRob2QgbXVzdCBjYWNoZSBhbmQKKwkgKiByZXR1cm4gdGhlIHNhbWUgaW5zdGFuY2Ugb2YgYW55IGNoaWxkIGZyYWdtZW50IGNyZWF0ZWQuIElmIG5ldworCSAqIGluc3RhbmNlcyBhcmUgY3JlYXRlZCBlYWNoIHRpbWUgdGhlIHdpemFyZCBpcyB1cGRhdGVkLCB0aGUgZW5hYmxlbWVudAorCSAqIHN0YXRlIGFuZCB0aGUgZmxvdyBvZiB0aGUgd2l6YXJkIHdpbGwgYmUgaW5jb3JyZWN0LiAKKwkgKiAKKwkgKiBAcGFyYW0gbGlzdCBhIGxpc3QgdG8gYWRkIHRoZSBjaGlsZCBmcmFnbWVudHMgdG8KKwkgKi8KKwlwcm90ZWN0ZWQgdm9pZCBjcmVhdGVDaGlsZEZyYWdtZW50cyhMaXN0PFdpemFyZEZyYWdtZW50PiBsaXN0KSB7CisJCS8vIGRvIG5vdGhpbmcKKwl9CisKKwkvKioKKwkgKiBSZXR1cm5zIHRydWUgaWYgdGhpcyBmcmFnbWVudCBpcyBjb21wbGV0ZSAoY2FuIGZpbmlzaCkuIElmIGl0IGlzCisJICogY29tcGxldGUgdGhlIHVzZXIgd2lsbCBiZSBhbGxvd2VkIHRvIGdvIHRvIHRoZSBuZXh0IGZyYWdtZW50IG9yCisJICogZmluaXNoIHRoZSB3aXphcmQuIElmIHRoZSBmcmFnbWVudCBpcyBub3QgY29tcGxldGUsIHRoZSBOZXh0IGJ1dHRvbgorCSAqIHdpbGwgYmUgZGlzYWJsZWQuIElmIHRoZSBmcmFnbWVudCBpcyBjb21wbGV0ZSBidXQgYW5vdGhlciBmcmFnbWVudAorCSAqIGlzIG5vdCBjb21wbGV0ZSwgdGhlIEZpbmlzaCBidXR0b24gd2lsbCBub3QgYmUgZW5hYmxlZC4KKwkgKiAKKwkgKiBAcmV0dXJuIDxjb2RlPnRydWU8L2NvZGU+IGlmIHRoZSBmcmFnbWVudCBpcyBjb21wbGV0ZSwgYW5kCisJICogICAgPGNvZGU+ZmFsc2U8L2NvZGU+IG90aGVyd2lzZQorCSAqLworCXB1YmxpYyBib29sZWFuIGlzQ29tcGxldGUoKSB7CisJCXJldHVybiBpc0NvbXBsZXRlOworCX0KKworCS8qKgorCSAqIFNldCB0aGUgaXNDb21wbGV0ZSBzdGF0ZS4KKwkgKiAKKwkgKiBAcGFyYW0gY29tcGxldGUgPGNvZGU+dHJ1ZTwvY29kZT4gaWYgdGhlIGZyYWdtZW50IGlzIGNvbXBsZXRlLCBhbmQKKwkgKiAgICA8Y29kZT5mYWxzZTwvY29kZT4gb3RoZXJ3aXNlCisJICovCisJcHJvdGVjdGVkIHZvaWQgc2V0Q29tcGxldGUoYm9vbGVhbiBjb21wbGV0ZSkgeworCQl0aGlzLmlzQ29tcGxldGUgPSBjb21wbGV0ZTsKKwl9CisJCisgICAgcHVibGljIHZvaWQgYWR2YW5jZVRvTmV4dFBhZ2VPckZpbmlzaCgpIHsKKwkJaWYgKGdldFBhZ2UoKS5jYW5GbGlwVG9OZXh0UGFnZSgpKSB7CisJCQlnZXRQYWdlKCkuZ2V0V2l6YXJkKCkuZ2V0Q29udGFpbmVyKCkuc2hvd1BhZ2UoZ2V0UGFnZSgpLmdldE5leHRQYWdlKCkpOworCQl9IGVsc2UgaWYoZ2V0UGFnZSgpLmdldFdpemFyZCgpLmNhbkZpbmlzaCgpKSB7CisJCQlpZiAoZ2V0UGFnZSgpLmdldFdpemFyZCgpLnBlcmZvcm1GaW5pc2goKSkgeworCQkJCSgoV2l6YXJkRGlhbG9nKWdldFBhZ2UoKS5nZXRXaXphcmQoKS5nZXRDb250YWluZXIoKSkuY2xvc2UoKTsKKwkJCX0KKwkJfQorICAgIH0KKworfQpcIE5vIG5ld2xpbmUgYXQgZW5kIG9mIGZpbGUKZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlLnVpL3NyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2NvbXBvbmVudGNvcmUvdWkvaW50ZXJuYWwvdGFza3dpemFyZC9Xb3Jrc3BhY2VSdW5uYWJsZUFkYXB0ZXIuamF2YSBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlLnVpL3NyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2NvbXBvbmVudGNvcmUvdWkvaW50ZXJuYWwvdGFza3dpemFyZC9Xb3Jrc3BhY2VSdW5uYWJsZUFkYXB0ZXIuamF2YQpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi40NDQ3ZTUzCi0tLSAvZGV2L251bGwKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUudWkvc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vY29tcG9uZW50Y29yZS91aS9pbnRlcm5hbC90YXNrd2l6YXJkL1dvcmtzcGFjZVJ1bm5hYmxlQWRhcHRlci5qYXZhCkBAIC0wLDAgKzEsNDAgQEAKKy8qKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqCisgKiBDb3B5cmlnaHQgKGMpIDIwMDMsIDIwMDUgSUJNIENvcnBvcmF0aW9uIGFuZCBvdGhlcnMuCisgKiBBbGwgcmlnaHRzIHJlc2VydmVkLiBUaGlzIHByb2dyYW0gYW5kIHRoZSBhY2NvbXBhbnlpbmcgbWF0ZXJpYWxzCisgKiBhcmUgbWFkZSBhdmFpbGFibGUgdW5kZXIgdGhlIHRlcm1zIG9mIHRoZSBFY2xpcHNlIFB1YmxpYyBMaWNlbnNlIHYxLjAKKyAqIHdoaWNoIGFjY29tcGFuaWVzIHRoaXMgZGlzdHJpYnV0aW9uLCBhbmQgaXMgYXZhaWxhYmxlIGF0CisgKiBodHRwOi8vd3d3LmVjbGlwc2Uub3JnL2xlZ2FsL2VwbC12MTAuaHRtbAorICogCisgKiBDb250cmlidXRvcnM6CisgKiAgICAgSUJNIENvcnBvcmF0aW9uIC0gSW5pdGlhbCBBUEkgYW5kIGltcGxlbWVudGF0aW9uCisgKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKi8KK3BhY2thZ2Ugb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb21wb25lbnRjb3JlLnVpLmludGVybmFsLnRhc2t3aXphcmQ7CisKK2ltcG9ydCBqYXZhLmxhbmcucmVmbGVjdC5JbnZvY2F0aW9uVGFyZ2V0RXhjZXB0aW9uOworCitpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5yZXNvdXJjZXMuSVdvcmtzcGFjZVJ1bm5hYmxlOworaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucmVzb3VyY2VzLlJlc291cmNlc1BsdWdpbjsKK2ltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJ1bnRpbWUuQ29yZUV4Y2VwdGlvbjsKK2ltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJ1bnRpbWUuSVByb2dyZXNzTW9uaXRvcjsKK2ltcG9ydCBvcmcuZWNsaXBzZS5qZmFjZS5vcGVyYXRpb24uSVJ1bm5hYmxlV2l0aFByb2dyZXNzOworLyoqCisgKiBJUnVubmFibGVXaXRoUHJvZ3Jlc3NBZGFwdGVyIHRvIGFsbG93IGl0IHRvIHJ1biBhbiBJV29ya3NwYWNlUnVubmFibGUuCisgKi8KK3B1YmxpYyBjbGFzcyBXb3Jrc3BhY2VSdW5uYWJsZUFkYXB0ZXIgaW1wbGVtZW50cyBJUnVubmFibGVXaXRoUHJvZ3Jlc3MgeworCXByaXZhdGUgSVdvcmtzcGFjZVJ1bm5hYmxlIHdvcmtzcGFjZVJ1bm5hYmxlOworCQorCXB1YmxpYyBXb3Jrc3BhY2VSdW5uYWJsZUFkYXB0ZXIoSVdvcmtzcGFjZVJ1bm5hYmxlIHJ1bm5hYmxlKSB7CisJCXdvcmtzcGFjZVJ1bm5hYmxlID0gcnVubmFibGU7CisJfQorCisJLyoKKwkgKiBAc2VlIElSdW5uYWJsZVdpdGhQcm9ncmVzcyNydW4oSVByb2dyZXNzTW9uaXRvcikKKwkgKi8KKwlwdWJsaWMgdm9pZCBydW4oSVByb2dyZXNzTW9uaXRvciBtb25pdG9yKSB0aHJvd3MgSW52b2NhdGlvblRhcmdldEV4Y2VwdGlvbiB7CisJCXRyeSB7CisJCQlSZXNvdXJjZXNQbHVnaW4uZ2V0V29ya3NwYWNlKCkucnVuKHdvcmtzcGFjZVJ1bm5hYmxlLCBtb25pdG9yKTsKKwkJfSBjYXRjaCAoQ29yZUV4Y2VwdGlvbiBlKSB7CisJCQl0aHJvdyBuZXcgSW52b2NhdGlvblRhcmdldEV4Y2VwdGlvbihlKTsKKwkJfQorCX0KK30KXCBObyBuZXdsaW5lIGF0IGVuZCBvZiBmaWxlCmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS51aS9zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9jb21wb25lbnRjb3JlL3VpL21lc3NhZ2VzLnByb3BlcnRpZXMgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS51aS9zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9jb21wb25lbnRjb3JlL3VpL21lc3NhZ2VzLnByb3BlcnRpZXMKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uNjc2NzhlMwotLS0gL2Rldi9udWxsCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlLnVpL3NyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2NvbXBvbmVudGNvcmUvdWkvbWVzc2FnZXMucHJvcGVydGllcwpAQCAtMCwwICsxLDI5IEBACitNb2R1bGVBc3NlbWJseVJvb3RQYWdlRGVzY3JpcHRpb249Q3JlYXRlIGFuZCBjaGFuZ2UgcGFja2FnaW5nIHN0cnVjdHVyZSBmb3IgdGhpcyBwcm9qZWN0CitNb2R1bGVBc3NlbWJseT1EZXBsb3ltZW50IGEmc3NlbWJseToKK0Vycm9yQ2hlY2tpbmdGYWNldHM9RXJyb3IgQ2hlY2tpbmcgUHJvamVjdCBGYWNldHMKK0Vycm9yTm90VmlydHVhbENvbXBvbmVudD1UaGUgZ2l2ZW4gcHJvamVjdCBpcyBub3QgYSB2aXJ0dWFsIGNvbXBvbmVudCBwcm9qZWN0CitEZXBsb3ltZW50QXNzZW1ibHlWZXJpZmllckhlbHBlcl8wPVZlcmlmeWluZyBDb21wb25lbnQKK0RlcGxveVBhdGhDb2x1bW49RGVwbG95IFBhdGgKK1NvdXJjZUNvbHVtbj1Tb3VyY2UKK0ludGVybmFsTGliSmFyV2FybmluZz1UaGlzIGxpYnJhcnkgaGFzIGJlZW4gYWRkZWQgdG8gdGhlIHByb2plY3QgYnkgdXNpbmcgdGhlIHByb2plY3QgdHJlZSBvciB0aGUgZmlsZSBzeXN0ZW0uIElmIHlvdSB3YW50IHRvIG1vdmUgLyByZW1vdmUgaXQsIHVzZSB0aGUgc2FtZSBhcHByb2FjaC4KK0FkZEZvbGRlcj1BZGQgRm9sZGVyCitBZGRGb2xkZXJFbGlwc2VzPUFkZCBGb2xkZXIuLi4KK0FkZEZvbGRlck1hcHBpbmdzPUFkZCBhIGZvbGRlciBtYXBwaW5nCitBZGRFbGxpcHNpcz0mQWRkLi4uCitFZGl0RWxsaXBzaXM9JkVkaXQuLi4KK1JlbW92ZVNlbGVjdGVkPSZSZW1vdmUKK0V4dGVybmFsSmFyVGl0bGU9QWRkIGFuIEV4dGVybmFsIEphciBSZWZlcmVuY2UKK0V4dGVybmFsSmFyRGVzY3JpcHRpb249SGVyZSB5b3UgY2FuIHJlZmVyZW5jZSBhIGZpbGVzeXN0ZW0gSmFyXG5UaGlzIGlzIG5vdCBhIHN1Z2dlc3RlZCB1c2UtY2FzZSwgYnV0IGlzIGhlcmUgZm9yIGJhY2t3YXJkcyBjb21wYXRhYmlsaXR5LgorSmFyVGl0bGU9QWRkIGEgSmFyIFJlZmVyZW5jZQorSmFyRGVzY3JpcHRpb249IkhlcmUgeW91IGNhbiByZWZlcmVuY2UgYSB3b3Jrc3BhY2UgSmFyXG5UaGlzIGlzIG5vdCBhIHN1Z2dlc3RlZCB1c2UtY2FzZSwgYnV0IGlzIGhlcmUgZm9yIGJhY2t3YXJkcyBjb21wYXRhYmlsaXR5LgorQnJvd3NlPUJyb3dzZS4uLgorTmV3UmVmZXJlbmNlVGl0bGU9U2VsZWN0IGEgcmVmZXJlbmNlIHR5cGUKK05ld1JlZmVyZW5jZURlc2NyaXB0aW9uPUhlcmUgeW91IGNhbiBzZWxlY3Qgb25lIG9mIG1hbnkgdHlwZXMgb2YgcmVmZXJlbmNlcyB0byBhZGQKK05ld1JlZmVyZW5jZVdpemFyZD1OZXcgUmVmZXJlbmNlIFdpemFyZAorUHJvamVjdFJlZmVyZW5jZVRpdGxlPUFkZCBhIFByb2plY3QgUmVmZXJlbmNlCitQcm9qZWN0UmVmZXJlbmNlRGVzY3JpcHRpb249SGVyZSB5b3UgY2FuIG1ha2UgYSBwcm9qZWN0IGludG8gYSByZWZlcmVuY2UuXG5JZiB0aGUgcHJvamVjdCBpcyBub3QgYWxyZWFkeSBhIGZsZXhpYmxlIHByb2plY3QsIGl0IHdpbGwgYmUgY29udmVydGVkIGludG8gb25lLgorVmFyaWFibGVSZWZlcmVuY2VUaXRsZT1BZGQgYSBWYXJpYWJsZSBSZWZlcmVuY2UKK1ZhcmlhYmxlUmVmZXJlbmNlRGVzY3JpcHRpb249IkhlcmUgeW91IGNhbiByZWZlcmVuY2UgYSB2YXJpYWJsZSB3aGljaCBtYXBzIHRvIGEgc2luZ2xlIGphci5cblRoaXMgaXMgbm90IGEgc3VnZ2VzdGVkIHVzZS1jYXNlLCBidXQgaXMgaGVyZSBmb3IgYmFja3dhcmRzIGNvbXBhdGFiaWxpdHkuCitXaXphcmRFcnJvcj1XaXphcmQgRXJyb3IKK1Byb2plY3RDb252ZXJzaW9uRXJyb3I9RXJyb3IgY29udmVydGluZyBwcm9qZWN0IHswfSBpbnRvIGEgZmxleGlibGUgcHJvamVjdAorUmV2ZXJ0PVJlJnZlcnQKXCBObyBuZXdsaW5lIGF0IGVuZCBvZiBmaWxlCmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS51aS9zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9jb21wb25lbnRjb3JlL3VpL3Byb3BlcnR5cGFnZS9BZGRNb2R1bGVEZXBlbmRlbmNpZXNQcm9wZXJ0aWVzUGFnZS5qYXZhIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUudWkvc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vY29tcG9uZW50Y29yZS91aS9wcm9wZXJ0eXBhZ2UvQWRkTW9kdWxlRGVwZW5kZW5jaWVzUHJvcGVydGllc1BhZ2UuamF2YQpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi45NDAyNzRjCi0tLSAvZGV2L251bGwKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUudWkvc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vY29tcG9uZW50Y29yZS91aS9wcm9wZXJ0eXBhZ2UvQWRkTW9kdWxlRGVwZW5kZW5jaWVzUHJvcGVydGllc1BhZ2UuamF2YQpAQCAtMCwwICsxLDEwNDYgQEAKKy8qKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioKKyAqIENvcHlyaWdodCAoYykgMjAwOSBSZWQgSGF0CisgKiBBbGwgcmlnaHRzIHJlc2VydmVkLiBUaGlzIHByb2dyYW0gYW5kIHRoZSBhY2NvbXBhbnlpbmcgbWF0ZXJpYWxzCisgKiBhcmUgbWFkZSBhdmFpbGFibGUgdW5kZXIgdGhlIHRlcm1zIG9mIHRoZSBFY2xpcHNlIFB1YmxpYyBMaWNlbnNlIHYxLjAKKyAqIHdoaWNoIGFjY29tcGFuaWVzIHRoaXMgZGlzdHJpYnV0aW9uLCBhbmQgaXMgYXZhaWxhYmxlIGF0CisgKiBodHRwOi8vd3d3LmVjbGlwc2Uub3JnL2xlZ2FsL2VwbC12MTAuaHRtbAorICoKKyAqIENvbnRyaWJ1dG9yczoKKyAqICAgIFJvYiBTdHJ5a2VyIC0gaW5pdGlhbCBpbXBsZW1lbnRhdGlvbiBhbmQgb25nb2luZyBtYWludGVuYW5jZQorICogICAgCisgKiBBUEkgaW4gdGhlc2UgcGFja2FnZXMgaXMgcHJvdmlzaW9uYWwgaW4gdGhpcyByZWxlYXNlCisgKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqLworcGFja2FnZSBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUudWkucHJvcGVydHlwYWdlOworCitpbXBvcnQgamF2YS51dGlsLkFycmF5TGlzdDsKK2ltcG9ydCBqYXZhLnV0aWwuQXJyYXlzOworaW1wb3J0IGphdmEudXRpbC5IYXNoTWFwOworaW1wb3J0IGphdmEudXRpbC5JdGVyYXRvcjsKK2ltcG9ydCBqYXZhLnV0aWwuTGlzdDsKK2ltcG9ydCBqYXZhLnV0aWwuTWFwOworCitpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5jb21tYW5kcy5FeGVjdXRpb25FeGNlcHRpb247CitpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5yZXNvdXJjZXMuSVByb2plY3Q7CitpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5yZXNvdXJjZXMuSVdvcmtzcGFjZVJvb3Q7CitpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5yZXNvdXJjZXMuSVdvcmtzcGFjZVJ1bm5hYmxlOworaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucmVzb3VyY2VzLlJlc291cmNlc1BsdWdpbjsKK2ltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJ1bnRpbWUuQ29yZUV4Y2VwdGlvbjsKK2ltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJ1bnRpbWUuSVBhdGg7CitpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5ydW50aW1lLklQcm9ncmVzc01vbml0b3I7CitpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5ydW50aW1lLklTdGF0dXM7CitpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5ydW50aW1lLk11bHRpU3RhdHVzOworaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucnVudGltZS5OdWxsUHJvZ3Jlc3NNb25pdG9yOworaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucnVudGltZS5QYXRoOworaW1wb3J0IG9yZy5lY2xpcHNlLmpmYWNlLmRpYWxvZ3MuRGlhbG9nOworaW1wb3J0IG9yZy5lY2xpcHNlLmpmYWNlLnZpZXdlcnMuQ2VsbEVkaXRvcjsKK2ltcG9ydCBvcmcuZWNsaXBzZS5qZmFjZS52aWV3ZXJzLkNvbHVtbldlaWdodERhdGE7CitpbXBvcnQgb3JnLmVjbGlwc2UuamZhY2Uudmlld2Vycy5JQ2VsbE1vZGlmaWVyOworaW1wb3J0IG9yZy5lY2xpcHNlLmpmYWNlLnZpZXdlcnMuSUxhYmVsUHJvdmlkZXJMaXN0ZW5lcjsKK2ltcG9ydCBvcmcuZWNsaXBzZS5qZmFjZS52aWV3ZXJzLklTZWxlY3Rpb247CitpbXBvcnQgb3JnLmVjbGlwc2UuamZhY2Uudmlld2Vycy5JU2VsZWN0aW9uQ2hhbmdlZExpc3RlbmVyOworaW1wb3J0IG9yZy5lY2xpcHNlLmpmYWNlLnZpZXdlcnMuSVN0cnVjdHVyZWRTZWxlY3Rpb247CitpbXBvcnQgb3JnLmVjbGlwc2UuamZhY2Uudmlld2Vycy5MYWJlbFByb3ZpZGVyQ2hhbmdlZEV2ZW50OworaW1wb3J0IG9yZy5lY2xpcHNlLmpmYWNlLnZpZXdlcnMuU2VsZWN0aW9uQ2hhbmdlZEV2ZW50OworaW1wb3J0IG9yZy5lY2xpcHNlLmpmYWNlLnZpZXdlcnMuVGFibGVMYXlvdXQ7CitpbXBvcnQgb3JnLmVjbGlwc2UuamZhY2Uudmlld2Vycy5UYWJsZVZpZXdlcjsKK2ltcG9ydCBvcmcuZWNsaXBzZS5qZmFjZS52aWV3ZXJzLlRleHRDZWxsRWRpdG9yOworaW1wb3J0IG9yZy5lY2xpcHNlLmpmYWNlLndpbmRvdy5XaW5kb3c7CitpbXBvcnQgb3JnLmVjbGlwc2UuamZhY2Uud2l6YXJkLldpemFyZERpYWxvZzsKK2ltcG9ydCBvcmcuZWNsaXBzZS5zd3QuU1dUOworaW1wb3J0IG9yZy5lY2xpcHNlLnN3dC5sYXlvdXQuR3JpZERhdGE7CitpbXBvcnQgb3JnLmVjbGlwc2Uuc3d0LmxheW91dC5HcmlkTGF5b3V0OworaW1wb3J0IG9yZy5lY2xpcHNlLnN3dC53aWRnZXRzLkJ1dHRvbjsKK2ltcG9ydCBvcmcuZWNsaXBzZS5zd3Qud2lkZ2V0cy5Db21wb3NpdGU7CitpbXBvcnQgb3JnLmVjbGlwc2Uuc3d0LndpZGdldHMuRXZlbnQ7CitpbXBvcnQgb3JnLmVjbGlwc2Uuc3d0LndpZGdldHMuR3JvdXA7CitpbXBvcnQgb3JnLmVjbGlwc2Uuc3d0LndpZGdldHMuTGFiZWw7CitpbXBvcnQgb3JnLmVjbGlwc2Uuc3d0LndpZGdldHMuTGlzdGVuZXI7CitpbXBvcnQgb3JnLmVjbGlwc2Uuc3d0LndpZGdldHMuU2hlbGw7CitpbXBvcnQgb3JnLmVjbGlwc2Uuc3d0LndpZGdldHMuVGFibGU7CitpbXBvcnQgb3JnLmVjbGlwc2Uuc3d0LndpZGdldHMuVGFibGVDb2x1bW47CitpbXBvcnQgb3JnLmVjbGlwc2Uuc3d0LndpZGdldHMuVGFibGVJdGVtOworaW1wb3J0IG9yZy5lY2xpcHNlLnN3dC53aWRnZXRzLlRleHQ7CitpbXBvcnQgb3JnLmVjbGlwc2UudWkuUGxhdGZvcm1VSTsKK2ltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUuQ29tcG9uZW50Q29yZTsKK2ltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUuZGF0YW1vZGVsLnByb3BlcnRpZXMuSUFkZFJlZmVyZW5jZURhdGFNb2RlbFByb3BlcnRpZXM7CitpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb21wb25lbnRjb3JlLmludGVybmFsLkNvbXBvbmVudFJlc291cmNlOworaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS5pbnRlcm5hbC5EZWZhdWx0TW9kdWxlSGFuZGxlcjsKK2ltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUuaW50ZXJuYWwuRGVwZW5kZW5jeVR5cGU7CitpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb21wb25lbnRjb3JlLmludGVybmFsLklNb2R1bGVIYW5kbGVyOworaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS5pbnRlcm5hbC5TdHJ1Y3R1cmVFZGl0OworaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS5pbnRlcm5hbC5Xb3JrYmVuY2hDb21wb25lbnQ7CitpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb21wb25lbnRjb3JlLmludGVybmFsLmltcGwuVGFza01vZGVsOworaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS5pbnRlcm5hbC5vcGVyYXRpb24uQWRkUmVmZXJlbmNlRGF0YU1vZGVsUHJvdmlkZXI7CitpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb21wb25lbnRjb3JlLmludGVybmFsLm9wZXJhdGlvbi5SZW1vdmVSZWZlcmVuY2VEYXRhTW9kZWxQcm92aWRlcjsKK2ltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUuaW50ZXJuYWwucmVzb3VyY2VzLlZpcnR1YWxSZWZlcmVuY2U7CitpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb21wb25lbnRjb3JlLnJlc291cmNlcy5JVmlydHVhbENvbXBvbmVudDsKK2ltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUucmVzb3VyY2VzLklWaXJ0dWFsRm9sZGVyOworaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS5yZXNvdXJjZXMuSVZpcnR1YWxSZWZlcmVuY2U7CitpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb21wb25lbnRjb3JlLnVpLklNb2R1bGVDb3JlVUlDb250ZXh0SWRzOworaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS51aS5NZXNzYWdlczsKK2ltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUudWkuTW9kdWxlQ29yZVVJUGx1Z2luOworaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS51aS5pbnRlcm5hbC5wcm9wZXJ0eXBhZ2UuQ29tcG9uZW50RGVwZW5kZW5jeUNvbnRlbnRQcm92aWRlcjsKK2ltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUudWkuaW50ZXJuYWwucHJvcGVydHlwYWdlLkRlcGVuZGVuY3lQYWdlRXh0ZW5zaW9uTWFuYWdlcjsKK2ltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUudWkuaW50ZXJuYWwucHJvcGVydHlwYWdlLkRlcGVuZGVuY3lQYWdlRXh0ZW5zaW9uTWFuYWdlci5SZWZlcmVuY2VFeHRlbnNpb247CitpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb21wb25lbnRjb3JlLnVpLmludGVybmFsLnByb3BlcnR5cGFnZS5OZXdSZWZlcmVuY2VXaXphcmQ7CitpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb21wb25lbnRjb3JlLnVpLmludGVybmFsLnByb3BlcnR5cGFnZS52ZXJpZmllci5EZXBsb3ltZW50QXNzZW1ibHlWZXJpZmllckhlbHBlcjsKK2ltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUudWkuaW50ZXJuYWwudGFza3dpemFyZC5UYXNrV2l6YXJkOworaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS51aS5pbnRlcm5hbC50YXNrd2l6YXJkLldpemFyZEZyYWdtZW50OworaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy5kYXRhbW9kZWwuRGF0YU1vZGVsRmFjdG9yeTsKK2ltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3MuZGF0YW1vZGVsLklEYXRhTW9kZWw7CitpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzLmRhdGFtb2RlbC5JRGF0YU1vZGVsT3BlcmF0aW9uOworaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy5kYXRhbW9kZWwuSURhdGFNb2RlbFByb3ZpZGVyOworaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24ucHJvamVjdC5mYWNldC5jb3JlLklGYWNldGVkUHJvamVjdDsKK2ltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLnByb2plY3QuZmFjZXQuY29yZS5Qcm9qZWN0RmFjZXRzTWFuYWdlcjsKK2ltcG9ydCBvcmcuZWNsaXBzZS53c3Quc2VydmVyLmNvcmUuSVJ1bnRpbWU7CitpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LnNlcnZlci5jb3JlLmludGVybmFsLmZhY2V0cy5GYWNldFV0aWw7CisgCitwdWJsaWMgY2xhc3MgQWRkTW9kdWxlRGVwZW5kZW5jaWVzUHJvcGVydGllc1BhZ2UgaW1wbGVtZW50cyBMaXN0ZW5lciwKKwkJSU1vZHVsZURlcGVuZGVuY2llc0NvbnRyb2wsIElMYWJlbFByb3ZpZGVyTGlzdGVuZXIgeworCisJcHJvdGVjdGVkIHN0YXRpYyBmaW5hbCBTdHJpbmcgREVQTE9ZX1BBVEhfUFJPUEVSVFkgPSBuZXcgSW50ZWdlcigwKS50b1N0cmluZygpOworCXByb3RlY3RlZCBzdGF0aWMgZmluYWwgU3RyaW5nIFNPVVJDRV9QUk9QRVJUWSA9IG5ldyBJbnRlZ2VyKDEpLnRvU3RyaW5nKCk7CisJCisJCisJcHJvdGVjdGVkIGZpbmFsIFN0cmluZyBQQVRIX1NFUEFSQVRPUiA9IFN0cmluZy52YWx1ZU9mKElQYXRoLlNFUEFSQVRPUik7CisJcHJpdmF0ZSBib29sZWFuIGhhc0luaXRpYWxpemVkID0gZmFsc2U7CisJcHJvdGVjdGVkIGZpbmFsIElQcm9qZWN0IHByb2plY3Q7CisJcHJvdGVjdGVkIGZpbmFsIElSdW50aW1lIHJ1bnRpbWU7CisJcHJvdGVjdGVkIGZpbmFsIE1vZHVsZUFzc2VtYmx5Um9vdFBhZ2UgcHJvcFBhZ2U7CisJcHJvdGVjdGVkIElWaXJ0dWFsQ29tcG9uZW50IHJvb3RDb21wb25lbnQgPSBudWxsOworCXByb3RlY3RlZCBUZXh0IGNvbXBvbmVudE5hbWVUZXh0OworCXByb3RlY3RlZCBMYWJlbCBhdmFpbGFibGVNb2R1bGVzOworCXByb3RlY3RlZCBUYWJsZVZpZXdlciBhdmFpbGFibGVDb21wb25lbnRzVmlld2VyOworCXByb3RlY3RlZCBCdXR0b24gYWRkTWFwcGluZ0J1dHRvbiwgYWRkUmVmZXJlbmNlQnV0dG9uLCBlZGl0UmVmZXJlbmNlQnV0dG9uLCByZW1vdmVCdXR0b247CisJcHJvdGVjdGVkIENvbXBvc2l0ZSBidXR0b25Db2x1bW47CisJcHJvdGVjdGVkIHN0YXRpYyBmaW5hbCBJU3RhdHVzIE9LX1NUQVRVUyA9IElEYXRhTW9kZWxQcm92aWRlci5PS19TVEFUVVM7CisJLy9wcm90ZWN0ZWQgTGlzdGVuZXIgdGFibGVMaXN0ZW5lcjsKKwlwcm90ZWN0ZWQgTGlzdGVuZXIgbGFiZWxMaXN0ZW5lcjsKKworCXByb3RlY3RlZCBBcnJheUxpc3Q8SVZpcnR1YWxSZWZlcmVuY2U+IG9yaWdpbmFsUmVmZXJlbmNlcyA9IG5ldyBBcnJheUxpc3Q8SVZpcnR1YWxSZWZlcmVuY2U+KCk7CisJcHJvdGVjdGVkIEFycmF5TGlzdDxJVmlydHVhbFJlZmVyZW5jZT4gY3VycmVudFJlZmVyZW5jZXMgPSBuZXcgQXJyYXlMaXN0PElWaXJ0dWFsUmVmZXJlbmNlPigpOworCisJLy8gQSBzaW5nbGUgbGlzdCBvZiB3Yi1yZXNvdXJjZSBtYXBwaW5ncy4gSWYgdGhlcmUncyBhbnkgY2hhbmdlLCAKKwkvLyBhbGwgb2xkIHdpbGwgYmUgcmVtb3ZlZCBhbmQgbmV3IG9uZXMgYWRkZWQKKwlwcm90ZWN0ZWQgQXJyYXlMaXN0PENvbXBvbmVudFJlc291cmNlUHJveHk+IHJlc291cmNlTWFwcGluZ3MgPSBuZXcgQXJyYXlMaXN0PENvbXBvbmVudFJlc291cmNlUHJveHk+KCk7CisJCisJLy8ga2VlcHMgdHJhY2sgaWYgYSBjaGFuZ2UgaGFzIG9jY3VycmVkIGluIHdiLXJlc291cmNlIG1hcHBpbmdzCisJcHJvdGVjdGVkIGJvb2xlYW4gcmVzb3VyY2VNYXBwaW5nc0NoYW5nZWQgPSBmYWxzZTsKKwkKKwlwcm90ZWN0ZWQgSU1vZHVsZUhhbmRsZXIgbW9kdWxlSGFuZGxlcjsKKwkKKwlwdWJsaWMgc3RhdGljIFN0cmluZyBnZXRTYWZlUnVudGltZVBhdGgoSVZpcnR1YWxSZWZlcmVuY2UgcmVmKSB7CisJCVN0cmluZyBhcmNoaXZlTmFtZSA9IHJlZi5nZXREZXBlbmRlbmN5VHlwZSgpID09IERlcGVuZGVuY3lUeXBlLkNPTlNVTUVTID8gbnVsbCA6IHJlZi5nZXRBcmNoaXZlTmFtZSgpOworCQlTdHJpbmcgdmFsID0gbnVsbDsKKwkJaWYoYXJjaGl2ZU5hbWUgIT0gbnVsbCkgeworCQkJSVBhdGggcnVudGltZVBhdGggPSBuZXcgUGF0aChhcmNoaXZlTmFtZSk7CisJCQlpZihydW50aW1lUGF0aC5zZWdtZW50Q291bnQoKSA+IDEpIHsKKwkJCQl2YWwgPSBhcmNoaXZlTmFtZTsKKwkJCX0gZWxzZSB7CisJCQkJdmFsID0gcmVmLmdldFJ1bnRpbWVQYXRoKCkuYXBwZW5kKGFyY2hpdmVOYW1lKS50b1N0cmluZygpOworCQkJfQorCQl9IGVsc2UgeworCQkJdmFsID0gcmVmLmdldFJ1bnRpbWVQYXRoKCkudG9TdHJpbmcoKTsKKwkJfQorCQlpZiggdmFsID09IG51bGwgKSB2YWwgPSAiLyI7CisJCXJldHVybiB2YWw7CisJfQorCisJcHVibGljIHN0YXRpYyB2b2lkIHNldFJ1bnRpbWVQYXRoU2FmZShJVmlydHVhbFJlZmVyZW5jZSByZWYsIFN0cmluZyBuZXdQYXRoKSB7CisJCWlmKCByZWYuZ2V0RGVwZW5kZW5jeVR5cGUoKSA9PSBJVmlydHVhbFJlZmVyZW5jZS5ERVBFTkRFTkNZX1RZUEVfQ09OU1VNRVMpCisJCQlyZWYuc2V0UnVudGltZVBhdGgobmV3IFBhdGgobmV3UGF0aCA9PSBudWxsID8gIi8iIDogbmV3UGF0aCkpOworCQllbHNlIHsKKwkJCUlQYXRoIHBhdGgyID0gbmV3IFBhdGgobmV3UGF0aCA9PSBudWxsID8gIi8iIDogbmV3UGF0aCk7CisJCQlyZWYuc2V0UnVudGltZVBhdGgocGF0aDIuc2VnbWVudENvdW50KCkgPiAxID8gcGF0aDIucmVtb3ZlTGFzdFNlZ21lbnRzKDEpIDogbmV3IFBhdGgoIi8iKSk7CisJCQlyZWYuc2V0QXJjaGl2ZU5hbWUocGF0aDIuc2VnbWVudENvdW50KCkgPiAwID8gcGF0aDIubGFzdFNlZ21lbnQoKSA6ICIiKTsKKwkJfQorCX0KKwkKKwkvKioKKwkgKiBDb25zdHJ1Y3RvciBmb3IgQWRkTW9kdWxlc3RvRUFSUHJvcGVydGllc0NvbnRyb2wuCisJICovCisJcHVibGljIEFkZE1vZHVsZURlcGVuZGVuY2llc1Byb3BlcnRpZXNQYWdlKGZpbmFsIElQcm9qZWN0IHByb2plY3QsCisJCQlmaW5hbCBNb2R1bGVBc3NlbWJseVJvb3RQYWdlIHBhZ2UpIHsKKwkJdGhpcy5wcm9qZWN0ID0gcHJvamVjdDsKKwkJdGhpcy5wcm9wUGFnZSA9IHBhZ2U7CisJCXRoaXMucnVudGltZSA9IHNldFJ1bnRpbWUoKTsKKwkJcm9vdENvbXBvbmVudCA9IENvbXBvbmVudENvcmUuY3JlYXRlQ29tcG9uZW50KHByb2plY3QpOworCX0KKworCXByaXZhdGUgSVJ1bnRpbWUgc2V0UnVudGltZSgpIHsKKwkJSVJ1bnRpbWUgYVJ1bnRpbWUgPSBudWxsOworCQl0cnkgeworCQkJYVJ1bnRpbWUgPSBnZXRTZXJ2ZXJSdW50aW1lKHByb2plY3QpOworCQl9CisJCWNhdGNoIChDb3JlRXhjZXB0aW9uIGUpIHsKKwkJCU1vZHVsZUNvcmVVSVBsdWdpbi5sb2coZSk7CisJCX0KKwkJcmV0dXJuIGFSdW50aW1lOworCX0KKworCS8qCisJICogVUkgQ3JlYXRpb24gTWV0aG9kcworCSAqLworCisJcHVibGljIENvbXBvc2l0ZSBjcmVhdGVDb250ZW50cyhmaW5hbCBDb21wb3NpdGUgcGFyZW50KSB7CisJCUNvbXBvc2l0ZSBjb21wb3NpdGUgPSBuZXcgQ29tcG9zaXRlKHBhcmVudCwgU1dULk5PTkUpOworCQlQbGF0Zm9ybVVJLmdldFdvcmtiZW5jaCgpLmdldEhlbHBTeXN0ZW0oKS5zZXRIZWxwKGNvbXBvc2l0ZSwgSU1vZHVsZUNvcmVVSUNvbnRleHRJZHMuREVQTE9ZTUVOVF9BU1NFTUJMWV9QUkVGRVJFTkNFX1BBR0VfREVQTE9ZTUVOVF9BU1NFTUJMWV9UQUIpOworCQlHcmlkTGF5b3V0IGxheW91dCA9IG5ldyBHcmlkTGF5b3V0KCk7CisJCWxheW91dC5tYXJnaW5XaWR0aCA9IDA7CisJCWxheW91dC5tYXJnaW5XaWR0aCA9IDA7CisJCWNvbXBvc2l0ZS5zZXRMYXlvdXQobGF5b3V0KTsKKwkJY29tcG9zaXRlLnNldExheW91dERhdGEobmV3IEdyaWREYXRhKEdyaWREYXRhLkZJTExfQk9USCkpOworCQljcmVhdGVEZXNjcmlwdGlvbkNvbXBvc2l0ZShjb21wb3NpdGUpOworCQljcmVhdGVMaXN0R3JvdXAoY29tcG9zaXRlKTsKKwkJcmVmcmVzaCgpOworCQlEaWFsb2cuYXBwbHlEaWFsb2dGb250KHBhcmVudCk7CisJCXJldHVybiBjb21wb3NpdGU7CisJfQorCQorCXByb3RlY3RlZCB2b2lkIGNyZWF0ZURlc2NyaXB0aW9uQ29tcG9zaXRlKENvbXBvc2l0ZSBwYXJlbnQpeworCQlNb2R1bGVBc3NlbWJseVJvb3RQYWdlLmNyZWF0ZURlc2NyaXB0aW9uQ29tcG9zaXRlKHBhcmVudCwgZ2V0TW9kdWxlQXNzZW1ibHlSb290UGFnZURlc2NyaXB0aW9uKCkpOworCX0KKworCXByb3RlY3RlZCBTdHJpbmcgZ2V0TW9kdWxlQXNzZW1ibHlSb290UGFnZURlc2NyaXB0aW9uKCkgeworCQlyZXR1cm4gTWVzc2FnZXMuTW9kdWxlQXNzZW1ibHlSb290UGFnZURlc2NyaXB0aW9uOworCX0KKworCXByb3RlY3RlZCB2b2lkIGNyZWF0ZUxpc3RHcm91cChDb21wb3NpdGUgcGFyZW50KSB7CisJCUNvbXBvc2l0ZSBsaXN0R3JvdXAgPSBuZXcgQ29tcG9zaXRlKHBhcmVudCwgU1dULk5PTkUpOworCQlHcmlkTGF5b3V0IGxheW91dCA9IG5ldyBHcmlkTGF5b3V0KCk7CisJCWxheW91dC5udW1Db2x1bW5zID0gMTsKKwkJbGF5b3V0Lm1hcmdpbldpZHRoID0gMDsKKwkJbGF5b3V0Lm1hcmdpbkhlaWdodCA9IDA7CisJCWxpc3RHcm91cC5zZXRMYXlvdXQobGF5b3V0KTsKKwkJR3JpZERhdGEgZ0RhdGEgPSBuZXcgR3JpZERhdGEoR3JpZERhdGEuRklMTF9CT1RIKTsKKwkJZ0RhdGEuaG9yaXpvbnRhbEluZGVudCA9IDU7CisJCWxpc3RHcm91cC5zZXRMYXlvdXREYXRhKGdEYXRhKTsKKworCQlhdmFpbGFibGVNb2R1bGVzID0gbmV3IExhYmVsKGxpc3RHcm91cCwgU1dULk5PTkUpOworCQlnRGF0YSA9IG5ldyBHcmlkRGF0YShHcmlkRGF0YS5IT1JJWk9OVEFMX0FMSUdOX0ZJTEwKKwkJCQl8IEdyaWREYXRhLlZFUlRJQ0FMX0FMSUdOX0ZJTEwpOworCQlhdmFpbGFibGVNb2R1bGVzLnNldFRleHQoTWVzc2FnZXMuTW9kdWxlQXNzZW1ibHkpOyAKKwkJYXZhaWxhYmxlTW9kdWxlcy5zZXRMYXlvdXREYXRhKGdEYXRhKTsKKwkJY3JlYXRlVGFibGVDb21wb3NpdGUobGlzdEdyb3VwKTsKKwl9CisKKwlwcm90ZWN0ZWQgdm9pZCBjcmVhdGVUYWJsZUNvbXBvc2l0ZShDb21wb3NpdGUgcGFyZW50KSB7CisJCUNvbXBvc2l0ZSBjb21wb3NpdGUgPSBuZXcgQ29tcG9zaXRlKHBhcmVudCwgU1dULk5PTkUpOworCQlHcmlkRGF0YSBnRGF0YSA9IG5ldyBHcmlkRGF0YShHcmlkRGF0YS5GSUxMX0JPVEgpOworCQljb21wb3NpdGUuc2V0TGF5b3V0RGF0YShnRGF0YSk7CisJCWZpbGxUYWJsZUNvbXBvc2l0ZShjb21wb3NpdGUpOworCX0KKworCXB1YmxpYyB2b2lkIGZpbGxUYWJsZUNvbXBvc2l0ZShDb21wb3NpdGUgcGFyZW50KSB7CisJCUdyaWRMYXlvdXQgbGF5b3V0ID0gbmV3IEdyaWRMYXlvdXQoKTsKKwkJbGF5b3V0Lm51bUNvbHVtbnMgPSAyOworCQlsYXlvdXQubWFyZ2luSGVpZ2h0ID0gMDsKKwkJcGFyZW50LnNldExheW91dChsYXlvdXQpOworCQlwYXJlbnQuc2V0TGF5b3V0RGF0YShuZXcgR3JpZERhdGEoR3JpZERhdGEuRklMTF9CT1RIKSk7CisJCWNyZWF0ZVRhYmxlKHBhcmVudCk7CisJCWNyZWF0ZUJ1dHRvbkNvbHVtbihwYXJlbnQpOworCX0KKworCXByb3RlY3RlZCB2b2lkIGNyZWF0ZUJ1dHRvbkNvbHVtbihDb21wb3NpdGUgcGFyZW50KSB7CisJCWJ1dHRvbkNvbHVtbiA9IGNyZWF0ZUJ1dHRvbkNvbHVtbkNvbXBvc2l0ZShwYXJlbnQpOworCQlHcmlkRGF0YSBkYXRhID0gbmV3IEdyaWREYXRhKEdyaWREYXRhLkhPUklaT05UQUxfQUxJR05fRU5EKTsKKwkJYnV0dG9uQ29sdW1uLnNldExheW91dERhdGEoZGF0YSk7CisJCWNyZWF0ZVB1c2hCdXR0b25zKCk7CisJfQorCisJcHJvdGVjdGVkIHZvaWQgY3JlYXRlUHVzaEJ1dHRvbnMoKSB7CisJCWFkZFJlZmVyZW5jZUJ1dHRvbiA9IGNyZWF0ZVB1c2hCdXR0b24oTWVzc2FnZXMuQWRkRWxsaXBzaXMpOworCQllZGl0UmVmZXJlbmNlQnV0dG9uID0gY3JlYXRlUHVzaEJ1dHRvbihNZXNzYWdlcy5FZGl0RWxsaXBzaXMpOworCQlyZW1vdmVCdXR0b24gPSBjcmVhdGVQdXNoQnV0dG9uKE1lc3NhZ2VzLlJlbW92ZVNlbGVjdGVkKTsKKwl9CisKKwlwcm90ZWN0ZWQgQnV0dG9uIGNyZWF0ZVB1c2hCdXR0b24oU3RyaW5nIGxhYmVsKSB7CisJCUJ1dHRvbiBhQnV0dG9uID0gbmV3IEJ1dHRvbihidXR0b25Db2x1bW4sIFNXVC5QVVNIKTsKKwkJYUJ1dHRvbi5zZXRUZXh0KGxhYmVsKTsKKwkJYUJ1dHRvbi5hZGRMaXN0ZW5lcihTV1QuU2VsZWN0aW9uLCB0aGlzKTsKKwkJYUJ1dHRvbi5zZXRMYXlvdXREYXRhKG5ldyBHcmlkRGF0YShHcmlkRGF0YS5GSUxMX0hPUklaT05UQUwpKTsKKwkJcmV0dXJuIGFCdXR0b247CisJfQorCisJcHVibGljIENvbXBvc2l0ZSBjcmVhdGVCdXR0b25Db2x1bW5Db21wb3NpdGUoQ29tcG9zaXRlIHBhcmVudCkgeworCQlDb21wb3NpdGUgYUJ1dHRvbkNvbHVtbiA9IG5ldyBDb21wb3NpdGUocGFyZW50LCBTV1QuTk9ORSk7CisJCUdyaWRMYXlvdXQgbGF5b3V0ID0gbmV3IEdyaWRMYXlvdXQoKTsKKwkJbGF5b3V0Lm51bUNvbHVtbnMgPSAxOworCQlsYXlvdXQubWFyZ2luSGVpZ2h0ID0gMDsKKwkJbGF5b3V0Lm1hcmdpbldpZHRoID0gMDsKKwkJYUJ1dHRvbkNvbHVtbi5zZXRMYXlvdXQobGF5b3V0KTsKKwkJR3JpZERhdGEgZGF0YSA9IG5ldyBHcmlkRGF0YShHcmlkRGF0YS5IT1JJWk9OVEFMX0FMSUdOX0ZJTEwKKwkJCQl8IEdyaWREYXRhLlZFUlRJQ0FMX0FMSUdOX0JFR0lOTklORyk7CisJCWFCdXR0b25Db2x1bW4uc2V0TGF5b3V0RGF0YShkYXRhKTsKKwkJcmV0dXJuIGFCdXR0b25Db2x1bW47CisJfQorCisJcHVibGljIEdyb3VwIGNyZWF0ZUdyb3VwKENvbXBvc2l0ZSBwYXJlbnQpIHsKKwkJcmV0dXJuIG5ldyBHcm91cChwYXJlbnQsIFNXVC5OVUxMKTsKKwl9CisKKwlwcm90ZWN0ZWQgdm9pZCBjcmVhdGVUYWJsZShDb21wb3NpdGUgcGFyZW50KSB7CisJCWlmIChyb290Q29tcG9uZW50ICE9IG51bGwpIHsKKwkJCWF2YWlsYWJsZUNvbXBvbmVudHNWaWV3ZXIgPSBjcmVhdGVBdmFpbGFibGVDb21wb25lbnRzVmlld2VyKHBhcmVudCk7CisJCQlHcmlkRGF0YSBnZCA9IG5ldyBHcmlkRGF0YShHcmlkRGF0YS5IT1JJWk9OVEFMX0FMSUdOX0ZJTEwKKwkJCQkJfCBHcmlkRGF0YS5GSUxMX1ZFUlRJQ0FMKTsKKwkJCWF2YWlsYWJsZUNvbXBvbmVudHNWaWV3ZXIuZ2V0VGFibGUoKS5zZXRMYXlvdXREYXRhKGdkKTsKKworCQkJQ29tcG9uZW50RGVwZW5kZW5jeUNvbnRlbnRQcm92aWRlciBwcm92aWRlciA9IGNyZWF0ZVByb3ZpZGVyKCk7CisJCQlwcm92aWRlci5zZXRSdW50aW1lUGF0aHMoY3VycmVudFJlZmVyZW5jZXMpOworCQkJcHJvdmlkZXIuc2V0UmVzb3VyY2VNYXBwaW5ncyhyZXNvdXJjZU1hcHBpbmdzKTsKKwkJCWF2YWlsYWJsZUNvbXBvbmVudHNWaWV3ZXIuc2V0Q29udGVudFByb3ZpZGVyKHByb3ZpZGVyKTsKKwkJCS8vYXZhaWxhYmxlQ29tcG9uZW50c1ZpZXdlci5zZXRMYWJlbFByb3ZpZGVyKG5ldyBEZWNvcmF0aW5nTGFiZWxQcm92aWRlcigKKwkgICAgICAgIC8vICAgICAgICBuZXcgV29ya2JlbmNoTGFiZWxQcm92aWRlcigpLCBQbGF0Zm9ybVVJLmdldFdvcmtiZW5jaCgpLgorCSAgICAgICAgLy8gICAgICAgICBnZXREZWNvcmF0b3JNYW5hZ2VyKCkuZ2V0TGFiZWxEZWNvcmF0b3IoKSkpOworCQkJYXZhaWxhYmxlQ29tcG9uZW50c1ZpZXdlci5zZXRMYWJlbFByb3ZpZGVyKHByb3ZpZGVyKTsKKwkJCWFkZFRhYmxlTGlzdGVuZXJzKCk7CisJCX0KKwl9CisKKwkvKioKKwkgKiBTdWJjbGFzc2VzIHNob3VsZCBvdmVyLXJpZGUgdGhpcyBhbmQgZXh0ZW5kIHRoZSBjbGFzcworCSAqLworCXByb3RlY3RlZCBDb21wb25lbnREZXBlbmRlbmN5Q29udGVudFByb3ZpZGVyIGNyZWF0ZVByb3ZpZGVyKCkgeworCQlyZXR1cm4gbmV3IENvbXBvbmVudERlcGVuZGVuY3lDb250ZW50UHJvdmlkZXIodGhpcyk7CisJfQorCisJLyoKKwkgKiBMaXN0ZW5lcnMgb2YgdmFyaW91cyBldmVudHMKKwkgKi8KKworCXByb3RlY3RlZCB2b2lkIGFkZFRhYmxlTGlzdGVuZXJzKCkgeworCQlhZGRIb3ZlckhlbHBMaXN0ZW5lcnMoKTsKKwkJYWRkRG91YmxlQ2xpY2tMaXN0ZW5lcigpOworCQlhZGRTZWxlY3Rpb25MaXN0ZW5lcigpOworCX0KKworCXByb3RlY3RlZCB2b2lkIGFkZEhvdmVySGVscExpc3RlbmVycygpIHsKKwkJZmluYWwgVGFibGUgdGFibGUgPSBhdmFpbGFibGVDb21wb25lbnRzVmlld2VyLmdldFRhYmxlKCk7CisJCWNyZWF0ZUxhYmVsTGlzdGVuZXIodGFibGUpOworLy8JCWNyZWF0ZVRhYmxlTGlzdGVuZXIodGFibGUpOworLy8JCXRhYmxlLmFkZExpc3RlbmVyKFNXVC5EaXNwb3NlLCB0YWJsZUxpc3RlbmVyKTsKKy8vCQl0YWJsZS5hZGRMaXN0ZW5lcihTV1QuS2V5RG93biwgdGFibGVMaXN0ZW5lcik7CisvLwkJdGFibGUuYWRkTGlzdGVuZXIoU1dULk1vdXNlTW92ZSwgdGFibGVMaXN0ZW5lcik7CisvLwkJdGFibGUuYWRkTGlzdGVuZXIoU1dULk1vdXNlSG92ZXIsIHRhYmxlTGlzdGVuZXIpOworCX0KKworCXByb3RlY3RlZCB2b2lkIGNyZWF0ZUxhYmVsTGlzdGVuZXIoZmluYWwgVGFibGUgdGFibGUpIHsKKwkJbGFiZWxMaXN0ZW5lciA9IG5ldyBMaXN0ZW5lcigpIHsKKwkJCXB1YmxpYyB2b2lkIGhhbmRsZUV2ZW50KEV2ZW50IGV2ZW50KSB7CisJCQkJTGFiZWwgbGFiZWwgPSAoTGFiZWwpIGV2ZW50LndpZGdldDsKKwkJCQlTaGVsbCBzaGVsbCA9IGxhYmVsLmdldFNoZWxsKCk7CisJCQkJc3dpdGNoIChldmVudC50eXBlKSB7CisJCQkJY2FzZSBTV1QuTW91c2VEb3duOgorCQkJCQlFdmVudCBlID0gbmV3IEV2ZW50KCk7CisJCQkJCWUuaXRlbSA9IChUYWJsZUl0ZW0pIGxhYmVsLmdldERhdGEoIl9UQUJMRUlURU0iKTsgLy8kTk9OLU5MUy0xJAorCQkJCQl0YWJsZS5zZXRTZWxlY3Rpb24obmV3IFRhYmxlSXRlbVtdIHsgKFRhYmxlSXRlbSkgZS5pdGVtIH0pOworCQkJCQl0YWJsZS5ub3RpZnlMaXN0ZW5lcnMoU1dULlNlbGVjdGlvbiwgZSk7CisJCQkJCXNoZWxsLmRpc3Bvc2UoKTsKKwkJCQkJdGFibGUuc2V0Rm9jdXMoKTsKKwkJCQkJYnJlYWs7CisJCQkJY2FzZSBTV1QuTW91c2VFeGl0OgorCQkJCQlzaGVsbC5kaXNwb3NlKCk7CisJCQkJCWJyZWFrOworCQkJCX0KKwkJCX0KKwkJfTsKKwl9CisKKy8vCXByb3RlY3RlZCB2b2lkIGNyZWF0ZVRhYmxlTGlzdGVuZXIoZmluYWwgVGFibGUgdGFibGUpIHsKKy8vCQl0YWJsZUxpc3RlbmVyID0gbmV3IExpc3RlbmVyKCkgeworLy8JCQlTaGVsbCB0aXAgPSBudWxsOworLy8JCQlMYWJlbCBsYWJlbCA9IG51bGw7CisvLworLy8JCQlwdWJsaWMgdm9pZCBoYW5kbGVFdmVudChFdmVudCBldmVudCkgeworLy8JCQkJc3dpdGNoIChldmVudC50eXBlKSB7CisvLwkJCQljYXNlIFNXVC5EaXNwb3NlOgorLy8JCQkJY2FzZSBTV1QuS2V5RG93bjoKKy8vCQkJCWNhc2UgU1dULk1vdXNlTW92ZTogeworLy8JCQkJCWlmICh0aXAgPT0gbnVsbCkKKy8vCQkJCQkJYnJlYWs7CisvLwkJCQkJdGlwLmRpc3Bvc2UoKTsKKy8vCQkJCQl0aXAgPSBudWxsOworLy8JCQkJCWxhYmVsID0gbnVsbDsKKy8vCQkJCQlicmVhazsKKy8vCQkJCX0KKy8vCQkJCWNhc2UgU1dULk1vdXNlSG92ZXI6IHsKKy8vCQkJCQlUYWJsZUl0ZW0gaXRlbSA9IHRhYmxlLmdldEl0ZW0obmV3IFBvaW50KGV2ZW50LngsIGV2ZW50LnkpKTsKKy8vCQkJCQlpZiAoaXRlbSAhPSBudWxsICYmIGl0ZW0uZ2V0RGF0YSgpICE9IG51bGwgJiYgIWNhbkVkaXQoaXRlbS5nZXREYXRhKCkpKSB7CisvLwkJCQkJCWlmICh0aXAgIT0gbnVsbCAmJiAhdGlwLmlzRGlzcG9zZWQoKSkKKy8vCQkJCQkJCXRpcC5kaXNwb3NlKCk7CisvLwkJCQkJCXRpcCA9IG5ldyBTaGVsbChQbGF0Zm9ybVVJLmdldFdvcmtiZW5jaCgpCisvLwkJCQkJCQkJLmdldEFjdGl2ZVdvcmtiZW5jaFdpbmRvdygpLmdldFNoZWxsKCksCisvLwkJCQkJCQkJU1dULk9OX1RPUCB8IFNXVC5OT19GT0NVUyB8IFNXVC5UT09MKTsKKy8vCQkJCQkJdGlwLnNldEJhY2tncm91bmQoRGlzcGxheS5nZXREZWZhdWx0KCkuZ2V0U3lzdGVtQ29sb3IoCisvLwkJCQkJCQkJU1dULkNPTE9SX0lORk9fQkFDS0dST1VORCkpOworLy8JCQkJCQlGaWxsTGF5b3V0IGxheW91dCA9IG5ldyBGaWxsTGF5b3V0KCk7CisvLwkJCQkJCWxheW91dC5tYXJnaW5XaWR0aCA9IDI7CisvLwkJCQkJCXRpcC5zZXRMYXlvdXQobGF5b3V0KTsKKy8vCQkJCQkJbGFiZWwgPSBuZXcgTGFiZWwodGlwLCBTV1QuV1JBUCk7CisvLwkJCQkJCWxhYmVsLnNldEZvcmVncm91bmQoRGlzcGxheS5nZXREZWZhdWx0KCkKKy8vCQkJCQkJCQkuZ2V0U3lzdGVtQ29sb3IoU1dULkNPTE9SX0lORk9fRk9SRUdST1VORCkpOworLy8JCQkJCQlsYWJlbC5zZXRCYWNrZ3JvdW5kKERpc3BsYXkuZ2V0RGVmYXVsdCgpCisvLwkJCQkJCQkJLmdldFN5c3RlbUNvbG9yKFNXVC5DT0xPUl9JTkZPX0JBQ0tHUk9VTkQpKTsKKy8vCQkJCQkJbGFiZWwuc2V0RGF0YSgiX1RBQkxFSVRFTSIsIGl0ZW0pOyAvLyROT04tTkxTLTEkCisvLwkJCQkJCWxhYmVsLnNldFRleHQoIE1lc3NhZ2VzLkludGVybmFsTGliSmFyV2FybmluZyk7CisvLwkJCQkJCWxhYmVsLmFkZExpc3RlbmVyKFNXVC5Nb3VzZUV4aXQsIGxhYmVsTGlzdGVuZXIpOworLy8JCQkJCQlsYWJlbC5hZGRMaXN0ZW5lcihTV1QuTW91c2VEb3duLCBsYWJlbExpc3RlbmVyKTsKKy8vCQkJCQkJUG9pbnQgc2l6ZSA9IHRpcC5jb21wdXRlU2l6ZShTV1QuREVGQVVMVCwgU1dULkRFRkFVTFQpOworLy8JCQkJCQlSZWN0YW5nbGUgcmVjdCA9IGl0ZW0uZ2V0Qm91bmRzKDApOworLy8JCQkJCQlQb2ludCBwdCA9IHRhYmxlLnRvRGlzcGxheShyZWN0LngsIHJlY3QueSk7CisvLwkJCQkJCXRpcC5zZXRCb3VuZHMocHQueCwgcHQueSAtIHNpemUueSwgc2l6ZS54LCBzaXplLnkpOworLy8JCQkJCQl0aXAuc2V0VmlzaWJsZSh0cnVlKTsKKy8vCQkJCQl9CisvLwkJCQl9CisvLwkJCQl9CisvLwkJCX0KKy8vCQl9OworLy8JfQorCisvLwlwcm90ZWN0ZWQgYm9vbGVhbiBjYW5FZGl0KE9iamVjdCBkYXRhKSB7CisvLwkJaWYoIGRhdGEgPT0gbnVsbCApIHJldHVybiBmYWxzZTsKKy8vCQlpZiggIShkYXRhIGluc3RhbmNlb2YgVmlydHVhbEFyY2hpdmVDb21wb25lbnQpKSByZXR1cm4gdHJ1ZTsKKy8vCQkKKy8vCQlWaXJ0dWFsQXJjaGl2ZUNvbXBvbmVudCBkMiA9IChWaXJ0dWFsQXJjaGl2ZUNvbXBvbmVudClkYXRhOworLy8JCWJvb2xlYW4gc2FtZVByb2plY3QgPSBkMi5nZXRXb3Jrc3BhY2VSZWxhdGl2ZVBhdGgoKSAhPSBudWxsCisvLwkJCSYmIGQyLmdldFdvcmtzcGFjZVJlbGF0aXZlUGF0aCgpLnNlZ21lbnQoMCkKKy8vCQkJCS5lcXVhbHMocm9vdENvbXBvbmVudC5nZXRQcm9qZWN0KCkuZ2V0TmFtZSgpKTsKKy8vCQlyZXR1cm4gIShzYW1lUHJvamVjdCAmJiBpc1BoeXNpY2FsbHlBZGRlZChkMikpOworLy8JfQorCQorCXByb3RlY3RlZCB2b2lkIGFkZERvdWJsZUNsaWNrTGlzdGVuZXIoKSB7CisJCWF2YWlsYWJsZUNvbXBvbmVudHNWaWV3ZXIuc2V0Q29sdW1uUHJvcGVydGllcyhuZXcgU3RyaW5nW10geyAKKwkJCQlERVBMT1lfUEFUSF9QUk9QRVJUWSwgU09VUkNFX1BST1BFUlRZIH0pOworCQkKKwkJQ2VsbEVkaXRvcltdIGVkaXRvcnMgPSBuZXcgQ2VsbEVkaXRvcltdIHsgCisJCQkJbmV3IFRleHRDZWxsRWRpdG9yKGF2YWlsYWJsZUNvbXBvbmVudHNWaWV3ZXIuZ2V0VGFibGUoKSksCisJCQkJbmV3IFRleHRDZWxsRWRpdG9yKCl9OworCQlhdmFpbGFibGVDb21wb25lbnRzVmlld2VyLnNldENlbGxFZGl0b3JzKGVkaXRvcnMpOworCQlhdmFpbGFibGVDb21wb25lbnRzVmlld2VyCisJCQkJLnNldENlbGxNb2RpZmllcihuZXcgUnVudGltZVBhdGhDZWxsTW9kaWZpZXIoKSk7CisJfQorCisJcHJvdGVjdGVkIHZvaWQgYWRkU2VsZWN0aW9uTGlzdGVuZXIoKSB7CisJCWF2YWlsYWJsZUNvbXBvbmVudHNWaWV3ZXIuYWRkU2VsZWN0aW9uQ2hhbmdlZExpc3RlbmVyKAorCQkJCW5ldyBJU2VsZWN0aW9uQ2hhbmdlZExpc3RlbmVyKCl7CisJCQkJCXB1YmxpYyB2b2lkIHNlbGVjdGlvbkNoYW5nZWQoU2VsZWN0aW9uQ2hhbmdlZEV2ZW50IGV2ZW50KSB7CisJCQkJCQl2aWV3ZXJTZWxlY3Rpb25DaGFuZ2VkKCk7CisJCQkJCX0KKwkJCQl9KTsKKwl9CisJCisJcHJvdGVjdGVkIHZvaWQgdmlld2VyU2VsZWN0aW9uQ2hhbmdlZCgpIHsKKwkJZWRpdFJlZmVyZW5jZUJ1dHRvbi5zZXRFbmFibGVkKGhhc0VkaXRXaXphcmRQYWdlKGdldFNlbGVjdGVkT2JqZWN0KCkpKTsKKwkJcmVtb3ZlQnV0dG9uLnNldEVuYWJsZWQoZ2V0U2VsZWN0ZWRPYmplY3QoKSAhPSBudWxsKTsKKwl9CisJCisJcHJvdGVjdGVkIGJvb2xlYW4gaGFzRWRpdFdpemFyZFBhZ2UoT2JqZWN0IG8pIHsKKwkJaWYoIG8gPT0gbnVsbCB8fCAhKG8gaW5zdGFuY2VvZiBJVmlydHVhbFJlZmVyZW5jZSkpIAorCQkJcmV0dXJuIGZhbHNlOworCQlXaXphcmRGcmFnbWVudCB3ZiA9IE5ld1JlZmVyZW5jZVdpemFyZC5nZXRGaXJzdEVkaXRpbmdGcmFnbWVudCgoSVZpcnR1YWxSZWZlcmVuY2Upbyk7CisJCXJldHVybiB3ZiAhPSBudWxsOworCX0KKworCXByb3RlY3RlZCBPYmplY3QgZ2V0U2VsZWN0ZWRPYmplY3QoKSB7CisJCUlTdHJ1Y3R1cmVkU2VsZWN0aW9uIHNlbCA9IChJU3RydWN0dXJlZFNlbGVjdGlvbilhdmFpbGFibGVDb21wb25lbnRzVmlld2VyLmdldFNlbGVjdGlvbigpOworCQlyZXR1cm4gc2VsLmdldEZpcnN0RWxlbWVudCgpOworCX0KKwkKKwlwcml2YXRlIGNsYXNzIFJ1bnRpbWVQYXRoQ2VsbE1vZGlmaWVyIGltcGxlbWVudHMgSUNlbGxNb2RpZmllciB7CisKKwkJcHVibGljIGJvb2xlYW4gY2FuTW9kaWZ5KE9iamVjdCBlbGVtZW50LCBTdHJpbmcgcHJvcGVydHkpIHsKKwkJCWlmKCBwcm9wZXJ0eS5lcXVhbHMoREVQTE9ZX1BBVEhfUFJPUEVSVFkpKSB7CisJCQkJaWYoIGVsZW1lbnQgaW5zdGFuY2VvZiBJVmlydHVhbFJlZmVyZW5jZSAmJiAhKChJVmlydHVhbFJlZmVyZW5jZSllbGVtZW50KS5pc0Rlcml2ZWQoKSkKKwkJCQkJcmV0dXJuIHRydWU7CisJCQkJaWYoIGVsZW1lbnQgaW5zdGFuY2VvZiBDb21wb25lbnRSZXNvdXJjZVByb3h5ICkKKwkJCQkJcmV0dXJuIHRydWU7IAorCQkJfQorCQkJcmV0dXJuIGZhbHNlOworCQl9CisKKwkJcHVibGljIE9iamVjdCBnZXRWYWx1ZShPYmplY3QgZWxlbWVudCwgU3RyaW5nIHByb3BlcnR5KSB7CisJCQlpZiggZWxlbWVudCBpbnN0YW5jZW9mIElWaXJ0dWFsUmVmZXJlbmNlICkgeworCQkJCXJldHVybiBnZXRTYWZlUnVudGltZVBhdGgoKElWaXJ0dWFsUmVmZXJlbmNlKWVsZW1lbnQpOworCQkJfSBlbHNlIGlmKCBlbGVtZW50IGluc3RhbmNlb2YgQ29tcG9uZW50UmVzb3VyY2VQcm94eSkgeworCQkJCXJldHVybiAoKENvbXBvbmVudFJlc291cmNlUHJveHkpZWxlbWVudCkucnVudGltZVBhdGgudG9TdHJpbmcoKTsKKwkJCX0KKwkJCXJldHVybiBuZXcgUGF0aCgiLyIpOyAvLyROT04tTkxTLTEkCisJCX0KKworCQlwdWJsaWMgdm9pZCBtb2RpZnkoT2JqZWN0IGVsZW1lbnQsIFN0cmluZyBwcm9wZXJ0eSwgT2JqZWN0IHZhbHVlKSB7CisJCQlpZiAocHJvcGVydHkuZXF1YWxzKERFUExPWV9QQVRIX1BST1BFUlRZKSkgeworCQkJCVRhYmxlSXRlbSBpdGVtID0gKFRhYmxlSXRlbSkgZWxlbWVudDsKKwkJCQlUYWJsZUl0ZW1bXSBjb21wb25lbnRzID0gYXZhaWxhYmxlQ29tcG9uZW50c1ZpZXdlci5nZXRUYWJsZSgpLmdldEl0ZW1zKCk7CisJCQkJaW50IHRhYmxlSW5kZXggPSAtMTsKKwkJCQlmb3IoaW50IGk9MDsgaSA8IGNvbXBvbmVudHMubGVuZ3RoOyBpKyspIHsKKwkJCQkJaWYoY29tcG9uZW50c1tpXSA9PSBpdGVtKSB7CisJCQkJCQl0YWJsZUluZGV4ID0gaTsKKwkJCQkJCWJyZWFrOworCQkJCQl9CisJCQkJfQorCQkJCWlmKCBpdGVtLmdldERhdGEoKSBpbnN0YW5jZW9mIElWaXJ0dWFsUmVmZXJlbmNlKSB7CisJCQkJCXNldFJ1bnRpbWVQYXRoU2FmZSgoSVZpcnR1YWxSZWZlcmVuY2UpaXRlbS5nZXREYXRhKCksIChTdHJpbmcpIHZhbHVlKTsKKwkJCQkJaWYodGFibGVJbmRleCA+PSAwKQorCQkJCQkJY29tcG9uZW50c1t0YWJsZUluZGV4XS5zZXRUZXh0KChTdHJpbmcpdmFsdWUpOworCQkJCX0gZWxzZSBpZiggaXRlbS5nZXREYXRhKCkgaW5zdGFuY2VvZiBDb21wb25lbnRSZXNvdXJjZVByb3h5KSB7CisJCQkJCUNvbXBvbmVudFJlc291cmNlUHJveHkgYyA9ICgoQ29tcG9uZW50UmVzb3VyY2VQcm94eSlpdGVtLmdldERhdGEoKSk7CisJCQkJCWMucnVudGltZVBhdGggPSBuZXcgUGF0aCgoU3RyaW5nKXZhbHVlKTsKKwkJCQkJcmVzb3VyY2VNYXBwaW5nc0NoYW5nZWQgPSB0cnVlOworCQkJCQlpZih0YWJsZUluZGV4ID49IDApCisJCQkJCQljb21wb25lbnRzW3RhYmxlSW5kZXhdLnNldFRleHQoKFN0cmluZyl2YWx1ZSk7CisJCQkJfQorCQkJCXZlcmlmeSgpOworCQkJfQorCQl9CisKKwl9CisKKwlwdWJsaWMgdm9pZCBoYW5kbGVFdmVudChFdmVudCBldmVudCkgeworCQlpZiggZXZlbnQud2lkZ2V0ID09IGFkZFJlZmVyZW5jZUJ1dHRvbikgCisJCQloYW5kbGVBZGRSZWZlcmVuY2VCdXR0b24oKTsKKwkJZWxzZSBpZiggZXZlbnQud2lkZ2V0ID09IGVkaXRSZWZlcmVuY2VCdXR0b24pIAorCQkJaGFuZGxlRWRpdFJlZmVyZW5jZUJ1dHRvbigpOworCQllbHNlIGlmKCBldmVudC53aWRnZXQgPT0gcmVtb3ZlQnV0dG9uICkgCisJCQloYW5kbGVSZW1vdmVTZWxlY3RlZEJ1dHRvbigpOworCX0KKwkKKwlwcm90ZWN0ZWQgdm9pZCBoYW5kbGVBZGRSZWZlcmVuY2VCdXR0b24oKSB7CisJCXNob3dSZWZlcmVuY2VXaXphcmQoZmFsc2UpOworCX0KKwkKKwlwcm90ZWN0ZWQgdm9pZCBoYW5kbGVFZGl0UmVmZXJlbmNlQnV0dG9uKCkgeworCQlzaG93UmVmZXJlbmNlV2l6YXJkKHRydWUpOworCX0KKwkKKwlwcm90ZWN0ZWQgUmVmZXJlbmNlRXh0ZW5zaW9uW10gZmlsdGVyUmVmZXJlbmNlVHlwZXMoUmVmZXJlbmNlRXh0ZW5zaW9uW10gZGVmYXVsdHMpIHsKKwkJcmV0dXJuIGRlZmF1bHRzOworCX0KKwkKKwlwcm90ZWN0ZWQgdm9pZCBzaG93UmVmZXJlbmNlV2l6YXJkKGJvb2xlYW4gZWRpdGluZykgeworCQlSZWZlcmVuY2VFeHRlbnNpb25bXSBleHRlbnNpb25zID0gCisJCQlEZXBlbmRlbmN5UGFnZUV4dGVuc2lvbk1hbmFnZXIuZ2V0TWFuYWdlcigpLmdldEV4cG9zZWRSZWZlcmVuY2VFeHRlbnNpb25zKCk7CisJCWV4dGVuc2lvbnMgPSBmaWx0ZXJSZWZlcmVuY2VUeXBlcyhleHRlbnNpb25zKTsKKwkJTmV3UmVmZXJlbmNlV2l6YXJkIHdpemFyZCA9IG5ldyBOZXdSZWZlcmVuY2VXaXphcmQoZXh0ZW5zaW9ucyk7CisJCS8vIGZpbGwgdGhlIHRhc2sgbW9kZWwKKwkJd2l6YXJkLmdldFRhc2tNb2RlbCgpLnB1dE9iamVjdChJUmVmZXJlbmNlV2l6YXJkQ29uc3RhbnRzLlBST0pFQ1QsIHByb2plY3QpOworCQl3aXphcmQuZ2V0VGFza01vZGVsKCkucHV0T2JqZWN0KElSZWZlcmVuY2VXaXphcmRDb25zdGFudHMuUk9PVF9DT01QT05FTlQsIHJvb3RDb21wb25lbnQpOworCQl3aXphcmQuZ2V0VGFza01vZGVsKCkucHV0T2JqZWN0KElSZWZlcmVuY2VXaXphcmRDb25zdGFudHMuTU9EVUxFSEFORExFUiwgZ2V0TW9kdWxlSGFuZGxlcigpKTsKKwkJd2l6YXJkLmdldFRhc2tNb2RlbCgpLnB1dE9iamVjdChJUmVmZXJlbmNlV2l6YXJkQ29uc3RhbnRzLkNVUlJFTlRfUkVGUywgY3VycmVudFJlZmVyZW5jZXMpOworCQlzZXRDdXN0b21SZWZlcmVuY2VXaXphcmRQcm9wZXJ0aWVzKHdpemFyZC5nZXRUYXNrTW9kZWwoKSk7CisKKwkJSVZpcnR1YWxSZWZlcmVuY2Ugc2VsZWN0ZWQgPSBudWxsOworCQlpZiggZWRpdGluZyApIHsKKwkJCU9iamVjdCBvID0gKChJU3RydWN0dXJlZFNlbGVjdGlvbilhdmFpbGFibGVDb21wb25lbnRzVmlld2VyLmdldFNlbGVjdGlvbigpKS5nZXRGaXJzdEVsZW1lbnQoKTsKKwkJCWlmKCBvIGluc3RhbmNlb2YgSVZpcnR1YWxSZWZlcmVuY2UgKSB7CisJCQkJc2VsZWN0ZWQgPSAoSVZpcnR1YWxSZWZlcmVuY2UpbzsKKwkJCQl3aXphcmQuZ2V0VGFza01vZGVsKCkucHV0T2JqZWN0KElSZWZlcmVuY2VXaXphcmRDb25zdGFudHMuT1JJR0lOQUxfUkVGRVJFTkNFLCBzZWxlY3RlZCk7CisJCQl9IAorCQl9CisJCQorCQlXaXphcmREaWFsb2cgd2QgPSBuZXcgV2l6YXJkRGlhbG9nKGFkZFJlZmVyZW5jZUJ1dHRvbi5nZXRTaGVsbCgpLCB3aXphcmQpOworCQlpZiggd2Qub3BlbigpICE9IFdpbmRvdy5DQU5DRUwpIHsKKwkJCWlmKCBlZGl0aW5nICYmIHNlbGVjdGVkICE9IG51bGwpIHsKKwkJCQkvLyByZW1vdmUgb2xkCisJCQkJY3VycmVudFJlZmVyZW5jZXMucmVtb3ZlKHNlbGVjdGVkKTsKKwkJCX0KKwkJCQorCQkJaWYoIHdpemFyZC5nZXRUYXNrTW9kZWwoKS5nZXRPYmplY3QoSVJlZmVyZW5jZVdpemFyZENvbnN0YW50cy5GT0xERVJfTUFQUElORykgIT0gbnVsbCApCisJCQkJaGFuZGxlQWRkRm9sZGVyTWFwcGluZyh3aXphcmQpOworCQkJZWxzZQorCQkJCWhhbmRsZUFkZE5ld1JlZmVyZW5jZSh3aXphcmQpOworCQkJcmVmcmVzaCgpOworCQl9CisJfQorCQorCS8qCisJICogQ2xpZW50cyBjYW4gb3ZlcnJpZGUgdGhpcyB0byBzZXQgY3VzdG9tIHByb3BlcnRpZXMKKwkgKi8KKwlwcm90ZWN0ZWQgdm9pZCBzZXRDdXN0b21SZWZlcmVuY2VXaXphcmRQcm9wZXJ0aWVzKFRhc2tNb2RlbCBtb2RlbCkgeworCQkvLyBkbyBub3RoaW5nCisJfQorCQorCXByb3RlY3RlZCB2b2lkIGhhbmRsZUFkZEZvbGRlck1hcHBpbmcoVGFza1dpemFyZCB3aXphcmQpIHsKKwkJT2JqZWN0IG8gPSB3aXphcmQuZ2V0VGFza01vZGVsKCkuZ2V0T2JqZWN0KElSZWZlcmVuY2VXaXphcmRDb25zdGFudHMuRk9MREVSX01BUFBJTkcpOworCQlpZiggbyAhPSBudWxsICYmIG8gaW5zdGFuY2VvZiBDb21wb25lbnRSZXNvdXJjZVByb3h5ICkgeworCQkJQ29tcG9uZW50UmVzb3VyY2VQcm94eSBwcm94eSA9IChDb21wb25lbnRSZXNvdXJjZVByb3h5KW87CisJCQlyZXNvdXJjZU1hcHBpbmdzLmFkZChwcm94eSk7CisJCQlyZXNvdXJjZU1hcHBpbmdzQ2hhbmdlZCA9IHRydWU7CisJCX0KKwl9CisJCisJcHJvdGVjdGVkIHZvaWQgaGFuZGxlQWRkTmV3UmVmZXJlbmNlKFRhc2tXaXphcmQgd2l6YXJkKSB7CisJCU9iamVjdCBjMSA9IHdpemFyZC5nZXRUYXNrTW9kZWwoKS5nZXRPYmplY3QoSVJlZmVyZW5jZVdpemFyZENvbnN0YW50cy5GSU5BTF9SRUZFUkVOQ0UpOworCQlpZihjMSAhPSBudWxsKSB7CisJCQlJVmlydHVhbFJlZmVyZW5jZVtdIHJlZmVyZW5jZUFycmF5ID0gYzEgaW5zdGFuY2VvZiBJVmlydHVhbFJlZmVyZW5jZSA/IAorCQkJCQluZXcgSVZpcnR1YWxSZWZlcmVuY2VbXSB7IChJVmlydHVhbFJlZmVyZW5jZSljMSB9IDogCisJCQkJCQkoSVZpcnR1YWxSZWZlcmVuY2VbXSljMTsKKwkJCWN1cnJlbnRSZWZlcmVuY2VzLmFkZEFsbChBcnJheXMuYXNMaXN0KHJlZmVyZW5jZUFycmF5KSk7CisJCX0KKwl9CisJCisJLyoqCisJICogU3ViY2xhc3NlcyBhcmUgZW5jb3VyYWdlZCB0byBvdmVycmlkZSB0aGlzIG1ldGhvZCBpZiAKKwkgKiB0aGV5IGhhdmUgc29tZSBzcGVjaWZpYyBwbGFjZSAod2ViaW5mL2xpYiBldGMpIHdoZXJlIGNlcnRhaW4KKwkgKiB0eXBlcyBvZiByZWZlcmVuY2VzIHNob3VsZCBkZWZhdWx0IHRvLiAKKwkgKiAKKwkgKiBJZiB0aGUgc3ViY2xhc3MgZG9lcyBub3QgdW5kZXJzdGFuZCBvciBrbm93IGFib3V0IHRoZSAKKwkgKiB0aGlzIGNvbXBvbmVudCB0eXBlLCBvciBpZiBpdCBoYXMgbm8gY3VzdG9taXphdGlvbnMgdG8gcGVyZm9ybSwKKwkgKiBpdCBzaG91bGQgcmV0dXJuIHRoZSBwcm92aWRlZCB3aXphcmRQYXRoIHVuY2hhbmdlZAorCSAqIAorCSAqIEBwYXJhbSBhZGRlZENvbXAgVGhlIGNvbXBvbmVudCBiZWluZyBhZGRlZCBhcyBhIHJlZmVyZW5jZQorCSAqIEBwYXJhbSBhZGRlZFBhdGggVGhlIHBhdGggdGhhdCB0aGUgd2l6YXJkIHN1Z2dlc3RzIGFzIHRoZSBwYXRoCisJICogQHJldHVybiBUaGUgcnVudGltZSBwYXRoIHRoYXQgc2hvdWxkIGJlIGFkZGVkIHRvIHRoZSBwcm9wZXJ0aWVzIHBhZ2UKKwkgKi8KKwlwcm90ZWN0ZWQgU3RyaW5nIGdldFJ1bnRpbWVQYXRoKElWaXJ0dWFsQ29tcG9uZW50IGFkZGVkQ29tcCwgU3RyaW5nIHdpemFyZFBhdGgpIHsKKwkJcmV0dXJuIHdpemFyZFBhdGg7CisJfQorCQorCXByb3RlY3RlZCB2b2lkIGhhbmRsZVJlbW92ZVNlbGVjdGVkQnV0dG9uKCkgeworCQlJU2VsZWN0aW9uIHNlbCA9IGF2YWlsYWJsZUNvbXBvbmVudHNWaWV3ZXIuZ2V0U2VsZWN0aW9uKCk7CisJCWlmKCBzZWwgaW5zdGFuY2VvZiBJU3RydWN0dXJlZFNlbGVjdGlvbiApIHsKKwkJCUlTdHJ1Y3R1cmVkU2VsZWN0aW9uIHNlbDIgPSAoSVN0cnVjdHVyZWRTZWxlY3Rpb24pc2VsOworCQkJT2JqZWN0W10gc2VsZWN0ZWRTdHVmZiA9IHNlbDIudG9BcnJheSgpOworCQkJZm9yKCBpbnQgaSA9IDA7IGkgPCBzZWxlY3RlZFN0dWZmLmxlbmd0aDsgaSsrKSB7CisJCQkJT2JqZWN0IG8gPSBzZWxlY3RlZFN0dWZmW2ldOworCQkJCWlmKCBvIGluc3RhbmNlb2YgSVZpcnR1YWxSZWZlcmVuY2UpCisJCQkJCWN1cnJlbnRSZWZlcmVuY2VzLnJlbW92ZShvKTsKKwkJCQllbHNlIGlmKCBvIGluc3RhbmNlb2YgQ29tcG9uZW50UmVzb3VyY2VQcm94eSkgeworCQkJCQlyZXNvdXJjZU1hcHBpbmdzLnJlbW92ZShvKTsKKwkJCQkJcmVzb3VyY2VNYXBwaW5nc0NoYW5nZWQgPSB0cnVlOworCQkJCX0KKwkJCX0KKwkJCXJlZnJlc2goKTsKKwkJfQorCX0KKworCXB1YmxpYyBUYWJsZVZpZXdlciBjcmVhdGVBdmFpbGFibGVDb21wb25lbnRzVmlld2VyKENvbXBvc2l0ZSBwYXJlbnQpIHsKKwkJaW50IGZsYWdzID0gU1dULkJPUkRFUiB8IFNXVC5GVUxMX1NFTEVDVElPTiB8IFNXVC5NVUxUSTsKKworCQlUYWJsZSB0YWJsZSA9IG5ldyBUYWJsZShwYXJlbnQsIGZsYWdzKTsKKwkJVGFibGVWaWV3ZXIgdGVtcFZpZXdlciA9IG5ldyBUYWJsZVZpZXdlcih0YWJsZSk7CisKKwkJLy8gc2V0IHVwIHRhYmxlIGxheW91dAorCQlUYWJsZUxheW91dCB0YWJsZUxheW91dCA9IG5ldyBvcmcuZWNsaXBzZS5qZmFjZS52aWV3ZXJzLlRhYmxlTGF5b3V0KCk7CisJCXRhYmxlTGF5b3V0LmFkZENvbHVtbkRhdGEobmV3IENvbHVtbldlaWdodERhdGEoNDAwLCB0cnVlKSk7CisJCXRhYmxlTGF5b3V0LmFkZENvbHVtbkRhdGEobmV3IENvbHVtbldlaWdodERhdGEoNTAwLCB0cnVlKSk7CisJCXRhYmxlLnNldExheW91dCh0YWJsZUxheW91dCk7CisJCXRhYmxlLnNldEhlYWRlclZpc2libGUodHJ1ZSk7CisJCXRhYmxlLnNldExpbmVzVmlzaWJsZSh0cnVlKTsKKwkJdGVtcFZpZXdlci5zZXRTb3J0ZXIobnVsbCk7CisKKwkJVGFibGVDb2x1bW4gYm5kQ29sdW1uID0gbmV3IFRhYmxlQ29sdW1uKHRhYmxlLCBTV1QuTk9ORSwgMCk7CisJCWJuZENvbHVtbi5zZXRUZXh0KE1lc3NhZ2VzLkRlcGxveVBhdGhDb2x1bW4pOworCQlibmRDb2x1bW4uc2V0UmVzaXphYmxlKHRydWUpOworCisJCVRhYmxlQ29sdW1uIHByb2plY3RDb2x1bW4gPSBuZXcgVGFibGVDb2x1bW4odGFibGUsIFNXVC5OT05FLCAxKTsKKwkJcHJvamVjdENvbHVtbi5zZXRUZXh0KE1lc3NhZ2VzLlNvdXJjZUNvbHVtbik7CisJCXByb2plY3RDb2x1bW4uc2V0UmVzaXphYmxlKHRydWUpOworCisJCXRhYmxlTGF5b3V0LmxheW91dCh0YWJsZSwgdHJ1ZSk7CisJCXJldHVybiB0ZW1wVmlld2VyOworCisJfQorCisJLyoqCisJICogVGhpcyBzaG91bGQgb25seSBiZSBjYWxsZWQgb24gY2hhbmdlcywgc3VjaCBhcyBhZGRpbmcgYSBwcm9qZWN0CisJICogcmVmZXJlbmNlLCBhZGRpbmcgYSBsaWIgcmVmZXJlbmNlIGV0Yy4KKwkgKiAKKwkgKiBJdCB3aWxsIHJlc2V0IHRoZSBpbnB1dCwgbWFudWFsbHkgcmUtYWRkIG1pc3NpbmcgZWxlbWVudHMsIGFuZCBkbyBvdGhlcgorCSAqIHRhc2tzCisJICovCisJcHVibGljIHZvaWQgcmVmcmVzaCgpIHsKKwkJcmVzZXRUYWJsZVVJKCk7CisJCWlmICghaGFzSW5pdGlhbGl6ZWQpIHsKKwkJCWluaXRpYWxpemUoKTsKKwkJCXJlc2V0VGFibGVVSSgpOworCQl9CisJCXZlcmlmeSgpOworCisJfQorCisJcHJvdGVjdGVkIHZvaWQgdmVyaWZ5KCkgeworCQkKKwkJSVN0YXR1cyBzdGF0dXMgPSBEZXBsb3ltZW50QXNzZW1ibHlWZXJpZmllckhlbHBlci52ZXJpZnkocm9vdENvbXBvbmVudCwgcnVudGltZSwgY3VycmVudFJlZmVyZW5jZXMsIHJlc291cmNlTWFwcGluZ3MscmVzb3VyY2VNYXBwaW5nc0NoYW5nZWQpOworCQkvLyBDbGVhciB0aGUgbWVzc2FnZXMKKwkJcHJvcFBhZ2Uuc2V0RXJyb3JNZXNzYWdlKG51bGwpOworCQlwcm9wUGFnZS5zZXRNZXNzYWdlKG51bGwpOworCQlpZiAoc3RhdHVzLmlzTXVsdGlTdGF0dXMoKSkgeworCQkJTXVsdGlTdGF0dXMgbXVsdGkgPSAoTXVsdGlTdGF0dXMpc3RhdHVzOworCQkJaWYgKCFtdWx0aS5pc09LKCkpIHsKKwkJCQlwcm9wUGFnZS5zZXRNZXNzYWdlKGdldE1lc3NhZ2UobXVsdGkpLCBtdWx0aS5nZXRTZXZlcml0eSgpKTsKKwkJCQlpZiAobXVsdGkuZ2V0U2V2ZXJpdHkoKSA9PSBJU3RhdHVzLkVSUk9SKSB7CisJCQkJCXByb3BQYWdlLnNldEVycm9yTWVzc2FnZShnZXRNZXNzYWdlKG11bHRpKSk7CisJCQkJCXByb3BQYWdlLnNldFZhbGlkKGZhbHNlKTsKKwkJCQl9CisJCQkJZWxzZSAKKwkJCQkJcHJvcFBhZ2Uuc2V0VmFsaWQodHJ1ZSk7CisJCQl9IGVsc2UgcHJvcFBhZ2Uuc2V0VmFsaWQodHJ1ZSk7CisJCX0gZWxzZSBpZiAoc3RhdHVzLmlzT0soKSkgcHJvcFBhZ2Uuc2V0VmFsaWQodHJ1ZSk7CisJCXByb3BQYWdlLmdldENvbnRhaW5lcigpLnVwZGF0ZU1lc3NhZ2UoKTsKKwl9CisKKwlwcml2YXRlIFN0cmluZyBnZXRNZXNzYWdlKE11bHRpU3RhdHVzIG11bHRpKSB7CisJCS8vQXBwZW5kIE1lc3NhZ2VzCisJCVN0cmluZ0J1ZmZlciBtZXNzYWdlID0gbmV3IFN0cmluZ0J1ZmZlcigpOworCQkKKwkJZm9yIChpbnQgaSA9IDA7IGkgPCBtdWx0aS5nZXRDaGlsZHJlbigpLmxlbmd0aDsgaSsrKSB7CisJCQlJU3RhdHVzIHN0YXR1cyA9IG11bHRpLmdldENoaWxkcmVuKClbaV07CisJCQlpZiAoIXN0YXR1cy5pc09LKCkgJiYgc3RhdHVzLmdldE1lc3NhZ2UoKSAhPSBudWxsKSB7CisJCQkJbWVzc2FnZS5hcHBlbmQoc3RhdHVzLmdldE1lc3NhZ2UoKSk7CisJCQkJbWVzc2FnZS5hcHBlbmQoIiAiKTsgLy8kTk9OLU5MUy0xJAorCQkJfQorCQl9CisJCXJldHVybiBtZXNzYWdlLnRvU3RyaW5nKCk7CisJfQorCisJcHJvdGVjdGVkIHZvaWQgcmVzZXRUYWJsZVVJKCkgeworCQlJV29ya3NwYWNlUm9vdCBpbnB1dCA9IFJlc291cmNlc1BsdWdpbi5nZXRXb3Jrc3BhY2UoKS5nZXRSb290KCk7CisJCWF2YWlsYWJsZUNvbXBvbmVudHNWaWV3ZXIuc2V0SW5wdXQoaW5wdXQpOworCQlHcmlkRGF0YSBkYXRhID0gbmV3IEdyaWREYXRhKEdyaWREYXRhLkZJTExfQk9USCk7CisJCWludCBudW1saW5lcyA9IE1hdGgubWluKDEwLCBhdmFpbGFibGVDb21wb25lbnRzVmlld2VyLmdldFRhYmxlKCkKKwkJCQkuZ2V0SXRlbUNvdW50KCkpOworCQlkYXRhLmhlaWdodEhpbnQgPSBhdmFpbGFibGVDb21wb25lbnRzVmlld2VyLmdldFRhYmxlKCkuZ2V0SXRlbUhlaWdodCgpCisJCQkJKiBudW1saW5lczsKKwkJYXZhaWxhYmxlQ29tcG9uZW50c1ZpZXdlci5nZXRUYWJsZSgpLnNldExheW91dERhdGEoZGF0YSk7CisJCUdyaWREYXRhIGJ0bmRhdGEgPSBuZXcgR3JpZERhdGEoR3JpZERhdGEuSE9SSVpPTlRBTF9BTElHTl9GSUxMCisJCQkJfCBHcmlkRGF0YS5WRVJUSUNBTF9BTElHTl9CRUdJTk5JTkcpOworCQlidXR0b25Db2x1bW4uc2V0TGF5b3V0RGF0YShidG5kYXRhKTsKKwl9CisKKwlwcm90ZWN0ZWQgdm9pZCBpbml0aWFsaXplKCkgeworCQlNYXA8U3RyaW5nLCBPYmplY3Q+IG9wdGlvbnMgPSBuZXcgSGFzaE1hcDxTdHJpbmcsIE9iamVjdD4oKTsKKwkJb3B0aW9ucy5wdXQoSVZpcnR1YWxDb21wb25lbnQuUkVRVUVTVEVEX1JFRkVSRU5DRV9UWVBFLCBJVmlydHVhbENvbXBvbmVudC5ESVNQTEFZQUJMRV9SRUZFUkVOQ0VTKTsKKwkJSVZpcnR1YWxSZWZlcmVuY2VbXSByZWZzID0gcm9vdENvbXBvbmVudC5nZXRSZWZlcmVuY2VzKG9wdGlvbnMpOworCQlJVmlydHVhbENvbXBvbmVudCBjb21wOworCQlvcmlnaW5hbFJlZmVyZW5jZXMuYWRkQWxsKEFycmF5cy5hc0xpc3QocmVmcykpOworCQljdXJyZW50UmVmZXJlbmNlcy5hZGRBbGwoQXJyYXlzLmFzTGlzdChjbG9uZVJlZmVyZW5jZXMocmVmcykpKTsKKworCQlDb21wb25lbnRSZXNvdXJjZVtdIGFsbE1hcHBpbmdzID0gZmluZEFsbE1hcHBpbmdzKCk7CisJCWZvciggaW50IGkgPSAwOyBpIDwgYWxsTWFwcGluZ3MubGVuZ3RoOyBpKysgKSB7CisJCQlyZXNvdXJjZU1hcHBpbmdzLmFkZChuZXcgQ29tcG9uZW50UmVzb3VyY2VQcm94eSgKKwkJCQkJYWxsTWFwcGluZ3NbaV0uZ2V0U291cmNlUGF0aCgpLCBhbGxNYXBwaW5nc1tpXS5nZXRSdW50aW1lUGF0aCgpCisJCQkpKTsKKwkJfQorCQlpZihlZGl0UmVmZXJlbmNlQnV0dG9uICE9IG51bGwpCisJCQllZGl0UmVmZXJlbmNlQnV0dG9uLnNldEVuYWJsZWQoZmFsc2UpOworCQlpZihyZW1vdmVCdXR0b24gIT0gbnVsbCkKKwkJCXJlbW92ZUJ1dHRvbi5zZXRFbmFibGVkKGZhbHNlKTsKKwkJaGFzSW5pdGlhbGl6ZWQgPSB0cnVlOworCX0KKworCXByaXZhdGUgSVJ1bnRpbWUgZ2V0U2VydmVyUnVudGltZShJUHJvamVjdCBwcm9qZWN0MikgdGhyb3dzIENvcmVFeGNlcHRpb24geworCQlpZiAocHJvamVjdCA9PSBudWxsKQorCQkJcmV0dXJuIG51bGw7CisJCUlGYWNldGVkUHJvamVjdCBmYWNldGVkUHJvamVjdCA9IFByb2plY3RGYWNldHNNYW5hZ2VyLmNyZWF0ZShwcm9qZWN0KTsKKwkJaWYgKGZhY2V0ZWRQcm9qZWN0ID09IG51bGwpCisJCQlyZXR1cm4gbnVsbDsKKwkJb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5wcm9qZWN0LmZhY2V0LmNvcmUucnVudGltZS5JUnVudGltZSBydW50aW1lID0gZmFjZXRlZFByb2plY3QuZ2V0UnVudGltZSgpOworCQlpZiAocnVudGltZSA9PSBudWxsKQorCQkJcmV0dXJuIG51bGw7CisJCXJldHVybiBGYWNldFV0aWwuZ2V0UnVudGltZShydW50aW1lKTsKKwl9CisKKwlwcm90ZWN0ZWQgSVZpcnR1YWxSZWZlcmVuY2VbXSBjbG9uZVJlZmVyZW5jZXMoSVZpcnR1YWxSZWZlcmVuY2VbXSByZWZzKSB7CisJCUlWaXJ0dWFsUmVmZXJlbmNlW10gcmVzdWx0ID0gbmV3IElWaXJ0dWFsUmVmZXJlbmNlW3JlZnMubGVuZ3RoXTsKKwkJVmlydHVhbFJlZmVyZW5jZSB0ZW1wOworCQlmb3IoIGludCBpID0gMDsgaSA8IHJlc3VsdC5sZW5ndGg7IGkrKyApIHsKKwkJCXRlbXAgPSBuZXcgVmlydHVhbFJlZmVyZW5jZShyZWZzW2ldLmdldEVuY2xvc2luZ0NvbXBvbmVudCgpLCByZWZzW2ldLmdldFJlZmVyZW5jZWRDb21wb25lbnQoKSk7CisJCQl0ZW1wLnNldERlcGVuZGVuY3lUeXBlKHJlZnNbaV0uZ2V0RGVwZW5kZW5jeVR5cGUoKSk7CisJCQl0ZW1wLnNldERlcml2ZWQocmVmc1tpXS5pc0Rlcml2ZWQoKSk7CisJCQl0ZW1wLnNldEFyY2hpdmVOYW1lKHJlZnNbaV0uZ2V0QXJjaGl2ZU5hbWUoKSk7CisJCQl0ZW1wLnNldFJ1bnRpbWVQYXRoKHJlZnNbaV0uZ2V0UnVudGltZVBhdGgoKSk7CisJCQlyZXN1bHRbaV0gPSB0ZW1wOworCQl9CisJCXJldHVybiByZXN1bHQ7CisJfQorCQorCXByb3RlY3RlZCBDb21wb25lbnRSZXNvdXJjZVtdIGZpbmRBbGxNYXBwaW5ncygpIHsKKwkJU3RydWN0dXJlRWRpdCBzdHJ1Y3R1cmVFZGl0ID0gbnVsbDsKKwkJdHJ5IHsKKwkJCXN0cnVjdHVyZUVkaXQgPSBTdHJ1Y3R1cmVFZGl0LmdldFN0cnVjdHVyZUVkaXRGb3JSZWFkKHByb2plY3QpOworCQkJV29ya2JlbmNoQ29tcG9uZW50IGNvbXBvbmVudCA9IHN0cnVjdHVyZUVkaXQuZ2V0Q29tcG9uZW50KCk7CisJCQlPYmplY3RbXSBhcnIgPSBjb21wb25lbnQuZ2V0UmVzb3VyY2VzKCkudG9BcnJheSgpOworCQkJQ29tcG9uZW50UmVzb3VyY2VbXSByZXN1bHQgPSBuZXcgQ29tcG9uZW50UmVzb3VyY2VbYXJyLmxlbmd0aF07CisJCQlmb3IoIGludCBpID0gMDsgaSA8IGFyci5sZW5ndGg7IGkrKyApCisJCQkJcmVzdWx0W2ldID0gKENvbXBvbmVudFJlc291cmNlKWFycltpXTsKKwkJCXJldHVybiByZXN1bHQ7CisJCX0gY2F0Y2goRXhjZXB0aW9uIGUpIHsKKwkJfSBmaW5hbGx5IHsKKwkJCXN0cnVjdHVyZUVkaXQuZGlzcG9zZSgpOworCQl9CisJCXJldHVybiBuZXcgQ29tcG9uZW50UmVzb3VyY2VbXXt9OworCX0KKwkKKwlwdWJsaWMgc3RhdGljIGNsYXNzIENvbXBvbmVudFJlc291cmNlUHJveHkgeworCQlwdWJsaWMgSVBhdGggc291cmNlLCBydW50aW1lUGF0aDsKKwkJcHVibGljIENvbXBvbmVudFJlc291cmNlUHJveHkoSVBhdGggc291cmNlLCBJUGF0aCBydW50aW1lUGF0aCkgeworCQkJdGhpcy5zb3VyY2UgPSBzb3VyY2U7CisJCQl0aGlzLnJ1bnRpbWVQYXRoID0gcnVudGltZVBhdGg7CisJCX0KKwl9CisJCisJLyoKKwkgKiBDbGVhbi11cCBtZXRob2RzIGFyZSBiZWxvdy4gVGhlc2UgaW5jbHVkZSBwZXJmb3JtQ2FuY2VsLCBwZXJmb3JtRGVmYXVsdHMsCisJICogcGVyZm9ybU9LLCBhbmQgYW55IG90aGVyIG1ldGhvZHMgdGhhdCBhcmUgY2FsbGVkICpvbmx5KiBieSB0aGlzIG9uZS4KKwkgKi8KKwlwdWJsaWMgdm9pZCBzZXRWaXNpYmxlKGJvb2xlYW4gdmlzaWJsZSkgeworCX0KKworCXB1YmxpYyB2b2lkIHBlcmZvcm1EZWZhdWx0cygpIHsKKwkJY3VycmVudFJlZmVyZW5jZXMuY2xlYXIoKTsKKwkJSVZpcnR1YWxSZWZlcmVuY2VbXSBjdXJyZW50VG1wID0KKwkJCW9yaWdpbmFsUmVmZXJlbmNlcy50b0FycmF5KG5ldyBJVmlydHVhbFJlZmVyZW5jZVtvcmlnaW5hbFJlZmVyZW5jZXMuc2l6ZSgpXSk7IAorCQljdXJyZW50UmVmZXJlbmNlcy5hZGRBbGwoQXJyYXlzLmFzTGlzdChjbG9uZVJlZmVyZW5jZXMoY3VycmVudFRtcCkpKTsKKwkJcmVzb3VyY2VNYXBwaW5ncy5jbGVhcigpOworCQlDb21wb25lbnRSZXNvdXJjZVtdIGFsbE1hcHBpbmdzID0gZmluZEFsbE1hcHBpbmdzKCk7CisJCWZvciggaW50IGkgPSAwOyBpIDwgYWxsTWFwcGluZ3MubGVuZ3RoOyBpKysgKSB7CisJCQlyZXNvdXJjZU1hcHBpbmdzLmFkZChuZXcgQ29tcG9uZW50UmVzb3VyY2VQcm94eSgKKwkJCQkJYWxsTWFwcGluZ3NbaV0uZ2V0U291cmNlUGF0aCgpLCBhbGxNYXBwaW5nc1tpXS5nZXRSdW50aW1lUGF0aCgpCisJCQkpKTsKKwkJfQorCQlyZWZyZXNoKCk7CisJfQorCisJcHVibGljIGJvb2xlYW4gcGVyZm9ybUNhbmNlbCgpIHsKKwkJcmV0dXJuIHRydWU7CisJfQorCisJcHVibGljIHZvaWQgZGlzcG9zZSgpIHsKKwkJVGFibGUgdGFibGUgPSBudWxsOworCQlpZiAoYXZhaWxhYmxlQ29tcG9uZW50c1ZpZXdlciAhPSBudWxsKSB7CisJCQl0YWJsZSA9IGF2YWlsYWJsZUNvbXBvbmVudHNWaWV3ZXIuZ2V0VGFibGUoKTsKKwkJfQorLy8JCWlmICh0YWJsZSA9PSBudWxsIHx8IHRhYmxlTGlzdGVuZXIgPT0gbnVsbCkKKy8vCQkJcmV0dXJuOyAKKy8vCQl0YWJsZS5yZW1vdmVMaXN0ZW5lcihTV1QuRGlzcG9zZSwgdGFibGVMaXN0ZW5lcik7CisvLwkJdGFibGUucmVtb3ZlTGlzdGVuZXIoU1dULktleURvd24sIHRhYmxlTGlzdGVuZXIpOworLy8JCXRhYmxlLnJlbW92ZUxpc3RlbmVyKFNXVC5Nb3VzZU1vdmUsIHRhYmxlTGlzdGVuZXIpOworLy8JCXRhYmxlLnJlbW92ZUxpc3RlbmVyKFNXVC5Nb3VzZUhvdmVyLCB0YWJsZUxpc3RlbmVyKTsKKwl9CisKKwkKKwkKKwkvKgorCSAqIFRoaXMgaXMgd2hlcmUgdGhlIE9LIHdvcmsgZ29lcy4gTG90cyBvZiBpdC4gV2F0Y2ggeW91ciBoZWFkLgorCSAqIHhpYW8geGluCisJICovCisJcHJvdGVjdGVkIGJvb2xlYW4gcHJlSGFuZGxlQ2hhbmdlcyhJUHJvZ3Jlc3NNb25pdG9yIG1vbml0b3IpIHsKKwkJcmV0dXJuIHRydWU7CisJfQorCisJcHJvdGVjdGVkIGJvb2xlYW4gcG9zdEhhbmRsZUNoYW5nZXMoSVByb2dyZXNzTW9uaXRvciBtb25pdG9yKSB7CisJCXJldHVybiB0cnVlOworCX0KKworCXB1YmxpYyBib29sZWFuIHBlcmZvcm1PaygpIHsKKwkJYm9vbGVhbiByZXN1bHQgPSB0cnVlOworCQlyZXN1bHQgJj0gc2F2ZVJlc291cmNlQ2hhbmdlcygpOworCQlyZXN1bHQgJj0gc2F2ZVJlZmVyZW5jZUNoYW5nZXMoKTsKKwkJcmV0dXJuIHJlc3VsdDsKKwl9CisJCisJcHJvdGVjdGVkIGJvb2xlYW4gc2F2ZVJlc291cmNlQ2hhbmdlcygpIHsKKwkJaWYoIHJlc291cmNlTWFwcGluZ3NDaGFuZ2VkICkgeworCQkJcmVtb3ZlQWxsUmVzb3VyY2VNYXBwaW5ncygpOworCQkJYWRkTmV3UmVzb3VyY2VNYXBwaW5ncygpOworCQl9CisJCXJldHVybiB0cnVlOworCX0KKwlwcm90ZWN0ZWQgYm9vbGVhbiBhZGROZXdSZXNvdXJjZU1hcHBpbmdzKCkgeworCQlDb21wb25lbnRSZXNvdXJjZVByb3h5W10gcHJveGllcyA9IHJlc291cmNlTWFwcGluZ3MudG9BcnJheShuZXcgQ29tcG9uZW50UmVzb3VyY2VQcm94eVtyZXNvdXJjZU1hcHBpbmdzLnNpemUoKV0pOworCQlJVmlydHVhbEZvbGRlciByb290Rm9sZGVyID0gcm9vdENvbXBvbmVudC5nZXRSb290Rm9sZGVyKCk7CisJCWZvciggaW50IGkgPSAwOyBpIDwgcHJveGllcy5sZW5ndGg7IGkrKyApIHsKKwkJCXRyeSB7CisJCQkJcm9vdEZvbGRlci5nZXRGb2xkZXIocHJveGllc1tpXS5ydW50aW1lUGF0aCkuY3JlYXRlTGluayhwcm94aWVzW2ldLnNvdXJjZSwgMCwgbnVsbCk7CisJCQl9IGNhdGNoKCBDb3JlRXhjZXB0aW9uIGNlICkgeworCQkJfQorCQl9CisJCXJlc291cmNlTWFwcGluZ3NDaGFuZ2VkID0gZmFsc2U7CisJCXJldHVybiB0cnVlOworCX0KKwkKKwlwcm90ZWN0ZWQgYm9vbGVhbiByZW1vdmVBbGxSZXNvdXJjZU1hcHBpbmdzKCkgeworCQlTdHJ1Y3R1cmVFZGl0IG1vZHVsZUNvcmUgPSBudWxsOworCQl0cnkgeworCQkJbW9kdWxlQ29yZSA9IFN0cnVjdHVyZUVkaXQuZ2V0U3RydWN0dXJlRWRpdEZvcldyaXRlKHByb2plY3QpOworCQkJbW9kdWxlQ29yZS5nZXRDb21wb25lbnQoKS5nZXRSZXNvdXJjZXMoKS5jbGVhcigpOworCQl9CisJCWZpbmFsbHkgeworCQkJaWYgKG1vZHVsZUNvcmUgIT0gbnVsbCkgeworCQkJCW1vZHVsZUNvcmUuc2F2ZUlmTmVjZXNzYXJ5KG5ldyBOdWxsUHJvZ3Jlc3NNb25pdG9yKCkpOworCQkJCW1vZHVsZUNvcmUuZGlzcG9zZSgpOworCQkJfQorCQl9CisJCXJldHVybiB0cnVlOworCX0KKwkKKwlwcm90ZWN0ZWQgYm9vbGVhbiBzYXZlUmVmZXJlbmNlQ2hhbmdlcygpIHsKKwkJLy8gRmlsbCBvdXIgZGVsdGEgbGlzdHMKKwkJQXJyYXlMaXN0PElWaXJ0dWFsUmVmZXJlbmNlPiBhZGRlZCA9IG5ldyBBcnJheUxpc3Q8SVZpcnR1YWxSZWZlcmVuY2U+KCk7CisJCUFycmF5TGlzdDxJVmlydHVhbFJlZmVyZW5jZT4gcmVtb3ZlZCA9IG5ldyBBcnJheUxpc3Q8SVZpcnR1YWxSZWZlcmVuY2U+KCk7CisKKwkJSGFzaE1hcDxJVmlydHVhbENvbXBvbmVudCwgSVZpcnR1YWxSZWZlcmVuY2U+IG1hcCA9IG5ldyBIYXNoTWFwPElWaXJ0dWFsQ29tcG9uZW50LCBJVmlydHVhbFJlZmVyZW5jZT4oKTsKKwkJSXRlcmF0b3I8SVZpcnR1YWxSZWZlcmVuY2U+IGsgPSBjdXJyZW50UmVmZXJlbmNlcy5pdGVyYXRvcigpOworCQlJVmlydHVhbFJlZmVyZW5jZSB2MTsKKwkJd2hpbGUoay5oYXNOZXh0KCkpIHsKKwkJCXYxID0gay5uZXh0KCk7CisJCQltYXAucHV0KHYxLmdldFJlZmVyZW5jZWRDb21wb25lbnQoKSwgdjEpOworCQl9CisJCQorCQlJdGVyYXRvcjxJVmlydHVhbFJlZmVyZW5jZT4gaiA9IG9yaWdpbmFsUmVmZXJlbmNlcy5pdGVyYXRvcigpOworCQlJVmlydHVhbFJlZmVyZW5jZSBvcmlnUmVmLCBuZXdSZWY7CisJCXdoaWxlIChqLmhhc05leHQoKSkgeworCQkJb3JpZ1JlZiA9IGoubmV4dCgpOworCQkJbmV3UmVmID0gbWFwLmdldChvcmlnUmVmLmdldFJlZmVyZW5jZWRDb21wb25lbnQoKSk7CisJCQlpZiggbmV3UmVmID09IG51bGwgKQorCQkJCXJlbW92ZWQuYWRkKG9yaWdSZWYpOworCQkJZWxzZSBpZiggIWdldFNhZmVSdW50aW1lUGF0aChvcmlnUmVmKS5lcXVhbHMoZ2V0U2FmZVJ1bnRpbWVQYXRoKG5ld1JlZikpKSB7CisJCQkJcmVtb3ZlZC5hZGQob3JpZ1JlZik7CisJCQkJYWRkZWQuYWRkKG5ld1JlZik7CisJCQl9CisJCQltYXAucmVtb3ZlKG9yaWdSZWYuZ2V0UmVmZXJlbmNlZENvbXBvbmVudCgpKTsKKwkJfQorCisJCWFkZGVkLmFkZEFsbChtYXAudmFsdWVzKCkpOworCisJCU51bGxQcm9ncmVzc01vbml0b3IgbW9uaXRvciA9IG5ldyBOdWxsUHJvZ3Jlc3NNb25pdG9yKCk7CisJCWJvb2xlYW4gc3ViUmVzdWx0ID0gcHJlSGFuZGxlQ2hhbmdlcyhtb25pdG9yKTsKKwkJaWYoICFzdWJSZXN1bHQgKQorCQkJcmV0dXJuIGZhbHNlOworCQkKKwkJaGFuZGxlUmVtb3ZlZChyZW1vdmVkKTsKKwkJaGFuZGxlQWRkZWQoYWRkZWQpOworCisJCXN1YlJlc3VsdCAmPSBwb3N0SGFuZGxlQ2hhbmdlcyhtb25pdG9yKTsKKwkJCisJCW9yaWdpbmFsUmVmZXJlbmNlcy5jbGVhcigpOworCQlvcmlnaW5hbFJlZmVyZW5jZXMuYWRkQWxsKGN1cnJlbnRSZWZlcmVuY2VzKTsKKwkJY3VycmVudFJlZmVyZW5jZXMuY2xlYXIoKTsKKwkJSVZpcnR1YWxSZWZlcmVuY2VbXSBjdXJyZW50VG1wID0KKwkJCW9yaWdpbmFsUmVmZXJlbmNlcy50b0FycmF5KG5ldyBJVmlydHVhbFJlZmVyZW5jZVtvcmlnaW5hbFJlZmVyZW5jZXMuc2l6ZSgpXSk7IAorCQljdXJyZW50UmVmZXJlbmNlcy5hZGRBbGwoQXJyYXlzLmFzTGlzdChjbG9uZVJlZmVyZW5jZXMoY3VycmVudFRtcCkpKTsKKwkJcmV0dXJuIHN1YlJlc3VsdDsKKwl9CisKKwlwcm90ZWN0ZWQgdm9pZCBoYW5kbGVSZW1vdmVkKEFycmF5TGlzdDxJVmlydHVhbFJlZmVyZW5jZT4gcmVtb3ZlZCkgeworCQkvLyBJZiBpdCdzIHJlbW92ZWQgaXQgc2hvdWxkICpvbmx5KiBiZSBhIHZpcnR1YWwgY29tcG9uZW50IGFscmVhZHkKKwkJaWYocmVtb3ZlZC5pc0VtcHR5KCkpIHJldHVybjsKKwkJZmluYWwgQXJyYXlMaXN0PElWaXJ0dWFsUmVmZXJlbmNlPiByZWZzID0gbmV3IEFycmF5TGlzdDxJVmlydHVhbFJlZmVyZW5jZT4oKTsKKwkJSXRlcmF0b3I8SVZpcnR1YWxSZWZlcmVuY2U+IGkgPSByZW1vdmVkLml0ZXJhdG9yKCk7CisJCUlWaXJ0dWFsUmVmZXJlbmNlIG87CisJCXdoaWxlKGkuaGFzTmV4dCgpKSB7CisJCQlvID0gaS5uZXh0KCk7CisJCQlyZWZzLmFkZChvKTsKKwkJfQorCQlJV29ya3NwYWNlUnVubmFibGUgcnVubmFibGUgPSBuZXcgSVdvcmtzcGFjZVJ1bm5hYmxlKCl7CisJCQlwdWJsaWMgdm9pZCBydW4oSVByb2dyZXNzTW9uaXRvciBtb25pdG9yKSB0aHJvd3MgQ29yZUV4Y2VwdGlvbnsKKwkJCQlyZW1vdmVSZWZlcmVuY2VzKHJlZnMpOworCQkJfQorCQl9OworCQl0cnkgeworCQkJUmVzb3VyY2VzUGx1Z2luLmdldFdvcmtzcGFjZSgpLnJ1bihydW5uYWJsZSwgbmV3IE51bGxQcm9ncmVzc01vbml0b3IoKSk7CisJCX0gY2F0Y2goIENvcmVFeGNlcHRpb24gZSApIHsKKwkJCU1vZHVsZUNvcmVVSVBsdWdpbi5sb2dFcnJvcihlKTsKKwkJfQorCQkKKwl9CisJCisJcHJvdGVjdGVkIHZvaWQgcmVtb3ZlUmVmZXJlbmNlcyhBcnJheUxpc3Q8SVZpcnR1YWxSZWZlcmVuY2U+IHJlbW92ZWQpIHsKKwkJSXRlcmF0b3I8SVZpcnR1YWxSZWZlcmVuY2U+IGkgPSByZW1vdmVkLml0ZXJhdG9yKCk7CisJCXdoaWxlKGkuaGFzTmV4dCgpKSB7CisJCQlyZW1vdmVPbmVSZWZlcmVuY2UoaS5uZXh0KCkpOworCQl9CisJfQorCisJcHJvdGVjdGVkIHZvaWQgcmVtb3ZlT25lUmVmZXJlbmNlKElWaXJ0dWFsUmVmZXJlbmNlIGNvbXApIHsKKwkJdHJ5IHsKKwkJCUlEYXRhTW9kZWxPcGVyYXRpb24gb3BlcmF0aW9uID0gZ2V0UmVtb3ZlQ29tcG9uZW50T3BlcmF0aW9uKGNvbXApOworCQkJb3BlcmF0aW9uLmV4ZWN1dGUobnVsbCwgbnVsbCk7CisJCX0gY2F0Y2goIEV4ZWN1dGlvbkV4Y2VwdGlvbiBlKSB7CisJCQlNb2R1bGVDb3JlVUlQbHVnaW4ubG9nRXJyb3IoZSk7CisJCX0KKwkJCisJfQorCisJcHJvdGVjdGVkIElEYXRhTW9kZWxPcGVyYXRpb24gZ2V0UmVtb3ZlQ29tcG9uZW50T3BlcmF0aW9uKElWaXJ0dWFsUmVmZXJlbmNlIHJlZmVyZW5jZSkgeworCQlJRGF0YU1vZGVsUHJvdmlkZXIgcHJvdmlkZXIgPSBnZXRSZW1vdmVSZWZlcmVuY2VEYXRhTW9kZWxQcm92aWRlcihyZWZlcmVuY2UpOworCQlJRGF0YU1vZGVsIG1vZGVsID0gRGF0YU1vZGVsRmFjdG9yeS5jcmVhdGVEYXRhTW9kZWwocHJvdmlkZXIpOworCQltb2RlbC5zZXRQcm9wZXJ0eShJQWRkUmVmZXJlbmNlRGF0YU1vZGVsUHJvcGVydGllcy5TT1VSQ0VfQ09NUE9ORU5ULCByb290Q29tcG9uZW50KTsKKwkJTGlzdDxJVmlydHVhbFJlZmVyZW5jZT4gdG9SZW1vdmUgPSBuZXcgQXJyYXlMaXN0PElWaXJ0dWFsUmVmZXJlbmNlPigpOworCQl0b1JlbW92ZS5hZGQocmVmZXJlbmNlKTsgCisJCW1vZGVsLnNldFByb3BlcnR5KElBZGRSZWZlcmVuY2VEYXRhTW9kZWxQcm9wZXJ0aWVzLlRBUkdFVF9SRUZFUkVOQ0VfTElTVCwgdG9SZW1vdmUpOworCQlyZXR1cm4gbW9kZWwuZ2V0RGVmYXVsdE9wZXJhdGlvbigpOworCX0KKwkKKwlwcm90ZWN0ZWQgSURhdGFNb2RlbFByb3ZpZGVyIGdldFJlbW92ZVJlZmVyZW5jZURhdGFNb2RlbFByb3ZpZGVyKElWaXJ0dWFsUmVmZXJlbmNlIHJlZmVyZW5jZSkgeworCQlyZXR1cm4gbmV3IFJlbW92ZVJlZmVyZW5jZURhdGFNb2RlbFByb3ZpZGVyKCk7CisJfQorCQorCXByb3RlY3RlZCB2b2lkIGhhbmRsZUFkZGVkKEFycmF5TGlzdDxJVmlydHVhbFJlZmVyZW5jZT4gYWRkZWQpIHsKKwkJZmluYWwgQXJyYXlMaXN0PElWaXJ0dWFsUmVmZXJlbmNlPiByZWZzID0gbmV3IEFycmF5TGlzdDxJVmlydHVhbFJlZmVyZW5jZT4oKTsKKwkJSXRlcmF0b3I8SVZpcnR1YWxSZWZlcmVuY2U+IGkgPSBhZGRlZC5pdGVyYXRvcigpOworCQlJVmlydHVhbFJlZmVyZW5jZSBvOworCQl3aGlsZShpLmhhc05leHQoKSkgeworCQkJbyA9IGkubmV4dCgpOworCQkJcmVmcy5hZGQobyk7CisJCX0KKwkJCisJCUlXb3Jrc3BhY2VSdW5uYWJsZSBydW5uYWJsZSA9IG5ldyBJV29ya3NwYWNlUnVubmFibGUoKXsKKwkJCXB1YmxpYyB2b2lkIHJ1bihJUHJvZ3Jlc3NNb25pdG9yIG1vbml0b3IpIHRocm93cyBDb3JlRXhjZXB0aW9ueworCQkJCWFkZFJlZmVyZW5jZXMocmVmcyk7CisJCQl9CisJCX07CisJCXRyeSB7CisJCQlSZXNvdXJjZXNQbHVnaW4uZ2V0V29ya3NwYWNlKCkucnVuKHJ1bm5hYmxlLCBuZXcgTnVsbFByb2dyZXNzTW9uaXRvcigpKTsKKwkJfSBjYXRjaCggQ29yZUV4Y2VwdGlvbiBlICkgeworCQkJTW9kdWxlQ29yZVVJUGx1Z2luLmxvZ0Vycm9yKGUpOworCQl9CisJfQorCQorCXByb3RlY3RlZCB2b2lkIGFkZFJlZmVyZW5jZXMoQXJyYXlMaXN0PElWaXJ0dWFsUmVmZXJlbmNlPiByZWZzKSB0aHJvd3MgQ29yZUV4Y2VwdGlvbiB7CisJCUl0ZXJhdG9yPElWaXJ0dWFsUmVmZXJlbmNlPiBpID0gcmVmcy5pdGVyYXRvcigpOworCQl3aGlsZShpLmhhc05leHQoKSkgeworCQkJYWRkT25lUmVmZXJlbmNlKGkubmV4dCgpKTsKKwkJfQorCX0KKwkKKwlwcm90ZWN0ZWQgSURhdGFNb2RlbFByb3ZpZGVyIGdldEFkZFJlZmVyZW5jZURhdGFNb2RlbFByb3ZpZGVyKElWaXJ0dWFsUmVmZXJlbmNlIGNvbXBvbmVudCkgeworCQlyZXR1cm4gbmV3IEFkZFJlZmVyZW5jZURhdGFNb2RlbFByb3ZpZGVyKCk7CisJfQorCQorCXByb3RlY3RlZCB2b2lkIGFkZE9uZVJlZmVyZW5jZShJVmlydHVhbFJlZmVyZW5jZSByZWYpIHRocm93cyBDb3JlRXhjZXB0aW9uIHsKKwkJU3RyaW5nIHBhdGgsIGFyY2hpdmVOYW1lOworCisJCUlEYXRhTW9kZWxQcm92aWRlciBwcm92aWRlciA9IGdldEFkZFJlZmVyZW5jZURhdGFNb2RlbFByb3ZpZGVyKHJlZik7CisJCUlEYXRhTW9kZWwgZG0gPSBEYXRhTW9kZWxGYWN0b3J5LmNyZWF0ZURhdGFNb2RlbChwcm92aWRlcik7CisJCWRtLnNldFByb3BlcnR5KElBZGRSZWZlcmVuY2VEYXRhTW9kZWxQcm9wZXJ0aWVzLlNPVVJDRV9DT01QT05FTlQsIHJvb3RDb21wb25lbnQpOworCQlkbS5zZXRQcm9wZXJ0eShJQWRkUmVmZXJlbmNlRGF0YU1vZGVsUHJvcGVydGllcy5UQVJHRVRfUkVGRVJFTkNFX0xJU1QsIEFycmF5cy5hc0xpc3QocmVmKSk7CisJCQorCQlJU3RhdHVzIHN0YXQgPSBkbS52YWxpZGF0ZVByb3BlcnR5KElBZGRSZWZlcmVuY2VEYXRhTW9kZWxQcm9wZXJ0aWVzLlRBUkdFVF9SRUZFUkVOQ0VfTElTVCk7CisJCWlmIChzdGF0ICE9IE9LX1NUQVRVUykKKwkJCXRocm93IG5ldyBDb3JlRXhjZXB0aW9uKHN0YXQpOworCQl0cnkgeworCQkJZG0uZ2V0RGVmYXVsdE9wZXJhdGlvbigpLmV4ZWN1dGUobmV3IE51bGxQcm9ncmVzc01vbml0b3IoKSwgbnVsbCk7CisJCX0gY2F0Y2ggKEV4ZWN1dGlvbkV4Y2VwdGlvbiBlKSB7CisJCQlNb2R1bGVDb3JlVUlQbHVnaW4ubG9nRXJyb3IoZSk7CisJCX0JCisJfQorCisJcHVibGljIHZvaWQgbGFiZWxQcm92aWRlckNoYW5nZWQoTGFiZWxQcm92aWRlckNoYW5nZWRFdmVudCBldmVudCkgeworCQlpZighYXZhaWxhYmxlQ29tcG9uZW50c1ZpZXdlci5nZXRUYWJsZSgpLmlzRGlzcG9zZWQoKSkKKwkJCWF2YWlsYWJsZUNvbXBvbmVudHNWaWV3ZXIucmVmcmVzaCh0cnVlKTsKKwl9CisKKwlwcm90ZWN0ZWQgSU1vZHVsZUhhbmRsZXIgZ2V0TW9kdWxlSGFuZGxlcigpIHsKKwkJaWYobW9kdWxlSGFuZGxlciA9PSBudWxsKQorCQkJbW9kdWxlSGFuZGxlciA9IG5ldyBEZWZhdWx0TW9kdWxlSGFuZGxlcigpOworCQlyZXR1cm4gbW9kdWxlSGFuZGxlcjsKKwl9CisKKwlwdWJsaWMgdm9pZCBwZXJmb3JtQXBwbHkoKSB7CisJCXBlcmZvcm1PaygpOworCQl2ZXJpZnkoKTsKKwl9CisKK30KZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlLnVpL3NyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2NvbXBvbmVudGNvcmUvdWkvcHJvcGVydHlwYWdlL0lEZXBlbmRlbmN5UGFnZVByb3ZpZGVyLmphdmEgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS51aS9zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9jb21wb25lbnRjb3JlL3VpL3Byb3BlcnR5cGFnZS9JRGVwZW5kZW5jeVBhZ2VQcm92aWRlci5qYXZhCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLjQ3MzMyZTIKLS0tIC9kZXYvbnVsbAorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS51aS9zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9jb21wb25lbnRjb3JlL3VpL3Byb3BlcnR5cGFnZS9JRGVwZW5kZW5jeVBhZ2VQcm92aWRlci5qYXZhCkBAIC0wLDAgKzEsNjMgQEAKKy8qKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioKKyAqIENvcHlyaWdodCAoYykgMjAwOSBSZWQgSGF0CisgKiBBbGwgcmlnaHRzIHJlc2VydmVkLiBUaGlzIHByb2dyYW0gYW5kIHRoZSBhY2NvbXBhbnlpbmcgbWF0ZXJpYWxzCisgKiBhcmUgbWFkZSBhdmFpbGFibGUgdW5kZXIgdGhlIHRlcm1zIG9mIHRoZSBFY2xpcHNlIFB1YmxpYyBMaWNlbnNlIHYxLjAKKyAqIHdoaWNoIGFjY29tcGFuaWVzIHRoaXMgZGlzdHJpYnV0aW9uLCBhbmQgaXMgYXZhaWxhYmxlIGF0CisgKiBodHRwOi8vd3d3LmVjbGlwc2Uub3JnL2xlZ2FsL2VwbC12MTAuaHRtbAorICoKKyAqIENvbnRyaWJ1dG9yczoKKyAqICAgIFJvYiBTdHJ5a2VyIC0gaW5pdGlhbCBpbXBsZW1lbnRhdGlvbiBhbmQgb25nb2luZyBtYWludGVuYW5jZQorICogICAgCisgKiBBUEkgaW4gdGhlc2UgcGFja2FnZXMgaXMgcHJvdmlzaW9uYWwgaW4gdGhpcyByZWxlYXNlCisgKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqLworcGFja2FnZSBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUudWkucHJvcGVydHlwYWdlOworCitpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5yZXNvdXJjZXMuSVByb2plY3Q7CitpbXBvcnQgb3JnLmVjbGlwc2Uuc3d0LndpZGdldHMuQ29tcG9zaXRlOworaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24ucHJvamVjdC5mYWNldC5jb3JlLklGYWNldGVkUHJvamVjdDsKKworLyoqCisgKiBTdWdnZXN0ZWQgdXNlIGNhc2Ugb2YgdGhpcyBjbGFzcyBpcyBhcyBmb2xsb3dzOgorICogCisgKiAJCXByb3ZpZGVyID0gRGVwZW5kZW5jeVBhZ2VFeHRlbnNpb25NYW5hZ2VyLmdldE1hbmFnZXIoKS5nZXRQcm92aWRlcihmYWNldGVkUHJvamVjdCk7CisgKgkJaWYoIHByb3ZpZGVyICE9IG51bGwgKSB7CisgKgkJCWNvbnRyb2xzID0gcHJvdmlkZXIuY3JlYXRlUGFnZXMoZmFjZXRlZFByb2plY3QsIHRoaXMpOworICoJCQlDb21wb3NpdGUgcm9vdCA9IHByb3ZpZGVyLmNyZWF0ZVJvb3RDb250cm9sKGNvbnRyb2xzLCBwYXJlbnQpOworICoJCX0KKyAqLworcHVibGljIGludGVyZmFjZSBJRGVwZW5kZW5jeVBhZ2VQcm92aWRlciB7CisJLyoqCisJICogUmV0dXJucyB0cnVlIGlmIHRoaXMgcGFnZSBwcm92aWRlciBrbm93cyBob3cgdG8gCisJICogaGFuZGxlIHRoZSBnaXZlbiBmYWNldGVkIHByb2plY3QsIGZhbHNlIG90aGVyd2lzZQorCSAqIEBwYXJhbSBwcm9qZWN0IGEgcHJvamVjdAorCSAqIEByZXR1cm4gdHJ1ZSBpZiB0aGlzIHByb3ZpZGVyIGNhbiBoYW5kbGUgaXQsIGZhbHNlIG90aGVyd2lzZQorCSAqLworCXB1YmxpYyBib29sZWFuIGNhbkhhbmRsZShJRmFjZXRlZFByb2plY3QgcHJvamVjdCk7CisJCisJLyoqCisJICogUmV0dXJucyBhIGxpc3Qgb2YgcGFnZSBjb250cm9sIG9iamVjdHMgd2hpY2ggc2hvdWxkIGJlCisJICogcHJlc2VudGVkIHRvIHRoZSB1c2VyIGZvciB0aGlzIHByb2plY3QgdHlwZS4gCisJICogCisJICogQHBhcmFtIHByb2plY3QKKwkgKiBAcGFyYW0gcGFyZW50CisJICogQHJldHVybgorCSAqLworCXB1YmxpYyBJTW9kdWxlRGVwZW5kZW5jaWVzQ29udHJvbFtdIGNyZWF0ZVBhZ2VzKElGYWNldGVkUHJvamVjdCBwcm9qZWN0LCBNb2R1bGVBc3NlbWJseVJvb3RQYWdlIHBhcmVudCk7CisJCisJLyoqCisJICogVHVybiB0aGlzIGFycmF5IG9mIHBhZ2VzIC8gY29udHJvbHMgaW50byBvbmUgcm9vdCBjb250cm9sCisJICogdGhhdCBjYW4gYmUgcmV0dXJuZWQgdG8gdGhlIFByb3BlcnRpZXMgUGFnZSBjb250YWluZXIuIAorCisJICogQHBhcmFtIHBhZ2VzCisJICogQHBhcmFtIHBhcmVudAorCSAqIEByZXR1cm4KKwkgKi8KKwlwdWJsaWMgQ29tcG9zaXRlIGNyZWF0ZVJvb3RDb250cm9sKElGYWNldGVkUHJvamVjdCBwcm9qZWN0LCBJTW9kdWxlRGVwZW5kZW5jaWVzQ29udHJvbFtdIHBhZ2VzLCBDb21wb3NpdGUgcGFyZW50KTsKKworCS8qKgorCSAqIAorCSAqIEByZXR1cm4gU3RyaW5nIC0gcGFnZSB0aXRsZSBzdHJpbmcgb3IgbnVsbCBpZiBkZWZhdWx0IHRpdGxlIGlzIGRlc2lyZWQKKwkgKi8KKwlwdWJsaWMgU3RyaW5nIGdldFBhZ2VUaXRsZShJUHJvamVjdCBwcm9qZWN0KTsKKwkKK30KZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlLnVpL3NyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2NvbXBvbmVudGNvcmUvdWkvcHJvcGVydHlwYWdlL0lNb2R1bGVEZXBlbmRlbmNpZXNDb250cm9sLmphdmEgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS51aS9zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9jb21wb25lbnRjb3JlL3VpL3Byb3BlcnR5cGFnZS9JTW9kdWxlRGVwZW5kZW5jaWVzQ29udHJvbC5qYXZhCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLmQ2Y2E0YzgKLS0tIC9kZXYvbnVsbAorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS51aS9zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9jb21wb25lbnRjb3JlL3VpL3Byb3BlcnR5cGFnZS9JTW9kdWxlRGVwZW5kZW5jaWVzQ29udHJvbC5qYXZhCkBAIC0wLDAgKzEsNjUgQEAKKy8qKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioKKyAqIENvcHlyaWdodCAoYykgMjAwOSBSZWQgSGF0CisgKiBBbGwgcmlnaHRzIHJlc2VydmVkLiBUaGlzIHByb2dyYW0gYW5kIHRoZSBhY2NvbXBhbnlpbmcgbWF0ZXJpYWxzCisgKiBhcmUgbWFkZSBhdmFpbGFibGUgdW5kZXIgdGhlIHRlcm1zIG9mIHRoZSBFY2xpcHNlIFB1YmxpYyBMaWNlbnNlIHYxLjAKKyAqIHdoaWNoIGFjY29tcGFuaWVzIHRoaXMgZGlzdHJpYnV0aW9uLCBhbmQgaXMgYXZhaWxhYmxlIGF0CisgKiBodHRwOi8vd3d3LmVjbGlwc2Uub3JnL2xlZ2FsL2VwbC12MTAuaHRtbAorICoKKyAqIENvbnRyaWJ1dG9yczoKKyAqICAgIFJvYiBTdHJ5a2VyIC0gaW5pdGlhbCBpbXBsZW1lbnRhdGlvbiBhbmQgb25nb2luZyBtYWludGVuYW5jZQorICogICAgCisgKiBBUEkgaW4gdGhlc2UgcGFja2FnZXMgaXMgcHJvdmlzaW9uYWwgaW4gdGhpcyByZWxlYXNlCisgKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqLworcGFja2FnZSBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUudWkucHJvcGVydHlwYWdlOworCitpbXBvcnQgb3JnLmVjbGlwc2Uuc3d0LndpZGdldHMuQ29tcG9zaXRlOworCisvKioKKyAqIFRoaXMgcmVwcmVzZW50cyBvbmUgY29udHJvbCB3aGljaCBtYXkgYmUgcHJlc2VudCBvbiBhIHBhZ2UKKyAqIGFuZCByZXF1aXJlcyB0byBsaXN0ZW4gaW4gdG8gdGhlIHNwZWNpZmljIGxpZmVjeWNsZSAKKyAqIGV2ZW50cyBvZiB0aGUgcGFnZS4gCisgKi8KK3B1YmxpYyBpbnRlcmZhY2UgSU1vZHVsZURlcGVuZGVuY2llc0NvbnRyb2wgeworCS8qKgorCSAqIENyZWF0ZXMgdGhlIENvbXBvc2l0ZSBhc3NvY2lhdGVkIHdpdGggdGhpcyBjb250cm9sLgorCSAqIEBwYXJhbSBwYXJlbnQgUGFyZW50IENvbXBvc2l0ZS4KKwkgKiBAcmV0dXJuIENvbXBvc2l0ZSBmb3IgdGhlIGNvbnRyb2wuCisJICovCisJQ29tcG9zaXRlIGNyZWF0ZUNvbnRlbnRzKENvbXBvc2l0ZSBwYXJlbnQpOworCQorCS8qKgorCSAqIENhbGxlZCB3aGVuIHRoZSBwcm9wZXJ0eSBwYWdlJ3MgPGNvZGU+cGVyZm9ybU9rKCk8L2NvZGU+IG1ldGhvZCBpcyBjYWxsZWQuCisJICogQHJldHVybgorCSAqLworCWJvb2xlYW4gcGVyZm9ybU9rKCk7CisJCisJLyoqCisJICogQ2FsbGVkIHdoZW4gdGhlIHByb3BlcnR5IHBhZ2UncyA8Y29kZT5wZXJmb3JtRGVmYXVsdHMoKTwvY29kZT4gbWV0aG9kIGlzIGNhbGxlZC4KKwkgKiBAcmV0dXJuCisJICovCisJdm9pZCBwZXJmb3JtRGVmYXVsdHMoKTsKKwkKKwkvKioKKwkgKiBDYWxsZWQgd2hlbiB0aGUgcHJvcGVydHkgcGFnZSdzIDxjb2RlPnBlcmZvcm1DYW5jZWwoKTwvY29kZT4gbWV0aG9kIGlzIGNhbGxlZC4KKwkgKiBAcmV0dXJuCisJICovCisJYm9vbGVhbiBwZXJmb3JtQ2FuY2VsKCk7CisJCisJLyoqCisJICogQ2FsbGVkIHdoZW4gdGhlIHByb3BlcnR5IHBhZ2UncyA8Y29kZT5wZXJmb3JtQXBwbHkoKTwvY29kZT4gbWV0aG9kIGlzIGNhbGxlZC4KKwkgKiBAcmV0dXJuCisJICovCisJdm9pZCBwZXJmb3JtQXBwbHkoKTsKKwkKKwkvKioKKwkgKiBDYWxsZWQgd2hlbiB0aGUgcHJvcGVydHkgcGFnZSdzIDxjb2RlPnNldFZpc2libGUoKTwvY29kZT4gbWV0aG9kIGlzIGNhbGxlZC4KKwkgKiBAcmV0dXJuCisJICovCisJdm9pZCBzZXRWaXNpYmxlKGJvb2xlYW4gdmlzaWJsZSk7CisJCisJLyoqCisJICogQ2FsbGVkIHdoZW4gdGhlIHByb3BlcnR5IHBhZ2UncyA8Y29kZT5kaXNwb3NlKCk8L2NvZGU+IG1ldGhvZCBpcyBjYWxsZWQuCisJICogQHJldHVybgorCSAqLworCXZvaWQgZGlzcG9zZSgpOworfQpkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUudWkvc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vY29tcG9uZW50Y29yZS91aS9wcm9wZXJ0eXBhZ2UvSVJlZmVyZW5jZVdpemFyZENvbnN0YW50cy5qYXZhIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUudWkvc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vY29tcG9uZW50Y29yZS91aS9wcm9wZXJ0eXBhZ2UvSVJlZmVyZW5jZVdpemFyZENvbnN0YW50cy5qYXZhCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLmIyM2FkOTEKLS0tIC9kZXYvbnVsbAorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS51aS9zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9jb21wb25lbnRjb3JlL3VpL3Byb3BlcnR5cGFnZS9JUmVmZXJlbmNlV2l6YXJkQ29uc3RhbnRzLmphdmEKQEAgLTAsMCArMSw4NyBAQAorLyoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKgorICogQ29weXJpZ2h0IChjKSAyMDA5IFJlZCBIYXQKKyAqIEFsbCByaWdodHMgcmVzZXJ2ZWQuIFRoaXMgcHJvZ3JhbSBhbmQgdGhlIGFjY29tcGFueWluZyBtYXRlcmlhbHMKKyAqIGFyZSBtYWRlIGF2YWlsYWJsZSB1bmRlciB0aGUgdGVybXMgb2YgdGhlIEVjbGlwc2UgUHVibGljIExpY2Vuc2UgdjEuMAorICogd2hpY2ggYWNjb21wYW5pZXMgdGhpcyBkaXN0cmlidXRpb24sIGFuZCBpcyBhdmFpbGFibGUgYXQKKyAqIGh0dHA6Ly93d3cuZWNsaXBzZS5vcmcvbGVnYWwvZXBsLXYxMC5odG1sCisgKgorICogQ29udHJpYnV0b3JzOgorICogICAgUm9iIFN0cnlrZXIgLSBpbml0aWFsIGltcGxlbWVudGF0aW9uIGFuZCBvbmdvaW5nIG1haW50ZW5hbmNlCisgKiAgICBJQk0gLSBPbmdvaW5nIG1haW50ZW5hbmNlCisgKiAgICAKKyAqIEFQSSBpbiB0aGVzZSBwYWNrYWdlcyBpcyBwcm92aXNpb25hbCBpbiB0aGlzIHJlbGVhc2UKKyAqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKiovCitwYWNrYWdlIG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS51aS5wcm9wZXJ0eXBhZ2U7CisKK2ltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJlc291cmNlcy5JUHJvamVjdDsKK2ltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3MuZGF0YW1vZGVsLklEYXRhTW9kZWxPcGVyYXRpb247CisKK3B1YmxpYyBpbnRlcmZhY2UgSVJlZmVyZW5jZVdpemFyZENvbnN0YW50cyB7CisJLyoqCisJICogVGhlIGtleSByZXByZXNlbnRpbmcgdGhhdCB0aGlzIHdpemFyZCBjYW4gcmV0dXJuIGEgZm9sZGVyIG1hcHBpbmcKKwkgKiBUaGUgdmFsdWUgc2hvdWxkIGJlIGFuIGluc3RhbmNlb2YgQ29tcG9uZW50UmVzb3VyY2VQcm94eQorCSAqLworCXB1YmxpYyBzdGF0aWMgZmluYWwgU3RyaW5nIEZPTERFUl9NQVBQSU5HID0gImZvbGRlci5tYXBwaW5nIjsgLy8kTk9OLU5MUy0xJAorCQorCS8qKgorCSAqIFRoaXMgcHJvcGVydHkgc2hvdWxkIG1hcCB0byB0aGUgSVByb2plY3Qgd2hpY2ggaXMgdGhlIHJvb3QgcHJvamVjdAorCSAqIHdoaWNoIHdpbGwgZW5jbG9zZSB0aGUgcmV0dXJuZWQgcmVmZXJlbmNlCisJICovCisJcHVibGljIHN0YXRpYyBmaW5hbCBTdHJpbmcgUFJPSkVDVCA9ICJyb290LnByb2plY3QiOyAvLyROT04tTkxTLTEkCisJCisJLyoqCisJICogVGhpcyBwcm9wZXJ0eSBzaG91bGQgbWFwIHRvIHRoZSBJVmlydHVhbENvbXBvbmVudCB3aGljaCBpcyB0aGUgcm9vdCBjb21wb25lbnQKKwkgKiB3aGljaCB3aWxsIGVuY2xvc2UgdGhlIHJldHVybmVkIHJlZmVyZW5jZQorCSAqLworCXB1YmxpYyBzdGF0aWMgZmluYWwgU3RyaW5nIFJPT1RfQ09NUE9ORU5UID0gInJvb3QuY29tcG9uZW50IjsgLy8kTk9OLU5MUy0xJAorCQorCS8qKgorCSAqIFRoaXMgcHJvcGVydHkgc2hvdWxkIG1hcCB0byB0aGUgSU1vZHVsZUhhbmRsZXIgZm9yIGN1c3RvbWl6ZWQgYmVoYXZpb3VyCisJICovCisJcHVibGljIHN0YXRpYyBmaW5hbCBTdHJpbmcgTU9EVUxFSEFORExFUiA9ICJtb2R1bGUuaGFuZGxlciI7IC8vJE5PTi1OTFMtMSQKKwkKKwkvKioKKwkgKiBUaGlzIHByb3BlcnR5IHNob3VsZCBtYXAgdG8gdGhlIG9yaWdpbmFsIHJlZmVyZW5jZSwgaWYgdGhlIHdpemFyZCBoYXMgYmVlbiBvcGVuZWQKKwkgKiBpbiBlZGl0aW5nIG1vZGUuIAorCSAqLworCXB1YmxpYyBzdGF0aWMgZmluYWwgU3RyaW5nIE9SSUdJTkFMX1JFRkVSRU5DRSA9ICJkZXBlbmRlbmN5LnJlZmVyZW5jZS5vcmlnaW5hbCI7Ly8kTk9OLU5MUy0xJAorCQorCS8qKgorCSAqIFRoaXMgcHJvcGVydHkgc2hvdWxkIG1hcCB0byB0aGUgZmluYWwgcmVmZXJlbmNlLCBlaXRoZXIgbmV3IHJlZmVyZW5jZSwgCisJICogb3IgYSBuZXcgaW5zdGFuY2Ugb2YgYSBtb2RpZmllZCByZWZlcmVuY2UuIAorCSAqLworCXB1YmxpYyBzdGF0aWMgZmluYWwgU3RyaW5nIEZJTkFMX1JFRkVSRU5DRSA9ICJkZXBlbmRlbmN5LnJlZmVyZW5jZS5maW5hbCI7Ly8kTk9OLU5MUy0xJAorCQorCS8qKgorCSAqIFRoaXMgcHJvcGVydHkgc2hvdWxkIG1hcCB0byB0aGUgZGVmYXVsdCBsb2NhdGlvbiB0aGF0IGxpYnJhcmllcyBzaG91bGQgYmUgcGxhY2VkLgorCSAqIElmIHRoaXMgaXMgdW5zZXQsIHRoZSBjcmVhdGluZyBvciBlZGl0aW5nIHdpemFyZCBmcmFnbWVudCBjYW4gY2hvb3NlIHRvIAorCSAqIHNldCB0aGUgcnVudGltZVBhdGggb2YgdGhlIHJlZmVyZW5jZSB0byB3aGF0ZXZlciBpdCB3YW50cy4KKwkgKi8KKwlwdWJsaWMgc3RhdGljIGZpbmFsIFN0cmluZyBERUZBVUxUX0xJQlJBUllfTE9DQVRJT04gPSAiZGVmYXVsdC5saWJyYXJ5LmxvY2F0aW9uIjsKKwkKKwkvKioKKwkgKiBUaGlzIHByb3BlcnR5IHNob3VsZCBtYXAgdG8gdGhlIGRlZmF1bHQgbG9jYXRpb24gdGhhdCBnZW5lcmljIHJlc291cmNlcyBzaG91bGQgYmUgcGxhY2VkLgorCSAqIElmIHRoaXMgaXMgdW5zZXQsIHRoZSBjcmVhdGluZyBvciBlZGl0aW5nIHdpemFyZCBmcmFnbWVudCBjYW4gY2hvb3NlIHRvIAorCSAqIHNldCB0aGUgcnVudGltZVBhdGggb2YgdGhlIHJlZmVyZW5jZSB0byB3aGF0ZXZlciBpdCB3YW50cy4KKwkgKi8KKwlwdWJsaWMgc3RhdGljIGZpbmFsIFN0cmluZyBERUZBVUxUX1JFU09VUkNFX0xPQ0FUSU9OID0gImRlZmF1bHQucmVzb3VyY2UubG9jYXRpb24iOworCisJLyoqCisJICogVGhpcyBwcm9wZXJ0eSBoZWxwcyB0cmFjayB0aGUgY3VycmVudCBzdGF0ZSBvZiB0aGUgY29tcG9uZW50IHJlZiBtb2RlbCBhcyBlYWNoIHN1YnNlcXVlbnQgYWN0aW9uIGlzIHRha2VuLCBidXQgbm90IGNvbW1pdHRlZAorCSAqLworCXB1YmxpYyBzdGF0aWMgZmluYWwgU3RyaW5nIENVUlJFTlRfUkVGUyA9ICJjdXJyZW50LnJlZmVyZW5jZXMiOworCQorCS8qKgorCSAqIFRoaXMga2V5IHNob3VsZCBiZSB1c2VkIHdoZW4geW91IHdhbnQgdG8gY29udmVydCBhIHByb2plY3QgaW50byAKKwkgKiBhIHNwZWNpZmljIG1vZHVsZWNvcmUgcHJvamVjdCB0eXBlLgorCSAqIAorCSAqLworCXB1YmxpYyBzdGF0aWMgZmluYWwgU3RyaW5nIFBST0pFQ1RfQ09OVkVSVEVSX09QRVJBVElPTl9QUk9WSURFUiA9ICJwcm9qZWN0LmNvbnZlcnRlci5vcGVyYXRpb24ucHJvdmlkZXIiOworCQorCS8qKgorCSAqIEFuIGludGVyZmFjZSB0byBwcm92aWRlIGFuIG9wZXJhdGlvbiBmb3IgY29udmVydGluZyBhIHNwZWNpZmljIHByb2plY3QKKwkgKi8KKwlwdWJsaWMgc3RhdGljIGludGVyZmFjZSBQcm9qZWN0Q29udmVydGVyT3BlcmF0aW9uUHJvdmlkZXIgeworCQlwdWJsaWMgSURhdGFNb2RlbE9wZXJhdGlvbiBnZXRDb252ZXJzaW9uT3BlcmF0aW9uKElQcm9qZWN0IHByb2plY3QpOworCX0KK30KZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlLnVpL3NyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2NvbXBvbmVudGNvcmUvdWkvcHJvcGVydHlwYWdlL01vZHVsZUFzc2VtYmx5Um9vdFBhZ2UuamF2YSBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlLnVpL3NyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2NvbXBvbmVudGNvcmUvdWkvcHJvcGVydHlwYWdlL01vZHVsZUFzc2VtYmx5Um9vdFBhZ2UuamF2YQpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi5lNTI1Njk3Ci0tLSAvZGV2L251bGwKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUudWkvc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vY29tcG9uZW50Y29yZS91aS9wcm9wZXJ0eXBhZ2UvTW9kdWxlQXNzZW1ibHlSb290UGFnZS5qYXZhCkBAIC0wLDAgKzEsMTkzIEBACisvKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqCisgKiBDb3B5cmlnaHQgKGMpIDIwMDkgUmVkIEhhdAorICogQWxsIHJpZ2h0cyByZXNlcnZlZC4gVGhpcyBwcm9ncmFtIGFuZCB0aGUgYWNjb21wYW55aW5nIG1hdGVyaWFscworICogYXJlIG1hZGUgYXZhaWxhYmxlIHVuZGVyIHRoZSB0ZXJtcyBvZiB0aGUgRWNsaXBzZSBQdWJsaWMgTGljZW5zZSB2MS4wCisgKiB3aGljaCBhY2NvbXBhbmllcyB0aGlzIGRpc3RyaWJ1dGlvbiwgYW5kIGlzIGF2YWlsYWJsZSBhdAorICogaHR0cDovL3d3dy5lY2xpcHNlLm9yZy9sZWdhbC9lcGwtdjEwLmh0bWwKKyAqCisgKiBDb250cmlidXRvcnM6CisgKiAgICBSb2IgU3RyeWtlciAtIGluaXRpYWwgaW1wbGVtZW50YXRpb24gYW5kIG9uZ29pbmcgbWFpbnRlbmFuY2UKKyAqICAgIAorICogQVBJIGluIHRoZXNlIHBhY2thZ2VzIGlzIHByb3Zpc2lvbmFsIGluIHRoaXMgcmVsZWFzZQorICoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKi8KK3BhY2thZ2Ugb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb21wb25lbnRjb3JlLnVpLnByb3BlcnR5cGFnZTsKKworaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucmVzb3VyY2VzLklQcm9qZWN0OworaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucmVzb3VyY2VzLklSZXNvdXJjZTsKK2ltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJ1bnRpbWUuQ29yZUV4Y2VwdGlvbjsKK2ltcG9ydCBvcmcuZWNsaXBzZS5zd3QuU1dUOworaW1wb3J0IG9yZy5lY2xpcHNlLnN3dC5sYXlvdXQuR3JpZERhdGE7CitpbXBvcnQgb3JnLmVjbGlwc2Uuc3d0LmxheW91dC5HcmlkTGF5b3V0OworaW1wb3J0IG9yZy5lY2xpcHNlLnN3dC53aWRnZXRzLkNvbXBvc2l0ZTsKK2ltcG9ydCBvcmcuZWNsaXBzZS5zd3Qud2lkZ2V0cy5Db250cm9sOworaW1wb3J0IG9yZy5lY2xpcHNlLnN3dC53aWRnZXRzLkxhYmVsOworaW1wb3J0IG9yZy5lY2xpcHNlLnN3dC53aWRnZXRzLlRleHQ7CitpbXBvcnQgb3JnLmVjbGlwc2UudWkuZGlhbG9ncy5Qcm9wZXJ0eVBhZ2U7CitpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb21wb25lbnRjb3JlLkNvbXBvbmVudENvcmU7CitpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb21wb25lbnRjb3JlLnVpLk1lc3NhZ2VzOworaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS51aS5pbnRlcm5hbC5wcm9wZXJ0eXBhZ2UuRGVwZW5kZW5jeVBhZ2VFeHRlbnNpb25NYW5hZ2VyOworaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24ucHJvamVjdC5mYWNldC5jb3JlLklGYWNldGVkUHJvamVjdDsKK2ltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLnByb2plY3QuZmFjZXQuY29yZS5Qcm9qZWN0RmFjZXRzTWFuYWdlcjsKKworLyoqCisgKiBQcmltYXJ5IHByb2plY3QgcHJvcGVydHkgcGFnZSBmb3IgTW9kdWxlIGFzc2VtYmx5OworICovCitwdWJsaWMgY2xhc3MgTW9kdWxlQXNzZW1ibHlSb290UGFnZSBleHRlbmRzIFByb3BlcnR5UGFnZSB7CisJCisJcHJpdmF0ZSBJUHJvamVjdCBwcm9qZWN0OworCXByaXZhdGUgSU1vZHVsZURlcGVuZGVuY2llc0NvbnRyb2xbXSBjb250cm9scyA9IG5ldyBJTW9kdWxlRGVwZW5kZW5jaWVzQ29udHJvbFswXTsKKwkKKwlwdWJsaWMgTW9kdWxlQXNzZW1ibHlSb290UGFnZSgpIHsKKwkJc3VwZXIoKTsKKwl9CisJCisJcHJpdmF0ZSBDb21wb3NpdGUgZ2V0RmFjZXRFcnJvckNvbXBvc2l0ZShmaW5hbCBDb21wb3NpdGUgcGFyZW50KSB7CisJCWZpbmFsIFN0cmluZyBlcnJvckNoZWNraW5nRmFjZXQgPSBNZXNzYWdlcy5FcnJvckNoZWNraW5nRmFjZXRzOworCQlzZXRFcnJvck1lc3NhZ2UoZXJyb3JDaGVja2luZ0ZhY2V0KTsKKwkJcmV0dXJuIGdldEVycm9yQ29tcG9zaXRlKHBhcmVudCwgZXJyb3JDaGVja2luZ0ZhY2V0KTsJCQorCX0KKwlwcml2YXRlIENvbXBvc2l0ZSBnZXRWaXJ0Q29tcEVycm9yQ29tcG9zaXRlKGZpbmFsIENvbXBvc2l0ZSBwYXJlbnQpIHsKKwkJZmluYWwgU3RyaW5nIGVycm9yQ2hlY2tpbmdGYWNldCA9IE1lc3NhZ2VzLkVycm9yTm90VmlydHVhbENvbXBvbmVudDsKKwkJc2V0RXJyb3JNZXNzYWdlKGVycm9yQ2hlY2tpbmdGYWNldCk7CisJCXJldHVybiBnZXRFcnJvckNvbXBvc2l0ZShwYXJlbnQsIGVycm9yQ2hlY2tpbmdGYWNldCk7CQkKKwl9CisJCisJCisJcHJpdmF0ZSBDb21wb3NpdGUgZ2V0RXJyb3JDb21wb3NpdGUoZmluYWwgQ29tcG9zaXRlIHBhcmVudCwgZmluYWwgU3RyaW5nIGVycm9yKSB7CisJCWZpbmFsIENvbXBvc2l0ZSBjb21wb3NpdGUgPSBuZXcgQ29tcG9zaXRlKHBhcmVudCwgU1dULk5PTkUpOworCQlmaW5hbCBHcmlkTGF5b3V0IGxheW91dCA9IG5ldyBHcmlkTGF5b3V0KCk7CisgICAgICAgIGxheW91dC5tYXJnaW5XaWR0aCA9IDA7CisgICAgICAgIGxheW91dC5tYXJnaW5XaWR0aCA9IDA7CisgICAgICAgIGNvbXBvc2l0ZS5zZXRMYXlvdXQobGF5b3V0KTsKKyAgICAgICAgY29tcG9zaXRlLnNldExheW91dERhdGEobmV3IEdyaWREYXRhKEdyaWREYXRhLkZJTExfQk9USCkpOworCQlmaW5hbCBMYWJlbCBsYWJlbD0gbmV3IExhYmVsKGNvbXBvc2l0ZSwgU1dULk5PTkUpOworCQlsYWJlbC5zZXRUZXh0KGVycm9yKTsKKwkJcmV0dXJuIGNvbXBvc2l0ZTsKKwl9CisJCisJLyogKG5vbi1KYXZhZG9jKQorCSAqIEBzZWUgb3JnLmVjbGlwc2UuamZhY2UucHJlZmVyZW5jZS5JUHJlZmVyZW5jZVBhZ2UjcGVyZm9ybU9rKCkKKwkgKi8KKwlwdWJsaWMgYm9vbGVhbiBwZXJmb3JtT2soKSB7CisJCWZvciAoaW50IGkgPSAwOyBpIDwgY29udHJvbHMubGVuZ3RoOyBpKyspIHsKKwkJCWlmIChjb250cm9sc1tpXSAhPSBudWxsKSB7CisJCQkJaWYgKCFjb250cm9sc1tpXS5wZXJmb3JtT2soKSkgeworCQkJCQlyZXR1cm4gZmFsc2U7CisJCQkJfQorCQkJfQorCQl9CisJCXJldHVybiB0cnVlOworCX0KKworCS8qIChub24tSmF2YWRvYykKKwkgKiBAc2VlIG9yZy5lY2xpcHNlLmpmYWNlLnByZWZlcmVuY2UuUHJlZmVyZW5jZVBhZ2UjcGVyZm9ybURlZmF1bHRzKCkKKwkgKi8KKwlwdWJsaWMgdm9pZCBwZXJmb3JtRGVmYXVsdHMoKSB7CisJCWZvciAoaW50IGkgPSAwOyBpIDwgY29udHJvbHMubGVuZ3RoOyBpKyspIHsKKwkJCWlmIChjb250cm9sc1tpXSAhPSBudWxsKSB7CisJCQkJY29udHJvbHNbaV0ucGVyZm9ybURlZmF1bHRzKCk7CisJCQl9CisJCX0KKwl9CisJCisJcHVibGljIHZvaWQgcGVyZm9ybUFwcGx5KCkgeworCQlmb3IgKGludCBpID0gMDsgaSA8IGNvbnRyb2xzLmxlbmd0aDsgaSsrKSB7CisJCQlpZiAoY29udHJvbHNbaV0gIT0gbnVsbCkgeworCQkJCWNvbnRyb2xzW2ldLnBlcmZvcm1BcHBseSgpOworCQkJfQorCQl9CisJfQorCQorCS8qIChub24tSmF2YWRvYykKKwkgKiBAc2VlIG9yZy5lY2xpcHNlLmpmYWNlLnByZWZlcmVuY2UuSVByZWZlcmVuY2VQYWdlI3BlcmZvcm1DYW5jZWwoKQorCSAqLworCXB1YmxpYyBib29sZWFuIHBlcmZvcm1DYW5jZWwoKSB7CisJCWZvciAoaW50IGkgPSAwOyBpIDwgY29udHJvbHMubGVuZ3RoOyBpKyspIHsKKwkJCWlmIChjb250cm9sc1tpXSAhPSBudWxsKSB7CisJCQkJaWYgKCFjb250cm9sc1tpXS5wZXJmb3JtQ2FuY2VsKCkpIHsKKwkJCQkJcmV0dXJuIGZhbHNlOworCQkJCX0KKwkJCX0KKwkJfQorCQlyZXR1cm4gc3VwZXIucGVyZm9ybUNhbmNlbCgpOworCX0KKwkKKwkvKiAobm9uLUphdmFkb2MpCisJICogQHNlZSBvcmcuZWNsaXBzZS5qZmFjZS5kaWFsb2dzLklEaWFsb2dQYWdlI3NldFZpc2libGUoYm9vbGVhbikKKwkgKi8KKwlwdWJsaWMgdm9pZCBzZXRWaXNpYmxlKGJvb2xlYW4gdmlzaWJsZSkgeworCQlzdXBlci5zZXRWaXNpYmxlKHZpc2libGUpOworCQlmb3IgKGludCBpID0gMDsgaSA8IGNvbnRyb2xzLmxlbmd0aDsgaSsrKSB7CisJCQlpZiAoY29udHJvbHNbaV0gIT0gbnVsbCkgeworCQkJCWNvbnRyb2xzW2ldLnNldFZpc2libGUodmlzaWJsZSk7CisJCQl9CisJCX0KKwl9CisJCisJLyogKG5vbi1KYXZhZG9jKQorCSAqIEBzZWUgb3JnLmVjbGlwc2UuamZhY2UuZGlhbG9ncy5JRGlhbG9nUGFnZSNkaXNwb3NlKCkKKwkgKi8KKwlwdWJsaWMgdm9pZCBkaXNwb3NlKCkgeworCQlzdXBlci5kaXNwb3NlKCk7CisJCWZvciAoaW50IGkgPSAwOyBpIDwgY29udHJvbHMubGVuZ3RoOyBpKyspIHsKKwkJCWlmKGNvbnRyb2xzW2ldICE9IG51bGwpeworCQkJCWNvbnRyb2xzW2ldLmRpc3Bvc2UoKTsKKwkJCX0KKwkJfQorCX0KKworCXByb3RlY3RlZCBzdGF0aWMgdm9pZCBjcmVhdGVEZXNjcmlwdGlvbkNvbXBvc2l0ZShmaW5hbCBDb21wb3NpdGUgcGFyZW50LCBmaW5hbCBTdHJpbmcgZGVzY3JpcHRpb24pIHsKKwkJQ29tcG9zaXRlIGRlc2NyaXB0aW9uQ29tcCA9IG5ldyBDb21wb3NpdGUocGFyZW50LCBTV1QuTk9ORSk7CisJCUdyaWRMYXlvdXQgbGF5b3V0ID0gbmV3IEdyaWRMYXlvdXQoKTsKKwkJbGF5b3V0Lm51bUNvbHVtbnMgPSAxOworCQlkZXNjcmlwdGlvbkNvbXAuc2V0TGF5b3V0KGxheW91dCk7CisJCWRlc2NyaXB0aW9uQ29tcC5zZXRMYXlvdXREYXRhKG5ldyBHcmlkRGF0YShHcmlkRGF0YS5GSUxMX0hPUklaT05UQUwpKTsKKwkJZmlsbERlc2NyaXB0aW9uKGRlc2NyaXB0aW9uQ29tcCwgZGVzY3JpcHRpb24pOworCX0KKwkKKwlwcml2YXRlIHN0YXRpYyB2b2lkIGZpbGxEZXNjcmlwdGlvbihDb21wb3NpdGUgYywgU3RyaW5nIHMpIHsKKwkJR3JpZERhdGEgZGF0YSA9IG5ldyBHcmlkRGF0YShHcmlkRGF0YS5GSUxMX0hPUklaT05UQUwpOworCQlkYXRhLndpZHRoSGludCA9IDI1MDsKKwkJVGV4dCB0ZXh0ID0gbmV3IFRleHQoYywgU1dULlJFQURfT05MWSB8IFNXVC5XUkFQKTsKKwkJdGV4dC5zZXRMYXlvdXREYXRhKGRhdGEpOworCQl0ZXh0LnNldFRleHQocyk7CisJfQorCQorCXByb3RlY3RlZCBDb250cm9sIGNyZWF0ZUNvbnRlbnRzKENvbXBvc2l0ZSBwYXJlbnQpIHsKKwkJCisJCS8vIE5lZWQgdG8gZmluZCBvdXQgd2hhdCB0eXBlIG9mIHByb2plY3Qgd2UgYXJlIGhhbmRsaW5nCisJCXByb2plY3QgPSAoSVByb2plY3QpIGdldEVsZW1lbnQoKS5nZXRBZGFwdGVyKElSZXNvdXJjZS5jbGFzcyk7CisJCWlmKCBwcm9qZWN0ICE9IG51bGwgKSB7CisJCQl0cnkgeworCQkJCUlGYWNldGVkUHJvamVjdCBmYWNldGVkUHJvamVjdCA9IFByb2plY3RGYWNldHNNYW5hZ2VyLmNyZWF0ZShwcm9qZWN0KTsgCisJCQkJSURlcGVuZGVuY3lQYWdlUHJvdmlkZXIgcHJvdmlkZXIgPSBudWxsOworCQkJCWlmKCBmYWNldGVkUHJvamVjdCA9PSBudWxsICkKKwkJCQkJcmV0dXJuIGdldEZhY2V0RXJyb3JDb21wb3NpdGUocGFyZW50KTsKKwkJCQkKKwkJCQlwcm92aWRlciA9IERlcGVuZGVuY3lQYWdlRXh0ZW5zaW9uTWFuYWdlci5nZXRNYW5hZ2VyKCkuZ2V0UHJvdmlkZXIoZmFjZXRlZFByb2plY3QpOworCQkJCWlmKCBwcm92aWRlciAhPSBudWxsICkgeworCQkJCQljb250cm9scyA9IHByb3ZpZGVyLmNyZWF0ZVBhZ2VzKGZhY2V0ZWRQcm9qZWN0LCB0aGlzKTsKKwkJCQkJY29udHJvbHMgPSBjb250cm9scyA9PSBudWxsID8gbmV3IElNb2R1bGVEZXBlbmRlbmNpZXNDb250cm9sW117fSA6IGNvbnRyb2xzOworCQkJCQlpZiAocHJvdmlkZXIuZ2V0UGFnZVRpdGxlKHByb2plY3QpICE9IG51bGwpCisJCQkJCQlzZXRUaXRsZShwcm92aWRlci5nZXRQYWdlVGl0bGUocHJvamVjdCkpOworCQkJCQlyZXR1cm4gcHJvdmlkZXIuY3JlYXRlUm9vdENvbnRyb2woZmFjZXRlZFByb2plY3QsIGNvbnRyb2xzLCBwYXJlbnQpOworCQkJCX0KKwkJCQkKKwkJCQlpZiggQ29tcG9uZW50Q29yZS5jcmVhdGVDb21wb25lbnQocHJvamVjdCkgPT0gbnVsbCApCisJCQkJCXJldHVybiBnZXRWaXJ0Q29tcEVycm9yQ29tcG9zaXRlKHBhcmVudCk7CisJCQkJCisJCQkJQWRkTW9kdWxlRGVwZW5kZW5jaWVzUHJvcGVydGllc1BhZ2UgcGFnZSA9IG5ldyBBZGRNb2R1bGVEZXBlbmRlbmNpZXNQcm9wZXJ0aWVzUGFnZShwcm9qZWN0LCB0aGlzKTsKKwkJCQljb250cm9scyA9IG5ldyBJTW9kdWxlRGVwZW5kZW5jaWVzQ29udHJvbFsxXTsKKwkJCQljb250cm9sc1swXSA9IHBhZ2U7CisJCQkJcmV0dXJuIHBhZ2UuY3JlYXRlQ29udGVudHMocGFyZW50KTsKKwkJCX0gY2F0Y2goIENvcmVFeGNlcHRpb24gY2UgKQl7CisJCQl9CisJCX0KKwkJcmV0dXJuIGdldEZhY2V0RXJyb3JDb21wb3NpdGUocGFyZW50KTsKKwl9CisJCisgICAgcHVibGljIHZvaWQgY3JlYXRlQ29udHJvbChDb21wb3NpdGUgcGFyZW50KXsKKyAgICAJc3VwZXIuY3JlYXRlQ29udHJvbChwYXJlbnQpOworICAgIAlnZXREZWZhdWx0c0J1dHRvbigpLnNldFRleHQoTWVzc2FnZXMuUmV2ZXJ0KTsKKyAgICB9Cit9CmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS9NRVRBLUlORi9NQU5JRkVTVC5NRiBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlL01FVEEtSU5GL01BTklGRVNULk1GCmluZGV4IGQzNWIxOTkuLjA5NGRhZjUgMTAwNjQ0Ci0tLSBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlL01FVEEtSU5GL01BTklGRVNULk1GCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlL01FVEEtSU5GL01BTklGRVNULk1GCkBAIC0zLDcgKzMsNyBAQAogQnVuZGxlLU5hbWU6ICVCdW5kbGUtTmFtZS4wCiBCdW5kbGUtVmVuZG9yOiAlcHJvdmlkZXIKIEJ1bmRsZS1TeW1ib2xpY05hbWU6IG9yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZTsgc2luZ2xldG9uOj10cnVlCi1CdW5kbGUtVmVyc2lvbjogMS4xLjIwMS5xdWFsaWZpZXIKK0J1bmRsZS1WZXJzaW9uOiAxLjIuMS5xdWFsaWZpZXIKIEJ1bmRsZS1BY3RpdmF0b3I6IG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS5pbnRlcm5hbC5Nb2R1bGVjb3JlUGx1Z2luCiBCdW5kbGUtTG9jYWxpemF0aW9uOiBwbHVnaW4KIEV4cG9ydC1QYWNrYWdlOiBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUsCkBAIC0xMSwxMCArMTEsMTIgQEAKICBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUuZGF0YW1vZGVsLnByb3BlcnRpZXMsCiAgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb21wb25lbnRjb3JlLmludGVybmFsO3gtaW50ZXJuYWw6PXRydWUsCiAgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb21wb25lbnRjb3JlLmludGVybmFsLmJ1aWxkZXI7eC1pbnRlcm5hbDo9dHJ1ZSwKKyBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUuaW50ZXJuYWwuZmxhdDt4LWludGVybmFsOj10cnVlLAogIG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS5pbnRlcm5hbC5pbXBsO3gtaW50ZXJuYWw6PXRydWUsCiAgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb21wb25lbnRjb3JlLmludGVybmFsLm9wZXJhdGlvbjt4LWludGVybmFsOj10cnVlLAogIG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS5pbnRlcm5hbC5yZXNvdXJjZXM7eC1pbnRlcm5hbDo9dHJ1ZSwKICBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUuaW50ZXJuYWwudXRpbDt4LWludGVybmFsOj10cnVlLAorIG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS5yZXNvbHZlcnM7eC1pbnRlcm5hbDo9dHJ1ZSwKICBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUucmVzb3VyY2VzCiBSZXF1aXJlLUJ1bmRsZTogb3JnLmVjbGlwc2UuY29yZS5ydW50aW1lO2J1bmRsZS12ZXJzaW9uPSJbMy40LjAsNC4wLjApIiwKICBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3M7YnVuZGxlLXZlcnNpb249IlsxLjEuMjAwLDIuMC4wKSIsCkBAIC0zMCw1ICszMiw2IEBACiAgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5wcm9qZWN0LmZhY2V0LmNvcmU7YnVuZGxlLXZlcnNpb249IlsxLjMuMCwyLjAuMCkiLAogIG9yZy5lY2xpcHNlLndzdC5jb21tb24uZW52aXJvbm1lbnQ7YnVuZGxlLXZlcnNpb249IlsxLjAuMjAwLDIuMC4wKSIsCiAgb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb247YnVuZGxlLXZlcnNpb249IlsxLjIuMCwyLjAuMCkiCitCdW5kbGUtQWN0aXZhdGlvblBvbGljeTogbGF6eQogRWNsaXBzZS1MYXp5U3RhcnQ6IHRydWUKIEJ1bmRsZS1SZXF1aXJlZEV4ZWN1dGlvbkVudmlyb25tZW50OiBKMlNFLTEuNQpkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUvamF2YWRvYy1pbWFnZXMvY29tcG9uZW50Q29yZS54c2QgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS9qYXZhZG9jLWltYWdlcy9jb21wb25lbnRDb3JlLnhzZAppbmRleCBhMmQ4ODI4Li5mNmM4N2U5IDEwMDY0NAotLS0gYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS9qYXZhZG9jLWltYWdlcy9jb21wb25lbnRDb3JlLnhzZAorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS9qYXZhZG9jLWltYWdlcy9jb21wb25lbnRDb3JlLnhzZApAQCAtMzEsNiArMzEsOSBAQAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCTxhdHRyaWJ1dGUgbmFtZT0iaGFuZGxlIg0KICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAkJdHlwZT0ic3RyaW5nIiB1c2U9InJlcXVpcmVkIj4NCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAJPC9hdHRyaWJ1dGU+DQorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCTxhdHRyaWJ1dGUgbmFtZT0iYXJjaGl2ZU5hbWUiDQorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCQl0eXBlPSJzdHJpbmciIHVzZT0ib3B0aW9uYWwiPg0KKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAk8L2F0dHJpYnV0ZT4NCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAJPGF0dHJpYnV0ZSBuYW1lPSJkZXBsb3ktcGF0aCINCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAJCXR5cGU9InN0cmluZyIgdXNlPSJyZXF1aXJlZCI+DQogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCTwvYXR0cmlidXRlPg0KZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlL21vZHVsZWNvcmUtc3JjL21vZHVsZWNvcmUucHJvcGVydGllcyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlL21vZHVsZWNvcmUtc3JjL21vZHVsZWNvcmUucHJvcGVydGllcwppbmRleCA1NWI2MjhlLi5kMzA3ZjRhIDEwMDY0NAotLS0gYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS9tb2R1bGVjb3JlLXNyYy9tb2R1bGVjb3JlLnByb3BlcnRpZXMKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUvbW9kdWxlY29yZS1zcmMvbW9kdWxlY29yZS5wcm9wZXJ0aWVzCkBAIC04LDQgKzgsNCBAQAogIyBDb250cmlidXRvcnM6CiAjIElCTSBDb3Jwb3JhdGlvbiAtIGluaXRpYWwgQVBJIGFuZCBpbXBsZW1lbnRhdGlvbgogIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIwotTkVFRFNNSUdSQVRJTkc9VGhpcyBwcm9qZWN0IG5lZWRzIHRvIG1pZ3JhdGUgV1RQIG1ldGFkYXRhClwgTm8gbmV3bGluZSBhdCBlbmQgb2YgZmlsZQorTkVFRFNNSUdSQVRJTkc9VGhpcyBwcm9qZWN0IG5lZWRzIHRvIG1pZ3JhdGUgbWV0YWRhdGEKXCBObyBuZXdsaW5lIGF0IGVuZCBvZiBmaWxlCmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS9tb2R1bGVjb3JlLXNyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2NvbXBvbmVudGNvcmUvQXJ0aWZhY3RFZGl0LmphdmEgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS9tb2R1bGVjb3JlLXNyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2NvbXBvbmVudGNvcmUvQXJ0aWZhY3RFZGl0LmphdmEKaW5kZXggNDZjNTQxZC4uZWVlN2I4YSAxMDA2NDQKLS0tIGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUvbW9kdWxlY29yZS1zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9jb21wb25lbnRjb3JlL0FydGlmYWN0RWRpdC5qYXZhCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlL21vZHVsZWNvcmUtc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vY29tcG9uZW50Y29yZS9BcnRpZmFjdEVkaXQuamF2YQpAQCAtMjgxLDEzICsyODEsMjIgQEAKIAkgKiAgICAgICAgICAgIHtAc2VlIE1vZHVsZUNvcmVOYXR1cmV9CiAJICovCiAJcHJvdGVjdGVkIEFydGlmYWN0RWRpdChNb2R1bGVDb3JlTmF0dXJlIGFOYXR1cmUsIElWaXJ0dWFsQ29tcG9uZW50IGFNb2R1bGUsIGJvb2xlYW4gdG9BY2Nlc3NBc1JlYWRPbmx5KSB7Ci0JCWlmICh0b0FjY2Vzc0FzUmVhZE9ubHkpCi0JCQlhcnRpZmFjdEVkaXRNb2RlbCA9IGFOYXR1cmUuZ2V0QXJ0aWZhY3RFZGl0TW9kZWxGb3JSZWFkKE1vZHVsZVVSSVV0aWwuZnVsbHlRdWFsaWZ5VVJJKGFNb2R1bGUuZ2V0UHJvamVjdCgpKSwgdGhpcyk7Ci0JCWVsc2UKLQkJCWFydGlmYWN0RWRpdE1vZGVsID0gYU5hdHVyZS5nZXRBcnRpZmFjdEVkaXRNb2RlbEZvcldyaXRlKE1vZHVsZVVSSVV0aWwuZnVsbHlRdWFsaWZ5VVJJKGFNb2R1bGUuZ2V0UHJvamVjdCgpKSwgdGhpcyk7CisJCQogCQlpc1JlYWRPbmx5ID0gdG9BY2Nlc3NBc1JlYWRPbmx5OwogCQlpc0FydGlmYWN0RWRpdE1vZGVsU2VsZk1hbmFnZWQgPSB0cnVlOwogCQlwcm9qZWN0ID0gYU5hdHVyZS5nZXRQcm9qZWN0KCk7CisJCUlQcm9qZWN0IGFQcm9qZWN0ID0gYU1vZHVsZS5nZXRQcm9qZWN0KCk7CisJCVVSSSBjb21wb25lbnRVUkkgPSBNb2R1bGVVUklVdGlsLmZ1bGx5UXVhbGlmeVVSSShhUHJvamVjdCk7CisJCU1hcCBlZGl0TW9kZWxQYXJhbXMgPSBudWxsOworCQlpZiAoZ2V0Q29udGVudFR5cGVEZXNjcmliZXIoKSAhPSBudWxsKSB7CisJCQllZGl0TW9kZWxQYXJhbXMgPSBuZXcgSGFzaE1hcCgpOworCQkJZWRpdE1vZGVsUGFyYW1zLnB1dChBcnRpZmFjdEVkaXRNb2RlbEZhY3RvcnkuUEFSQU1fUk9PVF9VUkksIGdldFJvb3RVUkkoKSk7CisJCQllZGl0TW9kZWxQYXJhbXMucHV0KEFydGlmYWN0RWRpdE1vZGVsRmFjdG9yeS5QQVJBTV9ST09UX0NPTlRFTlRfVFlQRSwgZ2V0Q29udGVudFR5cGVEZXNjcmliZXIoKSk7CisJCX0KKwkJaWYgKHRvQWNjZXNzQXNSZWFkT25seSkgCisJCQlhcnRpZmFjdEVkaXRNb2RlbCA9IGFOYXR1cmUuZ2V0QXJ0aWZhY3RFZGl0TW9kZWxGb3JSZWFkKGNvbXBvbmVudFVSSSwgdGhpcywgbnVsbCwgZWRpdE1vZGVsUGFyYW1zKTsKKwkJZWxzZSAKKwkJCWFydGlmYWN0RWRpdE1vZGVsID0gYU5hdHVyZS5nZXRBcnRpZmFjdEVkaXRNb2RlbEZvcldyaXRlKGNvbXBvbmVudFVSSSwgdGhpcywgbnVsbCwgZWRpdE1vZGVsUGFyYW1zKTsKIAl9CiAKIAkvKioKQEAgLTQwNiwxMyArNDE1LDEzIEBACiAJcHJvdGVjdGVkIFN0cmluZyBnZXRDb250ZW50VHlwZURlc2NyaWJlcigpIHsKIAkJCiAJCWlmIChpc1Byb2plY3RPZlR5cGUocHJvamVjdCwgSU1vZHVsZUNvbnN0YW50cy5KU1RfRUpCX01PRFVMRSkpCi0JCQlyZXR1cm4gIm9yZy5lY2xpcHNlLmpzdC5qMmVlLmVqYkREIjsKKwkJCXJldHVybiAib3JnLmVjbGlwc2UuanN0LmoyZWUuZWpiREQiOyAvLyROT04tTkxTLTEkCiAJCWlmIChpc1Byb2plY3RPZlR5cGUocHJvamVjdCwgSU1vZHVsZUNvbnN0YW50cy5KU1RfV0VCX01PRFVMRSkpCi0JCQlyZXR1cm4gIm9yZy5lY2xpcHNlLmpzdC5qMmVlLndlYkREIjsKKwkJCXJldHVybiAib3JnLmVjbGlwc2UuanN0LmoyZWUud2ViREQiOyAvLyROT04tTkxTLTEkCiAJCWlmIChpc1Byb2plY3RPZlR5cGUocHJvamVjdCwgSU1vZHVsZUNvbnN0YW50cy5KU1RfRUFSX01PRFVMRSkpCi0JCQlyZXR1cm4gIm9yZy5lY2xpcHNlLmpzdC5qMmVlLmVhckREIjsKKwkJCXJldHVybiAib3JnLmVjbGlwc2UuanN0LmoyZWUuZWFyREQiOyAvLyROT04tTkxTLTEkCiAJCWlmIChpc1Byb2plY3RPZlR5cGUocHJvamVjdCwgSU1vZHVsZUNvbnN0YW50cy5KU1RfQVBQQ0xJRU5UX01PRFVMRSkpCi0JCQlyZXR1cm4gIm9yZy5lY2xpcHNlLmpzdC5qMmVlLmFwcGNsaWVudEREIjsKKwkJCXJldHVybiAib3JnLmVjbGlwc2UuanN0LmoyZWUuYXBwY2xpZW50REQiOyAvLyROT04tTkxTLTEkCiAJCXJldHVybiBudWxsOwogCX0KIAkKQEAgLTQ2Nyw3ICs0NzYsNyBAQAogCXB1YmxpYyB2b2lkIHNhdmVJZk5lY2Vzc2FyeShJUHJvZ3Jlc3NNb25pdG9yIGFNb25pdG9yKSB7CiAJCWlmIChpc1JlYWRPbmx5KCkpCiAJCQl0aHJvd0F0dGVtcHRlZFJlYWRPbmx5TW9kaWZpY2F0aW9uKCk7Ci0JCWVsc2UgaWYgKHZhbGlkYXRlRWRpdCgpLmlzT0soKSkKKwkJZWxzZSBpZiAoYXJ0aWZhY3RFZGl0TW9kZWwuaXNEaXJ0eSgpICYmIHZhbGlkYXRlRWRpdCgpLmlzT0soKSkKIAkJCWFydGlmYWN0RWRpdE1vZGVsLnNhdmVJZk5lY2Vzc2FyeShhTW9uaXRvciwgdGhpcyk7CiAJfQogCQpkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUvbW9kdWxlY29yZS1zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9jb21wb25lbnRjb3JlL0NvbXBvbmVudENvcmUuamF2YSBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlL21vZHVsZWNvcmUtc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vY29tcG9uZW50Y29yZS9Db21wb25lbnRDb3JlLmphdmEKaW5kZXggOTNjMWUzNS4uMzZlNGE1YyAxMDA2NDQKLS0tIGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUvbW9kdWxlY29yZS1zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9jb21wb25lbnRjb3JlL0NvbXBvbmVudENvcmUuamF2YQorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS9tb2R1bGVjb3JlLXNyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2NvbXBvbmVudGNvcmUvQ29tcG9uZW50Q29yZS5qYXZhCkBAIC0xNyw2ICsxNyw3IEBACiBpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5yZXNvdXJjZXMuSVJlc291cmNlOwogaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucnVudGltZS5JUGF0aDsKIGltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUuaW50ZXJuYWwuQ29tcG9uZW50UmVzb3VyY2U7CitpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb21wb25lbnRjb3JlLmludGVybmFsLk1vZHVsZWNvcmVQbHVnaW47CiBpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb21wb25lbnRjb3JlLmludGVybmFsLlN0cnVjdHVyZUVkaXQ7CiBpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb21wb25lbnRjb3JlLmludGVybmFsLmltcGwuUmVzb3VyY2VUcmVlTm9kZTsKIGltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUuaW50ZXJuYWwucmVzb3VyY2VzLlZpcnR1YWxGaWxlOwpAQCAtNzAsNiArNzEsMjYgQEAKIAkgKiAKIAkgKiBAcGFyYW0gYVByb2plY3QKIAkgKiAgICAgICAgICAgIEEgdmFsaWQsIGFjY2Vzc2libGUgcHJvamVjdCB0byBjb250YWluIHRoZSBjb21wb25lbnQKKwkgKiBAcGFyYW0gY2hlY2tGb3JDb21wb25lbnRGaWxlCisJICogICAgICAgICAgICBBIGZsYWcgdG8gaW5kaWNhdGUgaWYgdGhlIHByZXNlbmNlIG9mIHRoZSBjb21wb25lbnQgZmlsZSBzaG91bGQgYmUgY2hlY2tlZAorCSAqIEByZXR1cm4gQSBoYW5kbGUgdG8gYW4gSVZpcnR1YWxDb21wb25lbnQgdGhhdCBtYXkgb3IgbWF5IG5vdCBleGlzdCBvcgorCSAqICAgICAgICAgbnVsbCBpZiBwYXNzZWQgcHJvamVjdCBkb2VzIG5vdCBjb250YWluIE1vZHVsZUNvcmVOYXR1cmUuCisJICogQHNlZSBvcmcuZWNsaXBzZS5jb3JlLnJ1bnRpbWUuSVByb2dyZXNzTW9uaXRvciNjcmVhdGUoaW50LCBvcmcuZWNsaXBzZS5jb3JlLnJ1bnRpbWUuSVByb2dyZXNzTW9uaXRvcikKKwkgKi8KKwlwdWJsaWMgc3RhdGljIElWaXJ0dWFsQ29tcG9uZW50IGNyZWF0ZUNvbXBvbmVudChJUHJvamVjdCBhUHJvamVjdCwgYm9vbGVhbiBjaGVja0ZvckNvbXBvbmVudEZpbGUpIHsKKwkJaWYgKGFQcm9qZWN0ID09IG51bGwgfHwgIWFQcm9qZWN0LmlzQWNjZXNzaWJsZSgpKXsKKwkJCXJldHVybiBudWxsOworCQl9CisJCXJldHVybiBDb21wb25lbnRJbXBsTWFuYWdlci5pbnN0YW5jZSgpLmNyZWF0ZUNvbXBvbmVudChhUHJvamVjdCwgY2hlY2tGb3JDb21wb25lbnRGaWxlKTsKKwl9CisKKwkvKioKKwkgKiBSZXR1cm4gYW4gSVZpcnR1YWxDb21wb25lbnQgd2l0aCB0aGUgZ2l2ZW4gbmFtZSAoYUNvbXBvbmVudE5hbWUpCisJICogY29udGFpbmVkIGJ5IHRoZSBnaXZlbiBwcm9qZWN0IChhUHJvamVjdCkuIENvbXBvbmVudCBuYW1lcyBzaG91bGQgYmUKKwkgKiB1bmlxdWUgYWNyb3NzIGEgcHJvamVjdC4KKwkgKiAKKwkgKiBAcGFyYW0gYVByb2plY3QKKwkgKiAgICAgICAgICAgIEEgdmFsaWQsIGFjY2Vzc2libGUgcHJvamVjdCB0byBjb250YWluIHRoZSBjb21wb25lbnQKIAkgKiBAcmV0dXJuIEEgaGFuZGxlIHRvIGFuIElWaXJ0dWFsQ29tcG9uZW50IHRoYXQgbWF5IG9yIG1heSBub3QgZXhpc3Qgb3IKIAkgKiAgICAgICAgIG51bGwgaWYgcGFzc2VkIHByb2plY3QgZG9lcyBub3QgY29udGFpbiBNb2R1bGVDb3JlTmF0dXJlLgogCSAqIEBkZXByZWNhdGVkCkBAIC05NCw2ICsxMTUsMjEgQEAKIAl9CiAKIAkvKioKKwkgKiBSZXR1cm4gYW4gSVZpcnR1YWxDb21wb25lbnQgd2l0aCB0aGUgZ2l2ZW4gbmFtZSAoYUNvbXBvbmVudE5hbWUpCisJICogYW5kIHRoZSBnaXZlbiBydW50aW1lIHBhdGggKHBhdGgpCisJICogCisJICogQHBhcmFtIGFDb21wb25lbnROYW1lCisJICogICAgICAgICAgICBBIG5hbWUgdG8gaWRlbnRpZnkgdGhlIGNvbXBvbmVudCwgdGhlIG5hbWUgY2FuIGJlCisJICogICAgICAgICAgICBsaWIvJmx0O0Fic29sdXRlIHBhdGggb2YgYSBqYXImZ3Q7IG9yCisJICogICAgICAgICAgICB2YXIvJmx0O0NMQVNTUEFUSF9WQVJJQUJMRS9saWJyYXJ5IG5hbWVyJmd0OworCSAqIEByZXR1cm4gQSBoYW5kbGUgdG8gYW4gSVZpcnR1YWxDb21wb25lbnQgdGhhdCBtYXkgb3IgbWF5IG5vdCBleGlzdC4KKwkgKiBAc2VlIG9yZy5lY2xpcHNlLmNvcmUucnVudGltZS5JUHJvZ3Jlc3NNb25pdG9yI2NyZWF0ZShpbnQsIG9yZy5lY2xpcHNlLmNvcmUucnVudGltZS5JUHJvZ3Jlc3NNb25pdG9yKQorCSAqLworCXB1YmxpYyBzdGF0aWMgSVZpcnR1YWxDb21wb25lbnQgY3JlYXRlQXJjaGl2ZUNvbXBvbmVudChJUHJvamVjdCBhUHJvamVjdCwgU3RyaW5nIGFDb21wb25lbnROYW1lLCBJUGF0aCBydW50aW1lUGF0aCkgeworCQlyZXR1cm4gQ29tcG9uZW50SW1wbE1hbmFnZXIuaW5zdGFuY2UoKS5jcmVhdGVBcmNoaXZlQ29tcG9uZW50KGFQcm9qZWN0LCBhQ29tcG9uZW50TmFtZSwgcnVudGltZVBhdGgpOworCX0KKworCS8qKgogCSAqIFJldHVybiBhbiBJVmlydHVhbEZvbGRlciB3aXRoIGEgcnVudGltZSBwYXRoIHNwZWNpZmllZCBieSBhUnVudGltZVBhdGgKIAkgKiBjb250YWluZWQgYnkgYVByb2plY3QsIGluIGEgY29tcG9uZW50IG5hbWVkIGFDb21wb25lbnROYW1lLiBUaGUgcmVzdWx0YW50CiAJICogSVZpcnR1YWxGb2xkZXIgbWF5IG9yIG1heSBub3QgZXhpc3QuCkBAIC0xODEsNyArMjE3LDcgQEAKIAkJCQl9CiAJCQl9CiAJCX0gY2F0Y2ggKFVucmVzb2x2ZWFibGVVUklFeGNlcHRpb24gZSkgewotCQkJZS5wcmludFN0YWNrVHJhY2UoKTsKKwkJCU1vZHVsZWNvcmVQbHVnaW4ubG9nRXJyb3IoZSk7CiAJCX0gZmluYWxseSB7CiAJCQlpZiAoc2UgIT0gbnVsbCkgewogCQkJCXNlLmRpc3Bvc2UoKTsKZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlL21vZHVsZWNvcmUtc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vY29tcG9uZW50Y29yZS9Nb2R1bGVDb3JlTmF0dXJlLmphdmEgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS9tb2R1bGVjb3JlLXNyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2NvbXBvbmVudGNvcmUvTW9kdWxlQ29yZU5hdHVyZS5qYXZhCmluZGV4IDViOGE0NzUuLmFiOTY4NTMgMTAwNjQ0Ci0tLSBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlL21vZHVsZWNvcmUtc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vY29tcG9uZW50Y29yZS9Nb2R1bGVDb3JlTmF0dXJlLmphdmEKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUvbW9kdWxlY29yZS1zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9jb21wb25lbnRjb3JlL01vZHVsZUNvcmVOYXR1cmUuamF2YQpAQCAtMTMsNiArMTMsNyBAQAogaW1wb3J0IGphdmEudXRpbC5IYXNoTWFwOwogaW1wb3J0IGphdmEudXRpbC5NYXA7CiAKK2ltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJlc291cmNlcy5JRmlsZTsKIGltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJlc291cmNlcy5JUHJvamVjdDsKIGltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJlc291cmNlcy5JUHJvamVjdERlc2NyaXB0aW9uOwogaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucmVzb3VyY2VzLklQcm9qZWN0TmF0dXJlOwpAQCAtMzgsNiArMzksNyBAQAogaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS5pbnRlcm5hbC5pbXBsLkFydGlmYWN0RWRpdE1vZGVsRmFjdG9yeTsKIGltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUuaW50ZXJuYWwuaW1wbC5Db21wb25lbnRDb3JlVVJJQ29udmVydGVyOwogaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS5pbnRlcm5hbC5pbXBsLk1vZHVsZVN0cnVjdHVyYWxNb2RlbEZhY3Rvcnk7CitpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb21wb25lbnRjb3JlLmludGVybmFsLmltcGwuV1RQTW9kdWxlc1Jlc291cmNlRmFjdG9yeTsKIGltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUuaW50ZXJuYWwuaW1wbC5XVFBSZXNvdXJjZUZhY3RvcnlSZWdpc3RyeTsKIGltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUuaW50ZXJuYWwudXRpbC5JTW9kdWxlQ29uc3RhbnRzOwogaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS5pbnRlcm5hbC51dGlsLk1vZHVsZUNvcmVNZXNzYWdlczsKQEAgLTE2NSw4ICsxNjcsMzMgQEAKIAkJfQogCQlyZXR1cm4gbnVsbDsKIAl9CisJLy8gVGhlIGV4aXN0ZW5jZSBvZiB0aGlzIE5hdHVyZSBwbHVzIHRoZSBjb21wb25lbnQgZmlsZSBvbiBkaXNrIG1ha2VzIGEgZmxleGlibGUgcHJvamVjdAogCXB1YmxpYyBzdGF0aWMgYm9vbGVhbiBpc0ZsZXhpYmxlUHJvamVjdChJUHJvamVjdCBwcm9qZWN0KSB7Ci0JCXJldHVybiBNb2R1bGVDb3JlTmF0dXJlLmdldE1vZHVsZUNvcmVOYXR1cmUocHJvamVjdCkgIT0gbnVsbDsKKwkJYm9vbGVhbiBmb3VuZE5hdHVyZSA9IE1vZHVsZUNvcmVOYXR1cmUuZ2V0TW9kdWxlQ29yZU5hdHVyZShwcm9qZWN0KSAhPSBudWxsOworCQlpZiAoZm91bmROYXR1cmUpIHsKKwkJCXJldHVybiBjb21wb25lbnRSZXNvdXJjZUV4aXN0cyhwcm9qZWN0KTsKKwkJfQorCQlyZXR1cm4gZmFsc2U7CisJfQorCXB1YmxpYyBzdGF0aWMgYm9vbGVhbiBjb21wb25lbnRSZXNvdXJjZUV4aXN0cyhJUHJvamVjdCBwcm9qZWN0KSB7CisJCQorCQlJRmlsZSBjb21wRmlsZSA9IHByb2plY3QuZ2V0RmlsZShTdHJ1Y3R1cmVFZGl0Lk1PRFVMRV9NRVRBX0ZJTEVfTkFNRSk7CisJCWlmIChjb21wRmlsZS5pc0FjY2Vzc2libGUoKSkKKwkJCXJldHVybiB0cnVlOworCQllbHNlIHsgLy9OZWVkIHRvIGNoZWNrIGZvciBsZWdhY3kgZmlsZSBsb2NhdGlvbnMgYWxzby4uLi4KKwkJCWNvbXBGaWxlID0gcHJvamVjdC5nZXRGaWxlKE1vZHVsZVN0cnVjdHVyYWxNb2RlbC5SMV9NT0RVTEVfTUVUQV9GSUxFX05BTUUpOworCQkJaWYgKGNvbXBGaWxlLmlzQWNjZXNzaWJsZSgpKQorCQkJCXJldHVybiB0cnVlOworCQkJZWxzZSB7CisJCQkJY29tcEZpbGUgPSBwcm9qZWN0LmdldEZpbGUoTW9kdWxlU3RydWN0dXJhbE1vZGVsLlIwXzdfTU9EVUxFX01FVEFfRklMRV9OQU1FKTsKKwkJCQlpZiAoY29tcEZpbGUuaXNBY2Nlc3NpYmxlKCkpCisJCQkJCXJldHVybiB0cnVlOworCQkJCWVsc2UgeworCQkJCQljb21wRmlsZSA9IHByb2plY3QuZ2V0RmlsZShXVFBNb2R1bGVzUmVzb3VyY2VGYWN0b3J5LkZJUlNUX1dUUF9NT0RVTEVTX1NIT1JUX05BTUUpOworCQkJCQlyZXR1cm4gY29tcEZpbGUuaXNBY2Nlc3NpYmxlKCk7CisJCQkJfQorCQkJfQorCQl9CiAJfQogCiAJLyoqCkBAIC0yMDIsMTQgKzIyOSwxNCBAQAogCQkJCWRlc2NyaXB0aW9uLnNldE5hdHVyZUlkcyhuZXdOYXR1cmVJZHMpOwogCQkJCWFQcm9qZWN0LnNldERlc2NyaXB0aW9uKGRlc2NyaXB0aW9uLCBhTW9uaXRvcik7CiAJCQl9IGNhdGNoIChDb3JlRXhjZXB0aW9uIGUpIHsKLQkJCQllLnByaW50U3RhY2tUcmFjZSgpOyAJCQkJCisJCQkJTW9kdWxlY29yZVBsdWdpbi5sb2dFcnJvcihlKTsKIAkJCX0gZmluYWxseSB7CiAJCQkJbWFuYWdlci5lbmRSdWxlKHJvb3QpOwogCQkJfSAJCQkKIAkJCWlmIChhTW9uaXRvciAhPSBudWxsKQogCQkJCWFNb25pdG9yLmRvbmUoKTsKIAkJfSBjYXRjaCAoQ29yZUV4Y2VwdGlvbiBlKSB7Ci0JCQllLnByaW50U3RhY2tUcmFjZSgpOworCQkJTW9kdWxlY29yZVBsdWdpbi5sb2dFcnJvcihlKTsKIAkJfQogCQkvKiBSZXR1cm4gdGhlIG5ldyBuYXR1cmUgKi8KIAkJcmV0dXJuIGdldE1vZHVsZUNvcmVOYXR1cmUoYVByb2plY3QpOwpAQCAtMjQyLDE1ICsyNjksMTAgQEAKIAkJTW9kdWxlU3RydWN0dXJhbE1vZGVsIGVkaXRNb2RlbCA9IChNb2R1bGVTdHJ1Y3R1cmFsTW9kZWwpZ2V0RW1mQ29udGV4dCgpLmdldEV4aXN0aW5nRWRpdE1vZGVsKE1vZHVsZVN0cnVjdHVyYWxNb2RlbEZhY3RvcnkuTU9EVUxFX1NUUlVDVFVSQUxfTU9ERUxfSUQsIG51bGwsdHJ1ZSk7CiAJCWlmIChlZGl0TW9kZWwgPT0gbnVsbCkgewogCQkJZWRpdE1vZGVsID0gKE1vZHVsZVN0cnVjdHVyYWxNb2RlbClFZGl0TW9kZWxSZWdpc3RyeS5nZXRJbnN0YW5jZSgpLmNyZWF0ZUVkaXRNb2RlbEZvclJlYWQoTW9kdWxlU3RydWN0dXJhbE1vZGVsRmFjdG9yeS5NT0RVTEVfU1RSVUNUVVJBTF9NT0RFTF9JRCwgZ2V0RW1mQ29udGV4dCgpLCBudWxsKTsKLQkJCXN5bmNocm9uaXplZCAoZWRpdE1vZGVsKSB7Ci0JCQkJZ2V0RW1mQ29udGV4dCgpLmNhY2hlRWRpdE1vZGVsKGVkaXRNb2RlbCwgbnVsbCk7Ci0JCQkJZWRpdE1vZGVsLmFjY2VzcyhhbkFjY2Vzc29yS2V5KTsKLQkJCX0KLQkJfSBlbHNlIHsKLQkJCXN5bmNocm9uaXplZCAoZWRpdE1vZGVsKSB7Ci0JCQkJZWRpdE1vZGVsLmFjY2VzcyhhbkFjY2Vzc29yS2V5KTsKLQkJCX0KLQkJfQorCQkJZ2V0RW1mQ29udGV4dCgpLmNhY2hlRWRpdE1vZGVsKGVkaXRNb2RlbCwgbnVsbCk7CisJCQllZGl0TW9kZWwuYWNjZXNzKGFuQWNjZXNzb3JLZXkpOworCQl9IGVsc2UgCisJCQllZGl0TW9kZWwuYWNjZXNzKGFuQWNjZXNzb3JLZXkpOwogCQlyZXR1cm4gZWRpdE1vZGVsOwogCX0KIApAQCAtMjgxLDE1ICszMDMsMTIgQEAKIAkJTW9kdWxlU3RydWN0dXJhbE1vZGVsIGVkaXRNb2RlbCA9IChNb2R1bGVTdHJ1Y3R1cmFsTW9kZWwpZ2V0RW1mQ29udGV4dCgpLmdldEV4aXN0aW5nRWRpdE1vZGVsKE1vZHVsZVN0cnVjdHVyYWxNb2RlbEZhY3RvcnkuTU9EVUxFX1NUUlVDVFVSQUxfTU9ERUxfSUQsIG51bGwsZmFsc2UpOwogCQlpZiAoZWRpdE1vZGVsID09IG51bGwpIHsKIAkJCWVkaXRNb2RlbCA9IChNb2R1bGVTdHJ1Y3R1cmFsTW9kZWwpRWRpdE1vZGVsUmVnaXN0cnkuZ2V0SW5zdGFuY2UoKS5jcmVhdGVFZGl0TW9kZWxGb3JXcml0ZShNb2R1bGVTdHJ1Y3R1cmFsTW9kZWxGYWN0b3J5Lk1PRFVMRV9TVFJVQ1RVUkFMX01PREVMX0lELCBnZXRFbWZDb250ZXh0KCksIG51bGwpOwotCQkJc3luY2hyb25pemVkIChlZGl0TW9kZWwpIHsKLQkJCQlnZXRFbWZDb250ZXh0KCkuY2FjaGVFZGl0TW9kZWwoZWRpdE1vZGVsLCBudWxsKTsKLQkJCQllZGl0TW9kZWwuYWNjZXNzKGFuQWNjZXNzb3JLZXkpOwotCQkJfQotCQl9IGVsc2UgewotCQkJc3luY2hyb25pemVkIChlZGl0TW9kZWwpIHsKLQkJCQllZGl0TW9kZWwuYWNjZXNzKGFuQWNjZXNzb3JLZXkpOwotCQkJfQotCQl9CisJCQlnZXRFbWZDb250ZXh0KCkuY2FjaGVFZGl0TW9kZWwoZWRpdE1vZGVsLCBudWxsKTsKKwkJCWVkaXRNb2RlbC5hY2Nlc3MoYW5BY2Nlc3NvcktleSk7CisJCQkKKwkJfSBlbHNlIAorCQkJZWRpdE1vZGVsLmFjY2VzcyhhbkFjY2Vzc29yS2V5KTsKKwkJCiAJCXJldHVybiBlZGl0TW9kZWw7CiAJfQogCkBAIC01MjIsNyArNTQxLDggQEAKIAkJLy8gYWRkQWRhcHRlckZhY3RvcmllcyhzZXQpOwogCQkvLyBzZXQuZ2V0U3luY2hyb25pemVyKCkuYWRkRXh0ZW5kZXIodGhpcyk7IC8vIGFkZGVkIHNvIHdlIGNhbiBiZSBpbmZvcm1lZCBvZiBjbG9zZXMgdG8gdGhlCiAJCS8vIG5ldyBKMkVFUmVzb3VyY2VEZXBlbmRlbmN5UmVnaXN0ZXIoc2V0KTsgLy8gVGhpcyBtdXN0IGJlIGRvbmUgYWZ0ZXIgdGhlIFVSSUNvbnZlcnRlciBpcwotCQlwcm9qZWN0UmVzb3VyY2VTZXQuZ2V0U3luY2hyb25pemVyKCkuYWRkRXh0ZW5kZXIodGhpcyk7IC8vIGFkZGVkIHNvIHdlIGNhbiBiZSBpbmZvcm1lZCBvZiBjbG9zZXMKKwkJaWYocHJvamVjdFJlc291cmNlU2V0LmdldFN5bmNocm9uaXplcigpICE9IG51bGwpCisJCQlwcm9qZWN0UmVzb3VyY2VTZXQuZ2V0U3luY2hyb25pemVyKCkuYWRkRXh0ZW5kZXIodGhpcyk7IC8vIGFkZGVkIHNvIHdlIGNhbiBiZSBpbmZvcm1lZCBvZiBjbG9zZXMKIAkJY2FjaGVNb2R1bGVTdHJ1Y3R1cmFsTW9kZWxzKCk7CiAJfQogCQpAQCAtNTgyLDExICs2MDIsMTEgQEAKIAlwcml2YXRlIHZvaWQgY2FjaGVNb2R1bGVTdHJ1Y3R1cmFsTW9kZWxzKCkgewogCQlpZiAoY2FjaGVkV3JpdGVIYW5kbGUgPT0gbnVsbCkKIAkJCWNhY2hlZFdyaXRlSGFuZGxlID0gZ2V0TW9kdWxlU3RydWN0dXJhbE1vZGVsRm9yV3JpdGUodGhpcyk7Ci0JCWlmIChjYWNoZWRSZWFkSGFuZGxlID09IG51bGwpCi0JCQljYWNoZWRSZWFkSGFuZGxlID0gZ2V0TW9kdWxlU3RydWN0dXJhbE1vZGVsRm9yUmVhZCh0aGlzKTsKKwkJLy9pZiAoY2FjaGVkUmVhZEhhbmRsZSA9PSBudWxsKQorCQkvLwljYWNoZWRSZWFkSGFuZGxlID0gZ2V0TW9kdWxlU3RydWN0dXJhbE1vZGVsRm9yUmVhZCh0aGlzKTsKIAl9CiAKLQlwcm90ZWN0ZWQgU3RyaW5nIGdldFBsdWdpbklEKCkgeworCXB1YmxpYyBTdHJpbmcgZ2V0UGx1Z2luSUQoKSB7CiAJCXJldHVybiBNT0RVTEVfUExVR19JTl9JRDsKIAl9CiAKQEAgLTYxOSw4ICs2MzksOCBAQAogCQlpZiAoZGVsdGEuZ2V0S2luZCgpID09IElSZXNvdXJjZURlbHRhLk9QRU4pIHsKIAkJCWlmIChjYWNoZWRXcml0ZUhhbmRsZSA9PSBudWxsKQogCQkJCWNhY2hlZFdyaXRlSGFuZGxlID0gZ2V0TW9kdWxlU3RydWN0dXJhbE1vZGVsRm9yV3JpdGUodGhpcyk7Ci0JCQlpZiAoY2FjaGVkUmVhZEhhbmRsZSA9PSBudWxsKQotCQkJCWNhY2hlZFJlYWRIYW5kbGUgPSBnZXRNb2R1bGVTdHJ1Y3R1cmFsTW9kZWxGb3JSZWFkKHRoaXMpOworCQkJLy9pZiAoY2FjaGVkUmVhZEhhbmRsZSA9PSBudWxsKQorCQkJLy8JY2FjaGVkUmVhZEhhbmRsZSA9IGdldE1vZHVsZVN0cnVjdHVyYWxNb2RlbEZvclJlYWQodGhpcyk7CiAJCX0KIAkKIAl9CkBAIC02MzYsOCArNjU2LDggQEAKIC8vCQlTeXN0ZW0ub3V0LnByaW50bG4oYnVmZmVyLnRvU3RyaW5nKCkpOwogCQl0aGlzLmVtZkNvbnRleHQgPSBudWxsOwogCQlpZiAoY2FjaGVkV3JpdGVIYW5kbGUgIT0gbnVsbCkgewotCQkJaWYgKGNhY2hlZFdyaXRlSGFuZGxlLmlzRGlydHkoKSkKLQkJCQljYWNoZWRXcml0ZUhhbmRsZS5zYXZlSWZOZWNlc3NhcnkodGhpcyk7CisvLwkJCWlmIChjYWNoZWRXcml0ZUhhbmRsZS5pc0RpcnR5KCkpCisvLwkJCQljYWNoZWRXcml0ZUhhbmRsZS5zYXZlSWZOZWNlc3NhcnkodGhpcyk7CiAJCQljYWNoZWRXcml0ZUhhbmRsZS5kaXNwb3NlKCk7CiAJCQljYWNoZWRXcml0ZUhhbmRsZSA9IG51bGw7CiAJCX0KZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlL21vZHVsZWNvcmUtc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vY29tcG9uZW50Y29yZS9kYXRhbW9kZWwvRmFjZXREYXRhTW9kZWxDb25maWdBZGFwdGVyLmphdmEgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS9tb2R1bGVjb3JlLXNyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2NvbXBvbmVudGNvcmUvZGF0YW1vZGVsL0ZhY2V0RGF0YU1vZGVsQ29uZmlnQWRhcHRlci5qYXZhCmluZGV4IDQzMWM3ZWUuLmNjODY3NWQgMTAwNjQ0Ci0tLSBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlL21vZHVsZWNvcmUtc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vY29tcG9uZW50Y29yZS9kYXRhbW9kZWwvRmFjZXREYXRhTW9kZWxDb25maWdBZGFwdGVyLmphdmEKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUvbW9kdWxlY29yZS1zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9jb21wb25lbnRjb3JlL2RhdGFtb2RlbC9GYWNldERhdGFNb2RlbENvbmZpZ0FkYXB0ZXIuamF2YQpAQCAtNjIsNiArNjIsMTIgQEAKICAgICB7CiAgICAgICAgIHJldHVybiBkbS52YWxpZGF0ZSgpOwogICAgIH0KKyAgICAKKyAgICBwdWJsaWMgdm9pZCBkaXNwb3NlKCkKKyAgICB7CisgICAgICAgIHN1cGVyLmRpc3Bvc2UoKTsKKyAgICAgICAgZG0uZGlzcG9zZSgpOworICAgIH0KIAogICAgIHB1YmxpYyBzdGF0aWMgZmluYWwgY2xhc3MgRmFjdG9yeQogICAgIApkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUvbW9kdWxlY29yZS1zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9jb21wb25lbnRjb3JlL2RhdGFtb2RlbC9GYWNldFByb2plY3RDcmVhdGlvbkRhdGFNb2RlbFByb3ZpZGVyLmphdmEgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS9tb2R1bGVjb3JlLXNyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2NvbXBvbmVudGNvcmUvZGF0YW1vZGVsL0ZhY2V0UHJvamVjdENyZWF0aW9uRGF0YU1vZGVsUHJvdmlkZXIuamF2YQppbmRleCBkOGNiNWQ2Li5mNDE1ODJkIDEwMDY0NAotLS0gYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS9tb2R1bGVjb3JlLXNyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2NvbXBvbmVudGNvcmUvZGF0YW1vZGVsL0ZhY2V0UHJvamVjdENyZWF0aW9uRGF0YU1vZGVsUHJvdmlkZXIuamF2YQorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS9tb2R1bGVjb3JlLXNyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2NvbXBvbmVudGNvcmUvZGF0YW1vZGVsL0ZhY2V0UHJvamVjdENyZWF0aW9uRGF0YU1vZGVsUHJvdmlkZXIuamF2YQpAQCAtMjQsOSArMjQsOSBAQAogaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucnVudGltZS5JU3RhdHVzOwogaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucnVudGltZS5QYXRoOwogaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucnVudGltZS5QbGF0Zm9ybTsKLWltcG9ydCBvcmcuZWNsaXBzZS5qZW0udXRpbC5sb2dnZXIucHJveHkuTG9nZ2VyOwogaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS5kYXRhbW9kZWwucHJvcGVydGllcy5JRmFjZXREYXRhTW9kZWxQcm9wZXJ0aWVzOwogaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS5kYXRhbW9kZWwucHJvcGVydGllcy5JRmFjZXRQcm9qZWN0Q3JlYXRpb25EYXRhTW9kZWxQcm9wZXJ0aWVzOworaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS5pbnRlcm5hbC5Nb2R1bGVjb3JlUGx1Z2luOwogaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS5pbnRlcm5hbC5vcGVyYXRpb24uRmFjZXRQcm9qZWN0Q3JlYXRpb25PcGVyYXRpb247CiBpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzLmRhdGFtb2RlbC5BYnN0cmFjdERhdGFNb2RlbFByb3ZpZGVyOwogaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy5kYXRhbW9kZWwuRGF0YU1vZGVsRXZlbnQ7CkBAIC04MCwxMCArODAsMTEgQEAKIAkJcmV0dXJuIG5hbWVzOwogCX0KIAorCXByaXZhdGUgZmluYWwgSUZhY2V0ZWRQcm9qZWN0V29ya2luZ0NvcHkgZnBqd2MgPSBGYWNldGVkUHJvamVjdEZyYW1ld29yay5jcmVhdGVOZXdQcm9qZWN0KCk7CisJCiAJcHVibGljIHZvaWQgaW5pdCgpIHsKIAkJc3VwZXIuaW5pdCgpOwogCQkKLQkJZmluYWwgSUZhY2V0ZWRQcm9qZWN0V29ya2luZ0NvcHkgZnBqd2MgPSBGYWNldGVkUHJvamVjdEZyYW1ld29yay5jcmVhdGVOZXdQcm9qZWN0KCk7CiAJCW1vZGVsLnNldFByb3BlcnR5KEZBQ0VURURfUFJPSkVDVF9XT1JLSU5HX0NPUFksIGZwandjKTsKIAkJCiAJCWZwandjLmFkZExpc3RlbmVyCkBAIC0xMzQsNyArMTM1LDEwIEBACiAgICAgICAgICAgICAgICAgewogICAgICAgICAgICAgICAgICAgICBmaW5hbCBTdHJpbmcgcHJvamVjdE5hbWUgPSAoU3RyaW5nKSBldmVudC5nZXRQcm9wZXJ0eSgpOwogCQkJCQlnZXREYXRhTW9kZWwoKS5zZXRQcm9wZXJ0eShGQUNFVF9QUk9KRUNUX05BTUUsIHByb2plY3ROYW1lKTsKLQkJCQkJZnBqd2Muc2V0UHJvamVjdE5hbWUoIHByb2plY3ROYW1lICk7CisJCQkJCUlTdGF0dXMgc3RhdHVzID0gZ2V0RGF0YU1vZGVsKCkudmFsaWRhdGVQcm9wZXJ0eShGQUNFVF9QUk9KRUNUX05BTUUpOworICAgICAgICAgICAgICAgICAgICBpZiggc3RhdHVzLmlzT0soKSApeworICAgICAgICAgICAgICAgICAgICAJZnBqd2Muc2V0UHJvamVjdE5hbWUoIHByb2plY3ROYW1lICk7CisgICAgICAgICAgICAgICAgICAgIH0KIAkJCQl9CiAgICAgICAgICAgICAgICAgZWxzZSBpZiggcHJvcC5lcXVhbHMoIElQcm9qZWN0Q3JlYXRpb25Qcm9wZXJ0aWVzTmV3LlBST0pFQ1RfTE9DQVRJT04gKSApCiAgICAgICAgICAgICAgICAgewpAQCAtMTQ2LDYgKzE1MCwxNCBAQAogCQltb2RlbC5hZGROZXN0ZWRNb2RlbChORVNURURfUFJPSkVDVF9ETSwgcHJvamVjdERhdGFNb2RlbCk7CiAJfQogCisJQE92ZXJyaWRlCisJcHVibGljIHZvaWQgZGlzcG9zZSgpIHsKKwkJaWYoZnBqd2MgIT0gbnVsbCl7CisJCQlmcGp3Yy5kaXNwb3NlKCk7CisJCX0KKwkJc3VwZXIuZGlzcG9zZSgpOworCX0KKwkKIAlwcm90ZWN0ZWQgY2xhc3MgRmFjZXRBY3Rpb25NYXBJbXBsIGV4dGVuZHMgSGFzaE1hcCBpbXBsZW1lbnRzIEZhY2V0QWN0aW9uTWFwIHsKIAkJcHJpdmF0ZSBzdGF0aWMgZmluYWwgbG9uZyBzZXJpYWxWZXJzaW9uVUlEID0gMUw7CiAJCXByaXZhdGUgYm9vbGVhbiBzdXByZXNzTm90aWZpY2F0aW9uID0gZmFsc2U7CkBAIC0zMjAsNyArMzMyLDcgQEAKIAkJCQkJCQkJZmFjZXRNb2RlbC5zZXRQcm9wZXJ0eShJRmFjZXREYXRhTW9kZWxQcm9wZXJ0aWVzLkZBQ0VUX1ZFUlNJT04sIG5ld1ZlcnNpb24pOwogCQkJCQkJCX0KIAkJCQkJCX0gY2F0Y2ggKENvcmVFeGNlcHRpb24gZSkgewotCQkJCQkJCUxvZ2dlci5nZXRMb2dnZXIoKS5sb2dFcnJvcihlKTsKKwkJCQkJCQlNb2R1bGVjb3JlUGx1Z2luLmxvZ0Vycm9yKGUpOwogCQkJCQkJfQogCQkJCQl9CiAJCQkJfQpAQCAtMzQ3LDcgKzM1OSwxNCBAQAogCSAgICAgICAgICAgICAgICBjb25maWcgPSBQbGF0Zm9ybS5nZXRBZGFwdGVyTWFuYWdlcigpLmdldEFkYXB0ZXIoIGNvbmZpZywgSURhdGFNb2RlbC5jbGFzcyApOwogCSAgICAgICAgICAgIH0KIAkgICAgICAgICAgICAKLQkgICAgICAgICAgICBmYWNldERtTWFwLmFkZCggKElEYXRhTW9kZWwpIGNvbmZpZyApOworCSAgICAgICAgICAgIGZpbmFsIElEYXRhTW9kZWwgZG0gPSAoSURhdGFNb2RlbCkgY29uZmlnOworCSAgICAgICAgICAgIAorCSAgICAgICAgICAgIGZhY2V0RG1NYXAucHV0KCBmYWNldC5nZXRJZCgpLCBkbSApOworCSAgICAgICAgICAgIAorCSAgICAgICAgICAgIGZvciggU3RyaW5nIGFsaWFzIDogZmFjZXQuZ2V0QWxpYXNlcygpICkKKwkgICAgICAgICAgICB7CisJICAgICAgICAgICAgICAgIGZhY2V0RG1NYXAucHV0KCBhbGlhcywgZG0gKTsKKwkgICAgICAgICAgICB9CiAJICAgICAgICB9CiAJCX0KIAkJcmV0dXJuIHN1cGVyLnByb3BlcnR5U2V0KHByb3BlcnR5TmFtZSwgcHJvcGVydHlWYWx1ZSk7CkBAIC00MjAsNyArNDM5LDcgQEAKIAkJCQlkZXNjcmlwdG9yc1tpXSA9IG5ldyBEYXRhTW9kZWxQcm9wZXJ0eURlc2NyaXB0b3IocnVudGltZSwgcnVudGltZS5nZXRMb2NhbGl6ZWROYW1lKCkpOwogCQkJfQogCQkJaWYoZGVzY3JpcHRvcnMubGVuZ3RoID4gMil7Ci0JCQkJQXJyYXlzLnNvcnQoZGVzY3JpcHRvcnMsIDAsIGRlc2NyaXB0b3JzLmxlbmd0aCAtIDIsIG5ldyBDb21wYXJhdG9yKCkgeworCQkJCUFycmF5cy5zb3J0KGRlc2NyaXB0b3JzLCAwLCBkZXNjcmlwdG9ycy5sZW5ndGggLSAxLCBuZXcgQ29tcGFyYXRvcigpIHsKIAkJCQkJcHVibGljIGludCBjb21wYXJlKE9iamVjdCBhcmcwLCBPYmplY3QgYXJnMSkgewogCQkJCQkJRGF0YU1vZGVsUHJvcGVydHlEZXNjcmlwdG9yIGQxID0gKERhdGFNb2RlbFByb3BlcnR5RGVzY3JpcHRvcilhcmcwOwogCQkJCQkJRGF0YU1vZGVsUHJvcGVydHlEZXNjcmlwdG9yIGQyID0gKERhdGFNb2RlbFByb3BlcnR5RGVzY3JpcHRvcilhcmcxOwpkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUvbW9kdWxlY29yZS1zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9jb21wb25lbnRjb3JlL2RhdGFtb2RlbC9Qcm9qZWN0TWlncmF0b3JEYXRhTW9kZWxQcm92aWRlci5qYXZhIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUvbW9kdWxlY29yZS1zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9jb21wb25lbnRjb3JlL2RhdGFtb2RlbC9Qcm9qZWN0TWlncmF0b3JEYXRhTW9kZWxQcm92aWRlci5qYXZhCmluZGV4IDIxYzNjYTMuLjA3YWRjYWYgMTAwNjQ0Ci0tLSBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlL21vZHVsZWNvcmUtc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vY29tcG9uZW50Y29yZS9kYXRhbW9kZWwvUHJvamVjdE1pZ3JhdG9yRGF0YU1vZGVsUHJvdmlkZXIuamF2YQorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS9tb2R1bGVjb3JlLXNyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2NvbXBvbmVudGNvcmUvZGF0YW1vZGVsL1Byb2plY3RNaWdyYXRvckRhdGFNb2RlbFByb3ZpZGVyLmphdmEKQEAgLTE3LDYgKzE3LDEyIEBACiBpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzLmRhdGFtb2RlbC5BYnN0cmFjdERhdGFNb2RlbFByb3ZpZGVyOwogaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy5kYXRhbW9kZWwuSURhdGFNb2RlbE9wZXJhdGlvbjsKIAorLyoqCisgKiBUaGlzIGhhcyBiZWVuIGRlcHJlY2F0ZWQgc2luY2UgV1RQIDMuMS4yIGFuZCB3aWxsIGJlIGRlbGV0ZWQgcG9zdCBXVFAgMy4yLgorICogU2VlIGh0dHBzOi8vYnVncy5lY2xpcHNlLm9yZy9idWdzL3Nob3dfYnVnLmNnaT9pZD0yOTI5MzQKKyAqIEBkZXByZWNhdGVkIAorICogQGF1dGhvciBqc2hvbGwKKyAqLwogcHVibGljIGNsYXNzIFByb2plY3RNaWdyYXRvckRhdGFNb2RlbFByb3ZpZGVyIGV4dGVuZHMgQWJzdHJhY3REYXRhTW9kZWxQcm92aWRlciBpbXBsZW1lbnRzIElQcm9qZWN0TWlncmF0b3JEYXRhTW9kZWxQcm9wZXJ0aWVzIHsKIAogCXB1YmxpYyBTZXQgZ2V0UHJvcGVydHlOYW1lcygpIHsKZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlL21vZHVsZWNvcmUtc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vY29tcG9uZW50Y29yZS9kYXRhbW9kZWwvcHJvcGVydGllcy9JQWRkUmVmZXJlbmNlRGF0YU1vZGVsUHJvcGVydGllcy5qYXZhIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUvbW9kdWxlY29yZS1zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9jb21wb25lbnRjb3JlL2RhdGFtb2RlbC9wcm9wZXJ0aWVzL0lBZGRSZWZlcmVuY2VEYXRhTW9kZWxQcm9wZXJ0aWVzLmphdmEKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uMjM2Nzg5MgotLS0gL2Rldi9udWxsCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlL21vZHVsZWNvcmUtc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vY29tcG9uZW50Y29yZS9kYXRhbW9kZWwvcHJvcGVydGllcy9JQWRkUmVmZXJlbmNlRGF0YU1vZGVsUHJvcGVydGllcy5qYXZhCkBAIC0wLDAgKzEsNDMgQEAKKy8qKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioKKyAqIENvcHlyaWdodCAoYykgMjAwOSBSZWQgSGF0CisgKiBBbGwgcmlnaHRzIHJlc2VydmVkLiBUaGlzIHByb2dyYW0gYW5kIHRoZSBhY2NvbXBhbnlpbmcgbWF0ZXJpYWxzCisgKiBhcmUgbWFkZSBhdmFpbGFibGUgdW5kZXIgdGhlIHRlcm1zIG9mIHRoZSBFY2xpcHNlIFB1YmxpYyBMaWNlbnNlIHYxLjAKKyAqIHdoaWNoIGFjY29tcGFuaWVzIHRoaXMgZGlzdHJpYnV0aW9uLCBhbmQgaXMgYXZhaWxhYmxlIGF0CisgKiBodHRwOi8vd3d3LmVjbGlwc2Uub3JnL2xlZ2FsL2VwbC12MTAuaHRtbAorICoKKyAqIENvbnRyaWJ1dG9yczoKKyAqICAgIFJvYiBTdHJ5a2VyIC0gaW5pdGlhbCBpbXBsZW1lbnRhdGlvbiBhbmQgb25nb2luZyBtYWludGVuYW5jZQorICoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKi8KK3BhY2thZ2Ugb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb21wb25lbnRjb3JlLmRhdGFtb2RlbC5wcm9wZXJ0aWVzOworCisKKy8qKgorICogVGhpcyBpcyBhbiBhbHRlcm5hdGl2ZSB0byBJQ3JlYXRlUmVmZXJlbmNlQ29tcG9uZW50c0RhdGFNb2RlbFByb3BlcnRpZXMKKyAqIEl0IGlzIG1lYW50IHRvIGJlIGEgc2ltcGxlciB0eXBlIG9mIG9wZXJhdGlvbiB3aGVyZSB5b3UgY2FuIHBhc3MgaW4KKyAqIGFuIGFscmVhZHktZm9ybWVkIElWaXJ0dWFsUmVmZXJlbmNlIHJhdGhlciB0aGFuIHRoZSBpbmRpdmlkdWFsIHByb3BlcnRpZXMKKyAqIHRvIGJlIHNldC4gCisgKi8KK3B1YmxpYyBpbnRlcmZhY2UgSUFkZFJlZmVyZW5jZURhdGFNb2RlbFByb3BlcnRpZXMgeworCQorCS8qKgorCSAqIDxwPgorCSAqIFRoaXMgcmVxdWlyZWQgcHJvcGVydHkgaXMgdGhlIHtAbGluayBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUucmVzb3VyY2VzLklWaXJ0dWFsQ29tcG9uZW50fSB3aGljaCB3aWxsIHJlZmVyZW5jZSB0aGUKKwkgKiB7QGxpbmsgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb21wb25lbnRjb3JlLnJlc291cmNlcy5JVmlydHVhbENvbXBvbmVudH1zIHNwZWNpZmllZCBieSB7QGxpbmsgI1RBUkdFVF9DT01QT05FTlRfTElTVH0uCisJICogPC9wPgorCSAqIDxwPgorCSAqIEZvciBleGFtcGxlLCBpZiB7QGxpbmsgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb21wb25lbnRjb3JlLnJlc291cmNlcy5JVmlydHVhbENvbXBvbmVudH1zIEEsIEIsIGFuZCBDIGV4aXN0IGFuZCByZWZlcmVuY2VzIGFyZSByZXF1aXJlZAorCSAqIGZyb20gQSB0byBCIGFuZCBBIHRvIEMsIHRoZW4ge0BsaW5rICNTT1VSQ0VfQ09NUE9ORU5UfSBzaG91bGQgYmUgc2V0IHRvIEEsIGFuZAorCSAqIHtAbGluayAjVEFSR0VUX0NPTVBPTkVOVF9MSVNUfSBzaG91bGQgYmUgc2V0IHRvIGEge0BsaW5rIGphdmEudXRpbC5MaXN0fSBjb250YWluaW5nIEIgYW5kIEMuCisJICogPC9wPgorCSAqLworCXB1YmxpYyBzdGF0aWMgZmluYWwgU3RyaW5nIFNPVVJDRV9DT01QT05FTlQgPSAiSUFkZFJlZmVyZW5jZURhdGFNb2RlbFByb3BlcnRpZXMuU09VUkNFX0NPTVBPTkVOVCI7IC8vJE5PTi1OTFMtMSQKKworCS8qKgorCSAqIDxwPgorCSAqIFRoaXMgcmVxdWlyZWQgcHJvcGVydHkgaXMgdGhlIHtAbGluayBqYXZhLnV0aWwuTGlzdH0gY29udGFpbmluZyB0aGUge0BsaW5rIG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS5yZXNvdXJjZXMuSVZpcnR1YWxSZWZlcmVuY2V9cyB0aGF0CisJICogd2lsbCBiZSByZWZlcmVuY2VkIGZyb20gdGhlIHtAbGluayBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUucmVzb3VyY2VzLklWaXJ0dWFsQ29tcG9uZW50fSBzcGVjaWZpZWQgYnkge0BsaW5rICNTT1VSQ0VfQ09NUE9ORU5UfS4KKwkgKiBJdCBtYXkgYWxzbyBiZSBhIHNpbmdsZSB7QGxpbmsgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb21wb25lbnRjb3JlLnJlc291cmNlcy5JVmlydHVhbFJlZmVyZW5jZX0gaWYgZGVzaXJlZAorCSAqIDwvcD4KKwkgKi8KKwlwdWJsaWMgc3RhdGljIGZpbmFsIFN0cmluZyBUQVJHRVRfUkVGRVJFTkNFX0xJU1QgPSAiSUFkZFJlZmVyZW5jZURhdGFNb2RlbFByb3BlcnRpZXMuVEFSR0VUX1JFRkVSRU5DRV9MSVNUIjsgLy8kTk9OLU5MUy0xJAorfQpkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUvbW9kdWxlY29yZS1zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9jb21wb25lbnRjb3JlL2RhdGFtb2RlbC9wcm9wZXJ0aWVzL0lDb21wb25lbnRDcmVhdGlvbkRhdGFNb2RlbFByb3BlcnRpZXMuamF2YSBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlL21vZHVsZWNvcmUtc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vY29tcG9uZW50Y29yZS9kYXRhbW9kZWwvcHJvcGVydGllcy9JQ29tcG9uZW50Q3JlYXRpb25EYXRhTW9kZWxQcm9wZXJ0aWVzLmphdmEKZGVsZXRlZCBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IGM4ZGNmNTYuLjAwMDAwMDAKLS0tIGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUvbW9kdWxlY29yZS1zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9jb21wb25lbnRjb3JlL2RhdGFtb2RlbC9wcm9wZXJ0aWVzL0lDb21wb25lbnRDcmVhdGlvbkRhdGFNb2RlbFByb3BlcnRpZXMuamF2YQorKysgL2Rldi9udWxsCkBAIC0xLDgzICswLDAgQEAKLS8qKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqCi0gKiBDb3B5cmlnaHQgKGMpIDIwMDMsIDIwMDYgSUJNIENvcnBvcmF0aW9uIGFuZCBvdGhlcnMuCi0gKiBBbGwgcmlnaHRzIHJlc2VydmVkLiBUaGlzIHByb2dyYW0gYW5kIHRoZSBhY2NvbXBhbnlpbmcgbWF0ZXJpYWxzCi0gKiBhcmUgbWFkZSBhdmFpbGFibGUgdW5kZXIgdGhlIHRlcm1zIG9mIHRoZSBFY2xpcHNlIFB1YmxpYyBMaWNlbnNlIHYxLjAKLSAqIHdoaWNoIGFjY29tcGFuaWVzIHRoaXMgZGlzdHJpYnV0aW9uLCBhbmQgaXMgYXZhaWxhYmxlIGF0Ci0gKiBodHRwOi8vd3d3LmVjbGlwc2Uub3JnL2xlZ2FsL2VwbC12MTAuaHRtbAotICoKLSAqIENvbnRyaWJ1dG9yczoKLSAqICAgICBJQk0gQ29ycG9yYXRpb24gLSBpbml0aWFsIEFQSSBhbmQgaW1wbGVtZW50YXRpb24KLSAqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqLwotcGFja2FnZSBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUuZGF0YW1vZGVsLnByb3BlcnRpZXM7Ci0KLWltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3MuZGF0YW1vZGVsLklEYXRhTW9kZWxQcm9wZXJ0aWVzOwotaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy5pbnRlcm5hbC5Eb05vdFVzZU1lVGhpc1dpbGxCZURlbGV0ZWRQb3N0MTU7Ci0KLS8qKgotICogPHA+Ci0gKiBJQ29tcG9uZW50Q3JlYXRpb25EYXRhTW9kZWxQcm9wZXJ0aWVzIHByb3ZpZGVzIHByb3BlcnRpZXMgdG8gdGhlIERhdGFNb2RlbCBhc3NvY2lhdGVkIHdpdGggdGhlCi0gKiBDb21wb25lbnRDcmVhdGlvbkRhdGFNb2RlbFByb3ZpZGVyIGFzIHdlbGwgYXMgYWxsIGV4dGVuZGluZyBpbnRlcmZhY2VzIGV4dGVuZGluZwotICogSUNvbXBvbmVudENyZWF0aW9uRGF0YU1vZGVsUHJvcGVydGllcyBzcGVjaWZpY2FsbHksIGJ1dCBub3QgbGltaXRlZCB0byBhbGwgSjJFRSBjb21wb25lbnQgcmVsYXRlZAotICogY3JlYXRpb24uCi0gKiAKLSAqIEBzZWUgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb21wb25lbnRjb3JlLmludGVybmFsLm9wZXJhdGlvbi5Db21wb25lbnRDcmVhdGlvbkRhdGFNb2RlbFByb3ZpZGVyCi0gKiAgICAgIDwvcD4KLSAqICAgICAgPHA+Ci0gKiAgICAgIFRoaXMgaW50ZXJmYWNlIGlzIG5vdCBpbnRlbmRlZCB0byBiZSBpbXBsZW1lbnRlZCBieSBjbGllbnRzLgotICogICAgICA8L3A+Ci0gKiAKLSAqIEBzZWUgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzLmRhdGFtb2RlbC5JRGF0YU1vZGVsUHJvdmlkZXIKLSAqIEBzZWUgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzLmRhdGFtb2RlbC5EYXRhTW9kZWxGYWN0b3J5Ci0gKiBAc2VlIG9yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy5kYXRhbW9kZWwuSURhdGFNb2RlbFByb3BlcnRpZXMKLSAqIAotICogQHBsYW5uZWRmb3IgMS4wCi0gKi8KLS8qKgotICogVGhpcyBoYXMgYmVlbiBzbGF0ZWQgZm9yIHJlbW92YWwgcG9zdCBXVFAgMS41LiBEbyBub3QgdXNlIHRoaXMgY2xhc3MvaW50ZXJmYWNlCi0gKiAKLSAqIEBkZXByZWNhdGVkCi0gKiAKLSAqIEBzZWUgSUNvbm5lY3RvckZhY2V0SW5zdGFsbERhdGFNb2RlbFByb3BlcnRpZXMKLSAqLwotcHVibGljIGludGVyZmFjZSBJQ29tcG9uZW50Q3JlYXRpb25EYXRhTW9kZWxQcm9wZXJ0aWVzIGV4dGVuZHMgSURhdGFNb2RlbFByb3BlcnRpZXMsIERvTm90VXNlTWVUaGlzV2lsbEJlRGVsZXRlZFBvc3QxNSB7Ci0KLQkvKioKLQkgKiBSZXF1aXJlZCwgdHlwZSBTdHJpbmcuIFRoZSB1c2VyIGRlZmluZWQgbmFtZSBvZiB0aGUgdGFyZ2V0IHByb2plY3QgZm9yIHRoZSBjb21wb25lbnQgdG8gYmUKLQkgKiBjcmVhdGVkLgotCSAqLwotCXB1YmxpYyBzdGF0aWMgZmluYWwgU3RyaW5nIFBST0pFQ1RfTkFNRSA9ICJJQ29tcG9uZW50Q3JlYXRpb25EYXRhTW9kZWxQcm9wZXJ0aWVzLlBST0pFQ1RfTkFNRSI7IC8vJE5PTi1OTFMtMSQKLQkvKioKLQkgKiBSZXF1aXJlZCwgdHlwZSBTdHJpbmcuIFRoZSB1c2VyIGRlZmluZWQgbmFtZSBvZiB0aGUgY29tcG9uZW50IHRvIGJlIGNyZWF0ZWQuCi0JICovCi0JcHVibGljIHN0YXRpYyBmaW5hbCBTdHJpbmcgQ09NUE9ORU5UX05BTUUgPSAiSUNvbXBvbmVudENyZWF0aW9uRGF0YU1vZGVsUHJvcGVydGllcy5DT01QT05FTlRfTkFNRSI7IC8vJE5PTi1OTFMtMSQKLQkvKioKLQkgKiBSZXF1aXJlZCwgdHlwZSBTdHJpbmcuIFRoZSB1c2VyIGRlZmluZWQgbG9jYXRpb24gb24gZGlzayBvZiB0aGUgdGFyZ2V0IHByb2plY3QgZm9yIHRoZQotCSAqIGNvbXBvbmVudCB0byBiZSBjcmVhdGVkLiBEZWZhdWx0ZWQgdG8gZGVmYXVsdCBlY2xpcHNlIHdvcmtzcGFjZSBsb2NhdGlvbgotCSAqLwotCXB1YmxpYyBzdGF0aWMgZmluYWwgU3RyaW5nIExPQ0FUSU9OID0gIklGbGV4aWJsZVByb2plY3RDcmVhdGlvbkRhdGFNb2RlbFByb3BlcnRpZXMuTE9DQVRJT04iOyAvLyROT04tTkxTLTEkCi0KLQotCS8qKgotCSAqIFJlcXVpcmVkLCB0eXBlIFN0cmluZy4gVGhlIHVzZXIgZGVmaW5lZCBkZXBsb3kgbmFtZSBvZiB0aGUgY29tcG9uZW50IHRvIGJlIGNyZWF0ZWQuIFRoZQotCSAqIERhdGFNb2RlbFByb3ZpZGVyIHdpbGwgZGVmYXVsdCB0aGUgbmFtZSB0byB0aGUgQ09NUE9ORU5UX05BTUUuCi0JICovCi0JcHVibGljIHN0YXRpYyBmaW5hbCBTdHJpbmcgQ09NUE9ORU5UX0RFUExPWV9OQU1FID0gIklDb21wb25lbnRDcmVhdGlvbkRhdGFNb2RlbFByb3BlcnRpZXMuQ09NUE9ORU5UX0RFUExPWV9OQU1FIjsgLy8kTk9OLU5MUy0xJAotCS8qKgotCSAqIFJlcXVpcmVkLCB0eXBlIFN0cmluZy4gTmVzdGVkIG9wZXJhdGlvbiB0byBjcmVhdGUgYSBuZXcgcHJvamVjdC4KLQkgKi8KLQlwdWJsaWMgc3RhdGljIGZpbmFsIFN0cmluZyBORVNURURfUFJPSkVDVF9DUkVBVElPTl9ETSA9ICJJQ29tcG9uZW50Q3JlYXRpb25EYXRhTW9kZWxQcm9wZXJ0aWVzLk5FU1RFRF9QUk9KRUNUX0NSRUFUSU9OX0RNIjsgLy8kTk9OLU5MUy0xJAotCS8vIFRPRE8gZGVsZXRlIHRoaXMKLQkvKioKLQkgKiBPcHRpb25hbCwgdHlwZSBCb29sZWFuIFRoZSBkZWZhdWx0IHZhbHVlIGlzIDxjb2RlPkJvb2xlYW4uVFJVRTwvY29kZT4uIElmIHRoaXMgcHJvcGVydHkgaXMKLQkgKiBzZXQgdG8gPGNvZGU+Qm9vbGVhbi5UUlVFPC9jb2RlPiB0aGVuIGEgZGVmYXVsdCBkZXBsb3ltZW50IGRlc2NyaXB0b3IgYW5kIHN1cHBvcnRpbmcKLQkgKiBiaW5kaW5ncyBmaWxlcyB3aWxsIGJlIGdlbmVyYXRlZC4KLQkgKi8KLQlwdWJsaWMgc3RhdGljIGZpbmFsIFN0cmluZyBDUkVBVEVfREVGQVVMVF9GSUxFUyA9ICJJQ29tcG9uZW50Q3JlYXRpb25EYXRhTW9kZWxQcm9wZXJ0aWVzLkNSRUFURV9ERUZBVUxUX0ZJTEVTIjsgLy8kTk9OLU5MUy0xJAotCi0JLyoqCi0JICogQW4gdW5zZXR0YWJsZSByZXN1bHQgcHJvcGVydHkgdXNlZCB0byByZXRyZWl2ZSB0aGUgY3JlYXRlZCB2aXJ0dWFsIGNvbXBvbmVudCBhZnRlciB0aGUKLQkgKiBvcGVyYXRpb24gaGFzIGV4ZWN1dGVkLgotCSAqLwotCXB1YmxpYyBzdGF0aWMgZmluYWwgU3RyaW5nIENPTVBPTkVOVCA9ICJJQ29tcG9uZW50Q3JlYXRpb25EYXRhTW9kZWxQcm9wZXJ0aWVzLkNPTVBPTkVOVCI7IC8vJE5PTi1OTFMtMSQKLQotfQpkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUvbW9kdWxlY29yZS1zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9jb21wb25lbnRjb3JlL2RhdGFtb2RlbC9wcm9wZXJ0aWVzL0lQcm9qZWN0TWlncmF0b3JEYXRhTW9kZWxQcm9wZXJ0aWVzLmphdmEgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS9tb2R1bGVjb3JlLXNyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2NvbXBvbmVudGNvcmUvZGF0YW1vZGVsL3Byb3BlcnRpZXMvSVByb2plY3RNaWdyYXRvckRhdGFNb2RlbFByb3BlcnRpZXMuamF2YQppbmRleCAxZTkzZmZmLi4wMTJiNDlkIDEwMDY0NAotLS0gYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS9tb2R1bGVjb3JlLXNyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2NvbXBvbmVudGNvcmUvZGF0YW1vZGVsL3Byb3BlcnRpZXMvSVByb2plY3RNaWdyYXRvckRhdGFNb2RlbFByb3BlcnRpZXMuamF2YQorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS9tb2R1bGVjb3JlLXNyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2NvbXBvbmVudGNvcmUvZGF0YW1vZGVsL3Byb3BlcnRpZXMvSVByb2plY3RNaWdyYXRvckRhdGFNb2RlbFByb3BlcnRpZXMuamF2YQpAQCAtMTIsNiArMTIsMTIgQEAKIAogaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy5kYXRhbW9kZWwuSURhdGFNb2RlbFByb3BlcnRpZXM7CiAKKy8qKgorICogVGhpcyBoYXMgYmVlbiBkZXByZWNhdGVkIHNpbmNlIFdUUCAzLjEuMiBhbmQgd2lsbCBiZSBkZWxldGVkIHBvc3QgV1RQIDMuMi4KKyAqIFNlZSBodHRwczovL2J1Z3MuZWNsaXBzZS5vcmcvYnVncy9zaG93X2J1Zy5jZ2k/aWQ9MjkyOTM0CisgKiBAZGVwcmVjYXRlZCAKKyAqIEBhdXRob3IganNob2xsCisgKi8KIHB1YmxpYyBpbnRlcmZhY2UgSVByb2plY3RNaWdyYXRvckRhdGFNb2RlbFByb3BlcnRpZXMgZXh0ZW5kcyBJRGF0YU1vZGVsUHJvcGVydGllcyB7CiAKIApkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUvbW9kdWxlY29yZS1zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9jb21wb25lbnRjb3JlL2RhdGFtb2RlbC9wcm9wZXJ0aWVzL0lTZXJ2ZXJDb250ZXh0Um9vdERhdGFNb2RlbFByb3BlcnRpZXMuamF2YSBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlL21vZHVsZWNvcmUtc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vY29tcG9uZW50Y29yZS9kYXRhbW9kZWwvcHJvcGVydGllcy9JU2VydmVyQ29udGV4dFJvb3REYXRhTW9kZWxQcm9wZXJ0aWVzLmphdmEKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uYzkzOTEzOAotLS0gL2Rldi9udWxsCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlL21vZHVsZWNvcmUtc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vY29tcG9uZW50Y29yZS9kYXRhbW9kZWwvcHJvcGVydGllcy9JU2VydmVyQ29udGV4dFJvb3REYXRhTW9kZWxQcm9wZXJ0aWVzLmphdmEKQEAgLTAsMCArMSwyNCBAQAorLyoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioKKyAqIENvcHlyaWdodCAoYykgMjAwOCBJQk0gQ29ycG9yYXRpb24gYW5kIG90aGVycy4KKyAqIEFsbCByaWdodHMgcmVzZXJ2ZWQuIFRoaXMgcHJvZ3JhbSBhbmQgdGhlIGFjY29tcGFueWluZyBtYXRlcmlhbHMKKyAqIGFyZSBtYWRlIGF2YWlsYWJsZSB1bmRlciB0aGUgdGVybXMgb2YgdGhlIEVjbGlwc2UgUHVibGljIExpY2Vuc2UgdjEuMAorICogd2hpY2ggYWNjb21wYW5pZXMgdGhpcyBkaXN0cmlidXRpb24sIGFuZCBpcyBhdmFpbGFibGUgYXQKKyAqIGh0dHA6Ly93d3cuZWNsaXBzZS5vcmcvbGVnYWwvZXBsLXYxMC5odG1sCisgKgorICogQ29udHJpYnV0b3JzOgorICogICAgIElCTSBDb3Jwb3JhdGlvbiAtIGluaXRpYWwgQVBJIGFuZCBpbXBsZW1lbnRhdGlvbgorICoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKiovCitwYWNrYWdlIG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS5kYXRhbW9kZWwucHJvcGVydGllczsKKworaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS5pbnRlcm5hbC5vcGVyYXRpb24uU2VydmVyQ29udGV4dFJvb3REYXRhTW9kZWxQcm92aWRlcjsKKworcHVibGljIGludGVyZmFjZSBJU2VydmVyQ29udGV4dFJvb3REYXRhTW9kZWxQcm9wZXJ0aWVzIHsKKwkvKioKKwkgKiBUaGlzIGZpZWxkIHNob3VsZCBub3QgYmUgdXNlZC4gIEl0IGlzIG5vdCBwYXJ0IG9mIHRoZSBBUEkgYW5kIG1heSBiZSBtb2RpZmllZCBpbiB0aGUgZnV0dXJlLgorCSAqLworCXB1YmxpYyBzdGF0aWMgQ2xhc3MgX3Byb3ZpZGVyX2NsYXNzID0gU2VydmVyQ29udGV4dFJvb3REYXRhTW9kZWxQcm92aWRlci5jbGFzczsKKworCXB1YmxpYyBzdGF0aWMgZmluYWwgU3RyaW5nIFBST0pFQ1QgPSAiSVNlcnZlckNvbnRleHRSb290RGF0YU1vZGVsUHJvcGVydGllcy5QUk9KRUNUIjsgLy8kTk9OLU5MUy0xJAkKKwlwdWJsaWMgc3RhdGljIGZpbmFsIFN0cmluZyBDT05URVhUX1JPT1QgPSAiSVNlcnZlckNvbnRleHRSb290RGF0YU1vZGVsUHJvcGVydGllcy5DT05URVhUX1JPT1QiOyAvLyROT04tTkxTLTEkCisKK30KZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlL21vZHVsZWNvcmUtc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vY29tcG9uZW50Y29yZS9pbnRlcm5hbC9BcnRpZmFjdEVkaXRNb2RlbC5qYXZhIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUvbW9kdWxlY29yZS1zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9jb21wb25lbnRjb3JlL2ludGVybmFsL0FydGlmYWN0RWRpdE1vZGVsLmphdmEKaW5kZXggOWUzODk1MC4uNGJkYjczOSAxMDA2NDQKLS0tIGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUvbW9kdWxlY29yZS1zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9jb21wb25lbnRjb3JlL2ludGVybmFsL0FydGlmYWN0RWRpdE1vZGVsLmphdmEKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUvbW9kdWxlY29yZS1zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9jb21wb25lbnRjb3JlL2ludGVybmFsL0FydGlmYWN0RWRpdE1vZGVsLmphdmEKQEAgLTIxLDcgKzIxLDYgQEAKIGltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJ1bnRpbWUuUGxhdGZvcm07CiBpbXBvcnQgb3JnLmVjbGlwc2UuZW1mLmNvbW1vbi51dGlsLlVSSTsKIGltcG9ydCBvcmcuZWNsaXBzZS5lbWYuZWNvcmUucmVzb3VyY2UuUmVzb3VyY2U7Ci1pbXBvcnQgb3JnLmVjbGlwc2UuamVtLnV0aWwubG9nZ2VyLnByb3h5LkxvZ2dlcjsKIGltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUuQ29tcG9uZW50Q29yZTsKIGltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUuVW5yZXNvbHZlYWJsZVVSSUV4Y2VwdGlvbjsKIGltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUuaW50ZXJuYWwuaW1wbC5QbGF0Zm9ybVVSTE1vZHVsZUNvbm5lY3Rpb247CkBAIC0zNSw2ICszNCw3IEBACiBpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5wcm9qZWN0LmZhY2V0LmNvcmUuSUZhY2V0ZWRQcm9qZWN0OwogaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24ucHJvamVjdC5mYWNldC5jb3JlLklGYWNldGVkUHJvamVjdExpc3RlbmVyOwogaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24ucHJvamVjdC5mYWNldC5jb3JlLlByb2plY3RGYWNldHNNYW5hZ2VyOworaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS5pbnRlcm5hbC5Nb2R1bGVjb3JlUGx1Z2luOwogCiAvKioKICAqIApAQCAtMTQ5LDEyICsxNDksMTAgQEAKIAkJCWZhY2V0UHJvaiA9IFByb2plY3RGYWNldHNNYW5hZ2VyLmNyZWF0ZShwcm9qZWN0KTsKIAkJCWlmIChmYWNldFByb2ogIT0gbnVsbCkKIAkJCQlmYWNldFByb2ouYWRkTGlzdGVuZXIodGhpcyk7Ci0JCX0gY2F0Y2ggKFVucmVzb2x2ZWFibGVVUklFeGNlcHRpb24gZSkgewotCQkJLy8gVE9ETyBBdXRvLWdlbmVyYXRlZCBjYXRjaCBibG9jawotCQkJZS5wcmludFN0YWNrVHJhY2UoKTsKKwkJfSBjYXRjaCAoVW5yZXNvbHZlYWJsZVVSSUV4Y2VwdGlvbiBlKXsKKwkJCU1vZHVsZWNvcmVQbHVnaW4ubG9nRXJyb3IoZSk7CiAJCX0gY2F0Y2ggKENvcmVFeGNlcHRpb24gZSkgewotCQkJLy8gVE9ETyBBdXRvLWdlbmVyYXRlZCBjYXRjaCBibG9jawotCQkJZS5wcmludFN0YWNrVHJhY2UoKTsKKwkJCU1vZHVsZWNvcmVQbHVnaW4ubG9nRXJyb3IoZSk7CiAJCX1maW5hbGx5IHsKIAkJCWNvbXBvbmVudFByb2plY3QgPSBhUHJvamVjdDsKIAkJfQpAQCAtMzI1LDggKzMyMyw3IEBACiAJCXRyeSB7CiAJCQlFbmFibGVtZW50TWFuYWdlci5JTlNUQU5DRS5ub3RpZnlGdW5jdGlvbkdyb3VwQ2hhbmdlZChudWxsLGdldENvbXBvbmVudFByb2plY3QoKSk7CiAJCX0gY2F0Y2ggKENvcmVFeGNlcHRpb24gZSkgewotCQkJLy8gVE9ETyBBdXRvLWdlbmVyYXRlZCBjYXRjaCBibG9jawotCQkJZS5wcmludFN0YWNrVHJhY2UoKTsKKwkJCU1vZHVsZWNvcmVQbHVnaW4ubG9nRXJyb3IoZSk7CiAJCX0KIAkJCiAJfQpAQCAtMzM4LDcgKzMzNSw3IEBACiAJCQlpZiAoZmFjZXRQcm9qICE9IG51bGwpCiAJCQkJZmFjZXRQcm9qLnJlbW92ZUxpc3RlbmVyKHRoaXMpOwogCQl9IGNhdGNoIChFeGNlcHRpb24gZSkgewotCQkJTG9nZ2VyLmdldExvZ2dlcigpLmxvZ0Vycm9yKGUpOworCQkJTW9kdWxlY29yZVBsdWdpbi5sb2dFcnJvcihlKTsKIAkJfQogCQlzdXBlci5kb0Rpc3Bvc2UoKTsKIAl9CmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS9tb2R1bGVjb3JlLXNyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2NvbXBvbmVudGNvcmUvaW50ZXJuYWwvQ29tcG9uZW50Y29yZVBhY2thZ2UuamF2YSBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlL21vZHVsZWNvcmUtc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vY29tcG9uZW50Y29yZS9pbnRlcm5hbC9Db21wb25lbnRjb3JlUGFja2FnZS5qYXZhCmluZGV4IGVlZDRmZTMuLmU3ODllNzUgMTAwNjQ0Ci0tLSBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlL21vZHVsZWNvcmUtc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vY29tcG9uZW50Y29yZS9pbnRlcm5hbC9Db21wb25lbnRjb3JlUGFja2FnZS5qYXZhCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlL21vZHVsZWNvcmUtc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vY29tcG9uZW50Y29yZS9pbnRlcm5hbC9Db21wb25lbnRjb3JlUGFja2FnZS5qYXZhCkBAIC0yLDcgKzIsNyBAQAogICogPGNvcHlyaWdodD4KICAqIDwvY29weXJpZ2h0PgogICoKLSAqICRJZDogQ29tcG9uZW50Y29yZVBhY2thZ2UuamF2YSx2IDEuOCAyMDA2LzA0LzI3IDA0OjE3OjQwIGNicmlkZ2hhIEV4cCAkCisgKiAkSWQ6IENvbXBvbmVudGNvcmVQYWNrYWdlLmphdmEsdiAxLjkgMjAwOS8wNi8wOSAyMDowMjowNCBqc2hvbGwgRXhwICQKICAqLwogcGFja2FnZSBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUuaW50ZXJuYWw7CiAKQEAgLTQ0LDcgKzQ0LDcgQEAKIAkgKiA8IS0tIGVuZC11c2VyLWRvYyAtLT4KIAkgKiBAZ2VuZXJhdGVkCiAJICovCi0JU3RyaW5nIGVOU19VUkkgPSAiY29tcG9uZW50Y29yZS54bWkiOworCVN0cmluZyBlTlNfVVJJID0gImNvbXBvbmVudGNvcmUueG1pIjsgLy8kTk9OLU5MUy0xJAogCiAJLyoqCiAJICogVGhlIHBhY2thZ2UgbmFtZXNwYWNlIG5hbWUuCkBAIC01Miw3ICs1Miw3IEBACiAJICogPCEtLSBlbmQtdXNlci1kb2MgLS0+CiAJICogQGdlbmVyYXRlZAogCSAqLwotCVN0cmluZyBlTlNfUFJFRklYID0gIm9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZSI7CisJU3RyaW5nIGVOU19QUkVGSVggPSAib3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb21wb25lbnRjb3JlIjsgLy8kTk9OLU5MUy0xJAogCiAJLyoqCiAJICogVGhlIHNpbmdsZXRvbiBpbnN0YW5jZSBvZiB0aGUgcGFja2FnZS4KZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlL21vZHVsZWNvcmUtc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vY29tcG9uZW50Y29yZS9pbnRlcm5hbC9EZWZhdWx0TW9kdWxlSGFuZGxlci5qYXZhIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUvbW9kdWxlY29yZS1zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9jb21wb25lbnRjb3JlL2ludGVybmFsL0RlZmF1bHRNb2R1bGVIYW5kbGVyLmphdmEKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uYjQ5YjA0MAotLS0gL2Rldi9udWxsCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlL21vZHVsZWNvcmUtc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vY29tcG9uZW50Y29yZS9pbnRlcm5hbC9EZWZhdWx0TW9kdWxlSGFuZGxlci5qYXZhCkBAIC0wLDAgKzEsNDUgQEAKKy8qKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqCisgKiBDb3B5cmlnaHQgKGMpIDIwMDkgSUJNIENvcnBvcmF0aW9uIGFuZCBvdGhlcnMuCisgKiBBbGwgcmlnaHRzIHJlc2VydmVkLiBUaGlzIHByb2dyYW0gYW5kIHRoZSBhY2NvbXBhbnlpbmcgbWF0ZXJpYWxzCisgKiBhcmUgbWFkZSBhdmFpbGFibGUgdW5kZXIgdGhlIHRlcm1zIG9mIHRoZSBFY2xpcHNlIFB1YmxpYyBMaWNlbnNlIHYxLjAKKyAqIHdoaWNoIGFjY29tcGFuaWVzIHRoaXMgZGlzdHJpYnV0aW9uLCBhbmQgaXMgYXZhaWxhYmxlIGF0CisgKiBodHRwOi8vd3d3LmVjbGlwc2Uub3JnL2xlZ2FsL2VwbC12MTAuaHRtbAorICoKKyAqIENvbnRyaWJ1dG9yczoKKyAqICAgICBJQk0gQ29ycG9yYXRpb24gLSBpbml0aWFsIEFQSSBhbmQgaW1wbGVtZW50YXRpb24KKyAqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqLworcGFja2FnZSBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUuaW50ZXJuYWw7CisKK2ltcG9ydCBqYXZhLnV0aWwuSXRlcmF0b3I7CitpbXBvcnQgamF2YS51dGlsLkxpc3Q7CisKK2ltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJlc291cmNlcy5JUHJvamVjdDsKK2ltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUucmVzb3VyY2VzLklWaXJ0dWFsQ29tcG9uZW50OworCitwdWJsaWMgY2xhc3MgRGVmYXVsdE1vZHVsZUhhbmRsZXIgaW1wbGVtZW50cyBJTW9kdWxlSGFuZGxlciB7CisKKwlwdWJsaWMgU3RyaW5nIGdldEFyY2hpdmVOYW1lKElQcm9qZWN0IHByb2osSVZpcnR1YWxDb21wb25lbnQgY29tcCkgeworCQlpZiAoY29tcCAhPSBudWxsKQorCQkJcmV0dXJuIGNvbXAuZ2V0TmFtZSgpICsgIi5qYXIiOworCQlyZXR1cm4gcHJvai5nZXROYW1lKCkgKyAiLmphciI7CisJfQorCisJcHVibGljIExpc3Q8SVByb2plY3Q+IGdldEZpbHRlcmVkUHJvamVjdExpc3RGb3JBZGQoSVZpcnR1YWxDb21wb25lbnQgc291cmNlQ29tcG9uZW50LCBMaXN0PElQcm9qZWN0PiBhdmFpbGFibGVQcm9qZWN0cykgeworCQlJdGVyYXRvcjxJUHJvamVjdD4gaSA9IGF2YWlsYWJsZVByb2plY3RzLml0ZXJhdG9yKCk7CisJCUlQcm9qZWN0IHA7CisJCXdoaWxlKGkuaGFzTmV4dCgpKSB7CisJCQlwID0gaS5uZXh0KCk7CisJCQlpZiggIXAuaXNPcGVuKCkpCisJCQkJaS5yZW1vdmUoKTsKKwkJCWVsc2UgaWYoIHAuZXF1YWxzKHNvdXJjZUNvbXBvbmVudC5nZXRQcm9qZWN0KCkpKQorCQkJCWkucmVtb3ZlKCk7CisJCX0KKwkJcmV0dXJuIGF2YWlsYWJsZVByb2plY3RzOworCX0KKworCXB1YmxpYyBib29sZWFuIHNldENvbXBvbmVudEF0dHJpYnV0ZXMoSVByb2plY3QgcHJvaikgeworCQkKKwkJcmV0dXJuIHRydWU7CisJfQorCit9CmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS9tb2R1bGVjb3JlLXNyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2NvbXBvbmVudGNvcmUvaW50ZXJuYWwvSUNvbXBvbmVudFByb2plY3RNaWdyYXRvci5qYXZhIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUvbW9kdWxlY29yZS1zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9jb21wb25lbnRjb3JlL2ludGVybmFsL0lDb21wb25lbnRQcm9qZWN0TWlncmF0b3IuamF2YQppbmRleCAwZjY2YWQxLi42NGMzYjkzIDEwMDY0NAotLS0gYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS9tb2R1bGVjb3JlLXNyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2NvbXBvbmVudGNvcmUvaW50ZXJuYWwvSUNvbXBvbmVudFByb2plY3RNaWdyYXRvci5qYXZhCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlL21vZHVsZWNvcmUtc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vY29tcG9uZW50Y29yZS9pbnRlcm5hbC9JQ29tcG9uZW50UHJvamVjdE1pZ3JhdG9yLmphdmEKQEAgLTEyLDYgKzEyLDEyIEBACiAKIGltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJlc291cmNlcy5JUHJvamVjdDsKIAorLyoqCisgKiBUaGlzIGhhcyBiZWVuIGRlcHJlY2F0ZWQgc2luY2UgV1RQIDMuMS4yIGFuZCB3aWxsIGJlIGRlbGV0ZWQgcG9zdCBXVFAgMy4yLgorICogU2VlIGh0dHBzOi8vYnVncy5lY2xpcHNlLm9yZy9idWdzL3Nob3dfYnVnLmNnaT9pZD0yOTI5MzQKKyAqIEBkZXByZWNhdGVkIAorICogQGF1dGhvciBqc2hvbGwKKyAqLwogcHVibGljIGludGVyZmFjZSBJQ29tcG9uZW50UHJvamVjdE1pZ3JhdG9yIHsKIAlwdWJsaWMgdm9pZCBtaWdyYXRlUHJvamVjdChJUHJvamVjdCBwcm9qZWN0KTsKIApkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUvbW9kdWxlY29yZS1zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9jb21wb25lbnRjb3JlL2ludGVybmFsL0lNb2R1bGVIYW5kbGVyLmphdmEgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS9tb2R1bGVjb3JlLXNyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2NvbXBvbmVudGNvcmUvaW50ZXJuYWwvSU1vZHVsZUhhbmRsZXIuamF2YQpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi5hNDAzOTNmCi0tLSAvZGV2L251bGwKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUvbW9kdWxlY29yZS1zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9jb21wb25lbnRjb3JlL2ludGVybmFsL0lNb2R1bGVIYW5kbGVyLmphdmEKQEAgLTAsMCArMSw1MiBAQAorLyoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioKKyAqIENvcHlyaWdodCAoYykgMjAwOSBJQk0gQ29ycG9yYXRpb24gYW5kIG90aGVycy4KKyAqIEFsbCByaWdodHMgcmVzZXJ2ZWQuIFRoaXMgcHJvZ3JhbSBhbmQgdGhlIGFjY29tcGFueWluZyBtYXRlcmlhbHMKKyAqIGFyZSBtYWRlIGF2YWlsYWJsZSB1bmRlciB0aGUgdGVybXMgb2YgdGhlIEVjbGlwc2UgUHVibGljIExpY2Vuc2UgdjEuMAorICogd2hpY2ggYWNjb21wYW5pZXMgdGhpcyBkaXN0cmlidXRpb24sIGFuZCBpcyBhdmFpbGFibGUgYXQKKyAqIGh0dHA6Ly93d3cuZWNsaXBzZS5vcmcvbGVnYWwvZXBsLXYxMC5odG1sCisgKgorICogQ29udHJpYnV0b3JzOgorICogICAgIElCTSBDb3Jwb3JhdGlvbiAtIGluaXRpYWwgQVBJIGFuZCBpbXBsZW1lbnRhdGlvbgorICoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKiovCisKKworcGFja2FnZSBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUuaW50ZXJuYWw7CisKK2ltcG9ydCBqYXZhLnV0aWwuTGlzdDsKKworaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucmVzb3VyY2VzLklQcm9qZWN0OworaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS5yZXNvdXJjZXMuSVZpcnR1YWxDb21wb25lbnQ7CisKKy8qKgorICogSW50ZXJmYWNlIGludGVuZGVkIHRvIHJlZmxlY3QgYmVoYXZpb3Igb2YgY3VzdG9taXplZCBjb21wb25lbnRzCisgKgorICovCitwdWJsaWMgaW50ZXJmYWNlIElNb2R1bGVIYW5kbGVyIHsKKwkKKwkKKwkvKioKKwkgKiBUaGlzIGlzIHVzZWQgdG8gcmV0dXJuIGEgcHJvcGVyIGFyY2hpdmUgbmFtZSBiYXNlZCBvbiB0aGUgY29tcG9uZW50IHR5cGUKKwkgKiBAcGFyYW0gcHJvaiAKKwkgKiBAcGFyYW0gY29tcAorCSAqIEByZXR1cm4gU3RyaW5nIGFyY2hpdmUgbmFtZQorCSAqLworCXB1YmxpYyBTdHJpbmcgZ2V0QXJjaGl2ZU5hbWUoSVByb2plY3QgcHJvaiwgSVZpcnR1YWxDb21wb25lbnQgY29tcCk7CisJCisJLyoqCisJICogVXNlZCB0byBmaWx0ZXIgaXRlbXMgZGlzcGxheWVkIGluIEFkZCBkaWFsb2cKKwkgKiBAcGFyYW0gc291cmNlQ29tcG9uZW50CisJICogQHBhcmFtIGF2YWlsYWJsZUNvbXBvbmVudHMKKwkgKiBAcmV0dXJuIExpc3Qgb2YgaXRlbXMgdGhhdCB3aWxsIG5vdCBiZSBzaG93biBpbiB0aGUgYWRkIHJlZiBkaWFsb2dzCisJICovCisJcHVibGljIExpc3Q8SVByb2plY3Q+IGdldEZpbHRlcmVkUHJvamVjdExpc3RGb3JBZGQoSVZpcnR1YWxDb21wb25lbnQgc291cmNlQ29tcG9uZW50LCBMaXN0PElQcm9qZWN0PiBhdmFpbGFibGVDb21wb25lbnRzKTsKKworCS8qKgorCSAqIFRoaXMgY2FsbCBpcyBtZWFudCB0byBhZGQgSVZpcnR1YWxDb21wb29uZW50IGluZnJhc3RydWN0dXJlIHRvIGFueSBwcm9qZWN0IHBhc3NlZCBpZiBuZWVkZWQKKwkgKiBNZWFudCBiZSBvdmVycmlkZGVuIHRvIGluY2x1ZGUgdGVjaG5vbG9neSBzcGVjaWZpYyBhdHRyaWJ1dGVzCisJICogQHBhcmFtIHByb2oKKwkgKiBAcmV0dXJuIGJvb2xlYW4gaW5kaWNhdGluZyBvcGVyYXRpb24gc3VjY2VzcworCSAqLworCXB1YmxpYyBib29sZWFuIHNldENvbXBvbmVudEF0dHJpYnV0ZXMoSVByb2plY3QgcHJvaik7CisJCisKK30KZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlL21vZHVsZWNvcmUtc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vY29tcG9uZW50Y29yZS9pbnRlcm5hbC9Nb2R1bGVDb3JlVmFsaWRhdG9yLmphdmEgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS9tb2R1bGVjb3JlLXNyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2NvbXBvbmVudGNvcmUvaW50ZXJuYWwvTW9kdWxlQ29yZVZhbGlkYXRvci5qYXZhCmluZGV4IDAzNzJkM2MuLmUxZmQwMGIgMTAwNjQ0Ci0tLSBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlL21vZHVsZWNvcmUtc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vY29tcG9uZW50Y29yZS9pbnRlcm5hbC9Nb2R1bGVDb3JlVmFsaWRhdG9yLmphdmEKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUvbW9kdWxlY29yZS1zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9jb21wb25lbnRjb3JlL2ludGVybmFsL01vZHVsZUNvcmVWYWxpZGF0b3IuamF2YQpAQCAtMzEsNiArMzEsMTIgQEAKIGltcG9ydCBvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5pbnRlcm5hbC5wcm92aXNpb25hbC5jb3JlLklWYWxpZGF0b3JKb2I7CiAKIAorLyoqCisgKiBUaGlzIGhhcyBiZWVuIGRlcHJlY2F0ZWQgc2luY2UgV1RQIDMuMS4yIGFuZCB3aWxsIGJlIGRlbGV0ZWQgcG9zdCBXVFAgMy4yLgorICogU2VlIGh0dHBzOi8vYnVncy5lY2xpcHNlLm9yZy9idWdzL3Nob3dfYnVnLmNnaT9pZD0yOTI5MzQKKyAqIEBkZXByZWNhdGVkIAorICogQGF1dGhvciBqc2hvbGwKKyAqLwogcHVibGljIGNsYXNzIE1vZHVsZUNvcmVWYWxpZGF0b3IgaW1wbGVtZW50cyBJVmFsaWRhdG9ySm9iIHsKIAkJcHJvdGVjdGVkIElSZXBvcnRlciBfcmVwb3J0ZXI7CiAKQEAgLTQ5LDYgKzU1LDggQEAKIAkJCWlmIChzdHJ1Y3R1cmVFZGl0ICE9IG51bGwpIHsKIAkJCQlNb2R1bGVTdHJ1Y3R1cmFsTW9kZWwgc3RydWN0dXJhbE1vZGVsID0gc3RydWN0dXJlRWRpdC5nZXRNb2R1bGVTdHJ1Y3R1cmFsTW9kZWwoKTsKIAkJCQlpZiAoc3RydWN0dXJhbE1vZGVsICE9IG51bGwpIHsKKwkJCQkJLy8gRmlyc3QgdG91Y2ggdGhlIG1vZGVsIEZpbGUgdG8gbWFrZSBzdXJlIGlzIHN5bmNoZWQgYmVmb3JlIGdldHRpbmcgdGhlIGxvY2sKKwkJCQkJc3RydWN0dXJhbE1vZGVsLmdldENvbXBvbmVudEZpbGUoKTsKIAkJCQkJLy8gYWNxdWlyaW5nIHRoZSBNb2R1bGVTdHJ1Y3R1cmFsTW9kZWwgbG9jayBoZXJlIGZpcnN0IGJlY2F1c2UgdGhlIGNhbGwgdG8gZ2V0UHJpbWFyeVJlc291cmNlKCkKIAkJCQkJLy8gd2lsbCBjYXVzZSB0aGlzIGxvY2sgdG8gYmUgYWNxdWlyZWQgbGF0ZXIgcmVzdWx0aW5nIGluIGEgcG90ZW50aWFsIGRlYWRsb2NrCiAJCQkJCUlMb2NrIGxvY2sgPSBFTUZXb3JrYmVuY2hFZGl0Q29udGV4dEZhY3RvcnkuZ2V0UHJvamVjdExvY2tPYmplY3Qoc3RydWN0dXJhbE1vZGVsLmdldFByb2plY3QoKSk7CmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS9tb2R1bGVjb3JlLXNyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2NvbXBvbmVudGNvcmUvaW50ZXJuYWwvTW9kdWxlQ29yZVZhbGlkYXRvckhlbHBlci5qYXZhIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUvbW9kdWxlY29yZS1zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9jb21wb25lbnRjb3JlL2ludGVybmFsL01vZHVsZUNvcmVWYWxpZGF0b3JIZWxwZXIuamF2YQppbmRleCAxOTY5ZjYxLi5hZDJjMzIwIDEwMDY0NAotLS0gYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS9tb2R1bGVjb3JlLXNyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2NvbXBvbmVudGNvcmUvaW50ZXJuYWwvTW9kdWxlQ29yZVZhbGlkYXRvckhlbHBlci5qYXZhCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlL21vZHVsZWNvcmUtc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vY29tcG9uZW50Y29yZS9pbnRlcm5hbC9Nb2R1bGVDb3JlVmFsaWRhdG9ySGVscGVyLmphdmEKQEAgLTE0LDYgKzE0LDEyIEBACiBpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uaW50ZXJuYWwub3BlcmF0aW9ucy5Xb3JrYmVuY2hDb250ZXh0OwogCiAKKy8qKgorICogVGhpcyBoYXMgYmVlbiBkZXByZWNhdGVkIHNpbmNlIFdUUCAzLjEuMiBhbmQgd2lsbCBiZSBkZWxldGVkIHBvc3QgV1RQIDMuMi4KKyAqIFNlZSBodHRwczovL2J1Z3MuZWNsaXBzZS5vcmcvYnVncy9zaG93X2J1Zy5jZ2k/aWQ9MjkyOTM0CisgKiBAZGVwcmVjYXRlZCAKKyAqIEBhdXRob3IganNob2xsCisgKi8KIHB1YmxpYyBjbGFzcyBNb2R1bGVDb3JlVmFsaWRhdG9ySGVscGVyIGV4dGVuZHMgV29ya2JlbmNoQ29udGV4dCB7CiAKIAkJcHVibGljIHN0YXRpYyBmaW5hbCBTdHJpbmcgTU9EVUxFQ09SRSA9ICJNT0RVTEVDT1JFIjsKZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlL21vZHVsZWNvcmUtc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vY29tcG9uZW50Y29yZS9pbnRlcm5hbC9Nb2R1bGVNaWdyYXRvck1hbmFnZXIuamF2YSBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlL21vZHVsZWNvcmUtc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vY29tcG9uZW50Y29yZS9pbnRlcm5hbC9Nb2R1bGVNaWdyYXRvck1hbmFnZXIuamF2YQppbmRleCA4OGE5MDc4Li5jYWYyMWUwIDEwMDY0NAotLS0gYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS9tb2R1bGVjb3JlLXNyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2NvbXBvbmVudGNvcmUvaW50ZXJuYWwvTW9kdWxlTWlncmF0b3JNYW5hZ2VyLmphdmEKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUvbW9kdWxlY29yZS1zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9jb21wb25lbnRjb3JlL2ludGVybmFsL01vZHVsZU1pZ3JhdG9yTWFuYWdlci5qYXZhCkBAIC0zMyw2ICszMywxMiBAQAogaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy5pbnRlcm5hbC5kYXRhbW9kZWwuSVdvcmtzcGFjZVJ1bm5hYmxlV2l0aFN0YXR1czsKIGltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLnByb2plY3QuZmFjZXQuY29yZS5Qcm9qZWN0RmFjZXRzTWFuYWdlcjsKIAorLyoqCisgKiBUaGlzIGhhcyBiZWVuIGRlcHJlY2F0ZWQgc2luY2UgV1RQIDMuMS4yIGFuZCB3aWxsIGJlIGRlbGV0ZWQgcG9zdCBXVFAgMy4yLgorICogU2VlIGh0dHBzOi8vYnVncy5lY2xpcHNlLm9yZy9idWdzL3Nob3dfYnVnLmNnaT9pZD0yOTI5MzQKKyAqIEBkZXByZWNhdGVkIAorICogQGF1dGhvciBqc2hvbGwKKyAqLwogcHVibGljIGNsYXNzIE1vZHVsZU1pZ3JhdG9yTWFuYWdlciB7CiAKIAlwcml2YXRlIHN0YXRpYyBIYXNoTWFwIG1hbmFnZXJDYWNoZSA9IG5ldyBIYXNoTWFwKCk7CmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS9tb2R1bGVjb3JlLXNyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2NvbXBvbmVudGNvcmUvaW50ZXJuYWwvTW9kdWxlU3RydWN0dXJhbE1vZGVsLmphdmEgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS9tb2R1bGVjb3JlLXNyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2NvbXBvbmVudGNvcmUvaW50ZXJuYWwvTW9kdWxlU3RydWN0dXJhbE1vZGVsLmphdmEKaW5kZXggYjkxM2E0Mi4uYmYzN2NlYSAxMDA2NDQKLS0tIGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUvbW9kdWxlY29yZS1zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9jb21wb25lbnRjb3JlL2ludGVybmFsL01vZHVsZVN0cnVjdHVyYWxNb2RlbC5qYXZhCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlL21vZHVsZWNvcmUtc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vY29tcG9uZW50Y29yZS9pbnRlcm5hbC9Nb2R1bGVTdHJ1Y3R1cmFsTW9kZWwuamF2YQpAQCAtMTAsNiArMTAsNyBAQAogICoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKiovCiBwYWNrYWdlIG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS5pbnRlcm5hbDsKIAoraW1wb3J0IGphdmEuaW8uRmlsZTsKIGltcG9ydCBqYXZhLmlvLklPRXhjZXB0aW9uOwogaW1wb3J0IGphdmEudXRpbC5BcnJheUxpc3Q7CiBpbXBvcnQgamF2YS51dGlsLkFycmF5czsKQEAgLTIxLDExICsyMiwxMSBAQAogaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucmVzb3VyY2VzLklGaWxlOwogaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucmVzb3VyY2VzLklSZXNvdXJjZTsKIGltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJlc291cmNlcy5JV29ya3NwYWNlOworaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucmVzb3VyY2VzLklXb3Jrc3BhY2VSb290OwogaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucmVzb3VyY2VzLklXb3Jrc3BhY2VSdW5uYWJsZTsKIGltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJlc291cmNlcy5SZXNvdXJjZXNQbHVnaW47CiBpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5ydW50aW1lLkNvcmVFeGNlcHRpb247CiBpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5ydW50aW1lLklBZGFwdGFibGU7Ci1pbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5ydW50aW1lLklQYXRoOwogaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucnVudGltZS5JUHJvZ3Jlc3NNb25pdG9yOwogaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucnVudGltZS5JU3RhdHVzOwogaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucnVudGltZS5QbGF0Zm9ybTsKQEAgLTc4LDExICs3OSwxMiBAQAogKi8gCiBwdWJsaWMgY2xhc3MgTW9kdWxlU3RydWN0dXJhbE1vZGVsIGV4dGVuZHMgRWRpdE1vZGVsIGltcGxlbWVudHMgSUFkYXB0YWJsZSB7CiAJCi0JcHJpdmF0ZSBzdGF0aWMgZmluYWwgU3RyaW5nIFIwXzdfTU9EVUxFX01FVEFfRklMRV9OQU1FID0gIi5jb21wb25lbnQiOwotCXByaXZhdGUgc3RhdGljIGZpbmFsIFN0cmluZyBSMV9NT0RVTEVfTUVUQV9GSUxFX05BTUUgPSAiLnNldHRpbmdzLy5jb21wb25lbnQiOworCXB1YmxpYyBzdGF0aWMgZmluYWwgU3RyaW5nIFIwXzdfTU9EVUxFX01FVEFfRklMRV9OQU1FID0gIi5jb21wb25lbnQiOworCXB1YmxpYyBzdGF0aWMgZmluYWwgU3RyaW5nIFIxX01PRFVMRV9NRVRBX0ZJTEVfTkFNRSA9ICIuc2V0dGluZ3MvLmNvbXBvbmVudCI7CiAJcHVibGljIHN0YXRpYyBmaW5hbCBTdHJpbmcgTU9EVUxFX0NPUkVfSUQgPSAibW9kdWxlQ29yZUlkIjsgLy8kTk9OLU5MUy0xJCAKIAlwcml2YXRlIHN0YXRpYyBmaW5hbCBTdHJpbmcgUFJPSkVDVF9WRVJTSU9OXzFfNSA9ICIxLjUuMCI7CiAJcHJpdmF0ZSBib29sZWFuIHVzZU9sZEZvcm1hdCA9IGZhbHNlOworCXByaXZhdGUgQm9vbGVhbiBuZWVkc1N5bmMgPSBuZXcgQm9vbGVhbih0cnVlKTsKIAlwdWJsaWMgTW9kdWxlU3RydWN0dXJhbE1vZGVsKFN0cmluZyBlZGl0TW9kZWxJRCwgRU1GV29ya2JlbmNoQ29udGV4dCBjb250ZXh0LCBib29sZWFuIHJlYWRPbmx5KSB7CiAgICAgICAgIHN1cGVyKGVkaXRNb2RlbElELCBjb250ZXh0LCByZWFkT25seSk7CiAgICAgfQpAQCAtOTgsNiArMTAwLDggQEAKIAl9CiAJcHJvdGVjdGVkIGJvb2xlYW4gcmVtb3ZlUmVzb3VyY2UoUmVzb3VyY2UgYVJlc291cmNlKSB7CiAJCWlmIChhUmVzb3VyY2UgIT0gbnVsbCkgeworCQkJLy9GaXJzdCBjaGVja2luZyBpZiByZXNvdXJjZSBpcyBsb2FkZWQgKFdoaWNoIHdpbGwgcHJldmVudCByZW1vdmluZyBpbiBtaWRkbGUgb2YgbG9hZGluZyBieSBjaGVja2luZyByZXNvdXJjZSBhZGFwdGVyIGxvY2spCisJCQlhUmVzb3VyY2UuaXNMb2FkZWQoKTsKIAkJCXN5bmNocm9uaXplZCAoYVJlc291cmNlKSB7CiAJCQkJYVJlc291cmNlLmVBZGFwdGVycygpLnJlbW92ZShyZXNvdXJjZUFkYXB0ZXIpOwogCQkJCXJldHVybiBnZXRSZXNvdXJjZXMoKS5yZW1vdmUoYVJlc291cmNlKTsKQEAgLTExNiw4ICsxMjAsNyBAQAogCQkJaWYgKHJlcyA9PSBudWxsKQogCQkJCXJldHVybiBudWxsOwogCQl9IGNhdGNoIChDb3JlRXhjZXB0aW9uIGUpIHsKLQkJCS8vIFRPRE8gQXV0by1nZW5lcmF0ZWQgY2F0Y2ggYmxvY2sKLQkJCWUucHJpbnRTdGFja1RyYWNlKCk7CisJCQlNb2R1bGVjb3JlUGx1Z2luLmxvZ0Vycm9yKGUpOwogCQl9CiAJCUVPYmplY3QgbW9kZWxSb290ID0gbnVsbDsKIAkJbW9kZWxSb290ID0gc3VwZXIuZ2V0UHJpbWFyeVJvb3RPYmplY3QoKTsKQEAgLTIzNCwxMCArMjM3LDYgQEAKIAl9CiAJcHVibGljIFJlc291cmNlIHByZXBhcmVQcm9qZWN0TW9kdWxlc0lmTmVjZXNzYXJ5KCkgdGhyb3dzIENvcmVFeGNlcHRpb24gewogCQlYTUlSZXNvdXJjZSByZXM7Ci0JCWlmICghaXNDb21wb25lbnRTeW5jaHJvbml6ZWRPck51bGwoKSkgewotCQkJLy9SZXR1cm4gaWYgY29tcG9uZW50IGZpbGUgaXMgb3V0IG9mIHN5bmMgZnJvbSB3b3Jrc3BhY2UKLQkJCXJldHVybiBudWxsOwotCQl9CiAJCXJlcyA9IChYTUlSZXNvdXJjZSkgZ2V0UHJpbWFyeVJlc291cmNlKCk7CiAJCWlmIChyZXMgIT0gbnVsbCAmJiByZXNOZWVkc01pZ3JhdGluZyhyZXMpICYmICF1c2VPbGRGb3JtYXQpCiAJCQlyZXR1cm4gbnVsbDsKQEAgLTI1MSwzMyArMjUwLDY0IEBACiAJCXJldHVybiByZXM7CiAJfQogCQotCS8qKgotCSAqIFRoaXMgbWV0aG9kcyBjaGVja3MgdGhlIHN0YXR1cyBvZiB0aGUgY29tcG9uZW50IGZpbGUsIGFuZCBmaXJzdCBjaGVja3MgZm9yIGV4aXN0YW5jZSwgdGhlbiBpZiBpdHMgbG9jYWxseSBzeW5jaHJvbml6ZWQKLQkgKiBAcmV0dXJuIGJvb2xlYW4KLQkgKi8KLQlwcml2YXRlIGJvb2xlYW4gaXNDb21wb25lbnRTeW5jaHJvbml6ZWRPck51bGwoKSB7Ci0JCUlGaWxlIGNvbXBvbmVudEZpbGUgPSBnZXRQcm9qZWN0KCkuZ2V0RmlsZShTdHJ1Y3R1cmVFZGl0Lk1PRFVMRV9NRVRBX0ZJTEVfTkFNRSk7Ci0JCUlQYXRoIGNvbXBvbmVudEZpbGVMb2NhdGlvbiA9IGNvbXBvbmVudEZpbGUuZ2V0TG9jYXRpb24oKTsKLQkJaWYgKGNvbXBvbmVudEZpbGVMb2NhdGlvbiAhPSBudWxsICYmICFjb21wb25lbnRGaWxlTG9jYXRpb24udG9GaWxlKCkuZXhpc3RzKCkpIHsKLQkJCWNvbXBvbmVudEZpbGUgPSBnZXRQcm9qZWN0KCkuZ2V0RmlsZShSMV9NT0RVTEVfTUVUQV9GSUxFX05BTUUpOwotCQkJY29tcG9uZW50RmlsZUxvY2F0aW9uID0gY29tcG9uZW50RmlsZS5nZXRMb2NhdGlvbigpOwotCQkJaWYgKGNvbXBvbmVudEZpbGVMb2NhdGlvbiAhPSBudWxsICYmICFjb21wb25lbnRGaWxlTG9jYXRpb24udG9GaWxlKCkuZXhpc3RzKCkpIHsKLQkJCQljb21wb25lbnRGaWxlID0gZ2V0UHJvamVjdCgpLmdldEZpbGUoUjBfN19NT0RVTEVfTUVUQV9GSUxFX05BTUUpOwotCQkJCWNvbXBvbmVudEZpbGVMb2NhdGlvbiA9IGNvbXBvbmVudEZpbGUuZ2V0TG9jYXRpb24oKTsKLQkJCQlpZiAoY29tcG9uZW50RmlsZUxvY2F0aW9uICE9IG51bGwgJiYgIWNvbXBvbmVudEZpbGVMb2NhdGlvbi50b0ZpbGUoKS5leGlzdHMoKSkgCi0JCQkJCXJldHVybiB0cnVlOworCQorCXB1YmxpYyBJRmlsZSBnZXRDb21wb25lbnRGaWxlKCkgeworCQkKKwkJSUZpbGUgY29tcEZpbGUgPSBnZXRQcm9qZWN0KCkuZ2V0RmlsZShTdHJ1Y3R1cmVFZGl0Lk1PRFVMRV9NRVRBX0ZJTEVfTkFNRSk7CisJCWlmIChjb21wRmlsZS5pc0FjY2Vzc2libGUoKSkgeworCQkJY2hlY2tTeW5jKGNvbXBGaWxlKTsJCisJCQlyZXR1cm4gY29tcEZpbGU7CisJCX0KKwkJZWxzZSB7IC8vTmVlZCB0byBjaGVjayBmb3IgbGVnYWN5IGZpbGUgbG9jYXRpb25zIGFsc28uLi4uCisJCQljb21wRmlsZSA9IGdldFByb2plY3QoKS5nZXRGaWxlKE1vZHVsZVN0cnVjdHVyYWxNb2RlbC5SMV9NT0RVTEVfTUVUQV9GSUxFX05BTUUpOworCQkJaWYgKGNvbXBGaWxlLmlzQWNjZXNzaWJsZSgpKSB7CisJCQkJY2hlY2tTeW5jKGNvbXBGaWxlKTsJCisJCQkJcmV0dXJuIGNvbXBGaWxlOworCQkJfQorCQkJZWxzZSB7CisJCQkJY29tcEZpbGUgPSBnZXRQcm9qZWN0KCkuZ2V0RmlsZShNb2R1bGVTdHJ1Y3R1cmFsTW9kZWwuUjBfN19NT0RVTEVfTUVUQV9GSUxFX05BTUUpOworCQkJCWlmIChjb21wRmlsZS5pc0FjY2Vzc2libGUoKSkgeworCQkJCQljaGVja1N5bmMoY29tcEZpbGUpOwkKKwkJCQkJcmV0dXJuIGNvbXBGaWxlOworCQkJCX0KIAkJCX0KIAkJfQotCQlpZiAoY29tcG9uZW50RmlsZUxvY2F0aW9uID09IG51bGwpCi0JCQlyZXR1cm4gdHJ1ZTsKLQkJZWxzZSByZXR1cm4gY29tcG9uZW50RmlsZS5pc1N5bmNocm9uaXplZChJUmVzb3VyY2UuREVQVEhfWkVSTyk7CisJCXJldHVybiBnZXRQcm9qZWN0KCkuZ2V0RmlsZShTdHJ1Y3R1cmVFZGl0Lk1PRFVMRV9NRVRBX0ZJTEVfTkFNRSk7CiAJfQorCQorCXByaXZhdGUgdm9pZCBjaGVja1N5bmMoSUZpbGUgY29tcEZpbGUpIHsKKwkJYm9vbGVhbiBsb2NhbE5lZWRzU3luYyA9IGZhbHNlOworCQlzeW5jaHJvbml6ZWQgKG5lZWRzU3luYykgeworCQkJbG9jYWxOZWVkc1N5bmMgPSBuZWVkc1N5bmM7CisJCX0KKwkJaWYgKGxvY2FsTmVlZHNTeW5jKSB7IC8vIE9ubHkgY2hlY2sgc3luYyBvbmNlIGZvciBsaWZlIG9mIHRoaXMgbW9kZWwKKwkJCWlmICghY29tcEZpbGUuaXNTeW5jaHJvbml6ZWQoSVJlc291cmNlLkRFUFRIX09ORSkpIHsKKwkJCQlGaWxlIGlvZmlsZSA9IGNvbXBGaWxlLmdldEZ1bGxQYXRoKCkudG9GaWxlKCk7CisJCQkJaWYgKGlvZmlsZS5leGlzdHMoKSB8fCBjb21wRmlsZS5leGlzdHMoKSkgeworCQkJCQlJV29ya3NwYWNlUm9vdCByb290ID0gUmVzb3VyY2VzUGx1Z2luLmdldFdvcmtzcGFjZSgpLmdldFJvb3QoKTsKKwkJCQkJdHJ5IHsKKwkJCQkJCS8vIE9LIHdhaXQgdG8gZ2V0IHdvcmtzcGFjZSByb290IGJlZm9yZSByZWZyZXNoaW5nCisJCQkJCQlKb2IuZ2V0Sm9iTWFuYWdlcigpLmJlZ2luUnVsZShyb290LCBudWxsKTsKKwkJCQkJCWNvbXBGaWxlLmdldFByb2plY3QoKS5yZWZyZXNoTG9jYWwoSVJlc291cmNlLkRFUFRIX0lORklOSVRFLCBudWxsKTsKKwkJCQkJfSBjYXRjaCAoQ29yZUV4Y2VwdGlvbiBjZSkgeworCQkJCQkJLy8gaWdub3JlCisJCQkJCX0gZmluYWxseSB7CisJCQkJCQlKb2IuZ2V0Sm9iTWFuYWdlcigpLmVuZFJ1bGUocm9vdCk7CisJCQkJCX0KKwkJCQl9CisJCQl9CisJCQlzeW5jaHJvbml6ZWQgKG5lZWRzU3luYykgeworCQkJCW5lZWRzU3luYyA9IG5ldyBCb29sZWFuKGZhbHNlKTsKKwkJCX0KKwkJfQorCX0KKwkKIAlwdWJsaWMgV1RQTW9kdWxlc1Jlc291cmNlICBtYWtlV1RQTW9kdWxlc1Jlc291cmNlKCkgewogCQlyZXR1cm4gKFdUUE1vZHVsZXNSZXNvdXJjZSkgY3JlYXRlUmVzb3VyY2UoV1RQTW9kdWxlc1Jlc291cmNlRmFjdG9yeS5XVFBfTU9EVUxFU19VUklfT0JKKTsKIAl9CiAJcHJvdGVjdGVkIHZvaWQgcnVuU2F2ZU9wZXJhdGlvbihJV29ya3NwYWNlUnVubmFibGUgcnVubmFibGUsIElQcm9ncmVzc01vbml0b3IgbW9uaXRvcikgdGhyb3dzIFNhdmVGYWlsZWRFeGNlcHRpb24gewogCQl0cnkgewotCQkJUmVzb3VyY2VzUGx1Z2luLmdldFdvcmtzcGFjZSgpLnJ1bihydW5uYWJsZSwgbnVsbCxJV29ya3NwYWNlLkFWT0lEX1VQREFURSxtb25pdG9yKTsKKwkJCVJlc291cmNlc1BsdWdpbi5nZXRXb3Jrc3BhY2UoKS5ydW4ocnVubmFibGUsIGdldENvbXBvbmVudEZpbGUoKSxJV29ya3NwYWNlLkFWT0lEX1VQREFURSxtb25pdG9yKTsKIAkJfSBjYXRjaCAoQ29yZUV4Y2VwdGlvbiBlKSB7CiAJCQl0aHJvdyBuZXcgU2F2ZUZhaWxlZEV4Y2VwdGlvbihlKTsKIAkJfQpAQCAtMjk1LDI1ICszMjUsMTQgQEAKIAkgKiBAcmV0dXJuCiAJICovCiAJcHVibGljIFJlc291cmNlIGdldFByaW1hcnlSZXNvdXJjZSgpIHsKLQkJLy8gT3ZlcnJpZGVuIHRvIGhhbmRsZSBsb2FkaW5nIHRoZSAuY29tcG9uZW50IHJlc291cmNlIGluIG5ldyBhbmQgb2xkIGZvcm1zCi0JCS8vIEZpcnN0IHdpbGwgdHJ5IHRvIGxvYWQgZnJvbSAuc2V0dGluZ3Mvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb21wb25lbnQKLQkJLy8gU2Vjb25kIHdpbGwgdHJ5IHRvIGxvYWQgZnJvbSB0aGUgb2xkIGxvY2F0aW9uKHMpIC5zZXR0aW5ncy8uY29tcG9uZW50IG9yIC5jb21wb25lbnQKKwkJLy8gV2lsbCBhbHdheXMgZ28gdGhyb3VnaCB0aGUgZ2V0RmlsZSBtZXRob2QgdGhhdCBzZWFyY2hlcyBmb3IgYWxsIHBvc3NpYmxlIGxvY2F0aW9ucy4KKwkJSUZpbGUgY29tcEZpbGUgPSBnZXRDb21wb25lbnRGaWxlKCk7CiAJCQotCQlVUkkgdXJpID0gVVJJLmNyZWF0ZVVSSShTdHJ1Y3R1cmVFZGl0Lk1PRFVMRV9NRVRBX0ZJTEVfTkFNRSk7CisJCVVSSSB1cmkgPSBVUkkuY3JlYXRlVVJJKGNvbXBGaWxlLmdldFByb2plY3RSZWxhdGl2ZVBhdGgoKS50b1BvcnRhYmxlU3RyaW5nKCkpOwogCQlXVFBNb2R1bGVzUmVzb3VyY2UgcmVzID0gKFdUUE1vZHVsZXNSZXNvdXJjZSlnZXRSZXNvdXJjZSh1cmkpOwotCQlpZiAocmVzID09IG51bGwgfHwgIXJlcy5pc0xvYWRlZCgpKSB7CisJCWlmIChyZXMgPT0gbnVsbCB8fCAhcmVzLmlzTG9hZGVkKCkgfHwgcmVzLmdldENvbnRlbnRzKCkuaXNFbXB0eSgpKSB7CiAJCQlyZW1vdmVSZXNvdXJjZShyZXMpOwotCQkJdXJpID0gVVJJLmNyZWF0ZVVSSShSMV9NT0RVTEVfTUVUQV9GSUxFX05BTUUpOwotCQkJcmVzID0gKFdUUE1vZHVsZXNSZXNvdXJjZSlnZXRSZXNvdXJjZSh1cmkpOwotCQkJaWYgKHJlcyA9PSBudWxsIHx8ICFyZXMuaXNMb2FkZWQoKSkgewotCQkJCXJlbW92ZVJlc291cmNlKHJlcyk7Ci0JCQkJdXJpID0gVVJJLmNyZWF0ZVVSSShSMF83X01PRFVMRV9NRVRBX0ZJTEVfTkFNRSk7Ci0JCQkJcmVzID0gKFdUUE1vZHVsZXNSZXNvdXJjZSlnZXRSZXNvdXJjZSh1cmkpOwotCQkJCWlmIChyZXMgPT0gbnVsbCB8fCAhcmVzLmlzTG9hZGVkKCkpIHsKLQkJCQkJcmVtb3ZlUmVzb3VyY2UocmVzKTsKLQkJCQkJcmVzID0gbnVsbDsKLQkJCQl9Ci0JCQl9CisJCQlyZXMgPSBudWxsOwogCQl9CiAJCXJldHVybiByZXM7CiAJfQpAQCAtMzc0LDMzICszOTMsMjEgQEAKIAl9CiAJQE92ZXJyaWRlCiAJcHVibGljIHZvaWQgYWNjZXNzKE9iamVjdCBhY2Nlc3NvcktleSkgewotCQkKLQkJc3VwZXIuYWNjZXNzKGFjY2Vzc29yS2V5KTsKLS8vCQlTdHJpbmdCdWZmZXIgYnVmZmVyID0gbmV3IFN0cmluZ0J1ZmZlcigiQWNjZXNzIE1vZHVsZSBtb2RlbCAoIik7Ci0vLwkJYnVmZmVyLmFwcGVuZCh0aGlzLmhhc2hDb2RlKCkpOwotLy8JCWJ1ZmZlci5hcHBlbmQoIikgUHJvamVjdDogIik7Ci0vLwkJYnVmZmVyLmFwcGVuZCh0aGlzLmdldFByb2plY3QoKSk7Ci0vLwkJaWYgKGlzUmVhZE9ubHkoKSkKLS8vCQkJYnVmZmVyLmFwcGVuZCgiIFIgPSAiKTsgLy8kTk9OLU5MUy0xJAotLy8JCWVsc2UKLS8vCQkJYnVmZmVyLmFwcGVuZCgiIFcgPSAiKTsgLy8kTk9OLU5MUy0xJAotLy8JCWJ1ZmZlci5hcHBlbmQoZ2V0UmVnaXN0cnkoKS5zaXplKCkpOwotLy8JCVN5c3RlbS5vdXQucHJpbnRsbihidWZmZXIudG9TdHJpbmcoKSk7CisJCS8vTm90IGJvdGhlcmluZyB3aXRoIHJlZiBjb3VudGluZyBtb2RlbCBhY2Nlc3MgLSBhbHdheXMgYWxsb3cgc2F2ZS9hY2Nlc3MKIAkJCQkKIAl9CiAJQE92ZXJyaWRlCiAJcHVibGljIHZvaWQgcmVsZWFzZUFjY2VzcyhPYmplY3QgYWNjZXNzb3JLZXkpIHsKIAkJCi0JCXN1cGVyLnJlbGVhc2VBY2Nlc3MoYWNjZXNzb3JLZXkpOwotLy8JCVN0cmluZ0J1ZmZlciBidWZmZXIgPSBuZXcgU3RyaW5nQnVmZmVyKCJSZWxlYXNlIE1vZHVsZSBtb2RlbCAoIik7Ci0vLwkJYnVmZmVyLmFwcGVuZCh0aGlzLmhhc2hDb2RlKCkpOwotLy8JCWJ1ZmZlci5hcHBlbmQoIikgUHJvamVjdDogIik7Ci0vLwkJYnVmZmVyLmFwcGVuZCh0aGlzLmdldFByb2plY3QoKSk7Ci0vLwkJaWYgKGlzUmVhZE9ubHkoKSkKLS8vCQkJYnVmZmVyLmFwcGVuZCgiIFIgPSAiKTsgLy8kTk9OLU5MUy0xJAotLy8JCWVsc2UKLS8vCQkJYnVmZmVyLmFwcGVuZCgiIFcgPSAiKTsgLy8kTk9OLU5MUy0xJAotLy8JCWJ1ZmZlci5hcHBlbmQoZ2V0UmVnaXN0cnkoKS5zaXplKCkpOwotLy8JCVN5c3RlbS5vdXQucHJpbnRsbihidWZmZXIudG9TdHJpbmcoKSk7CisJCS8vTm90IGJvdGhlcmluZyB3aXRoIHJlZiBjb3VudGluZyBtb2RlbCBhY2Nlc3MgLSBhbHdheXMgYWxsb3cgc2F2ZS9hY2Nlc3MKKwl9CisJQE92ZXJyaWRlCisJcHJvdGVjdGVkIHZvaWQgYXNzZXJ0UGVybWlzc2lvblRvU2F2ZShPYmplY3QgYWNjZXNzb3JLZXkpIHsKKwkJLy9Ob3QgYm90aGVyaW5nIHdpdGggcmVmIGNvdW50aW5nIG1vZGVsIGFjY2VzcyAtIGFsd2F5cyBhbGxvdyBzYXZlL2FjY2VzcworCX0KKwlAT3ZlcnJpZGUKKwlwdWJsaWMgYm9vbGVhbiBpc1NoYXJlZCgpIHsKKwkJLy9Ob3QgYm90aGVyaW5nIHdpdGggcmVmIGNvdW50aW5nIG1vZGVsIGFjY2VzcyAtIGFsd2F5cyBhbGxvdyBzYXZlL2FjY2VzcworCQlyZXR1cm4gZmFsc2U7CiAJfQogfQpkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUvbW9kdWxlY29yZS1zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9jb21wb25lbnRjb3JlL2ludGVybmFsL1Byb2plY3RNaWdyYXRvclJlZ2lzdHJ5LmphdmEgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS9tb2R1bGVjb3JlLXNyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2NvbXBvbmVudGNvcmUvaW50ZXJuYWwvUHJvamVjdE1pZ3JhdG9yUmVnaXN0cnkuamF2YQppbmRleCBmNjg4M2NhLi4wODQ4NDU0IDEwMDY0NAotLS0gYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS9tb2R1bGVjb3JlLXNyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2NvbXBvbmVudGNvcmUvaW50ZXJuYWwvUHJvamVjdE1pZ3JhdG9yUmVnaXN0cnkuamF2YQorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS9tb2R1bGVjb3JlLXNyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2NvbXBvbmVudGNvcmUvaW50ZXJuYWwvUHJvamVjdE1pZ3JhdG9yUmVnaXN0cnkuamF2YQpAQCAtMjQsOCArMjQsMTAgQEAKIGltcG9ydCBvcmcuZWNsaXBzZS5qZW0udXRpbC5SZWdpc3RyeVJlYWRlcjsKIAogLyoqCi0gKiBUbyBjaGFuZ2UgdGhlIHRlbXBsYXRlIGZvciB0aGlzIGdlbmVyYXRlZCB0eXBlIGNvbW1lbnQgZ28gdG8KLSAqIFdpbmRvdyZndDtQcmVmZXJlbmNlcyZndDtKYXZhJmd0O0NvZGUgR2VuZXJhdGlvbiZndDtDb2RlIGFuZCBDb21tZW50cworICogVGhpcyBoYXMgYmVlbiBkZXByZWNhdGVkIHNpbmNlIFdUUCAzLjEuMiBhbmQgd2lsbCBiZSBkZWxldGVkIHBvc3QgV1RQIDMuMi4KKyAqIFNlZSBodHRwczovL2J1Z3MuZWNsaXBzZS5vcmcvYnVncy9zaG93X2J1Zy5jZ2k/aWQ9MjkyOTM0CisgKiBAZGVwcmVjYXRlZCAKKyAqIEBhdXRob3IganNob2xsCiAgKi8KIHB1YmxpYyBjbGFzcyBQcm9qZWN0TWlncmF0b3JSZWdpc3RyeSBleHRlbmRzIFJlZ2lzdHJ5UmVhZGVyIHsKIApkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUvbW9kdWxlY29yZS1zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9jb21wb25lbnRjb3JlL2ludGVybmFsL1N0cnVjdHVyZUVkaXQuamF2YSBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlL21vZHVsZWNvcmUtc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vY29tcG9uZW50Y29yZS9pbnRlcm5hbC9TdHJ1Y3R1cmVFZGl0LmphdmEKaW5kZXggMzg5MWNlNi4uNGJjZjVhOCAxMDA2NDQKLS0tIGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUvbW9kdWxlY29yZS1zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9jb21wb25lbnRjb3JlL2ludGVybmFsL1N0cnVjdHVyZUVkaXQuamF2YQorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS9tb2R1bGVjb3JlLXNyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2NvbXBvbmVudGNvcmUvaW50ZXJuYWwvU3RydWN0dXJlRWRpdC5qYXZhCkBAIC0xOCw4ICsxOCwxMCBAQAogaW1wb3J0IGphdmEudXRpbC5MaXN0OwogaW1wb3J0IGphdmEudXRpbC5NYXA7CiAKK2ltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJlc291cmNlcy5JRmlsZTsKIGltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJlc291cmNlcy5JUHJvamVjdDsKIGltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJlc291cmNlcy5JUmVzb3VyY2U7CitpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5yZXNvdXJjZXMuSVdvcmtzcGFjZVJvb3Q7CiBpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5yZXNvdXJjZXMuUmVzb3VyY2VzUGx1Z2luOwogaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucnVudGltZS5Db3JlRXhjZXB0aW9uOwogaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucnVudGltZS5JUGF0aDsKQEAgLTI3LDE5ICsyOSwxOSBAQAogaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucnVudGltZS5JU3RhdHVzOwogaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucnVudGltZS5QYXRoOwogaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucnVudGltZS5qb2JzLklMb2NrOworaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucnVudGltZS5qb2JzLkpvYjsKIGltcG9ydCBvcmcuZWNsaXBzZS5lbWYuY29tbW9uLnV0aWwuRUxpc3Q7CiBpbXBvcnQgb3JnLmVjbGlwc2UuZW1mLmNvbW1vbi51dGlsLlVSSTsKIGltcG9ydCBvcmcuZWNsaXBzZS5qZW0udXRpbC5VSUNvbnRleHREZXRlcm1pbmF0aW9uOwogaW1wb3J0IG9yZy5lY2xpcHNlLmplbS51dGlsLmVtZi53b3JrYmVuY2guUHJvamVjdFV0aWxpdGllczsKLWltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUuQ29tcG9uZW50Q29yZTsKIGltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUuSUVkaXRNb2RlbEhhbmRsZXI7CiBpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb21wb25lbnRjb3JlLk1vZHVsZUNvcmVOYXR1cmU7CiBpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb21wb25lbnRjb3JlLlVucmVzb2x2ZWFibGVVUklFeGNlcHRpb247CiBpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb21wb25lbnRjb3JlLmludGVybmFsLmltcGwuTW9kdWxlVVJJVXRpbDsKLWltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUuaW50ZXJuYWwuaW1wbC5QbGF0Zm9ybVVSTE1vZHVsZUNvbm5lY3Rpb247CiBpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb21wb25lbnRjb3JlLmludGVybmFsLmltcGwuUmVzb3VyY2VUcmVlTm9kZTsKLWltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUuaW50ZXJuYWwucmVzb3VyY2VzLlZpcnR1YWxSZWZlcmVuY2U7CiBpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb21wb25lbnRjb3JlLmludGVybmFsLnV0aWwuRWNsaXBzZVJlc291cmNlQWRhcHRlcjsKK2ltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUucmVzb2x2ZXJzLklSZWZlcmVuY2VSZXNvbHZlcjsKK2ltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUucmVzb2x2ZXJzLlJlZmVyZW5jZVJlc29sdmVyVXRpbDsKIGltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUucmVzb3VyY2VzLklWaXJ0dWFsQ29tcG9uZW50OwogaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS5yZXNvdXJjZXMuSVZpcnR1YWxSZWZlcmVuY2U7CiBpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5pbnRlcm5hbC5lbWYudXRpbGl0aWVzLkV4dGVuZGVkRWNvcmVVdGlsOwpAQCAtNTYsNyArNTgsNyBAQAogICoge0BzZWUgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlLk1vZHVsZVN0cnVjdHVyYWxNb2RlbH0pIGNvcnJlY3RseS4gRWFjaCBwcm9qZWN0IGhhcwogICogZXhhY3RseSBvbmUgKHtAc2VlIG9yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS5Nb2R1bGVTdHJ1Y3R1cmFsTW9kZWx9KSBmb3IgcmVhZCBhbmQKICAqIGV4YWN0bHkgb25lIGZvciB3cml0ZS4gRWFjaCBvZiB0aGVzZSBpcyBzaGFyZWQgYW1vbmcgYWxsIGNsaWVudHMgYW5kIHJlZmVyZW5jZSBjb3VudGVkIGFzCi0gKiBuZWNlc3NhcnkuIENsaWVudHMgc2hvdWxkIHVzZSBNb2R1bGVDb3JlIHdoZW4gd29ya2luZyB3aXRoIHRoZSBXVFAgTW9kdWxlcyBTdHJjdXRydWFsIE1vZGVsLgorICogbmVjZXNzYXJ5LiBDbGllbnRzIHNob3VsZCB1c2UgTW9kdWxlQ29yZSB3aGVuIHdvcmtpbmcgd2l0aCB0aGUgV1RQIE1vZHVsZXMgU3RydWN0dXJhbCBNb2RlbC4KICAqIDwvcD4KICAqIAogICogPHA+CkBAIC0yNDYsNiArMjQ4LDcgQEAKIAkJaWYgKGVjbGlwc2VSZXNvdXJjZUFkYXB0ZXIgIT0gbnVsbCkKIAkJCXJldHVybiBlY2xpcHNlUmVzb3VyY2VBZGFwdGVyLmdldEVjbGlwc2VSZXNvdXJjZSgpOwogCQllY2xpcHNlUmVzb3VyY2VBZGFwdGVyID0gbmV3IEVjbGlwc2VSZXNvdXJjZUFkYXB0ZXIoKTsKKwkJZWNsaXBzZVJlc291cmNlQWRhcHRlci5zZXRUYXJnZXQoYU1vZHVsZVJlc291cmNlKTsKIAkJYU1vZHVsZVJlc291cmNlLmVBZGFwdGVycygpLmFkZChlY2xpcHNlUmVzb3VyY2VBZGFwdGVyKTsKIAkJcmV0dXJuIGVjbGlwc2VSZXNvdXJjZUFkYXB0ZXIuZ2V0RWNsaXBzZVJlc291cmNlKCk7CiAJfQpAQCAtMjgxLDQ1ICsyODQsMTQgQEAKIAkJcmV0dXJuIGNvbXBvbmVudFR5cGU7CiAJfQogCi0JcHVibGljIHN0YXRpYyBJVmlydHVhbFJlZmVyZW5jZSBjcmVhdGVWaXJ0dWFsUmVmZXJlbmNlKElWaXJ0dWFsQ29tcG9uZW50IGNvbnRleHQsIFJlZmVyZW5jZWRDb21wb25lbnQgcmVmZXJlbmNlZENvbXBvbmVudCkgewotCi0JCUlWaXJ0dWFsQ29tcG9uZW50IHRhcmdldENvbXBvbmVudCA9IG51bGw7Ci0JCUlQcm9qZWN0IHRhcmdldFByb2plY3QgPSBudWxsOwotCQlVUkkgdXJpID0gcmVmZXJlbmNlZENvbXBvbmVudC5nZXRIYW5kbGUoKTsKLQkJaWYgKHVyaSA9PSBudWxsKQotCQkJcmV0dXJuIG51bGw7Ci0JCWJvb2xlYW4gaXNDbGFzc1BhdGhVUkkgPSBNb2R1bGVVUklVdGlsLmlzQ2xhc3NQYXRoVVJJKHVyaSk7Ci0JCWlmKCAhaXNDbGFzc1BhdGhVUkkgKXsKLQkJCXRyeSB7IAotCQkJCXRhcmdldFByb2plY3QgPSBTdHJ1Y3R1cmVFZGl0LmdldENvbnRhaW5pbmdQcm9qZWN0KHVyaSk7Ci0JCQl9IGNhdGNoKFVucmVzb2x2ZWFibGVVUklFeGNlcHRpb24gdXVyaWUpIHsKLQkJCQkvL0lnbm9yZQotCQkJfSAKLQkJCS8vIGlmIHRoZSBwcm9qZWN0IGNhbm5vdCBiZSByZXNvbHZlZCwgYXNzdW1lIGl0J3MgbG9jYWwgLSByZWFsbHkgaXQgcHJvYmFibHkgZGVsZXRlZCAKLQkJCQotCQkJdGFyZ2V0Q29tcG9uZW50ID0gQ29tcG9uZW50Q29yZS5jcmVhdGVDb21wb25lbnQodGFyZ2V0UHJvamVjdCk7ICAKLQkJCQkKLQotCQl9ZWxzZXsKLQkJCVN0cmluZyBhcmNoaXZlVHlwZSA9ICIiOyAvLyROT04tTkxTLTEkCi0JCQlTdHJpbmcgYXJjaGl2ZU5hbWUgPSAiIjsgLy8kTk9OLU5MUy0xJAotCQkJdHJ5IHsKLQkJCQlhcmNoaXZlVHlwZSA9IE1vZHVsZVVSSVV0aWwuZ2V0QXJjaGl2ZVR5cGUodXJpKTsKLQkJCQlhcmNoaXZlTmFtZSA9IE1vZHVsZVVSSVV0aWwuZ2V0QXJjaGl2ZU5hbWUodXJpKTsKLQkJCQkKLQkJCX0gY2F0Y2ggKFVucmVzb2x2ZWFibGVVUklFeGNlcHRpb24gZSkgewotCQkJCS8vSWdub3JlCi0JCQl9Ci0JCQl0YXJnZXRDb21wb25lbnQgPSBDb21wb25lbnRDb3JlLmNyZWF0ZUFyY2hpdmVDb21wb25lbnQoY29udGV4dC5nZXRQcm9qZWN0KCksIGFyY2hpdmVUeXBlICsgSVBhdGguU0VQQVJBVE9SICsgYXJjaGl2ZU5hbWUgKTsgCi0JCX0KLQkJcmV0dXJuIG5ldyBWaXJ0dWFsUmVmZXJlbmNlKGNvbnRleHQsIHRhcmdldENvbXBvbmVudCwgcmVmZXJlbmNlZENvbXBvbmVudC5nZXRSdW50aW1lUGF0aCgpLCByZWZlcmVuY2VkQ29tcG9uZW50LmdldERlcGVuZGVuY3lUeXBlKCkuZ2V0VmFsdWUoKSk7CisJcHVibGljIHN0YXRpYyBJVmlydHVhbFJlZmVyZW5jZSBjcmVhdGVWaXJ0dWFsUmVmZXJlbmNlKElWaXJ0dWFsQ29tcG9uZW50IGNvbnRleHQsIFJlZmVyZW5jZWRDb21wb25lbnQgcmVmZXJlbmNlKSB7CisJCUlSZWZlcmVuY2VSZXNvbHZlciByZXNvbHZlciA9IFJlZmVyZW5jZVJlc29sdmVyVXRpbC5nZXREZWZhdWx0KCkuZ2V0UmVzb2x2ZXIoY29udGV4dCwgcmVmZXJlbmNlKTsKKwkJcmV0dXJuIHJlc29sdmVyLnJlc29sdmUoY29udGV4dCwgcmVmZXJlbmNlKTsKIAl9CiAKIAlwcm90ZWN0ZWQgU3RydWN0dXJlRWRpdChNb2R1bGVDb3JlTmF0dXJlIGFOYXR1cmUsIGJvb2xlYW4gdG9BY2Nlc3NBc1JlYWRPbmx5KSB7Ci0JCWlmICh0b0FjY2Vzc0FzUmVhZE9ubHkpCi0JCQlzdHJ1Y3R1cmFsTW9kZWwgPSBhTmF0dXJlLmdldE1vZHVsZVN0cnVjdHVyYWxNb2RlbEZvclJlYWQodGhpcyk7Ci0JCWVsc2UKLQkJCXN0cnVjdHVyYWxNb2RlbCA9IGFOYXR1cmUuZ2V0TW9kdWxlU3RydWN0dXJhbE1vZGVsRm9yV3JpdGUodGhpcyk7CisJCS8vIGFsd2F5cyBnZXQgdGhlIHdyaXRlIGVkaXRtb2RlbCAtIG9uZSBpbnN0YW5jZSBvbmx5CisJCXN0cnVjdHVyYWxNb2RlbCA9IGFOYXR1cmUuZ2V0TW9kdWxlU3RydWN0dXJhbE1vZGVsRm9yV3JpdGUodGhpcyk7CiAJCWFQcm9qZWN0ID0gYU5hdHVyZS5nZXRQcm9qZWN0KCk7CiAJCWlzUmVhZE9ubHkgPSB0b0FjY2Vzc0FzUmVhZE9ubHk7CiAJCWlzU3RydWN0dXJhbE1vZGVsU2VsZk1hbmFnZWQgPSB0cnVlOwpAQCAtMzU2LDEwICszMjgsMTggQEAKIAkJaWYgKGlzUmVhZE9ubHkpCiAJCQl0aHJvd0F0dGVtcHRlZFJlYWRPbmx5TW9kaWZpY2F0aW9uKCk7CiAJCWVsc2UgaWYgKHZhbGlkYXRlRWRpdCgpLmlzT0soKSkgeyAKKwkJCS8vIE1ha2Ugc3VyZSB3ZSBvYnRhaW4gd29ya3NwYWNlIHJ1bGUgYmVmb3JlIHNhdmluZworCQkJSVdvcmtzcGFjZVJvb3Qgcm9vdCA9IFJlc291cmNlc1BsdWdpbi5nZXRXb3Jrc3BhY2UoKS5nZXRSb290KCk7CisJCQl0cnkgeworCQkJLy9PSyB3YWl0IHRvIGdldCB3b3Jrc3BhY2Ugcm9vdCBiZWZvcmUgcmVmcmVzaGluZworCQkJSm9iLmdldEpvYk1hbmFnZXIoKS5iZWdpblJ1bGUocm9vdCwgbnVsbCk7CiAJCQlzeW5jaHJvbml6ZWQgKHN0cnVjdHVyYWxNb2RlbCkgewogCQkJCWlmICghc3RydWN0dXJhbE1vZGVsLmlzRGlzcG9zZWQoKSkKIAkJCQkJc3RydWN0dXJhbE1vZGVsLnNhdmUoYU1vbml0b3IsIHRoaXMpOwogCQkJfQorCQkJfSBmaW5hbGx5IHsKKwkJCQlKb2IuZ2V0Sm9iTWFuYWdlcigpLmVuZFJ1bGUocm9vdCk7CisJCQl9CiAJCX0KIAl9CiAKQEAgLTM3Nyw3ICszNTcsNyBAQAogCXB1YmxpYyB2b2lkIHNhdmVJZk5lY2Vzc2FyeShJUHJvZ3Jlc3NNb25pdG9yIGFNb25pdG9yKSB7CiAJCWlmIChpc1JlYWRPbmx5KQogCQkJdGhyb3dBdHRlbXB0ZWRSZWFkT25seU1vZGlmaWNhdGlvbigpOwotCQllbHNlIGlmICh2YWxpZGF0ZUVkaXQoKS5pc09LKCkpIHsgCisJCWVsc2UgaWYgKHN0cnVjdHVyYWxNb2RlbC5pc0RpcnR5KCkgJiYgdmFsaWRhdGVFZGl0KCkuaXNPSygpKSB7IAogCQkJCWlmICghc3RydWN0dXJhbE1vZGVsLmlzRGlzcG9zZWQoKSkKIAkJCQkJc3RydWN0dXJhbE1vZGVsLnNhdmVJZk5lY2Vzc2FyeShhTW9uaXRvciwgdGhpcyk7CiAJCX0KQEAgLTQyMiw4ICs0MDIsNyBAQAogCQkJCXRyeSB7CiAJCQkJCXN0cnVjdHVyYWxNb2RlbC5wcmVwYXJlUHJvamVjdE1vZHVsZXNJZk5lY2Vzc2FyeSgpOwogCQkJCX0gY2F0Y2ggKENvcmVFeGNlcHRpb24gZSkgewotCQkJCQkvLyBUT0RPIEF1dG8tZ2VuZXJhdGVkIGNhdGNoIGJsb2NrCi0JCQkJCWUucHJpbnRTdGFja1RyYWNlKCk7CisJCQkJCU1vZHVsZWNvcmVQbHVnaW4ubG9nRXJyb3IoZSk7CiAJCQkJfQogCQkJfQogCQl9CkBAIC00MzUsMTAgKzQxNCwxNyBAQAogCSAqIHRvIGFkZCBvciByZW1vdmUge0BzZWUgV29ya2JlbmNoQ29tcG9uZW50fXMuIElmIGEgY2xpZW50IG5lZWRzIHRvIGp1c3QgcmVhZCB0aGUgZXhpc3RpbmcKIAkgKiB7QHNlZSBXb3JrYmVuY2hDb21wb25lbnR9cywgdXNlIHtAc2VlICNnZXRXb3JrYmVuY2hNb2R1bGVzKCl9LgogCSAqIDwvcD4KKwkgKiA8cD4KKwkgKiBEZWFkbG9jayBXYXJuaW5nOiBDYWxsaW5nIHRoaXMgbWV0aG9kIHJlcXVpcmVzIHR3byBsb2Nrcy4gIEZpcnN0IHRoZSBjb21wb25lbnQgZmlsZSdzIGZpbGUgbG9jaworCSAqIGlzIHJlcXVpcmVkIGFuZCB0aGVuIHRoZSBFTUZXb3JrYmVuY2hFZGl0Q29udGV4dEZhY3RvcnkncyBwcm9qZWN0SUxvY2sgaXMgcmVxdWlyZWQuICBJZiBhbm90aGVyCisJICogdGhyZWFkIGFjcXVpcmVzIHRoZXNlIHNhbWUgdHdvIGxvY2tzIGluIHRoZSBvcHBvc2l0ZSBvcmRlciwgZGVhZGxvY2sgY291bGQgb2NjdXIuCisJICogPC9wPgogCSAqIAogCSAqIEByZXR1cm4gVGhlIHJvb3Qgb2JqZWN0IG9mIHRoZSB1bmRlcmx5aW5nIG1vZGVsCiAJICovCiAJcHVibGljIFByb2plY3RDb21wb25lbnRzIGdldENvbXBvbmVudE1vZGVsUm9vdCgpIHsKKwkJSUZpbGUgZmlsZSA9IHN0cnVjdHVyYWxNb2RlbC5nZXRDb21wb25lbnRGaWxlKCk7CisJCWlmIChmaWxlID09IG51bGwpIHJldHVybiBudWxsOwogCQlQcm9qZWN0Q29tcG9uZW50cyBjb21wcyA9IG51bGw7CiAJCUlMb2NrIGxvY2sgPSBFTUZXb3JrYmVuY2hFZGl0Q29udGV4dEZhY3RvcnkuZ2V0UHJvamVjdExvY2tPYmplY3Qoc3RydWN0dXJhbE1vZGVsLmdldFByb2plY3QoKSk7CiAJCXRyeXsKQEAgLTQ1NCw4ICs0NDAsNyBAQAogCQkJCWxvY2sucmVsZWFzZSgpOwogCQkJfQogCQl9Ci0JCQotCQlyZXR1cm4gY29tcHM7CisJCXJldHVybiBjb21wczsJCQogCX0KIAogCS8qKgpAQCAtOTMzLDkgKzkxOCw4IEBACiAJfQogCiAJcHVibGljIHN0YXRpYyBVUkkgY3JlYXRlQ29tcG9uZW50VVJJKElQcm9qZWN0IGFDb250YWluaW5nUHJvamVjdCwgU3RyaW5nIGFDb21wb25lbnROYW1lKSB7Ci0JCXJldHVybiBVUkkuY3JlYXRlVVJJKFBsYXRmb3JtVVJMTW9kdWxlQ29ubmVjdGlvbi5NT0RVTEVfUFJPVE9DT0wgKyBJUGF0aC5TRVBBUkFUT1IgKyBQbGF0Zm9ybVVSTE1vZHVsZUNvbm5lY3Rpb24uUkVTT1VSQ0VfTU9EVUxFICsgYUNvbnRhaW5pbmdQcm9qZWN0LmdldE5hbWUoKSArIElQYXRoLlNFUEFSQVRPUiArIGFDb21wb25lbnROYW1lKTsKKwkJcmV0dXJuIE1vZHVsZVVSSVV0aWwuZnVsbHlRdWFsaWZ5VVJJKGFDb250YWluaW5nUHJvamVjdCwgYUNvbXBvbmVudE5hbWUpOwogCX0KLQogCQogCXByb3RlY3RlZCBJUHJvamVjdCBnZXRQcm9qZWN0KCkgewogCQlyZXR1cm4gYVByb2plY3Q7CmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS9tb2R1bGVjb3JlLXNyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2NvbXBvbmVudGNvcmUvaW50ZXJuYWwvYnVpbGRlci9EZXBlbmRlbmN5R3JhcGguamF2YSBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlL21vZHVsZWNvcmUtc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vY29tcG9uZW50Y29yZS9pbnRlcm5hbC9idWlsZGVyL0RlcGVuZGVuY3lHcmFwaC5qYXZhCmluZGV4IDc0MzQxZjIuLmYzMTk3MGEgMTAwNjQ0Ci0tLSBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlL21vZHVsZWNvcmUtc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vY29tcG9uZW50Y29yZS9pbnRlcm5hbC9idWlsZGVyL0RlcGVuZGVuY3lHcmFwaC5qYXZhCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlL21vZHVsZWNvcmUtc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vY29tcG9uZW50Y29yZS9pbnRlcm5hbC9idWlsZGVyL0RlcGVuZGVuY3lHcmFwaC5qYXZhCkBAIC0yOCw3ICsyOCw3IEBACiAKIAlwdWJsaWMgSVByb2plY3RbXSBnZXRSZWZlcmVuY2luZ0NvbXBvbmVudHMoSVByb2plY3QgdGFyZ2V0KSB7CiAJCVNldDxJUHJvamVjdD4gcmVmZXJlbmNpbmdDb21wb25lbnRzID0gSURlcGVuZGVuY3lHcmFwaC5JTlNUQU5DRS5nZXRSZWZlcmVuY2luZ0NvbXBvbmVudHModGFyZ2V0KTsKLQkJcmV0dXJuIChJUHJvamVjdFtdKSByZWZlcmVuY2luZ0NvbXBvbmVudHMudG9BcnJheShuZXcgSVByb2plY3RbcmVmZXJlbmNpbmdDb21wb25lbnRzLnNpemUoKV0pOworCQlyZXR1cm4gcmVmZXJlbmNpbmdDb21wb25lbnRzLnRvQXJyYXkobmV3IElQcm9qZWN0W3JlZmVyZW5jaW5nQ29tcG9uZW50cy5zaXplKCldKTsKIAl9CiAKIAlwdWJsaWMgdm9pZCBhZGRSZWZlcmVuY2UoSVByb2plY3QgdGFyZ2V0LCBJUHJvamVjdCByZWZlcmVuY2luZ0NvbXBvbmVudCkgewpkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUvbW9kdWxlY29yZS1zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9jb21wb25lbnRjb3JlL2ludGVybmFsL2J1aWxkZXIvRGVwZW5kZW5jeUdyYXBoRXZlbnQuamF2YSBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlL21vZHVsZWNvcmUtc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vY29tcG9uZW50Y29yZS9pbnRlcm5hbC9idWlsZGVyL0RlcGVuZGVuY3lHcmFwaEV2ZW50LmphdmEKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uYWEyZDgwZAotLS0gL2Rldi9udWxsCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlL21vZHVsZWNvcmUtc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vY29tcG9uZW50Y29yZS9pbnRlcm5hbC9idWlsZGVyL0RlcGVuZGVuY3lHcmFwaEV2ZW50LmphdmEKQEAgLTAsMCArMSwxNjggQEAKKy8qKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqCisgKiBDb3B5cmlnaHQgKGMpIDIwMTAgSUJNIENvcnBvcmF0aW9uIGFuZCBvdGhlcnMuCisgKiBBbGwgcmlnaHRzIHJlc2VydmVkLiBUaGlzIHByb2dyYW0gYW5kIHRoZSBhY2NvbXBhbnlpbmcgbWF0ZXJpYWxzCisgKiBhcmUgbWFkZSBhdmFpbGFibGUgdW5kZXIgdGhlIHRlcm1zIG9mIHRoZSBFY2xpcHNlIFB1YmxpYyBMaWNlbnNlIHYxLjAKKyAqIHdoaWNoIGFjY29tcGFuaWVzIHRoaXMgZGlzdHJpYnV0aW9uLCBhbmQgaXMgYXZhaWxhYmxlIGF0CisgKiBodHRwOi8vd3d3LmVjbGlwc2Uub3JnL2xlZ2FsL2VwbC12MTAuaHRtbAorICoKKyAqIENvbnRyaWJ1dG9yczoKKyAqIElCTSBDb3Jwb3JhdGlvbiAtIGluaXRpYWwgQVBJIGFuZCBpbXBsZW1lbnRhdGlvbgorICoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKiovCitwYWNrYWdlIG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS5pbnRlcm5hbC5idWlsZGVyOworCitpbXBvcnQgamF2YS51dGlsLkNvbGxlY3Rpb25zOworaW1wb3J0IGphdmEudXRpbC5IYXNoTWFwOworaW1wb3J0IGphdmEudXRpbC5IYXNoU2V0OworaW1wb3J0IGphdmEudXRpbC5NYXA7CitpbXBvcnQgamF2YS51dGlsLlNldDsKKworaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucmVzb3VyY2VzLklQcm9qZWN0OworCitwdWJsaWMgY2xhc3MgRGVwZW5kZW5jeUdyYXBoRXZlbnQgaW1wbGVtZW50cyBJRGVwZW5kZW5jeUdyYXBoVXBkYXRlRXZlbnQgeworCisJcHJpdmF0ZSBpbnQgdHlwZSA9IDA7CisJcHJpdmF0ZSBsb25nIG1vZFN0YW1wID0gMDsKKworCS8qKgorCSAqIEJvdGggdGhlc2UgbWFwcyBhcmUgcmV2ZXJzZSByZWZlcmVuY2UgbWFwcyBhcyB0aGUgb25lcyBhcmUgaW4KKwkgKiB7QGxpbmsgSURlcGVuZGVuY3lHcmFwaH0KKwkgKi8KKwlwcml2YXRlIE1hcDxJUHJvamVjdCwgU2V0PElQcm9qZWN0Pj4gYWRkZWRSZWZlcmVuY2VzID0gbnVsbDsKKwlwcml2YXRlIE1hcDxJUHJvamVjdCwgU2V0PElQcm9qZWN0Pj4gcmVtb3ZlZFJlZmVyZW5jZXMgPSBudWxsOworCisJLyoKKwkgKiAobm9uLUphdmFkb2MpCisJICogCisJICogQHNlZW9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS5pbnRlcm5hbC5idWlsZGVyLgorCSAqIElEZXBlbmRlbmN5R3JhcGhVcGRhdGVFdmVudCNnZXRUeXBlKCkKKwkgKi8KKwlwdWJsaWMgaW50IGdldFR5cGUoKSB7CisJCXJldHVybiB0eXBlOworCX0KKworCXZvaWQgc2V0TW9kU3RhbXAobG9uZyBtb2RTdGFtcCkgeworCQl0aGlzLm1vZFN0YW1wID0gbW9kU3RhbXA7CisJfQorCisJLyoKKwkgKiAobm9uLUphdmFkb2MpCisJICogCisJICogQHNlZW9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS5pbnRlcm5hbC5idWlsZGVyLgorCSAqIElEZXBlbmRlbmN5R3JhcGhVcGRhdGVFdmVudCNnZXRNb2RTdGFtcCgpCisJICovCisJcHVibGljIGxvbmcgZ2V0TW9kU3RhbXAoKSB7CisJCXJldHVybiBtb2RTdGFtcDsKKwl9CisKKwl2b2lkIGFkZFJlZmVyZXJlbmNlKElQcm9qZWN0IHNvdXJjZVByb2plY3QsIElQcm9qZWN0IHRhcmdldFByb2plY3QpIHsKKwkJaWYgKHNvdXJjZVByb2plY3QgPT0gbnVsbCkgeworCQkJdGhyb3cgbmV3IE51bGxQb2ludGVyRXhjZXB0aW9uKCJTb3VyY2UgcHJvamVjdCBtdXN0IG5vdCBiZSBudWxsLiIpOworCQl9CisJCWlmICh0YXJnZXRQcm9qZWN0ID09IG51bGwpIHsKKwkJCXRocm93IG5ldyBOdWxsUG9pbnRlckV4Y2VwdGlvbigiVGFyZ2V0IHByb2plY3QgbXVzdCBub3QgYmUgbnVsbC4iKTsKKwkJfQorCQkvL3VwZGF0ZSByZW1vdmVkIHJlZmVyZW5jZXMgYWNjb3JkaW5nbHkKKwkJaWYocmVtb3ZlZFJlZmVyZW5jZXMgIT0gbnVsbCl7CisJCQlTZXQgcmVmZXJlbmNlcyA9IHJlbW92ZWRSZWZlcmVuY2VzLmdldCh0YXJnZXRQcm9qZWN0KTsKKwkJCWlmKHJlZmVyZW5jZXMgIT0gbnVsbCl7CisJCQkJaWYocmVmZXJlbmNlcy5yZW1vdmUoc291cmNlUHJvamVjdCkpIHsKKwkJCQkJaWYocmVmZXJlbmNlcy5pc0VtcHR5KCkpeworCQkJCQkJcmVtb3ZlZFJlZmVyZW5jZXMucmVtb3ZlKHRhcmdldFByb2plY3QpOworCQkJCQkJaWYocmVtb3ZlZFJlZmVyZW5jZXMuaXNFbXB0eSgpKXsKKwkJCQkJCQlyZW1vdmVkUmVmZXJlbmNlcyA9IG51bGw7CisJCQkJCQkJaWYoKHR5cGUgJiBBRERFRCkgPT0gQURERUQpeworCQkJCQkJCQl0eXBlID0gQURERUQ7CisJCQkJCQkJfSBlbHNlIHsKKwkJCQkJCQkJdHlwZSA9IDA7CisJCQkJCQkJfQorCQkJCQkJfQorCQkJCQl9CisJCQkJCS8vdGhlcmUgaXMgbm8gbmV0IGNoYW5nZSwgc28gcmV0dXJuLgorCQkJCQlyZXR1cm47CisJCQkJfQorCQkJfQorCQl9CisJCQorCQlpZiAoYWRkZWRSZWZlcmVuY2VzID09IG51bGwpIHsKKwkJCXR5cGUgPSB0eXBlIHwgQURERUQ7CisJCQlhZGRlZFJlZmVyZW5jZXMgPSBuZXcgSGFzaE1hcDxJUHJvamVjdCwgU2V0PElQcm9qZWN0Pj4oKTsKKwkJfQorCQlTZXQgcmVmZXJlbmNlcyA9IGFkZGVkUmVmZXJlbmNlcy5nZXQodGFyZ2V0UHJvamVjdCk7CisJCWlmIChyZWZlcmVuY2VzID09IG51bGwpIHsKKwkJCXJlZmVyZW5jZXMgPSBuZXcgSGFzaFNldDxJUHJvamVjdD4oKTsKKwkJCWFkZGVkUmVmZXJlbmNlcy5wdXQodGFyZ2V0UHJvamVjdCwgcmVmZXJlbmNlcyk7CisJCX0KKwkJcmVmZXJlbmNlcy5hZGQoc291cmNlUHJvamVjdCk7CisJCQorCQkKKwl9CisKKwl2b2lkIHJlbW92ZVJlZmVyZW5jZShJUHJvamVjdCBzb3VyY2VQcm9qZWN0LCBJUHJvamVjdCB0YXJnZXRQcm9qZWN0KSB7CisJCWlmIChzb3VyY2VQcm9qZWN0ID09IG51bGwpIHsKKwkJCXRocm93IG5ldyBOdWxsUG9pbnRlckV4Y2VwdGlvbigiU291cmNlIHByb2plY3QgbXVzdCBub3QgYmUgbnVsbC4iKTsKKwkJfQorCQlpZiAodGFyZ2V0UHJvamVjdCA9PSBudWxsKSB7CisJCQl0aHJvdyBuZXcgTnVsbFBvaW50ZXJFeGNlcHRpb24oIlRhcmdldCBwcm9qZWN0IG11c3Qgbm90IGJlIG51bGwuIik7CisJCX0KKwkJCisJCS8vdXBkYXRlZCBhZGRlZCByZWZlcmVuY2VzIGFjY29yZGluZ2x5CisJCWlmKGFkZGVkUmVmZXJlbmNlcyAhPSBudWxsKXsKKwkJCVNldCByZWZlcmVuY2VzID0gYWRkZWRSZWZlcmVuY2VzLmdldCh0YXJnZXRQcm9qZWN0KTsKKwkJCWlmKHJlZmVyZW5jZXMgIT0gbnVsbCl7CisJCQkJaWYocmVmZXJlbmNlcy5yZW1vdmUoc291cmNlUHJvamVjdCkpeworCQkJCQlpZihyZWZlcmVuY2VzLmlzRW1wdHkoKSl7CisJCQkJCQlhZGRlZFJlZmVyZW5jZXMucmVtb3ZlKHRhcmdldFByb2plY3QpOworCQkJCQkJaWYoYWRkZWRSZWZlcmVuY2VzLmlzRW1wdHkoKSl7CisJCQkJCQkJYWRkZWRSZWZlcmVuY2VzID0gbnVsbDsKKwkJCQkJCQlpZigodHlwZSAmIFJFTU9WRUQpID09IFJFTU9WRUQpeworCQkJCQkJCQl0eXBlID0gUkVNT1ZFRDsKKwkJCQkJCQl9IGVsc2UgeworCQkJCQkJCQl0eXBlID0gMDsKKwkJCQkJCQl9CisJCQkJCQl9CisJCQkJCX0KKwkJCQkJLy90aGVyZSBpcyBubyBuZXQgY2hhbmdlLCBzbyByZXR1cm4uCisJCQkJCXJldHVybjsKKwkJCQl9CisJCQl9CisJCX0KKwkJCisJCWlmIChyZW1vdmVkUmVmZXJlbmNlcyA9PSBudWxsKSB7CisJCQl0eXBlID0gdHlwZSB8IFJFTU9WRUQ7CisJCQlyZW1vdmVkUmVmZXJlbmNlcyA9IG5ldyBIYXNoTWFwPElQcm9qZWN0LCBTZXQ8SVByb2plY3Q+PigpOworCQl9CisJCVNldCByZWZlcmVuY2VzID0gcmVtb3ZlZFJlZmVyZW5jZXMuZ2V0KHRhcmdldFByb2plY3QpOworCQlpZiAocmVmZXJlbmNlcyA9PSBudWxsKSB7CisJCQlyZWZlcmVuY2VzID0gbmV3IEhhc2hTZXQ8SVByb2plY3Q+KCk7CisJCQlyZW1vdmVkUmVmZXJlbmNlcy5wdXQodGFyZ2V0UHJvamVjdCwgcmVmZXJlbmNlcyk7CisJCX0KKwkJcmVmZXJlbmNlcy5hZGQoc291cmNlUHJvamVjdCk7CisJfQorCisJLyoKKwkgKiAobm9uLUphdmFkb2MpCisJICogCisJICogQHNlZW9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS5pbnRlcm5hbC5idWlsZGVyLgorCSAqIElEZXBlbmRlbmN5R3JhcGhVcGRhdGVFdmVudCNnZXRBZGRlZFJlZmVyZW5jZXMoKQorCSAqLworCXB1YmxpYyBNYXA8SVByb2plY3QsIFNldDxJUHJvamVjdD4+IGdldEFkZGVkUmVmZXJlbmNlcygpIHsKKwkJaWYgKGFkZGVkUmVmZXJlbmNlcyA9PSBudWxsKSB7CisJCQlyZXR1cm4gQ29sbGVjdGlvbnMuRU1QVFlfTUFQOworCQl9CisJCXJldHVybiBhZGRlZFJlZmVyZW5jZXM7CisJfQorCisJLyoKKwkgKiAobm9uLUphdmFkb2MpCisJICogCisJICogQHNlZW9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS5pbnRlcm5hbC5idWlsZGVyLgorCSAqIElEZXBlbmRlbmN5R3JhcGhVcGRhdGVFdmVudCNnZXRSZW1vdmVkUmVmZXJlbmNlcygpCisJICovCisJcHVibGljIE1hcDxJUHJvamVjdCwgU2V0PElQcm9qZWN0Pj4gZ2V0UmVtb3ZlZFJlZmVyZW5jZXMoKSB7CisJCWlmIChyZW1vdmVkUmVmZXJlbmNlcyA9PSBudWxsKSB7CisJCQlyZXR1cm4gQ29sbGVjdGlvbnMuRU1QVFlfTUFQOworCQl9CisJCXJldHVybiByZW1vdmVkUmVmZXJlbmNlczsKKwl9CisKK30KZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlL21vZHVsZWNvcmUtc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vY29tcG9uZW50Y29yZS9pbnRlcm5hbC9idWlsZGVyL0RlcGVuZGVuY3lHcmFwaEltcGwuamF2YSBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlL21vZHVsZWNvcmUtc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vY29tcG9uZW50Y29yZS9pbnRlcm5hbC9idWlsZGVyL0RlcGVuZGVuY3lHcmFwaEltcGwuamF2YQppbmRleCAwNGQ4ZGNkLi4zYzk2MGEyIDEwMDY0NAotLS0gYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS9tb2R1bGVjb3JlLXNyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2NvbXBvbmVudGNvcmUvaW50ZXJuYWwvYnVpbGRlci9EZXBlbmRlbmN5R3JhcGhJbXBsLmphdmEKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUvbW9kdWxlY29yZS1zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9jb21wb25lbnRjb3JlL2ludGVybmFsL2J1aWxkZXIvRGVwZW5kZW5jeUdyYXBoSW1wbC5qYXZhCkBAIC01LDYgKzUsNyBAQAogaW1wb3J0IGphdmEudXRpbC5IYXNoU2V0OwogaW1wb3J0IGphdmEudXRpbC5JdGVyYXRvcjsKIGltcG9ydCBqYXZhLnV0aWwuTWFwOworaW1wb3J0IGphdmEudXRpbC5NYXAuRW50cnk7CiBpbXBvcnQgamF2YS51dGlsLlNldDsKIAogaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucmVzb3VyY2VzLklQcm9qZWN0OwpAQCAtMTksMTQgKzIwLDIxIEBACiBpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5ydW50aW1lLklTYWZlUnVubmFibGU7CiBpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5ydW50aW1lLklTdGF0dXM7CiBpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5ydW50aW1lLkxpc3RlbmVyTGlzdDsKK2ltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJ1bnRpbWUuT3BlcmF0aW9uQ2FuY2VsZWRFeGNlcHRpb247CiBpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5ydW50aW1lLlNhZmVSdW5uZXI7CiBpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5ydW50aW1lLlN0YXR1czsKK2ltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJ1bnRpbWUuU3ViTW9uaXRvcjsKK2ltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJ1bnRpbWUuam9icy5JTG9jazsKIGltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJ1bnRpbWUuam9icy5Kb2I7CitpbXBvcnQgb3JnLmVjbGlwc2Uub3NnaS51dGlsLk5MUzsKIGltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUuQ29tcG9uZW50Q29yZTsKIGltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUuaW50ZXJuYWwuTW9kdWxlY29yZVBsdWdpbjsKIGltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUuaW50ZXJuYWwuaW1wbC5XVFBNb2R1bGVzUmVzb3VyY2VGYWN0b3J5OworaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS5pbnRlcm5hbC5yZXNvdXJjZXMuVmlydHVhbENvbXBvbmVudDsKK2ltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUuaW50ZXJuYWwudXRpbC5JTW9kdWxlQ29uc3RhbnRzOwogaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS5yZXNvdXJjZXMuSVZpcnR1YWxDb21wb25lbnQ7CiBpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb21wb25lbnRjb3JlLnJlc291cmNlcy5JVmlydHVhbFJlZmVyZW5jZTsKK2ltcG9ydCBvcmcub3NnaS5mcmFtZXdvcmsuQnVuZGxlOwogCiBwdWJsaWMgY2xhc3MgRGVwZW5kZW5jeUdyYXBoSW1wbCBpbXBsZW1lbnRzIElEZXBlbmRlbmN5R3JhcGggewogCkBAIC0zNiwxMyArNDQsMTUgQEAKIAlwcml2YXRlIE9iamVjdCBncmFwaExvY2sgPSBuZXcgT2JqZWN0KCk7CiAKIAkvKioKLQkgKiBJZiBwcm9qZWN0cyBhbmQgYW5kIEIgYm90aCBkZXBlbmQgb24gQyBhbiBlbnRyeSBpbiB0aGlzIGdyYXBoIHdvdWxkIGJlIHtDIC0+CisJICogSWYgcHJvamVjdHMgQSBhbmQgYW5kIEIgYm90aCBkZXBlbmQgb24gQyBhbiBlbnRyeSBpbiB0aGlzIGdyYXBoIHdvdWxkIGJlIHtDIC0+CiAJICoge0EsIEJ9IH0KIAkgKi8KIAlwcml2YXRlIE1hcDxJUHJvamVjdCwgU2V0PElQcm9qZWN0Pj4gZ3JhcGggPSBudWxsOwotCisJCiAJcHJpdmF0ZSBsb25nIG1vZFN0YW1wID0gMDsKLQorCQorCXByaXZhdGUgTGlzdGVuZXJMaXN0IGxpc3RlbmVycyA9IG5ldyBMaXN0ZW5lckxpc3QoKTsKKwkKIAkvKioKIAkgKiBUaGlzIGlzIG5vdCBwdWJsaWM7IG9ubHkge0BsaW5rIElEZXBlbmRlbmN5R3JhcGgjSU5TVEFOQ0V9IHNob3VsZCBiZQogCSAqIHVzZWQuCkBAIC02Nyw3ICs3NywxNyBAQAogCQkJcmV0dXJuIG1vZFN0YW1wOwogCQl9CiAJfQotCisJCisJcHJpdmF0ZSB2b2lkIGluY3JlbWVudE1vZFN0YW1wKCl7CisJCXN5bmNocm9uaXplZCAoZ3JhcGhMb2NrKSB7CisJCQltb2RTdGFtcCsrOworCQl9CisJfQorCS8qKgorCSAqIFJldHVybnMgdGhlIHNldCBvZiBwcm9qZWN0cyB3aG9zZSBjb21wb25lbnRzIHJlZmVyZW5jZSB0aGUgc3BlY2lmaWVkCisJICogdGFyZ2V0IHByb2plY3QncyBjb21wb25lbnQuIEZvciBleGFtcGxlIGlmIHByb2plY3RzIEEgYW5kIEIgYm90aAorCSAqIHJlZmVyZW5jZSBDLiBQYXNzaW5nIEMgYXMgdGhlIHRhcmdldFByb2plY3Qgd2lsbCByZXR1cm4ge0EsIEJ9CisJICovCiAJcHVibGljIFNldDxJUHJvamVjdD4gZ2V0UmVmZXJlbmNpbmdDb21wb25lbnRzKElQcm9qZWN0IHRhcmdldFByb2plY3QpIHsKIAkJd2FpdEZvckFsbFVwZGF0ZXMobnVsbCk7CiAJCXN5bmNocm9uaXplZCAoZ3JhcGhMb2NrKSB7CkBAIC03NSwxMiArOTUsMjIgQEAKIAkJCWlmIChzZXQgPT0gbnVsbCkgewogCQkJCXJldHVybiBDb2xsZWN0aW9ucy5FTVBUWV9TRVQ7CiAJCQl9IGVsc2UgeworCQkJCURlcGVuZGVuY3lHcmFwaEV2ZW50IGV2ZW50ID0gbnVsbDsKIAkJCQlmb3IgKEl0ZXJhdG9yPElQcm9qZWN0PiBpdGVyYXRvciA9IHNldC5pdGVyYXRvcigpOyBpdGVyYXRvci5oYXNOZXh0KCk7KSB7Ci0JCQkJCUlQcm9qZWN0IHByb2plY3QgPSBpdGVyYXRvci5uZXh0KCk7Ci0JCQkJCWlmICghcHJvamVjdC5pc0FjY2Vzc2libGUoKSkgeworCQkJCQlJUHJvamVjdCBzb3VyY2VQcm9qZWN0ID0gaXRlcmF0b3IubmV4dCgpOworCQkJCQlpZiAoIXNvdXJjZVByb2plY3QuaXNBY2Nlc3NpYmxlKCkpIHsKIAkJCQkJCWl0ZXJhdG9yLnJlbW92ZSgpOworCQkJCQkJaWYoZXZlbnQgPT0gbnVsbCl7CisJCQkJCQkJaW5jcmVtZW50TW9kU3RhbXAoKTsKKwkJCQkJCQlldmVudCA9IG5ldyBEZXBlbmRlbmN5R3JhcGhFdmVudCgpOworCQkJCQkJCWV2ZW50LnNldE1vZFN0YW1wKGdldE1vZFN0YW1wKCkpOworCQkJCQkJfQorCQkJCQkJZXZlbnQucmVtb3ZlUmVmZXJlbmNlKHNvdXJjZVByb2plY3QsIHRhcmdldFByb2plY3QpOwogCQkJCQl9CiAJCQkJfQorCQkJCWlmKGV2ZW50ICE9IG51bGwpeworCQkJCQlub3RpZml5TGlzdGVuZXJzKGV2ZW50KTsKKwkJCQl9CiAJCQkJU2V0PElQcm9qZWN0PiBjb3B5ID0gbmV3IEhhc2hTZXQ8SVByb2plY3Q+KCk7CiAJCQkJY29weS5hZGRBbGwoc2V0KTsKIAkJCQlyZXR1cm4gY29weTsKQEAgLTEwOSwxOSArMTM5LDE5IEBACiAJCQljYXNlIElSZXNvdXJjZS5QUk9KRUNUOiB7CiAJCQkJaW50IGtpbmQgPSBkZWx0YS5nZXRLaW5kKCk7CiAJCQkJaWYgKChJUmVzb3VyY2VEZWx0YS5BRERFRCAmIGtpbmQpICE9IDApIHsKLQkJCQkJcXVldWVQcm9qZWN0QWRkZWQoKElQcm9qZWN0KSByZXNvdXJjZSk7CisJCQkJCXVwZGF0ZSgoSVByb2plY3QpIHJlc291cmNlLCBJRGVwZW5kZW5jeUdyYXBoLkFEREVEKTsKIAkJCQkJcmV0dXJuIGZhbHNlOwogCQkJCX0gZWxzZSBpZiAoKElSZXNvdXJjZURlbHRhLlJFTU9WRUQgJiBraW5kKSAhPSAwKSB7Ci0JCQkJCXF1ZXVlUHJvamVjdERlbGV0ZWQoKElQcm9qZWN0KSByZXNvdXJjZSk7CisJCQkJCXVwZGF0ZSgoSVByb2plY3QpIHJlc291cmNlLCBJRGVwZW5kZW5jeUdyYXBoLlJFTU9WRUQpOwogCQkJCQlyZXR1cm4gZmFsc2U7CiAJCQkJfSBlbHNlIGlmICgoSVJlc291cmNlRGVsdGEuQ0hBTkdFRCAmIGtpbmQpICE9IDApIHsKIAkJCQkJaW50IGZsYWdzID0gZGVsdGEuZ2V0RmxhZ3MoKTsKIAkJCQkJaWYgKChJUmVzb3VyY2VEZWx0YS5PUEVOICYgZmxhZ3MpICE9IDApIHsKIAkJCQkJCWJvb2xlYW4gaXNPcGVuID0gKChJUHJvamVjdCkgcmVzb3VyY2UpLmlzT3BlbigpOwogCQkJCQkJaWYgKGlzT3BlbikgewotCQkJCQkJCXF1ZXVlUHJvamVjdEFkZGVkKChJUHJvamVjdCkgcmVzb3VyY2UpOworCQkJCQkJCXVwZGF0ZSgoSVByb2plY3QpIHJlc291cmNlLCBJRGVwZW5kZW5jeUdyYXBoLkFEREVEKTsKIAkJCQkJCX0gZWxzZSB7Ci0JCQkJCQkJcXVldWVQcm9qZWN0RGVsZXRlZCgoSVByb2plY3QpIHJlc291cmNlKTsKKwkJCQkJCQl1cGRhdGUoKElQcm9qZWN0KSByZXNvdXJjZSwgSURlcGVuZGVuY3lHcmFwaC5SRU1PVkVEKTsKIAkJCQkJCX0KIAkJCQkJCXJldHVybiBmYWxzZTsKIAkJCQkJfQpAQCAtMTMwLDE0ICsxNjAsMjAgQEAKIAkJCQlyZXR1cm4gZmFsc2U7CiAJCQl9CiAJCQljYXNlIElSZXNvdXJjZS5GT0xERVI6Ci0JCQkJaWYgKHJlc291cmNlLmdldE5hbWUoKS5lcXVhbHMoIi5zZXR0aW5ncyIpKSB7CisJCQkJaWYgKHJlc291cmNlLmdldE5hbWUoKS5lcXVhbHMoSU1vZHVsZUNvbnN0YW50cy5ET1RfU0VUVElOR1MpKSB7CiAJCQkJCXJldHVybiB0cnVlOwogCQkJCX0KIAkJCQlyZXR1cm4gZmFsc2U7CiAJCQljYXNlIElSZXNvdXJjZS5GSUxFOgogCQkJCVN0cmluZyBuYW1lID0gcmVzb3VyY2UuZ2V0TmFtZSgpOwogCQkJCWlmIChuYW1lLmVxdWFscyhXVFBNb2R1bGVzUmVzb3VyY2VGYWN0b3J5LldUUF9NT0RVTEVTX1NIT1JUX05BTUUpKSB7Ci0JCQkJCXVwZGF0ZShyZXNvdXJjZS5nZXRQcm9qZWN0KCkpOworCQkJCQlpZigoZGVsdGEuZ2V0S2luZCgpICYgSVJlc291cmNlRGVsdGEuQURERUQpICE9IDApeworCQkJCQkJdXBkYXRlKHJlc291cmNlLmdldFByb2plY3QoKSwgSURlcGVuZGVuY3lHcmFwaC5BRERFRCk7CisJCQkJCX0gZWxzZSB7CisJCQkJCQl1cGRhdGUocmVzb3VyY2UuZ2V0UHJvamVjdCgpLCBJRGVwZW5kZW5jeUdyYXBoLk1PRElGSUVEKTsKKwkJCQkJfQorCQkJCX0gZWxzZSBpZihuYW1lLmVxdWFscygiLnByb2plY3QiKSl7CisJCQkJCXVwZGF0ZShyZXNvdXJjZS5nZXRQcm9qZWN0KCksIElEZXBlbmRlbmN5R3JhcGguQURERUQpOwogCQkJCX0KIAkJCWRlZmF1bHQ6CiAJCQkJcmV0dXJuIGZhbHNlOwpAQCAtMTU4LDQ1ICsxOTQsODggQEAKIAkJCQlncmFwaCA9IG5ldyBIYXNoTWFwPElQcm9qZWN0LCBTZXQ8SVByb2plY3Q+PigpOwogCQkJCWxpc3RlbmVyID0gbmV3IERlcGVuZGVuY3lHcmFwaFJlc291cmNlQ2hhbmdlZExpc3RlbmVyKCk7CiAJCQkJUmVzb3VyY2VzUGx1Z2luLmdldFdvcmtzcGFjZSgpLmFkZFJlc291cmNlQ2hhbmdlTGlzdGVuZXIobGlzdGVuZXIsIElSZXNvdXJjZUNoYW5nZUV2ZW50LlBPU1RfQ0hBTkdFKTsKLQkJCQlJUHJvamVjdFtdIGFsbFByb2plY3RzID0gUmVzb3VyY2VzUGx1Z2luLmdldFdvcmtzcGFjZSgpLmdldFJvb3QoKS5nZXRQcm9qZWN0cygpOwotCQkJCWZvciAoSVByb2plY3Qgc291cmNlUHJvamVjdCA6IGFsbFByb2plY3RzKSB7Ci0JCQkJCXF1ZXVlUHJvamVjdEFkZGVkKHNvdXJjZVByb2plY3QpOwotCQkJCX0KKwkJCQlpbml0QWxsKCk7CiAJCQl9IGZpbmFsbHkgewogCQkJCXBvc3RVcGRhdGUoKTsKIAkJCX0KIAkJfQogCX0KLQotCXByaXZhdGUgdm9pZCByZW1vdmVBbGxSZWZlcmVuY2VzKElQcm9qZWN0IHByb2plY3QpIHsKKwkKKwlwcml2YXRlIHZvaWQgaW5pdEFsbCgpewogCQlzeW5jaHJvbml6ZWQgKGdyYXBoTG9jaykgewotCQkJZ3JhcGgucmVtb3ZlKHByb2plY3QpOwotCQkJZm9yIChJdGVyYXRvcjxTZXQ8SVByb2plY3Q+PiBpdGVyYXRvciA9IGdyYXBoLnZhbHVlcygpLml0ZXJhdG9yKCk7IGl0ZXJhdG9yLmhhc05leHQoKTspIHsKLQkJCQlpdGVyYXRvci5uZXh0KCkucmVtb3ZlKHByb2plY3QpOworCQkJdHJ5eworCQkJCXByZVVwZGF0ZSgpOworCQkJCUlQcm9qZWN0W10gYWxsUHJvamVjdHMgPSBSZXNvdXJjZXNQbHVnaW4uZ2V0V29ya3NwYWNlKCkuZ2V0Um9vdCgpLmdldFByb2plY3RzKCk7CisJCQkJZm9yIChJUHJvamVjdCBzb3VyY2VQcm9qZWN0IDogYWxsUHJvamVjdHMpIHsKKwkJCQkJdXBkYXRlKHNvdXJjZVByb2plY3QsIElEZXBlbmRlbmN5R3JhcGguQURERUQpOworCQkJCX0JCisJCQl9IGZpbmFsbHl7CisJCQkJcG9zdFVwZGF0ZSgpOwogCQkJfQotCQkJbW9kU3RhbXArKzsKKwkJCQorCQl9CisJfQorCQorCXByaXZhdGUgdm9pZCByZW1vdmVBbGxSZWZlcmVuY2VzKERlcGVuZGVuY3lHcmFwaEV2ZW50IGV2ZW50KXsKKwkJc3luY2hyb25pemVkIChncmFwaExvY2spIHsKKwkJCUlQcm9qZWN0IFtdIGFsbFJlZmVyZW5jZUtleXMgPSBuZXcgSVByb2plY3QgW2dyYXBoLmtleVNldCgpLnNpemUoKV07CisJCQlncmFwaC5rZXlTZXQoKS50b0FycmF5KGFsbFJlZmVyZW5jZUtleXMpOworCQkJZm9yKElQcm9qZWN0IHByb2plY3QgOiBhbGxSZWZlcmVuY2VLZXlzKXsKKwkJCQlyZW1vdmVBbGxSZWZlcmVuY2VzKHByb2plY3QsIGV2ZW50KTsKKwkJCX0KIAkJfQogCX0KIAotCXByaXZhdGUgdm9pZCByZW1vdmVSZWZlcmVuY2UoSVByb2plY3Qgc291cmNlUHJvamVjdCwgSVByb2plY3QgdGFyZ2V0UHJvamVjdCkgeworCXByaXZhdGUgdm9pZCByZW1vdmVBbGxSZWZlcmVuY2VzKElQcm9qZWN0IHRhcmdldFByb2plY3QsIERlcGVuZGVuY3lHcmFwaEV2ZW50IGV2ZW50KSB7CisJCXN5bmNocm9uaXplZCAoZ3JhcGhMb2NrKSB7CisJCQlib29sZWFuIHJlbW92ZWQgPSBmYWxzZTsKKwkJCVNldDxJUHJvamVjdD4gcmVtb3ZlZFNldCA9IGdyYXBoLnJlbW92ZSh0YXJnZXRQcm9qZWN0KTsKKwkJCWlmKHJlbW92ZWRTZXQgIT0gbnVsbCAmJiAhcmVtb3ZlZFNldC5pc0VtcHR5KCkpeworCQkJCXJlbW92ZWQgPSB0cnVlOworCQkJCWZvcihJdGVyYXRvcjxJUHJvamVjdD5pdGVyYXRvciA9IHJlbW92ZWRTZXQuaXRlcmF0b3IoKTsgaXRlcmF0b3IuaGFzTmV4dCgpOyl7CisJCQkJCWV2ZW50LnJlbW92ZVJlZmVyZW5jZShpdGVyYXRvci5uZXh0KCksIHRhcmdldFByb2plY3QpOworCQkJCX0KKwkJCX0KKwkJCWZvcihJdGVyYXRvciA8RW50cnk8SVByb2plY3QsU2V0PElQcm9qZWN0Pj4+aXRlcmF0b3IgPSBncmFwaC5lbnRyeVNldCgpLml0ZXJhdG9yKCk7IGl0ZXJhdG9yLmhhc05leHQoKTspeworCQkJCUVudHJ5PElQcm9qZWN0LFNldDxJUHJvamVjdD4+IGVudHJ5ID0gaXRlcmF0b3IubmV4dCgpOworCQkJCWlmKCFlbnRyeS5nZXRWYWx1ZSgpLmlzRW1wdHkoKSAmJiBlbnRyeS5nZXRWYWx1ZSgpLnJlbW92ZSh0YXJnZXRQcm9qZWN0KSl7CisJCQkJCXJlbW92ZWQgPSB0cnVlOworCQkJCQlldmVudC5yZW1vdmVSZWZlcmVuY2UodGFyZ2V0UHJvamVjdCwgZW50cnkuZ2V0S2V5KCkpOworCQkJCX0KKwkJCX0KKwkJCWlmKHJlbW92ZWQpeworCQkJCWluY3JlbWVudE1vZFN0YW1wKCk7CisJCQkJZXZlbnQuc2V0TW9kU3RhbXAoZ2V0TW9kU3RhbXAoKSk7CisJCQl9CisJCX0KKwl9CisKKwlwcml2YXRlIHZvaWQgcmVtb3ZlUmVmZXJlbmNlKElQcm9qZWN0IHNvdXJjZVByb2plY3QsIElQcm9qZWN0IHRhcmdldFByb2plY3QsIERlcGVuZGVuY3lHcmFwaEV2ZW50IGV2ZW50KSB7CiAJCXN5bmNocm9uaXplZCAoZ3JhcGhMb2NrKSB7CiAJCQlTZXQ8SVByb2plY3Q+IHJlZmVyZW5jaW5nUHJvamVjdHMgPSBncmFwaC5nZXQodGFyZ2V0UHJvamVjdCk7CiAJCQlpZiAocmVmZXJlbmNpbmdQcm9qZWN0cyAhPSBudWxsKSB7Ci0JCQkJcmVmZXJlbmNpbmdQcm9qZWN0cy5yZW1vdmUoc291cmNlUHJvamVjdCk7CisJCQkJaWYocmVmZXJlbmNpbmdQcm9qZWN0cy5yZW1vdmUoc291cmNlUHJvamVjdCkpeworCQkJCQlldmVudC5yZW1vdmVSZWZlcmVuY2Uoc291cmNlUHJvamVjdCwgdGFyZ2V0UHJvamVjdCk7CisJCQkJCWluY3JlbWVudE1vZFN0YW1wKCk7CisJCQkJCWV2ZW50LnNldE1vZFN0YW1wKGdldE1vZFN0YW1wKCkpOworCQkJCX0KIAkJCX0KLQkJCW1vZFN0YW1wKys7CiAJCX0KIAl9CiAKLQlwcml2YXRlIHZvaWQgYWRkUmVmZXJlbmNlKElQcm9qZWN0IHNvdXJjZVByb2plY3QsIElQcm9qZWN0IHRhcmdldFByb2plY3QpIHsKKwlwcml2YXRlIHZvaWQgYWRkUmVmZXJlbmNlKElQcm9qZWN0IHNvdXJjZVByb2plY3QsIElQcm9qZWN0IHRhcmdldFByb2plY3QsIERlcGVuZGVuY3lHcmFwaEV2ZW50IGV2ZW50KSB7CiAJCXN5bmNocm9uaXplZCAoZ3JhcGhMb2NrKSB7CiAJCQlTZXQ8SVByb2plY3Q+IHJlZmVyZW5jaW5nUHJvamVjdHMgPSBncmFwaC5nZXQodGFyZ2V0UHJvamVjdCk7CiAJCQlpZiAocmVmZXJlbmNpbmdQcm9qZWN0cyA9PSBudWxsKSB7CiAJCQkJcmVmZXJlbmNpbmdQcm9qZWN0cyA9IG5ldyBIYXNoU2V0PElQcm9qZWN0PigpOwogCQkJCWdyYXBoLnB1dCh0YXJnZXRQcm9qZWN0LCByZWZlcmVuY2luZ1Byb2plY3RzKTsKIAkJCX0KLQkJCXJlZmVyZW5jaW5nUHJvamVjdHMuYWRkKHNvdXJjZVByb2plY3QpOwotCQkJbW9kU3RhbXArKzsKKwkJCWJvb2xlYW4gYWRkZWQgPSByZWZlcmVuY2luZ1Byb2plY3RzLmFkZChzb3VyY2VQcm9qZWN0KTsKKwkJCWlmKGFkZGVkKXsKKwkJCQlldmVudC5hZGRSZWZlcmVyZW5jZShzb3VyY2VQcm9qZWN0LCB0YXJnZXRQcm9qZWN0KTsKKwkJCQlpbmNyZW1lbnRNb2RTdGFtcCgpOworCQkJCWV2ZW50LnNldE1vZFN0YW1wKGdldE1vZFN0YW1wKCkpOworCQkJfQogCQl9CiAJfQogCkBAIC0yMDYsMTQgKzI4NSwyMCBAQAogCiAJcHJpdmF0ZSBmaW5hbCBHcmFwaFVwZGF0ZUpvYiBncmFwaFVwZGF0ZUpvYiA9IG5ldyBHcmFwaFVwZGF0ZUpvYigpOwogCXByaXZhdGUgZmluYWwgT2JqZWN0IGpvYkxvY2sgPSBuZXcgT2JqZWN0KCk7CisJCisJLy9UaGlzIGxvY2sgaXMgdXNlZCBmb3IgZGVhZGxvY2sgYXZvaWRhbmNlLiAgVGhlIHNwZWNpZmljIHNjZW5hcmlvCisJLy9pcyBkdXJpbmcgd2FpdEZvckFsbFVwZGF0ZXMoKTsgaWYgYSBkZWFkbG9jayBpcyBkZXRlY3RlZCBkdXJpbmcgCisJLy90aGUgbG9jaydzIGFjcXVpcmUoKSBtZXRob2QsIHRoaXMgdGhyZWFkIHdpbGwgdGVtcG9yYXJpbHkgcmVsZWFzZQorCS8vaXRzIGFscmVhZHkgYWNxdWlyZWQgSUxvY2tzIHRvIGFsbG93IG90aGVyIHRocmVhZHMgdG8gY29udGludWUuCisJLy9XaGVuIGV4ZWN1dGlvbiBpcyByZXR1cm5lZCB0byB0aGlzIHRocmVhZCwgYW55IHJlbGVhc2UgSUxvY2tzIHdpbGwKKwkvL2JlIHJlYWNxdWlyZWQgYmVmb3JlIHByb2NlZWRpbmcKKwlwcml2YXRlIGZpbmFsIElMb2NrIGpvYklMb2NrID0gSm9iLmdldEpvYk1hbmFnZXIoKS5uZXdMb2NrKCk7CiAKIAlwcml2YXRlIGNsYXNzIEdyYXBoVXBkYXRlSm9iIGV4dGVuZHMgSm9iIHsKIAogCQlwdWJsaWMgR3JhcGhVcGRhdGVKb2IoKSB7Ci0JCQlzdXBlcigiR3JhcGggVXBkYXRlIEpvYiIpOworCQkJc3VwZXIoUmVzb3VyY2VzLkpPQl9OQU1FKTsKIAkJCXNldFN5c3RlbSh0cnVlKTsKLQkJCS8vW0J1ZyAyMzg2ODVdIG5lZWQgdG8gbG9jayBvbiB3b3Jrc3BhY2UgdG8gYXZvaWQgZGVhZCBsb2NrCi0JCQlzZXRSdWxlKFJlc291cmNlc1BsdWdpbi5nZXRXb3Jrc3BhY2UoKS5nZXRSb290KCkpOwogCQl9CiAKIAkJcHVibGljIGJvb2xlYW4gYmVsb25nc1RvKE9iamVjdCBmYW1pbHkpIHsKQEAgLTI0MywyMyArMzI4LDE3IEBACiAJCXByaXZhdGUgUXVldWUgcHJvamVjdHNVcGRhdGVkID0gbmV3IFF1ZXVlKCk7CiAKIAkJcHVibGljIHZvaWQgcXVldWVQcm9qZWN0QWRkZWQoSVByb2plY3QgcHJvamVjdCkgewotCQkJc3luY2hyb25pemVkIChncmFwaExvY2spIHsKLQkJCQltb2RTdGFtcCsrOwotCQkJfQorCQkJaW5jcmVtZW50TW9kU3RhbXAoKTsKIAkJCXByb2plY3RzQWRkZWQuYWRkKHByb2plY3QpOwogCQl9CiAKIAkJcHVibGljIHZvaWQgcXVldWVQcm9qZWN0RGVsZXRlZChJUHJvamVjdCBwcm9qZWN0KSB7Ci0JCQlzeW5jaHJvbml6ZWQgKGdyYXBoTG9jaykgewotCQkJCW1vZFN0YW1wKys7Ci0JCQl9CisJCQlpbmNyZW1lbnRNb2RTdGFtcCgpOwogCQkJcHJvamVjdHNSZW1vdmVkLmFkZChwcm9qZWN0KTsKIAkJfQogCiAJCXB1YmxpYyB2b2lkIHF1ZXVlUHJvamVjdFVwZGF0ZWQoSVByb2plY3QgcHJvamVjdCkgewotCQkJc3luY2hyb25pemVkIChncmFwaExvY2spIHsKLQkJCQltb2RTdGFtcCsrOwotCQkJfQorCQkJaW5jcmVtZW50TW9kU3RhbXAoKTsKIAkJCXByb2plY3RzVXBkYXRlZC5hZGQocHJvamVjdCk7CiAJCX0KIApAQCAtMjY4LDk1ICszNDcsMjI2IEBACiAJCQlib29sZWFuIGlzRW1wdHkgPSBwcm9qZWN0c0FkZGVkLmlzRW1wdHkoKSAmJiBwcm9qZWN0c1JlbW92ZWQuaXNFbXB0eSgpICYmIHByb2plY3RzVXBkYXRlZC5pc0VtcHR5KCk7CiAJCQlyZXR1cm4gIWlzRW1wdHk7CiAJCX0KLQorCQkKKwkJcHJpdmF0ZSBib29sZWFuIHJ1bm5pbmcgPSBmYWxzZTsKKwkJcHJpdmF0ZSB2b2lkIHNldFJ1bm5pbmcoYm9vbGVhbiBiKSB7CisJCQlzeW5jaHJvbml6ZWQgKHJ1bkxvY2spIHsKKwkJCQlydW5uaW5nID0gYjsKKwkJCQlpZihydW5uaW5nKXsKKwkJCQkJcnVuU3RhbXArKzsKKwkJCQl9CisJCQl9CisJCX0KKwkJCisJCXByaXZhdGUgYm9vbGVhbiBpc1J1bm5pbmcoKXsKKwkJCXN5bmNocm9uaXplZCAocnVuTG9jaykgeworCQkJCXJldHVybiBydW5uaW5nOworCQkJfQorCQl9CisJCQorCQlwcml2YXRlIGJvb2xlYW4gZGlkUnVuKGxvbmcgc3RhbXApeworCQkJc3luY2hyb25pemVkIChydW5Mb2NrKSB7CisJCQkJcmV0dXJuIHN0YW1wICE9IHJ1blN0YW1wOworCQkJfQorCQl9CisJCQorCQkvL2tlZXBzIHRyYWNrIG9mIHdoZW4gZWFjaCBydW4KKwkJcHJpdmF0ZSBsb25nIHJ1blN0YW1wID0gMDsKKwkJcHJpdmF0ZSBPYmplY3QgcnVuTG9jayA9IG5ldyBPYmplY3QoKTsKKwkJCisJCXB1YmxpYyB2b2lkIHdhaXRGb3JSdW4obG9uZyBtYXhXYWl0VGltZSkgeworCQkJaWYoaXNSdW5uaW5nKCkpeworCQkJCXJldHVybjsKKwkJCX0gZWxzZSB7CisJCQkJZmluYWwgbG9uZyBzdGFydFRpbWUgPSBTeXN0ZW0uY3VycmVudFRpbWVNaWxsaXMoKTsKKwkJCQlsb25nIGxvY2FsUnVuU3RhbXAgPSAwOworCQkJCXN5bmNocm9uaXplZCAoZ3JhcGhMb2NrKSB7CisJCQkJCWxvY2FsUnVuU3RhbXAgPSBydW5TdGFtcDsKKwkJCQl9CisJCQkJd2hpbGUodHJ1ZSl7CisJCQkJCWlmKFN5c3RlbS5jdXJyZW50VGltZU1pbGxpcygpIC0gc3RhcnRUaW1lID4gbWF4V2FpdFRpbWUpeworCQkJCQkJcmV0dXJuOworCQkJCQl9CisJCQkJCWlmKGRpZFJ1bihsb2NhbFJ1blN0YW1wKSl7CisJCQkJCQlyZXR1cm47CisJCQkJCX0KKwkJCQkJdHJ5IHsKKwkJCQkJCVRocmVhZC5zbGVlcCg1MCk7CisJCQkJCX0gY2F0Y2ggKEludGVycnVwdGVkRXhjZXB0aW9uIGUpIHsKKwkJCQkJCVRocmVhZC5pbnRlcnJ1cHRlZCgpOworCQkJCQl9CisJCQkJfQorCQkJfQorCQl9CisJCQogCQlwcm90ZWN0ZWQgSVN0YXR1cyBydW4oSVByb2dyZXNzTW9uaXRvciBtb25pdG9yKSB7Ci0JCQlmaW5hbCBPYmplY3RbXSByZW1vdmVkID0gcHJvamVjdHNSZW1vdmVkLmdldExpc3RlbmVycygpOwotCQkJZmluYWwgT2JqZWN0W10gdXBkYXRlZCA9IHByb2plY3RzVXBkYXRlZC5nZXRMaXN0ZW5lcnMoKTsKLQkJCWZpbmFsIE9iamVjdFtdIGFkZGVkID0gcHJvamVjdHNBZGRlZC5nZXRMaXN0ZW5lcnMoKTsKLQkJCWlmIChyZW1vdmVkLmxlbmd0aCA9PSAwICYmIHVwZGF0ZWQubGVuZ3RoID09IDAgJiYgYWRkZWQubGVuZ3RoID09IDApIHsKLQkJCQlyZXR1cm4gU3RhdHVzLk9LX1NUQVRVUzsKLQkJCX0KLQkJCXN5bmNocm9uaXplZCAoZ3JhcGhMb2NrKSB7Ci0JCQkJbW9kU3RhbXArKzsKLQkJCX0KLQkJCVNhZmVSdW5uZXIucnVuKG5ldyBJU2FmZVJ1bm5hYmxlKCkgewotCQkJCXB1YmxpYyB2b2lkIGhhbmRsZUV4Y2VwdGlvbihUaHJvd2FibGUgZSkgewotCQkJCQlNb2R1bGVjb3JlUGx1Z2luLmxvZ0Vycm9yKGUpOworCQkJdHJ5eworCQkJCWpvYklMb2NrLmFjcXVpcmUoKTsKKwkJCQlzZXRSdW5uaW5nKHRydWUpOworCQkJCQorCQkJCWlmKFJlc291cmNlc1BsdWdpbi5nZXRQbHVnaW4oKS5nZXRCdW5kbGUoKS5nZXRTdGF0ZSgpID09IEJ1bmRsZS5TVEFSVElORyApeworCQkJCQlncmFwaFVwZGF0ZUpvYi5zY2hlZHVsZShKT0JfREVMQVkpOworCQkJCQlyZXR1cm4gU3RhdHVzLk9LX1NUQVRVUzsKIAkJCQl9Ci0KLQkJCQlwdWJsaWMgdm9pZCBydW4oKSB0aHJvd3MgRXhjZXB0aW9uIHsKLQkJCQkJLy8gdGhpcyBpcyB0aGUgc2ltcGxlIGNhc2U7IGp1c3QgcmVtb3ZlIHRoZW0gYWxsCi0JCQkJCXN5bmNocm9uaXplZCAoZ3JhcGhMb2NrKSB7Ci0JCQkJCQlmb3IgKE9iamVjdCBvIDogcmVtb3ZlZCkgewotCQkJCQkJCUlQcm9qZWN0IHByb2plY3QgPSAoSVByb2plY3QpIG87Ci0JCQkJCQkJcmVtb3ZlQWxsUmVmZXJlbmNlcyhwcm9qZWN0KTsKLQkJCQkJCX0KKwkJCQkKKwkJCQlmaW5hbCBPYmplY3RbXSByZW1vdmVkID0gcHJvamVjdHNSZW1vdmVkLmdldExpc3RlbmVycygpOworCQkJCWZpbmFsIE9iamVjdFtdIHVwZGF0ZWQgPSBwcm9qZWN0c1VwZGF0ZWQuZ2V0TGlzdGVuZXJzKCk7CisJCQkJZmluYWwgT2JqZWN0W10gYWRkZWQgPSBwcm9qZWN0c0FkZGVkLmdldExpc3RlbmVycygpOworCQkJCWlmIChyZW1vdmVkLmxlbmd0aCA9PSAwICYmIHVwZGF0ZWQubGVuZ3RoID09IDAgJiYgYWRkZWQubGVuZ3RoID09IDApIHsKKwkJCQkJcmV0dXJuIFN0YXR1cy5PS19TVEFUVVM7CisJCQkJfQorCQkJCWluY3JlbWVudE1vZFN0YW1wKCk7CisJCQkJaWYoUmVzb3VyY2VzUGx1Z2luLmdldFBsdWdpbigpLmdldEJ1bmRsZSgpLmdldFN0YXRlKCkgIT0gQnVuZGxlLkFDVElWRSl7CisJCQkJCXJldHVybiBTdGF0dXMuT0tfU1RBVFVTOworCQkJCX0KKwkJCQlTYWZlUnVubmVyLnJ1bihuZXcgSVNhZmVSdW5uYWJsZSgpIHsKKwkJCQkJcHVibGljIHZvaWQgaGFuZGxlRXhjZXB0aW9uKFRocm93YWJsZSBlKSB7CisJCQkJCQlNb2R1bGVjb3JlUGx1Z2luLmxvZ0Vycm9yKGUpOwogCQkJCQl9Ci0JCQkJCS8vIGdldCB0aGUgdXBkYXRlZCBxdWV1ZSBpbiBjYXNlIHRoZXJlIGFyZSBhbnkgYWRkcwotCQkJCQkvLyBpZiB0aGVyZSBhcmUgYW55IGFkZGVkIHByb2plY3RzLCB0aGVuIHVuZm9ydHVuYXRlbHkgdGhlCi0JCQkJCS8vIGVudGlyZSB3b3Jrc3BhY2UgbmVlZHMgdG8gYmUgcHJvY2Vzc2VkCi0JCQkJCWlmIChhZGRlZC5sZW5ndGggPiAwKSB7Ci0JCQkJCQlJUHJvamVjdFtdIGFsbFByb2plY3RzID0gUmVzb3VyY2VzUGx1Z2luLmdldFdvcmtzcGFjZSgpLmdldFJvb3QoKS5nZXRQcm9qZWN0cygpOwotCQkJCQkJZm9yIChJUHJvamVjdCBzb3VyY2VQcm9qZWN0IDogYWxsUHJvamVjdHMpIHsKLQkJCQkJCQlJVmlydHVhbENvbXBvbmVudCBjb21wb25lbnQgPSBDb21wb25lbnRDb3JlLmNyZWF0ZUNvbXBvbmVudChzb3VyY2VQcm9qZWN0KTsKLQkJCQkJCQlpZiAoY29tcG9uZW50ICE9IG51bGwpIHsKLQkJCQkJCQkJSVZpcnR1YWxSZWZlcmVuY2VbXSByZWZlcmVuY2VzID0gY29tcG9uZW50LmdldFJlZmVyZW5jZXMoKTsKLQkJCQkJCQkJZm9yIChJVmlydHVhbFJlZmVyZW5jZSByZWYgOiByZWZlcmVuY2VzKSB7Ci0JCQkJCQkJCQlJVmlydHVhbENvbXBvbmVudCB0YXJnZXRDb21wb25lbnQgPSByZWYuZ2V0UmVmZXJlbmNlZENvbXBvbmVudCgpOwotCQkJCQkJCQkJaWYgKHRhcmdldENvbXBvbmVudCAhPSBudWxsKSB7Ci0JCQkJCQkJCQkJSVByb2plY3QgdGFyZ2V0UHJvamVjdCA9IHRhcmdldENvbXBvbmVudC5nZXRQcm9qZWN0KCk7Ci0JCQkJCQkJCQkJaWYgKHRhcmdldFByb2plY3QgIT0gbnVsbCAmJiAhdGFyZ2V0UHJvamVjdC5lcXVhbHMoc291cmNlUHJvamVjdCkpIHsKLQkJCQkJCQkJCQkJYWRkUmVmZXJlbmNlKHNvdXJjZVByb2plY3QsIHRhcmdldFByb2plY3QpOwotCQkJCQkJCQkJCX0KLQkJCQkJCQkJCX0KKwkKKwkJCQkJcHVibGljIHZvaWQgcnVuKCkgdGhyb3dzIEV4Y2VwdGlvbiB7CisJCQkJCQlmaW5hbCBEZXBlbmRlbmN5R3JhcGhFdmVudCBldmVudCA9IG5ldyBEZXBlbmRlbmN5R3JhcGhFdmVudCgpOworCQkJCQkJCisJCQkJCQkvL2FsbCByZWZlcmVuY2VzIHdpbGwgYmUgcmVidWlsdCBkdXJpbmcgYW4gYWRkCisJCQkJCQlpZihhZGRlZC5sZW5ndGggPT0gMCl7CisJCQkJCQkJLy8gdGhpcyBpcyB0aGUgc2ltcGxlIGNhc2U7IGp1c3QgcmVtb3ZlIHRoZW0gYWxsCisJCQkJCQkJc3luY2hyb25pemVkIChncmFwaExvY2spIHsKKwkJCQkJCQkJZm9yIChPYmplY3QgbyA6IHJlbW92ZWQpIHsKKwkJCQkJCQkJCUlQcm9qZWN0IHByb2plY3QgPSAoSVByb2plY3QpIG87CisJCQkJCQkJCQlyZW1vdmVBbGxSZWZlcmVuY2VzKHByb2plY3QsIGV2ZW50KTsKIAkJCQkJCQkJfQogCQkJCQkJCX0KIAkJCQkJCX0KLQkJCQkJfSBlbHNlIGlmICh1cGRhdGVkLmxlbmd0aCA+IDApIHsKLQkJCQkJCUlQcm9qZWN0W10gYWxsUHJvamVjdHMgPSBSZXNvdXJjZXNQbHVnaW4uZ2V0V29ya3NwYWNlKCkuZ2V0Um9vdCgpLmdldFByb2plY3RzKCk7Ci0JCQkJCQlTZXQ8SVByb2plY3Q+IHZhbGlkUmVmcyA9IG5ldyBIYXNoU2V0PElQcm9qZWN0PigpOwotCQkJCQkJZm9yIChPYmplY3QgbyA6IHVwZGF0ZWQpIHsKLQkJCQkJCQlJUHJvamVjdCBzb3VyY2VQcm9qZWN0ID0gKElQcm9qZWN0KSBvOwotCQkJCQkJCUlWaXJ0dWFsQ29tcG9uZW50IGNvbXBvbmVudCA9IENvbXBvbmVudENvcmUuY3JlYXRlQ29tcG9uZW50KHNvdXJjZVByb2plY3QpOwotCQkJCQkJCWlmIChjb21wb25lbnQgIT0gbnVsbCkgewotCQkJCQkJCQl2YWxpZFJlZnMuY2xlYXIoKTsKLQkJCQkJCQkJSVZpcnR1YWxSZWZlcmVuY2VbXSByZWZlcmVuY2VzID0gY29tcG9uZW50LmdldFJlZmVyZW5jZXMoKTsKLQkJCQkJCQkJZm9yIChJVmlydHVhbFJlZmVyZW5jZSByZWYgOiByZWZlcmVuY2VzKSB7Ci0JCQkJCQkJCQlJVmlydHVhbENvbXBvbmVudCB0YXJnZXRDb21wb25lbnQgPSByZWYuZ2V0UmVmZXJlbmNlZENvbXBvbmVudCgpOwotCQkJCQkJCQkJaWYgKHRhcmdldENvbXBvbmVudCAhPSBudWxsKSB7Ci0JCQkJCQkJCQkJSVByb2plY3QgdGFyZ2V0UHJvamVjdCA9IHRhcmdldENvbXBvbmVudC5nZXRQcm9qZWN0KCk7Ci0JCQkJCQkJCQkJaWYgKHRhcmdldFByb2plY3QgIT0gbnVsbCAmJiAhdGFyZ2V0UHJvamVjdC5lcXVhbHMoc291cmNlUHJvamVjdCkpIHsKLQkJCQkJCQkJCQkJdmFsaWRSZWZzLmFkZCh0YXJnZXRQcm9qZWN0KTsKLQkJCQkJCQkJCQl9Ci0JCQkJCQkJCQl9Ci0JCQkJCQkJCX0KLQkJCQkJCQkJc3luY2hyb25pemVkIChncmFwaExvY2spIHsKLQkJCQkJCQkJCWZvciAoSVByb2plY3QgdGFyZ2V0UHJvamVjdCA6IGFsbFByb2plY3RzKSB7Ci0JCQkJCQkJCQkJLy8gaWYgdGhlIHJlZmVyZW5jZSB3YXMgaWRlbnRpZmllZAotCQkJCQkJCQkJCS8vIGFib3ZlLCBiZSBzdXJlIHRvIGFkZCBpdAotCQkJCQkJCQkJCS8vIG90aGVyd2lzZSwgcmVtb3ZlIGl0Ci0JCQkJCQkJCQkJaWYgKHZhbGlkUmVmcy5yZW1vdmUodGFyZ2V0UHJvamVjdCkpIHsKLQkJCQkJCQkJCQkJYWRkUmVmZXJlbmNlKHNvdXJjZVByb2plY3QsIHRhcmdldFByb2plY3QpOwotCQkJCQkJCQkJCX0gZWxzZSB7Ci0JCQkJCQkJCQkJCXJlbW92ZVJlZmVyZW5jZShzb3VyY2VQcm9qZWN0LCB0YXJnZXRQcm9qZWN0KTsKLQkJCQkJCQkJCQl9Ci0JCQkJCQkJCQl9Ci0JCQkJCQkJCX0KKwkJCQkJCS8vIGdldCB0aGUgdXBkYXRlZCBxdWV1ZSBpbiBjYXNlIHRoZXJlIGFyZSBhbnkgYWRkcworCQkJCQkJLy8gaWYgdGhlcmUgYXJlIGFueSBhZGRlZCBwcm9qZWN0cywgdGhlbiB1bmZvcnR1bmF0ZWx5IHRoZQorCQkJCQkJLy8gZW50aXJlIHdvcmtzcGFjZSBuZWVkcyB0byBiZSBwcm9jZXNzZWQKKwkJCQkJCWlmIChhZGRlZC5sZW5ndGggPiAwKSB7CisJCQkJCQkJcmVtb3ZlQWxsUmVmZXJlbmNlcyhldmVudCk7CisJCQkJCQkJSVByb2plY3RbXSBhbGxQcm9qZWN0cyA9IG51bGw7CisJCQkJCQkJaW50IHN0YXRlID0gUmVzb3VyY2VzUGx1Z2luLmdldFBsdWdpbigpLmdldEJ1bmRsZSgpLmdldFN0YXRlKCk7CisJCQkJCQkJaWYgKHN0YXRlID09IEJ1bmRsZS5BQ1RJVkUpIHsKKwkJCQkJCQkJYWxsUHJvamVjdHMgPSBSZXNvdXJjZXNQbHVnaW4uZ2V0V29ya3NwYWNlKCkuZ2V0Um9vdCgpLmdldFByb2plY3RzKCk7CiAJCQkJCQkJfSBlbHNlIHsKLQkJCQkJCQkJLy8gaWYgdGhpcyBwcm9qZWN0IGlzIG5vdCBhIGNvbXBvbmVudCwgdGhlbiBpdAotCQkJCQkJCQkvLyBzaG91bGQgYmUgY29tcGxldGVseSByZW1vdmVkLgotCQkJCQkJCQlyZW1vdmVBbGxSZWZlcmVuY2VzKHNvdXJjZVByb2plY3QpOworCQkJCQkJCQlyZXR1cm47CisJCQkJCQkJfQorCQkJCQkJCQorCQkJCQkJCWZvciAoSVByb2plY3Qgc291cmNlUHJvamVjdCA6IGFsbFByb2plY3RzKSB7CisJCQkJCQkJCUlWaXJ0dWFsQ29tcG9uZW50IGNvbXBvbmVudCA9IENvbXBvbmVudENvcmUuY3JlYXRlQ29tcG9uZW50KHNvdXJjZVByb2plY3QpOworCQkJCQkJCQlpZiAoY29tcG9uZW50ICE9IG51bGwgJiYgY29tcG9uZW50IGluc3RhbmNlb2YgVmlydHVhbENvbXBvbmVudCkgeworCQkJCQkJCQkJKChWaXJ0dWFsQ29tcG9uZW50KWNvbXBvbmVudCkuZmx1c2hDYWNoZSgpOworCQkJCQkJCQl9CisJCQkJCQkJfQorCQkJCQkJCQorCQkJCQkJCWZvciAoSVByb2plY3Qgc291cmNlUHJvamVjdCA6IGFsbFByb2plY3RzKSB7CisJCQkJCQkJCUlWaXJ0dWFsQ29tcG9uZW50IGNvbXBvbmVudCA9IENvbXBvbmVudENvcmUuY3JlYXRlQ29tcG9uZW50KHNvdXJjZVByb2plY3QpOworCQkJCQkJCQlpZiAoY29tcG9uZW50ICE9IG51bGwgJiYgY29tcG9uZW50IGluc3RhbmNlb2YgVmlydHVhbENvbXBvbmVudCkgeworCQkJCQkJCQkJSVZpcnR1YWxSZWZlcmVuY2VbXSByZWZlcmVuY2VzID0gKChWaXJ0dWFsQ29tcG9uZW50KWNvbXBvbmVudCkuZ2V0UmF3UmVmZXJlbmNlcygpOworCQkJCQkJCQkJZm9yIChJVmlydHVhbFJlZmVyZW5jZSByZWYgOiByZWZlcmVuY2VzKSB7CisJCQkJCQkJCQkJSVZpcnR1YWxDb21wb25lbnQgdGFyZ2V0Q29tcG9uZW50ID0gcmVmLmdldFJlZmVyZW5jZWRDb21wb25lbnQoKTsKKwkJCQkJCQkJCQlpZiAodGFyZ2V0Q29tcG9uZW50ICE9IG51bGwpIHsKKwkJCQkJCQkJCQkJSVByb2plY3QgdGFyZ2V0UHJvamVjdCA9IHRhcmdldENvbXBvbmVudC5nZXRQcm9qZWN0KCk7CisJCQkJCQkJCQkJCWlmICh0YXJnZXRQcm9qZWN0ICE9IG51bGwgJiYgIXRhcmdldFByb2plY3QuZXF1YWxzKHNvdXJjZVByb2plY3QpKSB7CisJCQkJCQkJCQkJCQlhZGRSZWZlcmVuY2Uoc291cmNlUHJvamVjdCwgdGFyZ2V0UHJvamVjdCwgZXZlbnQpOworCQkJCQkJCQkJCQl9CisJCQkJCQkJCQkJfQorCQkJCQkJCQkJfQkKKwkJCQkJCQkJfQorCQkJCQkJCX0KKwkJCQkJCX0gZWxzZSBpZiAodXBkYXRlZC5sZW5ndGggPiAwKSB7CisJCQkJCQkJSVByb2plY3RbXSBhbGxQcm9qZWN0cyA9IG51bGw7CisJCQkJCQkJaW50IHN0YXRlID0gUmVzb3VyY2VzUGx1Z2luLmdldFBsdWdpbigpLmdldEJ1bmRsZSgpLmdldFN0YXRlKCk7CisJCQkJCQkJaWYgKHN0YXRlID09IEJ1bmRsZS5BQ1RJVkUpIHsKKwkJCQkJCQkJYWxsUHJvamVjdHMgPSBSZXNvdXJjZXNQbHVnaW4uZ2V0V29ya3NwYWNlKCkuZ2V0Um9vdCgpLmdldFByb2plY3RzKCk7CisJCQkJCQkJfSBlbHNlIHsKKwkJCQkJCQkJcmV0dXJuOworCQkJCQkJCX0KKwkJCQkJCQkKKwkJCQkJCQlTZXQ8SVByb2plY3Q+IHZhbGlkUmVmcyA9IG5ldyBIYXNoU2V0PElQcm9qZWN0PigpOworCQkJCQkJCWZvciAoT2JqZWN0IG8gOiB1cGRhdGVkKSB7CisJCQkJCQkJCUlQcm9qZWN0IHNvdXJjZVByb2plY3QgPSAoSVByb2plY3QpIG87CisJCQkJCQkJCUlWaXJ0dWFsQ29tcG9uZW50IGNvbXBvbmVudCA9IENvbXBvbmVudENvcmUuY3JlYXRlQ29tcG9uZW50KHNvdXJjZVByb2plY3QpOworCQkJCQkJCQlpZiAoY29tcG9uZW50ICE9IG51bGwgJiYgY29tcG9uZW50IGluc3RhbmNlb2YgVmlydHVhbENvbXBvbmVudCkgeworCQkJCQkJCQkJdmFsaWRSZWZzLmNsZWFyKCk7CisJCQkJCQkJCQkoKFZpcnR1YWxDb21wb25lbnQpY29tcG9uZW50KS5mbHVzaENhY2hlKCk7CisJCQkJCQkJCQlJVmlydHVhbFJlZmVyZW5jZVtdIHJlZmVyZW5jZXMgPSAoKFZpcnR1YWxDb21wb25lbnQpY29tcG9uZW50KS5nZXRSYXdSZWZlcmVuY2VzKCk7CisJCQkJCQkJCQlmb3IgKElWaXJ0dWFsUmVmZXJlbmNlIHJlZiA6IHJlZmVyZW5jZXMpIHsKKwkJCQkJCQkJCQlJVmlydHVhbENvbXBvbmVudCB0YXJnZXRDb21wb25lbnQgPSByZWYuZ2V0UmVmZXJlbmNlZENvbXBvbmVudCgpOworCQkJCQkJCQkJCWlmICh0YXJnZXRDb21wb25lbnQgIT0gbnVsbCkgeworCQkJCQkJCQkJCQlJUHJvamVjdCB0YXJnZXRQcm9qZWN0ID0gdGFyZ2V0Q29tcG9uZW50LmdldFByb2plY3QoKTsKKwkJCQkJCQkJCQkJaWYgKHRhcmdldFByb2plY3QgIT0gbnVsbCAmJiAhdGFyZ2V0UHJvamVjdC5lcXVhbHMoc291cmNlUHJvamVjdCkpIHsKKwkJCQkJCQkJCQkJCXZhbGlkUmVmcy5hZGQodGFyZ2V0UHJvamVjdCk7CisJCQkJCQkJCQkJCX0KKwkJCQkJCQkJCQl9CisJCQkJCQkJCQl9CisJCQkJCQkJCQlzeW5jaHJvbml6ZWQgKGdyYXBoTG9jaykgeworCQkJCQkJCQkJCWZvciAoSVByb2plY3QgdGFyZ2V0UHJvamVjdCA6IGFsbFByb2plY3RzKSB7CisJCQkJCQkJCQkJCS8vIGlmIHRoZSByZWZlcmVuY2Ugd2FzIGlkZW50aWZpZWQKKwkJCQkJCQkJCQkJLy8gYWJvdmUsIGJlIHN1cmUgdG8gYWRkIGl0CisJCQkJCQkJCQkJCS8vIG90aGVyd2lzZSwgcmVtb3ZlIGl0CisJCQkJCQkJCQkJCWlmICh2YWxpZFJlZnMucmVtb3ZlKHRhcmdldFByb2plY3QpKSB7CisJCQkJCQkJCQkJCQlhZGRSZWZlcmVuY2Uoc291cmNlUHJvamVjdCwgdGFyZ2V0UHJvamVjdCwgZXZlbnQpOworCQkJCQkJCQkJCQl9IGVsc2UgeworCQkJCQkJCQkJCQkJcmVtb3ZlUmVmZXJlbmNlKHNvdXJjZVByb2plY3QsIHRhcmdldFByb2plY3QsIGV2ZW50KTsKKwkJCQkJCQkJCQkJfQorCQkJCQkJCQkJCX0KKwkJCQkJCQkJCX0KKwkJCQkJCQkJfSBlbHNlIHsKKwkJCQkJCQkJCS8vIGlmIHRoaXMgcHJvamVjdCBpcyBub3QgYSBjb21wb25lbnQsIHRoZW4gaXQKKwkJCQkJCQkJCS8vIHNob3VsZCBiZSBjb21wbGV0ZWx5IHJlbW92ZWQuCisJCQkJCQkJCQlyZW1vdmVBbGxSZWZlcmVuY2VzKHNvdXJjZVByb2plY3QsIGV2ZW50KTsKKwkJCQkJCQkJfQogCQkJCQkJCX0KIAkJCQkJCX0KKwkJCQkJCW5vdGlmaXlMaXN0ZW5lcnMoZXZlbnQpOwogCQkJCQl9Ci0JCQkJfQotCQkJfSk7Ci0JCQkvLyBTeXN0ZW0uZXJyLnByaW50bG4oSURlcGVuZGVuY3lHcmFwaC5JTlNUQU5DRSk7Ci0JCQlyZXR1cm4gU3RhdHVzLk9LX1NUQVRVUzsKKwkJCQl9KTsKKwkJCQlyZXR1cm4gU3RhdHVzLk9LX1NUQVRVUzsKKwkJCX0gZmluYWxseSB7CisJCQkJc2V0UnVubmluZyhmYWxzZSk7CisJCQkJam9iSUxvY2sucmVsZWFzZSgpOworCQkJfQogCQl9CiAJfTsKIAorCXB1YmxpYyB2b2lkIGFkZExpc3RlbmVyKElEZXBlbmRlbmN5R3JhcGhMaXN0ZW5lciBsaXN0ZW5lcikgeworCQlsaXN0ZW5lcnMuYWRkKGxpc3RlbmVyKTsJCQorCX0KKwkKKwlwdWJsaWMgdm9pZCByZW1vdmVMaXN0ZW5lcihJRGVwZW5kZW5jeUdyYXBoTGlzdGVuZXIgbGlzdGVuZXIpIHsKKwkJbGlzdGVuZXJzLnJlbW92ZShsaXN0ZW5lcik7CisJfQorCisJcHJpdmF0ZSB2b2lkIG5vdGlmaXlMaXN0ZW5lcnMoZmluYWwgRGVwZW5kZW5jeUdyYXBoRXZlbnQgZXZlbnQpIHsKKwkJaWYoZXZlbnQuZ2V0VHlwZSgpID09IDApeworCQkJcmV0dXJuOworCQl9CisJCS8vZmlyZSBub3RpZmljYXRpb25zIG9uIGEgZGlmZmVyZW50IGpvYiBzbyB0aGV5IGRvIG5vdCBibG9jayB3YWl0Rm9yQWxsVXBkYXRlcygpCisJCUpvYiBub3RpZmljYXRpb25Kb2IgPSBuZXcgSm9iKFJlc291cmNlcy5OT1RJRklDQVRJT05fSk9CX05BTUUpeworCQkJQE92ZXJyaWRlCisJCQlwcm90ZWN0ZWQgSVN0YXR1cyBydW4oZmluYWwgSVByb2dyZXNzTW9uaXRvciBtb25pdG9yKSB7CisJCQkJU2FmZVJ1bm5lci5ydW4obmV3IElTYWZlUnVubmFibGUoKSB7CisJCQkJCXB1YmxpYyB2b2lkIHJ1bigpIHRocm93cyBFeGNlcHRpb24geworCQkJCQkJZm9yKE9iamVjdCBsaXN0ZW5lciA6IGxpc3RlbmVycy5nZXRMaXN0ZW5lcnMoKSl7CisJCQkJCQkJKChJRGVwZW5kZW5jeUdyYXBoTGlzdGVuZXIpbGlzdGVuZXIpLmRlcGVuZGVuY3lHcmFwaFVwZGF0ZShldmVudCk7CisJCQkJCQl9CisJCQkJCQltb25pdG9yLmRvbmUoKTsKKwkJCQkJfQorCisJCQkJCXB1YmxpYyB2b2lkIGhhbmRsZUV4Y2VwdGlvbihUaHJvd2FibGUgZXhjZXB0aW9uKSB7CisJCQkJCQlNb2R1bGVjb3JlUGx1Z2luLmxvZ0Vycm9yKGV4Y2VwdGlvbik7CisJCQkJCX0KKwkJCQl9KTsKKwkJCQlyZXR1cm4gU3RhdHVzLk9LX1NUQVRVUzsKKwkJCX0KKwkJfTsKKwkJbm90aWZpY2F0aW9uSm9iLnNldFN5c3RlbSh0cnVlKTsKKwkJbm90aWZpY2F0aW9uSm9iLnNldFJ1bGUobnVsbCk7CisJCW5vdGlmaWNhdGlvbkpvYi5zY2hlZHVsZSgpOworCX0KKwkKKwkKIAkvKioKKwkgKiBVc2U6IHVwZGF0ZShwcm9qZWN0LCBJRGVwZW5kZW5jeUdyYXBoLkFEREVEKTsKIAkgKiBAZGVwcmVjYXRlZCB1c2Uge0BsaW5rICN1cGRhdGUoSVByb2plY3QsIGludCl9CiAJICovCiAJcHVibGljIHZvaWQgcXVldWVQcm9qZWN0QWRkZWQoSVByb2plY3QgcHJvamVjdCkgewpAQCAtMzY0LDYgKzU3NCw3IEBACiAJfQogCiAJLyoqCisJICogVXNlOiB1cGRhdGUocHJvamVjdCwgSURlcGVuZGVuY3lHcmFwaC5SRU1PVkVEKTsKIAkgKiBAZGVwcmVjYXRlZCB1c2Uge0BsaW5rICN1cGRhdGUoSVByb2plY3QsIGludCl9CiAJICovCiAJcHVibGljIHZvaWQgcXVldWVQcm9qZWN0RGVsZXRlZChJUHJvamVjdCBwcm9qZWN0KSB7CkBAIC0zNzEsNiArNTgyLDcgQEAKIAl9CiAKIAkvKioKKwkgKiBVc2U6IHVwZGF0ZShwcm9qZWN0LCBJRGVwZW5kZW5jeUdyYXBoLk1PRElGSUVEKTsKIAkgKiBAZGVwcmVjYXRlZCB1c2Uge0BsaW5rICN1cGRhdGUoSVByb2plY3QsIGludCl9CiAJICovCiAJcHVibGljIHZvaWQgdXBkYXRlKElQcm9qZWN0IHByb2plY3QpIHsKQEAgLTQyMywyMiArNjM1LDYxIEBACiAJCWdyYXBoVXBkYXRlSm9iLnNjaGVkdWxlKEpPQl9ERUxBWSk7CiAJfQogCi0JLyoqCi0JICogQmxvY2tzIHVudGlsIHRoZSBncmFwaCBpcyBmaW5pc2hlZCB1cGRhdGluZwotCSAqLwogCXB1YmxpYyB2b2lkIHdhaXRGb3JBbGxVcGRhdGVzKElQcm9ncmVzc01vbml0b3IgbW9uaXRvcikgewotCQlUaHJlYWQgZ3JhcGhVcGRhdGVUaHJlYWQgPSBncmFwaFVwZGF0ZUpvYi5nZXRUaHJlYWQoKTsKLQkJaWYoZ3JhcGhVcGRhdGVUaHJlYWQgIT0gbnVsbCAmJiBncmFwaFVwZGF0ZVRocmVhZCAhPSBUaHJlYWQuY3VycmVudFRocmVhZCgpKSB7Ci0JCQl0cnkgewotCQkJCWdyYXBoVXBkYXRlSm9iLmpvaW4oKTsKLQkJCX0gY2F0Y2ggKEludGVycnVwdGVkRXhjZXB0aW9uIGUpIHsKLQkJCQlNb2R1bGVjb3JlUGx1Z2luLmxvZ0Vycm9yKGUpOworCQlTdWJNb25pdG9yIHN1Yk1vbml0b3IgPSBTdWJNb25pdG9yLmNvbnZlcnQobW9uaXRvcik7CisJCXN1Yk1vbml0b3Iuc3ViVGFzayhSZXNvdXJjZXMuV0FJVElORyk7CisJCQorCQlKb2IgY3VycmVudEpvYiA9IEpvYi5nZXRKb2JNYW5hZ2VyKCkuY3VycmVudEpvYigpOworCQlpZiAoY3VycmVudEpvYiAhPSBncmFwaFVwZGF0ZUpvYikgeworCQkJaWYoSm9iLmdldEpvYk1hbmFnZXIoKS5pc1N1c3BlbmRlZCgpKXsKKwkJCQlKb2IuZ2V0Sm9iTWFuYWdlcigpLnJlc3VtZSgpOwogCQkJfQorCQkJd2hpbGUoaXNVcGRhdGVOZWNlc3NhcnkoKSl7CisJCQkJaWYoc3ViTW9uaXRvci5pc0NhbmNlbGVkKCkpeworCQkJCQl0aHJvdyBuZXcgT3BlcmF0aW9uQ2FuY2VsZWRFeGNlcHRpb24oKTsKKwkJCQl9CisJCQkJCisJCQkJLy8gRW5zdXJlIGFueSBwZW5kaW5nIHdvcmsgaGFzIGNhdXNlZCB0aGUgam9iIHRvIGJlY29tZSBzY2hlZHVsZWQKKwkJCQlpZihncmFwaFVwZGF0ZUpvYi5zaG91bGRTY2hlZHVsZSgpKXsKKwkJCQkJZ3JhcGhVcGRhdGVKb2Iuc2NoZWR1bGUoKTsKKwkJCQl9CisJCQkJLy8gV2FrZSB1cCBhbnkgc2xlZXBpbmcgam9icyBzaW5jZSB3ZSdyZSBnb2luZyB0byB3YWl0IG9uIHRoZSBqb2IsIAorCQkJCS8vIHRoZXJlIGlzIG5vIHNlbnNlIHRvIHdhaXQgZm9yIGEgc2xlZXBpbmcgam9iCisJCQkJZ3JhcGhVcGRhdGVKb2Iud2FrZVVwKCk7CisJCQkJaWYoY3VycmVudEpvYiAhPSBudWxsICYmICFSZXNvdXJjZXNQbHVnaW4uZ2V0V29ya3NwYWNlKCkuaXNUcmVlTG9ja2VkKCkpeworCQkJCQljdXJyZW50Sm9iLnlpZWxkUnVsZShzdWJNb25pdG9yLm5ld0NoaWxkKDEwMCkpOworCQkJCX0KKwkJCQkKKwkJCQlncmFwaFVwZGF0ZUpvYi53YWl0Rm9yUnVuKDUwMCk7CisJCQkJCisJCQkJYm9vbGVhbiBpbnRlcnJ1cHRlZCA9IGZhbHNlOworCQkJCXRyeSB7CisJCQkJCWlmKGpvYklMb2NrLmFjcXVpcmUoNTAwKSl7CisJCQkJCQlqb2JJTG9jay5yZWxlYXNlKCk7CisJCQkJCQkvL29ubHkgZXhpdCBpZiB0aGUgam9iIGhhcyBoYWQgYSBjaGFuY2UgdG8gcnVuCisJCQkJCQlpZighaXNVcGRhdGVOZWNlc3NhcnkoKSl7CisJCQkJCQkJYnJlYWs7CQorCQkJCQkJfQorCQkJCQl9CisJCQkJfSBjYXRjaCAoSW50ZXJydXB0ZWRFeGNlcHRpb24gZSkgeworCQkJCQlpbnRlcnJ1cHRlZCA9IHRydWU7CisJCQkJfSBmaW5hbGx5eworCQkJCQlpZihpbnRlcnJ1cHRlZCl7CisJCQkJCQkvLyBQcm9wYWdhdGUgaW50ZXJydXB0cworCQkJCQkJVGhyZWFkLmN1cnJlbnRUaHJlYWQoKS5pbnRlcnJ1cHQoKTsKKwkJCQkJfQorCQkJCX0KKwkJCX0KKwkJfQkJCisJCWlmKG51bGwgIT0gbW9uaXRvcil7CisJCQltb25pdG9yLmRvbmUoKTsKIAkJfQotCQkJCi0JCWlmKGdyYXBoVXBkYXRlSm9iLnNob3VsZFNjaGVkdWxlKCkpewotCQkJZ3JhcGhVcGRhdGVKb2IucnVuKG1vbml0b3IpOwotCQl9CisJfQorCisJLy8gbmVjZXNzYXJ5IGlmIHRoZSBqb2IgaXMgcnVubmluZywgd2FpdGluZywgb3Igc2xlZXBpbmcKKwkvLyBvciB0aGVyZSBpcyBhbnl0aGluZyBpbiB0aGUgZ3JhcGhxdWV1ZQorCXByaXZhdGUgYm9vbGVhbiBpc1VwZGF0ZU5lY2Vzc2FyeSgpIHsKKwkJcmV0dXJuIGdyYXBoVXBkYXRlSm9iLmdldFN0YXRlKCkgIT0gSm9iLk5PTkUgfHwgZ3JhcGhVcGRhdGVKb2Iuc2hvdWxkU2NoZWR1bGUoKTsKIAl9CiAKIAlwdWJsaWMgU3RyaW5nIHRvU3RyaW5nKCkgewpAQCAtNDYwLDUgKzcxMSwxNiBAQAogCQl9CiAKIAl9CisJCisJcHVibGljIHN0YXRpYyBmaW5hbCBjbGFzcyBSZXNvdXJjZXMgZXh0ZW5kcyBOTFMgeworCSAgICBwdWJsaWMgc3RhdGljIFN0cmluZyBXQUlUSU5HOworCSAgICBwdWJsaWMgc3RhdGljIFN0cmluZyBKT0JfTkFNRTsKKwkgICAgcHVibGljIHN0YXRpYyBTdHJpbmcgTk9USUZJQ0FUSU9OX0pPQl9OQU1FOworCSAgICAKKwkgICAgc3RhdGljCisJICAgIHsKKwkgICAgICAgIGluaXRpYWxpemVNZXNzYWdlcyggRGVwZW5kZW5jeUdyYXBoSW1wbC5jbGFzcy5nZXROYW1lKCksIFJlc291cmNlcy5jbGFzcyApOworCSAgICB9CisJfQogCiB9CmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS9tb2R1bGVjb3JlLXNyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2NvbXBvbmVudGNvcmUvaW50ZXJuYWwvYnVpbGRlci9EZXBlbmRlbmN5R3JhcGhJbXBsLnByb3BlcnRpZXMgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS9tb2R1bGVjb3JlLXNyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2NvbXBvbmVudGNvcmUvaW50ZXJuYWwvYnVpbGRlci9EZXBlbmRlbmN5R3JhcGhJbXBsLnByb3BlcnRpZXMKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uYjg1NTJhOAotLS0gL2Rldi9udWxsCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlL21vZHVsZWNvcmUtc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vY29tcG9uZW50Y29yZS9pbnRlcm5hbC9idWlsZGVyL0RlcGVuZGVuY3lHcmFwaEltcGwucHJvcGVydGllcwpAQCAtMCwwICsxLDMgQEAKK1dBSVRJTkc9V2FpdGluZworSk9CX05BTUU9R3JhcGggVXBkYXRlCitOT1RJRklDQVRJT05fSk9CX05BTUU9R3JhcGggVXBkYXRlIE5vdGlmaWNhdGlvbgpcIE5vIG5ld2xpbmUgYXQgZW5kIG9mIGZpbGUKZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlL21vZHVsZWNvcmUtc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vY29tcG9uZW50Y29yZS9pbnRlcm5hbC9idWlsZGVyL0lEZXBlbmRlbmN5R3JhcGguamF2YSBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlL21vZHVsZWNvcmUtc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vY29tcG9uZW50Y29yZS9pbnRlcm5hbC9idWlsZGVyL0lEZXBlbmRlbmN5R3JhcGguamF2YQppbmRleCBhYTRmNThjLi4wNzQ0MmExIDEwMDY0NAotLS0gYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS9tb2R1bGVjb3JlLXNyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2NvbXBvbmVudGNvcmUvaW50ZXJuYWwvYnVpbGRlci9JRGVwZW5kZW5jeUdyYXBoLmphdmEKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUvbW9kdWxlY29yZS1zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9jb21wb25lbnRjb3JlL2ludGVybmFsL2J1aWxkZXIvSURlcGVuZGVuY3lHcmFwaC5qYXZhCkBAIC03Miw2ICs3MiwxMCBAQAogCSAqIGlmIHRoZSBwcm9qZWN0IGRlcGVuZGVuY2llcyBldmVyIGNoYW5nZS4KIAkgKi8KIAlwdWJsaWMgbG9uZyBnZXRNb2RTdGFtcCgpOworCQorCXB1YmxpYyB2b2lkIGFkZExpc3RlbmVyKElEZXBlbmRlbmN5R3JhcGhMaXN0ZW5lciBsaXN0ZW5lcik7CisJCisJcHVibGljIHZvaWQgcmVtb3ZlTGlzdGVuZXIoSURlcGVuZGVuY3lHcmFwaExpc3RlbmVyIGxpc3RlbmVyKTsKIAogCS8qKgogCSAqIFdBUk5JTkc6IHRoaXMgc2hvdWxkIG9ubHkgYmUgY2FsbGVkIGJ5IGltcGxlbWVudG9ycyBvZiB0aGUKZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlL21vZHVsZWNvcmUtc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vY29tcG9uZW50Y29yZS9pbnRlcm5hbC9idWlsZGVyL0lEZXBlbmRlbmN5R3JhcGhMaXN0ZW5lci5qYXZhIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUvbW9kdWxlY29yZS1zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9jb21wb25lbnRjb3JlL2ludGVybmFsL2J1aWxkZXIvSURlcGVuZGVuY3lHcmFwaExpc3RlbmVyLmphdmEKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uYzFmNjM3YgotLS0gL2Rldi9udWxsCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlL21vZHVsZWNvcmUtc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vY29tcG9uZW50Y29yZS9pbnRlcm5hbC9idWlsZGVyL0lEZXBlbmRlbmN5R3JhcGhMaXN0ZW5lci5qYXZhCkBAIC0wLDAgKzEsMTcgQEAKKy8qKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqCisgKiBDb3B5cmlnaHQgKGMpIDIwMTAgSUJNIENvcnBvcmF0aW9uIGFuZCBvdGhlcnMuCisgKiBBbGwgcmlnaHRzIHJlc2VydmVkLiBUaGlzIHByb2dyYW0gYW5kIHRoZSBhY2NvbXBhbnlpbmcgbWF0ZXJpYWxzCisgKiBhcmUgbWFkZSBhdmFpbGFibGUgdW5kZXIgdGhlIHRlcm1zIG9mIHRoZSBFY2xpcHNlIFB1YmxpYyBMaWNlbnNlIHYxLjAKKyAqIHdoaWNoIGFjY29tcGFuaWVzIHRoaXMgZGlzdHJpYnV0aW9uLCBhbmQgaXMgYXZhaWxhYmxlIGF0CisgKiBodHRwOi8vd3d3LmVjbGlwc2Uub3JnL2xlZ2FsL2VwbC12MTAuaHRtbAorICoKKyAqIENvbnRyaWJ1dG9yczoKKyAqIElCTSBDb3Jwb3JhdGlvbiAtIGluaXRpYWwgQVBJIGFuZCBpbXBsZW1lbnRhdGlvbgorICoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKiovCitwYWNrYWdlIG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS5pbnRlcm5hbC5idWlsZGVyOworCitwdWJsaWMgaW50ZXJmYWNlIElEZXBlbmRlbmN5R3JhcGhMaXN0ZW5lciB7CisKKwlwdWJsaWMgdm9pZCBkZXBlbmRlbmN5R3JhcGhVcGRhdGUoSURlcGVuZGVuY3lHcmFwaFVwZGF0ZUV2ZW50IGV2ZW50KTsKKwkKK30KZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlL21vZHVsZWNvcmUtc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vY29tcG9uZW50Y29yZS9pbnRlcm5hbC9idWlsZGVyL0lEZXBlbmRlbmN5R3JhcGhVcGRhdGVFdmVudC5qYXZhIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUvbW9kdWxlY29yZS1zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9jb21wb25lbnRjb3JlL2ludGVybmFsL2J1aWxkZXIvSURlcGVuZGVuY3lHcmFwaFVwZGF0ZUV2ZW50LmphdmEKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uMGQxMDk0YgotLS0gL2Rldi9udWxsCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlL21vZHVsZWNvcmUtc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vY29tcG9uZW50Y29yZS9pbnRlcm5hbC9idWlsZGVyL0lEZXBlbmRlbmN5R3JhcGhVcGRhdGVFdmVudC5qYXZhCkBAIC0wLDAgKzEsNzcgQEAKKy8qKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqCisgKiBDb3B5cmlnaHQgKGMpIDIwMTAgSUJNIENvcnBvcmF0aW9uIGFuZCBvdGhlcnMuCisgKiBBbGwgcmlnaHRzIHJlc2VydmVkLiBUaGlzIHByb2dyYW0gYW5kIHRoZSBhY2NvbXBhbnlpbmcgbWF0ZXJpYWxzCisgKiBhcmUgbWFkZSBhdmFpbGFibGUgdW5kZXIgdGhlIHRlcm1zIG9mIHRoZSBFY2xpcHNlIFB1YmxpYyBMaWNlbnNlIHYxLjAKKyAqIHdoaWNoIGFjY29tcGFuaWVzIHRoaXMgZGlzdHJpYnV0aW9uLCBhbmQgaXMgYXZhaWxhYmxlIGF0CisgKiBodHRwOi8vd3d3LmVjbGlwc2Uub3JnL2xlZ2FsL2VwbC12MTAuaHRtbAorICoKKyAqIENvbnRyaWJ1dG9yczoKKyAqIElCTSBDb3Jwb3JhdGlvbiAtIGluaXRpYWwgQVBJIGFuZCBpbXBsZW1lbnRhdGlvbgorICoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKiovCitwYWNrYWdlIG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS5pbnRlcm5hbC5idWlsZGVyOworCitpbXBvcnQgamF2YS51dGlsLk1hcDsKK2ltcG9ydCBqYXZhLnV0aWwuU2V0OworCitpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5yZXNvdXJjZXMuSVByb2plY3Q7CisKK3B1YmxpYyBpbnRlcmZhY2UgSURlcGVuZGVuY3lHcmFwaFVwZGF0ZUV2ZW50IHsKKworCXB1YmxpYyBzdGF0aWMgaW50IEFEREVEID0gMTsKKwlwdWJsaWMgc3RhdGljIGludCBSRU1PVkVEID0gMjsKKworCQorCS8qKgorCSAqIFJldHVybnMgYSBiaXR3aXNlIG9yIG9mIHRoZSByZWZlcmVuY2UgY2hhbmdlIHR5cGVzLgorCSAqIAorCSAqIEBzZWUge0BsaW5rICNBRERFRH0ge0BsaW5rICNSRU1PVkVEfQorCSAqIEByZXR1cm4KKwkgKi8KKwlwdWJsaWMgYWJzdHJhY3QgaW50IGdldFR5cGUoKTsKKworCS8qKgorCSAqIFJldHVybnMgdGhlIG1vZGlmaWNhdGlvbiBzdGFtcCBmb3IgdGhlIGxhc3QgdXBkYXRlIGNoYW5nZSBpbiB0aGUKKwkgKiB7QGxpbmsgSURlcGVuZGVuY3lHcmFwaH0gYmVpbmcgbm90aWZpZWQgYnkgdGhpcyBldmVudC4KKwkgKiAKKwkgKiBOb3RlIHRoYXQgdXBkYXRlcyB0byB0aGUge0BsaW5rIElEZXBlbmRlbmN5R3JhcGh9IG1heSBiZSBxdWV1ZWQgc28KKwkgKiBzZXZlcmFsIGFyZSBoYW5kbGVkIGJ5IGEgc2luZ2xlIGV2ZW50LgorCSAqIAorCSAqIEBzZWUgSURlcGVuZGVuY3lHcmFwaCNnZXRNb2RTdGFtcCgpCisJICogCisJICogQHJldHVybgorCSAqLworCXB1YmxpYyBhYnN0cmFjdCBsb25nIGdldE1vZFN0YW1wKCk7CisKKwkvKioKKwkgKiBUaGUga2V5IGNvbnRhaW5zIHRoZSByZWZlcmVuY2VkIGNvbXBvbmVudCwgdGhlIHZhbHVlIGNvbnRhaW5zIHRoZSBzZXQgb2YKKwkgKiByZWZlcmVuY2luZyBjb21wb25lbnRzIHJlY2VudGx5IGFkZGVkLiBUaGlzIG1hcCB3aWxsIG9ubHkgY29udGFpbiB0aGUKKwkgKiBjaGFuZ2VzIHNpbmNlIHRoZSBsYXN0IGV2ZW50IHdhcyBmaXJlZC4gSWYge0BsaW5rICNnZXRUeXBlKCl9IHwKKwkgKiB7QGxpbmsgI0FEREVEfSAhPSB7QGxpbmsgI0FEREVEfSB0aGVuIHRoaXMgd2lsbCBiZSBhbiBlbXB0eSBtYXAuCisJICogCisJICogTm90ZSB0aGF0IHRoZSBjaGFuZ2VzIHNwZWNpZmllZCBieSB0aGlzIG1hcCBkbyBub3QgbmVjZXNzYXJpbHkgcmVmbGVjdAorCSAqIHRoZSBjdXJyZW50IHN0YXRlIG9mIHRoZSB7QGxpbmsgSURlcGVuZGVuY3lHcmFwaH0gYmVjYXVzZSBpdCBpcyBwb3NzaWJsZQorCSAqIHRoYXQgYWRkaXRpb25hbCBjaGFuZ2VzIGhhdmUgb2NjdXJyZWQgc2luY2UgdGhpcyBldmVudCB3YXMgZmlyZWQuCisJICoge0BsaW5rIElEZXBlbmRlbmN5R3JhcGgjZ2V0UmVmZXJlbmNpbmdDb21wb25lbnRzKElQcm9qZWN0KX0gd2lsbCByZXR1cm4KKwkgKiB0aGUgY3VycmVudCByZWZlcmVuY2Ugc3RhdGUuCisJICogCisJICogQHJldHVybgorCSAqLworCXB1YmxpYyBhYnN0cmFjdCBNYXA8SVByb2plY3QsIFNldDxJUHJvamVjdD4+IGdldEFkZGVkUmVmZXJlbmNlcygpOworCisJLyoqCisJICogVGhlIGtleSBjb250YWlucyB0aGUgcmVmZXJlbmNlZCBjb21wb25lbnQsIHRoZSB2YWx1ZSBjb250YWlucyB0aGUgc2V0IG9mCisJICogcmVmZXJlbmNpbmcgY29tcG9uZW50cyByZWNlbnRseSByZW1vdmVkLiBUaGlzIG1hcCB3aWxsIG9ubHkgY29udGFpbiB0aGUKKwkgKiBjaGFuZ2VzIHNpbmNlIHRoZSBsYXN0IGV2ZW50IHdhcyBmaXJlZC4gSWYge0BsaW5rICNnZXRUeXBlKCl9IHwKKwkgKiB7QGxpbmsgI1JFTU9WRUR9ICE9IHtAbGluayAjUkVNT1ZFRH0gdGhlbiB0aGlzIHdpbGwgYmUgYW4gZW1wdHkgbWFwLgorCSAqIAorCSAqIE5vdGUgdGhhdCB0aGUgY2hhbmdlcyBzcGVjaWZpZWQgYnkgdGhpcyBtYXAgZG8gbm90IG5lY2Vzc2FyaWx5IHJlZmxlY3QKKwkgKiB0aGUgY3VycmVudCBzdGF0ZSBvZiB0aGUge0BsaW5rIElEZXBlbmRlbmN5R3JhcGh9IGJlY2F1c2UgaXQgaXMgcG9zc2libGUKKwkgKiB0aGF0IGFkZGl0aW9uYWwgY2hhbmdlcyBoYXZlIG9jY3VycmVkIHNpbmNlIHRoaXMgZXZlbnQgd2FzIGZpcmVkLgorCSAqIHtAbGluayBJRGVwZW5kZW5jeUdyYXBoI2dldFJlZmVyZW5jaW5nQ29tcG9uZW50cyhJUHJvamVjdCl9IHdpbGwgcmV0dXJuCisJICogdGhlIGN1cnJlbnQgcmVmZXJlbmNlIHN0YXRlLgorCSAqIAorCSAqIEByZXR1cm4KKwkgKi8KKwlwdWJsaWMgYWJzdHJhY3QgTWFwPElQcm9qZWN0LCBTZXQ8SVByb2plY3Q+PiBnZXRSZW1vdmVkUmVmZXJlbmNlcygpOworCit9CmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS9tb2R1bGVjb3JlLXNyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2NvbXBvbmVudGNvcmUvaW50ZXJuYWwvZmxhdC9BYnN0cmFjdEZsYXR0ZW5QYXJ0aWNpcGFudC5qYXZhIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUvbW9kdWxlY29yZS1zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9jb21wb25lbnRjb3JlL2ludGVybmFsL2ZsYXQvQWJzdHJhY3RGbGF0dGVuUGFydGljaXBhbnQuamF2YQpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi4wMjRmNzEwCi0tLSAvZGV2L251bGwKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUvbW9kdWxlY29yZS1zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9jb21wb25lbnRjb3JlL2ludGVybmFsL2ZsYXQvQWJzdHJhY3RGbGF0dGVuUGFydGljaXBhbnQuamF2YQpAQCAtMCwwICsxLDYzIEBACisvKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKgorICogQ29weXJpZ2h0IChjKSAyMDA5IFJlZCBIYXQgYW5kIG90aGVycy4KKyAqIEFsbCByaWdodHMgcmVzZXJ2ZWQuIFRoaXMgcHJvZ3JhbSBhbmQgdGhlIGFjY29tcGFueWluZyBtYXRlcmlhbHMKKyAqIGFyZSBtYWRlIGF2YWlsYWJsZSB1bmRlciB0aGUgdGVybXMgb2YgdGhlIEVjbGlwc2UgUHVibGljIExpY2Vuc2UgdjEuMAorICogd2hpY2ggYWNjb21wYW5pZXMgdGhpcyBkaXN0cmlidXRpb24sIGFuZCBpcyBhdmFpbGFibGUgYXQKKyAqIGh0dHA6Ly93d3cuZWNsaXBzZS5vcmcvbGVnYWwvZXBsLXYxMC5odG1sCisgKgorICogQ29udHJpYnV0b3JzOgorICogICAgIFJlZCBIYXQgLSBJbml0aWFsIEFQSSBhbmQgaW1wbGVtZW50YXRpb24KKyAqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqLworcGFja2FnZSBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUuaW50ZXJuYWwuZmxhdDsKKworaW1wb3J0IGphdmEudXRpbC5MaXN0OworCitpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb21wb25lbnRjb3JlLmludGVybmFsLmZsYXQuRmxhdFZpcnR1YWxDb21wb25lbnQuRmxhdENvbXBvbmVudFRhc2tNb2RlbDsKK2ltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUucmVzb3VyY2VzLklWaXJ0dWFsQ29tcG9uZW50OworaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS5yZXNvdXJjZXMuSVZpcnR1YWxSZWZlcmVuY2U7CisKKy8qKgorICogQSBzaW1wbGUgYWJzdHJhY3QgY2xhc3Mgd2l0aCBkZWZhdWx0IHZhbHVlcyBzbyBjbGllbnRzCisgKiBjYW4gZXh0ZW5kIGFuZCBvdmVycmlkZSBvbmx5IHRoZSBtZXRob2QgdGhleSBjYXJlIGFib3V0CisgKi8KK3B1YmxpYyBjbGFzcyBBYnN0cmFjdEZsYXR0ZW5QYXJ0aWNpcGFudCBpbXBsZW1lbnRzIElGbGF0dGVuUGFydGljaXBhbnQgeworCisJcHVibGljIHZvaWQgaW5pdGlhbGl6ZShJVmlydHVhbENvbXBvbmVudCBjb21wb25lbnQsCisJCQlGbGF0Q29tcG9uZW50VGFza01vZGVsIGRhdGFNb2RlbCwgTGlzdDxJRmxhdFJlc291cmNlPiByZXNvdXJjZXMpIHsKKwl9CisKKwlwdWJsaWMgYm9vbGVhbiBjYW5PcHRpbWl6ZShJVmlydHVhbENvbXBvbmVudCBjb21wb25lbnQsCisJCQlGbGF0Q29tcG9uZW50VGFza01vZGVsIGRhdGFNb2RlbCkgeworCQlyZXR1cm4gZmFsc2U7CisJfQorCisJcHVibGljIHZvaWQgb3B0aW1pemUoSVZpcnR1YWxDb21wb25lbnQgY29tcG9uZW50LCBGbGF0Q29tcG9uZW50VGFza01vZGVsIGRhdGFNb2RlbCwgCisJCQlMaXN0PElGbGF0UmVzb3VyY2U+IHJlc291cmNlcywgTGlzdDxJQ2hpbGRNb2R1bGVSZWZlcmVuY2U+IGNoaWxkTW9kdWxlcykgeworCX0KKworCXB1YmxpYyB2b2lkIGZpbmFsaXplKElWaXJ0dWFsQ29tcG9uZW50IGNvbXBvbmVudCwKKwkJCUZsYXRDb21wb25lbnRUYXNrTW9kZWwgZGF0YU1vZGVsLCBMaXN0PElGbGF0UmVzb3VyY2U+IHJlc291cmNlcykgeworCX0KKworCXB1YmxpYyBib29sZWFuIGlzQ2hpbGRNb2R1bGUoSVZpcnR1YWxDb21wb25lbnQgcm9vdENvbXBvbmVudCwKKwkJCUZsYXRDb21wb25lbnRUYXNrTW9kZWwgZGF0YU1vZGVsLCBJRmxhdEZpbGUgZmlsZSkgeworCQlyZXR1cm4gZmFsc2U7CisJfQorCisJcHVibGljIGJvb2xlYW4gaXNDaGlsZE1vZHVsZShJVmlydHVhbENvbXBvbmVudCByb290Q29tcG9uZW50LAorCQkJSVZpcnR1YWxSZWZlcmVuY2UgcmVmZXJlbmNlZCwgRmxhdENvbXBvbmVudFRhc2tNb2RlbCBkYXRhTW9kZWwpIHsKKwkJcmV0dXJuIGZhbHNlOworCX0KKworCXB1YmxpYyBib29sZWFuIHNob3VsZEFkZEV4cG9ydGFibGVGaWxlKElWaXJ0dWFsQ29tcG9uZW50IHJvb3RDb21wb25lbnQsCisJCQlJVmlydHVhbENvbXBvbmVudCBjdXJyZW50Q29tcG9uZW50LCBGbGF0Q29tcG9uZW50VGFza01vZGVsIGRhdGFNb2RlbCwKKwkJCUlGbGF0RmlsZSBmaWxlKSB7CisJCXJldHVybiB0cnVlOworCX0KKwkKKwlwdWJsaWMgYm9vbGVhbiBzaG91bGRJZ25vcmVSZWZlcmVuY2UoSVZpcnR1YWxDb21wb25lbnQgcm9vdENvbXBvbmVudCwKKwkJCUlWaXJ0dWFsUmVmZXJlbmNlIHJlZmVyZW5jZWQsIEZsYXRDb21wb25lbnRUYXNrTW9kZWwgZGF0YU1vZGVsKSB7CisJCXJldHVybiBmYWxzZTsKKwl9CisKK30KZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlL21vZHVsZWNvcmUtc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vY29tcG9uZW50Y29yZS9pbnRlcm5hbC9mbGF0L0NoaWxkTW9kdWxlUmVmZXJlbmNlLmphdmEgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS9tb2R1bGVjb3JlLXNyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2NvbXBvbmVudGNvcmUvaW50ZXJuYWwvZmxhdC9DaGlsZE1vZHVsZVJlZmVyZW5jZS5qYXZhCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLmY0OGFmOTkKLS0tIC9kZXYvbnVsbAorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS9tb2R1bGVjb3JlLXNyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2NvbXBvbmVudGNvcmUvaW50ZXJuYWwvZmxhdC9DaGlsZE1vZHVsZVJlZmVyZW5jZS5qYXZhCkBAIC0wLDAgKzEsMTEyIEBACisvKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKgorICogQ29weXJpZ2h0IChjKSAyMDA5IFJlZCBIYXQgYW5kIG90aGVycy4KKyAqIEFsbCByaWdodHMgcmVzZXJ2ZWQuIFRoaXMgcHJvZ3JhbSBhbmQgdGhlIGFjY29tcGFueWluZyBtYXRlcmlhbHMKKyAqIGFyZSBtYWRlIGF2YWlsYWJsZSB1bmRlciB0aGUgdGVybXMgb2YgdGhlIEVjbGlwc2UgUHVibGljIExpY2Vuc2UgdjEuMAorICogd2hpY2ggYWNjb21wYW5pZXMgdGhpcyBkaXN0cmlidXRpb24sIGFuZCBpcyBhdmFpbGFibGUgYXQKKyAqIGh0dHA6Ly93d3cuZWNsaXBzZS5vcmcvbGVnYWwvZXBsLXYxMC5odG1sCisgKgorICogQ29udHJpYnV0b3JzOgorICogICAgIFJlZCBIYXQgLSBJbml0aWFsIEFQSSBhbmQgaW1wbGVtZW50YXRpb24KKyAqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqLworcGFja2FnZSBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUuaW50ZXJuYWwuZmxhdDsKKworaW1wb3J0IGphdmEuaW8uRmlsZTsKKworaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucmVzb3VyY2VzLklQcm9qZWN0OworaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucnVudGltZS5JUGF0aDsKK2ltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJ1bnRpbWUuUGF0aDsKK2ltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUuaW50ZXJuYWwucmVzb3VyY2VzLlZpcnR1YWxBcmNoaXZlQ29tcG9uZW50OworaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS5yZXNvdXJjZXMuSVZpcnR1YWxDb21wb25lbnQ7CitpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb21wb25lbnRjb3JlLnJlc291cmNlcy5JVmlydHVhbFJlZmVyZW5jZTsKKworLyoqCisgKiBDbGllbnRzIG9mIHRoaXMgY2xhc3Mgd2lsbCBuZWVkIHRvIHBheSBhdHRlbnRpb24gdG8gCisgKiBpZiB0aGlzIG1vZHVsZSBpcyBiaW5hcnkgb3Igbm90LiBJZiBpdCdzIGJpbmFyeSwgeW91IAorICogc2hvdWxkIGdldCB0aGUgZmlsZSwgYW5kIGNvcHkgaXQgZGlyZWN0bHkgdG8gdGhlIFVSSSBwcm92aWRlZC4KKyAqIAorICogSWYgaXQncyBub3QgYmluYXJ5LCB5b3Ugc2hvdWxkIHVzZSB0aGUgcHJvdmlkZWQgdXJpCisgKiBhcyBhIGJhc2UgZnJvbSB3aGljaCB5b3UgY2FuIGFwcGVuZCBpdCdzIG1lbWJlciByZXNvdXJjZXMKKyAqICAKKyAqIFN0cmluZyBwYXJlbnRSZWxhdGl2ZSA9IG1vZHVsZS5nZXRSZWxhdGl2ZVVSSSgpOyAvLyAgcGF0aC90by9jaGlsZG1vZC5qYXIKKyAqIFN0cmluZyB1cmkgPSBwYXJlbnRMb2MuYXBwZW5kKHBhcmVudFJlbGF0aXZlKTsKKyAqIGlmKCBtb2R1bGUuaXNCaW5hcnkoKSkgeworICogICAgRmlsZSBmID0gbW9kdWxlLmdldEZpbGUoKTsKKyAqICAgIC8vIGNvcHkgZmlsZSBmIHRvIHVyaTsKKyAqIH0gZWxzZSB7CisgKiAgICBFeHBvcnRNb2RlbCBlbSA9IG5ldyBFeHBvcnRNb2RlbChtb2R1bGUuZ2V0Q29tcG9uZW50KCkpOworICogICAgRXhwb3J0YWJsZVJlc291cmNlW10gbWVtYmVycyA9IGVtLmZldGNoUmVzb3VyY2VzKCk7CisgKiAgICBTdHJpbmcgdXJpMSA9IHVyaS5hcHBlbmQobWVtYmVyc1sxXS5nZXRNb2R1bGVSZWxhdGl2ZVBhdGgoKSk7CisgKiAgICBTdHJpbmcgdXJpMiA9IC4uLi4KKyAqIH0KKyAqIEBhdXRob3Igcm9iCisgKgorICovCitwdWJsaWMgY2xhc3MgQ2hpbGRNb2R1bGVSZWZlcmVuY2UgaW1wbGVtZW50cyBJQ2hpbGRNb2R1bGVSZWZlcmVuY2UgeworCXByaXZhdGUgSVByb2plY3QgcHJvamVjdDsKKwlwcml2YXRlIEZpbGUgZmlsZTsKKwlwcml2YXRlIElWaXJ0dWFsQ29tcG9uZW50IGNvbXBvbmVudDsKKwlwcml2YXRlIElWaXJ0dWFsUmVmZXJlbmNlIHJlZmVyZW5jZTsKKwlwcml2YXRlIElQYXRoIHVyaTsKKwlwdWJsaWMgQ2hpbGRNb2R1bGVSZWZlcmVuY2UoSVByb2plY3QgcHJvamVjdCwgSUZsYXRGaWxlIGYpIHsKKwkJdGhpcy5wcm9qZWN0ID0gcHJvamVjdDsKKwkJdGhpcy5maWxlID0gZiA9PSBudWxsID8gbnVsbCA6IChGaWxlKWYuZ2V0QWRhcHRlcihGaWxlLmNsYXNzKTsKKwkJaWYoIGYgIT0gbnVsbCAmJiBmaWxlICE9IG51bGwgKSB7CisJCQl0aGlzLnVyaSA9IGYuZ2V0TW9kdWxlUmVsYXRpdmVQYXRoKCkuYXBwZW5kKGYuZ2V0TmFtZSgpKTsKKwkJfQorCX0KKwkKKwlwdWJsaWMgQ2hpbGRNb2R1bGVSZWZlcmVuY2UoSVZpcnR1YWxSZWZlcmVuY2UgcmVmZXJlbmNlLCBJUGF0aCByb290KSB7CisJCXRoaXMucmVmZXJlbmNlID0gcmVmZXJlbmNlOworCQl0aGlzLmNvbXBvbmVudCA9IHJlZmVyZW5jZS5nZXRSZWZlcmVuY2VkQ29tcG9uZW50KCk7CisJCXRoaXMucHJvamVjdCA9IHRoaXMuY29tcG9uZW50LmdldFByb2plY3QoKTsKKwkJaWYoIGNvbXBvbmVudC5pc0JpbmFyeSgpICkgeworCQkJRmlsZSBmID0gKEZpbGUpY29tcG9uZW50LmdldEFkYXB0ZXIoRmlsZS5jbGFzcyk7CisJCQlpZiggZi5leGlzdHMoKSAmJiBmLmlzRmlsZSgpKSB7CisJCQkJdGhpcy5maWxlID0gZjsKKwkJCX0KKwkJfQorCQl0aGlzLnVyaSA9IHJvb3QuYXBwZW5kKHJlZmVyZW5jZS5nZXRSdW50aW1lUGF0aCgpKS5hcHBlbmQocmVmZXJlbmNlLmdldEFyY2hpdmVOYW1lKCkpOworCX0KKwkKKwkvKioKKwkgKiBXaWxsIHJldHVybiBhIGZpbGUgaWYgdGhpcyBjYW4gYmUgdHJhY2tlZCB0byBvbmUKKwkgKiBAcmV0dXJuCisJICovCisJcHVibGljIEZpbGUgZ2V0RmlsZSgpIHsKKwkJcmV0dXJuIGZpbGU7CisJfQorCQorCXB1YmxpYyBJVmlydHVhbFJlZmVyZW5jZSBnZXRSZWZlcmVuY2UoKSB7CisJCXJldHVybiByZWZlcmVuY2U7CisJfQorCQorCS8qKgorCSAqIFJldHVybiB0aGUgY29tcG9uZW50IGlmIGl0IGV4aXN0cworCSAqIEByZXR1cm4KKwkgKi8KKwlwdWJsaWMgSVZpcnR1YWxDb21wb25lbnQgZ2V0Q29tcG9uZW50KCkgeworCQlpZiggY29tcG9uZW50ICE9IG51bGwgKSAKKwkJCXJldHVybiBjb21wb25lbnQ7CisJCWlmKCBmaWxlICE9IG51bGwgKSAKKwkJCXJldHVybiBuZXcgVmlydHVhbEFyY2hpdmVDb21wb25lbnQocHJvamVjdCwgVmlydHVhbEFyY2hpdmVDb21wb25lbnQuTElCQVJDSElWRVRZUEUgKyAiLyIgKyBmaWxlLmdldEFic29sdXRlUGF0aCgpLCBuZXcgUGF0aCgiLyIpKTsKKwkJcmV0dXJuIG51bGw7CisJfQorCQorCS8qKgorCSAqIElmIHRoaXMgaXMgYSBzaW5nbGUgZmlsZSwgcmV0dXJuIHRydWUuCisJICogSWYgYSBtb3JlIGNvbXBsZXggY29tcG9uZW50LCByZXR1cm4gZmFsc2UKKwkgKiBAcmV0dXJuCisJICovCisJcHVibGljIGJvb2xlYW4gaXNCaW5hcnkoKSB7CisJCXJldHVybiBjb21wb25lbnQgPT0gbnVsbCB8fCBjb21wb25lbnQuaXNCaW5hcnkoKTsKKwl9CisJCisJLyoqCisJICogR2V0IHRoZSByZWxhdGl2ZSBVUkkgdG8gaXQncyBkaXJlY3QgcGFyZW50LCAKKwkgKiBpbmNsdWRpbmcgcGF0aCArIGZpbGVuYW1lICsgZXh0ZW5zaW9uCisJICogQHJldHVybgorCSAqLworCXB1YmxpYyBJUGF0aCBnZXRSZWxhdGl2ZVVSSSgpIHsKKwkJcmV0dXJuIHVyaTsKKwl9Cit9CmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS9tb2R1bGVjb3JlLXNyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2NvbXBvbmVudGNvcmUvaW50ZXJuYWwvZmxhdC9GaWx0ZXJSZXNvdXJjZVBhcnRpY2lwYW50LmphdmEgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS9tb2R1bGVjb3JlLXNyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2NvbXBvbmVudGNvcmUvaW50ZXJuYWwvZmxhdC9GaWx0ZXJSZXNvdXJjZVBhcnRpY2lwYW50LmphdmEKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uNjM1Y2FhNgotLS0gL2Rldi9udWxsCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlL21vZHVsZWNvcmUtc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vY29tcG9uZW50Y29yZS9pbnRlcm5hbC9mbGF0L0ZpbHRlclJlc291cmNlUGFydGljaXBhbnQuamF2YQpAQCAtMCwwICsxLDY0IEBACisvKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKgorICogQ29weXJpZ2h0IChjKSAyMDA5IFJlZCBIYXQgYW5kIG90aGVycy4KKyAqIEFsbCByaWdodHMgcmVzZXJ2ZWQuIFRoaXMgcHJvZ3JhbSBhbmQgdGhlIGFjY29tcGFueWluZyBtYXRlcmlhbHMKKyAqIGFyZSBtYWRlIGF2YWlsYWJsZSB1bmRlciB0aGUgdGVybXMgb2YgdGhlIEVjbGlwc2UgUHVibGljIExpY2Vuc2UgdjEuMAorICogd2hpY2ggYWNjb21wYW5pZXMgdGhpcyBkaXN0cmlidXRpb24sIGFuZCBpcyBhdmFpbGFibGUgYXQKKyAqIGh0dHA6Ly93d3cuZWNsaXBzZS5vcmcvbGVnYWwvZXBsLXYxMC5odG1sCisgKgorICogQ29udHJpYnV0b3JzOgorICogICAgIFJlZCBIYXQgLSBJbml0aWFsIEFQSSBhbmQgaW1wbGVtZW50YXRpb24KKyAqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqLworcGFja2FnZSBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUuaW50ZXJuYWwuZmxhdDsKKworaW1wb3J0IGphdmEuaW8uRmlsZTsKKworaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucmVzb3VyY2VzLklGaWxlOworaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS5pbnRlcm5hbC5mbGF0LkZsYXRWaXJ0dWFsQ29tcG9uZW50LkZsYXRDb21wb25lbnRUYXNrTW9kZWw7CitpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb21wb25lbnRjb3JlLnJlc291cmNlcy5JVmlydHVhbENvbXBvbmVudDsKKworcHVibGljIGNsYXNzIEZpbHRlclJlc291cmNlUGFydGljaXBhbnQgZXh0ZW5kcyBBYnN0cmFjdEZsYXR0ZW5QYXJ0aWNpcGFudCB7CisJcHVibGljIGludGVyZmFjZSBJRXhwb3J0YWJsZVJlc291cmNlRmlsdGVyIHsKKwkJcHVibGljIGJvb2xlYW4gYWNjZXB0cyhJRmxhdFJlc291cmNlIHJlc291cmNlKTsKKwl9CisJCisJcHVibGljIHN0YXRpYyBjbGFzcyBGaWx0ZXJFeHRlbnNpb25zUGFydGljaXBhbnQgaW1wbGVtZW50cyBJRXhwb3J0YWJsZVJlc291cmNlRmlsdGVyIHsKKwkJcHJpdmF0ZSBTdHJpbmdbXSBiYW5uZWRFeHRlbnNpb25zOworCQlwdWJsaWMgRmlsdGVyRXh0ZW5zaW9uc1BhcnRpY2lwYW50KFN0cmluZ1tdIGV4dGVuc2lvbnMpIHsKKwkJCXRoaXMuYmFubmVkRXh0ZW5zaW9ucyA9IGV4dGVuc2lvbnM7CisJCX0KKwkJcHVibGljIGJvb2xlYW4gYWNjZXB0cyhJRmxhdFJlc291cmNlIHJlc291cmNlKSB7CisJCQlJRmlsZSBpZmlsZSA9IChJRmlsZSlyZXNvdXJjZS5nZXRBZGFwdGVyKElGaWxlLmNsYXNzKTsKKwkJCVN0cmluZyBuYW1lID0gbnVsbDsKKwkJCWlmKCBpZmlsZSAhPSBudWxsICkgeworCQkJCW5hbWUgPSBpZmlsZS5nZXROYW1lKCk7CisJCQl9IGVsc2UgeworCQkJCUZpbGUgZiA9IChGaWxlKXJlc291cmNlLmdldEFkYXB0ZXIoRmlsZS5jbGFzcyk7CisJCQkJaWYoIGYgIT0gbnVsbCApCisJCQkJCW5hbWUgPSBmLmdldE5hbWUoKTsKKwkJCX0KKwkJCWlmKCBuYW1lICE9IG51bGwpIHsKKwkJCQlmb3IoIGludCBpID0gMDsgaSA8IGJhbm5lZEV4dGVuc2lvbnMubGVuZ3RoOyBpKysgKSB7CisJCQkJCWlmKCBuYW1lLmVuZHNXaXRoKGJhbm5lZEV4dGVuc2lvbnNbaV0pKQorCQkJCQkJcmV0dXJuIGZhbHNlOworCQkJCX0KKwkJCQlyZXR1cm4gdHJ1ZTsKKwkJCX0gCisJCQlyZXR1cm4gZmFsc2U7CisJCX0KKwl9CisJCisJcHVibGljIHN0YXRpYyBGaWx0ZXJSZXNvdXJjZVBhcnRpY2lwYW50IGNyZWF0ZVN1ZmZpeEZpbHRlclBhcnRpY2lwYW50KFN0cmluZ1tdIHN0cmluZ3MpIHsKKwkJcmV0dXJuIG5ldyBGaWx0ZXJSZXNvdXJjZVBhcnRpY2lwYW50KG5ldyBGaWx0ZXJFeHRlbnNpb25zUGFydGljaXBhbnQoc3RyaW5ncykpOworCX0KKwkKKwlwcml2YXRlIElFeHBvcnRhYmxlUmVzb3VyY2VGaWx0ZXIgZmlsdGVyOworCXB1YmxpYyBGaWx0ZXJSZXNvdXJjZVBhcnRpY2lwYW50KElFeHBvcnRhYmxlUmVzb3VyY2VGaWx0ZXIgZmlsdGVyKSB7CisJCXRoaXMuZmlsdGVyID0gZmlsdGVyOworCX0KKwkKKwlwdWJsaWMgYm9vbGVhbiBzaG91bGRBZGRFeHBvcnRhYmxlRmlsZShJVmlydHVhbENvbXBvbmVudCByb290Q29tcG9uZW50LAorCQkJSVZpcnR1YWxDb21wb25lbnQgY3VycmVudENvbXBvbmVudCwgRmxhdENvbXBvbmVudFRhc2tNb2RlbCBkYXRhTW9kZWwsCisJCQlJRmxhdEZpbGUgZmlsZSkgeworCQlyZXR1cm4gZmlsdGVyLmFjY2VwdHMoZmlsZSk7CisJfQorfQpkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUvbW9kdWxlY29yZS1zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9jb21wb25lbnRjb3JlL2ludGVybmFsL2ZsYXQvRmxhdEZpbGUuamF2YSBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlL21vZHVsZWNvcmUtc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vY29tcG9uZW50Y29yZS9pbnRlcm5hbC9mbGF0L0ZsYXRGaWxlLmphdmEKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uODQ2MzlmOAotLS0gL2Rldi9udWxsCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlL21vZHVsZWNvcmUtc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vY29tcG9uZW50Y29yZS9pbnRlcm5hbC9mbGF0L0ZsYXRGaWxlLmphdmEKQEAgLTAsMCArMSwxNzggQEAKKy8qKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqCisgKiBDb3B5cmlnaHQgKGMpIDIwMDUsIDIwMDYgSUJNIENvcnBvcmF0aW9uIGFuZCBvdGhlcnMuCisgKiBBbGwgcmlnaHRzIHJlc2VydmVkLiBUaGlzIHByb2dyYW0gYW5kIHRoZSBhY2NvbXBhbnlpbmcgbWF0ZXJpYWxzCisgKiBhcmUgbWFkZSBhdmFpbGFibGUgdW5kZXIgdGhlIHRlcm1zIG9mIHRoZSBFY2xpcHNlIFB1YmxpYyBMaWNlbnNlIHYxLjAKKyAqIHdoaWNoIGFjY29tcGFuaWVzIHRoaXMgZGlzdHJpYnV0aW9uLCBhbmQgaXMgYXZhaWxhYmxlIGF0CisgKiBodHRwOi8vd3d3LmVjbGlwc2Uub3JnL2xlZ2FsL2VwbC12MTAuaHRtbAorICoKKyAqIENvbnRyaWJ1dG9yczoKKyAqICAgICBJQk0gQ29ycG9yYXRpb24gLSBJbml0aWFsIEFQSSBhbmQgaW1wbGVtZW50YXRpb24KKyAqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqLworcGFja2FnZSBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUuaW50ZXJuYWwuZmxhdDsKKworaW1wb3J0IGphdmEuaW8uRmlsZTsKK2ltcG9ydCBqYXZhLmlvLkZpbGVJbnB1dFN0cmVhbTsKK2ltcG9ydCBqYXZhLmlvLklPRXhjZXB0aW9uOworaW1wb3J0IGphdmEuaW8uSW5wdXRTdHJlYW07CisKK2ltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJlc291cmNlcy5JRmlsZTsKK2ltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJlc291cmNlcy5JUmVzb3VyY2U7CitpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5ydW50aW1lLklQYXRoOworCisvKioKKyAqIEEgZGVwbG95YWJsZSBmaWxlCisgKi8KK3B1YmxpYyBjbGFzcyBGbGF0RmlsZSBleHRlbmRzIEZsYXRSZXNvdXJjZSBpbXBsZW1lbnRzIElGbGF0RmlsZSB7CisJcHJpdmF0ZSBJbnB1dFN0cmVhbSBzdHJlYW07CisJcHJpdmF0ZSBJRmlsZSBmaWxlOworCXByaXZhdGUgRmlsZSBmaWxlMjsKKwlwcml2YXRlIFN0cmluZyBuYW1lOworCXByaXZhdGUgSVBhdGggcGF0aDsKKwlwcml2YXRlIGxvbmcgc3RhbXAgPSAtMTsKKworCS8qKgorCSAqIENyZWF0ZXMgYSB3b3Jrc3BhY2UgbW9kdWxlIGZpbGUgd2l0aCB0aGUgY3VycmVudCBtb2RpZmljYXRpb24gc3RhbXAuCisJICogCisJICogQHBhcmFtIGZpbGUgYSBmaWxlIGluIHRoZSB3b3Jrc3BhY2UKKwkgKiBAcGFyYW0gbmFtZSBhIG5hbWUKKwkgKiBAcGFyYW0gcGF0aCB0aGUgcGF0aCB0byB0aGUgZmlsZQorCSAqLworCXB1YmxpYyBGbGF0RmlsZShJRmlsZSBmaWxlLCBTdHJpbmcgbmFtZSwgSVBhdGggcGF0aCkgeworCQlpZiAobmFtZSA9PSBudWxsKQorCQkJdGhyb3cgbmV3IElsbGVnYWxBcmd1bWVudEV4Y2VwdGlvbigpOworCQl0aGlzLmZpbGUgPSBmaWxlOworCQl0aGlzLm5hbWUgPSBuYW1lOworCQl0aGlzLnBhdGggPSBwYXRoOworCQlpZiAoZmlsZSAhPSBudWxsKQorCQkJc3RhbXAgPSBmaWxlLmdldE1vZGlmaWNhdGlvblN0YW1wKCkgKyBmaWxlLmdldExvY2FsVGltZVN0YW1wKCk7CisJfQorCisJLyoqCisJICogQ3JlYXRlcyBhbiBleHRlcm5hbCBtb2R1bGUgZmlsZSAKKwkgKiAKKwkgKiBAcGFyYW0gZmlsZQorCSAqIEBwYXJhbSBuYW1lCisJICogQHBhcmFtIHBhdGgKKwkgKi8KKwlwdWJsaWMgRmxhdEZpbGUoRmlsZSBmaWxlLCBTdHJpbmcgbmFtZSwgSVBhdGggcGF0aCkgeworCQlpZiAobmFtZSA9PSBudWxsKQorCQkJdGhyb3cgbmV3IElsbGVnYWxBcmd1bWVudEV4Y2VwdGlvbigpOworCQl0aGlzLmZpbGUyID0gZmlsZTsKKwkJdGhpcy5uYW1lID0gbmFtZTsKKwkJdGhpcy5wYXRoID0gcGF0aDsKKwkJaWYgKGZpbGUyICE9IG51bGwpCisJCQlzdGFtcCA9IGZpbGUyLmxhc3RNb2RpZmllZCgpOworCX0KKworCS8qKgorCSAqIENyZWF0ZXMgYW4gdW5rbm93biBtb2R1bGUgZmlsZSB3aXRoIGEgc3BlY2lmaWMgbW9kaWZpY2F0aW9uIHN0YW1wLgorCSAqIAorCSAqIEBwYXJhbSBmaWxlCisJICogQHBhcmFtIG5hbWUKKwkgKiBAcGFyYW0gcGF0aAorCSAqIEBwYXJhbSBzdGFtcAorCSAqLworCXB1YmxpYyBGbGF0RmlsZShJbnB1dFN0cmVhbSBpcywgU3RyaW5nIG5hbWUsIElQYXRoIHBhdGgsIGxvbmcgc3RhbXApIHsKKwkJaWYgKG5hbWUgPT0gbnVsbCkKKwkJCXRocm93IG5ldyBJbGxlZ2FsQXJndW1lbnRFeGNlcHRpb24oKTsKKwkJdGhpcy5zdHJlYW0gPSBpczsKKwkJdGhpcy5uYW1lID0gbmFtZTsKKwkJdGhpcy5wYXRoID0gcGF0aDsKKwkJdGhpcy5zdGFtcCA9IHN0YW1wOworCX0KKwkKKwkvKioKKwkgKiBDcmVhdGVzIGFuIHVua25vd24gbW9kdWxlIGZpbGUgd2l0aCB0aGUgY3VycmVudCBtb2RpZmljYXRpb24gc3RhbXAuCisJICogCisJICogQHBhcmFtIGZpbGUKKwkgKiBAcGFyYW0gbmFtZQorCSAqIEBwYXJhbSBwYXRoCisJICovCisJcHVibGljIEZsYXRGaWxlKElucHV0U3RyZWFtIGlzLCBTdHJpbmcgbmFtZSwgSVBhdGggcGF0aCkgeworCQl0aGlzKGlzLCBuYW1lLCBwYXRoLCBTeXN0ZW0uY3VycmVudFRpbWVNaWxsaXMoKSk7CisJfQorCisJLyoqCisJICogQ3JlYXRlcyBhIG1vZHVsZSBmaWxlIHdpdGggYSBzcGVjaWZpYyBtb2RpZmljYXRpb24gc3RhbXAgYW5kIG5vCisJICogZmlsZSByZWZlcmVuY2UuCisJICogCisJICogQHBhcmFtIG5hbWUKKwkgKiBAcGFyYW0gcGF0aAorCSAqIEBwYXJhbSBzdGFtcAorCSAqLworCXB1YmxpYyBGbGF0RmlsZShTdHJpbmcgbmFtZSwgSVBhdGggcGF0aCwgbG9uZyBzdGFtcCkgeworCQlpZiAobmFtZSA9PSBudWxsKQorCQkJdGhyb3cgbmV3IElsbGVnYWxBcmd1bWVudEV4Y2VwdGlvbigpOworCQl0aGlzLm5hbWUgPSBuYW1lOworCQl0aGlzLnBhdGggPSBwYXRoOworCQl0aGlzLnN0YW1wID0gc3RhbXA7CisJfQorCisJLyogKG5vbi1KYXZhZG9jKQorCSAqIEBzZWUgb3JnLmVjbGlwc2Uud3N0LnNlcnZlci5jb3JlLm1vZGVsLklNb2R1bGVGaWxlI2dldE1vZGlmaWNhdGlvblN0YW1wKCkKKwkgKi8KKwlwdWJsaWMgbG9uZyBnZXRNb2RpZmljYXRpb25TdGFtcCgpIHsKKwkJcmV0dXJuIHN0YW1wOworCX0KKworCS8qIChub24tSmF2YWRvYykKKwkgKiBAc2VlIG9yZy5lY2xpcHNlLndzdC5zZXJ2ZXIuY29yZS5tb2RlbC5JTW9kdWxlUmVzb3VyY2UjZ2V0TW9kdWxlUmVsYXRpdmVQYXRoKCkKKwkgKi8KKwlwdWJsaWMgSVBhdGggZ2V0TW9kdWxlUmVsYXRpdmVQYXRoKCkgeworCQlyZXR1cm4gcGF0aDsKKwl9CisKKwkvKiAobm9uLUphdmFkb2MpCisJICogQHNlZSBvcmcuZWNsaXBzZS53c3Quc2VydmVyLmNvcmUubW9kZWwuSU1vZHVsZVJlc291cmNlI2dldE5hbWUoKQorCSAqLworCXB1YmxpYyBTdHJpbmcgZ2V0TmFtZSgpIHsKKwkJcmV0dXJuIG5hbWU7CisJfQorCisJcHVibGljIGJvb2xlYW4gZXF1YWxzKE9iamVjdCBvYmopIHsKKwkJaWYgKG9iaiA9PSB0aGlzKQorCQkJcmV0dXJuIHRydWU7CisJCQorCQlpZiAoIShvYmogaW5zdGFuY2VvZiBGbGF0RmlsZSkpCisJCQlyZXR1cm4gZmFsc2U7CisJCQorCQlGbGF0RmlsZSBtZiA9IChGbGF0RmlsZSkgb2JqOworCQlpZiAoIW5hbWUuZXF1YWxzKG1mLmdldE5hbWUoKSkpCisJCQlyZXR1cm4gZmFsc2U7CisJCWlmICghcGF0aC5lcXVhbHMobWYuZ2V0TW9kdWxlUmVsYXRpdmVQYXRoKCkpKQorCQkJcmV0dXJuIGZhbHNlOworCQlyZXR1cm4gdHJ1ZTsKKwl9CisKKwlwdWJsaWMgaW50IGhhc2hDb2RlKCkgeworCQlyZXR1cm4gbmFtZS5oYXNoQ29kZSgpICogMzcgKyBwYXRoLmhhc2hDb2RlKCk7CisJfQorCisJcHVibGljIE9iamVjdCBnZXRBZGFwdGVyKENsYXNzIGNsKSB7CisJCWlmIChJRmlsZS5jbGFzcy5lcXVhbHMoY2wpIHx8IElSZXNvdXJjZS5jbGFzcy5lcXVhbHMoY2wpKQorCQkJcmV0dXJuIGZpbGU7CisJCWVsc2UgaWYgKEZpbGUuY2xhc3MuZXF1YWxzKGNsKSkgeworCQkJaWYoIGZpbGUyICE9IG51bGwgKQorCQkJCXJldHVybiBmaWxlMjsKKwkJCWlmKCBmaWxlICE9IG51bGwgKQorCQkJCXJldHVybiBmaWxlLmdldExvY2F0aW9uKCkudG9GaWxlKCk7CisJCX0KKwkJZWxzZSBpZiggSW5wdXRTdHJlYW0uY2xhc3MuZXF1YWxzKGNsKSkgeworCQkJdHJ5IHsKKwkJCQlpZiggc3RyZWFtICE9IG51bGwgKQorCQkJCQlyZXR1cm4gc3RyZWFtOworCQkJCWlmKCBmaWxlMiAhPSBudWxsICYmIGZpbGUyLmV4aXN0cygpKSAKKwkJCQkJcmV0dXJuIG5ldyBGaWxlSW5wdXRTdHJlYW0oZmlsZTIpOworCQkJCWlmKCBmaWxlICE9IG51bGwgJiYgZmlsZS5leGlzdHMoKSkgCisJCQkJCXJldHVybiBuZXcgRmlsZUlucHV0U3RyZWFtKGZpbGUuZ2V0TG9jYXRpb24oKS50b0ZpbGUoKSk7CisJCQl9IGNhdGNoKCBJT0V4Y2VwdGlvbiBpb2UpIHsKKwkJCQkvLyBEbyBOb3RoaW5nCisJCQl9CisJCX0KKwkJcmV0dXJuIG51bGw7CisJfQorCisJcHVibGljIFN0cmluZyB0b1N0cmluZygpIHsKKwkJcmV0dXJuICJEZXBsb3lhYmxlRmlsZSBbIiArIG5hbWUgKyAiLCAiICsgcGF0aCArICIsICIgKyBzdGFtcCArICJdIjsKKwl9Cit9ClwgTm8gbmV3bGluZSBhdCBlbmQgb2YgZmlsZQpkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUvbW9kdWxlY29yZS1zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9jb21wb25lbnRjb3JlL2ludGVybmFsL2ZsYXQvRmxhdEZvbGRlci5qYXZhIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUvbW9kdWxlY29yZS1zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9jb21wb25lbnRjb3JlL2ludGVybmFsL2ZsYXQvRmxhdEZvbGRlci5qYXZhCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLmM1NWMwMjMKLS0tIC9kZXYvbnVsbAorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS9tb2R1bGVjb3JlLXNyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2NvbXBvbmVudGNvcmUvaW50ZXJuYWwvZmxhdC9GbGF0Rm9sZGVyLmphdmEKQEAgLTAsMCArMSwxMTEgQEAKKy8qKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqCisgKiBDb3B5cmlnaHQgKGMpIDIwMDUsIDIwMDYgSUJNIENvcnBvcmF0aW9uIGFuZCBvdGhlcnMuCisgKiBBbGwgcmlnaHRzIHJlc2VydmVkLiBUaGlzIHByb2dyYW0gYW5kIHRoZSBhY2NvbXBhbnlpbmcgbWF0ZXJpYWxzCisgKiBhcmUgbWFkZSBhdmFpbGFibGUgdW5kZXIgdGhlIHRlcm1zIG9mIHRoZSBFY2xpcHNlIFB1YmxpYyBMaWNlbnNlIHYxLjAKKyAqIHdoaWNoIGFjY29tcGFuaWVzIHRoaXMgZGlzdHJpYnV0aW9uLCBhbmQgaXMgYXZhaWxhYmxlIGF0CisgKiBodHRwOi8vd3d3LmVjbGlwc2Uub3JnL2xlZ2FsL2VwbC12MTAuaHRtbAorICoKKyAqIENvbnRyaWJ1dG9yczoKKyAqICAgICBJQk0gQ29ycG9yYXRpb24gLSBJbml0aWFsIEFQSSBhbmQgaW1wbGVtZW50YXRpb24KKyAqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqLworcGFja2FnZSBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUuaW50ZXJuYWwuZmxhdDsKKworaW1wb3J0IGphdmEuaW8uRmlsZTsKKworaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucmVzb3VyY2VzLklDb250YWluZXI7CitpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5yZXNvdXJjZXMuSUZvbGRlcjsKK2ltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJlc291cmNlcy5JUmVzb3VyY2U7CitpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5ydW50aW1lLklQYXRoOworCisvKioKKyAqIEFuIGltcGxlbWVudGF0aW9uIG9mIHtAbGluayBJRmxhdEZvbGRlcn0gZm9yIHBoeXNpY2FsIGZvbGRlcnMgb24gZGlzayBvciBpbiB0aGUKKyAqIHdvcmtzcGFjZS4KKyAqLworcHVibGljIGNsYXNzIEZsYXRGb2xkZXIgZXh0ZW5kcyBGbGF0UmVzb3VyY2UgaW1wbGVtZW50cyBJRmxhdEZvbGRlciB7CisJcHJpdmF0ZSBzdGF0aWMgZmluYWwgRmxhdFJlc291cmNlW10gRU1QVFlfUkVTT1VSQ0VfQVJSQVkgPSBuZXcgRmxhdFJlc291cmNlWzBdOworCisJcHJpdmF0ZSBJQ29udGFpbmVyIGNvbnRhaW5lcjsKKwlwcml2YXRlIFN0cmluZyBuYW1lOworCXByaXZhdGUgSVBhdGggcGF0aDsKKwlwcml2YXRlIElGbGF0UmVzb3VyY2VbXSBtZW1iZXJzOworCisJLyoqCisJICogQ3JlYXRlcyBhIG1vZHVsZSBmb2xkZXIuCisJICogCisJICogQHBhcmFtIGNvbnRhaW5lciB0aGUgY29udGFpbmVyLCBvciA8Y29kZT5udWxsPC9jb2RlPiBmb3IgdW5rbm93biBjb250YWluZXIKKwkgKiBAcGFyYW0gbmFtZSBhIG5hbWUKKwkgKiBAcGFyYW0gcGF0aCB0aGUgbW9kdWxlIHJlbGF0aXZlIHBhdGggdG8gdGhlIGZvbGRlcgorCSAqLworCXB1YmxpYyBGbGF0Rm9sZGVyKElDb250YWluZXIgY29udGFpbmVyLCBTdHJpbmcgbmFtZSwgSVBhdGggcGF0aCkgeworCQlpZiAobmFtZSA9PSBudWxsKQorCQkJdGhyb3cgbmV3IElsbGVnYWxBcmd1bWVudEV4Y2VwdGlvbigpOworCQl0aGlzLmNvbnRhaW5lciA9IGNvbnRhaW5lcjsKKwkJdGhpcy5uYW1lID0gbmFtZTsKKwkJdGhpcy5wYXRoID0gcGF0aDsKKwl9CisKKwkvKioKKwkgKiBTZXRzIHRoZSBtZW1iZXJzIChjb250ZW50cykgb2YgdGhpcyBmb2xkZXIuCisJICogCisJICogQHBhcmFtIG1lbWJlcnMgdGhlIG1lbWJlcnMKKwkgKi8KKwlwdWJsaWMgdm9pZCBzZXRNZW1iZXJzKElGbGF0UmVzb3VyY2VbXSBtZW1iZXJzKSB7CisJCXRoaXMubWVtYmVycyA9IG1lbWJlcnM7CisJfQorCisJLyogKG5vbi1KYXZhZG9jKQorCSAqIEBzZWUgb3JnLmVjbGlwc2Uud3N0LnNlcnZlci5jb3JlLm1vZGVsLklNb2R1bGVSZXNvdXJjZSNnZXRNb2R1bGVSZWxhdGl2ZVBhdGgoKQorCSAqLworCXB1YmxpYyBJUGF0aCBnZXRNb2R1bGVSZWxhdGl2ZVBhdGgoKSB7CisJCXJldHVybiBwYXRoOworCX0KKworCS8qIChub24tSmF2YWRvYykKKwkgKiBAc2VlIG9yZy5lY2xpcHNlLndzdC5zZXJ2ZXIuY29yZS5tb2RlbC5JTW9kdWxlUmVzb3VyY2UjZ2V0TmFtZSgpCisJICovCisJcHVibGljIFN0cmluZyBnZXROYW1lKCkgeworCQlyZXR1cm4gbmFtZTsKKwl9CisKKwkvKiAobm9uLUphdmFkb2MpCisJICogQHNlZSBvcmcuZWNsaXBzZS53c3Quc2VydmVyLmNvcmUubW9kZWwuSU1vZHVsZUZvbGRlciNtZW1iZXJzKCkKKwkgKi8KKwlwdWJsaWMgSUZsYXRSZXNvdXJjZVtdIG1lbWJlcnMoKSB7CisJCWlmIChtZW1iZXJzID09IG51bGwpCisJCQlyZXR1cm4gRU1QVFlfUkVTT1VSQ0VfQVJSQVk7CisJCXJldHVybiBtZW1iZXJzOworCX0KKworCXB1YmxpYyBib29sZWFuIGVxdWFscyhPYmplY3Qgb2JqKSB7CisJCWlmIChvYmogPT0gdGhpcykKKwkJCXJldHVybiB0cnVlOworCQkKKwkJaWYgKCEob2JqIGluc3RhbmNlb2YgRmxhdEZvbGRlcikpCisJCQlyZXR1cm4gZmFsc2U7CisJCQorCQlGbGF0Rm9sZGVyIG1mID0gKEZsYXRGb2xkZXIpIG9iajsKKwkJaWYgKCFuYW1lLmVxdWFscyhtZi5uYW1lKSkKKwkJCXJldHVybiBmYWxzZTsKKwkJaWYgKCFwYXRoLmVxdWFscyhtZi5wYXRoKSkKKwkJCXJldHVybiBmYWxzZTsKKwkJcmV0dXJuIHRydWU7CisJfQorCisJcHVibGljIGludCBoYXNoQ29kZSgpIHsKKwkJcmV0dXJuIG5hbWUuaGFzaENvZGUoKSAqIDM3ICsgcGF0aC5oYXNoQ29kZSgpOworCX0KKworCXB1YmxpYyBPYmplY3QgZ2V0QWRhcHRlcihDbGFzcyBjbCkgeworCQlpZiAoY29udGFpbmVyICE9IG51bGwpIHsKKwkJCWlmIChJQ29udGFpbmVyLmNsYXNzLmVxdWFscyhjbCkgfHwgSUZvbGRlci5jbGFzcy5lcXVhbHMoY2wpIHx8IElSZXNvdXJjZS5jbGFzcy5lcXVhbHMoY2wpKQorCQkJCXJldHVybiBjb250YWluZXI7CisJCQlpZiggRmlsZS5jbGFzcy5lcXVhbHMoY2wpKQorCQkJCXJldHVybiBjb250YWluZXIuZ2V0TG9jYXRpb24oKS50b0ZpbGUoKTsKKwkJfQorCQlyZXR1cm4gbnVsbDsKKwl9CisKKwlwdWJsaWMgU3RyaW5nIHRvU3RyaW5nKCkgeworCQlyZXR1cm4gIkRlcGxveWFibGVGb2xkZXIgWyIgKyBuYW1lICsgIiwgIiArIHBhdGggKyAiXSI7CisJfQorfQpcIE5vIG5ld2xpbmUgYXQgZW5kIG9mIGZpbGUKZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlL21vZHVsZWNvcmUtc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vY29tcG9uZW50Y29yZS9pbnRlcm5hbC9mbGF0L0ZsYXRSZXNvdXJjZS5qYXZhIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUvbW9kdWxlY29yZS1zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9jb21wb25lbnRjb3JlL2ludGVybmFsL2ZsYXQvRmxhdFJlc291cmNlLmphdmEKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uZmY2ZjE3NAotLS0gL2Rldi9udWxsCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlL21vZHVsZWNvcmUtc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vY29tcG9uZW50Y29yZS9pbnRlcm5hbC9mbGF0L0ZsYXRSZXNvdXJjZS5qYXZhCkBAIC0wLDAgKzEsMzAgQEAKKy8qKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqCisgKiBDb3B5cmlnaHQgKGMpIDIwMDUsIDIwMDYgSUJNIENvcnBvcmF0aW9uIGFuZCBvdGhlcnMuCisgKiBBbGwgcmlnaHRzIHJlc2VydmVkLiBUaGlzIHByb2dyYW0gYW5kIHRoZSBhY2NvbXBhbnlpbmcgbWF0ZXJpYWxzCisgKiBhcmUgbWFkZSBhdmFpbGFibGUgdW5kZXIgdGhlIHRlcm1zIG9mIHRoZSBFY2xpcHNlIFB1YmxpYyBMaWNlbnNlIHYxLjAKKyAqIHdoaWNoIGFjY29tcGFuaWVzIHRoaXMgZGlzdHJpYnV0aW9uLCBhbmQgaXMgYXZhaWxhYmxlIGF0CisgKiBodHRwOi8vd3d3LmVjbGlwc2Uub3JnL2xlZ2FsL2VwbC12MTAuaHRtbAorICoKKyAqIENvbnRyaWJ1dG9yczoKKyAqICAgICBJQk0gQ29ycG9yYXRpb24gLSBJbml0aWFsIEFQSSBhbmQgaW1wbGVtZW50YXRpb24KKyAqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqLworcGFja2FnZSBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUuaW50ZXJuYWwuZmxhdDsKKworaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucnVudGltZS5JQWRhcHRhYmxlOworaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucnVudGltZS5JUGF0aDsKKworcHVibGljIGFic3RyYWN0IGNsYXNzIEZsYXRSZXNvdXJjZSBpbXBsZW1lbnRzIElGbGF0UmVzb3VyY2UsIElBZGFwdGFibGUgeworCS8qKgorCSAqIFJldHVybnMgdGhlIG1vZHVsZSByZWxhdGl2ZSBwYXRoIHRvIHRoaXMgcmVzb3VyY2UuCisJICogCisJICogQHJldHVybiB0aGUgbW9kdWxlIHJlbGF0aXZlIHBhdGggdG8gdGhpcyByZXNvdXJjZQorCSAqLworCXB1YmxpYyBhYnN0cmFjdCBJUGF0aCBnZXRNb2R1bGVSZWxhdGl2ZVBhdGgoKTsKKworCS8qKgorCSAqIFJldHVybnMgdGhlIG5hbWUgb2YgdGhpcyByZXNvdXJjZS4KKwkgKiAKKwkgKiBAcmV0dXJuIHRoZSBuYW1lIG9mIHRoaXMgcmVzb3VyY2UKKwkgKi8KKwlwdWJsaWMgYWJzdHJhY3QgU3RyaW5nIGdldE5hbWUoKTsKK30KZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlL21vZHVsZWNvcmUtc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vY29tcG9uZW50Y29yZS9pbnRlcm5hbC9mbGF0L0ZsYXRWaXJ0dWFsQ29tcG9uZW50LmphdmEgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS9tb2R1bGVjb3JlLXNyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2NvbXBvbmVudGNvcmUvaW50ZXJuYWwvZmxhdC9GbGF0VmlydHVhbENvbXBvbmVudC5qYXZhCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLjI5OWM1YjkKLS0tIC9kZXYvbnVsbAorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS9tb2R1bGVjb3JlLXNyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2NvbXBvbmVudGNvcmUvaW50ZXJuYWwvZmxhdC9GbGF0VmlydHVhbENvbXBvbmVudC5qYXZhCkBAIC0wLDAgKzEsMzU5IEBACisvKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKgorICogQ29weXJpZ2h0IChjKSAyMDA5IFJlZCBIYXQgYW5kIG90aGVycy4KKyAqIEFsbCByaWdodHMgcmVzZXJ2ZWQuIFRoaXMgcHJvZ3JhbSBhbmQgdGhlIGFjY29tcGFueWluZyBtYXRlcmlhbHMKKyAqIGFyZSBtYWRlIGF2YWlsYWJsZSB1bmRlciB0aGUgdGVybXMgb2YgdGhlIEVjbGlwc2UgUHVibGljIExpY2Vuc2UgdjEuMAorICogd2hpY2ggYWNjb21wYW5pZXMgdGhpcyBkaXN0cmlidXRpb24sIGFuZCBpcyBhdmFpbGFibGUgYXQKKyAqIGh0dHA6Ly93d3cuZWNsaXBzZS5vcmcvbGVnYWwvZXBsLXYxMC5odG1sCisgKgorICogQ29udHJpYnV0b3JzOgorICogICAgIFJlZCBIYXQgLSBJbml0aWFsIEFQSSBhbmQgaW1wbGVtZW50YXRpb24KKyAqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqLworcGFja2FnZSBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUuaW50ZXJuYWwuZmxhdDsKKworaW1wb3J0IGphdmEuaW8uRmlsZTsKK2ltcG9ydCBqYXZhLnV0aWwuQXJyYXlMaXN0OworaW1wb3J0IGphdmEudXRpbC5IYXNoTWFwOworaW1wb3J0IGphdmEudXRpbC5MaXN0OworaW1wb3J0IGphdmEudXRpbC5NYXA7CisKK2ltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJlc291cmNlcy5JQ29udGFpbmVyOworaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucmVzb3VyY2VzLklGaWxlOworaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucnVudGltZS5Db3JlRXhjZXB0aW9uOworaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucnVudGltZS5JUGF0aDsKK2ltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJ1bnRpbWUuUGF0aDsKK2ltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUuaW50ZXJuYWwuRGVwZW5kZW5jeVR5cGU7CitpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb21wb25lbnRjb3JlLmludGVybmFsLmZsYXQuVmlydHVhbENvbXBvbmVudEZsYXR0ZW5VdGlsaXR5LlNob3VsZEluY2x1ZGVVdGlsaXR5Q2FsbGJhY2s7CitpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb21wb25lbnRjb3JlLnJlc291cmNlcy5JVmlydHVhbENvbXBvbmVudDsKK2ltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUucmVzb3VyY2VzLklWaXJ0dWFsRm9sZGVyOworaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS5yZXNvdXJjZXMuSVZpcnR1YWxSZWZlcmVuY2U7CisKK3B1YmxpYyBjbGFzcyBGbGF0VmlydHVhbENvbXBvbmVudCBpbXBsZW1lbnRzIElGbGF0VmlydHVhbENvbXBvbmVudCwgU2hvdWxkSW5jbHVkZVV0aWxpdHlDYWxsYmFjayB7CisJCisJcHVibGljIHN0YXRpYyBjbGFzcyBGbGF0Q29tcG9uZW50VGFza01vZGVsIGV4dGVuZHMgSGFzaE1hcDxPYmplY3QsIE9iamVjdD4geworCQkJcHJpdmF0ZSBzdGF0aWMgZmluYWwgbG9uZyBzZXJpYWxWZXJzaW9uVUlEID0gMUw7CisJfQorCQorCS8qKgorCSAqIFRoZSBkYXRhbW9kZWwsIHdoaWNoIG1heSBjb250YWluIHByZWZlcmVuY2VzLCBzZXR0aW5ncywgb3Igb3RoZXIgZGF0YQorCSAqIHVzZWQgYnkgdGhlIHZhcmlvdXMgcGFydGljaXBhbnRzIHRvIGRldGVybWluZSBob3cgdG8gcHJvcGVybHkgCisJICogdHJhdmVyc2UgdGhpcyBjb21wb25lbnQuIAorCSAqLworCXByaXZhdGUgRmxhdENvbXBvbmVudFRhc2tNb2RlbCBkYXRhTW9kZWw7CisJCisJLyoqCisJICogVGhlIHJvb3QgY29tcG9uZW50IGJlaW5nIGZsYXR0ZW5lZC4gCisJICovCisJcHJpdmF0ZSBJVmlydHVhbENvbXBvbmVudCBjb21wb25lbnQ7CisJCisJLyoqCisJICogVGhlIGxpc3Qgb2YgcGFydGljaXBhbnRzIHRvIGVuZ2FnZSBpbiB0aGUgZmxhdHRlbmluZyBwcm9jZXNzLiAKKwkgKi8KKwlwcml2YXRlIElGbGF0dGVuUGFydGljaXBhbnRbXSBwYXJ0aWNpcGFudHM7CisKKwkvKioKKwkgKiBUaGUgbGlzdCBvZiBtZW1iZXIgcmVzb3VyY2VzIGZvciB0aGlzIGNvbXBvbmVudAorCSAqLworCXByaXZhdGUgTGlzdDxJRmxhdFJlc291cmNlPiBtZW1iZXJzID0gbnVsbDsKKwkKKwkvKioKKwkgKiBUaGUgbGlzdCBvZiBjaGlsZCBtb2R1bGVzIGZvciB0aGlzIGNvbXBvbmVudAorCSAqLworCXByaXZhdGUgTGlzdDxJQ2hpbGRNb2R1bGVSZWZlcmVuY2U+IGNoaWxkcmVuID0gbnVsbDsKKwkKKwkKKwlwdWJsaWMgRmxhdFZpcnR1YWxDb21wb25lbnQoSVZpcnR1YWxDb21wb25lbnQgY29tcG9uZW50KSB7CisJCXRoaXMoY29tcG9uZW50LCBuZXcgRmxhdENvbXBvbmVudFRhc2tNb2RlbCgpKTsKKwl9CisJCisJcHVibGljIEZsYXRWaXJ0dWFsQ29tcG9uZW50KElWaXJ0dWFsQ29tcG9uZW50IGNvbXBvbmVudCwgRmxhdENvbXBvbmVudFRhc2tNb2RlbCBkYXRhTW9kZWwpIHsKKwkJdGhpcy5jb21wb25lbnQgPSBjb21wb25lbnQ7CisJCXRoaXMuZGF0YU1vZGVsID0gZGF0YU1vZGVsOworCQlwYXJ0aWNpcGFudHMgPSBzZXRQYXJ0aWNpcGFudHMoKTsKKwkJZGF0YU1vZGVsLnB1dChFWFBPUlRfTU9ERUwsIHRoaXMpOworCX0KKwkKKwkvKioKKwkgKiBTZXQgdGhlIGxpc3Qgb2YgcGFydGljaXBhbnRzIGZvciB0aGlzIHZpcnR1YWwgY29tcG9uZW50LiAKKwkgKiBUaGlzIGlzIHB1bGxlZCBmcm9tIHRoZSBkYXRhbW9kZWwuIAorCSAqLworCXByb3RlY3RlZCBJRmxhdHRlblBhcnRpY2lwYW50W10gc2V0UGFydGljaXBhbnRzKCkgeworCQlPYmplY3QgbyA9IGRhdGFNb2RlbC5nZXQoUEFSVElDSVBBTlRfTElTVCk7CisJCWlmKCBvICE9IG51bGwgKSB7CisJCQlpZiggbyBpbnN0YW5jZW9mIElGbGF0dGVuUGFydGljaXBhbnQgKQorCQkJCXJldHVybiBuZXcgSUZsYXR0ZW5QYXJ0aWNpcGFudFtdIHsgKElGbGF0dGVuUGFydGljaXBhbnQpb307CisJCQlpZiggbyBpbnN0YW5jZW9mIElGbGF0dGVuUGFydGljaXBhbnRbXSkKKwkJCQlyZXR1cm4gKElGbGF0dGVuUGFydGljaXBhbnRbXSlvOworCQkJaWYoIG8gaW5zdGFuY2VvZiBMaXN0ICkgeworCQkJCUxpc3Q8SUZsYXR0ZW5QYXJ0aWNpcGFudD4gbCA9IChMaXN0PElGbGF0dGVuUGFydGljaXBhbnQ+KW87CisJCQkJcmV0dXJuIChJRmxhdHRlblBhcnRpY2lwYW50W10pIGwKKwkJCQkJCS50b0FycmF5KG5ldyBJRmxhdHRlblBhcnRpY2lwYW50W2wuc2l6ZSgpXSk7CisJCQl9CisJCX0KKwkJcmV0dXJuIG5ldyBJRmxhdHRlblBhcnRpY2lwYW50W117fTsKKwl9CisJCisJLyoKKwkgKiAobm9uLUphdmFkb2MpCisJICogQHNlZSBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUuaW50ZXJuYWwuZmxhdC5JRmxhdFZpcnR1YWxDb21wb25lbnQjZmV0Y2hSZXNvdXJjZXMoKQorCSAqLworCXB1YmxpYyBJRmxhdFJlc291cmNlW10gZmV0Y2hSZXNvdXJjZXMoKSB0aHJvd3MgQ29yZUV4Y2VwdGlvbiB7CisJCWlmKCBtZW1iZXJzID09IG51bGwpCisJCQljYWNoZVJlc291cmNlcygpOworCQlyZXR1cm4gKEZsYXRSZXNvdXJjZVtdKSBtZW1iZXJzLnRvQXJyYXkobmV3IEZsYXRSZXNvdXJjZVttZW1iZXJzLnNpemUoKV0pOworCX0KKwkKKwkvKgorCSAqIChub24tSmF2YWRvYykKKwkgKiBAc2VlIG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS5pbnRlcm5hbC5mbGF0LklGbGF0VmlydHVhbENvbXBvbmVudCNnZXRDaGlsZE1vZHVsZXMoKQorCSAqLworCXB1YmxpYyBJQ2hpbGRNb2R1bGVSZWZlcmVuY2VbXSBnZXRDaGlsZE1vZHVsZXMoKSB0aHJvd3MgQ29yZUV4Y2VwdGlvbiB7CisJCWlmKCBtZW1iZXJzID09IG51bGwgKQorCQkJY2FjaGVSZXNvdXJjZXMoKTsKKwkJcmV0dXJuIChDaGlsZE1vZHVsZVJlZmVyZW5jZVtdKSBjaGlsZHJlbi50b0FycmF5KG5ldyBDaGlsZE1vZHVsZVJlZmVyZW5jZVtjaGlsZHJlbi5zaXplKCldKTsKKwl9CisJCisJCisJcHJvdGVjdGVkIHZvaWQgY2FjaGVSZXNvdXJjZXMoKSB0aHJvd3MgQ29yZUV4Y2VwdGlvbiB7CisJCXJ1bkluaXRpYWxpemF0aW9ucygpOworCQlpZiggY2FuT3B0aW1pemUoKSkgeworCQkJb3B0aW1pemUobWVtYmVycywgY2hpbGRyZW4pOworCQl9IGVsc2UgeworCQkJdHJlZVdhbGsoKTsKKwkJCXJ1bkZpbmFsaXphdGlvbnMobWVtYmVycyk7CisJCX0KKwl9CisJCisJcHJvdGVjdGVkIHZvaWQgcnVuSW5pdGlhbGl6YXRpb25zKCkgeworCQltZW1iZXJzID0gbmV3IEFycmF5TGlzdDxJRmxhdFJlc291cmNlPigpOworCQljaGlsZHJlbiA9IG5ldyBBcnJheUxpc3Q8SUNoaWxkTW9kdWxlUmVmZXJlbmNlPigpOworCQlmb3IoIGludCBpID0gMDsgaSA8IHBhcnRpY2lwYW50cy5sZW5ndGg7IGkrKyApIHsKKwkJCXBhcnRpY2lwYW50c1tpXS5pbml0aWFsaXplKGNvbXBvbmVudCwgZGF0YU1vZGVsLCBtZW1iZXJzKTsKKwkJfQorCX0KKwkKKwlwcm90ZWN0ZWQgYm9vbGVhbiBjYW5PcHRpbWl6ZSgpIHsKKwkJZm9yKCBpbnQgaSA9IDA7IGkgPCBwYXJ0aWNpcGFudHMubGVuZ3RoOyBpKysgKSB7CisJCQlpZiggcGFydGljaXBhbnRzW2ldLmNhbk9wdGltaXplKGNvbXBvbmVudCwgZGF0YU1vZGVsKSkKKwkJCQlyZXR1cm4gdHJ1ZTsKKwkJfQorCQlyZXR1cm4gZmFsc2U7CisJfQorCisJcHJvdGVjdGVkIHZvaWQgb3B0aW1pemUoTGlzdDxJRmxhdFJlc291cmNlPiByZXNvdXJjZXMsIExpc3Q8SUNoaWxkTW9kdWxlUmVmZXJlbmNlPiBjaGlsZHJlbikgeworCQlmb3IoIGludCBpID0gMDsgaSA8IHBhcnRpY2lwYW50cy5sZW5ndGg7IGkrKyApIHsKKwkJCWlmKCBwYXJ0aWNpcGFudHNbaV0uY2FuT3B0aW1pemUoY29tcG9uZW50LCBkYXRhTW9kZWwpKSB7CisJCQkJcGFydGljaXBhbnRzW2ldLm9wdGltaXplKGNvbXBvbmVudCwgZGF0YU1vZGVsLCByZXNvdXJjZXMsIGNoaWxkcmVuKTsKKwkJCQlyZXR1cm47CisJCQl9CisJCX0KKwl9CisJCisJcHJvdGVjdGVkIHZvaWQgcnVuRmluYWxpemF0aW9ucyhMaXN0PElGbGF0UmVzb3VyY2U+IHJlc291cmNlcykgeworCQlmb3IoIGludCBpID0gMDsgaSA8IHBhcnRpY2lwYW50cy5sZW5ndGg7IGkrKyApIHsKKwkJCXBhcnRpY2lwYW50c1tpXS5maW5hbGl6ZShjb21wb25lbnQsIGRhdGFNb2RlbCwgcmVzb3VyY2VzKTsKKwkJfQorCX0KKwkKKwlwcm90ZWN0ZWQgdm9pZCB0cmVlV2FsaygpIHRocm93cyBDb3JlRXhjZXB0aW9uIHsKKwkJaWYgKGNvbXBvbmVudCAhPSBudWxsKSB7CisJCQlWaXJ0dWFsQ29tcG9uZW50RmxhdHRlblV0aWxpdHkgdXRpbCA9IG5ldyBWaXJ0dWFsQ29tcG9uZW50RmxhdHRlblV0aWxpdHkobWVtYmVycywgdGhpcyk7CisJCQlJVmlydHVhbEZvbGRlciB2Rm9sZGVyID0gY29tcG9uZW50LmdldFJvb3RGb2xkZXIoKTsKKwkJCQorCQkJLy8gYWN0dWFsbHkgd2FsayB0aGUgdHJlZQorCQkJdXRpbC5hZGRNZW1iZXJzKGNvbXBvbmVudCwgdkZvbGRlciwgUGF0aC5FTVBUWSk7CisKKwkJCS8vYWRkUmVsZXZhbnRPdXRwdXRGb2xkZXJzKCk7IC8vIHRvIGJlIGRvbmUgaW4gYSBwYXJ0aWNpcGFudCBsYXRlcgorCisJCQlhZGRDb25zdW1lZFJlZmVyZW5jZXModXRpbCwgY29tcG9uZW50LCBuZXcgUGF0aCgiIikpOworCQkJYWRkVXNlZFJlZmVyZW5jZXModXRpbCwgY29tcG9uZW50LCBuZXcgUGF0aCgiIikpOworCQl9CisJfQorCQorCS8qKgorCSAqIENvbnN1bWVkIHJlZmVyZW5jZXMgYXJlLCBieSBkZWZpbml0aW9uLCBjb25zdW1lZCwgYW5kIHNob3VsZCBub3QKKwkgKiBiZSBlbGlnaWJsZSB0byBiZSBleHBvc2VkIGFzIGNoaWxkIG1vZHVsZXMuIFRoZXkgYXJlIGNvbnN1bWVkIAorCSAqIGRpcmVjdGx5IGludG8gdGhlIG1vZHVsZSB0cmVlLiAKKwkgKiAKKwkgKiBUaGUgcmVmZXJlbmNlIGluIHF1ZXN0aW9uIG1heSBoYXZlIHJlZmVyZW5jZXMgb2YgaXRzIG93biwgYm90aAorCSAqIHVzZWQgYW5kIGNvbnN1bWVkLiBSZWZlcmVuY2VzIG9mIHRoZSBjaGlsZCB3aWxsIGJlIHRyZWF0ZWQKKwkgKiBhcyByZWZlcmVuY2VzIG9mIHRoZSBwYXJlbnQsIHdoZXRoZXIgY29uc3VtZWQgb3IgdXNlZC4gIAorCSAqIAorCSAqIEEga2V5IGRpZmZlcmVuY2UgaW4gdGhlIGhhbmRsaW5nIG9mIG5vbi1jaGlsZCBVU0VEIHJlZmVyZW5jZXMgCisJICogYXMgY29tcGFyZWQgdG8gQ09OU1VNRVMgaXMgdGhhdCBDT05TVU1FRCByZWZlcmVuY2VzIGhhdmUgdGhlaXIKKwkgKiBhcmNoaXZlTmFtZSAqaWdub3JlZCosIGFuZCBpdHMgY2hpbGQgbWVtYmVycyBhcmUgZGlyZWN0bHkgY29uc3VtZWQuIAorCSAqIEluIGNvbnRyYXN0LCBhIFVTRUQgbm9uLWNoaWxkIGtlZXBzIGl0cyBhcmNoaXZlTmFtZSBhcyB0aGUgZm9sZGVyIG5hbWUuIAorCSAqICAKKwkgKiBAcGFyYW0gdmMKKwkgKi8KKwlwcm90ZWN0ZWQgdm9pZCBhZGRDb25zdW1lZFJlZmVyZW5jZXMoVmlydHVhbENvbXBvbmVudEZsYXR0ZW5VdGlsaXR5IHV0aWwsIElWaXJ0dWFsQ29tcG9uZW50IHZjLCBJUGF0aCByb290KSB0aHJvd3MgQ29yZUV4Y2VwdGlvbiB7CisJCUxpc3QgY29uc3VtYWJsZU1lbWJlcnMgPSBuZXcgQXJyYXlMaXN0KCk7CisJCU1hcDxTdHJpbmcsIE9iamVjdD4gb3B0aW9ucyA9IG5ldyBIYXNoTWFwPFN0cmluZywgT2JqZWN0PigpOworCQlvcHRpb25zLnB1dChJVmlydHVhbENvbXBvbmVudC5SRVFVRVNURURfUkVGRVJFTkNFX1RZUEUsIElWaXJ0dWFsQ29tcG9uZW50LkZMQVRURU5BQkxFX1JFRkVSRU5DRVMpOworCQlJVmlydHVhbFJlZmVyZW5jZVtdIHJlZkNvbXBvbmVudHMgPSB2Yy5nZXRSZWZlcmVuY2VzKG9wdGlvbnMpOworICAgIAlmb3IgKGludCBpID0gMDsgaSA8IHJlZkNvbXBvbmVudHMubGVuZ3RoOyBpKyspIHsKKyAgICAJCUlWaXJ0dWFsUmVmZXJlbmNlIHJlZmVyZW5jZSA9IHJlZkNvbXBvbmVudHNbaV07CisgICAgCQlpZiAocmVmZXJlbmNlICE9IG51bGwgJiYgcmVmZXJlbmNlLmdldERlcGVuZGVuY3lUeXBlKCk9PUlWaXJ0dWFsUmVmZXJlbmNlLkRFUEVOREVOQ1lfVFlQRV9DT05TVU1FUykgeworCQkJCWNvbnN1bWVDb21wb25lbnQodXRpbCwgcm9vdCwgcmVmZXJlbmNlKTsKKyAgICAJCX0KKyAgICAJfQorCX0KKworCXByb3RlY3RlZCB2b2lkIGNvbnN1bWVDb21wb25lbnQoVmlydHVhbENvbXBvbmVudEZsYXR0ZW5VdGlsaXR5IHV0aWwsIElQYXRoIHJvb3QsIElWaXJ0dWFsUmVmZXJlbmNlIHJlZmVyZW5jZSkgdGhyb3dzIENvcmVFeGNlcHRpb24geworCQlJVmlydHVhbENvbXBvbmVudCBjb25zdW1lZENvbXBvbmVudCA9IHJlZmVyZW5jZS5nZXRSZWZlcmVuY2VkQ29tcG9uZW50KCk7CisJCWlmIChjb25zdW1lZENvbXBvbmVudC5nZXRSb290Rm9sZGVyKCkhPW51bGwpIHsKKwkJCUlWaXJ0dWFsRm9sZGVyIHZGb2xkZXIgPSBjb25zdW1lZENvbXBvbmVudC5nZXRSb290Rm9sZGVyKCk7CisJCQl1dGlsLmFkZE1lbWJlcnMoY29uc3VtZWRDb21wb25lbnQsIHZGb2xkZXIsIHJvb3QuYXBwZW5kKHJlZmVyZW5jZS5nZXRSdW50aW1lUGF0aCgpLm1ha2VSZWxhdGl2ZSgpKSk7CisJCQlhZGRDb25zdW1lZFJlZmVyZW5jZXModXRpbCwgY29uc3VtZWRDb21wb25lbnQsIHJvb3QuYXBwZW5kKHJlZmVyZW5jZS5nZXRSdW50aW1lUGF0aCgpLm1ha2VSZWxhdGl2ZSgpKSk7CisJCQlhZGRVc2VkUmVmZXJlbmNlcyh1dGlsLCBjb25zdW1lZENvbXBvbmVudCwgcm9vdC5hcHBlbmQocmVmZXJlbmNlLmdldFJ1bnRpbWVQYXRoKCkubWFrZVJlbGF0aXZlKCkpKTsKKwkJfQorCX0KKwkKKwkvKioKKwkgKiBUaGlzIGNoZWNrcyB0byBzZWUgaWYgYW55IGV4cG9ydGFibGUgZmlsZSBpcyBhY3R1YWxseSBhIGNoaWxkIG1vZHVsZS4KKwkgKiBDaGlsZHJlbiBtb2R1bGVzIHdpbGwgYmUgZXhwb3NlZCB2aWEgdGhlIGdldENoaWxkTW9kdWxlcygpIG1ldGhvZC4gCisJICovCisJcHVibGljIGJvb2xlYW4gc2hvdWxkQWRkQ29tcG9uZW50RmlsZShJVmlydHVhbENvbXBvbmVudCBjdXJyZW50LCBJRmxhdEZpbGUgZmlsZSkgeworCQlmb3IoIGludCBpID0gMDsgaSA8IHBhcnRpY2lwYW50cy5sZW5ndGg7IGkrKyApIHsKKwkJCWlmKCBwYXJ0aWNpcGFudHNbaV0uaXNDaGlsZE1vZHVsZShjb21wb25lbnQsIGRhdGFNb2RlbCwgZmlsZSkpIHsKKwkJCQlDaGlsZE1vZHVsZVJlZmVyZW5jZSBjaGlsZCA9IG5ldyBDaGlsZE1vZHVsZVJlZmVyZW5jZShjdXJyZW50LmdldFByb2plY3QoKSwgZmlsZSk7CisJCQkJY2hpbGRyZW4uYWRkKGNoaWxkKTsgCisJCQkJcmV0dXJuIGZhbHNlOworCQkJfSBlbHNlIGlmKCAhcGFydGljaXBhbnRzW2ldLnNob3VsZEFkZEV4cG9ydGFibGVGaWxlKGNvbXBvbmVudCwgY3VycmVudCwgZGF0YU1vZGVsLCBmaWxlKSkKKwkJCQlyZXR1cm4gZmFsc2U7CisJCX0KKwkJcmV0dXJuIHRydWU7CisJfQorCisJcHJvdGVjdGVkIHZvaWQgYWRkVXNlZFJlZmVyZW5jZXMoVmlydHVhbENvbXBvbmVudEZsYXR0ZW5VdGlsaXR5IHV0aWwsIElWaXJ0dWFsQ29tcG9uZW50IHZjLCBJUGF0aCByb290KSB0aHJvd3MgQ29yZUV4Y2VwdGlvbiB7CisJCU1hcDxTdHJpbmcsIE9iamVjdD4gb3B0aW9ucyA9IG5ldyBIYXNoTWFwPFN0cmluZywgT2JqZWN0PigpOworCQlvcHRpb25zLnB1dChJVmlydHVhbENvbXBvbmVudC5SRVFVRVNURURfUkVGRVJFTkNFX1RZUEUsIElWaXJ0dWFsQ29tcG9uZW50LkZMQVRURU5BQkxFX1JFRkVSRU5DRVMpOworCQlJVmlydHVhbFJlZmVyZW5jZVtdIGFsbFJlZmVyZW5jZXMgPSB2Yy5nZXRSZWZlcmVuY2VzKG9wdGlvbnMpOworICAgIAlmb3IgKGludCBpID0gMDsgaSA8IGFsbFJlZmVyZW5jZXMubGVuZ3RoOyBpKyspIHsKKyAgICAJCUlWaXJ0dWFsUmVmZXJlbmNlIHJlZmVyZW5jZSA9IGFsbFJlZmVyZW5jZXNbaV07CisJCQlJVmlydHVhbENvbXBvbmVudCB2aXJ0dWFsQ29tcCA9IHJlZmVyZW5jZS5nZXRSZWZlcmVuY2VkQ29tcG9uZW50KCk7CisJCQlpZiAocmVmZXJlbmNlLmdldERlcGVuZGVuY3lUeXBlKCkgPT0gRGVwZW5kZW5jeVR5cGUuVVNFUyApIHsKKwkJCQlpZiggc2hvdWxkSWdub3JlUmVmZXJlbmNlKHJlZmVyZW5jZSkpCisJCQkJCWNvbnRpbnVlOworCQkJCQorCQkJCWlmKCAhaXNDaGlsZE1vZHVsZShyZWZlcmVuY2UpKSB7CisJCQkJCWFkZE5vbkNoaWxkVXNlZFJlZmVyZW5jZSh1dGlsLCB2YywgcmVmZXJlbmNlLCByb290LmFwcGVuZChyZWZlcmVuY2UuZ2V0UnVudGltZVBhdGgoKSkpOworCQkJCX0gZWxzZSB7CisJCQkJCUNoaWxkTW9kdWxlUmVmZXJlbmNlIGNtID0gbmV3IENoaWxkTW9kdWxlUmVmZXJlbmNlKHJlZmVyZW5jZSwgcm9vdCk7CisJCQkJCUxpc3Q8SUNoaWxkTW9kdWxlUmVmZXJlbmNlPiBkdXBsaWNhdGVzID0gbmV3IEFycmF5TGlzdCgpOworCQkJCQlmb3IoIElDaGlsZE1vZHVsZVJlZmVyZW5jZSB0bXAgOiBjaGlsZHJlbiApIHsKKwkJCQkJCWlmKHRtcC5nZXRSZWxhdGl2ZVVSSSgpLmVxdWFscyhjbS5nZXRSZWxhdGl2ZVVSSSgpKSkKKwkJCQkJCQlkdXBsaWNhdGVzLmFkZCh0bXApOworCQkJCQl9CisJCQkJCWNoaWxkcmVuLnJlbW92ZUFsbChkdXBsaWNhdGVzKTsKKwkJCQkJY2hpbGRyZW4uYWRkKGNtKTsKKwkJCQl9CisJCQl9CisgICAgCX0KKwl9CisJCisJLyoqCisJICogU2hvdWxkIHdlIGV4cG9zZSB0aGlzIHVzZWQgcmVmZXJlbmNlIGFzIGEgbWVtYmVyIGZpbGU/CisJICogCisJICogQHBhcmFtIGN1cnJlbnRDb21wb25lbnQgdGhlIGN1cnJlbnQgY29tcG9uZW50IHdlJ3JlIHRyYXZlcnNpbmcKKwkgKiBAcmV0dXJuIHRydWUgaWYgaXQncyBhIG1lbWJlciBmaWxlLCBmYWxzZSBpZiBpdCdzIGEgY2hpbGQgbW9kdWxlCisJICovCisJcHJvdGVjdGVkIGJvb2xlYW4gaXNDaGlsZE1vZHVsZShJVmlydHVhbFJlZmVyZW5jZSByZWZlcmVuY2VkQ29tcG9uZW50KSB7CisJCWZvciggaW50IGkgPSAwOyBpIDwgcGFydGljaXBhbnRzLmxlbmd0aDsgaSsrICkgeworCQkJaWYoIHBhcnRpY2lwYW50c1tpXS5pc0NoaWxkTW9kdWxlKGNvbXBvbmVudCwgcmVmZXJlbmNlZENvbXBvbmVudCwgZGF0YU1vZGVsKSkKKwkJCQlyZXR1cm4gdHJ1ZTsKKwkJfQorCQlyZXR1cm4gZmFsc2U7CisJfQorCisJcHJvdGVjdGVkIGJvb2xlYW4gc2hvdWxkSWdub3JlUmVmZXJlbmNlKElWaXJ0dWFsUmVmZXJlbmNlIHJlZmVyZW5jZWRDb21wb25lbnQpIHsKKwkJZm9yKCBpbnQgaSA9IDA7IGkgPCBwYXJ0aWNpcGFudHMubGVuZ3RoOyBpKysgKSB7CisJCQlpZiggcGFydGljaXBhbnRzW2ldLnNob3VsZElnbm9yZVJlZmVyZW5jZShjb21wb25lbnQsIHJlZmVyZW5jZWRDb21wb25lbnQsIGRhdGFNb2RlbCkpCisJCQkJcmV0dXJuIHRydWU7CisJCX0KKwkJcmV0dXJuIGZhbHNlOworCX0KKworCXByb3RlY3RlZCB2b2lkIGFkZE5vbkNoaWxkVXNlZFJlZmVyZW5jZShWaXJ0dWFsQ29tcG9uZW50RmxhdHRlblV0aWxpdHkgdXRpbCwgSVZpcnR1YWxDb21wb25lbnQgcGFyZW50LCAKKwkJCUlWaXJ0dWFsUmVmZXJlbmNlIHJlZmVyZW5jZSwgSVBhdGggcnVudGltZVBhdGgpIHRocm93cyBDb3JlRXhjZXB0aW9uIHsKKwkJaWYoIHJlZmVyZW5jZS5nZXRSZWZlcmVuY2VkQ29tcG9uZW50KCkuaXNCaW5hcnkoKSkgeworCQkJaGFuZGxlTm9uQ2hpbGRVc2VkQmluYXJ5UmVmZXJlbmNlKHV0aWwsIHBhcmVudCwgcmVmZXJlbmNlLCBydW50aW1lUGF0aCk7CisJCX0gZWxzZSAvKiAhdmlydHVhbENvbXAuaXNCaW5hcnkoKSAqLyB7CisJCQkvKgorCQkJICogdXNlZCByZWZlcmVuY2VzIHRvIG5vbi1iaW5hcnkgY29tcG9uZW50cyB0aGF0IGFyZSBOT1QgY2hpbGQgbW9kdWxlcy4KKwkJCSAqIFRoZXNlIHNob3VsZCBiZSAnY29uc3VtZWQnIGJ1dCBtYWludGFpbiB0aGVpciBuYW1lCisJCQkgKiBBcyBvZiBub3cgSSBkb24ndCBiZWxpZXZlIHRoZXJlIGFyZSBhbnkgc3VjaCBpbnN0YW5jZXMgb2YgdGhpcy4KKwkJCSAqIEkgYWxzbyBiZWxpZXZlIGluIG1vc3QgY2FzZXMsIHRoaXMgcHJvYmFibHkgaXMgYSBjaGlsZCBtb2R1bGUgdGhhdCAKKwkJCSAqIHRoZSBwYXJlbnQganVzdCBkb2Vzbid0IGtub3cgYWJvdXQuCisJCQkgKiAKKwkJCSAqIEV4YW1wbGU6IEVhciBQcm9qZWN0IGNvbnN1bWVzIEVTQiBwcm9qZWN0LCBFYXIgcHJvamVjdCBkb2VzIG5vdCAKKwkJCSAqIHJlY29nbml6ZSBFU0IgcHJvamVjdCBhcyBhIGNoaWxkIEhvd2V2ZXIsIGlmIHRoZSBzZXJ2ZXIgYWRhcHRlciAKKwkJCSAqIGNhbiB1c2UgbmVzdGVkIGV4cGxvZGVkIGRlcGxveW1lbnRzIChmb2xkZXJzIGluc3RlYWQgb2YgemlwcyksCisJCQkgKiB0aGVuIHRoaXMgd2lsbCBzdGlsbCB3b3JrLiAKKwkJCSAqIAorCQkJICogVE9ETyBJbnZlc3RpZ2F0ZSAvIERpc2N1c3MKKwkJCSAqLworCQkJdXRpbC5hZGRNZW1iZXJzKHJlZmVyZW5jZS5nZXRSZWZlcmVuY2VkQ29tcG9uZW50KCksIHJlZmVyZW5jZS5nZXRSZWZlcmVuY2VkQ29tcG9uZW50KCkuZ2V0Um9vdEZvbGRlcigpLCAKKwkJCQkJcnVudGltZVBhdGguYXBwZW5kKHJlZmVyZW5jZS5nZXRBcmNoaXZlTmFtZSgpKSk7CisJCX0KKwl9CisJCisJcHJvdGVjdGVkIHZvaWQgaGFuZGxlTm9uQ2hpbGRVc2VkQmluYXJ5UmVmZXJlbmNlKFZpcnR1YWxDb21wb25lbnRGbGF0dGVuVXRpbGl0eSB1dGlsLCBJVmlydHVhbENvbXBvbmVudCBwYXJlbnQsIAorCQkJSVZpcnR1YWxSZWZlcmVuY2UgcmVmZXJlbmNlLCBJUGF0aCBydW50aW1lUGF0aCkgdGhyb3dzIENvcmVFeGNlcHRpb24geworCQkvLyBCaW5hcnkgdXNlZCByZWZlcmVuY2VzIG11c3QgYmUgYWRkZWQgYXMgYSBzaW5nbGUgZmlsZSB1bmxlc3MgdGhleSdyZSBjaGlsZCBtb2R1bGVzCisJCWZpbmFsIFN0cmluZyBhcmNoaXZlTmFtZTIgPSByZWZlcmVuY2UuZ2V0QXJjaGl2ZU5hbWUoKTsKKwkJZmluYWwgU3RyaW5nIGFyY2hpdmVOYW1lID0gbmV3IFBhdGgoYXJjaGl2ZU5hbWUyKS5sYXN0U2VnbWVudCgpOworCQlmaW5hbCBJVmlydHVhbENvbXBvbmVudCB2aXJ0dWFsQ29tcCA9IHJlZmVyZW5jZS5nZXRSZWZlcmVuY2VkQ29tcG9uZW50KCk7CisJCUZsYXRGaWxlIG1mID0gbnVsbDsKKwkJSUZpbGUgaWZpbGUgPSAoSUZpbGUpdmlydHVhbENvbXAuZ2V0QWRhcHRlcihJRmlsZS5jbGFzcyk7CisJCWlmKCBpZmlsZSAhPSBudWxsICkgeworCQkJU3RyaW5nIG5hbWUgPSBudWxsICE9IGFyY2hpdmVOYW1lID8gYXJjaGl2ZU5hbWUgOiBpZmlsZS5nZXROYW1lKCk7CisJCQltZiA9IG5ldyBGbGF0RmlsZShpZmlsZSwgbmFtZSwgcnVudGltZVBhdGgubWFrZVJlbGF0aXZlKCkpOworCQl9IGVsc2UgeworCQkJRmlsZSBleHRGaWxlID0gKEZpbGUpdmlydHVhbENvbXAuZ2V0QWRhcHRlcihGaWxlLmNsYXNzKTsKKwkJCWlmKCBleHRGaWxlICE9IG51bGwgKSB7CisJCQkJU3RyaW5nIG5hbWUgPSBudWxsICE9IGFyY2hpdmVOYW1lID8gYXJjaGl2ZU5hbWUgOiBleHRGaWxlLmdldE5hbWUoKTsKKwkJCQltZiA9IG5ldyBGbGF0RmlsZShleHRGaWxlLCBuYW1lLCBydW50aW1lUGF0aC5tYWtlUmVsYXRpdmUoKSk7CisJCQl9CisJCX0KKwkJCisJCWlmKCBtZiAhPSBudWxsICkgeworCQkJSUZsYXRSZXNvdXJjZSBtb2R1bGVQYXJlbnQgPSBWaXJ0dWFsQ29tcG9uZW50RmxhdHRlblV0aWxpdHkuZ2V0RXhpc3RpbmdNb2R1bGVSZXNvdXJjZShtZW1iZXJzLCBtZi5nZXRNb2R1bGVSZWxhdGl2ZVBhdGgoKSk7CisJCQlpZiAobW9kdWxlUGFyZW50ICE9IG51bGwgJiYgbW9kdWxlUGFyZW50IGluc3RhbmNlb2YgSUZsYXRGb2xkZXIpIHsKKwkJCQlJRmxhdFJlc291cmNlW10gbWZfbWVtYmVycyA9ICgoSUZsYXRGb2xkZXIpbW9kdWxlUGFyZW50KS5tZW1iZXJzKCk7CisJCQkJZm9yIChpbnQgaSA9IDA7IGkgPCBtZl9tZW1iZXJzLmxlbmd0aDsgaSsrKSB7CisJCQkJCWlmIChtZl9tZW1iZXJzW2ldLmdldE5hbWUoKS5lcXVhbHMobWYuZ2V0TmFtZSgpKSkKKwkJCQkJCXJldHVybjsKKwkJCQl9CisJCQkJVmlydHVhbENvbXBvbmVudEZsYXR0ZW5VdGlsaXR5LmFkZE1lbWJlcnNUb01vZHVsZUZvbGRlcigoSUZsYXRGb2xkZXIpbW9kdWxlUGFyZW50LCBuZXcgRmxhdFJlc291cmNlW117bWZ9KTsKKwkJCX0gZWxzZSB7CisJCQkJaWYoIHNob3VsZEFkZEV4cG9ydGFibGVGaWxlKHZpcnR1YWxDb21wLCBtZikpIHsKKwkJCQkJaWYgKG1mLmdldE1vZHVsZVJlbGF0aXZlUGF0aCgpLmlzRW1wdHkoKSkgeworCQkJCQkJZm9yKCBJRmxhdFJlc291cmNlIHRtcCA6IG1lbWJlcnMpIAorCQkJCQkJCWlmKCB0bXAuZ2V0TmFtZSgpLmVxdWFscyhtZi5nZXROYW1lKCkpKQorCQkJCQkJCQlyZXR1cm47CisJCQkJCQltZW1iZXJzLmFkZChtZik7CisJCQkJCX0gZWxzZSB7CisJCQkJCQlpZiAobW9kdWxlUGFyZW50ID09IG51bGwpIHsKKwkJCQkJCQltb2R1bGVQYXJlbnQgPSBWaXJ0dWFsQ29tcG9uZW50RmxhdHRlblV0aWxpdHkuZW5zdXJlUGFyZW50RXhpc3RzKG1lbWJlcnMsIG1mLmdldE1vZHVsZVJlbGF0aXZlUGF0aCgpLCAoSUNvbnRhaW5lcilwYXJlbnQuZ2V0Um9vdEZvbGRlcigpLmdldFVuZGVybHlpbmdSZXNvdXJjZSgpKTsKKwkJCQkJCX0KKwkJCQkJCVZpcnR1YWxDb21wb25lbnRGbGF0dGVuVXRpbGl0eS5hZGRNZW1iZXJzVG9Nb2R1bGVGb2xkZXIoKElGbGF0Rm9sZGVyKW1vZHVsZVBhcmVudCwgbmV3IEZsYXRSZXNvdXJjZVtdIHttZn0pOworCQkJCQl9CisJCQkJfSBlbHNlIHsKKwkJCQkJLy8gQXV0b21hdGljYWxseSBhZGRlZCB0byBjaGlsZHJlbiBpZiBpdCBuZWVkZWQgdG8gYmUKKwkJCQl9CisJCQl9CisJCX0KKwl9CisKKwlwcm90ZWN0ZWQgYm9vbGVhbiBzaG91bGRBZGRFeHBvcnRhYmxlRmlsZShJVmlydHVhbENvbXBvbmVudCBjdXJyZW50LCBGbGF0RmlsZSBmaWxlKSB7CisJCWZvciggaW50IGkgPSAwOyBpIDwgcGFydGljaXBhbnRzLmxlbmd0aDsgaSsrICkgeworCQkJaWYgKCAhcGFydGljaXBhbnRzW2ldLnNob3VsZEFkZEV4cG9ydGFibGVGaWxlKGNvbXBvbmVudCwgY3VycmVudCwgZGF0YU1vZGVsLCBmaWxlKSkKKwkJCQlyZXR1cm4gZmFsc2U7CisJCX0KKwkJcmV0dXJuIHRydWU7CisJfQorCisJcHVibGljIElWaXJ0dWFsQ29tcG9uZW50IGdldENvbXBvbmVudCgpIHsKKwkJcmV0dXJuIGNvbXBvbmVudDsKKwl9Cit9CmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS9tb2R1bGVjb3JlLXNyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2NvbXBvbmVudGNvcmUvaW50ZXJuYWwvZmxhdC9JQ2hpbGRNb2R1bGVSZWZlcmVuY2UuamF2YSBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlL21vZHVsZWNvcmUtc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vY29tcG9uZW50Y29yZS9pbnRlcm5hbC9mbGF0L0lDaGlsZE1vZHVsZVJlZmVyZW5jZS5qYXZhCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLjk2M2YwZTUKLS0tIC9kZXYvbnVsbAorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS9tb2R1bGVjb3JlLXNyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2NvbXBvbmVudGNvcmUvaW50ZXJuYWwvZmxhdC9JQ2hpbGRNb2R1bGVSZWZlcmVuY2UuamF2YQpAQCAtMCwwICsxLDU4IEBACisvKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKgorICogQ29weXJpZ2h0IChjKSAyMDA5IFJlZCBIYXQgYW5kIG90aGVycy4KKyAqIEFsbCByaWdodHMgcmVzZXJ2ZWQuIFRoaXMgcHJvZ3JhbSBhbmQgdGhlIGFjY29tcGFueWluZyBtYXRlcmlhbHMKKyAqIGFyZSBtYWRlIGF2YWlsYWJsZSB1bmRlciB0aGUgdGVybXMgb2YgdGhlIEVjbGlwc2UgUHVibGljIExpY2Vuc2UgdjEuMAorICogd2hpY2ggYWNjb21wYW5pZXMgdGhpcyBkaXN0cmlidXRpb24sIGFuZCBpcyBhdmFpbGFibGUgYXQKKyAqIGh0dHA6Ly93d3cuZWNsaXBzZS5vcmcvbGVnYWwvZXBsLXYxMC5odG1sCisgKgorICogQ29udHJpYnV0b3JzOgorICogICAgIFJlZCBIYXQgLSBJbml0aWFsIEFQSSBhbmQgaW1wbGVtZW50YXRpb24KKyAqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqLworcGFja2FnZSBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUuaW50ZXJuYWwuZmxhdDsKKworaW1wb3J0IGphdmEuaW8uRmlsZTsKKworaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucnVudGltZS5JUGF0aDsKK2ltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUucmVzb3VyY2VzLklWaXJ0dWFsQ29tcG9uZW50OworaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS5yZXNvdXJjZXMuSVZpcnR1YWxSZWZlcmVuY2U7CisKKy8qKgorICogQSBjaGlsZCBtb2R1bGUgbWF5IGJlIGJhc2VkIG9uIGEgZmlsZSAoaWYgYmluYXJ5KSwgCisgKiBvciBvbiBhIHJlZmVyZW5jZSAvIGNvbXBvbmVudCBpZiBub3QuIAorICogCisgKiBUaGlzIGludGVyZmFjZSBpcyBub3QgaW50ZW5kZWQgdG8gYmUgaW1wbGVtZW50ZWQgYnkgY2xpZW50cworICovCitwdWJsaWMgaW50ZXJmYWNlIElDaGlsZE1vZHVsZVJlZmVyZW5jZSB7CisJLyoqCisJICogV2lsbCByZXR1cm4gYSBmaWxlIGlmIHRoaXMgY2FuIGJlIHRyYWNrZWQgdG8gb25lCisJICogQHJldHVybgorCSAqLworCXB1YmxpYyBGaWxlIGdldEZpbGUoKTsKKwkKKwkKKwkvKioKKwkgKiBSZXR1cm4gdGhlIHJlZmVyZW5jZSBpZiBpdCBleGlzdHMKKwkgKiBAcmV0dXJuCisJICovCisJcHVibGljIElWaXJ0dWFsUmVmZXJlbmNlIGdldFJlZmVyZW5jZSgpOworCQorCS8qKgorCSAqIFJldHVybiB0aGUgY29tcG9uZW50IGlmIGl0IGV4aXN0cworCSAqIEByZXR1cm4KKwkgKi8KKwlwdWJsaWMgSVZpcnR1YWxDb21wb25lbnQgZ2V0Q29tcG9uZW50KCk7CisJCisJLyoqCisJICogSWYgdGhpcyBpcyBhIHNpbmdsZSBmaWxlLCByZXR1cm4gdHJ1ZS4KKwkgKiBJZiBhIG1vcmUgY29tcGxleCBjb21wb25lbnQsIHJldHVybiBmYWxzZQorCSAqIEByZXR1cm4KKwkgKi8KKwlwdWJsaWMgYm9vbGVhbiBpc0JpbmFyeSgpOworCQorCS8qKgorCSAqIEdldCB0aGUgcmVsYXRpdmUgVVJJIHRvIGl0J3MgZGlyZWN0IHBhcmVudCwgCisJICogaW5jbHVkaW5nIHBhdGggKyBmaWxlbmFtZSArIGV4dGVuc2lvbgorCSAqIEByZXR1cm4KKwkgKi8KKwlwdWJsaWMgSVBhdGggZ2V0UmVsYXRpdmVVUkkoKTsKK30KZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlL21vZHVsZWNvcmUtc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vY29tcG9uZW50Y29yZS9pbnRlcm5hbC9mbGF0L0lGbGF0RmlsZS5qYXZhIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUvbW9kdWxlY29yZS1zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9jb21wb25lbnRjb3JlL2ludGVybmFsL2ZsYXQvSUZsYXRGaWxlLmphdmEKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uNmE2NDliNwotLS0gL2Rldi9udWxsCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlL21vZHVsZWNvcmUtc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vY29tcG9uZW50Y29yZS9pbnRlcm5hbC9mbGF0L0lGbGF0RmlsZS5qYXZhCkBAIC0wLDAgKzEsMjYgQEAKKy8qKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqCisgKiBDb3B5cmlnaHQgKGMpIDIwMDkgUmVkIEhhdCBhbmQgb3RoZXJzLgorICogQWxsIHJpZ2h0cyByZXNlcnZlZC4gVGhpcyBwcm9ncmFtIGFuZCB0aGUgYWNjb21wYW55aW5nIG1hdGVyaWFscworICogYXJlIG1hZGUgYXZhaWxhYmxlIHVuZGVyIHRoZSB0ZXJtcyBvZiB0aGUgRWNsaXBzZSBQdWJsaWMgTGljZW5zZSB2MS4wCisgKiB3aGljaCBhY2NvbXBhbmllcyB0aGlzIGRpc3RyaWJ1dGlvbiwgYW5kIGlzIGF2YWlsYWJsZSBhdAorICogaHR0cDovL3d3dy5lY2xpcHNlLm9yZy9sZWdhbC9lcGwtdjEwLmh0bWwKKyAqCisgKiBDb250cmlidXRvcnM6CisgKiAgICAgUmVkIEhhdCAtIEluaXRpYWwgQVBJIGFuZCBpbXBsZW1lbnRhdGlvbgorICoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKiovCitwYWNrYWdlIG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS5pbnRlcm5hbC5mbGF0OworCisvKioKKyAqIAorICogVGhpcyBpbnRlcmZhY2UgaXMgbm90IGludGVuZGVkIHRvIGJlIGltcGxlbWVudGVkIGJ5IGNsaWVudHMKKyAqCisgKi8KK3B1YmxpYyBpbnRlcmZhY2UgSUZsYXRGaWxlIGV4dGVuZHMgSUZsYXRSZXNvdXJjZSB7CisJLyoqCisJICogUmV0dXJucyBhIG1vZGlmaWNhdGlvbiBzdGFtcC4gV2hlbmV2ZXIgdGhlIG1vZGlmaWNhdGlvbgorCSAqIHN0YW1wIGNoYW5nZXMsIHRoZXJlIG1heSBoYXZlIGJlZW4gYSBjaGFuZ2UgdG8gdGhlIGZpbGUuCisJICogCisJICogQHJldHVybiB0aGUgbW9kaWZpY2F0aW9uIHN0YW1wCisJICovCisJcHVibGljIGxvbmcgZ2V0TW9kaWZpY2F0aW9uU3RhbXAoKTsKK30KXCBObyBuZXdsaW5lIGF0IGVuZCBvZiBmaWxlCmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS9tb2R1bGVjb3JlLXNyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2NvbXBvbmVudGNvcmUvaW50ZXJuYWwvZmxhdC9JRmxhdEZvbGRlci5qYXZhIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUvbW9kdWxlY29yZS1zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9jb21wb25lbnRjb3JlL2ludGVybmFsL2ZsYXQvSUZsYXRGb2xkZXIuamF2YQpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi5hZWRjZjUwCi0tLSAvZGV2L251bGwKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUvbW9kdWxlY29yZS1zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9jb21wb25lbnRjb3JlL2ludGVybmFsL2ZsYXQvSUZsYXRGb2xkZXIuamF2YQpAQCAtMCwwICsxLDMxIEBACisvKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKgorICogQ29weXJpZ2h0IChjKSAyMDA1LCAyMDA2IElCTSBDb3Jwb3JhdGlvbiBhbmQgb3RoZXJzLgorICogQWxsIHJpZ2h0cyByZXNlcnZlZC4gVGhpcyBwcm9ncmFtIGFuZCB0aGUgYWNjb21wYW55aW5nIG1hdGVyaWFscworICogYXJlIG1hZGUgYXZhaWxhYmxlIHVuZGVyIHRoZSB0ZXJtcyBvZiB0aGUgRWNsaXBzZSBQdWJsaWMgTGljZW5zZSB2MS4wCisgKiB3aGljaCBhY2NvbXBhbmllcyB0aGlzIGRpc3RyaWJ1dGlvbiwgYW5kIGlzIGF2YWlsYWJsZSBhdAorICogaHR0cDovL3d3dy5lY2xpcHNlLm9yZy9sZWdhbC9lcGwtdjEwLmh0bWwKKyAqCisgKiBDb250cmlidXRvcnM6CisgKiAgICAgSUJNIENvcnBvcmF0aW9uIC0gSW5pdGlhbCBBUEkgYW5kIGltcGxlbWVudGF0aW9uCisgKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKi8KK3BhY2thZ2Ugb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb21wb25lbnRjb3JlLmludGVybmFsLmZsYXQ7CisKKy8qKgorICogCisgKiBUaGlzIGludGVyZmFjZSBpcyBub3QgaW50ZW5kZWQgdG8gYmUgaW1wbGVtZW50ZWQgYnkgY2xpZW50cworICoKKyAqLworcHVibGljIGludGVyZmFjZSBJRmxhdEZvbGRlciBleHRlbmRzIElGbGF0UmVzb3VyY2UgeworCS8qKgorCSAqIFJldHVybnMgdGhlIG1lbWJlcnMgKGNvbnRlbnRzKSBvZiB0aGlzIGZvbGRlci4KKwkgKiAKKwkgKiBAcmV0dXJuIGFuIGFycmF5IGNvbnRhaW5pbmcgdGhlIG1vZHVsZSByZXNvdXJjZXMgY29udGFpbmVkIGluIHRoaXMgZm9sZGVyCisJICovCisJcHVibGljIElGbGF0UmVzb3VyY2VbXSBtZW1iZXJzKCk7CisJLyoqCisJICogU2V0cyB0aGUgbWVtYmVycyAoY29udGVudHMpIG9mIHRoaXMgZm9sZGVyLgorCSAqIAorCSAqIEBwYXJhbSBtZW1iZXJzIHRoZSBtZW1iZXJzCisJICovCisJcHVibGljIHZvaWQgc2V0TWVtYmVycyhJRmxhdFJlc291cmNlW10gbWVtYmVycyk7Cit9CmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS9tb2R1bGVjb3JlLXNyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2NvbXBvbmVudGNvcmUvaW50ZXJuYWwvZmxhdC9JRmxhdFJlc291cmNlLmphdmEgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS9tb2R1bGVjb3JlLXNyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2NvbXBvbmVudGNvcmUvaW50ZXJuYWwvZmxhdC9JRmxhdFJlc291cmNlLmphdmEKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uZmRiOTE5NwotLS0gL2Rldi9udWxsCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlL21vZHVsZWNvcmUtc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vY29tcG9uZW50Y29yZS9pbnRlcm5hbC9mbGF0L0lGbGF0UmVzb3VyY2UuamF2YQpAQCAtMCwwICsxLDM1IEBACisvKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKgorICogQ29weXJpZ2h0IChjKSAyMDA5IFJlZCBIYXQgYW5kIG90aGVycy4KKyAqIEFsbCByaWdodHMgcmVzZXJ2ZWQuIFRoaXMgcHJvZ3JhbSBhbmQgdGhlIGFjY29tcGFueWluZyBtYXRlcmlhbHMKKyAqIGFyZSBtYWRlIGF2YWlsYWJsZSB1bmRlciB0aGUgdGVybXMgb2YgdGhlIEVjbGlwc2UgUHVibGljIExpY2Vuc2UgdjEuMAorICogd2hpY2ggYWNjb21wYW5pZXMgdGhpcyBkaXN0cmlidXRpb24sIGFuZCBpcyBhdmFpbGFibGUgYXQKKyAqIGh0dHA6Ly93d3cuZWNsaXBzZS5vcmcvbGVnYWwvZXBsLXYxMC5odG1sCisgKgorICogQ29udHJpYnV0b3JzOgorICogICAgIFJlZCBIYXQgLSBJbml0aWFsIEFQSSBhbmQgaW1wbGVtZW50YXRpb24KKyAqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqLworcGFja2FnZSBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUuaW50ZXJuYWwuZmxhdDsKKworaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucnVudGltZS5JQWRhcHRhYmxlOworaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucnVudGltZS5JUGF0aDsKKworLyoqCisgKiAKKyAqIFRoaXMgaW50ZXJmYWNlIGlzIG5vdCBpbnRlbmRlZCB0byBiZSBpbXBsZW1lbnRlZCBieSBjbGllbnRzCisgKgorICovCitwdWJsaWMgaW50ZXJmYWNlIElGbGF0UmVzb3VyY2UgZXh0ZW5kcyBJQWRhcHRhYmxlIHsKKwkvKioKKwkgKiBSZXR1cm5zIHRoZSBtb2R1bGUgcmVsYXRpdmUgcGF0aCB0byB0aGlzIHJlc291cmNlLgorCSAqIAorCSAqIEByZXR1cm4gdGhlIG1vZHVsZSByZWxhdGl2ZSBwYXRoIHRvIHRoaXMgcmVzb3VyY2UKKwkgKi8KKwlwdWJsaWMgSVBhdGggZ2V0TW9kdWxlUmVsYXRpdmVQYXRoKCk7CisKKwkvKioKKwkgKiBSZXR1cm5zIHRoZSBuYW1lIG9mIHRoaXMgcmVzb3VyY2UuCisJICogCisJICogQHJldHVybiB0aGUgbmFtZSBvZiB0aGlzIHJlc291cmNlCisJICovCisJcHVibGljIFN0cmluZyBnZXROYW1lKCk7Cit9ClwgTm8gbmV3bGluZSBhdCBlbmQgb2YgZmlsZQpkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUvbW9kdWxlY29yZS1zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9jb21wb25lbnRjb3JlL2ludGVybmFsL2ZsYXQvSUZsYXRWaXJ0dWFsQ29tcG9uZW50LmphdmEgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS9tb2R1bGVjb3JlLXNyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2NvbXBvbmVudGNvcmUvaW50ZXJuYWwvZmxhdC9JRmxhdFZpcnR1YWxDb21wb25lbnQuamF2YQpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi44MWI5Yjg1Ci0tLSAvZGV2L251bGwKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUvbW9kdWxlY29yZS1zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9jb21wb25lbnRjb3JlL2ludGVybmFsL2ZsYXQvSUZsYXRWaXJ0dWFsQ29tcG9uZW50LmphdmEKQEAgLTAsMCArMSw0MiBAQAorLyoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioKKyAqIENvcHlyaWdodCAoYykgMjAwOSBSZWQgSGF0IGFuZCBvdGhlcnMuCisgKiBBbGwgcmlnaHRzIHJlc2VydmVkLiBUaGlzIHByb2dyYW0gYW5kIHRoZSBhY2NvbXBhbnlpbmcgbWF0ZXJpYWxzCisgKiBhcmUgbWFkZSBhdmFpbGFibGUgdW5kZXIgdGhlIHRlcm1zIG9mIHRoZSBFY2xpcHNlIFB1YmxpYyBMaWNlbnNlIHYxLjAKKyAqIHdoaWNoIGFjY29tcGFuaWVzIHRoaXMgZGlzdHJpYnV0aW9uLCBhbmQgaXMgYXZhaWxhYmxlIGF0CisgKiBodHRwOi8vd3d3LmVjbGlwc2Uub3JnL2xlZ2FsL2VwbC12MTAuaHRtbAorICoKKyAqIENvbnRyaWJ1dG9yczoKKyAqICAgICBSZWQgSGF0IC0gSW5pdGlhbCBBUEkgYW5kIGltcGxlbWVudGF0aW9uCisgKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKi8KK3BhY2thZ2Ugb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb21wb25lbnRjb3JlLmludGVybmFsLmZsYXQ7CisKK2ltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJ1bnRpbWUuQ29yZUV4Y2VwdGlvbjsKKworcHVibGljIGludGVyZmFjZSBJRmxhdFZpcnR1YWxDb21wb25lbnQgeworCQorCS8qKgorCSAqIEFuIG9wdGlvbnMga2V5IGxpc3RpbmcgdGhlIGV4cG9ydCBwYXJ0aWNpcGFudHMuCisJICogVGhlIHZhbHVlIG11c3QgYmUgYSBMaXN0PElFeHBvcnRVdGlsUGFydGljaXBhbnQ+LCAKKwkgKiAgb3Igc2ltcGx5IGFuIElFeHBvcnRVdGlsUGFydGljaXBhbnQKKwkgKi8KKwlwdWJsaWMgc3RhdGljIFN0cmluZyBQQVJUSUNJUEFOVF9MSVNUID0gIm9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS5leHBvcnQucGFydGljaXBhbnRMaXN0IjsKKwkKKwkvKioKKwkgKiBUaGUgRXhwb3J0TW9kZWwgYmVpbmcgdXNlZDsgdGhlIHZhbHVlIG9mIHRoaXMgc2hvdWxkIGJlIHRoZSBJRmxhdFZpcnR1YWxDb21wb25lbnQgaXRzZWxmLiAKKwkgKi8KKwlwdWJsaWMgc3RhdGljIFN0cmluZyBFWFBPUlRfTU9ERUwgPSAib3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb21wb25lbnRjb3JlLmV4cG9ydC5leHBvcnRNb2RlbCI7CisKKwkvKioKKwkgKiBGZXRjaCB0aGUgbGlzdCBvZiByZXNvdXJjZXMsIHdoaWNoIGluY2x1ZGUgcmF3IGZpbGVzIG9yIGZvbGRlcnMgb25seQorCSAqIEByZXR1cm4KKwkgKiBAdGhyb3dzIENvcmVFeGNlcHRpb24KKwkgKi8KKwlwdWJsaWMgSUZsYXRSZXNvdXJjZVtdIGZldGNoUmVzb3VyY2VzKCkgdGhyb3dzIENvcmVFeGNlcHRpb247CisJCisJLyoqCisJICogRmV0Y2ggYSBsaXN0IG9mIGNoaWxkIG1vZHVsZSByZWZlcmVuY2VzLgorCSAqIEByZXR1cm4KKwkgKiBAdGhyb3dzIENvcmVFeGNlcHRpb24KKwkgKi8KKwlwdWJsaWMgSUNoaWxkTW9kdWxlUmVmZXJlbmNlW10gZ2V0Q2hpbGRNb2R1bGVzKCkgdGhyb3dzIENvcmVFeGNlcHRpb247Cit9CmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS9tb2R1bGVjb3JlLXNyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2NvbXBvbmVudGNvcmUvaW50ZXJuYWwvZmxhdC9JRmxhdHRlblBhcnRpY2lwYW50LmphdmEgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS9tb2R1bGVjb3JlLXNyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2NvbXBvbmVudGNvcmUvaW50ZXJuYWwvZmxhdC9JRmxhdHRlblBhcnRpY2lwYW50LmphdmEKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uNTRmZDc0MgotLS0gL2Rldi9udWxsCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlL21vZHVsZWNvcmUtc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vY29tcG9uZW50Y29yZS9pbnRlcm5hbC9mbGF0L0lGbGF0dGVuUGFydGljaXBhbnQuamF2YQpAQCAtMCwwICsxLDE2NiBAQAorLyoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioKKyAqIENvcHlyaWdodCAoYykgMjAwOSBSZWQgSGF0IGFuZCBvdGhlcnMuCisgKiBBbGwgcmlnaHRzIHJlc2VydmVkLiBUaGlzIHByb2dyYW0gYW5kIHRoZSBhY2NvbXBhbnlpbmcgbWF0ZXJpYWxzCisgKiBhcmUgbWFkZSBhdmFpbGFibGUgdW5kZXIgdGhlIHRlcm1zIG9mIHRoZSBFY2xpcHNlIFB1YmxpYyBMaWNlbnNlIHYxLjAKKyAqIHdoaWNoIGFjY29tcGFuaWVzIHRoaXMgZGlzdHJpYnV0aW9uLCBhbmQgaXMgYXZhaWxhYmxlIGF0CisgKiBodHRwOi8vd3d3LmVjbGlwc2Uub3JnL2xlZ2FsL2VwbC12MTAuaHRtbAorICoKKyAqIENvbnRyaWJ1dG9yczoKKyAqICAgICBSZWQgSGF0IC0gSW5pdGlhbCBBUEkgYW5kIGltcGxlbWVudGF0aW9uCisgKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKi8KK3BhY2thZ2Ugb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb21wb25lbnRjb3JlLmludGVybmFsLmZsYXQ7CisKK2ltcG9ydCBqYXZhLnV0aWwuTGlzdDsKKworaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS5pbnRlcm5hbC5mbGF0LkZsYXRWaXJ0dWFsQ29tcG9uZW50LkZsYXRDb21wb25lbnRUYXNrTW9kZWw7CitpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb21wb25lbnRjb3JlLnJlc291cmNlcy5JVmlydHVhbENvbXBvbmVudDsKK2ltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUucmVzb3VyY2VzLklWaXJ0dWFsUmVmZXJlbmNlOworCisvKioKKyAqIFRoaXMgY2xhc3MgcmVwcmVzZW50cyBhIHBhcnRpY2lwYW50IGluIHRoZSBwcm9jZXNzCisgKiBvZiB0cmF2ZXJzaW5nIHRoZSB2aXJ0dWFsIGNvbXBvbmVudCBhbmQgZGVjaWRpbmcgd2hpY2gKKyAqIHJlc291cmNlcyBzaG91bGQgYmUgZXhwb3NlZCBieSB0aGUgbW9kZWwsIGFuZCAKKyAqIGluIHdoYXQgZmFzaGlvbi4KKyAqIAorICogQ2xpZW50cyBzaG91bGQgbm90IGltcGxlbWVudCB0aGlzIGNsYXNzIGRpcmVjdGx5LCAKKyAqIGJ1dCBzaG91bGQgcmF0aGVyIGV4dGVuZCBBYnN0cmFjdEV4cG9ydFBhcnRpY2lwYW50LiAKKyAqLworcHVibGljIGludGVyZmFjZSBJRmxhdHRlblBhcnRpY2lwYW50IHsKKwkKKwkvKioKKwkgKiBTZWVkIHRoZSBsaXN0IG9mIHJlc291cmNlcyB3aXRoIGVudHJpZXMgdGhhdCBtdXN0IGJlIHByZXNlbnQsIAorCSAqIHNwZWNpZmljYWxseSBmaWxlcyB0aGF0IG1heSBiZSBtaXNzZWQgYnkgb3B0aW1pemF0aW9ucy4KKwkgKiAKKwkgKiBAcGFyYW0gY29tcG9uZW50CisJICogQHBhcmFtIGRhdGFNb2RlbAorCSAqIEBwYXJhbSBvcmlnaW5hbAorCSAqIEByZXR1cm4KKwkgKi8KKwlwdWJsaWMgdm9pZCBpbml0aWFsaXplKElWaXJ0dWFsQ29tcG9uZW50IGNvbXBvbmVudCwgCisJCQlGbGF0Q29tcG9uZW50VGFza01vZGVsIGRhdGFNb2RlbCwgTGlzdDxJRmxhdFJlc291cmNlPiByZXNvdXJjZXMpOworCQorCS8qKgorCSAqIENhbiB0aGlzIHBhcnRpY2lwYW50IHJldHVybiBvcHRpbWl6ZWQgbWVtYmVycyB0aGF0CisJICogcHJlY2x1ZGUgdGhlIG5lZWQgZm9yIHJ1bm5pbmcgdGhlIGZ1bGwgYWxnb3JpdGhtPworCSAqIAorCSAqIENhdXRpb24gaXMgZW5jb3VyYWdlZC4gSWYgcmVmZXJlbmNlIHR5cGVzIHlvdSBkbyBub3QgdW5kZXJzdGFuZAorCSAqIGFyZSBwcmVzZW50IGFuZCB5b3UgbWlzdGFrZW5seSBjbGFpbSB5b3UgY2FuT3B0aW1pemUsIHlvdSBtYXkKKwkgKiBsZWF2ZSBzb21lIHJlZmVyZW5jZXMgaWdub3JlZCBhbmQgdGhlIGFyY2hpdmUgaW5jb21wbGV0ZWx5IGFzc2VtYmxlZC4KKwkgKiAKKwkgKiBFeGFtcGxlOiBpZiB0aGUgY29tcG9uZW50IHNhdGlzZmllcyBzaW5nbGVSb290IHJlcXVpcmVtZW50cywgdGhpcyBtYXkgcmV0dXJuIHRydWUKKwkgKiAKKwkgKiBAcGFyYW0gY29tcG9uZW50CisJICogQHBhcmFtIGRhdGFNb2RlbAorCSAqIEByZXR1cm4KKwkgKi8KKwlwdWJsaWMgYm9vbGVhbiBjYW5PcHRpbWl6ZShJVmlydHVhbENvbXBvbmVudCBjb21wb25lbnQsIAorCQkJRmxhdENvbXBvbmVudFRhc2tNb2RlbCBkYXRhTW9kZWwpOworCQorCS8qKgorCSAqIFJldHVybiBhIGZ1bGwgYW5kIGNvbXBsZXRlIGxpc3Qgb2YgbWVtYmVycyB0byBiZSBwdWJsaXNoZWQuCisJICogVGhlIG9yaWdpbmFsIGVudHJpZXMgc2hvdWxkIGJlIGluY2x1ZGVkLCB1bmxlc3MgbGVmdCBvdXQgaW50ZW50aW9uYWxseS4KKwkgKiAKKwkgKiBPbmx5IHRoZSBmaXJzdCBwYXJ0aWNpcGFudCB0byBjbGFpbSBpdCBjYW4gb3B0aW1pemUgd2lsbCBiZSBhbGxvd2VkIHRvIGRvIHNvLgorCSAqIFRoaXMgd2lsbCBiZSB0aGUgZmluYWwgbGlzdCByZXR1cm5lZCBieSBFeHBvcnRVdGlsLgorCSAqIE5vIGZpbmFsaXphdGlvbiBvciBvdGhlciBhY3Rpb25zIG9uIHRoaXMgbGlzdCB3aWxsIHRha2UgcGxhY2UKKwkgKiAKKwkgKiBAcGFyYW0gY29tcG9uZW50CisJICogQHBhcmFtIGRhdGFNb2RlbAorCSAqIEBwYXJhbSBvcmlnaW5hbAorCSAqIEByZXR1cm4KKwkgKi8KKwlwdWJsaWMgdm9pZCBvcHRpbWl6ZShJVmlydHVhbENvbXBvbmVudCBjb21wb25lbnQsIEZsYXRDb21wb25lbnRUYXNrTW9kZWwgZGF0YU1vZGVsLCAKKwkJCUxpc3Q8SUZsYXRSZXNvdXJjZT4gcmVzb3VyY2VzLCBMaXN0PElDaGlsZE1vZHVsZVJlZmVyZW5jZT4gY2hpbGRyZW4pOworCQorCS8qKgorCSAqIFJldHVybnMgdHJ1ZSBpZiB0aGlzIHBhcnRpY2lwYW50IGNvbnNpZGVycyB0aGlzIGZpbGUgdG8gYmUgYSBjaGlsZCBtb2R1bGUKKwkgKiBUaGUgZnJhbWV3b3JrIHdpbGwgY29uc2lkZXIgdGhlIGZpbGUgYSBjaGlsZCBtb2R1bGUgaWYgYXQgbGVhc3Qgb25lIHBhcnRpY2lwYW50CisJICogcmV0dXJucyB0cnVlIHRvIHRoaXMgbWV0aG9kLiAKKwkgKiAKKwkgKiBUaGUgaXRlbSBpbiBxdWVzdGlvbiBpcyBhIGZsYXQgZmlsZSB3aGljaCBoYXMgYmVlbiBmb3VuZCBpbnNpZGUgdGhlIHByb2plY3QKKwkgKiBvciBpbnNpZGUgYSBjb25zdW1lZCByZWZlcmVuY2Ugb2YgdGhlIHByb2plY3QuIFRoZSBmcmFtZXdvcmsgaXMgYXNraW5nCisJICogYWxsIHBhcnRpY2lwYW50cyBpZiB0aGlzIGZpbGUgaXMgYSBjaGlsZCBtb2R1bGUsIHRvIGJlIGV4cG9zZWQgYXMgc3VjaCBsYXRlciwgCisJICogb3IgaWYgaXQgaXMganVzdCBhIGdlbmVyaWMgcmVzb3VyY2UsIHdoaWNoIHNob3VsZCBiZSBleHBvc2VkIGFzIGEgcmVndWxhciBtZW1iZXIgZmlsZS4gCisJICogCisJICogQHBhcmFtIHJvb3RDb21wb25lbnQKKwkgKiBAcGFyYW0gZGF0YU1vZGVsCisJICogQHBhcmFtIGZpbGUKKwkgKiBAcmV0dXJuCisJICovCisJcHVibGljIGJvb2xlYW4gaXNDaGlsZE1vZHVsZShJVmlydHVhbENvbXBvbmVudCByb290Q29tcG9uZW50LAorCQkJRmxhdENvbXBvbmVudFRhc2tNb2RlbCBkYXRhTW9kZWwsIElGbGF0RmlsZSBmaWxlKTsKKwkKKwkKKwkvKioKKwkgKiBTaG91bGQgdGhlIHByb3Bvc2VkIGZpbGUgYmUgaW5jbHVkZWQgaW4gdGhlIHJlc3VsdCBzZXQgb3Igbm90LgorCSAqIElmIGFueSBvbmUgcGFydGljaXBhbnQgc2F5cyBubywgdGhlIGZpbGUgd2lsbCBub3QgYmUgaW5jbHVkZWQuCisJICogVGhlIGRlZmF1bHQgYmVoYXZpb3VyIHdvdWxkIGJlIHRvIHJldHVybiB0cnVlIHVubGVzcyB5b3UKKwkgKiBoYXZlIGEgY29tcGVsbGluZyByZWFzb24gdG8gYmxvY2sgdGhlIGZpbGUgZnJvbSBpbmNsdXNpb24KKwkgKiAKKwkgKiBFeGFtcGxlOiBJZiB0aGUgZmlsZSBpcyBiZWluZyBhY3RpdmVseSBmaWx0ZXJlZCAoaW4gYSAuc3ZuIGZvbGRlcikgcmV0dXJuIGZhbHNlCisJICogQ2F1dGlvbiBpcyBlbmNvdXJhZ2VkIGhlcmUsIGFzIGEgY29uc3VtZWQgcmVmZXJlbmNlIG1heSBhY3RpdmVseSAKKwkgKiBiZSBwcm92aWRpbmcgdGhlIGZpbGVzIHlvdSBtYXkgYmUgdHJ5aW5nIHRvIGZpbHRlci4gSXQncyBhZHZpc2VkIHRvIG9ubHkKKwkgKiBmaWx0ZXIgaWYgeW91IGtub3cgd2hhdCB0eXBlIGN1cnJlbnRDb21wb25lbnQgaXMgYW5kIGhvdyBpdCB3b3Jrcy4KKwkgKiAKKwkgKiBAcGFyYW0gcm9vdENvbXBvbmVudCBUaGUgcm9vdCBjb21wb25lbnQgdGhhdCBpcyBiZWluZyBhc3NlbWJsZWQKKwkgKiBAcGFyYW0gY3VycmVudENvbXBvbmVudCBUaGUgY29tcG9uZW50IGN1cnJlbnRseSBiZWluZyBwcm9jZXNzZWQsIGVpdGhlciByb290Q29tcG9uZW50IG9yIGEgY29uc3VtZWQgcmVmZXJlbmNlCisJICogQHBhcmFtIGRhdGFNb2RlbAorCSAqIEBwYXJhbSBmaWxlCisJICogQHJldHVybgorCSAqLworCXB1YmxpYyBib29sZWFuIHNob3VsZEFkZEV4cG9ydGFibGVGaWxlKElWaXJ0dWFsQ29tcG9uZW50IHJvb3RDb21wb25lbnQsCisJCQlJVmlydHVhbENvbXBvbmVudCBjdXJyZW50Q29tcG9uZW50LCAKKwkJCUZsYXRDb21wb25lbnRUYXNrTW9kZWwgZGF0YU1vZGVsLCBJRmxhdEZpbGUgZmlsZSk7CisJCisJCisJLyoqCisJICogUmV0dXJucyB0cnVlIGlmIHRoaXMgcGFydGljaXBhbnQgY29uc2lkZXJzIHRoZSByZWZlcmVuY2UgYSBjaGlsZCBtb2R1bGUuCisJICogVGhlIGZyYW1ld29yayB3aWxsIGNvbnNpZGVyIGl0IGEgY2hpbGQgbW9kdWxlIGlmIGF0IGxlYXN0IG9uZSBwYXJ0aWNpcGFudCByZXR1cm5zIHRydWUuIAorCSAqIAorCSAqIFRoZSBmcmFtZXdvcmsgaXMgYXNraW5nIHdoZXRoZXIgdGhlIHJlZmVyZW5jZWQgY29tcG9uZW50IGlzIGEgY2hpbGQgbW9kdWxlLCAKKwkgKiB3aGljaCBzaG91bGQgYmUgYWRkZWQgdG8gdGhlIGxpc3Qgb2YgY2hpbGRyZW4gbW9kdWxlcyBhbmQgZXhwb3NlZCBhcyBhbiAgCisJICogSUNoaWxkTW9kdWxlUmVmZXJlbmNlLCBvciBpZiBpdCBpcyBqdXN0IHNvbWUgZ2VuZXJpYyB0eXBlIG9mIGVudGl0eSB0byBiZSAKKwkgKiBleHBvc2VkIGFzIG1lbWJlciByZXNvdXJjZXMgaW5zaWRlIHRoZSBjdXJyZW50IGZsYXQgY29tcG9uZW50LiAKKwkgKiAKKwkgKiBUaGUgcGFyYW1ldGVyICJyZWZlcmVuY2VkIiBpcyBndWFyYW50ZWVkIHRvIGJlIGEgIlVTRUQiIHJlZmVyZW5jZSwKKwkgKiBhcyAiQ09OU1VNRUQiIHJlZmVyZW5jZXMgaGF2ZSBhbHJlYWR5IGJlZW4gY29uc3VtZWQgZGlyZWN0bHkgaW50byB0aGUgcHJvamVjdAorCSAqIGFzIGlmIHRoZXkgd2VyZSBwYXJ0IG9mIGl0IG9yaWdpbmFsbHkuICAKKwkgKiAKKwkgKiBBICJVU0VEIiByZWZlcmVuY2Ugd2hpY2ggaXMgYSBjaGlsZCBtb2R1bGUgd2lsbCBiZSBleHBvc2VkIGFzIGFuIAorCSAqIElDaGlsZE1vZHVsZVJlZmVyZW5jZSBhbmQgdXNlIHRoZSBhcmNoaXZlTmFtZSByZXRyaWV2ZWQgZnJvbSB0aGUgSVZpcnR1YWxSZWZlcmVuY2UuIAorCSAqIAorCSAqIEEgIlVTRUQiIHJlZmVyZW5jZSB3aGljaCBpcyAqbm90KiBhIGNoaWxkIG1vZHVsZSB3aWxsIGJlIHJlcHJlc2VudGVkCisJICogYXMgYSBmb2xkZXIgbWVtYmVyIHJlc291cmNlIGluc2lkZSB0aGUgcGFyZW50LCBhbmQgdGhlIGZvbGRlcidzIG5hbWUgd2lsbAorCSAqIGFsc28gYmUgcmV0cmlldmVkIGZyb20gdGhlIGFyY2hpdmVOYW1lIGF0dHJpYnV0ZSBvZiB0aGUgSVZpcnR1YWxSZWZlcmVuY2UuCisJICogCisJICogQHBhcmFtIHJvb3RDb21wb25lbnQKKwkgKiBAcGFyYW0gcmVmZXJlbmNlZCAKKwkgKiBAcGFyYW0gZGF0YU1vZGVsCisJICogQHJldHVybgorCSAqLworCXB1YmxpYyBib29sZWFuIGlzQ2hpbGRNb2R1bGUoSVZpcnR1YWxDb21wb25lbnQgcm9vdENvbXBvbmVudCwgCisJCQlJVmlydHVhbFJlZmVyZW5jZSByZWZlcmVuY2VkLCBGbGF0Q29tcG9uZW50VGFza01vZGVsIGRhdGFNb2RlbCk7CisJCisJLyoqCisJICogU2hvdWxkIHRoaXMgcmVmZXJlbmNlIGJlIGlnbm9yZWQsIGllIGhhbmRsZWQgZWxzZXdoZXJlCisJICogQHBhcmFtIHJvb3RDb21wb25lbnQKKwkgKiBAcGFyYW0gcmVmZXJlbmNlZAorCSAqIEBwYXJhbSBkYXRhTW9kZWwKKwkgKiBAcmV0dXJuCisJICovCisJcHVibGljIGJvb2xlYW4gc2hvdWxkSWdub3JlUmVmZXJlbmNlKElWaXJ0dWFsQ29tcG9uZW50IHJvb3RDb21wb25lbnQsCisJCQlJVmlydHVhbFJlZmVyZW5jZSByZWZlcmVuY2VkLCBGbGF0Q29tcG9uZW50VGFza01vZGVsIGRhdGFNb2RlbCk7CisJLyoqCisJICogRmluYWxpemUgdGhlIGxpc3Qgb2YgcmVzb3VyY2VzIGJ5IGFkZGluZyBtaXNzZWQgcmVzb3VyY2VzIG9yIAorCSAqIHJlbW92aW5nIGZpbGVzIGFkZGVkIGJ5IG1pc3Rha2UuIAorCSAqIAorCSAqIEBwYXJhbSBjb21wb25lbnQKKwkgKiBAcGFyYW0gZGF0YU1vZGVsCisJICogQHBhcmFtIG9yaWdpbmFsCisJICogQHBhcmFtIHJlc291cmNlcworCSAqIEByZXR1cm4KKwkgKi8KKwlwdWJsaWMgdm9pZCBmaW5hbGl6ZShJVmlydHVhbENvbXBvbmVudCBjb21wb25lbnQsIAorCQkJRmxhdENvbXBvbmVudFRhc2tNb2RlbCBkYXRhTW9kZWwsIExpc3Q8SUZsYXRSZXNvdXJjZT4gcmVzb3VyY2VzKTsKKworfQpkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUvbW9kdWxlY29yZS1zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9jb21wb25lbnRjb3JlL2ludGVybmFsL2ZsYXQvVmlydHVhbENvbXBvbmVudEZsYXR0ZW5VdGlsaXR5LmphdmEgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS9tb2R1bGVjb3JlLXNyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2NvbXBvbmVudGNvcmUvaW50ZXJuYWwvZmxhdC9WaXJ0dWFsQ29tcG9uZW50RmxhdHRlblV0aWxpdHkuamF2YQpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi4wMWFhZDYxCi0tLSAvZGV2L251bGwKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUvbW9kdWxlY29yZS1zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9jb21wb25lbnRjb3JlL2ludGVybmFsL2ZsYXQvVmlydHVhbENvbXBvbmVudEZsYXR0ZW5VdGlsaXR5LmphdmEKQEAgLTAsMCArMSwyNTMgQEAKKy8qKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqCisgKiBDb3B5cmlnaHQgKGMpIDIwMDkgUmVkIEhhdCBhbmQgb3RoZXJzLgorICogQWxsIHJpZ2h0cyByZXNlcnZlZC4gVGhpcyBwcm9ncmFtIGFuZCB0aGUgYWNjb21wYW55aW5nIG1hdGVyaWFscworICogYXJlIG1hZGUgYXZhaWxhYmxlIHVuZGVyIHRoZSB0ZXJtcyBvZiB0aGUgRWNsaXBzZSBQdWJsaWMgTGljZW5zZSB2MS4wCisgKiB3aGljaCBhY2NvbXBhbmllcyB0aGlzIGRpc3RyaWJ1dGlvbiwgYW5kIGlzIGF2YWlsYWJsZSBhdAorICogaHR0cDovL3d3dy5lY2xpcHNlLm9yZy9sZWdhbC9lcGwtdjEwLmh0bWwKKyAqCisgKiBDb250cmlidXRvcnM6CisgKiAgICAgUmVkIEhhdCAtIEluaXRpYWwgQVBJIGFuZCBpbXBsZW1lbnRhdGlvbgorICoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKiovCitwYWNrYWdlIG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS5pbnRlcm5hbC5mbGF0OworCitpbXBvcnQgamF2YS5pby5GaWxlOworaW1wb3J0IGphdmEudXRpbC5BcnJheUxpc3Q7CitpbXBvcnQgamF2YS51dGlsLkFycmF5czsKK2ltcG9ydCBqYXZhLnV0aWwuSXRlcmF0b3I7CitpbXBvcnQgamF2YS51dGlsLkxpc3Q7CisKK2ltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJlc291cmNlcy5JQ29udGFpbmVyOworaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucmVzb3VyY2VzLklGaWxlOworaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucmVzb3VyY2VzLklSZXNvdXJjZTsKK2ltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJ1bnRpbWUuQ29yZUV4Y2VwdGlvbjsKK2ltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJ1bnRpbWUuSUFkYXB0YWJsZTsKK2ltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJ1bnRpbWUuSVBhdGg7CitpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5ydW50aW1lLlBhdGg7CitpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb21wb25lbnRjb3JlLnJlc291cmNlcy5JVmlydHVhbENvbXBvbmVudDsKK2ltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUucmVzb3VyY2VzLklWaXJ0dWFsQ29udGFpbmVyOworaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS5yZXNvdXJjZXMuSVZpcnR1YWxSZXNvdXJjZTsKKworLyoqCisgKiBUaGlzIHV0aWxpdHkgY2xhc3MgaXMgYWxtb3N0IGVudGlyZWx5IGNvcGllZCBmcm9tIENvbXBvbmVudERlcGxveWFibGUKKyAqIGFuZCBkZWFscyB3aXRoIHRoZSBudXRzIGFuZCBib2x0cyBvZiBjcmVhdGluZyB0aGUgbW9kZWwgb2JqZWN0cyB3aGVuCisgKiB3YWxraW5nIGEgcG9ydGlvbiBvZiB0aGUgdHJlZQorICovCitwdWJsaWMgY2xhc3MgVmlydHVhbENvbXBvbmVudEZsYXR0ZW5VdGlsaXR5IHsKKwlwdWJsaWMgc3RhdGljIGludGVyZmFjZSBTaG91bGRJbmNsdWRlVXRpbGl0eUNhbGxiYWNrIHsKKwkJcHVibGljIGJvb2xlYW4gc2hvdWxkQWRkQ29tcG9uZW50RmlsZShJVmlydHVhbENvbXBvbmVudCBjdXJyZW50LCBJRmxhdEZpbGUgZmlsZSk7CisJfQorCQorCXByaXZhdGUgTGlzdDxJRmxhdFJlc291cmNlPiBtZW1iZXJzOworCXByaXZhdGUgU2hvdWxkSW5jbHVkZVV0aWxpdHlDYWxsYmFjayBoYW5kbGVyOworCXB1YmxpYyBWaXJ0dWFsQ29tcG9uZW50RmxhdHRlblV0aWxpdHkoCisJCQlMaXN0PElGbGF0UmVzb3VyY2U+IG1lbWJlcnMsIFNob3VsZEluY2x1ZGVVdGlsaXR5Q2FsbGJhY2sgaGFuZGxlcikgeworCQl0aGlzLm1lbWJlcnMgPSBtZW1iZXJzOworCQl0aGlzLmhhbmRsZXIgPSBoYW5kbGVyOworCX0KKwkKKwlwdWJsaWMgdm9pZCBhZGRNZW1iZXJzKElWaXJ0dWFsQ29tcG9uZW50IGN1cnJlbnQsIElWaXJ0dWFsQ29udGFpbmVyIGNvbnQsIElQYXRoIHBhdGgpIHRocm93cyBDb3JlRXhjZXB0aW9uIHsKKwkJZW5zdXJlUGFyZW50RXhpc3RzKG1lbWJlcnMsIHBhdGgsIG51bGwpOworCQlGbGF0UmVzb3VyY2VbXSBtciA9IGFkZE1lbWJlcnNJbnRlcm5hbChjdXJyZW50LCBjb250LCBwYXRoKTsKKwkJaW50IHNpemUgPSBtci5sZW5ndGg7CisJCWZvciAoaW50IGogPSAwOyBqIDwgc2l6ZTsgaisrKSB7CisJCQltZW1iZXJzLmFkZChtcltqXSk7CisJCX0KKwl9CisJCisJLy8gQWRkIHRoaXMgY29udGFpbmVyJ3MgY2hpbGRyZW4KKwlwdWJsaWMgdm9pZCBhZGRDb250YWluZXIoSUNvbnRhaW5lciBjb250YWluZXIsIElQYXRoIHBhdGgpIHRocm93cyBDb3JlRXhjZXB0aW9uIHsKKwkJSVJlc291cmNlW10gY2hpbGRyZW4gPSBjb250YWluZXIubWVtYmVycygpOworCQlmb3IoIGludCBpID0gMDsgaSA8IGNoaWxkcmVuLmxlbmd0aDsgaSsrICkgeworCQkJaWYoIGNoaWxkcmVuW2ldIGluc3RhbmNlb2YgSUNvbnRhaW5lciApIHsKKwkJCQlhZGRDb250YWluZXJJbnRlcm5hbCgoSUNvbnRhaW5lciljaGlsZHJlbltpXSwgcGF0aCk7CisJCQl9IGVsc2UgaWYoIGNoaWxkcmVuW2ldIGluc3RhbmNlb2YgSUZpbGUgKXsKKwkJCQlhZGRGaWxlKG51bGwsIChJRmlsZSljaGlsZHJlbltpXSwgcGF0aCk7CisJCQl9CisJCX0KKwl9CisJCisJLy8gUGh5c2ljYWxseSBhZGRzIHRoaXMgY29udGFpbmVyCisJcHJvdGVjdGVkIHZvaWQgYWRkQ29udGFpbmVySW50ZXJuYWwoSUNvbnRhaW5lciBjb250YWluZXIsIElQYXRoIHBhdGgpIHRocm93cyBDb3JlRXhjZXB0aW9uIHsKKwkJSUZsYXRGb2xkZXIgbWYgPSAoRmxhdEZvbGRlcikgZ2V0RXhpc3RpbmdNb2R1bGVSZXNvdXJjZShtZW1iZXJzLHBhdGguYXBwZW5kKGNvbnRhaW5lci5nZXROYW1lKCkpLm1ha2VSZWxhdGl2ZSgpKTsKKwkJaWYoIG1mID09IG51bGwgKSB7CisJCQltZiA9IG5ldyBGbGF0Rm9sZGVyKGNvbnRhaW5lciwgY29udGFpbmVyLmdldE5hbWUoKSwgcGF0aCk7CisJCQlJRmxhdEZvbGRlciBwYXJlbnQgPSAoRmxhdEZvbGRlcikgZ2V0RXhpc3RpbmdNb2R1bGVSZXNvdXJjZShtZW1iZXJzLCBwYXRoKTsKKwkJCWlmIChwYXRoLmlzRW1wdHkoKSkKKwkJCQltZW1iZXJzLmFkZChtZik7CisJCQllbHNlIHsKKwkJCQlpZiAocGFyZW50ID09IG51bGwpCisJCQkJCXBhcmVudCA9IGVuc3VyZVBhcmVudEV4aXN0cyhtZW1iZXJzLCBwYXRoLCBjb250YWluZXIpOworCQkJCWFkZE1lbWJlcnNUb01vZHVsZUZvbGRlcihwYXJlbnQsIG5ldyBJRmxhdFJlc291cmNlW10ge21mfSk7CisJCQl9CisJCX0KKwkJLy8gcmVjdXJzZQorCQlhZGRDb250YWluZXIoY29udGFpbmVyLCBwYXRoLmFwcGVuZChjb250YWluZXIuZ2V0TmFtZSgpKSk7CisJfQorCQorCXByb3RlY3RlZCBGbGF0UmVzb3VyY2VbXSBhZGRNZW1iZXJzSW50ZXJuYWwoSVZpcnR1YWxDb21wb25lbnQgY3VycmVudCwgSVZpcnR1YWxDb250YWluZXIgY29udCwgSVBhdGggcGF0aCkgdGhyb3dzIENvcmVFeGNlcHRpb24geworCQlJVmlydHVhbFJlc291cmNlW10gcmVzID0gY29udC5tZW1iZXJzKCk7CisJCWludCBzaXplMiA9IHJlcy5sZW5ndGg7CisJCUxpc3QgbGlzdCA9IG5ldyBBcnJheUxpc3Qoc2l6ZTIpOworCQlmb3IgKGludCBqID0gMDsgaiA8IHNpemUyOyBqKyspIHsKKwkJCWlmIChyZXNbal0gaW5zdGFuY2VvZiBJVmlydHVhbENvbnRhaW5lcikgeworCQkJCUlWaXJ0dWFsQ29udGFpbmVyIGNjID0gKElWaXJ0dWFsQ29udGFpbmVyKSByZXNbal07CisJCQkJSUZsYXRGb2xkZXIgbWYgPSBhZGRWaXJ0dWFsQ29udGFpbmVySW50ZXJuYWwoY2MsIHBhdGgpOworCQkJCUlGbGF0UmVzb3VyY2VbXSBtciA9IGFkZE1lbWJlcnNJbnRlcm5hbChjdXJyZW50LCBjYywgcGF0aC5hcHBlbmQoY2MuZ2V0TmFtZSgpKSk7CisJCQkJYWRkTWVtYmVyc1RvTW9kdWxlRm9sZGVyKG1mLCBtcik7CisJCQl9IGVsc2UgeworCQkJCWFkZEZpbGUoY3VycmVudCwgcGF0aCwgKElBZGFwdGFibGUpcmVzW2pdKTsKKwkJCX0KKwkJfQorCQlGbGF0UmVzb3VyY2VbXSBtciA9IG5ldyBGbGF0UmVzb3VyY2VbbGlzdC5zaXplKCldOworCQlsaXN0LnRvQXJyYXkobXIpOworCQlyZXR1cm4gbXI7CisJfQorCQorCXB1YmxpYyB2b2lkIGFkZEZpbGUoSVZpcnR1YWxDb21wb25lbnQgY3VycmVudCwgSVBhdGggcGF0aCwgSUFkYXB0YWJsZSBmaWxlKSB7CisJCUlGaWxlIGYgPSAoSUZpbGUpZmlsZS5nZXRBZGFwdGVyKElGaWxlLmNsYXNzKTsKKwkJSUZsYXRGaWxlIG1mID0gbnVsbDsKKwkJaWYoIGYgIT0gbnVsbCApCisJCQkgbWYgPSBjcmVhdGVNb2R1bGVGaWxlKGYsIHBhdGgubWFrZVJlbGF0aXZlKCkpOworCQllbHNlIHsKKwkJCUZpbGUgZjIgPSAoRmlsZSlmaWxlLmdldEFkYXB0ZXIoRmlsZS5jbGFzcyk7CisJCQlpZiggZjIgIT0gbnVsbCApCisJCQkJbWYgPSBuZXcgRmxhdEZpbGUoZjIsIGYyLmdldE5hbWUoKSwgcGF0aC5tYWtlUmVsYXRpdmUoKSk7CisJCX0KKwkJaWYoIG1mICE9IG51bGwgKSB7CisJCQlpZiAoaGFuZGxlciA9PSBudWxsIHx8IGhhbmRsZXIuc2hvdWxkQWRkQ29tcG9uZW50RmlsZShjdXJyZW50LCBtZikpIHsKKwkJCQlpZiggbWYuZ2V0TW9kdWxlUmVsYXRpdmVQYXRoKCkuaXNFbXB0eSgpKSB7CisJCQkJCW1lbWJlcnMucmVtb3ZlKG1mKTsKKwkJCQkJbWVtYmVycy5hZGQobWYpOworCQkJCX0KKwkJCQllbHNlIHsKKwkJCQkJSUZsYXRGb2xkZXIgbW9kdWxlUGFyZW50ID0gVmlydHVhbENvbXBvbmVudEZsYXR0ZW5VdGlsaXR5LmVuc3VyZVBhcmVudEV4aXN0cyhtZW1iZXJzLCBtZi5nZXRNb2R1bGVSZWxhdGl2ZVBhdGgoKSwgbnVsbCk7CisJCQkJCUxpc3QgdGVtcFBhcmVudE1lbWJlcnMgPSBuZXcgQXJyYXlMaXN0KEFycmF5cy5hc0xpc3QobW9kdWxlUGFyZW50Lm1lbWJlcnMoKSkpOworCQkJCQl0ZW1wUGFyZW50TWVtYmVycy5yZW1vdmUobWYpOworCQkJCQl0ZW1wUGFyZW50TWVtYmVycy5hZGQobWYpOworCQkJCQltb2R1bGVQYXJlbnQuc2V0TWVtYmVycygoSUZsYXRSZXNvdXJjZVtdKSB0ZW1wUGFyZW50TWVtYmVycy50b0FycmF5KG5ldyBJRmxhdFJlc291cmNlW3RlbXBQYXJlbnRNZW1iZXJzLnNpemUoKV0pKTsKKwkJCQl9CisJCQl9CisJCX0KKwl9CisJCisJcHVibGljIHZvaWQgYWRkRmlsZShJVmlydHVhbENvbXBvbmVudCBjdXJyZW50LCBJRmlsZSBmLCBJUGF0aCBwYXRoKSB7CisJCWFkZEZpbGUoY3VycmVudCwgcGF0aCwgKElBZGFwdGFibGUpZik7CisJfQorCQorCXByb3RlY3RlZCBJRmxhdEZvbGRlciBhZGRWaXJ0dWFsQ29udGFpbmVySW50ZXJuYWwoSVZpcnR1YWxDb250YWluZXIgY2MsIElQYXRoIHBhdGgpIHsKKwkJLy8gUmV0cmlldmUgYWxyZWFkeSBleGlzdGluZyBtb2R1bGUgZm9sZGVyIGlmIGFwcGxpY2FibGUKKwkJSUZsYXRGb2xkZXIgbWYgPSAoRmxhdEZvbGRlcikgZ2V0RXhpc3RpbmdNb2R1bGVSZXNvdXJjZShtZW1iZXJzLHBhdGguYXBwZW5kKGNjLmdldE5hbWUoKSkubWFrZVJlbGF0aXZlKCkpOworCQlpZiAobWYgPT0gbnVsbCkgeworCQkJbWYgPSBuZXcgRmxhdEZvbGRlcigoSUNvbnRhaW5lciljYy5nZXRVbmRlcmx5aW5nUmVzb3VyY2UoKSwgY2MuZ2V0TmFtZSgpLCBwYXRoKTsKKwkJCUlGbGF0Rm9sZGVyIHBhcmVudCA9IChGbGF0Rm9sZGVyKSBnZXRFeGlzdGluZ01vZHVsZVJlc291cmNlKG1lbWJlcnMsIHBhdGgpOworCQkJaWYgKHBhdGguaXNFbXB0eSgpKQorCQkJCW1lbWJlcnMuYWRkKG1mKTsKKwkJCWVsc2UgeworCQkJCWlmIChwYXJlbnQgPT0gbnVsbCkKKwkJCQkJcGFyZW50ID0gZW5zdXJlUGFyZW50RXhpc3RzKG1lbWJlcnMsIHBhdGgsIChJQ29udGFpbmVyKWNjLmdldFVuZGVybHlpbmdSZXNvdXJjZSgpKTsKKwkJCQlhZGRNZW1iZXJzVG9Nb2R1bGVGb2xkZXIocGFyZW50LCBuZXcgSUZsYXRSZXNvdXJjZVtdIHttZn0pOworCQkJfQorCQl9CisJCXJldHVybiBtZjsKKwl9CisJCisJcHVibGljIHN0YXRpYyBGbGF0RmlsZSBjcmVhdGVNb2R1bGVGaWxlKGZpbmFsIElGaWxlIGZpbGUsIGZpbmFsIElQYXRoIHBhdGgpIHsKKwkJcmV0dXJuIG5ldyBGbGF0RmlsZShmaWxlLCBmaWxlLmdldE5hbWUoKSwgcGF0aCk7CisJfQorCisJCisJLyoqCisJICogQ2hlY2sgdGhlIGN1cnJlbnQgY2FjaGUgdG8gc2VlIGlmIHdlIGFscmVhZHkgaGF2ZSBhbiBleGlzdGluZyBtb2R1bGUgcmVzb3VyY2UgZm9yCisJICogdGhlIGdpdmVuIHBhdGguCisJICogQHBhcmFtIGFMaXN0CisJICogQHBhcmFtIHBhdGgKKwkgKiBAcmV0dXJuIGFuIGV4aXN0aW5nIG1vZHVsZVJlc291cmNlIGZyb20gdGhlIGNhY2hlZCByZXN1bHQKKwkgKi8KKwkgCisJcHVibGljIHN0YXRpYyBGbGF0UmVzb3VyY2UgZ2V0RXhpc3RpbmdNb2R1bGVSZXNvdXJjZShMaXN0IGFMaXN0LCBJUGF0aCBwYXRoKSB7IAorICAgIAkvLyBJZiB0aGUgbGlzdCBpcyBlbXB0eSwgcmV0dXJuIG51bGwKKyAgICAJaWYgKGFMaXN0PT1udWxsIHx8IGFMaXN0LmlzRW1wdHkoKSB8fCBwYXRoID09IG51bGwpCisgICAgCQlyZXR1cm4gbnVsbDsKKyAgICAJLy8gT3RoZXJ3aXNlIHJlY3Vyc2l2ZWx5IGNoZWNrIHRvIHNlZSBpZiBnaXZlbiByZXNvdXJjZSBtYXRjaGVzIGN1cnJlbnQgcmVzb3VyY2Ugb3IgaWYgaXQgaXMgYSBjaGlsZAorICAgIAlTdHJpbmdbXSBwYXRoU2VnbWVudHMgPSBwYXRoLnNlZ21lbnRzKCk7IAorICAgIAlGbGF0UmVzb3VyY2UgZXhwb3J0YWJsZVJlc291cmNlID0gbnVsbDsKKyAgICAJCisgICAgCWlmKHBhdGhTZWdtZW50cy5sZW5ndGggPT0gMCkKKyAgICAJCXJldHVybiBudWxsOworICAgIAlmb3IgKEl0ZXJhdG9yIGl0ZXIgPSBhTGlzdC5pdGVyYXRvcigpOyBpdGVyLmhhc05leHQoKTspIHsKKyAgICAJCWV4cG9ydGFibGVSZXNvdXJjZSA9IChGbGF0UmVzb3VyY2UpIGl0ZXIubmV4dCgpOyAgICAgCQorICAgIAkJU3RyaW5nW10gbW9kdWxlU2VnbWVudHMgPSBleHBvcnRhYmxlUmVzb3VyY2UuZ2V0TW9kdWxlUmVsYXRpdmVQYXRoKCkuc2VnbWVudHMoKTsKKyAgICAJCS8vIElmIHRoZSBsYXN0IHNlZ21lbnQgaW4gcGFzc2VkIGluIHBhdGggZXF1YWxzIHRoZSBtb2R1bGUgcmVzb3VyY2UgbmFtZSAKKyAgICAJCS8vIGFuZCBzZWdtZW50IGNvdW50IGlzIHRoZSBzYW1lIGFuZCB0aGUgcGF0aCBzZWdtZW50cyBzdGFydCB3aXRoIHRoZSBtb2R1bGUgcGF0aCBzZWdtZW50cworICAgIAkJLy8gdGhlbiB3ZSBoYXZlIGEgbWF0Y2ggYW5kIHdlIHJldHVybiB0aGUgZXhpc3RpbmcgbW9kdWxlUmVzb3VyY2UKKyAgICAJCWlmIChwYXRoU2VnbWVudHNbcGF0aFNlZ21lbnRzLmxlbmd0aCAtIDFdLmVxdWFscyhleHBvcnRhYmxlUmVzb3VyY2UuZ2V0TmFtZSgpKSAmJiAKKwkJICAgIAkJKG1vZHVsZVNlZ21lbnRzLmxlbmd0aCArIDEpID09IHBhdGhTZWdtZW50cy5sZW5ndGggJiYgCisJCSAgICAJCXN0YXJ0c1dpdGgobW9kdWxlU2VnbWVudHMsIHBhdGhTZWdtZW50cykpCisJCSAgICAJcmV0dXJuIGV4cG9ydGFibGVSZXNvdXJjZTsgCisgICAgCQkKKyAgICAJCS8vIE90aGVyd2lzZSwgaWYgaXQgaXMgYSBmb2xkZXIsIGNoZWNrIGl0cyBjaGlsZHJlbiBmb3IgdGhlIGV4aXN0aW5nIHJlc291cmNlIHBhdGgKKyAgICAJCS8vIGJ1dCBvbmx5IGNoZWNrIGlmIHRoZSBiZWdpbm5pbmcgc2VnbWVudHMgYXJlIGEgbWF0Y2gKKwkgICAgCWlmKGV4cG9ydGFibGVSZXNvdXJjZSBpbnN0YW5jZW9mIEZsYXRGb2xkZXIgJiYgCisJICAgIAkJCXN0YXJ0c1dpdGgobW9kdWxlU2VnbWVudHMsIHBhdGhTZWdtZW50cykgJiYgcGF0aFNlZ21lbnRzLmxlbmd0aCA+IG1vZHVsZVNlZ21lbnRzLmxlbmd0aCAmJgorCSAgICAJCQlleHBvcnRhYmxlUmVzb3VyY2UuZ2V0TmFtZSgpLmVxdWFscyhwYXRoU2VnbWVudHNbbW9kdWxlU2VnbWVudHMubGVuZ3RoID4gMCA/IG1vZHVsZVNlZ21lbnRzLmxlbmd0aCA6IDBdKSkJICAgIAkgIAorICAgIAkJCWlmICgoKEZsYXRGb2xkZXIpZXhwb3J0YWJsZVJlc291cmNlKS5tZW1iZXJzKCkhPW51bGwpCisgICAgCQkJCXJldHVybiBnZXRFeGlzdGluZ01vZHVsZVJlc291cmNlKEFycmF5cy5hc0xpc3QoKChGbGF0Rm9sZGVyKWV4cG9ydGFibGVSZXNvdXJjZSkubWVtYmVycygpKSxwYXRoKTsKKyAgICAJfQorICAgIAlyZXR1cm4gbnVsbDsKKyAgICB9CisJCisJLyoqCisJICogQHJldHVybiBUcnVlIGlmIGJlZ2lubmluZ1NlZ21lbnRzW2ldID09IHRlc3RTZWdtZW50c1tpXSBmb3IgYWxsIDA8PWk8YmVnaW5uaW5nU2VnbWVudHNbaV0gCisJICovCisJcHJpdmF0ZSBzdGF0aWMgYm9vbGVhbiBzdGFydHNXaXRoKFN0cmluZ1tdIGJlZ2lubmluZ1NlZ21lbnRzLCBTdHJpbmdbXSB0ZXN0U2VnbWVudHMpIHsgCisJCWZvcihpbnQgaT0wOyBpIDwgYmVnaW5uaW5nU2VnbWVudHMubGVuZ3RoOyBpKyspIHsKKwkJCWlmKCFiZWdpbm5pbmdTZWdtZW50c1tpXS5lcXVhbHModGVzdFNlZ21lbnRzW2ldKSkKKwkJCQlyZXR1cm4gZmFsc2U7CisJCX0KKwkJcmV0dXJuIHRydWU7CisJfQorCQorCXB1YmxpYyBzdGF0aWMgSUZsYXRGb2xkZXIgZW5zdXJlUGFyZW50RXhpc3RzKExpc3Q8SUZsYXRSZXNvdXJjZT4gbWVtYmVycywgSVBhdGggcGF0aCwgSUNvbnRhaW5lciBjYykgeworCQlJRmxhdEZvbGRlciBwYXJlbnQgPSAoSUZsYXRGb2xkZXIpIGdldEV4aXN0aW5nTW9kdWxlUmVzb3VyY2UobWVtYmVycywgcGF0aCk7CisJCWlmIChwYXJlbnQgPT0gbnVsbCAmJiBwYXRoLnNlZ21lbnRDb3VudCgpID4gMCkgeworCQkJU3RyaW5nIGZvbGRlck5hbWUgPSBwYXRoLmxhc3RTZWdtZW50KCk7CisJCQlJUGF0aCBmb2xkZXJQYXRoID0gUGF0aC5FTVBUWTsKKwkJCWlmIChwYXRoLnNlZ21lbnRDb3VudCgpPjEpCisJCQkJZm9sZGVyUGF0aCA9IHBhdGgucmVtb3ZlTGFzdFNlZ21lbnRzKDEpOworCQkJcGFyZW50ID0gbmV3IEZsYXRGb2xkZXIoY2MsIGZvbGRlck5hbWUsIGZvbGRlclBhdGgpOworCQkJaWYgKHBhdGguc2VnbWVudENvdW50KCk+MSkKKwkJCQlhZGRNZW1iZXJzVG9Nb2R1bGVGb2xkZXIoZW5zdXJlUGFyZW50RXhpc3RzKG1lbWJlcnMsIHBhdGgucmVtb3ZlTGFzdFNlZ21lbnRzKDEpLGNjKSwgbmV3IElGbGF0UmVzb3VyY2VbXSB7cGFyZW50fSk7CisJCQllbHNlCisJCQkJbWVtYmVycy5hZGQocGFyZW50KTsKKwkJfQorCQlyZXR1cm4gcGFyZW50OworCX0KKwkKKwkvKioKKwkgKiBBZGQgdGhlIHJlc291cmNlcyBmcm9tIG1yIHRvIHRoZSBleGlzdGluZyByZXNvdXJjZXMgaW4gTW9kdWxlIEZvbGRlciBtZgorCSAqIEBwYXJhbSBNb2R1bGVGb2xkZXIgbWYKKwkgKiBAcGFyYW0gSU1vZHVsZVJlc291cmNlW10gbXIKKwkgKi8KKwlwdWJsaWMgc3RhdGljIHZvaWQgYWRkTWVtYmVyc1RvTW9kdWxlRm9sZGVyKElGbGF0Rm9sZGVyIG1mLCBJRmxhdFJlc291cmNlW10gbXIpIHsKKwkJLy8gSWYgdGhlIGZvbGRlciBpcyBudWxsIG9yIHRoZSByZXNvdXJjZXMgdG8gYWRkIGFyZSBudWxsIG9yIGVtcHR5LCBiYWlsIGFuZCByZXR1cm4KKwkJaWYgKG1mID09IG51bGwgfHwgbXIgPT0gbnVsbCB8fCBtci5sZW5ndGg9PTApIAorCQkJcmV0dXJuOworCQkvLyBHZXQgdGhlIGV4aXN0aW5nIG1lbWJlcnMgaW4gdGhlIG1vZHVsZSBmb2xkZXIKKwkJSUZsYXRSZXNvdXJjZVtdIG1mX21lbWJlcnMgPSBtZi5tZW1iZXJzKCk7CisJCWludCBtZl9zaXplID0gMDsKKwkJLy8gR2V0IHRoZSBsZW5ndGggb2YgdGhlIGV4aXN0aW5nIG1lbWJlcnMgaW4gdGhlIG1vZHVsZSBmb2xkZXIKKwkJaWYgKG1mX21lbWJlcnMgIT0gbnVsbCkKKwkJCW1mX3NpemUgPSBtZl9tZW1iZXJzLmxlbmd0aDsKKwkJLy8gQ3JlYXRlIGEgbmV3IGFycmF5IHRvIHNldCBvbiB0aGUgbW9kdWxlIGZvbGRlciB3aGljaCB3aWxsIGNvbWJpbmUgdGhlIGV4aXN0aW5nIGFuZAorCQkvLyBuZXcgbW9kdWxlIHJlc291cmNlcworCQlJRmxhdFJlc291cmNlW10gcmVzID0gbmV3IEZsYXRSZXNvdXJjZVttZl9zaXplICsgbXIubGVuZ3RoXTsKKwkJLy8gQ29weSB0aGUgZXhpc3RpbmcgbWVtYmVycyBpbnRvIHRoZSBhcnJheSBpZiB0aGVyZSBhcmUgYW55CisJCWlmIChtZl9tZW1iZXJzICE9IG51bGwgJiYgbWZfc2l6ZSA+IDApCisJCQlTeXN0ZW0uYXJyYXljb3B5KG1mX21lbWJlcnMsIDAsIHJlcywgMCwgbWZfc2l6ZSk7CisJCS8vIENvcHkgdGhlIG5ldyBtZW1iZXJzIGludG8gdGhlIGFycmF5CisJCVN5c3RlbS5hcnJheWNvcHkobXIsIDAsIHJlcywgbWZfc2l6ZSwgbXIubGVuZ3RoKTsKKwkJLy8gU2V0IHRoZSBuZXcgbWVtYmVycyBhcnJheSBvbiB0aGUgbW9kdWxlIGZvbGRlcgorCQltZi5zZXRNZW1iZXJzKHJlcyk7CisJfQorCQorfQpkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUvbW9kdWxlY29yZS1zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9jb21wb25lbnRjb3JlL2ludGVybmFsL2ltcGwvQ29tcG9uZW50Q29yZVVSSUNvbnZlcnRlci5qYXZhIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUvbW9kdWxlY29yZS1zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9jb21wb25lbnRjb3JlL2ludGVybmFsL2ltcGwvQ29tcG9uZW50Q29yZVVSSUNvbnZlcnRlci5qYXZhCmluZGV4IGEyNzIyYjYuLjI3MzljYWQgMTAwNjQ0Ci0tLSBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlL21vZHVsZWNvcmUtc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vY29tcG9uZW50Y29yZS9pbnRlcm5hbC9pbXBsL0NvbXBvbmVudENvcmVVUklDb252ZXJ0ZXIuamF2YQorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS9tb2R1bGVjb3JlLXNyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2NvbXBvbmVudGNvcmUvaW50ZXJuYWwvaW1wbC9Db21wb25lbnRDb3JlVVJJQ29udmVydGVyLmphdmEKQEAgLTI2LDYgKzI2LDcgQEAKIGltcG9ydCBvcmcuZWNsaXBzZS5qZW0udXRpbC5lbWYud29ya2JlbmNoLlJlc291cmNlU2V0V29ya2JlbmNoU3luY2hyb25pemVyOwogaW1wb3J0IG9yZy5lY2xpcHNlLmplbS51dGlsLmVtZi53b3JrYmVuY2guV29ya2JlbmNoUmVzb3VyY2VIZWxwZXJCYXNlOwogaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS5Db21wb25lbnRDb3JlOworaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS5pbnRlcm5hbC5Nb2R1bGVjb3JlUGx1Z2luOwogaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS5yZXNvdXJjZXMuSVZpcnR1YWxDb21wb25lbnQ7CiBpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb21wb25lbnRjb3JlLnJlc291cmNlcy5JVmlydHVhbEZpbGU7CiBpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb21wb25lbnRjb3JlLnJlc291cmNlcy5JVmlydHVhbEZvbGRlcjsKQEAgLTc5LDggKzgwLDggQEAKIAkJaWYoUGxhdGZvcm1VUkxNb2R1bGVDb25uZWN0aW9uLk1PRFVMRS5lcXVhbHMoYVVSSS5zY2hlbWUoKSkpIHsgCQkKIAkJCXRyeSB7CiAJCQkJbm9ybWFsaXplZFVSSSA9IFBsYXRmb3JtVVJMTW9kdWxlQ29ubmVjdGlvbi5yZXNvbHZlKGFVUkkpOwotCQkJfSBjYXRjaChJT0V4Y2VwdGlvbiBpb2UpIHsKLQkJCQlpb2UucHJpbnRTdGFja1RyYWNlKCk7CisJCQl9IGNhdGNoKElPRXhjZXB0aW9uIGUpIHsKKwkJCQlNb2R1bGVjb3JlUGx1Z2luLmxvZ0Vycm9yKGUpOwogCQkJfSAKIAkJfSBlbHNlIHsKIAkJCW5vcm1hbGl6ZWRVUkkgPSBzdXBlci5ub3JtYWxpemUoYVVSSSk7CkBAIC0xMDksNyArMTEwLDcgQEAKIAkJCXJldHVybiBVUkkuY3JlYXRlUGxhdGZvcm1SZXNvdXJjZVVSSShuZXdGaWxlLmdldFdvcmtzcGFjZVJlbGF0aXZlUGF0aCgpLnRvU3RyaW5nKCkpOwogCQkJIAogCQl9IGNhdGNoKEV4Y2VwdGlvbiBlKSB7Ci0JCQllLnByaW50U3RhY2tUcmFjZSgpOworCQkJTW9kdWxlY29yZVBsdWdpbi5sb2dFcnJvcihlKTsKIAkJfQogCQlyZXR1cm4gbnVsbDsKIAl9CmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS9tb2R1bGVjb3JlLXNyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2NvbXBvbmVudGNvcmUvaW50ZXJuYWwvaW1wbC9Db21wb25lbnRSZXNvdXJjZUltcGwuamF2YSBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlL21vZHVsZWNvcmUtc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vY29tcG9uZW50Y29yZS9pbnRlcm5hbC9pbXBsL0NvbXBvbmVudFJlc291cmNlSW1wbC5qYXZhCmluZGV4IDkxNDc0NjYuLjg0ZWEzNmQgMTAwNjQ0Ci0tLSBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlL21vZHVsZWNvcmUtc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vY29tcG9uZW50Y29yZS9pbnRlcm5hbC9pbXBsL0NvbXBvbmVudFJlc291cmNlSW1wbC5qYXZhCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlL21vZHVsZWNvcmUtc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vY29tcG9uZW50Y29yZS9pbnRlcm5hbC9pbXBsL0NvbXBvbmVudFJlc291cmNlSW1wbC5qYXZhCkBAIC0yLDcgKzIsNyBAQAogICogPGNvcHlyaWdodD4KICAqIDwvY29weXJpZ2h0PgogICoKLSAqICRJZDogQ29tcG9uZW50UmVzb3VyY2VJbXBsLmphdmEsdiAxLjMgMjAwNi8wMS8xMSAxODo0MDozMSBjYnJpZGdoYSBFeHAgJAorICogJElkOiBDb21wb25lbnRSZXNvdXJjZUltcGwuamF2YSx2IDEuNCAyMDEwLzA1LzEzIDA0OjA0OjM1IGNhbmRlcnNvbiBFeHAgJAogICovCiBwYWNrYWdlIG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS5pbnRlcm5hbC5pbXBsOwogCkBAIC0yMyw2ICsyMyw3IEBACiBpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb21wb25lbnRjb3JlLmludGVybmFsLkNvbXBvbmVudFJlc291cmNlOwogaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS5pbnRlcm5hbC5Db21wb25lbnRjb3JlUGFja2FnZTsKIGltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUuaW50ZXJuYWwuV29ya2JlbmNoQ29tcG9uZW50OworaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uaW50ZXJuYWwuZW1mLnV0aWxpdGllcy5FeHRlbmRlZEVjb3JlVXRpbC5FU3luY2hyb25pemVkQWRhcHRlckxpc3Q7CiAKIC8qKgogICogPCEtLSBiZWdpbi11c2VyLWRvYyAtLT4KQEAgLTQzMCw1ICs0MzEsMTUgQEAKIAkJb3duaW5nUHJvamVjdCA9IGFQcm9qZWN0OwogCX0KIAkKKwlAT3ZlcnJpZGUKKwlwdWJsaWMgRUxpc3QgZUFkYXB0ZXJzKCkKKwkgIHsKKwkgICAgaWYgKGVBZGFwdGVycyA9PSBudWxsKQorCSAgICB7CisJICAgICAgZUFkYXB0ZXJzID0gIG5ldyBFU3luY2hyb25pemVkQWRhcHRlckxpc3QodGhpcyk7CisJICAgIH0KKwkgICAgcmV0dXJuIGVBZGFwdGVyczsKKwkgIH0KKwkKIAogfSAvL0NvbXBvbmVudFJlc291cmNlSW1wbApkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUvbW9kdWxlY29yZS1zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9jb21wb25lbnRjb3JlL2ludGVybmFsL2ltcGwvQ29tcG9uZW50Y29yZVBhY2thZ2VJbXBsLmphdmEgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS9tb2R1bGVjb3JlLXNyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2NvbXBvbmVudGNvcmUvaW50ZXJuYWwvaW1wbC9Db21wb25lbnRjb3JlUGFja2FnZUltcGwuamF2YQppbmRleCA4ODhiYTU0Li5jMDRlZWRkIDEwMDY0NAotLS0gYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS9tb2R1bGVjb3JlLXNyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2NvbXBvbmVudGNvcmUvaW50ZXJuYWwvaW1wbC9Db21wb25lbnRjb3JlUGFja2FnZUltcGwuamF2YQorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS9tb2R1bGVjb3JlLXNyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2NvbXBvbmVudGNvcmUvaW50ZXJuYWwvaW1wbC9Db21wb25lbnRjb3JlUGFja2FnZUltcGwuamF2YQpAQCAtMiw3ICsyLDcgQEAKICAqIDxjb3B5cmlnaHQ+CiAgKiA8L2NvcHlyaWdodD4KICAqCi0gKiAkSWQ6IENvbXBvbmVudGNvcmVQYWNrYWdlSW1wbC5qYXZhLHYgMS45IDIwMDYvMDQvMjcgMDQ6MTc6NDAgY2JyaWRnaGEgRXhwICQKKyAqICRJZDogQ29tcG9uZW50Y29yZVBhY2thZ2VJbXBsLmphdmEsdiAxLjEwIDIwMDkvMDYvMDkgMjA6MDI6MDQganNob2xsIEV4cCAkCiAgKi8KIHBhY2thZ2Ugb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb21wb25lbnRjb3JlLmludGVybmFsLmltcGw7CiAKQEAgLTU2Nyw1MSArNTY3LDUxIEBACiAJCS8vIEFkZCBzdXBlcnR5cGVzIHRvIGNsYXNzZXMKIAogCQkvLyBJbml0aWFsaXplIGNsYXNzZXMgYW5kIGZlYXR1cmVzOyBhZGQgb3BlcmF0aW9ucyBhbmQgcGFyYW1ldGVycwotCQlpbml0RUNsYXNzKHdvcmtiZW5jaENvbXBvbmVudEVDbGFzcywgV29ya2JlbmNoQ29tcG9uZW50LmNsYXNzLCAiV29ya2JlbmNoQ29tcG9uZW50IiwgIUlTX0FCU1RSQUNULCAhSVNfSU5URVJGQUNFLCBJU19HRU5FUkFURURfSU5TVEFOQ0VfQ0xBU1MpOwotCQlpbml0RUF0dHJpYnV0ZShnZXRXb3JrYmVuY2hDb21wb25lbnRfTmFtZSgpLCBlY29yZVBhY2thZ2UuZ2V0RVN0cmluZygpLCAibmFtZSIsICIiLCAxLCAxLCBXb3JrYmVuY2hDb21wb25lbnQuY2xhc3MsICFJU19UUkFOU0lFTlQsICFJU19WT0xBVElMRSwgSVNfQ0hBTkdFQUJMRSwgIUlTX1VOU0VUVEFCTEUsICFJU19JRCwgSVNfVU5JUVVFLCAhSVNfREVSSVZFRCwgSVNfT1JERVJFRCk7Ci0JCWluaXRFUmVmZXJlbmNlKGdldFdvcmtiZW5jaENvbXBvbmVudF9SZXNvdXJjZXMoKSwgdGhpcy5nZXRDb21wb25lbnRSZXNvdXJjZSgpLCB0aGlzLmdldENvbXBvbmVudFJlc291cmNlX0NvbXBvbmVudCgpLCAicmVzb3VyY2VzIiwgbnVsbCwgMCwgLTEsIFdvcmtiZW5jaENvbXBvbmVudC5jbGFzcywgIUlTX1RSQU5TSUVOVCwgIUlTX1ZPTEFUSUxFLCBJU19DSEFOR0VBQkxFLCBJU19DT01QT1NJVEUsICFJU19SRVNPTFZFX1BST1hJRVMsICFJU19VTlNFVFRBQkxFLCAhSVNfVU5JUVVFLCAhSVNfREVSSVZFRCwgSVNfT1JERVJFRCk7Ci0JCWluaXRFUmVmZXJlbmNlKGdldFdvcmtiZW5jaENvbXBvbmVudF9Db21wb25lbnRUeXBlKCksIHRoaXMuZ2V0Q29tcG9uZW50VHlwZSgpLCBudWxsLCAiY29tcG9uZW50VHlwZSIsIG51bGwsIDEsIDEsIFdvcmtiZW5jaENvbXBvbmVudC5jbGFzcywgIUlTX1RSQU5TSUVOVCwgIUlTX1ZPTEFUSUxFLCBJU19DSEFOR0VBQkxFLCBJU19DT01QT1NJVEUsICFJU19SRVNPTFZFX1BST1hJRVMsICFJU19VTlNFVFRBQkxFLCAhSVNfVU5JUVVFLCAhSVNfREVSSVZFRCwgSVNfT1JERVJFRCk7Ci0JCWluaXRFUmVmZXJlbmNlKGdldFdvcmtiZW5jaENvbXBvbmVudF9SZWZlcmVuY2VkQ29tcG9uZW50cygpLCB0aGlzLmdldFJlZmVyZW5jZWRDb21wb25lbnQoKSwgbnVsbCwgInJlZmVyZW5jZWRDb21wb25lbnRzIiwgbnVsbCwgMCwgLTEsIFdvcmtiZW5jaENvbXBvbmVudC5jbGFzcywgIUlTX1RSQU5TSUVOVCwgIUlTX1ZPTEFUSUxFLCBJU19DSEFOR0VBQkxFLCBJU19DT01QT1NJVEUsICFJU19SRVNPTFZFX1BST1hJRVMsICFJU19VTlNFVFRBQkxFLCAhSVNfVU5JUVVFLCAhSVNfREVSSVZFRCwgSVNfT1JERVJFRCk7Ci0JCWluaXRFUmVmZXJlbmNlKGdldFdvcmtiZW5jaENvbXBvbmVudF9Qcm9wZXJ0aWVzKCksIHRoaXMuZ2V0UHJvcGVydHkoKSwgbnVsbCwgInByb3BlcnRpZXMiLCBudWxsLCAwLCAtMSwgV29ya2JlbmNoQ29tcG9uZW50LmNsYXNzLCAhSVNfVFJBTlNJRU5ULCAhSVNfVk9MQVRJTEUsIElTX0NIQU5HRUFCTEUsICFJU19DT01QT1NJVEUsIElTX1JFU09MVkVfUFJPWElFUywgIUlTX1VOU0VUVEFCTEUsIElTX1VOSVFVRSwgIUlTX0RFUklWRUQsIElTX09SREVSRUQpOwotCQlpbml0RUF0dHJpYnV0ZShnZXRXb3JrYmVuY2hDb21wb25lbnRfTWV0YWRhdGFSZXNvdXJjZXMoKSwgdGhpcy5nZXRJUGF0aCgpLCAibWV0YWRhdGFSZXNvdXJjZXMiLCBudWxsLCAwLCAtMSwgV29ya2JlbmNoQ29tcG9uZW50LmNsYXNzLCAhSVNfVFJBTlNJRU5ULCAhSVNfVk9MQVRJTEUsIElTX0NIQU5HRUFCTEUsICFJU19VTlNFVFRBQkxFLCAhSVNfSUQsIElTX1VOSVFVRSwgIUlTX0RFUklWRUQsIElTX09SREVSRUQpOworCQlpbml0RUNsYXNzKHdvcmtiZW5jaENvbXBvbmVudEVDbGFzcywgV29ya2JlbmNoQ29tcG9uZW50LmNsYXNzLCAiV29ya2JlbmNoQ29tcG9uZW50IiwgIUlTX0FCU1RSQUNULCAhSVNfSU5URVJGQUNFLCBJU19HRU5FUkFURURfSU5TVEFOQ0VfQ0xBU1MpOyAvLyROT04tTkxTLTEkCisJCWluaXRFQXR0cmlidXRlKGdldFdvcmtiZW5jaENvbXBvbmVudF9OYW1lKCksIGVjb3JlUGFja2FnZS5nZXRFU3RyaW5nKCksICJuYW1lIiwgIiIsIDEsIDEsIFdvcmtiZW5jaENvbXBvbmVudC5jbGFzcywgIUlTX1RSQU5TSUVOVCwgIUlTX1ZPTEFUSUxFLCBJU19DSEFOR0VBQkxFLCAhSVNfVU5TRVRUQUJMRSwgIUlTX0lELCBJU19VTklRVUUsICFJU19ERVJJVkVELCBJU19PUkRFUkVEKTsgLy8kTk9OLU5MUy0xJAorCQlpbml0RVJlZmVyZW5jZShnZXRXb3JrYmVuY2hDb21wb25lbnRfUmVzb3VyY2VzKCksIHRoaXMuZ2V0Q29tcG9uZW50UmVzb3VyY2UoKSwgdGhpcy5nZXRDb21wb25lbnRSZXNvdXJjZV9Db21wb25lbnQoKSwgInJlc291cmNlcyIsIG51bGwsIDAsIC0xLCBXb3JrYmVuY2hDb21wb25lbnQuY2xhc3MsICFJU19UUkFOU0lFTlQsICFJU19WT0xBVElMRSwgSVNfQ0hBTkdFQUJMRSwgSVNfQ09NUE9TSVRFLCAhSVNfUkVTT0xWRV9QUk9YSUVTLCAhSVNfVU5TRVRUQUJMRSwgIUlTX1VOSVFVRSwgIUlTX0RFUklWRUQsIElTX09SREVSRUQpOyAvLyROT04tTkxTLTEkCisJCWluaXRFUmVmZXJlbmNlKGdldFdvcmtiZW5jaENvbXBvbmVudF9Db21wb25lbnRUeXBlKCksIHRoaXMuZ2V0Q29tcG9uZW50VHlwZSgpLCBudWxsLCAiY29tcG9uZW50VHlwZSIsIG51bGwsIDEsIDEsIFdvcmtiZW5jaENvbXBvbmVudC5jbGFzcywgIUlTX1RSQU5TSUVOVCwgIUlTX1ZPTEFUSUxFLCBJU19DSEFOR0VBQkxFLCBJU19DT01QT1NJVEUsICFJU19SRVNPTFZFX1BST1hJRVMsICFJU19VTlNFVFRBQkxFLCAhSVNfVU5JUVVFLCAhSVNfREVSSVZFRCwgSVNfT1JERVJFRCk7IC8vJE5PTi1OTFMtMSQKKwkJaW5pdEVSZWZlcmVuY2UoZ2V0V29ya2JlbmNoQ29tcG9uZW50X1JlZmVyZW5jZWRDb21wb25lbnRzKCksIHRoaXMuZ2V0UmVmZXJlbmNlZENvbXBvbmVudCgpLCBudWxsLCAicmVmZXJlbmNlZENvbXBvbmVudHMiLCBudWxsLCAwLCAtMSwgV29ya2JlbmNoQ29tcG9uZW50LmNsYXNzLCAhSVNfVFJBTlNJRU5ULCAhSVNfVk9MQVRJTEUsIElTX0NIQU5HRUFCTEUsIElTX0NPTVBPU0lURSwgIUlTX1JFU09MVkVfUFJPWElFUywgIUlTX1VOU0VUVEFCTEUsICFJU19VTklRVUUsICFJU19ERVJJVkVELCBJU19PUkRFUkVEKTsgLy8kTk9OLU5MUy0xJAorCQlpbml0RVJlZmVyZW5jZShnZXRXb3JrYmVuY2hDb21wb25lbnRfUHJvcGVydGllcygpLCB0aGlzLmdldFByb3BlcnR5KCksIG51bGwsICJwcm9wZXJ0aWVzIiwgbnVsbCwgMCwgLTEsIFdvcmtiZW5jaENvbXBvbmVudC5jbGFzcywgIUlTX1RSQU5TSUVOVCwgIUlTX1ZPTEFUSUxFLCBJU19DSEFOR0VBQkxFLCAhSVNfQ09NUE9TSVRFLCBJU19SRVNPTFZFX1BST1hJRVMsICFJU19VTlNFVFRBQkxFLCBJU19VTklRVUUsICFJU19ERVJJVkVELCBJU19PUkRFUkVEKTsgLy8kTk9OLU5MUy0xJAorCQlpbml0RUF0dHJpYnV0ZShnZXRXb3JrYmVuY2hDb21wb25lbnRfTWV0YWRhdGFSZXNvdXJjZXMoKSwgdGhpcy5nZXRJUGF0aCgpLCAibWV0YWRhdGFSZXNvdXJjZXMiLCBudWxsLCAwLCAtMSwgV29ya2JlbmNoQ29tcG9uZW50LmNsYXNzLCAhSVNfVFJBTlNJRU5ULCAhSVNfVk9MQVRJTEUsIElTX0NIQU5HRUFCTEUsICFJU19VTlNFVFRBQkxFLCAhSVNfSUQsIElTX1VOSVFVRSwgIUlTX0RFUklWRUQsIElTX09SREVSRUQpOyAvLyROT04tTkxTLTEkCiAKLQkJaW5pdEVDbGFzcyhjb21wb25lbnRSZXNvdXJjZUVDbGFzcywgQ29tcG9uZW50UmVzb3VyY2UuY2xhc3MsICJDb21wb25lbnRSZXNvdXJjZSIsICFJU19BQlNUUkFDVCwgIUlTX0lOVEVSRkFDRSwgSVNfR0VORVJBVEVEX0lOU1RBTkNFX0NMQVNTKTsKLQkJaW5pdEVBdHRyaWJ1dGUoZ2V0Q29tcG9uZW50UmVzb3VyY2VfU291cmNlUGF0aCgpLCB0aGlzLmdldElQYXRoKCksICJzb3VyY2VQYXRoIiwgbnVsbCwgMSwgMSwgQ29tcG9uZW50UmVzb3VyY2UuY2xhc3MsICFJU19UUkFOU0lFTlQsICFJU19WT0xBVElMRSwgSVNfQ0hBTkdFQUJMRSwgIUlTX1VOU0VUVEFCTEUsICFJU19JRCwgSVNfVU5JUVVFLCAhSVNfREVSSVZFRCwgSVNfT1JERVJFRCk7Ci0JCWluaXRFQXR0cmlidXRlKGdldENvbXBvbmVudFJlc291cmNlX1J1bnRpbWVQYXRoKCksIHRoaXMuZ2V0SVBhdGgoKSwgInJ1bnRpbWVQYXRoIiwgbnVsbCwgMSwgMSwgQ29tcG9uZW50UmVzb3VyY2UuY2xhc3MsICFJU19UUkFOU0lFTlQsICFJU19WT0xBVElMRSwgSVNfQ0hBTkdFQUJMRSwgIUlTX1VOU0VUVEFCTEUsICFJU19JRCwgSVNfVU5JUVVFLCAhSVNfREVSSVZFRCwgSVNfT1JERVJFRCk7Ci0JCWluaXRFQXR0cmlidXRlKGdldENvbXBvbmVudFJlc291cmNlX0V4Y2x1c2lvbnMoKSwgZWNvcmVQYWNrYWdlLmdldEVTdHJpbmcoKSwgImV4Y2x1c2lvbnMiLCAiIiwgMCwgLTEsIENvbXBvbmVudFJlc291cmNlLmNsYXNzLCAhSVNfVFJBTlNJRU5ULCAhSVNfVk9MQVRJTEUsIElTX0NIQU5HRUFCTEUsICFJU19VTlNFVFRBQkxFLCAhSVNfSUQsIElTX1VOSVFVRSwgIUlTX0RFUklWRUQsIElTX09SREVSRUQpOwotCQlpbml0RVJlZmVyZW5jZShnZXRDb21wb25lbnRSZXNvdXJjZV9Db21wb25lbnQoKSwgdGhpcy5nZXRXb3JrYmVuY2hDb21wb25lbnQoKSwgdGhpcy5nZXRXb3JrYmVuY2hDb21wb25lbnRfUmVzb3VyY2VzKCksICJjb21wb25lbnQiLCBudWxsLCAxLCAxLCBDb21wb25lbnRSZXNvdXJjZS5jbGFzcywgIUlTX1RSQU5TSUVOVCwgIUlTX1ZPTEFUSUxFLCBJU19DSEFOR0VBQkxFLCAhSVNfQ09NUE9TSVRFLCAhSVNfUkVTT0xWRV9QUk9YSUVTLCAhSVNfVU5TRVRUQUJMRSwgIUlTX1VOSVFVRSwgIUlTX0RFUklWRUQsIElTX09SREVSRUQpOwotCQlpbml0RUF0dHJpYnV0ZShnZXRDb21wb25lbnRSZXNvdXJjZV9SZXNvdXJjZVR5cGUoKSwgZWNvcmVQYWNrYWdlLmdldEVTdHJpbmcoKSwgInJlc291cmNlVHlwZSIsICIiLCAxLCAxLCBDb21wb25lbnRSZXNvdXJjZS5jbGFzcywgIUlTX1RSQU5TSUVOVCwgIUlTX1ZPTEFUSUxFLCBJU19DSEFOR0VBQkxFLCAhSVNfVU5TRVRUQUJMRSwgIUlTX0lELCBJU19VTklRVUUsICFJU19ERVJJVkVELCBJU19PUkRFUkVEKTsKKwkJaW5pdEVDbGFzcyhjb21wb25lbnRSZXNvdXJjZUVDbGFzcywgQ29tcG9uZW50UmVzb3VyY2UuY2xhc3MsICJDb21wb25lbnRSZXNvdXJjZSIsICFJU19BQlNUUkFDVCwgIUlTX0lOVEVSRkFDRSwgSVNfR0VORVJBVEVEX0lOU1RBTkNFX0NMQVNTKTsgLy8kTk9OLU5MUy0xJAorCQlpbml0RUF0dHJpYnV0ZShnZXRDb21wb25lbnRSZXNvdXJjZV9Tb3VyY2VQYXRoKCksIHRoaXMuZ2V0SVBhdGgoKSwgInNvdXJjZVBhdGgiLCBudWxsLCAxLCAxLCBDb21wb25lbnRSZXNvdXJjZS5jbGFzcywgIUlTX1RSQU5TSUVOVCwgIUlTX1ZPTEFUSUxFLCBJU19DSEFOR0VBQkxFLCAhSVNfVU5TRVRUQUJMRSwgIUlTX0lELCBJU19VTklRVUUsICFJU19ERVJJVkVELCBJU19PUkRFUkVEKTsgLy8kTk9OLU5MUy0xJAorCQlpbml0RUF0dHJpYnV0ZShnZXRDb21wb25lbnRSZXNvdXJjZV9SdW50aW1lUGF0aCgpLCB0aGlzLmdldElQYXRoKCksICJydW50aW1lUGF0aCIsIG51bGwsIDEsIDEsIENvbXBvbmVudFJlc291cmNlLmNsYXNzLCAhSVNfVFJBTlNJRU5ULCAhSVNfVk9MQVRJTEUsIElTX0NIQU5HRUFCTEUsICFJU19VTlNFVFRBQkxFLCAhSVNfSUQsIElTX1VOSVFVRSwgIUlTX0RFUklWRUQsIElTX09SREVSRUQpOyAvLyROT04tTkxTLTEkCisJCWluaXRFQXR0cmlidXRlKGdldENvbXBvbmVudFJlc291cmNlX0V4Y2x1c2lvbnMoKSwgZWNvcmVQYWNrYWdlLmdldEVTdHJpbmcoKSwgImV4Y2x1c2lvbnMiLCAiIiwgMCwgLTEsIENvbXBvbmVudFJlc291cmNlLmNsYXNzLCAhSVNfVFJBTlNJRU5ULCAhSVNfVk9MQVRJTEUsIElTX0NIQU5HRUFCTEUsICFJU19VTlNFVFRBQkxFLCAhSVNfSUQsIElTX1VOSVFVRSwgIUlTX0RFUklWRUQsIElTX09SREVSRUQpOyAvLyROT04tTkxTLTEkCisJCWluaXRFUmVmZXJlbmNlKGdldENvbXBvbmVudFJlc291cmNlX0NvbXBvbmVudCgpLCB0aGlzLmdldFdvcmtiZW5jaENvbXBvbmVudCgpLCB0aGlzLmdldFdvcmtiZW5jaENvbXBvbmVudF9SZXNvdXJjZXMoKSwgImNvbXBvbmVudCIsIG51bGwsIDEsIDEsIENvbXBvbmVudFJlc291cmNlLmNsYXNzLCAhSVNfVFJBTlNJRU5ULCAhSVNfVk9MQVRJTEUsIElTX0NIQU5HRUFCTEUsICFJU19DT01QT1NJVEUsICFJU19SRVNPTFZFX1BST1hJRVMsICFJU19VTlNFVFRBQkxFLCAhSVNfVU5JUVVFLCAhSVNfREVSSVZFRCwgSVNfT1JERVJFRCk7IC8vJE5PTi1OTFMtMSQKKwkJaW5pdEVBdHRyaWJ1dGUoZ2V0Q29tcG9uZW50UmVzb3VyY2VfUmVzb3VyY2VUeXBlKCksIGVjb3JlUGFja2FnZS5nZXRFU3RyaW5nKCksICJyZXNvdXJjZVR5cGUiLCAiIiwgMSwgMSwgQ29tcG9uZW50UmVzb3VyY2UuY2xhc3MsICFJU19UUkFOU0lFTlQsICFJU19WT0xBVElMRSwgSVNfQ0hBTkdFQUJMRSwgIUlTX1VOU0VUVEFCTEUsICFJU19JRCwgSVNfVU5JUVVFLCAhSVNfREVSSVZFRCwgSVNfT1JERVJFRCk7IC8vJE5PTi1OTFMtMSQKIAotCQlpbml0RUNsYXNzKGNvbXBvbmVudFR5cGVFQ2xhc3MsIENvbXBvbmVudFR5cGUuY2xhc3MsICJDb21wb25lbnRUeXBlIiwgIUlTX0FCU1RSQUNULCAhSVNfSU5URVJGQUNFLCBJU19HRU5FUkFURURfSU5TVEFOQ0VfQ0xBU1MpOwotCQlpbml0RUF0dHJpYnV0ZShnZXRDb21wb25lbnRUeXBlX0NvbXBvbmVudFR5cGVJZCgpLCBlY29yZVBhY2thZ2UuZ2V0RVN0cmluZygpLCAiY29tcG9uZW50VHlwZUlkIiwgIiIsIDEsIDEsIENvbXBvbmVudFR5cGUuY2xhc3MsICFJU19UUkFOU0lFTlQsICFJU19WT0xBVElMRSwgSVNfQ0hBTkdFQUJMRSwgIUlTX1VOU0VUVEFCTEUsICFJU19JRCwgSVNfVU5JUVVFLCAhSVNfREVSSVZFRCwgSVNfT1JERVJFRCk7Ci0JCWluaXRFQXR0cmlidXRlKGdldENvbXBvbmVudFR5cGVfVmVyc2lvbigpLCBlY29yZVBhY2thZ2UuZ2V0RVN0cmluZygpLCAidmVyc2lvbiIsICIiLCAxLCAxLCBDb21wb25lbnRUeXBlLmNsYXNzLCAhSVNfVFJBTlNJRU5ULCAhSVNfVk9MQVRJTEUsIElTX0NIQU5HRUFCTEUsICFJU19VTlNFVFRBQkxFLCAhSVNfSUQsIElTX1VOSVFVRSwgIUlTX0RFUklWRUQsIElTX09SREVSRUQpOwotCQlpbml0RVJlZmVyZW5jZShnZXRDb21wb25lbnRUeXBlX1Byb3BlcnRpZXMoKSwgdGhpcy5nZXRQcm9wZXJ0eSgpLCBudWxsLCAicHJvcGVydGllcyIsIG51bGwsIDAsIC0xLCBDb21wb25lbnRUeXBlLmNsYXNzLCAhSVNfVFJBTlNJRU5ULCAhSVNfVk9MQVRJTEUsIElTX0NIQU5HRUFCTEUsICFJU19DT01QT1NJVEUsIElTX1JFU09MVkVfUFJPWElFUywgIUlTX1VOU0VUVEFCTEUsIElTX1VOSVFVRSwgIUlTX0RFUklWRUQsIElTX09SREVSRUQpOwotCQlpbml0RUF0dHJpYnV0ZShnZXRDb21wb25lbnRUeXBlX01ldGFkYXRhUmVzb3VyY2VzKCksIHRoaXMuZ2V0SVBhdGgoKSwgIm1ldGFkYXRhUmVzb3VyY2VzIiwgbnVsbCwgMCwgLTEsIENvbXBvbmVudFR5cGUuY2xhc3MsICFJU19UUkFOU0lFTlQsICFJU19WT0xBVElMRSwgSVNfQ0hBTkdFQUJMRSwgIUlTX1VOU0VUVEFCTEUsICFJU19JRCwgSVNfVU5JUVVFLCAhSVNfREVSSVZFRCwgSVNfT1JERVJFRCk7CisJCWluaXRFQ2xhc3MoY29tcG9uZW50VHlwZUVDbGFzcywgQ29tcG9uZW50VHlwZS5jbGFzcywgIkNvbXBvbmVudFR5cGUiLCAhSVNfQUJTVFJBQ1QsICFJU19JTlRFUkZBQ0UsIElTX0dFTkVSQVRFRF9JTlNUQU5DRV9DTEFTUyk7IC8vJE5PTi1OTFMtMSQKKwkJaW5pdEVBdHRyaWJ1dGUoZ2V0Q29tcG9uZW50VHlwZV9Db21wb25lbnRUeXBlSWQoKSwgZWNvcmVQYWNrYWdlLmdldEVTdHJpbmcoKSwgImNvbXBvbmVudFR5cGVJZCIsICIiLCAxLCAxLCBDb21wb25lbnRUeXBlLmNsYXNzLCAhSVNfVFJBTlNJRU5ULCAhSVNfVk9MQVRJTEUsIElTX0NIQU5HRUFCTEUsICFJU19VTlNFVFRBQkxFLCAhSVNfSUQsIElTX1VOSVFVRSwgIUlTX0RFUklWRUQsIElTX09SREVSRUQpOyAvLyROT04tTkxTLTEkCisJCWluaXRFQXR0cmlidXRlKGdldENvbXBvbmVudFR5cGVfVmVyc2lvbigpLCBlY29yZVBhY2thZ2UuZ2V0RVN0cmluZygpLCAidmVyc2lvbiIsICIiLCAxLCAxLCBDb21wb25lbnRUeXBlLmNsYXNzLCAhSVNfVFJBTlNJRU5ULCAhSVNfVk9MQVRJTEUsIElTX0NIQU5HRUFCTEUsICFJU19VTlNFVFRBQkxFLCAhSVNfSUQsIElTX1VOSVFVRSwgIUlTX0RFUklWRUQsIElTX09SREVSRUQpOyAvLyROT04tTkxTLTEkCisJCWluaXRFUmVmZXJlbmNlKGdldENvbXBvbmVudFR5cGVfUHJvcGVydGllcygpLCB0aGlzLmdldFByb3BlcnR5KCksIG51bGwsICJwcm9wZXJ0aWVzIiwgbnVsbCwgMCwgLTEsIENvbXBvbmVudFR5cGUuY2xhc3MsICFJU19UUkFOU0lFTlQsICFJU19WT0xBVElMRSwgSVNfQ0hBTkdFQUJMRSwgIUlTX0NPTVBPU0lURSwgSVNfUkVTT0xWRV9QUk9YSUVTLCAhSVNfVU5TRVRUQUJMRSwgSVNfVU5JUVVFLCAhSVNfREVSSVZFRCwgSVNfT1JERVJFRCk7IC8vJE5PTi1OTFMtMSQKKwkJaW5pdEVBdHRyaWJ1dGUoZ2V0Q29tcG9uZW50VHlwZV9NZXRhZGF0YVJlc291cmNlcygpLCB0aGlzLmdldElQYXRoKCksICJtZXRhZGF0YVJlc291cmNlcyIsIG51bGwsIDAsIC0xLCBDb21wb25lbnRUeXBlLmNsYXNzLCAhSVNfVFJBTlNJRU5ULCAhSVNfVk9MQVRJTEUsIElTX0NIQU5HRUFCTEUsICFJU19VTlNFVFRBQkxFLCAhSVNfSUQsIElTX1VOSVFVRSwgIUlTX0RFUklWRUQsIElTX09SREVSRUQpOyAvLyROT04tTkxTLTEkCiAKIAkJaW5pdEVDbGFzcyhwcm9wZXJ0eUVDbGFzcywgUHJvcGVydHkuY2xhc3MsICJQcm9wZXJ0eSIsICFJU19BQlNUUkFDVCwgIUlTX0lOVEVSRkFDRSwgSVNfR0VORVJBVEVEX0lOU1RBTkNFX0NMQVNTKTsKLQkJaW5pdEVBdHRyaWJ1dGUoZ2V0UHJvcGVydHlfTmFtZSgpLCBlY29yZVBhY2thZ2UuZ2V0RVN0cmluZygpLCAibmFtZSIsICIiLCAxLCAxLCBQcm9wZXJ0eS5jbGFzcywgIUlTX1RSQU5TSUVOVCwgIUlTX1ZPTEFUSUxFLCBJU19DSEFOR0VBQkxFLCAhSVNfVU5TRVRUQUJMRSwgIUlTX0lELCBJU19VTklRVUUsICFJU19ERVJJVkVELCBJU19PUkRFUkVEKTsKLQkJaW5pdEVBdHRyaWJ1dGUoZ2V0UHJvcGVydHlfVmFsdWUoKSwgZWNvcmVQYWNrYWdlLmdldEVTdHJpbmcoKSwgInZhbHVlIiwgIiIsIDEsIDEsIFByb3BlcnR5LmNsYXNzLCAhSVNfVFJBTlNJRU5ULCAhSVNfVk9MQVRJTEUsIElTX0NIQU5HRUFCTEUsICFJU19VTlNFVFRBQkxFLCAhSVNfSUQsIElTX1VOSVFVRSwgIUlTX0RFUklWRUQsIElTX09SREVSRUQpOworCQlpbml0RUF0dHJpYnV0ZShnZXRQcm9wZXJ0eV9OYW1lKCksIGVjb3JlUGFja2FnZS5nZXRFU3RyaW5nKCksICJuYW1lIiwgIiIsIDEsIDEsIFByb3BlcnR5LmNsYXNzLCAhSVNfVFJBTlNJRU5ULCAhSVNfVk9MQVRJTEUsIElTX0NIQU5HRUFCTEUsICFJU19VTlNFVFRBQkxFLCAhSVNfSUQsIElTX1VOSVFVRSwgIUlTX0RFUklWRUQsIElTX09SREVSRUQpOyAvLyROT04tTkxTLTEkCisJCWluaXRFQXR0cmlidXRlKGdldFByb3BlcnR5X1ZhbHVlKCksIGVjb3JlUGFja2FnZS5nZXRFU3RyaW5nKCksICJ2YWx1ZSIsICIiLCAxLCAxLCBQcm9wZXJ0eS5jbGFzcywgIUlTX1RSQU5TSUVOVCwgIUlTX1ZPTEFUSUxFLCBJU19DSEFOR0VBQkxFLCAhSVNfVU5TRVRUQUJMRSwgIUlTX0lELCBJU19VTklRVUUsICFJU19ERVJJVkVELCBJU19PUkRFUkVEKTsgLy8kTk9OLU5MUy0xJAogCiAJCWluaXRFQ2xhc3MocmVmZXJlbmNlZENvbXBvbmVudEVDbGFzcywgUmVmZXJlbmNlZENvbXBvbmVudC5jbGFzcywgIlJlZmVyZW5jZWRDb21wb25lbnQiLCAhSVNfQUJTVFJBQ1QsICFJU19JTlRFUkZBQ0UsIElTX0dFTkVSQVRFRF9JTlNUQU5DRV9DTEFTUyk7Ci0JCWluaXRFQXR0cmlidXRlKGdldFJlZmVyZW5jZWRDb21wb25lbnRfSGFuZGxlKCksIHRoaXMuZ2V0VVJJKCksICJoYW5kbGUiLCBudWxsLCAxLCAxLCBSZWZlcmVuY2VkQ29tcG9uZW50LmNsYXNzLCAhSVNfVFJBTlNJRU5ULCAhSVNfVk9MQVRJTEUsIElTX0NIQU5HRUFCTEUsICFJU19VTlNFVFRBQkxFLCAhSVNfSUQsIElTX1VOSVFVRSwgIUlTX0RFUklWRUQsIElTX09SREVSRUQpOwotCQlpbml0RUF0dHJpYnV0ZShnZXRSZWZlcmVuY2VkQ29tcG9uZW50X1J1bnRpbWVQYXRoKCksIHRoaXMuZ2V0SVBhdGgoKSwgInJ1bnRpbWVQYXRoIiwgbnVsbCwgMSwgMSwgUmVmZXJlbmNlZENvbXBvbmVudC5jbGFzcywgIUlTX1RSQU5TSUVOVCwgIUlTX1ZPTEFUSUxFLCBJU19DSEFOR0VBQkxFLCAhSVNfVU5TRVRUQUJMRSwgIUlTX0lELCBJU19VTklRVUUsICFJU19ERVJJVkVELCBJU19PUkRFUkVEKTsKLQkJaW5pdEVBdHRyaWJ1dGUoZ2V0UmVmZXJlbmNlZENvbXBvbmVudF9EZXBlbmRlbmN5VHlwZSgpLCB0aGlzLmdldERlcGVuZGVuY3lUeXBlKCksICJkZXBlbmRlbmN5VHlwZSIsIG51bGwsIDEsIDEsIFJlZmVyZW5jZWRDb21wb25lbnQuY2xhc3MsICFJU19UUkFOU0lFTlQsICFJU19WT0xBVElMRSwgSVNfQ0hBTkdFQUJMRSwgIUlTX1VOU0VUVEFCTEUsICFJU19JRCwgSVNfVU5JUVVFLCAhSVNfREVSSVZFRCwgSVNfT1JERVJFRCk7Ci0JCWluaXRFUmVmZXJlbmNlKGdldFJlZmVyZW5jZWRDb21wb25lbnRfRGVwZW5kZW50T2JqZWN0KCksIGVjb3JlUGFja2FnZS5nZXRFT2JqZWN0KCksIG51bGwsICJkZXBlbmRlbnRPYmplY3QiLCBudWxsLCAwLCAxLCBSZWZlcmVuY2VkQ29tcG9uZW50LmNsYXNzLCAhSVNfVFJBTlNJRU5ULCAhSVNfVk9MQVRJTEUsIElTX0NIQU5HRUFCTEUsICFJU19DT01QT1NJVEUsIElTX1JFU09MVkVfUFJPWElFUywgIUlTX1VOU0VUVEFCTEUsIElTX1VOSVFVRSwgIUlTX0RFUklWRUQsIElTX09SREVSRUQpOwotCQlpbml0RUF0dHJpYnV0ZShnZXRSZWZlcmVuY2VkQ29tcG9uZW50X0FyY2hpdmVOYW1lKCksIGVjb3JlUGFja2FnZS5nZXRFU3RyaW5nKCksICJhcmNoaXZlTmFtZSIsIG51bGwsIDAsIDEsIFJlZmVyZW5jZWRDb21wb25lbnQuY2xhc3MsICFJU19UUkFOU0lFTlQsICFJU19WT0xBVElMRSwgSVNfQ0hBTkdFQUJMRSwgIUlTX1VOU0VUVEFCTEUsICFJU19JRCwgSVNfVU5JUVVFLCAhSVNfREVSSVZFRCwgSVNfT1JERVJFRCk7CisJCWluaXRFQXR0cmlidXRlKGdldFJlZmVyZW5jZWRDb21wb25lbnRfSGFuZGxlKCksIHRoaXMuZ2V0VVJJKCksICJoYW5kbGUiLCBudWxsLCAxLCAxLCBSZWZlcmVuY2VkQ29tcG9uZW50LmNsYXNzLCAhSVNfVFJBTlNJRU5ULCAhSVNfVk9MQVRJTEUsIElTX0NIQU5HRUFCTEUsICFJU19VTlNFVFRBQkxFLCAhSVNfSUQsIElTX1VOSVFVRSwgIUlTX0RFUklWRUQsIElTX09SREVSRUQpOyAvLyROT04tTkxTLTEkCisJCWluaXRFQXR0cmlidXRlKGdldFJlZmVyZW5jZWRDb21wb25lbnRfUnVudGltZVBhdGgoKSwgdGhpcy5nZXRJUGF0aCgpLCAicnVudGltZVBhdGgiLCBudWxsLCAxLCAxLCBSZWZlcmVuY2VkQ29tcG9uZW50LmNsYXNzLCAhSVNfVFJBTlNJRU5ULCAhSVNfVk9MQVRJTEUsIElTX0NIQU5HRUFCTEUsICFJU19VTlNFVFRBQkxFLCAhSVNfSUQsIElTX1VOSVFVRSwgIUlTX0RFUklWRUQsIElTX09SREVSRUQpOyAvLyROT04tTkxTLTEkCisJCWluaXRFQXR0cmlidXRlKGdldFJlZmVyZW5jZWRDb21wb25lbnRfRGVwZW5kZW5jeVR5cGUoKSwgdGhpcy5nZXREZXBlbmRlbmN5VHlwZSgpLCAiZGVwZW5kZW5jeVR5cGUiLCBudWxsLCAxLCAxLCBSZWZlcmVuY2VkQ29tcG9uZW50LmNsYXNzLCAhSVNfVFJBTlNJRU5ULCAhSVNfVk9MQVRJTEUsIElTX0NIQU5HRUFCTEUsICFJU19VTlNFVFRBQkxFLCAhSVNfSUQsIElTX1VOSVFVRSwgIUlTX0RFUklWRUQsIElTX09SREVSRUQpOyAvLyROT04tTkxTLTEkCisJCWluaXRFUmVmZXJlbmNlKGdldFJlZmVyZW5jZWRDb21wb25lbnRfRGVwZW5kZW50T2JqZWN0KCksIGVjb3JlUGFja2FnZS5nZXRFT2JqZWN0KCksIG51bGwsICJkZXBlbmRlbnRPYmplY3QiLCBudWxsLCAwLCAxLCBSZWZlcmVuY2VkQ29tcG9uZW50LmNsYXNzLCAhSVNfVFJBTlNJRU5ULCAhSVNfVk9MQVRJTEUsIElTX0NIQU5HRUFCTEUsICFJU19DT01QT1NJVEUsIElTX1JFU09MVkVfUFJPWElFUywgIUlTX1VOU0VUVEFCTEUsIElTX1VOSVFVRSwgIUlTX0RFUklWRUQsIElTX09SREVSRUQpOyAvLyROT04tTkxTLTEkCisJCWluaXRFQXR0cmlidXRlKGdldFJlZmVyZW5jZWRDb21wb25lbnRfQXJjaGl2ZU5hbWUoKSwgZWNvcmVQYWNrYWdlLmdldEVTdHJpbmcoKSwgImFyY2hpdmVOYW1lIiwgbnVsbCwgMCwgMSwgUmVmZXJlbmNlZENvbXBvbmVudC5jbGFzcywgIUlTX1RSQU5TSUVOVCwgIUlTX1ZPTEFUSUxFLCBJU19DSEFOR0VBQkxFLCAhSVNfVU5TRVRUQUJMRSwgIUlTX0lELCBJU19VTklRVUUsICFJU19ERVJJVkVELCBJU19PUkRFUkVEKTsgLy8kTk9OLU5MUy0xJAogCi0JCWluaXRFQ2xhc3MocHJvamVjdENvbXBvbmVudHNFQ2xhc3MsIFByb2plY3RDb21wb25lbnRzLmNsYXNzLCAiUHJvamVjdENvbXBvbmVudHMiLCAhSVNfQUJTVFJBQ1QsICFJU19JTlRFUkZBQ0UsIElTX0dFTkVSQVRFRF9JTlNUQU5DRV9DTEFTUyk7Ci0JCWluaXRFQXR0cmlidXRlKGdldFByb2plY3RDb21wb25lbnRzX1Byb2plY3ROYW1lKCksIGVjb3JlUGFja2FnZS5nZXRFU3RyaW5nKCksICJwcm9qZWN0TmFtZSIsICIiLCAxLCAxLCBQcm9qZWN0Q29tcG9uZW50cy5jbGFzcywgIUlTX1RSQU5TSUVOVCwgIUlTX1ZPTEFUSUxFLCBJU19DSEFOR0VBQkxFLCAhSVNfVU5TRVRUQUJMRSwgIUlTX0lELCBJU19VTklRVUUsICFJU19ERVJJVkVELCBJU19PUkRFUkVEKTsKLQkJaW5pdEVSZWZlcmVuY2UoZ2V0UHJvamVjdENvbXBvbmVudHNfQ29tcG9uZW50cygpLCB0aGlzLmdldFdvcmtiZW5jaENvbXBvbmVudCgpLCBudWxsLCAiY29tcG9uZW50cyIsIG51bGwsIDAsIC0xLCBQcm9qZWN0Q29tcG9uZW50cy5jbGFzcywgIUlTX1RSQU5TSUVOVCwgIUlTX1ZPTEFUSUxFLCBJU19DSEFOR0VBQkxFLCBJU19DT01QT1NJVEUsICFJU19SRVNPTFZFX1BST1hJRVMsICFJU19VTlNFVFRBQkxFLCAhSVNfVU5JUVVFLCAhSVNfREVSSVZFRCwgSVNfT1JERVJFRCk7Ci0JCWluaXRFQXR0cmlidXRlKGdldFByb2plY3RDb21wb25lbnRzX1ZlcnNpb24oKSwgZWNvcmVQYWNrYWdlLmdldEVTdHJpbmcoKSwgInZlcnNpb24iLCBudWxsLCAxLCAxLCBQcm9qZWN0Q29tcG9uZW50cy5jbGFzcywgIUlTX1RSQU5TSUVOVCwgIUlTX1ZPTEFUSUxFLCBJU19DSEFOR0VBQkxFLCAhSVNfVU5TRVRUQUJMRSwgIUlTX0lELCBJU19VTklRVUUsICFJU19ERVJJVkVELCBJU19PUkRFUkVEKTsKKwkJaW5pdEVDbGFzcyhwcm9qZWN0Q29tcG9uZW50c0VDbGFzcywgUHJvamVjdENvbXBvbmVudHMuY2xhc3MsICJQcm9qZWN0Q29tcG9uZW50cyIsICFJU19BQlNUUkFDVCwgIUlTX0lOVEVSRkFDRSwgSVNfR0VORVJBVEVEX0lOU1RBTkNFX0NMQVNTKTsgLy8kTk9OLU5MUy0xJAorCQlpbml0RUF0dHJpYnV0ZShnZXRQcm9qZWN0Q29tcG9uZW50c19Qcm9qZWN0TmFtZSgpLCBlY29yZVBhY2thZ2UuZ2V0RVN0cmluZygpLCAicHJvamVjdE5hbWUiLCAiIiwgMSwgMSwgUHJvamVjdENvbXBvbmVudHMuY2xhc3MsICFJU19UUkFOU0lFTlQsICFJU19WT0xBVElMRSwgSVNfQ0hBTkdFQUJMRSwgIUlTX1VOU0VUVEFCTEUsICFJU19JRCwgSVNfVU5JUVVFLCAhSVNfREVSSVZFRCwgSVNfT1JERVJFRCk7IC8vJE5PTi1OTFMtMSQKKwkJaW5pdEVSZWZlcmVuY2UoZ2V0UHJvamVjdENvbXBvbmVudHNfQ29tcG9uZW50cygpLCB0aGlzLmdldFdvcmtiZW5jaENvbXBvbmVudCgpLCBudWxsLCAiY29tcG9uZW50cyIsIG51bGwsIDAsIC0xLCBQcm9qZWN0Q29tcG9uZW50cy5jbGFzcywgIUlTX1RSQU5TSUVOVCwgIUlTX1ZPTEFUSUxFLCBJU19DSEFOR0VBQkxFLCBJU19DT01QT1NJVEUsICFJU19SRVNPTFZFX1BST1hJRVMsICFJU19VTlNFVFRBQkxFLCAhSVNfVU5JUVVFLCAhSVNfREVSSVZFRCwgSVNfT1JERVJFRCk7IC8vJE5PTi1OTFMtMSQKKwkJaW5pdEVBdHRyaWJ1dGUoZ2V0UHJvamVjdENvbXBvbmVudHNfVmVyc2lvbigpLCBlY29yZVBhY2thZ2UuZ2V0RVN0cmluZygpLCAidmVyc2lvbiIsIG51bGwsIDEsIDEsIFByb2plY3RDb21wb25lbnRzLmNsYXNzLCAhSVNfVFJBTlNJRU5ULCAhSVNfVk9MQVRJTEUsIElTX0NIQU5HRUFCTEUsICFJU19VTlNFVFRBQkxFLCAhSVNfSUQsIElTX1VOSVFVRSwgIUlTX0RFUklWRUQsIElTX09SREVSRUQpOyAvLyROT04tTkxTLTEkCiAKIAkJLy8gSW5pdGlhbGl6ZSBlbnVtcyBhbmQgYWRkIGVudW0gbGl0ZXJhbHMKLQkJaW5pdEVFbnVtKGRlcGVuZGVuY3lUeXBlRUVudW0sIERlcGVuZGVuY3lUeXBlLmNsYXNzLCAiRGVwZW5kZW5jeVR5cGUiKTsKKwkJaW5pdEVFbnVtKGRlcGVuZGVuY3lUeXBlRUVudW0sIERlcGVuZGVuY3lUeXBlLmNsYXNzLCAiRGVwZW5kZW5jeVR5cGUiKTsgLy8kTk9OLU5MUy0xJAogCQlhZGRFRW51bUxpdGVyYWwoZGVwZW5kZW5jeVR5cGVFRW51bSwgRGVwZW5kZW5jeVR5cGUuVVNFU19MSVRFUkFMKTsKIAkJYWRkRUVudW1MaXRlcmFsKGRlcGVuZGVuY3lUeXBlRUVudW0sIERlcGVuZGVuY3lUeXBlLkNPTlNVTUVTX0xJVEVSQUwpOwogCiAJCS8vIEluaXRpYWxpemUgZGF0YSB0eXBlcwotCQlpbml0RURhdGFUeXBlKGlQYXRoRURhdGFUeXBlLCBJUGF0aC5jbGFzcywgIklQYXRoIiwgSVNfU0VSSUFMSVpBQkxFLCAhSVNfR0VORVJBVEVEX0lOU1RBTkNFX0NMQVNTKTsKLQkJaW5pdEVEYXRhVHlwZSh1cmlFRGF0YVR5cGUsIG9yZy5lY2xpcHNlLmVtZi5jb21tb24udXRpbC5VUkkuY2xhc3MsICJVUkkiLCBJU19TRVJJQUxJWkFCTEUsICFJU19HRU5FUkFURURfSU5TVEFOQ0VfQ0xBU1MpOworCQlpbml0RURhdGFUeXBlKGlQYXRoRURhdGFUeXBlLCBJUGF0aC5jbGFzcywgIklQYXRoIiwgSVNfU0VSSUFMSVpBQkxFLCAhSVNfR0VORVJBVEVEX0lOU1RBTkNFX0NMQVNTKTsgLy8kTk9OLU5MUy0xJAorCQlpbml0RURhdGFUeXBlKHVyaUVEYXRhVHlwZSwgb3JnLmVjbGlwc2UuZW1mLmNvbW1vbi51dGlsLlVSSS5jbGFzcywgIlVSSSIsIElTX1NFUklBTElaQUJMRSwgIUlTX0dFTkVSQVRFRF9JTlNUQU5DRV9DTEFTUyk7IC8vJE5PTi1OTFMtMSQKIAogCQkvLyBDcmVhdGUgcmVzb3VyY2UKIAkJY3JlYXRlUmVzb3VyY2UoZU5TX1VSSSk7CmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS9tb2R1bGVjb3JlLXNyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2NvbXBvbmVudGNvcmUvaW50ZXJuYWwvaW1wbC9JUmVzb3VyY2VGYWN0b3J5RXh0UHRDb25zdGFudHMuamF2YSBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlL21vZHVsZWNvcmUtc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vY29tcG9uZW50Y29yZS9pbnRlcm5hbC9pbXBsL0lSZXNvdXJjZUZhY3RvcnlFeHRQdENvbnN0YW50cy5qYXZhCmluZGV4IGZkYTFhNWMuLmM2ZTFlNDUgMTAwNjQ0Ci0tLSBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlL21vZHVsZWNvcmUtc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vY29tcG9uZW50Y29yZS9pbnRlcm5hbC9pbXBsL0lSZXNvdXJjZUZhY3RvcnlFeHRQdENvbnN0YW50cy5qYXZhCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlL21vZHVsZWNvcmUtc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vY29tcG9uZW50Y29yZS9pbnRlcm5hbC9pbXBsL0lSZXNvdXJjZUZhY3RvcnlFeHRQdENvbnN0YW50cy5qYXZhCkBAIC0yNiw2ICsyNiw4IEBACiAJU3RyaW5nIEFUVF9DT05URU5UVFlQRUlEID0gImNvbnRlbnRUeXBlSWQiOyAvLyROT04tTkxTLTEkIAogCQogCVN0cmluZyBBVFRfSVNERUZBVUxUID0gImlzRGVmYXVsdCI7IC8vJE5PTi1OTFMtMSQgCisJCisJU3RyaW5nIEFUVF9PVkVSUklERVNfRkFDVE9SWSA9Im92ZXJyaWRlc0ZhY3RvcnlDbGFzcyI7IC8vJE5PTi1OTFMtMSQgCiAJCQogCiB9CmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS9tb2R1bGVjb3JlLXNyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2NvbXBvbmVudGNvcmUvaW50ZXJuYWwvaW1wbC9Nb2R1bGVVUklVdGlsLmphdmEgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS9tb2R1bGVjb3JlLXNyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2NvbXBvbmVudGNvcmUvaW50ZXJuYWwvaW1wbC9Nb2R1bGVVUklVdGlsLmphdmEKaW5kZXggMTcwYzUxMy4uMTA3NjY3NiAxMDA2NDQKLS0tIGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUvbW9kdWxlY29yZS1zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9jb21wb25lbnRjb3JlL2ludGVybmFsL2ltcGwvTW9kdWxlVVJJVXRpbC5qYXZhCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlL21vZHVsZWNvcmUtc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vY29tcG9uZW50Y29yZS9pbnRlcm5hbC9pbXBsL01vZHVsZVVSSVV0aWwuamF2YQpAQCAtMjAwLDcgKzIwMCw3IEBACiAJCWlmIChhQ29tcG9uZW50LmlzQmluYXJ5KCkpCiAJCQlyZXR1cm4gTW9kdWxlVVJJVXRpbC5hcmNoaXZlQ29tcG9uZW50ZnVsbHlRdWFsaWZ5VVJJKGFDb21wb25lbnQuZ2V0TmFtZSgpKS50b1N0cmluZygpOwogCQllbHNlCi0JCQlyZXR1cm4gIlsiICsgYUNvbXBvbmVudC5nZXRQcm9qZWN0KCkuZ2V0RnVsbFBhdGgoKSArICJdOiIgKyBhQ29tcG9uZW50LmdldFByb2plY3QoKS5nZXROYW1lKCk7CisJCQlyZXR1cm4gIlsiICsgYUNvbXBvbmVudC5nZXRQcm9qZWN0KCkuZ2V0RnVsbFBhdGgoKSArICJdOiIgKyBhQ29tcG9uZW50LmdldFByb2plY3QoKS5nZXROYW1lKCk7IC8vJE5PTi1OTFMtMSQgIC8vJE5PTi1OTFMtMiQKIAl9CiAKIAlwdWJsaWMgc3RhdGljIFN0cmluZyBnZXRDb250ZW50VHlwZU5hbWUoVVJJIHVyaSkgewpkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUvbW9kdWxlY29yZS1zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9jb21wb25lbnRjb3JlL2ludGVybmFsL2ltcGwvUmVmZXJlbmNlZENvbXBvbmVudFhNSVJlc291cmNlRmFjdG9yeS5qYXZhIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUvbW9kdWxlY29yZS1zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9jb21wb25lbnRjb3JlL2ludGVybmFsL2ltcGwvUmVmZXJlbmNlZENvbXBvbmVudFhNSVJlc291cmNlRmFjdG9yeS5qYXZhCmluZGV4IDJhMTU3YWQuLjU1ZDIyOTkgMTAwNjQ0Ci0tLSBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlL21vZHVsZWNvcmUtc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vY29tcG9uZW50Y29yZS9pbnRlcm5hbC9pbXBsL1JlZmVyZW5jZWRDb21wb25lbnRYTUlSZXNvdXJjZUZhY3RvcnkuamF2YQorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS9tb2R1bGVjb3JlLXNyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2NvbXBvbmVudGNvcmUvaW50ZXJuYWwvaW1wbC9SZWZlcmVuY2VkQ29tcG9uZW50WE1JUmVzb3VyY2VGYWN0b3J5LmphdmEKQEAgLTE5LDcgKzE5LDYgQEAKIAogCXB1YmxpYyBSZWZlcmVuY2VkQ29tcG9uZW50WE1JUmVzb3VyY2VGYWN0b3J5KCkgewogCQlzdXBlcigpOwotCQkvLyBUT0RPIEF1dG8tZ2VuZXJhdGVkIGNvbnN0cnVjdG9yIHN0dWIKIAl9CiAJLyoqCiAJICogVGhpcyBpcyB0aGUgbWV0aG9kIHRoYXQgc3ViY2xhc3NlcyBjYW4gb3ZlcnJpZGUgdG8gYWN0dWFsbHkgaW5zdGFudGlhdGUgYSBuZXcgUmVzb3VyY2UKZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlL21vZHVsZWNvcmUtc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vY29tcG9uZW50Y29yZS9pbnRlcm5hbC9pbXBsL1JlZmVyZW5jZWRDb21wb25lbnRYTUlSZXNvdXJjZUltcGwuamF2YSBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlL21vZHVsZWNvcmUtc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vY29tcG9uZW50Y29yZS9pbnRlcm5hbC9pbXBsL1JlZmVyZW5jZWRDb21wb25lbnRYTUlSZXNvdXJjZUltcGwuamF2YQppbmRleCAzMzNiNGIwLi5hYzQ2ODg1IDEwMDY0NAotLS0gYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS9tb2R1bGVjb3JlLXNyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2NvbXBvbmVudGNvcmUvaW50ZXJuYWwvaW1wbC9SZWZlcmVuY2VkQ29tcG9uZW50WE1JUmVzb3VyY2VJbXBsLmphdmEKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUvbW9kdWxlY29yZS1zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9jb21wb25lbnRjb3JlL2ludGVybmFsL2ltcGwvUmVmZXJlbmNlZENvbXBvbmVudFhNSVJlc291cmNlSW1wbC5qYXZhCkBAIC0yMCwxMiArMjAsMTAgQEAKIAogCXB1YmxpYyBSZWZlcmVuY2VkQ29tcG9uZW50WE1JUmVzb3VyY2VJbXBsKCkgewogCQlzdXBlcigpOwotCQkvLyBUT0RPIEF1dG8tZ2VuZXJhdGVkIGNvbnN0cnVjdG9yIHN0dWIKIAl9CiAKIAlwdWJsaWMgUmVmZXJlbmNlZENvbXBvbmVudFhNSVJlc291cmNlSW1wbChVUkkgdXJpKSB7CiAJCXN1cGVyKHVyaSk7Ci0JCS8vIFRPRE8gQXV0by1nZW5lcmF0ZWQgY29uc3RydWN0b3Igc3R1YgogCX0KIAlwcm90ZWN0ZWQgTWFwcGVkWE1JSGVscGVyIGRvQ3JlYXRlWE1MSGVscGVyKCkgewogCQlyZXR1cm4gbmV3IE1hcHBlZENvbXBvbmVudFhNSUhlbHBlcih0aGlzLCBnZXRQcmVmaXhUb1BhY2thZ2VVUklzKCkpOwpkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUvbW9kdWxlY29yZS1zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9jb21wb25lbnRjb3JlL2ludGVybmFsL2ltcGwvV1RQUmVzb3VyY2VGYWN0b3J5UmVnaXN0cnkuamF2YSBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlL21vZHVsZWNvcmUtc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vY29tcG9uZW50Y29yZS9pbnRlcm5hbC9pbXBsL1dUUFJlc291cmNlRmFjdG9yeVJlZ2lzdHJ5LmphdmEKaW5kZXggZTA2OThiMi4uNzFmZGEyYyAxMDA2NDQKLS0tIGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUvbW9kdWxlY29yZS1zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9jb21wb25lbnRjb3JlL2ludGVybmFsL2ltcGwvV1RQUmVzb3VyY2VGYWN0b3J5UmVnaXN0cnkuamF2YQorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS9tb2R1bGVjb3JlLXNyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2NvbXBvbmVudGNvcmUvaW50ZXJuYWwvaW1wbC9XVFBSZXNvdXJjZUZhY3RvcnlSZWdpc3RyeS5qYXZhCkBAIC0xMSw3ICsxMSwxMSBAQAogcGFja2FnZSBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUuaW50ZXJuYWwuaW1wbDsKIAogaW1wb3J0IGphdmEuaW8uSU9FeGNlcHRpb247CitpbXBvcnQgamF2YS51dGlsLkFycmF5czsKK2ltcG9ydCBqYXZhLnV0aWwuQ29sbGVjdGlvbjsKK2ltcG9ydCBqYXZhLnV0aWwuQ29tcGFyYXRvcjsKIGltcG9ydCBqYXZhLnV0aWwuSXRlcmF0b3I7CitpbXBvcnQgamF2YS51dGlsLk1hcDsKIGltcG9ydCBqYXZhLnV0aWwuU2V0OwogCiBpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5yZXNvdXJjZXMuSUZpbGU7CkBAIC0yNiw4ICszMCwxMCBAQAogaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucnVudGltZS5TYWZlUnVubmVyOwogaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucnVudGltZS5jb250ZW50LklDb250ZW50RGVzY3JpcHRpb247CiBpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5ydW50aW1lLmNvbnRlbnQuSUNvbnRlbnRUeXBlOworaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucnVudGltZS5qb2JzLklMb2NrOwogaW1wb3J0IG9yZy5lY2xpcHNlLmVtZi5jb21tb24udXRpbC5VUkk7CiBpbXBvcnQgb3JnLmVjbGlwc2UuZW1mLmVjb3JlLnJlc291cmNlLlJlc291cmNlOworaW1wb3J0IG9yZy5lY2xpcHNlLmVtZi5lY29yZS5yZXNvdXJjZS5SZXNvdXJjZS5GYWN0b3J5OwogaW1wb3J0IG9yZy5lY2xpcHNlLmplbS51dGlsLlJlZ2lzdHJ5UmVhZGVyOwogaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS5Db21wb25lbnRDb3JlOwogaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS5VbnJlc29sdmVhYmxlVVJJRXhjZXB0aW9uOwpAQCAtNDAsNiArNDYsNyBAQAogaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uaW50ZXJuYWwuZW1mLnJlc291cmNlLlJlc291cmNlRmFjdG9yeURlc2NyaXB0b3I7CiBpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5pbnRlcm5hbC5lbWYudXRpbGl0aWVzLkRlZmF1bHRPdmVycmlkYWJsZVJlc291cmNlRmFjdG9yeVJlZ2lzdHJ5OwogaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uaW50ZXJuYWwuZW1md29ya2JlbmNoLldvcmtiZW5jaFJlc291cmNlSGVscGVyOworaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uaW50ZXJuYWwuZW1md29ya2JlbmNoLmVkaXQuRU1GV29ya2JlbmNoRWRpdENvbnRleHRGYWN0b3J5OwogCiAvKioKICAqIDxwPgpAQCAtNjMsMjYgKzcwLDQ0IEBACiAJCXJldHVybiBXVFBSZXNvdXJjZUZhY3RvcnlSZWdpc3RyeS5JTlNUQU5DRS5nZXRGYWN0b3J5KHVyaSk7CQogCX0gICAKIAotCXB1YmxpYyBzeW5jaHJvbml6ZWQgUmVzb3VyY2UuRmFjdG9yeSBnZXRGYWN0b3J5KFVSSSB1cmksIElDb250ZW50RGVzY3JpcHRpb24gZGVzY3JpcHRpb24pIHsKLQkJUmVzb3VyY2UuRmFjdG9yeSByZXNvdXJjZUZhY3RvcnkgPSBudWxsOwotCQlpZih1cmkgIT0gbnVsbCAmJiB1cmkubGFzdFNlZ21lbnQoKSAhPSBudWxsKSB7Ci0JCQlSZXNvdXJjZUZhY3RvcnlEZXNjcmlwdG9yIGRlc2NyaXB0b3IgPSBudWxsOwotCQkJaWYobnVsbCA9PSBkZXNjcmlwdGlvbil7Ci0JCQkJZGVzY3JpcHRvciA9IGdldERlc2NyaXB0b3IodXJpKTsKLQkJCX0gZWxzZSB7Ci0JCQkJZGVzY3JpcHRvciA9IGdldERlc2NyaXB0b3IodXJpLCBkZXNjcmlwdGlvbik7Ci0JCQl9Ci0JCQkKLQkJCWlmKGRlc2NyaXB0b3IgIT0gbnVsbCkgewotCQkJCXJlc291cmNlRmFjdG9yeSA9IGdldEZhY3RvcnkoZGVzY3JpcHRvcik7CQotCQkJfQkKKwlwdWJsaWMgUmVzb3VyY2UuRmFjdG9yeSBnZXRGYWN0b3J5KFVSSSB1cmksIElDb250ZW50RGVzY3JpcHRpb24gZGVzY3JpcHRpb24pIHsKKwkJSVByb2plY3QgY29tcG9uZW50UHJvamVjdCA9IG51bGw7CisJCXRyeSB7CisJCQljb21wb25lbnRQcm9qZWN0ID0gU3RydWN0dXJlRWRpdC5nZXRDb250YWluaW5nUHJvamVjdCh1cmkpOworCQl9IGNhdGNoIChVbnJlc29sdmVhYmxlVVJJRXhjZXB0aW9uIGUpIHsKKwkJCS8vIGRvbid0IGRvIGFueXRoaW5nCiAJCX0KLQkJaWYocmVzb3VyY2VGYWN0b3J5ID09IG51bGwpCi0JCQlyZXNvdXJjZUZhY3RvcnkgPSBzdXBlci5nZXRGYWN0b3J5KHVyaSk7Ci0JCXJldHVybiByZXNvdXJjZUZhY3Rvcnk7IAorCQlJTG9jayBsb2NrID0gRU1GV29ya2JlbmNoRWRpdENvbnRleHRGYWN0b3J5LmdldFByb2plY3RMb2NrT2JqZWN0KGNvbXBvbmVudFByb2plY3QpOworCQl0cnl7CisJCQlpZihudWxsICE9IGxvY2speworCQkJCWxvY2suYWNxdWlyZSgpOworCQkJfQorCQkJc3luY2hyb25pemVkKHRoaXMpeworCQkJCVJlc291cmNlLkZhY3RvcnkgcmVzb3VyY2VGYWN0b3J5ID0gbnVsbDsKKwkJCQlpZih1cmkgIT0gbnVsbCAmJiB1cmkubGFzdFNlZ21lbnQoKSAhPSBudWxsKSB7CisJCQkJCVJlc291cmNlRmFjdG9yeURlc2NyaXB0b3IgZGVzY3JpcHRvciA9IG51bGw7CisJCQkJCWlmKG51bGwgPT0gZGVzY3JpcHRpb24peworCQkJCQkJZGVzY3JpcHRvciA9IGdldERlc2NyaXB0b3IodXJpKTsKKwkJCQkJfSBlbHNlIHsKKwkJCQkJCWRlc2NyaXB0b3IgPSBnZXREZXNjcmlwdG9yKHVyaSwgZGVzY3JpcHRpb24pOworCQkJCQl9CisJCQkJCQorCQkJCQlpZihkZXNjcmlwdG9yICE9IG51bGwpIHsKKwkJCQkJCXJlc291cmNlRmFjdG9yeSA9IGdldEZhY3RvcnkoZGVzY3JpcHRvcik7CQorCQkJCQl9CQorCQkJCX0KKwkJCQlpZihyZXNvdXJjZUZhY3RvcnkgPT0gbnVsbCkKKwkJCQkJcmVzb3VyY2VGYWN0b3J5ID0gc3VwZXIuZ2V0RmFjdG9yeSh1cmkpOworCQkJCXJldHVybiByZXNvdXJjZUZhY3Rvcnk7CisJCQl9CisJCX0gZmluYWxseXsKKwkJCWlmKG51bGwgIT0gbG9jayl7CisJCQkJbG9jay5yZWxlYXNlKCk7CisJCQl9CisJCX0gCiAJfQogCQotCXB1YmxpYyBzeW5jaHJvbml6ZWQgUmVzb3VyY2UuRmFjdG9yeSBnZXRGYWN0b3J5KFVSSSB1cmkpIHsKKwlwdWJsaWMgUmVzb3VyY2UuRmFjdG9yeSBnZXRGYWN0b3J5KFVSSSB1cmkpIHsKIAkJcmV0dXJuIGdldEZhY3RvcnkodXJpLCAoSUNvbnRlbnREZXNjcmlwdGlvbiludWxsKTsKIAl9CQogCkBAIC0xMTUsNiArMTQwLDExIEBACiAJCWtleS5zaG9ydE5hbWUgPSBkZXNjcmlwdG9yLmdldFNob3J0U2VnbWVudCgpOwogCQlrZXkudHlwZSA9IGRlc2NyaXB0b3IuZ2V0Q29udGVudFR5cGUoKTsKIAkJa2V5LmlzRGVmYXVsdCA9IGRlc2NyaXB0b3IuaXNEZWZhdWx0KCk7CisJCWlmKGRlc2NyaXB0b3IgaW5zdGFuY2VvZiBDb25maWd1cmF0aW9uUmVzb3VyY2VGYWN0b3J5RGVzY3JpcHRvcil7CisJCQlDb25maWd1cmF0aW9uUmVzb3VyY2VGYWN0b3J5RGVzY3JpcHRvciBjb25maWd1cmF0aW9uRGVzY3JpcHRvciA9IChDb25maWd1cmF0aW9uUmVzb3VyY2VGYWN0b3J5RGVzY3JpcHRvcilkZXNjcmlwdG9yOworCQkJa2V5LmZhY3RvcnlDbGFzc05hbWUgPSBjb25maWd1cmF0aW9uRGVzY3JpcHRvci5nZXRGYWN0b3J5Q2xhc3NOYW1lKCk7CisJCQlrZXkub3ZlcnJpZGVzRmFjdG9yeUNsYXNzTmFtZSA9IGNvbmZpZ3VyYXRpb25EZXNjcmlwdG9yLmdldE92ZXJyaWRlc0ZhY3RvcnlDbGFzc05hbWUoKTsKKwkJfQogCQlyZXR1cm4ga2V5OwogCX0KIAkKQEAgLTEyNiw2ICsxNTYsOCBAQAogCQlwcml2YXRlIFN0cmluZyBzaG9ydFNlZ21lbnQ7CiAJCXByaXZhdGUgSUNvbnRlbnRUeXBlIGNvbnRlbnRUeXBlOwogCQlwcml2YXRlIGJvb2xlYW4gaXNEZWZhdWx0ID0gdHJ1ZTsKKwkJcHJpdmF0ZSBTdHJpbmcgZmFjdG9yeUNsYXNzTmFtZSA9IG51bGw7CisJCXByaXZhdGUgU3RyaW5nIG92ZXJyaWRlc0ZhY3RvcnlDbGFzc05hbWUgPSBudWxsOwogCQlwcml2YXRlIGZpbmFsIElDb25maWd1cmF0aW9uRWxlbWVudCBlbGVtZW50OyAKIAkJCiAJCXB1YmxpYyBDb25maWd1cmF0aW9uUmVzb3VyY2VGYWN0b3J5RGVzY3JpcHRvcihJQ29uZmlndXJhdGlvbkVsZW1lbnQgZXh0KSB0aHJvd3MgQ29yZUV4Y2VwdGlvbiB7CkBAIC0xMzQsMTYgKzE2NiwxNiBAQAogCQkJaW5pdCgpOwogCQl9IAogCQkKKwkJcHVibGljIFN0cmluZyBnZXRPdmVycmlkZXNGYWN0b3J5Q2xhc3NOYW1lKCkgeworCQkJcmV0dXJuIG92ZXJyaWRlc0ZhY3RvcnlDbGFzc05hbWU7CisJCX0KKworCQlwdWJsaWMgU3RyaW5nIGdldEZhY3RvcnlDbGFzc05hbWUoKSB7CisJCQlyZXR1cm4gZmFjdG9yeUNsYXNzTmFtZTsKKwkJfQorCiAJCXByaXZhdGUgdm9pZCBpbml0KCkgdGhyb3dzIENvcmVFeGNlcHRpb24gewogCQkJc2hvcnRTZWdtZW50ID0gZWxlbWVudC5nZXRBdHRyaWJ1dGUoQVRUX1NIT1JUX1NFR01FTlQpOwotCQkJaWYoc2hvcnRTZWdtZW50ID09IG51bGwgfHwgc2hvcnRTZWdtZW50LnRyaW0oKS5sZW5ndGgoKSA9PSAwKQotCQkJCXRocm93IG5ldyBDb3JlRXhjZXB0aW9uKAotCQkJCQkJCU1vZHVsZWNvcmVQbHVnaW4uY3JlYXRlRXJyb3JTdGF0dXMoMCwgCi0JCQkJCQkJCQkJIlRoZSBzaG9ydFNlZ21lbnQgYXR0cmlidXRlIG9mICIgKyBUQUdfUkVTT1VSQ0VfRkFDVE9SWSArIC8vJE5PTi1OTFMtMSQgCi0JCQkJCQkJCQkJIiBtdXN0IHNwZWNpZnkgYSB2YWxpZCwgbm9uLW51bGwsIG5vbi1lbXB0eSB2YWx1ZSBpbiAiICsgICAvLyROT04tTkxTLTEkCi0JCQkJCQkJCQkJZWxlbWVudC5nZXROYW1lc3BhY2VJZGVudGlmaWVyKCksIG51bGwpKTsKLQkJCWlmICgiZmFsc2UiLmVxdWFscyhlbGVtZW50LmdldEF0dHJpYnV0ZShBVFRfSVNERUZBVUxUKSkpCi0JCQkJCWlzRGVmYXVsdCA9IGZhbHNlOwogCQkJCiAJCQlJQ29uZmlndXJhdGlvbkVsZW1lbnRbXSBiaW5kaW5ncyA9IGVsZW1lbnQuZ2V0Q2hpbGRyZW4oVEFHX0NPTlRFTlRUWVBFKTsKIAkJCWlmIChiaW5kaW5ncy5sZW5ndGggPiAwKSB7CkBAIC0xNTEsMTQgKzE4MywzNSBAQAogCQkJCWNvbnRlbnRUeXBlSWQgPSBiaW5kaW5nc1swXS5nZXRBdHRyaWJ1dGUoQVRUX0NPTlRFTlRUWVBFSUQpOwkJCQogCQkJCWlmIChjb250ZW50VHlwZUlkICE9IG51bGwpCiAJCQkJCWNvbnRlbnRUeXBlID0gUGxhdGZvcm0uZ2V0Q29udGVudFR5cGVNYW5hZ2VyKCkuZ2V0Q29udGVudFR5cGUoY29udGVudFR5cGVJZCk7Ci0JCQkJfQorCQkJfQorCQkJCisJCQlpZiAoKHNob3J0U2VnbWVudCA9PSBudWxsIHx8IHNob3J0U2VnbWVudC50cmltKCkubGVuZ3RoKCkgPT0gMCkKKwkJCQkJCSYmIGNvbnRlbnRUeXBlID09IG51bGwpIHsKKwkJCQl0aHJvdyBuZXcgQ29yZUV4Y2VwdGlvbigKKwkJCQkJCQlNb2R1bGVjb3JlUGx1Z2luLmNyZWF0ZUVycm9yU3RhdHVzKDAsIAorCQkJCQkJCQkJCSJFaXRoZXIgdGhlIHNob3J0U2VnbWVudCBhdHRyaWJ1dGUgb3IgdGhlIGNvbnRlbnRUeXBlIGVsZW1lbnQgb2YgIiAvLyROT04tTkxTLTEkCisJCQkJCQkJCQkJKyBUQUdfUkVTT1VSQ0VfRkFDVE9SWSAKKwkJCQkJCQkJCQkrICIgbXVzdCBiZSBzcGVjaWZpZWQgaW4gIiAKKwkJCQkJCQkJCQkrIGVsZW1lbnQuZ2V0TmFtZXNwYWNlSWRlbnRpZmllcigpCisJCQkJCQkJCQkJKyAiLiAgVGhlIHNob3J0U2VnbWVudCBhdHRyaWJ1dGUgaXMgc3BlY2lmaWVkIHdpdGggYSB2YWxpZCwgbm9uLW51bGwsICIgLy8kTk9OLU5MUy0xJAorCQkJCQkJCQkJCSsgIm5vbi1lbXB0eSB2YWx1ZSwgYW5kIHRoZSBjb250ZW50VHlwZSBlbGVtZW50IGlzIHNwZWNpZmllZCB3aXRoIGEgIiAvLyROT04tTkxTLTEkCisJCQkJCQkJCQkJKyAidmFsaWQsIG5vbi1udWxsLCBub24tZW1wdHkgY29udGVudFR5cGVJZC4iIC8vJE5PTi1OTFMtMSQKKwkJCQkJCQkJCQksIG51bGwpKTsKKwkJCX0KKwkJCQorCQkJaWYgKCJmYWxzZSIuZXF1YWxzKGVsZW1lbnQuZ2V0QXR0cmlidXRlKEFUVF9JU0RFRkFVTFQpKSkKKwkJCQlpc0RlZmF1bHQgPSBmYWxzZTsKKwkJCQkKKyAgICAgICAgICAgIGZhY3RvcnlDbGFzc05hbWUgPSBlbGVtZW50LmdldEF0dHJpYnV0ZShBVFRfQ0xBU1MpOworCQkJb3ZlcnJpZGVzRmFjdG9yeUNsYXNzTmFtZSA9IGVsZW1lbnQuZ2V0QXR0cmlidXRlKEFUVF9PVkVSUklERVNfRkFDVE9SWSk7CQkJCQogCQl9IAogCiAJCXB1YmxpYyBib29sZWFuIGlzRW5hYmxlZEZvcihVUkkgZmlsZVVSSSkgewotCQkJLyogc2hvcnRTZWdtZW50IG11c3QgYmUgbm9uLW51bGwgZm9yIHRoZSBkZXNjcmlwdG9yIHRvIGJlIGNyZWF0ZWQsIAotCQkJICogYSB2YWxpZGF0aW9uIGNoZWNrIGluIGluaXQoKSB2ZXJpZmllcyB0aGlzIHJlcXVpcmVtZW50ICovCi0JCQlpZihmaWxlVVJJICE9IG51bGwgJiYgZmlsZVVSSS5sYXN0U2VnbWVudCgpICE9IG51bGwpCisJCQkvLyBOb3Qgc3VyZSB3aGVyZSB0aGlzIGlzIGFjdHVhbGx5IHVzZWQsIHNvIG5vdCBzdXJlIHdoYXQgdGhlIHByb3BlciAKKwkJCS8vIGltcGxlbWVudGF0aW9uIHNob3VsZCBiZSwgc28gc2ltcGx5IGNoZWNraW5nIHRoZSBzaG9ydCBzZWdtZW50IGZvciBub3cKKwkJCWlmIChmaWxlVVJJICE9IG51bGwgJiYgZmlsZVVSSS5sYXN0U2VnbWVudCgpICE9IG51bGwgJiYgc2hvcnRTZWdtZW50ICE9IG51bGwpIHsKIAkJCQlyZXR1cm4gc2hvcnRTZWdtZW50LmVxdWFscyhmaWxlVVJJLmxhc3RTZWdtZW50KCkpOworCQkJfQogCQkJcmV0dXJuIGZhbHNlOwogCQl9IAogCQkKQEAgLTE4NiwzNCArMjM5LDQzIEBACiAJCX0KIAogCQlwdWJsaWMgSUNvbnRlbnRUeXBlIGdldENvbnRlbnRUeXBlKCkgewotCQkJCiAJCQlyZXR1cm4gY29udGVudFR5cGU7CiAJCX0KIAogCQlwdWJsaWMgYm9vbGVhbiBpc0RlZmF1bHQoKSB7CiAJCQlyZXR1cm4gaXNEZWZhdWx0OwotCQl9ICAKKwkJfQorCQkKIAkJcHVibGljIGludCBoYXNoQ29kZSgpIHsKLQkJCWlmIChnZXRDb250ZW50VHlwZSgpICE9IG51bGwpCi0JCQkJcmV0dXJuIGdldFNob3J0U2VnbWVudCgpLmhhc2hDb2RlKCkgJiBnZXRDb250ZW50VHlwZSgpLmhhc2hDb2RlKCk7Ci0JCQllbHNlIHJldHVybiBzdXBlci5oYXNoQ29kZSgpOworCQkJaW50IGhhc2hDb2RlID0gMDsKKwkJCWlmIChnZXRDb250ZW50VHlwZSgpICE9IG51bGwpIHsKKwkJCQloYXNoQ29kZSB8PSBnZXRDb250ZW50VHlwZSgpLmhhc2hDb2RlKCk7CisJCQl9CisJCQlpZiAoZ2V0U2hvcnRTZWdtZW50KCkgIT0gbnVsbCkgeworCQkJCWhhc2hDb2RlIHw9IGdldFNob3J0U2VnbWVudCgpLmhhc2hDb2RlKCk7CisJCQl9CisJCQlyZXR1cm4gaGFzaENvZGU7CiAJCX0KIAkJCiAJCXB1YmxpYyBib29sZWFuIGVxdWFscyhPYmplY3QgbykgewotCQkJaWYobyBpbnN0YW5jZW9mIFJlc291cmNlRmFjdG9yeURlc2NyaXB0b3IgJiYgZ2V0Q29udGVudFR5cGUoKSAhPSBudWxsKQotCQkJCXJldHVybiAoZ2V0U2hvcnRTZWdtZW50KCkuZXF1YWxzKCgoUmVzb3VyY2VGYWN0b3J5RGVzY3JpcHRvcilvKS5nZXRTaG9ydFNlZ21lbnQoKSkgJiYKLQkJCQkJCWdldENvbnRlbnRUeXBlKCkuZXF1YWxzKCgoUmVzb3VyY2VGYWN0b3J5RGVzY3JpcHRvcilvKS5nZXRDb250ZW50VHlwZSgpKSk7Ci0JCQllbHNlIGlmICgoKFJlc291cmNlRmFjdG9yeURlc2NyaXB0b3IpbykuZ2V0Q29udGVudFR5cGUoKSAhPSBudWxsKSByZXR1cm4gZmFsc2U7Ci0JCQkJCi0JCQlyZXR1cm4gc3VwZXIuZXF1YWxzKG8pOworCQkJaWYgKCEgKG8gaW5zdGFuY2VvZiBSZXNvdXJjZUZhY3RvcnlEZXNjcmlwdG9yKSkgeworCQkJCXJldHVybiBmYWxzZTsKKwkJCX0KKwkJCVJlc291cmNlRmFjdG9yeURlc2NyaXB0b3IgcmZkbyA9IChSZXNvdXJjZUZhY3RvcnlEZXNjcmlwdG9yKSBvOworCQkJYm9vbGVhbiBlcXVhbHMgPSB0cnVlOworCQkJZXF1YWxzICY9IChnZXRDb250ZW50VHlwZSgpID09IG51bGwpID8gcmZkby5nZXRDb250ZW50VHlwZSgpID09IG51bGwgOgorCQkJCWdldENvbnRlbnRUeXBlKCkuZXF1YWxzKHJmZG8uZ2V0Q29udGVudFR5cGUoKSk7CisJCQllcXVhbHMgJj0gKGdldFNob3J0U2VnbWVudCgpID09IG51bGwpID8gcmZkby5nZXRTaG9ydFNlZ21lbnQoKSA9PSBudWxsIDoKKwkJCQlnZXRTaG9ydFNlZ21lbnQoKS5lcXVhbHMocmZkby5nZXRTaG9ydFNlZ21lbnQoKSk7CisJCQlyZXR1cm4gZXF1YWxzOwogCQl9Ci0JfSAgCisJfQogCSAKIAkKIAlwcml2YXRlIGNsYXNzIFJlc291cmNlRmFjdG9yeVJlZ2lzdHJ5UmVhZGVyIGV4dGVuZHMgUmVnaXN0cnlSZWFkZXIgaW1wbGVtZW50cyBJUmVzb3VyY2VGYWN0b3J5RXh0UHRDb25zdGFudHMgeyAKICAJCQogCQlwdWJsaWMgUmVzb3VyY2VGYWN0b3J5UmVnaXN0cnlSZWFkZXIoKSB7Ci0JCQlzdXBlcihQbGF0Zm9ybS5nZXRQbHVnaW5SZWdpc3RyeSgpLCBNb2R1bGVjb3JlUGx1Z2luLlBMVUdJTl9JRCwgRVhUUFRfUkVTT1VSQ0VfRkFDVE9SSUVTKTsKKwkJCXN1cGVyKE1vZHVsZWNvcmVQbHVnaW4uUExVR0lOX0lELCBFWFRQVF9SRVNPVVJDRV9GQUNUT1JJRVMpOwogCQl9CiAKIAkJcHVibGljIGJvb2xlYW4gcmVhZEVsZW1lbnQoZmluYWwgSUNvbmZpZ3VyYXRpb25FbGVtZW50IGVsZW1lbnQpIHsKQEAgLTIzOSw2ICszMDEsOCBAQAogCX0KIAlwcml2YXRlIGNsYXNzIFdUUFJlc291cmNlRmFjdG9yeVJlZ2lzdHJ5S2V5IHsgCiAgCQkKKwkJcHVibGljIFN0cmluZyBvdmVycmlkZXNGYWN0b3J5Q2xhc3NOYW1lOworCQlwdWJsaWMgU3RyaW5nIGZhY3RvcnlDbGFzc05hbWU7CiAJCXB1YmxpYyBTdHJpbmcgc2hvcnROYW1lOwogCQlwdWJsaWMgSUNvbnRlbnRUeXBlIHR5cGU7CiAJCXB1YmxpYyBib29sZWFuIGlzRGVmYXVsdCA9IHRydWU7CkBAIC0yNDYsNDQgKzMxMCwxMTYgQEAKIAkJCXN1cGVyKCk7CiAJCX0KIAkJCi0JCQorCQkvKioKKwkJICogU29ydCBpbiB0aGUgZm9sbG93aW5nIG1hbm5lcjoKKwkJICogRmlyc3QsIHNvcnQgYnkgc2hvcnROYW1lLCBpZiBzaG9ydE5hbWUgaXMgbnVsbCwgdGhlbiBpdCBjb21lcyBsYXN0CisJCSAqIElmIHNob3J0TmFtZXMgYXJlIGVxdWFsLCB0aGVuIHNvcnQgYnkgaXNEZWZhdWx0CisJCSAqIElmIGlzRGVmYXVsdCBpcyBhbHNvIGVxdWFsLCB0aGVuIHRoZSBvbmUgZGVmaW5pbmcgYSBmYWN0b3J5Q2xhc3NOYW1lIHdpbnMKKwkJICogSWYgYm90aCBoYXZlIGZhY3RvcnlDbGFzc05hbWVzLCB0aGVuIGNoZWNrIHRvIHNlZSBpZiBvbmUgb3ZlcnJpZGVzIHRoZSBvdGhlciB2aWEgb3ZlcnJpZGVzRmFjdG9yeUNsYXNzTmFtZQorCQkgKiBJZiBuZWl0aGVyIG92ZXJyaWRlIHRoZSBvdGhlciBmYWN0b3J5IGNsYXNzLCB0aGVuIHNvcnQgYnkgZmFjdG9yeUNsYXNzbmFtZQorCQkgKiBAcGFyYW0gb3RoZXIKKwkJICogQHJldHVybgorCQkgKi8KKwkJcHVibGljIGludCBjb21wYXJlVG8oV1RQUmVzb3VyY2VGYWN0b3J5UmVnaXN0cnlLZXkgb3RoZXIpeworCQkJaWYodGhpcyA9PSBvdGhlcil7CisJCQkJcmV0dXJuIDA7CisJCQl9CisJCQlpZihzaG9ydE5hbWUgPT0gbnVsbCAmJiBvdGhlci5zaG9ydE5hbWUgPT0gbnVsbCl7CisJCQkJcmV0dXJuIDA7CisJCQl9IGVsc2UgaWYoc2hvcnROYW1lID09IG51bGwpeworCQkJCXJldHVybiAxOworCQkJfSBlbHNlIGlmKG90aGVyLnNob3J0TmFtZSA9PSBudWxsKXsKKwkJCQlyZXR1cm4gLTE7CisJCQl9CisJCQkKKwkJCWludCBzaG9ydE5hbWVDb21wYXJlID0gdGhpcy5zaG9ydE5hbWUuY29tcGFyZVRvKG90aGVyLnNob3J0TmFtZSk7CisJCQlpZihzaG9ydE5hbWVDb21wYXJlICE9IDApeworCQkJCXJldHVybiBzaG9ydE5hbWVDb21wYXJlOworCQkJfSBlbHNlIHsKKwkJCQlpZih0aGlzLmlzRGVmYXVsdCAhPSBvdGhlci5pc0RlZmF1bHQpeworCQkJCQlpZih0aGlzLmlzRGVmYXVsdCl7CisJCQkJCQlyZXR1cm4gLTE7CisJCQkJCX0gZWxzZSB7CisJCQkJCQlyZXR1cm4gMTsKKwkJCQkJfQorCQkJCX0gZWxzZSB7CisJCQkJCWlmKHRoaXMuZmFjdG9yeUNsYXNzTmFtZSA9PSBudWxsICYmIG90aGVyLmZhY3RvcnlDbGFzc05hbWUgPT0gbnVsbCl7CisJCQkJCQlyZXR1cm4gMDsKKwkJCQkJfSBlbHNlIGlmKG90aGVyLmZhY3RvcnlDbGFzc05hbWUgPT0gbnVsbCl7CisJCQkJCQlyZXR1cm4gLTE7CisJCQkJCX0gZWxzZSBpZiAodGhpcy5mYWN0b3J5Q2xhc3NOYW1lID09IG51bGwpeworCQkJCQkJcmV0dXJuIDE7CisJCQkJCX0gZWxzZSBpZihvdGhlci5mYWN0b3J5Q2xhc3NOYW1lLmVxdWFscyh0aGlzLm92ZXJyaWRlc0ZhY3RvcnlDbGFzc05hbWUpKXsKKwkJCQkJCXJldHVybiAtMTsKKwkJCQkJfSBlbHNlIGlmKHRoaXMuZmFjdG9yeUNsYXNzTmFtZS5lcXVhbHMob3RoZXIub3ZlcnJpZGVzRmFjdG9yeUNsYXNzTmFtZSkpeworCQkJCQkJcmV0dXJuIDE7CisJCQkJCX0gZWxzZSB7CisJCQkJCQlyZXR1cm4gdGhpcy5mYWN0b3J5Q2xhc3NOYW1lLmNvbXBhcmVUbyhvdGhlci5mYWN0b3J5Q2xhc3NOYW1lKTsKKwkJCQkJfQkKKwkJCQl9CisJCQl9CisJCX0KIAl9CiAKIAlwcm90ZWN0ZWQgdm9pZCBhZGREZXNjcmlwdG9yKFJlc291cmNlRmFjdG9yeURlc2NyaXB0b3IgZGVzY3JpcHRvcikgewogCQlnZXREZXNjcmlwdG9ycygpLnB1dChnZXRLZXkoZGVzY3JpcHRvciksIGRlc2NyaXB0b3IpOwogCX0KKwkKKwlwcml2YXRlIFdUUFJlc291cmNlRmFjdG9yeVJlZ2lzdHJ5S2V5IFtdICBzb3J0ZWREZXNjcmlwdG9ycyA9IG51bGw7CisJCisJcHJpdmF0ZSBXVFBSZXNvdXJjZUZhY3RvcnlSZWdpc3RyeUtleSBbXSAgZ2V0U29ydGVkRGVzY3JpcHRvcktleXMoKSB7CisJCWlmKHNvcnRlZERlc2NyaXB0b3JzID09IG51bGwgfHwgc29ydGVkRGVzY3JpcHRvcnMubGVuZ3RoICE9IGdldERlc2NyaXB0b3JzKCkuc2l6ZSgpKXsKKwkJCVNldCBrZXlzID0gZ2V0RGVzY3JpcHRvcnMoKS5rZXlTZXQoKTsKKwkJCVdUUFJlc291cmNlRmFjdG9yeVJlZ2lzdHJ5S2V5IFtdIGFycmF5ID0gbmV3IFdUUFJlc291cmNlRmFjdG9yeVJlZ2lzdHJ5S2V5IFtrZXlzLnNpemUoKV07CisJCQlpbnQgY291bnQgPSAwOworCQkJZm9yIChJdGVyYXRvciBpdGVyYXRvciA9IGtleXMuaXRlcmF0b3IoKTsgaXRlcmF0b3IuaGFzTmV4dCgpO2NvdW50KyspIHsKKwkJCQlXVFBSZXNvdXJjZUZhY3RvcnlSZWdpc3RyeUtleSBrZXkgPSAoV1RQUmVzb3VyY2VGYWN0b3J5UmVnaXN0cnlLZXkpIGl0ZXJhdG9yLm5leHQoKTsKKwkJCQlhcnJheVtjb3VudF0gPSBrZXk7CisJCQl9CisJCQlBcnJheXMuc29ydChhcnJheSwgbmV3IENvbXBhcmF0b3I8V1RQUmVzb3VyY2VGYWN0b3J5UmVnaXN0cnlLZXk+KCkgeworCQkJCXB1YmxpYyBpbnQgY29tcGFyZShXVFBSZXNvdXJjZUZhY3RvcnlSZWdpc3RyeUtleSBrZXkxLAorCQkJCQkJV1RQUmVzb3VyY2VGYWN0b3J5UmVnaXN0cnlLZXkga2V5MikgeworCQkJCQlyZXR1cm4ga2V5MS5jb21wYXJlVG8oa2V5Mik7CisJCQkJfQorCQkJfSk7CisJCQlzb3J0ZWREZXNjcmlwdG9ycyA9IGFycmF5OworCQl9CisJCXJldHVybiBzb3J0ZWREZXNjcmlwdG9yczsKKwl9CiAKIAlwcm90ZWN0ZWQgc3luY2hyb25pemVkIFJlc291cmNlRmFjdG9yeURlc2NyaXB0b3IgZ2V0RGVzY3JpcHRvcihVUkkgdXJpLCBJQ29udGVudERlc2NyaXB0aW9uIGRlc2NyaXB0aW9uKSB7Ci0JCVNldCBrZXlzID0gZ2V0RGVzY3JpcHRvcnMoKS5rZXlTZXQoKTsKLQkJUmVzb3VyY2VGYWN0b3J5RGVzY3JpcHRvciBkZWZhdWx0RGVzYyA9IG51bGw7Ci0JCWZvciAoSXRlcmF0b3IgaXRlcmF0b3IgPSBrZXlzLml0ZXJhdG9yKCk7IGl0ZXJhdG9yLmhhc05leHQoKTspIHsKLQkJCVdUUFJlc291cmNlRmFjdG9yeVJlZ2lzdHJ5S2V5IGtleSA9IChXVFBSZXNvdXJjZUZhY3RvcnlSZWdpc3RyeUtleSkgaXRlcmF0b3IubmV4dCgpOwotCQkJaWYgKGtleS5zaG9ydE5hbWUuZXF1YWxzKHVyaS5sYXN0U2VnbWVudCgpKSkgewotCQkJCVJlc291cmNlRmFjdG9yeURlc2NyaXB0b3IgZGVzYyA9IChSZXNvdXJjZUZhY3RvcnlEZXNjcmlwdG9yKWdldERlc2NyaXB0b3JzKCkuZ2V0KGtleSk7Ci0JCQkJaWYgKGRlc2NyaXB0aW9uID09IG51bGwpIHsKLQkJCQkJaWYgKGtleS50eXBlID09IG51bGwpIAotCQkJCQkJcmV0dXJuIGRlc2M7Ci0JCQkJCWVsc2UgaWYgKGRlc2MuaXNEZWZhdWx0KCkpIAotCQkJCQkJcmV0dXJuIGRlc2M7CisJCVdUUFJlc291cmNlRmFjdG9yeVJlZ2lzdHJ5S2V5IFtdIGtleXMgPSBnZXRTb3J0ZWREZXNjcmlwdG9yS2V5cygpOworCQlSZXNvdXJjZUZhY3RvcnlEZXNjcmlwdG9yIGRlZmF1bHREZXNjcmlwdG9yID0gbnVsbDsKKwkJCisJCS8vIGZpcnN0IGNoZWNrIGNvbnRlbnQgdHlwZQorCQlpZiAoZGVzY3JpcHRpb24gIT0gbnVsbCkgeworCQkJZm9yIChXVFBSZXNvdXJjZUZhY3RvcnlSZWdpc3RyeUtleSBrZXkgOiBrZXlzKSB7CisJCQkJUmVzb3VyY2VGYWN0b3J5RGVzY3JpcHRvciBkZXNjcmlwdG9yID0gKFJlc291cmNlRmFjdG9yeURlc2NyaXB0b3IpIGdldERlc2NyaXB0b3JzKCkuZ2V0KGtleSk7CisJCQkJCisJCQkJaWYgKChrZXkudHlwZSAhPSBudWxsKSAmJiAoZGVzY3JpcHRpb24uZ2V0Q29udGVudFR5cGUoKS5lcXVhbHMoa2V5LnR5cGUpKSkgeworCQkJCQlpZiAoKGRlZmF1bHREZXNjcmlwdG9yID09IG51bGwpIHx8IChrZXkuaXNEZWZhdWx0KSkgeworCQkJCQkJZGVmYXVsdERlc2NyaXB0b3IgPSBkZXNjcmlwdG9yOworCQkJCQl9CiAJCQkJfQotCQkJCS8vQWxsb3cgdGhlIGNvbnRlbnRUeXBlIGRpc2NyaW1pbmF0aW9uIHRvIHRha2UgcGxhY2UKLQkJCQlpZiAoKGtleS50eXBlICE9IG51bGwpICYmIAotCQkJCQkJKGRlc2NyaXB0aW9uICE9IG51bGwpICYmIAotCQkJCQkJKGRlc2NyaXB0aW9uLmdldENvbnRlbnRUeXBlKCkuZXF1YWxzKGtleS50eXBlKSkpIHsKLQkJCQkJLy8gSWYgdGhlIGN1cnJlbnQgZGVzY3JpYmVyIGlzICJkZWZhdWx0IiB0aGVuIHNwZWNpZnkKLQkJCQkJaWYoZGVzYy5pc0RlZmF1bHQoKSkKLQkJCQkJCXJldHVybiBkZXNjOwotCQkJCQllbHNlIAkKLQkJCQkJCWRlZmF1bHREZXNjID0gZGVzYzsKLQkJCQl9Ci0JCQkJCQotCQkJCWlmICgoZGVzY3JpcHRpb24gIT0gbnVsbCkgJiYgKGRlc2MuaXNEZWZhdWx0KCkpICYmIChkZWZhdWx0RGVzYyA9PSBudWxsKSkKLQkJCQkJZGVmYXVsdERlc2MgPSBkZXNjOwogCQkJfQogCQl9Ci0JCXJldHVybiBkZWZhdWx0RGVzYzsKKwkJCisJCS8vIHRoZW4gY2hlY2sgc2hvcnQgbmFtZSwgb3ZlcnJpZGluZyBkZWZhdWx0IGlmIG5lY2Vzc2FyeQorCQlmb3IgKFdUUFJlc291cmNlRmFjdG9yeVJlZ2lzdHJ5S2V5IGtleSA6IGtleXMpIHsKKwkJCVJlc291cmNlRmFjdG9yeURlc2NyaXB0b3IgZGVzY3JpcHRvciA9IChSZXNvdXJjZUZhY3RvcnlEZXNjcmlwdG9yKSBnZXREZXNjcmlwdG9ycygpLmdldChrZXkpOworCQkJCQkJCisJCQlpZiAoKGtleS5zaG9ydE5hbWUgIT0gbnVsbCkgJiYgKHVyaS5sYXN0U2VnbWVudCgpLmVxdWFscyhrZXkuc2hvcnROYW1lKSkpIHsKKwkJCQlpZiAoKGRlZmF1bHREZXNjcmlwdG9yID09IG51bGwpIAorCQkJCQkJfHwgKChkZXNjcmlwdGlvbiA9PSBudWxsKSAmJiAoa2V5LmlzRGVmYXVsdCkpKSB7CisJCQkJCWRlZmF1bHREZXNjcmlwdG9yID0gZGVzY3JpcHRvcjsKKwkJCQl9CisJCQl9CisJCX0KKwkJCisJCXJldHVybiBkZWZhdWx0RGVzY3JpcHRvcjsKIAl9Ci1wcml2YXRlIFVSSSBuZXdQbGF0Zm9ybVVSSShVUkkgYU5ld1VSSSwgSVByb2plY3QgcHJvamVjdCkgeworCQorCXByaXZhdGUgVVJJIG5ld1BsYXRmb3JtVVJJKFVSSSBhTmV3VVJJLCBJUHJvamVjdCBwcm9qZWN0KSB7CiAJCQogCQlpZiAocHJvamVjdCA9PSBudWxsKQogCQkJcmV0dXJuIE1vZHVsZVVSSVV0aWwudHJpbVRvRGVwbG95UGF0aFNlZ21lbnQoYU5ld1VSSSk7CkBAIC0yOTksNyArNDM1LDcgQEAKIAkJCXJldHVybiBVUkkuY3JlYXRlUGxhdGZvcm1SZXNvdXJjZVVSSShuZXdGaWxlLmdldFdvcmtzcGFjZVJlbGF0aXZlUGF0aCgpLnRvU3RyaW5nKCkpOwogCQkJIAogCQl9IGNhdGNoKEV4Y2VwdGlvbiBlKSB7Ci0JCQllLnByaW50U3RhY2tUcmFjZSgpOworCQkJTW9kdWxlY29yZVBsdWdpbi5sb2dFcnJvcihlKTsKIAkJfQogCQlyZXR1cm4gbnVsbDsKIAl9CkBAIC0zMjAsOCArNDU2LDcgQEAKIAkJCXRyeSB7CiAJCQkJZGVzY3JpcHRpb24gPSBmaWxlLmdldENvbnRlbnREZXNjcmlwdGlvbigpOwogCQkJfSBjYXRjaCAoQ29yZUV4Y2VwdGlvbiBlKSB7Ci0JCQkJLy8gVE9ETyBBdXRvLWdlbmVyYXRlZCBjYXRjaCBibG9jawotCQkJCWUucHJpbnRTdGFja1RyYWNlKCk7CisJCQkJTW9kdWxlY29yZVBsdWdpbi5sb2dFcnJvcihlKTsKIAkJCX0KIAkJfQogCQlpZiAoZGVzY3JpcHRpb24gPT0gbnVsbCkgey8vQ2hlY2sgZm9yIG9wdGlvbmFsIGVtYmVkZGVkIHVyaSBzZWdtZW50LCB0aGVuIG5vcm1hbGl6ZQpAQCAtMzMyLDE1ICs0NjcsMTMgQEAKIAkJCQkJdHJ5IHsKIAkJCQkJCWNvbXBvbmVudFByb2plY3QgPSBTdHJ1Y3R1cmVFZGl0LmdldENvbnRhaW5pbmdQcm9qZWN0KHVyaSk7CiAJCQkJCX0gY2F0Y2ggKFVucmVzb2x2ZWFibGVVUklFeGNlcHRpb24gZSkgewotCQkJCQkJLy8gVE9ETyBBdXRvLWdlbmVyYXRlZCBjYXRjaCBibG9jawotCQkJCQkJZS5wcmludFN0YWNrVHJhY2UoKTsKKwkJCQkJCU1vZHVsZWNvcmVQbHVnaW4ubG9nRXJyb3IoZSk7CiAJCQkJCX0KIAkJCQkJdXJpID0gUGxhdGZvcm1VUkxNb2R1bGVDb25uZWN0aW9uLnJlc29sdmUodXJpKTsKIAkJCQkJdXJpID0gbmV3UGxhdGZvcm1VUkkodXJpLGNvbXBvbmVudFByb2plY3QpOwogCQkJCX0gCiAJCQl9IGNhdGNoIChJT0V4Y2VwdGlvbiBlKSB7Ci0JCQkJLy8gVE9ETyBBdXRvLWdlbmVyYXRlZCBjYXRjaCBibG9jawotCQkJCWUucHJpbnRTdGFja1RyYWNlKCk7CisJCQkJTW9kdWxlY29yZVBsdWdpbi5sb2dFcnJvcihlKTsKIAkJCX0KIAkJfQogCQkKQEAgLTM1Myw0ICs0ODYsMzAgQEAKIAkJCXJldHVybiBzdXBlci5nZXREZXNjcmlwdG9yKHVyaSk7CiAJCX0KIAl9CisKKwlwdWJsaWMgRmFjdG9yeSBnZXRGYWN0b3J5KFVSSSB1cmksIFN0cmluZyBjb250ZW50VHlwZSkgeworCQlJQ29udGVudFR5cGUgdHlwZSA9IFBsYXRmb3JtLmdldENvbnRlbnRUeXBlTWFuYWdlcigpLmdldENvbnRlbnRUeXBlKGNvbnRlbnRUeXBlKTsKKwkJaWYgKHR5cGUgIT0gbnVsbCkKKwkJCXJldHVybiBnZXRGYWN0b3J5KHVyaSwgdHlwZS5nZXREZWZhdWx0RGVzY3JpcHRpb24oKSk7CisJCXJldHVybiBzdXBlci5nZXRGYWN0b3J5KHVyaSwgY29udGVudFR5cGUpOworCX0KKwkKKwkKKwkvKioKKwkgKiAgUmV0dXJucyB0cnVlIGlmIHRoZSB1cmkgaXMgZm91bmQgaW4gdGhlIFdUUFJlc291cmNlRmFjdG9yeVJlZ2lzdHJ5IGRlc2NyaXB0b3IuCisJICogIFRoaXMgd2lsbCBub3QgbG9hZCBhbnkgZXh0ZW5zaW9uIHBvaW50cworCSAqLworCXB1YmxpYyBzeW5jaHJvbml6ZWQgYm9vbGVhbiBzaG9ydE5hbWVSZWdpc3RlcmVkKFVSSSB1cmkpIHsKKwkJTWFwIG0gPSBnZXREZXNjcmlwdG9ycygpOworCQlDb2xsZWN0aW9uIGMgPSBtLnZhbHVlcygpOworCQlJdGVyYXRvciBpdGVyID0gYy5pdGVyYXRvcigpOworCQlTdHJpbmcgdXJpTGFzdFNlZ21lbnQgPSB1cmkubGFzdFNlZ21lbnQoKTsKKwkJd2hpbGUoaXRlci5oYXNOZXh0KCkpIHsKKwkJCVJlc291cmNlRmFjdG9yeURlc2NyaXB0b3IgZGVzY3JpcHRvciA9IChSZXNvdXJjZUZhY3RvcnlEZXNjcmlwdG9yKSBpdGVyLm5leHQoKTsKKwkJCWlmKGRlc2NyaXB0b3IuZ2V0U2hvcnRTZWdtZW50KCkgIT0gbnVsbCAmJiBkZXNjcmlwdG9yLmdldFNob3J0U2VnbWVudCgpLmVxdWFscyh1cmlMYXN0U2VnbWVudCkpIHsKKwkJCQlyZXR1cm4gdHJ1ZTsKKwkJCX0KKwkJfQorCQlyZXR1cm4gZmFsc2U7CisJfQogfQpkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUvbW9kdWxlY29yZS1zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9jb21wb25lbnRjb3JlL2ludGVybmFsL2ltcGwvV29ya2JlbmNoQ29tcG9uZW50SW1wbC5qYXZhIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUvbW9kdWxlY29yZS1zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9jb21wb25lbnRjb3JlL2ludGVybmFsL2ltcGwvV29ya2JlbmNoQ29tcG9uZW50SW1wbC5qYXZhCmluZGV4IDg4M2ViYjkuLmM4YjE4M2EgMTAwNjQ0Ci0tLSBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlL21vZHVsZWNvcmUtc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vY29tcG9uZW50Y29yZS9pbnRlcm5hbC9pbXBsL1dvcmtiZW5jaENvbXBvbmVudEltcGwuamF2YQorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS9tb2R1bGVjb3JlLXNyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2NvbXBvbmVudGNvcmUvaW50ZXJuYWwvaW1wbC9Xb3JrYmVuY2hDb21wb25lbnRJbXBsLmphdmEKQEAgLTEsOSArMSwxMyBAQAotLyoqCi0gKiA8Y29weXJpZ2h0PgotICogPC9jb3B5cmlnaHQ+CisvKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKgorICogQ29weXJpZ2h0IChjKSAyMDAzLCAyMDA5IElCTSBDb3Jwb3JhdGlvbiBhbmQgb3RoZXJzLgorICogQWxsIHJpZ2h0cyByZXNlcnZlZC4gVGhpcyBwcm9ncmFtIGFuZCB0aGUgYWNjb21wYW55aW5nIG1hdGVyaWFscworICogYXJlIG1hZGUgYXZhaWxhYmxlIHVuZGVyIHRoZSB0ZXJtcyBvZiB0aGUgRWNsaXBzZSBQdWJsaWMgTGljZW5zZSB2MS4wCisgKiB3aGljaCBhY2NvbXBhbmllcyB0aGlzIGRpc3RyaWJ1dGlvbiwgYW5kIGlzIGF2YWlsYWJsZSBhdAorICogaHR0cDovL3d3dy5lY2xpcHNlLm9yZy9sZWdhbC9lcGwtdjEwLmh0bWwKICAqCi0gKiAkSWQ6IFdvcmtiZW5jaENvbXBvbmVudEltcGwuamF2YSx2IDEuMTQgMjAwNy8wMi8xNCAxNjowMDo1MiBqc2hvbGwgRXhwICQKLSAqLworICogQ29udHJpYnV0b3JzOgorICogICAgIElCTSBDb3Jwb3JhdGlvbiAtIGluaXRpYWwgQVBJIGFuZCBpbXBsZW1lbnRhdGlvbgorICoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKiovCiBwYWNrYWdlIG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS5pbnRlcm5hbC5pbXBsOwogCiBpbXBvcnQgamF2YS51dGlsLkNvbGxlY3Rpb247CkBAIC02MCw3ICs2NCwxMiBAQAogCXB1YmxpYyBzdGF0aWMgY2xhc3MgRVN5bmNocm9uaXplZEFkYXB0ZXJMaXN0IGV4dGVuZHMgRUFkYXB0ZXJMaXN0CiAJICB7CiAJCi0JICAgIHB1YmxpYyBFU3luY2hyb25pemVkQWRhcHRlckxpc3QoTm90aWZpZXIgbm90aWZpZXIpIHsKKwkgICAgQE92ZXJyaWRlCisJCXB1YmxpYyBPYmplY3RbXSBkYXRhKCkgeworCQkJc3luY2hyb25pemVkICh0aGlzKXtyZXR1cm4gc3VwZXIuZGF0YSgpO30KKwkJfQorCisJCXB1YmxpYyBFU3luY2hyb25pemVkQWRhcHRlckxpc3QoTm90aWZpZXIgbm90aWZpZXIpIHsKIAkJCXN1cGVyKG5vdGlmaWVyKTsKIAkJfQogCQpAQCAtNTUyLDYgKzU2MSwxMyBAQAogCXB1YmxpYyB2b2lkIGVOb3RpZnkoTm90aWZpY2F0aW9uIG5vdGlmaWNhdGlvbikgewogCQlzeW5jaHJvbml6ZWQgKGVBZGFwdGVycygpKSB7CiAJCQlzdXBlci5lTm90aWZ5KG5vdGlmaWNhdGlvbik7CisJCQlzd2l0Y2gobm90aWZpY2F0aW9uLmdldEV2ZW50VHlwZSgpKSB7CisJCQkJY2FzZSBOb3RpZmljYXRpb24uUkVNT1ZFOgorCQkJCWNhc2UgTm90aWZpY2F0aW9uLlJFTU9WRV9NQU5ZOgorCQkJCQlkZWZhdWx0U291cmNlUm9vdCA9IG51bGw7CisJCQkJCWhhbmRsZSA9IG51bGw7CisJCQkJCWJyZWFrOworCQkJCX0KIAkJfQogCX0KIAkKZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlL21vZHVsZWNvcmUtc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vY29tcG9uZW50Y29yZS9pbnRlcm5hbC9vcGVyYXRpb24vQWRkUmVmZXJlbmNlRGF0YU1vZGVsUHJvdmlkZXIuamF2YSBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlL21vZHVsZWNvcmUtc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vY29tcG9uZW50Y29yZS9pbnRlcm5hbC9vcGVyYXRpb24vQWRkUmVmZXJlbmNlRGF0YU1vZGVsUHJvdmlkZXIuamF2YQpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi40MGM2ZTY1Ci0tLSAvZGV2L251bGwKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUvbW9kdWxlY29yZS1zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9jb21wb25lbnRjb3JlL2ludGVybmFsL29wZXJhdGlvbi9BZGRSZWZlcmVuY2VEYXRhTW9kZWxQcm92aWRlci5qYXZhCkBAIC0wLDAgKzEsNDQgQEAKKy8qKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqCisgKiBDb3B5cmlnaHQgKGMpIDIwMDUsIDIwMDcgSUJNIENvcnBvcmF0aW9uIGFuZCBvdGhlcnMuCisgKiBBbGwgcmlnaHRzIHJlc2VydmVkLiBUaGlzIHByb2dyYW0gYW5kIHRoZSBhY2NvbXBhbnlpbmcgbWF0ZXJpYWxzCisgKiBhcmUgbWFkZSBhdmFpbGFibGUgdW5kZXIgdGhlIHRlcm1zIG9mIHRoZSBFY2xpcHNlIFB1YmxpYyBMaWNlbnNlIHYxLjAKKyAqIHdoaWNoIGFjY29tcGFuaWVzIHRoaXMgZGlzdHJpYnV0aW9uLCBhbmQgaXMgYXZhaWxhYmxlIGF0CisgKiBodHRwOi8vd3d3LmVjbGlwc2Uub3JnL2xlZ2FsL2VwbC12MTAuaHRtbAorICoKKyAqIENvbnRyaWJ1dG9yczoKKyAqICAgICBJQk0gQ29ycG9yYXRpb24gLSBpbml0aWFsIEFQSSBhbmQgaW1wbGVtZW50YXRpb24KKyAqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqLworcGFja2FnZSBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUuaW50ZXJuYWwub3BlcmF0aW9uOworCitpbXBvcnQgamF2YS51dGlsLlNldDsKKworaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS5kYXRhbW9kZWwucHJvcGVydGllcy5JQWRkUmVmZXJlbmNlRGF0YU1vZGVsUHJvcGVydGllczsKK2ltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3MuZGF0YW1vZGVsLkFic3RyYWN0RGF0YU1vZGVsUHJvdmlkZXI7CitpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzLmRhdGFtb2RlbC5JRGF0YU1vZGVsT3BlcmF0aW9uOworCisvKioKKyAqIFRoaXMgY2xhc3MgaXMgbWVhbnQgdG8gYmUgYW4gYWx0ZXJuYXRpdmUgdG8gQ3JlYXRlUmVmZXJlbmNlQ29tcG9uZW50c0RhdGFNb2RlbFByb3ZpZGVyCisgKiB3aGljaCByZXF1aXJlcyBsZXNzIG9wdGlvbnMgYW5kIGFsbG93cyBmb3IgYSBwcmUtbWFkZSBJVmlydHVhbFJlZmVyZW5jZSB0byBiZSBzdG9yZWQuCisgKi8KK3B1YmxpYyBjbGFzcyBBZGRSZWZlcmVuY2VEYXRhTW9kZWxQcm92aWRlciBleHRlbmRzIEFic3RyYWN0RGF0YU1vZGVsUHJvdmlkZXIgaW1wbGVtZW50cyBJQWRkUmVmZXJlbmNlRGF0YU1vZGVsUHJvcGVydGllcyB7CisKKwlwdWJsaWMgQWRkUmVmZXJlbmNlRGF0YU1vZGVsUHJvdmlkZXIoKSB7CisJCXN1cGVyKCk7CisJfQorCisJcHVibGljIFNldCBnZXRQcm9wZXJ0eU5hbWVzKCkgeworCQlTZXQgcHJvcGVydHlOYW1lcyA9IHN1cGVyLmdldFByb3BlcnR5TmFtZXMoKTsKKwkJcHJvcGVydHlOYW1lcy5hZGQoU09VUkNFX0NPTVBPTkVOVCk7CisJCXByb3BlcnR5TmFtZXMuYWRkKFRBUkdFVF9SRUZFUkVOQ0VfTElTVCk7CisJCXJldHVybiBwcm9wZXJ0eU5hbWVzOworCX0KKworCXB1YmxpYyBJRGF0YU1vZGVsT3BlcmF0aW9uIGdldERlZmF1bHRPcGVyYXRpb24oKSB7CisJCXJldHVybiBuZXcgQWRkUmVmZXJlbmNlc09wKG1vZGVsKTsKKwl9CisKKwlwdWJsaWMgT2JqZWN0IGdldERlZmF1bHRQcm9wZXJ0eShTdHJpbmcgcHJvcGVydHlOYW1lKSB7CisJCS8vIE5vIGRlZmF1bHRzLCBib3RoIG11c3QgYmUgc2V0CisJCXJldHVybiBzdXBlci5nZXREZWZhdWx0UHJvcGVydHkocHJvcGVydHlOYW1lKTsKKwl9Cit9CmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS9tb2R1bGVjb3JlLXNyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2NvbXBvbmVudGNvcmUvaW50ZXJuYWwvb3BlcmF0aW9uL0FkZFJlZmVyZW5jZXNPcC5qYXZhIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUvbW9kdWxlY29yZS1zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9jb21wb25lbnRjb3JlL2ludGVybmFsL29wZXJhdGlvbi9BZGRSZWZlcmVuY2VzT3AuamF2YQpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi4zNTgxMmJmCi0tLSAvZGV2L251bGwKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUvbW9kdWxlY29yZS1zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9jb21wb25lbnRjb3JlL2ludGVybmFsL29wZXJhdGlvbi9BZGRSZWZlcmVuY2VzT3AuamF2YQpAQCAtMCwwICsxLDEyMCBAQAorLyoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioKKyAqIENvcHlyaWdodCAoYykgMjAwNSwgMjAwNyBJQk0gQ29ycG9yYXRpb24gYW5kIG90aGVycy4KKyAqIEFsbCByaWdodHMgcmVzZXJ2ZWQuIFRoaXMgcHJvZ3JhbSBhbmQgdGhlIGFjY29tcGFueWluZyBtYXRlcmlhbHMKKyAqIGFyZSBtYWRlIGF2YWlsYWJsZSB1bmRlciB0aGUgdGVybXMgb2YgdGhlIEVjbGlwc2UgUHVibGljIExpY2Vuc2UgdjEuMAorICogd2hpY2ggYWNjb21wYW5pZXMgdGhpcyBkaXN0cmlidXRpb24sIGFuZCBpcyBhdmFpbGFibGUgYXQKKyAqIGh0dHA6Ly93d3cuZWNsaXBzZS5vcmcvbGVnYWwvZXBsLXYxMC5odG1sCisgKgorICogQ29udHJpYnV0b3JzOgorICogICAgIElCTSBDb3Jwb3JhdGlvbiAtIGluaXRpYWwgQVBJIGFuZCBpbXBsZW1lbnRhdGlvbgorICoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKiovCitwYWNrYWdlIG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS5pbnRlcm5hbC5vcGVyYXRpb247CisKK2ltcG9ydCBqYXZhLnV0aWwuQXJyYXlMaXN0OworaW1wb3J0IGphdmEudXRpbC5BcnJheXM7CitpbXBvcnQgamF2YS51dGlsLkxpc3Q7CisKK2ltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLmNvbW1hbmRzLkV4ZWN1dGlvbkV4Y2VwdGlvbjsKK2ltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJlc291cmNlcy5JRmlsZTsKK2ltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJlc291cmNlcy5JUHJvamVjdDsKK2ltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJlc291cmNlcy5SZXNvdXJjZXNQbHVnaW47CitpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5ydW50aW1lLkNvcmVFeGNlcHRpb247CitpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5ydW50aW1lLklBZGFwdGFibGU7CitpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5ydW50aW1lLklQcm9ncmVzc01vbml0b3I7CitpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5ydW50aW1lLklTdGF0dXM7CitpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5ydW50aW1lLlN0YXR1czsKK2ltcG9ydCBvcmcuZWNsaXBzZS5qZW0udXRpbC5VSUNvbnRleHREZXRlcm1pbmF0aW9uOworaW1wb3J0IG9yZy5lY2xpcHNlLmplbS51dGlsLmVtZi53b3JrYmVuY2guUHJvamVjdFV0aWxpdGllczsKK2ltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUuZGF0YW1vZGVsLnByb3BlcnRpZXMuSUFkZFJlZmVyZW5jZURhdGFNb2RlbFByb3BlcnRpZXM7CitpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb21wb25lbnRjb3JlLmludGVybmFsLk1vZHVsZWNvcmVQbHVnaW47CitpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb21wb25lbnRjb3JlLmludGVybmFsLlN0cnVjdHVyZUVkaXQ7CitpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb21wb25lbnRjb3JlLnJlc291cmNlcy5JVmlydHVhbENvbXBvbmVudDsKK2ltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUucmVzb3VyY2VzLklWaXJ0dWFsUmVmZXJlbmNlOworaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy5kYXRhbW9kZWwuQWJzdHJhY3REYXRhTW9kZWxPcGVyYXRpb247CitpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzLmRhdGFtb2RlbC5JRGF0YU1vZGVsOworaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uaW50ZXJuYWwuZW1md29ya2JlbmNoLnZhbGlkYXRlZWRpdC5JVmFsaWRhdGVFZGl0Q29udGV4dDsKKworcHVibGljIGNsYXNzIEFkZFJlZmVyZW5jZXNPcCBleHRlbmRzIEFic3RyYWN0RGF0YU1vZGVsT3BlcmF0aW9uIHsKKworCisJcHVibGljIEFkZFJlZmVyZW5jZXNPcChJRGF0YU1vZGVsIG1vZGVsKSB7CisJCXN1cGVyKG1vZGVsKTsKKwl9CisKKwlwdWJsaWMgSVN0YXR1cyBleGVjdXRlKElQcm9ncmVzc01vbml0b3IgbW9uaXRvciwgSUFkYXB0YWJsZSBpbmZvKSB0aHJvd3MgRXhlY3V0aW9uRXhjZXB0aW9uIHsKKwkJaWYgKCF2YWxpZGF0ZUVkaXQoKS5pc09LKCkpCisJCQlyZXR1cm4gU3RhdHVzLkNBTkNFTF9TVEFUVVM7CisJCWFkZFJlZmVyZW5jZWRDb21wb25lbnRzKG1vbml0b3IpOworCQlhZGRQcm9qZWN0UmVmZXJlbmNlcygpOworCQlyZXR1cm4gT0tfU1RBVFVTOworCX0KKwkKKwkvKioKKwkgKiBWYWxpZGF0ZSBlZGl0IGZvciByZXNvdXJjZSBzdGF0ZQorCSAqLworCXByb3RlY3RlZCBJU3RhdHVzIHZhbGlkYXRlRWRpdCgpIHsKKwkJSVN0YXR1cyBzdGF0dXMgPSBPS19TVEFUVVM7CisJCUlWYWxpZGF0ZUVkaXRDb250ZXh0IHZhbGlkYXRvciA9IChJVmFsaWRhdGVFZGl0Q29udGV4dCkgVUlDb250ZXh0RGV0ZXJtaW5hdGlvbi5jcmVhdGVJbnN0YW5jZShJVmFsaWRhdGVFZGl0Q29udGV4dC5DTEFTU19LRVkpOworCQlJVmlydHVhbENvbXBvbmVudCBzb3VyY2VDb21wID0gKElWaXJ0dWFsQ29tcG9uZW50KSBtb2RlbC5nZXRQcm9wZXJ0eShJQWRkUmVmZXJlbmNlRGF0YU1vZGVsUHJvcGVydGllcy5TT1VSQ0VfQ09NUE9ORU5UKTsKKwkJSVByb2plY3QgcHJvamVjdCA9IHNvdXJjZUNvbXAuZ2V0UHJvamVjdCgpOworCisJCWlmIChzdGF0dXMuaXNPSygpKSB7CisJCQlTdHJ1Y3R1cmVFZGl0IHNFZGl0ID0gbnVsbDsKKwkJCXRyeSB7CisJCQkJc0VkaXQgPSBTdHJ1Y3R1cmVFZGl0LmdldFN0cnVjdHVyZUVkaXRGb3JXcml0ZShwcm9qZWN0KTsKKwkJCQlzdGF0dXMgPSB2YWxpZGF0b3IudmFsaWRhdGVTdGF0ZShzRWRpdC5nZXRNb2R1bGVTdHJ1Y3R1cmFsTW9kZWwoKSk7CisJCQl9IGZpbmFsbHkgeworCQkJCWlmIChzRWRpdCAhPW51bGwpCisJCQkJCXNFZGl0LmRpc3Bvc2UoKTsKKwkJCX0KKwkJfQorCQkKKwkJSUZpbGUgW10gZmlsZXMgPSBuZXcgSUZpbGVbMV07CisJCWZpbGVzWzBdID0gcHJvamVjdC5nZXRGaWxlKFByb2plY3RVdGlsaXRpZXMuRE9UX1BST0pFQ1QpOworCQlzdGF0dXMgPSBSZXNvdXJjZXNQbHVnaW4uZ2V0V29ya3NwYWNlKCkudmFsaWRhdGVFZGl0KGZpbGVzLCBudWxsKTsKKwkJcmV0dXJuIHN0YXR1czsKKwl9CisJCisJcHVibGljIHN0YXRpYyBMaXN0PElWaXJ0dWFsUmVmZXJlbmNlPiBnZXRMaXN0RnJvbU1vZGVsKElEYXRhTW9kZWwgbW9kZWwpIHsKKwkJT2JqZWN0IHZhbHVlID0gbW9kZWwuZ2V0UHJvcGVydHkoSUFkZFJlZmVyZW5jZURhdGFNb2RlbFByb3BlcnRpZXMuVEFSR0VUX1JFRkVSRU5DRV9MSVNUKTsKKwkJTGlzdDxJVmlydHVhbFJlZmVyZW5jZT4gbW9kTGlzdCA9IHZhbHVlIGluc3RhbmNlb2YgTGlzdCA/ICAoTGlzdDxJVmlydHVhbFJlZmVyZW5jZT4pdmFsdWUgOiBBcnJheXMuYXNMaXN0KG5ldyBJVmlydHVhbFJlZmVyZW5jZVtdeyhJVmlydHVhbFJlZmVyZW5jZSl2YWx1ZX0pOworCQlyZXR1cm4gbW9kTGlzdDsKKwl9CisJCisJcHJvdGVjdGVkIHZvaWQgYWRkUHJvamVjdFJlZmVyZW5jZXMoKSB7CisKKwkJSVZpcnR1YWxDb21wb25lbnQgc291cmNlQ29tcCA9IChJVmlydHVhbENvbXBvbmVudCkgbW9kZWwuZ2V0UHJvcGVydHkoSUFkZFJlZmVyZW5jZURhdGFNb2RlbFByb3BlcnRpZXMuU09VUkNFX0NPTVBPTkVOVCk7CisJCUxpc3QgbW9kTGlzdCA9IGdldExpc3RGcm9tTW9kZWwobW9kZWwpOworCQlMaXN0IHRhcmdldHByb2plY3RMaXN0ID0gbmV3IEFycmF5TGlzdCgpOworCQlmb3IgKGludCBpID0gMDsgaSA8IG1vZExpc3Quc2l6ZSgpOyBpKyspIHsKKwkJCUlWaXJ0dWFsQ29tcG9uZW50IHZpcnR1YWxDb21wb25lbnQgPSAoKElWaXJ0dWFsUmVmZXJlbmNlKSBtb2RMaXN0LmdldChpKSkuZ2V0UmVmZXJlbmNlZENvbXBvbmVudCgpOworCQkJaWYodmlydHVhbENvbXBvbmVudC5pc0JpbmFyeSgpKXsKKwkJCQljb250aW51ZTsKKwkJCX0KKwkJCUlQcm9qZWN0IHRhcmdldFByb2plY3QgPSB2aXJ0dWFsQ29tcG9uZW50LmdldFByb2plY3QoKTsKKwkJCXRhcmdldHByb2plY3RMaXN0LmFkZCh0YXJnZXRQcm9qZWN0KTsKKwkJfQorCQl0cnkgeworCQkJUHJvamVjdFV0aWxpdGllcy5hZGRSZWZlcmVuY2VQcm9qZWN0cyhzb3VyY2VDb21wLmdldFByb2plY3QoKSwgdGFyZ2V0cHJvamVjdExpc3QpOworCQl9IGNhdGNoIChDb3JlRXhjZXB0aW9uIGUpIHsKKwkJCU1vZHVsZWNvcmVQbHVnaW4ubG9nRXJyb3IoZSk7CisJCX0KKworCX0KKworCXByb3RlY3RlZCB2b2lkIGFkZFJlZmVyZW5jZWRDb21wb25lbnRzKElQcm9ncmVzc01vbml0b3IgbW9uaXRvcikgeworCQlJVmlydHVhbENvbXBvbmVudCBzb3VyY2VDb21wID0gKElWaXJ0dWFsQ29tcG9uZW50KSBtb2RlbC5nZXRQcm9wZXJ0eShJQWRkUmVmZXJlbmNlRGF0YU1vZGVsUHJvcGVydGllcy5TT1VSQ0VfQ09NUE9ORU5UKTsKKwkJTGlzdDxJVmlydHVhbFJlZmVyZW5jZT4gcmVmTGlzdCA9IGdldExpc3RGcm9tTW9kZWwobW9kZWwpOworCQlJVmlydHVhbFJlZmVyZW5jZVtdIHJlZnMgPSAoSVZpcnR1YWxSZWZlcmVuY2VbXSkgcmVmTGlzdC50b0FycmF5KG5ldyBJVmlydHVhbFJlZmVyZW5jZVtyZWZMaXN0LnNpemUoKV0pOworCQlzb3VyY2VDb21wLmFkZFJlZmVyZW5jZXMocmVmcyk7CisJfQorCisJcHVibGljIElTdGF0dXMgcmVkbyhJUHJvZ3Jlc3NNb25pdG9yIG1vbml0b3IsIElBZGFwdGFibGUgaW5mbykgdGhyb3dzIEV4ZWN1dGlvbkV4Y2VwdGlvbiB7CisJCXJldHVybiBudWxsOworCX0KKworCXB1YmxpYyBJU3RhdHVzIHVuZG8oSVByb2dyZXNzTW9uaXRvciBtb25pdG9yLCBJQWRhcHRhYmxlIGluZm8pIHRocm93cyBFeGVjdXRpb25FeGNlcHRpb24geworCQlyZXR1cm4gbnVsbDsKKwl9CisKK30KZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlL21vZHVsZWNvcmUtc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vY29tcG9uZW50Y29yZS9pbnRlcm5hbC9vcGVyYXRpb24vQXJ0aWZhY3RFZGl0UHJvdmlkZXJPcGVyYXRpb24uamF2YSBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlL21vZHVsZWNvcmUtc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vY29tcG9uZW50Y29yZS9pbnRlcm5hbC9vcGVyYXRpb24vQXJ0aWZhY3RFZGl0UHJvdmlkZXJPcGVyYXRpb24uamF2YQppbmRleCBiOTU2NTE2Li5iMGE0NmQzIDEwMDY0NAotLS0gYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS9tb2R1bGVjb3JlLXNyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2NvbXBvbmVudGNvcmUvaW50ZXJuYWwvb3BlcmF0aW9uL0FydGlmYWN0RWRpdFByb3ZpZGVyT3BlcmF0aW9uLmphdmEKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUvbW9kdWxlY29yZS1zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9jb21wb25lbnRjb3JlL2ludGVybmFsL29wZXJhdGlvbi9BcnRpZmFjdEVkaXRQcm92aWRlck9wZXJhdGlvbi5qYXZhCkBAIC00MCw3ICs0MCw2IEBACiAKIAlwdWJsaWMgQXJ0aWZhY3RFZGl0UHJvdmlkZXJPcGVyYXRpb24oKSB7CiAJCXN1cGVyKCk7Ci0JCS8vIFRPRE8gQXV0by1nZW5lcmF0ZWQgY29uc3RydWN0b3Igc3R1YgogCX0KIAogCXB1YmxpYyBBcnRpZmFjdEVkaXRQcm92aWRlck9wZXJhdGlvbihJRGF0YU1vZGVsIG1vZGVsKSB7CmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS9tb2R1bGVjb3JlLXNyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2NvbXBvbmVudGNvcmUvaW50ZXJuYWwvb3BlcmF0aW9uL0NyZWF0ZVJlZmVyZW5jZUNvbXBvbmVudHNPcC5qYXZhIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUvbW9kdWxlY29yZS1zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9jb21wb25lbnRjb3JlL2ludGVybmFsL29wZXJhdGlvbi9DcmVhdGVSZWZlcmVuY2VDb21wb25lbnRzT3AuamF2YQppbmRleCBkZmNjNjIyLi45ZmNjNzY4IDEwMDY0NAotLS0gYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS9tb2R1bGVjb3JlLXNyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2NvbXBvbmVudGNvcmUvaW50ZXJuYWwvb3BlcmF0aW9uL0NyZWF0ZVJlZmVyZW5jZUNvbXBvbmVudHNPcC5qYXZhCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlL21vZHVsZWNvcmUtc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vY29tcG9uZW50Y29yZS9pbnRlcm5hbC9vcGVyYXRpb24vQ3JlYXRlUmVmZXJlbmNlQ29tcG9uZW50c09wLmphdmEKQEAgLTI5LDYgKzI5LDcgQEAKIGltcG9ydCBvcmcuZWNsaXBzZS5qZW0udXRpbC5lbWYud29ya2JlbmNoLlByb2plY3RVdGlsaXRpZXM7CiBpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb21wb25lbnRjb3JlLkNvbXBvbmVudENvcmU7CiBpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb21wb25lbnRjb3JlLmRhdGFtb2RlbC5wcm9wZXJ0aWVzLklDcmVhdGVSZWZlcmVuY2VDb21wb25lbnRzRGF0YU1vZGVsUHJvcGVydGllczsKK2ltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUuaW50ZXJuYWwuTW9kdWxlY29yZVBsdWdpbjsKIGltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUuaW50ZXJuYWwuU3RydWN0dXJlRWRpdDsKIGltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUucmVzb3VyY2VzLklWaXJ0dWFsQ29tcG9uZW50OwogaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS5yZXNvdXJjZXMuSVZpcnR1YWxSZWZlcmVuY2U7CkBAIC04MywxNCArODQsMTcgQEAKIAkJTGlzdCBtb2RMaXN0ID0gKExpc3QpIG1vZGVsLmdldFByb3BlcnR5KElDcmVhdGVSZWZlcmVuY2VDb21wb25lbnRzRGF0YU1vZGVsUHJvcGVydGllcy5UQVJHRVRfQ09NUE9ORU5UX0xJU1QpOwogCQlMaXN0IHRhcmdldHByb2plY3RMaXN0ID0gbmV3IEFycmF5TGlzdCgpOwogCQlmb3IgKGludCBpID0gMDsgaSA8IG1vZExpc3Quc2l6ZSgpOyBpKyspIHsKLQkJCUlWaXJ0dWFsQ29tcG9uZW50IElWaXJ0dWFsQ29tcG9uZW50ID0gKElWaXJ0dWFsQ29tcG9uZW50KSBtb2RMaXN0LmdldChpKTsKLQkJCUlQcm9qZWN0IHRhcmdldFByb2plY3QgPSBJVmlydHVhbENvbXBvbmVudC5nZXRQcm9qZWN0KCk7CisJCQlJVmlydHVhbENvbXBvbmVudCB2aXJ0dWFsQ29tcG9uZW50ID0gKElWaXJ0dWFsQ29tcG9uZW50KSBtb2RMaXN0LmdldChpKTsKKwkJCWlmKHZpcnR1YWxDb21wb25lbnQuaXNCaW5hcnkoKSl7CisJCQkJY29udGludWU7CisJCQl9CisJCQlJUHJvamVjdCB0YXJnZXRQcm9qZWN0ID0gdmlydHVhbENvbXBvbmVudC5nZXRQcm9qZWN0KCk7CiAJCQl0YXJnZXRwcm9qZWN0TGlzdC5hZGQodGFyZ2V0UHJvamVjdCk7CiAJCX0KIAkJdHJ5IHsKIAkJCVByb2plY3RVdGlsaXRpZXMuYWRkUmVmZXJlbmNlUHJvamVjdHMoc291cmNlQ29tcC5nZXRQcm9qZWN0KCksIHRhcmdldHByb2plY3RMaXN0KTsKIAkJfSBjYXRjaCAoQ29yZUV4Y2VwdGlvbiBlKSB7Ci0JCQllLnByaW50U3RhY2tUcmFjZSgpOworCQkJTW9kdWxlY29yZVBsdWdpbi5sb2dFcnJvcihlKTsKIAkJfQogCiAJfQpAQCAtMTA2LDYgKzExMCw4IEBACiAJCWlmIChkZXBsb3lQYXRoU3RyICE9IG51bGwgJiYgZGVwbG95UGF0aFN0ci5sZW5ndGgoKSA+IDApewogCQkJZGVwbG95UGF0aCA9IG5ldyBQYXRoKGRlcGxveVBhdGhTdHIpOwogCQl9CisJCWVsc2UgaWYgKGRlcGxveVBhdGhTdHIubGVuZ3RoKCkgPT0gMCkgZGVwbG95UGF0aCA9IG5ldyBQYXRoKCIvIik7IC8vJE5PTi1OTFMtMSQpOworCQogCQlmb3IgKGludCBpID0gMDsgaSA8IG1vZExpc3Quc2l6ZSgpOyBpKyspIHsKIAkJCUlWaXJ0dWFsQ29tcG9uZW50IGNvbXAgPSAoSVZpcnR1YWxDb21wb25lbnQpIG1vZExpc3QuZ2V0KGkpOwogCQkJaWYgKCFzcmNDb21wb25lbnRDb250YWluc1JlZmVyZW5jZShzb3VyY2VDb21wLCBjb21wLCBkZXBsb3lQYXRoKSkgewpkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUvbW9kdWxlY29yZS1zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9jb21wb25lbnRjb3JlL2ludGVybmFsL29wZXJhdGlvbi9GYWNldERhdGFNb2RlbE9wZXJhdGlvbi5qYXZhIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUvbW9kdWxlY29yZS1zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9jb21wb25lbnRjb3JlL2ludGVybmFsL29wZXJhdGlvbi9GYWNldERhdGFNb2RlbE9wZXJhdGlvbi5qYXZhCmluZGV4IDE1NThiMTEuLjcxZDRkYzEgMTAwNjQ0Ci0tLSBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlL21vZHVsZWNvcmUtc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vY29tcG9uZW50Y29yZS9pbnRlcm5hbC9vcGVyYXRpb24vRmFjZXREYXRhTW9kZWxPcGVyYXRpb24uamF2YQorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS9tb2R1bGVjb3JlLXNyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2NvbXBvbmVudGNvcmUvaW50ZXJuYWwvb3BlcmF0aW9uL0ZhY2V0RGF0YU1vZGVsT3BlcmF0aW9uLmphdmEKQEAgLTEwLDIyICsxMCwyOSBAQAogICoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKiovCiBwYWNrYWdlIG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS5pbnRlcm5hbC5vcGVyYXRpb247CiAKK2ltcG9ydCBqYXZhLnV0aWwuQ29sbGVjdGlvbnM7CiBpbXBvcnQgamF2YS51dGlsLkhhc2hTZXQ7CiBpbXBvcnQgamF2YS51dGlsLlNldDsKIAogaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUuY29tbWFuZHMuRXhlY3V0aW9uRXhjZXB0aW9uOworaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucmVzb3VyY2VzLklQcm9qZWN0OwogaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucnVudGltZS5Db3JlRXhjZXB0aW9uOwogaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucnVudGltZS5JQWRhcHRhYmxlOworaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucnVudGltZS5JUGF0aDsKIGltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJ1bnRpbWUuSVByb2dyZXNzTW9uaXRvcjsKIGltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJ1bnRpbWUuSVN0YXR1czsKK2ltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJ1bnRpbWUuUGF0aDsKK2ltcG9ydCBvcmcuZWNsaXBzZS5qZW0udXRpbC5lbWYud29ya2JlbmNoLlByb2plY3RVdGlsaXRpZXM7CiBpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb21wb25lbnRjb3JlLmRhdGFtb2RlbC5wcm9wZXJ0aWVzLklGYWNldERhdGFNb2RlbFByb3BlcnRpZXM7CiBpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb21wb25lbnRjb3JlLmRhdGFtb2RlbC5wcm9wZXJ0aWVzLklGYWNldFByb2plY3RDcmVhdGlvbkRhdGFNb2RlbFByb3BlcnRpZXM7CiBpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzLmRhdGFtb2RlbC5BYnN0cmFjdERhdGFNb2RlbE9wZXJhdGlvbjsKIGltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3MuZGF0YW1vZGVsLklEYXRhTW9kZWw7CitpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzLmludGVybmFsLm9wZXJhdGlvbnMuSVByb2plY3RDcmVhdGlvblByb3BlcnRpZXNOZXc7CiBpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5wcm9qZWN0LmZhY2V0LmNvcmUuSUZhY2V0ZWRQcm9qZWN0OwogaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24ucHJvamVjdC5mYWNldC5jb3JlLklQcm9qZWN0RmFjZXRWZXJzaW9uOwogaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24ucHJvamVjdC5mYWNldC5jb3JlLlByb2plY3RGYWNldHNNYW5hZ2VyOwogaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24ucHJvamVjdC5mYWNldC5jb3JlLklGYWNldGVkUHJvamVjdC5BY3Rpb24uVHlwZTsKK2ltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLnByb2plY3QuZmFjZXQuY29yZS5ydW50aW1lLklSdW50aW1lOwogCiBwdWJsaWMgY2xhc3MgRmFjZXREYXRhTW9kZWxPcGVyYXRpb24gZXh0ZW5kcyBBYnN0cmFjdERhdGFNb2RlbE9wZXJhdGlvbiB7CiAKQEAgLTM2LDcgKzQzLDcgQEAKIAlwdWJsaWMgSVN0YXR1cyBleGVjdXRlKElQcm9ncmVzc01vbml0b3IgbW9uaXRvciwgSUFkYXB0YWJsZSBpbmZvKSB0aHJvd3MgRXhlY3V0aW9uRXhjZXB0aW9uIHsKIAkJSUZhY2V0ZWRQcm9qZWN0IGZhY2V0UHJvajsKIAkJdHJ5IHsKLQkJCWZhY2V0UHJvaiA9IFByb2plY3RGYWNldHNNYW5hZ2VyLmNyZWF0ZShtb2RlbC5nZXRTdHJpbmdQcm9wZXJ0eShJRmFjZXRQcm9qZWN0Q3JlYXRpb25EYXRhTW9kZWxQcm9wZXJ0aWVzLkZBQ0VUX1BST0pFQ1RfTkFNRSksIG51bGwsIG1vbml0b3IpOworCQkJZmFjZXRQcm9qID0gY3JlYXRlUHJvamVjdChtb25pdG9yKTsKIAkJCVNldCBhY3Rpb25zID0gbmV3IEhhc2hTZXQoKTsKIAkJCWFjdGlvbnMuYWRkKG5ldyBJRmFjZXRlZFByb2plY3QuQWN0aW9uKChUeXBlKSBtb2RlbC5nZXRQcm9wZXJ0eShJRmFjZXREYXRhTW9kZWxQcm9wZXJ0aWVzLkZBQ0VUX1RZUEUpLCAoSVByb2plY3RGYWNldFZlcnNpb24pIG1vZGVsLmdldFByb3BlcnR5KElGYWNldERhdGFNb2RlbFByb3BlcnRpZXMuRkFDRVRfVkVSU0lPTiksIG1vZGVsKSk7CiAJCQlmYWNldFByb2oubW9kaWZ5KGFjdGlvbnMsIG1vbml0b3IpOwpAQCAtNDYsNCArNTMsMjkgQEAKIAkJcmV0dXJuIE9LX1NUQVRVUzsKIAl9CiAKKwlwdWJsaWMgSUZhY2V0ZWRQcm9qZWN0IGNyZWF0ZVByb2plY3QoSVByb2dyZXNzTW9uaXRvciBtb25pdG9yKSB0aHJvd3MgQ29yZUV4Y2VwdGlvbiB7CisJCUlQcm9qZWN0IHByb2plY3QgPSBQcm9qZWN0VXRpbGl0aWVzLmdldFByb2plY3QoKFN0cmluZykgbW9kZWwuZ2V0UHJvcGVydHkoSUZhY2V0UHJvamVjdENyZWF0aW9uRGF0YU1vZGVsUHJvcGVydGllcy5GQUNFVF9QUk9KRUNUX05BTUUpKTsKKwkJSUZhY2V0ZWRQcm9qZWN0IGZhY2V0UHJvaiA9IG51bGw7CisKKwkJaWYgKHByb2plY3QuZXhpc3RzKCkpIHsKKwkJCWZhY2V0UHJvaiA9IFByb2plY3RGYWNldHNNYW5hZ2VyLmNyZWF0ZShwcm9qZWN0LCB0cnVlLCBtb25pdG9yKTsKKwkJfSBlbHNlIHsKKwkJCVN0cmluZyBsb2NhdGlvbiA9IG51bGw7CisJCQlpZiAobW9kZWwuaXNQcm9wZXJ0eShJUHJvamVjdENyZWF0aW9uUHJvcGVydGllc05ldy5QUk9KRUNUX0xPQ0FUSU9OKSkKKwkJCXsKKwkJCQlsb2NhdGlvbiA9IChTdHJpbmcpIG1vZGVsLmdldFByb3BlcnR5KElQcm9qZWN0Q3JlYXRpb25Qcm9wZXJ0aWVzTmV3LlBST0pFQ1RfTE9DQVRJT04pOworCQkJfQorCQkJSVBhdGggbG9jYXRpb25QYXRoID0gbnVsbCA9PSBsb2NhdGlvbiA/IG51bGwgOiBuZXcgUGF0aChsb2NhdGlvbik7CisJCQlmYWNldFByb2ogPSBQcm9qZWN0RmFjZXRzTWFuYWdlci5jcmVhdGUobW9kZWwuZ2V0U3RyaW5nUHJvcGVydHkoSUZhY2V0UHJvamVjdENyZWF0aW9uRGF0YU1vZGVsUHJvcGVydGllcy5GQUNFVF9QUk9KRUNUX05BTUUpLCBsb2NhdGlvblBhdGgsIG1vbml0b3IpOworCQl9CisJCWlmIChtb2RlbC5pc1Byb3BlcnR5KElGYWNldFByb2plY3RDcmVhdGlvbkRhdGFNb2RlbFByb3BlcnRpZXMuRkFDRVRfUlVOVElNRSkpCisJCXsKKwkJCUlSdW50aW1lIHJ1bnRpbWUgPSAoSVJ1bnRpbWUpIG1vZGVsLmdldFByb3BlcnR5KElGYWNldFByb2plY3RDcmVhdGlvbkRhdGFNb2RlbFByb3BlcnRpZXMuRkFDRVRfUlVOVElNRSk7CisJCQlJUnVudGltZSBleGlzdGluZ1J1bnRpbWUgPSBmYWNldFByb2ouZ2V0UHJpbWFyeVJ1bnRpbWUoKTsKKwkJCWlmIChydW50aW1lICE9IG51bGwgJiYgKGV4aXN0aW5nUnVudGltZSA9PSBudWxsIHx8ICFydW50aW1lLmVxdWFscyhleGlzdGluZ1J1bnRpbWUpKSkgeworCQkJCWZhY2V0UHJvai5zZXRUYXJnZXRlZFJ1bnRpbWVzKENvbGxlY3Rpb25zLnNpbmdsZXRvbihydW50aW1lKSwgbnVsbCk7CisJCQl9CisJCX0KKwkJcmV0dXJuIGZhY2V0UHJvajsKKwl9CiB9CmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS9tb2R1bGVjb3JlLXNyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2NvbXBvbmVudGNvcmUvaW50ZXJuYWwvb3BlcmF0aW9uL0ZhY2V0UHJvamVjdENyZWF0aW9uT3BlcmF0aW9uLmphdmEgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS9tb2R1bGVjb3JlLXNyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2NvbXBvbmVudGNvcmUvaW50ZXJuYWwvb3BlcmF0aW9uL0ZhY2V0UHJvamVjdENyZWF0aW9uT3BlcmF0aW9uLmphdmEKaW5kZXggYWJkY2QxNC4uYzg1YWQwNiAxMDA2NDQKLS0tIGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUvbW9kdWxlY29yZS1zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9jb21wb25lbnRjb3JlL2ludGVybmFsL29wZXJhdGlvbi9GYWNldFByb2plY3RDcmVhdGlvbk9wZXJhdGlvbi5qYXZhCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlL21vZHVsZWNvcmUtc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vY29tcG9uZW50Y29yZS9pbnRlcm5hbC9vcGVyYXRpb24vRmFjZXRQcm9qZWN0Q3JlYXRpb25PcGVyYXRpb24uamF2YQpAQCAtMjUsOSArMjUsOSBAQAogaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucnVudGltZS5JU3RhdHVzOwogaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucnVudGltZS5QYXRoOwogaW1wb3J0IG9yZy5lY2xpcHNlLmplbS51dGlsLmVtZi53b3JrYmVuY2guUHJvamVjdFV0aWxpdGllczsKLWltcG9ydCBvcmcuZWNsaXBzZS5qZW0udXRpbC5sb2dnZXIucHJveHkuTG9nZ2VyOwogaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS5kYXRhbW9kZWwucHJvcGVydGllcy5JRmFjZXREYXRhTW9kZWxQcm9wZXJ0aWVzOwogaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS5kYXRhbW9kZWwucHJvcGVydGllcy5JRmFjZXRQcm9qZWN0Q3JlYXRpb25EYXRhTW9kZWxQcm9wZXJ0aWVzOworaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS5pbnRlcm5hbC5Nb2R1bGVjb3JlUGx1Z2luOwogaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy5kYXRhbW9kZWwuQWJzdHJhY3REYXRhTW9kZWxPcGVyYXRpb247CiBpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzLmRhdGFtb2RlbC5JRGF0YU1vZGVsOwogaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy5pbnRlcm5hbC5vcGVyYXRpb25zLklQcm9qZWN0Q3JlYXRpb25Qcm9wZXJ0aWVzTmV3OwpAQCAtMTA2LDEwICsxMDYsMTAgQEAKIAkJCX0KIAogCQl9IGNhdGNoIChDb3JlRXhjZXB0aW9uIGUpIHsKLQkJCUxvZ2dlci5nZXRMb2dnZXIoKS5sb2dFcnJvcihlKTsKKwkJCU1vZHVsZWNvcmVQbHVnaW4ubG9nRXJyb3IoZSk7CiAJCQl0aHJvdyBuZXcgRXhlY3V0aW9uRXhjZXB0aW9uKGUuZ2V0TWVzc2FnZSgpLCBlKTsKIAkJfSBjYXRjaCAoRXhjZXB0aW9uIGUpIHsKLQkJCUxvZ2dlci5nZXRMb2dnZXIoKS5sb2dFcnJvcihlKTsKKwkJCU1vZHVsZWNvcmVQbHVnaW4ubG9nRXJyb3IoZSk7CiAJCX0KIAkJcmV0dXJuIE9LX1NUQVRVUzsKIAl9CkBAIC0xMjcsNyArMTI3LDcgQEAKIAkJCWlmICghYWN0aW9ucy5pc0VtcHR5KCkpCiAJCQkJZmFjZXRQcm9qLm1vZGlmeShhY3Rpb25zLCBudWxsKTsKIAkJfSBjYXRjaCAoQ29yZUV4Y2VwdGlvbiBlKSB7Ci0JCQlMb2dnZXIuZ2V0TG9nZ2VyKCkubG9nRXJyb3IoZSk7CisJCQlNb2R1bGVjb3JlUGx1Z2luLmxvZ0Vycm9yKGUpOwogCQl9CiAJfQogCkBAIC0xNTMsOSArMTUzLDE2IEBACiAJcHVibGljIHN0YXRpYyB2b2lkIGFkZERlZmF1bHRGYWN0ZXRzKElGYWNldGVkUHJvamVjdCBmYWNldFByb2osIElSdW50aW1lIHJ1bnRpbWUpIHRocm93cyBFeGVjdXRpb25FeGNlcHRpb24gewogCQkKIAkJCWlmIChydW50aW1lICE9IG51bGwpIHsKLQkJCQlmaW5hbCBJRmFjZXRlZFByb2plY3RXb3JraW5nQ29weSBmcGp3YyA9IGZhY2V0UHJvai5jcmVhdGVXb3JraW5nQ29weSgpOwotCQkJCVNldDxJUHJvamVjdEZhY2V0VmVyc2lvbj4gcHJlc2V0RmFjZXRzID0gZnBqd2MuZ2V0RGVmYXVsdENvbmZpZ3VyYXRpb24oKS5nZXRQcm9qZWN0RmFjZXRzKCk7Ci0JCQkJYWRkRGVmYXVsdEZhY2V0cyhmYWNldFByb2osIHByZXNldEZhY2V0cyk7CisJCQkJSUZhY2V0ZWRQcm9qZWN0V29ya2luZ0NvcHkgZnBqd2MgPSBudWxsOworCQkJCXRyeXsKKwkJCQkJZnBqd2MgPSBmYWNldFByb2ouY3JlYXRlV29ya2luZ0NvcHkoKTsKKwkJCQkJU2V0PElQcm9qZWN0RmFjZXRWZXJzaW9uPiBwcmVzZXRGYWNldHMgPSBmcGp3Yy5nZXREZWZhdWx0Q29uZmlndXJhdGlvbigpLmdldFByb2plY3RGYWNldHMoKTsKKwkJCQkJYWRkRGVmYXVsdEZhY2V0cyhmYWNldFByb2osIHByZXNldEZhY2V0cyk7CisJCQkJfSBmaW5hbGx5eworCQkJCQlpZihmcGp3YyAhPSBudWxsKXsKKwkJCQkJCWZwandjLmRpc3Bvc2UoKTsKKwkJCQkJfQorCQkJCX0KIAkJCX0KIAkJCiAJfQpkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUvbW9kdWxlY29yZS1zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9jb21wb25lbnRjb3JlL2ludGVybmFsL29wZXJhdGlvbi9Qcm9qZWN0TWlncmF0b3JEYXRhTW9kZWxPcGVyYXRpb24uamF2YSBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlL21vZHVsZWNvcmUtc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vY29tcG9uZW50Y29yZS9pbnRlcm5hbC9vcGVyYXRpb24vUHJvamVjdE1pZ3JhdG9yRGF0YU1vZGVsT3BlcmF0aW9uLmphdmEKaW5kZXggZDUwNzM4OS4uOTU4NzQwNiAxMDA2NDQKLS0tIGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUvbW9kdWxlY29yZS1zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9jb21wb25lbnRjb3JlL2ludGVybmFsL29wZXJhdGlvbi9Qcm9qZWN0TWlncmF0b3JEYXRhTW9kZWxPcGVyYXRpb24uamF2YQorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS9tb2R1bGVjb3JlLXNyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2NvbXBvbmVudGNvcmUvaW50ZXJuYWwvb3BlcmF0aW9uL1Byb2plY3RNaWdyYXRvckRhdGFNb2RlbE9wZXJhdGlvbi5qYXZhCkBAIC0yMiw2ICsyMiwxMiBAQAogaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy5kYXRhbW9kZWwuQWJzdHJhY3REYXRhTW9kZWxPcGVyYXRpb247CiBpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzLmRhdGFtb2RlbC5JRGF0YU1vZGVsOwogCisvKioKKyAqIFRoaXMgaGFzIGJlZW4gZGVwcmVjYXRlZCBzaW5jZSBXVFAgMy4xLjIgYW5kIHdpbGwgYmUgZGVsZXRlZCBwb3N0IFdUUCAzLjIuCisgKiBTZWUgaHR0cHM6Ly9idWdzLmVjbGlwc2Uub3JnL2J1Z3Mvc2hvd19idWcuY2dpP2lkPTI5MjkzNAorICogQGRlcHJlY2F0ZWQgCisgKiBAYXV0aG9yIGpzaG9sbAorICovCiBwdWJsaWMgY2xhc3MgUHJvamVjdE1pZ3JhdG9yRGF0YU1vZGVsT3BlcmF0aW9uIGV4dGVuZHMgQWJzdHJhY3REYXRhTW9kZWxPcGVyYXRpb24gewogCiAJcHVibGljIFByb2plY3RNaWdyYXRvckRhdGFNb2RlbE9wZXJhdGlvbihJRGF0YU1vZGVsIG1vZGVsKSB7CmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS9tb2R1bGVjb3JlLXNyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2NvbXBvbmVudGNvcmUvaW50ZXJuYWwvb3BlcmF0aW9uL1JlbW92ZVJlZmVyZW5jZUNvbXBvbmVudE9wZXJhdGlvbi5qYXZhIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUvbW9kdWxlY29yZS1zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9jb21wb25lbnRjb3JlL2ludGVybmFsL29wZXJhdGlvbi9SZW1vdmVSZWZlcmVuY2VDb21wb25lbnRPcGVyYXRpb24uamF2YQppbmRleCBiYjFmMmMzLi5kMGVkNTQ5IDEwMDY0NAotLS0gYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS9tb2R1bGVjb3JlLXNyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2NvbXBvbmVudGNvcmUvaW50ZXJuYWwvb3BlcmF0aW9uL1JlbW92ZVJlZmVyZW5jZUNvbXBvbmVudE9wZXJhdGlvbi5qYXZhCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlL21vZHVsZWNvcmUtc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vY29tcG9uZW50Y29yZS9pbnRlcm5hbC9vcGVyYXRpb24vUmVtb3ZlUmVmZXJlbmNlQ29tcG9uZW50T3BlcmF0aW9uLmphdmEKQEAgLTIyLDggKzIyLDggQEAKIGltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJ1bnRpbWUuSVN0YXR1czsKIGltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJ1bnRpbWUuUGF0aDsKIGltcG9ydCBvcmcuZWNsaXBzZS5qZW0udXRpbC5lbWYud29ya2JlbmNoLlByb2plY3RVdGlsaXRpZXM7Ci1pbXBvcnQgb3JnLmVjbGlwc2UuamVtLnV0aWwubG9nZ2VyLnByb3h5LkxvZ2dlcjsKIGltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUuZGF0YW1vZGVsLnByb3BlcnRpZXMuSUNyZWF0ZVJlZmVyZW5jZUNvbXBvbmVudHNEYXRhTW9kZWxQcm9wZXJ0aWVzOworaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS5pbnRlcm5hbC5Nb2R1bGVjb3JlUGx1Z2luOwogaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS5pbnRlcm5hbC5yZXNvdXJjZXMuVmlydHVhbENvbXBvbmVudDsKIGltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUucmVzb3VyY2VzLklWaXJ0dWFsQ29tcG9uZW50OwogaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS5yZXNvdXJjZXMuSVZpcnR1YWxSZWZlcmVuY2U7CkBAIC02MCwxMSArNjAsMTYgQEAKIAkJCWV4aXN0aW5nUmVmZXJlbmNlcy5hZGQoZXhpc3RpbmdSZWZlcmVuY2VzQXJyYXlbaV0pOwogCQl9CiAJCQotCQlTdHJpbmcgZGVwbG95UGF0aCA9IG1vZGVsLmdldFN0cmluZ1Byb3BlcnR5KCBJQ3JlYXRlUmVmZXJlbmNlQ29tcG9uZW50c0RhdGFNb2RlbFByb3BlcnRpZXMuVEFSR0VUX0NPTVBPTkVOVFNfREVQTE9ZX1BBVEggKTsKLQkJSVBhdGggcGF0aCA9IG5ldyBQYXRoKCBkZXBsb3lQYXRoICk7CisJCUlQYXRoIHBhdGggPSBudWxsOworCQkvL2lmIHRoZSBkZXBsb3lQYXRoIGlzIG5vdCBleHBsaWNpdGx5IHNldCwgdGhlbiBsZWF2ZSBpdCBhcyBudWxsIHNvIHRoZSBmaXJzdCByZWZlcmVuY2UgaXMgcmVtb3ZlZC4KKwkJaWYobW9kZWwuaXNQcm9wZXJ0eVNldCggSUNyZWF0ZVJlZmVyZW5jZUNvbXBvbmVudHNEYXRhTW9kZWxQcm9wZXJ0aWVzLlRBUkdFVF9DT01QT05FTlRTX0RFUExPWV9QQVRIICkpeworCQkJU3RyaW5nIGRlcGxveVBhdGggPSBtb2RlbC5nZXRTdHJpbmdQcm9wZXJ0eSggSUNyZWF0ZVJlZmVyZW5jZUNvbXBvbmVudHNEYXRhTW9kZWxQcm9wZXJ0aWVzLlRBUkdFVF9DT01QT05FTlRTX0RFUExPWV9QQVRIICk7CisJCQlwYXRoID0gbmV3IFBhdGgoIGRlcGxveVBhdGggKTsKKwkJfQogCQkKIAkJTGlzdCBtb2RMaXN0ID0gKExpc3QpIG1vZGVsLmdldFByb3BlcnR5KElDcmVhdGVSZWZlcmVuY2VDb21wb25lbnRzRGF0YU1vZGVsUHJvcGVydGllcy5UQVJHRVRfQ09NUE9ORU5UX0xJU1QpOwogICAgIAorCQkKIAkJTGlzdCB0YXJnZXRwcm9qZWN0TGlzdCA9IG5ldyBBcnJheUxpc3QoKTsKIAogCQlmb3IgKGludCBpID0gMDsgaSA8IG1vZExpc3Quc2l6ZSgpICYmICFleGlzdGluZ1JlZmVyZW5jZXMuaXNFbXB0eSgpOyBpKyspIHsKQEAgLTkwLDcgKzk1LDcgQEAKIAkJdHJ5IHsKIAkJCVByb2plY3RVdGlsaXRpZXMucmVtb3ZlUmVmZXJlbmNlUHJvamVjdHMoc291cmNlQ29tcC5nZXRQcm9qZWN0KCksdGFyZ2V0cHJvamVjdExpc3QpOwogCQl9IGNhdGNoIChDb3JlRXhjZXB0aW9uIGUpIHsKLQkJCUxvZ2dlci5nZXRMb2dnZXIoKS5sb2dFcnJvcihlKTsKKwkJCU1vZHVsZWNvcmVQbHVnaW4ubG9nRXJyb3IoZSk7CiAJCX0JCQogCQkKIAl9CmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS9tb2R1bGVjb3JlLXNyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2NvbXBvbmVudGNvcmUvaW50ZXJuYWwvb3BlcmF0aW9uL1JlbW92ZVJlZmVyZW5jZURhdGFNb2RlbFByb3ZpZGVyLmphdmEgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS9tb2R1bGVjb3JlLXNyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2NvbXBvbmVudGNvcmUvaW50ZXJuYWwvb3BlcmF0aW9uL1JlbW92ZVJlZmVyZW5jZURhdGFNb2RlbFByb3ZpZGVyLmphdmEKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uNTgwODZjNAotLS0gL2Rldi9udWxsCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlL21vZHVsZWNvcmUtc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vY29tcG9uZW50Y29yZS9pbnRlcm5hbC9vcGVyYXRpb24vUmVtb3ZlUmVmZXJlbmNlRGF0YU1vZGVsUHJvdmlkZXIuamF2YQpAQCAtMCwwICsxLDMwIEBACisvKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKgorICogQ29weXJpZ2h0IChjKSAyMDA1IElCTSBDb3Jwb3JhdGlvbiBhbmQgb3RoZXJzLgorICogQWxsIHJpZ2h0cyByZXNlcnZlZC4gVGhpcyBwcm9ncmFtIGFuZCB0aGUgYWNjb21wYW55aW5nIG1hdGVyaWFscworICogYXJlIG1hZGUgYXZhaWxhYmxlIHVuZGVyIHRoZSB0ZXJtcyBvZiB0aGUgRWNsaXBzZSBQdWJsaWMgTGljZW5zZSB2MS4wCisgKiB3aGljaCBhY2NvbXBhbmllcyB0aGlzIGRpc3RyaWJ1dGlvbiwgYW5kIGlzIGF2YWlsYWJsZSBhdAorICogaHR0cDovL3d3dy5lY2xpcHNlLm9yZy9sZWdhbC9lcGwtdjEwLmh0bWwKKyAqCisgKiBDb250cmlidXRvcnM6CisgKiAgICAgSUJNIENvcnBvcmF0aW9uIC0gaW5pdGlhbCBBUEkgYW5kIGltcGxlbWVudGF0aW9uCisgKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKi8KK3BhY2thZ2Ugb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb21wb25lbnRjb3JlLmludGVybmFsLm9wZXJhdGlvbjsKKworaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy5kYXRhbW9kZWwuSURhdGFNb2RlbE9wZXJhdGlvbjsKKworLyoqCisgKiBUaGlzIGNsYXNzIGlzIG1lYW50IHRvICBiZSBhbiBhbHRlcm5hdGl2ZSB0byBSZW1vdmVSZWZlcmVuY2VDb21wb25lbnRzRGF0YU1vZGVsUHJvdmlkZXIKKyAqIGluIG9yZGVyIHRvIHJlbW92ZSBwcmUtbWFkZSBvciBwcmUtY3JhZnRlZCBJVmlydHVhbFJlZmVyZW5jZXMsIHJhdGhlciB0aGFuIAorICogc2VhcmNoaW5nIGZvciB0aGVpciBpbmRpdmlkdWFsIHByb3BlcnRpZXMKKyAqLworcHVibGljIGNsYXNzIFJlbW92ZVJlZmVyZW5jZURhdGFNb2RlbFByb3ZpZGVyIGV4dGVuZHMgQWRkUmVmZXJlbmNlRGF0YU1vZGVsUHJvdmlkZXIgeworCisJcHVibGljIFJlbW92ZVJlZmVyZW5jZURhdGFNb2RlbFByb3ZpZGVyKCkgeworCQlzdXBlcigpOworCX0KKworCXB1YmxpYyBJRGF0YU1vZGVsT3BlcmF0aW9uIGdldERlZmF1bHRPcGVyYXRpb24oKSB7CisJCXJldHVybiBuZXcgUmVtb3ZlUmVmZXJlbmNlT3BlcmF0aW9uKG1vZGVsKTsKKwl9CisKK30KZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlL21vZHVsZWNvcmUtc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vY29tcG9uZW50Y29yZS9pbnRlcm5hbC9vcGVyYXRpb24vUmVtb3ZlUmVmZXJlbmNlT3BlcmF0aW9uLmphdmEgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS9tb2R1bGVjb3JlLXNyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2NvbXBvbmVudGNvcmUvaW50ZXJuYWwvb3BlcmF0aW9uL1JlbW92ZVJlZmVyZW5jZU9wZXJhdGlvbi5qYXZhCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLmZjYzNiMWEKLS0tIC9kZXYvbnVsbAorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS9tb2R1bGVjb3JlLXNyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2NvbXBvbmVudGNvcmUvaW50ZXJuYWwvb3BlcmF0aW9uL1JlbW92ZVJlZmVyZW5jZU9wZXJhdGlvbi5qYXZhCkBAIC0wLDAgKzEsMTI1IEBACisvKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKgorICogQ29weXJpZ2h0IChjKSAyMDA1LCAyMDA2IElCTSBDb3Jwb3JhdGlvbiBhbmQgb3RoZXJzLgorICogQWxsIHJpZ2h0cyByZXNlcnZlZC4gVGhpcyBwcm9ncmFtIGFuZCB0aGUgYWNjb21wYW55aW5nIG1hdGVyaWFscworICogYXJlIG1hZGUgYXZhaWxhYmxlIHVuZGVyIHRoZSB0ZXJtcyBvZiB0aGUgRWNsaXBzZSBQdWJsaWMgTGljZW5zZSB2MS4wCisgKiB3aGljaCBhY2NvbXBhbmllcyB0aGlzIGRpc3RyaWJ1dGlvbiwgYW5kIGlzIGF2YWlsYWJsZSBhdAorICogaHR0cDovL3d3dy5lY2xpcHNlLm9yZy9sZWdhbC9lcGwtdjEwLmh0bWwKKyAqCisgKiBDb250cmlidXRvcnM6CisgKiAgICAgSUJNIENvcnBvcmF0aW9uIC0gaW5pdGlhbCBBUEkgYW5kIGltcGxlbWVudGF0aW9uCisgKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKi8KK3BhY2thZ2Ugb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb21wb25lbnRjb3JlLmludGVybmFsLm9wZXJhdGlvbjsKKworaW1wb3J0IGphdmEudXRpbC5BcnJheUxpc3Q7CitpbXBvcnQgamF2YS51dGlsLkFycmF5czsKK2ltcG9ydCBqYXZhLnV0aWwuTGlzdDsKKworaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUuY29tbWFuZHMuRXhlY3V0aW9uRXhjZXB0aW9uOworaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucmVzb3VyY2VzLklQcm9qZWN0OworaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucnVudGltZS5Db3JlRXhjZXB0aW9uOworaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucnVudGltZS5JQWRhcHRhYmxlOworaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucnVudGltZS5JUGF0aDsKK2ltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJ1bnRpbWUuSVByb2dyZXNzTW9uaXRvcjsKK2ltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJ1bnRpbWUuSVN0YXR1czsKK2ltcG9ydCBvcmcuZWNsaXBzZS5qZW0udXRpbC5lbWYud29ya2JlbmNoLlByb2plY3RVdGlsaXRpZXM7CitpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb21wb25lbnRjb3JlLmRhdGFtb2RlbC5wcm9wZXJ0aWVzLklBZGRSZWZlcmVuY2VEYXRhTW9kZWxQcm9wZXJ0aWVzOworaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS5pbnRlcm5hbC5Nb2R1bGVjb3JlUGx1Z2luOworaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS5pbnRlcm5hbC5yZXNvdXJjZXMuVmlydHVhbENvbXBvbmVudDsKK2ltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUucmVzb3VyY2VzLklWaXJ0dWFsQ29tcG9uZW50OworaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS5yZXNvdXJjZXMuSVZpcnR1YWxSZWZlcmVuY2U7CitpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzLmRhdGFtb2RlbC5BYnN0cmFjdERhdGFNb2RlbE9wZXJhdGlvbjsKK2ltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3MuZGF0YW1vZGVsLklEYXRhTW9kZWw7CisKKy8qKgorICogVGhpcyBjbGFzcyBpcyBtZWFudCB0byBiZSBhbiBhbHRlcm5hdGl2ZSB0byBSZW1vdmVSZWZlcmVuY2VDb21wb25lbnRPcGVyYXRpb24KKyAqIGluIG9yZGVyIHRvIHJlbW92ZSBwcmUtbWFkZSBvciBwcmUtY3JhZnRlZCBJVmlydHVhbFJlZmVyZW5jZXMsIHJhdGhlciB0aGFuIAorICogc2VhcmNoaW5nIGZvciB0aGVpciBpbmRpdmlkdWFsIHByb3BlcnRpZXMKKyAqLworcHVibGljIGNsYXNzIFJlbW92ZVJlZmVyZW5jZU9wZXJhdGlvbiBleHRlbmRzIEFic3RyYWN0RGF0YU1vZGVsT3BlcmF0aW9uIHsKKworCXB1YmxpYyBSZW1vdmVSZWZlcmVuY2VPcGVyYXRpb24oKSB7CisJCXN1cGVyKCk7CisJfQorCisJcHVibGljIFJlbW92ZVJlZmVyZW5jZU9wZXJhdGlvbihJRGF0YU1vZGVsIG1vZGVsKSB7CisJCXN1cGVyKG1vZGVsKTsKKwl9CisKKwlwdWJsaWMgSVN0YXR1cyBleGVjdXRlKElQcm9ncmVzc01vbml0b3IgbW9uaXRvciwgSUFkYXB0YWJsZSBpbmZvKSB0aHJvd3MgRXhlY3V0aW9uRXhjZXB0aW9uIHsKKwkJcmVtb3ZlUmVmZXJlbmNlcyhtb25pdG9yKTsKKwkJcmV0dXJuIE9LX1NUQVRVUzsKKwl9CisKKwlwcm90ZWN0ZWQgTGlzdDxJVmlydHVhbFJlZmVyZW5jZT4gZ2V0TGlzdEZyb21Nb2RlbChJRGF0YU1vZGVsIG1vZGVsKSB7CisJCU9iamVjdCB2YWx1ZSA9IG1vZGVsLmdldFByb3BlcnR5KElBZGRSZWZlcmVuY2VEYXRhTW9kZWxQcm9wZXJ0aWVzLlRBUkdFVF9SRUZFUkVOQ0VfTElTVCk7CisJCUxpc3Q8SVZpcnR1YWxSZWZlcmVuY2U+IG1vZExpc3QgPSB2YWx1ZSBpbnN0YW5jZW9mIExpc3QgPyAgKExpc3Q8SVZpcnR1YWxSZWZlcmVuY2U+KXZhbHVlIDogQXJyYXlzLmFzTGlzdChuZXcgSVZpcnR1YWxSZWZlcmVuY2VbXXsoSVZpcnR1YWxSZWZlcmVuY2UpdmFsdWV9KTsKKwkJcmV0dXJuIG1vZExpc3Q7CisJfQorCisJcHJvdGVjdGVkIHZvaWQgcmVtb3ZlUmVmZXJlbmNlcyhJUHJvZ3Jlc3NNb25pdG9yIG1vbml0b3IpIHsKKwkJCisJCUlWaXJ0dWFsQ29tcG9uZW50IHNvdXJjZUNvbXAgPSAoSVZpcnR1YWxDb21wb25lbnQpIG1vZGVsLmdldFByb3BlcnR5KElBZGRSZWZlcmVuY2VEYXRhTW9kZWxQcm9wZXJ0aWVzLlNPVVJDRV9DT01QT05FTlQpOworCQlpZiAoc291cmNlQ29tcCA9PSBudWxsIHx8ICFzb3VyY2VDb21wLmdldFByb2plY3QoKS5pc0FjY2Vzc2libGUoKSB8fCBzb3VyY2VDb21wLmlzQmluYXJ5KCkpIHJldHVybjsKKwkJCisJCUlWaXJ0dWFsUmVmZXJlbmNlIFtdIGV4aXN0aW5nUmVmZXJlbmNlc0FycmF5ID0gc291cmNlQ29tcC5nZXRSZWZlcmVuY2VzKCk7CisJCWlmKGV4aXN0aW5nUmVmZXJlbmNlc0FycmF5ID09IG51bGwgfHwgZXhpc3RpbmdSZWZlcmVuY2VzQXJyYXkubGVuZ3RoID09IDApeworCQkJcmV0dXJuOworCQl9CisJCQorCQlMaXN0PElWaXJ0dWFsUmVmZXJlbmNlPiBleGlzdGluZ1JlZmVyZW5jZXMgPSBuZXcgQXJyYXlMaXN0PElWaXJ0dWFsUmVmZXJlbmNlPigpOworCQlleGlzdGluZ1JlZmVyZW5jZXMuYWRkQWxsKEFycmF5cy5hc0xpc3QoZXhpc3RpbmdSZWZlcmVuY2VzQXJyYXkpKTsKKwkJTGlzdDxJVmlydHVhbFJlZmVyZW5jZT4gbW9kTGlzdCA9IGdldExpc3RGcm9tTW9kZWwobW9kZWwpOworCQlMaXN0IHRhcmdldHByb2plY3RMaXN0ID0gbmV3IEFycmF5TGlzdCgpOworCQlmb3IgKGludCBpID0gMDsgaSA8IG1vZExpc3Quc2l6ZSgpICYmICFleGlzdGluZ1JlZmVyZW5jZXMuaXNFbXB0eSgpOyBpKyspIHsKKwkJCUlWaXJ0dWFsUmVmZXJlbmNlIHJlZiA9IG1vZExpc3QuZ2V0KGkpOworCQkJaWYgKHJlZi5nZXRSZWZlcmVuY2VkQ29tcG9uZW50KCk9PW51bGwgKQorCQkJCWNvbnRpbnVlOworCisJCQlJVmlydHVhbFJlZmVyZW5jZSBleGlzdGluZyA9IGZpbmRNYXRjaGluZ1JlZmVyZW5jZShleGlzdGluZ1JlZmVyZW5jZXMsIAorCQkJCQlyZWYuZ2V0UmVmZXJlbmNlZENvbXBvbmVudCgpLCByZWYuZ2V0UnVudGltZVBhdGgoKSk7CisJCQkvL2lmIGEgcmVmIHdhcyBmb3VuZCBtYXRjaGluZyB0aGUgc3BlY2lmaWVkIGRlcGxveVBhdGgsIHRoZW4gcmVtb3ZlIGl0CisJCQlpZihleGlzdGluZyAhPSBudWxsKXsKKwkJCQlyZW1vdmVSZWZlcmVuZWNlSW5Db21wb25lbnQoc291cmNlQ29tcCwgZXhpc3RpbmcpOworCQkJCWV4aXN0aW5nUmVmZXJlbmNlcy5yZW1vdmUoZXhpc3RpbmcpOworCQkJCS8vYWZ0ZXIgcmVtb3ZpbmcgdGhlIHJlZiwgY2hlY2sgdG8gc2VlIGlmIGl0IHdhcyB0aGUgbGFzdCByZWYgcmVtb3ZlZCB0byB0aGF0IGNvbXBvbmVudAorCQkJCS8vYW5kIGlmIGl0IHdhcywgdGhlbiBhbHNvIHJlbW92ZSB0aGUgcHJvamVjdCByZWZlcmVuY2UKKwkJCQlleGlzdGluZyA9IGZpbmRNYXRjaGluZ1JlZmVyZW5jZShleGlzdGluZ1JlZmVyZW5jZXMsIHJlZi5nZXRSZWZlcmVuY2VkQ29tcG9uZW50KCkpOworCQkJCWlmKGV4aXN0aW5nID09IG51bGwpeworCQkJCQlJUHJvamVjdCB0YXJnZXRQcm9qZWN0ID0gcmVmLmdldFJlZmVyZW5jZWRDb21wb25lbnQoKS5nZXRQcm9qZWN0KCk7CisJCQkJCXRhcmdldHByb2plY3RMaXN0LmFkZCh0YXJnZXRQcm9qZWN0KTsKKwkJCQl9CisJCQl9CisJCX0KKwkJCisJCXRyeSB7CisJCQlQcm9qZWN0VXRpbGl0aWVzLnJlbW92ZVJlZmVyZW5jZVByb2plY3RzKHNvdXJjZUNvbXAuZ2V0UHJvamVjdCgpLHRhcmdldHByb2plY3RMaXN0KTsKKwkJfSBjYXRjaCAoQ29yZUV4Y2VwdGlvbiBlKSB7CisJCQlNb2R1bGVjb3JlUGx1Z2luLmxvZ0Vycm9yKGUpOworCQl9CQkKKwkJCisJfQorCisJcHJpdmF0ZSBJVmlydHVhbFJlZmVyZW5jZSBmaW5kTWF0Y2hpbmdSZWZlcmVuY2UoTGlzdCBleGlzdGluZ1JlZmVyZW5jZXMsIElWaXJ0dWFsQ29tcG9uZW50IGNvbXAsIElQYXRoIHBhdGgpIHsKKwkJZm9yKGludCBpPTA7aTxleGlzdGluZ1JlZmVyZW5jZXMuc2l6ZSgpOyBpKyspeworCQkJSVZpcnR1YWxSZWZlcmVuY2UgcmVmID0gKElWaXJ0dWFsUmVmZXJlbmNlKWV4aXN0aW5nUmVmZXJlbmNlcy5nZXQoaSk7CisJCQlJVmlydHVhbENvbXBvbmVudCBjID0gcmVmLmdldFJlZmVyZW5jZWRDb21wb25lbnQoKTsKKwkJCWlmKGMgIT0gbnVsbCAmJiBjLmdldE5hbWUoKS5lcXVhbHMoY29tcC5nZXROYW1lKCkpKXsKKwkJCQlpZihwYXRoID09IG51bGwpeworCQkJCQlyZXR1cm4gcmVmOworCQkJCX0gZWxzZSBpZihwYXRoLmVxdWFscyhyZWYuZ2V0UnVudGltZVBhdGgoKSkpeworCQkJCQlyZXR1cm4gcmVmOworCQkJCX0KKwkJCX0KKwkJfQorCQlyZXR1cm4gbnVsbDsKKwl9CisKKwlwcml2YXRlIElWaXJ0dWFsUmVmZXJlbmNlIGZpbmRNYXRjaGluZ1JlZmVyZW5jZShMaXN0IGV4aXN0aW5nUmVmZXJlbmNlcywgSVZpcnR1YWxDb21wb25lbnQgY29tcCkgeworCQlyZXR1cm4gZmluZE1hdGNoaW5nUmVmZXJlbmNlKGV4aXN0aW5nUmVmZXJlbmNlcywgY29tcCwgbnVsbCk7CisJfQorCisJcHJvdGVjdGVkIHZvaWQgcmVtb3ZlUmVmZXJlbmVjZUluQ29tcG9uZW50KElWaXJ0dWFsQ29tcG9uZW50IGNvbXBvbmVudCwgSVZpcnR1YWxSZWZlcmVuY2UgcmVmZXJlbmNlKSB7CisJCSgoVmlydHVhbENvbXBvbmVudCljb21wb25lbnQuZ2V0Q29tcG9uZW50KCkpLnJlbW92ZVJlZmVyZW5jZShyZWZlcmVuY2UpOworCX0KKworfQpkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUvbW9kdWxlY29yZS1zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9jb21wb25lbnRjb3JlL2ludGVybmFsL29wZXJhdGlvbi9TZXJ2ZXJDb250ZXh0Um9vdERhdGFNb2RlbFByb3ZpZGVyLmphdmEgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS9tb2R1bGVjb3JlLXNyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2NvbXBvbmVudGNvcmUvaW50ZXJuYWwvb3BlcmF0aW9uL1NlcnZlckNvbnRleHRSb290RGF0YU1vZGVsUHJvdmlkZXIuamF2YQpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi4wMWRlZDQ5Ci0tLSAvZGV2L251bGwKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUvbW9kdWxlY29yZS1zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9jb21wb25lbnRjb3JlL2ludGVybmFsL29wZXJhdGlvbi9TZXJ2ZXJDb250ZXh0Um9vdERhdGFNb2RlbFByb3ZpZGVyLmphdmEKQEAgLTAsMCArMSwzOSBAQAorcGFja2FnZSBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUuaW50ZXJuYWwub3BlcmF0aW9uOworCisvKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKgorICogQ29weXJpZ2h0IChjKSAyMDA4IElCTSBDb3Jwb3JhdGlvbiBhbmQgb3RoZXJzLgorICogQWxsIHJpZ2h0cyByZXNlcnZlZC4gVGhpcyBwcm9ncmFtIGFuZCB0aGUgYWNjb21wYW55aW5nIG1hdGVyaWFscworICogYXJlIG1hZGUgYXZhaWxhYmxlIHVuZGVyIHRoZSB0ZXJtcyBvZiB0aGUgRWNsaXBzZSBQdWJsaWMgTGljZW5zZSB2MS4wCisgKiB3aGljaCBhY2NvbXBhbmllcyB0aGlzIGRpc3RyaWJ1dGlvbiwgYW5kIGlzIGF2YWlsYWJsZSBhdAorICogaHR0cDovL3d3dy5lY2xpcHNlLm9yZy9sZWdhbC9lcGwtdjEwLmh0bWwKKyAqIAorICogQ29udHJpYnV0b3JzOgorICogSUJNIENvcnBvcmF0aW9uIC0gaW5pdGlhbCBBUEkgYW5kIGltcGxlbWVudGF0aW9uCisgKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKi8KKworaW1wb3J0IGphdmEudXRpbC5TZXQ7CisKK2ltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUuZGF0YW1vZGVsLnByb3BlcnRpZXMuSVNlcnZlckNvbnRleHRSb290RGF0YU1vZGVsUHJvcGVydGllczsKK2ltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3MuZGF0YW1vZGVsLkFic3RyYWN0RGF0YU1vZGVsUHJvdmlkZXI7CitpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzLmRhdGFtb2RlbC5JRGF0YU1vZGVsT3BlcmF0aW9uOworCitwdWJsaWMgY2xhc3MgU2VydmVyQ29udGV4dFJvb3REYXRhTW9kZWxQcm92aWRlciAKKyBleHRlbmRzIEFic3RyYWN0RGF0YU1vZGVsUHJvdmlkZXIKKyBpbXBsZW1lbnRzIElTZXJ2ZXJDb250ZXh0Um9vdERhdGFNb2RlbFByb3BlcnRpZXN7CisKKwlwdWJsaWMgU2VydmVyQ29udGV4dFJvb3REYXRhTW9kZWxQcm92aWRlcigpeworCQlzdXBlcigpOworCX0KKworCXB1YmxpYyBTZXQgZ2V0UHJvcGVydHlOYW1lcygpIHsKKwkJU2V0IG5hbWVzID0gc3VwZXIuZ2V0UHJvcGVydHlOYW1lcygpOworCQluYW1lcy5hZGQoUFJPSkVDVCk7CisJCW5hbWVzLmFkZChDT05URVhUX1JPT1QpOworCQlyZXR1cm4gbmFtZXM7CisJfQorCQorCXB1YmxpYyBJRGF0YU1vZGVsT3BlcmF0aW9uIGdldERlZmF1bHRPcGVyYXRpb24oKSB7CisJCXJldHVybiBuZXcgU2VydmVyQ29udGV4dFJvb3RVcGRhdGVPcGVyYXRpb24obW9kZWwpOworCX0KKwkKK30KZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlL21vZHVsZWNvcmUtc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vY29tcG9uZW50Y29yZS9pbnRlcm5hbC9vcGVyYXRpb24vU2VydmVyQ29udGV4dFJvb3RVcGRhdGVPcGVyYXRpb24uamF2YSBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlL21vZHVsZWNvcmUtc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vY29tcG9uZW50Y29yZS9pbnRlcm5hbC9vcGVyYXRpb24vU2VydmVyQ29udGV4dFJvb3RVcGRhdGVPcGVyYXRpb24uamF2YQpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi45NjJiNzMxCi0tLSAvZGV2L251bGwKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUvbW9kdWxlY29yZS1zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9jb21wb25lbnRjb3JlL2ludGVybmFsL29wZXJhdGlvbi9TZXJ2ZXJDb250ZXh0Um9vdFVwZGF0ZU9wZXJhdGlvbi5qYXZhCkBAIC0wLDAgKzEsNDUgQEAKK3BhY2thZ2Ugb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb21wb25lbnRjb3JlLmludGVybmFsLm9wZXJhdGlvbjsKKworLyoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioKKyAqIENvcHlyaWdodCAoYykgMjAwOCBJQk0gQ29ycG9yYXRpb24gYW5kIG90aGVycy4KKyAqIEFsbCByaWdodHMgcmVzZXJ2ZWQuIFRoaXMgcHJvZ3JhbSBhbmQgdGhlIGFjY29tcGFueWluZyBtYXRlcmlhbHMKKyAqIGFyZSBtYWRlIGF2YWlsYWJsZSB1bmRlciB0aGUgdGVybXMgb2YgdGhlIEVjbGlwc2UgUHVibGljIExpY2Vuc2UgdjEuMAorICogd2hpY2ggYWNjb21wYW5pZXMgdGhpcyBkaXN0cmlidXRpb24sIGFuZCBpcyBhdmFpbGFibGUgYXQKKyAqIGh0dHA6Ly93d3cuZWNsaXBzZS5vcmcvbGVnYWwvZXBsLXYxMC5odG1sCisgKiAKKyAqIENvbnRyaWJ1dG9yczoKKyAqIElCTSBDb3Jwb3JhdGlvbiAtIGluaXRpYWwgQVBJIGFuZCBpbXBsZW1lbnRhdGlvbgorICoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKiovCisKK2ltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLmNvbW1hbmRzLkV4ZWN1dGlvbkV4Y2VwdGlvbjsKK2ltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJlc291cmNlcy5JUHJvamVjdDsKK2ltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJ1bnRpbWUuSUFkYXB0YWJsZTsKK2ltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJ1bnRpbWUuSVByb2dyZXNzTW9uaXRvcjsKK2ltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJ1bnRpbWUuSVN0YXR1czsKK2ltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUuQ29tcG9uZW50Q29yZTsKK2ltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUuZGF0YW1vZGVsLnByb3BlcnRpZXMuSVNlcnZlckNvbnRleHRSb290RGF0YU1vZGVsUHJvcGVydGllczsKK2ltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUuaW50ZXJuYWwudXRpbC5JTW9kdWxlQ29uc3RhbnRzOworaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS5yZXNvdXJjZXMuSVZpcnR1YWxDb21wb25lbnQ7CitpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzLmRhdGFtb2RlbC5BYnN0cmFjdERhdGFNb2RlbE9wZXJhdGlvbjsKK2ltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3MuZGF0YW1vZGVsLklEYXRhTW9kZWw7CisKK3B1YmxpYyBjbGFzcyBTZXJ2ZXJDb250ZXh0Um9vdFVwZGF0ZU9wZXJhdGlvbiAKKyBleHRlbmRzICBBYnN0cmFjdERhdGFNb2RlbE9wZXJhdGlvbiAKKyBpbXBsZW1lbnRzIElTZXJ2ZXJDb250ZXh0Um9vdERhdGFNb2RlbFByb3BlcnRpZXN7CisJCisKKwlwdWJsaWMgU2VydmVyQ29udGV4dFJvb3RVcGRhdGVPcGVyYXRpb24oSURhdGFNb2RlbCBtb2RlbCkgeworCQlzdXBlcihtb2RlbCk7CisJfQorCisJcHVibGljIElTdGF0dXMgZXhlY3V0ZShJUHJvZ3Jlc3NNb25pdG9yIG1vbml0b3IsIElBZGFwdGFibGUgaW5mbykgdGhyb3dzIEV4ZWN1dGlvbkV4Y2VwdGlvbiB7CisJCUlQcm9qZWN0IHByb2plY3QgPSAoSVByb2plY3QpbW9kZWwuZ2V0UHJvcGVydHkoIElTZXJ2ZXJDb250ZXh0Um9vdERhdGFNb2RlbFByb3BlcnRpZXMuUFJPSkVDVCApOworCQlTdHJpbmcgY29udGV4dFJvb3QgPSBtb2RlbC5nZXRTdHJpbmdQcm9wZXJ0eSggSVNlcnZlckNvbnRleHRSb290RGF0YU1vZGVsUHJvcGVydGllcy5DT05URVhUX1JPT1QgKTsKKwkJaWYgKGNvbnRleHRSb290ICE9IG51bGwpIHsKKwkJCUlWaXJ0dWFsQ29tcG9uZW50IGNvbXAgPSBDb21wb25lbnRDb3JlLmNyZWF0ZUNvbXBvbmVudChwcm9qZWN0KTsKKwkJCWNvbXAuc2V0TWV0YVByb3BlcnR5KElNb2R1bGVDb25zdGFudHMuQ09OVEVYVFJPT1QsIGNvbnRleHRSb290KTsJCisJCX0KKwkJcmV0dXJuIE9LX1NUQVRVUzsKKwl9CisKK30KZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlL21vZHVsZWNvcmUtc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vY29tcG9uZW50Y29yZS9pbnRlcm5hbC9yZXNvdXJjZXMvQWJzdHJhY3RSZXNvdXJjZUxpc3RWaXJ0dWFsQ29tcG9uZW50LmphdmEgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS9tb2R1bGVjb3JlLXNyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2NvbXBvbmVudGNvcmUvaW50ZXJuYWwvcmVzb3VyY2VzL0Fic3RyYWN0UmVzb3VyY2VMaXN0VmlydHVhbENvbXBvbmVudC5qYXZhCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLjgzODE4N2QKLS0tIC9kZXYvbnVsbAorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS9tb2R1bGVjb3JlLXNyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2NvbXBvbmVudGNvcmUvaW50ZXJuYWwvcmVzb3VyY2VzL0Fic3RyYWN0UmVzb3VyY2VMaXN0VmlydHVhbENvbXBvbmVudC5qYXZhCkBAIC0wLDAgKzEsMTYyIEBACisvKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKiAKKyAqIENvcHlyaWdodCAoYykgMjAwOSBSZWQgSGF0LCBJbmMuIAorICogRGlzdHJpYnV0ZWQgdW5kZXIgbGljZW5zZSBieSBSZWQgSGF0LCBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuIAorICogVGhpcyBwcm9ncmFtIGlzIG1hZGUgYXZhaWxhYmxlIHVuZGVyIHRoZSB0ZXJtcyBvZiB0aGUgCisgKiBFY2xpcHNlIFB1YmxpYyBMaWNlbnNlIHYxLjAgd2hpY2ggYWNjb21wYW5pZXMgdGhpcyBkaXN0cmlidXRpb24sIAorICogYW5kIGlzIGF2YWlsYWJsZSBhdCBodHRwOi8vd3d3LmVjbGlwc2Uub3JnL2xlZ2FsL2VwbC12MTAuaHRtbCAKKyAqIAorICogQ29udHJpYnV0b3JzOiAKKyAqIFJlZCBIYXQsIEluYy4gLSBpbml0aWFsIEFQSSBhbmQgaW1wbGVtZW50YXRpb24gCisgKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqLyAKK3BhY2thZ2Ugb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb21wb25lbnRjb3JlLmludGVybmFsLnJlc291cmNlczsKKworaW1wb3J0IGphdmEudXRpbC5NYXA7CitpbXBvcnQgamF2YS51dGlsLlByb3BlcnRpZXM7CisKK2ltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJlc291cmNlcy5JQ29udGFpbmVyOworaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucmVzb3VyY2VzLklQcm9qZWN0OworaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucmVzb3VyY2VzLklSZXNvdXJjZTsKK2ltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJ1bnRpbWUuQ29yZUV4Y2VwdGlvbjsKK2ltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJ1bnRpbWUuSVBhdGg7CitpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5ydW50aW1lLklQcm9ncmVzc01vbml0b3I7CitpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5ydW50aW1lLlBhdGg7CitpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb21wb25lbnRjb3JlLnJlc291cmNlcy5JVmlydHVhbENvbXBvbmVudDsKK2ltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUucmVzb3VyY2VzLklWaXJ0dWFsRm9sZGVyOworaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS5yZXNvdXJjZXMuSVZpcnR1YWxSZWZlcmVuY2U7CisKK3B1YmxpYyBhYnN0cmFjdCBjbGFzcyBBYnN0cmFjdFJlc291cmNlTGlzdFZpcnR1YWxDb21wb25lbnQgaW1wbGVtZW50cyBJVmlydHVhbENvbXBvbmVudCB7CisJcHJvdGVjdGVkIElQcm9qZWN0IHByb2plY3Q7CisJcHJvdGVjdGVkIElWaXJ0dWFsQ29tcG9uZW50IHJlZmVyZW5jaW5nQ29tcDsJCisKKwlwdWJsaWMgQWJzdHJhY3RSZXNvdXJjZUxpc3RWaXJ0dWFsQ29tcG9uZW50KElQcm9qZWN0IHAsIElWaXJ0dWFsQ29tcG9uZW50IHJlZmVyZW5jaW5nQ29tcG9uZW50KSB7CisJCXRoaXMucHJvamVjdCA9IHA7CisJCXRoaXMucmVmZXJlbmNpbmdDb21wID0gcmVmZXJlbmNpbmdDb21wb25lbnQ7CisJfQorCQorCUBPdmVycmlkZQorCXB1YmxpYyBib29sZWFuIGVxdWFscyhPYmplY3QgbykgeworCQlpZih0aGlzID09IG8peworCQkJcmV0dXJuIHRydWU7CisJCX0KKwkJaWYobyA9PSBudWxsKXsKKwkJCXJldHVybiBmYWxzZTsKKwkJfQorCQlpZighdGhpcy5nZXRDbGFzcygpLmVxdWFscyhvLmdldENsYXNzKCkpKXsKKwkJCXJldHVybiBmYWxzZTsKKwkJfQorCQlBYnN0cmFjdFJlc291cmNlTGlzdFZpcnR1YWxDb21wb25lbnQgb3RoZXIgPSAoQWJzdHJhY3RSZXNvdXJjZUxpc3RWaXJ0dWFsQ29tcG9uZW50KW87CisJCXJldHVybiAocHJvamVjdCA9PSBudWxsID8gb3RoZXIucHJvamVjdCA9PSBudWxsIDogcHJvamVjdC5lcXVhbHMob3RoZXIucHJvamVjdCkpICYmIAorCQkJICAgKHJlZmVyZW5jaW5nQ29tcCA9PSBudWxsID8gb3RoZXIucmVmZXJlbmNpbmdDb21wID09IG51bGwgOiByZWZlcmVuY2luZ0NvbXAuZXF1YWxzKG90aGVyLnJlZmVyZW5jaW5nQ29tcCkpOworCX0KKwkKKwlAT3ZlcnJpZGUKKwlwdWJsaWMgaW50IGhhc2hDb2RlKCkgeworCQlyZXR1cm4gc3VwZXIuaGFzaENvZGUoKSArIChwcm9qZWN0ID09IG51bGwgPyAwIDogcHJvamVjdC5oYXNoQ29kZSgpKSArIChyZWZlcmVuY2luZ0NvbXAgPT0gbnVsbCA/IDAgOiByZWZlcmVuY2luZ0NvbXAuaGFzaENvZGUoKSk7CisJfQorCQorCisJcHVibGljIHZvaWQgY3JlYXRlKGludCB1cGRhdGVGbGFncywgSVByb2dyZXNzTW9uaXRvciBhTW9uaXRvcikKKwkJCXRocm93cyBDb3JlRXhjZXB0aW9uIHsKKwkJLy8gSWdub3JlCisJfQorCisJcHVibGljIGJvb2xlYW4gZXhpc3RzKCkgeworCQlyZXR1cm4gdHJ1ZTsKKwl9CisKKwlwdWJsaWMgSVZpcnR1YWxDb21wb25lbnQgZ2V0Q29tcG9uZW50KCkgeworCQlyZXR1cm4gdGhpczsKKwl9CisKKwlwdWJsaWMgU3RyaW5nIGdldE5hbWUoKSB7CisJCXJldHVybiBnZXRJZCgpOworCX0KKworCXB1YmxpYyBTdHJpbmcgZ2V0RGVwbG95ZWROYW1lKCkgeworCQlyZXR1cm4gZ2V0TmFtZSgpOworCX0KKworCXB1YmxpYyBTdHJpbmcgZ2V0SWQoKSB7CisJCVN0cmluZyBmaXJzdFNlZ21lbnQgPSBnZXRGaXJzdElkU2VnbWVudCgpOworCQlpZiAocHJvamVjdCAhPSBudWxsICYmIHByb2plY3QuZXF1YWxzKAorCQkJCXJlZmVyZW5jaW5nQ29tcC5nZXRQcm9qZWN0KCkpKQorCQkJcmV0dXJuIGZpcnN0U2VnbWVudDsgCisJCXJldHVybiBmaXJzdFNlZ21lbnQgKyBQYXRoLlNFUEFSQVRPUiArIHByb2plY3QuZ2V0TmFtZSgpOworCX0KKworCXByb3RlY3RlZCBhYnN0cmFjdCBTdHJpbmcgZ2V0Rmlyc3RJZFNlZ21lbnQoKTsKKwkKKwlwdWJsaWMgSVByb2plY3QgZ2V0UHJvamVjdCgpIHsKKwkJcmV0dXJuIHByb2plY3Q7CisJfQorCisJcHVibGljIElWaXJ0dWFsQ29tcG9uZW50W10gZ2V0UmVmZXJlbmNpbmdDb21wb25lbnRzKCkgeworCQlyZXR1cm4gcmVmZXJlbmNpbmdDb21wID09IG51bGwgPyBuZXcgSVZpcnR1YWxDb21wb25lbnRbXSB7fQorCQkJCTogbmV3IElWaXJ0dWFsQ29tcG9uZW50W10geyByZWZlcmVuY2luZ0NvbXAgfTsKKwl9CisKKwlwdWJsaWMgSVZpcnR1YWxGb2xkZXIgZ2V0Um9vdEZvbGRlcigpIHsKKwkJLy8gQ3JlYXRlcyBhIG5ldyBpbnN0YW5jZSBlYWNoIHRpbWUgdG8gZW5zdXJlIGl0J3Mgbm90IGNhY2hlZAorCQlJQ29udGFpbmVyW10gY29udGFpbmVycyA9IGdldFVuZGVybHlpbmdDb250YWluZXJzKCk7CisJCUlSZXNvdXJjZVtdIGxvb3NlUmVzb3VyY2VzID0gZ2V0TG9vc2VSZXNvdXJjZXMoKTsKKwkJUmVzb3VyY2VMaXN0VmlydHVhbEZvbGRlciBmb2xkZXIgPSAKKwkJCW5ldyBSZXNvdXJjZUxpc3RWaXJ0dWFsRm9sZGVyKHByb2plY3QsIG5ldyBQYXRoKCIvIiksIGNvbnRhaW5lcnMsIGxvb3NlUmVzb3VyY2VzKTsgLy8kTk9OLU5MUy0xJAorCQlyZXR1cm4gZm9sZGVyOworCX0KKworCXByb3RlY3RlZCBhYnN0cmFjdCBJQ29udGFpbmVyW10gZ2V0VW5kZXJseWluZ0NvbnRhaW5lcnMoKTsKKwlwcm90ZWN0ZWQgYWJzdHJhY3QgSVJlc291cmNlW10gZ2V0TG9vc2VSZXNvdXJjZXMoKTsKKwkKKwlwdWJsaWMgUHJvcGVydGllcyBnZXRNZXRhUHJvcGVydGllcygpIHsKKwkJcmV0dXJuIG51bGw7CisJfQorCisJcHVibGljIElQYXRoW10gZ2V0TWV0YVJlc291cmNlcygpIHsKKwkJcmV0dXJuIG51bGw7CisJfQorCisJcHVibGljIElWaXJ0dWFsUmVmZXJlbmNlIGdldFJlZmVyZW5jZShTdHJpbmcgYUNvbXBvbmVudE5hbWUpIHsKKwkJLy8gSWdub3JlCisJCXJldHVybiBudWxsOworCX0KKworCXB1YmxpYyBJVmlydHVhbFJlZmVyZW5jZVtdIGdldFJlZmVyZW5jZXMoKSB7CisJCS8vIElnbm9yZTsgbm8gY2hpbGRyZW4KKwkJcmV0dXJuIG5ldyBJVmlydHVhbFJlZmVyZW5jZVtdIHt9OworCX0KKworCXB1YmxpYyBJVmlydHVhbFJlZmVyZW5jZVtdIGdldFJlZmVyZW5jZXMoTWFwPFN0cmluZywgT2JqZWN0PiBvcHRpb25zKSB7CisJCS8vIElnbm9yZSwgbm8gY2hpbGRyZW4KKwkJcmV0dXJuIG5ldyBJVmlydHVhbFJlZmVyZW5jZVtde307CisJfQorCisJCisJcHVibGljIGJvb2xlYW4gaXNCaW5hcnkoKSB7CisJCXJldHVybiBmYWxzZTsKKwl9CisKKwlwdWJsaWMgdm9pZCBzZXRNZXRhUHJvcGVydGllcyhQcm9wZXJ0aWVzIHByb3BlcnRpZXMpIHsKKwkJLy8gSWdub3JlCisJfQorCisJcHVibGljIHZvaWQgc2V0TWV0YVByb3BlcnR5KFN0cmluZyBuYW1lLCBTdHJpbmcgdmFsdWUpIHsKKwkJLy8gSWdub3JlCisJfQorCisJcHVibGljIHZvaWQgc2V0TWV0YVJlc291cmNlcyhJUGF0aFtdIHRoZU1ldGFSZXNvdXJjZVBhdGhzKSB7CisJCS8vIElnbm9yZQorCX0KKworCXB1YmxpYyB2b2lkIHNldFJlZmVyZW5jZXMoSVZpcnR1YWxSZWZlcmVuY2VbXSB0aGVSZWZlcmVuY2VzKSB7CisJCS8vIElnbm9yZQorCX0KKworCXB1YmxpYyBPYmplY3QgZ2V0QWRhcHRlcihDbGFzcyBhZGFwdGVyKSB7CisJCS8vIElnbm9yZQorCQlyZXR1cm4gbnVsbDsKKwl9CisKKwlwdWJsaWMgdm9pZCBhZGRSZWZlcmVuY2VzKElWaXJ0dWFsUmVmZXJlbmNlW10gcmVmZXJlbmNlcykgeworCQkvLyBJZ25vcmUKKwl9Cit9CmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS9tb2R1bGVjb3JlLXNyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2NvbXBvbmVudGNvcmUvaW50ZXJuYWwvcmVzb3VyY2VzL1Jlc291cmNlTGlzdFZpcnR1YWxGb2xkZXIuamF2YSBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlL21vZHVsZWNvcmUtc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vY29tcG9uZW50Y29yZS9pbnRlcm5hbC9yZXNvdXJjZXMvUmVzb3VyY2VMaXN0VmlydHVhbEZvbGRlci5qYXZhCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLjExZDg5ZjMKLS0tIC9kZXYvbnVsbAorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS9tb2R1bGVjb3JlLXNyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2NvbXBvbmVudGNvcmUvaW50ZXJuYWwvcmVzb3VyY2VzL1Jlc291cmNlTGlzdFZpcnR1YWxGb2xkZXIuamF2YQpAQCAtMCwwICsxLDE1MCBAQAorLyoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKiogCisgKiBDb3B5cmlnaHQgKGMpIDIwMDkgUmVkIEhhdCwgSW5jLiAKKyAqIERpc3RyaWJ1dGVkIHVuZGVyIGxpY2Vuc2UgYnkgUmVkIEhhdCwgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLiAKKyAqIFRoaXMgcHJvZ3JhbSBpcyBtYWRlIGF2YWlsYWJsZSB1bmRlciB0aGUgdGVybXMgb2YgdGhlIAorICogRWNsaXBzZSBQdWJsaWMgTGljZW5zZSB2MS4wIHdoaWNoIGFjY29tcGFuaWVzIHRoaXMgZGlzdHJpYnV0aW9uLCAKKyAqIGFuZCBpcyBhdmFpbGFibGUgYXQgaHR0cDovL3d3dy5lY2xpcHNlLm9yZy9sZWdhbC9lcGwtdjEwLmh0bWwgCisgKiAKKyAqIENvbnRyaWJ1dG9yczogCisgKiBSZWQgSGF0LCBJbmMuIC0gaW5pdGlhbCBBUEkgYW5kIGltcGxlbWVudGF0aW9uIAorICoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKi8gCitwYWNrYWdlIG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS5pbnRlcm5hbC5yZXNvdXJjZXM7CisKK2ltcG9ydCBqYXZhLnV0aWwuQXJyYXlMaXN0OworaW1wb3J0IGphdmEudXRpbC5BcnJheXM7CitpbXBvcnQgamF2YS51dGlsLkNvbGxlY3Rpb247CitpbXBvcnQgamF2YS51dGlsLkhhc2hNYXA7CisKK2ltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJlc291cmNlcy5JQ29udGFpbmVyOworaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucmVzb3VyY2VzLklGaWxlOworaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucmVzb3VyY2VzLklQcm9qZWN0OworaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucmVzb3VyY2VzLklSZXNvdXJjZTsKK2ltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJ1bnRpbWUuQ29yZUV4Y2VwdGlvbjsKK2ltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJ1bnRpbWUuSVBhdGg7CitpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb21wb25lbnRjb3JlLnJlc291cmNlcy5JVmlydHVhbEZpbGU7CitpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb21wb25lbnRjb3JlLnJlc291cmNlcy5JVmlydHVhbFJlc291cmNlOworCitwdWJsaWMgY2xhc3MgUmVzb3VyY2VMaXN0VmlydHVhbEZvbGRlciBleHRlbmRzIFZpcnR1YWxGb2xkZXIgeworCisJcHVibGljIGludGVyZmFjZSBSZXNvdXJjZUZpbHRlciB7CisJCXB1YmxpYyBib29sZWFuIGFjY2VwdHMoSVJlc291cmNlIHJlc291cmNlKTsKKwl9CisJCisJcHJpdmF0ZSBBcnJheUxpc3Q8SVJlc291cmNlPiBjaGlsZHJlbjsKKwlwcml2YXRlIEFycmF5TGlzdDxJQ29udGFpbmVyPiB1bmRlcmx5aW5nOworCXByaXZhdGUgUmVzb3VyY2VGaWx0ZXIgZmlsdGVyOworCXB1YmxpYyBSZXNvdXJjZUxpc3RWaXJ0dWFsRm9sZGVyKAorCQkJSVByb2plY3QgYUNvbXBvbmVudFByb2plY3QsCisJCQlJUGF0aCBhUnVudGltZVBhdGgpIHsKKwkJc3VwZXIoYUNvbXBvbmVudFByb2plY3QsIGFSdW50aW1lUGF0aCk7CisJCXRoaXMuY2hpbGRyZW4gPSBuZXcgQXJyYXlMaXN0PElSZXNvdXJjZT4oKTsKKwkJdGhpcy51bmRlcmx5aW5nID0gbmV3IEFycmF5TGlzdDxJQ29udGFpbmVyPigpOworCX0KKworCXB1YmxpYyBSZXNvdXJjZUxpc3RWaXJ0dWFsRm9sZGVyKAorCQkJSVByb2plY3QgYUNvbXBvbmVudFByb2plY3QsCisJCQlJUGF0aCBhUnVudGltZVBhdGgsIElDb250YWluZXJbXSB1bmRlcmx5aW5nQ29udGFpbmVycykgeworCQl0aGlzKGFDb21wb25lbnRQcm9qZWN0LCBhUnVudGltZVBhdGgpOworCQlhZGRVbmRlcmx5aW5nUmVzb3VyY2UodW5kZXJseWluZ0NvbnRhaW5lcnMpOworCX0KKworCXB1YmxpYyBSZXNvdXJjZUxpc3RWaXJ0dWFsRm9sZGVyKAorCQkJSVByb2plY3QgYUNvbXBvbmVudFByb2plY3QsCisJCQlJUGF0aCBhUnVudGltZVBhdGgsIElDb250YWluZXJbXSB1bmRlcmx5aW5nQ29udGFpbmVycywgCisJCQlJUmVzb3VyY2VbXSBsb29zZVJlc291cmNlcykgeworCQl0aGlzKGFDb21wb25lbnRQcm9qZWN0LCBhUnVudGltZVBhdGgsIHVuZGVybHlpbmdDb250YWluZXJzKTsKKwkJYWRkQ2hpbGRyZW4obG9vc2VSZXNvdXJjZXMpOworCX0KKworCXB1YmxpYyB2b2lkIHNldEZpbHRlcihSZXNvdXJjZUZpbHRlciBmaWx0ZXIpIHsKKwkJdGhpcy5maWx0ZXIgPSBmaWx0ZXI7CisJfQorCQorCXByb3RlY3RlZCB2b2lkIGFkZFVuZGVybHlpbmdSZXNvdXJjZShJUmVzb3VyY2UgcmVzb3VyY2UpIHsKKwkJaWYoIHJlc291cmNlIGluc3RhbmNlb2YgSUNvbnRhaW5lciApIHsgCisJCQl1bmRlcmx5aW5nLmFkZCgoSUNvbnRhaW5lcilyZXNvdXJjZSk7CisJCQl0cnkgeworCQkJCUlSZXNvdXJjZVtdIG5ld0NoaWxkcmVuID0gKChJQ29udGFpbmVyKXJlc291cmNlKS5tZW1iZXJzKCk7CisJCQkJZm9yKCBpbnQgaSA9IDA7IGkgPCBuZXdDaGlsZHJlbi5sZW5ndGg7IGkrKyApIHsKKwkJCQkJY2hpbGRyZW4uYWRkKG5ld0NoaWxkcmVuW2ldKTsKKwkJCQl9CisJCQl9IGNhdGNoKCBDb3JlRXhjZXB0aW9uIGNlKSB7CisJCQkJLy8gVE9ETyBsb2cKKwkJCX0KKwkJfQorCX0KKworCXByb3RlY3RlZCB2b2lkIGFkZFVuZGVybHlpbmdSZXNvdXJjZShJUmVzb3VyY2VbXSByZXNvdXJjZXMpIHsKKwkJZm9yKCBpbnQgaSA9IDA7IGkgPCByZXNvdXJjZXMubGVuZ3RoOyBpKysgKSB7CisJCQlhZGRVbmRlcmx5aW5nUmVzb3VyY2UocmVzb3VyY2VzW2ldKTsKKwkJfQorCX0KKwkKKwlwcm90ZWN0ZWQgdm9pZCBhZGRDaGlsZChJUmVzb3VyY2UgcmVzb3VyY2UpIHsKKwkJdGhpcy5jaGlsZHJlbi5hZGQocmVzb3VyY2UpOworCX0KKworCXByb3RlY3RlZCB2b2lkIGFkZENoaWxkcmVuKElSZXNvdXJjZVtdIHJlc291cmNlcykgeworCQl0aGlzLmNoaWxkcmVuLmFkZEFsbChBcnJheXMuYXNMaXN0KHJlc291cmNlcykpOworCX0KKwkKKwlAT3ZlcnJpZGUKKwlwdWJsaWMgSVJlc291cmNlIGdldFVuZGVybHlpbmdSZXNvdXJjZSgpIHsKKwkJcmV0dXJuIGdldFVuZGVybHlpbmdGb2xkZXIoKTsKKwl9CisJCisJQE92ZXJyaWRlCisJcHVibGljIElSZXNvdXJjZVtdIGdldFVuZGVybHlpbmdSZXNvdXJjZXMoKSB7CisJCXJldHVybiBnZXRVbmRlcmx5aW5nRm9sZGVycygpOworCX0KKworCUBPdmVycmlkZQorCXB1YmxpYyBJQ29udGFpbmVyIGdldFVuZGVybHlpbmdGb2xkZXIoKSB7IAorCQlyZXR1cm4gdW5kZXJseWluZy5zaXplKCkgPiAwID8gdW5kZXJseWluZy5nZXQoMCkgOiBudWxsOworCX0KKwkKKwlAT3ZlcnJpZGUKKwlwdWJsaWMgSUNvbnRhaW5lcltdIGdldFVuZGVybHlpbmdGb2xkZXJzKCkgeworCQlyZXR1cm4gdW5kZXJseWluZy50b0FycmF5KG5ldyBJQ29udGFpbmVyW3VuZGVybHlpbmcuc2l6ZSgpXSk7CisJfQorCisJQE92ZXJyaWRlCisJcHVibGljIElWaXJ0dWFsUmVzb3VyY2VbXSBtZW1iZXJzKGludCBtZW1iZXJGbGFncykgdGhyb3dzIENvcmVFeGNlcHRpb24geworCQlIYXNoTWFwPFN0cmluZywgSVZpcnR1YWxSZXNvdXJjZT4gdmlydHVhbFJlc291cmNlcyA9IG5ldyBIYXNoTWFwPFN0cmluZywgSVZpcnR1YWxSZXNvdXJjZT4oKTsgLy8gcmVzdWx0CisJCUlSZXNvdXJjZVtdIHJlc291cmNlcyA9IHRoaXMuY2hpbGRyZW4udG9BcnJheShuZXcgSVJlc291cmNlW3RoaXMuY2hpbGRyZW4uc2l6ZSgpXSk7CisJCWZvciggaW50IGkgPSAwOyBpIDwgcmVzb3VyY2VzLmxlbmd0aDsgaSsrICkgeworCQkJaGFuZGxlUmVzb3VyY2UocmVzb3VyY2VzW2ldLCB2aXJ0dWFsUmVzb3VyY2VzLCBtZW1iZXJGbGFncyk7CisJCX0KKwkJQ29sbGVjdGlvbiBjID0gdmlydHVhbFJlc291cmNlcy52YWx1ZXMoKTsKKwkJcmV0dXJuIChJVmlydHVhbFJlc291cmNlW10pIGMudG9BcnJheShuZXcgSVZpcnR1YWxSZXNvdXJjZVtjLnNpemUoKV0pOworCX0KKworCXByb3RlY3RlZCB2b2lkIGhhbmRsZVJlc291cmNlKElSZXNvdXJjZSByZXNvdXJjZSwgSGFzaE1hcDxTdHJpbmcsIElWaXJ0dWFsUmVzb3VyY2U+IG1hcCwgaW50IG1lbWJlckZsYWdzKSB0aHJvd3MgQ29yZUV4Y2VwdGlvbiB7CisJCWlmKCBmaWx0ZXIgIT0gbnVsbCAmJiAhZmlsdGVyLmFjY2VwdHMocmVzb3VyY2UpKQorCQkJcmV0dXJuOworCQkKKwkJaWYoIHJlc291cmNlIGluc3RhbmNlb2YgSUZpbGUgKSB7CisJCQlpZiggIW1hcC5jb250YWluc0tleShyZXNvdXJjZS5nZXROYW1lKCkpICkgeworCQkJCUlWaXJ0dWFsRmlsZSB2aXJ0RmlsZSA9IG5ldyBWaXJ0dWFsRmlsZShnZXRQcm9qZWN0KCksIAorCQkJCQkJZ2V0UnVudGltZVBhdGgoKS5hcHBlbmQoKChJRmlsZSlyZXNvdXJjZSkuZ2V0TmFtZSgpKSwgKElGaWxlKXJlc291cmNlKTsKKwkJCQltYXAucHV0KHJlc291cmNlLmdldE5hbWUoKSwgdmlydEZpbGUpOworCQkJCXJldHVybjsKKwkJCX0gCisJCX0vLyBlbmQgZmlsZQorCQllbHNlIGlmKCByZXNvdXJjZSBpbnN0YW5jZW9mIElDb250YWluZXIgKSB7CisJCQlJQ29udGFpbmVyIHJlYWxDb250YWluZXIgPSAoSUNvbnRhaW5lcikgcmVzb3VyY2U7CisJCQkvL0lSZXNvdXJjZVtdIHJlYWxDaGlsZFJlc291cmNlcyA9IHJlYWxDb250YWluZXIubWVtYmVycyhtZW1iZXJGbGFncyk7CisJCQlJVmlydHVhbFJlc291cmNlIHByZXZpb3VzVmFsdWUgPSBtYXAuZ2V0KHJlc291cmNlLmdldE5hbWUoKSk7CisJCQlpZiggcHJldmlvdXNWYWx1ZSAhPSBudWxsICYmIHByZXZpb3VzVmFsdWUgaW5zdGFuY2VvZiBSZXNvdXJjZUxpc3RWaXJ0dWFsRm9sZGVyICkgeworCQkJCSgoUmVzb3VyY2VMaXN0VmlydHVhbEZvbGRlcilwcmV2aW91c1ZhbHVlKS5hZGRVbmRlcmx5aW5nUmVzb3VyY2UocmVhbENvbnRhaW5lcik7CisJCQl9IGVsc2UgaWYoIHByZXZpb3VzVmFsdWUgPT0gbnVsbCApIHsKKwkJCQlSZXNvdXJjZUxpc3RWaXJ0dWFsRm9sZGVyIGNoaWxkRm9sZGVyID0gCisJCQkJCW5ldyBSZXNvdXJjZUxpc3RWaXJ0dWFsRm9sZGVyKGdldFByb2plY3QoKSwgZ2V0UnVudGltZVBhdGgoKS5hcHBlbmQocmVzb3VyY2UuZ2V0TmFtZSgpKSk7CisJCQkJY2hpbGRGb2xkZXIuYWRkVW5kZXJseWluZ1Jlc291cmNlKHJlYWxDb250YWluZXIpOworCQkJCWlmKCBmaWx0ZXIgIT0gbnVsbCApCisJCQkJCWNoaWxkRm9sZGVyLnNldEZpbHRlcihmaWx0ZXIpOworCQkJCW1hcC5wdXQocmVzb3VyY2UuZ2V0TmFtZSgpLCBjaGlsZEZvbGRlcik7CisJCQl9CisJCX0gLy8gZW5kIGNvbnRhaW5lcgorCX0KK30KZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlL21vZHVsZWNvcmUtc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vY29tcG9uZW50Y29yZS9pbnRlcm5hbC9yZXNvdXJjZXMvVmlydHVhbEFyY2hpdmVDb21wb25lbnQuamF2YSBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlL21vZHVsZWNvcmUtc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vY29tcG9uZW50Y29yZS9pbnRlcm5hbC9yZXNvdXJjZXMvVmlydHVhbEFyY2hpdmVDb21wb25lbnQuamF2YQppbmRleCAwZDY2YzJmLi4wNTkwNjE5IDEwMDY0NAotLS0gYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS9tb2R1bGVjb3JlLXNyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2NvbXBvbmVudGNvcmUvaW50ZXJuYWwvcmVzb3VyY2VzL1ZpcnR1YWxBcmNoaXZlQ29tcG9uZW50LmphdmEKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUvbW9kdWxlY29yZS1zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9jb21wb25lbnRjb3JlL2ludGVybmFsL3Jlc291cmNlcy9WaXJ0dWFsQXJjaGl2ZUNvbXBvbmVudC5qYXZhCkBAIC0xMiw2ICsxMiw3IEBACiAKIAogaW1wb3J0IGphdmEuaW8uRmlsZTsKK2ltcG9ydCBqYXZhLnV0aWwuTWFwOwogaW1wb3J0IGphdmEudXRpbC5Qcm9wZXJ0aWVzOwogCiBpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5yZXNvdXJjZXMuSUZpbGU7CkBAIC00MiwxOCArNDMsMTIgQEAKIAkKIAlwcml2YXRlIHN0YXRpYyBmaW5hbCBJVmlydHVhbFJlZmVyZW5jZVtdIE5PX1JFRkVSRU5DRVMgPSBuZXcgVmlydHVhbFJlZmVyZW5jZVswXTsKIAlwcml2YXRlIHN0YXRpYyBmaW5hbCBJVmlydHVhbENvbXBvbmVudFtdIE5PX0NPTVBPTkVOVFMgPSBuZXcgVmlydHVhbENvbXBvbmVudFswXTsKLS8vCXByaXZhdGUgc3RhdGljIGZpbmFsIElSZXNvdXJjZVtdIE5PX1JFU09VUkNFUyA9IG51bGw7CiAJcHJpdmF0ZSBzdGF0aWMgZmluYWwgSVZpcnR1YWxSZXNvdXJjZVtdIE5PX1ZJUlRVQUxfUkVTT1VSQ0VTID0gbnVsbDsKIAlwcml2YXRlIHN0YXRpYyBmaW5hbCBQcm9wZXJ0aWVzIE5PX1BST1BFUlRJRVMgPSBuZXcgUHJvcGVydGllcygpOwogCXByaXZhdGUgc3RhdGljIGZpbmFsIElQYXRoW10gTk9fUEFUSFMgPSBuZXcgUGF0aFswXTsKIAotLy8JcHJpdmF0ZSBJUGF0aCBydW50aW1lUGF0aDsKKwlwcml2YXRlIElQYXRoIHJ1bnRpbWVQYXRoOwogCXByaXZhdGUgSVByb2plY3QgY29tcG9uZW50UHJvamVjdDsKLS8vCXByaXZhdGUgSVZpcnR1YWxGb2xkZXIgcm9vdEZvbGRlcjsKLQlwcml2YXRlIGludCBmbGFnID0gMTsKLS8vCXByaXZhdGUgU3RyaW5nIGFyY2hpdmVMb2NhdGlvbjsKLQotCiAJcHJpdmF0ZSBJUGF0aCBhcmNoaXZlUGF0aDsKIAlwcml2YXRlIFN0cmluZyBhcmNoaXZlVHlwZTsKIApAQCAtNjQsMTAgKzU5LDEwIEBACiAJCQl0aHJvdyBuZXcgTnVsbFBvaW50ZXJFeGNlcHRpb24oKTsKIAkJfQogCQljb21wb25lbnRQcm9qZWN0ID0gYUNvbXBvbmVudFByb2plY3Q7Ci0vLwkJcnVudGltZVBhdGggPSBhUnVudGltZVBhdGg7CisJCXJ1bnRpbWVQYXRoID0gYVJ1bnRpbWVQYXRoOwogCiAJCVN0cmluZyBhcmNoaXZlUGF0aFN0cmluZyA9IGFyY2hpdmVMb2NhdGlvbi5zdWJzdHJpbmcoNCwgYXJjaGl2ZUxvY2F0aW9uLmxlbmd0aCgpKTsKLQkJYXJjaGl2ZVR5cGUJPSBhcmNoaXZlTG9jYXRpb24uc3Vic3RyaW5nKDAsIGFyY2hpdmVMb2NhdGlvbi5sZW5ndGgoKSAtIGFyY2hpdmVQYXRoU3RyaW5nLmxlbmd0aCgpIC0xKTsKKwkJYXJjaGl2ZVR5cGUJPSBhcmNoaXZlTG9jYXRpb24uc3Vic3RyaW5nKDAsIDMpOwogCQlhcmNoaXZlUGF0aCA9IG5ldyAgUGF0aChhcmNoaXZlUGF0aFN0cmluZyk7CiAJfQogCkBAIC04MSw2ICs3Niw3IEBACiAJCiAJcHVibGljIFN0cmluZyBnZXREZXBsb3llZE5hbWUoKSB7CiAJCXJldHVybiBnZXROYW1lKCk7CisJCS8vcmV0dXJuIGdldEFyY2hpdmVQYXRoKCkubGFzdFNlZ21lbnQoKTsKIAl9CiAKIAlwdWJsaWMgdm9pZCBzZXRDb21wb25lbnRUeXBlSWQoU3RyaW5nIGFDb21wb25lbnRUeXBlSWQpIHsKQEAgLTkyLDggKzg4LDggQEAKIAl9CiAKIAlwdWJsaWMgYm9vbGVhbiBpc0JpbmFyeSgpIHsKLQkJYm9vbGVhbiByZXQgPSAoZmxhZyAmIEJJTkFSWSkgPT0gMSA/IHRydWUgOiBmYWxzZTsKLQkJcmV0dXJuIHJldDsKKwkJaW50IHggPSBCSU5BUlk7CisJCXJldHVybiB0cnVlOwogCX0KIAogCXB1YmxpYyBJUGF0aFtdIGdldE1ldGFSZXNvdXJjZXMoKSB7CkBAIC0xMDgsMTAgKzEwNCwyMiBAQAogCiAJfQogCisJLyoqCisJICogVGhlIGltcGxlbWVudGF0aW9uIHNob3VsZCBiZSBwcm90ZWN0ZWQuIERlcHJlY2F0ZWQgYXMgb2YgV1RQIDMuMiAKKwkgKiBZb3Ugc2hvdWxkIGNvbnZlcnQgdG8gYSBGaWxlIG9yIElGaWxlIGFuZCB0aGVuIGdldCB0aGUgZXh0ZW5zaW9uLiAKKwkgKiBAcmV0dXJuCisJICovCisJQERlcHJlY2F0ZWQKIAlwdWJsaWMgU3RyaW5nIGdldEZpbGVFeHRlbnNpb24oKSB7CiAJCXJldHVybiBhcmNoaXZlUGF0aC5nZXRGaWxlRXh0ZW5zaW9uKCk7CiAJfQogCisJLyoqCisJICogVGhlIGltcGxlbWVudGF0aW9uIHNob3VsZCBiZSBwcm90ZWN0ZWQuIERlcHJlY2F0ZWQgYXMgb2YgV1RQIDMuMgorCSAqIFlvdSBzaG91bGQgY29udmVydCB0byBhbiBJRmlsZSBhbmQgZ2V0IGl0J3MgZnVsbCBwYXRoCisJICogQHJldHVybgorCSAqLworCUBEZXByZWNhdGVkCiAJcHVibGljIElQYXRoIGdldFdvcmtzcGFjZVJlbGF0aXZlUGF0aCgpIHsKIAkJaWYoIGFyY2hpdmVQYXRoLnNlZ21lbnRDb3VudCgpID4gMSApewogCQkJSUZpbGUgYUZpbGUgPSBSZXNvdXJjZXNQbHVnaW4uZ2V0V29ya3NwYWNlKCkuZ2V0Um9vdCgpLmdldEZpbGUoYXJjaGl2ZVBhdGgpOwpAQCAtMTIxLDYgKzEyOSwxMiBAQAogCQlyZXR1cm4gbnVsbDsKIAl9CiAKKwkvKioKKwkgKiBUaGUgaW1wbGVtZW50YXRpb24gc2hvdWxkIGJlIHByb3RlY3RlZC4gRGVwcmVjYXRlZCBhcyBvZiBXVFAgMy4yCisJICogWW91IHNob3VsZCBjb252ZXJ0IHRvIGFuIElGaWxlIGFuZCB1c2UgSUZpbGUuZ2V0UHJvamVjdFJlbGF0aXZlUGF0aCgpCisJICogQHJldHVybgorCSAqLworCUBEZXByZWNhdGVkCiAJcHVibGljIElQYXRoIGdldFByb2plY3RSZWxhdGl2ZVBhdGgoKSB7CiAJCUlGaWxlIGFGaWxlID0gUmVzb3VyY2VzUGx1Z2luLmdldFdvcmtzcGFjZSgpLmdldFJvb3QoKS5nZXRGaWxlKGdldFdvcmtzcGFjZVJlbGF0aXZlUGF0aCgpKTsKIAkJaWYgKGFGaWxlLmV4aXN0cygpKQpAQCAtMTMzLDkgKzE0NywxMyBAQAogCX0KIAogCXB1YmxpYyBJUGF0aCBnZXRSdW50aW1lUGF0aCgpIHsKLQkJcmV0dXJuIFJPT1Q7CisJCXJldHVybiBydW50aW1lUGF0aCA9PSBudWxsID8gUk9PVCA6IHJ1bnRpbWVQYXRoOwogCX0KIAorCXB1YmxpYyBJUGF0aCBnZXRBcmNoaXZlUGF0aCgpIHsKKwkJcmV0dXJuIGFyY2hpdmVQYXRoOworCX0KKwkKIAlwdWJsaWMgYm9vbGVhbiBpc0FjY2Vzc2libGUoKSB7CiAJCXJldHVybiB0cnVlOwogCX0KQEAgLTE1MSw2ICsxNjksMTAgQEAKIAlwdWJsaWMgdm9pZCBjcmVhdGUoaW50IHVwZGF0ZUZsYWdzLCBJUHJvZ3Jlc3NNb25pdG9yIGFNb25pdG9yKSB0aHJvd3MgQ29yZUV4Y2VwdGlvbiB7CiAKIAl9CisJCisJcHVibGljIElWaXJ0dWFsUmVmZXJlbmNlW10gZ2V0UmVmZXJlbmNlcyhNYXA8U3RyaW5nLCBPYmplY3Q+IG9wdGlvbnMpIHsKKwkJcmV0dXJuIE5PX1JFRkVSRU5DRVM7CisJfQogCiAJcHVibGljIElWaXJ0dWFsUmVmZXJlbmNlW10gZ2V0UmVmZXJlbmNlcygpIHsKIAkJcmV0dXJuIE5PX1JFRkVSRU5DRVM7CkBAIC0xNjksMTcgKzE5MSw4IEBACiAJfQogCiAJcHVibGljIGJvb2xlYW4gZXhpc3RzKCkgewotCQlib29sZWFuIGV4aXN0cyA9IGZhbHNlOwotCQlqYXZhLmlvLkZpbGUgZGlza0ZpbGUgPSBnZXRVbmRlcmx5aW5nRGlza0ZpbGUoKTsKLQkJaWYoIGRpc2tGaWxlICE9IG51bGwgKQotCQkJZXhpc3RzID0gZGlza0ZpbGUuZXhpc3RzKCk7Ci0JCQotCQlpZiggIWV4aXN0cyApewotCQkJSUZpbGUgdXRpbGl0eUphciA9IGdldFVuZGVybHlpbmdXb3JrYmVuY2hGaWxlKCk7Ci0JCQlpZiggdXRpbGl0eUphciAhPSBudWxsICkKLQkJCQlleGlzdHMgPSAgdXRpbGl0eUphci5leGlzdHMoKTsKLQkJfQotCQlyZXR1cm4gZXhpc3RzOworCQlGaWxlIGYgPSAoRmlsZSlnZXRBZGFwdGVyKEZpbGUuY2xhc3MpOworCQlyZXR1cm4gZiAhPSBudWxsICYmIGYuZXhpc3RzKCk7CiAJfQogCiAJcHVibGljIElWaXJ0dWFsRm9sZGVyIGdldFJvb3RGb2xkZXIoKSB7CkBAIC0xOTEsNyArMjA0LDI2IEBACiAJfQogCiAKKwkvKioKKwkgKiBHdWFyYW50ZWVkIGFjY2VwdGVkIGFkYXB0ZXJzIGFuZCBiZWhhdmlvdXJzOgorCSAqIG9yZy5lY2xpcHNlLmNvcmUucnVudGltZS5JUGF0aCAtIGlmIGEgd29ya3NwYWNlIGZpbGUsIHJldHVybnMgaWZpbGUuZ2V0RnVsbFBhdGgoKSwgIGVsc2UgbmV3IFBhdGgoamF2YS5pby5GaWxlLmdldEFic29sdXRlUGF0aCgpKQorCSAqIGphdmEuaW8uRmlsZSAtIHRoZSBmaWxlLCB3aGV0aGVyIGluIHdvcmtzcGFjZSBvciBvdXQsIHRoaXMgd2lsbCBnZXQgdGhlIGFjdHVhbCBmaWxlIGlmIHRoZXJlIGlzIG9uZQorCSAqIG9yZy5lY2xpcHNlLmNvcmUucmVzb3VyY2VzLklGaWxlIC0gdGhlIHdvcmtzcGFjZSBmaWxlLCBpZiBpdCBleGlzdHMKKwkgKi8KIAlwdWJsaWMgT2JqZWN0IGdldEFkYXB0ZXIoQ2xhc3MgYWRhcHRlclR5cGUpIHsKKwkJaWYoIEZpbGUuY2xhc3MuZXF1YWxzKGFkYXB0ZXJUeXBlKSkKKwkJCXJldHVybiBnZXRVbmRlcmx5aW5nRGlza0ZpbGUoKTsKKwkJaWYoIElGaWxlLmNsYXNzLmVxdWFscyhhZGFwdGVyVHlwZSkpIHsKKwkJCXJldHVybiBnZXRVbmRlcmx5aW5nV29ya2JlbmNoRmlsZSgpOworCQl9CisJCWlmKCBJUGF0aC5jbGFzcy5lcXVhbHMoYWRhcHRlclR5cGUpKSB7CisJCQlJRmlsZSBmID0gZ2V0VW5kZXJseWluZ1dvcmtiZW5jaEZpbGUoKTsKKwkJCWlmKCBmICE9IG51bGwgKSAKKwkJCQlyZXR1cm4gZi5nZXRGdWxsUGF0aCgpOworCQkJRmlsZSBmMiA9IGdldFVuZGVybHlpbmdEaXNrRmlsZSgpOworCQkJaWYoIGYyICE9IG51bGwgKQorCQkJCXJldHVybiBuZXcgUGF0aChmMi5nZXRBYnNvbHV0ZVBhdGgoKSk7CisJCX0KIAkJcmV0dXJuIFBsYXRmb3JtLmdldEFkYXB0ZXJNYW5hZ2VyKCkuZ2V0QWRhcHRlcih0aGlzLCBhZGFwdGVyVHlwZSk7CiAJfQogCkBAIC0yMjQsMTIgKzI1NiwyNSBAQAogCXB1YmxpYyB2b2lkIHNldE1ldGFQcm9wZXJ0aWVzKFByb3BlcnRpZXMgcHJvcGVydGllcykgewogCiAJfQorCQorCS8qKgorCSAqIFRoZSBpbXBsZW1lbnRhdGlvbiBzaG91bGQgYmUgcHJvdGVjdGVkCisJICogWW91IHNob3VsZCB1c2UgZ2V0QWRhcHRlcihJRmlsZS5jbGFzcykKKwkgKiBAcmV0dXJuCisJICovCisJQERlcHJlY2F0ZWQKIAlwdWJsaWMgSUZpbGUgZ2V0VW5kZXJseWluZ1dvcmtiZW5jaEZpbGUoKSB7CiAJCWlmIChnZXRXb3Jrc3BhY2VSZWxhdGl2ZVBhdGgoKT09bnVsbCkKIAkJCXJldHVybiBudWxsOwogCQlyZXR1cm4gUmVzb3VyY2VzUGx1Z2luLmdldFdvcmtzcGFjZSgpLmdldFJvb3QoKS5nZXRGaWxlKGdldFdvcmtzcGFjZVJlbGF0aXZlUGF0aCgpKTsKIAl9CiAKKwkvKioKKwkgKiBUaGUgaW1wbGVtZW50YXRpb24gc2hvdWxkIGJlIHByb3RlY3RlZAorCSAqIFlvdSBzaG91bGQgdXNlIGdldEFkYXB0ZXIoRmlsZS5jbGFzcykKKwkgKiBAcmV0dXJuCisJICovCisJQERlcHJlY2F0ZWQKIAlwdWJsaWMgRmlsZSBnZXRVbmRlcmx5aW5nRGlza0ZpbGUoKSB7CiAJCVN0cmluZyBvc1BhdGggPSBudWxsOwogCQlJUGF0aCBsb2MgPSBudWxsOwpAQCAtMjY2LDUgKzMxMSw1IEBACiAJCX0KIAkJcmV0dXJuIHN1cGVyLnRvU3RyaW5nKCk7CiAJfQotCQorCiB9CmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS9tb2R1bGVjb3JlLXNyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2NvbXBvbmVudGNvcmUvaW50ZXJuYWwvcmVzb3VyY2VzL1ZpcnR1YWxDb21wb25lbnQuamF2YSBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlL21vZHVsZWNvcmUtc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vY29tcG9uZW50Y29yZS9pbnRlcm5hbC9yZXNvdXJjZXMvVmlydHVhbENvbXBvbmVudC5qYXZhCmluZGV4IGNlMjRkNjkuLmExZjhmYmQgMTAwNjQ0Ci0tLSBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlL21vZHVsZWNvcmUtc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vY29tcG9uZW50Y29yZS9pbnRlcm5hbC9yZXNvdXJjZXMvVmlydHVhbENvbXBvbmVudC5qYXZhCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlL21vZHVsZWNvcmUtc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vY29tcG9uZW50Y29yZS9pbnRlcm5hbC9yZXNvdXJjZXMvVmlydHVhbENvbXBvbmVudC5qYXZhCkBAIC0xMiw5ICsxMiwxMyBAQAogCiBpbXBvcnQgamF2YS51dGlsLkFycmF5TGlzdDsKIGltcG9ydCBqYXZhLnV0aWwuRW51bWVyYXRpb247CitpbXBvcnQgamF2YS51dGlsLkhhc2hNYXA7CitpbXBvcnQgamF2YS51dGlsLkhhc2h0YWJsZTsKIGltcG9ydCBqYXZhLnV0aWwuSXRlcmF0b3I7CiBpbXBvcnQgamF2YS51dGlsLkxpc3Q7CitpbXBvcnQgamF2YS51dGlsLk1hcDsKIGltcG9ydCBqYXZhLnV0aWwuUHJvcGVydGllczsKK2ltcG9ydCBqYXZhLnV0aWwuU2V0OwogCiBpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5yZXNvdXJjZXMuSVByb2plY3Q7CiBpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5ydW50aW1lLkNvcmVFeGNlcHRpb247CkBAIC0yMywxOCArMjcsMjIgQEAKIGltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJ1bnRpbWUuSVN0YXR1czsKIGltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJ1bnRpbWUuUGF0aDsKIGltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJ1bnRpbWUuUGxhdGZvcm07CitpbXBvcnQgb3JnLmVjbGlwc2UuZW1mLmNvbW1vbi5ub3RpZnkuTm90aWZpY2F0aW9uOworaW1wb3J0IG9yZy5lY2xpcHNlLmVtZi5jb21tb24ubm90aWZ5LmltcGwuQWRhcHRlckltcGw7CitpbXBvcnQgb3JnLmVjbGlwc2UuZW1mLmNvbW1vbi51dGlsLlVSSTsKK2ltcG9ydCBvcmcuZWNsaXBzZS5lbWYuZWNvcmUucmVzb3VyY2UuUmVzb3VyY2U7CiBpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb21wb25lbnRjb3JlLkNvbXBvbmVudENvcmU7CiBpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb21wb25lbnRjb3JlLk1vZHVsZUNvcmVOYXR1cmU7CiBpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb21wb25lbnRjb3JlLmludGVybmFsLkNvbXBvbmVudGNvcmVGYWN0b3J5OwogaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS5pbnRlcm5hbC5Db21wb25lbnRjb3JlUGFja2FnZTsKLWltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUuaW50ZXJuYWwuRGVwZW5kZW5jeVR5cGU7CiBpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb21wb25lbnRjb3JlLmludGVybmFsLk1vZHVsZWNvcmVQbHVnaW47CiBpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb21wb25lbnRjb3JlLmludGVybmFsLlByb3BlcnR5OwogaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS5pbnRlcm5hbC5SZWZlcmVuY2VkQ29tcG9uZW50OwogaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS5pbnRlcm5hbC5TdHJ1Y3R1cmVFZGl0OwogaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS5pbnRlcm5hbC5Xb3JrYmVuY2hDb21wb25lbnQ7Ci1pbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb21wb25lbnRjb3JlLmludGVybmFsLmJ1aWxkZXIuRGVwZW5kZW5jeUdyYXBoTWFuYWdlcjsKLWltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUuaW50ZXJuYWwuaW1wbC5Nb2R1bGVVUklVdGlsOworaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS5pbnRlcm5hbC5idWlsZGVyLklEZXBlbmRlbmN5R3JhcGg7CitpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb21wb25lbnRjb3JlLnJlc29sdmVycy5JUmVmZXJlbmNlUmVzb2x2ZXI7CitpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb21wb25lbnRjb3JlLnJlc29sdmVycy5SZWZlcmVuY2VSZXNvbHZlclV0aWw7CiBpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb21wb25lbnRjb3JlLnJlc291cmNlcy5JVmlydHVhbENvbXBvbmVudDsKIGltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUucmVzb3VyY2VzLklWaXJ0dWFsRm9sZGVyOwogaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS5yZXNvdXJjZXMuSVZpcnR1YWxSZWZlcmVuY2U7CkBAIC00OSw3ICs1Nyw4MiBAQAogCVN0cmluZyBjb21wb25lbnRUeXBlSWQ7CiAJcHJpdmF0ZSBpbnQgZmxhZyA9IDA7CiAJCisJLy8gQ2FjaGUgdmFyaWFibGVzCisJU3RyaW5nIG5hbWUgPSBudWxsOworCVN0cmluZyBkZXBsb3ltZW50TmFtZSA9IG51bGw7CisJTWFwIDxTdHJpbmcsIElWaXJ0dWFsUmVmZXJlbmNlPiByZWZlcmVuY2VNYXAgPSBudWxsOworCUlWaXJ0dWFsUmVmZXJlbmNlW10gcmF3UmVmZXJlbmNlc0FycmF5ID0gbnVsbDsKKwlJVmlydHVhbFJlZmVyZW5jZVtdIHJlZmVyZW5jZXNBcnJheSA9IG51bGw7CisJUHJvcGVydGllcyBtZXRhUHJvcGVydGllcyA9IG51bGw7CisJSVBhdGhbXSBjYWNoZU1ldGFSZXNvdXJjZXMgPSBudWxsOworCUlWaXJ0dWFsUmVmZXJlbmNlW10gYWxsUmVmZXJlbmNlcyA9IG51bGw7CisJCisJUmVzb3VyY2UgcHJvamVjdFJlc291cmNlOworCXByb3RlY3RlZCBSZXNvdXJjZUFkYXB0ZXIgcmVzb3VyY2VBZGFwdGVyID0gbmV3IFJlc291cmNlQWRhcHRlcigpOworCQorCXByb3RlY3RlZCBjbGFzcyBSZXNvdXJjZUFkYXB0ZXIgZXh0ZW5kcyBBZGFwdGVySW1wbCB7CisJCXB1YmxpYyB2b2lkIG5vdGlmeUNoYW5nZWQoTm90aWZpY2F0aW9uIG5vdGlmaWNhdGlvbikgeworCQkJaWYgKG5vdGlmaWNhdGlvbi5nZXRGZWF0dXJlSUQobnVsbCkgPT0gUmVzb3VyY2UuUkVTT1VSQ0VfX0lTX01PRElGSUVEKQorCQkJCXJlc291cmNlQ2hhbmdlZCgoUmVzb3VyY2UpIG5vdGlmaWNhdGlvbi5nZXROb3RpZmllcigpKTsKKwkJfQogCisJCUBPdmVycmlkZQorCQlwdWJsaWMgYm9vbGVhbiBlcXVhbHMoT2JqZWN0IGFyZzApIHsKKwkJCQorCQkJcmV0dXJuIHRoaXMuZ2V0Q2xhc3MoKS5lcXVhbHMoYXJnMC5nZXRDbGFzcygpKTsKKwkJfQorCisJCUBPdmVycmlkZQorCQlwdWJsaWMgaW50IGhhc2hDb2RlKCkgeworCQkJCisJCQlyZXR1cm4gZ2V0Q2xhc3MoKS5oYXNoQ29kZSgpOworCQl9CisJfQorCQorCXByb3RlY3RlZCB2b2lkIHJlc291cmNlQ2hhbmdlZChSZXNvdXJjZSBhUmVzb3VyY2UpIHsKKwkJY2xlYXJDYWNoZSgpOworCX0KKwkKKwlwcml2YXRlIHZvaWQgYWRkTWFuYWdlZFJlc291cmNlKCkgeworCQlpZihwcm9qZWN0UmVzb3VyY2UgPT0gbnVsbCkKKwkJCXByb2plY3RSZXNvdXJjZSA9IGNyZWF0ZVJlc291cmNlKCk7CisJCWlmIChwcm9qZWN0UmVzb3VyY2UgIT0gbnVsbCAmJiAhcHJvamVjdFJlc291cmNlLmVBZGFwdGVycygpLmNvbnRhaW5zKHJlc291cmNlQWRhcHRlcikpCisJCQlwcm9qZWN0UmVzb3VyY2UuZUFkYXB0ZXJzKCkuYWRkKHJlc291cmNlQWRhcHRlcik7CisJfQorCQorCXByb3RlY3RlZCB2b2lkIHJlbW92ZVJlc291cmNlKCkgeworCQlpZihwcm9qZWN0UmVzb3VyY2UgIT0gbnVsbCkgeworCQkJcHJvamVjdFJlc291cmNlLmVBZGFwdGVycygpLnJlbW92ZShyZXNvdXJjZUFkYXB0ZXIpOworCQkJcHJvamVjdFJlc291cmNlID0gbnVsbDsKKwkJfQorCX0KKwkKKwlwcm90ZWN0ZWQgdm9pZCBpbml0aWFsaXplUmVzb3VyY2UoKSB7CisJCXByb2plY3RSZXNvdXJjZSA9IGNyZWF0ZVJlc291cmNlKCk7CisJCWFkZE1hbmFnZWRSZXNvdXJjZSgpOworCX0KKwkKKwlwcm90ZWN0ZWQgUmVzb3VyY2UgY3JlYXRlUmVzb3VyY2UoKSB7CisJCVN0cnVjdHVyZUVkaXQgY29yZSA9IG51bGw7CisJCVJlc291cmNlIHJlcyA9IG51bGw7CisgICAgICAgIHRyeSB7CisgICAgICAgICAgICBjb3JlID0gU3RydWN0dXJlRWRpdC5nZXRTdHJ1Y3R1cmVFZGl0Rm9yUmVhZChnZXRQcm9qZWN0KCkpOworICAgICAgICAgICAgaWYgKGNvcmUgPT0gbnVsbCkKKyAgICAgICAgICAgIAlyZXR1cm4gbnVsbDsKKyAgICAgICAgICAgIFdvcmtiZW5jaENvbXBvbmVudCBjb21wb25lbnQgPSBjb3JlLmdldENvbXBvbmVudCgpOworICAgICAgICAgICAgaWYoY29tcG9uZW50ICE9IG51bGwpCisgICAgICAgICAgICAJcmVzID0gY29tcG9uZW50LmVSZXNvdXJjZSgpOworICAgICAgICB9IGZpbmFsbHkgeworICAgICAgICAgICAgaWYoY29yZSAhPSBudWxsKQorICAgICAgICAgICAgICAgIGNvcmUuZGlzcG9zZSgpOworICAgICAgICB9CisgICAgICAgIHJldHVybiByZXM7CisJfQorCQorCXB1YmxpYyB2b2lkIGRpc3Bvc2UoKSB7CisJCXJlbW92ZVJlc291cmNlKCk7CisJfQorCQogCXByb3RlY3RlZCBWaXJ0dWFsQ29tcG9uZW50KCl7CiAJfQogCQpAQCAtNjAsNiArMTQzLDcgQEAKIAkJY29tcG9uZW50UHJvamVjdCA9IGFQcm9qZWN0OwogCQlydW50aW1lUGF0aCA9IGFSdW50aW1lUGF0aDsKIAkJcm9vdEZvbGRlciA9IENvbXBvbmVudENvcmUuY3JlYXRlRm9sZGVyKGNvbXBvbmVudFByb2plY3QsIG5ldyBQYXRoKCIvIikpOyAvLyROT04tTkxTLTEkCisJCWluaXRpYWxpemVSZXNvdXJjZSgpOwogCX0KIAkKIAlwdWJsaWMgSVZpcnR1YWxDb21wb25lbnQgZ2V0Q29tcG9uZW50KCkgewpAQCAtNjcsMTAgKzE1MSwxNyBAQAogCX0KIAkKIAlwdWJsaWMgU3RyaW5nIGdldE5hbWUoKSB7Ci0JCXJldHVybiBnZXRQcm9qZWN0KCkuZ2V0TmFtZSgpOworCQlpZihuYW1lID09IG51bGwpeworCQkJbmFtZSA9IGdldFByb2plY3QoKS5nZXROYW1lKCk7CisJCX0KKwkJcmV0dXJuIG5hbWU7CiAJfQogCQogCXB1YmxpYyBTdHJpbmcgZ2V0RGVwbG95ZWROYW1lKCkgeworCQlpZihkZXBsb3ltZW50TmFtZSAhPSBudWxsKSB7CisJCQlyZXR1cm4gZGVwbG95bWVudE5hbWU7CisJCX0KKwkJCQogCQlTdHJ1Y3R1cmVFZGl0IGNvcmUgPSBudWxsOwogCQlJUHJvamVjdCBwcm9qZWN0ID0gZ2V0UHJvamVjdCgpOwogCQl0cnkgewpAQCAtNzgsMTUgKzE2OSwxOCBAQAogCQkJCWNvcmUgPSBTdHJ1Y3R1cmVFZGl0LmdldFN0cnVjdHVyZUVkaXRGb3JSZWFkKHByb2plY3QpOwogCQkJCWlmKGNvcmUgIT0gbnVsbCAmJiBjb3JlLmdldENvbXBvbmVudCgpICE9IG51bGwpewogCQkJCQlXb3JrYmVuY2hDb21wb25lbnQgY29tcG9uZW50ID0gY29yZS5nZXRDb21wb25lbnQoKTsKLQkJCQkJaWYgKGNvbXBvbmVudC5nZXROYW1lKCkhPW51bGwgJiYgY29tcG9uZW50LmdldE5hbWUoKS5sZW5ndGgoKT4wKQotCQkJCQkJcmV0dXJuIGNvbXBvbmVudC5nZXROYW1lKCk7CisJCQkJCWlmIChjb21wb25lbnQuZ2V0TmFtZSgpIT1udWxsICYmIGNvbXBvbmVudC5nZXROYW1lKCkubGVuZ3RoKCk+MCkgeworCQkJCQkJZGVwbG95bWVudE5hbWUgPSBjb21wb25lbnQuZ2V0TmFtZSgpOworCQkJCQkJcmV0dXJuIGRlcGxveW1lbnROYW1lOworCQkJCQl9CiAJCQkJfQogCQkJfQogCQl9IGZpbmFsbHkgewogCQkJaWYoY29yZSAhPSBudWxsKQogCQkJCWNvcmUuZGlzcG9zZSgpOwogCQl9Ci0JCXJldHVybiBnZXRQcm9qZWN0KCkuZ2V0TmFtZSgpOworCQlkZXBsb3ltZW50TmFtZSA9IGdldFByb2plY3QoKS5nZXROYW1lKCk7CisJCXJldHVybiBkZXBsb3ltZW50TmFtZTsKIAl9CiAJCiAJcHVibGljIGJvb2xlYW4gZXhpc3RzKCkgeyAKQEAgLTk2LDggKzE5MCwxMyBAQAogCQogCiAJcHVibGljIFByb3BlcnRpZXMgZ2V0TWV0YVByb3BlcnRpZXMoKSB7CisJCWlmKG1ldGFQcm9wZXJ0aWVzICE9IG51bGwpIHsKKwkJCXJldHVybiBtZXRhUHJvcGVydGllczsKKwkJfQorCQkKICAgICAgICAgU3RydWN0dXJlRWRpdCBjb3JlID0gbnVsbDsKICAgICAgICAgUHJvcGVydGllcyBwcm9wcyA9IG5ldyBQcm9wZXJ0aWVzKCk7CisgICAgICAgIG1ldGFQcm9wZXJ0aWVzID0gcHJvcHM7CiAgICAgICAgIHRyeSB7CiAgICAgICAgICAgICBjb3JlID0gU3RydWN0dXJlRWRpdC5nZXRTdHJ1Y3R1cmVFZGl0Rm9yUmVhZChnZXRQcm9qZWN0KCkpOwogICAgICAgICAgICAgaWYgKGNvcmUgPT0gbnVsbCkKQEAgLTExOCw3ICsyMTcsOCBAQAogICAgICAgICAgICAgICAgICAgICBwcm9wcy5zZXRQcm9wZXJ0eShuYW1lLCB2YWx1ZSk7CiAgICAgICAgICAgICAgICAgfQogICAgICAgICAgICAgfQotICAgICAgICAgICAgcmV0dXJuIHByb3BzOyAKKyAgICAgICAgICAgIG1ldGFQcm9wZXJ0aWVzID0gIHByb3BzOyAKKyAgICAgICAgICAgIHJldHVybiBwcm9wczsKICAgICAgICAgfSBmaW5hbGx5IHsKICAgICAgICAgICAgIGlmKGNvcmUgIT0gbnVsbCkKICAgICAgICAgICAgICAgICBjb3JlLmRpc3Bvc2UoKTsKQEAgLTE0OSw2ICsyNDksNyBAQAogCQkgICAgICAgICAgICAvLyBBZGQgbmV3IHByb3BlcnR5CiAJCSAgICAgICAgICAgIHByb3BMaXN0LmFkZChwcm9wKTsKIAkJICAgICAgICAgfQorCQkgICAgICAgIGNsZWFyQ2FjaGUoKTsKIAkJCX0gCiAgICAgICAgIH0gZmluYWxseSB7CiAgICAgICAgICAgICBpZihjb3JlICE9IG51bGwpewpAQCAtMTY0LDYgKzI2NSw3IEBACiAgICAgICAgICAgICBjb3JlID0gU3RydWN0dXJlRWRpdC5nZXRTdHJ1Y3R1cmVFZGl0Rm9yV3JpdGUoZ2V0UHJvamVjdCgpKTsKICAgICAgICAgICAgIFdvcmtiZW5jaENvbXBvbmVudCBjb21wb25lbnQgPSBjb3JlLmdldENvbXBvbmVudCgpOyAKICAgICAgICAgICAgIGNvbXBvbmVudC5nZXRQcm9wZXJ0aWVzKCkuY2xlYXIoKTsKKyAgICAgICAgICAgIGNsZWFyQ2FjaGUoKTsKICAgICAgICAgfSBmaW5hbGx5IHsKICAgICAgICAgICAgIGlmKGNvcmUgIT0gbnVsbCl7CiAgICAgICAgICAgICAJY29yZS5zYXZlSWZOZWNlc3NhcnkobnVsbCk7CkBAIC0xOTEsNyArMjkzLDcgQEAKIAkJCXByb3Auc2V0TmFtZShrZXkpOwogCQkJcHJvcC5zZXRWYWx1ZSh2YWx1ZSk7CiAJCQljb21wb25lbnQuZ2V0UHJvcGVydGllcygpLmFkZChwcm9wKTsKLSAgICAgICAgICAgIAorCQkJY2xlYXJDYWNoZSgpOyAgICAgICAgICAgIAogICAgICAgICB9IGZpbmFsbHkgewogICAgICAgICAgICAgaWYoY29yZSAhPSBudWxsKXsKICAgICAgICAgICAgIAljb3JlLnNhdmVJZk5lY2Vzc2FyeShudWxsKTsKQEAgLTIwMSw2ICszMDMsOSBAQAogCX0KIAkKIAlwdWJsaWMgSVBhdGhbXSBnZXRNZXRhUmVzb3VyY2VzKCkgeworCQlpZihjYWNoZU1ldGFSZXNvdXJjZXMgIT0gbnVsbCkKKwkJCXJldHVybiBjYWNoZU1ldGFSZXNvdXJjZXM7CisJCQogCQlTdHJ1Y3R1cmVFZGl0IG1vZHVsZUNvcmUgPSBudWxsOwogCQlMaXN0IG1ldGFSZXNvdXJjZXMgPSBuZXcgQXJyYXlMaXN0KCk7CiAJCXRyeSB7CkBAIC0yMTUsNyArMzIwLDggQEAKIAkJCQltb2R1bGVDb3JlLmRpc3Bvc2UoKTsKIAkJCX0KIAkJfQotCQlyZXR1cm4gKElQYXRoW10pIG1ldGFSZXNvdXJjZXMudG9BcnJheShuZXcgSVBhdGhbbWV0YVJlc291cmNlcy5zaXplKCldKTsKKwkJY2FjaGVNZXRhUmVzb3VyY2VzID0gKElQYXRoW10pIG1ldGFSZXNvdXJjZXMudG9BcnJheShuZXcgSVBhdGhbbWV0YVJlc291cmNlcy5zaXplKCldKTsKKwkJcmV0dXJuIGNhY2hlTWV0YVJlc291cmNlczsKIAl9CiAKIAlwdWJsaWMgdm9pZCBzZXRNZXRhUmVzb3VyY2VzKElQYXRoW10gdGhlTWV0YVJlc291cmNlUGF0aHMpIHsKQEAgLTIyOCw2ICszMzQsNyBAQAogCQkJCQlpZiAoIWNvbXBvbmVudC5nZXRNZXRhZGF0YVJlc291cmNlcygpLmNvbnRhaW5zKHRoZU1ldGFSZXNvdXJjZVBhdGhzW2ldKSkKIAkJCQkJCWNvbXBvbmVudC5nZXRNZXRhZGF0YVJlc291cmNlcygpLmFkZCh0aGVNZXRhUmVzb3VyY2VQYXRoc1tpXSk7CiAJCQkJfQorCQkJCWNsZWFyQ2FjaGUoKTsKIAkJCX0KIAkJfSBmaW5hbGx5IHsKIAkJCWlmIChtb2R1bGVDb3JlICE9IG51bGwpIHsKQEAgLTI2Niw4ICszNzMsNTEgQEAKIAkJCX0KIAkJfQogCX0JCisJCisJLyoqCisJICogUmV0dXJucyBhIHJhdyBsaXN0IG9mIHJlZmVyZW5jZXMgZXhhY3RseSBhcyBkZWZpbmVkIGluCisJICogLnNldHRpbmdzL29yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50CisJICogCisJICogQHJldHVybgorCSAqLworCXB1YmxpYyBmaW5hbCBJVmlydHVhbFJlZmVyZW5jZVtdIGdldFJhd1JlZmVyZW5jZXMoKSB7CisJCWlmIChyYXdSZWZlcmVuY2VzQXJyYXkgIT0gbnVsbCkgeworCQkJcmV0dXJuIHJhd1JlZmVyZW5jZXNBcnJheTsKKwkJfQorCQlTdHJ1Y3R1cmVFZGl0IGNvcmUgPSBudWxsOworCQlMaXN0IHJlZmVyZW5jZXMgPSBuZXcgQXJyYXlMaXN0KCk7CisJCXRyeSB7CisJCQljb3JlID0gU3RydWN0dXJlRWRpdC5nZXRTdHJ1Y3R1cmVFZGl0Rm9yUmVhZChnZXRQcm9qZWN0KCkpOworCQkJaWYgKGNvcmUgIT0gbnVsbCAmJiBjb3JlLmdldENvbXBvbmVudCgpICE9IG51bGwpIHsKKwkJCQlXb3JrYmVuY2hDb21wb25lbnQgY29tcG9uZW50ID0gY29yZS5nZXRDb21wb25lbnQoKTsKKwkJCQlpZiAoY29tcG9uZW50ICE9IG51bGwpIHsKKwkJCQkJTGlzdCByZWZlcmVuY2VkQ29tcG9uZW50cyA9IGNvbXBvbmVudC5nZXRSZWZlcmVuY2VkQ29tcG9uZW50cygpOworCQkJCQlmb3IgKEl0ZXJhdG9yIGl0ZXIgPSByZWZlcmVuY2VkQ29tcG9uZW50cy5pdGVyYXRvcigpOyBpdGVyLmhhc05leHQoKTspIHsKKwkJCQkJCVJlZmVyZW5jZWRDb21wb25lbnQgcmVmZXJlbmNlZENvbXBvbmVudCA9IChSZWZlcmVuY2VkQ29tcG9uZW50KSBpdGVyLm5leHQoKTsKKwkJCQkJCWlmIChyZWZlcmVuY2VkQ29tcG9uZW50ID09IG51bGwpIHsKKwkJCQkJCQljb250aW51ZTsKKwkJCQkJCX0KKwkJCQkJCUlWaXJ0dWFsUmVmZXJlbmNlIHZSZWZlcmVuY2UgPSBTdHJ1Y3R1cmVFZGl0LmNyZWF0ZVZpcnR1YWxSZWZlcmVuY2UodGhpcywgcmVmZXJlbmNlZENvbXBvbmVudCk7CisJCQkJCQlpZiAodlJlZmVyZW5jZSAhPSBudWxsICYmIHZSZWZlcmVuY2UuZ2V0UmVmZXJlbmNlZENvbXBvbmVudCgpICE9IG51bGwgJiYgdlJlZmVyZW5jZS5nZXRSZWZlcmVuY2VkQ29tcG9uZW50KCkuZXhpc3RzKCkpIHsKKwkJCQkJCQlyZWZlcmVuY2VzLmFkZCh2UmVmZXJlbmNlKTsKKwkJCQkJCX0KKwkJCQkJfQorCQkJCX0KKwkJCX0KKwkJCXJhd1JlZmVyZW5jZXNBcnJheSA9IChJVmlydHVhbFJlZmVyZW5jZVtdKSByZWZlcmVuY2VzLnRvQXJyYXkobmV3IElWaXJ0dWFsUmVmZXJlbmNlW3JlZmVyZW5jZXMuc2l6ZSgpXSk7CisJCQlyZXR1cm4gcmF3UmVmZXJlbmNlc0FycmF5OworCQl9IGZpbmFsbHkgeworCQkJaWYgKGNvcmUgIT0gbnVsbCkgeworCQkJCWNvcmUuZGlzcG9zZSgpOworCQkJfQorCQl9CisJfQorCQogCi0JcHVibGljIElWaXJ0dWFsUmVmZXJlbmNlW10gZ2V0UmVmZXJlbmNlcygpIHsgCisJcHVibGljIElWaXJ0dWFsUmVmZXJlbmNlW10gZ2V0UmVmZXJlbmNlcyhNYXA8U3RyaW5nLCBPYmplY3Q+IG9wdGlvbnMpIHsKKwkJaWYocmVmZXJlbmNlc0FycmF5ICE9IG51bGwpIHsKKwkJCXJldHVybiByZWZlcmVuY2VzQXJyYXk7CisJCX0KIAkJU3RydWN0dXJlRWRpdCBjb3JlID0gbnVsbDsKIAkJTGlzdCByZWZlcmVuY2VzID0gbmV3IEFycmF5TGlzdCgpOwogCQl0cnkgewpAQCAtMjgxLDIwICs0MzEsMjkgQEAKIAkJCQkJCWlmIChyZWZlcmVuY2VkQ29tcG9uZW50PT1udWxsKSAKIAkJCQkJCQljb250aW51ZTsKIAkJCQkJCUlWaXJ0dWFsUmVmZXJlbmNlIHZSZWZlcmVuY2UgPSBTdHJ1Y3R1cmVFZGl0LmNyZWF0ZVZpcnR1YWxSZWZlcmVuY2UodGhpcywgcmVmZXJlbmNlZENvbXBvbmVudCk7Ci0JCQkJCQlpZiggdlJlZmVyZW5jZSAhPSBudWxsICl7Ci0JCQkJCQkJdlJlZmVyZW5jZS5zZXRBcmNoaXZlTmFtZSggcmVmZXJlbmNlZENvbXBvbmVudC5nZXRBcmNoaXZlTmFtZSgpICk7Ci0JCQkJCQl9Ci0JCQkJCQlpZiAodlJlZmVyZW5jZSAhPSBudWxsICYmIHZSZWZlcmVuY2UuZ2V0UmVmZXJlbmNlZENvbXBvbmVudCgpICE9IG51bGwgJiYgdlJlZmVyZW5jZS5nZXRSZWZlcmVuY2VkQ29tcG9uZW50KCkuZXhpc3RzKCkpCisJCQkJCQlpZiAodlJlZmVyZW5jZSAhPSBudWxsICYmIHZSZWZlcmVuY2UuZ2V0UmVmZXJlbmNlZENvbXBvbmVudCgpICE9IG51bGwgJiYgdlJlZmVyZW5jZS5nZXRSZWZlcmVuY2VkQ29tcG9uZW50KCkuZXhpc3RzKCkpewogCQkJCQkJCXJlZmVyZW5jZXMuYWRkKHZSZWZlcmVuY2UpOyAKKwkJCQkJCQljdXN0b21pemVDcmVhdGVkUmVmZXJlbmNlKHZSZWZlcmVuY2UsIHJlZmVyZW5jZWRDb21wb25lbnQpOworCQkJCQkJfQogCQkJCQl9CiAJCQkJfQogCQkJfQotCQkJcmV0dXJuIChJVmlydHVhbFJlZmVyZW5jZVtdKSByZWZlcmVuY2VzLnRvQXJyYXkobmV3IElWaXJ0dWFsUmVmZXJlbmNlW3JlZmVyZW5jZXMuc2l6ZSgpXSk7CisJCQlyZWZlcmVuY2VzQXJyYXkgPSAoSVZpcnR1YWxSZWZlcmVuY2VbXSkgcmVmZXJlbmNlcy50b0FycmF5KG5ldyBJVmlydHVhbFJlZmVyZW5jZVtyZWZlcmVuY2VzLnNpemUoKV0pOworCQkJcmV0dXJuIHJlZmVyZW5jZXNBcnJheTsKIAkJfSBmaW5hbGx5IHsKIAkJCWlmKGNvcmUgIT0gbnVsbCkKIAkJCQljb3JlLmRpc3Bvc2UoKTsKIAkJfQkJCiAJfQorCQorCXByb3RlY3RlZCB2b2lkIGN1c3RvbWl6ZUNyZWF0ZWRSZWZlcmVuY2UoSVZpcnR1YWxSZWZlcmVuY2UgcmVmZXJlbmNlLCBPYmplY3QgZGVwZW5kZW50T2JqZWN0KSB7CisJCS8vIERvIE5vdGhpbmcKKwl9CisJCisJcHVibGljIElWaXJ0dWFsUmVmZXJlbmNlW10gZ2V0UmVmZXJlbmNlcygpIHsgCisJCUhhc2hNYXA8U3RyaW5nLCBPYmplY3Q+IG1hcCA9IG5ldyBIYXNoTWFwPFN0cmluZywgT2JqZWN0PigpOworCQlyZXR1cm4gZ2V0UmVmZXJlbmNlcyhtYXApOworCX0KIAogCXB1YmxpYyB2b2lkIGFkZFJlZmVyZW5jZXMoSVZpcnR1YWxSZWZlcmVuY2VbXSByZWZlcmVuY2VzKSB7CiAJCWlmIChyZWZlcmVuY2VzPT1udWxsIHx8IHJlZmVyZW5jZXMubGVuZ3RoPT0wKQpAQCAtMzA0LDI4ICs0NjMsMTggQEAKIAkJCWNvcmUgPSBTdHJ1Y3R1cmVFZGl0LmdldFN0cnVjdHVyZUVkaXRGb3JXcml0ZShnZXRQcm9qZWN0KCkpOwogCQkJaWYgKGNvcmUgPT0gbnVsbCkKIAkJCQlyZXR1cm47CisJCQljbGVhckNhY2hlKCk7CiAJCQlXb3JrYmVuY2hDb21wb25lbnQgY29tcG9uZW50ID0gY29yZS5nZXRDb21wb25lbnQoKTsKIAkJCVJlZmVyZW5jZWRDb21wb25lbnQgcmVmZXJlbmNlZENvbXBvbmVudCA9IG51bGw7CiAJCQlDb21wb25lbnRjb3JlRmFjdG9yeSBmYWN0b3J5ID0gQ29tcG9uZW50Y29yZVBhY2thZ2UuZUlOU1RBTkNFLmdldENvbXBvbmVudGNvcmVGYWN0b3J5KCk7CisJCQlJUmVmZXJlbmNlUmVzb2x2ZXIgcmVzb2x2ZXIgPSBudWxsOwogCQkJZm9yIChpbnQgaT0wOyBpPHJlZmVyZW5jZXMubGVuZ3RoOyBpKyspIHsKIAkJCQlpZiAocmVmZXJlbmNlc1tpXSA9PSBudWxsKQogCQkJCQljb250aW51ZTsKLQkJCQlyZWZlcmVuY2VkQ29tcG9uZW50ID0gZmFjdG9yeS5jcmVhdGVSZWZlcmVuY2VkQ29tcG9uZW50KCk7CQkJCQotCQkJCXJlZmVyZW5jZWRDb21wb25lbnQuc2V0RGVwZW5kZW5jeVR5cGUoRGVwZW5kZW5jeVR5cGUuZ2V0KHJlZmVyZW5jZXNbaV0uZ2V0RGVwZW5kZW5jeVR5cGUoKSkpOwotCQkJCXJlZmVyZW5jZWRDb21wb25lbnQuc2V0UnVudGltZVBhdGgocmVmZXJlbmNlc1tpXS5nZXRSdW50aW1lUGF0aCgpKTsKLQotCQkJCUlWaXJ0dWFsQ29tcG9uZW50IGNvbXAgPSByZWZlcmVuY2VzW2ldLmdldFJlZmVyZW5jZWRDb21wb25lbnQoKTsKLQkJCQlpZihjb21wIT1udWxsICYmICFjb21wLmlzQmluYXJ5KCkpCi0JCQkJCXJlZmVyZW5jZWRDb21wb25lbnQuc2V0SGFuZGxlKE1vZHVsZVVSSVV0aWwuZnVsbHlRdWFsaWZ5VVJJKGNvbXAuZ2V0UHJvamVjdCgpKSk7Ci0JCQkJZWxzZSBpZiAoY29tcCE9bnVsbCkKLQkJCQkJcmVmZXJlbmNlZENvbXBvbmVudC5zZXRIYW5kbGUoTW9kdWxlVVJJVXRpbC5hcmNoaXZlQ29tcG9uZW50ZnVsbHlRdWFsaWZ5VVJJKGNvbXAuZ2V0TmFtZSgpKSk7CisJCQkJcmVzb2x2ZXIgPSBSZWZlcmVuY2VSZXNvbHZlclV0aWwuZ2V0RGVmYXVsdCgpLmdldFJlc29sdmVyKHJlZmVyZW5jZXNbaV0pOworCQkJCXJlZmVyZW5jZWRDb21wb25lbnQgPSByZXNvbHZlci5yZXNvbHZlKHJlZmVyZW5jZXNbaV0pOwogCQkJCWlmIChjb21wb25lbnQgIT0gbnVsbCkKIAkJCQkJY29tcG9uZW50LmdldFJlZmVyZW5jZWRDb21wb25lbnRzKCkuYWRkKHJlZmVyZW5jZWRDb21wb25lbnQpOwotCQkJCXJlZmVyZW5jZWRDb21wb25lbnQuc2V0QXJjaGl2ZU5hbWUocmVmZXJlbmNlc1tpXS5nZXRBcmNoaXZlTmFtZSgpKTsKLQkJCX0KLQkJCS8vY2xlYW4gdXAgYW55IG9sZCBvYnNvbGV0ZSByZWZlcmVuY2VzCi0JCQlpZiAoY29tcG9uZW50ICE9IG51bGwpewotCQkJCWNsZWFuVXBSZWZlcmVuY2VzKGNvbXBvbmVudCk7CiAJCQl9CiAJCX0gZmluYWxseSB7CiAJCQlpZihjb3JlICE9IG51bGwpIHsKQEAgLTMzNSw0MSArNDg0LDIyIEBACiAJCX0JCiAJfQogCQotCXByaXZhdGUgdm9pZCBjbGVhblVwUmVmZXJlbmNlcyhXb3JrYmVuY2hDb21wb25lbnQgY29tcG9uZW50KSB7Ci0JCUxpc3QgcmVmZXJlbmNlZENvbXBvbmVudHMgPSBjb21wb25lbnQuZ2V0UmVmZXJlbmNlZENvbXBvbmVudHMoKTsKLQkJZm9yIChJdGVyYXRvciBpdGVyID0gcmVmZXJlbmNlZENvbXBvbmVudHMuaXRlcmF0b3IoKTsgaXRlci5oYXNOZXh0KCk7KSB7Ci0JCQlSZWZlcmVuY2VkQ29tcG9uZW50IHJlZmVyZW5jZWRDb21wb25lbnQgPSAoUmVmZXJlbmNlZENvbXBvbmVudCkgaXRlci5uZXh0KCk7Ci0JCQlpZiAocmVmZXJlbmNlZENvbXBvbmVudD09bnVsbCkgCi0JCQkJY29udGludWU7Ci0JCQlJVmlydHVhbFJlZmVyZW5jZSB2UmVmZXJlbmNlID0gU3RydWN0dXJlRWRpdC5jcmVhdGVWaXJ0dWFsUmVmZXJlbmNlKHRoaXMsIHJlZmVyZW5jZWRDb21wb25lbnQpOwotCQkJaWYgKHZSZWZlcmVuY2UgPT0gbnVsbCB8fCB2UmVmZXJlbmNlLmdldFJlZmVyZW5jZWRDb21wb25lbnQoKSA9PSBudWxsIHx8ICF2UmVmZXJlbmNlLmdldFJlZmVyZW5jZWRDb21wb25lbnQoKS5leGlzdHMoKSl7Ci0JCQkJaXRlci5yZW1vdmUoKTsKLQkJCX0KLQkJfQotCX0KLQkKIAlwdWJsaWMgdm9pZCBzZXRSZWZlcmVuY2VzKElWaXJ0dWFsUmVmZXJlbmNlW10gcmVmZXJlbmNlcykgeyAKIAkJU3RydWN0dXJlRWRpdCBjb3JlID0gbnVsbDsKIAkJdHJ5IHsKIAkJCWNvcmUgPSBTdHJ1Y3R1cmVFZGl0LmdldFN0cnVjdHVyZUVkaXRGb3JXcml0ZShnZXRQcm9qZWN0KCkpOwogCQkJV29ya2JlbmNoQ29tcG9uZW50IGNvbXBvbmVudCA9IGNvcmUuZ2V0Q29tcG9uZW50KCk7CiAJCQlSZWZlcmVuY2VkQ29tcG9uZW50IHJlZmVyZW5jZWRDb21wb25lbnQgPSBudWxsOwotCQkJICAKKwkJCSAKKwkJCWNsZWFyQ2FjaGUoKTsKIAkJCWNvbXBvbmVudC5nZXRSZWZlcmVuY2VkQ29tcG9uZW50cygpLmNsZWFyKCk7CiAJCQlDb21wb25lbnRjb3JlRmFjdG9yeSBmYWN0b3J5ID0gQ29tcG9uZW50Y29yZVBhY2thZ2UuZUlOU1RBTkNFLmdldENvbXBvbmVudGNvcmVGYWN0b3J5KCk7CisJCQlJUmVmZXJlbmNlUmVzb2x2ZXIgcmVzb2x2ZXIgPSBudWxsOwogCQkJZm9yIChpbnQgaT0wOyBpPHJlZmVyZW5jZXMubGVuZ3RoOyBpKyspIHsKLQkJCQlyZWZlcmVuY2VkQ29tcG9uZW50ID0gZmFjdG9yeS5jcmVhdGVSZWZlcmVuY2VkQ29tcG9uZW50KCk7CQkJCQotCQkJCXJlZmVyZW5jZWRDb21wb25lbnQuc2V0RGVwZW5kZW5jeVR5cGUoRGVwZW5kZW5jeVR5cGUuZ2V0KHJlZmVyZW5jZXNbaV0uZ2V0RGVwZW5kZW5jeVR5cGUoKSkpOwotCQkJCXJlZmVyZW5jZWRDb21wb25lbnQuc2V0UnVudGltZVBhdGgocmVmZXJlbmNlc1tpXS5nZXRSdW50aW1lUGF0aCgpKTsKLQotCQkJCUlWaXJ0dWFsQ29tcG9uZW50IGNvbXAgPSByZWZlcmVuY2VzW2ldLmdldFJlZmVyZW5jZWRDb21wb25lbnQoKTsKLQkJCQlpZiggIWNvbXAuaXNCaW5hcnkoKSkKLQkJCQkJcmVmZXJlbmNlZENvbXBvbmVudC5zZXRIYW5kbGUoTW9kdWxlVVJJVXRpbC5mdWxseVF1YWxpZnlVUkkocmVmZXJlbmNlc1tpXS5nZXRSZWZlcmVuY2VkQ29tcG9uZW50KCkuZ2V0UHJvamVjdCgpKSk7Ci0JCQkJZWxzZQotCQkJCQlyZWZlcmVuY2VkQ29tcG9uZW50LnNldEhhbmRsZShNb2R1bGVVUklVdGlsLmFyY2hpdmVDb21wb25lbnRmdWxseVF1YWxpZnlVUkkocmVmZXJlbmNlc1tpXS5nZXRSZWZlcmVuY2VkQ29tcG9uZW50KCkuZ2V0TmFtZSgpKSk7Ci0JCQkJCi0JCQkJcmVmZXJlbmNlZENvbXBvbmVudC5zZXRBcmNoaXZlTmFtZShyZWZlcmVuY2VzW2ldLmdldEFyY2hpdmVOYW1lKCkpOwotCQkJCWNvbXBvbmVudC5nZXRSZWZlcmVuY2VkQ29tcG9uZW50cygpLmFkZChyZWZlcmVuY2VkQ29tcG9uZW50KTsKKwkJCQlyZXNvbHZlciA9IFJlZmVyZW5jZVJlc29sdmVyVXRpbC5nZXREZWZhdWx0KCkuZ2V0UmVzb2x2ZXIocmVmZXJlbmNlc1tpXSk7CisJCQkJcmVmZXJlbmNlZENvbXBvbmVudCA9IHJlc29sdmVyLnJlc29sdmUocmVmZXJlbmNlc1tpXSk7CisJCQkJaWYoIHJlZmVyZW5jZWRDb21wb25lbnQgIT0gbnVsbCkKKwkJCQkJY29tcG9uZW50LmdldFJlZmVyZW5jZWRDb21wb25lbnRzKCkuYWRkKHJlZmVyZW5jZWRDb21wb25lbnQpOwogCQkJfQogCQkJIAogCQl9IGZpbmFsbHkgewpAQCAtMzgxLDYgKzUxMSw3IEBACiAJfQogCiAJcHVibGljIGludCBoYXNoQ29kZSgpIHsKKwkJaWYoY29tcG9uZW50UHJvamVjdCA9PSBudWxsKSByZXR1cm4gc3VwZXIuaGFzaENvZGUoKTsgIC8vSWYgY29tcG9uZW50IGZhY3RvcnkgaW5zdGFuY2UsIGRvbid0IHVzZSBwcm9qZWN0IHRvIGhhc2gKIAkJaW50IGhhc2ggPSBIYXNoVXRpbC5TRUVEOwogCQloYXNoID0gSGFzaFV0aWwuaGFzaChoYXNoLCBnZXRQcm9qZWN0KCkuZ2V0TmFtZSgpKTsKIAkJaGFzaCA9IEhhc2hVdGlsLmhhc2goaGFzaCwgZ2V0TmFtZSgpKTsKQEAgLTM4OCw3ICs1MTksOSBAQAogCQlyZXR1cm4gaGFzaDsKIAl9CiAJCi0JcHVibGljIGJvb2xlYW4gZXF1YWxzKE9iamVjdCBhbk90aGVyKSB7IAorCXB1YmxpYyBib29sZWFuIGVxdWFscyhPYmplY3QgYW5PdGhlcikgeworCQlpZihjb21wb25lbnRQcm9qZWN0ID09IG51bGwpIHJldHVybiBzdXBlci5lcXVhbHMoYW5PdGhlcik7ICAvL0lmIGNvbXBvbmVudCBmYWN0b3J5IGluc3RhbmNlLCBkb24ndCB1c2UgcHJvamVjdCB0byBjb21wYXJlCisJCWlmKGFuT3RoZXIgPT0gdGhpcykgcmV0dXJuIHRydWU7CiAJCWlmKGFuT3RoZXIgaW5zdGFuY2VvZiBJVmlydHVhbENvbXBvbmVudCkgewogCQkJSVZpcnR1YWxDb21wb25lbnQgb3RoZXJDb21wb25lbnQgPSAoSVZpcnR1YWxDb21wb25lbnQpIGFuT3RoZXI7CiAJCQlyZXR1cm4gZ2V0UHJvamVjdCgpLmVxdWFscyhvdGhlckNvbXBvbmVudC5nZXRQcm9qZWN0KCkpICYmIApAQCAtMzk5LDEyICs1MzIsMjAgQEAKIAl9CiAKIAlwdWJsaWMgSVZpcnR1YWxSZWZlcmVuY2UgZ2V0UmVmZXJlbmNlKFN0cmluZyBhQ29tcG9uZW50TmFtZSkgeworCQlpZihyZWZlcmVuY2VNYXAgPT0gbnVsbCl7CisJCQlyZWZlcmVuY2VNYXAgPSBuZXcgSGFzaHRhYmxlPFN0cmluZywgSVZpcnR1YWxSZWZlcmVuY2U+KCk7CisJCX0gZWxzZSBpZihyZWZlcmVuY2VNYXAuY29udGFpbnNLZXkoYUNvbXBvbmVudE5hbWUpKSB7CisJCQlyZXR1cm4gKElWaXJ0dWFsUmVmZXJlbmNlKSByZWZlcmVuY2VNYXAuZ2V0KGFDb21wb25lbnROYW1lKTsKKwkJfQorCQkKIAkJSVZpcnR1YWxSZWZlcmVuY2VbXSByZWZzID0gZ2V0UmVmZXJlbmNlcygpOwogCQlmb3IgKGludCBpID0gMDsgaSA8IHJlZnMubGVuZ3RoOyBpKyspIHsKIAkJCUlWaXJ0dWFsUmVmZXJlbmNlIHJlZmVyZW5jZSA9IHJlZnNbaV07CiAJCQlpZiggcmVmZXJlbmNlLmdldFJlZmVyZW5jZWRDb21wb25lbnQoKSAhPSBudWxsICl7Ci0JCQkJaWYgKHJlZmVyZW5jZS5nZXRSZWZlcmVuY2VkQ29tcG9uZW50KCkuZ2V0TmFtZSgpLmVxdWFscyhhQ29tcG9uZW50TmFtZSkpCisJCQkJaWYgKHJlZmVyZW5jZS5nZXRSZWZlcmVuY2VkQ29tcG9uZW50KCkuZ2V0TmFtZSgpLmVxdWFscyhhQ29tcG9uZW50TmFtZSkpIHsKKwkJCQkJcmVmZXJlbmNlTWFwLnB1dChhQ29tcG9uZW50TmFtZSwgcmVmZXJlbmNlKTsKIAkJCQkJcmV0dXJuIHJlZmVyZW5jZTsKKwkJCQl9CiAJCQl9CiAJCX0KIAkJcmV0dXJuIG51bGw7CkBAIC00MjksMTAgKzU3MCwxMSBAQAogCSAqIEByZXR1cm4gYXJyYXkgb2YgY29tcG9uZW50cwogCSAqLwogCXB1YmxpYyBJVmlydHVhbENvbXBvbmVudFtdIGdldFJlZmVyZW5jaW5nQ29tcG9uZW50cygpIHsKLQkJSVByb2plY3RbXSBoYW5kbGVzID0gIERlcGVuZGVuY3lHcmFwaE1hbmFnZXIuZ2V0SW5zdGFuY2UoKS5nZXREZXBlbmRlbmN5R3JhcGgoKS5nZXRSZWZlcmVuY2luZ0NvbXBvbmVudHMoZ2V0UHJvamVjdCgpKTsKLQkJSVZpcnR1YWxDb21wb25lbnRbXSByZXN1bHQgPSBuZXcgSVZpcnR1YWxDb21wb25lbnRbaGFuZGxlcy5sZW5ndGhdOwotCQlmb3IgKGludCBpPTA7IGk8aGFuZGxlcy5sZW5ndGg7IGkrKykKLQkJCXJlc3VsdFtpXSA9IENvbXBvbmVudENvcmUuY3JlYXRlQ29tcG9uZW50KGhhbmRsZXNbaV0pOworCQlTZXQ8SVByb2plY3Q+IHByb2plY3RzID0gSURlcGVuZGVuY3lHcmFwaC5JTlNUQU5DRS5nZXRSZWZlcmVuY2luZ0NvbXBvbmVudHMoZ2V0UHJvamVjdCgpKTsKKwkJSVZpcnR1YWxDb21wb25lbnRbXSByZXN1bHQgPSBuZXcgSVZpcnR1YWxDb21wb25lbnRbcHJvamVjdHMuc2l6ZSgpXTsKKwkJSXRlcmF0b3I8SVByb2plY3Q+IGkgPSBwcm9qZWN0cy5pdGVyYXRvcigpOworCQlmb3IgKGludCBqPTA7IGo8cHJvamVjdHMuc2l6ZSgpOyBqKyspCisJCQlyZXN1bHRbal0gPSBDb21wb25lbnRDb3JlLmNyZWF0ZUNvbXBvbmVudChpLm5leHQoKSk7CiAJCXJldHVybiByZXN1bHQ7CiAJfQogCQpAQCAtNDQ1LDEzICs1ODcsMTggQEAKIAlwdWJsaWMgdm9pZCByZW1vdmVSZWZlcmVuY2UoSVZpcnR1YWxSZWZlcmVuY2UgYVJlZmVyZW5jZSkgewogCQlTdHJ1Y3R1cmVFZGl0IGNvcmUgPSBudWxsOwogCQl0cnkgewotCQkJY29yZSA9IFN0cnVjdHVyZUVkaXQuZ2V0U3RydWN0dXJlRWRpdEZvcldyaXRlKGdldFByb2plY3QoKSk7Ci0JCQlpZiAoY29yZSA9PSBudWxsIHx8IGFSZWZlcmVuY2UgPT0gbnVsbCkKKwkJCWlmKGFSZWZlcmVuY2UgPT0gbnVsbCkKIAkJCQlyZXR1cm47CisJCQljb3JlID0gU3RydWN0dXJlRWRpdC5nZXRTdHJ1Y3R1cmVFZGl0Rm9yV3JpdGUoZ2V0UHJvamVjdCgpKTsKKwkJCWlmIChjb3JlID09IG51bGwpIHsKKwkJCQlyZXR1cm47CisJCQl9CisJCQljbGVhckNhY2hlKCk7CiAJCQlXb3JrYmVuY2hDb21wb25lbnQgY29tcG9uZW50ID0gY29yZS5nZXRDb21wb25lbnQoKTsKIAkJCVJlZmVyZW5jZWRDb21wb25lbnQgcmVmQ29tcG9uZW50ID0gZ2V0V29ya2JlbmNoUmVmZXJlbmNlZENvbXBvbmVudChhUmVmZXJlbmNlLCBjb21wb25lbnQpOwotCQkJaWYgKGNvbXBvbmVudCAhPSBudWxsICYmIHJlZkNvbXBvbmVudCAhPSBudWxsKQorCQkJaWYgKGNvbXBvbmVudCAhPSBudWxsICYmIHJlZkNvbXBvbmVudCAhPSBudWxsKSB7CiAJCQkJY29tcG9uZW50LmdldFJlZmVyZW5jZWRDb21wb25lbnRzKCkucmVtb3ZlKHJlZkNvbXBvbmVudCk7CisJCQl9CiAJCX0gZmluYWxseSB7CiAJCQlpZihjb3JlICE9IG51bGwpIHsKIAkJCQljb3JlLnNhdmVJZk5lY2Vzc2FyeShudWxsKTsKQEAgLTQ3MiwyNSArNjE5LDI2IEBACiAJCWlmIChhUmVmZXJlbmNlID09IG51bGwgfHwgYVJlZmVyZW5jZS5nZXRSZWZlcmVuY2VkQ29tcG9uZW50KCkgPT0gbnVsbCB8fCBjb21wb25lbnQgPT0gbnVsbCkKIAkJCXJldHVybiBudWxsOwogCQlMaXN0IHJlZmVyZW5jZWRDb21wb25lbnRzID0gY29tcG9uZW50LmdldFJlZmVyZW5jZWRDb21wb25lbnRzKCk7CisJCVVSSSB1cmkgPSBSZWZlcmVuY2VSZXNvbHZlclV0aWwuZ2V0RGVmYXVsdCgpLmdldFJlc29sdmVyKGFSZWZlcmVuY2UpLnJlc29sdmUoYVJlZmVyZW5jZSkuZ2V0SGFuZGxlKCk7IAogCQlmb3IgKGludCBpPTA7IGk8cmVmZXJlbmNlZENvbXBvbmVudHMuc2l6ZSgpOyBpKyspIHsKIAkJCVJlZmVyZW5jZWRDb21wb25lbnQgcmVmID0gKFJlZmVyZW5jZWRDb21wb25lbnQpIHJlZmVyZW5jZWRDb21wb25lbnRzLmdldChpKTsKLQkJCWlmICghYVJlZmVyZW5jZS5nZXRSZWZlcmVuY2VkQ29tcG9uZW50KCkuaXNCaW5hcnkoKSkgewotCQkJCWlmIChyZWYuZ2V0SGFuZGxlKCkuZXF1YWxzKE1vZHVsZVVSSVV0aWwuZnVsbHlRdWFsaWZ5VVJJKGFSZWZlcmVuY2UuZ2V0UmVmZXJlbmNlZENvbXBvbmVudCgpLmdldFByb2plY3QoKSkpKQotCQkJCQlyZXR1cm4gcmVmOwkKLQkJCX0gCi0JCQllbHNlIHsKLQkJCQlpZiAocmVmLmdldEhhbmRsZSgpLmVxdWFscyhNb2R1bGVVUklVdGlsLmFyY2hpdmVDb21wb25lbnRmdWxseVF1YWxpZnlVUkkoYVJlZmVyZW5jZS5nZXRSZWZlcmVuY2VkQ29tcG9uZW50KCkuZ2V0TmFtZSgpKSkpCi0JCQkJCXJldHVybiByZWY7Ci0JCQl9CQorCQkJaWYoIHJlZi5nZXRIYW5kbGUoKS5lcXVhbHModXJpKSkKKwkJCQlyZXR1cm4gcmVmOwogCQl9CiAJCXJldHVybiBudWxsOwogCX0KIAkKKwlwcm90ZWN0ZWQgYm9vbGVhbiBzaG91bGRDYWNoZVJlZmVyZW5jZXMoKSB7CisJCXJldHVybiB0cnVlOworCX0KIAkKIAkvKioKIAkgKiBAcmV0dXJuIElWaXJ0dWFsUmVmZXJlbmNlW10gLSBBbGwgdGhlIHJlZmVyZW5jZXMgb2YgdGhpcyBjb21wb25lbnQsIGluY2x1ZGluZyBwb3RlbnRpYWxseSBkZWxldGVkIHJlZmVyZW5jZXMKIAkgKi8KIAlwdWJsaWMgSVZpcnR1YWxSZWZlcmVuY2VbXSBnZXRBbGxSZWZlcmVuY2VzKCkgeyAKKwkJaWYoc2hvdWxkQ2FjaGVSZWZlcmVuY2VzKCkgJiYgYWxsUmVmZXJlbmNlcyAhPSBudWxsKQorCQkJcmV0dXJuIGFsbFJlZmVyZW5jZXM7CisJCQogCQlTdHJ1Y3R1cmVFZGl0IGNvcmUgPSBudWxsOwogCQlMaXN0IHJlZmVyZW5jZXMgPSBuZXcgQXJyYXlMaXN0KCk7CiAJCXRyeSB7CkBAIC01MTIsMTMgKzY2MCwzNSBAQAogCQkJCQl9CiAJCQkJfQogCQkJfQotCQkJcmV0dXJuIChJVmlydHVhbFJlZmVyZW5jZVtdKSByZWZlcmVuY2VzLnRvQXJyYXkobmV3IElWaXJ0dWFsUmVmZXJlbmNlW3JlZmVyZW5jZXMuc2l6ZSgpXSk7CisJCQlhbGxSZWZlcmVuY2VzID0gKElWaXJ0dWFsUmVmZXJlbmNlW10pIHJlZmVyZW5jZXMudG9BcnJheShuZXcgSVZpcnR1YWxSZWZlcmVuY2VbcmVmZXJlbmNlcy5zaXplKCldKTsKKwkJCXJldHVybiBhbGxSZWZlcmVuY2VzOwogCQl9IGZpbmFsbHkgewogCQkJaWYoY29yZSAhPSBudWxsKQogCQkJCWNvcmUuZGlzcG9zZSgpOwogCQl9CQkKIAl9CiAJCisJLyoqCisJICogVGhpcyBpcyBhbiBpbnRlcm5hbCBtZXRob2QgYW5kIHNob3VsZCBub3QgYmUgY2FsbGVkIGV4Y2VwdCBieSB0aGUgCisJICoge0BsaW5rIG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50LmludGVybmFsLmJ1aWxkZXIuRGVwZW5kZW5jeUdyYXBoSW1wbH0KKwkgKi8KKwlwdWJsaWMgdm9pZCBmbHVzaENhY2hlKCkgeworCQljbGVhckNhY2hlKCk7CisJfQorCQorCXByb3RlY3RlZCB2b2lkIGNsZWFyQ2FjaGUoKSB7CisJCW5hbWUgPSBudWxsOworCQlkZXBsb3ltZW50TmFtZSA9IG51bGw7CisJCWlmKHJlZmVyZW5jZU1hcCAhPSBudWxsKSB7CisJCQlyZWZlcmVuY2VNYXAuY2xlYXIoKTsKKwkJfQorCQlyYXdSZWZlcmVuY2VzQXJyYXkgPSBudWxsOworCQlyZWZlcmVuY2VzQXJyYXkgPSBudWxsOworCQltZXRhUHJvcGVydGllcyA9IG51bGw7CisJCWNhY2hlTWV0YVJlc291cmNlcyA9IG51bGw7CisJCWFsbFJlZmVyZW5jZXMgPSBudWxsOworCX0KKwkJCiAJcHVibGljIFN0cmluZyB0b1N0cmluZygpIHsKIAkJcmV0dXJuIGNvbXBvbmVudFByb2plY3QudG9TdHJpbmcoKTsKIAl9CmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS9tb2R1bGVjb3JlLXNyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2NvbXBvbmVudGNvcmUvaW50ZXJuYWwvcmVzb3VyY2VzL1ZpcnR1YWxDb250YWluZXIuamF2YSBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlL21vZHVsZWNvcmUtc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vY29tcG9uZW50Y29yZS9pbnRlcm5hbC9yZXNvdXJjZXMvVmlydHVhbENvbnRhaW5lci5qYXZhCmluZGV4IDUxZjRmMTUuLmI3NzVhY2EgMTAwNjQ0Ci0tLSBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlL21vZHVsZWNvcmUtc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vY29tcG9uZW50Y29yZS9pbnRlcm5hbC9yZXNvdXJjZXMvVmlydHVhbENvbnRhaW5lci5qYXZhCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlL21vZHVsZWNvcmUtc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vY29tcG9uZW50Y29yZS9pbnRlcm5hbC9yZXNvdXJjZXMvVmlydHVhbENvbnRhaW5lci5qYXZhCkBAIC03MiwyOSArNzIsMjkgQEAKIAl9CiAKIAlwdWJsaWMgSVZpcnR1YWxSZXNvdXJjZSBmaW5kTWVtYmVyKElQYXRoIGFQYXRoLCBpbnQgdGhlU2VhcmNoRmxhZ3MpIHsKLQogCQlTdHJ1Y3R1cmVFZGl0IHN0cnVjdHVyZUVkaXQgPSBudWxsOwogCQl0cnkgewotCiAJCQlzdHJ1Y3R1cmVFZGl0ID0gU3RydWN0dXJlRWRpdC5nZXRTdHJ1Y3R1cmVFZGl0Rm9yUmVhZChnZXRQcm9qZWN0KCkpOwotCQkJV29ya2JlbmNoQ29tcG9uZW50IGNvbXBvbmVudCA9IHN0cnVjdHVyZUVkaXQuZ2V0Q29tcG9uZW50KCk7Ci0JCQlpZiAobnVsbCAhPSBjb21wb25lbnQpIHsKLQkJCQlSZXNvdXJjZVRyZWVSb290IHJvb3QgPSBSZXNvdXJjZVRyZWVSb290LmdldERlcGxveVJlc291cmNlVHJlZVJvb3QoY29tcG9uZW50KTsKLQkJCQlDb21wb25lbnRSZXNvdXJjZVtdIHJlc291cmNlcyA9IHJvb3QuZmluZE1vZHVsZVJlc291cmNlcyhnZXRSdW50aW1lUGF0aCgpLmFwcGVuZChhUGF0aCksIFJlc291cmNlVHJlZU5vZGUuQ1JFQVRFX05PTkUpOwotCi0JCQkJZm9yIChpbnQgaSA9IDA7IGkgPCByZXNvdXJjZXMubGVuZ3RoOyBpKyspIHsKLQkJCQkvLyByZXR1cm4gdGhlIHJlc291cmNlcyBjb3JyZXNwb25kaW5nIHRvIHRoZSByb290LCBub3QgYW55IG9mIHRoZSBjaGlsZHJlbiBpZiBpdHMgYSBmb2xkZXIKLQkJCQkJaWYgKHJlc291cmNlc1tpXS5nZXRSdW50aW1lUGF0aCgpLmVxdWFscyhnZXRSdW50aW1lUGF0aCgpLmFwcGVuZChhUGF0aCkpKSB7Ci0JCQkJCQlJUmVzb3VyY2UgcGxhdGZvcm1SZXNvdXJjZSA9IGdldFByb2plY3QoKS5maW5kTWVtYmVyKHJlc291cmNlc1tpXS5nZXRTb3VyY2VQYXRoKCkpOwotCQkJCQkJaWYgKHBsYXRmb3JtUmVzb3VyY2UgPT0gbnVsbCkKLQkJCQkJCQlwbGF0Zm9ybVJlc291cmNlID0gUmVzb3VyY2VzUGx1Z2luLmdldFdvcmtzcGFjZSgpLmdldFJvb3QoKS5maW5kTWVtYmVyKHJlc291cmNlc1tpXS5nZXRTb3VyY2VQYXRoKCkpOwotCQkJCQkJaWYgKHBsYXRmb3JtUmVzb3VyY2UgIT0gbnVsbCkgewotCQkJCQkJCXN3aXRjaCAocGxhdGZvcm1SZXNvdXJjZS5nZXRUeXBlKCkpIHsKLQkJCQkJCQkJY2FzZSBJUmVzb3VyY2UuRk9MREVSIDoKLQkJCQkJCQkJY2FzZSBJUmVzb3VyY2UuUFJPSkVDVCA6Ci0JCQkJCQkJCQlyZXR1cm4gQ29tcG9uZW50Q29yZS5jcmVhdGVGb2xkZXIoZ2V0UHJvamVjdCgpLCBnZXRSdW50aW1lUGF0aCgpLmFwcGVuZChhUGF0aCkpOwotCQkJCQkJCQljYXNlIElSZXNvdXJjZS5GSUxFIDoKLQkJCQkJCQkJCXJldHVybiBuZXcgVmlydHVhbEZpbGUoZ2V0UHJvamVjdCgpLCBnZXRSdW50aW1lUGF0aCgpLmFwcGVuZChhUGF0aCkpOworCQkJaWYoc3RydWN0dXJlRWRpdCAhPSBudWxsKXsKKwkJCQlXb3JrYmVuY2hDb21wb25lbnQgY29tcG9uZW50ID0gc3RydWN0dXJlRWRpdC5nZXRDb21wb25lbnQoKTsKKwkJCQlpZiAobnVsbCAhPSBjb21wb25lbnQpIHsKKwkJCQkJUmVzb3VyY2VUcmVlUm9vdCByb290ID0gUmVzb3VyY2VUcmVlUm9vdC5nZXREZXBsb3lSZXNvdXJjZVRyZWVSb290KGNvbXBvbmVudCk7CisJCQkJCUNvbXBvbmVudFJlc291cmNlW10gcmVzb3VyY2VzID0gcm9vdC5maW5kTW9kdWxlUmVzb3VyY2VzKGdldFJ1bnRpbWVQYXRoKCkuYXBwZW5kKGFQYXRoKSwgUmVzb3VyY2VUcmVlTm9kZS5DUkVBVEVfTk9ORSk7CisJCisJCQkJCWZvciAoaW50IGkgPSAwOyBpIDwgcmVzb3VyY2VzLmxlbmd0aDsgaSsrKSB7CisJCQkJCS8vIHJldHVybiB0aGUgcmVzb3VyY2VzIGNvcnJlc3BvbmRpbmcgdG8gdGhlIHJvb3QsIG5vdCBhbnkgb2YgdGhlIGNoaWxkcmVuIGlmIGl0cyBhIGZvbGRlcgorCQkJCQkJaWYgKHJlc291cmNlc1tpXS5nZXRSdW50aW1lUGF0aCgpLmVxdWFscyhnZXRSdW50aW1lUGF0aCgpLmFwcGVuZChhUGF0aCkpKSB7CisJCQkJCQkJSVJlc291cmNlIHBsYXRmb3JtUmVzb3VyY2UgPSBnZXRQcm9qZWN0KCkuZmluZE1lbWJlcihyZXNvdXJjZXNbaV0uZ2V0U291cmNlUGF0aCgpKTsKKwkJCQkJCQlpZiAocGxhdGZvcm1SZXNvdXJjZSA9PSBudWxsKQorCQkJCQkJCQlwbGF0Zm9ybVJlc291cmNlID0gUmVzb3VyY2VzUGx1Z2luLmdldFdvcmtzcGFjZSgpLmdldFJvb3QoKS5maW5kTWVtYmVyKHJlc291cmNlc1tpXS5nZXRTb3VyY2VQYXRoKCkpOworCQkJCQkJCWlmIChwbGF0Zm9ybVJlc291cmNlICE9IG51bGwpIHsKKwkJCQkJCQkJc3dpdGNoIChwbGF0Zm9ybVJlc291cmNlLmdldFR5cGUoKSkgeworCQkJCQkJCQkJY2FzZSBJUmVzb3VyY2UuRk9MREVSIDoKKwkJCQkJCQkJCWNhc2UgSVJlc291cmNlLlBST0pFQ1QgOgorCQkJCQkJCQkJCXJldHVybiBDb21wb25lbnRDb3JlLmNyZWF0ZUZvbGRlcihnZXRQcm9qZWN0KCksIGdldFJ1bnRpbWVQYXRoKCkuYXBwZW5kKGFQYXRoKSk7CisJCQkJCQkJCQljYXNlIElSZXNvdXJjZS5GSUxFIDoKKwkJCQkJCQkJCQlyZXR1cm4gbmV3IFZpcnR1YWxGaWxlKGdldFByb2plY3QoKSwgZ2V0UnVudGltZVBhdGgoKS5hcHBlbmQoYVBhdGgpKTsKKwkJCQkJCQkJfQogCQkJCQkJCX0KIAkJCQkJCX0KIAkJCQkJfQpAQCAtMzUyLDExICszNTIsMTQgQEAKIAogCXByaXZhdGUgSVZpcnR1YWxSZXNvdXJjZSBjcmVhdGVWaXJ0dWFsUmVzb3VyY2UoQ29tcG9uZW50UmVzb3VyY2UgYUNvbXBvbmVudFJlc291cmNlKSB7CiAJCUlSZXNvdXJjZSByZXNvdXJjZSA9IFN0cnVjdHVyZUVkaXQuZ2V0RWNsaXBzZVJlc291cmNlKGFDb21wb25lbnRSZXNvdXJjZSk7Ci0JCXN3aXRjaCAocmVzb3VyY2UuZ2V0VHlwZSgpKSB7Ci0JCQljYXNlIElSZXNvdXJjZS5GSUxFIDoKLQkJCQlyZXR1cm4gQ29tcG9uZW50Q29yZS5jcmVhdGVGaWxlKGdldFByb2plY3QoKSwgYUNvbXBvbmVudFJlc291cmNlLmdldFJ1bnRpbWVQYXRoKCkpOwotCQkJY2FzZSBJUmVzb3VyY2UuRk9MREVSIDoKLQkJCQlyZXR1cm4gQ29tcG9uZW50Q29yZS5jcmVhdGVGb2xkZXIoZ2V0UHJvamVjdCgpLCBhQ29tcG9uZW50UmVzb3VyY2UuZ2V0UnVudGltZVBhdGgoKSk7CisJCWlmIChyZXNvdXJjZSAhPSBudWxsKQorCQl7CisJCQlzd2l0Y2ggKHJlc291cmNlLmdldFR5cGUoKSkgeworCQkJCWNhc2UgSVJlc291cmNlLkZJTEUgOgorCQkJCQlyZXR1cm4gQ29tcG9uZW50Q29yZS5jcmVhdGVGaWxlKGdldFByb2plY3QoKSwgYUNvbXBvbmVudFJlc291cmNlLmdldFJ1bnRpbWVQYXRoKCkpOworCQkJCWNhc2UgSVJlc291cmNlLkZPTERFUiA6CisJCQkJCXJldHVybiBDb21wb25lbnRDb3JlLmNyZWF0ZUZvbGRlcihnZXRQcm9qZWN0KCksIGFDb21wb25lbnRSZXNvdXJjZS5nZXRSdW50aW1lUGF0aCgpKTsKKwkJCX0KIAkJfQogCQlyZXR1cm4gbnVsbDsKIAl9CmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS9tb2R1bGVjb3JlLXNyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2NvbXBvbmVudGNvcmUvaW50ZXJuYWwvcmVzb3VyY2VzL1ZpcnR1YWxGaWxlLmphdmEgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS9tb2R1bGVjb3JlLXNyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2NvbXBvbmVudGNvcmUvaW50ZXJuYWwvcmVzb3VyY2VzL1ZpcnR1YWxGaWxlLmphdmEKaW5kZXggZWU5ZWMwNC4uOWFhNjZjNiAxMDA2NDQKLS0tIGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUvbW9kdWxlY29yZS1zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9jb21wb25lbnRjb3JlL2ludGVybmFsL3Jlc291cmNlcy9WaXJ0dWFsRmlsZS5qYXZhCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlL21vZHVsZWNvcmUtc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vY29tcG9uZW50Y29yZS9pbnRlcm5hbC9yZXNvdXJjZXMvVmlydHVhbEZpbGUuamF2YQpAQCAtMTE5LDQgKzExOSwxNSBAQAogCQkvL0RlZmF1bHQKIAl9CiAKKwlAT3ZlcnJpZGUKKwlwdWJsaWMgT2JqZWN0IGdldEFkYXB0ZXIoQ2xhc3MgYWRhcHRlcikgeyAKKwkJaWYoIGphdmEuaW8uRmlsZS5jbGFzcy5lcXVhbHMoYWRhcHRlcikpIHsKKwkJCUlGaWxlIGZpbGUgPSBnZXRVbmRlcmx5aW5nRmlsZSgpOworCQkJcmV0dXJuIGZpbGUuZ2V0TG9jYXRpb24oKS50b0ZpbGUoKTsKKwkJfQorCQlpZiggSUZpbGUuY2xhc3MuZXF1YWxzKGFkYXB0ZXIpKSB7CisJCQlyZXR1cm4gZ2V0VW5kZXJseWluZ0ZpbGUoKTsKKwkJfQorCQlyZXR1cm4gbnVsbDsKKwl9CiB9CmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS9tb2R1bGVjb3JlLXNyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2NvbXBvbmVudGNvcmUvaW50ZXJuYWwvcmVzb3VyY2VzL1ZpcnR1YWxSZWZlcmVuY2UuamF2YSBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlL21vZHVsZWNvcmUtc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vY29tcG9uZW50Y29yZS9pbnRlcm5hbC9yZXNvdXJjZXMvVmlydHVhbFJlZmVyZW5jZS5qYXZhCmluZGV4IDAwN2IxY2UuLjllMmM3MzYgMTAwNjQ0Ci0tLSBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlL21vZHVsZWNvcmUtc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vY29tcG9uZW50Y29yZS9pbnRlcm5hbC9yZXNvdXJjZXMvVmlydHVhbFJlZmVyZW5jZS5qYXZhCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlL21vZHVsZWNvcmUtc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vY29tcG9uZW50Y29yZS9pbnRlcm5hbC9yZXNvdXJjZXMvVmlydHVhbFJlZmVyZW5jZS5qYXZhCkBAIC0xLDUgKzEsNSBAQAogLyoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioKLSAqIENvcHlyaWdodCAoYykgMjAwMywgMjAwNiBJQk0gQ29ycG9yYXRpb24gYW5kIG90aGVycy4KKyAqIENvcHlyaWdodCAoYykgMjAwMywgMjAxMCBJQk0gQ29ycG9yYXRpb24gYW5kIG90aGVycy4KICAqIEFsbCByaWdodHMgcmVzZXJ2ZWQuIFRoaXMgcHJvZ3JhbSBhbmQgdGhlIGFjY29tcGFueWluZyBtYXRlcmlhbHMKICAqIGFyZSBtYWRlIGF2YWlsYWJsZSB1bmRlciB0aGUgdGVybXMgb2YgdGhlIEVjbGlwc2UgUHVibGljIExpY2Vuc2UgdjEuMAogICogd2hpY2ggYWNjb21wYW5pZXMgdGhpcyBkaXN0cmlidXRpb24sIGFuZCBpcyBhdmFpbGFibGUgYXQKQEAgLTE2LDE1ICsxNiwxNiBAQAogaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucnVudGltZS5JUHJvZ3Jlc3NNb25pdG9yOwogaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucnVudGltZS5OdWxsUHJvZ3Jlc3NNb25pdG9yOwogaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucnVudGltZS5QYXRoOworaW1wb3J0IG9yZy5lY2xpcHNlLmVtZi5jb21tb24udXRpbC5VUkk7CiBpbXBvcnQgb3JnLmVjbGlwc2UuZW1mLmVjb3JlLkVPYmplY3Q7Ci1pbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb21wb25lbnRjb3JlLmludGVybmFsLkNvbXBvbmVudGNvcmVQYWNrYWdlOwotaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS5pbnRlcm5hbC5EZXBlbmRlbmN5VHlwZTsKIGltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUuaW50ZXJuYWwuUmVmZXJlbmNlZENvbXBvbmVudDsKIGltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUuaW50ZXJuYWwuU3RydWN0dXJlRWRpdDsKIGltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUuaW50ZXJuYWwuV29ya2JlbmNoQ29tcG9uZW50OwotaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS5pbnRlcm5hbC5pbXBsLk1vZHVsZVVSSVV0aWw7CitpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb21wb25lbnRjb3JlLnJlc29sdmVycy5JUmVmZXJlbmNlUmVzb2x2ZXI7CitpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb21wb25lbnRjb3JlLnJlc29sdmVycy5SZWZlcmVuY2VSZXNvbHZlclV0aWw7CiBpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb21wb25lbnRjb3JlLnJlc291cmNlcy5JVmlydHVhbENvbXBvbmVudDsKIGltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUucmVzb3VyY2VzLklWaXJ0dWFsUmVmZXJlbmNlOworaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy5pbnRlcm5hbC5IYXNoVXRpbDsKIAogcHVibGljIGNsYXNzIFZpcnR1YWxSZWZlcmVuY2UgaW1wbGVtZW50cyBJVmlydHVhbFJlZmVyZW5jZSB7CiAJCkBAIC0zMywyNCArMzQsMzEgQEAKIAlwcml2YXRlIElQYXRoIHJ1bnRpbWVQYXRoOwogCXByaXZhdGUgaW50IGRlcGVuZGVuY3lUeXBlOwogCXByaXZhdGUgU3RyaW5nIGFyY2hpdmVOYW1lOwotCisJcHJpdmF0ZSBib29sZWFuIGRlcml2ZWQ7CiAJcHVibGljIFZpcnR1YWxSZWZlcmVuY2UoKSB7CiAJCQogCX0gCiAJCiAJcHVibGljIFZpcnR1YWxSZWZlcmVuY2UoSVZpcnR1YWxDb21wb25lbnQgYW5FbmNsb3NpbmdDb21wb25lbnQsIElWaXJ0dWFsQ29tcG9uZW50IGFSZWZlcmVuY2VkQ29tcG9uZW50KSB7Ci0JCXRoaXMoYW5FbmNsb3NpbmdDb21wb25lbnQsIGFSZWZlcmVuY2VkQ29tcG9uZW50LCBuZXcgUGF0aChTdHJpbmcudmFsdWVPZihJUGF0aC5TRVBBUkFUT1IpKSwgREVQRU5ERU5DWV9UWVBFX1VTRVMpOyAKKwkJdGhpcyhhbkVuY2xvc2luZ0NvbXBvbmVudCwgYVJlZmVyZW5jZWRDb21wb25lbnQsIG5ldyBQYXRoKFN0cmluZy52YWx1ZU9mKElQYXRoLlNFUEFSQVRPUikpLCBERVBFTkRFTkNZX1RZUEVfVVNFUywgZmFsc2UpOyAKIAl9CiAJCiAJcHVibGljIFZpcnR1YWxSZWZlcmVuY2UoSVZpcnR1YWxDb21wb25lbnQgYW5FbmNsb3NpbmdDb21wb25lbnQsIElWaXJ0dWFsQ29tcG9uZW50IGFSZWZlcmVuY2VkQ29tcG9uZW50LCBJUGF0aCBhUnVudGltZVBhdGgpIHsKLQkJdGhpcyhhbkVuY2xvc2luZ0NvbXBvbmVudCwgYVJlZmVyZW5jZWRDb21wb25lbnQsIGFSdW50aW1lUGF0aCwgREVQRU5ERU5DWV9UWVBFX1VTRVMpOworCQl0aGlzKGFuRW5jbG9zaW5nQ29tcG9uZW50LCBhUmVmZXJlbmNlZENvbXBvbmVudCwgYVJ1bnRpbWVQYXRoLCBERVBFTkRFTkNZX1RZUEVfVVNFUywgZmFsc2UpOwogCX0KIAotCXB1YmxpYyBWaXJ0dWFsUmVmZXJlbmNlKElWaXJ0dWFsQ29tcG9uZW50IGFuRW5jbG9zaW5nQ29tcG9uZW50LCBJVmlydHVhbENvbXBvbmVudCBhUmVmZXJlbmNlZENvbXBvbmVudCwgSVBhdGggYVJ1bnRpbWVQYXRoLCBpbnQgYURlcGVuZGVuY3lUeXBlKSB7CisJcHVibGljIFZpcnR1YWxSZWZlcmVuY2UoSVZpcnR1YWxDb21wb25lbnQgYW5FbmNsb3NpbmdDb21wb25lbnQsIElWaXJ0dWFsQ29tcG9uZW50IGFSZWZlcmVuY2VkQ29tcG9uZW50LCAKKwkJCUlQYXRoIGFSdW50aW1lUGF0aCwgaW50IGFEZXBlbmRlbmN5VHlwZSkgeworCQl0aGlzKGFuRW5jbG9zaW5nQ29tcG9uZW50LCBhUmVmZXJlbmNlZENvbXBvbmVudCwgYVJ1bnRpbWVQYXRoLCBhRGVwZW5kZW5jeVR5cGUsIGZhbHNlKTsKKwl9CisJCisJcHVibGljIFZpcnR1YWxSZWZlcmVuY2UoSVZpcnR1YWxDb21wb25lbnQgYW5FbmNsb3NpbmdDb21wb25lbnQsIElWaXJ0dWFsQ29tcG9uZW50IGFSZWZlcmVuY2VkQ29tcG9uZW50LCAKKwkJCUlQYXRoIGFSdW50aW1lUGF0aCwgaW50IGFEZXBlbmRlbmN5VHlwZSwgYm9vbGVhbiBpc0Rlcml2ZWQpIHsKIAkJZW5jbG9zaW5nQ29tcG9uZW50ID0gYW5FbmNsb3NpbmdDb21wb25lbnQ7CiAJCXJlZmVyZW5jZWRDb21wb25lbnQgPSBhUmVmZXJlbmNlZENvbXBvbmVudDsKIAkJcnVudGltZVBhdGggPSBhUnVudGltZVBhdGg7CiAJCWRlcGVuZGVuY3lUeXBlID0gYURlcGVuZGVuY3lUeXBlOworCQlkZXJpdmVkID0gaXNEZXJpdmVkOwogCX0KIAogCXB1YmxpYyB2b2lkIGNyZWF0ZShpbnQgdXBkYXRlRmxhZ3MsIElQcm9ncmVzc01vbml0b3IgYU1vbml0b3IpIHsgCkBAIC01OSwxNCArNjcsOCBAQAogCQkJY29yZSA9IFN0cnVjdHVyZUVkaXQuZ2V0U3RydWN0dXJlRWRpdEZvcldyaXRlKGVuY2xvc2luZ0NvbXBvbmVudC5nZXRQcm9qZWN0KCkpOwogCQkJV29ya2JlbmNoQ29tcG9uZW50IGNvbXBvbmVudCA9IGNvcmUuZ2V0Q29tcG9uZW50KCk7CiAJCQlMaXN0IHJlZmVyZW5jZWRDb21wb25lbnRzID0gY29tcG9uZW50LmdldFJlZmVyZW5jZWRDb21wb25lbnRzKCk7Ci0JCQlSZWZlcmVuY2VkQ29tcG9uZW50IHJlZkNvbXAgPSBDb21wb25lbnRjb3JlUGFja2FnZS5lSU5TVEFOQ0UuZ2V0Q29tcG9uZW50Y29yZUZhY3RvcnkoKS5jcmVhdGVSZWZlcmVuY2VkQ29tcG9uZW50KCk7Ci0JCQlpZiggIXJlZmVyZW5jZWRDb21wb25lbnQuaXNCaW5hcnkoKSkKLQkJCQlyZWZDb21wLnNldEhhbmRsZShNb2R1bGVVUklVdGlsLmZ1bGx5UXVhbGlmeVVSSShyZWZlcmVuY2VkQ29tcG9uZW50LmdldFByb2plY3QoKSkpOwotCQkJZWxzZQotCQkJCXJlZkNvbXAuc2V0SGFuZGxlKE1vZHVsZVVSSVV0aWwuYXJjaGl2ZUNvbXBvbmVudGZ1bGx5UXVhbGlmeVVSSShyZWZlcmVuY2VkQ29tcG9uZW50LmdldE5hbWUoKSkpOyAKLQkJCXJlZkNvbXAuc2V0UnVudGltZVBhdGgocnVudGltZVBhdGgpOwotCQkJcmVmQ29tcC5zZXREZXBlbmRlbmN5VHlwZShEZXBlbmRlbmN5VHlwZS5nZXQoZGVwZW5kZW5jeVR5cGUpKTsKLQkJCXJlZkNvbXAuc2V0QXJjaGl2ZU5hbWUoYXJjaGl2ZU5hbWUpOworCQkJSVJlZmVyZW5jZVJlc29sdmVyIHJlc29sdmVyID0gUmVmZXJlbmNlUmVzb2x2ZXJVdGlsLmdldERlZmF1bHQoKS5nZXRSZXNvbHZlcih0aGlzKTsKKwkJCVJlZmVyZW5jZWRDb21wb25lbnQgcmVmQ29tcCA9IHJlc29sdmVyLnJlc29sdmUodGhpcyk7CiAJCQlpZighcmVmZXJlbmNlZENvbXBvbmVudHMuY29udGFpbnMocmVmQ29tcCkpewogCQkJCXJlZmVyZW5jZWRDb21wb25lbnRzLmFkZChyZWZDb21wKTsKIAkJCX0KQEAgLTEyMywxMCArMTI1LDkgQEAKIAkJCVJlZmVyZW5jZWRDb21wb25lbnQgYWN0dWFsUmVmZXJlbmNlZENvbXBvbmVudCA9IGVuY2xvc2luZ0NvcmUuZmluZFJlZmVyZW5jZWRDb21wb25lbnQoZW5jbG9zaW5nQ29tcCwgcmVmQ29tcCk7CiAJCQlpZiAoYWN0dWFsUmVmZXJlbmNlZENvbXBvbmVudCAhPSBudWxsKSB7CiAJCQkJcmVmZXJlbmNlZENvbXBvbmVudCA9IGFSZWZlcmVuY2VkQ29tcG9uZW50OwotCQkJCWlmKCFyZWZlcmVuY2VkQ29tcG9uZW50LmlzQmluYXJ5KCkpCi0JCQkJCWFjdHVhbFJlZmVyZW5jZWRDb21wb25lbnQuc2V0SGFuZGxlKE1vZHVsZVVSSVV0aWwuZnVsbHlRdWFsaWZ5VVJJKHJlZmVyZW5jZWRDb21wb25lbnQuZ2V0UHJvamVjdCgpKSk7Ci0JCQkJZWxzZQotCQkJCQlhY3R1YWxSZWZlcmVuY2VkQ29tcG9uZW50LnNldEhhbmRsZShNb2R1bGVVUklVdGlsLmFyY2hpdmVDb21wb25lbnRmdWxseVF1YWxpZnlVUkkocmVmZXJlbmNlZENvbXBvbmVudC5nZXROYW1lKCkpKTsKKwkJCQlJUmVmZXJlbmNlUmVzb2x2ZXIgcmVzb2x2ZXIgPSBSZWZlcmVuY2VSZXNvbHZlclV0aWwuZ2V0RGVmYXVsdCgpLmdldFJlc29sdmVyKHRoaXMpOworCQkJCVVSSSB1cmkgPSByZXNvbHZlci5yZXNvbHZlKHRoaXMpLmdldEhhbmRsZSgpOworCQkJCWFjdHVhbFJlZmVyZW5jZWRDb21wb25lbnQuc2V0SGFuZGxlKHVyaSk7CiAJCQkJYWN0dWFsUmVmZXJlbmNlZENvbXBvbmVudC5zZXREZXBlbmRlbnRPYmplY3QoZGVwZW5kZW50T2JqZWN0KTsKIAkJCX0KIAkJfSBmaW5hbGx5IHsKQEAgLTE0OCw0ICsxNDksMzUgQEAKIAlwdWJsaWMgdm9pZCBzZXRBcmNoaXZlTmFtZShTdHJpbmcgYXJjaGl2ZU5hbWUpIHsKIAkJdGhpcy5hcmNoaXZlTmFtZSA9IGFyY2hpdmVOYW1lOwogCX0KKwkKKwlwdWJsaWMgYm9vbGVhbiBpc0Rlcml2ZWQoKSB7CisJCXJldHVybiBkZXJpdmVkOworCX0KKwkKKwlwdWJsaWMgdm9pZCBzZXREZXJpdmVkKGJvb2xlYW4gdmFsKSB7CisJCWRlcml2ZWQgPSB2YWw7CisJfQorCisJcHVibGljIGJvb2xlYW4gZXF1YWxzKE9iamVjdCBhbk90aGVyKSB7CisJCWlmKGFuT3RoZXIgPT0gbnVsbCB8fCAhKGFuT3RoZXIgaW5zdGFuY2VvZiBJVmlydHVhbFJlZmVyZW5jZSkpIHJldHVybiBmYWxzZTsKKwkJaWYoYW5PdGhlciA9PSB0aGlzKSByZXR1cm4gdHJ1ZTsKKwkJSVZpcnR1YWxSZWZlcmVuY2Ugb3RoZXJSZWYgPSAoSVZpcnR1YWxSZWZlcmVuY2UpIGFuT3RoZXI7CisJCXJldHVybiAoZ2V0QXJjaGl2ZU5hbWUoKSAhPSBudWxsID8gZ2V0QXJjaGl2ZU5hbWUoKS5lcXVhbHMob3RoZXJSZWYuZ2V0QXJjaGl2ZU5hbWUoKSkgOiAob3RoZXJSZWYuZ2V0QXJjaGl2ZU5hbWUoKSA9PSBudWxsID8gdHJ1ZSA6IGZhbHNlKSkgJiYgCisJCQkgICBnZXRSdW50aW1lUGF0aCgpLmVxdWFscyhvdGhlclJlZi5nZXRSdW50aW1lUGF0aCgpKSAmJiAKKwkJCSAgIGdldEVuY2xvc2luZ0NvbXBvbmVudCgpLmVxdWFscyhvdGhlclJlZi5nZXRFbmNsb3NpbmdDb21wb25lbnQoKSkgJiYgCisJCQkgICBnZXRSZWZlcmVuY2VkQ29tcG9uZW50KCkuZXF1YWxzKG90aGVyUmVmLmdldFJlZmVyZW5jZWRDb21wb25lbnQoKSkgJiYgCisJCQkgICBnZXREZXBlbmRlbmN5VHlwZSgpID09IG90aGVyUmVmLmdldERlcGVuZGVuY3lUeXBlKCk7CisJCQorCX0KKworCXB1YmxpYyBpbnQgaGFzaENvZGUoKSB7CisJCQorCQlpbnQgaGFzaCA9IEhhc2hVdGlsLlNFRUQ7CisJCWhhc2ggPSBIYXNoVXRpbC5oYXNoKGhhc2gsIGdldEFyY2hpdmVOYW1lKCkpOworCQloYXNoID0gSGFzaFV0aWwuaGFzaChoYXNoLCBnZXRSdW50aW1lUGF0aCgpKTsKKwkJaGFzaCA9IEhhc2hVdGlsLmhhc2goaGFzaCwgZ2V0RW5jbG9zaW5nQ29tcG9uZW50KCkpOworCQloYXNoID0gSGFzaFV0aWwuaGFzaChoYXNoLCBnZXRSZWZlcmVuY2VkQ29tcG9uZW50KCkpOworCQloYXNoID0gSGFzaFV0aWwuaGFzaChoYXNoLCBnZXREZXBlbmRlbmN5VHlwZSgpKTsKKwkJcmV0dXJuIGhhc2g7CisJfQogfQpkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUvbW9kdWxlY29yZS1zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9jb21wb25lbnRjb3JlL2ludGVybmFsL3Jlc291cmNlcy9WaXJ0dWFsUmVzb3VyY2UuamF2YSBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlL21vZHVsZWNvcmUtc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vY29tcG9uZW50Y29yZS9pbnRlcm5hbC9yZXNvdXJjZXMvVmlydHVhbFJlc291cmNlLmphdmEKaW5kZXggNTQxYTYwOS4uYzg4MTVkZSAxMDA2NDQKLS0tIGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUvbW9kdWxlY29yZS1zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9jb21wb25lbnRjb3JlL2ludGVybmFsL3Jlc291cmNlcy9WaXJ0dWFsUmVzb3VyY2UuamF2YQorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS9tb2R1bGVjb3JlLXNyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2NvbXBvbmVudGNvcmUvaW50ZXJuYWwvcmVzb3VyY2VzL1ZpcnR1YWxSZXNvdXJjZS5qYXZhCkBAIC0yOTcsMjAgKzI5NywyNSBAQAogCQlTdHJ1Y3R1cmVFZGl0IG1vZHVsZUNvcmUgPSBudWxsOwogCQl0cnkgewogCQkJbW9kdWxlQ29yZSA9IFN0cnVjdHVyZUVkaXQuZ2V0U3RydWN0dXJlRWRpdEZvcldyaXRlKGdldFByb2plY3QoKSk7Ci0JCQlXb3JrYmVuY2hDb21wb25lbnQgY29tcG9uZW50ID0gbW9kdWxlQ29yZS5nZXRDb21wb25lbnQoKTsKLQkJCVJlc291cmNlVHJlZVJvb3Qgcm9vdCA9IFJlc291cmNlVHJlZVJvb3QuZ2V0RGVwbG95UmVzb3VyY2VUcmVlUm9vdChjb21wb25lbnQpOwotCQkJQ29tcG9uZW50UmVzb3VyY2VbXSByZXNvdXJjZXMgPSByb290LmZpbmRNb2R1bGVSZXNvdXJjZXMoZ2V0UnVudGltZVBhdGgoKSwgUmVzb3VyY2VUcmVlTm9kZS5DUkVBVEVfTk9ORSk7Ci0JCQlpZiAocmVzb3VyY2VzLmxlbmd0aCA+IDApIHsKLQkJCQlmb3IgKGludCByZXNvdXJjZUluZHggPSAwOyByZXNvdXJjZUluZHggPCByZXNvdXJjZXMubGVuZ3RoOyByZXNvdXJjZUluZHgrKykgewotCQkJCQlpZiAoYVByb2plY3RSZWxhdGl2ZUxvY2F0aW9uLm1ha2VBYnNvbHV0ZSgpLmVxdWFscyhyZXNvdXJjZXNbcmVzb3VyY2VJbmR4XS5nZXRTb3VyY2VQYXRoKCkpKSB7Ci0JCQkJCQljb21wb25lbnQuZ2V0UmVzb3VyY2VzKCkucmVtb3ZlKHJlc291cmNlc1tyZXNvdXJjZUluZHhdKTsKKwkJCWlmKCBtb2R1bGVDb3JlICE9IG51bGwgKSB7CisJCQkJV29ya2JlbmNoQ29tcG9uZW50IGNvbXBvbmVudCA9IG1vZHVsZUNvcmUuZ2V0Q29tcG9uZW50KCk7CisJCQkJaWYgKGNvbXBvbmVudCAhPSBudWxsKSB7CisJCQkJCVJlc291cmNlVHJlZVJvb3Qgcm9vdCA9IFJlc291cmNlVHJlZVJvb3QuZ2V0RGVwbG95UmVzb3VyY2VUcmVlUm9vdChjb21wb25lbnQpOworCQkJCQlDb21wb25lbnRSZXNvdXJjZVtdIHJlc291cmNlcyA9IHJvb3QuZmluZE1vZHVsZVJlc291cmNlcyhnZXRSdW50aW1lUGF0aCgpLCBSZXNvdXJjZVRyZWVOb2RlLkNSRUFURV9OT05FKTsKKwkJCQkJaWYgKHJlc291cmNlcy5sZW5ndGggPiAwKSB7CisJCQkJCQlmb3IgKGludCByZXNvdXJjZUluZHggPSAwOyByZXNvdXJjZUluZHggPCByZXNvdXJjZXMubGVuZ3RoOyByZXNvdXJjZUluZHgrKykgeworCQkJCQkJCWlmIChhUHJvamVjdFJlbGF0aXZlTG9jYXRpb24ubWFrZUFic29sdXRlKCkuZXF1YWxzKHJlc291cmNlc1tyZXNvdXJjZUluZHhdLmdldFNvdXJjZVBhdGgoKSkpIHsKKwkJCQkJCQkJY29tcG9uZW50LmdldFJlc291cmNlcygpLnJlbW92ZShyZXNvdXJjZXNbcmVzb3VyY2VJbmR4XSk7CisJCQkJCQkJfQorCQkJCQkJfQogCQkJCQl9CiAJCQkJfQogCQkJfQogCQl9CiAJCWZpbmFsbHkgewogCQkJaWYgKG1vZHVsZUNvcmUgIT0gbnVsbCkgewotCQkJCW1vZHVsZUNvcmUuc2F2ZUlmTmVjZXNzYXJ5KG1vbml0b3IpOworCQkJCWlmIChnZXRDb21wb25lbnQoKSAhPSBudWxsKQorCQkJCQltb2R1bGVDb3JlLnNhdmVJZk5lY2Vzc2FyeShtb25pdG9yKTsKIAkJCQltb2R1bGVDb3JlLmRpc3Bvc2UoKTsKIAkJCX0KIAkJfQpkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUvbW9kdWxlY29yZS1zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9jb21wb25lbnRjb3JlL2ludGVybmFsL3V0aWwvQ29tcG9uZW50SW1wbE1hbmFnZXIuamF2YSBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlL21vZHVsZWNvcmUtc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vY29tcG9uZW50Y29yZS9pbnRlcm5hbC91dGlsL0NvbXBvbmVudEltcGxNYW5hZ2VyLmphdmEKaW5kZXggMmNjMmZkYy4uYzk3NTVjNiAxMDA2NDQKLS0tIGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUvbW9kdWxlY29yZS1zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9jb21wb25lbnRjb3JlL2ludGVybmFsL3V0aWwvQ29tcG9uZW50SW1wbE1hbmFnZXIuamF2YQorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS9tb2R1bGVjb3JlLXNyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2NvbXBvbmVudGNvcmUvaW50ZXJuYWwvdXRpbC9Db21wb25lbnRJbXBsTWFuYWdlci5qYXZhCkBAIC0xMCwxNyArMTAsMjUgQEAKICAqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqLwogcGFja2FnZSBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUuaW50ZXJuYWwudXRpbDsKIAoraW1wb3J0IGphdmEudXRpbC5BcnJheUxpc3Q7CitpbXBvcnQgamF2YS51dGlsLkNvbGxlY3Rpb25zOworaW1wb3J0IGphdmEudXRpbC5Db21wYXJhdG9yOworaW1wb3J0IGphdmEudXRpbC5IYXNoU2V0OwogaW1wb3J0IGphdmEudXRpbC5IYXNodGFibGU7CiBpbXBvcnQgamF2YS51dGlsLkl0ZXJhdG9yOwogaW1wb3J0IGphdmEudXRpbC5NYXA7Ci0KK2ltcG9ydCBqYXZhLnV0aWwuU2V0OwogaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucmVzb3VyY2VzLklQcm9qZWN0OworaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucmVzb3VyY2VzLklSZXNvdXJjZURlbHRhOwogaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucnVudGltZS5JQ29uZmlndXJhdGlvbkVsZW1lbnQ7CiBpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5ydW50aW1lLklQYXRoOwogaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucnVudGltZS5JU2FmZVJ1bm5hYmxlOwogaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucnVudGltZS5QYXRoOwogaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucnVudGltZS5TYWZlUnVubmVyOwogaW1wb3J0IG9yZy5lY2xpcHNlLmplbS51dGlsLlJlZ2lzdHJ5UmVhZGVyOworaW1wb3J0IG9yZy5lY2xpcHNlLmplbS51dGlsLmVtZi53b3JrYmVuY2guSVN5bmNocm9uaXplckV4dGVuZGVyOworaW1wb3J0IG9yZy5lY2xpcHNlLmplbS51dGlsLmVtZi53b3JrYmVuY2guUHJvamVjdFJlc291cmNlU2V0OworaW1wb3J0IG9yZy5lY2xpcHNlLmplbS51dGlsLmVtZi53b3JrYmVuY2guV29ya2JlbmNoUmVzb3VyY2VIZWxwZXJCYXNlOwogaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS5Nb2R1bGVDb3JlTmF0dXJlOwogaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS5pbnRlcm5hbC5Nb2R1bGVjb3JlUGx1Z2luOwogaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS5pbnRlcm5hbC5yZXNvdXJjZXMuUmVzb3VyY2VUaW1lc3RhbXBNYXBwaW5nczsKQEAgLTMxLDE2ICszOSwyMCBAQAogaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS5yZXNvdXJjZXMuSVZpcnR1YWxGb2xkZXI7CiBpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5wcm9qZWN0LmZhY2V0LmNvcmUuSUZhY2V0ZWRQcm9qZWN0OwogaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24ucHJvamVjdC5mYWNldC5jb3JlLklQcm9qZWN0RmFjZXQ7CitpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5wcm9qZWN0LmZhY2V0LmNvcmUuSVByb2plY3RGYWNldFZlcnNpb247CiBpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5wcm9qZWN0LmZhY2V0LmNvcmUuUHJvamVjdEZhY2V0c01hbmFnZXI7CiAKLXB1YmxpYyBjbGFzcyBDb21wb25lbnRJbXBsTWFuYWdlciAgeworCisKK3B1YmxpYyBjbGFzcyBDb21wb25lbnRJbXBsTWFuYWdlciBpbXBsZW1lbnRzIElTeW5jaHJvbml6ZXJFeHRlbmRlcnsKIAogCXByaXZhdGUgc3RhdGljIGZpbmFsIFN0cmluZyBOT19GQUNFVFMgPSAiTk9ORSI7Ly8kTk9OLU5MUy0xJAotCQorCiAJcHJpdmF0ZSBzdGF0aWMgZmluYWwgU3RyaW5nIENPTVBPTkVOVF9JTVBMX0VYVEVOU0lPTl9QT0lOVCA9ICJjb21wb25lbnRpbXBsIjsgLy8kTk9OLU5MUy0xJAogCXByaXZhdGUgc3RhdGljIGZpbmFsIFN0cmluZyBUQUdfQ09NUE9ORU5UX0lNUEwgPSAiY29tcG9uZW50aW1wbCI7IC8vJE5PTi1OTFMtMSQKIAlwcml2YXRlIHN0YXRpYyBmaW5hbCBTdHJpbmcgQVRUX1RZUEUgPSAidHlwZUlEIjsgLy8kTk9OLU5MUy0xJAogCXByaXZhdGUgc3RhdGljIGZpbmFsIFN0cmluZyBBVFRfQ0xBU1MgPSAiY2xhc3MiOyAvLyROT04tTkxTLTEkCisJcHJpdmF0ZSBzdGF0aWMgZmluYWwgU3RyaW5nIEVYVEVOREVEX0VMRU1FTlQ9ImV4dGVuZGVkVHlwZUlEIjsgLy8kTk9OLU5MUy0xJAogCiAJcHJpdmF0ZSBzdGF0aWMgZmluYWwgQ29tcG9uZW50SW1wbE1hbmFnZXIgaW5zdGFuY2UgPSBuZXcgQ29tcG9uZW50SW1wbE1hbmFnZXIoKTsKIC8vCXByaXZhdGUgc3RhdGljIGZpbmFsIE9iamVjdCBMT0FEX0ZBSUxFRCA9IG5ldyBPYmplY3QoKTsKQEAgLTQ4LDcgKzYwLDcgQEAKIAlwcml2YXRlIGZpbmFsIE1hcC8qIDxTdHJpbmcsIENvbXBvbmVudEltcGxEZXNjcmlwdG9yPiAqLyBkZXNjcmlwdG9ycyA9IG5ldyBIYXNodGFibGUoKTsKIAogCXByaXZhdGUgZmluYWwgTWFwLyogPENvbXBvbmVudEltcGxEZXNjcmlwdG9yLCBJQ29tcG9uZW50SW1wbEZhY3Rvcnk+ICovIGluc3RhbmNlcyA9IG5ldyBIYXNodGFibGUoKTsKLQlwcml2YXRlIGZpbmFsIFJlc291cmNlVGltZXN0YW1wTWFwcGluZ3MgZmFjdG9yeU1hcCA9IG5ldyBSZXNvdXJjZVRpbWVzdGFtcE1hcHBpbmdzKCk7CisJcHJpdmF0ZSBBcnJheUxpc3Q8SGFzaFNldD4gc29ydGVkRGVzY3JpcHRvcnNLZXlMaXN0ID0gbmV3IEFycmF5TGlzdDxIYXNoU2V0PigpOwogCiAJLyoqCiAJICogQHJldHVybiBSZXR1cm5zIHRoZSBpbnN0YW5jZS4KQEAgLTY3LDEzICs3OSwyNSBAQAogCiAJCQlwdWJsaWMgdm9pZCBydW4oKSB0aHJvd3MgRXhjZXB0aW9uIHsKIAkJCQluZXcgQ29tcG9uZW50SW1wbFJlZ2lzdHJ5UmVhZGVyKCkucmVhZFJlZ2lzdHJ5KCk7Ci0JCQl9CisJCQkJLy9zb3J0IGRlc2NyaXB0b3JzIGtleXMgYnkgc2l6ZSwgYmlnZ2VyIHNpemUgaXMgYXQgbG93ZXIgaW5kZXgKKwkJCQlpZiggZGVzY3JpcHRvcnMgIT0gbnVsbCApewogCisJCQkJCXNvcnRlZERlc2NyaXB0b3JzS2V5TGlzdC5hZGRBbGwoZGVzY3JpcHRvcnMua2V5U2V0KCkpOworCQkJCQkKKwkJCQkJZmluYWwgQ29tcGFyYXRvcjxIYXNoU2V0PiBjb21wID0gbmV3IENvbXBhcmF0b3I8SGFzaFNldD4oKSB7CisJCQkJCQlwdWJsaWMgaW50IGNvbXBhcmUoZmluYWwgSGFzaFNldCBkZXNjcmlwdG9yMSwgZmluYWwgSGFzaFNldCBkZXNjcmlwdG9yMikgeworCQkJCQkJCWlmKCBkZXNjcmlwdG9yMS5zaXplKCkgPT0gZGVzY3JpcHRvcjIuc2l6ZSgpICkKKwkJCQkJCQkJcmV0dXJuIDA7CisJCQkJCQkJcmV0dXJuIGRlc2NyaXB0b3IxLnNpemUoKSA8IGRlc2NyaXB0b3IyLnNpemUoKSA/IDEgOiAtMTsKKwkJCQkJCX0KKwkJCQkJfTsKKwkJCQkJQ29sbGVjdGlvbnMuc29ydChzb3J0ZWREZXNjcmlwdG9yc0tleUxpc3QsIGNvbXApOworCQkJCX0KKwkJCX0KIAkJfSk7CiAJfQotCi0KLQlwcml2YXRlIElDb21wb25lbnRJbXBsRmFjdG9yeSBnZXRDb21wb25lbnRJbXBsRmFjdG9yeShTdHJpbmcgdHlwZUlEKSB7CisJCisJcHJpdmF0ZSBJQ29tcG9uZW50SW1wbEZhY3RvcnkgZ2V0Q29tcG9uZW50SW1wbEZhY3RvcnkoSGFzaFNldCB0eXBlSUQpIHsKIAogCQlDb21wb25lbnRJbXBsRGVzY3JpcHRvciBkZXNjcmlwdG9yID0gKENvbXBvbmVudEltcGxEZXNjcmlwdG9yKSBkZXNjcmlwdG9ycy5nZXQodHlwZUlEKTsKIAkJSUNvbXBvbmVudEltcGxGYWN0b3J5IGZhY3RvcnkgPSBudWxsOwpAQCAtOTMsMTAyICsxMTcsMzE4IEBACiAJCX0KIAkJcmV0dXJuIGZhY3Rvcnk7CiAJfQotCSAKLQlwcml2YXRlIElDb21wb25lbnRJbXBsRmFjdG9yeSBmaW5kRmFjdG9yeUZvclByb2plY3QoSVByb2plY3QgcHJvamVjdCl7Ci0JCXRyeSB7Ci0JCQlJQ29tcG9uZW50SW1wbEZhY3RvcnkgZmFjdG9yeSA9IG51bGw7CQkKLQkJCQotCQkJaWYoICFmYWN0b3J5TWFwLmhhc0NoYW5nZWQocHJvamVjdCkgKSB7CQkJCQorCQorCQogCi0JCQkJaWYoIGZhY3RvcnlNYXAuaGFzQ2FjaGVFcnJvcihwcm9qZWN0KSkKLQkJCQkJcmV0dXJuIG51bGw7Ci0JCQkJCi0JCQkJaWYoIGZhY3RvcnlNYXAuaGFzQ2FjaGVEYXRhKHByb2plY3QpKSAKLQkJCQkJcmV0dXJuIChJQ29tcG9uZW50SW1wbEZhY3RvcnkpIGZhY3RvcnlNYXAuZ2V0RGF0YShwcm9qZWN0KTsKLQkJCX0gCi0JCQkKKwlwcml2YXRlIElDb21wb25lbnRJbXBsRmFjdG9yeSBmaW5kRmFjdG9yeUZvclByb2plY3QoSVByb2plY3QgcHJvamVjdCwgTWFwIGRlc2NyaXB0b3JzKXsKKwkJdHJ5IHsKKwkJCUlDb21wb25lbnRJbXBsRmFjdG9yeSBmYWN0b3J5ID0gQ29tcG9uZW50Q2FjaGVNYW5hZ2VyLmluc3RhbmNlKCkuZ2V0Q29tcG9uZW50SW1wbEZhY3RvcnkocHJvamVjdCk7CisKKwkJCWlmKGZhY3RvcnkgIT0gbnVsbCkKKwkJCQlyZXR1cm4gZmFjdG9yeTsKKwogCQkJSUZhY2V0ZWRQcm9qZWN0IGZhY2V0ZWRQcm9qZWN0ID0gUHJvamVjdEZhY2V0c01hbmFnZXIuY3JlYXRlKHByb2plY3QpOwogCQkJaWYgKGZhY2V0ZWRQcm9qZWN0ID09IG51bGwpewotCQkJCWZhY3RvcnkgPSBnZXRDb21wb25lbnRJbXBsRmFjdG9yeShOT19GQUNFVFMpOwotCQkJCWZhY3RvcnlNYXAubWFyayhwcm9qZWN0LCBmYWN0b3J5KTsKKwkJCQlIYXNoU2V0IHNldCA9IG5ldyBIYXNoU2V0KCk7CisJCQkJc2V0LmFkZChOT19GQUNFVFMpOworCQkJCWZhY3RvcnkgPSBnZXRDb21wb25lbnRJbXBsRmFjdG9yeShzZXQpOworCQkJCUNvbXBvbmVudENhY2hlTWFuYWdlci5pbnN0YW5jZSgpLnNldENvbXBvbmVudEltcGxGYWN0b3J5KHByb2plY3QsIGZhY3RvcnkpOwogCQkJCXJldHVybiBmYWN0b3J5OwogCQkJfQotCQkJSXRlcmF0b3Iga2V5cyA9IGRlc2NyaXB0b3JzLmtleVNldCgpLml0ZXJhdG9yKCk7Ci0JCQl3aGlsZSAoa2V5cy5oYXNOZXh0KCkpIHsKLQkJCQlTdHJpbmcgdHlwZUlEID0gKFN0cmluZykga2V5cy5uZXh0KCk7Ci0JCQkJaWYodHlwZUlELmVxdWFscyhOT19GQUNFVFMpKXsKLQkJCQkJY29udGludWU7Ci0JCQkJfQotCQkJCXRyeSB7Ci0JCQkJCUlQcm9qZWN0RmFjZXQgcHJvamVjdEZhY2V0ID0gUHJvamVjdEZhY2V0c01hbmFnZXIuZ2V0UHJvamVjdEZhY2V0KHR5cGVJRCk7Ci0JCQkJCWlmIChwcm9qZWN0RmFjZXQgIT0gbnVsbCAmJiBmYWNldGVkUHJvamVjdC5oYXNQcm9qZWN0RmFjZXQocHJvamVjdEZhY2V0KSl7Ci0JCQkJCQlmYWN0b3J5ID0gZ2V0Q29tcG9uZW50SW1wbEZhY3RvcnkodHlwZUlEKTsKLQkJCQkJCWlmKG51bGwgIT0gZmFjdG9yeSl7Ci0JCQkJCQkJZmFjdG9yeU1hcC5tYXJrKHByb2plY3QsIGZhY3RvcnkpOwotCQkJCQkJCXJldHVybiBmYWN0b3J5OwotCQkJCQkJfQotCQkJCQl9Ci0JCQkJfSBjYXRjaCAoRXhjZXB0aW9uIGUpIHsKLQkJCQkJY29udGludWU7Ci0JCQkJfQotCQkJfQotCQkJCisJCQlyZXR1cm4gZmluZEZhY3RvcnlTdXBwb3J0aW5nRmFjZXRzRm9yUHJvamVjdChmYWNldGVkUHJvamVjdCk7CisKIAkJfSBjYXRjaCAoRXhjZXB0aW9uIGUpIHsKIAkJCU1vZHVsZWNvcmVQbHVnaW4ubG9nRXJyb3IoMCwgIlJldHVybmluZyBudWxsIGZhY3RvcnkgZm9yIHByb2plY3Q6ICIgKyBwcm9qZWN0LCBlKTsgLy8kTk9OLU5MUy0xJAotCQkJZmFjdG9yeU1hcC5tYXJrRXJyb3IocHJvamVjdCk7CisJCQlDb21wb25lbnRDYWNoZU1hbmFnZXIuaW5zdGFuY2UoKS5tYXJrRXJyb3JDb21wb25lbnRJbXBsRmFjdG9yeShwcm9qZWN0KTsKIAkJfQogCQlyZXR1cm4gbnVsbDsKIAl9Ci0JIAorCQorCQkKKwlwcml2YXRlIElDb21wb25lbnRJbXBsRmFjdG9yeSBmaW5kRmFjdG9yeVN1cHBvcnRpbmdGYWNldHNGb3JQcm9qZWN0KElGYWNldGVkUHJvamVjdCBmYWNldGVkUHJvamVjdCl7CisJCVNldDxJUHJvamVjdEZhY2V0VmVyc2lvbj4gcHJvamVjdEZhY2V0cyA9IGZhY2V0ZWRQcm9qZWN0LmdldFByb2plY3RGYWNldHMoKTsKKworCQlJQ29tcG9uZW50SW1wbEZhY3RvcnkgZmFjdG9yeSA9IG51bGw7CQorCisJCWlmKCBzb3J0ZWREZXNjcmlwdG9yc0tleUxpc3QgIT0gbnVsbCApeworCQkJZm9yKCBIYXNoU2V0IGtleSA6IHNvcnRlZERlc2NyaXB0b3JzS2V5TGlzdCApeworCQkJCQorCQkJCWJvb2xlYW4gaW52YWxpZERlc2NyaXB0b3IgPSBmYWxzZTsKKwkJCQlJdGVyYXRvciBpdGVyYXRvciA9IGtleS5pdGVyYXRvcigpOworCisJCQkJd2hpbGUgKGl0ZXJhdG9yLmhhc05leHQoKSkgeworCisJCQkJCVN0cmluZyB0eXBlSUQgPSAoU3RyaW5nKSBpdGVyYXRvci5uZXh0KCk7CisJCQkJCUlQcm9qZWN0RmFjZXQgcHJvamVjdEZhY2V0ID0gbnVsbDsKKwkJCQkJdHJ5eworCQkJCQkJcHJvamVjdEZhY2V0ID0gUHJvamVjdEZhY2V0c01hbmFnZXIuZ2V0UHJvamVjdEZhY2V0KHR5cGVJRCk7CisJCQkJCX1jYXRjaChFeGNlcHRpb24gZSl7CisJCQkJCQlpbnZhbGlkRGVzY3JpcHRvciA9IHRydWU7CisJCQkJCQlicmVhazsKKwkJCQkJfQorCQkJCQkvL2lmIGEgcHJvamVjdCBkb2VzIG5vdCBoYXZlIGEgZmFjZXQgc3VwcG9ydGVkIGJ5IHRoaXMgdHlwZSwgcmV0dXJuIAorCQkJCQlpZiAocHJvamVjdEZhY2V0ICE9IG51bGwgJiYgIWZhY2V0ZWRQcm9qZWN0Lmhhc1Byb2plY3RGYWNldChwcm9qZWN0RmFjZXQpKXsKKwkJCQkJCWludmFsaWREZXNjcmlwdG9yID0gdHJ1ZTsKKwkJCQkJCWJyZWFrOworCQkJCQl9CisJCQkJfQorCQkJCWlmKCAhaW52YWxpZERlc2NyaXB0b3IgKXsKKwkJCQkJZmFjdG9yeSA9IGdldENvbXBvbmVudEltcGxGYWN0b3J5KGtleSk7CisJCQkJCWlmKG51bGwgIT0gZmFjdG9yeSl7CisJCQkJCQlDb21wb25lbnRDYWNoZU1hbmFnZXIuaW5zdGFuY2UoKS5zZXRDb21wb25lbnRJbXBsRmFjdG9yeShmYWNldGVkUHJvamVjdC5nZXRQcm9qZWN0KCksIGZhY3RvcnkpOworCQkJCQkJcmV0dXJuIGZhY3Rvcnk7CisJCQkJCX0KKwkJCQl9CisJCQl9CisJCX0KKwkJcmV0dXJuIG51bGw7CisJfQorCiAJCiAJCiAJcHVibGljIElWaXJ0dWFsRm9sZGVyIGNyZWF0ZUZvbGRlcihJUHJvamVjdCBhUHJvamVjdCwgSVBhdGggYVJ1bnRpbWVQYXRoKXsKIAkJdHJ5IHsKLQkJCUlDb21wb25lbnRJbXBsRmFjdG9yeSBmYWN0b3J5ID0gZmluZEZhY3RvcnlGb3JQcm9qZWN0KGFQcm9qZWN0KTsKKwkJCUlDb21wb25lbnRJbXBsRmFjdG9yeSBmYWN0b3J5ID0gZmluZEZhY3RvcnlGb3JQcm9qZWN0KGFQcm9qZWN0LCBkZXNjcmlwdG9ycyk7CiAJCQlpZihudWxsICE9IGZhY3RvcnkpewogCQkJCXJldHVybiBmYWN0b3J5LmNyZWF0ZUZvbGRlcihhUHJvamVjdCwgYVJ1bnRpbWVQYXRoKTsKIAkJCX0KIAkJfSBjYXRjaCAoRXhjZXB0aW9uIGUpIHsKIAkJCS8vIEp1c3QgcmV0dXJuIGEgZGVmYXVsdCBmb2xkZXIKIAkJfQorCQlDb21wb25lbnRDYWNoZU1hbmFnZXIuaW5zdGFuY2UoKS5zZXRDb21wb25lbnRJbXBsRmFjdG9yeShhUHJvamVjdCwgbnVsbCk7CiAJCXJldHVybiBuZXcgVmlydHVhbEZvbGRlcihhUHJvamVjdCwgYVJ1bnRpbWVQYXRoKTsKIAl9CiAKIAlwdWJsaWMgSVZpcnR1YWxDb21wb25lbnQgY3JlYXRlQ29tcG9uZW50KElQcm9qZWN0IHByb2plY3QpIHsKKwkJcmV0dXJuIGNyZWF0ZUNvbXBvbmVudChwcm9qZWN0LCB0cnVlKTsKKwl9CisKKwlwdWJsaWMgSVZpcnR1YWxDb21wb25lbnQgY3JlYXRlQ29tcG9uZW50KElQcm9qZWN0IHByb2plY3QsIGJvb2xlYW4gY2hlY2tTZXR0aW5ncykgewogCQl0cnkgewotCQkJSUNvbXBvbmVudEltcGxGYWN0b3J5IGZhY3RvcnkgPSBmaW5kRmFjdG9yeUZvclByb2plY3QocHJvamVjdCk7CisJCQlJVmlydHVhbENvbXBvbmVudCBjb21wb25lbnQgPSBDb21wb25lbnRDYWNoZU1hbmFnZXIuaW5zdGFuY2UoKS5nZXRDb21wb25lbnQocHJvamVjdCk7CisJCQlpZihjb21wb25lbnQgIT0gbnVsbCkgeworCQkJCXJldHVybiBjb21wb25lbnQ7CisJCQl9CQkKKworCQkJSUNvbXBvbmVudEltcGxGYWN0b3J5IGZhY3RvcnkgPSBmaW5kRmFjdG9yeUZvclByb2plY3QocHJvamVjdCwgZGVzY3JpcHRvcnMpOwogCQkJaWYobnVsbCAhPSBmYWN0b3J5KXsKLQkJCQlyZXR1cm4gZmFjdG9yeS5jcmVhdGVDb21wb25lbnQocHJvamVjdCk7CisJCQkJY29tcG9uZW50ID0gZmFjdG9yeS5jcmVhdGVDb21wb25lbnQocHJvamVjdCk7CisJCQkJaWYoY29tcG9uZW50ICE9IG51bGwpIHsKKwkJCQkJQ29tcG9uZW50Q2FjaGVNYW5hZ2VyLmluc3RhbmNlKCkuc2V0Q29tcG9uZW50KHByb2plY3QsIGNvbXBvbmVudCk7CisJCQkJCXJlZ2lzdGVyTGlzdGVuZXIocHJvamVjdCk7CisJCQkJfQorCQkJCXJldHVybiBjb21wb25lbnQ7CiAJCQl9CiAJCX0gY2F0Y2ggKEV4Y2VwdGlvbiBlKSB7CiAJCQkvLyBKdXN0IHJldHVybiBhIGRlZmF1bHQgY29tcG9uZW50CiAJCX0KLQkJaWYgKCFNb2R1bGVDb3JlTmF0dXJlLmlzRmxleGlibGVQcm9qZWN0KHByb2plY3QpKXsKLQkJCXJldHVybiBudWxsOworCQlpZihjaGVja1NldHRpbmdzKSB7CisJCQlpZiAoIU1vZHVsZUNvcmVOYXR1cmUuaXNGbGV4aWJsZVByb2plY3QocHJvamVjdCkpeworCQkJCXJldHVybiBudWxsOworCQkJfQogCQl9Ci0JCXJldHVybiBuZXcgVmlydHVhbENvbXBvbmVudChwcm9qZWN0LCBuZXcgUGF0aCgiLyIpKTsgLy8kTk9OLU5MUy0xJAorCQllbHNlIHsKKwkJCWlmIChNb2R1bGVDb3JlTmF0dXJlLmdldE1vZHVsZUNvcmVOYXR1cmUocHJvamVjdCkgPT0gbnVsbCl7CisJCQkJcmV0dXJuIG51bGw7CisJCQl9CisJCX0KKwkJSVZpcnR1YWxDb21wb25lbnQgY29tcG9uZW50ID0gbmV3IFZpcnR1YWxDb21wb25lbnQocHJvamVjdCwgbmV3IFBhdGgoIi8iKSk7IC8vJE5PTi1OTFMtMSQKKwkJaWYoY29tcG9uZW50ICE9IG51bGwpIHsKKwkJCUNvbXBvbmVudENhY2hlTWFuYWdlci5pbnN0YW5jZSgpLnNldENvbXBvbmVudEltcGxGYWN0b3J5KHByb2plY3QsIG51bGwpOworCQkJQ29tcG9uZW50Q2FjaGVNYW5hZ2VyLmluc3RhbmNlKCkuc2V0Q29tcG9uZW50KHByb2plY3QsIGNvbXBvbmVudCk7CisJCQlyZWdpc3Rlckxpc3RlbmVyKHByb2plY3QpOworCQl9CisKKwkJcmV0dXJuIGNvbXBvbmVudDsKIAl9CiAKIAlwdWJsaWMgSVZpcnR1YWxDb21wb25lbnQgY3JlYXRlQXJjaGl2ZUNvbXBvbmVudChJUHJvamVjdCBhUHJvamVjdCwgU3RyaW5nIGFDb21wb25lbnROYW1lKSB7CisJCXJldHVybiBjcmVhdGVBcmNoaXZlQ29tcG9uZW50KGFQcm9qZWN0LCBhQ29tcG9uZW50TmFtZSwgbmV3IFBhdGgoIi8iKSk7CisJfQorCQorCXB1YmxpYyBJVmlydHVhbENvbXBvbmVudCBjcmVhdGVBcmNoaXZlQ29tcG9uZW50KElQcm9qZWN0IGFQcm9qZWN0LCBTdHJpbmcgYUNvbXBvbmVudE5hbWUsIElQYXRoIHBhdGgpIHsKKwkJcGF0aCA9IHBhdGggPT0gbnVsbCA/IG5ldyBQYXRoKCIvIikgOiBwYXRoOyAvLyROT04tTkxTLTEkCiAJCXRyeSB7Ci0JCQlJQ29tcG9uZW50SW1wbEZhY3RvcnkgZmFjdG9yeSA9IGZpbmRGYWN0b3J5Rm9yUHJvamVjdChhUHJvamVjdCk7CisJCQlJVmlydHVhbENvbXBvbmVudCBjb21wb25lbnQgPSBDb21wb25lbnRDYWNoZU1hbmFnZXIuaW5zdGFuY2UoKS5nZXRBcmNoaXZlQ29tcG9uZW50KGFQcm9qZWN0LCBhQ29tcG9uZW50TmFtZSk7CisJCQlpZihjb21wb25lbnQgIT0gbnVsbCkKKwkJCQlyZXR1cm4gY29tcG9uZW50OworCisJCQlpZighQ29tcG9uZW50Q2FjaGVNYW5hZ2VyLmluc3RhbmNlKCkuaXNWYWxpZENvbXBvbmVudEltcGxGYWN0b3J5KGFQcm9qZWN0KSkgeworCQkJCXJlZ2lzdGVyTGlzdGVuZXIoYVByb2plY3QpOworCQkJfQorCisJCQlJQ29tcG9uZW50SW1wbEZhY3RvcnkgZmFjdG9yeSA9IGZpbmRGYWN0b3J5Rm9yUHJvamVjdChhUHJvamVjdCwgZGVzY3JpcHRvcnMpOwogCQkJaWYobnVsbCAhPSBmYWN0b3J5KXsKLQkJCQlyZXR1cm4gZmFjdG9yeS5jcmVhdGVBcmNoaXZlQ29tcG9uZW50KGFQcm9qZWN0LCBhQ29tcG9uZW50TmFtZSwgbmV3IFBhdGgoIi8iKSk7IC8vJE5PTi1OTFMtMSQKKwkJCQlJVmlydHVhbENvbXBvbmVudCBhcmNoaXZlQ29tcG9uZW50ID0gZmFjdG9yeS5jcmVhdGVBcmNoaXZlQ29tcG9uZW50KGFQcm9qZWN0LCBhQ29tcG9uZW50TmFtZSwgcGF0aCk7CisJCQkJQ29tcG9uZW50Q2FjaGVNYW5hZ2VyLmluc3RhbmNlKCkuc2V0QXJjaGl2ZUNvbXBvbmVudChhUHJvamVjdCwgYUNvbXBvbmVudE5hbWUsIGFyY2hpdmVDb21wb25lbnQpOworCQkJCXJldHVybiBhcmNoaXZlQ29tcG9uZW50OwogCQkJfQogCQl9IGNhdGNoIChFeGNlcHRpb24gZSkgewogCQkJLy8gSnVzdCByZXR1cm4gYSBkZWZhdWx0IGFyY2hpdmUgY29tcG9uZW50CiAJCX0KLQkJcmV0dXJuIG5ldyBWaXJ0dWFsQXJjaGl2ZUNvbXBvbmVudChhUHJvamVjdCwgYUNvbXBvbmVudE5hbWUsIG5ldyBQYXRoKCIvIikpOyAvLyROT04tTkxTLTEkCisJCUNvbXBvbmVudENhY2hlTWFuYWdlci5pbnN0YW5jZSgpLnNldENvbXBvbmVudEltcGxGYWN0b3J5KGFQcm9qZWN0LCBudWxsKTsKKwkJSVZpcnR1YWxDb21wb25lbnQgYXJjaGl2ZUNvbXBvbmVudCA9IG5ldyBWaXJ0dWFsQXJjaGl2ZUNvbXBvbmVudChhUHJvamVjdCwgYUNvbXBvbmVudE5hbWUsIHBhdGgpOyAvLyROT04tTkxTLTEkCisJCUNvbXBvbmVudENhY2hlTWFuYWdlci5pbnN0YW5jZSgpLnNldEFyY2hpdmVDb21wb25lbnQoYVByb2plY3QsIGFDb21wb25lbnROYW1lLCBhcmNoaXZlQ29tcG9uZW50KTsKKwkJcmV0dXJuIGFyY2hpdmVDb21wb25lbnQ7CiAJfQogCQorCXByaXZhdGUgdm9pZCByZWdpc3Rlckxpc3RlbmVyKElQcm9qZWN0IGFQcm9qZWN0KSB7CisJCVByb2plY3RSZXNvdXJjZVNldCByZXNTZXQgPSBnZXRSZXNvdXJjZVNldChhUHJvamVjdCk7CisJCWlmIChyZXNTZXQgPT0gbnVsbCB8fCByZXNTZXQuZ2V0U3luY2hyb25pemVyKCkgPT0gbnVsbCkKKwkJCXJldHVybjsKKwkJcmVzU2V0LmdldFN5bmNocm9uaXplcigpLmFkZEV4dGVuZGVyKHRoaXMpOworCX0KKworCXByb3RlY3RlZCBQcm9qZWN0UmVzb3VyY2VTZXQgZ2V0UmVzb3VyY2VTZXQoSVByb2plY3QgcHJvaikgeworCQlyZXR1cm4gKFByb2plY3RSZXNvdXJjZVNldClXb3JrYmVuY2hSZXNvdXJjZUhlbHBlckJhc2UuZ2V0UmVzb3VyY2VTZXQocHJvaik7CisJfQorCisJcHVibGljIHZvaWQgcHJvamVjdENoYW5nZWQoSVJlc291cmNlRGVsdGEgZGVsdGEpIHsKKwkJLy8gVE9ETyBBdXRvLWdlbmVyYXRlZCBtZXRob2Qgc3R1YgorCisJfQorCisJcHVibGljIHN5bmNocm9uaXplZCB2b2lkIHByb2plY3RDbG9zZWQoKSB7CisJCUNvbXBvbmVudENhY2hlTWFuYWdlci5pbnN0YW5jZSgpLmNsZWFyQ2FjaGUoKTsKKwl9CisKKwlwcml2YXRlIHN0YXRpYyBjbGFzcyBDb21wb25lbnRDYWNoZU1hbmFnZXIgIHsKKwkJcHJpdmF0ZSBzdGF0aWMgZmluYWwgQ29tcG9uZW50Q2FjaGVNYW5hZ2VyIGluc3RhbmNlID0gbmV3IENvbXBvbmVudENhY2hlTWFuYWdlcigpOworCisJCXByaXZhdGUgZmluYWwgUmVzb3VyY2VUaW1lc3RhbXBNYXBwaW5ncyBmYWN0b3J5TWFwID0gbmV3IFJlc291cmNlVGltZXN0YW1wTWFwcGluZ3MoKTsJCisJCXByaXZhdGUgZmluYWwgTWFwIDxJUHJvamVjdCAsIElWaXJ0dWFsQ29tcG9uZW50PiBjb21wb25lbnRzTWFwID0gbmV3IEhhc2h0YWJsZTxJUHJvamVjdCAsIElWaXJ0dWFsQ29tcG9uZW50PigpOworCQlwcml2YXRlIGZpbmFsIE1hcCA8SVByb2plY3QgLCBNYXA8U3RyaW5nLCBJVmlydHVhbENvbXBvbmVudD4+IGNvbXBvbmVudHNBcmNoaXZlc01hcCA9IG5ldyBIYXNodGFibGU8SVByb2plY3QgLCBNYXA8U3RyaW5nLCBJVmlydHVhbENvbXBvbmVudD4+KCk7CisKKwkJcHJpdmF0ZSBPYmplY3QgY2FjaGVMb2NrID0gbmV3IE9iamVjdCgpOworCisJCXB1YmxpYyBDb21wb25lbnRDYWNoZU1hbmFnZXIoKSB7fQorCisJCXB1YmxpYyBzdGF0aWMgQ29tcG9uZW50Q2FjaGVNYW5hZ2VyIGluc3RhbmNlKCkgeworCQkJcmV0dXJuIGluc3RhbmNlOworCQl9CisKKwkJcHVibGljIElDb21wb25lbnRJbXBsRmFjdG9yeSBnZXRDb21wb25lbnRJbXBsRmFjdG9yeShJUHJvamVjdCBwcm9qZWN0KSB7CisJCQlzeW5jaHJvbml6ZWQgKGNhY2hlTG9jaykgeworCQkJCWlmKGlzVmFsaWRDb21wb25lbnRJbXBsRmFjdG9yeShwcm9qZWN0KSkgeworCQkJCQlPYmplY3QgZGF0YSA9IGZhY3RvcnlNYXAuZ2V0RGF0YShwcm9qZWN0KTsKKwkJCQkJaWYoZGF0YSBpbnN0YW5jZW9mIElDb21wb25lbnRJbXBsRmFjdG9yeSkKKwkJCQkJCXJldHVybiAoSUNvbXBvbmVudEltcGxGYWN0b3J5KSBkYXRhOworCQkJCX0KKwkJCQlyZXR1cm4gbnVsbDsKKwkJCX0KKwkJfQorCisJCXB1YmxpYyBib29sZWFuIGlzVmFsaWRDb21wb25lbnRJbXBsRmFjdG9yeShJUHJvamVjdCBwcm9qZWN0KSB7CisJCQlzeW5jaHJvbml6ZWQgKGNhY2hlTG9jaykgeworCQkJCWlmKCFmYWN0b3J5TWFwLmhhc0NoYW5nZWQocHJvamVjdCkgJiYgIWZhY3RvcnlNYXAuaGFzQ2FjaGVFcnJvcihwcm9qZWN0KSAmJiBmYWN0b3J5TWFwLmhhc0NhY2hlRGF0YShwcm9qZWN0KSkKKwkJCQkJcmV0dXJuIHRydWU7CisJCQkJcmV0dXJuIGZhbHNlOworCQkJfQorCQl9CisKKwkJcHVibGljIHZvaWQgc2V0Q29tcG9uZW50SW1wbEZhY3RvcnkoSVByb2plY3QgcHJvamVjdCwgSUNvbXBvbmVudEltcGxGYWN0b3J5IGZhY3RvcnkpeworCQkJc3luY2hyb25pemVkIChjYWNoZUxvY2spIHsKKwkJCQlpZihmYWN0b3J5ICE9IG51bGwpIHsKKwkJCQkJZmFjdG9yeU1hcC5tYXJrKHByb2plY3QsIGZhY3RvcnkpOworCQkJCX0KKwkJCQllbHNlIHsKKwkJCQkJZmFjdG9yeU1hcC5tYXJrKHByb2plY3QsIHByb2plY3QpOworCQkJCX0KKwkJCX0KKwkJfQorCisJCXB1YmxpYyB2b2lkIG1hcmtFcnJvckNvbXBvbmVudEltcGxGYWN0b3J5KElQcm9qZWN0IHByb2plY3QpeworCQkJc3luY2hyb25pemVkIChjYWNoZUxvY2spIHsKKwkJCQlmYWN0b3J5TWFwLm1hcmtFcnJvcihwcm9qZWN0KTsKKwkJCX0KKwkJfQorCisJCXB1YmxpYyBJVmlydHVhbENvbXBvbmVudCBnZXRDb21wb25lbnQoSVByb2plY3QgcHJvamVjdCkgeworCQkJc3luY2hyb25pemVkIChjYWNoZUxvY2spIHsKKwkJCQlpZihjb21wb25lbnRzTWFwLmNvbnRhaW5zS2V5KHByb2plY3QpKSB7CisJCQkJCWlmKGlzVmFsaWRDb21wb25lbnRJbXBsRmFjdG9yeShwcm9qZWN0KSkgeworCQkJCQkJcmV0dXJuIGNvbXBvbmVudHNNYXAuZ2V0KHByb2plY3QpOworCQkJCQl9IGVsc2UgeworCQkJCQkJY29tcG9uZW50c01hcC5yZW1vdmUocHJvamVjdCk7CisJCQkJCX0KKwkJCQl9CisJCQkJcmV0dXJuIG51bGw7CisJCQl9CisJCX0KKworCQlwdWJsaWMgdm9pZCBzZXRDb21wb25lbnQoSVByb2plY3QgcHJvamVjdCwgSVZpcnR1YWxDb21wb25lbnQgY29tcG9uZW50KSB7CisJCQlzeW5jaHJvbml6ZWQgKGNhY2hlTG9jaykgeworCQkJCWlmKGNvbXBvbmVudCAhPSBudWxsKQorCQkJCQljb21wb25lbnRzTWFwLnB1dChwcm9qZWN0LCBjb21wb25lbnQpOworCQkJfQorCQl9CisKKwkJcHVibGljIElWaXJ0dWFsQ29tcG9uZW50IGdldEFyY2hpdmVDb21wb25lbnQoSVByb2plY3QgcHJvamVjdCwgU3RyaW5nIGNvbXBvbmVudE5hbWUpIHsKKwkJCXN5bmNocm9uaXplZCAoY2FjaGVMb2NrKSB7CisJCQkJTWFwIGFyY2hpdmVzID0gZ2V0Q29tcG9uZW50QXJjaGl2ZXMocHJvamVjdCk7CQkJCisJCQkJaWYoaXNWYWxpZENvbXBvbmVudEltcGxGYWN0b3J5KHByb2plY3QpKSB7CisJCQkJCWlmKGFyY2hpdmVzLmNvbnRhaW5zS2V5KGNvbXBvbmVudE5hbWUpKSB7CisJCQkJCQlyZXR1cm4gKElWaXJ0dWFsQ29tcG9uZW50KSBhcmNoaXZlcy5nZXQoY29tcG9uZW50TmFtZSk7CisJCQkJCX0KKwkJCQl9CisJCQkJZWxzZSB7CisJCQkJCWFyY2hpdmVzID0gbmV3IEhhc2h0YWJsZTxTdHJpbmcsIElWaXJ0dWFsQ29tcG9uZW50PigpOworCQkJCQljb21wb25lbnRzQXJjaGl2ZXNNYXAucHV0KHByb2plY3QsIGFyY2hpdmVzKTsKKwkJCQl9CisJCQkJcmV0dXJuIG51bGw7CisJCQl9CisJCX0KKworCQlwdWJsaWMgTWFwIGdldENvbXBvbmVudEFyY2hpdmVzKElQcm9qZWN0IHByb2plY3QpIHsKKwkJCXN5bmNocm9uaXplZCAoY2FjaGVMb2NrKSB7CisJCQkJTWFwIGFyY2hpdmVzID0gY29tcG9uZW50c0FyY2hpdmVzTWFwLmdldChwcm9qZWN0KTsKKwkJCQlpZihhcmNoaXZlcyA9PSBudWxsKSB7CisJCQkJCWFyY2hpdmVzID0gbmV3IEhhc2h0YWJsZTxTdHJpbmcsIElWaXJ0dWFsQ29tcG9uZW50PigpOworCQkJCQljb21wb25lbnRzQXJjaGl2ZXNNYXAucHV0KHByb2plY3QsIGFyY2hpdmVzKTsKKwkJCQl9CisJCQkJcmV0dXJuIGFyY2hpdmVzOworCQkJfQorCQl9CisKKwkJcHVibGljIHZvaWQgc2V0QXJjaGl2ZUNvbXBvbmVudChJUHJvamVjdCBwcm9qZWN0LCBTdHJpbmcgY29tcG9uZW50TmFtZSwgSVZpcnR1YWxDb21wb25lbnQgYXJjaGl2ZUNvbXBvbmVudCkgeworCQkJc3luY2hyb25pemVkIChjYWNoZUxvY2spIHsKKwkJCQlpZihhcmNoaXZlQ29tcG9uZW50ICE9IG51bGwpIHsKKwkJCQkJTWFwIGFyY2hpdmVzID0gQ29tcG9uZW50Q2FjaGVNYW5hZ2VyLmluc3RhbmNlKCkuZ2V0Q29tcG9uZW50QXJjaGl2ZXMocHJvamVjdCk7CisJCQkJCWFyY2hpdmVzLnB1dChjb21wb25lbnROYW1lLCBhcmNoaXZlQ29tcG9uZW50KTsKKwkJCQl9CisJCQl9CisJCX0KKworCisJCXB1YmxpYyB2b2lkIGNsZWFyQ2FjaGUoKSB7CisJCQlPYmplY3RbXSBjb21wb25lbnRzID0gbnVsbDsKKwkJCU9iamVjdFtdIGNvbXBvbmVudHNBcmNoaXZlcyA9IG51bGw7CisJCQlzeW5jaHJvbml6ZWQgKGNhY2hlTG9jaykgeworCQkJCWNvbXBvbmVudHMgPSAoT2JqZWN0W10pIGNvbXBvbmVudHNNYXAudmFsdWVzKCkudG9BcnJheSgpOworCQkJCWNvbXBvbmVudHNNYXAuY2xlYXIoKTsKKwkJCQkKKwkJCQljb21wb25lbnRzQXJjaGl2ZXMgPSAoT2JqZWN0W10pIGNvbXBvbmVudHNBcmNoaXZlc01hcC52YWx1ZXMoKS50b0FycmF5KCk7CisJCQkJY29tcG9uZW50c0FyY2hpdmVzTWFwLmNsZWFyKCk7CisJCQl9CisJCQkKKwkJCWZvcihpbnQgaSA9IDA7IGkgPCBjb21wb25lbnRzLmxlbmd0aDsgaSsrKSB7CisJCQkJaWYoY29tcG9uZW50c1tpXSBpbnN0YW5jZW9mIFZpcnR1YWxDb21wb25lbnQpCisJCQkJCSgoVmlydHVhbENvbXBvbmVudCljb21wb25lbnRzW2ldKS5kaXNwb3NlKCk7CisJCQl9CisJCQkKKwkJCWZvcihpbnQgaSA9IDA7IGkgPCBjb21wb25lbnRzQXJjaGl2ZXMubGVuZ3RoOyBpKyspIHsKKwkJCQlpZihjb21wb25lbnRzQXJjaGl2ZXNbaV0gaW5zdGFuY2VvZiBWaXJ0dWFsQ29tcG9uZW50KQorCQkJCQkoKFZpcnR1YWxDb21wb25lbnQpY29tcG9uZW50c0FyY2hpdmVzW2ldKS5kaXNwb3NlKCk7CisJCQl9CisJCX0KKwl9CisKIAlwcml2YXRlIGNsYXNzIENvbXBvbmVudEltcGxEZXNjcmlwdG9yIHsKIAogCQlwcml2YXRlIGZpbmFsIElDb25maWd1cmF0aW9uRWxlbWVudCBlbGVtZW50OwotCQlwcml2YXRlIGZpbmFsIFN0cmluZyB0eXBlOwotCisJCQogCQlwdWJsaWMgQ29tcG9uZW50SW1wbERlc2NyaXB0b3IoSUNvbmZpZ3VyYXRpb25FbGVtZW50IGNvbmZpZ0VsZW1lbnQpIHsKIAkJCWVsZW1lbnQgPSBjb25maWdFbGVtZW50OwotCQkJdHlwZSA9IGVsZW1lbnQuZ2V0QXR0cmlidXRlKEFUVF9UWVBFKTsKIAkJfQogCiAJCS8qKgpAQCAtMjE2LDE1ICs0NTYsNiBAQAogCiAJCQlyZXR1cm4gZmFjdG9yeVswXTsKIAkJfQotCi0JCS8qKgotCQkgKiAKLQkJICogQHJldHVybiBUaGUgdHlwZSBpZCBvZiB0aGlzIEFydGlmYWN0RWRpdCBkZWZpbml0aW9uCi0JCSAqLwotCQlwdWJsaWMgU3RyaW5nIGdldFR5cGUoKSB7Ci0JCQlyZXR1cm4gdHlwZTsKLQkJfQotCiAJfQogCQogCXByaXZhdGUgY2xhc3MgQ29tcG9uZW50SW1wbFJlZ2lzdHJ5UmVhZGVyIGV4dGVuZHMgUmVnaXN0cnlSZWFkZXIgewpAQCAtMjQ0LDkgKzQ3NSwyMCBAQAogCQkJCSAqIHRoZSByZWdpc3RyeSBpcyBpbml0aWFsaXplZCBpbiB0aGUgY29uc3RydWN0b3Igb2YgdGhpcyB0eXBlLCBvdGhlciB0aHJlYWRzIGNhbm5vdAogCQkJCSAqIGNvbXBldGUgd2l0aCByZWFkRWxlbWVudCgpIGZvciBhY2Nlc3MgdG8gPGk+ZGVzY3JpcHRvcnM8L2k+CiAJCQkJICovCisJCQkJCisJCQkJSGFzaFNldDxTdHJpbmc+IHNldE9mSWRzID0gbmV3IEhhc2hTZXQ8U3RyaW5nPigpOworCQkJCXNldE9mSWRzLmFkZCggZWxlbWVudC5nZXRBdHRyaWJ1dGUoQVRUX1RZUEUpICk7CisJCQkJCisJCQkJSUNvbmZpZ3VyYXRpb25FbGVtZW50W10gY2hpbGQgPSBlbGVtZW50LmdldENoaWxkcmVuKEVYVEVOREVEX0VMRU1FTlQpOworCQkJCWlmKCBjaGlsZC5sZW5ndGggPiAwICl7CisJCQkJCWZvciggaW50IGk9MDsgaTwgY2hpbGQubGVuZ3RoOyBpKysgKXsKKwkJCQkJCXNldE9mSWRzLmFkZChjaGlsZFtpXS5nZXRWYWx1ZSgpKTsKKwkJCQkJfQorCQkJCX0KIAkJCQlTdHJpbmcgdHlwZSA9IGVsZW1lbnQuZ2V0QXR0cmlidXRlKEFUVF9UWVBFKTsKIAkJCQlpZiAodHlwZSAhPSBudWxsKQotCQkJCQlkZXNjcmlwdG9ycy5wdXQoZWxlbWVudC5nZXRBdHRyaWJ1dGUoQVRUX1RZUEUpLCBuZXcgQ29tcG9uZW50SW1wbERlc2NyaXB0b3IoZWxlbWVudCkpOworCQkJCQlkZXNjcmlwdG9ycy5wdXQoc2V0T2ZJZHMsIG5ldyBDb21wb25lbnRJbXBsRGVzY3JpcHRvcihlbGVtZW50KSk7CisJCQkJCS8vZGVzY3JpcHRvcnMucHV0KGVsZW1lbnQuZ2V0QXR0cmlidXRlKEFUVF9UWVBFKSwgbmV3IENvbXBvbmVudEltcGxEZXNjcmlwdG9yKGVsZW1lbnQpKTsKIAkJCQllbHNlCiAJCQkJCU1vZHVsZWNvcmVQbHVnaW4ubG9nRXJyb3IoMCwgIk5vIHR5cGUgYXR0cmlidXRlIGlzIHNwZWNpZmllZCBmb3IgIiArIC8vJE5PTi1OTFMtMSQKIAkJCQkJCQkJTW9kdWxlY29yZVBsdWdpbi5QTFVHSU5fSUQgKyAiLiIgKyBDT01QT05FTlRfSU1QTF9FWFRFTlNJT05fUE9JTlQgKyAvLyROT04tTkxTLTEkIApkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUvbW9kdWxlY29yZS1zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9jb21wb25lbnRjb3JlL2ludGVybmFsL3V0aWwvQ29tcG9uZW50UmVzb2x2ZXIuamF2YSBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlL21vZHVsZWNvcmUtc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vY29tcG9uZW50Y29yZS9pbnRlcm5hbC91dGlsL0NvbXBvbmVudFJlc29sdmVyLmphdmEKaW5kZXggOTRmODMzNC4uYzZhODNiYiAxMDA2NDQKLS0tIGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUvbW9kdWxlY29yZS1zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9jb21wb25lbnRjb3JlL2ludGVybmFsL3V0aWwvQ29tcG9uZW50UmVzb2x2ZXIuamF2YQorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS9tb2R1bGVjb3JlLXNyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2NvbXBvbmVudGNvcmUvaW50ZXJuYWwvdXRpbC9Db21wb25lbnRSZXNvbHZlci5qYXZhCkBAIC0xLDUgKzEsNSBAQAogLyoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioKLSAqIENvcHlyaWdodCAoYykgMjAwMSwgMjAwNyBJQk0gQ29ycG9yYXRpb24gYW5kIG90aGVycy4KKyAqIENvcHlyaWdodCAoYykgMjAwMSwgMjAwOSBJQk0gQ29ycG9yYXRpb24gYW5kIG90aGVycy4KICAqIEFsbCByaWdodHMgcmVzZXJ2ZWQuIFRoaXMgcHJvZ3JhbSBhbmQgdGhlIGFjY29tcGFueWluZyBtYXRlcmlhbHMKICAqIGFyZSBtYWRlIGF2YWlsYWJsZSB1bmRlciB0aGUgdGVybXMgb2YgdGhlIEVjbGlwc2UgUHVibGljIExpY2Vuc2UgdjEuMAogICogd2hpY2ggYWNjb21wYW5pZXMgdGhpcyBkaXN0cmlidXRpb24sIGFuZCBpcyBhdmFpbGFibGUgYXQKQEAgLTMxLDEwICszMSwxMCBAQAogaW1wb3J0IG9yZy5vc2dpLmZyYW1ld29yay5CdW5kbGU7CiAKIHB1YmxpYyBjbGFzcyBDb21wb25lbnRSZXNvbHZlciBpbXBsZW1lbnRzIFVSSVJlc29sdmVyRXh0ZW5zaW9uIHsKLQlwcml2YXRlIHN0YXRpYyBib29sZWFuIF9ERUJVRyA9ICJ0cnVlIi5lcXVhbHMoUGxhdGZvcm0uZ2V0RGVidWdPcHRpb24oIm9yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS9Db21wb25lbnRSZXNvbHZlciIpKTsgLy8kTk9OLU5MUy0xJCAvLyROT04tTkxTLTIkIAorCXByaXZhdGUgc3RhdGljIGJvb2xlYW4gX0RFQlVHID0gQm9vbGVhbi52YWx1ZU9mKFBsYXRmb3JtLmdldERlYnVnT3B0aW9uKCJvcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUvQ29tcG9uZW50UmVzb2x2ZXIiKSkuYm9vbGVhblZhbHVlKCk7IC8vJE5PTi1OTFMtMSQgCiAJcHJpdmF0ZSBzdGF0aWMgZmluYWwgU3RyaW5nIEZJTEVfUFJPVE9DT0wgPSAiZmlsZTovLy8iOyAvLyROT04tTkxTLTEkCiAJcHJpdmF0ZSBzdGF0aWMgZmluYWwgU3RyaW5nIEZJTEVfUFJPVE9DT0wyID0gImZpbGU6Ly8iOyAvLyROT04tTkxTLTEkCi0JcHJpdmF0ZSBzdGF0aWMgZmluYWwgU3RyaW5nIFJPT1RfUEFUSF9TVFJJTkcgPSBQYXRoLlJPT1QudG9TdHJpbmcoKTsgLy8kTk9OLU5MUy0xJAorCXByaXZhdGUgc3RhdGljIGZpbmFsIFN0cmluZyBST09UX1BBVEhfU1RSSU5HID0gUGF0aC5ST09ULnRvU3RyaW5nKCk7CiAJcHJpdmF0ZSBzdGF0aWMgZmluYWwgU3RyaW5nIEhUVFBfUFJPVE9DT0wgPSAiaHR0cDoiOyAvLyROT04tTkxTLTEkCiAKIAkvKioKQEAgLTEwNyw3ICsxMDcsNyBAQAogCiAJCS8qIFJlY29tcHV0ZSB0aGUgSUZpbGUsIGlmIG5lZWRlZCwgZnJvbSB0aGUgYmFzZSBsb2NhdGlvbi4gKi8KIAkJaWYgKGZpbGUgPT0gbnVsbCkgewotCQkJaWYgKGJhc2VMb2NhdGlvbiA9PSBudWxsIHx8IGJhc2VMb2NhdGlvbi5sZW5ndGgoKSA9PSAwKSB7CisJCQlpZiAoYmFzZUxvY2F0aW9uID09IG51bGwgfHwgYmFzZUxvY2F0aW9uLmxlbmd0aCgpID09IDAgfHwgYmFzZUxvY2F0aW9uLnN0YXJ0c1dpdGgoIndiaXQ6IikpIHsgLy8kTk9OLU5MUy0xJAogCQkJCS8qCiAJCQkJICogV2UgY2FuJ3QgcHJvY2VlZCBpZiB3ZSBsYWNrIGJvdGggYW4gSUZpbGUgYW5kIGEgc3lzdGVtCiAJCQkJICogcmVmZXJlbmNlCkBAIC0xOTEsNiArMTkxLDEwIEBACiAJCQkJSVBhdGggcmVzb2x2ZWRSdW50aW1lUGF0aCA9IG51bGw7CiAJCQkJaWYgKHN5c3RlbUlkLnN0YXJ0c1dpdGgoUk9PVF9QQVRIX1NUUklORykpIHsKIAkJCQkJcmVzb2x2ZWRSdW50aW1lUGF0aCA9IG5ldyBQYXRoKHN5c3RlbUlkKTsKKwkJCQkJLyogaHR0cHM6Ly9idWdzLmVjbGlwc2Uub3JnLzI4NDAxNyAtIENvbXBvbmVudFJlc29sdmVyIGRvZXMgbm90IHJlc29sdmUgYWJzb2x1dGUgcmVmZXJlbmNlcyB0byB0aGUgY29udGV4dCByb290ICovCisJCQkJCWlmIChyZXNvbHZlZFJ1bnRpbWVQYXRoLnNlZ21lbnRDb3VudCgpID4gMSAmJiByZXNvbHZlZFJ1bnRpbWVQYXRoLnNlZ21lbnQoMCkuZXF1YWxzKENvbXBvbmVudFV0aWxpdGllcy5nZXRTZXJ2ZXJDb250ZXh0Um9vdChmaWxlLmdldFByb2plY3QoKSkpKSB7CisJCQkJCQlyZXNvbHZlZFJ1bnRpbWVQYXRoID0gcmVzb2x2ZWRSdW50aW1lUGF0aC5yZW1vdmVGaXJzdFNlZ21lbnRzKDEpOworCQkJCQl9CiAJCQkJfQogCQkJCWVsc2UgewogCQkJCQlyZXNvbHZlZFJ1bnRpbWVQYXRoID0gbmV3IFBhdGgodmlydHVhbFJlc291cmNlc1tpXS5nZXRSdW50aW1lUGF0aCgpLnJlbW92ZUxhc3RTZWdtZW50cygxKS5hcHBlbmQoc3lzdGVtSWQpLnRvU3RyaW5nKCkpOwpkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUvbW9kdWxlY29yZS1zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9jb21wb25lbnRjb3JlL2ludGVybmFsL3V0aWwvQ29tcG9uZW50VXRpbGl0aWVzLmphdmEgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS9tb2R1bGVjb3JlLXNyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2NvbXBvbmVudGNvcmUvaW50ZXJuYWwvdXRpbC9Db21wb25lbnRVdGlsaXRpZXMuamF2YQppbmRleCBiYTVhZmEwLi42MTUwYWRhIDEwMDY0NAotLS0gYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS9tb2R1bGVjb3JlLXNyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2NvbXBvbmVudGNvcmUvaW50ZXJuYWwvdXRpbC9Db21wb25lbnRVdGlsaXRpZXMuamF2YQorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS9tb2R1bGVjb3JlLXNyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2NvbXBvbmVudGNvcmUvaW50ZXJuYWwvdXRpbC9Db21wb25lbnRVdGlsaXRpZXMuamF2YQpAQCAtMTIsOCArMTIsMTEgQEAKIAogaW1wb3J0IGphdmEudXRpbC5BcnJheUxpc3Q7CiBpbXBvcnQgamF2YS51dGlsLkFycmF5czsKK2ltcG9ydCBqYXZhLnV0aWwuSGFzaE1hcDsKIGltcG9ydCBqYXZhLnV0aWwuTGlzdDsKK2ltcG9ydCBqYXZhLnV0aWwuTWFwOwogCitpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5jb21tYW5kcy5FeGVjdXRpb25FeGNlcHRpb247CiBpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5yZXNvdXJjZXMuSUNvbnRhaW5lcjsKIGltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJlc291cmNlcy5JRmlsZTsKIGltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJlc291cmNlcy5JRm9sZGVyOwpAQCAtMjMsNiArMjYsNyBAQAogaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucmVzb3VyY2VzLlJlc291cmNlc1BsdWdpbjsKIGltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJ1bnRpbWUuQ29yZUV4Y2VwdGlvbjsKIGltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJ1bnRpbWUuSVBhdGg7CitpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5ydW50aW1lLk51bGxQcm9ncmVzc01vbml0b3I7CiBpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5ydW50aW1lLlBhdGg7CiBpbXBvcnQgb3JnLmVjbGlwc2UuZW1mLmVjb3JlLkVPYmplY3Q7CiBpbXBvcnQgb3JnLmVjbGlwc2UuZW1mLmVjb3JlLnJlc291cmNlLlJlc291cmNlOwpAQCAtMzEsNiArMzUsNyBAQAogaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS5Db21wb25lbnRDb3JlOwogaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS5Nb2R1bGVDb3JlTmF0dXJlOwogaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS5kYXRhbW9kZWwucHJvcGVydGllcy5JQ3JlYXRlUmVmZXJlbmNlQ29tcG9uZW50c0RhdGFNb2RlbFByb3BlcnRpZXM7CitpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb21wb25lbnRjb3JlLmRhdGFtb2RlbC5wcm9wZXJ0aWVzLklTZXJ2ZXJDb250ZXh0Um9vdERhdGFNb2RlbFByb3BlcnRpZXM7CiBpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb21wb25lbnRjb3JlLmludGVybmFsLlByb3BlcnR5OwogaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS5pbnRlcm5hbC5TdHJ1Y3R1cmVFZGl0OwogaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS5pbnRlcm5hbC5Xb3JrYmVuY2hDb21wb25lbnQ7CkBAIC0xMTAsNyArMTE1LDcgQEAKIAogCiAJcHVibGljIHN0YXRpYyBJRmlsZSBmaW5kRmlsZShJVmlydHVhbENvbXBvbmVudCBjb21wLCBJUGF0aCBhUGF0aCkgdGhyb3dzIENvcmVFeGNlcHRpb24gewotCQlpZiAoY29tcCA9PSBudWxsIHx8IGFQYXRoID09IG51bGwpCisJCWlmIChjb21wID09IG51bGwgfHwgYVBhdGggPT0gbnVsbCB8fCBjb21wLmlzQmluYXJ5KCkpCiAJCQlyZXR1cm4gbnVsbDsKIAkJSVZpcnR1YWxGb2xkZXIgcm9vdCA9IGNvbXAuZ2V0Um9vdEZvbGRlcigpOwogCQlJVmlydHVhbFJlc291cmNlIGZpbGUgPSByb290LmZpbmRNZW1iZXIoYVBhdGgpOwpAQCAtMjE1LDYgKzIyMCwxOCBAQAogCQltb2RIYW5kbGVzTGlzdC5hZGRBbGwodGFyZ2V0Q29tcG9uZW50UHJvamVjdHMpOwogCQltb2RlbC5zZXRQcm9wZXJ0eShJQ3JlYXRlUmVmZXJlbmNlQ29tcG9uZW50c0RhdGFNb2RlbFByb3BlcnRpZXMuVEFSR0VUX0NPTVBPTkVOVF9MSVNULCBtb2RIYW5kbGVzTGlzdCk7CiAJCW1vZGVsLnNldFByb3BlcnR5KElDcmVhdGVSZWZlcmVuY2VDb21wb25lbnRzRGF0YU1vZGVsUHJvcGVydGllcy5UQVJHRVRfQ09NUE9ORU5UU19ERVBMT1lfUEFUSCwiL1dFQi1JTkYvbGliIik7IC8vJE5PTi1OTFMtMSQKKwkJaWYobW9kSGFuZGxlc0xpc3QgIT0gbnVsbCl7CisJCQlNYXAgbWFwID0gbmV3IEhhc2hNYXAoKTsKKwkJCWZvcihpbnQgaT0wOyBpPG1vZEhhbmRsZXNMaXN0LnNpemUoKTtpKyspeworCQkJCUlWaXJ0dWFsQ29tcG9uZW50IGNvbXAgPSAoSVZpcnR1YWxDb21wb25lbnQpbW9kSGFuZGxlc0xpc3QuZ2V0KGkpOworCQkJCVN0cmluZyB1cmkgPSBjb21wLmdldE5hbWUoKS5yZXBsYWNlKCcgJywgJ18nKSArICIuamFyIjsKKwkJCQltYXAucHV0KGNvbXAsIHVyaSk7CisJCQl9CisJCQlpZihtYXAuc2l6ZSgpID4gMCl7CisJCQkJbW9kZWwuc2V0UHJvcGVydHkoSUNyZWF0ZVJlZmVyZW5jZUNvbXBvbmVudHNEYXRhTW9kZWxQcm9wZXJ0aWVzLlRBUkdFVF9DT01QT05FTlRTX1RPX1VSSV9NQVAsIG1hcCk7CisJCQl9CisJCX0KKwkJCiAJCXJldHVybiBuZXcgQ3JlYXRlUmVmZXJlbmNlQ29tcG9uZW50c09wKG1vZGVsKTsKIAl9CiAKQEAgLTMwOSw5ICszMjYsMTkgQEAKIAkgKiAKIAkgKiBAcGFyYW0gY29udGV4dFJvb3Qgc3RyaW5nCiAJICovCi0JcHVibGljIHN0YXRpYyB2b2lkIHNldFNlcnZlckNvbnRleHRSb290KElQcm9qZWN0IHByb2plY3QsIFN0cmluZyBjb250ZXh0Um9vdCkgewotCQlJVmlydHVhbENvbXBvbmVudCBjb21wID0gQ29tcG9uZW50Q29yZS5jcmVhdGVDb21wb25lbnQocHJvamVjdCk7Ci0JCWNvbXAuc2V0TWV0YVByb3BlcnR5KElNb2R1bGVDb25zdGFudHMuQ09OVEVYVFJPT1QsIGNvbnRleHRSb290KTsKKwlwdWJsaWMgc3RhdGljIHZvaWQgc2V0U2VydmVyQ29udGV4dFJvb3QoSVByb2plY3QgcHJvamVjdCwgU3RyaW5nIG5ld0NvbnRleHRSb290KSB7CisJCQorCQlJRGF0YU1vZGVsIG1vZGVsID0gRGF0YU1vZGVsRmFjdG9yeS5jcmVhdGVEYXRhTW9kZWwoSVNlcnZlckNvbnRleHRSb290RGF0YU1vZGVsUHJvcGVydGllcy5jbGFzcyk7CisJCW1vZGVsLnNldFByb3BlcnR5KElTZXJ2ZXJDb250ZXh0Um9vdERhdGFNb2RlbFByb3BlcnRpZXMuUFJPSkVDVCwgcHJvamVjdCk7CisJCW1vZGVsLnNldFN0cmluZ1Byb3BlcnR5KElTZXJ2ZXJDb250ZXh0Um9vdERhdGFNb2RlbFByb3BlcnRpZXMuQ09OVEVYVF9ST09ULAorCQkJCW5ld0NvbnRleHRSb290KTsKKwkJCisJCXRyeSB7CisJCQltb2RlbC5nZXREZWZhdWx0T3BlcmF0aW9uKCkuZXhlY3V0ZShuZXcgTnVsbFByb2dyZXNzTW9uaXRvcigpLCBudWxsKTsKKwkJfQorCQljYXRjaCAoRXhlY3V0aW9uRXhjZXB0aW9uIGUpIHsKKwkJCW9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS5pbnRlcm5hbC5Nb2R1bGVjb3JlUGx1Z2luLmxvZ0Vycm9yKGUpOworCQl9CiAJfQogCiAJLyoqCkBAIC0zMzIsNCArMzU5LDUgQEAKIAkJCXVyaSA9IHJlZmVyZW5jZS5nZXRSdW50aW1lUGF0aCgpICsgIi8iICsgcmVmZXJlbmNlLmdldFJlZmVyZW5jZWRDb21wb25lbnQoKS5nZXRQcm9qZWN0KCkuZ2V0TmFtZSgpICsgZXh0ZW5zaW9uOyAvLyROT04tTkxTLTEkCiAJCX0KIAkJcmV0dXJuIHVyaTsKLQl9fQorCX0KK30KZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlL21vZHVsZWNvcmUtc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vY29tcG9uZW50Y29yZS9pbnRlcm5hbC91dGlsL0NvbXBvbmVudGNvcmVTd2l0Y2guamF2YSBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlL21vZHVsZWNvcmUtc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vY29tcG9uZW50Y29yZS9pbnRlcm5hbC91dGlsL0NvbXBvbmVudGNvcmVTd2l0Y2guamF2YQppbmRleCBmNTU2YWJjLi5lOGMwY2M0IDEwMDY0NAotLS0gYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS9tb2R1bGVjb3JlLXNyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2NvbXBvbmVudGNvcmUvaW50ZXJuYWwvdXRpbC9Db21wb25lbnRjb3JlU3dpdGNoLmphdmEKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUvbW9kdWxlY29yZS1zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9jb21wb25lbnRjb3JlL2ludGVybmFsL3V0aWwvQ29tcG9uZW50Y29yZVN3aXRjaC5qYXZhCkBAIC0yLDcgKzIsNyBAQAogICogPGNvcHlyaWdodD4KICAqIDwvY29weXJpZ2h0PgogICoKLSAqICRJZDogQ29tcG9uZW50Y29yZVN3aXRjaC5qYXZhLHYgMS42IDIwMDUvMTAvMTggMjI6Mjc6MTggY2JyaWRnaGEgRXhwICQKKyAqICRJZDogQ29tcG9uZW50Y29yZVN3aXRjaC5qYXZhLHYgMS43IDIwMDkvMDYvMDkgMjA6MDI6MDMganNob2xsIEV4cCAkCiAgKi8KIHBhY2thZ2Ugb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb21wb25lbnRjb3JlLmludGVybmFsLnV0aWw7CiAKQEAgLTc0LDEzICs3NCwxMSBAQAogCQlpZiAodGhlRUNsYXNzLmVDb250YWluZXIoKSA9PSBtb2RlbFBhY2thZ2UpIHsKIAkJCXJldHVybiBkb1N3aXRjaCh0aGVFQ2xhc3MuZ2V0Q2xhc3NpZmllcklEKCksIHRoZUVPYmplY3QpOwogCQl9Ci0JCWVsc2UgewotCQkJTGlzdCBlU3VwZXJUeXBlcyA9IHRoZUVDbGFzcy5nZXRFU3VwZXJUeXBlcygpOwotCQkJcmV0dXJuCi0JCQkJZVN1cGVyVHlwZXMuaXNFbXB0eSgpID8KLQkJCQkJZGVmYXVsdENhc2UodGhlRU9iamVjdCkgOgotCQkJCQlkb1N3aXRjaCgoRUNsYXNzKWVTdXBlclR5cGVzLmdldCgwKSwgdGhlRU9iamVjdCk7Ci0JCX0KKwkJTGlzdCBlU3VwZXJUeXBlcyA9IHRoZUVDbGFzcy5nZXRFU3VwZXJUeXBlcygpOworCQlyZXR1cm4KKwkJCWVTdXBlclR5cGVzLmlzRW1wdHkoKSA/CisJCQkJZGVmYXVsdENhc2UodGhlRU9iamVjdCkgOgorCQkJCWRvU3dpdGNoKChFQ2xhc3MpZVN1cGVyVHlwZXMuZ2V0KDApLCB0aGVFT2JqZWN0KTsKIAl9CiAKIAkvKioKZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlL21vZHVsZWNvcmUtc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vY29tcG9uZW50Y29yZS9pbnRlcm5hbC91dGlsL0ZhY2V0ZWRQcm9qZWN0VXRpbGl0aWVzLmphdmEgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS9tb2R1bGVjb3JlLXNyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2NvbXBvbmVudGNvcmUvaW50ZXJuYWwvdXRpbC9GYWNldGVkUHJvamVjdFV0aWxpdGllcy5qYXZhCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLjk4MjYzY2EKLS0tIC9kZXYvbnVsbAorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS9tb2R1bGVjb3JlLXNyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2NvbXBvbmVudGNvcmUvaW50ZXJuYWwvdXRpbC9GYWNldGVkUHJvamVjdFV0aWxpdGllcy5qYXZhCkBAIC0wLDAgKzEsNTAgQEAKKy8qKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqCisgKiBDb3B5cmlnaHQgKGMpIDIwMDkgUmVkIEhhdCBhbmQgb3RoZXJzLgorICogQWxsIHJpZ2h0cyByZXNlcnZlZC4gVGhpcyBwcm9ncmFtIGFuZCB0aGUgYWNjb21wYW55aW5nIG1hdGVyaWFscworICogYXJlIG1hZGUgYXZhaWxhYmxlIHVuZGVyIHRoZSB0ZXJtcyBvZiB0aGUgRWNsaXBzZSBQdWJsaWMgTGljZW5zZSB2MS4wCisgKiB3aGljaCBhY2NvbXBhbmllcyB0aGlzIGRpc3RyaWJ1dGlvbiwgYW5kIGlzIGF2YWlsYWJsZSBhdAorICogaHR0cDovL3d3dy5lY2xpcHNlLm9yZy9sZWdhbC9lcGwtdjEwLmh0bWwKKyAqCisgKiBDb250cmlidXRvcnM6CisgKiAgICAgUmVkIEhhdCAtIEluaXRpYWwgQVBJIGFuZCBpbXBsZW1lbnRhdGlvbgorICoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKiovCitwYWNrYWdlIG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS5pbnRlcm5hbC51dGlsOworCitpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5yZXNvdXJjZXMuSVByb2plY3Q7CitpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5ydW50aW1lLkNvcmVFeGNlcHRpb247CitpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5wcm9qZWN0LmZhY2V0LmNvcmUuSUZhY2V0ZWRQcm9qZWN0OworaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24ucHJvamVjdC5mYWNldC5jb3JlLklQcm9qZWN0RmFjZXQ7CitpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5wcm9qZWN0LmZhY2V0LmNvcmUuSVByb2plY3RGYWNldFZlcnNpb247CitpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5wcm9qZWN0LmZhY2V0LmNvcmUuUHJvamVjdEZhY2V0c01hbmFnZXI7CisKK3B1YmxpYyBjbGFzcyBGYWNldGVkUHJvamVjdFV0aWxpdGllcyB7CisJcHVibGljIHN0YXRpYyBib29sZWFuIGlzUHJvamVjdE9mVHlwZShJUHJvamVjdCBwcm9qZWN0LCBTdHJpbmcgdHlwZUlEKSB7CisJCXJldHVybiBnZXRQcm9qZWN0RmFjZXRWZXJzaW9uKHByb2plY3QsIHR5cGVJRCkgIT0gbnVsbDsKKwl9CisKKwlwdWJsaWMgc3RhdGljIElQcm9qZWN0RmFjZXRWZXJzaW9uIGdldFByb2plY3RGYWNldFZlcnNpb24oSVByb2plY3QgcHJvamVjdCwgU3RyaW5nIHR5cGVJRCl7CisJCUlGYWNldGVkUHJvamVjdCBmYWNldGVkUHJvamVjdCA9IG51bGw7CisJCXRyeSB7CisJCQlmYWNldGVkUHJvamVjdCA9IFByb2plY3RGYWNldHNNYW5hZ2VyLmNyZWF0ZShwcm9qZWN0KTsKKwkJfSBjYXRjaCAoQ29yZUV4Y2VwdGlvbiBlKSB7CisJCQlyZXR1cm4gbnVsbDsKKwkJfQorCisJCWlmIChmYWNldGVkUHJvamVjdCAhPSBudWxsICYmIFByb2plY3RGYWNldHNNYW5hZ2VyLmlzUHJvamVjdEZhY2V0RGVmaW5lZCh0eXBlSUQpKSB7CisJCQlJUHJvamVjdEZhY2V0IHByb2plY3RGYWNldCA9IFByb2plY3RGYWNldHNNYW5hZ2VyLmdldFByb2plY3RGYWNldCh0eXBlSUQpOworCQkJaWYocHJvamVjdEZhY2V0ID09IG51bGwpeworCQkJCXJldHVybiBudWxsOworCQkJfQorCQkJcmV0dXJuIGZhY2V0ZWRQcm9qZWN0LmdldFByb2plY3RGYWNldFZlcnNpb24ocHJvamVjdEZhY2V0KTsKKwkJfQorCQlyZXR1cm4gbnVsbDsKKwl9CisJCisJcHVibGljIHN0YXRpYyBib29sZWFuIGlzUHJvamVjdE9mVHlwZShJRmFjZXRlZFByb2plY3QgZmFjZXRlZFByb2plY3QsIFN0cmluZyB0eXBlSUQpIHsKKwkJaWYgKGZhY2V0ZWRQcm9qZWN0ICE9IG51bGwgJiYgUHJvamVjdEZhY2V0c01hbmFnZXIuaXNQcm9qZWN0RmFjZXREZWZpbmVkKHR5cGVJRCkpIHsKKwkJCUlQcm9qZWN0RmFjZXQgcHJvamVjdEZhY2V0ID0gUHJvamVjdEZhY2V0c01hbmFnZXIuZ2V0UHJvamVjdEZhY2V0KHR5cGVJRCk7CisJCQlyZXR1cm4gcHJvamVjdEZhY2V0ICE9IG51bGwgJiYgZmFjZXRlZFByb2plY3QuaGFzUHJvamVjdEZhY2V0KHByb2plY3RGYWNldCk7CisJCX0KKwkJcmV0dXJuIGZhbHNlOworCX0KK30KZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlL21vZHVsZWNvcmUtc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vY29tcG9uZW50Y29yZS9pbnRlcm5hbC91dGlsL0hSZWZUcmFuc2xhdG9yLmphdmEgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS9tb2R1bGVjb3JlLXNyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2NvbXBvbmVudGNvcmUvaW50ZXJuYWwvdXRpbC9IUmVmVHJhbnNsYXRvci5qYXZhCmluZGV4IDhmYmE2MjcuLmFjYjdjN2UgMTAwNjQ0Ci0tLSBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlL21vZHVsZWNvcmUtc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vY29tcG9uZW50Y29yZS9pbnRlcm5hbC91dGlsL0hSZWZUcmFuc2xhdG9yLmphdmEKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUvbW9kdWxlY29yZS1zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9jb21wb25lbnRjb3JlL2ludGVybmFsL3V0aWwvSFJlZlRyYW5zbGF0b3IuamF2YQpAQCAtMjgsMzYgKzI4LDMwIEBACiAKIAlwdWJsaWMgSFJlZlRyYW5zbGF0b3IoU3RyaW5nIGRvbU5hbWVBbmRQYXRoLCBFQ2xhc3MgZUNsYXNzKSB7CiAJCXN1cGVyKGRvbU5hbWVBbmRQYXRoLCBlQ2xhc3MpOwotCQkvLyBUT0RPIEF1dG8tZ2VuZXJhdGVkIGNvbnN0cnVjdG9yIHN0dWIKIAl9CiAKIAlwdWJsaWMgSFJlZlRyYW5zbGF0b3IoU3RyaW5nIGRvbU5hbWVBbmRQYXRoLCBFU3RydWN0dXJhbEZlYXR1cmUgYUZlYXR1cmUpIHsKIAkJc3VwZXIoZG9tTmFtZUFuZFBhdGgsIGFGZWF0dXJlKTsKLQkJLy8gVE9ETyBBdXRvLWdlbmVyYXRlZCBjb25zdHJ1Y3RvciBzdHViCiAJfQogCiAJcHVibGljIEhSZWZUcmFuc2xhdG9yKFN0cmluZyBkb21OYW1lQW5kUGF0aCwgRVN0cnVjdHVyYWxGZWF0dXJlIGFGZWF0dXJlLAogCQkJRUNsYXNzIGVDbGFzcykgewogCQlzdXBlcihkb21OYW1lQW5kUGF0aCwgYUZlYXR1cmUsIGVDbGFzcyk7Ci0JCS8vIFRPRE8gQXV0by1nZW5lcmF0ZWQgY29uc3RydWN0b3Igc3R1YgogCX0KIAogCXB1YmxpYyBIUmVmVHJhbnNsYXRvcihTdHJpbmcgZG9tTmFtZUFuZFBhdGgsIEVTdHJ1Y3R1cmFsRmVhdHVyZSBhRmVhdHVyZSwKIAkJCVRyYW5zbGF0b3JQYXRoIHBhdGgpIHsKIAkJc3VwZXIoZG9tTmFtZUFuZFBhdGgsIGFGZWF0dXJlLCBwYXRoKTsKLQkJLy8gVE9ETyBBdXRvLWdlbmVyYXRlZCBjb25zdHJ1Y3RvciBzdHViCiAJfQogCiAJcHVibGljIEhSZWZUcmFuc2xhdG9yKFN0cmluZyBkb21OYW1lQW5kUGF0aCwgRVN0cnVjdHVyYWxGZWF0dXJlIGFGZWF0dXJlLAogCQkJVHJhbnNsYXRvclBhdGhbXSBwYXRocykgewogCQlzdXBlcihkb21OYW1lQW5kUGF0aCwgYUZlYXR1cmUsIHBhdGhzKTsKLQkJLy8gVE9ETyBBdXRvLWdlbmVyYXRlZCBjb25zdHJ1Y3RvciBzdHViCiAJfQogCiAJcHVibGljIEhSZWZUcmFuc2xhdG9yKFN0cmluZyBkb21OYW1lQW5kUGF0aCwgRVN0cnVjdHVyYWxGZWF0dXJlIGFGZWF0dXJlLAogCQkJaW50IHN0eWxlKSB7CiAJCXN1cGVyKGRvbU5hbWVBbmRQYXRoLCBhRmVhdHVyZSwgc3R5bGUpOwotCQkvLyBUT0RPIEF1dG8tZ2VuZXJhdGVkIGNvbnN0cnVjdG9yIHN0dWIKIAl9CiAJLyoKIAkgKiAobm9uLUphdmFkb2MpCmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS9tb2R1bGVjb3JlLXNyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2NvbXBvbmVudGNvcmUvaW50ZXJuYWwvdXRpbC9JTW9kdWxlQ29uc3RhbnRzLmphdmEgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS9tb2R1bGVjb3JlLXNyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2NvbXBvbmVudGNvcmUvaW50ZXJuYWwvdXRpbC9JTW9kdWxlQ29uc3RhbnRzLmphdmEKaW5kZXggZjFjOThkMC4uYzkzZDlkNyAxMDA2NDQKLS0tIGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUvbW9kdWxlY29yZS1zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9jb21wb25lbnRjb3JlL2ludGVybmFsL3V0aWwvSU1vZHVsZUNvbnN0YW50cy5qYXZhCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlL21vZHVsZWNvcmUtc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vY29tcG9uZW50Y29yZS9pbnRlcm5hbC91dGlsL0lNb2R1bGVDb25zdGFudHMuamF2YQpAQCAtMzksNiArMzksMTMgQEAKIAlwdWJsaWMgZmluYWwgc3RhdGljIFN0cmluZyBKU1RfQVBQQ0xJRU5UX01PRFVMRSA9ICJqc3QuYXBwY2xpZW50IjsgLy8kTk9OLU5MUy0xJAogCXB1YmxpYyBmaW5hbCBzdGF0aWMgU3RyaW5nIEpTVF9DT05ORUNUT1JfTU9EVUxFID0gImpzdC5jb25uZWN0b3IiOyAvLyROT04tTkxTLTEkCiAJcHVibGljIGZpbmFsIHN0YXRpYyBTdHJpbmcgSlNUX0pBVkEgPSAianN0LmphdmEiOyAvLyROT04tTkxTLTEkCisJcHVibGljIGZpbmFsIHN0YXRpYyBTdHJpbmcgSlNUX1dFQkZSQUdNRU5UX01PRFVMRSA9ICJqc3Qud2ViZnJhZ21lbnQiOyAvLyROT04tTkxTLTEkCisJCisJLy8gRXh0ZW5zaW9ucworCXB1YmxpYyBmaW5hbCBzdGF0aWMgU3RyaW5nIEVBUl9FWFRFTlNJT04gPSAiLmVhciI7IC8vJE5PTi1OTFMtMSQKKwlwdWJsaWMgZmluYWwgc3RhdGljIFN0cmluZyBXQVJfRVhURU5TSU9OID0gIi53YXIiOyAvLyROT04tTkxTLTEkCisJcHVibGljIGZpbmFsIHN0YXRpYyBTdHJpbmcgUkFSX0VYVEVOU0lPTiA9ICIucmFyIjsgLy8kTk9OLU5MUy0xJAorCXB1YmxpYyBmaW5hbCBzdGF0aWMgU3RyaW5nIEpBUl9FWFRFTlNJT04gPSAiLmphciI7IC8vJE5PTi1OTFMtMSQKIAkKIAlwdWJsaWMgZmluYWwgc3RhdGljIFN0cmluZyBERVBFTkRFTlRfTU9EVUxFID0gImRlcGVuZGVudCI7IC8vJE5PTi1OTFMtMSQKICAgICAKZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlL21vZHVsZWNvcmUtc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vY29tcG9uZW50Y29yZS9pbnRlcm5hbC91dGlsL1ZpcnR1YWxSZWZlcmVuY2VVdGlsaXRpZXMuamF2YSBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlL21vZHVsZWNvcmUtc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vY29tcG9uZW50Y29yZS9pbnRlcm5hbC91dGlsL1ZpcnR1YWxSZWZlcmVuY2VVdGlsaXRpZXMuamF2YQpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi5mZTEyYjY2Ci0tLSAvZGV2L251bGwKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUvbW9kdWxlY29yZS1zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9jb21wb25lbnRjb3JlL2ludGVybmFsL3V0aWwvVmlydHVhbFJlZmVyZW5jZVV0aWxpdGllcy5qYXZhCkBAIC0wLDAgKzEsODkgQEAKKy8qKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqCisgKiBDb3B5cmlnaHQgKGMpIDIwMDkgUmVkIEhhdCBhbmQgb3RoZXJzLgorICogQWxsIHJpZ2h0cyByZXNlcnZlZC4gVGhpcyBwcm9ncmFtIGFuZCB0aGUgYWNjb21wYW55aW5nIG1hdGVyaWFscworICogYXJlIG1hZGUgYXZhaWxhYmxlIHVuZGVyIHRoZSB0ZXJtcyBvZiB0aGUgRWNsaXBzZSBQdWJsaWMgTGljZW5zZSB2MS4wCisgKiB3aGljaCBhY2NvbXBhbmllcyB0aGlzIGRpc3RyaWJ1dGlvbiwgYW5kIGlzIGF2YWlsYWJsZSBhdAorICogaHR0cDovL3d3dy5lY2xpcHNlLm9yZy9sZWdhbC9lcGwtdjEwLmh0bWwKKyAqCisgKiBDb250cmlidXRvcnM6CisgKiAgICAgUmVkIEhhdCAtIEluaXRpYWwgQVBJIGFuZCBpbXBsZW1lbnRhdGlvbgorICoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKiovCitwYWNrYWdlIG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS5pbnRlcm5hbC51dGlsOworCitpbXBvcnQgamF2YS51dGlsLkhhc2hNYXA7CitpbXBvcnQgamF2YS51dGlsLkl0ZXJhdG9yOworCitpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5ydW50aW1lLlBhdGg7CitpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb21wb25lbnRjb3JlLnJlc291cmNlcy5JVmlydHVhbENvbXBvbmVudDsKK2ltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUucmVzb3VyY2VzLklWaXJ0dWFsUmVmZXJlbmNlOworaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24ucHJvamVjdC5mYWNldC5jb3JlLlByb2plY3RGYWNldHNNYW5hZ2VyOworCitwdWJsaWMgY2xhc3MgVmlydHVhbFJlZmVyZW5jZVV0aWxpdGllcyBpbXBsZW1lbnRzIElNb2R1bGVDb25zdGFudHMgeworCXB1YmxpYyBzdGF0aWMgVmlydHVhbFJlZmVyZW5jZVV0aWxpdGllcyBJTlNUQU5DRSA9IG5ldyBWaXJ0dWFsUmVmZXJlbmNlVXRpbGl0aWVzKCk7CisJcHJpdmF0ZSBIYXNoTWFwPFN0cmluZywgU3RyaW5nPiBtYXBwaW5nOworCVZpcnR1YWxSZWZlcmVuY2VVdGlsaXRpZXMoKSB7CisJCW1hcHBpbmcgPSBuZXcgSGFzaE1hcDxTdHJpbmcsIFN0cmluZz4oKTsKKwkJbWFwcGluZy5wdXQoSlNUX0FQUENMSUVOVF9NT0RVTEUsIEpBUl9FWFRFTlNJT04pOyAvLyROT04tTkxTLTEkCisJCW1hcHBpbmcucHV0KEpTVF9XRUJfTU9EVUxFLCBXQVJfRVhURU5TSU9OKTsgLy8kTk9OLU5MUy0xJAorCQltYXBwaW5nLnB1dChKU1RfRUpCX01PRFVMRSwgSkFSX0VYVEVOU0lPTik7IC8vJE5PTi1OTFMtMSQKKwkJbWFwcGluZy5wdXQoV1NUX1dFQl9NT0RVTEUsIFdBUl9FWFRFTlNJT04pOyAvLyROT04tTkxTLTEkCisJCW1hcHBpbmcucHV0KEpTVF9FQVJfTU9EVUxFLCBFQVJfRVhURU5TSU9OKTsgLy8kTk9OLU5MUy0xJAorCQltYXBwaW5nLnB1dChKU1RfQ09OTkVDVE9SX01PRFVMRSwgUkFSX0VYVEVOU0lPTik7IC8vJE5PTi1OTFMtMSQKKwkJbWFwcGluZy5wdXQoSlNUX1VUSUxJVFlfTU9EVUxFLCBKQVJfRVhURU5TSU9OKTsgLy8kTk9OLU5MUy0xJAorCQltYXBwaW5nLnB1dChKU1RfV0VCRlJBR01FTlRfTU9EVUxFLCBKQVJfRVhURU5TSU9OKTsgLy8kTk9OLU5MUy0xJAorCX0KKwkKKwkvKioKKwkgKiBBZGQgYSBtYXBwaW5nIGZvciBzb21lIGZhY2V0IHR5cGUgdG8gc29tZSBkZWZhdWx0IGV4dGVuc2lvbgorCSAqIEBwYXJhbSBmYWNldCAKKwkgKiBAcGFyYW0gZXh0ZW5zaW9uCisJICogQHJldHVybgorCSAqLworCXB1YmxpYyBib29sZWFuIGFkZERlZmF1bHRFeHRlbnNpb24oU3RyaW5nIGZhY2V0LCBTdHJpbmcgZXh0ZW5zaW9uKSB7CisJCWlmKCAhbWFwcGluZy5jb250YWluc0tleShmYWNldCkpIHsKKwkJCWlmKCBQcm9qZWN0RmFjZXRzTWFuYWdlci5pc1Byb2plY3RGYWNldERlZmluZWQoZmFjZXQpKSB7CisJCQkJbWFwcGluZy5wdXQoZmFjZXQsIGV4dGVuc2lvbik7CisJCQkJcmV0dXJuIHRydWU7CisJCQl9CisJCX0KKwkJcmV0dXJuIGZhbHNlOworCX0KKwkKKwkKKwkvKioKKwkgKiBUaGlzIGlzIGEgdXRpbGl0eSBtZXRob2QgY2xpZW50cyBtYXkgb3IgbWF5IG5vdCBjaG9vc2UgdG8gbWFrZSB1c2Ugb2YKKwkgKiB0byBlbnN1cmUgdGhhdCBhbGwgUHJvamVjdCByZWZlcmVuY2VzIGhhdmUgc29tZSBhcmNoaXZlTmFtZSBhc3NvY2lhdGVkIHdpdGggaXQuCisJICovCisJcHVibGljIHZvaWQgZW5zdXJlUmVmZXJlbmNlc0hhdmVOYW1lcyhJVmlydHVhbFJlZmVyZW5jZVtdIHJlZnMpIHsKKwkJZm9yKCBpbnQgaSA9IDA7IGkgPCByZWZzLmxlbmd0aDsgaSsrICkgeworCQkJaWYoIHJlZnNbaV0uZ2V0QXJjaGl2ZU5hbWUoKSA9PSBudWxsIHx8IHJlZnNbaV0uZ2V0QXJjaGl2ZU5hbWUoKS5lcXVhbHMoIiIpKSB7IC8vJE5PTi1OTFMtMSQKKwkJCQlyZWZzW2ldLnNldEFyY2hpdmVOYW1lKGdldERlZmF1bHRBcmNoaXZlTmFtZShyZWZzW2ldKSk7CisJCQl9CisJCX0KKwl9CisKKwkvKioKKwkgKiByZXR1cm4gd2hhdCB0aGUgc3VnZ2VzdGVkIGFyY2hpdmVOYW1lIGlzIAorCSAqIEBwYXJhbSByZWYKKwkgKiBAcmV0dXJuCisJICovCisJcHVibGljIFN0cmluZyBnZXREZWZhdWx0QXJjaGl2ZU5hbWUoSVZpcnR1YWxSZWZlcmVuY2UgcmVmKSB7CisJCWlmKCAhcmVmLmdldFJlZmVyZW5jZWRDb21wb25lbnQoKS5pc0JpbmFyeSgpKSB7CisJCQlyZXR1cm4gZ2V0RGVmYXVsdFByb2plY3RBcmNoaXZlTmFtZShyZWYuZ2V0UmVmZXJlbmNlZENvbXBvbmVudCgpKTsKKwkJfSAKKwkJLy8gYmluYXJ5CisJCXJldHVybiBuZXcgUGF0aChyZWYuZ2V0UmVmZXJlbmNlZENvbXBvbmVudCgpLmdldERlcGxveWVkTmFtZSgpKS5sYXN0U2VnbWVudCgpOworCX0KKwkKKwlwdWJsaWMgU3RyaW5nIGdldERlZmF1bHRQcm9qZWN0QXJjaGl2ZU5hbWUoSVZpcnR1YWxDb21wb25lbnQgY29tcG9uZW50KSB7CisJCUl0ZXJhdG9yPFN0cmluZz4gaSA9IG1hcHBpbmcua2V5U2V0KCkuaXRlcmF0b3IoKTsKKwkJU3RyaW5nIGZhY2V0OworCQlTdHJpbmcgbmFtZSA9IChjb21wb25lbnQuZ2V0RGVwbG95ZWROYW1lKCkgPT0gbnVsbCA/IGNvbXBvbmVudC5nZXROYW1lKCkgOiBjb21wb25lbnQuZ2V0RGVwbG95ZWROYW1lKCkpOworCQl3aGlsZShpLmhhc05leHQoKSkgeworCQkJZmFjZXQgPSBpLm5leHQoKTsKKwkJCWlmKCBGYWNldGVkUHJvamVjdFV0aWxpdGllcy5pc1Byb2plY3RPZlR5cGUoY29tcG9uZW50LmdldFByb2plY3QoKSwgZmFjZXQpKQorCQkJCXJldHVybiBuYW1lICsgbWFwcGluZy5nZXQoZmFjZXQpOworCQl9CisJCXJldHVybiBuYW1lICsgSkFSX0VYVEVOU0lPTjsgCisJfQorfQpkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUvbW9kdWxlY29yZS1zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9jb21wb25lbnRjb3JlL2ludGVybmFsL3V0aWwvV1RQTW9kdWxlc1htbE1hcHBlckkuamF2YSBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlL21vZHVsZWNvcmUtc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vY29tcG9uZW50Y29yZS9pbnRlcm5hbC91dGlsL1dUUE1vZHVsZXNYbWxNYXBwZXJJLmphdmEKaW5kZXggOWVkOWRlOS4uNmRkOWFiMyAxMDA2NDQKLS0tIGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUvbW9kdWxlY29yZS1zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9jb21wb25lbnRjb3JlL2ludGVybmFsL3V0aWwvV1RQTW9kdWxlc1htbE1hcHBlckkuamF2YQorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS9tb2R1bGVjb3JlLXNyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2NvbXBvbmVudGNvcmUvaW50ZXJuYWwvdXRpbC9XVFBNb2R1bGVzWG1sTWFwcGVySS5qYXZhCkBAIC0zMiw2ICszMiw2IEBACiAJU3RyaW5nIFBST1BFUlRZX1ZBTFVFID0gInZhbHVlIjsvLyROT04tTkxTLTEkCiAJU3RyaW5nIFJFU09VUkNFX1RZUEUgPSAicmVzb3VyY2UtdHlwZSI7Ly8kTk9OLU5MUy0xJAogCVN0cmluZyBBUkNISVZFX05BTUU9ImFyY2hpdmVOYW1lIjsvLyROT04tTkxTLTEkCi0JU3RyaW5nIFBST0pFQ1RfVkVSU0lPTj0icHJvamVjdC12ZXJzaW9uIjsKKwlTdHJpbmcgUFJPSkVDVF9WRVJTSU9OPSJwcm9qZWN0LXZlcnNpb24iOyAvLyROT04tTkxTLTEkCiAJCiB9CmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS9tb2R1bGVjb3JlLXNyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2NvbXBvbmVudGNvcmUvcmVzb2x2ZXJzL0RlZmF1bHRSZWZlcmVuY2VSZXNvbHZlci5qYXZhIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUvbW9kdWxlY29yZS1zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9jb21wb25lbnRjb3JlL3Jlc29sdmVycy9EZWZhdWx0UmVmZXJlbmNlUmVzb2x2ZXIuamF2YQpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi5lOGZjZDczCi0tLSAvZGV2L251bGwKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUvbW9kdWxlY29yZS1zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9jb21wb25lbnRjb3JlL3Jlc29sdmVycy9EZWZhdWx0UmVmZXJlbmNlUmVzb2x2ZXIuamF2YQpAQCAtMCwwICsxLDgzIEBACitwYWNrYWdlIG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS5yZXNvbHZlcnM7CisKK2ltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJlc291cmNlcy5JUHJvamVjdDsKK2ltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJ1bnRpbWUuSVBhdGg7CitpbXBvcnQgb3JnLmVjbGlwc2UuZW1mLmNvbW1vbi51dGlsLlVSSTsKK2ltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUuQ29tcG9uZW50Q29yZTsKK2ltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUuVW5yZXNvbHZlYWJsZVVSSUV4Y2VwdGlvbjsKK2ltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUuaW50ZXJuYWwuQ29tcG9uZW50Y29yZVBhY2thZ2U7CitpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb21wb25lbnRjb3JlLmludGVybmFsLkRlcGVuZGVuY3lUeXBlOworaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS5pbnRlcm5hbC5SZWZlcmVuY2VkQ29tcG9uZW50OworaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS5pbnRlcm5hbC5TdHJ1Y3R1cmVFZGl0OworaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS5pbnRlcm5hbC5pbXBsLk1vZHVsZVVSSVV0aWw7CitpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb21wb25lbnRjb3JlLmludGVybmFsLnJlc291cmNlcy5WaXJ0dWFsUmVmZXJlbmNlOworaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS5yZXNvdXJjZXMuSVZpcnR1YWxDb21wb25lbnQ7CitpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb21wb25lbnRjb3JlLnJlc291cmNlcy5JVmlydHVhbFJlZmVyZW5jZTsKKworcHVibGljIGNsYXNzIERlZmF1bHRSZWZlcmVuY2VSZXNvbHZlciBpbXBsZW1lbnRzIElSZWZlcmVuY2VSZXNvbHZlciB7CisJLy8gRG9lcyBub3QgbmVlZCB0byBpbXBsZW1lbnQsIAorCS8vIGRlZmF1bHQgaXMgYWx3YXlzIGNhbGxlZCBhcyBsYXN0IHJlc29ydAorCXB1YmxpYyBib29sZWFuIGNhblJlc29sdmUoSVZpcnR1YWxDb21wb25lbnQgY29udGV4dCwKKwkJCVJlZmVyZW5jZWRDb21wb25lbnQgcmVmZXJlbmNlZENvbXBvbmVudCkgeworCQlyZXR1cm4gZmFsc2U7CisJfQorCisJLy8gRG9lcyBub3QgbmVlZCB0byBpbXBsZW1lbnQsIAorCS8vIGRlZmF1bHQgaXMgYWx3YXlzIGNhbGxlZCBhcyBsYXN0IHJlc29ydAorCXB1YmxpYyBib29sZWFuIGNhblJlc29sdmUoSVZpcnR1YWxSZWZlcmVuY2UgcmVmZXJlbmNlKSB7CisJCXJldHVybiBmYWxzZTsKKwl9CisKKwlwdWJsaWMgSVZpcnR1YWxSZWZlcmVuY2UgcmVzb2x2ZShJVmlydHVhbENvbXBvbmVudCBjb250ZXh0LAorCQkJUmVmZXJlbmNlZENvbXBvbmVudCByZWZlcmVuY2VkQ29tcG9uZW50KSB7CisJCUlWaXJ0dWFsQ29tcG9uZW50IHRhcmdldENvbXBvbmVudCA9IG51bGw7CisJCUlQcm9qZWN0IHRhcmdldFByb2plY3QgPSBudWxsOworCQlVUkkgdXJpID0gcmVmZXJlbmNlZENvbXBvbmVudC5nZXRIYW5kbGUoKTsKKwkJaWYgKHVyaSA9PSBudWxsKQorCQkJcmV0dXJuIG51bGw7CisJCWJvb2xlYW4gaXNDbGFzc1BhdGhVUkkgPSBNb2R1bGVVUklVdGlsLmlzQ2xhc3NQYXRoVVJJKHVyaSk7CisJCWlmKCAhaXNDbGFzc1BhdGhVUkkgKXsKKwkJCXRyeSB7IAorCQkJCXRhcmdldFByb2plY3QgPSBTdHJ1Y3R1cmVFZGl0LmdldENvbnRhaW5pbmdQcm9qZWN0KHVyaSk7CisJCQl9IGNhdGNoKFVucmVzb2x2ZWFibGVVUklFeGNlcHRpb24gdXVyaWUpIHsKKwkJCQkvL0lnbm9yZQorCQkJfSAKKwkJCS8vIGlmIHRoZSBwcm9qZWN0IGNhbm5vdCBiZSByZXNvbHZlZCwgYXNzdW1lIGl0J3MgbG9jYWwgLSByZWFsbHkgaXQgcHJvYmFibHkgZGVsZXRlZCAKKwkJCQorCQkJdGFyZ2V0Q29tcG9uZW50ID0gQ29tcG9uZW50Q29yZS5jcmVhdGVDb21wb25lbnQodGFyZ2V0UHJvamVjdCk7ICAKKwkJCQkKKworCQl9ZWxzZXsKKwkJCVN0cmluZyBhcmNoaXZlVHlwZSA9ICIiOyAvLyROT04tTkxTLTEkCisJCQlTdHJpbmcgYXJjaGl2ZU5hbWUgPSAiIjsgLy8kTk9OLU5MUy0xJAorCQkJdHJ5IHsKKwkJCQlhcmNoaXZlVHlwZSA9IE1vZHVsZVVSSVV0aWwuZ2V0QXJjaGl2ZVR5cGUodXJpKTsKKwkJCQlhcmNoaXZlTmFtZSA9IE1vZHVsZVVSSVV0aWwuZ2V0QXJjaGl2ZU5hbWUodXJpKTsKKwkJCQkKKwkJCX0gY2F0Y2ggKFVucmVzb2x2ZWFibGVVUklFeGNlcHRpb24gZSkgeworCQkJCS8vSWdub3JlCisJCQl9CisJCQl0YXJnZXRDb21wb25lbnQgPSBDb21wb25lbnRDb3JlLmNyZWF0ZUFyY2hpdmVDb21wb25lbnQoY29udGV4dC5nZXRQcm9qZWN0KCksIGFyY2hpdmVUeXBlICsgSVBhdGguU0VQQVJBVE9SICsgYXJjaGl2ZU5hbWUgKTsgCisJCX0KKwkJVmlydHVhbFJlZmVyZW5jZSB2UmVmID0gbmV3IFZpcnR1YWxSZWZlcmVuY2UoY29udGV4dCwgdGFyZ2V0Q29tcG9uZW50LCByZWZlcmVuY2VkQ29tcG9uZW50LmdldFJ1bnRpbWVQYXRoKCksIHJlZmVyZW5jZWRDb21wb25lbnQuZ2V0RGVwZW5kZW5jeVR5cGUoKS5nZXRWYWx1ZSgpKTsKKwkJdlJlZi5zZXRBcmNoaXZlTmFtZShyZWZlcmVuY2VkQ29tcG9uZW50LmdldEFyY2hpdmVOYW1lKCkpOworCQlyZXR1cm4gdlJlZjsKKwl9CisKKwlwdWJsaWMgUmVmZXJlbmNlZENvbXBvbmVudCByZXNvbHZlKElWaXJ0dWFsUmVmZXJlbmNlIHJlZmVyZW5jZSkgeworCQlJVmlydHVhbENvbXBvbmVudCByZWZlcmVuY2VkQ29tcG9uZW50ID0gcmVmZXJlbmNlLmdldFJlZmVyZW5jZWRDb21wb25lbnQoKTsKKwkJUmVmZXJlbmNlZENvbXBvbmVudCByZWZDb21wID0gQ29tcG9uZW50Y29yZVBhY2thZ2UuZUlOU1RBTkNFLmdldENvbXBvbmVudGNvcmVGYWN0b3J5KCkuY3JlYXRlUmVmZXJlbmNlZENvbXBvbmVudCgpOworCQlyZWZDb21wLnNldFJ1bnRpbWVQYXRoKHJlZmVyZW5jZS5nZXRSdW50aW1lUGF0aCgpKTsKKwkJcmVmQ29tcC5zZXREZXBlbmRlbmN5VHlwZShEZXBlbmRlbmN5VHlwZS5nZXQocmVmZXJlbmNlLmdldERlcGVuZGVuY3lUeXBlKCkpKTsKKwkJcmVmQ29tcC5zZXRBcmNoaXZlTmFtZShyZWZlcmVuY2UuZ2V0QXJjaGl2ZU5hbWUoKSk7CisJCWlmKCByZWZlcmVuY2VkQ29tcG9uZW50ICE9IG51bGwgKSB7CisJCQlpZiggIXJlZmVyZW5jZWRDb21wb25lbnQuaXNCaW5hcnkoKSkKKwkJCQlyZWZDb21wLnNldEhhbmRsZShNb2R1bGVVUklVdGlsLmZ1bGx5UXVhbGlmeVVSSShyZWZlcmVuY2VkQ29tcG9uZW50LmdldFByb2plY3QoKSkpOworCQkJZWxzZQorCQkJCXJlZkNvbXAuc2V0SGFuZGxlKE1vZHVsZVVSSVV0aWwuYXJjaGl2ZUNvbXBvbmVudGZ1bGx5UXVhbGlmeVVSSShyZWZlcmVuY2VkQ29tcG9uZW50LmdldE5hbWUoKSkpOyAKKwkJfQorCQlyZXR1cm4gcmVmQ29tcDsKKwl9CisKKworfQpkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUvbW9kdWxlY29yZS1zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9jb21wb25lbnRjb3JlL3Jlc29sdmVycy9JUmVmZXJlbmNlUmVzb2x2ZXIuamF2YSBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlL21vZHVsZWNvcmUtc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vY29tcG9uZW50Y29yZS9yZXNvbHZlcnMvSVJlZmVyZW5jZVJlc29sdmVyLmphdmEKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uYjFkY2QwMAotLS0gL2Rldi9udWxsCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlL21vZHVsZWNvcmUtc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vY29tcG9uZW50Y29yZS9yZXNvbHZlcnMvSVJlZmVyZW5jZVJlc29sdmVyLmphdmEKQEAgLTAsMCArMSwyMiBAQAorLyoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioKKyAqIENvcHlyaWdodCAoYykgMjAwOSBSZWQgSGF0IGFuZCBvdGhlcnMuCisgKiBBbGwgcmlnaHRzIHJlc2VydmVkLiBUaGlzIHByb2dyYW0gYW5kIHRoZSBhY2NvbXBhbnlpbmcgbWF0ZXJpYWxzCisgKiBhcmUgbWFkZSBhdmFpbGFibGUgdW5kZXIgdGhlIHRlcm1zIG9mIHRoZSBFY2xpcHNlIFB1YmxpYyBMaWNlbnNlIHYxLjAKKyAqIHdoaWNoIGFjY29tcGFuaWVzIHRoaXMgZGlzdHJpYnV0aW9uLCBhbmQgaXMgYXZhaWxhYmxlIGF0CisgKiBodHRwOi8vd3d3LmVjbGlwc2Uub3JnL2xlZ2FsL2VwbC12MTAuaHRtbAorICoKKyAqIENvbnRyaWJ1dG9yczoKKyAqICAgICBSZWQgSGF0IC0gSW5pdGlhbCBBUEkgYW5kIGltcGxlbWVudGF0aW9uCisgKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKi8KK3BhY2thZ2Ugb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb21wb25lbnRjb3JlLnJlc29sdmVyczsKKworaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS5pbnRlcm5hbC5SZWZlcmVuY2VkQ29tcG9uZW50OworaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS5yZXNvdXJjZXMuSVZpcnR1YWxDb21wb25lbnQ7CitpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb21wb25lbnRjb3JlLnJlc291cmNlcy5JVmlydHVhbFJlZmVyZW5jZTsKKworcHVibGljIGludGVyZmFjZSBJUmVmZXJlbmNlUmVzb2x2ZXIgeworCXB1YmxpYyBib29sZWFuIGNhblJlc29sdmUoSVZpcnR1YWxDb21wb25lbnQgY29udGV4dCwgUmVmZXJlbmNlZENvbXBvbmVudCByZWZlcmVuY2VkQ29tcG9uZW50KTsKKwlwdWJsaWMgSVZpcnR1YWxSZWZlcmVuY2UgcmVzb2x2ZShJVmlydHVhbENvbXBvbmVudCBjb250ZXh0LCBSZWZlcmVuY2VkQ29tcG9uZW50IHJlZmVyZW5jZWRDb21wb25lbnQpOworCXB1YmxpYyBib29sZWFuIGNhblJlc29sdmUoSVZpcnR1YWxSZWZlcmVuY2UgcmVmZXJlbmNlKTsKKwlwdWJsaWMgUmVmZXJlbmNlZENvbXBvbmVudCByZXNvbHZlKElWaXJ0dWFsUmVmZXJlbmNlIHJlZmVyZW5jZSk7Cit9CmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS9tb2R1bGVjb3JlLXNyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2NvbXBvbmVudGNvcmUvcmVzb2x2ZXJzL1JlZmVyZW5jZVJlc29sdmVyVXRpbC5qYXZhIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUvbW9kdWxlY29yZS1zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9jb21wb25lbnRjb3JlL3Jlc29sdmVycy9SZWZlcmVuY2VSZXNvbHZlclV0aWwuamF2YQpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi5lYzlkM2YxCi0tLSAvZGV2L251bGwKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUvbW9kdWxlY29yZS1zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9jb21wb25lbnRjb3JlL3Jlc29sdmVycy9SZWZlcmVuY2VSZXNvbHZlclV0aWwuamF2YQpAQCAtMCwwICsxLDEyNiBAQAorcGFja2FnZSBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUucmVzb2x2ZXJzOworCitpbXBvcnQgamF2YS51dGlsLkFycmF5TGlzdDsKK2ltcG9ydCBqYXZhLnV0aWwuQ29sbGVjdGlvbnM7CitpbXBvcnQgamF2YS51dGlsLkNvbXBhcmF0b3I7CitpbXBvcnQgamF2YS51dGlsLkhhc2hNYXA7CitpbXBvcnQgamF2YS51dGlsLkl0ZXJhdG9yOworaW1wb3J0IGphdmEudXRpbC5MaXN0OworCitpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5ydW50aW1lLkNvcmVFeGNlcHRpb247CitpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5ydW50aW1lLklDb25maWd1cmF0aW9uRWxlbWVudDsKK2ltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJ1bnRpbWUuSUV4dGVuc2lvblJlZ2lzdHJ5OworaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucnVudGltZS5QbGF0Zm9ybTsKK2ltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUuaW50ZXJuYWwuTW9kdWxlY29yZVBsdWdpbjsKK2ltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUuaW50ZXJuYWwuUmVmZXJlbmNlZENvbXBvbmVudDsKK2ltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUucmVzb3VyY2VzLklWaXJ0dWFsQ29tcG9uZW50OworaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS5yZXNvdXJjZXMuSVZpcnR1YWxSZWZlcmVuY2U7CisKK3B1YmxpYyBjbGFzcyBSZWZlcmVuY2VSZXNvbHZlclV0aWwgeworCXB1YmxpYyBzdGF0aWMgUmVmZXJlbmNlUmVzb2x2ZXJVdGlsIGluc3RhbmNlID0gbnVsbDsKKwlwdWJsaWMgc3RhdGljIFJlZmVyZW5jZVJlc29sdmVyVXRpbCBnZXREZWZhdWx0KCkgeworCQlpZiggaW5zdGFuY2UgPT0gbnVsbCApCisJCQlpbnN0YW5jZSA9IG5ldyBSZWZlcmVuY2VSZXNvbHZlclV0aWwoKTsKKwkJcmV0dXJuIGluc3RhbmNlOworCX0KKwkKKwlwcml2YXRlIEhhc2hNYXA8U3RyaW5nLCBSZWZlcmVuY2VSZXNvbHZlcldyYXBwZXI+IHJlc29sdmVycyA9IG51bGw7CisJcHJpdmF0ZSBBcnJheUxpc3Q8SVJlZmVyZW5jZVJlc29sdmVyPiBzb3J0ZWQgPSBudWxsOworCXByaXZhdGUgRGVmYXVsdFJlZmVyZW5jZVJlc29sdmVyIGRlZmF1bHRSZXNvbHZlciA9IG5ldyBEZWZhdWx0UmVmZXJlbmNlUmVzb2x2ZXIoKTsKKwlwdWJsaWMgSVJlZmVyZW5jZVJlc29sdmVyW10gZ2V0UmVzb2x2ZXJzKCkgeworCQlpZiggcmVzb2x2ZXJzID09IG51bGwgfHwgc29ydGVkID09IG51bGwpCisJCQlsb2FkUmVzb2x2ZXJzKCk7CisJCWlmIChzb3J0ZWQuaXNFbXB0eSgpKSByZXR1cm4gbmV3IElSZWZlcmVuY2VSZXNvbHZlclswXTsKKyAgICAgICAgcmV0dXJuIChJUmVmZXJlbmNlUmVzb2x2ZXJbXSkgc29ydGVkLnRvQXJyYXkobmV3IElSZWZlcmVuY2VSZXNvbHZlcltzb3J0ZWQuc2l6ZSgpXSk7CisJfQorCQorCXB1YmxpYyBJUmVmZXJlbmNlUmVzb2x2ZXIgZ2V0UmVzb2x2ZXIoSVZpcnR1YWxDb21wb25lbnQgY29udGV4dCwgUmVmZXJlbmNlZENvbXBvbmVudCByZWZlcmVuY2UpIHsKKwkJZ2V0UmVzb2x2ZXJzKCk7CisJCUl0ZXJhdG9yPElSZWZlcmVuY2VSZXNvbHZlcj4gaSA9IHNvcnRlZC5pdGVyYXRvcigpOworCQlJUmVmZXJlbmNlUmVzb2x2ZXIgcmVzb2x2ZXI7CisJCXdoaWxlKGkuaGFzTmV4dCgpKSB7CisJCQlyZXNvbHZlciA9IGkubmV4dCgpOworCQkJaWYoIHJlc29sdmVyLmNhblJlc29sdmUoY29udGV4dCwgcmVmZXJlbmNlKSkKKwkJCQlyZXR1cm4gcmVzb2x2ZXI7CisJCX0KKwkJcmV0dXJuIGRlZmF1bHRSZXNvbHZlcjsKKwl9CisJCisJcHVibGljIElSZWZlcmVuY2VSZXNvbHZlciBnZXRSZXNvbHZlcihJVmlydHVhbFJlZmVyZW5jZSByZWZlcmVuY2UpIHsKKwkJZ2V0UmVzb2x2ZXJzKCk7CisJCUl0ZXJhdG9yPElSZWZlcmVuY2VSZXNvbHZlcj4gaSA9IHNvcnRlZC5pdGVyYXRvcigpOworCQlJUmVmZXJlbmNlUmVzb2x2ZXIgcmVzb2x2ZXI7CisJCXdoaWxlKGkuaGFzTmV4dCgpKSB7CisJCQlyZXNvbHZlciA9IGkubmV4dCgpOworCQkJaWYoIHJlc29sdmVyLmNhblJlc29sdmUocmVmZXJlbmNlKSkKKwkJCQlyZXR1cm4gcmVzb2x2ZXI7CisJCX0KKwkJcmV0dXJuIGRlZmF1bHRSZXNvbHZlcjsKKwl9CisJCisJcHJvdGVjdGVkIHZvaWQgbG9hZFJlc29sdmVycygpIHsKKwkJSGFzaE1hcDxTdHJpbmcsIFJlZmVyZW5jZVJlc29sdmVyV3JhcHBlcj4gbWFwID0gbmV3IEhhc2hNYXA8U3RyaW5nLCBSZWZlcmVuY2VSZXNvbHZlcldyYXBwZXI+KCk7CisJCQorCQlJRXh0ZW5zaW9uUmVnaXN0cnkgcmVnaXN0cnkgPSBQbGF0Zm9ybS5nZXRFeHRlbnNpb25SZWdpc3RyeSgpOworCQlJQ29uZmlndXJhdGlvbkVsZW1lbnRbXSBjZiA9IHJlZ2lzdHJ5LmdldENvbmZpZ3VyYXRpb25FbGVtZW50c0ZvcihNb2R1bGVjb3JlUGx1Z2luLlBMVUdJTl9JRCwgInJlZmVyZW5jZVJlc29sdmVyIik7IC8vJE5PTi1OTFMtMSQKKwkJU3RyaW5nIGlkID0gbnVsbDsKKwkJZm9yKCBpbnQgaiA9IDA7IGogPCBjZi5sZW5ndGg7IGorKyApIHsKKwkJCWlkID0gY2Zbal0uZ2V0QXR0cmlidXRlKCJpZCIpOworCQkJdHJ5IHsKKwkJCQltYXAucHV0KGlkLCBuZXcgUmVmZXJlbmNlUmVzb2x2ZXJXcmFwcGVyKAorCQkJCQkJaWQsIChJUmVmZXJlbmNlUmVzb2x2ZXIpCisJCQkJCQkJY2Zbal0uY3JlYXRlRXhlY3V0YWJsZUV4dGVuc2lvbigiY2xhc3MiKSwKKwkJCQkJCWNmW2pdLmdldEF0dHJpYnV0ZSgid2VpZ2h0IikpKTsKKwkJCX0gY2F0Y2goIENvcmVFeGNlcHRpb24gY2UgKSB7CisJCQkJLy8gVE9ETyBmaWd1cmUgaXQgb3V0CisJCQl9CisJCX0KKwkJCisJCS8vIENhY2hlIHRoZSBzb3J0ZWQgb25lcworCQlMaXN0PFJlZmVyZW5jZVJlc29sdmVyV3JhcHBlcj4gbGlzdCA9IG5ldyBBcnJheUxpc3QobWFwLnZhbHVlcygpKTsKKwkJQ29tcGFyYXRvciBjb21wYXJhdG9yID0gbmV3IENvbXBhcmF0b3IoKSB7IAorCQkJcHVibGljIGludCBjb21wYXJlKE9iamVjdCBvMSwgT2JqZWN0IG8yKSB7CisJCQkJaWYoICEobzEgaW5zdGFuY2VvZiBSZWZlcmVuY2VSZXNvbHZlcldyYXBwZXIpKQorCQkJCQlyZXR1cm4gLTE7CisJCQkJaWYoICEobzIgaW5zdGFuY2VvZiBSZWZlcmVuY2VSZXNvbHZlcldyYXBwZXIpKQorCQkJCQlyZXR1cm4gMTsKKwkJCQlyZXR1cm4gKChSZWZlcmVuY2VSZXNvbHZlcldyYXBwZXIpbzIpLmdldFdlaWdodCgpCisJCQkJIAktICgoUmVmZXJlbmNlUmVzb2x2ZXJXcmFwcGVyKW8xKS5nZXRXZWlnaHQoKTsKKwkJCX0KKwkJfTsKKwkJCisJCUNvbGxlY3Rpb25zLnNvcnQobGlzdCwgY29tcGFyYXRvcik7CisJCUFycmF5TGlzdDxJUmVmZXJlbmNlUmVzb2x2ZXI+IHNvcnRlZCA9IG5ldyBBcnJheUxpc3Q8SVJlZmVyZW5jZVJlc29sdmVyPigpOworCQlJdGVyYXRvciBpID0gbGlzdC5pdGVyYXRvcigpOworCQl3aGlsZShpLmhhc05leHQoKSkKKwkJCXNvcnRlZC5hZGQoKChSZWZlcmVuY2VSZXNvbHZlcldyYXBwZXIpaS5uZXh0KCkpLmdldFJlc29sdmVyKCkpOworCQl0aGlzLnNvcnRlZCA9IHNvcnRlZDsKKwkJdGhpcy5yZXNvbHZlcnMgPSBtYXA7CisJfQorCQorCQorCXByb3RlY3RlZCBjbGFzcyBSZWZlcmVuY2VSZXNvbHZlcldyYXBwZXIgeworCQlwcml2YXRlIFN0cmluZyBpZDsKKwkJcHJpdmF0ZSBJUmVmZXJlbmNlUmVzb2x2ZXIgcmVzb2x2ZXI7CisJCXByaXZhdGUgaW50IHdlaWdodDsKKwkJcHVibGljIFJlZmVyZW5jZVJlc29sdmVyV3JhcHBlcihTdHJpbmcgaWQsIElSZWZlcmVuY2VSZXNvbHZlciByZXNvbHZlciwgU3RyaW5nIHdlaWdodCkgeworCQkJdGhpcy5pZCA9IGlkOworCQkJdGhpcy5yZXNvbHZlciA9IHJlc29sdmVyOworCQkJdHJ5IHsKKwkJCQl0aGlzLndlaWdodCA9IEludGVnZXIucGFyc2VJbnQod2VpZ2h0KTsKKwkJCX0gY2F0Y2goIE51bWJlckZvcm1hdEV4Y2VwdGlvbiBuZmUpIHsKKwkJCQl0aGlzLndlaWdodCA9IDEwMDA7CisJCQl9CisJCX0KKwkJcHVibGljIGludCBnZXRXZWlnaHQoKSB7CisJCQlyZXR1cm4gd2VpZ2h0OworCQl9CisJCXB1YmxpYyBTdHJpbmcgZ2V0SWQoKSB7CisJCQlyZXR1cm4gaWQ7CisJCX0KKwkJcHVibGljIElSZWZlcmVuY2VSZXNvbHZlciBnZXRSZXNvbHZlcigpIHsKKwkJCXJldHVybiByZXNvbHZlcjsKKwkJfQorCX0KKwkKK30KZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlL21vZHVsZWNvcmUtc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vY29tcG9uZW50Y29yZS9yZXNvdXJjZXMvSVZpcnR1YWxDb21wb25lbnQuamF2YSBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlL21vZHVsZWNvcmUtc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vY29tcG9uZW50Y29yZS9yZXNvdXJjZXMvSVZpcnR1YWxDb21wb25lbnQuamF2YQppbmRleCA3ZGUwODFkLi42OWExYjVhIDEwMDY0NAotLS0gYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS9tb2R1bGVjb3JlLXNyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2NvbXBvbmVudGNvcmUvcmVzb3VyY2VzL0lWaXJ0dWFsQ29tcG9uZW50LmphdmEKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUvbW9kdWxlY29yZS1zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9jb21wb25lbnRjb3JlL3Jlc291cmNlcy9JVmlydHVhbENvbXBvbmVudC5qYXZhCkBAIC0xMCw2ICsxMCw3IEBACiAgKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKi8KIHBhY2thZ2Ugb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb21wb25lbnRjb3JlLnJlc291cmNlczsKIAoraW1wb3J0IGphdmEudXRpbC5NYXA7CiBpbXBvcnQgamF2YS51dGlsLlByb3BlcnRpZXM7CiAKIGltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJlc291cmNlcy5JUHJvamVjdDsKQEAgLTM2LDcgKzM3LDE1IEBACiAJICovCiAJcHVibGljIHN0YXRpYyBmaW5hbCBpbnQgQklOQVJZID0gMHgxOwogCQotCQorCS8qKgorCSAqIFRoZSBrZXkgZm9yIHRoZSBwcm9wZXJ0eSBvZiB3aGljaCByZWZlcmVuY2UgdHlwZXMgd2UncmUgcmVxdWVzdGluZworCSAqLworCXB1YmxpYyBzdGF0aWMgZmluYWwgU3RyaW5nIFJFUVVFU1RFRF9SRUZFUkVOQ0VfVFlQRSA9ICJSRVFVRVNURURfUkVGRVJFTkNFX1RZUEUiOworCXB1YmxpYyBzdGF0aWMgZmluYWwgU3RyaW5nIEhBUkRfUkVGRVJFTkNFUyA9ICJIQVJEX1JFRkVSRU5DRVMiOworCXB1YmxpYyBzdGF0aWMgZmluYWwgU3RyaW5nIE5PTl9ERVJJVkVEX1JFRkVSRU5DRVMgPSAiTk9OX0RFUklWRURfUkVGRVJFTkNFUyI7CisJcHVibGljIHN0YXRpYyBmaW5hbCBTdHJpbmcgRElTUExBWUFCTEVfUkVGRVJFTkNFUyA9ICJESVNQTEFZQUJMRV9SRUZFUkVOQ0VTIjsKKwlwdWJsaWMgc3RhdGljIGZpbmFsIFN0cmluZyBGTEFUVEVOQUJMRV9SRUZFUkVOQ0VTID0gIkZMQVRURU5BQkxFX1JFRkVSRU5DRVMiOworCQkKIAkvKioKIAkgKiBUaGUgbmFtZSBvZiB0aGUgY29tcG9uZW50IG11c3QgYmUgdW5pcXVlIHdpdGhpbiBpdHMgZW5jbG9zaW5nIHByb2plY3QuCiAJICogCkBAIC0xNDQsNiArMTUzLDE5IEBACiAJICogQHJldHVybiBBIGJ5LXZhbHVlIGNvcHkgb2YgdGhlIHZpcnR1YWwgcmVmZXJlbmNlIGFycmF5CiAJICovCiAJSVZpcnR1YWxSZWZlcmVuY2VbXSBnZXRSZWZlcmVuY2VzKCk7CisKKwkvKioKKwkgKiBWaXJ0dWFsIGNvbXBvbmVudHMgbWF5IHJlZmVyZW5jZSBvdGhlciB2aXJ0dWFsIGNvbXBvbmVudHMgdG8gYnVpbGQgbG9naWNhbCBkZXBlbmRlbmN5IHRyZWVzLiAKKwkgKiA8cD4KKwkgKiBFYWNoIHZpcnR1YWwgcmVmZXJlbmNlIHdpbGwgaW5kaWNhdGUgaG93IHRoZSBjb250ZW50IG9mIHRoZSByZWZlcmVuY2Ugd2lsbCBiZSBhYnNvcmJlZCAKKwkgKiBieSB0aGlzIGNvbXBvbmVudC4gRWFjaCB2aXJ0dWFsIHJlZmVyZW5jZSB3aWxsIGFsd2F5cyBzcGVjaWZ5IGFuIGVuY2xvc2luZyBjb21wb25lbnQgdGhhdCB3aWxsCisJICogYmUgdGhpcyBjb21wb25lbnQuICAKKwkgKiA8L3A+CisJICogQHBhcmFtIG9wdGlvbnMgQSBoYXNobWFwIGZ1bGwgb2Ygb3B0aW9ucworCSAqIEByZXR1cm4KKwkgKi8KKwlJVmlydHVhbFJlZmVyZW5jZVtdIGdldFJlZmVyZW5jZXMoTWFwPFN0cmluZywgT2JqZWN0PiBvcHRpb25zKTsKKwogCS8qKgogCSAqIFZpcnR1YWwgY29tcG9uZW50cyBtYXkgcmVmZXJlbmNlIG90aGVyIHZpcnR1YWwgY29tcG9uZW50cyB0byBidWlsZCBsb2dpY2FsIGRlcGVuZGVuY3kgdHJlZXMuIAogCSAqIDxwPgpAQCAtMTU1LDYgKzE3Nyw4IEBACiAJICovCiAJSVZpcnR1YWxSZWZlcmVuY2UgZ2V0UmVmZXJlbmNlKFN0cmluZyBhQ29tcG9uZW50TmFtZSk7CiAJCisKKwkKIAkvKioKIAkgKiBWaXJ0dWFsIGNvbXBvbmVudHMgbWF5IHJlZmVyZW5jZSBvdGhlciB2aXJ0dWFsIGNvbXBvbmVudHMgdG8gYnVpbGQgbG9naWNhbCBkZXBlbmRlbmN5IHRyZWVzLiAKIAkgKiA8cD4KZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlL21vZHVsZWNvcmUtc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vY29tcG9uZW50Y29yZS9yZXNvdXJjZXMvSVZpcnR1YWxSZWZlcmVuY2UuamF2YSBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlL21vZHVsZWNvcmUtc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vY29tcG9uZW50Y29yZS9yZXNvdXJjZXMvSVZpcnR1YWxSZWZlcmVuY2UuamF2YQppbmRleCA2ZWYyMjc0Li5iNWM3YzZiIDEwMDY0NAotLS0gYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS9tb2R1bGVjb3JlLXNyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2NvbXBvbmVudGNvcmUvcmVzb3VyY2VzL0lWaXJ0dWFsUmVmZXJlbmNlLmphdmEKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUvbW9kdWxlY29yZS1zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9jb21wb25lbnRjb3JlL3Jlc291cmNlcy9JVmlydHVhbFJlZmVyZW5jZS5qYXZhCkBAIC0xMDcsNCArMTA3LDEyIEBACiAJICovCiAJcHVibGljIHZvaWQgc2V0QXJjaGl2ZU5hbWUoU3RyaW5nIGFyY2hpdmVOYW1lKTsKIAkKKwkvKioKKwkgKiBJcyB0aGlzIHJlZmVyZW5jZSBhICdkZXJpdmVkJyByZWZlcmVuY2U/IEEgZGVyaXZlZCByZWZlcmVuY2UKKwkgKiBpcyBhIHJlZmVyZW5jZSB0aGF0J3Mgbm90IHBlcnNpc3RlZCBpbiB0aGUgcHJpbWFyeSBtb2RlbCAKKwkgKiBpbnNpZGUgdGhlIG9yZy5lY2xpcHNlLndzdC5jb21wb25lbnQgZmlsZS4gCisJICogCisJICogQHJldHVybiBpc0Rlcml2ZWQgZmFsc2UgaWYgcGVyc2lzdGVkLCB0cnVlIG90aGVyd2lzZSAKKwkgKi8KKwlwdWJsaWMgYm9vbGVhbiBpc0Rlcml2ZWQoKTsKIH0KZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlL3BsdWdpbi54bWwgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS9wbHVnaW4ueG1sCmluZGV4IDU2OWRkNDQuLjIwNTczZGEgMTAwNjQ0Ci0tLSBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlL3BsdWdpbi54bWwKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUvcGx1Z2luLnhtbApAQCAtMzQsNyArMzQsNyBAQAogICAgICAgPC9lZGl0TW9kZWw+IAogICAgPC9leHRlbnNpb24+CiAJCi0JPGV4dGVuc2lvbiBwb2ludD0ib3JnLmVjbGlwc2UuY29yZS5ydW50aW1lLmNvbnRlbnRUeXBlcyI+CisJPGV4dGVuc2lvbiBwb2ludD0ib3JnLmVjbGlwc2UuY29yZS5jb250ZW50dHlwZS5jb250ZW50VHlwZXMiPgogIAkJCTxmaWxlLWFzc29jaWF0aW9uCiAJCQkJY29udGVudC10eXBlPSJvcmcuZWNsaXBzZS5jb3JlLnJ1bnRpbWUueG1sIgogCQkJCWZpbGUtbmFtZXM9Im9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Ii8+CkBAIC01NSw2ICs1NSw3IEBACiAJPGV4dGVuc2lvbi1wb2ludCBpZD0iYXJ0aWZhY3RlZGl0IiBuYW1lPSJDb21wb25lbnQgQXJ0aWZhY3QgRWRpdCIgc2NoZW1hPSJzY2hlbWEvYXJ0aWZhY3RlZGl0LmV4c2QiLz4KICAgICA8ZXh0ZW5zaW9uLXBvaW50IGlkPSJjb21wb25lbnRpbXBsIiBuYW1lPSJjb21wb25lbnRpbXBsIiBzY2hlbWE9InNjaGVtYS9jb21wb25lbnRpbXBsLmV4c2QiLz4KIAk8ZXh0ZW5zaW9uLXBvaW50IGlkPSJyZXNvdXJjZUZhY3RvcmllcyIgbmFtZT0iUmVzb3VyY2UgRmFjdG9yeSBBc3NvY2lhdGlvbiAoSW50ZXJuYWwpIiBzY2hlbWE9InNjaGVtYS9yZXNvdXJjZUZhY3Rvcmllcy5leHNkIi8+CisgPGV4dGVuc2lvbi1wb2ludCBpZD0icmVmZXJlbmNlUmVzb2x2ZXIiIG5hbWU9InJlZmVyZW5jZVJlc29sdmVyIiBzY2hlbWE9InNjaGVtYS9yZWZlcmVuY2VSZXNvbHZlci5leHNkIi8+CiAJCiAJPCEtLSBDb250cmlidXRlIGEgVVJJUmVzb2x2ZXJFeHRlbnNpb24gZm9yIGZsZXhpYmxlIHByb2plY3RzIC0tPgogCTxleHRlbnNpb24gcG9pbnQ9Im9yZy5lY2xpcHNlLndzdC5jb21tb24udXJpcmVzb2x2ZXIucmVzb2x2ZXJFeHRlbnNpb25zIj4KQEAgLTc0LDYzICs3NSw2IEBACiAgICAgPC9mYWN0b3J5PgogICA8L2V4dGVuc2lvbj4KICAgCi0gIDxleHRlbnNpb24KLSAgICAgICAgIGlkPSJNb2R1bGVDb3JlVmFsaWRhdG9yIgotICAgICAgICAgbmFtZT0iJVZhbGlkYXRvci5uYW1lIgotICAgICAgICAgcG9pbnQ9Im9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLnZhbGlkYXRvciI+Ci0gICAgICA8dmFsaWRhdG9yPgotICAgICAgCTxwcm9qZWN0TmF0dXJlCi0gICAgICAgICAgICAgICBpZD0ib3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlLk1vZHVsZUNvcmVOYXR1cmUiPgotICAgICAgICAgPC9wcm9qZWN0TmF0dXJlPgotICAgICAgICAgPGZpbHRlcgotICAgICAgICAgICAgICAgb2JqZWN0Q2xhc3M9Im9yZy5lY2xpcHNlLmNvcmUucmVzb3VyY2VzLklGaWxlIgotICAgICAgICAgICAgICAgY2FzZVNlbnNpdGl2ZT0iZmFsc2UiCi0gICAgICAgICAgICAgICBuYW1lRmlsdGVyPSIqLnd0cG1vZHVsZXMiPgotICAgICAgICAgPC9maWx0ZXI+Ci0gICAgICAgICA8ZmlsdGVyCi0gICAgICAgICAgICAgICBvYmplY3RDbGFzcz0ib3JnLmVjbGlwc2UuY29yZS5yZXNvdXJjZXMuSUZpbGUiCi0gICAgICAgICAgICAgICBjYXNlU2Vuc2l0aXZlPSJmYWxzZSIKLSAgICAgICAgICAgICAgIG5hbWVGaWx0ZXI9IiouY29tcG9uZW50Ij4KLSAgICAgICAgIDwvZmlsdGVyPgotCQkgICA8bWFya2VySWQKLSAgICAgICAgICAgICAgIAkgICBtYXJrZXJJZFZhbHVlPSJNb2R1bGVDb3JlVmFsaWRhdG9yTWFya2VyIj4KLSAgICAgICAgIDwvbWFya2VySWQ+Ci0gICAgICAgICA8aGVscGVyICAgICAgCi0gICAgICAgICAgICAgICBjbGFzcz0ib3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb21wb25lbnRjb3JlLmludGVybmFsLk1vZHVsZUNvcmVWYWxpZGF0b3JIZWxwZXIiPgotICAgICAgICAgPC9oZWxwZXI+Ci0gICAgICAgICA8cnVuCi0gICAgICAgICAgICAgICBjbGFzcz0ib3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb21wb25lbnRjb3JlLmludGVybmFsLk1vZHVsZUNvcmVWYWxpZGF0b3IiPgotICAgICAgICAgPC9ydW4+Ci0gICAgICA8L3ZhbGlkYXRvcj4KLSAgIDwvZXh0ZW5zaW9uPgotCi08ZXh0ZW5zaW9uCi0gICAgICAgICBpZD0iTW9kdWxlQ29yZVZhbGlkYXRvck1hcmtlciIKLSAgICAgICAgIG5hbWU9IiVWYWxpZGF0aW9uTWFya2VyLm5hbWUiCi0gICAgICAgICBwb2ludD0ib3JnLmVjbGlwc2UuY29yZS5yZXNvdXJjZXMubWFya2VycyI+Ci0gICAgICA8c3VwZXIKLSAgICAgICAgICAgIHR5cGU9Im9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLnByb2JsZW1tYXJrZXIiPgotICAgICAgPC9zdXBlcj4KLSAgICAgIDxwZXJzaXN0ZW50Ci0gICAgICAgICAgICB2YWx1ZT0idHJ1ZSI+Ci0gICAgICA8L3BlcnNpc3RlbnQ+Ci0gICAgICA8YXR0cmlidXRlCi0gICAgICAgICAgICBuYW1lPSJvd25lciI+Ci0gICAgICA8L2F0dHJpYnV0ZT4KLSAgICAgIDxhdHRyaWJ1dGUKLSAgICAgICAgICAgIG5hbWU9InZhbGlkYXRpb25TZXZlcml0eSI+Ci0gICAgICA8L2F0dHJpYnV0ZT4KLSAgICAgIDxhdHRyaWJ1dGUKLSAgICAgICAgICAgIG5hbWU9InRhcmdldE9iamVjdCI+Ci0gICAgICA8L2F0dHJpYnV0ZT4KLSAgICAgIDxhdHRyaWJ1dGUKLSAgICAgICAgICAgIG5hbWU9Imdyb3VwTmFtZSI+Ci0gICAgICA8L2F0dHJpYnV0ZT4KLSAgICAgIDxhdHRyaWJ1dGUKLSAgICAgICAgICAgIG5hbWU9Im1lc3NhZ2VJZCI+Ci0gICAgICA8L2F0dHJpYnV0ZT4KLTwvZXh0ZW5zaW9uPiAKLQogICAgPCEtLSBSZWdpc3RlciB0aGUgbmF0dXJlIGlkIHdpdGggdGhlIEVNRk5hdHVyZSAtLT4KICAgIDxleHRlbnNpb24KICAgICAgICAgIHBvaW50PSJvcmcuZWNsaXBzZS5qZW0udXRpbC5uYXR1cmVfcmVnaXN0cmF0aW9uIj4KZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlL3NjaGVtYS9Db21wb25lbnRQcm9qZWN0TWlncmF0b3IuZXhzZCBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlL3NjaGVtYS9Db21wb25lbnRQcm9qZWN0TWlncmF0b3IuZXhzZAppbmRleCA1MDdlZDEwLi5lZGFmMTdmIDEwMDY0NAotLS0gYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS9zY2hlbWEvQ29tcG9uZW50UHJvamVjdE1pZ3JhdG9yLmV4c2QKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUvc2NoZW1hL0NvbXBvbmVudFByb2plY3RNaWdyYXRvci5leHNkCkBAIC0xLDE2ICsxLDI1IEBACiA8P3htbCB2ZXJzaW9uPScxLjAnIGVuY29kaW5nPSdVVEYtOCc/PgogPCEtLSBTY2hlbWEgZmlsZSB3cml0dGVuIGJ5IFBERSAtLT4KLTxzY2hlbWEgdGFyZ2V0TmFtZXNwYWNlPSJvcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUiPgorPHNjaGVtYSB0YXJnZXROYW1lc3BhY2U9Im9yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZSIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDEvWE1MU2NoZW1hIj4KIDxhbm5vdGF0aW9uPgogICAgICAgPGFwcEluZm8+CiAgICAgICAgICA8bWV0YS5zY2hlbWEgcGx1Z2luPSJvcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUiIGlkPSJDb21wb25lbnRQcm9qZWN0TWlncmF0b3IiIG5hbWU9IkNvbXBvbmVudCBQcm9qZWN0IE1pZ3JhdG9yIi8+CiAgICAgICA8L2FwcEluZm8+CiAgICAgICA8ZG9jdW1lbnRhdGlvbj4KLSAgICAgICAgIFRoaXMgYWxsb3dzIHNwZWNpZmljIGltcGxlbWVudGF0aW9ucyBvZiBjb21wb25lbnRzIHRvIGNvbnRyaWJ1dGUgbWlncmF0b3JzIFRob3NlIHBsdWdpbnMgaGF2ZSBkZXBlbmRlbmNpZXMgb24gdGhlIG1vZHVsZWNvcmUgcGx1Z2luLCBidXQgbm90IHZpY2UgdmVyc2EuIEluIG9yZGVyIGZvciBjb2RlIGRlZmluZWQgd2l0aGluIHRoZSBtb2R1bGVjb3JlIHBsdWdpbiB0byBleGVjdXRlIHRoZXNlIGFjdGlvbnMsIHdlIG5lZWQgdGhpcyBleHRlbnNpb24gcG9pbnQuCisgICAgICAgICBUaGlzIGhhcyBiZWVuIGRlcHJlY2F0ZWQgc2luY2UgV1RQIDMuMS4yIGFuZCB3aWxsIGJlIGRlbGV0ZWQgcG9zdCBXVFAgMy4yLgorU2VlIGh0dHBzOi8vYnVncy5lY2xpcHNlLm9yZy9idWdzL3Nob3dfYnVnLmNnaT9pZD0yOTI5MzQKK0BkZXByZWNhdGVkIAorCitUaGlzIGFsbG93cyBzcGVjaWZpYyBpbXBsZW1lbnRhdGlvbnMgb2YgY29tcG9uZW50cyB0byBjb250cmlidXRlIG1pZ3JhdG9ycyBUaG9zZSBwbHVnaW5zIGhhdmUgZGVwZW5kZW5jaWVzIG9uIHRoZSBtb2R1bGVjb3JlIHBsdWdpbiwgYnV0IG5vdCB2aWNlIHZlcnNhLiBJbiBvcmRlciBmb3IgY29kZSBkZWZpbmVkIHdpdGhpbiB0aGUgbW9kdWxlY29yZSBwbHVnaW4gdG8gZXhlY3V0ZSB0aGVzZSBhY3Rpb25zLCB3ZSBuZWVkIHRoaXMgZXh0ZW5zaW9uIHBvaW50LgogICAgICAgPC9kb2N1bWVudGF0aW9uPgogICAgPC9hbm5vdGF0aW9uPgogCiAgICA8ZWxlbWVudCBuYW1lPSJleHRlbnNpb24iPgorICAgICAgPGFubm90YXRpb24+CisgICAgICAgICA8YXBwSW5mbz4KKyAgICAgICAgICAgIDxtZXRhLmVsZW1lbnQgLz4KKyAgICAgICAgIDwvYXBwSW5mbz4KKyAgICAgIDwvYW5ub3RhdGlvbj4KICAgICAgIDxjb21wbGV4VHlwZT4KICAgICAgICAgIDxzZXF1ZW5jZT4KICAgICAgICAgICAgIDxlbGVtZW50IHJlZj0ibWlncmF0b3JFeHRlbnNpb24iLz4KQEAgLTUzLDEwICs2MiwyNyBAQAogCiAgICA8YW5ub3RhdGlvbj4KICAgICAgIDxhcHBJbmZvPgorICAgICAgICAgPG1ldGEuc2VjdGlvbiB0eXBlPSJhcGlJbmZvIi8+CisgICAgICA8L2FwcEluZm8+CisgICAgICA8ZG9jdW1lbnRhdGlvbj4KKyAgICAgICAgIFRoaXMgaGFzIGJlZW4gZGVwcmVjYXRlZCBzaW5jZSBXVFAgMy4xLjIgYW5kIHdpbGwgYmUgZGVsZXRlZCBwb3N0IFdUUCAzLjIuCitTZWUgaHR0cHM6Ly9idWdzLmVjbGlwc2Uub3JnL2J1Z3Mvc2hvd19idWcuY2dpP2lkPTI5MjkzNAorQGRlcHJlY2F0ZWQgCisKKyAgICAgIDwvZG9jdW1lbnRhdGlvbj4KKyAgIDwvYW5ub3RhdGlvbj4KKworICAgPGFubm90YXRpb24+CisgICAgICA8YXBwSW5mbz4KICAgICAgICAgIDxtZXRhLnNlY3Rpb24gdHlwZT0ic2luY2UiLz4KICAgICAgIDwvYXBwSW5mbz4KICAgICAgIDxkb2N1bWVudGF0aW9uPgotICAgICAgICAgJmx0O2ImZ3Q7VGhpcyBleHRlbnNpb24gcG9pbnQgaXMgcGFydCBvZiBhbiBpbnRlcmltIEFQSSB0aGF0IGlzIHN0aWxsIHVuZGVyIGRldmVsb3BtZW50IGFuZCBleHBlY3RlZCB0byBjaGFuZ2Ugc2lnbmlmaWNhbnRseSBiZWZvcmUgcmVhY2hpbmcgc3RhYmlsaXR5LiBJdCBpcyBiZWluZyBtYWRlIGF2YWlsYWJsZSBhdCB0aGlzIGVhcmx5IHN0YWdlIHRvIHNvbGljaXQgZmVlZGJhY2sgZnJvbSBwaW9uZWVyaW5nIGFkb3B0ZXJzIG9uIHRoZSB1bmRlcnN0YW5kaW5nIHRoYXQgYW55IGNvZGUgdGhhdCB1c2VzIHRoaXMgQVBJIHdpbGwgYWxtb3N0IGNlcnRhaW5seSBiZSBicm9rZW4gKHJlcGVhdGVkbHkpIGFzIHRoZSBBUEkgZXZvbHZlcy4mbHQ7L2ImZ3Q7CisgICAgICAgICBUaGlzIGhhcyBiZWVuIGRlcHJlY2F0ZWQgc2luY2UgV1RQIDMuMS4yIGFuZCB3aWxsIGJlIGRlbGV0ZWQgcG9zdCBXVFAgMy4yLgorU2VlIGh0dHBzOi8vYnVncy5lY2xpcHNlLm9yZy9idWdzL3Nob3dfYnVnLmNnaT9pZD0yOTI5MzQKK0BkZXByZWNhdGVkIAorCisKKyZsdDtiJmd0O1RoaXMgZXh0ZW5zaW9uIHBvaW50IGlzIHBhcnQgb2YgYW4gaW50ZXJpbSBBUEkgdGhhdCBpcyBzdGlsbCB1bmRlciBkZXZlbG9wbWVudCBhbmQgZXhwZWN0ZWQgdG8gY2hhbmdlIHNpZ25pZmljYW50bHkgYmVmb3JlIHJlYWNoaW5nIHN0YWJpbGl0eS4gSXQgaXMgYmVpbmcgbWFkZSBhdmFpbGFibGUgYXQgdGhpcyBlYXJseSBzdGFnZSB0byBzb2xpY2l0IGZlZWRiYWNrIGZyb20gcGlvbmVlcmluZyBhZG9wdGVycyBvbiB0aGUgdW5kZXJzdGFuZGluZyB0aGF0IGFueSBjb2RlIHRoYXQgdXNlcyB0aGlzIEFQSSB3aWxsIGFsbW9zdCBjZXJ0YWlubHkgYmUgYnJva2VuIChyZXBlYXRlZGx5KSBhcyB0aGUgQVBJIGV2b2x2ZXMuJmx0Oy9iJmd0OwogICAgICAgPC9kb2N1bWVudGF0aW9uPgogICAgPC9hbm5vdGF0aW9uPgogCkBAIC02NSwxNiArOTEsMTAgQEAKICAgICAgICAgIDxtZXRhLnNlY3Rpb24gdHlwZT0iZXhhbXBsZXMiLz4KICAgICAgIDwvYXBwSW5mbz4KICAgICAgIDxkb2N1bWVudGF0aW9uPgotICAgICAgICAgCi0gICAgICA8L2RvY3VtZW50YXRpb24+Ci0gICA8L2Fubm90YXRpb24+CisgICAgICAgICBUaGlzIGhhcyBiZWVuIGRlcHJlY2F0ZWQgc2luY2UgV1RQIDMuMS4yIGFuZCB3aWxsIGJlIGRlbGV0ZWQgcG9zdCBXVFAgMy4yLgorU2VlIGh0dHBzOi8vYnVncy5lY2xpcHNlLm9yZy9idWdzL3Nob3dfYnVnLmNnaT9pZD0yOTI5MzQKK0BkZXByZWNhdGVkIAogCi0gICA8YW5ub3RhdGlvbj4KLSAgICAgIDxhcHBJbmZvPgotICAgICAgICAgPG1ldGEuc2VjdGlvbiB0eXBlPSJhcGlJbmZvIi8+Ci0gICAgICA8L2FwcEluZm8+Ci0gICAgICA8ZG9jdW1lbnRhdGlvbj4KLSAgICAgICAgIAogICAgICAgPC9kb2N1bWVudGF0aW9uPgogICAgPC9hbm5vdGF0aW9uPgogCkBAIC04Myw3ICsxMDMsMTAgQEAKICAgICAgICAgIDxtZXRhLnNlY3Rpb24gdHlwZT0iaW1wbGVtZW50YXRpb24iLz4KICAgICAgIDwvYXBwSW5mbz4KICAgICAgIDxkb2N1bWVudGF0aW9uPgotICAgICAgICAgCisgICAgICAgICBUaGlzIGhhcyBiZWVuIGRlcHJlY2F0ZWQgc2luY2UgV1RQIDMuMS4yIGFuZCB3aWxsIGJlIGRlbGV0ZWQgcG9zdCBXVFAgMy4yLgorU2VlIGh0dHBzOi8vYnVncy5lY2xpcHNlLm9yZy9idWdzL3Nob3dfYnVnLmNnaT9pZD0yOTI5MzQKK0BkZXByZWNhdGVkIAorCiAgICAgICA8L2RvY3VtZW50YXRpb24+CiAgICA8L2Fubm90YXRpb24+CiAKZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlL3NjaGVtYS9jb21wb25lbnRDb3JlLnhzZCBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlL3NjaGVtYS9jb21wb25lbnRDb3JlLnhzZAppbmRleCBhMmQ4ODI4Li5mNmM4N2U5IDEwMDY0NAotLS0gYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS9zY2hlbWEvY29tcG9uZW50Q29yZS54c2QKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUvc2NoZW1hL2NvbXBvbmVudENvcmUueHNkCkBAIC0zMSw2ICszMSw5IEBACiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAJPGF0dHJpYnV0ZSBuYW1lPSJoYW5kbGUiDQogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCQl0eXBlPSJzdHJpbmciIHVzZT0icmVxdWlyZWQiPg0KICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAk8L2F0dHJpYnV0ZT4NCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAJPGF0dHJpYnV0ZSBuYW1lPSJhcmNoaXZlTmFtZSINCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAJCXR5cGU9InN0cmluZyIgdXNlPSJvcHRpb25hbCI+DQorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCTwvYXR0cmlidXRlPg0KICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAk8YXR0cmlidXRlIG5hbWU9ImRlcGxveS1wYXRoIg0KICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAkJdHlwZT0ic3RyaW5nIiB1c2U9InJlcXVpcmVkIj4NCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAJPC9hdHRyaWJ1dGU+DQpkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUvc2NoZW1hL2NvbXBvbmVudGltcGwuZXhzZCBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlL3NjaGVtYS9jb21wb25lbnRpbXBsLmV4c2QKaW5kZXggNjY3MzE3ZS4uODI4Yjc4ZSAxMDA2NDQKLS0tIGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUvc2NoZW1hL2NvbXBvbmVudGltcGwuZXhzZAorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS9zY2hlbWEvY29tcG9uZW50aW1wbC5leHNkCkBAIC0yLDE1ICsyLDIwIEBACiA8IS0tIFNjaGVtYSBmaWxlIHdyaXR0ZW4gYnkgUERFIC0tPgogPHNjaGVtYSB0YXJnZXROYW1lc3BhY2U9Im9yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZSIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDEvWE1MU2NoZW1hIj4KIDxhbm5vdGF0aW9uPgotICAgICAgPGFwcGluZm8+CisgICAgICA8YXBwSW5mbz4KICAgICAgICAgIDxtZXRhLnNjaGVtYSBwbHVnaW49Im9yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZSIgaWQ9ImNvbXBvbmVudGltcGwiIG5hbWU9ImNvbXBvbmVudGltcGwiLz4KLSAgICAgIDwvYXBwaW5mbz4KKyAgICAgIDwvYXBwSW5mbz4KICAgICAgIDxkb2N1bWVudGF0aW9uPgogICAgICAgICAgW0VudGVyIGRlc2NyaXB0aW9uIG9mIHRoaXMgZXh0ZW5zaW9uIHBvaW50Ll0KICAgICAgIDwvZG9jdW1lbnRhdGlvbj4KICAgIDwvYW5ub3RhdGlvbj4KIAogICAgPGVsZW1lbnQgbmFtZT0iZXh0ZW5zaW9uIj4KKyAgICAgIDxhbm5vdGF0aW9uPgorICAgICAgICAgPGFwcEluZm8+CisgICAgICAgICAgICA8bWV0YS5lbGVtZW50IC8+CisgICAgICAgICA8L2FwcEluZm8+CisgICAgICA8L2Fubm90YXRpb24+CiAgICAgICA8Y29tcGxleFR5cGU+CiAgICAgICAgICA8c2VxdWVuY2U+CiAgICAgICAgICA8L3NlcXVlbmNlPgpAQCAtMzMsOSArMzgsOSBAQAogICAgICAgICAgICAgICAgPGRvY3VtZW50YXRpb24+CiAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgIDwvZG9jdW1lbnRhdGlvbj4KLSAgICAgICAgICAgICAgIDxhcHBpbmZvPgorICAgICAgICAgICAgICAgPGFwcEluZm8+CiAgICAgICAgICAgICAgICAgICA8bWV0YS5hdHRyaWJ1dGUgdHJhbnNsYXRhYmxlPSJ0cnVlIi8+Ci0gICAgICAgICAgICAgICA8L2FwcGluZm8+CisgICAgICAgICAgICAgICA8L2FwcEluZm8+CiAgICAgICAgICAgICA8L2Fubm90YXRpb24+CiAgICAgICAgICA8L2F0dHJpYnV0ZT4KICAgICAgIDwvY29tcGxleFR5cGU+CkBAIC00Myw2ICs0OCw5IEBACiAKICAgIDxlbGVtZW50IG5hbWU9ImNvbXBvbmVudGltcGwiPgogICAgICAgPGNvbXBsZXhUeXBlPgorICAgICAgICAgPHNlcXVlbmNlIG1pbk9jY3Vycz0iMCIgbWF4T2NjdXJzPSJ1bmJvdW5kZWQiPgorICAgICAgICAgICAgPGVsZW1lbnQgcmVmPSJleHRlbmRlZFR5cGVJRCIgbWluT2NjdXJzPSIwIiBtYXhPY2N1cnM9InVuYm91bmRlZCIvPgorICAgICAgICAgPC9zZXF1ZW5jZT4KICAgICAgICAgIDxhdHRyaWJ1dGUgbmFtZT0idHlwZUlEIiB0eXBlPSJzdHJpbmciIHVzZT0icmVxdWlyZWQiPgogICAgICAgICAgICAgPGFubm90YXRpb24+CiAgICAgICAgICAgICAgICA8ZG9jdW1lbnRhdGlvbj4KQEAgLTU1LDQ2ICs2Myw0OCBAQAogICAgICAgICAgICAgICAgPGRvY3VtZW50YXRpb24+CiAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgIDwvZG9jdW1lbnRhdGlvbj4KLSAgICAgICAgICAgICAgIDxhcHBpbmZvPgorICAgICAgICAgICAgICAgPGFwcEluZm8+CiAgICAgICAgICAgICAgICAgICA8bWV0YS5hdHRyaWJ1dGUga2luZD0iamF2YSIgYmFzZWRPbj0iOm9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS5yZXNvdXJjZXMuSVZpcnR1YWxDb21wb25lbnQiLz4KLSAgICAgICAgICAgICAgIDwvYXBwaW5mbz4KKyAgICAgICAgICAgICAgIDwvYXBwSW5mbz4KICAgICAgICAgICAgIDwvYW5ub3RhdGlvbj4KICAgICAgICAgIDwvYXR0cmlidXRlPgogICAgICAgPC9jb21wbGV4VHlwZT4KICAgIDwvZWxlbWVudD4KIAorICAgPGVsZW1lbnQgbmFtZT0iZXh0ZW5kZWRUeXBlSUQiIHR5cGU9InN0cmluZyI+CisgICA8L2VsZW1lbnQ+CisKICAgIDxhbm5vdGF0aW9uPgotICAgICAgPGFwcGluZm8+CisgICAgICA8YXBwSW5mbz4KKyAgICAgICAgIDxtZXRhLnNlY3Rpb24gdHlwZT0iYXBpSW5mbyIvPgorICAgICAgPC9hcHBJbmZvPgorICAgICAgPGRvY3VtZW50YXRpb24+CisgICAgICAgICBbRW50ZXIgQVBJIGluZm9ybWF0aW9uIGhlcmUuXQorICAgICAgPC9kb2N1bWVudGF0aW9uPgorICAgPC9hbm5vdGF0aW9uPgorCisgICA8YW5ub3RhdGlvbj4KKyAgICAgIDxhcHBJbmZvPgogICAgICAgICAgPG1ldGEuc2VjdGlvbiB0eXBlPSJzaW5jZSIvPgotICAgICAgPC9hcHBpbmZvPgorICAgICAgPC9hcHBJbmZvPgogICAgICAgPGRvY3VtZW50YXRpb24+CiAgICAgICAgICBbRW50ZXIgdGhlIGZpcnN0IHJlbGVhc2UgaW4gd2hpY2ggdGhpcyBleHRlbnNpb24gcG9pbnQgYXBwZWFycy5dCiAgICAgICA8L2RvY3VtZW50YXRpb24+CiAgICA8L2Fubm90YXRpb24+CiAKICAgIDxhbm5vdGF0aW9uPgotICAgICAgPGFwcGluZm8+CisgICAgICA8YXBwSW5mbz4KICAgICAgICAgIDxtZXRhLnNlY3Rpb24gdHlwZT0iZXhhbXBsZXMiLz4KLSAgICAgIDwvYXBwaW5mbz4KKyAgICAgIDwvYXBwSW5mbz4KICAgICAgIDxkb2N1bWVudGF0aW9uPgogICAgICAgICAgW0VudGVyIGV4dGVuc2lvbiBwb2ludCB1c2FnZSBleGFtcGxlIGhlcmUuXQogICAgICAgPC9kb2N1bWVudGF0aW9uPgogICAgPC9hbm5vdGF0aW9uPgogCiAgICA8YW5ub3RhdGlvbj4KLSAgICAgIDxhcHBpbmZvPgotICAgICAgICAgPG1ldGEuc2VjdGlvbiB0eXBlPSJhcGlJbmZvIi8+Ci0gICAgICA8L2FwcGluZm8+Ci0gICAgICA8ZG9jdW1lbnRhdGlvbj4KLSAgICAgICAgIFtFbnRlciBBUEkgaW5mb3JtYXRpb24gaGVyZS5dCi0gICAgICA8L2RvY3VtZW50YXRpb24+Ci0gICA8L2Fubm90YXRpb24+Ci0KLQotICAgPGFubm90YXRpb24+Ci0gICAgICA8YXBwaW5mbz4KKyAgICAgIDxhcHBJbmZvPgogICAgICAgICAgPG1ldGEuc2VjdGlvbiB0eXBlPSJpbXBsZW1lbnRhdGlvbiIvPgotICAgICAgPC9hcHBpbmZvPgorICAgICAgPC9hcHBJbmZvPgogICAgICAgPGRvY3VtZW50YXRpb24+CiAgICAgICAgICBbRW50ZXIgaW5mb3JtYXRpb24gYWJvdXQgc3VwcGxpZWQgaW1wbGVtZW50YXRpb24gb2YgdGhpcyBleHRlbnNpb24gcG9pbnQuXQogICAgICAgPC9kb2N1bWVudGF0aW9uPgpkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUvc2NoZW1hL3JlZmVyZW5jZVJlc29sdmVyLmV4c2QgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS9zY2hlbWEvcmVmZXJlbmNlUmVzb2x2ZXIuZXhzZApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi44ZWQ3YTkyCi0tLSAvZGV2L251bGwKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUvc2NoZW1hL3JlZmVyZW5jZVJlc29sdmVyLmV4c2QKQEAgLTAsMCArMSwxMTYgQEAKKzw/eG1sIHZlcnNpb249JzEuMCcgZW5jb2Rpbmc9J1VURi04Jz8+Cis8IS0tIFNjaGVtYSBmaWxlIHdyaXR0ZW4gYnkgUERFIC0tPgorPHNjaGVtYSB0YXJnZXROYW1lc3BhY2U9Im9yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZSIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDEvWE1MU2NoZW1hIj4KKzxhbm5vdGF0aW9uPgorICAgICAgPGFwcEluZm8+CisgICAgICAgICA8bWV0YS5zY2hlbWEgcGx1Z2luPSJvcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUiIGlkPSJyZWZlcmVuY2VSZXNvbHZlciIgbmFtZT0icmVmZXJlbmNlUmVzb2x2ZXIiLz4KKyAgICAgIDwvYXBwSW5mbz4KKyAgICAgIDxkb2N1bWVudGF0aW9uPgorICAgICAgICAgW0VudGVyIGRlc2NyaXB0aW9uIG9mIHRoaXMgZXh0ZW5zaW9uIHBvaW50Ll0KKyAgICAgIDwvZG9jdW1lbnRhdGlvbj4KKyAgIDwvYW5ub3RhdGlvbj4KKworICAgPGVsZW1lbnQgbmFtZT0iZXh0ZW5zaW9uIj4KKyAgICAgIDxhbm5vdGF0aW9uPgorICAgICAgICAgPGFwcEluZm8+CisgICAgICAgICAgICA8bWV0YS5lbGVtZW50IC8+CisgICAgICAgICA8L2FwcEluZm8+CisgICAgICA8L2Fubm90YXRpb24+CisgICAgICA8Y29tcGxleFR5cGU+CisgICAgICAgICA8c2VxdWVuY2UgbWluT2NjdXJzPSIxIiBtYXhPY2N1cnM9InVuYm91bmRlZCI+CisgICAgICAgICAgICA8ZWxlbWVudCByZWY9InJlc29sdmVyIi8+CisgICAgICAgICA8L3NlcXVlbmNlPgorICAgICAgICAgPGF0dHJpYnV0ZSBuYW1lPSJwb2ludCIgdHlwZT0ic3RyaW5nIiB1c2U9InJlcXVpcmVkIj4KKyAgICAgICAgICAgIDxhbm5vdGF0aW9uPgorICAgICAgICAgICAgICAgPGRvY3VtZW50YXRpb24+CisgICAgICAgICAgICAgICAgICAKKyAgICAgICAgICAgICAgIDwvZG9jdW1lbnRhdGlvbj4KKyAgICAgICAgICAgIDwvYW5ub3RhdGlvbj4KKyAgICAgICAgIDwvYXR0cmlidXRlPgorICAgICAgICAgPGF0dHJpYnV0ZSBuYW1lPSJpZCIgdHlwZT0ic3RyaW5nIj4KKyAgICAgICAgICAgIDxhbm5vdGF0aW9uPgorICAgICAgICAgICAgICAgPGRvY3VtZW50YXRpb24+CisgICAgICAgICAgICAgICAgICAKKyAgICAgICAgICAgICAgIDwvZG9jdW1lbnRhdGlvbj4KKyAgICAgICAgICAgIDwvYW5ub3RhdGlvbj4KKyAgICAgICAgIDwvYXR0cmlidXRlPgorICAgICAgICAgPGF0dHJpYnV0ZSBuYW1lPSJuYW1lIiB0eXBlPSJzdHJpbmciPgorICAgICAgICAgICAgPGFubm90YXRpb24+CisgICAgICAgICAgICAgICA8ZG9jdW1lbnRhdGlvbj4KKyAgICAgICAgICAgICAgICAgIAorICAgICAgICAgICAgICAgPC9kb2N1bWVudGF0aW9uPgorICAgICAgICAgICAgICAgPGFwcEluZm8+CisgICAgICAgICAgICAgICAgICA8bWV0YS5hdHRyaWJ1dGUgdHJhbnNsYXRhYmxlPSJ0cnVlIi8+CisgICAgICAgICAgICAgICA8L2FwcEluZm8+CisgICAgICAgICAgICA8L2Fubm90YXRpb24+CisgICAgICAgICA8L2F0dHJpYnV0ZT4KKyAgICAgIDwvY29tcGxleFR5cGU+CisgICA8L2VsZW1lbnQ+CisKKyAgIDxlbGVtZW50IG5hbWU9InJlc29sdmVyIj4KKyAgICAgIDxjb21wbGV4VHlwZT4KKyAgICAgICAgIDxhdHRyaWJ1dGUgbmFtZT0iaWQiIHR5cGU9InN0cmluZyIgdXNlPSJyZXF1aXJlZCI+CisgICAgICAgICAgICA8YW5ub3RhdGlvbj4KKyAgICAgICAgICAgICAgIDxkb2N1bWVudGF0aW9uPgorICAgICAgICAgICAgICAgICAgQSByZXF1aXJlZCBpZCB3aGljaCBjYW4gYmUgdXNlZCB0byByZWZlcmVuY2UgdGhpcyByZXNvbHZlcgorICAgICAgICAgICAgICAgPC9kb2N1bWVudGF0aW9uPgorICAgICAgICAgICAgPC9hbm5vdGF0aW9uPgorICAgICAgICAgPC9hdHRyaWJ1dGU+CisgICAgICAgICA8YXR0cmlidXRlIG5hbWU9ImNsYXNzIiB0eXBlPSJzdHJpbmciIHVzZT0icmVxdWlyZWQiPgorICAgICAgICAgICAgPGFubm90YXRpb24+CisgICAgICAgICAgICAgICA8ZG9jdW1lbnRhdGlvbj4KKyAgICAgICAgICAgICAgICAgIFRoZSBpbXBsZW1lbnRhdGlvbiBjbGFzcyBvZiB0aGlzIGV4dGVuc2lvbgorICAgICAgICAgICAgICAgPC9kb2N1bWVudGF0aW9uPgorICAgICAgICAgICAgICAgPGFwcEluZm8+CisgICAgICAgICAgICAgICAgICA8bWV0YS5hdHRyaWJ1dGUga2luZD0iamF2YSIgYmFzZWRPbj0iOm9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS5yZXNvbHZlcnMuSVJlZmVyZW5jZVJlc29sdmVyIi8+CisgICAgICAgICAgICAgICA8L2FwcEluZm8+CisgICAgICAgICAgICA8L2Fubm90YXRpb24+CisgICAgICAgICA8L2F0dHJpYnV0ZT4KKyAgICAgICAgIDxhdHRyaWJ1dGUgbmFtZT0id2VpZ2h0IiB0eXBlPSJzdHJpbmciPgorICAgICAgICAgICAgPGFubm90YXRpb24+CisgICAgICAgICAgICAgICA8ZG9jdW1lbnRhdGlvbj4KKyAgICAgICAgICAgICAgICAgIFRoZSB3ZWlnaHQgdXNlZCBmb3Igc29ydGluZyB0aGUgcmVzb2x2ZXJzLiBMaWdodGVyIHdlaWdodHMgZmxvYXQgdG8gdGhlIHRvcCBhbmQgYXJlIHRyaWVkIGZpcnN0LgorICAgICAgICAgICAgICAgPC9kb2N1bWVudGF0aW9uPgorICAgICAgICAgICAgPC9hbm5vdGF0aW9uPgorICAgICAgICAgPC9hdHRyaWJ1dGU+CisgICAgICA8L2NvbXBsZXhUeXBlPgorICAgPC9lbGVtZW50PgorCisgICA8YW5ub3RhdGlvbj4KKyAgICAgIDxhcHBJbmZvPgorICAgICAgICAgPG1ldGEuc2VjdGlvbiB0eXBlPSJzaW5jZSIvPgorICAgICAgPC9hcHBJbmZvPgorICAgICAgPGRvY3VtZW50YXRpb24+CisgICAgICAgICBbRW50ZXIgdGhlIGZpcnN0IHJlbGVhc2UgaW4gd2hpY2ggdGhpcyBleHRlbnNpb24gcG9pbnQgYXBwZWFycy5dCisgICAgICA8L2RvY3VtZW50YXRpb24+CisgICA8L2Fubm90YXRpb24+CisKKyAgIDxhbm5vdGF0aW9uPgorICAgICAgPGFwcEluZm8+CisgICAgICAgICA8bWV0YS5zZWN0aW9uIHR5cGU9ImV4YW1wbGVzIi8+CisgICAgICA8L2FwcEluZm8+CisgICAgICA8ZG9jdW1lbnRhdGlvbj4KKyAgICAgICAgIFtFbnRlciBleHRlbnNpb24gcG9pbnQgdXNhZ2UgZXhhbXBsZSBoZXJlLl0KKyAgICAgIDwvZG9jdW1lbnRhdGlvbj4KKyAgIDwvYW5ub3RhdGlvbj4KKworICAgPGFubm90YXRpb24+CisgICAgICA8YXBwSW5mbz4KKyAgICAgICAgIDxtZXRhLnNlY3Rpb24gdHlwZT0iYXBpaW5mbyIvPgorICAgICAgPC9hcHBJbmZvPgorICAgICAgPGRvY3VtZW50YXRpb24+CisgICAgICAgICBbRW50ZXIgQVBJIGluZm9ybWF0aW9uIGhlcmUuXQorICAgICAgPC9kb2N1bWVudGF0aW9uPgorICAgPC9hbm5vdGF0aW9uPgorCisgICA8YW5ub3RhdGlvbj4KKyAgICAgIDxhcHBJbmZvPgorICAgICAgICAgPG1ldGEuc2VjdGlvbiB0eXBlPSJpbXBsZW1lbnRhdGlvbiIvPgorICAgICAgPC9hcHBJbmZvPgorICAgICAgPGRvY3VtZW50YXRpb24+CisgICAgICAgICBbRW50ZXIgaW5mb3JtYXRpb24gYWJvdXQgc3VwcGxpZWQgaW1wbGVtZW50YXRpb24gb2YgdGhpcyBleHRlbnNpb24gcG9pbnQuXQorICAgICAgPC9kb2N1bWVudGF0aW9uPgorICAgPC9hbm5vdGF0aW9uPgorCisKKzwvc2NoZW1hPgpkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUvc2NoZW1hL3Jlc291cmNlRmFjdG9yaWVzLmV4c2QgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS9zY2hlbWEvcmVzb3VyY2VGYWN0b3JpZXMuZXhzZAppbmRleCBkZDQzYmRiLi40OWY3YTgwIDEwMDY0NAotLS0gYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS9zY2hlbWEvcmVzb3VyY2VGYWN0b3JpZXMuZXhzZAorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS9zY2hlbWEvcmVzb3VyY2VGYWN0b3JpZXMuZXhzZApAQCAtMSwxNiArMSwyMSBAQAogPD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4KIDwhLS0gU2NoZW1hIGZpbGUgd3JpdHRlbiBieSBQREUgLS0+Ci08c2NoZW1hIHRhcmdldE5hbWVzcGFjZT0ib3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlIj4KKzxzY2hlbWEgdGFyZ2V0TmFtZXNwYWNlPSJvcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAxL1hNTFNjaGVtYSI+CiA8YW5ub3RhdGlvbj4KLSAgICAgIDxhcHBJbmZvPgorICAgICAgPGFwcGluZm8+CiAgICAgICAgICA8bWV0YS5zY2hlbWEgcGx1Z2luPSJvcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUiIGlkPSJyZXNvdXJjZUZhY3RvcmllcyIgbmFtZT0iUmVzb3VyY2UgRmFjdG9yeSBBc3NvY2lhdGlvbiAoSW50ZXJuYWwpIi8+Ci0gICAgICA8L2FwcEluZm8+CisgICAgICA8L2FwcGluZm8+CiAgICAgICA8ZG9jdW1lbnRhdGlvbj4KICAgICAgICAgIEFuICppbnRlcm5hbCogZXh0ZW5zaW9uIHBvaW50IHRoYXQgZGVjbGFyZXMgYW4gYXNzb2NpYXRpb24gYmV0d2VlbiBhIHNob3J0LXNlZ21lbnQgZmlsZW5hbWUgYW5kIGEgUmVzb3VyY2UuRmFjdG9yeS4KICAgICAgIDwvZG9jdW1lbnRhdGlvbj4KICAgIDwvYW5ub3RhdGlvbj4KIAogICAgPGVsZW1lbnQgbmFtZT0iZXh0ZW5zaW9uIj4KKyAgICAgIDxhbm5vdGF0aW9uPgorICAgICAgICAgPGFwcGluZm8+CisgICAgICAgICAgICA8bWV0YS5lbGVtZW50IC8+CisgICAgICAgICA8L2FwcGluZm8+CisgICAgICA8L2Fubm90YXRpb24+CiAgICAgICA8Y29tcGxleFR5cGU+CiAgICAgICAgICA8c2VxdWVuY2U+CiAgICAgICAgICAgICA8ZWxlbWVudCByZWY9InJlc291cmNlRmFjdG9yeSIvPgpAQCAtMzQsOSArMzksOSBAQAogICAgICAgICAgICAgICAgPGRvY3VtZW50YXRpb24+CiAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgIDwvZG9jdW1lbnRhdGlvbj4KLSAgICAgICAgICAgICAgIDxhcHBJbmZvPgorICAgICAgICAgICAgICAgPGFwcGluZm8+CiAgICAgICAgICAgICAgICAgICA8bWV0YS5hdHRyaWJ1dGUgdHJhbnNsYXRhYmxlPSJ0cnVlIi8+Ci0gICAgICAgICAgICAgICA8L2FwcEluZm8+CisgICAgICAgICAgICAgICA8L2FwcGluZm8+CiAgICAgICAgICAgICA8L2Fubm90YXRpb24+CiAgICAgICAgICA8L2F0dHJpYnV0ZT4KICAgICAgIDwvY29tcGxleFR5cGU+CkBAIC01NywxNSArNjIsMTUgQEAKICAgICAgICAgICAgICAgIDxkb2N1bWVudGF0aW9uPgogICAgICAgICAgICAgICAgICAgRGVjbGFyZXMgYW4gaW1wbGVtZW50YXRpb24gb2YgJmx0O2NvZGUmZ3Q7b3JnLmVjbGlwc2UuZW1mLmVjb3JlLnJlc291cmNlLlJlc291cmNlLkZhY3RvcnkmbHQ7L2NvZGUmZ3Q7LgogICAgICAgICAgICAgICAgPC9kb2N1bWVudGF0aW9uPgotICAgICAgICAgICAgICAgPGFwcEluZm8+CisgICAgICAgICAgICAgICA8YXBwaW5mbz4KICAgICAgICAgICAgICAgICAgIDxtZXRhLmF0dHJpYnV0ZSBraW5kPSJqYXZhIiBiYXNlZE9uPSJvcmcuZWNsaXBzZS5lbWYuZWNvcmUucmVzb3VyY2UuUmVzb3VyY2UuRmFjdG9yeSIvPgotICAgICAgICAgICAgICAgPC9hcHBJbmZvPgorICAgICAgICAgICAgICAgPC9hcHBpbmZvPgogICAgICAgICAgICAgPC9hbm5vdGF0aW9uPgogICAgICAgICAgPC9hdHRyaWJ1dGU+Ci0gICAgICAgICA8YXR0cmlidXRlIG5hbWU9InNob3J0U2VnbWVudCIgdHlwZT0ic3RyaW5nIiB1c2U9InJlcXVpcmVkIj4KKyAgICAgICAgIDxhdHRyaWJ1dGUgbmFtZT0ic2hvcnRTZWdtZW50IiB0eXBlPSJzdHJpbmciPgogICAgICAgICAgICAgPGFubm90YXRpb24+CiAgICAgICAgICAgICAgICA8ZG9jdW1lbnRhdGlvbj4KLSAgICAgICAgICAgICAgICAgIERlY2xhcmVzIHRoZSBzaG9ydCBzZWdtZW50IG9mIGEgZmlsZW5hbWUgdGhhdCB0aGUgcmVzb3VyY2UgZmFjdG9yeSBhcHBsaWVzIHRvIChlLmcuICZxdW90O3dlYi54bWwmcXVvdDspLgorICAgICAgICAgICAgICAgICAgT3B0aW9uYWxseSBkZWNsYXJlcyB0aGUgc2hvcnQgc2VnbWVudCBvZiBhIGZpbGVuYW1lIHRoYXQgdGhlIHJlc291cmNlIGZhY3RvcnkgYXBwbGllcyB0byAoZS5nLiAmcXVvdDt3ZWIueG1sJnF1b3Q7KS4KICAgICAgICAgICAgICAgIDwvZG9jdW1lbnRhdGlvbj4KICAgICAgICAgICAgIDwvYW5ub3RhdGlvbj4KICAgICAgICAgIDwvYXR0cmlidXRlPgpAQCAtNzYsMTQgKzgxLDI0IEBACiAgICAgICAgICAgICAgICA8L2RvY3VtZW50YXRpb24+CiAgICAgICAgICAgICA8L2Fubm90YXRpb24+CiAgICAgICAgICA8L2F0dHJpYnV0ZT4KKyAgICAgICAgIDxhdHRyaWJ1dGUgbmFtZT0ib3ZlcnJpZGVzRmFjdG9yeUNsYXNzIiB0eXBlPSJzdHJpbmciPgorICAgICAgICAgICAgPGFubm90YXRpb24+CisgICAgICAgICAgICAgICA8ZG9jdW1lbnRhdGlvbj4KKyAgICAgICAgICAgICAgICAgIFRoaXMgb3B0aW9uYWwgYXR0cmlidXRlIGlzIHRvIHJlc29sdmUgY29uZmxpY3RzIGJldHdlZW4gbXVsdGlwbGUgZGVmZWF1bHQgZmFjdG9yaWVzIHJlZ2lzdGVyZWQgdG8gdGhlIHNhbWUgY29udGVudCB0eXBlIGFuZCBzaG9ydCBzZWdtZW50cy4gIFRoZSB2YWx1ZSBzaG91bGQgYmUgdGhlIGZ1bGx5IHF1YWxpZmllZCBjbGFzcyBuYW1lIG9mIHRoZSBmYWN0b3J5IGJlaW5nIG92ZXJyaWRkZW4uCisgICAgICAgICAgICAgICA8L2RvY3VtZW50YXRpb24+CisgICAgICAgICAgICAgICA8YXBwaW5mbz4KKyAgICAgICAgICAgICAgICAgIDxtZXRhLmF0dHJpYnV0ZSBraW5kPSJqYXZhIiBiYXNlZE9uPSJvcmcuZWNsaXBzZS5lbWYuZWNvcmUucmVzb3VyY2UuUmVzb3VyY2UuRmFjdG9yeToiLz4KKyAgICAgICAgICAgICAgIDwvYXBwaW5mbz4KKyAgICAgICAgICAgIDwvYW5ub3RhdGlvbj4KKyAgICAgICAgIDwvYXR0cmlidXRlPgogICAgICAgPC9jb21wbGV4VHlwZT4KICAgIDwvZWxlbWVudD4KIAogICAgPGVsZW1lbnQgbmFtZT0iY29udGVudFR5cGVCaW5kaW5nIj4KICAgICAgIDxhbm5vdGF0aW9uPgotICAgICAgICAgPGFwcEluZm8+CisgICAgICAgICA8YXBwaW5mbz4KICAgICAgICAgICAgIDxtZXRhLmVsZW1lbnQgbGFiZWxBdHRyaWJ1dGU9ImNvbnRlbnRUeXBlSWQiLz4KLSAgICAgICAgIDwvYXBwSW5mbz4KKyAgICAgICAgIDwvYXBwaW5mbz4KICAgICAgICAgIDxkb2N1bWVudGF0aW9uPgogICAgICAgICAgICAgQWR2ZXJ0aXNlcyB0aGF0IHRoZSBjb250YWluaW5nIGVkaXRvciB1bmRlcnN0YW5kcyB0aGUgZ2l2ZW4gY29udGVudCB0eXBlIGFuZCBpcyBzdWl0YWJsZSBmb3IgZWRpdGluZyBmaWxlcyBvZiB0aGF0IHR5cGUuCiAgICAgICAgICA8L2RvY3VtZW50YXRpb24+CkBAIC0xMDAsNDggKzExNSw0MCBAQAogICAgPC9lbGVtZW50PgogCiAgICA8YW5ub3RhdGlvbj4KLSAgICAgIDxhcHBJbmZvPgorICAgICAgPGFwcGluZm8+CiAgICAgICAgICA8bWV0YS5zZWN0aW9uIHR5cGU9InNpbmNlIi8+Ci0gICAgICA8L2FwcEluZm8+CisgICAgICA8L2FwcGluZm8+CiAgICAgICA8ZG9jdW1lbnRhdGlvbj4KICAgICAgICAgIFtFbnRlciB0aGUgZmlyc3QgcmVsZWFzZSBpbiB3aGljaCB0aGlzIGV4dGVuc2lvbiBwb2ludCBhcHBlYXJzLl0KICAgICAgIDwvZG9jdW1lbnRhdGlvbj4KICAgIDwvYW5ub3RhdGlvbj4KIAogICAgPGFubm90YXRpb24+Ci0gICAgICA8YXBwSW5mbz4KKyAgICAgIDxhcHBpbmZvPgogICAgICAgICAgPG1ldGEuc2VjdGlvbiB0eXBlPSJleGFtcGxlcyIvPgotICAgICAgPC9hcHBJbmZvPgorICAgICAgPC9hcHBpbmZvPgogICAgICAgPGRvY3VtZW50YXRpb24+CiAgICAgICAgICBbRW50ZXIgZXh0ZW5zaW9uIHBvaW50IHVzYWdlIGV4YW1wbGUgaGVyZS5dCiAgICAgICA8L2RvY3VtZW50YXRpb24+CiAgICA8L2Fubm90YXRpb24+CiAKICAgIDxhbm5vdGF0aW9uPgotICAgICAgPGFwcEluZm8+CisgICAgICA8YXBwaW5mbz4KICAgICAgICAgIDxtZXRhLnNlY3Rpb24gdHlwZT0iYXBpSW5mbyIvPgotICAgICAgPC9hcHBJbmZvPgorICAgICAgPC9hcHBpbmZvPgogICAgICAgPGRvY3VtZW50YXRpb24+CiAgICAgICAgICBbRW50ZXIgQVBJIGluZm9ybWF0aW9uIGhlcmUuXQogICAgICAgPC9kb2N1bWVudGF0aW9uPgogICAgPC9hbm5vdGF0aW9uPgogCiAgICA8YW5ub3RhdGlvbj4KLSAgICAgIDxhcHBJbmZvPgorICAgICAgPGFwcGluZm8+CiAgICAgICAgICA8bWV0YS5zZWN0aW9uIHR5cGU9ImltcGxlbWVudGF0aW9uIi8+Ci0gICAgICA8L2FwcEluZm8+CisgICAgICA8L2FwcGluZm8+CiAgICAgICA8ZG9jdW1lbnRhdGlvbj4KICAgICAgICAgIFtFbnRlciBpbmZvcm1hdGlvbiBhYm91dCBzdXBwbGllZCBpbXBsZW1lbnRhdGlvbiBvZiB0aGlzIGV4dGVuc2lvbiBwb2ludC5dCiAgICAgICA8L2RvY3VtZW50YXRpb24+CiAgICA8L2Fubm90YXRpb24+CiAKLSAgIDxhbm5vdGF0aW9uPgotICAgICAgPGFwcEluZm8+Ci0gICAgICAgICA8bWV0YS5zZWN0aW9uIHR5cGU9ImNvcHlyaWdodCIvPgotICAgICAgPC9hcHBJbmZvPgotICAgICAgPGRvY3VtZW50YXRpb24+Ci0gICAgICAgICAKLSAgICAgIDwvZG9jdW1lbnRhdGlvbj4KLSAgIDwvYW5ub3RhdGlvbj4KIAogPC9zY2hlbWE+CmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24udWkvTUVUQS1JTkYvTUFOSUZFU1QuTUYgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24udWkvTUVUQS1JTkYvTUFOSUZFU1QuTUYKaW5kZXggNGY1M2QwMy4uNjVlNzA4ZSAxMDA2NDQKLS0tIGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLnVpL01FVEEtSU5GL01BTklGRVNULk1GCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi51aS9NRVRBLUlORi9NQU5JRkVTVC5NRgpAQCAtMiwxNyArMiwxOCBAQAogQnVuZGxlLU1hbmlmZXN0VmVyc2lvbjogMgogQnVuZGxlLU5hbWU6ICVwbHVnaW5OYW1lCiBCdW5kbGUtU3ltYm9saWNOYW1lOiBvcmcuZWNsaXBzZS53c3QuY29tbW9uLnVpOyBzaW5nbGV0b246PXRydWUKLUJ1bmRsZS1WZXJzaW9uOiAxLjEuMzAxLnF1YWxpZmllcgorQnVuZGxlLVZlcnNpb246IDEuMS41MDAucXVhbGlmaWVyCiBCdW5kbGUtQWN0aXZhdG9yOiBvcmcuZWNsaXBzZS53c3QuY29tbW9uLnVpLmludGVybmFsLlVJUGx1Z2luCiBCdW5kbGUtVmVuZG9yOiAlcGx1Z2luUHJvdmlkZXIKIEJ1bmRsZS1Mb2NhbGl6YXRpb246IHBsdWdpbgogRXhwb3J0LVBhY2thZ2U6IG9yZy5lY2xpcHNlLndzdC5jb21tb24udWkuaW50ZXJuYWw7eC1pbnRlcm5hbDo9dHJ1ZSwKICBvcmcuZWNsaXBzZS53c3QuY29tbW9uLnVpLmludGVybmFsLmRpYWxvZ3M7eC1pbnRlcm5hbDo9dHJ1ZSwKICBvcmcuZWNsaXBzZS53c3QuY29tbW9uLnVpLmludGVybmFsLmRuZDt4LWludGVybmFsOj10cnVlLAorIG9yZy5lY2xpcHNlLndzdC5jb21tb24udWkuaW50ZXJuYWwubmF2aWdhdG9yLAogIG9yZy5lY2xpcHNlLndzdC5jb21tb24udWkuaW50ZXJuYWwuc2VhcmNoO3gtaW50ZXJuYWw6PXRydWUsCiAgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi51aS5pbnRlcm5hbC5zZWFyY2guZGlhbG9ncywKLSBvcmcuZWNsaXBzZS53c3QuY29tbW9uLnVpLmludGVybmFsLnZpZXdlcnM7eC1pbnRlcm5hbDo9dHJ1ZSwKLSBvcmcuZWNsaXBzZS53c3QuY29tbW9uLnVpLnByb3Zpc2lvbmFsLmVkaXRvcnMKKyBvcmcuZWNsaXBzZS53c3QuY29tbW9uLnVpLmludGVybmFsLnZpZXdlcnM7eC1pbnRlcm5hbDo9dHJ1ZQorSW1wb3J0LVBhY2thZ2U6IGNvbS5pYm0uaWN1LnRleHQ7IHZlcnNpb249IjMuOCIKIFJlcXVpcmUtQnVuZGxlOiBvcmcuZWNsaXBzZS51aS5pZGU7YnVuZGxlLXZlcnNpb249IlszLjQuMCw0LjAuMCkiLAogIG9yZy5lY2xpcHNlLnVpO2J1bmRsZS12ZXJzaW9uPSJbMy40LjAsNC4wLjApIiwKICBvcmcuZWNsaXBzZS5jb3JlLnJ1bnRpbWU7YnVuZGxlLXZlcnNpb249IlszLjQuMCw0LjAuMCkiLApAQCAtMjAsNyArMjEsNiBAQAogIG9yZy5lY2xpcHNlLnNlYXJjaDtidW5kbGUtdmVyc2lvbj0iWzMuNC4wLDQuMC4wKSIsCiAgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb3JlO2J1bmRsZS12ZXJzaW9uPSJbMS4xLjEwMSwyLjAuMCkiLAogIG9yZy5lY2xpcHNlLmpmYWNlLnRleHQ7YnVuZGxlLXZlcnNpb249IlszLjQuMCw0LjAuMCkiLAotIG9yZy5lY2xpcHNlLnVpLndvcmtiZW5jaC50ZXh0ZWRpdG9yO2J1bmRsZS12ZXJzaW9uPSJbMy40LjAsNC4wLjApIiwKLSBjb20uaWJtLmljdTtidW5kbGUtdmVyc2lvbj0iWzMuOC4xLDQuMC4wKSIKLUVjbGlwc2UtTGF6eVN0YXJ0OiB0cnVlCisgb3JnLmVjbGlwc2UudWkud29ya2JlbmNoLnRleHRlZGl0b3I7YnVuZGxlLXZlcnNpb249IlszLjQuMCw0LjAuMCkiCitCdW5kbGUtQWN0aXZhdGlvblBvbGljeTogbGF6eQogQnVuZGxlLVJlcXVpcmVkRXhlY3V0aW9uRW52aXJvbm1lbnQ6IEoyU0UtMS40CmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24udWkvc3JjLXNlYXJjaC9vcmcvZWNsaXBzZS93c3QvY29tbW9uL3VpL2ludGVybmFsL3NlYXJjaC9kaWFsb2dzL0NvbXBvbmVudFNlYXJjaExpc3REaWFsb2cuamF2YSBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi51aS9zcmMtc2VhcmNoL29yZy9lY2xpcHNlL3dzdC9jb21tb24vdWkvaW50ZXJuYWwvc2VhcmNoL2RpYWxvZ3MvQ29tcG9uZW50U2VhcmNoTGlzdERpYWxvZy5qYXZhCmluZGV4IDU4OTU1MjUuLjVlZWQ1OTggMTAwNjQ0Ci0tLSBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi51aS9zcmMtc2VhcmNoL29yZy9lY2xpcHNlL3dzdC9jb21tb24vdWkvaW50ZXJuYWwvc2VhcmNoL2RpYWxvZ3MvQ29tcG9uZW50U2VhcmNoTGlzdERpYWxvZy5qYXZhCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi51aS9zcmMtc2VhcmNoL29yZy9lY2xpcHNlL3dzdC9jb21tb24vdWkvaW50ZXJuYWwvc2VhcmNoL2RpYWxvZ3MvQ29tcG9uZW50U2VhcmNoTGlzdERpYWxvZy5qYXZhCkBAIC0xMjEsNyArMTIxLDYgQEAKICAgICAgICAgQ29tcG9zaXRlIG1haW5Db21wb3NpdGUgPSAoQ29tcG9zaXRlKSBzdXBlci5jcmVhdGVEaWFsb2dBcmVhKHBhcmVudCk7CiAgICAgICAgIEdyaWREYXRhIGdEYXRhID0gKEdyaWREYXRhKSBtYWluQ29tcG9zaXRlLmdldExheW91dERhdGEoKTsKICAgICAgICAgZ0RhdGEuaGVpZ2h0SGludCA9IDUwMDsKLSAgICAgICAgZ0RhdGEud2lkdGhIaW50ID0gNDAwOwogICAgICAgICAKICAgICAgICAgY29uZmlndXJhdGlvbi5jcmVhdGVXaWRnZXRBYm92ZVF1YWxpZmllckJveChtYWluQ29tcG9zaXRlKTsgICAgICAgIAogICAgICAgICAvLyBTdWJjbGFzc2VzIG1heSB1c2UgdGhpcyBDb21wb3NpdGUgdG8gYWRkIGRlc2lyZWQgd2lkZ2V0cwpAQCAtNTAwLDEyICs0OTksOSBAQAogICAgICAgICAgICAgdHJ5IHsKICAgICAgICAgICAgICAgLy8gdGhpcyBzdHVmZiBnZXRzIGV4ZWN1dGVkIG9uIGEgbm9uLVVJIHRocmVhZAogICAgICAgICAgICAgICAvLwotICAgICAgICAgICAgICBsb25nIHRpbWUxID0gU3lzdGVtLmN1cnJlbnRUaW1lTWlsbGlzKCk7CiAgICAgICAgICAgICAgIGNvbmZpZ3VyYXRpb24uZ2V0U2VhcmNoTGlzdFByb3ZpZGVyKCkucG9wdWxhdGVDb21wb25lbnRMaXN0KGNvbXBvbmVudExpc3QsIHNlYXJjaFNjb3BlLCBudWxsKTsgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAvLyBEbyBhIGZpbmFsIHVwZGF0ZSBvZiBvdXIgSW5wdXQgZm9yIHRoZSBjb21wb25lbnQgdHJlZSB2aWV3ZXIuCiAgICAgICAgICAgICAgIGZpcmVVcGRhdGVMaXN0KGNvbXBvbmVudExpc3QpOwotICAgICAgICAgICAgICBsb25nIHRpbWUyID0gU3lzdGVtLmN1cnJlbnRUaW1lTWlsbGlzKCk7Ci0gICAgICAgICAgICAgIFN5c3RlbS5vdXQucHJpbnRsbigidGltZT0iICsgKHRpbWUyIC0gdGltZTEpICsgIiBpdGVtcz0gIiArIG1hc3RlckNvbXBvbmVudExpc3Quc2l6ZSgpKTsKICAgICAgICAgICAgIH0KICAgICAgICAgICAgIGNhdGNoIChFeGNlcHRpb24gZSkgewogICAgICAgICAgICAgCWUucHJpbnRTdGFja1RyYWNlKCk7CmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24udWkvc3JjLXNlYXJjaC9vcmcvZWNsaXBzZS93c3QvY29tbW9uL3VpL2ludGVybmFsL3NlYXJjaC9kaWFsb2dzL1Njb3BlZENvbXBvbmVudFNlYXJjaExpc3REaWFsb2cuamF2YSBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi51aS9zcmMtc2VhcmNoL29yZy9lY2xpcHNlL3dzdC9jb21tb24vdWkvaW50ZXJuYWwvc2VhcmNoL2RpYWxvZ3MvU2NvcGVkQ29tcG9uZW50U2VhcmNoTGlzdERpYWxvZy5qYXZhCmluZGV4IDRiZjdkOGQuLjE2Y2E2MTEgMTAwNjQ0Ci0tLSBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi51aS9zcmMtc2VhcmNoL29yZy9lY2xpcHNlL3dzdC9jb21tb24vdWkvaW50ZXJuYWwvc2VhcmNoL2RpYWxvZ3MvU2NvcGVkQ29tcG9uZW50U2VhcmNoTGlzdERpYWxvZy5qYXZhCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi51aS9zcmMtc2VhcmNoL29yZy9lY2xpcHNlL3dzdC9jb21tb24vdWkvaW50ZXJuYWwvc2VhcmNoL2RpYWxvZ3MvU2NvcGVkQ29tcG9uZW50U2VhcmNoTGlzdERpYWxvZy5qYXZhCkBAIC0xLDUgKzEsNSBAQAogLyoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioKLSAqIENvcHlyaWdodCAoYykgMjAwNCBJQk0gQ29ycG9yYXRpb24gYW5kIG90aGVycy4KKyAqIENvcHlyaWdodCAoYykgMjAwNCwgMjAwOCBJQk0gQ29ycG9yYXRpb24gYW5kIG90aGVycy4KICAqIEFsbCByaWdodHMgcmVzZXJ2ZWQuIFRoaXMgcHJvZ3JhbSBhbmQgdGhlIGFjY29tcGFueWluZyBtYXRlcmlhbHMKICAqIGFyZSBtYWRlIGF2YWlsYWJsZSB1bmRlciB0aGUgdGVybXMgb2YgdGhlIEVjbGlwc2UgUHVibGljIExpY2Vuc2UgdjEuMAogICogd2hpY2ggYWNjb21wYW5pZXMgdGhpcyBkaXN0cmlidXRpb24sIGFuZCBpcyBhdmFpbGFibGUgYXQKQEAgLTU0LDYgKzU0LDggQEAKICAgcHJvdGVjdGVkIFRleHQgd29ya2luZ1NldHNUZXh0OwogICAKICAgcHJvdGVjdGVkIHN0YXRpYyBTdHJpbmcgdmFsdWVGb3JXb3JraW5nU2V0c1RleHQ7CisgIC8vIFNob3cgKGRlZmF1bHQvdHJ1ZSkgb3IgaGlkZSAoZmFsc2UpIHRoZSBjdXJyZW50IHJlc291cmNlIHNjb3BlIGJ1dHRvbgorICBwcml2YXRlIGJvb2xlYW4gc2hvd0N1cnJlbnRSZXNvdXJjZVNjb3BlID0gdHJ1ZTsKICAgCiAgIC8vIHdvcmtpbmcgc2V0cyBjdXJyZW50bHkgY2hvc2VuIGJ5IHRoZSB1c2VyCiAgIHByaXZhdGUgc3RhdGljIElXb3JraW5nU2V0W10gd29ya2luZ1NldHM7CkBAIC04NCw4ICs4Niw2IEBACiAgICAgYm90dG9tQ29tcG9zaXRlLnNldExheW91dChsYXlvdXQpOwogICAgIEdyb3VwIGdyb3VwID0gbmV3IEdyb3VwKGJvdHRvbUNvbXBvc2l0ZSwgU1dULk5PTkUpOwogICAgIEdyaWRMYXlvdXQgZ3JpZExheW91dCA9IG5ldyBHcmlkTGF5b3V0KDMsIGZhbHNlKTsKLSAgICAvLyBncmlkTGF5b3V0Lm1hcmdpbldpZHRoID0gMDsKLSAgICAvLyBncmlkTGF5b3V0Lm1hcmdpbkxlZnQgPSAyOwogICAgIGdyb3VwLnNldExheW91dChncmlkTGF5b3V0KTsKICAgICBncm91cC5zZXRMYXlvdXREYXRhKG5ldyBHcmlkRGF0YShHcmlkRGF0YS5GSUxMX0hPUklaT05UQUwpKTsKICAgICBncm91cC5zZXRUZXh0KE1lc3NhZ2VzLl9VSV9MQUJFTF9TRUFSQ0hfU0NPUEUpOwpAQCAtOTgsNiArOTgsMjAgQEAKICAgICByYWRpb0J1dHRvblsyXS5zZXRUZXh0KFNDT1BFX0NVUlJFTlRfUkVTT1VSQ0UpOwogICAgIHJhZGlvQnV0dG9uWzNdID0gbmV3IEJ1dHRvbihncm91cCwgU1dULlJBRElPKTsKICAgICByYWRpb0J1dHRvblszXS5zZXRUZXh0KFNDT1BFX1dPUktJTkdfU0VUUyk7CisgICAgLy8gaHR0cHM6Ly9idWdzLmVjbGlwc2Uub3JnL2J1Z3Mvc2hvd19idWcuY2dpP2lkPTI1MDgxNSAKKyAgICAvLyBJZiB0aGUgY3VycmVudCByZXNvdXJjZSBzY29wZSBidXR0b24gaXMgaGlkZGVuLCBpdCBubyBsb25nZXIgaXMgdGhlIGRlZmF1bHQgc2NvcGUuICBXZSBtdXN0IHNlbGVjdCBvbmUgb2YgdGhlIHJlbWFpbmluZyAKKyAgICAvLyB2aXNpYmxlIHJhZGlvIGJ1dHRvbnMgKEVuY2xvc2luZyBQcm9qZWN0KSBhbmQgbWFrZSBpdCB0aGUgZGVmYXVsdC4gICAgCisgICAgcmFkaW9CdXR0b25bMl0uc2V0VmlzaWJsZShzaG93Q3VycmVudFJlc291cmNlU2NvcGUpOworICAgIGlmICghc2hvd0N1cnJlbnRSZXNvdXJjZVNjb3BlKQorICAgIHsKKyAgICAgIGN1cnJlbnRTZWFyY2hTY29wZSA9IFNDT1BFX0VOQ0xPU0lOR19QUk9KRUNUOworICAgICAgaWYgKGN1cnJlbnRSZXNvdXJjZSAhPSBudWxsKQorICAgICAgeworICAgICAgICAvLyBUaGlzIGlzIHRvIGVuc3VyZSB0aGF0IG9uY2UgdGhlIGRpYWxvZyBpcyBpbnZva2VkLCB0aGUgbGlzdCBpcyBwb3B1bGF0ZWQgd2l0aCB0aGUKKyAgICAgICAgLy8gYXBwcm9wcmlhdGUgY29tcG9uZW50cyBiYXNlZCBvbiB0aGlzIHNlYXJjaCBzY29wZS4KKyAgICAgICAgcG9wdWxhdGVNYXN0ZXJDb21wb25lbnRMaXN0KG5ldyBQcm9qZWN0U2VhcmNoU2NvcGUoY3VycmVudFJlc291cmNlLmdldEZ1bGxQYXRoKCkpKTsKKyAgICAgIH0gCisgICAgfQogICAgIGZvciAoaW50IGkgPSAwOyBpIDwgcmFkaW9CdXR0b24ubGVuZ3RoOyBpKyspCiAgICAgewogICAgICAgaWYgKHJhZGlvQnV0dG9uW2ldLmdldFRleHQoKS5lcXVhbHMoY3VycmVudFNlYXJjaFNjb3BlKSkKQEAgLTEzMCwxMSArMTQ0LDEzIEBACiAJCQlpZiAoIGRpYWxvZy5vcGVuKCkgPT0gV2luZG93Lk9LKXsKIAkJCQl3b3JraW5nU2V0cyA9IGRpYWxvZy5nZXRTZWxlY3Rpb24oKTsKIAkJCQl2YWx1ZUZvcldvcmtpbmdTZXRzVGV4dCA9ICIiOwotCQkJCWZvciAoaW50IGkgPSAwOyBpIDwgd29ya2luZ1NldHMubGVuZ3RoOyBpKyspewotCQkJCQl2YWx1ZUZvcldvcmtpbmdTZXRzVGV4dCArPSB3b3JraW5nU2V0c1tpXS5nZXRMYWJlbCgpOwotCQkJCQkvLyBpZiBub3QgdGhlIGxhc3QgaXRlbSwgd2UgYWRkIGEgY29tbWEKLQkJCQkJaWYgKCBpICE9IHdvcmtpbmdTZXRzLmxlbmd0aCAtIDEpIAotCQkJCQkJdmFsdWVGb3JXb3JraW5nU2V0c1RleHQgKz0gIiwgIjsKKwkJCQlpZiAod29ya2luZ1NldHMgIT0gbnVsbCkgeworCQkJCQlmb3IgKGludCBpID0gMDsgaSA8IHdvcmtpbmdTZXRzLmxlbmd0aDsgaSsrKXsKKwkJCQkJCXZhbHVlRm9yV29ya2luZ1NldHNUZXh0ICs9IHdvcmtpbmdTZXRzW2ldLmdldExhYmVsKCk7CisJCQkJCQkvLyBpZiBub3QgdGhlIGxhc3QgaXRlbSwgd2UgYWRkIGEgY29tbWEKKwkJCQkJCWlmICggaSAhPSB3b3JraW5nU2V0cy5sZW5ndGggLSAxKSAKKwkJCQkJCQl2YWx1ZUZvcldvcmtpbmdTZXRzVGV4dCArPSAiLCAiOworCQkJCQl9CiAJCQkJfQogCQkJCXdvcmtpbmdTZXRzVGV4dC5zZXRUZXh0KHZhbHVlRm9yV29ya2luZ1NldHNUZXh0KTsKIAkJCX0KQEAgLTE4MCw5ICsxOTYsMTEgQEAKIAkJCSAgLy8gQ29uc3RydWN0cyB0aGUgd29ya2luZyBzZXRzIHNjb3BlIGZyb20gdGhlIHdvcmtpbmcgc2V0cyB0aGUgdXNlcgogCQkJICAvLyBzZWxlY3RlZAogCQkJICBXb3JraW5nU2V0U2VhcmNoU2NvcGUgd29ya2luZ1NldHNTY29wZSA9IG5ldyBXb3JraW5nU2V0U2VhcmNoU2NvcGUoKTsKLQkJCSAgZm9yIChpbnQgaSA9IDA7IGkgPCB3b3JraW5nU2V0cy5sZW5ndGg7IGkrKyl7Ci0JCQkJICB3b3JraW5nU2V0c1Njb3BlLmFkZEFXb3JraW5nU2V0VG9TY29wZSh3b3JraW5nU2V0c1tpXS5nZXRFbGVtZW50cygpKTsKLQkJCSAgfQkJCSAgCisJCQkgIGlmICh3b3JraW5nU2V0cyAhPSBudWxsKSB7CisJCQkJICBmb3IgKGludCBpID0gMDsgaSA8IHdvcmtpbmdTZXRzLmxlbmd0aDsgaSsrKXsKKwkJCQkJICB3b3JraW5nU2V0c1Njb3BlLmFkZEFXb3JraW5nU2V0VG9TY29wZSh3b3JraW5nU2V0c1tpXS5nZXRFbGVtZW50cygpKTsKKwkJCQkgIH0KKwkJCSAgfQogCQkJICBzY29wZSA9IHdvcmtpbmdTZXRzU2NvcGU7CiAJCSAgfQogCQkgIApAQCAtMjI5LDQgKzI0NywxNCBAQAogICB7CiAgICAgdGhpcy5jdXJyZW50UmVzb3VyY2UgPSBjdXJyZW50UmVzb3VyY2U7CiAgIH0KKyAKKyAgLyoqCisgICAqIFRoaXMgaXMgbm9uLUFQSS4gIFNlZSBodHRwczovL2J1Z3MuZWNsaXBzZS5vcmcvYnVncy9zaG93X2J1Zy5jZ2k/aWQ9MjUwODE1CisgICAqIFNob3cgKGJ5IGRlZmF1bHQpLCBvciBoaWRlIHRoZSBjdXJyZW50IHJlc291cmNlIHNlYXJjaCBzY29wZSBidXR0b24KKyAgICogQHBhcmFtIHNob3dDdXJyZW50UmVzb3VyY2VTY29wZS4gIGZhbHNlIHRvIGhpZGUuCisgICAqLworICBwdWJsaWMgdm9pZCBzZXRTaG93Q3VycmVudFJlc291cmNlU2VhcmNoU2NvcGVCdWcyNTA4MTUoYm9vbGVhbiBzaG93Q3VycmVudFJlc291cmNlU2NvcGUpCisgIHsKKyAgICB0aGlzLnNob3dDdXJyZW50UmVzb3VyY2VTY29wZSA9IHNob3dDdXJyZW50UmVzb3VyY2VTY29wZTsKKyAgfQogfQpcIE5vIG5ld2xpbmUgYXQgZW5kIG9mIGZpbGUKZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi51aS9zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi91aS9pbnRlcm5hbC9Db21tb25VSU1lc3NhZ2VzLnByb3BlcnRpZXMgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24udWkvc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vdWkvaW50ZXJuYWwvQ29tbW9uVUlNZXNzYWdlcy5wcm9wZXJ0aWVzCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLjc0MmUzNWIKLS0tIC9kZXYvbnVsbAorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24udWkvc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vdWkvaW50ZXJuYWwvQ29tbW9uVUlNZXNzYWdlcy5wcm9wZXJ0aWVzCkBAIC0wLDAgKzEsMTQzIEBACishIFNlbGVjdFNpbmdsZUZpbGVQYWdlIGFuZCBTZWxlY3RNdWx0aUZpbGVQYWdlCitfVUlfTEFCRUxfU09VUkNFX0ZJTEVTICAgPSBXb3Jrc3BhY2UgRmlsZXMKK19VSV9MQUJFTF9TRUxFQ1RFRF9GSUxFUyA9IFNlbGVjdGVkIEZpbGVzCitfVUlfUE9QVVBfRVhQQU5EX0FMTAkgPSBFeHBhbmQgQWxsCitfVUlfUE9QVVBfQ09MTEFQU0VfQUxMCSA9IENvbGxhcHNlIEFsbAorCQorX1VJX0lNUE9SVF9CVVRUT04gICAgICAgICAgPSBJbXBvcnQgRmlsZXMuLi4KK19VSV9JTVBPUlRfQlVUVE9OX1RPT0xfVElQID0gSW1wb3J0IGZpbGVzIGZyb20gZmlsZSBzeXN0ZW0KKworCishIFNlbGVjdE11bHRpRmlsZVBhZ2UKKyEgTk9URSBUTyBUUkFOU0xBVE9SOiB0aGUgZm9sbG93aW5nIHRocmVlIGxpbmVzIHJlZmVycyB0byBfVUlfTEFCRUxfU0VMRUNURURfRklMRVMgbGFiZWwgYWJvdmUKK19VSV9BRERfQlVUVE9OX1RPT0xfVElQICAgID0gQWRkIGZpbGVzIHRvIFNlbGVjdGVkIEZpbGVzIGxpc3QuCitfVUlfUkVNT1ZFX0JVVFRPTl9UT09MX1RJUCA9IFJlbW92ZSBmaWxlcyBmcm9tIFNlbGVjdGVkIEZpbGVzIGxpc3QuCitfVUlfUkVNT1ZFX0FMTF9CVVRUT05fVE9PTF9USVAgPSAgUmVtb3ZlIGFsbCBmaWxlcyBmcm9tIFNlbGVjdGVkIEZpbGVzIGxpc3QuCisKKyEgTk9URSBUTyBUUkFOU0xBVE9SOiBObyB0cmFuc2xhdGlvbiBuZWVkZWQgb2YgZm9sbG93aW5nIHRocmVlIGxpbmVzCitfVUlfQUREX0JVVFRPTiAgICAgICAgICAgICA9ID4KK19VSV9SRU1PVkVfQlVUVE9OICAgICAgICAgID0gPAorX1VJX1JFTU9WRV9BTExfQlVUVE9OICAgICAgPSA8PAorCishIFNlbGVjdEphdmFQcm9qZWN0VmlldworX1VJX0xBQkVMX0NIT09TRV9GT0xERVIgPSBTZWxlY3QgYSBwcm9qZWN0IG9yIGZvbGRlcjoKKworISBTZWxlY3RKYXZhUHJvamVjdERpYWxvZworX1VJX0xBQkVMX0ZPTERFUl9TRUxFQ1RJT04gPSBDb250YWluZXIgU2VsZWN0aW9uCisKKyEgVGV4dFZpZXdlck9wZXJhdGlvbkFjdGlvbgorX1VJX01FTlVfQ09QWSAgICAgICAgID0gJkNvcHkKK19VSV9NRU5VX0NVVCAgICAgICAgICA9IEN1JnQKK19VSV9NRU5VX0RFTEVURSAgICAgICA9IERlbGV0ZQorX1VJX01FTlVfUEFTVEUgICAgICAgID0gJlBhc3RlCitfVUlfTUVOVV9QUkVGSVggICAgICAgPSBQcmVmaXgKK19VSV9NRU5VX1JFRE8gICAgICAgICA9IFJlZG8KK19VSV9NRU5VX1NFTEVDVF9BTEwgICA9IFNlbGVjdCBBbGwKK19VSV9NRU5VX1NISUZUX0xFRlQgICA9IFNoaWZ0IExlZnQKK19VSV9NRU5VX1NISUZUX1JJR0hUICA9IFNoaWZ0IFJpZ2h0CitfVUlfTUVOVV9TVFJJUF9QUkVGSVggPSBTdHJpcCBQcmVmaXgKK19VSV9NRU5VX1VORE8gICAgICAgICA9IFVuZG8KKworISBTb3VyY2VWaWV3ZXJHb3RvTGluZUFjdGlvbgorX1VJX01FTlVfR09UT19MSU5FICAgICAgICAgICA9IEdvIFRvIExpbmUuLi4KK19VSV9HT1RPX0xJTkVfRElBTE9HX1RJVExFICAgPSBHbyBUbyBMaW5lCitfVUlfR09UT19MSU5FX0RJQUxPR19URVhUICAgID0gRW50ZXIgTGluZSBOdW1iZXIKKworX1VJX0ZJTEVfQ0hBTkdFRF9USVRMRSA9IEZpbGUgQ2hhbmdlZAorX1VJX0ZJTEVfREVMRVRFRF9TQVZFX0NIQU5HRVMgPSBUaGUgZmlsZSBoYXMgYmVlbiBkZWxldGVkIGZyb20gdGhlIGZpbGUgc3lzdGVtLiBEbyB5b3Ugd2FudCB0byBzYXZlIHlvdXIgY2hhbmdlcyBvciBjbG9zZSB0aGUgZWRpdG9yIHdpdGhvdXQgc2F2aW5nPworX1VJX0ZJTEVfREVMRVRFRF9FRElUT1JfQ0xPU0VEID0gVGhlIGZpbGUgaGFzIGJlZW4gZGVsZXRlZCBmcm9tIHRoZSBmaWxlIHN5c3RlbS4gVGhpcyBlZGl0b3Igd2lsbCBiZSBjbG9zZWQuCitfVUlfRklMRV9DSEFOR0VEX0xPQURfQ0hBTkdFUyA9IFRoZSBmaWxlIGhhcyBiZWVuIGNoYW5nZWQgb24gdGhlIGZpbGUgc3lzdGVtLiBEbyB5b3Ugd2FudCB0byBsb2FkIHRoZSBjaGFuZ2VzPworX1VJX1NBVkVfQlVUVE9OID0gU2F2ZQorX1VJX0NMT1NFX0JVVFRPTiA9IENsb3NlCisKKworISBYU0wgUHJlZmVyZXJlbmNlCitfVUlfWFNMVF9TRUxFQ1QgICAgID0gU2VsZWN0IHdoaWNoIGVsZW1lbnQgdG8gdXNlIGZvciB5b3VyIHN0eWxlc2hlZXQKK19VSV9YU0xUX1NUWUxFU0hFRVQgPSAmVXNlIDx4c2w6c3R5bGVzaGVldD4KK19VSV9YU0xUX1RSQU5TRk9STSAgPSBVJnNlIDx4c2w6dHJhbnNmb3JtPgorCishIFhTTCBEZWJ1ZyBQcmVmZXJlcmVuY2UKK19VSV9YU0xfREVCVUdfU0VMRUNUX0xBVU5DSEVSID0gU2V0IHRoZSBkZWZhdWx0IFhTTCBsYXVuY2hlciBmb3IgdGhlIFhTTCBEZWJ1Z2dpbmcgYW5kIFRyYW5zZm9ybWF0aW9uIHRvb2wKK19VSV9YU0xfREVCVUdfTE9DQUwgICAgICAgICAgID0gJlhTTCBhcHBsaWNhdGlvbgorX1VJX1hTTF9ERUJVR19SRU1PVEUgICAgICAgICAgPSBYUyZMIHJlbW90ZSBhcHBsaWNhdGlvbgorX1VJX1hTTF9USUxFX0VESVRPUiAgICAgICAgICAgPSAmU2hvdyBhbGwgZGVidWdnaW5nIGZpbGVzIGluIGEgdGlsZSBlZGl0b3IKK19VSV9YU0xfREVCVUdfQU5EX1RSQU5TRk9STSAgID0gJlJ1biB0cmFuc2Zvcm1hdGlvbiBhbmQgb3BlbiBhIGRlYnVnZ2luZyBzZXNzaW9uCitfVUlfWFNMX0NPTlRFWFRfVVJJICAgICAgICAgICA9IENvbnRleHQgUGF0aCAKK19VSV9YU0xfQ09OVEVYVCAgICAgICAgICAgICAgID0gU3BlY2lmeSBhICZjb250ZXh0IHBhdGggZm9yIHJlc29sdmluZyBVUklzIGluIHhzbDppbXBvcnQsIHhzbDppbmNsdWRlIG9yIGRvY3VtZW50KCkKKworCitfVUlfT1ZFUlJJREVfRklMRSAgICA9IE92ZXJ3cml0ZSBleGlzdGluZyBmaWxlcworX1VJX0pBVkFfRVhJU1RfRklMRTEgPSBUaGUgZm9sbG93aW5nIEphdmEgY2xhc3NlcyBhbHJlYWR5IGV4aXN0LgorX1VJX0pBVkFfRVhJU1RfRklMRTIgPSBEbyB5b3Ugd2FudCB0byBvdmVyd3JpdGUgdGhlIGV4aXN0aW5nIGZpbGU/CisgICAgICAKKyEgc29tZSBvcHRpb25zIHN0cmluZ3MgY29tbW9uIHRvIHNldmVyYWwgcGx1Z2lucworX1VJX0VSUk9SX0NSRUFUSU5HX0ZJTEVfVElUTEUgPSBFcnJvciBDcmVhdGluZyBGaWxlCitfVUlfRVJST1JfQ1JFQVRJTkdfRklMRV9TSE9SVF9ERVNDID0gRXJyb3IgY3JlYXRpbmcgZmlsZSAiezB9IgorX1VJX0VSUk9SX0NSRUFUSU5HX0ZJTEVfTE9OR19ERVNDID0gQW4gZXJyb3Igb2NjdXJlZCB3aGlsZSBhdHRlbXB0aW5nIHRvIGNyZWF0ZSB0aGUgZmlsZSAiezB9Ii4KK19VSV9QQVJFTlRfRk9MREVSX0lTX1JFQURfT05MWSA9IFRoZSBwYXJlbnQgZGlyZWN0b3J5ICJ7MH0iIGlzIHJlYWQgb25seS4KK19VSV9VTktOT1dOX0VSUk9SX1dJVEhfSElOVCA9IFVua25vd24gZXJyb3IuIEVuc3VyZSB0aGF0IHRoZSBwYXJlbnQgZGlyZWN0b3J5ICJ7MH0iIGlzIHdyaXRlYWJsZS4KK19VSV9VTktOT1dOX0VSUk9SID0gVW5rbm93biBlcnJvci4gRW5zdXJlIHRoYXQgdGhlIHBhcmVudCBkaXJlY3RvcnkgInswfSIgaXMgd3JpdGVhYmxlLgorCishIHVzYWdlIC0gdGhpcyBsYWJlbCBpcyBmb2xsb3dlZCBieSB0d28gcmFkaW8gYnV0dG9uIG9wdGlvbnMgZm9yIHRoZSBmaWxlIGxvY2F0aW9uCitfVUlfTEFCRUxfSU5DTFVERV9VUkxfRklMRSA9IFNlbGVjdCBmaWxlIGxvY2F0aW9uCitfVUlfUkFESU9fRklMRSAgICAgICAgICAgICA9IFdvcmtzcGFjZSBwcm9qZWN0cworX1VJX1JBRElPX1VSTCAgICAgICAgICAgICAgPSBIVFRQCisKK19VSV9MQUJFTF9DT01QT05FTlRTCQkJCSAgID0gQ29tcG9uZW50czoKK19VSV9MQUJFTF9RVUFMSUZJRVIJCQkJCSAgID0gUXVhbGlmaWVyOgorCishLSBjb21wb25lbnQgc2VsZWN0aW9uIGRpYWxvZ3MgCitfVUlfTEFCRUxfQ09NUE9ORU5UX05BTUUJCQkgICA9IENvbXBvbmVudCBOYW1lOgorX1VJX0xBQkVMX01BVENISU5HX0NPTVBPTkVOVFMJCSAgID0gTWF0Y2hpbmcgQ29tcG9uZW50czoKK19VSV9MQUJFTF9TUEVDSUZJRURfRklMRQkJCSAgID0gU3BlY2lmaWVkIEZpbGUKK19VSV9MQUJFTF9FTkNMT1NJTkdfUFJPSkVDVAkJCSAgID0gRW5jbG9zaW5nIFByb2plY3QKK19VSV9MQUJFTF9XT1JLU1BBQ0UJCQkJCSAgID0gV29ya3NwYWNlCitfVUlfTEFCRUxfQ1VSUkVOVF9SRVNPVVJDRQkJCSAgID0gQ3VycmVudCBSZXNvdXJjZQorX1VJX0xBQkVMX1NFQVJDSF9TQ09QRQkJCQkgICA9IFNlYXJjaCBTY29wZQorX1VJX0xBQkVMX05BUlJPV19TRUFSQ0hfU0NPUEVfUkVTT1VSQ0UgPSBVc2UgcmVzb3VyY2UgdmlldyB0byBuYXJyb3cgc2VhcmNoIHNjb3BlCitfVUlfTEFCRUxfQVZBSUxBQkxFX1RZUEVTCQkJICAgPSBBdmFpbGFibGUgVHlwZXMKK19VSV9MQUJFTF9XT1JLSU5HX1NFVFMgICAgICAgICAgICAgICAgID0gV29ya2luZyBTZXRzCisKK19VSV9MQUJFTF9OZXc9TmV3Li4uCitfVUlfTEFCRUxfREVDTEFSQVRJT05fTE9DQVRJT049RGVjbGFyYXRpb24gTG9jYXRpb246CitfVUlfTEFCRUxfQ0hPT1NFPUNob29zZS4uLgorCishPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KKyEKKyEgSGVyZSBpcyB0aGUgbGlzdCBvZiBFcnJvciBzdHJpbmcgdGhhdCBoYXZlIG1lc3NhZ2UgSURzIC0gbWFrZSBzdXJlIHRoZXkgYXJlIHVuaXF1ZQorISAgUmFuZ2UgZm9yIGIyYmd1aSBtZXNzYWdlSURzOiBJV0FYMTIwMSAtIElXQVgxNDAwCishCishPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KKworX0VSUk9SX1RIRV9DT05UQUlORVJfTkFNRSA9IFRoZSBzcGVjaWZpZWQgY29udGFpbmVyIG11c3QgZXhpc3QgaW4gdGhlIHdvcmtzcGFjZSBhbmQgaXRzIHBhdGggbXVzdCBzdGFydCBhdCB0aGUgd29ya3NwYWNlIHJvb3QuCisKK19FUlJPUl9MT0NBTF9MT0NBVElPTiAgICAgPSBUaGUgbG9jYWwgbG9jYXRpb24gb2YgdGhpcyBjb250YWluZXIgY2Fubm90IGJlIHJlc29sdmVkLgorX0VSUk9SX05PVF9KQVZBX1BST0pFQ1QgICA9IFRoZSBzcGVjaWZpZWQgcHJvamVjdCBpcyBub3QgYSBKYXZhIHByb2plY3QuCisKKyFOT1RFIFRPIFRSQU5TTEFUT1I6IHRoaXMgZXJyb3IgbWVzc2FnZSB0ZXh0IGlzIGZvbGxvd2VkIGJ5IGEgbWVzc2FnZSBmcm9tIGFub3RoZXIgcGx1Z2luCitfRVJST1JfSU5WQUxJRF9KQVZBX1BBQ0tBR0UgPSBJV0FYMTIwMUUgSW52YWxpZCBwYWNrYWdlIG5hbWUgZXJyb3I6CisKKyFOT1RFIFRPIFRSQU5TTEFUT1I6IChfRVJST1JfQkFEX0ZJTEVOQU1FX0VYVEVOU0lPTiArIHN0cmluZyArIF9VSV9MQUJFTF9PUiArIHN0cmluZykgb3IgKF9FUlJPUl9CQURfRklMRU5BTUVfRVhURU5TSU9OKQorX0VSUk9SX0JBRF9GSUxFTkFNRV9FWFRFTlNJT04gICAgICAgICA9IFRoZSBmaWxlIG5hbWUgbXVzdCBlbmQgd2l0aAorX0VSUk9SX0ZJTEVfQUxSRUFEWV9FWElTVFMgICAgICAgICAgICA9IFRoZSBzYW1lIG5hbWUgYWxyZWFkeSBleGlzdHMuCisKK19FUlJPUl9DT05UQUlORVJfTk9UX0pBVkFfQlVJTERQQVRIID0gVGhlIGNvbnRhaW5lciBpcyBub3QgYSBKYXZhIHNvdXJjZSBmb2xkZXIgZm9yIHRoaXMgcHJvamVjdAorX0VSUk9SX1VTRV9QUk9KRUNUX0pBVkFfU09VUkNFX0ZPTERFUiA9IFRoZSBwcm9qZWN0IGlzIG5vdCBvbiB0aGUgYnVpbGQgcGF0aC4gIFNlbGVjdCBhIEphdmEgc291cmNlIGZvbGRlciBmb3IgdGhlIHByb2plY3QuCisKK19VSV9FUlJPUiAgICAgICAgICAgICA9IEVycm9yCisKKyFOT1RFIFRPIFRSQU5TTEFUT1I6IHRoaXMgd2FybmluZyBtZXNzYWdlIHRleHQgaXMgZm9sbG93ZWQgYnkgYSBtZXNzYWdlIGZyb20gYW5vdGhlciBwbHVnaW4KK19XQVJOX0lOVkFMSURfSkFWQV9QQUNLQUdFID0gSW52YWxpZCBwYWNrYWdlIG5hbWUgd2FybmluZzoKKworX0VSUk9SX1JPT1RfRUxFTUVOVCA9IFRoZSBYTUwgc2NoZW1hIGRvZXMgbm90IGNvbnRhaW4gYW55IGdsb2JhbCBlbGVtZW50cyB0aGF0IGNhbiBiZSB1c2VkIGFzIGEgcm9vdCBlbGVtZW50LgorX0VSUk9SX1NBVklOR19GSUxFID0gRXJyb3Igc2F2aW5nIGZpbGUgInswfSIKKworISBGaWxlIFZhbGlkYXRvcgorX1VJX0VSUk9SX1ZBTElEQVRFX0ZBSUxfVElUTEUgPSBGYWlsZWQgdG8gY2hlY2sgb3V0IG5lY2Vzc2FyeSBmaWxlcworX1VJX0VSUk9SX1ZBTElEQVRFX0ZBSUxfTUVTU0FHRSA9IEdlbmVyYXRpb24gZmFpbGVkLiBOZWNlc3NhcnkgZmlsZXMgY291bGQgbm90IGJlIGNoZWNrZWQgb3V0LiAKKworISBQcm9wZXJ0eURpcnR5Q2hhbmdlTGlzdGVuZXIgYW5kIFByb3BlcnR5UmVzb3VyY2VDaGFuZ2VMaXN0ZW5lcgorX1VJX0VSUk9SX1ZBTElEQVRFX0VESVRfRkFJTF9PTkVfRklMRSA9IEVycm9yCisKK1NhdmVGaWxlc0RpYWxvZ19zYXZlX2FsbF9yZXNvdXJjZXM9U2F2ZSBBbGwgTW9kaWZpZWQgUmVzb3VyY2VzCitTYXZlRmlsZXNEaWFsb2dfbXVzdF9zYXZlPUFsbCBtb2RpZmllZCByZXNvdXJjZXMgbXVzdCBiZSBzYXZlZCBiZWZvcmUgdGhpcyBvcGVyYXRpb24uCmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24udWkvc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vdWkvaW50ZXJuYWwvTWVzc2FnZXMuamF2YSBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi51aS9zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi91aS9pbnRlcm5hbC9NZXNzYWdlcy5qYXZhCmluZGV4IGNlMTNiYjguLjBjZDgxNmEgMTAwNjQ0Ci0tLSBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi51aS9zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi91aS9pbnRlcm5hbC9NZXNzYWdlcy5qYXZhCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi51aS9zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi91aS9pbnRlcm5hbC9NZXNzYWdlcy5qYXZhCkBAIC0xLDUgKzEsNSBAQAogLyoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioKLSAqIENvcHlyaWdodCAoYykgMjAwMSwgMjAwNiBJQk0gQ29ycG9yYXRpb24gYW5kIG90aGVycy4KKyAqIENvcHlyaWdodCAoYykgMjAwMSwgMjAwOCBJQk0gQ29ycG9yYXRpb24gYW5kIG90aGVycy4KICAqIEFsbCByaWdodHMgcmVzZXJ2ZWQuIFRoaXMgcHJvZ3JhbSBhbmQgdGhlIGFjY29tcGFueWluZyBtYXRlcmlhbHMKICAqIGFyZSBtYWRlIGF2YWlsYWJsZSB1bmRlciB0aGUgdGVybXMgb2YgdGhlIEVjbGlwc2UgUHVibGljIExpY2Vuc2UgdjEuMAogICogd2hpY2ggYWNjb21wYW5pZXMgdGhpcyBkaXN0cmlidXRpb24sIGFuZCBpcyBhdmFpbGFibGUgYXQKQEAgLTEzLDcgKzEzLDcgQEAKIGltcG9ydCBvcmcuZWNsaXBzZS5vc2dpLnV0aWwuTkxTOwogCiBwdWJsaWMgY2xhc3MgTWVzc2FnZXMgewotCXByaXZhdGUgc3RhdGljIGZpbmFsIFN0cmluZyBCVU5ETEVfTkFNRSA9ICJwbHVnaW4iOyAvLyROT04tTkxTLTEkCisJcHJpdmF0ZSBzdGF0aWMgZmluYWwgU3RyaW5nIEJVTkRMRV9OQU1FID0gIm9yZy5lY2xpcHNlLndzdC5jb21tb24udWkuaW50ZXJuYWwuQ29tbW9uVUlNZXNzYWdlcyI7IC8vJE5PTi1OTFMtMSQKIAogCXN0YXRpYyB7CiAJCU5MUy5pbml0aWFsaXplTWVzc2FnZXMoQlVORExFX05BTUUsIE1lc3NhZ2VzLmNsYXNzKTsgLy8kTk9OLU5MUy0xJApAQCAtMTQ5LDYgKzE0OSw4IEBACiAKIAlwdWJsaWMgc3RhdGljIFN0cmluZyBfVUlfRVJST1I7CiAKKwlwdWJsaWMgc3RhdGljIFN0cmluZyBfV0FSTl9JTlZBTElEX0pBVkFfUEFDS0FHRTsKKwkKIAlwdWJsaWMgc3RhdGljIFN0cmluZyBfRVJST1JfUk9PVF9FTEVNRU5UOwogCXB1YmxpYyBzdGF0aWMgU3RyaW5nIF9FUlJPUl9TQVZJTkdfRklMRTsKIApAQCAtMTU5LDE4ICsxNjEsNiBAQAogLy8JIFByb3BlcnR5RGlydHlDaGFuZ2VMaXN0ZW5lciBhbmQgUHJvcGVydHlSZXNvdXJjZUNoYW5nZUxpc3RlbmVyCiAJcHVibGljIHN0YXRpYyBTdHJpbmcgX1VJX0VSUk9SX1ZBTElEQVRFX0VESVRfRkFJTF9PTkVfRklMRTsKIAotLy8JcHVibGljIHN0YXRpYyBTdHJpbmcgRXhhbXBsZVByb2plY3RDcmVhdGlvbldpemFyZC50aXRsZTsKLS8vCXB1YmxpYyBzdGF0aWMgU3RyaW5nIEV4YW1wbGVQcm9qZWN0Q3JlYXRpb25XaXphcmQub3BfZXJyb3IudGl0bGU7Ci0vLwlwdWJsaWMgc3RhdGljIFN0cmluZyBFeGFtcGxlUHJvamVjdENyZWF0aW9uV2l6YXJkLm9wX2Vycm9yLm1lc3NhZ2U7Ci0vLwotLy8JcHVibGljIHN0YXRpYyBTdHJpbmcgRXhhbXBsZVByb2plY3RDcmVhdGlvbldpemFyZC5vdmVyd3JpdGVxdWVyeS50aXRsZTsKLS8vCXB1YmxpYyBzdGF0aWMgU3RyaW5nIEV4YW1wbGVQcm9qZWN0Q3JlYXRpb25XaXphcmQub3ZlcndyaXRlcXVlcnkubWVzc2FnZTsKLS8vCi0vLwotLy8JcHVibGljIHN0YXRpYyBTdHJpbmcgRXhhbXBsZVByb2plY3RDcmVhdGlvbk9wZXJhdGlvbi5vcF9kZXNjOwotLy8JcHVibGljIHN0YXRpYyBTdHJpbmcgRXhhbXBsZVByb2plY3RDcmVhdGlvbk9wZXJhdGlvbi5vcF9kZXNjX3Byb2o7Ci0vLwotLy8JcHVibGljIHN0YXRpYyBTdHJpbmcgRXhhbXBsZVByb2plY3RDcmVhdGlvbldpemFyZFBhZ2UuZXJyb3IuYWxyZWFkeWV4aXN0czsKIAlwdWJsaWMgc3RhdGljIFN0cmluZyBTYXZlRmlsZXNEaWFsb2dfc2F2ZV9hbGxfcmVzb3VyY2VzOwogCXB1YmxpYyBzdGF0aWMgU3RyaW5nIFNhdmVGaWxlc0RpYWxvZ19tdXN0X3NhdmU7CiB9CmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24udWkvc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vdWkvaW50ZXJuYWwvbmF2aWdhdG9yL0lMb2FkaW5nREROb2RlLmphdmEgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24udWkvc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vdWkvaW50ZXJuYWwvbmF2aWdhdG9yL0lMb2FkaW5nREROb2RlLmphdmEKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uYWIzMTBkZAotLS0gL2Rldi9udWxsCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi51aS9zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi91aS9pbnRlcm5hbC9uYXZpZ2F0b3IvSUxvYWRpbmdERE5vZGUuamF2YQpAQCAtMCwwICsxLDM1IEBACisvKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKgorICogQ29weXJpZ2h0IChjKSAyMDA5IElCTSBDb3Jwb3JhdGlvbiBhbmQgb3RoZXJzLgorICogQWxsIHJpZ2h0cyByZXNlcnZlZC4gVGhpcyBwcm9ncmFtIGFuZCB0aGUgYWNjb21wYW55aW5nIG1hdGVyaWFscworICogYXJlIG1hZGUgYXZhaWxhYmxlIHVuZGVyIHRoZSB0ZXJtcyBvZiB0aGUgRWNsaXBzZSBQdWJsaWMgTGljZW5zZSB2MS4wCisgKiB3aGljaCBhY2NvbXBhbmllcyB0aGlzIGRpc3RyaWJ1dGlvbiwgYW5kIGlzIGF2YWlsYWJsZSBhdAorICogaHR0cDovL3d3dy5lY2xpcHNlLm9yZy9sZWdhbC9lcGwtdjEwLmh0bWwKKyAqCisgKiBDb250cmlidXRvcnM6CisgKiAgICAgSUJNIENvcnBvcmF0aW9uIC0gaW5pdGlhbCBBUEkgYW5kIGltcGxlbWVudGF0aW9uCisgKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKi8KKworcGFja2FnZSBvcmcuZWNsaXBzZS53c3QuY29tbW9uLnVpLmludGVybmFsLm5hdmlnYXRvcjsKKworaW1wb3J0IG9yZy5lY2xpcHNlLnN3dC5ncmFwaGljcy5JbWFnZTsKKworLyoqCisgKiAKKyAqIEBhdXRob3IgCisgKiBBbiBpbnRlcmZhY2UgdXNlZCBieSBuYXZpZ2F0b3IgY29udHJpYnV0aW9uIHRvIGRpc3BsYXkgdGV4dCBhbmQgaW1hZ2UKKyAqIHdoaWxlIGxvYWRpbmcgdGhlIG1vZGVsIAorICovCitwdWJsaWMgaW50ZXJmYWNlIElMb2FkaW5nREROb2RlIHsKKwkKKwkvKioKKwkgKiAKKwkgKiBAcmV0dXJuCisJICovCisJU3RyaW5nIGdldFRleHQoKTsKKwkKKwkvKioKKwkgKiAKKwkgKiBAcmV0dXJuCisJICovCisJSW1hZ2UgZ2V0SW1hZ2UoKTsKK30KXCBObyBuZXdsaW5lIGF0IGVuZCBvZiBmaWxlCmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24udWkvc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vdWkvcHJvdmlzaW9uYWwvZWRpdG9ycy9Qb3N0TXVsdGlQYWdlRWRpdG9yU2l0ZS5qYXZhIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLnVpL3NyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL3VpL3Byb3Zpc2lvbmFsL2VkaXRvcnMvUG9zdE11bHRpUGFnZUVkaXRvclNpdGUuamF2YQpkZWxldGVkIGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggZWUyODBjYS4uMDAwMDAwMAotLS0gYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24udWkvc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vdWkvcHJvdmlzaW9uYWwvZWRpdG9ycy9Qb3N0TXVsdGlQYWdlRWRpdG9yU2l0ZS5qYXZhCisrKyAvZGV2L251bGwKQEAgLTEsMTAzICswLDAgQEAKLS8qKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqCi0gKiBDb3B5cmlnaHQgKGMpIDIwMDAsIDIwMDUgSUJNIENvcnBvcmF0aW9uIGFuZCBvdGhlcnMuCi0gKiBBbGwgcmlnaHRzIHJlc2VydmVkLiBUaGlzIHByb2dyYW0gYW5kIHRoZSBhY2NvbXBhbnlpbmcgbWF0ZXJpYWxzCi0gKiBhcmUgbWFkZSBhdmFpbGFibGUgdW5kZXIgdGhlIHRlcm1zIG9mIHRoZSBFY2xpcHNlIFB1YmxpYyBMaWNlbnNlIHYxLjAKLSAqIHdoaWNoIGFjY29tcGFuaWVzIHRoaXMgZGlzdHJpYnV0aW9uLCBhbmQgaXMgYXZhaWxhYmxlIGF0Ci0gKiBodHRwOi8vd3d3LmVjbGlwc2Uub3JnL2xlZ2FsL2VwbC12MTAuaHRtbAotICoKLSAqIENvbnRyaWJ1dG9yczoKLSAqICAgICBJQk0gQ29ycG9yYXRpb24gLSBpbml0aWFsIEFQSSBhbmQgaW1wbGVtZW50YXRpb24KLSAqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqLwotcGFja2FnZSBvcmcuZWNsaXBzZS53c3QuY29tbW9uLnVpLnByb3Zpc2lvbmFsLmVkaXRvcnM7Ci0KLWltcG9ydCBvcmcuZWNsaXBzZS5qZmFjZS52aWV3ZXJzLklQb3N0U2VsZWN0aW9uUHJvdmlkZXI7Ci1pbXBvcnQgb3JnLmVjbGlwc2UuamZhY2Uudmlld2Vycy5JU2VsZWN0aW9uQ2hhbmdlZExpc3RlbmVyOwotaW1wb3J0IG9yZy5lY2xpcHNlLmpmYWNlLnZpZXdlcnMuSVNlbGVjdGlvblByb3ZpZGVyOwotaW1wb3J0IG9yZy5lY2xpcHNlLmpmYWNlLnZpZXdlcnMuU2VsZWN0aW9uQ2hhbmdlZEV2ZW50OwotaW1wb3J0IG9yZy5lY2xpcHNlLnVpLklFZGl0b3JQYXJ0OwotaW1wb3J0IG9yZy5lY2xpcHNlLnVpLnBhcnQuTXVsdGlQYWdlRWRpdG9yUGFydDsKLWltcG9ydCBvcmcuZWNsaXBzZS51aS5wYXJ0Lk11bHRpUGFnZUVkaXRvclNpdGU7Ci0KLS8qKgotICogQGRlcHJlY2F0ZWQgLSBObyBsb25nZXIgbmVjZXNzYXJ5IGFzIG9mIDMuMk0zLgotICovCi1wdWJsaWMgY2xhc3MgUG9zdE11bHRpUGFnZUVkaXRvclNpdGUgZXh0ZW5kcyBNdWx0aVBhZ2VFZGl0b3JTaXRlIHsKLQkvKioKLQkgKiBUaGUgcG9zdCBzZWxlY3Rpb24gY2hhbmdlIGxpc3RlbmVyLCBpbml0aWFsaXplZCBsYXppbHk7Ci0JICogPGNvZGU+bnVsbDwvY29kZT4gaWYgbm90IHlldCBjcmVhdGVkLgotCSAqLwotCXByaXZhdGUgSVNlbGVjdGlvbkNoYW5nZWRMaXN0ZW5lciBwb3N0U2VsZWN0aW9uQ2hhbmdlZExpc3RlbmVyID0gbnVsbDsKLQotCXB1YmxpYyBQb3N0TXVsdGlQYWdlRWRpdG9yU2l0ZShNdWx0aVBhZ2VFZGl0b3JQYXJ0IG11bHRpUGFnZUVkaXRvciwgSUVkaXRvclBhcnQgZWRpdG9yKSB7Ci0JCXN1cGVyKG11bHRpUGFnZUVkaXRvciwgZWRpdG9yKTsKLQl9Ci0KLQkvKioKLQkgKiBSZXR1cm5zIHRoZSBzZWxlY3Rpb24gY2hhbmdlZCBsaXN0ZW5lciB3aGljaCBsaXN0ZW5zIHRvIHRoZSBuZXN0ZWQKLQkgKiBlZGl0b3IncyBwb3N0IHNlbGVjdGlvbiBjaGFuZ2VzLCBhbmQgY2FsbHMKLQkgKiA8Y29kZT5oYW5kbGVQb3N0U2VsZWN0aW9uQ2hhbmdlZDwvY29kZT4uCi0JICogCi0JICogQHJldHVybiB0aGUgc2VsZWN0aW9uIGNoYW5nZWQgbGlzdGVuZXIKLQkgKi8KLQlwcml2YXRlIElTZWxlY3Rpb25DaGFuZ2VkTGlzdGVuZXIgZ2V0UG9zdFNlbGVjdGlvbkNoYW5nZWRMaXN0ZW5lcigpIHsKLQkJaWYgKHBvc3RTZWxlY3Rpb25DaGFuZ2VkTGlzdGVuZXIgPT0gbnVsbCkgewotCQkJcG9zdFNlbGVjdGlvbkNoYW5nZWRMaXN0ZW5lciA9IG5ldyBJU2VsZWN0aW9uQ2hhbmdlZExpc3RlbmVyKCkgewotCQkJCXB1YmxpYyB2b2lkIHNlbGVjdGlvbkNoYW5nZWQoU2VsZWN0aW9uQ2hhbmdlZEV2ZW50IGV2ZW50KSB7Ci0JCQkJCVBvc3RNdWx0aVBhZ2VFZGl0b3JTaXRlLnRoaXMuaGFuZGxlUG9zdFNlbGVjdGlvbkNoYW5nZWQoZXZlbnQpOwotCQkJCX0KLQkJCX07Ci0JCX0KLQkJcmV0dXJuIHBvc3RTZWxlY3Rpb25DaGFuZ2VkTGlzdGVuZXI7Ci0JfQotCi0JLyoqCi0JICogSGFuZGxlcyBhIHBvc3Qgc2VsZWN0aW9uIGNoYW5nZWQgZXZlbnQgZnJvbSB0aGUgbmVzdGVkIGVkaXRvci4gVGhlCi0JICogZGVmYXVsdCBpbXBsZW1lbnRhdGlvbiBnZXRzIHRoZSBzZWxlY3Rpb24gcHJvdmlkZXIgZnJvbSB0aGUgbXVsdGktcGFnZQotCSAqIGVkaXRvcidzIHNpdGUsIGFuZCBjYWxscyA8Y29kZT5maXJlUG9zdFNlbGVjdGlvbkNoYW5nZWQ8L2NvZGU+IG9uIGl0Ci0JICogKG9ubHkgaWYgaXQgaXMgYW4gaW5zdGFuY2Ugb2YgPGNvZGU+TXVsdGlQYWdlU2VsZWN0aW9uUHJvdmlkZXI8L2NvZGU+KSwKLQkgKiBwYXNzaW5nIGEgbmV3IGV2ZW50IG9iamVjdC4KLQkgKiA8cD4KLQkgKiBTdWJjbGFzc2VzIG1heSBleHRlbmQgb3IgcmVpbXBsZW1lbnQgdGhpcyBtZXRob2QuCi0JICogPC9wPgotCSAqIAotCSAqIEBwYXJhbSBldmVudAotCSAqICAgICAgICAgICAgdGhlIGV2ZW50Ci0JICovCi0JcHJvdGVjdGVkIHZvaWQgaGFuZGxlUG9zdFNlbGVjdGlvbkNoYW5nZWQoU2VsZWN0aW9uQ2hhbmdlZEV2ZW50IGV2ZW50KSB7Ci0JCUlTZWxlY3Rpb25Qcm92aWRlciBwYXJlbnRQcm92aWRlciA9IGdldE11bHRpUGFnZUVkaXRvcigpLmdldFNpdGUoKS5nZXRTZWxlY3Rpb25Qcm92aWRlcigpOwotCQlpZiAocGFyZW50UHJvdmlkZXIgaW5zdGFuY2VvZiBQb3N0TXVsdGlQYWdlU2VsZWN0aW9uUHJvdmlkZXIpIHsKLQkJCVNlbGVjdGlvbkNoYW5nZWRFdmVudCBuZXdFdmVudCA9IG5ldyBTZWxlY3Rpb25DaGFuZ2VkRXZlbnQocGFyZW50UHJvdmlkZXIsIGV2ZW50LmdldFNlbGVjdGlvbigpKTsKLQkJCSgoUG9zdE11bHRpUGFnZVNlbGVjdGlvblByb3ZpZGVyKSBwYXJlbnRQcm92aWRlcikuZmlyZVBvc3RTZWxlY3Rpb25DaGFuZ2VkKG5ld0V2ZW50KTsKLQkJfQotCX0KLQotCS8qKgotCSAqIFRoZSA8Y29kZT5NdWx0aVBhZ2VFZGl0b3JTaXRlPC9jb2RlPiBpbXBsZW1lbnRhdGlvbiBvZiB0aGlzCi0JICogPGNvZGU+SVdvcmtiZW5jaFBhcnRTaXRlPC9jb2RlPiBtZXRob2QgcmVtZW1iZXJzIHRoZSBzZWxlY3Rpb24KLQkgKiBwcm92aWRlciwgYW5kIGFsc28gaG9va3MgYSBsaXN0ZW5lciBvbiBpdCwgd2hpY2ggY2FsbHMKLQkgKiA8Y29kZT5oYW5kbGVTZWxlY3Rpb25DaGFuZ2VkPC9jb2RlPiB3aGVuIGEgc2VsZWN0aW9uIGNoYW5nZWQgZXZlbnQKLQkgKiBvY2N1cnMgYW5kIDxjb2RlPmhhbmRsZVBvc3RTZWxlY3Rpb25DaGFuZ2VkPC9jb2RlPiB3aGVuIGEgcG9zdAotCSAqIHNlbGVjdGlvbiBjaGFuZ2VkIGV2ZW50IG9jY3Vycy4KLQkgKiAKLQkgKiBAcGFyYW0gcHJvdmlkZXIKLQkgKiAgICAgICAgICAgIFRoZSBzZWxlY3Rpb24gcHJvdmlkZXIuCi0JICogQHNlZSBQb3N0TXVsdGlQYWdlRWRpdG9yU2l0ZSNoYW5kbGVTZWxlY3Rpb25DaGFuZ2VkKFNlbGVjdGlvbkNoYW5nZWRFdmVudCkKLQkgKi8KLQlwdWJsaWMgdm9pZCBzZXRTZWxlY3Rpb25Qcm92aWRlcihJU2VsZWN0aW9uUHJvdmlkZXIgcHJvdmlkZXIpIHsKLQkJSVNlbGVjdGlvblByb3ZpZGVyIG9sZFNlbGVjdGlvblByb3ZpZGVyID0gZ2V0U2VsZWN0aW9uUHJvdmlkZXIoKTsKLQkJaWYgKG9sZFNlbGVjdGlvblByb3ZpZGVyICE9IG51bGwpIHsKLQkJCWlmIChvbGRTZWxlY3Rpb25Qcm92aWRlciBpbnN0YW5jZW9mIElQb3N0U2VsZWN0aW9uUHJvdmlkZXIpIHsKLQkJCQkoKElQb3N0U2VsZWN0aW9uUHJvdmlkZXIpIG9sZFNlbGVjdGlvblByb3ZpZGVyKS5yZW1vdmVQb3N0U2VsZWN0aW9uQ2hhbmdlZExpc3RlbmVyKGdldFBvc3RTZWxlY3Rpb25DaGFuZ2VkTGlzdGVuZXIoKSk7Ci0JCQl9Ci0JCX0KLQotCQlzdXBlci5zZXRTZWxlY3Rpb25Qcm92aWRlcihwcm92aWRlcik7Ci0KLQkJaWYgKHByb3ZpZGVyICE9IG51bGwpIHsKLQkJCWlmIChwcm92aWRlciBpbnN0YW5jZW9mIElQb3N0U2VsZWN0aW9uUHJvdmlkZXIpIHsKLQkJCQkoKElQb3N0U2VsZWN0aW9uUHJvdmlkZXIpIHByb3ZpZGVyKS5hZGRQb3N0U2VsZWN0aW9uQ2hhbmdlZExpc3RlbmVyKGdldFBvc3RTZWxlY3Rpb25DaGFuZ2VkTGlzdGVuZXIoKSk7Ci0JCQl9Ci0JCX0KLQl9Ci0KLX0KZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi51aS9zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi91aS9wcm92aXNpb25hbC9lZGl0b3JzL1Bvc3RNdWx0aVBhZ2VTZWxlY3Rpb25Qcm92aWRlci5qYXZhIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLnVpL3NyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL3VpL3Byb3Zpc2lvbmFsL2VkaXRvcnMvUG9zdE11bHRpUGFnZVNlbGVjdGlvblByb3ZpZGVyLmphdmEKZGVsZXRlZCBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDNhNGY5MDguLjAwMDAwMDAKLS0tIGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLnVpL3NyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL3VpL3Byb3Zpc2lvbmFsL2VkaXRvcnMvUG9zdE11bHRpUGFnZVNlbGVjdGlvblByb3ZpZGVyLmphdmEKKysrIC9kZXYvbnVsbApAQCAtMSw1MiArMCwwIEBACi0vKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKgotICogQ29weXJpZ2h0IChjKSAyMDAwLCAyMDA0IElCTSBDb3Jwb3JhdGlvbiBhbmQgb3RoZXJzLgotICogQWxsIHJpZ2h0cyByZXNlcnZlZC4gVGhpcyBwcm9ncmFtIGFuZCB0aGUgYWNjb21wYW55aW5nIG1hdGVyaWFscwotICogYXJlIG1hZGUgYXZhaWxhYmxlIHVuZGVyIHRoZSB0ZXJtcyBvZiB0aGUgRWNsaXBzZSBQdWJsaWMgTGljZW5zZSB2MS4wCi0gKiB3aGljaCBhY2NvbXBhbmllcyB0aGlzIGRpc3RyaWJ1dGlvbiwgYW5kIGlzIGF2YWlsYWJsZSBhdAotICogaHR0cDovL3d3dy5lY2xpcHNlLm9yZy9sZWdhbC9lcGwtdjEwLmh0bWwKLSAqCi0gKiBDb250cmlidXRvcnM6Ci0gKiAgICAgSUJNIENvcnBvcmF0aW9uIC0gaW5pdGlhbCBBUEkgYW5kIGltcGxlbWVudGF0aW9uCi0gKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKi8KLXBhY2thZ2Ugb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi51aS5wcm92aXNpb25hbC5lZGl0b3JzOwotCi1pbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5ydW50aW1lLlBsYXRmb3JtOwotaW1wb3J0IG9yZy5lY2xpcHNlLmpmYWNlLnV0aWwuTGlzdGVuZXJMaXN0OwotaW1wb3J0IG9yZy5lY2xpcHNlLmpmYWNlLnV0aWwuU2FmZVJ1bm5hYmxlOwotaW1wb3J0IG9yZy5lY2xpcHNlLmpmYWNlLnZpZXdlcnMuSVBvc3RTZWxlY3Rpb25Qcm92aWRlcjsKLWltcG9ydCBvcmcuZWNsaXBzZS5qZmFjZS52aWV3ZXJzLklTZWxlY3Rpb25DaGFuZ2VkTGlzdGVuZXI7Ci1pbXBvcnQgb3JnLmVjbGlwc2UuamZhY2Uudmlld2Vycy5TZWxlY3Rpb25DaGFuZ2VkRXZlbnQ7Ci1pbXBvcnQgb3JnLmVjbGlwc2UudWkucGFydC5NdWx0aVBhZ2VFZGl0b3JQYXJ0OwotaW1wb3J0IG9yZy5lY2xpcHNlLnVpLnBhcnQuTXVsdGlQYWdlU2VsZWN0aW9uUHJvdmlkZXI7Ci0KLS8qKgotICogQGRlcHJlY2F0ZWQgLSBObyBsb25nZXIgbmVjZXNzYXJ5IGFzIG9mIDMuMk0zLgotICovCi1wdWJsaWMgY2xhc3MgUG9zdE11bHRpUGFnZVNlbGVjdGlvblByb3ZpZGVyIGV4dGVuZHMgTXVsdGlQYWdlU2VsZWN0aW9uUHJvdmlkZXIgaW1wbGVtZW50cyBJUG9zdFNlbGVjdGlvblByb3ZpZGVyIHsKLQlwcml2YXRlIExpc3RlbmVyTGlzdCBwb3N0TGlzdGVuZXJzOwotCi0JcHVibGljIFBvc3RNdWx0aVBhZ2VTZWxlY3Rpb25Qcm92aWRlcihNdWx0aVBhZ2VFZGl0b3JQYXJ0IG11bHRpUGFnZUVkaXRvcikgewotCQlzdXBlcihtdWx0aVBhZ2VFZGl0b3IpOwotCQlwb3N0TGlzdGVuZXJzID0gbmV3IExpc3RlbmVyTGlzdCgpOwotCX0KLQotCXB1YmxpYyB2b2lkIGFkZFBvc3RTZWxlY3Rpb25DaGFuZ2VkTGlzdGVuZXIoSVNlbGVjdGlvbkNoYW5nZWRMaXN0ZW5lciBsaXN0ZW5lcikgewotCQlwb3N0TGlzdGVuZXJzLmFkZChsaXN0ZW5lcik7Ci0JfQotCi0JcHVibGljIHZvaWQgZmlyZVBvc3RTZWxlY3Rpb25DaGFuZ2VkKGZpbmFsIFNlbGVjdGlvbkNoYW5nZWRFdmVudCBldmVudCkgewotCQlPYmplY3RbXSBsaXN0ZW5lcnMgPSBwb3N0TGlzdGVuZXJzLmdldExpc3RlbmVycygpOwotCQlmb3IgKGludCBpID0gMDsgaSA8IGxpc3RlbmVycy5sZW5ndGg7ICsraSkgewotCQkJZmluYWwgSVNlbGVjdGlvbkNoYW5nZWRMaXN0ZW5lciBwbCA9IChJU2VsZWN0aW9uQ2hhbmdlZExpc3RlbmVyKSBsaXN0ZW5lcnNbaV07Ci0JCQlQbGF0Zm9ybS5ydW4obmV3IFNhZmVSdW5uYWJsZSgpIHsKLQkJCQlwdWJsaWMgdm9pZCBydW4oKSB7Ci0JCQkJCXBsLnNlbGVjdGlvbkNoYW5nZWQoZXZlbnQpOwotCQkJCX0KLQkJCX0pOwotCQl9Ci0JfQotCi0JcHVibGljIHZvaWQgcmVtb3ZlUG9zdFNlbGVjdGlvbkNoYW5nZWRMaXN0ZW5lcihJU2VsZWN0aW9uQ2hhbmdlZExpc3RlbmVyIGxpc3RlbmVyKSB7Ci0JCXBvc3RMaXN0ZW5lcnMucmVtb3ZlKGxpc3RlbmVyKTsKLQl9Ci19CmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24udWkvc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vdWkvcHJvdmlzaW9uYWwvZWRpdG9ycy9Qb3N0U2VsZWN0aW9uTXVsdGlQYWdlRWRpdG9yUGFydC5qYXZhIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLnVpL3NyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL3VpL3Byb3Zpc2lvbmFsL2VkaXRvcnMvUG9zdFNlbGVjdGlvbk11bHRpUGFnZUVkaXRvclBhcnQuamF2YQpkZWxldGVkIGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggYmNkMmYwNy4uMDAwMDAwMAotLS0gYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24udWkvc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vdWkvcHJvdmlzaW9uYWwvZWRpdG9ycy9Qb3N0U2VsZWN0aW9uTXVsdGlQYWdlRWRpdG9yUGFydC5qYXZhCisrKyAvZGV2L251bGwKQEAgLTEsNDYgKzAsMCBAQAotLyoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioKLSAqIENvcHlyaWdodCAoYykgMjAwMCwgMjAwNSBJQk0gQ29ycG9yYXRpb24gYW5kIG90aGVycy4KLSAqIEFsbCByaWdodHMgcmVzZXJ2ZWQuIFRoaXMgcHJvZ3JhbSBhbmQgdGhlIGFjY29tcGFueWluZyBtYXRlcmlhbHMKLSAqIGFyZSBtYWRlIGF2YWlsYWJsZSB1bmRlciB0aGUgdGVybXMgb2YgdGhlIEVjbGlwc2UgUHVibGljIExpY2Vuc2UgdjEuMAotICogd2hpY2ggYWNjb21wYW5pZXMgdGhpcyBkaXN0cmlidXRpb24sIGFuZCBpcyBhdmFpbGFibGUgYXQKLSAqIGh0dHA6Ly93d3cuZWNsaXBzZS5vcmcvbGVnYWwvZXBsLXYxMC5odG1sCi0gKgotICogQ29udHJpYnV0b3JzOgotICogICAgIElCTSBDb3Jwb3JhdGlvbiAtIGluaXRpYWwgQVBJIGFuZCBpbXBsZW1lbnRhdGlvbgotICoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKiovCi1wYWNrYWdlIG9yZy5lY2xpcHNlLndzdC5jb21tb24udWkucHJvdmlzaW9uYWwuZWRpdG9yczsKLQotaW1wb3J0IG9yZy5lY2xpcHNlLmpmYWNlLnZpZXdlcnMuSVNlbGVjdGlvblByb3ZpZGVyOwotaW1wb3J0IG9yZy5lY2xpcHNlLmpmYWNlLnZpZXdlcnMuU2VsZWN0aW9uQ2hhbmdlZEV2ZW50OwotaW1wb3J0IG9yZy5lY2xpcHNlLnVpLklFZGl0b3JJbnB1dDsKLWltcG9ydCBvcmcuZWNsaXBzZS51aS5JRWRpdG9yUGFydDsKLWltcG9ydCBvcmcuZWNsaXBzZS51aS5JRWRpdG9yU2l0ZTsKLWltcG9ydCBvcmcuZWNsaXBzZS51aS5QYXJ0SW5pdEV4Y2VwdGlvbjsKLWltcG9ydCBvcmcuZWNsaXBzZS51aS5wYXJ0Lk11bHRpUGFnZUVkaXRvclBhcnQ7Ci0KLS8qKgotICogQWRkcyBwb3N0cyBzZWxlY3Rpb24gbm90aWZpY2F0aW9ucyBmcm9tIGNvbnRhaW5lZCBlZGl0b3IgcGFydHMgdG8KLSAqIGxpc3RlbmVycy4gVGhpcyBwYXJ0IHdhcyBjcmVhdGVkIGFzIGEgd29ya2Fyb3VuZCBmb3IKLSAqIGh0dHBzOi8vYnVncy5lY2xpcHNlLm9yZy9idWdzL3Nob3dfYnVnLmNnaT9pZD0xMDgzMjQgYW5kIHdpbGwgYmUgcmVtb3ZlZAotICogb25jZSBXVFAgaXMgYnVpbGRpbmcgb24gYSBwbGF0Zm9ybSBtaWxlc3RvbmUgdGhhdCBpbmNsdWRlcyBhIGZpeC4KLSAqIAotICogQGRlcHJlY2F0ZWQgLSBObyBsb25nZXIgbmVjZXNzYXJ5IGFzIG9mIDMuMk0zLgotICovCi1wdWJsaWMgYWJzdHJhY3QgY2xhc3MgUG9zdFNlbGVjdGlvbk11bHRpUGFnZUVkaXRvclBhcnQgZXh0ZW5kcyBNdWx0aVBhZ2VFZGl0b3JQYXJ0IHsKLQlwdWJsaWMgdm9pZCBpbml0KElFZGl0b3JTaXRlIHNpdGUsIElFZGl0b3JJbnB1dCBpbnB1dCkgdGhyb3dzIFBhcnRJbml0RXhjZXB0aW9uIHsKLQkJc3VwZXIuaW5pdChzaXRlLCBpbnB1dCk7Ci0JCXNpdGUuc2V0U2VsZWN0aW9uUHJvdmlkZXIobmV3IFBvc3RNdWx0aVBhZ2VTZWxlY3Rpb25Qcm92aWRlcih0aGlzKSk7Ci0JfQotCi0JcHJvdGVjdGVkIHZvaWQgcGFnZUNoYW5nZShpbnQgbmV3UGFnZUluZGV4KSB7Ci0JCXN1cGVyLnBhZ2VDaGFuZ2UobmV3UGFnZUluZGV4KTsKLQkJSUVkaXRvclBhcnQgYWN0aXZlRWRpdG9yID0gZ2V0RWRpdG9yKG5ld1BhZ2VJbmRleCk7Ci0JCWlmIChhY3RpdmVFZGl0b3IgIT0gbnVsbCkgewotCQkJSVNlbGVjdGlvblByb3ZpZGVyIHNlbGVjdGlvblByb3ZpZGVyID0gYWN0aXZlRWRpdG9yLmdldFNpdGUoKS5nZXRTZWxlY3Rpb25Qcm92aWRlcigpOwotCQkJaWYgKHNlbGVjdGlvblByb3ZpZGVyICE9IG51bGwpIHsKLQkJCQlTZWxlY3Rpb25DaGFuZ2VkRXZlbnQgZXZlbnQgPSBuZXcgU2VsZWN0aW9uQ2hhbmdlZEV2ZW50KHNlbGVjdGlvblByb3ZpZGVyLCBzZWxlY3Rpb25Qcm92aWRlci5nZXRTZWxlY3Rpb24oKSk7Ci0JCQkJKChQb3N0TXVsdGlQYWdlU2VsZWN0aW9uUHJvdmlkZXIpIGdldFNpdGUoKS5nZXRTZWxlY3Rpb25Qcm92aWRlcigpKS5maXJlUG9zdFNlbGVjdGlvbkNoYW5nZWQoZXZlbnQpOwotCQkJfQotCQl9Ci0JfQotfQpkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLnVyaXJlc29sdmVyL01FVEEtSU5GL01BTklGRVNULk1GIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLnVyaXJlc29sdmVyL01FVEEtSU5GL01BTklGRVNULk1GCmluZGV4IDY2YWY5OTIuLjg4OGNjYTggMTAwNjQ0Ci0tLSBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi51cmlyZXNvbHZlci9NRVRBLUlORi9NQU5JRkVTVC5NRgorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24udXJpcmVzb2x2ZXIvTUVUQS1JTkYvTUFOSUZFU1QuTUYKQEAgLTIsMTUgKzIsMTUgQEAKIEJ1bmRsZS1NYW5pZmVzdFZlcnNpb246IDIKIEJ1bmRsZS1OYW1lOiAlcGx1Z2luTmFtZQogQnVuZGxlLVN5bWJvbGljTmFtZTogb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi51cmlyZXNvbHZlcjsgc2luZ2xldG9uOj10cnVlCi1CdW5kbGUtVmVyc2lvbjogMS4xLjMwMS5xdWFsaWZpZXIKK0J1bmRsZS1WZXJzaW9uOiAxLjEuNDAxLnF1YWxpZmllcgogQnVuZGxlLUFjdGl2YXRvcjogb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi51cmlyZXNvbHZlci5pbnRlcm5hbC5wcm92aXNpb25hbC5VUklSZXNvbHZlclBsdWdpbgogQnVuZGxlLVZlbmRvcjogJXByb3ZpZGVyTmFtZQogQnVuZGxlLUxvY2FsaXphdGlvbjogcGx1Z2luCi1FeHBvcnQtUGFja2FnZTogb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi51cmlyZXNvbHZlci5pbnRlcm5hbCwKLSBvcmcuZWNsaXBzZS53c3QuY29tbW9uLnVyaXJlc29sdmVyLmludGVybmFsLnByb3Zpc2lvbmFsLAotIG9yZy5lY2xpcHNlLndzdC5jb21tb24udXJpcmVzb2x2ZXIuaW50ZXJuYWwudXRpbAorRXhwb3J0LVBhY2thZ2U6IG9yZy5lY2xpcHNlLndzdC5jb21tb24udXJpcmVzb2x2ZXIuaW50ZXJuYWw7eC1pbnRlcm5hbDo9dHJ1ZSwKKyBvcmcuZWNsaXBzZS53c3QuY29tbW9uLnVyaXJlc29sdmVyLmludGVybmFsLnByb3Zpc2lvbmFsO3gtaW50ZXJuYWw6PXRydWUsCisgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi51cmlyZXNvbHZlci5pbnRlcm5hbC51dGlsO3gtaW50ZXJuYWw6PXRydWUKIFJlcXVpcmUtQnVuZGxlOiBvcmcuZWNsaXBzZS5jb3JlLnJ1bnRpbWU7YnVuZGxlLXZlcnNpb249IlszLjQuMCw0LjAuMCkiLAogIG9yZy5lY2xpcHNlLmNvcmUucmVzb3VyY2VzO2J1bmRsZS12ZXJzaW9uPSJbMy40LjAsNC4wLjApIgogRWNsaXBzZS1MYXp5U3RhcnQ6IHRydWUKLUJ1bmRsZS1DbGFzc1BhdGg6IC4KIEJ1bmRsZS1SZXF1aXJlZEV4ZWN1dGlvbkVudmlyb25tZW50OiBKMlNFLTEuNAorQnVuZGxlLUFjdGl2YXRpb25Qb2xpY3k6IGxhenkKZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi51cmlyZXNvbHZlci9wbHVnaW4ucHJvcGVydGllcyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi51cmlyZXNvbHZlci9wbHVnaW4ucHJvcGVydGllcwppbmRleCAzMDc2NjRiLi5mNGU2YzJmIDEwMDY0NAotLS0gYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24udXJpcmVzb2x2ZXIvcGx1Z2luLnByb3BlcnRpZXMKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLnVyaXJlc29sdmVyL3BsdWdpbi5wcm9wZXJ0aWVzCkBAIC0xLDUgKzEsNSBAQAogIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIwotIyBDb3B5cmlnaHQgKGMpIDIwMDUgSUJNIENvcnBvcmF0aW9uIGFuZCBvdGhlcnMuCisjIENvcHlyaWdodCAoYykgMjAwNSwgMjAxMCBJQk0gQ29ycG9yYXRpb24gYW5kIG90aGVycy4KICMgQWxsIHJpZ2h0cyByZXNlcnZlZC4gVGhpcyBwcm9ncmFtIGFuZCB0aGUgYWNjb21wYW55aW5nIG1hdGVyaWFscwogIyBhcmUgbWFkZSBhdmFpbGFibGUgdW5kZXIgdGhlIHRlcm1zIG9mIHRoZSBFY2xpcHNlIFB1YmxpYyBMaWNlbnNlIHYxLjAKICMgd2hpY2ggYWNjb21wYW5pZXMgdGhpcyBkaXN0cmlidXRpb24sIGFuZCBpcyBhdmFpbGFibGUgYXQKQEAgLTgsNyArOCw3IEBACiAjIENvbnRyaWJ1dG9yczoKICMgICAgIElCTSBDb3Jwb3JhdGlvbiAtIGluaXRpYWwgQVBJIGFuZCBpbXBsZW1lbnRhdGlvbgogIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIwotcHJvdmlkZXJOYW1lPUVjbGlwc2Uub3JnCitwcm92aWRlck5hbWU9RWNsaXBzZSBXZWIgVG9vbHMgUGxhdGZvcm0KIHBsdWdpbk5hbWU9Q29tbW9uIFVSSSBSZXNvbHZlciBGcmFtZXdvcmsKICMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMKIApkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLnVyaXJlc29sdmVyL3NyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL3VyaXJlc29sdmVyL2ludGVybmFsL1VSSVJlc29sdmVyRXh0ZW5zaW9uUmVnaXN0cnkuamF2YSBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi51cmlyZXNvbHZlci9zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi91cmlyZXNvbHZlci9pbnRlcm5hbC9VUklSZXNvbHZlckV4dGVuc2lvblJlZ2lzdHJ5LmphdmEKaW5kZXggMTQwMzA3MS4uZTVjMjJlOCAxMDA2NDQKLS0tIGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLnVyaXJlc29sdmVyL3NyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL3VyaXJlc29sdmVyL2ludGVybmFsL1VSSVJlc29sdmVyRXh0ZW5zaW9uUmVnaXN0cnkuamF2YQorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24udXJpcmVzb2x2ZXIvc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vdXJpcmVzb2x2ZXIvaW50ZXJuYWwvVVJJUmVzb2x2ZXJFeHRlbnNpb25SZWdpc3RyeS5qYXZhCkBAIC0yNiw2ICsyNiw4IEBACiBwdWJsaWMgY2xhc3MgVVJJUmVzb2x2ZXJFeHRlbnNpb25SZWdpc3RyeQogewogCXByb3RlY3RlZCBIYXNoTWFwIG1hcCA9IG5ldyBIYXNoTWFwKCk7CisJCisJcHJvdGVjdGVkIExpc3QgcmVzb2x2ZXJMaXN0ID0gbmV3IEFycmF5TGlzdCgpOwogCiAJcHVibGljIHN0YXRpYyBmaW5hbCBpbnQgU1RBR0VfUFJFTk9STUFMSVpBVElPTiA9IDE7CiAKQEAgLTg0LDYgKzg2LDggQEAKIAkJVVJJUmVzb2x2ZXJFeHRlbnNpb25EZXNjcmlwdG9yIGluZm8gPSBuZXcgVVJJUmVzb2x2ZXJFeHRlbnNpb25EZXNjcmlwdG9yKAogCQkJCWNsYXNzTmFtZSwgcGx1Z2luSWQsIHByb2plY3ROYXR1cmVJZHMsIHJlc291cmNlVHlwZSwgc3RhZ2UsIHByaW9yaXR5KTsKIAorCQlyZXNvbHZlckxpc3QuYWRkKGluZm8pOworCQkKIAkJSXRlcmF0b3IgaWRzSXRlciA9IHByb2plY3ROYXR1cmVJZHMuaXRlcmF0b3IoKTsKIAkJd2hpbGUgKGlkc0l0ZXIuaGFzTmV4dCgpKQogCQl7CkBAIC0xMTIsMjkgKzExNiwzMyBAQAogCSAqLwogCXB1YmxpYyBMaXN0IGdldEV4dGVuc2lvbkRlc2NyaXB0b3JzKElQcm9qZWN0IHByb2plY3QpCiAJewotCSAgTGlzdCByZXN1bHQgPSBuZXcgQXJyYXlMaXN0KCk7Ci0JICBMaXN0IGxvd1ByaW9yaXR5TGlzdCA9IG5ldyBBcnJheUxpc3QoKTsKLQkgIExpc3QgbWVkaXVtUHJpb3JpdHlMaXN0ID0gbmV3IEFycmF5TGlzdCgpOwotCSAgTGlzdCBoaWdoUHJpb3JpdHlMaXN0ID0gbmV3IEFycmF5TGlzdCgpOyAgICAgICAgICAKLQkgIGZvciAoSXRlcmF0b3IgaSA9IG1hcC5rZXlTZXQoKS5pdGVyYXRvcigpOyBpLmhhc05leHQoKTspCi0JICB7Ci0JICAgIFN0cmluZyBrZXkgPSAoU3RyaW5nKSBpLm5leHQoKTsKLQkgICAgdHJ5Ci0JICAgIHsKLQkgICAgICBpZiAoa2V5ID09IE5VTExfUFJPSkVDVF9OQVRVUkVfSUQgfHwgcHJvamVjdCA9PSBudWxsIHx8IHByb2plY3QuaGFzTmF0dXJlKGtleSkpCi0JICAgICAgewotCSAgICAgICAgaGlnaFByaW9yaXR5TGlzdC5hZGRBbGwoKExpc3QpICgoSGFzaE1hcCkgbWFwLmdldChrZXkpKS5nZXQoUFJJT1JJVFlfSElHSCkpOwotCSAgICAgICAgbWVkaXVtUHJpb3JpdHlMaXN0LmFkZEFsbCgoTGlzdCkgKChIYXNoTWFwKSBtYXAuZ2V0KGtleSkpLmdldChQUklPUklUWV9NRURJVU0pKTsKLQkgICAgICAgIGxvd1ByaW9yaXR5TGlzdC5hZGRBbGwoKExpc3QpICgoSGFzaE1hcCkgbWFwLmdldChrZXkpKS5nZXQoUFJJT1JJVFlfTE9XKSk7Ci0JICAgICAgfQotCSAgICB9IGNhdGNoIChDb3JlRXhjZXB0aW9uIGUpCi0JICAgIHsKLQkgICAgfQorCSAgaWYocHJvamVjdCAhPSBudWxsKSB7CisJCSAgTGlzdCByZXN1bHQgPSBuZXcgQXJyYXlMaXN0KCk7CisJCSAgTGlzdCBsb3dQcmlvcml0eUxpc3QgPSBuZXcgQXJyYXlMaXN0KCk7CisJCSAgTGlzdCBtZWRpdW1Qcmlvcml0eUxpc3QgPSBuZXcgQXJyYXlMaXN0KCk7CisJCSAgTGlzdCBoaWdoUHJpb3JpdHlMaXN0ID0gbmV3IEFycmF5TGlzdCgpOyAgICAgICAgICAKKwkJICBmb3IgKEl0ZXJhdG9yIGkgPSBtYXAua2V5U2V0KCkuaXRlcmF0b3IoKTsgaS5oYXNOZXh0KCk7KQorCQkgIHsKKwkJICAgIFN0cmluZyBrZXkgPSAoU3RyaW5nKSBpLm5leHQoKTsKKwkJICAgIHRyeQorCQkgICAgeworCQkgICAgICBpZiAoa2V5ID09IE5VTExfUFJPSkVDVF9OQVRVUkVfSUQgfHwgcHJvamVjdC5oYXNOYXR1cmUoa2V5KSkKKwkJICAgICAgeworCQkgICAgICAgIGhpZ2hQcmlvcml0eUxpc3QuYWRkQWxsKChMaXN0KSAoKEhhc2hNYXApIG1hcC5nZXQoa2V5KSkuZ2V0KFBSSU9SSVRZX0hJR0gpKTsKKwkJICAgICAgICBtZWRpdW1Qcmlvcml0eUxpc3QuYWRkQWxsKChMaXN0KSAoKEhhc2hNYXApIG1hcC5nZXQoa2V5KSkuZ2V0KFBSSU9SSVRZX01FRElVTSkpOworCQkgICAgICAgIGxvd1ByaW9yaXR5TGlzdC5hZGRBbGwoKExpc3QpICgoSGFzaE1hcCkgbWFwLmdldChrZXkpKS5nZXQoUFJJT1JJVFlfTE9XKSk7CisJCSAgICAgIH0KKwkJICAgIH0gY2F0Y2ggKENvcmVFeGNlcHRpb24gZSkKKwkJICAgIHsKKwkJICAgIH0KKwkJICB9CisJCSAgcmVzdWx0LmFkZEFsbChoaWdoUHJpb3JpdHlMaXN0KTsKKwkJICByZXN1bHQuYWRkQWxsKG1lZGl1bVByaW9yaXR5TGlzdCk7CisJCSAgcmVzdWx0LmFkZEFsbChsb3dQcmlvcml0eUxpc3QpOworCQkgIHJldHVybiByZXN1bHQ7CisJICB9IGVsc2UgeworCQkgIHJldHVybiByZXNvbHZlckxpc3Q7CiAJICB9Ci0JICByZXN1bHQuYWRkQWxsKGhpZ2hQcmlvcml0eUxpc3QpOwotCSAgcmVzdWx0LmFkZEFsbChtZWRpdW1Qcmlvcml0eUxpc3QpOwotCSAgcmVzdWx0LmFkZEFsbChsb3dQcmlvcml0eUxpc3QpOwotCSAgcmV0dXJuIHJlc3VsdDsKIAl9CiAKIAkvKioKZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi51cmlyZXNvbHZlci9zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi91cmlyZXNvbHZlci9pbnRlcm5hbC9VUklSZXNvbHZlckV4dGVuc2lvblJlZ2lzdHJ5UmVhZGVyLmphdmEgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24udXJpcmVzb2x2ZXIvc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vdXJpcmVzb2x2ZXIvaW50ZXJuYWwvVVJJUmVzb2x2ZXJFeHRlbnNpb25SZWdpc3RyeVJlYWRlci5qYXZhCmluZGV4IGExNzNmMjguLjhmMTAyMmUgMTAwNjQ0Ci0tLSBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi51cmlyZXNvbHZlci9zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi91cmlyZXNvbHZlci9pbnRlcm5hbC9VUklSZXNvbHZlckV4dGVuc2lvblJlZ2lzdHJ5UmVhZGVyLmphdmEKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLnVyaXJlc29sdmVyL3NyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL3VyaXJlc29sdmVyL2ludGVybmFsL1VSSVJlc29sdmVyRXh0ZW5zaW9uUmVnaXN0cnlSZWFkZXIuamF2YQpAQCAtMTcsOCArMTcsMTEgQEAKIGltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJ1bnRpbWUuSUNvbmZpZ3VyYXRpb25FbGVtZW50OwogaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucnVudGltZS5JRXh0ZW5zaW9uUG9pbnQ7CiBpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5ydW50aW1lLklFeHRlbnNpb25SZWdpc3RyeTsKK2ltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJ1bnRpbWUuSVN0YXR1czsKIGltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJ1bnRpbWUuUGxhdGZvcm07CitpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5ydW50aW1lLlN0YXR1czsKIGltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLnVyaXJlc29sdmVyLmludGVybmFsLnByb3Zpc2lvbmFsLlVSSVJlc29sdmVyUGx1Z2luOworaW1wb3J0IG9yZy5vc2dpLmZyYW1ld29yay5CdW5kbGU7CiAKIC8qKgogICogVGhpcyBjbGFzcyByZWFkcyB0aGUgVVJJIHJlc29sdmVyIGV4dGVuc2lvbiBwb2ludCBhbmQgcmVnaXN0ZXJzIGV4dGVuc2lvbgpAQCAtOTIsNiArOTUsMTAgQEAKIAkJCS8vIFN0cmluZyBwcm9qZWN0TmF0dXJlSWQgPSBlbGVtZW50LmdldEF0dHJpYnV0ZShBVFRfUFJPSkVDVF9OQVRVUkVfSUQpOwogCQkJU3RyaW5nIHJlc291cmNlVHlwZSA9IGVsZW1lbnQuZ2V0QXR0cmlidXRlKEFUVF9SRVNPVVJDRV9UWVBFKTsKIAkJCVN0cmluZyBzdGFnZSA9IGVsZW1lbnQuZ2V0QXR0cmlidXRlKEFUVF9TVEFHRSk7CisJCQlpZiAoc3RhZ2UgPT0gbnVsbCB8fCBzdGFnZS5lcXVhbHMoIiIpKQorCQkJeworCQkJICAgIHN0YWdlID0gVkFMX1NUQUdFX1BPU1Q7CisJCQl9CiAJCQlTdHJpbmcgcHJpb3JpdHkgPSBlbGVtZW50LmdldEF0dHJpYnV0ZShBVFRfUFJJT1JJVFkpOwogCQkJaWYgKHByaW9yaXR5ID09IG51bGwgfHwgcHJpb3JpdHkuZXF1YWxzKCIiKSkKIAkJCXsKQEAgLTEyNyw4ICsxMzQsOSBAQAogCQkJCQkJCXN0YWdlaW50LCBwcmlvcml0eSk7CiAJCQkJfSBjYXRjaCAoRXhjZXB0aW9uIGUpCiAJCQkJewotCQkJCQkvLyBUT0RPOiBMb2cgZXhjZXB0aW9uIGFzIHRoaXMgd2lsbCBjYXVzZSBhbiBleHRlbnNpb24gcmVzb2x2ZXIKLQkJCQkJLy8gICAgICAgZnJvbSBsb2FkaW5nLgorCQkJCQlCdW5kbGUgYnVuZGxlID0gVVJJUmVzb2x2ZXJQbHVnaW4uZ2V0SW5zdGFuY2UoKS5nZXRCdW5kbGUoKTsKKwkJCQkJSVN0YXR1cyBzdGF0dXMgPSBuZXcgU3RhdHVzKElTdGF0dXMuRVJST1IsIGJ1bmRsZS5nZXRTeW1ib2xpY05hbWUoKSwgZS5nZXRNZXNzYWdlKCksIGUpOworCQkJCQlQbGF0Zm9ybS5nZXRMb2coYnVuZGxlKS5sb2coIHN0YXR1cyk7CiAJCQkJfQogCQkJfQogCQl9CmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5pbnRlcm5ldC5jYWNoZS9NRVRBLUlORi9NQU5JRkVTVC5NRiBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmludGVybmV0LmNhY2hlL01FVEEtSU5GL01BTklGRVNULk1GCmluZGV4IGMzMTVjZGUuLjUzZmI0NjggMTAwNjQ0Ci0tLSBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmludGVybmV0LmNhY2hlL01FVEEtSU5GL01BTklGRVNULk1GCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmludGVybmV0LmNhY2hlL01FVEEtSU5GL01BTklGRVNULk1GCkBAIC0yLDcgKzIsNyBAQAogQnVuZGxlLU1hbmlmZXN0VmVyc2lvbjogMgogQnVuZGxlLU5hbWU6ICVfUExVR0lOX05BTUUKIEJ1bmRsZS1TeW1ib2xpY05hbWU6IG9yZy5lY2xpcHNlLndzdC5pbnRlcm5ldC5jYWNoZTsgc2luZ2xldG9uOj10cnVlCi1CdW5kbGUtVmVyc2lvbjogMS4wLjMwMS5xdWFsaWZpZXIKK0J1bmRsZS1WZXJzaW9uOiAxLjAuNDAwLnF1YWxpZmllcgogQnVuZGxlLUFjdGl2YXRvcjogb3JnLmVjbGlwc2Uud3N0LmludGVybmV0LmNhY2hlLmludGVybmFsLkNhY2hlUGx1Z2luCiBCdW5kbGUtVmVuZG9yOiAlX1BMVUdJTl9QUk9WSURFUgogQnVuZGxlLUxvY2FsaXphdGlvbjogcGx1Z2luCmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5pbnRlcm5ldC5jYWNoZS9idWlsZC5wcm9wZXJ0aWVzIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuaW50ZXJuZXQuY2FjaGUvYnVpbGQucHJvcGVydGllcwppbmRleCBkYmQ0ZjYwLi5kZDQ0M2Q0IDEwMDY0NAotLS0gYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5pbnRlcm5ldC5jYWNoZS9idWlsZC5wcm9wZXJ0aWVzCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmludGVybmV0LmNhY2hlL2J1aWxkLnByb3BlcnRpZXMKQEAgLTQsNyArNCw1IEBACiAgICAgICAgICAgICAgICAuLFwKICAgICAgICAgICAgICAgIHBsdWdpbi5wcm9wZXJ0aWVzLFwKICAgICAgICAgICAgICAgIGFib3V0Lmh0bWwKLXNyYy5pbmNsdWRlcyA9IGV4c2QvLFwKLSAgICAgICAgICAgICAgIC4sXAotICAgICAgICAgICAgICAgYnVpbGQucHJvcGVydGllcworc3JjLmluY2x1ZGVzID0gZXhzZC8KIG91dHB1dC4uID0gYmluLwpkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuaW50ZXJuZXQuY2FjaGUvcGx1Z2luLnByb3BlcnRpZXMgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5pbnRlcm5ldC5jYWNoZS9wbHVnaW4ucHJvcGVydGllcwppbmRleCA1ZGY3MmI5Li4xMzUzZGYyIDEwMDY0NAotLS0gYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5pbnRlcm5ldC5jYWNoZS9wbHVnaW4ucHJvcGVydGllcworKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5pbnRlcm5ldC5jYWNoZS9wbHVnaW4ucHJvcGVydGllcwpAQCAtMSw1ICsxLDUgQEAKICMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMKLSMgQ29weXJpZ2h0IChjKSAyMDA1IElCTSBDb3Jwb3JhdGlvbiBhbmQgb3RoZXJzLgorIyBDb3B5cmlnaHQgKGMpIDIwMDUsIDIwMTAgSUJNIENvcnBvcmF0aW9uIGFuZCBvdGhlcnMuCiAjIEFsbCByaWdodHMgcmVzZXJ2ZWQuIFRoaXMgcHJvZ3JhbSBhbmQgdGhlIGFjY29tcGFueWluZyBtYXRlcmlhbHMKICMgYXJlIG1hZGUgYXZhaWxhYmxlIHVuZGVyIHRoZSB0ZXJtcyBvZiB0aGUgRWNsaXBzZSBQdWJsaWMgTGljZW5zZSB2MS4wCiAjIHdoaWNoIGFjY29tcGFuaWVzIHRoaXMgZGlzdHJpYnV0aW9uLCBhbmQgaXMgYXZhaWxhYmxlIGF0CkBAIC05LDcgKzksNyBAQAogIyAgICAgSUJNIENvcnBvcmF0aW9uIC0gaW5pdGlhbCBBUEkgYW5kIGltcGxlbWVudGF0aW9uCiAjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjCiAKLV9QTFVHSU5fUFJPVklERVIgICAgICAgICAgICAgICAgICAgICAgID0gRWNsaXBzZS5vcmcKK19QTFVHSU5fUFJPVklERVIgICAgICAgICAgICAgICAgICAgICAgID0gRWNsaXBzZSBXZWIgVG9vbHMgUGxhdGZvcm0KIF9QTFVHSU5fTkFNRSAgICAgICAgICAgICAgICAgICAgICAgICAgID0gQ2FjaGUgVVJJIFJlc29sdmVyIFBsdWctaW4KIAogY2FjaGVSZXNvdXJjZSAgICAgICAgICAgICAgICAgICAgICAgICAgPSBDYWNoZSBSZXNvdXJjZQpkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi51aS9NRVRBLUlORi9NQU5JRkVTVC5NRiBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24udWkvTUVUQS1JTkYvTUFOSUZFU1QuTUYKaW5kZXggMTNiMzhmZC4uZjI1NzczYyAxMDA2NDQKLS0tIGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi51aS9NRVRBLUlORi9NQU5JRkVTVC5NRgorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLnVpL01FVEEtSU5GL01BTklGRVNULk1GCkBAIC0yLDcgKzIsNyBAQAogQnVuZGxlLU1hbmlmZXN0VmVyc2lvbjogMgogQnVuZGxlLU5hbWU6ICVCdW5kbGUtTmFtZS4wCiBCdW5kbGUtU3ltYm9saWNOYW1lOiBvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi51aTsgc2luZ2xldG9uOj10cnVlCi1CdW5kbGUtVmVyc2lvbjogMS4yLjAucXVhbGlmaWVyCitCdW5kbGUtVmVyc2lvbjogMS4yLjIwNC5xdWFsaWZpZXIKIEJ1bmRsZS1BY3RpdmF0b3I6IG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLmludGVybmFsLnVpLnBsdWdpbi5WYWxpZGF0aW9uVUlQbHVnaW4KIEJ1bmRsZS1WZW5kb3I6ICVCdW5kbGUtVmVuZG9yLjAKIEJ1bmRsZS1Mb2NhbGl6YXRpb246IHBsdWdpbgpkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi51aS9wbHVnaW4ucHJvcGVydGllcyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24udWkvcGx1Z2luLnByb3BlcnRpZXMKaW5kZXggYjhkMTJmMi4uODg3ZGZjMCAxMDA2NDQKLS0tIGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi51aS9wbHVnaW4ucHJvcGVydGllcworKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLnVpL3BsdWdpbi5wcm9wZXJ0aWVzCkBAIC0xLDUgKzEsNSBAQAogIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIwotIyBDb3B5cmlnaHQgKGMpIDIwMDEsIDIwMDcgSUJNIENvcnBvcmF0aW9uIGFuZCBvdGhlcnMuCisjIENvcHlyaWdodCAoYykgMjAwMSwgMjAwOSBJQk0gQ29ycG9yYXRpb24gYW5kIG90aGVycy4KICMgQWxsIHJpZ2h0cyByZXNlcnZlZC4gVGhpcyBwcm9ncmFtIGFuZCB0aGUgYWNjb21wYW55aW5nIG1hdGVyaWFscwogIyBhcmUgbWFkZSBhdmFpbGFibGUgdW5kZXIgdGhlIHRlcm1zIG9mIHRoZSBFY2xpcHNlIFB1YmxpYyBMaWNlbnNlIHYxLjAKICMgd2hpY2ggYWNjb21wYW5pZXMgdGhpcyBkaXN0cmlidXRpb24sIGFuZCBpcyBhdmFpbGFibGUgYXQKQEAgLTEyLDggKzEyLDggQEAKICMgVmVyc2lvbiAxLjMKICMKIFZCRl9USVRMRV9QUk9QRVJUSUVTPVZhbGlkYXRpb24KLVZCRl9VSV9QT1BVUF9SVU5WQUxJREFUSU9OPVZhbGlkYXRlCitWQkZfVUlfUE9QVVBfUlVOVkFMSURBVElPTj0mVmFsaWRhdGUKIFZCRl9USVRMRV9QUkVGRVJFTkNFPVZhbGlkYXRpb24KIAogQnVuZGxlLU5hbWUuMCA9IFZhbGlkYXRpb24gRnJhbWV3b3JrIFVJCi1CdW5kbGUtVmVuZG9yLjAgPSBFY2xpcHNlLm9yZworQnVuZGxlLVZlbmRvci4wID0gRWNsaXBzZSBXZWIgVG9vbHMgUGxhdGZvcm0KZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24udWkvcHJvcGVydHlfZmlsZXMvb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vdWkvaW50ZXJuYWwvbWVzc2FnZXMucHJvcGVydGllcyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24udWkvcHJvcGVydHlfZmlsZXMvb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vdWkvaW50ZXJuYWwvbWVzc2FnZXMucHJvcGVydGllcwppbmRleCBhZjhlODIzLi5iMDhiYjQzIDEwMDY0NAotLS0gYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLnVpL3Byb3BlcnR5X2ZpbGVzL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL3VpL2ludGVybmFsL21lc3NhZ2VzLnByb3BlcnRpZXMKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi51aS9wcm9wZXJ0eV9maWxlcy9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi91aS9pbnRlcm5hbC9tZXNzYWdlcy5wcm9wZXJ0aWVzCkBAIC0xLDUgKzEsNSBAQAogIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIwotIyBDb3B5cmlnaHQgKGMpIDIwMDEsIDIwMDggSUJNIENvcnBvcmF0aW9uIGFuZCBvdGhlcnMuCisjIENvcHlyaWdodCAoYykgMjAwMSwgMjAwOSBJQk0gQ29ycG9yYXRpb24gYW5kIG90aGVycy4KICMgQWxsIHJpZ2h0cyByZXNlcnZlZC4gVGhpcyBwcm9ncmFtIGFuZCB0aGUgYWNjb21wYW55aW5nIG1hdGVyaWFscwogIyBhcmUgbWFkZSBhdmFpbGFibGUgdW5kZXIgdGhlIHRlcm1zIG9mIHRoZSBFY2xpcHNlIFB1YmxpYyBMaWNlbnNlIHYxLjAKICMgd2hpY2ggYWNjb21wYW5pZXMgdGhpcyBkaXN0cmlidXRpb24sIGFuZCBpcyBhdmFpbGFibGUgYXQKQEAgLTU2LDEwICs1NiwxMCBAQAogIyAgICBWQkZfRVhDPUV4Y2VwdGlvbiBvciBlcnJvciB0ZXh0CiAjICAgIFZCRl9VST1VSSBsYWJlbAogIwotUFJFRl9CVVRUT05fT1ZFUlJJREU9QWxsb3cgcHJvamVjdHMgdG8gb3ZlcnJpZGUgdGhlc2UgcHJlZmVyZW5jZSBzZXR0aW5ncwotUFJFRl9CVVRUT05fRU5BQkxFQUxMPUVuYWJsZSBBbGwKLVBSRUZfQlVUVE9OX0RJU0FCTEVBTEw9RGlzYWJsZSBBbGwKLVBSRUZfVkFMTElTVF9USVRMRT1UaGUgc2VsZWN0ZWQgdmFsaWRhdG9ycyB3aWxsIHJ1biB3aGVuIHZhbGlkYXRpb24gaXMgcGVyZm9ybWVkOgorUFJFRl9CVVRUT05fT1ZFUlJJREU9QWxsb3cgcHJvamVjdHMgdG8gJm92ZXJyaWRlIHRoZXNlIHByZWZlcmVuY2Ugc2V0dGluZ3MKK1BSRUZfQlVUVE9OX0VOQUJMRUFMTD1FJm5hYmxlIEFsbAorUFJFRl9CVVRUT05fRElTQUJMRUFMTD1EJmlzYWJsZSBBbGwKK1BSRUZfVkFMTElTVF9USVRMRT1UaGUgc2VsZWN0ZWQgJnZhbGlkYXRvcnMgd2lsbCBydW4gd2hlbiB2YWxpZGF0aW9uIGlzIHBlcmZvcm1lZDoKIFBSRUZfTU5VX01BTlVBTD0mTWFudWFsCiBQUkVGX01OVV9CVUlMRD0mQnVpbGQKIFBSRUZfTU5VX1NFVFRJTkdTPSZTZXR0aW5ncy4uLgpAQCAtNzIsMTEgKzcyLDExIEBACiAgCiBWQkZfVUlfTk9fVkFMSURBVE9SU19JTlNUQUxMRUQ9Tm8gdmFsaWRhdG9ycyBhcmUgaW5zdGFsbGVkLgogCi1ESVNBQkxFX1ZBTElEQVRJT049U3VzcGVuZCBhbGwgdmFsaWRhdG9ycworRElTQUJMRV9WQUxJREFUSU9OPVMmdXNwZW5kIGFsbCB2YWxpZGF0b3JzCiAKIERlbGVnYXRlc0RpYWxvZ1RpdGxlPVZhbGlkYXRvciBQcmVmZXJlbmNlcwotRGVsZWdhdGVzQ29tYm9MYWJlbD1JbXBsZW1lbnRhdGlvbjoKLUFERF9WQUxJREFUSU9OX0JVSUxERVI9QWRkIFZhbGlkYXRpb24gQnVpbGRlciB0byBwcm9qZWN0CitEZWxlZ2F0ZXNDb21ib0xhYmVsPUltJnBsZW1lbnRhdGlvbjoKK0FERF9WQUxJREFUSU9OX0JVSUxERVI9QWRkIFZhbGlkYXRpb24gJkJ1aWxkZXIgdG8gcHJvamVjdAogQ29uZmlnV3NTZXR0aW5ncz1Db25maWd1cmUgV29ya3NwYWNlIFNldHRpbmdzLi4uCiBWQUxJREFUT1I9VmFsaWRhdG9yCiBNQU5VQUw9TWFudWFsCkBAIC04OSw3ICs4OSw3IEBACiBTYXZlRmlsZXNEaWFsb2dfbXVzdF9zYXZlPUFsbCBtb2RpZmllZCByZXNvdXJjZXMgbXVzdCBiZSBzYXZlZCBiZWZvcmUgdGhpcyBvcGVyYXRpb24uCiAKIFByZWZQYWdlX2Fsd2F5c19zYXZlPSZTYXZlIGFsbCBtb2RpZmllZCByZXNvdXJjZXMgYXV0b21hdGljYWxseSBwcmlvciB0byB2YWxpZGF0aW5nCi1QcmVmUGFnZUNvbmZpcm1EaWFsb2c9U2hvdyBhIGNvbmZpcm1hdGlvbiBkaWFsb2cgd2hlbiBwZXJmb3JtaW5nIG1hbnVhbCB2YWxpZGF0aW9ucworUHJlZlBhZ2VDb25maXJtRGlhbG9nPVNob3cgYSAmY29uZmlybWF0aW9uIGRpYWxvZyB3aGVuIHBlcmZvcm1pbmcgbWFudWFsIHZhbGlkYXRpb25zCiAKIFJ1blZhbGlkYXRpb25EaWFsb2dUaXRsZT1SdW5uaW5nIFZhbGlkYXRpb24KIApAQCAtOTgsMTggKzk4LDE4IEBACiBFcnJDb25maWc9RXh0ZW5zaW9uIGNvbmZpZ3VyYXRpb24gZXJyb3IuIEFuIGludGVybmFsIGVycm9yIGhhcyBoYXBwZW5lZCwgdGhlIHZhbGlkYXRvciB7MH0gaGFzIGluY29ycmVjdGx5IGNvbmZpZ3VyZWQgdGhlIHZhbGlkYXRpb24gZXh0ZW5zaW9uIHBvaW50LgogCiBGaWx0ZXJIZWxwPUZpbHRlciBydWxlcyBhcmUgZ3JvdXBlZCBpbnRvIGdyb3Vwcy4gSW5zaWRlIG9mIGFueSBvbmUgZ3JvdXAgdGhlIHJ1bGVzIGFyZSBjb21iaW5lZCBieSB1c2luZyB0aGUgbG9naWNhbCBPUiBvcGVyYXRvci4gVGhlcmUgYXJlIHR3byB0eXBlcyBvZiBncm91cHMgSW5jbHVkZSBhbmQgRXhjbHVkZS4gSWYgYW55IG9mIHRoZSBydWxlcyBpbiB0aGUgRXhjbHVkZSBncm91cCBtYXRjaCwgdGhlIHJlc291cmNlIGlzIG5vdCB2YWxpZGF0ZWQuIElmIHRoZXJlIGFyZSBJbmNsdWRlIGdyb3VwcywgYXQgbGVhc3Qgb25lIHJ1bGUgZnJvbSBlYWNoIGdyb3VwIG11c3QgbWF0Y2ggYmVmb3JlIHRoZSByZXNvdXJjZSBpcyB2YWxpZGF0ZWQuCi1CdXR0b25BZGRHcm91cEluY2x1ZGU9QWRkIEluY2x1ZGUgR3JvdXAuLi4KLUJ1dHRvbkFkZEdyb3VwRXhjbHVkZT1BZGQgRXhjbHVkZSBHcm91cC4uLgotQnV0dG9uQWRkUnVsZT1BZGQgUnVsZS4uLgotQnV0dG9uUmVtb3ZlPVJlbW92ZSAKK0J1dHRvbkFkZEdyb3VwSW5jbHVkZT1BZGQgJkluY2x1ZGUgR3JvdXAuLi4KK0J1dHRvbkFkZEdyb3VwRXhjbHVkZT1BZGQgJkV4Y2x1ZGUgR3JvdXAuLi4KK0J1dHRvbkFkZFJ1bGU9QWRkIFImdWxlLi4uCitCdXR0b25SZW1vdmU9JlJlbW92ZSAKIAotTGFiZWxFbmFibGVQcm9qZWN0U3BlY2lmaWM9RW5hYmxlIHByb2plY3Qgc3BlY2lmaWMgc2V0dGluZ3MKK0xhYmVsRW5hYmxlUHJvamVjdFNwZWNpZmljPUVuYWJsZSBwciZvamVjdCBzcGVjaWZpYyBzZXR0aW5ncwogCi1MYWJlbEV4dGVuc2lvbj1GaWxlIGV4dGVuc2lvbgotTGFiZWxGaWxlPUZvbGRlciBvciBmaWxlIG5hbWUKLUxhYmVsUHJvamVjdHM9UHJvamVjdCBuYXR1cmUKLUxhYmVsRmFjZXRzPUZhY2V0Ci1MYWJlbENvbnRlbnRUeXBlPUNvbnRlbnQgVHlwZQorTGFiZWxFeHRlbnNpb249RmlsZSAmZXh0ZW5zaW9uCitMYWJlbEZpbGU9RiZvbGRlciBvciBmaWxlIG5hbWUKK0xhYmVsUHJvamVjdHM9UHJvamVjdCAmbmF0dXJlCitMYWJlbEZhY2V0cz0mRmFjZXQKK0xhYmVsQ29udGVudFR5cGU9JkNvbnRlbnQgVHlwZQogCiAjIE5vdGUgdG8gdHJhbnNsYXRvcnMsIGtlZXAgdGhlIDxBPiBhbmQgPC9BPiB0YWdzIGV4YWN0bHkgYXMgdGhleSBhcmUKIERvTm90U2hvd1Jlc3VsdHM9RG8gbm90IHNob3cgdGhpcyBkaWFsb2cgaW4gdGhlIGZ1dHVyZS4KQEAgLTEyMiw3ICsxMjIsNyBAQAogCiBFcnJvcnNXYXJuaW5ncz1FcnJvcnMvV2FybmluZ3MKIAotVmFsaWRhdGlvbj1WYWxpZGF0aW9uCitWYWxpZGF0aW9uPVZhbGlkYXRpbmcKIFZhbGlkYXRpb25TdGF0dXM9VmFsaWRhdGlvbiBTdGF0dXMKIAogRXJyU3VtbWFyeT1WYWxpZGF0aW9uIHJlc3VsdHMuIEVycm9ycz17MH0sIFdhcm5pbmdzPXsxfSwgSW5mb3JtYXRpb249ezJ9CkBAIC0xMzEsMjIgKzEzMSwyMiBAQAogRnJXaXphcmQ9TmV3IEZpbHRlciBSdWxlIFdpemFyZAogRnJTZWxlY3RGaWx0ZXJUeXBlPVNlbGVjdCBGaWx0ZXIgVHlwZQogRnJGaWxlRXh0ZW5zaW9uPUZpbGUgRXh0ZW5zaW9uCi1GckZpbGVFeHRlbnNpb25MYWJlbD1GaWxlIGV4dGVuc2lvbiwgZm9yIGV4YW1wbGUgaHRtbDoKLUZyQ2FzZVNlbnNpdGl2ZT1JcyB0aGUgY29tcGFyaXNvbiBjYXNlIHNlbnNpdGl2ZT8KLUZyRXhhY3RNYXRjaD1DaGVjayB0aGlzIGlmIHRoZSBjb250ZW50IHR5cGUgbmVlZHMgdG8gbWF0Y2ggZXhhY3RseS4gRG8gbm90IGNoZWNrIGl0LCBpZiBzdWIgdHlwZXMgbmVlZCB0byBtYXRjaCBhcyB3ZWxsLgotRnJTaW1wbGVGaWxlTmFtZT1Gb3IgZmlsZSBiYXNlZCBjb21wYXJpc29ucywgdXNlIG9ubHkgdGhlIHNpbXBsZSBmaWxlIG5hbWUuCitGckZpbGVFeHRlbnNpb25MYWJlbD1GaWxlICZleHRlbnNpb24sIGZvciBleGFtcGxlIGh0bWw6CitGckNhc2VTZW5zaXRpdmU9SXMgdGhlIGNvbXBhcmlzb24gY2FzZSAmc2Vuc2l0aXZlPworRnJFeGFjdE1hdGNoPUNoZWNrIHRoaXMgaWYgdGhlIGNvbnRlbnQgdHlwZSBuZWVkcyB0byAmbWF0Y2ggZXhhY3RseS4gRG8gbm90IGNoZWNrIGl0LCBpZiBzdWIgdHlwZXMgbmVlZCB0byBtYXRjaCBhcyB3ZWxsLgorRnJTaW1wbGVGaWxlTmFtZT1Gb3IgZmlsZSBiYXNlZCAmY29tcGFyaXNvbnMsIHVzZSBvbmx5IHRoZSBzaW1wbGUgZmlsZSBuYW1lLgogRnJGb2xkZXJPckZpbGU9Rm9sZGVyIG9yIEZpbGUgTmFtZQotRnJGb2xkZXJPckZpbGVMYWJlbD1GaWxlIG9yIGZvbGRlcjoKLUZyQnJvd3NlRmlsZT1Ccm93c2UgRmlsZS4uLgorRnJGb2xkZXJPckZpbGVMYWJlbD1GaWwmZSBvciBmb2xkZXI6CitGckJyb3dzZUZpbGU9QnJvd3NlICZGaWxlLi4uCiBGckZpbGVGaWx0ZXI9U2VsZWN0IHRoZSBmaWxlIHRoYXQgd2lsbCBzZXJ2ZSBhcyB0aGUgZmlsdGVyCi1GckJyb3dzZUZvbGRlcj1Ccm93c2UgRm9sZGVyLi4uCitGckJyb3dzZUZvbGRlcj1Ccm93c2UgRiZvbGRlci4uLgogRnJGb2xkZXJGaWx0ZXI9U2VsZWN0IHRoZSBmb2xkZXIgdGhhdCB3aWxsIHNlcnZlIGFzIHRoZSBmaWx0ZXIKIEZyUHJvamVjdE5hdHVyZT1Qcm9qZWN0IE5hdHVyZQotRnJQcm9qZWN0TmF0dXJlTGFiZWw9UHJvamVjdCBuYXR1cmU6CitGclByb2plY3ROYXR1cmVMYWJlbD1Qcm9qZWN0ICZuYXR1cmU6CiBGckZhY2l0PUZhY2V0Ci1GckZhY2l0TGFiZWw9RmFjZXQgaWQ6CitGckZhY2l0TGFiZWw9JkZhY2V0IGlkOgogRnJDb250ZW50VHlwZT1Db250ZW50IFR5cGUKLUZyQ29udGVudFR5cGVMYWJlbD1Db250ZW50IFR5cGU6CitGckNvbnRlbnRUeXBlTGFiZWw9JkNvbnRlbnQgVHlwZToKIEZyTXNnU2V2PVNlbGVjdCB0aGUgc2V2ZXJpdHkgbGV2ZWwgZm9yIHRoZSBmb2xsb3dpbmcgcHJvYmxlbXMKIAogUmVidWlsZFRpdGxlPVZhbGlkYXRpb24gU2V0dGluZ3MgQ2hhbmdlZApkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi51aS92YWxpZGF0ZXVpL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL2ludGVybmFsL3VpL1ZhbGlkYXRpb25NZW51QWN0aW9uLmphdmEgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLnVpL3ZhbGlkYXRldWkvb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vaW50ZXJuYWwvdWkvVmFsaWRhdGlvbk1lbnVBY3Rpb24uamF2YQppbmRleCBhZjA4M2U3Li4xMjZjNDA3IDEwMDY0NAotLS0gYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLnVpL3ZhbGlkYXRldWkvb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vaW50ZXJuYWwvdWkvVmFsaWRhdGlvbk1lbnVBY3Rpb24uamF2YQorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLnVpL3ZhbGlkYXRldWkvb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vaW50ZXJuYWwvdWkvVmFsaWRhdGlvbk1lbnVBY3Rpb24uamF2YQpAQCAtMjEyLDYgKzIxMiw3IEBACiAJCQkJCWlmIChEaXNhYmxlZFJlc291cmNlTWFuYWdlci5nZXREZWZhdWx0KCkuaXNEaXNhYmxlZChyZXMpKXJldHVybiBmYWxzZTsKIAkJCQkJaWYgKHJlcyBpbnN0YW5jZW9mIElGaWxlKWFkZFNlbGVjdGVkKHJlcyk7CiAJCQkJCWVsc2UgaWYgKHJlcyBpbnN0YW5jZW9mIElGb2xkZXIpYWRkU2VsZWN0ZWQocmVzKTsKKwkJCQkJZWxzZSBpZiAocmVzIGluc3RhbmNlb2YgSVByb2plY3QpYWRkU2VsZWN0ZWQocmVzKTsKIAkJCQkJCiAJCQkJCXJldHVybiB0cnVlOwogCQkJCX0KZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24udWkvdmYyL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL3VpL2ludGVybmFsL0FkYXB0ZXJGYWN0b3J5LmphdmEgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLnVpL3ZmMi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi91aS9pbnRlcm5hbC9BZGFwdGVyRmFjdG9yeS5qYXZhCmluZGV4IDQzMzc1MzQuLjc1MGM2ZmQgMTAwNjQ0Ci0tLSBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24udWkvdmYyL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL3VpL2ludGVybmFsL0FkYXB0ZXJGYWN0b3J5LmphdmEKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi51aS92ZjIvb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vdWkvaW50ZXJuYWwvQWRhcHRlckZhY3RvcnkuamF2YQpAQCAtMTQsMTUgKzE0LDE3IEBACiBpbXBvcnQgb3JnLmVjbGlwc2UuamZhY2UucmVzb3VyY2UuSW1hZ2VEZXNjcmlwdG9yOwogaW1wb3J0IG9yZy5lY2xpcHNlLnVpLm1vZGVsLklXb3JrYmVuY2hBZGFwdGVyOwogaW1wb3J0IG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLlZhbGlkYXRvcjsKK2ltcG9ydCBvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5pbnRlcm5hbC5WYWxpZGF0b3JNdXRhYmxlOwogaW1wb3J0IG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLmludGVybmFsLm1vZGVsLkZpbHRlckdyb3VwOwogaW1wb3J0IG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLmludGVybmFsLm1vZGVsLkZpbHRlclJ1bGU7CiAKIHB1YmxpYyBjbGFzcyBBZGFwdGVyRmFjdG9yeSBpbXBsZW1lbnRzIElBZGFwdGVyRmFjdG9yeSB7CiAKIAlwdWJsaWMgT2JqZWN0IGdldEFkYXB0ZXIoT2JqZWN0IGFkYXB0YWJsZU9iamVjdCwgQ2xhc3MgYWRhcHRlclR5cGUpIHsKLQkJaWYgKGFkYXB0ZXJUeXBlID09IElXb3JrYmVuY2hBZGFwdGVyLmNsYXNzJiYgYWRhcHRhYmxlT2JqZWN0IGluc3RhbmNlb2YgVmFsaWRhdG9yLlYyKXJldHVybiBfdmFsQWRhcHRvcjsKKwkJaWYgKGFkYXB0ZXJUeXBlID09IElXb3JrYmVuY2hBZGFwdGVyLmNsYXNzICYmIGFkYXB0YWJsZU9iamVjdCBpbnN0YW5jZW9mIFZhbGlkYXRvci5WMilyZXR1cm4gX3ZhbEFkYXB0b3I7CiAJCWlmIChhZGFwdGVyVHlwZSA9PSBJV29ya2JlbmNoQWRhcHRlci5jbGFzcyAmJiBhZGFwdGFibGVPYmplY3QgaW5zdGFuY2VvZiBGaWx0ZXJHcm91cClyZXR1cm4gX2ZnQWRhcHRvcjsKIAkJaWYgKGFkYXB0ZXJUeXBlID09IElXb3JrYmVuY2hBZGFwdGVyLmNsYXNzICYmIGFkYXB0YWJsZU9iamVjdCBpbnN0YW5jZW9mIEZpbHRlclJ1bGUpcmV0dXJuIF9ydWxlQWRhcHRvcjsKKwkJaWYgKGFkYXB0ZXJUeXBlID09IElXb3JrYmVuY2hBZGFwdGVyLmNsYXNzICYmIGFkYXB0YWJsZU9iamVjdCBpbnN0YW5jZW9mIFZhbGlkYXRvck11dGFibGUpcmV0dXJuIF92YWxNdXRhYmxlQWRhcHRvcjsKIAogCQlyZXR1cm4gbnVsbDsKIAl9CkBAIC01MCw2ICs1MiwyNSBAQAogCQl9CiAKIAl9OworCXByaXZhdGUgSVdvcmtiZW5jaEFkYXB0ZXIgX3ZhbE11dGFibGVBZGFwdG9yID0gbmV3IElXb3JrYmVuY2hBZGFwdGVyKCkgeworCisJCXB1YmxpYyBPYmplY3RbXSBnZXRDaGlsZHJlbihPYmplY3QgbykgeworCQkJcmV0dXJuICgoVmFsaWRhdG9yTXV0YWJsZSkgbykuZ2V0R3JvdXBzKCk7CisJCX0KKworCQlwdWJsaWMgSW1hZ2VEZXNjcmlwdG9yIGdldEltYWdlRGVzY3JpcHRvcihPYmplY3QgbykgeworCQkJcmV0dXJuIG51bGw7CisJCX0KKworCQlwdWJsaWMgU3RyaW5nIGdldExhYmVsKE9iamVjdCBvKSB7CisJCQlyZXR1cm4gKChWYWxpZGF0b3JNdXRhYmxlKSBvKS5nZXROYW1lKCk7CisJCX0KKworCQlwdWJsaWMgT2JqZWN0IGdldFBhcmVudChPYmplY3QgbykgeworCQkJcmV0dXJuIG51bGw7CisJCX0KKworCX07CiAKIAlwcml2YXRlIElXb3JrYmVuY2hBZGFwdGVyIF9mZ0FkYXB0b3IgPSBuZXcgSVdvcmtiZW5jaEFkYXB0ZXIoKSB7CiAKZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24udWkvdmYyL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL3VpL2ludGVybmFsL01hbnVhbFZhbGlkYXRpb25SdW5uZXIuamF2YSBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24udWkvdmYyL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL3VpL2ludGVybmFsL01hbnVhbFZhbGlkYXRpb25SdW5uZXIuamF2YQppbmRleCA1MmI0N2VhLi5mNzBiY2NlIDEwMDY0NAotLS0gYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLnVpL3ZmMi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi91aS9pbnRlcm5hbC9NYW51YWxWYWxpZGF0aW9uUnVubmVyLmphdmEKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi51aS92ZjIvb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vdWkvaW50ZXJuYWwvTWFudWFsVmFsaWRhdGlvblJ1bm5lci5qYXZhCkBAIC0yMiw5ICsyMiw5IEBACiBpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5ydW50aW1lLlN0YXR1czsKIGltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJ1bnRpbWUuam9icy5NdWx0aVJ1bGU7CiBpbXBvcnQgb3JnLmVjbGlwc2Uuc3d0LndpZGdldHMuRGlzcGxheTsKLWltcG9ydCBvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5WYWxpZGF0aW9uUmVzdWx0OwogaW1wb3J0IG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLmludGVybmFsLlZhbE9wZXJhdGlvbjsKIGltcG9ydCBvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5pbnRlcm5hbC5WYWxUeXBlOworaW1wb3J0IG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLmludGVybmFsLlZhbGlkYXRpb25SZXN1bHRTdW1tYXJ5OwogaW1wb3J0IG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLmludGVybmFsLlZhbGlkYXRpb25SdW5uZXI7CiBpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24udWkuaW50ZXJuYWwuZGlhbG9nLlJlc3VsdHNEaWFsb2c7CiAKQEAgLTg1LDE0ICs4NSwxNCBAQAogCQlpbnQgcmVzb3VyY2VDb3VudCA9IDA7CiAJCWZvciAoU2V0IHMgOiBfcHJvamVjdHMudmFsdWVzKCkpcmVzb3VyY2VDb3VudCArPSBzLnNpemUoKTsKIAkJZmluYWwgaW50IGZpbmFsUmVzb3VyY2VDb3VudCA9IHJlc291cmNlQ291bnQ7Ci0JCWlmICh2by5nZXRSZXN1bHQoKS5pc0NhbmNlbGVkKCkpcmV0dXJuIFN0YXR1cy5DQU5DRUxfU1RBVFVTOworCQlpZiAodm8uaXNDYW5jZWxlZCgpKXJldHVybiBTdGF0dXMuQ0FOQ0VMX1NUQVRVUzsKIAkJCiAJCWlmIChfc2hvd1Jlc3VsdHMpewogCQkJRGlzcGxheSBkaXNwbGF5ID0gRGlzcGxheS5nZXREZWZhdWx0KCk7CiAJCQlSdW5uYWJsZSBydW4gPSBuZXcgUnVubmFibGUoKXsKIAogCQkJCXB1YmxpYyB2b2lkIHJ1bigpIHsKLQkJCQkJVmFsaWRhdGlvblJlc3VsdCB2ciA9IHZvLmdldFJlc3VsdCgpOworCQkJCQlWYWxpZGF0aW9uUmVzdWx0U3VtbWFyeSB2ciA9IHZvLmdldFJlc3VsdCgpOwogCQkJCQlSZXN1bHRzRGlhbG9nIHJkID0gbmV3IFJlc3VsdHNEaWFsb2cobnVsbCwgdnIsIHRpbWUsIGZpbmFsUmVzb3VyY2VDb3VudCk7CiAJCQkJCXJkLm9wZW4oKTsKIAkJCQl9CmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLnVpL3ZmMi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi91aS9pbnRlcm5hbC9kaWFsb2cvRmlsdGVyRGlhbG9nLmphdmEgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLnVpL3ZmMi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi91aS9pbnRlcm5hbC9kaWFsb2cvRmlsdGVyRGlhbG9nLmphdmEKaW5kZXggNjcyYjJkMC4uMTg2ZWFhZSAxMDA2NDQKLS0tIGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi51aS92ZjIvb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vdWkvaW50ZXJuYWwvZGlhbG9nL0ZpbHRlckRpYWxvZy5qYXZhCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24udWkvdmYyL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL3VpL2ludGVybmFsL2RpYWxvZy9GaWx0ZXJEaWFsb2cuamF2YQpAQCAtMSw1ICsxLDUgQEAKIC8qKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqCi0gKiBDb3B5cmlnaHQgKGMpIDIwMDUsIDIwMDggSUJNIENvcnBvcmF0aW9uIGFuZCBvdGhlcnMuCisgKiBDb3B5cmlnaHQgKGMpIDIwMDUsIDIwMDkgSUJNIENvcnBvcmF0aW9uIGFuZCBvdGhlcnMuCiAgKiBBbGwgcmlnaHRzIHJlc2VydmVkLiBUaGlzIHByb2dyYW0gYW5kIHRoZSBhY2NvbXBhbnlpbmcgbWF0ZXJpYWxzCiAgKiBhcmUgbWFkZSBhdmFpbGFibGUgdW5kZXIgdGhlIHRlcm1zIG9mIHRoZSBFY2xpcHNlIFB1YmxpYyBMaWNlbnNlIHYxLjAKICAqIHdoaWNoIGFjY29tcGFuaWVzIHRoaXMgZGlzdHJpYnV0aW9uLCBhbmQgaXMgYXZhaWxhYmxlIGF0CkBAIC00NSw2ICs0NSw3IEBACiBpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uVmFsaWRhdG9yOwogaW1wb3J0IG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLmludGVybmFsLlZhbE1hbmFnZXI7CiBpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uaW50ZXJuYWwuVmFsTWVzc2FnZXM7CitpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uaW50ZXJuYWwuVmFsaWRhdG9yTXV0YWJsZTsKIGltcG9ydCBvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5pbnRlcm5hbC5kZWxlZ2F0ZXMuVmFsaWRhdG9yRGVsZWdhdGVEZXNjcmlwdG9yOwogaW1wb3J0IG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLmludGVybmFsLmRlbGVnYXRlcy5WYWxpZGF0b3JEZWxlZ2F0ZXNSZWdpc3RyeTsKIGltcG9ydCBvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5pbnRlcm5hbC5tb2RlbC5GaWx0ZXJHcm91cDsKQEAgLTYwLDcgKzYxLDcgQEAKICAqIEBhdXRob3Iga2FyYXNpdWsKICAqCiAgKi8KLXB1YmxpYyBjbGFzcyBGaWx0ZXJEaWFsb2cgZXh0ZW5kcyBEaWFsb2cgeworcHVibGljIGZpbmFsIGNsYXNzIEZpbHRlckRpYWxvZyBleHRlbmRzIERpYWxvZyB7CiAJCiAJLyoqIAogCSAqIElmIHdlIGFyZSBkb2luZyBwcm9qZWN0IGxldmVsIGZpbHRlcnMgdGhpcyB3aWxsIHBvaW50IHRvIHRoZSBwcm9qZWN0LiBUaGlzIGlzIG51bGwgaWYgd2UgYXJlIGRvaW5nCkBAIC02OCwxNCArNjksOCBAQAogCSAqLwogCXByaXZhdGUgSVByb2plY3QJX3Byb2plY3Q7CiAJCi0JLyoqIAotCSAqIEEgZGVlcCBjb3B5IG9mIHRoZSB2YWxpZGF0b3IsIHNvIHRoYXQgd2UgY2FuIHVzZSBpdCBhcyBhIG1vZGVsIG9iamVjdCwgYW5kIG5vdCB3b3JyeSBhYm91dCB0aGUKLQkgKiB1c2VyIG5vdCBzYXZpbmcgdGhlaXIgY2hhbmdlcy4KLQkgKi8KLQlwcml2YXRlIFZhbGlkYXRvciAJX3ZhbGlkYXRvcjsKKwlwcml2YXRlIFZhbGlkYXRvck11dGFibGUgCV92YWxpZGF0b3I7CiAJCi0JLy8gVGhlIFYyIHZlcnNpb24gb2YgX3ZhbGlkYXRvci4KLQlwcml2YXRlIFZhbGlkYXRvci5WMglfdjI7CiAJcHJpdmF0ZSBUcmVlVmlld2VyCQlfdHJlZTsKIAlwcml2YXRlIENvbWJvCQkJX2RlbGVnYXRpbmc7CiAJcHJpdmF0ZSBJQWRhcHRlckZhY3RvcnkgX2FkYXB0b3JGYWN0b3J5ID0gbmV3IEFkYXB0ZXJGYWN0b3J5KCk7CkBAIC04Niw3ICs4MSwxMCBAQAogCXByaXZhdGUgQnV0dG9uCQlfcmVtb3ZlOwogCXByaXZhdGUgSVNlbGVjdGlvbkNoYW5nZWRMaXN0ZW5lcglfbm9kZUNoYW5nZWRMaXN0ZW5lcjsKIAkKKwkvKiogVGhlIGN1cnJlbnRseSBzZWxlY3RlZCBncm91cC4gSWYgYSBydWxlIGlzIHNlbGVjdGVkIGluc3RlYWQsIHRoZW4gdGhpcyB3aWxsIGJlIG51bGwuICovCiAJcHJpdmF0ZSBGaWx0ZXJHcm91cAlfc2VsZWN0ZWRHcm91cDsKKwkKKwkvKiogVGhlIGN1cnJlbnRseSBzZWxlY3RlZCBydWxlLiBJZiBhIGdyb3VwIGlzIHNlbGVjdGVkIGluc3RlYWQsIHRoZW4gdGhpcyB3aWxsIGJlIG51bGwuICovCiAJcHJpdmF0ZSBGaWx0ZXJSdWxlCV9zZWxlY3RlZFJ1bGU7CiAJCiAJcHJpdmF0ZSBDb21ib1tdCQlfbWVzc2FnZVNldjsKQEAgLTEwNiwxMiArMTA0LDExIEBACiAJICogQHBhcmFtIHByb2plY3QgdGhlIHByb2plY3QgdGhhdCB0aGUgZmlsdGVycyBhcmUgYmVpbmcgYWRkZWQgdG8uIElmIHRoZXNlIGFyZSB3b3Jrc3BhY2UKIAkgKiBsZXZlbCBmaWx0ZXJzLCB0aGVuIHRoaXMgbXVzdCBiZSBudWxsLiAKIAkgKi8KLQlwdWJsaWMgRmlsdGVyRGlhbG9nKFNoZWxsIHNoZWxsLCBWYWxpZGF0b3IgdmFsaWRhdG9yLCBJUHJvamVjdCBwcm9qZWN0KXsKKwlwdWJsaWMgRmlsdGVyRGlhbG9nKFNoZWxsIHNoZWxsLCBWYWxpZGF0b3JNdXRhYmxlIHZhbGlkYXRvciwgSVByb2plY3QgcHJvamVjdCl7CiAJCXN1cGVyKHNoZWxsKTsKIAkJX3NoZWxsID0gc2hlbGw7CiAJCXNldFNoZWxsU3R5bGUoZ2V0U2hlbGxTdHlsZSgpIHwgU1dULkNMT1NFfFNXVC5NSU58U1dULk1BWHxTV1QuUkVTSVpFKTsKLQkJX3ZhbGlkYXRvciA9IHZhbGlkYXRvci5jb3B5KHRydWUpOwotCQlfdjIgPSBfdmFsaWRhdG9yLmFzVjJWYWxpZGF0b3IoKTsKKwkJX3ZhbGlkYXRvciA9IHZhbGlkYXRvcjsKIAkJX3Byb2plY3QgPSBwcm9qZWN0OwogCX0KIAkKQEAgLTEyMyw3ICsxMjAsNyBAQAogCXByb3RlY3RlZCBDb250cm9sIGNyZWF0ZURpYWxvZ0FyZWEoQ29tcG9zaXRlIHBhcmVudCkgewogCQlDb21wb3NpdGUgYyA9IChDb21wb3NpdGUpc3VwZXIuY3JlYXRlRGlhbG9nQXJlYShwYXJlbnQpOwogCQljLnNldExheW91dChuZXcgR3JpZExheW91dCgyLCBmYWxzZSkpOwotCQlpZiAoX3YyID09IG51bGwpeworCQlpZiAoIV92YWxpZGF0b3IuaXNWMlZhbGlkYXRvcigpKXsKIAkJCW5ldyBMYWJlbChjLCBTV1QuTk9ORSkuc2V0VGV4dChWYWxVSU1lc3NhZ2VzLmZkTm9GaWx0ZXJzKTsKIAkJfQogCQllbHNlIHsKQEAgLTEzMywxNyArMTMwLDE3IEBACiAJCQkKIAkJCV90cmVlID0gbmV3IFRyZWVWaWV3ZXIoYywgU1dULlNJTkdMRSB8IFNXVC5IX1NDUk9MTCB8IFNXVC5WX1NDUk9MTCB8IFNXVC5CT1JERVIpOwogCQkJX3RyZWUuZ2V0Q29udHJvbCgpLnNldExheW91dERhdGEobmV3IEdyaWREYXRhKFNXVC5GSUxMLCBTV1QuRklMTCwgdHJ1ZSwgdHJ1ZSkpOwotCQkJUGxhdGZvcm0uZ2V0QWRhcHRlck1hbmFnZXIoKS5yZWdpc3RlckFkYXB0ZXJzKF9hZGFwdG9yRmFjdG9yeSwgVmFsaWRhdG9yLlYyLmNsYXNzKTsKKwkJCVBsYXRmb3JtLmdldEFkYXB0ZXJNYW5hZ2VyKCkucmVnaXN0ZXJBZGFwdGVycyhfYWRhcHRvckZhY3RvcnksIFZhbGlkYXRvck11dGFibGUuY2xhc3MpOwogCQkJUGxhdGZvcm0uZ2V0QWRhcHRlck1hbmFnZXIoKS5yZWdpc3RlckFkYXB0ZXJzKF9hZGFwdG9yRmFjdG9yeSwgRmlsdGVyR3JvdXAuY2xhc3MpOwogCQkJUGxhdGZvcm0uZ2V0QWRhcHRlck1hbmFnZXIoKS5yZWdpc3RlckFkYXB0ZXJzKF9hZGFwdG9yRmFjdG9yeSwgRmlsdGVyUnVsZS5jbGFzcyk7CiAJCQlfdHJlZS5zZXRDb250ZW50UHJvdmlkZXIobmV3IEJhc2VXb3JrYmVuY2hDb250ZW50UHJvdmlkZXIoKSk7CiAJCQlfdHJlZS5zZXRMYWJlbFByb3ZpZGVyKG5ldyBXb3JrYmVuY2hMYWJlbFByb3ZpZGVyKCkpOwotCQkJX3RyZWUuc2V0SW5wdXQoX3YyKTsKKwkJCV90cmVlLnNldElucHV0KF92YWxpZGF0b3IpOwogCQkJX3RyZWUuZXhwYW5kQWxsKCk7CiAJCQkKIAkJCWFkZEJ1dHRvbnMoYyk7CiAJCQkKLQkJCVN0cmluZyBkZWxlZ2F0aW5nSWQgPSBfdjIuZ2V0RGVsZWdhdGluZ0lkKCk7CisJCQlTdHJpbmcgZGVsZWdhdGluZ0lkID0gX3ZhbGlkYXRvci5nZXREZWxlZ2F0aW5nSWQoKTsKIAkJCWlmIChkZWxlZ2F0aW5nSWQgIT0gbnVsbCl7CiAJCQkJYWRkRGVsZWdhdG9yU2VsZWN0aW9uKGMpOwogCQkJfQpAQCAtMjMzLDggKzIzMCw5IEBACiAJCQkJCiAJCQkJRmlsdGVyUnVsZSBydWxlID0gbmZyLmdldFJ1bGUoKTsKIAkJCQlpZiAocnVsZSAhPSBudWxsKXsKLQkJCQkJX3NlbGVjdGVkR3JvdXAuYWRkKHJ1bGUpOwotCQkJCQlfdjIuYnVtcENoYW5nZUNvdW50R3JvdXBzKCk7CisJCQkJCUZpbHRlckdyb3VwIG5ld0dyb3VwID0gRmlsdGVyR3JvdXAuYWRkUnVsZShfc2VsZWN0ZWRHcm91cCwgcnVsZSk7CisJCQkJCV92YWxpZGF0b3IucmVwbGFjZUZpbHRlckdyb3VwKF9zZWxlY3RlZEdyb3VwLCBuZXdHcm91cCk7CisJCQkJCV9zZWxlY3RlZEdyb3VwID0gbmV3R3JvdXA7CiAJCQkJCXJlZnJlc2goKTsKIAkJCQl9CiAJCQl9CkBAIC0yNzIsMTUgKzI3MCwxNCBAQAogCX0KIAkKIAlwcml2YXRlIHZvaWQgcmVzdG9yZURlZmF1bHRzKCkgewotCQlpZiAoX3YyICE9IG51bGwpeworCQlpZiAoX3ZhbGlkYXRvci5pc1YyVmFsaWRhdG9yKCkpewogCQkJdHJ5IHsKLQkJCQlTdHJpbmcgaWQgPSBfdjIuZ2V0SWQoKTsKKwkJCQlTdHJpbmcgaWQgPSBfdmFsaWRhdG9yLmdldElkKCk7CiAJCQkJVmFsaWRhdG9yW10gdmFscyA9IFZhbE1hbmFnZXIuZ2V0RGVmYXVsdFZhbGlkYXRvcnMoKTsKIAkJCQlmb3IgKFZhbGlkYXRvciB2IDogdmFscyl7CiAJCQkJCWlmICh2LmdldElkKCkuZXF1YWxzKGlkKSl7Ci0JCQkJCQlfdmFsaWRhdG9yID0gdjsKLQkJCQkJCV92MiA9IHYuYXNWMlZhbGlkYXRvcigpOwotCQkJCQkJX3RyZWUuc2V0SW5wdXQoX3YyKTsKKwkJCQkJCV92YWxpZGF0b3IgPSBuZXcgVmFsaWRhdG9yTXV0YWJsZSh2KTsKKwkJCQkJCV90cmVlLnNldElucHV0KF92YWxpZGF0b3IpOwogCQkJCQkJX3RyZWUuZXhwYW5kQWxsKCk7CiAJCQkJCQlyZWZyZXNoKCk7CiAJCQkJCQlyZXR1cm47CkBAIC0yOTYsNyArMjkzLDcgQEAKIAogCiAJcHJpdmF0ZSB2b2lkIGFkZE1lc3NhZ2VNYXBwaW5ncyhDb21wb3NpdGUgYykgewotCQlpZiAoX3YyID09IG51bGwpcmV0dXJuOworCQlpZiAoIV92YWxpZGF0b3IuaXNWMlZhbGlkYXRvcigpKXJldHVybjsKIAkJTWFwPFN0cmluZyxNZXNzYWdlU2V2ZXJpdHlTZXR0aW5nPiBtYXBwaW5ncyA9IF92YWxpZGF0b3IuZ2V0TWVzc2FnZVNldHRpbmdzKCk7CiAJCWlmIChtYXBwaW5ncyA9PSBudWxsIHx8IG1hcHBpbmdzLnNpemUoKSA9PSAwKXJldHVybjsKIAkJCkBAIC0zNDcsNyArMzQ0LDcgQEAKIAkgKiBBZGQgYSBjb21ibyBib3ggc28gdGhhdCB0aGUgdXNlciBjYW4gY2hhbmdlIHdoaWNoIGRlbGVnYXRpbmcgdmFsaWRhdG9yIHRvIGNhbGwuCiAJICovCiAJcHJpdmF0ZSB2b2lkIGFkZERlbGVnYXRvclNlbGVjdGlvbihDb21wb3NpdGUgYykgewotCQlNYXAgbWFwID0gVmFsaWRhdG9yRGVsZWdhdGVzUmVnaXN0cnkuZ2V0SW5zdGFuY2UoKS5nZXREZWxlZ2F0ZURlc2NyaXB0b3JzKF92Mi5nZXRWYWxpZGF0b3JDbGFzc25hbWUoKSk7CisJCU1hcCBtYXAgPSBWYWxpZGF0b3JEZWxlZ2F0ZXNSZWdpc3RyeS5nZXRJbnN0YW5jZSgpLmdldERlbGVnYXRlRGVzY3JpcHRvcnMoX3ZhbGlkYXRvci5nZXRWYWxpZGF0b3JDbGFzc25hbWUoKSk7CiAJCWlmIChtYXAgPT0gbnVsbClyZXR1cm47CiAJCQogCQlDb21wb3NpdGUgbGluZSA9IG5ldyBDb21wb3NpdGUoYywgU1dULk5PTkUpOwpAQCAtMzY3LDcgKzM2NCw3IEBACiAJCQlWYWxpZGF0b3JEZWxlZ2F0ZURlc2NyaXB0b3IgdmQgPSAoVmFsaWRhdG9yRGVsZWdhdGVEZXNjcmlwdG9yKWl0Lm5leHQoKTsKIAkJCWl0ZW1zW2ldID0gdmQuZ2V0TmFtZSgpOwogCQkJaWRzW2ldID0gdmQuZ2V0SWQoKTsKLQkJCWlmICh2ZC5nZXRJZCgpLmVxdWFscyhfdjIuZ2V0RGVsZWdhdGluZ0lkKCkpKXsKKwkJCWlmICh2ZC5nZXRJZCgpLmVxdWFscyhfdmFsaWRhdG9yLmdldERlbGVnYXRpbmdJZCgpKSl7CiAJCQkJc2VsZWN0ZWQgPSB2ZC5nZXROYW1lKCk7CiAJCQl9CiAJCX0KQEAgLTM4MCw3ICszNzcsNyBAQAogCiAJCQlwdWJsaWMgdm9pZCB3aWRnZXRTZWxlY3RlZChTZWxlY3Rpb25FdmVudCBlKSB7CiAJCQkJaW50IHNlbCA9IF9kZWxlZ2F0aW5nLmdldFNlbGVjdGlvbkluZGV4KCk7Ci0JCQkJX3YyLnNldERlbGVnYXRpbmdJZChpZHNbc2VsXSk7CisJCQkJX3ZhbGlkYXRvci5zZXREZWxlZ2F0aW5nSWQoaWRzW3NlbF0pOwogCQkJfQogCQkJCiAJCX0pOwpAQCAtMzkxLDE0ICszODgsMTYgQEAKIAkgKiBAcGFyYW0gZXhjbHVkZQogCSAqLwogCXByaXZhdGUgdm9pZCBhZGRHcm91cChib29sZWFuIGV4Y2x1ZGUpewotCQlpZiAoX3YyID09IG51bGwpcmV0dXJuOwotCQlfdjIuYWRkKEZpbHRlckdyb3VwLmNyZWF0ZShleGNsdWRlKSk7CisJCWlmICghX3ZhbGlkYXRvci5pc1YyVmFsaWRhdG9yKCkpcmV0dXJuOworCQlGaWx0ZXJSdWxlW10gcnVsZXMgPSBuZXcgRmlsdGVyUnVsZVswXTsKKwkJX3ZhbGlkYXRvci5hZGQoRmlsdGVyR3JvdXAuY3JlYXRlKGV4Y2x1ZGUsIHJ1bGVzKSk7CiAJCXJlZnJlc2goKTsKIAkJCiAJfQogCQogCXByaXZhdGUgdm9pZCByZWZyZXNoKCl7CiAJCV90cmVlLnJlZnJlc2goKTsKKwkJX3RyZWUuZXhwYW5kQWxsKCk7CiAJCXVwZGF0ZUJ1dHRvbnMoKTsJCQogCX0KIAkKQEAgLTQwNywyNiArNDA2LDM4IEBACiAJICovCiAJcHJpdmF0ZSB2b2lkIHJlbW92ZSgpewogCQlpZiAoX3NlbGVjdGVkUnVsZSAhPSBudWxsKXsKLQkJCUZpbHRlckdyb3VwW10gZ3JvdXBzID0gX3YyLmdldEdyb3VwcygpOwotCQkJZm9yIChpbnQgaT0wOyBpPGdyb3Vwcy5sZW5ndGg7IGkrKyl7Ci0JCQkJaWYgKGdyb3Vwc1tpXS5yZW1vdmUoX3NlbGVjdGVkUnVsZSkpewotCQkJCQlfdjIuYnVtcENoYW5nZUNvdW50R3JvdXBzKCk7Ci0JCQkJCXJlZnJlc2goKTsKLQkJCQkJcmV0dXJuOwotCQkJCX0KKwkJCUZpbHRlckdyb3VwIGdyb3VwID0gZmluZEdyb3VwKF9zZWxlY3RlZFJ1bGUpOworCQkJaWYgKGdyb3VwICE9IG51bGwpeworCQkJCUZpbHRlckdyb3VwIG5ld0dyb3VwID0gRmlsdGVyR3JvdXAucmVtb3ZlUnVsZShncm91cCwgX3NlbGVjdGVkUnVsZSk7CisJCQkJX3ZhbGlkYXRvci5yZXBsYWNlRmlsdGVyR3JvdXAoZ3JvdXAsIG5ld0dyb3VwKTsKKwkJCQlyZWZyZXNoKCk7CiAJCQl9CiAJCX0KIAkJCiAJCWlmIChfc2VsZWN0ZWRHcm91cCAhPSBudWxsKXsKLQkJCV92Mi5yZW1vdmUoX3NlbGVjdGVkR3JvdXApOworCQkJX3ZhbGlkYXRvci5yZW1vdmUoX3NlbGVjdGVkR3JvdXApOwogCQkJcmVmcmVzaCgpOwogCQkJcmV0dXJuOwogCQl9CiAJfQogCQorCS8qKgorCSAqIEZpbmQgdGhlIGdyb3VwIGluIHRoZSBjdXJyZW50IHZhbGlkYXRvciB0aGF0IGhhcyB0aGlzIHJ1bGUuCisJICogQHBhcmFtIHJ1bGUgVGhlIHJ1bGUgdGhhdCB3ZSBhcmUgc2VhcmNoaW5nIGZvci4KKwkgKiBAcmV0dXJuIG51bGwgaWYgd2UgY2FuIG5vdCBmaW5kIHRoZSBncm91cC4KKwkgKi8KKwlwcml2YXRlIEZpbHRlckdyb3VwIGZpbmRHcm91cChGaWx0ZXJSdWxlIHJ1bGUpIHsKKwkJZm9yIChGaWx0ZXJHcm91cCBncm91cCA6IF92YWxpZGF0b3IuZ2V0R3JvdXBzKCkpeworCQkJZm9yIChGaWx0ZXJSdWxlIGZyIDogZ3JvdXAuZ2V0UnVsZXMoKSl7CisJCQkJaWYgKGZyLmVxdWFscyhydWxlKSlyZXR1cm4gZ3JvdXA7CisJCQl9CisJCX0KKwkJcmV0dXJuIG51bGw7CisJfQorCiAJcHJpdmF0ZSB2b2lkIHVwZGF0ZUJ1dHRvbnMoKSB7Ci0JCWlmIChfdjIgIT0gbnVsbCl7Ci0JCQlfYWRkR3JvdXBFeGNsdWRlLnNldEVuYWJsZWQoIVZhbGlkYXRvckhlbHBlci5oYXNFeGNsdWRlR3JvdXAoX3YyKSk7CisJCWlmIChfdmFsaWRhdG9yLmlzVjJWYWxpZGF0b3IoKSl7CisJCQlfYWRkR3JvdXBFeGNsdWRlLnNldEVuYWJsZWQoIVZhbGlkYXRvckhlbHBlci5oYXNFeGNsdWRlR3JvdXAoX3ZhbGlkYXRvcikpOwogCQl9CiAJCV9hZGRSdWxlLnNldEVuYWJsZWQoX3NlbGVjdGVkR3JvdXAgIT0gbnVsbCk7CiAJCV9yZW1vdmUuc2V0RW5hYmxlZChfc2VsZWN0ZWRHcm91cCAhPSBudWxsIHx8IF9zZWxlY3RlZFJ1bGUgIT0gbnVsbCk7CkBAIC00NTIsNyArNDYzLDcgQEAKIAkJcmV0dXJuIG5ldyBQb2ludCg2MDAsIDQ3NSk7CiAJfQogCi0JcHVibGljIFZhbGlkYXRvciBnZXRWYWxpZGF0b3IoKSB7CisJcHVibGljIFZhbGlkYXRvck11dGFibGUgZ2V0VmFsaWRhdG9yKCkgewogCQlyZXR1cm4gX3ZhbGlkYXRvcjsKIAl9CiB9CmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLnVpL3ZmMi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi91aS9pbnRlcm5hbC9kaWFsb2cvTmV3RmlsdGVyUnVsZS5qYXZhIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi51aS92ZjIvb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vdWkvaW50ZXJuYWwvZGlhbG9nL05ld0ZpbHRlclJ1bGUuamF2YQppbmRleCBmYWQ0OWQ3Li43ZjY0Yjk2IDEwMDY0NAotLS0gYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLnVpL3ZmMi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi91aS9pbnRlcm5hbC9kaWFsb2cvTmV3RmlsdGVyUnVsZS5qYXZhCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24udWkvdmYyL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL3VpL2ludGVybmFsL2RpYWxvZy9OZXdGaWx0ZXJSdWxlLmphdmEKQEAgLTEsNSArMSw1IEBACiAvKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKgotICogQ29weXJpZ2h0IChjKSAyMDA1LCAyMDA4IElCTSBDb3Jwb3JhdGlvbiBhbmQgb3RoZXJzLgorICogQ29weXJpZ2h0IChjKSAyMDA1LCAyMDA5IElCTSBDb3Jwb3JhdGlvbiBhbmQgb3RoZXJzLgogICogQWxsIHJpZ2h0cyByZXNlcnZlZC4gVGhpcyBwcm9ncmFtIGFuZCB0aGUgYWNjb21wYW55aW5nIG1hdGVyaWFscwogICogYXJlIG1hZGUgYXZhaWxhYmxlIHVuZGVyIHRoZSB0ZXJtcyBvZiB0aGUgRWNsaXBzZSBQdWJsaWMgTGljZW5zZSB2MS4wCiAgKiB3aGljaCBhY2NvbXBhbmllcyB0aGlzIGRpc3RyaWJ1dGlvbiwgYW5kIGlzIGF2YWlsYWJsZSBhdApAQCAtMTc2LDcgKzE3Niw3IEBACiAJCQkJYnV0dG9uLnNldFRleHQobGFiZWxzW2ldKTsKIAkJCQlidXR0b24uc2V0RGF0YShuZXcgSW50ZWdlcihpKSk7CQkJCiAJCQkJYnV0dG9uLmFkZFNlbGVjdGlvbkxpc3RlbmVyKGxpc3RlbmVyKTsKLQkJCQkobmV3IExhYmVsKGNvbnRyb2wsIFNXVC5XUkFQKSkuc2V0VGV4dChkZXNjW2ldKTsKKwkJCQkobmV3IFRleHQoY29udHJvbCwgU1dULldSQVB8U1dULlJFQURfT05MWSkpLnNldFRleHQoZGVzY1tpXSk7CiAJCQkJaWYgKGkgPT0gMClidXR0b24uc2V0U2VsZWN0aW9uKHRydWUpOwkJCQkKIAkJCX0JCQkKIAkJCXNldENvbnRyb2woY29udHJvbCk7CQkJCkBAIC0yMDgsNyArMjA4LDcgQEAKIAkJCXNldENvbnRyb2woY29udHJvbCk7CiAJCQljb250cm9sLnNldExheW91dChuZXcgR3JpZExheW91dCgyLCBmYWxzZSkpOwogCQkJKG5ldyBMYWJlbChjb250cm9sLCBTV1QuTk9ORSkpLnNldFRleHQoVmFsVUlNZXNzYWdlcy5GckZpbGVFeHRlbnNpb25MYWJlbCk7Ci0JCQlfcGF0dGVybiA9IG5ldyBUZXh0KGNvbnRyb2wsIFNXVC5OT05FKTsKKwkJCV9wYXR0ZXJuID0gbmV3IFRleHQoY29udHJvbCwgU1dULkJPUkRFUik7CiAJCQlfcGF0dGVybi5zZXRGb2N1cygpOwogCQkJX3BhdHRlcm4uYWRkTW9kaWZ5TGlzdGVuZXIobmV3IE1vZGlmeUxpc3RlbmVyKCl7CiAKQEAgLTI2MSw3ICsyNjEsNyBAQAogCQkJc2V0Q29udHJvbChjb250cm9sKTsKIAkJCWNvbnRyb2wuc2V0TGF5b3V0KG5ldyBHcmlkTGF5b3V0KDQsIGZhbHNlKSk7CiAJCQkobmV3IExhYmVsKGNvbnRyb2wsIFNXVC5OT05FKSkuc2V0VGV4dChWYWxVSU1lc3NhZ2VzLkZyRm9sZGVyT3JGaWxlTGFiZWwpOwotCQkJX3BhdHRlcm4gPSBuZXcgVGV4dChjb250cm9sLCBTV1QuTk9ORSk7CisJCQlfcGF0dGVybiA9IG5ldyBUZXh0KGNvbnRyb2wsIFNXVC5CT1JERVIpOwogCQkJX3BhdHRlcm4uc2V0Rm9jdXMoKTsKIAkJCV9wYXR0ZXJuLnNldExheW91dERhdGEobmV3IEdyaWREYXRhKDMwMCwgU1dULkRFRkFVTFQpKTsKIAkJCV9wYXR0ZXJuLmFkZE1vZGlmeUxpc3RlbmVyKG5ldyBNb2RpZnlMaXN0ZW5lcigpewpAQCAtNDY1LDcgKzQ2NSw3IEBACiAJCQlzZXRDb250cm9sKGNvbnRyb2wpOwogCQkJY29udHJvbC5zZXRMYXlvdXQobmV3IEdyaWRMYXlvdXQoMiwgZmFsc2UpKTsKIAkJCShuZXcgTGFiZWwoY29udHJvbCwgU1dULk5PTkUpKS5zZXRUZXh0KFZhbFVJTWVzc2FnZXMuRnJGYWNpdExhYmVsKTsKLQkJCV9wYXR0ZXJuID0gbmV3IFRleHQoY29udHJvbCwgU1dULk5PTkUpOworCQkJX3BhdHRlcm4gPSBuZXcgVGV4dChjb250cm9sLCBTV1QuQk9SREVSKTsKIAkJCV9wYXR0ZXJuLnNldEZvY3VzKCk7CiAJCQlfcGF0dGVybi5zZXRMYXlvdXREYXRhKG5ldyBHcmlkRGF0YSgzMDAsIFNXVC5ERUZBVUxUKSk7CiAJCQlfcGF0dGVybi5hZGRNb2RpZnlMaXN0ZW5lcihuZXcgTW9kaWZ5TGlzdGVuZXIoKXsKZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24udWkvdmYyL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL3VpL2ludGVybmFsL2RpYWxvZy9SZXN1bHRzRGlhbG9nLmphdmEgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLnVpL3ZmMi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi91aS9pbnRlcm5hbC9kaWFsb2cvUmVzdWx0c0RpYWxvZy5qYXZhCmluZGV4IDQ1MjJlZWEuLjM1MzRlYjcgMTAwNjQ0Ci0tLSBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24udWkvdmYyL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL3VpL2ludGVybmFsL2RpYWxvZy9SZXN1bHRzRGlhbG9nLmphdmEKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi51aS92ZjIvb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vdWkvaW50ZXJuYWwvZGlhbG9nL1Jlc3VsdHNEaWFsb2cuamF2YQpAQCAtMjQsMTEgKzI0LDEyIEBACiBpbXBvcnQgb3JnLmVjbGlwc2Uuc3d0LndpZGdldHMuQ29udHJvbDsKIGltcG9ydCBvcmcuZWNsaXBzZS5zd3Qud2lkZ2V0cy5MYWJlbDsKIGltcG9ydCBvcmcuZWNsaXBzZS5zd3Qud2lkZ2V0cy5TaGVsbDsKLWltcG9ydCBvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5WYWxpZGF0aW9uUmVzdWx0OwogaW1wb3J0IG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLmludGVybmFsLk1pc2M7CiBpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uaW50ZXJuYWwuVmFsTWFuYWdlcjsKIGltcG9ydCBvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5pbnRlcm5hbC5WYWxQcmVmTWFuYWdlckdsb2JhbDsKK2ltcG9ydCBvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5pbnRlcm5hbC5WYWxpZGF0aW9uUmVzdWx0U3VtbWFyeTsKIGltcG9ydCBvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5pbnRlcm5hbC5tb2RlbC5HbG9iYWxQcmVmZXJlbmNlczsKK2ltcG9ydCBvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5pbnRlcm5hbC5tb2RlbC5HbG9iYWxQcmVmZXJlbmNlc1ZhbHVlczsKIGltcG9ydCBvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5pbnRlcm5hbC51aS5WYWxpZGF0aW9uVUlNZXNzYWdlczsKIGltcG9ydCBvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi51aS5pbnRlcm5hbC5WYWxVSU1lc3NhZ2VzOwogCkBAIC0zOSw3ICs0MCw3IEBACiAgKi8KIHB1YmxpYyBjbGFzcyBSZXN1bHRzRGlhbG9nIGV4dGVuZHMgSWNvbkFuZE1lc3NhZ2VEaWFsb2cgewogCQotCXByaXZhdGUgVmFsaWRhdGlvblJlc3VsdCAJX3Jlc3VsdDsKKwlwcml2YXRlIFZhbGlkYXRpb25SZXN1bHRTdW1tYXJ5IAlfcmVzdWx0OwogCXByaXZhdGUgbG9uZwkJCQlfdGltZTsKIAlwcml2YXRlIGludAkJCQkJX3Jlc291cmNlQ291bnQ7CiAJcHJpdmF0ZSBCdXR0b24gX2hpZGVCdXR0b247CkBAIC01Miw3ICs1Myw3IEBACiAJICogQHBhcmFtIHRpbWUgdGhlIHRpbWUgdGhhdCB0aGUgdmFsaWRhdGlvbiB0b29rIGluIG1pbGxpc2Vjb25kcwogCSAqIEBwYXJhbSByZXNvdXJjZUNvdW50IHRoZSBudW1iZXIgb2YgcmVzb3VyY2VzIHRoYXQgd2VyZSB2YWxpZGF0ZWQKIAkgKi8KLQlwdWJsaWMgUmVzdWx0c0RpYWxvZyhTaGVsbCBwYXJlbnRTaGVsbCwgVmFsaWRhdGlvblJlc3VsdCByZXN1bHRzLCBsb25nIHRpbWUsIGludCByZXNvdXJjZUNvdW50KSB7CisJcHVibGljIFJlc3VsdHNEaWFsb2coU2hlbGwgcGFyZW50U2hlbGwsIFZhbGlkYXRpb25SZXN1bHRTdW1tYXJ5IHJlc3VsdHMsIGxvbmcgdGltZSwgaW50IHJlc291cmNlQ291bnQpIHsKIAkJc3VwZXIocGFyZW50U2hlbGwpOwogCQlfcmVzdWx0ID0gcmVzdWx0czsKIAkJX3RpbWUgPSB0aW1lOwpAQCAtNjIsOSArNjMsMTIgQEAKIAlAT3ZlcnJpZGUKIAlwcm90ZWN0ZWQgdm9pZCBva1ByZXNzZWQoKSB7CiAJCWlmKF9oaWRlQnV0dG9uIT1udWxsKSB7Ci0JCQlHbG9iYWxQcmVmZXJlbmNlcyBncCA9IFZhbE1hbmFnZXIuZ2V0RGVmYXVsdCgpLmdldEdsb2JhbFByZWZlcmVuY2VzKCk7Ci0JCQlncC5zZXRDb25maXJtRGlhbG9nKCFfaGlkZUJ1dHRvbi5nZXRTZWxlY3Rpb24oKSk7Ci0JCQlWYWxQcmVmTWFuYWdlckdsb2JhbC5nZXREZWZhdWx0KCkuc2F2ZVByZWZlcmVuY2VzKGdwKTsKKwkJCVZhbE1hbmFnZXIgdm0gPSBWYWxNYW5hZ2VyLmdldERlZmF1bHQoKTsKKwkJCUdsb2JhbFByZWZlcmVuY2VzIGdwID0gdm0uZ2V0R2xvYmFsUHJlZmVyZW5jZXMoKTsKKwkJCUdsb2JhbFByZWZlcmVuY2VzVmFsdWVzIGdwdiA9IGdwLmFzVmFsdWVzKCk7CisJCQlncHYuY29uZmlybURpYWxvZyA9ICFfaGlkZUJ1dHRvbi5nZXRTZWxlY3Rpb24oKTsKKwkJCWludCBjaGFuZ2VzID0gdm0ucmVwbGFjZShncHYpOworCQkJaWYgKGNoYW5nZXMgIT0gMClWYWxQcmVmTWFuYWdlckdsb2JhbC5nZXREZWZhdWx0KCkuc2F2ZVByZWZlcmVuY2VzKCk7CiAJCX0KIAkJc3VwZXIub2tQcmVzc2VkKCk7CiAJfQpkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi51aS92ZjIvb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vdWkvaW50ZXJuYWwvcHJlZmVyZW5jZXMvVmFsaWRhdGlvblByZWZlcmVuY2VQYWdlLmphdmEgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLnVpL3ZmMi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi91aS9pbnRlcm5hbC9wcmVmZXJlbmNlcy9WYWxpZGF0aW9uUHJlZmVyZW5jZVBhZ2UuamF2YQppbmRleCAwMDY4YjQ3Li4yZjFkYTI0IDEwMDY0NAotLS0gYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLnVpL3ZmMi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi91aS9pbnRlcm5hbC9wcmVmZXJlbmNlcy9WYWxpZGF0aW9uUHJlZmVyZW5jZVBhZ2UuamF2YQorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLnVpL3ZmMi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi91aS9pbnRlcm5hbC9wcmVmZXJlbmNlcy9WYWxpZGF0aW9uUHJlZmVyZW5jZVBhZ2UuamF2YQpAQCAtMSw3ICsxLDUgQEAKLXBhY2thZ2Ugb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24udWkuaW50ZXJuYWwucHJlZmVyZW5jZXM7Ci0KIC8qKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqCi0gKiBDb3B5cmlnaHQgKGMpIDIwMDEsIDIwMDggSUJNIENvcnBvcmF0aW9uIGFuZCBvdGhlcnMuCisgKiBDb3B5cmlnaHQgKGMpIDIwMDEsIDIwMDkgSUJNIENvcnBvcmF0aW9uIGFuZCBvdGhlcnMuCiAgKiBBbGwgcmlnaHRzIHJlc2VydmVkLiBUaGlzIHByb2dyYW0gYW5kIHRoZSBhY2NvbXBhbnlpbmcgbWF0ZXJpYWxzCiAgKiBhcmUgbWFkZSBhdmFpbGFibGUgdW5kZXIgdGhlIHRlcm1zIG9mIHRoZSBFY2xpcHNlIFB1YmxpYyBMaWNlbnNlIHYxLjAKICAqIHdoaWNoIGFjY29tcGFuaWVzIHRoaXMgZGlzdHJpYnV0aW9uLCBhbmQgaXMgYXZhaWxhYmxlIGF0CkBAIC0xMCwxMyArOCwxMiBAQAogICogQ29udHJpYnV0b3JzOgogICogSUJNIENvcnBvcmF0aW9uIC0gaW5pdGlhbCBBUEkgYW5kIGltcGxlbWVudGF0aW9uCiAgKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKi8KK3BhY2thZ2Ugb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24udWkuaW50ZXJuYWwucHJlZmVyZW5jZXM7CiAKIGltcG9ydCBqYXZhLmxhbmcucmVmbGVjdC5JbnZvY2F0aW9uVGFyZ2V0RXhjZXB0aW9uOwogaW1wb3J0IGphdmEudXRpbC5MaW5rZWRMaXN0OwogaW1wb3J0IGphdmEudXRpbC5MaXN0OwogCi1pbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5ydW50aW1lLkNvcmVFeGNlcHRpb247Ci1pbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5ydW50aW1lLk51bGxQcm9ncmVzc01vbml0b3I7CiBpbXBvcnQgb3JnLmVjbGlwc2UuamZhY2UuZGlhbG9ncy5NZXNzYWdlRGlhbG9nOwogaW1wb3J0IG9yZy5lY2xpcHNlLmpmYWNlLmxheW91dC5HcmlkRGF0YUZhY3Rvcnk7CiBpbXBvcnQgb3JnLmVjbGlwc2UuamZhY2UucHJlZmVyZW5jZS5QcmVmZXJlbmNlUGFnZTsKQEAgLTY1LDggKzYyLDkgQEAKIGltcG9ydCBvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5pbnRlcm5hbC5WYWxNYW5hZ2VyOwogaW1wb3J0IG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLmludGVybmFsLlZhbFByZWZNYW5hZ2VyR2xvYmFsOwogaW1wb3J0IG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLmludGVybmFsLlZhbGlkYXRvck1ldGFEYXRhOworaW1wb3J0IG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLmludGVybmFsLlZhbGlkYXRvck11dGFibGU7CiBpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uaW50ZXJuYWwubW9kZWwuR2xvYmFsUHJlZmVyZW5jZXM7Ci1pbXBvcnQgb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uaW50ZXJuYWwucGx1Z2luLlZhbGlkYXRpb25QbHVnaW47CitpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uaW50ZXJuYWwubW9kZWwuR2xvYmFsUHJlZmVyZW5jZXNWYWx1ZXM7CiBpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uaW50ZXJuYWwudWkuRGVsZWdhdGluZ1ZhbGlkYXRvclByZWZlcmVuY2VzRGlhbG9nOwogaW1wb3J0IG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLmludGVybmFsLnVpLnBsdWdpbi5WYWxpZGF0aW9uVUlQbHVnaW47CiBpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24udWkuaW50ZXJuYWwuSGVscENvbnRleHRJZHM7CkBAIC04NywyMiArODUsMTcgQEAKIAlwcml2YXRlIFNoZWxsIF9zaGVsbDsKIAogCXB1YmxpYyBpbnRlcmZhY2UgSVZhbGlkYXRpb25QYWdlIHsKKwkJCiAJCUNvbXBvc2l0ZSBjcmVhdGVQYWdlKENvbXBvc2l0ZSBwYXJlbnQpIHRocm93cyBJbnZvY2F0aW9uVGFyZ2V0RXhjZXB0aW9uOwotCiAJCWJvb2xlYW4gcGVyZm9ybU9rKCkgdGhyb3dzIEludm9jYXRpb25UYXJnZXRFeGNlcHRpb247Ci0KIAkJYm9vbGVhbiBwZXJmb3JtRGVmYXVsdHMoKSB0aHJvd3MgSW52b2NhdGlvblRhcmdldEV4Y2VwdGlvbjsKLQogCQlDb21wb3NpdGUgZ2V0Q29udHJvbCgpOwotCiAJCXZvaWQgZGlzcG9zZSgpOwotCiAJCXZvaWQgbG9zZUZvY3VzKCk7Ci0KIAkJdm9pZCBnYWluRm9jdXMoKTsKIAl9CiAKLQlwdWJsaWMgY2xhc3MgSW52YWxpZFBhZ2UgaW1wbGVtZW50cyBJVmFsaWRhdGlvblBhZ2UgeworCXB1YmxpYyBmaW5hbCBjbGFzcyBJbnZhbGlkUGFnZSBpbXBsZW1lbnRzIElWYWxpZGF0aW9uUGFnZSB7CiAJCXByaXZhdGUgQ29tcG9zaXRlIHBhZ2UgPSBudWxsOwogCiAJCXByaXZhdGUgQ29tcG9zaXRlIGNvbXBvc2l0ZSA9IG51bGw7CkBAIC0xNzEsNyArMTY0LDcgQEAKIAkJfQogCX0KIAotCXByaXZhdGUgY2xhc3MgVmFsaWRhdG9yTGlzdFBhZ2UgaW1wbGVtZW50cyBJVmFsaWRhdGlvblBhZ2UgeworCXByaXZhdGUgZmluYWwgY2xhc3MgVmFsaWRhdG9yTGlzdFBhZ2UgaW1wbGVtZW50cyBJVmFsaWRhdGlvblBhZ2UgewogCQlwcml2YXRlIENvbXBvc2l0ZSBfcGFnZTsKIAkJcHJpdmF0ZSBUYWJsZVZpZXdlciBfdmFsaWRhdG9yTGlzdDsKIAkJcHJpdmF0ZSBCdXR0b24gX2VuYWJsZUFsbEJ1dHRvbjsKQEAgLTE4Miw5ICsxNzUsOSBAQAogCQlwcml2YXRlIEJ1dHRvbiBfY29uZmlybUJ1dHRvbjsKIAkJcHJpdmF0ZSBMYWJlbCBfbGlzdExhYmVsOwogCQlwcml2YXRlIFRhYmxlIF92YWxpZGF0b3JzVGFibGU7Ci0JCXByaXZhdGUgR2xvYmFsUHJlZmVyZW5jZXMgCV9nbG9iYWxQcmVmZXJlbmNlcyA9IFZhbE1hbmFnZXIuZ2V0RGVmYXVsdCgpLmdldEdsb2JhbFByZWZlcmVuY2VzKCk7CisJCXByaXZhdGUgR2xvYmFsUHJlZmVyZW5jZXNWYWx1ZXMgCV9nbG9iYWxQcmVmZXJlbmNlcyA9IFZhbE1hbmFnZXIuZ2V0RGVmYXVsdCgpLmdldEdsb2JhbFByZWZlcmVuY2VzKCkuYXNWYWx1ZXMoKTsKIAkJcHJpdmF0ZSBHbG9iYWxDb25maWd1cmF0aW9uIF9nbG9iYWxDb25maWc7Ci0JCXByaXZhdGUgVmFsaWRhdG9yW10gX3ZhbGlkYXRvcnM7CisJCXByaXZhdGUgVmFsaWRhdG9yTXV0YWJsZVtdIF92YWxpZGF0b3JzOwogCQkKIAkJcHJpdmF0ZSBpbnQgX2NoYW5nZUNvdW50OwogCkBAIC0xOTcsOCArMTkwLDggQEAKIAkJCX0KIAogCQkJcHVibGljIE9iamVjdFtdIGdldEVsZW1lbnRzKE9iamVjdCBpbnB1dEVsZW1lbnQpIHsKLQkJCQlpZiAoaW5wdXRFbGVtZW50IGluc3RhbmNlb2YgVmFsaWRhdG9yW10pIHsKLQkJCQkJcmV0dXJuIChWYWxpZGF0b3JbXSkgaW5wdXRFbGVtZW50OworCQkJCWlmIChpbnB1dEVsZW1lbnQgaW5zdGFuY2VvZiBWYWxpZGF0b3JNdXRhYmxlW10pIHsKKwkJCQkJcmV0dXJuIChWYWxpZGF0b3JNdXRhYmxlW10pIGlucHV0RWxlbWVudDsKIAkJCQl9CiAJCQkJcmV0dXJuIG5ldyBPYmplY3RbMF07CiAJCQl9CkBAIC0yMTQsOCArMjA3LDggQEAKIAkJcHVibGljIGNsYXNzIFZhbGlkYXRpb25MYWJlbFByb3ZpZGVyIGV4dGVuZHMgTGFiZWxQcm92aWRlciBpbXBsZW1lbnRzIElUYWJsZUxhYmVsUHJvdmlkZXIgewogCQkJcHVibGljIFN0cmluZyBnZXRUZXh0KE9iamVjdCBlbGVtZW50KSB7CiAJCQkJaWYgKGVsZW1lbnQgPT0gbnVsbClyZXR1cm4gIiI7IC8vJE5PTi1OTFMtMSQKLQkJCQllbHNlIGlmIChlbGVtZW50IGluc3RhbmNlb2YgVmFsaWRhdG9yKQotCQkJCQlyZXR1cm4gKChWYWxpZGF0b3IpIGVsZW1lbnQpLmdldE5hbWUoKTsKKwkJCQllbHNlIGlmIChlbGVtZW50IGluc3RhbmNlb2YgVmFsaWRhdG9yTXV0YWJsZSkKKwkJCQkJcmV0dXJuICgoVmFsaWRhdG9yTXV0YWJsZSkgZWxlbWVudCkuZ2V0TmFtZSgpOwogCQkJCWVsc2UKIAkJCQkJcmV0dXJuIHN1cGVyLmdldFRleHQoZWxlbWVudCk7CiAJCQl9CkBAIC0yMjgsNyArMjIxLDcgQEAKIAkJCX0KIAogCQkJcHVibGljIEltYWdlIGdldENvbHVtbkltYWdlKE9iamVjdCBlbGVtZW50LCBpbnQgY29sdW1uSW5kZXgpIHsKLQkJCQlWYWxpZGF0b3IgdiA9IChWYWxpZGF0b3IpIGVsZW1lbnQ7CisJCQkJVmFsaWRhdG9yTXV0YWJsZSB2ID0gKFZhbGlkYXRvck11dGFibGUpIGVsZW1lbnQ7CiAJCQkJaWYgKGNvbHVtbkluZGV4ID09IDEpIHsKIAkJCQkJcmV0dXJuIGdldEltYWdlKHYuaXNNYW51YWxWYWxpZGF0aW9uKCkgPyBJbWFnZU5hbWVzLm9rVGFibGUgOiBJbWFnZU5hbWVzLmZhaWxUYWJsZSk7CiAJCQkJfSBlbHNlIGlmIChjb2x1bW5JbmRleCA9PSAyKSB7CkBAIC0yNDIsNyArMjM1LDcgQEAKIAkJCX0KIAogCQkJcHVibGljIFN0cmluZyBnZXRDb2x1bW5UZXh0KE9iamVjdCBlbGVtZW50LCBpbnQgY29sdW1uSW5kZXgpIHsKLQkJCQlpZiAoY29sdW1uSW5kZXggPT0gMClyZXR1cm4gKChWYWxpZGF0b3IpIGVsZW1lbnQpLmdldE5hbWUoKTsKKwkJCQlpZiAoY29sdW1uSW5kZXggPT0gMClyZXR1cm4gKChWYWxpZGF0b3JNdXRhYmxlKSBlbGVtZW50KS5nZXROYW1lKCk7CiAJCQkJcmV0dXJuIG51bGw7CiAJCQl9CiAJCX0KQEAgLTI3NiwxMCArMjY5LDE3IEBACiAJCQlzZXR0aW5nc0NvbHVtbi5zZXRUZXh0KFZhbFVJTWVzc2FnZXMuU0VUVElOR1MpOwogCQkJc2V0dGluZ3NDb2x1bW4ucGFjaygpOwogCQl9CisJCQorCQlwcml2YXRlIFZhbGlkYXRvck11dGFibGVbXSBnZXREZWZhdWx0VmFsaWRhdG9ycygpeworCQkJVmFsaWRhdG9yW10gdmFscyA9IFZhbE1hbmFnZXIuZ2V0RGVmYXVsdCgpLmdldFZhbGlkYXRvcnMoKTsKKwkJCVZhbGlkYXRvck11dGFibGVbXSB2bXMgPSBuZXcgVmFsaWRhdG9yTXV0YWJsZVt2YWxzLmxlbmd0aF07CisJCQlmb3IgKGludCBpPTA7IGk8dmFscy5sZW5ndGg7IGkrKyl2bXNbaV0gPSBuZXcgVmFsaWRhdG9yTXV0YWJsZSh2YWxzW2ldKTsKKwkJCXJldHVybiB2bXM7CisJCX0KIAogCQlwdWJsaWMgQ29tcG9zaXRlIGNyZWF0ZVBhZ2UoQ29tcG9zaXRlIHBhcmVudCkgdGhyb3dzIEludm9jYXRpb25UYXJnZXRFeGNlcHRpb24gewogCQkJX2dsb2JhbENvbmZpZyA9IG5ldyBHbG9iYWxDb25maWd1cmF0aW9uKENvbmZpZ3VyYXRpb25NYW5hZ2VyLmdldE1hbmFnZXIoKS5nZXRHbG9iYWxDb25maWd1cmF0aW9uKCkpOwotCQkJX3ZhbGlkYXRvcnMgPSBjb3B5VmFsaWRhdG9ycyhWYWxNYW5hZ2VyLmdldERlZmF1bHQoKS5nZXRWYWxpZGF0b3JzKCkpOworCQkJX3ZhbGlkYXRvcnMgPSBnZXREZWZhdWx0VmFsaWRhdG9ycygpOwogCQkJCiAJCQlDb21wb3NpdGUgdmFsaWRhdG9yR3JvdXAgPSBuZXcgQ29tcG9zaXRlKHBhcmVudCwgU1dULk5PTkUpOwogCkBAIC0zNjEsMTIgKzM2MSw2IEBACiAKIAkJCWFkZEVuYWJsZURpc2FibGUodmFsaWRhdG9yR3JvdXApOwogCi0JCQkvLyBIYXZlIHRvIHNldCB0aGUgdGFiIG9yZGVyIG9yIG9ubHkgdGhlIGZpcnN0IGNoZWNrYm94IGluIGEKLQkJCS8vIENvbXBvc2l0ZSBjYW4gYmUgdGFiYmVkIHRvLiAoU2VlbXMgdG8gYXBwbHkgb25seSB0byBjaGVja2JveGVzLiBIYXZlIHRvIHVzZSB0aGUKLQkJCS8vIGFycm93IGtleSB0byBuYXZpZ2F0ZSB0aGUgY2hlY2tib3hlcy4pCi0JCQl2YWxpZGF0b3JHcm91cC5zZXRUYWJMaXN0KG5ldyBDb250cm9sW10geyBfc3VzcGVuZCwgX2F1dG9TYXZlLAotCQkJCV92YWxpZGF0b3JzVGFibGUsIF9lbmFibGVBbGxCdXR0b24sIF9kaXNhYmxlQWxsQnV0dG9uIH0pOwotCiAJCQl1cGRhdGVXaWRnZXRzKCk7CiAKIAkJCWFwcGx5RGlhbG9nRm9udCh2YWxpZGF0b3JHcm91cCk7CkBAIC00MDQsMTUgKzM5OCw2IEBACiAJCQl9KTsKIAkJfQogCQkKLQkJLyoqCi0JCSAqIE1ha2UgYSBjb3B5IG9mIHRoZSBjdXJyZW50IHZhbGlkYXRvcnMgYW5kIHN0b3JlIHRoZSByZXN1bHRzLgotCQkgKi8KLQkJcHJpdmF0ZSBWYWxpZGF0b3JbXSBjb3B5VmFsaWRhdG9ycyhWYWxpZGF0b3JbXSB2YWxzKXsKLQkJCVZhbGlkYXRvcltdIGNvcHkgPSBuZXcgVmFsaWRhdG9yW3ZhbHMubGVuZ3RoXTsKLQkJCWZvciAoaW50IGk9MDsgaTx2YWxzLmxlbmd0aDsgaSsrKWNvcHlbaV0gPSB2YWxzW2ldLmNvcHkoKTsKLQkJCXJldHVybiBjb3B5OwotCQl9Ci0KIAkJcHJpdmF0ZSB2b2lkIGFkZENvbmZpcm0oQ29tcG9zaXRlIHZhbGlkYXRvckdyb3VwKSB7CiAJCQlHcmlkRGF0YSBnZDsKIAkJCWdkID0gbmV3IEdyaWREYXRhKEdyaWREYXRhLkZJTExfSE9SSVpPTlRBTCk7CkBAIC00MjAsMTEgKzQwNSwxMSBAQAogCQkJX2NvbmZpcm1CdXR0b24gPSBuZXcgQnV0dG9uKHZhbGlkYXRvckdyb3VwLCBTV1QuQ0hFQ0spOwogCQkJX2NvbmZpcm1CdXR0b24uc2V0TGF5b3V0RGF0YShnZCk7CiAJCQlfY29uZmlybUJ1dHRvbi5zZXRUZXh0KFZhbFVJTWVzc2FnZXMuUHJlZlBhZ2VDb25maXJtRGlhbG9nKTsKLQkJCV9jb25maXJtQnV0dG9uLnNldFNlbGVjdGlvbihfZ2xvYmFsUHJlZmVyZW5jZXMuZ2V0Q29uZmlybURpYWxvZygpKTsKKwkJCV9jb25maXJtQnV0dG9uLnNldFNlbGVjdGlvbihfZ2xvYmFsUHJlZmVyZW5jZXMuY29uZmlybURpYWxvZyk7CiAJCQlfY29uZmlybUJ1dHRvbi5hZGRTZWxlY3Rpb25MaXN0ZW5lcihuZXcgU2VsZWN0aW9uQWRhcHRlcigpIHsKIAkJCQlwdWJsaWMgdm9pZCB3aWRnZXRTZWxlY3RlZChTZWxlY3Rpb25FdmVudCBlKSB7CiAJCQkJCS8vIGRvIG5vdCBpbmNyZW1lbnQgdGhlIF9jaGFuZ2VDb3VudCBhcyB0aGlzIGJ5IGl0c2VsZiBzaG91bGQgbm90IHRyaWdnZXIgYSBidWlsZCBwcm9tcHQKLQkJCQkJX2dsb2JhbFByZWZlcmVuY2VzLnNldENvbmZpcm1EaWFsb2coX2NvbmZpcm1CdXR0b24uZ2V0U2VsZWN0aW9uKCkpOworCQkJCQlfZ2xvYmFsUHJlZmVyZW5jZXMuY29uZmlybURpYWxvZyA9IF9jb25maXJtQnV0dG9uLmdldFNlbGVjdGlvbigpOwogCQkJCQlfY29uZmlybUJ1dHRvbi5zZXRGb2N1cygpOwogCQkJCX0KIAkJCX0pOwpAQCAtNDM3LDExICs0MjIsMTEgQEAKIAkJCV9hdXRvU2F2ZSA9IG5ldyBCdXR0b24odmFsaWRhdG9yR3JvdXAsIFNXVC5DSEVDSyk7CiAJCQlfYXV0b1NhdmUuc2V0TGF5b3V0RGF0YShnZCk7CiAJCQlfYXV0b1NhdmUuc2V0VGV4dChWYWxVSU1lc3NhZ2VzLlByZWZQYWdlX2Fsd2F5c19zYXZlKTsKLQkJCV9hdXRvU2F2ZS5zZXRTZWxlY3Rpb24oX2dsb2JhbFByZWZlcmVuY2VzLmdldFNhdmVBdXRvbWF0aWNhbGx5KCkpOworCQkJX2F1dG9TYXZlLnNldFNlbGVjdGlvbihfZ2xvYmFsUHJlZmVyZW5jZXMuc2F2ZUF1dG9tYXRpY2FsbHkpOwogCQkJX2F1dG9TYXZlLmFkZFNlbGVjdGlvbkxpc3RlbmVyKG5ldyBTZWxlY3Rpb25BZGFwdGVyKCkgewogCQkJCXB1YmxpYyB2b2lkIHdpZGdldFNlbGVjdGVkKFNlbGVjdGlvbkV2ZW50IGUpIHsKIAkJCQkJLy8gZG8gbm90IGluY3JlbWVudCB0aGUgX2NoYW5nZUNvdW50IGFzIHRoaXMgYnkgaXRzZWxmIHNob3VsZCBub3QgdHJpZ2dlciBhIGJ1aWxkIHByb21wdAotCQkJCQlfZ2xvYmFsUHJlZmVyZW5jZXMuc2V0U2F2ZUF1dG9tYXRpY2FsbHkoX2F1dG9TYXZlLmdldFNlbGVjdGlvbigpKTsKKwkJCQkJX2dsb2JhbFByZWZlcmVuY2VzLnNhdmVBdXRvbWF0aWNhbGx5ID0gX2F1dG9TYXZlLmdldFNlbGVjdGlvbigpOwogCQkJCQlfYXV0b1NhdmUuc2V0Rm9jdXMoKTsKIAkJCQl9CiAJCQl9KTsKQEAgLTQ1NSwxMCArNDQwLDkgQEAKIAkJCV9zdXNwZW5kID0gbmV3IEJ1dHRvbih2YWxpZGF0b3JHcm91cCwgU1dULkNIRUNLKTsKIAkJCV9zdXNwZW5kLnNldExheW91dERhdGEoZ2QpOwogCQkJX3N1c3BlbmQuc2V0VGV4dChWYWxVSU1lc3NhZ2VzLkRJU0FCTEVfVkFMSURBVElPTik7Ci0JCQlfc3VzcGVuZC5zZXRTZWxlY3Rpb24oX2dsb2JhbFByZWZlcmVuY2VzLmdldERpc2FibGVBbGxWYWxpZGF0aW9uKCkpOworCQkJX3N1c3BlbmQuc2V0U2VsZWN0aW9uKF9nbG9iYWxQcmVmZXJlbmNlcy5kaXNhYmxlQWxsVmFsaWRhdGlvbik7CiAJCQlfc3VzcGVuZC5hZGRTZWxlY3Rpb25MaXN0ZW5lcihuZXcgU2VsZWN0aW9uQWRhcHRlcigpIHsKIAkJCQlwdWJsaWMgdm9pZCB3aWRnZXRTZWxlY3RlZChTZWxlY3Rpb25FdmVudCBlKSB7Ci0JCQkJCV9jaGFuZ2VDb3VudCsrOwogCQkJCQlfc3VzcGVuZC5zZXRGb2N1cygpOwogCQkJCQlfdmFsaWRhdG9yc1RhYmxlLnNldEVuYWJsZWQoIV9zdXNwZW5kLmdldFNlbGVjdGlvbigpKTsKIAkJCQkJX2VuYWJsZUFsbEJ1dHRvbi5zZXRFbmFibGVkKCFfc3VzcGVuZC5nZXRTZWxlY3Rpb24oKSk7CkBAIC00NzYsMTEgKzQ2MCwxMCBAQAogCQkJX292ZXJyaWRlLnNldExheW91dERhdGEoZ2QpOwogCQkJX292ZXJyaWRlLnNldFRleHQoVmFsVUlNZXNzYWdlcy5QUkVGX0JVVFRPTl9PVkVSUklERSk7CiAJCQlfb3ZlcnJpZGUuc2V0RW5hYmxlZCh0cnVlKTsKLQkJCV9vdmVycmlkZS5zZXRTZWxlY3Rpb24oX2dsb2JhbFByZWZlcmVuY2VzLmdldE92ZXJyaWRlKCkpOworCQkJX292ZXJyaWRlLnNldFNlbGVjdGlvbihfZ2xvYmFsUHJlZmVyZW5jZXMub3ZlcnJpZGUpOwogCQkJX292ZXJyaWRlLmFkZFNlbGVjdGlvbkxpc3RlbmVyKG5ldyBTZWxlY3Rpb25BZGFwdGVyKCkgewogCQkJCXB1YmxpYyB2b2lkIHdpZGdldFNlbGVjdGVkKFNlbGVjdGlvbkV2ZW50IGUpIHsKLQkJCQkJX2NoYW5nZUNvdW50Kys7Ci0JCQkJCV9nbG9iYWxQcmVmZXJlbmNlcy5zZXRPdmVycmlkZShfb3ZlcnJpZGUuZ2V0U2VsZWN0aW9uKCkpOworCQkJCQlfZ2xvYmFsUHJlZmVyZW5jZXMub3ZlcnJpZGUgPSBfb3ZlcnJpZGUuZ2V0U2VsZWN0aW9uKCk7CiAJCQkJCV9vdmVycmlkZS5zZXRGb2N1cygpOwogCQkJCQkKIAkJCQl9CkBAIC01MTEsNyArNDk0LDcgQEAKIAkJCW1lbnUuYWRkTWVudUxpc3RlbmVyKG5ldyBNZW51QWRhcHRlcigpIHsKIAkJCQlwdWJsaWMgdm9pZCBtZW51U2hvd24oTWVudUV2ZW50IGUpIHsKIAkJCQkJSVN0cnVjdHVyZWRTZWxlY3Rpb24gc2VsZWN0aW9uID0gKElTdHJ1Y3R1cmVkU2VsZWN0aW9uKSBfdmFsaWRhdG9yTGlzdC5nZXRTZWxlY3Rpb24oKTsKLQkJCQkJVmFsaWRhdG9yIHZ3ID0gKFZhbGlkYXRvcikgc2VsZWN0aW9uLmdldEZpcnN0RWxlbWVudCgpOworCQkJCQlWYWxpZGF0b3JNdXRhYmxlIHZ3ID0gKFZhbGlkYXRvck11dGFibGUpIHNlbGVjdGlvbi5nZXRGaXJzdEVsZW1lbnQoKTsKIAkJCQkJbWFudWFsSXRlbS5zZXRTZWxlY3Rpb24odncuaXNNYW51YWxWYWxpZGF0aW9uKCkpOwogCQkJCQlidWlsZEl0ZW0uc2V0U2VsZWN0aW9uKHZ3LmlzQnVpbGRWYWxpZGF0aW9uKCkpOwogCQkJCQlzZXR0aW5nc0l0ZW0uc2V0RW5hYmxlZChoYXNTZXR0aW5ncyh2dykpOwpAQCAtNTIzLDcgKzUwNiw3IEBACiAKIAkJcHJvdGVjdGVkIHZvaWQgY29sdW1uQ2xpY2tlZChpbnQgY29sdW1uVG9FZGl0KSB7CiAJCQlJU3RydWN0dXJlZFNlbGVjdGlvbiBzZWxlY3Rpb24gPSAoSVN0cnVjdHVyZWRTZWxlY3Rpb24pIF92YWxpZGF0b3JMaXN0LmdldFNlbGVjdGlvbigpOwotCQkJVmFsaWRhdG9yIHZhbCA9IChWYWxpZGF0b3IpIHNlbGVjdGlvbi5nZXRGaXJzdEVsZW1lbnQoKTsKKwkJCVZhbGlkYXRvck11dGFibGUgdmFsID0gKFZhbGlkYXRvck11dGFibGUpIHNlbGVjdGlvbi5nZXRGaXJzdEVsZW1lbnQoKTsKIAogCQkJc3dpdGNoIChjb2x1bW5Ub0VkaXQpIHsKIAkJCWNhc2UgMToKQEAgLTUzNSwxMiArNTE4LDE0IEBACiAJCQkJdmFsLnNldEJ1aWxkVmFsaWRhdGlvbighdmFsLmlzQnVpbGRWYWxpZGF0aW9uKCkpOwogCQkJCWJyZWFrOwogCQkJY2FzZSAzOgotCQkJCVZhbGlkYXRvci5WMiB2MiA9IHZhbC5hc1YyVmFsaWRhdG9yKCk7Ci0JCQkJaWYgKHYyICE9IG51bGwpewotCQkJCQlGaWx0ZXJEaWFsb2cgZmQgPSBuZXcgRmlsdGVyRGlhbG9nKF9zaGVsbCwgdmFsLCBudWxsKTsKKwkJCQlpZiAodmFsLmlzVjJWYWxpZGF0b3IoKSl7CisJCQkJCVZhbGlkYXRvck11dGFibGUgbmV3VmFsID0gbmV3IFZhbGlkYXRvck11dGFibGUodmFsKTsKKwkJCQkJRmlsdGVyRGlhbG9nIGZkID0gbmV3IEZpbHRlckRpYWxvZyhfc2hlbGwsIG5ld1ZhbCwgbnVsbCk7CiAJCQkJCWlmIChXaW5kb3cuT0sgPT0gZmQub3BlbigpKXsKIAkJCQkJCV9jaGFuZ2VDb3VudCsrOwotCQkJCQkJdmFsLmJlY29tZShmZC5nZXRWYWxpZGF0b3IoKSk7CisJCQkJCQluZXdWYWwgPSBmZC5nZXRWYWxpZGF0b3IoKTsKKwkJCQkJCWludCBpID0gZmluZGl0KHZhbCk7CisJCQkJCQlpZiAoaSAhPSAtMSlfdmFsaWRhdG9yc1tpXSA9IG5ld1ZhbDsKIAkJCQkJfQogCQkJCX0KIAkJCQllbHNlIHsKQEAgLTU1NCwxMSArNTM5LDE1IEBACiAJCQlfdmFsaWRhdG9yTGlzdC5yZWZyZXNoKCk7CiAJCX0KIAotCQlwcml2YXRlIHZvaWQgaGFuZGxlT2xkRGVsZWdhdGUoVmFsaWRhdG9yIHZhbCkgewotCQkJVmFsaWRhdG9yLlYxIHYxID0gdmFsLmFzVjFWYWxpZGF0b3IoKTsKLQkJCWlmICh2MSA9PSBudWxsKXJldHVybjsKKwkJcHJpdmF0ZSBpbnQgZmluZGl0KFZhbGlkYXRvck11dGFibGUgdmFsKSB7CisJCQlmb3IgKGludCBpPTA7IGk8X3ZhbGlkYXRvcnMubGVuZ3RoOyBpKyspaWYgKF92YWxpZGF0b3JzW2ldID09IHZhbClyZXR1cm4gaTsKKwkJCXJldHVybiAtMTsKKwkJfQorCisJCXByaXZhdGUgdm9pZCBoYW5kbGVPbGREZWxlZ2F0ZShWYWxpZGF0b3JNdXRhYmxlIHZhbCkgeworCQkJaWYgKCF2YWwuaXNWMVZhbGlkYXRvcigpKXJldHVybjsKIAkJCQotCQkJVmFsaWRhdG9yTWV0YURhdGEgdm1kID0gdjEuZ2V0Vm1kKCk7CisJCQlWYWxpZGF0b3JNZXRhRGF0YSB2bWQgPSB2YWwuZ2V0Vm1kKCk7CiAJCSAgICBpZiAoIXZtZC5pc0RlbGVnYXRpbmcoKSlyZXR1cm47CiAJCSAgICAKIAkJICAgIFN0cmluZyBkZWxlZ2F0ZUlEID0gX2dsb2JhbENvbmZpZy5nZXREZWxlZ2F0ZVVuaXF1ZU5hbWUodm1kKTsKQEAgLTU4MSw4ICs1NzAsOCBAQAogCQkgKiBAcGFyYW0gdgogCQkgKiBAcmV0dXJuIHRydWUgaWYgaXQgZG9lcwogCQkgKi8KLQkJYm9vbGVhbiBoYXNTZXR0aW5ncyhWYWxpZGF0b3Igdil7Ci0JCQlpZiAodi5hc1YyVmFsaWRhdG9yKCkgIT0gbnVsbClyZXR1cm4gdHJ1ZTsKKwkJYm9vbGVhbiBoYXNTZXR0aW5ncyhWYWxpZGF0b3JNdXRhYmxlIHYpeworCQkJaWYgKHYuaXNWMlZhbGlkYXRvcigpKXJldHVybiB0cnVlOwogCQkJaWYgKHYuZ2V0RGVsZWdhdGluZ0lkKCkgIT0gbnVsbClyZXR1cm4gdHJ1ZTsKIAkJCXJldHVybiBmYWxzZTsKIAkJfQpAQCAtNTk3LDEwICs1ODYsMTAgQEAKIAkJfQogCiAJCXByaXZhdGUgdm9pZCB1cGRhdGVBbGxXaWRnZXRzKCkgdGhyb3dzIEludm9jYXRpb25UYXJnZXRFeGNlcHRpb24gewotCQkJX3N1c3BlbmQuc2V0U2VsZWN0aW9uKF9nbG9iYWxQcmVmZXJlbmNlcy5nZXREaXNhYmxlQWxsVmFsaWRhdGlvbigpKTsKLQkJCV9hdXRvU2F2ZS5zZXRTZWxlY3Rpb24oX2dsb2JhbFByZWZlcmVuY2VzLmdldFNhdmVBdXRvbWF0aWNhbGx5KCkpOwotCQkJX2NvbmZpcm1CdXR0b24uc2V0U2VsZWN0aW9uKF9nbG9iYWxQcmVmZXJlbmNlcy5nZXRDb25maXJtRGlhbG9nKCkpOwotCQkJX292ZXJyaWRlLnNldFNlbGVjdGlvbihfZ2xvYmFsUHJlZmVyZW5jZXMuZ2V0T3ZlcnJpZGUoKSk7CisJCQlfc3VzcGVuZC5zZXRTZWxlY3Rpb24oX2dsb2JhbFByZWZlcmVuY2VzLmRpc2FibGVBbGxWYWxpZGF0aW9uKTsKKwkJCV9hdXRvU2F2ZS5zZXRTZWxlY3Rpb24oX2dsb2JhbFByZWZlcmVuY2VzLnNhdmVBdXRvbWF0aWNhbGx5KTsKKwkJCV9jb25maXJtQnV0dG9uLnNldFNlbGVjdGlvbihfZ2xvYmFsUHJlZmVyZW5jZXMuY29uZmlybURpYWxvZyk7CisJCQlfb3ZlcnJpZGUuc2V0U2VsZWN0aW9uKF9nbG9iYWxQcmVmZXJlbmNlcy5vdmVycmlkZSk7CiAJCQlfdmFsaWRhdG9yc1RhYmxlLnNldEVuYWJsZWQoIV9zdXNwZW5kLmdldFNlbGVjdGlvbigpKTsKIAkJCV9lbmFibGVBbGxCdXR0b24uc2V0RW5hYmxlZCghX3N1c3BlbmQuZ2V0U2VsZWN0aW9uKCkpOwogCQkJX2Rpc2FibGVBbGxCdXR0b24uc2V0RW5hYmxlZCghX3N1c3BlbmQuZ2V0U2VsZWN0aW9uKCkpOwpAQCAtNjA5LDIyICs1OTgsMjEgQEAKIAkJfQogCiAJCXB1YmxpYyBib29sZWFuIHBlcmZvcm1PaygpIHRocm93cyBJbnZvY2F0aW9uVGFyZ2V0RXhjZXB0aW9uIHsKLQkJCV9nbG9iYWxQcmVmZXJlbmNlcy5zZXREaXNhYmxlQWxsVmFsaWRhdGlvbihfc3VzcGVuZC5nZXRTZWxlY3Rpb24oKSk7Ci0JCQlfZ2xvYmFsUHJlZmVyZW5jZXMuc2V0U2F2ZUF1dG9tYXRpY2FsbHkoX2F1dG9TYXZlLmdldFNlbGVjdGlvbigpKTsKKwkJCV9nbG9iYWxQcmVmZXJlbmNlcy5kaXNhYmxlQWxsVmFsaWRhdGlvbiA9IF9zdXNwZW5kLmdldFNlbGVjdGlvbigpOworCQkJX2dsb2JhbFByZWZlcmVuY2VzLnNhdmVBdXRvbWF0aWNhbGx5ID0gX2F1dG9TYXZlLmdldFNlbGVjdGlvbigpOworCQkJVmFsTWFuYWdlciB2bSA9IFZhbE1hbmFnZXIuZ2V0RGVmYXVsdCgpOworCQkJaW50IGNoYW5nZXMgPSB2bS5yZXBsYWNlKF9nbG9iYWxQcmVmZXJlbmNlcyk7CisJCQlpZiAoKGNoYW5nZXMgJiBHbG9iYWxQcmVmZXJlbmNlcy5CdWlsZENoYW5nZU1hc2spICE9IDApX2NoYW5nZUNvdW50Kys7CisJCQkKIAkJCVZhbFByZWZNYW5hZ2VyR2xvYmFsIHZwbSA9IFZhbFByZWZNYW5hZ2VyR2xvYmFsLmdldERlZmF1bHQoKTsKLQkJCXZwbS5zYXZlUHJlZmVyZW5jZXMoX2dsb2JhbFByZWZlcmVuY2VzLCBfdmFsaWRhdG9ycyk7CisJCQl2cG0uc2F2ZVByZWZlcmVuY2VzKHZtLmdldEdsb2JhbFByZWZlcmVuY2VzKCksIF92YWxpZGF0b3JzLCBudWxsKTsKIAkJCXNhdmVWMVByZWZlcmVuY2VzKCk7CiAJCQkKIAkJCWlmIChfY2hhbmdlQ291bnQgPiAwICYmIAogCQkJCU1lc3NhZ2VEaWFsb2cub3BlblF1ZXN0aW9uKF9zaGVsbCwgVmFsVUlNZXNzYWdlcy5SZWJ1aWxkVGl0bGUsIFZhbFVJTWVzc2FnZXMuUmVidWlsZE1zZykpewogCQkJCQogCQkJCUZ1bGxCdWlsZEpvYiBmYmogPSBuZXcgRnVsbEJ1aWxkSm9iKCk7Ci0JCQkJdHJ5IHsKLQkJCQkJZmJqLnJ1bkluV29ya3NwYWNlKG5ldyBOdWxsUHJvZ3Jlc3NNb25pdG9yKCkpOwotCQkJCX0KLQkJCQljYXRjaCAoQ29yZUV4Y2VwdGlvbiBlKXsKLQkJCQkJVmFsaWRhdGlvblBsdWdpbi5nZXRQbHVnaW4oKS5oYW5kbGVFeGNlcHRpb24oZSk7Ci0JCQkJfQorCQkJCWZiai5zY2hlZHVsZSgpOwogCQkJfQogCQkJcmV0dXJuIHRydWU7CiAJCX0KQEAgLTYzNSwxMSArNjIzLDcgQEAKIAkJcHJpdmF0ZSB2b2lkIHNhdmVWMVByZWZlcmVuY2VzKCl7CiAJCQl0cnkgewogCQkJCUdsb2JhbENvbmZpZ3VyYXRpb24gZ2MgPSBDb25maWd1cmF0aW9uTWFuYWdlci5nZXRNYW5hZ2VyKCkuZ2V0R2xvYmFsQ29uZmlndXJhdGlvbigpOwotCS8vCQkJZ2Muc2V0Q2FuUHJvamVjdHNPdmVycmlkZShvdmVycmlkZUJ1dHRvbi5nZXRTZWxlY3Rpb24oKSk7Ci0JCQkJCi0JCQkJaWYgKF9nbG9iYWxQcmVmZXJlbmNlcy5nZXREaXNhYmxlQWxsVmFsaWRhdGlvbigpKWdjLnNldERpc2FibGVBbGxWYWxpZGF0aW9uKHRydWUpOwotCQkJCS8vcGFnZVByZWZlcmVuY2VzLnNldEVuYWJsZWRWYWxpZGF0b3JzKGdldEVuYWJsZWRWYWxpZGF0b3JzKCkpOwotCQkJCQorCQkJCWdjLnNldERpc2FibGVBbGxWYWxpZGF0aW9uKF9nbG9iYWxQcmVmZXJlbmNlcy5kaXNhYmxlQWxsVmFsaWRhdGlvbik7CiAJCQkJZ2Muc2V0RW5hYmxlZE1hbnVhbFZhbGlkYXRvcnMoZ2V0RW5hYmxlZE1hbnVhbFZhbGlkYXRvcnMoKSk7CQkJCQogCQkJCWdjLnNldEVuYWJsZWRCdWlsZFZhbGlkYXRvcnMoZ2V0RW5hYmxlZEJ1aWxkVmFsaWRhdG9ycygpKTsKIAkKQEAgLTY0OCw4ICs2MzIsNyBAQAogCQkJfQogCQkJY2F0Y2ggKEludm9jYXRpb25UYXJnZXRFeGNlcHRpb24gZSl7CiAJCQkJVmFsaWRhdGlvblVJUGx1Z2luLmdldFBsdWdpbigpLmhhbmRsZUV4Y2VwdGlvbihlKTsKLQkJCX0KLQkJCQorCQkJfQkJCQogCQl9CiAKIAkJLyoqCkBAIC02NTgsMTMgKzY0MSw4IEBACiAJCSAqLwogCQlwcml2YXRlIFZhbGlkYXRvck1ldGFEYXRhW10gZ2V0RW5hYmxlZE1hbnVhbFZhbGlkYXRvcnMoKSB7CiAJCQlMaXN0PFZhbGlkYXRvck1ldGFEYXRhPiBsaXN0ID0gbmV3IExpbmtlZExpc3Q8VmFsaWRhdG9yTWV0YURhdGE+KCk7Ci0JCQlmb3IgKFZhbGlkYXRvciB2IDogX3ZhbGlkYXRvcnMpewotCQkJCWlmICh2LmlzTWFudWFsVmFsaWRhdGlvbigpKXsKLQkJCQkJVmFsaWRhdG9yLlYxIHYxID0gdi5hc1YxVmFsaWRhdG9yKCk7Ci0JCQkJCWlmICh2MSAhPSBudWxsKXsKLQkJCQkJCWxpc3QuYWRkKHYxLmdldFZtZCgpKTsKLQkJCQkJfQotCQkJCX0KKwkJCWZvciAoVmFsaWRhdG9yTXV0YWJsZSB2IDogX3ZhbGlkYXRvcnMpeworCQkJCWlmICh2LmlzTWFudWFsVmFsaWRhdGlvbigpICYmIHYuaXNWMVZhbGlkYXRvcigpKWxpc3QuYWRkKHYuZ2V0Vm1kKCkpOwogCQkJfQogCQkJVmFsaWRhdG9yTWV0YURhdGFbXSByZXN1bHQgPSBuZXcgVmFsaWRhdG9yTWV0YURhdGFbbGlzdC5zaXplKCldOwogCQkJbGlzdC50b0FycmF5KHJlc3VsdCk7CkBAIC02NzcsMTEgKzY1NSw4IEBACiAJCSAqLwogCQlwcml2YXRlIFZhbGlkYXRvck1ldGFEYXRhW10gZ2V0RW5hYmxlZEJ1aWxkVmFsaWRhdG9ycygpIHsKIAkJCUxpc3Q8VmFsaWRhdG9yTWV0YURhdGE+IGxpc3QgPSBuZXcgTGlua2VkTGlzdDxWYWxpZGF0b3JNZXRhRGF0YT4oKTsKLQkJCWZvciAoVmFsaWRhdG9yIHYgOiBfdmFsaWRhdG9ycyl7Ci0JCQkJaWYgKHYuaXNCdWlsZFZhbGlkYXRpb24oKSl7Ci0JCQkJCVZhbGlkYXRvci5WMSB2MSA9IHYuYXNWMVZhbGlkYXRvcigpOwotCQkJCQlpZiAodjEgIT0gbnVsbClsaXN0LmFkZCh2MS5nZXRWbWQoKSk7Ci0JCQkJfQorCQkJZm9yIChWYWxpZGF0b3JNdXRhYmxlIHYgOiBfdmFsaWRhdG9ycyl7CisJCQkJaWYgKHYuaXNCdWlsZFZhbGlkYXRpb24oKSAmJiB2LmlzVjFWYWxpZGF0b3IoKSlsaXN0LmFkZCh2LmdldFZtZCgpKTsKIAkJCX0KIAkJCVZhbGlkYXRvck1ldGFEYXRhW10gcmVzdWx0ID0gbmV3IFZhbGlkYXRvck1ldGFEYXRhW2xpc3Quc2l6ZSgpXTsKIAkJCWxpc3QudG9BcnJheShyZXN1bHQpOwpAQCAtNjkwLDcgKzY2NSw5IEBACiAKIAkJcHVibGljIGJvb2xlYW4gcGVyZm9ybURlZmF1bHRzKCkgdGhyb3dzIEludm9jYXRpb25UYXJnZXRFeGNlcHRpb24gewogCQkJX2NoYW5nZUNvdW50Kys7Ci0JCQlfdmFsaWRhdG9ycyA9IGNvcHlWYWxpZGF0b3JzKFZhbE1hbmFnZXIuZ2V0RGVmYXVsdFZhbGlkYXRvcnMoKSk7CisJCQlWYWxpZGF0b3JbXSB2YWxzID0gVmFsTWFuYWdlci5nZXREZWZhdWx0VmFsaWRhdG9ycygpOworCQkJX3ZhbGlkYXRvcnMgPSBuZXcgVmFsaWRhdG9yTXV0YWJsZVt2YWxzLmxlbmd0aF07CisJCQlmb3IgKGludCBpPTA7IGk8dmFscy5sZW5ndGg7IGkrKylfdmFsaWRhdG9yc1tpXSA9IG5ldyBWYWxpZGF0b3JNdXRhYmxlKHZhbHNbaV0pOwogCQkJdXBkYXRlV2lkZ2V0cygpOwogCQkJZ2V0RGVmYXVsdHNCdXR0b24oKS5zZXRGb2N1cygpOwogCQkJcmV0dXJuIHRydWU7CkBAIC03MTIsNyArNjg5LDcgQEAKIAkJCiAJCXByaXZhdGUgdm9pZCBzZXRBbGxWYWxpZGF0b3JzKGJvb2xlYW4gYm9vbCl7CiAJCQlfY2hhbmdlQ291bnQrKzsKLQkJCWZvciAoVmFsaWRhdG9yIHYgOiBfdmFsaWRhdG9ycyl7CisJCQlmb3IgKFZhbGlkYXRvck11dGFibGUgdiA6IF92YWxpZGF0b3JzKXsKIAkJCQl2LnNldEJ1aWxkVmFsaWRhdGlvbihib29sKTsKIAkJCQl2LnNldE1hbnVhbFZhbGlkYXRpb24oYm9vbCk7CiAJCQl9CmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLnVpL3ZmMi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi91aS9pbnRlcm5hbC9wcmVmZXJlbmNlcy9WYWxpZGF0aW9uUHJvcGVydHlQYWdlLmphdmEgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLnVpL3ZmMi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi91aS9pbnRlcm5hbC9wcmVmZXJlbmNlcy9WYWxpZGF0aW9uUHJvcGVydHlQYWdlLmphdmEKaW5kZXggZWY4ZGFiZC4uNTNjNTc0YSAxMDA2NDQKLS0tIGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi51aS92ZjIvb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vdWkvaW50ZXJuYWwvcHJlZmVyZW5jZXMvVmFsaWRhdGlvblByb3BlcnR5UGFnZS5qYXZhCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24udWkvdmYyL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL3VpL2ludGVybmFsL3ByZWZlcmVuY2VzL1ZhbGlkYXRpb25Qcm9wZXJ0eVBhZ2UuamF2YQpAQCAtMSw3ICsxLDUgQEAKLXBhY2thZ2Ugb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24udWkuaW50ZXJuYWwucHJlZmVyZW5jZXM7Ci0KIC8qKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqCi0gKiBDb3B5cmlnaHQgKGMpIDIwMDEsIDIwMDggSUJNIENvcnBvcmF0aW9uIGFuZCBvdGhlcnMuCisgKiBDb3B5cmlnaHQgKGMpIDIwMDEsIDIwMDkgSUJNIENvcnBvcmF0aW9uIGFuZCBvdGhlcnMuCiAgKiBBbGwgcmlnaHRzIHJlc2VydmVkLiBUaGlzIHByb2dyYW0gYW5kIHRoZSBhY2NvbXBhbnlpbmcgbWF0ZXJpYWxzCiAgKiBhcmUgbWFkZSBhdmFpbGFibGUgdW5kZXIgdGhlIHRlcm1zIG9mIHRoZSBFY2xpcHNlIFB1YmxpYyBMaWNlbnNlIHYxLjAKICAqIHdoaWNoIGFjY29tcGFuaWVzIHRoaXMgZGlzdHJpYnV0aW9uLCBhbmQgaXMgYXZhaWxhYmxlIGF0CkBAIC0xMCw5ICs4LDkgQEAKICAqIENvbnRyaWJ1dG9yczoKICAqIElCTSBDb3Jwb3JhdGlvbiAtIGluaXRpYWwgQVBJIGFuZCBpbXBsZW1lbnRhdGlvbgogICoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKiovCitwYWNrYWdlIG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLnVpLmludGVybmFsLnByZWZlcmVuY2VzOwogCiBpbXBvcnQgamF2YS5sYW5nLnJlZmxlY3QuSW52b2NhdGlvblRhcmdldEV4Y2VwdGlvbjsKLQogaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucmVzb3VyY2VzLklDb21tYW5kOwogaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucmVzb3VyY2VzLklQcm9qZWN0OwogaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucmVzb3VyY2VzLklQcm9qZWN0RGVzY3JpcHRpb247CkBAIC02OCw2ICs2Niw4IEBACiBpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uaW50ZXJuYWwuVmFsTWFuYWdlcjsKIGltcG9ydCBvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5pbnRlcm5hbC5WYWxQcmVmTWFuYWdlclByb2plY3Q7CiBpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uaW50ZXJuYWwuVmFsaWRhdG9yTWV0YURhdGE7CitpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uaW50ZXJuYWwuVmFsaWRhdG9yTXV0YWJsZTsKK2ltcG9ydCBvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5pbnRlcm5hbC5WYWxNYW5hZ2VyLlVzZVByb2plY3RQcmVmZXJlbmNlczsKIGltcG9ydCBvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5pbnRlcm5hbC5tb2RlbC5Qcm9qZWN0UHJlZmVyZW5jZXM7CiBpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uaW50ZXJuYWwub3BlcmF0aW9ucy5WYWxpZGF0b3JNYW5hZ2VyOwogaW1wb3J0IG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLmludGVybmFsLnBsdWdpbi5WYWxpZGF0aW9uUGx1Z2luOwpAQCAtODksMjQgKzg5LDE5IEBACiAJcHJpdmF0ZSBTaGVsbCAJCQlfc2hlbGw7CiAKIAlwdWJsaWMgaW50ZXJmYWNlIElWYWxpZGF0aW9uUGFnZSB7CisJCQogCQlDb21wb3NpdGUgY3JlYXRlUGFnZShDb21wb3NpdGUgcGFyZW50KSB0aHJvd3MgSW52b2NhdGlvblRhcmdldEV4Y2VwdGlvbjsKLQogCQlib29sZWFuIHBlcmZvcm1PaygpIHRocm93cyBJbnZvY2F0aW9uVGFyZ2V0RXhjZXB0aW9uOwotCiAJCWJvb2xlYW4gcGVyZm9ybURlZmF1bHRzKCkgdGhyb3dzIEludm9jYXRpb25UYXJnZXRFeGNlcHRpb247Ci0KIAkJQ29tcG9zaXRlIGdldENvbnRyb2woKTsKLQogCQl2b2lkIGRpc3Bvc2UoKTsKLQogCQl2b2lkIGxvc2VGb2N1cygpOwotCiAJCXZvaWQgZ2FpbkZvY3VzKCk7CiAJfQogCiAJcHVibGljIGNsYXNzIEludmFsaWRQYWdlIGltcGxlbWVudHMgSVZhbGlkYXRpb25QYWdlIHsKKwkJCiAJCXByaXZhdGUgQ29tcG9zaXRlIHBhZ2UgPSBudWxsOwotCiAJCXByaXZhdGUgQ29tcG9zaXRlIGNvbXBvc2l0ZSA9IG51bGw7CiAJCXByaXZhdGUgR3JpZExheW91dCBsYXlvdXQgPSBudWxsOwogCQlwcml2YXRlIExhYmVsIG1lc3NhZ2VMYWJlbCA9IG51bGw7CkBAIC0xNjgsNyArMTYzLDcgQEAKIAkJfQogCX0KIAotCXByaXZhdGUgY2xhc3MgVmFsaWRhdG9yTGlzdFBhZ2UgaW1wbGVtZW50cyBJVmFsaWRhdGlvblBhZ2UgeworCXByaXZhdGUgZmluYWwgY2xhc3MgVmFsaWRhdG9yTGlzdFBhZ2UgaW1wbGVtZW50cyBJVmFsaWRhdGlvblBhZ2UgewogCQlwcml2YXRlIENvbXBvc2l0ZSAJCV9wYWdlOwogCiAJCXByaXZhdGUgVGFibGVWaWV3ZXIgCV92YWxpZGF0b3JMaXN0OwpAQCAtMTc5LDcgKzE3NCwxMCBAQAogCQlwcml2YXRlIExpbmsJCQlfY29uZmlnTGluazsKIAkJcHJpdmF0ZSBCdXR0b24JCQlfYWRkVmFsaWRhdGlvbkJ1aWxkZXI7CiAJCXByaXZhdGUgVGFibGUgCQkJX3ZhbGlkYXRvcnNUYWJsZTsKLQkJcHJpdmF0ZSBWYWxpZGF0b3JbXQkJX3ZhbGlkYXRvcnM7CisJCXByaXZhdGUgVmFsaWRhdG9yTXV0YWJsZVtdCQlfdmFsaWRhdG9yczsKKwkJCisJCS8qKiBOdW1iZXIgb2YgdGhpbmdzIHRoYXQgbWF5IGhhdmUgY2hhbmdlZC4gKi8KKwkJcHJpdmF0ZSBpbnQJCQkJX2NoYW5nZXM7CiAKIAkJLyoqCiAJCSAqIFRoaXMgY2xhc3MgaXMgcHJvdmlkZWQgZm9yIHRoZSBDaGVja2JveFRhYmxlVmlld2VyIGluIHRoZQpAQCAtMTkwLDggKzE4OCw4IEBACiAJCQl9CiAKIAkJCXB1YmxpYyBPYmplY3RbXSBnZXRFbGVtZW50cyhPYmplY3QgaW5wdXRFbGVtZW50KSB7Ci0JCQkJaWYgKGlucHV0RWxlbWVudCBpbnN0YW5jZW9mIFZhbGlkYXRvcltdKSB7Ci0JCQkJCXJldHVybiAoVmFsaWRhdG9yW10pIGlucHV0RWxlbWVudDsKKwkJCQlpZiAoaW5wdXRFbGVtZW50IGluc3RhbmNlb2YgVmFsaWRhdG9yTXV0YWJsZVtdKSB7CisJCQkJCXJldHVybiAoVmFsaWRhdG9yTXV0YWJsZVtdKSBpbnB1dEVsZW1lbnQ7CiAJCQkJfQogCQkJCXJldHVybiBuZXcgT2JqZWN0WzBdOwogCQkJfQpAQCAtMjA5LDcgKzIwNyw3IEBACiAJCQlwdWJsaWMgU3RyaW5nIGdldFRleHQoT2JqZWN0IGVsZW1lbnQpIHsKIAkJCQlpZiAoZWxlbWVudCA9PSBudWxsKXJldHVybiAiIjsgLy8kTk9OLU5MUy0xJAogCQkJCWVsc2UgaWYgKGVsZW1lbnQgaW5zdGFuY2VvZiBWYWxpZGF0b3IpCi0JCQkJCXJldHVybiAoKFZhbGlkYXRvcikgZWxlbWVudCkuZ2V0TmFtZSgpOworCQkJCQlyZXR1cm4gKChWYWxpZGF0b3JNdXRhYmxlKSBlbGVtZW50KS5nZXROYW1lKCk7CiAJCQkJZWxzZQogCQkJCQlyZXR1cm4gc3VwZXIuZ2V0VGV4dChlbGVtZW50KTsKIAkJCX0KQEAgLTIyMyw3ICsyMjEsNyBAQAogCQkJfQogCiAJCQlwdWJsaWMgSW1hZ2UgZ2V0Q29sdW1uSW1hZ2UoT2JqZWN0IGVsZW1lbnQsIGludCBjb2x1bW5JbmRleCkgewotCQkJCVZhbGlkYXRvciB2ID0gKFZhbGlkYXRvcikgZWxlbWVudDsKKwkJCQlWYWxpZGF0b3JNdXRhYmxlIHYgPSAoVmFsaWRhdG9yTXV0YWJsZSkgZWxlbWVudDsKIAkJCQlpZiAoY29sdW1uSW5kZXggPT0gMSkgewogCQkJCQlyZXR1cm4gZ2V0SW1hZ2Uodi5pc01hbnVhbFZhbGlkYXRpb24oKSA/IEltYWdlTmFtZXMub2tUYWJsZQogCQkJCQkJCTogSW1hZ2VOYW1lcy5mYWlsVGFibGUpOwpAQCAtMjM4LDcgKzIzNiw3IEBACiAJCQl9CiAKIAkJCXB1YmxpYyBTdHJpbmcgZ2V0Q29sdW1uVGV4dChPYmplY3QgZWxlbWVudCwgaW50IGNvbHVtbkluZGV4KSB7Ci0JCQkJaWYgKGNvbHVtbkluZGV4ID09IDApcmV0dXJuICgoVmFsaWRhdG9yKSBlbGVtZW50KS5nZXROYW1lKCk7CisJCQkJaWYgKGNvbHVtbkluZGV4ID09IDApcmV0dXJuICgoVmFsaWRhdG9yTXV0YWJsZSkgZWxlbWVudCkuZ2V0TmFtZSgpOwogCQkJCXJldHVybiBudWxsOwogCQkJfQogCQl9CkBAIC0yNjMsNyArMjYxLDEwIEBACiAJCX0KIAogCQlwdWJsaWMgQ29tcG9zaXRlIGNyZWF0ZVBhZ2UoQ29tcG9zaXRlIHBhcmVudCkgdGhyb3dzIEludm9jYXRpb25UYXJnZXRFeGNlcHRpb24gewotCQkJX3ZhbGlkYXRvcnMgPSBjb3B5VmFsaWRhdG9ycyhWYWxNYW5hZ2VyLmdldERlZmF1bHQoKS5nZXRWYWxpZGF0b3JzKGdldFByb2plY3QoKSwgZmFsc2UpKTsKKwkJCVZhbGlkYXRvcltdIHZhbHMgPSBWYWxNYW5hZ2VyLmdldERlZmF1bHQoKQorCQkJCS5nZXRWYWxpZGF0b3JzQ29uZmlndXJlZEZvclByb2plY3QoZ2V0UHJvamVjdCgpLCBVc2VQcm9qZWN0UHJlZmVyZW5jZXMuTXVzdFVzZSk7CisJCQlfdmFsaWRhdG9ycyA9IG5ldyBWYWxpZGF0b3JNdXRhYmxlW3ZhbHMubGVuZ3RoXTsKKwkJCWZvciAoaW50IGk9MDsgaTx2YWxzLmxlbmd0aDsgaSsrKV92YWxpZGF0b3JzW2ldID0gbmV3IFZhbGlkYXRvck11dGFibGUodmFsc1tpXSk7CiAKIAkJCUNvbXBvc2l0ZSB2YWxpZGF0b3JHcm91cCA9IG5ldyBDb21wb3NpdGUocGFyZW50LCBTV1QuTk9ORSk7CiAKQEAgLTI3NCw2ICsyNzUsOCBAQAogCiAJCQlhZGRPdmVycmlkZSh2YWxpZGF0b3JHcm91cCk7CiAJCQlhZGRDb25maWdMaW5rKHZhbGlkYXRvckdyb3VwKTsKKwkJCS8vCisJCQlhZGRMaW5lKHZhbGlkYXRvckdyb3VwKTsKIAkJCWFkZFN1c3BlbmQodmFsaWRhdG9yR3JvdXApOwogCQkJYWRkVmFsaWRhdGlvbkJ1aWxkZXIodmFsaWRhdG9yR3JvdXApOwogCQkJbmV3IExhYmVsKHZhbGlkYXRvckdyb3VwLCBTV1QuTk9ORSkuc2V0TGF5b3V0RGF0YShuZXcgR3JpZERhdGEoKSk7CkBAIC0zNDQsMTEgKzM0Nyw2IEBACiAJCQkKIAkJCWFkZEJ1dHRvbnModmFsaWRhdG9yR3JvdXApOwogCi0JCQkvLyBIYXZlIHRvIHNldCB0aGUgdGFiIG9yZGVyIG9yIG9ubHkgdGhlIGZpcnN0IGNoZWNrYm94IGluIGEKLQkJCS8vIENvbXBvc2l0ZSBjYW4gYmUgdGFiYmVkIHRvLiAoU2VlbXMgdG8gYXBwbHkgb25seSB0byBjaGVja2JveGVzLiBIYXZlIHRvIHVzZSB0aGUKLQkJCS8vIGFycm93IGtleSB0byBuYXZpZ2F0ZSB0aGUgY2hlY2tib3hlcy4pCi0JCQl2YWxpZGF0b3JHcm91cC5zZXRUYWJMaXN0KG5ldyBDb250cm9sW10geyBfb3ZlcnJpZGUsIF9zdXNwZW5kfSk7Ci0KIAkJCXVwZGF0ZVdpZGdldHMoKTsKIAogCQkJYXBwbHlEaWFsb2dGb250KHZhbGlkYXRvckdyb3VwKTsKQEAgLTM5OSwxMiArMzk3LDIzIEBACiAJCQlfc3VzcGVuZC5hZGRTZWxlY3Rpb25MaXN0ZW5lcihuZXcgU2VsZWN0aW9uQWRhcHRlcigpIHsKIAkJCQlwdWJsaWMgdm9pZCB3aWRnZXRTZWxlY3RlZChTZWxlY3Rpb25FdmVudCBlKSB7CiAJCQkJCV9zdXNwZW5kLnNldEZvY3VzKCk7CisJCQkJCV9jaGFuZ2VzKys7CiAJCQkJCWVuYWJsZURpc2FibGVXaWRnZXRzKCk7CiAJCQkJCV92YWxpZGF0b3JMaXN0LnJlZnJlc2goKTsKIAkJCQl9CiAJCQl9KTsKIAkJfQogCQkKKwkJLy9BZGQgYSBsaW5lIHNlcGFyYXRvcgorCQlwcml2YXRlIHZvaWQgYWRkTGluZShDb21wb3NpdGUgdmFsaWRhdG9yR3JvdXApIHsKKwkJCUdyaWREYXRhIGdkID0gbmV3IEdyaWREYXRhKEdyaWREYXRhLkZJTExfSE9SSVpPTlRBTCk7CisJCQlnZC5ob3Jpem9udGFsU3BhbiA9IDI7CisJCQlMYWJlbCBsaW5lID0gbmV3IExhYmVsKHZhbGlkYXRvckdyb3VwLFNXVC5TRVBBUkFUT1IgfCBTV1QuU0hBRE9XX09VVCB8IFNXVC5IT1JJWk9OVEFMKTsKKwkJCWxpbmUuc2V0TGF5b3V0RGF0YShnZCk7CisJCQkKKwkJCQorCQl9CisJCQogCQlwcml2YXRlIHZvaWQgYWRkQ29uZmlnTGluayhDb21wb3NpdGUgdmFsaWRhdG9yR3JvdXApewogCQkJX2NvbmZpZ0xpbmsgPSBuZXcgTGluayh2YWxpZGF0b3JHcm91cCxTV1QuTm9uZSk7CiAJCQlHcmlkRGF0YSBsYXlvdXQgPSBuZXcgR3JpZERhdGEoR3JpZERhdGEuSE9SSVpPTlRBTF9BTElHTl9FTkQpOwpAQCAtNDYwLDIzICs0NjksMTQgQEAKIAkJCV9hZGRWYWxpZGF0aW9uQnVpbGRlci5zZXRUZXh0KFZhbFVJTWVzc2FnZXMuQUREX1ZBTElEQVRJT05fQlVJTERFUik7CiAJCQlfYWRkVmFsaWRhdGlvbkJ1aWxkZXIuc2V0U2VsZWN0aW9uKGZhbHNlKTsKIAkJfQotCQkKLQkJLyoqCi0JCSAqIE1ha2UgYSBjb3B5IG9mIHRoZSBjdXJyZW50IHZhbGlkYXRvcnMgYW5kIHN0b3JlIHRoZSByZXN1bHRzLgotCQkgKi8KLQkJcHJpdmF0ZSBWYWxpZGF0b3JbXSBjb3B5VmFsaWRhdG9ycyhWYWxpZGF0b3JbXSB2YWxzKXsKLQkJCVZhbGlkYXRvcltdIHZhbGlkYXRvcnMgPSBuZXcgVmFsaWRhdG9yW3ZhbHMubGVuZ3RoXTsKLQkJCWZvciAoaW50IGk9MDsgaTx2YWxzLmxlbmd0aDsgaSsrKXZhbGlkYXRvcnNbaV0gPSB2YWxzW2ldLmNvcHkoKTsKLQkJCXJldHVybiB2YWxpZGF0b3JzOwotCQl9Ci0JCQorCQkJCQogCQkvKioKIAkJICogRG9lcyB0aGlzIHZhbGlkYXRvciBoYXZlIGV4dHJhIHNldHRpbmdzIHRoYXQgY2FuIGJlIGNvbmZpZ3VyZWQ/CiAJCSAqIEBwYXJhbSB2CiAJCSAqIEByZXR1cm4gdHJ1ZSBpZiBpdCBkb2VzCiAJCSAqLwotCQlib29sZWFuIGhhc1NldHRpbmdzKFZhbGlkYXRvciB2KXsKLQkJCWlmICh2LmFzVjJWYWxpZGF0b3IoKSAhPSBudWxsKXJldHVybiB0cnVlOworCQlib29sZWFuIGhhc1NldHRpbmdzKFZhbGlkYXRvck11dGFibGUgdil7CisJCQlpZiAodi5pc1YyVmFsaWRhdG9yKCkpcmV0dXJuIHRydWU7CiAJCQlpZiAodi5nZXREZWxlZ2F0aW5nSWQoKSAhPSBudWxsKXJldHVybiB0cnVlOwogCQkJcmV0dXJuIGZhbHNlOwogCQl9CkBAIC01MTEsNyArNTExLDE0IEBACiAJCQlfb3ZlcnJpZGUuYWRkU2VsZWN0aW9uTGlzdGVuZXIobmV3IFNlbGVjdGlvbkFkYXB0ZXIoKSB7CiAJCQkJcHVibGljIHZvaWQgd2lkZ2V0U2VsZWN0ZWQoU2VsZWN0aW9uRXZlbnQgZSkgewogCQkJCQlfb3ZlcnJpZGUuc2V0Rm9jdXMoKTsKLQkJCQkJaWYgKFZhbE1hbmFnZXIuZ2V0RGVmYXVsdCgpLmdldEdsb2JhbFByZWZlcmVuY2VzKCkuZ2V0T3ZlcnJpZGUoKSl7CisJCQkJCV9jaGFuZ2VzKys7CisJCQkJCVZhbE1hbmFnZXIgdm0gPSBWYWxNYW5hZ2VyLmdldERlZmF1bHQoKTsKKwkJCQkJaWYgKHZtLmdldEdsb2JhbFByZWZlcmVuY2VzKCkuZ2V0T3ZlcnJpZGUoKSl7CisvLwkJCQkJCUlQcm9qZWN0IHByb2plY3QgPSBnZXRQcm9qZWN0KCk7CisvLwkJCQkJCVVzZVByb2plY3RQcmVmZXJlbmNlcyB1c2VQcm9qZWN0ID0gVXNlUHJvamVjdFByZWZlcmVuY2VzLk5vcm1hbDsKKy8vCQkJCQkJaWYgKF9vdmVycmlkZS5nZXRTZWxlY3Rpb24oKSl1c2VQcm9qZWN0ID0gVXNlUHJvamVjdFByZWZlcmVuY2VzLk11c3RVc2U7CisvLwkJCQkJCV92YWxpZGF0b3JzID0gY29weVZhbGlkYXRvcnModm0uZ2V0VmFsaWRhdG9yc0NvbmZpZ3VyZWRGb3JQcm9qZWN0KHByb2plY3QsIHVzZVByb2plY3QpKTsKKy8vCQkJCQkJX3ZhbGlkYXRvckxpc3Quc2V0SW5wdXQoX3ZhbGlkYXRvcnMpOwogCQkJCQkJZW5hYmxlRGlzYWJsZVdpZGdldHMoKTsKIAkJCQkJCV92YWxpZGF0b3JMaXN0LnJlZnJlc2goKTsKIAkJCQkJfQpAQCAtNTQ4LDcgKzU1NSw3IEBACiAJCQltZW51LmFkZE1lbnVMaXN0ZW5lcihuZXcgTWVudUFkYXB0ZXIoKSB7CiAJCQkJcHVibGljIHZvaWQgbWVudVNob3duKE1lbnVFdmVudCBlKSB7CiAJCQkJCUlTdHJ1Y3R1cmVkU2VsZWN0aW9uIHNlbGVjdGlvbiA9IChJU3RydWN0dXJlZFNlbGVjdGlvbikgX3ZhbGlkYXRvckxpc3QuZ2V0U2VsZWN0aW9uKCk7Ci0JCQkJCVZhbGlkYXRvciB2YWwgPSAoVmFsaWRhdG9yKSBzZWxlY3Rpb24uZ2V0Rmlyc3RFbGVtZW50KCk7CisJCQkJCVZhbGlkYXRvck11dGFibGUgdmFsID0gKFZhbGlkYXRvck11dGFibGUpIHNlbGVjdGlvbi5nZXRGaXJzdEVsZW1lbnQoKTsKIAkJCQkJbWFudWFsSXRlbS5zZXRTZWxlY3Rpb24odmFsLmlzTWFudWFsVmFsaWRhdGlvbigpKTsKIAkJCQkJYnVpbGRJdGVtLnNldFNlbGVjdGlvbih2YWwuaXNCdWlsZFZhbGlkYXRpb24oKSk7CiAJCQkJCXNldHRpbmdzSXRlbS5zZXRFbmFibGVkKGhhc1NldHRpbmdzKHZhbCkpOwpAQCAtNTYwLDcgKzU2Nyw3IEBACiAKIAkJcHJvdGVjdGVkIHZvaWQgY29sdW1uQ2xpY2tlZChpbnQgY29sdW1uVG9FZGl0KSB7CiAJCQlJU3RydWN0dXJlZFNlbGVjdGlvbiBzZWxlY3Rpb24gPSAoSVN0cnVjdHVyZWRTZWxlY3Rpb24pIF92YWxpZGF0b3JMaXN0LmdldFNlbGVjdGlvbigpOwotCQkJVmFsaWRhdG9yIHZhbCA9IChWYWxpZGF0b3IpIHNlbGVjdGlvbi5nZXRGaXJzdEVsZW1lbnQoKTsKKwkJCVZhbGlkYXRvck11dGFibGUgdmFsID0gKFZhbGlkYXRvck11dGFibGUpIHNlbGVjdGlvbi5nZXRGaXJzdEVsZW1lbnQoKTsKIAogCQkJc3dpdGNoIChjb2x1bW5Ub0VkaXQpIHsKIAkJCWNhc2UgMToKQEAgLTU3MCwxMSArNTc3LDE0IEBACiAJCQkJdmFsLnNldEJ1aWxkVmFsaWRhdGlvbighdmFsLmlzQnVpbGRWYWxpZGF0aW9uKCkpOwogCQkJCWJyZWFrOwogCQkJY2FzZSAzOgotCQkJCVZhbGlkYXRvci5WMiB2MiA9IHZhbC5hc1YyVmFsaWRhdG9yKCk7Ci0JCQkJaWYgKHYyICE9IG51bGwpewotCQkJCQlGaWx0ZXJEaWFsb2cgZmQgPSBuZXcgRmlsdGVyRGlhbG9nKF9zaGVsbCwgdmFsLCBnZXRQcm9qZWN0KCkpOworCQkJCWlmICh2YWwuaXNWMlZhbGlkYXRvcigpKXsKKwkJCQkJVmFsaWRhdG9yTXV0YWJsZSBuZXdWYWwgPSBuZXcgVmFsaWRhdG9yTXV0YWJsZSh2YWwpOworCQkJCQlGaWx0ZXJEaWFsb2cgZmQgPSBuZXcgRmlsdGVyRGlhbG9nKF9zaGVsbCwgbmV3VmFsLCBnZXRQcm9qZWN0KCkpOwogCQkJCQlpZiAoV2luZG93Lk9LID09IGZkLm9wZW4oKSl7Ci0JCQkJCQl2YWwuYmVjb21lKGZkLmdldFZhbGlkYXRvcigpKTsKKwkJCQkJCV9jaGFuZ2VzKys7CisJCQkJCQluZXdWYWwgPSBmZC5nZXRWYWxpZGF0b3IoKTsKKwkJCQkJCWludCBpID0gZmluZGl0KHZhbCk7CisJCQkJCQlpZiAoaSAhPSAtMSlfdmFsaWRhdG9yc1tpXSA9IG5ld1ZhbDsKIAkJCQkJfQogCQkJCX0KIAkJCQllbHNlIHsKQEAgLTU4OCwxMiArNTk4LDE2IEBACiAJCQlfdmFsaWRhdG9yTGlzdC5yZWZyZXNoKCk7CiAJCX0KIAotCQlwcml2YXRlIHZvaWQgaGFuZGxlT2xkRGVsZWdhdGUoVmFsaWRhdG9yIHZhbCkgeworCQlwcml2YXRlIGludCBmaW5kaXQoVmFsaWRhdG9yTXV0YWJsZSB2YWwpIHsKKwkJCWZvciAoaW50IGk9MDsgaTxfdmFsaWRhdG9ycy5sZW5ndGg7IGkrKylpZiAoX3ZhbGlkYXRvcnNbaV0gPT0gdmFsKXJldHVybiBpOworCQkJcmV0dXJuIC0xOworCQl9CisJCQorCQlwcml2YXRlIHZvaWQgaGFuZGxlT2xkRGVsZWdhdGUoVmFsaWRhdG9yTXV0YWJsZSB2YWwpIHsKIAkJCXRyeSB7Ci0JCQkJVmFsaWRhdG9yLlYxIHYxID0gdmFsLmFzVjFWYWxpZGF0b3IoKTsKLQkJCQlpZiAodjEgPT0gbnVsbClyZXR1cm47CisJCQkJaWYgKCF2YWwuaXNWMVZhbGlkYXRvcigpKXJldHVybjsKIAkJCQkKLQkJCQlWYWxpZGF0b3JNZXRhRGF0YSB2bWQgPSB2MS5nZXRWbWQoKTsKKwkJCQlWYWxpZGF0b3JNZXRhRGF0YSB2bWQgPSB2YWwuZ2V0Vm1kKCk7CiAJCQkgICAgaWYgKCF2bWQuaXNEZWxlZ2F0aW5nKCkpcmV0dXJuOwogCQkJICAgIAogCQkJICAgIEdsb2JhbENvbmZpZ3VyYXRpb24gZ2MgPSBDb25maWd1cmF0aW9uTWFuYWdlci5nZXRNYW5hZ2VyKCkuZ2V0R2xvYmFsQ29uZmlndXJhdGlvbigpOwpAQCAtNjA2LDcgKzYyMCwxMCBAQAogCQkJICAgIGRpYWxvZy5jcmVhdGUoKTsKIAkJCQogCQkJICAgIGludCByZXN1bHQgPSBkaWFsb2cub3BlbigpOwotCQkgICAgICAgIGlmIChyZXN1bHQgPT0gV2luZG93Lk9LKWdjLnNldERlbGVnYXRlVW5pcXVlTmFtZSh2bWQsIGRpYWxvZy5nZXREZWxlZ2F0ZUlEKCkpOworCQkgICAgICAgIGlmIChyZXN1bHQgPT0gV2luZG93Lk9LKXsKKwkJICAgICAgICAJX2NoYW5nZXMrKzsKKwkJICAgICAgICAJZ2Muc2V0RGVsZWdhdGVVbmlxdWVOYW1lKHZtZCwgZGlhbG9nLmdldERlbGVnYXRlSUQoKSk7CisJCSAgICAgICAgfQogCQkJfQogCQkJY2F0Y2ggKEludm9jYXRpb25UYXJnZXRFeGNlcHRpb24gZSl7CiAJCQkJCkBAIC02MjMsOCArNjQwLDExIEBACiAJCX0KIAogCQlwcm90ZWN0ZWQgdm9pZCB1cGRhdGVXaWRnZXRzRm9yRGVmYXVsdHMoKSB0aHJvd3MgSW52b2NhdGlvblRhcmdldEV4Y2VwdGlvbiB7Ci0JCQl1cGRhdGVBbGxXaWRnZXRzKCk7Ci0JCQl1cGRhdGVIZWxwKCk7CisJCQlfc3VzcGVuZC5zZXRTZWxlY3Rpb24oZmFsc2UpOworCQkJX292ZXJyaWRlLnNldFNlbGVjdGlvbihmYWxzZSk7CisJCQllbmFibGVEaXNhYmxlV2lkZ2V0cygpOworCQkJX3ZhbGlkYXRvckxpc3Quc2V0SW5wdXQoX3ZhbGlkYXRvcnMpOworCQkJX3ZhbGlkYXRvckxpc3QucmVmcmVzaCgpOwogCQl9CiAKIAkJcHJpdmF0ZSB2b2lkIHVwZGF0ZUFsbFdpZGdldHMoKSB0aHJvd3MgSW52b2NhdGlvblRhcmdldEV4Y2VwdGlvbiB7CkBAIC02MzgsMTkgKzY1OCwxOSBAQAogCQlwdWJsaWMgYm9vbGVhbiBwZXJmb3JtT2soKSB0aHJvd3MgSW52b2NhdGlvblRhcmdldEV4Y2VwdGlvbiB7CiAJCQkKIAkJCWFkZEJ1aWxkZXIoKTsKKwkJCWZvciAoVmFsaWRhdG9yTXV0YWJsZSB2bSA6IF92YWxpZGF0b3JzKWlmICh2bS5pc0NoYW5nZWQoKSlfY2hhbmdlcysrOworCQkJaWYgKF9jaGFuZ2VzID09IDApcmV0dXJuIHRydWU7CiAJCQkvLyBbMjEzNjMxXSB0aGlzIHdhcm5pbmcgc2hvdWxkIG9ubHkgYmUgc2hvd24gaWYgdGhlIHVzZXIgYWN0dWFsbHkgdHJpZWQgdG8gb3ZlcnJpZGUKIAkJCS8vIHRoZSB2YWxpZGF0b3JzCiAJCQlpZiAoIVZhbE1hbmFnZXIuZ2V0RGVmYXVsdCgpLmdldEdsb2JhbFByZWZlcmVuY2VzKCkuZ2V0T3ZlcnJpZGUoKSAmJiBfb3ZlcnJpZGUuZ2V0U2VsZWN0aW9uKCkpewotCQkJCU1lc3NhZ2VEaWFsb2cub3Blbldhcm5pbmcoX3NoZWxsLCBWYWxVSU1lc3NhZ2VzLlZhbGlkYXRpb24sIAotCQkJCQlWYWxVSU1lc3NhZ2VzLlByb2plY3RPdmVycmlkZXNOb3RBbGxvd2VkKTsKKwkJCQlNZXNzYWdlRGlhbG9nLm9wZW5XYXJuaW5nKF9zaGVsbCwgVmFsVUlNZXNzYWdlcy5WYWxpZGF0aW9uLCBWYWxVSU1lc3NhZ2VzLlByb2plY3RPdmVycmlkZXNOb3RBbGxvd2VkKTsKIAkJCQlyZXR1cm4gZmFsc2U7CiAJCQl9CiAJCQl1cGRhdGVWMVByb2plY3RTZXR0aW5ncygpOwotCQkJZ2V0UHJvamVjdFByZWZlcmVuY2VzKCkuc2V0U3VzcGVuZChfc3VzcGVuZC5nZXRTZWxlY3Rpb24oKSk7Ci0JCQlnZXRQcm9qZWN0UHJlZmVyZW5jZXMoKS5zZXRPdmVycmlkZShfb3ZlcnJpZGUuZ2V0U2VsZWN0aW9uKCkpOwogCQkJSVByb2plY3QgcHJvamVjdCA9IGdldFByb2plY3QoKTsKKwkJCVByb2plY3RQcmVmZXJlbmNlcyBwcCA9IG5ldyBQcm9qZWN0UHJlZmVyZW5jZXMocHJvamVjdCwgX292ZXJyaWRlLmdldFNlbGVjdGlvbigpLCBfc3VzcGVuZC5nZXRTZWxlY3Rpb24oKSwgbnVsbCk7CiAJCQlWYWxQcmVmTWFuYWdlclByb2plY3QgdnBtID0gbmV3IFZhbFByZWZNYW5hZ2VyUHJvamVjdChwcm9qZWN0KTsKLQkJCXZwbS5zYXZlUHJlZmVyZW5jZXMoZ2V0UHJvamVjdFByZWZlcmVuY2VzKCksIF92YWxpZGF0b3JzKTsKKwkJCXZwbS5zYXZlUHJlZmVyZW5jZXMocHAsIF92YWxpZGF0b3JzKTsKIAkJCXJldHVybiB0cnVlOwogCQl9CiAJCQpAQCAtNjc4LDcgKzY5OCwxMiBAQAogCQl9CiAKIAkJcHVibGljIGJvb2xlYW4gcGVyZm9ybURlZmF1bHRzKCkgdGhyb3dzIEludm9jYXRpb25UYXJnZXRFeGNlcHRpb24gewotCQkJX3ZhbGlkYXRvcnMgPSBjb3B5VmFsaWRhdG9ycyhWYWxNYW5hZ2VyLmdldERlZmF1bHRWYWxpZGF0b3JzKGdldFByb2plY3QoKSkpOworCQkJVmFsaWRhdG9yW10gdmFscyA9IFZhbE1hbmFnZXIuZ2V0RGVmYXVsdCgpCisJCQkJLmdldFZhbGlkYXRvcnNDb25maWd1cmVkRm9yUHJvamVjdChnZXRQcm9qZWN0KCksIFVzZVByb2plY3RQcmVmZXJlbmNlcy5NdXN0Tm90VXNlKTsKKwkJCV92YWxpZGF0b3JzID0gbmV3IFZhbGlkYXRvck11dGFibGVbdmFscy5sZW5ndGhdOworCQkJZm9yIChpbnQgaT0wOyBpPHZhbHMubGVuZ3RoOyBpKyspX3ZhbGlkYXRvcnNbaV0gPSBuZXcgVmFsaWRhdG9yTXV0YWJsZSh2YWxzW2ldKTsKKworCQkJX2NoYW5nZXMrKzsKIAkJCXVwZGF0ZVdpZGdldHNGb3JEZWZhdWx0cygpOwogCQkJZ2V0RGVmYXVsdHNCdXR0b24oKS5zZXRGb2N1cygpOwogCQkJcmV0dXJuIHRydWU7CkBAIC02OTMsNyArNzE4LDcgQEAKIAogCQlwcml2YXRlIHZvaWQgc2V0QWxsVmFsaWRhdG9ycyhib29sZWFuIGJvb2wpIHsKIAkJCWZvciAoVGFibGVJdGVtIGl0ZW0gOiBfdmFsaWRhdG9yc1RhYmxlLmdldEl0ZW1zKCkpIHsKLQkJCQlWYWxpZGF0b3IgdmFsID0gKFZhbGlkYXRvcikgaXRlbS5nZXREYXRhKCk7CisJCQkJVmFsaWRhdG9yTXV0YWJsZSB2YWwgPSAoVmFsaWRhdG9yTXV0YWJsZSkgaXRlbS5nZXREYXRhKCk7CiAJCQkJdmFsLnNldE1hbnVhbFZhbGlkYXRpb24oYm9vbCk7CiAJCQkJdmFsLnNldEJ1aWxkVmFsaWRhdGlvbihib29sKTsKIAkJCX0KZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24vLm9wdGlvbnMgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLy5vcHRpb25zCmluZGV4IDM2YTc0NzEuLmUwY2MxOTIgMTAwNjQ0Ci0tLSBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24vLm9wdGlvbnMKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi8ub3B0aW9ucwpAQCAtMjIsNCArMjIsMTQgQEAKICMgb3JnLmVjbGlwc2Uud3N0LnhtbC5jb3JlLnhtbCAKIG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uL2V4dHJhVmFsRGV0YWlsPQogCisjIFRvIG1ha2UgZGVidWdnaW5nIGVhc2llciwgeW91IGNhbiBtYWtlIGl0IGFwcGVhciBpcyBpZiBvbmx5IG9uZSB2YWxpZGF0b3IgaGFzIGJlZW4gCisjIHJlZ2lzdGVyZWQgdmlhIHRoZSBleHRlbnNpb24gcG9pbnRzLiBZb3UgZG8gdGhpcyBieSBzZXR0aW5nIHRoZSBmb2xsb3dpbmcgZmlsdGVyCisjIHRvIHZhbGlkYXRvciBpZCBvZiB0aGUgb25lIHZhbGlkYXRvciB0aGF0IHlvdSB3YW50IHJlZ2lzdGVyZWQuCisjCisjIEFzIGFuIGV4YW1wbGUsIHlvdSBjb3VsZCB1c2UgdGhpcyBwbHVnLWluIGlkIGZvciBhIHYxIHZhbGlkYXRvcjogb3JnLmVjbGlwc2UuanN0LmoyZWUuZWpiLkVKQlZhbGlkYXRvcgorIyBhbmQgb3JnLmVjbGlwc2Uud3N0Lmh0bWwudWkuSFRNTFZhbGlkYXRvciBmb3IgYSB2MiB2YWxpZGF0b3IKK29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uL2ZpbHRlci9hbGxFeGNlcHQ9CiAKKyMgVGhlIHRyYWNpbmcgbGV2ZWwuIElmIG5vdCBzdXBwbGllZCBhIGRlZmF1bHQgb2YgemVybyBpcyB1c2VkLiBUaGUgaGlnaGVyIHRoZSBudW1iZXIgdGhlCisjIG1vcmUgdmVyYm9zZSB0aGUgdHJhY2luZy4KK29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uL3RyYWNlL2xldmVsPQpkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi9NRVRBLUlORi9NQU5JRkVTVC5NRiBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24vTUVUQS1JTkYvTUFOSUZFU1QuTUYKaW5kZXggYjg0OTIwMS4uMDhhZTRkNSAxMDA2NDQKLS0tIGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi9NRVRBLUlORi9NQU5JRkVTVC5NRgorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uL01FVEEtSU5GL01BTklGRVNULk1GCkBAIC0yLDcgKzIsNyBAQAogQnVuZGxlLU1hbmlmZXN0VmVyc2lvbjogMgogQnVuZGxlLU5hbWU6ICVCdW5kbGUtTmFtZS4wCiBCdW5kbGUtU3ltYm9saWNOYW1lOiBvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbjsgc2luZ2xldG9uOj10cnVlCi1CdW5kbGUtVmVyc2lvbjogMS4yLjAucXVhbGlmaWVyCitCdW5kbGUtVmVyc2lvbjogMS4yLjIwMC5xdWFsaWZpZXIKIEJ1bmRsZS1BY3RpdmF0b3I6IG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLmludGVybmFsLnBsdWdpbi5WYWxpZGF0aW9uUGx1Z2luCiBCdW5kbGUtVmVuZG9yOiAlQnVuZGxlLVZlbmRvci4wCiBCdW5kbGUtTG9jYWxpemF0aW9uOiBwbHVnaW4KZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24vcGx1Z2luLnByb3BlcnRpZXMgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uL3BsdWdpbi5wcm9wZXJ0aWVzCmluZGV4IGQ3NzIyZTQuLjBmY2IzYjUgMTAwNjQ0Ci0tLSBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24vcGx1Z2luLnByb3BlcnRpZXMKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi9wbHVnaW4ucHJvcGVydGllcwpAQCAtMjEsNiArMjEsNyBAQAogVmFsaWRhdG9yRGVsZWdhdGVzPVZhbGlkYXRvciBEZWxlZ2F0ZXMKIAogQnVuZGxlLU5hbWUuMCA9IFZhbGlkYXRpb24gRnJhbWV3b3JrCi1CdW5kbGUtVmVuZG9yLjAgPSBFY2xpcHNlLm9yZworQnVuZGxlLVZlbmRvci4wID0gRWNsaXBzZSBXZWIgVG9vbHMgUGxhdGZvcm0KIAogRXh0ZW5zaW9uLnZhbGlkYXRvcj1WYWxpZGF0b3IgKFZlcnNpb24gMikKK3JlbW92ZVYyVmFsaWRhdG9yPVJlbW92ZSBWMiBWYWxpZGF0b3IKXCBObyBuZXdsaW5lIGF0IGVuZCBvZiBmaWxlCmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uL3BsdWdpbi54bWwgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uL3BsdWdpbi54bWwKaW5kZXggMWIxNzU2OC4uYjhhNDMwYSAxMDA2NDQKLS0tIGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi9wbHVnaW4ueG1sCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24vcGx1Z2luLnhtbApAQCAtMTAsNyArMTAsOCBAQAogICAgPGV4dGVuc2lvbi1wb2ludCBpZD0idmFsaWRhdGlvbkhlbHBlciIgbmFtZT0idmFsaWRhdGlvbkhlbHBlciIgc2NoZW1hPSJ4c2RzL3ZhbGlkYXRpb25IZWxwZXIuZXhzZCIvPgogICAgPGV4dGVuc2lvbi1wb2ludCBpZD0idmFsaWRhdG9yRGVsZWdhdGVzIiBuYW1lPSIlVmFsaWRhdG9yRGVsZWdhdGVzIiBzY2hlbWE9InhzZHMvdmFsaWRhdG9yRGVsZWdhdGVzLmV4c2QiLz4gICAKICAgIDxleHRlbnNpb24tcG9pbnQgaWQ9InZhbGlkYXRvckdyb3VwIiBuYW1lPSJWYWxpZGF0b3IgR3JvdXAiIHNjaGVtYT0ieHNkcy92YWxpZGF0b3Jncm91cC5leHNkIi8+ICAgCi0gICA8ZXh0ZW5zaW9uLXBvaW50IGlkPSJleGNsdWRlIiBuYW1lPSJWYWxpZGF0b3IgRXhjbHVzaW9ucyIgc2NoZW1hPSJ4c2RzL2V4Y2x1ZGUuZXhzZCIvPiAgIAorICAgPGV4dGVuc2lvbi1wb2ludCBpZD0iZXhjbHVkZSIgbmFtZT0iVmFsaWRhdG9yIEV4Y2x1c2lvbnMiIHNjaGVtYT0ieHNkcy9leGNsdWRlLmV4c2QiLz4KKyAgIDxleHRlbnNpb24tcG9pbnQgaWQ9InJlbW92ZVYyVmFsaWRhdG9yIiBuYW1lPSIlcmVtb3ZlVjJWYWxpZGF0b3IiIHNjaGVtYT0ieHNkcy9yZW1vdmVWMlZhbGlkYXRvci5leHNkIi8+ICAgCiAgICAKIDwhLS09PT09PT09PT09PT09PT09PT09PT09PT09PT09LS0+CiA8IS0tIFZhbGlkYXRpb24gQ29udHJpYnV0aW9ucyAgIC0tPgpkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi9wcm9wZXJ0eV9maWxlcy9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9pbnRlcm5hbC9tZXNzYWdlcy5wcm9wZXJ0aWVzIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi9wcm9wZXJ0eV9maWxlcy9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9pbnRlcm5hbC9tZXNzYWdlcy5wcm9wZXJ0aWVzCmluZGV4IGE1MDYyYjguLmM1NzYwOGMgMTAwNjQ0Ci0tLSBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24vcHJvcGVydHlfZmlsZXMvb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vaW50ZXJuYWwvbWVzc2FnZXMucHJvcGVydGllcworKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uL3Byb3BlcnR5X2ZpbGVzL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL2ludGVybmFsL21lc3NhZ2VzLnByb3BlcnRpZXMKQEAgLTEsNSArMSw1IEBACiAjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjCi0jIENvcHlyaWdodCAoYykgMjAwNSwgMjAwOCBJQk0gQ29ycG9yYXRpb24gYW5kIG90aGVycy4KKyMgQ29weXJpZ2h0IChjKSAyMDA1LCAyMDEwIElCTSBDb3Jwb3JhdGlvbiBhbmQgb3RoZXJzLgogIyBBbGwgcmlnaHRzIHJlc2VydmVkLiBUaGlzIHByb2dyYW0gYW5kIHRoZSBhY2NvbXBhbnlpbmcgbWF0ZXJpYWxzCiAjIGFyZSBtYWRlIGF2YWlsYWJsZSB1bmRlciB0aGUgdGVybXMgb2YgdGhlIEVjbGlwc2UgUHVibGljIExpY2Vuc2UgdjEuMAogIyB3aGljaCBhY2NvbXBhbmllcyB0aGlzIGRpc3RyaWJ1dGlvbiwgYW5kIGlzIGF2YWlsYWJsZSBhdApAQCAtMTAsNyArMTAsNyBAQAogIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIwogRXJyQ29uZmlnPUlXQUUwMTAwRSBFeHRlbnNpb24gY29uZmlndXJhdGlvbiBlcnJvci4gQW4gaW50ZXJuYWwgZXJyb3IgaGFzIGhhcHBlbmVkLCB0aGUgdmFsaWRhdG9yIHswfSBoYXMgaW5jb3JyZWN0bHkgY29uZmlndXJlZCB0aGUgdmFsaWRhdGlvbiBleHRlbnNpb24gcG9pbnQuCiBFcnJHcm91cE5hbWU9SVdBRTAxMDFFIEludmFsaWQgZWxlbWVudCwgZXhwZWN0IGVpdGhlciB0aGUgZWxlbWVudCAiaW5jbHVkZSIgb3IgImV4Y2x1ZGUiLgotRXJyRmlsdGVyUnVsZT1JV0FFMDEwMkUgQW4gaW52YWxpZCBmaWx0ZXIgcnVsZSBoYXMgYmVlbiBlbmNvdW50ZXJlZC4KK0VyckZpbHRlclJ1bGU9SVdBRTAxMDJFIEFuIGludmFsaWQgZmlsdGVyIHJ1bGUgaGFzIGJlZW4gZW5jb3VudGVyZWQuIENvbnRyaWJ1dGluZyBwbHVnLWluOiB7MH0sIGVsZW1lbnQgbmFtZTogezF9CiAKIEVyckdyb3VwTm9UeXBlPUlXQUUwMTAzRSBHcm91cHMgbXVzdCBoYXZlIGEgdmFsaWQgdHlwZSwgbm8gdHlwZSB3YXMgcmV0dXJuZWQKIEVyckdyb3VwSW52YWxpZFR5cGU9SVdBRTAxMDRFIEdyb3VwcyBtdXN0IGhhdmUgYSB2YWxpZCB0eXBlLCB0aGUgZm9sbG93aW5nIGludmFsaWQgdHlwZSB3YXMgcmV0dXJuZWQ6IHswfQpAQCAtMjgsNiArMjgsNyBAQAogCiBEZWNvZGVFcnJvcjE9SVdBRTAwMTlFIFRoZXJlIHdhcyBhIHByb2JsZW0gZGVzZXJpYWxpemluZyBhIHN0cmluZy4gQSBib29sZWFuIHdhcyBleHBlY3RlZCBidXQgbm90IGZvdW5kLiAKIEVycm9yMjA9SVdBRTAwMjBFIEludGVybmFsIGVycm9yLCB0aGUgaW5jb21pbmcgdmFsaWRhdG9yIG11c3QgYmUgYSB2MiB2YWxpZGF0b3IKK0Vycm9yMjE9VGhlIGZvbGxvd2luZyBkZXBlbmRlbmN5IGNvdWxkIG5vdCBiZSByZXN0b3JlZCBiZWNhdXNlIHRoZSBmb2xsb3dpbmcgcmVzb3VyY2UgezB9IGNvdWxkIG5vIGxvbmdlciBiZSBmb3VuZC4KIEdyb3VwSW5jbHVkZT1JbmNsdWRlIEdyb3VwCiBHcm91cEV4Y2x1ZGU9RXhjbHVkZSBHcm91cAogCkBAIC0zNSw2ICszNiw3IEBACiBUeXBlRXhjbHVkZT1leGNsdWRlCiAKIEpvYk5hbWU9VmFsaWRhdGlvbgorSm9iTmFtZVdpdGhQcm9qZWN0TmFtZT1WYWxpZGF0aW5nIHswfQogSm9iTmFtZU1vbml0b3I9VmFsaWRhdGlvbiBNb25pdG9yCiBKb2JJbmRleFNhdmU9SW5kZXggU2F2ZQogCkBAIC00Nyw2ICs0OSw3IEBACiBSdWxlRmFjZXQ9RmFjZXQKIFJ1bGVGb2xkZXI9Rm9sZGVyCiBSdWxlRnVsbD1RdWFsaWZpZWQgRmlsZQorUnVsZVBhdHRlcm49UGF0dGVybgogCiBGaWxlRXh0V2l0aENhc2U9ezB9OiB7MX0gKGNhc2Ugc2Vuc2l0aXZlKQogRmlsZUV4dFdpdGhvdXRDYXNlPXswfTogezF9CkBAIC03MSwzICs3NCw1IEBACiBUaW1lU2VjPXswfSBzZWNvbmRzCiBUaW1lTWluPXswfSBtaW51dGVzCiAKK1JvZ3VlVmFsaWRhdG9yPVJvZ3VlIHZhbGlkYXRvciBkZWxlZ2F0ZSBmcm9tIGNvbnRyaWJ1dG9yIHswfQorCmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uL3ZhbGlkYXRlL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL2ludGVybmFsL0NvbmZpZ3VyYXRpb25Db25zdGFudHMuamF2YSBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24vdmFsaWRhdGUvb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vaW50ZXJuYWwvQ29uZmlndXJhdGlvbkNvbnN0YW50cy5qYXZhCmluZGV4IDE4ZTZkNDQuLjE2YWVmMDggMTAwNjQ0Ci0tLSBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24vdmFsaWRhdGUvb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vaW50ZXJuYWwvQ29uZmlndXJhdGlvbkNvbnN0YW50cy5qYXZhCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24vdmFsaWRhdGUvb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vaW50ZXJuYWwvQ29uZmlndXJhdGlvbkNvbnN0YW50cy5qYXZhCkBAIC0zNSw4ICszNSw3IEBACiAJU3RyaW5nIEVMRU1FTlRfU0VQQVJBVE9SID0gIjsiOyAvLyROT04tTkxTLTEkIC8vIHNlcGFyYXRlcyB0aGUgbmFtZSBvZiBvbmUgSVZhbGlkYXRvciBmcm9tIHRoZSBuZXh0IGluIHRoZSBsaXN0IG9mIGVuYWJsZWQgdmFsaWRhdG9ycyBmb3IgYSBwcm9qZWN0IG9yIHByZWZlcmVuY2UKIAlTdHJpbmcgREVMRUdBVEVTX1NFUEFSQVRPUiA9ICI9IjsgLy8kTk9OLU5MUy0xJCAvLyBTZXBhcmF0ZXMgdGhlIGRlbGVnYXRpbmcgdmFsaWRhdG9yIGlkIGZyb20gdGhlIGRlbGVnYXRlIHZhbGlkYXRvciBpZCBpbiB0aGUgbGlzdCBvZiBkZWxlZ2F0ZXMKIAotCS8vIFRoZSBmb2xsb3dpbmcgdmFsdWVzIG11c3QgbWF0Y2ggdGhlIGF0dHJpYnV0ZXMgaW4gdGhlIHByZWZlcmVuY2UgbWFya2VyIGFzIHNob3duIGluCi0JLy8gcGx1Z2luLnhtbAorCS8vIFRoZSBmb2xsb3dpbmcgdmFsdWVzIG11c3QgbWF0Y2ggdGhlIGF0dHJpYnV0ZXMgaW4gdGhlIHByZWZlcmVuY2UgbWFya2VyIGFzIHNob3duIGluIHBsdWdpbi54bWwKIAkvLyBFdmVuIHRob3VnaCB0aGUgcGx1Z2luLnhtbCB2YWx1ZXMgYXJlIG5vdCB1c2VkIHRvIGNyZWF0ZSBuZXcgUHJlZmVyZW5jZSBvciBQcm9qZWN0IG1hcmtlcnMsCiAJLy8gbWFpbnRhaW5pbmcgb25lIGxvY2FsIG5hbWUgZW5zdXJlcyB0aGF0IHRoZXJlJ3Mgbm8gY29uZnVzaW9uIHdyaXRpbmcgdGhlIG1pZ3JhdGlvbiBjb2RlLgogCS8vIFRoZXNlIGFyZSB0aGUgUXVhbGlmaWVkTmFtZXMgdXNlZCB0byBwZXJzaXN0IHRoZSB1c2VyJ3Mgc2V0dGluZ3MuCmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uL3ZhbGlkYXRlL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL2ludGVybmFsL0NvbmZpZ3VyYXRpb25NYW5hZ2VyLmphdmEgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uL3ZhbGlkYXRlL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL2ludGVybmFsL0NvbmZpZ3VyYXRpb25NYW5hZ2VyLmphdmEKaW5kZXggMGMwYzBiZS4uMmJhYWQ0MiAxMDA2NDQKLS0tIGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi92YWxpZGF0ZS9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9pbnRlcm5hbC9Db25maWd1cmF0aW9uTWFuYWdlci5qYXZhCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24vdmFsaWRhdGUvb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vaW50ZXJuYWwvQ29uZmlndXJhdGlvbk1hbmFnZXIuamF2YQpAQCAtMSw1ICsxLDUgQEAKIC8qKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqCi0gKiBDb3B5cmlnaHQgKGMpIDIwMDEsIDIwMDggSUJNIENvcnBvcmF0aW9uIGFuZCBvdGhlcnMuCisgKiBDb3B5cmlnaHQgKGMpIDIwMDEsIDIwMDkgSUJNIENvcnBvcmF0aW9uIGFuZCBvdGhlcnMuCiAgKiBBbGwgcmlnaHRzIHJlc2VydmVkLiBUaGlzIHByb2dyYW0gYW5kIHRoZSBhY2NvbXBhbnlpbmcgbWF0ZXJpYWxzCiAgKiBhcmUgbWFkZSBhdmFpbGFibGUgdW5kZXIgdGhlIHRlcm1zIG9mIHRoZSBFY2xpcHNlIFB1YmxpYyBMaWNlbnNlIHYxLjAKICAqIHdoaWNoIGFjY29tcGFuaWVzIHRoaXMgZGlzdHJpYnV0aW9uLCBhbmQgaXMgYXZhaWxhYmxlIGF0CkBAIC0xNSw4ICsxNSw4IEBACiBpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5yZXNvdXJjZXMuSU1hcmtlcjsKIGltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJlc291cmNlcy5JUHJvamVjdDsKIGltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJlc291cmNlcy5JV29ya3NwYWNlUm9vdDsKK2ltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJlc291cmNlcy5SZXNvdXJjZXNQbHVnaW47CiBpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5ydW50aW1lLkNvcmVFeGNlcHRpb247Ci1pbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5ydW50aW1lLlByZWZlcmVuY2VzOwogaW1wb3J0IG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLmludGVybmFsLnBsdWdpbi5WYWxpZGF0aW9uUGx1Z2luOwogCiAKQEAgLTQ3LDEwICs0Nyw3IEBACiAJCQlpZiAoIW1hcmtlci5nZXRUeXBlKCkuZXF1YWxzKFZBTElEQVRJT05fTUFSS0VSKSlyZXR1cm4gbnVsbDsKIAogCQkJT2JqZWN0IGF0dHJpYiA9IG1hcmtlci5nZXRBdHRyaWJ1dGUoVkFMSURBVElPTl9NQVJLRVJfT1dORVIpOwotCQkJaWYgKGF0dHJpYiA9PSBudWxsKSB7Ci0JCQkJLy8gb3duZXIgbm90IHNldAotCQkJCXJldHVybiBudWxsOwotCQkJfQorCQkJaWYgKGF0dHJpYiA9PSBudWxsKXJldHVybiBudWxsOwogCQkJcmV0dXJuIGF0dHJpYi50b1N0cmluZygpOwogCQl9IGNhdGNoIChDb3JlRXhjZXB0aW9uIGUpIHsKIAkJCVZhbGlkYXRpb25QbHVnaW4uZ2V0UGx1Z2luKCkuaGFuZGxlRXhjZXB0aW9uKGUpOwpAQCAtOTMsNyArOTAsNyBAQAogCSAqIFRoaXMgbWV0aG9kIHJldHVybnMgdGhlIGdsb2JhbCBwcmVmZXJlbmNlcyBmb3IgdGhlIHdvcmtzcGFjZS4KIAkgKi8KIAlwdWJsaWMgR2xvYmFsQ29uZmlndXJhdGlvbiBnZXRHbG9iYWxDb25maWd1cmF0aW9uKCkgdGhyb3dzIEludm9jYXRpb25UYXJnZXRFeGNlcHRpb24gewotCQlJV29ya3NwYWNlUm9vdCByb290ID0gVmFsaWRhdGlvbkNvbmZpZ3VyYXRpb24uZ2V0Um9vdCgpOworCQlJV29ya3NwYWNlUm9vdCByb290ID0gUmVzb3VyY2VzUGx1Z2luLmdldFdvcmtzcGFjZSgpLmdldFJvb3QoKTsKIAkJR2xvYmFsQ29uZmlndXJhdGlvbiBncCA9IG51bGw7CiAJCXRyeSB7CiAJCQlncCA9IChHbG9iYWxDb25maWd1cmF0aW9uKSByb290LmdldFNlc3Npb25Qcm9wZXJ0eShVU0VSX1BSRUZFUkVOQ0UpOwpAQCAtMTEwLDEwICsxMDcsOCBAQAogCQkJZ3AgPSAoR2xvYmFsQ29uZmlndXJhdGlvbikgcm9vdC5nZXRTZXNzaW9uUHJvcGVydHkoVVNFUl9QUkVGRVJFTkNFKTsKIAkJCWlmIChncCA9PSBudWxsKSB7CiAJCQkJZ3AgPSBuZXcgR2xvYmFsQ29uZmlndXJhdGlvbihyb290KTsKLQkJCQlQcmVmZXJlbmNlcyBwcmVmcyA9IFZhbGlkYXRpb25QbHVnaW4uZ2V0UGx1Z2luKCkuZ2V0UGx1Z2luUHJlZmVyZW5jZXMoKTsKLQkJCQlpZiggcHJlZnMgIT0gbnVsbCApewotCQkJCQlwcmVmcy5hZGRQcm9wZXJ0eUNoYW5nZUxpc3RlbmVyKGdwKTsKLQkJCQl9CisvLwkJCQlQcmVmZXJlbmNlc1dyYXBwZXIgcHJlZnMgPSBQcmVmZXJlbmNlc1dyYXBwZXIuZ2V0UHJlZmVyZW5jZXMobnVsbCwgbnVsbCk7CisvLwkJCQlwcmVmcy5hZGRQcm9wZXJ0eUNoYW5nZUxpc3RlbmVyKGdwKTsKIAkJCQkKIAkJCQlncC5nZXRWZXJzaW9uKCk7IC8vIGluaXRpYWxpemUgdGhlIGNvbmZpZ3VyYXRpb24ncyB2ZXJzaW9uIGF0dHJpYnV0ZQogCQkJCWdwLmxvYWQoKTsgLy8gaW5pdGlhbGl6ZSB0aGlzIGluc3RhbmNlIGZyb20gdGhlIHN0b3JlZCB2YWx1ZXMKQEAgLTE3MCw4ICsxNjUsNyBAQAogCQl0cnkgewogCQkJaWYgKGlzTWlncmF0ZWQocHJvamVjdCkpIHsKIAkJCQlQcm9qZWN0Q29uZmlndXJhdGlvbiBwcmpwID0gQ29uZmlndXJhdGlvbk1hbmFnZXIuZ2V0TWFuYWdlcigpLmdldFByb2plY3RDb25maWd1cmF0aW9uKHByb2plY3QpOwotCQkJCWlmKCFwcmpwLnVzZUdsb2JhbFByZWZlcmVuY2UoKSkKLQkJCQkJcHJqcC5zdG9yZSgpOworCQkJCWlmKCFwcmpwLnVzZUdsb2JhbFByZWZlcmVuY2UoKSlwcmpwLnN0b3JlKCk7CiAJCQl9CiAJCX0gY2F0Y2ggKEludm9jYXRpb25UYXJnZXRFeGNlcHRpb24gZSkgewogCQkJVmFsaWRhdGlvblBsdWdpbi5nZXRQbHVnaW4oKS5oYW5kbGVFeGNlcHRpb24oZSk7CkBAIC0xODAsOSArMTc0LDE3IEBACiAJCX0KIAl9CiAKKwkvKioKKwkgKiBAZGVwcmVjYXRlZCB0aGlzIG1ldGhvZCBkb2VzIG5vdCBkbyBhbnl0aGluZy4KKwkgKiBAcGFyYW0gcHJvamVjdAorCSAqLwogCXB1YmxpYyB2b2lkIGRlbGV0aW5nKElQcm9qZWN0IHByb2plY3QpIHsKIAl9CiAKKwkvKioKKwkgKiBAZGVwcmVjYXRlZCB0aGlzIG1ldGhvZCBkb2VzIG5vdCBkbyBhbnl0aGluZy4KKwkgKiBAcGFyYW0gcHJvamVjdAorCSAqLwogCXB1YmxpYyB2b2lkIG9wZW5pbmcoSVByb2plY3QgcHJvamVjdCkgewogCQkvLyBEbyBub3QgbG9hZCBvciBtaWdyYXRlIHRoZSBwcm9qZWN0IGluIHRoaXMgbWV0aG9kOyBsZXQgdGhlIGdldENvbmZpZ3VyYXRpb24oSVByb2plY3QpCiAJCS8vIG1ldGhvZCBkbyB0aGF0LiBEbyBub3QgbG9hZCB0aGUgcHJvamVjdCBiZWZvcmUgaXQncyBuZWNlc3NhcnkuCkBAIC0xOTMsOSArMTk1LDcgQEAKIAkgKi8KIAlwdWJsaWMgYm9vbGVhbiBpc0dsb2JhbE1pZ3JhdGVkKCkgdGhyb3dzIEludm9jYXRpb25UYXJnZXRFeGNlcHRpb24gewogCQlJV29ya3NwYWNlUm9vdCByb290ID0gVmFsaWRhdGlvbkNvbmZpZ3VyYXRpb24uZ2V0Um9vdCgpOwotCQlpZiAocm9vdCA9PSBudWxsKSB7Ci0JCQlyZXR1cm4gZmFsc2U7Ci0JCX0KKwkJaWYgKHJvb3QgPT0gbnVsbClyZXR1cm4gZmFsc2U7CiAKIAkJdHJ5IHsKIAkJCUdsb2JhbENvbmZpZ3VyYXRpb24gZ3AgPSAoR2xvYmFsQ29uZmlndXJhdGlvbikgcm9vdC5nZXRTZXNzaW9uUHJvcGVydHkoVVNFUl9QUkVGRVJFTkNFKTsKQEAgLTIyMCwyMCArMjIwLDE3IEBACiAJICogUmV0dXJuIHRydWUgaWYgdGhlIGdpdmVuIHByb2plY3QgaGFzIHRoZSBjdXJyZW50IGxldmVsIG9mIG1ldGFkYXRhLCBmYWxzZSBvdGhlcndpc2UuCiAJICovCiAJcHVibGljIGJvb2xlYW4gaXNNaWdyYXRlZChJUHJvamVjdCBwcm9qZWN0KSB0aHJvd3MgSW52b2NhdGlvblRhcmdldEV4Y2VwdGlvbiB7Ci0JCWlmIChwcm9qZWN0ID09IG51bGwpIHsKLQkJCXJldHVybiBmYWxzZTsKLQkJfQorCQlpZiAocHJvamVjdCA9PSBudWxsKXJldHVybiBmYWxzZTsKKwkJCiAJCXRyeSB7CiAJCQlpZiAocHJvamVjdC5pc0FjY2Vzc2libGUoKSkgewogCQkJCVByb2plY3RDb25maWd1cmF0aW9uIHByanAgPSAoUHJvamVjdENvbmZpZ3VyYXRpb24pIHByb2plY3QuZ2V0U2Vzc2lvblByb3BlcnR5KFVTRVJfUFJFRkVSRU5DRSk7Ci0JCQkJaWYgKHByanAgIT0gbnVsbCkgewotCQkJCQlyZXR1cm4gcHJqcC5pc1ZlcnNpb25DdXJyZW50KCk7Ci0JCQkJfQorCQkJCWlmIChwcmpwICE9IG51bGwpcmV0dXJuIHByanAuaXNWZXJzaW9uQ3VycmVudCgpOworCQkJCQogCQkJCVN0cmluZyBzZXJpYWxpemVkUHJqcCA9IHByb2plY3QuZ2V0UGVyc2lzdGVudFByb3BlcnR5KFVTRVJfUFJFRkVSRU5DRSk7CiAJCQkJaWYgKHNlcmlhbGl6ZWRQcmpwICE9IG51bGwpIHsKIAkJCQkJcHJqcCA9IG5ldyBQcm9qZWN0Q29uZmlndXJhdGlvbihwcm9qZWN0KTsKLQkJCQkJcHJqcC5nZXRWZXJzaW9uKCk7IC8vIGluaXRpYWxpemUgdGhlIGNvbmZpZ3VyYXRpb24ncwotCQkJCQkvLyB2ZXJzaW9uIGF0dHJpYnV0ZQorCQkJCQlwcmpwLmdldFZlcnNpb24oKTsgCiAJCQkJCXJldHVybiBwcmpwLmlzVmVyc2lvbkN1cnJlbnQoKTsKIAkJCQl9CiAJCQl9CmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uL3ZhbGlkYXRlL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL2ludGVybmFsL0V2ZW50TWFuYWdlci5qYXZhIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi92YWxpZGF0ZS9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9pbnRlcm5hbC9FdmVudE1hbmFnZXIuamF2YQppbmRleCBkZTc3YmE5Li5kNjAzYjhkIDEwMDY0NAotLS0gYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uL3ZhbGlkYXRlL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL2ludGVybmFsL0V2ZW50TWFuYWdlci5qYXZhCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24vdmFsaWRhdGUvb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vaW50ZXJuYWwvRXZlbnRNYW5hZ2VyLmphdmEKQEAgLTExLDggKzExLDggQEAKIHBhY2thZ2Ugb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uaW50ZXJuYWw7CiAKIGltcG9ydCBqYXZhLmxhbmcucmVmbGVjdC5JbnZvY2F0aW9uVGFyZ2V0RXhjZXB0aW9uOwotaW1wb3J0IGphdmEudXRpbC5IYXNoU2V0OwogaW1wb3J0IGphdmEudXRpbC5TZXQ7CitpbXBvcnQgamF2YS51dGlsLmNvbmN1cnJlbnQuQ29weU9uV3JpdGVBcnJheVNldDsKIAogaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucmVzb3VyY2VzLklQcm9qZWN0OwogaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucmVzb3VyY2VzLklSZXNvdXJjZTsKQEAgLTM5LDcgKzM5LDcgQEAKIAlwcml2YXRlIElSZXNvdXJjZURlbHRhVmlzaXRvciBfcG9zdEF1dG9CdWlsZFZpc2l0b3I7CiAJcHJpdmF0ZSBib29sZWFuIF9pc0FjdGl2ZTsgLy8gaGFzIHRoZSByZWdpc3RyeSBiZWVuIHJlYWQ/CiAJCi0JcHJpdmF0ZSBTZXQ8SVByb2plY3RDaGFuZ2VMaXN0ZW5lcj4gX2xpc3RlbmVycyA9IG5ldyBIYXNoU2V0PElQcm9qZWN0Q2hhbmdlTGlzdGVuZXI+KDQpOworCXByaXZhdGUgU2V0PElQcm9qZWN0Q2hhbmdlTGlzdGVuZXI+IF9saXN0ZW5lcnMgPSBuZXcgQ29weU9uV3JpdGVBcnJheVNldDxJUHJvamVjdENoYW5nZUxpc3RlbmVyPigpOwogCiAJcHJpdmF0ZSBFdmVudE1hbmFnZXIoKSB7CiAJfQpAQCAtODAsNyArODAsNyBAQAogCQlzaWduYWwocHJvamVjdCwgSVByb2plY3RDaGFuZ2VMaXN0ZW5lci5Qcm9qZWN0T3BlbmVkKTsKIAogCQkvLyBXaGVuIHRoZSBwcm9qZWN0IGlzIG9wZW5lZCwgY2hlY2sgZm9yIGFueSBvcnBoYW5lZCB0YXNrcyBvciB0YXNrcyB3aG9zZSBvd25lcnMgbmVlZCB0byBiZSB1cGRhdGVkLgotCQlDb25maWd1cmF0aW9uTWFuYWdlci5nZXRNYW5hZ2VyKCkub3BlbmluZyhwcm9qZWN0KTsKKy8vCQlDb25maWd1cmF0aW9uTWFuYWdlci5nZXRNYW5hZ2VyKCkub3BlbmluZyhwcm9qZWN0KTsKIAl9CiAKIAlwdWJsaWMgdm9pZCBjbG9zaW5nKElQcm9qZWN0IHByb2plY3QpIHsKQEAgLTE2Myw3ICsxNjMsNyBAQAogCQkJCQl9CiAJCQkJfQogCi0JCQkJQ29uZmlndXJhdGlvbk1hbmFnZXIuZ2V0TWFuYWdlcigpLmRlbGV0aW5nKHByb2plY3QpOworLy8JCQkJQ29uZmlndXJhdGlvbk1hbmFnZXIuZ2V0TWFuYWdlcigpLmRlbGV0aW5nKHByb2plY3QpOwogCQkJfQogCQl9IGNhdGNoIChJbnZvY2F0aW9uVGFyZ2V0RXhjZXB0aW9uIGUpIHsKIAkJCVZhbGlkYXRpb25QbHVnaW4uZ2V0UGx1Z2luKCkuaGFuZGxlRXhjZXB0aW9uKGUpOwpkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi92YWxpZGF0ZS9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9pbnRlcm5hbC9GaWx0ZXJVdGlsLmphdmEgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uL3ZhbGlkYXRlL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL2ludGVybmFsL0ZpbHRlclV0aWwuamF2YQppbmRleCBmYjJhODBkLi4zOWEzNmJjIDEwMDY0NAotLS0gYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uL3ZhbGlkYXRlL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL2ludGVybmFsL0ZpbHRlclV0aWwuamF2YQorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uL3ZhbGlkYXRlL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL2ludGVybmFsL0ZpbHRlclV0aWwuamF2YQpAQCAtNjEzLDcgKzYxMyw3IEBACiAKIAkJCQkJSVJlc291cmNlIHJlc291cmNlID0gc3ViZGVsdGEuZ2V0UmVzb3VyY2UoKTsKIAotCQkJCQlpZiAoVHJhY2luZy5pc0xvZ2dpbmcoKSkgeworCQkJCQlpZiAoVHJhY2luZy5pc0xvZ2dpbmcoMikpIHsKIAkJCQkJCVN0cmluZ0J1ZmZlciBidWZmZXIgPSBuZXcgU3RyaW5nQnVmZmVyKCJGaWx0ZXJVdGlsLTAxOiBzdWJkZWx0YSBvZiAiKTsgLy8kTk9OLU5MUy0xJAogCQkJCQkJYnVmZmVyLmFwcGVuZChyZXNvdXJjZS5nZXROYW1lKCkpOwogCQkJCQkJYnVmZmVyLmFwcGVuZCgiIGhhcyByZXNvdXJjZSBkZWx0YSBraW5kOiAiKTsgLy8kTk9OLU5MUy0xJApkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi92YWxpZGF0ZS9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9pbnRlcm5hbC9HbG9iYWxDb25maWd1cmF0aW9uLmphdmEgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uL3ZhbGlkYXRlL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL2ludGVybmFsL0dsb2JhbENvbmZpZ3VyYXRpb24uamF2YQppbmRleCAzMThkZTZkLi4yMGMwNDRmIDEwMDY0NAotLS0gYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uL3ZhbGlkYXRlL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL2ludGVybmFsL0dsb2JhbENvbmZpZ3VyYXRpb24uamF2YQorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uL3ZhbGlkYXRlL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL2ludGVybmFsL0dsb2JhbENvbmZpZ3VyYXRpb24uamF2YQpAQCAtNDcsNyArNDcsNyBAQAogCSAqIHdpdGhvdXQgcGVyc2lzdGluZyB0aGVtIChpLmUuLCBpZiB0aGUgdXNlciBwcmVzc2VzIENhbmNlbCB0aGVuIG5vdGhpbmcgbmVlZHMgdG8gYmUgZG9uZS4pCiAJICovCiAJcHVibGljIEdsb2JhbENvbmZpZ3VyYXRpb24oR2xvYmFsQ29uZmlndXJhdGlvbiBvcmlnaW5hbCkgdGhyb3dzIEludm9jYXRpb25UYXJnZXRFeGNlcHRpb24gewotCQlzdXBlcigpOworCQlzdXBlcihvcmlnaW5hbC5nZXRSZXNvdXJjZSgpKTsKIAkJb3JpZ2luYWwuY29weVRvKHRoaXMpOwogCX0KIApkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi92YWxpZGF0ZS9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9pbnRlcm5hbC9Qcm9qZWN0Q29uZmlndXJhdGlvbi5qYXZhIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi92YWxpZGF0ZS9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9pbnRlcm5hbC9Qcm9qZWN0Q29uZmlndXJhdGlvbi5qYXZhCmluZGV4IGI5MWE3NzcuLjVmMzllY2YgMTAwNjQ0Ci0tLSBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24vdmFsaWRhdGUvb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vaW50ZXJuYWwvUHJvamVjdENvbmZpZ3VyYXRpb24uamF2YQorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uL3ZhbGlkYXRlL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL2ludGVybmFsL1Byb2plY3RDb25maWd1cmF0aW9uLmphdmEKQEAgLTEsNSArMSw1IEBACiAvKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKgotICogQ29weXJpZ2h0IChjKSAyMDAxLCAyMDA4IElCTSBDb3Jwb3JhdGlvbiBhbmQgb3RoZXJzLgorICogQ29weXJpZ2h0IChjKSAyMDAxLCAyMDA5IElCTSBDb3Jwb3JhdGlvbiBhbmQgb3RoZXJzLgogICogQWxsIHJpZ2h0cyByZXNlcnZlZC4gVGhpcyBwcm9ncmFtIGFuZCB0aGUgYWNjb21wYW55aW5nIG1hdGVyaWFscwogICogYXJlIG1hZGUgYXZhaWxhYmxlIHVuZGVyIHRoZSB0ZXJtcyBvZiB0aGUgRWNsaXBzZSBQdWJsaWMgTGljZW5zZSB2MS4wCiAgKiB3aGljaCBhY2NvbXBhbmllcyB0aGlzIGRpc3RyaWJ1dGlvbiwgYW5kIGlzIGF2YWlsYWJsZSBhdApAQCAtMTEsMTUgKzExLDE1IEBACiBwYWNrYWdlIG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLmludGVybmFsOwogCiBpbXBvcnQgamF2YS5sYW5nLnJlZmxlY3QuSW52b2NhdGlvblRhcmdldEV4Y2VwdGlvbjsKK2ltcG9ydCBqYXZhLnV0aWwuSGFzaFNldDsKIGltcG9ydCBqYXZhLnV0aWwuTWFwOworaW1wb3J0IGphdmEudXRpbC5TZXQ7CitpbXBvcnQgamF2YS51dGlsLlN0cmluZ1Rva2VuaXplcjsKIAogaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucmVzb3VyY2VzLklNYXJrZXI7CiBpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5yZXNvdXJjZXMuSVByb2plY3Q7CiBpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5yZXNvdXJjZXMuSVJlc291cmNlOwotaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucmVzb3VyY2VzLlByb2plY3RTY29wZTsKIGltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJ1bnRpbWUuQ29yZUV4Y2VwdGlvbjsKLWltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJ1bnRpbWUucHJlZmVyZW5jZXMuSUVjbGlwc2VQcmVmZXJlbmNlczsKLWltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJ1bnRpbWUucHJlZmVyZW5jZXMuSVNjb3BlQ29udGV4dDsKIGltcG9ydCBvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5pbnRlcm5hbC5kZWxlZ2F0ZXMuVmFsaWRhdG9yRGVsZWdhdGVEZXNjcmlwdG9yOwogaW1wb3J0IG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLmludGVybmFsLnBsdWdpbi5WYWxpZGF0aW9uUGx1Z2luOwogaW1wb3J0IG9yZy5vc2dpLnNlcnZpY2UucHJlZnMuQmFja2luZ1N0b3JlRXhjZXB0aW9uOwpAQCAtNDUsMjIgKzQ1LDIxIEBACiAJCS8vIGdsb2JhbCBsaXN0LgogCQlzdXBlcihwcm9qZWN0LCBleHRyYWN0UHJvamVjdFZhbGlkYXRvcnMoY29udmVydFRvQXJyYXkoVmFsaWRhdGlvblJlZ2lzdHJ5UmVhZGVyLmdldFJlYWRlcigpLmdldEFsbFZhbGlkYXRvcnMoKSksIHByb2plY3QpKTsKIAotCQkvLyBDYW4ndCBwdXQgdGhlIGNhbGwgdG8gbG9hZCgpIGFuZCBwYXNzaXZhdGUoKSBpbiB0aGUgVmFsaWRhdGlvbkNvbmZpZ3VyYXRpb24gY29uc3RydWN0b3IKLQkJLy8gZHVlCisJCS8vIENhbid0IHB1dCB0aGUgY2FsbCB0byBsb2FkKCkgYW5kIHBhc3NpdmF0ZSgpIGluIHRoZSBWYWxpZGF0aW9uQ29uZmlndXJhdGlvbiBjb25zdHJ1Y3RvciBkdWUKIAkJLy8gdG8gdGhlIG9yZGVyIG9mIGluaXRpYWxpemF0aW9uLgotCQkvLyAgICAxLiBGaXJzdCB0aGUgVmFsaWRhdGlvbkNvbmZpZ3VyYXRpb24gY29uc3RydWN0b3IgaXMgY2FsbGVkLCBhbmQgdGhhdCBsb2FkcyB0aGUgc3RvcmVkCi0JCS8vIHZhbHVlcy4KKwkJLy8gICAgMS4gRmlyc3QgdGhlIFZhbGlkYXRpb25Db25maWd1cmF0aW9uIGNvbnN0cnVjdG9yIGlzIGNhbGxlZCwgYW5kIHRoYXQgbG9hZHMgdGhlIHN0b3JlZCB2YWx1ZXMuCiAJCS8vICAgIDIuIFRoZW4gdGhpcyBjbGFzcydzIDxpbml0PiBtZXRob2QgaXMgY2FsbGVkLCBhbmQgdGhhdCBpbml0aWFsaXplcyB0aGUgIm92ZXJyaWRlIiBmaWVsZAotCQkvLyB0byB0aGUgZGVmYXVsdCwKLQkJLy8gICAgICAgd2hpY2ggbWF5IGJlIGRpZmZlcmVudCB0aGFuIHRoZSBzdG9yZWQgdmFsdWUuCisJCS8vICAgICAgIHRvIHRoZSBkZWZhdWx0LCB3aGljaCBtYXkgYmUgZGlmZmVyZW50IHRoYW4gdGhlIHN0b3JlZCB2YWx1ZS4KIAl9CiAKIAkvKioKIAkgKiBUaGlzIGNvbnN0cnVjdG9yIGlzIHByb3ZpZGVkIG9ubHkgZm9yIHRoZSBQcm9wZXJ0aWVzIHBhZ2UsIHNvIHRoYXQgdGhlIHBhZ2UgY2FuIHN0b3JlIHZhbHVlcwogCSAqIHdpdGhvdXQgcGVyc2lzdGluZyB0aGVtIChpLmUuLCBpZiB0aGUgdXNlciBwcmVzc2VzIENhbmNlbCB0aGVuIG5vdGhpbmcgbmVlZHMgdG8gYmUgZG9uZS4pCisJICogCisJICogQGRlcHJlY2F0ZWQKIAkgKi8KIAlwdWJsaWMgUHJvamVjdENvbmZpZ3VyYXRpb24oUHJvamVjdENvbmZpZ3VyYXRpb24gb3JpZ2luYWwpIHRocm93cyBJbnZvY2F0aW9uVGFyZ2V0RXhjZXB0aW9uIHsKLQkJc3VwZXIoKTsKKwkJc3VwZXIob3JpZ2luYWwuZ2V0UmVzb3VyY2UoKSk7CiAJCW9yaWdpbmFsLmNvcHlUbyh0aGlzKTsKIAl9CiAKQEAgLTg3LDYgKzg2LDEwIEBACiAJCQlyZXR1cm4gZmFsc2U7CiAJCX0KIAl9CisJCisJcHVibGljIGJvb2xlYW4gZ2V0RG9lc1Byb2plY3RPdmVycmlkZSgpeworCQlyZXR1cm4gX2RvZXNQcm9qZWN0T3ZlcnJpZGU7CisJfQogCiAJcHVibGljIGJvb2xlYW4gZG9lc1Byb2plY3RPdmVycmlkZSgpIHsKIAkJLy8gSWYgdGhlIGdsb2JhbCBwcmVmZXJlbmNlIGRvZXNuJ3QgYWxsb3cgcHJvamVjdHMgdG8gb3ZlcnJpZGUsIGl0IGRvZXNuJ3QgbWF0dGVyIHdoYXQgdGhlCkBAIC00NzgsNyArNDgxLDcgQEAKIAkJCQlTdHJpbmcgZGlzYWJsZUFsbFZhbGlkYXRpb24gPSBzdG9yZWRDb25maWd1cmF0aW9uLnN1YnN0cmluZyhkaXNhYmxlQWxsVmFsaWRhdGlvbkluZGV4ICsgQ29uZmlndXJhdGlvbkNvbnN0YW50cy5ESVNBQkxFX0FMTF9WQUxJREFUSU9OX1NFVFRJTkcubGVuZ3RoKCksIHZlcnNpb25JbmRleCk7CiAJCQkJc2V0RGlzYWJsZUFsbFZhbGlkYXRpb24oQm9vbGVhbi52YWx1ZU9mKGRpc2FibGVBbGxWYWxpZGF0aW9uKS5ib29sZWFuVmFsdWUoKSk7CiAJCQl9IGVsc2UgewotCQkJCXNldERpc2FibGVBbGxWYWxpZGF0aW9uKGZhbHNlKTs7CisJCQkJc2V0RGlzYWJsZUFsbFZhbGlkYXRpb24oZmFsc2UpOwogCQkJfQogCQkJLy8gcHJvamVjdCBkb2Vzbid0IG92ZXJyaWRlIHRoZSBnbG9iYWwKIAkJCWlmIChkaXNhYmxlQWxsVmFsaWRhdGlvbkluZGV4ICE9IC0xKSB7CkBAIC01ODIsMzQgKzU4NSw3NSBAQAogICAKICAgcHVibGljIHZvaWQgc3RvcmUoKSB0aHJvd3MgSW52b2NhdGlvblRhcmdldEV4Y2VwdGlvbiB7CiAJCUlQcm9qZWN0IHByb2plY3QgPSAoSVByb2plY3QpIGdldFJlc291cmNlKCk7Ci0JCUlTY29wZUNvbnRleHQgcHJvamVjdENvbnRleHQgPSBuZXcgUHJvamVjdFNjb3BlKHByb2plY3QpOwotCQlmaW5hbCBJRWNsaXBzZVByZWZlcmVuY2VzIHByZWYgPSBwcm9qZWN0Q29udGV4dC5nZXROb2RlKFZhbGlkYXRpb25QbHVnaW4uUExVR0lOX0lEKTsKKwkJZmluYWwgUHJlZmVyZW5jZXNXcmFwcGVyIHByZWYgPSBQcmVmZXJlbmNlc1dyYXBwZXIuZ2V0UHJlZmVyZW5jZXMocHJvamVjdCwgbnVsbCk7CiAJCWlmIChwcmVmICE9IG51bGwpIHsKIAkJCXRyeSB7Ci0JCQkJcHJlZi5wdXQoVVNFUl9QUkVGRVJFTkNFLCBzZXJpYWxpemUoKSk7Ci0JCQkJcHJlZi5wdXQoVVNFUl9NQU5VQUxfUFJFRkVSRU5DRSwgc2VyaWFsaXplTWFudWFsU2V0dGluZygpKTsKLQkJCQlwcmVmLnB1dChVU0VSX0JVSUxEX1BSRUZFUkVOQ0UsIHNlcmlhbGl6ZUJ1aWxkU2V0dGluZygpKTsKLQkJCQlwcmVmLnB1dChERUxFR0FURVNfUFJFRkVSRU5DRSwgc2VyaWFsaXplRGVsZWdhdGVzU2V0dGluZygpKTsKKwkJCQlwcmVmLnB1dChWYWxpZGF0aW9uQ29uZmlndXJhdGlvbi5Vc2VyUHJlZmVyZW5jZSwgc2VyaWFsaXplKCkpOworCQkJCXByZWYucHV0KFZhbGlkYXRpb25Db25maWd1cmF0aW9uLlVzZXJNYW51YWxQcmVmZXJlbmNlLCBzZXJpYWxpemVNYW51YWxTZXR0aW5nKCkpOworCQkJCXByZWYucHV0KFZhbGlkYXRpb25Db25maWd1cmF0aW9uLlVzZXJCdWlsZFByZWZlcmVuY2UsIHNlcmlhbGl6ZUJ1aWxkU2V0dGluZygpKTsKKwkJCQlwcmVmLnB1dChWYWxpZGF0aW9uQ29uZmlndXJhdGlvbi5EZWxlZ2F0ZXNQcmVmZXJlbmNlLCBzZXJpYWxpemVEZWxlZ2F0ZXNTZXR0aW5nKCkpOwogCQkJCXByZWYuZmx1c2goKTsKIAkJCX0gY2F0Y2ggKEJhY2tpbmdTdG9yZUV4Y2VwdGlvbiBlKSB7Ci0JCQkJVmFsaWRhdGlvblBsdWdpbi5nZXRQbHVnaW4oKS5oYW5kbGVFeGNlcHRpb24oZSk7CisJCQkJLy8gQSBjb21tb24gZXJyb3IgaXMgdGhhdCB0aGUgcHJvamVjdCBoYXMgYmVlbiBjbG9zZWQsIGluIHdoaWNoIGNhc2UgdGhlcmUKKwkJCQkvLyBpcyBub3RoaW5nIHRoYXQgd2UgY2FuIGRvLgorCQkJCWlmIChwcm9qZWN0LmlzQWNjZXNzaWJsZSgpKVZhbGlkYXRpb25QbHVnaW4uZ2V0UGx1Z2luKCkuaGFuZGxlRXhjZXB0aW9uKGUpOwogCQkJfQogCQl9CiAJfQogICAKICAgcHJvdGVjdGVkIHZvaWQgbG9hZFByZWZlcmVuY2UoKSB0aHJvd3MgSW52b2NhdGlvblRhcmdldEV4Y2VwdGlvbiB7CiAJCUlQcm9qZWN0IHByb2plY3QgPSAoSVByb2plY3QpIGdldFJlc291cmNlKCk7Ci0JCUlTY29wZUNvbnRleHQgcHJvamVjdENvbnRleHQgPSBuZXcgUHJvamVjdFNjb3BlKHByb2plY3QpOwotCQlmaW5hbCBJRWNsaXBzZVByZWZlcmVuY2VzIHByZWZzID0gcHJvamVjdENvbnRleHQuZ2V0Tm9kZShWYWxpZGF0aW9uUGx1Z2luLlBMVUdJTl9JRCk7Ci0JCWlmIChwcmVmcyAhPSBudWxsKSB7Ci0JCQlTdHJpbmcgc3RvcmVkQ29uZmlnID0gcHJlZnMuZ2V0KFVTRVJfUFJFRkVSRU5DRSwgRGVmYXVsdFZhbHVlKTsKKwkJZmluYWwgUHJlZmVyZW5jZXNXcmFwcGVyIHByZWZzID0gUHJlZmVyZW5jZXNXcmFwcGVyLmdldFByZWZlcmVuY2VzKHByb2plY3QsIG51bGwpOworCQlpZiAocHJlZnMubm9kZUV4aXN0cygpKSB7IAorCQkJU3RyaW5nIHN0b3JlZENvbmZpZyA9IHByZWZzLmdldChWYWxpZGF0aW9uQ29uZmlndXJhdGlvbi5Vc2VyUHJlZmVyZW5jZSwgRGVmYXVsdFZhbHVlKTsKIAkJCWRlc2VyaWFsaXplKHN0b3JlZENvbmZpZyk7Ci0JCQlTdHJpbmcgc3RvcmVkTWFudWFsQ29uZmlnID0gcHJlZnMuZ2V0KFVTRVJfTUFOVUFMX1BSRUZFUkVOQ0UsIERlZmF1bHRWYWx1ZSk7CisJCQlTdHJpbmcgc3RvcmVkTWFudWFsQ29uZmlnID0gcHJlZnMuZ2V0KFZhbGlkYXRpb25Db25maWd1cmF0aW9uLlVzZXJNYW51YWxQcmVmZXJlbmNlLCBEZWZhdWx0VmFsdWUpOwogCQkJZGVzZXJpYWxpemVNYW51YWwoc3RvcmVkTWFudWFsQ29uZmlnKTsKLQkJCVN0cmluZyBzdG9yZWRCdWlsZENvbmZpZyA9IHByZWZzLmdldChVU0VSX0JVSUxEX1BSRUZFUkVOQ0UsIERlZmF1bHRWYWx1ZSk7CisJCQlTdHJpbmcgc3RvcmVkQnVpbGRDb25maWcgPSBwcmVmcy5nZXQoVmFsaWRhdGlvbkNvbmZpZ3VyYXRpb24uVXNlckJ1aWxkUHJlZmVyZW5jZSwgRGVmYXVsdFZhbHVlKTsKIAkJCWRlc2VyaWFsaXplQnVpbGQoc3RvcmVkQnVpbGRDb25maWcpOwotCQkJU3RyaW5nIHN0b3JlZERlbGVnYXRlc0NvbmZpZ3VyYXRpb24gPSBwcmVmcy5nZXQoREVMRUdBVEVTX1BSRUZFUkVOQ0UsIERlZmF1bHRWYWx1ZSk7CisJCQlTdHJpbmcgc3RvcmVkRGVsZWdhdGVzQ29uZmlndXJhdGlvbiA9IHByZWZzLmdldChWYWxpZGF0aW9uQ29uZmlndXJhdGlvbi5EZWxlZ2F0ZXNQcmVmZXJlbmNlLCBEZWZhdWx0VmFsdWUpOwogCQkJZGVzZXJpYWxpemVEZWxlZ2F0ZXMoc3RvcmVkRGVsZWdhdGVzQ29uZmlndXJhdGlvbik7CiAJCX0KIAl9CisgIAorICAvKioKKyAgICogQW5zd2VyIHRoZSB2YWxpZGF0b3IgaWQncyB0aGF0IGhhdmUgYmVlbiBlbmFibGVkIGZvciBtYW51YWwgdmFsaWRhdGlvbi4KKyAgICogQHJldHVybiBudWxsIGlmIHRoZXkgYXJlIGFsbCBlbmFibGVkCisgICAqLworICBTZXQ8U3RyaW5nPiBnZXRFbmFibGVkTWFudWFsVmFsaWRhdG9ycygpeworCSAgcmV0dXJuIGdldElkcyhWYWxpZGF0aW9uQ29uZmlndXJhdGlvbi5Vc2VyTWFudWFsUHJlZmVyZW5jZSwgQ29uZmlndXJhdGlvbkNvbnN0YW50cy5FTkFCTEVEX01BTlVBTF9WQUxJREFUT1JTKTsKKyAgfQorICAKKyAgLyoqCisgICAqIEFuc3dlciB0aGUgdmFsaWRhdG9yIGlkJ3MgdGhhdCBoYXZlIGJlZW4gZW5hYmxlZCBmb3IgYnVpbGQgdmFsaWRhdGlvbi4KKyAgICogQHJldHVybiBudWxsIGlmIHRoZXkgYXJlIGFsbCBlbmFibGVkCisgICAqLworICBTZXQ8U3RyaW5nPiBnZXRFbmFibGVkQnVpbGRsVmFsaWRhdG9ycygpeworCSAgcmV0dXJuIGdldElkcyhWYWxpZGF0aW9uQ29uZmlndXJhdGlvbi5Vc2VyQnVpbGRQcmVmZXJlbmNlLCBDb25maWd1cmF0aW9uQ29uc3RhbnRzLkVOQUJMRURfQlVJTERfVkFMSURBVE9SUyk7CisgIH0KKyAgCisgIC8qKgorICAgKiBBIGhlbHBlciBtZXRob2QgdG8gZXh0cmFjdCBzb21lIHZhbGlkYXRvciBpZCdzIGZyb20gYSBwcmVmZXJlbmNlIHN0b3JlIGZpZWxkLgorICAgKiAKKyAgICogQHJldHVybiBudWxsIGlmIGFsbCB0aGUgdmFsaWRhdG9ycyBhcmUgZW5hYmxlZC4KKyAgICovCisgIHByaXZhdGUgU2V0PFN0cmluZz4gZ2V0SWRzKFN0cmluZyBwcmVmS2V5LCBTdHJpbmcgZW5hYmxlZFBocmFzZSl7CisJSVByb2plY3QgcHJvamVjdCA9IChJUHJvamVjdCkgZ2V0UmVzb3VyY2UoKTsKKwlmaW5hbCBQcmVmZXJlbmNlc1dyYXBwZXIgcHJlZnMgPSBQcmVmZXJlbmNlc1dyYXBwZXIuZ2V0UHJlZmVyZW5jZXMocHJvamVjdCwgbnVsbCk7CisJaWYgKHByZWZzID09IG51bGwpcmV0dXJuIG51bGw7CisJCisJU3RyaW5nIHN0b3JlZENvbmZpZyA9IHByZWZzLmdldChwcmVmS2V5LCBEZWZhdWx0VmFsdWUpOworCWlmIChzdG9yZWRDb25maWcgPT0gbnVsbCB8fCBzdG9yZWRDb25maWcubGVuZ3RoKCkgPT0gMCB8fCBzdG9yZWRDb25maWcuZXF1YWxzKERlZmF1bHRWYWx1ZSkpcmV0dXJuIG51bGw7CisJaW50IHZhbGlkYXRpb25JbmRleCA9IHN0b3JlZENvbmZpZy5pbmRleE9mKGVuYWJsZWRQaHJhc2UpOworCisJU3RyaW5nIGlkcyA9IHN0b3JlZENvbmZpZy5zdWJzdHJpbmcodmFsaWRhdGlvbkluZGV4ICsgZW5hYmxlZFBocmFzZS5sZW5ndGgoKSxzdG9yZWRDb25maWcubGVuZ3RoKCkpOworCisJU3RyaW5nVG9rZW5pemVyIHRva2VuaXplciA9IG5ldyBTdHJpbmdUb2tlbml6ZXIoaWRzLCBDb25maWd1cmF0aW9uQ29uc3RhbnRzLkVMRU1FTlRfU0VQQVJBVE9SKTsKKwlTZXQ8U3RyaW5nPiBzZXQgPSBuZXcgSGFzaFNldDxTdHJpbmc+KDIwKTsKKwl3aGlsZSAodG9rZW5pemVyLmhhc01vcmVUb2tlbnMoKSlzZXQuYWRkKHRva2VuaXplci5uZXh0VG9rZW4oKSk7CisJaWYgKHNldC5zaXplKCkgPT0gMClyZXR1cm4gbnVsbDsKKwkgIAorCXJldHVybiBzZXQ7CisJICAKKyAgfQogfQpkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi92YWxpZGF0ZS9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9pbnRlcm5hbC9SZWdpc3RyeUNvbnN0YW50cy5qYXZhIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi92YWxpZGF0ZS9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9pbnRlcm5hbC9SZWdpc3RyeUNvbnN0YW50cy5qYXZhCmluZGV4IDgxYTc4YjQuLjE0MDI0MGEgMTAwNjQ0Ci0tLSBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24vdmFsaWRhdGUvb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vaW50ZXJuYWwvUmVnaXN0cnlDb25zdGFudHMuamF2YQorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uL3ZhbGlkYXRlL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL2ludGVybmFsL1JlZ2lzdHJ5Q29uc3RhbnRzLmphdmEKQEAgLTEsNSArMSw1IEBACiAvKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKgotICogQ29weXJpZ2h0IChjKSAyMDAxLCAyMDA3IElCTSBDb3Jwb3JhdGlvbiBhbmQgb3RoZXJzLgorICogQ29weXJpZ2h0IChjKSAyMDAxLCAyMDEwIElCTSBDb3Jwb3JhdGlvbiBhbmQgb3RoZXJzLgogICogQWxsIHJpZ2h0cyByZXNlcnZlZC4gVGhpcyBwcm9ncmFtIGFuZCB0aGUgYWNjb21wYW55aW5nIG1hdGVyaWFscwogICogYXJlIG1hZGUgYXZhaWxhYmxlIHVuZGVyIHRoZSB0ZXJtcyBvZiB0aGUgRWNsaXBzZSBQdWJsaWMgTGljZW5zZSB2MS4wCiAgKiB3aGljaCBhY2NvbXBhbmllcyB0aGlzIGRpc3RyaWJ1dGlvbiwgYW5kIGlzIGF2YWlsYWJsZSBhdApAQCAtNTQsNiArNTQsOSBAQAogCSAqIG9ubHkgb25lIHZhbGlkYXRvciBtYXkgdXNlIGFuIGFnZ3JlZ2F0ZSBvZiB0aGF0IHR5cGUuICovCiAJU3RyaW5nIFRBR19BR0dSRUdBVEVfVkFMSURBVE9SUyA9ICJhZ2dyZWdhdGVWYWxpZGF0b3IiOyAvLyROT04tTkxTLTEkIAogCisJLyoqIHJ1blN0cmF0ZWd5IC0gaWRlbnRpZmllcyB0aGUgcnVuIHN0cmF0ZWd5IG9mICBWYWxpZGF0b3IqLworCVN0cmluZyBUQUdfUlVOX1NUUkFURUdZID0gInJ1blN0cmF0ZWd5IjsgLy8kTk9OLU5MUy0xJAorCQogCS8qKiBvYmplY3RDbGFzcyAtIGlkZW50aWZpZXMgYSB0eXBlICovIAogCVN0cmluZyBBVFRfT0JKRUNUX0NMQVNTID0gIm9iamVjdENsYXNzIjsgLy8kTk9OLU5MUy0xJAogCQpAQCAtMTE5LDYgKzEyMiwxNiBAQAogCS8qKiBmYWxzZSAtIFRoZSAiY2FuIHZhbGlkYXRvciBydW4gYXN5bmNocm9ub3VzbHkiIGRlZmF1bHQuIEluIHRoZSBmdXR1cmUgdGhpcyBtYXkgYmUgY2hhbmdlZCB0byB0cnVlLiAqLwogCWJvb2xlYW4gQVRUX0FTWU5DX0RFRkFVTFQgPSBmYWxzZTsKIAorCS8qKiAKKwkgKiBwcm9qZWN0IC0gaWRlbnRpZmllcyB3aGV0aGVyIG9yIG5vdCB0aGUgdmFsaWRhdG9yIGlzIGNhbGxlZCBwZXIgcHJvamVjdC4gCisJICogRGVmYXVsdCBpcyBmYWxzZSAoaS5lLiB0aGUgdmFsaWRhdG9yIGlzIGNhbGxlZCBwZXIgcmVzb3VyY2UpLiAKKwkgKi8KKwlTdHJpbmcgQVRUX1BST0pFQ1QgPSAicHJvamVjdCI7IC8vJE5PTi1OTFMtMSQKKwkKKwkvKiogZmFsc2UgLSBUaGUgcHJvamVjdCBkZWZhdWx0LiAqLworCWJvb2xlYW4gQVRUX1BST0pFQ1RfREVGQVVMVCA9IGZhbHNlOworCQorCQogCS8qKiBtaWdyYXRlIC0gdGhlICJtaWdyYXRlIiBzZWN0aW9uIG9mIHRoZSB2YWxpZGF0b3IgKi8KIAlTdHJpbmcgVEFHX01JR1JBVEUgPSAibWlncmF0ZSI7IC8vJE5PTi1OTFMtMSQKIAkKZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24vdmFsaWRhdGUvb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vaW50ZXJuYWwvVGFza0xpc3RVdGlsaXR5LmphdmEgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uL3ZhbGlkYXRlL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL2ludGVybmFsL1Rhc2tMaXN0VXRpbGl0eS5qYXZhCmluZGV4IDdkYTYwZDcuLjFjYWUzYzEgMTAwNjQ0Ci0tLSBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24vdmFsaWRhdGUvb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vaW50ZXJuYWwvVGFza0xpc3RVdGlsaXR5LmphdmEKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi92YWxpZGF0ZS9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9pbnRlcm5hbC9UYXNrTGlzdFV0aWxpdHkuamF2YQpAQCAtMjI1LDQ0ICsyMjUsNDMgQEAKIAlwcml2YXRlIHN0YXRpYyBJTWFya2VyW10gZ2V0VmFsaWRhdGlvblRhc2tzKElSZXNvdXJjZSByZXNvdXJjZSwgaW50IHNldmVyaXR5LCBpbnQgZGVwdGgpIHsKIAkJSU1hcmtlcltdIHRlbXBNYXJrZXJzID0gbnVsbDsKIAkJaW50IHZhbGlkQ291bnQgPSAwOworCQlJTWFya2VyW10gYWxsTWFya2VycyA9IG51bGw7CiAJCXRyeSB7Ci0JCQlJTWFya2VyW10gYWxsTWFya2VycyA9IG51bGw7Ci0JCQl0cnkgewotCQkJCWFsbE1hcmtlcnMgPSByZXNvdXJjZS5maW5kTWFya2VycyhWQUxJREFUSU9OX01BUktFUiwgdHJ1ZSwgZGVwdGgpOyAvLyBmYWxzZSBtZWFucwotCQkJCS8vIG9ubHkgY29uc2lkZXIgUFJPQkxFTV9NQVJLRVIsIG5vdCB2YXJpYW50cyBvZiBQUk9CTEVNX01BUktFUi4KLQkJCQkvLyBTaW5jZSBhZGRUYXNrIG9ubHkgYWRkcyBQUk9CTEVNX01BUktFUiwgd2UgZG9uJ3QgbmVlZAotCQkJCS8vIHRvIGNvbnNpZGVyIGl0cyBzdWJ0eXBlcy4KLQkJCX0gY2F0Y2ggKENvcmVFeGNlcHRpb24gZSkgewotCQkJCWlmIChUcmFjaW5nLmlzTG9nZ2luZygpKVZhbGlkYXRpb25QbHVnaW4uZ2V0UGx1Z2luKCkuaGFuZGxlRXhjZXB0aW9uKGUpOwotCQkJCXJldHVybiBOT19NQVJLRVJTOwotCQkJfQorCQkJYWxsTWFya2VycyA9IHJlc291cmNlLmZpbmRNYXJrZXJzKFZBTElEQVRJT05fTUFSS0VSLCB0cnVlLCBkZXB0aCk7CisJCX0gY2F0Y2ggKENvcmVFeGNlcHRpb24gZSkgeworCQkJaWYgKFRyYWNpbmcuaXNMb2dnaW5nKCkpVmFsaWRhdGlvblBsdWdpbi5nZXRQbHVnaW4oKS5oYW5kbGVFeGNlcHRpb24oZSk7CisJCQlyZXR1cm4gTk9fTUFSS0VSUzsKKwkJfQogCi0JCQkvLyBOb3cgZmlsdGVyIGluIHRoZSBtYXJrZXJzLCBiYXNlZCBvbiBzZXZlcml0eSB0eXBlLgotCQkJaWYgKGFsbE1hcmtlcnMubGVuZ3RoICE9IDApIHsKLQkJCQl0ZW1wTWFya2VycyA9IG5ldyBJTWFya2VyW2FsbE1hcmtlcnMubGVuZ3RoXTsKLQkJCQlmb3IgKGludCBpID0gMDsgaSA8IGFsbE1hcmtlcnMubGVuZ3RoOyBpKyspIHsKLQkJCQkJSU1hcmtlciBtYXJrZXIgPSBhbGxNYXJrZXJzW2ldOwotCQkJCQlJbnRlZ2VyIGZpbHRlclNldmVyaXR5ID0gKEludGVnZXIpIG1hcmtlci5nZXRBdHRyaWJ1dGUoVkFMSURBVElPTl9NQVJLRVJfU0VWRVJJVFkpOwotCQkJCQlpZiAoZmlsdGVyU2V2ZXJpdHkgPT0gbnVsbCkgewotCQkJCQkJLy8gb2RkLi4ubWFya2VyIHdhc24ndCBjcmVhdGVkIGNvcnJlY3RseS4gSG93IGNvdWxkIHRoaXMgaGFwcGVuPwotCQkJCQkJLy8gRGVmYXVsdCB0byB0aGUgY3VycmVudCBzZXZlcml0eSBhbmQgYWRkIGl0IHRvIHRoZSBsaXN0LgotCQkJCQkJdHJ5IHsKLQkJCQkJCQkvLyAyMjY1NDEgLSBJIHdhcyBzZWVpbmcgbWFya2VycyB3aXRoIHZhbGlkIHNldmVyaXRpZXMgYmVpbmcgcmVzZXQsIHNvIEkgYWRkZWQgdGhpcwotCQkJCQkJCS8vIGFkZGl0aW9uYWwgdGVzdC4KLQkJCQkJCQlpZiAobWFya2VyLmdldEF0dHJpYnV0ZShJTWFya2VyLlNFVkVSSVRZLCAtMSkgPT0gLTEpCi0JCQkJCQkJCW1hcmtlci5zZXRBdHRyaWJ1dGUoSU1hcmtlci5TRVZFUklUWSwgZ2V0U2V2ZXJpdHkoc2V2ZXJpdHkpKTsKLQkJCQkJCX0gY2F0Y2ggKEV4Y2VwdGlvbiBlKSB7Ci0JCQkJCQkJVmFsaWRhdGlvblBsdWdpbi5nZXRQbHVnaW4oKS5oYW5kbGVFeGNlcHRpb24oZSk7Ci0JCQkJCQkJY29udGludWU7Ci0JCQkJCQl9Ci0JCQkJCX0gZWxzZSBpZiAoKHNldmVyaXR5ICYgZmlsdGVyU2V2ZXJpdHkuaW50VmFsdWUoKSkgPT0gMCkgeworCQkvLyBOb3cgZmlsdGVyIGluIHRoZSBtYXJrZXJzLCBiYXNlZCBvbiBzZXZlcml0eSB0eXBlLgorCQlpZiAoYWxsTWFya2Vycy5sZW5ndGggIT0gMCkgeworCQkJdGVtcE1hcmtlcnMgPSBuZXcgSU1hcmtlclthbGxNYXJrZXJzLmxlbmd0aF07CisJCQlmb3IgKElNYXJrZXIgbWFya2VyIDogYWxsTWFya2VycykgeworCQkJCUludGVnZXIgZmlsdGVyU2V2ZXJpdHkgPSBudWxsOworCQkJCXRyeSB7CisJCQkJCWZpbHRlclNldmVyaXR5ID0gKEludGVnZXIpIG1hcmtlci5nZXRBdHRyaWJ1dGUoVkFMSURBVElPTl9NQVJLRVJfU0VWRVJJVFkpOworCQkJCX0KKwkJCQljYXRjaCAoQ29yZUV4Y2VwdGlvbiBlKXsKKwkJCQkJLy8gU29tZW9uZSBtYXkgaGF2ZSBkZWxldGVkIHRoZSBtYXJrZXIgb24gdXMuIEFsbCB3ZSBjYW4gZG8gaXMgc2tpcCBpdC4KKwkJCQkJY29udGludWU7CisJCQkJfQorCQkJCWlmIChmaWx0ZXJTZXZlcml0eSA9PSBudWxsKSB7CisJCQkJCS8vIG9kZC4uLm1hcmtlciB3YXNuJ3QgY3JlYXRlZCBjb3JyZWN0bHkuIEhvdyBjb3VsZCB0aGlzIGhhcHBlbj8KKwkJCQkJLy8gRGVmYXVsdCB0byB0aGUgY3VycmVudCBzZXZlcml0eSBhbmQgYWRkIGl0IHRvIHRoZSBsaXN0LgorCQkJCQl0cnkgeworCQkJCQkJLy8gMjI2NTQxIC0gSSB3YXMgc2VlaW5nIG1hcmtlcnMgd2l0aCB2YWxpZCBzZXZlcml0aWVzIGJlaW5nIHJlc2V0LCBzbyBJIGFkZGVkIHRoaXMKKwkJCQkJCS8vIGFkZGl0aW9uYWwgdGVzdC4KKwkJCQkJCWlmIChtYXJrZXIuZ2V0QXR0cmlidXRlKElNYXJrZXIuU0VWRVJJVFksIC0xKSA9PSAtMSkKKwkJCQkJCQltYXJrZXIuc2V0QXR0cmlidXRlKElNYXJrZXIuU0VWRVJJVFksIGdldFNldmVyaXR5KHNldmVyaXR5KSk7CisJCQkJCX0gY2F0Y2ggKEV4Y2VwdGlvbiBlKSB7CisJCQkJCQlWYWxpZGF0aW9uUGx1Z2luLmdldFBsdWdpbigpLmhhbmRsZUV4Y2VwdGlvbihlKTsKIAkJCQkJCWNvbnRpbnVlOwogCQkJCQl9Ci0JCQkJCXRlbXBNYXJrZXJzW3ZhbGlkQ291bnQrK10gPSBtYXJrZXI7CisJCQkJfSBlbHNlIGlmICgoc2V2ZXJpdHkgJiBmaWx0ZXJTZXZlcml0eS5pbnRWYWx1ZSgpKSA9PSAwKSB7CisJCQkJCWNvbnRpbnVlOwogCQkJCX0KKwkJCQl0ZW1wTWFya2Vyc1t2YWxpZENvdW50KytdID0gbWFya2VyOwogCQkJfQotCQl9IGNhdGNoIChDb3JlRXhjZXB0aW9uIGUpIHsKLQkJCVZhbGlkYXRpb25QbHVnaW4uZ2V0UGx1Z2luKCkuaGFuZGxlRXhjZXB0aW9uKGUpOwogCQl9CiAKIAkJaWYgKHZhbGlkQ291bnQgPT0gMCkgewpAQCAtMjg0LDM0ICsyODMsMzIgQEAKIAogCXByaXZhdGUgc3RhdGljIElNYXJrZXJbXSBnZXRWYWxpZGF0aW9uVGFza3MoSVJlc291cmNlIHJlc291cmNlLCBTdHJpbmdbXSBtZXNzYWdlT3duZXJzLCBpbnQgZGVwdGgpIHsKIAkJSU1hcmtlcltdIG1hcmtlcnMgPSBnZXRWYWxpZGF0aW9uVGFza3MocmVzb3VyY2UsIElNZXNzYWdlLkFMTF9NRVNTQUdFUywgZGVwdGgpOwotCQlpZiAobWFya2Vycy5sZW5ndGggPT0gMCkgewotCQkJcmV0dXJuIE5PX01BUktFUlM7Ci0JCX0KKwkJaWYgKG1hcmtlcnMubGVuZ3RoID09IDApcmV0dXJuIE5PX01BUktFUlM7CiAKIAkJSU1hcmtlcltdIHRlbXAgPSBuZXcgSU1hcmtlclttYXJrZXJzLmxlbmd0aF07CiAJCWludCB2YWxpZENvdW50ID0gMDsKLQkJZm9yIChpbnQgaSA9IDA7IGkgPCBtYXJrZXJzLmxlbmd0aDsgaSsrKSB7Ci0JCQlJTWFya2VyIG1hcmtlciA9IG1hcmtlcnNbaV07Ci0KKwkJZm9yIChJTWFya2VyIG1hcmtlciA6IG1hcmtlcnMpIHsKKwkJCU9iamVjdCBvd25lciA9IG51bGw7CiAJCQl0cnkgewotCQkJCU9iamVjdCBvd25lciA9IG1hcmtlci5nZXRBdHRyaWJ1dGUoVkFMSURBVElPTl9NQVJLRVJfT1dORVIpOwotCQkJCWlmICgob3duZXIgPT0gbnVsbCkgfHwgIShvd25lciBpbnN0YW5jZW9mIFN0cmluZykpIHsKLQkJCQkJLy8gVGhlIFZhbGlkYXRpb25NaWdyYXRvciB3aWxsIHJlbW92ZSBhbnkgInVub3duZWQiIHZhbGlkYXRpb24gbWFya2Vycy4KLQkJCQkJY29udGludWU7Ci0JCQkJfQotCi0JCQkJZm9yIChpbnQgaiA9IDA7IGogPCBtZXNzYWdlT3duZXJzLmxlbmd0aDsgaisrKSB7Ci0JCQkJCVN0cmluZyBtZXNzYWdlT3duZXIgPSBtZXNzYWdlT3duZXJzW2pdOwotCQkJCQlpZiAoKChTdHJpbmcpIG93bmVyKS5lcXVhbHMobWVzc2FnZU93bmVyKSkgewotCQkJCQkJdGVtcFt2YWxpZENvdW50KytdID0gbWFya2VyOwotCQkJCQkJYnJlYWs7Ci0JCQkJCX0KLQkJCQl9CisJCQkJb3duZXIgPSBtYXJrZXIuZ2V0QXR0cmlidXRlKFZBTElEQVRJT05fTUFSS0VSX09XTkVSKTsKIAkJCX0gY2F0Y2ggKENvcmVFeGNlcHRpb24gZSkgewotCQkJCVZhbGlkYXRpb25QbHVnaW4uZ2V0UGx1Z2luKCkuaGFuZGxlRXhjZXB0aW9uKGUpOwotCQkJCXJldHVybiBOT19NQVJLRVJTOworCQkJCS8vIGVhdCBpdCAtLSBpZiBpdCBubyBsb25nZXIgZXhpc3RzIHRoZXJlIGlzIG5vdGhpbmcgd2UgY2FuIGRvIGFib3V0IGl0CisJCQl9CisJCQkKKwkJCWlmICgob3duZXIgPT0gbnVsbCkgfHwgIShvd25lciBpbnN0YW5jZW9mIFN0cmluZykpIHsKKwkJCQkvLyBUaGUgVmFsaWRhdGlvbk1pZ3JhdG9yIHdpbGwgcmVtb3ZlIGFueSAidW5vd25lZCIgdmFsaWRhdGlvbiBtYXJrZXJzLgorCQkJCWNvbnRpbnVlOworCQkJfQorCisJCQlmb3IgKFN0cmluZyBtZXNzYWdlT3duZXIgOiBtZXNzYWdlT3duZXJzKSB7CisJCQkJaWYgKCgoU3RyaW5nKSBvd25lcikuZXF1YWxzKG1lc3NhZ2VPd25lcikpIHsKKwkJCQkJdGVtcFt2YWxpZENvdW50KytdID0gbWFya2VyOworCQkJCQlicmVhazsKKwkJCQl9CiAJCQl9CiAJCX0KKwkJCisJCWlmICh2YWxpZENvdW50ID09IDApcmV0dXJuIE5PX01BUktFUlM7CiAKIAkJSU1hcmtlcltdIHJlc3VsdCA9IG5ldyBJTWFya2VyW3ZhbGlkQ291bnRdOwogCQlTeXN0ZW0uYXJyYXljb3B5KHRlbXAsIDAsIHJlc3VsdCwgMCwgdmFsaWRDb3VudCk7CmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uL3ZhbGlkYXRlL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL2ludGVybmFsL1ZhbGlkYXRpb25Db25maWd1cmF0aW9uLmphdmEgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uL3ZhbGlkYXRlL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL2ludGVybmFsL1ZhbGlkYXRpb25Db25maWd1cmF0aW9uLmphdmEKaW5kZXggM2M1ZTYxNi4uM2RkYjA4NyAxMDA2NDQKLS0tIGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi92YWxpZGF0ZS9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9pbnRlcm5hbC9WYWxpZGF0aW9uQ29uZmlndXJhdGlvbi5qYXZhCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24vdmFsaWRhdGUvb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vaW50ZXJuYWwvVmFsaWRhdGlvbkNvbmZpZ3VyYXRpb24uamF2YQpAQCAtMSw1ICsxLDUgQEAKIC8qKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqCi0gKiBDb3B5cmlnaHQgKGMpIDIwMDEsIDIwMDggSUJNIENvcnBvcmF0aW9uIGFuZCBvdGhlcnMuCisgKiBDb3B5cmlnaHQgKGMpIDIwMDEsIDIwMDkgSUJNIENvcnBvcmF0aW9uIGFuZCBvdGhlcnMuCiAgKiBBbGwgcmlnaHRzIHJlc2VydmVkLiBUaGlzIHByb2dyYW0gYW5kIHRoZSBhY2NvbXBhbnlpbmcgbWF0ZXJpYWxzCiAgKiBhcmUgbWFkZSBhdmFpbGFibGUgdW5kZXIgdGhlIHRlcm1zIG9mIHRoZSBFY2xpcHNlIFB1YmxpYyBMaWNlbnNlIHYxLjAKICAqIHdoaWNoIGFjY29tcGFuaWVzIHRoaXMgZGlzdHJpYnV0aW9uLCBhbmQgaXMgYXZhaWxhYmxlIGF0CkBAIC0xMCw5ICsxMCw2IEBACiAgKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKi8KIHBhY2thZ2Ugb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uaW50ZXJuYWw7CiAKLWltcG9ydCBqYXZhLmlvLkJ5dGVBcnJheU91dHB1dFN0cmVhbTsKLWltcG9ydCBqYXZhLmlvLklPRXhjZXB0aW9uOwotaW1wb3J0IGphdmEuaW8uT3V0cHV0U3RyZWFtOwogaW1wb3J0IGphdmEubGFuZy5yZWZsZWN0Lkludm9jYXRpb25UYXJnZXRFeGNlcHRpb247CiBpbXBvcnQgamF2YS51dGlsLkNvbGxlY3Rpb247CiBpbXBvcnQgamF2YS51dGlsLkhhc2hNYXA7CkBAIC0zNCw2ICszMSw3IEBACiBpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uaW50ZXJuYWwuZGVsZWdhdGVzLlZhbGlkYXRvckRlbGVnYXRlRGVzY3JpcHRvcjsKIGltcG9ydCBvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5pbnRlcm5hbC5kZWxlZ2F0ZXMuVmFsaWRhdG9yRGVsZWdhdGVzUmVnaXN0cnk7CiBpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uaW50ZXJuYWwucGx1Z2luLlZhbGlkYXRpb25QbHVnaW47CitpbXBvcnQgb3JnLm9zZ2kuc2VydmljZS5wcmVmcy5CYWNraW5nU3RvcmVFeGNlcHRpb247CiAKIC8qKgogICogVGhpcyBjbGFzcyByZXByZXNlbnRzIHRoZSB1c2VyJ3MgcHJlZmVyZW5jZSBvciBwcm9qZWN0IHNldHRpbmdzLgpAQCAtNDIsNyArNDAsNyBAQAogICogcHJvcGVydHkgd2hpbGUgdGhlIHJlc291cmNlIGlzIG9wZW4uCiAgKi8KIHB1YmxpYyBhYnN0cmFjdCBjbGFzcyBWYWxpZGF0aW9uQ29uZmlndXJhdGlvbiBpbXBsZW1lbnRzIElQcm9wZXJ0eUNoYW5nZUxpc3RlbmVyIHsKLQlwcml2YXRlIElSZXNvdXJjZSAJX3Jlc291cmNlOworCXByaXZhdGUgZmluYWwgSVJlc291cmNlIAlfcmVzb3VyY2U7CiAJcHJpdmF0ZSBib29sZWFuIAlkaXNhYmxlQWxsVmFsaWRhdGlvbiA9IGdldERpc2FibGVBbGxWYWxpZGF0aW9uKCk7CiAJcHJpdmF0ZSBTdHJpbmcgCQlfdmVyc2lvbjsKIAkKQEAgLTUwLDIwICs0OCwyNiBAQAogCSAqIE1hcCBvZiBhbGwgdmFsaWRhdG9ycyBjb25maWd1cmVkIG9uIHRoZSBwcm9qZWN0IG9yIGluc3RhbGxlZCBnbG9iYWxseS4gVGhlIHZhbHVlIG9mIHRydWUKIAkgKiBtZWFucyB0aGF0IHRoZSBWTUQgaXMgZW5hYmxlZCwgYW5kIGEgdmFsdWUgb2YgZmFsc2UgbWVhbnMgdGhhdCB0aGUgVk1EIGlzIGRpc2FibGVkLgogCSAqLwotCXByaXZhdGUgTWFwPFZhbGlkYXRvck1ldGFEYXRhLCBCb29sZWFuPgkJX3ZhbGlkYXRvcnM7CisJcHJpdmF0ZSBNYXA8VmFsaWRhdG9yTWV0YURhdGEsIEJvb2xlYW4+CQlfdmFsaWRhdG9ycyA9IG5ldyBIYXNoTWFwPFZhbGlkYXRvck1ldGFEYXRhLCBCb29sZWFuPigpOwogCXByb3RlY3RlZCBNYXA8VmFsaWRhdG9yTWV0YURhdGEsIEJvb2xlYW4+IAltYW51YWxWYWxpZGF0b3JzOwogCXByb3RlY3RlZCBNYXA8VmFsaWRhdG9yTWV0YURhdGEsIEJvb2xlYW4+IAlidWlsZFZhbGlkYXRvcnM7CiAJCi0JcHJvdGVjdGVkIFN0cmluZyBVU0VSX1BSRUZFUkVOQ0UgCQk9ICJVU0VSX1BSRUZFUkVOQ0UiOyAvLyROT04tTkxTLTEkCi0JcHJvdGVjdGVkIFN0cmluZyBVU0VSX01BTlVBTF9QUkVGRVJFTkNFID0gIlVTRVJfTUFOVUFMX1BSRUZFUkVOQ0UiOyAvLyROT04tTkxTLTEkCi0JcHJvdGVjdGVkIFN0cmluZyBVU0VSX0JVSUxEX1BSRUZFUkVOQ0UgCT0gIlVTRVJfQlVJTERfUFJFRkVSRU5DRSI7IC8vJE5PTi1OTFMtMSQKLQlwcm90ZWN0ZWQgU3RyaW5nIERFTEVHQVRFU19QUkVGRVJFTkNFIAk9ICJERUxFR0FURVNfUFJFRkVSRU5DRSI7IC8vJE5PTi1OTFMtMSQKKwlwcm90ZWN0ZWQgc3RhdGljIGZpbmFsIFN0cmluZyBVc2VyUHJlZmVyZW5jZSA9ICJVU0VSX1BSRUZFUkVOQ0UiOyAvLyROT04tTkxTLTEkCisJcHJvdGVjdGVkIHN0YXRpYyBmaW5hbCBTdHJpbmcgVXNlckJ1aWxkUHJlZmVyZW5jZSA9ICJVU0VSX0JVSUxEX1BSRUZFUkVOQ0UiOyAvLyROT04tTkxTLTEkCisJcHJvdGVjdGVkIHN0YXRpYyBmaW5hbCBTdHJpbmcgVXNlck1hbnVhbFByZWZlcmVuY2UgPSAiVVNFUl9NQU5VQUxfUFJFRkVSRU5DRSI7IC8vJE5PTi1OTFMtMSQKKwlwcm90ZWN0ZWQgc3RhdGljIGZpbmFsIFN0cmluZyBEZWxlZ2F0ZXNQcmVmZXJlbmNlID0gIkRFTEVHQVRFU19QUkVGRVJFTkNFIjsgLy8kTk9OLU5MUy0xJAorCQorCS8vIEdSSyAtIEkgYW0ga2VlcGluZyB0aGVzZSAiY29uc3RhbnRzIiBpbiB0aGUgb2ZmIGNoYW5jZSB0aGF0IHRoZXkgd2VyZSB1c2VkIHNvbWV3aGVyZSBvdXRzaWRlIHRoZSBmcmFtZXdvcmsKKwlwcm90ZWN0ZWQgU3RyaW5nIFVTRVJfUFJFRkVSRU5DRSAJCT0gVXNlclByZWZlcmVuY2U7CisJcHJvdGVjdGVkIFN0cmluZyBVU0VSX01BTlVBTF9QUkVGRVJFTkNFID0gVXNlck1hbnVhbFByZWZlcmVuY2U7CisJcHJvdGVjdGVkIFN0cmluZyBVU0VSX0JVSUxEX1BSRUZFUkVOQ0UgCT0gVXNlckJ1aWxkUHJlZmVyZW5jZTsKKwlwcm90ZWN0ZWQgU3RyaW5nIERFTEVHQVRFU19QUkVGRVJFTkNFIAk9IERlbGVnYXRlc1ByZWZlcmVuY2U7CiAJCiAJLyoqCiAJICogVGhlIGtleSBpcyB0aGUgdGFyZ2V0IGlkLCB0aGF0IGlzIHRoZSBpZCBvZiB0aGUgcGxhY2UgaG9sZGVyIHZhbGlkYXRvci4gVGhlIHZhbHVlIGlzIHRoZSBpZCAKIAkgKiBvZiB0aGUgcmVhbCB2YWxpZGF0b3IuIAogCSAqLwotCXByaXZhdGUgTWFwPFN0cmluZywgU3RyaW5nPiBfZGVsZWdhdGVzQnlUYXJnZXQ7CisJcHJpdmF0ZSBNYXA8U3RyaW5nLCBTdHJpbmc+IF9kZWxlZ2F0ZXNCeVRhcmdldCA9IG5ldyBIYXNoTWFwPFN0cmluZywgU3RyaW5nPigpOwogCQogCXByaXZhdGUgc3RhdGljIGZpbmFsIFN0cmluZyBEZWZhdWx0VmFsdWUgPSAiZGVmYXVsdF92YWx1ZSI7IC8vJE5PTi1OTFMtMSQKIApAQCAtMTI0LDI5ICsxMjgsNDcgQEAKIAogCQlyZXR1cm4gcmVzdWx0OwogCX0KKwkKKwkvKioKKwkgKiBBbnN3ZXIgdGhlIHZhbGlkYXRvcnMKKwkgKiBAcmV0dXJuCisJICovCisJcHVibGljIHN0YXRpYyBTZXQ8U3RyaW5nPiBnZXRWYWxpZGF0b3JJZHNNYW51YWwoKXsKKwkJUHJlZmVyZW5jZXNXcmFwcGVyIHByZWZzID0gUHJlZmVyZW5jZXNXcmFwcGVyLmdldFByZWZlcmVuY2VzKG51bGwsIG51bGwpOworCQlTdHJpbmcgY29uZmlnID0gcHJlZnMuZ2V0KFVzZXJNYW51YWxQcmVmZXJlbmNlLCBudWxsKTsKKwkJcmV0dXJuIGdldFZhbGlkYXRvcklkcyhjb25maWcpOworCX0KKwkKKwlwdWJsaWMgc3RhdGljIFNldDxTdHJpbmc+IGdldFZhbGlkYXRvcklkc0J1aWxkKCl7CisJCVByZWZlcmVuY2VzV3JhcHBlciBwcmVmcyA9IFByZWZlcmVuY2VzV3JhcHBlci5nZXRQcmVmZXJlbmNlcyhudWxsLCBudWxsKTsKKwkJU3RyaW5nIGNvbmZpZyA9IHByZWZzLmdldChVc2VyQnVpbGRQcmVmZXJlbmNlLCBudWxsKTsKKwkJcmV0dXJuIGdldFZhbGlkYXRvcklkcyhjb25maWcpOworCX0KKwkKKwlwcml2YXRlIHN0YXRpYyBTZXQ8U3RyaW5nPiBnZXRWYWxpZGF0b3JJZHMoU3RyaW5nIGVsZW1lbnRzKXsKKwkJU2V0PFN0cmluZz4gc2V0ID0gbmV3IEhhc2hTZXQ8U3RyaW5nPig1MCk7CisJCWlmIChlbGVtZW50cyAhPSBudWxsKXsKKwkJCVN0cmluZ1Rva2VuaXplciB0b2tlbml6ZXIgPSBuZXcgU3RyaW5nVG9rZW5pemVyKGVsZW1lbnRzLCBDb25maWd1cmF0aW9uQ29uc3RhbnRzLkVMRU1FTlRfU0VQQVJBVE9SKTsKKwkJCXdoaWxlICh0b2tlbml6ZXIuaGFzTW9yZVRva2VucygpKXNldC5hZGQodG9rZW5pemVyLm5leHRUb2tlbigpKTsKKwkJfQorCQlyZXR1cm4gc2V0OworCX0KIAogCXB1YmxpYyBzdGF0aWMgSVdvcmtzcGFjZVJvb3QgZ2V0Um9vdCgpIHsKIAkJcmV0dXJuIFJlc291cmNlc1BsdWdpbi5nZXRXb3Jrc3BhY2UoKS5nZXRSb290KCk7CiAJfQotCi0JcHJvdGVjdGVkIFZhbGlkYXRpb25Db25maWd1cmF0aW9uKCkgdGhyb3dzIEludm9jYXRpb25UYXJnZXRFeGNlcHRpb24gewotCQlfdmFsaWRhdG9ycyA9IG5ldyBIYXNoTWFwPFZhbGlkYXRvck1ldGFEYXRhLCBCb29sZWFuPigpOwotCQlfZGVsZWdhdGVzQnlUYXJnZXQgPSBuZXcgSGFzaE1hcDxTdHJpbmcsIFN0cmluZz4oKTsKKwkKKwlwcm90ZWN0ZWQgVmFsaWRhdGlvbkNvbmZpZ3VyYXRpb24oSVJlc291cmNlIHJlc291cmNlKXsKKwkJX3Jlc291cmNlID0gcmVzb3VyY2U7CiAJfQogCiAJcHJvdGVjdGVkIFZhbGlkYXRpb25Db25maWd1cmF0aW9uKElSZXNvdXJjZSByZXNvdXJjZSwgVmFsaWRhdG9yTWV0YURhdGFbXSB2YWxpZGF0b3JzKSB0aHJvd3MgSW52b2NhdGlvblRhcmdldEV4Y2VwdGlvbiB7Ci0JCXRoaXMoKTsKLQogCQlpZiAocmVzb3VyY2UgPT0gbnVsbCkgewogCQkJdGhyb3cgbmV3IEludm9jYXRpb25UYXJnZXRFeGNlcHRpb24obnVsbCwgUmVzb3VyY2VIYW5kbGVyLmdldEV4dGVybmFsaXplZE1lc3NhZ2UoUmVzb3VyY2VDb25zdGFudHMuVkJGX0VYQ19OVUxMQ1JFQVRFKSk7CiAJCX0KIAotCQlzZXRSZXNvdXJjZShyZXNvdXJjZSk7Ci0JCXNldFZhbGlkYXRvcnModmFsaWRhdG9ycyk7Ci0JfQotCi0JcHJpdmF0ZSB2b2lkIHNldFJlc291cmNlKElSZXNvdXJjZSByZXNvdXJjZSkgewogCQlfcmVzb3VyY2UgPSByZXNvdXJjZTsKKwkJc2V0VmFsaWRhdG9ycyh2YWxpZGF0b3JzKTsKIAl9CiAJCiAJcHVibGljIGJvb2xlYW4gaXNEaXNhYmxlQWxsVmFsaWRhdGlvbigpIHRocm93cyBJbnZvY2F0aW9uVGFyZ2V0RXhjZXB0aW9uIHsKQEAgLTE4Myw4ICsyMDUsOSBAQAogCQlWYWxpZGF0b3JNZXRhRGF0YVtdIHJlc3VsdCA9IG51bGw7CiAJCSAKIAkJaWYoICFpc0Rpc2FibGVBbGxWYWxpZGF0aW9uKCkgKXsKLQkJCVZhbGlkYXRvck1ldGFEYXRhW10gdGVtcCA9IG5ldyBWYWxpZGF0b3JNZXRhRGF0YVtudW1iZXJPZlZhbGlkYXRvcnMoKV07Ci0JCQlmb3IgKFZhbGlkYXRvck1ldGFEYXRhIHZtZCA6IGdldEJ1aWxkRW5hYmxlZFZhbGlkYXRvcnNNYXAoKS5rZXlTZXQoKSkgeworCQkJU2V0PFZhbGlkYXRvck1ldGFEYXRhPiBzZXQgPSBnZXRCdWlsZEVuYWJsZWRWYWxpZGF0b3JzTWFwKCkua2V5U2V0KCk7CisJCQlWYWxpZGF0b3JNZXRhRGF0YVtdIHRlbXAgPSBuZXcgVmFsaWRhdG9yTWV0YURhdGFbc2V0LnNpemUoKV07CisJCQlmb3IgKFZhbGlkYXRvck1ldGFEYXRhIHZtZCA6IHNldCkgewogCQkJCUJvb2xlYW4gYnZhbHVlID0gZ2V0QnVpbGRFbmFibGVkVmFsaWRhdG9yc01hcCgpLmdldCh2bWQpOwogCQkJCWlmIChidmFsdWUpIHsKIAkJCQkJLy8gSWYgdGhlIHZhbGlkYXRvciBpcyBlbmFibGVkCkBAIC00MzcsNiArNDYwLDcgQEAKIAogCS8qKgogCSAqIFRoaXMgcHJlZmVyZW5jZSBoYXMgYmVlbiBtaWdyYXRlZDsgY2hhbmdlIHRoZSB2ZXJzaW9uIHRvIHRoZSBjdXJyZW50IHZlcnNpb24uCisJICogQGRlcHJlY2F0ZWQgZGVhZCBjb2RlLgogCSAqLwogCXB1YmxpYyB2b2lkIG1hcmtWZXJzaW9uQ3VycmVudCgpIHsKIAkJLy8gVGhlIHZlcnNpb24gc2hvdWxkIG5vdCBiZSBtYXJrZWQgY3VycmVudCB1bnRpbCB0aGUgbWlncmF0aW9uIGlzIGNvbXBsZXRlCkBAIC01MzYsMjcgKzU2MCwyOCBAQAogCQlTeXN0ZW0uYXJyYXljb3B5KGMsIDAsIHJlc3VsdCwgMCwgbGVuZ3RoKTsKIAkJcmV0dXJuIHJlc3VsdDsKIAl9Ci0KKwkKIAkvKioKIAkgKiBTYXZlIHRoZSB2YWx1ZXMgb2YgdGhlc2UgZmllbGRzIGJlZm9yZSB0aGUgcHJvamVjdCBvciB3b3Jrc3BhY2UgaXMgY2xvc2VkLgogCSAqLwogCXB1YmxpYyB2b2lkIHN0b3JlKCkgdGhyb3dzIEludm9jYXRpb25UYXJnZXRFeGNlcHRpb24gewotCQlQcmVmZXJlbmNlcyBwcmVmID0gVmFsaWRhdGlvblBsdWdpbi5nZXRQbHVnaW4oKS5nZXRQbHVnaW5QcmVmZXJlbmNlcygpOwotCQlpZiAocHJlZiAhPSBudWxsKSB7Ci0JCQl0cnkgewotCQkJCU91dHB1dFN0cmVhbSBvcyA9IG5ldyBCeXRlQXJyYXlPdXRwdXRTdHJlYW0oKTsKLQkJCQlwcmVmLnNldFZhbHVlKFVTRVJfUFJFRkVSRU5DRSwgc2VyaWFsaXplKCkpOwotCQkJCXByZWYuc3RvcmUob3MsIFVTRVJfUFJFRkVSRU5DRSk7Ci0JCQkJcHJlZi5zZXRWYWx1ZShVU0VSX01BTlVBTF9QUkVGRVJFTkNFLCBzZXJpYWxpemVNYW51YWxTZXR0aW5nKCkpOwotCQkJCXByZWYuc3RvcmUob3MsIFVTRVJfTUFOVUFMX1BSRUZFUkVOQ0UpOwotCQkJCXByZWYuc2V0VmFsdWUoVVNFUl9CVUlMRF9QUkVGRVJFTkNFLCBzZXJpYWxpemVCdWlsZFNldHRpbmcoKSk7Ci0JCQkJcHJlZi5zdG9yZShvcywgVVNFUl9CVUlMRF9QUkVGRVJFTkNFKTsKLQkJCQlwcmVmLnNldFZhbHVlKERFTEVHQVRFU19QUkVGRVJFTkNFLCBzZXJpYWxpemVEZWxlZ2F0ZXNTZXR0aW5nKCkpOwotCQkJCXByZWYuc3RvcmUob3MsIERFTEVHQVRFU19QUkVGRVJFTkNFKTsKLQkJCX0gY2F0Y2ggKElPRXhjZXB0aW9uIGUpIHsKLQkJCQlWYWxpZGF0aW9uUGx1Z2luLmdldFBsdWdpbigpLmhhbmRsZUV4Y2VwdGlvbihlKTsKLQkJCX0KKwkJc3RvcmUobnVsbCk7CisJfQogCisJLyoqCisJICogU2F2ZSB0aGUgdmFsdWVzIG9mIHRoZXNlIGZpZWxkcyBiZWZvcmUgdGhlIHByb2plY3Qgb3Igd29ya3NwYWNlIGlzIGNsb3NlZC4KKwkgKi8KKwlwdWJsaWMgdm9pZCBzdG9yZShCb29sZWFuIHBlcnNpc3QpIHRocm93cyBJbnZvY2F0aW9uVGFyZ2V0RXhjZXB0aW9uIHsKKwkJUHJlZmVyZW5jZXNXcmFwcGVyIHByZWYgPSBQcmVmZXJlbmNlc1dyYXBwZXIuZ2V0UHJlZmVyZW5jZXMobnVsbCwgcGVyc2lzdCk7CisJCXByZWYucHV0KFZhbGlkYXRpb25Db25maWd1cmF0aW9uLlVzZXJQcmVmZXJlbmNlLCBzZXJpYWxpemUoKSk7CisJCXByZWYucHV0KFZhbGlkYXRpb25Db25maWd1cmF0aW9uLlVzZXJNYW51YWxQcmVmZXJlbmNlLCBzZXJpYWxpemVNYW51YWxTZXR0aW5nKCkpOworCQlwcmVmLnB1dChWYWxpZGF0aW9uQ29uZmlndXJhdGlvbi5Vc2VyQnVpbGRQcmVmZXJlbmNlLCBzZXJpYWxpemVCdWlsZFNldHRpbmcoKSk7CisJCXByZWYucHV0KFZhbGlkYXRpb25Db25maWd1cmF0aW9uLkRlbGVnYXRlc1ByZWZlcmVuY2UsIHNlcmlhbGl6ZURlbGVnYXRlc1NldHRpbmcoKSk7CisJCXRyeSB7CisJCQlwcmVmLmZsdXNoKCk7CisJCX0KKwkJY2F0Y2ggKEJhY2tpbmdTdG9yZUV4Y2VwdGlvbiBlKXsKKwkJCXRocm93IG5ldyBJbnZvY2F0aW9uVGFyZ2V0RXhjZXB0aW9uKGUpOwogCQl9CiAJfQogCkBAIC02ODgsMjQgKzcxMywyMiBAQAogCQkvLyAxLiBUaGlzIGlzIGEgbmV3IHdvcmtzcGFjZSBhbmQgbm8gcHJlZmVyZW5jZXMgZXhpc3QuCiAJCS8vIDIuIFRoaXMgaXMgYSBtaWdyYXRlZCB3b3Jrc3BhY2UgYW5kIHRoZSBvbGQgcHJlZmVyZW5jZXMgaGF2ZSBhbHJlYWR5IGJlZW4gY3JlYXRlZCBhcwogCQkvLyBwZXJzaXN0ZW50IHByb3BlcnRpZXMuCi0JCVByZWZlcmVuY2VzIHByZWZzID0gVmFsaWRhdGlvblBsdWdpbi5nZXRQbHVnaW4oKS5nZXRQbHVnaW5QcmVmZXJlbmNlcygpOwotCQlpZiAocHJlZnMgIT0gbnVsbCkgewotCQkJZGVzZXJpYWxpemVBbGxQcmVmcyhwcmVmcyk7Ci0JCX0KKwkJUHJlZmVyZW5jZXNXcmFwcGVyIHByZWZzID0gUHJlZmVyZW5jZXNXcmFwcGVyLmdldFByZWZlcmVuY2VzKG51bGwsIG51bGwpOworCQlkZXNlcmlhbGl6ZUFsbFByZWZzKHByZWZzKTsKIAl9CiAKIAkvKioKIAkgKiBAcGFyYW0gcHJlZnMKIAkgKiBAdGhyb3dzIEludm9jYXRpb25UYXJnZXRFeGNlcHRpb24KIAkgKi8KLQlwcml2YXRlIHZvaWQgZGVzZXJpYWxpemVBbGxQcmVmcyhQcmVmZXJlbmNlcyBwcmVmcykgdGhyb3dzIEludm9jYXRpb25UYXJnZXRFeGNlcHRpb24gewotCQlTdHJpbmcgc3RvcmVkQ29uZmlnID0gcHJlZnMuZ2V0U3RyaW5nKFVTRVJfUFJFRkVSRU5DRSk7CisJcHJpdmF0ZSB2b2lkIGRlc2VyaWFsaXplQWxsUHJlZnMoUHJlZmVyZW5jZXNXcmFwcGVyIHByZWZzKSB0aHJvd3MgSW52b2NhdGlvblRhcmdldEV4Y2VwdGlvbiB7CisJCVN0cmluZyBzdG9yZWRDb25maWcgPSBwcmVmcy5nZXQoVmFsaWRhdGlvbkNvbmZpZ3VyYXRpb24uVXNlclByZWZlcmVuY2UsIG51bGwpOwogCQlkZXNlcmlhbGl6ZShzdG9yZWRDb25maWcpOwotCQlTdHJpbmcgc3RvcmVkTWFudWFsQ29uZmlnID0gcHJlZnMuZ2V0U3RyaW5nKFVTRVJfTUFOVUFMX1BSRUZFUkVOQ0UpOworCQlTdHJpbmcgc3RvcmVkTWFudWFsQ29uZmlnID0gcHJlZnMuZ2V0KFZhbGlkYXRpb25Db25maWd1cmF0aW9uLlVzZXJNYW51YWxQcmVmZXJlbmNlLCBudWxsKTsKIAkJZGVzZXJpYWxpemVNYW51YWwoc3RvcmVkTWFudWFsQ29uZmlnKTsKLQkJU3RyaW5nIHN0b3JlZEJ1aWxkQ29uZmlnID0gcHJlZnMuZ2V0U3RyaW5nKFVTRVJfQlVJTERfUFJFRkVSRU5DRSk7CisJCVN0cmluZyBzdG9yZWRCdWlsZENvbmZpZyA9IHByZWZzLmdldChWYWxpZGF0aW9uQ29uZmlndXJhdGlvbi5Vc2VyQnVpbGRQcmVmZXJlbmNlLCBudWxsKTsKIAkJZGVzZXJpYWxpemVCdWlsZChzdG9yZWRCdWlsZENvbmZpZyk7Ci0JCVN0cmluZyBzdG9yZWREZWxlZ2F0ZXNDb25maWd1cmF0aW9uID0gcHJlZnMuZ2V0U3RyaW5nKERFTEVHQVRFU19QUkVGRVJFTkNFKTsKKwkJU3RyaW5nIHN0b3JlZERlbGVnYXRlc0NvbmZpZ3VyYXRpb24gPSBwcmVmcy5nZXQoVmFsaWRhdGlvbkNvbmZpZ3VyYXRpb24uRGVsZWdhdGVzUHJlZmVyZW5jZSwgbnVsbCk7CiAJCWRlc2VyaWFsaXplRGVsZWdhdGVzKHN0b3JlZERlbGVnYXRlc0NvbmZpZ3VyYXRpb24pOwogCX0KIAkKQEAgLTcyMywxMyArNzQ2LDEzIEBACiAKIAlwcml2YXRlIHZvaWQgZGVzZXJpYWxpemVBbGxQcmVmcyhQcm9wZXJ0eUNoYW5nZUV2ZW50IGV2ZW50KSB0aHJvd3MgSW52b2NhdGlvblRhcmdldEV4Y2VwdGlvbiB7CiAJCVN0cmluZyBzdG9yZWRDb25maWcgPSAoU3RyaW5nKWV2ZW50LmdldE5ld1ZhbHVlKCk7Ci0JCWlmKCBldmVudC5nZXRQcm9wZXJ0eSgpLmVxdWFscyhVU0VSX1BSRUZFUkVOQ0UpICl7CisJCWlmKCBldmVudC5nZXRQcm9wZXJ0eSgpLmVxdWFscyhWYWxpZGF0aW9uQ29uZmlndXJhdGlvbi5Vc2VyUHJlZmVyZW5jZSkgKXsKIAkJCWRlc2VyaWFsaXplKHN0b3JlZENvbmZpZyk7Ci0JCX1lbHNlIGlmKGV2ZW50LmdldFByb3BlcnR5KCkuZXF1YWxzKFVTRVJfTUFOVUFMX1BSRUZFUkVOQ0UpKXsKKwkJfWVsc2UgaWYoZXZlbnQuZ2V0UHJvcGVydHkoKS5lcXVhbHMoVmFsaWRhdGlvbkNvbmZpZ3VyYXRpb24uVXNlck1hbnVhbFByZWZlcmVuY2UpKXsKIAkJCWRlc2VyaWFsaXplTWFudWFsKHN0b3JlZENvbmZpZyk7Ci0JCX1lbHNlIGlmKGV2ZW50LmdldFByb3BlcnR5KCkuZXF1YWxzKFVTRVJfQlVJTERfUFJFRkVSRU5DRSkpeworCQl9ZWxzZSBpZihldmVudC5nZXRQcm9wZXJ0eSgpLmVxdWFscyhWYWxpZGF0aW9uQ29uZmlndXJhdGlvbi5Vc2VyQnVpbGRQcmVmZXJlbmNlKSl7CiAJCQlkZXNlcmlhbGl6ZUJ1aWxkKHN0b3JlZENvbmZpZyk7Ci0JCX1lbHNlIGlmKGV2ZW50LmdldFByb3BlcnR5KCkuZXF1YWxzKERFTEVHQVRFU19QUkVGRVJFTkNFKSl7CisJCX1lbHNlIGlmKGV2ZW50LmdldFByb3BlcnR5KCkuZXF1YWxzKFZhbGlkYXRpb25Db25maWd1cmF0aW9uLkRlbGVnYXRlc1ByZWZlcmVuY2UpKXsKIAkJCWRlc2VyaWFsaXplRGVsZWdhdGVzKHN0b3JlZENvbmZpZyk7CiAJCX0KIAl9CkBAIC03ODcsNyArODEwLDYgQEAKIAogCXByb3RlY3RlZCB2b2lkIGNvcHlUbyhWYWxpZGF0aW9uQ29uZmlndXJhdGlvbiB1cCkgdGhyb3dzIEludm9jYXRpb25UYXJnZXRFeGNlcHRpb24gewogCQl1cC5zZXRWZXJzaW9uKGdldFZlcnNpb24oKSk7Ci0JCXVwLnNldFJlc291cmNlKGdldFJlc291cmNlKCkpOwogCQl1cC5zZXRWYWxpZGF0b3JzKGdldFZhbGlkYXRvcnMoKSk7CiAJCXVwLnNldERpc2FibGVBbGxWYWxpZGF0aW9uKGlzRGlzYWJsZUFsbFZhbGlkYXRpb24oKSk7CiAJCXVwLnNldEVuYWJsZWRWYWxpZGF0b3JzKGdldEVuYWJsZWRWYWxpZGF0b3JzKCkpOwpAQCAtOTcwLDcgKzk5Miw3IEBACiAJCQkJU3RyaW5nIGRpc2FibGVBbGxWYWxpZGF0aW9uID0gc3RvcmVkQ29uZmlndXJhdGlvbi5zdWJzdHJpbmcoZGlzYWJsZUFsbFZhbGlkYXRpb25JbmRleCArIENvbmZpZ3VyYXRpb25Db25zdGFudHMuRElTQUJMRV9BTExfVkFMSURBVElPTl9TRVRUSU5HLmxlbmd0aCgpLHZlcnNpb25JbmRleCk7CiAJCQkJc2V0RGlzYWJsZUFsbFZhbGlkYXRpb24oQm9vbGVhbi52YWx1ZU9mKGRpc2FibGVBbGxWYWxpZGF0aW9uKS5ib29sZWFuVmFsdWUoKSk7CiAJCX0gZWxzZSB7Ci0JCQkJc2V0RGlzYWJsZUFsbFZhbGlkYXRpb24oZmFsc2UpOzsKKwkJCQlzZXREaXNhYmxlQWxsVmFsaWRhdGlvbihmYWxzZSk7CiAJCX0KIAkJCiAJfQpkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi92YWxpZGF0ZS9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9pbnRlcm5hbC9WYWxpZGF0aW9uUmVnaXN0cnlSZWFkZXIuamF2YSBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24vdmFsaWRhdGUvb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vaW50ZXJuYWwvVmFsaWRhdGlvblJlZ2lzdHJ5UmVhZGVyLmphdmEKaW5kZXggZDllZDFhOC4uN2E0ZDVmMSAxMDA2NDQKLS0tIGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi92YWxpZGF0ZS9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9pbnRlcm5hbC9WYWxpZGF0aW9uUmVnaXN0cnlSZWFkZXIuamF2YQorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uL3ZhbGlkYXRlL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL2ludGVybmFsL1ZhbGlkYXRpb25SZWdpc3RyeVJlYWRlci5qYXZhCkBAIC0xLDUgKzEsNSBAQAogLyoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioKLSAqIENvcHlyaWdodCAoYykgMjAwMSwgMjAwOCBJQk0gQ29ycG9yYXRpb24gYW5kIG90aGVycy4KKyAqIENvcHlyaWdodCAoYykgMjAwMSwgMjAxMCBJQk0gQ29ycG9yYXRpb24gYW5kIG90aGVycy4KICAqIEFsbCByaWdodHMgcmVzZXJ2ZWQuIFRoaXMgcHJvZ3JhbSBhbmQgdGhlIGFjY29tcGFueWluZyBtYXRlcmlhbHMKICAqIGFyZSBtYWRlIGF2YWlsYWJsZSB1bmRlciB0aGUgdGVybXMgb2YgdGhlIEVjbGlwc2UgUHVibGljIExpY2Vuc2UgdjEuMAogICogd2hpY2ggYWNjb21wYW5pZXMgdGhpcyBkaXN0cmlidXRpb24sIGFuZCBpcyBhdmFpbGFibGUgYXQKQEAgLTU0LDM2ICs1NCw0MCBAQAogICogVmFsaWRhdG9yTWFuYWdlcidzIGxvYWRWYWxpZGF0b3JNZXRhRGF0YShJUHJvamVjdCkgbWV0aG9kLiBWYWxpZGF0b3JNYW5hZ2VyIGRlbGVnYXRlcyB0aGUgbG9hZAogICogY2FsbCB0byB0aGlzIGNsYXNzLCBhbmQgaWYgdGhpcyBjbGFzcyBpcyBudWxsLCB0aGUgc2luZ2xldG9uIGlzIG5ldydlZCB1cCwgYW5kIHRoZSByZWdpc3RyeSBpcwogICogcmVhZC4KLSAqIAorICogPHA+CiAgKiBObyBWYWxpZGF0b3Igc2hvdWxkIG5lZWQgdG8ga25vdyBhYm91dCB0aGlzIGNsYXNzLiBUaGUgb25seSBjbGFzcyB3aGljaCBzaG91bGQgY2FsbAogICogVmFsaWRhdGlvblJlZ2lzdHJ5UmVhZGVyIGlzIFZhbGlkYXRvck1hbmFnZXIuCi0gKiAKKyAqIDwvcD4KKyAqIDxwPgogICogVGhlIFZhbGlkYXRvciBpdHNlbGYgaXMgaW5pdGlhbGl6ZWQgaW4gdGhlICJpbml0aWFsaXplVmFsaWRhdG9yIiBtZXRob2QuCi0gKiAKLSAqIDxleHRlbnNpb24gcG9pbnQ9Im9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLmludGVybmFsLnByb3Zpc2lvbmFsLmNvcmUuY29yZS52YWxpZGF0b3IiIGlkPSJFSkJWYWxpZGF0b3IiIG5hbWU9IkVKQgotICogVmFsaWRhdG9yIj4gPHZhbGlkYXRvcj48cHJvamVjdE5hdHVyZSBpZD0iY29tLmlibS5ldG9vbHMuajJlZS5FSkJOYXR1cmUiIGluY2x1ZGU9ImZhbHNlIi8+Ci0gKiA8ZmlsdGVyIG9iamVjdENsYXNzPSJvcmcuZWNsaXBzZS5jb3JlLnJlc291cmNlcy5JRmlsZSIgbmFtZUZpbHRlciA9ICJlamItamFyLnhtbCIvPiA8ZmlsdGVyCi0gKiBvYmplY3RDbGFzcz0ib3JnLmVjbGlwc2UuY29yZS5yZXNvdXJjZXMuSUZpbGUiIG5hbWVGaWx0ZXIgPSAiKi5qYXZhIi8+IDxoZWxwZXIKLSAqIGNsYXNzPSJvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5pbnRlcm5hbC5wcm92aXNpb25hbC5jb3JlLmNvcmUuZWpiLndvcmtiZW5jaGltcGwuRUpCSGVscGVyIi8+IDxydW4KLSAqIGNsYXNzPSJvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5pbnRlcm5hbC5wcm92aXNpb25hbC5jb3JlLmNvcmUuZWpiLkVKQlZhbGlkYXRvciIgaW5jcmVtZW50YWw9ImZhbHNlIiBlbmFibGVkPSJmYWxzZSIKLSAqIHBhc3M9ImZhc3QsZnVsbCIgYXN5bmM9ImZhbHNlIi8+IDxhZ2dyZWdhdGVWYWxpZGF0b3IgY2xhc3M9Im15LmFnZ3JlZ2F0ZS5WYWxpZGF0b3JDbGFzcyIvPgotICogPG1pZ3JhdGU+PHZhbGlkYXRvciBmcm9tPSJvbGQuY2xhc3MubmFtZSIgdG89Im5ldy5jbGFzcy5uYW1lIi8+IDwvbWlncmF0ZT4gPC92YWxpZGF0b3I+Ci0gKiA8L2V4dGVuc2lvbj4KKyAqIDwvcD4KICAqLwogcHVibGljIGZpbmFsIGNsYXNzIFZhbGlkYXRpb25SZWdpc3RyeVJlYWRlciBpbXBsZW1lbnRzIFJlZ2lzdHJ5Q29uc3RhbnRzIHsKLQlwcml2YXRlIHN0YXRpYyBWYWxpZGF0aW9uUmVnaXN0cnlSZWFkZXIgaW5zdDsKKwkKKwkgLyogPGV4dGVuc2lvbiBwb2ludD0ib3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uaW50ZXJuYWwucHJvdmlzaW9uYWwuY29yZS5jb3JlLnZhbGlkYXRvciIgaWQ9IkVKQlZhbGlkYXRvciIgbmFtZT0iRUpCCisJCSAqIFZhbGlkYXRvciI+IDx2YWxpZGF0b3I+PHByb2plY3ROYXR1cmUgaWQ9ImNvbS5pYm0uZXRvb2xzLmoyZWUuRUpCTmF0dXJlIiBpbmNsdWRlPSJmYWxzZSIvPgorCQkgKiA8ZmlsdGVyIG9iamVjdENsYXNzPSJvcmcuZWNsaXBzZS5jb3JlLnJlc291cmNlcy5JRmlsZSIgbmFtZUZpbHRlciA9ICJlamItamFyLnhtbCIvPiA8ZmlsdGVyCisJCSAqIG9iamVjdENsYXNzPSJvcmcuZWNsaXBzZS5jb3JlLnJlc291cmNlcy5JRmlsZSIgbmFtZUZpbHRlciA9ICIqLmphdmEiLz4gPGhlbHBlcgorCQkgKiBjbGFzcz0ib3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uaW50ZXJuYWwucHJvdmlzaW9uYWwuY29yZS5jb3JlLmVqYi53b3JrYmVuY2hpbXBsLkVKQkhlbHBlciIvPiA8cnVuCisJCSAqIGNsYXNzPSJvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5pbnRlcm5hbC5wcm92aXNpb25hbC5jb3JlLmNvcmUuZWpiLkVKQlZhbGlkYXRvciIgaW5jcmVtZW50YWw9ImZhbHNlIiBlbmFibGVkPSJmYWxzZSIKKwkJICogcGFzcz0iZmFzdCxmdWxsIiBhc3luYz0iZmFsc2UiLz4gPGFnZ3JlZ2F0ZVZhbGlkYXRvciBjbGFzcz0ibXkuYWdncmVnYXRlLlZhbGlkYXRvckNsYXNzIi8+CisJCSAqIDxtaWdyYXRlPjx2YWxpZGF0b3IgZnJvbT0ib2xkLmNsYXNzLm5hbWUiIHRvPSJuZXcuY2xhc3MubmFtZSIvPiA8L21pZ3JhdGU+IDwvdmFsaWRhdG9yPgorCQkgKiA8L2V4dGVuc2lvbj4KKwkJICovCisJCisJcHJpdmF0ZSBzdGF0aWMgVmFsaWRhdGlvblJlZ2lzdHJ5UmVhZGVyIF9pbnN0ID0gbmV3IFZhbGlkYXRpb25SZWdpc3RyeVJlYWRlcigpOwogCQogCS8qKiBsaXN0IG9mIGFsbCB2YWxpZGF0b3JzIHJlZ2lzdGVyZWQsIHdpdGggdGhlaXIgYXNzb2NpYXRlZCBWYWxpZGF0b3JNZXRhRGF0YSwgaW5kZXhlZCBieSBwcm9qZWN0IG5hdHVyZSBpZCAqLwotCXByaXZhdGUgTWFwPFN0cmluZyxTZXQ8VmFsaWRhdG9yTWV0YURhdGE+PiBfdmFsaWRhdG9yczsKKwlwcml2YXRlIGZpbmFsIE1hcDxTdHJpbmcsU2V0PFZhbGlkYXRvck1ldGFEYXRhPj4gX3ZhbGlkYXRvcnM7CiAJCiAJLy8gbGlzdCBvZiBhbGwgdmFsaWRhdG9ycywgaW5kZXhlZCBieSB2YWxpZGF0b3IgY2xhc3MgbmFtZSwKIAkvLyB3aXRoIHRoZSB2YWxpZGF0b3IncyBWYWxpZGF0b3JNZXRhRGF0YSBhcyB0aGUgdmFsdWUuCiAJLy8gTmVlZGVkIGJ5IHRoZSBXb3JrYmVuY2hSZXBvcnRlciwgYmVjYXVzZSBzb21ldGltZXMgdGhlCiAJLy8gSVZhbGlkYXRvciBpcyBub3QgZW5vdWdoIHRvIHJlbW92ZSBhbGwgbWVzc2FnZXMgZnJvbSB0aGUKIAkvLyB0YXNrIGxpc3QuCi0JcHJpdmF0ZSBNYXA8U3RyaW5nLCBWYWxpZGF0b3JNZXRhRGF0YT4gX2luZGV4ZWRWYWxpZGF0b3JzOyAKKwlwcml2YXRlIGZpbmFsIE1hcDxTdHJpbmcsIFZhbGlkYXRvck1ldGFEYXRhPiBfaW5kZXhlZFZhbGlkYXRvcnM7IAogCQotCXByaXZhdGUgU2V0PFZhbGlkYXRvck1ldGFEYXRhPiBfZGVmYXVsdEVuYWJsZWRWYWxpZGF0b3JzOworCXByaXZhdGUgZmluYWwgU2V0PFZhbGlkYXRvck1ldGFEYXRhPiBfZGVmYXVsdEVuYWJsZWRWYWxpZGF0b3JzOwogCQogCS8vIFNpbmNlIElQcm9qZWN0J3MgY29udGVudHMgYXJlIGFsbCBpbnN0YW5jZXMgb2YgSVJlc291cmNlLCBldmVyeSB0eXBlIGZpbHRlciBmb3IgYSB2YWxpZGF0b3IKIAkvLyBtdXN0IGJlIGFuIGluc3RhbmNlIG9mIElSZXNvdXJjZS4gVGhpcyBhcHBsaWVzIHRvIGJvdGggdGhlIHJlYnVpbGRDYWNoZSBwYXNzIGFuZCB0byB0aGUKQEAgLTkzLDE4ICs5NywxOCBAQAogCXByaXZhdGUgc3RhdGljIGZpbmFsIFN0cmluZyBVTktOT1dOX1BST0pFQ1QgPSAiVU5LTk9XTiI7IC8vJE5PTi1OTFMtMSQgLy8gVGhpcyAncHJvamVjdCBuYXR1cmUgaWQnIGlzIHVzZWQgYXMgYSBrZXkgdG8gZ2V0IHRoZSB2YWxpZGF0b3JzIHdoaWNoIGNhbiBydW4gb24gYSBwcm9qZWN0IHR5cGUgd2hpY2ggaGFzbid0IGJlZW4gZXhwbGljaXRseSBmaWx0ZXJlZCBpbiBvciBvdXQgYnkgYW55IHZhbGlkYXRvci4KIAlwcml2YXRlIHN0YXRpYyBmaW5hbCBTdHJpbmcgRVhDTFVERURfUFJPSkVDVCA9ICJFWENMVURFRCI7IC8vJE5PTi1OTFMtMSQgLy8gVGhpcyAncHJvamVjdCBuYXR1cmUgaWQnIGlzIHVzZWQgYXMgYSBrZXkgdG8gZ2V0IHRoZSB2YWxpZGF0b3JzIHdoaWNoIGFyZSBleGNsdWRlZCBvbiBjZXJ0YWluIHByb2plY3RzLgogCQotCXB1YmxpYyBIYXNoTWFwPElQcm9qZWN0LCBTZXQ8VmFsaWRhdG9yTWV0YURhdGE+PiBwcm9qZWN0VmFsaWRhdGlvbk1ldGFEYXRhOworCS8qKiBAZGVwcmVjYXRlZCB0aGlzIGluc3RhbmNlIHZhcmlhYmxlIHNob3VsZCBub3QgYmUgcHVibGljLiAqLworCXB1YmxpYyBIYXNoTWFwPElQcm9qZWN0LCBTZXQ8VmFsaWRhdG9yTWV0YURhdGE+PiBwcm9qZWN0VmFsaWRhdGlvbk1ldGFEYXRhID0gbmV3IEhhc2hNYXA8SVByb2plY3QsIFNldDxWYWxpZGF0b3JNZXRhRGF0YT4+KCk7CiAKIAkvKioKIAkgKiBUaGUgcmVnaXN0cnkgaXMgcmVhZCBvbmNlIC0gd2hlbiB0aGlzIGNsYXNzIGlzIGluc3RhbnRpYXRlZC4KIAkgKi8KIAlwcml2YXRlIFZhbGlkYXRpb25SZWdpc3RyeVJlYWRlcigpIHsKLQkJc3VwZXIoKTsKIAorCQlfdmFsaWRhdG9ycyA9IG5ldyBIYXNoTWFwPFN0cmluZyxTZXQ8VmFsaWRhdG9yTWV0YURhdGE+PigpOworCQlfaW5kZXhlZFZhbGlkYXRvcnMgPSBuZXcgSGFzaE1hcDxTdHJpbmcsIFZhbGlkYXRvck1ldGFEYXRhPigpOworCQlfZGVmYXVsdEVuYWJsZWRWYWxpZGF0b3JzID0gbmV3IEhhc2hTZXQ8VmFsaWRhdG9yTWV0YURhdGE+KCk7CiAJCXRyeSB7Ci0JCQlfdmFsaWRhdG9ycyA9IG5ldyBIYXNoTWFwPFN0cmluZyxTZXQ8VmFsaWRhdG9yTWV0YURhdGE+PigpOwotCQkJX2luZGV4ZWRWYWxpZGF0b3JzID0gbmV3IEhhc2hNYXA8U3RyaW5nLCBWYWxpZGF0b3JNZXRhRGF0YT4oKTsKLQkJCV9kZWZhdWx0RW5hYmxlZFZhbGlkYXRvcnMgPSBuZXcgSGFzaFNldDxWYWxpZGF0b3JNZXRhRGF0YT4oKTsKIAogCQkJLy8gUmVhZCB0aGUgcmVnaXN0cnkgYW5kIGJ1aWxkIGEgbWFwIG9mIHZhbGlkYXRvcnMuIFRoZSBrZXkgaW50bwogCQkJLy8gdGhlIG1hcCBpcyB0aGUgSVZhbGlkYXRvciBpbnN0YW5jZSBhbmQgdGhlIHZhbHVlIGlzIHRoZSBWYWxpZGF0b3JNZXRhRGF0YQpAQCAtNjQzLDcgKzY0Nyw3IEBACiAJCXJldHVybiByZXN1bHQ7CiAJfQogCi0JcHJpdmF0ZSBWYWxpZGF0b3JNZXRhRGF0YS5NaWdyYXRpb25NZXRhRGF0YSBnZXRNaWdyYXRpb25NZXRhRGF0YShJQ29uZmlndXJhdGlvbkVsZW1lbnQgZWxlbWVudCwgVmFsaWRhdG9yTWV0YURhdGEgdm1kKSB7CisJcHJpdmF0ZSBWYWxpZGF0b3JNZXRhRGF0YS5NaWdyYXRpb25NZXRhRGF0YSBnZXRNaWdyYXRpb25NZXRhRGF0YShJQ29uZmlndXJhdGlvbkVsZW1lbnQgZWxlbWVudCkgewogCQlJQ29uZmlndXJhdGlvbkVsZW1lbnRbXSBydW5DaGlsZHJlbiA9IGVsZW1lbnQuZ2V0Q2hpbGRyZW4oVEFHX01JR1JBVEUpOwogCQlpZiAoKHJ1bkNoaWxkcmVuID09IG51bGwpIHx8IChydW5DaGlsZHJlbi5sZW5ndGggPT0gMCkpIHsKIAkJCXJldHVybiBudWxsOwpAQCAtNjU4LDcgKzY2Miw3IEBACiAJCQlyZXR1cm4gbnVsbDsKIAkJfQogCi0JCVZhbGlkYXRvck1ldGFEYXRhLk1pZ3JhdGlvbk1ldGFEYXRhIG1tZCA9IHZtZC5uZXcgTWlncmF0aW9uTWV0YURhdGEoKTsKKwkJVmFsaWRhdG9yTWV0YURhdGEuTWlncmF0aW9uTWV0YURhdGEgbW1kID0gbmV3IFZhbGlkYXRvck1ldGFEYXRhLk1pZ3JhdGlvbk1ldGFEYXRhKCk7CiAJCWZvciAoaW50IGkgPSAwOyBpIDwgbWlncmF0ZUNoaWxkcmVuLmxlbmd0aDsgaSsrKSB7CiAJCQlJQ29uZmlndXJhdGlvbkVsZW1lbnQgbWlncmF0ZUNoaWxkID0gbWlncmF0ZUNoaWxkcmVuW2ldOwogCQkJU3RyaW5nIGZyb20gPSBtaWdyYXRlQ2hpbGQuZ2V0QXR0cmlidXRlKEFUVF9GUk9NKTsKQEAgLTcxNywxMiArNzIxLDcgQEAKIAkgKiBSZXR1cm5zIHRoZSBzaW5nbGV0b24gVmFsaWRhdGlvblJlZ2lzdHJ5UmVhZGVyLgogCSAqLwogCXB1YmxpYyBzdGF0aWMgVmFsaWRhdGlvblJlZ2lzdHJ5UmVhZGVyIGdldFJlYWRlcigpIHsKLQkJaWYgKGluc3QgPT0gbnVsbCkgewotCQkJaW5zdCA9IG5ldyBWYWxpZGF0aW9uUmVnaXN0cnlSZWFkZXIoKTsKLQotCQkJRXZlbnRNYW5hZ2VyLmdldE1hbmFnZXIoKS5zZXRBY3RpdmUodHJ1ZSk7Ci0JCX0KLQkJcmV0dXJuIGluc3Q7CisJCXJldHVybiBfaW5zdDsKIAl9CiAKIAlwdWJsaWMgc3RhdGljIGJvb2xlYW4gaXNBY3RpdmF0ZWQoKSB7CkBAIC03MzgsNyArNzM3LDcgQEAKIAkgKi8KIAlwcml2YXRlIElFeHRlbnNpb25Qb2ludCBnZXRWYWxpZGF0b3JFeHRlbnNpb25Qb2ludCgpIHsKIAkJSUV4dGVuc2lvblJlZ2lzdHJ5IHJlZ2lzdHJ5ID0gUGxhdGZvcm0uZ2V0RXh0ZW5zaW9uUmVnaXN0cnkoKTsKLQkJSUV4dGVuc2lvblBvaW50IGV4dGVuc2lvblBvaW50ID0gcmVnaXN0cnkuZ2V0RXh0ZW5zaW9uUG9pbnQoUExVR0lOX0lELCBWQUxJREFUT1JfRVhUX1BUX0lEKTsKKwkJSUV4dGVuc2lvblBvaW50IGV4dGVuc2lvblBvaW50ID0gcmVnaXN0cnkuZ2V0RXh0ZW5zaW9uUG9pbnQoVmFsaWRhdGlvblBsdWdpbi5QTFVHSU5fSUQsIFZBTElEQVRPUl9FWFRfUFRfSUQpOwogCQlpZiAoZXh0ZW5zaW9uUG9pbnQgPT0gbnVsbCkgewogCQkJLy8gSWYgdGhpcyBoYXBwZW5zIGl0IG1lYW5zIHRoYXQgc29tZW9uZSByZW1vdmVkIHRoZSAidmFsaWRhdG9yIiBleHRlbnNpb24gcG9pbnQKIAkJCS8vIGRlY2xhcmF0aW9uIGZyb20gb3VyIHBsdWdpbi54bWwgZmlsZS4KQEAgLTEwNDQsMTkgKzEwNDMsMjcgQEAKIAl9CiAKIAlwdWJsaWMgYm9vbGVhbiBpc0NvbmZpZ3VyZWRPblByb2plY3QoVmFsaWRhdG9yTWV0YURhdGEgdm1kLCBJUHJvamVjdCBwcm9qZWN0KSB7Ci0JCWlmIChwcm9qZWN0VmFsaWRhdGlvbk1ldGFEYXRhID09IG51bGwpCi0JCQlwcm9qZWN0VmFsaWRhdGlvbk1ldGFEYXRhID0gbmV3IEhhc2hNYXA8SVByb2plY3QsIFNldDxWYWxpZGF0b3JNZXRhRGF0YT4+KCk7Ci0KLQkJU2V0PFZhbGlkYXRvck1ldGFEYXRhPiB2bWRzID0gcHJvamVjdFZhbGlkYXRpb25NZXRhRGF0YS5nZXQocHJvamVjdCk7CisJCVNldDxWYWxpZGF0b3JNZXRhRGF0YT4gdm1kcyA9IG51bGw7CisJCXN5bmNocm9uaXplZChwcm9qZWN0VmFsaWRhdGlvbk1ldGFEYXRhKXsKKwkJCXZtZHMgPSBwcm9qZWN0VmFsaWRhdGlvbk1ldGFEYXRhLmdldChwcm9qZWN0KTsKKwkJfQogCQlpZiAodm1kcyAhPSBudWxsKSB7CiAJCQlyZXR1cm4gdm1kcy5jb250YWlucyh2bWQpOwogCQl9IGVsc2UgewogCQkJU2V0PFZhbGlkYXRvck1ldGFEYXRhPiBwcmpWbWRzID0gZ2V0VmFsaWRhdG9yTWV0YURhdGEocHJvamVjdCk7CiAJCQlpZiAocHJqVm1kcyA9PSBudWxsIHx8IHByalZtZHMuc2l6ZSgpID09IDApcmV0dXJuIGZhbHNlOwotCQkJcHJvamVjdFZhbGlkYXRpb25NZXRhRGF0YS5wdXQocHJvamVjdCwgcHJqVm1kcyk7CisJCQlzeW5jaHJvbml6ZWQocHJvamVjdFZhbGlkYXRpb25NZXRhRGF0YSl7CisJCQkJcHJvamVjdFZhbGlkYXRpb25NZXRhRGF0YS5wdXQocHJvamVjdCwgcHJqVm1kcyk7CisJCQl9CiAJCQlyZXR1cm4gcHJqVm1kcy5jb250YWlucyh2bWQpOwogCQl9CiAJfQorCQorCXB1YmxpYyB2b2lkIGNsZWFyQ2FjaGVkTWFwcygpeworCQlzeW5jaHJvbml6ZWQocHJvamVjdFZhbGlkYXRpb25NZXRhRGF0YSl7CisJCQlwcm9qZWN0VmFsaWRhdGlvbk1ldGFEYXRhLmNsZWFyKCk7CisJCX0KKwl9CiAKIAkvKioKIAkgKiBSZXR1cm4gYSBzZXQgb2YgVmFsaWRhdG9yTWV0YURhdGEgd2hpY2ggYXJlIGNvbmZpZ3VyZWQgb24gYWxsIHByb2plY3RzIG9yIHdoaWNoIHJ1biBvbiBhbnkKQEAgLTEyMDcsMjggKzEyMTQsMTUgQEAKIAkJLy8KIAkJLy8gVG8gbG9hZCBhIFN0cmluZyBpbnRvIHRoZSBjb25zdGFudHMgc3BhY2UsIGNhbGwgaW50ZXJuKCkgb24gdGhlIFN0cmluZy4KIAkJLy8KLQkJVmFsaWRhdG9yTWV0YURhdGEgdm1kID0gbmV3IFZhbGlkYXRvck1ldGFEYXRhKCk7Ci0JCXZtZC5hZGRGaWx0ZXJzKGdldEZpbHRlcnMoZWxlbWVudCkpOyAvLyB2YWxpZGF0b3IgbWF5LCBvciBtYXkgbm90LCBoYXZlIGZpbHRlcnMKLQkJdm1kLmFkZFByb2plY3ROYXR1cmVGaWx0ZXJzKGdldFByb2plY3ROYXR1cmVGaWx0ZXJzKGVsZW1lbnQpKTsgLy8gdmFsaWRhdG9yIG1heSwgb3IgbWF5IG5vdCwgc3BlY2lmeSBhIHByb2plY3QgbmF0dXJlCi0JCXZtZC5hZGRGYWNldEZpbHRlcnMoZ2V0RmFjZXRJZHMoZWxlbWVudCkpOy8vdmFsaWRhdG9yIG1heSBvciBtYXkgbm90IHNwZWNpZnkgdGhlIGZhY2V0Ci0JCXZtZC5zZXRFbmFibGVtZW50RWxlbWVudChnZXRFbmFibGVtZW50RWxlbWVudChlbGVtZW50KSk7Ci0JCXZtZC5hZGRBZ2dyZWdhdGVkVmFsaWRhdG9yTmFtZXMoZ2V0QWdncmVnYXRlVmFsaWRhdG9yc05hbWVzKGVsZW1lbnQpKTsgLy8gaWYgYSB2YWxpZGF0b3IKLQkJLy8gYWdncmVnYXRlZCBhbm90aGVyIHZhbGlkYXRvciwgaXQgc2hvdWxkIGlkZW50aWZ5Ci0JCS8vIHRoZSBzdWItdmFsaWRhdG9yKHMpJyBjbGFzcyBuYW1lCi0JCXZtZC5zZXRWYWxpZGF0b3JEaXNwbGF5TmFtZSh2YWxpZGF0b3JOYW1lLmludGVybigpKTsgLy8gdmFsaWRhdG9yIG11c3QgaGF2ZSBhIGRpc3BsYXkgbmFtZS4KLQkJdm1kLnNldFZhbGlkYXRvclVuaXF1ZU5hbWUodmFsaWRhdG9ySW1wbE5hbWUuaW50ZXJuKCkpOwotCQl2bWQuc2V0UGx1Z2luSWQocGx1Z2luSWQpOwotCQl2bWQuc2V0SW5jcmVtZW50YWwoZ2V0SW5jcmVtZW50YWwoZWxlbWVudCkpOwotCQl2bWQuc2V0RnVsbEJ1aWxkKGdldEZ1bGxCdWlsZChlbGVtZW50KSk7Ci0JCXZtZC5zZXRBc3luYyhnZXRBc3luYyhlbGVtZW50KSk7Ci0JCXZtZC5zZXRSdWxlR3JvdXAoZ2V0UnVsZUdyb3VwKGVsZW1lbnQpKTsKLQkJdm1kLnNldEVuYWJsZWRCeURlZmF1bHQoZ2V0RW5hYmxlZEJ5RGVmYXVsdChlbGVtZW50KSk7Ci0JCXZtZC5zZXRNaWdyYXRpb25NZXRhRGF0YShnZXRNaWdyYXRpb25NZXRhRGF0YShlbGVtZW50LCB2bWQpKTsKLQkJdm1kLnNldEhlbHBlckNsYXNzKGVsZW1lbnQsIGhlbHBlckltcGxOYW1lKTsKLQkJdm1kLnNldFZhbGlkYXRvckNsYXNzKHJ1bkNoaWxkcmVuWzBdKTsgLy8gYXNzb2NpYXRlIHRoZSBhYm92ZSBhdHRyaWJ1dGVzIHdpdGggdGhlIHZhbGlkYXRvcgotCQl2bWQuYWRkRGVwZW5kZW50VmFsaWRhdG9yKGdldERlcGVuZGVudFZhbGlkYXRvclZhbHVlKGVsZW1lbnQpKTsKLQkJdm1kLnNldENvbnRlbnRUeXBlSWRzKGdldENvbnRlbnRUeXBlQmluZGluZ3MoZWxlbWVudCkpOwotCQlpbml0aWFsaXplVmFsaWRhdG9yQ3VzdG9tTWFya2VycyhlbGVtZW50LCBwbHVnaW5JZCwgdm1kKTsKKwkJCisJCWJvb2xlYW4gYXN5bmMgPSBnZXRBc3luYyhlbGVtZW50KTsKKwkJU3RyaW5nW10gbWFya2VySWRzID0gaW5pdGlhbGl6ZVZhbGlkYXRvckN1c3RvbU1hcmtlcnMoZWxlbWVudCwgcGx1Z2luSWQpOworCQlWYWxpZGF0b3JNZXRhRGF0YSB2bWQgPSBuZXcgVmFsaWRhdG9yTWV0YURhdGEoYXN5bmMsIGdldEFnZ3JlZ2F0ZVZhbGlkYXRvcnNOYW1lcyhlbGVtZW50KSwgZ2V0RW5hYmxlZEJ5RGVmYXVsdChlbGVtZW50KSwKKwkJCQlnZXRJbmNyZW1lbnRhbChlbGVtZW50KSwgZ2V0RnVsbEJ1aWxkKGVsZW1lbnQpLCBlbGVtZW50LCBoZWxwZXJJbXBsTmFtZSwgZ2V0TWlncmF0aW9uTWV0YURhdGEoZWxlbWVudCksCisJCQkJcGx1Z2luSWQsIGdldFJ1bGVHcm91cChlbGVtZW50KSwgcnVuQ2hpbGRyZW5bMF0sIHZhbGlkYXRvck5hbWUuaW50ZXJuKCksIHZhbGlkYXRvckltcGxOYW1lLmludGVybigpLAorCQkJCWdldENvbnRlbnRUeXBlQmluZGluZ3MoZWxlbWVudCksIGdldERlcGVuZGVudFZhbGlkYXRvclZhbHVlKGVsZW1lbnQpLCBnZXRFbmFibGVtZW50RWxlbWVudChlbGVtZW50KSwKKwkJCQlnZXRGYWNldElkcyhlbGVtZW50KSwgZ2V0RmlsdGVycyhlbGVtZW50KSwgZ2V0UHJvamVjdE5hdHVyZUZpbHRlcnMoZWxlbWVudCksIG1hcmtlcklkcywgZ2V0UnVuU3RyYWdldHkoZWxlbWVudCkpOworCQkKIAkJCiAJCWlmIChUcmFjaW5nLmlzVHJhY2VWMSgpKSB7CiAJCQlUcmFjaW5nLmxvZygiVmFsaWRhdGlvblJlZ2lzdHJ5UmVhZGVyLTEwOiB2YWxpZGF0b3IgbG9hZGVkOiAiICsgdmFsaWRhdG9ySW1wbE5hbWUpOyAvLyROT04tTkxTLTEkCkBAIC0xMjQyLDEwICsxMjM2LDExIEBACiAJICogQHBhcmFtIHBsdWdpbklkCiAJICogQHBhcmFtIHZtZAogCSAqLwotCXByaXZhdGUgdm9pZCBpbml0aWFsaXplVmFsaWRhdG9yQ3VzdG9tTWFya2VycyhJQ29uZmlndXJhdGlvbkVsZW1lbnQgZWxlbWVudCwgU3RyaW5nIHBsdWdpbklkLCBWYWxpZGF0b3JNZXRhRGF0YSB2bWQpIHsKKwlwcml2YXRlIFN0cmluZ1tdIGluaXRpYWxpemVWYWxpZGF0b3JDdXN0b21NYXJrZXJzKElDb25maWd1cmF0aW9uRWxlbWVudCBlbGVtZW50LCBTdHJpbmcgcGx1Z2luSWQpIHsKKwkJU3RyaW5nW10gcXVhbGlmaWVkTWFya2VySWRzID0gbnVsbDsKIAkJU3RyaW5nW10gY3VzdG9tTWFya2VySWRzID0gZ2V0TWFya2VySWRzVmFsdWUoZWxlbWVudCk7CiAJCWlmIChjdXN0b21NYXJrZXJJZHMgIT0gbnVsbCAmJiBjdXN0b21NYXJrZXJJZHMubGVuZ3RoID4gMCkgewotCQkJU3RyaW5nW10gcXVhbGlmaWVkTWFya2VySWRzID0gbmV3IFN0cmluZ1tjdXN0b21NYXJrZXJJZHMubGVuZ3RoXTsKKwkJCXF1YWxpZmllZE1hcmtlcklkcyA9IG5ldyBTdHJpbmdbY3VzdG9tTWFya2VySWRzLmxlbmd0aF07CiAJCQlmb3IgKGludCBpID0gMDsgaSA8IGN1c3RvbU1hcmtlcklkcy5sZW5ndGg7IGkrKykgewogCQkJCVN0cmluZyBtYXJrZXJpZCA9IGN1c3RvbU1hcmtlcklkc1tpXTsKIAkJCQlpZiAobWFya2VyaWQubGFzdEluZGV4T2YoIi4iKSAhPSAtMSkgeyAvLyROT04tTkxTLTEkCkBAIC0xMjU4LDggKzEyNTMsOCBAQAogCQkJCX0gZWxzZQogCQkJCQlxdWFsaWZpZWRNYXJrZXJJZHNbaV0gPSBwbHVnaW5JZCArICIuIiArIGN1c3RvbU1hcmtlcklkc1tpXTsgLy8kTk9OLU5MUy0xJAogCQkJfQotCQkJdm1kLnNldE1hcmtlcklkcyhxdWFsaWZpZWRNYXJrZXJJZHMpOwogCQl9CisJCXJldHVybiBxdWFsaWZpZWRNYXJrZXJJZHM7CiAJfQogCiAJcHJpdmF0ZSBFeHByZXNzaW9uIGdldEVuYWJsZW1lbnRFbGVtZW50KElDb25maWd1cmF0aW9uRWxlbWVudCBlbGVtZW50KSB7CkBAIC0xMzEwLDEyICsxMzA1LDE0IEBACiAJCQkJLy8gVGhlIFByb3BlcnR5UGFnZSwgYW5kIG90aGVyIHN0YXR1cyBtZXNzYWdlcywgbmVlZCB0byBoYXZlIGEgZGlzcGxheWFibGUgbmFtZSBmb3IKIAkJCQkvLyB0aGUgdmFsaWRhdG9yLgogCQkJCVN0cmluZyBwbHVnaW5JZCA9IGV4dGVuc2lvbi5nZXRDb250cmlidXRvcigpLmdldE5hbWUoKTsKLQkJCQlWYWxpZGF0b3JNZXRhRGF0YSB2bWQgPSBpbml0aWFsaXplVmFsaWRhdG9yKGVsZW1lbnQsIGxhYmVsLCBwbHVnaW5JZCk7Ci0KLQkJCQlpZiAodm1kICE9IG51bGwpIHsKLQkJCQkJLy8gQWRkIHRoaXMgdmFsaWRhdG9yIHRvIHRoZSBsaXN0IG9mIHZhbGlkYXRvcnM7IGlmIHZtZCBpcyBudWxsLCB0aGUgdmFsaWRhdG9yCi0JCQkJCS8vIGNvdWxkbid0IGJlIGNyZWF0ZWQuCi0JCQkJCWFkZCh2bWQpOworCQkJCWlmIChUcmFjaW5nLmlzRW5hYmxlZChleHRlbnNpb24uZ2V0VW5pcXVlSWRlbnRpZmllcigpKSl7CisJCQkJCVZhbGlkYXRvck1ldGFEYXRhIHZtZCA9IGluaXRpYWxpemVWYWxpZGF0b3IoZWxlbWVudCwgbGFiZWwsIHBsdWdpbklkKTsKKwkKKwkJCQkJaWYgKHZtZCAhPSBudWxsKSB7CisJCQkJCQkvLyBBZGQgdGhpcyB2YWxpZGF0b3IgdG8gdGhlIGxpc3Qgb2YgdmFsaWRhdG9yczsgaWYgdm1kIGlzIG51bGwsIHRoZSB2YWxpZGF0b3IKKwkJCQkJCS8vIGNvdWxkbid0IGJlIGNyZWF0ZWQuCisJCQkJCQlhZGQodm1kKTsKKwkJCQkJfQogCQkJCX0KIAkJCX0KIAkJfQpAQCAtMTM1Miw1ICsxMzQ5LDIyIEBACiAJCQlyZXR1cm4gdm1kLmdldFZhbGlkYXRvcigpOwogCQlyZXR1cm4gbnVsbDsKIAl9CisJLyoqCisJICogR2l2ZW4gYW4gSUNvbmZpZ3VyYXRpb25FbGVtZW50IGZyb20gcGx1Z2luLnhtbCwgcmV0dXJuIHdoZXRoZXIgb3Igbm90IHRoZSB2YWxpZGF0b3IgaXMgY2FsbGVkIGJ5IHByb2plY3QKKwkgKiAKKwkgKiA8cD5JZiBubyBwcm9qZWN0IGF0dHJpYnV0ZSBpcyBzcGVjaWZpZWQsIHRoZSBkZWZhdWx0IGlzIGZhbHNlICh2YWxpZGF0b3IgaXMgY2FsbGVkIGJ5IHJlc291cmNlKQorCSAqLworCXByaXZhdGUgYm9vbGVhbiBnZXRSdW5TdHJhZ2V0eShJQ29uZmlndXJhdGlvbkVsZW1lbnQgZWxlbWVudCkgeworCQkKKwkJSUNvbmZpZ3VyYXRpb25FbGVtZW50W10gcnVuQ2hpbGRyZW4gPSBlbGVtZW50LmdldENoaWxkcmVuKFRBR19SVU5fU1RSQVRFR1kpOworCQkKKwkJaWYgKHJ1bkNoaWxkcmVuID09IG51bGwgfHwgcnVuQ2hpbGRyZW4ubGVuZ3RoIDwgMSkgcmV0dXJuIFJlZ2lzdHJ5Q29uc3RhbnRzLkFUVF9QUk9KRUNUX0RFRkFVTFQ7CisJCVN0cmluZyBwcm9qZWN0ID0gcnVuQ2hpbGRyZW5bMF0uZ2V0QXR0cmlidXRlKEFUVF9QUk9KRUNUKTsKKwkJaWYgKHByb2plY3QgPT0gbnVsbClyZXR1cm4gUmVnaXN0cnlDb25zdGFudHMuQVRUX1BST0pFQ1RfREVGQVVMVDsKKworCQlyZXR1cm4gQm9vbGVhbi52YWx1ZU9mKHByb2plY3QudHJpbSgpKTsgCisJCisJfQorCQogCiB9CmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uL3ZhbGlkYXRlL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL2ludGVybmFsL1ZhbGlkYXRvck1ldGFEYXRhLmphdmEgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uL3ZhbGlkYXRlL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL2ludGVybmFsL1ZhbGlkYXRvck1ldGFEYXRhLmphdmEKaW5kZXggY2ViNzQyNS4uNGZlZjhhNCAxMDA2NDQKLS0tIGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi92YWxpZGF0ZS9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9pbnRlcm5hbC9WYWxpZGF0b3JNZXRhRGF0YS5qYXZhCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24vdmFsaWRhdGUvb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vaW50ZXJuYWwvVmFsaWRhdG9yTWV0YURhdGEuamF2YQpAQCAtMSw1ICsxLDUgQEAKIC8qKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqCi0gKiBDb3B5cmlnaHQgKGMpIDIwMDEsIDIwMDggSUJNIENvcnBvcmF0aW9uIGFuZCBvdGhlcnMuCisgKiBDb3B5cmlnaHQgKGMpIDIwMDEsIDIwMTAgSUJNIENvcnBvcmF0aW9uIGFuZCBvdGhlcnMuCiAgKiBBbGwgcmlnaHRzIHJlc2VydmVkLiBUaGlzIHByb2dyYW0gYW5kIHRoZSBhY2NvbXBhbnlpbmcgbWF0ZXJpYWxzCiAgKiBhcmUgbWFkZSBhdmFpbGFibGUgdW5kZXIgdGhlIHRlcm1zIG9mIHRoZSBFY2xpcHNlIFB1YmxpYyBMaWNlbnNlIHYxLjAKICAqIHdoaWNoIGFjY29tcGFuaWVzIHRoaXMgZGlzdHJpYnV0aW9uLCBhbmQgaXMgYXZhaWxhYmxlIGF0CkBAIC0xOCw2ICsxOCw3IEBACiBpbXBvcnQgamF2YS51dGlsLkxpc3Q7CiBpbXBvcnQgamF2YS51dGlsLk1hcDsKIGltcG9ydCBqYXZhLnV0aWwuU2V0OworaW1wb3J0IGphdmEudXRpbC5jb25jdXJyZW50LmF0b21pYy5BdG9taWNSZWZlcmVuY2U7CiAKIGltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLmV4cHJlc3Npb25zLkV4cHJlc3Npb247CiBpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5yZXNvdXJjZXMuSUNvbnRhaW5lcjsKQEAgLTQzLDY4ICs0NCw3MiBAQAogICogVmFsaWRhdG9yTWV0YURhdGE7IGl0IGlzIGZvciB1c2UgYnkgdGhlIGJhc2UgZnJhbWV3b3JrIG9ubHkuCiAgKi8KIHB1YmxpYyBjbGFzcyBWYWxpZGF0b3JNZXRhRGF0YSB7Ci0JcHJpdmF0ZSBWYWxpZGF0b3JGaWx0ZXJbXSAJCV9maWx0ZXJzOwotCXByaXZhdGUgVmFsaWRhdG9yTmFtZUZpbHRlcltdIAlfcHJvamVjdE5hdHVyZUZpbHRlcnM7Ci0JcHJpdmF0ZSBTdHJpbmdbXSAJCQkJX2ZhY2V0RmlsdGVyczsKLQlwcml2YXRlIElWYWxpZGF0b3IgCQkJCV92YWxpZGF0b3I7Ci0JcHJpdmF0ZSBJV29ya2JlbmNoQ29udGV4dCAJCV9oZWxwZXI7Ci0JcHJpdmF0ZSBTdHJpbmcgCQkJCQlfdmFsaWRhdG9yRGlzcGxheU5hbWU7Ci0JcHJpdmF0ZSBTdHJpbmcgCQkJX3ZhbGlkYXRvclVuaXF1ZU5hbWU7Ci0JcHJpdmF0ZSBTdHJpbmdbXSAJCV9hZ2dyZWdhdGVkVmFsaWRhdG9yczsKLSAgICBwcml2YXRlIFN0cmluZ1tdIAkJX2NvbnRlbnRUeXBlSWRzID0gbnVsbDsKLQlwcml2YXRlIFN0cmluZ1tdIAkJX3ZhbGlkYXRvck5hbWVzOwotCXByaXZhdGUgU3RyaW5nIAkJCV9wbHVnaW5JZDsKLQlwcml2YXRlIGJvb2xlYW4gCQlfc3VwcG9ydHNJbmNyZW1lbnRhbCA9IFJlZ2lzdHJ5Q29uc3RhbnRzLkFUVF9JTkNSRU1FTlRBTF9ERUZBVUxUOwotCXByaXZhdGUgYm9vbGVhbiAJCV9zdXBwb3J0c0Z1bGxCdWlsZCA9IFJlZ2lzdHJ5Q29uc3RhbnRzLkFUVF9GVUxMQlVJTERfREVGQVVMVDsKLQlwcml2YXRlIGJvb2xlYW4gCQlfaXNFbmFibGVkQnlEZWZhdWx0ID0gUmVnaXN0cnlDb25zdGFudHMuQVRUX0VOQUJMRURfREVGQVVMVDsKLQlwcml2YXRlIE1pZ3JhdGlvbk1ldGFEYXRhIF9taWdyYXRpb25NZXRhRGF0YTsKLQlwcml2YXRlIGludCAJCQlfcnVsZUdyb3VwID0gUmVnaXN0cnlDb25zdGFudHMuQVRUX1JVTEVfR1JPVVBfREVGQVVMVDsKLQlwcml2YXRlIGJvb2xlYW4gCQlfYXN5bmMgPSBSZWdpc3RyeUNvbnN0YW50cy5BVFRfQVNZTkNfREVGQVVMVDsKLQlwcml2YXRlIGJvb2xlYW4gCQlfZGVwZW5kZW50VmFsaWRhdG9yID0gUmVnaXN0cnlDb25zdGFudHMuREVQX1ZBTF9WQUxVRV9ERUZBVUxUOwotCXByaXZhdGUgU3RyaW5nW10gCQlfbWFya2VySWRzOwotCXByaXZhdGUgU3RyaW5nIAkJCV9oZWxwZXJDbGFzc05hbWU7Ci0JcHJpdmF0ZSBJQ29uZmlndXJhdGlvbkVsZW1lbnQgX2hlbHBlckNsYXNzRWxlbWVudDsKLQlwcml2YXRlIElDb25maWd1cmF0aW9uRWxlbWVudCBfdmFsaWRhdG9yQ2xhc3NFbGVtZW50OwotCXByaXZhdGUgYm9vbGVhbiAJCV9jYW5ub3RMb2FkOwotCXByaXZhdGUgYm9vbGVhbiAJCV9tYW51YWxWYWxpZGF0aW9uID0gdHJ1ZTsKLQlwcml2YXRlIGJvb2xlYW4gCQlfYnVpbGRWYWxpZGF0aW9uID0gdHJ1ZTsKLQlwcml2YXRlIE1hcDxJVmFsaWRhdG9ySm9iLCBJV29ya2JlbmNoQ29udGV4dD4gX2hlbHBlcnMgPSAKLQkJQ29sbGVjdGlvbnMuc3luY2hyb25pemVkTWFwKCBuZXcgSGFzaE1hcDxJVmFsaWRhdG9ySm9iLCBJV29ya2JlbmNoQ29udGV4dD4oKSApOwotCXByaXZhdGUgRXhwcmVzc2lvbiAJCV9lbmFibGVtZW50RXhwcmVzc2lvbjsKLQotCVZhbGlkYXRvck1ldGFEYXRhKCkgewotCX0KLQorCXByaXZhdGUgZmluYWwgVmFsaWRhdG9yRmlsdGVyW10gX2ZpbHRlcnM7CisJcHJpdmF0ZSBmaW5hbCBWYWxpZGF0b3JOYW1lRmlsdGVyW10gCV9wcm9qZWN0TmF0dXJlRmlsdGVyczsKKwlwcml2YXRlIGZpbmFsIFN0cmluZ1tdCQkJX2ZhY2V0RmlsdGVyczsKKwlwcml2YXRlIGZpbmFsIEF0b21pY1JlZmVyZW5jZTxJVmFsaWRhdG9yPglfdmFsaWRhdG9yID0gbmV3IEF0b21pY1JlZmVyZW5jZTxJVmFsaWRhdG9yPigpOworCXByaXZhdGUgZmluYWwgQXRvbWljUmVmZXJlbmNlPElXb3JrYmVuY2hDb250ZXh0PiAJCV9oZWxwZXIgPSBuZXcgQXRvbWljUmVmZXJlbmNlPElXb3JrYmVuY2hDb250ZXh0PigpOworCXByaXZhdGUgZmluYWwgU3RyaW5nIAkJCV92YWxpZGF0b3JEaXNwbGF5TmFtZTsKKwlwcml2YXRlIGZpbmFsIFN0cmluZyAJCQlfdmFsaWRhdG9yVW5pcXVlTmFtZTsKKwkKIAkvKioKLQkgKiBBZGQgdG8gdGhlIGxpc3Qgb2YgY2xhc3MgbmFtZXMgb2YgZXZlcnkgdmFsaWRhdG9yIHdoaWNoIHRoaXMgdmFsaWRhdG9yIGFnZ3JlZ2F0ZXMuIEZvcgorCSAqIFRoZSBsaXN0IG9mIGNsYXNzIG5hbWVzIG9mIGV2ZXJ5IHZhbGlkYXRvciB3aGljaCB0aGlzIHZhbGlkYXRvciBhZ2dyZWdhdGVzLiBGb3IKIAkgKiBleGFtcGxlLCBpZiB0aGUgRUpCIFZhbGlkYXRvciBpbnN0YW50aWF0ZWQgYW5vdGhlciB2YWxpZGF0b3IsIGFuZCBzdGFydGVkIGl0cyB2YWxpZGF0ZQogCSAqIG1ldGhvZCwgdGhlbiB0aGF0IGluc3RhbnRpYXRlZCBjbGFzcycgbmFtZSBzaG91bGQgYmUgaW4gdGhpcyBsaXN0LgogCSAqLwotCXZvaWQgYWRkQWdncmVnYXRlZFZhbGlkYXRvck5hbWVzKFN0cmluZ1tdIHZhbCkgewotCQlfYWdncmVnYXRlZFZhbGlkYXRvcnMgPSB2YWw7Ci0JfQorCXByaXZhdGUgZmluYWwgU3RyaW5nW10gCV9hZ2dyZWdhdGVkVmFsaWRhdG9yczsKKyAgICBwcml2YXRlIGZpbmFsIFN0cmluZ1tdIAlfY29udGVudFR5cGVJZHM7CisJcHJpdmF0ZSBmaW5hbCBTdHJpbmdbXSAJX3ZhbGlkYXRvck5hbWVzOworCXByaXZhdGUgZmluYWwgU3RyaW5nIAlfcGx1Z2luSWQ7CisJcHJpdmF0ZSBmaW5hbCBib29sZWFuCV9zdXBwb3J0c0luY3JlbWVudGFsOworCXByaXZhdGUgZmluYWwgYm9vbGVhbiAJX3N1cHBvcnRzRnVsbEJ1aWxkOworCXByaXZhdGUgZmluYWwgYm9vbGVhbiAJX2lzRW5hYmxlZEJ5RGVmYXVsdDsKKwlwcml2YXRlIGZpbmFsIE1pZ3JhdGlvbk1ldGFEYXRhIF9taWdyYXRpb25NZXRhRGF0YTsKKwlwcml2YXRlIGZpbmFsIGludCAJCV9ydWxlR3JvdXA7CisJcHJpdmF0ZSBmaW5hbCBib29sZWFuIAlfYXN5bmM7CisJcHJpdmF0ZSBmaW5hbCBib29sZWFuIAlfZGVwZW5kZW50VmFsaWRhdG9yOworCXByaXZhdGUgZmluYWwgU3RyaW5nW10JX21hcmtlcklkczsKKwlwcml2YXRlIGZpbmFsIFN0cmluZyAJX2hlbHBlckNsYXNzTmFtZTsKKwlwcml2YXRlIGZpbmFsIElDb25maWd1cmF0aW9uRWxlbWVudCBfaGVscGVyQ2xhc3NFbGVtZW50OworCXByaXZhdGUgZmluYWwgSUNvbmZpZ3VyYXRpb25FbGVtZW50IF92YWxpZGF0b3JDbGFzc0VsZW1lbnQ7CisJcHJpdmF0ZSB2b2xhdGlsZSBib29sZWFuIAlfY2Fubm90TG9hZDsKKwlwcml2YXRlIHZvbGF0aWxlIGJvb2xlYW4gCV9tYW51YWxWYWxpZGF0aW9uID0gdHJ1ZTsKKwlwcml2YXRlIHZvbGF0aWxlIGJvb2xlYW4JX2J1aWxkVmFsaWRhdGlvbiA9IHRydWU7CisJcHJpdmF0ZSBmaW5hbCBNYXA8SVZhbGlkYXRvckpvYiwgSVdvcmtiZW5jaENvbnRleHQ+IF9oZWxwZXJzID0gCisJCUNvbGxlY3Rpb25zLnN5bmNocm9uaXplZE1hcCggbmV3IEhhc2hNYXA8SVZhbGlkYXRvckpvYiwgSVdvcmtiZW5jaENvbnRleHQ+KCkgKTsKKwlwcml2YXRlIGZpbmFsIEV4cHJlc3Npb24gCQlfZW5hYmxlbWVudEV4cHJlc3Npb247CisJcHJpdmF0ZSBib29sZWFuIF92YWxpZGF0ZUJ5UHJvamVjdCA9IHRydWU7CiAKLQkvKioKLQkgKiBBZGQgdGhlIG5hbWUvdHlwZSBmaWx0ZXIgcGFpcihzKS4KLQkgKi8KLQl2b2lkIGFkZEZpbHRlcnMoVmFsaWRhdG9yRmlsdGVyW10gZmlsdGVycykgeworCVZhbGlkYXRvck1ldGFEYXRhKGJvb2xlYW4gYXN5bmMsIFN0cmluZ1tdIGFnZ3JlZ2F0ZWRWYWxpZGF0b3JzLCBib29sZWFuIGlzRW5hYmxlZEJ5RGVmYXVsdCwgYm9vbGVhbiBzdXBwb3J0c0luY3JlbWVudGFsLAorCQkJYm9vbGVhbiBzdXBwb3J0c0Z1bGxCdWlsZCwgSUNvbmZpZ3VyYXRpb25FbGVtZW50IGhlbHBlckNsYXNzRWxlbWVudCwgU3RyaW5nIGhlbHBlckNsYXNzTmFtZSwgCisJCQlNaWdyYXRpb25NZXRhRGF0YSBtaWdyYXRpb25NZXRhRGF0YSwgU3RyaW5nIHBsdWdpbklkLCBpbnQgcnVsZUdyb3VwLCBJQ29uZmlndXJhdGlvbkVsZW1lbnQgdmFsaWRhdG9yQ2xhc3NFbGVtZW50LAorCQkJU3RyaW5nIHZhbGlkYXRvckRpc3BsYXlOYW1lLCBTdHJpbmcgdmFsaWRhdG9yVW5pcXVlTmFtZSwgU3RyaW5nW10gY29udGVudFR5cGVJZHMsIGJvb2xlYW4gZGVwZW5kZW50VmFsaWRhdG9yLAorCQkJRXhwcmVzc2lvbiBlbmFibGVtZW50RXhwcmVzc2lvbiwgU3RyaW5nW10gZmFjZXRGaWx0ZXJzLCBWYWxpZGF0b3JGaWx0ZXJbXSBmaWx0ZXJzLAorCQkJVmFsaWRhdG9yTmFtZUZpbHRlcltdIHByb2plY3ROYXR1cmVGaWx0ZXJzLCBTdHJpbmdbXSBtYXJrZXJJZHMsIGJvb2xlYW4gdmFsaWRhdGVCeVByb2plY3QpIHsKKwkJX2FzeW5jID0gYXN5bmM7CisJCV9hZ2dyZWdhdGVkVmFsaWRhdG9ycyA9IGFnZ3JlZ2F0ZWRWYWxpZGF0b3JzOworCQlfaXNFbmFibGVkQnlEZWZhdWx0ID0gaXNFbmFibGVkQnlEZWZhdWx0OworCQlfc3VwcG9ydHNJbmNyZW1lbnRhbCA9IHN1cHBvcnRzSW5jcmVtZW50YWw7CisJCV9zdXBwb3J0c0Z1bGxCdWlsZCA9IHN1cHBvcnRzRnVsbEJ1aWxkOworCQlfaGVscGVyQ2xhc3NFbGVtZW50ID0gaGVscGVyQ2xhc3NFbGVtZW50OworCQlfaGVscGVyQ2xhc3NOYW1lID0gaGVscGVyQ2xhc3NOYW1lOworCQlfbWlncmF0aW9uTWV0YURhdGEgPSBtaWdyYXRpb25NZXRhRGF0YTsKKwkJX3BsdWdpbklkID0gcGx1Z2luSWQ7CisJCV9ydWxlR3JvdXAgPSBydWxlR3JvdXA7CisJCV92YWxpZGF0b3JDbGFzc0VsZW1lbnQgPSB2YWxpZGF0b3JDbGFzc0VsZW1lbnQ7CisJCV92YWxpZGF0b3JEaXNwbGF5TmFtZSA9IHZhbGlkYXRvckRpc3BsYXlOYW1lOworCQlfdmFsaWRhdG9yVW5pcXVlTmFtZSA9IHZhbGlkYXRvclVuaXF1ZU5hbWU7CisJCV9jb250ZW50VHlwZUlkcyA9IGNvbnRlbnRUeXBlSWRzOworCQlfZGVwZW5kZW50VmFsaWRhdG9yID0gZGVwZW5kZW50VmFsaWRhdG9yOworCQlfZW5hYmxlbWVudEV4cHJlc3Npb24gPSBlbmFibGVtZW50RXhwcmVzc2lvbjsKKwkJX2ZhY2V0RmlsdGVycyA9IGZhY2V0RmlsdGVyczsKIAkJX2ZpbHRlcnMgPSBmaWx0ZXJzOworCQlfcHJvamVjdE5hdHVyZUZpbHRlcnMgPSBwcm9qZWN0TmF0dXJlRmlsdGVyczsKKwkJX21hcmtlcklkcyA9IG1hcmtlcklkczsKKwkJX3ZhbGlkYXRvck5hbWVzID0gYnVpbGRWYWxpZGF0b3JOYW1lcygpOworCQlfdmFsaWRhdGVCeVByb2plY3QgPSB2YWxpZGF0ZUJ5UHJvamVjdDsKIAl9Ci0KLQkvKioKLQkgKiBBZGQgdGhlIHByb2plY3QgbmF0dXJlIGZpbHRlcihzKS4KLQkgKi8KLQl2b2lkIGFkZFByb2plY3ROYXR1cmVGaWx0ZXJzKFZhbGlkYXRvck5hbWVGaWx0ZXJbXSBmaWx0ZXJzKSB7Ci0JCV9wcm9qZWN0TmF0dXJlRmlsdGVycyA9IGZpbHRlcnM7Ci0JfQotCQotCS8qKgotCSAqIEFkZCB0aGUgZmFjZXQgIGZpbHRlcihzKS4KLQkgKi8KLQlwcm90ZWN0ZWQgdm9pZCBhZGRGYWNldEZpbHRlcnMoU3RyaW5nW10gZmlsdGVycykgewotCQlfZmFjZXRGaWx0ZXJzID0gZmlsdGVyczsKLQl9Ci0JCisJCQogCXByb3RlY3RlZCBTdHJpbmdbXSBnZXRGYWNldEZpbHRlcnMoKSB7CiAJCXJldHVybiBfZmFjZXRGaWx0ZXJzOwogCX0KQEAgLTEyNiwxNiArMTMxLDE4IEBACiAJICogUmV0dXJuIHRoZSBsaXN0IG9mIGNsYXNzIG5hbWVzIG9mIHRoZSBwcmltYXJ5IHZhbGlkYXRvciBhbmQgaXRzIGFnZ3JlZ2F0ZXMuCiAJICovCiAJcHVibGljIFN0cmluZ1tdIGdldFZhbGlkYXRvck5hbWVzKCkgewotCQlpZiAoX3ZhbGlkYXRvck5hbWVzID09IG51bGwpIHsKLQkJCWludCBhTGVuZ3RoID0gKF9hZ2dyZWdhdGVkVmFsaWRhdG9ycyA9PSBudWxsKSA/IDAgOiBfYWdncmVnYXRlZFZhbGlkYXRvcnMubGVuZ3RoOwotCQkJX3ZhbGlkYXRvck5hbWVzID0gbmV3IFN0cmluZ1thTGVuZ3RoICsgMV07IC8vIGFkZCAxIGZvciB0aGUgcHJpbWFyeSB2YWxpZGF0b3IgbmFtZQotCQkJX3ZhbGlkYXRvck5hbWVzWzBdID0gZ2V0VmFsaWRhdG9yVW5pcXVlTmFtZSgpOwotCQkJaWYgKF9hZ2dyZWdhdGVkVmFsaWRhdG9ycyAhPSBudWxsKSB7Ci0JCQkJU3lzdGVtLmFycmF5Y29weShfYWdncmVnYXRlZFZhbGlkYXRvcnMsIDAsIF92YWxpZGF0b3JOYW1lcywgMSwgYUxlbmd0aCk7Ci0JCQl9Ci0JCX0KIAkJcmV0dXJuIF92YWxpZGF0b3JOYW1lczsKIAl9CisJCisJcHJpdmF0ZSBTdHJpbmdbXSBidWlsZFZhbGlkYXRvck5hbWVzKCkgeworCQlpbnQgYUxlbmd0aCA9IChfYWdncmVnYXRlZFZhbGlkYXRvcnMgPT0gbnVsbCkgPyAwIDogX2FnZ3JlZ2F0ZWRWYWxpZGF0b3JzLmxlbmd0aDsKKwkJU3RyaW5nIFtdIHZhbGlkYXRvck5hbWVzID0gbmV3IFN0cmluZ1thTGVuZ3RoICsgMV07IC8vIGFkZCAxIGZvciB0aGUgcHJpbWFyeSB2YWxpZGF0b3IgbmFtZQorCQl2YWxpZGF0b3JOYW1lc1swXSA9IGdldFZhbGlkYXRvclVuaXF1ZU5hbWUoKTsKKwkJaWYgKF9hZ2dyZWdhdGVkVmFsaWRhdG9ycyAhPSBudWxsKSB7CisJCQlTeXN0ZW0uYXJyYXljb3B5KF9hZ2dyZWdhdGVkVmFsaWRhdG9ycywgMCwgdmFsaWRhdG9yTmFtZXMsIDEsIGFMZW5ndGgpOworCQl9CisJCXJldHVybiB2YWxpZGF0b3JOYW1lczsKKwl9CiAKIAkvKioKIAkgKiBSZXR1cm4gdGhlIGxpc3Qgb2YgY2xhc3MgbmFtZXMgb2YgZXZlcnkgdmFsaWRhdG9yIHdoaWNoIHRoaXMgdmFsaWRhdG9yIGFnZ3JlZ2F0ZXMuIEZvcgpAQCAtMTkxLDMwICsxOTgsMjUgQEAKIAkvL1RPRE8ganVzdCB3YW50IHRvIHJlbWVtYmVyIHRvIGZpZ3VyZSBvdXQgdGhlIG1hbnktdGVtcG9yYXJ5LW9iamVjdHMgcHJvYmxlbSBpZiB0aGlzIG1ldGhvZAogCS8vIGNvbnRpbnVlcyB0byBuZXcgYW4gSVZhbGlkYXRpb25Db250ZXh0IGV2ZXJ5IHRpbWUgLSBSdXRoCiAJcHVibGljIElXb3JrYmVuY2hDb250ZXh0IGdldEhlbHBlcihJUHJvamVjdCBwcm9qZWN0KSB0aHJvd3MgSW5zdGFudGlhdGlvbkV4Y2VwdGlvbiB7Ci0JCWlmIChfaGVscGVyID09IG51bGwpIHsKLQkJCV9oZWxwZXIgPSBWYWxpZGF0aW9uUmVnaXN0cnlSZWFkZXIuY3JlYXRlSGVscGVyKF9oZWxwZXJDbGFzc0VsZW1lbnQsIF9oZWxwZXJDbGFzc05hbWUpOwotCQkJaWYgKF9oZWxwZXIgPT0gbnVsbCkgewotCQkJCV9oZWxwZXIgPSBuZXcgV29ya2JlbmNoQ29udGV4dCgpOwotCQkJCS8vc2V0Q2Fubm90TG9hZCgpOwotCQkJCS8vdGhyb3cgbmV3IEluc3RhbnRpYXRpb25FeGNlcHRpb24oUmVzb3VyY2VIYW5kbGVyLmdldEV4dGVybmFsaXplZE1lc3NhZ2UoUmVzb3VyY2VDb25zdGFudHMuVkJGX0VYQ19ESVNBQkxFSCwgbmV3IFN0cmluZ1tde19oZWxwZXJDbGFzc05hbWUsIGdldFZhbGlkYXRvclVuaXF1ZU5hbWUoKX0pKTsKLQkJCX0KLQkJCS8vIFdvbid0IGJlIHVzaW5nIHRoZSBlbGVtZW50ICYgbmFtZSBhZ2Fpbiwgc28gY2xlYXIgdGhlbS4KLQkJCS8vX2hlbHBlckNsYXNzRWxlbWVudCA9IG51bGw7Ci0JCQkvL19oZWxwZXJDbGFzc05hbWUgPSBudWxsOworCQlJV29ya2JlbmNoQ29udGV4dCBoZWxwZXIgPSBfaGVscGVyLmdldCgpOworCQlpZiAoaGVscGVyICE9IG51bGwpeworCQkJSVByb2plY3Qgb2xkUHJvamVjdCA9IGhlbHBlci5nZXRQcm9qZWN0KCk7CisJCQlpZiAoKG9sZFByb2plY3QgPT0gbnVsbCkgfHwgIShvbGRQcm9qZWN0LmVxdWFscyhwcm9qZWN0KSkpaGVscGVyLnNldFByb2plY3QocHJvamVjdCk7CisJCQlyZXR1cm4gaGVscGVyOwogCQl9Ci0JCWlmICgoX2hlbHBlci5nZXRQcm9qZWN0KCkgPT0gbnVsbCkgfHwgIShfaGVscGVyLmdldFByb2plY3QoKS5lcXVhbHMocHJvamVjdCkpKSB7Ci0JCQkvLyBJbml0aWFsaXplIGhlbHBlciB3aXRoIHRoZSBuZXcgcHJvamVjdAotCQkJX2hlbHBlci5zZXRQcm9qZWN0KHByb2plY3QpOworCQkKKwkJaGVscGVyID0gVmFsaWRhdGlvblJlZ2lzdHJ5UmVhZGVyLmNyZWF0ZUhlbHBlcihfaGVscGVyQ2xhc3NFbGVtZW50LCBfaGVscGVyQ2xhc3NOYW1lKTsKKwkJaWYgKGhlbHBlciA9PSBudWxsKWhlbHBlciA9IG5ldyBXb3JrYmVuY2hDb250ZXh0KCk7CisJCQorCQlpZiAoKGhlbHBlci5nZXRQcm9qZWN0KCkgPT0gbnVsbCkgfHwgIShoZWxwZXIuZ2V0UHJvamVjdCgpLmVxdWFscyhwcm9qZWN0KSkpIHsKKwkJCWhlbHBlci5zZXRQcm9qZWN0KHByb2plY3QpOwogCQl9Ci0JCXJldHVybiBfaGVscGVyOworCQlpZiAoX2hlbHBlci5jb21wYXJlQW5kU2V0KG51bGwsIGhlbHBlcikpcmV0dXJuIGhlbHBlcjsKKwkJcmV0dXJuIF9oZWxwZXIuZ2V0KCk7CiAJfQogCiAJLyoqCiAJICogY2Fubm90TG9hZCBpcyBmYWxzZSBpZiBib3RoIHRoZSBJVmFsaWRhdG9yIGFuZCBJV29ya2JlbmNoQ29udGV4dCBpbnN0YW5jZSBjYW4gYmUgaW5zdGFudGlhdGVkLgotCSAqIFRoaXMgbWV0aG9kIHNob3VsZCBiZSBjYWxsZWQgb25seSBieSB0aGUgdmFsaWRhdGlvbiBmcmFtZXdvcmssIGFuZCBvbmx5IGlmIGFuCi0JICogSW5zdGFudGlhdGlvbkV4Y2VwdGlvbiB3YXMgdGhyb3duLgotCSAqIAotCSAqIEBwYXJhbSBjYW4KIAkgKi8KIAlwcml2YXRlIHZvaWQgc2V0Q2Fubm90TG9hZCgpIHsKIAkJX2Nhbm5vdExvYWQgPSB0cnVlOwpAQCAtMjUxLDIzICsyNTMsMTkgQEAKIAkgKiBUaGlzIG1ldGhvZCByZXR1cm5zIHRoZSB2YWxpZGF0b3IgaWYgaXQgY2FuIGJlIGxvYWRlZDsgaWYgdGhlIHZhbGlkYXRvciBjYW5ub3QgYmUgbG9hZGVkLAogCSAqIGUuZy4sIGlmIGl0cyBwbHVnaW4gaXMgZGlzYWJsZWQgZm9yIHNvbWUgcmVhc29uLCB0aGVuIHRoaXMgbWV0aG9kIHRocm93cyBhbgogCSAqIEluc3RhbnRpYXRpb25FeGNlcHRpb24uIEJlZm9yZSB0aGUgQ29yZUV4Y2VwdGlvbiBpcyB0aHJvd24sIHRoaXMgdmFsaWRhdG9yIGlzIGRpc2FibGVkLgotCSAqIAotCSAqIEByZXR1cm4gSVZhbGlkYXRvcgotCSAqIEB0aHJvd3MgSW5zdGFudGlhdGlvbkV4Y2VwdGlvbgogCSAqLwogCXB1YmxpYyBJVmFsaWRhdG9yIGdldFZhbGlkYXRvcigpIHRocm93cyBJbnN0YW50aWF0aW9uRXhjZXB0aW9uIHsKLQkJaWYgKF92YWxpZGF0b3IgPT0gbnVsbCkgewotCQkJX3ZhbGlkYXRvciA9IFZhbGlkYXRpb25SZWdpc3RyeVJlYWRlci5jcmVhdGVWYWxpZGF0b3IoX3ZhbGlkYXRvckNsYXNzRWxlbWVudCwgZ2V0VmFsaWRhdG9yVW5pcXVlTmFtZSgpKTsKKwkJSVZhbGlkYXRvciB2YWwgPSBfdmFsaWRhdG9yLmdldCgpOworCQlpZiAodmFsICE9IG51bGwpcmV0dXJuIHZhbDsKKwkJCisJCXZhbCA9IFZhbGlkYXRpb25SZWdpc3RyeVJlYWRlci5jcmVhdGVWYWxpZGF0b3IoX3ZhbGlkYXRvckNsYXNzRWxlbWVudCwgZ2V0VmFsaWRhdG9yVW5pcXVlTmFtZSgpKTsKIAotCQkJLy8gU2luY2UgdGhlIGVsZW1lbnQgd29uJ3QgYmUgdXNlZCBhbnkgbW9yZSwgY2xlYXIgaXQuCi0JCQkvL192YWxpZGF0b3JDbGFzc0VsZW1lbnQgPSBudWxsOwotCi0JCQlpZiAoX3ZhbGlkYXRvciA9PSBudWxsKSB7Ci0JCQkJc2V0Q2Fubm90TG9hZCgpOwotCQkJCXRocm93IG5ldyBJbnN0YW50aWF0aW9uRXhjZXB0aW9uKFJlc291cmNlSGFuZGxlci5nZXRFeHRlcm5hbGl6ZWRNZXNzYWdlKFJlc291cmNlQ29uc3RhbnRzLlZCRl9FWENfRElTQUJMRVYsIG5ldyBTdHJpbmdbXXtnZXRWYWxpZGF0b3JVbmlxdWVOYW1lKCl9KSk7Ci0JCQl9CisJCWlmICh2YWwgPT0gbnVsbCkgeworCQkJc2V0Q2Fubm90TG9hZCgpOworCQkJdGhyb3cgbmV3IEluc3RhbnRpYXRpb25FeGNlcHRpb24oUmVzb3VyY2VIYW5kbGVyLmdldEV4dGVybmFsaXplZE1lc3NhZ2UoUmVzb3VyY2VDb25zdGFudHMuVkJGX0VYQ19ESVNBQkxFViwgbmV3IFN0cmluZ1tde2dldFZhbGlkYXRvclVuaXF1ZU5hbWUoKX0pKTsKIAkJfQotCQlyZXR1cm4gX3ZhbGlkYXRvcjsKKwkJaWYgKF92YWxpZGF0b3IuY29tcGFyZUFuZFNldChudWxsLCB2YWwpKXJldHVybiB2YWw7CisJCXJldHVybiBfdmFsaWRhdG9yLmdldCgpOwogCX0KIAogCXB1YmxpYyBTdHJpbmcgZ2V0VmFsaWRhdG9yRGlzcGxheU5hbWUoKSB7CkBAIC0yOTcsOCArMjk1LDkgQEAKIAkgKi8KIAlwdWJsaWMgYm9vbGVhbiBpc0FwcGxpY2FibGVUbyhJUmVzb3VyY2UgcmVzb3VyY2UsIGludCByZXNvdXJjZURlbHRhKSB7CiAJCS8vIElmIG5vIGZpbHRlcnMgYXJlIHNwZWNpZmllZCwgdGhlbiBldmVyeSB0eXBlIG9mIHJlc291cmNlIHNob3VsZCBiZSB2YWxpZGF0ZWQvdHJpZ2dlciBhCi0JCS8vIHJlYnVpbGQgb2YgdGhlIG1vZGVsIGNhY2hlCi0JCWlmIChfZmlsdGVycyA9PSBudWxsKXJldHVybiB0cnVlOworCQkvLyByZWJ1aWxkIG9mIHRoZSBtb2RlbCBjYWNoZS4KKwkJLy8gQWxzbyBtYWtlIHN1cmUgbm8gY29udGVudCB0eXBlIGlkIGlzIHNwZWNpZmllZCAoQlVHIDE5MzgxNikKKwkJaWYgKF9maWx0ZXJzID09IG51bGwgICYmIGdldENvbnRlbnRUeXBlSWRzKCkgPT0gbnVsbClyZXR1cm4gdHJ1ZTsKIAogCQlyZXR1cm4gaXNBcHBsaWNhYmxlVG8ocmVzb3VyY2UsIHJlc291cmNlRGVsdGEsIF9maWx0ZXJzKTsKIAl9CkBAIC0zMDgsMTUgKzMwNywxNCBAQAogCSAqLwogCWJvb2xlYW4gaXNBcHBsaWNhYmxlVG8oSVJlc291cmNlIHJlc291cmNlLCBpbnQgcmVzb3VyY2VEZWx0YSwgVmFsaWRhdG9yRmlsdGVyW10gZmlsdGVycykgewogCQkvLyBBcmUgYW55IG9mIHRoZSBmaWx0ZXJzIHNhdGlzZmllZD8gKGkuZS4sIE9SIHRoZW0sIG5vdCBBTkQgdGhlbS4pCi0JCWlmIChjaGVja0lmVmFsaWRTb3VyY2VGaWxlKHJlc291cmNlKSkgewotCQkJZm9yIChpbnQgaSA9IDA7IGkgPCBmaWx0ZXJzLmxlbmd0aDsgaSsrKSB7Ci0JCQkJVmFsaWRhdG9yRmlsdGVyIGZpbHRlciA9IGZpbHRlcnNbaV07CisJCS8vIG1ha2Ugc3VyZSBmaWx0ZXJzIGlzIG5vdCBudWxsIChCVUcgMTkzODE2KQorCQlpZiAoZmlsdGVycyAhPSBudWxsICYmIGNoZWNrSWZWYWxpZFNvdXJjZUZpbGUocmVzb3VyY2UpKSB7CisJCQlmb3IgKFZhbGlkYXRvckZpbHRlciBmaWx0ZXIgOiBmaWx0ZXJzKSB7CiAJCQkJaWYgKGZpbHRlci5pc0FwcGxpY2FibGVUeXBlKHJlc291cmNlKQogCQkJCQkJJiYgZmlsdGVyLmlzQXBwbGljYWJsZU5hbWUocmVzb3VyY2UpCiAJCQkJCQkmJiBmaWx0ZXIuaXNBcHBsaWNhYmxlQWN0aW9uKHJlc291cmNlRGVsdGEpKSB7CiAJCQkJCXJldHVybiB0cnVlOwogCQkJCX0KLQogCQkJfQogCQl9CiAJCWlmIChnZXRDb250ZW50VHlwZUlkcygpICE9IG51bGwpIHsKQEAgLTMyNywxMCArMzI1LDggQEAKIAkJCX0gY2F0Y2ggKENvcmVFeGNlcHRpb24gZSkgewogCQkJCS8vUmVzb3VyY2UgZXhjZXB0aW9ucwogCQkJfQotCQkJaWYgKGRlc2NyaXB0aW9uID09IG51bGwpCi0JCQkJcmV0dXJuIGZhbHNlOwotCQkJaWYgKGlzQXBwbGljYWJsZUNvbnRlbnRUeXBlKGRlc2NyaXB0aW9uKSkKLQkJCQlyZXR1cm4gdHJ1ZTsKKwkJCWlmIChkZXNjcmlwdGlvbiA9PSBudWxsKXJldHVybiBmYWxzZTsKKwkJCWlmIChpc0FwcGxpY2FibGVDb250ZW50VHlwZShkZXNjcmlwdGlvbikpcmV0dXJuIHRydWU7CiAJCX0KIAkJcmV0dXJuIGZhbHNlOwogCX0KQEAgLTM0Myw2ICszMzksNyBAQAogCQkJCXJldHVybiB0cnVlOwogCQkJSUNvbnRhaW5lcltdIG91dHB1dENvbnRhaW5lcnMgPSBoZWxwZXIuZ2V0T3V0cHV0Q29udGFpbmVycyhwcm9qZWN0KTsKIAkJCUlDb250YWluZXJbXSBzb3VyY2VDb250YWluZXJzID0gaGVscGVyLmdldFNvdXJjZUNvbnRhaW5lcnMocHJvamVjdCk7CisJCQlpZihvdXRwdXRDb250YWluZXJzICE9IG51bGwgJiYgc291cmNlQ29udGFpbmVycyAhPSBudWxsKXsKIAkJCWZvciAoaW50IGk9MDsgaTxvdXRwdXRDb250YWluZXJzLmxlbmd0aDsgaSsrKSB7CiAJCQkJU3RyaW5nIG91dHB1dFBhdGggPSBvdXRwdXRDb250YWluZXJzW2ldLmdldFByb2plY3RSZWxhdGl2ZVBhdGgoKS5tYWtlQWJzb2x1dGUoKS50b1N0cmluZygpOwogICAgICAgICAgICAgICAgIFN0cmluZyBmaWxlUGF0aCA9IGZpbGUuZ2V0UHJvamVjdFJlbGF0aXZlUGF0aCgpLm1ha2VBYnNvbHV0ZSgpLnRvU3RyaW5nKCk7CkBAIC0zNTgsNiArMzU1LDcgQEAKIAkJCQl9CiAJCQl9CiAJCX0KKwkJfQogCQlyZXR1cm4gdHJ1ZTsKIAl9CiAJCQpAQCAtNDE1LDU3ICs0MTMsMTEgQEAKIAkJcmV0dXJuIF9hc3luYzsKIAl9CiAKLQl2b2lkIHNldEhlbHBlckNsYXNzKElDb25maWd1cmF0aW9uRWxlbWVudCBlbGVtZW50LCBTdHJpbmcgaGVscGVyQ2xhc3NOYW1lKSB7Ci0JCV9oZWxwZXJDbGFzc0VsZW1lbnQgPSBlbGVtZW50OwotCQlfaGVscGVyQ2xhc3NOYW1lID0gaGVscGVyQ2xhc3NOYW1lOwotCX0KLQotCXZvaWQgc2V0RW5hYmxlZEJ5RGVmYXVsdChib29sZWFuIGVuYWJsZWRCeURlZmF1bHQpIHsKLQkJX2lzRW5hYmxlZEJ5RGVmYXVsdCA9IGVuYWJsZWRCeURlZmF1bHQ7Ci0JfQotCi0Jdm9pZCBzZXRJbmNyZW1lbnRhbChib29sZWFuIGlzSW5jcmVtZW50YWwpIHsKLQkJX3N1cHBvcnRzSW5jcmVtZW50YWwgPSBpc0luY3JlbWVudGFsOwotCX0KLQotCXZvaWQgc2V0RnVsbEJ1aWxkKGJvb2xlYW4gZnVsbEJ1aWxkKSB7Ci0JCV9zdXBwb3J0c0Z1bGxCdWlsZCA9IGZ1bGxCdWlsZDsKLQl9Ci0KLQl2b2lkIHNldEFzeW5jKGJvb2xlYW4gaXNBc3luYykgewotCQlfYXN5bmMgPSBpc0FzeW5jOwotCX0KLQotCXZvaWQgc2V0TWlncmF0aW9uTWV0YURhdGEoTWlncmF0aW9uTWV0YURhdGEgbW1kKSB7Ci0JCV9taWdyYXRpb25NZXRhRGF0YSA9IG1tZDsKLQl9Ci0KLQl2b2lkIHNldFJ1bGVHcm91cChpbnQgcnVsZUdyb3VwKSB7Ci0JCV9ydWxlR3JvdXAgPSBydWxlR3JvdXA7Ci0JfQotCi0Jdm9pZCBzZXRWYWxpZGF0b3JDbGFzcyhJQ29uZmlndXJhdGlvbkVsZW1lbnQgZWxlbWVudCkgewotCQlfdmFsaWRhdG9yQ2xhc3NFbGVtZW50ID0gZWxlbWVudDsKLQkJLy8gdmFsaWRhdG9yIGNsYXNzIG5hbWUgPT0gdmFsaWRhdG9yVW5pcXVlTmFtZQotCX0KLQotCXZvaWQgc2V0VmFsaWRhdG9yRGlzcGxheU5hbWUoU3RyaW5nIHZhbGlkYXRvck5hbWUpIHsKLQkJX3ZhbGlkYXRvckRpc3BsYXlOYW1lID0gdmFsaWRhdG9yTmFtZTsKLQl9Ci0KLQl2b2lkIHNldFZhbGlkYXRvclVuaXF1ZU5hbWUoU3RyaW5nIHZhbGlkYXRvclVuaXF1ZU5hbWUpIHsKLQkJX3ZhbGlkYXRvclVuaXF1ZU5hbWUgPSB2YWxpZGF0b3JVbmlxdWVOYW1lOwotCX0KLQotCXZvaWQgc2V0UGx1Z2luSWQoU3RyaW5nIHZhbGlkYXRvclBsdWdpbklkKSB7Ci0JCV9wbHVnaW5JZCA9IHZhbGlkYXRvclBsdWdpbklkOwotCX0KLQogCXB1YmxpYyBTdHJpbmcgdG9TdHJpbmcoKSB7CiAJCXJldHVybiBnZXRWYWxpZGF0b3JVbmlxdWVOYW1lKCk7CiAJfQogCi0JcHVibGljIGNsYXNzIE1pZ3JhdGlvbk1ldGFEYXRhIHsKKwlwdWJsaWMgZmluYWwgc3RhdGljIGNsYXNzIE1pZ3JhdGlvbk1ldGFEYXRhIHsKIAkJcHJpdmF0ZSBTZXQ8U3RyaW5nW10+IF9pZHM7CiAKIAkJcHVibGljIE1pZ3JhdGlvbk1ldGFEYXRhKCkgewpAQCAtNDg1LDEwICs0MzcsNiBAQAogCQl9CiAJfQogCi0JcHVibGljIHZvaWQgYWRkRGVwZW5kZW50VmFsaWRhdG9yKGJvb2xlYW4gYikgewotCQlfZGVwZW5kZW50VmFsaWRhdG9yID0gYjsKLQl9Ci0KIAlwdWJsaWMgYm9vbGVhbiBpc0RlcGVuZGVudFZhbGlkYXRvcigpIHsKIAkJcmV0dXJuIF9kZXBlbmRlbnRWYWxpZGF0b3I7CiAJfQpAQCAtNTAwLDIwICs0NDgsMTIgQEAKIAkJcmV0dXJuIF9tYXJrZXJJZHM7CiAJfQogCi0JLyoqCi0JICogQHBhcmFtIG1hcmtlcklkCi0JICogICAgICAgICAgICBUaGUgbWFya2VySWQgdG8gc2V0LgotCSAqLwotCXB1YmxpYyB2b2lkIHNldE1hcmtlcklkcyhTdHJpbmdbXSBtYXJrZXJJZCkgewotCQl0aGlzLl9tYXJrZXJJZHMgPSBtYXJrZXJJZDsKLQl9Ci0KIAlwdWJsaWMgYm9vbGVhbiBpc0J1aWxkVmFsaWRhdGlvbigpIHsKIAkJcmV0dXJuIF9idWlsZFZhbGlkYXRpb247CiAJfQogCiAJcHVibGljIHZvaWQgc2V0QnVpbGRWYWxpZGF0aW9uKGJvb2xlYW4gYnVpbGRWYWxpZGF0aW9uKSB7Ci0JCXRoaXMuX2J1aWxkVmFsaWRhdGlvbiA9IGJ1aWxkVmFsaWRhdGlvbjsKKwkJX2J1aWxkVmFsaWRhdGlvbiA9IGJ1aWxkVmFsaWRhdGlvbjsKIAl9CiAKIAlwdWJsaWMgYm9vbGVhbiBpc01hbnVhbFZhbGlkYXRpb24oKSB7CkBAIC01MjEsNyArNDYxLDcgQEAKIAl9CiAKIAlwdWJsaWMgdm9pZCBzZXRNYW51YWxWYWxpZGF0aW9uKGJvb2xlYW4gbWFudWFsVmFsaWRhdGlvbikgewotCQl0aGlzLl9tYW51YWxWYWxpZGF0aW9uID0gbWFudWFsVmFsaWRhdGlvbjsKKwkJX21hbnVhbFZhbGlkYXRpb24gPSBtYW51YWxWYWxpZGF0aW9uOwogCX0KICAgCiAJLyoqCkBAIC01ODksMTggKzUyOSwxMCBAQAogCQlyZXR1cm4gX2VuYWJsZW1lbnRFeHByZXNzaW9uOwogCX0KIAotICAgcHVibGljIHZvaWQgc2V0RW5hYmxlbWVudEVsZW1lbnQoRXhwcmVzc2lvbiBlbmFibGVtZW50RWxlbWVudCkgewotCSBfZW5hYmxlbWVudEV4cHJlc3Npb24gPSBlbmFibGVtZW50RWxlbWVudDsKLQl9Ci0KIHB1YmxpYyBTdHJpbmdbXSBnZXRDb250ZW50VHlwZUlkcygpIHsKIAlyZXR1cm4gX2NvbnRlbnRUeXBlSWRzOwogfQogCi1wdWJsaWMgdm9pZCBzZXRDb250ZW50VHlwZUlkcyhTdHJpbmdbXSBjb250ZW50VHlwZUlkcykgewotCXRoaXMuX2NvbnRlbnRUeXBlSWRzID0gY29udGVudFR5cGVJZHM7Ci19Ci0KICAKIHByaXZhdGUgYm9vbGVhbiBpc0FwcGxpY2FibGVDb250ZW50VHlwZShJQ29udGVudERlc2NyaXB0aW9uIGRlc2MpewogCQpAQCAtNjE0LDUgKzU0Niw5IEBACiAJfQogCXJldHVybiBmYWxzZTsKIH0KKworcHVibGljIGJvb2xlYW4gaXNWYWxpZGF0ZUJ5UHJvamVjdCgpIHsKKwlyZXR1cm4gX3ZhbGlkYXRlQnlQcm9qZWN0OworfQogICAgCiB9CmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uL3ZhbGlkYXRlL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL2ludGVybmFsL2RlbGVnYXRlcy9WYWxpZGF0b3JEZWxlZ2F0ZXNSZWdpc3RyeS5qYXZhIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi92YWxpZGF0ZS9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9pbnRlcm5hbC9kZWxlZ2F0ZXMvVmFsaWRhdG9yRGVsZWdhdGVzUmVnaXN0cnkuamF2YQppbmRleCAwOWJjNjNmLi4zZWEwMzRmIDEwMDY0NAotLS0gYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uL3ZhbGlkYXRlL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL2ludGVybmFsL2RlbGVnYXRlcy9WYWxpZGF0b3JEZWxlZ2F0ZXNSZWdpc3RyeS5qYXZhCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24vdmFsaWRhdGUvb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vaW50ZXJuYWwvZGVsZWdhdGVzL1ZhbGlkYXRvckRlbGVnYXRlc1JlZ2lzdHJ5LmphdmEKQEAgLTEyLDEwICsxMiwxNyBAQAogcGFja2FnZSBvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5pbnRlcm5hbC5kZWxlZ2F0ZXM7CiAKIGltcG9ydCBqYXZhLnV0aWwuSGFzaE1hcDsKK2ltcG9ydCBqYXZhLnV0aWwuSGFzaFNldDsKIGltcG9ydCBqYXZhLnV0aWwuSXRlcmF0b3I7CiBpbXBvcnQgamF2YS51dGlsLk1hcDsKK2ltcG9ydCBqYXZhLnV0aWwuU2V0OworaW1wb3J0IGphdmEudXRpbC5TdHJpbmdUb2tlbml6ZXI7CiAKK2ltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJ1bnRpbWUucHJlZmVyZW5jZXMuRGVmYXVsdFNjb3BlOworaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucnVudGltZS5wcmVmZXJlbmNlcy5JRWNsaXBzZVByZWZlcmVuY2VzOworaW1wb3J0IG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLmludGVybmFsLkNvbmZpZ3VyYXRpb25Db25zdGFudHM7CiBpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uaW50ZXJuYWwuY29yZS5WYWxpZGF0aW9uRXhjZXB0aW9uOworaW1wb3J0IG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLmludGVybmFsLnBsdWdpbi5WYWxpZGF0aW9uUGx1Z2luOwogaW1wb3J0IG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLmludGVybmFsLnByb3Zpc2lvbmFsLmNvcmUuSVZhbGlkYXRvcjsKIAogLyoqCkBAIC00MCwxOSArNDcsNTcgQEAKICAgICovCiAgIHB1YmxpYyBzdGF0aWMgVmFsaWRhdG9yRGVsZWdhdGVzUmVnaXN0cnkgZ2V0SW5zdGFuY2UoKSB7CiAgICAgaWYgKF9pbnN0YW5jZSA9PSBudWxsKSB7Ci0gICAgICBfaW5zdGFuY2UgPSBuZXcgVmFsaWRhdG9yRGVsZWdhdGVzUmVnaXN0cnkoKTsKLSAgICAgIFZhbGlkYXRvckRlbGVnYXRlc1JlZ2lzdHJ5UmVhZGVyIHJlYWRlciA9IG5ldyBWYWxpZGF0b3JEZWxlZ2F0ZXNSZWdpc3RyeVJlYWRlcihfaW5zdGFuY2UpOwotICAgICAgcmVhZGVyLnJlYWRSZWdpc3RyeSgpOworICAgIAlWYWxpZGF0b3JEZWxlZ2F0ZXNSZWdpc3RyeSBpbnN0YW5jZSA9IG5ldyBWYWxpZGF0b3JEZWxlZ2F0ZXNSZWdpc3RyeSgpOworICAgIAlWYWxpZGF0b3JEZWxlZ2F0ZXNSZWdpc3RyeVJlYWRlciByZWFkZXIgPSBuZXcgVmFsaWRhdG9yRGVsZWdhdGVzUmVnaXN0cnlSZWFkZXIoaW5zdGFuY2UpOworICAgIAlyZWFkZXIucmVhZFJlZ2lzdHJ5KCk7CisgICAgCWluc3RhbmNlLmluaXREZWZhdWx0cygpOworICAgIAlfaW5zdGFuY2UgPSBpbnN0YW5jZTsKICAgICB9CiAKICAgICByZXR1cm4gX2luc3RhbmNlOwogICB9CiAKICAgLyoqCisgICAqIERldGVybWluZSBpZiB0aGUgcHJvZHVjdCBkZWZpbmVkIGFueSBkZWZhdWx0IGRlbGVnYXRlIHZhbGlkYXRvcnMsIGJ5IHNldHRpbmcgdGhlIG9sZAorICAgKiBERUxFR0FURVNfUFJFRkVSRU5DRSBwcmVmZXJlbmNlIGluIHRoZSBkZWZhdWx0IHByZWZlcmVuY2Ugc2NvcGUuIElmIHRoZXkgZGlkLCB3ZSByZW1lbWJlcgorICAgKiB0aGVtLCBzbyB0aGF0IGlmIHdlIGV2ZXJ5IG5lZWQgdG8gcmV0dXJuIGEgZGVmYXVsdCBmb3IgdGhlIGRlbGVnYXRpbmcgdmFsaWRhdG9yLCB3ZSBjYW4gcmV0dXJuIHRoZSBvbmUKKyAgICogdGhhdCB0aGUgcHJvZHVjdCByZXF1ZXN0ZWQuCisgICAqLworICBwcml2YXRlIHZvaWQgaW5pdERlZmF1bHRzKCkgeworCSAgCS8vIFRoaXMgY29kZSB3YXMgY29waWVkIGZyb20gdGhlIFZhbGlkYXRpb25Db25maWd1cmF0aW9uI2Rlc2VyaWFsaXplRGVsZWdhdGVzKCkgbWV0aG9kLiBUaGUgY29kZSB3YXMgY29waWVkIGJlY2F1c2UgdGhpcworCSAgCS8vIGNoYW5nZSBpcyBwYXJ0IG9mIGEgcGF0Y2ggYW5kIEkgZGlkbid0IHdhbnQgdG8gZGlzdHVyYiB0aGUgVmFsaWRhdGlvbkNvbmZpZ3VyYXRpb24gY2xhc3MuCisJICAKKwkJSUVjbGlwc2VQcmVmZXJlbmNlcyBwcmVmcyA9IG5ldyBEZWZhdWx0U2NvcGUoKS5nZXROb2RlKFZhbGlkYXRpb25QbHVnaW4uUExVR0lOX0lEKTsKKwkJU3RyaW5nIGRlbGVnYXRlUHJlZiA9IHByZWZzLmdldCgiREVMRUdBVEVTX1BSRUZFUkVOQ0UiLCBudWxsKTsgLy8kTk9OLU5MUy0xJAorCQlpZiAoZGVsZWdhdGVQcmVmID09IG51bGwpcmV0dXJuOworCisJCWludCBkZWxlZ2F0ZXNJbmRleCA9IGRlbGVnYXRlUHJlZi5pbmRleE9mKENvbmZpZ3VyYXRpb25Db25zdGFudHMuREVMRUdBVEVfVkFMSURBVE9SUyk7CisJCVN0cmluZyBkZWxlZ2F0ZXMgPSBkZWxlZ2F0ZVByZWYuc3Vic3RyaW5nKGRlbGVnYXRlc0luZGV4ICsgQ29uZmlndXJhdGlvbkNvbnN0YW50cy5ERUxFR0FURV9WQUxJREFUT1JTLmxlbmd0aCgpLCBkZWxlZ2F0ZVByZWYubGVuZ3RoKCkpOworCisJCWlmIChkZWxlZ2F0ZXMgPT0gbnVsbClyZXR1cm47CisKKwkJX2RlZmF1bHREZWxlZ2F0ZXMgPSBuZXcgSGFzaFNldDxTdHJpbmc+KDEwKTsKKwkJU3RyaW5nVG9rZW5pemVyIHRva2VuaXplciA9IG5ldyBTdHJpbmdUb2tlbml6ZXIoZGVsZWdhdGVzLCBDb25maWd1cmF0aW9uQ29uc3RhbnRzLkVMRU1FTlRfU0VQQVJBVE9SKTsKKwkJd2hpbGUgKHRva2VuaXplci5oYXNNb3JlVG9rZW5zKCkpIHsKKwkJCVN0cmluZyBkZWxlZ2F0ZUNvbmZpZ3VyYXRpb24gPSB0b2tlbml6ZXIubmV4dFRva2VuKCk7CisJCQlpbnQgc2VwYXJhdG9ySW5kZXggPSBkZWxlZ2F0ZUNvbmZpZ3VyYXRpb24uaW5kZXhPZihDb25maWd1cmF0aW9uQ29uc3RhbnRzLkRFTEVHQVRFU19TRVBBUkFUT1IpOworLy8JCQlTdHJpbmcgdGFyZ2V0SUQgPSBkZWxlZ2F0ZUNvbmZpZ3VyYXRpb24uc3Vic3RyaW5nKDAsIHNlcGFyYXRvckluZGV4KTsKKwkJCVN0cmluZyBkZWxlZ2F0ZUlEID0gZGVsZWdhdGVDb25maWd1cmF0aW9uLnN1YnN0cmluZyhzZXBhcmF0b3JJbmRleCArIDEpOworCQkJX2RlZmF1bHREZWxlZ2F0ZXMuYWRkKGRlbGVnYXRlSUQpOworCQl9CisKKwl9CisKKy8qKgogICAgKiBUaGUgbWFwIG9mIHRhcmdldCB2YWxpZGF0b3IgaWQgdG8gTWFwIG9mIGRlbGVnYXRlcyBieSBpZC4KICAgICovCiAgIHByaXZhdGUgTWFwPFN0cmluZywgTWFwPFN0cmluZyxWYWxpZGF0b3JEZWxlZ2F0ZURlc2NyaXB0b3I+PiBfZGVsZWdhdGVzQnlUYXJnZXQgPSAKIAkgIG5ldyBIYXNoTWFwPFN0cmluZywgTWFwPFN0cmluZyxWYWxpZGF0b3JEZWxlZ2F0ZURlc2NyaXB0b3I+PigpOworICAKKyAgLyoqCisgICAqIFZhbGlkYXRvciBpZHMgdGhhdCBoYXZlIGJlZW4gZGVmaW5lZCBieSB0aGUgcHJvZHVjdCB0byBiZSB0aGUgZGVmYXVsdCB2YWxpZGF0b3JzLCBmb3Igc29tZSBvZiB0aGUgZGVsZWdhdGluZyB2YWxpZHRvcnMuCisgICAqLworICBwcml2YXRlIFNldDxTdHJpbmc+IF9kZWZhdWx0RGVsZWdhdGVzOwogCiAgIC8qKgogICAgKiBBZGRzIGEgZGVzY3JpcHRvciB0byB0aGUgcmVnaXN0cnkuCkBAIC04OCwxMiArMTMzLDE5IEBACiAKICAgICBpZiAoZGVsZWdhdGVzID09IG51bGwpcmV0dXJuIG51bGw7CiAKKyAgICBpZiAoX2RlZmF1bHREZWxlZ2F0ZXMgIT0gbnVsbCl7CisgICAgCWZvciAoVmFsaWRhdG9yRGVsZWdhdGVEZXNjcmlwdG9yIHZkZCA6IGRlbGVnYXRlcy52YWx1ZXMoKSl7CisgICAgCQlTdHJpbmcgaWQgPSB2ZGQuZ2V0SWQoKTsKKyAgICAJCWlmIChfZGVmYXVsdERlbGVnYXRlcy5jb250YWlucyhpZCkpcmV0dXJuIGlkOworICAgIAl9CisgICAgfQorICAgIAogICAgIC8vIFRPRE86IEltcGxlbWVudCBhIGRlZmF1bHQgYXR0cmlidXRlIGFuZCB1c2UgdGhhdCB0byBnZXQgdGhlIGRlZmF1bHQ/CiAgICAgLy8gV2hhdCBoYXBwZW5zIGlmIHR3byBvciBtb3JlIGRlbGVnYXRlcyBjbGFpbSB0byBiZSB0aGUgZGVmYXVsdCBvbmU/CiAgICAgLy8gRm9yIG5vdywganVzdCBwaWNrIHRoZSBmaXJzdCBvbmUgaW4gdGhlIGxpc3QuCiAKICAgICBJdGVyYXRvcjxWYWxpZGF0b3JEZWxlZ2F0ZURlc2NyaXB0b3I+IGRlbGVnYXRlc0l0ZXJhdG9yID0gZGVsZWdhdGVzLnZhbHVlcygpLml0ZXJhdG9yKCk7Ci0KKyAgICAKICAgICBpZiAoIWRlbGVnYXRlc0l0ZXJhdG9yLmhhc05leHQoKSlyZXR1cm4gbnVsbDsKIAogICAgIHJldHVybiBkZWxlZ2F0ZXNJdGVyYXRvci5uZXh0KCkuZ2V0SWQoKTsKZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24vdmFsaWRhdGUvb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vaW50ZXJuYWwvZGVsZWdhdGVzL1ZhbGlkYXRvckRlbGVnYXRlc1JlZ2lzdHJ5UmVhZGVyLmphdmEgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uL3ZhbGlkYXRlL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL2ludGVybmFsL2RlbGVnYXRlcy9WYWxpZGF0b3JEZWxlZ2F0ZXNSZWdpc3RyeVJlYWRlci5qYXZhCmluZGV4IDI2NGUyNmUuLmM2YmFmZTkgMTAwNjQ0Ci0tLSBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24vdmFsaWRhdGUvb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vaW50ZXJuYWwvZGVsZWdhdGVzL1ZhbGlkYXRvckRlbGVnYXRlc1JlZ2lzdHJ5UmVhZGVyLmphdmEKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi92YWxpZGF0ZS9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9pbnRlcm5hbC9kZWxlZ2F0ZXMvVmFsaWRhdG9yRGVsZWdhdGVzUmVnaXN0cnlSZWFkZXIuamF2YQpAQCAtMSw1ICsxLDUgQEAKIC8qKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqCi0gKiBDb3B5cmlnaHQgKGMpIDIwMDYsIDIwMDcgSUJNIENvcnBvcmF0aW9uIGFuZCBvdGhlcnMuCisgKiBDb3B5cmlnaHQgKGMpIDIwMDYsIDIwMDggSUJNIENvcnBvcmF0aW9uIGFuZCBvdGhlcnMuCiAgKiBBbGwgcmlnaHRzIHJlc2VydmVkLiBUaGlzIHByb2dyYW0gYW5kIHRoZSBhY2NvbXBhbnlpbmcgbWF0ZXJpYWxzCiAgKiBhcmUgbWFkZSBhdmFpbGFibGUgdW5kZXIgdGhlIHRlcm1zIG9mIHRoZSBFY2xpcHNlIFB1YmxpYyBMaWNlbnNlIHYxLjAKICAqIHdoaWNoIGFjY29tcGFuaWVzIHRoaXMgZGlzdHJpYnV0aW9uLCBhbmQgaXMgYXZhaWxhYmxlIGF0CkBAIC0xMiwxMDMgKzEyLDEwOSBAQAogcGFja2FnZSBvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5pbnRlcm5hbC5kZWxlZ2F0ZXM7CiAKIGltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJ1bnRpbWUuSUNvbmZpZ3VyYXRpb25FbGVtZW50OworaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucnVudGltZS5JQ29udHJpYnV0b3I7CiBpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5ydW50aW1lLklFeHRlbnNpb25Qb2ludDsKIGltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJ1bnRpbWUuSUV4dGVuc2lvblJlZ2lzdHJ5OworaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucnVudGltZS5JU3RhdHVzOwogaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucnVudGltZS5QbGF0Zm9ybTsKK2ltcG9ydCBvcmcuZWNsaXBzZS5vc2dpLnV0aWwuTkxTOworaW1wb3J0IG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLmludGVybmFsLlZhbE1lc3NhZ2VzOworaW1wb3J0IG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLmludGVybmFsLnBsdWdpbi5WYWxpZGF0aW9uUGx1Z2luOwogCiAvKioKLSAqIFRoaXMgY2xhc3MgcmVhZHMgdGhlIHBsdWdpbiBleHRlbnNpb24gcmVnaXN0cnkgYW5kIHJlZ2lzdGVycyBlYWNoIGRlbGVnYXRpbmcKKyAqIFRoaXMgY2xhc3MgcmVhZHMgdGhlIHBsdWctaW4gZXh0ZW5zaW9uIHJlZ2lzdHJ5IGFuZCByZWdpc3RlcnMgZWFjaCBkZWxlZ2F0aW5nCiAgKiB2YWxpZGF0b3IgZGVzY3JpcHRvciB3aXRoIHRoZSBkZWxlZ2F0ZXMgcmVnaXN0cnkuCiAgKiAKICAqIEBzZWUgVmFsaWRhdG9yRGVsZWdhdGVzUmVnaXN0cnkKICAqLwotY2xhc3MgVmFsaWRhdG9yRGVsZWdhdGVzUmVnaXN0cnlSZWFkZXIKLXsKLSAgLyoqCi0gICAqIFRoZSBkZWxlZ2F0ZSBjbGFzcyBhdHRyaWJ1dGUuIE11c3QgYmUgdmlzaWJsZSBpbiB0aGUgcGFja2FnZSBiZWNhdXNlIGl0IGlzCi0gICAqIHVzZWQgYnkgb3RoZXIgY2xhc3NlcyBpbiB0aGUgcGFja2FnZS4KLSAgICovCi0gIHN0YXRpYyBmaW5hbCBTdHJpbmcgQ0xBU1NfQVRUUklCVVRFID0gImNsYXNzIjsgLy8kTk9OLU5MUy0xJAorY2xhc3MgVmFsaWRhdG9yRGVsZWdhdGVzUmVnaXN0cnlSZWFkZXIgeworCS8qKgorCSAqIFRoZSBkZWxlZ2F0ZSBjbGFzcyBhdHRyaWJ1dGUuCisJICovCisJc3RhdGljIGZpbmFsIFN0cmluZyBDTEFTU19BVFRSSUJVVEUgPSAiY2xhc3MiOyAvLyROT04tTkxTLTEkCiAKLSAgLyoqCi0gICAqIFRoZSBkZWxlZ2F0ZSBlbGVtZW50IG5hbWUuCi0gICAqLwotICBwcml2YXRlIHN0YXRpYyBmaW5hbCBTdHJpbmcgREVMRUdBVEVfRUxFTUVOVCA9ICJkZWxlZ2F0ZSI7IC8vJE5PTi1OTFMtMSQKKwkvKioKKwkgKiBUaGUgZGVsZWdhdGUgZWxlbWVudCBuYW1lLgorCSAqLworCXByaXZhdGUgc3RhdGljIGZpbmFsIFN0cmluZyBERUxFR0FURV9FTEVNRU5UID0gImRlbGVnYXRlIjsgLy8kTk9OLU5MUy0xJAogCi0gIC8qKgotICAgKiBUaGUgdmFsaWRhdG9yIGRlbGVnYXRlcyBleHRlbnNpb24gcG9pbnQgaWQuCi0gICAqLwotICBwcml2YXRlIHN0YXRpYyBmaW5hbCBTdHJpbmcgRVhURU5TSU9OX1BPSU5UX0lEID0gInZhbGlkYXRvckRlbGVnYXRlcyI7IC8vJE5PTi1OTFMtMSQKKwkvKioKKwkgKiBUaGUgdmFsaWRhdG9yIGRlbGVnYXRlcyBleHRlbnNpb24gcG9pbnQgaWQuCisJICovCisJcHJpdmF0ZSBzdGF0aWMgZmluYWwgU3RyaW5nIEVYVEVOU0lPTl9QT0lOVF9JRCA9ICJ2YWxpZGF0b3JEZWxlZ2F0ZXMiOyAvLyROT04tTkxTLTEkCiAKLSAgLyoqCi0gICAqIFRoZSBkZWxlZ2F0ZSBuYW1lIGF0dHJpYnV0ZS4KLSAgICovCi0gIHByaXZhdGUgc3RhdGljIGZpbmFsIFN0cmluZyBOQU1FX0FUVFJJQlVURSA9ICJuYW1lIjsgLy8kTk9OLU5MUy0xJAorCS8qKgorCSAqIFRoZSBkZWxlZ2F0ZSBuYW1lIGF0dHJpYnV0ZS4KKwkgKi8KKwlwcml2YXRlIHN0YXRpYyBmaW5hbCBTdHJpbmcgTkFNRV9BVFRSSUJVVEUgPSAibmFtZSI7IC8vJE5PTi1OTFMtMSQKIAotICAvKioKLSAgICogUGx1Z2luIGlkLgotICAgKi8KLSAgcHJpdmF0ZSBzdGF0aWMgZmluYWwgU3RyaW5nIFBMVUdJTl9JRCA9ICJvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbiI7IC8vJE5PTi1OTFMtMSQKKwlwcml2YXRlIHN0YXRpYyBmaW5hbCBTdHJpbmcgUExVR0lOX0lEID0gIm9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uIjsgLy8kTk9OLU5MUy0xJAogCi0gIC8qKgotICAgKiBUaGUgdGFyZ2V0IGlkIGF0dHJpYnV0ZSBuYW1lLgotICAgKi8KLSAgcHJpdmF0ZSBzdGF0aWMgZmluYWwgU3RyaW5nIFRBUkdFVF9BVFRSSUJVVEUgPSAidGFyZ2V0IjsgLy8kTk9OLU5MUy0xJAorCS8qKgorCSAqIFRoZSB0YXJnZXQgaWQgYXR0cmlidXRlIG5hbWUuCisJICovCisJcHJpdmF0ZSBzdGF0aWMgZmluYWwgU3RyaW5nIFRBUkdFVF9BVFRSSUJVVEUgPSAidGFyZ2V0IjsgLy8kTk9OLU5MUy0xJAogCi0gIC8qKgotICAgKiBUaGUgdmFsaWRhdG9yIHJlZ2lzdHJ5IHdoZXJlIHRoZSBkZXNjcmlwdG9ycyBiZWluZyByZWFkIHdpbGwgYmUgcGxhY2VkLgotICAgKi8KLSAgcHJpdmF0ZSBWYWxpZGF0b3JEZWxlZ2F0ZXNSZWdpc3RyeSByZWdpc3RyeTsKKwkvKioKKwkgKiBUaGUgdmFsaWRhdG9yIHJlZ2lzdHJ5IHdoZXJlIHRoZSBkZXNjcmlwdG9ycyBiZWluZyByZWFkIHdpbGwgYmUgcGxhY2VkLgorCSAqLworCXByaXZhdGUgVmFsaWRhdG9yRGVsZWdhdGVzUmVnaXN0cnkgcmVnaXN0cnk7CiAKLSAgLyoqCi0gICAqIENvbnN0cnVjdG9yLgotICAgKiAKLSAgICogQHBhcmFtIHJlZ2lzdHJ5Ci0gICAqICAgICAgICAgIHRoZSByZWdpc3RyeSB3aGVyZSB0aGUgZGVzY3JpcHRvcnMgYmVpbmcgcmVhZCB3aWxsIGJlIHBsYWNlZC4KLSAgICovCi0gIHB1YmxpYyBWYWxpZGF0b3JEZWxlZ2F0ZXNSZWdpc3RyeVJlYWRlcihWYWxpZGF0b3JEZWxlZ2F0ZXNSZWdpc3RyeSByZWdpc3RyeSkKLSAgewotICAgIHRoaXMucmVnaXN0cnkgPSByZWdpc3RyeTsKLSAgfQorCS8qKgorCSAqIENvbnN0cnVjdG9yLgorCSAqIAorCSAqIEBwYXJhbSByZWdpc3RyeQorCSAqICAgICAgICAgICAgVGhlIHJlZ2lzdHJ5IHdoZXJlIHRoZSBkZXNjcmlwdG9ycyBiZWluZyByZWFkIHdpbGwgYmUgcGxhY2VkLgorCSAqLworCXB1YmxpYyBWYWxpZGF0b3JEZWxlZ2F0ZXNSZWdpc3RyeVJlYWRlcihWYWxpZGF0b3JEZWxlZ2F0ZXNSZWdpc3RyeSByZWdpc3RyeSkgeworCQl0aGlzLnJlZ2lzdHJ5ID0gcmVnaXN0cnk7CisJfQogCi0gIC8qKgotICAgKiBSZWFkcyBhIGNvbmZpZ3VyYXRpb24gZWxlbWVudC4KLSAgICogCi0gICAqIEBwYXJhbSBlbGVtZW50Ci0gICAqICAgICAgICAgIHRoZSBwbGF0Zm9ybSBjb25maWd1cmF0aW9uIGVsZW1lbnQgYmVpbmcgcmVhZC4KLSAgICovCi0gIHByaXZhdGUgdm9pZCByZWFkRWxlbWVudChJQ29uZmlndXJhdGlvbkVsZW1lbnQgZWxlbWVudCkKLSAgewotICAgIFN0cmluZyBlbGVtZW50TmFtZSA9IGVsZW1lbnQuZ2V0TmFtZSgpOworCS8qKgorCSAqIFJlYWRzIGEgY29uZmlndXJhdGlvbiBlbGVtZW50LgorCSAqIAorCSAqIEBwYXJhbSBlbGVtZW50CisJICogICAgICAgICAgICBUaGUgcGxhdGZvcm0gY29uZmlndXJhdGlvbiBlbGVtZW50IGJlaW5nIHJlYWQuCisJICovCisJcHJpdmF0ZSB2b2lkIHJlYWRFbGVtZW50KElDb25maWd1cmF0aW9uRWxlbWVudCBlbGVtZW50KSB7CisJCVN0cmluZyBlbGVtZW50TmFtZSA9IGVsZW1lbnQuZ2V0TmFtZSgpOwogCi0gICAgaWYgKGVsZW1lbnROYW1lLmVxdWFscyhERUxFR0FURV9FTEVNRU5UKSkKLSAgICB7Ci0gICAgICBTdHJpbmcgZGVsZWdhdGVJRCA9IGVsZW1lbnQuZ2V0QXR0cmlidXRlKENMQVNTX0FUVFJJQlVURSk7Ci0gICAgICBTdHJpbmcgZGVsZWdhdGVOYW1lID0gZWxlbWVudC5nZXRBdHRyaWJ1dGUoTkFNRV9BVFRSSUJVVEUpOwotICAgICAgU3RyaW5nIHRhcmdldFZhbGlkYXRvcklEID0gZWxlbWVudC5nZXRBdHRyaWJ1dGUoVEFSR0VUX0FUVFJJQlVURSk7CisJCWlmIChlbGVtZW50TmFtZS5lcXVhbHMoREVMRUdBVEVfRUxFTUVOVCkpIHsKKwkJCVN0cmluZyBkZWxlZ2F0ZUlEID0gZWxlbWVudC5nZXRBdHRyaWJ1dGUoQ0xBU1NfQVRUUklCVVRFKTsKKwkJCVN0cmluZyBkZWxlZ2F0ZU5hbWUgPSBlbGVtZW50LmdldEF0dHJpYnV0ZShOQU1FX0FUVFJJQlVURSk7CisJCQlTdHJpbmcgdGFyZ2V0VmFsaWRhdG9ySUQgPSBlbGVtZW50LmdldEF0dHJpYnV0ZShUQVJHRVRfQVRUUklCVVRFKTsKIAotICAgICAgVmFsaWRhdG9yRGVsZWdhdGVEZXNjcmlwdG9yIGRlc2NyaXB0b3IgPSBuZXcgVmFsaWRhdG9yRGVsZWdhdGVEZXNjcmlwdG9yKGRlbGVnYXRlSUQsIGVsZW1lbnQsIGRlbGVnYXRlTmFtZSwgdGFyZ2V0VmFsaWRhdG9ySUQpOworCQkJVmFsaWRhdG9yRGVsZWdhdGVEZXNjcmlwdG9yIGRlc2NyaXB0b3IgPSBuZXcgVmFsaWRhdG9yRGVsZWdhdGVEZXNjcmlwdG9yKAorCQkJCQlkZWxlZ2F0ZUlELCBlbGVtZW50LCBkZWxlZ2F0ZU5hbWUsIHRhcmdldFZhbGlkYXRvcklEKTsKIAotICAgICAgcmVnaXN0cnkuYWRkKGRlc2NyaXB0b3IpOwotICAgIH0KLSAgfQorCQkJcmVnaXN0cnkuYWRkKGRlc2NyaXB0b3IpOworCQl9CisJfQogCi0gIC8qKgotICAgKiBSZWFkIGZyb20gdGhlIGV4dGVuc2lvbnMgcmVnaXN0cnkgYW5kIHBhcnNlIGl0LgotICAgKi8KLSAgdm9pZCByZWFkUmVnaXN0cnkoKQotICB7Ci0gICAgSUV4dGVuc2lvblJlZ2lzdHJ5IHBsdWdpblJlZ2lzdHJ5ID0gUGxhdGZvcm0uZ2V0RXh0ZW5zaW9uUmVnaXN0cnkoKTsKLSAgICBJRXh0ZW5zaW9uUG9pbnQgcG9pbnQgPSBwbHVnaW5SZWdpc3RyeS5nZXRFeHRlbnNpb25Qb2ludChQTFVHSU5fSUQsIEVYVEVOU0lPTl9QT0lOVF9JRCk7CisJLyoqCisJICogUmVhZCBmcm9tIHRoZSBleHRlbnNpb25zIHJlZ2lzdHJ5IGFuZCBwYXJzZSBpdC4KKwkgKi8KKwl2b2lkIHJlYWRSZWdpc3RyeSgpIHsKKwkJSUV4dGVuc2lvblJlZ2lzdHJ5IHBsdWdpblJlZ2lzdHJ5ID0gUGxhdGZvcm0uZ2V0RXh0ZW5zaW9uUmVnaXN0cnkoKTsKKwkJSUV4dGVuc2lvblBvaW50IHBvaW50ID0gcGx1Z2luUmVnaXN0cnkuZ2V0RXh0ZW5zaW9uUG9pbnQoUExVR0lOX0lELAorCQkJCUVYVEVOU0lPTl9QT0lOVF9JRCk7CiAKLSAgICBpZiAocG9pbnQgIT0gbnVsbCkKLSAgICB7Ci0gICAgICBJQ29uZmlndXJhdGlvbkVsZW1lbnRbXSBlbGVtZW50cyA9IHBvaW50LmdldENvbmZpZ3VyYXRpb25FbGVtZW50cygpOwotCi0gICAgICBmb3IgKGludCBpbmRleCA9IDA7IGluZGV4IDwgZWxlbWVudHMubGVuZ3RoOyBpbmRleCsrKQotICAgICAgewotICAgICAgICByZWFkRWxlbWVudChlbGVtZW50c1tpbmRleF0pOwotICAgICAgfQotICAgIH0KLSAgfQorCQlpZiAocG9pbnQgIT0gbnVsbCkgeworCQkJSUNvbmZpZ3VyYXRpb25FbGVtZW50W10gZWxlbWVudHMgPSBwb2ludC5nZXRDb25maWd1cmF0aW9uRWxlbWVudHMoKTsKKwkJCWZvciAoSUNvbmZpZ3VyYXRpb25FbGVtZW50IGNvbmZpZ3VyYXRpb25FbGVtZW50IDogZWxlbWVudHMpIHsKKwkJCQl0cnkgeworCQkJCQlyZWFkRWxlbWVudChjb25maWd1cmF0aW9uRWxlbWVudCk7CisJCQkJfSBjYXRjaCAoRXhjZXB0aW9uIGUpIHsKKwkJCQkJLy8gd2UgZG9uJ3Qgd2FudCBhbGwgdGhlIHZhbGlkYXRvcnMgdG8gYmUgcmVuZGVyZWQgaGVscGxlc3MKKwkJCQkJLy8gYnkgc29tZQorCQkJCQkvLyByb2d1ZSBjb250cmlidXRpb24sIHNvLCB3ZSBjYXRjaCBhbnkgZXhjZXB0aW9uIHRoYXQKKwkJCQkJLy8gb2NjdXJzIGR1cmluZworCQkJCQkvLyBpbml0aWFsaXphdGlvbiwgbG9nIGl0LCBhbmQgY29udGludWUgb24uCisJCQkJCUlDb250cmlidXRvciBjb250cmlidXRvciA9IGNvbmZpZ3VyYXRpb25FbGVtZW50LmdldENvbnRyaWJ1dG9yKCk7CisJCQkJCVN0cmluZyBtc2cgPSBOTFMuYmluZChWYWxNZXNzYWdlcy5Sb2d1ZVZhbGlkYXRvciwgY29udHJpYnV0b3IpOworCQkJCQlWYWxpZGF0aW9uUGx1Z2luLmdldFBsdWdpbigpLmxvZ01lc3NhZ2UoSVN0YXR1cy5FUlJPUiwgbXNnKTsKKwkJCQl9CisJCQl9CisJCX0KKwl9CiB9CmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uL3ZhbGlkYXRlL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL2ludGVybmFsL29wZXJhdGlvbnMvRW5hYmxlZEluY3JlbWVudGFsVmFsaWRhdG9yc09wZXJhdGlvbi5qYXZhIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi92YWxpZGF0ZS9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9pbnRlcm5hbC9vcGVyYXRpb25zL0VuYWJsZWRJbmNyZW1lbnRhbFZhbGlkYXRvcnNPcGVyYXRpb24uamF2YQppbmRleCBkZjVhODMyLi5mMzZlNDhiIDEwMDY0NAotLS0gYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uL3ZhbGlkYXRlL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL2ludGVybmFsL29wZXJhdGlvbnMvRW5hYmxlZEluY3JlbWVudGFsVmFsaWRhdG9yc09wZXJhdGlvbi5qYXZhCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24vdmFsaWRhdGUvb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vaW50ZXJuYWwvb3BlcmF0aW9ucy9FbmFibGVkSW5jcmVtZW50YWxWYWxpZGF0b3JzT3BlcmF0aW9uLmphdmEKQEAgLTIyLDYgKzIyLDcgQEAKIGltcG9ydCBvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5pbnRlcm5hbC5JbnRlcm5hbFZhbGlkYXRvck1hbmFnZXI7CiBpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uaW50ZXJuYWwuUHJvamVjdENvbmZpZ3VyYXRpb247CiBpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uaW50ZXJuYWwuUmVnaXN0cnlDb25zdGFudHM7CitpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uaW50ZXJuYWwuVmFsaWRhdG9yTWV0YURhdGE7CiBpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uaW50ZXJuYWwucGx1Z2luLlZhbGlkYXRpb25QbHVnaW47CiAKIC8qKgpAQCAtNTcsNyArNTgsNyBAQAogCSAqICAgICAgICAgICAgIEVuYWJsZWRJbmNyZW1lbnRhbFZhbGlkYXRvcnNPcGVyYXRpb24oSVByb2plY3QsIElSZXNvdXJjZURlbHRhLCBpbnQsIGJvb2xlYW4pCiAJICogICAgICAgICAgICAgaW5zdGVhZC4KIAkgKi8KLQlwdWJsaWMgRW5hYmxlZEluY3JlbWVudGFsVmFsaWRhdG9yc09wZXJhdGlvbihJUHJvamVjdCBwcm9qZWN0LCBTZXQgdmFsaWRhdG9ycywgSVJlc291cmNlRGVsdGEgZGVsdGEsIGludCBydWxlR3JvdXApIHsKKwlwdWJsaWMgRW5hYmxlZEluY3JlbWVudGFsVmFsaWRhdG9yc09wZXJhdGlvbihJUHJvamVjdCBwcm9qZWN0LCBTZXQ8VmFsaWRhdG9yTWV0YURhdGE+IHZhbGlkYXRvcnMsIElSZXNvdXJjZURlbHRhIGRlbHRhLCBpbnQgcnVsZUdyb3VwKSB7CiAJCXRoaXMocHJvamVjdCwgZGVsdGEsIHJ1bGVHcm91cCwgREVGQVVMVF9BU1lOQyk7CiAJCXNldEVuYWJsZWRWYWxpZGF0b3JzKHZhbGlkYXRvcnMpOwogCX0KZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24vdmFsaWRhdGUvb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vaW50ZXJuYWwvb3BlcmF0aW9ucy9NYW51YWxWYWxpZGF0b3JzT3BlcmF0aW9uLmphdmEgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uL3ZhbGlkYXRlL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL2ludGVybmFsL29wZXJhdGlvbnMvTWFudWFsVmFsaWRhdG9yc09wZXJhdGlvbi5qYXZhCmluZGV4IDRmMjJjZWQuLjAzYTBiZjIgMTAwNjQ0Ci0tLSBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24vdmFsaWRhdGUvb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vaW50ZXJuYWwvb3BlcmF0aW9ucy9NYW51YWxWYWxpZGF0b3JzT3BlcmF0aW9uLmphdmEKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi92YWxpZGF0ZS9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9pbnRlcm5hbC9vcGVyYXRpb25zL01hbnVhbFZhbGlkYXRvcnNPcGVyYXRpb24uamF2YQpAQCAtMjAsMTEgKzIwLDEzIEBACiAgKiBWYWxpZGF0aW9uT3BlcmF0aW9uLCBiZWNhdXNlIHNvbWUgaW5pdGlhbGl6YXRpb24gb2YgdGhlIHZhbGlkYXRvciwgYW5kIGhhbmRsaW5nIG9mIGVycm9yCiAgKiBjb25kaXRpb25zLCBpcyBkb25lIGluIHRoZSBvcGVyYXRpb24uIFRoZSBpbml0aWFsaXphdGlvbiBpcyBzZXBhcmF0ZWQgYmVjYXVzZSBzb21lIG9mIHRoZQogICogaW5mb3JtYXRpb24gbmVlZGVkIHRvIGluaXRpYWxpemUgdGhlIHZhbGlkYXRvciAoaS5lLiwgdGhlIHByb2plY3QpIGlzbid0IGtub3duIHVudGlsIHJ1bnRpbWUuCi0gKiAKKyAqIDxwPgogICogSW5zdGFuY2VzIG9mIHRoaXMgb3BlcmF0aW9uIHJ1biBldmVyeSBlbmFibGVkIHZhbGlkYXRvciAoYm90aCBmdWxsIGFuZCBpbmNyZW1lbnRhbCkgb24gdGhlCiAgKiBwcm9qZWN0LgotICogCisgKiA8L3A+CisgKiA8cD4KICAqIFRoaXMgb3BlcmF0aW9uIGlzIG5vdCBpbnRlbmRlZCB0byBiZSBzdWJjbGFzc2VkIG91dHNpZGUgb2YgdGhlIHZhbGlkYXRpb24gZnJhbWV3b3JrLgorICogPC9wPgogICovCiBwdWJsaWMgY2xhc3MgTWFudWFsVmFsaWRhdG9yc09wZXJhdGlvbiBleHRlbmRzIFZhbGlkYXRvclN1YnNldE9wZXJhdGlvbiB7CiAKZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24vdmFsaWRhdGUvb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vaW50ZXJuYWwvb3BlcmF0aW9ucy9WYWxpZGF0aW9uQnVpbGRlci5qYXZhIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi92YWxpZGF0ZS9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9pbnRlcm5hbC9vcGVyYXRpb25zL1ZhbGlkYXRpb25CdWlsZGVyLmphdmEKaW5kZXggNTFkYTU1Ni4uNWJiMWMyOCAxMDA2NDQKLS0tIGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi92YWxpZGF0ZS9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9pbnRlcm5hbC9vcGVyYXRpb25zL1ZhbGlkYXRpb25CdWlsZGVyLmphdmEKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi92YWxpZGF0ZS9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9pbnRlcm5hbC9vcGVyYXRpb25zL1ZhbGlkYXRpb25CdWlsZGVyLmphdmEKQEAgLTEsNSArMSw1IEBACiAvKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKgotICogQ29weXJpZ2h0IChjKSAyMDAxLCAyMDA4IElCTSBDb3Jwb3JhdGlvbiBhbmQgb3RoZXJzLgorICogQ29weXJpZ2h0IChjKSAyMDAxLCAyMDA5IElCTSBDb3Jwb3JhdGlvbiBhbmQgb3RoZXJzLgogICogQWxsIHJpZ2h0cyByZXNlcnZlZC4gVGhpcyBwcm9ncmFtIGFuZCB0aGUgYWNjb21wYW55aW5nIG1hdGVyaWFscwogICogYXJlIG1hZGUgYXZhaWxhYmxlIHVuZGVyIHRoZSB0ZXJtcyBvZiB0aGUgRWNsaXBzZSBQdWJsaWMgTGljZW5zZSB2MS4wCiAgKiB3aGljaCBhY2NvbXBhbmllcyB0aGlzIGRpc3RyaWJ1dGlvbiwgYW5kIGlzIGF2YWlsYWJsZSBhdApAQCAtMTIsNiArMTIsNyBAQAogCiBpbXBvcnQgamF2YS5sYW5nLnJlZmxlY3QuSW52b2NhdGlvblRhcmdldEV4Y2VwdGlvbjsKIGltcG9ydCBqYXZhLnV0aWwuQXJyYXlMaXN0OworaW1wb3J0IGphdmEudXRpbC5BcnJheXM7CiBpbXBvcnQgamF2YS51dGlsLkhhc2hTZXQ7CiBpbXBvcnQgamF2YS51dGlsLkxpc3Q7CiBpbXBvcnQgamF2YS51dGlsLk1hcDsKQEAgLTIyLDE1ICsyMywxNiBAQAogaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucmVzb3VyY2VzLkluY3JlbWVudGFsUHJvamVjdEJ1aWxkZXI7CiBpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5ydW50aW1lLkNvcmVFeGNlcHRpb247CiBpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5ydW50aW1lLklQcm9ncmVzc01vbml0b3I7CitpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5ydW50aW1lLklTdGF0dXM7CiBpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uVmFsaWRhdGlvbkZyYW1ld29yazsKIGltcG9ydCBvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5pbnRlcm5hbC5Db25maWd1cmF0aW9uTWFuYWdlcjsKIGltcG9ydCBvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5pbnRlcm5hbC5JbnRlcm5hbFZhbGlkYXRvck1hbmFnZXI7CiBpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uaW50ZXJuYWwuUHJvamVjdENvbmZpZ3VyYXRpb247CiBpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uaW50ZXJuYWwuUmVzb3VyY2VDb25zdGFudHM7CiBpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uaW50ZXJuYWwuUmVzb3VyY2VIYW5kbGVyOworaW1wb3J0IG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLmludGVybmFsLlRyYWNpbmc7CiBpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uaW50ZXJuYWwuVmFsQnVpbGRlckpvYjsKIGltcG9ydCBvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5pbnRlcm5hbC5WYWxNYW5hZ2VyOwotaW1wb3J0IG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLmludGVybmFsLlZhbE9wZXJhdGlvbk1hbmFnZXI7CiBpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uaW50ZXJuYWwuVmFsaWRhdG9yTWV0YURhdGE7CiBpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uaW50ZXJuYWwucGx1Z2luLlZhbGlkYXRpb25QbHVnaW47CiAKQEAgLTQ5LDEzICs1MSwyMiBAQAogICogPC9wPgogICovCiBwdWJsaWMgY2xhc3MgVmFsaWRhdGlvbkJ1aWxkZXIgZXh0ZW5kcyBJbmNyZW1lbnRhbFByb2plY3RCdWlsZGVyIHsKKwkvKgorCSAqIEdSSyAtIFRoaXMgY2xhc3Mgc2VydmVzIGFzIGEgbWFpbiBlbnRyeSBwb2ludCBpbnRvIHRoZSBmcmFtZXdvcmsuIFRoZXJlIGlzIG9uZSBpbnN0YW5jZSBvZiB0aGlzIGNsYXNzIGZvciBldmVyeQorCSAqIHByb2plY3QgdGhhdCBoYXMgYSB2YWxpZGF0aW9uIGJ1aWxkZXIgY29uZmlndXJlZCBmb3IgaXQuIFR5cGljYWxseSBpZiB5b3UgaGFkIHRlbiBwcm9qZWN0cyBpbiB5b3VyIHdvcmtzcGFjZSB5b3Ugd291bGQgaGF2ZQorCSAqIHRlbiBvZiB0aGVzZSBvYmplY3RzLiBUaGV5IGFyZSBjcmVhdGVkIGVhcmx5IGluIHRoZSBsaWZlIGN5Y2xlIG9mIHRoZSB3b3JrYmVuY2gsIGFuZCB0aGVuIGFyZSByZXVzZWQuIAorCSAqIAorCSAqIE15IG9ic2VydmF0aW9uIHdhcyB0aGF0IHRoZXkgYXJlIHJ1biBzZXJpYWxseSBieSB0aGUgc2FtZSB0aHJlYWQuCisJICovCiAJcHVibGljIHN0YXRpYyBmaW5hbCBpbnQgTk9fREVMVEFfQ0hBTkdFID0gLTE7CiAJcHJvdGVjdGVkIExpc3Q8SVByb2plY3Q+IHJlZmVyZW5jZWRQcm9qZWN0czsKIAlwcm90ZWN0ZWQgSVdvcmtiZW5jaENvbnRleHQgd29ya2JlbmNoQ29udGV4dCA9IG51bGw7CiAJCi0JLyoqIEFsbCB0aGUgam9icyB0aGF0IHRoZSB2YWxpZGF0aW9uIGZyYW1ld29yayBzcGF3bnMgd2lsbCBiZWxvbmcgdG8gdGhpcyBmYW1pbHkuICovCisJLyoqIAorCSAqIEFsbCB0aGUgam9icyB0aGF0IHRoZSB2YWxpZGF0aW9uIGZyYW1ld29yayBzcGF3bnMgd2lsbCBiZWxvbmcgdG8gdGhpcyBmYW1pbHkuIAorCSAqLwogCXB1YmxpYyBzdGF0aWMgZmluYWwgT2JqZWN0IEZBTUlMWV9WQUxJREFUSU9OX0pPQiA9IG5ldyBPYmplY3QoKTsKLQorCQogCXB1YmxpYyBWYWxpZGF0aW9uQnVpbGRlcigpIHsKIAl9CiAKQEAgLTEwMCw4ICsxMTEsMTAgQEAKIAl9CiAKIAlwcm90ZWN0ZWQgdm9pZCBjbGVhbihJUHJvZ3Jlc3NNb25pdG9yIG1vbml0b3IpIHRocm93cyBDb3JlRXhjZXB0aW9uIHsKLQkJbmV3Q2xlYW4obW9uaXRvcik7CiAJCUlQcm9qZWN0IGN1cnJlbnRQcm9qZWN0ID0gZ2V0UHJvamVjdCgpOworCQlUcmFjaW5nLmxvZygiVmFsaWRhdGlvbkJ1aWxkZXItMDIgY2xlYW4gIiwgY3VycmVudFByb2plY3QpOyAvLyROT04tTkxTLTEkCisKKwkJbmV3Q2xlYW4obW9uaXRvcik7CiAJCWlmIChjdXJyZW50UHJvamVjdCA9PSBudWxsIHx8ICFjdXJyZW50UHJvamVjdC5pc0FjY2Vzc2libGUoKSlyZXR1cm47CiAJCXRyeSB7CiAJCQlQcm9qZWN0Q29uZmlndXJhdGlvbiBwcmpwID0gQ29uZmlndXJhdGlvbk1hbmFnZXIuZ2V0TWFuYWdlcigpLmdldFByb2plY3RDb25maWd1cmF0aW9uKGN1cnJlbnRQcm9qZWN0KTsKQEAgLTEyNSw5ICsxMzgsMTUgQEAKIAkJcmV0dXJuIHJlZmVyZW5jZWRQcm9qZWN0cy50b0FycmF5KHJlZlByb2pBcnJheSk7CiAJfQogCQorCUBTdXBwcmVzc1dhcm5pbmdzKCJ1bmNoZWNrZWQiKQogCXB1YmxpYyBJUHJvamVjdFtdIGJ1aWxkKGludCBraW5kLCBNYXAgcGFyYW1ldGVycywgSVByb2dyZXNzTW9uaXRvciBtb25pdG9yKSB7CiAJCUlSZXNvdXJjZURlbHRhIGRlbHRhID0gbnVsbDsKIAkJSVByb2plY3QgcHJvamVjdCA9IGdldFByb2plY3QoKTsKKwkJVHJhY2luZy5sb2coIlZhbGlkYXRpb25CdWlsZGVyLTAxIGJ1aWxkICIsIGtpbmQsIHByb2plY3QpOyAgLy8kTk9OLU5MUy0xJAorCQlpZiAoVHJhY2luZy5pc0xvZ2dpbmcoMSkpeworCQkJVHJhY2luZy5sb2dSZXNvdXJjZURlbHRhcyhnZXREZWx0YShwcm9qZWN0KSwgNTApOworCQl9CisJCQogCQkvLyBHUksgSSB3b25kZXIgd2h5IHRoaXMgYnVpbGRlciBuZWVkcyB0byBrbm93IGFib3V0IGFsbCB0aGUgb3RoZXIgcmVmZXJlbmNlZCBwcm9qZWN0cz8KIAkJLy8gd29uJ3QgdGhleSBoYXZlIGJ1aWxkZXJzIG9mIHRoZWlyIG93bi4KIAkJSVByb2plY3RbXSByZWZlcmVuY2VkID0gZ2V0QWxsUmVmZXJlbmNlZFByb2plY3RzKHByb2plY3QsIG51bGwpOwpAQCAtMTU5LDExICsxNzgsMTQgQEAKIAkJCQlyZXR1cm4gcmVmZXJlbmNlZDsKIAkJCX0KIAkJCWlmIChkb0Z1bGxCdWlsZCkgeworCQkJCWNsZWFudXBSZWZlcmVuY2VkUHJvamVjdHNNYXJrZXJzKHByanAsIHJlZmVyZW5jZWQpOwogCQkJCXBlcmZvcm1GdWxsQnVpbGQobW9uaXRvciwgcHJqcCk7CiAJCQl9IGVsc2UgewogCQkJCWlmIChkZWx0YS5nZXRBZmZlY3RlZENoaWxkcmVuKCkubGVuZ3RoID09IDApIHsKLQkJCQkJaWYgKGlzUmVmZXJlbmNlZFByb2plY3RJbkRlbHRhKHJlZmVyZW5jZWQpKQorCQkJCQlpZiAoaXNSZWZlcmVuY2VkUHJvamVjdEluRGVsdGEocmVmZXJlbmNlZCkpeworCQkJCQkJY2xlYW51cFJlZmVyZW5jZWRQcm9qZWN0c01hcmtlcnMocHJqcCwgcmVmZXJlbmNlZCk7CiAJCQkJCQlwZXJmb3JtRnVsbEJ1aWxkRm9yUmVmZXJlbmNlZFByb2plY3RDaGFuZ2VkKG1vbml0b3IsIHByanApOworCQkJCQl9CiAJCQkJCXJldHVybiByZWZlcmVuY2VkOwogCQkJCX0KIAkJCQlFbmFibGVkSW5jcmVtZW50YWxWYWxpZGF0b3JzT3BlcmF0aW9uIG9wZXJhdGlvbiA9IG5ldyBFbmFibGVkSW5jcmVtZW50YWxWYWxpZGF0b3JzT3BlcmF0aW9uKHByb2plY3QsIGRlbHRhLCB0cnVlKTsKQEAgLTE4MSw2ICsyMDMsMzkgQEAKIAkJCXJlZmVyZW5jZWRQcm9qZWN0cyA9IG51bGw7CiAJCX0KIAl9CisJCisJcHJpdmF0ZSB2b2lkIGNsZWFudXBSZWZlcmVuY2VkUHJvamVjdHNNYXJrZXJzKGZpbmFsIFByb2plY3RDb25maWd1cmF0aW9uIHByanAsIElQcm9qZWN0W10gcmVmZXJlbmNlZCl7CisJCS8vV2hlbiBhIHByb2plY3QgcmVmZXJlbmNlcyBvbmUgb3IgbW9yZSBwcm9qZWN0LCBwZXJmb3JtaW5nIGEgY2xlYW4gYnVpbGQgb24gcmVmZXJlbmNlZAorCQkvL2NhdXNlcyBkZWx0YSB0byBiZSBpbnZva2VkIG9uIHJlZmVyZW5jZWUsIGFrYSwgcGFyZW50LiBUaGlzIGNhdXNlcyBmb2xsb3dpbmcgY29kZSB0bworCQkvL2JlIGludm9rZWQuCisJCS8vVGhlIGZvbGxvd2luZyBjb2RlIGlzIHRyeWluZyB0byBmaXggYSBjYXNlIHdoZXJlIEVqYiBwcm9qZWN0IHJlZmVyZW5jZXMgYSB1dGlsaXR5IHByb2plY3QsCisJCS8vYW5kIHRoZSBjbGVhbiBidWlsZCBvbiB1dGlsaXR5IHByb2plY3QgY2F1c2VzIHRoZSBjb2RlIHRvIGNvbWUgaGVyZSwgdGhlIGVqYiB2YWxpZGF0b3IgcnVucworCQkvL29uIHRoZSBlamIgIHByb2plY3QgZHVlIHRvIHBlcmZvcm1GdWxsQnVpbGRGb3JSZWZlcmVuY2VkUHJvamVjdENoYW5nZWQoKSBiZWxvdywgYnV0IGl0IGFsc28KKwkJLy9jYXVzZXMgbWFya2VyIHRvIGJlIGdlbmVyYXRlZCBmb3IgdGhlIHV0aWwgcHJvamVjdCwgYnV0IHRoZSBtYXJrZXJzIGZvciB1dGlsIHByb2plY3QgYXJlIG5vdAorCQkvL2NsZWFuZWQgdXAuICAgCisJCQorCQlpZiggcmVmZXJlbmNlZCA9PSBudWxsIHx8IHJlZmVyZW5jZWQubGVuZ3RoID09IDAgKXJldHVybjsKKwkJCisJCXRyeXsKKwkJCVZhbGlkYXRvck1ldGFEYXRhW10gZW5hYmxlZFZhbGlkYXRvcnMgPSBwcmpwLmdldEVuYWJsZWRGdWxsQnVpbGRWYWxpZGF0b3JzKHRydWUsIGZhbHNlKTsKKyAKKwkJCVNldDxWYWxpZGF0b3JNZXRhRGF0YT4gIHNldCA9IG5ldyBIYXNoU2V0PFZhbGlkYXRvck1ldGFEYXRhPigpOworCQkJc2V0LmFkZEFsbCggQXJyYXlzLmFzTGlzdCggZW5hYmxlZFZhbGlkYXRvcnMgKSApOworCQkJZm9yIChJUHJvamVjdCBwIDogcmVmZXJlbmNlZCkgeworCQkJCWlmICghcC5pc0FjY2Vzc2libGUoKSljb250aW51ZTsKKwkJCQlQcm9qZWN0Q29uZmlndXJhdGlvbiByZWZQcm9qZWN0Q2ZnID0gQ29uZmlndXJhdGlvbk1hbmFnZXIuZ2V0TWFuYWdlcigpLmdldFByb2plY3RDb25maWd1cmF0aW9uKHApOworCQkKKwkJCQlWYWxpZGF0b3JNZXRhRGF0YVtdIHJlZkVuYWJsZWRWYWxpZGF0b3JzID0gcmVmUHJvamVjdENmZy5nZXRFbmFibGVkRnVsbEJ1aWxkVmFsaWRhdG9ycyh0cnVlLCBmYWxzZSk7CisJCQkJCisJCQkJLy9yZW1vdmUgZnJvbSB0aGUgc2V0IHRoZSB2YWxpZGF0b3JzIHdoaWNoIGFyZSBhbHNvIGluIGNoaWxkCisJCQkJZm9yKFZhbGlkYXRvck1ldGFEYXRhIHZtZCA6IHJlZkVuYWJsZWRWYWxpZGF0b3JzKXNldC5yZW1vdmUodm1kKTsKKwkJCQkKKwkJCQlmb3IoVmFsaWRhdG9yTWV0YURhdGEgdm1kIDogc2V0KVdvcmtiZW5jaFJlcG9ydGVyLnJlbW92ZUFsbE1lc3NhZ2VzKHAsIHZtZC5nZXRWYWxpZGF0b3IoKSk7CQkKKwkJCX0JCisJCX1jYXRjaCAoRXhjZXB0aW9uIGV4YykgeworCQkJVmFsaWRhdGlvblBsdWdpbi5nZXRQbHVnaW4oKS5sb2dNZXNzYWdlKElTdGF0dXMuRVJST1IsIGV4Yy50b1N0cmluZygpKTsKKwl9Cit9CiAKIAlwcml2YXRlIGJvb2xlYW4gaXNSZWZlcmVuY2VkUHJvamVjdEluRGVsdGEoSVByb2plY3RbXSByZWZlcmVuY2VkKSB7CiAJCUlQcm9qZWN0IHAgPSBudWxsOwpAQCAtMjA0LDcgKzI1OSw3IEBACiAJcHJpdmF0ZSB2b2lkIHBlcmZvcm1GdWxsQnVpbGQoSVByb2dyZXNzTW9uaXRvciBtb25pdG9yLCBQcm9qZWN0Q29uZmlndXJhdGlvbiBwcmpwLCBib29sZWFuIG9ubHlEZXBlbmRlbnRWYWxpZGF0b3JzKSB0aHJvd3MgSW52b2NhdGlvblRhcmdldEV4Y2VwdGlvbiB7CiAJCVZhbGlkYXRvck1ldGFEYXRhW10gZW5hYmxlZFZhbGlkYXRvcnMgPSBwcmpwLmdldEVuYWJsZWRGdWxsQnVpbGRWYWxpZGF0b3JzKHRydWUsIG9ubHlEZXBlbmRlbnRWYWxpZGF0b3JzKTsKIAkJaWYgKChlbmFibGVkVmFsaWRhdG9ycyAhPSBudWxsKSAmJiAoZW5hYmxlZFZhbGlkYXRvcnMubGVuZ3RoID4gMCkpIHsKLQkJCVNldCBlbmFibGVkVmFsaWRhdG9yc1NldCA9IEludGVybmFsVmFsaWRhdG9yTWFuYWdlci53cmFwSW5TZXQoZW5hYmxlZFZhbGlkYXRvcnMpOworCQkJU2V0PFZhbGlkYXRvck1ldGFEYXRhPiBlbmFibGVkVmFsaWRhdG9yc1NldCA9IEludGVybmFsVmFsaWRhdG9yTWFuYWdlci53cmFwSW5TZXQoZW5hYmxlZFZhbGlkYXRvcnMpOwogCQkJRW5hYmxlZFZhbGlkYXRvcnNPcGVyYXRpb24gb3AgPSBuZXcgRW5hYmxlZFZhbGlkYXRvcnNPcGVyYXRpb24oZ2V0UHJvamVjdCgpLCBlbmFibGVkVmFsaWRhdG9yc1NldCwgdHJ1ZSk7CiAJCQlvcC5ydW4obW9uaXRvcik7CiAJCX0KQEAgLTIzMyw3ICsyODgsNyBAQAogCQkJCWJyZWFrOwogCQl9CiAJCQotCQlWYWxCdWlsZGVySm9iLnZhbGlkYXRlUHJvamVjdChwcm9qZWN0LCBkZWx0YSwga2luZCwgVmFsT3BlcmF0aW9uTWFuYWdlci5nZXREZWZhdWx0KCkuZ2V0T3BlcmF0aW9uKCkpOwkJCisJCVZhbEJ1aWxkZXJKb2IudmFsaWRhdGVQcm9qZWN0KHByb2plY3QsIGRlbHRhLCBraW5kKTsJCQogCX0KIAkKIAkKZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24vdmFsaWRhdGUvb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vaW50ZXJuYWwvb3BlcmF0aW9ucy9WYWxpZGF0aW9uT3BlcmF0aW9uLmphdmEgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uL3ZhbGlkYXRlL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL2ludGVybmFsL29wZXJhdGlvbnMvVmFsaWRhdGlvbk9wZXJhdGlvbi5qYXZhCmluZGV4IDg2ODIyMjIuLmM5ZjdiNTMgMTAwNjQ0Ci0tLSBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24vdmFsaWRhdGUvb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vaW50ZXJuYWwvb3BlcmF0aW9ucy9WYWxpZGF0aW9uT3BlcmF0aW9uLmphdmEKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi92YWxpZGF0ZS9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9pbnRlcm5hbC9vcGVyYXRpb25zL1ZhbGlkYXRpb25PcGVyYXRpb24uamF2YQpAQCAtMSw1ICsxLDUgQEAKIC8qKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqCi0gKiBDb3B5cmlnaHQgKGMpIDIwMDEsIDIwMDggSUJNIENvcnBvcmF0aW9uIGFuZCBvdGhlcnMuCisgKiBDb3B5cmlnaHQgKGMpIDIwMDEsIDIwMDkgSUJNIENvcnBvcmF0aW9uIGFuZCBvdGhlcnMuCiAgKiBBbGwgcmlnaHRzIHJlc2VydmVkLiBUaGlzIHByb2dyYW0gYW5kIHRoZSBhY2NvbXBhbnlpbmcgbWF0ZXJpYWxzCiAgKiBhcmUgbWFkZSBhdmFpbGFibGUgdW5kZXIgdGhlIHRlcm1zIG9mIHRoZSBFY2xpcHNlIFB1YmxpYyBMaWNlbnNlIHYxLjAKICAqIHdoaWNoIGFjY29tcGFuaWVzIHRoaXMgZGlzdHJpYnV0aW9uLCBhbmQgaXMgYXZhaWxhYmxlIGF0CkBAIC0xNyw2ICsxNyw3IEBACiBpbXBvcnQgamF2YS51dGlsLkxpbmtlZExpc3Q7CiBpbXBvcnQgamF2YS51dGlsLkxpc3Q7CiBpbXBvcnQgamF2YS51dGlsLk1hcDsKK2ltcG9ydCBqYXZhLnV0aWwuUXVldWU7CiBpbXBvcnQgamF2YS51dGlsLlNldDsKIAogaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucmVzb3VyY2VzLklGaWxlOwpAQCAtNjIsMTEgKzYzLDEyIEBACiBpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uaW50ZXJuYWwucHJvdmlzaW9uYWwuY29yZS5JVmFsaWRhdG9ySm9iOwogCiAvKioKLSAqIEltcGxlbWVudGVkIFZhbGlkYXRvcnMgbWV0aG9kcyBtdXN0IG5vdCBiZSBjYWxsZWQgZGlyZWN0bHkgYnkgYW55b25lIG90aGVyIHRoYW4gdGhpcyBjbGFzcywgc2luY2UKKyAqIFZhbGlkYXRvcnMgbXVzdCBub3QgYmUgY2FsbGVkIGRpcmVjdGx5IGJ5IGFueW9uZSBvdGhlciB0aGFuIHRoaXMgY2xhc3MsIHNpbmNlCiAgKiBzb21lIGluaXRpYWxpemF0aW9uIG9mIHRoZSB2YWxpZGF0b3IgaXMgZG9uZSBoZXJlICh2aWEgdGhlIGdldFByb2plY3QoKSBtZXRob2QpLiBUaGUKICAqIGluaXRpYWxpemF0aW9uIGlzIHNlcGFyYXRlZCBiZWNhdXNlIHRoZSBJUHJvamVjdCBpc24ndCBrbm93biB1bnRpbCBydW50aW1lLgogICogPHA+CiAgKiBUaGlzIG9wZXJhdGlvbiBpcyBub3QgaW50ZW5kZWQgdG8gYmUgc3ViY2xhc3NlZCBvdXRzaWRlIG9mIHRoZSB2YWxpZGF0aW9uIGZyYW1ld29yay4KKyAqIDwvcD4KICAqLwogcHVibGljIGFic3RyYWN0IGNsYXNzIFZhbGlkYXRpb25PcGVyYXRpb24gaW1wbGVtZW50cyBJV29ya3NwYWNlUnVubmFibGUsIElIZWFkbGVzc1J1bm5hYmxlV2l0aFByb2dyZXNzIHsKIAkvLyBTaW5jZSBJUmVzb3VyY2VDb25zdGFudHMgZG9uJ3QgaGF2ZSBhICJubyBkZWx0YSIgZmxhZywgbGV0IHRoaXMgY29uc3RhbnQgYmUgdGhlIGZsYWcuCkBAIC03OSwyMSArODEsNDkgQEAKIAkKIAlwcm90ZWN0ZWQgc3RhdGljIGZpbmFsIGJvb2xlYW4gREVGQVVMVF9GT1JDRSA9IHRydWU7CiAJCi0JY2xhc3MgVmFsaWRhdGlvbkxhdW5jaGVySm9iIGV4dGVuZHMgSm9iIHsKLQkgICAgcHJpdmF0ZSBKb2IgdmFsaWRhdGlvbkpvYjsKLQkgICAgcHVibGljIFZhbGlkYXRpb25MYXVuY2hlckpvYihKb2IgdmFsaWRhdGlvbkpvYikgeworCXByaXZhdGUgc3RhdGljIFZhbGlkYXRpb25MYXVuY2hlckpvYiBsYXVuY2hlckpvYiA9IG5ldyBWYWxpZGF0aW9uTGF1bmNoZXJKb2IoKTsKKwkKKwlwcml2YXRlIHN0YXRpYyBmaW5hbCBpbnQgam9ic1BlclByb2Nlc3NvciA9IDM7CisJCisJcHJpdmF0ZSBmaW5hbCBzdGF0aWMgY2xhc3MgVmFsaWRhdGlvbkxhdW5jaGVySm9iIGV4dGVuZHMgSm9iIHsKKwkgICAgcHJpdmF0ZSBRdWV1ZTxKb2I+IF92YWxpZGF0aW9uSm9icyA9IG5ldyBMaW5rZWRMaXN0PEpvYj4oKTsKKwkgICAgCisJICAgIHB1YmxpYyBWYWxpZGF0aW9uTGF1bmNoZXJKb2IoKSB7CiAgICAgICAgICAgICBzdXBlcihSZXNvdXJjZUhhbmRsZXIuZ2V0RXh0ZXJuYWxpemVkTWVzc2FnZShSZXNvdXJjZUNvbnN0YW50cy5WQkZfVkFMSURBVElPTl9KT0JfTVNHKSk7Ci0gICAgICAgICAgICAKICAgICAgICAgICAgIHNldFN5c3RlbSh0cnVlKTsKICAgICAgICAgICAgIHNldFJ1bGUoUmVzb3VyY2VzUGx1Z2luLmdldFdvcmtzcGFjZSgpLmdldFJvb3QoKSk7Ci0gICAgICAgICAgICB0aGlzLnZhbGlkYXRpb25Kb2I9IHZhbGlkYXRpb25Kb2I7CiAJICAgIH0KIAkgICAgCiAJICAgIHByb3RlY3RlZCBJU3RhdHVzIHJ1bihJUHJvZ3Jlc3NNb25pdG9yIG1vbml0b3IpIHsKLSAgICAJCXZhbGlkYXRpb25Kb2Iuc2NoZWR1bGUoKTsKKwkJCWludCBwcm9jZXNzb3JzID0gUnVudGltZS5nZXRSdW50aW1lKCkuYXZhaWxhYmxlUHJvY2Vzc29ycygpOworCQkJaW50IHRvdGFsSW5pdGlhbEpvYnMgPSBwcm9jZXNzb3JzICogam9ic1BlclByb2Nlc3NvcjsKKyAgICAJCXN5bmNocm9uaXplZCAoX3ZhbGlkYXRpb25Kb2JzKSB7CisgICAgCQkJLy8gbmV2ZXIgc2NoZWR1bGUgbW9yZSB0aGFuIDMgdmFsaWRhdGlvbiBqb2JzIHBlciBwcm9jZXNzb3IgYXQgYSB0aW1lCisgICAgCQkJZm9yIChpbnQgaT0wOyBpPCB0b3RhbEluaXRpYWxKb2JzOyBpKyspIHsKKyAgICAJCQkJSm9iIHZhbGlkYXRpb25Kb2IgPSBfdmFsaWRhdGlvbkpvYnMucG9sbCgpOworICAgIAkJCQlpZiAodmFsaWRhdGlvbkpvYiA9PSBudWxsKSBicmVhazsKKyAgICAJCQkJYWRkSm9iQ2hhbmdlQWRhcHRlcih2YWxpZGF0aW9uSm9iKTsKKyAgICAJCQkJdmFsaWRhdGlvbkpvYi5zY2hlZHVsZSgpOworICAgIAkJCX0KKyAgICAJCX0KICAgICAgICAgICAgIHJldHVybiBTdGF0dXMuT0tfU1RBVFVTOwogCSAgICB9CiAJICAgIAorCSAgICBwcml2YXRlIHZvaWQgYWRkSm9iQ2hhbmdlQWRhcHRlcihKb2Igam9iKSB7CisJICAgIAlqb2IuYWRkSm9iQ2hhbmdlTGlzdGVuZXIobmV3IEpvYkNoYW5nZUFkYXB0ZXIoKXsKKwkgICAgCQkvLyB3aGVuIGRvbmUsIHNlZSBpZiB0aGVyZSBpcyBhbm90aGVyIHZhbGlkYXRpb24gam9iIHRvIHNjaGVkdWxlCisJCQkJcHVibGljIHZvaWQgZG9uZShJSm9iQ2hhbmdlRXZlbnQgZXZlbnQpIHsKKwkJCQkJc3luY2hyb25pemVkIChfdmFsaWRhdGlvbkpvYnMpIHsKKwkJCQkJCUpvYiB2YWxpZGF0aW9uSm9iID0gX3ZhbGlkYXRpb25Kb2JzLnBvbGwoKTsKKwkJCQkJCWlmICh2YWxpZGF0aW9uSm9iICE9IG51bGwpIHsKKwkJCQkJCQlhZGRKb2JDaGFuZ2VBZGFwdGVyKHZhbGlkYXRpb25Kb2IpOworCQkJCQkJCXZhbGlkYXRpb25Kb2Iuc2NoZWR1bGUoKTsKKwkJCQkJCX0KKwkJCQkJfQorCQkJCX0KKwkJCX0pOworCSAgICB9CisJICAgIAogCSAgICBAT3ZlcnJpZGUKIAkgICAgcHVibGljIGJvb2xlYW4gYmVsb25nc1RvKE9iamVjdCBmYW1pbHkpIHsKIAkJCWlmIChmYW1pbHkgPT0gUmVzb3VyY2VzUGx1Z2luLkZBTUlMWV9NQU5VQUxfQlVJTEQpcmV0dXJuIHRydWU7CkBAIC0xMDIsNiArMTMyLDE2IEBACiAJCQl9CiAJCQlyZXR1cm4gc3VwZXIuYmVsb25nc1RvKGZhbWlseSk7CiAJICAgIH0KKwkgICAgCisJICAgIHB1YmxpYyB2b2lkIGFkZFZhbGlkYXRpb25Kb2IoSm9iIHZhbGlkYXRpb25Kb2IpIHsKKwkgICAgCXN5bmNocm9uaXplZCAoX3ZhbGlkYXRpb25Kb2JzKSB7CisJICAgIAkJX3ZhbGlkYXRpb25Kb2JzLmFkZCh2YWxpZGF0aW9uSm9iKTsKKwkgICAgCQkvLyBzY2hlZHVsZSB0aGUgam9iIGlmIHdlIHdlcmUgZW1wdHkKKwkgICAgCQlpZiAoX3ZhbGlkYXRpb25Kb2JzLnNpemUoKSA9PSAxKSB7CisJICAgIAkJCXRoaXMuc2NoZWR1bGUoKTsKKwkgICAgCQl9CisJICAgIAl9CisJICAgIH0KIAl9CiAJCiAJLyoqCkBAIC04NzksMTAgKzkxOSw3IEBACiAJfQogCiAJcHJpdmF0ZSB2b2lkIHJlbGVhc2VDYWNoZWRNYXBzKCkgewotCQlpZiAoVmFsaWRhdGlvblJlZ2lzdHJ5UmVhZGVyLmdldFJlYWRlcigpLnByb2plY3RWYWxpZGF0aW9uTWV0YURhdGEgIT0gbnVsbCkgewotCQkJVmFsaWRhdGlvblJlZ2lzdHJ5UmVhZGVyLmdldFJlYWRlcigpLnByb2plY3RWYWxpZGF0aW9uTWV0YURhdGEuY2xlYXIoKTsKLQkJCVZhbGlkYXRpb25SZWdpc3RyeVJlYWRlci5nZXRSZWFkZXIoKS5wcm9qZWN0VmFsaWRhdGlvbk1ldGFEYXRhID0gbnVsbDsKLQkJfQorCQlWYWxpZGF0aW9uUmVnaXN0cnlSZWFkZXIuZ2V0UmVhZGVyKCkuY2xlYXJDYWNoZWRNYXBzKCk7CiAJCUlQcm9qZWN0VmFsaWRhdGlvbkhlbHBlciBoZWxwZXIgPSBWYWxpZGF0aW9uSGVscGVyUmVnaXN0cnlSZWFkZXIuZ2V0SW5zdGFuY2UoKS5nZXRWYWxpZGF0aW9uSGVscGVyKCk7CiAJCWlmIChoZWxwZXIgIT0gbnVsbCkKIAkJCWhlbHBlci5kaXNwb3NlSW5zdGFuY2UoKTsKQEAgLTEwNzQsMTUgKzExMTEsMjIgQEAKIAkgKiA8Y29kZT5wcm9jZXNzPC9jb2RlPiBhbHNvIHNlbmRzIG91dHB1dCB0byB0aGUgPGNvZGU+SVByb2dyZXNzTW9uaXRvcjwvY29kZT4sIGFuZCBjYWxscwogCSAqIHRoZSBjdXJyZW50IFZhbGlkYXRvciB0byB2YWxpZGF0ZSB0aGUgcmVzb3VyY2UuCiAJICogCi0JICogVG8gcHJvY2VzcyBhIHJlc291cmNlLCB0aGVyZSBhcmUgc2V2ZXJhbCBzdGVwczogMS4gY2hlY2sgaWYgdGhlIHJlc291cmNlIGlzIHJlZ2lzdGVyZWQgZm9yCisJICogPHA+VG8gcHJvY2VzcyBhIHJlc291cmNlLCB0aGVyZSBhcmUgc2V2ZXJhbCBzdGVwczo8L3A+IAorCSAqIDxwPjEuIGNoZWNrIGlmIHRoZSByZXNvdXJjZSBpcyByZWdpc3RlcmVkIGZvcgogCSAqIHRoaXMgdmFsaWRhdG9yIChpLmUuLCB0aGUgdmFsaWRhdG9yIGhhcyBlaXRoZXIgc3BlY2lmaWVkIGl0IGluIGEgZmlsdGVyLCBvciBoYXMgbm90IGZpbHRlcmVkCi0JICogaXQgb3V0IGV4cGxpY2l0bHkpIDIuIGNhbGwgPGNvZGU+aXNWYWxpZGF0aW9uU291cmNlPC9jb2RlPiBvbiB0aGUgY3VycmVudCB2YWxpZGF0b3Igd2l0aAorCSAqIGl0IG91dCBleHBsaWNpdGx5KTwvcD4KKwkgKiAKKwkgKiA8cD4yLiBjYWxsIDxjb2RlPmlzVmFsaWRhdGlvblNvdXJjZTwvY29kZT4gb24gdGhlIGN1cnJlbnQgdmFsaWRhdG9yIHdpdGgKIAkgKiB0aGUgY3VycmVudCByZXNvdXJjZS4gVGhpcyBtZXRob2QgcGVyZm9ybXMgZnVydGhlciBmaWx0ZXJpbmcgYnkgdGhlIFZhbGlkYXRvciBpdHNlbGYsIGluCiAJICogYWRkaXRpb24gdG8gdGhlIHN0YXRpYyBmaWx0ZXJpbmcgZG9uZSBieSB0aGUgZnJhbWV3b3JrLCBiYXNlZCBvbiB0aGUgaW5mb3JtYXRpb24gaW4KLQkgKiBwbHVnaW4ueG1sLiAzLiBJZiB0aGUgcmVzb3VyY2UgcGFzc2VzIGJvdGggZmlsdGVycywgY2FsbCA8Y29kZT52YWxpZGF0ZTwvY29kZT4gb24gdGhlCi0JICogdmFsaWRhdG9yLCB3aXRoIHRoZSByZXNvdXJjZS4gNC4gV2hlbiBjb21wbGV0ZSAoZWl0aGVyIGJ5IGZhaWxpbmcgdG8gcGFzcyBhIGZpbHRlciwgb3IgYnkgdGhlCisJICogcGx1Z2luLnhtbC48L3A+IAorCSAqIAorCSAqIDxwPjMuIElmIHRoZSByZXNvdXJjZSBwYXNzZXMgYm90aCBmaWx0ZXJzLCBjYWxsIDxjb2RlPnZhbGlkYXRlPC9jb2RlPiBvbiB0aGUKKwkgKiB2YWxpZGF0b3IsIHdpdGggdGhlIHJlc291cmNlLjwvcD4gCisJICogCisJICogPHA+NC4gV2hlbiBjb21wbGV0ZSAoZWl0aGVyIGJ5IGZhaWxpbmcgdG8gcGFzcyBhIGZpbHRlciwgb3IgYnkgdGhlCiAJICogY29tcGxldGlvbiBvZiB0aGUgPGNvZGU+dmFsaWRhdGU8L2NvZGU+KSwgaW5jcmVtZW50IHRoZSBJUHJvZ3Jlc3NNb25pdG9yJ3Mgc3RhdHVzIGJ5IG9uZQotCSAqIChpLmUuLCBvbmUgcmVzb3VyY2UgaGFzIGJlZW4gcHJvY2Vzc2VkLikKKwkgKiAoaS5lLiwgb25lIHJlc291cmNlIGhhcyBiZWVuIHByb2Nlc3NlZC4pPC9wPgogCSAqLwogCXByaXZhdGUgZmluYWwgdm9pZCBsYXVuY2hWYWxpZGF0b3IoV29ya2JlbmNoUmVwb3J0ZXIgcmVwb3J0ZXIsIElWYWxpZGF0b3IgdmFsaWRhdG9yLCBWYWxpZGF0b3JNZXRhRGF0YSB2bWQsIElXb3JrYmVuY2hDb250ZXh0IGhlbHBlciwgSUZpbGVEZWx0YVtdIGRlbHRhKSB7CiAJCWlmIChyZXBvcnRlciA9PSBudWxsKXJldHVybjsKQEAgLTEyMjcsMTIgKzEyNzEsMTcgQEAKIAkgKiAoaFByb2plY3QuZ2V0TmFtZSgpLmluZGV4T2YoImZvcmsiKSA+IC0xKSkgeyBUaHJlYWQuZHVtcFN0YWNrKCk7IH0gU3lzdGVtLmVyci5wcmludGxuKHByZWZpeCArCiAJICogIkVuZCBWYWxpZGF0aW9uT3BlcmF0aW9uIik7IH0KIAkgKi8KKwkKKwkvKioKKwkgKiBAZGVwcmVjYXRlZCBUaGlzIGNsYXNzIGlzIG5vIGxvbmdlciB1c2VkIGJ5IHRoZSBmcmFtZXdvcmsuCisJICovCiAJcHVibGljIGNsYXNzIFByb2plY3RSdW5uYWJsZSBpbXBsZW1lbnRzIFJ1bm5hYmxlIHsKIAkJcHJpdmF0ZSBXb3JrYmVuY2hSZXBvcnRlciBfcmVwb3J0ZXI7CiAJCXByaXZhdGUgSVZhbGlkYXRvciBfdmFsaWRhdG9yOwogCQlwcml2YXRlIFZhbGlkYXRvck1ldGFEYXRhIF92bWQ7CiAJCXByaXZhdGUgSUZpbGVEZWx0YVtdIF9kZWx0YTsKIAorCQlAU3VwcHJlc3NXYXJuaW5ncygidW5jaGVja2VkIikKIAkJcHVibGljIFByb2plY3RSdW5uYWJsZShXb3JrYmVuY2hSZXBvcnRlciByZXBvcnRlciwgSVZhbGlkYXRvciB2YWxpZGF0b3IsIAogCQkJVmFsaWRhdG9yTWV0YURhdGEgdm1kLCBJV29ya2JlbmNoQ29udGV4dCBoZWxwZXIsIElGaWxlRGVsdGFbXSBkZWx0YSwgSXRlcmF0b3IgaXRlcmF0b3IpIHsKIAkJCV9yZXBvcnRlciA9IHJlcG9ydGVyOwpAQCAtMTQwNSw5ICsxNDU0LDcgQEAKIAkJCX0KIAkJKTsKIAkJdmFsaWRhdG9yam9iLnNldFByaW9yaXR5KEpvYi5ERUNPUkFURSk7Ci0KLQkJVmFsaWRhdGlvbkxhdW5jaGVySm9iIHZhbGlkYXRpb25MYXVuY2hlckpvYiA9IG5ldyBWYWxpZGF0aW9uTGF1bmNoZXJKb2IodmFsaWRhdG9yam9iKTsKLQkJdmFsaWRhdGlvbkxhdW5jaGVySm9iLnNjaGVkdWxlKCk7CisJCWxhdW5jaGVySm9iLmFkZFZhbGlkYXRpb25Kb2IodmFsaWRhdG9yam9iKTsKIAl9CiAJCQogfQpkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi92YWxpZGF0ZS9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9pbnRlcm5hbC9vcGVyYXRpb25zL1ZhbGlkYXRvck1hbmFnZXIuamF2YSBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24vdmFsaWRhdGUvb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vaW50ZXJuYWwvb3BlcmF0aW9ucy9WYWxpZGF0b3JNYW5hZ2VyLmphdmEKaW5kZXggODZiYmJmMy4uNTUzNTM4YiAxMDA2NDQKLS0tIGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi92YWxpZGF0ZS9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9pbnRlcm5hbC9vcGVyYXRpb25zL1ZhbGlkYXRvck1hbmFnZXIuamF2YQorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uL3ZhbGlkYXRlL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL2ludGVybmFsL29wZXJhdGlvbnMvVmFsaWRhdG9yTWFuYWdlci5qYXZhCkBAIC0xLDUgKzEsNSBAQAogLyoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioKLSAqIENvcHlyaWdodCAoYykgMjAwMSwgMjAwOCBJQk0gQ29ycG9yYXRpb24gYW5kIG90aGVycy4KKyAqIENvcHlyaWdodCAoYykgMjAwMSwgMjAwOSBJQk0gQ29ycG9yYXRpb24gYW5kIG90aGVycy4KICAqIEFsbCByaWdodHMgcmVzZXJ2ZWQuIFRoaXMgcHJvZ3JhbSBhbmQgdGhlIGFjY29tcGFueWluZyBtYXRlcmlhbHMKICAqIGFyZSBtYWRlIGF2YWlsYWJsZSB1bmRlciB0aGUgdGVybXMgb2YgdGhlIEVjbGlwc2UgUHVibGljIExpY2Vuc2UgdjEuMAogICogd2hpY2ggYWNjb21wYW5pZXMgdGhpcyBkaXN0cmlidXRpb24sIGFuZCBpcyBhdmFpbGFibGUgYXQKQEAgLTE2LDcgKzE2LDYgQEAKIGltcG9ydCBqYXZhLnV0aWwuQ29sbGVjdGlvbnM7CiBpbXBvcnQgamF2YS51dGlsLkhhc2hNYXA7CiBpbXBvcnQgamF2YS51dGlsLkhhc2hTZXQ7Ci1pbXBvcnQgamF2YS51dGlsLkl0ZXJhdG9yOwogaW1wb3J0IGphdmEudXRpbC5MaXN0OwogaW1wb3J0IGphdmEudXRpbC5NYXA7CiBpbXBvcnQgamF2YS51dGlsLlNldDsKQEAgLTUyLDEyICs1MSwxMSBAQAogCXByaXZhdGUgc3RhdGljIElSZXNvdXJjZVV0aWwgX3Jlc291cmNlVXRpbDsgLy8gYSBjb21tb24gdXRpbGl0eSwgZGlmZmVyZW50IHdoZXRoZXIgb3Igbm90CiAJLy8gV1NBRCBpcyBydW5uaW5nIGluIGhlYWRsZXNzIG9yIFVJIG1vZGUsIHdoaWNoIGNhbiByZXRyaWV2ZSB0aGUgbGluZSBudW1iZXIgb2Ygc29tZSBNT0Ygb2JqZWN0cy4KIAlwcml2YXRlIHN0YXRpYyBmaW5hbCBDbGFzcyBSRVNPVVJDRVVUSUxfREVGQVVMVENMQVNTID0gb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uaW50ZXJuYWwub3BlcmF0aW9ucy5EZWZhdWx0UmVzb3VyY2VVdGlsLmNsYXNzOwotCXByaXZhdGUgc3RhdGljIENsYXNzIF9yZXNvdXJjZVV0aWxDbGFzcyA9IFJFU09VUkNFVVRJTF9ERUZBVUxUQ0xBU1M7Ci0JCQotCS8vIGFuIGVtcHR5IHNldCwgcHJvdmlkZWQgZm9yIGNvbnZlbmllbmNlLCBzbyB0aGF0IHdlIG9ubHkgY29uc3RydWN0IG9uZSBlbXB0eSBzZXQgb25jZS4KLQlwcml2YXRlIHN0YXRpYyBmaW5hbCBTZXQ8VmFsaWRhdG9yTWV0YURhdGE+IEVNUFRZX1NFVCA9IG5ldyBIYXNoU2V0PFZhbGlkYXRvck1ldGFEYXRhPigpOwotCQorCXByaXZhdGUgc3RhdGljIENsYXNzIF9yZXNvdXJjZVV0aWxDbGFzcyA9IFJFU09VUkNFVVRJTF9ERUZBVUxUQ0xBU1M7CQkKIAlwcml2YXRlIHN0YXRpYyBDbGFzcyAJX21lc3NhZ2VMaW1pdE93bmVyOworCQorCXByaXZhdGUgc3RhdGljIGZpbmFsIFNldDxWYWxpZGF0b3JNZXRhRGF0YT4gRW1wdHlTZXQgPSBDb2xsZWN0aW9ucy5lbXB0eVNldCgpOworCQkKIAlwcml2YXRlIFN0cmluZ1tdIAkJX2ludGVybmFsT3duZXJzOwogCXByaXZhdGUgTWFwPElWYWxpZGF0b3JKb2IsIExpc3Q8TWVzc2FnZUluZm8+PiBfdmFsaWRhdG9yTXNncyA9IAogCQlDb2xsZWN0aW9ucy5zeW5jaHJvbml6ZWRNYXAoIG5ldyBIYXNoTWFwPElWYWxpZGF0b3JKb2IsIExpc3Q8TWVzc2FnZUluZm8+PigpICk7CQpAQCAtNzUsNyArNzMsNyBAQAogCSAqLwogCXB1YmxpYyB2b2lkIGRpc2FibGVBbGxWYWxpZGF0b3JzKElQcm9qZWN0IGN1cnJlbnRQcm9qZWN0LCBJUHJvZ3Jlc3NNb25pdG9yIG1vbml0b3IpIHsKIAkJLy8gRGlzYWJsZSB0aGUgaW5kaXZpZHVhbCB2YWxpZGF0b3JzCi0JCXNldEVuYWJsZWRWYWxpZGF0b3JzKGN1cnJlbnRQcm9qZWN0LCBFTVBUWV9TRVQsIG1vbml0b3IpOworCQlzZXRFbmFibGVkVmFsaWRhdG9ycyhjdXJyZW50UHJvamVjdCwgRW1wdHlTZXQsIG1vbml0b3IpOwogCX0KIAogCXB1YmxpYyB2b2lkIGVuYWJsZVZhbGlkYXRvcihTdHJpbmcgdmFsaWRhdG9ySWQpIHsKQEAgLTEyMSwxNSArMTE5LDEwIEBACiAJCXRyeSB7CiAJCQlQcm9qZWN0Q29uZmlndXJhdGlvbiBwcmpwID0gQ29uZmlndXJhdGlvbk1hbmFnZXIuZ2V0TWFuYWdlcigpLmdldFByb2plY3RDb25maWd1cmF0aW9uKHByb2plY3QpOwogCQkJcHJqcC5zZXREb2VzUHJvamVjdE92ZXJyaWRlKHRydWUpOwotCQkJVmFsaWRhdG9yTWV0YURhdGEgdm1kID0gVmFsaWRhdGlvblJlZ2lzdHJ5UmVhZGVyLmdldFJlYWRlcigpCi0JCQkJCS5nZXRWYWxpZGF0b3JNZXRhRGF0YSh2YWxpZGF0b3JJZCk7CisJCQlWYWxpZGF0b3JNZXRhRGF0YSB2bWQgPSBWYWxpZGF0aW9uUmVnaXN0cnlSZWFkZXIuZ2V0UmVhZGVyKCkuZ2V0VmFsaWRhdG9yTWV0YURhdGEodmFsaWRhdG9ySWQpOwogCQkJCi0JCQlpZihtYW51YWxWYWxpZGF0aW9uKXsKLQkJCQlwcmpwLmRpc2FibGVTaW5nbGVNYW51YWxWYWxpZGF0b3Iodm1kKTsKLQkJCX0gCi0JCQlpZiAoYnVpbGRWYWxpZGF0aW9uKXsKLQkJCQlwcmpwLmRpc2FibGVTaW5nbGVCdWlsZFZhbGlkYXRvcih2bWQpOwotCQkJfQorCQkJaWYobWFudWFsVmFsaWRhdGlvbilwcmpwLmRpc2FibGVTaW5nbGVNYW51YWxWYWxpZGF0b3Iodm1kKTsKKwkJCWlmIChidWlsZFZhbGlkYXRpb24pcHJqcC5kaXNhYmxlU2luZ2xlQnVpbGRWYWxpZGF0b3Iodm1kKTsKIAkJCXByanAuc3RvcmUoKTsKIAkJCQogCQl9IGNhdGNoIChJbnZvY2F0aW9uVGFyZ2V0RXhjZXB0aW9uIGUpIHsKQEAgLTI2MiwxNCArMjU1LDE0IEBACiAJICogUmV0dXJuIGEgY29sbGVjdGlvbiBvZiBpbmNyZW1lbnRhbCBWYWxpZGF0b3JNZXRhRGF0YSBjb25maWd1cmVkIG9uIGEgY2VydGFpbiB0eXBlIG9mIElQcm9qZWN0CiAJICogKGUuZy4gRUpCIFByb2plY3QgdnMuIFdlYiBQcm9qZWN0KS4KIAkgKi8KLQlwdWJsaWMgU2V0IGdldFByb2plY3RDb25maWd1cmVkSW5jcmVtZW50YWxWYWxpZGF0b3JzKElQcm9qZWN0IHByb2plY3QpIHsKKwlwdWJsaWMgU2V0PFZhbGlkYXRvck1ldGFEYXRhPiBnZXRQcm9qZWN0Q29uZmlndXJlZEluY3JlbWVudGFsVmFsaWRhdG9ycyhJUHJvamVjdCBwcm9qZWN0KSB7CiAJCXRyeSB7CiAJCQlQcm9qZWN0Q29uZmlndXJhdGlvbiBwcmpwID0gQ29uZmlndXJhdGlvbk1hbmFnZXIuZ2V0TWFuYWdlcigpLmdldFByb2plY3RDb25maWd1cmF0aW9uKHByb2plY3QpOwogCQkJcmV0dXJuIEludGVybmFsVmFsaWRhdG9yTWFuYWdlci53cmFwSW5TZXQocHJqcC5nZXRJbmNyZW1lbnRhbFZhbGlkYXRvcnMoKSk7CiAJCX0gY2F0Y2ggKEludm9jYXRpb25UYXJnZXRFeGNlcHRpb24gZSkgewogCQkJVmFsaWRhdGlvblBsdWdpbi5nZXRQbHVnaW4oKS5oYW5kbGVFeGNlcHRpb24oZSk7CiAJCQlWYWxpZGF0aW9uUGx1Z2luLmdldFBsdWdpbigpLmhhbmRsZUV4Y2VwdGlvbihlLmdldFRhcmdldEV4Y2VwdGlvbigpKTsKLQkJCXJldHVybiBDb2xsZWN0aW9ucy5FTVBUWV9TRVQ7CisJCQlyZXR1cm4gRW1wdHlTZXQ7CiAJCX0KIAl9CiAKQEAgLTI4MSwxNCArMjc0LDE0IEBACiAJICogCiAJICogSWYgdGhlIGNvbGxlY3Rpb24gaGFzIG5vdCBiZWVuIGNhbGN1bGF0ZWQgYmVmb3JlLCBjYWxjdWxhdGUgaXQgbm93LCBhbmQgY2FjaGUgdGhlIHJlc3VsdC4KIAkgKi8KLQlwdWJsaWMgU2V0IGdldFByb2plY3RDb25maWd1cmVkVmFsaWRhdG9yTWV0YURhdGEoSVByb2plY3QgcHJvamVjdCkgeworCXB1YmxpYyBTZXQ8VmFsaWRhdG9yTWV0YURhdGE+IGdldFByb2plY3RDb25maWd1cmVkVmFsaWRhdG9yTWV0YURhdGEoSVByb2plY3QgcHJvamVjdCkgewogCQl0cnkgewogCQkJUHJvamVjdENvbmZpZ3VyYXRpb24gcHJqcCA9IENvbmZpZ3VyYXRpb25NYW5hZ2VyLmdldE1hbmFnZXIoKS5nZXRQcm9qZWN0Q29uZmlndXJhdGlvbihwcm9qZWN0KTsKIAkJCXJldHVybiBJbnRlcm5hbFZhbGlkYXRvck1hbmFnZXIud3JhcEluU2V0KHByanAuZ2V0VmFsaWRhdG9ycygpKTsKIAkJfSBjYXRjaCAoSW52b2NhdGlvblRhcmdldEV4Y2VwdGlvbiBlKSB7CiAJCQlWYWxpZGF0aW9uUGx1Z2luLmdldFBsdWdpbigpLmhhbmRsZUV4Y2VwdGlvbihlKTsKIAkJCVZhbGlkYXRpb25QbHVnaW4uZ2V0UGx1Z2luKCkuaGFuZGxlRXhjZXB0aW9uKGUuZ2V0VGFyZ2V0RXhjZXB0aW9uKCkpOwotCQkJcmV0dXJuIENvbGxlY3Rpb25zLkVNUFRZX1NFVDsKKwkJCXJldHVybiBFbXB0eVNldDsKIAkJfQogCX0KIApAQCAtMzAxLDE0ICsyOTQsMTQgQEAKIAkgKiB0cnVlLCByZXR1cm4gaW5jcmVtZW50YWwgdmFsaWRhdG9ycy4gSWYgdGhlIHBhcmFtZXRlciBpcyBmYWxzZSwgcmV0dXJuIG5vbmluY3JlbWVudGFsCiAJICogdmFsaWRhdG9ycy4KIAkgKi8KLQlwdWJsaWMgU2V0IGdldFByb2plY3RFbmFibGVkSW5jcmVtZW50YWxWYWxpZGF0b3JzKElQcm9qZWN0IHByb2plY3QpIHsKKwlwdWJsaWMgU2V0PFZhbGlkYXRvck1ldGFEYXRhPiBnZXRQcm9qZWN0RW5hYmxlZEluY3JlbWVudGFsVmFsaWRhdG9ycyhJUHJvamVjdCBwcm9qZWN0KSB7CiAJCXRyeSB7CiAJCQlQcm9qZWN0Q29uZmlndXJhdGlvbiBwcmpwID0gQ29uZmlndXJhdGlvbk1hbmFnZXIuZ2V0TWFuYWdlcigpLmdldFByb2plY3RDb25maWd1cmF0aW9uKHByb2plY3QpOwogCQkJcmV0dXJuIEludGVybmFsVmFsaWRhdG9yTWFuYWdlci53cmFwSW5TZXQocHJqcC5nZXRFbmFibGVkSW5jcmVtZW50YWxWYWxpZGF0b3JzKHRydWUpKTsKIAkJfSBjYXRjaCAoSW52b2NhdGlvblRhcmdldEV4Y2VwdGlvbiBlKSB7CiAJCQlWYWxpZGF0aW9uUGx1Z2luLmdldFBsdWdpbigpLmhhbmRsZUV4Y2VwdGlvbihlKTsKIAkJCVZhbGlkYXRpb25QbHVnaW4uZ2V0UGx1Z2luKCkuaGFuZGxlRXhjZXB0aW9uKGUuZ2V0VGFyZ2V0RXhjZXB0aW9uKCkpOwotCQkJcmV0dXJuIENvbGxlY3Rpb25zLkVNUFRZX1NFVDsKKwkJCXJldHVybiBFbXB0eVNldDsKIAkJfQogCX0KIApAQCAtMzIxLDE0ICszMTQsMTQgQEAKIAkgKiB0cnVlLCByZXR1cm4gaW5jcmVtZW50YWwgdmFsaWRhdG9ycy4gSWYgdGhlIHBhcmFtZXRlciBpcyBmYWxzZSwgcmV0dXJuIG5vbmluY3JlbWVudGFsCiAJICogdmFsaWRhdG9ycy4KIAkgKi8KLQlwdWJsaWMgQ29sbGVjdGlvbiBnZXRQcm9qZWN0RW5hYmxlZE5vbkluY3JlbWVudGFsVmFsaWRhdG9ycyhJUHJvamVjdCBwcm9qZWN0KSB7CisJcHVibGljIENvbGxlY3Rpb248VmFsaWRhdG9yTWV0YURhdGE+IGdldFByb2plY3RFbmFibGVkTm9uSW5jcmVtZW50YWxWYWxpZGF0b3JzKElQcm9qZWN0IHByb2plY3QpIHsKIAkJdHJ5IHsKIAkJCVByb2plY3RDb25maWd1cmF0aW9uIHByanAgPSBDb25maWd1cmF0aW9uTWFuYWdlci5nZXRNYW5hZ2VyKCkuZ2V0UHJvamVjdENvbmZpZ3VyYXRpb24ocHJvamVjdCk7CiAJCQlyZXR1cm4gSW50ZXJuYWxWYWxpZGF0b3JNYW5hZ2VyLndyYXBJblNldChwcmpwLmdldEVuYWJsZWRJbmNyZW1lbnRhbFZhbGlkYXRvcnMoZmFsc2UpKTsKIAkJfSBjYXRjaCAoSW52b2NhdGlvblRhcmdldEV4Y2VwdGlvbiBlKSB7CiAJCQlWYWxpZGF0aW9uUGx1Z2luLmdldFBsdWdpbigpLmhhbmRsZUV4Y2VwdGlvbihlKTsKIAkJCVZhbGlkYXRpb25QbHVnaW4uZ2V0UGx1Z2luKCkuaGFuZGxlRXhjZXB0aW9uKGUuZ2V0VGFyZ2V0RXhjZXB0aW9uKCkpOwotCQkJcmV0dXJuIENvbGxlY3Rpb25zLkVNUFRZX1NFVDsKKwkJCXJldHVybiBFbXB0eVNldDsKIAkJfQogCX0KIApAQCAtMzM5LDcgKzMzMiw3IEBACiAJICogYW5kIHdobyBhcmUgYWxzbyBlbmFibGVkIGJ5IHRoaXMgcHJvamVjdC4gSWYgdGhlIGxpc3Qgb2YgZW5hYmxlZCB2YWxpZGF0b3JzIGhhc24ndCBiZWVuCiAJICogbG9hZGVkIGludG8gdGhlIGNhY2hlLCBsb2FkIGl0IG5vdy4gT3RoZXJ3aXNlLCBqdXN0IHJldHVybiBpdC4KIAkgKi8KLQlwdWJsaWMgU2V0IGdldFByb2plY3RFbmFibGVkVmFsaWRhdG9ycyhJUHJvamVjdCBwcm9qZWN0KSB7CisJcHVibGljIFNldDxWYWxpZGF0b3JNZXRhRGF0YT4gZ2V0UHJvamVjdEVuYWJsZWRWYWxpZGF0b3JzKElQcm9qZWN0IHByb2plY3QpIHsKIAkJcmV0dXJuIGdldEVuYWJsZWRWYWxpZGF0b3JzKHByb2plY3QpOwogCX0KIApAQCAtNDA1LDE2ICszOTgsMTIgQEAKIAkvKioKIAkgKiBAZGVwcmVjYXRlZCBGb3IgdXNlIGJ5IHRoZSB2YWxpZGF0aW9uIGZyYW1ld29yayBvbmx5LgogCSAqLwotCXB1YmxpYyBTZXQ8VmFsaWRhdG9yTWV0YURhdGE+IGdldEluY3JlbWVudGFsVmFsaWRhdG9ycyhDb2xsZWN0aW9uIHZtZHMpIHsKKwlwdWJsaWMgU2V0PFZhbGlkYXRvck1ldGFEYXRhPiBnZXRJbmNyZW1lbnRhbFZhbGlkYXRvcnMoQ29sbGVjdGlvbjxWYWxpZGF0b3JNZXRhRGF0YT4gdm1kcykgewogCQlpZiAodm1kcyA9PSBudWxsKXJldHVybiBuZXcgSGFzaFNldDxWYWxpZGF0b3JNZXRhRGF0YT4oKTsKIAogCQlTZXQ8VmFsaWRhdG9yTWV0YURhdGE+IHJlc3VsdCA9IG5ldyBIYXNoU2V0PFZhbGlkYXRvck1ldGFEYXRhPigpOwotCQlJdGVyYXRvciBpdGVyYXRvciA9IHZtZHMuaXRlcmF0b3IoKTsKLQkJd2hpbGUgKGl0ZXJhdG9yLmhhc05leHQoKSkgewotCQkJVmFsaWRhdG9yTWV0YURhdGEgdm1kID0gKFZhbGlkYXRvck1ldGFEYXRhKSBpdGVyYXRvci5uZXh0KCk7Ci0JCQlpZiAodm1kLmlzSW5jcmVtZW50YWwoKSkgewotCQkJCXJlc3VsdC5hZGQodm1kKTsKLQkJCX0KKwkJZm9yIChWYWxpZGF0b3JNZXRhRGF0YSB2bWQgOiB2bWRzKSB7CisJCQlpZiAodm1kLmlzSW5jcmVtZW50YWwoKSlyZXN1bHQuYWRkKHZtZCk7CiAJCX0KIAkJcmV0dXJuIHJlc3VsdDsKIAl9CkBAIC01MjUsNyArNTE0LDcgQEAKIAkvKioKIAkgKiBAZGVwcmVjYXRlZCBGb3IgdXNlIGJ5IHRoZSB2YWxpZGF0aW9uIGZyYW1ld29yayBvbmx5LgogCSAqLwotCXB1YmxpYyBTZXQgZ2V0RW5hYmxlZEluY3JlbWVudGFsVmFsaWRhdG9ycyhJUHJvamVjdCBwcm9qZWN0KSB7CisJcHVibGljIFNldDxWYWxpZGF0b3JNZXRhRGF0YT4gZ2V0RW5hYmxlZEluY3JlbWVudGFsVmFsaWRhdG9ycyhJUHJvamVjdCBwcm9qZWN0KSB7CiAJCXRyeSB7CiAJCQlQcm9qZWN0Q29uZmlndXJhdGlvbiBwcmpwID0gQ29uZmlndXJhdGlvbk1hbmFnZXIuZ2V0TWFuYWdlcigpLmdldFByb2plY3RDb25maWd1cmF0aW9uKHByb2plY3QpOwogCQkJVmFsaWRhdG9yTWV0YURhdGFbXSB2bWRzID0gcHJqcC5nZXRFbmFibGVkSW5jcmVtZW50YWxWYWxpZGF0b3JzKHRydWUpOwpAQCAtNTMzLDcgKzUyMiw3IEBACiAJCX0gY2F0Y2ggKEludm9jYXRpb25UYXJnZXRFeGNlcHRpb24gZSkgewogCQkJVmFsaWRhdGlvblBsdWdpbi5nZXRQbHVnaW4oKS5oYW5kbGVFeGNlcHRpb24oZSk7CiAJCQlWYWxpZGF0aW9uUGx1Z2luLmdldFBsdWdpbigpLmhhbmRsZUV4Y2VwdGlvbihlLmdldFRhcmdldEV4Y2VwdGlvbigpKTsKLQkJCXJldHVybiBDb2xsZWN0aW9ucy5FTVBUWV9TRVQ7CisJCQlyZXR1cm4gRW1wdHlTZXQ7CiAJCX0KIAl9CiAKQEAgLTU5MCwxNCArNTc5LDE0IEBACiAJCX0gY2F0Y2ggKEludm9jYXRpb25UYXJnZXRFeGNlcHRpb24gZSkgewogCQkJVmFsaWRhdGlvblBsdWdpbi5nZXRQbHVnaW4oKS5oYW5kbGVFeGNlcHRpb24oZSk7CiAJCQlWYWxpZGF0aW9uUGx1Z2luLmdldFBsdWdpbigpLmhhbmRsZUV4Y2VwdGlvbihlLmdldFRhcmdldEV4Y2VwdGlvbigpKTsKLQkJCXJldHVybiBDb2xsZWN0aW9ucy5FTVBUWV9TRVQ7CisJCQlyZXR1cm4gRW1wdHlTZXQ7CiAJCX0KIAl9CiAKIAlwcml2YXRlIFZhbGlkYXRvck1ldGFEYXRhW10gZ2V0U3RhdGVPZlByb2plY3RMZXZlbFZhbGlkYXRvcnNGcm9tR2xvYmFsKFByb2plY3RDb25maWd1cmF0aW9uIHByanApIHRocm93cyBJbnZvY2F0aW9uVGFyZ2V0RXhjZXB0aW9uIHsKIAkJTGlzdDxWYWxpZGF0b3JNZXRhRGF0YT4gZW5hYmxlZEdsb2JhbFZhbGlkYXRvcnNGb3JQcm9qZWN0ID0gbmV3IEFycmF5TGlzdDxWYWxpZGF0b3JNZXRhRGF0YT4oKTsKIAkJR2xvYmFsQ29uZmlndXJhdGlvbiBnZiA9IENvbmZpZ3VyYXRpb25NYW5hZ2VyLmdldE1hbmFnZXIoKS5nZXRHbG9iYWxDb25maWd1cmF0aW9uKCk7Ci0JCUxpc3QgYWxsUHJvamVjdFZhbGlkYXRvciA9IGdldEFsbFZhbGlkYXRvclVuaXF1ZU5hbWVzKHByanAuZ2V0VmFsaWRhdG9ycygpKTsKKwkJTGlzdDxTdHJpbmc+IGFsbFByb2plY3RWYWxpZGF0b3IgPSBnZXRBbGxWYWxpZGF0b3JVbmlxdWVOYW1lcyhwcmpwLmdldFZhbGlkYXRvcnMoKSk7CiAJCWZvcihWYWxpZGF0b3JNZXRhRGF0YSB2bWQgOiBnZi5nZXRCdWlsZEVuYWJsZWRWYWxpZGF0b3JzKCkpIHsKIAkJCWlmKGFsbFByb2plY3RWYWxpZGF0b3IuY29udGFpbnModm1kLmdldFZhbGlkYXRvclVuaXF1ZU5hbWUoKSkpIHsKIAkJCQllbmFibGVkR2xvYmFsVmFsaWRhdG9yc0ZvclByb2plY3QuYWRkKHZtZCk7CkBAIC02MjQsNyArNjEzLDcgQEAKIAkJfSBjYXRjaCAoSW52b2NhdGlvblRhcmdldEV4Y2VwdGlvbiBlKSB7CiAJCQlWYWxpZGF0aW9uUGx1Z2luLmdldFBsdWdpbigpLmhhbmRsZUV4Y2VwdGlvbihlKTsKIAkJCVZhbGlkYXRpb25QbHVnaW4uZ2V0UGx1Z2luKCkuaGFuZGxlRXhjZXB0aW9uKGUuZ2V0VGFyZ2V0RXhjZXB0aW9uKCkpOwotCQkJcmV0dXJuIENvbGxlY3Rpb25zLkVNUFRZX1NFVDsKKwkJCXJldHVybiBFbXB0eVNldDsKIAkJfQogCX0JCiAJCkBAIC02MzYsNyArNjI1LDcgQEAKIAkJfSBjYXRjaCAoSW52b2NhdGlvblRhcmdldEV4Y2VwdGlvbiBlKSB7CiAJCQlWYWxpZGF0aW9uUGx1Z2luLmdldFBsdWdpbigpLmhhbmRsZUV4Y2VwdGlvbihlKTsKIAkJCVZhbGlkYXRpb25QbHVnaW4uZ2V0UGx1Z2luKCkuaGFuZGxlRXhjZXB0aW9uKGUuZ2V0VGFyZ2V0RXhjZXB0aW9uKCkpOwotCQkJcmV0dXJuIENvbGxlY3Rpb25zLkVNUFRZX1NFVDsKKwkJCXJldHVybiBFbXB0eVNldDsKIAkJfQogCX0JCiAJCmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uL3ZhbGlkYXRlL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL2ludGVybmFsL3BsdWdpbi9WYWxpZGF0aW9uUGx1Z2luLmphdmEgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uL3ZhbGlkYXRlL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL2ludGVybmFsL3BsdWdpbi9WYWxpZGF0aW9uUGx1Z2luLmphdmEKaW5kZXggN2FkY2M0OS4uNDcxM2ZkMiAxMDA2NDQKLS0tIGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi92YWxpZGF0ZS9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9pbnRlcm5hbC9wbHVnaW4vVmFsaWRhdGlvblBsdWdpbi5qYXZhCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24vdmFsaWRhdGUvb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vaW50ZXJuYWwvcGx1Z2luL1ZhbGlkYXRpb25QbHVnaW4uamF2YQpAQCAtMSw1ICsxLDUgQEAKIC8qKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqCi0gKiBDb3B5cmlnaHQgKGMpIDIwMDEsIDIwMDggSUJNIENvcnBvcmF0aW9uIGFuZCBvdGhlcnMuCisgKiBDb3B5cmlnaHQgKGMpIDIwMDEsIDIwMTAgSUJNIENvcnBvcmF0aW9uIGFuZCBvdGhlcnMuCiAgKiBBbGwgcmlnaHRzIHJlc2VydmVkLiBUaGlzIHByb2dyYW0gYW5kIHRoZSBhY2NvbXBhbnlpbmcgbWF0ZXJpYWxzCiAgKiBhcmUgbWFkZSBhdmFpbGFibGUgdW5kZXIgdGhlIHRlcm1zIG9mIHRoZSBFY2xpcHNlIFB1YmxpYyBMaWNlbnNlIHYxLjAKICAqIHdoaWNoIGFjY29tcGFuaWVzIHRoaXMgZGlzdHJpYnV0aW9uLCBhbmQgaXMgYXZhaWxhYmxlIGF0CkBAIC0xMCwyMCArMTAsMjMgQEAKICAqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqLwogcGFja2FnZSBvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5pbnRlcm5hbC5wbHVnaW47CiAKK2ltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJlc291cmNlcy5JUHJvamVjdDsKIGltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJlc291cmNlcy5JUmVzb3VyY2VDaGFuZ2VFdmVudDsKIGltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJlc291cmNlcy5JV29ya3NwYWNlOworaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucmVzb3VyY2VzLlByb2plY3RTY29wZTsKIGltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJlc291cmNlcy5SZXNvdXJjZXNQbHVnaW47CiBpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5ydW50aW1lLklTdGF0dXM7CiBpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5ydW50aW1lLlBsYXRmb3JtOwogaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucnVudGltZS5QbHVnaW47CiBpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5ydW50aW1lLlN0YXR1czsKK2ltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJ1bnRpbWUucHJlZmVyZW5jZXMuSUVjbGlwc2VQcmVmZXJlbmNlczsKK2ltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJ1bnRpbWUucHJlZmVyZW5jZXMuSVNjb3BlQ29udGV4dDsKIGltcG9ydCBvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5WYWxpZGF0aW9uRnJhbWV3b3JrOwogaW1wb3J0IG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLmludGVybmFsLkRlcGVuZGVuY3lJbmRleDsKIGltcG9ydCBvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5pbnRlcm5hbC5FdmVudE1hbmFnZXI7CiBpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uaW50ZXJuYWwuUHJvamVjdFVuYXZhaWxhYmxlRXJyb3I7CiBpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uaW50ZXJuYWwuUmVzb3VyY2VVbmF2YWlsYWJsZUVycm9yOwogaW1wb3J0IG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLmludGVybmFsLlRyYWNpbmc7Ci1pbXBvcnQgb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uaW50ZXJuYWwuVmFsT3BlcmF0aW9uTWFuYWdlcjsKIGltcG9ydCBvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5pbnRlcm5hbC5jb3JlLk1lc3NhZ2U7CiBpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uaW50ZXJuYWwucHJvdmlzaW9uYWwuY29yZS5JTWVzc2FnZTsKIGltcG9ydCBvcmcub3NnaS5mcmFtZXdvcmsuQnVuZGxlOwpAQCAtMTAwLDE1ICsxMDMsMTYgQEAKIAkJRGVwZW5kZW5jeUluZGV4IGRpID0gKERlcGVuZGVuY3lJbmRleClWYWxpZGF0aW9uRnJhbWV3b3JrLmdldERlZmF1bHQoKS5nZXREZXBlbmRlbmN5SW5kZXgoKTsKIAkJSVdvcmtzcGFjZSB3cyA9IFJlc291cmNlc1BsdWdpbi5nZXRXb3Jrc3BhY2UoKTsKIAkJd3MuYWRkU2F2ZVBhcnRpY2lwYW50KHRoaXMsIGRpKTsKLQkJd3MuYWRkUmVzb3VyY2VDaGFuZ2VMaXN0ZW5lcihWYWxPcGVyYXRpb25NYW5hZ2VyLmdldERlZmF1bHQoKSwgCi0JCQlJUmVzb3VyY2VDaGFuZ2VFdmVudC5QT1NUX0JVSUxEIHwgSVJlc291cmNlQ2hhbmdlRXZlbnQuUFJFX0JVSUxEKTsKKy8vCQl3cy5hZGRSZXNvdXJjZUNoYW5nZUxpc3RlbmVyKFZhbE9wZXJhdGlvbk1hbmFnZXIuZ2V0RGVmYXVsdCgpLCAKKy8vCQkJSVJlc291cmNlQ2hhbmdlRXZlbnQuUE9TVF9CVUlMRCB8IElSZXNvdXJjZUNoYW5nZUV2ZW50LlBSRV9CVUlMRCk7CiAKIAl9CiAKIAlwdWJsaWMgdm9pZCBzdG9wKEJ1bmRsZUNvbnRleHQgY29udGV4dCkgdGhyb3dzIEV4Y2VwdGlvbiB7CiAJCXN1cGVyLnN0b3AoY29udGV4dCk7CiAJCVJlc291cmNlc1BsdWdpbi5nZXRXb3Jrc3BhY2UoKS5yZW1vdmVSZXNvdXJjZUNoYW5nZUxpc3RlbmVyKCBFdmVudE1hbmFnZXIuZ2V0TWFuYWdlcigpICk7CQkKLQkJUmVzb3VyY2VzUGx1Z2luLmdldFdvcmtzcGFjZSgpLnJlbW92ZVJlc291cmNlQ2hhbmdlTGlzdGVuZXIoIFZhbE9wZXJhdGlvbk1hbmFnZXIuZ2V0RGVmYXVsdCgpICk7CQkKKwkJVmFsaWRhdGlvbkZyYW1ld29yay5nZXREZWZhdWx0KCkuam9pbihudWxsKTsKKy8vCQlSZXNvdXJjZXNQbHVnaW4uZ2V0V29ya3NwYWNlKCkucmVtb3ZlUmVzb3VyY2VDaGFuZ2VMaXN0ZW5lciggVmFsT3BlcmF0aW9uTWFuYWdlci5nZXREZWZhdWx0KCkgKTsJCQogCQlFdmVudE1hbmFnZXIuZ2V0TWFuYWdlcigpLnNodXRkb3duKCk7CiAJfQogCkBAIC0xMjEsNiArMTI1LDExIEBACiAJCXJldHVybiBQTFVHSU5fSUQ7CiAJfQogCQorCXB1YmxpYyBzdGF0aWMgSUVjbGlwc2VQcmVmZXJlbmNlcyBnZXRQcmVmZXJlbmNlcyhJUHJvamVjdCBwcm9qZWN0KXsKKwkJSVNjb3BlQ29udGV4dCBwcm9qZWN0Q29udGV4dCA9IG5ldyBQcm9qZWN0U2NvcGUocHJvamVjdCk7CisJCXJldHVybiBwcm9qZWN0Q29udGV4dC5nZXROb2RlKFBMVUdJTl9JRCk7CisJfQorCQogCS8qKgogCSAqIFdyaXRlIHRoaXMgZXhjZXB0aW9uIHRvIHRoZSBsb2cuCiAJICogPHA+CkBAIC0xMzAsOCArMTM5LDIxIEBACiAJICogQHBhcmFtIGUgdGhlIHRocm93YWJsZSwgdGhpcyBjYW4gYmUgbnVsbCBpbiB3aGljaCBjYXNlIGl0IGlzIGEgbm9wLgogCSAqLwogCXB1YmxpYyB2b2lkIGhhbmRsZUV4Y2VwdGlvbihUaHJvd2FibGUgZSl7CisJCWhhbmRsZUV4Y2VwdGlvbihlLCBJU3RhdHVzLkVSUk9SKTsKKwl9CisJCisJLyoqCisJICogV3JpdGUgdGhpcyBleGNlcHRpb24gdG8gdGhlIGxvZy4KKwkgKiA8cD4KKwkgKiBXZSBhcmUgaW4gdGhlIHRyYW5zaXRpb24gb2YgbW92aW5nIHRvIGEgbmV3IGFwcHJvYWNoIGZvciBsb2NhbGl6ZWQgbWVzc2FnZXMuIFRoaXMgaXMgdGhlIG5ldyAKKwkgKiBhcHByb2FjaCBmb3IgZXhjZXB0aW9ucy4KKwkgKiAKKwkgKiBAcGFyYW0gZSB0aGUgdGhyb3dhYmxlLCB0aGlzIGNhbiBiZSBudWxsIGluIHdoaWNoIGNhc2UgaXQgaXMgYSBub3AuCisJICogQHBhcmFtIHNldmVyaXR5IHRoZSBzZXZlcml0eSBvZiB0aGUgbWVzc2FnZS4gVGhpcyBtdXN0IGJlIG9uZSBvZiB0aGUgSVN0YXR1cyBzZXZlcml0aWVzLiAKKwkgKi8KKwlwdWJsaWMgdm9pZCBoYW5kbGVFeGNlcHRpb24oVGhyb3dhYmxlIGUsIGludCBzZXZlcml0eSl7CiAJCWlmIChlID09IG51bGwpcmV0dXJuOwotCQlTdGF0dXMgc3RhdHVzID0gbmV3IFN0YXR1cyhJU3RhdHVzLkVSUk9SLCBQTFVHSU5fSUQsIGUuZ2V0TG9jYWxpemVkTWVzc2FnZSgpLCBlKTsKKwkJU3RhdHVzIHN0YXR1cyA9IG5ldyBTdGF0dXMoc2V2ZXJpdHksIFBMVUdJTl9JRCwgZS5nZXRMb2NhbGl6ZWRNZXNzYWdlKCksIGUpOwogCQlnZXRMb2coKS5sb2coc3RhdHVzKTsKIAl9CiAJCmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uL3ZhbGlkYXRlX2NvcmUvb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vaW50ZXJuYWwvY29yZS9WYWxpZGF0b3JMYXVuY2hlci5qYXZhIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi92YWxpZGF0ZV9jb3JlL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL2ludGVybmFsL2NvcmUvVmFsaWRhdG9yTGF1bmNoZXIuamF2YQppbmRleCBmMDUzNDEwLi40MGNhODljIDEwMDY0NAotLS0gYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uL3ZhbGlkYXRlX2NvcmUvb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vaW50ZXJuYWwvY29yZS9WYWxpZGF0b3JMYXVuY2hlci5qYXZhCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24vdmFsaWRhdGVfY29yZS9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9pbnRlcm5hbC9jb3JlL1ZhbGlkYXRvckxhdW5jaGVyLmphdmEKQEAgLTEwLDcgKzEwLDYgQEAKICAqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqLwogcGFja2FnZSBvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5pbnRlcm5hbC5jb3JlOwogCi1pbXBvcnQgamF2YS51dGlsLkl0ZXJhdG9yOwogaW1wb3J0IGphdmEudXRpbC5MaXN0OwogCiBpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5ydW50aW1lLkNvcmVFeGNlcHRpb247CkBAIC04MywxMyArODIsMTEgQEAKIAkJCS8vdGhlICB2YWxpZGF0b3JzIHdobyBoYXZlIGltcGxlbWVudGVkIElWYWxpZGF0b3JKb2IgYnV0IGFyZSBydW5uaW5nIHN5bmNocm9ub3VzbHkKIAkJCS8vd291bGQgbG9nIG1lc3NhZ2VzIG5vdyAuLi4KIAkJCVZhbGlkYXRvck1hbmFnZXIgbWdyID0gVmFsaWRhdG9yTWFuYWdlci5nZXRNYW5hZ2VyKCk7Ci0JCQlmaW5hbCBMaXN0IGxpc3QgPSBtZ3IuZ2V0TWVzc2FnZXMoKElWYWxpZGF0b3JKb2IpdmFsaWRhdG9yKTsKKwkJCWZpbmFsIExpc3Q8TWVzc2FnZUluZm8+IGxpc3QgPSBtZ3IuZ2V0TWVzc2FnZXMoKElWYWxpZGF0b3JKb2IpdmFsaWRhdG9yKTsKIAotCSAgICAJSXRlcmF0b3IgaXQgPSBsaXN0Lml0ZXJhdG9yKCk7Ci0JCQl3aGlsZSggaXQuaGFzTmV4dCgpICl7Ci0JCQkJTWVzc2FnZUluZm8gaW5mbyA9IChNZXNzYWdlSW5mbylpdC5uZXh0KCk7CisJCQlmb3IoTWVzc2FnZUluZm8gaW5mbyA6IGxpc3QpewogCQkJCXRyeSB7Ci0JCQkJVGFza0xpc3RVdGlsaXR5LmFkZFRhc2soIGluZm8uZ2V0TWVzc2FnZU93bmVySWQoKSwgaW5mby5nZXRSZXNvdXJjZSgpLAorCQkJCQlUYXNrTGlzdFV0aWxpdHkuYWRkVGFzayggaW5mby5nZXRNZXNzYWdlT3duZXJJZCgpLCBpbmZvLmdldFJlc291cmNlKCksCiAJCQkJCQkJaW5mby5nZXRMb2NhdGlvbigpLCBpbmZvLmdldE1zZygpLmdldElkKCksIGluZm8uZ2V0VGV4dCgpLAogCQkJCQkJCWluZm8uZ2V0TXNnKCkuZ2V0U2V2ZXJpdHkoKSwgaW5mby5nZXRNYXJrZXJJZCgpLCAKIAkJCQkJCQlpbmZvLmdldFRhcmdldE9iamVjdE5hbWUoKSwKZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24vdmFsaWRhdGVfY29yZS9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9pbnRlcm5hbC9wcm92aXNpb25hbC9jb3JlL0lWYWxpZGF0b3JFeHRlbmRlci5qYXZhIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi92YWxpZGF0ZV9jb3JlL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL2ludGVybmFsL3Byb3Zpc2lvbmFsL2NvcmUvSVZhbGlkYXRvckV4dGVuZGVyLmphdmEKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uNTgxYTZiMAotLS0gL2Rldi9udWxsCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24vdmFsaWRhdGVfY29yZS9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9pbnRlcm5hbC9wcm92aXNpb25hbC9jb3JlL0lWYWxpZGF0b3JFeHRlbmRlci5qYXZhCkBAIC0wLDAgKzEsMTEgQEAKK3BhY2thZ2Ugb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uaW50ZXJuYWwucHJvdmlzaW9uYWwuY29yZTsKKworaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucmVzb3VyY2VzLklQcm9qZWN0OworaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucnVudGltZS5JUHJvZ3Jlc3NNb25pdG9yOworaW1wb3J0IG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLlZhbGlkYXRpb25TdGF0ZTsKKworcHVibGljIGludGVyZmFjZSBJVmFsaWRhdG9yRXh0ZW5kZXIgeworCisJdm9pZCB2YWxpZGF0aW9uRmluaXNoaW5nKElQcm9qZWN0IHByb2plY3QsIFZhbGlkYXRpb25TdGF0ZSBzdGF0ZSwgSVByb2dyZXNzTW9uaXRvciBtb25pdG9yKTsKKworfQpkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi92ZjIvb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vQWJzdHJhY3RWYWxpZGF0b3IuamF2YSBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24vdmYyL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL0Fic3RyYWN0VmFsaWRhdG9yLmphdmEKaW5kZXggM2Q4ODRkOS4uODNjMWQ1NSAxMDA2NDQKLS0tIGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi92ZjIvb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vQWJzdHJhY3RWYWxpZGF0b3IuamF2YQorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uL3ZmMi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9BYnN0cmFjdFZhbGlkYXRvci5qYXZhCkBAIC0zMiw4ICszMiwxMCBAQAogCQogCS8qKgogCSAqIFZhbGlkYXRlIHRoZSByZXNvdXJjZS4gVGhlIHZhbGlkYXRvciBpcyBjYWxsZWQgZnJvbSBhIFdvcmtzcGFjZUpvYiwgc28KLQkgKiB0aGUgdmFsaWRhdG9yIGl0c2VsZiBkb2VzIG5vdCBuZWVkIHRvIGVzdGFibGlzaCBpdCdzIG93bgotCSAqIElXb3Jrc3BhY2VSdW5uYWJsZS4KKwkgKiB0aGUgdmFsaWRhdG9yIGl0c2VsZiBkb2VzIG5vdCBuZWVkIHRvIGVzdGFibGlzaCBpdCdzIG93biBJV29ya3NwYWNlUnVubmFibGUuCisJICogPHA+CisJICogSWYgeW91IG92ZXJyaWRlIHRoaXMgbWV0aG9kIHRoZW4geW91IHNob3VsZCBub3Qgb3ZlcnJpZGUgdGhlIG90aGVyIHZhbGlkYXRlIG1ldGhvZC4KKwkgKiA8L3A+CiAJICogCiAJICogQHBhcmFtIHJlc291cmNlCiAJICogCQlUaGUgcmVzb3VyY2UgdG8gYmUgdmFsaWRhdGVkLgpAQCAtNTYsNyArNTgsNDMgQEAKIAkgKiAKIAkgKiBAcmV0dXJuIHRoZSByZXN1bHQgb2YgdGhlIHZhbGlkYXRpb24uIFRoaXMgbWF5IGJlLCBidXQgdXN1YWxseSBpc24ndCwgbnVsbC4KIAkgKi8KLQlwdWJsaWMgYWJzdHJhY3QgVmFsaWRhdGlvblJlc3VsdCB2YWxpZGF0ZShJUmVzb3VyY2UgcmVzb3VyY2UsIGludCBraW5kLCBWYWxpZGF0aW9uU3RhdGUgc3RhdGUsIElQcm9ncmVzc01vbml0b3IgbW9uaXRvcik7CisJcHVibGljIFZhbGlkYXRpb25SZXN1bHQgdmFsaWRhdGUoSVJlc291cmNlIHJlc291cmNlLCBpbnQga2luZCwgVmFsaWRhdGlvblN0YXRlIHN0YXRlLCBJUHJvZ3Jlc3NNb25pdG9yIG1vbml0b3IpeworCQlyZXR1cm4gbnVsbDsKKwl9CisJCisJLyoqCisJICogVmFsaWRhdGUgdGhlIHJlc291cmNlLiBUaGUgdmFsaWRhdG9yIGlzIGNhbGxlZCBmcm9tIGEgV29ya3NwYWNlSm9iLCBzbworCSAqIHRoZSB2YWxpZGF0b3IgaXRzZWxmIGRvZXMgbm90IG5lZWQgdG8gZXN0YWJsaXNoIGl0J3Mgb3duCisJICogSVdvcmtzcGFjZVJ1bm5hYmxlLgorCSAqIDxwPgorCSAqIElmIHlvdSBvdmVycmlkZSB0aGlzIG1ldGhvZCB0aGVuIHlvdSBzaG91bGQgbm90IG92ZXJyaWRlIHRoZSBvdGhlcgorCSAqIHZhbGlkYXRlIG1ldGhvZC4KKwkgKiA8L3A+CisJICogCisJICogQHBhcmFtIGV2ZW50CisJICogICAgICAgICAgICBBbiBvYmplY3QgdGhhdCBkZXNjcmliZXMgdGhlIHJlc291cmNlIHRvIGJlIHZhbGlkYXRlZCBhbmQgd2h5CisJICogICAgICAgICAgICBpdCBzaG91bGQgYmUgdmFsaWRhdGVkLgorCSAqIAorCSAqIEBwYXJhbSBzdGF0ZQorCSAqICAgICAgICAgICAgQSB3YXkgdG8gcGFzcyBhcmJpdHJhcnksIHZhbGlkYXRvciBzcGVjaWZpYywgZGF0YSBmcm9tIG9uZQorCSAqICAgICAgICAgICAgaW52b2NhdGlvbiBvZiBhIHZhbGlkYXRvciB0byB0aGUgbmV4dCwgZHVyaW5nIHRoZSB2YWxpZGF0aW9uCisJICogICAgICAgICAgICBwaGFzZS4gQXQgdGhlIGVuZCBvZiB0aGUgdmFsaWRhdGlvbiBwaGFzZSwgdGhpcyBvYmplY3Qgd2lsbCBiZQorCSAqICAgICAgICAgICAgY2xlYXJlZCwgdGhlcmVieSBhbGxvd2luZyBhbnkgb2YgdGhpcyBzdGF0ZSBpbmZvcm1hdGlvbiB0byBiZQorCSAqICAgICAgICAgICAgZ2FyYmFnZWQgY29sbGVjdGVkLgorCSAqIAorCSAqIEBwYXJhbSBtb25pdG9yCisJICogICAgICAgICAgICBBIG1vbml0b3IgdGhhdCB5b3UgY2FuIHVzZSB0byByZXBvcnQgeW91ciBwcm9ncmVzcy4gVG8gYmUgYQorCSAqICAgICAgICAgICAgd2VsbCBiZWhhdmVkIHZhbGlkYXRvciB5b3UgbmVlZCB0byBjaGVjayB0aGUgaXNDYW5jZWxsZWQoKQorCSAqICAgICAgICAgICAgbWV0aG9kIGF0IGFwcHJvcHJpYXRlIHRpbWVzLgorCSAqIAorCSAqIEByZXR1cm4gdGhlIHJlc3VsdCBvZiB0aGUgdmFsaWRhdGlvbi4gTnVsbCBzaG91bGQgbmV2ZXIgYmUgcmV0dXJuZWQuIElmCisJICogICAgICAgICBudWxsIGlzIHJldHVybmVkIHRoZW4gdGhlIG90aGVyIHZhbGlkYXRlIG1ldGhvZCB3aWxsIGJlIGNhbGxlZCBhcworCSAqICAgICAgICAgd2VsbC4KKwkgKi8KKwlwdWJsaWMgVmFsaWRhdGlvblJlc3VsdCB2YWxpZGF0ZShWYWxpZGF0aW9uRXZlbnQgZXZlbnQsIFZhbGlkYXRpb25TdGF0ZSBzdGF0ZSwgSVByb2dyZXNzTW9uaXRvciBtb25pdG9yKXsKKwkJcmV0dXJuIG51bGw7CisJfQorCQogCQogCS8qKgogCSAqIEEgY2FsbCBiYWNrIG1ldGhvZCB0aGF0IGxldHMgdGhlIHZhbGlkYXRvciBrbm93IHRoYXQgdGhlIHByb2plY3QgaXMgYmVpbmcKQEAgLTEyMiw2ICsxNjAsMjMgQEAKIAkgKi8KIAlwdWJsaWMgdm9pZCB2YWxpZGF0aW9uRmluaXNoaW5nKElQcm9qZWN0IHByb2plY3QsIFZhbGlkYXRpb25TdGF0ZSBzdGF0ZSwgSVByb2dyZXNzTW9uaXRvciBtb25pdG9yKXsJCQogCX0KKwkKKwkvKioKKwkgKiBTaG91bGQgdGhlIHZhbGlkYXRpb24gZnJhbWV3b3JrIGZpcnN0IGNsZWFyIHRoZSBtYXJrZXJzIHRoYXQgdGhpcworCSAqIHZhbGlkYXRvciBoYXMgcGxhY2VkIG9uIHRoaXMgcmVzb3VyY2U/IFRoaXMgbWV0aG9kIGNhbiBiZSBvdmVycmlkZGVuIGJ5CisJICogdmFsaWRhdG9yIGltcGxlbWVudG9ycyB0byBwcm92aWRlIGEgdmFsaWRhdG9yIHNwZWNpZmljIGJlaGF2aW9yLgorCSAqIAorCSAqIEBwYXJhbSBldmVudAorCSAqICAgICAgICAgICAgVGhlIHZhbGlkYXRpb24gZXZlbnQgdGhhdCB0cmlnZ2VyZWQgdGhlIHZhbGlkYXRpb24uCisJICogQHJldHVybiB0cnVlIGlmIHRoZSB2YWxpZGF0aW9uIGZyYW1ld29yayBzaG91bGQgZmlyc3QgY2xlYXIgYWxsIHRoZQorCSAqICAgICAgICAgbWFya2VycyB0aGF0IHRoaXMgdmFsaWRhdG9yIHByb2R1Y2VkLiBUaGlzIGlzIHRoZSBkZWZhdWx0CisJICogICAgICAgICBiZWhhdmlvci4gUmV0dXJuIGZhbHNlIHRvIGxlYXZlIHRoZSBtYXJrZXJzIHVuY2hhbmdlZC4gSXQgdGhlbgorCSAqICAgICAgICAgYmVjb21lcyB0aGUgcmVzcG9uc2liaWxpdHkgb2YgdGhlIHZhbGlkYXRvciB0byBtYW5hZ2UgaXQncyBvd24KKwkgKiAgICAgICAgIG1hcmtlcnMgZm9yIHRoaXMgcmVzb3VyY2UsIGZvciB0aGlzIHZhbGlkYXRpb24gZXZlbnQuCisJICovCisJcHVibGljIGJvb2xlYW4gc2hvdWxkQ2xlYXJNYXJrZXJzKFZhbGlkYXRpb25FdmVudCBldmVudCl7CisJCXJldHVybiB0cnVlOworCX0KIAkJCiAJLyoqCiAJICogQW5zd2VyIHRoZSB2YWxpZGF0b3IgdGhhdCB5b3UgYmVsb25nIHRvLiBUaGUgdmFsaWRhdG9yIGNvbnRyb2xzIHRoZQpkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi92ZjIvb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vRnJpZW5kLmphdmEgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uL3ZmMi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9GcmllbmQuamF2YQppbmRleCA1NGY4NGQ3Li40MTQ2NjM2IDEwMDY0NAotLS0gYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uL3ZmMi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9GcmllbmQuamF2YQorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uL3ZmMi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9GcmllbmQuamF2YQpAQCAtNDcsOCArNDcsMTEgQEAKIAlwdWJsaWMgc3RhdGljIGJvb2xlYW4gc2hvdWxkVmFsaWRhdGUoVmFsaWRhdG9yIHZhbGlkYXRvciwgSVJlc291cmNlIHJlc291cmNlLCBWYWxUeXBlIHZhbFR5cGUsIAogCQlDb250ZW50VHlwZVdyYXBwZXIgY29udGVudFR5cGVXcmFwcGVyKXsKIAkJCi0JCXJldHVybiB2YWxpZGF0b3Iuc2hvdWxkVmFsaWRhdGUocmVzb3VyY2UsIHZhbFR5cGUsIGNvbnRlbnRUeXBlV3JhcHBlcik7Ci0JCQorCQlyZXR1cm4gdmFsaWRhdG9yLnNob3VsZFZhbGlkYXRlKHJlc291cmNlLCB2YWxUeXBlLCBjb250ZW50VHlwZVdyYXBwZXIpOwkJCisJfQorCQorCXB1YmxpYyBzdGF0aWMgdm9pZCBzZXRNaWdyYXRlZChWYWxpZGF0b3IgdmFsaWRhdG9yLCBib29sZWFuIG1pZ3JhdGVkKXsKKwkJdmFsaWRhdG9yLnNldE1pZ3JhdGVkKG1pZ3JhdGVkKTsKIAl9CiAKIH0KZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24vdmYyL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL0lNdXRhYmxlVmFsaWRhdG9yLmphdmEgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uL3ZmMi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9JTXV0YWJsZVZhbGlkYXRvci5qYXZhCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLmJiYjY2MjcKLS0tIC9kZXYvbnVsbAorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uL3ZmMi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9JTXV0YWJsZVZhbGlkYXRvci5qYXZhCkBAIC0wLDAgKzEsNzcgQEAKKy8qKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqCisgKiBDb3B5cmlnaHQgKGMpIDIwMDkgSUJNIENvcnBvcmF0aW9uIGFuZCBvdGhlcnMuCisgKiBBbGwgcmlnaHRzIHJlc2VydmVkLiBUaGlzIHByb2dyYW0gYW5kIHRoZSBhY2NvbXBhbnlpbmcgbWF0ZXJpYWxzCisgKiBhcmUgbWFkZSBhdmFpbGFibGUgdW5kZXIgdGhlIHRlcm1zIG9mIHRoZSBFY2xpcHNlIFB1YmxpYyBMaWNlbnNlIHYxLjAKKyAqIHdoaWNoIGFjY29tcGFuaWVzIHRoaXMgZGlzdHJpYnV0aW9uLCBhbmQgaXMgYXZhaWxhYmxlIGF0CisgKiBodHRwOi8vd3d3LmVjbGlwc2Uub3JnL2xlZ2FsL2VwbC12MTAuaHRtbAorICoKKyAqIENvbnRyaWJ1dG9yczoKKyAqICAgICBJQk0gQ29ycG9yYXRpb24gLSBpbml0aWFsIEFQSSBhbmQgaW1wbGVtZW50YXRpb24KKyAqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqLworcGFja2FnZSBvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbjsKKworLyoqCisgKiBBIHZhbGlkYXRvciB0aGF0IGhhcyBmaWVsZHMgdGhhdCBjYW4gYmUgdXBkYXRlZC4KKyAqIDxwPgorICogVGhlIGZvbGxvd2luZyBwcm9jZWR1cmUgaXMgdXNlZCB0byBjaGFuZ2UgYSBWYWxpZGF0b3IncyBzZXR0aW5ncy4KKyAqIDxvbD4KKyAqIDxsaT5BbiBJTXV0YWJsZVZhbGlkYXRvciBpcyByZXRyaWV2ZWQuPC9saT4KKyAqIDxsaT5UaGUgSU11dGFibGVWYWxpZGF0b3IgaXMgY2hhbmdlZC48L2xpPgorICogPGxpPlRoZSBJTXV0YWJsZVZhbGlkYXRvciBpcyAiYWN0aXZhdGVkIi48L2xpPgorICogPC9vbD4KKyAqIDwvcD4KKyAqIDxwPlRoZSBtZXRob2RzIHtAbGluayBWYWxpZGF0aW9uRnJhbWV3b3JrI2dldFByb2plY3RTZXR0aW5ncyhvcmcuZWNsaXBzZS5jb3JlLnJlc291cmNlcy5JUHJvamVjdCl9IGFuZCAKKyAqIHtAbGluayBWYWxpZGF0aW9uRnJhbWV3b3JrI2dldFdvcmtzcGFjZVNldHRpbmdzKCl9IGNhbiBiZSB1c2VkIHRvIHJldHJpZXZlIElNdXRhYmxlVmFsaWRhdG9yJ3MuCisgKiA8cD4KKyAqIDxiPlByb3Zpc2lvbmFsIEFQSTo8L2I+IFRoaXMgY2xhc3MvaW50ZXJmYWNlIGlzIHBhcnQgb2YgYW4gaW50ZXJpbSBBUEkgdGhhdCBpcyBzdGlsbCB1bmRlciBkZXZlbG9wbWVudCBhbmQgZXhwZWN0ZWQgdG8gCisgKiBjaGFuZ2Ugc2lnbmlmaWNhbnRseSBiZWZvcmUgcmVhY2hpbmcgc3RhYmlsaXR5LiBJdCBpcyBiZWluZyBtYWRlIGF2YWlsYWJsZSBhdCB0aGlzIGVhcmx5IHN0YWdlIHRvIHNvbGljaXQgZmVlZGJhY2sgCisgKiBmcm9tIHBpb25lZXJpbmcgYWRvcHRlcnMgb24gdGhlIHVuZGVyc3RhbmRpbmcgdGhhdCBhbnkgY29kZSB0aGF0IHVzZXMgdGhpcyBBUEkgd2lsbCBhbG1vc3QgY2VydGFpbmx5IGJlIGJyb2tlbiAKKyAqIChyZXBlYXRlZGx5KSBhcyB0aGUgQVBJIGV2b2x2ZXMuCisgKiA8L3A+CisgKiBAbm9leHRlbmQgVGhpcyBpbnRlcmZhY2UgaXMgbm90IGludGVuZGVkIHRvIGJlIGV4dGVuZGVkIGJ5IGNsaWVudHMuCisgKiBAbm9pbXBsZW1lbnQgVGhpcyBpbnRlcmZhY2UgaXMgbm90IGludGVuZGVkIHRvIGJlIGltcGxlbWVudGVkIGJ5IGNsaWVudHMuCisKKyAqIEBhdXRob3Iga2FyYXNpdWsKKyAqCisgKi8KK3B1YmxpYyBpbnRlcmZhY2UgSU11dGFibGVWYWxpZGF0b3IgeworCQorCS8qKgorCSAqIEFuc3dlciB0aGUgdmFsaWRhdG9yJ3MgaWQuCisJICogQHJldHVybgorCSAqLworCVN0cmluZyBnZXRJZCgpOworCQorCS8qKgorCSAqIEFuc3dlciB0aGUgdmFsaWRhdG9yJ3MgbmFtZS4KKwkgKiBAcmV0dXJuCisJICovCisJU3RyaW5nIGdldE5hbWUoKTsKKwkKKwkvKioKKwkgKiBBbnN3ZXIgdGhlIHZhbGlkYXRvcidzIGNsYXNzIG5hbWUuCisJICogQHJldHVybgorCSAqLworCVN0cmluZyBnZXRWYWxpZGF0b3JDbGFzc25hbWUoKTsKKwkKKwkvKioKKwkgKiBBbnN3ZXIgaWYgdGhlIHZhbGlkYXRvciBpcyBlbmFibGVkIGZvciBidWlsZCBiYXNlZCB2YWxpZGF0aW9uLgorCSAqLworCWJvb2xlYW4gaXNCdWlsZFZhbGlkYXRpb24oKTsKKwkKKwkvKioKKwkgKiBBbnN3ZXIgaWYgdGhlIHZhbGlkYXRvciBpcyBlbmFibGVkIGZvciBtYW51YWwgYmFzZWQgdmFsaWRhdGlvbi4KKwkgKi8KKwlib29sZWFuIGlzTWFudWFsVmFsaWRhdGlvbigpOworCQorCS8qKgorCSAqIFNldCB3aGV0aGVyIHRoZSB2YWxpZGF0b3Igc2hvdWxkIGJlIGVuYWJsZWQgZm9yIGJ1aWxkIGJhc2VkIHZhbGlkYXRpb24uCisJICovCisJdm9pZCBzZXRCdWlsZFZhbGlkYXRpb24oYm9vbGVhbiBidWlsZCk7CisJCisJLyoqCisJICogU2V0IHdoZXRoZXIgdGhlIHZhbGlkYXRvciBzaG91bGQgYmUgZW5hYmxlZCBmb3IgbWFudWFsIGJhc2VkIHZhbGlkYXRpb24uCisJICovCQorCXZvaWQgc2V0TWFudWFsVmFsaWRhdGlvbihib29sZWFuIG1hbnVhbCk7CisKK30KZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24vdmYyL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL0lQZXJmb3JtYW5jZU1vbml0b3IuamF2YSBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24vdmYyL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL0lQZXJmb3JtYW5jZU1vbml0b3IuamF2YQppbmRleCBmZTdjMTViLi5iOTUxMjcwIDEwMDY0NAotLS0gYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uL3ZmMi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9JUGVyZm9ybWFuY2VNb25pdG9yLmphdmEKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi92ZjIvb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vSVBlcmZvcm1hbmNlTW9uaXRvci5qYXZhCkBAIC0yMCw3ICsyMCw4IEBACiAgKiBmcm9tIHBpb25lZXJpbmcgYWRvcHRlcnMgb24gdGhlIHVuZGVyc3RhbmRpbmcgdGhhdCBhbnkgY29kZSB0aGF0IHVzZXMgdGhpcyBBUEkgd2lsbCBhbG1vc3QgY2VydGFpbmx5IGJlIGJyb2tlbiAKICAqIChyZXBlYXRlZGx5KSBhcyB0aGUgQVBJIGV2b2x2ZXMuCiAgKiA8L3A+Ci0gKiBAbm9pbXBsZW1lbnQKKyAqIEBub2V4dGVuZCBUaGlzIGludGVyZmFjZSBpcyBub3QgaW50ZW5kZWQgdG8gYmUgZXh0ZW5kZWQgYnkgY2xpZW50cy4KKyAqIEBub2ltcGxlbWVudCBUaGlzIGludGVyZmFjZSBpcyBub3QgaW50ZW5kZWQgdG8gYmUgaW1wbGVtZW50ZWQgYnkgY2xpZW50cy4KICAqIEBhdXRob3Iga2FyYXNpdWsKICAqCiAgKi8KZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24vdmYyL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL011dGFibGVQcm9qZWN0U2V0dGluZ3MuamF2YSBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24vdmYyL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL011dGFibGVQcm9qZWN0U2V0dGluZ3MuamF2YQpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi43M2JmMjFjCi0tLSAvZGV2L251bGwKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi92ZjIvb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vTXV0YWJsZVByb2plY3RTZXR0aW5ncy5qYXZhCkBAIC0wLDAgKzEsOTYgQEAKKy8qKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqCisgKiBDb3B5cmlnaHQgKGMpIDIwMDkgSUJNIENvcnBvcmF0aW9uIGFuZCBvdGhlcnMuCisgKiBBbGwgcmlnaHRzIHJlc2VydmVkLiBUaGlzIHByb2dyYW0gYW5kIHRoZSBhY2NvbXBhbnlpbmcgbWF0ZXJpYWxzCisgKiBhcmUgbWFkZSBhdmFpbGFibGUgdW5kZXIgdGhlIHRlcm1zIG9mIHRoZSBFY2xpcHNlIFB1YmxpYyBMaWNlbnNlIHYxLjAKKyAqIHdoaWNoIGFjY29tcGFuaWVzIHRoaXMgZGlzdHJpYnV0aW9uLCBhbmQgaXMgYXZhaWxhYmxlIGF0CisgKiBodHRwOi8vd3d3LmVjbGlwc2Uub3JnL2xlZ2FsL2VwbC12MTAuaHRtbAorICoKKyAqIENvbnRyaWJ1dG9yczoKKyAqICAgICBJQk0gQ29ycG9yYXRpb24gLSBpbml0aWFsIEFQSSBhbmQgaW1wbGVtZW50YXRpb24KKyAqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqLworcGFja2FnZSBvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbjsKKworaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucmVzb3VyY2VzLklQcm9qZWN0OworCisvKioKKyAqIFRoaXMgY2xhc3MgaG9sZHMgdGhlIG92ZXJhbGwgcHJvamVjdCB2YWxpZGF0aW9uIHNldHRpbmdzLgorICogPHA+CisgKiBUaGUgZm9sbG93aW5nIHByb2NlZHVyZSBpcyB1c2VkIHRvIGNoYW5nZSBhIHByb2plY3QncyBWYWxpZGF0aW9uIHNldHRpbmdzLgorICogPG9sPgorICogPGxpPlRoZSBNdXRhYmxlUHJvamVjdFNldHRpbmdzIGFyZSByZXRyaWV2ZWQuPC9saT4KKyAqIDxsaT5UaGUgTXV0YWJsZVByb2plY3RTZXR0aW5ncyBhcmUgY2hhbmdlZC48L2xpPgorICogPGxpPlRoZSBNdXRhYmxlUHJvamVjdFNldHRpbmdzIGFyZSAiYXBwbGllZCIuPC9saT4KKyAqIDwvb2w+CisgKiA8L3A+CisgKiA8cD5JbiBvcmRlciBmb3IgYSBwcm9qZWN0J3MgdmFsaWRhdGlvbiBzZXR0aW5nIHRvIGJlIGVmZmVjdGl2ZSwgYm90aCAKKyAqIHtAbGluayAjZ2V0T3ZlcnJpZGUoKX0gYW5kIHtAbGluayBNdXRhYmxlV29ya3NwYWNlU2V0dGluZ3MjZ2V0T3ZlcnJpZGUoKX0KKyAqIG11c3QgYmUgdHJ1ZS4KKyAqIDwvcD4KKyAqIDxwPgorICogVGhlc2Ugc2V0dGluZ3MgY2FuIGJlIHJldHJpZXZlZCB3aXRoIHtAbGluayBWYWxpZGF0aW9uRnJhbWV3b3JrI2dldFByb2plY3RTZXR0aW5ncyhJUHJvamVjdCl9LgorICogPC9wPgorICogPHA+CisgKiA8Yj5Qcm92aXNpb25hbCBBUEk6PC9iPiBUaGlzIGNsYXNzL2ludGVyZmFjZSBpcyBwYXJ0IG9mIGFuIGludGVyaW0gQVBJIHRoYXQgaXMgc3RpbGwgdW5kZXIgZGV2ZWxvcG1lbnQgYW5kIGV4cGVjdGVkIHRvIAorICogY2hhbmdlIHNpZ25pZmljYW50bHkgYmVmb3JlIHJlYWNoaW5nIHN0YWJpbGl0eS4gSXQgaXMgYmVpbmcgbWFkZSBhdmFpbGFibGUgYXQgdGhpcyBlYXJseSBzdGFnZSB0byBzb2xpY2l0IGZlZWRiYWNrIAorICogZnJvbSBwaW9uZWVyaW5nIGFkb3B0ZXJzIG9uIHRoZSB1bmRlcnN0YW5kaW5nIHRoYXQgYW55IGNvZGUgdGhhdCB1c2VzIHRoaXMgQVBJIHdpbGwgYWxtb3N0IGNlcnRhaW5seSBiZSBicm9rZW4gCisgKiAocmVwZWF0ZWRseSkgYXMgdGhlIEFQSSBldm9sdmVzLgorICogPC9wPgorCisgKiBAYXV0aG9yIGthcmFzaXVrCisgKgorICovCitwdWJsaWMgZmluYWwgY2xhc3MgTXV0YWJsZVByb2plY3RTZXR0aW5ncyB7CisJcHJpdmF0ZSBmaW5hbCBJUHJvamVjdAlfcHJvamVjdDsKKworCXByaXZhdGUgYm9vbGVhbiBfb3ZlcnJpZGU7CisJcHJpdmF0ZSBib29sZWFuCV9zdXNwZW5kOworCXByaXZhdGUgZmluYWwgSU11dGFibGVWYWxpZGF0b3JbXSBfdmFsaWRhdG9yczsKKwkKKwlwdWJsaWMgSU11dGFibGVWYWxpZGF0b3JbXSBnZXRWYWxpZGF0b3JzKCkgeworCQlyZXR1cm4gX3ZhbGlkYXRvcnM7CisJfQorCisJcHVibGljIE11dGFibGVQcm9qZWN0U2V0dGluZ3MoSVByb2plY3QgcHJvamVjdCwgSU11dGFibGVWYWxpZGF0b3JbXSB2YWxpZGF0b3JzKXsKKwkJX3Byb2plY3QgPSBwcm9qZWN0OworCQlfdmFsaWRhdG9ycyA9IHZhbGlkYXRvcnM7CisJfQorCisJLyoqCisJICogQ2FuIHRoaXMgcHJvamVjdCBvdmVycmlkZSB0aGUgd29ya3NwYWNlIGxldmVsIHZhbGlkYXRpb24gc2V0dGluZ3M/CisJICovCisJcHVibGljIGJvb2xlYW4gZ2V0T3ZlcnJpZGUoKSB7CisJCXJldHVybiBfb3ZlcnJpZGU7CisJfQorCisJLyoqCisJICogQ2hhbmdlIHdoZXRoZXIgdGhpcyBwcm9qZWN0IGNhbiBvdmVycmlkZSB3b3Jrc3BhY2UgbGV2ZWwgdmFsaWRhdGlvbiBzZXR0aW5ncy4KKwkgKiBAcGFyYW0gb3ZlcnJpZGUgU2V0IHRvIHRydWUgaWYgdGhlIHByb2plY3QgaXMgYWxsb3dlZCB0byBvdmVycmlkZSB3b3Jrc3BhY2UgbGV2ZWwgdmFsaWRhdGlvbiBzZXR0aW5ncy4KKwkgKi8KKwlwdWJsaWMgdm9pZCBzZXRPdmVycmlkZShib29sZWFuIG92ZXJyaWRlKSB7CisJCV9vdmVycmlkZSA9IG92ZXJyaWRlOworCX0KKworCS8qKgorCSAqIElzIHZhbGlkYXRpb24gc3VzcGVuZGVkIGZvciB0aGlzIHByb2plY3Q/CisJICovCisJcHVibGljIGJvb2xlYW4gZ2V0U3VzcGVuZCgpIHsKKwkJcmV0dXJuIF9zdXNwZW5kOworCX0KKworCS8qKgorCSAqIENoYW5nZSB3aGV0aGVyIHRoaXMgcHJvamVjdCBpcyBzdXNwZW5kaW5nIGl0J3MgdmFsaWRhdGlvbi4KKwkgKiBAcGFyYW0gc3VzcGVuZCBTZXQgdG8gdHJ1ZSwgdG8gc3VzcGVuZCB2YWxpZGF0aW9uIGZvciB0aGlzIHByb2plY3QuCisJICovCisJcHVibGljIHZvaWQgc2V0U3VzcGVuZChib29sZWFuIHN1c3BlbmQpIHsKKwkJX3N1c3BlbmQgPSBzdXNwZW5kOworCX0KKworCS8qKgorCSAqIEFuc3dlciB0aGUgcHJvamVjdCB0aGF0IHRoZXNlIHNldHRpbmdzIGFyZSBmb3IuCisJICovCisJcHVibGljIElQcm9qZWN0IGdldFByb2plY3QoKSB7CisJCXJldHVybiBfcHJvamVjdDsKKwl9CisKKworfQpkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi92ZjIvb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vTXV0YWJsZVdvcmtzcGFjZVNldHRpbmdzLmphdmEgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uL3ZmMi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9NdXRhYmxlV29ya3NwYWNlU2V0dGluZ3MuamF2YQpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi44MGQxOGYxCi0tLSAvZGV2L251bGwKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi92ZjIvb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vTXV0YWJsZVdvcmtzcGFjZVNldHRpbmdzLmphdmEKQEAgLTAsMCArMSw5NiBAQAorLyoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioKKyAqIENvcHlyaWdodCAoYykgMjAwOSBJQk0gQ29ycG9yYXRpb24gYW5kIG90aGVycy4KKyAqIEFsbCByaWdodHMgcmVzZXJ2ZWQuIFRoaXMgcHJvZ3JhbSBhbmQgdGhlIGFjY29tcGFueWluZyBtYXRlcmlhbHMKKyAqIGFyZSBtYWRlIGF2YWlsYWJsZSB1bmRlciB0aGUgdGVybXMgb2YgdGhlIEVjbGlwc2UgUHVibGljIExpY2Vuc2UgdjEuMAorICogd2hpY2ggYWNjb21wYW5pZXMgdGhpcyBkaXN0cmlidXRpb24sIGFuZCBpcyBhdmFpbGFibGUgYXQKKyAqIGh0dHA6Ly93d3cuZWNsaXBzZS5vcmcvbGVnYWwvZXBsLXYxMC5odG1sCisgKgorICogQ29udHJpYnV0b3JzOgorICogICAgIElCTSBDb3Jwb3JhdGlvbiAtIGluaXRpYWwgQVBJIGFuZCBpbXBsZW1lbnRhdGlvbgorICoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKiovCitwYWNrYWdlIG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uOworCitpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uaW50ZXJuYWwubW9kZWwuR2xvYmFsUHJlZmVyZW5jZXNWYWx1ZXM7CisKKworLyoqCisgKiBUaGlzIGNsYXNzIGhvbGRzIHRoZSBvdmVyYWxsIHdvcmtzcGFjZSB2YWxpZGF0aW9uIHNldHRpbmdzLgorICogPHA+CisgKiBUaGUgZm9sbG93aW5nIHByb2NlZHVyZSBpcyB1c2VkIHRvIGNoYW5nZSBhIHByb2plY3QncyBWYWxpZGF0aW9uIHNldHRpbmdzLgorICogPG9sPgorICogPGxpPlRoZSBNdXRhYmxlV29ya3NwYWNlU2V0dGluZ3MgYXJlIHJldHJpZXZlZC48L2xpPgorICogPGxpPlRoZSBNdXRhYmxlV29ya3NwYWNlU2V0dGluZ3MgYXJlIGNoYW5nZWQuPC9saT4KKyAqIDxsaT5UaGUgTXV0YWJsZVdvcmtzcGFjZVNldHRpbmdzIGFyZSAiYXBwbGllZCIuPC9saT4KKyAqIDwvb2w+CisgKiA8L3A+CisgKiA8cD4KKyAqIFRoZXNlIHNldHRpbmdzIGNhbiBiZSByZXRyaWV2ZWQgd2l0aCB7QGxpbmsgVmFsaWRhdGlvbkZyYW1ld29yayNnZXRXb3Jrc3BhY2VTZXR0aW5ncygpfS4KKyAqIDwvcD4KKyAqIDxwPgorICogPGI+UHJvdmlzaW9uYWwgQVBJOjwvYj4gVGhpcyBjbGFzcy9pbnRlcmZhY2UgaXMgcGFydCBvZiBhbiBpbnRlcmltIEFQSSB0aGF0IGlzIHN0aWxsIHVuZGVyIGRldmVsb3BtZW50IGFuZCBleHBlY3RlZCB0byAKKyAqIGNoYW5nZSBzaWduaWZpY2FudGx5IGJlZm9yZSByZWFjaGluZyBzdGFiaWxpdHkuIEl0IGlzIGJlaW5nIG1hZGUgYXZhaWxhYmxlIGF0IHRoaXMgZWFybHkgc3RhZ2UgdG8gc29saWNpdCBmZWVkYmFjayAKKyAqIGZyb20gcGlvbmVlcmluZyBhZG9wdGVycyBvbiB0aGUgdW5kZXJzdGFuZGluZyB0aGF0IGFueSBjb2RlIHRoYXQgdXNlcyB0aGlzIEFQSSB3aWxsIGFsbW9zdCBjZXJ0YWlubHkgYmUgYnJva2VuIAorICogKHJlcGVhdGVkbHkpIGFzIHRoZSBBUEkgZXZvbHZlcy4KKyAqIDwvcD4KKworICogQGF1dGhvciBrYXJhc2l1aworICoKKyAqLworcHVibGljIGZpbmFsIGNsYXNzIE11dGFibGVXb3Jrc3BhY2VTZXR0aW5ncyB7CisKKwlwcml2YXRlIGZpbmFsIEdsb2JhbFByZWZlcmVuY2VzVmFsdWVzIF92YWx1ZXM7CisJCisJcHJpdmF0ZSBmaW5hbCBJTXV0YWJsZVZhbGlkYXRvcltdIF92YWxpZGF0b3JzOworCQorCXB1YmxpYyBJTXV0YWJsZVZhbGlkYXRvcltdIGdldFZhbGlkYXRvcnMoKSB7CisJCXJldHVybiBfdmFsaWRhdG9yczsKKwl9CisKKwlwdWJsaWMgTXV0YWJsZVdvcmtzcGFjZVNldHRpbmdzKElNdXRhYmxlVmFsaWRhdG9yW10gdmFsaWRhdG9ycywgR2xvYmFsUHJlZmVyZW5jZXNWYWx1ZXMgdmFsdWVzKXsKKwkJX3ZhbGlkYXRvcnMgPSB2YWxpZGF0b3JzOworCQlfdmFsdWVzID0gdmFsdWVzOworCX0KKwkKKwlwdWJsaWMgR2xvYmFsUHJlZmVyZW5jZXNWYWx1ZXMgZ2V0R2xvYmFsUHJlZmVyZW5jZXNWYWx1ZXMoKXsKKwkJcmV0dXJuIF92YWx1ZXM7CisJfQorCQorCXB1YmxpYyBib29sZWFuIGdldEF1dG9TYXZlKCkgeworCQlyZXR1cm4gX3ZhbHVlcy5zYXZlQXV0b21hdGljYWxseTsKKwl9CisKKwlwdWJsaWMgdm9pZCBzZXRBdXRvU2F2ZShib29sZWFuIGF1dG9TYXZlKSB7CisJCV92YWx1ZXMuc2F2ZUF1dG9tYXRpY2FsbHkgPSBhdXRvU2F2ZTsKKwl9CisKKwkvKioKKwkgKiBDYW4gdGhpcyBwcm9qZWN0IG92ZXJyaWRlIHRoZSB3b3Jrc3BhY2UgbGV2ZWwgdmFsaWRhdGlvbiBzZXR0aW5ncz8KKwkgKi8KKwlwdWJsaWMgYm9vbGVhbiBnZXRPdmVycmlkZSgpIHsKKwkJcmV0dXJuIF92YWx1ZXMub3ZlcnJpZGU7CisJfQorCisJLyoqCisJICogQ2hhbmdlIHdoZXRoZXIgdGhpcyBwcm9qZWN0IGNhbiBvdmVycmlkZSB3b3Jrc3BhY2UgbGV2ZWwgdmFsaWRhdGlvbiBzZXR0aW5ncy4KKwkgKiBAcGFyYW0gb3ZlcnJpZGUgU2V0IHRvIHRydWUgaWYgdGhlIHByb2plY3QgaXMgYWxsb3dlZCB0byBvdmVycmlkZSB3b3Jrc3BhY2UgbGV2ZWwgdmFsaWRhdGlvbiBzZXR0aW5ncy4KKwkgKi8KKwlwdWJsaWMgdm9pZCBzZXRPdmVycmlkZShib29sZWFuIG92ZXJyaWRlKSB7CisJCV92YWx1ZXMub3ZlcnJpZGUgPSBvdmVycmlkZTsKKwl9CisKKwkvKioKKwkgKiBJcyB2YWxpZGF0aW9uIHN1c3BlbmRlZCBmb3IgdGhpcyBwcm9qZWN0PworCSAqLworCXB1YmxpYyBib29sZWFuIGdldFN1c3BlbmQoKSB7CisJCXJldHVybiBfdmFsdWVzLmRpc2FibGVBbGxWYWxpZGF0aW9uOworCX0KKworCS8qKgorCSAqIENoYW5nZSB3aGV0aGVyIHRoaXMgcHJvamVjdCBpcyBzdXNwZW5kaW5nIGl0J3MgdmFsaWRhdGlvbi4KKwkgKiBAcGFyYW0gc3VzcGVuZCBTZXQgdG8gdHJ1ZSwgdG8gc3VzcGVuZCB2YWxpZGF0aW9uIGZvciB0aGlzIHByb2plY3QuCisJICovCisJcHVibGljIHZvaWQgc2V0U3VzcGVuZChib29sZWFuIHN1c3BlbmQpIHsKKwkJX3ZhbHVlcy5kaXNhYmxlQWxsVmFsaWRhdGlvbiA9IHN1c3BlbmQ7CisJfQorCit9CmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uL3ZmMi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9WYWxpZGF0aW9uRXZlbnQuamF2YSBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24vdmYyL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL1ZhbGlkYXRpb25FdmVudC5qYXZhCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLjUyOGU1OGUKLS0tIC9kZXYvbnVsbAorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uL3ZmMi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9WYWxpZGF0aW9uRXZlbnQuamF2YQpAQCAtMCwwICsxLDc1IEBACisvKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKgorICogQ29weXJpZ2h0IChjKSAyMDA4IElCTSBDb3Jwb3JhdGlvbiBhbmQgb3RoZXJzLgorICogQWxsIHJpZ2h0cyByZXNlcnZlZC4gVGhpcyBwcm9ncmFtIGFuZCB0aGUgYWNjb21wYW55aW5nIG1hdGVyaWFscworICogYXJlIG1hZGUgYXZhaWxhYmxlIHVuZGVyIHRoZSB0ZXJtcyBvZiB0aGUgRWNsaXBzZSBQdWJsaWMgTGljZW5zZSB2MS4wCisgKiB3aGljaCBhY2NvbXBhbmllcyB0aGlzIGRpc3RyaWJ1dGlvbiwgYW5kIGlzIGF2YWlsYWJsZSBhdAorICogaHR0cDovL3d3dy5lY2xpcHNlLm9yZy9sZWdhbC9lcGwtdjEwLmh0bWwKKyAqCisgKiBDb250cmlidXRvcnM6CisgKiAgICAgSUJNIENvcnBvcmF0aW9uIC0gaW5pdGlhbCBBUEkgYW5kIGltcGxlbWVudGF0aW9uCisgKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKi8KK3BhY2thZ2Ugb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb247CisKK2ltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJlc291cmNlcy5JUmVzb3VyY2U7CitpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5yZXNvdXJjZXMuSVJlc291cmNlRGVsdGE7CisKKy8qKgorICogQW4gb2JqZWN0IHRoYXQgZGVzY3JpYmVzIHdoaWNoIG9iamVjdCBzaG91bGQgYmUgdmFsaWRhdGVkIGFuZCB3aGF0IHRyaWdnZXJlZCBpdHMgdmFsaWRhdGlvbi4KKyAqIDxwPgorICogPGI+UHJvdmlzaW9uYWwgQVBJOjwvYj4gVGhpcyBjbGFzcy9pbnRlcmZhY2UgaXMgcGFydCBvZiBhbiBpbnRlcmltIEFQSSB0aGF0IGlzIHN0aWxsIHVuZGVyIGRldmVsb3BtZW50IGFuZCBleHBlY3RlZCB0byAKKyAqIGNoYW5nZSBzaWduaWZpY2FudGx5IGJlZm9yZSByZWFjaGluZyBzdGFiaWxpdHkuIEl0IGlzIGJlaW5nIG1hZGUgYXZhaWxhYmxlIGF0IHRoaXMgZWFybHkgc3RhZ2UgdG8gc29saWNpdCBmZWVkYmFjayAKKyAqIGZyb20gcGlvbmVlcmluZyBhZG9wdGVycyBvbiB0aGUgdW5kZXJzdGFuZGluZyB0aGF0IGFueSBjb2RlIHRoYXQgdXNlcyB0aGlzIEFQSSB3aWxsIGFsbW9zdCBjZXJ0YWlubHkgYmUgYnJva2VuIAorICogKHJlcGVhdGVkbHkpIGFzIHRoZSBBUEkgZXZvbHZlcy4KKyAqIDwvcD4KKyAqIEBhdXRob3Iga2FyYXNpdWsKKyAqCisgKi8KKworcHVibGljIGZpbmFsIGNsYXNzIFZhbGlkYXRpb25FdmVudCB7CisJCisJcHJpdmF0ZSBJUmVzb3VyY2UgCQlfcmVzb3VyY2U7CisJcHJpdmF0ZSBpbnQJCQkJX2tpbmQ7CisJcHJpdmF0ZSBJUmVzb3VyY2VEZWx0YSAJX2RlcGVuZHNPbjsKKwkKKwkvKioKKwkgKiBDcmVhdGUgYW4gb2JqZWN0IHRoYXQgZGVzY3JpYmVzIHdoYXQgc2hvdWxkIGJlIHZhbGlkYXRlZC4KKwkgKiAKKwkgKiBAcGFyYW0gcmVzb3VyY2UKKwkgKiAgICAgICAgICAgIFRoZSByZXNvdXJjZSB0byBiZSB2YWxpZGF0ZWQuCisJICogQHBhcmFtIGtpbmQKKwkgKiAgICAgICAgICAgIFRoZSB3YXkgdGhlIHJlc291cmNlIGNoYW5nZWQuIEl0IHVzZXMgdGhlIHNhbWUgdmFsdWVzIGFzIHRoZQorCSAqICAgICAgICAgICAga2luZCBwYXJhbWV0ZXIgaW4gSVJlc291cmNlRGVsdGEuCisJICogQHBhcmFtIGRlcGVuZHNPbgorCSAqICAgICAgICAgICAgSWYgdGhlIHJlc291cmNlIGlzIGJlaW5nIHZhbGlkYXRlZCBiZWNhdXNlIG9uZSBvZiBpdCdzCisJICogICAgICAgICAgICBkZXBlbmRlbmNpZXMgaGFzIGNoYW5nZWQsIHRoYXQgY2hhbmdlIGlzIGRlc2NyaWJlZCBoZXJlLiBUaGlzCisJICogICAgICAgICAgICBjYW4gYmUgbnVsbC4KKwkgKi8KKwlwdWJsaWMgVmFsaWRhdGlvbkV2ZW50KElSZXNvdXJjZSByZXNvdXJjZSwgaW50IGtpbmQsIElSZXNvdXJjZURlbHRhIGRlcGVuZHNPbil7CisJCV9yZXNvdXJjZSA9IHJlc291cmNlOworCQlfa2luZCA9IGtpbmQ7CisJCV9kZXBlbmRzT24gPSBkZXBlbmRzT247CisJfQorCisJLyoqCisJICogVGhlIHJlc291cmNlIHRvIGJlIHZhbGlkYXRlZC4KKwkgKi8KKwlwdWJsaWMgSVJlc291cmNlIGdldFJlc291cmNlKCkgeworCQlyZXR1cm4gX3Jlc291cmNlOworCX0KKworCS8qKgorCSAqIFRoZSB3YXkgdGhlIHJlc291cmNlIGNoYW5nZWQuIEl0IHVzZXMgdGhlIHNhbWUgdmFsdWVzIGFzIHRoZSBraW5kCisJICogcGFyYW1ldGVyIGluIElSZXNvdXJjZURlbHRhLgorCSAqLworCXB1YmxpYyBpbnQgZ2V0S2luZCgpIHsKKwkJcmV0dXJuIF9raW5kOworCX0KKworCS8qKgorCSAqIElmIHRoZSByZXNvdXJjZSBpcyBiZWluZyB2YWxpZGF0ZWQgYmVjYXVzZSBvbmUgb2YgaXQncyBkZXBlbmRlbmNpZXMgaGFzIGNoYW5nZWQsIHRoYXQgY2hhbmdlIGlzIGRlc2NyaWJlZCBoZXJlLgorCSAqIFRoaXMgbWV0aG9kIHdpbGwgcmV0dXJuIG51bGwgd2hlbiB0aGUgdHJpZ2dlciBpcyBub3QgYmVjYXVzZSBvZiBhIGRlcGVuZGVuY3kgY2hhbmdlLgorCSAqLworCXB1YmxpYyBJUmVzb3VyY2VEZWx0YSBnZXREZXBlbmRzT24oKSB7CisJCXJldHVybiBfZGVwZW5kc09uOworCX0KK30KZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24vdmYyL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL1ZhbGlkYXRpb25GcmFtZXdvcmsuamF2YSBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24vdmYyL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL1ZhbGlkYXRpb25GcmFtZXdvcmsuamF2YQppbmRleCBmZTYyYjQwLi4xN2NjNDU1IDEwMDY0NAotLS0gYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uL3ZmMi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9WYWxpZGF0aW9uRnJhbWV3b3JrLmphdmEKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi92ZjIvb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vVmFsaWRhdGlvbkZyYW1ld29yay5qYXZhCkBAIC0xLDUgKzEsNSBAQAogLyoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioKLSAqIENvcHlyaWdodCAoYykgMjAwNywgMjAwOCBJQk0gQ29ycG9yYXRpb24gYW5kIG90aGVycy4KKyAqIENvcHlyaWdodCAoYykgMjAwNywgMjAwOSBJQk0gQ29ycG9yYXRpb24gYW5kIG90aGVycy4KICAqIEFsbCByaWdodHMgcmVzZXJ2ZWQuIFRoaXMgcHJvZ3JhbSBhbmQgdGhlIGFjY29tcGFueWluZyBtYXRlcmlhbHMKICAqIGFyZSBtYWRlIGF2YWlsYWJsZSB1bmRlciB0aGUgdGVybXMgb2YgdGhlIEVjbGlwc2UgUHVibGljIExpY2Vuc2UgdjEuMAogICogd2hpY2ggYWNjb21wYW5pZXMgdGhpcyBkaXN0cmlidXRpb24sIGFuZCBpcyBhdmFpbGFibGUgYXQKQEAgLTEwLDYgKzEwLDcgQEAKICAqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqLwogcGFja2FnZSBvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbjsKIAoraW1wb3J0IGphdmEubGFuZy5yZWZsZWN0Lkludm9jYXRpb25UYXJnZXRFeGNlcHRpb247CiBpbXBvcnQgamF2YS51dGlsLkNvbGxlY3Rpb25zOwogaW1wb3J0IGphdmEudXRpbC5IYXNoTWFwOwogaW1wb3J0IGphdmEudXRpbC5IYXNoU2V0OwpAQCAtMTgsNiArMTksNyBAQAogaW1wb3J0IGphdmEudXRpbC5NYXA7CiBpbXBvcnQgamF2YS51dGlsLlNldDsKIAoraW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucmVzb3VyY2VzLklGaWxlOwogaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucmVzb3VyY2VzLklQcm9qZWN0OwogaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucmVzb3VyY2VzLklSZXNvdXJjZTsKIGltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJlc291cmNlcy5JUmVzb3VyY2VWaXNpdG9yOwpAQCAtMjksMTkgKzMxLDMyIEBACiBpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5ydW50aW1lLmpvYnMuSm9iOwogaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucnVudGltZS5wcmVmZXJlbmNlcy5JRWNsaXBzZVByZWZlcmVuY2VzOwogaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucnVudGltZS5wcmVmZXJlbmNlcy5JbnN0YW5jZVNjb3BlOworaW1wb3J0IG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLlZhbGlkYXRvci5WMTsKK2ltcG9ydCBvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5pbnRlcm5hbC5Db25maWd1cmF0aW9uTWFuYWdlcjsKIGltcG9ydCBvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5pbnRlcm5hbC5Db250ZW50VHlwZVdyYXBwZXI7CiBpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uaW50ZXJuYWwuRGVidWdDb25zdGFudHM7CiBpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uaW50ZXJuYWwuRGVwZW5kZW5jeUluZGV4OwogaW1wb3J0IG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLmludGVybmFsLkRpc2FibGVkUmVzb3VyY2VNYW5hZ2VyOwogaW1wb3J0IG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLmludGVybmFsLkRpc2FibGVkVmFsaWRhdG9yTWFuYWdlcjsKK2ltcG9ydCBvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5pbnRlcm5hbC5HbG9iYWxDb25maWd1cmF0aW9uOwogaW1wb3J0IG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLmludGVybmFsLk1hcmtlck1hbmFnZXI7CiBpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uaW50ZXJuYWwuTWlzYzsKIGltcG9ydCBvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5pbnRlcm5hbC5QZXJmb3JtYW5jZU1vbml0b3I7CitpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uaW50ZXJuYWwuUHJvamVjdFVuYXZhaWxhYmxlRXJyb3I7CiBpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uaW50ZXJuYWwuVmFsTWFuYWdlcjsKIGltcG9ydCBvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5pbnRlcm5hbC5WYWxPcGVyYXRpb247CitpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uaW50ZXJuYWwuVmFsUHJlZk1hbmFnZXJHbG9iYWw7CitpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uaW50ZXJuYWwuVmFsUHJlZk1hbmFnZXJQcm9qZWN0OwogaW1wb3J0IG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLmludGVybmFsLlZhbFR5cGU7CiBpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uaW50ZXJuYWwuVmFsaWRhdGlvblJ1bm5lcjsKK2ltcG9ydCBvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5pbnRlcm5hbC5WYWxpZGF0b3JNZXRhRGF0YTsKK2ltcG9ydCBvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5pbnRlcm5hbC5WYWxpZGF0b3JNdXRhYmxlOworaW1wb3J0IG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLmludGVybmFsLlZhbE1hbmFnZXIuVXNlUHJvamVjdFByZWZlcmVuY2VzOworaW1wb3J0IG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLmludGVybmFsLm1vZGVsLkdsb2JhbFByZWZlcmVuY2VzOworaW1wb3J0IG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLmludGVybmFsLm1vZGVsLkdsb2JhbFByZWZlcmVuY2VzVmFsdWVzOworaW1wb3J0IG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLmludGVybmFsLm1vZGVsLlByb2plY3RQcmVmZXJlbmNlczsKIGltcG9ydCBvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5pbnRlcm5hbC5vcGVyYXRpb25zLlZhbGlkYXRpb25CdWlsZGVyOworaW1wb3J0IG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLmludGVybmFsLm9wZXJhdGlvbnMuVmFsaWRhdG9yTWFuYWdlcjsKIGltcG9ydCBvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5pbnRlcm5hbC5vcGVyYXRpb25zLldvcmtiZW5jaFJlcG9ydGVyOwogaW1wb3J0IG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLmludGVybmFsLnBsdWdpbi5WYWxpZGF0aW9uUGx1Z2luOwogaW1wb3J0IG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLmludGVybmFsLnByb3Zpc2lvbmFsLmNvcmUuSVJlcG9ydGVyOwpAQCAtNjIsMjUgKzc3LDMzIEBACiAgKi8KIHB1YmxpYyBmaW5hbCBjbGFzcyBWYWxpZGF0aW9uRnJhbWV3b3JrIHsKIAkKLQlwcml2YXRlIElEZXBlbmRlbmN5SW5kZXggCQkJX2RlcGVuZGVuY3lJbmRleDsKKwlwcml2YXRlIHZvbGF0aWxlIElEZXBlbmRlbmN5SW5kZXggCV9kZXBlbmRlbmN5SW5kZXg7CiAJcHJpdmF0ZSBJUGVyZm9ybWFuY2VNb25pdG9yCQkJX3BlcmZvcm1hbmNlTW9uaXRvcjsKIAkKIAlwcml2YXRlIFNldDxJUHJvamVjdD4gCQkJCV9zdXNwZW5kZWRQcm9qZWN0czsKIAlwcml2YXRlIGJvb2xlYW4gCQkJCQlfc3VzcGVuZEFsbFZhbGlkYXRpb247CiAKLQlwcml2YXRlIHN0YXRpYyBWYWxpZGF0aW9uRnJhbWV3b3JrIAlfbWU7Ci0JCiAJLyoqIAogCSAqIEFuc3dlciB0aGUgc2luZ2xldG9uLCBkZWZhdWx0IGluc3RhbmNlIG9mIHRoaXMgY2xhc3MuCiAJICovCiAJcHVibGljIHN0YXRpYyBWYWxpZGF0aW9uRnJhbWV3b3JrIGdldERlZmF1bHQoKXsKLQkJaWYgKF9tZSA9PSBudWxsKV9tZSA9IG5ldyBWYWxpZGF0aW9uRnJhbWV3b3JrKCk7Ci0JCXJldHVybiBfbWU7CisJCXJldHVybiBTaW5nbGV0b24udmY7CiAJfQogCQogCXByaXZhdGUgVmFsaWRhdGlvbkZyYW1ld29yaygpe30KIAkKIAkvKioKKwkgKiBBZGQgdGhlIHZhbGlkYXRpb24gYnVpbGRlciB0byB0aGUgcHJvamVjdCwgc28gdGhhdCB0aGUgcHJvamVjdCBjYW4gc3VwcG9ydAorCSAqIGJ1aWxkIHRpbWUgdmFsaWRhdGlvbi4gSXQgaXMgc2FmZSB0byBjYWxsIHRoaXMgbWV0aG9kLCBpZiB0aGUgYnVpbGRlciB3YXMKKwkgKiBwcmV2aW91c2x5IGFkZGVkIHRvIHRoZSBwcm9qZWN0LiBJdCB3aWxsIG5vdCBiZSBhZGRlZCBtb3JlIHRoYW4gb25jZS4KKwkgKiAKKwkgKiBAcGFyYW0gcHJvamVjdCBUaGUgcHJvamVjdCB0aGF0IHRoZSBidWlsZGVyIGlzIGFkZGVkIHRvLgorCSAqLworCXB1YmxpYyB2b2lkIGFkZFZhbGlkYXRpb25CdWlsZGVyKElQcm9qZWN0IHByb2plY3QpeworCQlWYWxpZGF0b3JNYW5hZ2VyLmFkZFByb2plY3RCdWlsZFZhbGlkYXRpb25TdXBwb3J0KHByb2plY3QpOworCX0KKwkKKwkvKioKIAkgKiBDbGVhciBhbnkgdmFsaWRhdGlvbiBtYXJrZXJzIHRoYXQgbWF5IGhhdmUgYmVlbiBzZXQgYnkgdGhpcyB2YWxpZGF0b3IuCiAJICogCiAJICogQHBhcmFtIHJlc291cmNlCkBAIC0xMzEsMTUgKzE1NCwxNSBAQAogCSAqIG90aGVyIHJlc291cmNlcy4KIAkgKi8KIAlwdWJsaWMgSURlcGVuZGVuY3lJbmRleCBnZXREZXBlbmRlbmN5SW5kZXgoKXsKLQkJaWYgKF9kZXBlbmRlbmN5SW5kZXggIT0gbnVsbClyZXR1cm4gX2RlcGVuZGVuY3lJbmRleDsKLQkJcmV0dXJuIGdldERlcGVuZGVuY3lJbmRleDIoKTsKLQl9Ci0KLQlwcml2YXRlIHN5bmNocm9uaXplZCBJRGVwZW5kZW5jeUluZGV4IGdldERlcGVuZGVuY3lJbmRleDIoKSB7Ci0JCWlmIChfZGVwZW5kZW5jeUluZGV4ID09IG51bGwpX2RlcGVuZGVuY3lJbmRleCA9IG5ldyBEZXBlbmRlbmN5SW5kZXgoKTsKKwkJLy8gbm90ZSBob3cgdGhlIF9kZXBlbmRlbmN5SW5kZXggaXMgdm9sYXRpbGUgc28gdGhhdCB0aGlzIGRvdWJsZSBjaGVja2luZyBhcHByb2FjaCBjYW4gYmUgdXNlZC4KKwkJaWYgKF9kZXBlbmRlbmN5SW5kZXggPT0gbnVsbCl7CisJCQlzeW5jaHJvbml6ZWQodGhpcyl7CisJCQkJaWYgKF9kZXBlbmRlbmN5SW5kZXggPT0gbnVsbClfZGVwZW5kZW5jeUluZGV4ID0gbmV3IERlcGVuZGVuY3lJbmRleCgpOworCQkJfQorCQl9CiAJCXJldHVybiBfZGVwZW5kZW5jeUluZGV4OwogCX0KLQkKKwogCS8qKgogCSAqIEFuc3dlciBhIHBlcmZvcm1hbmNlIG1vbml0b3IgZm9yIHRoZSB2YWxpZGF0b3JzLgogCSAqLwpAQCAtMTU1LDcgKzE3OCw3IEBACiAJfQogCQogCS8qKgotCSAqIEFuc3dlciB0aGUgcHJlZmVyZW5jZSBzdG9yZSB0aGF0IGhvbGRzIHRoZSBnbG9iYWwgdmFsaWRhdGlvbiBzZXR0aW5ncy4KKwkgKiBBbnN3ZXIgdGhlIHByZWZlcmVuY2Ugc3RvcmUgdGhhdCBob2xkcyB0aGUgcGVyc2lzdGVkIGdsb2JhbCB2YWxpZGF0aW9uIHNldHRpbmdzLgogCSAqLwogCXB1YmxpYyBJRWNsaXBzZVByZWZlcmVuY2VzIGdldFByZWZlcmVuY2VTdG9yZSgpewogCQlyZXR1cm4gbmV3IEluc3RhbmNlU2NvcGUoKS5nZXROb2RlKFZhbGlkYXRpb25QbHVnaW4uUExVR0lOX0lEKTsKQEAgLTI1NCw2ICsyNzcsMTEyIEBACiAJfQogCQogCS8qKgorCSAqIEFuc3dlciBjb3BpZXMgb2YgYWxsIHRoZSByZWdpc3RlcmVkIHZhbGlkYXRvcnMuCisJICogCisJICogQHJldHVybiBBbnN3ZXIgYW4gZW1wdHkgYXJyYXkgaWYgdGhlcmUgYXJlIG5vIHZhbGlkYXRvcnMuCisJICovCisJcHVibGljIFZhbGlkYXRvcltdIGdldFZhbGlkYXRvcnMoKXsKKwkJcmV0dXJuIFZhbE1hbmFnZXIuZ2V0RGVmYXVsdCgpLmdldFZhbGlkYXRvcnNDb3B5KCk7CisJfQorCQkKKwkvKioKKwkgKiBBbnN3ZXIgdGhlIHZhbGlkYXRpb24gc2V0dGluZ3MgdGhhdCBoYXZlIGJlZW4gZGVmaW5lZCBvbiB0aGUKKwkgKiBwcm9qZWN0LiBUbyAiYWN0aXZhdGUiIGFueSBjaGFuZ2VzIHRvIHRoZXNlIHNldHRpbmdzLCB0aGUKKwkgKiB7QGxpbmsgI2FwcGx5Q2hhbmdlcyhNdXRhYmxlUHJvamVjdFNldHRpbmdzLCBib29sZWFuKX0gbWV0aG9kIG5lZWRzIHRvIGJlCisJICogY2FsbGVkLgorCSAqIAorCSAqIEBwYXJhbSBwcm9qZWN0IFRoZSBwcm9qZWN0IHdobydzIHNldHRpbmdzIHlvdSB3aXNoIHRvIGV4YW1pbmUgb3IgY2hhbmdlLgorCSAqIEByZXR1cm4gVmFsaWRhdGlvbiBzZXR0aW5ncyB0aGF0IGFwcGx5IHRvIHRoZSBnaXZlbiBwcm9qZWN0LgorCSAqLworCXB1YmxpYyBNdXRhYmxlUHJvamVjdFNldHRpbmdzIGdldFByb2plY3RTZXR0aW5ncyhJUHJvamVjdCBwcm9qZWN0KXsKKwkJUHJvamVjdFByZWZlcmVuY2VzIHBwID0gVmFsTWFuYWdlci5nZXREZWZhdWx0KCkuZ2V0UHJvamVjdFByZWZlcmVuY2VzKHByb2plY3QpOworCQlWYWxpZGF0b3JbXSB2YWxzID0gcHAuZ2V0VmFsaWRhdG9ycygpOworCQlWYWxpZGF0b3JNdXRhYmxlW10gdm1zID0gbmV3IFZhbGlkYXRvck11dGFibGVbdmFscy5sZW5ndGhdOworCQlmb3IgKGludCBpPTA7IGk8dmFscy5sZW5ndGg7IGkrKyl2bXNbaV0gPSBuZXcgVmFsaWRhdG9yTXV0YWJsZSh2YWxzW2ldKTsKKworCQlNdXRhYmxlUHJvamVjdFNldHRpbmdzIG1wcyA9IG5ldyBNdXRhYmxlUHJvamVjdFNldHRpbmdzKHByb2plY3QsIHZtcyk7CisJCW1wcy5zZXRPdmVycmlkZShwcC5nZXRPdmVycmlkZSgpKTsKKwkJbXBzLnNldFN1c3BlbmQocHAuZ2V0U3VzcGVuZCgpKTsKKwkJcmV0dXJuIG1wczsKKwl9CisJCisJLyoqCisJICogQW5zd2VyIHRoZSB2YWxpZGF0aW9uIHNldHRpbmdzIHRoYXQgaGF2ZSBiZWVuIGRlZmluZWQgYXQgdGhlIHdvcmtzcGFjZSBsZXZlbC4KKwkgKiBUbyAiYWN0aXZhdGUiIGFueSBjaGFuZ2VzIHRvIHRoZXNlIHNldHRpbmdzLCB0aGUKKwkgKiB7QGxpbmsgI2FwcGx5Q2hhbmdlcyhNdXRhYmxlV29ya3NwYWNlU2V0dGluZ3MsIGJvb2xlYW4pfSBtZXRob2QgbmVlZHMgdG8gYmUKKwkgKiBjYWxsZWQuCisJICogCisJICogQHJldHVybiBWYWxpZGF0aW9uIHNldHRpbmdzIHRoYXQgYXBwbHkgdG8gdGhlIGVudGlyZSB3b3Jrc3BhY2UuCisJICovCisJcHVibGljIE11dGFibGVXb3Jrc3BhY2VTZXR0aW5ncyBnZXRXb3Jrc3BhY2VTZXR0aW5ncygpIHRocm93cyBJbnZvY2F0aW9uVGFyZ2V0RXhjZXB0aW9ueworCQkKKwkJVmFsTWFuYWdlciB2bSA9IFZhbE1hbmFnZXIuZ2V0RGVmYXVsdCgpOworCQlHbG9iYWxQcmVmZXJlbmNlcyBncCA9IHZtLmdldEdsb2JhbFByZWZlcmVuY2VzKCk7CisJCQorCQlWYWxpZGF0b3JbXSB2YWxzID0gdm0uZ2V0VmFsaWRhdG9ycygpOwkJCisJCVZhbGlkYXRvck11dGFibGVbXSB2bXMgPSBuZXcgVmFsaWRhdG9yTXV0YWJsZVt2YWxzLmxlbmd0aF07CisJCWZvciAoaW50IGk9MDsgaTx2YWxzLmxlbmd0aDsgaSsrKXZtc1tpXSA9IG5ldyBWYWxpZGF0b3JNdXRhYmxlKHZhbHNbaV0pOworCisJCU11dGFibGVXb3Jrc3BhY2VTZXR0aW5ncyBtd3MgPSBuZXcgTXV0YWJsZVdvcmtzcGFjZVNldHRpbmdzKHZtcywgZ3AuYXNWYWx1ZXMoKSk7CisJCXJldHVybiBtd3M7CisJfQorCQkKKwkvKioKKwkgKiBBcHBseSB0aGUgY2hhbmdlcyB0aGF0IGhhdmUgYmVlbiBiZWVuIHRvIHRoZSB2YWxpZGF0aW9uIHNldHRpbmdzLgorCSAqIAorCSAqIEBwYXJhbSBzZXR0aW5ncworCSAqICAgICAgICAgICAgVGhlIHByb2plY3Qgc2V0dGluZ3MuCisJICogQHBhcmFtIHBlcnNpc3QKKwkgKiAgICAgICAgICAgIElmIHRydWUgdGhlbiB0aGUgY2hhbmdlcyBhcmUgcGVyc2lzdGVkIHRvIHRoZSBwcm9wZXJ0eSBmaWxlcy4KKwkgKiAgICAgICAgICAgIElmIGZhbHNlIHRoZSBjaGFuZ2VzIGFyZSBhcHBsaWVkIHRvIHRoZSB2YWxpZGF0b3JzLCBidXQgYXJlCisJICogICAgICAgICAgICBub3QgcGVyc2lzdGVkLgorCSAqLworCXB1YmxpYyB2b2lkIGFwcGx5Q2hhbmdlcyhNdXRhYmxlUHJvamVjdFNldHRpbmdzIHNldHRpbmdzLCBib29sZWFuIHBlcnNpc3QpeworCQlWYWxQcmVmTWFuYWdlclByb2plY3QgdnBtID0gbmV3IFZhbFByZWZNYW5hZ2VyUHJvamVjdChzZXR0aW5ncy5nZXRQcm9qZWN0KCkpOworCQl2cG0uc2F2ZVByZWZlcmVuY2VzKHNldHRpbmdzLCBwZXJzaXN0KTsKKwl9CisJCisJLyoqCisJICogQXBwbHkgdGhlIGNoYW5nZXMgdGhhdCBoYXZlIGJlZW4gYmVlbiB0byB0aGUgdmFsaWRhdGlvbiBzZXR0aW5ncy4KKwkgKiAKKwkgKiBAcGFyYW0gc2V0dGluZ3MKKwkgKiAgICAgICAgICAgIFRoZSB3b3Jrc3BhY2Ugc2V0dGluZ3MuCisJICogQHBhcmFtIHBlcnNpc3QKKwkgKiAgICAgICAgICAgIElmIHRydWUgdGhlbiB0aGUgY2hhbmdlcyBhcmUgcGVyc2lzdGVkIHRvIHRoZSBwcm9wZXJ0eSBmaWxlcy4KKwkgKiAgICAgICAgICAgIElmIGZhbHNlIHRoZSBjaGFuZ2VzIGFyZSBhcHBsaWVkIHRvIHRoZSB2YWxpZGF0b3JzLCBidXQgYXJlCisJICogICAgICAgICAgICBub3QgcGVyc2lzdGVkLgorCSAqLworCXB1YmxpYyB2b2lkIGFwcGx5Q2hhbmdlcyhNdXRhYmxlV29ya3NwYWNlU2V0dGluZ3Mgc2V0dGluZ3MsIGJvb2xlYW4gcGVyc2lzdCl7CisJCQorCQlWYWxNYW5hZ2VyIHZtID0gVmFsTWFuYWdlci5nZXREZWZhdWx0KCk7CisJCUdsb2JhbFByZWZlcmVuY2VzVmFsdWVzIGdwdiA9IHNldHRpbmdzLmdldEdsb2JhbFByZWZlcmVuY2VzVmFsdWVzKCk7CisJCXZtLnJlcGxhY2UoZ3B2KTsKKwkJCisJCUlNdXRhYmxlVmFsaWRhdG9yW10gbXZzID0gc2V0dGluZ3MuZ2V0VmFsaWRhdG9ycygpOworCQlWYWxpZGF0b3JNdXRhYmxlW10gdmFscyA9IG5ldyBWYWxpZGF0b3JNdXRhYmxlW212cy5sZW5ndGhdOworCQlmb3IgKGludCBpPTA7IGk8bXZzLmxlbmd0aDsgaSsrKXZhbHNbaV0gPSAoVmFsaWRhdG9yTXV0YWJsZSltdnNbaV07CisJCVZhbFByZWZNYW5hZ2VyR2xvYmFsLmdldERlZmF1bHQoKS5zYXZlUHJlZmVyZW5jZXModm0uZ2V0R2xvYmFsUHJlZmVyZW5jZXMoKSwgdmFscywgcGVyc2lzdCk7CisJCVZhbFByZWZNYW5hZ2VyR2xvYmFsLnNhdmVWMVByZWZlcmVuY2VzKHZhbHMsIHBlcnNpc3QpOwkJCisJfQorCQorCS8qKgorCSAqIFZhbGlkYXRvcnMgY2FuIHVzZSBwcm9qZWN0IGxldmVsIHNldHRpbmdzIChQcm9qZWN0IG5hdHVyZXMgYW5kIGZhY2V0cykgdG8KKwkgKiBkZXRlcm1pbmUgaWYgdGhleSBhcmUgYXBwbGljYWJsZSB0byB0aGUgcHJvamVjdCBvciBub3QuCisJICogCisJICogQHBhcmFtIHByb2plY3QKKwkgKiAgICAgICAgICAgIFRoZSBwcm9qZWN0IHRoYXQgdGhlIGNvbmZpZ3VyYXRpb24gaXMgYmFzZWQgb24uCisJICogQHJldHVybiBUaGUgY29waWVzIG9mIHRoZSB2YWxpZGF0b3JzIHRoYXQgYXJlIGNvbmZpZ3VyZWQgdG8gcnVuIG9uIHRoaXMgcHJvamVjdCBiYXNlZAorCSAqICAgICAgICAgb24gdGhlIHByb2plY3QgbGV2ZWwgc2V0dGluZ3MuCisJICogQHRocm93cyBQcm9qZWN0VW5hdmFpbGFibGVFcnJvcgorCSAqLworCXB1YmxpYyBWYWxpZGF0b3JbXSBnZXRWYWxpZGF0b3JzQ29uZmlndXJlZEZvclByb2plY3QoSVByb2plY3QgcHJvamVjdCkgdGhyb3dzIFByb2plY3RVbmF2YWlsYWJsZUVycm9yIHsKKwkJVmFsaWRhdG9yW10gb3JpZyA9IFZhbE1hbmFnZXIuZ2V0RGVmYXVsdCgpLmdldFZhbGlkYXRvcnNDb25maWd1cmVkRm9yUHJvamVjdChwcm9qZWN0LCBVc2VQcm9qZWN0UHJlZmVyZW5jZXMuTm9ybWFsKTsKKwkJVmFsaWRhdG9yW10gY29weSA9IG5ldyBWYWxpZGF0b3Jbb3JpZy5sZW5ndGhdOworCQlmb3IgKGludCBpPTA7IGk8b3JpZy5sZW5ndGg7IGkrKyljb3B5W2ldID0gb3JpZ1tpXS5jb3B5KCk7CisJCXJldHVybiBjb3B5OworCX0KKwkKKwkvKioKIAkgKiBBbnN3ZXIgYWxsIHRoZSB2YWxpZGF0b3JzIHRoYXQgYXJlIGFwcGxpY2FibGUgZm9yIHRoZSBnaXZlbiByZXNvdXJjZS4KIAkgKiAKIAkgKiBAcGFyYW0gcmVzb3VyY2UgdGhlIHJlc291cmNlIHRoYXQgZGV0ZXJtaW5lcyB3aGljaCB2YWxpZGF0b3JzIGFyZSBhcHBsaWNhYmxlLgpAQCAtMjg4LDYgKzQxNywyMSBAQAogCX0KIAkKIAkvKioKKwkgKiBBbnN3ZXIgd2hldGhlciBvciBub3QgdGhlIHZhbGlkYXRvciBoYXMgYmVlbiBhY3RpdmF0ZWQsIGkuZS4gaGFzIHRoZQorCSAqIGJ1bmRsZSB0aGF0IGRlZmluZXMgdGhlIHZhbGlkYXRvciBiZWVuIGxvYWRlZC4gV2UgZG8gbm90IHdhbnQgdG8gY2F1c2UKKwkgKiB1bm5lY2Vzc2FyeSBidW5kbGUgbG9hZGluZywgc28gdGhpcyBjaGVjayBjYW4gYmUgcGVyZm9ybWVkIGJ5IHRoaXJkIHBhcnR5CisJICogY2FsbGVycywgdG8gcHJldmVudCBtYWtpbmcgb3RoZXIgY2FsbHMgdGhhdCB3aWxsIGZvcmNlIHRoZSB2YWxpZGF0b3IgdG8KKwkgKiBiZSBsb2FkZWQuCisJICogCisJICogQHBhcmFtIHZhbGlkYXRvcgorCSAqICAgICAgICAgICAgVGhlIHZhbGlkYXRvciB0aGF0IGlzIGJlaW5nIHRlc3RlZC4KKwkgKiBAcmV0dXJuIHRydWUgaWYgdGhlIHZhbGlkYXRvciBoYXMgYWxyZWFkeSBiZWVuIGxvYWRlZC4KKwkgKi8KKwlwdWJsaWMgYm9vbGVhbiBpc0xvYWRlZChWYWxpZGF0b3IgdmFsaWRhdG9yKXsKKwkJcmV0dXJuIHZhbGlkYXRvci5pc0xvYWRlZCgpOworCX0KKwkKKwkvKioKIAkgKiBXYWl0cyB1bnRpbCBhbGwgdmFsaWRhdGlvbiBqb2JzIGFyZSBmaW5pc2hlZC4gVGhpcyBtZXRob2Qgd2lsbCBibG9jayB0aGUKIAkgKiBjYWxsaW5nIHRocmVhZCB1bnRpbCBhbGwgc3VjaCBqb2JzIGhhdmUgZmluaXNoZWQgZXhlY3V0aW5nLCBvciB1bnRpbCB0aGlzCiAJICogdGhyZWFkIGlzIGludGVycnVwdGVkLiBJZiB0aGVyZSBhcmUgbm8gdmFsaWRhdGlvbiBqb2JzIHRoYXQgYXJlCkBAIC0zNTAsNiArNDk0LDU1IEBACiAJCWlmIChfc3VzcGVuZGVkUHJvamVjdHMgPT0gbnVsbClfc3VzcGVuZGVkUHJvamVjdHMgPSBDb2xsZWN0aW9ucy5zeW5jaHJvbml6ZWRTZXQobmV3IEhhc2hTZXQ8SVByb2plY3Q+KDIwKSk7CiAJCXJldHVybiBfc3VzcGVuZGVkUHJvamVjdHM7CiAJfQorCQorCS8qKgorCSAqIFNhdmUgdGhlIHZhbGlkYXRvcnMgc2V0dGluZ3MgaW50byB0aGUgcGVyc2lzdGVudCBzdG9yZSwgdGhlcmUgYnkgbWFraW5nIHRoZWlyIHNldHRpbmdzIHRoZSBhY3RpdmUgc2V0dGluZ3MuCisJICogPHA+CisJICogQSBjb21tb24gdXNlIG9mIHRoaXMgbWV0aG9kIHdvdWxkIGJlIHRvIGNoYW5nZSB3aGV0aGVyIHBhcnRpY3VsYXIgdmFsaWRhdG9ycyBhcmUgZW5hYmxlZCBvciBub3QuIEZvciBleGFtcGxlCisJICogaWYgeW91IG9ubHkgd2FudGVkIHRoZSBKU1AgdmFsaWRhdG9yIGVuYWJsZWQsIHlvdSBjb3VsZCB1c2UgY29kZSBzaW1pbGFyIHRvIHRoaXM6CisJICogPHByZT4KKwkgKiBWYWxpZGF0aW9uRnJhbWV3b3JrIHZmID0gVmFsaWRhdGlvbkZyYW1ld29yay5nZXREZWZhdWx0KCk7CisJICogVmFsaWRhdG9yW10gdmFscyA9IHZmLmdldFZhbGlkYXRvcnMoKTsKKwkgKiBmb3IgKFZhbGlkYXRvciB2IDogdmFscyl7CisJICogICBib29sZWFuIGVuYWJsZWQgPSBmYWxzZTsKKwkgKiAgIGlmICh2LmdldFZhbGlkYXRvckNsYXNzbmFtZSgpLmVxdWFscygib3JnLmVjbGlwc2UuanN0LmpzcC5jb3JlLmludGVybmFsLnZhbGlkYXRpb24uSlNQQmF0Y2hWYWxpZGF0b3IiKSllbmFibGVkID0gdHJ1ZTsKKwkgKiAgICAgdi5zZXRCdWlsZFZhbGlkYXRpb24oZW5hYmxlZCk7CisJICogICAgIHYuc2V0TWFudWFsVmFsaWRhdGlvbihlbmFibGVkKTsKKwkgKiAgfQorCSAqIHZmLnNhdmVWYWxpZGF0b3JzKHZhbHMpOworCSAqIDwvcHJlPgorCSAqIDwvcD4gCisJICogCisJICogQHBhcmFtIHZhbGlkYXRvcnMgVGhlIHZhbGlkYXRvcnMgdGhhdCB5b3UgYXJlIHNhdmluZy4KKwkgKiAKKwkgKiBAdGhyb3dzIEludm9jYXRpb25UYXJnZXRFeGNlcHRpb24KKwkgKi8KKwlwdWJsaWMgdm9pZCBzYXZlVmFsaWRhdG9ycyhWYWxpZGF0b3JbXSB2YWxpZGF0b3JzKSB0aHJvd3MgSW52b2NhdGlvblRhcmdldEV4Y2VwdGlvbnsKKwkJCisJCQorCQlWYWxQcmVmTWFuYWdlckdsb2JhbCBncCA9IFZhbFByZWZNYW5hZ2VyR2xvYmFsLmdldERlZmF1bHQoKTsKKwkJZ3Auc2F2ZUFzUHJlZnModmFsaWRhdG9ycyk7CQorCQkKKwkJR2xvYmFsQ29uZmlndXJhdGlvbiBnYyA9IENvbmZpZ3VyYXRpb25NYW5hZ2VyLmdldE1hbmFnZXIoKS5nZXRHbG9iYWxDb25maWd1cmF0aW9uKCk7CisJCQorCQlMaXN0PFZhbGlkYXRvck1ldGFEYXRhPiBtYW51YWwgPSBuZXcgTGlua2VkTGlzdDxWYWxpZGF0b3JNZXRhRGF0YT4oKTsKKwkJTGlzdDxWYWxpZGF0b3JNZXRhRGF0YT4gYnVpbGQgPSBuZXcgTGlua2VkTGlzdDxWYWxpZGF0b3JNZXRhRGF0YT4oKTsKKwkJZm9yIChWYWxpZGF0b3IgdiA6IHZhbGlkYXRvcnMpeworCQkJVjEgdjEgPSB2LmFzVjFWYWxpZGF0b3IoKTsKKwkJCWlmICh2MSA9PSBudWxsKWNvbnRpbnVlOworCQkJaWYgKHYxLmlzTWFudWFsVmFsaWRhdGlvbigpKW1hbnVhbC5hZGQodjEuZ2V0Vm1kKCkpOworCQkJaWYgKHYxLmlzQnVpbGRWYWxpZGF0aW9uKCkpYnVpbGQuYWRkKHYxLmdldFZtZCgpKTsKKwkJfQorCQkKKwkJVmFsaWRhdG9yTWV0YURhdGFbXSBhcnJheSA9IG5ldyBWYWxpZGF0b3JNZXRhRGF0YVttYW51YWwuc2l6ZSgpXTsKKwkJZ2Muc2V0RW5hYmxlZE1hbnVhbFZhbGlkYXRvcnMobWFudWFsLnRvQXJyYXkoYXJyYXkpKTsKKwkJCisJCWFycmF5ID0gbmV3IFZhbGlkYXRvck1ldGFEYXRhW2J1aWxkLnNpemUoKV07CisJCWdjLnNldEVuYWJsZWRCdWlsZFZhbGlkYXRvcnMoYnVpbGQudG9BcnJheShhcnJheSkpOworCisJCWdjLnBhc3NpdmF0ZSgpOworCQlnYy5zdG9yZSgpOwkJCisJfQogCiAJLyoqCiAJICogU3VzcGVuZHMsIG9yIHVuZG9lcyB0aGUgc3VzcGVuc2lvbiBvZiwgdmFsaWRhdGlvbiBvbiBhbGwgcHJvamVjdHMgaW4gdGhlCkBAIC00MjQsNyArNjE3LDIxIEBACiAJCVZhbE9wZXJhdGlvbiB2byA9IFZhbGlkYXRpb25SdW5uZXIudmFsaWRhdGUoY3JlYXRlTWFwKHByb2plY3RzKSwgdHlwZSwgbW9uaXRvciwgdHJ1ZSk7CiAJCXJldHVybiB2by5nZXRSZXN1bHRzKCk7CiAJfQotCQorCisJLyoqCisJICogVmFsaWRhdGUgYSBzcGVjaWZpYyBmaWxlIHJlc291cmNlLgorCSAqIAorCSAqIEBwYXJhbSBmaWxlCisJICogICAgICAgICAgICBUaGUgZmlsZSB0byBiZSB2YWxpZGF0ZWQuCisJICogQHBhcmFtIG1vbml0b3IKKwkgKiAgICAgICAgICAgIFByb2dyZXNzIG1vbml0b3IuCisJICogQHJldHVybiB0aGUgcmVzdWx0IG9mIHZhbGlkYXRpbmcgdGhlIGZpbGUuCisJICovCisgIHB1YmxpYyBWYWxpZGF0aW9uUmVzdWx0cyB2YWxpZGF0ZShJRmlsZSBmaWxlLCBJUHJvZ3Jlc3NNb25pdG9yIG1vbml0b3IpIHRocm93cyBDb3JlRXhjZXB0aW9ueworICAgICAgVmFsT3BlcmF0aW9uIHZvID0gVmFsaWRhdGlvblJ1bm5lci52YWxpZGF0ZShmaWxlLCBWYWxUeXBlLk1hbnVhbCwgbW9uaXRvciwgdHJ1ZSk7CisgICAgICByZXR1cm4gdm8uZ2V0UmVzdWx0cygpOworICAgIH0KKwkgIAogCS8qKgogCSAqIEFuc3dlciBhbGwgdGhlIHJlc291cmNlcyBpbiB0aGUgcHJvamVjdHMgYXMgYSBtYXAuCiAJICogQHBhcmFtIHByb2plY3RzCkBAIC00NjEsNSArNjY4LDE2IEBACiAJCX0KIAkJCiAJfQorCQorCS8qKgorCSAqIFN0b3JlIHRoZSBzaW5nbGV0b24gZm9yIHRoZSBWYWxpZGF0aW9uRnJhbWV3b3JrLiBUaGlzIGFwcHJvYWNoIGlzIHVzZWQgdG8gYXZvaWQgaGF2aW5nIHRvIHN5bmNocm9uaXplIHRoZQorCSAqIFZhbGlkYXRpb25GcmFtZXdvcmsuZ2V0RGVmYXVsdCgpIG1ldGhvZC4KKwkgKiAKKwkgKiBAYXV0aG9yIGthcmFzaXVrCisJICoKKwkgKi8KKwlwcml2YXRlIHN0YXRpYyBjbGFzcyBTaW5nbGV0b24geworCQlzdGF0aWMgVmFsaWRhdGlvbkZyYW1ld29yayB2ZiA9IG5ldyBWYWxpZGF0aW9uRnJhbWV3b3JrKCk7CisJfQogCiB9CmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uL3ZmMi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9WYWxpZGF0aW9uUmVzdWx0LmphdmEgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uL3ZmMi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9WYWxpZGF0aW9uUmVzdWx0LmphdmEKaW5kZXggMWU1NGI3Yy4uYzE3MTRlMSAxMDA2NDQKLS0tIGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi92ZjIvb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vVmFsaWRhdGlvblJlc3VsdC5qYXZhCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24vdmYyL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL1ZhbGlkYXRpb25SZXN1bHQuamF2YQpAQCAtMSw1ICsxLDUgQEAKIC8qKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqCi0gKiBDb3B5cmlnaHQgKGMpIDIwMDcsIDIwMDggSUJNIENvcnBvcmF0aW9uIGFuZCBvdGhlcnMuCisgKiBDb3B5cmlnaHQgKGMpIDIwMDcsIDIwMDkgSUJNIENvcnBvcmF0aW9uIGFuZCBvdGhlcnMuCiAgKiBBbGwgcmlnaHRzIHJlc2VydmVkLiBUaGlzIHByb2dyYW0gYW5kIHRoZSBhY2NvbXBhbnlpbmcgbWF0ZXJpYWxzCiAgKiBhcmUgbWFkZSBhdmFpbGFibGUgdW5kZXIgdGhlIHRlcm1zIG9mIHRoZSBFY2xpcHNlIFB1YmxpYyBMaWNlbnNlIHYxLjAKICAqIHdoaWNoIGFjY29tcGFuaWVzIHRoaXMgZGlzdHJpYnV0aW9uLCBhbmQgaXMgYXZhaWxhYmxlIGF0CkBAIC0zNCw5ICszNCw5IEBACiAgKi8KIHB1YmxpYyBmaW5hbCBjbGFzcyBWYWxpZGF0aW9uUmVzdWx0IHsKIAkKLQlwcml2YXRlIExpc3Q8VmFsaWRhdG9yTWVzc2FnZT4gX21lc3NhZ2VzOworCXByaXZhdGUgZmluYWwgTGlzdDxWYWxpZGF0b3JNZXNzYWdlPiBfbWVzc2FnZXMgPSBuZXcgTGlua2VkTGlzdDxWYWxpZGF0b3JNZXNzYWdlPigpOwogCQotCXByaXZhdGUgc3RhdGljIFZhbGlkYXRvck1lc3NhZ2VbXSBfbm9NZXNzYWdlcyA9IG5ldyBWYWxpZGF0b3JNZXNzYWdlWzBdOworCXByaXZhdGUgZmluYWwgc3RhdGljIFZhbGlkYXRvck1lc3NhZ2VbXSBfbm9NZXNzYWdlcyA9IG5ldyBWYWxpZGF0b3JNZXNzYWdlWzBdOwogCQogCXByaXZhdGUgYm9vbGVhbgkJX2NhbmNlbGVkOwogCQpAQCAtNzgsMTIgKzc4LDE0IEBACiAJICogb25lIHR5cGUgb2YgbWVzc2FnZSwgYW5kIHRob3NlIG1lc3NhZ2VzIGNhbiBiZSBlaXRoZXIgYmUgZGlyZWN0bHkgdXNlZCBieQogCSAqIHRoZSBjYWxsZXIsIG9yIGF1dG9tYXRpY2FsbHkgY29udmVydGVkIGludG8gSU1hcmtlcnMgYnkgdGhlIHZhbGlkYXRpb24KIAkgKiBmcmFtZXdvcmsuCisJICogPC9wPgogCSAqIDxwPgogCSAqIFRvIG1ha2UgbWF0dGVycyBldmVuIG1vcmUgY29tcGxpY2F0ZWQgdGhlcmUgaXMgYSB0aGlyZCB3YXkgdG8gcmV0dXJuCiAJICogbWVzc2FnZXMuIFRvIG1ha2UgaXQgZWFzaWVyIGZvciBvbGQgdmFsaWRhdG9ycyB0byBwb3J0IHRvIHRoZSBuZXcKIAkgKiBmcmFtZXdvcmssIHRoZXkgY2FuIGNvbnRpbnVlIHRvIHVzZSBhbiBJUmVwb3J0ZXIuIElmIGEgdmFsaWRhdG9yIGNhbGxzCiAJICogdGhlIGdldFJlcG9ydGVyKCkgbWV0aG9kIHRoZW4gaXQgaXMgYXNzdW1lZCBieSB0aGUgZnJhbWV3b3JrIHRoYXQgdGhhdCBpcwogCSAqIHRoZSBhcHByb2FjaCB0aGF0IHRoZXkgaGF2ZSBjaG9zZW4uCisJICogPC9wPgogCSAqIAogCSAqIEBzZWUgI2dldFJlcG9ydGVyKElQcm9ncmVzc01vbml0b3IpCiAJICogCkBAIC05MSw3ICs5Myw3IEBACiAJICogCQlBIHZhbGlkYXRpb24gbWVzc2FnZS4KIAkgKi8KIAlwdWJsaWMgdm9pZCBhZGQoVmFsaWRhdG9yTWVzc2FnZSBtZXNzYWdlKXsKLQkJZ2V0TWVzc2FnZUxpc3QoKS5hZGQobWVzc2FnZSk7CisJCV9tZXNzYWdlcy5hZGQobWVzc2FnZSk7CiAJfQogCQogCS8qKgpAQCAtMTYzLDYgKzE2NSwxOSBAQAogCQlfbWVzc2FnZXMudG9BcnJheShtc2dzKTsKIAkJcmV0dXJuIG1zZ3M7CiAJfQorCQkKKwkvKioKKwkgKiBBbnN3ZXIgYSBjb3B5IG9mIGFueSB2YWxpZGF0aW9uIG1lc3NhZ2VzIHRoYXQgd2VyZSBhZGRlZCBieSB0aGUgdmFsaWRhdG9yLiBUaGUgYXJyYXkgaXMgYSBuZXcKKwkgKiBhcnJheSwgYW5kIGVhY2ggbWVzc2FnZSBpcyBhIGNvcHkuIAorCSAqIEByZXR1cm4gYW4gYXJyYXkgaXMgcmV0dXJuZWQgZXZlbiBpZiB0aGVyZSBhcmUgbm8gbWVzc2FnZXMuCisJICovCisJcHVibGljIHN5bmNocm9uaXplZCBWYWxpZGF0b3JNZXNzYWdlW10gZ2V0TWVzc2FnZXNBc0NvcHkoKXsKKwkJaWYgKF9tZXNzYWdlcyA9PSBudWxsKXJldHVybiBfbm9NZXNzYWdlczsKKwkJVmFsaWRhdG9yTWVzc2FnZVtdIG1zZ3MgPSBuZXcgVmFsaWRhdG9yTWVzc2FnZVtfbWVzc2FnZXMuc2l6ZSgpXTsKKwkJaW50IGkgPSAwOworCQlmb3IgKFZhbGlkYXRvck1lc3NhZ2UgbXNnIDogX21lc3NhZ2VzKW1zZ3NbaSsrXSA9IG1zZy5hc0NvcHkoKTsKKwkJcmV0dXJuIG1zZ3M7CisJfQogCiAJLyoqCiAJICogVXBkYXRlIHRoZSByZXNvdXJjZXMgdGhhdCB0aGUgdmFsaWRhdGVkIHJlc291cmNlIGRlcGVuZHMgb24uIFRoaXMgY2FuIGJlCkBAIC0xNzksMTEgKzE5NCw2IEBACiAJCV9kZXBlbmRzT24gPSBkZXBlbmRzT247CiAJfQogCQotCXByaXZhdGUgTGlzdDxWYWxpZGF0b3JNZXNzYWdlPiBnZXRNZXNzYWdlTGlzdCgpewotCQlpZiAoX21lc3NhZ2VzID09IG51bGwpX21lc3NhZ2VzID0gbmV3IExpbmtlZExpc3Q8VmFsaWRhdG9yTWVzc2FnZT4oKTsKLQkJcmV0dXJuIF9tZXNzYWdlczsKLQl9Ci0KIAkvKioKIAkgKiBAcmV0dXJuIEFsbCB0aGUgcmVzb3VyY2VzIHRoYXQgd2VyZSB2YWxpZGF0ZWQgYXMgYSBzaWRlLWVmZmVjdCBvZgogCSAqIAl2YWxpZGF0aW5nIHRoZSBtYWluIHJlc291cmNlLCBvciBudWxsIGlmIG5vbmUgd2VyZS4KZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24vdmYyL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL1ZhbGlkYXRpb25SZXN1bHRzLmphdmEgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uL3ZmMi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9WYWxpZGF0aW9uUmVzdWx0cy5qYXZhCmluZGV4IGY2MTQxMjEuLmJhOTQ3ZjggMTAwNjQ0Ci0tLSBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24vdmYyL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL1ZhbGlkYXRpb25SZXN1bHRzLmphdmEKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi92ZjIvb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vVmFsaWRhdGlvblJlc3VsdHMuamF2YQpAQCAtMSw1ICsxLDUgQEAKIC8qKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqCi0gKiBDb3B5cmlnaHQgKGMpIDIwMDcgSUJNIENvcnBvcmF0aW9uIGFuZCBvdGhlcnMuCisgKiBDb3B5cmlnaHQgKGMpIDIwMDcsIDIwMDkgSUJNIENvcnBvcmF0aW9uIGFuZCBvdGhlcnMuCiAgKiBBbGwgcmlnaHRzIHJlc2VydmVkLiBUaGlzIHByb2dyYW0gYW5kIHRoZSBhY2NvbXBhbnlpbmcgbWF0ZXJpYWxzCiAgKiBhcmUgbWFkZSBhdmFpbGFibGUgdW5kZXIgdGhlIHRlcm1zIG9mIHRoZSBFY2xpcHNlIFB1YmxpYyBMaWNlbnNlIHYxLjAKICAqIHdoaWNoIGFjY29tcGFuaWVzIHRoaXMgZGlzdHJpYnV0aW9uLCBhbmQgaXMgYXZhaWxhYmxlIGF0CkBAIC0xMCw2ICsxMCw3IEBACiAgKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKi8KIHBhY2thZ2Ugb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb247CiAKKwogLyoqCiAgKiBUaGUgY29tYmluZWQgcmVzdWx0cyBvZiB2YWxpZGF0aW5nIG11bHRpcGxlIHJlc291cmNlcy4KICAqIDxwPgpAQCAtMjEsMTEgKzIyLDI2IEBACiAgKiBAYXV0aG9yIGthcmFzaXVrCiAgKgogICovCi1wdWJsaWMgY2xhc3MgVmFsaWRhdGlvblJlc3VsdHMgewotCXByaXZhdGUgVmFsaWRhdGlvblJlc3VsdCBfcmVzdWx0OworcHVibGljIGZpbmFsIGNsYXNzIFZhbGlkYXRpb25SZXN1bHRzIHsKKwkKKwlwcml2YXRlIGZpbmFsIFZhbGlkYXRvck1lc3NhZ2VbXSBfbWVzc2FnZXM7CisJcHJpdmF0ZSBmaW5hbCBpbnQgCV9lcnJvcjsKKwlwcml2YXRlIGZpbmFsIGludAlfd2FybjsKKwlwcml2YXRlIGZpbmFsIGludAlfaW5mbzsKIAkKIAlwdWJsaWMgVmFsaWRhdGlvblJlc3VsdHMoVmFsaWRhdGlvblJlc3VsdCByZXN1bHQpewotCQlfcmVzdWx0ID0gcmVzdWx0OworCQlpZiAocmVzdWx0ID09IG51bGwpeworCQkJX21lc3NhZ2VzID0gbmV3IFZhbGlkYXRvck1lc3NhZ2VbMF07CisJCQlfZXJyb3IgPSAwOworCQkJX3dhcm4gPSAwOworCQkJX2luZm8gPSAwOworCQl9CisJCWVsc2UgeworCQkJX21lc3NhZ2VzID0gcmVzdWx0LmdldE1lc3NhZ2VzQXNDb3B5KCk7CisJCQlfZXJyb3IgPSByZXN1bHQuZ2V0U2V2ZXJpdHlFcnJvcigpOworCQkJX3dhcm4gPSByZXN1bHQuZ2V0U2V2ZXJpdHlXYXJuaW5nKCk7CisJCQlfaW5mbyA9IHJlc3VsdC5nZXRTZXZlcml0eUluZm8oKTsKKwkJfQogCX0KIAkKIAkvKioKQEAgLTMzLDMyICs0OSwyOCBAQAogCSAqIEByZXR1cm4gYW4gYXJyYXkgaXMgcmV0dXJuZWQgZXZlbiBpZiB0aGVyZSBhcmUgbm8gbWVzc2FnZXMuCiAJICovCiAJcHVibGljIFZhbGlkYXRvck1lc3NhZ2VbXSBnZXRNZXNzYWdlcygpewotCQlpZiAoX3Jlc3VsdCA9PSBudWxsKXJldHVybiBuZXcgVmFsaWRhdG9yTWVzc2FnZVswXTsKLQkJcmV0dXJuIF9yZXN1bHQuZ2V0TWVzc2FnZXMoKTsKKwkJcmV0dXJuIF9tZXNzYWdlczsKIAl9CiAKIAkvKioKIAkgKiBBbnN3ZXIgdGhlIG51bWJlciBvZiBlcnJvciBtZXNzYWdlcyB0aGF0IHdlcmUgZ2VuZXJhdGVkIGFzIHBhcnQgb2YgdGhpcyB2YWxpZGF0aW9uIG9wZXJhdGlvbi4KIAkgKi8KIAlwdWJsaWMgaW50IGdldFNldmVyaXR5RXJyb3IoKSB7Ci0JCWlmIChfcmVzdWx0ID09IG51bGwpcmV0dXJuIDA7Ci0JCXJldHVybiBfcmVzdWx0LmdldFNldmVyaXR5RXJyb3IoKTsKKwkJcmV0dXJuIF9lcnJvcjsKIAl9CiAKIAkvKioKIAkgKiBBbnN3ZXIgdGhlIG51bWJlciBvZiBpbmZvcm1hdGlvbmFsIG1lc3NhZ2VzIHRoYXQgd2VyZSBnZW5lcmF0ZWQgYXMgcGFydCBvZiB0aGlzIHZhbGlkYXRpb24gb3BlcmF0aW9uLgogCSAqLwogCXB1YmxpYyBpbnQgZ2V0U2V2ZXJpdHlJbmZvKCkgewotCQlpZiAoX3Jlc3VsdCA9PSBudWxsKXJldHVybiAwOwotCQlyZXR1cm4gX3Jlc3VsdC5nZXRTZXZlcml0eUluZm8oKTsKKwkJcmV0dXJuIF9pbmZvOwogCX0KIAkKIAkvKioKIAkgKiBBbnN3ZXIgdGhlIG51bWJlciBvZiB3YXJuaW5nIG1lc3NhZ2VzIHRoYXQgd2VyZSBnZW5lcmF0ZWQgYXMgcGFydCBvZiB0aGlzIHZhbGlkYXRpb24gb3BlcmF0aW9uLgogCSAqLwogCXB1YmxpYyBpbnQgZ2V0U2V2ZXJpdHlXYXJuaW5nKCkgewotCQlpZiAoX3Jlc3VsdCA9PSBudWxsKXJldHVybiAwOwotCQlyZXR1cm4gX3Jlc3VsdC5nZXRTZXZlcml0eVdhcm5pbmcoKTsKKwkJcmV0dXJuIF93YXJuOwogCX0KIAogfQpkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi92ZjIvb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vVmFsaWRhdGlvblN0YXRlLmphdmEgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uL3ZmMi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9WYWxpZGF0aW9uU3RhdGUuamF2YQppbmRleCAzYzE5NGFjLi44MDk3ZGU0IDEwMDY0NAotLS0gYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uL3ZmMi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9WYWxpZGF0aW9uU3RhdGUuamF2YQorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uL3ZmMi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9WYWxpZGF0aW9uU3RhdGUuamF2YQpAQCAtMSw1ICsxLDUgQEAKIC8qKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqCi0gKiBDb3B5cmlnaHQgKGMpIDIwMDcgSUJNIENvcnBvcmF0aW9uIGFuZCBvdGhlcnMuCisgKiBDb3B5cmlnaHQgKGMpIDIwMDcsIDIwMDggSUJNIENvcnBvcmF0aW9uIGFuZCBvdGhlcnMuCiAgKiBBbGwgcmlnaHRzIHJlc2VydmVkLiBUaGlzIHByb2dyYW0gYW5kIHRoZSBhY2NvbXBhbnlpbmcgbWF0ZXJpYWxzCiAgKiBhcmUgbWFkZSBhdmFpbGFibGUgdW5kZXIgdGhlIHRlcm1zIG9mIHRoZSBFY2xpcHNlIFB1YmxpYyBMaWNlbnNlIHYxLjAKICAqIHdoaWNoIGFjY29tcGFuaWVzIHRoaXMgZGlzdHJpYnV0aW9uLCBhbmQgaXMgYXZhaWxhYmxlIGF0CkBAIC0zNSw3ICszNSw3IEBACiAgKiBAYXV0aG9yIGthcmFzaXVrCiAgKgogICovCi1wdWJsaWMgY2xhc3MgVmFsaWRhdGlvblN0YXRlIHsKK3B1YmxpYyBmaW5hbCBjbGFzcyBWYWxpZGF0aW9uU3RhdGUgewogCQogCS8qKgogCSAqIFRoaXMgaXMgYSBzcGVjaWFsIGlkLgpAQCAtNDUsMTAgKzQ1LDE2IEBACiAJICogcmVzb3VyY2UgdGhhdCBhY3R1YWxseSBjaGFuZ2VkLCBpcyBwbGFjZWQgaW50byB0aGUgVmFsaWRhdGlvblN0YXRlIHVzaW5nCiAJICogdGhpcyBpZC4KIAkgKiA8L3A+CisJICogQGRlcHJlY2F0ZWQgVGhpcyBhcHByb2FjaCBpcyBub3QgdGhyZWFkIHNhZmUsIHRoZSBsb25nZXIgZm9ybSBvZiB0aGUgQWJzdHJhY3RWYWxpZGF0b3IgdmFsaWRhdGUgbWV0aG9kIHNob3VsZCBiZSB1c2VkIGluc3RlYWQuCisJICogQHNlZSBBYnN0cmFjdFZhbGlkYXRvciN2YWxpZGF0ZShWYWxpZGF0aW9uRXZlbnQsIFZhbGlkYXRpb25TdGF0ZSwgb3JnLmVjbGlwc2UuY29yZS5ydW50aW1lLklQcm9ncmVzc01vbml0b3IpCiAJICovCiAJcHVibGljIHN0YXRpYyBmaW5hbCBTdHJpbmcgVHJpZ2dlclJlc291cmNlID0gVmFsaWRhdGlvblBsdWdpbi5QTFVHSU5fSUQgKyAiLlRyaWdnZXIiOyAvLyROT04tTkxTLTEkCiAKLQlwcml2YXRlIE1hcDxTdHJpbmcsIE9iamVjdD4gX21hcCA9IG5ldyBIYXNoTWFwPFN0cmluZywgT2JqZWN0Pig1MCk7CisJLy8gSSBjYW4ndCB1c2UgYSBDb25uY3VycmVudEhhc2hNYXAgYmVjYXVzZSBzb21lIG9mIHRoZSBjbGllbnRzIHN0b3JlIG51bGxzLgorCXByaXZhdGUgZmluYWwgTWFwPFN0cmluZywgT2JqZWN0PiBfbWFwID0gbmV3IEhhc2hNYXA8U3RyaW5nLCBPYmplY3Q+KDUwKTsKKwkKKwlwdWJsaWMgVmFsaWRhdGlvblN0YXRlKCl7CisJfQogCQogCS8qKgogCSAqIFNhdmUgc29tZSBzdGF0ZSBpbmZvcm1hdGlvbi4KQEAgLTYyLDcgKzY4LDcgQEAKIAkgKiAJCXZhbGlkYXRpb24gZnJhbWV3b3JrIGRvZXNuJ3QgZG8gYW55dGhpbmcgd2l0aCB0aGlzIG9iamVjdCBleGNlcHQKIAkgKiAJCXBhc3MgaXQgYWxvbmcgZHVyaW5nIHRoZSB2YWxpZGF0aW9uIHByb2Nlc3MuCiAJICovCi0JcHVibGljIHZvaWQgcHV0KFN0cmluZyBpZCwgT2JqZWN0IHZhbHVlKXsKKwlwdWJsaWMgc3luY2hyb25pemVkIHZvaWQgcHV0KFN0cmluZyBpZCwgT2JqZWN0IHZhbHVlKXsKIAkJX21hcC5wdXQoaWQsIHZhbHVlKTsKIAl9CiAJCkBAIC03Niw3ICs4Miw3IEBACiAJICogQHJldHVybiBhbnkgYXJiaXRyYXJ5IGRhdGEgdGhhdCB0aGUgdmFsaWRhdG9yIG1pZ2h0IGZpbmQgdXNlZnVsLAogCSAqIAlpbmNsdWRpbmcgbnVsbC4KIAkgKi8KLQlwdWJsaWMgT2JqZWN0IGdldChTdHJpbmcgaWQpeworCXB1YmxpYyBzeW5jaHJvbml6ZWQgT2JqZWN0IGdldChTdHJpbmcgaWQpewogCQlyZXR1cm4gX21hcC5nZXQoaWQpOwogCX0KIApkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi92ZjIvb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vVmFsaWRhdG9yLmphdmEgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uL3ZmMi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9WYWxpZGF0b3IuamF2YQppbmRleCAxMjRmOGE1Li44OGY1ZWM1IDEwMDY0NAotLS0gYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uL3ZmMi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9WYWxpZGF0b3IuamF2YQorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uL3ZmMi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9WYWxpZGF0b3IuamF2YQpAQCAtMSw1ICsxLDUgQEAKIC8qKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqCi0gKiBDb3B5cmlnaHQgKGMpIDIwMDcsIDIwMDggSUJNIENvcnBvcmF0aW9uIGFuZCBvdGhlcnMuCisgKiBDb3B5cmlnaHQgKGMpIDIwMDcsIDIwMTAgSUJNIENvcnBvcmF0aW9uIGFuZCBvdGhlcnMuCiAgKiBBbGwgcmlnaHRzIHJlc2VydmVkLiBUaGlzIHByb2dyYW0gYW5kIHRoZSBhY2NvbXBhbnlpbmcgbWF0ZXJpYWxzCiAgKiBhcmUgbWFkZSBhdmFpbGFibGUgdW5kZXIgdGhlIHRlcm1zIG9mIHRoZSBFY2xpcHNlIFB1YmxpYyBMaWNlbnNlIHYxLjAKICAqIHdoaWNoIGFjY29tcGFuaWVzIHRoaXMgZGlzdHJpYnV0aW9uLCBhbmQgaXMgYXZhaWxhYmxlIGF0CkBAIC0xMywxMCArMTMsMTMgQEAKIGltcG9ydCBqYXZhLmxhbmcucmVmbGVjdC5JbnZvY2F0aW9uVGFyZ2V0RXhjZXB0aW9uOwogaW1wb3J0IGphdmEudXRpbC5BcnJheUxpc3Q7CiBpbXBvcnQgamF2YS51dGlsLkhhc2hNYXA7CitpbXBvcnQgamF2YS51dGlsLkhhc2hTZXQ7CiBpbXBvcnQgamF2YS51dGlsLkl0ZXJhdG9yOwogaW1wb3J0IGphdmEudXRpbC5MaW5rZWRMaXN0OwogaW1wb3J0IGphdmEudXRpbC5MaXN0OwogaW1wb3J0IGphdmEudXRpbC5NYXA7CitpbXBvcnQgamF2YS51dGlsLlNldDsKK2ltcG9ydCBqYXZhLnV0aWwuY29uY3VycmVudC5hdG9taWMuQXRvbWljQm9vbGVhbjsKIAogaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucmVzb3VyY2VzLklNYXJrZXI7CiBpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5yZXNvdXJjZXMuSVByb2plY3Q7CkBAIC00MSw3ICs0NCw2IEBACiBpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uaW50ZXJuYWwuVmFsTWFuYWdlcjsKIGltcG9ydCBvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5pbnRlcm5hbC5WYWxNZXNzYWdlczsKIGltcG9ydCBvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5pbnRlcm5hbC5WYWxPcGVyYXRpb247Ci1pbXBvcnQgb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uaW50ZXJuYWwuVmFsT3BlcmF0aW9uTWFuYWdlcjsKIGltcG9ydCBvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5pbnRlcm5hbC5WYWxQcmVmTWFuYWdlckdsb2JhbDsKIGltcG9ydCBvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5pbnRlcm5hbC5WYWxQcmVmTWFuYWdlclByb2plY3Q7CiBpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uaW50ZXJuYWwuVmFsVHlwZTsKQEAgLTU3LDYgKzU5LDcgQEAKIGltcG9ydCBvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5pbnRlcm5hbC5wbHVnaW4uVmFsaWRhdGlvblBsdWdpbjsKIGltcG9ydCBvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5pbnRlcm5hbC5wcm92aXNpb25hbC5jb3JlLklNZXNzYWdlOwogaW1wb3J0IG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLmludGVybmFsLnByb3Zpc2lvbmFsLmNvcmUuSVZhbGlkYXRvcjsKK2ltcG9ydCBvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5pbnRlcm5hbC5wcm92aXNpb25hbC5jb3JlLklWYWxpZGF0b3JFeHRlbmRlcjsKIAogLyoqCiAgKiBSZXByZXNlbnRzIGEgdmFsaWRhdG9yLiBUaGlzIGdldHMgaW5zdGFudGlhdGVkIHRocm91Z2ggb25lIG9mIHRoZSB2YWxpZGF0b3IgZXh0ZW5zaW9uIHBvaW50cy4KQEAgLTExNCw2ICsxMTcsMTcgQEAKIAkvKiogSG93IG1hbnkgdGltZXMgaGFzIGEgbWVzc2FnZSBmaWVsZCBpbiB0aGlzIHZhbGlkYXRvciBiZWVuIGNoYW5nZWQgc2luY2UgaXQgd2FzIGNyZWF0ZWQgKG9yIGNvcGllZCk/ICovCiAJcHJvdGVjdGVkIHRyYW5zaWVudCBpbnQgX2NoYW5nZUNvdW50TWVzc2FnZXM7CiAJCisJLyoqIEhhcyB0aGUgdmFsaWRhdG9yIGJlZW4gbWlncmF0ZWQgZnJvbSBhbiBlYXJsaWVyIHZlcnNpb24gaW4gdGhpcyBzZXNzaW9uLCBidXQgbm90IHlldCBzYXZlZD8gKi8KKwlwcml2YXRlIGJvb2xlYW4gX21pZ3JhdGVkOworCQorCXB1YmxpYyBWYWxpZGF0b3IoSVByb2plY3QgcHJvamVjdCl7CisJCV9wcm9qZWN0ID0gcHJvamVjdDsKKwl9CisJCQorCXZvaWQgc2V0TWlncmF0ZWQoYm9vbGVhbiBtaWdyYXRlZCl7CisJCV9taWdyYXRlZCA9IG1pZ3JhdGVkOworCX0KKwkKIAkvKioKIAkgKiBDcmVhdGUgYSBuZXcgdmFsaWRhdG9yIGJhc2VkIG9uIGEgYWJzdHJhY3QgdmFsaWRhdG9yLgogCSAqIApAQCAtMTM3LDggKzE1MSw3IEBACiAJICogICAgICAgICAgICBtZWFucyB0aGF0IHlvdSBhcmUgYSBnbG9iYWwgdmFsaWRhdG9yLgogCSAqLwogCXB1YmxpYyBzdGF0aWMgVmFsaWRhdG9yIGNyZWF0ZShWYWxpZGF0b3JNZXRhRGF0YSB2bWQsIFZhbGlkYXRpb25Db25maWd1cmF0aW9uIGNvbmZpZywgSVByb2plY3QgcHJvamVjdCl7Ci0JCVYxIHYxID0gbmV3IFYxKHZtZCwgY29uZmlnKTsKLQkJdjEuX3Byb2plY3QgPSBwcm9qZWN0OworCQlWMSB2MSA9IG5ldyBWMSh2bWQsIGNvbmZpZywgcHJvamVjdCk7CiAJCXJldHVybiB2MTsKIAl9CiAJCkBAIC0xNjMsMTQgKzE3NiwxNCBAQAogCSAqIEBwYXJhbSBwcm9qZWN0IHRoZSBwcm9qZWN0IGJlaW5nIGJ1aWx0LgogCSAqIEBwYXJhbSBtb25pdG9yIHRoZSBtb25pdG9yIHRoYXQgc2hvdWxkIGJlIHVzZWQgZm9yIHJlcG9ydGluZyBwcm9ncmVzcyBpZiB0aGUgY2xlYW4gdGFrZXMgYSBsb25nIHRpbWUuCiAJICovCi0JcHVibGljIHZvaWQgY2xlYW4oSVByb2plY3QgcHJvamVjdCwgSVByb2dyZXNzTW9uaXRvciBtb25pdG9yKXsKKwlwdWJsaWMgdm9pZCBjbGVhbihJUHJvamVjdCBwcm9qZWN0LCBWYWxPcGVyYXRpb24gb3BlcmF0aW9uLCBJUHJvZ3Jlc3NNb25pdG9yIG1vbml0b3IpewogCX0JCiAJCiAJLyoqCiAJICogQ29tcGFyZSB5b3Vyc2VsZiBiYXNlZCBvbiBWYWxpZGF0b3IgbmFtZS4KIAkgKi8KIAlwdWJsaWMgaW50IGNvbXBhcmVUbyhWYWxpZGF0b3IgdmFsaWRhdG9yKSB7Ci0JCQlyZXR1cm4gZ2V0TmFtZSgpLmNvbXBhcmVUbyh2YWxpZGF0b3IuZ2V0TmFtZSgpKTsJCQkKKwkJcmV0dXJuIGdldE5hbWUoKS5jb21wYXJlVG8odmFsaWRhdG9yLmdldE5hbWUoKSk7CQkJCiAJfQogCQogCS8qKiBBbnN3ZXIgYSBkZWVwIGNvcHkgb2YgeW91cnNlbGYuICovCkBAIC0xODksOSArMjAyLDkgQEAKIAkJX21hbnVhbFZhbGlkYXRpb24gPSB2Ll9tYW51YWxWYWxpZGF0aW9uOwogCQlfbWFya2VySWQgPSB2Ll9tYXJrZXJJZDsKIAkJX21lc3NhZ2VTZXR0aW5ncyA9IHYuX21lc3NhZ2VTZXR0aW5nczsKLQkJX3Byb2plY3QgPSB2Ll9wcm9qZWN0OwogCQlfc291cmNlSWQgPSB2Ll9zb3VyY2VJZDsKIAkJX3ZlcnNpb24gPSB2Ll92ZXJzaW9uOworCQlfbWlncmF0ZWQgPSB2Ll9taWdyYXRlZDsKIAkJCiAJCWlmIChpbmNsdWRlQ2hhbmdlQ291bnRzKXsKIAkJCV9jaGFuZ2VDb3VudEdsb2JhbCA9IHYuX2NoYW5nZUNvdW50R2xvYmFsOwpAQCAtMjAwLDYgKzIxMywyMyBAQAogCX0KIAkKIAkvKioKKwkgKiBTaG91bGQgdGhlIHZhbGlkYXRpb24gZnJhbWV3b3JrIGZpcnN0IGNsZWFyIHRoZSBtYXJrZXJzIHRoYXQgdGhpcworCSAqIHZhbGlkYXRvciBoYXMgcGxhY2VkIG9uIHRoaXMgcmVzb3VyY2U/IFRoaXMgbWV0aG9kIGNhbiBiZSBvdmVycmlkZGVuIGJ5CisJICogdmFsaWRhdG9yIGltcGxlbWVudG9ycyB0byBwcm92aWRlIGEgdmFsaWRhdG9yIHNwZWNpZmljIGJlaGF2aW9yLgorCSAqIAorCSAqIEBwYXJhbSBldmVudAorCSAqICAgICAgICAgICAgVGhlIHZhbGlkYXRpb24gZXZlbnQgdGhhdCB0cmlnZ2VyZWQgdGhlIHZhbGlkYXRpb24uCisJICogQHJldHVybiB0cnVlIGlmIHRoZSB2YWxpZGF0aW9uIGZyYW1ld29yayBzaG91bGQgZmlyc3QgY2xlYXIgYWxsIHRoZQorCSAqICAgICAgICAgbWFya2VycyB0aGF0IHRoaXMgdmFsaWRhdG9yIHByb2R1Y2VkLiBUaGlzIGlzIHRoZSBkZWZhdWx0CisJICogICAgICAgICBiZWhhdmlvci4gUmV0dXJuIGZhbHNlIHRvIGxlYXZlIHRoZSBtYXJrZXJzIHVuY2hhbmdlZC4gSXQgdGhlbgorCSAqICAgICAgICAgYmVjb21lcyB0aGUgcmVzcG9uc2liaWxpdHkgb2YgdGhlIHZhbGlkYXRvciB0byBtYW5hZ2UgaXQncyBvd24KKwkgKiAgICAgICAgIG1hcmtlcnMgZm9yIHRoaXMgcmVzb3VyY2UsIGZvciB0aGlzIHZhbGlkYXRpb24gZXZlbnQuCisJICovCisJcHVibGljIGJvb2xlYW4gc2hvdWxkQ2xlYXJNYXJrZXJzKFZhbGlkYXRpb25FdmVudCBldmVudCl7CisJCXJldHVybiB0cnVlOworCX0KKwkKKwkvKioKIAkgKiBBbnN3ZXIgdHJ1ZSBpZiB0aGlzIHZhbGlkYXRvciwgYmFzZWQgb24gaXQncyBmaWx0ZXJzLCBzaG91bGQgdmFsaWRhdGUKIAkgKiB0aGlzIHJlc291cmNlLiBUaGlzIG1ldGhvZCBkb2VzIG5vdCBjaGVjayB0byBzZWUgaWYgZ2xvYmFsIHZhbGlkYXRpb24gb3IKIAkgKiBwcm9qZWN0IHZhbGlkYXRpb24gaGFzIGJlZW4gc3VzcGVuZGVkIG9yIG5vdC4KQEAgLTMzMSwxNyArMzYxLDQ5IEBACiAJCX0KIAkJcmV0dXJuIHJlc3VsdDsKIAl9CisJCiAJLyoqCiAJICogVmFsaWRhdGUgdGhlIHJlc291cmNlLgogCSAqIAotCSAqIEBwYXJhbSByZXNvdXJjZSB0aGUgcmVzb3VyY2UgdG8gYmUgdmFsaWRhdGVkCi0JICogQHBhcmFtIGtpbmQgdGhlIGtpbmQgb2YgcmVzb3VyY2UgY2hhbmdlLCBzZWUgSVJlc291cmNlRGVsdGEgZm9yIHZhbHVlcy4KLQkgKiBAcGFyYW0gb3BlcmF0aW9uIHRoZSBvcGVyYXRpb24gdGhhdCB0aGlzIHZhbGlkYXRpb24gaXMgcnVubmluZyB1bmRlci4gVGhpcyBjYW4gYmUgbnVsbC4KLQkgKiBAcGFyYW0gbW9uaXRvciBhIHdheSB0byByZXBvcnQgcHJvZ3Jlc3MuIFRoaXMgY2FuIGJlIG51bGwuCisJICogQHBhcmFtIHJlc291cmNlCisJICogICAgICAgICAgICBUaGUgcmVzb3VyY2UgdG8gYmUgdmFsaWRhdGVkLgorCSAqIEBwYXJhbSBraW5kCisJICogICAgICAgICAgICBUaGUga2luZCBvZiByZXNvdXJjZSBjaGFuZ2UsIHNlZSBJUmVzb3VyY2VEZWx0YSBmb3IgdmFsdWVzLgorCSAqIEBwYXJhbSBvcGVyYXRpb24KKwkgKiAgICAgICAgICAgIFRoZSBvcGVyYXRpb24gdGhhdCB0aGlzIHZhbGlkYXRpb24gaXMgcnVubmluZyB1bmRlci4gVGhpcyBjYW4KKwkgKiAgICAgICAgICAgIGJlIG51bGwuCisJICogQHBhcmFtIG1vbml0b3IKKwkgKiAgICAgICAgICAgIEEgd2F5IHRvIHJlcG9ydCBwcm9ncmVzcy4gVGhpcyBjYW4gYmUgbnVsbC4KIAkgKiAKLQkgKiBAcmV0dXJuIHRoZSByZXN1bHQgb2YgZG9pbmcgdGhlIHZhbGlkYXRpb24sIGl0IGNhbiBiZSwgYnV0IHVzdWFsbHkgaXNuJ3QgbnVsbC4KKwkgKiBAcmV0dXJuIHRoZSByZXN1bHQgb2YgZG9pbmcgdGhlIHZhbGlkYXRpb24sIGl0IGNhbiBiZSwgYnV0IHVzdWFsbHkgaXNuJ3QKKwkgKiAgICAgICAgIG51bGwuCiAJICovCi0JcHVibGljIGFic3RyYWN0IFZhbGlkYXRpb25SZXN1bHQgdmFsaWRhdGUoSVJlc291cmNlIHJlc291cmNlLCBpbnQga2luZCwgVmFsT3BlcmF0aW9uIG9wZXJhdGlvbiwgSVByb2dyZXNzTW9uaXRvciBtb25pdG9yKTsJCisJcHVibGljIGFic3RyYWN0IFZhbGlkYXRpb25SZXN1bHQgdmFsaWRhdGUoSVJlc291cmNlIHJlc291cmNlLCBpbnQga2luZCwgVmFsT3BlcmF0aW9uIG9wZXJhdGlvbiwgSVByb2dyZXNzTW9uaXRvciBtb25pdG9yKTsKKwkKKwkvKioKKwkgKiBWYWxpZGF0ZSB0aGUgcmVzb3VyY2UuCisJICogCisJICogQHBhcmFtIHJlc291cmNlCisJICogICAgICAgICAgICBUaGUgcmVzb3VyY2UgdG8gYmUgdmFsaWRhdGVkLgorCSAqIEBwYXJhbSBraW5kCisJICogICAgICAgICAgICBUaGUga2luZCBvZiByZXNvdXJjZSBjaGFuZ2UsIHNlZSBJUmVzb3VyY2VEZWx0YSBmb3IgdmFsdWVzLgorCSAqIEBwYXJhbSBvcGVyYXRpb24KKwkgKiAgICAgICAgICAgIFRoZSBvcGVyYXRpb24gdGhhdCB0aGlzIHZhbGlkYXRpb24gaXMgcnVubmluZyB1bmRlci4gVGhpcyBjYW4KKwkgKiAgICAgICAgICAgIGJlIG51bGwuCisJICogQHBhcmFtIG1vbml0b3IKKwkgKiAgICAgICAgICAgIEEgd2F5IHRvIHJlcG9ydCBwcm9ncmVzcy4gVGhpcyBjYW4gYmUgbnVsbC4KKwkgKiBAcGFyYW0gZXZlbnQKKwkgKiAgICAgICAgICAgIEFuIGV2ZW50IHRoYXQgZGVzY3JpYmVzIGluIG1vcmUgZGV0YWlsIHdoYXQgc2hvdWxkIGJlCisJICogICAgICAgICAgICB2YWxpZGF0ZWQgYW5kIHdoeSBpdCBzaG91bGQgYmUgdmFsaWRhdGVkLiBUaGlzIGNhbiBiZSBudWxsLgorCSAqIAorCSAqIEByZXR1cm4gdGhlIHJlc3VsdCBvZiBkb2luZyB0aGUgdmFsaWRhdGlvbiwgaXQgY2FuIGJlLCBidXQgdXN1YWxseSBpc24ndAorCSAqICAgICAgICAgbnVsbC4KKwkgKi8KKwlwdWJsaWMgVmFsaWRhdGlvblJlc3VsdCB2YWxpZGF0ZShJUmVzb3VyY2UgcmVzb3VyY2UsIGludCBraW5kLCBWYWxPcGVyYXRpb24gb3BlcmF0aW9uLCBJUHJvZ3Jlc3NNb25pdG9yIG1vbml0b3IsIFZhbGlkYXRpb25FdmVudCBldmVudCl7CisJCS8vIFRoZSByZWFzb24gdGhhdCB0aGUgcmVzb3VyY2UgYW5kIGtpbmQgYXJlIHN0aWxsIHNwZWNpZmllZCwgaXMgdGhhdCBJIGRpZG4ndCB3YW50IHRvIHJlbW92ZSBhIHB1YmxpYyBtZXRob2QgaW4gdGhlIHNlcnZpY2UKKwkJLy8gc3RyZWFtLiAKKwkJcmV0dXJuIHZhbGlkYXRlKHJlc291cmNlLCBraW5kLCBvcGVyYXRpb24sIG1vbml0b3IpOwkJCisJfQogCiAJLyoqCiAJICogVGhpcyBtZXRob2Qgd2lsbCBiZSBjYWxsZWQgYmVmb3JlIGFueSB2YWxpZGF0aW9uIHRha2VzIHBsYWNlLiBJdCBhbGxvd3MgdmFsaWRhdG9ycyB0byBwZXJmb3JtIGFueQpAQCAtNDcxLDE2ICs1MzMsMjAgQEAKIAkgKiBTZXQgd2hldGhlciB0aGlzIHZhbGlkYXRvciBzaG91bGQgYmUgdHJpZ2dlcmVkIGFzIHBhcnQgb2YgYSBtYW51YWwgdmFsaWRhdGlvbi4KIAkgKiAKIAkgKiBAcGFyYW0gbWFudWFsVmFsaWRhdGlvbgorCSAqIEByZXR1cm4gdHJ1ZSBpZiB0aGUgc2V0dGluZyBjaGFuZ2VkLgogCSAqLwotCXB1YmxpYyB2b2lkIHNldE1hbnVhbFZhbGlkYXRpb24oYm9vbGVhbiBtYW51YWxWYWxpZGF0aW9uKSB7Ci0JCXNldE1hbnVhbFZhbGlkYXRpb24yKG1hbnVhbFZhbGlkYXRpb24pOworCXB1YmxpYyBib29sZWFuIHNldE1hbnVhbFZhbGlkYXRpb24oYm9vbGVhbiBtYW51YWxWYWxpZGF0aW9uKSB7CisJCXJldHVybiBzZXRNYW51YWxWYWxpZGF0aW9uMihtYW51YWxWYWxpZGF0aW9uKTsKIAl9CiAJCi0JcHJvdGVjdGVkIGZpbmFsIHZvaWQgc2V0TWFudWFsVmFsaWRhdGlvbjIoYm9vbGVhbiBtYW51YWxWYWxpZGF0aW9uKSB7CisJcHJvdGVjdGVkIGZpbmFsIGJvb2xlYW4gc2V0TWFudWFsVmFsaWRhdGlvbjIoYm9vbGVhbiBtYW51YWxWYWxpZGF0aW9uKSB7CisJCWJvb2xlYW4gY2hhbmdlZCA9IGZhbHNlOwogCQlpZiAoX21hbnVhbFZhbGlkYXRpb24gIT0gbWFudWFsVmFsaWRhdGlvbil7CiAJCQlidW1wQ2hhbmdlQ291bnRHbG9iYWwoKTsKKwkJCWNoYW5nZWQgPSB0cnVlOwogCQkJX21hbnVhbFZhbGlkYXRpb24gPSBtYW51YWxWYWxpZGF0aW9uOwogCQl9CisJCXJldHVybiBjaGFuZ2VkOwogCX0KIAogCS8qKgpAQCAtNDkxLDEwICs1NTcsMTAgQEAKIAl9CiAJCiAJLyoqCi0JICogSGFzIHRoZSB2YWxpZGF0b3IgY2hhbmdlZCBzaW5jZSBpdCB3YXMgbGFzdCBjcmVhdGVkIG9yIGNvcGllZD8KKwkgKiBIYXMgdGhlIHZhbGlkYXRvciBjaGFuZ2VkIHNpbmNlIGl0IHdhcyBsYXN0IGNyZWF0ZWQgb3IgY29waWVkPyBPciB3YXMgaXQgbWlncmF0ZWQgZnJvbSBhbiBlYXJsaWVyIHZlcnNpb24uIAogCSAqLwogCXB1YmxpYyBib29sZWFuIGlzQ2hhbmdlZCgpewotCQlpZiAoX2NoYW5nZUNvdW50R2xvYmFsID4gMCB8fCBfY2hhbmdlQ291bnRNZXNzYWdlcyA+IDApcmV0dXJuIHRydWU7CisJCWlmIChfY2hhbmdlQ291bnRHbG9iYWwgPiAwIHx8IF9jaGFuZ2VDb3VudE1lc3NhZ2VzID4gMCB8fCBfbWlncmF0ZWQpcmV0dXJuIHRydWU7CiAJCXJldHVybiBmYWxzZTsKIAl9CiAJCkBAIC01MDksMTYgKzU3NSwyMCBAQAogCSAqIFNldCB3aGV0aGVyIHRoaXMgdmFsaWRhdG9yIHNob3VsZCBiZSB0cmlnZ2VyZWQgYnkgdGhlIGJ1aWxkIHByb2Nlc3MuCiAJICogCiAJICogQHBhcmFtIGJ1aWxkVmFsaWRhdGlvbgorCSAqIEByZXR1cm4gdHJ1ZSBpZiB0aGUgc2V0dGluZyBjaGFuZ2VkLgogCSAqLwotCXB1YmxpYyB2b2lkIHNldEJ1aWxkVmFsaWRhdGlvbihib29sZWFuIGJ1aWxkVmFsaWRhdGlvbikgewotCQlzZXRCdWlsZFZhbGlkYXRpb24yKGJ1aWxkVmFsaWRhdGlvbik7CisJcHVibGljIGJvb2xlYW4gc2V0QnVpbGRWYWxpZGF0aW9uKGJvb2xlYW4gYnVpbGRWYWxpZGF0aW9uKSB7CisJCXJldHVybiBzZXRCdWlsZFZhbGlkYXRpb24yKGJ1aWxkVmFsaWRhdGlvbik7CiAJfQogCQotCXByb3RlY3RlZCBmaW5hbCB2b2lkIHNldEJ1aWxkVmFsaWRhdGlvbjIoYm9vbGVhbiBidWlsZFZhbGlkYXRpb24pIHsKKwlwcm90ZWN0ZWQgZmluYWwgYm9vbGVhbiBzZXRCdWlsZFZhbGlkYXRpb24yKGJvb2xlYW4gYnVpbGRWYWxpZGF0aW9uKSB7CisJCWJvb2xlYW4gY2hhbmdlZCA9IGZhbHNlOwogCQlpZiAoX2J1aWxkVmFsaWRhdGlvbiAhPSBidWlsZFZhbGlkYXRpb24pewogCQkJYnVtcENoYW5nZUNvdW50R2xvYmFsKCk7CisJCQljaGFuZ2VkID0gdHJ1ZTsKIAkJCV9idWlsZFZhbGlkYXRpb24gPSBidWlsZFZhbGlkYXRpb247CiAJCX0KKwkJcmV0dXJuIGNoYW5nZWQ7CiAJfQogCiAJLyoqCkBAIC01NzEsNyArNjQxLDggQEAKIAkgKiBAcGFyYW0gdm1kCiAJICogQHBhcmFtIGNvbmZpZyB0aGlzIGlzIHVzZWQgdG8gc2V0IHRoZSBnbG9iYWwgZW5hYmxlbWVudCBvcHRpb25zLiBJbiBzb21lIGNhc2UgdGhpcyBjYW4gYmUgbnVsbC4KIAkgKi8KLQlwdWJsaWMgVjEoVmFsaWRhdG9yTWV0YURhdGEgdm1kLCBWYWxpZGF0aW9uQ29uZmlndXJhdGlvbiBjb25maWcpeworCXB1YmxpYyBWMShWYWxpZGF0b3JNZXRhRGF0YSB2bWQsIFZhbGlkYXRpb25Db25maWd1cmF0aW9uIGNvbmZpZywgSVByb2plY3QgcHJvamVjdCl7CisJCXN1cGVyKHByb2plY3QpOwogCQlfdm1kID0gdm1kOwogCQlpZiAoY29uZmlnICE9IG51bGwpewogCQkJc2V0QnVpbGRWYWxpZGF0aW9uKGNvbmZpZy5pc0J1aWxkRW5hYmxlZCh2bWQpKTsKQEAgLTU4Myw2ICs2NTQsMTcgQEAKIAl9CiAJCiAJQE92ZXJyaWRlCisJcHVibGljIHZvaWQgdmFsaWRhdGlvbkZpbmlzaGluZyhJUHJvamVjdCBwcm9qZWN0LCBWYWxpZGF0aW9uU3RhdGUgc3RhdGUsIElQcm9ncmVzc01vbml0b3IgbW9uaXRvcikgeworCQlpZiAocHJvamVjdCAhPSBudWxsKSB7CisJCQlJVmFsaWRhdG9yIHYgPSBhc0lWYWxpZGF0b3IoKTsKKwkJCWlmICh2IGluc3RhbmNlb2YgSVZhbGlkYXRvckV4dGVuZGVyKSB7CisJCQkJSVZhbGlkYXRvckV4dGVuZGVyIHZFeHQgPSAoSVZhbGlkYXRvckV4dGVuZGVyKSB2OworCQkJCXZFeHQudmFsaWRhdGlvbkZpbmlzaGluZyhwcm9qZWN0LCBzdGF0ZSwgbW9uaXRvcik7CisJCQl9CQorCQl9CisJfQorCisJQE92ZXJyaWRlCiAJcHVibGljIElWYWxpZGF0b3IgYXNJVmFsaWRhdG9yKCkgewogCQlJVmFsaWRhdG9yIHYgPSBudWxsOwogCQl0cnkgewpAQCAtNTk4LDE3ICs2ODAsOSBAQAogCXB1YmxpYyBWMSBhc1YxVmFsaWRhdG9yKCkgewogCQlyZXR1cm4gdGhpczsKIAl9Ci0JCi0JQE92ZXJyaWRlCi0JcHVibGljIHZvaWQgYmVjb21lKFZhbGlkYXRvciB2YWwpIHsKLQkJc3VwZXIuYmVjb21lKHZhbCk7Ci0JCVYxIHYxID0gdmFsLmFzVjFWYWxpZGF0b3IoKTsKLQkJaWYgKHYxID09IG51bGwpdGhyb3cgbmV3IElsbGVnYWxBcmd1bWVudEV4Y2VwdGlvbigiSW50ZXJuYWwgZXJyb3IsIHRoZSBpbmNvbWluZyB2YWxpZGF0b3IgbXVzdCBiZSBhIHYxIHZhbGlkYXRvciIpOyAvLyROT04tTkxTLTEkCi0JCV92bWQgPSB2MS5fdm1kOwotCX0KLQkJCisJCQkKIAlwdWJsaWMgVmFsaWRhdG9yIGNvcHkoYm9vbGVhbiBpbmNsdWRlQ2hhbmdlQ291bnRzKSB7Ci0JCVYxIHYgPSBuZXcgVjFDb3B5KF92bWQsIG51bGwpOworCQlWMSB2ID0gbmV3IFYxQ29weShfdm1kLCBudWxsLCBfcHJvamVjdCk7CiAJCXYuY29weUxvY2FsKHRoaXMsIGluY2x1ZGVDaGFuZ2VDb3VudHMpOwogCQkJCQogCQlyZXR1cm4gdjsKQEAgLTY0MiwxNSArNzE2LDE3IEBACiAJfQogCQogCUBPdmVycmlkZQotCXB1YmxpYyB2b2lkIHNldEJ1aWxkVmFsaWRhdGlvbihib29sZWFuIGJ1aWxkVmFsaWRhdGlvbikgewotCQlzdXBlci5zZXRCdWlsZFZhbGlkYXRpb24oYnVpbGRWYWxpZGF0aW9uKTsKKwlwdWJsaWMgYm9vbGVhbiBzZXRCdWlsZFZhbGlkYXRpb24oYm9vbGVhbiBidWlsZFZhbGlkYXRpb24pIHsKKwkJYm9vbGVhbiBjaGFuZ2VkID0gc3VwZXIuc2V0QnVpbGRWYWxpZGF0aW9uKGJ1aWxkVmFsaWRhdGlvbik7CiAJCV92bWQuc2V0QnVpbGRWYWxpZGF0aW9uKGJ1aWxkVmFsaWRhdGlvbik7CisJCXJldHVybiBjaGFuZ2VkOwogCX0KIAkKIAlAT3ZlcnJpZGUKLQlwdWJsaWMgdm9pZCBzZXRNYW51YWxWYWxpZGF0aW9uKGJvb2xlYW4gbWFudWFsVmFsaWRhdGlvbikgewotCQlzdXBlci5zZXRNYW51YWxWYWxpZGF0aW9uKG1hbnVhbFZhbGlkYXRpb24pOworCXB1YmxpYyBib29sZWFuIHNldE1hbnVhbFZhbGlkYXRpb24oYm9vbGVhbiBtYW51YWxWYWxpZGF0aW9uKSB7CisJCWJvb2xlYW4gY2hhbmdlZCA9IHN1cGVyLnNldE1hbnVhbFZhbGlkYXRpb24obWFudWFsVmFsaWRhdGlvbik7CiAJCV92bWQuc2V0TWFudWFsVmFsaWRhdGlvbihtYW51YWxWYWxpZGF0aW9uKTsKKwkJcmV0dXJuIGNoYW5nZWQ7CiAJfQogCiAJQE92ZXJyaWRlCkBAIC02NzQsNiArNzUwLDggQEAKIAkJSVZhbGlkYXRvciB2ID0gYXNJVmFsaWRhdG9yKCk7CiAJCWlmICh2ID09IG51bGwpcmV0dXJuIG51bGw7CiAJCQorCQlpZiAoc2hvdWxkU2tpcFZhbGlkYXRvcihyZXNvdXJjZSwgb3BlcmF0aW9uKSlyZXR1cm4gbnVsbDsKKwkJCiAJCXRyeSB7CiAJCQlJUHJvamVjdCBwcm9qZWN0ID0gcmVzb3VyY2UuZ2V0UHJvamVjdCgpOwogCQkJU3VtbWFyeVJlcG9ydGVyIHJlcG9ydGVyID0gbmV3IFN1bW1hcnlSZXBvcnRlcihwcm9qZWN0LCBtb25pdG9yKTsKQEAgLTY4Niw3ICs3NjQsMTcgQEAKIAkJCQlmaWxlcy5hZGQod2MuZ2V0UG9ydGFibGVOYW1lKHJlc291cmNlKSk7CiAJCQkJd2Muc2V0VmFsaWRhdGlvbkZpbGVVUklzKGZpbGVzKTsKIAkJCX0KLQkJCVZhbGlkYXRvckxhdW5jaGVyLmdldExhdW5jaGVyKCkuc3RhcnQoaGVscGVyLCB2LCByZXBvcnRlcik7CisJCQl0cnkgeworCQkJCVZhbGlkYXRvckxhdW5jaGVyLmdldExhdW5jaGVyKCkuc3RhcnQoaGVscGVyLCB2LCByZXBvcnRlcik7CisJCQl9CisJCQlmaW5hbGx5IHsKKwkJCQl0cnkgeworCQkJCQl2LmNsZWFudXAocmVwb3J0ZXIpOworCQkJCX0KKwkJCQlmaW5hbGx5IHsKKwkJCQkJaGVscGVyLmNsZWFudXAocmVwb3J0ZXIpOworCQkJCX0KKwkJCX0KIAkJCQogCQkJdnIuaW5jcmVtZW50RXJyb3IocmVwb3J0ZXIuZ2V0U2V2ZXJpdHlIaWdoKCkpOwogCQkJdnIuaW5jcmVtZW50V2FybmluZyhyZXBvcnRlci5nZXRTZXZlcml0eU5vcm1hbCgpKTsKQEAgLTY5OSwzMyArNzg3LDQ5IEBACiAJCXJldHVybiB2cjsKIAl9CiAJCisKKwlwcml2YXRlIHN0YXRpYyBmaW5hbCBTdHJpbmcgVkFMSURBVEVfUFJPSkVDVF9PTkNFID0gIlZhbGlkYXRlUHJvamVjdE9uY2UiOyAvLyROT04tTkxTLTEkCisKKwkJQFN1cHByZXNzV2FybmluZ3MoInVuY2hlY2tlZCIpCQorCQlwcml2YXRlIGJvb2xlYW4gc2hvdWxkU2tpcFZhbGlkYXRvcihJUmVzb3VyY2UgcmVzb3VyY2UsIFZhbE9wZXJhdGlvbiBvcGVyYXRpb24pIHsKKworCQkJaWYgKF92bWQuaXNWYWxpZGF0ZUJ5UHJvamVjdCgpKQorCQkJeworCQkJCVZhbGlkYXRpb25TdGF0ZSB2YWxpZGF0aW9uU3RhdGUgPSBvcGVyYXRpb24uZ2V0U3RhdGUoKTsKKwkJCQlTZXQ8U3RyaW5nPiBwcm9qZWN0c05hbWVTZXQgPSAoU2V0PFN0cmluZz4pdmFsaWRhdGlvblN0YXRlLmdldChWQUxJREFURV9QUk9KRUNUX09OQ0UpOworCQkJCVN0cmluZyBwcm9qZWN0TmFtZSA9IHJlc291cmNlLmdldFByb2plY3QoKS5nZXROYW1lKCk7CisKKwkJCQlpZiAocHJvamVjdHNOYW1lU2V0ID09IG51bGwpIHsKKwkJCQkJcHJvamVjdHNOYW1lU2V0ID0gbmV3IEhhc2hTZXQ8U3RyaW5nPigpOworCQkJCQl2YWxpZGF0aW9uU3RhdGUucHV0KFZBTElEQVRFX1BST0pFQ1RfT05DRSwgcHJvamVjdHNOYW1lU2V0KTsKKwkJCQl9CisKKwkJCQlpZiAocHJvamVjdHNOYW1lU2V0LmNvbnRhaW5zKHByb2plY3ROYW1lKSlyZXR1cm4gdHJ1ZTsKKwkJCQllbHNlIHByb2plY3RzTmFtZVNldC5hZGQocHJvamVjdE5hbWUpOworCQkJfQorCQkJcmV0dXJuIGZhbHNlOworCQl9CisKIAkvKgogCSAqIEdSSyAtIEJlY2F1c2UgSSBkaWRuJ3Qgd2FudCB0byB0cnkgdG8gbWFrZSBhIHRydWUgY29weSBvZiB0aGUgVjEgdmFsaWRhdG9yLCAoYmVjYXVzZSBJIGRpZG4ndAogCSAqIHdhbnQgdG8gY29weSB0aGUgdm1kIG9iamVjdCksIEkgY2FtZSB1cCB3aXRoIHRoaXMgYXBwcm9hY2ggdG8gb25seSBjb3B5IHRoZSBmaWVsZHMgdGhhdAogCSAqIHRoZSBwcmVmZXJlbmNlIHBhZ2Ugd2FzIHdvcnJpZWQgYWJvdXQuIAogCSAqLwotCXB1YmxpYyBzdGF0aWMgY2xhc3MgVjFDb3B5IGV4dGVuZHMgVjEgewotCQlwdWJsaWMgVjFDb3B5KFZhbGlkYXRvck1ldGFEYXRhIHZtZCwgVmFsaWRhdGlvbkNvbmZpZ3VyYXRpb24gdmMpewotCQkJc3VwZXIodm1kLCB2Yyk7CisJcHVibGljIGZpbmFsIHN0YXRpYyBjbGFzcyBWMUNvcHkgZXh0ZW5kcyBWMSB7CisJCXB1YmxpYyBWMUNvcHkoVmFsaWRhdG9yTWV0YURhdGEgdm1kLCBWYWxpZGF0aW9uQ29uZmlndXJhdGlvbiB2YywgSVByb2plY3QgcHJvamVjdCl7CisJCQlzdXBlcih2bWQsIHZjLCBwcm9qZWN0KTsKIAkJfQogCQkKIAkJQE92ZXJyaWRlCi0JCXB1YmxpYyB2b2lkIHNldE1hbnVhbFZhbGlkYXRpb24oYm9vbGVhbiBib29sKSB7Ci0JCQlzZXRNYW51YWxWYWxpZGF0aW9uMihib29sKTsKKwkJcHVibGljIGJvb2xlYW4gc2V0TWFudWFsVmFsaWRhdGlvbihib29sZWFuIGJvb2wpIHsKKwkJCXJldHVybiBzZXRNYW51YWxWYWxpZGF0aW9uMihib29sKTsKIAkJfQogCQkKIAkJQE92ZXJyaWRlCi0JCXB1YmxpYyB2b2lkIHNldEJ1aWxkVmFsaWRhdGlvbihib29sZWFuIGJvb2wpIHsKLQkJCXNldEJ1aWxkVmFsaWRhdGlvbjIoYm9vbCk7CisJCXB1YmxpYyBib29sZWFuIHNldEJ1aWxkVmFsaWRhdGlvbihib29sZWFuIGJvb2wpIHsKKwkJCXJldHVybiBzZXRCdWlsZFZhbGlkYXRpb24yKGJvb2wpOwogCQl9Ci0JCQotCQlAT3ZlcnJpZGUKLQkJcHVibGljIHZvaWQgYmVjb21lKFZhbGlkYXRvciB2YWwpIHsKLQkJCXN1cGVyLmJlY29tZSh2YWwpOwotCQkJc3VwZXIuc2V0QnVpbGRWYWxpZGF0aW9uKHZhbC5pc0J1aWxkVmFsaWRhdGlvbigpKTsKLQkJCXN1cGVyLnNldE1hbnVhbFZhbGlkYXRpb24odmFsLmlzTWFudWFsVmFsaWRhdGlvbigpKTsKLQkJfQotCQkKKwkJCQkKIAl9CiAJCQogfQpAQCAtNzcxLDExICs4NzUsMjIgQEAKIAkJCiAJcHJpdmF0ZSBMZXZlbCBfbGV2ZWw7CiAJCisJLyoqCisJICogRG8gd2Ugc3RpbGwgbmVlZCB0byBpbnZva2UgdGhlIHZhbGlkYXRlU3RhcnRpbmcgbWV0aG9kIGZvciB0aGlzIHZhbGlkYXRvciwgZm9yIHRoZSBudWxsIHByb2plY3Q/CisJICogCisJICogQmVjYXVzZSB3ZSBkbyBub3Qgd2FudCB0byBhY3RpdmF0ZSBhIHZhbGlkYXRvcidzIHBsdWctaW4gdG9vIHNvb24sIHdlIGRvIG5vdCBhY3RpdmF0ZSB0aGUgdmFsaWRhdG9yCisJICogYXMgYSByZWFjdGlvbiB0byB0aGUgZ2xvYmFsIHZhbGlkYXRpb24gc3RhcnRpbmcgZXZlbnQuIEluc3RlYWQgd2UgbWFyayBpdCBwZW5kaW5nLCBhbmQgd2FpdCB1bnRpbAorCSAqIHdlIGFyZSBzdXJlIHRoYXQgd2UgaGF2ZSBzb21ldGhpbmcgdG8gdmFsaWRhdGUuCisJICogCisJICogSWYgdGhpcyBmbGFnIGlzIHRydWUsIGl0IG1lYW5zIHRoYXQgdGhlIHZhbGlkYXRlU3RhcnRpbmcgbWV0aG9kIHN0aWxsIG5lZWRzIHRvIGJlIGNhbGxlZCBmb3IgdGhpcyB2YWxpZGF0b3IuCisJICovCisJcHJpdmF0ZSBBdG9taWNCb29sZWFuIF9wZW5kaW5nVmFsaWRhdGlvblN0YXJ0ZWQgPSBuZXcgQXRvbWljQm9vbGVhbigpOworCQogCVYyKElDb25maWd1cmF0aW9uRWxlbWVudCBjb25maWdFbGVtZW50LCBJUHJvamVjdCBwcm9qZWN0KXsKKwkJc3VwZXIocHJvamVjdCk7CiAJCWFzc2VydCBjb25maWdFbGVtZW50ICE9IG51bGw7CiAJCV92YWxpZGF0b3JDb25maWdFbGVtZW50ID0gY29uZmlnRWxlbWVudDsKIAkJX3ZhbGlkYXRvckNsYXNzTmFtZSA9IGNvbmZpZ0VsZW1lbnQuZ2V0QXR0cmlidXRlKEV4dGVuc2lvbkNvbnN0YW50cy5BdHRyaWJDbGFzcyk7Ci0JCV9wcm9qZWN0ID0gcHJvamVjdDsKIAogCQlJQ29uZmlndXJhdGlvbkVsZW1lbnRbXSBncm91cFJlZmVyZW5jZUVsZW1lbnRzID0gY29uZmlnRWxlbWVudC5nZXRDaGlsZHJlbihFeHRlbnNpb25Db25zdGFudHMuR3JvdXAuZWxlbWVudEdyb3VwKTsKIAkJTGlzdDxTdHJpbmc+IHZhbGlkYXRvckdyb3VwSURzID0gbmV3IEFycmF5TGlzdDxTdHJpbmc+KCk7CkBAIC03ODksOSArOTA0LDkgQEAKIAl9CiAJCiAJcHJpdmF0ZSBWMihJUHJvamVjdCBwcm9qZWN0LCBTdHJpbmcgdmFsaWRhdG9yQ2xhc3NOYW1lLCBBYnN0cmFjdFZhbGlkYXRvciB2YWxpZGF0b3IpeworCQlzdXBlcihwcm9qZWN0KTsKIAkJYXNzZXJ0IHZhbGlkYXRvciAhPSBudWxsOwogCQkKLQkJX3Byb2plY3QgPSBwcm9qZWN0OwogCQlfdmFsaWRhdG9yQ2xhc3NOYW1lID0gdmFsaWRhdG9yQ2xhc3NOYW1lOwogCQlfdmFsaWRhdG9yID0gdmFsaWRhdG9yOwogCQlpbml0KCk7CkBAIC04MjMsNiArOTM4LDcgQEAKIAkJcmV0dXJuIHN1cGVyLmFzSVZhbGlkYXRvcigpOwogCX0KIAkKKwlAT3ZlcnJpZGUKIAlwdWJsaWMgVjIgYXNWMlZhbGlkYXRvcigpIHsKIAkJcmV0dXJuIHRoaXM7CiAJfQpAQCAtODMyLDExICs5NDgsMTQgQEAKIAkgKiAKIAkgKiBAcGFyYW0gcHJvamVjdCB0aGUgcHJvamVjdCB0aGF0IGlzIGJlaW5nIGNsZWFuZWQuIFRoaXMgY2FuIGJlIG51bGwgd2hpY2ggbWVhbnMgdGhhdCB0aGUgd29ya3NwYWNlCiAJICogaXMgYmVpbmcgY2xlYW5lZCAoaW4gd2hpY2ggY2FzZSBhIHNlcGFyYXRlIGNhbGwgd2lsbCBiZSBtYWRlIGZvciBlYWNoIG9wZW4gcHJvamVjdCkuCisJICogCiAJICovCi0JcHVibGljIHZvaWQgY2xlYW4oSVByb2plY3QgcHJvamVjdCwgSVByb2dyZXNzTW9uaXRvciBtb25pdG9yKSB7Ci0JCWdldERlbGVnYXRlZFZhbGlkYXRvcigpLmNsZWFuKHByb2plY3QsIFZhbE9wZXJhdGlvbk1hbmFnZXIuZ2V0RGVmYXVsdCgpLmdldE9wZXJhdGlvbigpLmdldFN0YXRlKCksIG1vbml0b3IpOworCUBPdmVycmlkZQorCXB1YmxpYyB2b2lkIGNsZWFuKElQcm9qZWN0IHByb2plY3QsIFZhbE9wZXJhdGlvbiBvcGVyYXRpb24sIElQcm9ncmVzc01vbml0b3IgbW9uaXRvcikgeworCQlnZXREZWxlZ2F0ZWRWYWxpZGF0b3IoKS5jbGVhbihwcm9qZWN0LCBvcGVyYXRpb24uZ2V0U3RhdGUoKSwgbW9uaXRvcik7CiAJfQogCQorCUBPdmVycmlkZQogCXB1YmxpYyBWYWxpZGF0b3IgY29weShib29sZWFuIGluY2x1ZGVDaGFuZ2VDb3VudHMpIHsKIAkJVjIgdiA9IG51bGw7CiAJCWlmIChfdmFsaWRhdG9yQ29uZmlnRWxlbWVudCAhPSBudWxsKXYgPSBuZXcgVjIoX3ZhbGlkYXRvckNvbmZpZ0VsZW1lbnQsIF9wcm9qZWN0KTsKQEAgLTg0OCwxMyArOTY3LDE0IEBACiAJCUZpbHRlckdyb3VwW10gZ3JvdXBzID0gZ2V0R3JvdXBzKCk7CiAJCXYuX2dyb3Vwc0FycmF5ID0gbmV3IEZpbHRlckdyb3VwW2dyb3Vwcy5sZW5ndGhdOwogCQlmb3IgKGludCBpPTA7IGk8Z3JvdXBzLmxlbmd0aDsgaSsrKXsKLQkJCXYuX2dyb3Vwc0FycmF5W2ldID0gZ3JvdXBzW2ldLmNvcHkoKTsKLQkJCXYuX2dyb3Vwcy5hZGQodi5fZ3JvdXBzQXJyYXlbaV0pOworCQkJdi5fZ3JvdXBzQXJyYXlbaV0gPSBncm91cHNbaV07CisJCQl2Ll9ncm91cHMuYWRkKGdyb3Vwc1tpXSk7CiAJCX0KIAogCQl2Ll9pZCA9IF9pZDsKIAkJdi5fbmFtZSA9IF9uYW1lOwogCQl2Ll92YWxpZGF0b3JHcm91cElkcyA9IF92YWxpZGF0b3JHcm91cElkczsKKwkJdi5fcGVuZGluZ1ZhbGlkYXRpb25TdGFydGVkID0gX3BlbmRpbmdWYWxpZGF0aW9uU3RhcnRlZDsKIAkJCQkKIAkJcmV0dXJuIHY7CiAJfQpAQCAtOTAwLDYgKzEwMjAsNyBAQAogCQlyZXR1cm4gZGVsZWdhdGVkOwogCX0KIAkJCisJQE92ZXJyaWRlCiAJcHVibGljIFN0cmluZyBnZXRJZCgpIHsKIAkJcmV0dXJuIF9pZDsKIAl9CkBAIC05MTgsNiArMTAzOSw3IEBACiAJCXJldHVybiBncm91cHM7CiAJfQogCQorCUBPdmVycmlkZQogCXB1YmxpYyBTdHJpbmcgZ2V0TmFtZSgpIHsKIAkJcmV0dXJuIF9uYW1lOwogCX0KQEAgLTk0MSw2ICsxMDYzLDcgQEAKIAkJcmV0dXJuIF92YWxpZGF0b3I7CiAJfQogCQorCUBPdmVycmlkZQogCXB1YmxpYyBTdHJpbmcgZ2V0VmFsaWRhdG9yQ2xhc3NuYW1lKCl7CiAJCXJldHVybiBfdmFsaWRhdG9yQ2xhc3NOYW1lOwogCX0KQEAgLTk2OSwxMyArMTA5MiwyMiBAQAogCWJvb2xlYW4gaXNMb2FkZWQoKSB7CiAJCXJldHVybiBfdmFsaWRhdG9yICE9IG51bGw7CiAJfQorCQorCUBPdmVycmlkZQorCXB1YmxpYyBib29sZWFuIHNob3VsZENsZWFyTWFya2VycyhWYWxpZGF0aW9uRXZlbnQgZXZlbnQpIHsKKwkJcmV0dXJuIGdldFZhbGlkYXRvcigpLnNob3VsZENsZWFyTWFya2VycyhldmVudCk7CisJfQogCQkKIAkvKioKIAkgKiBBbnN3ZXIgdHJ1ZSBpZiB0aGlzIHZhbGlkYXRvciwgYmFzZWQgb24gaXQncyBmaWx0ZXJzLCBzaG91bGQgdmFsaWRhdGUgdGhpcyByZXNvdXJjZS4KIAkgKiAKIAkgKiBAcmV0dXJuIHRydWUgaWYgdGhlIHJlc291cmNlIHNob3VsZCBiZSB2YWxpZGF0ZWQuCiAJICovCisJQE92ZXJyaWRlCiAJcHJvdGVjdGVkIGJvb2xlYW4gc2hvdWxkVmFsaWRhdGUoSVJlc291cmNlIHJlc291cmNlLCBDb250ZW50VHlwZVdyYXBwZXIgY29udGVudFR5cGVXcmFwcGVyKSB7CisJICAgIGlmIChyZXNvdXJjZS5pc0Rlcml2ZWQoKSl7CisJICAgICAgcmV0dXJuIGZhbHNlOworCSAgICB9CiAJCUZpbHRlckdyb3VwW10gZ3JvdXBzID0gZ2V0R3JvdXBzKCk7CiAJCUlQcm9qZWN0IHByb2plY3QgPSByZXNvdXJjZS5nZXRQcm9qZWN0KCk7CiAJCWZvciAoRmlsdGVyR3JvdXAgZ3JvdXAgOiBncm91cHMpewpAQCAtMTAxMiwxMiArMTE0NCwxOSBAQAogCX0KIAkKIAlAT3ZlcnJpZGUKLQlwdWJsaWMgVmFsaWRhdGlvblJlc3VsdCB2YWxpZGF0ZShJUmVzb3VyY2UgcmVzb3VyY2UsIGludCBraW5kLCBWYWxPcGVyYXRpb24gb3BlcmF0aW9uLCBJUHJvZ3Jlc3NNb25pdG9yIG1vbml0b3IpIHsKKwlwdWJsaWMgVmFsaWRhdGlvblJlc3VsdCB2YWxpZGF0ZShJUmVzb3VyY2UgcmVzb3VyY2UsIGludCBraW5kLCBWYWxPcGVyYXRpb24gb3BlcmF0aW9uLCBJUHJvZ3Jlc3NNb25pdG9yIG1vbml0b3IpeworCQlyZXR1cm4gdmFsaWRhdGUocmVzb3VyY2UsIGtpbmQsIG9wZXJhdGlvbiwgbW9uaXRvciwgbnVsbCk7CisJfQorCQorCUBPdmVycmlkZQorCXB1YmxpYyBWYWxpZGF0aW9uUmVzdWx0IHZhbGlkYXRlKElSZXNvdXJjZSByZXNvdXJjZSwgaW50IGtpbmQsIFZhbE9wZXJhdGlvbiBvcGVyYXRpb24sIElQcm9ncmVzc01vbml0b3IgbW9uaXRvciwgVmFsaWRhdGlvbkV2ZW50IGV2ZW50KSB7CiAJCVZhbGlkYXRpb25SZXN1bHQgdnIgPSBudWxsOwogCQlpZiAob3BlcmF0aW9uID09IG51bGwpb3BlcmF0aW9uID0gbmV3IFZhbE9wZXJhdGlvbigpOwogCQlpZiAobW9uaXRvciA9PSBudWxsKW1vbml0b3IgPSBuZXcgTnVsbFByb2dyZXNzTW9uaXRvcigpOwogCQl0cnkgewotCQkJdnIgPSBnZXREZWxlZ2F0ZWRWYWxpZGF0b3IoKS52YWxpZGF0ZShyZXNvdXJjZSwga2luZCwgb3BlcmF0aW9uLmdldFN0YXRlKCksIG1vbml0b3IpOworCQkJaWYgKGV2ZW50ID09IG51bGwpZXZlbnQgPSBuZXcgVmFsaWRhdGlvbkV2ZW50KHJlc291cmNlLCBraW5kLCBudWxsKTsKKwkJCXZyID0gZ2V0RGVsZWdhdGVkVmFsaWRhdG9yKCkudmFsaWRhdGUoZXZlbnQsIG9wZXJhdGlvbi5nZXRTdGF0ZSgpLCBtb25pdG9yKTsKKwkJCWlmICh2ciA9PSBudWxsKXZyID0gZ2V0RGVsZWdhdGVkVmFsaWRhdG9yKCkudmFsaWRhdGUocmVzb3VyY2UsIGtpbmQsIG9wZXJhdGlvbi5nZXRTdGF0ZSgpLCBtb25pdG9yKTsKIAkJfQogCQljYXRjaCAoRXhjZXB0aW9uIGUpewogCQkJdHJ5IHsKQEAgLTEwNjYsNyArMTIwNSw2IEBACiAJICogQHJldHVybiB0cnVlIGlmIHRoZSB0ZXN0IHBhc3NlZAogCSAqLwogLy8JcHJpdmF0ZSBib29sZWFuIHNhbml0eVRlc3QoaW50IG51bWJlcm9mTWVzc2FnZXMsIElSZXNvdXJjZSByZXNvdXJjZSkgewotLy8JCS8vRklYTUUgbWFrZSB0aGlzIG1vcmUgZ2VuZXJhbCBhbmQgY29uZmlndXJhYmxlCiAvLwkJaWYgKG51bWJlcm9mTWVzc2FnZXMgPCAyMDEpcmV0dXJuIHRydWU7CiAvLwkJCiAvLwkJU3RyaW5nIHJlc05hbWUgPSAiIjsgLy8kTk9OLU5MUy0xJApAQCAtMTE0MiwxMiArMTI4MCwyMiBAQAogCQogCUBPdmVycmlkZQogCXB1YmxpYyB2b2lkIHZhbGlkYXRpb25TdGFydGluZyhJUHJvamVjdCBwcm9qZWN0LCBWYWxpZGF0aW9uU3RhdGUgc3RhdGUsIElQcm9ncmVzc01vbml0b3IgbW9uaXRvcikgewotCQlnZXREZWxlZ2F0ZWRWYWxpZGF0b3IoKS52YWxpZGF0aW9uU3RhcnRpbmcocHJvamVjdCwgc3RhdGUsIG1vbml0b3IpOworCQlpZiAocHJvamVjdCA9PSBudWxsKV9wZW5kaW5nVmFsaWRhdGlvblN0YXJ0ZWQuc2V0KHRydWUpOworCQllbHNlIHsKKwkJCUFic3RyYWN0VmFsaWRhdG9yIHZhbCA9IGdldERlbGVnYXRlZFZhbGlkYXRvcigpOworCQkJaWYgKF9wZW5kaW5nVmFsaWRhdGlvblN0YXJ0ZWQuZ2V0QW5kU2V0KGZhbHNlKSl7CisJCQkJdmFsLnZhbGlkYXRpb25TdGFydGluZyhudWxsLCBzdGF0ZSwgbW9uaXRvcik7CisJCQl9CisJCQl2YWwudmFsaWRhdGlvblN0YXJ0aW5nKHByb2plY3QsIHN0YXRlLCBtb25pdG9yKTsKKwkJfQogCX0KIAkKIAlAT3ZlcnJpZGUKIAlwdWJsaWMgdm9pZCB2YWxpZGF0aW9uRmluaXNoaW5nKElQcm9qZWN0IHByb2plY3QsIFZhbGlkYXRpb25TdGF0ZSBzdGF0ZSwgSVByb2dyZXNzTW9uaXRvciBtb25pdG9yKSB7Ci0JCWdldERlbGVnYXRlZFZhbGlkYXRvcigpLnZhbGlkYXRpb25GaW5pc2hpbmcocHJvamVjdCwgc3RhdGUsIG1vbml0b3IpOworCQlpZiAocHJvamVjdCA9PSBudWxsKXsKKwkJCWlmICghX3BlbmRpbmdWYWxpZGF0aW9uU3RhcnRlZC5nZXRBbmRTZXQoZmFsc2UpKWdldERlbGVnYXRlZFZhbGlkYXRvcigpLnZhbGlkYXRpb25GaW5pc2hpbmcobnVsbCwgc3RhdGUsIG1vbml0b3IpOworCQl9CisJCWVsc2UgZ2V0RGVsZWdhdGVkVmFsaWRhdG9yKCkudmFsaWRhdGlvbkZpbmlzaGluZyhwcm9qZWN0LCBzdGF0ZSwgbW9uaXRvcik7CiAJfQogCiAJQFN1cHByZXNzV2FybmluZ3MoInVuY2hlY2tlZCIpCkBAIC0xMTc3LDIxICsxMzI1LDkgQEAKIAkJcmV0dXJuIHRydWU7CiAJfQogCQotCUBPdmVycmlkZQotCXB1YmxpYyB2b2lkIGJlY29tZShWYWxpZGF0b3IgdmFsKSB7Ci0JCXN1cGVyLmJlY29tZSh2YWwpOwotCQlWMiB2MiA9IHZhbC5hc1YyVmFsaWRhdG9yKCk7Ci0JCWlmICh2MiA9PSBudWxsKXRocm93IG5ldyBJbGxlZ2FsQXJndW1lbnRFeGNlcHRpb24oVmFsTWVzc2FnZXMuRXJyb3IyMCk7Ci0JCV9jaGFuZ2VDb3VudEdyb3VwcyA9IHYyLl9jaGFuZ2VDb3VudEdyb3VwczsKLQkJX2RlbGVnYXRlZCA9IHYyLl9kZWxlZ2F0ZWQ7Ci0JCV9ncm91cHMgPSB2Mi5fZ3JvdXBzOwotCQlfZ3JvdXBzQXJyYXkgPSB2Mi5fZ3JvdXBzQXJyYXk7Ci0JCV9pZCA9IHYyLl9pZDsKLQkJX25hbWUgPSB2Mi5fbmFtZTsKLQkJX3ZhbGlkYXRvciA9IHYyLl92YWxpZGF0b3I7Ci0JCV92YWxpZGF0b3JDb25maWdFbGVtZW50ID0gdjIuX3ZhbGlkYXRvckNvbmZpZ0VsZW1lbnQ7Ci0JCV92YWxpZGF0b3JDbGFzc05hbWUgPSB2Mi5fdmFsaWRhdG9yQ2xhc3NOYW1lOwotCQlfdmFsaWRhdG9yR3JvdXBJZHMgPSB2Mi5fdmFsaWRhdG9yR3JvdXBJZHM7CisJcHVibGljIHN5bmNocm9uaXplZCB2b2lkIHJlcGxhY2VGaWx0ZXJHcm91cChGaWx0ZXJHcm91cCBleGlzdGluZywgRmlsdGVyR3JvdXAgbWVyZ2VkKSB7CisJCXJlbW92ZShleGlzdGluZyk7CisJCWFkZChtZXJnZWQpOwogCX0KIAogfQpAQCAtMTIwNywyMiArMTM0Myw2IEBACiAJfQogfQogCi0vKioKLSAqIFRha2UgdGhlIGluc3RhbmNlIHZhcmlhYmxlcyBmcm9tIHRoZSBpbmNvbWluZyB2YWxpZGF0b3IgYW5kIHNldCB0aGVtIHRvIHlvdXJzZWxmLgotICogQHBhcmFtIHZhbGlkYXRvcgotICovCi1wdWJsaWMgdm9pZCBiZWNvbWUoVmFsaWRhdG9yIHZhbGlkYXRvcikgewotCV9idWlsZFZhbGlkYXRpb24gPSB2YWxpZGF0b3IuX2J1aWxkVmFsaWRhdGlvbjsKLQlfZGVsZWdhdGluZ0lkID0gdmFsaWRhdG9yLl9kZWxlZ2F0aW5nSWQ7Ci0JX21hbnVhbFZhbGlkYXRpb24gPSB2YWxpZGF0b3IuX21hbnVhbFZhbGlkYXRpb247Ci0JX21hcmtlcklkID0gdmFsaWRhdG9yLl9tYXJrZXJJZDsKLQlfbWVzc2FnZVNldHRpbmdzID0gdmFsaWRhdG9yLl9tZXNzYWdlU2V0dGluZ3M7Ci0JX3Byb2plY3QgPSB2YWxpZGF0b3IuX3Byb2plY3Q7Ci0JX3NvdXJjZUlkID0gdmFsaWRhdG9yLl9zb3VyY2VJZDsKLQlfdmVyc2lvbiA9IHZhbGlkYXRvci5fdmVyc2lvbjsKLQlfY2hhbmdlQ291bnRHbG9iYWwgPSB2YWxpZGF0b3IuX2NoYW5nZUNvdW50R2xvYmFsOwotCV9jaGFuZ2VDb3VudE1lc3NhZ2VzID0gdmFsaWRhdG9yLl9jaGFuZ2VDb3VudE1lc3NhZ2VzOwotfQogCiB2b2lkIHNldE1lc3NhZ2VzKE1hcDxTdHJpbmcsIE1lc3NhZ2VTZXZlcml0eVNldHRpbmc+IG1hcCkgewogCV9tZXNzYWdlU2V0dGluZ3MgPSBtYXA7CkBAIC0xMjMzLDYgKzEzNTMsMTAgQEAKIAlyZXR1cm4gX2NoYW5nZUNvdW50R2xvYmFsOwogfQogCitwdWJsaWMgYm9vbGVhbiBoYXNHbG9iYWxDaGFuZ2VzKCl7CisJcmV0dXJuIF9taWdyYXRlZCB8fCBfY2hhbmdlQ291bnRHbG9iYWwgPiAwOworfQorCiBwdWJsaWMgaW50IGdldENoYW5nZUNvdW50TWVzc2FnZXMoKSB7CiAJcmV0dXJuIF9jaGFuZ2VDb3VudE1lc3NhZ2VzOwogfQpkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi92ZjIvb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vVmFsaWRhdG9yTWVzc2FnZS5qYXZhIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi92ZjIvb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vVmFsaWRhdG9yTWVzc2FnZS5qYXZhCmluZGV4IDcwYmRkOTAuLmExNmMyNmUgMTAwNjQ0Ci0tLSBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24vdmYyL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL1ZhbGlkYXRvck1lc3NhZ2UuamF2YQorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uL3ZmMi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9WYWxpZGF0b3JNZXNzYWdlLmphdmEKQEAgLTQ1LDcgKzQ1LDcgQEAKIAlwdWJsaWMgc3RhdGljIGZpbmFsIFN0cmluZyBWYWxpZGF0aW9uSWQgPSAiVmFsaWRhdGlvbklkIjsgLy8kTk9OLU5MUy0xJAogCQogCS8qKiBBc3NvY2lhdGUgc29tZSBhcmJpdHJhcnkgYXR0cmlidXRlcyB3aXRoIGEgbWVzc2FnZS4gKi8KLQlwcml2YXRlIE1hcDxTdHJpbmcsIE9iamVjdD4JX21hcCA9IG5ldyBIYXNoTWFwPFN0cmluZywgT2JqZWN0Pig1KTsKKwlwcml2YXRlIGZpbmFsIE1hcDxTdHJpbmcsIE9iamVjdD4JX21hcCA9IG5ldyBIYXNoTWFwPFN0cmluZywgT2JqZWN0Pig1KTsKIAkKIAlwcml2YXRlIElSZXNvdXJjZQlfcmVzb3VyY2U7CiAJCkBAIC03Myw2ICs3MywxNyBAQAogCXByaXZhdGUgVmFsaWRhdG9yTWVzc2FnZSgpe30KIAkKIAkvKioKKwkgKiBBbnN3ZXIgYSBjb3B5IG9mIHlvdXJzZWxmLgorCSAqLworCXB1YmxpYyBWYWxpZGF0b3JNZXNzYWdlIGFzQ29weSgpeworCQlWYWxpZGF0b3JNZXNzYWdlIG1zZyA9IG5ldyBWYWxpZGF0b3JNZXNzYWdlKCk7CisJCW1zZy5fcmVzb3VyY2UgPSBfcmVzb3VyY2U7CisJCW1zZy5fdHlwZSA9IF90eXBlOworCQltc2cuX21hcC5wdXRBbGwoX21hcCk7CisJCXJldHVybiBtc2c7CisJfQorCQorCS8qKgogCSAqIFJldHVybnMgdGhlIGF0dHJpYnV0ZSB3aXRoIHRoZSBnaXZlbiBuYW1lLiBUaGUgcmVzdWx0IGlzIGFuIGluc3RhbmNlIG9mCiAJICogb25lIG9mIHRoZSBmb2xsb3dpbmcgY2xhc3NlczogPGNvZGU+U3RyaW5nPC9jb2RlPiwgPGNvZGU+SW50ZWdlcjwvY29kZT4sCiAJICogb3IgPGNvZGU+Qm9vbGVhbjwvY29kZT4uIFJldHVybnMgPGNvZGU+bnVsbDwvY29kZT4gaWYgdGhlIGF0dHJpYnV0ZSBpcwpAQCAtMjY3LDcgKzI3OCw4IEBACiAJICogdGFibGUuIFRoZSB2YWx1ZXMgbXVzdCBiZSBhbiBpbnN0YW5jZSBvZiBvbmUgb2YgdGhlIGZvbGxvd2luZyBjbGFzc2VzOgogCSAqIDxjb2RlPlN0cmluZzwvY29kZT4sIDxjb2RlPkludGVnZXI8L2NvZGU+LCBvciA8Y29kZT5Cb29sZWFuPC9jb2RlPi4KIAkgKiBBdHRyaWJ1dGVzIHByZXZpb3VzbHkgc2V0IG9uIHRoZSBtYXJrZXIgYnV0IG5vdCBpbmNsdWRlZCBpbiB0aGUgZ2l2ZW4gbWFwCi0JICogYXJlIGNvbnNpZGVyZWQgdG8gYmUgcmVtb3ZhbHMuIFNldHRpbmcgdGhlIGdpdmVuIG1hcCB0byBiZQorCSAqIGFyZSBjb25zaWRlcmVkIHRvIGJlIHJlbW92YWxzLiBUaGlzIGluY2x1ZGVzIHRoZSB0ZXh0IG9mIHRoZSBtZXNzYWdlLgorCSAqIFNldHRpbmcgdGhlIGdpdmVuIG1hcCB0byBiZQogCSAqIDxjb2RlPm51bGw8L2NvZGU+IGlzIGVxdWl2YWxlbnQgdG8gcmVtb3ZpbmcgYWxsIG1hcmtlciBhdHRyaWJ1dGVzLgogCSAqIAogCSAqIEBwYXJhbSBhdHRyaWJ1dGVzCmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uL3ZmMi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9kb2MtZmlsZXMvZmFxLmh0bWwgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uL3ZmMi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9kb2MtZmlsZXMvZmFxLmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uODA5NmQwYQotLS0gL2Rldi9udWxsCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24vdmYyL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL2RvYy1maWxlcy9mYXEuaHRtbApAQCAtMCwwICsxLDQwIEBACis8aHRtbD4KKzxoZWFkPgorPHRpdGxlPlZhbGlkYXRpb24gRnJhbWV3b3JrIC0gRnJlcXVlbnRseSBBc2tlZCBRdWVzdGlvbnM8L3RpdGxlPgorPC9oZWFkPgorPGJvZHk+Cis8aDE+VmFsaWRhdGlvbiBGcmFtZXdvcmsgLSBGcmVxdWVudGx5IEFza2VkIFF1ZXN0aW9uczwvaDE+Cis8aDM+SG93IGRvIEkgY3JlYXRlIFByb2JsZW0gTWFya2Vycz88L2gzPgorPHA+VGhlcmUgYXJlIHRocmVlIGRpZmZlcmVudCB3YXlzIHRvIGNyZWF0ZSBwcm9ibGVtIG1hcmtlcnMuPC9wPgorPG9sPgorCTxsaT5Vc2UgdGhlIG5hdGl2ZSBzdXBwb3J0IGluIHRoZSB2YWxpZGF0aW9uIGZyYW1ld29yay48L2xpPgorCTxsaT5NYW5hZ2UgeW91ciBvd24gbWFya2Vycy48L2xpPgorCTxsaT5Vc2UgdGhlIHN1cHBvcnQgaW4gdGhlIHByZXZpb3VzIHZlcnNpb24gb2YgdGhlIHZhbGlkYXRpb24gZnJhbWV3b3JrLjwvbGk+Cis8L29sPgorPHA+VGhlIGZpcnN0IGFwcHJvYWNoLCBpcyB0aGUgcmVjb21tZW5kZWQgYXBwcm9hY2guPC9wPgorCis8aDQ+MS4gVXNlIHRoZSBuYXRpdmUgc3VwcG9ydCBpbiB0aGUgdmFsaWRhdGlvbiBmcmFtZXdvcms8L2g0PgorPHA+QWZ0ZXIgeW91IGhhdmUgZmluaXNoZWQgcGVyZm9ybWluZyB5b3VyIHZhbGlkYXRpb24sIGFuZCBhcmUgcmV0dXJuaW5nIGNvbnRyb2wgYmFjayB0bwordGhlIHZhbGlkYXRpb24gZnJhbWV3b3JrLCBhZGQgeW91ciBtZXNzYWdlcyBpbnRvIHRoZSAKKzxhIGhyZWY9Ii4uL1ZhbGlkYXRpb25SZXN1bHQuaHRtbCI+VmFsaWRhdGlvblJlc3VsdDwvYT4gYnkgdXNpbmcKK3RoZSA8YSBocmVmPSIuLi9WYWxpZGF0aW9uUmVzdWx0Lmh0bWwjYWRkKG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLlZhbGlkYXRvck1lc3NhZ2UpIj5hZGQoVmFsaWRhdG9yTWVzc2FnZSBtZXNzYWdlKTwvYT4gbWV0aG9kLgorCis8aDQ+Mi4gTWFuYWdlIHlvdXIgb3duIG1hcmtlcnM8L2g0PgorCis8cD5DcmVhdGUgYW5kIHJlbW92ZSB5b3VyIG93biBtYXJrZXJzLiBTbyB0aGF0IHN1bW1hcnkgaW5mb3JtYXRpb24gY2FuIHN0aWxsIGJlIGRpc3BsYXllZCwgc2V0IHRoZSBjb3VudHMgb2YgYW55IG5ld2x5CitjcmVhdGVkIG1hcmtlcnMgaW4gdGhlIDxhIGhyZWY9Ii4uL1ZhbGlkYXRpb25SZXN1bHQuaHRtbCI+VmFsaWRhdGlvblJlc3VsdDwvYT4gYnkgdXNpbmcgdGhlIHNldFNldmVyaXR5WFhYKCkgbWV0aG9kcy4KK0ZvciBleGFtcGxlLCBpZiB0aGlzIHZhbGlkYXRpb24gcGFzcyBnZW5lcmF0ZWQgdHdvIGVycm9yIG1hcmtlcnMsIHlvdSB3b3VsZCBjYWxsIAorPGEgaHJlZj0iLi4vVmFsaWRhdGlvblJlc3VsdC5odG1sI3NldFNldmVyaXR5RXJyb3IoaW50KSI+c2V0U2V2ZXJpdHlFcnJvcigyKTwvYT4uIAorPC9wPgorCis8aDQ+My4gVXNlIHRoZSBzdXBwb3J0IGluIHRoZSBwcmV2aW91cyB2ZXJzaW9uIG9mIHRoZSB2YWxpZGF0aW9uIGZyYW1ld29yazwvaDQ+CisKKzxwPklmIHlvdSBhcmUgcG9ydGluZyBhIHZhbGlkYXRvciB0aGF0IHVzZWQgdGhlIHByZXZpb3VzIHZlcnNpb24gb2YgdGhlIHZhbGlkYXRpb24gZnJhbWV3b3JrLCBhbmQgeW91IHdpc2ggdG8gY29udGludWUgdG8gdXNlIGFuCis8QSBIUkVGPSIuLi8uLi8uLi8uLi8uLi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9pbnRlcm5hbC9wcm92aXNpb25hbC9jb3JlL0lSZXBvcnRlci5odG1sIj5JUmVwb3J0ZXI8L2E+IHRvCityZXBvcnQgeW91ciBtYXJrZXJzLCB5b3UgY2FuIGNvbnRpbnVlIHRvIGRvIHNvLjwvcD4KKzxwPkZvciB0aGlzIGFwcHJvYWNoLCB1c2UgdGhlCis8YSBocmVmPSIuLi9WYWxpZGF0aW9uUmVzdWx0Lmh0bWwjZ2V0UmVwb3J0ZXIoSVByb2dyZXNzTW9uaXRvcikiPmdldFJlcG9ydGVyKElQcm9ncmVzc01vbml0b3ImbmJzcDttb25pdG9yKTwvYT4gbWV0aG9kLAorYW5kIHJldHVybiB5b3VyIG1lc3NhZ2VzIHRocm91Z2ggdGhlIElSZXBvcnRlci4gSWYgdGhpcyBtZXRob2QgaXMgY2FsbGVkIGl0IGlzIGFzc3VtZWQgYnkgdGhlIGZyYW1ld29yaywgCit0aGF0IHRoaXMgSVJlcG9ydGVyIHdpbGwgYmUgdXNlZCBhcyB0aGUgb25seSB3YXkgb2YgcGFzc2luZyBtZXNzYWdlcyBiYWNrIHRvIHRoZSBmcmFtZXdvcmsuIAorPC9ib2R5PgorPC9odG1sPgpcIE5vIG5ld2xpbmUgYXQgZW5kIG9mIGZpbGUKZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24vdmYyL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL2ludGVybmFsL0NvbnRlbnRUeXBlV3JhcHBlci5qYXZhIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi92ZjIvb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vaW50ZXJuYWwvQ29udGVudFR5cGVXcmFwcGVyLmphdmEKaW5kZXggMjQzNmM4NC4uNTNkZDA0NSAxMDA2NDQKLS0tIGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi92ZjIvb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vaW50ZXJuYWwvQ29udGVudFR5cGVXcmFwcGVyLmphdmEKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi92ZjIvb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vaW50ZXJuYWwvQ29udGVudFR5cGVXcmFwcGVyLmphdmEKQEAgLTEsMyArMSwxMyBAQAorLyoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioKKyAqIENvcHlyaWdodCAoYykgMjAwOCBJQk0gQ29ycG9yYXRpb24gYW5kIG90aGVycy4KKyAqIEFsbCByaWdodHMgcmVzZXJ2ZWQuIFRoaXMgcHJvZ3JhbSBhbmQgdGhlIGFjY29tcGFueWluZyBtYXRlcmlhbHMKKyAqIGFyZSBtYWRlIGF2YWlsYWJsZSB1bmRlciB0aGUgdGVybXMgb2YgdGhlIEVjbGlwc2UgUHVibGljIExpY2Vuc2UgdjEuMAorICogd2hpY2ggYWNjb21wYW5pZXMgdGhpcyBkaXN0cmlidXRpb24sIGFuZCBpcyBhdmFpbGFibGUgYXQKKyAqIGh0dHA6Ly93d3cuZWNsaXBzZS5vcmcvbGVnYWwvZXBsLXYxMC5odG1sCisgKgorICogQ29udHJpYnV0b3JzOgorICogICAgIElCTSBDb3Jwb3JhdGlvbiAtIGluaXRpYWwgQVBJIGFuZCBpbXBsZW1lbnRhdGlvbgorICoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKiovCiBwYWNrYWdlIG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLmludGVybmFsOwogCiBpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5yZXNvdXJjZXMuSUZpbGU7CmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uL3ZmMi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9pbnRlcm5hbC9EZWJ1Z0NvbnN0YW50cy5qYXZhIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi92ZjIvb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vaW50ZXJuYWwvRGVidWdDb25zdGFudHMuamF2YQppbmRleCA1M2EwMjBkLi5hNDY2MjQxIDEwMDY0NAotLS0gYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uL3ZmMi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9pbnRlcm5hbC9EZWJ1Z0NvbnN0YW50cy5qYXZhCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24vdmYyL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL2ludGVybmFsL0RlYnVnQ29uc3RhbnRzLmphdmEKQEAgLTEsNSArMSw1IEBACiAvKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKgotICogQ29weXJpZ2h0IChjKSAyMDA3LCAyMDA4IElCTSBDb3Jwb3JhdGlvbiBhbmQgb3RoZXJzLgorICogQ29weXJpZ2h0IChjKSAyMDA3LCAyMDA5IElCTSBDb3Jwb3JhdGlvbiBhbmQgb3RoZXJzLgogICogQWxsIHJpZ2h0cyByZXNlcnZlZC4gVGhpcyBwcm9ncmFtIGFuZCB0aGUgYWNjb21wYW55aW5nIG1hdGVyaWFscwogICogYXJlIG1hZGUgYXZhaWxhYmxlIHVuZGVyIHRoZSB0ZXJtcyBvZiB0aGUgRWNsaXBzZSBQdWJsaWMgTGljZW5zZSB2MS4wCiAgKiB3aGljaCBhY2NvbXBhbmllcyB0aGlzIGRpc3RyaWJ1dGlvbiwgYW5kIGlzIGF2YWlsYWJsZSBhdApAQCAtMzksNSArMzksMTcgQEAKIAkgKiBGb3IgZXhhbXBsZSwgaWYgeW91IHdhbnRlZCBtb3JlIGRldGFpbCBvbiB0aGUgWE1MIHZhbGlkYXRvciB5b3Ugd291bGQgdXNlIG9yZy5lY2xpcHNlLndzdC54bWwuY29yZS54bWwgCiAJICovCiAJU3RyaW5nIEV4dHJhVmFsRGV0YWlsID0gVmFsaWRhdGlvblBsdWdpbi5QTFVHSU5fSUQrIi9leHRyYVZhbERldGFpbCI7IC8vJE5PTi1OTFMtMSQKKwkKKwkvKiogCisJICogZmlsdGVyL2FsbEV4Y2VwdCAtIElmIHN1cHBsaWVkLCBpdCBpcyBhcyBpZiB0aGlzIGlzIHRoZSBvbmx5IHZhbGlkYXRvciB0aGF0IGdldHMgZGVmaW5lZCB2aWEKKwkgKiB0aGUgZXh0ZW5zaW9uIHBvaW50LiBBbGwgdGhlIG90aGVyIHZhbGlkYXRvcnMgYXJlIGlnbm9yZWQuCisJICovCisJU3RyaW5nIEZpbHRlckFsbEV4Y2VwdCA9IFZhbGlkYXRpb25QbHVnaW4uUExVR0lOX0lEKyIvZmlsdGVyL2FsbEV4Y2VwdCI7IC8vJE5PTi1OTFMtMSQKKwkKKwkvKioKKwkgKiB0cmFjZS9sZXZlbCAtIFRoZSB0cmFjaW5nIGxldmVsLiBJZiBub3Qgc3VwcGxpZWQgYSBkZWZhdWx0IG9mIHplcm8gaXMgdXNlZC4gVGhlIGhpZ2hlciB0aGUgbnVtYmVyIHRoZQorCSAqIG1vcmUgdmVyYm9zZSB0aGUgdHJhY2luZy4KKwkgKi8KKwlTdHJpbmcgVHJhY2VMZXZlbCA9IFZhbGlkYXRpb25QbHVnaW4uUExVR0lOX0lEKyIvdHJhY2UvbGV2ZWwiOyAvLyROT04tTkxTLTEkCiAKIH0KZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24vdmYyL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL2ludGVybmFsL0RlcGVuZGVuY3lJbmRleC5qYXZhIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi92ZjIvb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vaW50ZXJuYWwvRGVwZW5kZW5jeUluZGV4LmphdmEKaW5kZXggNmU0MDI2ZS4uZmUxZGIxNSAxMDA2NDQKLS0tIGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi92ZjIvb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vaW50ZXJuYWwvRGVwZW5kZW5jeUluZGV4LmphdmEKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi92ZjIvb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vaW50ZXJuYWwvRGVwZW5kZW5jeUluZGV4LmphdmEKQEAgLTEyLDYgKzEyLDcgQEAKIAogaW1wb3J0IGphdmEuaW8uRGF0YUlucHV0U3RyZWFtOwogaW1wb3J0IGphdmEuaW8uRGF0YU91dHB1dFN0cmVhbTsKK2ltcG9ydCBqYXZhLmlvLkVPRkV4Y2VwdGlvbjsKIGltcG9ydCBqYXZhLmlvLkZpbGU7CiBpbXBvcnQgamF2YS5pby5GaWxlSW5wdXRTdHJlYW07CiBpbXBvcnQgamF2YS5pby5GaWxlT3V0cHV0U3RyZWFtOwpAQCAtNzYsNiArNzcsNyBAQAogCiAJcHVibGljIHN5bmNocm9uaXplZCB2b2lkIGFkZChTdHJpbmcgaWQsIElSZXNvdXJjZSBkZXBlbmRlbnQsIElSZXNvdXJjZSBkZXBlbmRzT24pIHsKIAkJaW5pdCgpOworCQlpZiAoZGVwZW5kc09uID09IG51bGwgfHwgZGVwZW5kZW50ID09IG51bGwpcmV0dXJuOwogCQlEZXBlbmRzIGQgPSBnZXRPckNyZWF0ZURlcGVuZHMoZGVwZW5kZW50LCBkZXBlbmRzT24pOwogCQlpZiAoZC5nZXRWYWxpZGF0b3JzKCkuYWRkKGlkKSlfZGlydHkgPSB0cnVlOwogCX0KQEAgLTgzLDcgKzg1LDcgQEAKIAlwcml2YXRlIERlcGVuZHMgZ2V0T3JDcmVhdGVEZXBlbmRzKElSZXNvdXJjZSBkZXBlbmRlbnQsIElSZXNvdXJjZSBkZXBlbmRzT24pIHsKIAkJU2V0PERlcGVuZHM+IHNldCA9IGdldFNldChfZGVwZW5kZW50cywgZGVwZW5kZW50KTsKIAkJZm9yIChEZXBlbmRzIGQgOiBzZXQpewotCQkJaWYgKGQuZ2V0RGVwZW5kc09uKCkgPT0gZGVwZW5kc09uKXJldHVybiBkOworCQkJaWYgKGQuZ2V0RGVwZW5kc09uKCkgIT0gbnVsbCAmJiBkLmdldERlcGVuZHNPbigpLmVxdWFscyhkZXBlbmRzT24pKSByZXR1cm4gZDsKIAkJfQogCQlEZXBlbmRzIGQgPSBuZXcgRGVwZW5kcyhkZXBlbmRlbnQsIGRlcGVuZHNPbik7CiAJCV9kaXJ0eSA9IHRydWU7CkBAIC0xMTgsOCArMTIwLDcgQEAKIAkJCV9kZXBlbmRlbnRzID0gbmV3IEhhc2hNYXA8SVJlc291cmNlLFNldDxEZXBlbmRzPj4oMTAwKTsKIAkJfQogCQllbHNlIHsKLQkJCVN0cmluZyBlcnJvck1lc3NhZ2UgPSAiVGhlIGZvbGxvd2luZyBkZXBlbmRlbmN5IGNvdWxkIG5vdCBiZSByZXN0b3JlZCAiICsgLy8kTk9OLU5MUy0xJAotCQkJCSJiZWNhdXNlIHRoZSBmb2xsb3dpbmcgcmVzb3VyY2UgezB9IGNvdWxkIG5vIGxvbmdlciBiZSBmb3VuZC4iOyAvLyROT04tTkxTLTEkCisJCQlTdHJpbmcgZXJyb3JNZXNzYWdlID0gVmFsTWVzc2FnZXMuRXJyb3IyMTsgCiAJCQlEYXRhSW5wdXRTdHJlYW0gaW4gPSBudWxsOwogCQkJdHJ5IHsKIAkJCQlJV29ya3NwYWNlUm9vdCByb290ID0gUmVzb3VyY2VzUGx1Z2luLmdldFdvcmtzcGFjZSgpLmdldFJvb3QoKTsKQEAgLTEzNyw5ICsxMzgsOCBAQAogCQkJCWZvciAoaW50IGk9MDsgaTxudW1EZXBlbmRzT247IGkrKyl7CiAJCQkJCVN0cmluZyB2ID0gaW4ucmVhZFVURigpOwogCQkJCQlJUmVzb3VyY2UgZGVwZW5kc09uID0gcm9vdC5maW5kTWVtYmVyKHYpOwotCQkJCQlpZiAodiA9PSBudWxsKXsKKwkJCQkJaWYgKGRlcGVuZHNPbiA9PSBudWxsKXsKIAkJCQkJCVRyYWNpbmcubG9nKE5MUy5iaW5kKGVycm9yTWVzc2FnZSwgdikpOwotCQkJCQkJY29udGludWU7CiAJCQkJCX0KIAkJCQkJaW50IG51bURlcGVuZGVudHMgPSBpbi5yZWFkSW50KCk7CiAJCQkJCWZvciAoaW50IGo9MDsgajxudW1EZXBlbmRlbnRzOyBqKyspewpAQCAtMTQ3LDE2ICsxNDcsMTggQEAKIAkJCQkJCUlSZXNvdXJjZSBkZXBlbmRlbnQgPSByb290LmZpbmRNZW1iZXIodik7CiAJCQkJCQlpZiAoZGVwZW5kZW50ID09IG51bGwpewogCQkJCQkJCVRyYWNpbmcubG9nKE5MUy5iaW5kKGVycm9yTWVzc2FnZSwgdikpOwotCQkJCQkJCWNvbnRpbnVlOwogCQkJCQkJfQogCQkJCQkJaW50IG51bVZhbCA9IGluLnJlYWRJbnQoKTsKIAkJCQkJCWZvciAoaW50IGs9MDsgazxudW1WYWw7IGsrKyl7CiAJCQkJCQkJU3RyaW5nIGlkID0gaW4ucmVhZFVURigpOwotCQkJCQkJCWFkZChpZCwgZGVwZW5kZW50LCBkZXBlbmRzT24pOworCQkJCQkJCWlmIChkZXBlbmRlbnQgIT0gbnVsbCAmJiBkZXBlbmRzT24gIT0gbnVsbClhZGQoaWQsIGRlcGVuZGVudCwgZGVwZW5kc09uKTsKIAkJCQkJCX0KIAkJCQkJfQkJCQkJCiAJCQkJfQkJCQkKIAkJCX0KKwkJCWNhdGNoIChFT0ZFeGNlcHRpb24gZSl7CisJCQkJVHJhY2luZy5sb2coIlVuYWJsZSB0byByZWFkIHRoZSBkZXBlbmRlbmN5IGluZGV4IGZpbGUgYmVjYXVzZSBvZiBFT0YgZXhjZXB0aW9uIik7IAorCQkJfQogCQkJY2F0Y2ggKElPRXhjZXB0aW9uIGUpewogCQkJCWVycm9yID0gdHJ1ZTsKIAkJCQlWYWxpZGF0aW9uUGx1Z2luLmdldFBsdWdpbigpLmhhbmRsZUV4Y2VwdGlvbihlKTsKQEAgLTI0OCwxMCArMjUwLDExIEBACiAJcHVibGljIHN5bmNocm9uaXplZCB2b2lkIHNhdmluZyhJU2F2ZUNvbnRleHQgY29udGV4dCkgdGhyb3dzIENvcmVFeGNlcHRpb24gewogCQlpZiAoIV9kaXJ0eSlyZXR1cm47CiAJCV9kaXJ0eSA9IGZhbHNlOwotCQkKKwkJYm9vbGVhbiBlcnJvciA9IGZhbHNlOwogCQlEYXRhT3V0cHV0U3RyZWFtIG91dCA9IG51bGw7CisJCUZpbGUgZiA9IG51bGw7CiAJCXRyeSB7Ci0JCQlGaWxlIGYgPSBnZXRJbmRleExvY2F0aW9uKCk7CisJCQlmID0gZ2V0SW5kZXhMb2NhdGlvbigpOwogCQkJb3V0ID0gbmV3IERhdGFPdXRwdXRTdHJlYW0obmV3IEZpbGVPdXRwdXRTdHJlYW0oZikpOwogCQkJb3V0LndyaXRlSW50KEN1cnJlbnRWZXJzaW9uKTsKIAkJCU1hcDxTdHJpbmcsIFNldDxEZXBlbmRzUmVzb2x2ZWQ+PiBtYXAgPSBjb21wcmVzcyhfZGVwZW5kc09uKTsKQEAgLTI3MCwxMCArMjczLDEyIEBACiAJCQl9CiAJCX0KIAkJY2F0Y2ggKElPRXhjZXB0aW9uIGUpeworCQkJZXJyb3IgPSB0cnVlOwogCQkJVmFsaWRhdGlvblBsdWdpbi5nZXRQbHVnaW4oKS5oYW5kbGVFeGNlcHRpb24oZSk7CiAJCX0KLQkJZmluYWxseSB7CisJCWZpbmFsbHkgewkJCiAJCQlNaXNjLmNsb3NlKG91dCk7CisJCQlpZiAoZXJyb3IpZi5kZWxldGUoKTsKIAkJfQogCX0KIApkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi92ZjIvb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vaW50ZXJuYWwvRGlzYWJsZWRSZXNvdXJjZU1hbmFnZXIuamF2YSBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24vdmYyL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL2ludGVybmFsL0Rpc2FibGVkUmVzb3VyY2VNYW5hZ2VyLmphdmEKaW5kZXggMWI1MjJmYS4uMTIwMTgwZiAxMDA2NDQKLS0tIGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi92ZjIvb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vaW50ZXJuYWwvRGlzYWJsZWRSZXNvdXJjZU1hbmFnZXIuamF2YQorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uL3ZmMi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9pbnRlcm5hbC9EaXNhYmxlZFJlc291cmNlTWFuYWdlci5qYXZhCkBAIC0xNSwxMSArMTUsOCBAQAogCiBpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5yZXNvdXJjZXMuSVByb2plY3Q7CiBpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5yZXNvdXJjZXMuSVJlc291cmNlOwotaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucmVzb3VyY2VzLlByb2plY3RTY29wZTsKIGltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJ1bnRpbWUuSVBhdGg7CiBpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5ydW50aW1lLlBhdGg7Ci1pbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5ydW50aW1lLnByZWZlcmVuY2VzLklFY2xpcHNlUHJlZmVyZW5jZXM7Ci1pbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5ydW50aW1lLnByZWZlcmVuY2VzLklTY29wZUNvbnRleHQ7CiBpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uaW50ZXJuYWwucGx1Z2luLlZhbGlkYXRpb25QbHVnaW47CiBpbXBvcnQgb3JnLm9zZ2kuc2VydmljZS5wcmVmcy5CYWNraW5nU3RvcmVFeGNlcHRpb247CiAKQEAgLTMxLDExICsyOCw4IEBACiAgKi8KIHB1YmxpYyBjbGFzcyBEaXNhYmxlZFJlc291cmNlTWFuYWdlciBpbXBsZW1lbnRzIElQcm9qZWN0Q2hhbmdlTGlzdGVuZXIgewogCQotCXByaXZhdGUgc3RhdGljIERpc2FibGVkUmVzb3VyY2VNYW5hZ2VyIF9tZTsKLQkKIAlwdWJsaWMgc3RhdGljIERpc2FibGVkUmVzb3VyY2VNYW5hZ2VyIGdldERlZmF1bHQoKXsKLQkJaWYgKF9tZSA9PSBudWxsKV9tZSA9IG5ldyBEaXNhYmxlZFJlc291cmNlTWFuYWdlcigpOwotCQlyZXR1cm4gX21lOworCQlyZXR1cm4gU2luZ2xldG9uLmRpc2FibGVkUmVzb3VyY2VNYW5hZ2VyOwogCX0KIAkKIAlwcml2YXRlIFNldDxJUmVzb3VyY2U+IF9kaXNhYmxlZCA9IG5ldyBIYXNoU2V0PElSZXNvdXJjZT4oMTAwKTsKQEAgLTY2LDEyICs2MCw3IEBACiAJCXNhdmUoY29weSwgcmVzb3VyY2UuZ2V0UHJvamVjdCgpKTsKIAkJX2Rpc2FibGVkID0gY29weTsJCQogCX0KLQkKLQlwcml2YXRlIElFY2xpcHNlUHJlZmVyZW5jZXMgZ2V0UHJlZmVyZW5jZXMoSVByb2plY3QgcHJvamVjdCl7Ci0JCUlTY29wZUNvbnRleHQgcHJvamVjdENvbnRleHQgPSBuZXcgUHJvamVjdFNjb3BlKHByb2plY3QpOwotCQlyZXR1cm4gcHJvamVjdENvbnRleHQuZ2V0Tm9kZShWYWxpZGF0aW9uUGx1Z2luLlBMVUdJTl9JRCk7Ci0JfQotCQorCQkKIAlwcml2YXRlIHZvaWQgc2F2ZShTZXQ8SVJlc291cmNlPiBkaXNhYmxlZCwgSVByb2plY3QgcHJvamVjdCkgewogCQlTZXJpYWxpemVyIHNlciA9IG5ldyBTZXJpYWxpemVyKDIwMCk7CiAJCWZvciAoSVJlc291cmNlIHJlc291cmNlIDogZGlzYWJsZWQpewpAQCAtNzksNyArNjgsNyBAQAogCQkJCXNlci5wdXQocmVzb3VyY2UuZ2V0UHJvamVjdFJlbGF0aXZlUGF0aCgpLnRvUG9ydGFibGVTdHJpbmcoKSk7CiAJCQl9CiAJCX0KLQkJSUVjbGlwc2VQcmVmZXJlbmNlcyBwcmVmcyA9IGdldFByZWZlcmVuY2VzKHByb2plY3QpOworCQlQcmVmZXJlbmNlc1dyYXBwZXIgcHJlZnMgPSBQcmVmZXJlbmNlc1dyYXBwZXIuZ2V0UHJlZmVyZW5jZXMocHJvamVjdCwgbnVsbCk7CiAJCXByZWZzLnB1dChQcmVmQ29uc3RhbnRzLmRpc2FibGVkLCBzZXIudG9TdHJpbmcoKSk7CiAJCXRyeSB7CiAJCQlwcmVmcy5mbHVzaCgpOwpAQCAtOTIsNyArODEsNyBAQAogCXByaXZhdGUgdm9pZCBsb2FkKElQcm9qZWN0IHByb2plY3QpewogCQlTZXQ8SVJlc291cmNlPiBjb3B5ID0gbmV3IEhhc2hTZXQ8SVJlc291cmNlPihfZGlzYWJsZWQuc2l6ZSgpKzEwKTsKIAkJY29weS5hZGRBbGwoX2Rpc2FibGVkKTsKLQkJSUVjbGlwc2VQcmVmZXJlbmNlcyBwcmVmcyA9IGdldFByZWZlcmVuY2VzKHByb2plY3QpOworCQlQcmVmZXJlbmNlc1dyYXBwZXIgcHJlZnMgPSBQcmVmZXJlbmNlc1dyYXBwZXIuZ2V0UHJlZmVyZW5jZXMocHJvamVjdCwgbnVsbCk7CiAJCVN0cmluZyBkaXNhYmxlZCA9IHByZWZzLmdldChQcmVmQ29uc3RhbnRzLmRpc2FibGVkLCAiIik7IC8vJE5PTi1OTFMtMSQKIAkJaWYgKGRpc2FibGVkLmxlbmd0aCgpID4gMCl7CiAJCQlEZXNlcmlhbGl6ZXIgZGVzID0gbmV3IERlc2VyaWFsaXplcihkaXNhYmxlZCk7CkBAIC0xNTMsNSArMTQyLDE3IEBACiAJCX0KIAkJX2Rpc2FibGVkID0gY29weTsKIAl9CisJCisJLyoqCisJICogU3RvcmUgdGhlIHNpbmdsZXRvbiBmb3IgdGhlIERpc2FibGVkUmVzb3VyY2VNYW5hZ2VyLiBUaGlzIGFwcHJvYWNoIGlzIHVzZWQgdG8gYXZvaWQgaGF2aW5nIHRvIHN5bmNocm9uaXplIHRoZQorCSAqIERpc2FibGVkUmVzb3VyY2VNYW5hZ2VyLmdldERlZmF1bHQoKSBtZXRob2QuCisJICogCisJICogQGF1dGhvciBrYXJhc2l1aworCSAqCisJICovCisJcHJpdmF0ZSBzdGF0aWMgY2xhc3MgU2luZ2xldG9uIHsKKwkJc3RhdGljIERpc2FibGVkUmVzb3VyY2VNYW5hZ2VyIGRpc2FibGVkUmVzb3VyY2VNYW5hZ2VyID0gbmV3IERpc2FibGVkUmVzb3VyY2VNYW5hZ2VyKCk7CisJfQorCiAKIH0KZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24vdmYyL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL2ludGVybmFsL0Rpc2FibGVkVmFsaWRhdG9yTWFuYWdlci5qYXZhIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi92ZjIvb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vaW50ZXJuYWwvRGlzYWJsZWRWYWxpZGF0b3JNYW5hZ2VyLmphdmEKaW5kZXggNGFmZTE1ZS4uOGExNDFjNSAxMDA2NDQKLS0tIGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi92ZjIvb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vaW50ZXJuYWwvRGlzYWJsZWRWYWxpZGF0b3JNYW5hZ2VyLmphdmEKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi92ZjIvb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vaW50ZXJuYWwvRGlzYWJsZWRWYWxpZGF0b3JNYW5hZ2VyLmphdmEKQEAgLTEsMyArMSwxMyBAQAorLyoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioKKyAqIENvcHlyaWdodCAoYykgMjAwOCBJQk0gQ29ycG9yYXRpb24gYW5kIG90aGVycy4KKyAqIEFsbCByaWdodHMgcmVzZXJ2ZWQuIFRoaXMgcHJvZ3JhbSBhbmQgdGhlIGFjY29tcGFueWluZyBtYXRlcmlhbHMKKyAqIGFyZSBtYWRlIGF2YWlsYWJsZSB1bmRlciB0aGUgdGVybXMgb2YgdGhlIEVjbGlwc2UgUHVibGljIExpY2Vuc2UgdjEuMAorICogd2hpY2ggYWNjb21wYW5pZXMgdGhpcyBkaXN0cmlidXRpb24sIGFuZCBpcyBhdmFpbGFibGUgYXQKKyAqIGh0dHA6Ly93d3cuZWNsaXBzZS5vcmcvbGVnYWwvZXBsLXYxMC5odG1sCisgKgorICogQ29udHJpYnV0b3JzOgorICogICAgIElCTSBDb3Jwb3JhdGlvbiAtIGluaXRpYWwgQVBJIGFuZCBpbXBsZW1lbnRhdGlvbgorICoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKiovCiBwYWNrYWdlIG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLmludGVybmFsOwogCiBpbXBvcnQgamF2YS51dGlsLkNvbGxlY3Rpb25zOwpAQCAtNSw2ICsxNSw3IEBACiBpbXBvcnQgamF2YS51dGlsLkhhc2hTZXQ7CiBpbXBvcnQgamF2YS51dGlsLk1hcDsKIGltcG9ydCBqYXZhLnV0aWwuU2V0OworaW1wb3J0IGphdmEudXRpbC5jb25jdXJyZW50LmF0b21pYy5BdG9taWNJbnRlZ2VyOwogCiBpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5yZXNvdXJjZXMuSVByb2plY3Q7CiBpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5yZXNvdXJjZXMuSVJlc291cmNlOwpAQCAtMTgsMjAgKzI5LDE1IEBACiAgKiBAYXV0aG9yIGthcmFzaXVrCiAgKgogICovCi1wdWJsaWMgY2xhc3MgRGlzYWJsZWRWYWxpZGF0b3JNYW5hZ2VyIGltcGxlbWVudHMgSVZhbENoYW5nZWRMaXN0ZW5lciB7CitwdWJsaWMgZmluYWwgY2xhc3MgRGlzYWJsZWRWYWxpZGF0b3JNYW5hZ2VyIGltcGxlbWVudHMgSVZhbENoYW5nZWRMaXN0ZW5lciB7CiAJCi0JcHJpdmF0ZSBzdGF0aWMgRGlzYWJsZWRWYWxpZGF0b3JNYW5hZ2VyIF9tZTsKLQlwcml2YXRlIHN0YXRpYyBpbnQgX2NvdW50ZXI7CisJcHJpdmF0ZSBzdGF0aWMgZmluYWwgQXRvbWljSW50ZWdlciBfY291bnRlciA9IG5ldyBBdG9taWNJbnRlZ2VyKCk7CiAJcHJpdmF0ZSBzdGF0aWMgZmluYWwgaW50IENhY2hlU2l6ZSA9IDU7CiAJCi0JcHJpdmF0ZSBNYXA8SVJlc291cmNlLCBMUlVTZXQ+IF9tYXAgPSBDb2xsZWN0aW9ucy5zeW5jaHJvbml6ZWRNYXAobmV3IEhhc2hNYXA8SVJlc291cmNlLCBMUlVTZXQ+KDUpKTsKKwlwcml2YXRlIGZpbmFsIE1hcDxJUmVzb3VyY2UsIExSVVNldD4gX21hcCA9IENvbGxlY3Rpb25zLnN5bmNocm9uaXplZE1hcChuZXcgSGFzaE1hcDxJUmVzb3VyY2UsIExSVVNldD4oNSkpOwogCQogCXB1YmxpYyBzdGF0aWMgRGlzYWJsZWRWYWxpZGF0b3JNYW5hZ2VyIGdldERlZmF1bHQoKXsKLQkJRGlzYWJsZWRWYWxpZGF0b3JNYW5hZ2VyIG1lID0gX21lOwotCQlpZiAobWUgIT0gbnVsbClyZXR1cm4gbWU7Ci0JCW1lID0gbmV3IERpc2FibGVkVmFsaWRhdG9yTWFuYWdlcigpOwotCQlfbWUgPSBtZTsKLQkJcmV0dXJuIG1lOworCQlyZXR1cm4gU2luZ2xldG9uLmRpc2FibGVkVmFsaWRhdG9yTWFuYWdlcjsKIAl9CiAJCiAJcHJpdmF0ZSBEaXNhYmxlZFZhbGlkYXRvck1hbmFnZXIoKXsKQEAgLTQ4LDcgKzU0LDcgQEAKIAlwdWJsaWMgU2V0PFZhbGlkYXRvcj4gZ2V0RGlzYWJsZWRWYWxpZGF0b3JzRm9yKElSZXNvdXJjZSByZXNvdXJjZSkgewogCQlMUlVTZXQgc2V0ID0gX21hcC5nZXQocmVzb3VyY2UpOwogCQlpZiAoc2V0ICE9IG51bGwpewotCQkJc2V0LmNvdW50ZXIgPSBfY291bnRlcisrOworCQkJc2V0LmNvdW50ZXIgPSBfY291bnRlci5nZXRBbmRJbmNyZW1lbnQoKTsKIAkJCXJldHVybiBzZXQudmFsaWRhdG9yczsKIAkJfQogCQkKQEAgLTcxLDE4ICs3NywxOCBAQAogCQkJX21hcC5yZW1vdmUob2xkZXN0KTsKIAkJfQogCQlMUlVTZXQgc2V0ID0gbmV3IExSVVNldCgpOwotCQlzZXQuY291bnRlciA9IF9jb3VudGVyKys7CisJCXNldC5jb3VudGVyID0gX2NvdW50ZXIuZ2V0QW5kSW5jcmVtZW50KCk7CiAJCXNldC52YWxpZGF0b3JzID0gdnNldDsKIAkJX21hcC5wdXQocmVzb3VyY2UsIHNldCk7CQkKIAl9CiAKIAotCXByaXZhdGUgc3RhdGljIGNsYXNzIExSVVNldCB7CisJcHJpdmF0ZSBmaW5hbCBzdGF0aWMgY2xhc3MgTFJVU2V0IHsKIAkJaW50IGNvdW50ZXI7CiAJCVNldDxWYWxpZGF0b3I+IHZhbGlkYXRvcnM7CiAJfQogCQotCXByaXZhdGUgc3RhdGljIGNsYXNzIERpc2FibGVkVmFsaWRhdGlvbkZpbmRlciBpbXBsZW1lbnRzIElWYWxpZGF0b3JWaXNpdG9yIHsKKwlwcml2YXRlIGZpbmFsIHN0YXRpYyBjbGFzcyBEaXNhYmxlZFZhbGlkYXRpb25GaW5kZXIgaW1wbGVtZW50cyBJVmFsaWRhdG9yVmlzaXRvciB7CiAJCQogCQlwcml2YXRlIE1hcDxTdHJpbmcsIFZhbGlkYXRvcj4gX3ZhbGlkYXRvcnM7CiAKQEAgLTExMiw1ICsxMTgsMTggQEAKIAlwdWJsaWMgdm9pZCB2YWxpZGF0b3JzRm9yUHJvamVjdENoYW5nZWQoSVByb2plY3QgcHJvamVjdCwgYm9vbGVhbiBjb25maWdTZXR0aW5nQ2hhbmdlZCkgewogCQlfbWFwLmNsZWFyKCk7CiAJfQorCQorCQorCS8qKgorCSAqIFN0b3JlIHRoZSBzaW5nbGV0b24gZm9yIHRoZSBEaXNhYmxlZFZhbGlkYXRvck1hbmFnZXIuIFRoaXMgYXBwcm9hY2ggaXMgdXNlZCB0byBhdm9pZCBoYXZpbmcgdG8gc3luY2hyb25pemUgdGhlCisJICogRGlzYWJsZWRWYWxpZGF0b3JNYW5hZ2VyLmdldERlZmF1bHQoKSBtZXRob2QuCisJICogCisJICogQGF1dGhvciBrYXJhc2l1aworCSAqCisJICovCisJcHJpdmF0ZSBmaW5hbCBzdGF0aWMgY2xhc3MgU2luZ2xldG9uIHsKKwkJZmluYWwgc3RhdGljIERpc2FibGVkVmFsaWRhdG9yTWFuYWdlciBkaXNhYmxlZFZhbGlkYXRvck1hbmFnZXIgPSBuZXcgRGlzYWJsZWRWYWxpZGF0b3JNYW5hZ2VyKCk7CisJfQorCiAKIH0KZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24vdmYyL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL2ludGVybmFsL0V4dGVuc2lvbkNvbnN0YW50cy5qYXZhIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi92ZjIvb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vaW50ZXJuYWwvRXh0ZW5zaW9uQ29uc3RhbnRzLmphdmEKaW5kZXggOTA3M2NkYi4uNjY0OWQ1OSAxMDA2NDQKLS0tIGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi92ZjIvb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vaW50ZXJuYWwvRXh0ZW5zaW9uQ29uc3RhbnRzLmphdmEKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi92ZjIvb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vaW50ZXJuYWwvRXh0ZW5zaW9uQ29uc3RhbnRzLmphdmEKQEAgLTEsNSArMSw1IEBACiAvKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKgotICogQ29weXJpZ2h0IChjKSAyMDA1LCAyMDA4IElCTSBDb3Jwb3JhdGlvbiBhbmQgb3RoZXJzLgorICogQ29weXJpZ2h0IChjKSAyMDA1LCAyMDEwIElCTSBDb3Jwb3JhdGlvbiBhbmQgb3RoZXJzLgogICogQWxsIHJpZ2h0cyByZXNlcnZlZC4gVGhpcyBwcm9ncmFtIGFuZCB0aGUgYWNjb21wYW55aW5nIG1hdGVyaWFscwogICogYXJlIG1hZGUgYXZhaWxhYmxlIHVuZGVyIHRoZSB0ZXJtcyBvZiB0aGUgRWNsaXBzZSBQdWJsaWMgTGljZW5zZSB2MS4wCiAgKiB3aGljaCBhY2NvbXBhbmllcyB0aGlzIGRpc3RyaWJ1dGlvbiwgYW5kIGlzIGF2YWlsYWJsZSBhdApAQCAtNjcsNiArNjcsMTAgQEAKIAkvKiogcnVsZXMgLSBleHRlbnNpb24gcG9pbnQgdG8gZGVjbGFyZSBhIHZhbGlkYXRvciBncm91cCAqLwogCVN0cmluZyBncm91cCA9ICJ2YWxpZGF0b3JHcm91cCI7IC8vJE5PTi1OTFMtMSQKIAkKKwkvKiogcmVtb3ZlVjJWYWxpZGF0b3IgLSBleHRlbnNpb24gcG9pbnQgdG8gcmVtb3ZlIGEgVjIgdmFsaWRhdG9yICovCisJU3RyaW5nIHJlbW92ZWRWYWxpZGF0b3JFeHRlbnNpb24gPSAicmVtb3ZlVjJWYWxpZGF0b3IiOyAvLyROT04tTkxTLTEkCisJCisKIAlpbnRlcmZhY2UgR3JvdXAgewogCQkvKgogCQkgKiBUaGUgZ3JvdXAgc3ViLWVsZW1lbnQgZm9yIGVpdGhlciB0aGUgdmFsaWRhdG9yR3JvdXAgb3IgdmFsaWRhdG9yCkBAIC05OCw2ICsxMDIsOSBAQAogCQkKIAkJLyoqIGNvbnRlbnRUeXBlIC0gZmlsdGVyIGJ5IGNvbnRlbnQgdHlwZS4gKi8KIAkJU3RyaW5nIGNvbnRlbnRUeXBlID0gImNvbnRlbnRUeXBlIjsgLy8kTk9OLU5MUy0xJAorCQkKKwkJLyoqIHBhdHRlcm4gLSBmaWx0ZXIgcGF0aHMgYnkgcmVndWxhciBleHByZXNzaW9uLiAqLworCQlTdHJpbmcgcGF0dGVybiA9ICJwYXR0ZXJuIjsgLy8kTk9OLU5MUy0xJAogCX0KIAkKIAkvKiogUnVsZSBhdHRyaWJ1dGVzICovCkBAIC0xMjEsNiArMTI4LDkgQEAKIAkJLyoqIG5hbWUgLSBhIGZpbGUgbmFtZS4gKi8KIAkJU3RyaW5nIG5hbWUgPSAibmFtZSI7IC8vJE5PTi1OTFMtMSQKIAkJCisJCS8qKiByZWdleCAtIGEgSmF2YSByZWd1bGFyIGV4cHJlc3Npb24uICovCisJCVN0cmluZyByZWdleCA9ICJyZWdleCI7IC8vJE5PTi1OTFMtMSQKKwkJCiAJCS8qKiAKIAkJICogdHlwZSAtIHRoZSB0eXBlIG9mIGZpbGUgdG8gYmUgbWF0Y2hlZDoKIAkJICogPHVsPgpAQCAtMTMwLDYgKzE0MCw5IEBACiAJCSAqIDwvdWw+CiAJCSAqLwogCQlTdHJpbmcgZmlsZVR5cGUgPSAidHlwZSI7IC8vJE5PTi1OTFMtMSQKKwkJCisJCS8qKiB2ZXJzaW9uIC0gZmFjZXQgdmVyc2lvbiBleHByZXNzaW9uLiBTZWUgdGhlIGZhY2V0IGZyYW1ld29yayBmb3IgdGhlIGV4YWN0IHN5bnRheCBvZiB0aGlzIGV4cHJlc3Npb24uICovCisJCVN0cmluZyB2ZXJzaW9uID0gInZlcnNpb24iOyAvLyROT04tTkxTLTEkCiAJfQogCQogCWludGVyZmFjZSBGaWxlVHlwZSB7CkBAIC0xNjYsNiArMTc5LDEwIEBACiAJCVN0cmluZyBpZCA9ICJpZCI7IC8vJE5PTi1OTFMtMSQKIAl9CiAJCisJaW50ZXJmYWNlIFJlbW92ZWRWYWxpZGF0b3IgeworCQkvKiogdmFsaWRhdG9ySWQgLSB0aGUgdmFsaWRhdG9yIElELiBUaGUgU3RyaW5nIHJlcHJlc2VudHMgdGhlIHZhbGlkYXRvciB0aGF0IHdpbGwgYmUgcmVtb3ZlZCAqLworCQlTdHJpbmcgdmFsaWRhdG9ySURBdHRyID0gInZhbGlkYXRvcklkIjsgLy8kTk9OLU5MUy0xJAorCX0KIAkvKiogdHJ1ZSAqLwogCVN0cmluZyBUcnVlID0gInRydWUiOyAvLyROT04tTkxTLTEkCiAJCmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uL3ZmMi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9pbnRlcm5hbC9FeHRlbnNpb25WYWxpZGF0b3JzLmphdmEgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uL3ZmMi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9pbnRlcm5hbC9FeHRlbnNpb25WYWxpZGF0b3JzLmphdmEKaW5kZXggNWI3NDU2OC4uMDkwZjRhZiAxMDA2NDQKLS0tIGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi92ZjIvb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vaW50ZXJuYWwvRXh0ZW5zaW9uVmFsaWRhdG9ycy5qYXZhCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24vdmYyL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL2ludGVybmFsL0V4dGVuc2lvblZhbGlkYXRvcnMuamF2YQpAQCAtMTIsNiArMTIsOCBAQAogCiBpbXBvcnQgamF2YS5sYW5nLnJlZmxlY3QuSW52b2NhdGlvblRhcmdldEV4Y2VwdGlvbjsKIGltcG9ydCBqYXZhLnV0aWwuSGFzaE1hcDsKK2ltcG9ydCBqYXZhLnV0aWwuTGlua2VkTGlzdDsKK2ltcG9ydCBqYXZhLnV0aWwuTGlzdDsKIGltcG9ydCBqYXZhLnV0aWwuTWFwOwogCiBpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5yZXNvdXJjZXMuSVByb2plY3Q7CkBAIC0yMywyOSArMjUsMjYgQEAKICAqIEBhdXRob3Iga2FyYXNpdWsKICAqCiAgKi8KLXB1YmxpYyBjbGFzcyBFeHRlbnNpb25WYWxpZGF0b3JzIHsKK3B1YmxpYyBmaW5hbCBjbGFzcyBFeHRlbnNpb25WYWxpZGF0b3JzIHsKIAlwcml2YXRlIHN0YXRpYyBFeHRlbnNpb25WYWxpZGF0b3JzIF9tZTsKIAkKIAkvKiogQWxsIHRoZSByZWdpc3RlcmVkIHZhbGlkYXRvcnMuIFRoZSBrZXkgaXMgdGhlIHZhbGlkYXRvciBpZCBhbmQgdGhlIHZhbHVlIGlzIHRoZSB2YWxpZGF0b3IuICovCi0JcHJpdmF0ZSBNYXA8U3RyaW5nLCBWYWxpZGF0b3I+IF9tYXA7CisJcHJpdmF0ZSBmaW5hbCBNYXA8U3RyaW5nLCBWYWxpZGF0b3I+IF9tYXA7CiAJCiAJcHVibGljIHN5bmNocm9uaXplZCBzdGF0aWMgRXh0ZW5zaW9uVmFsaWRhdG9ycyBpbnN0YW5jZSgpewogCQlpZiAoX21lID09IG51bGwpewogCQkJX21lID0gbmV3IEV4dGVuc2lvblZhbGlkYXRvcnMoKTsKLQkJCV9tZS5sb2FkKCk7CiAJCX0KIAkJcmV0dXJuIF9tZTsKIAl9CiAKLQlwcml2YXRlIEV4dGVuc2lvblZhbGlkYXRvcnMoKXt9OwotCQotCXByaXZhdGUgdm9pZCBsb2FkKCkgeworCXByaXZhdGUgRXh0ZW5zaW9uVmFsaWRhdG9ycygpewogCQlfbWFwID0gbmV3IEhhc2hNYXA8U3RyaW5nLCBWYWxpZGF0b3I+KDEwMCk7CiAJCWZvciAoVmFsaWRhdG9yIHYgOiBWYWxpZGF0b3JFeHRlbnNpb25SZWFkZXIuZ2V0RGVmYXVsdCgpLnByb2Nlc3MoKSl7CiAJCQlfbWFwLnB1dCh2LmdldElkKCksIHYpOwotCQl9CisJCX0JCQogCX0KLQorCQogCS8qKgogCSAqIEFuc3dlciBhbGwgdGhlIHYyIHZhbGlkYXRvcnMgdGhhdCBoYXZlIGJlZW4gZGVmaW5lZCBieSB0aGUgZXh0ZW5zaW9uIHBvaW50LiBUaGlzIGlzIHRoZSByZWFsCiAJICogbWFwIChub3QgYSBjb3B5KS4KQEAgLTgxLDE5ICs4MCwzMSBAQAogCQlNYXA8U3RyaW5nLCBWYWxpZGF0b3I+IG1hcCA9IG5ldyBIYXNoTWFwPFN0cmluZywgVmFsaWRhdG9yPigpOwogCQltYXAucHV0QWxsKF9tYXApOwogCQkKKwkJZm9yIChWYWxpZGF0b3IgdiA6IGdldFYxVmFsaWRhdG9ycyhwcm9qZWN0KSltYXAucHV0KHYuZ2V0SWQoKSwgdik7CisJCQorCQlyZXR1cm4gbWFwOworCX0KKwkKKwkvKioKKwkgKiBBbnN3ZXIgdGhlIHYxIHZhbGlkYXRvcnMgdGhhdCBoYXZlIGJlZW4gZGVmaW5lZCBqdXN0IG9uIHRoaXMgcHJvamVjdC4KKwkgKiBAcGFyYW0gcHJvamVjdAorCSAqIEByZXR1cm4KKwkgKi8KKwlMaXN0PFZhbGlkYXRvcj4gZ2V0VjFWYWxpZGF0b3JzKElQcm9qZWN0IHByb2plY3QpeworCQlMaXN0PFZhbGlkYXRvcj4gbGlzdCA9IG5ldyBMaW5rZWRMaXN0PFZhbGlkYXRvcj4oKTsKIAkJdHJ5IHsKIAkJCVByb2plY3RDb25maWd1cmF0aW9uIHBjID0gbmV3IFByb2plY3RDb25maWd1cmF0aW9uKHByb2plY3QpOwogCQkJcGMucmVzZXRUb0RlZmF1bHQoKTsKIAkJCWZvciAoVmFsaWRhdG9yTWV0YURhdGEgdm1kIDogcGMuZ2V0VmFsaWRhdG9ycygpKXsKIAkJCQlWYWxpZGF0b3IgdiA9IFZhbGlkYXRvci5jcmVhdGUodm1kLCBwYywgcHJvamVjdCk7Ci0JCQkJbWFwLnB1dCh2LmdldElkKCksIHYpOworCQkJCWxpc3QuYWRkKHYpOwogCQkJfQogCQl9CiAJCWNhdGNoIChJbnZvY2F0aW9uVGFyZ2V0RXhjZXB0aW9uIGUpewogCQkJVmFsaWRhdGlvblBsdWdpbi5nZXRQbHVnaW4oKS5oYW5kbGVFeGNlcHRpb24oZSk7CiAJCX0KIAotCQlyZXR1cm4gbWFwOworCQlyZXR1cm4gbGlzdDsKIAl9CiAKIH0KZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24vdmYyL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL2ludGVybmFsL01hcmtlck1hbmFnZXIuamF2YSBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24vdmYyL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL2ludGVybmFsL01hcmtlck1hbmFnZXIuamF2YQppbmRleCAwMzcyMmJlLi44Nzc2NTI1IDEwMDY0NAotLS0gYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uL3ZmMi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9pbnRlcm5hbC9NYXJrZXJNYW5hZ2VyLmphdmEKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi92ZjIvb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vaW50ZXJuYWwvTWFya2VyTWFuYWdlci5qYXZhCkBAIC0zMSwxMyArMzEsMTAgQEAKICAqLwogcHVibGljIGNsYXNzIE1hcmtlck1hbmFnZXIgewogCQotCXByaXZhdGUgc3RhdGljIE1hcmtlck1hbmFnZXIgX21lOwotCQogCXByaXZhdGUgU2V0PFN0cmluZz4gX21hcmtlcnMgPSBuZXcgSGFzaFNldDxTdHJpbmc+KDUwKTsKIAkKIAlwdWJsaWMgc3RhdGljIE1hcmtlck1hbmFnZXIgZ2V0RGVmYXVsdCgpewotCQlpZiAoX21lID09IG51bGwpX21lID0gbmV3IE1hcmtlck1hbmFnZXIoKTsKLQkJcmV0dXJuIF9tZTsKKwkJcmV0dXJuIFNpbmdsZXRvbi5tYXJrZXJNYW5hZ2VyOwogCX0KIAkKIAlwcml2YXRlIE1hcmtlck1hbmFnZXIoKXsKQEAgLTYwLDcgKzU3LDEyIEBACiAJCQogCQlTdHJpbmcgaWQgPSB2YWxpZGF0b3IuZ2V0TWFya2VySWQoKTsKIAkJaWYgKGlkICE9IG51bGwpewotCQkJcmVzb3VyY2UuZGVsZXRlTWFya2VycyhpZCwgdHJ1ZSwgSVJlc291cmNlLkRFUFRIX1pFUk8pOworCQkJdHJ5IHsKKwkJCQlyZXNvdXJjZS5kZWxldGVNYXJrZXJzKGlkLCB0cnVlLCBJUmVzb3VyY2UuREVQVEhfWkVSTyk7CisJCQl9CisJCQljYXRjaCAoQ29yZUV4Y2VwdGlvbiBlKXsKKwkJCQkvLyBOb3RoaW5nIHRoYXQgd2UgY2FuIGRvLiBUaGlzIGlzIG5vdCB3b3J0aCBsb2dnaW5nLgorCQkJfQogCQkJcmV0dXJuOwogCQl9CiAJCQkJCkBAIC0xMDYsMTEgKzEwOCwyNiBAQAogCQl0cnkgewogCQkJaG9vayhyZXNvdXJjZSk7IAogCQkJSU1hcmtlcltdIG1hcmtlcnMgPSByZXNvdXJjZS5maW5kTWFya2VycyhudWxsLCB0cnVlLCBkZXB0aCk7CisJCQlTdHJpbmcgbWFya2VyVHlwZTsKIAkJCWZvciAoSU1hcmtlciBtYXJrZXIgOiBtYXJrZXJzKXsKLQkJCQlpZiAoX21hcmtlcnMuY29udGFpbnMobWFya2VyLmdldFR5cGUoKSkpeworCQkJCXRyeSB7CisJCQkJCW1hcmtlclR5cGUgPSBtYXJrZXIuZ2V0VHlwZSgpOworCQkJCX0KKwkJCQljYXRjaCAoQ29yZUV4Y2VwdGlvbiBlKQorCQkJCXsKKwkJCQkJLy9pZ25vcmUgdGhlIG1hcmtlcgorCQkJCQlyZXR1cm47CisJCQkJfQorCQkJCWlmIChfbWFya2Vycy5jb250YWlucyhtYXJrZXJUeXBlKSl7CiAJCQkJCWxvbmcgY3JlYXRlVGltZSA9IG1hcmtlci5nZXRDcmVhdGlvblRpbWUoKTsKLS8vCQkJCQlsb25nIGRpZmYgPSBjcmVhdGVUaW1lIC0gb3BlcmF0aW9uU3RhcnRUaW1lOwotCQkJCQlpZiAoY3JlYXRlVGltZSA8IG9wZXJhdGlvblN0YXJ0VGltZSltYXJrZXIuZGVsZXRlKCk7CisJCQkJCWlmIChjcmVhdGVUaW1lIDwgb3BlcmF0aW9uU3RhcnRUaW1lKXsKKwkJCQkJCXRyeSB7CisJCQkJCQkJbWFya2VyLmRlbGV0ZSgpOworCQkJCQkJfQorCQkJCQkJY2F0Y2ggKENvcmVFeGNlcHRpb24gZSl7CisJCQkJCQkJLy8gZWF0IGl0IC0gdGhlcmUgaXMgbm90aGluZyB3ZSBjYW4gZG8gYWJvdXQgdGhpcy4KKwkJCQkJCX0KKwkJCQkJfQogCQkJCX0KIAkJCX0KIAkJfQpAQCAtMTcyLDUgKzE4OSwxNyBAQAogCXB1YmxpYyBTZXQ8U3RyaW5nPiBnZXRNYXJrZXJzKCkgewogCQlyZXR1cm4gX21hcmtlcnM7CiAJfQorCQorCS8qKgorCSAqIFN0b3JlIHRoZSBzaW5nbGV0b24gZm9yIHRoZSBNYXJrZXJNYW5hZ2VyLiBUaGlzIGFwcHJvYWNoIGlzIHVzZWQgdG8gYXZvaWQgaGF2aW5nIHRvIHN5bmNocm9uaXplIHRoZQorCSAqIE1hcmtlck1hbmFnZXIuZ2V0RGVmYXVsdCgpIG1ldGhvZC4KKwkgKiAKKwkgKiBAYXV0aG9yIGthcmFzaXVrCisJICoKKwkgKi8KKwlwcml2YXRlIHN0YXRpYyBjbGFzcyBTaW5nbGV0b24geworCQlzdGF0aWMgTWFya2VyTWFuYWdlciBtYXJrZXJNYW5hZ2VyID0gbmV3IE1hcmtlck1hbmFnZXIoKTsKKwl9CisKIAogfQpkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi92ZjIvb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vaW50ZXJuYWwvTWlzYy5qYXZhIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi92ZjIvb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vaW50ZXJuYWwvTWlzYy5qYXZhCmluZGV4IGJmOWJlZWIuLmNlYWZjNDEgMTAwNjQ0Ci0tLSBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24vdmYyL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL2ludGVybmFsL01pc2MuamF2YQorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uL3ZmMi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9pbnRlcm5hbC9NaXNjLmphdmEKQEAgLTI5LDcgKzI5LDcgQEAKICAqIEBhdXRob3Iga2FyYXNpdWsKICAqCiAgKi8KLXB1YmxpYyBjbGFzcyBNaXNjIHsKK3B1YmxpYyBmaW5hbCBjbGFzcyBNaXNjIHsKIAkKIAlwdWJsaWMgc3RhdGljIHZvaWQgY2xvc2UoSW5wdXRTdHJlYW0gaW4pewogCQlpZiAoaW4gPT0gbnVsbClyZXR1cm47CmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uL3ZmMi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9pbnRlcm5hbC9QcmVmZXJlbmNlc1dyYXBwZXIuamF2YSBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24vdmYyL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL2ludGVybmFsL1ByZWZlcmVuY2VzV3JhcHBlci5qYXZhCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLjBmM2E1ZTcKLS0tIC9kZXYvbnVsbAorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uL3ZmMi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9pbnRlcm5hbC9QcmVmZXJlbmNlc1dyYXBwZXIuamF2YQpAQCAtMCwwICsxLDQzMSBAQAorLyoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioKKyAqIENvcHlyaWdodCAoYykgMjAwOSBJQk0gQ29ycG9yYXRpb24gYW5kIG90aGVycy4KKyAqIEFsbCByaWdodHMgcmVzZXJ2ZWQuIFRoaXMgcHJvZ3JhbSBhbmQgdGhlIGFjY29tcGFueWluZyBtYXRlcmlhbHMKKyAqIGFyZSBtYWRlIGF2YWlsYWJsZSB1bmRlciB0aGUgdGVybXMgb2YgdGhlIEVjbGlwc2UgUHVibGljIExpY2Vuc2UgdjEuMAorICogd2hpY2ggYWNjb21wYW5pZXMgdGhpcyBkaXN0cmlidXRpb24sIGFuZCBpcyBhdmFpbGFibGUgYXQKKyAqIGh0dHA6Ly93d3cuZWNsaXBzZS5vcmcvbGVnYWwvZXBsLXYxMC5odG1sCisgKgorICogQ29udHJpYnV0b3JzOgorICogICAgIElCTSBDb3Jwb3JhdGlvbiAtIGluaXRpYWwgQVBJIGFuZCBpbXBsZW1lbnRhdGlvbgorICoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKiovCitwYWNrYWdlIG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLmludGVybmFsOworCitpbXBvcnQgamF2YS51dGlsLkNvbGxlY3Rpb25zOworaW1wb3J0IGphdmEudXRpbC5IYXNoTWFwOworaW1wb3J0IGphdmEudXRpbC5NYXA7CitpbXBvcnQgamF2YS51dGlsLlNldDsKK2ltcG9ydCBqYXZhLnV0aWwuY29uY3VycmVudC5hdG9taWMuQXRvbWljUmVmZXJlbmNlOworCitpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5yZXNvdXJjZXMuSVByb2plY3Q7CitpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uVmFsaWRhdGlvbkZyYW1ld29yazsKK2ltcG9ydCBvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5pbnRlcm5hbC5wbHVnaW4uVmFsaWRhdGlvblBsdWdpbjsKK2ltcG9ydCBvcmcub3NnaS5zZXJ2aWNlLnByZWZzLkJhY2tpbmdTdG9yZUV4Y2VwdGlvbjsKK2ltcG9ydCBvcmcub3NnaS5zZXJ2aWNlLnByZWZzLlByZWZlcmVuY2VzOworCisvKioKKyAqIFRoZSBzdWJzZXQgb2YgdGhlIElFY2xpcHNlUHJlZmVyZW5jZXMgaW50ZXJmYWNlIHRoYXQgdGhlIGZyYW1ld29yayBuZWVkcyB0bworICogYmUgYWJsZSB0byBwZXJzaXN0IHByZWZlcmVuY2VzLgorICogQGF1dGhvciBrYXJhc2l1aworICoKKyAqLworcHVibGljIGFic3RyYWN0IGNsYXNzIFByZWZlcmVuY2VzV3JhcHBlciB7CisJCisJcHJpdmF0ZSBzdGF0aWMgZmluYWwgV3JhcHBlck1hbmdlciBfbWFuYWdlciA9IG5ldyBXcmFwcGVyTWFuZ2VyKCk7CisJCisJLyoqCisJICogQW5zd2VyIHRoZSBwcmVmZXJlbmNlcyBmb3IgdGhlIHByb2plY3QuIElmIHByb2plY3QgaXMgbnVsbCBhbnN3ZXIgdGhlIGdsb2JhbCBwcmVmZXJlbmNlcy4KKwkgKiBAcGFyYW0gcHJvamVjdAorCSAqIEBwYXJhbSBwZXJzaXN0ZW50IGlmIG51bGwgdGhlIGRlZmF1bHQgcHJlZmVyZW5jZXMgYXJlIHJldHVybmVkLCBpZiBUcnVlIHRoZSBwZXJzaXN0ZWQgCisJICogcHJlZmVyZW5jZXMgYXJlIHJldHVybiBhbmQgaWYgRmFsc2UgdGhlIHRyYW5zaWVudCBwcmVmZXJlbmNlcyBhcmUgcmV0dXJuZWQuCisJICogQHJldHVybgorCSAqLworCXB1YmxpYyBzdGF0aWMgUHJlZmVyZW5jZXNXcmFwcGVyIGdldFByZWZlcmVuY2VzKElQcm9qZWN0IHByb2plY3QsIEJvb2xlYW4gcGVyc2lzdGVudCl7CisJCXJldHVybiBfbWFuYWdlci5nZXQocHJvamVjdCwgcGVyc2lzdGVudCk7CisJfQorCQkKKwkvKioKKwkgKiBUaGVzZSBhcmUgdGhlIG5hbWVzIG9mIHRoZSBub2RlIGVudHJpZXMuCisJICogQHJldHVybgorCSAqIEB0aHJvd3MgQmFja2luZ1N0b3JlRXhjZXB0aW9uCisJICovCisJcHVibGljIGFic3RyYWN0IFN0cmluZ1tdIGNoaWxkcmVuTmFtZXMoKSB0aHJvd3MgQmFja2luZ1N0b3JlRXhjZXB0aW9uOworCQorCXB1YmxpYyB2b2lkIGZsdXNoKCkgdGhyb3dzIEJhY2tpbmdTdG9yZUV4Y2VwdGlvbiB7CisJfQorCQorCXB1YmxpYyBhYnN0cmFjdCBib29sZWFuIGdldEJvb2xlYW4oU3RyaW5nIGtleSwgYm9vbGVhbiBkZWYpOworCQorCXB1YmxpYyBhYnN0cmFjdCBTdHJpbmcgZ2V0KFN0cmluZyBrZXksIFN0cmluZyBkZWYpOworCQorCXB1YmxpYyBhYnN0cmFjdCBpbnQgZ2V0SW50KFN0cmluZyBrZXksIGludCBkZWYpOworCQorCXB1YmxpYyBhYnN0cmFjdCBsb25nIGdldExvbmcoU3RyaW5nIGtleSwgbG9uZyBkZWYpOworCisJcHVibGljIGFic3RyYWN0IFN0cmluZ1tdIGtleXMoKSB0aHJvd3MgQmFja2luZ1N0b3JlRXhjZXB0aW9uOworCisJcHVibGljIGJvb2xlYW4gaXNQZXJzaXN0ZW50KCl7CisJCXJldHVybiBmYWxzZTsKKwl9CisKKwlwdWJsaWMgYm9vbGVhbiBpc1RyYW5zaWVudCgpeworCQlyZXR1cm4gZmFsc2U7CisJfQorCQorCXB1YmxpYyBhYnN0cmFjdCB2b2lkIHB1dChTdHJpbmcga2V5LCBTdHJpbmcgdmFsdWUpOworCQorCXB1YmxpYyBhYnN0cmFjdCB2b2lkIHB1dEJvb2xlYW4oU3RyaW5nIGtleSwgYm9vbGVhbiB2YWx1ZSk7CisJCisJcHVibGljIGFic3RyYWN0IHZvaWQgcHV0TG9uZyhTdHJpbmcga2V5LCBsb25nIHZhbHVlKTsKKwkKKwlwdWJsaWMgYWJzdHJhY3Qgdm9pZCBwdXRJbnQoU3RyaW5nIGtleSwgaW50IHZhbHVlKTsKKwkKKwkvKioKKwkgKiBVbmxpa2UgdGhlIG1vcmUgc29waGlzdGljYXRlZCBvcmcub3NnaS5zZXJ2aWNlLnByZWZzLlByZWZlcmVuY2VzIHN1cHBvcnQsIAorCSAqIHRoaXMgaXMgY3VycmVudGx5IGxpbWl0ZWQgdG8gc2ltcGxlIG5vZGUgbmFtZXMuCisJICovCisJcHVibGljIGFic3RyYWN0IFByZWZlcmVuY2VzV3JhcHBlciBub2RlKFN0cmluZyBub2RlTmFtZSk7CisJCisJcHVibGljIGFic3RyYWN0IGJvb2xlYW4gbm9kZUV4aXN0cygpOworCQorCXB1YmxpYyBhYnN0cmFjdCBib29sZWFuIG5vZGVFeGlzdHMoU3RyaW5nIHBhdGhOYW1lKSAgdGhyb3dzIEJhY2tpbmdTdG9yZUV4Y2VwdGlvbjsKKwkKKwlwdWJsaWMgYWJzdHJhY3Qgdm9pZCByZW1vdmVOb2RlKCkgIHRocm93cyBCYWNraW5nU3RvcmVFeGNlcHRpb247CisKKworcHVibGljIGZpbmFsIHN0YXRpYyBjbGFzcyBQcmVmZXJlbmNlc1dyYXBwZXJQZXJzaXN0ZW50IGV4dGVuZHMgUHJlZmVyZW5jZXNXcmFwcGVyIHsKKwkKKwlwcml2YXRlIGZpbmFsIFByZWZlcmVuY2VzIF9wcmVmZXJlbmNlczsKKwkKKwlwdWJsaWMgUHJlZmVyZW5jZXNXcmFwcGVyUGVyc2lzdGVudChQcmVmZXJlbmNlcyBwcmVmZXJlbmNlcyl7CisJCV9wcmVmZXJlbmNlcyA9IHByZWZlcmVuY2VzOworCX0KKwkKKwlAT3ZlcnJpZGUKKwlwdWJsaWMgU3RyaW5nW10gY2hpbGRyZW5OYW1lcygpIHRocm93cyBCYWNraW5nU3RvcmVFeGNlcHRpb24geworCQlyZXR1cm4gX3ByZWZlcmVuY2VzLmNoaWxkcmVuTmFtZXMoKTsKKwl9CisJCisJcHVibGljIHZvaWQgZmx1c2goKSB0aHJvd3MgQmFja2luZ1N0b3JlRXhjZXB0aW9uIHsKKwkJX3ByZWZlcmVuY2VzLmZsdXNoKCk7CisJfQorCQorCUBPdmVycmlkZQorCXB1YmxpYyBTdHJpbmcgZ2V0KFN0cmluZyBrZXksIFN0cmluZyBkZWYpIHsKKwkJcmV0dXJuIF9wcmVmZXJlbmNlcy5nZXQoa2V5LCBkZWYpOworCX0KKwkKKwlAT3ZlcnJpZGUKKwlwdWJsaWMgYm9vbGVhbiBnZXRCb29sZWFuKFN0cmluZyBrZXksIGJvb2xlYW4gZGVmKSB7CisJCXJldHVybiBfcHJlZmVyZW5jZXMuZ2V0Qm9vbGVhbihrZXksIGRlZik7CisJfQorCQorCUBPdmVycmlkZQorCXB1YmxpYyBpbnQgZ2V0SW50KFN0cmluZyBrZXksIGludCBkZWYpIHsKKwkJcmV0dXJuIF9wcmVmZXJlbmNlcy5nZXRJbnQoa2V5LCBkZWYpOworCX0KKwkKKwlAT3ZlcnJpZGUKKwlwdWJsaWMgbG9uZyBnZXRMb25nKFN0cmluZyBrZXksIGxvbmcgZGVmKSB7CisJCXJldHVybiBfcHJlZmVyZW5jZXMuZ2V0TG9uZyhrZXksIGRlZik7CisJfQorCQorCUBPdmVycmlkZQorCXB1YmxpYyBTdHJpbmdbXSBrZXlzKCkgdGhyb3dzIEJhY2tpbmdTdG9yZUV4Y2VwdGlvbiB7CisJCXJldHVybiBfcHJlZmVyZW5jZXMua2V5cygpOworCX0KKwkKKwlAT3ZlcnJpZGUKKwlwdWJsaWMgYm9vbGVhbiBpc1BlcnNpc3RlbnQoKSB7CisJCXJldHVybiB0cnVlOworCX0KKwkKKwlAT3ZlcnJpZGUKKwlwdWJsaWMgdm9pZCBwdXQoU3RyaW5nIGtleSwgU3RyaW5nIHZhbHVlKSB7CisJCV9wcmVmZXJlbmNlcy5wdXQoa2V5LCB2YWx1ZSk7CisJfQorCQorCUBPdmVycmlkZQorCXB1YmxpYyBQcmVmZXJlbmNlc1dyYXBwZXIgbm9kZShTdHJpbmcgcGF0aCkgeworCQlQcmVmZXJlbmNlcyBwcmVmcyA9IF9wcmVmZXJlbmNlcy5ub2RlKHBhdGgpOworCQlyZXR1cm4gbmV3IFByZWZlcmVuY2VzV3JhcHBlclBlcnNpc3RlbnQocHJlZnMpOworCX0KKwkKKwlAT3ZlcnJpZGUKKwlwdWJsaWMgYm9vbGVhbiBub2RlRXhpc3RzKCkgeworCQl0cnkgeworCQkJcmV0dXJuIG5vZGVFeGlzdHMoIiIpOyAvLyROT04tTkxTLTEkCisJCX0KKwkJY2F0Y2ggKEJhY2tpbmdTdG9yZUV4Y2VwdGlvbiBlKXsKKwkJCisJCX0KKwkJcmV0dXJuIGZhbHNlOworCX0KKwkKKwlAT3ZlcnJpZGUKKwlwdWJsaWMgYm9vbGVhbiBub2RlRXhpc3RzKFN0cmluZyBwYXRoTmFtZSkgdGhyb3dzIEJhY2tpbmdTdG9yZUV4Y2VwdGlvbiAgeworCQlyZXR1cm4gX3ByZWZlcmVuY2VzLm5vZGVFeGlzdHMocGF0aE5hbWUpOworCX0KKwkKKwlwdWJsaWMgdm9pZCBwdXRCb29sZWFuKFN0cmluZyBrZXksIGJvb2xlYW4gdmFsdWUpIHsKKwkJX3ByZWZlcmVuY2VzLnB1dEJvb2xlYW4oa2V5LCB2YWx1ZSk7CQorCX0KKwkKKwlwdWJsaWMgdm9pZCBwdXRMb25nKFN0cmluZyBrZXksIGxvbmcgdmFsdWUpeworCQlfcHJlZmVyZW5jZXMucHV0TG9uZyhrZXksIHZhbHVlKTsKKwl9CisJCisJQE92ZXJyaWRlCisJcHVibGljIHZvaWQgcHV0SW50KFN0cmluZyBrZXksIGludCB2YWx1ZSkgeworCQlfcHJlZmVyZW5jZXMucHV0SW50KGtleSwgdmFsdWUpOworCX0KKwkKKwlAT3ZlcnJpZGUKKwlwdWJsaWMgdm9pZCByZW1vdmVOb2RlKCkgdGhyb3dzIEJhY2tpbmdTdG9yZUV4Y2VwdGlvbiB7CisJCV9wcmVmZXJlbmNlcy5yZW1vdmVOb2RlKCk7CisJfQorfQorCitwdWJsaWMgZmluYWwgc3RhdGljIGNsYXNzIFByZWZlcmVuY2VzV3JhcHBlclRyYW5zaWVudCBleHRlbmRzIFByZWZlcmVuY2VzV3JhcHBlciB7CisJCisJcHJpdmF0ZSBmaW5hbCBQcmVmZXJlbmNlc1dyYXBwZXJUcmFuc2llbnQgX3BhcmVudDsKKwlwcml2YXRlIGZpbmFsIE1hcDxTdHJpbmcsIFN0cmluZz4gX2NoaWxkcmVuID0gQ29sbGVjdGlvbnMuc3luY2hyb25pemVkTWFwKG5ldyBIYXNoTWFwPFN0cmluZywgU3RyaW5nPigxMCkpOworCXByaXZhdGUgZmluYWwgTWFwPFN0cmluZywgUHJlZmVyZW5jZXNXcmFwcGVyVHJhbnNpZW50PiBfbm9kZXMgPSBDb2xsZWN0aW9ucy5zeW5jaHJvbml6ZWRNYXAobmV3IEhhc2hNYXA8U3RyaW5nLCBQcmVmZXJlbmNlc1dyYXBwZXJUcmFuc2llbnQ+KDEwKSk7CisJCisJcHVibGljIFByZWZlcmVuY2VzV3JhcHBlclRyYW5zaWVudChQcmVmZXJlbmNlc1dyYXBwZXJUcmFuc2llbnQgcGFyZW50KXsKKwkJX3BhcmVudCA9IHBhcmVudDsKKwl9CisJCisJcHVibGljIFByZWZlcmVuY2VzV3JhcHBlclRyYW5zaWVudChQcmVmZXJlbmNlc1dyYXBwZXIgcHcsIFByZWZlcmVuY2VzV3JhcHBlclRyYW5zaWVudCBwYXJlbnQpIHsKKwkJX3BhcmVudCA9IHBhcmVudDsKKwkJdHJ5IHsKKwkJCWZvciAoU3RyaW5nIGtleSA6IHB3LmtleXMoKSl7CisJCQkJcHV0KGtleSwgcHcuZ2V0KGtleSwgbnVsbCkpOworCQkJfQorCQkJCisJCQkKKwkJCWZvciAoU3RyaW5nIG5vZGVOYW1lIDogcHcuY2hpbGRyZW5OYW1lcygpKXsKKwkJCQlQcmVmZXJlbmNlc1dyYXBwZXIgcCA9IHB3Lm5vZGUobm9kZU5hbWUpOworCQkJCVByZWZlcmVuY2VzV3JhcHBlclRyYW5zaWVudCBwd3QgPSBuZXcgUHJlZmVyZW5jZXNXcmFwcGVyVHJhbnNpZW50KHAsIHRoaXMpOworCQkJCV9ub2Rlcy5wdXQobm9kZU5hbWUsIHB3dCk7CisJCQl9CisJCX0KKwkJY2F0Y2ggKEJhY2tpbmdTdG9yZUV4Y2VwdGlvbiBlKXsKKwkJCQorCQl9CisJfQorCisJQE92ZXJyaWRlCisJcHVibGljIFN0cmluZ1tdIGNoaWxkcmVuTmFtZXMoKSB0aHJvd3MgQmFja2luZ1N0b3JlRXhjZXB0aW9uIHsKKwkJU2V0PFN0cmluZz4ga2V5cyA9IF9ub2Rlcy5rZXlTZXQoKTsKKwkJU3RyaW5nIG5hbWVzW10gPSBuZXcgU3RyaW5nW2tleXMuc2l6ZSgpXTsKKwkJa2V5cy50b0FycmF5KG5hbWVzKTsKKwkJcmV0dXJuIG5hbWVzOworCX0KKwkKKwlAT3ZlcnJpZGUKKwlwdWJsaWMgU3RyaW5nIGdldChTdHJpbmcga2V5LCBTdHJpbmcgZGVmKSB7CisJCVN0cmluZyB2YWx1ZSA9IF9jaGlsZHJlbi5nZXQoa2V5KTsKKwkJaWYgKHZhbHVlICE9IG51bGwpcmV0dXJuIHZhbHVlOworCQlyZXR1cm4gZGVmOworCX0KKwkKKwlAT3ZlcnJpZGUKKwlwdWJsaWMgYm9vbGVhbiBnZXRCb29sZWFuKFN0cmluZyBrZXksIGJvb2xlYW4gZGVmKSB7CisJCVN0cmluZyB2YWx1ZSA9IF9jaGlsZHJlbi5nZXQoa2V5KTsKKwkJaWYgKHZhbHVlID09IG51bGwpcmV0dXJuIGRlZjsKKwkJdmFsdWUgPSB2YWx1ZS50b0xvd2VyQ2FzZSgpOworCQlpZiAoInRydWUiLmVxdWFscyh2YWx1ZSkpcmV0dXJuIHRydWU7IC8vJE5PTi1OTFMtMSQKKwkJaWYgKCJmYWxzZSIuZXF1YWxzKHZhbHVlKSlyZXR1cm4gZmFsc2U7IC8vJE5PTi1OTFMtMSQKKwkJcmV0dXJuIGRlZjsKKwl9CisJCisJQE92ZXJyaWRlCisJcHVibGljIGludCBnZXRJbnQoU3RyaW5nIGtleSwgaW50IGRlZikgeworCQlTdHJpbmcgdmFsdWUgPSBfY2hpbGRyZW4uZ2V0KGtleSk7CisJCWlmICh2YWx1ZSA9PSBudWxsKXJldHVybiBkZWY7CisJCXRyeSB7CisJCQlyZXR1cm4gSW50ZWdlci5wYXJzZUludCh2YWx1ZSk7CisJCX0KKwkJY2F0Y2ggKE51bWJlckZvcm1hdEV4Y2VwdGlvbiBlKXsKKwkJfQorCQlyZXR1cm4gZGVmOworCX0KKwkKKwlAT3ZlcnJpZGUKKwlwdWJsaWMgbG9uZyBnZXRMb25nKFN0cmluZyBrZXksIGxvbmcgZGVmKSB7CisJCVN0cmluZyB2YWx1ZSA9IF9jaGlsZHJlbi5nZXQoa2V5KTsKKwkJaWYgKHZhbHVlID09IG51bGwpcmV0dXJuIGRlZjsKKwkJdHJ5IHsKKwkJCXJldHVybiBMb25nLnBhcnNlTG9uZyh2YWx1ZSk7CisJCX0KKwkJY2F0Y2ggKE51bWJlckZvcm1hdEV4Y2VwdGlvbiBlKXsKKwkJfQorCQlyZXR1cm4gZGVmOworCX0KKwkKKwlAT3ZlcnJpZGUKKwlwdWJsaWMgYm9vbGVhbiBpc1RyYW5zaWVudCgpIHsKKwkJcmV0dXJuIHRydWU7CisJfQorCQorCUBPdmVycmlkZQorCXB1YmxpYyBzeW5jaHJvbml6ZWQgU3RyaW5nW10ga2V5cygpIHRocm93cyBCYWNraW5nU3RvcmVFeGNlcHRpb24geworCQlTdHJpbmdbXSBrZXlzID0gbmV3IFN0cmluZ1tfY2hpbGRyZW4uc2l6ZSgpXTsKKwkJX2NoaWxkcmVuLmtleVNldCgpLnRvQXJyYXkoa2V5cyk7CisJCXJldHVybiBrZXlzOworCX0KKwkKKwlAT3ZlcnJpZGUKKwlwdWJsaWMgc3luY2hyb25pemVkIFByZWZlcmVuY2VzV3JhcHBlciBub2RlKFN0cmluZyBuYW1lKSB7CisJCVByZWZlcmVuY2VzV3JhcHBlclRyYW5zaWVudCBwdyAgPSBfbm9kZXMuZ2V0KG5hbWUpOworCQlpZiAocHcgIT0gbnVsbClyZXR1cm4gcHc7CisJCXB3ID0gbmV3IFByZWZlcmVuY2VzV3JhcHBlclRyYW5zaWVudCh0aGlzKTsKKwkJX25vZGVzLnB1dChuYW1lLCBwdyk7CisJCXJldHVybiBwdzsKKwl9CisJCisJQE92ZXJyaWRlCisJcHVibGljIGJvb2xlYW4gbm9kZUV4aXN0cygpIHsKKwkJcmV0dXJuIHRydWU7CisJfQorCQorCUBPdmVycmlkZQorCXB1YmxpYyBib29sZWFuIG5vZGVFeGlzdHMoU3RyaW5nIGtleSkgdGhyb3dzIEJhY2tpbmdTdG9yZUV4Y2VwdGlvbiB7CisJCVByZWZlcmVuY2VzV3JhcHBlclRyYW5zaWVudCBwdyA9IF9ub2Rlcy5nZXQoa2V5KTsKKwkJaWYgKHB3ICE9IG51bGwpcmV0dXJuIHRydWU7CisJCXJldHVybiBmYWxzZTsKKwl9CisJCisJQE92ZXJyaWRlCisJcHVibGljIHZvaWQgcHV0KFN0cmluZyBrZXksIFN0cmluZyB2YWx1ZSkgeworCQlfY2hpbGRyZW4ucHV0KGtleSwgdmFsdWUpOworCX0KKwkKKwlAT3ZlcnJpZGUKKwlwdWJsaWMgdm9pZCBwdXRCb29sZWFuKFN0cmluZyBrZXksIGJvb2xlYW4gYm9vbCkgeworCQlTdHJpbmcgdmFsdWUgPSBib29sID8gInRydWUiIDogImZhbHNlIjsgIC8vJE5PTi1OTFMtMSQvLyROT04tTkxTLTIkCisJCV9jaGlsZHJlbi5wdXQoa2V5LCB2YWx1ZSk7CisJfQorCQorCUBPdmVycmlkZQorCXB1YmxpYyB2b2lkIHB1dEludChTdHJpbmcga2V5LCBpbnQgdmFsdWUpIHsKKwkJX2NoaWxkcmVuLnB1dChrZXksIFN0cmluZy52YWx1ZU9mKHZhbHVlKSk7CisJfQorCQorCUBPdmVycmlkZQorCXB1YmxpYyB2b2lkIHB1dExvbmcoU3RyaW5nIGtleSwgbG9uZyB2YWx1ZSkgeworCQlfY2hpbGRyZW4ucHV0KGtleSwgU3RyaW5nLnZhbHVlT2YodmFsdWUpKTsKKwl9CisJCisJQE92ZXJyaWRlCisJcHVibGljIHZvaWQgcmVtb3ZlTm9kZSgpIHRocm93cyBCYWNraW5nU3RvcmVFeGNlcHRpb24geworCQlpZiAoX3BhcmVudCA9PSBudWxsKXJldHVybjsKKwkJX3BhcmVudC5yZW1vdmVOb2RlKHRoaXMpOworCX0KKwkKKwlwcml2YXRlIHN5bmNocm9uaXplZCB2b2lkIHJlbW92ZU5vZGUoUHJlZmVyZW5jZXNXcmFwcGVyVHJhbnNpZW50IG5vZGUpeworCQlTdHJpbmcga2V5ID0gbnVsbDsKKwkJZm9yIChNYXAuRW50cnk8U3RyaW5nLCBQcmVmZXJlbmNlc1dyYXBwZXJUcmFuc2llbnQ+IG1lIDogX25vZGVzLmVudHJ5U2V0KCkpeworCQkJaWYgKG1lLmdldFZhbHVlKCkuZXF1YWxzKG5vZGUpKXsKKwkJCQlrZXkgPSBtZS5nZXRLZXkoKTsKKwkJCQlicmVhazsKKwkJCX0KKwkJfQorCQlpZiAoa2V5ICE9IG51bGwpX25vZGVzLnJlbW92ZShrZXkpOworCX0KK30KKworcHJpdmF0ZSBmaW5hbCBzdGF0aWMgY2xhc3MgV3JhcHBlck1hbmdlciBpbXBsZW1lbnRzIElQcm9qZWN0Q2hhbmdlTGlzdGVuZXIgeworCQorCXByaXZhdGUgZmluYWwgTWFwPElQcm9qZWN0LCBQcmVmZXJlbmNlc1dyYXBwZXI+IF9tYXAgPSBuZXcgSGFzaE1hcDxJUHJvamVjdCwgUHJlZmVyZW5jZXNXcmFwcGVyPigyMCk7IAorCXByaXZhdGUgZmluYWwgQXRvbWljUmVmZXJlbmNlPFByZWZlcmVuY2VzV3JhcHBlcj4gX2dsb2JhbCA9IG5ldyBBdG9taWNSZWZlcmVuY2U8UHJlZmVyZW5jZXNXcmFwcGVyPigpOworCQorCXByaXZhdGUgV3JhcHBlck1hbmdlcigpeworCQlFdmVudE1hbmFnZXIuZ2V0TWFuYWdlcigpLmFkZFByb2plY3RDaGFuZ2VMaXN0ZW5lcih0aGlzKTsKKwl9CisJCisJLyoqCisJICogQ3VycmVudGx5IHRoaXMgb2JqZWN0IG5ldmVyIGdvZXMgYXdheSwgYnV0IGlmIHRoYXQgd2FzIGV2ZXIgdG8gY2hhbmdlIHRoZW4gd2Ugd291bGQgbmVlZCB0byBkaXNwb3NlIGl0LgorCSAqLworCUBPdmVycmlkZQorCXByb3RlY3RlZCB2b2lkIGZpbmFsaXplKCkgdGhyb3dzIFRocm93YWJsZSB7CisJCWRpc3Bvc2UoKTsKKwl9CisJCisJcHVibGljIHZvaWQgZGlzcG9zZSgpeworCQlFdmVudE1hbmFnZXIuZ2V0TWFuYWdlcigpLnJlbW92ZVByb2plY3RDaGFuZ2VMaXN0ZW5lcih0aGlzKTsKKwl9CisKKwlwdWJsaWMgUHJlZmVyZW5jZXNXcmFwcGVyIGdldChJUHJvamVjdCBwcm9qZWN0LCBCb29sZWFuIHBlcnNpc3RlbnQpIHsKKwkJaWYgKHByb2plY3QgPT0gbnVsbClyZXR1cm4gZ2xvYmFsUHJlZmVyZW5jZXMocGVyc2lzdGVudCk7CisJCVByZWZlcmVuY2VzV3JhcHBlciBwdyA9IG51bGw7CisJCXN5bmNocm9uaXplZChfbWFwKXsKKwkJCXB3ID0gX21hcC5nZXQocHJvamVjdCk7CisJCX0KKwkJCisJCWlmIChwdyAhPSBudWxsICYmIChwZXJzaXN0ZW50ID09IG51bGwgfHwgcGVyc2lzdGVudCA9PSBwdy5pc1BlcnNpc3RlbnQoKSkpcmV0dXJuIHB3OworCQkKKwkJaWYgKHB3ID09IG51bGwpcHcgPSBuZXcgUHJlZmVyZW5jZXNXcmFwcGVyUGVyc2lzdGVudChWYWxpZGF0aW9uUGx1Z2luLmdldFByZWZlcmVuY2VzKHByb2plY3QpKTsKKwkJaWYgKHBlcnNpc3RlbnQgIT0gbnVsbCAmJiBwZXJzaXN0ZW50ICYmIHB3LmlzVHJhbnNpZW50KCkpcHcgPSBuZXcgUHJlZmVyZW5jZXNXcmFwcGVyUGVyc2lzdGVudChWYWxpZGF0aW9uUGx1Z2luLmdldFByZWZlcmVuY2VzKHByb2plY3QpKTsKKwkJaWYgKHBlcnNpc3RlbnQgIT0gbnVsbCAmJiAhcGVyc2lzdGVudCAmJiBwdy5pc1BlcnNpc3RlbnQoKSlwdyA9IG5ldyBQcmVmZXJlbmNlc1dyYXBwZXJUcmFuc2llbnQocHcsIG51bGwpOworCQkKKwkJc3luY2hyb25pemVkKF9tYXApeworCQkJX21hcC5wdXQocHJvamVjdCwgcHcpOworCQl9CisJCQorCQlyZXR1cm4gcHc7CisJfQorCisJLyoqCisJCSAqIEFuc3dlciB0aGUgYXBwcm9wcmlhdGUgZ2xvYmFsIHByZWZlcmVuY2VzLgorCQkgKiAKKwkJICogQHBhcmFtIHBlcnNpc3RlbnQKKwkJICogICAgICAgICAgICBJZiBudWxsIHRoZW4gYW5zd2VyIHRoZSBjdXJyZW50IHNhdmVkIGdsb2JhbCBwcmVmZXJlbmNlcywKKwkJICogICAgICAgICAgICBjcmVhdGluZyBhIG5ldyBwZXJzaXN0ZW50IG9uZSBpZiB0aGVyZSBpcyBub25lLiBJZiBUcnVlLAorCQkgKiAgICAgICAgICAgIHRoZW4gZW5zdXJlIHRoYXQgdGhlIHByZWZlcmVuY2VzIGFyZSBwZXJzaXN0ZW50LiBJZiBGYWxzZSwKKwkJICogICAgICAgICAgICBlbnN1cmUgdGhhdCB0aGUgcHJlZmVyZW5jZXMgYXJlIHRyYW5zaWVudC4KKwkJICogQHJldHVybgorCQkgKi8KKwlwcml2YXRlIFByZWZlcmVuY2VzV3JhcHBlciBnbG9iYWxQcmVmZXJlbmNlcyhCb29sZWFuIHBlcnNpc3RlbnQpIHsKKwkJUHJlZmVyZW5jZXNXcmFwcGVyIHB3ID0gX2dsb2JhbC5nZXQoKTsKKwkJCisJCXdoaWxlKHB3ID09IG51bGwpeworCQkJUHJlZmVyZW5jZXNXcmFwcGVyIG5ld1BXID0gY3JlYXRlR2xvYmFsKHBlcnNpc3RlbnQpOworCQkJaWYgKF9nbG9iYWwuY29tcGFyZUFuZFNldChudWxsLCBuZXdQVykpcHcgPSBuZXdQVzsKKwkJCWVsc2UgcHcgPSBfZ2xvYmFsLmdldCgpOworCQl9CisJCQorCQl3aGlsZSAocGVyc2lzdGVudCAhPSBudWxsICYmICFwZXJzaXN0ZW50ICYmICFwdy5pc1RyYW5zaWVudCgpKXsKKwkJCVByZWZlcmVuY2VzV3JhcHBlciBuZXdQVyA9IG5ldyBQcmVmZXJlbmNlc1dyYXBwZXJUcmFuc2llbnQocHcsIG51bGwpOworCQkJaWYgKF9nbG9iYWwuY29tcGFyZUFuZFNldChwdywgbmV3UFcpKXB3ID0gbmV3UFc7CisJCQllbHNlIHB3ID0gX2dsb2JhbC5nZXQoKTsKKwkJfQorCQkKKwkJd2hpbGUgKHBlcnNpc3RlbnQgIT0gbnVsbCAmJiBwZXJzaXN0ZW50ICYmICFwdy5pc1BlcnNpc3RlbnQoKSl7CisJCQlQcmVmZXJlbmNlc1dyYXBwZXIgbmV3UFcgPSBuZXcgUHJlZmVyZW5jZXNXcmFwcGVyUGVyc2lzdGVudChWYWxpZGF0aW9uRnJhbWV3b3JrLmdldERlZmF1bHQoKS5nZXRQcmVmZXJlbmNlU3RvcmUoKSk7CisJCQlpZiAoX2dsb2JhbC5jb21wYXJlQW5kU2V0KHB3LCBuZXdQVykpcHcgPSBuZXdQVzsKKwkJCWVsc2UgcHcgPSBfZ2xvYmFsLmdldCgpOwkJCQorCQl9CisJCXJldHVybiBwdzsKKwl9CisJCisJcHJpdmF0ZSBQcmVmZXJlbmNlc1dyYXBwZXIgY3JlYXRlR2xvYmFsKEJvb2xlYW4gcGVyc2lzdGVudCl7CisJCVByZWZlcmVuY2VzV3JhcHBlciBwdyA9IG5ldyBQcmVmZXJlbmNlc1dyYXBwZXJQZXJzaXN0ZW50KFZhbGlkYXRpb25GcmFtZXdvcmsuZ2V0RGVmYXVsdCgpLmdldFByZWZlcmVuY2VTdG9yZSgpKTsKKwkJaWYgKHBlcnNpc3RlbnQgPT0gbnVsbCB8fCBwZXJzaXN0ZW50KXJldHVybiBwdzsKKwkJcmV0dXJuIG5ldyBQcmVmZXJlbmNlc1dyYXBwZXJUcmFuc2llbnQocHcsIG51bGwpOworCX0KKworCXB1YmxpYyB2b2lkIHByb2plY3RDaGFuZ2VkKElQcm9qZWN0IHByb2plY3QsIGludCB0eXBlKSB7CisJCWludCBpbnRlcmVzdGVkID0gSVByb2plY3RDaGFuZ2VMaXN0ZW5lci5Qcm9qZWN0Q2xvc2VkIHwgSVByb2plY3RDaGFuZ2VMaXN0ZW5lci5Qcm9qZWN0RGVsZXRlZDsKKwkJaWYgKCh0eXBlICYgaW50ZXJlc3RlZCkgIT0gMCl7CisJCQlzeW5jaHJvbml6ZWQgKF9tYXApIHsKKwkJCQlfbWFwLnJlbW92ZShwcm9qZWN0KTsKKwkJCX0KKwkJfQorCQkKKwl9CisJCit9CisKKworfQpkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi92ZjIvb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vaW50ZXJuYWwvVHJhY2luZy5qYXZhIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi92ZjIvb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vaW50ZXJuYWwvVHJhY2luZy5qYXZhCmluZGV4IGNiN2RkZWQuLjc3ZTQ5Y2IgMTAwNjQ0Ci0tLSBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24vdmYyL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL2ludGVybmFsL1RyYWNpbmcuamF2YQorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uL3ZmMi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9pbnRlcm5hbC9UcmFjaW5nLmphdmEKQEAgLTEsNSArMSw1IEBACiAvKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKgotICogQ29weXJpZ2h0IChjKSAyMDA1LCAyMDA4IElCTSBDb3Jwb3JhdGlvbiBhbmQgb3RoZXJzLgorICogQ29weXJpZ2h0IChjKSAyMDA1LCAyMDA5IElCTSBDb3Jwb3JhdGlvbiBhbmQgb3RoZXJzLgogICogQWxsIHJpZ2h0cyByZXNlcnZlZC4gVGhpcyBwcm9ncmFtIGFuZCB0aGUgYWNjb21wYW55aW5nIG1hdGVyaWFscwogICogYXJlIG1hZGUgYXZhaWxhYmxlIHVuZGVyIHRoZSB0ZXJtcyBvZiB0aGUgRWNsaXBzZSBQdWJsaWMgTGljZW5zZSB2MS4wCiAgKiB3aGljaCBhY2NvbXBhbmllcyB0aGlzIGRpc3RyaWJ1dGlvbiwgYW5kIGlzIGF2YWlsYWJsZSBhdApAQCAtMTQsNiArMTQsOSBAQAogaW1wb3J0IGphdmEudGV4dC5TaW1wbGVEYXRlRm9ybWF0OwogaW1wb3J0IGphdmEudXRpbC5EYXRlOwogCitpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5yZXNvdXJjZXMuSVJlc291cmNlRGVsdGE7CitpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5yZXNvdXJjZXMuSVJlc291cmNlRGVsdGFWaXNpdG9yOworaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucnVudGltZS5Db3JlRXhjZXB0aW9uOwogaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucnVudGltZS5QbGF0Zm9ybTsKIGltcG9ydCBvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5pbnRlcm5hbC5wbHVnaW4uVmFsaWRhdGlvblBsdWdpbjsKIApAQCAtMjIsNDEgKzI1LDczIEBACiAgKiBAYXV0aG9yIGthcmFzaXVrCiAgKgogICovCi1wdWJsaWMgY2xhc3MgVHJhY2luZyB7CitwdWJsaWMgZmluYWwgY2xhc3MgVHJhY2luZyB7CiAJCi0JcHJpdmF0ZSBzdGF0aWMgRGF0ZUZvcm1hdCAJX2RmID0gbmV3IFNpbXBsZURhdGVGb3JtYXQoIkhIOm1tOnNzLlNTU1MiKTsgLy8kTk9OLU5MUy0xJAotCXByaXZhdGUgc3RhdGljIGJvb2xlYW4JCV9mb3JjZUxvZ2dpbmc7Ci0JcHJpdmF0ZSBzdGF0aWMgQm9vbGVhbgkJX3RyYWNlTWF0Y2hlczsKLQlwcml2YXRlIHN0YXRpYyBCb29sZWFuCQlfdHJhY2VWMTsKLQlwcml2YXRlIHN0YXRpYyBTdHJpbmcJCV9leHRyYVZhbERldGFpbDsKKwlwcml2YXRlIGZpbmFsIHN0YXRpYyBEYXRlRm9ybWF0IF9kZiA9IG5ldyBTaW1wbGVEYXRlRm9ybWF0KCJISDptbTpzcy5TU1NTIik7IC8vJE5PTi1OTFMtMSQKKwlwcml2YXRlIGZpbmFsIHN0YXRpYyBib29sZWFuCV9pc0xvZ2dpbmcgPSBWYWxpZGF0aW9uUGx1Z2luLmdldFBsdWdpbigpLmlzRGVidWdnaW5nKCk7CisJcHJpdmF0ZSBmaW5hbCBzdGF0aWMgYm9vbGVhbglfdHJhY2VNYXRjaGVzID0gTWlzYy5kZWJ1Z09wdGlvbkFzQm9vbGVhbihEZWJ1Z0NvbnN0YW50cy5UcmFjZU1hdGNoZXMpOworCXByaXZhdGUgZmluYWwgc3RhdGljIGJvb2xlYW4JX3RyYWNlVjEgPSBNaXNjLmRlYnVnT3B0aW9uQXNCb29sZWFuKERlYnVnQ29uc3RhbnRzLlRyYWNlVjEpOworCXByaXZhdGUgZmluYWwgc3RhdGljIFN0cmluZwkJX2V4dHJhVmFsRGV0YWlsID0gUGxhdGZvcm0uZ2V0RGVidWdPcHRpb24oRGVidWdDb25zdGFudHMuRXh0cmFWYWxEZXRhaWwpOworCXByaXZhdGUgZmluYWwgc3RhdGljIGludCAJCV90cmFjaW5nTGV2ZWw7CisJCisJcHJpdmF0ZSBmaW5hbCBzdGF0aWMgU3RyaW5nCQlfZmlsdGVyID0gUGxhdGZvcm0uZ2V0RGVidWdPcHRpb24oRGVidWdDb25zdGFudHMuRmlsdGVyQWxsRXhjZXB0KTsKKwkKKwlzdGF0aWMgeworCQlTdHJpbmcgdHJhY2VMZXZlbCA9IFBsYXRmb3JtLmdldERlYnVnT3B0aW9uKERlYnVnQ29uc3RhbnRzLlRyYWNlTGV2ZWwpOworCQlpbnQgbGV2ZWwgPSAwOworCQlpZiAodHJhY2VMZXZlbCAhPSBudWxsKXsKKwkJCXRyeSB7CisJCQkJbGV2ZWwgPSBJbnRlZ2VyLnBhcnNlSW50KHRyYWNlTGV2ZWwpOworCQkJfQorCQkJY2F0Y2ggKEV4Y2VwdGlvbiBlKXsKKwkJCX0KKwkJfQorCQlfdHJhY2luZ0xldmVsID0gbGV2ZWw7CisJfQorCQorCS8qKgorCSAqIEFuc3dlciB0cnVlIGlmIHRoZSBmaWx0ZXJzIGFsbG93IHRoaXMgdmFsaWRhdG9yIHRvIGJlIGVuYWJsZWQuIE5vcm1hbGx5IHRoaXMgbWV0aG9kIHdpbGwgYW5zd2VyIHRydWUuCisJICogSXQgaXMgb25seSB3aGVuIGZpbHRlcnMgYXJlIGFjdGl2YXRlZCB2aWEgdGhlIGRlYnVnZ2luZyBvcHRpb25zLCB0aGF0IHRoaXMgbWV0aG9kIG1pZ2h0IHJldHVybiBmYWxzZS4KKwkgKiBUaGlzIGlzIHVzZWQgdG8gYWlkIGluIGRlYnVnZ2luZyBieSBtYWtpbmcgaXQgbG9vayBsaWtlIG9ubHkgb25lIHZhbGlkYXRvciBoYXMgYmVlbiByZWdpc3RlcmVkLgorCSAqIAorCSAqIEBwYXJhbSB2YWxpZGF0b3JJZCB0aGUgdmFsaWRhdG9yIGlkLgorCSAqIEByZXR1cm4gdHJ1ZSBpZiB0aGUgdmFsaWRhdG9yIHNob3VsZCBiZSByZWdpc3RlcmVkIHZpYSBhbiBleHRlbnNpb24gcG9pbnQuCisJICovCisJcHVibGljIHN0YXRpYyBib29sZWFuIGlzRW5hYmxlZChTdHJpbmcgdmFsaWRhdG9ySWQpeworCQlpZiAoX2ZpbHRlciA9PSBudWxsIHx8IF9maWx0ZXIubGVuZ3RoKCkgPT0gMClyZXR1cm4gdHJ1ZTsKKwkJcmV0dXJuIChfZmlsdGVyLmVxdWFscyh2YWxpZGF0b3JJZCkpOwkJCisJfQogCQogCS8qKgogCSAqIEFyZSB3ZSBpbiBsb2dnaW5nL2RlYnVnZ2luZyBtb2RlPwogCSAqLwogCXB1YmxpYyBzdGF0aWMgYm9vbGVhbiBpc0xvZ2dpbmcoKXsKLQkJcmV0dXJuIF9mb3JjZUxvZ2dpbmcgfHwgVmFsaWRhdGlvblBsdWdpbi5nZXRQbHVnaW4oKS5pc0RlYnVnZ2luZygpOworCQlyZXR1cm4gX2lzTG9nZ2luZzsKKwl9CisJCisJLyoqCisJICogQW5zd2VyIHRydWUgaWYgd2UgYXJlIGluIGxvZ2dpbmcgbW9kZSwgYW5kIGlmIHRoZSBjdXJyZW50IGxvZ2dpbmcgbGV2ZWwgaXMgZ3JlYXRlciB0aGFuIG9yCisJICogZXF1YWwgdG8gbGV2ZWwuCisJICogQHBhcmFtIGxldmVsIFRoZSBsb2dnaW5nIGxldmVsIHRoYXQgd2UgYXJlIHRlc3RpbmcuIFRoZSBoaWdoZXIgdGhlIGxldmVsIHRoZSBtb3JlIHZlcmJvc2UKKwkgKiB0aGUgdHJhY2luZy4KKwkgKi8KKwlwdWJsaWMgc3RhdGljIGJvb2xlYW4gaXNMb2dnaW5nKGludCBsZXZlbCl7CisJCWlmIChfaXNMb2dnaW5nKXsKKwkJCXJldHVybiBfdHJhY2luZ0xldmVsID49IGxldmVsOworCQl9CisJCXJldHVybiBmYWxzZTsKIAl9CiAJCiAJcHVibGljIHN0YXRpYyBib29sZWFuIGlzVHJhY2VNYXRjaGVzKCl7Ci0JCWlmIChfdHJhY2VNYXRjaGVzID09IG51bGwpewotCQkJX3RyYWNlTWF0Y2hlcyA9IE1pc2MuZGVidWdPcHRpb25Bc0Jvb2xlYW4oRGVidWdDb25zdGFudHMuVHJhY2VNYXRjaGVzKTsKLQkJfQogCQlyZXR1cm4gX3RyYWNlTWF0Y2hlczsKIAl9CiAJCiAJcHVibGljIHN0YXRpYyBib29sZWFuIGlzVHJhY2VWMSgpewotCQlpZiAoX3RyYWNlVjEgPT0gbnVsbCl7Ci0JCQlfdHJhY2VWMSA9IE1pc2MuZGVidWdPcHRpb25Bc0Jvb2xlYW4oRGVidWdDb25zdGFudHMuVHJhY2VWMSk7Ci0JCX0KIAkJcmV0dXJuIF90cmFjZVYxOwogCX0KIAkKIAlwdWJsaWMgc3RhdGljIGJvb2xlYW4gbWF0Y2hlc0V4dHJhRGV0YWlsKFN0cmluZyB2YWxpZGF0b3JJZCl7Ci0JCWlmIChfZXh0cmFWYWxEZXRhaWwgPT0gbnVsbCl7Ci0JCQlfZXh0cmFWYWxEZXRhaWwgPSBQbGF0Zm9ybS5nZXREZWJ1Z09wdGlvbihEZWJ1Z0NvbnN0YW50cy5FeHRyYVZhbERldGFpbCk7Ci0JCQlpZiAoX2V4dHJhVmFsRGV0YWlsID09IG51bGwpX2V4dHJhVmFsRGV0YWlsID0gIiI7IC8vJE5PTi1OTFMtMSQKLQkJfQotCQlpZiAoX2V4dHJhVmFsRGV0YWlsLmxlbmd0aCgpID09IDApcmV0dXJuIGZhbHNlOworCQlpZiAoX2V4dHJhVmFsRGV0YWlsID09IG51bGwpcmV0dXJuIGZhbHNlOwogCQlyZXR1cm4gX2V4dHJhVmFsRGV0YWlsLmVxdWFscyh2YWxpZGF0b3JJZCk7CiAJfQogCkBAIC04Niw3ICsxMjEsNyBAQAogCiAJcHVibGljIHN0YXRpYyBTdHJpbmcgdGltZXN0YW1wSXQoU3RyaW5nIGxpbmUpewogCQlEYXRlIGRhdGUgPSBuZXcgRGF0ZSgpOwotCQlsb25nIHRocmVhZCA9IFRocmVhZC5jdXJyZW50VGhyZWFkKCkuZ2V0SWQoKTsKKwkJU3RyaW5nIHRocmVhZCA9IFRocmVhZC5jdXJyZW50VGhyZWFkKCkuZ2V0TmFtZSgpOwogCQlyZXR1cm4gX2RmLmZvcm1hdChkYXRlKSArICIgIiArIHRocmVhZCArICIgIiArIGxpbmU7ICAvLyROT04tTkxTLTEkLy8kTk9OLU5MUy0yJAkJCiAJfQogCkBAIC05OSwxNCArMTM0LDc1IEBACiAJfQogCiAJLyoqCi0JICogRm9yY2UgdGhlIGxvZ2dpbmcgdG8gYmUgdHVybmVkIG9uLiBOb3JtYWxseSBsb2dnaW5nIGlzIHR1cm5lZCBvbiB2aWEgLWRlYnVnIG9wdGlvbnMuIEhvd2V2ZXIKLQkgKiB0aGUgbG9nZ2luZyBjYW4gYmUgZm9yY2VkIHRvIGJlIG9uIGJ5IHNldHRpbmcgdGhpcyB0byB0cnVlLiAoU2V0dGluZyB0aGlzIHRvIGZhbHNlIGRvZXNuJ3QgZm9yY2UKLQkgKiB0aGUgbG9nZ2luZyB0byBiZSB0dXJuZWQgb2ZmKS4KKwkgKiBUaGlzIG1ldGhvZCBkb2Vzbid0IGRvIGFueXRoaW5nLCBhbmQgd2lsbCBiZSByZW1vdmVkLgogCSAqIAotCSAqIEBwYXJhbSBmb3JjZUxvZ2dpbmcKKwkgKiBAZGVwcmVjYXRlZAogCSAqLwogCXB1YmxpYyBzdGF0aWMgdm9pZCBzZXRGb3JjZUxvZ2dpbmcoYm9vbGVhbiBmb3JjZUxvZ2dpbmcpIHsKLQkJX2ZvcmNlTG9nZ2luZyA9IGZvcmNlTG9nZ2luZzsKKwl9CisJCisJLyoqCisJICogTG9nIHVwIHRvIG1heE51bWJlciBkZWx0YXMgdG8gdGhlIGxvZy4KKwkgKiBAcGFyYW0gZGVsdGEgVGhlIGRlbHRhcyB0byBsb2cuCisJICogQHBhcmFtIG1heE51bWJlciBUaGUgbWF4aW11bSBudW1iZXIgb2YgZGVsdGFzIHRvIGxvZy4KKwkgKi8KKwlwdWJsaWMgc3RhdGljIHZvaWQgbG9nUmVzb3VyY2VEZWx0YXMoSVJlc291cmNlRGVsdGEgZGVsdGEsIGludCBtYXhOdW1iZXIpeworCQlpZiAoIWlzTG9nZ2luZygpKXJldHVybjsKKwkJaWYgKGRlbHRhID09IG51bGwpVHJhY2luZy5sb2coIiAgUmVzb3VyY2VEZWx0YTogbnVsbCIpOyAvLyROT04tTkxTLTEkCisJCWVsc2UgeworCQkJRGVsdGFMb2dnZXIgbG9nZ2VyID0gbmV3IERlbHRhTG9nZ2VyKG1heE51bWJlcik7CisJCQl0cnkgeworCQkJCWRlbHRhLmFjY2VwdChsb2dnZXIpOworCQkJCWlmIChsb2dnZXIuZ2V0Q291bnQoKSA9PSAwKVRyYWNpbmcubG9nKCIgIFJlc291cmNlRGVsdGE6IG5vIGRlbHRhcyIpOyAvLyROT04tTkxTLTEkCisJCQl9CisJCQljYXRjaCAoQ29yZUV4Y2VwdGlvbiBlKXsKKwkJCQkvLyBlYXQgaXQKKwkJCX0KKwkJfQorCX0KKwkKKwkvKioKKwkgKiBBIGRlYnVnZ2luZyBjbGFzcyB0aGF0IHByaW50cyBvdXQgc29tZSByZXNvdXJjZSBkZWx0YSdzLgorCSAqIEBhdXRob3Iga2FyYXNpdWsKKwkgKgorCSAqLworCXByaXZhdGUgZmluYWwgc3RhdGljIGNsYXNzIERlbHRhTG9nZ2VyIGltcGxlbWVudHMgSVJlc291cmNlRGVsdGFWaXNpdG9yIHsKKwkJCisJCXByaXZhdGUgZmluYWwgaW50IAlfbWF4OworCQlwcml2YXRlIGludCAJCV9jb3VudDsKKwkJcHVibGljIGludCBnZXRDb3VudCgpIHsKKwkJCXJldHVybiBfY291bnQ7CisJCX0KKworCQlwcml2YXRlIFN0cmluZ0J1ZmZlciBfYiA9IG5ldyBTdHJpbmdCdWZmZXIoMjAwKTsKKwkJCisJCXB1YmxpYyBEZWx0YUxvZ2dlcihpbnQgbWF4KXsKKwkJCV9tYXggPSBtYXg7CisJCX0KKworCQlwdWJsaWMgYm9vbGVhbiB2aXNpdChJUmVzb3VyY2VEZWx0YSBkZWx0YSkgdGhyb3dzIENvcmVFeGNlcHRpb24geworCQkJaWYgKF9jb3VudCsrID4gX21heClyZXR1cm4gZmFsc2U7CisJCQlpbnQga2luZCA9IGRlbHRhLmdldEtpbmQoKTsKKwkJCVN0cmluZyB0eXBlID0gInVua25vd24iOyAvLyROT04tTkxTLTEkCisJCQlzd2l0Y2ggKGtpbmQpeworCQkJY2FzZSBJUmVzb3VyY2VEZWx0YS5BRERFRDoKKwkJCQl0eXBlID0gIkFkZGVkIjsgLy8kTk9OLU5MUy0xJAorCQkJCWJyZWFrOworCQkJY2FzZSBJUmVzb3VyY2VEZWx0YS5DSEFOR0VEOgorCQkJCXR5cGUgPSAiQ2hhbmdlZCI7IC8vJE5PTi1OTFMtMSQKKwkJCQlicmVhazsKKwkJCWNhc2UgSVJlc291cmNlRGVsdGEuUkVNT1ZFRDoKKwkJCQl0eXBlID0gIlJlbW92ZWQiOyAvLyROT04tTkxTLTEkCisJCQkJYnJlYWs7CQkJCQorCQkJfQorCQkJX2IuYXBwZW5kKCIgIFJlc291cmNlRGVsdGEgIik7IC8vJE5PTi1OTFMtMSQKKwkJCV9iLmFwcGVuZCh0eXBlKTsKKwkJCV9iLmFwcGVuZCgnICcpOworCQkJX2IuYXBwZW5kKGRlbHRhLmdldFJlc291cmNlKCkpOworCQkJVHJhY2luZy5sb2coX2IpOworCQkJcmV0dXJuIHRydWU7CisJCX0KKwkJCiAJfQogCiB9CmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uL3ZmMi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9pbnRlcm5hbC9WYWxCdWlsZGVySm9iLmphdmEgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uL3ZmMi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9pbnRlcm5hbC9WYWxCdWlsZGVySm9iLmphdmEKaW5kZXggYjhiZTNhYy4uOWZkNDVhNyAxMDA2NDQKLS0tIGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi92ZjIvb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vaW50ZXJuYWwvVmFsQnVpbGRlckpvYi5qYXZhCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24vdmYyL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL2ludGVybmFsL1ZhbEJ1aWxkZXJKb2IuamF2YQpAQCAtMSw1ICsxLDUgQEAKIC8qKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqCi0gKiBDb3B5cmlnaHQgKGMpIDIwMDcsIDIwMDggSUJNIENvcnBvcmF0aW9uIGFuZCBvdGhlcnMuCisgKiBDb3B5cmlnaHQgKGMpIDIwMDcsIDIwMTAgSUJNIENvcnBvcmF0aW9uIGFuZCBvdGhlcnMuCiAgKiBBbGwgcmlnaHRzIHJlc2VydmVkLiBUaGlzIHByb2dyYW0gYW5kIHRoZSBhY2NvbXBhbnlpbmcgbWF0ZXJpYWxzCiAgKiBhcmUgbWFkZSBhdmFpbGFibGUgdW5kZXIgdGhlIHRlcm1zIG9mIHRoZSBFY2xpcHNlIFB1YmxpYyBMaWNlbnNlIHYxLjAKICAqIHdoaWNoIGFjY29tcGFuaWVzIHRoaXMgZGlzdHJpYnV0aW9uLCBhbmQgaXMgYXZhaWxhYmxlIGF0CkBAIC0xMCw2ICsxMCw3IEBACiAgKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKi8KIHBhY2thZ2Ugb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uaW50ZXJuYWw7CiAKK2ltcG9ydCBqYXZhLnRleHQuTWVzc2FnZUZvcm1hdDsKIGltcG9ydCBqYXZhLnV0aWwuTGlua2VkTGlzdDsKIGltcG9ydCBqYXZhLnV0aWwuUXVldWU7CiAKQEAgLTMwLDggKzMxLDExIEBACiBpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uRGVwZW5kZW50UmVzb3VyY2U7CiBpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uRnJpZW5kOwogaW1wb3J0IG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLklEZXBlbmRlbmN5SW5kZXg7CitpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uVmFsaWRhdGlvbkV2ZW50OwogaW1wb3J0IG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLlZhbGlkYXRpb25GcmFtZXdvcms7CiBpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uVmFsaWRhdGlvblN0YXRlOworaW1wb3J0IG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLlZhbGlkYXRvcjsKK2ltcG9ydCBvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5pbnRlcm5hbC5tb2RlbC5JVmFsaWRhdG9yVmlzaXRvcjsKIGltcG9ydCBvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5pbnRlcm5hbC5vcGVyYXRpb25zLlZhbGlkYXRpb25CdWlsZGVyOwogaW1wb3J0IG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLmludGVybmFsLnBsdWdpbi5WYWxpZGF0aW9uUGx1Z2luOwogCkBAIC00MSwyNyArNDUsMjMgQEAKICAqIDxwPgogICogVGhpcyBpcyB0aGUgbWFpbiBjbGFzcyBmb3Igc3VwcG9ydGluZyBidWlsZCBiYXNlZCB2YWxpZGF0aW9uLiBXaGVuIHRyaWdnZXJlZCBpdCBsb29rcyBhdCBhbGwgb2YgdGhlCiAgKiByZXNvdXJjZSBjaGFuZ2VzIGFuZCBkZXRlcm1pbmVzIHdoYXQgbmVlZHMgdG8gYmUgdmFsaWRhdGVkLiAKKyAqIDwvcD4KICAqIEBhdXRob3Iga2FyYXNpdWsKICAqCiAgKi8KLXB1YmxpYyBjbGFzcyBWYWxCdWlsZGVySm9iIGV4dGVuZHMgV29ya3NwYWNlSm9iIGltcGxlbWVudHMgSVJlc291cmNlRGVsdGFWaXNpdG9yLCBJUmVzb3VyY2VWaXNpdG9yIHsKK3B1YmxpYyBmaW5hbCBjbGFzcyBWYWxCdWlsZGVySm9iIGV4dGVuZHMgV29ya3NwYWNlSm9iIHsKIAkKIAlwcml2YXRlIHN0YXRpYyBWYWxCdWlsZGVySm9iIF9qb2I7CiAJcHJpdmF0ZSBzdGF0aWMgUXVldWU8VmFsaWRhdGlvblJlcXVlc3Q+IF93b3JrID0gbmV3IExpbmtlZExpc3Q8VmFsaWRhdGlvblJlcXVlc3Q+KCk7CiAJCi0JLyoqIFRoZSBtb25pdG9yIHRvIHVzZSB3aGlsZSBydW5uaW5nIHRoZSBidWlsZC4gKi8KLQlwcml2YXRlIElQcm9ncmVzc01vbml0b3IJX21vbml0b3I7Ci0JCi0JcHJpdmF0ZSBTdWJNb25pdG9yCQkJX3N1Yk1vbml0b3I7Ci0JCi0JcHJpdmF0ZSBWYWxpZGF0aW9uUmVxdWVzdAlfcmVxdWVzdDsKLQkKKwlwcml2YXRlIGZpbmFsIFZhbE9wZXJhdGlvbiBfb3BlcmF0aW9uID0gbmV3IFZhbE9wZXJhdGlvbigpOworCQkKIAkvKiogVGhlIHR5cGVzIG9mIGNoYW5nZXMgd2UgYXJlIGludGVyZXN0ZWQgaW4uICovCiAJcHJpdmF0ZSBmaW5hbCBzdGF0aWMgaW50CUludGVyZXN0ZWRGbGFncyA9IElSZXNvdXJjZURlbHRhLkNPTlRFTlQgfCBJUmVzb3VyY2VEZWx0YS5FTkNPRElORyB8CiAJCUlSZXNvdXJjZURlbHRhLk1PVkVEX0ZST00gfCBJUmVzb3VyY2VEZWx0YS5NT1ZFRF9UTzsKIAkKLQlwdWJsaWMgc3RhdGljIHN5bmNocm9uaXplZCB2b2lkIHZhbGlkYXRlUHJvamVjdChJUHJvamVjdCBwcm9qZWN0LCBJUmVzb3VyY2VEZWx0YSBkZWx0YSwgaW50IGJ1aWxkS2luZCwgVmFsT3BlcmF0aW9uIG9wZXJhdGlvbil7Ci0JCVZhbGlkYXRpb25SZXF1ZXN0IHJlcXVlc3QgPSBuZXcgVmFsaWRhdGlvblJlcXVlc3QocHJvamVjdCwgZGVsdGEsIGJ1aWxkS2luZCwgb3BlcmF0aW9uKTsKKwlwdWJsaWMgc3RhdGljIHN5bmNocm9uaXplZCB2b2lkIHZhbGlkYXRlUHJvamVjdChJUHJvamVjdCBwcm9qZWN0LCBJUmVzb3VyY2VEZWx0YSBkZWx0YSwgaW50IGJ1aWxkS2luZCl7CisJCVZhbGlkYXRpb25SZXF1ZXN0IHJlcXVlc3QgPSBuZXcgVmFsaWRhdGlvblJlcXVlc3QocHJvamVjdCwgZGVsdGEsIGJ1aWxkS2luZCk7CiAJCWlmIChfam9iID09IG51bGwpewogCQkJX2pvYiA9IG5ldyBWYWxCdWlsZGVySm9iKCk7CiAJCQlfam9iLmFkZChyZXF1ZXN0KTsKQEAgLTEwNCw2ICsxMDQsNyBAQAogCQlfd29yay5hZGQocmVxdWVzdCk7CiAJfQogCQorCUBPdmVycmlkZQogCXB1YmxpYyBib29sZWFuIGJlbG9uZ3NUbyhPYmplY3QgZmFtaWx5KSB7CiAJCWlmIChmYW1pbHkgPT0gUmVzb3VyY2VzUGx1Z2luLkZBTUlMWV9NQU5VQUxfQlVJTEQpcmV0dXJuIHRydWU7CiAJCWlmIChmYW1pbHkgPT0gVmFsaWRhdGlvbkJ1aWxkZXIuRkFNSUxZX1ZBTElEQVRJT05fSk9CKXsKQEAgLTExMywyNiArMTE0LDcwIEBACiAJCXJldHVybiBzdXBlci5iZWxvbmdzVG8oZmFtaWx5KTsKIAl9CiAKKwlAT3ZlcnJpZGUKIAlwdWJsaWMgSVN0YXR1cyBydW5JbldvcmtzcGFjZShJUHJvZ3Jlc3NNb25pdG9yIG1vbml0b3IpIHsKIAkJVHJhY2luZy5sb2coIlZhbEJ1aWxkZXJKb2ItMDE6IFN0YXJ0aW5nIik7IC8vJE5PTi1OTFMtMSQKLQkJX21vbml0b3IgPSBtb25pdG9yOwogCQkKLQkJVmFsaWRhdGlvblJlcXVlc3QgcmVxdWVzdCA9IGdldFJlcXVlc3QoKTsKLQkJd2hpbGUocmVxdWVzdCAhPSBudWxsKXsKLQkJCV9yZXF1ZXN0ID0gcmVxdWVzdDsKLQkJCXJ1bigpOwotCQkJcmVxdWVzdCA9IGdldFJlcXVlc3QoKTsKKwkJdHJ5IHsKKwkJCXN0YXJ0aW5nVmFsaWRhdGlvbihtb25pdG9yKTsKKwkJCQorCQkJVmFsaWRhdGlvblJlcXVlc3QgcmVxdWVzdCA9IGdldFJlcXVlc3QoKTsKKwkJCXdoaWxlKHJlcXVlc3QgIT0gbnVsbCl7CisJCQkJcnVuKHJlcXVlc3QsIG1vbml0b3IpOworCQkJCXJlcXVlc3QgPSBnZXRSZXF1ZXN0KCk7CisJCQl9CisJCX0KKwkJZmluYWxseSB7CisJCQlmaW5pc2hpbmdWYWxpZGF0aW9uKG1vbml0b3IpOwogCQl9CiAJCQogCQlUcmFjaW5nLmxvZygiVmFsQnVpbGRlckpvYi0wMjogRmluaXNoZWQiKTsgLy8kTk9OLU5MUy0xJAogCQlyZXR1cm4gU3RhdHVzLk9LX1NUQVRVUzsKIAl9CisKKwlwcml2YXRlIHZvaWQgc3RhcnRpbmdWYWxpZGF0aW9uKElQcm9ncmVzc01vbml0b3IgbW9uaXRvcikgeworICAgICAgICBJVmFsaWRhdG9yVmlzaXRvciBzdGFydGluZ1Zpc2l0b3IgPSBuZXcgSVZhbGlkYXRvclZpc2l0b3IoKXsKKworICAgICAgICAgICAgcHVibGljIHZvaWQgdmlzaXQoVmFsaWRhdG9yIHZhbGlkYXRvciwgSVByb2plY3QgcHJvamVjdCwgVmFsVHlwZSB2YWxUeXBlLCAKKyAgICAgICAgICAgICAgICBWYWxPcGVyYXRpb24gb3BlcmF0aW9uLCBJUHJvZ3Jlc3NNb25pdG9yIG1vbml0b3IpIHsKKyAgICAgICAgICAgICAgICAKKyAgICAgICAgICAgICAgICB2YWxpZGF0b3IudmFsaWRhdGlvblN0YXJ0aW5nKHByb2plY3QsIG9wZXJhdGlvbi5nZXRTdGF0ZSgpLCBtb25pdG9yKTsgICAgICAgICAgICAgICAgICAgCisgICAgICAgICAgICB9ICAgICAgICAgICAgICAgCisgICAgICAgIH07CisKKyAgICAgICAgVmFsTWFuYWdlci5nZXREZWZhdWx0KCkuYWNjZXB0KHN0YXJ0aW5nVmlzaXRvciwgbnVsbCwgVmFsVHlwZS5CdWlsZCwgZ2V0T3BlcmF0aW9uKCksIG1vbml0b3IpOworCX0KIAkKLQlwcml2YXRlIHZvaWQgcnVuKCl7Ci0JCXNldE5hbWUoVmFsTWVzc2FnZXMuSm9iTmFtZSArICIgIiArIF9yZXF1ZXN0LmdldFByb2plY3QoKS5nZXROYW1lKCkpOyAvLyROT04tTkxTLTEkCisJcHJpdmF0ZSB2b2lkIGZpbmlzaGluZ1ZhbGlkYXRpb24oSVByb2dyZXNzTW9uaXRvciBtb25pdG9yKSB7CisJCQorCQlJVmFsaWRhdG9yVmlzaXRvciBmaW5pc2hlZFZpc2l0b3IgPSBuZXcgSVZhbGlkYXRvclZpc2l0b3IoKXsKKworCQkgICAgcHVibGljIHZvaWQgdmlzaXQoVmFsaWRhdG9yIHZhbGlkYXRvciwgSVByb2plY3QgcHJvamVjdCwgVmFsVHlwZSB2YWxUeXBlLAorCQkgICAgICBWYWxPcGVyYXRpb24gb3BlcmF0aW9uLCBJUHJvZ3Jlc3NNb25pdG9yIG1vbml0b3IpIHsKKworCQkgICAgICB2YWxpZGF0b3IudmFsaWRhdGlvbkZpbmlzaGluZyhwcm9qZWN0LCBvcGVyYXRpb24uZ2V0U3RhdGUoKSwgbW9uaXRvcik7ICAgICAgICAgICAgICAKKwkJICAgIH0gICAgICAgICAgIAorCQkgIH07CisJCSAgVmFsTWFuYWdlci5nZXREZWZhdWx0KCkuYWNjZXB0KGZpbmlzaGVkVmlzaXRvciwgbnVsbCwgVmFsVHlwZS5CdWlsZCwgZ2V0T3BlcmF0aW9uKCksIG1vbml0b3IpOworCX0KKworCXByaXZhdGUgdm9pZCBydW4oVmFsaWRhdGlvblJlcXVlc3QgcmVxdWVzdCwgSVByb2dyZXNzTW9uaXRvciBtb25pdG9yKXsKKwkJc2V0TmFtZShNZXNzYWdlRm9ybWF0LmZvcm1hdChWYWxNZXNzYWdlcy5Kb2JOYW1lV2l0aFByb2plY3ROYW1lLG5ldyBPYmplY3RbXSB7IHJlcXVlc3QuZ2V0UHJvamVjdCgpLmdldE5hbWUoKSB9KSk7IAogCQl0cnkgewkJCi0JCQlpZiAoX3JlcXVlc3QuZ2V0RGVsdGEoKSA9PSBudWxsKWZ1bGxCdWlsZCgpOwotCQkJZWxzZSBkZWx0YUJ1aWxkKCk7CisJICAgICAgICBJVmFsaWRhdG9yVmlzaXRvciBzdGFydGluZ1Zpc2l0b3IgPSBuZXcgSVZhbGlkYXRvclZpc2l0b3IoKXsKKworCSAgICAgICAgICAgIHB1YmxpYyB2b2lkIHZpc2l0KFZhbGlkYXRvciB2YWxpZGF0b3IsIElQcm9qZWN0IHByb2plY3QsIFZhbFR5cGUgdmFsVHlwZSwgCisJICAgICAgICAgICAgICAgIFZhbE9wZXJhdGlvbiBvcGVyYXRpb24sIElQcm9ncmVzc01vbml0b3IgbW9uaXRvcikgeworCSAgICAgICAgICAgICAgICAKKwkgICAgICAgICAgICAgICAgdmFsaWRhdG9yLnZhbGlkYXRpb25TdGFydGluZyhwcm9qZWN0LCBvcGVyYXRpb24uZ2V0U3RhdGUoKSwgbW9uaXRvcik7ICAgICAgICAgICAgICAgICAgIAorCSAgICAgICAgICAgIH0gICAgICAgICAgICAgICAKKwkgICAgICAgIH07CisKKwkgICAgICAgIFZhbE1hbmFnZXIuZ2V0RGVmYXVsdCgpLmFjY2VwdChzdGFydGluZ1Zpc2l0b3IsIHJlcXVlc3QuZ2V0UHJvamVjdCgpLCBWYWxUeXBlLkJ1aWxkLCBnZXRPcGVyYXRpb24oKSwgbW9uaXRvcik7CisJCSAgCisJCQlpZiAocmVxdWVzdC5nZXREZWx0YSgpID09IG51bGwpZnVsbEJ1aWxkKHJlcXVlc3QsIG1vbml0b3IpOworCQkJZWxzZSBkZWx0YUJ1aWxkKHJlcXVlc3QsIG1vbml0b3IpOworCiAJCQkKIAkJfQogCQljYXRjaCAoUHJvamVjdFVuYXZhaWxhYmxlRXJyb3IgZSl7CkBAIC0xNDQsNzIgKzE4OSw0MiBAQAogCQljYXRjaCAoQ29yZUV4Y2VwdGlvbiBlKXsKIAkJCVZhbGlkYXRpb25QbHVnaW4uZ2V0UGx1Z2luKCkuaGFuZGxlRXhjZXB0aW9uKGUpOwogCQl9CisJCWZpbmFsbHkgeworCQkgIElWYWxpZGF0b3JWaXNpdG9yIGZpbmlzaGVkVmlzaXRvciA9IG5ldyBJVmFsaWRhdG9yVmlzaXRvcigpeworCisJCSAgICBwdWJsaWMgdm9pZCB2aXNpdChWYWxpZGF0b3IgdmFsaWRhdG9yLCBJUHJvamVjdCBwcm9qZWN0LCBWYWxUeXBlIHZhbFR5cGUsCisJCSAgICAgIFZhbE9wZXJhdGlvbiBvcGVyYXRpb24sIElQcm9ncmVzc01vbml0b3IgbW9uaXRvcikgeworCisJCSAgICAgIHZhbGlkYXRvci52YWxpZGF0aW9uRmluaXNoaW5nKHByb2plY3QsIG9wZXJhdGlvbi5nZXRTdGF0ZSgpLCBtb25pdG9yKTsgICAgICAgICAgICAgIAorCQkgICAgfSAgICAgICAgICAgCisJCSAgfTsKKyAgICAgICAgICBWYWxNYW5hZ2VyLmdldERlZmF1bHQoKS5hY2NlcHQoZmluaXNoZWRWaXNpdG9yLCByZXF1ZXN0LmdldFByb2plY3QoKSwgVmFsVHlwZS5CdWlsZCwgZ2V0T3BlcmF0aW9uKCksIG1vbml0b3IpOworCQl9CiAJCQogCX0KIAotCXByaXZhdGUgdm9pZCBkZWx0YUJ1aWxkKCkgdGhyb3dzIENvcmVFeGNlcHRpb24geworCXByaXZhdGUgdm9pZCBkZWx0YUJ1aWxkKFZhbGlkYXRpb25SZXF1ZXN0IHJlcXVlc3QsIElQcm9ncmVzc01vbml0b3IgbW9uaXRvcikgdGhyb3dzIENvcmVFeGNlcHRpb24gewogCQlSZXNvdXJjZUNvdW50ZXIgY291bnRlciA9IG5ldyBSZXNvdXJjZUNvdW50ZXIoKTsKLQkJX3JlcXVlc3QuZ2V0RGVsdGEoKS5hY2NlcHQoY291bnRlcik7Ci0JCV9zdWJNb25pdG9yID0gU3ViTW9uaXRvci5jb252ZXJ0KF9tb25pdG9yLCBjb3VudGVyLmdldENvdW50KCkpOwotCQlfcmVxdWVzdC5nZXREZWx0YSgpLmFjY2VwdCh0aGlzKTsJCQorCQlyZXF1ZXN0LmdldERlbHRhKCkuYWNjZXB0KGNvdW50ZXIpOworCQlTdWJNb25pdG9yIHN1Yk1vbml0b3IgPSBTdWJNb25pdG9yLmNvbnZlcnQobW9uaXRvciwgY291bnRlci5nZXRDb3VudCgpKTsKKwkJVmlzaXRvciB2aXN0aXRvciA9IG5ldyBWaXNpdG9yKHJlcXVlc3QsIHN1Yk1vbml0b3IsIG1vbml0b3IsIGdldE9wZXJhdGlvbigpKTsKKwkJcmVxdWVzdC5nZXREZWx0YSgpLmFjY2VwdCh2aXN0aXRvcik7CQkKIAl9CiAKLQlwcml2YXRlIHZvaWQgZnVsbEJ1aWxkKCkgdGhyb3dzIENvcmVFeGNlcHRpb24geworCXByaXZhdGUgdm9pZCBmdWxsQnVpbGQoVmFsaWRhdGlvblJlcXVlc3QgcmVxdWVzdCwgSVByb2dyZXNzTW9uaXRvciBtb25pdG9yKSB0aHJvd3MgQ29yZUV4Y2VwdGlvbiB7CiAJCVJlc291cmNlQ291bnRlciBjb3VudGVyID0gbmV3IFJlc291cmNlQ291bnRlcigpOwotCQlfcmVxdWVzdC5nZXRQcm9qZWN0KCkuYWNjZXB0KGNvdW50ZXIsIDApOwotCQlfc3ViTW9uaXRvciA9IFN1Yk1vbml0b3IuY29udmVydChfbW9uaXRvciwgY291bnRlci5nZXRDb3VudCgpKTsKLQkJX3JlcXVlc3QuZ2V0UHJvamVjdCgpLmFjY2VwdCh0aGlzKTsKKwkJcmVxdWVzdC5nZXRQcm9qZWN0KCkuYWNjZXB0KGNvdW50ZXIsIDApOworCQlTdWJNb25pdG9yIHN1Yk1vbml0b3IgPSBTdWJNb25pdG9yLmNvbnZlcnQobW9uaXRvciwgY291bnRlci5nZXRDb3VudCgpKTsKKwkJVmlzaXRvciB2aXN0aXRvciA9IG5ldyBWaXNpdG9yKHJlcXVlc3QsIHN1Yk1vbml0b3IsIG1vbml0b3IsIGdldE9wZXJhdGlvbigpKTsKKwkJcmVxdWVzdC5nZXRQcm9qZWN0KCkuYWNjZXB0KHZpc3RpdG9yKTsKIAkJCiAJfQotCi0JcHVibGljIGJvb2xlYW4gdmlzaXQoSVJlc291cmNlRGVsdGEgZGVsdGEpIHRocm93cyBDb3JlRXhjZXB0aW9uIHsKLQkJSVJlc291cmNlIHJlc291cmNlID0gZGVsdGEuZ2V0UmVzb3VyY2UoKTsKLQkJaWYgKERpc2FibGVkUmVzb3VyY2VNYW5hZ2VyLmdldERlZmF1bHQoKS5pc0Rpc2FibGVkKHJlc291cmNlKSl7Ci0JCQlNYXJrZXJNYW5hZ2VyLmdldERlZmF1bHQoKS5kZWxldGVNYXJrZXJzKHJlc291cmNlLCBfcmVxdWVzdC5nZXRPcGVyYXRpb24oKS5nZXRTdGFydGVkKCksIElSZXNvdXJjZS5ERVBUSF9JTkZJTklURSk7Ci0JCQlyZXR1cm4gZmFsc2U7Ci0JCX0KLQkJaW50IGtpbmQgPSBkZWx0YS5nZXRLaW5kKCk7Ci0JCWJvb2xlYW4gaXNDaGFuZ2VkID0gKGtpbmQgJiBJUmVzb3VyY2VEZWx0YS5DSEFOR0VEKSAhPSAwOwotCQlpZiAoaXNDaGFuZ2VkICYmICAoZGVsdGEuZ2V0RmxhZ3MoKSAmIEludGVyZXN0ZWRGbGFncykgPT0gMClyZXR1cm4gdHJ1ZTsKLQkJCi0JCWlmICgoa2luZCAmIChJUmVzb3VyY2VEZWx0YS5BRERFRCB8IElSZXNvdXJjZURlbHRhLkNIQU5HRUQpKSAhPSAwKXsKLQkJCVZhbE1hbmFnZXIuZ2V0RGVmYXVsdCgpLnZhbGlkYXRlKF9yZXF1ZXN0LmdldFByb2plY3QoKSwgcmVzb3VyY2UsIGRlbHRhLmdldEtpbmQoKSwgVmFsVHlwZS5CdWlsZCwgCi0JCQkJX3JlcXVlc3QuZ2V0QnVpbGRLaW5kKCksIF9yZXF1ZXN0LmdldE9wZXJhdGlvbigpLCBfc3ViTW9uaXRvci5uZXdDaGlsZCgxKSk7Ci0JCX0KLQkJCQkKLQkJSURlcGVuZGVuY3lJbmRleCBpbmRleCA9IFZhbGlkYXRpb25GcmFtZXdvcmsuZ2V0RGVmYXVsdCgpLmdldERlcGVuZGVuY3lJbmRleCgpOwotCQlpZiAoaW5kZXguaXNEZXBlbmRlZE9uKHJlc291cmNlKSl7Ci0JCQlNYXJrZXJNYW5hZ2VyIG1tID0gTWFya2VyTWFuYWdlci5nZXREZWZhdWx0KCk7Ci0JCQlmb3IgKERlcGVuZGVudFJlc291cmNlIGRyIDogaW5kZXguZ2V0KHJlc291cmNlKSl7Ci0JCQkJaWYgKEZyaWVuZC5zaG91bGRWYWxpZGF0ZShkci5nZXRWYWxpZGF0b3IoKSwgZHIuZ2V0UmVzb3VyY2UoKSwgVmFsVHlwZS5CdWlsZCwgbmV3IENvbnRlbnRUeXBlV3JhcHBlcigpKSl7Ci0JCQkJCW1tLmNsZWFyTWFya2VyKGRyLmdldFJlc291cmNlKCksIGRyLmdldFZhbGlkYXRvcigpKTsgCi0JCQkJCV9yZXF1ZXN0LmdldE9wZXJhdGlvbigpLmdldFN0YXRlKCkucHV0KFZhbGlkYXRpb25TdGF0ZS5UcmlnZ2VyUmVzb3VyY2UsIHJlc291cmNlKTsKLQkJCQkJVmFsTWFuYWdlci5nZXREZWZhdWx0KCkudmFsaWRhdGUoZHIuZ2V0VmFsaWRhdG9yKCksIF9yZXF1ZXN0LmdldE9wZXJhdGlvbigpLCBkci5nZXRSZXNvdXJjZSgpLCAKLQkJCQkJCUlSZXNvdXJjZURlbHRhLk5PX0NIQU5HRSwgX21vbml0b3IpOwotCQkJCX0KLQkJCX0KLQkJfQotCQkJCQotCQlyZXR1cm4gdHJ1ZTsKLQl9Ci0KLQlwdWJsaWMgYm9vbGVhbiB2aXNpdChJUmVzb3VyY2UgcmVzb3VyY2UpIHRocm93cyBDb3JlRXhjZXB0aW9uIHsKLQkJdHJ5IHsKLQkJCWlmIChEaXNhYmxlZFJlc291cmNlTWFuYWdlci5nZXREZWZhdWx0KCkuaXNEaXNhYmxlZChyZXNvdXJjZSkpewotCQkJCU1hcmtlck1hbmFnZXIuZ2V0RGVmYXVsdCgpLmRlbGV0ZU1hcmtlcnMocmVzb3VyY2UsIF9yZXF1ZXN0LmdldE9wZXJhdGlvbigpLmdldFN0YXJ0ZWQoKSwgSVJlc291cmNlLkRFUFRIX0lORklOSVRFKTsKLQkJCQlyZXR1cm4gZmFsc2U7Ci0JCQl9Ci0JCQlWYWxNYW5hZ2VyLmdldERlZmF1bHQoKS52YWxpZGF0ZShfcmVxdWVzdC5nZXRQcm9qZWN0KCksIHJlc291cmNlLCBJUmVzb3VyY2VEZWx0YS5OT19DSEFOR0UsIFZhbFR5cGUuQnVpbGQsIAotCQkJCV9yZXF1ZXN0LmdldEJ1aWxkS2luZCgpLCBfcmVxdWVzdC5nZXRPcGVyYXRpb24oKSwgX3N1Yk1vbml0b3IubmV3Q2hpbGQoMSkpOwotCQl9Ci0JCWNhdGNoIChSZXNvdXJjZVVuYXZhaWxhYmxlRXJyb3IgZSl7Ci0JCQlpZiAoVHJhY2luZy5pc0xvZ2dpbmcoKSlUcmFjaW5nLmxvZygiVmFsQnVpbGRlckpvYi0wMjogIiArIGUudG9TdHJpbmcoKSk7IC8vJE5PTi1OTFMtMSQKLQkJCXJldHVybiBmYWxzZTsKLQkJfQotCQlyZXR1cm4gdHJ1ZTsKLQl9CiAJCi0Jc3RhdGljIGNsYXNzIFJlc291cmNlQ291bnRlciBpbXBsZW1lbnRzIElSZXNvdXJjZVByb3h5VmlzaXRvciwgSVJlc291cmNlRGVsdGFWaXNpdG9yIHsKKwlwcml2YXRlIFZhbE9wZXJhdGlvbiBnZXRPcGVyYXRpb24oKXsKKwkJcmV0dXJuIF9vcGVyYXRpb247CisJfQorCisJc3RhdGljIGZpbmFsIGNsYXNzIFJlc291cmNlQ291bnRlciBpbXBsZW1lbnRzIElSZXNvdXJjZVByb3h5VmlzaXRvciwgSVJlc291cmNlRGVsdGFWaXNpdG9yIHsKIAkJCiAJCXByaXZhdGUgaW50IF9jb3VudDsKIApAQCAtMjI4LDI3ICsyNDMsMjQgQEAKIAkJfQkJCiAJfQogCQotCXN0YXRpYyBjbGFzcyBWYWxpZGF0aW9uUmVxdWVzdCB7CisJc3RhdGljIGZpbmFsIGNsYXNzIFZhbGlkYXRpb25SZXF1ZXN0IHsKIAkJLyoqIFRoZSBwcm9qZWN0IHRoYXQgaXMgYmVpbmcgYnVpbHQuICovCi0JCXByaXZhdGUgSVByb2plY3QgCQkJX3Byb2plY3Q7CisJCXByaXZhdGUgZmluYWwgSVByb2plY3QgCQkJX3Byb2plY3Q7CiAJCQogCQkvKiogVGhlIHJlc291cmNlIGRlbHRhIHRoYXQgdHJpZ2dlcmVkIHRoZSBidWlsZCwgaXQgd2lsbCBiZSBudWxsIGZvciBhIGZ1bGwgYnVpbGQuICovCi0JCXByaXZhdGUgSVJlc291cmNlRGVsdGEJCV9kZWx0YTsKLQkJCi0JCXByaXZhdGUgVmFsT3BlcmF0aW9uCQlfb3BlcmF0aW9uOworCQlwcml2YXRlIGZpbmFsIElSZXNvdXJjZURlbHRhCV9kZWx0YTsKIAkJCiAJCS8qKiAKIAkJICogVGhlIGtpbmQgb2YgYnVpbGQuCiAJCSAqIAogCQkgKiAgQHNlZSBvcmcuZWNsaXBzZS5jb3JlLnJlc291cmNlcy5JbmNyZW1lbnRhbFByb2plY3RCdWlsZGVyCiAJCSAqLwotCQlwcml2YXRlIGludAkJCQkJX2J1aWxkS2luZDsKKwkJcHJpdmF0ZSBmaW5hbCBpbnQJCQkJCV9idWlsZEtpbmQ7CiAJCQotCQlwdWJsaWMgVmFsaWRhdGlvblJlcXVlc3QoSVByb2plY3QgcHJvamVjdCwgSVJlc291cmNlRGVsdGEgZGVsdGEsIGludCBidWlsZEtpbmQsIFZhbE9wZXJhdGlvbiBvcGVyYXRpb24peworCQlwdWJsaWMgVmFsaWRhdGlvblJlcXVlc3QoSVByb2plY3QgcHJvamVjdCwgSVJlc291cmNlRGVsdGEgZGVsdGEsIGludCBidWlsZEtpbmQpewogCQkJX3Byb2plY3QgPSBwcm9qZWN0OwogCQkJX2RlbHRhID0gZGVsdGE7CiAJCQlfYnVpbGRLaW5kID0gYnVpbGRLaW5kOwotCQkJX29wZXJhdGlvbiA9IG9wZXJhdGlvbjsKIAkJfQogCiAJCXB1YmxpYyBJUHJvamVjdCBnZXRQcm9qZWN0KCkgewpAQCAtMjU5LDEzICsyNzEsNzYgQEAKIAkJCXJldHVybiBfZGVsdGE7CiAJCX0KIAotCQlwdWJsaWMgVmFsT3BlcmF0aW9uIGdldE9wZXJhdGlvbigpIHsKLQkJCXJldHVybiBfb3BlcmF0aW9uOwotCQl9Ci0KIAkJcHVibGljIGludCBnZXRCdWlsZEtpbmQoKSB7CiAJCQlyZXR1cm4gX2J1aWxkS2luZDsKIAkJfQogCX0KKwkKKwlwcml2YXRlIGZpbmFsIHN0YXRpYyBjbGFzcyBWaXNpdG9yIGltcGxlbWVudHMgSVJlc291cmNlRGVsdGFWaXNpdG9yLCBJUmVzb3VyY2VWaXNpdG9yeworCQkKKwkJcHJpdmF0ZSBmaW5hbCBWYWxpZGF0aW9uUmVxdWVzdCAJX3JlcXVlc3Q7CisJCXByaXZhdGUgZmluYWwgU3ViTW9uaXRvciAJCQlfc3ViTW9uaXRvcjsKKwkJcHJpdmF0ZSBmaW5hbCBJUHJvZ3Jlc3NNb25pdG9yIAkJX21vbml0b3I7CisJCXByaXZhdGUgZmluYWwgVmFsT3BlcmF0aW9uCQkJX29wZXJhdGlvbjsKKwkJCisJCXB1YmxpYyBWaXNpdG9yKFZhbGlkYXRpb25SZXF1ZXN0IHJlcXVlc3QsIFN1Yk1vbml0b3Igc3ViTW9uaXRvciwgSVByb2dyZXNzTW9uaXRvciBtb25pdG9yLCBWYWxPcGVyYXRpb24gb3BlcmF0aW9uKXsKKwkJCV9yZXF1ZXN0ID0gcmVxdWVzdDsKKwkJCV9zdWJNb25pdG9yID0gc3ViTW9uaXRvcjsKKwkJCV9tb25pdG9yID0gbW9uaXRvcjsKKwkJCV9vcGVyYXRpb24gPSBvcGVyYXRpb247CisJCX0KKwkJCisJCXB1YmxpYyBib29sZWFuIHZpc2l0KElSZXNvdXJjZSByZXNvdXJjZSkgdGhyb3dzIENvcmVFeGNlcHRpb24geworCQkJdHJ5IHsKKwkJCQlpZiAoRGlzYWJsZWRSZXNvdXJjZU1hbmFnZXIuZ2V0RGVmYXVsdCgpLmlzRGlzYWJsZWQocmVzb3VyY2UpKXsKKwkJCQkJTWFya2VyTWFuYWdlci5nZXREZWZhdWx0KCkuZGVsZXRlTWFya2VycyhyZXNvdXJjZSwgX29wZXJhdGlvbi5nZXRTdGFydGVkKCksIElSZXNvdXJjZS5ERVBUSF9JTkZJTklURSk7CisJCQkJCXJldHVybiBmYWxzZTsKKwkJCQl9CisJCQkJVmFsTWFuYWdlci5nZXREZWZhdWx0KCkudmFsaWRhdGUoX3JlcXVlc3QuZ2V0UHJvamVjdCgpLCByZXNvdXJjZSwgSVJlc291cmNlRGVsdGEuTk9fQ0hBTkdFLCBWYWxUeXBlLkJ1aWxkLCAKKwkJCQkJX3JlcXVlc3QuZ2V0QnVpbGRLaW5kKCksIF9vcGVyYXRpb24sIF9zdWJNb25pdG9yLm5ld0NoaWxkKDEpKTsKKwkJCX0KKwkJCWNhdGNoIChSZXNvdXJjZVVuYXZhaWxhYmxlRXJyb3IgZSl7CisJCQkJaWYgKFRyYWNpbmcuaXNMb2dnaW5nKCkpVHJhY2luZy5sb2coIlZhbEJ1aWxkZXJKb2ItMDI6ICIgKyBlLnRvU3RyaW5nKCkpOyAvLyROT04tTkxTLTEkCisJCQkJcmV0dXJuIGZhbHNlOworCQkJfQorCQkJcmV0dXJuIHRydWU7CisJCX0KKwkJCisJCUBTdXBwcmVzc1dhcm5pbmdzKCJkZXByZWNhdGlvbiIpCisJCXB1YmxpYyBib29sZWFuIHZpc2l0KElSZXNvdXJjZURlbHRhIGRlbHRhKSB0aHJvd3MgQ29yZUV4Y2VwdGlvbiB7CisJCQlJUmVzb3VyY2UgcmVzb3VyY2UgPSBkZWx0YS5nZXRSZXNvdXJjZSgpOworCQkJaWYgKERpc2FibGVkUmVzb3VyY2VNYW5hZ2VyLmdldERlZmF1bHQoKS5pc0Rpc2FibGVkKHJlc291cmNlKSl7CisJCQkJTWFya2VyTWFuYWdlci5nZXREZWZhdWx0KCkuZGVsZXRlTWFya2VycyhyZXNvdXJjZSwgX29wZXJhdGlvbi5nZXRTdGFydGVkKCksIElSZXNvdXJjZS5ERVBUSF9JTkZJTklURSk7CisJCQkJcmV0dXJuIGZhbHNlOworCQkJfQorCQkJaW50IGtpbmQgPSBkZWx0YS5nZXRLaW5kKCk7CisJCQlib29sZWFuIGlzQ2hhbmdlZCA9IChraW5kICYgSVJlc291cmNlRGVsdGEuQ0hBTkdFRCkgIT0gMDsKKwkJCWlmIChpc0NoYW5nZWQgJiYgIChkZWx0YS5nZXRGbGFncygpICYgSW50ZXJlc3RlZEZsYWdzKSA9PSAwKXJldHVybiB0cnVlOworCQkJCisJCQlpZiAoKGtpbmQgJiAoSVJlc291cmNlRGVsdGEuQURERUQgfCBJUmVzb3VyY2VEZWx0YS5DSEFOR0VEKSkgIT0gMCl7CisJCQkJVmFsTWFuYWdlci5nZXREZWZhdWx0KCkudmFsaWRhdGUoX3JlcXVlc3QuZ2V0UHJvamVjdCgpLCByZXNvdXJjZSwgZGVsdGEuZ2V0S2luZCgpLCBWYWxUeXBlLkJ1aWxkLCAKKwkJCQkJX3JlcXVlc3QuZ2V0QnVpbGRLaW5kKCksIF9vcGVyYXRpb24sIF9zdWJNb25pdG9yLm5ld0NoaWxkKDEpKTsKKwkJCX0KKwkJCQkJCisJCQlJRGVwZW5kZW5jeUluZGV4IGluZGV4ID0gVmFsaWRhdGlvbkZyYW1ld29yay5nZXREZWZhdWx0KCkuZ2V0RGVwZW5kZW5jeUluZGV4KCk7CisJCQlpZiAoaW5kZXguaXNEZXBlbmRlZE9uKHJlc291cmNlKSl7CisJCQkJTWFya2VyTWFuYWdlciBtbSA9IE1hcmtlck1hbmFnZXIuZ2V0RGVmYXVsdCgpOworCQkJCWZvciAoRGVwZW5kZW50UmVzb3VyY2UgZHIgOiBpbmRleC5nZXQocmVzb3VyY2UpKXsKKwkJCQkJVmFsaWRhdG9yIHZhbCA9IGRyLmdldFZhbGlkYXRvcigpOworCQkJCQlpZiAoRnJpZW5kLnNob3VsZFZhbGlkYXRlKHZhbCwgZHIuZ2V0UmVzb3VyY2UoKSwgVmFsVHlwZS5CdWlsZCwgbmV3IENvbnRlbnRUeXBlV3JhcHBlcigpKSl7CisJCQkJCQlfb3BlcmF0aW9uLmdldFN0YXRlKCkucHV0KFZhbGlkYXRpb25TdGF0ZS5UcmlnZ2VyUmVzb3VyY2UsIHJlc291cmNlKTsKKwkJCQkJCVZhbGlkYXRpb25FdmVudCBldmVudCA9IG5ldyBWYWxpZGF0aW9uRXZlbnQoZHIuZ2V0UmVzb3VyY2UoKSwgSVJlc291cmNlRGVsdGEuTk9fQ0hBTkdFLCBkZWx0YSk7CisJCQkJCQlpZiAodmFsLnNob3VsZENsZWFyTWFya2VycyhldmVudCkpbW0uY2xlYXJNYXJrZXIoZHIuZ2V0UmVzb3VyY2UoKSwgdmFsKTsgCisJCQkJCQlWYWxNYW5hZ2VyLmdldERlZmF1bHQoKS52YWxpZGF0ZSh2YWwsIF9vcGVyYXRpb24sIGRyLmdldFJlc291cmNlKCksIAorCQkJCQkJCUlSZXNvdXJjZURlbHRhLk5PX0NIQU5HRSwgX21vbml0b3IsIGV2ZW50KTsKKwkJCQkJfQorCQkJCX0KKwkJCX0KKwkJCQkJCisJCQlyZXR1cm4gdHJ1ZTsKKwkJfQorCisJCQorCX0KIAogfQpkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi92ZjIvb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vaW50ZXJuYWwvVmFsTWFuYWdlci5qYXZhIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi92ZjIvb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vaW50ZXJuYWwvVmFsTWFuYWdlci5qYXZhCmluZGV4IDkyYzBiYWUuLmE0NmZkZjQgMTAwNjQ0Ci0tLSBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24vdmYyL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL2ludGVybmFsL1ZhbE1hbmFnZXIuamF2YQorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uL3ZmMi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9pbnRlcm5hbC9WYWxNYW5hZ2VyLmphdmEKQEAgLTEsNSArMSw1IEBACiAvKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKgotICogQ29weXJpZ2h0IChjKSAyMDA3LCAyMDA4IElCTSBDb3Jwb3JhdGlvbiBhbmQgb3RoZXJzLgorICogQ29weXJpZ2h0IChjKSAyMDA3LCAyMDEwIElCTSBDb3Jwb3JhdGlvbiBhbmQgb3RoZXJzLgogICogQWxsIHJpZ2h0cyByZXNlcnZlZC4gVGhpcyBwcm9ncmFtIGFuZCB0aGUgYWNjb21wYW55aW5nIG1hdGVyaWFscwogICogYXJlIG1hZGUgYXZhaWxhYmxlIHVuZGVyIHRoZSB0ZXJtcyBvZiB0aGUgRWNsaXBzZSBQdWJsaWMgTGljZW5zZSB2MS4wCiAgKiB3aGljaCBhY2NvbXBhbmllcyB0aGlzIGRpc3RyaWJ1dGlvbiwgYW5kIGlzIGF2YWlsYWJsZSBhdApAQCAtMjAsMTAgKzIwLDE1IEBACiBpbXBvcnQgamF2YS51dGlsLk1hcDsKIGltcG9ydCBqYXZhLnV0aWwuU2V0OwogaW1wb3J0IGphdmEudXRpbC5UcmVlU2V0OworaW1wb3J0IGphdmEudXRpbC5jb25jdXJyZW50LkNvbmN1cnJlbnRIYXNoTWFwOworaW1wb3J0IGphdmEudXRpbC5jb25jdXJyZW50LkNvbmN1cnJlbnRNYXA7CitpbXBvcnQgamF2YS51dGlsLmNvbmN1cnJlbnQuYXRvbWljLkF0b21pY0ludGVnZXI7CitpbXBvcnQgamF2YS51dGlsLmNvbmN1cnJlbnQuYXRvbWljLkF0b21pY1JlZmVyZW5jZTsKIAogaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucmVzb3VyY2VzLklGb2xkZXI7CiBpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5yZXNvdXJjZXMuSVByb2plY3Q7CiBpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5yZXNvdXJjZXMuSVJlc291cmNlOworaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucmVzb3VyY2VzLklSZXNvdXJjZVN0YXR1czsKIGltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJlc291cmNlcy5JUmVzb3VyY2VWaXNpdG9yOwogaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucmVzb3VyY2VzLklXb3Jrc3BhY2VSb290OwogaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucmVzb3VyY2VzLlJlc291cmNlc1BsdWdpbjsKQEAgLTQzLDEzICs0OCwxNiBAQAogaW1wb3J0IG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLklQZXJmb3JtYW5jZU1vbml0b3I7CiBpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uSVZhbGlkYXRvckdyb3VwTGlzdGVuZXI7CiBpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uUGVyZm9ybWFuY2VDb3VudGVyczsKK2ltcG9ydCBvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5WYWxpZGF0aW9uRXZlbnQ7CiBpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uVmFsaWRhdGlvbkZyYW1ld29yazsKIGltcG9ydCBvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5WYWxpZGF0aW9uUmVzdWx0OwogaW1wb3J0IG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLlZhbGlkYXRpb25TdGF0ZTsKIGltcG9ydCBvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5WYWxpZGF0b3I7CiBpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uaW50ZXJuYWwubW9kZWwuR2xvYmFsUHJlZmVyZW5jZXM7CitpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uaW50ZXJuYWwubW9kZWwuR2xvYmFsUHJlZmVyZW5jZXNWYWx1ZXM7CiBpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uaW50ZXJuYWwubW9kZWwuSVZhbGlkYXRvclZpc2l0b3I7CiBpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uaW50ZXJuYWwubW9kZWwuUHJvamVjdFByZWZlcmVuY2VzOworaW1wb3J0IG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLmludGVybmFsLm9wZXJhdGlvbnMuTWFudWFsVmFsaWRhdG9yc09wZXJhdGlvbjsKIGltcG9ydCBvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5pbnRlcm5hbC5wbHVnaW4uVmFsaWRhdGlvblBsdWdpbjsKIGltcG9ydCBvcmcub3NnaS5zZXJ2aWNlLnByZWZzLkJhY2tpbmdTdG9yZUV4Y2VwdGlvbjsKIApAQCAtNTgsMzYgKzY2LDM0IEBACiAgKiBAYXV0aG9yIGthcmFzaXVrCiAgKgogICovCi1wdWJsaWMgY2xhc3MgVmFsTWFuYWdlciBpbXBsZW1lbnRzIElWYWxDaGFuZ2VkTGlzdGVuZXIsIElGYWNldGVkUHJvamVjdExpc3RlbmVyLCBJUHJvamVjdENoYW5nZUxpc3RlbmVyIHsKK3B1YmxpYyBmaW5hbCBjbGFzcyBWYWxNYW5hZ2VyIGltcGxlbWVudHMgSVZhbENoYW5nZWRMaXN0ZW5lciwgSUZhY2V0ZWRQcm9qZWN0TGlzdGVuZXIsIElQcm9qZWN0Q2hhbmdlTGlzdGVuZXIgewogCQotCXByaXZhdGUgc3RhdGljIFZhbE1hbmFnZXIgX21lOwotCQkKIAkvKioKIAkgKiBQcm9qZWN0cyBtYXkgYmUgYWxsb3dlZCB0byBvdmVycmlkZSB0aGUgZ2xvYmFsIHZhbGlkYXRpb24gc2V0dGluZ3MuIElmIHRoYXQgaXMgdGhlIGNhc2UgdGhlbiB0aG9zZQogCSAqIHByb2plY3Qgc3BlY2lmaWMgc2V0dGluZ3MgYXJlIHNhdmVkIGhlcmUuIElmIHRoZSBrZXkgZXhpc3RzLCBidXQgdGhlIHZhbHVlIGlzIG51bGwsIHRoZW4gdGhhdAogCSAqIG1lYW5zIHRoYXQgdGhlIHByb2plY3QgaGFzIGJlZW4gY2hlY2tlZCBhbmQgaXQgZG9lcyBub3QgaGF2ZSBhbnkgc3BlY2lmaWMgc2V0dGluZ3MuCiAJICovCi0JcHJpdmF0ZSBNYXA8SVByb2plY3QsIFByb2plY3RQcmVmZXJlbmNlcz4gX3Byb2plY3RQcmVmZXJlbmNlcyA9IAorCXByaXZhdGUgZmluYWwgTWFwPElQcm9qZWN0LCBQcm9qZWN0UHJlZmVyZW5jZXM+IF9wcm9qZWN0UHJlZmVyZW5jZXMgPSAKIAkJQ29sbGVjdGlvbnMuc3luY2hyb25pemVkTWFwKG5ldyBIYXNoTWFwPElQcm9qZWN0LCBQcm9qZWN0UHJlZmVyZW5jZXM+KDUwKSk7CiAJCi0JcHJpdmF0ZSBHbG9iYWxQcmVmZXJlbmNlcyBfZ2xvYmFsUHJlZmVyZW5jZXM7CisJcHJpdmF0ZSBmaW5hbCBBdG9taWNSZWZlcmVuY2U8R2xvYmFsUHJlZmVyZW5jZXM+IF9nbG9iYWxQcmVmZXJlbmNlcyA9IG5ldyBBdG9taWNSZWZlcmVuY2U8R2xvYmFsUHJlZmVyZW5jZXM+KCk7CiAJCQogCS8qKgogCSAqIFRoaXMgbnVtYmVyIGluY3JlYXNlcyBlYWNoIHRpbWUgYW55IG9mIHRoZSB2YWxpZGF0aW9uIGNvbmZpZ3VyYXRpb25zIGNoYW5nZS4gSXQgaXMgdXNlZCB0byBkZXRlcm1pbmUKIAkgKiBpZiBpbmZvcm1hdGlvbiB0aGF0IHdlIGhhdmUgY2FjaGVkIGluIHRoZSBWYWxQcm9wZXJ0eSBpcyBzdGFsZSBvciBub3QuIFRoaXMgc3RhcnRzIG9mZiBhdCB6ZXJvLCBlYWNoIHRpbWUKIAkgKiB0aGUgd29ya2JlbmNoIGlzIHN0YXJ0ZWQuCiAJICovCi0JcHJpdmF0ZSBpbnQgX2NvbmZpZ051bWJlcjsKLQlwcml2YXRlIFZhbGlkYXRvcklkTWFuYWdlciBfaWRNYW5hZ2VyID0gbmV3IFZhbGlkYXRvcklkTWFuYWdlcigpOworCXByaXZhdGUgZmluYWwgQXRvbWljSW50ZWdlciBfY29uZmlnTnVtYmVyID0gbmV3IEF0b21pY0ludGVnZXIoKTsKIAkKLQlwcml2YXRlIFZhbGlkYXRvclByb2plY3RNYW5hZ2VyIF9wcm9qZWN0TWFuYWdlciA9IG5ldyBWYWxpZGF0b3JQcm9qZWN0TWFuYWdlcigpOwotCQorCXByaXZhdGUgZmluYWwgVmFsaWRhdG9ySWRNYW5hZ2VyIF9pZE1hbmFnZXIgPSBuZXcgVmFsaWRhdG9ySWRNYW5hZ2VyKCk7CisJcHJpdmF0ZSBmaW5hbCBWYWxpZGF0b3JDYWNoZSAJX2NhY2hlID0gbmV3IFZhbGlkYXRvckNhY2hlKCk7CisJCQogCXByaXZhdGUgc3RhdGljIGZpbmFsIFF1YWxpZmllZE5hbWUgU3RhdHVzQnVpbGQgPSBuZXcgUXVhbGlmaWVkTmFtZShWYWxpZGF0aW9uUGx1Z2luLlBMVUdJTl9JRCwgInNiIik7IC8vJE5PTi1OTFMtMSQKIAlwcml2YXRlIHN0YXRpYyBmaW5hbCBRdWFsaWZpZWROYW1lIFN0YXR1c01hbnVhbCA9IG5ldyBRdWFsaWZpZWROYW1lKFZhbGlkYXRpb25QbHVnaW4uUExVR0lOX0lELCAic20iKTsgLy8kTk9OLU5MUy0xJAotCQkJCi0JcHVibGljIHN0YXRpYyBzeW5jaHJvbml6ZWQgVmFsTWFuYWdlciBnZXREZWZhdWx0KCl7Ci0JCWlmIChfbWUgPT0gbnVsbClfbWUgPSBuZXcgVmFsTWFuYWdlcigpOwotCQlyZXR1cm4gX21lOworCisJCisJcHVibGljIHN0YXRpYyBWYWxNYW5hZ2VyIGdldERlZmF1bHQoKXsKKwkJcmV0dXJuIFNpbmdsZXRvbi52YWxNYW5hZ2VyOwogCX0KIAkKIAlwcml2YXRlIFZhbE1hbmFnZXIoKXsKQEAgLTExNSw3ICsxMjEsNyBAQAogCSAqIEJlY2F1c2UgaWYgeW91IG1ha2UgY2hhbmdlcyB0byB0aGUgb3JpZ2luYWwgdmFsaWRhdG9ycywgYW5kIHNpbmNlIHdlIG9ubHkgc2F2ZSBkaWZmZXJlbmNlcywKIAkgKiB0aGVyZSB3b24ndCBiZSBhbnkgZGlmZmVyZW5jZXMuIAogCSAqIAotCSAqIEByZXR1cm4gQW5zd2VyIGFuIGVtcHR5IGFycmF5IGlmIHRoZXJlIGFyZSBubyB2YWxpZGF0b3JzLgorCSAqIEByZXR1cm4gQW5zd2VyIHRoZSB2YWxpZGF0b3JzIGluIG5hbWUgc29ydGVkIG9yZGVyLiBBbnN3ZXIgYW4gZW1wdHkgYXJyYXkgaWYgdGhlcmUgYXJlIG5vIHZhbGlkYXRvcnMuCiAJICogCiAJICogQHNlZSAjZ2V0VmFsaWRhdG9yc0NvcHkoKQogCSAqLwpAQCAtMTM3LDIzICsxNDMsNiBAQAogCX0KIAkKIAkvKioKLQkgKiBBbnN3ZXIgYWxsIHRoZSB2YWxpZGF0b3JzIHRoYXQgYXJlIGluIGVmZmVjdCBmb3IgdGhlIGdpdmVuIHByb2plY3QuCi0JICogPHA+Ci0JICogSW5kaXZpZHVhbCBwcm9qZWN0cyBtYXkgb3ZlcnJpZGUgdGhlIGdsb2JhbCB2YWxpZGF0aW9uIHByZWZlcmVuY2Ugc2V0dGluZ3MuIElmIHRoaXMgaXMgYWxsb3dlZCBhbmQgaWYKLQkgKiB0aGUgcHJvamVjdCBoYXMgaXQncyBvd24gc2V0dGluZ3MsIHRoZW4gdGhvc2UgdmFsaWRhdG9ycyBhcmUgcmV0dXJuZWQgdmlhIHRoaXMgbWV0aG9kLgotCSAqIDwvcD4KLQkgKiA8cD4KLQkgKiBUaGUgZm9sbG93aW5nIGFwcHJvYWNoIGlzIHVzZWQuIEZvciB2ZXJzaW9uIDEgdmFsaWRhdG9ycywgdGhlIHZhbGlkYXRvciBpcyBvbmx5IHJldHVybmVkIGlmIGl0Ci0JICogaXMgZGVmaW5lZCB0byBvcGVyYXRlIG9uIHRoaXMgcHJvamVjdCB0eXBlLiBUaGlzIGlzIHRoZSB3YXkgdGhhdCB0aGUgcHJldmlvdXMgdmVyc2lvbiBvZiB0aGUgZnJhbWV3b3JrCi0JICogZGlkIGl0LiBGb3IgdmVyc2lvbiAyIHZhbGlkYXRvcnMsIHRoZXkgYXJlIGFsbCByZXR1cm5lZC4KLQkgKiA8L3A+Ci0JICogQHBhcmFtIHByb2plY3QgdGhpcyBtYXkgYmUgbnVsbCwgaW4gd2hpY2ggY2FzZSB0aGUgZ2xvYmFsIHByZWZlcmVuY2VzIGFyZSByZXR1cm5lZC4KLQkgKi8KLQlwdWJsaWMgVmFsaWRhdG9yW10gZ2V0VmFsaWRhdG9ycyhJUHJvamVjdCBwcm9qZWN0KSB0aHJvd3MgUHJvamVjdFVuYXZhaWxhYmxlRXJyb3IgewotCQlyZXR1cm4gZ2V0VmFsaWRhdG9ycyhwcm9qZWN0LCB0cnVlKTsKLQl9Ci0JCi0JLyoqCiAJICogQW5zd2VyIGFsbCB0aGUgdmFsaWRhdG9ycyBmb3IgdGhlIGdpdmVuIHByb2plY3QuCiAJICogPHA+CiAJICogSW5kaXZpZHVhbCBwcm9qZWN0cyBtYXkgb3ZlcnJpZGUgdGhlIGdsb2JhbCB2YWxpZGF0aW9uIHByZWZlcmVuY2UKQEAgLTE3NiwxNyArMTY1LDgwIEBACiAJICogICAgICAgICAgICBwcmVmZXJlbmNlcyBkbyBub3QgYWxsb3cgcHJvamVjdCBvdmVycmlkZXMgdGhlbiBub25lIG9mIHRoZQogCSAqICAgICAgICAgICAgcHJvamVjdCBzZXR0aW5ncyBhcmUgdXNlZC4gTm9ybWFsIHZhbGlkYXRpb24gd291bGQgc2V0IHRoaXMgdG8gdHJ1ZS4KIAkgKiAgICAgICAgICAgIFRoZSBwcm9wZXJ0aWVzIHBhZ2Ugd291bGQgc2V0IHRoaXMgdG8gZmFsc2UuCisJICogICAgICAgICAgICAKKwkgKiBAZGVwcmVjYXRlZCBVc2Uge0BsaW5rICNnZXRWYWxpZGF0b3JzTm90Q2FjaGVkKElQcm9qZWN0KX0gaW5zdGVhZCAgICAgICAgICAgIAogCSAqLwotCXB1YmxpYyBzeW5jaHJvbml6ZWQgVmFsaWRhdG9yW10gZ2V0VmFsaWRhdG9ycyhJUHJvamVjdCBwcm9qZWN0LCBib29sZWFuIHJlc3BlY3RPdmVycmlkZVNldHRpbmdzKSB0aHJvd3MgUHJvamVjdFVuYXZhaWxhYmxlRXJyb3IgewotCQlNYXA8U3RyaW5nLFZhbGlkYXRvcj4gdjJWYWxzID0gZ2V0VjJWYWxpZGF0b3JzKHByb2plY3QpOworCXB1YmxpYyBWYWxpZGF0b3JbXSBnZXRWYWxpZGF0b3JzKElQcm9qZWN0IHByb2plY3QsIGJvb2xlYW4gcmVzcGVjdE92ZXJyaWRlU2V0dGluZ3MpIHRocm93cyBQcm9qZWN0VW5hdmFpbGFibGVFcnJvciB7CisJCXJldHVybiBnZXRWYWxpZGF0b3JzKHByb2plY3QpOworCX0KKwkKKwkvKioKKwkgKiBBbnN3ZXIgYSBjYWNoZWQgY29weSBvZiB0aGUgdGhlIHZhbGlkYXRvcnMgZm9yIGEgZ2l2ZW4gcHJvamVjdC4gVGhpcyBpcyBhIGZyb250IGVuZCBtZXRob2QsIAorCSAqIGZvciB0aGUgZ2V0VmFsaWRhdG9yc05vdENhY2hlZCgpIG1ldGhvZC4KKwkgKiA8cD4KKwkgKiBJbmRpdmlkdWFsIHByb2plY3RzIG1heSBvdmVycmlkZSB0aGUgZ2xvYmFsIHZhbGlkYXRpb24gcHJlZmVyZW5jZQorCSAqIHNldHRpbmdzLiBJZiB0aGUgcHJvamVjdCBoYXMgaXQncyBvd24gc2V0dGluZ3MsIHRoZW4gdGhvc2UgdmFsaWRhdG9ycyBhcmUKKwkgKiByZXR1cm5lZCB2aWEgdGhpcyBtZXRob2QuCisJICogPC9wPgorCSAqIDxwPgorCSAqIFRoZSBmb2xsb3dpbmcgYXBwcm9hY2ggaXMgdXNlZC4gRm9yIHZlcnNpb24gMSB2YWxpZGF0b3JzLCB0aGUgdmFsaWRhdG9yCisJICogaXMgb25seSByZXR1cm5lZCBpZiBpdCBpcyBkZWZpbmVkIHRvIG9wZXJhdGUgb24gdGhpcyBwcm9qZWN0IHR5cGUuIFRoaXMKKwkgKiBpcyB0aGUgd2F5IHRoYXQgdGhlIHByZXZpb3VzIHZlcnNpb24gb2YgdGhlIGZyYW1ld29yayBkaWQgaXQuIEZvciB2ZXJzaW9uCisJICogMiB2YWxpZGF0b3JzLCB0aGV5IGFyZSBhbGwgcmV0dXJuZWQuCisJICogPC9wPgorCSAqIAorCSAqIEBwYXJhbSBwcm9qZWN0CisJICogICAgICAgICAgICBUaGlzIG1heSBiZSBudWxsLCBpbiB3aGljaCBjYXNlIHRoZSBnbG9iYWwgcHJlZmVyZW5jZXMgYXJlCisJICogICAgICAgICAgICByZXR1cm5lZC4KKwkgKiAKKwkgKiBAcmV0dXJuIFRoZSB2YWxpZGF0b3JzIGluIG5hbWUgc29ydGVkIG9yZGVyLgorCSAqLworCXB1YmxpYyBWYWxpZGF0b3JbXSBnZXRWYWxpZGF0b3JzKElQcm9qZWN0IHByb2plY3QpIHRocm93cyBQcm9qZWN0VW5hdmFpbGFibGVFcnJvciB7CisJCXJldHVybiBfY2FjaGUuZ2V0VmFsaWRhdG9yc0NhY2hlZChwcm9qZWN0KTsKKwl9CisJCisJLyoqCisJICogQW5zd2VyIGFsbCB0aGUgdmFsaWRhdG9ycyBmb3IgdGhlIGdpdmVuIHByb2plY3QuCisJICogPHA+CisJICogSW5kaXZpZHVhbCBwcm9qZWN0cyBtYXkgb3ZlcnJpZGUgdGhlIGdsb2JhbCB2YWxpZGF0aW9uIHByZWZlcmVuY2UKKwkgKiBzZXR0aW5ncy4gSWYgdGhlIHByb2plY3QgaGFzIGl0J3Mgb3duIHNldHRpbmdzLCB0aGVuIHRob3NlIHZhbGlkYXRvcnMgYXJlCisJICogcmV0dXJuZWQgdmlhIHRoaXMgbWV0aG9kLgorCSAqIDwvcD4KKwkgKiA8cD4KKwkgKiBUaGUgZm9sbG93aW5nIGFwcHJvYWNoIGlzIHVzZWQuIEZvciB2ZXJzaW9uIDEgdmFsaWRhdG9ycywgdGhlIHZhbGlkYXRvcgorCSAqIGlzIG9ubHkgcmV0dXJuZWQgaWYgaXQgaXMgZGVmaW5lZCB0byBvcGVyYXRlIG9uIHRoaXMgcHJvamVjdCB0eXBlLiBUaGlzCisJICogaXMgdGhlIHdheSB0aGF0IHRoZSBwcmV2aW91cyB2ZXJzaW9uIG9mIHRoZSBmcmFtZXdvcmsgZGlkIGl0LiBGb3IgdmVyc2lvbgorCSAqIDIgdmFsaWRhdG9ycywgdGhleSBhcmUgYWxsIHJldHVybmVkLgorCSAqIDwvcD4KKwkgKiAKKwkgKiBAcGFyYW0gcHJvamVjdAorCSAqICAgICAgICAgICAgVGhpcyBtYXkgYmUgbnVsbCwgaW4gd2hpY2ggY2FzZSB0aGUgZ2xvYmFsIHByZWZlcmVuY2VzIGFyZQorCSAqICAgICAgICAgICAgcmV0dXJuZWQuCisJICogCisJICogQHJldHVybiBUaGUgdmFsaWRhdG9ycyBpbiBuYW1lIHNvcnRlZCBvcmRlci4KKwkgKi8KKwlwcml2YXRlIFZhbGlkYXRvcltdIGdldFZhbGlkYXRvcnNOb3RDYWNoZWQoSVByb2plY3QgcHJvamVjdCkgdGhyb3dzIFByb2plY3RVbmF2YWlsYWJsZUVycm9yIHsKKwkJTWFwPFN0cmluZyxWYWxpZGF0b3I+IHYyVmFscyA9IGdldFYyVmFsaWRhdG9ycyhwcm9qZWN0LCBVc2VQcm9qZWN0UHJlZmVyZW5jZXMuTm9ybWFsKTsKIAkJVHJlZVNldDxWYWxpZGF0b3I+IHNvcnRlZCA9IG5ldyBUcmVlU2V0PFZhbGlkYXRvcj4oKTsKLQkJZm9yIChWYWxpZGF0b3IgdiA6IHYyVmFscy52YWx1ZXMoKSlzb3J0ZWQuYWRkKHYpOworCQlzb3J0ZWQuYWRkQWxsKHYyVmFscy52YWx1ZXMoKSk7CiAJCQogCQl0cnkgewogCQkJVmFsaWRhdGlvbkNvbmZpZ3VyYXRpb24gdmMgPSBDb25maWd1cmF0aW9uTWFuYWdlci5nZXRNYW5hZ2VyKCkuZ2V0Q29uZmlndXJhdGlvbihwcm9qZWN0KTsKLQkJCWZvciAoVmFsaWRhdG9yTWV0YURhdGEgdm1kIDogdmMuZ2V0VmFsaWRhdG9ycygpKXsKLQkJCQlWYWxpZGF0b3IgdiA9IFZhbGlkYXRvci5jcmVhdGUodm1kLCB2YywgcHJvamVjdCk7Ci0JCQkJc29ydGVkLmFkZCh2KTsKKwkJCWlmIChwcm9qZWN0ID09IG51bGwpeworCQkJCS8vIElmIHRoZSBwcm9qZWN0IGlzIG51bGwgd2UgbmVlZCB0byB1c2UgdGhpcyBhcHByb2FjaCwgc2luY2UgeW91IGNhbiBub3QgdXNlIG5ldyBNYW51YWxWYWxpZGF0b3JzT3BlcmF0aW9uKG51bGwpCisJCQkJVmFsaWRhdG9yTWV0YURhdGFbXSB2bWRzID0gdmMuZ2V0VmFsaWRhdG9ycygpOworCQkJCWZvciAoVmFsaWRhdG9yTWV0YURhdGEgdm1kIDogdm1kcyl7CisJCQkJCVZhbGlkYXRvciB2ID0gVmFsaWRhdG9yLmNyZWF0ZSh2bWQsIHZjLCBwcm9qZWN0KTsKKwkJCQkJc29ydGVkLmFkZCh2KTsKKwkJCQl9CisJCQl9CisJCQllbHNlIHsKKwkJCQlNYW51YWxWYWxpZGF0b3JzT3BlcmF0aW9uIG12byA9IG5ldyBNYW51YWxWYWxpZGF0b3JzT3BlcmF0aW9uKHByb2plY3QpOworCQkJCVNldDxWYWxpZGF0b3JNZXRhRGF0YT4gdm1kcyA9IG12by5nZXRFbmFibGVkVmFsaWRhdG9ycygpOworCQkJCWZvciAoVmFsaWRhdG9yTWV0YURhdGEgdm1kIDogdm1kcyl7CisJCQkJCVZhbGlkYXRvciB2ID0gVmFsaWRhdG9yLmNyZWF0ZSh2bWQsIHZjLCBwcm9qZWN0KTsKKwkJCQkJc29ydGVkLmFkZCh2KTsKKwkJCQl9CiAJCQl9CiAJCX0KIAkJY2F0Y2ggKEludm9jYXRpb25UYXJnZXRFeGNlcHRpb24gZSl7CkBAIC0xOTcsMzEgKzI0OSwxMTQgQEAKIAkJc29ydGVkLnRvQXJyYXkodmFscyk7CiAJCXJldHVybiB2YWxzOwogCX0KKwkvKioKKwkgKiBWYWxpZGF0b3JzIGNhbiB1c2UgcHJvamVjdCBsZXZlbCBzZXR0aW5ncyAoUHJvamVjdCBuYXR1cmVzIGFuZCBmYWNldHMpIHRvCisJICogZGV0ZXJtaW5lIGlmIHRoZXkgYXJlIGFwcGxpY2FibGUgdG8gdGhlIHByb2plY3Qgb3Igbm90LgorCSAqIAorCSAqIEBwYXJhbSBwcm9qZWN0CisJICogICAgICAgICAgICBUaGUgcHJvamVjdCB0aGF0IHRoZSBjb25maWd1cmF0aW9uIGlzIGJhc2VkIG9uLgorCSAqIEBwYXJhbSBtdXN0VXNlUHJvamVjdFNldHRpbmdzCisJICogICAgICAgICAgICBGb3JjZSB0aGUgcHJvamVjdCBwcm9wZXJ0aWVzIHRvIGJlIHVzZWQuIFRoZXJlIGlzIGEgY2FzZSB3aGVyZSB0aGUgdXNlciBoYXMgdG9nZ2xlZCB0aGUKKwkgKiAgICAgICAgICAgIEVuYWJsZSBwcm9qZWN0IHNwZWNpZmljIHNldHRpbmdzIGNoZWNrYm94IGluIHRoZSBkaWFsb2csIGJ1dCBoYXMgbm90IHlldCBjb21taXR0ZWQgdGhlCisJICogICAgICAgICAgICBjaGFuZ2VzLiBUaGlzIGFsbG93cyB0aGF0IHNldHRpbmcgdG8gYmUgcGFzc2VkIHRocm91Z2guCisJICogQHJldHVybiBUaGUgdmFsaWRhdG9ycyB0aGF0IGFyZSBjb25maWd1cmVkIHRvIHJ1biBvbiB0aGlzIHByb2plY3QgYmFzZWQKKwkgKiAgICAgICAgIG9uIHRoZSBwcm9qZWN0IGxldmVsIHNldHRpbmdzLiBUaGVzZSBhcmUgdGhlICJsaXZlIiB2YWxpZGF0b3JzLCB0aGV5IGFyZSBub3QgY29waWVzLgorCSAqIEB0aHJvd3MgUHJvamVjdFVuYXZhaWxhYmxlRXJyb3IKKwkgKiAKKwkgKiBAZGVwcmVjYXRlZCBVc2UgZ2V0VmFsaWRhdG9yc0NvbmZpZ3VyZWRGb3JQcm9qZWN0KElQcm9qZWN0IHByb2plY3QsIFVzZVByb2plY3RQcmVmZXJlbmNlcyB1c2VQcm9qZWN0KQorCSAqLworCXB1YmxpYyBWYWxpZGF0b3JbXSBnZXRWYWxpZGF0b3JzQ29uZmlndXJlZEZvclByb2plY3QoSVByb2plY3QgcHJvamVjdCwgYm9vbGVhbiBtdXN0VXNlUHJvamVjdFNldHRpbmdzKSB0aHJvd3MgUHJvamVjdFVuYXZhaWxhYmxlRXJyb3IgeworCQlVc2VQcm9qZWN0UHJlZmVyZW5jZXMgdXNlUHJvamVjdCA9IFVzZVByb2plY3RQcmVmZXJlbmNlcy5Ob3JtYWw7CisJCXJldHVybiBnZXRWYWxpZGF0b3JzQ29uZmlndXJlZEZvclByb2plY3QocHJvamVjdCwgdXNlUHJvamVjdCk7CisJfQogCQogCS8qKgotCSAqIEFuc3dlciB0aGUgVjIgdmFsaWRhdG9ycyB0aGF0IGFyZSBpbiBlZmZlY3QgZm9yIHRoaXMgcHJvamVjdC4gVGhlIGZvbGxvd2luZyBhcHByb2FjaCBpcyB1c2VkOgorCSAqIFZhbGlkYXRvcnMgY2FuIHVzZSBwcm9qZWN0IGxldmVsIHNldHRpbmdzIChQcm9qZWN0IG5hdHVyZXMgYW5kIGZhY2V0cykgdG8KKwkgKiBkZXRlcm1pbmUgaWYgdGhleSBhcmUgYXBwbGljYWJsZSB0byB0aGUgcHJvamVjdCBvciBub3QuCisJICogCisJICogQHBhcmFtIHByb2plY3QKKwkgKiAgICAgICAgICAgIFRoZSBwcm9qZWN0IHRoYXQgdGhlIGNvbmZpZ3VyYXRpb24gaXMgYmFzZWQgb24uCisJICogQHBhcmFtIHVzZVByb2plY3QKKwkgKiAgICAgICAgICAgIFNwZWNpZmllcyBob3cgdG8gdXNlIHRoZSBwcm9qZWN0IHByZWZlcmVuY2VzLiBUaGlzIGNhbiBiZSB1c2VkCisJICogICAgICAgICAgICB0byBmb3JjZSB0aGUgcHJvamVjdCBwcm9wZXJ0aWVzIHRvIGJlIHVzZWQuIFRoZXJlIGlzIGEgY2FzZQorCSAqICAgICAgICAgICAgd2hlcmUgdGhlIHVzZXIgaGFzIHRvZ2dsZWQgdGhlIEVuYWJsZSBwcm9qZWN0IHNwZWNpZmljCisJICogICAgICAgICAgICBzZXR0aW5ncyBjaGVja2JveCBpbiB0aGUgZGlhbG9nLCBidXQgaGFzIG5vdCB5ZXQgY29tbWl0dGVkIHRoZQorCSAqICAgICAgICAgICAgY2hhbmdlcy4gVGhpcyBhbGxvd3MgdGhhdCBzZXR0aW5nIHRvIGJlIHBhc3NlZCB0aHJvdWdoLgorCSAqIEByZXR1cm4gVGhlIHZhbGlkYXRvcnMgdGhhdCBhcmUgY29uZmlndXJlZCB0byBydW4gb24gdGhpcyBwcm9qZWN0IGJhc2VkCisJICogICAgICAgICBvbiB0aGUgcHJvamVjdCBsZXZlbCBzZXR0aW5ncy4gVGhlc2UgYXJlIHRoZSAibGl2ZSIgdmFsaWRhdG9ycywKKwkgKiAgICAgICAgIHRoZXkgYXJlIG5vdCBjb3BpZXMuCisJICogQHRocm93cyBQcm9qZWN0VW5hdmFpbGFibGVFcnJvcgorCSAqLworCXB1YmxpYyBWYWxpZGF0b3JbXSBnZXRWYWxpZGF0b3JzQ29uZmlndXJlZEZvclByb2plY3QoSVByb2plY3QgcHJvamVjdCwgVXNlUHJvamVjdFByZWZlcmVuY2VzIHVzZVByb2plY3QpIHRocm93cyBQcm9qZWN0VW5hdmFpbGFibGVFcnJvciB7CisJCU1hcDxTdHJpbmcsVmFsaWRhdG9yPiB2MlZhbHMgPSBnZXRWMlZhbGlkYXRvcnMocHJvamVjdCwgdXNlUHJvamVjdCk7CisJCVRyZWVTZXQ8VmFsaWRhdG9yPiBzb3J0ZWQgPSBuZXcgVHJlZVNldDxWYWxpZGF0b3I+KCk7CisJCXNvcnRlZC5hZGRBbGwodjJWYWxzLnZhbHVlcygpKTsKKwkJCisJCWlmICh1c2VQcm9qZWN0ID09IFVzZVByb2plY3RQcmVmZXJlbmNlcy5NdXN0Tm90VXNlKXsKKwkJCXNvcnRlZC5hZGRBbGwoRXh0ZW5zaW9uVmFsaWRhdG9ycy5pbnN0YW5jZSgpLmdldFYxVmFsaWRhdG9ycyhwcm9qZWN0KSk7CisJCX0KKwkJZWxzZSB7CisJCQl0cnkgeworCQkJCVZhbGlkYXRpb25Db25maWd1cmF0aW9uIHZjID0gQ29uZmlndXJhdGlvbk1hbmFnZXIuZ2V0TWFuYWdlcigpLmdldFByb2plY3RDb25maWd1cmF0aW9uKHByb2plY3QpOworCQkJCVZhbGlkYXRvck1ldGFEYXRhW10gdm1kcyA9IHZjLmdldFZhbGlkYXRvcnMoKTsKKwkJCQlmb3IgKFZhbGlkYXRvck1ldGFEYXRhIHZtZCA6IHZtZHMpIHsKKwkJCQkJVmFsaWRhdG9yIHYgPSBWYWxpZGF0b3IuY3JlYXRlKHZtZCwgdmMsIHByb2plY3QpOworCQkJCQlzb3J0ZWQuYWRkKHYpOworCQkJCX0KKwkJCX0KKwkJCWNhdGNoIChJbnZvY2F0aW9uVGFyZ2V0RXhjZXB0aW9uIGUpeworCQkJCVZhbGlkYXRpb25QbHVnaW4uZ2V0UGx1Z2luKCkuaGFuZGxlRXhjZXB0aW9uKGUpOworCQkJfQorCQl9CisJCQkJCisJCUxpc3Q8VmFsaWRhdG9yPiBsaXN0ID0gbmV3IExpbmtlZExpc3Q8VmFsaWRhdG9yPigpOworCQlmb3IgKFZhbGlkYXRvciB2IDogc29ydGVkKXsKKwkJCWlmICh2LnNob3VsZFZhbGlkYXRlUHJvamVjdChwcm9qZWN0LCBmYWxzZSwgZmFsc2UpKWxpc3QuYWRkKHYpOworCQl9CisJCQorCQlWYWxpZGF0b3JbXXZhbHMgPSBuZXcgVmFsaWRhdG9yW2xpc3Quc2l6ZSgpXTsKKwkJbGlzdC50b0FycmF5KHZhbHMpOworCQlyZXR1cm4gdmFsczsKKwl9CisJCisJLyoqCisJICogQW5zd2VyIHRoZSBWMiB2YWxpZGF0b3JzIHRoYXQgYXJlIGluIGVmZmVjdCBmb3IgdGhpcyBwcm9qZWN0LiBUaGUKKwkgKiBmb2xsb3dpbmcgYXBwcm9hY2ggaXMgdXNlZDoKIAkgKiA8b2w+CiAJICogPGxpPlRoZSB2YWxpZGF0b3JzIHRoYXQgYXJlIGRlZmluZWQgYnkgdGhlIGV4dGVuc2lvbiBwb2ludCBhcmUgbG9hZGVkLjwvbGk+CiAJICogPGxpPlRoZXkgYXJlIGN1c3RvbWl6ZWQgYnkgYW55IGdsb2JhbCBwcmVmZXJlbmNlcy48L2xpPgotCSAqIDxsaT5JZiBwcm9qZWN0IGN1c3RvbWl6YXRpb25zIGFyZSBhbGxvd2VkLCB0aGV5IGFyZSBjdXN0b21pemVkIGJ5IHRoZSBwcm9qZWN0IHByZWZlcmVuY2VzLgorCSAqIDxsaT5JZiBwcm9qZWN0IGN1c3RvbWl6YXRpb25zIGFyZSBhbGxvd2VkLCB0aGV5IGFyZSBjdXN0b21pemVkIGJ5IHRoZQorCSAqIHByb2plY3QgcHJlZmVyZW5jZXMuCiAJICogPC9vbD4KIAkgKiAKIAkgKiBAcGFyYW0gcHJvamVjdAotCSAqICAgICAgICAgICAgVGhpcyBtYXkgYmUgbnVsbCwgaW4gd2hpY2ggY2FzZSBvbmx5IHRoZSBnbG9iYWwgcHJlZmVyZW5jZXMgYXJlIHVzZWQuCisJICogICAgICAgICAgICBUaGlzIG1heSBiZSBudWxsLCBpbiB3aGljaCBjYXNlIG9ubHkgdGhlIGdsb2JhbCBwcmVmZXJlbmNlcworCSAqICAgICAgICAgICAgYXJlIHVzZWQuCisJICogQHBhcmFtIHVzZVByb2plY3QKKwkgKiAgICAgICAgICAgIFNwZWNpZmllcyBob3cgdG8gdXNlIHRoZSBwcm9qZWN0IHByZWZlcmVuY2VzLiBUaGlzIGNhbiBiZSB1c2VkCisJICogICAgICAgICAgICB0byBmb3JjZSB0aGUgcHJvamVjdCBwcm9wZXJ0aWVzIHRvIGJlIHVzZWQuIFRoZXJlIGlzIGEgY2FzZQorCSAqICAgICAgICAgICAgd2hlcmUgdGhlIHVzZXIgaGFzIHRvZ2dsZWQgdGhlIEVuYWJsZSBwcm9qZWN0IHNwZWNpZmljCisJICogICAgICAgICAgICBzZXR0aW5ncyBjaGVja2JveCBpbiB0aGUgZGlhbG9nLCBidXQgaGFzIG5vdCB5ZXQgY29tbWl0dGVkIHRoZQorCSAqICAgICAgICAgICAgY2hhbmdlcy4gVGhpcyBhbGxvd3MgdGhhdCBzZXR0aW5nIHRvIGJlIHBhc3NlZCB0aHJvdWdoLgorCSAqICAgICAgICAgICAgCiAJICogQHJldHVybgogCSAqLwotCXByaXZhdGUgTWFwPFN0cmluZyxWYWxpZGF0b3I+IGdldFYyVmFsaWRhdG9ycyhJUHJvamVjdCBwcm9qZWN0KXsKKwlwcml2YXRlIE1hcDxTdHJpbmcsVmFsaWRhdG9yPiBnZXRWMlZhbGlkYXRvcnMoSVByb2plY3QgcHJvamVjdCwgVXNlUHJvamVjdFByZWZlcmVuY2VzIHVzZVByb2plY3QpewogCQlNYXA8U3RyaW5nLFZhbGlkYXRvcj4gZXh0VmFscyA9IEV4dGVuc2lvblZhbGlkYXRvcnMuaW5zdGFuY2UoKS5nZXRNYXBWMkNvcHkoKTsKIAkJdHJ5IHsKIAkJCUxpc3Q8VmFsaWRhdG9yPiB2YWxzID0gVmFsUHJlZk1hbmFnZXJHbG9iYWwuZ2V0RGVmYXVsdCgpLmdldFZhbGlkYXRvcnMoKTsKIAkJCWZvciAoVmFsaWRhdG9yIHYgOiB2YWxzKWV4dFZhbHMucHV0KHYuZ2V0SWQoKSwgdik7CiAJCQkKLQkJCWlmICghbXVzdFVzZUdsb2JhbFZhbGlkYXRvcnMocHJvamVjdCkpewotCQkJCS8vVE9ETyBzaG91bGQgcHJvYmFibHkgY2FjaGUgdGhpcyB2cG0KLQkJCQlWYWxQcmVmTWFuYWdlclByb2plY3QgdnBtID0gbmV3IFZhbFByZWZNYW5hZ2VyUHJvamVjdChwcm9qZWN0KTsKLQkJCQl2YWxzID0gdnBtLmdldFZhbGlkYXRvcnMoZXh0VmFscyk7Ci0JCQkJZm9yIChWYWxpZGF0b3IgdiA6IHZhbHMpZXh0VmFscy5wdXQodi5nZXRJZCgpLCB2KTsKLQkJCX0JCQorCQkJaWYgKHVzZVByb2plY3QgIT0gVXNlUHJvamVjdFByZWZlcmVuY2VzLk11c3ROb3RVc2UpeworCQkJCWlmICh1c2VQcm9qZWN0ID09IFVzZVByb2plY3RQcmVmZXJlbmNlcy5NdXN0VXNlIHx8ICFtdXN0VXNlR2xvYmFsVmFsaWRhdG9ycyhwcm9qZWN0KSl7CisJCQkJCS8vVE9ETyBzaG91bGQgcHJvYmFibHkgY2FjaGUgdGhpcyB2cG0KKwkJCQkJVmFsUHJlZk1hbmFnZXJQcm9qZWN0IHZwbSA9IG5ldyBWYWxQcmVmTWFuYWdlclByb2plY3QocHJvamVjdCk7CisJCQkJCXZhbHMgPSB2cG0uZ2V0VmFsaWRhdG9ycyhleHRWYWxzKTsKKwkJCQkJZm9yIChWYWxpZGF0b3IgdiA6IHZhbHMpZXh0VmFscy5wdXQodi5nZXRJZCgpLCB2KTsKKwkJCQkJCisJCQkJCWZvciAoVmFsaWRhdG9yIHYgOiBnZXRQcm9qZWN0UHJlZmVyZW5jZXMocHJvamVjdCkuZ2V0VmFsaWRhdG9ycygpKWV4dFZhbHMucHV0KHYuZ2V0SWQoKSwgdik7CisJCQkJfQkKKwkJCX0KIAkJfQogCQljYXRjaCAoQmFja2luZ1N0b3JlRXhjZXB0aW9uIGUpewogCQkJVmFsaWRhdGlvblBsdWdpbi5nZXRQbHVnaW4oKS5oYW5kbGVFeGNlcHRpb24oZSk7CkBAIC0yNDAsMTQgKzM3NSwxMSBAQAogCXB1YmxpYyBib29sZWFuIG11c3RVc2VHbG9iYWxWYWxpZGF0b3JzKElQcm9qZWN0IHByb2plY3QpewogCQlpZiAocHJvamVjdCA9PSBudWxsKXJldHVybiB0cnVlOwogCQlpZiAoIWdldEdsb2JhbFByZWZlcmVuY2VzKCkuZ2V0T3ZlcnJpZGUoKSlyZXR1cm4gdHJ1ZTsKLQkJUHJvamVjdFByZWZlcmVuY2VzIHBwID0gZ2V0UHJvamVjdFByZWZlcmVuY2VzMihwcm9qZWN0KTsKLQkJaWYgKHBwID09IG51bGwpewotCQkJVmFsUHJlZk1hbmFnZXJQcm9qZWN0IHZwbSA9IG5ldyBWYWxQcmVmTWFuYWdlclByb2plY3QocHJvamVjdCk7Ci0JCQlwcCA9IG5ldyBQcm9qZWN0UHJlZmVyZW5jZXMocHJvamVjdCk7IAotCQkJdnBtLmxvYWRQcm9qZWN0UHJlZmVyZW5jZXNTaGFsbG93KHBwKTsKLQkJfQorCQlQcm9qZWN0UHJlZmVyZW5jZXMgcHAgPSBfcHJvamVjdFByZWZlcmVuY2VzLmdldChwcm9qZWN0KTsKKwkJaWYgKHBwICE9IG51bGwpcmV0dXJuICFwcC5nZXRPdmVycmlkZSgpOwogCQkKLQkJcmV0dXJuICFwcC5nZXRPdmVycmlkZSgpOworCQlWYWxQcmVmTWFuYWdlclByb2plY3QgdnBtID0gbmV3IFZhbFByZWZNYW5hZ2VyUHJvamVjdChwcm9qZWN0KTsKKwkJcmV0dXJuICF2cG0uZ2V0T3ZlcnJpZGUoKTsKIAl9CiAJCiAJLyoqCkBAIC0zMTcsNyArNDQ5LDcgQEAKIAkJR2xvYmFsUHJlZmVyZW5jZXMgZ3AgPSBnZXRHbG9iYWxQcmVmZXJlbmNlcygpOwogCQlpZiAoIWdwLmdldE92ZXJyaWRlKCkgfHwgcHJvamVjdCA9PSBudWxsKXJldHVybiBncC5nZXREaXNhYmxlQWxsVmFsaWRhdGlvbigpOwogCQkKLQkJUHJvamVjdFByZWZlcmVuY2VzIHBwID0gZ2V0UHJvamVjdFByZWZlcmVuY2VzMihwcm9qZWN0KTsKKwkJUHJvamVjdFByZWZlcmVuY2VzIHBwID0gX3Byb2plY3RQcmVmZXJlbmNlcy5nZXQocHJvamVjdCk7CiAJCWlmIChwcCA9PSBudWxsKXJldHVybiBncC5nZXREaXNhYmxlQWxsVmFsaWRhdGlvbigpOwogCQlyZXR1cm4gcHAuZ2V0U3VzcGVuZCgpOwkJCiAJfQpAQCAtNDA4LDI2ICs1NDAsNDYgQEAKIAkgKiBUaGlzIG1ldGhvZCBuZWVkcyB0byBiZSBjYWxsZWQgd2hlbmV2ZXIgdGhlIHZhbGlkYXRpb24gY29uZmlndXJhdGlvbiBoYXMgY2hhbmdlZC4KIAkgKi8KIAlwcml2YXRlIHZvaWQgY29uZmlnSGFzQ2hhbmdlZCgpewotCQlfY29uZmlnTnVtYmVyKys7Ci0JCV9wcm9qZWN0TWFuYWdlci5yZXNldCgpOworCQlfY29uZmlnTnVtYmVyLmluY3JlbWVudEFuZEdldCgpOworCQlWYWxpZGF0b3JQcm9qZWN0TWFuYWdlci5yZXNldCgpOworCQlfY2FjaGUucmVzZXQoKTsKIAl9CiAJCQogCS8qKgogCSAqIEFuc3dlciB0aGUgZ2xvYmFsIHZhbGlkYXRpb24gcHJlZmVyZW5jZXMuCiAJICovCi0JcHVibGljIHN5bmNocm9uaXplZCBHbG9iYWxQcmVmZXJlbmNlcyBnZXRHbG9iYWxQcmVmZXJlbmNlcygpewotCQlHbG9iYWxQcmVmZXJlbmNlcyBncCA9IF9nbG9iYWxQcmVmZXJlbmNlczsKKwlwdWJsaWMgR2xvYmFsUHJlZmVyZW5jZXMgZ2V0R2xvYmFsUHJlZmVyZW5jZXMoKXsKKwkJR2xvYmFsUHJlZmVyZW5jZXMgZ3AgPSBfZ2xvYmFsUHJlZmVyZW5jZXMuZ2V0KCk7CiAJCWlmIChncCA9PSBudWxsKXsKIAkJCVZhbFByZWZNYW5hZ2VyR2xvYmFsIHZwbSA9IFZhbFByZWZNYW5hZ2VyR2xvYmFsLmdldERlZmF1bHQoKTsKLQkJCWdwID0gbmV3IEdsb2JhbFByZWZlcmVuY2VzKCk7Ci0JCQl2cG0ubG9hZEdsb2JhbFByZWZlcmVuY2VzKGdwKTsKLQkJCV9nbG9iYWxQcmVmZXJlbmNlcyA9IGdwOworCQkJZ3AgPSB2cG0ubG9hZEdsb2JhbFByZWZlcmVuY2VzKCk7CisJCQlpZiAoIV9nbG9iYWxQcmVmZXJlbmNlcy5jb21wYXJlQW5kU2V0KG51bGwsIGdwKSlncCA9IF9nbG9iYWxQcmVmZXJlbmNlcy5nZXQoKTsKIAkJfQotCQlyZXR1cm4gZ3A7CQkKKwkJcmV0dXJuIGdwOwogCX0KIAkKKwkvKioKKwkgKiBVcGRhdGUgdGhlIGdsb2JhbCBwcmVmZXJlbmNlcywgYnV0IG9ubHkgaWYgc29tZXRoaW5nIGhhcyBhY3R1YWxseSBjaGFuZ2VkLgorCSAqIEBwYXJhbSB2YWx1ZXMgVGhlIGdsb2JhbCBzZXR0aW5ncy4KKwkgKiBAcmV0dXJuIGEgYml0IG1hc2sgb2YgdGhlIGNoYW5nZXMgYmV0d2VlbiB0aGUgb2xkIHZhbHVlcyBhbmQgdGhlIG5ldyB2YWx1ZXMuIFNlZSB0aGUgR2xvYmFsUHJlZmVyZW5jZXMKKwkgKiBjb25zdGFudHMgZm9yIHRoZSBiaXQgbWFzayB2YWx1ZXMuIElmIGEgemVybyBpcyByZXR1cm4gdGhlcmUgd2VyZSBubyBjaGFuZ2VzLgorCSAqLworCXB1YmxpYyBpbnQgcmVwbGFjZShHbG9iYWxQcmVmZXJlbmNlc1ZhbHVlcyB2YWx1ZXMpeworCQlHbG9iYWxQcmVmZXJlbmNlcyBncCA9IG5ldyBHbG9iYWxQcmVmZXJlbmNlcyh2YWx1ZXMpOworCQlHbG9iYWxQcmVmZXJlbmNlcyBvbGQgPSBnZXRHbG9iYWxQcmVmZXJlbmNlcygpOworCQlpbnQgY2hhbmdlcyA9IG9sZC5jb21wYXJlKGdwKTsKKwkJaWYgKGNoYW5nZXMgIT0gMCl7CisJCQlfZ2xvYmFsUHJlZmVyZW5jZXMuc2V0KGdwKTsKKwkJfQorCQlyZXR1cm4gY2hhbmdlczsKKwl9CisJCQorCS8qKgorCSAqIEFuc3dlciB0aGUgcHJvamVjdCBwcmVmZXJlbmNlcyBmb3IgdGhpcyBwcm9qZWN0LgorCSAqIEBwYXJhbSBwcm9qZWN0IFRoZSBwcm9qZWN0LCB0aGlzIG1heSBiZSBudWxsLgorCSAqLwogCXB1YmxpYyBQcm9qZWN0UHJlZmVyZW5jZXMgZ2V0UHJvamVjdFByZWZlcmVuY2VzKElQcm9qZWN0IHByb2plY3QpIHsKLQkJUHJvamVjdFByZWZlcmVuY2VzIHBwID0gZ2V0UHJvamVjdFByZWZlcmVuY2VzMihwcm9qZWN0KTsKKwkJUHJvamVjdFByZWZlcmVuY2VzIHBwID0gX3Byb2plY3RQcmVmZXJlbmNlcy5nZXQocHJvamVjdCk7CiAJCWlmIChwcCAhPSBudWxsKXJldHVybiBwcDsKIAkJCiAJCS8qIGhvcGVmdWxseSB3ZSByYXJlbHkgZ2V0IHRoaXMgZmFyICovCkBAIC00NDUsMzQgKzU5NywyMiBAQAogCQlyZXR1cm4gcHA7CiAJfQogCi0JCisJLyoqCisJICogCisJICogQHBhcmFtIHByb2plY3QgVGhlIHByb2plY3QsIHRoaXMgbWF5IGJlIG51bGwuCisJICogQHBhcmFtIGJhc2VWYWxpZGF0b3JzCisJICovCiAJcHJpdmF0ZSBQcm9qZWN0UHJlZmVyZW5jZXMgZ2V0UHJvamVjdFByZWZlcmVuY2VzKElQcm9qZWN0IHByb2plY3QsIE1hcDxTdHJpbmcsIFZhbGlkYXRvcj4gYmFzZVZhbGlkYXRvcnMpIAogCQl0aHJvd3MgQmFja2luZ1N0b3JlRXhjZXB0aW9uIHsKLQkJaWYgKF9wcm9qZWN0UHJlZmVyZW5jZXMuY29udGFpbnNLZXkocHJvamVjdCkpewotCQkJcmV0dXJuIF9wcm9qZWN0UHJlZmVyZW5jZXMuZ2V0KHByb2plY3QpOwotCQl9CisJCVByb2plY3RQcmVmZXJlbmNlcyBwcCA9IF9wcm9qZWN0UHJlZmVyZW5jZXMuZ2V0KHByb2plY3QpOworCQlpZiAocHAgIT0gbnVsbClyZXR1cm4gcHA7CiAJCQogCQlWYWxQcmVmTWFuYWdlclByb2plY3QgdnBtID0gbmV3IFZhbFByZWZNYW5hZ2VyUHJvamVjdChwcm9qZWN0KTsKLQkJUHJvamVjdFByZWZlcmVuY2VzIHBwID0gbmV3IFByb2plY3RQcmVmZXJlbmNlcyhwcm9qZWN0KTsgCi0JCXZwbS5sb2FkUHJvamVjdFByZWZlcmVuY2VzKHBwLCBiYXNlVmFsaWRhdG9ycyk7CisJCXBwID0gdnBtLmxvYWRQcm9qZWN0UHJlZmVyZW5jZXMocHJvamVjdCwgYmFzZVZhbGlkYXRvcnMpOwogCQlfcHJvamVjdFByZWZlcmVuY2VzLnB1dChwcm9qZWN0LCBwcCk7CiAJCXJldHVybiBwcDsJCQogCX0KLQkKLQkvKioKLQkgKiBBbnN3ZXIgdGhlIHByb2plY3Qgc3BlY2lmaWMgdmFsaWRhdGlvbiBwcmVmZXJlbmNlcyBmcm9tIHRoZSBjYWNoZQotCSAqIAotCSAqIEBwYXJhbSBwcm9qZWN0Ci0JICogCi0JICogQHJldHVybiBudWxsIGlmIHRoZSBwcm9qZWN0IGlzIG5vdCBpbiB0aGUgY2FjaGUuCi0JICovCi0JcHJpdmF0ZSBQcm9qZWN0UHJlZmVyZW5jZXMgZ2V0UHJvamVjdFByZWZlcmVuY2VzMihJUHJvamVjdCBwcm9qZWN0KXsKLQkJaWYgKF9wcm9qZWN0UHJlZmVyZW5jZXMuY29udGFpbnNLZXkocHJvamVjdCkpewotCQkJcmV0dXJuIF9wcm9qZWN0UHJlZmVyZW5jZXMuZ2V0KHByb2plY3QpOwotCQl9Ci0JCXJldHVybiBudWxsOwotCX0KLQkKKwkJCiAJLyoqCiAJICogUmVzdG9yZSBhbGwgdGhlIHZhbGlkYXRpb24gZGVmYXVsdHMsIGFzIGRlZmluZWQgYnkgdGhlIGluZGl2aWR1YWwgdmFsaWRhdG9ycyB2aWEgdGhlCiAJICogdmFsaWRhdGlvbiBleHRlbnNpb24gcG9pbnQuCkBAIC01MjAsNyArNjYwLDkgQEAKIAkJCQlTdWJNb25pdG9yIHN1Yk1vbml0b3IgPSBTdWJNb25pdG9yLmNvbnZlcnQobW9uaXRvcik7CiAJCQkJU3RyaW5nIHRhc2sgPSBOTFMuYmluZChWYWxNZXNzYWdlcy5Mb2dWYWxTdGFydCwgdmFsaWRhdG9yLmdldE5hbWUoKSwgcmVzb3VyY2UuZ2V0TmFtZSgpKTsKIAkJCQlzdWJNb25pdG9yLmJlZ2luVGFzayh0YXNrLCAxKTsKLQkJCQl2YWxpZGF0ZSh2YWxpZGF0b3IsIG9wZXJhdGlvbiwgcmVzb3VyY2UsIGtpbmQsIHN1Yk1vbml0b3IubmV3Q2hpbGQoMSkpOworCisJCQkJaWYgKHByb2plY3QuaXNPcGVuKCkpCisJCQkJCXZhbGlkYXRlKHZhbGlkYXRvciwgb3BlcmF0aW9uLCByZXNvdXJjZSwga2luZCwgc3ViTW9uaXRvci5uZXdDaGlsZCgxKSwgbnVsbCk7CiAJCQl9CQkJCiAJCX07CiAJCVN1Yk1vbml0b3Igc20gPSBTdWJNb25pdG9yLmNvbnZlcnQobW9uaXRvciwgZ2V0VmFsaWRhdG9ycyhwcm9qZWN0KS5sZW5ndGgpOwpAQCAtNTQxLDcgKzY4Myw3IEBACiAJICogQHBhcmFtIG1vbml0b3IKIAkgKi8KIAlwdWJsaWMgdm9pZCB2YWxpZGF0ZShWYWxpZGF0b3IgdmFsaWRhdG9yLCBWYWxPcGVyYXRpb24gb3BlcmF0aW9uLCBJUmVzb3VyY2UgcmVzb3VyY2UsIGludCBraW5kLCAKLQkJCUlQcm9ncmVzc01vbml0b3IgbW9uaXRvcil7CisJCQlJUHJvZ3Jlc3NNb25pdG9yIG1vbml0b3IsIFZhbGlkYXRpb25FdmVudCBldmVudCl7CiAJCWlmIChvcGVyYXRpb24uaXNWYWxpZGF0ZWQodmFsaWRhdG9yLmdldElkKCksIHJlc291cmNlKSlyZXR1cm47CiAJCWxvbmcgdGltZSA9IDA7CiAJCWxvbmcgY3B1VGltZSA9IC0xOwpAQCAtNTU2LDI4ICs2OTgsMzMgQEAKIAkJaWYgKFRyYWNpbmcubWF0Y2hlc0V4dHJhRGV0YWlsKHZhbGlkYXRvci5nZXRJZCgpKSl7CiAJCQlUcmFjaW5nLmxvZygiVmFsTWFuYWdlci0wMzogdmFsaWRhdGluZyAiLCByZXNvdXJjZSk7IC8vJE5PTi1OTFMtMSQKIAkJfQotCQlWYWxpZGF0aW9uUmVzdWx0IHZyID0gdmFsaWRhdG9yLnZhbGlkYXRlKHJlc291cmNlLCBraW5kLCBvcGVyYXRpb24sIG1vbml0b3IpOwotCQlpZiAocG0uaXNDb2xsZWN0aW5nKCkpewotCQkJaWYgKGNwdVRpbWUgIT0gLTEpewotCQkJCWNwdVRpbWUgPSBNaXNjLmdldENQVVRpbWUoKSAtIGNwdVRpbWU7CisJCisJCWlmIChyZXNvdXJjZS5leGlzdHMoKSkKKwkJewkKKwkJCVZhbGlkYXRpb25SZXN1bHQgdnIgPSB2YWxpZGF0b3IudmFsaWRhdGUocmVzb3VyY2UsIGtpbmQsIG9wZXJhdGlvbiwgbW9uaXRvciwgZXZlbnQpOworCQorCQkJaWYgKHBtLmlzQ29sbGVjdGluZygpKXsKKwkJCQlpZiAoY3B1VGltZSAhPSAtMSl7CisJCQkJCWNwdVRpbWUgPSBNaXNjLmdldENQVVRpbWUoKSAtIGNwdVRpbWU7CisJCQkJfQorCQkJCWludCBudW0gPSAwOworCQkJCWlmICh2ciAhPSBudWxsKW51bSA9IHZyLmdldE51bWJlck9mVmFsaWRhdGVkUmVzb3VyY2VzKCk7CisJCQkJUGVyZm9ybWFuY2VDb3VudGVycyBwYyA9IG5ldyBQZXJmb3JtYW5jZUNvdW50ZXJzKHZhbGlkYXRvci5nZXRJZCgpLCAKKwkJCQkJdmFsaWRhdG9yLmdldE5hbWUoKSwgcmVzb3VyY2UuZ2V0TmFtZSgpLAorCQkJCQludW0sIFN5c3RlbS5jdXJyZW50VGltZU1pbGxpcygpLXRpbWUsIGNwdVRpbWUpOworCQkJCXBtLmFkZChwYyk7CiAJCQl9Ci0JCQlpbnQgbnVtID0gMDsKLQkJCWlmICh2ciAhPSBudWxsKW51bSA9IHZyLmdldE51bWJlck9mVmFsaWRhdGVkUmVzb3VyY2VzKCk7Ci0JCQlQZXJmb3JtYW5jZUNvdW50ZXJzIHBjID0gbmV3IFBlcmZvcm1hbmNlQ291bnRlcnModmFsaWRhdG9yLmdldElkKCksIAotCQkJCXZhbGlkYXRvci5nZXROYW1lKCksIHJlc291cmNlLmdldE5hbWUoKSwKLQkJCQludW0sIFN5c3RlbS5jdXJyZW50VGltZU1pbGxpcygpLXRpbWUsIGNwdVRpbWUpOwotCQkJcG0uYWRkKHBjKTsKLQkJfQotCQlpZiAoVmFsaWRhdGlvblBsdWdpbi5nZXRQbHVnaW4oKS5pc0RlYnVnZ2luZygpICYmICFwbS5pc0NvbGxlY3RpbmcoKSl7Ci0JCQlTdHJpbmcgbXNnID0gdGltZSAhPSAwID8gCi0JCQkJTkxTLmJpbmQoVmFsTWVzc2FnZXMuTG9nVmFsRW5kVGltZSwJbmV3IE9iamVjdFtde3ZhbGlkYXRvci5nZXROYW1lKCksIAotCQkJCQl2YWxpZGF0b3IuZ2V0SWQoKSwgcmVzb3VyY2UsIE1pc2MuZ2V0VGltZU1TKFN5c3RlbS5jdXJyZW50VGltZU1pbGxpcygpLXRpbWUpfSkgOgotCQkJCU5MUy5iaW5kKFZhbE1lc3NhZ2VzLkxvZ1ZhbEVuZCwgdmFsaWRhdG9yLmdldE5hbWUoKSwgcmVzb3VyY2UpOwotCQkJVHJhY2luZy5sb2coIlZhbE1hbmFnZXItMDE6ICIgKyBtc2cpOyAvLyROT04tTkxTLTEkCi0JCX0KLQkJaWYgKHZyICE9IG51bGwpewotCQkJb3BlcmF0aW9uLmdldFJlc3VsdCgpLm1lcmdlUmVzdWx0cyh2cik7Ci0JCQlpZiAodnIuZ2V0U3VzcGVuZFZhbGlkYXRpb24oKSAhPSBudWxsKW9wZXJhdGlvbi5zdXNwZW5kVmFsaWRhdGlvbih2ci5nZXRTdXNwZW5kVmFsaWRhdGlvbigpLCB2YWxpZGF0b3IpOworCQkJaWYgKFZhbGlkYXRpb25QbHVnaW4uZ2V0UGx1Z2luKCkuaXNEZWJ1Z2dpbmcoKSAmJiAhcG0uaXNDb2xsZWN0aW5nKCkpeworCQkJCVN0cmluZyBtc2cgPSB0aW1lICE9IDAgPyAKKwkJCQkJTkxTLmJpbmQoVmFsTWVzc2FnZXMuTG9nVmFsRW5kVGltZSwJbmV3IE9iamVjdFtde3ZhbGlkYXRvci5nZXROYW1lKCksIAorCQkJCQkJdmFsaWRhdG9yLmdldElkKCksIHJlc291cmNlLCBNaXNjLmdldFRpbWVNUyhTeXN0ZW0uY3VycmVudFRpbWVNaWxsaXMoKS10aW1lKX0pIDoKKwkJCQkJTkxTLmJpbmQoVmFsTWVzc2FnZXMuTG9nVmFsRW5kLCB2YWxpZGF0b3IuZ2V0TmFtZSgpLCByZXNvdXJjZSk7CisJCQkJVHJhY2luZy5sb2coIlZhbE1hbmFnZXItMDE6ICIgKyBtc2cpOyAvLyROT04tTkxTLTEkCisJCQl9CisJCQlpZiAodnIgIT0gbnVsbCl7CisJCQkJb3BlcmF0aW9uLm1lcmdlUmVzdWx0cyh2cik7CisJCQkJaWYgKHZyLmdldFN1c3BlbmRWYWxpZGF0aW9uKCkgIT0gbnVsbClvcGVyYXRpb24uc3VzcGVuZFZhbGlkYXRpb24odnIuZ2V0U3VzcGVuZFZhbGlkYXRpb24oKSwgdmFsaWRhdG9yKTsKKwkJCX0KIAkJfQogCX0KIAkKQEAgLTU5Nyw3ICs3NDQsNyBAQAogCQkKIAkJZm9yIChWYWxpZGF0b3IgdmFsIDogZ2V0VmFsaWRhdG9ycyhwcm9qZWN0KSl7CiAJCQlpZiAobW9uaXRvci5pc0NhbmNlbGVkKCkpcmV0dXJuOwotCQkJaWYgKCFfcHJvamVjdE1hbmFnZXIuc2hvdWxkVmFsaWRhdGUodmFsLCBwcm9qZWN0LCB2YWxUeXBlKSljb250aW51ZTsKKwkJCWlmICghVmFsaWRhdG9yUHJvamVjdE1hbmFnZXIuZ2V0KCkuc2hvdWxkVmFsaWRhdGUodmFsLCBwcm9qZWN0LCB2YWxUeXBlKSljb250aW51ZTsKIAkJCWlmIChvcGVyYXRpb24uaXNTdXNwZW5kZWQodmFsLCBwcm9qZWN0KSljb250aW51ZTsKIAkJCXRyeSB7CiAJCQkJdmlzaXRvci52aXNpdCh2YWwsIHByb2plY3QsIHZhbFR5cGUsIG9wZXJhdGlvbiwgbW9uaXRvcik7CkBAIC02MjEsMTIgKzc2OCwxMyBAQAogCQkKIAkJTWFwPFN0cmluZyxJVmFsaWRhdG9yR3JvdXBMaXN0ZW5lcltdPiBncm91cExpc3RlbmVycyA9IG5ldyBIYXNoTWFwPFN0cmluZyxJVmFsaWRhdG9yR3JvdXBMaXN0ZW5lcltdPigpOwogCQkKLQkJVmFsUHJvcGVydHkgdnAgPSBnZXRWYWxQcm9wZXJ0eShyZXNvdXJjZSwgdmFsVHlwZSwgX2NvbmZpZ051bWJlcik7CisJCVZhbFByb3BlcnR5IHZwID0gZ2V0VmFsUHJvcGVydHkocmVzb3VyY2UsIHZhbFR5cGUsIF9jb25maWdOdW1iZXIuZ2V0KCkpOwogCQlpZiAodnAgIT0gbnVsbCl7CiAJCQlCaXRTZXQgYnMgPSB2cC5nZXRDb25maWdTZXQoKTsKIAkJCWZvciAoVmFsaWRhdG9yIHZhbCA6IGdldFZhbGlkYXRvcnMocHJvamVjdCkpewogCQkJCWlmICghbW9uaXRvci5pc0NhbmNlbGVkKCkpIHsKIAkJCQkJaWYgKCFicy5nZXQoX2lkTWFuYWdlci5nZXRJbmRleCh2YWwuZ2V0SWQoKSkpKWNvbnRpbnVlOworCQkJCQlpZiAob3BlcmF0aW9uLmlzU3VzcGVuZGVkKHZhbCwgcHJvamVjdCkpY29udGludWU7CiAJCQkJCVZhbGlkYXRvci5WMiB2MiA9IHZhbC5hc1YyVmFsaWRhdG9yKCk7CiAJCQkJCWlmICh2MiAhPSBudWxsKSB7CiAJCQkJCQlub3RpZnlHcm91cExpc3RlbmVyc1N0YXJ0aW5nKHJlc291cmNlLCBvcGVyYXRpb24uZ2V0U3RhdGUoKSwgbW9uaXRvciwgZ3JvdXBMaXN0ZW5lcnMsIHYyKTsKQEAgLTY0NCwxMSArNzkyLDExIEBACiAJCX0KIAkJCiAJCXZwID0gbmV3IFZhbFByb3BlcnR5KCk7Ci0JCXZwLnNldENvbmZpZ051bWJlcihfY29uZmlnTnVtYmVyKTsKKwkJdnAuc2V0Q29uZmlnTnVtYmVyKF9jb25maWdOdW1iZXIuZ2V0KCkpOwogCQlDb250ZW50VHlwZVdyYXBwZXIgY3R3ID0gbmV3IENvbnRlbnRUeXBlV3JhcHBlcigpOwogCQlmb3IgKFZhbGlkYXRvciB2YWwgOiBnZXRWYWxpZGF0b3JzKHByb2plY3QpKXsKIAkJCWlmICghbW9uaXRvci5pc0NhbmNlbGVkKCkpIHsKLQkJCQlpZiAoIV9wcm9qZWN0TWFuYWdlci5zaG91bGRWYWxpZGF0ZSh2YWwsIHByb2plY3QsIHZhbFR5cGUpKWNvbnRpbnVlOworCQkJCWlmICghVmFsaWRhdG9yUHJvamVjdE1hbmFnZXIuZ2V0KCkuc2hvdWxkVmFsaWRhdGUodmFsLCBwcm9qZWN0LCB2YWxUeXBlKSljb250aW51ZTsKIAkJCQlpZiAoRnJpZW5kLnNob3VsZFZhbGlkYXRlKHZhbCwgcmVzb3VyY2UsIHZhbFR5cGUsIGN0dykpewogCQkJCQl2cC5nZXRDb25maWdTZXQoKS5zZXQoX2lkTWFuYWdlci5nZXRJbmRleCh2YWwuZ2V0SWQoKSkpOwogCQkJCQkvLyB3ZSBkbyB0aGUgc3VzcGVuZCBjaGVjayBhZnRlciBmaWd1cmluZyBvdXQgaWYgaXQgbmVlZHMgdG8gYmUgdmFsaWRhdGVkLCBiZWNhdXNlIHdlIHNhdmUKQEAgLTc0Niw3ICs4OTQsNyBAQAogCQkJLy8gZG9uJ3QgY2FyZSBhYm91dCB0aGlzIG9uZQogCQl9CiAJCWlmICh2cCA9PSBudWxsKXJldHVybiBudWxsOwotCQlpZiAodnAuZ2V0Q29uZmlnTnVtYmVyKCkgIT0gX2NvbmZpZ051bWJlcilyZXR1cm4gbnVsbDsKKwkJaWYgKHZwLmdldENvbmZpZ051bWJlcigpICE9IF9jb25maWdOdW1iZXIuZ2V0KCkpcmV0dXJuIG51bGw7CiAJCXJldHVybiB2cDsKIAl9CiAJCkBAIC03NTYsNyArOTA0LDkgQEAKIAkgKiBAcGFyYW0gcHJvamVjdCBUaGUgcHJvamVjdCB0aGF0IGhhcyBiZWVuIG9wZW5lZCwgY3JlYXRlZCwgb3IgaGFkIGl0J3MgZGVzY3JpcHRpb24gY2hhbmdlLgogCSAqLwogCXB1YmxpYyB2b2lkIHByb2plY3RDaGFuZ2VkKElQcm9qZWN0IHByb2plY3QpewotCQlfcHJvamVjdE1hbmFnZXIuY2hhbmdlKHByb2plY3QpOwkJCisJCVZhbGlkYXRvclByb2plY3RNYW5hZ2VyLnJlc2V0KCk7CisJCV9wcm9qZWN0UHJlZmVyZW5jZXMucmVtb3ZlKHByb2plY3QpOworCQlfY2FjaGUucmVzZXQocHJvamVjdCk7CiAJfQogCQogCS8qKgpAQCAtNzY2LDE2ICs5MTYsMjQgQEAKIAkgKiAKIAkgKi8KIAlwdWJsaWMgdm9pZCBwcm9qZWN0UmVtb3ZlZChJUHJvamVjdCBwcm9qZWN0KXsKLQkJX3Byb2plY3RNYW5hZ2VyLnJlbW92ZShwcm9qZWN0KTsKKwkJVmFsaWRhdG9yUHJvamVjdE1hbmFnZXIucmVzZXQoKTsKKwkJX3Byb2plY3RQcmVmZXJlbmNlcy5yZW1vdmUocHJvamVjdCk7CisJCV9jYWNoZS5yZXNldChwcm9qZWN0KTsKIAl9CiAJCiAJcHJpdmF0ZSB2b2lkIHB1dFZhbFByb3BlcnR5KFZhbFByb3BlcnR5IHZwLCBJUmVzb3VyY2UgcmVzb3VyY2UsIFZhbFR5cGUgdmFsVHlwZSkgewogCQl0cnkgeworCQkJaWYgKCEocmVzb3VyY2UuaXNBY2Nlc3NpYmxlKCkpKSByZXR1cm47CiAJCQlpZiAodmFsVHlwZSA9PSBWYWxUeXBlLkJ1aWxkKXJlc291cmNlLnNldFNlc3Npb25Qcm9wZXJ0eShTdGF0dXNCdWlsZCwgdnApOwogCQkJZWxzZSBpZiAodmFsVHlwZSA9PSBWYWxUeXBlLk1hbnVhbClyZXNvdXJjZS5zZXRTZXNzaW9uUHJvcGVydHkoU3RhdHVzTWFudWFsLCB2cCk7Ci0JCX0KLQkJY2F0Y2ggKENvcmVFeGNlcHRpb24gZSl7Ci0JCQlWYWxpZGF0aW9uUGx1Z2luLmdldFBsdWdpbigpLmhhbmRsZUV4Y2VwdGlvbihlKTsKKwkJfSAKKwkJY2F0Y2ggKENvcmVFeGNlcHRpb24gZSkgeworCSAgICAgICAgLy8gSWYgdGhlIHJlc291cmNlIGlzIG5vdCBmb3VuZCwgaXQgaXMgbGlrZWx5IGp1c3QgYmVlbiBkZWxldGVkIAorCSAgICAgICAgLy8gYW5kIHRoZXJlIGlzIG5vIG5lZWQgdG8gZG8gYW55dGhpbmcuIAorCSAgICAgICAgLy8gU2VlIGh0dHBzOi8vYnVncy5lY2xpcHNlLm9yZy9idWdzL3Nob3dfYnVnLmNnaT9pZD0yNjkwMjIKKwkgICAgICAgIGlmICghZS5nZXRTdGF0dXMoKS5lcXVhbHMoSVJlc291cmNlU3RhdHVzLlJFU09VUkNFX05PVF9GT1VORCkpIHsKKwkgICAgICAgICAgICAgICAgVmFsaWRhdGlvblBsdWdpbi5nZXRQbHVnaW4oKS5oYW5kbGVFeGNlcHRpb24oZSwgSVN0YXR1cy5XQVJOSU5HKTsKKwkgICAgICAgIH0KIAkJfQogCX0KIApAQCAtNzkwLDcgKzk0OCw3IEBACiAKIAkJCXB1YmxpYyB2b2lkIHZpc2l0KFZhbGlkYXRvciB2YWxpZGF0b3IsIElQcm9qZWN0IHByb2plY3QsIFZhbFR5cGUgdmFsVHlwZSwKIAkJCQlWYWxPcGVyYXRpb24gb3BlcmF0aW9uLCBJUHJvZ3Jlc3NNb25pdG9yIG1vbml0b3IpIHsKLQkJCQl2YWxpZGF0b3IuY2xlYW4ocHJvamVjdCwgbW9uaXRvcik7CQkJCQkKKwkJCQl2YWxpZGF0b3IuY2xlYW4ocHJvamVjdCwgb3BlcmF0aW9uLCBtb25pdG9yKTsJCQkJCQogCQkJfQogCQkJCiAJCX07CkBAIC04MDgsNyArOTY2LDcgQEAKIAogCQkJcHVibGljIHZvaWQgdmlzaXQoVmFsaWRhdG9yIHZhbGlkYXRvciwgSVByb2plY3QgcHJvamVjdCwgVmFsVHlwZSB2YWxUeXBlLAogCQkJCVZhbE9wZXJhdGlvbiBvcGVyYXRpb24sIElQcm9ncmVzc01vbml0b3IgbW9uaXRvcikgewotCQkJCXZhbGlkYXRvci5jbGVhbihwcm9qZWN0LCBtb25pdG9yKTsJCQkJCQorCQkJCXZhbGlkYXRvci5jbGVhbihwcm9qZWN0LCBvcGVyYXRpb24sIG1vbml0b3IpOwkJCQkJCiAJCQl9CiAJCQkKIAkJfTsKQEAgLTgyNCwxMSArOTgyLDExIEBACiAJCX0KIAl9CiAJCi0JcHJpdmF0ZSBjbGFzcyBIYXNWYWxpZGF0b3JWaXNpdG9yIGltcGxlbWVudHMgSVJlc291cmNlVmlzaXRvciB7CisJcHJpdmF0ZSBmaW5hbCBjbGFzcyBIYXNWYWxpZGF0b3JWaXNpdG9yIGltcGxlbWVudHMgSVJlc291cmNlVmlzaXRvciB7CiAJCQotCQlwcml2YXRlIGJvb2xlYW4gCV9oYXNWYWxpZGF0b3I7Ci0JCXByaXZhdGUgYm9vbGVhbgkJX2lzTWFudWFsOwotCQlwcml2YXRlIGJvb2xlYW4JCV9pc0J1aWxkOworCQlwcml2YXRlIGJvb2xlYW4gCQkJX2hhc1ZhbGlkYXRvcjsKKwkJcHJpdmF0ZSBmaW5hbCBib29sZWFuCQlfaXNNYW51YWw7CisJCXByaXZhdGUgZmluYWwgYm9vbGVhbgkJX2lzQnVpbGQ7CiAJCQogCQlwdWJsaWMgSGFzVmFsaWRhdG9yVmlzaXRvcihib29sZWFuIGlzTWFudWFsLCBib29sZWFuIGlzQnVpbGQpewogCQkJX2lzTWFudWFsID0gaXNNYW51YWw7CkBAIC04NjEsMTMgKzEwMTksMTMgQEAKIAkgKiBAYXV0aG9yIGthcmFzaXVrCiAJICoKIAkgKi8KLQlwcml2YXRlIHN0YXRpYyBjbGFzcyBWYWxpZGF0b3JJZE1hbmFnZXIgeworCXByaXZhdGUgZmluYWwgc3RhdGljIGNsYXNzIFZhbGlkYXRvcklkTWFuYWdlciB7CiAJCQogCQkvKioKIAkJICogTWFwIHZhbGlkYXRvciBpZCdzIHRvIEludGVnZXJzLiBUaGUgaW50ZWdlcnMgY29ycmVzcG9uZCB0byBiaXRzIGluIHRoZSBWYWxQcm9wZXJ0eSBpbnN0YW5jZXMuCiAJCSAqLwotCQlwcml2YXRlIEhhc2hNYXA8U3RyaW5nLCBJbnRlZ2VyPiBfbWFwID0gbmV3IEhhc2hNYXA8U3RyaW5nLCBJbnRlZ2VyPigxMDApOwotCQlwcml2YXRlIEhhc2hNYXA8SW50ZWdlciwgU3RyaW5nPiBfcmV2ZXJzZU1hcCA9IG5ldyBIYXNoTWFwPEludGVnZXIsIFN0cmluZz4oMTAwKTsKKwkJcHJpdmF0ZSBmaW5hbCBNYXA8U3RyaW5nLCBJbnRlZ2VyPiBfbWFwID0gbmV3IEhhc2hNYXA8U3RyaW5nLCBJbnRlZ2VyPigxMDApOworCQlwcml2YXRlIGZpbmFsIE1hcDxJbnRlZ2VyLCBTdHJpbmc+IF9yZXZlcnNlTWFwID0gbmV3IEhhc2hNYXA8SW50ZWdlciwgU3RyaW5nPigxMDApOwogCQkKIAkJLyoqIE5leHQgYXZhaWxhYmxlIGJpdC4gKi8KIAkJcHJpdmF0ZSBpbnQgX25leHQ7CkBAIC04NzcsNyArMTAzNSw3IEBACiAJCSAqIEBwYXJhbSBpZCB2YWxpZGF0b3IgaWQuCiAJCSAqIEByZXR1cm4gaW5kZXggaW50byB0aGUgdmFsaWRhdG9yIGJpdCBtYXNrLgogCQkgKi8KLQkJcHVibGljIGludCBnZXRJbmRleChTdHJpbmcgaWQpeworCQlwdWJsaWMgc3luY2hyb25pemVkIGludCBnZXRJbmRleChTdHJpbmcgaWQpewogCQkJSW50ZWdlciBpID0gX21hcC5nZXQoaWQpOwogCQkJaWYgKGkgIT0gbnVsbClyZXR1cm4gaTsKIAkJCQpAQCAtODkzLDExICsxMDUxLDExIEBACiAJCSAqIEBwYXJhbSBpbmRleAogCQkgKiBAcmV0dXJuIG51bGwgaWYgdGhlIGluZGV4IG51bWJlciBoYXMgbm90IGJlZW4gc2V0LgogCQkgKi8KLQkJcHVibGljIFN0cmluZyBnZXRJZChJbnRlZ2VyIGluZGV4KXsKKwkJcHVibGljIHN5bmNocm9uaXplZCBTdHJpbmcgZ2V0SWQoSW50ZWdlciBpbmRleCl7CiAJCQlyZXR1cm4gX3JldmVyc2VNYXAuZ2V0KGluZGV4KTsKIAkJfQogCQkKLQkJcHVibGljIHZvaWQgcmVzZXQoKXsKKwkJcHVibGljIHN5bmNocm9uaXplZCB2b2lkIHJlc2V0KCl7CiAJCQlfbWFwLmNsZWFyKCk7CiAJCQlfcmV2ZXJzZU1hcC5jbGVhcigpOwogCQkJX25leHQgPSAwOwpAQCAtOTA3LDcgKzEwNjUsNyBAQAogCQkgKiBBbnN3ZXIgdGhlIGlkcyBmb3IgdGhlIGJpdCBpbiB0aGUgYml0c2V0LiBUaGlzIGlzIHVzZWQgZm9yIGRlYnVnZ2luZy4gCiAJCSAqIEBwYXJhbSBicwogCQkgKi8KLQkJcHVibGljIFN0cmluZ1tdIGdldElkcyhCaXRTZXQgYnMpeworCQlwdWJsaWMgc3luY2hyb25pemVkIFN0cmluZ1tdIGdldElkcyhCaXRTZXQgYnMpewogCQkJTGlzdDxTdHJpbmc+IGxpc3QgPSBuZXcgTGlua2VkTGlzdDxTdHJpbmc+KCk7CiAJCQlmb3IoaW50IGk9YnMubmV4dFNldEJpdCgwKTsgaT49MDsgaT1icy5uZXh0U2V0Qml0KGkrMSkpIHsKIAkJCQlTdHJpbmcgaWQgPSBnZXRJZChpKTsKQEAgLTkyMSwxNCArMTA3OSw1OSBAQAogCS8qKgogCSAqIFRoaXMgaXMgdXNlZCB0byBrZWVwIHRyYWNrIG9mIHdoaWNoIHZhbGlkYXRvcnMgYXJlIGVuYWJsZWQgd2l0aCB3aGljaCBwcm9qZWN0cy4gV2Ugd2FudCB0byBlbnN1cmUKIAkgKiB0aGF0IHdlIGRvbid0IGFjdGl2YXRlIGEgdmFsaWRhdG9yIChhbmQgaXQncyBwbHVnLWluKSBpZiBpdCBoYXMgbm90aGluZyB0byB2YWxpZGF0ZSBpbiB0aGUgd29ya3NwYWNlLgotCSAqIFRoZSBWYWxNYW5hZ2VyIGtlZXBzIGEgc2luZ2xlIGluc3RhbmNlIG9mIHRoaXMgY2xhc3MuIAorCSAqIFRoaXMgaXMgYW4gaW1tdXRhYmxlIG9iamVjdC4KIAkgKiBAYXV0aG9yIGthcmFzaXVrCiAJICoKIAkgKi8KLQlwcml2YXRlIHN0YXRpYyBjbGFzcyBWYWxpZGF0b3JQcm9qZWN0TWFuYWdlciB7CisJcHJpdmF0ZSBmaW5hbCBzdGF0aWMgY2xhc3MgVmFsaWRhdG9yUHJvamVjdE1hbmFnZXIgewogCQkKLQkJcHJpdmF0ZSBWYWxQcm9qZWN0TWFwIF9tYW51YWwgPSBuZXcgVmFsUHJvamVjdE1hcChWYWxUeXBlLk1hbnVhbCk7Ci0JCXByaXZhdGUgVmFsUHJvamVjdE1hcCBfYnVpbGQgPSBuZXcgVmFsUHJvamVjdE1hcChWYWxUeXBlLkJ1aWxkKTsKKwkJcHJpdmF0ZSBmaW5hbCBzdGF0aWMgQXRvbWljUmVmZXJlbmNlPFZhbGlkYXRvclByb2plY3RNYW5hZ2VyPiBfbWUgPSBuZXcgQXRvbWljUmVmZXJlbmNlPFZhbGlkYXRvclByb2plY3RNYW5hZ2VyPigpOworCQlwcml2YXRlIGZpbmFsIHN0YXRpYyBBdG9taWNJbnRlZ2VyIF9jb3VudGVyID0gbmV3IEF0b21pY0ludGVnZXIoKTsKKwkJCisJCXByaXZhdGUgZmluYWwgVmFsUHJvamVjdE1hcCBfbWFudWFsID0gbmV3IFZhbFByb2plY3RNYXAoVmFsVHlwZS5NYW51YWwpOworCQlwcml2YXRlIGZpbmFsIFZhbFByb2plY3RNYXAgX2J1aWxkID0gbmV3IFZhbFByb2plY3RNYXAoVmFsVHlwZS5CdWlsZCk7CisJCXByaXZhdGUgZmluYWwgaW50IF9zZXF1ZW5jZTsKKwkJCisJCS8qKgorCQkgKiBBbnN3ZXIgdGhlIG1vc3QgY3VycmVudCBWYWxpZGF0b3JQcm9qZWN0TWFuYWdlciBjcmVhdGluZyBhIG5ldyBvbmUgaWYgeW91IGhhdmUgdG8uCisJCSAqIEByZXR1cm4KKwkJICovCisJCXB1YmxpYyBzdGF0aWMgVmFsaWRhdG9yUHJvamVjdE1hbmFnZXIgZ2V0KCl7CisJCQlWYWxpZGF0b3JQcm9qZWN0TWFuYWdlciB2cG0gPSBfbWUuZ2V0KCk7CisJCQlpZiAodnBtICE9IG51bGwpcmV0dXJuIHZwbTsKKwkJCQorCQkJaW50IG5leHQgPSBfY291bnRlci5pbmNyZW1lbnRBbmRHZXQoKTsKKwkJCVZhbGlkYXRvclByb2plY3RNYW5hZ2VyIG5ld1ZwbSA9IG51bGw7CisJCQlib29sZWFuIGxvb2tpbmcgPSB0cnVlOworCQkJd2hpbGUobG9va2luZyl7CisJCQkJdnBtID0gX21lLmdldCgpOworCQkJCWlmICh2cG0gPT0gbnVsbCB8fCBuZXh0ID4gdnBtLmdldFNlcXVlbmNlKCkpeworCQkJCQlpZiAobmV3VnBtID09IG51bGwpbmV3VnBtID0gbmV3IFZhbGlkYXRvclByb2plY3RNYW5hZ2VyKG5leHQpOworCQkJCQlpZiAoX21lLmNvbXBhcmVBbmRTZXQodnBtLCBuZXdWcG0pKXJldHVybiBuZXdWcG07CisJCQkJfQorCQkJCWVsc2UgbG9va2luZyA9IGZhbHNlOworCQkJfQorCQkJcmV0dXJuIHZwbTsKKwkJfQorCQkKKwkJLyoqCisJCSAqIFJlc2V0IHRoZSBWYWxpZGF0b3JQcm9qZWN0TWFuYWdlciB0byBudWxsLCB3aGljaCB3aWxsIGZvcmNlIGEgbmV3ZXIgb25lIHRvIGJlIGNyZWF0ZWQgdGhlIG5leHQgdGltZQorCQkgKiB0aGF0IGl0IGlzIHJlcXVlc3RlZC4KKwkJICovCisJCXB1YmxpYyBzdGF0aWMgdm9pZCByZXNldCgpeworCQkJaW50IG5leHQgPSBfY291bnRlci5pbmNyZW1lbnRBbmRHZXQoKTsKKwkJCVZhbGlkYXRvclByb2plY3RNYW5hZ2VyIHZwbSA9IF9tZS5nZXQoKTsKKwkJCWlmICggdnBtID09IG51bGwpcmV0dXJuOworCQkJaWYgKG5leHQgPiB2cG0uZ2V0U2VxdWVuY2UoKSlfbWUuY29tcGFyZUFuZFNldCh2cG0sIG51bGwpOworCQl9CisJCQorCQlwcml2YXRlIFZhbGlkYXRvclByb2plY3RNYW5hZ2VyKGludCBzZXF1ZW5jZSl7CisJCQlfc2VxdWVuY2UgPSBzZXF1ZW5jZTsKKwkJfQorCQkKKwkJaW50IGdldFNlcXVlbmNlKCl7CisJCQlyZXR1cm4gX3NlcXVlbmNlOworCQl9CiAJCQogCQkvKioKIAkJICogU2hvdWxkIHRoaXMgdmFsaWRhdG9yIGF0dGVtcHQgdG8gdmFsaWRhdGUgYW55IHJlc291cmNlcyBpbiB0aGlzIHByb2plY3Q/CkBAIC05NDIsNTUgKzExNDUsNDEgQEAKIAkJICogICAgICAgICAgICBUaGUgdHlwZSBvZiB2YWxpZGF0aW9uIG9wZXJhdGlvbi4KIAkJICogQHJldHVybiB0cnVlIGlmIHRoZSB2YWxpZGF0b3Igc2hvdWxkIGF0dGVtcHQgdG8gdmFsaWRhdGUuCiAJCSAqLwotCQlwdWJsaWMgc3luY2hyb25pemVkIGJvb2xlYW4gc2hvdWxkVmFsaWRhdGUoVmFsaWRhdG9yIHZhbGlkYXRvciwgSVByb2plY3QgcHJvamVjdCwgVmFsVHlwZSB0eXBlKXsKKwkJcHVibGljIGJvb2xlYW4gc2hvdWxkVmFsaWRhdGUoVmFsaWRhdG9yIHZhbGlkYXRvciwgSVByb2plY3QgcHJvamVjdCwgVmFsVHlwZSB0eXBlKXsKIAkJCWlmICh0eXBlID09IFZhbFR5cGUuQnVpbGQpcmV0dXJuIF9idWlsZC5zaG91bGRWYWxpZGF0ZSh2YWxpZGF0b3IsIHByb2plY3QpOwogCQkJaWYgKHR5cGUgPT0gVmFsVHlwZS5NYW51YWwpcmV0dXJuIF9tYW51YWwuc2hvdWxkVmFsaWRhdGUodmFsaWRhdG9yLCBwcm9qZWN0KTsKIAkJCQkKIAkJCXJldHVybiBmYWxzZTsKLQkJfQotCQkKLQkJLyoqCi0JCSAqIEEgcHJvamVjdCBoYXMgYmVlbiBjcmVhdGVkLCBvcGVuZWQsIG9yIGhhZCBpdCdzIGRlc2NyaXB0aW9uIGNoYW5nZWQuCi0JCSAqIEBwYXJhbSBwcm9qZWN0Ci0JCSAqLwotCQlwdWJsaWMgdm9pZCBjaGFuZ2UoSVByb2plY3QgcHJvamVjdCkgewotCQkJcmVzZXQoKTsKLQkJfQotCQkKLQkJcHVibGljIHZvaWQgcmVtb3ZlKElQcm9qZWN0IHByb2plY3QpIHsKLQkJCXJlc2V0KCk7Ci0JCX0KLQkJCi0JCQotCQlwdWJsaWMgc3luY2hyb25pemVkIHZvaWQgcmVzZXQoKXsKLQkJCV9idWlsZC5yZXNldCgpOwotCQkJX21hbnVhbC5yZXNldCgpOwotCQl9Ci0JCQorCQl9CQkKKwkJCQkKIAkJLyoqCiAJCSAqIFRoaXMgaXMgdXNlZCB0byBrZWVwIHRyYWNrIG9mIHdoaWNoIHZhbGlkYXRvcnMgYXJlIGVuYWJsZWQgZm9yIHdoaWNoIHByb2plY3RzLiBXZSB3YW50IHRvIGVuc3VyZQogCQkgKiB0aGF0IHdlIGRvbid0IGFjdGl2YXRlIGEgdmFsaWRhdG9yIChhbmQgaXQncyBwbHVnLWluKSBpZiBpdCBoYXMgbm90aGluZyB0byB2YWxpZGF0ZSBpbiB0aGUgd29ya3NwYWNlLgorCQkgKiA8cD4KKwkJICogVGhlcmUgYXJlIHR3byByZWFzb25zIHdoeSBhIHZhbGlkYXRvciBtYXkgbm90IGJlIGVuYWJsZWQuIEl0J3MgY3VycmVudCBwcm9qZWN0IGxldmVsIGZpbHRlcnMgbWF5IG5vdCBtYXRjaAorCQkgKiB0aGUgcHJvamVjdC4gT3IgdGhlIGVudGlyZSB2YWxpZGF0b3IgbWF5IGhhdmUgYmVlbiB0dXJuZWQgb2ZmIGZvciB0aGUgcHJvamVjdC4gCisJCSAqIDwvcD4KIAkJICogQGF1dGhvciBrYXJhc2l1awogCQkgKgogCQkgKi8KLQkJcHJpdmF0ZSBzdGF0aWMgY2xhc3MgVmFsUHJvamVjdE1hcCB7CisJCXByaXZhdGUgZmluYWwgc3RhdGljIGNsYXNzIFZhbFByb2plY3RNYXAgewogCQkJLyoqCi0JCQkgKiBNYXAgYSB2YWxpZGF0b3IgdG8gdGhlIHByb2plY3RzIHRoYXQgaXQgdmFsaWRhdGVzLiAKKwkJCSAqIE1hcCBhIHZhbGlkYXRvciB0byB0aGUgcHJvamVjdHMgdGhhdCBpdCB2YWxpZGF0ZXMuIFRoaXMgaXMgYW4gaW1tdXRhYmxlIG9iamVjdC4KIAkJCSAqIDxwPgogCQkJICogSSd2ZSBnb25lIGJhY2sgYW5kIGZvcnRoIG9uIHdoZXRoZXIgdGhlIGtleSBzaG91bGQKIAkJCSAqIGJlIGEgVmFsaWRhdG9yIG9yIHRoZSB2YWxpZGF0b3IgaWQuIEknbSBiYWNrIHRvIGl0IGJlaW5nIHRoZSBpZCBiZWNhdXNlIEkgd2FzCi0JCQkgKiBydW5uaW5nIGludG8gY2FzZXMgd2hlcmUgYmVjYXVzZSBvZiBjb3B5aW5nIEkgd2Fzbid0IGdldHRpbmcgdGhlIG1hdGNoZXMgdGhhdCBJIGV4cGVjdGVkLiBJZiBJIHJ1biBpbnRvCisJCQkgKiBydW5uaW5nIGludG8gY2FzZXMgd2hlcmUgYmVjYXVzZSBvZiBjb3B5aW5nIEkgd2Fzbid0IGdldHRpbmcgdGhlIG1hdGNoZXMgdGhhdCBJIGV4cGVjdGVkIGFuZCBJCisJCQkgKiB3YW50IHRvIGVuc3VyZSB0aGF0IEkgZG9uJ3QgbGVhayB2YWxpZGF0b3JzLiBJZiBJIHJ1biBpbnRvCiAJCQkgKiBmYWxzZSBtYXRjaGVzLCBpdCBpcyBwcm9iYWJseSBiZWNhdXNlIHJlc2V0IGlzbid0IGJlaW5nIGNhbGxlZCB3aGVuIGl0IHNob3VsZCBiZS4KKwkJCSAqIDwvcD4KIAkJCSAqLwotCQkJcHJpdmF0ZSBNYXA8U3RyaW5nLCBTZXQ8SVByb2plY3Q+PiBfbWFwID0gbmV3IEhhc2hNYXA8U3RyaW5nLCBTZXQ8SVByb2plY3Q+Pig1MCk7CisJCQlwcml2YXRlIGZpbmFsIE1hcDxTdHJpbmcsIFNldDxJUHJvamVjdD4+IF9tYXA7CiAJCQkKLQkJCXByaXZhdGUgVmFsVHlwZSBfdHlwZTsKLQkJCQotCQkJLyoqIEhhdmUgd2UgYmVlbiBpbml0aWFsaXplZCB5ZXQ/ICovCi0JCQlwcml2YXRlIGJvb2xlYW4JX2luaXRpYWxpemVkOwotCQkJCisJCQlwcml2YXRlIGZpbmFsIFZhbFR5cGUgX3R5cGU7CisJCQkJCQkKIAkJCXB1YmxpYyBWYWxQcm9qZWN0TWFwKFZhbFR5cGUgdHlwZSl7CiAJCQkJX3R5cGUgPSB0eXBlOworCQkJCV9tYXAgPSBsb2FkKCk7CiAJCQl9CiAJCQkKIAkJCS8qKgpAQCAtMTAwNSw4ICsxMTk0LDcgQEAKIAkJCSAqICAgICAgICAgICAgCiAJCQkgKiBAcmV0dXJuIHRydWUgaWYgdGhlIHZhbGlkYXRvciBzaG91bGQgYXR0ZW1wdCB0byB2YWxpZGF0ZS4KIAkJCSAqLwotCQkJcHVibGljIHN5bmNocm9uaXplZCBib29sZWFuIHNob3VsZFZhbGlkYXRlKFZhbGlkYXRvciB2YWxpZGF0b3IsIElQcm9qZWN0IHByb2plY3QpewotCQkJCWlmICghX2luaXRpYWxpemVkKWxvYWQoKTsKKwkJCXB1YmxpYyBib29sZWFuIHNob3VsZFZhbGlkYXRlKFZhbGlkYXRvciB2YWxpZGF0b3IsIElQcm9qZWN0IHByb2plY3QpewogCQkJCVN0cmluZyB2aWQgPSB2YWxpZGF0b3IuZ2V0SWQoKTsKIAkJCQlTZXQ8SVByb2plY3Q+IHByb2plY3RzID0gX21hcC5nZXQodmlkKTsKIAkJCQlpZiAocHJvamVjdHMgPT0gbnVsbClyZXR1cm4gZmFsc2U7CkBAIC0xMDE0LDcgKzEyMDIsMTEgQEAKIAkJCQlyZXR1cm4gcHJvamVjdHMuY29udGFpbnMocHJvamVjdCk7CiAJCQl9CiAJCQkKLQkJCXByaXZhdGUgdm9pZCBsb2FkKCkgeworCQkJLyoqCisJCQkgKiBGb3IgZWFjaCBvZiB0aGUgcHJvamVjdHMgaW4gdGhlIHdvcmtzcGFjZSwgbG9hZCB3aGljaCB2YWxpZGF0b3JzIGFyZSBjdXJyZW50bHkgcHJlcGFyZWQgdG8gdmFsaWRhdGUgdGhpbmdzLgorCQkJICovCisJCQlwcml2YXRlIE1hcDxTdHJpbmcsIFNldDxJUHJvamVjdD4+IGxvYWQoKSB7CisJCQkJTWFwPFN0cmluZywgU2V0PElQcm9qZWN0Pj4gbWFwID0gbmV3IEhhc2hNYXA8U3RyaW5nLCBTZXQ8SVByb2plY3Q+Pig1MCk7CiAJCQkJVmFsTWFuYWdlciB2bSA9IFZhbE1hbmFnZXIuZ2V0RGVmYXVsdCgpOwogCQkJCUlQcm9qZWN0W10gcHJvamVjdHMgPSBSZXNvdXJjZXNQbHVnaW4uZ2V0V29ya3NwYWNlKCkuZ2V0Um9vdCgpLmdldFByb2plY3RzKCk7CiAJCQkJVHJhY2luZy5sb2coIlZhbE1hbmFnZXItMDI6IGxvYWRpbmcgIiArIHByb2plY3RzLmxlbmd0aCArICIgcHJvamVjdHMiKTsgIC8vJE5PTi1OTFMtMSQvLyROT04tTkxTLTIkCkBAIC0xMDIzLDI3ICsxMjE1LDI0IEBACiAJCQkJCVZhbGlkYXRvcltdIHZhbHMgPSB2bS5nZXRWYWxpZGF0b3JzKHByb2plY3QpOwogCQkJCQlmb3IgKFZhbGlkYXRvciB2IDogdmFscyl7CiAJCQkJCQlTdHJpbmcgdmlkID0gdi5nZXRJZCgpOwotCQkJCQkJU2V0PElQcm9qZWN0PiBzZXQgPSBfbWFwLmdldCh2aWQpOworCQkJCQkJU2V0PElQcm9qZWN0PiBzZXQgPSBtYXAuZ2V0KHZpZCk7CiAJCQkJCQlpZiAoc2V0ID09IG51bGwpewogCQkJCQkJCXNldCA9IG5ldyBIYXNoU2V0PElQcm9qZWN0Pig1MCk7Ci0JCQkJCQkJX21hcC5wdXQodmlkLCBzZXQpOworCQkJCQkJCW1hcC5wdXQodmlkLCBzZXQpOwogCQkJCQkJfQogCQkJCQkJCiAJCQkJCQlpZiAodi5zaG91bGRWYWxpZGF0ZVByb2plY3QocHJvamVjdCwgX3R5cGUpKXNldC5hZGQocHJvamVjdCk7CiAJCQkJCX0JCQkJCQogCQkJCX0KLQkJCQlfaW5pdGlhbGl6ZWQgPSB0cnVlOworCQkJCXJldHVybiBtYXA7CiAJCQl9CiAJCQkKLQkJCXB1YmxpYyBzeW5jaHJvbml6ZWQgdm9pZCByZXNldCgpewotCQkJCV9pbml0aWFsaXplZCA9IGZhbHNlOwotCQkJCV9tYXAuY2xlYXIoKTsKLQkJCX0KIAkJfQogCQkKIAl9CiAKIAlwdWJsaWMgdm9pZCBoYW5kbGVFdmVudChJRmFjZXRlZFByb2plY3RFdmVudCBldmVudCkgeworCQlfY29uZmlnTnVtYmVyLmluY3JlbWVudEFuZEdldCgpOwogCQlwcm9qZWN0Q2hhbmdlZChldmVudC5nZXRQcm9qZWN0KCkuZ2V0UHJvamVjdCgpKTsKIAl9CiAKQEAgLTEwNTgsNyArMTI0Nyw1NCBAQAogCQljYXNlIElQcm9qZWN0Q2hhbmdlTGlzdGVuZXIuUHJvamVjdEFkZGVkOgogCQkJcHJvamVjdENoYW5nZWQocHJvamVjdCk7CiAJCQlicmVhazsKKwkJfQkJCisJfQorCQorCS8qKgorCSAqIFN0b3JlIHRoZSBzaW5nbGV0b24gZm9yIHRoZSBWYWxNYW5hZ2VyLiBUaGlzIGFwcHJvYWNoIGlzIHVzZWQgdG8gYXZvaWQgaGF2aW5nIHRvIHN5bmNocm9uaXplIHRoZQorCSAqIFZhbE1hbmFnZXIuZ2V0RGVmYXVsdCgpIG1ldGhvZC4KKwkgKiAKKwkgKiBAYXV0aG9yIGthcmFzaXVrCisJICoKKwkgKi8KKwlwcml2YXRlIHN0YXRpYyBjbGFzcyBTaW5nbGV0b24geworCQlzdGF0aWMgVmFsTWFuYWdlciB2YWxNYW5hZ2VyID0gbmV3IFZhbE1hbmFnZXIoKTsKKwl9CisJCisJcHJpdmF0ZSBmaW5hbCBjbGFzcyBWYWxpZGF0b3JDYWNoZSB7CisJCXByaXZhdGUgZmluYWwgQ29uY3VycmVudE1hcDxJUHJvamVjdCwgVmFsaWRhdG9yW10+IF9jYWNoZSA9IG5ldyBDb25jdXJyZW50SGFzaE1hcDxJUHJvamVjdCwgVmFsaWRhdG9yW10+KDUwKTsKKwkJcHJpdmF0ZSBmaW5hbCBBdG9taWNSZWZlcmVuY2U8VmFsaWRhdG9yW10+IF9nbG9iYWwgPSBuZXcgQXRvbWljUmVmZXJlbmNlPFZhbGlkYXRvcltdPigpOworCQkKKwkJcHVibGljIFZhbGlkYXRvcltdIGdldFZhbGlkYXRvcnNDYWNoZWQoSVByb2plY3QgcHJvamVjdCkgdGhyb3dzIFByb2plY3RVbmF2YWlsYWJsZUVycm9yIHsKKwkJCVZhbGlkYXRvcltdIHZhbHMgPSBudWxsOworCQkJaWYgKHByb2plY3QgPT0gbnVsbCl7CisJCQkJdmFscyA9IF9nbG9iYWwuZ2V0KCk7CisJCQkJaWYgKHZhbHMgPT0gbnVsbCl7CQkJCQorCQkJCQl2YWxzID0gZ2V0VmFsaWRhdG9yc05vdENhY2hlZChwcm9qZWN0KTsKKwkJCQkJX2dsb2JhbC5zZXQodmFscyk7CisJCQkJfQorCQkJfQorCQkJZWxzZSB7CisJCQkJdmFscyA9IF9jYWNoZS5nZXQocHJvamVjdCk7CisJCQkJaWYgKHZhbHMgPT0gbnVsbCl7CisJCQkJCXZhbHMgPSBnZXRWYWxpZGF0b3JzTm90Q2FjaGVkKHByb2plY3QpOworCQkJCQlfY2FjaGUucHV0KHByb2plY3QsIHZhbHMpOworCQkJCX0KKwkJCX0KKwkJCXJldHVybiB2YWxzOwogCQl9CiAJCQorCQlwdWJsaWMgdm9pZCByZXNldCgpeworCQkJX2NhY2hlLmNsZWFyKCk7CisJCQlfZ2xvYmFsLnNldChudWxsKTsKKwkJfQorCQkKKwkJcHVibGljIHZvaWQgcmVzZXQoSVByb2plY3QgcHJvamVjdCl7CisJCQlpZiAocHJvamVjdCAhPSBudWxsKV9jYWNoZS5yZW1vdmUocHJvamVjdCk7CisJCX0KKwogCX0KKwkKKwlwdWJsaWMgZW51bSBVc2VQcm9qZWN0UHJlZmVyZW5jZXMge05vcm1hbCwgTXVzdFVzZSwgTXVzdE5vdFVzZX0KKwogfQpkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi92ZjIvb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vaW50ZXJuYWwvVmFsTWVzc2FnZXMuamF2YSBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24vdmYyL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL2ludGVybmFsL1ZhbE1lc3NhZ2VzLmphdmEKaW5kZXggMDJhYWJlMS4uZDIzODNjMSAxMDA2NDQKLS0tIGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi92ZjIvb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vaW50ZXJuYWwvVmFsTWVzc2FnZXMuamF2YQorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uL3ZmMi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9pbnRlcm5hbC9WYWxNZXNzYWdlcy5qYXZhCkBAIC0xLDUgKzEsNSBAQAogLyoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioKLSAqIENvcHlyaWdodCAoYykgMjAwNywgMjAwOCBJQk0gQ29ycG9yYXRpb24gYW5kIG90aGVycy4KKyAqIENvcHlyaWdodCAoYykgMjAwNywgMjAxMCBJQk0gQ29ycG9yYXRpb24gYW5kIG90aGVycy4KICAqIEFsbCByaWdodHMgcmVzZXJ2ZWQuIFRoaXMgcHJvZ3JhbSBhbmQgdGhlIGFjY29tcGFueWluZyBtYXRlcmlhbHMKICAqIGFyZSBtYWRlIGF2YWlsYWJsZSB1bmRlciB0aGUgdGVybXMgb2YgdGhlIEVjbGlwc2UgUHVibGljIExpY2Vuc2UgdjEuMAogICogd2hpY2ggYWNjb21wYW5pZXMgdGhpcyBkaXN0cmlidXRpb24sIGFuZCBpcyBhdmFpbGFibGUgYXQKQEAgLTIwLDYgKzIwLDcgQEAKIAkKIAlwdWJsaWMgc3RhdGljIFN0cmluZyBEZWNvZGVFcnJvcjE7CiAJcHVibGljIHN0YXRpYyBTdHJpbmcgRXJyb3IyMDsKKwlwdWJsaWMgc3RhdGljIFN0cmluZyBFcnJvcjIxOwogCQogCXB1YmxpYyBzdGF0aWMgU3RyaW5nIEVyckNvbmZpZzsJCiAJcHVibGljIHN0YXRpYyBTdHJpbmcgRXJyRmlsdGVyUnVsZTsJICAKQEAgLTQyLDYgKzQzLDcgQEAKIAlwdWJsaWMgc3RhdGljIFN0cmluZyBHcm91cEV4Y2x1ZGU7CiAJCiAJcHVibGljIHN0YXRpYyBTdHJpbmcgSm9iTmFtZTsKKwlwdWJsaWMgc3RhdGljIFN0cmluZyBKb2JOYW1lV2l0aFByb2plY3ROYW1lOwogCXB1YmxpYyBzdGF0aWMgU3RyaW5nIEpvYk5hbWVNb25pdG9yOwogCQogCXB1YmxpYyBzdGF0aWMgU3RyaW5nIEpvYkluZGV4U2F2ZTsKQEAgLTU1LDYgKzU3LDggQEAKIAkKIAlwdWJsaWMgc3RhdGljIFN0cmluZyBNaWdyYXRpb25Kb2JOYW1lOwogCQorCXB1YmxpYyBzdGF0aWMgU3RyaW5nIFJvZ3VlVmFsaWRhdG9yOworCQogCXB1YmxpYyBzdGF0aWMgU3RyaW5nIFJ1bGVQcm9qZWN0TmF0dXJlOwogCXB1YmxpYyBzdGF0aWMgU3RyaW5nIFJ1bGVGaWxlRXh0OwogCXB1YmxpYyBzdGF0aWMgU3RyaW5nIFJ1bGVGaWxlOwpAQCAtNjIsNiArNjYsNyBAQAogCXB1YmxpYyBzdGF0aWMgU3RyaW5nIFJ1bGVGdWxsOwogCXB1YmxpYyBzdGF0aWMgU3RyaW5nIFJ1bGVDb250ZW50VHlwZTsKIAlwdWJsaWMgc3RhdGljIFN0cmluZyBSdWxlRmFjZXQ7CisJcHVibGljIHN0YXRpYyBTdHJpbmcgUnVsZVBhdHRlcm47CiAJCiAJcHVibGljIHN0YXRpYyBTdHJpbmcgQ29udGVudFR5cGVFeGFjdDsKIAlwdWJsaWMgc3RhdGljIFN0cmluZyBDb250ZW50VHlwZU5vdEV4YWN0OwpkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi92ZjIvb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vaW50ZXJuYWwvVmFsT3BlcmF0aW9uLmphdmEgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uL3ZmMi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9pbnRlcm5hbC9WYWxPcGVyYXRpb24uamF2YQppbmRleCBlNWQ4Njk2Li40NGM3OGVjIDEwMDY0NAotLS0gYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uL3ZmMi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9pbnRlcm5hbC9WYWxPcGVyYXRpb24uamF2YQorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uL3ZmMi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9pbnRlcm5hbC9WYWxPcGVyYXRpb24uamF2YQpAQCAtMTAsNyArMTAsNiBAQAogICoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKiovCiBwYWNrYWdlIG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLmludGVybmFsOwogCi1pbXBvcnQgamF2YS51dGlsLkNvbGxlY3Rpb25zOwogaW1wb3J0IGphdmEudXRpbC5IYXNoTWFwOwogaW1wb3J0IGphdmEudXRpbC5IYXNoU2V0OwogaW1wb3J0IGphdmEudXRpbC5NYXA7CkBAIC0zNiw0NSArMzUsNjUgQEAKICAqIEBhdXRob3Iga2FyYXNpdWsKICAqCiAgKi8KLXB1YmxpYyBjbGFzcyBWYWxPcGVyYXRpb24geworcHVibGljIGZpbmFsIGNsYXNzIFZhbE9wZXJhdGlvbiB7CiAJCi0JcHJpdmF0ZSBWYWxpZGF0aW9uU3RhdGUgCV9zdGF0ZSA9IG5ldyBWYWxpZGF0aW9uU3RhdGUoKTsKLQlwcml2YXRlIFZhbGlkYXRpb25SZXN1bHQJX3Jlc3VsdCA9IG5ldyBWYWxpZGF0aW9uUmVzdWx0KCk7Ci0JcHJpdmF0ZSBNYXA8SVByb2plY3QsIFNldDxWYWxpZGF0b3I+PiBfc3VzcGVuZGVkID0gCi0JCUNvbGxlY3Rpb25zLnN5bmNocm9uaXplZE1hcChuZXcgSGFzaE1hcDxJUHJvamVjdCwgU2V0PFZhbGlkYXRvcj4+KDQwKSk7CisJcHJpdmF0ZSBmaW5hbCBWYWxpZGF0aW9uU3RhdGUgCV9zdGF0ZSA9IG5ldyBWYWxpZGF0aW9uU3RhdGUoKTsKKwlwcml2YXRlIGZpbmFsIFZhbGlkYXRpb25SZXN1bHQJX3Jlc3VsdCA9IG5ldyBWYWxpZGF0aW9uUmVzdWx0KCk7CisJCisJLyoqCisJICogRWFjaCBwcm9qZWN0IGNhbiBoYXZlIGEgc2V0IG9mIHZhbGlkYXRvcnMgdGhhdCBhcmUgc3VzcGVuZGVkIGZvciB0aGUgZHVyYXRpb24gb2YgdGhlIHZhbGlkYXRpb24gb3BlcmF0aW9uLgorCSAqIFRoZSBzZXQgY29udGFpbnMgdGhlIHZhbGlkYXRvcidzIGlkLgorCSAqLworCXByaXZhdGUgZmluYWwgTWFwPElQcm9qZWN0LCBTZXQ8U3RyaW5nPj4gX3N1c3BlbmRlZCA9IG5ldyBIYXNoTWFwPElQcm9qZWN0LCBTZXQ8U3RyaW5nPj4oNDApOwogCQogCS8qKiBUaGUgdGltZSB0aGF0IHRoZSBvcGVyYXRpb24gc3RhcnRlZC4gKi8KLQlwcml2YXRlIGxvbmcJX3N0YXJ0ZWQgPSBTeXN0ZW0uY3VycmVudFRpbWVNaWxsaXMoKTsKKwlwcml2YXRlIGZpbmFsIGxvbmcJX3N0YXJ0ZWQgPSBTeXN0ZW0uY3VycmVudFRpbWVNaWxsaXMoKTsKIAkKIAkvKiogCi0JICogQXJlIHdlIGluIGEgbXVsdGkgcHJvamVjdCB2YWxpZGF0aW9uPyBUaGlzIGNhbiBiZSB0cmlnZ2VyZWQgYnkgZWl0aGVyIGNsZWFuIGFsbCBvciAKKwkgKiBBcmUgd2UgaW4gYSBtdWx0aSBwcm9qZWN0IHZhbGlkYXRpb24/IFRoYXQgaXMsIGNvdWxkIHdlIGJlIHZhbGlkYXRpbmcgc2V2ZXJhbAorCSAqIHByb2plY3RzIGF0IHRoZSBzYW1lIHRpbWU/IFRoaXMgY2FuIGJlIHRyaWdnZXJlZCBieSBlaXRoZXIgY2xlYW4gYWxsIG9yIAogCSAqIGlmIGF1dG8gYnVpbGQgaXMgdHVybmVkIG9mZiwgYSBidWlsZCBhbGwuIAogCSAqLwotCXByaXZhdGUgYm9vbGVhbglfbXVsdGlQcm9qZWN0OworCXByaXZhdGUgZmluYWwgYm9vbGVhbglfbXVsdGlQcm9qZWN0OwogCQogCS8qKiAKIAkgKiBIb2xkcyBhbGwgdGhlIHJlc291cmNlcyB0aGF0IGhhdmUgYmVlbiB2YWxpZGF0ZWQgYXMgYSBzaWRlLWVmZmVjdCBvZiBydW5uaW5nIG90aGVyIHZhbGlkYXRpb25zLgogCSAqIFRoZSBrZXkgaXMgdGhlIHZhbGlkYXRvciBpZCBhbmQgdGhlIHZhbHVlIGlzIGEgU2V0IG9mIElSZXNvdXJjZXMuCiAJICovCi0JcHJpdmF0ZSBNYXA8U3RyaW5nLCBTZXQ8SVJlc291cmNlPj4gCV92YWxpZGF0ZWQgPSBuZXcgSGFzaE1hcDxTdHJpbmcsIFNldDxJUmVzb3VyY2U+PigyMCk7CisJcHJpdmF0ZSBmaW5hbCBNYXA8U3RyaW5nLCBTZXQ8SVJlc291cmNlPj4gCV92YWxpZGF0ZWQgPSBuZXcgSGFzaE1hcDxTdHJpbmcsIFNldDxJUmVzb3VyY2U+PigyMCk7CiAJCiAJcHVibGljIFZhbE9wZXJhdGlvbigpeworCQlfbXVsdGlQcm9qZWN0ID0gZmFsc2U7CisJfQorCQorCS8qKgorCSAqIAorCSAqIEBwYXJhbSBtdWx0aVByb2plY3QgU2V0IHRvIHRydWUgaWYgd2UgY291bGQgYmUgdmFsaWRhdGluZyBzZXZlcmFsIHByb2plY3RzIGF0IHRoZSBzYW1lIHRpbWUuCisJICovCisJcHVibGljIFZhbE9wZXJhdGlvbihib29sZWFuIG11bHRpUHJvamVjdCl7CisJCV9tdWx0aVByb2plY3QgPSBtdWx0aVByb2plY3Q7CiAJfQogCQogCXB1YmxpYyBWYWxpZGF0aW9uU3RhdGUgZ2V0U3RhdGUoKSB7CiAJCXJldHVybiBfc3RhdGU7CiAJfQotCXB1YmxpYyB2b2lkIHNldFN0YXRlKFZhbGlkYXRpb25TdGF0ZSBzdGF0ZSkgewotCQlfc3RhdGUgPSBzdGF0ZTsKLQl9Ci0JcHVibGljIFZhbGlkYXRpb25SZXN1bHQgZ2V0UmVzdWx0KCkgewotCQlyZXR1cm4gX3Jlc3VsdDsKLQl9CiAJCi0JcHVibGljIHZvaWQgc2V0UmVzdWx0KFZhbGlkYXRpb25SZXN1bHQgcmVzdWx0KSB7Ci0JCV9yZXN1bHQgPSByZXN1bHQ7CisJLyoqCisJICogQW5zd2VyIGEgc3VtbWFyeSBvZiB0aGUgdmFsaWRhdGlvbiByZXN1bHRzLgorCSAqIEByZXR1cm4KKwkgKi8KKwlwdWJsaWMgVmFsaWRhdGlvblJlc3VsdFN1bW1hcnkgZ2V0UmVzdWx0KCkgeworCQlzeW5jaHJvbml6ZWQoX3Jlc3VsdCl7CisJCQlWYWxpZGF0aW9uUmVzdWx0U3VtbWFyeSB2cnMgPSBuZXcgVmFsaWRhdGlvblJlc3VsdFN1bW1hcnkoX3Jlc3VsdC5nZXRTZXZlcml0eUVycm9yKCksIAorCQkJCV9yZXN1bHQuZ2V0U2V2ZXJpdHlXYXJuaW5nKCksIF9yZXN1bHQuZ2V0U2V2ZXJpdHlJbmZvKCkpOworCQkJcmV0dXJuIHZyczsKKwkJfQogCX0KLQkKKwkJCisJLyoqCisJICogQW5zd2VyIGEgY29weSBvZiB0aGUgVmFsaWRhdGlvblJlc3VsdC4KKwkgKiBAcmV0dXJuCisJICovCiAJcHVibGljIFZhbGlkYXRpb25SZXN1bHRzIGdldFJlc3VsdHMoKXsKIAkJcmV0dXJuIG5ldyBWYWxpZGF0aW9uUmVzdWx0cyhfcmVzdWx0KTsKIAl9CkBAIC04NiwxMiArMTA1LDE0IEBACiAJICogQHBhcmFtIHJlc291cmNlIHJlc291cmNlIHRoYXQgaGFzIGJlZW4gdmFsaWRhdGVkLgogCSAqLwogCXB1YmxpYyB2b2lkIGFkZFZhbGlkYXRlZChTdHJpbmcgaWQsIElSZXNvdXJjZSByZXNvdXJjZSl7Ci0JCVNldDxJUmVzb3VyY2U+IHNldCA9IF92YWxpZGF0ZWQuZ2V0KGlkKTsKLQkJaWYgKHNldCA9PSBudWxsKXsKLQkJCXNldCA9IG5ldyBIYXNoU2V0PElSZXNvdXJjZT4oMjApOwotCQkJX3ZhbGlkYXRlZC5wdXQoaWQsIHNldCk7CisJCXN5bmNocm9uaXplZChfdmFsaWRhdGVkKXsKKwkJCVNldDxJUmVzb3VyY2U+IHNldCA9IF92YWxpZGF0ZWQuZ2V0KGlkKTsKKwkJCWlmIChzZXQgPT0gbnVsbCl7CisJCQkJc2V0ID0gbmV3IEhhc2hTZXQ8SVJlc291cmNlPigyMCk7CisJCQkJX3ZhbGlkYXRlZC5wdXQoaWQsIHNldCk7CisJCQl9CisJCQlzZXQuYWRkKHJlc291cmNlKTsKIAkJfQotCQlzZXQuYWRkKHJlc291cmNlKTsKIAl9CiAJCiAJLyoqCkBAIC0xMDIsMzAgKzEyMywzNiBAQAogCSAqIEBwYXJhbSByZXNvdXJjZQogCSAqLwogCXB1YmxpYyBib29sZWFuIGlzVmFsaWRhdGVkKFN0cmluZyBpZCwgSVJlc291cmNlIHJlc291cmNlKXsKLQkJU2V0PElSZXNvdXJjZT4gc2V0ID0gX3ZhbGlkYXRlZC5nZXQoaWQpOwotCQlpZiAoc2V0ID09IG51bGwpcmV0dXJuIGZhbHNlOwotCQkKLQkJcmV0dXJuIHNldC5jb250YWlucyhyZXNvdXJjZSk7CisJCXN5bmNocm9uaXplZChfdmFsaWRhdGVkKXsKKwkJCVNldDxJUmVzb3VyY2U+IHNldCA9IF92YWxpZGF0ZWQuZ2V0KGlkKTsKKwkJCWlmIChzZXQgPT0gbnVsbClyZXR1cm4gZmFsc2U7CisJCQkKKwkJCXJldHVybiBzZXQuY29udGFpbnMocmVzb3VyY2UpOworCQl9CiAJfQogCiAJLyoqCi0JICogSGFzIHRoaXMgdmFsaWRhdG9yIGJlZW4gc3VzcGVuZGVkIGZvciB0aGUgZHVyYXRpb24gb2YgdGhpcyBvcGVyYXRpb24/Ci0JICogICAKLQkgKiBAcGFyYW0gdmFsCi0JICogQHBhcmFtIHByb2plY3QgY2FuIGJlIG51bGwsIGluIHdoaWNoIGNhc2Ugd2UgcmV0dXJuIGZhbHNlCisJICogSGFzIHRoaXMgdmFsaWRhdG9yIGJlZW4gc3VzcGVuZGVkIGZvciB0aGUgZHVyYXRpb24gb2YgdGhpcyBvcGVyYXRpb24gb24gdGhpcyBwcm9qZWN0PwogCSAqIAotCSAqIEByZXR1cm4gdHJ1ZSBpZiB3ZSBhbHJlYWR5IGtub3cgdGhhdCB0aGlzIHZhbGlkYXRvciBzaG91bGQgbm90IHJ1biBvbiB0aGlzIHByb2plY3QuCisJICogQHBhcmFtIHZhbAorCSAqICAgICAgICAgICAgVGhlIHZhbGlkYXRvciB0aGF0IGlzIGJlaW5nIGNoZWNrZWQuCisJICogQHBhcmFtIHByb2plY3QKKwkgKiAgICAgICAgICAgIENhbiBiZSBudWxsLCBpbiB3aGljaCBjYXNlIHdlIHJldHVybiBmYWxzZS4KKwkgKiAKKwkgKiBAcmV0dXJuIHRydWUgaWYgdGhpcyB2YWxpZGF0b3Igc2hvdWxkIG5vdCBydW4gb24gdGhpcyBwcm9qZWN0LgogCSAqLwogCXB1YmxpYyBib29sZWFuIGlzU3VzcGVuZGVkKFZhbGlkYXRvciB2YWwsIElQcm9qZWN0IHByb2plY3QpIHsKIAkJaWYgKHByb2plY3QgPT0gbnVsbClyZXR1cm4gZmFsc2U7Ci0JCVNldDxWYWxpZGF0b3I+IHNldCA9IGdldFN1c3BlbmRlZChwcm9qZWN0KTsJCQotCQlyZXR1cm4gc2V0LmNvbnRhaW5zKHZhbCk7CisJCXN5bmNocm9uaXplZChfc3VzcGVuZGVkKXsKKwkJCVNldDxTdHJpbmc+IHNldCA9IGdldFN1c3BlbmRlZChwcm9qZWN0KTsJCQorCQkJcmV0dXJuIHNldC5jb250YWlucyh2YWwuZ2V0SWQoKSk7CisJCX0KIAl9CiAJCi0JcHJpdmF0ZSBTZXQ8VmFsaWRhdG9yPiBnZXRTdXNwZW5kZWQoSVByb2plY3QgcHJvamVjdCl7Ci0JCVNldDxWYWxpZGF0b3I+IHNldCA9IF9zdXNwZW5kZWQuZ2V0KHByb2plY3QpOworCXByaXZhdGUgU2V0PFN0cmluZz4gZ2V0U3VzcGVuZGVkKElQcm9qZWN0IHByb2plY3QpeworCQlTZXQ8U3RyaW5nPiBzZXQgPSBfc3VzcGVuZGVkLmdldChwcm9qZWN0KTsKIAkJaWYgKHNldCA9PSBudWxsKXsKLQkJCXNldCA9IG5ldyBIYXNoU2V0PFZhbGlkYXRvcj4oNSk7CisJCQlzZXQgPSBuZXcgSGFzaFNldDxTdHJpbmc+KDUpOwogCQkJX3N1c3BlbmRlZC5wdXQocHJvamVjdCwgc2V0KTsKIAkJfQogCQlyZXR1cm4gc2V0OwpAQCAtMTMzLDcgKzE2MCw4IEBACiAKIAl2b2lkIHN1c3BlbmRWYWxpZGF0aW9uKElQcm9qZWN0IHByb2plY3QsIFZhbGlkYXRvciB2YWxpZGF0b3IpIHsKIAkJaWYgKHByb2plY3QgPT0gbnVsbClyZXR1cm47Ci0JCWdldFN1c3BlbmRlZChwcm9qZWN0KS5hZGQodmFsaWRhdG9yKTsKKwkJaWYgKHZhbGlkYXRvciA9PSBudWxsKXJldHVybjsKKwkJZ2V0U3VzcGVuZGVkKHByb2plY3QpLmFkZCh2YWxpZGF0b3IuZ2V0SWQoKSk7CiAJfQogCiAJcHVibGljIGxvbmcgZ2V0U3RhcnRlZCgpIHsKQEAgLTE0NCwxMiArMTcyLDM0IEBACiAJCXJldHVybiBfbXVsdGlQcm9qZWN0OwogCX0KIAotCS8qKiAKLQkgKiBBcmUgd2UgaW4gYSBtdWx0aSBwcm9qZWN0IHZhbGlkYXRpb24/IFRoYXQgaXMsIGNvdWxkIHdlIGJlIHZhbGlkYXRpbmcgc2V2ZXJhbAotCSAqIHByb2plY3RzIGF0IHRoZSBzYW1lIHRpbWU/IFRoaXMgY2FuIGJlIHRyaWdnZXJlZCBieSBlaXRoZXIgY2xlYW4gYWxsIG9yIAotCSAqIGlmIGF1dG8gYnVpbGQgaXMgdHVybmVkIG9mZiwgYSBidWlsZCBhbGwuIAorCS8qKgorCSAqIEluZGljYXRlIGlmIHRoZSBvcGVyYXRpb24gd2FzIGNhbmNlbGVkLgorCSAqIAorCSAqIEBwYXJhbSBjYW5jZWxlZAorCSAqIAkJU2V0IHRvIHRydWUgaWYgaXQgd2FzIGNhbmNlbGVkIGFuZCBmYWxzZSBpZiBpdCB3YXMgbm90IGNhbmNlbGVkLgogCSAqLwotCXB1YmxpYyB2b2lkIHNldE11bHRpUHJvamVjdChib29sZWFuIG11bHRpUHJvamVjdCkgewotCQlfbXVsdGlQcm9qZWN0ID0gbXVsdGlQcm9qZWN0OwotCX0JCisJcHVibGljIHZvaWQgc2V0Q2FuY2VsZWQoYm9vbGVhbiBjYW5jZWxlZCkgeworCQlzeW5jaHJvbml6ZWQgKF9yZXN1bHQpIHsKKwkJCV9yZXN1bHQuc2V0Q2FuY2VsZWQoY2FuY2VsZWQpOworCQl9CisJCQorCX0KKworCS8qKgorCSAqIFdhcyB0aGUgb3BlcmF0aW9uIGNhbmNlbGVkIGJlZm9yZSBpdCBjb21wbGV0ZWQ/IEZvciBleGFtcGxlIGlmIHRoZSB2YWxpZGF0aW9uIGlzIGJlaW5nIHJ1biB0aHJvdWdoIHRoZQorCSAqIHVzZXIgaW50ZXJmYWNlLCB0aGUgZW5kIHVzZXIgY2FuIGNhbmNlbCB0aGUgb3BlcmF0aW9uIHRocm91Z2ggdGhlIHByb2dyZXNzIG1vbml0b3IuCisJICogCisJICogQHJldHVybiB0cnVlIGlmIHRoZSBvcGVyYXRpb24gd2FzIGNhbmNlbGVkCisJICovCisJcHVibGljIGJvb2xlYW4gaXNDYW5jZWxlZCgpIHsKKwkJc3luY2hyb25pemVkIChfcmVzdWx0KSB7CisJCQlyZXR1cm4gX3Jlc3VsdC5pc0NhbmNlbGVkKCk7CisJCX0KKwl9CisKKwlwdWJsaWMgdm9pZCBtZXJnZVJlc3VsdHMoVmFsaWRhdGlvblJlc3VsdCB2cikgeworCQlzeW5jaHJvbml6ZWQgKF9yZXN1bHQpIHsKKwkJCV9yZXN1bHQubWVyZ2VSZXN1bHRzKHZyKTsKKwkJfQorCX0KIH0KZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24vdmYyL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL2ludGVybmFsL1ZhbE9wZXJhdGlvbkpvYi5qYXZhIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi92ZjIvb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vaW50ZXJuYWwvVmFsT3BlcmF0aW9uSm9iLmphdmEKZGVsZXRlZCBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDk0MTRjMDIuLjAwMDAwMDAKLS0tIGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi92ZjIvb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vaW50ZXJuYWwvVmFsT3BlcmF0aW9uSm9iLmphdmEKKysrIC9kZXYvbnVsbApAQCAtMSw2MyArMCwwIEBACi0vKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKgotICogQ29weXJpZ2h0IChjKSAyMDA3LCAyMDA4IElCTSBDb3Jwb3JhdGlvbiBhbmQgb3RoZXJzLgotICogQWxsIHJpZ2h0cyByZXNlcnZlZC4gVGhpcyBwcm9ncmFtIGFuZCB0aGUgYWNjb21wYW55aW5nIG1hdGVyaWFscwotICogYXJlIG1hZGUgYXZhaWxhYmxlIHVuZGVyIHRoZSB0ZXJtcyBvZiB0aGUgRWNsaXBzZSBQdWJsaWMgTGljZW5zZSB2MS4wCi0gKiB3aGljaCBhY2NvbXBhbmllcyB0aGlzIGRpc3RyaWJ1dGlvbiwgYW5kIGlzIGF2YWlsYWJsZSBhdAotICogaHR0cDovL3d3dy5lY2xpcHNlLm9yZy9sZWdhbC9lcGwtdjEwLmh0bWwKLSAqCi0gKiBDb250cmlidXRvcnM6Ci0gKiAgICAgSUJNIENvcnBvcmF0aW9uIC0gaW5pdGlhbCBBUEkgYW5kIGltcGxlbWVudGF0aW9uCi0gKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKi8KLXBhY2thZ2Ugb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uaW50ZXJuYWw7Ci0KLWltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJlc291cmNlcy5JUHJvamVjdDsKLWltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJ1bnRpbWUuSVByb2dyZXNzTW9uaXRvcjsKLWltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJ1bnRpbWUuSVN0YXR1czsKLWltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJ1bnRpbWUuU3RhdHVzOwotaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucnVudGltZS5qb2JzLkpvYjsKLWltcG9ydCBvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5WYWxpZGF0aW9uRnJhbWV3b3JrOwotaW1wb3J0IG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLlZhbGlkYXRvcjsKLWltcG9ydCBvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5pbnRlcm5hbC5tb2RlbC5JVmFsaWRhdG9yVmlzaXRvcjsKLQotLyoqCi0gKiBUaGlzIGlzIHVzZWQgdG8gc2lnbmFsIHdoZW4gdGhlIGVudGlyZSB2YWxpZGF0aW9uIG9wZXJhdGlvbiBpcyBjb21wbGV0ZS4gVGhpcyBuZWVkcyB0byBiZSBkb25lIGluIGEgam9iCi0gKiBiZWNhdXNlIHRoZSBvcGVyYXRpb24gaXNuJ3QgZG9uZSwgdW50aWwgYWxsIHRoZSB2YWxpZGF0aW9uIGpvYnMgaGF2ZSBmaW5pc2hlZC4gIAotICogQGF1dGhvciBrYXJhc2l1awotICoKLSAqLwotcHVibGljIGNsYXNzIFZhbE9wZXJhdGlvbkpvYiBleHRlbmRzIEpvYiB7Ci0JCi0JcHJpdmF0ZSBWYWxPcGVyYXRpb24gX29wZXJhdGlvbjsKLQkKLQlwdWJsaWMgVmFsT3BlcmF0aW9uSm9iKFZhbE9wZXJhdGlvbiBvcGVyYXRpb24pewotCQlzdXBlcihWYWxNZXNzYWdlcy5Kb2JOYW1lTW9uaXRvcik7Ci0JCV9vcGVyYXRpb24gPSBvcGVyYXRpb247Ci0JfQotCi0JQE92ZXJyaWRlCi0JcHJvdGVjdGVkIElTdGF0dXMgcnVuKElQcm9ncmVzc01vbml0b3IgbW9uaXRvcikgewotCQlib29sZWFuIG9rID0gdHJ1ZTsKLQkJdHJ5IHsKLQkJCVZhbGlkYXRpb25GcmFtZXdvcmsuZ2V0RGVmYXVsdCgpLmpvaW4obW9uaXRvcik7Ci0JCX0KLQkJY2F0Y2ggKEludGVycnVwdGVkRXhjZXB0aW9uIGUpewotCQkJb2sgPSBmYWxzZTsKLQkJfQotCQlmaW5pc2hlZChtb25pdG9yKTsKLQkJcmV0dXJuIG9rID8gU3RhdHVzLk9LX1NUQVRVUyA6IFN0YXR1cy5DQU5DRUxfU1RBVFVTOwotCX0KLQkKLQlwcml2YXRlIHZvaWQgZmluaXNoZWQoSVByb2dyZXNzTW9uaXRvciBtb25pdG9yKXsKLQkJSVZhbGlkYXRvclZpc2l0b3IgdmlzaXRvciA9IG5ldyBJVmFsaWRhdG9yVmlzaXRvcigpewotCi0JCQlwdWJsaWMgdm9pZCB2aXNpdChWYWxpZGF0b3IgdmFsaWRhdG9yLCBJUHJvamVjdCBwcm9qZWN0LCBWYWxUeXBlIHZhbFR5cGUsIAotCQkJCVZhbE9wZXJhdGlvbiBvcGVyYXRpb24sIElQcm9ncmVzc01vbml0b3IgbW9uaXRvcikgewotCQkJCQotCQkJCXZhbGlkYXRvci52YWxpZGF0aW9uRmluaXNoaW5nKHByb2plY3QsIG9wZXJhdGlvbi5nZXRTdGF0ZSgpLCBtb25pdG9yKTsJCQkJCQotCQkJfQotCQkJCi0JCX07Ci0JCVZhbE1hbmFnZXIuZ2V0RGVmYXVsdCgpLmFjY2VwdCh2aXNpdG9yLCBudWxsLCBWYWxUeXBlLkJ1aWxkLCBfb3BlcmF0aW9uLCBtb25pdG9yKTsKLQl9Ci0KLX0KZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24vdmYyL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL2ludGVybmFsL1ZhbE9wZXJhdGlvbk1hbmFnZXIuamF2YSBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24vdmYyL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL2ludGVybmFsL1ZhbE9wZXJhdGlvbk1hbmFnZXIuamF2YQpkZWxldGVkIGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMTg3N2EzMy4uMDAwMDAwMAotLS0gYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uL3ZmMi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9pbnRlcm5hbC9WYWxPcGVyYXRpb25NYW5hZ2VyLmphdmEKKysrIC9kZXYvbnVsbApAQCAtMSwyNjcgKzAsMCBAQAotLyoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioKLSAqIENvcHlyaWdodCAoYykgMjAwNywgMjAwOCBJQk0gQ29ycG9yYXRpb24gYW5kIG90aGVycy4KLSAqIEFsbCByaWdodHMgcmVzZXJ2ZWQuIFRoaXMgcHJvZ3JhbSBhbmQgdGhlIGFjY29tcGFueWluZyBtYXRlcmlhbHMKLSAqIGFyZSBtYWRlIGF2YWlsYWJsZSB1bmRlciB0aGUgdGVybXMgb2YgdGhlIEVjbGlwc2UgUHVibGljIExpY2Vuc2UgdjEuMAotICogd2hpY2ggYWNjb21wYW5pZXMgdGhpcyBkaXN0cmlidXRpb24sIGFuZCBpcyBhdmFpbGFibGUgYXQKLSAqIGh0dHA6Ly93d3cuZWNsaXBzZS5vcmcvbGVnYWwvZXBsLXYxMC5odG1sCi0gKgotICogQ29udHJpYnV0b3JzOgotICogICAgIElCTSBDb3Jwb3JhdGlvbiAtIGluaXRpYWwgQVBJIGFuZCBpbXBsZW1lbnRhdGlvbgotICoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKiovCi1wYWNrYWdlIG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLmludGVybmFsOwotCi1pbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5yZXNvdXJjZXMuSVByb2plY3Q7Ci1pbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5yZXNvdXJjZXMuSVJlc291cmNlOwotaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucmVzb3VyY2VzLklSZXNvdXJjZUNoYW5nZUV2ZW50OwotaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucmVzb3VyY2VzLklSZXNvdXJjZUNoYW5nZUxpc3RlbmVyOwotaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucmVzb3VyY2VzLklSZXNvdXJjZURlbHRhOwotaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucmVzb3VyY2VzLklXb3Jrc3BhY2U7Ci1pbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5yZXNvdXJjZXMuSW5jcmVtZW50YWxQcm9qZWN0QnVpbGRlcjsKLWltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJlc291cmNlcy5SZXNvdXJjZXNQbHVnaW47Ci1pbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5ydW50aW1lLklQcm9ncmVzc01vbml0b3I7Ci1pbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5ydW50aW1lLk51bGxQcm9ncmVzc01vbml0b3I7Ci1pbXBvcnQgb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uVmFsaWRhdG9yOwotaW1wb3J0IG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLmludGVybmFsLm1vZGVsLklWYWxpZGF0b3JWaXNpdG9yOwotCi0vKioKLSAqIEtlZXAgdHJhY2sgb2YgYSB2YWxpZGF0aW9uIG9wZXJhdGlvbiB3aGVuIGl0IGlzIHRyaWdnZXJlZCBhcyBwYXJ0IG9mIGEgYnVpbGQuCi0gKiBAYXV0aG9yIGthcmFzaXVrCi0gKgotICovCi1wdWJsaWMgY2xhc3MgVmFsT3BlcmF0aW9uTWFuYWdlciBpbXBsZW1lbnRzIElSZXNvdXJjZUNoYW5nZUxpc3RlbmVyIHsKLQkKLQkvKgotCSAqIEkgdHJpZWQgdmFyaW91cyB0ZXN0cyB0byBzZWUgd2hhdCBzb3J0IG9mIGNoYW5nZSBldmVudHMgSSB3b3VsZCBnZXQuIFRoaXMgaXMgd2hhdCBJIAotCSAqIG9ic2VydmVkIHVzaW5nIEVjbGlwc2UgMy40OgotCSAqIAotCSAqIEF1dG8gQnVpbGQgT24KLQkgKiAKLQkgKiAgIENsZWFuIEFsbAotCSAqICAgICAtIHdvcmtzcGFjZSwgY2xlYW4sIHByZQotCSAqICAgICAtIHdvcmtzcGFjZSwgY2xlYW4gcG9zdAotCSAqICAgICAtIHdvcmtzcGFjZSwgYXV0bywgcG9zdAotCSAqICAgICAKLQkgKiAgIENsZWFuIFNvbWUKLQkgKiAgICAgLSBwcm9qZWN0MSwgY2xlYW4sIHByZQotCSAqICAgICAtIHByb2plY3QxLCBjbGVhbiwgcG9zdAotCSAqICAgICAtIHByb2plY3QyLCBjbGVhbiwgcHJlCi0JICogICAgIC0gcHJvamVjdDIsIGNsZWFuLCBwb3N0Ci0JICogICAgIC0gd29ya3NwYWNlLCBBdXRvLCBwb3N0Ci0JICogICAgIAotCSAqICAgQnVpbGQgV29ya2luZyBTZXQgLSBOQQotCSAqICAgQnVpbGQgUHJvamVjdCAtIE5BCi0JICogICBCdWlsZCBBbGwgLSBOQQotCSAqICAgCi0JICogICBDdHJsLVMKLQkgKiAgICAgLSB3b3Jrc3BhY2UsIGF1dG8sIHByZQotCSAqICAgICAtIHdvcmtzcGFjZSwgYXV0bywgcG9zdAotCSAqICAgICAKLQkgKiBBdXRvIGJ1aWxkIE9mZgotCSAqIAotCSAqICAgQ2xlYW4gQWxsCi0JICogICAgIC0gc2FtZSBhcyAoYXV0byBidWlsZCBvbiksIGJ1dCBubyB3b3Jrc3BhY2UsYXV0byxwb3N0IGV2ZW50Ci0JICogICAgIAotCSAqICAgQ2xlYW4gU29tZSAKLQkgKiAgICAgLSBzYW1lIGFzIChhdXRvIGJ1aWxkIG9uKSwgYnV0IG5vIHdvcmtzcGFjZSxhdXRvLHBvc3QgZXZlbnQKLQkgKiAgICAgCi0JICogICBCdWlsZCBXb3JraW5nIFNldAotCSAqICAgICAtIHByb2plY3QxLCBpbmNyZW1lbnRhbCwgcHJlCi0JICogICAgIC0gcHJvamVjdDEsIGluY3JlbWVudGFsLCBwb3N0Ci0JICogICAgIC0gcHJvamVjdDIsIGluY3JlbWVudGFsLCBwcmUKLQkgKiAgICAgLSBwcm9qZWN0MiwgaW5jcmVtZW50YWwsIHBvc3QKLQkgKiAgICAgCi0JICogICBCdWlsZCBQcm9qZWN0Ci0JICogICAgIC0gc2FtZSBhcyBhYm92ZQotCSAqICAgICAKLQkgKiAgIEJ1aWxkIEFsbAotCSAqICAgICAtIHdvcmtzcGFjZSwgaW5jcmVtZW50YWwsIHByZQotCSAqICAgICAtIHdvcmtzcGFjZSwgaW5jcmVtZW50YWwsIHBvc3QKLQkgKiAgICAgCi0JICogICBDdHJsLVMgLSBOQQotCSAqICAgCi0JICogRm9yIHRoZSBjYXNlIHdoZXJlIGEgc3Vic2V0IG9mIHRoZSBwcm9qZWN0cyBhcmUgYnVpbHQgdGhlcmUgaXMgbm8gd2F5IHRvIGd1ZXNzIHdoZXRoZXIgdGhleSBhcmUgcGFydCBvZiB0aGUKLQkgKiBzYW1lIG9wZXJhdGlvbiBvciBub3QuIEVjbGlwc2UgdGhyZWF0cyB0aGVtIGFzIGluZGVwZW5kZW50IGV2ZW50cywgYW5kIHNvIHdpbGwgdGhlIHZhbGlkYXRpb24gZnJhbWV3b3JrLgotCSAqIAotCSAqIFNvIGZvciBleGFtcGxlLCBpZiB0aGUgdXNlciBzZWxlY3RlZCB0d28gcHJvamVjdHMgKHAxIGFuZCBwMikgYW5kIGJ1aWx0IHRoZW0sIHRoZSBmcmFtZXdvcmsgd291bGQgY2FsbCB0aGUKLQkgKiB2YWxpZGF0b3JzIGxpa2UgdGhpczoKLQkgKiAKLQkgKiB2YWxpZGF0aW9uIHN0YXJ0aW5nIG9uIG51bGwKLQkgKiB2YWxpZGF0aW9uIHN0YXJ0aW5nIG9uIFAxCi0JICogIC0gaW5kaXZpZHVhbCBldmVudHMgcGVyIHJlc291cmNlCi0JICogdmFsaWRhdGlvbiBmaW5pc2hlZCBvbiBQMQotCSAqIHZhbGlkYXRpb24gZmluaXNoZWQgb24gbnVsbCAKLQkgKiAKLQkgKiB2YWxpZGF0aW9uIHN0YXJ0aW5nIG9uIG51bGwKLQkgKiB2YWxpZGF0aW9uIHN0YXJ0aW5nIG9uIFAyCi0JICogIC0gaW5kaXZpZHVhbCBldmVudHMgcGVyIHJlc291cmNlCi0JICogdmFsaWRhdGlvbiBmaW5pc2hlZCBvbiBQMgotCSAqIHZhbGlkYXRpb24gZmluaXNoZWQgb24gbnVsbCAKLQkgKi8KLQkKLQlwcml2YXRlIHN0YXRpYyBWYWxPcGVyYXRpb25NYW5hZ2VyIF9tZTsKLQotCS8qKgotCSAqIFRoaXMgb3BlcmF0aW9uIGlzIGluIGFmZmVjdCBmb3IgYSBidWlsZCBjeWNsZS4gQXQgdGhlIGVuZCBvZiB0aGUgYnVpbGQgaXQgaXMgcmVpbml0aWFsaXplZC4KLQkgKi8KLQlwcml2YXRlIFZhbE9wZXJhdGlvbiAJX29wZXJhdGlvbjsKLQkKLQkKLQkvKioKLQkgKiBJbiB0aGUgdmVyeSBjb21tb24gY2FzZSBvZiBkb2luZyBhIGNsZWFuIGFsbCAod2l0aCBhdXRvIGJ1aWxkIHR1cm5lZCBvbiksIEVjbGlwc2Ugc2lnbmFscyB0d28gCi0JICogd29ya3NwYWNlLCBhdXRvIGJ1aWxkLCBwb3N0IGV2ZW50cy4gT25lIGF0IHRoZSBlbmQgb2YgdGhlIGNsZWFuIGFuZCBvbmUgYXQgdGhlIGVuZCBvZiB0aGUKLQkgKiByZWFsIGJ1aWxkLgotCSAqIAotCSAqIElmIHdlIGFyZSBkb2luZyBhIGNsZWFuIGFsbCwgd2l0aCBhdXRvIGJ1aWxkIHR1cm5lZCBvbiwgd2UgaW5jcmVtZW50IHRoaXMgYnkgb25lLCAKLQkgKiBzbyB0aGF0IHdlIGtub3cgdG8gdGhyb3cgYXdheSB0aGUgZmlyc3Qgd29ya3NwYWNlLCBhdXRvIGJ1aWxkLCBwb3N0IGV2ZW50LgotCSAqLwotCXByaXZhdGUgaW50IF9kaXNjYXJkQXV0b1Bvc3Q7Ci0KLQlwdWJsaWMgc3RhdGljIHN5bmNocm9uaXplZCBWYWxPcGVyYXRpb25NYW5hZ2VyIGdldERlZmF1bHQoKXsKLQkJaWYgKF9tZSA9PSBudWxsKV9tZSA9IG5ldyBWYWxPcGVyYXRpb25NYW5hZ2VyKCk7Ci0JCXJldHVybiBfbWU7Ci0JfQotCQotCXByaXZhdGUgVmFsT3BlcmF0aW9uTWFuYWdlcigpe30KLQkJCQkKLQlwdWJsaWMgdm9pZCByZXNvdXJjZUNoYW5nZWQoSVJlc291cmNlQ2hhbmdlRXZlbnQgZXZlbnQpIHsKLQkJaW50IHR5cGUgPSBldmVudC5nZXRUeXBlKCk7Ci0JCWludCBraW5kID0gZXZlbnQuZ2V0QnVpbGRLaW5kKCk7Ci0JCQotCQlpZiAoa2luZCA9PSBJbmNyZW1lbnRhbFByb2plY3RCdWlsZGVyLkNMRUFOX0JVSUxEICYmICgodHlwZSAmIElSZXNvdXJjZUNoYW5nZUV2ZW50LlBSRV9CVUlMRCkgIT0gMCkpewotCQkJcHJvY2Vzc0NsZWFuKGV2ZW50KTsKLQkJfQotCQkKLQkJaWYgKGlzQnVpbGRTdGFydGluZyhldmVudCkpewotCQkJX29wZXJhdGlvbiA9IG5ldyBWYWxPcGVyYXRpb24oKTsKLQkJCV9vcGVyYXRpb24uc2V0TXVsdGlQcm9qZWN0KHRydWUpOwotCQkJSVZhbGlkYXRvclZpc2l0b3IgdmlzaXRvciA9IG5ldyBJVmFsaWRhdG9yVmlzaXRvcigpewotCi0JCQkJcHVibGljIHZvaWQgdmlzaXQoVmFsaWRhdG9yIHZhbGlkYXRvciwgSVByb2plY3QgcHJvamVjdCwgVmFsVHlwZSB2YWxUeXBlLCAKLQkJCQkJVmFsT3BlcmF0aW9uIG9wZXJhdGlvbiwgSVByb2dyZXNzTW9uaXRvciBtb25pdG9yKSB7Ci0JCQkJCQotCQkJCQl2YWxpZGF0b3IudmFsaWRhdGlvblN0YXJ0aW5nKHByb2plY3QsIG9wZXJhdGlvbi5nZXRTdGF0ZSgpLCBtb25pdG9yKTsJCQkJCQotCQkJCX0JCQkJCi0JCQl9OwotCQkJVmFsTWFuYWdlci5nZXREZWZhdWx0KCkuYWNjZXB0KHZpc2l0b3IsIG51bGwsIFZhbFR5cGUuQnVpbGQsIF9vcGVyYXRpb24sIG5ldyBOdWxsUHJvZ3Jlc3NNb25pdG9yKCkpOwotCQkJCi0JCX0KLQkJCi0JCWlmIChpc0J1aWxkRmluaXNoZWQoZXZlbnQpKXsKLQkJCVZhbE9wZXJhdGlvbkpvYiBmaW5pc2hlZCA9IG5ldyBWYWxPcGVyYXRpb25Kb2IoZ2V0T3BlcmF0aW9uKCkpOwotCQkJZmluaXNoZWQuc2NoZWR1bGUoKTsKLQkJCV9vcGVyYXRpb24gPSBudWxsOwotCQl9Ci0JCQotCQkKLQkJaWYgKFRyYWNpbmcuaXNMb2dnaW5nKCkpewotCQkJU3RyaW5nIGtpbmROYW1lID0gbnVsbDsKLQkJCWlmIChraW5kID09IEluY3JlbWVudGFsUHJvamVjdEJ1aWxkZXIuQVVUT19CVUlMRClraW5kTmFtZSA9ICJBdXRvIjsgLy8kTk9OLU5MUy0xJAotCQkJZWxzZSBpZiAoa2luZCA9PSBJbmNyZW1lbnRhbFByb2plY3RCdWlsZGVyLkNMRUFOX0JVSUxEKWtpbmROYW1lID0gIkNsZWFuIjsgLy8kTk9OLU5MUy0xJAotCQkJZWxzZSBpZiAoa2luZCA9PSBJbmNyZW1lbnRhbFByb2plY3RCdWlsZGVyLkZVTExfQlVJTEQpa2luZE5hbWUgPSAiRnVsbCI7IC8vJE5PTi1OTFMtMSQKLQkJCWVsc2UgaWYgKGtpbmQgPT0gSW5jcmVtZW50YWxQcm9qZWN0QnVpbGRlci5JTkNSRU1FTlRBTF9CVUlMRClraW5kTmFtZSA9ICJJbmNyZW1lbnRhbCI7IC8vJE5PTi1OTFMtMSQKLQkJCWVsc2Uga2luZE5hbWUgPSBTdHJpbmcudmFsdWVPZihraW5kKTsKLQkJCQotCQkJU3RyaW5nQnVmZmVyIGIgPSBuZXcgU3RyaW5nQnVmZmVyKDEwMCk7Ci0JCQkKLQkJCVN0cmluZyBzb3VyY2VOYW1lID0gInVua25vd24iOyAvLyROT04tTkxTLTEkCi0JCQlpZiAoZXZlbnQuZ2V0U291cmNlKCkgaW5zdGFuY2VvZiBJUmVzb3VyY2UpIHsKLQkJCQlJUmVzb3VyY2UgcmVzID0gKElSZXNvdXJjZSkgZXZlbnQuZ2V0U291cmNlKCk7Ci0JCQkJc291cmNlTmFtZSA9IHJlcy5nZXROYW1lKCk7Ci0JCQl9Ci0JCQllbHNlIGlmIChldmVudC5nZXRTb3VyY2UoKSBpbnN0YW5jZW9mIElXb3Jrc3BhY2UpIHsKLQkJCQlzb3VyY2VOYW1lID0gIldvcmtzcGFjZSI7CQkJIC8vJE5PTi1OTFMtMSQKLQkJCX0KLQkJCWIuYXBwZW5kKCJWYWxPcGVyYXRpb25NYW5hZ2VyLTAxOiBBIHJlc291cmNlIGhhcyBjaGFuZ2VkLCBzb3VyY2U9Iitzb3VyY2VOYW1lKyIsIGtpbmQ9IitraW5kTmFtZSsiLCBldmVudCB0eXBlPSgiK3R5cGUpOyAvLyROT04tTkxTLTEkIC8vJE5PTi1OTFMtMiQgLy8kTk9OLU5MUy0zJAotCQkJaWYgKCh0eXBlICYgSVJlc291cmNlQ2hhbmdlRXZlbnQuUE9TVF9CVUlMRCkgIT0gMCliLmFwcGVuZCgiLCBwb3N0IGJ1aWxkIik7IC8vJE5PTi1OTFMtMSQKLQkJCWlmICgodHlwZSAmIElSZXNvdXJjZUNoYW5nZUV2ZW50LlBSRV9CVUlMRCkgIT0gMCl7Ci0JCQkJYi5hcHBlbmQoIiwgcHJlIGJ1aWxkIik7IC8vJE5PTi1OTFMtMSQKLQkJCX0KLQkJCWIuYXBwZW5kKCcpJyk7Ci0JCQlJUmVzb3VyY2VEZWx0YSByZCA9IGV2ZW50LmdldERlbHRhKCk7Ci0JCQlpZiAocmQgPT0gbnVsbCliLmFwcGVuZCgiLCB0aGVyZSB3YXMgbm8gcmVzb3VyY2UgZGVsdGEiKTsgLy8kTk9OLU5MUy0xJAotCQkJCi0JCQlUcmFjaW5nLmxvZyhiKTsKLQkJfQotCQkKLQl9Ci0JCi0JLyoqCi0JICogRGV0ZXJtaW5lIGlmIHdlIGFyZSBzdGFydGluZyBhIG5ldyBidWlsZCBjeWNsZS4KLQkgKiBAcGFyYW0gZXZlbnQKLQkgKiBAcmV0dXJuCi0JICovCi0JcHJpdmF0ZSBib29sZWFuIGlzQnVpbGRTdGFydGluZyhJUmVzb3VyY2VDaGFuZ2VFdmVudCBldmVudCkgewotCQlpbnQgdHlwZSA9IGV2ZW50LmdldFR5cGUoKTsKLQkJaW50IGtpbmQgPSBldmVudC5nZXRCdWlsZEtpbmQoKTsKLQkJYm9vbGVhbiBpc1dvcmtzcGFjZSA9IGV2ZW50LmdldFNvdXJjZSgpIGluc3RhbmNlb2YgSVdvcmtzcGFjZTsKLQkJYm9vbGVhbiBwcmVCdWlsZCA9ICh0eXBlICYgSVJlc291cmNlQ2hhbmdlRXZlbnQuUFJFX0JVSUxEKSAhPSAwOwotCQkKLQkJaWYgKFJlc291cmNlc1BsdWdpbi5nZXRXb3Jrc3BhY2UoKS5pc0F1dG9CdWlsZGluZygpKXsKLQkJCWlmIChpc1dvcmtzcGFjZSAmJiBwcmVCdWlsZCAmJiBraW5kID09IEluY3JlbWVudGFsUHJvamVjdEJ1aWxkZXIuQ0xFQU5fQlVJTEQpewotCQkJCV9kaXNjYXJkQXV0b1Bvc3QgPSAxOwotCQkJCXJldHVybiB0cnVlOwotCQkJfQotCQkJCi0JCQlpZiAoaXNXb3Jrc3BhY2UgJiYgcHJlQnVpbGQgJiYga2luZCA9PSBJbmNyZW1lbnRhbFByb2plY3RCdWlsZGVyLkFVVE9fQlVJTEQpcmV0dXJuIHRydWU7Ci0JCX0KLQkJZWxzZSB7Ci0JCQlpZiAoaXNXb3Jrc3BhY2UgJiYgcHJlQnVpbGQgJiYga2luZCA9PSBJbmNyZW1lbnRhbFByb2plY3RCdWlsZGVyLklOQ1JFTUVOVEFMX0JVSUxEKXJldHVybiB0cnVlOwotCQl9Ci0JCXJldHVybiBmYWxzZTsKLQl9Ci0KLQkvKioKLQkgKiBEZXRlcm1pbmUgaWYgd2UgYXJlIGF0IHRoZSBlbmQgb2YgYSBidWlsZCBjeWNsZS4gVGhpcyB3aWxsIGdpdmUgY2FsbGVycyB0aGUgYWJpbGl0eSB0bwotCSAqIGNsZWFyIGNhY2hlcyBldGMuCi0JICogIAotCSAqIEBwYXJhbSBldmVudAotCSAqIEByZXR1cm4gcmV0dXJuIHRydWUgaWYgd2UgYXJlIGp1c3QgZmluaXNoaW5nIGEgYnVpbGQuCi0JICovCi0JcHJpdmF0ZSBib29sZWFuIGlzQnVpbGRGaW5pc2hlZChJUmVzb3VyY2VDaGFuZ2VFdmVudCBldmVudCkgewotCQkKLQkJaWYgKF9vcGVyYXRpb24gPT0gbnVsbClyZXR1cm4gZmFsc2U7Ci0JCQotCQlpbnQgdHlwZSA9IGV2ZW50LmdldFR5cGUoKTsKLQkJaW50IGtpbmQgPSBldmVudC5nZXRCdWlsZEtpbmQoKTsKLQkJYm9vbGVhbiBpc1dvcmtzcGFjZSA9IGV2ZW50LmdldFNvdXJjZSgpIGluc3RhbmNlb2YgSVdvcmtzcGFjZTsKLQkJYm9vbGVhbiBwb3N0QnVpbGQgPSAodHlwZSAmIElSZXNvdXJjZUNoYW5nZUV2ZW50LlBPU1RfQlVJTEQpICE9IDA7Ci0KLQkJCi0JCWlmIChSZXNvdXJjZXNQbHVnaW4uZ2V0V29ya3NwYWNlKCkuaXNBdXRvQnVpbGRpbmcoKSl7Ci0JCQlpZiAoaXNXb3Jrc3BhY2UgJiYgcG9zdEJ1aWxkICYmIGtpbmQgPT0gSW5jcmVtZW50YWxQcm9qZWN0QnVpbGRlci5BVVRPX0JVSUxEKXsKLQkJCQlpZiAoX2Rpc2NhcmRBdXRvUG9zdCA9PSAxKV9kaXNjYXJkQXV0b1Bvc3QgPSAwOwotCQkJCWVsc2UgcmV0dXJuIHRydWU7Ci0JCQl9Ci0JCX0KLQkJZWxzZSB7Ci0JCQlpZiAoaXNXb3Jrc3BhY2UgJiYgcG9zdEJ1aWxkICYmIGtpbmQgPT0gSW5jcmVtZW50YWxQcm9qZWN0QnVpbGRlci5JTkNSRU1FTlRBTF9CVUlMRClyZXR1cm4gdHJ1ZTsKLQkJfQotCQkKLQkJcmV0dXJuIGZhbHNlOwotCX0KLQkKLQlwcml2YXRlIHZvaWQgcHJvY2Vzc0NsZWFuKElSZXNvdXJjZUNoYW5nZUV2ZW50IGV2ZW50KXsKLQkJLy8gT3JpZ2luYWxseSBJIHdhcyB1c2luZyB0aGlzIHRvIG1vbml0b3IgSVByb2plY3QgYnVpbGQgcmVxdWVzdHMgYXMgd2VsbCwgYnV0IHRoYXQgaXMgbm90IG5vdCBuZWVkZWQKLQkJLy8gc2luY2UgdGhlc2Ugd2lsbCBiZSBoYW5kbGVkIGJ5IHRoZSBJbmNyZW1lbnRhbFByb2plY3RCdWlsZGVyLmNsZWFuKCkgbWV0aG9kLgotCQlJUHJvZ3Jlc3NNb25pdG9yIG1vbml0b3IgPSBuZXcgTnVsbFByb2dyZXNzTW9uaXRvcigpOwotCQlPYmplY3Qgc291cmNlID0gZXZlbnQuZ2V0U291cmNlKCk7Ci0JCWlmIChzb3VyY2UgaW5zdGFuY2VvZiBJV29ya3NwYWNlKSB7Ci0JCQlWYWxNYW5hZ2VyLmdldERlZmF1bHQoKS5jbGVhbihudWxsLCBnZXRPcGVyYXRpb24oKSwgbW9uaXRvcik7Ci0JCX0KLQkJCi0JfQotCi0JLyoqCi0JICogQW5zd2VyIHRoZSBjdXJyZW50IHZhbGlkYXRpb24gb3BlcmF0aW9uLiBJZiB3ZSBhcmUgbm90IGluIGEgbXVsdGlwbGUgcHJvamVjdCB2YWxpZGF0aW9uCi0JICogd2Ugd2lsbCByZXR1cm4gYSBuZXcgb25lLiAKLQkgKi8KLQlwdWJsaWMgVmFsT3BlcmF0aW9uIGdldE9wZXJhdGlvbigpIHsKLQkJLyoKLQkJICogSWYgd2UgZG9uJ3QgaGF2ZSBhIGN1cnJlbnQgb3BlcmF0aW9uLCB3ZSBjcmVhdGUgYSBuZXcgb25lLiBUaGUgb25seSB0aW1lIHdlIHNhdmUKLQkJICogdGhlIG9wZXJhdGlvbiBpcyB3aGVuIHdlIGFyZSBzdXJlIHRoYXQgd2UgYXJlIGluIGEgbXVsdGkgcHJvamVjdCB2YWxpZGF0aW9uLgotCQkgKi8KLQkJaWYgKF9vcGVyYXRpb24gPT0gbnVsbClyZXR1cm4gbmV3IFZhbE9wZXJhdGlvbigpOwotCQlyZXR1cm4gX29wZXJhdGlvbjsKLQl9Ci0KLX0KZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24vdmYyL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL2ludGVybmFsL1ZhbFByZWZNYW5hZ2VyR2xvYmFsLmphdmEgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uL3ZmMi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9pbnRlcm5hbC9WYWxQcmVmTWFuYWdlckdsb2JhbC5qYXZhCmluZGV4IGExODdjZmEuLjM0NGVkMGYgMTAwNjQ0Ci0tLSBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24vdmYyL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL2ludGVybmFsL1ZhbFByZWZNYW5hZ2VyR2xvYmFsLmphdmEKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi92ZjIvb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vaW50ZXJuYWwvVmFsUHJlZk1hbmFnZXJHbG9iYWwuamF2YQpAQCAtMTAsMjggKzEwLDMxIEBACiAgKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKi8KIHBhY2thZ2Ugb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uaW50ZXJuYWw7CiAKK2ltcG9ydCBqYXZhLmxhbmcucmVmbGVjdC5JbnZvY2F0aW9uVGFyZ2V0RXhjZXB0aW9uOwogaW1wb3J0IGphdmEudXRpbC5Db2xsZWN0aW9uOwogaW1wb3J0IGphdmEudXRpbC5IYXNoTWFwOwogaW1wb3J0IGphdmEudXRpbC5MaW5rZWRMaXN0OwogaW1wb3J0IGphdmEudXRpbC5MaXN0OwogaW1wb3J0IGphdmEudXRpbC5NYXA7CitpbXBvcnQgamF2YS51dGlsLlNldDsKK2ltcG9ydCBqYXZhLnV0aWwuY29uY3VycmVudC5Db3B5T25Xcml0ZUFycmF5U2V0OworaW1wb3J0IGphdmEudXRpbC5jb25jdXJyZW50LmF0b21pYy5BdG9taWNSZWZlcmVuY2U7CiAKLWltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJ1bnRpbWUucHJlZmVyZW5jZXMuSUVjbGlwc2VQcmVmZXJlbmNlczsKK2ltcG9ydCBvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5GcmllbmQ7CiBpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uTWVzc2FnZVNldmVyaXR5U2V0dGluZzsKLWltcG9ydCBvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5WYWxpZGF0aW9uRnJhbWV3b3JrOwogaW1wb3J0IG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLlZhbGlkYXRvcjsKIGltcG9ydCBvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5WYWxpZGF0b3IuVjI7CiBpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uaW50ZXJuYWwubW9kZWwuRmlsdGVyR3JvdXA7CiBpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uaW50ZXJuYWwubW9kZWwuR2xvYmFsUHJlZmVyZW5jZXM7CitpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uaW50ZXJuYWwubW9kZWwuR2xvYmFsUHJlZmVyZW5jZXNWYWx1ZXM7CiBpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uaW50ZXJuYWwucGx1Z2luLlZhbGlkYXRpb25QbHVnaW47CiBpbXBvcnQgb3JnLm9zZ2kuc2VydmljZS5wcmVmcy5CYWNraW5nU3RvcmVFeGNlcHRpb247Ci1pbXBvcnQgb3JnLm9zZ2kuc2VydmljZS5wcmVmcy5QcmVmZXJlbmNlczsKIAogLyoqCiAgKiBBIGNsYXNzIHRoYXQga25vd3MgaG93IHRvIG1hbmFnZSB0aGUgZ2xvYmFsIHBlcnNpc3RlZCB2YWxpZGF0aW9uIHNldHRpbmdzLgogICogQGF1dGhvciBrYXJhc2l1awogICovCi1wdWJsaWMgY2xhc3MgVmFsUHJlZk1hbmFnZXJHbG9iYWwgeworcHVibGljIGZpbmFsIGNsYXNzIFZhbFByZWZNYW5hZ2VyR2xvYmFsIHsKIAkKIAkvKiogCiAJICogVmVyc2lvbiBvZiB0aGUgZnJhbWV3b3JrIHByb3BlcnRpZXMuCkBAIC00MywyMCArNDYsMTcgQEAKIAkgKi8KIAlwdWJsaWMgZmluYWwgc3RhdGljIGludCBmcmFtZXdvcmtWZXJzaW9uID0gMzsKIAkKLQlwcml2YXRlIExpc3Q8SVZhbENoYW5nZWRMaXN0ZW5lcj4gX2xpc3RlbmVycyA9IG5ldyBMaW5rZWRMaXN0PElWYWxDaGFuZ2VkTGlzdGVuZXI+KCk7Ci0JcHJpdmF0ZSBzdGF0aWMgVmFsUHJlZk1hbmFnZXJHbG9iYWwgX21lOworCXByaXZhdGUgZmluYWwgU2V0PElWYWxDaGFuZ2VkTGlzdGVuZXI+IF9saXN0ZW5lcnMgPSBuZXcgQ29weU9uV3JpdGVBcnJheVNldDxJVmFsQ2hhbmdlZExpc3RlbmVyPigpOwogCQotCXByaXZhdGUgTGlzdDxWYWxpZGF0b3I+IF92YWxpZGF0b3JzOworCXByaXZhdGUgZmluYWwgQXRvbWljUmVmZXJlbmNlPExpc3Q8VmFsaWRhdG9yPj4gX3ZhbGlkYXRvcnMgPSBuZXcgQXRvbWljUmVmZXJlbmNlPExpc3Q8VmFsaWRhdG9yPj4oKTsKIAkKIAlwcml2YXRlIFZhbFByZWZNYW5hZ2VyR2xvYmFsKCl7fQogCQogCXB1YmxpYyBzdGF0aWMgVmFsUHJlZk1hbmFnZXJHbG9iYWwgZ2V0RGVmYXVsdCgpewotCQlpZiAoX21lID09IG51bGwpX21lID0gbmV3IFZhbFByZWZNYW5hZ2VyR2xvYmFsKCk7Ci0JCXJldHVybiBfbWU7CisJCXJldHVybiBTaW5nbGV0b24udmFsUHJlZk1hbmFnZXJHbG9iYWw7CiAJfQogCQogCXB1YmxpYyB2b2lkIGFkZExpc3RlbmVyKElWYWxDaGFuZ2VkTGlzdGVuZXIgbGlzdGVuZXIpewotCQlpZiAoX2xpc3RlbmVycy5jb250YWlucyhsaXN0ZW5lcikpcmV0dXJuOwogCQlfbGlzdGVuZXJzLmFkZChsaXN0ZW5lcik7CiAJfQogCQpAQCAtMTA2LDEwICsxMDYsMTAgQEAKIAkgKiBBbnN3ZXIgdGhlIHYyIHZhbGlkYXRvcnMgdGhhdCBoYXZlIGJlZW4gb3ZlcnJpZGRlbiBieSB0aGUgZ2xvYmFsIHByZWZlcmVuY2VzLgogCSAqLwogCXB1YmxpYyBMaXN0PFZhbGlkYXRvcj4gZ2V0VmFsaWRhdG9ycygpIHRocm93cyBCYWNraW5nU3RvcmVFeGNlcHRpb24gewotCQlMaXN0PFZhbGlkYXRvcj4gdmFscyA9IF92YWxpZGF0b3JzOwotCQlpZiAodmFscyA9PSBudWxsKXsKKwkJTGlzdDxWYWxpZGF0b3I+IHZhbHMgPSBfdmFsaWRhdG9ycy5nZXQoKTsKKwkJd2hpbGUgKHZhbHMgPT0gbnVsbCl7CiAJCQl2YWxzID0gbG9hZFZhbGlkYXRvcnMoKTsKLQkJCV92YWxpZGF0b3JzID0gdmFsczsKKwkJCWlmICghX3ZhbGlkYXRvcnMuY29tcGFyZUFuZFNldChudWxsLCB2YWxzKSl2YWxzID0gX3ZhbGlkYXRvcnMuZ2V0KCk7CiAJCX0KIAkJcmV0dXJuIHZhbHM7CiAJfQpAQCAtMTIwLDkgKzEyMCw5IEBACiAJICovCiAJcHJpdmF0ZSBMaXN0PFZhbGlkYXRvcj4gbG9hZFZhbGlkYXRvcnMoKSB0aHJvd3MgQmFja2luZ1N0b3JlRXhjZXB0aW9uIHsKIAkJTGlua2VkTGlzdDxWYWxpZGF0b3I+IGxpc3QgPSBuZXcgTGlua2VkTGlzdDxWYWxpZGF0b3I+KCk7Ci0JCUlFY2xpcHNlUHJlZmVyZW5jZXMgcHJlZiA9IFZhbGlkYXRpb25GcmFtZXdvcmsuZ2V0RGVmYXVsdCgpLmdldFByZWZlcmVuY2VTdG9yZSgpOworCQlQcmVmZXJlbmNlc1dyYXBwZXIgcHJlZiA9IFByZWZlcmVuY2VzV3JhcHBlci5nZXRQcmVmZXJlbmNlcyhudWxsLCBudWxsKTsKIAkJaWYgKHByZWYubm9kZUV4aXN0cyhQcmVmQ29uc3RhbnRzLnZhbHMpKXsKLQkJCVByZWZlcmVuY2VzIHZhbHMgPSBwcmVmLm5vZGUoUHJlZkNvbnN0YW50cy52YWxzKTsKKwkJCVByZWZlcmVuY2VzV3JhcHBlciB2YWxzID0gcHJlZi5ub2RlKFByZWZDb25zdGFudHMudmFscyk7CiAJCQlmb3IgKFN0cmluZyBpZCA6IHZhbHMuY2hpbGRyZW5OYW1lcygpKXsKIAkJCQlWYWxpZGF0b3IgYmFzZSA9IEV4dGVuc2lvblZhbGlkYXRvcnMuaW5zdGFuY2UoKS5nZXRNYXBWMigpLmdldChpZCk7CiAJCQkJVmFsaWRhdG9yIHYgPSBsb2FkVmFsaWRhdG9yKGlkLCB2YWxzLCBiYXNlKTsKQEAgLTE1MCwxMCArMTUwLDEwIEBACiAJICogQHJldHVybiBBIG5ldyB2YWxpZGF0b3IgdGhhdCBpcyBhIGNvcHkgb2YgdGhlIGV4dGVuc2lvbiBwb2ludCB2YWxpZGF0b3IKIAkgKiAgICAgICAgIHdpdGggdGhlIHVwZGF0ZXMgZnJvbSB0aGUgcHJlZmVyZW5jZSBzdG9yZS4KIAkgKi8KLQlzdGF0aWMgVmFsaWRhdG9yIGxvYWRWYWxpZGF0b3IoU3RyaW5nIGlkLCBQcmVmZXJlbmNlcyB2YWxzTm9kZSwgVmFsaWRhdG9yIGJhc2UpIHsKKwlzdGF0aWMgVmFsaWRhdG9yIGxvYWRWYWxpZGF0b3IoU3RyaW5nIGlkLCBQcmVmZXJlbmNlc1dyYXBwZXIgdmFsc05vZGUsIFZhbGlkYXRvciBiYXNlKSB7CiAJCWlmIChiYXNlID09IG51bGwpcmV0dXJuIG51bGw7CiAJCQotCQlQcmVmZXJlbmNlcyB2cCA9IHZhbHNOb2RlLm5vZGUoaWQpOworCQlQcmVmZXJlbmNlc1dyYXBwZXIgdnAgPSB2YWxzTm9kZS5ub2RlKGlkKTsKIAkJYmFzZSA9IGJhc2UuY29weSgpOwogCQlWMiB2MiA9IGJhc2UuYXNWMlZhbGlkYXRvcigpOwogCkBAIC0xNzMsNiArMTczLDE4IEBACiAJCQkJd2hpbGUoZGVzLmhhc05leHQoKSlsaXN0LmFkZChGaWx0ZXJHcm91cC5jcmVhdGUoZGVzKSk7CiAJCQkJdjIuc2V0R3JvdXBzKGxpc3QpOwogCQkJfQorCQkJCisJCQlTdHJpbmcgc2V0dGluZ3MgPSB2cC5nZXQoUHJlZkNvbnN0YW50cy5tc2dzLCAiIik7IC8vJE5PTi1OTFMtMSQKKwkJCWlmIChzZXR0aW5ncy5sZW5ndGgoKSA+MCkKKwkJCXsKKwkJCQlNYXA8U3RyaW5nLCBNZXNzYWdlU2V2ZXJpdHlTZXR0aW5nLlNldmVyaXR5PiBtYXAgPSBNc2dzLmRlc2VyaWFsaXplKHNldHRpbmdzKTsKKwkJCQlNYXA8U3RyaW5nLCBNZXNzYWdlU2V2ZXJpdHlTZXR0aW5nPiBtc2cgPSBiYXNlLmdldE1lc3NhZ2VTZXR0aW5ncygpOworCQkJCisJCQkJZm9yIChNYXAuRW50cnk8U3RyaW5nLCBNZXNzYWdlU2V2ZXJpdHlTZXR0aW5nLlNldmVyaXR5PiBtZSA6IG1hcC5lbnRyeVNldCgpKXsKKwkJCQkJTWVzc2FnZVNldmVyaXR5U2V0dGluZyBtcyA9IG1zZy5nZXQobWUuZ2V0S2V5KCkpOworCQkJCQlpZiAobXMgIT0gbnVsbCltcy5zZXRDdXJyZW50KG1lLmdldFZhbHVlKCkpOworCQkJCX0JCisJCQl9CiAJCX0JCQkJCQogCQlyZXR1cm4gYmFzZTsKIAl9CkBAIC0xODIsMTYgKzE5NCwxOCBAQAogCSAqIAogCSAqIEBzZWUgVmFsTWFuYWdlciNnZXRHbG9iYWxQcmVmZXJlbmNlcygpCiAJICovCi0JcHVibGljIHZvaWQgbG9hZEdsb2JhbFByZWZlcmVuY2VzKEdsb2JhbFByZWZlcmVuY2VzIGdwKSB7Ci0JCUlFY2xpcHNlUHJlZmVyZW5jZXMgcHJlZiA9IFZhbGlkYXRpb25GcmFtZXdvcmsuZ2V0RGVmYXVsdCgpLmdldFByZWZlcmVuY2VTdG9yZSgpOwotCQlncC5zZXRTYXZlQXV0b21hdGljYWxseShwcmVmLmdldEJvb2xlYW4oUHJlZkNvbnN0YW50cy5zYXZlQXV0bywgR2xvYmFsUHJlZmVyZW5jZXMuRGVmYXVsdEF1dG9TYXZlKSk7Ci0JCWdwLnNldERpc2FibGVBbGxWYWxpZGF0aW9uKHByZWYuZ2V0Qm9vbGVhbihQcmVmQ29uc3RhbnRzLnN1c3BlbmQsIEdsb2JhbFByZWZlcmVuY2VzLkRlZmF1bHRTdXNwZW5kKSk7Ci0JCWdwLnNldENvbmZpcm1EaWFsb2cocHJlZi5nZXRCb29sZWFuKFByZWZDb25zdGFudHMuY29uZmlybURpYWxvZywgR2xvYmFsUHJlZmVyZW5jZXMuRGVmYXVsdENvbmZpcm0pKTsKLQkJZ3Auc2V0T3ZlcnJpZGUocHJlZi5nZXRCb29sZWFuKFByZWZDb25zdGFudHMub3ZlcnJpZGUsIEdsb2JhbFByZWZlcmVuY2VzLkRlZmF1bHRPdmVycmlkZSkpOwotCQlncC5zZXRWZXJzaW9uKHByZWYuZ2V0SW50KFByZWZDb25zdGFudHMuZnJhbWV3b3JrVmVyc2lvbiwgR2xvYmFsUHJlZmVyZW5jZXMuRGVmYXVsdEZyYW1ld29ya1ZlcnNpb24pKTsKLQkJZ3Auc2V0U3RhdGVUaW1lU3RhbXAocHJlZi5nZXRMb25nKFByZWZDb25zdGFudHMuc3RhdGVUUywgMCkpOworCXB1YmxpYyBHbG9iYWxQcmVmZXJlbmNlcyBsb2FkR2xvYmFsUHJlZmVyZW5jZXMoKSB7CisJCVByZWZlcmVuY2VzV3JhcHBlciBwcmVmID0gUHJlZmVyZW5jZXNXcmFwcGVyLmdldFByZWZlcmVuY2VzKG51bGwsIG51bGwpOworCQlHbG9iYWxQcmVmZXJlbmNlc1ZhbHVlcyBncCA9IG5ldyBHbG9iYWxQcmVmZXJlbmNlc1ZhbHVlcygpOworCQlncC5zYXZlQXV0b21hdGljYWxseSA9IHByZWYuZ2V0Qm9vbGVhbihQcmVmQ29uc3RhbnRzLnNhdmVBdXRvLCBHbG9iYWxQcmVmZXJlbmNlcy5EZWZhdWx0QXV0b1NhdmUpOworCQlncC5kaXNhYmxlQWxsVmFsaWRhdGlvbiA9IHByZWYuZ2V0Qm9vbGVhbihQcmVmQ29uc3RhbnRzLnN1c3BlbmQsIEdsb2JhbFByZWZlcmVuY2VzLkRlZmF1bHRTdXNwZW5kKTsKKwkJZ3AuY29uZmlybURpYWxvZyA9IHByZWYuZ2V0Qm9vbGVhbihQcmVmQ29uc3RhbnRzLmNvbmZpcm1EaWFsb2csIEdsb2JhbFByZWZlcmVuY2VzLkRlZmF1bHRDb25maXJtKTsKKwkJZ3Aub3ZlcnJpZGUgPSBwcmVmLmdldEJvb2xlYW4oUHJlZkNvbnN0YW50cy5vdmVycmlkZSwgR2xvYmFsUHJlZmVyZW5jZXMuRGVmYXVsdE92ZXJyaWRlKTsKKwkJZ3AudmVyc2lvbiA9IHByZWYuZ2V0SW50KFByZWZDb25zdGFudHMuZnJhbWV3b3JrVmVyc2lvbiwgR2xvYmFsUHJlZmVyZW5jZXMuRGVmYXVsdEZyYW1ld29ya1ZlcnNpb24pOworCQlncC5zdGF0ZVRpbWVTdGFtcCA9IHByZWYuZ2V0TG9uZyhQcmVmQ29uc3RhbnRzLnN0YXRlVFMsIDApOwogCQkKLQkJaWYgKGdwLmdldFZlcnNpb24oKSAhPSBmcmFtZXdvcmtWZXJzaW9uKW1pZ3JhdGUoZ3AuZ2V0VmVyc2lvbigpLCBwcmVmKTsKKwkJaWYgKGdwLnZlcnNpb24gIT0gZnJhbWV3b3JrVmVyc2lvbiltaWdyYXRlKGdwLnZlcnNpb24sIHByZWYpOworCQlyZXR1cm4gbmV3IEdsb2JhbFByZWZlcmVuY2VzKGdwKTsKIAl9CiAJCiAJLyoqCkBAIC0xOTksNyArMjEzLDcgQEAKIAkgKiBAcGFyYW0gdmVyc2lvbiBUaGUgaW5jb21pbmcgdmVyc2lvbiBvZiB0aGUgcHJlZmVyZW5jZXMuCiAJICogQHBhcmFtIHByZWYgdGhlIHJvb3Qgb2YgdGhlIHByZWZlcmVuY2Ugc3RvcmUKIAkgKi8KLQlzdGF0aWMgdm9pZCBtaWdyYXRlKGludCB2ZXJzaW9uLCBJRWNsaXBzZVByZWZlcmVuY2VzIHByZWYpIHsKKwlzdGF0aWMgdm9pZCBtaWdyYXRlKGludCB2ZXJzaW9uLCBQcmVmZXJlbmNlc1dyYXBwZXIgcHJlZikgewogCQl0cnkgewogCQkJYm9vbGVhbiB1cGRhdGUgPSBmYWxzZTsKIAkJCWlmICh2ZXJzaW9uID09IDIpewpAQCAtMjgyLDIwICsyOTYsMjcgQEAKIAkgKiAgICAgICAgICAgIHZhbGlkYXRvcnMuIElmIHdlIGFyZSB1cGRhdGluZyBhIHByb2plY3QncyB2YWxpZGF0b3JzLCB0aGVuCiAJICogICAgICAgICAgICB0aGlzIG1hcCB3b3VsZCBiZSB0aGUgcHJlZmVyZW5jZSBwYWdlIHZhbGlkYXRvcnMuCiAJICovCi0Jc3RhdGljIHZvaWQgc2F2ZShWYWxpZGF0b3IgdmFsaWRhdG9yLCBQcmVmZXJlbmNlcyByb290LCBNYXA8U3RyaW5nLCBWYWxpZGF0b3I+IGJhc2VWYWxpZGF0b3JzKSB0aHJvd3MgQmFja2luZ1N0b3JlRXhjZXB0aW9uIHsKKwlzdGF0aWMgdm9pZCBzYXZlKFZhbGlkYXRvciB2YWxpZGF0b3IsIFByZWZlcmVuY2VzV3JhcHBlciByb290LCBNYXA8U3RyaW5nLCBWYWxpZGF0b3I+IGJhc2VWYWxpZGF0b3JzKSB0aHJvd3MgQmFja2luZ1N0b3JlRXhjZXB0aW9uIHsKIAkJVmFsaWRhdG9yLlYyIHYyID0gdmFsaWRhdG9yLmFzVjJWYWxpZGF0b3IoKTsKIAkJaWYgKHYyID09IG51bGwpcmV0dXJuOwogCQkKLQkJUHJlZmVyZW5jZXMgdnAgPSByb290Lm5vZGUodmFsaWRhdG9yLmdldElkKCkpOwotCQlpZiAodmFsaWRhdG9yLnNhbWVDb25maWcoYmFzZVZhbGlkYXRvcnMuZ2V0KHZhbGlkYXRvci5nZXRJZCgpKSkpewotCQkJdnAucmVtb3ZlTm9kZSgpOworCQlmaW5hbCBTdHJpbmcgaWQgPSB2YWxpZGF0b3IuZ2V0SWQoKTsKKwkJYm9vbGVhbiBoYXNOb2RlID0gcm9vdC5ub2RlRXhpc3RzKGlkKTsKKwkJCisJCWlmICh2YWxpZGF0b3Iuc2FtZUNvbmZpZyhiYXNlVmFsaWRhdG9ycy5nZXQoaWQpKSl7CisJCQlpZiAoaGFzTm9kZSl7CisJCQkJUHJlZmVyZW5jZXNXcmFwcGVyIHZwID0gcm9vdC5ub2RlKGlkKTsKKwkJCQl2cC5yZW1vdmVOb2RlKCk7CisJCQl9CiAJCQlyZXR1cm47CiAJCX0KIAkJaWYgKCF2YWxpZGF0b3IuaXNDaGFuZ2VkKCkpcmV0dXJuOwotCQlpZiAodmFsaWRhdG9yLmdldENoYW5nZUNvdW50R2xvYmFsKCkgPiAwKXsKKwkJUHJlZmVyZW5jZXNXcmFwcGVyIHZwID0gcm9vdC5ub2RlKGlkKTsKKwkJaWYgKHZhbGlkYXRvci5oYXNHbG9iYWxDaGFuZ2VzKCkpewogCQkJR2xvYmFsIGcgPSBuZXcgR2xvYmFsKHZhbGlkYXRvci5pc01hbnVhbFZhbGlkYXRpb24oKSwgdmFsaWRhdG9yLmlzQnVpbGRWYWxpZGF0aW9uKCksIHZhbGlkYXRvci5nZXRWZXJzaW9uKCksCiAJCQkJdmFsaWRhdG9yLmdldERlbGVnYXRpbmdJZCgpKTsKIAkJCXZwLnB1dChQcmVmQ29uc3RhbnRzLmdsb2JhbCwgZy5zZXJpYWxpemUoKSk7CisJCQlGcmllbmQuc2V0TWlncmF0ZWQodmFsaWRhdG9yLCBmYWxzZSk7CiAJCX0KIAkJCiAJCWlmICh2YWxpZGF0b3IuZ2V0Q2hhbmdlQ291bnRNZXNzYWdlcygpID4gMCl7CkBAIC0zMTQsMTUgKzMzNSw2NSBAQAogCQkJfQogCQl9CiAJfQorCS8qKgorCSAqIFNhdmUgdGhlIHZhbGlkYXRvciBpbnRvIHRoZSBwcmVmZXJlbmNlIHN0b3JlLgorCSAqIAorCSAqIEBwYXJhbSB2YWxpZGF0b3IKKwkgKiAgICAgICAgICAgIFRoZSB2YWxpZGF0b3IgYmVpbmcgc2F2ZWQuCisJICogCisJICogQHBhcmFtIHJvb3QKKwkgKiAgICAgICAgICAgIFRoZSB0b3Agb2YgdGhlIHByZWZlcmVuY2UgdHJlZSBmb3IgdmFsaWRhdG9ycywgaS5lLgorCSAqICAgICAgICAgICAgL2luc3RhbmNlL3ZhbGlkYXRvci1mcmFtZXdvcmstaWQvdmFscyBmb3Igd29ya3NwYWNlIHZhbGlkYXRvcnMKKwkgKiAgICAgICAgICAgIGFuZCAvdmFscyBmb3IgcHJvamVjdCB2YWxpZGF0b3JzLgorCSAqICAgICAgICAgICAgCisJICogQHBhcmFtIGJhc2VWYWxpZGF0b3JzCisJICogICAgICAgICAgICBBIG1hcCBvZiB0aGUgdmFsaWRhdG9ycyB0aGF0IGFyZSBvbmUgbGV2ZWwgaGlnaGVyIGluIHRoZQorCSAqICAgICAgICAgICAgc3RvcmFnZSBoaWVyYXJjaHkuIFNvIGlmIHdlIGFyZSB1cGRhdGluZyB0aGUgcHJlZmVyZW5jZSBwYWdlCisJICogICAgICAgICAgICB2YWxpZGF0b3JzLCB0aGVuIHRoaXMgbWFwIHdvdWxkIGJlIHRoZSBleHRlbnNpb24gcG9pbnQKKwkgKiAgICAgICAgICAgIHZhbGlkYXRvcnMuIElmIHdlIGFyZSB1cGRhdGluZyBhIHByb2plY3QncyB2YWxpZGF0b3JzLCB0aGVuCisJICogICAgICAgICAgICB0aGlzIG1hcCB3b3VsZCBiZSB0aGUgcHJlZmVyZW5jZSBwYWdlIHZhbGlkYXRvcnMuCisJICovCisJc3RhdGljIHZvaWQgc2F2ZShWYWxpZGF0b3JNdXRhYmxlIHZhbGlkYXRvciwgUHJlZmVyZW5jZXNXcmFwcGVyIHJvb3QsIE1hcDxTdHJpbmcsIFZhbGlkYXRvcj4gYmFzZVZhbGlkYXRvcnMpIHRocm93cyBCYWNraW5nU3RvcmVFeGNlcHRpb24geworCQlpZiAoIXZhbGlkYXRvci5pc1YyVmFsaWRhdG9yKCkpcmV0dXJuOworCQkKKwkJUHJlZmVyZW5jZXNXcmFwcGVyIHZwID0gcm9vdC5ub2RlKHZhbGlkYXRvci5nZXRJZCgpKTsKKwkJaWYgKHZhbGlkYXRvci5zYW1lQ29uZmlnKGJhc2VWYWxpZGF0b3JzLmdldCh2YWxpZGF0b3IuZ2V0SWQoKSkpKXsKKwkJCXZwLnJlbW92ZU5vZGUoKTsKKwkJCXJldHVybjsKKwkJfQorCQlpZiAoIXZhbGlkYXRvci5pc0NoYW5nZWQoKSlyZXR1cm47CisJCWlmICh2YWxpZGF0b3IuaGFzR2xvYmFsQ2hhbmdlcygpKXsKKwkJCUdsb2JhbCBnID0gbmV3IEdsb2JhbCh2YWxpZGF0b3IuaXNNYW51YWxWYWxpZGF0aW9uKCksIHZhbGlkYXRvci5pc0J1aWxkVmFsaWRhdGlvbigpLCB2YWxpZGF0b3IuZ2V0VmVyc2lvbigpLAorCQkJCXZhbGlkYXRvci5nZXREZWxlZ2F0aW5nSWQoKSk7CisJCQl2cC5wdXQoUHJlZkNvbnN0YW50cy5nbG9iYWwsIGcuc2VyaWFsaXplKCkpOworLy8JCQlGcmllbmQuc2V0TWlncmF0ZWQodmFsaWRhdG9yLCBmYWxzZSk7CisJCX0KKwkJCQkKKwkJaWYgKHZhbGlkYXRvci5nZXRDaGFuZ2VDb3VudEdyb3VwcygpID4gMCl7CisJCQlGaWx0ZXJHcm91cFtdIGdyb3VwcyA9IHZhbGlkYXRvci5nZXRHcm91cHMoKTsKKwkJCWlmIChncm91cHMubGVuZ3RoID4gMCl7CisJCQkJU2VyaWFsaXplciBzZXIgPSBuZXcgU2VyaWFsaXplcig1MDApOworCQkJCWZvciAoRmlsdGVyR3JvdXAgZ3JvdXAgOiBncm91cHMpZ3JvdXAuc2F2ZShzZXIpOworCQkJCXZwLnB1dChQcmVmQ29uc3RhbnRzLmdyb3Vwcywgc2VyLnRvU3RyaW5nKCkpOworCQkJfQorCQl9CisJCWlmICh2YWxpZGF0b3IuZ2V0Q2hhbmdlQ291bnRNZXNzYWdlcygpID4gMCl7CisJCQlDb2xsZWN0aW9uPE1lc3NhZ2VTZXZlcml0eVNldHRpbmc+IG1zZ3MgPSB2YWxpZGF0b3IuZ2V0TWVzc2FnZVNldHRpbmdzKCkudmFsdWVzKCk7CisJCQlpZiAobXNncy5zaXplKCkgPiAwKXsKKwkJCQl2cC5wdXQoUHJlZkNvbnN0YW50cy5tc2dzLCBNc2dzLnNlcmlhbGl6ZShtc2dzKSk7CisJCQl9CisJCX0KKwkJCisJfQogCQogCXB1YmxpYyB2b2lkIHNhdmVBc1ByZWZzKFZhbGlkYXRvcltdIHZhbCkgewogCQl0cnkgewotCQkJSUVjbGlwc2VQcmVmZXJlbmNlcyBwcmVmID0gVmFsaWRhdGlvbkZyYW1ld29yay5nZXREZWZhdWx0KCkuZ2V0UHJlZmVyZW5jZVN0b3JlKCk7Ci0JCQlQcmVmZXJlbmNlcyB2YWxzID0gcHJlZi5ub2RlKFByZWZDb25zdGFudHMudmFscyk7CisJCQlQcmVmZXJlbmNlc1dyYXBwZXIgcHJlZiA9IFByZWZlcmVuY2VzV3JhcHBlci5nZXRQcmVmZXJlbmNlcyhudWxsLCBudWxsKTsKKwkJCVByZWZlcmVuY2VzV3JhcHBlciB2YWxzID0gcHJlZi5ub2RlKFByZWZDb25zdGFudHMudmFscyk7CiAJCQlNYXA8U3RyaW5nLCBWYWxpZGF0b3I+IGJhc2UgPSBFeHRlbnNpb25WYWxpZGF0b3JzLmluc3RhbmNlKCkuZ2V0TWFwVjIoKTsKIAkJCWZvciAoVmFsaWRhdG9yIHYgOiB2YWwpc2F2ZSh2LCB2YWxzLCBiYXNlKTsKIAkJCXByZWYuZmx1c2goKTsKLQkJCV92YWxpZGF0b3JzID0gbnVsbDsKKwkJCV92YWxpZGF0b3JzLnNldChudWxsKTsKIAkJCXVwZGF0ZUxpc3RlbmVycyh0cnVlKTsKIAkJfQogCQljYXRjaCAoQmFja2luZ1N0b3JlRXhjZXB0aW9uIGUpewpAQCAtMzM2LDE0ICs0MDcsMTQgQEAKIAkgKi8KIAlwdWJsaWMgc3luY2hyb25pemVkIHZvaWQgc2F2ZVByZWZlcmVuY2VzKEdsb2JhbFByZWZlcmVuY2VzIGdwLCBWYWxpZGF0b3JbXSB2YWxpZGF0b3JzKXsKIAkJdHJ5IHsKLQkJCUlFY2xpcHNlUHJlZmVyZW5jZXMgcHJlZnMgPSBWYWxpZGF0aW9uRnJhbWV3b3JrLmdldERlZmF1bHQoKS5nZXRQcmVmZXJlbmNlU3RvcmUoKTsKKwkJCVByZWZlcmVuY2VzV3JhcHBlciBwcmVmcyA9IFByZWZlcmVuY2VzV3JhcHBlci5nZXRQcmVmZXJlbmNlcyhudWxsLCBudWxsKTsKIAkJCXNhdmVQcmVmZXJlbmNlcyhwcmVmcywgZ3ApOwotCQkJUHJlZmVyZW5jZXMgdmFscyA9IHByZWZzLm5vZGUoUHJlZkNvbnN0YW50cy52YWxzKTsKKwkJCVByZWZlcmVuY2VzV3JhcHBlciB2YWxzID0gcHJlZnMubm9kZShQcmVmQ29uc3RhbnRzLnZhbHMpOwogCiAJCQlNYXA8U3RyaW5nLCBWYWxpZGF0b3I+IGJhc2UgPSBFeHRlbnNpb25WYWxpZGF0b3JzLmluc3RhbmNlKCkuZ2V0TWFwVjIoKTsKIAkJCWZvciAoVmFsaWRhdG9yIHYgOiB2YWxpZGF0b3JzKXNhdmUodiwgdmFscywgYmFzZSk7CiAJCQlwcmVmcy5mbHVzaCgpOwotCQkJX3ZhbGlkYXRvcnMgPSBudWxsOworCQkJX3ZhbGlkYXRvcnMuc2V0KG51bGwpOwogCQkJdXBkYXRlTGlzdGVuZXJzKHRydWUpOwogCQl9CiAJCWNhdGNoIChCYWNraW5nU3RvcmVFeGNlcHRpb24gZSl7CkBAIC0zNTQsMTMgKzQyNSw3OSBAQAogCS8qKgogCSAqIFNhdmUgdGhlIGdsb2JhbCBwcmVmZXJlbmNlcyBhbmQgdGhlIHZhbGlkYXRvcnMuCiAJICovCi0JcHVibGljIHN5bmNocm9uaXplZCB2b2lkIHNhdmVQcmVmZXJlbmNlcyhHbG9iYWxQcmVmZXJlbmNlcyBncCl7CisJcHVibGljIHN5bmNocm9uaXplZCB2b2lkIHNhdmVQcmVmZXJlbmNlcyhHbG9iYWxQcmVmZXJlbmNlcyBncCwgVmFsaWRhdG9yTXV0YWJsZVtdIHZhbGlkYXRvcnMsIEJvb2xlYW4gcGVyc2lzdCl7CiAJCXRyeSB7Ci0JCQlJRWNsaXBzZVByZWZlcmVuY2VzIHByZWZzID0gVmFsaWRhdGlvbkZyYW1ld29yay5nZXREZWZhdWx0KCkuZ2V0UHJlZmVyZW5jZVN0b3JlKCk7Ci0JCQlib29sZWFuIGlzQ29uZmlnQ2hhbmdlID0gZ3AuaXNDb25maWdDaGFuZ2UoKTsKKwkJCVByZWZlcmVuY2VzV3JhcHBlciBwcmVmcyA9IFByZWZlcmVuY2VzV3JhcHBlci5nZXRQcmVmZXJlbmNlcyhudWxsLCBwZXJzaXN0KTsKKwkJCXNhdmVQcmVmZXJlbmNlcyhwcmVmcywgZ3ApOworCQkJUHJlZmVyZW5jZXNXcmFwcGVyIHZhbHMgPSBwcmVmcy5ub2RlKFByZWZDb25zdGFudHMudmFscyk7CisJCQlNYXA8U3RyaW5nLCBWYWxpZGF0b3I+IGJhc2UgPSBFeHRlbnNpb25WYWxpZGF0b3JzLmluc3RhbmNlKCkuZ2V0TWFwVjIoKTsKKwkJCWZvciAoVmFsaWRhdG9yTXV0YWJsZSB2IDogdmFsaWRhdG9ycylzYXZlKHYsIHZhbHMsIGJhc2UpOworCisJCQlwcmVmcy5mbHVzaCgpOworCQkJX3ZhbGlkYXRvcnMuc2V0KG51bGwpOworCQkJdXBkYXRlTGlzdGVuZXJzKHRydWUpOworCQl9CisJCWNhdGNoIChCYWNraW5nU3RvcmVFeGNlcHRpb24gZSl7CisJCQlWYWxpZGF0aW9uUGx1Z2luLmdldFBsdWdpbigpLmhhbmRsZUV4Y2VwdGlvbihlKTsKKwkJfQorCX0KKwkJCisJLyoqCisJICogU2F2ZSB0aGUgVjEgcHJlZmVyZW5jZXMsIHNvIHRoYXQgdGhlIG9sZCB2YWxpZGF0b3JzIGNvbnRpbnVlIHRvIHdvcmsuCisJICovCisJcHVibGljIHN0YXRpYyB2b2lkIHNhdmVWMVByZWZlcmVuY2VzKFZhbGlkYXRvck11dGFibGVbXSB2YWxpZGF0b3JzLCBCb29sZWFuIHBlcnNpc3RlbnQpeworCQl0cnkgeworCQkJR2xvYmFsQ29uZmlndXJhdGlvbiBnYyA9IENvbmZpZ3VyYXRpb25NYW5hZ2VyLmdldE1hbmFnZXIoKS5nZXRHbG9iYWxDb25maWd1cmF0aW9uKCk7CisJCQlnYy5zZXRFbmFibGVkTWFudWFsVmFsaWRhdG9ycyhnZXRFbmFibGVkTWFudWFsVmFsaWRhdG9ycyh2YWxpZGF0b3JzKSk7CQkJCQorCQkJZ2Muc2V0RW5hYmxlZEJ1aWxkVmFsaWRhdG9ycyhnZXRFbmFibGVkQnVpbGRWYWxpZGF0b3JzKHZhbGlkYXRvcnMpKTsKKworCQkJZ2MucGFzc2l2YXRlKCk7CisJCQlnYy5zdG9yZShwZXJzaXN0ZW50KTsKKwkJfQorCQljYXRjaCAoSW52b2NhdGlvblRhcmdldEV4Y2VwdGlvbiBlKXsKKwkJCVZhbGlkYXRpb25QbHVnaW4uZ2V0UGx1Z2luKCkuaGFuZGxlRXhjZXB0aW9uKGUpOworCQl9CQkJCisJfQorCisJLyoqCisJICogQW5zd2VyIGFsbCB0aGUgVjEgdmFsaWRhdG9ycyB0aGF0IGFyZSBtYW51YWxseSBlbmFibGVkLgorCSAqIEByZXR1cm4KKwkgKi8KKwlwcml2YXRlIHN0YXRpYyBWYWxpZGF0b3JNZXRhRGF0YVtdIGdldEVuYWJsZWRNYW51YWxWYWxpZGF0b3JzKFZhbGlkYXRvck11dGFibGVbXSB2YWxpZGF0b3JzKSB7CisJCUxpc3Q8VmFsaWRhdG9yTWV0YURhdGE+IGxpc3QgPSBuZXcgTGlua2VkTGlzdDxWYWxpZGF0b3JNZXRhRGF0YT4oKTsKKwkJZm9yIChWYWxpZGF0b3JNdXRhYmxlIHYgOiB2YWxpZGF0b3JzKXsKKwkJCWlmICh2LmlzTWFudWFsVmFsaWRhdGlvbigpICYmIHYuaXNWMVZhbGlkYXRvcigpKWxpc3QuYWRkKHYuZ2V0Vm1kKCkpOworCQl9CisJCVZhbGlkYXRvck1ldGFEYXRhW10gcmVzdWx0ID0gbmV3IFZhbGlkYXRvck1ldGFEYXRhW2xpc3Quc2l6ZSgpXTsKKwkJbGlzdC50b0FycmF5KHJlc3VsdCk7CisJCXJldHVybiByZXN1bHQ7CisJfQorCisJLyoqCisJICogQW5zd2VyIGFsbCB0aGUgVjEgdmFsaWRhdG9ycyB0aGF0IGFyZSBlbmFibGVkIGZvciBidWlsZC4KKwkgKiBAcmV0dXJuCisJICovCisJcHJpdmF0ZSBzdGF0aWMgVmFsaWRhdG9yTWV0YURhdGFbXSBnZXRFbmFibGVkQnVpbGRWYWxpZGF0b3JzKFZhbGlkYXRvck11dGFibGVbXSB2YWxpZGF0b3JzKSB7CisJCUxpc3Q8VmFsaWRhdG9yTWV0YURhdGE+IGxpc3QgPSBuZXcgTGlua2VkTGlzdDxWYWxpZGF0b3JNZXRhRGF0YT4oKTsKKwkJZm9yIChWYWxpZGF0b3JNdXRhYmxlIHYgOiB2YWxpZGF0b3JzKXsKKwkJCWlmICh2LmlzQnVpbGRWYWxpZGF0aW9uKCkgJiYgdi5pc1YxVmFsaWRhdG9yKCkpbGlzdC5hZGQodi5nZXRWbWQoKSk7CisJCX0KKwkJVmFsaWRhdG9yTWV0YURhdGFbXSByZXN1bHQgPSBuZXcgVmFsaWRhdG9yTWV0YURhdGFbbGlzdC5zaXplKCldOworCQlsaXN0LnRvQXJyYXkocmVzdWx0KTsKKwkJcmV0dXJuIHJlc3VsdDsKKwl9CisKKwkKKwkvKioKKwkgKiBTYXZlIHRoZSBnbG9iYWwgcHJlZmVyZW5jZXMgYW5kIHRoZSB2YWxpZGF0b3JzLgorCSAqLworCXB1YmxpYyBzeW5jaHJvbml6ZWQgdm9pZCBzYXZlUHJlZmVyZW5jZXMoKXsKKwkJdHJ5IHsKKwkJCUdsb2JhbFByZWZlcmVuY2VzIGdwID0gVmFsTWFuYWdlci5nZXREZWZhdWx0KCkuZ2V0R2xvYmFsUHJlZmVyZW5jZXMoKTsKKwkJCVByZWZlcmVuY2VzV3JhcHBlciBwcmVmcyA9IFByZWZlcmVuY2VzV3JhcHBlci5nZXRQcmVmZXJlbmNlcyhudWxsLCBudWxsKTsKIAkJCXNhdmVQcmVmZXJlbmNlcyhwcmVmcywgZ3ApOwogCQkJcHJlZnMuZmx1c2goKTsKLQkJCXVwZGF0ZUxpc3RlbmVycyhpc0NvbmZpZ0NoYW5nZSk7CisJCQl1cGRhdGVMaXN0ZW5lcnModHJ1ZSk7CiAJCX0KIAkJY2F0Y2ggKEJhY2tpbmdTdG9yZUV4Y2VwdGlvbiBlKXsKIAkJCVZhbGlkYXRpb25QbHVnaW4uZ2V0UGx1Z2luKCkuaGFuZGxlRXhjZXB0aW9uKGUpOwpAQCAtMzcwLDcgKzUwNyw3IEBACiAJLyoqCiAJICogU2F2ZSB0aGUgZ2xvYmFsIHByZWZlcmVuY2VzIGFuZCB0aGUgdmFsaWRhdG9ycy4KIAkgKi8KLQlwcml2YXRlIHZvaWQgc2F2ZVByZWZlcmVuY2VzKElFY2xpcHNlUHJlZmVyZW5jZXMgcHJlZnMsIEdsb2JhbFByZWZlcmVuY2VzIGdwKXsKKwlwcml2YXRlIHZvaWQgc2F2ZVByZWZlcmVuY2VzKFByZWZlcmVuY2VzV3JhcHBlciBwcmVmcywgR2xvYmFsUHJlZmVyZW5jZXMgZ3ApewogCQlwcmVmcy5wdXRCb29sZWFuKFByZWZDb25zdGFudHMuc2F2ZUF1dG8sIGdwLmdldFNhdmVBdXRvbWF0aWNhbGx5KCkpOwogCQlwcmVmcy5wdXRCb29sZWFuKFByZWZDb25zdGFudHMuc3VzcGVuZCwgZ3AuZ2V0RGlzYWJsZUFsbFZhbGlkYXRpb24oKSk7CiAJCXByZWZzLnB1dExvbmcoUHJlZkNvbnN0YW50cy5zdGF0ZVRTLCBncC5nZXRTdGF0ZVRpbWVTdGFtcCgpKTsKQEAgLTM4NSw3ICs1MjIsNyBAQAogCSAqIEBwYXJhbSBzZXR0aW5ncwogCSAqLwogCXB1YmxpYyB2b2lkIGxvYWRNZXNzYWdlcyhWYWxpZGF0b3IgdmFsaWRhdG9yLCBNYXA8U3RyaW5nLCBNZXNzYWdlU2V2ZXJpdHlTZXR0aW5nPiBzZXR0aW5ncykgewotCQlJRWNsaXBzZVByZWZlcmVuY2VzIHByZWYgPSBWYWxpZGF0aW9uRnJhbWV3b3JrLmdldERlZmF1bHQoKS5nZXRQcmVmZXJlbmNlU3RvcmUoKTsKKwkJUHJlZmVyZW5jZXNXcmFwcGVyIHByZWYgPSBQcmVmZXJlbmNlc1dyYXBwZXIuZ2V0UHJlZmVyZW5jZXMobnVsbCwgbnVsbCk7CiAJCXRyeSB7CiAJCQlsb2FkTWVzc2FnZVNldHRpbmdzKHZhbGlkYXRvciwgc2V0dGluZ3MsIHByZWYpOwogCQl9CkBAIC00MDEsMTQgKzUzOCwxNCBAQAogCSAqIEBwYXJhbSBzZXR0aW5ncwogCSAqIEBwYXJhbSByb290IHRoZSByb290IG9mIHRoZSBwcmVmZXJlbmNlIHN0b3JlCiAJICovCi0Jc3RhdGljIHZvaWQgbG9hZE1lc3NhZ2VTZXR0aW5ncyhWYWxpZGF0b3IgdmFsLCBNYXA8U3RyaW5nLCBNZXNzYWdlU2V2ZXJpdHlTZXR0aW5nPiBzZXR0aW5ncywgUHJlZmVyZW5jZXMgcm9vdCkgCisJc3RhdGljIHZvaWQgbG9hZE1lc3NhZ2VTZXR0aW5ncyhWYWxpZGF0b3IgdmFsLCBNYXA8U3RyaW5nLCBNZXNzYWdlU2V2ZXJpdHlTZXR0aW5nPiBzZXR0aW5ncywgUHJlZmVyZW5jZXNXcmFwcGVyIHJvb3QpIAogCQl0aHJvd3MgQmFja2luZ1N0b3JlRXhjZXB0aW9uIHsKIAkJaWYgKCFyb290Lm5vZGVFeGlzdHMoUHJlZkNvbnN0YW50cy52YWxzKSlyZXR1cm47CiAJCQotCQlQcmVmZXJlbmNlcyB2YWxzID0gcm9vdC5ub2RlKFByZWZDb25zdGFudHMudmFscyk7IAorCQlQcmVmZXJlbmNlc1dyYXBwZXIgdmFscyA9IHJvb3Qubm9kZShQcmVmQ29uc3RhbnRzLnZhbHMpOyAKIAkJaWYgKCF2YWxzLm5vZGVFeGlzdHModmFsLmdldElkKCkpKXJldHVybjsKIAkJCi0JCVByZWZlcmVuY2VzIHZhbFByZWZzID0gdmFscy5ub2RlKHZhbC5nZXRJZCgpKTsKKwkJUHJlZmVyZW5jZXNXcmFwcGVyIHZhbFByZWZzID0gdmFscy5ub2RlKHZhbC5nZXRJZCgpKTsKIAkJU3RyaW5nIG1zZ3MgPSB2YWxQcmVmcy5nZXQoUHJlZkNvbnN0YW50cy5tc2dzLCAiIik7IC8vJE5PTi1OTFMtMSQKIAkJaWYgKG1zZ3MubGVuZ3RoKCkgPT0gMClyZXR1cm47CiAJCQpAQCAtNDQ2LDE4ICs1ODMsMTggQEAKIC8vCQl9CiAvLwl9CiAJCi0JcHJpdmF0ZSBzdGF0aWMgY2xhc3MgR2xvYmFsIHsKLQkJcHJpdmF0ZSBib29sZWFuIF9tYW51YWw7Ci0JCXByaXZhdGUgYm9vbGVhbiBfYnVpbGQ7Ci0JCXByaXZhdGUgaW50CQlfdmVyc2lvbjsKLQkJcHJpdmF0ZSBTdHJpbmcJX2RlbGVnYXRpbmc7CisJcHJpdmF0ZSBmaW5hbCBzdGF0aWMgY2xhc3MgR2xvYmFsIHsKKwkJcHJpdmF0ZSBmaW5hbCBib29sZWFuIAlfbWFudWFsOworCQlwcml2YXRlIGZpbmFsIGJvb2xlYW4gCV9idWlsZDsKKwkJcHJpdmF0ZSBmaW5hbCBpbnQJCV92ZXJzaW9uOworCQlwcml2YXRlIGZpbmFsIFN0cmluZwlfZGVsZWdhdGluZzsKIAkJCiAJCXB1YmxpYyBHbG9iYWwoU3RyaW5nIHZhbHVlKXsKIAkJCURlc2VyaWFsaXplciBkID0gbmV3IERlc2VyaWFsaXplcih2YWx1ZSk7CiAJCQlfbWFudWFsID0gZC5nZXRCb29sZWFuKCk7CiAJCQlfYnVpbGQgPSBkLmdldEJvb2xlYW4oKTsKIAkJCV92ZXJzaW9uID0gZC5nZXRJbnQoKTsKLQkJCWlmIChkLmhhc05leHQoKSlfZGVsZWdhdGluZyA9IGQuZ2V0U3RyaW5nKCk7CisJCQlfZGVsZWdhdGluZyA9IGQuaGFzTmV4dCgpID8gZC5nZXRTdHJpbmcoKSA6IG51bGw7CiAJCX0KIAkJCiAJCXB1YmxpYyBHbG9iYWwoYm9vbGVhbiBtYW51YWwsIGJvb2xlYW4gYnVpbGQsIGludCB2ZXJzaW9uLCBTdHJpbmcgZGVsZWdhdGluZyl7CkBAIC00OTMsNyArNjMwLDcgQEAKIAkJfQogCX0KIAkKLQlwcml2YXRlIHN0YXRpYyBjbGFzcyBNc2dzIHsKKwlwcml2YXRlIGZpbmFsIHN0YXRpYyBjbGFzcyBNc2dzIHsKIAkJcHVibGljIHN0YXRpYyBTdHJpbmcgc2VyaWFsaXplKENvbGxlY3Rpb248TWVzc2FnZVNldmVyaXR5U2V0dGluZz4gbWVzc2FnZXMpewogCQkJU2VyaWFsaXplciBzID0gbmV3IFNlcmlhbGl6ZXIoMTAwKTsKIAkJCWZvciAoTWVzc2FnZVNldmVyaXR5U2V0dGluZyBtcyA6IG1lc3NhZ2VzKXsKQEAgLTUyMCw0ICs2NTcsMTYgQEAKIAkJCXJldHVybiBtYXA7CiAJCX0KIAl9CisJCisJLyoqCisJICogU3RvcmUgdGhlIHNpbmdsZXRvbiBmb3IgdGhlIFZhbFByZWZNYW5hZ2VyR2xvYmFsLiBUaGlzIGFwcHJvYWNoIGlzIHVzZWQgdG8gYXZvaWQgaGF2aW5nIHRvIHN5bmNocm9uaXplIHRoZQorCSAqIFZhbFByZWZNYW5hZ2VyR2xvYmFsLmdldERlZmF1bHQoKSBtZXRob2QuCisJICogCisJICogQGF1dGhvciBrYXJhc2l1aworCSAqCisJICovCisJcHJpdmF0ZSBmaW5hbCBzdGF0aWMgY2xhc3MgU2luZ2xldG9uIHsKKwkJZmluYWwgc3RhdGljIFZhbFByZWZNYW5hZ2VyR2xvYmFsIHZhbFByZWZNYW5hZ2VyR2xvYmFsID0gbmV3IFZhbFByZWZNYW5hZ2VyR2xvYmFsKCk7CisJfQorCiB9CmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uL3ZmMi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9pbnRlcm5hbC9WYWxQcmVmTWFuYWdlclByb2plY3QuamF2YSBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24vdmYyL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL2ludGVybmFsL1ZhbFByZWZNYW5hZ2VyUHJvamVjdC5qYXZhCmluZGV4IDcwNmY1OTUuLmMyOGIwMzEgMTAwNjQ0Ci0tLSBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24vdmYyL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL2ludGVybmFsL1ZhbFByZWZNYW5hZ2VyUHJvamVjdC5qYXZhCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24vdmYyL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL2ludGVybmFsL1ZhbFByZWZNYW5hZ2VyUHJvamVjdC5qYXZhCkBAIC0xMCw2ICsxMCw3IEBACiAgKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKi8KIHBhY2thZ2Ugb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uaW50ZXJuYWw7CiAKK2ltcG9ydCBqYXZhLmxhbmcucmVmbGVjdC5JbnZvY2F0aW9uVGFyZ2V0RXhjZXB0aW9uOwogaW1wb3J0IGphdmEudXRpbC5IYXNoTWFwOwogaW1wb3J0IGphdmEudXRpbC5IYXNoU2V0OwogaW1wb3J0IGphdmEudXRpbC5MaW5rZWRMaXN0OwpAQCAtMTgsMjcgKzE5LDMxIEBACiBpbXBvcnQgamF2YS51dGlsLlNldDsKIAogaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucmVzb3VyY2VzLklQcm9qZWN0OwotaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucmVzb3VyY2VzLlByb2plY3RTY29wZTsKLWltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJ1bnRpbWUucHJlZmVyZW5jZXMuSUVjbGlwc2VQcmVmZXJlbmNlczsKLWltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJ1bnRpbWUucHJlZmVyZW5jZXMuSVNjb3BlQ29udGV4dDsKK2ltcG9ydCBvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5GcmllbmQ7CitpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uSU11dGFibGVWYWxpZGF0b3I7CiBpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uTWVzc2FnZVNldmVyaXR5U2V0dGluZzsKK2ltcG9ydCBvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5NdXRhYmxlUHJvamVjdFNldHRpbmdzOwogaW1wb3J0IG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLlZhbGlkYXRvcjsKIGltcG9ydCBvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5WYWxpZGF0b3IuVjI7CiBpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uaW50ZXJuYWwubW9kZWwuUHJvamVjdFByZWZlcmVuY2VzOwogaW1wb3J0IG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLmludGVybmFsLnBsdWdpbi5WYWxpZGF0aW9uUGx1Z2luOwogaW1wb3J0IG9yZy5vc2dpLnNlcnZpY2UucHJlZnMuQmFja2luZ1N0b3JlRXhjZXB0aW9uOwotaW1wb3J0IG9yZy5vc2dpLnNlcnZpY2UucHJlZnMuUHJlZmVyZW5jZXM7CiAKIC8qKgogICogQSBjbGFzcyB0aGF0IGtub3dzIGhvdyB0byBtYW5hZ2UgdGhlIHByb2plY3QgbGV2ZWwgcGVyc2lzdGVkIHZhbGlkYXRpb24gc2V0dGluZ3MuCiAgKiBAYXV0aG9yIGthcmFzaXVrCiAgKgogICovCi1wdWJsaWMgY2xhc3MgVmFsUHJlZk1hbmFnZXJQcm9qZWN0IHsKK3B1YmxpYyBmaW5hbCBjbGFzcyBWYWxQcmVmTWFuYWdlclByb2plY3QgewogCQotCXByaXZhdGUgSVByb2plY3QJX3Byb2plY3Q7Ci0JcHJpdmF0ZSBzdGF0aWMgTGlzdDxJVmFsQ2hhbmdlZExpc3RlbmVyPiBfbGlzdGVuZXJzID0gbmV3IExpbmtlZExpc3Q8SVZhbENoYW5nZWRMaXN0ZW5lcj4oKTsKKwlwcml2YXRlIGZpbmFsIElQcm9qZWN0CV9wcm9qZWN0OworCXByaXZhdGUgZmluYWwgc3RhdGljIExpc3Q8SVZhbENoYW5nZWRMaXN0ZW5lcj4gX2xpc3RlbmVycyA9IG5ldyBMaW5rZWRMaXN0PElWYWxDaGFuZ2VkTGlzdGVuZXI+KCk7CiAJCisJLyoqCisJICogVGhlIHZhbGlkYXRvcnMgdGhhdCBhcmUgaW4gdGhlIHByb2plY3QgcHJlZmVyZW5jZSBmaWxlLCBidXQgaGF2ZQorCSAqIG9ubHkgYmVlbiBjb25maWd1cmVkIHRvIHRoZSBnbG9iYWwgcHJlZmVyZW5jZSBsZXZlbC4gVGhhdCBpcyB0aGV5IGhhdmUgbm90IGhhZAorCSAqIGFueSBwcm9qZWN0IGxldmVsIGN1c3RvbWl6YXRpb25zIGFwcGxpZWQgeWV0LgorCSAqLwogCXByaXZhdGUgTGlzdDxWYWxpZGF0b3I+IF92YWxpZGF0b3JzOwogCQogCXB1YmxpYyBWYWxQcmVmTWFuYWdlclByb2plY3QoSVByb2plY3QgcHJvamVjdCl7CkBAIC02NiwyMCArNzEsMjQgQEAKIAkgKiBAcmV0dXJuIHRydWUgaWYgaXQgaGFzIHNldHRpbmdzLiBUaGlzIGRvZXMgbm90IG1lYW4gdGhhdCB0aGUgc2V0dGluZ3MgYXJlIGVuYWJsZWQsIG9ubHkgdGhhdCBpdAogCSAqIGhhcyBzZXR0aW5ncy4KIAkgKiAKLQkgKiBAc2VlIFZhbE1hbmFnZXIjaGFzRW5hYmxlZFByb2plY3RQcmVmZXJlbmNlcyhJUHJvamVjdCkKKwkgKiBAZGVwcmVjYXRlZAogCSAqLwogCXB1YmxpYyBib29sZWFuIGhhc1Byb2plY3RTcGVjaWZpY1NldHRpbmdzKCl7Ci0JCUlFY2xpcHNlUHJlZmVyZW5jZXMgcHJlZiA9IGdldFByZWZlcmVuY2VzKCk7CisJCVByZWZlcmVuY2VzV3JhcHBlciBwcmVmID0gZ2V0UHJlZmVyZW5jZXMobnVsbCk7CiAJCQogCQlpZiAocHJlZiA9PSBudWxsKXJldHVybiBmYWxzZTsKLQkJaW50IHZlcnNpb24gPSBwcmVmLmdldEludChQcmVmQ29uc3RhbnRzLmZyYW1ld29ya1ZlcnNpb24sIDApOwotCQlpZiAodmVyc2lvbiA9PSAwKXJldHVybiBmYWxzZTsKLQogCQlyZXR1cm4gdHJ1ZTsKIAl9CiAJCiAJLyoqCi0JICogQW5zd2VyIHRoZSB2MiB2YWxpZGF0b3JzIHRoYXQgaGF2ZSBiZWVuIG92ZXJyaWRkZW4gYnkgdGhlIGdsb2JhbCBwcmVmZXJlbmNlcy4KKwkgKiBBbnN3ZXIgdGhlIHYyIHZhbGlkYXRvcnMgdGhhdCBoYXZlIGJlZW4gb3ZlcnJpZGRlbiBieSB0aGUgcHJvamVjdAorCSAqIHByZWZlcmVuY2VzLiBUaGUgdmFsaWRhdG9ycyB3aWxsIG5vdCBoYXZlIHRoZSBwcmVmZXJlbmNlIHN0b3JlJ3MKKwkgKiBjdXN0b21pemF0aW9ucyBhcHBsaWVkIHlldC4gVGhlIHB1cnBvc2Ugb2YgdGhpcyBtZXRob2QsIGlzIHRvIGlkZW50aWZ5IHRoZSBzdWJzZXQgb2YgdmFsaWRhdG9ycyAKKwkgKiB0aGF0IG1heSBsYXRlciBiZSBjb25maWd1cmVkLgorCSAqIAorCSAqIEBwYXJhbSBiYXNlVmFsaWRhdG9ycworCSAqICAgICAgICAgICAgVjIgdmFsaWRhdG9ycyBmcm9tIHRoZSBleHRlbnNpb24gcG9pbnRzLCBhbmQgY3VzdG9taXplZCBieSBhbnkKKwkgKiAgICAgICAgICAgIGdsb2JhbCBwcmVmZXJlbmNlcy4KIAkgKi8KIAlwdWJsaWMgTGlzdDxWYWxpZGF0b3I+IGdldFZhbGlkYXRvcnMoTWFwPFN0cmluZywgVmFsaWRhdG9yPiBiYXNlVmFsaWRhdG9ycykgdGhyb3dzIEJhY2tpbmdTdG9yZUV4Y2VwdGlvbiB7CiAJCUxpc3Q8VmFsaWRhdG9yPiB2YWxzID0gX3ZhbGlkYXRvcnM7CkBAIC05MSwxNCArMTAwLDIyIEBACiAJfQogCQogCS8qKgotCSAqIExvYWQgdGhlIHZhbGlkYXRvcnMgZnJvbSB0aGUgcHJlZmVyZW5jZSBzdG9yZS4KLQkgKiBAcmV0dXJuIHRoZSB2YWxpZGF0b3JzIHRoYXQgaGF2ZSBiZWVuIG92ZXJyaWRkZW4gYnkgdGhlIGdsb2JhbCByZWZlcmVuY2VzLgorCSAqIExvYWQgdGhlIHZhbGlkYXRvcnMgZnJvbSB0aGUgcHJlZmVyZW5jZSBzdG9yZS4gVGhlIHZhbGlkYXRvcnMgd2lsbCBub3QgaGF2ZSB0aGUgcHJlZmVyZW5jZSBzdG9yZSdzCisJICogY3VzdG9taXphdGlvbnMgYXBwbGllZCB5ZXQuIFRoZSBwdXJwb3NlIG9mIHRoaXMgbWV0aG9kLCBpcyB0byBpZGVudGlmeSB0aGUgc3Vic2V0IG9mIHZhbGlkYXRvcnMgCisJICogdGhhdCBtYXkgbGF0ZXIgYmUgY29uZmlndXJlZC4KKwkgKiAKKwkgKiBAcGFyYW0gYmFzZVZhbGlkYXRvcnMKKwkgKiAgICAgICAgICAgIFYyIHZhbGlkYXRvcnMgZnJvbSB0aGUgZXh0ZW5zaW9uIHBvaW50cywgYW5kIGN1c3RvbWl6ZWQgYnkgYW55CisJICogICAgICAgICAgICBnbG9iYWwgcHJlZmVyZW5jZXMuCisJICogQHJldHVybiB0aGUgdmFsaWRhdG9ycyB0aGF0IGFyZSBpbiB0aGUgcHJvamVjdCBwcmVmZXJlbmNlIGZpbGUsIGJ1dCBoYXZlCisJICogICAgICAgICBvbmx5IGJlZW4gY29uZmlndXJlZCB0byB0aGUgZ2xvYmFsIHByZWZlcmVuY2UgbGV2ZWwuIFRoYXQgaXMgdGhleSBoYXZlIG5vdCBoYWQKKwkgKiAgICAgICAgIGFueSBwcm9qZWN0IGxldmVsIGN1c3RvbWl6YXRpb25zIGFwcGxpZWQgeWV0LgogCSAqLwogCXByaXZhdGUgTGlzdDxWYWxpZGF0b3I+IGxvYWRWYWxpZGF0b3JzKE1hcDxTdHJpbmcsIFZhbGlkYXRvcj4gYmFzZVZhbGlkYXRvcnMpIHRocm93cyBCYWNraW5nU3RvcmVFeGNlcHRpb24gewotCQlMaW5rZWRMaXN0PFZhbGlkYXRvcj4gbGlzdCA9IG5ldyBMaW5rZWRMaXN0PFZhbGlkYXRvcj4oKTsKLQkJSUVjbGlwc2VQcmVmZXJlbmNlcyBwcmVmID0gZ2V0UHJlZmVyZW5jZXMoKTsKKwkJTGlzdDxWYWxpZGF0b3I+IGxpc3QgPSBuZXcgTGlua2VkTGlzdDxWYWxpZGF0b3I+KCk7CisJCVByZWZlcmVuY2VzV3JhcHBlciBwcmVmID0gZ2V0UHJlZmVyZW5jZXMobnVsbCk7CiAJCWlmIChwcmVmLm5vZGVFeGlzdHMoUHJlZkNvbnN0YW50cy52YWxzKSl7Ci0JCQlQcmVmZXJlbmNlcyB2YWxzID0gcHJlZi5ub2RlKFByZWZDb25zdGFudHMudmFscyk7CisJCQlQcmVmZXJlbmNlc1dyYXBwZXIgdmFscyA9IHByZWYubm9kZShQcmVmQ29uc3RhbnRzLnZhbHMpOwogCQkJZm9yIChTdHJpbmcgaWQgOiB2YWxzLmNoaWxkcmVuTmFtZXMoKSl7CiAJCQkJVmFsaWRhdG9yIGJhc2UgPSBiYXNlVmFsaWRhdG9ycy5nZXQoaWQpOwogCQkJCVZhbGlkYXRvciB2ID0gVmFsUHJlZk1hbmFnZXJHbG9iYWwubG9hZFZhbGlkYXRvcihpZCwgdmFscywgYmFzZSk7CkBAIC0xMTEsNDAgKzEyOCw5MyBAQAogCQl9CiAJCXJldHVybiBsaXN0OwogCX0KLQkKKwkJCiAJLyoqCi0JICogVXBkYXRlIHRoZSBwcm9qZWN0IHByZWZlcmVuY2VzIGZyb20gdGhlIHByZWZlcmVuY2Ugc3RvcmUuCi0JICogQHJldHVybiBmYWxzZSBpZiB0aGUgcHJvamVjdCBkb2VzIG5vdCBoYXZlIGFueSBzcGVjaWZpYyBwcmVmZXJlbmNlcy4KKwkgKiBBbnN3ZXIgdGhlIHNldHRpbmcgb2YgdGhlIGdldE92ZXJyaWRlIGZpZWxkLgogCSAqLwotCXB1YmxpYyBib29sZWFuIGxvYWRQcm9qZWN0UHJlZmVyZW5jZXNTaGFsbG93KFByb2plY3RQcmVmZXJlbmNlcyBwcCkgewotCQlJRWNsaXBzZVByZWZlcmVuY2VzIHByZWYgPSBnZXRQcmVmZXJlbmNlcygpOworCXB1YmxpYyBib29sZWFuIGdldE92ZXJyaWRlKCl7CisJCVByZWZlcmVuY2VzV3JhcHBlciBwcmVmID0gZ2V0UHJlZmVyZW5jZXMobnVsbCk7CiAJCQotCQlpZiAocHJlZiA9PSBudWxsKXJldHVybiBmYWxzZTsKKwkJaWYgKCFwcmVmLm5vZGVFeGlzdHMoKSlyZXR1cm4gUHJvamVjdFByZWZlcmVuY2VzLkRlZmF1bHRPdmVycmlkZTsKKwkJCiAJCWludCB2ZXJzaW9uID0gcHJlZi5nZXRJbnQoUHJlZkNvbnN0YW50cy5mcmFtZXdvcmtWZXJzaW9uLCAwKTsKLQkJaWYgKHZlcnNpb24gPT0gMClyZXR1cm4gZmFsc2U7Ci0JCQotCQlpZiAodmVyc2lvbiAhPSBWYWxQcmVmTWFuYWdlckdsb2JhbC5mcmFtZXdvcmtWZXJzaW9uKVZhbFByZWZNYW5hZ2VyR2xvYmFsLm1pZ3JhdGUodmVyc2lvbiwgcHJlZik7CisJCWlmICh2ZXJzaW9uID09IDApeworCQkJdHJ5IHsKKwkJCQlQcm9qZWN0Q29uZmlndXJhdGlvbiBwYyA9IENvbmZpZ3VyYXRpb25NYW5hZ2VyLmdldE1hbmFnZXIoKS5nZXRQcm9qZWN0Q29uZmlndXJhdGlvbihfcHJvamVjdCk7CisJCQkJcmV0dXJuIHBjLmdldERvZXNQcm9qZWN0T3ZlcnJpZGUoKTsKKwkJCX0KKwkJCWNhdGNoIChJbnZvY2F0aW9uVGFyZ2V0RXhjZXB0aW9uIGUpeworCQkJCS8vIGVhdCBpdCwgaWYgaXQgZmFpbHMgd2UganVzdCBnbyB3aXRoIHRoZSBkZWZhdWx0cworCQkJfQorCQl9CisJCXJldHVybiBwcmVmLmdldEJvb2xlYW4oUHJlZkNvbnN0YW50cy5vdmVycmlkZSwgUHJvamVjdFByZWZlcmVuY2VzLkRlZmF1bHRPdmVycmlkZSk7CisJfQogCi0JCXBwLnNldE92ZXJyaWRlKHByZWYuZ2V0Qm9vbGVhbihQcmVmQ29uc3RhbnRzLm92ZXJyaWRlLCBQcm9qZWN0UHJlZmVyZW5jZXMuRGVmYXVsdE92ZXJyaWRlKSk7Ci0JCXBwLnNldFN1c3BlbmQocHJlZi5nZXRCb29sZWFuKFByZWZDb25zdGFudHMuc3VzcGVuZCwgUHJvamVjdFByZWZlcmVuY2VzLkRlZmF1bHRTdXNwZW5kKSk7Ci0JCXJldHVybiB0cnVlOworCXByaXZhdGUgUHJvamVjdFByZWZlcmVuY2VzIG1pZ3JhdGVGcm9tQmVmb3JlV1RQMzAoSVByb2plY3QgcHJvamVjdCwgTWFwPFN0cmluZywgVmFsaWRhdG9yPiBiYXNlVmFsaWRhdG9ycykgeworCQl0cnkgeworCQkJUHJvamVjdENvbmZpZ3VyYXRpb24gcGMgPSBDb25maWd1cmF0aW9uTWFuYWdlci5nZXRNYW5hZ2VyKCkuZ2V0UHJvamVjdENvbmZpZ3VyYXRpb24ocHJvamVjdCk7CisJCQkKKwkJCUxpc3Q8VmFsaWRhdG9yPiBsaXN0ID0gbWlncmF0ZUZyb21CZWZvcmVXVFAzMChiYXNlVmFsaWRhdG9ycywgcGMpOworCQkJVmFsaWRhdG9yW10gdmFscyA9IG5ldyBWYWxpZGF0b3JbbGlzdC5zaXplKCldOworCQkJbGlzdC50b0FycmF5KHZhbHMpOworCQkJcmV0dXJuIG5ldyBQcm9qZWN0UHJlZmVyZW5jZXMocHJvamVjdCwgcGMuZ2V0RG9lc1Byb2plY3RPdmVycmlkZSgpLCBwYy5pc0Rpc2FibGVBbGxWYWxpZGF0aW9uKCksIHZhbHMpOworCQl9CisJCWNhdGNoIChJbnZvY2F0aW9uVGFyZ2V0RXhjZXB0aW9uIGUpeworCQkJLy8gZWF0IGl0LCBpZiBpdCBmYWlscyB3ZSBqdXN0IGdvIHdpdGggdGhlIGRlZmF1bHRzCisJCX0KKwkJcmV0dXJuIG5ldyBQcm9qZWN0UHJlZmVyZW5jZXMocHJvamVjdCk7CisJfQorCisJcHJpdmF0ZSBMaXN0PFZhbGlkYXRvcj4gbWlncmF0ZUZyb21CZWZvcmVXVFAzMChNYXA8U3RyaW5nLCBWYWxpZGF0b3I+IGJhc2VWYWxpZGF0b3JzLCBQcm9qZWN0Q29uZmlndXJhdGlvbiBwYykKKwkJCXRocm93cyBJbnZvY2F0aW9uVGFyZ2V0RXhjZXB0aW9uIHsKKwkJCQkKKwkJU2V0PFN0cmluZz4gYnVpbGQgPSBwYy5nZXRFbmFibGVkQnVpbGRsVmFsaWRhdG9ycygpOworCQlTZXQ8U3RyaW5nPiBtYW51YWwgPSBwYy5nZXRFbmFibGVkTWFudWFsVmFsaWRhdG9ycygpOworCQkKKwkJTGlzdDxWYWxpZGF0b3I+IGxpc3QgPSBuZXcgTGlua2VkTGlzdDxWYWxpZGF0b3I+KCk7CisJCWZvciAoVmFsaWRhdG9yIHYgOiBiYXNlVmFsaWRhdG9ycy52YWx1ZXMoKSl7CisJCQlWMiB2MiA9IHYuYXNWMlZhbGlkYXRvcigpOworCQkJaWYgKHYyICE9IG51bGwpeworCQkJCWJvb2xlYW4gaXNCdWlsZCA9IGJ1aWxkID09IG51bGwgfHwgYnVpbGQuY29udGFpbnModjIuZ2V0VmFsaWRhdG9yQ2xhc3NuYW1lKCkpOworCQkJCWJvb2xlYW4gaXNNYW51YWwgPSBtYW51YWwgPT0gbnVsbCB8fCBtYW51YWwuY29udGFpbnModjIuZ2V0VmFsaWRhdG9yQ2xhc3NuYW1lKCkpOworCQkJCWlmICgodi5pc0J1aWxkVmFsaWRhdGlvbigpICE9IGlzQnVpbGQpIHx8ICh2LmlzTWFudWFsVmFsaWRhdGlvbigpICE9IGlzTWFudWFsKSl7CisJCQkJCVYyIGNvcHkgPSB2Mi5jb3B5KCkuYXNWMlZhbGlkYXRvcigpOworCQkJCQljb3B5LnNldEJ1aWxkVmFsaWRhdGlvbihpc0J1aWxkKTsKKwkJCQkJY29weS5zZXRNYW51YWxWYWxpZGF0aW9uKGlzTWFudWFsKTsKKwkJCQkJY29weS5zZXRMZXZlbChWYWxpZGF0b3IuTGV2ZWwuUHJvamVjdCk7CisJCQkJCUZyaWVuZC5zZXRNaWdyYXRlZChjb3B5LCB0cnVlKTsKKwkJCQkJbGlzdC5hZGQoY29weSk7CisJCQkJfQorCQkJfQorCQl9CisJCXJldHVybiBsaXN0OwogCX0KIAkKIAkKLQkvL0ZJWE1FIEkgc3VzcGVjdCB0aGF0IHRoaXMgbWV0aG9kIHNob3VsZCBiZSByZW1vdmVkCQogCS8qKgotCSAqIFVwZGF0ZSB0aGUgcHJvamVjdCBwcmVmZXJlbmNlcyBmcm9tIHRoZSBwcmVmZXJlbmNlIHN0b3JlLgotCSAqIEByZXR1cm4gZmFsc2UgaWYgdGhlIHByb2plY3QgZG9lcyBub3QgaGF2ZSBhbnkgc3BlY2lmaWMgcHJlZmVyZW5jZXMuCisJICogQW5zd2VyIHRoZSBwcm9qZWN0IHByZWZlcmVuY2VzIGZyb20gdGhlIHByZWZlcmVuY2Ugc3RvcmUuCisJICogQHJldHVybiBudWxsIGlmIHRoZSBwcm9qZWN0IGRvZXMgbm90IGhhdmUgYW55IHNwZWNpZmljIHByZWZlcmVuY2VzLgogCSAqLwotCXB1YmxpYyBib29sZWFuIGxvYWRQcm9qZWN0UHJlZmVyZW5jZXMoUHJvamVjdFByZWZlcmVuY2VzIHBwLCBNYXA8U3RyaW5nLCBWYWxpZGF0b3I+IGJhc2VWYWxpZGF0b3JzKSAKKwlwdWJsaWMgUHJvamVjdFByZWZlcmVuY2VzIGxvYWRQcm9qZWN0UHJlZmVyZW5jZXMoSVByb2plY3QgcHJvamVjdCwgTWFwPFN0cmluZywgVmFsaWRhdG9yPiBiYXNlVmFsaWRhdG9ycykgCiAJCXRocm93cyBCYWNraW5nU3RvcmVFeGNlcHRpb24gewogCQkKLQkJaWYgKCFsb2FkUHJvamVjdFByZWZlcmVuY2VzU2hhbGxvdyhwcCkpcmV0dXJuIGZhbHNlOworCQlQcmVmZXJlbmNlc1dyYXBwZXIgcHJlZiA9IGdldFByZWZlcmVuY2VzKG51bGwpOworCisJCWlmIChwcmVmID09IG51bGwpcmV0dXJuIG51bGw7CisJCWludCB2ZXJzaW9uID0gcHJlZi5nZXRJbnQoUHJlZkNvbnN0YW50cy5mcmFtZXdvcmtWZXJzaW9uLCAwKTsKKwkJaWYgKHZlcnNpb24gPT0gMCl7CisJCQkvLyBUaGlzIG1lYW5zIHRoYXQgd2UgaGF2ZSBhIHByb2plY3QgdGhhdCBpcyBiZWZvcmUgV1RQIDMuMAorCQkJcmV0dXJuIG1pZ3JhdGVGcm9tQmVmb3JlV1RQMzAocHJvamVjdCwgYmFzZVZhbGlkYXRvcnMpOworCQl9CiAJCQotCQlJRWNsaXBzZVByZWZlcmVuY2VzIHByZWYgPSBnZXRQcmVmZXJlbmNlcygpOwotCQlpZiAoIXByZWYubm9kZUV4aXN0cyhQcmVmQ29uc3RhbnRzLnZhbHMpKXJldHVybiB0cnVlOworCQlpZiAodmVyc2lvbiAhPSBWYWxQcmVmTWFuYWdlckdsb2JhbC5mcmFtZXdvcmtWZXJzaW9uKVZhbFByZWZNYW5hZ2VyR2xvYmFsLm1pZ3JhdGUodmVyc2lvbiwgcHJlZik7CisKKwkJaWYgKCFwcmVmLm5vZGVFeGlzdHMoUHJlZkNvbnN0YW50cy52YWxzKSl7CisJCQlyZXR1cm4gbmV3IFByb2plY3RQcmVmZXJlbmNlcyhwcm9qZWN0LCBwcmVmLmdldEJvb2xlYW4oUHJlZkNvbnN0YW50cy5vdmVycmlkZSwgUHJvamVjdFByZWZlcmVuY2VzLkRlZmF1bHRPdmVycmlkZSksCisJCQkJcHJlZi5nZXRCb29sZWFuKFByZWZDb25zdGFudHMuc3VzcGVuZCwgUHJvamVjdFByZWZlcmVuY2VzLkRlZmF1bHRTdXNwZW5kKSwgbmV3IFZhbGlkYXRvclswXSk7CisJCX0KIAkJCi0JCVByZWZlcmVuY2VzIHZwID0gcHJlZi5ub2RlKFByZWZDb25zdGFudHMudmFscyk7CisJCVByZWZlcmVuY2VzV3JhcHBlciB2cCA9IHByZWYubm9kZShQcmVmQ29uc3RhbnRzLnZhbHMpOwogCQlMaXN0PFZhbGlkYXRvcj4gbGlzdCA9IG5ldyBMaW5rZWRMaXN0PFZhbGlkYXRvcj4oKTsKIAkJZm9yIChTdHJpbmcgaWQgOiB2cC5jaGlsZHJlbk5hbWVzKCkpewogCQkJVmFsaWRhdG9yIGJhc2UgPSBiYXNlVmFsaWRhdG9ycy5nZXQoaWQpOwpAQCAtMTU3LDI1ICsyMjcsMjUgQEAKIAkJfQogCQlWYWxpZGF0b3JbXSB2YWxzID0gbmV3IFZhbGlkYXRvcltsaXN0LnNpemUoKV07CiAJCWxpc3QudG9BcnJheSh2YWxzKTsKLQkJcHAuc2V0VmFsaWRhdG9ycyh2YWxzKTsKLQkJcmV0dXJuIHRydWU7CisJCXJldHVybiBuZXcgUHJvamVjdFByZWZlcmVuY2VzKHByb2plY3QsIHByZWYuZ2V0Qm9vbGVhbihQcmVmQ29uc3RhbnRzLm92ZXJyaWRlLCBQcm9qZWN0UHJlZmVyZW5jZXMuRGVmYXVsdE92ZXJyaWRlKSwKKwkJCXByZWYuZ2V0Qm9vbGVhbihQcmVmQ29uc3RhbnRzLnN1c3BlbmQsIFByb2plY3RQcmVmZXJlbmNlcy5EZWZhdWx0U3VzcGVuZCksIHZhbHMpOwogCX0KIAotCXByaXZhdGUgSUVjbGlwc2VQcmVmZXJlbmNlcyBnZXRQcmVmZXJlbmNlcygpIHsKLQkJSVNjb3BlQ29udGV4dCBwcm9qZWN0Q29udGV4dCA9IG5ldyBQcm9qZWN0U2NvcGUoX3Byb2plY3QpOwotCQlJRWNsaXBzZVByZWZlcmVuY2VzIHByZWYgPSBwcm9qZWN0Q29udGV4dC5nZXROb2RlKFZhbGlkYXRpb25QbHVnaW4uUExVR0lOX0lEKTsKLQkJcmV0dXJuIHByZWY7CisJcHJpdmF0ZSBQcmVmZXJlbmNlc1dyYXBwZXIgZ2V0UHJlZmVyZW5jZXMoQm9vbGVhbiBwZXJzaXN0KSB7CisJCXJldHVybiBQcmVmZXJlbmNlc1dyYXBwZXIuZ2V0UHJlZmVyZW5jZXMoX3Byb2plY3QsIHBlcnNpc3QpOwogCX0KIAotCXB1YmxpYyB2b2lkIHNhdmVQcmVmZXJlbmNlcyhQcm9qZWN0UHJlZmVyZW5jZXMgcHJvamVjdFByZWZlcmVuY2VzLCBWYWxpZGF0b3JbXSB2YWxpZGF0b3JzKSB7Ci0JCUlFY2xpcHNlUHJlZmVyZW5jZXMgcHJlZiA9IGdldFByZWZlcmVuY2VzKCk7CisJcHVibGljIHZvaWQgc2F2ZVByZWZlcmVuY2VzKFByb2plY3RQcmVmZXJlbmNlcyBwcm9qZWN0UHJlZmVyZW5jZXMpIHsKKwkJVmFsaWRhdG9yW10gdmFsaWRhdG9ycyA9IHByb2plY3RQcmVmZXJlbmNlcy5nZXRWYWxpZGF0b3JzKCk7CisJCVByZWZlcmVuY2VzV3JhcHBlciBwcmVmID0gZ2V0UHJlZmVyZW5jZXMobnVsbCk7CiAJCXByZWYucHV0Qm9vbGVhbihQcmVmQ29uc3RhbnRzLnN1c3BlbmQsIHByb2plY3RQcmVmZXJlbmNlcy5nZXRTdXNwZW5kKCkpOwogCQlwcmVmLnB1dEJvb2xlYW4oUHJlZkNvbnN0YW50cy5vdmVycmlkZSwgcHJvamVjdFByZWZlcmVuY2VzLmdldE92ZXJyaWRlKCkpOwogCQlwcmVmLnB1dEludChQcmVmQ29uc3RhbnRzLmZyYW1ld29ya1ZlcnNpb24sIFZhbFByZWZNYW5hZ2VyR2xvYmFsLmZyYW1ld29ya1ZlcnNpb24pOwotCQlQcmVmZXJlbmNlcyB2YWxzID0gcHJlZi5ub2RlKFByZWZDb25zdGFudHMudmFscyk7CisJCVByZWZlcmVuY2VzV3JhcHBlciB2YWxzID0gcHJlZi5ub2RlKFByZWZDb25zdGFudHMudmFscyk7CiAJCXRyeSB7CiAJCQlWYWxpZGF0b3JbXSB3b3Jrc3BhY2VWYWxzID0gVmFsTWFuYWdlci5nZXREZWZhdWx0KCkuZ2V0VmFsaWRhdG9ycygpOwogCQkJTWFwPFN0cmluZywgVmFsaWRhdG9yPiBiYXNlID0gbmV3IEhhc2hNYXA8U3RyaW5nLCBWYWxpZGF0b3I+KHdvcmtzcGFjZVZhbHMubGVuZ3RoKTsKKwkJCWZvciAoVmFsaWRhdG9yIHYgOiB3b3Jrc3BhY2VWYWxzKWJhc2UucHV0KHYuZ2V0SWQoKSwgdik7CiAJCQlmb3IgKFZhbGlkYXRvciB2IDogdmFsaWRhdG9ycylWYWxQcmVmTWFuYWdlckdsb2JhbC5zYXZlKHYsIHZhbHMsIGJhc2UpOwogCQkJcHJlZi5mbHVzaCgpOwogCQkJUHJvamVjdENvbmZpZ3VyYXRpb24gcGMgPSBDb25maWd1cmF0aW9uTWFuYWdlci5nZXRNYW5hZ2VyKCkKQEAgLTE5MCw2ICsyNjAsNjcgQEAKIAkJCVZhbGlkYXRpb25QbHVnaW4uZ2V0UGx1Z2luKCkuaGFuZGxlRXhjZXB0aW9uKGUpOwogCQl9CQkKIAl9CisKKwlwdWJsaWMgdm9pZCBzYXZlUHJlZmVyZW5jZXMoUHJvamVjdFByZWZlcmVuY2VzIHByb2plY3RQcmVmZXJlbmNlcywgVmFsaWRhdG9yTXV0YWJsZVtdIHZhbGlkYXRvcnMpIHsKKwkJUHJlZmVyZW5jZXNXcmFwcGVyIHByZWYgPSBnZXRQcmVmZXJlbmNlcyhudWxsKTsKKwkJcHJlZi5wdXRCb29sZWFuKFByZWZDb25zdGFudHMuc3VzcGVuZCwgcHJvamVjdFByZWZlcmVuY2VzLmdldFN1c3BlbmQoKSk7CisJCXByZWYucHV0Qm9vbGVhbihQcmVmQ29uc3RhbnRzLm92ZXJyaWRlLCBwcm9qZWN0UHJlZmVyZW5jZXMuZ2V0T3ZlcnJpZGUoKSk7CisJCXByZWYucHV0SW50KFByZWZDb25zdGFudHMuZnJhbWV3b3JrVmVyc2lvbiwgVmFsUHJlZk1hbmFnZXJHbG9iYWwuZnJhbWV3b3JrVmVyc2lvbik7CisJCXRyeSB7CisJCQlzYXZlUHJlZmVyZW5jZXModmFsaWRhdG9ycywgZmFsc2UsIG51bGwpOworCQkJcHJlZi5mbHVzaCgpOworCQkJdXBkYXRlTGlzdGVuZXJzKF9wcm9qZWN0KTsKKwkJfQorCQljYXRjaCAoRXhjZXB0aW9uIGUpeworCQkJVmFsaWRhdGlvblBsdWdpbi5nZXRQbHVnaW4oKS5oYW5kbGVFeGNlcHRpb24oZSk7CisJCX0JCQorCX0KKwkKKwlwdWJsaWMgdm9pZCBzYXZlUHJlZmVyZW5jZXMoTXV0YWJsZVByb2plY3RTZXR0aW5ncyBzZXR0aW5ncywgQm9vbGVhbiBwZXJzaXN0KXsKKwkJSVByb2plY3QgcHJvamVjdCA9IHNldHRpbmdzLmdldFByb2plY3QoKTsKKwkJUHJlZmVyZW5jZXNXcmFwcGVyIHByZWYgPSBQcmVmZXJlbmNlc1dyYXBwZXIuZ2V0UHJlZmVyZW5jZXMocHJvamVjdCwgcGVyc2lzdCk7CisJCXByZWYucHV0Qm9vbGVhbihQcmVmQ29uc3RhbnRzLnN1c3BlbmQsIHNldHRpbmdzLmdldFN1c3BlbmQoKSk7CisJCXByZWYucHV0Qm9vbGVhbihQcmVmQ29uc3RhbnRzLm92ZXJyaWRlLCBzZXR0aW5ncy5nZXRPdmVycmlkZSgpKTsKKwkJcHJlZi5wdXRJbnQoUHJlZkNvbnN0YW50cy5mcmFtZXdvcmtWZXJzaW9uLCBWYWxQcmVmTWFuYWdlckdsb2JhbC5mcmFtZXdvcmtWZXJzaW9uKTsKKwkJCisJCUlNdXRhYmxlVmFsaWRhdG9yW10gdm1zID0gc2V0dGluZ3MuZ2V0VmFsaWRhdG9ycygpOworCQlWYWxpZGF0b3JNdXRhYmxlW10gdmFsaWRhdG9ycyA9IG5ldyBWYWxpZGF0b3JNdXRhYmxlW3Ztcy5sZW5ndGhdOworCQlmb3IgKGludCBpPTA7IGk8dm1zLmxlbmd0aDtpKyspdmFsaWRhdG9yc1tpXSA9IChWYWxpZGF0b3JNdXRhYmxlKXZtc1tpXTsKKwkJCisJCXRyeSB7CisJCQlzYXZlUHJlZmVyZW5jZXModmFsaWRhdG9ycywgZmFsc2UsIHBlcnNpc3QpOworCQkJcHJlZi5mbHVzaCgpOworCQkJdXBkYXRlTGlzdGVuZXJzKHByb2plY3QpOworCQl9CisJCWNhdGNoIChFeGNlcHRpb24gZSl7CisJCQlpZiAocHJvamVjdC5pc0FjY2Vzc2libGUoKSlWYWxpZGF0aW9uUGx1Z2luLmdldFBsdWdpbigpLmhhbmRsZUV4Y2VwdGlvbihlKTsKKwkJfQorCX0KKwkKKwlwdWJsaWMgdm9pZCBzYXZlUHJlZmVyZW5jZXMoVmFsaWRhdG9yTXV0YWJsZVtdIHZhbGlkYXRvcnMsIGJvb2xlYW4gZmx1c2gsIEJvb2xlYW4gcGVyc2lzdCl7CisJCVByZWZlcmVuY2VzV3JhcHBlciBwcmVmID0gZ2V0UHJlZmVyZW5jZXMocGVyc2lzdCk7CisJCXByZWYucHV0SW50KFByZWZDb25zdGFudHMuZnJhbWV3b3JrVmVyc2lvbiwgVmFsUHJlZk1hbmFnZXJHbG9iYWwuZnJhbWV3b3JrVmVyc2lvbik7CisJCVByZWZlcmVuY2VzV3JhcHBlciB2YWxzID0gcHJlZi5ub2RlKFByZWZDb25zdGFudHMudmFscyk7CisJCXRyeSB7CisJCQlWYWxpZGF0b3JbXSB3b3Jrc3BhY2VWYWxzID0gVmFsTWFuYWdlci5nZXREZWZhdWx0KCkuZ2V0VmFsaWRhdG9ycygpOworCQkJTWFwPFN0cmluZywgVmFsaWRhdG9yPiBiYXNlID0gbmV3IEhhc2hNYXA8U3RyaW5nLCBWYWxpZGF0b3I+KHdvcmtzcGFjZVZhbHMubGVuZ3RoKTsKKwkJCWZvciAoVmFsaWRhdG9yIHYgOiB3b3Jrc3BhY2VWYWxzKWJhc2UucHV0KHYuZ2V0SWQoKSwgdik7CisJCQlmb3IgKFZhbGlkYXRvck11dGFibGUgdiA6IHZhbGlkYXRvcnMpVmFsUHJlZk1hbmFnZXJHbG9iYWwuc2F2ZSh2LCB2YWxzLCBiYXNlKTsKKwkJCVByb2plY3RDb25maWd1cmF0aW9uIHBjID0gQ29uZmlndXJhdGlvbk1hbmFnZXIuZ2V0TWFuYWdlcigpLmdldFByb2plY3RDb25maWd1cmF0aW9uKF9wcm9qZWN0KTsKKwkJCXBjLnNldEVuYWJsZWRCdWlsZFZhbGlkYXRvcnMoZ2V0RW5hYmxlZEJ1aWxkVmFsaWRhdG9ycyh2YWxpZGF0b3JzKSk7CisJCQlwYy5zZXRFbmFibGVkTWFudWFsVmFsaWRhdG9ycyhnZXRFbmFibGVkTWFudWFsVmFsaWRhdG9ycyh2YWxpZGF0b3JzKSk7CisJCQlwYy5wYXNzaXZhdGUoKTsKKwkJCXBjLnN0b3JlKCk7CisJCQlpZiAoZmx1c2gpeworCQkJCXByZWYuZmx1c2goKTsKKwkJCQl1cGRhdGVMaXN0ZW5lcnMoX3Byb2plY3QpOworCQkJfQorCQl9CisJCWNhdGNoIChFeGNlcHRpb24gZSl7CisJCQlWYWxpZGF0aW9uUGx1Z2luLmdldFBsdWdpbigpLmhhbmRsZUV4Y2VwdGlvbihlKTsKKwkJfQkJCisJCQorCX0KIAkKIAkvKioKIAkgKiBBbnN3ZXIgYWxsIHRoZSBWMSB2YWxpZGF0b3JzIHRoYXQgYXJlIGVuYWJsZWQgZm9yIGJ1aWxkLgpAQCAtMjA3LDYgKzMzOCwxOCBAQAogCX0KIAkKIAkvKioKKwkgKiBBbnN3ZXIgYWxsIHRoZSBWMSB2YWxpZGF0b3JzIHRoYXQgYXJlIGVuYWJsZWQgZm9yIGJ1aWxkLgorCSAqIEByZXR1cm4KKwkgKi8KKwlwcml2YXRlIFNldDxWYWxpZGF0b3JNZXRhRGF0YT4gZ2V0RW5hYmxlZEJ1aWxkVmFsaWRhdG9ycyhWYWxpZGF0b3JNdXRhYmxlW10gdmFsaWRhdG9ycykgeworCQlTZXQ8VmFsaWRhdG9yTWV0YURhdGE+IHNldCA9IG5ldyBIYXNoU2V0PFZhbGlkYXRvck1ldGFEYXRhPig1MCk7CisJCWZvciAoVmFsaWRhdG9yTXV0YWJsZSB2IDogdmFsaWRhdG9ycyl7CisJCQlpZiAodi5pc0J1aWxkVmFsaWRhdGlvbigpICYmIHYuaXNWMVZhbGlkYXRvcigpKXNldC5hZGQodi5nZXRWbWQoKSk7CisJCX0KKwkJcmV0dXJuIHNldDsKKwl9CisJCisJLyoqCiAJICogQW5zd2VyIGFsbCB0aGUgVjEgdmFsaWRhdG9ycyB0aGF0IGFyZSBlbmFibGVkIGZvciBtYW51YWwgdmFsaWRhdGlvbi4KIAkgKiBAcmV0dXJuCiAJICovCkBAIC0yMjEsOSArMzY0LDIxIEBACiAJCXJldHVybiBzZXQ7CiAJfQogCQorCS8qKgorCSAqIEFuc3dlciBhbGwgdGhlIFYxIHZhbGlkYXRvcnMgdGhhdCBhcmUgZW5hYmxlZCBmb3IgbWFudWFsIHZhbGlkYXRpb24uCisJICogQHJldHVybgorCSAqLworCXByaXZhdGUgU2V0PFZhbGlkYXRvck1ldGFEYXRhPiBnZXRFbmFibGVkTWFudWFsVmFsaWRhdG9ycyhWYWxpZGF0b3JNdXRhYmxlW10gdmFsaWRhdG9ycykgeworCQlTZXQ8VmFsaWRhdG9yTWV0YURhdGE+IHNldCA9IG5ldyBIYXNoU2V0PFZhbGlkYXRvck1ldGFEYXRhPig1MCk7CisJCWZvciAoVmFsaWRhdG9yTXV0YWJsZSB2IDogdmFsaWRhdG9ycyl7CisJCQlpZiAodi5pc01hbnVhbFZhbGlkYXRpb24oKSAmJiB2LmlzVjFWYWxpZGF0b3IoKSlzZXQuYWRkKHYuZ2V0Vm1kKCkpOworCQl9CisJCXJldHVybiBzZXQ7CisJfQorCQogCXB1YmxpYyB2b2lkIGxvYWRNZXNzYWdlcyhWYWxpZGF0b3IgdmFsaWRhdG9yLCBNYXA8U3RyaW5nLCBNZXNzYWdlU2V2ZXJpdHlTZXR0aW5nPiBzZXR0aW5ncykgewogCQl0cnkgewotCQkJVmFsUHJlZk1hbmFnZXJHbG9iYWwubG9hZE1lc3NhZ2VTZXR0aW5ncyh2YWxpZGF0b3IsIHNldHRpbmdzLCBnZXRQcmVmZXJlbmNlcygpKTsKKwkJCVZhbFByZWZNYW5hZ2VyR2xvYmFsLmxvYWRNZXNzYWdlU2V0dGluZ3ModmFsaWRhdG9yLCBzZXR0aW5ncywgZ2V0UHJlZmVyZW5jZXMobnVsbCkpOwogCQl9CiAJCWNhdGNoIChCYWNraW5nU3RvcmVFeGNlcHRpb24gZSl7CiAJCQlWYWxpZGF0aW9uUGx1Z2luLmdldFBsdWdpbigpLmhhbmRsZUV4Y2VwdGlvbihlKTsKZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24vdmYyL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL2ludGVybmFsL1ZhbGlkYXRpb25SZXN1bHRTdW1tYXJ5LmphdmEgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uL3ZmMi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9pbnRlcm5hbC9WYWxpZGF0aW9uUmVzdWx0U3VtbWFyeS5qYXZhCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLjllOTEyMTcKLS0tIC9kZXYvbnVsbAorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uL3ZmMi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9pbnRlcm5hbC9WYWxpZGF0aW9uUmVzdWx0U3VtbWFyeS5qYXZhCkBAIC0wLDAgKzEsNDIgQEAKKy8qKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqCisgKiBDb3B5cmlnaHQgKGMpIDIwMDgsIDIwMDkgSUJNIENvcnBvcmF0aW9uIGFuZCBvdGhlcnMuCisgKiBBbGwgcmlnaHRzIHJlc2VydmVkLiBUaGlzIHByb2dyYW0gYW5kIHRoZSBhY2NvbXBhbnlpbmcgbWF0ZXJpYWxzCisgKiBhcmUgbWFkZSBhdmFpbGFibGUgdW5kZXIgdGhlIHRlcm1zIG9mIHRoZSBFY2xpcHNlIFB1YmxpYyBMaWNlbnNlIHYxLjAKKyAqIHdoaWNoIGFjY29tcGFuaWVzIHRoaXMgZGlzdHJpYnV0aW9uLCBhbmQgaXMgYXZhaWxhYmxlIGF0CisgKiBodHRwOi8vd3d3LmVjbGlwc2Uub3JnL2xlZ2FsL2VwbC12MTAuaHRtbAorICoKKyAqIENvbnRyaWJ1dG9yczoKKyAqICAgICBJQk0gQ29ycG9yYXRpb24gLSBpbml0aWFsIEFQSSBhbmQgaW1wbGVtZW50YXRpb24KKyAqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqLworcGFja2FnZSBvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5pbnRlcm5hbDsKKworLyoqCisgKiBBbiBpbW11dGFibGUgb2JqZWN0IHRoYXQgaG9sZHMgYSBzdW1tYXJ5IG9mIHRoZSB2YWxpZGF0aW9uLgorICogQGF1dGhvciBrYXJhc2l1aworICoKKyAqLworcHVibGljIGZpbmFsIGNsYXNzIFZhbGlkYXRpb25SZXN1bHRTdW1tYXJ5IHsKKwkKKwlwcml2YXRlIGZpbmFsIGludCAJX2Vycm9yOworCXByaXZhdGUgZmluYWwgaW50IAlfd2FybmluZzsKKwlwcml2YXRlIGZpbmFsIGludAlfaW5mbzsKKwkKKwlwdWJsaWMgVmFsaWRhdGlvblJlc3VsdFN1bW1hcnkoaW50IGVycm9yLCBpbnQgd2FybmluZywgaW50IGluZm8peworCQlfZXJyb3IgPSBlcnJvcjsKKwkJX3dhcm5pbmcgPSB3YXJuaW5nOworCQlfaW5mbyA9IGluZm87CisJfQorCisJcHVibGljIGludCBnZXRTZXZlcml0eUVycm9yKCkgeworCQlyZXR1cm4gX2Vycm9yOworCX0KKworCXB1YmxpYyBpbnQgZ2V0U2V2ZXJpdHlXYXJuaW5nKCkgeworCQlyZXR1cm4gX3dhcm5pbmc7CisJfQorCisJcHVibGljIGludCBnZXRTZXZlcml0eUluZm8oKSB7CisJCXJldHVybiBfaW5mbzsKKwl9CisKK30KZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24vdmYyL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL2ludGVybmFsL1ZhbGlkYXRpb25SdW5uZXIuamF2YSBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24vdmYyL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL2ludGVybmFsL1ZhbGlkYXRpb25SdW5uZXIuamF2YQppbmRleCBkZDMzZDgyLi4wMWJmMjk3IDEwMDY0NAotLS0gYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uL3ZmMi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9pbnRlcm5hbC9WYWxpZGF0aW9uUnVubmVyLmphdmEKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi92ZjIvb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vaW50ZXJuYWwvVmFsaWRhdGlvblJ1bm5lci5qYXZhCkBAIC0xLDUgKzEsNSBAQAogLyoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioKLSAqIENvcHlyaWdodCAoYykgMjAwNywgMjAwOCBJQk0gQ29ycG9yYXRpb24gYW5kIG90aGVycy4KKyAqIENvcHlyaWdodCAoYykgMjAwNywgMjAwOSBJQk0gQ29ycG9yYXRpb24gYW5kIG90aGVycy4KICAqIEFsbCByaWdodHMgcmVzZXJ2ZWQuIFRoaXMgcHJvZ3JhbSBhbmQgdGhlIGFjY29tcGFueWluZyBtYXRlcmlhbHMKICAqIGFyZSBtYWRlIGF2YWlsYWJsZSB1bmRlciB0aGUgdGVybXMgb2YgdGhlIEVjbGlwc2UgUHVibGljIExpY2Vuc2UgdjEuMAogICogd2hpY2ggYWNjb21wYW5pZXMgdGhpcyBkaXN0cmlidXRpb24sIGFuZCBpcyBhdmFpbGFibGUgYXQKQEAgLTEwLDkgKzEwLDEyIEBACiAgKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKi8KIHBhY2thZ2Ugb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uaW50ZXJuYWw7CiAKK2ltcG9ydCBqYXZhLnV0aWwuSGFzaE1hcDsKK2ltcG9ydCBqYXZhLnV0aWwuSGFzaFNldDsKIGltcG9ydCBqYXZhLnV0aWwuTWFwOwogaW1wb3J0IGphdmEudXRpbC5TZXQ7CiAKK2ltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJlc291cmNlcy5JRmlsZTsKIGltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJlc291cmNlcy5JUHJvamVjdDsKIGltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJlc291cmNlcy5JUmVzb3VyY2U7CiBpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5yZXNvdXJjZXMuSVJlc291cmNlRGVsdGE7CkBAIC0yNywxMCArMzAsMTUgQEAKIAogLyoqCiAgKiBSdW4gdGhlIHZhbGlkYXRvcnMgb24gYSBzZWxlY3RlZCBzZXQgb2YgcmVzb3VyY2VzLgorICogPHA+CisgKiBUaGlzIGlzIHVzZWQgdG8gcnVuIG1hbnVhbCB2YWxpZGF0aW9ucyAoaS5lLiB0aGUgdXNlciBzZWxlY3RzIHRoZSBWYWxpZGF0ZSBtZW51IGl0ZW0pLCAKKyAqIG9yIGl0IGlzIGludm9rZWQgcHJvZ3JhbW1hdGljYWxseSBieSBhIHRoaXJkIHBhcnR5IHRocm91Z2ggdGhlIFZhbGlkYXRpb25GcmFtZXdvcmsgQVBJLgorICogSXQgaXMgbm90IHVzZWQgZm9yIHRoZSBidWlsZCBiYXNlZCBpbnZvY2F0aW9uLgorICogPC9wPiAKICAqIEBhdXRob3Iga2FyYXNpdWsKICAqCiAgKi8KLXB1YmxpYyBjbGFzcyBWYWxpZGF0aW9uUnVubmVyIGltcGxlbWVudHMgSVdvcmtzcGFjZVJ1bm5hYmxlIHsKK3B1YmxpYyBmaW5hbCBjbGFzcyBWYWxpZGF0aW9uUnVubmVyIGltcGxlbWVudHMgSVdvcmtzcGFjZVJ1bm5hYmxlIHsKIAkKIAlwcml2YXRlIE1hcDxJUHJvamVjdCwgU2V0PElSZXNvdXJjZT4+CQlfcHJvamVjdHM7CiAJcHJpdmF0ZQlWYWxUeXBlCQkJX3ZhbFR5cGU7CkBAIC02MSw2ICs2OSwzMSBAQAogCQlyZXR1cm4gbWUuX3ZhbE9wZXJhdGlvbjsKIAl9CiAJCisJLyoqCisJICogVmFsaWRhdGUgdGhlIHNlbGVjdGVkIGZpbGUuIFRoaXMgaXMgYSBjb252ZW5pZW5jZSBtZXRob2QsIGl0IHNpbXBseSBjYWxscyB0aGUgbW9yZSBmbGV4aWJsZSAKKwkgKiB2YWxpZGF0ZSB3aXRoIE1hcCBtZXRob2QuIAorCSAqIAorCSAqIEBwYXJhbSBmaWxlCisJICogICAgICAgICAgICBUaGUgZmlsZSB0byBiZSB2YWxpZGF0ZWQuCisJICogCisJICogQHBhcmFtIHZhbFR5cGUKKwkgKiAgICAgICAgICAgIFRoZSB0eXBlIG9mIHZhbGlkYXRpb24gdGhhdCBoYXMgYmVlbiByZXF1ZXN0ZWQuCisJICogCisJICogQHBhcmFtIG1vbml0b3IKKwkgKiAgICAgICAgICAgIFByb2dyZXNzIG1vbml0b3IuCisJICogCisJICogQHBhcmFtIGF0b21pYworCSAqICAgICAgICAgICAgUnVuIGFzIGFuIGF0b21pYyB3b3Jrc3BhY2Ugb3BlcmF0aW9uPworCSAqLworCXB1YmxpYyBzdGF0aWMgVmFsT3BlcmF0aW9uIHZhbGlkYXRlKElGaWxlIGZpbGUsIFZhbFR5cGUgdmFsVHlwZSwgSVByb2dyZXNzTW9uaXRvciBtb25pdG9yLCBib29sZWFuIGF0b21pYykgdGhyb3dzIENvcmVFeGNlcHRpb257CisJICAgIGZpbmFsIE1hcDxJUHJvamVjdCwgU2V0PElSZXNvdXJjZT4+IG1hcCA9IG5ldyBIYXNoTWFwPElQcm9qZWN0LCBTZXQ8SVJlc291cmNlPj4oMSk7CisJICAgICAgCisJICAgIFNldDxJUmVzb3VyY2U+IHNldCA9IG5ldyBIYXNoU2V0PElSZXNvdXJjZT4oMSk7CisJICAgIHNldC5hZGQoZmlsZSk7CisJICAgIG1hcC5wdXQoZmlsZS5nZXRQcm9qZWN0KCksIHNldCk7CisJICAgIHJldHVybiB2YWxpZGF0ZShtYXAsIHZhbFR5cGUsIG1vbml0b3IsIGF0b21pYyk7CQkKKwl9CisJCiAJcHJpdmF0ZSBWYWxpZGF0aW9uUnVubmVyKE1hcDxJUHJvamVjdCwgU2V0PElSZXNvdXJjZT4+IHByb2plY3RzLCBWYWxUeXBlIHZhbFR5cGUpewogCQlfcHJvamVjdHMgPSBwcm9qZWN0czsKIAkJX3ZhbFR5cGUgPSB2YWxUeXBlOwpAQCAtOTEsMTQgKzEyNCwxOSBAQAogCQkJCQogCQlmb3IgKE1hcC5FbnRyeTxJUHJvamVjdCwgU2V0PElSZXNvdXJjZT4+IG1lIDogX3Byb2plY3RzLmVudHJ5U2V0KCkpewogCQkJaWYgKG1vbml0b3IuaXNDYW5jZWxlZCgpKXsKLQkJCQlfdmFsT3BlcmF0aW9uLmdldFJlc3VsdCgpLnNldENhbmNlbGVkKHRydWUpOworCQkJCV92YWxPcGVyYXRpb24uc2V0Q2FuY2VsZWQodHJ1ZSk7CiAJCQkJcmV0dXJuIF92YWxPcGVyYXRpb247CiAJCQl9CiAJCQlJUHJvamVjdCBwcm9qZWN0ID0gbWUuZ2V0S2V5KCk7CiAJCQltYW5hZ2VyLmFjY2VwdChzdGFydGluZ1Zpc2l0b3IsIHByb2plY3QsIF92YWxUeXBlLCBfdmFsT3BlcmF0aW9uLCBtb25pdG9yKTsKIAkJCWZvciAoSVJlc291cmNlIHJlc291cmNlIDogbWUuZ2V0VmFsdWUoKSl7Ci0JCQkJbWFuYWdlci52YWxpZGF0ZShwcm9qZWN0LCByZXNvdXJjZSwgSVJlc291cmNlRGVsdGEuTk9fQ0hBTkdFLCBfdmFsVHlwZSwgCi0JCQkJCUluY3JlbWVudGFsUHJvamVjdEJ1aWxkZXIuQVVUT19CVUlMRCwgX3ZhbE9wZXJhdGlvbiwgbW9uaXRvcik7CisJCQkJdHJ5IHsKKwkJCQkJbWFuYWdlci52YWxpZGF0ZShwcm9qZWN0LCByZXNvdXJjZSwgSVJlc291cmNlRGVsdGEuTk9fQ0hBTkdFLCBfdmFsVHlwZSwgCisJCQkJCQkJSW5jcmVtZW50YWxQcm9qZWN0QnVpbGRlci5BVVRPX0JVSUxELCBfdmFsT3BlcmF0aW9uLCBtb25pdG9yKTsKKwkJCQl9CisJCQkJY2F0Y2ggKFJlc291cmNlVW5hdmFpbGFibGVFcnJvciBlcnJvcil7CisJCQkJCS8vIGlmIHRoZSByZXNvdXJjZSBpcyBubyBsb25nZXIgYXZhaWxhYmxlLCB3ZSBjYW4ndCB2YWxpZGF0ZSBpdCwgc28gd2Ugc2hvdWxkIGp1c3QgbW92ZSBvbi4gCisJCQkJfQogCQkJfQogCQkJbWFuYWdlci5hY2NlcHQoZmluaXNoZWRWaXNpdG9yLCBwcm9qZWN0LCBfdmFsVHlwZSwgX3ZhbE9wZXJhdGlvbiwgbW9uaXRvcik7CiAJCX0KZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24vdmYyL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL2ludGVybmFsL1ZhbGlkYXRvckV4dGVuc2lvblJlYWRlci5qYXZhIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi92ZjIvb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vaW50ZXJuYWwvVmFsaWRhdG9yRXh0ZW5zaW9uUmVhZGVyLmphdmEKaW5kZXggM2E0OTc1ZS4uMGM3OGFkNSAxMDA2NDQKLS0tIGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi92ZjIvb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vaW50ZXJuYWwvVmFsaWRhdG9yRXh0ZW5zaW9uUmVhZGVyLmphdmEKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi92ZjIvb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vaW50ZXJuYWwvVmFsaWRhdG9yRXh0ZW5zaW9uUmVhZGVyLmphdmEKQEAgLTEsNSArMSw1IEBACiAvKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKgotICogQ29weXJpZ2h0IChjKSAyMDA3LCAyMDA4IElCTSBDb3Jwb3JhdGlvbiBhbmQgb3RoZXJzLgorICogQ29weXJpZ2h0IChjKSAyMDA3LCAyMDEwIElCTSBDb3Jwb3JhdGlvbiBhbmQgb3RoZXJzLgogICogQWxsIHJpZ2h0cyByZXNlcnZlZC4gVGhpcyBwcm9ncmFtIGFuZCB0aGUgYWNjb21wYW55aW5nIG1hdGVyaWFscwogICogYXJlIG1hZGUgYXZhaWxhYmxlIHVuZGVyIHRoZSB0ZXJtcyBvZiB0aGUgRWNsaXBzZSBQdWJsaWMgTGljZW5zZSB2MS4wCiAgKiB3aGljaCBhY2NvbXBhbmllcyB0aGlzIGRpc3RyaWJ1dGlvbiwgYW5kIGlzIGF2YWlsYWJsZSBhdApAQCAtNDIsMTcgKzQyLDE2IEBACiAgKi8KIHB1YmxpYyBjbGFzcyBWYWxpZGF0b3JFeHRlbnNpb25SZWFkZXIgewogCQotCXByaXZhdGUgc3RhdGljIFZhbGlkYXRvckV4dGVuc2lvblJlYWRlciBfbWU7CisJcHJpdmF0ZSBzdGF0aWMgVmFsaWRhdG9yRXh0ZW5zaW9uUmVhZGVyIF9tZSA9IG5ldyBWYWxpZGF0b3JFeHRlbnNpb25SZWFkZXIoKTsKIAkKLQlwdWJsaWMgc3RhdGljIFZhbGlkYXRvckV4dGVuc2lvblJlYWRlciBnZXREZWZhdWx0KCl7Ci0JCWlmIChfbWUgPT0gbnVsbClfbWUgPSBuZXcgVmFsaWRhdG9yRXh0ZW5zaW9uUmVhZGVyKCk7CisJcHVibGljICBzdGF0aWMgVmFsaWRhdG9yRXh0ZW5zaW9uUmVhZGVyIGdldERlZmF1bHQoKXsKIAkJcmV0dXJuIF9tZTsKIAl9CiAJCiAJcHJpdmF0ZSBWYWxpZGF0b3JFeHRlbnNpb25SZWFkZXIoKXt9CiAJCiAJLyoqCi0JICogUmVhZCB0aGUgZXh0ZW5zaW9ucy4KKwkgKiBQcm9jZXNzIHRoZSB2MiBleHRlbnNpb25zLCByZXR1cm5pbmcgYWxsIHRoZSB2MiB2YWxpZGF0b3JzLgogCSAqLwogCUNvbGxlY3Rpb248VmFsaWRhdG9yPiBwcm9jZXNzKCkgewogCQlNYXA8U3RyaW5nLFZhbGlkYXRvcj4gbWFwID0gbmV3IEhhc2hNYXA8U3RyaW5nLCBWYWxpZGF0b3I+KDEwMCk7CkBAIC02MSw4ICs2MCwxMSBAQAogCQkJCQogCQlmb3IgKElFeHRlbnNpb24gZXh0IDogZXh0ZW5zaW9uUG9pbnQuZ2V0RXh0ZW5zaW9ucygpKXsKIAkJCWZvciAoSUNvbmZpZ3VyYXRpb25FbGVtZW50IHZhbGlkYXRvciA6IGV4dC5nZXRDb25maWd1cmF0aW9uRWxlbWVudHMoKSl7Ci0JCQkJVmFsaWRhdG9yIHYgPSBwcm9jZXNzVmFsaWRhdG9yKHZhbGlkYXRvciwgZXh0LmdldFVuaXF1ZUlkZW50aWZpZXIoKSwgZXh0LmdldExhYmVsKCksIG51bGwpOwotCQkJCWlmICh2ICE9IG51bGwpbWFwLnB1dCh2LmdldElkKCksdik7CisJCQkJU3RyaW5nIGlkID0gZXh0LmdldFVuaXF1ZUlkZW50aWZpZXIoKTsKKwkJCQlpZiAoVHJhY2luZy5pc0VuYWJsZWQoaWQpKXsKKwkJCQkJVmFsaWRhdG9yIHYgPSBwcm9jZXNzVmFsaWRhdG9yKHZhbGlkYXRvciwgaWQsIGV4dC5nZXRMYWJlbCgpLCBudWxsKTsKKwkJCQkJaWYgKHYgIT0gbnVsbCltYXAucHV0KHYuZ2V0SWQoKSx2KTsKKwkJCQl9CiAJCQl9CiAJCX0KIAkJCkBAIC04Myw3ICs4NSwxNiBAQAogCQkJCQl9CiAJCQkJCWVsc2UgewogCQkJCQkJZm9yIChJQ29uZmlndXJhdGlvbkVsZW1lbnQgZXhjbHVkZSA6IHZhbGlkYXRvci5nZXRDaGlsZHJlbigpKXsKLQkJCQkJCQlGaWx0ZXJHcm91cCBmZyA9IGNyZWF0ZUZpbHRlckdyb3VwKGV4Y2x1ZGUpOworCQkJCQkJCUZpbHRlckdyb3VwIGZnID0gbnVsbDsKKwkJCQkJCQl0cnkgeworCQkJCQkJCQlmZyA9IGNyZWF0ZUZpbHRlckdyb3VwKGV4Y2x1ZGUpOworCQkJCQkJCX0KKwkJCQkJCQljYXRjaCAoRXhjZXB0aW9uIGUpeworCQkJCQkJCQlWYWxpZGF0aW9uUGx1Z2luLmdldFBsdWdpbigpLmhhbmRsZUV4Y2VwdGlvbihlKTsKKwkJCQkJCQkJSUNvbnRyaWJ1dG9yIGNvbnRyaWIgPSB2YWxpZGF0b3IuZ2V0Q29udHJpYnV0b3IoKTsKKwkJCQkJCQkJU3RyaW5nIG1lc3NhZ2UgPSBOTFMuYmluZChWYWxNZXNzYWdlcy5FcnJDb25maWcsIGNvbnRyaWIuZ2V0TmFtZSgpKTsKKwkJCQkJCQkJVmFsaWRhdGlvblBsdWdpbi5nZXRQbHVnaW4oKS5sb2dNZXNzYWdlKElTdGF0dXMuRVJST1IsIG1lc3NhZ2UpOwkJCQkJCQkJCisJCQkJCQkJfQogCQkJCQkJCWlmIChmZyAhPSBudWxsICYmIGZnLmlzRXhjbHVkZSgpKXsKIAkJCQkJCQkJbWVyZ2VFeGNsdWRlR3JvdXAodjIsIGZnKTsKIAkJCQkJCQl9CkBAIC05Myw2ICsxMDQsMTMgQEAKIAkJCX0KIAkJCQogCQl9CisJCQorCQlmb3IgKFN0cmluZyByZW1vdmVkVmFsaWRhdG9yIDogZ2V0UmVtb3ZlZFZhbGlkYXRvcnMoKSl7CisJCQlpZiAocmVtb3ZlZFZhbGlkYXRvciAhPSBudWxsKSB7CisJCQkJbWFwLnJlbW92ZShyZW1vdmVkVmFsaWRhdG9yKTsKKwkJCX0KKwkJfQorCiAJCXJldHVybiBtYXAudmFsdWVzKCk7CiAJCQogCX0KQEAgLTExMywxMCArMTMxLDE2IEBACiAJCX0KIAkJaWYgKGV4aXN0aW5nID09IG51bGwpdjIuYWRkKGZnKTsKIAkJZWxzZSB7Ci0JCQlmb3IgKEZpbHRlclJ1bGUgcnVsZSA6IGZnLmdldFJ1bGVzKCkpewotCQkJCWV4aXN0aW5nLmFkZChydWxlKTsKLQkJCX0KLQkJCXYyLmJ1bXBDaGFuZ2VDb3VudEdyb3VwcygpOworCQkJTGlzdDxGaWx0ZXJSdWxlPiBydWxlcyA9IG5ldyBMaW5rZWRMaXN0PEZpbHRlclJ1bGU+KCk7CisJCQlmb3IgKEZpbHRlclJ1bGUgcnVsZSA6IGV4aXN0aW5nLmdldFJ1bGVzKCkpcnVsZXMuYWRkKHJ1bGUpOworCQkJCisJCQlmb3IgKEZpbHRlclJ1bGUgcnVsZSA6IGZnLmdldFJ1bGVzKCkpcnVsZXMuYWRkKHJ1bGUpOworCQkJCisJCQlGaWx0ZXJSdWxlW10gZmlsdGVyUnVsZXMgPSBuZXcgRmlsdGVyUnVsZVtydWxlcy5zaXplKCldOworCQkJcnVsZXMudG9BcnJheShmaWx0ZXJSdWxlcyk7CisJCQlGaWx0ZXJHcm91cCBtZXJnZWQgPSBGaWx0ZXJHcm91cC5jcmVhdGUoZXhpc3RpbmcuaXNFeGNsdWRlKCksIGZpbHRlclJ1bGVzKTsKKwkJCQorCQkJdjIucmVwbGFjZUZpbHRlckdyb3VwKGV4aXN0aW5nLCBtZXJnZWQpOwogCQl9CiAJfQogCQpAQCAtMTgzLDcgKzIwNyw3IEBACiAJfQogCiAJLyoqCi0JICogQW5zd2VyIHRoZSBleHRlbnNpb24gcG9pbnQgZm9yIHRoZSB2YWxpZGF0b3JzLgorCSAqIEFuc3dlciB0aGUgZXh0ZW5zaW9uIHBvaW50IGZvciB0aGUgdjIgdmFsaWRhdG9ycy4KIAkgKiAKIAkgKiBAcmV0dXJuIG51bGwgaWYgdGhlcmUgaXMgYSBwcm9ibGVtIG9yIG5vIGV4dGVuc2lvbnMuCiAJICovCkBAIC0xOTMsNyArMjE3LDggQEAKIAl9CiAKIAkvKioKLQkgKiBBbnN3ZXIgdGhlIGV4dGVuc2lvbiBwb2ludCBmb3IgYWRkaW5nIGV4Y2x1c2lvbiBmaWx0ZXJzLgorCSAqIEFuc3dlciB0aGUgZXh0ZW5zaW9uIHBvaW50IGZvciBhZGRpbmcgZXhjbHVzaW9uIGZpbHRlcnMuIFRoaXMgaXMgd2hlcmUgYW5vdGhlciB2YWxpZGF0b3IgY2FuCisJICogZnVydGhlciByZXN0cmljdCBhbiBleGlzdGluZyB2YWxpZGF0b3IuCiAJICogCiAJICogQHJldHVybiBudWxsIGlmIHRoZXJlIGlzIGEgcHJvYmxlbSBvciBubyBleHRlbnNpb25zLgogCSAqLwpAQCAtMjAyLDkgKzIyNywyMiBAQAogCQlyZXR1cm4gcmVnaXN0cnkuZ2V0RXh0ZW5zaW9uUG9pbnQoVmFsaWRhdGlvblBsdWdpbi5QTFVHSU5fSUQsIEV4dGVuc2lvbkNvbnN0YW50cy5leGNsdWRlRXh0ZW5zaW9uKTsKIAl9CiAJCi0JCi0JCi0KKwkvKioKKwkgKiBBbnN3ZXIgdGhlIGV4dGVuc2lvbiBwb2ludCBmb3IgcmVtb3ZpbmcgYSB2YWxpZGF0b3IuIAorCSAqIAorCSAqIEByZXR1cm4gbGlzdCBvZiB2YWxpZGF0b3IgSUQgb3IgbnVsbCBpZiBubyB2YWxpZGF0b3Igd2lsbCBiZSByZW1vdmVkCisJICovCisJcHJpdmF0ZSBMaXN0PFN0cmluZz4gZ2V0UmVtb3ZlZFZhbGlkYXRvcnMoKXsKKwkJSUV4dGVuc2lvblJlZ2lzdHJ5IHJlZ2lzdHJ5ID0gUGxhdGZvcm0uZ2V0RXh0ZW5zaW9uUmVnaXN0cnkoKTsKKwkJSUV4dGVuc2lvblBvaW50IGV4dGVuc2lvblBvaW50ID0gcmVnaXN0cnkuZ2V0RXh0ZW5zaW9uUG9pbnQoVmFsaWRhdGlvblBsdWdpbi5QTFVHSU5fSUQsIEV4dGVuc2lvbkNvbnN0YW50cy5yZW1vdmVkVmFsaWRhdG9yRXh0ZW5zaW9uKTsKKwkJTGlzdDxTdHJpbmc+IHZhbCA9IG5ldyBMaW5rZWRMaXN0PFN0cmluZz4oKTsKKwkJZm9yIChJRXh0ZW5zaW9uIGV4dCA6IGV4dGVuc2lvblBvaW50LmdldEV4dGVuc2lvbnMoKSl7CisJCQlmb3IgKElDb25maWd1cmF0aW9uRWxlbWVudCB2YWxpZGF0b3IgOiBleHQuZ2V0Q29uZmlndXJhdGlvbkVsZW1lbnRzKCkpeworCQkJCXZhbC5hZGQodmFsaWRhdG9yLmdldEF0dHJpYnV0ZShFeHRlbnNpb25Db25zdGFudHMuUmVtb3ZlZFZhbGlkYXRvci52YWxpZGF0b3JJREF0dHIpKTsKKwkJCX0KKwkJfQorCQlyZXR1cm4gdmFsOworCX0KIAkvKioKIAkgKiBQcm9jZXNzIGEgbWVzc2FnZSBlbGVtZW50IGZvciB0aGUgdmFsaWRhdG9yLCBieSBjcmVhdGluZyBhIE1lc3NhZ2VDYXRlZ29yeSBmb3IgaXQuCiAJICogCkBAIC0yNDUsMzEgKzI4Myw0NCBAQAogCSAqICAgICAgICAgZWxlbWVudC4KIAkgKi8KIAlwcml2YXRlIEZpbHRlckdyb3VwIGNyZWF0ZUZpbHRlckdyb3VwKElDb25maWd1cmF0aW9uRWxlbWVudCBncm91cCl7Ci0JCUZpbHRlckdyb3VwIGZnID0gRmlsdGVyR3JvdXAuY3JlYXRlKGdyb3VwLmdldE5hbWUoKSk7Ci0JCWlmIChmZyA9PSBudWxsKXJldHVybiBudWxsOwkJCQorCQlTdHJpbmcgbmFtZSA9IGdyb3VwLmdldE5hbWUoKTsKKwkJaWYgKCFGaWx0ZXJHcm91cC5pc0tub3duTmFtZShuYW1lKSlyZXR1cm4gbnVsbDsgCisJCQogCQkKIAkJSUNvbmZpZ3VyYXRpb25FbGVtZW50W10gcnVsZXMgPSBncm91cC5nZXRDaGlsZHJlbihFeHRlbnNpb25Db25zdGFudHMucnVsZXMpOwogCQkvLyB0aGVyZSBzaG91bGQgb25seSBiZSBvbmUKKwkJTGlzdDxGaWx0ZXJSdWxlPiBsaXN0ID0gbmV3IExpbmtlZExpc3Q8RmlsdGVyUnVsZT4oKTsKIAkJZm9yIChpbnQgaT0wOyBpPHJ1bGVzLmxlbmd0aDsgaSsrKXsKIAkJCUlDb25maWd1cmF0aW9uRWxlbWVudFtdIHIgPSBydWxlc1tpXS5nZXRDaGlsZHJlbigpOwogCQkJZm9yKGludCBqPTA7IGo8ci5sZW5ndGg7IGorKyl7Ci0JCQkJcHJvY2Vzc1J1bGUoZmcsIHJbal0pOworCQkJCWxpc3QuYWRkKHByb2Nlc3NSdWxlKHJbal0pKTsKIAkJCX0KIAkJfQotCQlyZXR1cm4gZmc7CisJCUZpbHRlclJ1bGVbXSBmaWx0ZXJSdWxlcyA9IG5ldyBGaWx0ZXJSdWxlW2xpc3Quc2l6ZSgpXTsKKwkJbGlzdC50b0FycmF5KGZpbHRlclJ1bGVzKTsKKwkJcmV0dXJuIEZpbHRlckdyb3VwLmNyZWF0ZShuYW1lLCBmaWx0ZXJSdWxlcyk7CiAJfQogCiAJLyoqCiAJICogUHJvY2VzcyBhIHJ1bGUgaW4gb25lIG9mIHRoZSBydWxlIGdyb3Vwcy4KIAkgKiAKLQkgKiBAcGFyYW0gZmcgdGhlIGZpbHRlciBncm91cCB0aGF0IHdlIGFyZSBidWlsZGluZyB1cCAKIAkgKiBAcGFyYW0gcnVsZSBhIHJ1bGUgaW4gdGhlIGdyb3VwLCBsaWtlIGZpbGVleHQuCiAJICovCi0JcHJpdmF0ZSB2b2lkIHByb2Nlc3NSdWxlKEZpbHRlckdyb3VwIGZnLCBJQ29uZmlndXJhdGlvbkVsZW1lbnQgcnVsZSkgewotCQlGaWx0ZXJSdWxlIGZyID0gRmlsdGVyUnVsZS5jcmVhdGUocnVsZS5nZXROYW1lKCkpOwotCQlpZiAoZnIgPT0gbnVsbCl0aHJvdyBuZXcgSWxsZWdhbFN0YXRlRXhjZXB0aW9uKFZhbE1lc3NhZ2VzLkVyckZpbHRlclJ1bGUpOwotCQlmci5zZXREYXRhKHJ1bGUpOwotCQlmZy5hZGQoZnIpOworCXByaXZhdGUgRmlsdGVyUnVsZSBwcm9jZXNzUnVsZShJQ29uZmlndXJhdGlvbkVsZW1lbnQgcnVsZSkgeworCQlGaWx0ZXJSdWxlIGZyID0gRmlsdGVyUnVsZS5jcmVhdGUocnVsZSk7CisJCWlmIChmciA9PSBudWxsKXsKKwkJCVN0cmluZyBjb250cmlidXRvciA9ICIiOyAvLyROT04tTkxTLTEkCisJCQlTdHJpbmcgbmFtZSA9ICIiOyAvLyROT04tTkxTLTEkCisJCQl0cnkgeworCQkJCWNvbnRyaWJ1dG9yID0gcnVsZS5nZXREZWNsYXJpbmdFeHRlbnNpb24oKS5nZXRDb250cmlidXRvcigpLmdldE5hbWUoKTsKKwkJCQluYW1lID0gcnVsZS5nZXROYW1lKCk7CisJCQl9CisJCQljYXRjaCAoRXhjZXB0aW9uIGUpeworCQkJCS8vIGVhdCBpdAorCQkJfQorCQkJdGhyb3cgbmV3IElsbGVnYWxTdGF0ZUV4Y2VwdGlvbihOTFMuYmluZChWYWxNZXNzYWdlcy5FcnJGaWx0ZXJSdWxlLCBjb250cmlidXRvciwgbmFtZSkpOworCQl9CisJCXJldHVybiBmcjsKIAl9CiAJCiAJLyoqCmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uL3ZmMi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9pbnRlcm5hbC9WYWxpZGF0b3JNdXRhYmxlLmphdmEgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uL3ZmMi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9pbnRlcm5hbC9WYWxpZGF0b3JNdXRhYmxlLmphdmEKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uNWFiMjljNQotLS0gL2Rldi9udWxsCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24vdmYyL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL2ludGVybmFsL1ZhbGlkYXRvck11dGFibGUuamF2YQpAQCAtMCwwICsxLDI2MiBAQAorcGFja2FnZSBvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5pbnRlcm5hbDsKKworaW1wb3J0IGphdmEudXRpbC5IYXNoTWFwOworaW1wb3J0IGphdmEudXRpbC5NYXA7CisKK2ltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJ1bnRpbWUuSUFkYXB0YWJsZTsKK2ltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJ1bnRpbWUuUGxhdGZvcm07CitpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uSU11dGFibGVWYWxpZGF0b3I7CitpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uTWVzc2FnZVNldmVyaXR5U2V0dGluZzsKK2ltcG9ydCBvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5WYWxpZGF0b3I7CitpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uVmFsaWRhdG9yLlYxOworaW1wb3J0IG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLlZhbGlkYXRvci5WMjsKK2ltcG9ydCBvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5pbnRlcm5hbC5tb2RlbC5GaWx0ZXJHcm91cDsKKworLyoqCisgKiBUaGUgbXV0YWJsZSBmaWVsZHMgdGhhdCBhIHVzZXIgY2FuIGNoYW5nZSB0aHJvdWdoIHRoZSBwcmVmZXJlbmNlIG9yIHByb3BlcnR5IHBhZ2UuCisgKiBAYXV0aG9yIGthcmFzaXVrCisgKgorICovCitwdWJsaWMgZmluYWwgY2xhc3MgVmFsaWRhdG9yTXV0YWJsZSBpbXBsZW1lbnRzIElBZGFwdGFibGUsIElNdXRhYmxlVmFsaWRhdG9yIHsKKwkKKwlwcml2YXRlIGJvb2xlYW4gX2J1aWxkOworCXByaXZhdGUgYm9vbGVhbglfbWFudWFsOworCXByaXZhdGUgU3RyaW5nIF9kZWxlZ2F0aW5nSWQ7CisJCisJcHJpdmF0ZSBpbnQgX2NoYW5nZUNvdW50R3JvdXBzOworCXByaXZhdGUgaW50IF9jaGFuZ2VDb3VudE1lc3NhZ2VzOworCQorCXByaXZhdGUgZmluYWwgU3RyaW5nCV9uYW1lOworCXByaXZhdGUgZmluYWwgU3RyaW5nIAlfc291cmNlSWQ7CisJcHJpdmF0ZSBmaW5hbCBib29sZWFuIF9pc1YxOworCXByaXZhdGUgZmluYWwgYm9vbGVhbiBfaXNWMjsKKwlwcml2YXRlIGZpbmFsIFZhbGlkYXRvck1ldGFEYXRhIF92bWQ7CisJcHJpdmF0ZSBmaW5hbCBTdHJpbmcgX2lkOworCXByaXZhdGUgZmluYWwgaW50CV92ZXJzaW9uOworCisJcHJpdmF0ZSBGaWx0ZXJHcm91cFtdIF9ncm91cHM7CisJcHJpdmF0ZSBmaW5hbCBNYXA8U3RyaW5nLCBNZXNzYWdlU2V2ZXJpdHlTZXR0aW5nPiBfbWVzc2FnZVNldHRpbmdzOworCXByaXZhdGUgZmluYWwgU3RyaW5nIF92YWxpZGF0b3JDbGFzc25hbWU7CisJCisJcHJpdmF0ZSBmaW5hbCBib29sZWFuIAlfb3JpZ0J1aWxkOworCXByaXZhdGUgZmluYWwgYm9vbGVhbiAJX29yaWdNYW51YWw7CisJcHJpdmF0ZSBmaW5hbCBTdHJpbmcJX29yaWdEZWxlZ2F0aW5nOworCisJcHVibGljIFZhbGlkYXRvck11dGFibGUoVmFsaWRhdG9yIHZhbGlkYXRvcikgeworCQlfbmFtZSA9IHZhbGlkYXRvci5nZXROYW1lKCk7CisJCV9zb3VyY2VJZCA9IHZhbGlkYXRvci5nZXRTb3VyY2VJZCgpOworCQlfbWFudWFsID0gdmFsaWRhdG9yLmlzTWFudWFsVmFsaWRhdGlvbigpOworCQlfYnVpbGQgPSB2YWxpZGF0b3IuaXNCdWlsZFZhbGlkYXRpb24oKTsKKwkJVjIgdjIgPSB2YWxpZGF0b3IuYXNWMlZhbGlkYXRvcigpOworCQlfaXNWMiA9IHYyICE9IG51bGw7CisJCV9kZWxlZ2F0aW5nSWQgPSB2YWxpZGF0b3IuZ2V0RGVsZWdhdGluZ0lkKCk7CisJCQorCQlWMSB2MSA9IHZhbGlkYXRvci5hc1YxVmFsaWRhdG9yKCk7CisJCV9pc1YxID0gdjEgIT0gbnVsbDsKKwkJX3ZtZCA9IF9pc1YxID8gdjEuZ2V0Vm1kKCkgOiBudWxsOworCQlfaWQgPSB2YWxpZGF0b3IuZ2V0SWQoKTsKKwkJCisJCV9vcmlnQnVpbGQgPSBfYnVpbGQ7CisJCV9vcmlnRGVsZWdhdGluZyA9IF9kZWxlZ2F0aW5nSWQ7CisJCV9vcmlnTWFudWFsID0gX21hbnVhbDsKKwkJX3ZlcnNpb24gPSB2YWxpZGF0b3IuZ2V0VmVyc2lvbigpOworCQlfdmFsaWRhdG9yQ2xhc3NuYW1lID0gdmFsaWRhdG9yLmdldFZhbGlkYXRvckNsYXNzbmFtZSgpOworCQlfbWVzc2FnZVNldHRpbmdzID0gbmV3IEhhc2hNYXA8U3RyaW5nLCBNZXNzYWdlU2V2ZXJpdHlTZXR0aW5nPigxMCk7IAorCQlmb3IgKE1hcC5FbnRyeTxTdHJpbmcsIE1lc3NhZ2VTZXZlcml0eVNldHRpbmc+IG1lIDogdmFsaWRhdG9yLmdldE1lc3NhZ2VTZXR0aW5ncygpLmVudHJ5U2V0KCkpeworCQkJX21lc3NhZ2VTZXR0aW5ncy5wdXQobWUuZ2V0S2V5KCksIG1lLmdldFZhbHVlKCkuY29weSgpKTsKKwkJfQorCQkKKwkJaWYgKHYyICE9IG51bGwpeworCQkJRmlsdGVyR3JvdXBbXSBncm91cHMgPSB2Mi5nZXRHcm91cHMoKTsKKwkJCV9ncm91cHMgPSBuZXcgRmlsdGVyR3JvdXBbZ3JvdXBzLmxlbmd0aF07CisJCQlTeXN0ZW0uYXJyYXljb3B5KGdyb3VwcywgMCwgX2dyb3VwcywgMCwgZ3JvdXBzLmxlbmd0aCk7CisJCX0KKwl9CisKKwlwdWJsaWMgVmFsaWRhdG9yTXV0YWJsZShWYWxpZGF0b3JNdXRhYmxlIHZhbCkgeworCQlfYnVpbGQgPSB2YWwuX2J1aWxkOworCQlfZGVsZWdhdGluZ0lkID0gdmFsLl9kZWxlZ2F0aW5nSWQ7CisJCUZpbHRlckdyb3VwW10gZ3JvdXBzID0gdmFsLmdldEdyb3VwcygpOworCQlfZ3JvdXBzID0gbmV3IEZpbHRlckdyb3VwW2dyb3Vwcy5sZW5ndGhdOworCQlTeXN0ZW0uYXJyYXljb3B5KGdyb3VwcywgMCwgX2dyb3VwcywgMCwgZ3JvdXBzLmxlbmd0aCk7CisJCQorCQlfaWQgPSB2YWwuX2lkOworCQlfaXNWMSA9IHZhbC5faXNWMTsKKwkJX2lzVjIgPSB2YWwuX2lzVjI7CisJCV9tYW51YWwgPSB2YWwuX21hbnVhbDsKKwkJX21lc3NhZ2VTZXR0aW5ncyA9IG5ldyBIYXNoTWFwPFN0cmluZywgTWVzc2FnZVNldmVyaXR5U2V0dGluZz4oMTApOyAKKwkJZm9yIChNYXAuRW50cnk8U3RyaW5nLCBNZXNzYWdlU2V2ZXJpdHlTZXR0aW5nPiBtZSA6IHZhbC5nZXRNZXNzYWdlU2V0dGluZ3MoKS5lbnRyeVNldCgpKXsKKwkJCV9tZXNzYWdlU2V0dGluZ3MucHV0KG1lLmdldEtleSgpLCBtZS5nZXRWYWx1ZSgpLmNvcHkoKSk7CisJCX0KKworCQlfbmFtZSA9IHZhbC5fbmFtZTsKKwkJX29yaWdCdWlsZCA9IHZhbC5fb3JpZ0J1aWxkOworCQlfb3JpZ0RlbGVnYXRpbmcgPSB2YWwuX29yaWdEZWxlZ2F0aW5nOworCQlfb3JpZ01hbnVhbCA9IHZhbC5fb3JpZ01hbnVhbDsKKwkJX3NvdXJjZUlkID0gdmFsLl9zb3VyY2VJZDsKKwkJX3ZhbGlkYXRvckNsYXNzbmFtZSA9IHZhbC5fdmFsaWRhdG9yQ2xhc3NuYW1lOworCQlfdmVyc2lvbiA9IHZhbC5fdmVyc2lvbjsKKwkJX3ZtZCA9IHZhbC5fdm1kOworCX0KKworCXB1YmxpYyB2b2lkIHNldEJ1aWxkVmFsaWRhdGlvbihib29sZWFuIGJ1aWxkKSB7CisJCV9idWlsZCA9IGJ1aWxkOwkJCisJfQorCisJcHVibGljIHZvaWQgc2V0TWFudWFsVmFsaWRhdGlvbihib29sZWFuIG1hbnVhbCkgeworCQlfbWFudWFsID0gbWFudWFsOworCX0KKworCXB1YmxpYyBTdHJpbmcgZ2V0TmFtZSgpIHsKKwkJcmV0dXJuIF9uYW1lOworCX0KKworCXB1YmxpYyBib29sZWFuIGlzTWFudWFsVmFsaWRhdGlvbigpIHsKKwkJcmV0dXJuIF9tYW51YWw7CisJfQorCisJcHVibGljIGJvb2xlYW4gaXNCdWlsZFZhbGlkYXRpb24oKSB7CisJCXJldHVybiBfYnVpbGQ7CisJfQorCisJcHVibGljIGJvb2xlYW4gaXNWMlZhbGlkYXRvcigpIHsKKwkJcmV0dXJuIF9pc1YyOworCX0KKworCXB1YmxpYyBTdHJpbmcgZ2V0RGVsZWdhdGluZ0lkKCkgeworCQlyZXR1cm4gX2RlbGVnYXRpbmdJZDsKKwl9CisKKwkvKioKKwkgKiBUaGUgY2FsbGVyIG9mIHRoaXMgbWV0aG9kIG11c3Qgbm90IGNoYW5nZSB0aGUgVmFsaWRhdG9yTWV0YURhdGEuCisJICovCisJcHVibGljIFZhbGlkYXRvck1ldGFEYXRhIGdldFZtZCgpIHsKKwkJcmV0dXJuIF92bWQ7CisJfQorCisJcHVibGljIGJvb2xlYW4gaXNWMVZhbGlkYXRvcigpIHsKKwkJcmV0dXJuIF9pc1YxOworCX0KKworCXB1YmxpYyBTdHJpbmcgZ2V0SWQoKSB7CisJCXJldHVybiBfaWQ7CisJfQorCisJLyoqCisJICogQW5zd2VyIHRydWUgaWYgYW55IG9mIHlvdXIgc2V0dGluZ3MgaGF2ZSBjaGFuZ2VkLgorCSAqLworCXB1YmxpYyBib29sZWFuIGlzQ2hhbmdlZCgpIHsKKwkJaWYgKGhhc0dsb2JhbENoYW5nZXMoKSlyZXR1cm4gdHJ1ZTsKKwkJaWYgKF9jaGFuZ2VDb3VudEdyb3VwcyA+IDAgfHwgX2NoYW5nZUNvdW50TWVzc2FnZXMgPiAwKXJldHVybiB0cnVlOworCQlyZXR1cm4gZmFsc2U7CisJfQorCisJcHVibGljIGJvb2xlYW4gaGFzR2xvYmFsQ2hhbmdlcygpIHsKKwkJaWYgKF9vcmlnQnVpbGQgIT0gX2J1aWxkKXJldHVybiB0cnVlOworCQlpZiAoX29yaWdNYW51YWwgIT0gX21hbnVhbClyZXR1cm4gdHJ1ZTsKKwkJaWYgKCFNaXNjLnNhbWUoX29yaWdEZWxlZ2F0aW5nLCBfZGVsZWdhdGluZ0lkKSlyZXR1cm4gdHJ1ZTsKKwkJcmV0dXJuIGZhbHNlOworCX0KKworCXB1YmxpYyBpbnQgZ2V0VmVyc2lvbigpIHsKKwkJcmV0dXJuIF92ZXJzaW9uOworCX0KKworCXB1YmxpYyB2b2lkIHJlcGxhY2VGaWx0ZXJHcm91cChGaWx0ZXJHcm91cCBleGlzdGluZywgRmlsdGVyR3JvdXAgbWVyZ2VkKSB7CisJCWludCBpID0gZmluZChleGlzdGluZyk7CisJCWlmIChpID09IC0xKWFkZChtZXJnZWQpOyAgLy8gdGhpcyBzaG91bGQgbmV2ZXIgaGFwcGVuCisJCWVsc2UgeworCQkJX2dyb3Vwc1tpXSA9IG1lcmdlZDsKKwkJCWJ1bXBDaGFuZ2VDb3VudEdyb3VwcygpOworCQl9CisJfQorCQorCXB1YmxpYyB2b2lkIHJlbW92ZShGaWx0ZXJHcm91cCBncm91cCkgeworCQlpbnQgaSA9IGZpbmQoZ3JvdXApOworCQlpZiAoaSA9PSAtMSlyZXR1cm47CisJCQorCQlGaWx0ZXJHcm91cFtdIGdyb3VwcyA9IG5ldyBGaWx0ZXJHcm91cFtfZ3JvdXBzLmxlbmd0aC0xXTsKKwkJaWYgKGkgPiAwKVN5c3RlbS5hcnJheWNvcHkoX2dyb3VwcywgMCwgZ3JvdXBzLCAwLCBpKTsKKwkJaWYgKGkgPCBncm91cHMubGVuZ3RoKVN5c3RlbS5hcnJheWNvcHkoX2dyb3VwcywgaSsxLCBncm91cHMsIGksIGdyb3Vwcy5sZW5ndGgtaSk7CisJCV9ncm91cHMgPSBncm91cHM7CisJCWJ1bXBDaGFuZ2VDb3VudEdyb3VwcygpOworCX0KKwkKKwlwcml2YXRlIGludCBmaW5kKEZpbHRlckdyb3VwIGdyb3VwKSB7CisJCWZvciAoaW50IGk9MDsgaTxfZ3JvdXBzLmxlbmd0aDsgaSsrKWlmIChncm91cCA9PSBfZ3JvdXBzW2ldKXJldHVybiBpOworCQlyZXR1cm4gLTE7CisJfQorCisJcHVibGljIHZvaWQgYWRkKEZpbHRlckdyb3VwIGZnKSB7CisJCWFzc2VydCBmZyAhPSBudWxsOworCQlGaWx0ZXJHcm91cFtdIGdyb3VwcyA9IG5ldyBGaWx0ZXJHcm91cFtfZ3JvdXBzLmxlbmd0aCsxXTsKKwkJU3lzdGVtLmFycmF5Y29weShfZ3JvdXBzLCAwLCBncm91cHMsIDAsIF9ncm91cHMubGVuZ3RoKTsKKwkJZ3JvdXBzW19ncm91cHMubGVuZ3RoXSA9IGZnOworCQlfZ3JvdXBzID0gZ3JvdXBzOworCQlidW1wQ2hhbmdlQ291bnRHcm91cHMoKTsKKwl9CisJCisJcHJpdmF0ZSB2b2lkIGJ1bXBDaGFuZ2VDb3VudEdyb3VwcygpeworCQlfY2hhbmdlQ291bnRHcm91cHMrKzsKKwl9CisKKwlwdWJsaWMgaW50IGdldENoYW5nZUNvdW50R3JvdXBzKCkgeworCQlyZXR1cm4gX2NoYW5nZUNvdW50R3JvdXBzOworCX0KKwkKKwlwdWJsaWMgRmlsdGVyR3JvdXBbXSBnZXRHcm91cHMoKXsKKwkJcmV0dXJuIF9ncm91cHM7CisJfQorCisJcHVibGljIHZvaWQgc2V0RGVsZWdhdGluZ0lkKFN0cmluZyBpZCkgeworCQlfZGVsZWdhdGluZ0lkID0gaWQ7CQorCX0KKworCXB1YmxpYyBNYXA8U3RyaW5nLCBNZXNzYWdlU2V2ZXJpdHlTZXR0aW5nPiBnZXRNZXNzYWdlU2V0dGluZ3MoKSB7CisJCXJldHVybiBfbWVzc2FnZVNldHRpbmdzOworCX0KKworCXB1YmxpYyBpbnQgZ2V0Q2hhbmdlQ291bnRNZXNzYWdlcygpeworCQlyZXR1cm4gX2NoYW5nZUNvdW50TWVzc2FnZXM7CisJfQorCQorCXB1YmxpYyB2b2lkIGJ1bXBDaGFuZ2VDb3VudE1lc3NhZ2VzKCl7CisJCV9jaGFuZ2VDb3VudE1lc3NhZ2VzKys7CisJfQorCisJcHVibGljIFN0cmluZyBnZXRWYWxpZGF0b3JDbGFzc25hbWUoKSB7CisJCXJldHVybiBfdmFsaWRhdG9yQ2xhc3NuYW1lOworCX0KKworCUBTdXBwcmVzc1dhcm5pbmdzKCJ1bmNoZWNrZWQiKQorCXB1YmxpYyBPYmplY3QgZ2V0QWRhcHRlcihDbGFzcyBhZGFwdGVyKSB7CisJCXJldHVybiBQbGF0Zm9ybS5nZXRBZGFwdGVyTWFuYWdlcigpLmdldEFkYXB0ZXIodGhpcywgYWRhcHRlcik7CisJfQorCisJcHVibGljIGJvb2xlYW4gc2FtZUNvbmZpZyhWYWxpZGF0b3IgdmFsaWRhdG9yKSB7CisJCWlmICh2YWxpZGF0b3IgPT0gbnVsbClyZXR1cm4gZmFsc2U7CisJCXJldHVybiBoYXNoQ29kZUZvckNvbmZpZygpID09IHZhbGlkYXRvci5oYXNoQ29kZUZvckNvbmZpZygpOworCX0KKworCXByaXZhdGUgaW50IGhhc2hDb2RlRm9yQ29uZmlnKCkgeworCQlpbnQgaCA9IDA7CisJCWlmIChfYnVpbGQpaCArPSAxMDE7CisJCWlmIChfZGVsZWdhdGluZ0lkICE9IG51bGwpaCArPSBfZGVsZWdhdGluZ0lkLmhhc2hDb2RlKCk7CisJCWlmIChfbWFudWFsKWggKz0gMjAxOworCQlpZiAoX21lc3NhZ2VTZXR0aW5ncyAhPSBudWxsKXsKKwkJCWZvciAoTWVzc2FnZVNldmVyaXR5U2V0dGluZyBtcyA6IF9tZXNzYWdlU2V0dGluZ3MudmFsdWVzKCkpaCArPSBtcy5oYXNoQ29kZSgpOworCQl9CisJCWlmIChfc291cmNlSWQgIT0gbnVsbCloICs9IF9zb3VyY2VJZC5oYXNoQ29kZSgpOworCQloICs9IF92ZXJzaW9uOworCQlpZiAoX2lkICE9IG51bGwpaCArPSBfaWQuaGFzaENvZGUoKTsKKwkJZm9yIChGaWx0ZXJHcm91cCBmZyA6IF9ncm91cHMpaCArPSBmZy5oYXNoQ29kZUZvckNvbmZpZygpOworCQlyZXR1cm4gaDsKKwl9CisKKwlAT3ZlcnJpZGUKKwlwdWJsaWMgU3RyaW5nIHRvU3RyaW5nKCkgeworCQlyZXR1cm4gX25hbWU7CisJfQorCisKK30KZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24vdmYyL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL2ludGVybmFsL21vZGVsL0ZpbHRlckdyb3VwLmphdmEgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uL3ZmMi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9pbnRlcm5hbC9tb2RlbC9GaWx0ZXJHcm91cC5qYXZhCmluZGV4IGY1NDQxNTYuLjZkMjBkZDUgMTAwNjQ0Ci0tLSBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24vdmYyL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL2ludGVybmFsL21vZGVsL0ZpbHRlckdyb3VwLmphdmEKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi92ZjIvb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vaW50ZXJuYWwvbW9kZWwvRmlsdGVyR3JvdXAuamF2YQpAQCAtMSw1ICsxLDUgQEAKIC8qKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqCi0gKiBDb3B5cmlnaHQgKGMpIDIwMDUsIDIwMDggSUJNIENvcnBvcmF0aW9uIGFuZCBvdGhlcnMuCisgKiBDb3B5cmlnaHQgKGMpIDIwMDUsIDIwMDkgSUJNIENvcnBvcmF0aW9uIGFuZCBvdGhlcnMuCiAgKiBBbGwgcmlnaHRzIHJlc2VydmVkLiBUaGlzIHByb2dyYW0gYW5kIHRoZSBhY2NvbXBhbnlpbmcgbWF0ZXJpYWxzCiAgKiBhcmUgbWFkZSBhdmFpbGFibGUgdW5kZXIgdGhlIHRlcm1zIG9mIHRoZSBFY2xpcHNlIFB1YmxpYyBMaWNlbnNlIHYxLjAKICAqIHdoaWNoIGFjY29tcGFuaWVzIHRoaXMgZGlzdHJpYnV0aW9uLCBhbmQgaXMgYXZhaWxhYmxlIGF0CkBAIC0yMywxMSArMjMsMTQgQEAKIGltcG9ydCBvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5pbnRlcm5hbC5TZXJpYWxpemVyOwogaW1wb3J0IG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLmludGVybmFsLlZhbE1lc3NhZ2VzOwogCisvKioKKyAqIEFuIGltbXV0YWJsZSBncm91cCBvZiBmaWx0ZXIgcnVsZXMuCisgKiBAYXV0aG9yIGthcmFzaXVrCisgKgorICovCiBwdWJsaWMgYWJzdHJhY3QgY2xhc3MgRmlsdGVyR3JvdXAgaW1wbGVtZW50cyBJQWRhcHRhYmxlIHsKIAkKLQkvKiogQSBsaXN0IG9mIEZpbHRlclJ1bGUncyBmb3IgdGhpcyBncm91cC4gKi8KLQlMaXN0PEZpbHRlclJ1bGU+IF9ydWxlcyA9IG5ldyBMaW5rZWRMaXN0PEZpbHRlclJ1bGU+KCk7Ci0JRmlsdGVyUnVsZVtdIF9ydWxlc0FycmF5OworCXByaXZhdGUgZmluYWwgRmlsdGVyUnVsZVtdIF9ydWxlczsKIAkKIAkvKiogVGhlIHZlcnNpb24gbnVtYmVyIG9mIHRoZSBzZXJpYWxpemF0aW9uIChpbiBjYXNlIHdlIGV2ZXIgbmVlZCB0byBjaGFuZ2UgdGhpcykgKi8KIAlwcml2YXRlIHN0YXRpYyBmaW5hbCBpbnQgU2VyaWFsaXphdGlvblZlcnNpb24gPSAxOwpAQCAtMzksOSArNDIsOSBAQAogCSAqIAogCSAqIEByZXR1cm4gbnVsbCBpZiB0aGUgbmFtZSBwYXJhbWV0ZXIgaXNuJ3QgY29ycmVjdC4KIAkgKi8KLQlwdWJsaWMgc3RhdGljIEZpbHRlckdyb3VwIGNyZWF0ZShTdHJpbmcgbmFtZSkgewotCQlpZiAoRXh0ZW5zaW9uQ29uc3RhbnRzLmluY2x1ZGUuZXF1YWxzKG5hbWUpKXJldHVybiBuZXcgRmlsdGVySW5jbHVkZUdyb3VwKCk7Ci0JCWlmIChFeHRlbnNpb25Db25zdGFudHMuZXhjbHVkZS5lcXVhbHMobmFtZSkpcmV0dXJuIG5ldyBGaWx0ZXJFeGNsdWRlR3JvdXAoKTsKKwlwdWJsaWMgc3RhdGljIEZpbHRlckdyb3VwIGNyZWF0ZShTdHJpbmcgbmFtZSwgRmlsdGVyUnVsZVtdIHJ1bGVzKSB7CisJCWlmIChFeHRlbnNpb25Db25zdGFudHMuaW5jbHVkZS5lcXVhbHMobmFtZSkpcmV0dXJuIG5ldyBGaWx0ZXJJbmNsdWRlR3JvdXAocnVsZXMpOworCQlpZiAoRXh0ZW5zaW9uQ29uc3RhbnRzLmV4Y2x1ZGUuZXF1YWxzKG5hbWUpKXJldHVybiBuZXcgRmlsdGVyRXhjbHVkZUdyb3VwKHJ1bGVzKTsKIAkJcmV0dXJuIG51bGw7CiAJfQogCQpAQCAtNTQsOSArNTcsMTQgQEAKIAlwdWJsaWMgc3RhdGljIEZpbHRlckdyb3VwIGNyZWF0ZShEZXNlcmlhbGl6ZXIgZGVzKXsKIAkJZGVzLmdldEludCgpOyAvLyBnZXQgdGhlIHZlcnNpb24KIAkJU3RyaW5nIHR5cGUgPSBkZXMuZ2V0U3RyaW5nKCk7Ci0JCUZpbHRlckdyb3VwIGZnID0gY3JlYXRlKHR5cGUpOwotCQlpZiAoZmcgIT0gbnVsbClmZy5sb2FkKGRlcyk7Ci0JCXJldHVybiBmZzsKKwkJCisJCWludCBudW1iZXJSdWxlcyA9IGRlcy5nZXRJbnQoKTsKKwkJTGlzdDxGaWx0ZXJSdWxlPiBsaXN0ID0gbmV3IExpbmtlZExpc3Q8RmlsdGVyUnVsZT4oKTsKKwkJZm9yIChpbnQgaT0wOyBpPG51bWJlclJ1bGVzOyBpKyspbGlzdC5hZGQoRmlsdGVyUnVsZS5jcmVhdGUoZGVzKSk7CisJCUZpbHRlclJ1bGVbXSBydWxlcyA9IG5ldyBGaWx0ZXJSdWxlW2xpc3Quc2l6ZSgpXTsKKwkJbGlzdC50b0FycmF5KHJ1bGVzKTsKKworCQlyZXR1cm4gY3JlYXRlKHR5cGUsIHJ1bGVzKTsKIAl9CiAKIAkvKioKQEAgLTY0LDQyICs3MiwzNiBAQAogCSAqIAogCSAqIEBwYXJhbSBleGNsdWRlIGlmIHRydWUgYW4gZXhjbHVzaW9uIGdyb3VwIGlzIHJldHVybmVkLCBvdGhlcndpc2UgYW4gaW5jbHVzaW9uIGdyb3VwIGlzIHJldHVybmVkLgogCSAqLwotCXB1YmxpYyBzdGF0aWMgRmlsdGVyR3JvdXAgY3JlYXRlKGJvb2xlYW4gZXhjbHVkZSl7Ci0JCWlmIChleGNsdWRlKSByZXR1cm4gbmV3IEZpbHRlckV4Y2x1ZGVHcm91cCgpOwotCQlyZXR1cm4gbmV3IEZpbHRlckluY2x1ZGVHcm91cCgpOworCXB1YmxpYyBzdGF0aWMgRmlsdGVyR3JvdXAgY3JlYXRlKGJvb2xlYW4gZXhjbHVkZSwgRmlsdGVyUnVsZVtdIHJ1bGVzKXsKKwkJaWYgKGV4Y2x1ZGUpIHJldHVybiBuZXcgRmlsdGVyRXhjbHVkZUdyb3VwKHJ1bGVzKTsKKwkJcmV0dXJuIG5ldyBGaWx0ZXJJbmNsdWRlR3JvdXAocnVsZXMpOwogCX0KIAotCXB1YmxpYyB2b2lkIGFkZChGaWx0ZXJSdWxlIGZyKSB7Ci0JCV9ydWxlc0FycmF5ID0gbnVsbDsKLQkJX3J1bGVzLmFkZChmcik7Ci0JfQotCQogCS8qKgotCSAqIElmIHlvdSBjYW4sIHJlbW92ZSB0aGlzIHJ1bGUgZnJvbSB5b3Vyc2VsZi4KLQkgKiAKLQkgKiBAcGFyYW0gZnIgdGhlIHJ1bGUgdGhhdCBpcyBiZWluZyByZW1vdmVkCi0JICogCi0JICogQHJldHVybiB0cnVlIGlmIHRoZSBydWxlIHdhcyByZW1vdmVkLCBhbmQgZmFsc2UgaWYgaXQgd2FzIG5vdC4gSWYgeW91IGRpZG4ndCBpbmNsdWRlIHRoZSBydWxlIGluIHRoZQotCSAqIGZpcnN0IHBsYWNlLCBmYWxzZSB3b3VsZCBiZSByZXR1cm5lZC4KKwkgKiBBbnN3ZXIgdHJ1ZSBpZiB0aGlzIGlzIGEgc3VwcG9ydGVkIHR5cGUgb2YgZ3JvdXAuCisJICogQHBhcmFtIG5hbWUgVHlwZSBvZiBncm91cCB0aGF0IGlzIGJlaW5nIHRlc3RlZC4KKwkgKiBAcmV0dXJuCiAJICovCi0JcHVibGljIHN5bmNocm9uaXplZCBib29sZWFuIHJlbW92ZShGaWx0ZXJSdWxlIGZyKXsKLQkJaWYgKF9ydWxlcy5yZW1vdmUoZnIpKXsKLQkJCV9ydWxlc0FycmF5ID0gIG51bGw7Ci0JCQlyZXR1cm4gdHJ1ZTsKLQkJfQorCXB1YmxpYyBzdGF0aWMgYm9vbGVhbiBpc0tub3duTmFtZShTdHJpbmcgbmFtZSkgeworCQlpZiAoRXh0ZW5zaW9uQ29uc3RhbnRzLmluY2x1ZGUuZXF1YWxzKG5hbWUpKXJldHVybiB0cnVlOworCQlpZiAoRXh0ZW5zaW9uQ29uc3RhbnRzLmV4Y2x1ZGUuZXF1YWxzKG5hbWUpKXJldHVybiB0cnVlOwogCQlyZXR1cm4gZmFsc2U7CiAJfQorCiAJCi0JcHVibGljIEZpbHRlclJ1bGVbXSBnZXRSdWxlcygpewotCQlGaWx0ZXJSdWxlW10gcnVsZXMgPSBfcnVsZXNBcnJheTsKLQkJaWYgKHJ1bGVzID09IG51bGwpewotCQkJcnVsZXMgPSBuZXcgRmlsdGVyUnVsZVtfcnVsZXMuc2l6ZSgpXTsKLQkJCV9ydWxlcy50b0FycmF5KHJ1bGVzKTsKLQkJCV9ydWxlc0FycmF5ID0gcnVsZXM7Ci0JCX0KKwlwcml2YXRlIEZpbHRlckdyb3VwKEZpbHRlclJ1bGVbXSBydWxlcyl7CisJCV9ydWxlcyA9IHJ1bGVzOworCX0KKwkJCisJLyoqCisJICogVGhlIHJ1bGVzIGluIHRoZSBncm91cC4KKwkgKi8KKwlwdWJsaWMgZmluYWwgRmlsdGVyUnVsZVtdIGdldFJ1bGVzKCl7CisJCUZpbHRlclJ1bGVbXSBydWxlcyA9IG5ldyBGaWx0ZXJSdWxlW19ydWxlcy5sZW5ndGhdOworCQlTeXN0ZW0uYXJyYXljb3B5KF9ydWxlcywgMCwgcnVsZXMsIDAsIF9ydWxlcy5sZW5ndGgpOwogCQlyZXR1cm4gcnVsZXM7CiAJfQotCQorCQkKIAkvKioKIAkgKiBBbnN3ZXIgdGhlIGludGVybmFsIHR5cGUgb2YgZ3JvdXAsIGUuZy4gImluY2x1ZGUiIG9yICJleGNsdWRlIi4KIAkgKi8KQEAgLTExMyw3ICsxMTUsMTEgQEAKIAkJcmV0dXJuIFBsYXRmb3JtLmdldEFkYXB0ZXJNYW5hZ2VyKCkuZ2V0QWRhcHRlcih0aGlzLCBhZGFwdGVyKTsKIAl9CiAJCi0JcHVibGljIHN0YXRpYyBjbGFzcyBGaWx0ZXJJbmNsdWRlR3JvdXAgZXh0ZW5kcyBGaWx0ZXJHcm91cCB7CisJcHVibGljIHN0YXRpYyBmaW5hbCBjbGFzcyBGaWx0ZXJJbmNsdWRlR3JvdXAgZXh0ZW5kcyBGaWx0ZXJHcm91cCB7CisJCQorCQlwcml2YXRlIEZpbHRlckluY2x1ZGVHcm91cChGaWx0ZXJSdWxlW10gcnVsZXMpeworCQkJc3VwZXIocnVsZXMpOworCQl9CiAKIAkJcHVibGljIFN0cmluZyBnZXRUeXBlKCkgewogCQkJcmV0dXJuIEV4dGVuc2lvbkNvbnN0YW50cy5pbmNsdWRlOwpAQCAtMTI3LDIyICsxMzMsMTggQEAKIAkJCXJldHVybiB0cnVlOwogCQl9CiAJCQotCQlwcm90ZWN0ZWQgRmlsdGVyR3JvdXAgY3JlYXRlKCkgewotCQkJcmV0dXJuIG5ldyBGaWx0ZXJJbmNsdWRlR3JvdXAoKTsKLQkJfQotCQkKIAl9CiAJCiAJCi0JcHVibGljIHN0YXRpYyBjbGFzcyBGaWx0ZXJFeGNsdWRlR3JvdXAgZXh0ZW5kcyBGaWx0ZXJHcm91cCB7CisJcHVibGljIHN0YXRpYyBmaW5hbCBjbGFzcyBGaWx0ZXJFeGNsdWRlR3JvdXAgZXh0ZW5kcyBGaWx0ZXJHcm91cCB7CisJCQorCQlwcml2YXRlIEZpbHRlckV4Y2x1ZGVHcm91cChGaWx0ZXJSdWxlW10gcnVsZXMpeworCQkJc3VwZXIocnVsZXMpOworCQl9CiAJCXB1YmxpYyBTdHJpbmcgZ2V0VHlwZSgpIHsKIAkJCXJldHVybiBFeHRlbnNpb25Db25zdGFudHMuZXhjbHVkZTsKIAkJfQogCQkKLQkJcHJvdGVjdGVkIEZpbHRlckdyb3VwIGNyZWF0ZSgpIHsKLQkJCXJldHVybiBuZXcgRmlsdGVyRXhjbHVkZUdyb3VwKCk7Ci0JCX0KLQkJCiAJCXB1YmxpYyBTdHJpbmcgZ2V0RGlzcGxheWFibGVUeXBlKCkgewogCQkJcmV0dXJuIFZhbE1lc3NhZ2VzLkdyb3VwRXhjbHVkZTsKIAkJfQpAQCAtMTUxLDEyICsxNTMsNyBAQAogCQkJcmV0dXJuIHRydWU7CiAJCX0JCQogCX0KLQkKLQlwcm90ZWN0ZWQgdm9pZCBsb2FkKERlc2VyaWFsaXplciBkZXMpIHsKLQkJaW50IHJ1bGVzID0gZGVzLmdldEludCgpOwotCQlmb3IgKGludCBpPTA7IGk8cnVsZXM7IGkrKylfcnVsZXMuYWRkKEZpbHRlclJ1bGUuY3JlYXRlKGRlcykpOwotCX0KLQkKKwkJCiAJLyoqCiAJICogU2F2ZSB5b3VyIHNldHRpbmdzIGludG8gdGhlIHNlcmlhbGl6ZXIuCiAJICogQHBhcmFtIHNlcgpAQCAtMTY0LDcgKzE2MSw3IEBACiAJcHVibGljIHZvaWQgc2F2ZShTZXJpYWxpemVyIHNlcil7CiAJCXNlci5wdXQoU2VyaWFsaXphdGlvblZlcnNpb24pOwogCQlzZXIucHV0KGdldFR5cGUoKSk7Ci0JCXNlci5wdXQoX3J1bGVzLnNpemUoKSk7CisJCXNlci5wdXQoX3J1bGVzLmxlbmd0aCk7CiAJCWZvciAoRmlsdGVyUnVsZSBydWxlIDogX3J1bGVzKXJ1bGUuc2F2ZShzZXIpOwkJCiAJfQogCkBAIC0xNzYsMTEgKzE3MywxMCBAQAogCSAqIG9ubHkgdGhlIHByb2plY3QgbGV2ZWwgY2hlY2tzIGFyZSBwZXJmb3JtZWQuCiAJICovCiAJcHVibGljIGJvb2xlYW4gc2hvdWxkVmFsaWRhdGUoSVByb2plY3QgcHJvamVjdCwgSVJlc291cmNlIHJlc291cmNlLCBDb250ZW50VHlwZVdyYXBwZXIgY29udGVudFR5cGVXcmFwcGVyKSB7Ci0JCUZpbHRlclJ1bGVbXSBydWxlcyA9IGdldFJ1bGVzKCk7CiAJCWJvb2xlYW4gZXhjbHVkZSA9IGlzRXhjbHVkZSgpOwogCQlib29sZWFuIGluY2x1ZGUgPSBpc0luY2x1ZGUoKTsKIAkJaW50IGNvdW50ID0gMDsKLQkJZm9yIChGaWx0ZXJSdWxlIHJ1bGUgOiBydWxlcyl7CisJCWZvciAoRmlsdGVyUnVsZSBydWxlIDogX3J1bGVzKXsKIAkJCWlmIChyZXNvdXJjZSAhPSBudWxsKXsKIAkJCQlCb29sZWFuIG1hdGNoID0gcnVsZS5tYXRjaGVzUmVzb3VyY2UocmVzb3VyY2UsIGNvbnRlbnRUeXBlV3JhcHBlcik7CiAJCQkJaWYgKG1hdGNoICE9IG51bGwpY291bnQrKzsKQEAgLTIxNCwyOCArMjEwLDQ0IEBACiAJCXJldHVybiBmYWxzZTsKIAl9CiAJCi0JcHJvdGVjdGVkIGFic3RyYWN0IEZpbHRlckdyb3VwIGNyZWF0ZSgpOwotCi0JLyoqIEFuc3dlciBhIGRlZXAgY29weSBvZiB5b3Vyc2VsZi4gKi8KLQlwdWJsaWMgRmlsdGVyR3JvdXAgY29weSgpIHsKLQkJRmlsdGVyR3JvdXAgZmcgPSBjcmVhdGUoKTsKLQkJRmlsdGVyUnVsZVtdIHJ1bGVzID0gZ2V0UnVsZXMoKTsKLQkJZmcuX3J1bGVzQXJyYXkgPSBuZXcgRmlsdGVyUnVsZVtydWxlcy5sZW5ndGhdOwotCQlmb3IgKGludCBpPTA7IGk8cnVsZXMubGVuZ3RoOyBpKyspewotCQkJZmcuX3J1bGVzQXJyYXlbaV0gPSBydWxlc1tpXS5jb3B5KCk7Ci0JCQlmZy5fcnVsZXMuYWRkKGZnLl9ydWxlc0FycmF5W2ldKTsKLQkJfQotCQlyZXR1cm4gZmc7Ci0JfQotCiAJcHVibGljIGludCBoYXNoQ29kZUZvckNvbmZpZygpIHsKIAkJaW50IGggPSAwOwogCQlpZiAoaXNFeGNsdWRlKCkpaCArPSAxMzsKLQkJaWYgKF9ydWxlcyAhPSBudWxsKXsKLQkJCWZvciAoRmlsdGVyUnVsZSBmciA6IF9ydWxlcyloICs9IGZyLmhhc2hDb2RlRm9yQ29uZmlnKCk7Ci0JCX0KKwkJZm9yIChGaWx0ZXJSdWxlIGZyIDogX3J1bGVzKWggKz0gZnIuaGFzaENvZGVGb3JDb25maWcoKTsKIAkJcmV0dXJuIGg7CiAJfQotCQorCisJLyoqCisJICogQ3JlYXRlIGEgbmV3IGdyb3VwIGJ5IGFkZGluZyBhIHJ1bGUgdG8gYW4gZXhpc3RpbmcgZ3JvdXAuCisJICogQHBhcmFtIGJhc2VHcm91cCBUaGUgZ3JvdXAgdGhhdCBob2xkcyB0aGUgZXhpc3RpbmcgcnVsZXMuCisJICogQHBhcmFtIHJ1bGUgVGhlIG5ldyBydWxlIHRoYXQgaXMgYmVpbmcgYWRkZWQKKwkgKiBAcmV0dXJuCisJICovCisJcHVibGljIHN0YXRpYyBGaWx0ZXJHcm91cCBhZGRSdWxlKEZpbHRlckdyb3VwIGJhc2VHcm91cCwgRmlsdGVyUnVsZSBydWxlKSB7CisJCUxpc3Q8RmlsdGVyUnVsZT4gbGlzdCA9IG5ldyBMaW5rZWRMaXN0PEZpbHRlclJ1bGU+KCk7CisJCWZvciAoRmlsdGVyUnVsZSByIDogYmFzZUdyb3VwLl9ydWxlcylsaXN0LmFkZChyKTsKKwkJbGlzdC5hZGQocnVsZSk7CisJCQorCQlGaWx0ZXJSdWxlW10gcnVsZXMgPSBuZXcgRmlsdGVyUnVsZVtsaXN0LnNpemUoKV07CisJCWxpc3QudG9BcnJheShydWxlcyk7CisJCXJldHVybiBGaWx0ZXJHcm91cC5jcmVhdGUoYmFzZUdyb3VwLmlzRXhjbHVkZSgpLCBydWxlcyk7CisJfQorCisJLyoqCisJICogQ3JlYXRlIGEgbmV3IGdyb3VwIGJ5IHJlbW92aW5nIGEgcnVsZSBmcm9tIGFuIGV4aXN0aW5nIGdyb3VwLgorCSAqIEBwYXJhbSBiYXNlR3JvdXAgVGhlIGdyb3VwIHRoYXQgaG9sZHMgdGhlIGV4aXN0aW5nIHJ1bGVzLgorCSAqIEBwYXJhbSBydWxlIFRoZSBydWxlIHRoYXQgaXMgYmVpbmcgcmVtb3ZlZAorCSAqIEByZXR1cm4KKwkgKi8KKwlwdWJsaWMgc3RhdGljIEZpbHRlckdyb3VwIHJlbW92ZVJ1bGUoRmlsdGVyR3JvdXAgYmFzZUdyb3VwLAlGaWx0ZXJSdWxlIHJ1bGUpIHsKKwkJTGlzdDxGaWx0ZXJSdWxlPiBsaXN0ID0gbmV3IExpbmtlZExpc3Q8RmlsdGVyUnVsZT4oKTsKKwkJZm9yIChGaWx0ZXJSdWxlIHIgOiBiYXNlR3JvdXAuX3J1bGVzKXsKKwkJCWlmICghci5lcXVhbHMocnVsZSkpbGlzdC5hZGQocik7CisJCX0KKwkJCisJCUZpbHRlclJ1bGVbXSBydWxlcyA9IG5ldyBGaWx0ZXJSdWxlW2xpc3Quc2l6ZSgpXTsKKwkJbGlzdC50b0FycmF5KHJ1bGVzKTsKKwkJcmV0dXJuIEZpbHRlckdyb3VwLmNyZWF0ZShiYXNlR3JvdXAuaXNFeGNsdWRlKCksIHJ1bGVzKTsKKwl9CQogCiB9CmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uL3ZmMi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9pbnRlcm5hbC9tb2RlbC9GaWx0ZXJSdWxlLmphdmEgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uL3ZmMi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9pbnRlcm5hbC9tb2RlbC9GaWx0ZXJSdWxlLmphdmEKaW5kZXggMDA5N2NkNS4uZTUwZGY2MSAxMDA2NDQKLS0tIGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi92ZjIvb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vaW50ZXJuYWwvbW9kZWwvRmlsdGVyUnVsZS5qYXZhCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24vdmYyL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL2ludGVybmFsL21vZGVsL0ZpbHRlclJ1bGUuamF2YQpAQCAtMSw1ICsxLDUgQEAKIC8qKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqCi0gKiBDb3B5cmlnaHQgKGMpIDIwMDcsIDIwMDggSUJNIENvcnBvcmF0aW9uIGFuZCBvdGhlcnMuCisgKiBDb3B5cmlnaHQgKGMpIDIwMDcsIDIwMDkgSUJNIENvcnBvcmF0aW9uIGFuZCBvdGhlcnMuCiAgKiBBbGwgcmlnaHRzIHJlc2VydmVkLiBUaGlzIHByb2dyYW0gYW5kIHRoZSBhY2NvbXBhbnlpbmcgbWF0ZXJpYWxzCiAgKiBhcmUgbWFkZSBhdmFpbGFibGUgdW5kZXIgdGhlIHRlcm1zIG9mIHRoZSBFY2xpcHNlIFB1YmxpYyBMaWNlbnNlIHYxLjAKICAqIHdoaWNoIGFjY29tcGFuaWVzIHRoaXMgZGlzdHJpYnV0aW9uLCBhbmQgaXMgYXZhaWxhYmxlIGF0CkBAIC0xMCw2ICsxMCw4IEBACiAgKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKi8KIHBhY2thZ2Ugb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uaW50ZXJuYWwubW9kZWw7CiAKK2ltcG9ydCBqYXZhLnV0aWwucmVnZXguUGF0dGVybjsKKwogaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucmVzb3VyY2VzLklGaWxlOwogaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucmVzb3VyY2VzLklQcm9qZWN0OwogaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucmVzb3VyY2VzLklSZXNvdXJjZTsKQEAgLTIzLDc5ICsyNSwxMDUgQEAKIGltcG9ydCBvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5pbnRlcm5hbC5Db250ZW50VHlwZVdyYXBwZXI7CiBpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uaW50ZXJuYWwuRGVzZXJpYWxpemVyOwogaW1wb3J0IG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLmludGVybmFsLkV4dGVuc2lvbkNvbnN0YW50czsKLWltcG9ydCBvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5pbnRlcm5hbC5QcmVmQ29uc3RhbnRzOwogaW1wb3J0IG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLmludGVybmFsLlNlcmlhbGl6ZXI7CiBpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uaW50ZXJuYWwuVHJhY2luZzsKIGltcG9ydCBvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5pbnRlcm5hbC5WYWxNZXNzYWdlczsKIGltcG9ydCBvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5pbnRlcm5hbC5wbHVnaW4uVmFsaWRhdGlvblBsdWdpbjsKLWltcG9ydCBvcmcub3NnaS5zZXJ2aWNlLnByZWZzLlByZWZlcmVuY2VzOwogCiAvKioKICAqIEEgcnVsZSB0aGF0IGlzIHVzZWQgdG8gZmlsdGVyIG91dCAob3IgaW4pIHZhbGlkYXRpb24gb24gYSByZXNvdXJjZS4KKyAqIFRoZSBjb25jcmV0ZSBjbGFzc2VzIGFyZSBhbGwgaW1tdXRhYmxlLgogICogQGF1dGhvciBrYXJhc2l1awogICoKICAqLwogcHVibGljIGFic3RyYWN0IGNsYXNzIEZpbHRlclJ1bGUgaW1wbGVtZW50cyBJQWRhcHRhYmxlIHsKIAkKLQlwcm90ZWN0ZWQgU3RyaW5nIF9wYXR0ZXJuOworCXByb3RlY3RlZCBmaW5hbCBTdHJpbmcgX3BhdHRlcm47CisJCisJcHJvdGVjdGVkIHN0YXRpYyBmaW5hbCBTdHJpbmcgUG9ydGFibGVGaWxlRGVsaW0gPSAiLyI7IC8vJE5PTi1OTFMtMSQKIAkKIAkvKioKLQkgKiBDcmVhdGUgYSBydWxlIGJhc2VkIG9uIGFuIGV4dGVuc2lvbiBlbGVtZW50LgotCSAqIEBwYXJhbSBuYW1lIHRoZSBleHRlbnNpb24gZWxlbWVudCwgaXQgY2FuIGJlIG9uZSBvZiBwcm9qZWN0TmF0dXJlLCBmYWNldCwgZmlsZWV4dCwgZmlsZSBvciBjb250ZW50VHlwZQorCSAqIENyZWF0ZSBhIHJ1bGUgYmFzZWQgb24gYSBjb25maWd1cmF0aW9uIGVsZW1lbnQuCisJICogCisJICogQHBhcmFtIHJ1bGUKKwkgKiAgICAgICAgICAgIFRoZSBjb25maWd1cmF0aW9uIGVsZW1lbnQsIHNlZSB0aGUgZXh0ZW5zaW9uIHBvaW50IGZvciBkZXRhaWxzLgogCSAqIEByZXR1cm4gbnVsbCBpZiB0aGVyZSBpcyBhIHByb2JsZW0uCiAJICovCi0JcHVibGljIHN0YXRpYyBGaWx0ZXJSdWxlIGNyZWF0ZShTdHJpbmcgbmFtZSl7Ci0JCWlmIChFeHRlbnNpb25Db25zdGFudHMuUnVsZS5maWxlZXh0LmVxdWFscyhuYW1lKSlyZXR1cm4gbmV3IEZpbGVFeHQoKTsKLQkJaWYgKEV4dGVuc2lvbkNvbnN0YW50cy5SdWxlLnByb2plY3ROYXR1cmUuZXF1YWxzKG5hbWUpKXJldHVybiBuZXcgUHJvamVjdE5hdHVyZSgpOwotCQlpZiAoRXh0ZW5zaW9uQ29uc3RhbnRzLlJ1bGUuZmlsZS5lcXVhbHMobmFtZSkpcmV0dXJuIG5ldyBGaWxlKCk7Ci0JCWlmIChFeHRlbnNpb25Db25zdGFudHMuUnVsZS5jb250ZW50VHlwZS5lcXVhbHMobmFtZSkpcmV0dXJuIG5ldyBDb250ZW50VHlwZSgpOwotCQlpZiAoRXh0ZW5zaW9uQ29uc3RhbnRzLlJ1bGUuZmFjZXQuZXF1YWxzKG5hbWUpKXJldHVybiBuZXcgRmFjZXQoKTsKKwlwdWJsaWMgc3RhdGljIEZpbHRlclJ1bGUgY3JlYXRlKElDb25maWd1cmF0aW9uRWxlbWVudCBydWxlKXsKKwkJU3RyaW5nIG5hbWUgPSBydWxlLmdldE5hbWUoKTsKKwkJaWYgKEV4dGVuc2lvbkNvbnN0YW50cy5SdWxlLmZpbGVleHQuZXF1YWxzKG5hbWUpKXJldHVybiBuZXcgRmlsZUV4dChydWxlKTsKKwkJaWYgKEV4dGVuc2lvbkNvbnN0YW50cy5SdWxlLnByb2plY3ROYXR1cmUuZXF1YWxzKG5hbWUpKXJldHVybiBuZXcgUHJvamVjdE5hdHVyZShydWxlKTsKKwkJaWYgKEV4dGVuc2lvbkNvbnN0YW50cy5SdWxlLmZpbGUuZXF1YWxzKG5hbWUpKXJldHVybiBGaWxlLmNyZWF0ZUZpbGUocnVsZSk7CisJCWlmIChFeHRlbnNpb25Db25zdGFudHMuUnVsZS5jb250ZW50VHlwZS5lcXVhbHMobmFtZSkpcmV0dXJuIENvbnRlbnRUeXBlLmNyZWF0ZUNvbnRlbnRUeXBlKHJ1bGUpOworCQlpZiAoRXh0ZW5zaW9uQ29uc3RhbnRzLlJ1bGUuZmFjZXQuZXF1YWxzKG5hbWUpKXJldHVybiBuZXcgRmFjZXQocnVsZSk7CisJCWlmIChFeHRlbnNpb25Db25zdGFudHMuUnVsZS5wYXR0ZXJuLmVxdWFscyhuYW1lKSlyZXR1cm4gRmlsZVBhdHRlcm4uY3JlYXRlRmlsZVBhdHRlcm4ocnVsZSk7CiAJCXJldHVybiBudWxsOwogCX0KIAkKLQlwdWJsaWMgc3RhdGljIEZpbHRlclJ1bGUgY3JlYXRlKERlc2VyaWFsaXplciBkZXMpIHsKKwlzdGF0aWMgRmlsdGVyUnVsZSBjcmVhdGUoRGVzZXJpYWxpemVyIGRlcykgewogCQlTdHJpbmcgdHlwZSA9IGRlcy5nZXRTdHJpbmcoKTsKLQkJRmlsdGVyUnVsZSBmciA9IGNyZWF0ZSh0eXBlKTsKLQkJaWYgKGZyICE9IG51bGwpZnIubG9hZChkZXMpOwotCQlyZXR1cm4gZnI7CisJCWlmIChFeHRlbnNpb25Db25zdGFudHMuUnVsZS5maWxlZXh0LmVxdWFscyh0eXBlKSl7CisJCQlTdHJpbmcgcGF0dGVybiA9IGRlcy5nZXRTdHJpbmcoKTsKKwkJCWJvb2xlYW4gY2FzZVNlbnNpdGl2ZSA9IGRlcy5nZXRCb29sZWFuKCk7CisJCQlyZXR1cm4gbmV3IEZpbGVFeHQocGF0dGVybiwgY2FzZVNlbnNpdGl2ZSk7CisJCX0KKwkJCisJCWlmIChFeHRlbnNpb25Db25zdGFudHMuUnVsZS5wcm9qZWN0TmF0dXJlLmVxdWFscyh0eXBlKSl7CisJCQlTdHJpbmcgcGF0dGVybiA9IGRlcy5nZXRTdHJpbmcoKTsKKwkJCXJldHVybiBuZXcgUHJvamVjdE5hdHVyZShwYXR0ZXJuKTsKKwkJfQorCQkKKwkJaWYgKEV4dGVuc2lvbkNvbnN0YW50cy5SdWxlLmZpbGUuZXF1YWxzKHR5cGUpKXsKKwkJCVN0cmluZyBwYXR0ZXJuID0gZGVzLmdldFN0cmluZygpOworCQkJYm9vbGVhbiBjYXNlU2Vuc2l0aXZlID0gZGVzLmdldEJvb2xlYW4oKTsKKwkJCWludCBmaWxlVHlwZSA9IGRlcy5nZXRJbnQoKTsKKwkJCXJldHVybiBuZXcgRmlsZShwYXR0ZXJuLCBjYXNlU2Vuc2l0aXZlLCBmaWxlVHlwZSk7CisJCX0KKwkJCisJCWlmIChFeHRlbnNpb25Db25zdGFudHMuUnVsZS5jb250ZW50VHlwZS5lcXVhbHModHlwZSkpeworCQkJU3RyaW5nIHBhdHRlcm4gPSBkZXMuZ2V0U3RyaW5nKCk7CisJCQlib29sZWFuIGV4YWN0TWF0Y2ggPSBkZXMuZ2V0Qm9vbGVhbigpOworCQkJcmV0dXJuIG5ldyBDb250ZW50VHlwZShwYXR0ZXJuLCBleGFjdE1hdGNoKTsKKwkJfQorCQkKKwkJaWYgKEV4dGVuc2lvbkNvbnN0YW50cy5SdWxlLmZhY2V0LmVxdWFscyh0eXBlKSl7CisJCQlTdHJpbmcgcGF0dGVybiA9IGRlcy5nZXRTdHJpbmcoKTsKKwkJCXJldHVybiBuZXcgRmFjZXQocGF0dGVybiwgbnVsbCk7CisJCX0KKwkJCisJCWlmIChFeHRlbnNpb25Db25zdGFudHMuUnVsZS5wYXR0ZXJuLmVxdWFscyh0eXBlKSl7CisJCQlTdHJpbmcgcGF0dGVybiA9IGRlcy5nZXRTdHJpbmcoKTsKKwkJCWJvb2xlYW4gY2FzZVNlbnNpdGl2ZSA9IGRlcy5nZXRCb29sZWFuKCk7CisJCQlyZXR1cm4gbmV3IEZpbGVQYXR0ZXJuKHBhdHRlcm4sIGNhc2VTZW5zaXRpdmUpOworCQl9CisJCXJldHVybiBudWxsOwogCX0KIAogCQogCXB1YmxpYyBzdGF0aWMgRmlsdGVyUnVsZSBjcmVhdGVGaWxlKFN0cmluZyBwYXR0ZXJuLCBib29sZWFuIGNhc2VTZW5zaXRpdmUsIGludCB0eXBlKXsKLQkJRmlsZSBleHQgPSBuZXcgRmlsZSgpOwotCQlleHQuc2V0RGF0YShwYXR0ZXJuKTsKLQkJZXh0LnNldENhc2VTZW5zaXRpdmUoY2FzZVNlbnNpdGl2ZSk7Ci0JCWV4dC5zZXRUeXBlKHR5cGUpOwotCQlyZXR1cm4gZXh0OworCQlyZXR1cm4gbmV3IEZpbGUocGF0dGVybiwgY2FzZVNlbnNpdGl2ZSwgdHlwZSk7CiAJfQogCQogCXB1YmxpYyBzdGF0aWMgRmlsdGVyUnVsZSBjcmVhdGVGaWxlRXh0KFN0cmluZyBwYXR0ZXJuLCBib29sZWFuIGNhc2VTZW5zaXRpdmUpewotCQlGaWxlRXh0IGV4dCA9IG5ldyBGaWxlRXh0KCk7Ci0JCWV4dC5zZXREYXRhKHBhdHRlcm4pOwotCQlleHQuc2V0Q2FzZVNlbnNpdGl2ZShjYXNlU2Vuc2l0aXZlKTsKKwkJRmlsZUV4dCBleHQgPSBuZXcgRmlsZUV4dChwYXR0ZXJuLCBjYXNlU2Vuc2l0aXZlKTsKIAkJcmV0dXJuIGV4dDsKIAl9CiAJCiAJcHVibGljIHN0YXRpYyBGaWx0ZXJSdWxlIGNyZWF0ZUZhY2V0KFN0cmluZyBmYWNldElkKXsKLQkJRmFjZXQgZmFjZXQgPSBuZXcgRmFjZXQoKTsKLQkJZmFjZXQuc2V0RGF0YShmYWNldElkKTsKLQkJcmV0dXJuIGZhY2V0OworCQlyZXR1cm4gbmV3IEZhY2V0KGZhY2V0SWQsIG51bGwpOwogCX0KIAkKIAlwdWJsaWMgc3RhdGljIEZpbHRlclJ1bGUgY3JlYXRlUHJvamVjdChTdHJpbmcgcHJvamVjdE5hdHVyZSl7Ci0JCVByb2plY3ROYXR1cmUgcG4gPSBuZXcgUHJvamVjdE5hdHVyZSgpOwotCQlwbi5zZXREYXRhKHByb2plY3ROYXR1cmUpOwotCQlyZXR1cm4gcG47CisJCXJldHVybiBuZXcgUHJvamVjdE5hdHVyZShwcm9qZWN0TmF0dXJlKTsKIAl9CiAJCiAJcHVibGljIHN0YXRpYyBGaWx0ZXJSdWxlIGNyZWF0ZUNvbnRlbnRUeXBlKFN0cmluZyBjb250ZW50VHlwZSwgYm9vbGVhbiBleGFjdE1hdGNoKXsKLQkJQ29udGVudFR5cGUgY3QgPSBuZXcgQ29udGVudFR5cGUoKTsKLQkJY3Quc2V0RGF0YShjb250ZW50VHlwZSk7Ci0JCWN0LnNldEV4YWN0TWF0Y2goZXhhY3RNYXRjaCk7Ci0JCXJldHVybiBjdDsKKwkJcmV0dXJuIG5ldyBDb250ZW50VHlwZShjb250ZW50VHlwZSwgZXhhY3RNYXRjaCk7CiAJfQotCQotCXB1YmxpYyBhYnN0cmFjdCB2b2lkIHNldERhdGEoSUNvbmZpZ3VyYXRpb25FbGVtZW50IHJ1bGUpOworCQkKKwlwcm90ZWN0ZWQgRmlsdGVyUnVsZShTdHJpbmcgcGF0dGVybil7CisJCV9wYXR0ZXJuID0gcGF0dGVybjsKKwl9CiAKIAkvKiogCiAJICogQW5zd2VyIHRydWUgaWYgdGhlIHJ1bGUgbWF0Y2hlcyB0aGUgcmVzb3VyY2UsIGZhbHNlIGlmIGl0IGRvZXNuJ3QsIGFuZApAQCAtMTE2LDExICsxNDQsNyBAQAogCXB1YmxpYyBCb29sZWFuIG1hdGNoZXNQcm9qZWN0KElQcm9qZWN0IHByb2plY3QpewogCQlyZXR1cm4gbnVsbDsKIAl9Ci0JCi0JcHVibGljIHZvaWQgc2V0RGF0YShTdHJpbmcgZGF0YSl7Ci0JCV9wYXR0ZXJuID0gZGF0YTsKLQl9Ci0JCisJCQogCXB1YmxpYyBTdHJpbmcgdG9TdHJpbmcoKSB7CiAJCXJldHVybiBnZXREaXNwbGF5YWJsZVR5cGUoKSArICI6ICIgKyBfcGF0dGVybjsgLy8kTk9OLU5MUy0xJAogCX0KQEAgLTE0MCw3ICsxNjQsNyBAQAogCS8qKiBBbnN3ZXIgYSB0eXBlIHRoYXQgY2FuIGJlIGRpc3BsYXllZCB0byBhbiBlbmQgdXNlci4gKi8KIAlwdWJsaWMgYWJzdHJhY3QgU3RyaW5nIGdldERpc3BsYXlhYmxlVHlwZSgpOwogCQotCXB1YmxpYyBib29sZWFuIGFzQm9vbGVhbihTdHJpbmcgdmFsdWUsIGJvb2xlYW4gYURlZmF1bHQpeworCXB1YmxpYyBzdGF0aWMgYm9vbGVhbiBhc0Jvb2xlYW4oU3RyaW5nIHZhbHVlLCBib29sZWFuIGFEZWZhdWx0KXsKIAkJaWYgKHZhbHVlID09IG51bGwpcmV0dXJuIGFEZWZhdWx0OwogCQlpZiAodmFsdWUuZXF1YWxzKEV4dGVuc2lvbkNvbnN0YW50cy5UcnVlKSlyZXR1cm4gdHJ1ZTsKIAkJaWYgKHZhbHVlLmVxdWFscyhFeHRlbnNpb25Db25zdGFudHMuRmFsc2UpKXJldHVybiBmYWxzZTsKQEAgLTE1MiwyMCArMTc2LDQ1IEBACiAJCXJldHVybiBQbGF0Zm9ybS5nZXRBZGFwdGVyTWFuYWdlcigpLmdldEFkYXB0ZXIodGhpcywgYWRhcHRlcik7CiAJfQogCQotCXB1YmxpYyBzdGF0aWMgY2xhc3MgUHJvamVjdE5hdHVyZSBleHRlbmRzIEZpbHRlclJ1bGUgewotCi0JCQotCQlwdWJsaWMgRmlsdGVyUnVsZSBjb3B5KCkgewotCQkJUHJvamVjdE5hdHVyZSBydWxlID0gbmV3IFByb2plY3ROYXR1cmUoKTsKLQkJCXJ1bGUuX3BhdHRlcm4gPSBfcGF0dGVybjsKLQkJCXJldHVybiBydWxlOworCXB1YmxpYyBzdGF0aWMgYWJzdHJhY3QgY2xhc3MgRmlsdGVyUnVsZUNhc2VTZW5zaXRpdmUgZXh0ZW5kcyBGaWx0ZXJSdWxlIHsKKwkJCQkKKwkJcHVibGljIEZpbHRlclJ1bGVDYXNlU2Vuc2l0aXZlKFN0cmluZyBwYXR0ZXJuLCBib29sZWFuIGNhc2VTZW5zaXRpdmUpIHsKKwkJCXN1cGVyKHBhdHRlcm4pOworCQkJX2Nhc2VTZW5zaXRpdmUgPSBjYXNlU2Vuc2l0aXZlOwogCQl9CiAJCQotCQlwdWJsaWMgdm9pZCBzZXREYXRhKElDb25maWd1cmF0aW9uRWxlbWVudCBydWxlKSB7Ci0JCQlfcGF0dGVybiA9IHJ1bGUuZ2V0QXR0cmlidXRlKEV4dGVuc2lvbkNvbnN0YW50cy5SdWxlQXR0cmliLmlkKTsKKwkJcHJpdmF0ZSBmaW5hbCBib29sZWFuIF9jYXNlU2Vuc2l0aXZlOworCQkJCQorCQlAT3ZlcnJpZGUKKwkJcHVibGljIGludCBoYXNoQ29kZUZvckNvbmZpZygpIHsKKwkJCWludCBoID0gIHN1cGVyLmhhc2hDb2RlRm9yQ29uZmlnKCk7CisJCQlpZiAoX2Nhc2VTZW5zaXRpdmUpaCArPSA0MDE7CisJCQlyZXR1cm4gaDsKKwkJfQorCQkJCQorCQlAT3ZlcnJpZGUKKwkJcHVibGljIHZvaWQgc2F2ZShTZXJpYWxpemVyIHNlcikgeworCQkJc3VwZXIuc2F2ZShzZXIpOworCQkJc2VyLnB1dChfY2FzZVNlbnNpdGl2ZSk7CisJCX0KKwkJCQkJCQorCQlwdWJsaWMgYm9vbGVhbiBpc0Nhc2VTZW5zaXRpdmUoKSB7CisJCQlyZXR1cm4gX2Nhc2VTZW5zaXRpdmU7CisJCX0KKwkJCQkKKwl9CisJCisJcHVibGljIHN0YXRpYyBmaW5hbCBjbGFzcyBQcm9qZWN0TmF0dXJlIGV4dGVuZHMgRmlsdGVyUnVsZSB7CisJCQorCQlwcml2YXRlIFByb2plY3ROYXR1cmUoSUNvbmZpZ3VyYXRpb25FbGVtZW50IHJ1bGUpIHsKKwkJCXN1cGVyKHJ1bGUuZ2V0QXR0cmlidXRlKEV4dGVuc2lvbkNvbnN0YW50cy5SdWxlQXR0cmliLmlkKSk7CiAJCQkKIAkJfQogCQkKKwkJcHVibGljIFByb2plY3ROYXR1cmUoU3RyaW5nIHByb2plY3ROYXR1cmUpIHsKKwkJCXN1cGVyKHByb2plY3ROYXR1cmUpOworCQl9CisKIAkJcHVibGljIFN0cmluZyBnZXREaXNwbGF5YWJsZVR5cGUoKSB7CiAJCQlyZXR1cm4gVmFsTWVzc2FnZXMuUnVsZVByb2plY3ROYXR1cmU7CiAJCX0KQEAgLTE4NSwyOCArMjM0LDIxIEBACiAJCQogCX0KIAkKLQlwdWJsaWMgc3RhdGljIGNsYXNzIEZpbGVFeHQgZXh0ZW5kcyBGaWx0ZXJSdWxlIHsKKwlwdWJsaWMgc3RhdGljIGZpbmFsIGNsYXNzIEZpbGVFeHQgZXh0ZW5kcyBGaWx0ZXJSdWxlQ2FzZVNlbnNpdGl2ZSB7CiAJCQotCQlwcml2YXRlIGJvb2xlYW4gX2Nhc2VTZW5zaXRpdmU7Ci0JCQotCQlwdWJsaWMgRmlsdGVyUnVsZSBjb3B5KCkgewotCQkJRmlsZUV4dCBydWxlID0gbmV3IEZpbGVFeHQoKTsKLQkJCXJ1bGUuX3BhdHRlcm4gPSBfcGF0dGVybjsKLQkJCXJ1bGUuX2Nhc2VTZW5zaXRpdmUgPSBfY2FzZVNlbnNpdGl2ZTsKLQkJCXJldHVybiBydWxlOworCQlwcml2YXRlIEZpbGVFeHQoSUNvbmZpZ3VyYXRpb25FbGVtZW50IHJ1bGUpeworCQkJc3VwZXIocnVsZS5nZXRBdHRyaWJ1dGUoRXh0ZW5zaW9uQ29uc3RhbnRzLlJ1bGVBdHRyaWIuZXh0KSwgCisJCQkJYXNCb29sZWFuKHJ1bGUuZ2V0QXR0cmlidXRlKEV4dGVuc2lvbkNvbnN0YW50cy5SdWxlQXR0cmliLmNhc2VTZW5zaXRpdmUpLCBmYWxzZSkpOwogCQl9Ci0JCQorCQkJCQorCQlwcml2YXRlIEZpbGVFeHQoU3RyaW5nIHBhdHRlcm4sIGJvb2xlYW4gY2FzZVNlbnNpdGl2ZSkgeworCQkJc3VwZXIocGF0dGVybiwgY2FzZVNlbnNpdGl2ZSk7CisJCX0KKwogCQlwdWJsaWMgU3RyaW5nIGdldFR5cGUoKSB7CiAJCQlyZXR1cm4gRXh0ZW5zaW9uQ29uc3RhbnRzLlJ1bGUuZmlsZWV4dDsKIAkJfQogCQkKLQkJQE92ZXJyaWRlCi0JCXB1YmxpYyBpbnQgaGFzaENvZGVGb3JDb25maWcoKSB7Ci0JCQlpbnQgaCA9ICBzdXBlci5oYXNoQ29kZUZvckNvbmZpZygpOwotCQkJaWYgKF9jYXNlU2Vuc2l0aXZlKWggKz0gNjAxOwotCQkJcmV0dXJuIGg7Ci0JCX0KLQkJCiAJCXB1YmxpYyBTdHJpbmcgZ2V0RGlzcGxheWFibGVUeXBlKCkgewogCQkJcmV0dXJuIFZhbE1lc3NhZ2VzLlJ1bGVGaWxlRXh0OwogCQl9CkBAIC0yMTQsNTMgKzI1NiwxNyBAQAogCQlwdWJsaWMgU3RyaW5nIGdldE5hbWUoKSB7CiAJCQlyZXR1cm4gdG9TdHJpbmcoKTsKIAkJfQotCi0JCXB1YmxpYyB2b2lkIHNldERhdGEoSUNvbmZpZ3VyYXRpb25FbGVtZW50IHJ1bGUpIHsKLQkJCV9wYXR0ZXJuID0gcnVsZS5nZXRBdHRyaWJ1dGUoRXh0ZW5zaW9uQ29uc3RhbnRzLlJ1bGVBdHRyaWIuZXh0KTsKLQkJCV9jYXNlU2Vuc2l0aXZlID0gYXNCb29sZWFuKHJ1bGUuZ2V0QXR0cmlidXRlKEV4dGVuc2lvbkNvbnN0YW50cy5SdWxlQXR0cmliLmNhc2VTZW5zaXRpdmUpLCBmYWxzZSk7CQkJCi0JCX0KIAkJCiAJCXB1YmxpYyBTdHJpbmcgdG9TdHJpbmcoKSB7Ci0JCQlpZiAoX2Nhc2VTZW5zaXRpdmUpcmV0dXJuIE5MUy5iaW5kKFZhbE1lc3NhZ2VzLkZpbGVFeHRXaXRoQ2FzZSwgZ2V0RGlzcGxheWFibGVUeXBlKCksIF9wYXR0ZXJuKTsKKwkJCWlmIChpc0Nhc2VTZW5zaXRpdmUoKSlyZXR1cm4gTkxTLmJpbmQoVmFsTWVzc2FnZXMuRmlsZUV4dFdpdGhDYXNlLCBnZXREaXNwbGF5YWJsZVR5cGUoKSwgX3BhdHRlcm4pOwogCQkJcmV0dXJuIE5MUy5iaW5kKFZhbE1lc3NhZ2VzLkZpbGVFeHRXaXRob3V0Q2FzZSwgZ2V0RGlzcGxheWFibGVUeXBlKCksIF9wYXR0ZXJuKTsKIAkJfQogCiAJCXB1YmxpYyBCb29sZWFuIG1hdGNoZXNSZXNvdXJjZShJUmVzb3VyY2UgcmVzb3VyY2UsIENvbnRlbnRUeXBlV3JhcHBlciBjb250ZW50VHlwZVdyYXBwZXIpIHsKIAkJCVN0cmluZyBleHQgPSByZXNvdXJjZS5nZXRGaWxlRXh0ZW5zaW9uKCk7Ci0JCQlpZiAoX2Nhc2VTZW5zaXRpdmUpcmV0dXJuIF9wYXR0ZXJuLmVxdWFscyhleHQpOworCQkJaWYgKGlzQ2FzZVNlbnNpdGl2ZSgpKXJldHVybiBfcGF0dGVybi5lcXVhbHMoZXh0KTsKIAkJCXJldHVybiBfcGF0dGVybi5lcXVhbHNJZ25vcmVDYXNlKGV4dCk7CiAJCX0KLQotCQlwdWJsaWMgYm9vbGVhbiBpc0Nhc2VTZW5zaXRpdmUoKSB7Ci0JCQlyZXR1cm4gX2Nhc2VTZW5zaXRpdmU7Ci0JCX0KLQkJCi0JCUBPdmVycmlkZQotCQlwdWJsaWMgdm9pZCBsb2FkKFByZWZlcmVuY2VzIHJpZCkgewotCQkJX2Nhc2VTZW5zaXRpdmUgPSByaWQuZ2V0Qm9vbGVhbihQcmVmQ29uc3RhbnRzLmNhc2VTZW5zaXRpdmUsIGZhbHNlKTsKLQkJCXN1cGVyLmxvYWQocmlkKTsKLQkJfQotCQkKLQkJQE92ZXJyaWRlCi0JCXB1YmxpYyB2b2lkIHNhdmUoUHJlZmVyZW5jZXMgcmlkKSB7Ci0JCQlyaWQucHV0Qm9vbGVhbihQcmVmQ29uc3RhbnRzLmNhc2VTZW5zaXRpdmUsIF9jYXNlU2Vuc2l0aXZlKTsKLQkJCXN1cGVyLnNhdmUocmlkKTsKLQkJfQotCQkKLQkJQE92ZXJyaWRlCi0JCXByb3RlY3RlZCB2b2lkIGxvYWQoRGVzZXJpYWxpemVyIGRlcykgewotCQkJc3VwZXIubG9hZChkZXMpOwotCQkJX2Nhc2VTZW5zaXRpdmUgPSBkZXMuZ2V0Qm9vbGVhbigpOwotCQl9Ci0JCUBPdmVycmlkZQotCQlwdWJsaWMgdm9pZCBzYXZlKFNlcmlhbGl6ZXIgc2VyKSB7Ci0JCQlzdXBlci5zYXZlKHNlcik7Ci0JCQlzZXIucHV0KF9jYXNlU2Vuc2l0aXZlKTsKLQkJfQotCi0JCXB1YmxpYyB2b2lkIHNldENhc2VTZW5zaXRpdmUoYm9vbGVhbiBjYXNlU2Vuc2l0aXZlKSB7Ci0JCQlfY2FzZVNlbnNpdGl2ZSA9IGNhc2VTZW5zaXRpdmU7Ci0JCX0JCQogCX0KIAkKIAkvKioKQEAgLTI2OCw3OCArMjc0LDYwIEBACiAJICogQGF1dGhvciBrYXJhc2l1awogCSAqCiAJICovCi0JcHVibGljIHN0YXRpYyBjbGFzcyBGaWxlIGV4dGVuZHMgRmlsdGVyUnVsZSB7CisJcHVibGljIHN0YXRpYyBmaW5hbCBjbGFzcyBGaWxlIGV4dGVuZHMgRmlsdGVyUnVsZUNhc2VTZW5zaXRpdmUgewogCQkKLQkJcHJpdmF0ZSBib29sZWFuIF9jYXNlU2Vuc2l0aXZlOwotCQlwcml2YXRlIFN0cmluZwlfcGF0dGVybkFzTG93ZXJjYXNlOworCQlwcml2YXRlIGZpbmFsIFN0cmluZwlfcGF0dGVybkFzTG93ZXJjYXNlOwogCQkKIAkJLyoqIE9uZSBvZiB0aGUgRmlsZVR5cGVYWCBjb25zdGFudHMuICovCi0JCXByaXZhdGUgaW50CQlfdHlwZTsKKwkJcHJpdmF0ZSBmaW5hbCBpbnQJCV90eXBlOwogCQkKIAkJcHVibGljIHN0YXRpYyBmaW5hbCBpbnQgRmlsZVR5cGVGaWxlID0gMTsKIAkJcHVibGljIHN0YXRpYyBmaW5hbCBpbnQgRmlsZVR5cGVGb2xkZXIgPSAyOwogCQlwdWJsaWMgc3RhdGljIGZpbmFsIGludCBGaWxlVHlwZUZ1bGwgPSAzOwogCQkKLQkJcHJpdmF0ZSBzdGF0aWMgZmluYWwgU3RyaW5nIFBvcnRhYmxlRmlsZURlbGltID0gIi8iOyAvLyROT04tTkxTLTEkCi0JCQotCQlwdWJsaWMgRmlsZSgpewkJCQorCQlwcml2YXRlIHN0YXRpYyBGaWxlIGNyZWF0ZUZpbGUoSUNvbmZpZ3VyYXRpb25FbGVtZW50IHJ1bGUpeworCQkJU3RyaW5nIHBhdHRlcm4gPSBydWxlLmdldEF0dHJpYnV0ZShFeHRlbnNpb25Db25zdGFudHMuUnVsZUF0dHJpYi5uYW1lKTsKKwkJCWlmIChwYXR0ZXJuID09IG51bGwpdGhyb3cgbmV3IElsbGVnYWxTdGF0ZUV4Y2VwdGlvbihWYWxNZXNzYWdlcy5FcnJQYXR0ZXJuQXR0cmliKTsKKwkJCVN0cmluZyB0eXBlID0gcnVsZS5nZXRBdHRyaWJ1dGUoRXh0ZW5zaW9uQ29uc3RhbnRzLlJ1bGVBdHRyaWIuZmlsZVR5cGUpOworCQkJaWYgKHR5cGUgPT0gbnVsbCl0aHJvdyBuZXcgSWxsZWdhbFN0YXRlRXhjZXB0aW9uKFZhbE1lc3NhZ2VzLkVyclR5cGVSZXEpOworCQkJCisJCQlpbnQgbXlUeXBlID0gLTE7CisJCQlpZiAoRXh0ZW5zaW9uQ29uc3RhbnRzLkZpbGVUeXBlLmZpbGUuZXF1YWxzKHR5cGUpKW15VHlwZSA9IEZpbGVUeXBlRmlsZTsKKwkJCWVsc2UgaWYgKEV4dGVuc2lvbkNvbnN0YW50cy5GaWxlVHlwZS5mb2xkZXIuZXF1YWxzKHR5cGUpKXsKKwkJCQlteVR5cGUgPSBGaWxlVHlwZUZvbGRlcjsKKwkJCQlpZiAoIXBhdHRlcm4uZW5kc1dpdGgoUG9ydGFibGVGaWxlRGVsaW0pKXBhdHRlcm4gKz0gUG9ydGFibGVGaWxlRGVsaW07CisJCQl9CisJCQllbHNlIGlmIChFeHRlbnNpb25Db25zdGFudHMuRmlsZVR5cGUuZnVsbC5lcXVhbHModHlwZSkpbXlUeXBlID0gRmlsZVR5cGVGdWxsOworCQkJZWxzZSB7CisJCQkJT2JqZWN0W10gcGFybXMgPSB7dHlwZSwgRXh0ZW5zaW9uQ29uc3RhbnRzLkZpbGVUeXBlLmZpbGUsIEV4dGVuc2lvbkNvbnN0YW50cy5GaWxlVHlwZS5mb2xkZXIsIAorCQkJCQlFeHRlbnNpb25Db25zdGFudHMuRmlsZVR5cGUuZnVsbH07CisJCQkJdGhyb3cgbmV3IElsbGVnYWxTdGF0ZUV4Y2VwdGlvbihOTFMuYmluZChWYWxNZXNzYWdlcy5FcnJUeXBlLCBwYXJtcykpOworCQkJfQorCQkJYm9vbGVhbiBjYXNlU2Vuc2l0aXZlID0gYXNCb29sZWFuKHJ1bGUuZ2V0QXR0cmlidXRlKEV4dGVuc2lvbkNvbnN0YW50cy5SdWxlQXR0cmliLmNhc2VTZW5zaXRpdmUpLCBmYWxzZSk7CisJCQlyZXR1cm4gbmV3IEZpbGUocGF0dGVybiwgY2FzZVNlbnNpdGl2ZSwgbXlUeXBlKTsKIAkJfQogCQkKLQkJcHVibGljIEZpbHRlclJ1bGUgY29weSgpIHsKLQkJCUZpbGUgcnVsZSA9IG5ldyBGaWxlKCk7Ci0JCQlydWxlLl9wYXR0ZXJuID0gX3BhdHRlcm47Ci0JCQlydWxlLl9wYXR0ZXJuQXNMb3dlcmNhc2UgPSBfcGF0dGVybkFzTG93ZXJjYXNlOwotCQkJcnVsZS5fY2FzZVNlbnNpdGl2ZSA9IF9jYXNlU2Vuc2l0aXZlOwotCQkJcnVsZS5fdHlwZSA9IF90eXBlOwotCQkJcmV0dXJuIHJ1bGU7CisJCXByaXZhdGUgIEZpbGUoU3RyaW5nIHBhdHRlcm4sIGJvb2xlYW4gY2FzZVNlbnNpdGl2ZSwgaW50IHR5cGUpewkJCQorCQkJc3VwZXIocGF0dGVybiwgY2FzZVNlbnNpdGl2ZSk7CisJCQlfdHlwZSA9IHR5cGU7CisJCQlfcGF0dGVybkFzTG93ZXJjYXNlID0gcGF0dGVybiA9PSBudWxsID8gbnVsbCA6IHBhdHRlcm4udG9Mb3dlckNhc2UoKTsKIAkJfQotCQkKKwkJCQkKIAkJcHVibGljIFN0cmluZyBnZXRUeXBlKCkgewogCQkJcmV0dXJuIEV4dGVuc2lvbkNvbnN0YW50cy5SdWxlLmZpbGU7CiAJCX0KIAkJCi0JCUBPdmVycmlkZQotCQlwdWJsaWMgaW50IGhhc2hDb2RlRm9yQ29uZmlnKCkgewotCQkJaW50IGggPSAgc3VwZXIuaGFzaENvZGVGb3JDb25maWcoKTsKLQkJCWlmIChfY2FzZVNlbnNpdGl2ZSloICs9IDQwMTsKLQkJCXJldHVybiBoOwotCQl9Ci0JCQogCQlwdWJsaWMgU3RyaW5nIGdldERpc3BsYXlhYmxlVHlwZSgpIHsKIAkJCWlmIChfdHlwZSA9PSBGaWxlVHlwZUZvbGRlcilyZXR1cm4gVmFsTWVzc2FnZXMuUnVsZUZvbGRlcjsKIAkJCWlmIChfdHlwZSA9PSBGaWxlVHlwZUZ1bGwpcmV0dXJuIFZhbE1lc3NhZ2VzLlJ1bGVGdWxsOwogCQkJcmV0dXJuIFZhbE1lc3NhZ2VzLlJ1bGVGaWxlOwogCQl9CiAJCQotCQlAT3ZlcnJpZGUKLQkJcHVibGljIHZvaWQgc2V0RGF0YShTdHJpbmcgcGF0dGVybikgewotCQkJaWYgKHBhdHRlcm4gIT0gbnVsbClfcGF0dGVybkFzTG93ZXJjYXNlID0gcGF0dGVybi50b0xvd2VyQ2FzZSgpOwotCQkJZWxzZSBfcGF0dGVybkFzTG93ZXJjYXNlID0gbnVsbDsKLQkJCQotCQkJX3BhdHRlcm4gPSBwYXR0ZXJuOwotCQl9Ci0KIAkJcHVibGljIHZvaWQgc2V0RGF0YShJQ29uZmlndXJhdGlvbkVsZW1lbnQgcnVsZSkgewotCQkJc2V0RGF0YShydWxlLmdldEF0dHJpYnV0ZShFeHRlbnNpb25Db25zdGFudHMuUnVsZUF0dHJpYi5uYW1lKSk7Ci0JCQlpZiAoX3BhdHRlcm4gPT0gbnVsbCl0aHJvdyBuZXcgSWxsZWdhbFN0YXRlRXhjZXB0aW9uKFZhbE1lc3NhZ2VzLkVyclBhdHRlcm5BdHRyaWIpOwotCQkJX2Nhc2VTZW5zaXRpdmUgPSBhc0Jvb2xlYW4ocnVsZS5nZXRBdHRyaWJ1dGUoRXh0ZW5zaW9uQ29uc3RhbnRzLlJ1bGVBdHRyaWIuY2FzZVNlbnNpdGl2ZSksIGZhbHNlKTsJCi0JCQlTdHJpbmcgdHlwZSA9IHJ1bGUuZ2V0QXR0cmlidXRlKEV4dGVuc2lvbkNvbnN0YW50cy5SdWxlQXR0cmliLmZpbGVUeXBlKTsKLQkJCWlmICh0eXBlID09IG51bGwpdGhyb3cgbmV3IElsbGVnYWxTdGF0ZUV4Y2VwdGlvbihWYWxNZXNzYWdlcy5FcnJUeXBlUmVxKTsKLQkJCWlmIChFeHRlbnNpb25Db25zdGFudHMuRmlsZVR5cGUuZmlsZS5lcXVhbHModHlwZSkpX3R5cGUgPSBGaWxlVHlwZUZpbGU7Ci0JCQllbHNlIGlmIChFeHRlbnNpb25Db25zdGFudHMuRmlsZVR5cGUuZm9sZGVyLmVxdWFscyh0eXBlKSl7Ci0JCQkJX3R5cGUgPSBGaWxlVHlwZUZvbGRlcjsKLQkJCQlpZiAoIV9wYXR0ZXJuLmVuZHNXaXRoKFBvcnRhYmxlRmlsZURlbGltKSlzZXREYXRhKF9wYXR0ZXJuICsgUG9ydGFibGVGaWxlRGVsaW0pOwotCQkJfQotCQkJZWxzZSBpZiAoRXh0ZW5zaW9uQ29uc3RhbnRzLkZpbGVUeXBlLmZ1bGwuZXF1YWxzKHR5cGUpKV90eXBlID0gRmlsZVR5cGVGdWxsOwotCQkJZWxzZSB7Ci0JCQkJT2JqZWN0W10gcGFybXMgPSB7dHlwZSwgRXh0ZW5zaW9uQ29uc3RhbnRzLkZpbGVUeXBlLmZpbGUsIEV4dGVuc2lvbkNvbnN0YW50cy5GaWxlVHlwZS5mb2xkZXIsIAotCQkJCQlFeHRlbnNpb25Db25zdGFudHMuRmlsZVR5cGUuZnVsbH07Ci0JCQkJdGhyb3cgbmV3IElsbGVnYWxTdGF0ZUV4Y2VwdGlvbihOTFMuYmluZChWYWxNZXNzYWdlcy5FcnJUeXBlLCBwYXJtcykpOwotCQkJfQogCQl9CiAJCQogCQlwdWJsaWMgU3RyaW5nIHRvU3RyaW5nKCkgewotCQkJaWYgKF9jYXNlU2Vuc2l0aXZlKXJldHVybiBOTFMuYmluZChWYWxNZXNzYWdlcy5GaWxlRXh0V2l0aENhc2UsIGdldERpc3BsYXlhYmxlVHlwZSgpLCBfcGF0dGVybik7CisJCQlpZiAoaXNDYXNlU2Vuc2l0aXZlKCkpcmV0dXJuIE5MUy5iaW5kKFZhbE1lc3NhZ2VzLkZpbGVFeHRXaXRoQ2FzZSwgZ2V0RGlzcGxheWFibGVUeXBlKCksIF9wYXR0ZXJuKTsKIAkJCXJldHVybiBOTFMuYmluZChWYWxNZXNzYWdlcy5GaWxlRXh0V2l0aG91dENhc2UsIGdldERpc3BsYXlhYmxlVHlwZSgpLCBfcGF0dGVybik7CiAJCX0KIAkJCkBAIC0zNjAsNTYgKzM0OCwzMyBAQAogCQkJfQogCQkJCiAJCQlpZiAobmFtZSA9PSBudWxsKXJldHVybiBCb29sZWFuLkZBTFNFOwotCQkJaWYgKF9jYXNlU2Vuc2l0aXZlKXJldHVybiBuYW1lLnN0YXJ0c1dpdGgoX3BhdHRlcm4pOworCQkJaWYgKGlzQ2FzZVNlbnNpdGl2ZSgpKXJldHVybiBuYW1lLnN0YXJ0c1dpdGgoX3BhdHRlcm4pOwogCQkJcmV0dXJuIG5hbWUudG9Mb3dlckNhc2UoKS5zdGFydHNXaXRoKF9wYXR0ZXJuQXNMb3dlcmNhc2UpOwogCQl9Ci0JCQotCQlAT3ZlcnJpZGUKLQkJcHVibGljIHZvaWQgbG9hZChQcmVmZXJlbmNlcyByaWQpIHsKLQkJCV9jYXNlU2Vuc2l0aXZlID0gcmlkLmdldEJvb2xlYW4oUHJlZkNvbnN0YW50cy5jYXNlU2Vuc2l0aXZlLCBmYWxzZSk7Ci0JCQlfdHlwZSA9IHJpZC5nZXRJbnQoUHJlZkNvbnN0YW50cy5maWxlVHlwZSwgLTEpOwotCQkJc3VwZXIubG9hZChyaWQpOwotCQl9Ci0JCQotCQlAT3ZlcnJpZGUKLQkJcHVibGljIHZvaWQgc2F2ZShQcmVmZXJlbmNlcyByaWQpIHsKLQkJCXJpZC5wdXRCb29sZWFuKFByZWZDb25zdGFudHMuY2FzZVNlbnNpdGl2ZSwgX2Nhc2VTZW5zaXRpdmUpOwotCQkJcmlkLnB1dEludChQcmVmQ29uc3RhbnRzLmZpbGVUeXBlLCBfdHlwZSk7Ci0JCQlzdXBlci5zYXZlKHJpZCk7Ci0JCX0KLQkJCi0JCUBPdmVycmlkZQotCQlwcm90ZWN0ZWQgdm9pZCBsb2FkKERlc2VyaWFsaXplciBkZXMpIHsKLQkJCXN1cGVyLmxvYWQoZGVzKTsKLQkJCV9jYXNlU2Vuc2l0aXZlID0gZGVzLmdldEJvb2xlYW4oKTsKLQkJCV90eXBlID0gZGVzLmdldEludCgpOwotCQl9Ci0JCQorCQkJCQkJCQkKIAkJQE92ZXJyaWRlCiAJCXB1YmxpYyB2b2lkIHNhdmUoU2VyaWFsaXplciBzZXIpIHsKIAkJCXN1cGVyLnNhdmUoc2VyKTsKLQkJCXNlci5wdXQoX2Nhc2VTZW5zaXRpdmUpOwogCQkJc2VyLnB1dChfdHlwZSk7CiAJCX0KLQotCQlwdWJsaWMgdm9pZCBzZXRDYXNlU2Vuc2l0aXZlKGJvb2xlYW4gY2FzZVNlbnNpdGl2ZSkgewotCQkJX2Nhc2VTZW5zaXRpdmUgPSBjYXNlU2Vuc2l0aXZlOwotCQl9Ci0KLQkJcHVibGljIHZvaWQgc2V0VHlwZShpbnQgdHlwZSkgewotCQkJX3R5cGUgPSB0eXBlOwotCQl9CiAJCQogCX0KIAkKLQlwdWJsaWMgc3RhdGljIGNsYXNzIEZhY2V0IGV4dGVuZHMgRmlsdGVyUnVsZSB7CisJcHVibGljIHN0YXRpYyBmaW5hbCBjbGFzcyBGYWNldCBleHRlbmRzIEZpbHRlclJ1bGUgewogCQkKLQkJcHVibGljIEZpbHRlclJ1bGUgY29weSgpIHsKLQkJCUZhY2V0IHJ1bGUgPSBuZXcgRmFjZXQoKTsKLQkJCXJ1bGUuX3BhdHRlcm4gPSBfcGF0dGVybjsKLQkJCXJldHVybiBydWxlOworCQlwcml2YXRlIGZpbmFsIFN0cmluZyBfdmVyc2lvbkV4cHJlc3Npb247CisJCQorCQlwcml2YXRlIEZhY2V0KElDb25maWd1cmF0aW9uRWxlbWVudCBydWxlKXsKKwkJCXN1cGVyKHJ1bGUuZ2V0QXR0cmlidXRlKEV4dGVuc2lvbkNvbnN0YW50cy5SdWxlQXR0cmliLmlkKSk7CisJCQlfdmVyc2lvbkV4cHJlc3Npb24gPSBydWxlLmdldEF0dHJpYnV0ZShFeHRlbnNpb25Db25zdGFudHMuUnVsZUF0dHJpYi52ZXJzaW9uKTsKKwkJCQogCQl9Ci0JCQorCQkJCQorCQlwdWJsaWMgRmFjZXQoU3RyaW5nIGZhY2V0SWQsIFN0cmluZyB2ZXJzaW9uRXhwcmVzc2lvbikgeworCQkJc3VwZXIoZmFjZXRJZCk7CisJCQlfdmVyc2lvbkV4cHJlc3Npb24gPSB2ZXJzaW9uRXhwcmVzc2lvbjsKKwkJfQorCiAJCXB1YmxpYyBTdHJpbmcgZ2V0VHlwZSgpIHsKIAkJCXJldHVybiBFeHRlbnNpb25Db25zdGFudHMuUnVsZS5mYWNldDsKIAkJfQpAQCAtNDE3LDE1ICszODIsMTIgQEAKIAkJcHVibGljIFN0cmluZyBnZXREaXNwbGF5YWJsZVR5cGUoKSB7CiAJCQlyZXR1cm4gVmFsTWVzc2FnZXMuUnVsZUZhY2V0OwogCQl9Ci0KLQkJcHVibGljIHZvaWQgc2V0RGF0YShJQ29uZmlndXJhdGlvbkVsZW1lbnQgcnVsZSkgewotCQkJX3BhdHRlcm4gPSBydWxlLmdldEF0dHJpYnV0ZShFeHRlbnNpb25Db25zdGFudHMuUnVsZUF0dHJpYi5pZCk7Ci0JCX0KIAkJCiAJCUBPdmVycmlkZQogCQlwdWJsaWMgQm9vbGVhbiBtYXRjaGVzUHJvamVjdChJUHJvamVjdCBwcm9qZWN0KSB7CiAJCQl0cnkgewotCQkJCXJldHVybiBGYWNldGVkUHJvamVjdEZyYW1ld29yay5oYXNQcm9qZWN0RmFjZXQocHJvamVjdCwgX3BhdHRlcm4pOworCQkJCWlmIChfdmVyc2lvbkV4cHJlc3Npb24gPT0gbnVsbClyZXR1cm4gRmFjZXRlZFByb2plY3RGcmFtZXdvcmsuaGFzUHJvamVjdEZhY2V0KHByb2plY3QsIF9wYXR0ZXJuKTsKKwkJCQlyZXR1cm4gRmFjZXRlZFByb2plY3RGcmFtZXdvcmsuaGFzUHJvamVjdEZhY2V0KHByb2plY3QsIF9wYXR0ZXJuLCBfdmVyc2lvbkV4cHJlc3Npb24pOwogCQkJfQogCQkJY2F0Y2ggKENvcmVFeGNlcHRpb24gZSl7CiAJCQkJaWYgKFRyYWNpbmcuaXNMb2dnaW5nKCkpVmFsaWRhdGlvblBsdWdpbi5nZXRQbHVnaW4oKS5oYW5kbGVFeGNlcHRpb24oZSk7CkBAIC00MzMsMjEgKzM5NSw0MyBAQAogCQkJcmV0dXJuIEJvb2xlYW4uRkFMU0U7CiAJCX0KIAkJCi0JfQotCQotCXB1YmxpYyBzdGF0aWMgY2xhc3MgQ29udGVudFR5cGUgZXh0ZW5kcyBGaWx0ZXJSdWxlIHsKLQkJCi0JCXByaXZhdGUgdHJhbnNpZW50IElDb250ZW50VHlwZSAJX3R5cGU7Ci0JCXByaXZhdGUgYm9vbGVhbgkJCV9leGFjdE1hdGNoID0gdHJ1ZTsKLQkJCi0JCXB1YmxpYyBGaWx0ZXJSdWxlIGNvcHkoKSB7Ci0JCQlDb250ZW50VHlwZSBydWxlID0gbmV3IENvbnRlbnRUeXBlKCk7Ci0JCQlydWxlLl9wYXR0ZXJuID0gX3BhdHRlcm47Ci0JCQlydWxlLl90eXBlID0gX3R5cGU7Ci0JCQlydWxlLl9leGFjdE1hdGNoID0gX2V4YWN0TWF0Y2g7Ci0JCQlyZXR1cm4gcnVsZTsKKwkJQE92ZXJyaWRlCisJCXB1YmxpYyBTdHJpbmcgdG9TdHJpbmcoKSB7CisJCQlTdHJpbmdCdWZmZXIgYiA9IG5ldyBTdHJpbmdCdWZmZXIoMjAwKTsKKwkJCWIuYXBwZW5kKGdldERpc3BsYXlhYmxlVHlwZSgpKTsKKwkJCWIuYXBwZW5kKCI6ICIpOyAvLyROT04tTkxTLTEkCisJCQliLmFwcGVuZChfcGF0dGVybik7CisJCQkKKwkJCWlmIChfdmVyc2lvbkV4cHJlc3Npb24gIT0gIG51bGwpeworCQkJCWIuYXBwZW5kKCIgKCIpOyAvLyROT04tTkxTLTEkCisJCQkJYi5hcHBlbmQoX3ZlcnNpb25FeHByZXNzaW9uKTsKKwkJCQliLmFwcGVuZCgiKSIpOyAvLyROT04tTkxTLTEkCisJCQl9CisJCQlyZXR1cm4gYi50b1N0cmluZygpOwogCQl9CiAJCQorCX0KKwkKKwlwdWJsaWMgc3RhdGljIGZpbmFsIGNsYXNzIENvbnRlbnRUeXBlIGV4dGVuZHMgRmlsdGVyUnVsZSB7CisJCQorCQlwcml2YXRlIGZpbmFsIElDb250ZW50VHlwZSAJX3R5cGU7CisJCXByaXZhdGUgZmluYWwgYm9vbGVhbgkJX2V4YWN0TWF0Y2g7CisJCQorCQlwcml2YXRlIENvbnRlbnRUeXBlKFN0cmluZyBwYXR0ZXJuLCBib29sZWFuIGV4YWN0TWF0Y2gpeworCQkJc3VwZXIocGF0dGVybik7CisJCQlfdHlwZSA9IFBsYXRmb3JtLmdldENvbnRlbnRUeXBlTWFuYWdlcigpLmdldENvbnRlbnRUeXBlKHBhdHRlcm4pOworCQkJX2V4YWN0TWF0Y2ggPSBleGFjdE1hdGNoOworCQl9CisJCQorCQlwcml2YXRlIHN0YXRpYyBDb250ZW50VHlwZSBjcmVhdGVDb250ZW50VHlwZShJQ29uZmlndXJhdGlvbkVsZW1lbnQgcnVsZSl7CisJCQlTdHJpbmcgcGF0dGVybiA9IHJ1bGUuZ2V0QXR0cmlidXRlKEV4dGVuc2lvbkNvbnN0YW50cy5SdWxlQXR0cmliLmlkKTsKKwkJCWJvb2xlYW4gZXhhY3RNYXRjaCA9IHRydWU7CisJCQlTdHJpbmcgZXhhY3QgPSBydWxlLmdldEF0dHJpYnV0ZShFeHRlbnNpb25Db25zdGFudHMuUnVsZUF0dHJpYi5leGFjdE1hdGNoKTsKKwkJCWlmIChFeHRlbnNpb25Db25zdGFudHMuRmFsc2UuZXF1YWxzKGV4YWN0KSkgZXhhY3RNYXRjaCA9IGZhbHNlOworCQkJCisJCQlyZXR1cm4gbmV3IENvbnRlbnRUeXBlKHBhdHRlcm4sIGV4YWN0TWF0Y2gpOworCQl9CisJCQkJCiAJCXB1YmxpYyBTdHJpbmcgZ2V0VHlwZSgpIHsKIAkJCXJldHVybiBFeHRlbnNpb25Db25zdGFudHMuUnVsZS5jb250ZW50VHlwZTsKIAkJfQpAQCAtNDYyLDI1ICs0NDYsNyBAQAogCQlwdWJsaWMgU3RyaW5nIGdldERpc3BsYXlhYmxlVHlwZSgpIHsKIAkJCXJldHVybiBWYWxNZXNzYWdlcy5SdWxlQ29udGVudFR5cGU7CiAJCX0KLQkJCi0JCUBPdmVycmlkZQotCQlwdWJsaWMgdm9pZCBsb2FkKFByZWZlcmVuY2VzIHJpZCkgewotCQkJX2V4YWN0TWF0Y2ggPSByaWQuZ2V0Qm9vbGVhbihQcmVmQ29uc3RhbnRzLmV4YWN0TWF0Y2gsIHRydWUpOwotCQkJc3VwZXIubG9hZChyaWQpOwotCQl9Ci0JCQotCQlAT3ZlcnJpZGUKLQkJcHVibGljIHZvaWQgc2F2ZShQcmVmZXJlbmNlcyByaWQpIHsKLQkJCXJpZC5wdXRCb29sZWFuKFByZWZDb25zdGFudHMuZXhhY3RNYXRjaCwgX2V4YWN0TWF0Y2gpOwotCQkJc3VwZXIuc2F2ZShyaWQpOwotCQl9Ci0JCQotCQlAT3ZlcnJpZGUKLQkJcHJvdGVjdGVkIHZvaWQgbG9hZChEZXNlcmlhbGl6ZXIgZGVzKSB7Ci0JCQlzdXBlci5sb2FkKGRlcyk7Ci0JCQlfZXhhY3RNYXRjaCA9IGRlcy5nZXRCb29sZWFuKCk7Ci0JCX0KLQkJCisJCQkJCQkJCQogCQlAT3ZlcnJpZGUKIAkJcHVibGljIHZvaWQgc2F2ZShTZXJpYWxpemVyIHNlcikgewogCQkJc3VwZXIuc2F2ZShzZXIpOwpAQCAtNDg4LDE5ICs0NTQsOCBAQAogCQl9CiAKIAkJcHVibGljIHZvaWQgc2V0RGF0YShJQ29uZmlndXJhdGlvbkVsZW1lbnQgcnVsZSkgewotCQkJc2V0RGF0YShydWxlLmdldEF0dHJpYnV0ZShFeHRlbnNpb25Db25zdGFudHMuUnVsZUF0dHJpYi5pZCkpOwotCQkJYm9vbGVhbiBleGFjdE1hdGNoID0gdHJ1ZTsKLQkJCVN0cmluZyBleGFjdCA9IHJ1bGUuZ2V0QXR0cmlidXRlKEV4dGVuc2lvbkNvbnN0YW50cy5SdWxlQXR0cmliLmV4YWN0TWF0Y2gpOwotCQkJaWYgKEV4dGVuc2lvbkNvbnN0YW50cy5GYWxzZS5lcXVhbHMoZXhhY3QpKSBleGFjdE1hdGNoID0gZmFsc2U7Ci0JCQlzZXRFeGFjdE1hdGNoKGV4YWN0TWF0Y2gpOwogCQl9Ci0JCQotCQlAT3ZlcnJpZGUKLQkJcHVibGljIHZvaWQgc2V0RGF0YShTdHJpbmcgcGF0dGVybikgewotCQkJX3BhdHRlcm4gPSBwYXR0ZXJuOwotCQkJX3R5cGUgPSBQbGF0Zm9ybS5nZXRDb250ZW50VHlwZU1hbmFnZXIoKS5nZXRDb250ZW50VHlwZShwYXR0ZXJuKTsKLQkJfQotCQkKKwkJCQkKIAkJcHVibGljIEJvb2xlYW4gbWF0Y2hlc1Jlc291cmNlKElSZXNvdXJjZSByZXNvdXJjZSwgQ29udGVudFR5cGVXcmFwcGVyIGNvbnRlbnRUeXBlV3JhcHBlcikgewogCQkJaWYgKF90eXBlID09IG51bGwpcmV0dXJuIEJvb2xlYW4uRkFMU0U7CiAJCQlpZiAocmVzb3VyY2UgaW5zdGFuY2VvZiBJRmlsZSkgewpAQCAtNTE3LDE5ICs0NzIsNiBAQAogCQkJfQogCQkJcmV0dXJuIEJvb2xlYW4uRkFMU0U7CiAJCX0KLQotCQkvKioKLQkJICogU2hvdWxkIHRoZSBjb250ZW50IHR5cGUgbWF0Y2ggZXhhY3RseSwgb3Igc2hvdWxkIHN1YiB0eXBlcyBiZQotCQkgKiBpbmNsdWRlZCBhcyB3ZWxsPwotCQkgKiAKLQkJICogQHBhcmFtIGV4YWN0TWF0Y2gKLQkJICogICAgICAgICAgICBJZiB0cnVlIHRoaXMgcnVsZSB3aWxsIG9ubHkgbWF0Y2ggdGhpcyBzcGVjaWZpYyBjb250ZW50Ci0JCSAqICAgICAgICAgICAgdHlwZS4gSWYgZmFsc2UgdGhpcyBydWxlIHdpbGwgbWF0Y2ggdGhpcyBjb250ZW50IHR5cGUgYW5kCi0JCSAqICAgICAgICAgICAgYW55IG9mIGl0J3Mgc3ViIHR5cGVzLgotCQkgKi8KLQkJcHVibGljIHZvaWQgc2V0RXhhY3RNYXRjaChib29sZWFuIGV4YWN0TWF0Y2gpIHsKLQkJCV9leGFjdE1hdGNoID0gZXhhY3RNYXRjaDsKLQkJfQogCQkKIAkJQE92ZXJyaWRlCiAJCXB1YmxpYyBTdHJpbmcgdG9TdHJpbmcoKSB7CkBAIC01MzgsMzAgKzQ4MCw0MyBAQAogCQl9CiAJCQogCX0KKwkKKwlwdWJsaWMgc3RhdGljIGZpbmFsIGNsYXNzIEZpbGVQYXR0ZXJuIGV4dGVuZHMgRmlsdGVyUnVsZUNhc2VTZW5zaXRpdmUgeworCQkKKwkJcHJpdmF0ZSBmaW5hbCBQYXR0ZXJuIF9jb21waWxlZFBhdHRlcm47CisJCQorCQlwcml2YXRlIHN0YXRpYyBGaWxlUGF0dGVybiBjcmVhdGVGaWxlUGF0dGVybihJQ29uZmlndXJhdGlvbkVsZW1lbnQgcnVsZSl7CisJCQlTdHJpbmcgcGF0dGVybiA9IHJ1bGUuZ2V0QXR0cmlidXRlKEV4dGVuc2lvbkNvbnN0YW50cy5SdWxlQXR0cmliLnJlZ2V4KTsKKwkJCWJvb2xlYW4gY2FzZVNlbnNpdGl2ZSA9IGFzQm9vbGVhbihydWxlLmdldEF0dHJpYnV0ZShFeHRlbnNpb25Db25zdGFudHMuUnVsZUF0dHJpYi5jYXNlU2Vuc2l0aXZlKSwgZmFsc2UpOworCQkJcmV0dXJuIG5ldyBGaWxlUGF0dGVybihwYXR0ZXJuLCBjYXNlU2Vuc2l0aXZlKTsKKwkJfQorCQkKKwkJcHJpdmF0ZSBGaWxlUGF0dGVybihTdHJpbmcgcGF0dGVybiwgYm9vbGVhbiBjYXNlU2Vuc2l0aXZlKXsKKwkJCXN1cGVyKHBhdHRlcm4sIGNhc2VTZW5zaXRpdmUpOworCQkJaW50IGZsYWdzID0gMDsKKwkJCWlmIChjYXNlU2Vuc2l0aXZlKWZsYWdzID0gUGF0dGVybi5DQVNFX0lOU0VOU0lUSVZFOworCQkJUGF0dGVybiBjb21waWxlZFBhdHRlcm4gPSBQYXR0ZXJuLmNvbXBpbGUocGF0dGVybiwgZmxhZ3MpOwkJCQkKKwkJCV9jb21waWxlZFBhdHRlcm4gPSBjb21waWxlZFBhdHRlcm47CisJCX0KIAotCS8qKiBBbnN3ZXIgYSBkZWVwIGNvcHkgb2YgeW91cnNlbGYuICovCi0JcHVibGljIGFic3RyYWN0IEZpbHRlclJ1bGUgY29weSgpOworCQlAT3ZlcnJpZGUKKwkJcHVibGljIFN0cmluZyBnZXREaXNwbGF5YWJsZVR5cGUoKSB7CisJCQlyZXR1cm4gVmFsTWVzc2FnZXMuUnVsZVBhdHRlcm47CisJCX0KIAotCS8qKgotCSAqIFNhdmUgeW91cnNlbGYgaW4gdGhlIHByZWZlcmVuY2UgZmlsZS4KLQkgKiBAcGFyYW0gcmlkCi0JICovCi0JcHVibGljIHZvaWQgc2F2ZShQcmVmZXJlbmNlcyByaWQpIHsKLQkJcmlkLnB1dChQcmVmQ29uc3RhbnRzLnJ1bGVUeXBlLCBnZXRUeXBlKCkpOwotCQlyaWQucHV0KFByZWZDb25zdGFudHMucGF0dGVybiwgZ2V0UGF0dGVybigpKTsJCQotCX0KLQotCS8qKgotCSAqIEBwYXJhbSBydWxlCi0JICovCi0JcHVibGljIHZvaWQgbG9hZChQcmVmZXJlbmNlcyBydWxlKSB7Ci0JCXNldERhdGEocnVsZS5nZXQoUHJlZkNvbnN0YW50cy5wYXR0ZXJuLCBudWxsKSk7CQkKKwkJQE92ZXJyaWRlCisJCXB1YmxpYyBTdHJpbmcgZ2V0VHlwZSgpIHsKKwkJCXJldHVybiBFeHRlbnNpb25Db25zdGFudHMuUnVsZS5wYXR0ZXJuOworCQl9CisJCQorCQlAT3ZlcnJpZGUKKwkJcHVibGljIEJvb2xlYW4gbWF0Y2hlc1Jlc291cmNlKElSZXNvdXJjZSByZXNvdXJjZSwgQ29udGVudFR5cGVXcmFwcGVyIHdyYXBwZXIpIHsKKwkJCVN0cmluZyBuYW1lID0gUG9ydGFibGVGaWxlRGVsaW0gKyByZXNvdXJjZS5nZXRQcm9qZWN0UmVsYXRpdmVQYXRoKCkudG9Qb3J0YWJsZVN0cmluZygpOworCQkJaWYgKG5hbWUgPT0gbnVsbClyZXR1cm4gQm9vbGVhbi5GQUxTRTsKKwkJCXJldHVybiBfY29tcGlsZWRQYXR0ZXJuLm1hdGNoZXIobmFtZSkubWF0Y2hlcygpOworCQl9CQkKIAl9CiAJCi0JcHJvdGVjdGVkIHZvaWQgbG9hZChEZXNlcmlhbGl6ZXIgZGVzKXsKLQkJc2V0RGF0YShkZXMuZ2V0U3RyaW5nKCkpOwotCX0KLQogCS8qKgogCSAqIFNhdmUgeW91ciBzZXR0aW5ncyBpbnRvIHRoZSBzZXJpYWxpemVyLgogCSAqIEBwYXJhbSBzZXIKZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24vdmYyL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL2ludGVybmFsL21vZGVsL0dsb2JhbFByZWZlcmVuY2VzLmphdmEgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uL3ZmMi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9pbnRlcm5hbC9tb2RlbC9HbG9iYWxQcmVmZXJlbmNlcy5qYXZhCmluZGV4IDI3NGZhMjAuLjI5ODljMmMgMTAwNjQ0Ci0tLSBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24vdmYyL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL2ludGVybmFsL21vZGVsL0dsb2JhbFByZWZlcmVuY2VzLmphdmEKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi92ZjIvb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vaW50ZXJuYWwvbW9kZWwvR2xvYmFsUHJlZmVyZW5jZXMuamF2YQpAQCAtMSw1ICsxLDUgQEAKIC8qKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqCi0gKiBDb3B5cmlnaHQgKGMpIDIwMDcsIDIwMDggSUJNIENvcnBvcmF0aW9uIGFuZCBvdGhlcnMuCisgKiBDb3B5cmlnaHQgKGMpIDIwMDcsIDIwMDkgSUJNIENvcnBvcmF0aW9uIGFuZCBvdGhlcnMuCiAgKiBBbGwgcmlnaHRzIHJlc2VydmVkLiBUaGlzIHByb2dyYW0gYW5kIHRoZSBhY2NvbXBhbnlpbmcgbWF0ZXJpYWxzCiAgKiBhcmUgbWFkZSBhdmFpbGFibGUgdW5kZXIgdGhlIHRlcm1zIG9mIHRoZSBFY2xpcHNlIFB1YmxpYyBMaWNlbnNlIHYxLjAKICAqIHdoaWNoIGFjY29tcGFuaWVzIHRoaXMgZGlzdHJpYnV0aW9uLCBhbmQgaXMgYXZhaWxhYmxlIGF0CkBAIC0xMiw5ICsxMiw5IEBACiAKIC8qKgogICogVGhpcyBjbGFzcyByZXByZXNlbnRzIHRoZSBnbG9iYWwgUHJlZmVyZW5jZXMgYXMgc2V0IG9uIHRoZSBWYWxpZGF0aW9uIFByZWZlcmVuY2VzIHBhZ2UuIEl0IGRvZXNuJ3QKLSAqIGhvbGQgYW55IG9mIHRoZSBpbmRpdmlkdWFsIHZhbGlkYXRvciBzZXR0aW5ncywganVzdCB0aGUgZ2xvYmFsIGNoZWNrIGJveGVzLgorICogaG9sZCBhbnkgb2YgdGhlIGluZGl2aWR1YWwgdmFsaWRhdG9yIHNldHRpbmdzLCBqdXN0IHRoZSBnbG9iYWwgY2hlY2sgYm94ZXMuIEl0IGlzIGFuIGltbXV0YWJsZSBvYmplY3QuCiAgKi8KLXB1YmxpYyBjbGFzcyBHbG9iYWxQcmVmZXJlbmNlcyB7CitwdWJsaWMgZmluYWwgY2xhc3MgR2xvYmFsUHJlZmVyZW5jZXMgewogCQogCS8qKiBmYWxzZSAtIERlZmF1bHQgc2V0dGluZyBmb3IgdGhlIHNob3VsZCBhbGwgdGhlIHZhbGlkYXRpb24gYmUgc3VzcGVuZGVkIHNldHRpbmcuICovIAogCXB1YmxpYyBzdGF0aWMgZmluYWwgYm9vbGVhbiBEZWZhdWx0U3VzcGVuZCA9IGZhbHNlOwpAQCAtMzAsMzUgKzMwLDY1IEBACiAJCiAJLyoqIDIgLSBUaGUgdmVyc2lvbiBvZiB0aGUgZnJhbWV3b3JrIG1ldGEgZGF0YSwgaWYgYW4gZXhwbGljaXQgdmVyc2lvbiBpc24ndCBmb3VuZC4gKi8KIAlwdWJsaWMgc3RhdGljIGZpbmFsIGludCBEZWZhdWx0RnJhbWV3b3JrVmVyc2lvbiA9IDI7CisJCisJLyoqIEJpdCBtYXNrcyBmb3Igd2hhdCBoYXMgY2hhbmdlZC4gKi8KKwlwdWJsaWMgZmluYWwgc3RhdGljIGludCBDb25maXJtRGlhbG9nTWFzayA9IDE7CisJcHVibGljIGZpbmFsIHN0YXRpYyBpbnQgRGlzYWJsZUFsbFZhbGlkYXRpb25NYXNrID0gMjsKKwlwdWJsaWMgZmluYWwgc3RhdGljIGludCBPdmVycmlkZU1hc2sgPSA0OworCXB1YmxpYyBmaW5hbCBzdGF0aWMgaW50IFNhdmVBdXRvbWF0aWNhbGx5TWFzayA9IDg7CisJcHVibGljIGZpbmFsIHN0YXRpYyBpbnQgU3RhdGVUaW1lU3RhbXBNYXNrID0gMTY7CisJcHVibGljIGZpbmFsIHN0YXRpYyBpbnQgVmVyc2lvbk1hc2sgPSAzMjsKKwkKKwkvKioKKwkgKiBUaGUgY2hhbmdlcyB0aGF0IGNvdWxkIGFmZmVjdCB3aGF0IGdldHMgdmFsaWRhdGVkLgorCSAqLworCXB1YmxpYyBmaW5hbCBzdGF0aWMgaW50IEJ1aWxkQ2hhbmdlTWFzayA9IERpc2FibGVBbGxWYWxpZGF0aW9uTWFzayB8IE92ZXJyaWRlTWFzazsKKwkKIAotCXByaXZhdGUgYm9vbGVhbiBfZGlzYWJsZUFsbFZhbGlkYXRpb24gPSBEZWZhdWx0U3VzcGVuZDsKLQlwcml2YXRlIGJvb2xlYW4gX3NhdmVBdXRvbWF0aWNhbGx5ID0gRGVmYXVsdEF1dG9TYXZlOwotCXByaXZhdGUgYm9vbGVhbiBfY29uZmlybURpYWxvZyA9IERlZmF1bHRDb25maXJtOwotCXByaXZhdGUgYm9vbGVhbiBfb3ZlcnJpZGUgPSBEZWZhdWx0T3ZlcnJpZGU7CisJcHJpdmF0ZSBmaW5hbCBib29sZWFuIF9jb25maXJtRGlhbG9nOworCXByaXZhdGUgZmluYWwgYm9vbGVhbiBfZGlzYWJsZUFsbFZhbGlkYXRpb247CisJcHJpdmF0ZSBmaW5hbCBib29sZWFuIF9vdmVycmlkZTsKKwlwcml2YXRlIGZpbmFsIGJvb2xlYW4gX3NhdmVBdXRvbWF0aWNhbGx5OwogCQogCS8qKiBUaGUgcGx1Zy1pbiBzdGF0ZSB0aW1lIHN0YW1wLiAqLwotCXByaXZhdGUgbG9uZwlfc3RhdGVUaW1lU3RhbXA7CisJcHJpdmF0ZSBmaW5hbCBsb25nCV9zdGF0ZVRpbWVTdGFtcDsKIAkKIAkvKiogVGhlIGluY29taW5nIHZlcnNpb24gb2YgdGhlIGZyYW1ld29yay4gVGhpcyBpcyB1c2VkIHRvIGRldGVybWluZSBpZiBhIG1pZ3JhdGlvbiBpcyBuZWVkZWQuKi8KLQlwcml2YXRlIGludAkJX3ZlcnNpb247Ci0JCi0JLyoqIEhhcyBhIHNldHRpbmcgY2hhbmdlZCB0aGF0IGNvdWxkIGVmZmVjdCB3aGljaCB2YWxpZGF0b3JzIGdldCBjYWxsZWQ/ICovCi0JcHJpdmF0ZSBib29sZWFuCV9jb25maWdDaGFuZ2U7Ci0JCisJcHJpdmF0ZSBmaW5hbCBpbnQJCV92ZXJzaW9uOworCQkJCiAJLyoqCiAJICogVGhlIG9ubHkgdmFsaWQgd2F5IHRvIGdldCB0aGUgZ2xvYmFsIHByZWZlcmVuY2VzIGlzIHRocm91Z2ggdGhlIFZhbE1hbmFnZXIuCiAJICogCiAJICogQHNlZSBvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5pbnRlcm5hbC5WYWxNYW5hZ2VyI2dldEdsb2JhbFByZWZlcmVuY2VzKCkKIAkgKi8KLQlwdWJsaWMgR2xvYmFsUHJlZmVyZW5jZXMoKXsJfQorCXB1YmxpYyBHbG9iYWxQcmVmZXJlbmNlcyhHbG9iYWxQcmVmZXJlbmNlc1ZhbHVlcyBncCkgeworCQlfY29uZmlybURpYWxvZyA9IGdwLmNvbmZpcm1EaWFsb2c7CisJCV9kaXNhYmxlQWxsVmFsaWRhdGlvbiA9IGdwLmRpc2FibGVBbGxWYWxpZGF0aW9uOworCQlfb3ZlcnJpZGUgPSBncC5vdmVycmlkZTsKKwkJX3NhdmVBdXRvbWF0aWNhbGx5ID0gZ3Auc2F2ZUF1dG9tYXRpY2FsbHk7CisJCV9zdGF0ZVRpbWVTdGFtcCA9IGdwLnN0YXRlVGltZVN0YW1wOworCQlfdmVyc2lvbiA9IGdwLnZlcnNpb247CisJfQogCQorCS8qKgorCSAqIEFuc3dlciBhIGNvcHkgb2YgdGhlIHZhbHVlcy4KKwkgKiBAcmV0dXJuCisJICovCisJcHVibGljIEdsb2JhbFByZWZlcmVuY2VzVmFsdWVzIGFzVmFsdWVzKCl7CisJCUdsb2JhbFByZWZlcmVuY2VzVmFsdWVzIGdwID0gbmV3IEdsb2JhbFByZWZlcmVuY2VzVmFsdWVzKCk7CisJCWdwLmNvbmZpcm1EaWFsb2cgPSBfY29uZmlybURpYWxvZzsKKwkJZ3AuZGlzYWJsZUFsbFZhbGlkYXRpb24gPSBfZGlzYWJsZUFsbFZhbGlkYXRpb247CisJCWdwLm92ZXJyaWRlID0gX292ZXJyaWRlOworCQlncC5zYXZlQXV0b21hdGljYWxseSA9IF9zYXZlQXV0b21hdGljYWxseTsKKwkJZ3Auc3RhdGVUaW1lU3RhbXAgPSBfc3RhdGVUaW1lU3RhbXA7CisJCWdwLnZlcnNpb24gPSBfdmVyc2lvbjsKKwkJcmV0dXJuIGdwOworCX0KKwogCXB1YmxpYyBib29sZWFuIGdldFNhdmVBdXRvbWF0aWNhbGx5KCkgewogCQlyZXR1cm4gX3NhdmVBdXRvbWF0aWNhbGx5OwogCX0KIAotCXB1YmxpYyB2b2lkIHNldFNhdmVBdXRvbWF0aWNhbGx5KGJvb2xlYW4gc2F2ZUF1dG9tYXRpY2FsbHkpIHsKLQkJX3NhdmVBdXRvbWF0aWNhbGx5ID0gc2F2ZUF1dG9tYXRpY2FsbHk7Ci0JfQogCiAJLyoqCiAJICogQW5zd2VyIGlmIGFsbCB2YWxpZGF0aW9uIGhhcyBiZWVuIGRpc2FibGVkLgpAQCAtNjcsNjYgKzk3LDM3IEBACiAJCXJldHVybiBfZGlzYWJsZUFsbFZhbGlkYXRpb247CiAJfQogCi0JcHVibGljIHZvaWQgc2V0RGlzYWJsZUFsbFZhbGlkYXRpb24oYm9vbGVhbiBkaXNhYmxlQWxsVmFsaWRhdGlvbikgewotCQlpZiAoX2Rpc2FibGVBbGxWYWxpZGF0aW9uICE9IGRpc2FibGVBbGxWYWxpZGF0aW9uKXsKLQkJCV9jb25maWdDaGFuZ2UgPSB0cnVlOwotCQkJX2Rpc2FibGVBbGxWYWxpZGF0aW9uID0gZGlzYWJsZUFsbFZhbGlkYXRpb247Ci0JCX0KLQl9Ci0KLQkvKioKLQkgKiBSZXNldCBhbGwgdGhlIGdsb2JhbCBwcmVmZXJlbmNlcyB0byB0aGVpciBkZWZhdWx0IHNldHRpbmdzLiBUaGlzIGRvZXNuJ3QgcmVzZXQKLQkgKiB0aGUgaW5kaXZpZHVhbCB2YWxpZGF0b3JzLgotCSAqLwotCXB1YmxpYyB2b2lkIHJlc2V0VG9EZWZhdWx0KCkgewotCQlzZXREaXNhYmxlQWxsVmFsaWRhdGlvbihEZWZhdWx0U3VzcGVuZCk7Ci0JCV9zYXZlQXV0b21hdGljYWxseSA9IERlZmF1bHRBdXRvU2F2ZTsKLQkJX2NvbmZpcm1EaWFsb2cgPSBEZWZhdWx0Q29uZmlybTsKLQkJc2V0T3ZlcnJpZGUoRGVmYXVsdE92ZXJyaWRlKTsKLQl9Ci0KIAlwdWJsaWMgYm9vbGVhbiBnZXRDb25maXJtRGlhbG9nKCkgewogCQlyZXR1cm4gX2NvbmZpcm1EaWFsb2c7CiAJfQogCi0JcHVibGljIHZvaWQgc2V0Q29uZmlybURpYWxvZyhib29sZWFuIGNvbmZpcm1EaWFsb2cpIHsKLQkJX2NvbmZpcm1EaWFsb2cgPSBjb25maXJtRGlhbG9nOwotCX0KLQogCXB1YmxpYyBsb25nIGdldFN0YXRlVGltZVN0YW1wKCkgewogCQlyZXR1cm4gX3N0YXRlVGltZVN0YW1wOwogCX0KIAotCXB1YmxpYyB2b2lkIHNldFN0YXRlVGltZVN0YW1wKGxvbmcgc3RhdGVUaW1lU3RhbXApIHsKLQkJX3N0YXRlVGltZVN0YW1wID0gc3RhdGVUaW1lU3RhbXA7Ci0JfQotCiAJLyoqIEFuc3dlciB3aGV0aGVyIG9yIG5vdCBwcm9qZWN0cyBhcmUgYWxsb3dlZCB0byBvdmVycmlkZSB0aGUgZ2xvYmFsIHByZWZlcmVuY2VzLiAqLwogCXB1YmxpYyBib29sZWFuIGdldE92ZXJyaWRlKCkgewogCQlyZXR1cm4gX292ZXJyaWRlOwogCX0KIAotCXB1YmxpYyB2b2lkIHNldE92ZXJyaWRlKGJvb2xlYW4gb3ZlcnJpZGUpIHsKLQkJaWYgKF9vdmVycmlkZSAhPSBvdmVycmlkZSl7Ci0JCQlfY29uZmlnQ2hhbmdlID0gdHJ1ZTsKLQkJCV9vdmVycmlkZSA9IG92ZXJyaWRlOwotCQl9Ci0JfQotCiAJcHVibGljIGludCBnZXRWZXJzaW9uKCkgewogCQlyZXR1cm4gX3ZlcnNpb247CiAJfQogCi0JcHVibGljIHZvaWQgc2V0VmVyc2lvbihpbnQgdmVyc2lvbikgewotCQlfdmVyc2lvbiA9IHZlcnNpb247Ci0JfQotCi0JcHVibGljIGJvb2xlYW4gaXNDb25maWdDaGFuZ2UoKSB7Ci0JCXJldHVybiBfY29uZmlnQ2hhbmdlOwotCX0KLQotCXB1YmxpYyB2b2lkIHNldENvbmZpZ0NoYW5nZShib29sZWFuIGNvbmZpZ0NoYW5nZSkgewotCQlfY29uZmlnQ2hhbmdlID0gY29uZmlnQ2hhbmdlOworCS8qKgorCSAqIENvbXBhcmUgeW91cnNlbGYgdG8gdGhlIG90aGVyIGdsb2JhbCBwcmVmZXJlbmNlcyBhbmQgYW5zd2VyIGEgYml0bWFzayB3aXRoIHRoZSBkaWZmZXJlbmNlcy4KKwkgKiBAcGFyYW0gZ3AKKwkgKiBAcmV0dXJuIGJpdCBtYXNrIG9mIHRoZSBjaGFuZ2VzLiBTZWUgdGhlIHh4eE1hc2sgY29uc3RhbnRzIGZvciB0aGUgdmFsdWVzIG9mIHRoZSBiaXRzLiBBIHplcm8gbWVhbnMgdGhhdCB0aGV5IGFyZSB0aGUgc2FtZS4KKwkgKi8KKwlwdWJsaWMgaW50IGNvbXBhcmUoR2xvYmFsUHJlZmVyZW5jZXMgZ3ApIHsKKwkJaW50IGNoYW5nZXMgPSAwOworCQlpZiAoX2NvbmZpcm1EaWFsb2cgIT0gZ3AuZ2V0Q29uZmlybURpYWxvZygpKWNoYW5nZXMgfD0gQ29uZmlybURpYWxvZ01hc2s7CisJCWlmIChfZGlzYWJsZUFsbFZhbGlkYXRpb24gIT0gZ3AuZ2V0RGlzYWJsZUFsbFZhbGlkYXRpb24oKSljaGFuZ2VzIHw9IERpc2FibGVBbGxWYWxpZGF0aW9uTWFzazsKKwkJaWYgKF9vdmVycmlkZSAhPSBncC5nZXRPdmVycmlkZSgpKWNoYW5nZXMgfD0gT3ZlcnJpZGVNYXNrOworCQlpZiAoX3NhdmVBdXRvbWF0aWNhbGx5ICE9IGdwLmdldFNhdmVBdXRvbWF0aWNhbGx5KCkpY2hhbmdlcyB8PSBTYXZlQXV0b21hdGljYWxseU1hc2s7CisJCWlmIChfc3RhdGVUaW1lU3RhbXAgIT0gZ3AuZ2V0U3RhdGVUaW1lU3RhbXAoKSljaGFuZ2VzIHw9IFN0YXRlVGltZVN0YW1wTWFzazsKKwkJaWYgKF92ZXJzaW9uICE9IGdwLmdldFZlcnNpb24oKSljaGFuZ2VzIHw9IFZlcnNpb25NYXNrOworCQlyZXR1cm4gY2hhbmdlczsKIAl9CiAKIH0KZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24vdmYyL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL2ludGVybmFsL21vZGVsL0dsb2JhbFByZWZlcmVuY2VzVmFsdWVzLmphdmEgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uL3ZmMi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9pbnRlcm5hbC9tb2RlbC9HbG9iYWxQcmVmZXJlbmNlc1ZhbHVlcy5qYXZhCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLmNkZjgzNDUKLS0tIC9kZXYvbnVsbAorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uL3ZmMi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9pbnRlcm5hbC9tb2RlbC9HbG9iYWxQcmVmZXJlbmNlc1ZhbHVlcy5qYXZhCkBAIC0wLDAgKzEsMzUgQEAKKy8qKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqCisgKiBDb3B5cmlnaHQgKGMpIDIwMDkgSUJNIENvcnBvcmF0aW9uIGFuZCBvdGhlcnMuCisgKiBBbGwgcmlnaHRzIHJlc2VydmVkLiBUaGlzIHByb2dyYW0gYW5kIHRoZSBhY2NvbXBhbnlpbmcgbWF0ZXJpYWxzCisgKiBhcmUgbWFkZSBhdmFpbGFibGUgdW5kZXIgdGhlIHRlcm1zIG9mIHRoZSBFY2xpcHNlIFB1YmxpYyBMaWNlbnNlIHYxLjAKKyAqIHdoaWNoIGFjY29tcGFuaWVzIHRoaXMgZGlzdHJpYnV0aW9uLCBhbmQgaXMgYXZhaWxhYmxlIGF0CisgKiBodHRwOi8vd3d3LmVjbGlwc2Uub3JnL2xlZ2FsL2VwbC12MTAuaHRtbAorICoKKyAqIENvbnRyaWJ1dG9yczoKKyAqICAgICBJQk0gQ29ycG9yYXRpb24gLSBpbml0aWFsIEFQSSBhbmQgaW1wbGVtZW50YXRpb24KKyAqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqLworCitwYWNrYWdlIG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLmludGVybmFsLm1vZGVsOworCisvKioKKyAqIEEgbXV0YWJsZSBvYmplY3QgdGhhdCBpcyB1c2VkIHRvIGluaXRpYWxpemUgYSBHbG9iYWxQcmVmZXJlbmNlLgorICogQGF1dGhvciBrYXJhc2l1aworICoKKyAqLworcHVibGljIGNsYXNzIEdsb2JhbFByZWZlcmVuY2VzVmFsdWVzIHsKKwlwdWJsaWMgYm9vbGVhbiBkaXNhYmxlQWxsVmFsaWRhdGlvbiA9IEdsb2JhbFByZWZlcmVuY2VzLkRlZmF1bHRTdXNwZW5kOworCXB1YmxpYyBib29sZWFuIHNhdmVBdXRvbWF0aWNhbGx5ID0gR2xvYmFsUHJlZmVyZW5jZXMuRGVmYXVsdEF1dG9TYXZlOworCXB1YmxpYyBib29sZWFuIGNvbmZpcm1EaWFsb2cgPSBHbG9iYWxQcmVmZXJlbmNlcy5EZWZhdWx0Q29uZmlybTsKKwlwdWJsaWMgYm9vbGVhbiBvdmVycmlkZSA9IEdsb2JhbFByZWZlcmVuY2VzLkRlZmF1bHRPdmVycmlkZTsKKwkKKwkvKiogVGhlIHBsdWctaW4gc3RhdGUgdGltZSBzdGFtcC4gKi8KKwlwdWJsaWMgbG9uZwlzdGF0ZVRpbWVTdGFtcDsKKwkKKwkvKiogVGhlIGluY29taW5nIHZlcnNpb24gb2YgdGhlIGZyYW1ld29yay4gVGhpcyBpcyB1c2VkIHRvIGRldGVybWluZSBpZiBhIG1pZ3JhdGlvbiBpcyBuZWVkZWQuKi8KKwlwdWJsaWMgaW50CQl2ZXJzaW9uOworCQorCXB1YmxpYyBHbG9iYWxQcmVmZXJlbmNlc1ZhbHVlcygpeworCQkKKwl9CisKK30KZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24vdmYyL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL2ludGVybmFsL21vZGVsL1Byb2plY3RQcmVmZXJlbmNlcy5qYXZhIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi92ZjIvb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vaW50ZXJuYWwvbW9kZWwvUHJvamVjdFByZWZlcmVuY2VzLmphdmEKaW5kZXggYTU3MWRjNi4uZGQyNmFkZCAxMDA2NDQKLS0tIGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi92ZjIvb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vaW50ZXJuYWwvbW9kZWwvUHJvamVjdFByZWZlcmVuY2VzLmphdmEKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi92ZjIvb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vaW50ZXJuYWwvbW9kZWwvUHJvamVjdFByZWZlcmVuY2VzLmphdmEKQEAgLTEsNSArMSw1IEBACiAvKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKgotICogQ29weXJpZ2h0IChjKSAyMDA3LCAyMDA4IElCTSBDb3Jwb3JhdGlvbiBhbmQgb3RoZXJzLgorICogQ29weXJpZ2h0IChjKSAyMDA3LCAyMDA5IElCTSBDb3Jwb3JhdGlvbiBhbmQgb3RoZXJzLgogICogQWxsIHJpZ2h0cyByZXNlcnZlZC4gVGhpcyBwcm9ncmFtIGFuZCB0aGUgYWNjb21wYW55aW5nIG1hdGVyaWFscwogICogYXJlIG1hZGUgYXZhaWxhYmxlIHVuZGVyIHRoZSB0ZXJtcyBvZiB0aGUgRWNsaXBzZSBQdWJsaWMgTGljZW5zZSB2MS4wCiAgKiB3aGljaCBhY2NvbXBhbmllcyB0aGlzIGRpc3RyaWJ1dGlvbiwgYW5kIGlzIGF2YWlsYWJsZSBhdApAQCAtMTgsMzYgKzE4LDQzIEBACiAgKiBAYXV0aG9yIGthcmFzaXVrCiAgKgogICovCi1wdWJsaWMgY2xhc3MgUHJvamVjdFByZWZlcmVuY2VzIHsKK3B1YmxpYyBmaW5hbCBjbGFzcyBQcm9qZWN0UHJlZmVyZW5jZXMgeworCS8qCisJICogQmVmb3JlIHRoaXMgb2JqZWN0IGNhbiBiZSBjb25zaWRlcmVkIGltbXV0YWJsZSwgdGhlIG11dGFibGUgdmFsaWRhdG9ycyBuZWVkIHRvIGJlIGFkZHJlc3NlZC4KKwkgKi8KIAkvKiogZmFsc2UgLSBEZWZhdWx0IHNldHRpbmcgZm9yIHRoZSAic2hvdWxkIGFsbCB0aGUgdmFsaWRhdGlvbiBiZSBzdXNwZW5kZWQiIHNldHRpbmcuICovIAogCXB1YmxpYyBzdGF0aWMgZmluYWwgYm9vbGVhbiBEZWZhdWx0U3VzcGVuZCA9IGZhbHNlOwogCQogCS8qKiBmYWxzZSAtIERlZmF1bHQgc2V0dGluZyBmb3IgbGV0dGluZyBwcm9qZWN0cyBvdmVycmlkZSB0aGUgZ2xvYmFsIHNldHRpbmdzLiAqLwogCXB1YmxpYyBzdGF0aWMgZmluYWwgYm9vbGVhbiBEZWZhdWx0T3ZlcnJpZGUgPSBmYWxzZTsKIAkKLQlwcml2YXRlIElQcm9qZWN0CV9wcm9qZWN0OworCXByaXZhdGUgZmluYWwgSVByb2plY3QJX3Byb2plY3Q7CiAKLQlwcml2YXRlIGJvb2xlYW4gCV9vdmVycmlkZSA9IERlZmF1bHRPdmVycmlkZTsKLQlwcml2YXRlIGJvb2xlYW4JCV9zdXNwZW5kID0gRGVmYXVsdFN1c3BlbmQ7CisJcHJpdmF0ZSBmaW5hbCBib29sZWFuIAlfb3ZlcnJpZGU7CisJcHJpdmF0ZSBmaW5hbCBib29sZWFuCV9zdXNwZW5kOwogCQotCXByaXZhdGUgVmFsaWRhdG9yW10JX3ZhbGlkYXRvcnMgPSBuZXcgVmFsaWRhdG9yWzBdOworCXByaXZhdGUgZmluYWwgVmFsaWRhdG9yW10JX3ZhbGlkYXRvcnM7CiAJCiAJcHVibGljIFByb2plY3RQcmVmZXJlbmNlcyhJUHJvamVjdCBwcm9qZWN0KXsKIAkJX3Byb2plY3QgPSBwcm9qZWN0OworCQlfb3ZlcnJpZGUgPSBEZWZhdWx0T3ZlcnJpZGU7CisJCV9zdXNwZW5kICA9IERlZmF1bHRTdXNwZW5kOworCQlfdmFsaWRhdG9ycyA9IG5ldyBWYWxpZGF0b3JbMF07CisJfQorCQorCXB1YmxpYyBQcm9qZWN0UHJlZmVyZW5jZXMoSVByb2plY3QgcHJvamVjdCwgYm9vbGVhbiBvdmVycmlkZSwgYm9vbGVhbiBzdXNwZW5kLCBWYWxpZGF0b3JbXSB2YWxpZGF0b3JzKXsKKwkJX3Byb2plY3QgPSBwcm9qZWN0OworCQlfb3ZlcnJpZGUgPSBvdmVycmlkZTsKKwkJX3N1c3BlbmQgPSBzdXNwZW5kOworCQlfdmFsaWRhdG9ycyA9IHZhbGlkYXRvcnM7CiAJfQogCQogCXB1YmxpYyBib29sZWFuIGdldE92ZXJyaWRlKCkgewogCQlyZXR1cm4gX292ZXJyaWRlOwogCX0KLQlwdWJsaWMgdm9pZCBzZXRPdmVycmlkZShib29sZWFuIG92ZXJyaWRlKSB7Ci0JCV9vdmVycmlkZSA9IG92ZXJyaWRlOwotCX0KIAlwdWJsaWMgYm9vbGVhbiBnZXRTdXNwZW5kKCkgewogCQlyZXR1cm4gX3N1c3BlbmQ7CiAJfQotCXB1YmxpYyB2b2lkIHNldFN1c3BlbmQoYm9vbGVhbiBzdXNwZW5kKSB7Ci0JCV9zdXNwZW5kID0gc3VzcGVuZDsKLQl9CiAJCiAJLyoqCiAJICogQW5zd2VyIHRoZSB2YWxpZGF0b3JzIHRoYXQgaGF2ZSBiZWVuIHJlZ2lzdGVyZWQgZm9yIHRoaXMgcHJvamVjdC4KQEAgLTU3LDEwICs2NCw2IEBACiAJCXJldHVybiBfdmFsaWRhdG9yczsKIAl9CiAJCi0JcHVibGljIHZvaWQgc2V0VmFsaWRhdG9ycyhWYWxpZGF0b3JbXSB2YWxpZGF0b3JzKXsKLQkJX3ZhbGlkYXRvcnMgPSB2YWxpZGF0b3JzOwotCX0KLQkKIAlwdWJsaWMgSVByb2plY3QgZ2V0UHJvamVjdCgpIHsKIAkJcmV0dXJuIF9wcm9qZWN0OwogCX0KZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24vdmYyL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL2ludGVybmFsL21vZGVsL1ZhbGlkYXRvckhlbHBlci5qYXZhIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi92ZjIvb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vaW50ZXJuYWwvbW9kZWwvVmFsaWRhdG9ySGVscGVyLmphdmEKaW5kZXggYzMxNTJiNC4uMjg4ZjIyNiAxMDA2NDQKLS0tIGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi92ZjIvb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vaW50ZXJuYWwvbW9kZWwvVmFsaWRhdG9ySGVscGVyLmphdmEKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi92ZjIvb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vaW50ZXJuYWwvbW9kZWwvVmFsaWRhdG9ySGVscGVyLmphdmEKQEAgLTEsNSArMSw1IEBACiAvKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKgotICogQ29weXJpZ2h0IChjKSAyMDA1LCAyMDA3IElCTSBDb3Jwb3JhdGlvbiBhbmQgb3RoZXJzLgorICogQ29weXJpZ2h0IChjKSAyMDA1LCAyMDA5IElCTSBDb3Jwb3JhdGlvbiBhbmQgb3RoZXJzLgogICogQWxsIHJpZ2h0cyByZXNlcnZlZC4gVGhpcyBwcm9ncmFtIGFuZCB0aGUgYWNjb21wYW55aW5nIG1hdGVyaWFscwogICogYXJlIG1hZGUgYXZhaWxhYmxlIHVuZGVyIHRoZSB0ZXJtcyBvZiB0aGUgRWNsaXBzZSBQdWJsaWMgTGljZW5zZSB2MS4wCiAgKiB3aGljaCBhY2NvbXBhbmllcyB0aGlzIGRpc3RyaWJ1dGlvbiwgYW5kIGlzIGF2YWlsYWJsZSBhdApAQCAtMTAsNyArMTAsNyBAQAogICoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKiovCiBwYWNrYWdlIG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLmludGVybmFsLm1vZGVsOwogCi1pbXBvcnQgb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uVmFsaWRhdG9yOworaW1wb3J0IG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLmludGVybmFsLlZhbGlkYXRvck11dGFibGU7CiAKIC8qKgogICogSW1wbGVtZW50IHNvbWUgY29tbW9uIHZhbGlkYXRvciBtZXRob2RzLCB0aGF0IGRvbid0IG5lZWQgdG8gYmUgcGFydCBvZiB0aGUgQVBJLgpAQCAtMTgsMjAgKzE4LDEzIEBACiAgKiBAYXV0aG9yIGthcmFzaXVrCiAgKgogICovCi1wdWJsaWMgY2xhc3MgVmFsaWRhdG9ySGVscGVyIHsKK3B1YmxpYyBmaW5hbCBjbGFzcyBWYWxpZGF0b3JIZWxwZXIgewogCQogCS8qKgogCSAqIEFuc3dlciB0cnVlIGlmIHRoaXMgdmFsaWRhdG9yIGFscmVhZHkgaGFzIGFuIGV4Y2x1ZGUgZmlsdGVyLgotCSAqIAotCSAqIEBwYXJhbSB2Ci0JICogQHJldHVybgogCSAqLwotCXB1YmxpYyBzdGF0aWMgYm9vbGVhbiBoYXNFeGNsdWRlR3JvdXAoVmFsaWRhdG9yLlYyIHYpewotCQlGaWx0ZXJHcm91cFtdIGdyb3VwcyA9IHYuZ2V0R3JvdXBzKCk7Ci0JCWZvciAoaW50IGk9MDsgaTxncm91cHMubGVuZ3RoOyBpKyspewotCQkJaWYgKGdyb3Vwc1tpXS5pc0V4Y2x1ZGUoKSlyZXR1cm4gdHJ1ZTsKLQkJfQotCQlyZXR1cm4gZmFsc2U7Ci0JCQorCXB1YmxpYyBzdGF0aWMgYm9vbGVhbiBoYXNFeGNsdWRlR3JvdXAoVmFsaWRhdG9yTXV0YWJsZSB2KXsKKwkJZm9yIChGaWx0ZXJHcm91cCBncm91cCA6IHYuZ2V0R3JvdXBzKCkpaWYgKGdyb3VwLmlzRXhjbHVkZSgpKXJldHVybiB0cnVlOworCQlyZXR1cm4gZmFsc2U7CQkKIAl9CiB9CmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uL3ZmMi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9wYWNrYWdlLmh0bWwgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uL3ZmMi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9wYWNrYWdlLmh0bWwKaW5kZXggODc4MjNkNi4uOGMzYzQyNiAxMDA2NDQKLS0tIGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi92ZjIvb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vcGFja2FnZS5odG1sCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24vdmYyL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL3BhY2thZ2UuaHRtbApAQCAtNCwxMyArNCwxNCBAQAogPC9oZWFkPgogPGJvZHk+CiA8cD5BIGZyYW1ld29yayBmb3IgY2FsbGluZyB2YWxpZGF0b3JzIHRoYXQgYXJlIGJ1aWxkIGJhc2VkLjwvcD4KKzxwPkFsc28gc2VlIDxhIGhyZWY9ImRvYy1maWxlcy9mYXEuaHRtbCI+RnJlcXVlbnRseSBBc2tlZCBRdWVzdGlvbnM8L2E+PC9wPgogPHA+CiBUaGVyZSBhcmUgdHdvIG1haW4gdHlwZXMgb2YgdmFsaWRhdGlvbiwgPGI+YnVpbGQgYmFzZWQ8L2I+IGFuZCAKIDxiPmFzIHlvdSB0eXBlPC9iPi4gVGhpcyBmcmFtZXdvcmsgc3VwcG9ydHMgYnVpbGQgYmFzZWQKIHZhbGlkYXRpb24uIElmIGF1dG8gYnVpbGQgaXMgdHVybmVkIG9uIHRoZW4gdGhlIHZhbGlkYXRvcnMgYXJlIGNhbGxlZAogd2hlbiB0aGUgdXNlciBzYXZlcyB0aGVpciBmaWxlLiBJZiBhdXRvIGJ1aWxkIGlzIG5vdCB0dXJuZWQgb24gdGhlbgogdGhlIHZhbGlkYXRvcnMgYXJlIGNhbGxlZCB3aGVuIHRoZSB1c2VyIHN0YXJ0cyBhIGJ1aWxkLjwvcD4KLTxwPlRoaXMgZnJhbWV3b3JrIHdhcyBhZGRlZCB0byBXVFAgaW4gdmVyc2lvbiAzLjQuPC9wPgorPHA+VGhpcyBmcmFtZXdvcmsgd2FzIGFkZGVkIHRvIFdUUCBpbiB2ZXJzaW9uIDMuMC48L3A+CiA8aDM+RGVwZW5kZW5jeSBTdXBwb3J0PC9oMz4KIDxwPlNvbWV0aW1lcyByZXNvdXJjZXMgZGVwZW5kIG9uIG90aGVyIHJlc291cmNlcywgdG8gZGV0ZXJtaW5lIHdoZXRoZXIgdGhleSBhcmUgCiB2YWxpZCBvciBub3QuIEFuIGV4YW1wbGUgd291bGQgYmUgdGhhdCBhbiBYTUwgcmVzb3VyY2UgY291bGQgZGVwZW5kIG9uIGEgRFRELiBJZiBhdCBzb21lIApAQCAtMjgsNyArMjksNyBAQAogcHJvZHVjdC4KIDxwPkluIHBhcnRpY3VsYXIgd2hlbiB0aGUgdmFsaWRhdGUgbWV0aG9kIHJldHVybnMsIGEKIDxhIGhyZWY9IlZhbGlkYXRpb25SZXN1bHQuaHRtbCI+VmFsaWRhdGlvblJlc3VsdDwvYT4gbXVzdCBiZSByZXR1cm5lZCwgaW5zaWRlIG9mIAotdGhpcyByZXN1bHQsIGFsbCB5b3VyIGRlcGVuZGVuY2llcyBuZWVkIHRvIGJlIHNwZWNpZmllZCB3aXRoIHRoZSZuYnNwOwordGhpcyByZXN1bHQsIGFsbCB5b3VyIGRlcGVuZGVuY2llcyBuZWVkIHRvIGJlIHNwZWNpZmllZCB3aXRoIHRoZQogPGEgaHJlZj0iVmFsaWRhdGlvblJlc3VsdC5odG1sI3NldERlcGVuZHNPbihvcmcuZWNsaXBzZS5jb3JlLnJlc291cmNlcy5JUmVzb3VyY2VbXSkiPgogc2V0RGVwZW5kc09uPC9hPiBtZXRob2QuPHA+SW4gYWRkaXRpb24gdG8ga2VlcGluZyB0aGUgZGVwZW5kZW5jeSBpbmZvcm1hdGlvbiAKIHVwLXRvLWRhdGUgdGhyb3VnaCB0aGUgbm9ybWFsIGNvdXJzZSBvZiB2YWxpZGF0aW9uLCBkaXJlY3QgYWNjZXNzIGlzIGFsc28gCkBAIC0zNiw1ICszNywxNiBAQAogPGEgaHJlZj0iVmFsaWRhdGlvbkZyYW1ld29yay5odG1sI2dldERlcGVuZGVuY3lJbmRleCgpIj5nZXREZXBlbmRlbmN5SW5kZXg8L2E+IAogbWV0aG9kLiBUaGUgPGEgaHJlZj0iSURlcGVuZGVuY3lJbmRleC5odG1sIj5JRGVwZW5kZW5jeUluZGV4PC9hPiBhbGxvd3MgeW91IHRvIAogZGlyZWN0bHkgbWFuaXB1bGF0ZSB0aGUgZGVwZW5kZW5jeSBpbmZvcm1hdGlvbiBmb3IgYSB2YWxpZGF0b3IuCis8aDM+RW50cnkgUG9pbnRzIGludG8gdGhlIFZhbGlkYXRpb24gRnJhbWV3b3JrPC9oMz4KKzxwPkhlcmUgYXJlIHNvbWUgb2YgdGhlIHBvaW50cyB3aGVyZSB0aGUgcGxhdGZvcm0gY2FsbHMgaW50byB0aGUgZnJhbWV3b3JrOjwvcD4KKzx1bD4KKzxsaT48Yj5CdWlsZGVyPC9iPiAtIFZhbGlkYXRpb25CdWlsZGVyPC9saT4KKzxsaT48Yj5JRmFjZXRlZFByb2plY3RMaXN0ZW5lcjwvYj4gLSBWYWxNYW5hZ2VyPC9saT4KKzxsaT48Yj5JSm9iQ2hhbmdlTGlzdGVuZXI8L2I+IC0gVmFsaWRhdGlvbk9wZXJhdGlvbiwgVmFsaWRhdGlvbk9wZXJhdGlvbi5WYWxpZGF0aW9uTGF1bmNoZXJKb2I8L2xpPgorPGxpPjxiPklQcm9qZWN0Q2hhbmdlTGlzdGVuZXI8L2I+IC0gVmFsTWFuYWdlcjwvbGk+Cis8bGk+PGI+SVByb3BlcnR5Q2hhbmdlTGlzdGVuZXI8L2I+IC0gVmFsaWRhdGlvbkNvbmZpZ3VyYXRpb24sIERpc2FibGVkUmVzb3VyY2VNYW5hZ2VyPC9saT4KKzxsaT48Yj5JUmVzb3VyY2VDaGFuZ2VMaXN0ZW5lcjwvYj4gLSBFdmVudE1hbmdlcjwvbGk+Cis8bGk+PGI+SVZhbENoYW5nZWRMaXN0ZW5lcjwvYj4gLSBWYWxNYW5hZ2VyLCBEaXNhYmxlZFZhbGlkYXRvck1hbmFnZXI8L2xpPgorPC91bD4KIDwvYm9keT4KIDwvaHRtbD4KZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24veHNkcy9leGNsdWRlLmV4c2QgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uL3hzZHMvZXhjbHVkZS5leHNkCmluZGV4IDNlZDlhOTYuLjkyZDc2NDcgMTAwNjQ0Ci0tLSBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24veHNkcy9leGNsdWRlLmV4c2QKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi94c2RzL2V4Y2x1ZGUuZXhzZApAQCAtMTY4LDYgKzE2OCw3IEBACiAgICAgICAgICAgICA8ZWxlbWVudCByZWY9InByb2plY3ROYXR1cmUiIG1pbk9jY3Vycz0iMCIgbWF4T2NjdXJzPSJ1bmJvdW5kZWQiLz4KICAgICAgICAgICAgIDxlbGVtZW50IHJlZj0iZmFjZXQiIG1pbk9jY3Vycz0iMCIgbWF4T2NjdXJzPSJ1bmJvdW5kZWQiLz4KICAgICAgICAgICAgIDxlbGVtZW50IHJlZj0iY29udGVudFR5cGUiIG1pbk9jY3Vycz0iMCIgbWF4T2NjdXJzPSJ1bmJvdW5kZWQiLz4KKyAgICAgICAgICAgIDxlbGVtZW50IHJlZj0icGF0dGVybiIgbWluT2NjdXJzPSIwIiBtYXhPY2N1cnM9InVuYm91bmRlZCIvPgogICAgICAgICAgPC9zZXF1ZW5jZT4KICAgICAgIDwvY29tcGxleFR5cGU+CiAgICA8L2VsZW1lbnQ+CkBAIC0yMDcsNiArMjA4LDMwIEBACiAgICAgICAgICA8L2F0dHJpYnV0ZT4KICAgICAgIDwvY29tcGxleFR5cGU+CiAgICA8L2VsZW1lbnQ+CisgICA8ZWxlbWVudCBuYW1lPSJwYXR0ZXJuIj4KKyAgICAgIDxhbm5vdGF0aW9uPgorICAgICAgICAgPGRvY3VtZW50YXRpb24+CisgICAgICAgICAgICBIb2xkcyBhIHJlZ3VhbHIgZXhwcmVzc2lvbiwgdGhhdCBtYXRjaGVzIHRoZSByZXNvdXJjZSZhcG9zO3MgcHJvamVjdCByZWxhdGl2ZSBuYW1lLgorICAgICAgICAgPC9kb2N1bWVudGF0aW9uPgorICAgICAgPC9hbm5vdGF0aW9uPgorICAgICAgPGNvbXBsZXhUeXBlPgorICAgICAgICAgPGF0dHJpYnV0ZSBuYW1lPSJyZWdleCIgdHlwZT0ic3RyaW5nIiB1c2U9InJlcXVpcmVkIj4KKyAgICAgICAgICAgIDxhbm5vdGF0aW9uPgorICAgICAgICAgICAgICAgPGRvY3VtZW50YXRpb24+CisgICAgICAgICAgICAgICAgICBIb2xkcyBhIEphdmEgcmVndWxhciBleHByZXNzaW9uLiBTZWUgdGhlIGNsYXNzIGphdmEudXRpbC5yZWdleC5QYXR0ZXJuIGZvciBtb3JlIGRldGFpbHMuIFRoaXMgcmVndWxhciBleHByZXNzaW9uIGlzIG1hdGNoZWQgYWdhaW5zdCBhIHJlc291cmNlJmFwb3M7cyBwcm9qZWN0IHJlbGF0aXZlIHBhdGgsIGFmdGVyIHRoYXQgcGF0aCBoYXMgYmVlbiBjb252ZXJ0ZWQgaW50byBhIHBvcnRhYmxlIHBhdGguCismbHQ7cCZndDtUaGUgcGF0aCB3aWxsIGFsd2F5cyBzdGFydCB3aXRoIGEgZm9yd2FyZCBzbGFzaCAoLykgc28gdGhhdCBmb2xkZXIgbmFtZXMgY2FuIGJlIG1vcmUgZWFzaWx5IG1hdGNoZWQuCisgICAgICAgICAgICAgICA8L2RvY3VtZW50YXRpb24+CisgICAgICAgICAgICA8L2Fubm90YXRpb24+CisgICAgICAgICA8L2F0dHJpYnV0ZT4KKyAgICAgICAgIDxhdHRyaWJ1dGUgbmFtZT0iY2FzZVNlbnNpdGl2ZSIgdHlwZT0iYm9vbGVhbiI+CisgICAgICAgICAgICA8YW5ub3RhdGlvbj4KKyAgICAgICAgICAgICAgIDxkb2N1bWVudGF0aW9uPgorICAgICAgICAgICAgICAgICAgSWYgdGhlIGZpbGUgbmFtZSBpcyBub3QgY2FzZSBzZW5zdGl0aXZlLCB0aGVuIHRoaXMgbmVlZHMgdG8gYmUgc2V0IHRvIGZhbHNlLgorICAgICAgICAgICAgICAgPC9kb2N1bWVudGF0aW9uPgorICAgICAgICAgICAgPC9hbm5vdGF0aW9uPgorICAgICAgICAgPC9hdHRyaWJ1dGU+CisgICAgICA8L2NvbXBsZXhUeXBlPgorICAgPC9lbGVtZW50PgogCiAgICA8YW5ub3RhdGlvbj4KICAgICAgIDxhcHBpbmZvPgpkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi94c2RzL3JlbW92ZVYyVmFsaWRhdG9yLmV4c2QgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uL3hzZHMvcmVtb3ZlVjJWYWxpZGF0b3IuZXhzZApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi4yNzFiODJlCi0tLSAvZGV2L251bGwKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi94c2RzL3JlbW92ZVYyVmFsaWRhdG9yLmV4c2QKQEAgLTAsMCArMSwxMjMgQEAKKzw/eG1sIHZlcnNpb249JzEuMCcgZW5jb2Rpbmc9J1VURi04Jz8+Cis8IS0tIFNjaGVtYSBmaWxlIHdyaXR0ZW4gYnkgUERFIC0tPgorPHNjaGVtYSB0YXJnZXROYW1lc3BhY2U9Im9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMS9YTUxTY2hlbWEiPgorPGFubm90YXRpb24+CisgICAgICA8YXBwSW5mbz4KKyAgICAgICAgIDxtZXRhLnNjaGVtYSBwbHVnaW49Im9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uIiBpZD0icmVtb3ZlVjJWYWxpZGF0b3IiIG5hbWU9IlJlbW92ZSBWMiBWYWxpZGF0b3IiLz4KKyAgICAgIDwvYXBwSW5mbz4KKyAgICAgIDxkb2N1bWVudGF0aW9uPgorICAgICAgICAgVGhpcyBpcyB1c2VkIHRvIHJlbW92ZSBhIFYyIHZhbGlkYXRvci4gQnkgc3BlY2lmeWluZyB0aGUgdmFsaWRhdG9yIElELCB0aGUgY29ycmVzcG9uZGluZyB2YWxpZGF0b3Igd2lsbCBiZSByZW1vdmVkIGFzIGlmIGl0IGhhc24mYXBvczt0IGJlZW4gcmVnaXN0ZXJlZC4gVGhlIHJlbW92ZWQgdmFsaWRhdG9yIHdpbGwgbm90IGJlIHNob3duIGluIHRoZSBQcmVmZXJlbmNlcyBwYWdlLgorICAgICAgPC9kb2N1bWVudGF0aW9uPgorICAgPC9hbm5vdGF0aW9uPgorCisgICA8ZWxlbWVudCBuYW1lPSJleHRlbnNpb24iPgorICAgICAgPGFubm90YXRpb24+CisgICAgICAgICA8YXBwSW5mbz4KKyAgICAgICAgICAgIDxtZXRhLmVsZW1lbnQgLz4KKyAgICAgICAgIDwvYXBwSW5mbz4KKyAgICAgIDwvYW5ub3RhdGlvbj4KKyAgICAgIDxjb21wbGV4VHlwZT4KKyAgICAgICAgIDxzZXF1ZW5jZT4KKyAgICAgICAgICAgIDxlbGVtZW50IHJlZj0icmVtb3ZlIiBtaW5PY2N1cnM9IjEiIG1heE9jY3Vycz0idW5ib3VuZGVkIi8+CisgICAgICAgICA8L3NlcXVlbmNlPgorICAgICAgICAgPGF0dHJpYnV0ZSBuYW1lPSJwb2ludCIgdHlwZT0ic3RyaW5nIiB1c2U9InJlcXVpcmVkIj4KKyAgICAgICAgICAgIDxhbm5vdGF0aW9uPgorICAgICAgICAgICAgICAgPGRvY3VtZW50YXRpb24+CisgICAgICAgICAgICAgICAgICAKKyAgICAgICAgICAgICAgIDwvZG9jdW1lbnRhdGlvbj4KKyAgICAgICAgICAgIDwvYW5ub3RhdGlvbj4KKyAgICAgICAgIDwvYXR0cmlidXRlPgorICAgICAgICAgPGF0dHJpYnV0ZSBuYW1lPSJpZCIgdHlwZT0ic3RyaW5nIj4KKyAgICAgICAgICAgIDxhbm5vdGF0aW9uPgorICAgICAgICAgICAgICAgPGRvY3VtZW50YXRpb24+CisgICAgICAgICAgICAgICAgICAKKyAgICAgICAgICAgICAgIDwvZG9jdW1lbnRhdGlvbj4KKyAgICAgICAgICAgIDwvYW5ub3RhdGlvbj4KKyAgICAgICAgIDwvYXR0cmlidXRlPgorICAgICAgICAgPGF0dHJpYnV0ZSBuYW1lPSJuYW1lIiB0eXBlPSJzdHJpbmciPgorICAgICAgICAgICAgPGFubm90YXRpb24+CisgICAgICAgICAgICAgICA8ZG9jdW1lbnRhdGlvbj4KKyAgICAgICAgICAgICAgICAgIAorICAgICAgICAgICAgICAgPC9kb2N1bWVudGF0aW9uPgorICAgICAgICAgICAgICAgPGFwcEluZm8+CisgICAgICAgICAgICAgICAgICA8bWV0YS5hdHRyaWJ1dGUgdHJhbnNsYXRhYmxlPSJ0cnVlIi8+CisgICAgICAgICAgICAgICA8L2FwcEluZm8+CisgICAgICAgICAgICA8L2Fubm90YXRpb24+CisgICAgICAgICA8L2F0dHJpYnV0ZT4KKyAgICAgIDwvY29tcGxleFR5cGU+CisgICA8L2VsZW1lbnQ+CisKKyAgIDxlbGVtZW50IG5hbWU9InJlbW92ZSI+CisgICAgICA8YW5ub3RhdGlvbj4KKyAgICAgICAgIDxkb2N1bWVudGF0aW9uPgorICAgICAgICAgICAgRGVmaW5lIHRoZSB2YWxpZGF0b3IgdGhhdCB3aWxsIGJlIHJlbW92ZWQuCisgICAgICAgICA8L2RvY3VtZW50YXRpb24+CisgICAgICA8L2Fubm90YXRpb24+CisgICAgICA8Y29tcGxleFR5cGU+CisgICAgICAgICA8YXR0cmlidXRlIG5hbWU9InZhbGlkYXRvcklkIiB0eXBlPSJzdHJpbmciIHVzZT0icmVxdWlyZWQiPgorICAgICAgICAgICAgPGFubm90YXRpb24+CisgICAgICAgICAgICAgICA8ZG9jdW1lbnRhdGlvbj4KKyAgICAgICAgICAgICAgICAgIFRoZSB2YWxpZGF0b3IgSUQgdGhhdCB3aWxsIGJlIHJlbW92ZWQuCisgICAgICAgICAgICAgICA8L2RvY3VtZW50YXRpb24+CisgICAgICAgICAgICA8L2Fubm90YXRpb24+CisgICAgICAgICA8L2F0dHJpYnV0ZT4KKyAgICAgIDwvY29tcGxleFR5cGU+CisgICA8L2VsZW1lbnQ+CisKKyAgIDxhbm5vdGF0aW9uPgorICAgICAgPGFwcEluZm8+CisgICAgICAgICA8bWV0YS5zZWN0aW9uIHR5cGU9InNpbmNlIi8+CisgICAgICA8L2FwcEluZm8+CisgICAgICA8ZG9jdW1lbnRhdGlvbj4KKyAgICAgICAgIFdlYlRvb2xzIDMuMgorICAgICAgPC9kb2N1bWVudGF0aW9uPgorICAgPC9hbm5vdGF0aW9uPgorCisgICA8YW5ub3RhdGlvbj4KKyAgICAgIDxhcHBJbmZvPgorICAgICAgICAgPG1ldGEuc2VjdGlvbiB0eXBlPSJleGFtcGxlcyIvPgorICAgICAgPC9hcHBJbmZvPgorICAgICAgPGRvY3VtZW50YXRpb24+CisgICAgICAgICBBbiBleGFtcGxlIHRvIHJlbW92ZSB0aGUgWFNMIHZhbGlkYXRvcgorCismbHQ7ZXh0ZW5zaW9uCisgICAgICAgcG9pbnQ9JnF1b3Q7b3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24ucmVtb3ZlVjJWYWxpZGF0b3ImcXVvdDsmZ3Q7CisgICAgJmx0O3JlbW92ZQorICAgICAgICAgIHZhbGlkYXRvcklkPSZxdW90O29yZy5lY2xpcHNlLndzdC54bWwuY29yZS54bWwmcXVvdDsmZ3Q7CisgICAgJmx0Oy9yZW1vdmUmZ3Q7CisgJmx0Oy9leHRlbnNpb24mZ3Q7CisgICAgICA8L2RvY3VtZW50YXRpb24+CisgICA8L2Fubm90YXRpb24+CisKKyAgIDxhbm5vdGF0aW9uPgorICAgICAgPGFwcEluZm8+CisgICAgICAgICA8bWV0YS5zZWN0aW9uIHR5cGU9ImFwaWluZm8iLz4KKyAgICAgIDwvYXBwSW5mbz4KKyAgICAgIDxkb2N1bWVudGF0aW9uPgorICAgICAgICAgUHJvdmlzaW9uYWwgQVBJLgorICAgICAgPC9kb2N1bWVudGF0aW9uPgorICAgPC9hbm5vdGF0aW9uPgorCisgICA8YW5ub3RhdGlvbj4KKyAgICAgIDxhcHBJbmZvPgorICAgICAgICAgPG1ldGEuc2VjdGlvbiB0eXBlPSJpbXBsZW1lbnRhdGlvbiIvPgorICAgICAgPC9hcHBJbmZvPgorICAgICAgPGRvY3VtZW50YXRpb24+CisgICAgICAgICBbRW50ZXIgaW5mb3JtYXRpb24gYWJvdXQgc3VwcGxpZWQgaW1wbGVtZW50YXRpb24gb2YgdGhpcyBleHRlbnNpb24gcG9pbnQuXQorICAgICAgPC9kb2N1bWVudGF0aW9uPgorICAgPC9hbm5vdGF0aW9uPgorCisgICA8YW5ub3RhdGlvbj4KKyAgICAgIDxhcHBJbmZvPgorICAgICAgICAgPG1ldGEuc2VjdGlvbiB0eXBlPSJjb3B5cmlnaHQiLz4KKyAgICAgIDwvYXBwSW5mbz4KKyAgICAgIDxkb2N1bWVudGF0aW9uPgorICAgICAgICAgQ29weXJpZ2h0IChjKSAyMDEwIElCTSBDb3Jwb3JhdGlvbiBhbmQgb3RoZXJzLiZsdDticiZndDsKK0FsbCByaWdodHMgcmVzZXJ2ZWQuIFRoaXMgcHJvZ3JhbSBhbmQgdGhlIGFjY29tcGFueWluZyBtYXRlcmlhbHMgYXJlIG1hZGUgCithdmFpbGFibGUgdW5kZXIgdGhlIHRlcm1zIG9mIHRoZSBFY2xpcHNlIFB1YmxpYyBMaWNlbnNlIHYxLjAgd2hpY2ggYWNjb21wYW5pZXMgCit0aGlzIGRpc3RyaWJ1dGlvbiwgYW5kIGlzIGF2YWlsYWJsZSBhdCAmbHQ7YQoraHJlZj0mcXVvdDtodHRwOi8vd3d3LmVjbGlwc2Uub3JnL2xlZ2FsL2VwbC12MTAuaHRtbCZxdW90OyZndDtodHRwOi8vd3d3LmVjbGlwc2Uub3JnL2xlZ2FsL2VwbC12MTAuaHRtbCZsdDsvYSZndDsKKyAgICAgIDwvZG9jdW1lbnRhdGlvbj4KKyAgIDwvYW5ub3RhdGlvbj4KKworPC9zY2hlbWE+CmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uL3hzZHMvdmFsaWRhdG9yLmV4c2QgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uL3hzZHMvdmFsaWRhdG9yLmV4c2QKaW5kZXggNzY5OTY3MS4uN2FmM2E3NCAxMDA2NDQKLS0tIGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi94c2RzL3ZhbGlkYXRvci5leHNkCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24veHNkcy92YWxpZGF0b3IuZXhzZApAQCAtMjI1LDYgKzIyNSw3IEBACiAgICAgICAgICAgICA8ZWxlbWVudCByZWY9InByb2plY3ROYXR1cmUiIG1pbk9jY3Vycz0iMCIgbWF4T2NjdXJzPSJ1bmJvdW5kZWQiLz4KICAgICAgICAgICAgIDxlbGVtZW50IHJlZj0iZmFjZXQiIG1pbk9jY3Vycz0iMCIgbWF4T2NjdXJzPSJ1bmJvdW5kZWQiLz4KICAgICAgICAgICAgIDxlbGVtZW50IHJlZj0iY29udGVudFR5cGUiIG1pbk9jY3Vycz0iMCIgbWF4T2NjdXJzPSJ1bmJvdW5kZWQiLz4KKyAgICAgICAgICAgIDxlbGVtZW50IHJlZj0icGF0dGVybiIgbWluT2NjdXJzPSIwIiBtYXhPY2N1cnM9InVuYm91bmRlZCIvPgogICAgICAgICAgPC9zZXF1ZW5jZT4KICAgICAgIDwvY29tcGxleFR5cGU+CiAgICA8L2VsZW1lbnQ+CkBAIC0yMzgsNiArMjM5LDEzIEBACiAgICAgICAgICAgICAgICA8L2RvY3VtZW50YXRpb24+CiAgICAgICAgICAgICA8L2Fubm90YXRpb24+CiAgICAgICAgICA8L2F0dHJpYnV0ZT4KKyAgICAgICAgIDxhdHRyaWJ1dGUgbmFtZT0idmVyc2lvbiIgdHlwZT0ic3RyaW5nIj4KKyAgICAgICAgICAgIDxhbm5vdGF0aW9uPgorICAgICAgICAgICAgICAgPGRvY3VtZW50YXRpb24+CisgICAgICAgICAgICAgICAgICBBIHZlcnNpb24gZXhwcmVzc2lvbiB0aGF0IGNhbiBiZSB1c2VkIHRvIGZ1dGhlciBxdWFsaWZ5IHRoZSBtYXRjaC4gSWYgbm90IHNwZWNpZmVkLCB0aGVuIHZlcnNpb25zIGFyZSBub3QgdXNlZCBhcyBhIGNyaXRlcmlhIGZvciBzZWxlY3RpbmcgdGhlIGZhY2V0LiBUaGUgc3ludGF4IG9mIHRoaXMgZXhwcmVzc2lvbiwgaXMgdGhlIHNhbWUgc3ludGF4IHRoYXQgaXMgdXNlZCBieSB0aGUgZmFjZXQgZnJhbWV3b3JrLgorICAgICAgICAgICAgICAgPC9kb2N1bWVudGF0aW9uPgorICAgICAgICAgICAgPC9hbm5vdGF0aW9uPgorICAgICAgICAgPC9hdHRyaWJ1dGU+CiAgICAgICA8L2NvbXBsZXhUeXBlPgogICAgPC9lbGVtZW50PgogCkBAIC0zMjksMTIgKzMzNywzNyBAQAogICAgICAgPC9jb21wbGV4VHlwZT4KICAgIDwvZWxlbWVudD4KIAorICAgPGVsZW1lbnQgbmFtZT0icGF0dGVybiI+CisgICAgICA8YW5ub3RhdGlvbj4KKyAgICAgICAgIDxkb2N1bWVudGF0aW9uPgorICAgICAgICAgICAgSG9sZHMgYSByZWd1YWxyIGV4cHJlc3Npb24sIHRoYXQgbWF0Y2hlcyB0aGUgcmVzb3VyY2UmYXBvcztzIHByb2plY3QgcmVsYXRpdmUgbmFtZS4KKyAgICAgICAgIDwvZG9jdW1lbnRhdGlvbj4KKyAgICAgIDwvYW5ub3RhdGlvbj4KKyAgICAgIDxjb21wbGV4VHlwZT4KKyAgICAgICAgIDxhdHRyaWJ1dGUgbmFtZT0icmVnZXgiIHR5cGU9InN0cmluZyIgdXNlPSJyZXF1aXJlZCI+CisgICAgICAgICAgICA8YW5ub3RhdGlvbj4KKyAgICAgICAgICAgICAgIDxkb2N1bWVudGF0aW9uPgorICAgICAgICAgICAgICAgICAgSG9sZHMgYSBKYXZhIHJlZ3VsYXIgZXhwcmVzc2lvbi4gU2VlIHRoZSBjbGFzcyBqYXZhLnV0aWwucmVnZXguUGF0dGVybiBmb3IgbW9yZSBkZXRhaWxzLiBUaGlzIHJlZ3VsYXIgZXhwcmVzc2lvbiBpcyBtYXRjaGVkIGFnYWluc3QgYSByZXNvdXJjZSZhcG9zO3MgcHJvamVjdCByZWxhdGl2ZSBwYXRoLCBhZnRlciB0aGF0IHBhdGggaGFzIGJlZW4gY29udmVydGVkIGludG8gYSBwb3J0YWJsZSBwYXRoLgorJmx0O3AmZ3Q7VGhlIHBhdGggd2lsbCBhbHdheXMgc3RhcnQgd2l0aCBhIGZvcndhcmQgc2xhc2ggKC8pIHNvIHRoYXQgZm9sZGVyIG5hbWVzIGNhbiBiZSBtb3JlIGVhc2lseSBtYXRjaGVkLgorICAgICAgICAgICAgICAgPC9kb2N1bWVudGF0aW9uPgorICAgICAgICAgICAgPC9hbm5vdGF0aW9uPgorICAgICAgICAgPC9hdHRyaWJ1dGU+CisgICAgICAgICA8YXR0cmlidXRlIG5hbWU9ImNhc2VTZW5zaXRpdmUiIHR5cGU9ImJvb2xlYW4iPgorICAgICAgICAgICAgPGFubm90YXRpb24+CisgICAgICAgICAgICAgICA8ZG9jdW1lbnRhdGlvbj4KKyAgICAgICAgICAgICAgICAgIElmIHRoZSBmaWxlIG5hbWUgaXMgbm90IGNhc2Ugc2Vuc3RpdGl2ZSwgdGhlbiB0aGlzIG5lZWRzIHRvIGJlIHNldCB0byBmYWxzZS4KKyAgICAgICAgICAgICAgIDwvZG9jdW1lbnRhdGlvbj4KKyAgICAgICAgICAgIDwvYW5ub3RhdGlvbj4KKyAgICAgICAgIDwvYXR0cmlidXRlPgorICAgICAgPC9jb21wbGV4VHlwZT4KKyAgIDwvZWxlbWVudD4KKwogICAgPGFubm90YXRpb24+CiAgICAgICA8YXBwaW5mbz4KICAgICAgICAgIDxtZXRhLnNlY3Rpb24gdHlwZT0ic2luY2UiLz4KICAgICAgIDwvYXBwaW5mbz4KICAgICAgIDxkb2N1bWVudGF0aW9uPgotICAgICAgICAgV2ViVG9vbHMgMy40LgorICAgICAgICAgV2ViVG9vbHMgMy4wLgogICAgICAgPC9kb2N1bWVudGF0aW9uPgogICAgPC9hbm5vdGF0aW9uPgogCkBAIC0zNjEsMTUgKzM5NCw2IEBACiAgICAgICA8L2RvY3VtZW50YXRpb24+CiAgICA8L2Fubm90YXRpb24+CiAKLSAgIDxhbm5vdGF0aW9uPgotICAgICAgPGFwcGluZm8+Ci0gICAgICAgICA8bWV0YS5zZWN0aW9uIHR5cGU9ImFwaUluZm8iLz4KLSAgICAgIDwvYXBwaW5mbz4KLSAgICAgIDxkb2N1bWVudGF0aW9uPgotICAgICAgICAgUHJvdmlzaW9uYWwgQVBJLgotICAgICAgPC9kb2N1bWVudGF0aW9uPgotICAgPC9hbm5vdGF0aW9uPgotCiAKICAgIDxhbm5vdGF0aW9uPgogICAgICAgPGFwcGluZm8+CkBAIC0zODQsNCArNDA4LDEzIEBACiAgICAgICA8L2RvY3VtZW50YXRpb24+CiAgICA8L2Fubm90YXRpb24+CiAKKyAgIDxhbm5vdGF0aW9uPgorICAgICAgPGFwcGluZm8+CisgICAgICAgICA8bWV0YS5zZWN0aW9uIHR5cGU9ImFwaUluZm8iLz4KKyAgICAgIDwvYXBwaW5mbz4KKyAgICAgIDxkb2N1bWVudGF0aW9uPgorICAgICAgICAgUHJvdmlzaW9uYWwgQVBJLgorICAgICAgPC9kb2N1bWVudGF0aW9uPgorICAgPC9hbm5vdGF0aW9uPgorCiA8L3NjaGVtYT4KZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24veHNkcy92YWxpZGF0b3JFeHRTY2hlbWEuZXhzZCBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24veHNkcy92YWxpZGF0b3JFeHRTY2hlbWEuZXhzZAppbmRleCBmYWEwYTJjLi4wZTk2NjdlIDEwMDY0NAotLS0gYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uL3hzZHMvdmFsaWRhdG9yRXh0U2NoZW1hLmV4c2QKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi94c2RzL3ZhbGlkYXRvckV4dFNjaGVtYS5leHNkCkBAIC0xLDYgKzEsNiBAQAogPD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCiA8IS0tIFNjaGVtYSBmaWxlIHdyaXR0ZW4gYnkgUERFIC0tPg0KLTxzY2hlbWEgdGFyZ2V0TmFtZXNwYWNlPSJvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbiI+DQorPHNjaGVtYSB0YXJnZXROYW1lc3BhY2U9Im9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMS9YTUxTY2hlbWEiPg0KIDxhbm5vdGF0aW9uPg0KICAgICAgIDxhcHBJbmZvPg0KICAgICAgICAgIDxtZXRhLnNjaGVtYSBwbHVnaW49Im9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uIiBpZD0idmFsaWRhdG9yIiBuYW1lPSJWYWxpZGF0b3IiLz4NCkBAIC0xMyw2ICsxMywxMSBAQAogICAgPGluY2x1ZGUgc2NoZW1hTG9jYXRpb249InNjaGVtYTovL29yZy5lY2xpcHNlLmNvcmUuZXhwcmVzc2lvbnMvc2NoZW1hL2V4cHJlc3Npb25MYW5ndWFnZS5leHNkIi8+DQogDQogICAgPGVsZW1lbnQgbmFtZT0iZXh0ZW5zaW9uIj4NCisgICAgICA8YW5ub3RhdGlvbj4NCisgICAgICAgICA8YXBwSW5mbz4NCisgICAgICAgICAgICA8bWV0YS5lbGVtZW50IC8+DQorICAgICAgICAgPC9hcHBJbmZvPg0KKyAgICAgIDwvYW5ub3RhdGlvbj4NCiAgICAgICA8Y29tcGxleFR5cGU+DQogICAgICAgICAgPHNlcXVlbmNlPg0KICAgICAgICAgICAgIDxlbGVtZW50IHJlZj0idmFsaWRhdG9yIi8+DQpAQCAtMzYsNiArNDEsOSBAQAogICAgICAgICAgICAgICAgPGRvY3VtZW50YXRpb24+DQogICAgICAgICAgICAgICAgICAgQW4gb3B0aW9uYWwgbmFtZSBvZiB0aGUgZXh0ZW5zaW9uIGluc3RhbmNlDQogICAgICAgICAgICAgICAgPC9kb2N1bWVudGF0aW9uPg0KKyAgICAgICAgICAgICAgIDxhcHBJbmZvPg0KKyAgICAgICAgICAgICAgICAgIDxtZXRhLmF0dHJpYnV0ZSB0cmFuc2xhdGFibGU9InRydWUiLz4NCisgICAgICAgICAgICAgICA8L2FwcEluZm8+DQogICAgICAgICAgICAgPC9hbm5vdGF0aW9uPg0KICAgICAgICAgIDwvYXR0cmlidXRlPg0KICAgICAgIDwvY29tcGxleFR5cGU+DQpAQCAtNDYsMTMgKzU0LDE0IEBACiAgICAgICAgICA8c2VxdWVuY2U+DQogICAgICAgICAgICAgPGVsZW1lbnQgcmVmPSJwcm9qZWN0TmF0dXJlIiBtaW5PY2N1cnM9IjAiIG1heE9jY3Vycz0idW5ib3VuZGVkIi8+DQogICAgICAgICAgICAgPGVsZW1lbnQgcmVmPSJmaWx0ZXIiIG1pbk9jY3Vycz0iMCIgbWF4T2NjdXJzPSJ1bmJvdW5kZWQiLz4NCi0gICAgICAgICAgICA8ZWxlbWVudCByZWY9ImVuYWJsZW1lbnQiIG1pbk9jY3Vycz0iMCIgbWF4T2NjdXJzPSJ1bmJvdW5kZWQiLz4vPg0KKyAgICAgICAgICAgIDxlbGVtZW50IHJlZj0iZW5hYmxlbWVudCIgbWluT2NjdXJzPSIwIiBtYXhPY2N1cnM9InVuYm91bmRlZCIvPg0KICAgICAgICAgICAgIDxlbGVtZW50IHJlZj0iaGVscGVyIi8+DQogICAgICAgICAgICAgPGVsZW1lbnQgcmVmPSJkZXBlbmRlbnRWYWxpZGF0b3IiIG1pbk9jY3Vycz0iMCIgbWF4T2NjdXJzPSIxIi8+DQogICAgICAgICAgICAgPGVsZW1lbnQgcmVmPSJydW4iLz4NCiAgICAgICAgICAgICA8ZWxlbWVudCByZWY9Im1hcmtlcklkIiBtaW5PY2N1cnM9IjAiIG1heE9jY3Vycz0iMSIvPg0KICAgICAgICAgICAgIDxlbGVtZW50IHJlZj0iZmFjZXQiIG1pbk9jY3Vycz0iMCIgbWF4T2NjdXJzPSJ1bmJvdW5kZWQiLz4NCiAgICAgICAgICAgICA8ZWxlbWVudCByZWY9ImNvbnRlbnRUeXBlQmluZGluZyIgbWluT2NjdXJzPSIwIiBtYXhPY2N1cnM9InVuYm91bmRlZCIvPg0KKyAgICAgICAgICAgIDxlbGVtZW50IHJlZj0icnVuU3RyYXRlZ3kiLz4NCiAgICAgICAgICA8L3NlcXVlbmNlPg0KICAgICAgICAgIDxhdHRyaWJ1dGUgbmFtZT0idG8iIHR5cGU9InN0cmluZyI+DQogICAgICAgICAgICAgPGFubm90YXRpb24+DQpAQCAtOTEsMTUgKzEwMCwxNCBAQAogICAgICAgICAgPC9hdHRyaWJ1dGU+DQogICAgICAgPC9jb21wbGV4VHlwZT4NCiAgICA8L2VsZW1lbnQ+DQotICAgDQotICAgDQorDQogICAgPGVsZW1lbnQgbmFtZT0iY29udGVudFR5cGVCaW5kaW5nIj4NCiAgICAgICA8YW5ub3RhdGlvbj4NCiAgICAgICAgICA8YXBwSW5mbz4NCiAgICAgICAgICAgICA8bWV0YS5lbGVtZW50IGxhYmVsQXR0cmlidXRlPSJjb250ZW50VHlwZUlkIi8+DQogICAgICAgICAgPC9hcHBJbmZvPg0KICAgICAgICAgIDxkb2N1bWVudGF0aW9uPg0KLSAgICAgICAgICAgICAgICAgICAgICAgIEFzc29jaWF0ZXMgYSBwYXJ0aWN1bGFyIGNvbnRlbnQgdHlwZSB3aXRoIHRoZSBjdXJyZW50IHZhbGlkYXRvciwgYW5kIGVuYWJsZXMgdGhlIHZhbGlkYXRvciB0byBiZSBydW4gb24gcmVzb3VyY2VzIG9mIHRoZSBzcGVjaWZpZWQgY29udGVudCB0eXBlLg0KKyAgICAgICAgICAgIEFzc29jaWF0ZXMgYSBwYXJ0aWN1bGFyIGNvbnRlbnQgdHlwZSB3aXRoIHRoZSBjdXJyZW50IHZhbGlkYXRvciwgYW5kIGVuYWJsZXMgdGhlIHZhbGlkYXRvciB0byBiZSBydW4gb24gcmVzb3VyY2VzIG9mIHRoZSBzcGVjaWZpZWQgY29udGVudCB0eXBlLg0KICAgICAgICAgIDwvZG9jdW1lbnRhdGlvbj4NCiAgICAgICA8L2Fubm90YXRpb24+DQogICAgICAgPGNvbXBsZXhUeXBlPg0KQEAgLTExMiw5ICsxMjAsNiBAQAogICAgICAgICAgPC9hdHRyaWJ1dGU+DQogICAgICAgPC9jb21wbGV4VHlwZT4NCiAgICA8L2VsZW1lbnQ+DQotICAgDQotICAgDQotICAgDQogDQogICAgPGVsZW1lbnQgbmFtZT0iZmlsdGVyIj4NCiAgICAgICA8Y29tcGxleFR5cGU+DQpAQCAtMjgxLDYgKzI4NiwxOSBAQAogICAgICAgPC9jb21wbGV4VHlwZT4NCiAgICA8L2VsZW1lbnQ+DQogDQorICAgPGVsZW1lbnQgbmFtZT0icnVuU3RyYXRlZ3kiPg0KKyAgICAgIDxjb21wbGV4VHlwZT4NCisgICAgICAgICA8YXR0cmlidXRlIG5hbWU9InByb2plY3QiIHR5cGU9ImJvb2xlYW4iPg0KKyAgICAgICAgICAgIDxhbm5vdGF0aW9uPg0KKyAgICAgICAgICAgICAgIDxkb2N1bWVudGF0aW9uPg0KKyAgICAgICAgICAgICAgICAgIElmIHRydWUgdGhlbiB0aGUgdmFsaWRhdG9yIGlzIG9ubHkgY2FsbGVkIG9uY2UgcGVyIHByb2plY3QuIElmIGZhbHNlIChvciBtaXNzaW5nKSB0aGVuIHRoZSB2YWxpZGF0b3IgY291bGQgYmUgY2FsbGVkIG9uY2UgcGVyIHJlc291cmNlIChiYXNlZCBvbiB0aGUgb3RoZXIgZmlsdGVyIHJ1bGVzKS4NCisgICAgICAgICAgICAgICA8L2RvY3VtZW50YXRpb24+DQorICAgICAgICAgICAgPC9hbm5vdGF0aW9uPg0KKyAgICAgICAgIDwvYXR0cmlidXRlPg0KKyAgICAgIDwvY29tcGxleFR5cGU+DQorICAgPC9lbGVtZW50Pg0KKw0KKw0KICAgIDxhbm5vdGF0aW9uPg0KICAgICAgIDxhcHBJbmZvPg0KICAgICAgICAgIDxtZXRhLnNlY3Rpb24gdHlwZT0ic2luY2UiLz4NCkBAIC0yOTAsMzkgKzMwOCwxNCBAQAogICAgICAgPC9kb2N1bWVudGF0aW9uPg0KICAgIDwvYW5ub3RhdGlvbj4NCiANCi0gICA8YW5ub3RhdGlvbj4NCi0gICAgICA8YXBwSW5mbz4NCi0gICAgICAgICA8bWV0YS5zZWN0aW9uIHR5cGU9ImV4YW1wbGVzIi8+DQotICAgICAgPC9hcHBJbmZvPg0KLSAgICAgIDxkb2N1bWVudGF0aW9uPg0KLSAgICAgICAgIA0KLSAgICAgIDwvZG9jdW1lbnRhdGlvbj4NCi0gICA8L2Fubm90YXRpb24+DQogDQotICAgPGFubm90YXRpb24+DQotICAgICAgPGFwcEluZm8+DQotICAgICAgICAgPG1ldGEuc2VjdGlvbiB0eXBlPSJhcGlJbmZvIi8+DQotICAgICAgPC9hcHBJbmZvPg0KLSAgICAgIDxkb2N1bWVudGF0aW9uPg0KLSAgICAgICAgIA0KLSAgICAgIDwvZG9jdW1lbnRhdGlvbj4NCi0gICA8L2Fubm90YXRpb24+DQotDQotICAgPGFubm90YXRpb24+DQotICAgICAgPGFwcEluZm8+DQotICAgICAgICAgPG1ldGEuc2VjdGlvbiB0eXBlPSJpbXBsZW1lbnRhdGlvbiIvPg0KLSAgICAgIDwvYXBwSW5mbz4NCi0gICAgICA8ZG9jdW1lbnRhdGlvbj4NCi0gICAgICAgICANCi0gICAgICA8L2RvY3VtZW50YXRpb24+DQotICAgPC9hbm5vdGF0aW9uPg0KIA0KICAgIDxhbm5vdGF0aW9uPg0KICAgICAgIDxhcHBJbmZvPg0KICAgICAgICAgIDxtZXRhLnNlY3Rpb24gdHlwZT0iY29weXJpZ2h0Ii8+DQogICAgICAgPC9hcHBJbmZvPg0KICAgICAgIDxkb2N1bWVudGF0aW9uPg0KLSAgICAgICAgIENvcHlyaWdodCAoYykgMjAwNSBJQk0gQ29ycG9yYXRpb24gYW5kIG90aGVycy4mbHQ7YnImZ3Q7DQorICAgICAgICAgQ29weXJpZ2h0IChjKSAyMDA1LCAyMDEwIElCTSBDb3Jwb3JhdGlvbiBhbmQgb3RoZXJzLiZsdDticiZndDsNCiBBbGwgcmlnaHRzIHJlc2VydmVkLiBUaGlzIHByb2dyYW0gYW5kIHRoZSBhY2NvbXBhbnlpbmcgbWF0ZXJpYWxzIGFyZSBtYWRlIA0KIGF2YWlsYWJsZSB1bmRlciB0aGUgdGVybXMgb2YgdGhlIEVjbGlwc2UgUHVibGljIExpY2Vuc2UgdjEuMCB3aGljaCBhY2NvbXBhbmllcyANCiB0aGlzIGRpc3RyaWJ1dGlvbiwgYW5kIGlzIGF2YWlsYWJsZSBhdCAmbHQ7YQ0KZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24veHNkcy92YWxpZGF0b3Jncm91cC5leHNkIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi94c2RzL3ZhbGlkYXRvcmdyb3VwLmV4c2QKaW5kZXggY2EyZmI2Zi4uZGYwNWNiMSAxMDA2NDQKLS0tIGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi94c2RzL3ZhbGlkYXRvcmdyb3VwLmV4c2QKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi94c2RzL3ZhbGlkYXRvcmdyb3VwLmV4c2QKQEAgLTk1LDcgKzk1LDcgQEAKICAgICAgICAgIDxtZXRhLnNlY3Rpb24gdHlwZT0ic2luY2UiLz4KICAgICAgIDwvYXBwaW5mbz4KICAgICAgIDxkb2N1bWVudGF0aW9uPgotICAgICAgICAgV2ViVG9vbHMgMy40CisgICAgICAgICBXZWJUb29scyAzLjAKICAgICAgIDwvZG9jdW1lbnRhdGlvbj4KICAgIDwvYW5ub3RhdGlvbj4KIAo=