geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r1226696 - in /geronimo/server/trunk/framework/modules/geronimo-system: pom.xml src/main/java/org/apache/geronimo/system/configuration/DependencyManager.java
Date Tue, 03 Jan 2012 08:12:51 GMT
Author: djencks
Date: Tue Jan  3 08:12:50 2012
New Revision: 1226696

URL: http://svn.apache.org/viewvc?rev=1226696&view=rev
Log:
GERONIMO-6249 use RecursiveBundleTracker in DependencyManager

Modified:
    geronimo/server/trunk/framework/modules/geronimo-system/pom.xml
    geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/DependencyManager.java

Modified: geronimo/server/trunk/framework/modules/geronimo-system/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-system/pom.xml?rev=1226696&r1=1226695&r2=1226696&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-system/pom.xml (original)
+++ geronimo/server/trunk/framework/modules/geronimo-system/pom.xml Tue Jan  3 08:12:50 2012
@@ -146,6 +146,11 @@
             <artifactId>org.apache.felix.utils</artifactId>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>org.apache.aries</groupId>
+            <artifactId>org.apache.aries.util</artifactId>
+            <scope>provided</scope>
+        </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.testsupport</groupId>

Modified: geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/DependencyManager.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/DependencyManager.java?rev=1226696&r1=1226695&r2=1226696&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/DependencyManager.java
(original)
+++ geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/DependencyManager.java
Tue Jan  3 08:12:50 2012
@@ -36,6 +36,7 @@ import java.util.Set;
 import java.util.WeakHashMap;
 import java.util.concurrent.ConcurrentHashMap;
 
+import org.apache.aries.util.tracker.RecursiveBundleTracker;
 import org.apache.felix.bundlerepository.RepositoryAdmin;
 import org.apache.felix.scr.annotations.Activate;
 import org.apache.felix.scr.annotations.Component;
@@ -43,10 +44,6 @@ import org.apache.felix.scr.annotations.
 import org.apache.felix.scr.annotations.Reference;
 import org.apache.felix.scr.annotations.ReferenceCardinality;
 import org.apache.felix.scr.annotations.ReferencePolicy;
-import org.apache.geronimo.gbean.GBeanLifecycle;
-import org.apache.geronimo.gbean.annotation.ParamReference;
-import org.apache.geronimo.gbean.annotation.ParamSpecial;
-import org.apache.geronimo.gbean.annotation.SpecialAttributeType;
 import org.apache.geronimo.kernel.config.InvalidConfigException;
 import org.apache.geronimo.kernel.config.NoSuchConfigException;
 import org.apache.geronimo.kernel.repository.AbstractRepository;
@@ -69,10 +66,10 @@ import org.osgi.framework.BundleEvent;
 import org.osgi.framework.BundleException;
 import org.osgi.framework.Constants;
 import org.osgi.framework.ServiceReference;
-import org.osgi.framework.SynchronousBundleListener;
 import org.osgi.framework.Version;
 import org.osgi.service.packageadmin.ExportedPackage;
 import org.osgi.service.packageadmin.PackageAdmin;
+import org.osgi.util.tracker.BundleTrackerCustomizer;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -80,7 +77,7 @@ import org.slf4j.LoggerFactory;
  * @version $Rev$ $Date$
  */
 @Component
