Return-Path: X-Original-To: apmail-tuscany-commits-archive@www.apache.org Delivered-To: apmail-tuscany-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 80AD09A83 for ; Tue, 20 Dec 2011 19:31:07 +0000 (UTC) Received: (qmail 76375 invoked by uid 500); 20 Dec 2011 19:31:07 -0000 Delivered-To: apmail-tuscany-commits-archive@tuscany.apache.org Received: (qmail 76331 invoked by uid 500); 20 Dec 2011 19:31:07 -0000 Mailing-List: contact commits-help@tuscany.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@tuscany.apache.org Delivered-To: mailing list commits@tuscany.apache.org Received: (qmail 76324 invoked by uid 99); 20 Dec 2011 19:31:07 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 20 Dec 2011 19:31:07 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 20 Dec 2011 19:31:06 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id D258223888E7 for ; Tue, 20 Dec 2011 19:30:45 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1221453 - /tuscany/sca-java-2.x/trunk/modules/extensibility-equinox/src/main/java/org/apache/tuscany/sca/extensibility/equinox/EquinoxServiceDiscoverer.java Date: Tue, 20 Dec 2011 19:30:45 -0000 To: commits@tuscany.apache.org From: antelder@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20111220193045.D258223888E7@eris.apache.org> Author: antelder Date: Tue Dec 20 19:30:45 2011 New Revision: 1221453 URL: http://svn.apache.org/viewvc?rev=1221453&view=rev Log: TUSCANY-3998: Apply revised patch from Greg Dritschler to provide a way to override Tuscany system definition.xml documents Modified: tuscany/sca-java-2.x/trunk/modules/extensibility-equinox/src/main/java/org/apache/tuscany/sca/extensibility/equinox/EquinoxServiceDiscoverer.java Modified: tuscany/sca-java-2.x/trunk/modules/extensibility-equinox/src/main/java/org/apache/tuscany/sca/extensibility/equinox/EquinoxServiceDiscoverer.java URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/extensibility-equinox/src/main/java/org/apache/tuscany/sca/extensibility/equinox/EquinoxServiceDiscoverer.java?rev=1221453&r1=1221452&r2=1221453&view=diff ============================================================================== --- tuscany/sca-java-2.x/trunk/modules/extensibility-equinox/src/main/java/org/apache/tuscany/sca/extensibility/equinox/EquinoxServiceDiscoverer.java (original) +++ tuscany/sca-java-2.x/trunk/modules/extensibility-equinox/src/main/java/org/apache/tuscany/sca/extensibility/equinox/EquinoxServiceDiscoverer.java Tue Dec 20 19:30:45 2011 @@ -172,7 +172,12 @@ public class EquinoxServiceDiscoverer im public URL getResource(final String name) { return AccessController.doPrivileged(new PrivilegedAction() { public URL run() { - return bundle.getResource(name); + // Search bundle first using getEntry() + URL url = bundle.getEntry(name); + // If not found in bundle, try getResource() which looks at imports + if (url == null) + url = bundle.getResource(name); + return url; } }); }