[jboss-cvs] JBossAS SVN: r106472 - in projects/cluster/ha-server-cache-ispn/trunk: src/main/java/org/jboss/ha/infinispan and 1 other directory.

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

Author: pferraro
Date: 2010-07-06 16:24:50 -0400 (Tue, 06 Jul 2010)
New Revision: 106472

Modified:
   projects/cluster/ha-server-cache-ispn/trunk/pom.xml
   projects/cluster/ha-server-cache-ispn/trunk/src/main/java/org/jboss/ha/infinispan/CacheManagerRegistryImpl.java
Log:
Drop Install/Uninstall annotations - callback methods can be configured in *-jboss-beans.xml.

Modified: projects/cluster/ha-server-cache-ispn/trunk/pom.xml
===================================================================
--- projects/cluster/ha-server-cache-ispn/trunk/pom.xml	2010-07-06 20:21:00 UTC (rev 106471)
+++ projects/cluster/ha-server-cache-ispn/trunk/pom.xml	2010-07-06 20:24:50 UTC (rev 106472)
@@ -32,7 +32,6 @@
     <version.jboss.ha.server.cache.spi>2.2.0.Final</version.jboss.ha.server.cache.spi>
     <version.jboss.ha.server.api>2.0.0.Alpha3</version.jboss.ha.server.api>
     <version.jboss.common.core>2.2.17.GA</version.jboss.common.core>
-    <version.jboss.kernel>2.2.0.Alpha10</version.jboss.kernel>
     <version.jboss.logging>3.0.0.Beta2</version.jboss.logging>
     <version.infinispan>4.1.0.CR1</version.infinispan>
     <version.org.jboss.naming>5.0.5.Final</version.org.jboss.naming>
@@ -141,12 +140,6 @@
       <version>${version.org.jboss.metadata.war}</version>
     </dependency>
     
-    <dependency>
-      <groupId>org.jboss.kernel</groupId>
-      <artifactId>jboss-kernel</artifactId>
-      <version>${version.jboss.kernel}</version>
-    </dependency>
-    
     <!-- Test dependencies -->
     
     <dependency>

Modified: projects/cluster/ha-server-cache-ispn/trunk/src/main/java/org/jboss/ha/infinispan/CacheManagerRegistryImpl.java
===================================================================
--- projects/cluster/ha-server-cache-ispn/trunk/src/main/java/org/jboss/ha/infinispan/CacheManagerRegistryImpl.java	2010-07-06 20:21:00 UTC (rev 106471)
+++ projects/cluster/ha-server-cache-ispn/trunk/src/main/java/org/jboss/ha/infinispan/CacheManagerRegistryImpl.java	2010-07-06 20:24:50 UTC (rev 106472)
@@ -32,8 +32,6 @@
 import javax.naming.NamingException;
 
 import org.infinispan.manager.CacheContainer;
-import org.jboss.beans.metadata.api.annotations.Install;
-import org.jboss.beans.metadata.api.annotations.Uninstall;
 import org.jboss.ha.infinispan.config.CacheManagerRegistryConfiguration;
 import org.jboss.ha.infinispan.config.CacheManagerRegistryConfigurationEntry;
 import org.jboss.ha.infinispan.config.CacheManagerRegistryConfigurationSource;
@@ -156,7 +154,6 @@
       return (entry != null) ? entry.getValue() : this.defaultCacheManager;
    }
    
-   @Install
    public void add(CacheManagerRegistryConfigurationEntry entry) throws NamingException
    {
       CacheContainer manager = this.factory.createCacheManager(new CacheManagerConfigurationAdapter(entry.getConfiguration()));
@@ -170,7 +167,6 @@
       this.context.bind(jndiName, manager);
    }
    
-   @Uninstall
    public void remove(CacheManagerRegistryConfigurationEntry config) throws NamingException
    {
       Map.Entry<String, CacheContainer> entry = this.cacheManagers.remove(config.getId());