[jboss-cvs] JBossAS SVN: r108023 - in branches/infinispan-int: tomcat/src/main/java/org/jboss/web/tomcat/service/session and 1 other directory.

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

Author: pferraro
Date: 2010-09-07 15:36:28 -0400 (Tue, 07 Sep 2010)
New Revision: 108023

Modified:
   branches/infinispan-int/component-matrix/pom.xml
   branches/infinispan-int/tomcat/src/main/java/org/jboss/web/tomcat/service/session/JBossManager.java
Log:
Upgrade ha-server-cache-spi to 3.0.0.Alpha6, ha-server-cache-ispn to 1.0.0.Alpha11.
Use name from init(...) for getName().

Modified: branches/infinispan-int/component-matrix/pom.xml
===================================================================
--- branches/infinispan-int/component-matrix/pom.xml	2010-09-07 19:28:58 UTC (rev 108022)
+++ branches/infinispan-int/component-matrix/pom.xml	2010-09-07 19:36:28 UTC (rev 108023)
@@ -88,6 +88,7 @@
     <version.org.hibernate.entity.manager>${version.org.hibernate}</version.org.hibernate.entity.manager>
     <version.org.hibernate.javax.persistence>1.0.0.Final</version.org.hibernate.javax.persistence>
     <version.org.hibernate.validator>4.0.2.GA</version.org.hibernate.validator>
+    <!--version.org.infinispan>4.1.1-SNAPSHOT</version.org.infinispan-->
     <version.org.infinispan>4.1.0.FINAL</version.org.infinispan>
     <version.org.jboss.aop>2.2.1.Alpha3</version.org.jboss.aop>
     <version.org.jboss.aspects.currentinvocation>1.0.1</version.org.jboss.aspects.currentinvocation>
@@ -95,18 +96,14 @@
     <version.org.jboss.aspects.security>1.0.1</version.org.jboss.aspects.security>
     <version.org.jboss.aspects.transaction>1.0.0.GA</version.org.jboss.aspects.transaction>
     <version.org.jboss.bootstrap>2.1.0-alpha-5</version.org.jboss.bootstrap>
-    <!--version.org.jboss.cache.core>3.2.5.GA</version.org.jboss.cache.core>
-    <version.org.jboss.cache.pojo>3.0.0.GA</version.org.jboss.cache.pojo-->
     <version.org.jboss.cl>2.2.0.Alpha7</version.org.jboss.cl>
     <version.org.jboss.classpool>1.0.0.Alpha6</version.org.jboss.classpool>
-    <!--version.org.jboss.cluster.cache.jbc>3.0.0.Alpha3</version.org.jboss.cluster.cache.jbc-->
-    <version.org.jboss.cluster.cache.spi>3.0.0.Alpha5</version.org.jboss.cluster.cache.spi>
-    <version.org.jboss.cluster.cache.ispn>1.0.0.Alpha10</version.org.jboss.cluster.cache.ispn>
+    <version.org.jboss.cluster.cache.spi>3.0.0.Alpha6</version.org.jboss.cluster.cache.spi>
+    <version.org.jboss.cluster.cache.ispn>1.0.0.Alpha11</version.org.jboss.cluster.cache.ispn>
     <version.org.jboss.cluster.client>1.1.2.Beta1</version.org.jboss.cluster.client>
     <version.org.jboss.cluster.server.api>2.0.0.Alpha6</version.org.jboss.cluster.server.api>
     <version.org.jboss.cluster.server.core>1.0.0.Alpha5</version.org.jboss.cluster.server.core>
     <version.org.jboss.cluster.server.ispn>1.0.0.Alpha11</version.org.jboss.cluster.server.ispn>
-    <!--version.org.jboss.cluster.server.ispn>1.0.0-SNAPSHOT</version.org.jboss.cluster.server.ispn-->
     <version.org.jboss.common.core>2.2.17.GA</version.org.jboss.common.core>
     <version.org.jboss.deployers>2.2.0.Alpha6</version.org.jboss.deployers>
     <version.org.jboss.ejb3.depchain>1.0.0-alpha-3</version.org.jboss.ejb3.depchain>
@@ -2473,7 +2470,7 @@
       <dependency>
         <groupId>org.infinispan</groupId>
         <artifactId>infinispan-core</artifactId>
-        <version>${version.org.infinispan}</version>
+        <version>4.1.1-SNAPSHOT</version>
         <exclusions>
           <exclusion>
             <groupId>log4j</groupId>

Modified: branches/infinispan-int/tomcat/src/main/java/org/jboss/web/tomcat/service/session/JBossManager.java
===================================================================
--- branches/infinispan-int/tomcat/src/main/java/org/jboss/web/tomcat/service/session/JBossManager.java	2010-09-07 19:28:58 UTC (rev 108022)
+++ branches/infinispan-int/tomcat/src/main/java/org/jboss/web/tomcat/service/session/JBossManager.java	2010-09-07 19:36:28 UTC (rev 108023)
@@ -218,6 +218,8 @@
     */
    protected AtomicInteger duplicates_ = new AtomicInteger(); 
    
+   private String name;
+   
    // TODO Need a string manager to handle localization
 
    // ------------------------------------------------------------ Constructors
@@ -266,9 +268,10 @@
    /**
     * {@inheritDoc}
     */
-   public void init(String name, JBossWebMetaData webMetaData)
-           throws ClusteringNotSupportedException
-   {     
+   public void init(String name, JBossWebMetaData webMetaData) throws ClusteringNotSupportedException
+   {
+      this.name = name;
+      
       if (webMetaData.getMaxActiveSessions() != null)
       {
          maxActiveAllowed_ = webMetaData.getMaxActiveSessions().intValue();
@@ -835,9 +838,10 @@
    /**
     * {@inheritDoc}
     */
+   @Override
    public String getName()
    {
-      return getClass().getSimpleName();
+      return this.name;
    }
 
    /**