[jboss-cvs] JBossAS SVN: r109415 - in projects/cluster/ha-server-cache-jbc/trunk: src/main/java/org/jboss/web/tomcat/service/session/distributedcache/jbc and 1 other directory.

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

Author: pferraro
Date: 2010-11-22 23:11:10 -0500 (Mon, 22 Nov 2010)
New Revision: 109415

Modified:
   projects/cluster/ha-server-cache-jbc/trunk/pom.xml
   projects/cluster/ha-server-cache-jbc/trunk/src/main/java/org/jboss/web/tomcat/service/session/distributedcache/jbc/AbstractJBossCacheService.java
Log:
Upgrade dependencies - implement api changes.

Modified: projects/cluster/ha-server-cache-jbc/trunk/pom.xml
===================================================================
--- projects/cluster/ha-server-cache-jbc/trunk/pom.xml	2010-11-22 22:27:16 UTC (rev 109414)
+++ projects/cluster/ha-server-cache-jbc/trunk/pom.xml	2010-11-23 04:11:10 UTC (rev 109415)
@@ -30,11 +30,10 @@
   </scm>
   
   <properties>
-    <version.jboss.ha.server.cache.spi>3.0.0.Alpha4</version.jboss.ha.server.cache.spi>
-    <version.jboss.ha.server.core>1.0.0.Alpha4</version.jboss.ha.server.core>
+    <version.jboss.ha.server.cache.spi>3.0.0.CR1</version.jboss.ha.server.cache.spi>
+    <version.jboss.ha.server.core>1.0.0.CR2</version.jboss.ha.server.core>
     <version.jboss.cache>3.2.5.GA</version.jboss.cache>
-    <version.jgroups>2.10.0.GA</version.jgroups>
-    <version.junit>4.8.1</version.junit>
+    <version.junit>4.8.2</version.junit>
   </properties>
   
   <dependencies> 
@@ -86,12 +85,6 @@
       <scope>provided</scope>
     </dependency>
     
-    <dependency>
-      <groupId>org.jgroups</groupId>
-      <artifactId>jgroups</artifactId>
-      <version>${version.jgroups}</version>
-    </dependency>
-    
     <!-- Test dependencies -->
     <dependency>
       <groupId>commons-logging</groupId>

Modified: projects/cluster/ha-server-cache-jbc/trunk/src/main/java/org/jboss/web/tomcat/service/session/distributedcache/jbc/AbstractJBossCacheService.java
===================================================================
--- projects/cluster/ha-server-cache-jbc/trunk/src/main/java/org/jboss/web/tomcat/service/session/distributedcache/jbc/AbstractJBossCacheService.java	2010-11-22 22:27:16 UTC (rev 109414)
+++ projects/cluster/ha-server-cache-jbc/trunk/src/main/java/org/jboss/web/tomcat/service/session/distributedcache/jbc/AbstractJBossCacheService.java	2010-11-23 04:11:10 UTC (rev 109415)
@@ -21,7 +21,6 @@
 */
 package org.jboss.web.tomcat.service.session.distributedcache.jbc;
 
-import java.security.AccessController;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
@@ -45,7 +44,6 @@
 import org.jboss.cache.config.CacheLoaderConfig.IndividualCacheLoaderConfig;
 import org.jboss.cache.transaction.BatchModeTransactionManager;
 import org.jboss.logging.Logger;
-import org.jboss.util.loading.ContextClassLoaderSwitcher;
 import org.jboss.web.tomcat.service.session.distributedcache.impl.BatchingManagerImpl;
 import org.jboss.web.tomcat.service.session.distributedcache.impl.IncomingDistributableSessionDataImpl;
 import org.jboss.web.tomcat.service.session.distributedcache.impl.SessionAttributeMarshallerFactoryImpl;
@@ -96,12 +94,6 @@
       return Fqn.fromElements(BUDDY_BACKUP, dataOwner, SESSION, contextHostPath, sessionId);
    } 
    
-   @SuppressWarnings("unchecked")
-   private static ContextClassLoaderSwitcher getContextClassLoaderSwitcher()
-   {
-      return (ContextClassLoaderSwitcher) AccessController.doPrivileged(ContextClassLoaderSwitcher.INSTANTIATOR);
-   }
-   
    protected Logger log_ = Logger.getLogger(getClass());
    
    private CacheManager cacheManager_;
@@ -181,8 +173,11 @@
       
       this.webAppClassLoader_ = this.manager_.getApplicationClassLoader();
       
+      String name = this.manager_.getName().substring(2);
+      int index = name.indexOf("/");
+      
       String webAppPath;
-      String path = manager_.getContextName();
+      String path = (index < 0) ? "" : name.substring(index);
       if( path.length() == 0 || path.equals("/")) {
          // If this is root.
          webAppPath = "ROOT";
@@ -198,7 +193,7 @@
       log_.debug("Old and new web app path are: " +path + ", " +webAppPath);
       
       String hostName;      
-      String host = manager_.getHostName();
+      String host = (index < 0) ? name : name.substring(0, index);
       if( host == null || host.length() == 0) {
          hostName = "localhost";
       }else {
@@ -325,6 +320,16 @@
    }
 
    /**
+    * {@inheritDoc}
+    * @see org.jboss.web.tomcat.service.session.distributedcache.spi.DistributedCacheManager#locate(java.lang.String)
+    */
+   @Override
+   public String locate(String sessionId)
+   {
+      return this.manager_.getJvmRoute();
+   }
+
+   /**
     * Get specfically the BatchModeTransactionManager.
     */
    public BatchingManager getBatchingManager()