-public class DependencyManager implements SynchronousBundleListener {
+public class DependencyManager {
 
     private static final Logger log = LoggerFactory.getLogger(DependencyManager.class);
 
@@ -107,9 +104,12 @@ public class DependencyManager implement
 
     private final Map<Long, Artifact> bundleIdArtifactMap = new ConcurrentHashMap<Long,
Artifact>();
 
-    public DependencyManager(@ParamSpecial(type = SpecialAttributeType.bundleContext) BundleContext
bundleContext,
-            @ParamReference(name = "Repositories", namingType = "Repository") Collection<Repository>
repositories,
-            @ParamReference(name = "ArtifactResolver", namingType = "ArtifactResolver") ArtifactResolver
artifactResolver) {
+    private RecursiveBundleTracker bt;
+
+    //used in tests
+    protected DependencyManager(BundleContext bundleContext,
+            Collection<Repository> repositories,
+            ArtifactResolver artifactResolver) {
         this.bundleContext = bundleContext;
         this.repositories.addAll(repositories);
         this.artifactResolver = artifactResolver;
@@ -146,6 +146,59 @@ public class DependencyManager implement
         repositories.remove(repository);
     }
 
+
+    @Activate
+    public void doStart(BundleContext bundleContext) throws Exception {
+        this.bundleContext = bundleContext;
+        int stateMask = Bundle.INSTALLED | Bundle.RESOLVED | Bundle.STARTING | Bundle.ACTIVE
| Bundle.STOPPING | Bundle.UNINSTALLED;
+        bt = new RecursiveBundleTracker(bundleContext, stateMask, new BundleTrackerCustomizer()
{
+            @Override
+            public Object addingBundle(Bundle bundle, BundleEvent bundleEvent) {
+                if (bundleEvent == null) {
+                    // existing bundles first added to the tracker with no event change
+                    installed(bundle);
+                } else {
+                    bundleChanged(bundleEvent);
+                }
+
+                return bundle;
+            }
+
+            @Override
+            public void modifiedBundle(Bundle bundle, BundleEvent bundleEvent, Object o)
{
+                if (bundleEvent == null) {
+                    // existing bundles first added to the tracker with no event change
+                    return;
+                } else {
+                    bundleChanged(bundleEvent);
+                }
+            }
+
+            @Override
+            public void removedBundle(Bundle bundle, BundleEvent bundleEvent, Object o) {
+                if (bundleEvent == null) {
+                    // existing bundles first added to the tracker with no event change
+                    return;
+                } else {
+                    bundleChanged(bundleEvent);
+                }
+            }
+        });
+        bt.open();
+    }
+
+    @Deactivate
+    public void doStop() throws Exception {
+        bt.close();
+        //Some clean up work
+        pluginMap.clear();
+        dependentBundleIdsMap.clear();
+        fullDependentBundleIdsMap.clear();
+        bundleExportPackagesMap.clear();
+        artifactBundleMap.clear();
+        bundleIdArtifactMap.clear();
+    }
+
     public void bundleChanged(BundleEvent bundleEvent) {
         int eventType = bundleEvent.getType();
         //TODO Need to optimize the codes, as we will not receive the INSTALLED event after
the cache is created
@@ -600,52 +653,4 @@ public class DependencyManager implement
 //        throw new NoSuchConfigException(configurationId);
     }
 
-    @Activate
-    public void doStart(BundleContext bundleContext) throws Exception {
-        this.bundleContext = bundleContext;
-        bundleContext.addBundleListener(this);
-//        respositoryAdminReference = bundleContext.getServiceReference(RepositoryAdmin.class.getName());
-//        repositoryAdmin = respositoryAdminReference == null ? null : (RepositoryAdmin)
bundleContext.getService(respositoryAdminReference);
-        //init installed bundles
-        for (Bundle bundle : bundleContext.getBundles()) {
-            installed(bundle);
-        }
-        //Check the car who loads me ...
-        try {
-            PluginArtifactType pluginArtifact = getCachedPluginMetadata(bundleContext.getBundle());
-            if (pluginArtifact != null) {
-                Set<Long> dependentBundleIds = new HashSet<Long>();
-                for (DependencyType dependency : pluginArtifact.getDependency()) {
-                    Bundle dependentBundle = getBundle(dependency.toArtifact());
-                    if (dependentBundle != null) {
-                        dependentBundleIds.add(dependentBundle.getBundleId());
-                    }
-                }
-                long bundleId = bundleContext.getBundle().getBundleId();
-                dependentBundleIdsMap.put(bundleId, dependentBundleIds);
-                fullDependentBundleIdsMap.put(bundleId, dependentBundleIds);
-            }
-        } catch (Exception e) {
-            log.error("Fail to read the dependency info from bundle " + bundleContext.getBundle().getLocation());
-        }
-    }
-
-    @Deactivate
-    public void doStop() throws Exception {
-//        if (respositoryAdminReference != null) {
-//            try {
-//                bundleContext.ungetService(respositoryAdminReference);
-//            } catch (Exception e) {
-//            }
-//        }
-        bundleContext.removeBundleListener(this);
-        //Some clean up work
-        pluginMap.clear();
-        dependentBundleIdsMap.clear();
-        fullDependentBundleIdsMap.clear();
-        bundleExportPackagesMap.clear();
-        artifactBundleMap.clear();
-        bundleIdArtifactMap.clear();
-    }
-
 }



Mime
View raw message