6251 2014-04-29 11:11:01 +0000 Upgrade Eclipse plugin to Luna 2015-03-24 13:11:35 +0000 1 1 6 Yocto Project Subprojects Eclipse Plugin eclipse-plugin 1.7 x86 Multiple VERIFIED FIXED Medium+ enhancement 1.8 M3 1 jessica.zhang todor.minchev alexandru.c.georgescu ioanax.grigoropol yp.ep.watcher yp.watcher stanciux.mihail --- --- Yes (doc changes required) oldest_to_newest 43056 0 jessica.zhang 2014-04-29 11:11:01 +0000 45729 1 2132 mober.at 2014-09-21 07:48:18 +0000 Created attachment 2132 Patch to adapt org.yocto.bc.ui to Eclipse Luna (PTP 8.0+) Attached patch makes the necessary adaptations in the org.yocto.bc.ui plug-in for Eclipse 4.4 Luna (which includes PTP 8.0 which introduced an API change): With Eclipse 4.4 Luna, the PTP/RDT project has changed the remote services API from org.eclipse.ptp.remote to org.eclipse.remote . This commit makes the necessary adaptations in the org.yocto.bc.ui plug-in , and also fixes the most obvious warnings in the files that were touched (BREE was missing in MANIFEST.MF , and the non-generic Map has been replaced by the proper Map<String,Object> in one place. The changes are actually quite trivial but partially look bigger than they are, just because "organize imports" was used. Remaining work: (1) A compiler warning informs about a possible resource leak related to using ConsoleWriter - that warning was not followed up on. Also (2) the new PTP remote API was introduced in order to allow consumers leverage the remote services framework without a dependency on PTP. The org.yocto.bc.ui does not currently leverage this new benefit since it still uses internals from PTP/RDT in very few places. This should be reviewed. The patch is signed-off and ready to go. I declare that I developed attached changes from scratch myself, and I am authorized by my employer (WindRiver) to contribute attached changes under the Eclipse Public License EPL v1.0 48640 2 stanciux.mihail 2015-02-09 13:10:15 +0000 Is there any chance we can get an ETA on this? It would help our QA plans greatly if we had a general idea when this would be finished. Regards, Mihail 48641 3 todor.minchev 2015-02-09 13:41:06 +0000 This is already done. The plugin is adapted for Eclipse Luna. Please retest using this repo (luna-next branch). https://git.yoctoproject.org/cgit/cgit.cgi/eclipse-poky-luna/?h=luna-next If you are happy with the tests, please mark this bug as resolved. Regards, Todor 48649 4 alexandru.c.georgescu 2015-02-09 17:32:40 +0000 (In reply to comment #3) > This is already done. The plugin is adapted for Eclipse Luna. > Please retest using this repo (luna-next branch). > > https://git.yoctoproject.org/cgit/cgit.cgi/eclipse-poky-luna/?h=luna-next > > If you are happy with the tests, please mark this bug as resolved. > > Regards, > Todor Hi, I just tried to run the headless build on the latest http://git.yoctoproject.org/cgit/cgit.cgi/eclipse-poky-luna/. Seems that it is downloading the 4.3 version which is Kepler: [fed@fed scripts]$ ./setup.sh Getting Eclipse SDK... --2015-02-09 19:29:07-- http://downloads.yoctoproject.org/eclipse/downloads/drops4/R-4.3-201306052000/eclipse-SDK-4.3-linux-gtk-x86_64.tar.gz Resolving Connecting to Proxy request sent, awaiting response... 200 OK Length: 199285473 (190M) [application/x-gzip] Saving to: 'eclipse-SDK-4.3-linux-gtk-x86_64.tar.gz' 4% [======> ] 9,585,487 136KB/s eta 48m 9s 48653 5 todor.minchev 2015-02-09 18:12:17 +0000 Please use the luna-next branch, seems like you are building from master. I have merged these 3 trees and pushed the result to eclipse-poky-luna for the moment: eclipse-poky eclipse-poky-juno eclipse-poky-kepler Our aim is to maintain a single repo in the future. When Beth returns from sabbatical I'll work with her to verify that she is happy with this arrangement. We can then "push --force" eclipse-poky-luna to eclipse-poky and discard eclipse-poky-juno eclipse-poky-kepler eclipse-poky-luna For QA purposes please always use the *-next branch for the release you are testing. After the work in -next branches passes the QA tests it will get merged into its respective stable branch (juno, kepler or luna). Master will always point to the latest stable (for the moment it is kepler, but I will change it to luna after luna-next is tested). Thanks, Todor 49645 6 stanciux.mihail 2015-03-23 12:18:43 +0000 Update for future verification efforts - from mailing list: All branches and tags from the eclipse-poky-kepler and eclipse-poky-juno repositories will be reachable with the same branch/tag names and the kepler or juno prefix respectively. The development(master) branches for juno, kepler and luna are: juno-master kepler-master luna-master master - tracks the master branch for the latest supported Eclipse release (luna-master at present) This means that all code is now in eclipse-poky. 49696 7 stanciux.mihail 2015-03-24 13:11:35 +0000 Verified. 2132 2014-09-21 07:48:18 +0000 2014-09-21 07:48:18 +0000 Patch to adapt org.yocto.bc.ui to Eclipse Luna (PTP 8.0+) Bug-6251--Upgrade-Eclipse-plugin-orgyoctobcui-to-Lun.patch text/plain 18684 mober.at RnJvbSBkZTAxOWZhZWU3Nzc1OWExNjJiNjhlY2JkYmNiNmViMGRkZmNjMzY4IFN1biwgMjEgU2Vw IDIwMTQgMDk6NDI6MDIgKzAyMDAKRnJvbTogTWFydGluIE9iZXJodWJlciA8bWFydGluLm9iZXJo dWJlckB3aW5kcml2ZXIuY29tPgpEYXRlOiBTdW4sIDIxIFNlcCAyMDE0IDA5OjQwOjU5ICswMjAw ClN1YmplY3Q6IFtQQVRDSF0gQnVnIDYyNTEgLSBVcGdyYWRlIEVjbGlwc2UgcGx1Z2luIChvcmcu eW9jdG8uYmMudWkpIHRvIEx1bmEKCgpXaXRoIEVjbGlwc2UgNC40IEx1bmEsIHRoZSBQVFAvUkRU IHByb2plY3QgaGFzIGNoYW5nZWQgdGhlIHJlbW90ZQpzZXJ2aWNlcyBBUEkgZnJvbSBvcmcuZWNs aXBzZS5wdHAucmVtb3RlIHRvIG9yZy5lY2xpcHNlLnJlbW90ZSAuCgpUaGlzIGNvbW1pdCBtYWtl cyB0aGUgbmVjZXNzYXJ5IGFkYXB0YXRpb25zIGluIHRoZSBvcmcueW9jdG8uYmMudWkKcGx1Zy1p biAsIGFuZCBhbHNvIGZpeGVzIHRoZSBtb3N0IG9idmlvdXMgd2FybmluZ3MgaW4gdGhlIGZpbGVz IHRoYXQKd2VyZSB0b3VjaGVkIChCUkVFIHdhcyBtaXNzaW5nIGluIE1BTklGRVNULk1GICwgYW5k IHRoZSBub24tZ2VuZXJpYwpNYXAgaGFzIGJlZW4gcmVwbGFjZWQgYnkgdGhlIHByb3BlciBNYXA8 U3RyaW5nLE9iamVjdD4gaW4gb25lIHBsYWNlLgoKVGhlIGNoYW5nZXMgYXJlIGFjdHVhbGx5IHF1 aXRlIHRyaXZpYWwgYnV0IHBhcnRpYWxseSBsb29rIGJpZ2dlciB0aGFuCnRoZXkgYXJlLCBqdXN0 IGJlY2F1c2UgIm9yZ2FuaXplIGltcG9ydHMiIHdhcyB1c2VkLgoKUmVtYWluaW5nIHdvcms6ICgx KSBBIGNvbXBpbGVyIHdhcm5pbmcgaW5mb3JtcyBhYm91dCBhIHBvc3NpYmxlCnJlc291cmNlIGxl YWsgcmVsYXRlZCB0byB1c2luZyBDb25zb2xlV3JpdGVyIC0gdGhhdCB3YXJuaW5nIHdhcyBub3QK Zm9sbG93ZWQgdXAgb24uIEFsc28gKDIpIHRoZSBuZXcgUFRQIHJlbW90ZSBBUEkgd2FzIGludHJv ZHVjZWQgaW4gb3JkZXIKdG8gYWxsb3cgY29uc3VtZXJzIGxldmVyYWdlIHRoZSByZW1vdGUgc2Vy dmljZXMgZnJhbWV3b3JrIHdpdGhvdXQKYSBkZXBlbmRlbmN5IG9uIFBUUC4gVGhlIG9yZy55b2N0 by5iYy51aSBkb2VzIG5vdCBjdXJyZW50bHkgbGV2ZXJhZ2UKdGhpcyBuZXcgYmVuZWZpdCBzaW5j ZSBpdCBzdGlsbCB1c2VzIGludGVybmFscyBmcm9tIFBUUC9SRFQgaW4gdmVyeQpmZXcgcGxhY2Vz LiBUaGlzIHNob3VsZCBiZSByZXZpZXdlZC4KCkNoYW5nZS1JZDogSWE1MjE5N2ZhYTUwYWJkMjM5 NDA5MDZmN2Q3OWMzMjUwNzE5NDNhOWUKU2lnbmVkLW9mZi1ieTogTWFydGluIE9iZXJodWJlciA8 bWFydGluLm9iZXJodWJlckB3aW5kcml2ZXIuY29tPgpkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcu eW9jdG8uYmMudWkvLmNsYXNzcGF0aCBiL3BsdWdpbnMvb3JnLnlvY3RvLmJjLnVpLy5jbGFzc3Bh dGgKaW5kZXggMTIxZTUyNy4uYWQzMmM4MyAxMDA2NDQKLS0tIGEvcGx1Z2lucy9vcmcueW9jdG8u YmMudWkvLmNsYXNzcGF0aAorKysgYi9wbHVnaW5zL29yZy55b2N0by5iYy51aS8uY2xhc3NwYXRo CkBAIC0xLDcgKzEsNyBAQAogPD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4K IDxjbGFzc3BhdGg+Ci0JPGNsYXNzcGF0aGVudHJ5IGtpbmQ9InNyYyIgcGF0aD0ic3JjIi8+CiAJ PGNsYXNzcGF0aGVudHJ5IGtpbmQ9ImNvbiIgcGF0aD0ib3JnLmVjbGlwc2UuamR0LmxhdW5jaGlu Zy5KUkVfQ09OVEFJTkVSL29yZy5lY2xpcHNlLmpkdC5pbnRlcm5hbC5kZWJ1Zy51aS5sYXVuY2hl ci5TdGFuZGFyZFZNVHlwZS9KYXZhU0UtMS42Ii8+CiAJPGNsYXNzcGF0aGVudHJ5IGtpbmQ9ImNv biIgcGF0aD0ib3JnLmVjbGlwc2UucGRlLmNvcmUucmVxdWlyZWRQbHVnaW5zIi8+CisJPGNsYXNz cGF0aGVudHJ5IGtpbmQ9InNyYyIgcGF0aD0ic3JjIi8+CiAJPGNsYXNzcGF0aGVudHJ5IGtpbmQ9 Im91dHB1dCIgcGF0aD0iYmluIi8+CiA8L2NsYXNzcGF0aD4KZGlmZiAtLWdpdCBhL3BsdWdpbnMv b3JnLnlvY3RvLmJjLnVpLy5zZXR0aW5ncy9vcmcuZWNsaXBzZS5qZHQuY29yZS5wcmVmcyBiL3Bs dWdpbnMvb3JnLnlvY3RvLmJjLnVpLy5zZXR0aW5ncy9vcmcuZWNsaXBzZS5qZHQuY29yZS5wcmVm cwpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi5jNTM3YjYzCi0tLSAvZGV2L251 bGwKKysrIGIvcGx1Z2lucy9vcmcueW9jdG8uYmMudWkvLnNldHRpbmdzL29yZy5lY2xpcHNlLmpk dC5jb3JlLnByZWZzCkBAIC0wLDAgKzEsNyBAQAorZWNsaXBzZS5wcmVmZXJlbmNlcy52ZXJzaW9u PTEKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLmNvZGVnZW4uaW5saW5lSnNyQnl0ZWNv ZGU9ZW5hYmxlZAorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIuY29kZWdlbi50YXJnZXRQ bGF0Zm9ybT0xLjYKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLmNvbXBsaWFuY2U9MS42 CitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLmFzc2VydElkZW50aWZpZXI9 ZXJyb3IKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0uZW51bUlkZW50aWZp ZXI9ZXJyb3IKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnNvdXJjZT0xLjYKZGlmZiAt LWdpdCBhL3BsdWdpbnMvb3JnLnlvY3RvLmJjLnVpL01FVEEtSU5GL01BTklGRVNULk1GIGIvcGx1 Z2lucy9vcmcueW9jdG8uYmMudWkvTUVUQS1JTkYvTUFOSUZFU1QuTUYKaW5kZXggNGM1Mzc0NS4u ZDliNzY4NCAxMDA2NDQKLS0tIGEvcGx1Z2lucy9vcmcueW9jdG8uYmMudWkvTUVUQS1JTkYvTUFO SUZFU1QuTUYKKysrIGIvcGx1Z2lucy9vcmcueW9jdG8uYmMudWkvTUVUQS1JTkYvTUFOSUZFU1Qu TUYKQEAgLTIsNyArMiw3IEBACiBCdW5kbGUtTWFuaWZlc3RWZXJzaW9uOiAyCiBCdW5kbGUtTmFt ZTogJUJ1bmRsZS1OYW1lCiBCdW5kbGUtU3ltYm9saWNOYW1lOiBvcmcueW9jdG8uYmMudWk7c2lu Z2xldG9uOj10cnVlCi1CdW5kbGUtVmVyc2lvbjogMS40LjAucXVhbGlmaWVyCitCdW5kbGUtVmVy c2lvbjogMS41LjAucXVhbGlmaWVyCiBCdW5kbGUtQWN0aXZhdG9yOiBvcmcueW9jdG8uYmMudWku QWN0aXZhdG9yCiBCdW5kbGUtVmVuZG9yOiAlQnVuZGxlLVZlbmRvcgogUmVxdWlyZS1CdW5kbGU6 IG9yZy5lY2xpcHNlLnVpLApAQCAtMTYsMTggKzE2LDE1IEBACiAgb3JnLmVjbGlwc2UudWkuY29u c29sZSwKICBvcmcuZWNsaXBzZS5jb3JlLmZpbGVzeXN0ZW0sCiAgb3JnLnlvY3RvLnJlbW90ZS51 dGlscztidW5kbGUtdmVyc2lvbj0iMS4wLjAiLAotIG9yZy5lY2xpcHNlLnB0cC5yZHQudWksCi0g b3JnLmVjbGlwc2UucHRwLnJlbW90ZS51aQotRWNsaXBzZS1MYXp5U3RhcnQ6IHRydWUKKyBvcmcu ZWNsaXBzZS5yZW1vdGUuY29yZSwKKyBvcmcuZWNsaXBzZS5yZW1vdGUudWksCisgb3JnLmVjbGlw c2UucHRwLnJkdC51aQorQnVuZGxlLUFjdGl2YXRpb25Qb2xpY3k6IGxhenkKIEJ1bmRsZS1DbGFz c1BhdGg6IC4KIEltcG9ydC1QYWNrYWdlOiBvcmcuZWNsaXBzZS5wdHAuaW50ZXJuYWwucmVtb3Rl LnJzZS5jb3JlLAogIG9yZy5lY2xpcHNlLnB0cC5yZHQuY29yZS5zZXJ2aWNlcHJvdmlkZXJzLAot IG9yZy5lY2xpcHNlLnB0cC5yZHQudWksCi0gb3JnLmVjbGlwc2UucHRwLnJkdC51aS53aXphcmRz LAotIG9yZy5lY2xpcHNlLnB0cC5yZW1vdGUuY29yZSwKLSBvcmcuZWNsaXBzZS5wdHAucmVtb3Rl LmNvcmUuZXhjZXB0aW9uLAotIG9yZy5lY2xpcHNlLnB0cC5yZW1vdGUudWksCiAgb3JnLmVjbGlw c2UucnNlLmNvcmUubW9kZWwsCiAgb3JnLmVjbGlwc2UucnNlLnNlcnZpY2VzLmNsaWVudHNlcnZl ci5tZXNzYWdlcywKICBvcmcuZWNsaXBzZS5yc2Uuc2VydmljZXMuZmlsZXMsCiAgb3JnLmVjbGlw c2UucnNlLnNlcnZpY2VzLnNoZWxscworQnVuZGxlLVJlcXVpcmVkRXhlY3V0aW9uRW52aXJvbm1l bnQ6IEphdmFTRS0xLjYKZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLnlvY3RvLmJjLnVpL3NyYy9v cmcveW9jdG8vYmMvcmVtb3RlL3V0aWxzL1lvY3RvUnVubmFibGVXaXRoUHJvZ3Jlc3MuamF2YSBi L3BsdWdpbnMvb3JnLnlvY3RvLmJjLnVpL3NyYy9vcmcveW9jdG8vYmMvcmVtb3RlL3V0aWxzL1lv Y3RvUnVubmFibGVXaXRoUHJvZ3Jlc3MuamF2YQppbmRleCA5NjU0Y2IzLi5kMmJkNDg0IDEwMDY0 NAotLS0gYS9wbHVnaW5zL29yZy55b2N0by5iYy51aS9zcmMvb3JnL3lvY3RvL2JjL3JlbW90ZS91 dGlscy9Zb2N0b1J1bm5hYmxlV2l0aFByb2dyZXNzLmphdmEKKysrIGIvcGx1Z2lucy9vcmcueW9j dG8uYmMudWkvc3JjL29yZy95b2N0by9iYy9yZW1vdGUvdXRpbHMvWW9jdG9SdW5uYWJsZVdpdGhQ cm9ncmVzcy5qYXZhCkBAIC0xLDUgKzEsNSBAQAogLyoqKioqKioqKioqKioqKioqKioqKioqKioq KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioKLSAq IENvcHlyaWdodCAoYykgMjAxMyBJbnRlbCBDb3Jwb3JhdGlvbi4KKyAqIENvcHlyaWdodCAoYykg MjAxMywgMjAxNCBJbnRlbCBDb3Jwb3JhdGlvbiBhbmQgb3RoZXJzLgogICogQWxsIHJpZ2h0cyBy ZXNlcnZlZC4gVGhpcyBwcm9ncmFtIGFuZCB0aGUgYWNjb21wYW55aW5nIG1hdGVyaWFscwogICog YXJlIG1hZGUgYXZhaWxhYmxlIHVuZGVyIHRoZSB0ZXJtcyBvZiB0aGUgRWNsaXBzZSBQdWJsaWMg TGljZW5zZSB2MS4wCiAgKiB3aGljaCBhY2NvbXBhbmllcyB0aGlzIGRpc3RyaWJ1dGlvbiwgYW5k IGlzIGF2YWlsYWJsZSBhdApAQCAtNyw2ICs3LDcgQEAKICAqCiAgKiBDb250cmlidXRvcnM6CiAg KiBJb2FuYSBHcmlnb3JvcG9sKEludGVsKSAtIGluaXRpYWwgQVBJIGFuZCBpbXBsZW1lbnRhdGlv bgorICogTWFydGluIE9iZXJodWJlciAoV2luZCBSaXZlcikgLSBBZGFwdCBmb3IgRWNsaXBzZSBQ VFAvUkRUIEx1bmEuCiAgKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKi8KIHBhY2thZ2Ugb3JnLnlvY3Rv LmJjLnJlbW90ZS51dGlsczsKIApAQCAtMTksOSArMjAsOSBAQAogaW1wb3J0IG9yZy5lY2xpcHNl LmNvcmUucnVudGltZS5JUHJvZ3Jlc3NNb25pdG9yOwogaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUu cnVudGltZS5OdWxsUHJvZ3Jlc3NNb25pdG9yOwogaW1wb3J0IG9yZy5lY2xpcHNlLmpmYWNlLm9w ZXJhdGlvbi5JUnVubmFibGVXaXRoUHJvZ3Jlc3M7Ci1pbXBvcnQgb3JnLmVjbGlwc2UucHRwLnJl bW90ZS5jb3JlLklSZW1vdGVDb25uZWN0aW9uOwotaW1wb3J0IG9yZy5lY2xpcHNlLnB0cC5yZW1v dGUuY29yZS5JUmVtb3RlU2VydmljZXM7Ci1pbXBvcnQgb3JnLmVjbGlwc2UucHRwLnJlbW90ZS5j b3JlLmV4Y2VwdGlvbi5SZW1vdGVDb25uZWN0aW9uRXhjZXB0aW9uOworaW1wb3J0IG9yZy5lY2xp cHNlLnJlbW90ZS5jb3JlLklSZW1vdGVDb25uZWN0aW9uOworaW1wb3J0IG9yZy5lY2xpcHNlLnJl bW90ZS5jb3JlLklSZW1vdGVTZXJ2aWNlczsKK2ltcG9ydCBvcmcuZWNsaXBzZS5yZW1vdGUuY29y ZS5leGNlcHRpb24uUmVtb3RlQ29ubmVjdGlvbkV4Y2VwdGlvbjsKIGltcG9ydCBvcmcuZWNsaXBz ZS5yc2UuY29yZS5tb2RlbC5JSG9zdDsKIGltcG9ydCBvcmcuZWNsaXBzZS5yc2Uuc2VydmljZXMu c2hlbGxzLklIb3N0U2hlbGw7CiBpbXBvcnQgb3JnLmVjbGlwc2Uuc3d0LndpZGdldHMuRGlzcGxh eTsKZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLnlvY3RvLmJjLnVpL3NyYy9vcmcveW9jdG8vYmMv dWkvbW9kZWwvUHJvamVjdEluZm8uamF2YSBiL3BsdWdpbnMvb3JnLnlvY3RvLmJjLnVpL3NyYy9v cmcveW9jdG8vYmMvdWkvbW9kZWwvUHJvamVjdEluZm8uamF2YQppbmRleCAxMTk3ODJkLi5jY2Q5 OGExIDEwMDY0NAotLS0gYS9wbHVnaW5zL29yZy55b2N0by5iYy51aS9zcmMvb3JnL3lvY3RvL2Jj L3VpL21vZGVsL1Byb2plY3RJbmZvLmphdmEKKysrIGIvcGx1Z2lucy9vcmcueW9jdG8uYmMudWkv c3JjL29yZy95b2N0by9iYy91aS9tb2RlbC9Qcm9qZWN0SW5mby5qYXZhCkBAIC0xLDUgKzEsNSBA QAogLyoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq KioqKioqKioqKioqKioqKioqKioqKioqCi0gKiBDb3B5cmlnaHQgKGMpIDIwMTMgS2VuIEdpbG1l ciwgSW50ZWwgQ29ycG9yYXRpb24KKyAqIENvcHlyaWdodCAoYykgMjAxMywgMjAxNCBLZW4gR2ls bWVyLCBJbnRlbCBDb3Jwb3JhdGlvbiBhbmQgb3RoZXJzLgogICogQWxsIHJpZ2h0cyByZXNlcnZl ZC4gVGhpcyBwcm9ncmFtIGFuZCB0aGUgYWNjb21wYW55aW5nIG1hdGVyaWFscwogICogYXJlIG1h ZGUgYXZhaWxhYmxlIHVuZGVyIHRoZSB0ZXJtcyBvZiB0aGUgRWNsaXBzZSBQdWJsaWMgTGljZW5z ZSB2MS4wCiAgKiB3aGljaCBhY2NvbXBhbmllcyB0aGlzIGRpc3RyaWJ1dGlvbiwgYW5kIGlzIGF2 YWlsYWJsZSBhdApAQCAtOCw2ICs4LDcgQEAKICAqIENvbnRyaWJ1dG9yczoKICAqICAgICBLZW4g R2lsbWVyIC0gaW5pdGlhbCBBUEkgYW5kIGltcGxlbWVudGF0aW9uCiAgKiAgICAgSW9hbmEgR3Jp Z29yb3BvbCAoSW50ZWwpIC0gYWRhcHQgY2xhc3MgZm9yIHJlbW90ZSBzdXBwb3J0CisgKiBNYXJ0 aW4gT2Jlcmh1YmVyIChXaW5kIFJpdmVyKSAtIEFkYXB0IGZvciBFY2xpcHNlIFBUUC9SRFQgTHVu YS4KICAqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq KioqKioqKioqKioqKioqKioqKioqKioqKioqLwogcGFja2FnZSBvcmcueW9jdG8uYmMudWkubW9k ZWw7CiAKQEAgLTE2LDcgKzE3LDcgQEAKIAogaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucnVudGlt ZS5JUHJvZ3Jlc3NNb25pdG9yOwogaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucnVudGltZS5OdWxs UHJvZ3Jlc3NNb25pdG9yOwotaW1wb3J0IG9yZy5lY2xpcHNlLnB0cC5yZW1vdGUuY29yZS5JUmVt b3RlU2VydmljZXM7CitpbXBvcnQgb3JnLmVjbGlwc2UucmVtb3RlLmNvcmUuSVJlbW90ZVNlcnZp Y2VzOwogaW1wb3J0IG9yZy5lY2xpcHNlLnJzZS5jb3JlLm1vZGVsLklIb3N0OwogaW1wb3J0IG9y Zy5lY2xpcHNlLnJzZS5zZXJ2aWNlcy5maWxlcy5JRmlsZVNlcnZpY2U7CiBpbXBvcnQgb3JnLnlv Y3RvLmJjLmJpdGJha2UuUHJvamVjdEluZm9IZWxwZXI7CmRpZmYgLS1naXQgYS9wbHVnaW5zL29y Zy55b2N0by5iYy51aS9zcmMvb3JnL3lvY3RvL2JjL3VpL3dpemFyZHMvaW5zdGFsbC9CQkNSZW1v dGVQcm9qZWN0Q29udGVudHNMb2NhdGlvbkFyZWEuamF2YSBiL3BsdWdpbnMvb3JnLnlvY3RvLmJj LnVpL3NyYy9vcmcveW9jdG8vYmMvdWkvd2l6YXJkcy9pbnN0YWxsL0JCQ1JlbW90ZVByb2plY3RD b250ZW50c0xvY2F0aW9uQXJlYS5qYXZhCmluZGV4IDZkN2M0NDAuLjRjOGRmMGEgMTAwNjQ0Ci0t LSBhL3BsdWdpbnMvb3JnLnlvY3RvLmJjLnVpL3NyYy9vcmcveW9jdG8vYmMvdWkvd2l6YXJkcy9p bnN0YWxsL0JCQ1JlbW90ZVByb2plY3RDb250ZW50c0xvY2F0aW9uQXJlYS5qYXZhCisrKyBiL3Bs dWdpbnMvb3JnLnlvY3RvLmJjLnVpL3NyYy9vcmcveW9jdG8vYmMvdWkvd2l6YXJkcy9pbnN0YWxs L0JCQ1JlbW90ZVByb2plY3RDb250ZW50c0xvY2F0aW9uQXJlYS5qYXZhCkBAIC0xLDUgKzEsNSBA QAogLyoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq KioqKioqKioqKioqKioqKioqKioqKioqKioKLSAqIENvcHlyaWdodCAoYykgMjAxMyBJbnRlbCBD b3Jwb3JhdGlvbiBhbmQgb3RoZXJzLgorICogQ29weXJpZ2h0IChjKSAyMDEzLCAyMDE0IEludGVs IENvcnBvcmF0aW9uIGFuZCBvdGhlcnMuCiAgKiBBbGwgcmlnaHRzIHJlc2VydmVkLiBUaGlzIHBy b2dyYW0gYW5kIHRoZSBhY2NvbXBhbnlpbmcgbWF0ZXJpYWxzCiAgKiBhcmUgbWFkZSBhdmFpbGFi bGUgdW5kZXIgdGhlIHRlcm1zIG9mIHRoZSBFY2xpcHNlIFB1YmxpYyBMaWNlbnNlIHYxLjAKICAq IHdoaWNoIGFjY29tcGFuaWVzIHRoaXMgZGlzdHJpYnV0aW9uLCBhbmQgaXMgYXZhaWxhYmxlIGF0 CkBAIC03LDMzICs3LDkgQEAKICAqCiAgKiBDb250cmlidXRvcnM6CiAgKiBJbnRlbCAtIEluaXRp YWwgQVBJIGFuZCBpbXBsZW1lbnRhdGlvbgorICogTWFydGluIE9iZXJodWJlciAoV2luZCBSaXZl cikgLSBBZGFwdCBmb3IgRWNsaXBzZSBQVFAvUkRUIEx1bmEuCiAgKioqKioqKioqKioqKioqKioq KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq KioqKi8KIHBhY2thZ2Ugb3JnLnlvY3RvLmJjLnVpLndpemFyZHMuaW5zdGFsbDsKLQotaW1wb3J0 IGphdmEubmV0LlVSSTsKLQotaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUuZmlsZXN5c3RlbS5VUklV dGlsOwotaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucmVzb3VyY2VzLklQcm9qZWN0OwotaW1wb3J0 IG9yZy5lY2xpcHNlLmNvcmUucnVudGltZS5QYXRoOwotaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUu cnVudGltZS5QbGF0Zm9ybTsKLWltcG9ydCBvcmcuZWNsaXBzZS5qZmFjZS5vcGVyYXRpb24uSVJ1 bm5hYmxlQ29udGV4dDsKLWltcG9ydCBvcmcuZWNsaXBzZS5wdHAucmR0LnVpLndpemFyZHMuUmVt b3RlUHJvamVjdENvbnRlbnRzTG9jYXRpb25BcmVhOwotaW1wb3J0IG9yZy5lY2xpcHNlLnB0cC5y ZW1vdGUuY29yZS5JUmVtb3RlRmlsZU1hbmFnZXI7Ci1pbXBvcnQgb3JnLmVjbGlwc2Uuc3d0LlNX VDsKLWltcG9ydCBvcmcuZWNsaXBzZS5zd3QuZXZlbnRzLk1vZGlmeUV2ZW50OwotaW1wb3J0IG9y Zy5lY2xpcHNlLnN3dC5ldmVudHMuTW9kaWZ5TGlzdGVuZXI7Ci1pbXBvcnQgb3JnLmVjbGlwc2Uu c3d0LmV2ZW50cy5TZWxlY3Rpb25BZGFwdGVyOwotaW1wb3J0IG9yZy5lY2xpcHNlLnN3dC5ldmVu dHMuU2VsZWN0aW9uRXZlbnQ7Ci1pbXBvcnQgb3JnLmVjbGlwc2Uuc3d0LmxheW91dC5HcmlkRGF0 YTsKLWltcG9ydCBvcmcuZWNsaXBzZS5zd3QubGF5b3V0LkdyaWRMYXlvdXQ7Ci1pbXBvcnQgb3Jn LmVjbGlwc2Uuc3d0LndpZGdldHMuQnV0dG9uOwotaW1wb3J0IG9yZy5lY2xpcHNlLnN3dC53aWRn ZXRzLkNvbXBvc2l0ZTsKLWltcG9ydCBvcmcuZWNsaXBzZS5zd3Qud2lkZ2V0cy5Db250cm9sOwot aW1wb3J0IG9yZy5lY2xpcHNlLnN3dC53aWRnZXRzLkdyb3VwOwotaW1wb3J0IG9yZy5lY2xpcHNl LnN3dC53aWRnZXRzLkxhYmVsOwotaW1wb3J0IG9yZy5lY2xpcHNlLnN3dC53aWRnZXRzLlRleHQ7 Ci1pbXBvcnQgb3JnLmVjbGlwc2UudWkuaW50ZXJuYWwuaWRlLklERVdvcmtiZW5jaE1lc3NhZ2Vz OwotaW1wb3J0IG9yZy5lY2xpcHNlLnVpLmludGVybmFsLmlkZS5kaWFsb2dzLklERVJlc291cmNl SW5mb1V0aWxzOwogCiBpbXBvcnQgamF2YS5uZXQuVVJJOwogCkBAIC00NSwxNSArMjEsMTUgQEAK IGltcG9ydCBvcmcuZWNsaXBzZS5wdHAucmR0LnVpLm1lc3NhZ2VzLk1lc3NhZ2VzOwogLy9pbXBv cnQgb3JnLmVjbGlwc2UucHRwLnJkdC51aS5zZXJ2aWNlcHJvdmlkZXJzLlJlbW90ZUJ1aWxkU2Vy dmljZVByb3ZpZGVyOwogLy9pbXBvcnQgb3JnLmVjbGlwc2UucHRwLnJkdC5jb3JlLnNlcnZpY2Vw cm92aWRlcnMuCi1pbXBvcnQgb3JnLmVjbGlwc2UucHRwLnJlbW90ZS5jb3JlLklSZW1vdGVDb25u ZWN0aW9uOwotaW1wb3J0IG9yZy5lY2xpcHNlLnB0cC5yZW1vdGUuY29yZS5JUmVtb3RlRmlsZU1h bmFnZXI7Ci1pbXBvcnQgb3JnLmVjbGlwc2UucHRwLnJlbW90ZS5jb3JlLklSZW1vdGVTZXJ2aWNl czsKLWltcG9ydCBvcmcuZWNsaXBzZS5wdHAucmVtb3RlLnVpLklSZW1vdGVVSUNvbm5lY3Rpb25N YW5hZ2VyOwotaW1wb3J0IG9yZy5lY2xpcHNlLnB0cC5yZW1vdGUudWkuSVJlbW90ZVVJQ29uc3Rh bnRzOwotaW1wb3J0IG9yZy5lY2xpcHNlLnB0cC5yZW1vdGUudWkuSVJlbW90ZVVJRmlsZU1hbmFn ZXI7Ci1pbXBvcnQgb3JnLmVjbGlwc2UucHRwLnJlbW90ZS51aS5JUmVtb3RlVUlTZXJ2aWNlczsK LWltcG9ydCBvcmcuZWNsaXBzZS5wdHAucmVtb3RlLnVpLlJlbW90ZVVJU2VydmljZXM7Ci1pbXBv cnQgb3JnLmVjbGlwc2UucHRwLnJlbW90ZS51aS53aWRnZXRzLlJlbW90ZUNvbm5lY3Rpb25XaWRn ZXQ7CitpbXBvcnQgb3JnLmVjbGlwc2UucmVtb3RlLmNvcmUuSVJlbW90ZUNvbm5lY3Rpb247Citp bXBvcnQgb3JnLmVjbGlwc2UucmVtb3RlLmNvcmUuSVJlbW90ZUZpbGVNYW5hZ2VyOworaW1wb3J0 IG9yZy5lY2xpcHNlLnJlbW90ZS5jb3JlLklSZW1vdGVTZXJ2aWNlczsKK2ltcG9ydCBvcmcuZWNs aXBzZS5yZW1vdGUudWkuSVJlbW90ZVVJQ29ubmVjdGlvbk1hbmFnZXI7CitpbXBvcnQgb3JnLmVj bGlwc2UucmVtb3RlLnVpLklSZW1vdGVVSUNvbnN0YW50czsKK2ltcG9ydCBvcmcuZWNsaXBzZS5y ZW1vdGUudWkuSVJlbW90ZVVJRmlsZU1hbmFnZXI7CitpbXBvcnQgb3JnLmVjbGlwc2UucmVtb3Rl LnVpLklSZW1vdGVVSVNlcnZpY2VzOworaW1wb3J0IG9yZy5lY2xpcHNlLnJlbW90ZS51aS5SZW1v dGVVSVNlcnZpY2VzOworaW1wb3J0IG9yZy5lY2xpcHNlLnJlbW90ZS51aS53aWRnZXRzLlJlbW90 ZUNvbm5lY3Rpb25XaWRnZXQ7CiBpbXBvcnQgb3JnLmVjbGlwc2Uuc3d0LlNXVDsKIGltcG9ydCBv cmcuZWNsaXBzZS5zd3QuZXZlbnRzLk1vZGlmeUV2ZW50OwogaW1wb3J0IG9yZy5lY2xpcHNlLnN3 dC5ldmVudHMuTW9kaWZ5TGlzdGVuZXI7CkBAIC0xOTIsNyArMTY4LDcgQEAKIAlwdWJsaWMgVVJJ IGdldFByb2plY3RMb2NhdGlvblVSSSgpIHsKIAkJaWYgKGZTZWxlY3RlZENvbm5lY3Rpb24gPT0g bnVsbCkKIAkJCXJldHVybiBudWxsOwotCQlyZXR1cm4gZlNlbGVjdGVkQ29ubmVjdGlvbi5nZXRS ZW1vdGVTZXJ2aWNlcygpLmdldEZpbGVNYW5hZ2VyKGZTZWxlY3RlZENvbm5lY3Rpb24pLnRvVVJJ KGZMb2NhdGlvblRleHQuZ2V0VGV4dCgpKTsKKwkJcmV0dXJuIGZTZWxlY3RlZENvbm5lY3Rpb24u Z2V0RmlsZU1hbmFnZXIoKS50b1VSSShmTG9jYXRpb25UZXh0LmdldFRleHQoKSk7CiAJfQogCiAJ cHVibGljIElSZW1vdGVDb25uZWN0aW9uIGdldFJlbW90ZUNvbm5lY3Rpb24oKSB7CkBAIC0yNjIs NyArMjM4LDcgQEAKIAkgKi8KIAlwcml2YXRlIFN0cmluZyBnZXREZWZhdWx0UGF0aERpc3BsYXlT dHJpbmcoKSB7CiAJCWlmIChnZXRSZW1vdGVDb25uZWN0aW9uKCkgIT0gbnVsbCAmJiBnZXRSZW1v dGVDb25uZWN0aW9uKCkuaXNPcGVuKCkpIHsKLQkJCUlSZW1vdGVGaWxlTWFuYWdlciBmaWxlTWdy ID0gZlNlbGVjdGVkQ29ubmVjdGlvbi5nZXRSZW1vdGVTZXJ2aWNlcygpLmdldEZpbGVNYW5hZ2Vy KGdldFJlbW90ZUNvbm5lY3Rpb24oKSk7CisJCQlJUmVtb3RlRmlsZU1hbmFnZXIgZmlsZU1nciA9 IGdldFJlbW90ZUNvbm5lY3Rpb24oKS5nZXRGaWxlTWFuYWdlcigpOwogCQkJVVJJIGRlZmF1bHRV UkkgPSBmaWxlTWdyLnRvVVJJKGdldFJlbW90ZUNvbm5lY3Rpb24oKS5nZXRXb3JraW5nRGlyZWN0 b3J5KCkpOwogCiAJCQkvLyBIYW5kbGUgZmlsZXMgc3BlY2lhbGx5LiBBc3N1bWUgYSBmaWxlIGlm IHRoZXJlIGlzIG5vIHByb2plY3QgdG8KZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLnlvY3RvLmJj LnVpL3NyYy9vcmcveW9jdG8vYmMvdWkvd2l6YXJkcy9pbnN0YWxsL0luc3RhbGxXaXphcmQuamF2 YSBiL3BsdWdpbnMvb3JnLnlvY3RvLmJjLnVpL3NyYy9vcmcveW9jdG8vYmMvdWkvd2l6YXJkcy9p bnN0YWxsL0luc3RhbGxXaXphcmQuamF2YQppbmRleCBmNjQ0MDFjLi4yYzE3YzNlIDEwMDY0NAot LS0gYS9wbHVnaW5zL29yZy55b2N0by5iYy51aS9zcmMvb3JnL3lvY3RvL2JjL3VpL3dpemFyZHMv aW5zdGFsbC9JbnN0YWxsV2l6YXJkLmphdmEKKysrIGIvcGx1Z2lucy9vcmcueW9jdG8uYmMudWkv c3JjL29yZy95b2N0by9iYy91aS93aXphcmRzL2luc3RhbGwvSW5zdGFsbFdpemFyZC5qYXZhCkBA IC0xLDUgKzEsNSBAQAogLyoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioKLSAqIENvcHlyaWdodCAoYykg MjAxMyBJbnRlbCBDb3Jwb3JhdGlvbi4KKyAqIENvcHlyaWdodCAoYykgMjAxMywgMjAxNCBJbnRl bCBDb3Jwb3JhdGlvbiBhbmQgb3RoZXJzLgogICogQWxsIHJpZ2h0cyByZXNlcnZlZC4gVGhpcyBw cm9ncmFtIGFuZCB0aGUgYWNjb21wYW55aW5nIG1hdGVyaWFscwogICogYXJlIG1hZGUgYXZhaWxh YmxlIHVuZGVyIHRoZSB0ZXJtcyBvZiB0aGUgRWNsaXBzZSBQdWJsaWMgTGljZW5zZSB2MS4wCiAg KiB3aGljaCBhY2NvbXBhbmllcyB0aGlzIGRpc3RyaWJ1dGlvbiwgYW5kIGlzIGF2YWlsYWJsZSBh dApAQCAtOCw0MyArOCwyNyBAQAogICogQ29udHJpYnV0b3JzOgogICogSW50ZWwgLSBpbml0aWFs IEFQSSBhbmQgaW1wbGVtZW50YXRpb24KICAqIElvYW5hIEdyaWdvcm9wb2wgKEludGVsKSAtIGFk YXB0IGNsYXNzIGZvciByZW1vdGUgc3VwcG9ydAorICogTWFydGluIE9iZXJodWJlciAoV2luZCBS aXZlcikgLSBBZGFwdCBmb3IgRWNsaXBzZSBQVFAvUkRUIEx1bmEuCiAgKioqKioqKioqKioqKioq KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq KioqKioqKi8KIHBhY2thZ2Ugb3JnLnlvY3RvLmJjLnVpLndpemFyZHMuaW5zdGFsbDsKIAotaW1w b3J0IGphdmEuaW8uQnVmZmVyZWRSZWFkZXI7Ci1pbXBvcnQgamF2YS5pby5GaWxlOwotaW1wb3J0 IGphdmEuaW8uSU9FeGNlcHRpb247Ci1pbXBvcnQgamF2YS5pby5JbnB1dFN0cmVhbVJlYWRlcjsK LWltcG9ydCBqYXZhLmlvLldyaXRlcjsKIGltcG9ydCBqYXZhLmxhbmcucmVmbGVjdC5JbnZvY2F0 aW9uVGFyZ2V0RXhjZXB0aW9uOwogaW1wb3J0IGphdmEubmV0LlVSSTsKIGltcG9ydCBqYXZhLnV0 aWwuSGFzaHRhYmxlOwogaW1wb3J0IGphdmEudXRpbC5NYXA7Ci1pbXBvcnQgamF2YS51dGlsLnJl Z2V4Lk1hdGNoZXI7Ci1pbXBvcnQgamF2YS51dGlsLnJlZ2V4LlBhdHRlcm47CiAKLWltcG9ydCBv cmcuZWNsaXBzZS5jb3JlLnJ1bnRpbWUuSVByb2dyZXNzTW9uaXRvcjsKIGltcG9ydCBvcmcuZWNs aXBzZS5jb3JlLnJ1bnRpbWUuSVN0YXR1czsKIGltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJ1bnRp bWUuU3RhdHVzOwotaW1wb3J0IG9yZy5lY2xpcHNlLmpmYWNlLm9wZXJhdGlvbi5JUnVubmFibGVX aXRoUHJvZ3Jlc3M7CiBpbXBvcnQgb3JnLmVjbGlwc2UuamZhY2Uudmlld2Vycy5JU3RydWN0dXJl ZFNlbGVjdGlvbjsKIGltcG9ydCBvcmcuZWNsaXBzZS5qZmFjZS53aXphcmQuSVdpemFyZENvbnRh aW5lcjsKIGltcG9ydCBvcmcuZWNsaXBzZS5qZmFjZS53aXphcmQuV2l6YXJkUGFnZTsKLWltcG9y dCBvcmcuZWNsaXBzZS5wdHAucmVtb3RlLmNvcmUuSVJlbW90ZUNvbm5lY3Rpb247Ci1pbXBvcnQg b3JnLmVjbGlwc2UucHRwLnJlbW90ZS5jb3JlLklSZW1vdGVTZXJ2aWNlczsKK2ltcG9ydCBvcmcu ZWNsaXBzZS5yZW1vdGUuY29yZS5JUmVtb3RlQ29ubmVjdGlvbjsKK2ltcG9ydCBvcmcuZWNsaXBz ZS5yZW1vdGUuY29yZS5JUmVtb3RlU2VydmljZXM7CiBpbXBvcnQgb3JnLmVjbGlwc2UucnNlLmNv cmUubW9kZWwuSUhvc3Q7CiBpbXBvcnQgb3JnLmVjbGlwc2UudWkuSVdvcmtiZW5jaDsKLWltcG9y dCBvcmcuZWNsaXBzZS51aS5JV29ya2JlbmNoUGFnZTsKLWltcG9ydCBvcmcuZWNsaXBzZS51aS5J V29ya2JlbmNoV2luZG93OwogaW1wb3J0IG9yZy5lY2xpcHNlLnVpLklXb3JrYmVuY2hXaXphcmQ7 Ci1pbXBvcnQgb3JnLmVjbGlwc2UudWkuUGxhdGZvcm1VSTsKLWltcG9ydCBvcmcuZWNsaXBzZS51 aS5jb25zb2xlLkNvbnNvbGVQbHVnaW47Ci1pbXBvcnQgb3JnLmVjbGlwc2UudWkuY29uc29sZS5J Q29uc29sZTsKLWltcG9ydCBvcmcuZWNsaXBzZS51aS5jb25zb2xlLklDb25zb2xlQ29uc3RhbnRz OwotaW1wb3J0IG9yZy5lY2xpcHNlLnVpLmNvbnNvbGUuSUNvbnNvbGVNYW5hZ2VyOwotaW1wb3J0 IG9yZy5lY2xpcHNlLnVpLmNvbnNvbGUuSUNvbnNvbGVWaWV3OwogaW1wb3J0IG9yZy5lY2xpcHNl LnVpLmNvbnNvbGUuTWVzc2FnZUNvbnNvbGU7Ci1pbXBvcnQgb3JnLmVjbGlwc2UudWkuY29uc29s ZS5NZXNzYWdlQ29uc29sZVN0cmVhbTsKK2ltcG9ydCBvcmcueW9jdG8uYmMucmVtb3RlLnV0aWxz LkNvbnNvbGVXcml0ZXI7CiBpbXBvcnQgb3JnLnlvY3RvLmJjLnJlbW90ZS51dGlscy5Zb2N0b1J1 bm5hYmxlV2l0aFByb2dyZXNzOwogaW1wb3J0IG9yZy55b2N0by5iYy51aS5BY3RpdmF0b3I7CiBp bXBvcnQgb3JnLnlvY3RvLmJjLnVpLm1vZGVsLlByb2plY3RJbmZvOwpAQCAtNTIsMTAgKzM2LDgg QEAKIGltcG9ydCBvcmcueW9jdG8uYmMudWkud2l6YXJkcy5uZXdwcm9qZWN0LkJCQ29uZmlndXJh dGlvbkluaXRpYWxpemVPcGVyYXRpb247CiBpbXBvcnQgb3JnLnlvY3RvLmJjLnVpLndpemFyZHMu bmV3cHJvamVjdC5DcmVhdGVCQkNQcm9qZWN0T3BlcmF0aW9uOwogaW1wb3J0IG9yZy55b2N0by5y ZW1vdGUudXRpbHMuQ29tbWFuZFJlc3BvbnNlSGFuZGxlcjsKLWltcG9ydCBvcmcueW9jdG8ucmVt b3RlLnV0aWxzLklDb21tYW5kUmVzcG9uc2VIYW5kbGVyOwogaW1wb3J0IG9yZy55b2N0by5yZW1v dGUudXRpbHMuUmVtb3RlSGVscGVyOwogaW1wb3J0IG9yZy55b2N0by5yZW1vdGUudXRpbHMuWW9j dG9Db21tYW5kOwotaW1wb3J0IG9yZy55b2N0by5iYy5yZW1vdGUudXRpbHMuQ29uc29sZVdyaXRl cjsKIAogLyoqCiAgKiBBIHdpemFyZCBmb3IgaW5zdGFsbGluZyBhIGZyZXNoIGNvcHkgb2YgYW4g T0Ugc3lzdGVtLgpAQCAtODYsMTIgKzY4LDEyIEBACiAJcHJvdGVjdGVkIHN0YXRpYyBmaW5hbCBT dHJpbmcgR0lUX0NMT05FID0gIkdpdCBDbG9uZSI7CiAJcHVibGljIHN0YXRpYyBmaW5hbCBTdHJp bmcgVkFMSURBVElPTl9GSUxFID0gREVGQVVMVF9JTklUX1NDUklQVDsKIAotCXByaXZhdGUgTWFw IG1vZGVsOworCXByaXZhdGUgTWFwPFN0cmluZyxPYmplY3Q+IG1vZGVsOwogCXByaXZhdGUgTWVz c2FnZUNvbnNvbGUgbXlDb25zb2xlOwogCXByaXZhdGUgT3B0aW9uc1BhZ2Ugb3B0aW9uc1BhZ2U7 CiAKIAlwdWJsaWMgSW5zdGFsbFdpemFyZCgpIHsKLQkJdGhpcy5tb2RlbCA9IG5ldyBIYXNodGFi bGUoKTsKKwkJdGhpcy5tb2RlbCA9IG5ldyBIYXNodGFibGU8U3RyaW5nLE9iamVjdD4oKTsKIAkJ bW9kZWwucHV0KElOU1RBTExfRElSRUNUT1JZLCBERUZBVUxUX0lOU1RBTExfRElSKTsKIAkJbW9k ZWwucHV0KElOSVRfU0NSSVBULCBERUZBVUxUX0lOSVRfU0NSSVBUKTsKIAkJCkBAIC0xMDIsNyAr ODQsNyBAQAogCiAKIAlwdWJsaWMgSW5zdGFsbFdpemFyZChJU3RydWN0dXJlZFNlbGVjdGlvbiBz ZWxlY3Rpb24pIHsKLQkJbW9kZWwgPSBuZXcgSGFzaHRhYmxlKCk7CisJCW1vZGVsID0gbmV3IEhh c2h0YWJsZTxTdHJpbmcsT2JqZWN0PigpOwogCX0KIAogCS8qCkBAIC0xMjcsNyArMTA5LDcgQEAK IAl9CiAKIAlAT3ZlcnJpZGUKLQlwdWJsaWMgTWFwIGdldE1vZGVsKCkgeworCXB1YmxpYyBNYXA8 U3RyaW5nLE9iamVjdD4gZ2V0TW9kZWwoKSB7CiAJCXJldHVybiBtb2RlbDsKIAl9CiAKZGlmZiAt LWdpdCBhL3BsdWdpbnMvb3JnLnlvY3RvLmJjLnVpL3NyYy9vcmcveW9jdG8vYmMvdWkvd2l6YXJk cy9pbnN0YWxsL09wdGlvbnNQYWdlLmphdmEgYi9wbHVnaW5zL29yZy55b2N0by5iYy51aS9zcmMv b3JnL3lvY3RvL2JjL3VpL3dpemFyZHMvaW5zdGFsbC9PcHRpb25zUGFnZS5qYXZhCmluZGV4IDc1 ZDlmOTkuLjdmMWEyZDAgMTAwNjQ0Ci0tLSBhL3BsdWdpbnMvb3JnLnlvY3RvLmJjLnVpL3NyYy9v cmcveW9jdG8vYmMvdWkvd2l6YXJkcy9pbnN0YWxsL09wdGlvbnNQYWdlLmphdmEKKysrIGIvcGx1 Z2lucy9vcmcueW9jdG8uYmMudWkvc3JjL29yZy95b2N0by9iYy91aS93aXphcmRzL2luc3RhbGwv T3B0aW9uc1BhZ2UuamF2YQpAQCAtMSw1ICsxLDUgQEAKIC8qKioqKioqKioqKioqKioqKioqKioq KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq Ci0gKiBDb3B5cmlnaHQgKGMpIDIwMTMgSW50ZWwgQ29ycG9yYXRpb24uCisgKiBDb3B5cmlnaHQg KGMpIDIwMTMsIDIwMTQgSW50ZWwgQ29ycG9yYXRpb24gYW5kIG90aGVycy4KICAqIEFsbCByaWdo dHMgcmVzZXJ2ZWQuIFRoaXMgcHJvZ3JhbSBhbmQgdGhlIGFjY29tcGFueWluZyBtYXRlcmlhbHMK ICAqIGFyZSBtYWRlIGF2YWlsYWJsZSB1bmRlciB0aGUgdGVybXMgb2YgdGhlIEVjbGlwc2UgUHVi bGljIExpY2Vuc2UgdjEuMAogICogd2hpY2ggYWNjb21wYW5pZXMgdGhpcyBkaXN0cmlidXRpb24s IGFuZCBpcyBhdmFpbGFibGUgYXQKQEAgLTgsNTMgKzgsMzggQEAKICAqIENvbnRyaWJ1dG9yczoK ICAqIEludGVsIC0gaW5pdGlhbCBBUEkgYW5kIGltcGxlbWVudGF0aW9uCiAgKiBJb2FuYSBHcmln b3JvcG9sIChJbnRlbCkgLSBhZGFwdCBjbGFzcyBmb3IgcmVtb3RlIHN1cHBvcnQKKyAqIE1hcnRp biBPYmVyaHViZXIgKFdpbmQgUml2ZXIpIC0gQWRhcHQgZm9yIEVjbGlwc2UgUFRQL1JEVCBMdW5h LgogICoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq KioqKioqKioqKioqKioqKioqKioqKioqKiovCiBwYWNrYWdlIG9yZy55b2N0by5iYy51aS53aXph cmRzLmluc3RhbGw7CiAKLWltcG9ydCBqYXZhLmlvLklPRXhjZXB0aW9uOwogaW1wb3J0IGphdmEu aW8uRmlsZTsKIGltcG9ydCBqYXZhLm5ldC5VUkk7CiBpbXBvcnQgamF2YS5uZXQuVVJJU3ludGF4 RXhjZXB0aW9uOwotaW1wb3J0IGphdmEudXRpbC5BcnJheUxpc3Q7Ci1pbXBvcnQgamF2YS51dGls Lkhhc2h0YWJsZTsKLWltcG9ydCBqYXZhLnV0aWwuSXRlcmF0b3I7Ci1pbXBvcnQgamF2YS51dGls Lkxpc3Q7CiBpbXBvcnQgamF2YS51dGlsLk1hcDsKIGltcG9ydCBqYXZhLnV0aWwucmVnZXguTWF0 Y2hlcjsKIGltcG9ydCBqYXZhLnV0aWwucmVnZXguUGF0dGVybjsKIAogaW1wb3J0IG9yZy5lY2xp cHNlLmNvcmUucmVzb3VyY2VzLklQcm9qZWN0OwotaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucmVz b3VyY2VzLklQcm9qZWN0RGVzY3JpcHRpb247CiBpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5yZXNv dXJjZXMuSVJlc291cmNlOwogaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucmVzb3VyY2VzLklXb3Jr c3BhY2VSb290OwogaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucmVzb3VyY2VzLlJlc291cmNlc1Bs dWdpbjsKLWltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJ1bnRpbWUuQ29yZUV4Y2VwdGlvbjsKIGlt cG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJ1bnRpbWUuSVN0YXR1czsKIGltcG9ydCBvcmcuZWNsaXBz ZS5jb3JlLnJ1bnRpbWUuTnVsbFByb2dyZXNzTW9uaXRvcjsKK2ltcG9ydCBvcmcuZWNsaXBzZS5w dHAuaW50ZXJuYWwucmVtb3RlLnJzZS5jb3JlLlJTRUNvbm5lY3Rpb247CiBpbXBvcnQgb3JnLmVj bGlwc2UucHRwLnJkdC51aS53aXphcmRzLlJlbW90ZVByb2plY3RDb250ZW50c0xvY2F0aW9uQXJl YTsKIGltcG9ydCBvcmcuZWNsaXBzZS5wdHAucmR0LnVpLndpemFyZHMuUmVtb3RlUHJvamVjdENv bnRlbnRzTG9jYXRpb25BcmVhLklFcnJvck1lc3NhZ2VSZXBvcnRlcjsKLWltcG9ydCBvcmcuZWNs aXBzZS5wdHAucmVtb3RlLmNvcmUuSVJlbW90ZUNvbm5lY3Rpb247Ci1pbXBvcnQgb3JnLmVjbGlw c2UucHRwLmludGVybmFsLnJlbW90ZS5yc2UuY29yZS5SU0VDb25uZWN0aW9uOworaW1wb3J0IG9y Zy5lY2xpcHNlLnJlbW90ZS5jb3JlLklSZW1vdGVDb25uZWN0aW9uOwogaW1wb3J0IG9yZy5lY2xp cHNlLnJzZS5jb3JlLm1vZGVsLklIb3N0OwogaW1wb3J0IG9yZy5lY2xpcHNlLnJzZS5zZXJ2aWNl cy5maWxlcy5JRmlsZVNlcnZpY2U7CiBpbXBvcnQgb3JnLmVjbGlwc2UucnNlLnNlcnZpY2VzLmZp bGVzLklIb3N0RmlsZTsKIGltcG9ydCBvcmcuZWNsaXBzZS5zd3QuU1dUOwotaW1wb3J0IG9yZy5l Y2xpcHNlLnN3dC5ldmVudHMuU2VsZWN0aW9uQWRhcHRlcjsKLWltcG9ydCBvcmcuZWNsaXBzZS5z d3QuZXZlbnRzLlNlbGVjdGlvbkV2ZW50OwogaW1wb3J0IG9yZy5lY2xpcHNlLnN3dC5sYXlvdXQu R3JpZERhdGE7CiBpbXBvcnQgb3JnLmVjbGlwc2Uuc3d0LmxheW91dC5HcmlkTGF5b3V0OwogaW1w b3J0IG9yZy5lY2xpcHNlLnN3dC53aWRnZXRzLkJ1dHRvbjsKIGltcG9ydCBvcmcuZWNsaXBzZS5z d3Qud2lkZ2V0cy5Db21wb3NpdGU7Ci1pbXBvcnQgb3JnLmVjbGlwc2Uuc3d0LndpZGdldHMuQ29u dHJvbDsKLWltcG9ydCBvcmcuZWNsaXBzZS5zd3Qud2lkZ2V0cy5EaXJlY3RvcnlEaWFsb2c7Ci1p bXBvcnQgb3JnLmVjbGlwc2Uuc3d0LndpZGdldHMuRmlsZURpYWxvZzsKIGltcG9ydCBvcmcuZWNs aXBzZS5zd3Qud2lkZ2V0cy5MYWJlbDsKIGltcG9ydCBvcmcuZWNsaXBzZS5zd3Qud2lkZ2V0cy5U ZXh0OwotaW1wb3J0IG9yZy5lY2xpcHNlLnVpLlBsYXRmb3JtVUk7Ci0KLWltcG9ydCBvcmcueW9j dG8uYmMudWkud2l6YXJkcy5GaW5pdGVTdGF0ZVdpemFyZDsKIGltcG9ydCBvcmcueW9jdG8uYmMu dWkud2l6YXJkcy5GaW5pdGVTdGF0ZVdpemFyZFBhZ2U7Ci1pbXBvcnQgb3JnLnlvY3RvLmJjLnVp LndpemFyZHMuRmluaXRlU3RhdGVXaXphcmRQYWdlLlZhbGlkYXRpb25MaXN0ZW5lcjsKIGltcG9y dCBvcmcueW9jdG8ucmVtb3RlLnV0aWxzLlJlbW90ZUhlbHBlcjsKIAogLyoq