[jboss-cvs] JBossAS SVN: r73064 - projects/jboss-osgi/trunk/osgi-int/src/main/org/jboss/osgi/plugins/deployers.

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

Author: alesj
Date: 2008-05-05 14:58:58 -0400 (Mon, 05 May 2008)
New Revision: 73064

Modified:
   projects/jboss-osgi/trunk/osgi-int/src/main/org/jboss/osgi/plugins/deployers/OSGiMetaData2ClassLoadingMetaDataDeployer.java
Log:
Use lifecycle to register/remove version comparators.

Modified: projects/jboss-osgi/trunk/osgi-int/src/main/org/jboss/osgi/plugins/deployers/OSGiMetaData2ClassLoadingMetaDataDeployer.java
===================================================================
--- projects/jboss-osgi/trunk/osgi-int/src/main/org/jboss/osgi/plugins/deployers/OSGiMetaData2ClassLoadingMetaDataDeployer.java	2008-05-05 14:53:12 UTC (rev 73063)
+++ projects/jboss-osgi/trunk/osgi-int/src/main/org/jboss/osgi/plugins/deployers/OSGiMetaData2ClassLoadingMetaDataDeployer.java	2008-05-05 18:58:58 UTC (rev 73064)
@@ -50,19 +50,27 @@
  */
 public class OSGiMetaData2ClassLoadingMetaDataDeployer extends AbstractSimpleRealDeployer<OSGiMetaData>
 {
-   static
+   public OSGiMetaData2ClassLoadingMetaDataDeployer()
    {
+      super(OSGiMetaData.class);
+      setOutput(ClassLoadingMetaData.class);
+      setStage(DeploymentStages.DESCRIBE);
+   }
+
+   public void create()
+   {
       VersionComparatorRegistry registry = VersionComparatorRegistry.getInstance();
       registry.registerVersionComparator(Version.class, OSGiVersionComparator.INSTANCE);
       registry.registerVersionComparator(Version.class, String.class, OSGiVersionToStringComparator.INSTANCE);
       registry.registerVersionComparator(Version.class, org.jboss.classloading.spi.version.Version.class, OSGiVersionToVersionComparator.INSTANCE);
    }
 
-   public OSGiMetaData2ClassLoadingMetaDataDeployer()
+   public void destroy()
    {
-      super(OSGiMetaData.class);
-      setOutput(ClassLoadingMetaData.class);
-      setStage(DeploymentStages.DESCRIBE);
+      VersionComparatorRegistry registry = VersionComparatorRegistry.getInstance();
+      registry.removeVersionComparator(Version.class);
+      registry.removeVersionComparator(Version.class, String.class);
+      registry.removeVersionComparator(Version.class, org.jboss.classloading.spi.version.Version.class);      
    }
 
    public void deploy(DeploymentUnit unit, OSGiMetaData deployment) throws DeploymentException