geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ke...@apache.org
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 GMT
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.<FacesConfig> emptyList();
-            }
-            DependencyManager dependencyManager = (DependencyManager) bundleContext.getService(serviceReference);
-            List<Bundle> dependentBundles = dependencyManager.getFullDependentBundles(bundle);
-            List<FacesConfig> dependentFacesConfigs = new ArrayList<FacesConfig>();
-            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.<FacesConfig> emptyList();
+//             }
+//             DependencyManager dependencyManager = (DependencyManager) bundleContext.getService(serviceReference);
+//             List<Bundle> dependentBundles = dependencyManager.getFullDependentBundles(bundle);
+//             List<FacesConfig> dependentFacesConfigs = new ArrayList<FacesConfig>();
+//             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);



Mime
View raw message