[jboss-cvs] JBossAS SVN: r84896 - projects/jboss-osgi/trunk/runtime/deployer/src/main/java/org/jboss/osgi/deployer/helpers.

[jboss-cvs-commits at lists.jboss.org]

Author: alesj
Date: 2009-02-27 16:31:16 -0500 (Fri, 27 Feb 2009)
New Revision: 84896

Modified:
   projects/jboss-osgi/trunk/runtime/deployer/src/main/java/org/jboss/osgi/deployer/helpers/VDFBundleListener.java
Log:
Todo on stages mappings.


Modified: projects/jboss-osgi/trunk/runtime/deployer/src/main/java/org/jboss/osgi/deployer/helpers/VDFBundleListener.java
===================================================================
--- projects/jboss-osgi/trunk/runtime/deployer/src/main/java/org/jboss/osgi/deployer/helpers/VDFBundleListener.java	2009-02-27 21:24:18 UTC (rev 84895)
+++ projects/jboss-osgi/trunk/runtime/deployer/src/main/java/org/jboss/osgi/deployer/helpers/VDFBundleListener.java	2009-02-27 21:31:16 UTC (rev 84896)
@@ -46,15 +46,18 @@
 
    private final DeployerClient main;
 
+   // TODO - think about this mappings
+   // we need to be 'smarter' when it comes to deploy phase stages
+   // e.g. not to go back when VDF already pushed us fwd
    static
    {
-      stages.put(BundleEvent.INSTALLED, DeploymentStages.NOT_INSTALLED);
-      stages.put(BundleEvent.RESOLVED, DeploymentStages.CLASSLOADER);
+//      stages.put(BundleEvent.INSTALLED, DeploymentStages.NOT_INSTALLED);
+//      stages.put(BundleEvent.RESOLVED, DeploymentStages.CLASSLOADER);
       stages.put(BundleEvent.LAZY_ACTIVATION, DeploymentStages.INSTALLED); // TODO
-      stages.put(BundleEvent.STARTING, DeploymentStages.POST_CLASSLOADER);
-      stages.put(BundleEvent.STARTED, DeploymentStages.PRE_REAL);
-      stages.put(BundleEvent.STOPPING, DeploymentStages.PRE_REAL);
-      stages.put(BundleEvent.STOPPED, DeploymentStages.POST_CLASSLOADER);
+//      stages.put(BundleEvent.STARTING, DeploymentStages.POST_CLASSLOADER);
+//      stages.put(BundleEvent.STARTED, DeploymentStages.PRE_REAL);
+//      stages.put(BundleEvent.STOPPING, DeploymentStages.PRE_REAL);
+      stages.put(BundleEvent.STOPPED, DeploymentStages.PRE_REAL);
       stages.put(BundleEvent.UPDATED, DeploymentStages.NOT_INSTALLED); // TODO
       stages.put(BundleEvent.UNRESOLVED, DeploymentStages.DESCRIBE);
       stages.put(BundleEvent.UNINSTALLED, DeploymentStages.NOT_INSTALLED);
@@ -80,7 +83,8 @@
          {
             int type = event.getType();
             DeploymentStage stage = stages.get(type);
-            main.change(deploymentName, stage);
+            if (stage != null)
+               main.change(deploymentName, stage);
          }
          catch (Throwable t)
          {