Return-Path: Delivered-To: apmail-jakarta-avalon-dev-archive@apache.org Received: (qmail 50061 invoked from network); 13 Feb 2002 10:29:57 -0000 Received: from unknown (HELO nagoya.betaversion.org) (192.18.49.131) by daedalus.apache.org with SMTP; 13 Feb 2002 10:29:57 -0000 Received: (qmail 426 invoked by uid 97); 13 Feb 2002 10:30:08 -0000 Delivered-To: qmlist-jakarta-archive-avalon-dev@jakarta.apache.org Received: (qmail 410 invoked by uid 97); 13 Feb 2002 10:30:08 -0000 Mailing-List: contact avalon-dev-help@jakarta.apache.org; run by ezmlm Precedence: bulk List-Unsubscribe: List-Subscribe: List-Help: List-Post: List-Id: "Avalon Developers List" Reply-To: "Avalon Developers List" Delivered-To: mailing list avalon-dev@jakarta.apache.org Received: (qmail 399 invoked from network); 13 Feb 2002 10:30:07 -0000 Date: Wed, 13 Feb 2002 11:33:19 +0100 (CET) From: Torsten Curdt X-X-Sender: To: Avalon Developers List Subject: [PATCH] Re: Cascading Configuration In-Reply-To: <200202122011.g1CKBJE31165@mail016.syd.optusnet.com.au> Message-ID: MIME-Version: 1.0 Content-Type: MULTIPART/MIXED; BOUNDARY="8323584-2085486914-1013596399=:692" X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N --8323584-2085486914-1013596399=:692 Content-Type: TEXT/PLAIN; charset=US-ASCII Here we go... ...it would be great if someone could look over this and then apply it. I changed the AbstractConfiguration and DefaultConfiguration as discussed before cheers -- Torsten --8323584-2085486914-1013596399=:692 Content-Type: TEXT/PLAIN; charset=US-ASCII; name="configuration.diff" Content-Transfer-Encoding: BASE64 Content-ID: Content-Description: Content-Disposition: attachment; filename="configuration.diff" SW5kZXg6IEFic3RyYWN0Q29uZmlndXJhdGlvbi5qYXZhDQo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09DQpSQ1MgZmlsZTogL2hvbWUvY3ZzcHVibGljL2pha2Fy dGEtYXZhbG9uL3NyYy9qYXZhL29yZy9hcGFjaGUvYXZhbG9uL2ZyYW1ld29y ay9jb25maWd1cmF0aW9uL0Fic3RyYWN0Q29uZmlndXJhdGlvbi5qYXZhLHYN CnJldHJpZXZpbmcgcmV2aXNpb24gMS4xMg0KZGlmZiAtdSAtcjEuMTIgQWJz dHJhY3RDb25maWd1cmF0aW9uLmphdmENCi0tLSBBYnN0cmFjdENvbmZpZ3Vy YXRpb24uamF2YQkxMSBEZWMgMjAwMSAwOTowMDo0NSAtMDAwMAkxLjEyDQor KysgQWJzdHJhY3RDb25maWd1cmF0aW9uLmphdmEJMTMgRmViIDIwMDIgMTA6 MjU6MTMgLTAwMDANCkBAIC0xOSw3ICsxOSw1MCBAQA0KICAqLw0KIHB1Ymxp YyBhYnN0cmFjdCBjbGFzcyBBYnN0cmFjdENvbmZpZ3VyYXRpb24NCiAgICAg aW1wbGVtZW50cyBDb25maWd1cmF0aW9uDQotew0KK3sNDQorICAgIHByaXZh dGUgQ29uZmlndXJhdGlvbiBwYXJlbnQ7DQ0KKw0NCisgIC8qKg0NCisgICAq IFRoZSBkZWZhdWx0IGNvbnRzdHJ1Y3Rvcg0NCisgICAqLw0NCisgICAgcHVi bGljIEFic3RyYWN0Q29uZmlndXJhdGlvbigpIHsNDQorICAgICAgdGhpcy5w YXJlbnQgPSBudWxsOw0NCisgICAgfQ0NCisNDQorICAvKioNDQorICAgKiBU aGlzIGNvbnRzdHJ1Y3RvciBpcyB0byBwYXNzIGEgcGFyZW50IDxjb2RlPkNv bmZpZ3VyYXRpb248L2NvZGU+DQ0KKyAgICogb2JqZWN0LiBTaW5jZSB0aGlz IGlzIGFuIGFic3RyYWN0IGNsYXNzIGl0IHdpbGwgb25seSBjYWxsZWQgd2l0 aA0NCisgICAqIDxjb2RlPnN1cGVyKCk8L2NvZGU+DQ0KKyAgICovDQ0KKyAg ICBwdWJsaWMgQWJzdHJhY3RDb25maWd1cmF0aW9uKCBmaW5hbCBDb25maWd1 cmF0aW9uIHBhcmVudCApIHsNDQorICAgICAgdGhpcy5wYXJlbnQgPSBwYXJl bnQ7DQ0KKyAgICB9DQorDQ0KKyAgLyoqDQ0KKyAgICogY2hlY2tzIHRoZSBj dXJyZW50IGNvbmZpZ3VyYXRpb24gZm9yIGEgdmFsdWUsIGlmIG5vbiBpcyBm b3VuZA0NCisgICAqIGFuZCBhIHBhcmVudCBpcyBhdmFpbGFibGUgdGhlIGxv b2t1cCBpcyBwYXNzZWQgdG8gdGhlIHBhcmVudCBjb25maWd1cmF0aW9uDQ0K KyAgICogQHRocm93cyBDb25maWd1cmF0aW9uRXhjZXB0aW9uIGlmIGFuIGVy cm9yIG9jY3Vycw0NCisgICAqIEByZXR1cm4gdGhlIHZhbHVlDQ0KKyAgICog PGNvZGU+bnVsbDwvY29kZT4uDQ0KKyAgICovDQ0KKyAgICBwcml2YXRlIFN0 cmluZyBnZXRDYXNjYWRpbmdWYWx1ZSgpDQ0KKyAgICAgICAgdGhyb3dzIENv bmZpZ3VyYXRpb25FeGNlcHRpb24NDQorICAgIHsNDQorICAgICAgaWYgKHBh cmVudCAhPSBudWxsKSB7DQ0KKyAgICAgICAgdHJ5DQ0KKyAgICAgICAgew0N CisgICAgICAgICAgICByZXR1cm4gZ2V0VmFsdWUoKTsNDQorICAgICAgICB9 DQ0KKyAgICAgICAgY2F0Y2goIGZpbmFsIENvbmZpZ3VyYXRpb25FeGNlcHRp b24gY2UgKQ0NCisgICAgICAgIHsNDQorICAgICAgICAgICAgcmV0dXJuIHBh cmVudC5nZXRWYWx1ZSgpOw0NCisgICAgICAgIH0NDQorICAgICAgfQ0NCisg ICAgICBlbHNlIHsNDQorICAgICAgICByZXR1cm4gZ2V0VmFsdWUoKTsNDQor ICAgICAgfQ0NCisgICAgfQ0NCisNDQogICAgIC8qKg0KICAgICAgKiBSZXR1 cm5zIHRoZSBwcmVmaXggb2YgdGhlIG5hbWVzcGFjZS4gIFRoaXMgaXMgb25s eSB1c2VkIGFzIGEgc2VyaWFsaXphdGlvbg0KICAgICAgKiBoaW50LCB0aGVy ZWZvcmUgaXMgbm90IHBhcnQgb2YgdGhlIGNsaWVudCBBUEkuICBJdCBzaG91 bGQgYmUgaW5jbHVkZWQgaW4NCkBAIC00Miw3ICs4NSw3IEBADQogICAgIHB1 YmxpYyBpbnQgZ2V0VmFsdWVBc0ludGVnZXIoKQ0KICAgICAgICAgdGhyb3dz IENvbmZpZ3VyYXRpb25FeGNlcHRpb24NCiAgICAgew0KLSAgICAgICAgZmlu YWwgU3RyaW5nIHZhbHVlID0gZ2V0VmFsdWUoKTsNCisgICAgICAgIGZpbmFs IFN0cmluZyB2YWx1ZSA9IGdldENhc2NhZGluZ1ZhbHVlKCk7DQogICAgICAg ICB0cnkNCiAgICAgICAgIHsNCiAgICAgICAgICAgICBpZiggdmFsdWUuc3Rh cnRzV2l0aCggIjB4IiApICkNCkBAIC0xMDMsNyArMTQ2LDcgQEANCiAgICAg cHVibGljIGxvbmcgZ2V0VmFsdWVBc0xvbmcoKQ0KICAgICAgICAgdGhyb3dz IENvbmZpZ3VyYXRpb25FeGNlcHRpb24NCiAgICAgew0KLSAgICAgICAgZmlu YWwgU3RyaW5nIHZhbHVlID0gZ2V0VmFsdWUoKTsNCisgICAgICAgIGZpbmFs IFN0cmluZyB2YWx1ZSA9IGdldENhc2NhZGluZ1ZhbHVlKCk7DQogICAgICAg ICB0cnkNCiAgICAgICAgIHsNCiAgICAgICAgICAgICBpZiggdmFsdWUuc3Rh cnRzV2l0aCggIjB4IiApICkNCkBAIC0xNjEsNyArMjA0LDcgQEANCiAgICAg cHVibGljIGZsb2F0IGdldFZhbHVlQXNGbG9hdCgpDQogICAgICAgICB0aHJv d3MgQ29uZmlndXJhdGlvbkV4Y2VwdGlvbg0KICAgICB7DQotICAgICAgICBm aW5hbCBTdHJpbmcgdmFsdWUgPSBnZXRWYWx1ZSgpOw0KKyAgICAgICAgZmlu YWwgU3RyaW5nIHZhbHVlID0gZ2V0Q2FzY2FkaW5nVmFsdWUoKTsNCiAgICAg ICAgIHRyeQ0KICAgICAgICAgew0KICAgICAgICAgICAgIHJldHVybiBGbG9h dC5wYXJzZUZsb2F0KCB2YWx1ZSApOw0KQEAgLTIwMSw3ICsyNDQsNyBAQA0K ICAgICBwdWJsaWMgYm9vbGVhbiBnZXRWYWx1ZUFzQm9vbGVhbigpDQogICAg ICAgICB0aHJvd3MgQ29uZmlndXJhdGlvbkV4Y2VwdGlvbg0KICAgICB7DQot ICAgICAgICBmaW5hbCBTdHJpbmcgdmFsdWUgPSBnZXRWYWx1ZSgpOw0KKyAg ICAgICAgZmluYWwgU3RyaW5nIHZhbHVlID0gZ2V0Q2FzY2FkaW5nVmFsdWUo KTsNCiAgICAgICAgIGlmKCB2YWx1ZS5lcXVhbHMoICJ0cnVlIiApICkNCiAg ICAgICAgIHsNCiAgICAgICAgICAgICByZXR1cm4gdHJ1ZTsNCkBAIC0yNDYs NyArMjg5LDcgQEANCiAgICAgew0KICAgICAgICAgdHJ5DQogICAgICAgICB7 DQotICAgICAgICAgICAgcmV0dXJuIGdldFZhbHVlKCk7DQorICAgICAgICAg ICAgcmV0dXJuIGdldENhc2NhZGluZ1ZhbHVlKCk7DQogICAgICAgICB9DQog ICAgICAgICBjYXRjaCggZmluYWwgQ29uZmlndXJhdGlvbkV4Y2VwdGlvbiBj ZSApDQogICAgICAgICB7DQpJbmRleDogRGVmYXVsdENvbmZpZ3VyYXRpb24u amF2YQ0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQ0KUkNTIGZpbGU6IC9ob21l L2N2c3B1YmxpYy9qYWthcnRhLWF2YWxvbi9zcmMvamF2YS9vcmcvYXBhY2hl L2F2YWxvbi9mcmFtZXdvcmsvY29uZmlndXJhdGlvbi9EZWZhdWx0Q29uZmln dXJhdGlvbi5qYXZhLHYNCnJldHJpZXZpbmcgcmV2aXNpb24gMS4xMw0KZGlm ZiAtdSAtcjEuMTMgRGVmYXVsdENvbmZpZ3VyYXRpb24uamF2YQ0KLS0tIERl ZmF1bHRDb25maWd1cmF0aW9uLmphdmEJMTEgRGVjIDIwMDEgMDk6MDA6NDUg LTAwMDAJMS4xMw0KKysrIERlZmF1bHRDb25maWd1cmF0aW9uLmphdmEJMTMg RmViIDIwMDIgMTA6MjU6MTMgLTAwMDANCkBAIC0zOSwxMSArMzksNDAgQEAN CiAgICAgICovDQogICAgIHB1YmxpYyBEZWZhdWx0Q29uZmlndXJhdGlvbigg ZmluYWwgU3RyaW5nIG5hbWUsIGZpbmFsIFN0cmluZyBsb2NhdGlvbiApDQog ICAgIHsNCi0gICAgICAgIHRoaXMgKG5hbWUsIGxvY2F0aW9uLCAiIiwgIiIp Ow0KKyAgICAgICAgdGhpcyAobnVsbCwgbmFtZSwgbG9jYXRpb24sICIiLCAi Iik7DQorICAgIH0NCisNCisgICAgLyoqDQorICAgICAqIENyZWF0ZSBhIG5l dyA8Y29kZT5EZWZhdWx0Q29uZmlndXJhdGlvbjwvY29kZT4gaW5zdGFuY2UN CisgICAgICogd2l0aCBhIHBhcmVudCA8Y29kZT5Db25maWd1cmF0aW9uPC9j b2RlPg0KKyAgICAgKi8NCisgICAgcHVibGljIERlZmF1bHRDb25maWd1cmF0 aW9uKCBmaW5hbCBDb25maWd1cmF0aW9uIHBhcmVudCwgZmluYWwgU3RyaW5n IG5hbWUsIGZpbmFsIFN0cmluZyBsb2NhdGlvbiApDQorICAgIHsNCisgICAg ICAgIHRoaXMgKHBhcmVudCwgbmFtZSwgbG9jYXRpb24sICIiLCAiIik7DQor ICAgIH0NCisNCisNCisgICAgLyoqDQorICAgICAqIENyZWF0ZSBhIG5ldyA8 Y29kZT5EZWZhdWx0Q29uZmlndXJhdGlvbjwvY29kZT4gaW5zdGFuY2UuDQor ICAgICAqIEBwYXJhbSBuYW1lIGNvbmZpZyBub2RlIG5hbWUNCisgICAgICog QHBhcmFtIGxvY2F0aW9uIEJ1aWxkZXItc3BlY2lmaWMgbG9jYXRvciBzdHJp bmcNCisgICAgICogQHBhcmFtIG5zIE5hbWVzcGFjZSBzdHJpbmcgKHR5cGlj YWxseSBhIFVSSSkuIFNob3VsZCBub3QgYmUgbnVsbDsgdXNlICIiDQorICAg ICAqIGlmIG5vIG5hbWVzcGFjZS4NCisgICAgICogQHBhcmFtIHByZWZpeCBB IHNob3J0IHN0cmluZyBwcmVmaXhlZCB0byBlbGVtZW50IG5hbWVzLCBhc3Nv Y2lhdGluZw0KKyAgICAgKiBlbGVtZW50cyB3aXRoIGEgbG9uZ2VyIG5hbWVz cGFjZSBzdHJpbmcuIFNob3VsZCBub3QgYmUgbnVsbDsgdXNlICIiIGlmIG5v DQorICAgICAqIG5hbWVzcGFjZS4NCisgICAgICovDQorICAgIHB1YmxpYyBE ZWZhdWx0Q29uZmlndXJhdGlvbiggZmluYWwgU3RyaW5nIG5hbWUsDQorICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgZmluYWwgU3RyaW5nIGxv Y2F0aW9uLA0KKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGZp bmFsIFN0cmluZyBucywNCisgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICBmaW5hbCBTdHJpbmcgcHJlZml4ICkNCisgICAgew0KKyAgICAgIHRo aXMgKG51bGwsIG5hbWUsIGxvY2F0aW9uLCAiIiwgIiIpOw0KICAgICB9DQog DQogICAgIC8qKg0KICAgICAgKiBDcmVhdGUgYSBuZXcgPGNvZGU+RGVmYXVs dENvbmZpZ3VyYXRpb248L2NvZGU+IGluc3RhbmNlLg0KKyAgICAgKiBAcGFy YW0gcGFyZW50IHRoZSBwYXJlbnQgY29uZmlndXJhdGlvbiBvYmplY3QNCiAg ICAgICogQHBhcmFtIG5hbWUgY29uZmlnIG5vZGUgbmFtZQ0KICAgICAgKiBA cGFyYW0gbG9jYXRpb24gQnVpbGRlci1zcGVjaWZpYyBsb2NhdG9yIHN0cmlu Zw0KICAgICAgKiBAcGFyYW0gbnMgTmFtZXNwYWNlIHN0cmluZyAodHlwaWNh bGx5IGEgVVJJKS4gU2hvdWxkIG5vdCBiZSBudWxsOyB1c2UgIiINCkBAIC01 MiwxMSArODEsMTMgQEANCiAgICAgICogZWxlbWVudHMgd2l0aCBhIGxvbmdl ciBuYW1lc3BhY2Ugc3RyaW5nLiBTaG91bGQgbm90IGJlIG51bGw7IHVzZSAi IiBpZiBubw0KICAgICAgKiBuYW1lc3BhY2UuDQogICAgICAqLw0KLSAgICBw dWJsaWMgRGVmYXVsdENvbmZpZ3VyYXRpb24oIGZpbmFsIFN0cmluZyBuYW1l LCANCisgICAgcHVibGljIERlZmF1bHRDb25maWd1cmF0aW9uKCBmaW5hbCBD b25maWd1cmF0aW9uIHBhcmVudCwNCisgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICBmaW5hbCBTdHJpbmcgbmFtZSwNCiAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICBmaW5hbCBTdHJpbmcgbG9jYXRpb24sIA0K ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGZpbmFsIFN0cmlu ZyBucywgDQogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgZmlu YWwgU3RyaW5nIHByZWZpeCApDQogICAgIHsNCisgICAgICAgIHN1cGVyKHBh cmVudCk7DQogICAgICAgICBtX25hbWUgPSBuYW1lOw0KICAgICAgICAgbV9s b2NhdGlvbiA9IGxvY2F0aW9uOw0KICAgICAgICAgbV9uYW1lc3BhY2UgPSBu czsNCg== --8323584-2085486914-1013596399=:692 Content-Type: text/plain; charset=us-ascii -- To unsubscribe, e-mail: For additional commands, e-mail: --8323584-2085486914-1013596399=:692--