[jsword-devel] What can I do if I want to help?

[Jacky Cheung]

This is a multi-part message in MIME format.
--------------090107040207060109070704
Content-Type: text/plain; charset=us-ascii; format=flowed
Content-Transfer-Encoding: 7bit

Hi Joe,

Attached is my updates. Here is a short description of what I have done.
1. build.xml, custom.xsl
- Add fork to JDepend task
- To avoid hardcoding path in custom.xsl in checkstyle

2. Updated JUnit tests so that no garbage files (foo.la and tmp.ser) 
will be created.

3. Updated SwordBible, SwordDictionary, and SwordCommentary so that they 
can handle non-Latin-1 module (e.g. Chinese Bible, Hebrew) properly.

Anybody working on "GBF add tags: RB, WG****, WHO****, WTH****, WTP, 
WT*******" in bugs.txt? I am going to work on this.

Jacky

Joe Walker wrote:

>
> Hi,
>
> I've made the change you noted - thanks! I didn't realise you could 
> fork the JDepend task. It might help me work out why I've found the 
> junit task so troublesome.
>
> I think you should be able to change whatever you want and use cvs 
> diff to send me a patchfile. I use eclipse to do all my cvs access, 
> but the cvs console tells me that the command would be:
>   cvs diff -N -u "/jsword"
>
> When I've needed to create diff files without access to cvs then I've 
> used this:
>   diff -ruN jsword-orig jsword-modified
>
> I would hazard a guess that -u meant unified diff format, and -N meant 
> include new files, and that cvs does -r (recursive) automatically.
>
> I hope to do another beta release soon so I'm trying to concentrate on 
> fixing bugs.
>
> Hope that helps,
>
> Joe.
>
> Jacky Cheung wrote:
>
>> Hi,
>>
>> I wanted to give a handle in the project. What can I do? I have 
>> looked at the ant script and found that the JDepend task requires 
>> fork="yes" to work without puting the JDepend.jar to ${ant.home}. 
>> However, I cannot commit the build.xml back to CVS. Is there anything 
>> I should apply for? Thanks.
>>
>> Best regards,
>> Jacky
>>
>> _______________________________________________
>> jsword-devel mailing list
>> jsword-devel@crosswire.org
>> http://www.crosswire.org/mailman/listinfo/jsword-devel
>
>
> _______________________________________________
> jsword-devel mailing list
> jsword-devel@crosswire.org
> http://www.crosswire.org/mailman/listinfo/jsword-devel
>


--------------090107040207060109070704
Content-Type: application/x-java-vm;
 name="jsword_upd_diff"
Content-Transfer-Encoding: base64
Content-Disposition: inline;
 filename="jsword_upd_diff"

