81008 2005-02-06 11:05 0000 xml-commons-1.0-beta2-r1 (for Java 1.5) 2005-02-06 11:49:53 0000 1 1 1 Unclassified Gentoo Linux Development unspecified All Linux RESOLVED FIXED P2 enhancement --- 1 egore@gmx.de java@gentoo.org egore@gmx.de 2005-02-06 11:05:43 0000 I ran into some issues with compiling xml-commons with java 1.5. So I made the same changes that have been done to xml-commons-resolver (see bug #78352 for details). Reproducible: Always Steps to Reproduce: 1. 2. 3. egore@gmx.de 2005-02-06 11:06:37 0000 Created an attachment (id=50548) dev-java/xml-commons-1.0_beta2-r1 The ebuild (only adds an epatch) egore@gmx.de 2005-02-06 11:07:29 0000 Created an attachment (id=50549) xml-commons-java-1.5.patch The necessary patch (does not break downwards compatibility from what I can tell) luckyduck@gentoo.org 2005-02-06 11:49:53 0000 it's much easier to patch the buildfile and add source and target attributes to the javac nodes. i've done this, thanks a lot for your effort. 50548 2005-02-06 11:06 0000 dev-java/xml-commons-1.0_beta2-r1 xml-commons-1.0_beta2-r1.ebuild text/plain IyBDb3B5cmlnaHQgMTk5OS0yMDA1IEdlbnRvbyBGb3VuZGF0aW9uCiMgRGlzdHJpYnV0ZWQgdW5k ZXIgdGhlIHRlcm1zIG9mIHRoZSBHTlUgR2VuZXJhbCBQdWJsaWMgTGljZW5zZSB2MgojICRIZWFk ZXI6IC92YXIvY3Zzcm9vdC9nZW50b28teDg2L2Rldi1qYXZhL3htbC1jb21tb25zL3htbC1jb21t b25zLTEuMF9iZXRhMi5lYnVpbGQsdiAxLjQgMjAwNS8wMS8xNSAxOTowMzoxNiBjb21wbmVyZCBF eHAgJAoKaW5oZXJpdCBqYXZhLXBrZyBldXRpbHMKCkRFU0NSSVBUSU9OPSJKYWthcnRhIHByb2pl Y3QgZm9yIGZvciBYTUwgYmluZGluZ3MgZm9yIGphdmEiCkhPTUVQQUdFPSJodHRwOi8veG1sLmFw YWNoZS5vcmcvY29tbW9ucy8iClNSQ19VUkk9Im1pcnJvcjovL2FwYWNoZS94bWwvY29tbW9ucy94 bWwtY29tbW9ucy0xLjAuYjIudGFyLmd6IgpMSUNFTlNFPSJBcGFjaGUtMS4xIgpTTE9UPSIwIgpL RVlXT1JEUz0ifng4NiB+YW1kNjQiCklVU0U9ImRvYyBqaWtlcyIKCkRFUEVORD0iPj12aXJ0dWFs L2pkay0xLjQKCWRldi1qYXZhL2FudC1jb3JlCglqaWtlcz8gKCA+PWRldi1qYXZhL2ppa2VzLTEu MjEgKSIKUkRFUEVORD0iPj12aXJ0dWFsL2pyZS0xLjQiCgpTPSR7V09SS0RJUn0veG1sLWNvbW1v bnMtMS4wLmIyCgpzcmNfdW5wYWNrKCkgewoJdW5wYWNrICR7QX0KCWNkICR7U30KCWVwYXRjaCAk e0ZJTEVTRElSfS8ke1BOfS1qYXZhLTEuNS5wYXRjaCB8fCBkaWUgIkphdmEgMS41IGNvbXBhdGli bGl0eSBwYXRjaCBmYWlsZWQiCn0KCnNyY19jb21waWxlKCkgewoJbG9jYWwgYW50ZmxhZ3M9Imph ciIKCgl1c2UgamlrZXMgJiYgYW50ZmxhZ3M9IiR7YW50ZmxhZ3N9IC1EYnVpbGQuY29tcGlsZXI9 amlrZXMiCgl1c2UgZG9jICYmIGFudGZsYWdzPSIke2FudGZsYWdzfSBqYXZhZG9jcyIKCgljZCAk e1N9L2phdmEKCWFudCAtZiByZXNvbHZlci54bWwgJHthbnRmbGFnc30gfHwgZGllICJYTUwtUmVz b2x2ZXIgQ29tcGlsZSBmYWlsZWQiCglhbnQgLWYgd2hpY2gueG1sICR7YW50ZmxhZ3N9IHx8IGRp ZSAiWE1MLVdoaWNoIENvbXBpbGUgZmFpbGVkIgp9CgpzcmNfaW5zdGFsbCgpIHsKCWphdmEtcGtn X2RvamFyIGphdmEvYnVpbGQvd2hpY2guamFyCglqYXZhLXBrZ19kb2phciBqYXZhL2J1aWxkL3Jl c29sdmVyLmphcgoJamF2YS1wa2dfZG9qYXIgamF2YS9leHRlcm5hbC9idWlsZC94bWwtYXBpcy5q YXIKCglkb2RvYyBSRUFETUUuaHRtbAoJdXNlIGRvYyAmJiBqYXZhLXBrZ19kb2h0bWwgLXIgamF2 YS9idWlsZC9kb2NzLyoKfQo= 50549 2005-02-06 11:07 0000 xml-commons-java-1.5.patch xml-commons-java-1.5.patch text/plain ZGlmZiAtTmF1ciB4bWwtY29tbW9ucy0xLjAuYjIub3JpZy9qYXZhL3NyYy9vcmcvYXBhY2hlL2Vu di9XaGljaC5qYXZhIHhtbC1jb21tb25zLTEuMC5iMi9qYXZhL3NyYy9vcmcvYXBhY2hlL2Vudi9X aGljaC5qYXZhCi0tLSB4bWwtY29tbW9ucy0xLjAuYjIub3JpZy9qYXZhL3NyYy9vcmcvYXBhY2hl L2Vudi9XaGljaC5qYXZhCTIwMDItMDItMDYgMTY6NTI6MjYuMDAwMDAwMDAwICswMTAwCisrKyB4 bWwtY29tbW9ucy0xLjAuYjIvamF2YS9zcmMvb3JnL2FwYWNoZS9lbnYvV2hpY2guamF2YQkyMDA1 LTAyLTA2IDIwOjAwOjU4LjcwODcyMzY4OCArMDEwMApAQCAtMjg5LDEyICsyODksMTIgQEAKICAg ICAgICAgaWYgKG51bGwgPT0gaGFzaCkNCiAgICAgICAgICAgICByZXR1cm47DQogDQotICAgICAg ICBFbnVtZXJhdGlvbiBlbnVtID0gaGFzaC5rZXlzKCk7DQorICAgICAgICBFbnVtZXJhdGlvbiBl bnVtMSA9IGhhc2gua2V5cygpOw0KICAgICAgICAgVmVjdG9yIHYgPSBuZXcgVmVjdG9yKCk7DQog DQotICAgICAgICB3aGlsZSAoZW51bS5oYXNNb3JlRWxlbWVudHMoKSkNCisgICAgICAgIHdoaWxl IChlbnVtMS5oYXNNb3JlRWxlbWVudHMoKSkNCiAgICAgICAgIHsNCi0gICAgICAgICAgICBPYmpl Y3Qga2V5ID0gZW51bS5uZXh0RWxlbWVudCgpOw0KKyAgICAgICAgICAgIE9iamVjdCBrZXkgPSBl bnVtMS5uZXh0RWxlbWVudCgpOw0KICAgICAgICAgICAgIFN0cmluZyBrZXlTdHIgPSBrZXkudG9T dHJpbmcoKTsNCiAgICAgICAgICAgICBPYmplY3QgaXRlbSA9IGhhc2guZ2V0KGtleSk7DQogDQpA QCAtMzExLDEyICszMTEsMTIgQEAKICAgICAgICAgICAgIH0NCiAgICAgICAgIH0NCiANCi0gICAg ICAgIGVudW0gPSB2LmVsZW1lbnRzKCk7DQorICAgICAgICBlbnVtMSA9IHYuZWxlbWVudHMoKTsN CiANCi0gICAgICAgIHdoaWxlIChlbnVtLmhhc01vcmVFbGVtZW50cygpKQ0KKyAgICAgICAgd2hp bGUgKGVudW0xLmhhc01vcmVFbGVtZW50cygpKQ0KICAgICAgICAgew0KLSAgICAgICAgICAgIFN0 cmluZyBuID0gKFN0cmluZykgZW51bS5uZXh0RWxlbWVudCgpOw0KLSAgICAgICAgICAgIEhhc2h0 YWJsZSBoID0gKEhhc2h0YWJsZSkgZW51bS5uZXh0RWxlbWVudCgpOw0KKyAgICAgICAgICAgIFN0 cmluZyBuID0gKFN0cmluZykgZW51bTEubmV4dEVsZW1lbnQoKTsNCisgICAgICAgICAgICBIYXNo dGFibGUgaCA9IChIYXNodGFibGUpIGVudW0xLm5leHRFbGVtZW50KCk7DQogDQogICAgICAgICAg ICAgcmVwb3J0SGFzaHRhYmxlKGgsIG4sIG91dCk7DQogICAgICAgICB9DQpkaWZmIC1OYXVyIHht bC1jb21tb25zLTEuMC5iMi5vcmlnL2phdmEvc3JjL29yZy9hcGFjaGUveG1sL3Jlc29sdmVyL0Nh dGFsb2cuamF2YSB4bWwtY29tbW9ucy0xLjAuYjIvamF2YS9zcmMvb3JnL2FwYWNoZS94bWwvcmVz b2x2ZXIvQ2F0YWxvZy5qYXZhCi0tLSB4bWwtY29tbW9ucy0xLjAuYjIub3JpZy9qYXZhL3NyYy9v cmcvYXBhY2hlL3htbC9yZXNvbHZlci9DYXRhbG9nLmphdmEJMjAwMi0wMi0wNiAxNjo1MjowMi4w MDAwMDAwMDAgKzAxMDAKKysrIHhtbC1jb21tb25zLTEuMC5iMi9qYXZhL3NyYy9vcmcvYXBhY2hl L3htbC9yZXNvbHZlci9DYXRhbG9nLmphdmEJMjAwNS0wMi0wNiAxOTo1MTo1NC4wMDAwMDAwMDAg KzAxMDAKQEAgLTQ1MSw5ICs0NTEsOSBAQAogICAgICAgbWFwQXJyLmFkZChudWxsKTsNCiAgICAg fQ0KIA0KLSAgICBFbnVtZXJhdGlvbiBlbnVtID0gcmVhZGVyTWFwLmtleXMoKTsNCi0gICAgd2hp bGUgKGVudW0uaGFzTW9yZUVsZW1lbnRzKCkpIHsNCi0gICAgICBTdHJpbmcgbWltZVR5cGUgPSAo U3RyaW5nKSBlbnVtLm5leHRFbGVtZW50KCk7DQorICAgIEVudW1lcmF0aW9uIGVudW0xID0gcmVh ZGVyTWFwLmtleXMoKTsNCisgICAgd2hpbGUgKGVudW0xLmhhc01vcmVFbGVtZW50cygpKSB7DQor ICAgICAgU3RyaW5nIG1pbWVUeXBlID0gKFN0cmluZykgZW51bTEubmV4dEVsZW1lbnQoKTsNCiAg ICAgICBJbnRlZ2VyIHBvcyA9IChJbnRlZ2VyKSByZWFkZXJNYXAuZ2V0KG1pbWVUeXBlKTsNCiAg ICAgICBtYXBBcnIuc2V0KHBvcy5pbnRWYWx1ZSgpLCBtaW1lVHlwZSk7DQogICAgIH0NCkBAIC0x MDY0LDkgKzEwNjQsOSBAQAogICAgIH0NCiANCiAgICAgLy8gUGFyc2UgYWxsIHRoZSBERUxFR0FU RSBjYXRhbG9ncw0KLSAgICBFbnVtZXJhdGlvbiBlbnVtID0gY2F0YWxvZ0VudHJpZXMuZWxlbWVu dHMoKTsNCi0gICAgd2hpbGUgKGVudW0uaGFzTW9yZUVsZW1lbnRzKCkpIHsNCi0gICAgICBDYXRh bG9nRW50cnkgZSA9IChDYXRhbG9nRW50cnkpIGVudW0ubmV4dEVsZW1lbnQoKTsNCisgICAgRW51 bWVyYXRpb24gZW51bTEgPSBjYXRhbG9nRW50cmllcy5lbGVtZW50cygpOw0KKyAgICB3aGlsZSAo ZW51bTEuaGFzTW9yZUVsZW1lbnRzKCkpIHsNCisgICAgICBDYXRhbG9nRW50cnkgZSA9IChDYXRh bG9nRW50cnkpIGVudW0xLm5leHRFbGVtZW50KCk7DQogICAgICAgaWYgKGUuZ2V0RW50cnlUeXBl KCkgPT0gREVMRUdBVEVfUFVCTElDDQogCSAgfHwgZS5nZXRFbnRyeVR5cGUoKSA9PSBERUxFR0FU RV9TWVNURU0NCiAJICB8fCBlLmdldEVudHJ5VHlwZSgpID09IERFTEVHQVRFX1VSSSkgew0KQEAg LTExNDAsOSArMTE0MCw5IEBACiANCiAgICAgLy8gSWYgdGhlcmUncyBhIERPQ1RZUEUgZW50cnkg aW4gdGhpcyBjYXRhbG9nLCB1c2UgaXQNCiAgICAgYm9vbGVhbiBvdmVyID0gZGVmYXVsdF9vdmVy cmlkZTsNCi0gICAgRW51bWVyYXRpb24gZW51bSA9IGNhdGFsb2dFbnRyaWVzLmVsZW1lbnRzKCk7 DQotICAgIHdoaWxlIChlbnVtLmhhc01vcmVFbGVtZW50cygpKSB7DQotICAgICAgQ2F0YWxvZ0Vu dHJ5IGUgPSAoQ2F0YWxvZ0VudHJ5KSBlbnVtLm5leHRFbGVtZW50KCk7DQorICAgIEVudW1lcmF0 aW9uIGVudW0xID0gY2F0YWxvZ0VudHJpZXMuZWxlbWVudHMoKTsNCisgICAgd2hpbGUgKGVudW0x Lmhhc01vcmVFbGVtZW50cygpKSB7DQorICAgICAgQ2F0YWxvZ0VudHJ5IGUgPSAoQ2F0YWxvZ0Vu dHJ5KSBlbnVtMS5uZXh0RWxlbWVudCgpOw0KICAgICAgIGlmIChlLmdldEVudHJ5VHlwZSgpID09 IE9WRVJSSURFKSB7DQogCW92ZXIgPSBlLmdldEVudHJ5QXJnKDApLmVxdWFsc0lnbm9yZUNhc2Uo IllFUyIpOw0KIAljb250aW51ZTsNCkBAIC0xMTc4LDkgKzExNzgsOSBAQAogDQogICAgIERlYnVn Lm1lc3NhZ2UoMywgInJlc29sdmVEb2N1bWVudCIpOw0KIA0KLSAgICBFbnVtZXJhdGlvbiBlbnVt ID0gY2F0YWxvZ0VudHJpZXMuZWxlbWVudHMoKTsNCi0gICAgd2hpbGUgKGVudW0uaGFzTW9yZUVs ZW1lbnRzKCkpIHsNCi0gICAgICBDYXRhbG9nRW50cnkgZSA9IChDYXRhbG9nRW50cnkpIGVudW0u bmV4dEVsZW1lbnQoKTsNCisgICAgRW51bWVyYXRpb24gZW51bTEgPSBjYXRhbG9nRW50cmllcy5l bGVtZW50cygpOw0KKyAgICB3aGlsZSAoZW51bTEuaGFzTW9yZUVsZW1lbnRzKCkpIHsNCisgICAg ICBDYXRhbG9nRW50cnkgZSA9IChDYXRhbG9nRW50cnkpIGVudW0xLm5leHRFbGVtZW50KCk7DQog ICAgICAgaWYgKGUuZ2V0RW50cnlUeXBlKCkgPT0gRE9DVU1FTlQpIHsNCiAJcmV0dXJuIGUuZ2V0 RW50cnlBcmcoMSk7IC8vRklYTUUgY2hlY2sgdGhpcw0KICAgICAgIH0NCkBAIC0xMjUzLDkgKzEy NTMsOSBAQAogDQogICAgIC8vIElmIHRoZXJlJ3MgYSBFTlRJVFkgZW50cnkgaW4gdGhpcyBjYXRh bG9nLCB1c2UgaXQNCiAgICAgYm9vbGVhbiBvdmVyID0gZGVmYXVsdF9vdmVycmlkZTsNCi0gICAg RW51bWVyYXRpb24gZW51bSA9IGNhdGFsb2dFbnRyaWVzLmVsZW1lbnRzKCk7DQotICAgIHdoaWxl IChlbnVtLmhhc01vcmVFbGVtZW50cygpKSB7DQotICAgICAgQ2F0YWxvZ0VudHJ5IGUgPSAoQ2F0 YWxvZ0VudHJ5KSBlbnVtLm5leHRFbGVtZW50KCk7DQorICAgIEVudW1lcmF0aW9uIGVudW0xID0g Y2F0YWxvZ0VudHJpZXMuZWxlbWVudHMoKTsNCisgICAgd2hpbGUgKGVudW0xLmhhc01vcmVFbGVt ZW50cygpKSB7DQorICAgICAgQ2F0YWxvZ0VudHJ5IGUgPSAoQ2F0YWxvZ0VudHJ5KSBlbnVtMS5u ZXh0RWxlbWVudCgpOw0KICAgICAgIGlmIChlLmdldEVudHJ5VHlwZSgpID09IE9WRVJSSURFKSB7 DQogCW92ZXIgPSBlLmdldEVudHJ5QXJnKDApLmVxdWFsc0lnbm9yZUNhc2UoIllFUyIpOw0KIAlj b250aW51ZTsNCkBAIC0xMzM5LDkgKzEzMzksOSBAQAogDQogICAgIC8vIElmIHRoZXJlJ3MgYSBO T1RBVElPTiBlbnRyeSBpbiB0aGlzIGNhdGFsb2csIHVzZSBpdA0KICAgICBib29sZWFuIG92ZXIg PSBkZWZhdWx0X292ZXJyaWRlOw0KLSAgICBFbnVtZXJhdGlvbiBlbnVtID0gY2F0YWxvZ0VudHJp ZXMuZWxlbWVudHMoKTsNCi0gICAgd2hpbGUgKGVudW0uaGFzTW9yZUVsZW1lbnRzKCkpIHsNCi0g ICAgICBDYXRhbG9nRW50cnkgZSA9IChDYXRhbG9nRW50cnkpIGVudW0ubmV4dEVsZW1lbnQoKTsN CisgICAgRW51bWVyYXRpb24gZW51bTEgPSBjYXRhbG9nRW50cmllcy5lbGVtZW50cygpOw0KKyAg ICB3aGlsZSAoZW51bTEuaGFzTW9yZUVsZW1lbnRzKCkpIHsNCisgICAgICBDYXRhbG9nRW50cnkg ZSA9IChDYXRhbG9nRW50cnkpIGVudW0xLm5leHRFbGVtZW50KCk7DQogICAgICAgaWYgKGUuZ2V0 RW50cnlUeXBlKCkgPT0gT1ZFUlJJREUpIHsNCiAJb3ZlciA9IGUuZ2V0RW50cnlBcmcoMCkuZXF1 YWxzSWdub3JlQ2FzZSgiWUVTIik7DQogCWNvbnRpbnVlOw0KQEAgLTE0OTgsOSArMTQ5OCw5IEBA CiANCiAgICAgLy8gSWYgdGhlcmUncyBhIFBVQkxJQyBlbnRyeSBpbiB0aGlzIGNhdGFsb2csIHVz ZSBpdA0KICAgICBib29sZWFuIG92ZXIgPSBkZWZhdWx0X292ZXJyaWRlOw0KLSAgICBFbnVtZXJh dGlvbiBlbnVtID0gY2F0YWxvZ0VudHJpZXMuZWxlbWVudHMoKTsNCi0gICAgd2hpbGUgKGVudW0u aGFzTW9yZUVsZW1lbnRzKCkpIHsNCi0gICAgICBDYXRhbG9nRW50cnkgZSA9IChDYXRhbG9nRW50 cnkpIGVudW0ubmV4dEVsZW1lbnQoKTsNCisgICAgRW51bWVyYXRpb24gZW51bTEgPSBjYXRhbG9n RW50cmllcy5lbGVtZW50cygpOw0KKyAgICB3aGlsZSAoZW51bTEuaGFzTW9yZUVsZW1lbnRzKCkp IHsNCisgICAgICBDYXRhbG9nRW50cnkgZSA9IChDYXRhbG9nRW50cnkpIGVudW0xLm5leHRFbGVt ZW50KCk7DQogICAgICAgaWYgKGUuZ2V0RW50cnlUeXBlKCkgPT0gT1ZFUlJJREUpIHsNCiAJb3Zl ciA9IGUuZ2V0RW50cnlBcmcoMCkuZXF1YWxzSWdub3JlQ2FzZSgiWUVTIik7DQogCWNvbnRpbnVl Ow0KQEAgLTE1MTYsMTAgKzE1MTYsMTAgQEAKIA0KICAgICAvLyBJZiB0aGVyZSdzIGEgREVMRUdB VEVfUFVCTElDIGVudHJ5IGluIHRoaXMgY2F0YWxvZywgdXNlIGl0DQogICAgIG92ZXIgPSBkZWZh dWx0X292ZXJyaWRlOw0KLSAgICBlbnVtID0gY2F0YWxvZ0VudHJpZXMuZWxlbWVudHMoKTsNCisg ICAgZW51bTEgPSBjYXRhbG9nRW50cmllcy5lbGVtZW50cygpOw0KICAgICBWZWN0b3IgZGVsQ2F0 cyA9IG5ldyBWZWN0b3IoKTsNCi0gICAgd2hpbGUgKGVudW0uaGFzTW9yZUVsZW1lbnRzKCkpIHsN Ci0gICAgICBDYXRhbG9nRW50cnkgZSA9IChDYXRhbG9nRW50cnkpIGVudW0ubmV4dEVsZW1lbnQo KTsNCisgICAgd2hpbGUgKGVudW0xLmhhc01vcmVFbGVtZW50cygpKSB7DQorICAgICAgQ2F0YWxv Z0VudHJ5IGUgPSAoQ2F0YWxvZ0VudHJ5KSBlbnVtMS5uZXh0RWxlbWVudCgpOw0KICAgICAgIGlm IChlLmdldEVudHJ5VHlwZSgpID09IE9WRVJSSURFKSB7DQogCW92ZXIgPSBlLmdldEVudHJ5QXJn KDApLmVxdWFsc0lnbm9yZUNhc2UoIllFUyIpOw0KIAljb250aW51ZTsNCkBAIC0xNjI0LDkgKzE2 MjQsOSBAQAogDQogICAgIFN0cmluZyBvc25hbWUgPSBTeXN0ZW0uZ2V0UHJvcGVydHkoIm9zLm5h bWUiKTsNCiAgICAgYm9vbGVhbiB3aW5kb3dzID0gKG9zbmFtZS5pbmRleE9mKCJXaW5kb3dzIikg Pj0gMCk7DQotICAgIEVudW1lcmF0aW9uIGVudW0gPSBjYXRhbG9nRW50cmllcy5lbGVtZW50cygp Ow0KLSAgICB3aGlsZSAoZW51bS5oYXNNb3JlRWxlbWVudHMoKSkgew0KLSAgICAgIENhdGFsb2dF bnRyeSBlID0gKENhdGFsb2dFbnRyeSkgZW51bS5uZXh0RWxlbWVudCgpOw0KKyAgICBFbnVtZXJh dGlvbiBlbnVtMSA9IGNhdGFsb2dFbnRyaWVzLmVsZW1lbnRzKCk7DQorICAgIHdoaWxlIChlbnVt MS5oYXNNb3JlRWxlbWVudHMoKSkgew0KKyAgICAgIENhdGFsb2dFbnRyeSBlID0gKENhdGFsb2dF bnRyeSkgZW51bTEubmV4dEVsZW1lbnQoKTsNCiAgICAgICBpZiAoZS5nZXRFbnRyeVR5cGUoKSA9 PSBTWVNURU0NCiAJICAmJiAoZS5nZXRFbnRyeUFyZygwKS5lcXVhbHMoc3lzdGVtSWQpDQogCSAg ICAgIHx8ICh3aW5kb3dzDQpAQCAtMTYzNiwxMSArMTYzNiwxMSBAQAogICAgIH0NCiANCiAgICAg Ly8gSWYgdGhlcmUncyBhIFJFV1JJVEVfU1lTVEVNIGVudHJ5IGluIHRoaXMgY2F0YWxvZywgdXNl IGl0DQotICAgIGVudW0gPSBjYXRhbG9nRW50cmllcy5lbGVtZW50cygpOw0KKyAgICBlbnVtMSA9 IGNhdGFsb2dFbnRyaWVzLmVsZW1lbnRzKCk7DQogICAgIFN0cmluZyBzdGFydFN0cmluZyA9IG51 bGw7DQogICAgIFN0cmluZyBwcmVmaXggPSBudWxsOw0KLSAgICB3aGlsZSAoZW51bS5oYXNNb3Jl RWxlbWVudHMoKSkgew0KLSAgICAgIENhdGFsb2dFbnRyeSBlID0gKENhdGFsb2dFbnRyeSkgZW51 bS5uZXh0RWxlbWVudCgpOw0KKyAgICB3aGlsZSAoZW51bTEuaGFzTW9yZUVsZW1lbnRzKCkpIHsN CisgICAgICBDYXRhbG9nRW50cnkgZSA9IChDYXRhbG9nRW50cnkpIGVudW0xLm5leHRFbGVtZW50 KCk7DQogDQogICAgICAgaWYgKGUuZ2V0RW50cnlUeXBlKCkgPT0gUkVXUklURV9TWVNURU0pIHsN CiAJU3RyaW5nIHAgPSAoU3RyaW5nKSBlLmdldEVudHJ5QXJnKDApOw0KQEAgLTE2NjIsMTAgKzE2 NjIsMTAgQEAKICAgICB9DQogDQogICAgIC8vIElmIHRoZXJlJ3MgYSBERUxFR0FURV9TWVNURU0g ZW50cnkgaW4gdGhpcyBjYXRhbG9nLCB1c2UgaXQNCi0gICAgZW51bSA9IGNhdGFsb2dFbnRyaWVz LmVsZW1lbnRzKCk7DQorICAgIGVudW0xID0gY2F0YWxvZ0VudHJpZXMuZWxlbWVudHMoKTsNCiAg ICAgVmVjdG9yIGRlbENhdHMgPSBuZXcgVmVjdG9yKCk7DQotICAgIHdoaWxlIChlbnVtLmhhc01v cmVFbGVtZW50cygpKSB7DQotICAgICAgQ2F0YWxvZ0VudHJ5IGUgPSAoQ2F0YWxvZ0VudHJ5KSBl bnVtLm5leHRFbGVtZW50KCk7DQorICAgIHdoaWxlIChlbnVtMS5oYXNNb3JlRWxlbWVudHMoKSkg ew0KKyAgICAgIENhdGFsb2dFbnRyeSBlID0gKENhdGFsb2dFbnRyeSkgZW51bTEubmV4dEVsZW1l bnQoKTsNCiANCiAgICAgICBpZiAoZS5nZXRFbnRyeVR5cGUoKSA9PSBERUxFR0FURV9TWVNURU0p IHsNCiAJU3RyaW5nIHAgPSAoU3RyaW5nKSBlLmdldEVudHJ5QXJnKDApOw0KQEAgLTE3NTksOSAr MTc1OSw5IEBACiAgICAqLw0KICAgcHJvdGVjdGVkIFN0cmluZyByZXNvbHZlTG9jYWxVUkkoU3Ry aW5nIHVyaSkNCiAgICAgdGhyb3dzIE1hbGZvcm1lZFVSTEV4Y2VwdGlvbiwgSU9FeGNlcHRpb24g ew0KLSAgICBFbnVtZXJhdGlvbiBlbnVtID0gY2F0YWxvZ0VudHJpZXMuZWxlbWVudHMoKTsNCi0g ICAgd2hpbGUgKGVudW0uaGFzTW9yZUVsZW1lbnRzKCkpIHsNCi0gICAgICBDYXRhbG9nRW50cnkg ZSA9IChDYXRhbG9nRW50cnkpIGVudW0ubmV4dEVsZW1lbnQoKTsNCisgICAgRW51bWVyYXRpb24g ZW51bTEgPSBjYXRhbG9nRW50cmllcy5lbGVtZW50cygpOw0KKyAgICB3aGlsZSAoZW51bTEuaGFz TW9yZUVsZW1lbnRzKCkpIHsNCisgICAgICBDYXRhbG9nRW50cnkgZSA9IChDYXRhbG9nRW50cnkp IGVudW0xLm5leHRFbGVtZW50KCk7DQogICAgICAgaWYgKGUuZ2V0RW50cnlUeXBlKCkgPT0gVVJJ DQogCSAgJiYgKGUuZ2V0RW50cnlBcmcoMCkuZXF1YWxzKHVyaSkpKSB7DQogCXJldHVybiBlLmdl dEVudHJ5QXJnKDEpOw0KQEAgLTE3NjksMTEgKzE3NjksMTEgQEAKICAgICB9DQogDQogICAgIC8v IElmIHRoZXJlJ3MgYSBSRVdSSVRFX1VSSSBlbnRyeSBpbiB0aGlzIGNhdGFsb2csIHVzZSBpdA0K LSAgICBlbnVtID0gY2F0YWxvZ0VudHJpZXMuZWxlbWVudHMoKTsNCisgICAgZW51bTEgPSBjYXRh bG9nRW50cmllcy5lbGVtZW50cygpOw0KICAgICBTdHJpbmcgc3RhcnRTdHJpbmcgPSBudWxsOw0K ICAgICBTdHJpbmcgcHJlZml4ID0gbnVsbDsNCi0gICAgd2hpbGUgKGVudW0uaGFzTW9yZUVsZW1l bnRzKCkpIHsNCi0gICAgICBDYXRhbG9nRW50cnkgZSA9IChDYXRhbG9nRW50cnkpIGVudW0ubmV4 dEVsZW1lbnQoKTsNCisgICAgd2hpbGUgKGVudW0xLmhhc01vcmVFbGVtZW50cygpKSB7DQorICAg ICAgQ2F0YWxvZ0VudHJ5IGUgPSAoQ2F0YWxvZ0VudHJ5KSBlbnVtMS5uZXh0RWxlbWVudCgpOw0K IA0KICAgICAgIGlmIChlLmdldEVudHJ5VHlwZSgpID09IFJFV1JJVEVfVVJJKSB7DQogCVN0cmlu ZyBwID0gKFN0cmluZykgZS5nZXRFbnRyeUFyZygwKTsNCkBAIC0xNzk1LDEwICsxNzk1LDEwIEBA CiAgICAgfQ0KIA0KICAgICAvLyBJZiB0aGVyZSdzIGEgREVMRUdBVEVfVVJJIGVudHJ5IGluIHRo aXMgY2F0YWxvZywgdXNlIGl0DQotICAgIGVudW0gPSBjYXRhbG9nRW50cmllcy5lbGVtZW50cygp Ow0KKyAgICBlbnVtMSA9IGNhdGFsb2dFbnRyaWVzLmVsZW1lbnRzKCk7DQogICAgIFZlY3RvciBk ZWxDYXRzID0gbmV3IFZlY3RvcigpOw0KLSAgICB3aGlsZSAoZW51bS5oYXNNb3JlRWxlbWVudHMo KSkgew0KLSAgICAgIENhdGFsb2dFbnRyeSBlID0gKENhdGFsb2dFbnRyeSkgZW51bS5uZXh0RWxl bWVudCgpOw0KKyAgICB3aGlsZSAoZW51bTEuaGFzTW9yZUVsZW1lbnRzKCkpIHsNCisgICAgICBD YXRhbG9nRW50cnkgZSA9IChDYXRhbG9nRW50cnkpIGVudW0xLm5leHRFbGVtZW50KCk7DQogDQog ICAgICAgaWYgKGUuZ2V0RW50cnlUeXBlKCkgPT0gREVMRUdBVEVfVVJJKSB7DQogCVN0cmluZyBw ID0gKFN0cmluZykgZS5nZXRFbnRyeUFyZygwKTsNCmRpZmYgLU5hdXIgeG1sLWNvbW1vbnMtMS4w LmIyLm9yaWcvamF2YS9zcmMvb3JnL2FwYWNoZS94bWwvcmVzb2x2ZXIvUmVzb2x2ZXIuamF2YSB4 bWwtY29tbW9ucy0xLjAuYjIvamF2YS9zcmMvb3JnL2FwYWNoZS94bWwvcmVzb2x2ZXIvUmVzb2x2 ZXIuamF2YQotLS0geG1sLWNvbW1vbnMtMS4wLmIyLm9yaWcvamF2YS9zcmMvb3JnL2FwYWNoZS94 bWwvcmVzb2x2ZXIvUmVzb2x2ZXIuamF2YQkyMDAyLTAyLTA2IDE2OjUzOjAwLjAwMDAwMDAwMCAr MDEwMAorKysgeG1sLWNvbW1vbnMtMS4wLmIyL2phdmEvc3JjL29yZy9hcGFjaGUveG1sL3Jlc29s dmVyL1Jlc29sdmVyLmphdmEJMjAwNS0wMi0wNiAxOTo1MTo0My4wMDAwMDAwMDAgKzAxMDAKQEAg LTIxNSw5ICsyMTUsOSBAQAogICAgICAgcmV0dXJuIHJlc29sdmVkOw0KICAgICB9DQogDQotICAg IEVudW1lcmF0aW9uIGVudW0gPSBjYXRhbG9nRW50cmllcy5lbGVtZW50cygpOw0KLSAgICB3aGls ZSAoZW51bS5oYXNNb3JlRWxlbWVudHMoKSkgew0KLSAgICAgIENhdGFsb2dFbnRyeSBlID0gKENh dGFsb2dFbnRyeSkgZW51bS5uZXh0RWxlbWVudCgpOw0KKyAgICBFbnVtZXJhdGlvbiBlbnVtMSA9 IGNhdGFsb2dFbnRyaWVzLmVsZW1lbnRzKCk7DQorICAgIHdoaWxlIChlbnVtMS5oYXNNb3JlRWxl bWVudHMoKSkgew0KKyAgICAgIENhdGFsb2dFbnRyeSBlID0gKENhdGFsb2dFbnRyeSkgZW51bTEu bmV4dEVsZW1lbnQoKTsNCiAgICAgICBpZiAoZS5nZXRFbnRyeVR5cGUoKSA9PSBSRVNPTFZFUikg ew0KIAlyZXNvbHZlZCA9IHJlc29sdmVFeHRlcm5hbFN5c3RlbSh1cmksIGUuZ2V0RW50cnlBcmco MCkpOw0KIAlpZiAocmVzb2x2ZWQgIT0gbnVsbCkgew0KQEAgLTI3Miw5ICsyNzIsOSBAQAogICAg ICAgcmV0dXJuIHJlc29sdmVkOw0KICAgICB9DQogDQotICAgIEVudW1lcmF0aW9uIGVudW0gPSBj YXRhbG9nRW50cmllcy5lbGVtZW50cygpOw0KLSAgICB3aGlsZSAoZW51bS5oYXNNb3JlRWxlbWVu dHMoKSkgew0KLSAgICAgIENhdGFsb2dFbnRyeSBlID0gKENhdGFsb2dFbnRyeSkgZW51bS5uZXh0 RWxlbWVudCgpOw0KKyAgICBFbnVtZXJhdGlvbiBlbnVtMSA9IGNhdGFsb2dFbnRyaWVzLmVsZW1l bnRzKCk7DQorICAgIHdoaWxlIChlbnVtMS5oYXNNb3JlRWxlbWVudHMoKSkgew0KKyAgICAgIENh dGFsb2dFbnRyeSBlID0gKENhdGFsb2dFbnRyeSkgZW51bTEubmV4dEVsZW1lbnQoKTsNCiAgICAg ICBpZiAoZS5nZXRFbnRyeVR5cGUoKSA9PSBSRVNPTFZFUikgew0KIAlyZXNvbHZlZCA9IHJlc29s dmVFeHRlcm5hbFN5c3RlbShzeXN0ZW1JZCwgZS5nZXRFbnRyeUFyZygwKSk7DQogCWlmIChyZXNv bHZlZCAhPSBudWxsKSB7DQpAQCAtMzM0LDkgKzMzNCw5IEBACiAgICAgICByZXR1cm4gcmVzb2x2 ZWQ7DQogICAgIH0NCiANCi0gICAgRW51bWVyYXRpb24gZW51bSA9IGNhdGFsb2dFbnRyaWVzLmVs ZW1lbnRzKCk7DQotICAgIHdoaWxlIChlbnVtLmhhc01vcmVFbGVtZW50cygpKSB7DQotICAgICAg Q2F0YWxvZ0VudHJ5IGUgPSAoQ2F0YWxvZ0VudHJ5KSBlbnVtLm5leHRFbGVtZW50KCk7DQorICAg IEVudW1lcmF0aW9uIGVudW0xID0gY2F0YWxvZ0VudHJpZXMuZWxlbWVudHMoKTsNCisgICAgd2hp bGUgKGVudW0xLmhhc01vcmVFbGVtZW50cygpKSB7DQorICAgICAgQ2F0YWxvZ0VudHJ5IGUgPSAo Q2F0YWxvZ0VudHJ5KSBlbnVtMS5uZXh0RWxlbWVudCgpOw0KICAgICAgIGlmIChlLmdldEVudHJ5 VHlwZSgpID09IFJFU09MVkVSKSB7DQogCWlmIChzeXN0ZW1JZCAhPSBudWxsKSB7DQogCSAgcmVz b2x2ZWQgPSByZXNvbHZlRXh0ZXJuYWxTeXN0ZW0oc3lzdGVtSWQsDQpAQCAtNTc1LDkgKzU3NSw5 IEBACiAJVmVjdG9yIG1hcCA9IG5ldyBWZWN0b3IoKTsNCiAJU3RyaW5nIG9zbmFtZSA9IFN5c3Rl bS5nZXRQcm9wZXJ0eSgib3MubmFtZSIpOw0KIAlib29sZWFuIHdpbmRvd3MgPSAob3NuYW1lLmlu ZGV4T2YoIldpbmRvd3MiKSA+PSAwKTsNCi0JRW51bWVyYXRpb24gZW51bSA9IGNhdGFsb2dFbnRy aWVzLmVsZW1lbnRzKCk7DQotCXdoaWxlIChlbnVtLmhhc01vcmVFbGVtZW50cygpKSB7DQotCSAg ICBDYXRhbG9nRW50cnkgZSA9IChDYXRhbG9nRW50cnkpIGVudW0ubmV4dEVsZW1lbnQoKTsNCisJ RW51bWVyYXRpb24gZW51bTEgPSBjYXRhbG9nRW50cmllcy5lbGVtZW50cygpOw0KKwl3aGlsZSAo ZW51bTEuaGFzTW9yZUVsZW1lbnRzKCkpIHsNCisJICAgIENhdGFsb2dFbnRyeSBlID0gKENhdGFs b2dFbnRyeSkgZW51bTEubmV4dEVsZW1lbnQoKTsNCiAJICAgIGlmIChlLmdldEVudHJ5VHlwZSgp ID09IFNZU1RFTQ0KIAkJJiYgKGUuZ2V0RW50cnlBcmcoMCkuZXF1YWxzKHN5c3RlbUlkKQ0KIAkJ ICAgIHx8ICh3aW5kb3dzDQpAQCAtNjAzLDkgKzYwMyw5IEBACiAJVmVjdG9yIG1hcCA9IG5ldyBW ZWN0b3IoKTsNCiAJU3RyaW5nIG9zbmFtZSA9IFN5c3RlbS5nZXRQcm9wZXJ0eSgib3MubmFtZSIp Ow0KIAlib29sZWFuIHdpbmRvd3MgPSAob3NuYW1lLmluZGV4T2YoIldpbmRvd3MiKSA+PSAwKTsN Ci0JRW51bWVyYXRpb24gZW51bSA9IGNhdGFsb2dFbnRyaWVzLmVsZW1lbnRzKCk7DQotCXdoaWxl IChlbnVtLmhhc01vcmVFbGVtZW50cygpKSB7DQotCSAgICBDYXRhbG9nRW50cnkgZSA9IChDYXRh bG9nRW50cnkpIGVudW0ubmV4dEVsZW1lbnQoKTsNCisJRW51bWVyYXRpb24gZW51bTEgPSBjYXRh bG9nRW50cmllcy5lbGVtZW50cygpOw0KKwl3aGlsZSAoZW51bTEuaGFzTW9yZUVsZW1lbnRzKCkp IHsNCisJICAgIENhdGFsb2dFbnRyeSBlID0gKENhdGFsb2dFbnRyeSkgZW51bTEubmV4dEVsZW1l bnQoKTsNCiAJICAgIGlmIChlLmdldEVudHJ5VHlwZSgpID09IFNZU1RFTQ0KIAkJJiYgKGUuZ2V0 RW50cnlBcmcoMSkuZXF1YWxzKHN5c3RlbUlkKQ0KIAkJICAgIHx8ICh3aW5kb3dzDQo=