Return-Path: X-Original-To: apmail-geronimo-scm-archive@www.apache.org Delivered-To: apmail-geronimo-scm-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 147F2A6F for ; Fri, 29 Apr 2011 11:45:33 +0000 (UTC) Received: (qmail 78027 invoked by uid 500); 29 Apr 2011 11:45:33 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 77979 invoked by uid 500); 29 Apr 2011 11:45:32 -0000 Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: Reply-To: dev@geronimo.apache.org List-Id: Delivered-To: mailing list scm@geronimo.apache.org Received: (qmail 77972 invoked by uid 99); 29 Apr 2011 11:45:32 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 29 Apr 2011 11:45:32 +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; Fri, 29 Apr 2011 11:45:29 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 4706923888EA; Fri, 29 Apr 2011 11:45:08 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1097777 - in /geronimo/server/trunk/plugins/myfaces/geronimo-myfaces/src/main/java/org/apache/geronimo/myfaces/config/resource/osgi: ConfigBundleTrackerCustomizer.java ConfigRegistryImpl.java Date: Fri, 29 Apr 2011 11:45:08 -0000 To: scm@geronimo.apache.org From: xuhaihong@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110429114508.4706923888EA@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: xuhaihong Date: Fri Apr 29 11:45:07 2011 New Revision: 1097777 URL: http://svn.apache.org/viewvc?rev=1097777&view=rev Log: return boolean value to the tacker if required Modified: geronimo/server/trunk/plugins/myfaces/geronimo-myfaces/src/main/java/org/apache/geronimo/myfaces/config/resource/osgi/ConfigBundleTrackerCustomizer.java geronimo/server/trunk/plugins/myfaces/geronimo-myfaces/src/main/java/org/apache/geronimo/myfaces/config/resource/osgi/ConfigRegistryImpl.java Modified: geronimo/server/trunk/plugins/myfaces/geronimo-myfaces/src/main/java/org/apache/geronimo/myfaces/config/resource/osgi/ConfigBundleTrackerCustomizer.java URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/myfaces/geronimo-myfaces/src/main/java/org/apache/geronimo/myfaces/config/resource/osgi/ConfigBundleTrackerCustomizer.java?rev=1097777&r1=1097776&r2=1097777&view=diff ============================================================================== --- geronimo/server/trunk/plugins/myfaces/geronimo-myfaces/src/main/java/org/apache/geronimo/myfaces/config/resource/osgi/ConfigBundleTrackerCustomizer.java (original) +++ geronimo/server/trunk/plugins/myfaces/geronimo-myfaces/src/main/java/org/apache/geronimo/myfaces/config/resource/osgi/ConfigBundleTrackerCustomizer.java Fri Apr 29 11:45:07 2011 @@ -55,8 +55,7 @@ public class ConfigBundleTrackerCustomiz if (bundle.equals(registryBundle)) { return null; } - registry.addBundle(bundle); - return null; + return registry.addBundle(bundle) ? Boolean.TRUE : null; } @Override Modified: geronimo/server/trunk/plugins/myfaces/geronimo-myfaces/src/main/java/org/apache/geronimo/myfaces/config/resource/osgi/ConfigRegistryImpl.java URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/myfaces/geronimo-myfaces/src/main/java/org/apache/geronimo/myfaces/config/resource/osgi/ConfigRegistryImpl.java?rev=1097777&r1=1097776&r2=1097777&view=diff ============================================================================== --- geronimo/server/trunk/plugins/myfaces/geronimo-myfaces/src/main/java/org/apache/geronimo/myfaces/config/resource/osgi/ConfigRegistryImpl.java (original) +++ geronimo/server/trunk/plugins/myfaces/geronimo-myfaces/src/main/java/org/apache/geronimo/myfaces/config/resource/osgi/ConfigRegistryImpl.java Fri Apr 29 11:45:07 2011 @@ -58,24 +58,28 @@ public class ConfigRegistryImpl implemen this.activator = activator; } - public void addBundle(Bundle bundle) { - findFacesConfigs(bundle); - findFaceletsConfigResources(bundle); + public boolean addBundle(Bundle bundle) { + boolean facesConfigsFound = findFacesConfigs(bundle); + boolean faceletsConfigResourcesFound = findFaceletsConfigResources(bundle); + return facesConfigsFound || faceletsConfigResourcesFound; } - protected void findFaceletsConfigResources(Bundle bundle) { + protected boolean findFaceletsConfigResources(Bundle bundle) { Enumeration metaInfEn = bundle.findEntries("META-INF/", "*.taglib.xml", false); - if (metaInfEn != null) { - List faceletsConfigResources = new ArrayList(); - while (metaInfEn.hasMoreElements()) { - faceletsConfigResources.add(metaInfEn.nextElement()); - } - bundleIdFaceletsConfigResourcesMap.put(bundle.getBundleId(), faceletsConfigResources); + if (metaInfEn == null) { + return false; + } + List faceletsConfigResources = new ArrayList(); + while (metaInfEn.hasMoreElements()) { + faceletsConfigResources.add(metaInfEn.nextElement()); } + bundleIdFaceletsConfigResourcesMap.put(bundle.getBundleId(), faceletsConfigResources); + return true; } - protected void findFacesConfigs(Bundle bundle) { + protected boolean findFacesConfigs(Bundle bundle) { log(LogService.LOG_DEBUG, "examining bundle for META-INF/faces-config.xml " + bundle.getSymbolicName()); + boolean facesConfigsFound = false; URL url = bundle.getEntry("META-INF/faces-config.xml"); List facesConfigs = null; List facesConfigURLs = null; @@ -101,10 +105,13 @@ public class ConfigRegistryImpl implemen } if (facesConfigs != null) { bundleIdFacesConfigsMap.put(bundle.getBundleId(), facesConfigs); + facesConfigsFound = true; } if (facesConfigURLs != null) { bundleIdFacesConfigURLsMap.put(bundle.getBundleId(), facesConfigURLs); + facesConfigsFound = true; } + return facesConfigsFound; } public void removeBundle(Bundle bundle, Object object) {