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 0BE6325C1 for ; Sat, 7 May 2011 23:10:30 +0000 (UTC) Received: (qmail 91709 invoked by uid 500); 7 May 2011 23:10:29 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 91654 invoked by uid 500); 7 May 2011 23:10:29 -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 91647 invoked by uid 99); 7 May 2011 23:10:29 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 07 May 2011 23:10:29 +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; Sat, 07 May 2011 23:10:28 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id D50E32388A3C; Sat, 7 May 2011 23:10:08 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1100654 - /geronimo/server/branches/3.0-osgi/plugins/myfaces/geronimo-myfaces/src/main/java/org/apache/geronimo/myfaces/config/resource/osgi/ConfigRegistryImpl.java Date: Sat, 07 May 2011 23:10:08 -0000 To: scm@geronimo.apache.org From: kevan@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110507231008.D50E32388A3C@eris.apache.org> Author: kevan Date: Sat May 7 23:10:08 2011 New Revision: 1100654 URL: http://svn.apache.org/viewvc?rev=1100654&view=rev Log: fix compile error in myfaces. will need to fix, before jsf will work Modified: geronimo/server/branches/3.0-osgi/plugins/myfaces/geronimo-myfaces/src/main/java/org/apache/geronimo/myfaces/config/resource/osgi/ConfigRegistryImpl.java Modified: geronimo/server/branches/3.0-osgi/plugins/myfaces/geronimo-myfaces/src/main/java/org/apache/geronimo/myfaces/config/resource/osgi/ConfigRegistryImpl.java URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-osgi/plugins/myfaces/geronimo-myfaces/src/main/java/org/apache/geronimo/myfaces/config/resource/osgi/ConfigRegistryImpl.java?rev=1100654&r1=1100653&r2=1100654&view=diff ============================================================================== --- geronimo/server/branches/3.0-osgi/plugins/myfaces/geronimo-myfaces/src/main/java/org/apache/geronimo/myfaces/config/resource/osgi/ConfigRegistryImpl.java (original) +++ geronimo/server/branches/3.0-osgi/plugins/myfaces/geronimo-myfaces/src/main/java/org/apache/geronimo/myfaces/config/resource/osgi/ConfigRegistryImpl.java Sat May 7 23:10:08 2011 @@ -95,20 +95,23 @@ public class ConfigRegistryImpl implemen BundleContext bundleContext = activator.getBundleContext(); ServiceReference serviceReference = null; try { - serviceReference = bundleContext.getServiceReference(DependencyManager.class.getName()); - if (serviceReference == null) { - return Collections. emptyList(); - } - DependencyManager dependencyManager = (DependencyManager) bundleContext.getService(serviceReference); - List dependentBundles = dependencyManager.getFullDependentBundles(bundle); - List dependentFacesConfigs = new ArrayList(); - for (Bundle dependentBundle : dependentBundles) { - FacesConfig facesConfig = bundleIdFacesConfigMap.get(dependentBundle.getBundleId()); - if (facesConfig != null) { - dependentFacesConfigs.add(facesConfig); - } - } - return dependentFacesConfigs; + //TODO - fix dependencymanager lookup + assert false; + return null; +// serviceReference = bundleContext.getServiceReference(DependencyManager.class.getName()); +// if (serviceReference == null) { +// return Collections. emptyList(); +// } +// DependencyManager dependencyManager = (DependencyManager) bundleContext.getService(serviceReference); +// List dependentBundles = dependencyManager.getFullDependentBundles(bundle); +// List dependentFacesConfigs = new ArrayList(); +// for (Bundle dependentBundle : dependentBundles) { +// FacesConfig facesConfig = bundleIdFacesConfigMap.get(dependentBundle.getBundleId()); +// if (facesConfig != null) { +// dependentFacesConfigs.add(facesConfig); +// } +// } +// return dependentFacesConfigs; } finally { if (serviceReference != null) { bundleContext.ungetService(serviceReference);