geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From xuhaih...@apache.org
Subject svn commit: r1075712 - /geronimo/server/branches/3.0-M2/plugins/myfaces/geronimo-myfaces/src/main/java/org/apache/geronimo/myfaces/config/resource/osgi/ConfigRegistryImpl.java
Date Tue, 01 Mar 2011 08:47:15 GMT
Author: xuhaihong
Date: Tue Mar  1 08:47:15 2011
New Revision: 1075712

URL: http://svn.apache.org/viewvc?rev=1075712&view=rev
Log:
Use getFullDependentBundles to make sure all the faces-config.xml files from the dependency
tree are added

Modified:
    geronimo/server/branches/3.0-M2/plugins/myfaces/geronimo-myfaces/src/main/java/org/apache/geronimo/myfaces/config/resource/osgi/ConfigRegistryImpl.java
  (contents, props changed)

Modified: geronimo/server/branches/3.0-M2/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-M2/plugins/myfaces/geronimo-myfaces/src/main/java/org/apache/geronimo/myfaces/config/resource/osgi/ConfigRegistryImpl.java?rev=1075712&r1=1075711&r2=1075712&view=diff
==============================================================================
--- geronimo/server/branches/3.0-M2/plugins/myfaces/geronimo-myfaces/src/main/java/org/apache/geronimo/myfaces/config/resource/osgi/ConfigRegistryImpl.java
(original)
+++ geronimo/server/branches/3.0-M2/plugins/myfaces/geronimo-myfaces/src/main/java/org/apache/geronimo/myfaces/config/resource/osgi/ConfigRegistryImpl.java
Tue Mar  1 08:47:15 2011
@@ -42,7 +42,7 @@ import org.osgi.service.log.LogService;
 
 
 /**
- * @version $Rev:$ $Date:$
+ * @version $Rev$ $Date$
  */
 public class ConfigRegistryImpl implements ConfigRegistry {
     private final Activator activator;
@@ -101,7 +101,7 @@ public class ConfigRegistryImpl implemen
                 return Collections.<FacesConfig> emptyList();
             }
             DependencyManager dependencyManager = (DependencyManager) bundleContext.getService(serviceReference);
-            List<Bundle> dependentBundles = dependencyManager.getDependentBundles(bundle);
+            List<Bundle> dependentBundles = dependencyManager.getFullDependentBundles(bundle);
             List<FacesConfig> dependentFacesConfigs = new ArrayList<FacesConfig>();
             for (Bundle dependentBundle : dependentBundles) {
                 FacesConfig facesConfig = bundleIdFacesConfigMap.get(dependentBundle.getBundleId());

Propchange: geronimo/server/branches/3.0-M2/plugins/myfaces/geronimo-myfaces/src/main/java/org/apache/geronimo/myfaces/config/resource/osgi/ConfigRegistryImpl.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/branches/3.0-M2/plugins/myfaces/geronimo-myfaces/src/main/java/org/apache/geronimo/myfaces/config/resource/osgi/ConfigRegistryImpl.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/server/branches/3.0-M2/plugins/myfaces/geronimo-myfaces/src/main/java/org/apache/geronimo/myfaces/config/resource/osgi/ConfigRegistryImpl.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain



Mime
View raw message