[jboss-cvs] JBossAS SVN: r58600 - trunk/testsuite/src/main/org/jboss/test/cluster/test

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

Author: bstansberry at jboss.com
Date: 2006-11-18 06:52:48 -0500 (Sat, 18 Nov 2006)
New Revision: 58600

Modified:
   trunk/testsuite/src/main/org/jboss/test/cluster/test/SessionTestUtil.java
Log:
Utilize CacheHelper

Modified: trunk/testsuite/src/main/org/jboss/test/cluster/test/SessionTestUtil.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cluster/test/SessionTestUtil.java	2006-11-18 11:52:27 UTC (rev 58599)
+++ trunk/testsuite/src/main/org/jboss/test/cluster/test/SessionTestUtil.java	2006-11-18 11:52:48 UTC (rev 58600)
@@ -22,16 +22,10 @@
 
 package org.jboss.test.cluster.test;
 
-import java.util.HashSet;
-import java.util.Iterator;
 import java.util.Set;
 
-import javax.management.MalformedObjectNameException;
-import javax.management.ObjectName;
-
-import org.jboss.cache.Fqn;
-import org.jboss.cache.buddyreplication.BuddyManager;
 import org.jboss.jmx.adaptor.rmi.RMIAdaptor;
+import org.jboss.test.cluster.web.CacheHelper;
 
 /**
  * Utilities for session testing.
@@ -41,87 +35,46 @@
  */
 public class SessionTestUtil
 {  
-   private static final String[] TYPES = 
-   { String.class.getName(), Object.class.getName() };
-   private static final String VERSION_KEY = "VERSION";
+   private static final String[] TYPES = { String.class.getName() };
    
-   private static final Fqn BUDDY_BACKUP_SUBTREE_FQN = Fqn.fromString("_BUDDY_BACKUP_");
-   
-   private static final ObjectName CACHE_OBJECT_NAME;
-   static
-   {
-      try
-      {
-         CACHE_OBJECT_NAME =
-            new ObjectName("jboss.cache:service=TomcatClusteringCache");
-      }
-      catch (MalformedObjectNameException e)
-      {
-         throw new ExceptionInInitializerError(e);
-      }
-   }
-   
    public static Object getSessionVersion(RMIAdaptor adaptor, String sessionFqn) throws Exception
    {
-      return adaptor.invoke(CACHE_OBJECT_NAME, "get", new Object[]
-      {sessionFqn, VERSION_KEY}, TYPES);
+      return adaptor.invoke(CacheHelper.OBJECT_NAME, 
+                            "getSessionVersion", 
+                            new Object[] { sessionFqn }, 
+                            TYPES);
    }
 
    public static Object getBuddySessionVersion(RMIAdaptor adaptor, String sessionFqn) throws Exception
    {
-      Object replVersion = null;
-      //    Check in the buddy backup tree
-      Set buddies = (Set) adaptor.invoke(CACHE_OBJECT_NAME, "getChildrenNames", new Object[]
-      {BUDDY_BACKUP_SUBTREE_FQN}, new String[]
-      {Fqn.class.getName()});
 
-      if (buddies != null)
-      {
-         for (Iterator it = buddies.iterator(); it.hasNext() && replVersion == null;)
-         {
-            Fqn fqn = new Fqn(BUDDY_BACKUP_SUBTREE_FQN, it.next());
-            fqn = new Fqn(fqn, Fqn.fromString(sessionFqn));
-            replVersion = adaptor.invoke(CACHE_OBJECT_NAME, "get", new Object[]
-            {fqn.toString(), VERSION_KEY}, TYPES);
-         }
-      }
-
-      return replVersion;
+      return adaptor.invoke(CacheHelper.OBJECT_NAME, 
+                            "getBuddySessionVersion", 
+                            new Object[] { sessionFqn }, 
+                            TYPES);
    }
    
    public static Set getSessionIds(RMIAdaptor adaptor, String warFqn) throws Exception
    {
-      Set result = new HashSet();
-      Set s = (Set) adaptor.invoke(CACHE_OBJECT_NAME, 
-                     "getChildrenNames",
-                     new Object[] { warFqn },
-                     new String[] { String.class.getName() });
-      if (s != null)
-         result.addAll(s);
-      
-//    Check in the buddy backup tree
-      Set buddies = (Set) adaptor.invoke(CACHE_OBJECT_NAME, 
-            "getChildrenNames",
-            new Object[] { BuddyManager.BUDDY_BACKUP_SUBTREE_FQN },
-            new String[] { Fqn.class.getName() });
-      
-      if (buddies != null)
-      {
-         for (Iterator it = buddies.iterator(); it.hasNext(); )
-         {
-            Fqn fqn = new Fqn(BuddyManager.BUDDY_BACKUP_SUBTREE_FQN, it.next());
-            fqn = new Fqn(fqn, Fqn.fromString(warFqn));
-            s = (Set) adaptor.invoke(CACHE_OBJECT_NAME, 
-                  "getChildrenNames",
-                  new Object[] { fqn.toString() },
-                  new String[] { String.class.getName() });
-            if (s != null)
-               result.addAll(s);
-         }
-      }
-      
-      return result;
+      return (Set) adaptor.invoke(CacheHelper.OBJECT_NAME, 
+                           "getSessionIds", 
+                           new Object[] { warFqn }, 
+                           TYPES);
    }
+   
+   public static void leaveHelperOnServer(RMIAdaptor adaptor) throws Exception
+   {
+      adaptor.invoke(CacheHelper.OBJECT_NAME, 
+            "setLeaveInstalledAfterShutdown", 
+            new Object[0], new String[0]);
+   }
+   
+   public static void uninstallHelper(RMIAdaptor adaptor) throws Exception
+   {
+      adaptor.invoke(CacheHelper.OBJECT_NAME, 
+            "uninstall", 
+            new Object[0], new String[0]);
+   }
 
    private SessionTestUtil() {}
 }