SW5kZXg6IGpzd29yZC9idWlsZC54bWwKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQpSQ1MgZmlsZTogL2N2cy9q
c3dvcmQvanN3b3JkL2J1aWxkLnhtbCx2CnJldHJpZXZpbmcgcmV2aXNpb24gMS41MQpkaWZm
IC11IC1yMS41MSBidWlsZC54bWwKLS0tIGpzd29yZC9idWlsZC54bWwJMiBNYXkgMjAwMyAy
MDoxMToyOSAtMDAwMAkxLjUxCisrKyBqc3dvcmQvYnVpbGQueG1sCTggTWF5IDIwMDMgMDk6
NDk6MzAgLTAwMDAKQEAgLTQxOCw3ICs0MTgsNyBAQAogICAgICAgPC9jbGFzc3BhdGg+CiAg
ICAgPC90YXNrZGVmPgogICAgIC0tPgotICAgIDxqZGVwZW5kIGZvcm1hdD0ieG1sIiBvdXRw
dXRmaWxlPSIke3RhcmdldC5qZGVwZW5kfS9qZGVwZW5kLXJlcG9ydC54bWwiPgorICAgIDxq
ZGVwZW5kIGZvcms9InllcyIgZm9ybWF0PSJ4bWwiIG91dHB1dGZpbGU9IiR7dGFyZ2V0Lmpk
ZXBlbmR9L2pkZXBlbmQtcmVwb3J0LnhtbCI+CiAgICAgICA8c291cmNlc3BhdGg+CiAgICAg
ICAgIDxwYXRoZWxlbWVudCBwYXRoPSIke3NvdXJjZS5qYXZhfS9jb21tb24iLz4KICAgICAg
ICAgPHBhdGhlbGVtZW50IHBhdGg9IiR7c291cmNlLmphdmF9L2pzd29yZCIvPgpAQCAtNDUw
LDcgKzQ1MCwxNCBAQAogICAgICAgPC9jbGFzc3BhdGg+CiAgICAgPC90YXNrZGVmPgogICAg
IDwhLS0gdGFza2RlZiBuYW1lPSJjaGVja3N0eWxlIiBjbGFzc25hbWU9Im9yZy5hcGFjaGUu
dG9vbHMuYW50LnRhc2tkZWZzLm9wdGlvbmFsLmpkZXBlbmQuSkRlcGVuZFRhc2siLyAtLT4K
LSAgICA8Y2hlY2tzdHlsZSBjb25maWc9IiR7c291cmNlLnRvb2xzfS9jaGVja3N0eWxlMzAv
Y3VzdG9tLnhtbCIgZmFpbE9uVmlvbGF0aW9uPSJmYWxzZSI+CisgICAgPGNvcHkgZmlsZT0i
JHtzb3VyY2UudG9vbHN9L2NoZWNrc3R5bGUzMC9jdXN0b20ueG1sIiBvdmVyd3JpdGU9InRy
dWUiCisgICAgICAgICAgdG9maWxlPSIke3RhcmdldC5jaGVja3N0eWxlfS9jdXN0b20ueG1s
Ij4KKyAgICAgIDxmaWx0ZXJzZXQ+CisgICAgICAgIDxmaWx0ZXIgdG9rZW49InNvdXJjZS5q
YXZhIiB2YWx1ZT0iJHtiYXNlZGlyfS8ke3NvdXJjZS5qYXZhfSIvPgorICAgICAgICA8Zmls
dGVyIHRva2VuPSJ0YXJnZXQuY2hlY2tzdHlsZSIgdmFsdWU9IiR7YmFzZWRpcn0vJHt0YXJn
ZXQuY2hlY2tzdHlsZX0iLz4KKyAgICAgIDwvZmlsdGVyc2V0PgorICAgIDwvY29weT4KKyAg
ICA8Y2hlY2tzdHlsZSBjb25maWc9IiR7dGFyZ2V0LmNoZWNrc3R5bGV9L2N1c3RvbS54bWwi
IGZhaWxPblZpb2xhdGlvbj0iZmFsc2UiPgogICAgICAgPGZpbGVzZXQgZGlyPSIke3NvdXJj
ZS5qYXZhfS9jb21tb24iIGluY2x1ZGVzPSIqKi8qLmphdmEiLz4KICAgICAgIDxmaWxlc2V0
IGRpcj0iJHtzb3VyY2UuamF2YX0vanN3b3JkIiBpbmNsdWRlcz0iKiovKi5qYXZhIi8+CiAg
ICAgICA8ZmlsZXNldCBkaXI9IiR7c291cmNlLmphdmF9L3NlcnZsZXQiIGluY2x1ZGVzPSIq
Ki8qLmphdmEiLz4KSW5kZXg6IGpzd29yZC9qYXZhL2pzd29yZC9vcmcvY3Jvc3N3aXJlL2pz
d29yZC9ib29rL3N3b3JkL1N3b3JkQmlibGUuamF2YQo9PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09ClJDUyBmaWxl
OiAvY3ZzL2pzd29yZC9qc3dvcmQvamF2YS9qc3dvcmQvb3JnL2Nyb3Nzd2lyZS9qc3dvcmQv
Ym9vay9zd29yZC9Td29yZEJpYmxlLmphdmEsdgpyZXRyaWV2aW5nIHJldmlzaW9uIDEuMzEK
ZGlmZiAtdSAtcjEuMzEgU3dvcmRCaWJsZS5qYXZhCi0tLSBqc3dvcmQvamF2YS9qc3dvcmQv
b3JnL2Nyb3Nzd2lyZS9qc3dvcmQvYm9vay9zd29yZC9Td29yZEJpYmxlLmphdmEJMjggQXBy
IDIwMDMgMDg6Mzk6NDYgLTAwMDAJMS4zMQorKysganN3b3JkL2phdmEvanN3b3JkL29yZy9j
cm9zc3dpcmUvanN3b3JkL2Jvb2svc3dvcmQvU3dvcmRCaWJsZS5qYXZhCTggTWF5IDIwMDMg
MDk6NDk6MzEgLTAwMDAKQEAgLTMsNiArMyw3IEBACiAKIGltcG9ydCBqYXZhLm5ldC5VUkw7
CiBpbXBvcnQgamF2YS51dGlsLkl0ZXJhdG9yOworaW1wb3J0IGphdmEuaW8uVW5zdXBwb3J0
ZWRFbmNvZGluZ0V4Y2VwdGlvbjsKIAogaW1wb3J0IG9yZy5jcm9zc3dpcmUuY29tbW9uLnV0
aWwuTG9nZ2VyOwogaW1wb3J0IG9yZy5jcm9zc3dpcmUuanN3b3JkLmJvb2suQmlibGVNZXRh
RGF0YTsKQEAgLTkzLDYgKzk0LDggQEAKICAgICAgICAgICAgIEJvb2tEYXRhTGlzdGVuZXIg
bGkgPSBEYXRhRmFjdG9yeS5nZXRJbnN0YW5jZSgpLmNyZWF0ZUJvb2tEYXRhTGlzdG5lbmVy
KCk7CiAgICAgICAgICAgICBsaS5zdGFydERvY3VtZW50KGdldEJpYmxlTWV0YURhdGEoKS5n
ZXRJbml0aWFscygpKTsKICAgICAKKyAgICAgICAgICAgIFN0cmluZyBtb2R1bGVDaGFyc2V0
ID0gY29uZmlnLmdldE1vZHVsZUNoYXJzZXQoKTsKKyAgICAgICAgICAgIAogICAgICAgICAg
ICAgLy8gRm9yIGFsbCB0aGUgcmFuZ2VzIGluIHRoaXMgUGFzc2FnZQogICAgICAgICAgICAg
SXRlcmF0b3Igcml0ID0gcmVmLnJhbmdlSXRlcmF0b3IoKTsKICAgICAgICAgICAgIHdoaWxl
IChyaXQuaGFzTmV4dCgpKQpAQCAtMTA4LDkgKzExMSwxOSBAQAogICAgIAogICAgICAgICAg
ICAgICAgICAgICBsaS5zdGFydFZlcnNlKHZlcnNlKTsKIAotICAgICAgICAgICAgICAgICAg
ICAvLyBXZSBzaG91bGQgcHJvYmFibHkgdGhpbmsgYWJvdXQgZW5jb2RpbmdzIGhlcmU/CiAg
ICAgICAgICAgICAgICAgICAgIGJ5dGVbXSBkYXRhID0gYmFja2VuZC5nZXRSYXdUZXh0KHZl
cnNlKTsKLSAgICAgICAgICAgICAgICAgICAgU3RyaW5nIHRleHQgPSBuZXcgU3RyaW5nKGRh
dGEpOworICAgICAgICAgICAgICAgICAgICBTdHJpbmcgdGV4dCA9IG51bGw7CisgICAgICAg
ICAgICAgICAgICAgIHRyeQorICAgICAgICAgICAgICAgICAgICB7CisgICAgICAgICAgICAg
ICAgICAgICAgICB0ZXh0ID0gbmV3IFN0cmluZyhkYXRhLCBtb2R1bGVDaGFyc2V0KTsKKyAg
ICAgICAgICAgICAgICAgICAgfQorICAgICAgICAgICAgICAgICAgICBjYXRjaChVbnN1cHBv
cnRlZEVuY29kaW5nRXhjZXB0aW9uIHVuU3VwRW5FeCkKKyAgICAgICAgICAgICAgICAgICAg
eworICAgICAgICAgICAgICAgICAgICAgICAgLy8gSXQgaXMgaW1wb3NzaWJsZSEgSW4gY2Fz
ZSwgdXNlIHN5c3RlbSBkZWZhdWx0Li4uCisgICAgICAgICAgICAgICAgICAgICAgICBsb2cu
ZXJyb3IoIkVuY29kaW5nOiAiICsgbW9kdWxlQ2hhcnNldCArICIgbm90IHN1cHBvcnRlZCIs
CisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgdW5TdXBFbkV4KTsKKyAgICAg
ICAgICAgICAgICAgICAgICAgIHRleHQgPSBuZXcgU3RyaW5nKGRhdGEpOworICAgICAgICAg
ICAgICAgICAgICB9CiAgICAgICAgICAgICAgICAgICAgIGNvbmZpZy5nZXRGaWx0ZXIoKS50
b09TSVMobGksIHRleHQpOwogCiAgICAgICAgICAgICAgICAgICAgIGxpLmVuZFZlcnNlKCk7
CkBAIC0xMzksNyArMTUyLDcgQEAKIAogICAgICAgICByZXR1cm4gc2VhcmNoZXIuZmluZFBh
c3NhZ2UobWF0Y2gpOwogICAgIH0KLQorICAgIAogICAgIC8qPS0wCiAgICAgICogVGhlIHNl
YXJjaCBpbXBsZW1lbnRhdGlvbgogICAgICAqLwpJbmRleDoganN3b3JkL2phdmEvanN3b3Jk
L29yZy9jcm9zc3dpcmUvanN3b3JkL2Jvb2svc3dvcmQvU3dvcmRDb21tZW50YXJ5LmphdmEK
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PQpSQ1MgZmlsZTogL2N2cy9qc3dvcmQvanN3b3JkL2phdmEvanN3b3Jk
L29yZy9jcm9zc3dpcmUvanN3b3JkL2Jvb2svc3dvcmQvU3dvcmRDb21tZW50YXJ5LmphdmEs
dgpyZXRyaWV2aW5nIHJldmlzaW9uIDEuOApkaWZmIC11IC1yMS44IFN3b3JkQ29tbWVudGFy
eS5qYXZhCi0tLSBqc3dvcmQvamF2YS9qc3dvcmQvb3JnL2Nyb3Nzd2lyZS9qc3dvcmQvYm9v
ay9zd29yZC9Td29yZENvbW1lbnRhcnkuamF2YQkyNCBBcHIgMjAwMyAxNzowOTowMiAtMDAw
MAkxLjgKKysrIGpzd29yZC9qYXZhL2pzd29yZC9vcmcvY3Jvc3N3aXJlL2pzd29yZC9ib29r
L3N3b3JkL1N3b3JkQ29tbWVudGFyeS5qYXZhCTggTWF5IDIwMDMgMDk6NDk6MzEgLTAwMDAK
QEAgLTEsNiArMSw3IEBACiAKIHBhY2thZ2Ugb3JnLmNyb3Nzd2lyZS5qc3dvcmQuYm9vay5z
d29yZDsKIAoraW1wb3J0IGphdmEuaW8uVW5zdXBwb3J0ZWRFbmNvZGluZ0V4Y2VwdGlvbjsK
IGltcG9ydCBqYXZhLnV0aWwuSXRlcmF0b3I7CiAKIGltcG9ydCBvcmcuY3Jvc3N3aXJlLmNv
bW1vbi51dGlsLkxvZ2dlcjsKQEAgLTg3LDYgKzg4LDggQEAKICAgICAgICAgICAgIEJvb2tE
YXRhTGlzdGVuZXIgbGkgPSBEYXRhRmFjdG9yeS5nZXRJbnN0YW5jZSgpLmNyZWF0ZUJvb2tE
YXRhTGlzdG5lbmVyKCk7CiAgICAgICAgICAgICBsaS5zdGFydERvY3VtZW50KGdldENvbW1l
bnRhcnlNZXRhRGF0YSgpLmdldEluaXRpYWxzKCkpOwogICAgIAorICAgICAgICAgICAgU3Ry
aW5nIG1vZHVsZUNoYXJzZXQgPSBjb25maWcuZ2V0TW9kdWxlQ2hhcnNldCgpOworICAgICAg
ICAgICAgCiAgICAgICAgICAgICAvLyBGb3IgYWxsIHRoZSByYW5nZXMgaW4gdGhpcyBQYXNz
YWdlCiAgICAgICAgICAgICBJdGVyYXRvciByaXQgPSByZWYucmFuZ2VJdGVyYXRvcigpOwog
ICAgICAgICAgICAgd2hpbGUgKHJpdC5oYXNOZXh0KCkpCkBAIC0xMDIsOSArMTA1LDE5IEBA
CiAgICAgCiAgICAgICAgICAgICAgICAgICAgIGxpLnN0YXJ0VmVyc2UodmVyc2UpOwogCi0g
ICAgICAgICAgICAgICAgICAgIC8vIFdlIHNob3VsZCBwcm9iYWJseSB0aGluayBhYm91dCBl
bmNvZGluZ3MgaGVyZT8KICAgICAgICAgICAgICAgICAgICAgYnl0ZVtdIGRhdGEgPSBiYWNr
ZW5kLmdldFJhd1RleHQodmVyc2UpOwotICAgICAgICAgICAgICAgICAgICBTdHJpbmcgdGV4
dCA9IG5ldyBTdHJpbmcoZGF0YSk7CisgICAgICAgICAgICAgICAgICAgIFN0cmluZyB0ZXh0
ID0gbnVsbDsKKyAgICAgICAgICAgICAgICAgICAgdHJ5CisgICAgICAgICAgICAgICAgICAg
IHsKKyAgICAgICAgICAgICAgICAgICAgICAgIHRleHQgPSBuZXcgU3RyaW5nKGRhdGEsIG1v
ZHVsZUNoYXJzZXQpOworICAgICAgICAgICAgICAgICAgICB9CisgICAgICAgICAgICAgICAg
ICAgIGNhdGNoKFVuc3VwcG9ydGVkRW5jb2RpbmdFeGNlcHRpb24gdW5TdXBFbkV4KQorICAg
ICAgICAgICAgICAgICAgICB7CisgICAgICAgICAgICAgICAgICAgICAgICAvLyBJdCBpcyBp
bXBvc3NpYmxlISBJbiBjYXNlLCB1c2Ugc3lzdGVtIGRlZmF1bHQuLi4KKyAgICAgICAgICAg
ICAgICAgICAgICAgIGxvZy5lcnJvcigiRW5jb2Rpbmc6ICIgKyBtb2R1bGVDaGFyc2V0ICsg
IiBub3Qgc3VwcG9ydGVkIiwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICB1
blN1cEVuRXgpOworICAgICAgICAgICAgICAgICAgICAgICAgdGV4dCA9IG5ldyBTdHJpbmco
ZGF0YSk7CisgICAgICAgICAgICAgICAgICAgIH0KICAgICAgICAgICAgICAgICAgICAgY29u
ZmlnLmdldEZpbHRlcigpLnRvT1NJUyhsaSwgdGV4dCk7CiAKICAgICAgICAgICAgICAgICAg
ICAgbGkuZW5kVmVyc2UoKTsKSW5kZXg6IGpzd29yZC9qYXZhL2pzd29yZC9vcmcvY3Jvc3N3
aXJlL2pzd29yZC9ib29rL3N3b3JkL1N3b3JkQ29uZmlnLmphdmEKPT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQpS
Q1MgZmlsZTogL2N2cy9qc3dvcmQvanN3b3JkL2phdmEvanN3b3JkL29yZy9jcm9zc3dpcmUv
anN3b3JkL2Jvb2svc3dvcmQvU3dvcmRDb25maWcuamF2YSx2CnJldHJpZXZpbmcgcmV2aXNp
b24gMS4xNgpkaWZmIC11IC1yMS4xNiBTd29yZENvbmZpZy5qYXZhCi0tLSBqc3dvcmQvamF2
YS9qc3dvcmQvb3JnL2Nyb3Nzd2lyZS9qc3dvcmQvYm9vay9zd29yZC9Td29yZENvbmZpZy5q
YXZhCTIgTWF5IDIwMDMgMjA6MTE6MjggLTAwMDAJMS4xNgorKysganN3b3JkL2phdmEvanN3
b3JkL29yZy9jcm9zc3dpcmUvanN3b3JkL2Jvb2svc3dvcmQvU3dvcmRDb25maWcuamF2YQk4
IE1heSAyMDAzIDA5OjQ5OjMxIC0wMDAwCkBAIC0yMTUsNiArMjE1LDEwIEBACiAKICAgICAg
ICAgU3RyaW5nIGVuY29kaW5nU3RyaW5nID0gcmVhZGVyLmdldEZpcnN0VmFsdWUoIkVuY29k
aW5nIik7CiAgICAgICAgIGVuY29kaW5nID0gbWF0Y2hpbmdJbmRleChTd29yZENvbnN0YW50
cy5FTkNPRElOR19TVFJJTkdTLCBlbmNvZGluZ1N0cmluZyk7CisgICAgICAgIGlmIChlbmNv
ZGluZyA8IDApCisgICAgICAgIHsKKyAgICAgICAgICAgIGVuY29kaW5nID0gMTsgLy8gZGVm
YXVsdCBpcyBMYXRpbi0xLCBidXQgd2h5IG5vdCBlbmNvZGluZyBpcyBhIFN0cmluZyBvYmpl
Y3Q/CisgICAgICAgIH0KIAogICAgICAgICB0cnkKICAgICAgICAgewpAQCAtNTQ1LDYgKzU0
OSwyMiBAQAogICAgIHB1YmxpYyBpbnQgZ2V0RW5jb2RpbmcoKQogICAgIHsKICAgICAgICAg
cmV0dXJuIGVuY29kaW5nOworICAgIH0KKyAgICAKKyAgICAvKioKKyAgICAgKiBSZXR1cm5z
IHRoZSBDaGFyc2V0IG9mIHRoZSBtb2R1bGUgYmFzZWQgb24gdGhlIGVuY29kaW5nIGF0dHJp
YnV0ZQorICAgICAqCisgICAgICogQHJldHVybiB0aGUgY2hhcnNldCBvZiB0aGUgbW9kdWxl
LgorICAgICAqLworICAgIHB1YmxpYyBTdHJpbmcgZ2V0TW9kdWxlQ2hhcnNldCgpCisgICAg
eworICAgICAgICBzd2l0Y2goZW5jb2RpbmcpCisgICAgICAgIHsKKyAgICAgICAgICAgIGNh
c2UgMDoKKyAgICAgICAgICAgICAgICByZXR1cm4gIlVURi04IjsKKyAgICAgICAgICAgIGRl
ZmF1bHQ6CisgICAgICAgICAgICAgICAgcmV0dXJuICJJU08tODg1OS0xIjsgLy8gTGF0aW4t
MQorICAgICAgICB9CiAgICAgfQogCiAgICAgLyoqCkluZGV4OiBqc3dvcmQvamF2YS9qc3dv
cmQvb3JnL2Nyb3Nzd2lyZS9qc3dvcmQvYm9vay9zd29yZC9Td29yZERpY3Rpb25hcnkuamF2
YQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09ClJDUyBmaWxlOiAvY3ZzL2pzd29yZC9qc3dvcmQvamF2YS9qc3dv
cmQvb3JnL2Nyb3Nzd2lyZS9qc3dvcmQvYm9vay9zd29yZC9Td29yZERpY3Rpb25hcnkuamF2
YSx2CnJldHJpZXZpbmcgcmV2aXNpb24gMS45CmRpZmYgLXUgLXIxLjkgU3dvcmREaWN0aW9u
YXJ5LmphdmEKLS0tIGpzd29yZC9qYXZhL2pzd29yZC9vcmcvY3Jvc3N3aXJlL2pzd29yZC9i
b29rL3N3b3JkL1N3b3JkRGljdGlvbmFyeS5qYXZhCTIgTWF5IDIwMDMgMjA6NTg6MDkgLTAw
MDAJMS45CisrKyBqc3dvcmQvamF2YS9qc3dvcmQvb3JnL2Nyb3Nzd2lyZS9qc3dvcmQvYm9v
ay9zd29yZC9Td29yZERpY3Rpb25hcnkuamF2YQk4IE1heSAyMDAzIDA5OjQ5OjMxIC0wMDAw
CkBAIC0xLDYgKzEsNyBAQAogCiBwYWNrYWdlIG9yZy5jcm9zc3dpcmUuanN3b3JkLmJvb2su
c3dvcmQ7CiAKK2ltcG9ydCBqYXZhLmlvLlVuc3VwcG9ydGVkRW5jb2RpbmdFeGNlcHRpb247
CiBpbXBvcnQgamF2YS51dGlsLkNvbXBhcmF0b3I7CiBpbXBvcnQgamF2YS51dGlsLkhhc2hN
YXA7CiBpbXBvcnQgamF2YS51dGlsLkl0ZXJhdG9yOwpAQCAtOSw2ICsxMCw3IEBACiBpbXBv
cnQgamF2YS51dGlsLlNvcnRlZFNldDsKIGltcG9ydCBqYXZhLnV0aWwuVHJlZVNldDsKIAor
aW1wb3J0IG9yZy5jcm9zc3dpcmUuY29tbW9uLnV0aWwuTG9nZ2VyOwogaW1wb3J0IG9yZy5j
cm9zc3dpcmUuanN3b3JkLmJvb2suQm9va0V4Y2VwdGlvbjsKIGltcG9ydCBvcmcuY3Jvc3N3
aXJlLmpzd29yZC5ib29rLkRpY3Rpb25hcnk7CiBpbXBvcnQgb3JnLmNyb3Nzd2lyZS5qc3dv
cmQuYm9vay5EaWN0aW9uYXJ5TWV0YURhdGE7CkBAIC0xNTksNyArMTYxLDIwIEBACiAgICAg
ICAgICAgICBsaS5zdGFydERvY3VtZW50KGdldERpY3Rpb25hcnlNZXRhRGF0YSgpLmdldElu
aXRpYWxzKCkpOwogICAgICAgICAgICAgbGkuc3RhcnRTZWN0aW9uKGtleS5nZXRUZXh0KCkp
OwogCi0gICAgICAgICAgICBTdHJpbmcgdGV4dCA9IG5ldyBTdHJpbmcoYmFja2VuZC5nZXRS
YXdUZXh0KGtleSkpOworICAgICAgICAgICAgYnl0ZVtdIGRhdGEgPSBiYWNrZW5kLmdldFJh
d1RleHQoa2V5KTsKKyAgICAgICAgICAgIFN0cmluZyBtb2R1bGVDaGFyc2V0ID0gY29uZmln
LmdldE1vZHVsZUNoYXJzZXQoKTsKKyAgICAgICAgICAgIFN0cmluZyB0ZXh0ID0gbnVsbDsK
KyAgICAgICAgICAgIHRyeQorICAgICAgICAgICAgeworICAgICAgICAgICAgICAgIHRleHQg
PSBuZXcgU3RyaW5nKGRhdGEsIG1vZHVsZUNoYXJzZXQpOworICAgICAgICAgICAgfQorICAg
ICAgICAgICAgY2F0Y2goVW5zdXBwb3J0ZWRFbmNvZGluZ0V4Y2VwdGlvbiB1blN1cEVuRXgp
CisgICAgICAgICAgICB7CisgICAgICAgICAgICAgICAgLy8gSXQgaXMgaW1wb3NzaWJsZSEg
SW4gY2FzZSwgdXNlIHN5c3RlbSBkZWZhdWx0Li4uCisgICAgICAgICAgICAgICAgbG9nLmVy
cm9yKCJFbmNvZGluZzogIiArIG1vZHVsZUNoYXJzZXQgKyAiIG5vdCBzdXBwb3J0ZWQiLAor
ICAgICAgICAgICAgICAgIHVuU3VwRW5FeCk7CisgICAgICAgICAgICAgICAgdGV4dCA9IG5l
dyBTdHJpbmcoZGF0YSk7CisgICAgICAgICAgICB9CiAgICAgICAgICAgICBjb25maWcuZ2V0
RmlsdGVyKCkudG9PU0lTKGxpLCB0ZXh0KTsKIAogICAgICAgICAgICAgbGkuZW5kU2VjdGlv
bigpOwpAQCAtMTkxLDYgKzIwNiwxMSBAQAogICAgICAqLwogICAgIHByaXZhdGUgU3dvcmRD
b25maWcgY29uZmlnOwogCisgICAgLyoqCisgICAgICogVGhlIGxvZyBzdHJlYW0KKyAgICAg
Ki8KKyAgICBwcml2YXRlIHN0YXRpYyBMb2dnZXIgbG9nID0gTG9nZ2VyLmdldExvZ2dlcihT
d29yZERpY3Rpb25hcnkuY2xhc3MpOworICAgIAogICAgIC8qKgogICAgICAqIG91ciBtZXRh
IGRhdGEKICAgICAgKi8KSW5kZXg6IGpzd29yZC9qYXZhL2pzd29yZHRlc3Qvb3JnL2Nyb3Nz
d2lyZS9qc3dvcmQvcGFzc2FnZS9UZXN0UGFzc2FnZVRhbGx5Mi5qYXZhCj09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT0KUkNTIGZpbGU6IC9jdnMvanN3b3JkL2pzd29yZC9qYXZhL2pzd29yZHRlc3Qvb3JnL2Ny
b3Nzd2lyZS9qc3dvcmQvcGFzc2FnZS9UZXN0UGFzc2FnZVRhbGx5Mi5qYXZhLHYKcmV0cmll
dmluZyByZXZpc2lvbiAxLjMKZGlmZiAtdSAtcjEuMyBUZXN0UGFzc2FnZVRhbGx5Mi5qYXZh
Ci0tLSBqc3dvcmQvamF2YS9qc3dvcmR0ZXN0L29yZy9jcm9zc3dpcmUvanN3b3JkL3Bhc3Nh
Z2UvVGVzdFBhc3NhZ2VUYWxseTIuamF2YQkyNSBOb3YgMjAwMiAxODowNzo0OCAtMDAwMAkx
LjMKKysrIGpzd29yZC9qYXZhL2pzd29yZHRlc3Qvb3JnL2Nyb3Nzd2lyZS9qc3dvcmQvcGFz
c2FnZS9UZXN0UGFzc2FnZVRhbGx5Mi5qYXZhCTggTWF5IDIwMDMgMDk6NDk6MzIgLTAwMDAK
QEAgLTEsOCArMSw4IEBACiAKIHBhY2thZ2Ugb3JnLmNyb3Nzd2lyZS5qc3dvcmQucGFzc2Fn
ZTsKIAotaW1wb3J0IGphdmEuaW8uRmlsZUlucHV0U3RyZWFtOwotaW1wb3J0IGphdmEuaW8u
RmlsZU91dHB1dFN0cmVhbTsKK2ltcG9ydCBqYXZhLmlvLkJ5dGVBcnJheUlucHV0U3RyZWFt
OworaW1wb3J0IGphdmEuaW8uQnl0ZUFycmF5T3V0cHV0U3RyZWFtOwogaW1wb3J0IGphdmEu
aW8uT2JqZWN0SW5wdXRTdHJlYW07CiBpbXBvcnQgamF2YS5pby5PYmplY3RPdXRwdXRTdHJl
YW07CiBpbXBvcnQgamF2YS51dGlsLkl0ZXJhdG9yOwpAQCAtMjk4LDE0ICsyOTgsMTQgQEAK
IAogICAgIHB1YmxpYyB2b2lkIHRlc3RPYmplY3QoKSB0aHJvd3MgRXhjZXB0aW9uCiAgICAg
ewotICAgICAgICBGaWxlT3V0cHV0U3RyZWFtIGZpbGVfb3V0ID0gbmV3IEZpbGVPdXRwdXRT
dHJlYW0oInRtcC5zZXIiKTsKLSAgICAgICAgT2JqZWN0T3V0cHV0U3RyZWFtIG9ial9vdXQg
PSBuZXcgT2JqZWN0T3V0cHV0U3RyZWFtKGZpbGVfb3V0KTsKKyAgICAgICAgQnl0ZUFycmF5
T3V0cHV0U3RyZWFtIGJvdXQgPSBuZXcgQnl0ZUFycmF5T3V0cHV0U3RyZWFtKCk7CisgICAg
ICAgIE9iamVjdE91dHB1dFN0cmVhbSBvYmpfb3V0ID0gbmV3IE9iamVjdE91dHB1dFN0cmVh
bShib3V0KTsKICAgICAgICAgb2JqX291dC53cml0ZU9iamVjdCh0YWxseSk7CiAgICAgICAg
IG9ial9vdXQud3JpdGVPYmplY3QoZW1wdHkpOwogICAgICAgICBvYmpfb3V0LmNsb3NlKCk7
CiAgICAgICAgIG9ial9vdXQgPSBudWxsOwotICAgICAgICBGaWxlSW5wdXRTdHJlYW0gZmls
ZV9pbiA9IG5ldyBGaWxlSW5wdXRTdHJlYW0oInRtcC5zZXIiKTsKLSAgICAgICAgT2JqZWN0
SW5wdXRTdHJlYW0gb2JqX2luID0gbmV3IE9iamVjdElucHV0U3RyZWFtKGZpbGVfaW4pOwor
ICAgICAgICBCeXRlQXJyYXlJbnB1dFN0cmVhbSBiaW4gPSBuZXcgQnl0ZUFycmF5SW5wdXRT
dHJlYW0oYm91dC50b0J5dGVBcnJheSgpKTsKKyAgICAgICAgT2JqZWN0SW5wdXRTdHJlYW0g
b2JqX2luID0gbmV3IE9iamVjdElucHV0U3RyZWFtKGJpbik7CiAgICAgICAgIFBhc3NhZ2Ug
Z2VuMV8xMzVfY29weSA9IChQYXNzYWdlKSBvYmpfaW4ucmVhZE9iamVjdCgpOwogICAgICAg
ICBQYXNzYWdlIGV4bzJhXzNiX2NvcHkgPSAoUGFzc2FnZSkgb2JqX2luLnJlYWRPYmplY3Qo
KTsKICAgICAgICAgb2JqX2luLmNsb3NlKCk7CkluZGV4OiBqc3dvcmQvamF2YS9tYXB0ZXN0
L29yZy9jcm9zc3dpcmUvanN3b3JkL21hcC9tb2RlbC9UZXN0TGlua0FycmF5LmphdmEKPT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PQpSQ1MgZmlsZTogL2N2cy9qc3dvcmQvanN3b3JkL2phdmEvbWFwdGVzdC9v
cmcvY3Jvc3N3aXJlL2pzd29yZC9tYXAvbW9kZWwvVGVzdExpbmtBcnJheS5qYXZhLHYKcmV0
cmlldmluZyByZXZpc2lvbiAxLjcKZGlmZiAtdSAtcjEuNyBUZXN0TGlua0FycmF5LmphdmEK
LS0tIGpzd29yZC9qYXZhL21hcHRlc3Qvb3JnL2Nyb3Nzd2lyZS9qc3dvcmQvbWFwL21vZGVs
L1Rlc3RMaW5rQXJyYXkuamF2YQk1IEphbiAyMDAzIDEzOjI1OjMyIC0wMDAwCTEuNworKysg
anN3b3JkL2phdmEvbWFwdGVzdC9vcmcvY3Jvc3N3aXJlL2pzd29yZC9tYXAvbW9kZWwvVGVz
dExpbmtBcnJheS5qYXZhCTggTWF5IDIwMDMgMDk6NDk6MzIgLTAwMDAKQEAgLTEsNyArMSw3
IEBACiAKIHBhY2thZ2Ugb3JnLmNyb3Nzd2lyZS5qc3dvcmQubWFwLm1vZGVsOwogCi1pbXBv
cnQgamF2YS5pby5GaWxlT3V0cHV0U3RyZWFtOworaW1wb3J0IGphdmEuaW8uQnl0ZUFycmF5
T3V0cHV0U3RyZWFtOwogaW1wb3J0IGphdmEuaW8uT2JqZWN0T3V0cHV0U3RyZWFtOwogCiBp
bXBvcnQganVuaXQuZnJhbWV3b3JrLlRlc3RDYXNlOwpAQCAtNTUsNyArNTUsNyBAQAogICAg
ICAgICBCaWJsZSBiaWJsZSA9IERlZmF1bHRzLmdldEJpYmxlTWV0YURhdGEoKS5nZXRCaWJs
ZSgpOwogICAgICAgICBMaW5rQXJyYXkgbGEgPSBuZXcgTGlua0FycmF5KGJpYmxlKTsKIAot
ICAgICAgICBPYmplY3RPdXRwdXRTdHJlYW0gb3V0ID0gbmV3IE9iamVjdE91dHB1dFN0cmVh
bShuZXcgRmlsZU91dHB1dFN0cmVhbSgiZm9vLmxhIikpOworICAgICAgICBPYmplY3RPdXRw
dXRTdHJlYW0gb3V0ID0gbmV3IE9iamVjdE91dHB1dFN0cmVhbShuZXcgQnl0ZUFycmF5T3V0
cHV0U3RyZWFtKCkpOwogICAgICAgICBvdXQud3JpdGVPYmplY3QobGEpOwogICAgICAgICBv
dXQuY2xvc2UoKTsKICAgICB9CkluZGV4OiBqc3dvcmQvdG9vbHMvY2hlY2tzdHlsZTMwL2N1
c3RvbS54bWwKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PQpSQ1MgZmlsZTogL2N2cy9qc3dvcmQvanN3b3JkL3Rv
b2xzL2NoZWNrc3R5bGUzMC9jdXN0b20ueG1sLHYKcmV0cmlldmluZyByZXZpc2lvbiAxLjEK
ZGlmZiAtdSAtcjEuMSBjdXN0b20ueG1sCi0tLSBqc3dvcmQvdG9vbHMvY2hlY2tzdHlsZTMw
L2N1c3RvbS54bWwJMjYgQXByIDIwMDMgMTY6NDg6MzQgLTAwMDAJMS4xCisrKyBqc3dvcmQv
dG9vbHMvY2hlY2tzdHlsZTMwL2N1c3RvbS54bWwJOCBNYXkgMjAwMyAwOTo0OTozNCAtMDAw
MApAQCAtNSwxNCArNSwxNCBAQAogCiA8bW9kdWxlIG5hbWU9IkNoZWNrZXIiPgogCi0gIDxw
cm9wZXJ0eSBuYW1lPSJiYXNlZGlyIiB2YWx1ZT0iVDpcc2hhcmVcam9lXGpzd29yZFxqYXZh
XCIvPgorICA8cHJvcGVydHkgbmFtZT0iYmFzZWRpciIgdmFsdWU9IkBzb3VyY2UuamF2YUAi
Lz4KIAogICA8IS0tIGVuZm9yY2UgcGFja2FnZSBkb2N1bWVudGF0aW9uIC0tPgogICA8bW9k
dWxlIG5hbWU9IlBhY2thZ2VIdG1sIi8+CiAKICAgPG1vZHVsZSBuYW1lPSJUcmVlV2Fsa2Vy
Ij4KIAotICAgIDxwcm9wZXJ0eSBuYW1lPSJjYWNoZUZpbGUiIHZhbHVlPSJUOlxzaGFyZVxq
b2VcanN3b3JkXHRhcmdldFxhbnRcdGVtcFxjaGVja3N0eWxlXGNhY2hlZmlsZS5kYXQiLz4K
KyAgICA8cHJvcGVydHkgbmFtZT0iY2FjaGVGaWxlIiB2YWx1ZT0iQHRhcmdldC5jaGVja3N0
eWxlQC9jYWNoZWZpbGUuZGF0Ii8+CiAKICAgICA8IS0tIEphdmFEb2MgY2hlY2tzIC0tPgog
ICAgIDxtb2R1bGUgbmFtZT0iSWxsZWdhbEltcG9ydCIvPgoK
--------------090107040207060109070704--