Return-Path: Delivered-To: apmail-ws-axis-dev-archive@www.apache.org Received: (qmail 18792 invoked from network); 3 Jan 2006 05:33:44 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 3 Jan 2006 05:33:44 -0000 Received: (qmail 3810 invoked by uid 500); 3 Jan 2006 05:33:43 -0000 Delivered-To: apmail-ws-axis-dev-archive@ws.apache.org Received: (qmail 3208 invoked by uid 500); 3 Jan 2006 05:33:41 -0000 Mailing-List: contact axis-dev-help@ws.apache.org; run by ezmlm Precedence: bulk Reply-To: axis-dev@ws.apache.org list-help: list-unsubscribe: List-Post: List-Id: Delivered-To: mailing list axis-dev@ws.apache.org Received: (qmail 3197 invoked by uid 99); 3 Jan 2006 05:33:41 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 02 Jan 2006 21:33:41 -0800 X-ASF-Spam-Status: No, hits=-0.0 required=10.0 tests=SPF_PASS X-Spam-Check-By: apache.org Received-SPF: pass (asf.osuosl.org: domain of ssanka@gmail.com designates 66.249.82.204 as permitted sender) Received: from [66.249.82.204] (HELO xproxy.gmail.com) (66.249.82.204) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 02 Jan 2006 21:33:40 -0800 Received: by xproxy.gmail.com with SMTP id t15so1381894wxc for ; Mon, 02 Jan 2006 21:33:19 -0800 (PST) DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=beta; d=gmail.com; h=received:message-id:date:from:to:subject:mime-version:content-type; b=TtaJIZAqXv8frf4Rj6YgGNMjARD0KooCADgpySq6wUZQv8PKjukisU1ZvxnLJ8DhQ+7M5TtQyMlCHHfY/x2ml29ILO5uNnQyvz/4wWPXbidwRhrMs2GxZ/oLa7OsZI6qseD7rBm2OMpk8huL5e5oKbwJ4+OKcvK3wbNru8yjmD8= Received: by 10.70.118.1 with SMTP id q1mr13113074wxc; Mon, 02 Jan 2006 21:33:19 -0800 (PST) Received: by 10.70.109.7 with HTTP; Mon, 2 Jan 2006 21:33:19 -0800 (PST) Message-ID: <1e8c1ed40601022133y4c9e589ame7fe80e9b009a6b@mail.gmail.com> Date: Mon, 2 Jan 2006 23:33:19 -0600 From: Sanka Samaranayake To: axis-dev@ws.apache.org Subject: [AXIS2][PATCH] ExtElements and ExtAttributes Support in WOM MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="----=_Part_17526_2158526.1136266399611" X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N ------=_Part_17526_2158526.1136266399611 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable Content-Disposition: inline Ajith, Can you pls review and apply this patch which provides proper serialization of policy elements which can either be an ExtElement or an ExtAttribute. Thanks, Sanka ------=_Part_17526_2158526.1136266399611 Content-Type: text/x-patch; name="ExtElements-ExtAttributesSupport.patch" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="ExtElements-ExtAttributesSupport.patch" SW5kZXg6IHNyYy9vcmcvYXBhY2hlL2F4aXMyL3dzZGwvYnVpbGRlci93c2RsNGovV1NETFB1bXAu amF2YQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBzcmMvb3JnL2FwYWNoZS9heGlzMi93c2RsL2J1aWxkZXIvd3Nk bDRqL1dTRExQdW1wLmphdmEJKHJldmlzaW9uIDM2NTUyNykKKysrIHNyYy9vcmcvYXBhY2hlL2F4 aXMyL3dzZGwvYnVpbGRlci93c2RsNGovV1NETFB1bXAuamF2YQkod29ya2luZyBjb3B5KQpAQCAt MTgsMTAgKzE4LDE0IEBACiAKIGltcG9ydCBjb20uaWJtLndzZGwuZXh0ZW5zaW9ucy5zb2FwLlNP QVBDb25zdGFudHM7CiBpbXBvcnQgb3JnLmFwYWNoZS5heGlzMi53c2RsLmJ1aWxkZXIuV1NETENv bXBvbmVudEZhY3Rvcnk7CitpbXBvcnQgb3JnLmFwYWNoZS53cy5wb2xpY3kudXRpbC5ET01Qb2xp Y3lSZWFkZXI7CitpbXBvcnQgb3JnLmFwYWNoZS53cy5wb2xpY3kudXRpbC5PTVBvbGljeVJlYWRl cjsKK2ltcG9ydCBvcmcuYXBhY2hlLndzLnBvbGljeS51dGlsLlBvbGljeUZhY3Rvcnk7CiBpbXBv cnQgb3JnLmFwYWNoZS53c2RsLio7CiBpbXBvcnQgb3JnLmFwYWNoZS53c2RsLmV4dGVuc2lvbnMu RGVmYXVsdEV4dGVuc2liaWxpdHlFbGVtZW50OwogaW1wb3J0IG9yZy5hcGFjaGUud3NkbC5leHRl bnNpb25zLkV4dGVuc2lvbkNvbnN0YW50czsKIGltcG9ydCBvcmcuYXBhY2hlLndzZGwuZXh0ZW5z aW9ucy5FeHRlbnNpb25GYWN0b3J5OworaW1wb3J0IG9yZy5hcGFjaGUud3NkbC5leHRlbnNpb25z LlBvbGljeUV4dGVuc2liaWxpdHlFbGVtZW50OwogaW1wb3J0IG9yZy5hcGFjaGUud3NkbC5pbXBs LldTRExQcm9jZXNzaW5nRXhjZXB0aW9uOwogaW1wb3J0IG9yZy53M2MuZG9tLkRvY3VtZW50Owog aW1wb3J0IG9yZy53M2MuZG9tLkVsZW1lbnQ7CkBAIC0xMDM1LDYgKzEwMzksMTkgQEAKICAgICAg ICAgICAgICAgICAgICAgRWxlbWVudCBlbGVtZW50ID0gdW5rbm93bi5nZXRFbGVtZW50KCk7CiAg ICAgICAgICAgICAgICAgICAgIHNvYXBBZGRyZXNzRXh0ZW5zaWJpbHR5RWxlbWVudC5zZXRMb2Nh dGlvblVSSShlbGVtZW50LmdldEF0dHJpYnV0ZSgibG9jYXRpb24iKSk7CiAgICAgICAgICAgICAg ICAgICAgIGNvbXBvbmVudC5hZGRFeHRlbnNpYmlsaXR5RWxlbWVudChzb2FwQWRkcmVzc0V4dGVu c2liaWx0eUVsZW1lbnQpOworICAgICAgICAgICAgICAgICAgICAKKyAgICAgICAgICAgICAgICB9 IGVsc2UgaWYgKEV4dGVuc2lvbkNvbnN0YW50cy5QT0xJQ1kuZXF1YWxzKHVua25vd24uZ2V0RWxl bWVudFR5cGUoKSkpIHsKKyAgICAgICAgICAgICAgICAgICAgUG9saWN5RXh0ZW5zaWJpbGl0eUVs ZW1lbnQgcG9saWN5RXh0ZW5zaWJpbGl0eUVsZW1lbnQgPSAoUG9saWN5RXh0ZW5zaWJpbGl0eUVs ZW1lbnQpIGV4dGVuc2lvbkZhY3RvcnkuZ2V0RXh0ZW5zaW9uRWxlbWVudCh3c2RsNGpFbGVtZW50 LmdldEVsZW1lbnRUeXBlKCkpOworICAgICAgICAgICAgICAgICAgICBET01Qb2xpY3lSZWFkZXIg cG9saWN5UmVhZGVyID0gKERPTVBvbGljeVJlYWRlcikgUG9saWN5RmFjdG9yeS5nZXRQb2xpY3lS ZWFkZXIoUG9saWN5RmFjdG9yeS5ET01fUE9MSUNZX1JFQURFUik7CisgICAgICAgICAgICAgICAg ICAgIHBvbGljeUV4dGVuc2liaWxpdHlFbGVtZW50LnNldFBvbGljeUVsZW1lbnQocG9saWN5UmVh ZGVyLnJlYWRQb2xpY3kodW5rbm93bi5nZXRFbGVtZW50KCkpKTsgICAgICAgICAgICAgICAgICAg IAorICAgICAgICAgICAgICAgICAgICBjb21wb25lbnQuYWRkRXh0ZW5zaWJpbGl0eUVsZW1lbnQo cG9saWN5RXh0ZW5zaWJpbGl0eUVsZW1lbnQpOworICAgICAgICAgICAgICAgICAgICAKKyAgICAg ICAgICAgICAgICB9IGVsc2UgaWYgKEV4dGVuc2lvbkNvbnN0YW50cy5QT0xJQ1lfUkVGRVJFTkNF LmVxdWFscyh1bmtub3duLmdldEVsZW1lbnRUeXBlKCkpKSB7CisgICAgICAgICAgICAgICAgICAg IFBvbGljeUV4dGVuc2liaWxpdHlFbGVtZW50IHBvbGljeUV4dGVuc2liaWxpdHlFbGVtZW50ID0g KFBvbGljeUV4dGVuc2liaWxpdHlFbGVtZW50KSBleHRlbnNpb25GYWN0b3J5LmdldEV4dGVuc2lv bkVsZW1lbnQod3NkbDRqRWxlbWVudC5nZXRFbGVtZW50VHlwZSgpKTsKKyAgICAgICAgICAgICAg ICAgICAgRE9NUG9saWN5UmVhZGVyIHBvbGljeVJlYWRlciA9IChET01Qb2xpY3lSZWFkZXIpIFBv bGljeUZhY3RvcnkuZ2V0UG9saWN5UmVhZGVyKFBvbGljeUZhY3RvcnkuRE9NX1BPTElDWV9SRUFE RVIpOworICAgICAgICAgICAgICAgICAgICBwb2xpY3lFeHRlbnNpYmlsaXR5RWxlbWVudC5zZXRQ b2xpY3lFbGVtZW50KHBvbGljeVJlYWRlci5yZWFkUG9saWN5UmVmZXJlbmNlKHVua25vd24uZ2V0 RWxlbWVudCgpKSk7CisgICAgICAgICAgICAgICAgICAgIGNvbXBvbmVudC5hZGRFeHRlbnNpYmls aXR5RWxlbWVudChwb2xpY3lFeHRlbnNpYmlsaXR5RWxlbWVudCk7ICAgICAgICAgICAgICAgICAg IAorICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICB9ZWxzZXsKIAogICAgICAg ICAgICAgICAgICAgICBEZWZhdWx0RXh0ZW5zaWJpbGl0eUVsZW1lbnQgZGVmYXVsdEV4dGVuc2li aWxpdHlFbGVtZW50ID0gKERlZmF1bHRFeHRlbnNpYmlsaXR5RWxlbWVudCkgZXh0ZW5zaW9uRmFj dG9yeQpJbmRleDogc3JjL29yZy9hcGFjaGUvYXhpczIvd3NkbC93cml0ZXIvV09NdG9XU0RMMTFX cml0ZXIuamF2YQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBzcmMvb3JnL2FwYWNoZS9heGlzMi93c2RsL3dyaXRl ci9XT010b1dTREwxMVdyaXRlci5qYXZhCShyZXZpc2lvbiAzNjU1MjcpCisrKyBzcmMvb3JnL2Fw YWNoZS9heGlzMi93c2RsL3dyaXRlci9XT010b1dTREwxMVdyaXRlci5qYXZhCSh3b3JraW5nIGNv cHkpCkBAIC02LDYgKzYsMTAgQEAKIGltcG9ydCBvcmcuYXBhY2hlLmF4aXMyLm9tLk9NRmFjdG9y eTsKIGltcG9ydCBvcmcuYXBhY2hlLmF4aXMyLm9tLmltcGwubGxvbS5idWlsZGVyLlN0QVhPTUJ1 aWxkZXI7CiBpbXBvcnQgb3JnLmFwYWNoZS5heGlzMi53c2RsLldTRExWZXJzaW9uV3JhcHBlcjsK K2ltcG9ydCBvcmcuYXBhY2hlLndzLnBvbGljeS5Qb2xpY3k7CitpbXBvcnQgb3JnLmFwYWNoZS53 cy5wb2xpY3kuUG9saWN5UmVmZXJlbmNlOworaW1wb3J0IG9yZy5hcGFjaGUud3MucG9saWN5LnV0 aWwuUG9saWN5RmFjdG9yeTsKK2ltcG9ydCBvcmcuYXBhY2hlLndzLnBvbGljeS51dGlsLlN0QVhQ b2xpY3lXcml0ZXI7CiBpbXBvcnQgb3JnLmFwYWNoZS53c2RsLio7CiBpbXBvcnQgb3JnLmFwYWNo ZS53c2RsLmV4dGVuc2lvbnMuKjsKIGltcG9ydCBvcmcudzNjLmRvbS5FbGVtZW50OwpAQCAtMTUs NiArMTksNyBAQAogaW1wb3J0IGphdmF4LndzZGwueG1sLldTRExXcml0ZXI7CiBpbXBvcnQgamF2 YXgueG1sLm5hbWVzcGFjZS5RTmFtZTsKIGltcG9ydCBqYXZheC54bWwuc3RyZWFtLio7CisKIGlt cG9ydCBqYXZhLmlvLio7CiBpbXBvcnQgamF2YS51dGlsLkhhc2hNYXA7CiBpbXBvcnQgamF2YS51 dGlsLkl0ZXJhdG9yOwpAQCAtMTIwLDcgKzEyNSwxMCBAQAogICAgICAgICAgICAgZmluZFNPQVBO c1ByZWZpeCh3c2RsRGVzY3JpcHRpb24pOwogICAgICAgICAgICAgLy93cml0ZSB0aGUgaW1wb3J0 cwogICAgICAgICAgICAgd3JpdGVJbXBvcnRzKHdzZGxEZXNjcmlwdGlvbik7Ci0gICAgICAgICAg ICAvL3dyaXRlICB0aGUgdHlwZXMKKyAgICAgICAgICAgIC8vd3JpdGUgZXh0ZW5zaWJpbGl0eSBl bGVtZW50cworICAgICAgICAgICAgaGFuZGxlRXh0ZW5zaWJpbHR5RWxlbWVudHMod3NkbERlc2Ny aXB0aW9uLmdldEV4dGVuc2liaWxpdHlFbGVtZW50cygpKTsKKyAgICAgICAgICAgIAorICAgICAg ICAgICAgLy93cml0ZSAgdGhlIHR5cGVzICAgICAgICAgICAgCiAgICAgICAgICAgICB3cml0ZVR5 cGVzKHdzZGxEZXNjcmlwdGlvbik7CiAgICAgICAgICAgICAvL3dyaXRlIHRoZSBtZXNzYWdlcwog ICAgICAgICAgICAgd3JpdGVNZXNzYWdlcyh3c2RsRGVzY3JpcHRpb24pOwpAQCAtMTU1LDYgKzE2 Myw3IEBACiAgICAgICAgICAgICAgICAgc2VydmljZSA9IChXU0RMU2VydmljZSkgc2VydmljZUl0 ZXJhdG9yLm5leHQoKTsKICAgICAgICAgICAgICAgICB3cml0ZXIud3JpdGVTdGFydEVsZW1lbnQo ZGVmYXVsdFdTRExQcmVmaXgsICJzZXJ2aWNlIiwgV1NETDFfMV9OQU1FU1BBQ0VfVVJJKTsKICAg ICAgICAgICAgICAgICB3cml0ZXIud3JpdGVBdHRyaWJ1dGUoIm5hbWUiLCBzZXJ2aWNlLmdldE5h bWUoKS5nZXRMb2NhbFBhcnQoKSk7CisgICAgICAgICAgICAgICAgaGFuZGxlRXh0ZW5zaWJpbHR5 RWxlbWVudHMoc2VydmljZS5nZXRFeHRlbnNpYmlsaXR5RWxlbWVudHMoKSk7CiAgICAgICAgICAg ICAgICAgLy93cnRpZSB0aGUgcG9ydHR5cGVzCiAgICAgICAgICAgICAgICAgTWFwIGVuZFBvaW50 TWFwID0gc2VydmljZS5nZXRFbmRwb2ludHMoKTsKICAgICAgICAgICAgICAgICBpZiAoZW5kUG9p bnRNYXAgIT0gbnVsbCAmJiAhZW5kUG9pbnRNYXAuaXNFbXB0eSgpKSB7CkBAIC00MTAsOCArNDE5 LDEwIEBACiAKICAgICAvKioKICAgICAgKiBAcGFyYW0gZGVzYworICAgICAqIEB0aHJvd3MgWE1M U3RyZWFtRXhjZXB0aW9uCisgICAgICogQHRocm93cyBJT0V4Y2VwdGlvbgogICAgICAqLwotICAg IHByb3RlY3RlZCB2b2lkIHdyaXRlUG9ydFR5cGVzKFdTRExEZXNjcmlwdGlvbiBkZXNjKSB0aHJv d3MgWE1MU3RyZWFtRXhjZXB0aW9uIHsKKyAgICBwcm90ZWN0ZWQgdm9pZCB3cml0ZVBvcnRUeXBl cyhXU0RMRGVzY3JpcHRpb24gZGVzYykgdGhyb3dzIFhNTFN0cmVhbUV4Y2VwdGlvbiwgSU9FeGNl cHRpb24gewogICAgICAgICBNYXAgaW50ZXJmYWNlTWFwID0gZGVzYy5nZXRXc2RsSW50ZXJmYWNl cygpOwogICAgICAgICBpZiAoIWludGVyZmFjZU1hcC5pc0VtcHR5KCkpIHsKICAgICAgICAgICAg IEl0ZXJhdG9yIGludGVyZmFjZUl0ZXJhdG9yID0gaW50ZXJmYWNlTWFwLnZhbHVlcygpLml0ZXJh dG9yKCk7CkBAIC00MjEsNyArNDMyLDggQEAKICAgICAgICAgICAgICAgICB3cml0ZXIud3JpdGVT dGFydEVsZW1lbnQoZGVmYXVsdFdTRExQcmVmaXgsIFBPUlRUWVBFX05BTUUsIFdTREwxXzFfTkFN RVNQQUNFX1VSSSk7CiAgICAgICAgICAgICAgICAgd3JpdGVyLndyaXRlQXR0cmlidXRlKCJuYW1l IiwKICAgICAgICAgICAgICAgICAgICAgICAgIHdzZGxJbnRlcmZhY2UuZ2V0TmFtZSgpID09IG51 bGwgPyAiIiA6IHdzZGxJbnRlcmZhY2UuZ2V0TmFtZSgpLmdldExvY2FsUGFydCgpKTsKLQorICAg ICAgICAgICAgICAgIC8vd3JpdGUgZXh0ZW5zaWJpbGl0eSBhdHRyaWJ1dGVzCisgICAgICAgICAg ICAgICAgaGFuZGxlRXh0ZW5zaWJpbGl0eUF0dHJpYnV0ZXMod3NkbEludGVyZmFjZS5nZXRFeHRl bnNpYmlsaXR5QXR0cmlidXRlcygpKTsKICAgICAgICAgICAgICAgICAvL3dyaXRlIHRoZSBvcGVy YXRpb25zCiAgICAgICAgICAgICAgICAgd3JpdGVQb3J0dHlwZU9wZXJhdGlvbnMod3NkbEludGVy ZmFjZSk7CiAKQEAgLTQzNyw4ICs0NDksMTAgQEAKICAgICAgKiBXcml0ZXMgdGhlIG9wZXJhdGlv bi4KICAgICAgKgogICAgICAqIEBwYXJhbSB3c2RsSW50ZXJmYWNlCisgICAgICogQHRocm93cyBY TUxTdHJlYW1FeGNlcHRpb24KKyAgICAgKiBAdGhyb3dzIElPRXhjZXB0aW9uCiAgICAgICovCi0g ICAgcHJvdGVjdGVkIHZvaWQgd3JpdGVQb3J0dHlwZU9wZXJhdGlvbnMoV1NETEludGVyZmFjZSB3 c2RsSW50ZXJmYWNlKSB0aHJvd3MgWE1MU3RyZWFtRXhjZXB0aW9uIHsKKyAgICBwcm90ZWN0ZWQg dm9pZCB3cml0ZVBvcnR0eXBlT3BlcmF0aW9ucyhXU0RMSW50ZXJmYWNlIHdzZGxJbnRlcmZhY2Up IHRocm93cyBYTUxTdHJlYW1FeGNlcHRpb24sIElPRXhjZXB0aW9uIHsKICAgICAgICAgTWFwIG9w ZXJhdGlvbnNNYXAgPSB3c2RsSW50ZXJmYWNlLmdldE9wZXJhdGlvbnMoKTsKICAgICAgICAgaWYg KCFvcGVyYXRpb25zTWFwLmlzRW1wdHkoKSkgewogICAgICAgICAgICAgSXRlcmF0b3Igb3BJdGVy YXRvciA9IG9wZXJhdGlvbnNNYXAudmFsdWVzKCkuaXRlcmF0b3IoKTsKQEAgLTQ0OSwxMiArNDYz LDE2IEBACiAgICAgICAgICAgICAgICAgd3JpdGVyLndyaXRlQXR0cmlidXRlKCJuYW1lIiwgb3Bl cmF0aW9uLmdldE5hbWUoKSA9PSBudWxsID8gIiIgOiBvcGVyYXRpb24uZ2V0TmFtZSgpLmdldExv Y2FsUGFydCgpKTsKIC8vICAgICAgICAgICAgICAgIHdyaXRlci53cml0ZUVuZEVsZW1lbnQoKTsK ICAgICAgICAgICAgICAgICAvL3dyaXRlIHRoZSBpbnB1dHMKKyAgICAgICAgICAgICAgICAvL3dy aXRlIGV4dGVuc2liaWxpdHkgZWxlbWVudHMKKyAgICAgICAgICAgICAgICBoYW5kbGVFeHRlbnNp YmlsdHlFbGVtZW50cyhvcGVyYXRpb24uZ2V0RXh0ZW5zaWJpbGl0eUVsZW1lbnRzKCkpOwogICAg ICAgICAgICAgICAgIFdTREwxMU1lc3NhZ2UgbWVzc2FnZTsKICAgICAgICAgICAgICAgICBNZXNz YWdlUmVmZXJlbmNlIGlucHV0TWVzc2FnZSA9IG9wZXJhdGlvbi5nZXRJbnB1dE1lc3NhZ2UoKTsK ICAgICAgICAgICAgICAgICBpZiAoaW5wdXRNZXNzYWdlICE9IG51bGwpIHsKICAgICAgICAgICAg ICAgICAgICAgbWVzc2FnZSA9IChXU0RMMTFNZXNzYWdlKSBtZXNzYWdlTWFwLmdldChpbnB1dE1l c3NhZ2UuZ2V0RWxlbWVudFFOYW1lKCkpOwogICAgICAgICAgICAgICAgICAgICB3cml0ZXIud3Jp dGVTdGFydEVsZW1lbnQoZGVmYXVsdFdTRExQcmVmaXgsIElOUFVUX05BTUUsIFdTREwxXzFfTkFN RVNQQUNFX1VSSSk7CiAgICAgICAgICAgICAgICAgICAgIHdyaXRlci53cml0ZUF0dHJpYnV0ZSgi bWVzc2FnZSIsIHRhcmdldE5hbWVzcGFjZVByZWZpeCArICI6IiArIG1lc3NhZ2UuZ2V0TWVzc2Fn ZU5hbWUoKSk7CisgICAgICAgICAgICAgICAgICAgIC8vd3JpdGUgZXh0ZW5zaWJpbGl0eSBhdHRy aWJ1dGVzCisgICAgICAgICAgICAgICAgICAgIGhhbmRsZUV4dGVuc2liaWxpdHlBdHRyaWJ1dGVz KGlucHV0TWVzc2FnZS5nZXRFeHRlbnNpYmlsaXR5QXR0cmlidXRlcygpKTsKICAgICAgICAgICAg ICAgICAgICAgd3JpdGVyLndyaXRlRW5kRWxlbWVudCgpOwogICAgICAgICAgICAgICAgIH0KIApA QCAtNDY0LDYgKzQ4Miw4IEBACiAgICAgICAgICAgICAgICAgICAgIG1lc3NhZ2UgPSAoV1NETDEx TWVzc2FnZSkgbWVzc2FnZU1hcC5nZXQob3V0cHV0TWVzc2FnZS5nZXRFbGVtZW50UU5hbWUoKSk7 CiAgICAgICAgICAgICAgICAgICAgIHdyaXRlci53cml0ZVN0YXJ0RWxlbWVudChkZWZhdWx0V1NE TFByZWZpeCwgT1VUUFVUX05BTUUsIFdTREwxXzFfTkFNRVNQQUNFX1VSSSk7CiAgICAgICAgICAg ICAgICAgICAgIHdyaXRlci53cml0ZUF0dHJpYnV0ZSgibWVzc2FnZSIsIHRhcmdldE5hbWVzcGFj ZVByZWZpeCArICI6IiArIG1lc3NhZ2UuZ2V0TWVzc2FnZU5hbWUoKSk7CisvLyAgICAgICAgICAg ICAgICAgIHdyaXRlIGV4dGVuc2liaWxpdHkgYXR0cmlidXRlcworICAgICAgICAgICAgICAgICAg ICBoYW5kbGVFeHRlbnNpYmlsaXR5QXR0cmlidXRlcyhvdXRwdXRNZXNzYWdlLmdldEV4dGVuc2li aWxpdHlBdHRyaWJ1dGVzKCkpOwogICAgICAgICAgICAgICAgICAgICB3cml0ZXIud3JpdGVFbmRF bGVtZW50KCk7CiAgICAgICAgICAgICAgICAgfQogCkBAIC01MzEsNiArNTUxLDEzIEBACiAgICAg ICAgIHdyaXRlci53cml0ZUVuZEVsZW1lbnQoKTsKICAgICB9CiAKKyAgICBwcm90ZWN0ZWQgdm9p ZCBoYW5kbGVFeHRlbnNpYmlsaXR5QXR0cmlidXRlcyhMaXN0IGV4dEF0dHJpYnV0ZUxpc3QpIHRo cm93cyBYTUxTdHJlYW1FeGNlcHRpb24geworICAgICAgICBpbnQgZXh0QXR0cmlidXRlQ291bnQg PSBleHRBdHRyaWJ1dGVMaXN0LnNpemUoKTsKKyAgICAgICAgZm9yIChpbnQgaSA9IDA7IGkgPCBl eHRBdHRyaWJ1dGVDb3VudDsgaSsrKSB7CisgICAgICAgICAgICB3cml0ZUV4dGVuc2liaWxpdHlB dHRyaWJ1dGUoKFdTRExFeHRlbnNpYmlsaXR5QXR0cmlidXRlKSBleHRBdHRyaWJ1dGVMaXN0Lmdl dChpKSk7CisgICAgICAgIH0KKyAgICB9CisgICAgCiAgICAgcHJvdGVjdGVkIHZvaWQgaGFuZGxl RXh0ZW5zaWJpbHR5RWxlbWVudHMoTGlzdCBleHRFbGVtZW50TGlzdCkgdGhyb3dzIFhNTFN0cmVh bUV4Y2VwdGlvbiwgSU9FeGNlcHRpb24gewogICAgICAgICBpbnQgZXh0ZW5zaWJpbGl0eUVsZW1l bnRDb3VudCA9IGV4dEVsZW1lbnRMaXN0LnNpemUoKTsKICAgICAgICAgZm9yIChpbnQgaSA9IDA7 IGkgPCBleHRlbnNpYmlsaXR5RWxlbWVudENvdW50OyBpKyspIHsKQEAgLTU1MSw2ICs1NzgsMTMg QEAKICAgICAgICAgT01FbGVtZW50IHNjaGVhbUVsZW1lbnQgPSBzdGF4T01CdWlsZGVyLmdldERv Y3VtZW50RWxlbWVudCgpOwogICAgICAgICBzY2hlYW1FbGVtZW50LnNlcmlhbGl6ZSh3cml0ZXIp OwogICAgIH0KKyAgICAKKyAgICBwcm90ZWN0ZWQgdm9pZCB3cml0ZUV4dGVuc2liaWxpdHlBdHRy aWJ1dGUoV1NETEV4dGVuc2liaWxpdHlBdHRyaWJ1dGUgZXh0QXR0cmlidXRlKSB0aHJvd3MgWE1M U3RyZWFtRXhjZXB0aW9uIHsKKyAgICAgICAgUU5hbWUgcW5hbWUgPSBleHRBdHRyaWJ1dGUuZ2V0 S2V5KCk7CisgICAgICAgIFFOYW1lIHZhbHVlID0gZXh0QXR0cmlidXRlLmdldFZhbHVlKCk7Cisg ICAgICAgIAorICAgICAgICB3cml0ZXIud3JpdGVBdHRyaWJ1dGUocW5hbWUuZ2V0UHJlZml4KCks IHFuYW1lLmdldE5hbWVzcGFjZVVSSSgpLCBxbmFtZS5nZXRMb2NhbFBhcnQoKSwgdmFsdWUuZ2V0 TG9jYWxQYXJ0KCkpOworICAgIH0KIAogICAgIC8qKgogICAgICAqIEBwYXJhbSBleHRFbGVtZW50 CkBAIC01NzQsNiArNjA4LDggQEAKICAgICAgICAgICAgIHdyaXRlU09BUE9wZXh0ZW5zaWJpbGl0 eUVsZW1lbnQoKFNPQVBPcGVyYXRpb24pIGV4dEVsZW1lbnQpOwogICAgICAgICB9IGVsc2UgaWYg KGV4dEVsZW1lbnQgaW5zdGFuY2VvZiBTT0FQQm9keSkgewogICAgICAgICAgICAgd3JpdGVTT0FQ Qm9keUV4dGVuc2liaWxpdHlFbGVtZW50KChTT0FQQm9keSkgZXh0RWxlbWVudCk7CisgICAgICAg IH0gZWxzZSBpZiAoZXh0RWxlbWVudCBpbnN0YW5jZW9mIFBvbGljeUV4dGVuc2liaWxpdHlFbGVt ZW50KSB7CisgICAgICAgICAgICB3cml0ZVBvbGljeUV4dGVuc2liaWxpdHlFbGVtZW50KChQb2xp Y3lFeHRlbnNpYmlsaXR5RWxlbWVudCkgZXh0RWxlbWVudCk7CiAgICAgICAgIH0gZWxzZSB7CiAg ICAgICAgICAgICB3cml0ZXIud3JpdGVDb21tZW50KCIgVW5rbm93biBleHRlbnNpYmlsaXR5IGVs ZW1lbnQiICsgZXh0RWxlbWVudC50b1N0cmluZygpKTsKICAgICAgICAgfQpAQCAtNjE2LDYgKzY1 MiwxOCBAQAogICAgICAgICB3cml0ZXIud3JpdGVBdHRyaWJ1dGUoInN0eWxlIiwgc29hcG9wLmdl dFN0eWxlKCkpOwogICAgICAgICB3cml0ZXIud3JpdGVFbmRFbGVtZW50KCk7CiAgICAgfQorICAg IAorICAgIHByb3RlY3RlZCB2b2lkIHdyaXRlUG9saWN5RXh0ZW5zaWJpbGl0eUVsZW1lbnQoUG9s aWN5RXh0ZW5zaWJpbGl0eUVsZW1lbnQgcG9saWN5RXh0ZW5zaWJpbGl0eUVsZW1lbnQpIHRocm93 cyBYTUxTdHJlYW1FeGNlcHRpb24geworICAgICAgICBTdEFYUG9saWN5V3JpdGVyIHBvbGljeVdy aXRlciA9IChTdEFYUG9saWN5V3JpdGVyKSBQb2xpY3lGYWN0b3J5LmdldFBvbGljeVdyaXRlcihQ b2xpY3lGYWN0b3J5LlN0QVhfUE9MSUNZX1dSSVRFUik7CisgICAgICAgIE9iamVjdCBwb2xpY3lF bGVtZW50ID0gcG9saWN5RXh0ZW5zaWJpbGl0eUVsZW1lbnQuZ2V0UG9saWN5RWxlbWVudCgpOwor ICAgICAgICAKKyAgICAgICAgaWYgKHBvbGljeUVsZW1lbnQgaW5zdGFuY2VvZiBQb2xpY3kpIHsK KyAgICAgICAgICAgIHBvbGljeVdyaXRlci53cml0ZVBvbGljeSgoUG9saWN5KSBwb2xpY3lFbGVt ZW50LCB3cml0ZXIpOworICAgICAgICAgICAgICAgICAgICAgICAgCisgICAgICAgIH0gZWxzZSBp ZiAocG9saWN5RWxlbWVudCBpbnN0YW5jZW9mIFBvbGljeVJlZmVyZW5jZSkgeworICAgICAgICAg ICAgcG9saWN5V3JpdGVyLndyaXRlUG9saWN5UmVmZXJlbmNlKChQb2xpY3lSZWZlcmVuY2UpIHBv bGljeUVsZW1lbnQsIHdyaXRlcik7CisgICAgICAgIH0KKyAgICB9CiAKICAgICAvKioKICAgICAg KiBTaW5jZSB3ZSBoYXZlIG5vIHByb3BlciB3YXkgdG8gcmVwcmVzZW50IGEgV1NETCAxLjEgbWVz c2FnZSwgaGVyZSdzIGEgc2ltcGxlIGJlYW4gY2xhc3MgdG8KSW5kZXg6IHNyYy9vcmcvYXBhY2hl L3dzZGwvZXh0ZW5zaW9ucy9pbXBsL1BvbGljeUV4dGVuc2l0YmlsaXR5RWxlbWVudEltcGwuamF2 YQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBzcmMvb3JnL2FwYWNoZS93c2RsL2V4dGVuc2lvbnMvaW1wbC9Qb2xp Y3lFeHRlbnNpdGJpbGl0eUVsZW1lbnRJbXBsLmphdmEJKHJldmlzaW9uIDM2NTUyNykKKysrIHNy Yy9vcmcvYXBhY2hlL3dzZGwvZXh0ZW5zaW9ucy9pbXBsL1BvbGljeUV4dGVuc2l0YmlsaXR5RWxl bWVudEltcGwuamF2YQkod29ya2luZyBjb3B5KQpAQCAtMjQsMjAgKzI0LDIxIEBACiAgKiBAYXV0 aG9yIFNhbmthIFNhbWFyYW5heWFrZSAoc2Fua2FAYXBhY2hlLm9yZykKICAqLwogcHVibGljIGNs YXNzIFBvbGljeUV4dGVuc2l0YmlsaXR5RWxlbWVudEltcGwgZXh0ZW5kcyBXU0RMRXh0ZW5zaWJp bGl0eUVsZW1lbnRJbXBsIGltcGxlbWVudHMgUG9saWN5RXh0ZW5zaWJpbGl0eUVsZW1lbnQgewot ICAgIHByaXZhdGUgUG9saWN5IHBvbGljeTsKKyAgICBwcml2YXRlIE9iamVjdCBwb2xpY3lFbGVt ZW50OwogICAgIAogICAgIHB1YmxpYyBQb2xpY3lFeHRlbnNpdGJpbGl0eUVsZW1lbnRJbXBsKCkg ewogICAgIH0KICAgICAKLSAgICBwdWJsaWMgUG9saWN5RXh0ZW5zaXRiaWxpdHlFbGVtZW50SW1w bChQb2xpY3kgcG9saWN5KSB7Ci0gICAgICAgIHNldFBvbGljeShwb2xpY3kpOworICAgIAorICAg IHB1YmxpYyBQb2xpY3lFeHRlbnNpdGJpbGl0eUVsZW1lbnRJbXBsKE9iamVjdCBwb2xpY3lFbGVt ZW50KSB7CisgICAgICAgIHNldFBvbGljeUVsZW1lbnQocG9saWN5RWxlbWVudCk7CiAgICAgfQog ICAgIAotICAgIHB1YmxpYyB2b2lkIHNldFBvbGljeShQb2xpY3kgcG9saWN5KSB7Ci0gICAgICAg IHRoaXMucG9saWN5ID0gcG9saWN5OworICAgIHB1YmxpYyB2b2lkIHNldFBvbGljeUVsZW1lbnQo T2JqZWN0IHBvbGljeUVsZW1lbnQpIHsKKyAgICAgICAgdGhpcy5wb2xpY3lFbGVtZW50ID0gcG9s aWN5RWxlbWVudDsKICAgICB9CiAgICAgCi0gICAgcHVibGljIFBvbGljeSBnZXRQb2xpY3koKSB7 Ci0gICAgICAgIHJldHVybiBwb2xpY3k7CisgICAgcHVibGljIE9iamVjdCBnZXRQb2xpY3lFbGVt ZW50KCkgeworICAgICAgICByZXR1cm4gcG9saWN5RWxlbWVudDsKICAgICB9CiB9CkluZGV4OiBz cmMvb3JnL2FwYWNoZS93c2RsL2V4dGVuc2lvbnMvUG9saWN5RXh0ZW5zaWJpbGl0eUVsZW1lbnQu amF2YQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBzcmMvb3JnL2FwYWNoZS93c2RsL2V4dGVuc2lvbnMvUG9saWN5 RXh0ZW5zaWJpbGl0eUVsZW1lbnQuamF2YQkocmV2aXNpb24gMzY1NTI3KQorKysgc3JjL29yZy9h cGFjaGUvd3NkbC9leHRlbnNpb25zL1BvbGljeUV4dGVuc2liaWxpdHlFbGVtZW50LmphdmEJKHdv cmtpbmcgY29weSkKQEAgLTE2LDcgKzE2LDYgQEAKIAogcGFja2FnZSBvcmcuYXBhY2hlLndzZGwu ZXh0ZW5zaW9uczsKIAotaW1wb3J0IG9yZy5hcGFjaGUud3MucG9saWN5LlBvbGljeTsKIGltcG9y dCBvcmcuYXBhY2hlLndzZGwuV1NETEV4dGVuc2liaWxpdHlFbGVtZW50OwogCiAvKioKQEAgLTI0 LDcgKzIzLDcgQEAKICAqLwogcHVibGljIGludGVyZmFjZSBQb2xpY3lFeHRlbnNpYmlsaXR5RWxl bWVudCBleHRlbmRzIFdTRExFeHRlbnNpYmlsaXR5RWxlbWVudCB7CiAgICAgCi0gICAgcHVibGlj IHZvaWQgc2V0UG9saWN5KFBvbGljeSBwb2xpY3kpOworICAgIHB1YmxpYyB2b2lkIHNldFBvbGlj eUVsZW1lbnQoT2JqZWN0IHBvbGljeUVsZW1lbnQpOwogICAgIAotICAgIHB1YmxpYyBQb2xpY3kg Z2V0UG9saWN5KCk7CisgICAgcHVibGljIE9iamVjdCBnZXRQb2xpY3lFbGVtZW50KCk7CiB9Cklu ZGV4OiBzcmMvb3JnL2FwYWNoZS93c2RsL2V4dGVuc2lvbnMvRXh0ZW5zaW9uQ29uc3RhbnRzLmph dmEKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gc3JjL29yZy9hcGFjaGUvd3NkbC9leHRlbnNpb25zL0V4dGVuc2lv bkNvbnN0YW50cy5qYXZhCShyZXZpc2lvbiAzNjU1MjcpCisrKyBzcmMvb3JnL2FwYWNoZS93c2Rs L2V4dGVuc2lvbnMvRXh0ZW5zaW9uQ29uc3RhbnRzLmphdmEJKHdvcmtpbmcgY29weSkKQEAgLTU0 LDUgKzU0LDYgQEAKICAgICAgCiAgICAgIHB1YmxpYyBzdGF0aWMgZmluYWwgUU5hbWUgUE9MSUNZ ID0gbmV3IFFOYW1lKAogICAgICAgICAgICAgICJodHRwOi8vc2NoZW1hcy54bWxzb2FwLm9yZy93 cy8yMDA0LzA5L3BvbGljeSIsICJQb2xpY3kiKTsKLQorICAgICBwdWJsaWMgc3RhdGljIGZpbmFs IFFOYW1lIFBPTElDWV9SRUZFUkVOQ0UgPSBuZXcgUU5hbWUoCisgICAgICAgICAgICAgImh0dHA6 Ly9zY2hlbWFzLnhtbHNvYXAub3JnL3dzLzIwMDQvMDkvcG9saWN5IiwgIlBvbGljeVJlZmVyZW5j ZSIpOwogfQo= ------=_Part_17526_2158526.1136266399611--