From jbosscache-commits at lists.jboss.org Tue Jan  1 17:27:18 2008
Content-Type: multipart/mixed; boundary="===============2996857459902754020=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r4928 - in core/trunk/src:
 test/java/org/jboss/cache/transaction/isolationlevels and 1 other directory.
Date: Tue, 01 Jan 2008 17:27:17 -0500
Message-ID: <E1J9pZt-00013T-Ri@committer01.frg.pub.inap.atl.jboss.com>

--===============2996857459902754020==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: manik.surtani(a)jboss.com
Date: 2008-01-01 17:27:17 -0500 (Tue, 01 Jan 2008)
New Revision: 4928

Modified:
   core/trunk/src/main/java/org/jboss/cache/interceptors/PessimisticLockInt=
erceptor.java
   core/trunk/src/test/java/org/jboss/cache/transaction/isolationlevels/Non=
eTest.java
Log:
Fixed PLI not creating nonexistent nodes when isolation level is none

Modified: core/trunk/src/main/java/org/jboss/cache/interceptors/Pessimistic=
LockInterceptor.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/java/org/jboss/cache/interceptors/PessimisticLockIn=
terceptor.java	2007-12-30 21:45:04 UTC (rev 4927)
+++ core/trunk/src/main/java/org/jboss/cache/interceptors/PessimisticLockIn=
terceptor.java	2008-01-01 22:27:17 UTC (rev 4928)
@@ -91,7 +91,7 @@
    private Object handlePutMethod(InvocationContext ctx, Fqn fqn)
          throws Throwable
    {
-      if (ctx.getOptionOverrides() !=3D null && ctx.getOptionOverrides().i=
sSuppressLocking())
+      if ((ctx.getOptionOverrides() !=3D null && ctx.getOptionOverrides().=
isSuppressLocking()) || configuration.getIsolationLevel() =3D=3D IsolationL=
evel.NONE)
       {
          log.trace("Suppressing locking");
          log.trace("Creating nodes if necessary");
@@ -310,10 +310,8 @@
                                            boolean acquireLockOnParent, bo=
olean reverseRemoveCheck)
          throws InterruptedException
    {
-      if (fqn =3D=3D null || configuration.getIsolationLevel() =3D=3D Isol=
ationLevel.NONE)
-      {
-         return false;
-      }
+      if (fqn =3D=3D null) return false;
+
       boolean created;
       long timeout =3D zeroLockTimeout ? 0 : ctx.getContextLockAcquisition=
Timeout(lock_acquisition_timeout);
       // make sure we can bail out of this loop

Modified: core/trunk/src/test/java/org/jboss/cache/transaction/isolationlev=
els/NoneTest.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/test/java/org/jboss/cache/transaction/isolationlevels/No=
neTest.java	2007-12-30 21:45:04 UTC (rev 4927)
+++ core/trunk/src/test/java/org/jboss/cache/transaction/isolationlevels/No=
neTest.java	2008-01-01 22:27:17 UTC (rev 4928)
@@ -1,11 +1,13 @@
 package org.jboss.cache.transaction.isolationlevels;
 =

 import org.jboss.cache.lock.IsolationLevel;
+import org.testng.annotations.Test;
 =

 /**
  * @author <a href=3D"mailto:manik(a)jboss.org">Manik Surtani</a>
  * @since 2.0.0
  */
+(a)Test(groups =3D {"functional", "transaction"})
 public class NoneTest extends IsolationLevelTestBase
 {
    public NoneTest()


--===============2996857459902754020==--

From jbosscache-commits at lists.jboss.org Tue Jan  1 17:48:05 2008
Content-Type: multipart/mixed; boundary="===============5403730389600041939=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r4929 - in core/trunk/src:
 test/java/org/jboss/cache/lock and 1 other directory.
Date: Tue, 01 Jan 2008 17:48:04 -0500
Message-ID: <E1J9pu0-0004pU-R2@committer01.frg.pub.inap.atl.jboss.com>

--===============5403730389600041939==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: manik.surtani(a)jboss.com
Date: 2008-01-01 17:48:04 -0500 (Tue, 01 Jan 2008)
New Revision: 4929

Modified:
   core/trunk/src/main/java/org/jboss/cache/interceptors/PessimisticLockInt=
erceptor.java
   core/trunk/src/test/java/org/jboss/cache/lock/AcquireAllTest.java
   core/trunk/src/test/java/org/jboss/cache/lock/BreakDeadMemberLocksTest.j=
ava
Log:
Fixed PLI issue with not differentiating between a 1 phase prepare and a 2 =
phase prepare.

Modified: core/trunk/src/main/java/org/jboss/cache/interceptors/Pessimistic=
LockInterceptor.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/java/org/jboss/cache/interceptors/PessimisticLockIn=
terceptor.java	2008-01-01 22:27:17 UTC (rev 4928)
+++ core/trunk/src/main/java/org/jboss/cache/interceptors/PessimisticLockIn=
terceptor.java	2008-01-01 22:48:04 UTC (rev 4929)
@@ -131,6 +131,9 @@
 =

    protected Object handlePrepareMethod(InvocationContext ctx, GlobalTrans=
action gtx, List modification, Address coordinator, boolean onePhaseCommit)=
 throws Throwable
    {
+      // 2-phase commit prepares are no-ops here.
+      if (!onePhaseCommit) return nextInterceptor(ctx);
+
       // commit propagated up from the tx interceptor
       commit(ctx.getGlobalTransaction());
       Object retVal =3D nextInterceptor(ctx);
@@ -140,16 +143,13 @@
 =

    protected Object handleOptimisticPrepareMethod(InvocationContext ctx, G=
lobalTransaction gtx, List modifications, Map data, Address address, boolea=
n onePhaseCommit) throws Throwable
    {
-      return handlePrepareMethod(ctx, gtx, modifications, address, onePhas=
eCommit);
+      throw new UnsupportedOperationException("Optimistic prepare methods =
should never be received by the pessimistic lock interceptor!!");
    }
 =

    protected Object handleCommitMethod(InvocationContext ctx, GlobalTransa=
ction globalTransaction) throws Throwable
    {
       commit(globalTransaction);
-      if (log.isTraceEnabled())
-      {
-         log.trace("bypassed locking as method commit() doesn't require lo=
cking");
-      }
+      log.trace("bypassed locking as method commit() doesn't require locki=
ng");
       Object retVal =3D nextInterceptor(ctx);
       tx_table.cleanup(globalTransaction);
       return retVal;

Modified: core/trunk/src/test/java/org/jboss/cache/lock/AcquireAllTest.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/test/java/org/jboss/cache/lock/AcquireAllTest.java	2008-=
01-01 22:27:17 UTC (rev 4928)
+++ core/trunk/src/test/java/org/jboss/cache/lock/AcquireAllTest.java	2008-=
01-01 22:48:04 UTC (rev 4929)
@@ -1,10 +1,12 @@
 package org.jboss.cache.lock;
 =

-import org.jboss.cache.CacheImpl;
+import org.jboss.cache.CacheSPI;
 import org.jboss.cache.DefaultCacheFactory;
 import org.jboss.cache.Fqn;
 import org.jboss.cache.NodeSPI;
 import org.jboss.cache.config.Configuration;
+import org.jboss.cache.misc.TestingUtil;
+import org.jboss.cache.transaction.DummyTransactionManagerLookup;
 import static org.testng.AssertJUnit.assertEquals;
 import org.testng.annotations.AfterMethod;
 import org.testng.annotations.Test;
@@ -16,7 +18,7 @@
 @Test(groups =3D {"functional"})
 public class AcquireAllTest
 {
-   CacheImpl cache =3D null, cache2;
+   CacheSPI<Object, Object> cache =3D null, cache2;
    final Fqn FQN =3D Fqn.fromString("/myNode");
    final String KEY =3D "key";
    final String VALUE =3D "value";
@@ -24,12 +26,7 @@
    @AfterMethod(alwaysRun =3D true)
    public void tearDown() throws Exception
    {
-      if (cache !=3D null)
-      {
-         cache.stop();
-         cache.destroy();
-         cache =3D null;
-      }
+      TestingUtil.killCaches(cache, cache2);
    }
 =

 =

@@ -82,12 +79,12 @@
    }
 =

 =

-   private CacheImpl createCache(Configuration.CacheMode mode, IsolationLe=
vel level)
+   private CacheSPI<Object, Object> createCache(Configuration.CacheMode mo=
de, IsolationLevel level)
    {
-      CacheImpl c =3D (CacheImpl) new DefaultCacheFactory().createCache(fa=
lse);
+      CacheSPI<Object, Object> c =3D (CacheSPI<Object, Object>) new Defaul=
tCacheFactory<Object, Object>().createCache(false);
       c.getConfiguration().setCacheMode(mode);
       c.getConfiguration().setIsolationLevel(level);
-      c.getConfiguration().setTransactionManagerLookupClass("org.jboss.cac=
he.transaction.DummyTransactionManagerLookup");
+      c.getConfiguration().setTransactionManagerLookupClass(DummyTransacti=
onManagerLookup.class.getName());
       c.create();
       c.start();
       return c;

Modified: core/trunk/src/test/java/org/jboss/cache/lock/BreakDeadMemberLock=
sTest.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/test/java/org/jboss/cache/lock/BreakDeadMemberLocksTest.=
java	2008-01-01 22:27:17 UTC (rev 4928)
+++ core/trunk/src/test/java/org/jboss/cache/lock/BreakDeadMemberLocksTest.=
java	2008-01-01 22:48:04 UTC (rev 4929)
@@ -22,7 +22,6 @@
 =

 package org.jboss.cache.lock;
 =

-import org.jboss.cache.CacheImpl;
 import org.jboss.cache.CacheSPI;
 import org.jboss.cache.DefaultCacheFactory;
 import org.jboss.cache.Fqn;
@@ -176,20 +175,7 @@
 =

    protected void stopCache(String id)
    {
-      CacheImpl cache =3D (CacheImpl) caches.get(id);
-      if (cache !=3D null)
-      {
-         try
-         {
-            cache.stop();
-            cache.destroy();
-         }
-         catch (Exception e)
-         {
-            System.out.println("Exception stopping cache " + e.getMessage(=
));
-            e.printStackTrace(System.out);
-         }
-      }
+      TestingUtil.killCaches(caches.get(id));
    }
 =

    class HangSync implements Synchronization


--===============5403730389600041939==--

From jbosscache-commits at lists.jboss.org Tue Jan  1 17:58:36 2008
Content-Type: multipart/mixed; boundary="===============8564136314584560024=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r4930 -
 core/trunk/src/test/java/org/jboss/cache/api.
Date: Tue, 01 Jan 2008 17:58:36 -0500
Message-ID: <E1J9q4C-0006ih-5I@committer01.frg.pub.inap.atl.jboss.com>

--===============8564136314584560024==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: manik.surtani(a)jboss.com
Date: 2008-01-01 17:58:36 -0500 (Tue, 01 Jan 2008)
New Revision: 4930

Modified:
   core/trunk/src/test/java/org/jboss/cache/api/NodeReplicatedMoveTest.java
Log:
Fixed broken test

Modified: core/trunk/src/test/java/org/jboss/cache/api/NodeReplicatedMoveTe=
st.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/test/java/org/jboss/cache/api/NodeReplicatedMoveTest.jav=
a	2008-01-01 22:48:04 UTC (rev 4929)
+++ core/trunk/src/test/java/org/jboss/cache/api/NodeReplicatedMoveTest.jav=
a	2008-01-01 22:58:36 UTC (rev 4930)
@@ -7,7 +7,6 @@
 package org.jboss.cache.api;
 =

 import org.jboss.cache.Cache;
-import org.jboss.cache.CacheImpl;
 import org.jboss.cache.CacheSPI;
 import org.jboss.cache.DefaultCacheFactory;
 import org.jboss.cache.Fqn;
@@ -132,7 +131,7 @@
    private void assertInvalidated(Cache cache, Fqn fqn, String msg)
    {
       assert cache.getRoot().getChild(fqn) =3D=3D null : msg;
-      NodeSPI n =3D ((CacheImpl) cache).peek(fqn, true, true);
+      NodeSPI n =3D ((CacheSPI) cache).peek(fqn, true, true);
       assert n !=3D null : msg;
       assert !n.isValid() : msg;
    }


--===============8564136314584560024==--

From jbosscache-commits at lists.jboss.org Tue Jan  1 19:31:48 2008
Content-Type: multipart/mixed; boundary="===============5202299193276181356=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r4931 -
 core/trunk/src/main/java/org/jboss/cache.
Date: Tue, 01 Jan 2008 19:31:48 -0500
Message-ID: <E1J9rWO-00089G-5t@committer01.frg.pub.inap.atl.jboss.com>

--===============5202299193276181356==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: manik.surtani(a)jboss.com
Date: 2008-01-01 19:31:47 -0500 (Tue, 01 Jan 2008)
New Revision: 4931

Modified:
   core/trunk/src/main/java/org/jboss/cache/CacheImpl.java
Log:
added check to ensure buddy manager is enabled before attempting to initial=
ise

Modified: core/trunk/src/main/java/org/jboss/cache/CacheImpl.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/java/org/jboss/cache/CacheImpl.java	2008-01-01 22:5=
8:36 UTC (rev 4930)
+++ core/trunk/src/main/java/org/jboss/cache/CacheImpl.java	2008-01-02 00:3=
1:47 UTC (rev 4931)
@@ -730,7 +730,7 @@
             {
                log.info("CacheImpl local address is " + channel.getLocalAd=
dress());
             }
-            if (buddyManager !=3D null)
+            if (buddyManager !=3D null && buddyManager.isEnabled())
             {
                //buddyManager.init(this);
                buddyManager.init();


--===============5202299193276181356==--

From jbosscache-commits at lists.jboss.org Tue Jan  1 19:32:17 2008
Content-Type: multipart/mixed; boundary="===============8264533582961875351=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r4932 -
 core/trunk/src/main/java/org/jboss/cache/buddyreplication.
Date: Tue, 01 Jan 2008 19:32:16 -0500
Message-ID: <E1J9rWq-0008Ap-UB@committer01.frg.pub.inap.atl.jboss.com>

--===============8264533582961875351==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: manik.surtani(a)jboss.com
Date: 2008-01-01 19:32:16 -0500 (Tue, 01 Jan 2008)
New Revision: 4932

Modified:
   core/trunk/src/main/java/org/jboss/cache/buddyreplication/BuddyManager.j=
ava
Log:
Ensure the view changes queue is cleared before starting view change listen=
er thread

Modified: core/trunk/src/main/java/org/jboss/cache/buddyreplication/BuddyMa=
nager.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/java/org/jboss/cache/buddyreplication/BuddyManager.=
java	2008-01-02 00:31:47 UTC (rev 4931)
+++ core/trunk/src/main/java/org/jboss/cache/buddyreplication/BuddyManager.=
java	2008-01-02 00:32:16 UTC (rev 4932)
@@ -236,6 +236,7 @@
       }
    }
 =

+   // For now, this is initialised MANUALLY from CacheImpl.internalStart()
    public void init() throws CacheException
    {
       log.debug("Starting BuddyManager");
@@ -260,6 +261,7 @@
 =

       // assign buddies based on what we know now
       reassignBuddies(cache.getMembers());
+      queue.clear();
       asyncViewChangeHandler.start();
    }
 =

@@ -1048,6 +1050,7 @@
 =

       public void run()
       {
+         log.trace("Started");
          // don't start this thread until the Buddy Manager has initialise=
d as it cocks things up.
          try
          {
@@ -1082,6 +1085,7 @@
          MembershipChange members =3D queue.take();
          if (members =3D=3D STOP_NOTIFIER)
          {
+            log.trace("Caught stop notifier, time to go home.");
             // time to go home
             isRunning =3D false;
             return;
@@ -1108,6 +1112,7 @@
                log.trace("Not received necessary buddy pool info for all n=
ew members yet; waiting on poolInfoNotifierLock.");
                while (!receivedBuddyInfo)
                   poolInfoNotifierLock.wait();
+               log.trace("Notified!!");
                receivedBuddyInfo =3D false;
             }
          }


--===============8264533582961875351==--

From jbosscache-commits at lists.jboss.org Tue Jan  1 20:55:52 2008
Content-Type: multipart/mixed; boundary="===============8850565646897452716=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r4933 -
 core/trunk/src/main/java/org/jboss/cache/util/reflect.
Date: Tue, 01 Jan 2008 20:55:51 -0500
Message-ID: <E1J9spj-0007R8-SZ@committer01.frg.pub.inap.atl.jboss.com>

--===============8850565646897452716==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: manik.surtani(a)jboss.com
Date: 2008-01-01 20:55:51 -0500 (Tue, 01 Jan 2008)
New Revision: 4933

Modified:
   core/trunk/src/main/java/org/jboss/cache/util/reflect/ClasspathScanner.j=
ava
Log:
Fixed classpath scanning within jar files

Modified: core/trunk/src/main/java/org/jboss/cache/util/reflect/ClasspathSc=
anner.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/java/org/jboss/cache/util/reflect/ClasspathScanner.=
java	2008-01-02 00:32:16 UTC (rev 4932)
+++ core/trunk/src/main/java/org/jboss/cache/util/reflect/ClasspathScanner.=
java	2008-01-02 01:55:51 UTC (rev 4933)
@@ -2,6 +2,7 @@
 =

 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.jboss.cache.config.ConfigurationException;
 =

 import java.io.File;
 import java.io.IOException;
@@ -70,11 +71,11 @@
       }
       catch (IOException ioe)
       {
-         log.warn("could not read entries", ioe);
+         log.fatal("could not read entries", ioe);
       }
       catch (ClassNotFoundException e)
       {
-         log.warn("Unable to load class", e);
+         log.fatal("Unable to load class", e);
       }
 =

       return classes;
@@ -83,17 +84,19 @@
    private URL getURLPathFromClassLoader() throws MalformedURLException
    {
       URL u2 =3D classLoader.findResource("org/jboss/cache/Version.class");
+      String u2String =3D u2.toString();
 =

+      boolean isJar =3D u2String.startsWith("jar:") && u2String.contains("=
.jar!/");
+
       for (URL u : classLoader.getURLs())
       {
-         String urlString =3D u.toString().replaceAll("\\/\\.\\/", "/");
-         if (u2.toString().startsWith(urlString))
-         {
-            return new URL(urlString);
-         }
+         String originalUrlString =3D u.toString().replaceAll("\\/\\.\\/",=
 "/");
+         String urlString =3D originalUrlString;
+         if (isJar) urlString =3D "jar:" + urlString + "!/";
+         if (u2String.startsWith(urlString)) return new URL(originalUrlStr=
ing);
       }
 =

-      return null;
+      throw new ConfigurationException("Unable to find core JBoss Cache cl=
asses on classpath!");
    }
 =

 =



--===============8850565646897452716==--

From jbosscache-commits at lists.jboss.org Wed Jan  2 06:32:10 2008
Content-Type: multipart/mixed; boundary="===============3018539804148691228=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r4934 - in
 core/trunk/src/test/java/org/jboss/cache: invalidation and 4 other
 directories.
Date: Wed, 02 Jan 2008 06:28:08 -0500
Message-ID: <E1JA1lY-0007or-Do@committer01.frg.pub.inap.atl.jboss.com>

--===============3018539804148691228==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: manik.surtani(a)jboss.com
Date: 2008-01-02 06:28:08 -0500 (Wed, 02 Jan 2008)
New Revision: 4934

Modified:
   core/trunk/src/test/java/org/jboss/cache/factories/ComponentRegistryFunc=
tionalTest.java
   core/trunk/src/test/java/org/jboss/cache/invalidation/VersionInconsisten=
cyTest.java
   core/trunk/src/test/java/org/jboss/cache/jmx/CacheJmxWrapperTest.java
   core/trunk/src/test/java/org/jboss/cache/jmx/CacheJmxWrapperTestBase.java
   core/trunk/src/test/java/org/jboss/cache/replicated/ExceptionTest.java
   core/trunk/src/test/java/org/jboss/cache/statetransfer/StateTransfer200T=
est.java
   core/trunk/src/test/java/org/jboss/cache/transaction/StatusUnknownTest.j=
ava
Log:
Fixed a bunch of unit tests


Modified: core/trunk/src/test/java/org/jboss/cache/factories/ComponentRegis=
tryFunctionalTest.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/test/java/org/jboss/cache/factories/ComponentRegistryFun=
ctionalTest.java	2008-01-02 01:55:51 UTC (rev 4933)
+++ core/trunk/src/test/java/org/jboss/cache/factories/ComponentRegistryFun=
ctionalTest.java	2008-01-02 11:28:08 UTC (rev 4934)
@@ -95,6 +95,7 @@
       Marshaller m =3D cr.getOrCreateComponent(null, componentToTest);
       assert m instanceof VersionAwareMarshaller;
       VersionAwareMarshaller vam =3D (VersionAwareMarshaller) m;
+      vam.initReplicationVersions();
       m =3D (Marshaller) TestingUtil.extractField(vam, "defaultMarshaller"=
);
       assert m instanceof CacheMarshaller210;
    }
@@ -147,6 +148,7 @@
       Marshaller m =3D cr.getOrCreateComponent(null, componentToTest);
       assert m instanceof VersionAwareMarshaller;
       VersionAwareMarshaller vam =3D (VersionAwareMarshaller) m;
+      vam.initReplicationVersions();
       m =3D (Marshaller) TestingUtil.extractField(vam, "defaultMarshaller"=
);
       assert m instanceof CacheMarshaller200;
    }

Modified: core/trunk/src/test/java/org/jboss/cache/invalidation/VersionInco=
nsistencyTest.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/test/java/org/jboss/cache/invalidation/VersionInconsiste=
ncyTest.java	2008-01-02 01:55:51 UTC (rev 4933)
+++ core/trunk/src/test/java/org/jboss/cache/invalidation/VersionInconsiste=
ncyTest.java	2008-01-02 11:28:08 UTC (rev 4934)
@@ -1,7 +1,7 @@
 package org.jboss.cache.invalidation;
 =

 import org.jboss.cache.Cache;
-import org.jboss.cache.CacheImpl;
+import org.jboss.cache.CacheSPI;
 import org.jboss.cache.DefaultCacheFactory;
 import org.jboss.cache.Fqn;
 import org.jboss.cache.NodeSPI;
@@ -91,7 +91,7 @@
       assert val.equals("v-newer");
 =

       // test node versions
-      NodeSPI n =3D ((CacheImpl) cache1).peek(node, true, true);
+      NodeSPI n =3D ((CacheSPI) cache1).peek(node, true, true);
       assert ((DefaultDataVersion) n.getVersion()).getRawVersion() =3D=3D =
1 : "Version should be 1";
    }
 }

Modified: core/trunk/src/test/java/org/jboss/cache/jmx/CacheJmxWrapperTest.=
java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/test/java/org/jboss/cache/jmx/CacheJmxWrapperTest.java	2=
008-01-02 01:55:51 UTC (rev 4933)
+++ core/trunk/src/test/java/org/jboss/cache/jmx/CacheJmxWrapperTest.java	2=
008-01-02 11:28:08 UTC (rev 4934)
@@ -1,17 +1,5 @@
 package org.jboss.cache.jmx;
 =

-import static org.testng.AssertJUnit.assertEquals;
-import static org.testng.AssertJUnit.assertNotNull;
-import static org.testng.AssertJUnit.assertSame;
-import static org.testng.AssertJUnit.assertTrue;
-import static org.testng.AssertJUnit.fail;
-
-import java.util.List;
-
-import javax.management.ObjectName;
-import javax.transaction.Transaction;
-import javax.transaction.TransactionManager;
-
 import org.jboss.cache.Cache;
 import org.jboss.cache.CacheException;
 import org.jboss.cache.CacheStatus;
@@ -26,13 +14,20 @@
 import org.jboss.cache.transaction.DummyTransactionManagerLookup;
 import org.jgroups.Address;
 import org.jgroups.stack.IpAddress;
+import static org.testng.AssertJUnit.*;
+import org.testng.annotations.Test;
 =

+import javax.management.ObjectName;
+import javax.transaction.TransactionManager;
+import java.util.List;
+
 /**
  * Tests the JMX wrapper class around the cache.
  *
  * @author <a href=3D"mailto:manik(a)jboss.org">Manik Surtani</a>
  * @author Brian Stansberry
  */
+(a)Test(groups =3D "functional")
 public class CacheJmxWrapperTest extends CacheJmxWrapperTestBase
 {
    public void testCacheMBeanBinding() throws Exception

Modified: core/trunk/src/test/java/org/jboss/cache/jmx/CacheJmxWrapperTestB=
ase.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/test/java/org/jboss/cache/jmx/CacheJmxWrapperTestBase.ja=
va	2008-01-02 01:55:51 UTC (rev 4933)
+++ core/trunk/src/test/java/org/jboss/cache/jmx/CacheJmxWrapperTestBase.ja=
va	2008-01-02 11:28:08 UTC (rev 4934)
@@ -22,7 +22,7 @@
  * @author <a href=3D"mailto:manik(a)jboss.org">Manik Surtani</a>
  * @author Brian Stansberry
  */
-(a)Test(groups =3D {"functional"})
+(a)Test(groups =3D "functional")
 public abstract class CacheJmxWrapperTestBase
 {
    public static final String CLUSTER_NAME =3D "CacheMBeanTest";

Modified: core/trunk/src/test/java/org/jboss/cache/replicated/ExceptionTest=
.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/test/java/org/jboss/cache/replicated/ExceptionTest.java	=
2008-01-02 01:55:51 UTC (rev 4933)
+++ core/trunk/src/test/java/org/jboss/cache/replicated/ExceptionTest.java	=
2008-01-02 11:28:08 UTC (rev 4934)
@@ -3,7 +3,6 @@
 import org.jboss.cache.Cache;
 import org.jboss.cache.DefaultCacheFactory;
 import org.jboss.cache.Fqn;
-import org.jboss.cache.ReplicationException;
 import org.jboss.cache.config.Configuration;
 import org.jboss.cache.factories.UnitTestCacheConfigurationFactory;
 import org.jboss.cache.lock.TimeoutException;
@@ -53,7 +52,7 @@
       if (cache2 !=3D null) cache2.stop();
    }
 =

-   @Test(groups =3D {"functional"}, expectedExceptions =3D {ReplicationExc=
eption.class})
+   @Test(groups =3D {"functional"}, expectedExceptions =3D {TimeoutExcepti=
on.class})
    public void testSyncReplTimeout()
    {
       cache1.getConfiguration().setSyncReplTimeout(1); // 1ms.  this is *b=
ound* to fail.

Modified: core/trunk/src/test/java/org/jboss/cache/statetransfer/StateTrans=
fer200Test.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/test/java/org/jboss/cache/statetransfer/StateTransfer200=
Test.java	2008-01-02 01:55:51 UTC (rev 4933)
+++ core/trunk/src/test/java/org/jboss/cache/statetransfer/StateTransfer200=
Test.java	2008-01-02 11:28:08 UTC (rev 4934)
@@ -7,7 +7,6 @@
 =

 package org.jboss.cache.statetransfer;
 =

-import org.jboss.cache.CacheImpl;
 import org.jboss.cache.CacheSPI;
 import org.jboss.cache.Fqn;
 import org.jboss.cache.Region;
@@ -83,9 +82,6 @@
       // Pause to give caches time to see each other
       TestingUtil.blockUntilViewsReceived(60000, cache1, cache2);
 =

-      System.out.println("C1: " + ((CacheImpl) cache1).printLockInfo());
-      System.out.println("C2: " + ((CacheImpl) cache2).printLockInfo());
-
       // now peek into cache 2 to check that this state has been transferr=
ed into the backup subtree
       Fqn test =3D BuddyManager.getBackupFqn(cache1.getLocalAddress(), A_B=
);
       assertEquals("/a/b state should have integrated in backup region " +=
 test, JOE, cache2.get(test, "name"));

Modified: core/trunk/src/test/java/org/jboss/cache/transaction/StatusUnknow=
nTest.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/test/java/org/jboss/cache/transaction/StatusUnknownTest.=
java	2008-01-02 01:55:51 UTC (rev 4933)
+++ core/trunk/src/test/java/org/jboss/cache/transaction/StatusUnknownTest.=
java	2008-01-02 11:28:08 UTC (rev 4934)
@@ -1,7 +1,7 @@
 package org.jboss.cache.transaction;
 =

 import org.jboss.cache.Cache;
-import org.jboss.cache.CacheImpl;
+import org.jboss.cache.CacheSPI;
 import org.jboss.cache.DefaultCacheFactory;
 import org.jboss.cache.Fqn;
 import static org.testng.AssertJUnit.*;
@@ -29,7 +29,7 @@
  * @author <a href=3D"mailto:manik(a)jboss.org">Manik Surtani</a>
  */
 @SuppressWarnings("unchecked")
-(a)Test(groups =3D {"functional"})
+(a)Test(groups =3D "functional")
 public class StatusUnknownTest
 {
    private Cache cache;
@@ -56,11 +56,11 @@
       Fqn<String> fqn =3D Fqn.fromString("/a/b/c");
 =

       cache.put(fqn, "k", "v");
-      assertEquals(4, ((CacheImpl) cache).getNumberOfLocksHeld());
+      assertEquals(4, ((CacheSPI) cache).getNumberOfLocksHeld());
       assertTrue(cache.getRoot().hasChild(fqn));
       tm.commit();
 =

-      assertEquals(0, ((CacheImpl) cache).getNumberOfLocksHeld());
+      assertEquals(0, ((CacheSPI) cache).getNumberOfLocksHeld());
       assertFalse(cache.getRoot().hasChild(fqn));
    }
 =



--===============3018539804148691228==--

From jbosscache-commits at lists.jboss.org Wed Jan  2 06:32:33 2008
Content-Type: multipart/mixed; boundary="===============4337560119074185947=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r4935 -
 core/trunk/src/main/java/org/jboss/cache/factories.
Date: Wed, 02 Jan 2008 06:28:33 -0500
Message-ID: <E1JA1lx-0007p7-J9@committer01.frg.pub.inap.atl.jboss.com>

--===============4337560119074185947==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: manik.surtani(a)jboss.com
Date: 2008-01-02 06:28:33 -0500 (Wed, 02 Jan 2008)
New Revision: 4935

Modified:
   core/trunk/src/main/java/org/jboss/cache/factories/ComponentRegistry.java
Log:
Even after resetting, the SPI should move to state WIRED so operations like=
 start() can be called on it!

Modified: core/trunk/src/main/java/org/jboss/cache/factories/ComponentRegis=
try.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/java/org/jboss/cache/factories/ComponentRegistry.ja=
va	2008-01-02 11:28:08 UTC (rev 4934)
+++ core/trunk/src/main/java/org/jboss/cache/factories/ComponentRegistry.ja=
va	2008-01-02 11:28:33 UTC (rev 4935)
@@ -541,6 +541,8 @@
       componentLookup.put(CacheImpl.class.getName(), impl);
       componentLookup.put(CacheSPI.class.getName(), spi);
 =

+      spi.changeState(WIRED);
+
       overallState =3D null;
    }
 =



--===============4337560119074185947==--

From jbosscache-commits at lists.jboss.org Wed Jan  2 06:32:57 2008
Content-Type: multipart/mixed; boundary="===============2862288371277327295=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r4936 -
 core/trunk/src/main/java/org/jboss/cache/interceptors.
Date: Wed, 02 Jan 2008 06:28:57 -0500
Message-ID: <E1JA1mL-0007pL-QP@committer01.frg.pub.inap.atl.jboss.com>

--===============2862288371277327295==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: manik.surtani(a)jboss.com
Date: 2008-01-02 06:28:57 -0500 (Wed, 02 Jan 2008)
New Revision: 4936

Modified:
   core/trunk/src/main/java/org/jboss/cache/interceptors/PessimisticLockInt=
erceptor.java
Log:
Ensure we dont acquire locks for isolation level of NONE

Modified: core/trunk/src/main/java/org/jboss/cache/interceptors/Pessimistic=
LockInterceptor.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/java/org/jboss/cache/interceptors/PessimisticLockIn=
terceptor.java	2008-01-02 11:28:33 UTC (rev 4935)
+++ core/trunk/src/main/java/org/jboss/cache/interceptors/PessimisticLockIn=
terceptor.java	2008-01-02 11:28:57 UTC (rev 4936)
@@ -310,7 +310,7 @@
                                            boolean acquireLockOnParent, bo=
olean reverseRemoveCheck)
          throws InterruptedException
    {
-      if (fqn =3D=3D null) return false;
+      if (fqn =3D=3D null || configuration.getIsolationLevel() =3D=3D Isol=
ationLevel.NONE) return false;
 =

       boolean created;
       long timeout =3D zeroLockTimeout ? 0 : ctx.getContextLockAcquisition=
Timeout(lock_acquisition_timeout);


--===============2862288371277327295==--

From jbosscache-commits at lists.jboss.org Wed Jan  2 06:33:31 2008
Content-Type: multipart/mixed; boundary="===============6808137085618932180=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r4937 -
 core/trunk/src/main/java/org/jboss/cache/invocation.
Date: Wed, 02 Jan 2008 06:29:31 -0500
Message-ID: <E1JA1mt-0007qY-Mj@committer01.frg.pub.inap.atl.jboss.com>

--===============6808137085618932180==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: manik.surtani(a)jboss.com
Date: 2008-01-02 06:29:31 -0500 (Wed, 02 Jan 2008)
New Revision: 4937

Modified:
   core/trunk/src/main/java/org/jboss/cache/invocation/CacheInvocationDeleg=
ate.java
Log:
getInterceptorChain should return unmodifiable list

Modified: core/trunk/src/main/java/org/jboss/cache/invocation/CacheInvocati=
onDelegate.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/java/org/jboss/cache/invocation/CacheInvocationDele=
gate.java	2008-01-02 11:28:57 UTC (rev 4936)
+++ core/trunk/src/main/java/org/jboss/cache/invocation/CacheInvocationDele=
gate.java	2008-01-02 11:29:31 UTC (rev 4937)
@@ -113,7 +113,7 @@
 =

    public List<Interceptor> getInterceptorChain()
    {
-      return InterceptorChainFactory.asList(interceptorChain);
+      return Collections.unmodifiableList(InterceptorChainFactory.asList(i=
nterceptorChain));
    }
 =

    public void addInterceptor(Interceptor i, int position)


--===============6808137085618932180==--

From jbosscache-commits at lists.jboss.org Wed Jan  2 06:33:54 2008
Content-Type: multipart/mixed; boundary="===============1538964856443831080=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r4938 -
 core/trunk/src/main/java/org/jboss/cache/marshall.
Date: Wed, 02 Jan 2008 06:29:53 -0500
Message-ID: <E1JA1nF-0007yz-S0@committer01.frg.pub.inap.atl.jboss.com>

--===============1538964856443831080==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: manik.surtani(a)jboss.com
Date: 2008-01-02 06:29:53 -0500 (Wed, 02 Jan 2008)
New Revision: 4938

Modified:
   core/trunk/src/main/java/org/jboss/cache/marshall/VersionAwareMarshaller=
.java
Log:
made method public to aid unit testing

Modified: core/trunk/src/main/java/org/jboss/cache/marshall/VersionAwareMar=
shaller.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/java/org/jboss/cache/marshall/VersionAwareMarshalle=
r.java	2008-01-02 11:29:31 UTC (rev 4937)
+++ core/trunk/src/main/java/org/jboss/cache/marshall/VersionAwareMarshalle=
r.java	2008-01-02 11:29:53 UTC (rev 4938)
@@ -42,7 +42,7 @@
    private int versionInt;
 =

    @Start
-   protected void initReplicationVersions()
+   public void initReplicationVersions()
    {
       String replVersionString =3D configuration.getReplVersionString();
 =



--===============1538964856443831080==--

From jbosscache-commits at lists.jboss.org Wed Jan  2 06:34:25 2008
Content-Type: multipart/mixed; boundary="===============3574238150376116328=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r4939 -
 core/trunk/src/main/java/org/jboss/cache/jmx.
Date: Wed, 02 Jan 2008 06:30:24 -0500
Message-ID: <E1JA1nk-0000HZ-K7@committer01.frg.pub.inap.atl.jboss.com>

--===============3574238150376116328==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: manik.surtani(a)jboss.com
Date: 2008-01-02 06:30:24 -0500 (Wed, 02 Jan 2008)
New Revision: 4939

Modified:
   core/trunk/src/main/java/org/jboss/cache/jmx/CacheJmxWrapper.java
Log:
code readability cleanups

Modified: core/trunk/src/main/java/org/jboss/cache/jmx/CacheJmxWrapper.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/java/org/jboss/cache/jmx/CacheJmxWrapper.java	2008-=
01-02 11:29:53 UTC (rev 4938)
+++ core/trunk/src/main/java/org/jboss/cache/jmx/CacheJmxWrapper.java	2008-=
01-02 11:30:24 UTC (rev 4939)
@@ -547,7 +547,7 @@
 =

    public void create() throws CacheException
    {
-      if (cacheStatus.createAllowed() =3D=3D false)
+      if (!cacheStatus.createAllowed())
       {
          if (cacheStatus.needToDestroyFailedCache())
             destroy();
@@ -581,7 +581,7 @@
 =

    public void start() throws CacheException
    {
-      if (cacheStatus.startAllowed() =3D=3D false)
+      if (!cacheStatus.startAllowed())
       {
          if (cacheStatus.needToDestroyFailedCache())
             destroy(); // this will take us back to DESTROYED
@@ -614,7 +614,7 @@
 =

    public void stop()
    {
-      if (cacheStatus.stopAllowed() =3D=3D false)
+      if (!cacheStatus.stopAllowed())
       {
          return;
       }
@@ -654,7 +654,7 @@
 =

    public void destroy()
    {
-      if (cacheStatus.destroyAllowed() =3D=3D false)
+      if (!cacheStatus.destroyAllowed())
       {
          if (cacheStatus.needStopBeforeDestroy())
          {
@@ -1072,8 +1072,8 @@
             this,
             getNextNotificationSequenceNumber(), now, msg,
             "State", "java.lang.Integer",
-            Integer.valueOf(oldState), Integer.valueOf(newState)
-      );
+            oldState, newState);
+
       stateChangeNotification.setUserData(t);
 =

       sendNotification(stateChangeNotification);


--===============3574238150376116328==--

From jbosscache-commits at lists.jboss.org Wed Jan  2 07:00:57 2008
Content-Type: multipart/mixed; boundary="===============2062128171583589811=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r4940 - in
 core/trunk/src/main/java/org/jboss/cache: invocation and 1 other directories.
Date: Wed, 02 Jan 2008 06:56:57 -0500
Message-ID: <E1JA2DR-00058r-26@committer01.frg.pub.inap.atl.jboss.com>

--===============2062128171583589811==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: manik.surtani(a)jboss.com
Date: 2008-01-02 06:56:56 -0500 (Wed, 02 Jan 2008)
New Revision: 4940

Modified:
   core/trunk/src/main/java/org/jboss/cache/CacheImpl.java
   core/trunk/src/main/java/org/jboss/cache/invocation/AbstractInvocationDe=
legate.java
   core/trunk/src/main/java/org/jboss/cache/invocation/RemoteCacheInvocatio=
nDelegate.java
   core/trunk/src/main/java/org/jboss/cache/marshall/MethodDeclarations.java
Log:
Fixed data gravitation issues

Modified: core/trunk/src/main/java/org/jboss/cache/CacheImpl.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/java/org/jboss/cache/CacheImpl.java	2008-01-02 11:3=
0:24 UTC (rev 4939)
+++ core/trunk/src/main/java/org/jboss/cache/CacheImpl.java	2008-01-02 11:5=
6:56 UTC (rev 4940)
@@ -2827,7 +2827,7 @@
 =

                      // use a get() call into the cache to make sure cache=
 loading takes place.
                      ctx.getOptionOverrides().setSkipDataGravitation(true);
-                     actualNode =3D get(backupNodeFqn);
+                     actualNode =3D spi.getNode(backupNodeFqn);
                      ctx.getOptionOverrides().setSkipDataGravitation(false=
);
                      if (log.isTraceEnabled())
                         log.trace("Looking for " + backupNodeFqn + ". Sear=
ch result: " + actualNode);
@@ -2908,8 +2908,10 @@
          if (log.isTraceEnabled())
             log.trace("DataGravitationCleanup: Removing primary (" + prima=
ry + ") and backup (" + backup + ")");
          //primaryDataCleanup =3D MethodCallFactory.create(MethodDeclarati=
ons.removeNodeMethodLocal, primary, false);
+         spi.getInvocationContext().getOptionOverrides().setCacheModeLocal=
(true);
          spi.removeNode(primary);
          //backupDataCleanup =3D MethodCallFactory.create(MethodDeclaratio=
ns.removeNodeMethodLocal, backup, false);
+         spi.getInvocationContext().getOptionOverrides().setCacheModeLocal=
(true);
          spi.removeNode(backup);
       }
       else

Modified: core/trunk/src/main/java/org/jboss/cache/invocation/AbstractInvoc=
ationDelegate.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/java/org/jboss/cache/invocation/AbstractInvocationD=
elegate.java	2008-01-02 11:30:24 UTC (rev 4939)
+++ core/trunk/src/main/java/org/jboss/cache/invocation/AbstractInvocationD=
elegate.java	2008-01-02 11:56:56 UTC (rev 4940)
@@ -10,7 +10,6 @@
 import org.jboss.cache.factories.annotations.Inject;
 import org.jboss.cache.interceptors.Interceptor;
 import org.jboss.cache.marshall.MethodCall;
-import org.jboss.cache.marshall.MethodDeclarations;
 =

 /**
  * The JBoss Cache hand-wired interceptor stack.  A "minimal" AOP framewor=
k which uses delegation through an
@@ -76,7 +75,7 @@
       InvocationContext ctx =3D invocationContextContainer.get();
 =

       // BR methods should NOT block on the cache being started, since the=
 cache depends on these completing to start.
-      if (!MethodDeclarations.isBuddyGroupOrganisationMethod(call.getMetho=
dId()) &&
+      if (//!MethodDeclarations.isBuddyGroupOrganisationMethod(call.getMet=
hodId()) &&
             !cache.getCacheStatus().allowInvocations() && !skipCacheStatus=
Check)
       {
          // only throw an exception if this is a locally originating call =
- JBCACHE-1179

Modified: core/trunk/src/main/java/org/jboss/cache/invocation/RemoteCacheIn=
vocationDelegate.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/java/org/jboss/cache/invocation/RemoteCacheInvocati=
onDelegate.java	2008-01-02 11:30:24 UTC (rev 4939)
+++ core/trunk/src/main/java/org/jboss/cache/invocation/RemoteCacheInvocati=
onDelegate.java	2008-01-02 11:56:56 UTC (rev 4940)
@@ -30,8 +30,13 @@
    {
       if (methodCall.getMethodId() =3D=3D MethodDeclarations.clusteredGetM=
ethod_id)
          return invokeClusteredGet(methodCall);
-      else if (MethodDeclarations.isDataGravitationMethod(methodCall.getMe=
thodId()))
-         return invokeDataGravitationCall(methodCall);
+      else if (methodCall.getMethodId() =3D=3D MethodDeclarations.dataGrav=
itationCleanupMethod_id)
+      {
+         Object[] args =3D methodCall.getArgs();
+         cache._dataGravitationCleanup((GlobalTransaction) args[0], (Fqn) =
args[1], (Fqn) args[2]);
+         return null;
+      }
+
       else
       {
          try
@@ -75,25 +80,6 @@
       return clusteredGet((MethodCall) args[0], (Boolean) args[1]);
    }
 =

-   public Object invokeDataGravitationCall(MethodCall call) throws Excepti=
on
-   {
-      Object[] args =3D call.getArgs();
-      if (call.getMethodId() =3D=3D MethodDeclarations.dataGravitationMeth=
od_id)
-      {
-         return cache.gravitateData((Fqn) args[0], (Boolean) args[1]);
-      }
-      else if (call.getMethodId() =3D=3D MethodDeclarations.dataGravitatio=
nCleanupMethod_id)
-      {
-         cache._dataGravitationCleanup((GlobalTransaction) args[0], (Fqn) =
args[1], (Fqn) args[2]);
-         return null;
-      }
-      else
-      {
-         throw new UnsupportedOperationException(call + " is not a data gr=
avitation call!");
-      }
-   }
-
-
    public void block()
    {
       MethodCall m =3D MethodCallFactory.create(MethodDeclarations.blockCh=
annelLocal);

Modified: core/trunk/src/main/java/org/jboss/cache/marshall/MethodDeclarati=
ons.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/java/org/jboss/cache/marshall/MethodDeclarations.ja=
va	2008-01-02 11:30:24 UTC (rev 4939)
+++ core/trunk/src/main/java/org/jboss/cache/marshall/MethodDeclarations.ja=
va	2008-01-02 11:56:56 UTC (rev 4940)
@@ -10,6 +10,7 @@
 import org.apache.commons.logging.LogFactory;
 import org.jboss.cache.CacheException;
 import org.jboss.cache.CacheImpl;
+import org.jboss.cache.CacheSPI;
 import org.jboss.cache.Fqn;
 import org.jboss.cache.Node;
 import org.jboss.cache.buddyreplication.BuddyGroup;
@@ -276,7 +277,7 @@
          remoteAssignToBuddyGroupMethod =3D CacheImpl.class.getDeclaredMet=
hod("_remoteAssignToBuddyGroup", BuddyGroup.class, Map.class);
 =

          dataGravitationCleanupMethod =3D CacheImpl.class.getDeclaredMetho=
d("_dataGravitationCleanup", GlobalTransaction.class, Fqn.class, Fqn.class);
-         dataGravitationMethod =3D CacheImpl.class.getDeclaredMethod("grav=
itateData", Fqn.class, boolean.class);
+         dataGravitationMethod =3D CacheSPI.class.getDeclaredMethod("gravi=
tateData", Fqn.class, boolean.class);
 =

          // ------------ move() api
          moveMethodLocal =3D CacheImpl.class.getDeclaredMethod("_move", Fq=
n.class, Fqn.class);


--===============2062128171583589811==--

From jbosscache-commits at lists.jboss.org Wed Jan  2 11:01:56 2008
Content-Type: multipart/mixed; boundary="===============1481233640962937967=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r4941 - in core/trunk/src:
 main/java/org/jboss/cache/buddyreplication and 5 other directories.
Date: Wed, 02 Jan 2008 11:01:52 -0500
Message-ID: <E1JA62S-0001qv-VZ@committer01.frg.pub.inap.atl.jboss.com>

--===============1481233640962937967==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: manik.surtani(a)jboss.com
Date: 2008-01-02 11:01:52 -0500 (Wed, 02 Jan 2008)
New Revision: 4941

Modified:
   core/trunk/src/main/java/org/jboss/cache/CacheImpl.java
   core/trunk/src/main/java/org/jboss/cache/buddyreplication/BuddyManager.j=
ava
   core/trunk/src/main/java/org/jboss/cache/interceptors/BaseRpcInterceptor=
.java
   core/trunk/src/main/java/org/jboss/cache/interceptors/DataGravitatorInte=
rceptor.java
   core/trunk/src/main/java/org/jboss/cache/invocation/AbstractInvocationDe=
legate.java
   core/trunk/src/main/java/org/jboss/cache/invocation/CacheInvocationDeleg=
ate.java
   core/trunk/src/main/java/org/jboss/cache/invocation/RemoteCacheInvocatio=
nDelegate.java
   core/trunk/src/main/java/org/jboss/cache/jmx/CacheJmxWrapper.java
   core/trunk/src/main/java/org/jboss/cache/marshall/MethodDeclarations.java
   core/trunk/src/test/java/org/jboss/cache/jmx/InterceptorRegistrationTest=
.java
Log:
moved remote-only calls to the RemoteCacheInvocationDelegate rather than th=
e CacheImpl

Modified: core/trunk/src/main/java/org/jboss/cache/CacheImpl.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/java/org/jboss/cache/CacheImpl.java	2008-01-02 11:5=
6:56 UTC (rev 4940)
+++ core/trunk/src/main/java/org/jboss/cache/CacheImpl.java	2008-01-02 16:0=
1:52 UTC (rev 4941)
@@ -8,9 +8,7 @@
 =

 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.jboss.cache.buddyreplication.BuddyGroup;
 import org.jboss.cache.buddyreplication.BuddyManager;
-import org.jboss.cache.buddyreplication.BuddyNotInitException;
 import org.jboss.cache.buddyreplication.GravitateResult;
 import org.jboss.cache.config.Configuration;
 import org.jboss.cache.config.Option;
@@ -1946,13 +1944,14 @@
          }
          else
          {
-            if (rsp.getValue() instanceof Exception)
+            Object value =3D rsp.getValue();
+            if (value instanceof Exception && !(value instanceof Replicati=
onException))
             {
-               if (log.isTraceEnabled())
-                  log.trace("Recieved exception'" + rsp.getValue() + "' fr=
om " + rsp.getSender());
-               throw (Exception) rsp.getValue();
+               // if we have any application-level exceptions make sure we=
 throw them!!
+               if (log.isTraceEnabled()) log.trace("Recieved exception'" +=
 value + "' from " + rsp.getSender());
+               throw (Exception) value;
             }
-            retval.add(rsp.getValue());
+            retval.add(value);
          }
       }
       return retval;
@@ -2873,62 +2872,6 @@
       return list;
    }
 =

-   // ------------- start: buddy replication specific 'lifecycle' method c=
alls
-
-   public void _remoteAssignToBuddyGroup(BuddyGroup group, Map<Fqn, byte[]=
> state) throws Exception
-   {
-      if (buddyManager !=3D null)
-         buddyManager.handleAssignToBuddyGroup(group, state);
-      else if (log.isWarnEnabled())
-         log.warn("Received assignToBuddyGroup call from group owner [" + =
group.getDataOwner() + "] but buddy replication is not enabled on this node=
!");
-   }
-
-   public void _remoteRemoveFromBuddyGroup(String groupName) throws BuddyN=
otInitException
-   {
-      if (buddyManager !=3D null)
-         buddyManager.handleRemoveFromBuddyGroup(groupName);
-      else if (log.isWarnEnabled())
-         log.warn("Received removeFromBuddyGroup call for group name [" + =
groupName + "] but buddy replication is not enabled on this node!");
-
-   }
-
-   public void _remoteAnnounceBuddyPoolName(Address address, String buddyP=
oolName)
-   {
-      if (buddyManager !=3D null)
-         buddyManager.handlePoolNameBroadcast(address, buddyPoolName);
-      else if (log.isWarnEnabled())
-         log.warn("Received annouceBuddyPoolName call from [" + address + =
"] but buddy replication is not enabled on this node!");
-   }
-
-   public void _dataGravitationCleanup(GlobalTransaction gtx, Fqn primary,=
 Fqn backup) throws Exception
-   {
-//      MethodCall primaryDataCleanup, backupDataCleanup;
-      if (buddyManager.isDataGravitationRemoveOnFind())
-      {
-         if (log.isTraceEnabled())
-            log.trace("DataGravitationCleanup: Removing primary (" + prima=
ry + ") and backup (" + backup + ")");
-         //primaryDataCleanup =3D MethodCallFactory.create(MethodDeclarati=
ons.removeNodeMethodLocal, primary, false);
-         spi.getInvocationContext().getOptionOverrides().setCacheModeLocal=
(true);
-         spi.removeNode(primary);
-         //backupDataCleanup =3D MethodCallFactory.create(MethodDeclaratio=
ns.removeNodeMethodLocal, backup, false);
-         spi.getInvocationContext().getOptionOverrides().setCacheModeLocal=
(true);
-         spi.removeNode(backup);
-      }
-      else
-      {
-         if (log.isTraceEnabled())
-            log.trace("DataGravitationCleanup: Evicting primary (" + prima=
ry + ") and backup (" + backup + ")");
-         //primaryDataCleanup =3D MethodCallFactory.create(MethodDeclarati=
ons.evictNodeMethodLocal, primary);
-         spi.evict(primary, true);
-         //backupDataCleanup =3D MethodCallFactory.create(MethodDeclaratio=
ns.evictNodeMethodLocal, backup);
-         spi.evict(backup, true);
-      }
-
-//      invokeMethod(primaryDataCleanup, true);
-//      invokeMethod(backupDataCleanup, true);
-   }
-
-   // ------------- end: buddy replication specific 'lifecycle' method cal=
ls
    /**
     * Releases all locks for a FQN.
     */
@@ -3140,7 +3083,7 @@
     */
    private void configureLogCategory()
    {
-      StringBuilder category =3D new StringBuilder(getClass().getSimpleNam=
e());
+      StringBuilder category =3D new StringBuilder(getClass().getName());
       if (configuration !=3D null)
       {
          String clusterName =3D configuration.getClusterName();
@@ -3151,12 +3094,12 @@
             if (channel !=3D null && channel.getLocalAddress() !=3D null)
             {
                category.append('.');
-               category.append(channel.getLocalAddress());
+               category.append(channel.getLocalAddress().toString().replac=
e('.', '_'));
             }
          }
       }
       // replace .s with _s otherwise Log4J will strip them out
-      log =3D LogFactory.getLog(category.toString().replace('.', '_'));
+      log =3D LogFactory.getLog(category.toString());
    }
 =

    /**

Modified: core/trunk/src/main/java/org/jboss/cache/buddyreplication/BuddyMa=
nager.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/java/org/jboss/cache/buddyreplication/BuddyManager.=
java	2008-01-02 11:56:56 UTC (rev 4940)
+++ core/trunk/src/main/java/org/jboss/cache/buddyreplication/BuddyManager.=
java	2008-01-02 16:01:52 UTC (rev 4941)
@@ -685,7 +685,6 @@
       buddyGroup.removeBuddies(buddies);
       // now broadcast a message to the removed buddies.
       MethodCall membershipCall =3D MethodCallFactory.create(MethodDeclara=
tions.remoteRemoveFromBuddyGroupMethod, buddyGroup.getGroupName());
-      MethodCall replicateCall =3D MethodCallFactory.create(MethodDeclarat=
ions.replicateMethod, membershipCall);
 =

       int attemptsLeft =3D UNINIT_BUDDIES_RETRIES;
       int currentAttempt =3D 0;
@@ -694,7 +693,7 @@
       {
          try
          {
-            makeRemoteCall(buddies, replicateCall, true);
+            makeRemoteCall(buddies, membershipCall, true);
             break;
          }
          catch (Exception e)
@@ -784,7 +783,6 @@
 =

       // now broadcast a message to the newly assigned buddies.
       MethodCall membershipCall =3D MethodCallFactory.create(MethodDeclara=
tions.remoteAssignToBuddyGroupMethod, buddyGroup, stateMap);
-      MethodCall replicateCall =3D MethodCallFactory.create(MethodDeclarat=
ions.replicateMethod, membershipCall);
 =

       int attemptsLeft =3D UNINIT_BUDDIES_RETRIES;
       int currentAttempt =3D 0;
@@ -793,7 +791,7 @@
       {
          try
          {
-            makeRemoteCall(buddies, replicateCall, true);
+            makeRemoteCall(buddies, membershipCall, true);
             break;
          }
          catch (Exception e)
@@ -943,11 +941,10 @@
       }
 =

       MethodCall membershipCall =3D MethodCallFactory.create(MethodDeclara=
tions.remoteAnnounceBuddyPoolNameMethod, buddyGroup.getDataOwner(), config.=
getBuddyPoolName());
-      MethodCall replicateCall =3D MethodCallFactory.create(MethodDeclarat=
ions.replicateMethod, membershipCall);
 =

       try
       {
-         makeRemoteCall(recipients, replicateCall, true);
+         makeRemoteCall(recipients, membershipCall, true);
       }
       catch (Exception e)
       {

Modified: core/trunk/src/main/java/org/jboss/cache/interceptors/BaseRpcInte=
rceptor.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/java/org/jboss/cache/interceptors/BaseRpcIntercepto=
r.java	2008-01-02 11:56:56 UTC (rev 4940)
+++ core/trunk/src/main/java/org/jboss/cache/interceptors/BaseRpcIntercepto=
r.java	2008-01-02 16:01:52 UTC (rev 4941)
@@ -76,7 +76,12 @@
 =

    protected void replicateCall(List<Address> recipients, MethodCall call,=
 boolean sync, Option o) throws Throwable
    {
+      replicateCall(recipients, call, sync, o, true);
+   }
 =

+   protected void replicateCall(List<Address> recipients, MethodCall call,=
 boolean sync, Option o, boolean wrapMethodCallInReplicateMethod) throws Th=
rowable
+   {
+
       if (log.isTraceEnabled()) log.trace("Broadcasting call " + call + " =
to recipient list " + recipients);
       Transaction tx =3D null;
       if (cache.getTransactionManager() !=3D null && (tx =3D cache.getTran=
sactionManager().getTransaction()) !=3D null)
@@ -108,12 +113,13 @@
          long syncReplTimeout =3D o.getSyncReplTimeout();
          if (syncReplTimeout < 0) syncReplTimeout =3D configuration.getSyn=
cReplTimeout();
 =

+         MethodCall toCall =3D wrapMethodCallInReplicateMethod ? toCall =
=3D MethodCallFactory.create(MethodDeclarations.replicateMethod, call) : ca=
ll;
+
          List rsps =3D rpcManager.callRemoteMethods(callRecipients,
-               MethodDeclarations.replicateMethod,
-               new Object[]{call},
+               toCall,
                sync, // is synchronised?
                true, // ignore self?
-               syncReplTimeout);
+               (int) syncReplTimeout);
          if (log.isTraceEnabled())
          {
             log.trace("responses=3D" + rsps);

Modified: core/trunk/src/main/java/org/jboss/cache/interceptors/DataGravita=
torInterceptor.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/java/org/jboss/cache/interceptors/DataGravitatorInt=
erceptor.java	2008-01-02 11:56:56 UTC (rev 4940)
+++ core/trunk/src/main/java/org/jboss/cache/interceptors/DataGravitatorInt=
erceptor.java	2008-01-02 16:01:52 UTC (rev 4941)
@@ -8,7 +8,11 @@
 =

 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.jboss.cache.*;
+import org.jboss.cache.CacheException;
+import org.jboss.cache.CacheSPI;
+import org.jboss.cache.Fqn;
+import org.jboss.cache.InvocationContext;
+import org.jboss.cache.NodeSPI;
 import org.jboss.cache.buddyreplication.BuddyManager;
 import org.jboss.cache.buddyreplication.GravitateResult;
 import org.jboss.cache.config.Configuration;
@@ -64,7 +68,7 @@
    protected boolean skipMethodCall(InvocationContext ctx)
    {
       return MethodDeclarations.isBlockUnblockMethod(ctx.getMethodCall().g=
etMethodId()) ||
-         ctx.getOptionOverrides().isSkipDataGravitation();
+            ctx.getOptionOverrides().isSkipDataGravitation();
    }
 =

    protected Object handleGetChildrenNamesMethod(InvocationContext ctx, Fq=
n fqn) throws Throwable
@@ -104,7 +108,8 @@
          Object returnValue =3D nextInterceptor(ctx);
          doPrepare(ctx.getGlobalTransaction(), ctx);
          return returnValue;
-      } catch (Throwable throwable)
+      }
+      catch (Throwable throwable)
       {
          transactionMods.remove(ctx.getGlobalTransaction());
          throw throwable;
@@ -123,7 +128,8 @@
       {
          transactionMods.remove(ctx.getGlobalTransaction());
          return nextInterceptor(ctx);
-      } catch (Throwable throwable)
+      }
+      catch (Throwable throwable)
       {
          transactionMods.remove(ctx.getGlobalTransaction());
          throw throwable;
@@ -137,7 +143,8 @@
          doCommit(ctx.getGlobalTransaction(), ctx);
          transactionMods.remove(ctx.getGlobalTransaction());
          return nextInterceptor(ctx);
-      } catch (Throwable throwable)
+      }
+      catch (Throwable throwable)
       {
          transactionMods.remove(ctx.getGlobalTransaction());
          throw throwable;
@@ -153,7 +160,8 @@
          if (BuddyManager.isBackupFqn(fqn))
          {
             log.info("Is call for a backup Fqn, not performing any gravita=
tion.  Direct calls on internal backup nodes are *not* supported.");
-         } else
+         }
+         else
          {
             if (cache.peek(fqn, false) =3D=3D null)
             {
@@ -183,12 +191,14 @@
                   // Clean up the other nodes
                   cleanBackupData(data, ctx.getGlobalTransaction(), ctx);
                }
-            } else
+            }
+            else
             {
                log.trace("No need to gravitate; have this already.");
             }
          }
-      } else
+      }
+      else
       {
          if (log.isTraceEnabled())
          {
@@ -314,7 +324,7 @@
       //           backupDataCleanup =3D MethodCallFactory.create(MethodDe=
clarations.evictNodeMethodLocal, new Object[]{backup.backupFqn});
       //       }
 =

-      MethodCall cleanup =3D MethodCallFactory.create(MethodDeclarations.d=
ataGravitationCleanupMethod, gtx, backup.primaryFqn, backup.backupFqn);
+      MethodCall cleanup =3D MethodCallFactory.create(MethodDeclarations.d=
ataGravitationCleanupMethod, backup.primaryFqn, backup.backupFqn);
 =

 =

       if (log.isTraceEnabled()) log.trace("Performing cleanup on [" + back=
up.primaryFqn + "]");
@@ -327,7 +337,7 @@
          if (log.isTraceEnabled()) log.trace("Performing cleanup on [" + b=
ackup.backupFqn + "]");
          // remove backup Fqn
          //replicateCall(cache.getMembers(), backupDataCleanup, syncCommun=
ications);
-         replicateCall(cache.getMembers(), cleanup, syncCommunications, ct=
x.getOptionOverrides());
+         replicateCall(cache.getMembers(), cleanup, syncCommunications, ct=
x.getOptionOverrides(), false);
       }
       else
       {

Modified: core/trunk/src/main/java/org/jboss/cache/invocation/AbstractInvoc=
ationDelegate.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/java/org/jboss/cache/invocation/AbstractInvocationD=
elegate.java	2008-01-02 11:56:56 UTC (rev 4940)
+++ core/trunk/src/main/java/org/jboss/cache/invocation/AbstractInvocationD=
elegate.java	2008-01-02 16:01:52 UTC (rev 4941)
@@ -59,7 +59,9 @@
     */
    protected Object invoke(MethodCall call) throws CacheException
    {
-      return invoke(call, false);
+      assertIsConstructed();
+      InvocationContext ctx =3D invocationContextContainer.get();
+      return invoke(call, ctx.getOptionOverrides().isSkipCacheStatusCheck(=
), ctx);
    }
 =

    /**
@@ -71,12 +73,18 @@
     */
    protected Object invoke(MethodCall call, boolean skipCacheStatusCheck) =
throws CacheException
    {
-      // never create a new one directly; always let the container do this=
 if needed.
-      InvocationContext ctx =3D invocationContextContainer.get();
+      assertIsConstructed();
+      return invoke(call, skipCacheStatusCheck, invocationContextContainer=
.get());
+   }
 =

-      // BR methods should NOT block on the cache being started, since the=
 cache depends on these completing to start.
-      if (//!MethodDeclarations.isBuddyGroupOrganisationMethod(call.getMet=
hodId()) &&
-            !cache.getCacheStatus().allowInvocations() && !skipCacheStatus=
Check)
+   private void assertIsConstructed()
+   {
+      if (invocationContextContainer =3D=3D null) throw new IllegalStateEx=
ception("The cache has been destroyed!");
+   }
+
+   private Object invoke(MethodCall call, boolean skipCacheStatusCheck, In=
vocationContext ctx) throws CacheException
+   {
+      if (!cache.getCacheStatus().allowInvocations() && !skipCacheStatusCh=
eck)
       {
          // only throw an exception if this is a locally originating call =
- JBCACHE-1179
          if (originLocal)

Modified: core/trunk/src/main/java/org/jboss/cache/invocation/CacheInvocati=
onDelegate.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/java/org/jboss/cache/invocation/CacheInvocationDele=
gate.java	2008-01-02 11:56:56 UTC (rev 4940)
+++ core/trunk/src/main/java/org/jboss/cache/invocation/CacheInvocationDele=
gate.java	2008-01-02 16:01:52 UTC (rev 4941)
@@ -113,7 +113,8 @@
 =

    public List<Interceptor> getInterceptorChain()
    {
-      return Collections.unmodifiableList(InterceptorChainFactory.asList(i=
nterceptorChain));
+      List interceptors =3D InterceptorChainFactory.asList(interceptorChai=
n);
+      return interceptors =3D=3D null ? Collections.emptyList() : Collecti=
ons.unmodifiableList(interceptors);
    }
 =

    public void addInterceptor(Interceptor i, int position)

Modified: core/trunk/src/main/java/org/jboss/cache/invocation/RemoteCacheIn=
vocationDelegate.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/java/org/jboss/cache/invocation/RemoteCacheInvocati=
onDelegate.java	2008-01-02 11:56:56 UTC (rev 4940)
+++ core/trunk/src/main/java/org/jboss/cache/invocation/RemoteCacheInvocati=
onDelegate.java	2008-01-02 16:01:52 UTC (rev 4941)
@@ -2,15 +2,20 @@
 =

 import org.apache.commons.logging.LogFactory;
 import org.jboss.cache.Fqn;
+import org.jboss.cache.buddyreplication.BuddyGroup;
+import org.jboss.cache.buddyreplication.BuddyManager;
+import org.jboss.cache.buddyreplication.BuddyNotInitException;
+import org.jboss.cache.factories.annotations.Inject;
 import org.jboss.cache.marshall.MethodCall;
 import org.jboss.cache.marshall.MethodCallFactory;
 import org.jboss.cache.marshall.MethodDeclarations;
-import org.jboss.cache.transaction.GlobalTransaction;
+import org.jgroups.Address;
 =

 import java.lang.reflect.Method;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
+import java.util.Map;
 =

 /**
  * A sublcass of CacheInvocationDelegate, used by remote instances to invo=
ke methods on current cache.
@@ -20,50 +25,101 @@
  */
 public class RemoteCacheInvocationDelegate extends CacheInvocationDelegate
 {
+   private BuddyManager buddyManager;
+
    public RemoteCacheInvocationDelegate()
    {
       originLocal =3D false;
       log =3D LogFactory.getLog(RemoteCacheInvocationDelegate.class);
    }
 =

-   public Object _replicate(MethodCall methodCall) throws Throwable
+   @Inject
+   private void injectBuddyManager(BuddyManager buddyManager)
    {
-      if (methodCall.getMethodId() =3D=3D MethodDeclarations.clusteredGetM=
ethod_id)
-         return invokeClusteredGet(methodCall);
-      else if (methodCall.getMethodId() =3D=3D MethodDeclarations.dataGrav=
itationCleanupMethod_id)
+      this.buddyManager =3D buddyManager;
+   }
+
+   // ------------- start: buddy replication specific 'lifecycle' method c=
alls
+
+   public void assignToBuddyGroup(BuddyGroup group, Map<Fqn, byte[]> state=
) throws Exception
+   {
+      if (buddyManager !=3D null)
+         buddyManager.handleAssignToBuddyGroup(group, state);
+      else if (log.isWarnEnabled())
+         log.warn("Received assignToBuddyGroup call from group owner [" + =
group.getDataOwner() + "] but buddy replication is not enabled on this node=
!");
+   }
+
+   public void removeFromBuddyGroup(String groupName) throws BuddyNotInitE=
xception
+   {
+      if (buddyManager !=3D null)
+         buddyManager.handleRemoveFromBuddyGroup(groupName);
+      else if (log.isWarnEnabled())
+         log.warn("Received removeFromBuddyGroup call for group name [" + =
groupName + "] but buddy replication is not enabled on this node!");
+
+   }
+
+   public void announceBuddyPoolName(Address address, String buddyPoolName)
+   {
+      if (buddyManager !=3D null)
+         buddyManager.handlePoolNameBroadcast(address, buddyPoolName);
+      else if (log.isWarnEnabled())
+         log.warn("Received annouceBuddyPoolName call from [" + address + =
"] but buddy replication is not enabled on this node!");
+   }
+
+   public void dataGravitationCleanup(Fqn primary, Fqn backup) throws Exce=
ption
+   {
+//      MethodCall primaryDataCleanup, backupDataCleanup;
+      if (buddyManager.isDataGravitationRemoveOnFind())
       {
-         Object[] args =3D methodCall.getArgs();
-         cache._dataGravitationCleanup((GlobalTransaction) args[0], (Fqn) =
args[1], (Fqn) args[2]);
-         return null;
+         if (log.isTraceEnabled())
+            log.trace("DataGravitationCleanup: Removing primary (" + prima=
ry + ") and backup (" + backup + ")");
+         //primaryDataCleanup =3D MethodCallFactory.create(MethodDeclarati=
ons.removeNodeMethodLocal, primary, false);
+         getInvocationContext().getOptionOverrides().setCacheModeLocal(tru=
e);
+         removeNode(primary);
+         //backupDataCleanup =3D MethodCallFactory.create(MethodDeclaratio=
ns.removeNodeMethodLocal, backup, false);
+         getInvocationContext().getOptionOverrides().setCacheModeLocal(tru=
e);
+         removeNode(backup);
       }
-
       else
       {
-         try
+         if (log.isTraceEnabled())
+            log.trace("DataGravitationCleanup: Evicting primary (" + prima=
ry + ") and backup (" + backup + ")");
+         //primaryDataCleanup =3D MethodCallFactory.create(MethodDeclarati=
ons.evictNodeMethodLocal, primary);
+         evict(primary, true);
+         //backupDataCleanup =3D MethodCallFactory.create(MethodDeclaratio=
ns.evictNodeMethodLocal, backup);
+         evict(backup, true);
+      }
+   }
+
+   // ------------- end: buddy replication specific 'lifecycle' method cal=
ls
+
+
+   public Object _replicate(MethodCall methodCall) throws Throwable
+   {
+      try
+      {
+         Object retVal =3D invoke(methodCall);
+         // we only need to return values for a set of remote calls; not e=
very call.
+         if (MethodDeclarations.returnValueForRemoteCall(methodCall.getMet=
hodId()))
          {
-            Object retVal =3D invoke(methodCall);
-            // we only need to return values for a set of remote calls; no=
t every call.
-            if (MethodDeclarations.returnValueForRemoteCall(methodCall.get=
MethodId()))
-            {
-               return retVal;
-            }
-            else
-            {
-               return null;
-            }
+            return retVal;
          }
-         catch (Throwable ex)
+         else
          {
-            if (methodCall.getMethodId() !=3D MethodDeclarations.putForExt=
ernalReadMethodLocal_id
-                  || methodCall.getMethodId() !=3D MethodDeclarations.putF=
orExternalReadVersionedMethodLocal_id)
-            {
-               if (!MethodDeclarations.isBuddyGroupOrganisationMethod(meth=
odCall.getMethodId()) && log.isWarnEnabled())
-                  log.warn("replication failure with methodCall " + method=
Call + " exception", ex);
-               throw ex;
-            }
-            else return null;
+            return null;
          }
       }
+      catch (Throwable ex)
+      {
+         if (methodCall.getMethodId() !=3D MethodDeclarations.putForExtern=
alReadMethodLocal_id
+               || methodCall.getMethodId() !=3D MethodDeclarations.putForE=
xternalReadVersionedMethodLocal_id)
+         {
+            if (!MethodDeclarations.isBuddyGroupOrganisationMethod(methodC=
all.getMethodId()) && log.isWarnEnabled())
+               log.warn("replication failure with methodCall " + methodCal=
l + " exception", ex);
+            throw ex;
+         }
+         else return null;
+      }
    }
 =

    /**
@@ -74,12 +130,6 @@
       for (MethodCall methodCall : methodCalls) _replicate(methodCall);
    }
 =

-   public Object invokeClusteredGet(MethodCall call)
-   {
-      Object[] args =3D call.getArgs();
-      return clusteredGet((MethodCall) args[0], (Boolean) args[1]);
-   }
-
    public void block()
    {
       MethodCall m =3D MethodCallFactory.create(MethodDeclarations.blockCh=
annelLocal);

Modified: core/trunk/src/main/java/org/jboss/cache/jmx/CacheJmxWrapper.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/java/org/jboss/cache/jmx/CacheJmxWrapper.java	2008-=
01-02 11:56:56 UTC (rev 4940)
+++ core/trunk/src/main/java/org/jboss/cache/jmx/CacheJmxWrapper.java	2008-=
01-02 16:01:52 UTC (rev 4941)
@@ -676,11 +676,11 @@
       {
          cacheStatus =3D CacheStatus.DESTROYING;
 =

-         cache.destroy();
-
          // The cache is destroyed, so we shouldn't leave the interceptors
          // in JMX, even if we didn't register them in create
          unregisterInterceptors();
+
+         cache.destroy();
       }
       finally
       {
@@ -955,7 +955,7 @@
       {
          try
          {
-            log.debug("Unreqistering interceptors");
+            log.debug("Unregistering interceptors");
             JmxUtil.unregisterInterceptors(server, cache.getInterceptorCha=
in(), getCacheObjectName());
             interceptorsRegistered =3D false;
          }

Modified: core/trunk/src/main/java/org/jboss/cache/marshall/MethodDeclarati=
ons.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/java/org/jboss/cache/marshall/MethodDeclarations.ja=
va	2008-01-02 11:56:56 UTC (rev 4940)
+++ core/trunk/src/main/java/org/jboss/cache/marshall/MethodDeclarations.ja=
va	2008-01-02 16:01:52 UTC (rev 4941)
@@ -272,11 +272,11 @@
 =

          // ------------ buddy replication
 =

-         remoteAnnounceBuddyPoolNameMethod =3D CacheImpl.class.getDeclared=
Method("_remoteAnnounceBuddyPoolName", Address.class, String.class);
-         remoteRemoveFromBuddyGroupMethod =3D CacheImpl.class.getDeclaredM=
ethod("_remoteRemoveFromBuddyGroup", String.class);
-         remoteAssignToBuddyGroupMethod =3D CacheImpl.class.getDeclaredMet=
hod("_remoteAssignToBuddyGroup", BuddyGroup.class, Map.class);
+         remoteAnnounceBuddyPoolNameMethod =3D RemoteCacheInvocationDelega=
te.class.getDeclaredMethod("announceBuddyPoolName", Address.class, String.c=
lass);
+         remoteRemoveFromBuddyGroupMethod =3D RemoteCacheInvocationDelegat=
e.class.getDeclaredMethod("removeFromBuddyGroup", String.class);
+         remoteAssignToBuddyGroupMethod =3D RemoteCacheInvocationDelegate.=
class.getDeclaredMethod("assignToBuddyGroup", BuddyGroup.class, Map.class);
 =

-         dataGravitationCleanupMethod =3D CacheImpl.class.getDeclaredMetho=
d("_dataGravitationCleanup", GlobalTransaction.class, Fqn.class, Fqn.class);
+         dataGravitationCleanupMethod =3D RemoteCacheInvocationDelegate.cl=
ass.getDeclaredMethod("dataGravitationCleanup", Fqn.class, Fqn.class);
          dataGravitationMethod =3D CacheSPI.class.getDeclaredMethod("gravi=
tateData", Fqn.class, boolean.class);
 =

          // ------------ move() api

Modified: core/trunk/src/test/java/org/jboss/cache/jmx/InterceptorRegistrat=
ionTest.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/test/java/org/jboss/cache/jmx/InterceptorRegistrationTes=
t.java	2008-01-02 11:56:56 UTC (rev 4940)
+++ core/trunk/src/test/java/org/jboss/cache/jmx/InterceptorRegistrationTes=
t.java	2008-01-02 16:01:52 UTC (rev 4941)
@@ -22,23 +22,24 @@
 =

 package org.jboss.cache.jmx;
 =

+import org.jboss.cache.config.Configuration;
 import static org.testng.AssertJUnit.assertTrue;
+import org.testng.annotations.Test;
 =

-import org.jboss.cache.config.Configuration;
-
 /**
  * Tests the interceptor registration function of CacheJmxWrapper.
  *
  * @author <a href=3D"brian.stansberry(a)jboss.com">Brian Stansberry</a>
  * @version $Revision$
  */
+(a)Test(groups =3D "functional")
 public class InterceptorRegistrationTest extends CacheJmxWrapperTestBase
 {
 =

    /**
     * Confirms interceptor mbeans are registered if the following events
     * occur:
-    *
+    * <p/>
     * cache.start();
     * wrapper creation and registration.
     *
@@ -71,7 +72,7 @@
    /**
     * Confirms interceptor mbeans are registered if the following events
     * occur:
-    *
+    * <p/>
     * cache.start();
     * wrapper creation and and start
     * wrapper registration.
@@ -105,7 +106,7 @@
    /**
     * Confirms interceptor mbeans are registered if the following events
     * occur:
-    *
+    * <p/>
     * Cache not injected
     * wrapper registered;
     * wrapper created and started.
@@ -137,7 +138,7 @@
    /**
     * Confirms interceptor mbeans are registered if the following events
     * occur:
-    *
+    * <p/>
     * Cache not injected
     * wrapper created and started.
     * wrapper registered
@@ -172,7 +173,7 @@
    /**
     * Confirms interceptor mbeans are registered if the following events
     * occur:
-    *
+    * <p/>
     * cache constructed;
     * wrapper constructed and registered with manageCacheLifecycle=3Dtrue
     * wrapper created and started
@@ -205,7 +206,7 @@
    /**
     * Confirms interceptor mbeans are registered if the following events
     * occur:
-    *
+    * <p/>
     * cache constructed;
     * wrapper constructed and registered
     * wrapper created and started
@@ -236,7 +237,7 @@
    /**
     * Confirms interceptor mbeans are registered if the following events
     * occur:
-    *
+    * <p/>
     * cache constructed;
     * wrapper created and started
     * wrapper registered


--===============1481233640962937967==--

From jbosscache-commits at lists.jboss.org Wed Jan  2 11:53:35 2008
Content-Type: multipart/mixed; boundary="===============1721256098489961432=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r4942 - in core/trunk/src:
 test/java/org/jboss/cache/misc and 1 other directories.
Date: Wed, 02 Jan 2008 11:53:35 -0500
Message-ID: <E1JA6qV-0004Y4-FX@committer01.frg.pub.inap.atl.jboss.com>

--===============1721256098489961432==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: manik.surtani(a)jboss.com
Date: 2008-01-02 11:53:35 -0500 (Wed, 02 Jan 2008)
New Revision: 4942

Modified:
   core/trunk/src/main/java/org/jboss/cache/util/reflect/ClasspathScanner.j=
ava
   core/trunk/src/test/java/org/jboss/cache/misc/TestingUtil.java
   core/trunk/src/test/java/org/jboss/cache/util/reflect/ClasspathScannerTe=
st.java
Log:
More robust classpath scanning + a proper test

Modified: core/trunk/src/main/java/org/jboss/cache/util/reflect/ClasspathSc=
anner.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/java/org/jboss/cache/util/reflect/ClasspathScanner.=
java	2008-01-02 16:01:52 UTC (rev 4941)
+++ core/trunk/src/main/java/org/jboss/cache/util/reflect/ClasspathScanner.=
java	2008-01-02 16:53:35 UTC (rev 4942)
@@ -26,7 +26,7 @@
 public class ClasspathScanner
 {
    private Log log =3D LogFactory.getLog(ClasspathScanner.class);
-   private URLClassLoader classLoader;
+   URLClassLoader classLoader;
 =

    /**
     * Constructor with the type of annotation to scan for.
@@ -51,7 +51,7 @@
       try
       {
          // only scan the current ClassPath location that contains this fi=
le.  Could be a directory or a JAR file.
-         URL url =3D getURLPathFromClassLoader();
+         URL url =3D getURLPathFromClassLoader("org/jboss/cache/Version.cl=
ass");
          String urlPath =3D url.getFile();
          if (urlPath.endsWith("/"))
          {
@@ -81,12 +81,12 @@
       return classes;
    }
 =

-   private URL getURLPathFromClassLoader() throws MalformedURLException
+   URL getURLPathFromClassLoader(String resourceName) throws MalformedURLE=
xception
    {
-      URL u2 =3D classLoader.findResource("org/jboss/cache/Version.class");
+      URL u2 =3D classLoader.findResource(resourceName);
       String u2String =3D u2.toString();
 =

-      boolean isJar =3D u2String.startsWith("jar:") && u2String.contains("=
.jar!/");
+      boolean isJar =3D u2String.startsWith("jar:") && (u2String.toLowerCa=
se().contains(".jar!/") || u2String.toLowerCase().contains(".zip!/"));
 =

       for (URL u : classLoader.getURLs())
       {

Modified: core/trunk/src/test/java/org/jboss/cache/misc/TestingUtil.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/test/java/org/jboss/cache/misc/TestingUtil.java	2008-01-=
02 16:01:52 UTC (rev 4941)
+++ core/trunk/src/test/java/org/jboss/cache/misc/TestingUtil.java	2008-01-=
02 16:53:35 UTC (rev 4942)
@@ -387,6 +387,11 @@
    public static void recursiveFileRemove(String directoryName)
    {
       File file =3D new File(directoryName);
+      recursiveFileRemove(file);
+   }
+
+   public static void recursiveFileRemove(File file)
+   {
       if (file.exists())
       {
          System.out.println("Deleting file " + file);

Modified: core/trunk/src/test/java/org/jboss/cache/util/reflect/ClasspathSc=
annerTest.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/test/java/org/jboss/cache/util/reflect/ClasspathScannerT=
est.java	2008-01-02 16:01:52 UTC (rev 4941)
+++ core/trunk/src/test/java/org/jboss/cache/util/reflect/ClasspathScannerT=
est.java	2008-01-02 16:53:35 UTC (rev 4942)
@@ -4,9 +4,22 @@
 import org.jboss.cache.factories.EmptyConstructorFactory;
 import org.jboss.cache.factories.TransactionManagerFactory;
 import org.jboss.cache.factories.annotations.DefaultFactoryFor;
+import org.jboss.cache.misc.TestingUtil;
+import org.testng.annotations.AfterMethod;
+import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 =

+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.net.URL;
+import java.net.URLClassLoader;
 import java.util.Set;
+import java.util.jar.JarOutputStream;
+import java.util.zip.ZipEntry;
 =

 /**
  * @author Manik Surtani (<a href=3D"mailto:manik(a)jboss.org">manik(a)jbo=
ss.org</a>)
@@ -15,6 +28,35 @@
 @Test(groups =3D {"functional"})
 public class ClasspathScannerTest
 {
+   String tmpDir;
+   File classpathDirectory;
+   File archive;
+   String resourceName =3D "test.resource";
+
+   @BeforeMethod
+   public void setUp() throws Exception
+   {
+      // create a test directory and add this to my class path:
+      tmpDir =3D System.getProperty("java.io.tmpdir", "/tmp");
+      String tmpClasspath =3D tmpDir + File.separator + "tempClasspath";
+      classpathDirectory =3D new File(tmpClasspath);
+      classpathDirectory.mkdirs();
+      File tempResourceFile =3D new File(tmpClasspath + File.separator + r=
esourceName);
+
+      PrintWriter writer =3D new PrintWriter(new FileWriter(tempResourceFi=
le));
+      writer.write("Blah");
+      writer.close();
+
+      assert tempResourceFile.exists();
+   }
+
+   @AfterMethod
+   public void tearDown()
+   {
+      TestingUtil.recursiveFileRemove(classpathDirectory);
+      if (archive !=3D null) TestingUtil.recursiveFileRemove(archive);
+   }
+
    public void testScanning()
    {
       ClasspathScanner cs =3D new ClasspathScanner();
@@ -24,4 +66,53 @@
       assert sc.contains(TransactionManagerFactory.class);
       assert sc.contains(EmptyConstructorFactory.class);
    }
+
+   public void testScanningClassDirectory() throws IOException
+   {
+      ClasspathScanner cs =3D new ClasspathScanner();
+      cs.classLoader =3D new URLClassLoader(new URL[]{classpathDirectory.t=
oURL()}, getClass().getClassLoader());
+
+      URL u =3D cs.getURLPathFromClassLoader(resourceName);
+
+      assert u.equals(classpathDirectory.toURL());
+   }
+
+   public void testScanningJar() throws IOException
+   {
+      // create a JAR archive
+      archive =3D new File(tmpDir + File.separator + "lib" + File.separato=
r + "archive.jar");
+      testScanningArchive();
+   }
+
+   public void testScanningZip() throws IOException
+   {
+      // create a ZIP archive
+      archive =3D new File(tmpDir + File.separator + "lib" + File.separato=
r + "archive.zip");
+      testScanningArchive();
+   }
+
+   private void testScanningArchive() throws IOException
+   {
+      archive.getParentFile().mkdirs();
+      FileOutputStream fos =3D new FileOutputStream(archive);
+      JarOutputStream jos =3D new JarOutputStream(fos);
+      FileInputStream fis =3D new FileInputStream(classpathDirectory + Fil=
e.separator + resourceName);
+      ZipEntry ze =3D new ZipEntry(resourceName);
+      jos.putNextEntry(ze);
+
+      byte b;
+      while ((b =3D (byte) fis.read()) !=3D -1) jos.write(b);
+
+      fis.close();
+      jos.closeEntry();
+      jos.close();
+      fos.close();
+
+      ClasspathScanner cs =3D new ClasspathScanner();
+      cs.classLoader =3D new URLClassLoader(new URL[]{archive.toURL()}, ge=
tClass().getClassLoader());
+
+      URL u =3D cs.getURLPathFromClassLoader(resourceName);
+
+      assert u.equals(archive.toURL());
+   }
 }


--===============1721256098489961432==--

From jbosscache-commits at lists.jboss.org Wed Jan  2 12:41:26 2008
Content-Type: multipart/mixed; boundary="===============7604583625621774366=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r4943 - in core/trunk/src:
 main/java/org/jboss/cache/loader and 3 other directories.
Date: Wed, 02 Jan 2008 12:41:26 -0500
Message-ID: <E1JA7ao-0005m3-FV@committer01.frg.pub.inap.atl.jboss.com>

--===============7604583625621774366==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: manik.surtani(a)jboss.com
Date: 2008-01-02 12:41:26 -0500 (Wed, 02 Jan 2008)
New Revision: 4943

Modified:
   core/trunk/src/main/java/org/jboss/cache/CacheImpl.java
   core/trunk/src/main/java/org/jboss/cache/loader/AbstractCacheLoader.java
   core/trunk/src/main/java/org/jboss/cache/lock/IdentityLock.java
   core/trunk/src/main/java/org/jboss/cache/lock/NodeLock.java
   core/trunk/src/main/java/org/jboss/cache/statetransfer/DefaultStateTrans=
ferGenerator.java
   core/trunk/src/main/java/org/jboss/cache/statetransfer/StateTransferMana=
ger.java
   core/trunk/src/test/java/org/jboss/cache/buddyreplication/BuddyGroupAssi=
gnmentTest.java
   core/trunk/src/test/java/org/jboss/cache/buddyreplication/BuddyReplicati=
onContentTest.java
Log:
more efficient locking with state transfer + population of internal fqns se=
t on cache construction

Modified: core/trunk/src/main/java/org/jboss/cache/CacheImpl.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/java/org/jboss/cache/CacheImpl.java	2008-01-02 16:5=
3:35 UTC (rev 4942)
+++ core/trunk/src/main/java/org/jboss/cache/CacheImpl.java	2008-01-02 17:4=
1:26 UTC (rev 4943)
@@ -45,7 +45,6 @@
 import org.jboss.cache.transaction.TransactionTable;
 import org.jboss.cache.util.CachePrinter;
 import org.jboss.cache.util.ThreadGate;
-import org.jboss.cache.util.concurrent.ConcurrentHashSet;
 import org.jboss.cache.util.reflect.ReflectionUtil;
 import org.jgroups.*;
 import org.jgroups.blocks.GroupRequest;
@@ -134,7 +133,7 @@
     * Set<Fqn> of Fqns of the topmost node of internal regions that should
     * not included in standard state transfers.
     */
-   private Set<Fqn> internalFqns =3D new ConcurrentHashSet<Fqn>();
+   private Set<Fqn> internalFqns =3D new HashSet<Fqn>();
 =

    /**
     * Marshaller if register to handle marshalling
@@ -200,6 +199,8 @@
       this.configuration =3D configuration;
       this.componentRegistry =3D new ComponentRegistry(configuration);
       this.cacheStatus =3D CacheStatus.INSTANTIATED;
+
+      internalFqns.add(BuddyManager.BUDDY_BACKUP_SUBTREE_FQN);
    }
 =

    protected ComponentRegistry getComponentRegistry()

Modified: core/trunk/src/main/java/org/jboss/cache/loader/AbstractCacheLoad=
er.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/java/org/jboss/cache/loader/AbstractCacheLoader.jav=
a	2008-01-02 16:53:35 UTC (rev 4942)
+++ core/trunk/src/main/java/org/jboss/cache/loader/AbstractCacheLoader.jav=
a	2008-01-02 17:41:26 UTC (rev 4943)
@@ -219,8 +219,7 @@
       {
          child_name =3D (String) children_name;
          tmp_fqn =3D new Fqn(fqn, child_name);
-         //loadStateHelper(tmp_fqn, out);
-         getNodeDataList(tmp_fqn, list);
+         if (!cache.getInternalFqns().contains(tmp_fqn)) getNodeDataList(t=
mp_fqn, list);
       }
    }
 =


Modified: core/trunk/src/main/java/org/jboss/cache/lock/IdentityLock.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/java/org/jboss/cache/lock/IdentityLock.java	2008-01=
-02 16:53:35 UTC (rev 4942)
+++ core/trunk/src/main/java/org/jboss/cache/lock/IdentityLock.java	2008-01=
-02 17:41:26 UTC (rev 4943)
@@ -532,9 +532,15 @@
    public Set<NodeLock> acquireAll(Object caller, long timeout, LockType l=
ock_type)
          throws LockingException, TimeoutException, InterruptedException
    {
+      return acquireAll(caller, timeout, lock_type, false);
+   }
+
+   public Set<NodeLock> acquireAll(Object caller, long timeout, LockType l=
ock_type, boolean excludeInternalFqns)
+         throws LockingException, TimeoutException, InterruptedException
+   {
       boolean acquired;
 =

-      if (lock_type =3D=3D LockType.NONE)
+      if (lock_type =3D=3D LockType.NONE || (excludeInternalFqns && node.g=
etCache().getInternalFqns().contains(getFqn())))
       {
          return Collections.emptySet();
       }
@@ -548,7 +554,7 @@
 =

       for (NodeSPI n : node.getChildrenDirect())
       {
-         retval.addAll(n.getLock().acquireAll(caller, timeout, lock_type));
+         retval.addAll(n.getLock().acquireAll(caller, timeout, lock_type, =
excludeInternalFqns));
       }
       return retval;
    }

Modified: core/trunk/src/main/java/org/jboss/cache/lock/NodeLock.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/java/org/jboss/cache/lock/NodeLock.java	2008-01-02 =
16:53:35 UTC (rev 4942)
+++ core/trunk/src/main/java/org/jboss/cache/lock/NodeLock.java	2008-01-02 =
17:41:26 UTC (rev 4943)
@@ -98,19 +98,29 @@
          InterruptedException;
 =

    /**
-    * Recursively acquire locks for this node and all subnodes.
+    * Recursively acquire locks for this node and all subnodes, including =
internal Fqns such as buddy backup subtrees.
     *
     * @param caller    lock owner
     * @param timeout   time to wait
     * @param lock_type type of lock
     * @return locks acquired
-    * @throws LockingException
-    * @throws TimeoutException
-    * @throws InterruptedException
     */
    Set<NodeLock> acquireAll(Object caller, long timeout, NodeLock.LockType=
 lock_type) throws LockingException, TimeoutException,
          InterruptedException;
 =

+   /**
+    * Same as the overloaded {@link #acquire(Object, long, org.jboss.cache=
.lock.NodeLock.LockType)} except that you can
+    * optionally specify that internal Fqns - such as buddy backup subtree=
s - can be excluded when acquiring locks.
+    *
+    * @param caller              lock owner
+    * @param timeout             time to wait
+    * @param lock_type           type of lock
+    * @param excludeInternalFqns if true, locks on internal fqns are not a=
cquired.
+    * @return locks acquired
+    */
+   Set<NodeLock> acquireAll(Object caller, long timeout, LockType lock_typ=
e, boolean excludeInternalFqns) throws LockingException, TimeoutException,
+         InterruptedException;
+
    void printLockInfo(StringBuffer sb, int indent);
 =

 }
\ No newline at end of file

Modified: core/trunk/src/main/java/org/jboss/cache/statetransfer/DefaultSta=
teTransferGenerator.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/java/org/jboss/cache/statetransfer/DefaultStateTran=
sferGenerator.java	2008-01-02 16:53:35 UTC (rev 4942)
+++ core/trunk/src/main/java/org/jboss/cache/statetransfer/DefaultStateTran=
sferGenerator.java	2008-01-02 17:41:26 UTC (rev 4943)
@@ -165,11 +165,7 @@
       list.add(nd);
 =

       // then visit the children
-      for (NodeSPI child : node.getChildrenDirect())
-      {
-         //marshallTransientState(child, out);
-         generateNodeDataList(child, list);
-      }
+      for (NodeSPI child : node.getChildrenDirect()) generateNodeDataList(=
child, list);
    }
 =

    /**

Modified: core/trunk/src/main/java/org/jboss/cache/statetransfer/StateTrans=
ferManager.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/java/org/jboss/cache/statetransfer/StateTransferMan=
ager.java	2008-01-02 16:53:35 UTC (rev 4942)
+++ core/trunk/src/main/java/org/jboss/cache/statetransfer/StateTransferMan=
ager.java	2008-01-02 17:41:26 UTC (rev 4943)
@@ -241,7 +241,7 @@
       {
          if (lockChildren)
          {
-            root.getLock().acquireAll(lockOwner, timeout, NodeLock.LockTyp=
e.READ);
+            root.getLock().acquireAll(lockOwner, timeout, NodeLock.LockTyp=
e.READ, true);
          }
          else
          {

Modified: core/trunk/src/test/java/org/jboss/cache/buddyreplication/BuddyGr=
oupAssignmentTest.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/test/java/org/jboss/cache/buddyreplication/BuddyGroupAss=
ignmentTest.java	2008-01-02 16:53:35 UTC (rev 4942)
+++ core/trunk/src/test/java/org/jboss/cache/buddyreplication/BuddyGroupAss=
ignmentTest.java	2008-01-02 17:41:26 UTC (rev 4943)
@@ -11,6 +11,7 @@
 import org.jboss.cache.Cache;
 import org.jboss.cache.CacheSPI;
 import org.jboss.cache.misc.TestingUtil;
+import org.jboss.cache.util.CachePrinter;
 import org.testng.annotations.Test;
 =

 /**
@@ -39,6 +40,10 @@
       assertIsBuddy(caches.get(1), caches.get(2), true);
       System.out.println("*** Testing cache 2:");
       assertIsBuddy(caches.get(2), caches.get(0), true);
+
+      System.out.println("Cache 0 =3D " + CachePrinter.printCacheLockingIn=
fo(caches.get(0)));
+      System.out.println("Cache 1 =3D " + CachePrinter.printCacheLockingIn=
fo(caches.get(1)));
+      System.out.println("Cache 2 =3D " + CachePrinter.printCacheLockingIn=
fo(caches.get(2)));
    }
 =

    public void test2Buddies() throws Exception

Modified: core/trunk/src/test/java/org/jboss/cache/buddyreplication/BuddyRe=
plicationContentTest.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/test/java/org/jboss/cache/buddyreplication/BuddyReplicat=
ionContentTest.java	2008-01-02 16:53:35 UTC (rev 4942)
+++ core/trunk/src/test/java/org/jboss/cache/buddyreplication/BuddyReplicat=
ionContentTest.java	2008-01-02 17:41:26 UTC (rev 4943)
@@ -71,6 +71,10 @@
       assertNull("Should be null", caches.get(2).get(backupFqn, key));
 =

       assertNoStaleLocks(caches);
+
+      System.out.println("Cache 0 =3D " + CachePrinter.printCacheLockingIn=
fo(caches.get(0)));
+      System.out.println("Cache 1 =3D " + CachePrinter.printCacheLockingIn=
fo(caches.get(1)));
+      System.out.println("Cache 2 =3D " + CachePrinter.printCacheLockingIn=
fo(caches.get(2)));
    }
 =

    public void testPutAndRemove() throws Exception


--===============7604583625621774366==--

From jbosscache-commits at lists.jboss.org Wed Jan  2 14:08:11 2008
Content-Type: multipart/mixed; boundary="===============1549831037565509694=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r4944 - support/trunk/common.
Date: Wed, 02 Jan 2008 14:08:11 -0500
Message-ID: <E1JA8wl-0005aH-66@committer01.frg.pub.inap.atl.jboss.com>

--===============1549831037565509694==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: manik.surtani(a)jboss.com
Date: 2008-01-02 14:08:11 -0500 (Wed, 02 Jan 2008)
New Revision: 4944

Modified:
   support/trunk/common/pom.xml
Log:
Added main class

Modified: support/trunk/common/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- support/trunk/common/pom.xml	2008-01-02 17:41:26 UTC (rev 4943)
+++ support/trunk/common/pom.xml	2008-01-02 19:08:11 UTC (rev 4944)
@@ -128,6 +128,7 @@
                         <manifest>
                             <addDefaultSpecificationEntries>true</addDefau=
ltSpecificationEntries>
                             <addDefaultImplementationEntries>true</addDefa=
ultImplementationEntries>
+							<mainClass>org.jboss.cache.Version</mainClass>
                         </manifest>
                     </archive>
                 </configuration>


--===============1549831037565509694==--

From jbosscache-commits at lists.jboss.org Wed Jan  2 14:32:15 2008
Content-Type: multipart/mixed; boundary="===============1774166884178424716=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r4945 - in
 core/trunk/src/test/java/org/jboss/cache: buddyreplication and 1 other
 directory.
Date: Wed, 02 Jan 2008 14:32:14 -0500
Message-ID: <E1JA9K2-0001vI-Os@committer01.frg.pub.inap.atl.jboss.com>

--===============1774166884178424716==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: manik.surtani(a)jboss.com
Date: 2008-01-02 14:32:14 -0500 (Wed, 02 Jan 2008)
New Revision: 4945

Added:
   core/trunk/src/test/java/org/jboss/cache/buddyreplication/DisabledStateT=
ransferTest.java
Modified:
   core/trunk/src/test/java/org/jboss/cache/api/pfer/PutForExternalReadTest=
Base.java
   core/trunk/src/test/java/org/jboss/cache/buddyreplication/BuddyReplicati=
onTestsBase.java
Log:
Updated existing tests, added new test to ensure correct classpath scanning

Modified: core/trunk/src/test/java/org/jboss/cache/api/pfer/PutForExternalR=
eadTestBase.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/test/java/org/jboss/cache/api/pfer/PutForExternalReadTes=
tBase.java	2008-01-02 19:08:11 UTC (rev 4944)
+++ core/trunk/src/test/java/org/jboss/cache/api/pfer/PutForExternalReadTes=
tBase.java	2008-01-02 19:32:14 UTC (rev 4945)
@@ -14,6 +14,7 @@
 import org.jboss.cache.config.Configuration.CacheMode;
 import org.jboss.cache.factories.UnitTestCacheConfigurationFactory;
 import org.jboss.cache.lock.NodeLock;
+import org.jboss.cache.marshall.MethodCall;
 import org.jboss.cache.misc.TestingUtil;
 import org.jboss.cache.optimistic.TransactionWorkspace;
 import org.jboss.cache.transaction.GlobalTransaction;
@@ -27,7 +28,6 @@
 import javax.transaction.SystemException;
 import javax.transaction.Transaction;
 import javax.transaction.TransactionManager;
-import java.lang.reflect.Method;
 import java.util.List;
 =

 @Test(groups =3D {"functional", "jgroups", "transaction"})
@@ -179,7 +179,7 @@
          // specify what we expect called on the mock Rpc Manager.  For pa=
rams we don't care about, just use ANYTHING.
          // setting the mock object to expect the "sync" param to be false.
          expect(rpcManager.getReplicationQueue()).andReturn(null);
-         expect(rpcManager.callRemoteMethods(anyAddresses(), (Method) anyO=
bject(), (Object[]) anyObject(), eq(false), anyBoolean(), anyInt())).andRet=
urn(null);
+         expect(rpcManager.callRemoteMethods(anyAddresses(), (MethodCall) =
anyObject(), eq(false), anyBoolean(), anyInt())).andReturn(null);
       }
 =

       replay(rpcManager);
@@ -237,7 +237,8 @@
    {
       RPCManager barfingRpcManager =3D new RPCManagerImpl()
       {
-         public List callRemoteMethods(List<Address> recipients, Method me=
thod, Object[] arguments, boolean synchronous, boolean excludeSelf, long ti=
meout)
+         @Override
+         public List callRemoteMethods(List<Address> recipients, MethodCal=
l method, boolean synchronous, boolean excludeSelf, int timeout)
          {
             throw new RuntimeException("Barf");
          }

Modified: core/trunk/src/test/java/org/jboss/cache/buddyreplication/BuddyRe=
plicationTestsBase.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/test/java/org/jboss/cache/buddyreplication/BuddyReplicat=
ionTestsBase.java	2008-01-02 19:08:11 UTC (rev 4944)
+++ core/trunk/src/test/java/org/jboss/cache/buddyreplication/BuddyReplicat=
ionTestsBase.java	2008-01-02 19:32:14 UTC (rev 4945)
@@ -259,13 +259,21 @@
 =

    protected List<CacheSPI<Object, Object>> createCaches(int numBuddies, i=
nt numCaches, boolean useBuddyPool, boolean useDataGravitation, boolean opt=
imisticLocks) throws Exception
    {
+      return createCaches(numBuddies, numCaches, useBuddyPool, useDataGrav=
itation, optimisticLocks, true);
+   }
+
+   protected List<CacheSPI<Object, Object>> createCaches(int numBuddies, i=
nt numCaches, boolean useBuddyPool, boolean useDataGravitation, boolean opt=
imisticLocks, boolean start) throws Exception
+   {
       List<CacheSPI<Object, Object>> caches =3D new ArrayList<CacheSPI<Obj=
ect, Object>>(numCaches);
       for (int i =3D 0; i < numCaches; i++)
-         caches.add(createCache(optimisticLocks, numBuddies, useBuddyPool =
? Character.toString((char) ('A' + i)) : null, useDataGravitation, true));
+         caches.add(createCache(optimisticLocks, numBuddies, useBuddyPool =
? Character.toString((char) ('A' + i)) : null, useDataGravitation, start));
 =

-      // allow some time for the caches to start up and discover each other
-      TestingUtil.blockUntilViewsReceived(caches.toArray(new Cache[0]), VI=
EW_BLOCK_TIMEOUT);
-      TestingUtil.sleepThread(getSleepTimeout());
+      if (start)
+      {
+         // allow some time for the caches to start up and discover each o=
ther
+         TestingUtil.blockUntilViewsReceived(caches.toArray(new Cache[0]),=
 VIEW_BLOCK_TIMEOUT);
+         TestingUtil.sleepThread(getSleepTimeout());
+      }
 =

       return caches;
    }

Added: core/trunk/src/test/java/org/jboss/cache/buddyreplication/DisabledSt=
ateTransferTest.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/test/java/org/jboss/cache/buddyreplication/DisabledState=
TransferTest.java	                        (rev 0)
+++ core/trunk/src/test/java/org/jboss/cache/buddyreplication/DisabledState=
TransferTest.java	2008-01-02 19:32:14 UTC (rev 4945)
@@ -0,0 +1,67 @@
+package org.jboss.cache.buddyreplication;
+
+import org.jboss.cache.CacheSPI;
+import org.jboss.cache.Fqn;
+import org.jboss.cache.misc.TestingUtil;
+import org.jboss.cache.util.CachePrinter;
+import org.testng.annotations.Test;
+
+/**
+ * This is to test JBCACHE-1229
+ *
+ * @author Manik Surtani (<a href=3D"mailto:manik(a)jboss.org">manik(a)jbo=
ss.org</a>)
+ * @since 2.1.0
+ */
+(a)Test(groups =3D "functional")
+public class DisabledStateTransferTest extends BuddyReplicationTestsBase
+{
+   public void testCachesWithoutStateTransfer() throws Exception
+   {
+      caches =3D createCaches(1, 3, false, false, false, false);
+
+      int cacheNumber =3D 0;
+      for (CacheSPI c : caches)
+      {
+         c.getConfiguration().setFetchInMemoryState(false);
+         c.start();
+         c.put("/" + cacheNumber++, "k", "v");
+      }
+
+      TestingUtil.blockUntilViewsReceived(caches.toArray(new CacheSPI[0]),=
 60000);
+
+      for (CacheSPI c : caches)
+         System.out.println("Cache (local address " + c.getLocalAddress() =
+ ") contents: " + CachePrinter.printCacheLockingInfo(c));
+
+      for (int i =3D 0; i < 3; i++)
+      {
+         int backupIndex =3D i =3D=3D 2 ? 0 : i + 1;
+
+         assert caches.get(i).exists("/" + i) : "Data should exist on owne=
r (cache #" + i + ")";
+         Fqn backup =3D BuddyManager.getBackupFqn(caches.get(i).getLocalAd=
dress(), Fqn.fromString("/" + i));
+
+         assert caches.get(backupIndex).exists(backup.getParent()) : "Back=
up region should have been created on buddy (cache #" + backupIndex + ")";
+         boolean backupStatePropagated =3D caches.get(backupIndex).exists(=
backup);
+         boolean backupOlderThanOwner =3D backupIndex < i;
+         assert (!backupStatePropagated && !backupOlderThanOwner) || (back=
upStatePropagated && backupOlderThanOwner) : "Backup state should NOT have =
been transferred to buddy (cache #" + backupIndex + ")";
+      }
+
+      // now NEW state should transfer just fine.
+
+      cacheNumber =3D 0;
+      for (CacheSPI c : caches)
+      {
+         c.put("/" + (cacheNumber++) + "_NEW", "k", "v");
+      }
+
+      for (int i =3D 0; i < 3; i++)
+      {
+         int backupIndex =3D i =3D=3D 2 ? 0 : i + 1;
+
+         assert caches.get(i).exists("/" + i + "_NEW") : "Data should exis=
t on owner (cache #" + i + ")";
+         Fqn backup =3D BuddyManager.getBackupFqn(caches.get(i).getLocalAd=
dress(), Fqn.fromString("/" + i + "_NEW"));
+
+         assert caches.get(backupIndex).exists(backup.getParent()) : "Back=
up region should have been created on buddy (cache #" + backupIndex + ")";
+         assert caches.get(backupIndex).exists(backup) : "Backup state sho=
uld NOT have been transferred to buddy (cache #" + backupIndex + ")";
+      }
+   }
+}


--===============1774166884178424716==--

From jbosscache-commits at lists.jboss.org Wed Jan  2 14:32:45 2008
Content-Type: multipart/mixed; boundary="===============1819170488108356580=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r4946 - in
 core/trunk/src/main/java/org/jboss/cache: buddyreplication and 4 other
 directories.
Date: Wed, 02 Jan 2008 14:32:44 -0500
Message-ID: <E1JA9KW-0001w2-V1@committer01.frg.pub.inap.atl.jboss.com>

--===============1819170488108356580==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: manik.surtani(a)jboss.com
Date: 2008-01-02 14:32:44 -0500 (Wed, 02 Jan 2008)
New Revision: 4946

Modified:
   core/trunk/src/main/java/org/jboss/cache/InvocationContext.java
   core/trunk/src/main/java/org/jboss/cache/buddyreplication/BuddyManager.j=
ava
   core/trunk/src/main/java/org/jboss/cache/interceptors/BaseTransactionalC=
ontextInterceptor.java
   core/trunk/src/main/java/org/jboss/cache/interceptors/TxInterceptor.java
   core/trunk/src/main/java/org/jboss/cache/invocation/CacheInvocationDeleg=
ate.java
   core/trunk/src/main/java/org/jboss/cache/statetransfer/DefaultStateTrans=
ferIntegrator.java
   core/trunk/src/main/java/org/jboss/cache/util/reflect/ClasspathScanner.j=
ava
Log:
Updated state transfer and BR codebases

Modified: core/trunk/src/main/java/org/jboss/cache/InvocationContext.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/java/org/jboss/cache/InvocationContext.java	2008-01=
-02 19:32:14 UTC (rev 4945)
+++ core/trunk/src/main/java/org/jboss/cache/InvocationContext.java	2008-01=
-02 19:32:44 UTC (rev 4946)
@@ -88,6 +88,11 @@
       return optionOverrides;
    }
 =

+   public boolean isOptionsUninitialised()
+   {
+      return optionOverrides =3D=3D null;
+   }
+
    /**
     * Sets the option overrides associated with this invocation
     *
@@ -122,13 +127,13 @@
    public String toString()
    {
       return "InvocationContext{" +
-              "methodCall=3D" + methodCall +
-              "transaction=3D" + transaction +
-              ", globalTransaction=3D" + globalTransaction +
-              ", optionOverrides=3D" + optionOverrides +
-              ", originLocal=3D" + originLocal +
-              ", txHasMods=3D" + txHasMods +
-              '}';
+            "methodCall=3D" + methodCall +
+            "transaction=3D" + transaction +
+            ", globalTransaction=3D" + globalTransaction +
+            ", optionOverrides=3D" + optionOverrides +
+            ", originLocal=3D" + originLocal +
+            ", txHasMods=3D" + txHasMods +
+            '}';
    }
 =

    public boolean isTxHasMods()
@@ -255,10 +260,11 @@
     * If the acq timeout if overwritten for current call, then return that=
 one.
     * If not overwritten return default value.
     */
-   public long getContextLockAcquisitionTimeout(long defaultFalue) {
+   public long getContextLockAcquisitionTimeout(long defaultFalue)
+   {
       long timeout =3D defaultFalue;
       if (getOptionOverrides() !=3D null
-              && getOptionOverrides().getLockAcquisitionTimeout() >=3D 0)
+            && getOptionOverrides().getLockAcquisitionTimeout() >=3D 0)
       {
          timeout =3D getOptionOverrides().getLockAcquisitionTimeout();
       }

Modified: core/trunk/src/main/java/org/jboss/cache/buddyreplication/BuddyMa=
nager.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/java/org/jboss/cache/buddyreplication/BuddyManager.=
java	2008-01-02 19:32:14 UTC (rev 4945)
+++ core/trunk/src/main/java/org/jboss/cache/buddyreplication/BuddyManager.=
java	2008-01-02 19:32:44 UTC (rev 4946)
@@ -11,12 +11,14 @@
 import org.jboss.cache.CacheException;
 import org.jboss.cache.CacheSPI;
 import org.jboss.cache.Fqn;
+import org.jboss.cache.Node;
 import org.jboss.cache.RPCManager;
 import org.jboss.cache.Region;
 import org.jboss.cache.RegionManager;
 import org.jboss.cache.config.BuddyReplicationConfig;
 import org.jboss.cache.config.BuddyReplicationConfig.BuddyLocatorConfig;
 import org.jboss.cache.config.Configuration;
+import org.jboss.cache.config.Option;
 import org.jboss.cache.factories.annotations.Inject;
 import org.jboss.cache.factories.annotations.Stop;
 import org.jboss.cache.lock.TimeoutException;
@@ -251,6 +253,8 @@
 =

       broadcastBuddyPoolMembership();
 =

+      if (!cache.exists(BUDDY_BACKUP_SUBTREE_FQN)) cache.getRoot().addChil=
dDirect(BUDDY_BACKUP_SUBTREE_FQN);
+
       // allow waiting threads to process.
       initialisationLatch.countDown();
 =

@@ -519,43 +523,60 @@
       Fqn integrationBase =3D new Fqn(BuddyManager.BUDDY_BACKUP_SUBTREE_FQ=
N,
             newGroup.getGroupName());
 =

-      for (Map.Entry<Fqn, byte[]> entry : state.entrySet())
+
+      if (state.isEmpty())
       {
-         Fqn fqn =3D entry.getKey();
-         if (!regionManager.isInactive(fqn))
+         if (configuredToFetchState())
+            log.info("Data owner has no state to set, even though buddy is=
 configured to accept state.  Assuming there is no data on the data owner."=
);
+         // create the backup region anyway
+         Option o =3D cache.getInvocationContext().getOptionOverrides();
+         o.setSkipCacheStatusCheck(true);
+         Node root =3D cache.getRoot();
+         o =3D cache.getInvocationContext().getOptionOverrides();
+         o.setCacheModeLocal(true);
+         o.setSkipCacheStatusCheck(true);
+         root.addChild(new Fqn<String>(BUDDY_BACKUP_SUBTREE, newGroup.getG=
roupName()));
+      }
+      else
+      {
+         for (Map.Entry<Fqn, byte[]> entry : state.entrySet())
          {
-            //ClassLoader cl =3D (marshaller =3D=3D null) ? null : marshal=
ler.getClassLoader(fqnS);
-            Fqn integrationRoot =3D new Fqn(integrationBase, fqn);
+            Fqn fqn =3D entry.getKey();
+            if (!regionManager.isInactive(fqn))
+            {
+               //ClassLoader cl =3D (marshaller =3D=3D null) ? null : mars=
haller.getClassLoader(fqnS);
+               Fqn integrationRoot =3D new Fqn(integrationBase, fqn);
 =

-            byte[] stateBuffer =3D entry.getValue();
-            MarshalledValueInputStream in =3D null;
-            try
-            {
-               ByteArrayInputStream bais =3D new ByteArrayInputStream(stat=
eBuffer);
-               in =3D new MarshalledValueInputStream(bais);
-               //stateMgr.setState(in, integrationRoot, cl);
-               stateTransferManager.setState(in, integrationRoot);
-            }
-            catch (Throwable t)
-            {
-               if (t instanceof CacheException)
+               byte[] stateBuffer =3D entry.getValue();
+               MarshalledValueInputStream in =3D null;
+               try
                {
-                  //excepected/common and can happen due to inactive regio=
ns and so on
-                  log.debug(t);
+                  ByteArrayInputStream bais =3D new ByteArrayInputStream(s=
tateBuffer);
+                  in =3D new MarshalledValueInputStream(bais);
+                  //stateMgr.setState(in, integrationRoot, cl);
+                  stateTransferManager.setState(in, integrationRoot);
                }
-               else
+               catch (Throwable t)
                {
-                  //something has gone wrong
-                  log.error("State for fqn " + fqn
-                        + " could not be transferred to a buddy at "
-                        + cache.getLocalAddress(), t);
+                  if (t instanceof CacheException)
+                  {
+                     //excepected/common and can happen due to inactive re=
gions and so on
+                     log.debug(t);
+                  }
+                  else
+                  {
+                     //something has gone wrong
+                     log.error("State for fqn " + fqn
+                           + " could not be transferred to a buddy at "
+                           + cache.getLocalAddress(), t);
+                  }
                }
-            }
-            finally
-            {
-               if (in !=3D null)
+               finally
                {
-                  in.close();
+                  if (in !=3D null)
+                  {
+                     in.close();
+                  }
                }
             }
          }
@@ -746,25 +767,36 @@
       // Create the state transfer map
 =

       Map<Fqn, byte[]> stateMap =3D new HashMap<Fqn, byte[]>();
-      byte[] state;
-      if (configuration.isUseRegionBasedMarshalling())
+      if (configuredToFetchState())
       {
-         Collection<Region> regions =3D regionManager.getAllRegions(Region=
.Type.MARSHALLING);
-         if (regions.size() > 0)
+         byte[] state;
+         if (configuration.isUseRegionBasedMarshalling())
          {
-            for (Region r : regions)
+            Collection<Region> regions =3D regionManager.getAllRegions(Reg=
ion.Type.MARSHALLING);
+            if (regions.size() > 0)
             {
-               Fqn f =3D r.getFqn();
-               state =3D acquireState(f);
+               for (Region r : regions)
+               {
+                  Fqn f =3D r.getFqn();
+                  state =3D acquireState(f);
+                  if (state !=3D null)
+                  {
+                     stateMap.put(f, state);
+                  }
+               }
+            }
+            else if (!configuration.isInactiveOnStartup())
+            {
+               // No regions defined; try the root
+               state =3D acquireState(Fqn.ROOT);
                if (state !=3D null)
                {
-                  stateMap.put(f, state);
+                  stateMap.put(Fqn.ROOT, state);
                }
             }
          }
-         else if (!configuration.isInactiveOnStartup())
+         else
          {
-            // No regions defined; try the root
             state =3D acquireState(Fqn.ROOT);
             if (state !=3D null)
             {
@@ -772,14 +804,6 @@
             }
          }
       }
-      else
-      {
-         state =3D acquireState(Fqn.ROOT);
-         if (state !=3D null)
-         {
-            stateMap.put(Fqn.ROOT, state);
-         }
-      }
 =

       // now broadcast a message to the newly assigned buddies.
       MethodCall membershipCall =3D MethodCallFactory.create(MethodDeclara=
tions.remoteAssignToBuddyGroupMethod, buddyGroup, stateMap);
@@ -827,6 +851,11 @@
       log.trace("addToGroup notification complete");
    }
 =

+   private boolean configuredToFetchState()
+   {
+      return configuration.isFetchInMemoryState() || (cache.getCacheLoader=
Manager() !=3D null && cache.getCacheLoaderManager().isFetchPersistentState=
());
+   }
+
    private byte[] acquireState(Fqn fqn) throws CacheException
    {
       // Call _getState with progressively longer timeouts until we

Modified: core/trunk/src/main/java/org/jboss/cache/interceptors/BaseTransac=
tionalContextInterceptor.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/java/org/jboss/cache/interceptors/BaseTransactional=
ContextInterceptor.java	2008-01-02 19:32:14 UTC (rev 4945)
+++ core/trunk/src/main/java/org/jboss/cache/interceptors/BaseTransactional=
ContextInterceptor.java	2008-01-02 19:32:44 UTC (rev 4946)
@@ -37,6 +37,7 @@
       {
          Option txScopeOption =3D new Option();
          txScopeOption.setCacheModeLocal(ctx.getOptionOverrides() !=3D nul=
l && ctx.getOptionOverrides().isCacheModeLocal());
+         txScopeOption.setSkipCacheStatusCheck(ctx.getOptionOverrides() !=
=3D null && ctx.getOptionOverrides().isSkipCacheStatusCheck());
          entry.setOption(txScopeOption);
       }
    }

Modified: core/trunk/src/main/java/org/jboss/cache/interceptors/TxIntercept=
or.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/java/org/jboss/cache/interceptors/TxInterceptor.jav=
a	2008-01-02 19:32:14 UTC (rev 4945)
+++ core/trunk/src/main/java/org/jboss/cache/interceptors/TxInterceptor.jav=
a	2008-01-02 19:32:44 UTC (rev 4946)
@@ -1170,8 +1170,6 @@
 =

       public void beforeCompletion()
       {
-         if (!cache.getCacheStatus().allowInvocations()) throw new Illegal=
StateException("Cache not in STARTED state!");
-
          if (log.isTraceEnabled()) log.trace("Running beforeCompletion on =
gtx " + gtx);
          entry =3D txTable.get(gtx);
          if (entry =3D=3D null)
@@ -1183,6 +1181,7 @@
 =

          modifications =3D entry.getModifications();
          ctx =3D cache.getInvocationContext();
+         if (ctx.isOptionsUninitialised() && entry.getOption() !=3D null) =
ctx.setOptionOverrides(entry.getOption());
          ctx.setOriginLocal(false);
       }
 =

@@ -1190,11 +1189,21 @@
       // it is supposed to be post commit not actually run the commit
       public void afterCompletion(int status)
       {
-         if (!cache.getCacheStatus().allowInvocations()) throw new Illegal=
StateException("Cache not in STARTED state!");
+         // could happen if a rollback is called and beforeCompletion() do=
esn't get called.
+         if (ctx =3D=3D null)
+         {
+            ctx =3D cache.getInvocationContext();
+         }
+
+         if (ctx.isOptionsUninitialised() && entry.getOption() !=3D null)
+         {
+            // use the options from the transaction entry instead
+            ctx.setOptionOverrides(entry.getOption());
+         }
+
          try
          {
-            // could happen if a rollback is called and beforeCompletion()=
 doesn't get called.
-            if (ctx =3D=3D null) ctx =3D cache.getInvocationContext();
+            assertCanContinue();
             setTransactionalContext(tx, gtx, ctx);
 =

             try
@@ -1249,6 +1258,12 @@
          }
       }
 =

+      private void assertCanContinue()
+      {
+         if (!cache.getCacheStatus().allowInvocations() && (ctx.getOptionO=
verrides() =3D=3D null || !ctx.getOptionOverrides().isSkipCacheStatusCheck(=
)))
+            throw new IllegalStateException("Cache not in STARTED state!");
+      }
+
       /**
        * Cleans out (nullifies) member variables held by the sync object f=
or easier gc.  Could be (falsely) seen as a mem
        * leak if the TM implementation hangs on to the synchronizations fo=
r an unnecessarily long time even after the tx

Modified: core/trunk/src/main/java/org/jboss/cache/invocation/CacheInvocati=
onDelegate.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/java/org/jboss/cache/invocation/CacheInvocationDele=
gate.java	2008-01-02 19:32:14 UTC (rev 4945)
+++ core/trunk/src/main/java/org/jboss/cache/invocation/CacheInvocationDele=
gate.java	2008-01-02 19:32:44 UTC (rev 4946)
@@ -481,6 +481,7 @@
       if (peek(fqn, false, false) =3D=3D null)
       {
          getInvocationContext().getOptionOverrides().setFailSilently(true);
+         getInvocationContext().getOptionOverrides().setForceAsynchronous(=
true);
          //GlobalTransaction tx =3D cache.getCurrentTransaction();
          MethodCall m =3D MethodCallFactory.create(MethodDeclarations.putF=
orExternalReadMethodLocal, null, fqn, key, value);
          invoke(m);

Modified: core/trunk/src/main/java/org/jboss/cache/statetransfer/DefaultSta=
teTransferIntegrator.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/java/org/jboss/cache/statetransfer/DefaultStateTran=
sferIntegrator.java	2008-01-02 19:32:14 UTC (rev 4945)
+++ core/trunk/src/main/java/org/jboss/cache/statetransfer/DefaultStateTran=
sferIntegrator.java	2008-01-02 19:32:44 UTC (rev 4946)
@@ -381,6 +381,7 @@
    private Node getInternalNode(Node parent, Fqn internalFqn)
    {
       Object name =3D internalFqn.get(parent.getFqn().size());
+      cache.getInvocationContext().getOptionOverrides().setSkipCacheStatus=
Check(true);
       Node result =3D parent.getChild(new Fqn(name));
       if (result !=3D null)
       {

Modified: core/trunk/src/main/java/org/jboss/cache/util/reflect/ClasspathSc=
anner.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/java/org/jboss/cache/util/reflect/ClasspathScanner.=
java	2008-01-02 19:32:14 UTC (rev 4945)
+++ core/trunk/src/main/java/org/jboss/cache/util/reflect/ClasspathScanner.=
java	2008-01-02 19:32:44 UTC (rev 4946)
@@ -51,7 +51,7 @@
       try
       {
          // only scan the current ClassPath location that contains this fi=
le.  Could be a directory or a JAR file.
-         URL url =3D getURLPathFromClassLoader("org/jboss/cache/Version.cl=
ass");
+         URL url =3D getURLPathFromClassLoader("org/jboss/cache/Cache.clas=
s");
          String urlPath =3D url.getFile();
          if (urlPath.endsWith("/"))
          {


--===============1819170488108356580==--

From jbosscache-commits at lists.jboss.org Wed Jan  2 14:37:27 2008
Content-Type: multipart/mixed; boundary="===============8277282679425619739=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r4947 -
 core/trunk/src/test/java/org/jboss/cache/eviction.
Date: Wed, 02 Jan 2008 14:37:27 -0500
Message-ID: <E1JA9P5-0002py-Nt@committer01.frg.pub.inap.atl.jboss.com>

--===============8277282679425619739==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: manik.surtani(a)jboss.com
Date: 2008-01-02 14:37:27 -0500 (Wed, 02 Jan 2008)
New Revision: 4947

Modified:
   core/trunk/src/test/java/org/jboss/cache/eviction/RegionManagerTest.java
Log:
Updated test

Modified: core/trunk/src/test/java/org/jboss/cache/eviction/RegionManagerTe=
st.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/test/java/org/jboss/cache/eviction/RegionManagerTest.jav=
a	2008-01-02 19:32:44 UTC (rev 4946)
+++ core/trunk/src/test/java/org/jboss/cache/eviction/RegionManagerTest.jav=
a	2008-01-02 19:37:27 UTC (rev 4947)
@@ -1,13 +1,5 @@
 package org.jboss.cache.eviction;
 =

-import static org.testng.AssertJUnit.assertEquals;
-import static org.testng.AssertJUnit.assertNotNull;
-import static org.testng.AssertJUnit.assertNotSame;
-import static org.testng.AssertJUnit.assertTrue;
-import static org.testng.AssertJUnit.fail;
-
-import java.util.List;
-
 import org.jboss.cache.Fqn;
 import org.jboss.cache.Region;
 import org.jboss.cache.RegionManager;
@@ -16,9 +8,13 @@
 import org.jboss.cache.config.EvictionRegionConfig;
 import org.jboss.cache.factories.XmlConfigurationParser;
 import org.jboss.cache.xml.XmlHelper;
+import static org.testng.AssertJUnit.*;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 import org.w3c.dom.Element;
+
+import java.util.List;
+
 /**
  * Region Manager unit tests.
  *
@@ -26,7 +22,7 @@
  * @author Daniel Huang (dhuang(a)jboss.org)
  * @version $Revision$
  */
-(a)Test(groups =3D {"functional"})
+(a)Test(groups =3D "functional")
 public class RegionManagerTest
 {
    private final Fqn DEFAULT_REGION =3D Fqn.ROOT;
@@ -97,12 +93,10 @@
          regionManager.getRegion(Fqn.fromString("/a"), Region.Type.EVICTIO=
N, false);
          fail("If we don't setCache the default region, we should throw a =
RTE!");
       }
-      catch (Exception e)
+      catch (Exception expected)
       {
          // This is ok. Should throw an runtime exception
       }
-
-      assert regionManager.getRegion(Fqn.fromString("/a"), false) =3D=3D n=
ull : "Should not throw an exception if we dont specify a region type!";
    }
 =

    public void testGetRegion()
@@ -121,9 +115,9 @@
    {
       // test the new style configuration
       String xml =3D "<region name=3D\"/test/\" policyClass=3D\"org.jboss.=
cache.eviction.LFUPolicy\">" +
-              "<attribute name=3D\"minNodes\">10</attribute>" +
-              "<attribute name=3D\"maxNodes\">20</attribute>" +
-              "</region>";
+            "<attribute name=3D\"minNodes\">10</attribute>" +
+            "<attribute name=3D\"maxNodes\">20</attribute>" +
+            "</region>";
       Element element =3D XmlHelper.stringToElement(xml);
       RegionManager regionManager =3D new RegionManager();
       regionManager.setUsingEvictions(true);
@@ -140,9 +134,9 @@
 =

       // test the 1.2.x style configuration
       xml =3D "<region name=3D\"abc\">" +
-              "<attribute name=3D\"minNodes\">10</attribute>" +
-              "<attribute name=3D\"maxNodes\">20</attribute>" +
-              "</region>";
+            "<attribute name=3D\"minNodes\">10</attribute>" +
+            "<attribute name=3D\"maxNodes\">20</attribute>" +
+            "</region>";
       element =3D XmlHelper.stringToElement(xml);
       erc =3D XmlConfigurationParser.parseEvictionRegionConfig(element, "o=
rg.jboss.cache.eviction.LFUPolicy", EvictionConfig.EVENT_QUEUE_SIZE_DEFAULT=
);
       regionManager =3D new RegionManager();


--===============8277282679425619739==--

From jbosscache-commits at lists.jboss.org Wed Jan  2 18:09:39 2008
Content-Type: multipart/mixed; boundary="===============5417868296289399039=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r4948 -
 core/trunk/src/main/java/org/jboss/cache/interceptors.
Date: Wed, 02 Jan 2008 18:09:39 -0500
Message-ID: <E1JACiR-0001TT-0O@committer01.frg.pub.inap.atl.jboss.com>

--===============5417868296289399039==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: manik.surtani(a)jboss.com
Date: 2008-01-02 18:09:38 -0500 (Wed, 02 Jan 2008)
New Revision: 4948

Modified:
   core/trunk/src/main/java/org/jboss/cache/interceptors/TxInterceptor.java
Log:
Added null check

Modified: core/trunk/src/main/java/org/jboss/cache/interceptors/TxIntercept=
or.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/java/org/jboss/cache/interceptors/TxInterceptor.jav=
a	2008-01-02 19:37:27 UTC (rev 4947)
+++ core/trunk/src/main/java/org/jboss/cache/interceptors/TxInterceptor.jav=
a	2008-01-02 23:09:38 UTC (rev 4948)
@@ -1195,7 +1195,9 @@
             ctx =3D cache.getInvocationContext();
          }
 =

-         if (ctx.isOptionsUninitialised() && entry.getOption() !=3D null)
+         entry =3D txTable.get(gtx);
+
+         if (ctx.isOptionsUninitialised() && entry !=3D null && entry.getO=
ption() !=3D null)
          {
             // use the options from the transaction entry instead
             ctx.setOptionOverrides(entry.getOption());
@@ -1218,7 +1220,7 @@
 =

             if (log.isTraceEnabled()) log.trace("calling aftercompletion f=
or " + gtx);
             // set any transaction wide options as current for this thread.
-            if ((entry =3D txTable.get(gtx)) !=3D null)
+            if (entry !=3D null)
             {
                modifications =3D entry.getModifications();
                ctx.setOptionOverrides(entry.getOption());


--===============5417868296289399039==--

From jbosscache-commits at lists.jboss.org Wed Jan  2 19:17:12 2008
Content-Type: multipart/mixed; boundary="===============0782933210117651453=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r4949 -
 core/trunk/src/main/java/org/jboss/cache/invocation.
Date: Wed, 02 Jan 2008 19:17:12 -0500
Message-ID: <E1JADlo-0006Rl-II@committer01.frg.pub.inap.atl.jboss.com>

--===============0782933210117651453==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: manik.surtani(a)jboss.com
Date: 2008-01-02 19:17:12 -0500 (Wed, 02 Jan 2008)
New Revision: 4949

Modified:
   core/trunk/src/main/java/org/jboss/cache/invocation/CacheInvocationDeleg=
ate.java
Log:
JBCACHE-1241 - removing root should not attempt to clear internal Fqns.

Modified: core/trunk/src/main/java/org/jboss/cache/invocation/CacheInvocati=
onDelegate.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/java/org/jboss/cache/invocation/CacheInvocationDele=
gate.java	2008-01-02 23:09:38 UTC (rev 4948)
+++ core/trunk/src/main/java/org/jboss/cache/invocation/CacheInvocationDele=
gate.java	2008-01-03 00:17:12 UTC (rev 4949)
@@ -418,10 +418,14 @@
          // we need to preserve options
          InvocationContext ctx =3D getInvocationContext();
          Option o =3D ctx.getOptionOverrides();
+         Set<Fqn> internalFqns =3D getInternalFqns();
          for (Object childName : peek(fqn, false, false).getChildrenNames(=
))
          {
-            ctx.setOptionOverrides(o);
-            result =3D removeNode(new Fqn<Object>((Fqn<Object>) fqn, child=
Name)) && result;
+            if (!internalFqns.contains(new Fqn(childName)))
+            {
+               ctx.setOptionOverrides(o);
+               result =3D removeNode(new Fqn<Object>((Fqn<Object>) fqn, ch=
ildName)) && result;
+            }
          }
 =

          return result;


--===============0782933210117651453==--

From jbosscache-commits at lists.jboss.org Wed Jan  2 19:31:31 2008
Content-Type: multipart/mixed; boundary="===============2891691362096588410=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r4950 - in core/branches/1.4.X:
 tests/functional/org/jboss/cache/buddyreplication and 1 other directory.
Date: Wed, 02 Jan 2008 19:31:31 -0500
Message-ID: <E1JADzf-0000ob-2E@committer01.frg.pub.inap.atl.jboss.com>

--===============2891691362096588410==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: manik.surtani(a)jboss.com
Date: 2008-01-02 19:31:30 -0500 (Wed, 02 Jan 2008)
New Revision: 4950

Added:
   core/branches/1.4.X/tests/functional/org/jboss/cache/buddyreplication/Re=
moveRootBuddyTest.java
Modified:
   core/branches/1.4.X/src/org/jboss/cache/TreeCache.java
Log:
Added test and fix for JBCACHE-1241 - do not remove internal fqns when remo=
ving root.

Modified: core/branches/1.4.X/src/org/jboss/cache/TreeCache.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/branches/1.4.X/src/org/jboss/cache/TreeCache.java	2008-01-03 00:17=
:12 UTC (rev 4949)
+++ core/branches/1.4.X/src/org/jboss/cache/TreeCache.java	2008-01-03 00:31=
:30 UTC (rev 4950)
@@ -3886,7 +3886,8 @@
          {
             for (Iterator i =3D children.iterator(); i.hasNext();)
             {
-               remove(new Fqn(fqn, i.next()), o);
+               Fqn childFqn =3D new Fqn(fqn, i.next());
+               if (!internalFqns.contains(childFqn)) remove(childFqn, o);
             }
          }
       }
@@ -3917,7 +3918,8 @@
          {
             for (Iterator i =3D children.iterator(); i.hasNext();)
             {
-               evict(new Fqn(fqn, i.next()));
+               Fqn childFqn =3D new Fqn(fqn, i.next());
+               if (!internalFqns.contains(childFqn)) evict(childFqn);
             }
          }
       }

Added: core/branches/1.4.X/tests/functional/org/jboss/cache/buddyreplicatio=
n/RemoveRootBuddyTest.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/branches/1.4.X/tests/functional/org/jboss/cache/buddyreplication/R=
emoveRootBuddyTest.java	                        (rev 0)
+++ core/branches/1.4.X/tests/functional/org/jboss/cache/buddyreplication/R=
emoveRootBuddyTest.java	2008-01-03 00:31:30 UTC (rev 4950)
@@ -0,0 +1,44 @@
+package org.jboss.cache.buddyreplication;
+
+import org.jboss.cache.Fqn;
+import org.jboss.cache.TreeCache;
+import org.jboss.cache.misc.TestingUtil;
+
+import java.util.ArrayList;
+
+/**
+ * Test added to replicate a found issue - JBCACHE-1241
+ *
+ * @author Mircea.Markus(a)jboss.com
+ */
+public class RemoveRootBuddyTest extends BuddyReplicationTestsBase
+{
+   TreeCache cache1, cache2;
+
+   protected void setUp() throws Exception
+   {
+      cache1 =3D createCache(false, 1, "myBuddyPoolReplicationGroup", fals=
e, true, true);
+      cache2 =3D createCache(false, 1, "myBuddyPoolReplicationGroup", fals=
e, true, true);
+
+      TestingUtil.blockUntilViewsReceived(new TreeCache[]{cache1, cache2},=
 60000);
+   }
+
+   protected void tearDown()
+   {
+      cache1.stop();
+      cache2.stop();
+   }
+
+   public void testRemoveRootNode() throws Exception
+   {
+      int opCount =3D 10;
+      for (int i =3D 0; i < opCount; i++)
+      {
+         String key =3D String.valueOf(opCount);
+         String value =3D String.valueOf(opCount);
+         Fqn f =3D Fqn.fromString("/test" + key);
+         cache1.put(f, key, value);
+      }
+      cache1.remove(Fqn.ROOT);
+   }
+}


--===============2891691362096588410==--

From jbosscache-commits at lists.jboss.org Wed Jan  2 19:57:23 2008
Content-Type: multipart/mixed; boundary="===============8669000907808399074=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r4951 -
 core/trunk/src/test/java/org/jboss/cache/interceptors.
Date: Wed, 02 Jan 2008 19:57:22 -0500
Message-ID: <E1JAEOg-0005bO-RJ@committer01.frg.pub.inap.atl.jboss.com>

--===============8669000907808399074==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: manik.surtani(a)jboss.com
Date: 2008-01-02 19:57:22 -0500 (Wed, 02 Jan 2008)
New Revision: 4951

Modified:
   core/trunk/src/test/java/org/jboss/cache/interceptors/EvictionIntercepto=
rTest.java
Log:
Fixed test

Modified: core/trunk/src/test/java/org/jboss/cache/interceptors/EvictionInt=
erceptorTest.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/test/java/org/jboss/cache/interceptors/EvictionIntercept=
orTest.java	2008-01-03 00:31:30 UTC (rev 4950)
+++ core/trunk/src/test/java/org/jboss/cache/interceptors/EvictionIntercept=
orTest.java	2008-01-03 00:57:22 UTC (rev 4951)
@@ -11,6 +11,7 @@
 import org.jboss.cache.Fqn;
 import org.jboss.cache.InvocationContext;
 import org.jboss.cache.Node;
+import org.jboss.cache.NodeSPI;
 import org.jboss.cache.Region;
 import org.jboss.cache.RegionManager;
 import org.jboss.cache.config.EvictionConfig;
@@ -83,9 +84,9 @@
    }
 =

    @SuppressWarnings("unchecked")
-   private Node<Object, Object> cast(Node node)
+   private NodeSPI<Object, Object> cast(Node node)
    {
-      return node;
+      return (NodeSPI<Object, Object>) node;
    }
 =

    public void testVisitNode() throws Throwable
@@ -98,17 +99,15 @@
       Region regionABC =3D regionManager.getRegion(fqn1, false);
       assertNull(regionABC.takeLastEventNode());
 =

-      cache.put(fqn1, "key", "value");
-      assertEquals("value", cache.get(fqn1, "key"));
-      Node<Object, Object> node =3D cast(cache.getNode(fqn1));
+      putQuietly(fqn1, "key", "value");
+      NodeSPI<Object, Object> node =3D cast(cache.peek(Fqn.fromString(fqn1=
), false, false));
       assertNotNull(node);
-      assertEquals("value", node.get("key"));
+      assertEquals("value", node.getDirect("key"));
 =

-      cache.put(fqn3, "key", "value");
-      assertEquals("value", cache.get(fqn3, "key"));
-      node =3D cast(cache.getNode(fqn3));
+      putQuietly(fqn3, "key", "value");
+      node =3D cast(cache.peek(Fqn.fromString(fqn3), false, false));
       assertNotNull(node);
-      assertEquals("value", node.get("key"));
+      assertEquals("value", node.getDirect("key"));
 =

 =

       mc =3D MethodCallFactory.create(MethodDeclarations.getNodeMethodLoca=
l,
@@ -162,6 +161,39 @@
 =

    }
 =

+   /**
+    * Helper to quietly add something into the cache without generating ev=
iction events
+    *
+    * @param fqn   fqn to add
+    * @param key   key
+    * @param value value
+    */
+   private void putQuietly(String fqn, Object key, Object value)
+   {
+      putQuietly(Fqn.fromString(fqn), key, value);
+   }
+
+   /**
+    * Helper to quietly add something into the cache without generating ev=
iction events
+    *
+    * @param fqn   fqn to add
+    * @param key   key
+    * @param value value
+    */
+   private void putQuietly(Fqn fqn, Object key, Object value)
+   {
+      NodeSPI root =3D cache.getRoot();
+      NodeSPI child =3D root;
+      for (int i =3D 0; i < fqn.size(); i++)
+      {
+         child =3D child.addChildDirect(new Fqn(fqn.get(i)));
+      }
+
+      assert child.getFqn().equals(fqn);
+
+      child.putDirect(key, value);
+   }
+
    public void testVisitElement() throws Throwable
    {
       // make sure a get/visit on an empty node and empty element results =
in no cache events being added to event queue
@@ -173,8 +205,9 @@
       Region region =3D regionManager.getRegion(fqn.toString(), false);
       assertNull(region.takeLastEventNode());
 =

-      // add the node but try to get on a null element should result in no=
 cache events being added to MarshRegion.
-      cache.put(fqn, "wrongkey", "");
+      // add the node but try to get on a null element should result in no=
 cache events being added to Region.
+      putQuietly(fqn, "wrongkey", "");
+
       mc =3D MethodCallFactory.create(MethodDeclarations.getKeyValueMethod=
Local, fqn, key, false);
       interceptor.invoke(InvocationContext.fromMethodCall(mc));
       assertNull(region.takeLastEventNode());
@@ -189,7 +222,8 @@
 =

       assertNull(region.takeLastEventNode());
 =

-      cache.put(fqn4, key, "value");
+      putQuietly(fqn4, key, "value");
+
       // test on element granularity configured node.
       fqn =3D Fqn.fromString(fqn4);
       mc =3D MethodCallFactory.create(MethodDeclarations.getKeyValueMethod=
Local, fqn, key, false);
@@ -204,26 +238,28 @@
       assertNull(region.takeLastEventNode());
 =

       fqn =3D Fqn.fromString("/d/e/g");
-      for (int i =3D 0; i < 1000; i++)
+      for (int i =3D 0; i < 100; i++)
       {
          key =3D i;
 =

-         cache.put("/d/e/g", key, "");
+         putQuietly("/d/e/g", key, "");
 =

          mc =3D MethodCallFactory.create(MethodDeclarations.getKeyValueMet=
hodLocal, fqn, key, true);
          interceptor.invoke(InvocationContext.fromMethodCall(mc));
       }
 =

       region =3D regionManager.getRegion(fqn.toString(), false);
-      for (int i =3D 0; i < 1000; i++)
+
+      for (int i =3D 0; i < 100; i++)
       {
          event =3D region.takeLastEventNode();
          assertEquals(fqn, event.getFqn());
          assertEquals(NodeEventType.VISIT_NODE_EVENT, event.getEventType()=
);
       }
 =

-      cache.put("/a/b/c", key, "");
+      putQuietly("/a/b/c", key, "");
       fqn =3D Fqn.fromString("/a/b/c");
+
       mc =3D MethodCallFactory.create(MethodDeclarations.getKeyValueMethod=
Local, fqn, key, false);
       interceptor.invoke(InvocationContext.fromMethodCall(mc));
 =

@@ -234,17 +270,17 @@
       assertEquals(NodeEventType.VISIT_NODE_EVENT, event.getEventType());
       assertEquals(fqn, event.getFqn());
 =

-      for (int i =3D 0; i < 1000; i++)
+      for (int i =3D 0; i < 100; i++)
       {
          key =3D i;
 =

-         cache.put(fqn, key, "");
+         putQuietly(fqn, key, "");
 =

          mc =3D MethodCallFactory.create(MethodDeclarations.getKeyValueMet=
hodLocal, fqn, key, true);
          interceptor.invoke(InvocationContext.fromMethodCall(mc));
       }
 =

-      for (int i =3D 0; i < 1000; i++)
+      for (int i =3D 0; i < 100; i++)
       {
          event =3D region.takeLastEventNode();
          assertEquals(NodeEventType.VISIT_NODE_EVENT, event.getEventType()=
);
@@ -252,20 +288,6 @@
       }
 =

       assertNull(region.takeLastEventNode());
-
-      // What exactly are we trying to test here?!?  =

-      // check null handling
-//      mc =3D MethodCallFactory.create(MethodDeclarations.getKeyValueMeth=
odLocal, fqn, key, true);
-//      interceptor.invoke(InvocationContext.fromMethodCall(mc));
-//      assertNull(region.takeLastEventNode());
-//
-//      mc =3D MethodCallFactory.create(MethodDeclarations.getKeyValueMeth=
odLocal, fqn, null, true);
-//      interceptor.invoke(InvocationContext.fromMethodCall(mc));
-//      assertNull(region.takeLastEventNode());
-//
-//      mc =3D MethodCallFactory.create(MethodDeclarations.getKeyValueMeth=
odLocal, fqn, null, true);
-//      interceptor.invoke(InvocationContext.fromMethodCall(mc));
-//      assertNull(region.takeLastEventNode());
    }
 =

    public void testCreateNode() throws Throwable
@@ -289,13 +311,13 @@
       assertEquals(fqn, event.getFqn());
       assertEquals(100, event.getElementDifference());
 =

-      Node<Object, Object> node =3D cast(cache.getNode(fqn));
+      NodeSPI<Object, Object> node =3D cast(cache.peek(fqn, false, false));
       assertNotNull(node);
 =

       for (int i =3D 0; i < 100; i++)
       {
-         assertTrue(node.getData().containsKey(i));
-         assertEquals(i, node.get(i));
+         assertTrue(node.getDataDirect().containsKey(i));
+         assertEquals(i, node.getDirect(i));
       }
 =

       for (int i =3D 0; i < 100; i++)
@@ -304,7 +326,7 @@
                "value", false);
          interceptor.invoke(InvocationContext.fromMethodCall(mc));
 =

-         assertEquals("value", cache.get(fqn, i));
+         assertEquals("value", cache.peek(fqn, false, false).getDirect(i));
       }
 =

       for (int i =3D 0; i < 100; i++)
@@ -326,15 +348,15 @@
       assertEquals(fqn, event.getFqn());
       assertEquals(100, event.getElementDifference());
       assertNull(regionManager.getRegion(fqn.toString(), false).takeLastEv=
entNode());
-      node =3D cast(cache.getNode(fqn));
-      assertEquals(100, node.getData().size());
+      node =3D cast(cache.peek(fqn, false, false));
+      assertEquals(100, node.getDataDirect().size());
 =

       assertNotNull(node);
 =

       for (int i =3D 0; i < 100; i++)
       {
-         assertTrue(node.getData().containsKey(i));
-         assertEquals(i, node.get(i));
+         assertTrue(node.getDataDirect().containsKey(i));
+         assertEquals(i, node.getDirect(i));
       }
 =

       mc =3D MethodCallFactory.create(MethodDeclarations.putDataEraseMetho=
dLocal, null, fqn, data, false, true);
@@ -353,8 +375,8 @@
 =

       for (int i =3D 0; i < 100; i++)
       {
-         assertTrue(node.getData().containsKey(i));
-         assertEquals(i, node.get(i));
+         assertTrue(node.getDataDirect().containsKey(i));
+         assertEquals(i, node.getDirect(i));
       }
 =

    }
@@ -369,23 +391,23 @@
       MethodCall mc =3D MethodCallFactory.create(MethodDeclarations.putKey=
ValMethodLocal,
             null, fqn, key, value, false);
       interceptor.invoke(InvocationContext.fromMethodCall(mc));
-      assertEquals("value", cache.get(fqn, key));
+      assertEquals("value", cache.peek(fqn, false, false).getDirect(key));
       EvictedEventNode event =3D region.takeLastEventNode();
       assertEquals(NodeEventType.ADD_ELEMENT_EVENT, event.getEventType());
       assertEquals(1, event.getElementDifference());
       assertEquals(fqn, event.getFqn());
-      assertEquals("value", cache.get(fqn, key));
+      assertEquals("value", cache.peek(fqn, false, false).getDirect(key));
       assertNull(region.takeLastEventNode());
 =

       mc =3D MethodCallFactory.create(MethodDeclarations.putKeyValMethodLo=
cal,
             null, fqn, key, value, false);
       interceptor.invoke(InvocationContext.fromMethodCall(mc));
-      assertEquals("value", cache.get(fqn, key));
+      assertEquals("value", cache.peek(fqn, false, false).getDirect(key));
       event =3D region.takeLastEventNode();
       assertEquals(NodeEventType.ADD_ELEMENT_EVENT, event.getEventType());
       assertEquals(1, event.getElementDifference());
       assertEquals(fqn, event.getFqn());
-      assertEquals("value", cache.get(fqn, key));
+      assertEquals("value", cache.peek(fqn, false, false).getDirect(key));
       assertNull(region.takeLastEventNode());
 =

    }
@@ -393,13 +415,13 @@
    public void testRemoveNode() throws Throwable
    {
       Fqn fqn =3D Fqn.fromString("/a/b/c");
-      cache.put(fqn, "a", "b");
-      cache.put(fqn, "b", "c");
+      putQuietly(fqn, "a", "b");
+      putQuietly(fqn, "b", "c");
 =

       MethodCall mc =3D MethodCallFactory.create(MethodDeclarations.remove=
DataMethodLocal, null, fqn, false);
       interceptor.invoke(InvocationContext.fromMethodCall(mc));
 =

-      assertEquals(0, cache.getNode(fqn).getData().size());
+      assertEquals(0, cache.peek(fqn, false, false).getDataDirect().size()=
);
       Region region =3D regionManager.getRegion(fqn.toString(), false);
       EvictedEventNode event =3D region.takeLastEventNode();
       assertEquals(NodeEventType.REMOVE_NODE_EVENT, event.getEventType());
@@ -409,7 +431,7 @@
       mc =3D MethodCallFactory.create(MethodDeclarations.removeNodeMethodL=
ocal, null, fqn, false);
       interceptor.invoke(InvocationContext.fromMethodCall(mc));
 =

-      assertNull(cache.getNode(fqn));
+      assertNull(cache.peek(fqn, false, false));
       event =3D region.takeLastEventNode();
       assertEquals(NodeEventType.REMOVE_NODE_EVENT, event.getEventType());
       assertEquals(fqn, event.getFqn());
@@ -419,8 +441,8 @@
    public void testRemoveElement() throws Throwable
    {
       Fqn fqn =3D Fqn.fromString("/a/b/c");
-      cache.put(fqn, "a", "b");
-      cache.put(fqn, "b", "c");
+      putQuietly(fqn, "a", "b");
+      putQuietly(fqn, "b", "c");
 =

       MethodCall mc =3D MethodCallFactory.create(MethodDeclarations.remove=
KeyMethodLocal,
             null, fqn, "a", false);
@@ -496,12 +518,12 @@
       mc =3D MethodCallFactory.create(MethodDeclarations.putKeyValMethodLo=
cal,
             null, fqn, key, value, false);
       interceptor.invoke(InvocationContext.fromMethodCall(mc));
-      assertEquals("value", cache.get(fqn, key));
+      assertEquals("value", cache.peek(fqn, false, false).getDirect(key));
       event =3D region.takeLastEventNode();
       assertEquals(NodeEventType.ADD_ELEMENT_EVENT, event.getEventType());
       assertEquals(1, event.getElementDifference());
       assertEquals(fqn, event.getFqn());
-      assertEquals("value", cache.get(fqn, key));
+      assertEquals("value", cache.peek(fqn, false, false).getDirect(key));
       assertNull(region.takeLastEventNode());
 =

       mc =3D MethodCallFactory.create(MethodDeclarations.getKeyValueMethod=
Local, fqn, key, false);


--===============8669000907808399074==--

From jbosscache-commits at lists.jboss.org Wed Jan  2 20:58:38 2008
Content-Type: multipart/mixed; boundary="===============3009165155998885509=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r4952 - in core/trunk/src:
 test/java/org/jboss/cache and 2 other directories.
Date: Wed, 02 Jan 2008 20:58:38 -0500
Message-ID: <E1JAFLy-0000GM-OY@committer01.frg.pub.inap.atl.jboss.com>

--===============3009165155998885509==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: manik.surtani(a)jboss.com
Date: 2008-01-02 20:58:38 -0500 (Wed, 02 Jan 2008)
New Revision: 4952

Modified:
   core/trunk/src/main/java/org/jboss/cache/interceptors/CallInterceptor.ja=
va
   core/trunk/src/main/java/org/jboss/cache/interceptors/InvalidationInterc=
eptor.java
   core/trunk/src/main/java/org/jboss/cache/interceptors/MethodDispacherInt=
erceptor.java
   core/trunk/src/main/java/org/jboss/cache/interceptors/OptimisticNodeInte=
rceptor.java
   core/trunk/src/main/java/org/jboss/cache/interceptors/ReplicationInterce=
ptor.java
   core/trunk/src/main/java/org/jboss/cache/interceptors/TxInterceptor.java
   core/trunk/src/test/java/org/jboss/cache/LifeCycleTest.java
   core/trunk/src/test/java/org/jboss/cache/buddyreplication/BuddyReplicati=
onWithOptimisticLockingTest.java
   core/trunk/src/test/java/org/jboss/cache/buddyreplication/BuddyReplicati=
onWithTransactionsTest.java
   core/trunk/src/test/java/org/jboss/cache/eviction/EvictionConfigurationT=
est.java
Log:
Fixed tests

Modified: core/trunk/src/main/java/org/jboss/cache/interceptors/CallInterce=
ptor.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/java/org/jboss/cache/interceptors/CallInterceptor.j=
ava	2008-01-03 00:57:22 UTC (rev 4951)
+++ core/trunk/src/main/java/org/jboss/cache/interceptors/CallInterceptor.j=
ava	2008-01-03 01:58:38 UTC (rev 4952)
@@ -1,8 +1,10 @@
 package org.jboss.cache.interceptors;
 =

 import org.jboss.cache.CacheImpl;
+import org.jboss.cache.CacheSPI;
 import org.jboss.cache.InvocationContext;
 import org.jboss.cache.config.Option;
+import org.jboss.cache.factories.annotations.ComponentName;
 import org.jboss.cache.factories.annotations.Inject;
 import org.jboss.cache.marshall.MethodCall;
 import org.jboss.cache.marshall.MethodDeclarations;
@@ -24,11 +26,13 @@
 public class CallInterceptor extends Interceptor
 {
    private CacheImpl cacheImpl;
+   private CacheSPI remoteDelegate;
 =

    @Inject
-   private void injectDependencies(CacheImpl cacheImpl)
+   private void injectDependencies(CacheImpl cacheImpl, @ComponentName("re=
moteDelegate")CacheSPI remoteDelegate)
    {
       this.cacheImpl =3D cacheImpl;
+      this.remoteDelegate =3D remoteDelegate;
    }
 =

    public Object invoke(InvocationContext ctx) throws Throwable
@@ -41,7 +45,7 @@
          if (log.isTraceEnabled()) log.trace("Passing up method " + m + " =
so it gets invoked on cache.");
          try
          {
-            retval =3D m.invoke(cacheImpl);
+            retval =3D m.invoke(m.getMethodId() =3D=3D MethodDeclarations.=
dataGravitationCleanupMethod_id ? remoteDelegate : cacheImpl);
          }
          catch (Throwable t)
          {

Modified: core/trunk/src/main/java/org/jboss/cache/interceptors/Invalidatio=
nInterceptor.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/java/org/jboss/cache/interceptors/InvalidationInter=
ceptor.java	2008-01-03 00:57:22 UTC (rev 4951)
+++ core/trunk/src/main/java/org/jboss/cache/interceptors/InvalidationInter=
ceptor.java	2008-01-03 01:58:38 UTC (rev 4952)
@@ -131,7 +131,7 @@
       return handleCrudMethod(ctx, fqn, null);
    }
 =

-   protected Object handleDataGravitationCleanupMethod(InvocationContext c=
tx, GlobalTransaction globalTransaction, Fqn primary, Fqn backup) throws Th=
rowable
+   protected Object handleDataGravitationCleanupMethod(InvocationContext c=
tx, Fqn primary, Fqn backup) throws Throwable
    {
       return handleCrudMethod(ctx, primary, null);
    }

Modified: core/trunk/src/main/java/org/jboss/cache/interceptors/MethodDispa=
cherInterceptor.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/java/org/jboss/cache/interceptors/MethodDispacherIn=
terceptor.java	2008-01-03 00:57:22 UTC (rev 4951)
+++ core/trunk/src/main/java/org/jboss/cache/interceptors/MethodDispacherIn=
terceptor.java	2008-01-03 01:58:38 UTC (rev 4952)
@@ -152,7 +152,7 @@
             result =3D handlePutForExternalReadVersionedMethod(ctx, (Globa=
lTransaction) args[0], (Fqn) args[1], args[2], args[3], (DataVersion) args[=
5]);
             break;
          case MethodDeclarations.dataGravitationCleanupMethod_id:
-            result =3D handleDataGravitationCleanupMethod(ctx, (GlobalTran=
saction) args[0], (Fqn) args[1], (Fqn) args[2]);
+            result =3D handleDataGravitationCleanupMethod(ctx, (Fqn) args[=
0], (Fqn) args[1]);
             break;
          case MethodDeclarations.removeNodeVersionedMethodLocal_id:
             result =3D handleRemoveNodeVersionedMethod(ctx, (GlobalTransac=
tion) args[0], (Fqn) args[1], (Boolean) args[2], (DataVersion) args[3]);
@@ -227,9 +227,9 @@
    }
 =

    /**
-    * Handles {@link org.jboss.cache.CacheImpl#_dataGravitationCleanup(org=
.jboss.cache.transaction.GlobalTransaction, org.jboss.cache.Fqn, org.jboss.=
cache.Fqn)}
+    * Handles {@link org.jboss.cache.invocation.RemoteCacheInvocationDeleg=
ate#dataGravitationCleanup(org.jboss.cache.Fqn, org.jboss.cache.Fqn)}
     */
-   protected Object handleDataGravitationCleanupMethod(InvocationContext c=
tx, GlobalTransaction globalTransaction, Fqn primary, Fqn backup) throws Th=
rowable
+   protected Object handleDataGravitationCleanupMethod(InvocationContext c=
tx, Fqn primary, Fqn backup) throws Throwable
    {
       return defaultHandlersBehavior();
    }

Modified: core/trunk/src/main/java/org/jboss/cache/interceptors/OptimisticN=
odeInterceptor.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/java/org/jboss/cache/interceptors/OptimisticNodeInt=
erceptor.java	2008-01-03 00:57:22 UTC (rev 4951)
+++ core/trunk/src/main/java/org/jboss/cache/interceptors/OptimisticNodeInt=
erceptor.java	2008-01-03 01:58:38 UTC (rev 4952)
@@ -176,7 +176,7 @@
     */
    private Fqn getFqn(Object[] args, int methodId)
    {
-      return (Fqn) args[methodId =3D=3D MethodDeclarations.moveMethodLocal=
_id ? 0 : 1];
+      return (Fqn) args[methodId =3D=3D MethodDeclarations.moveMethodLocal=
_id || methodId =3D=3D MethodDeclarations.dataGravitationCleanupMethod_id ?=
 0 : 1];
    }
 =

    /**
@@ -187,7 +187,7 @@
     */
    private Fqn getBackupFqn(Object[] args)
    {
-      return (Fqn) args[2];
+      return (Fqn) args[1];
    }
 =

    /**

Modified: core/trunk/src/main/java/org/jboss/cache/interceptors/Replication=
Interceptor.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/java/org/jboss/cache/interceptors/ReplicationInterc=
eptor.java	2008-01-03 00:57:22 UTC (rev 4951)
+++ core/trunk/src/main/java/org/jboss/cache/interceptors/ReplicationInterc=
eptor.java	2008-01-03 01:58:38 UTC (rev 4952)
@@ -167,7 +167,7 @@
       return handleCrudMethod(ctx);
    }
 =

-   protected Object handleDataGravitationCleanupMethod(InvocationContext c=
tx, GlobalTransaction globalTransaction, Fqn primary, Fqn backup) throws Th=
rowable
+   protected Object handleDataGravitationCleanupMethod(InvocationContext c=
tx, Fqn primary, Fqn backup) throws Throwable
    {
       return handleCrudMethod(ctx);
    }

Modified: core/trunk/src/main/java/org/jboss/cache/interceptors/TxIntercept=
or.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/java/org/jboss/cache/interceptors/TxInterceptor.jav=
a	2008-01-03 00:57:22 UTC (rev 4951)
+++ core/trunk/src/main/java/org/jboss/cache/interceptors/TxInterceptor.jav=
a	2008-01-03 01:58:38 UTC (rev 4952)
@@ -162,7 +162,7 @@
       return handleNonTxMethod(ctx);
    }
 =

-   protected Object handleDataGravitationCleanupMethod(InvocationContext c=
tx, GlobalTransaction globalTransaction, Fqn primary, Fqn backup) throws Th=
rowable
+   protected Object handleDataGravitationCleanupMethod(InvocationContext c=
tx, Fqn primary, Fqn backup) throws Throwable
    {
       return handleNonTxMethod(ctx);
    }
@@ -1182,6 +1182,9 @@
          modifications =3D entry.getModifications();
          ctx =3D cache.getInvocationContext();
          if (ctx.isOptionsUninitialised() && entry.getOption() !=3D null) =
ctx.setOptionOverrides(entry.getOption());
+
+         assertCanContinue();
+
          ctx.setOriginLocal(false);
       }
 =


Modified: core/trunk/src/test/java/org/jboss/cache/LifeCycleTest.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/test/java/org/jboss/cache/LifeCycleTest.java	2008-01-03 =
00:57:22 UTC (rev 4951)
+++ core/trunk/src/test/java/org/jboss/cache/LifeCycleTest.java	2008-01-03 =
01:58:38 UTC (rev 4952)
@@ -14,6 +14,7 @@
 import javax.transaction.RollbackException;
 import javax.transaction.SystemException;
 import javax.transaction.TransactionManager;
+import java.util.Arrays;
 import java.util.LinkedList;
 import java.util.List;
 =

@@ -55,7 +56,7 @@
    {
       Cache cache =3D createCache(mode);
       List<Cache> caches =3D new LinkedList<Cache>();
-      if (c !=3D null) for (Cache existingCache : c) caches.add(existingCa=
che);
+      if (c !=3D null) caches.addAll(Arrays.asList(c));
       caches.add(cache);
       c =3D caches.toArray(new CacheSPI[]{});
       if (start)

Modified: core/trunk/src/test/java/org/jboss/cache/buddyreplication/BuddyRe=
plicationWithOptimisticLockingTest.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/test/java/org/jboss/cache/buddyreplication/BuddyReplicat=
ionWithOptimisticLockingTest.java	2008-01-03 00:57:22 UTC (rev 4951)
+++ core/trunk/src/test/java/org/jboss/cache/buddyreplication/BuddyReplicat=
ionWithOptimisticLockingTest.java	2008-01-03 01:58:38 UTC (rev 4952)
@@ -6,9 +6,12 @@
  */
 package org.jboss.cache.buddyreplication;
 =

+import org.testng.annotations.Test;
+
 /**
  * @author <a href=3D"mailto:manik(a)jboss.org">Manik Surtani (manik(a)jbo=
ss.org)</a>
  */
+(a)Test(groups =3D {"functional", "jgroups"})
 public class BuddyReplicationWithOptimisticLockingTest extends BuddyReplic=
ationFailoverTest
 {
    public BuddyReplicationWithOptimisticLockingTest()

Modified: core/trunk/src/test/java/org/jboss/cache/buddyreplication/BuddyRe=
plicationWithTransactionsTest.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/test/java/org/jboss/cache/buddyreplication/BuddyReplicat=
ionWithTransactionsTest.java	2008-01-03 00:57:22 UTC (rev 4951)
+++ core/trunk/src/test/java/org/jboss/cache/buddyreplication/BuddyReplicat=
ionWithTransactionsTest.java	2008-01-03 01:58:38 UTC (rev 4952)
@@ -6,15 +6,16 @@
  */
 package org.jboss.cache.buddyreplication;
 =

+import org.jboss.cache.Fqn;
 import static org.testng.AssertJUnit.assertTrue;
+import org.testng.annotations.Test;
 =

 import javax.transaction.TransactionManager;
 =

-import org.jboss.cache.Fqn;
-
 /**
  * @author <a href=3D"mailto:manik(a)jboss.org">Manik Surtani (manik(a)jbo=
ss.org)</a>
  */
+(a)Test(groups =3D {"functional", "jgroups"})
 public class BuddyReplicationWithTransactionsTest extends BuddyReplication=
TestsBase
 {
    private Fqn fqn =3D Fqn.fromString("test");

Modified: core/trunk/src/test/java/org/jboss/cache/eviction/EvictionConfigu=
rationTest.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/test/java/org/jboss/cache/eviction/EvictionConfiguration=
Test.java	2008-01-03 00:57:22 UTC (rev 4951)
+++ core/trunk/src/test/java/org/jboss/cache/eviction/EvictionConfiguration=
Test.java	2008-01-03 01:58:38 UTC (rev 4952)
@@ -195,7 +195,7 @@
    {
       cache =3D (CacheSPI<Object, Object>) new DefaultCacheFactory().creat=
eCache();
       regionManager =3D cache.getRegionManager();
-      assertEquals(0, regionManager.getAllRegions(Region.Type.ANY).size());
+      assertEquals(1, regionManager.getAllRegions(Region.Type.ANY).size());
    }
 =

    private void setupCache(String configurationName)


--===============3009165155998885509==--

From jbosscache-commits at lists.jboss.org Wed Jan  2 21:27:57 2008
Content-Type: multipart/mixed; boundary="===============6608148377217246681=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r4953 -
 core/trunk/src/main/java/org/jboss/cache/interceptors.
Date: Wed, 02 Jan 2008 21:27:56 -0500
Message-ID: <E1JAFoK-0006PO-Pk@committer01.frg.pub.inap.atl.jboss.com>

--===============6608148377217246681==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: manik.surtani(a)jboss.com
Date: 2008-01-02 21:27:56 -0500 (Wed, 02 Jan 2008)
New Revision: 4953

Modified:
   core/trunk/src/main/java/org/jboss/cache/interceptors/ActivationIntercep=
tor.java
   core/trunk/src/main/java/org/jboss/cache/interceptors/BaseRpcInterceptor=
.java
   core/trunk/src/main/java/org/jboss/cache/interceptors/CacheLoaderInterce=
ptor.java
   core/trunk/src/main/java/org/jboss/cache/interceptors/CacheMgmtIntercept=
or.java
   core/trunk/src/main/java/org/jboss/cache/interceptors/CacheStoreIntercep=
tor.java
   core/trunk/src/main/java/org/jboss/cache/interceptors/DataGravitatorInte=
rceptor.java
   core/trunk/src/main/java/org/jboss/cache/interceptors/EvictionIntercepto=
r.java
   core/trunk/src/main/java/org/jboss/cache/interceptors/InvalidationInterc=
eptor.java
   core/trunk/src/main/java/org/jboss/cache/interceptors/InvocationContextI=
nterceptor.java
   core/trunk/src/main/java/org/jboss/cache/interceptors/MethodDispacherInt=
erceptor.java
   core/trunk/src/main/java/org/jboss/cache/interceptors/NotificationInterc=
eptor.java
   core/trunk/src/main/java/org/jboss/cache/interceptors/OptimisticCreateIf=
NotExistsInterceptor.java
   core/trunk/src/main/java/org/jboss/cache/interceptors/OptimisticIntercep=
tor.java
   core/trunk/src/main/java/org/jboss/cache/interceptors/OptimisticLockingI=
nterceptor.java
   core/trunk/src/main/java/org/jboss/cache/interceptors/OptimisticNodeInte=
rceptor.java
   core/trunk/src/main/java/org/jboss/cache/interceptors/OptimisticReplicat=
ionInterceptor.java
   core/trunk/src/main/java/org/jboss/cache/interceptors/OptimisticValidato=
rInterceptor.java
   core/trunk/src/main/java/org/jboss/cache/interceptors/PassivationInterce=
ptor.java
   core/trunk/src/main/java/org/jboss/cache/interceptors/PessimisticLockInt=
erceptor.java
   core/trunk/src/main/java/org/jboss/cache/interceptors/ReplicationInterce=
ptor.java
   core/trunk/src/main/java/org/jboss/cache/interceptors/TxInterceptor.java
Log:
Cleaned up interceptor implementations

Modified: core/trunk/src/main/java/org/jboss/cache/interceptors/ActivationI=
nterceptor.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/java/org/jboss/cache/interceptors/ActivationInterce=
ptor.java	2008-01-03 01:58:38 UTC (rev 4952)
+++ core/trunk/src/main/java/org/jboss/cache/interceptors/ActivationInterce=
ptor.java	2008-01-03 02:27:56 UTC (rev 4953)
@@ -1,6 +1,10 @@
 package org.jboss.cache.interceptors;
 =

-import org.jboss.cache.*;
+import org.jboss.cache.Fqn;
+import org.jboss.cache.InvocationContext;
+import org.jboss.cache.Modification;
+import org.jboss.cache.Node;
+import org.jboss.cache.NodeSPI;
 import org.jboss.cache.marshall.MethodCall;
 import org.jboss.cache.marshall.MethodDeclarations;
 import org.jboss.cache.transaction.GlobalTransaction;
@@ -8,8 +12,8 @@
 import org.jboss.cache.transaction.TransactionTable;
 import org.jgroups.Address;
 =

+import javax.transaction.SystemException;
 import javax.transaction.TransactionManager;
-import javax.transaction.SystemException;
 import java.lang.reflect.Method;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -47,6 +51,7 @@
       isActivation =3D true;
    }
 =

+   @Override
    protected Object handleRemoveDataMethod(InvocationContext ctx, GlobalTr=
ansaction tx, Fqn fqn, boolean createUndoOps) throws Throwable
    {
       Object returnValue =3D super.handleRemoveDataMethod(ctx, tx, fqn, cr=
eateUndoOps);
@@ -58,6 +63,7 @@
       return returnValue;
    }
 =

+   @Override
    protected Object handleRemoveNodeMethod(InvocationContext ctx, GlobalTr=
ansaction tx, Fqn fqn, boolean createUndoOps) throws Throwable
    {
       Object returnValue =3D super.handleRemoveNodeMethod(ctx, tx, fqn, cr=
eateUndoOps);
@@ -69,6 +75,7 @@
       return returnValue;
    }
 =

+   @Override
    protected Object handlePrintMethod(InvocationContext ctx, Fqn fqn) thro=
ws Throwable
    {
       Object returnValue =3D super.handlePrintMethod(ctx, fqn);
@@ -76,6 +83,7 @@
       return returnValue;
    }
 =

+   @Override
    protected Object handleReleaseAllLocksMethod(InvocationContext ctx, Fqn=
 fqn) throws Throwable
    {
       Object returnValue =3D super.handleReleaseAllLocksMethod(ctx, fqn);
@@ -83,6 +91,7 @@
       return returnValue;
    }
 =

+   @Override
    protected Object handleGetChildrenNamesMethod(InvocationContext ctx, Fq=
n fqn) throws Throwable
    {
       Object returnValue =3D super.handleGetChildrenNamesMethod(ctx, fqn);
@@ -90,6 +99,7 @@
       return returnValue;
    }
 =

+   @Override
    protected Object handleGetKeysMethod(InvocationContext ctx, Fqn fqn) th=
rows Throwable
    {
       Object returnValue =3D super.handleGetKeysMethod(ctx, fqn);
@@ -97,6 +107,7 @@
       return returnValue;
    }
 =

+   @Override
    protected Object handleGetNodeMethod(InvocationContext ctx, Fqn fqn) th=
rows Throwable
    {
       Object returnValue =3D super.handleGetNodeMethod(ctx, fqn);
@@ -104,6 +115,7 @@
       return returnValue;
    }
 =

+   @Override
    protected Object handleGetKeyValueMethod(InvocationContext ctx, Fqn fqn=
, Object key, boolean sendNodeEvent) throws Throwable
    {
       Object returnValue =3D super.handleGetKeyValueMethod(ctx, fqn, key, =
sendNodeEvent);
@@ -111,6 +123,7 @@
       return returnValue;
    }
 =

+   @Override
    protected Object handleAddChildMethod(InvocationContext ctx, GlobalTran=
saction tx, Fqn parentFqn, Object childName, Node cn, boolean createUndoOps=
) throws Throwable
    {
       Object returnValue =3D super.handleAddChildMethod(ctx, tx, parentFqn=
, childName, cn, createUndoOps);
@@ -118,6 +131,7 @@
       return returnValue;
    }
 =

+   @Override
    protected Object handlePutForExternalReadMethod(InvocationContext ctx, =
GlobalTransaction tx, Fqn fqn, Object key, Object value) throws Throwable
    {
       Object returnValue =3D super.handlePutForExternalReadMethod(ctx, tx,=
 fqn, key, value);
@@ -125,6 +139,7 @@
       return returnValue;
    }
 =

+   @Override
    protected Object handlePutDataMethod(InvocationContext ctx, GlobalTrans=
action tx, Fqn fqn, Map data, boolean createUndoOps) throws Throwable
    {
       Object returnValue =3D super.handlePutDataMethod(ctx, tx, fqn, data,=
 createUndoOps);
@@ -132,6 +147,7 @@
       return returnValue;
    }
 =

+   @Override
    protected Object handlePutKeyValueMethod(InvocationContext ctx, GlobalT=
ransaction gtx, Fqn fqn, Object key, Object value, boolean createUndoOps) t=
hrows Throwable
    {
       Object returnValue =3D super.handlePutKeyValueMethod(ctx, gtx, fqn, =
key, value, createUndoOps);
@@ -139,6 +155,7 @@
       return returnValue;
    }
 =

+   @Override
    protected Object handleRemoveKeyMethod(InvocationContext ctx, GlobalTra=
nsaction tx, Fqn fqn, Object key, boolean createUndoOps) throws Throwable
    {
       Object returnValue =3D super.handleRemoveKeyMethod(ctx, tx, fqn, key=
, createUndoOps);
@@ -146,6 +163,7 @@
       return returnValue;
    }
 =

+   @Override
    protected Object handlePutDataEraseMethod(InvocationContext ctx, Global=
Transaction gt, Fqn fqn, Map newData, boolean createUndoOps, boolean eraseC=
ontents) throws Throwable
    {
       Object returnValue =3D super.handlePutDataEraseMethod(ctx, gt, fqn, =
newData, createUndoOps, eraseContents);
@@ -172,7 +190,8 @@
                log.debug("children all initialized");
                remove(ctx, fqn);
             }
-         } else if (loaderNoChildren(fqn))
+         }
+         else if (loaderNoChildren(fqn))
          {
             if (log.isDebugEnabled()) log.debug("no children " + n);
             remove(ctx, fqn);
@@ -180,25 +199,29 @@
       }
    }
 =

+   @Override
    protected Object handleOptimisticPrepareMethod(InvocationContext ctx, G=
lobalTransaction gtx, List modifications, Map data, Address address, boolea=
n onePhaseCommit) throws Throwable
    {
       Object retval =3D nextInterceptor(ctx);
-      if (inTransaction()) {
+      if (inTransaction())
+      {
          prepareCacheLoader(ctx);
       }
       return retval;
    }
 =

    private boolean inTransaction()
-      throws SystemException
+         throws SystemException
    {
       return tx_mgr !=3D null && tx_mgr.getTransaction() !=3D null;
    }
 =

+   @Override
    protected Object handlePrepareMethod(InvocationContext ctx, GlobalTrans=
action gtx, List modification, Address coordinator, boolean onePhaseCommit)=
 throws Throwable
    {
       Object retval =3D nextInterceptor(ctx);
-      if (inTransaction()) {
+      if (inTransaction())
+      {
          prepareCacheLoader(ctx);
       }
       return retval;
@@ -257,12 +280,14 @@
       return m_activations;
    }
 =

+   @Override
    public void resetStatistics()
    {
       super.resetStatistics();
       m_activations =3D 0;
    }
 =

+   @Override
    public Map<String, Object> dumpStatistics()
    {
       Map<String, Object> retval =3D super.dumpStatistics();

Modified: core/trunk/src/main/java/org/jboss/cache/interceptors/BaseRpcInte=
rceptor.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/java/org/jboss/cache/interceptors/BaseRpcIntercepto=
r.java	2008-01-03 01:58:38 UTC (rev 4952)
+++ core/trunk/src/main/java/org/jboss/cache/interceptors/BaseRpcIntercepto=
r.java	2008-01-03 02:27:56 UTC (rev 4953)
@@ -41,6 +41,7 @@
       usingBuddyReplication =3D buddyManager !=3D null && buddyManager.isE=
nabled();
    }
 =

+   @Override
    public void setCache(CacheSPI cache)
    {
       super.setCache(cache);

Modified: core/trunk/src/main/java/org/jboss/cache/interceptors/CacheLoader=
Interceptor.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/java/org/jboss/cache/interceptors/CacheLoaderInterc=
eptor.java	2008-01-03 01:58:38 UTC (rev 4952)
+++ core/trunk/src/main/java/org/jboss/cache/interceptors/CacheLoaderInterc=
eptor.java	2008-01-03 02:27:56 UTC (rev 4953)
@@ -1,6 +1,6 @@
 package org.jboss.cache.interceptors;
 =

-import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.jboss.cache.CacheException;
 import org.jboss.cache.Fqn;
 import org.jboss.cache.InvocationContext;
@@ -9,6 +9,7 @@
 import org.jboss.cache.config.Configuration;
 import static org.jboss.cache.config.Configuration.CacheMode;
 import org.jboss.cache.factories.annotations.Inject;
+import org.jboss.cache.factories.annotations.Start;
 import org.jboss.cache.loader.CacheLoader;
 import org.jboss.cache.loader.CacheLoaderManager;
 import org.jboss.cache.lock.NodeLock;
@@ -42,6 +43,11 @@
    protected CacheLoaderManager clm;
    protected boolean usingOptimisticInvalidation =3D false;
 =

+   public CacheLoaderInterceptor()
+   {
+      log =3D LogFactory.getLog(getClass());
+   }
+
    /**
     * True if CacheStoreInterceptor is in place.
     * This allows us to skip loading keys for remove(Fqn, key) and put(Fqn=
, key).
@@ -49,11 +55,6 @@
     */
    protected boolean useCacheStore =3D true;
 =

-   protected Log getLog()
-   {
-      return log;
-   }
-
    @Inject
    protected void injectDependencies(TransactionTable txTable, CacheLoader=
Manager clm, Configuration configuration)
    {
@@ -63,13 +64,13 @@
       usingOptimisticInvalidation =3D configuration.isNodeLockingOptimisti=
c() && mode.isInvalidation();
    }
 =

-   public Object invoke(InvocationContext ctx) throws Throwable
+   @Start
+   protected void startInterceptor()
    {
-      if (loader =3D=3D null) loader =3D clm.getCacheLoader();
-      return super.invoke(ctx);
+      loader =3D clm.getCacheLoader();
    }
 =

-
+   @Override
    protected Object handlePutDataEraseMethod(InvocationContext ctx, Global=
Transaction gt, Fqn fqn, Map newData, boolean createUndoOps, boolean eraseC=
ontents) throws Throwable
    {
       if (fqn !=3D null)
@@ -79,6 +80,7 @@
       return nextInterceptor(ctx);
    }
 =

+   @Override
    protected Object handlePutDataMethod(InvocationContext ctx, GlobalTrans=
action tx, Fqn fqn, Map data, boolean createUndoOps) throws Throwable
    {
       if (fqn !=3D null)
@@ -88,6 +90,7 @@
       return nextInterceptor(ctx);
    }
 =

+   @Override
    protected Object handlePutForExternalReadMethod(InvocationContext ctx, =
GlobalTransaction tx, Fqn fqn, Object key, Object value) throws Throwable
    {
       if (fqn !=3D null)
@@ -97,6 +100,7 @@
       return nextInterceptor(ctx);
    }
 =

+   @Override
    protected Object handlePutKeyValueMethod(InvocationContext ctx, GlobalT=
ransaction gtx, Fqn fqn, Object key, Object value, boolean createUndoOps) t=
hrows Throwable
    {
       if (fqn !=3D null)
@@ -106,6 +110,7 @@
       return nextInterceptor(ctx);
    }
 =

+   @Override
    protected Object handleMoveMethod(InvocationContext ctx, Fqn from, Fqn =
to) throws Throwable
    {
       if (from !=3D null)
@@ -120,6 +125,7 @@
       return nextInterceptor(ctx);
    }
 =

+   @Override
    protected Object handleAddChildMethod(InvocationContext ctx, GlobalTran=
saction tx, Fqn parentFqn, Object childName, Node cn, boolean createUndoOps=
) throws Throwable
    {
 =

@@ -131,6 +137,7 @@
       return nextInterceptor(ctx);
    }
 =

+   @Override
    protected Object handleGetKeyValueMethod(InvocationContext ctx, Fqn fqn=
, Object key, boolean sendNodeEvent) throws Throwable
    {
       if (fqn !=3D null)
@@ -140,6 +147,7 @@
       return nextInterceptor(ctx);
    }
 =

+   @Override
    protected Object handleGetNodeMethod(InvocationContext ctx, Fqn fqn) th=
rows Throwable
    {
       if (fqn !=3D null)
@@ -149,6 +157,7 @@
       return nextInterceptor(ctx);
    }
 =

+   @Override
    protected Object handleGetChildrenNamesMethod(InvocationContext ctx, Fq=
n fqn) throws Throwable
    {
       if (fqn !=3D null)
@@ -158,6 +167,7 @@
       return nextInterceptor(ctx);
    }
 =

+   @Override
    protected Object handleReleaseAllLocksMethod(InvocationContext ctx, Fqn=
 fqn) throws Throwable
    {
       if (fqn !=3D null)
@@ -167,6 +177,7 @@
       return nextInterceptor(ctx);
    }
 =

+   @Override
    protected Object handlePrintMethod(InvocationContext ctx, Fqn fqn) thro=
ws Throwable
    {
       if (fqn !=3D null)
@@ -176,6 +187,7 @@
       return nextInterceptor(ctx);
    }
 =

+   @Override
    protected Object handleGetKeysMethod(InvocationContext ctx, Fqn fqn) th=
rows Throwable
    {
       if (fqn !=3D null)
@@ -185,6 +197,7 @@
       return nextInterceptor(ctx);
    }
 =

+   @Override
    protected Object handleGetDataMapMethod(InvocationContext ctx, Fqn fqn)=
 throws Throwable
    {
       if (fqn !=3D null)
@@ -194,6 +207,7 @@
       return nextInterceptor(ctx);
    }
 =

+   @Override
    protected Object handleRollbackMethod(InvocationContext ctx, GlobalTran=
saction globalTransaction) throws Throwable
    {
       // clean up nodesCreated map
@@ -221,6 +235,7 @@
       return nextInterceptor(ctx);
    }
 =

+   @Override
    protected Object handleRemoveNodeMethod(InvocationContext ctx, GlobalTr=
ansaction tx, Fqn fqn, boolean createUndoOps) throws Throwable
    {
       if (cache.getConfiguration().isNodeLockingOptimistic() && fqn !=3D n=
ull)
@@ -230,6 +245,7 @@
       return nextInterceptor(ctx);
    }
 =

+   @Override
    protected Object handleRemoveKeyMethod(InvocationContext ctx, GlobalTra=
nsaction tx, Fqn fqn, Object key, boolean createUndoOps) throws Throwable
    {
       if (fqn !=3D null && !useCacheStore)
@@ -239,6 +255,7 @@
       return nextInterceptor(ctx);
    }
 =

+   @Override
    protected Object handleRemoveDataMethod(InvocationContext ctx, GlobalTr=
ansaction tx, Fqn fqn, boolean createUndoOps) throws Throwable
    {
       if (fqn !=3D null && !useCacheStore)
@@ -424,12 +441,14 @@
       return m_cacheMisses;
    }
 =

+   @Override
    public void resetStatistics()
    {
       m_cacheLoads =3D 0;
       m_cacheMisses =3D 0;
    }
 =

+   @Override
    public Map<String, Object> dumpStatistics()
    {
       Map<String, Object> retval =3D new HashMap<String, Object>();

Modified: core/trunk/src/main/java/org/jboss/cache/interceptors/CacheMgmtIn=
terceptor.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/java/org/jboss/cache/interceptors/CacheMgmtIntercep=
tor.java	2008-01-03 01:58:38 UTC (rev 4952)
+++ core/trunk/src/main/java/org/jboss/cache/interceptors/CacheMgmtIntercep=
tor.java	2008-01-03 02:27:56 UTC (rev 4953)
@@ -21,12 +21,11 @@
  */
 package org.jboss.cache.interceptors;
 =

-import org.jboss.cache.CacheSPI;
+import org.apache.commons.logging.LogFactory;
+import org.jboss.cache.Fqn;
 import org.jboss.cache.InvocationContext;
-import org.jboss.cache.Fqn;
 import org.jboss.cache.optimistic.DataVersion;
 import org.jboss.cache.transaction.GlobalTransaction;
-import org.apache.commons.logging.Log;
 =

 import java.util.HashMap;
 import java.util.Map;
@@ -49,21 +48,18 @@
    private long m_start =3D System.currentTimeMillis();
    private long m_reset =3D m_start;
 =

-   public void setCache(CacheSPI cache)
+   public CacheMgmtInterceptor()
    {
-      super.setCache(cache);
+      log =3D LogFactory.getLog(getClass());
    }
 =

-   protected Log getLog()
-   {
-      return log;
-   }
-
+   @Override
    protected boolean skipMethodCall(InvocationContext ctx)
    {
       return !getStatisticsEnabled();
    }
 =

+   @Override
    protected Object handleEvictMethod(InvocationContext ctx, Fqn fqn) thro=
ws Throwable
    {
       Object returnValue =3D nextInterceptor(ctx);
@@ -71,6 +67,7 @@
       return returnValue;
    }
 =

+   @Override
    protected Object handleEvictVersionedNodeMethod(InvocationContext ctx, =
Fqn fqn, DataVersion dataVersion) throws Throwable
    {
       Object returnValue =3D nextInterceptor(ctx);
@@ -78,6 +75,7 @@
       return returnValue;
    }
 =

+   @Override
    protected Object handleGetKeyValueMethod(InvocationContext ctx, Fqn fqn=
, Object key, boolean sendNodeEvent) throws Throwable
    {
       long t1 =3D System.currentTimeMillis();
@@ -87,7 +85,8 @@
       {
          m_miss_times =3D m_miss_times + (t2 - t1);
          m_misses++;
-      } else
+      }
+      else
       {
          m_hit_times =3D m_hit_times + (t2 - t1);
          m_hits++;
@@ -95,18 +94,20 @@
       return retval;
    }
 =

+   @Override
    protected Object handlePutDataMethod(InvocationContext ctx, GlobalTrans=
action tx, Fqn fqn, Map data, boolean createUndoOps) throws Throwable
    {
       return handlePutData(ctx, data);
    }
 =

+   @Override
    protected Object handlePutDataEraseMethod(InvocationContext ctx, Global=
Transaction gt, Fqn fqn, Map newData, boolean createUndoOps, boolean eraseC=
ontents) throws Throwable
    {
       return handlePutData(ctx, newData);
    }
 =

    private Object handlePutData(InvocationContext ctx, Map data)
-      throws Throwable
+         throws Throwable
    {
       long t1 =3D System.currentTimeMillis();
       Object retval =3D nextInterceptor(ctx);
@@ -120,18 +121,20 @@
       return retval;
    }
 =

+   @Override
    protected Object handlePutForExternalReadMethod(InvocationContext ctx, =
GlobalTransaction tx, Fqn fqn, Object key, Object value) throws Throwable
    {
       return handlePutExternalAndKeyValue(ctx);
    }
 =

+   @Override
    protected Object handlePutKeyValueMethod(InvocationContext ctx, GlobalT=
ransaction gtx, Fqn fqn, Object key, Object value, boolean createUndoOps) t=
hrows Throwable
    {
       return handlePutExternalAndKeyValue(ctx);
    }
 =

    private Object handlePutExternalAndKeyValue(InvocationContext ctx)
-      throws Throwable
+         throws Throwable
    {
       long t1 =3D System.currentTimeMillis();
       Object retval =3D nextInterceptor(ctx);
@@ -211,6 +214,7 @@
       return (System.currentTimeMillis() - m_reset) / 1000;
    }
 =

+   @Override
    public Map<String, Object> dumpStatistics()
    {
       Map<String, Object> retval =3D new HashMap<String, Object>();
@@ -229,6 +233,7 @@
       return retval;
    }
 =

+   @Override
    public void resetStatistics()
    {
       m_hits =3D 0;

Modified: core/trunk/src/main/java/org/jboss/cache/interceptors/CacheStoreI=
nterceptor.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/java/org/jboss/cache/interceptors/CacheStoreInterce=
ptor.java	2008-01-03 01:58:38 UTC (rev 4952)
+++ core/trunk/src/main/java/org/jboss/cache/interceptors/CacheStoreInterce=
ptor.java	2008-01-03 02:27:56 UTC (rev 4953)
@@ -1,13 +1,13 @@
 package org.jboss.cache.interceptors;
 =

-import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.jboss.cache.CacheException;
-import org.jboss.cache.CacheSPI;
 import org.jboss.cache.Fqn;
 import org.jboss.cache.InvocationContext;
 import org.jboss.cache.Modification;
 import org.jboss.cache.NodeSPI;
 import org.jboss.cache.config.CacheLoaderConfig;
+import org.jboss.cache.factories.annotations.Start;
 import org.jboss.cache.loader.CacheLoader;
 import org.jboss.cache.marshall.MethodCall;
 import org.jboss.cache.marshall.MethodDeclarations;
@@ -45,30 +45,25 @@
    private long m_cacheStores =3D 0;
    protected CacheLoader loader;
 =

-   protected Log getLog()
+
+   public CacheStoreInterceptor()
    {
-      return log;
+      log =3D LogFactory.getLog(getClass());
    }
 =

-   public void setCache(CacheSPI cache)
+   @Start
+   protected void startInterceptor()
    {
-      super.setCache(cache);
+      loader =3D cache.getCacheLoaderManager().getCacheLoader();
       this.loaderConfig =3D cache.getCacheLoaderManager().getCacheLoaderCo=
nfig();
       tx_mgr =3D cache.getTransactionManager();
       tx_table =3D cache.getTransactionTable();
-      this.loader =3D cache.getCacheLoaderManager().getCacheLoader();
    }
 =

-   public Object invoke(InvocationContext ctx) throws Throwable
-   {
-      if (loaderConfig =3D=3D null) loaderConfig =3D cache.getCacheLoaderM=
anager().getCacheLoaderConfig();
-      if (loader =3D=3D null) loader =3D cache.getCacheLoaderManager().get=
CacheLoader();
-      return super.invoke(ctx);
-   }
-
    /**
     * if this is a shared cache loader and the call is of remote origin, p=
ass up the chain
     */
+   @Override
    protected boolean skipMethodCall(InvocationContext ctx)
    {
       if (!ctx.isOriginLocal() && loaderConfig.isShared())
@@ -82,6 +77,7 @@
       return false;
    }
 =

+   @Override
    protected Object handleCommitMethod(InvocationContext ctx, GlobalTransa=
ction gtx) throws Throwable
    {
       if (inTransaction())
@@ -129,6 +125,7 @@
       return nextInterceptor(ctx);
    }
 =

+   @Override
    protected Object handleRollbackMethod(InvocationContext ctx, GlobalTran=
saction gtx) throws Throwable
    {
       if (inTransaction())
@@ -155,6 +152,7 @@
       return nextInterceptor(ctx);
    }
 =

+   @Override
    protected Object handleOptimisticPrepareMethod(InvocationContext ctx, G=
lobalTransaction gtx, List modifications, Map data, Address address, boolea=
n onePhaseCommit) throws Throwable
    {
       if (inTransaction())
@@ -165,6 +163,7 @@
       return nextInterceptor(ctx);
    }
 =

+   @Override
    protected Object handlePrepareMethod(InvocationContext ctx, GlobalTrans=
action gtx, List modification, Address coordinator, boolean onePhaseCommit)=
 throws Throwable
    {
       if (inTransaction())
@@ -179,6 +178,7 @@
     * remove() methods need to be applied to the CacheLoader before passin=
g up the call: a listener might
     * access an element just removed, causing the CacheLoader to *load* th=
e element before *removing* it.
     */
+   @Override
    protected Object handleRemoveNodeMethod(InvocationContext ctx, GlobalTr=
ansaction tx, Fqn fqn, boolean createUndoOps) throws Throwable
    {
       if (!inTransaction())
@@ -191,6 +191,7 @@
    /**
     * @see #handleRemoveNodeMethod(org.jboss.cache.InvocationContext, org.=
jboss.cache.transaction.GlobalTransaction, org.jboss.cache.Fqn, boolean)
     */
+   @Override
    protected Object handleRemoveKeyMethod(InvocationContext ctx, GlobalTra=
nsaction tx, Fqn fqn, Object key, boolean createUndoOps) throws Throwable
    {
       if (!inTransaction())
@@ -205,6 +206,7 @@
    /**
     * @see #handleRemoveNodeMethod(org.jboss.cache.InvocationContext, org.=
jboss.cache.transaction.GlobalTransaction, org.jboss.cache.Fqn, boolean)
     */
+   @Override
    protected Object handleRemoveDataMethod(InvocationContext ctx, GlobalTr=
ansaction tx, Fqn fqn, boolean createUndoOps) throws Throwable
    {
       if (!inTransaction())
@@ -220,6 +222,7 @@
       return nextInterceptor(ctx);
    }
 =

+   @Override
    protected Object handleMoveMethod(InvocationContext ctx, Fqn from, Fqn =
to) throws Throwable
    {
       Object returnValue =3D nextInterceptor(ctx);
@@ -233,6 +236,7 @@
       return returnValue;
    }
 =

+   @Override
    protected Object handlePutDataEraseMethod(InvocationContext ctx, Global=
Transaction gt, Fqn fqn, Map newData, boolean createUndoOps, boolean eraseC=
ontents) throws Throwable
    {
       Object returnValue =3D nextInterceptor(ctx);
@@ -247,6 +251,7 @@
       return returnValue;
    }
 =

+   @Override
    protected Object handlePutDataMethod(InvocationContext ctx, GlobalTrans=
action tx, Fqn fqn, Map data, boolean createUndoOps) throws Throwable
    {
       Object returnValue =3D nextInterceptor(ctx);
@@ -262,11 +267,13 @@
       return returnValue;
    }
 =

+   @Override
    protected Object handlePutForExternalReadMethod(InvocationContext ctx, =
GlobalTransaction tx, Fqn fqn, Object key, Object value) throws Throwable
    {
       return handlePutKeyValue(ctx, fqn, key, value);
    }
 =

+   @Override
    protected Object handlePutKeyValueMethod(InvocationContext ctx, GlobalT=
ransaction gtx, Fqn fqn, Object key, Object value, boolean createUndoOps) t=
hrows Throwable
    {
       return handlePutKeyValue(ctx, fqn, key, value);
@@ -332,11 +339,13 @@
       return m_cacheStores;
    }
 =

+   @Override
    public void resetStatistics()
    {
       m_cacheStores =3D 0;
    }
 =

+   @Override
    public Map<String, Object> dumpStatistics()
    {
       Map<String, Object> retval =3D new HashMap<String, Object>();

Modified: core/trunk/src/main/java/org/jboss/cache/interceptors/DataGravita=
torInterceptor.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/java/org/jboss/cache/interceptors/DataGravitatorInt=
erceptor.java	2008-01-03 01:58:38 UTC (rev 4952)
+++ core/trunk/src/main/java/org/jboss/cache/interceptors/DataGravitatorInt=
erceptor.java	2008-01-03 02:27:56 UTC (rev 4953)
@@ -6,7 +6,6 @@
  */
 package org.jboss.cache.interceptors;
 =

-import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.jboss.cache.CacheException;
 import org.jboss.cache.CacheSPI;
@@ -50,9 +49,9 @@
 {
    private BuddyManager buddyManager;
    private boolean syncCommunications =3D false;
-   private Log log =3D LogFactory.getLog(DataGravitatorInterceptor.class);
    private Map<GlobalTransaction, MethodCall> transactionMods =3D new Conc=
urrentHashMap<GlobalTransaction, MethodCall>();
 =

+   @Override
    public void setCache(CacheSPI cache)
    {
       super.setCache(cache);
@@ -60,47 +59,55 @@
       syncCommunications =3D configuration.getCacheMode() =3D=3D Configura=
tion.CacheMode.REPL_SYNC || configuration.getCacheMode() =3D=3D Configurati=
on.CacheMode.INVALIDATION_SYNC;
    }
 =

-   protected Log getLog()
+   public DataGravitatorInterceptor()
    {
-      return log;
+      log =3D LogFactory.getLog(getClass());
    }
 =

+   @Override
    protected boolean skipMethodCall(InvocationContext ctx)
    {
       return MethodDeclarations.isBlockUnblockMethod(ctx.getMethodCall().g=
etMethodId()) ||
             ctx.getOptionOverrides().isSkipDataGravitation();
    }
 =

+   @Override
    protected Object handleGetChildrenNamesMethod(InvocationContext ctx, Fq=
n fqn) throws Throwable
    {
       return handleGetMethod(ctx, fqn);
    }
 =

+   @Override
    protected Object handleGetDataMapMethod(InvocationContext ctx, Fqn fqn)=
 throws Throwable
    {
       return handleGetMethod(ctx, fqn);
    }
 =

+   @Override
    protected Object handleExistsMethod(InvocationContext ctx, Fqn fqn) thr=
ows Throwable
    {
       return handleGetMethod(ctx, fqn);
    }
 =

+   @Override
    protected Object handleGetKeysMethod(InvocationContext ctx, Fqn fqn) th=
rows Throwable
    {
       return handleGetMethod(ctx, fqn);
    }
 =

+   @Override
    protected Object handleGetKeyValueMethod(InvocationContext ctx, Fqn fqn=
, Object key, boolean sendNodeEvent) throws Throwable
    {
       return handleGetMethod(ctx, fqn);
    }
 =

+   @Override
    protected Object handleGetNodeMethod(InvocationContext ctx, Fqn fqn) th=
rows Throwable
    {
       return handleGetMethod(ctx, fqn);
    }
 =

+   @Override
    protected Object handlePrepareMethod(InvocationContext ctx, GlobalTrans=
action gtx, List modification, Address coordinator, boolean onePhaseCommit)=
 throws Throwable
    {
       try
@@ -117,11 +124,13 @@
       }
    }
 =

+   @Override
    protected Object handleOptimisticPrepareMethod(InvocationContext ctx, G=
lobalTransaction gtx, List modifications, Map data, Address address, boolea=
n onePhaseCommit) throws Throwable
    {
       return handlePrepareMethod(ctx, gtx, modifications, address, onePhas=
eCommit);
    }
 =

+   @Override
    protected Object handleRollbackMethod(InvocationContext ctx, GlobalTran=
saction globalTransaction) throws Throwable
    {
       try
@@ -136,6 +145,7 @@
       }
    }
 =

+   @Override
    protected Object handleCommitMethod(InvocationContext ctx, GlobalTransa=
ction globalTransaction) throws Throwable
    {
       try
@@ -282,28 +292,6 @@
             log.trace("Got response " + gr);
          }
 =

-//         if (configuration.isUseRegionBasedMarshalling())
-//         {
-//            ClassLoader cl =3D Thread.currentThread().getContextClassLoa=
der();
-//            try
-//            {
-//               cache.getRegionManager().setContextClassLoaderAsCurrent(n=
ame);
-//
-//               byte[] nodeData =3D (byte[]) resp[0];
-//               ByteArrayInputStream bais =3D new ByteArrayInputStream(no=
deData);
-//               MarshalledValueInputStream mais =3D new MarshalledValueIn=
putStream(bais);
-//               nodes =3D (List) mais.readObject();
-//               mais.close();
-//            }
-//            finally
-//            {
-//               Thread.currentThread().setContextClassLoader(cl);
-//            }
-//         }
-//         else
-//         {
-//         }
-
          result =3D new BackupData(name, gr);
       }
 =

@@ -312,18 +300,6 @@
 =

    private void cleanBackupData(BackupData backup, GlobalTransaction gtx, =
InvocationContext ctx) throws Throwable
    {
-      //       MethodCall primaryDataCleanup, backupDataCleanup;
-      //       if (buddyManager.isDataGravitationRemoveOnFind())
-      //       {
-      //           primaryDataCleanup =3D MethodCallFactory.create(MethodD=
eclarations.removeNodeMethodLocal, new Object[]{null, backup.primaryFqn, Bo=
olean.FALSE});
-      //           backupDataCleanup =3D MethodCallFactory.create(MethodDe=
clarations.removeNodeMethodLocal, new Object[]{null, backup.backupFqn, Bool=
ean.FALSE});
-      //       }
-      //       else
-      //       {
-      //           primaryDataCleanup =3D MethodCallFactory.create(MethodD=
eclarations.evictNodeMethodLocal, new Object[]{backup.primaryFqn});
-      //           backupDataCleanup =3D MethodCallFactory.create(MethodDe=
clarations.evictNodeMethodLocal, new Object[]{backup.backupFqn});
-      //       }
-
       MethodCall cleanup =3D MethodCallFactory.create(MethodDeclarations.d=
ataGravitationCleanupMethod, backup.primaryFqn, backup.backupFqn);
 =

 =

@@ -332,11 +308,8 @@
       {
          // broadcast removes
          // remove main Fqn
-         //replicateCall(cache.getMembers(), primaryDataCleanup, syncCommu=
nications);
-
          if (log.isTraceEnabled()) log.trace("Performing cleanup on [" + b=
ackup.backupFqn + "]");
          // remove backup Fqn
-         //replicateCall(cache.getMembers(), backupDataCleanup, syncCommun=
ications);
          replicateCall(cache.getMembers(), cleanup, syncCommunications, ct=
x.getOptionOverrides(), false);
       }
       else

Modified: core/trunk/src/main/java/org/jboss/cache/interceptors/EvictionInt=
erceptor.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/java/org/jboss/cache/interceptors/EvictionIntercept=
or.java	2008-01-03 01:58:38 UTC (rev 4952)
+++ core/trunk/src/main/java/org/jboss/cache/interceptors/EvictionIntercept=
or.java	2008-01-03 02:27:56 UTC (rev 4953)
@@ -7,7 +7,6 @@
  */
 package org.jboss.cache.interceptors;
 =

-import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.jboss.cache.Fqn;
 import org.jboss.cache.InvocationContext;
@@ -33,8 +32,6 @@
  */
 public class EvictionInterceptor extends MethodDispacherInterceptor
 {
-   private static final Log log =3D LogFactory.getLog(EvictionInterceptor.=
class);
-
    protected RegionManager regionManager;
 =

    /**
@@ -49,16 +46,18 @@
       this.regionManager =3D regionManager;
    }
 =

-   protected Log getLog()
+   public EvictionInterceptor()
    {
-      return log;
+      log =3D LogFactory.getLog(getClass());
    }
 =

+   @Override
    protected Object handleEvictVersionedNodeMethod(InvocationContext ctx, =
Fqn fqn, DataVersion dataVersion) throws Throwable
    {
       return handleEvictMethod(ctx, fqn);
    }
 =

+   @Override
    protected Object handleEvictMethod(InvocationContext ctx, Fqn fqn) thro=
ws Throwable
    {
       Object retVal =3D nextInterceptor(ctx);
@@ -76,11 +75,13 @@
       return retVal;
    }
 =

+   @Override
    protected Object handlePutKeyValueMethod(InvocationContext ctx, GlobalT=
ransaction gtx, Fqn fqn, Object key, Object value, boolean createUndoOps) t=
hrows Throwable
    {
       return handlePutForExternalReadMethod(ctx, gtx, fqn, key, value);
    }
 =

+   @Override
    protected Object handlePutForExternalReadMethod(InvocationContext ctx, =
GlobalTransaction tx, Fqn fqn, Object key, Object value) throws Throwable
    {
       Object retVal =3D nextInterceptor(ctx);
@@ -91,6 +92,7 @@
       return retVal;
    }
 =

+   @Override
    protected Object handlePutDataEraseMethod(InvocationContext ctx, Global=
Transaction gt, Fqn fqn, Map newData, boolean createUndoOps, boolean eraseC=
ontents) throws Throwable
    {
       Object retVal =3D nextInterceptor(ctx);
@@ -118,6 +120,7 @@
       return retVal;
    }
 =

+   @Override
    protected Object handlePutDataMethod(InvocationContext ctx, GlobalTrans=
action tx, Fqn fqn, Map data, boolean createUndoOps) throws Throwable
    {
       Object retVal =3D nextInterceptor(ctx);
@@ -144,6 +147,7 @@
       return retVal;
    }
 =

+   @Override
    protected Object handleRemoveKeyMethod(InvocationContext ctx, GlobalTra=
nsaction tx, Fqn fqn, Object key, boolean createUndoOps) throws Throwable
    {
       Object retVal =3D nextInterceptor(ctx);
@@ -165,6 +169,7 @@
       return retVal;
    }
 =

+   @Override
    protected Object handleGetNodeMethod(InvocationContext ctx, Fqn fqn) th=
rows Throwable
    {
       Object retVal =3D nextInterceptor(ctx);
@@ -185,11 +190,13 @@
       return retVal;
    }
 =

+   @Override
    protected Object handleGetDataMapMethod(InvocationContext ctx, Fqn fqn)=
 throws Throwable
    {
       return handleGetNodeMethod(ctx, fqn);
    }
 =

+   @Override
    protected Object handleGetKeyValueMethod(InvocationContext ctx, Fqn fqn=
, Object key, boolean sendNodeEvent) throws Throwable
    {
       Object retVal =3D nextInterceptor(ctx);
@@ -207,6 +214,7 @@
       return retVal;
    }
 =

+   @Override
    protected Object handleRemoveNodeMethod(InvocationContext ctx, GlobalTr=
ansaction tx, Fqn fqn, boolean createUndoOps) throws Throwable
    {
       Object retVal =3D nextInterceptor(ctx);
@@ -217,6 +225,7 @@
       return retVal;
    }
 =

+   @Override
    protected Object handleRemoveDataMethod(InvocationContext ctx, GlobalTr=
ansaction tx, Fqn fqn, boolean createUndoOps) throws Throwable
    {
       return handleRemoveNodeMethod(ctx, tx, fqn, createUndoOps);

Modified: core/trunk/src/main/java/org/jboss/cache/interceptors/Invalidatio=
nInterceptor.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/java/org/jboss/cache/interceptors/InvalidationInter=
ceptor.java	2008-01-03 01:58:38 UTC (rev 4952)
+++ core/trunk/src/main/java/org/jboss/cache/interceptors/InvalidationInter=
ceptor.java	2008-01-03 02:27:56 UTC (rev 4953)
@@ -6,7 +6,7 @@
  */
 package org.jboss.cache.interceptors;
 =

-import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.jboss.cache.CacheSPI;
 import org.jboss.cache.Fqn;
 import org.jboss.cache.InvocationContext;
@@ -54,10 +54,14 @@
    protected Map<GlobalTransaction, List<MethodCall>> txMods;
    protected boolean optimistic;
 =

+   public InvalidationInterceptor()
+   {
+      log =3D LogFactory.getLog(getClass());
+   }
+
    public void setCache(CacheSPI cache)
    {
       super.setCache(cache);
-//      txTable =3D cache.getTransactionTable();
       optimistic =3D configuration.isNodeLockingOptimistic();
       if (optimistic) txMods =3D new ConcurrentHashMap<GlobalTransaction, =
List<MethodCall>>();
    }
@@ -68,11 +72,6 @@
       this.txTable =3D txTable;
    }
 =

-   protected Log getLog()
-   {
-      return log;
-   }
-
    protected boolean skipMethodCall(InvocationContext ctx)
    {
       Option optionOverride =3D ctx.getOptionOverrides();

Modified: core/trunk/src/main/java/org/jboss/cache/interceptors/InvocationC=
ontextInterceptor.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/java/org/jboss/cache/interceptors/InvocationContext=
Interceptor.java	2008-01-03 01:58:38 UTC (rev 4952)
+++ core/trunk/src/main/java/org/jboss/cache/interceptors/InvocationContext=
Interceptor.java	2008-01-03 02:27:56 UTC (rev 4953)
@@ -6,7 +6,7 @@
  */
 package org.jboss.cache.interceptors;
 =

-import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.jboss.cache.InvocationContext;
 import org.jboss.cache.config.Option;
 import org.jboss.cache.marshall.MethodCall;
@@ -23,11 +23,12 @@
  */
 public class InvocationContextInterceptor extends BaseTransactionalContext=
Interceptor implements InvocationContextInterceptorMBean
 {
-   protected Log getLog()
+   public InvocationContextInterceptor()
    {
-      return log;
+      log =3D LogFactory.getLog(getClass());
    }
 =

+   @Override
    public Object invoke(InvocationContext ctx) throws Throwable
    {
       MethodCall call =3D ctx.getMethodCall();

Modified: core/trunk/src/main/java/org/jboss/cache/interceptors/MethodDispa=
cherInterceptor.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/java/org/jboss/cache/interceptors/MethodDispacherIn=
terceptor.java	2008-01-03 01:58:38 UTC (rev 4952)
+++ core/trunk/src/main/java/org/jboss/cache/interceptors/MethodDispacherIn=
terceptor.java	2008-01-03 02:27:56 UTC (rev 4953)
@@ -1,6 +1,5 @@
 package org.jboss.cache.interceptors;
 =

-import org.apache.commons.logging.Log;
 import org.jboss.cache.Fqn;
 import org.jboss.cache.InvocationContext;
 import org.jboss.cache.Node;
@@ -33,7 +32,6 @@
  * @author Mircea.Markus(a)jboss.com
  * @version 2.1.0
  *          todo - Refactor stuff in txint
- *          todo - revisit backward compatibility
  */
 public abstract class MethodDispacherInterceptor extends Interceptor
 {
@@ -52,7 +50,7 @@
     */
    public Object invoke(InvocationContext ctx) throws Throwable
    {
-      if (getLog() !=3D null && getLog().isTraceEnabled())
+      if (log.isTraceEnabled())
       {
          log.trace("Invoked with method call " + ctx.getMethodCall());
       }
@@ -275,11 +273,6 @@
    }
 =

    /**
-    * used for logging various steps. if null is returned than nothing is =
logged.
-    */
-   protected abstract Log getLog();
-
-   /**
     * Each interceptor should extend this if it does not need any processi=
ng for current call.
     * An sample usage would be: this interceptor is only interested if thr=
e is one transaction going on. If so all
     * handleXYZ would know that we have a transaction going and would not =
check its state.

Modified: core/trunk/src/main/java/org/jboss/cache/interceptors/Notificatio=
nInterceptor.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/java/org/jboss/cache/interceptors/NotificationInter=
ceptor.java	2008-01-03 01:58:38 UTC (rev 4952)
+++ core/trunk/src/main/java/org/jboss/cache/interceptors/NotificationInter=
ceptor.java	2008-01-03 02:27:56 UTC (rev 4953)
@@ -1,10 +1,8 @@
 package org.jboss.cache.interceptors;
 =

+import org.apache.commons.logging.LogFactory;
 import org.jboss.cache.InvocationContext;
 import org.jboss.cache.transaction.GlobalTransaction;
-import org.jboss.cache.marshall.MethodCall;
-import org.jboss.cache.marshall.MethodDeclarations;
-import org.apache.commons.logging.Log;
 =

 /**
  * The interceptor in charge of firing off notifications to cache listeners
@@ -14,11 +12,12 @@
  */
 public class NotificationInterceptor extends BaseTransactionalContextInter=
ceptor
 {
-   protected Log getLog()
+   public NotificationInterceptor()
    {
-      return null;
+      log =3D LogFactory.getLog(getClass());
    }
 =

+   @Override
    protected Object handleBlockChannelMethod(InvocationContext ctx) throws=
 Throwable
    {
       cache.getNotifier().notifyCacheBlocked(cache, true);
@@ -27,6 +26,7 @@
       return retVal;
    }
 =

+   @Override
    protected Object handleUnblockChannelMethod(InvocationContext ctx) thro=
ws Throwable
    {
       cache.getNotifier().notifyCacheUnblocked(cache, true);
@@ -35,6 +35,7 @@
       return retval;
    }
 =

+   @Override
    protected Object handleCommitMethod(InvocationContext ctx, GlobalTransa=
ction globalTransaction) throws Throwable
    {
       // notify commit
@@ -44,6 +45,7 @@
       return retval;
    }
 =

+   @Override
    protected Object handleRollbackMethod(InvocationContext ctx, GlobalTran=
saction globalTransaction) throws Throwable
    {
       Object retval =3D nextInterceptor(ctx);

Modified: core/trunk/src/main/java/org/jboss/cache/interceptors/OptimisticC=
reateIfNotExistsInterceptor.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/java/org/jboss/cache/interceptors/OptimisticCreateI=
fNotExistsInterceptor.java	2008-01-03 01:58:38 UTC (rev 4952)
+++ core/trunk/src/main/java/org/jboss/cache/interceptors/OptimisticCreateI=
fNotExistsInterceptor.java	2008-01-03 02:27:56 UTC (rev 4953)
@@ -46,54 +46,63 @@
       this.nodeFactory =3D nodeFactory;
    }
 =

+   @Override
    protected Object handlePutDataMethod(InvocationContext ctx, GlobalTrans=
action tx, Fqn fqn, Map data, boolean createUndoOps) throws Throwable
    {
       createNode(ctx, fqn, false);
       return nextInterceptor(ctx);
    }
 =

+   @Override
    protected Object handlePutDataEraseVersionedMethod(InvocationContext ct=
x, GlobalTransaction gtx, Fqn fqn, Map data, boolean createUndoOps, boolean=
 eraseContent, DataVersion dv) throws Throwable
    {
       createNode(ctx, fqn, false);
       return nextInterceptor(ctx);
    }
 =

+   @Override
    protected Object handlePutKeyValueMethod(InvocationContext ctx, GlobalT=
ransaction gtx, Fqn fqn, Object key, Object value, boolean createUndoOps) t=
hrows Throwable
    {
       createNode(ctx, fqn, false);
       return nextInterceptor(ctx);
    }
 =

+   @Override
    protected Object handlePutDataEraseMethod(InvocationContext ctx, Global=
Transaction gt, Fqn fqn, Map newData, boolean createUndoOps, boolean eraseC=
ontents) throws Throwable
    {
       createNode(ctx, fqn, false);
       return nextInterceptor(ctx);
    }
 =

+   @Override
    protected Object handlePutDataVersionedMethod(InvocationContext ctx, Gl=
obalTransaction globalTransaction, Fqn fqn, Map map, Boolean createUndoOps,=
 DataVersion dataVersion) throws Throwable
    {
       createNode(ctx, fqn, false);
       return nextInterceptor(ctx);
    }
 =

+   @Override
    protected Object handlePutKeyValueVersionedMethod(InvocationContext ctx=
, GlobalTransaction gtx, Fqn fqn, Object key, Object value, boolean createU=
ndoOps, DataVersion dv) throws Throwable
    {
       createNode(ctx, fqn, false);
       return nextInterceptor(ctx);
    }
 =

+   @Override
    protected Object handlePutForExternalReadMethod(InvocationContext ctx, =
GlobalTransaction tx, Fqn fqn, Object key, Object value) throws Throwable
    {
       createNode(ctx, fqn, false);
       return nextInterceptor(ctx);
    }
 =

+   @Override
    protected Object handlePutForExternalReadVersionedMethod(InvocationCont=
ext ctx, GlobalTransaction gtx, Fqn fqn, Object key, Object value, DataVers=
ion dv) throws Throwable
    {
       createNode(ctx, fqn, false);
       return nextInterceptor(ctx);
    }
 =

+   @Override
    protected Object handleMoveMethod(InvocationContext ctx, Fqn from, Fqn =
to) throws Throwable
    {
       List<Fqn> fqns =3D new ArrayList<Fqn>();
@@ -135,13 +144,6 @@
 =

       List<Fqn> nodesCreated =3D new ArrayList<Fqn>();
 =

-      // synchronize on the workspace so that more than one thread doesn't=
 attempt to put stuff into the workspace for
-      // the same transaction.  Isn't this unlikely though, given that eac=
h transaction would only occur in a single thread
-      // at a time?
-/*
-      synchronized (workspace)
-      {
-*/
       DataVersion version =3D null;
       if (ctx.getOptionOverrides() !=3D null && ctx.getOptionOverrides().g=
etDataVersion() !=3D null)
       {
@@ -272,8 +274,6 @@
          }
       }
 =

-      //}// end sync block
-
       if (!suppressNotification)
       {
          if (nodesCreated.size() > 0)

Modified: core/trunk/src/main/java/org/jboss/cache/interceptors/OptimisticI=
nterceptor.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/java/org/jboss/cache/interceptors/OptimisticInterce=
ptor.java	2008-01-03 01:58:38 UTC (rev 4952)
+++ core/trunk/src/main/java/org/jboss/cache/interceptors/OptimisticInterce=
ptor.java	2008-01-03 02:27:56 UTC (rev 4953)
@@ -6,7 +6,6 @@
  */
 package org.jboss.cache.interceptors;
 =

-import org.apache.commons.logging.Log;
 import org.jboss.cache.CacheException;
 import org.jboss.cache.Fqn;
 import org.jboss.cache.InvocationContext;
@@ -26,17 +25,12 @@
  *
  * @author <a href=3D"mailto:manik(a)jboss.org">Manik Surtani (manik(a)jbo=
ss.org)</a>
  */
-public class OptimisticInterceptor extends MethodDispacherInterceptor
+public abstract class OptimisticInterceptor extends MethodDispacherInterce=
ptor
 {
    protected TransactionManager txManager =3D null;
    protected TransactionTable txTable =3D null;
    protected boolean trace;
 =

-   protected Log getLog()
-   {
-      return null;
-   }
-
    @Inject
    private void injectDependencies(TransactionManager txManager, Transacti=
onTable txTable)
    {

Modified: core/trunk/src/main/java/org/jboss/cache/interceptors/OptimisticL=
ockingInterceptor.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/java/org/jboss/cache/interceptors/OptimisticLocking=
Interceptor.java	2008-01-03 01:58:38 UTC (rev 4952)
+++ core/trunk/src/main/java/org/jboss/cache/interceptors/OptimisticLocking=
Interceptor.java	2008-01-03 02:27:56 UTC (rev 4953)
@@ -34,13 +34,14 @@
 {
    private long lockAcquisitionTimeout;
 =

+   @Override
    public void setCache(CacheSPI cache)
    {
       super.setCache(cache);
       lockAcquisitionTimeout =3D cache.getConfiguration().getLockAcquisiti=
onTimeout();
    }
 =

-
+   @Override
    protected Object handleOptimisticPrepareMethod(InvocationContext ctx, G=
lobalTransaction gtx, List modifications, Map data, Address address, boolea=
n onePhaseCommit) throws Throwable
    {
       //try and acquire the locks - before passing on
@@ -96,16 +97,19 @@
       return nextInterceptor(ctx);
    }
 =

+   @Override
    protected Object handleCommitMethod(InvocationContext ctx, GlobalTransa=
ction globalTransaction) throws Throwable
    {
       return transactionFinalized(ctx);
    }
 =

+   @Override
    protected Object handleRollbackMethod(InvocationContext ctx, GlobalTran=
saction globalTransaction) throws Throwable
    {
       return transactionFinalized(ctx);
    }
 =

+   @Override
    protected Object handleLockMethod(InvocationContext ctx, Fqn fqn, NodeL=
ock.LockType lockType, boolean recursive)
    {
       // bail out if _lock() is being called on the tree cache... this sho=
uld never be called with o/l enabled.

Modified: core/trunk/src/main/java/org/jboss/cache/interceptors/OptimisticN=
odeInterceptor.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/java/org/jboss/cache/interceptors/OptimisticNodeInt=
erceptor.java	2008-01-03 01:58:38 UTC (rev 4952)
+++ core/trunk/src/main/java/org/jboss/cache/interceptors/OptimisticNodeInt=
erceptor.java	2008-01-03 02:27:56 UTC (rev 4953)
@@ -51,6 +51,7 @@
       this.nodeFactory =3D nodeFactory;
    }
 =

+   @Override
    public Object invoke(InvocationContext ctx) throws Throwable
    {
       MethodCall m =3D ctx.getMethodCall();

Modified: core/trunk/src/main/java/org/jboss/cache/interceptors/OptimisticR=
eplicationInterceptor.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/java/org/jboss/cache/interceptors/OptimisticReplica=
tionInterceptor.java	2008-01-03 01:58:38 UTC (rev 4952)
+++ core/trunk/src/main/java/org/jboss/cache/interceptors/OptimisticReplica=
tionInterceptor.java	2008-01-03 02:27:56 UTC (rev 4953)
@@ -6,7 +6,7 @@
  */
 package org.jboss.cache.interceptors;
 =

-import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.jboss.cache.CacheException;
 import org.jboss.cache.Fqn;
 import org.jboss.cache.InvocationContext;
@@ -47,10 +47,9 @@
    // we really just need a set here, but concurrent CopyOnWriteArraySet h=
as poor performance when writing.
    private final Set<GlobalTransaction> broadcastTxs =3D new ConcurrentHas=
hSet<GlobalTransaction>();
 =

-
-   protected Log getLog()
+   public OptimisticReplicationInterceptor()
    {
-      return log;
+      log =3D LogFactory.getLog(getClass());
    }
 =

    @Override

Modified: core/trunk/src/main/java/org/jboss/cache/interceptors/OptimisticV=
alidatorInterceptor.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/java/org/jboss/cache/interceptors/OptimisticValidat=
orInterceptor.java	2008-01-03 01:58:38 UTC (rev 4952)
+++ core/trunk/src/main/java/org/jboss/cache/interceptors/OptimisticValidat=
orInterceptor.java	2008-01-03 02:27:56 UTC (rev 4953)
@@ -47,6 +47,7 @@
 {
    private boolean useTombstones;
 =

+   @Override
    public void setCache(CacheSPI cache)
    {
       super.setCache(cache);
@@ -54,6 +55,7 @@
       useTombstones =3D (mode =3D=3D CacheMode.INVALIDATION_ASYNC) || (mod=
e =3D=3D CacheMode.INVALIDATION_SYNC);
    }
 =

+   @Override
    protected Object handleOptimisticPrepareMethod(InvocationContext ctx, G=
lobalTransaction gtx, List modifications, Map data, Address address, boolea=
n onePhaseCommit) throws Throwable
    {
       TransactionWorkspace workspace =3D getTransactionWorkspace(getGlobal=
Transaction(ctx));
@@ -90,7 +92,8 @@
             if (underlyingNode !=3D null && !underlyingNode.isValid())
             {
                // we havea  tombstone
-               if (!workspaceNode.isCreated() && !workspaceNode.isDeleted(=
)) throw new DataVersioningException("Underlying node doesn't exist but a t=
ombstone does; workspace node should be marked as created!");
+               if (!workspaceNode.isCreated() && !workspaceNode.isDeleted(=
))
+                  throw new DataVersioningException("Underlying node doesn=
't exist but a tombstone does; workspace node should be marked as created!"=
);
                if (underlyingNode.getVersion().newerThan(workspaceNode.get=
Version()))
                {
                   // we have an out of date node here
@@ -126,6 +129,7 @@
       return nextInterceptor(ctx);
    }
 =

+   @Override
    protected Object handleCommitMethod(InvocationContext ctx, GlobalTransa=
ction globalTransaction) throws Throwable
    {
       GlobalTransaction gtx =3D getGlobalTransaction(ctx);
@@ -235,6 +239,7 @@
       return nextInterceptor(ctx);
    }
 =

+   @Override
    protected Object handleRollbackMethod(InvocationContext ctx, GlobalTran=
saction globalTransaction) throws Throwable
    {
       TransactionWorkspace workspace;

Modified: core/trunk/src/main/java/org/jboss/cache/interceptors/Passivation=
Interceptor.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/java/org/jboss/cache/interceptors/PassivationInterc=
eptor.java	2008-01-03 01:58:38 UTC (rev 4952)
+++ core/trunk/src/main/java/org/jboss/cache/interceptors/PassivationInterc=
eptor.java	2008-01-03 02:27:56 UTC (rev 4953)
@@ -1,11 +1,11 @@
 package org.jboss.cache.interceptors;
 =

+import org.apache.commons.logging.LogFactory;
 import org.jboss.cache.CacheSPI;
 import org.jboss.cache.Fqn;
 import org.jboss.cache.InvocationContext;
 import org.jboss.cache.NodeSPI;
 import org.jboss.cache.loader.CacheLoader;
-import org.apache.commons.logging.Log;
 =

 import java.util.Collections;
 import java.util.HashMap;
@@ -25,19 +25,20 @@
    protected CacheLoader loader =3D null;
    private AtomicLong m_passivations =3D new AtomicLong(0);
 =

+   public PassivationInterceptor()
+   {
+      log =3D LogFactory.getLog(getClass());
+   }
+
+
    public void setCache(CacheSPI cache)
    {
       super.setCache(cache);
       this.loader =3D cache.getCacheLoaderManager().getCacheLoader();
    }
 =

-   protected Log getLog()
-   {
-      return null;
-   }
-
    /**
-    *  Notifies the cache instance listeners that the evicted node is abou=
t to
+    * Notifies the cache instance listeners that the evicted node is about=
 to
     * be passivated and stores the evicted node and its attributes back to=
 the
     * store using the CacheLoader.
     */

Modified: core/trunk/src/main/java/org/jboss/cache/interceptors/Pessimistic=
LockInterceptor.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/java/org/jboss/cache/interceptors/PessimisticLockIn=
terceptor.java	2008-01-03 01:58:38 UTC (rev 4952)
+++ core/trunk/src/main/java/org/jboss/cache/interceptors/PessimisticLockIn=
terceptor.java	2008-01-03 02:27:56 UTC (rev 4953)
@@ -6,7 +6,7 @@
  */
 package org.jboss.cache.interceptors;
 =

-import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.jboss.cache.CacheImpl;
 import org.jboss.cache.Fqn;
 import org.jboss.cache.InvocationContext;
@@ -59,6 +59,11 @@
    private Map<Thread, List<NodeLock>> lockTable;
    private long lock_acquisition_timeout;
 =

+   public PessimisticLockInterceptor()
+   {
+      log =3D LogFactory.getLog(getClass());
+   }
+
    @Inject
    public void injectDependencies(@ComponentName("LockTable")Map<Thread, L=
ist<NodeLock>> lockTable, Configuration configuration, CacheImpl cacheImpl,=
 TransactionTable txTable)
    {
@@ -68,11 +73,6 @@
       this.tx_table =3D txTable;
    }
 =

-   protected Log getLog()
-   {
-      return log;
-   }
-
    protected Object handlePutDataMethod(InvocationContext ctx, GlobalTrans=
action tx, Fqn fqn, Map data, boolean createUndoOps) throws Throwable
    {
       return handlePutMethod(ctx, fqn);

Modified: core/trunk/src/main/java/org/jboss/cache/interceptors/Replication=
Interceptor.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/java/org/jboss/cache/interceptors/ReplicationInterc=
eptor.java	2008-01-03 01:58:38 UTC (rev 4952)
+++ core/trunk/src/main/java/org/jboss/cache/interceptors/ReplicationInterc=
eptor.java	2008-01-03 02:27:56 UTC (rev 4953)
@@ -1,6 +1,6 @@
 package org.jboss.cache.interceptors;
 =

-import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.jboss.cache.Fqn;
 import org.jboss.cache.InvocationContext;
 import org.jboss.cache.config.Configuration;
@@ -24,13 +24,11 @@
  */
 public class ReplicationInterceptor extends BaseRpcInterceptor
 {
-
-   protected Log getLog()
+   public ReplicationInterceptor()
    {
-      return log;
+      log =3D LogFactory.getLog(getClass());
    }
 =

-
    protected boolean skipMethodCall(InvocationContext ctx)
    {
       Option optionOverride =3D ctx.getOptionOverrides();

Modified: core/trunk/src/main/java/org/jboss/cache/interceptors/TxIntercept=
or.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/java/org/jboss/cache/interceptors/TxInterceptor.jav=
a	2008-01-03 01:58:38 UTC (rev 4952)
+++ core/trunk/src/main/java/org/jboss/cache/interceptors/TxInterceptor.jav=
a	2008-01-03 02:27:56 UTC (rev 4953)
@@ -6,7 +6,7 @@
  */
 package org.jboss.cache.interceptors;
 =

-import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.jboss.cache.CacheException;
 import org.jboss.cache.Fqn;
 import org.jboss.cache.InvocationContext;
@@ -56,12 +56,11 @@
 =

    private long m_rollbacks =3D 0;
 =

-   protected Log getLog()
+   public TxInterceptor()
    {
-      return log;
+      log =3D LogFactory.getLog(getClass());
    }
 =

-
    @SuppressWarnings("unchecked")
    protected Object handleOptimisticPrepareMethod(InvocationContext ctx, G=
lobalTransaction gtx, List modifications, Map data, Address address, boolea=
n onePhaseCommit) throws Throwable
    {


--===============6608148377217246681==--

From jboss-qa-internal at redhat.com Thu Jan  3 01:19:48 2008
Content-Type: multipart/mixed; boundary="===============4595977333474384774=="
MIME-Version: 1.0
From: jboss-qa-internal at redhat.com
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] Hudson build became unstable:
 jboss-cache-1.4.X-jdk1.5 #49
Date: Thu, 03 Jan 2008 01:19:46 -0500
Message-ID: <21402430.10691199341186685.JavaMail.hudson@dev45.qa.atl2.redhat.com>

--===============4595977333474384774==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

See http://hudson.qa.jboss.com/hudson/job/jboss-cache-1.4.X-jdk1.5/49/chang=
es



--===============4595977333474384774==--

From jbosscache-commits at lists.jboss.org Thu Jan  3 01:51:03 2008
Content-Type: multipart/mixed; boundary="===============4426862342776582834=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r4954 - in
 cache-bench-fwk/trunk: cache-products/terracotta-2.5.0 and 1 other
 directories.
Date: Thu, 03 Jan 2008 01:51:03 -0500
Message-ID: <E1JAJux-00065K-Cm@committer01.frg.pub.inap.atl.jboss.com>

--===============4426862342776582834==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: mircea.markus
Date: 2008-01-03 01:51:03 -0500 (Thu, 03 Jan 2008)
New Revision: 4954

Modified:
   cache-bench-fwk/trunk/cache-products/terracotta-2.5.0/config.sh
   cache-bench-fwk/trunk/cache-products/terracotta-2.5.0/src/org/cachebench=
/cachewrappers/TerracottaWrapper.java
   cache-bench-fwk/trunk/runNode.sh
Log:
enhanced - added a new test that checks that caches that replications occur=
s as expected  + refactorings

Modified: cache-bench-fwk/trunk/cache-products/terracotta-2.5.0/config.sh
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- cache-bench-fwk/trunk/cache-products/terracotta-2.5.0/config.sh	2008-01=
-03 02:27:56 UTC (rev 4953)
+++ cache-bench-fwk/trunk/cache-products/terracotta-2.5.0/config.sh	2008-01=
-03 06:51:03 UTC (rev 4954)
@@ -3,7 +3,7 @@
 TC_HOME=3D"/cygdrive/c/java/terracotta-2.5.0"
 CLASSPATH=3D$CLASSPATH:./classes/production/terracotta-2.5.0
 SYS_PROPS=3D"$SYS_PROPS -Dtc.config=3D$THIS_DIR/tc-client-config.xml"
-export START_NODE_COMMAND=3D"$TC_HOME/bin/dso-java.sh -cp $CLASSPATH $SYS_=
PROPS org.cachebench.CacheBenchmarkRunner"
+#export START_NODE_COMMAND=3D"$TC_HOME/bin/dso-java.sh -cp $CLASSPATH $SYS=
_PROPS org.cachebench.CacheBenchmarkRunner"
 =

 =

 export START_NODE_COMMAND=3D"java -Dtc.install-root=3D${TC_HOME} -Xbootcla=
sspath/p:${TC_HOME}/lib/dso-boot/dso-boot-hotspot_win32_150_14.jar $SYS_PRO=
PS -cp $CLASSPATH org.cachebench.CacheBenchmarkRunner"
\ No newline at end of file

Modified: cache-bench-fwk/trunk/cache-products/terracotta-2.5.0/src/org/cac=
hebench/cachewrappers/TerracottaWrapper.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- cache-bench-fwk/trunk/cache-products/terracotta-2.5.0/src/org/cachebenc=
h/cachewrappers/TerracottaWrapper.java	2008-01-03 02:27:56 UTC (rev 4953)
+++ cache-bench-fwk/trunk/cache-products/terracotta-2.5.0/src/org/cachebenc=
h/cachewrappers/TerracottaWrapper.java	2008-01-03 06:51:03 UTC (rev 4954)
@@ -2,7 +2,6 @@
 =

 import org.cachebench.CacheWrapper;
 =

-import java.util.Properties;
 import java.util.Map;
 import java.util.HashMap;
 =

@@ -18,10 +17,15 @@
    // Since terracotta =

    private final Map cache =3D new HashMap();
 =

-   public void init(Properties parameters) throws Exception
+   public void init(Map parameters) throws Exception
    {
    }
 =

+   public Object getReplicatedData(String key) throws Exception
+   {
+      return get(key);
+   }
+
    public void setUp() throws Exception
    {
    }
@@ -70,4 +74,5 @@
          return "There are " + cache.size() + " objects in cache";
       }
    }
+
 }

Modified: cache-bench-fwk/trunk/runNode.sh
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- cache-bench-fwk/trunk/runNode.sh	2008-01-03 02:27:56 UTC (rev 4953)
+++ cache-bench-fwk/trunk/runNode.sh	2008-01-03 06:51:03 UTC (rev 4954)
@@ -7,7 +7,7 @@
 CACHE_DEBUG=3Dtrue
 preferIPv4Stack=3Dtrue
 =

-if [ -z $1]
+if [ -z $1 ]
 then
    echo "Usage:"
    echo "     ./runNode.sh currentNodeIndex testConfig [other params]"


--===============4426862342776582834==--

From jbosscache-commits at lists.jboss.org Thu Jan  3 02:05:04 2008
Content-Type: multipart/mixed; boundary="===============3551703396153125216=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r4955 -
 cache-bench-fwk/trunk/conf.
Date: Thu, 03 Jan 2008 02:05:04 -0500
Message-ID: <E1JAK8W-0000GY-0a@committer01.frg.pub.inap.atl.jboss.com>

--===============3551703396153125216==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: mircea.markus
Date: 2008-01-03 02:05:03 -0500 (Thu, 03 Jan 2008)
New Revision: 4955

Removed:
   cache-bench-fwk/trunk/conf/cachebench-coherence.xml
   cache-bench-fwk/trunk/conf/cachebench-jbc-async.xml
   cache-bench-fwk/trunk/conf/cachebench-jbc-br-async.xml
   cache-bench-fwk/trunk/conf/cachebench-jbc-br.xml
   cache-bench-fwk/trunk/conf/cachebench-jbc-sync.xml
Log:
removed other onfig files as they are utdated

Deleted: cache-bench-fwk/trunk/conf/cachebench-coherence.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- cache-bench-fwk/trunk/conf/cachebench-coherence.xml	2008-01-03 06:51:03=
 UTC (rev 4954)
+++ cache-bench-fwk/trunk/conf/cachebench-coherence.xml	2008-01-03 07:05:03=
 UTC (rev 4955)
@@ -1,73 +0,0 @@
-<!--
-	Configures and controls the behaviour of the cache benchmarking framework.
-
-	sampleSize - this is the number of putsgets to be performed, an average i=
s used in metrics.
-	gcBetweenTestsEnabled - if true, the framework pauses between each test a=
nd requests System.gc() - use this if you find yourself running out of mem!
-	sleepBetweenTests - ms to sleep between tests.  useful to allow the JVM s=
ome time to do a gc
-	emptyCacheBetweenTests - again, use if you're running out of mem.
-	numThreads - the number of executor threads to use to perform the require=
d number of operations.  =

--->
-<cachebench sampleSize=3D"100000" gcBetweenTestsEnabled=3D"true" sleepBetw=
eenTests=3D"1000" emptyCacheBetweenTests=3D"true" numThreads=3D"10">
-
-	<!-- Each testcase represents either a single configuration or a cacheing=
 product.
-		  =

-		 For example, WhirlyCache would be one test case. JBossCache-standalone =
could be another, JBossCache-replicated could be yet another =

-		 =

-		 See the javadoc for org.cachebench.CacheWrapper for the cacheWrapper pr=
operty
-		 -->
-
-   <!--
-      Note that if you are using REPLICATED tests, using the "ant runSlave=
" command, you can only run one test at a time.
-      Otherwise, if you are using the test in standalone mode (testing a L=
OCAL cache), you can add multiple "testcase" elements.
-   -->
-
-   <!-- Make SURE you read the docs - especially when using Terracotta as =
this involves some additional setup -->
-
-   <!-- Legacy stuff -->
-   <!--<testcase name=3D"JBossCache140-Pessimistic-REPL_SYNC" cacheWrapper=
=3D"org.cachebench.cachewrappers.JBossCacheWrapper">-->
-   <!--<testcase name=3D"EHCache124-replicated" cacheWrapper=3D"org.cacheb=
ench.cachewrappers.EHCacheWrapper">-->
-   <!--<testcase name=3D"Terracotta230" cacheWrapper=3D"org.cachebench.cac=
hewrappers.TerracottaWrapper">-->
-
-
-    <!--<testcase name=3D"JBossCache2x-Pessimistic-REPL_SYNC_BR" cacheWrap=
per=3D"org.cachebench.cachewrappers.JBossCache200Wrapper">-->
-    <!--<testcase name=3D"JBossCache2x-Pessimistic-REPL_ASYNC" cacheWrappe=
r=3D"org.cachebench.cachewrappers.JBossCache200Wrapper">-->
-    <testcase name=3D"Coherence-3.x" cacheWrapper=3D"org.cachebench.cachew=
rappers.CoherenceWrapper">
-
-      <!--
-         * The "name" attrib is just used for display in the reports.
-         * You can write your own custom testClass.
-         * weight is currently unused.
-      -->
-      <test name=3D"Strings" testClass=3D"org.cachebench.tests.StringTest"=
 weight=3D"2.0" />
-
-       <!--
-      <test name=3D"Primitive Wrappers" testClass=3D"org.cachebench.tests.=
PrimitiveTest" weight=3D"1.0" />
-		<test name=3D"Custom Class Types" testClass=3D"org.cachebench.tests.Cust=
omClassTest" weight=3D"1.0" />
-		<test name=3D"Custom Subclasses of Abstracts" testClass=3D"org.cachebenc=
h.tests.SubclassTest" weight=3D"1.5" />
-		<test name=3D"Custom Types With Transients" testClass=3D"org.cachebench.=
tests.TransientTest" weight=3D"1.0" />
-		<test name=3D"Custom Types With Statics" testClass=3D"org.cachebench.tes=
ts.StaticsTest" weight=3D"1.5" />
-		<test name=3D"Custom Types With Associations" testClass=3D"org.cachebenc=
h.tests.AssociationsTest" weight=3D"2.0" />
-		-->
-
-		<!-- arbitrary params may be passed into the cacheWrapper implementation=
, typically used to pass in config files for the cache product. -->
-      <!-- JBoss Cache 1.4.x and 2.x -->
-      <param name=3D"config" value=3D"pess-repl-sync-br.xml" />       =

-      <!--<param name=3D"config" value=3D"pess-repl-async.xml" />-->
-
-      <!-- EHCache -->
-      <!--<param name=3D"config" value=3D"ehcache-repl-sync.xml" />-->
-
-      <!-- Terracotta -->
-      <!--<param name=3D"config" value=3D"tc-config-pojo.xml" />-->
-   </testcase>
-
-
-	<!-- Currently we only have a CSVReportGenerator.  See javadocs for org.c=
achebench.reportgenerators.ReportGenerator for writing your
-		own report generators such as XML generators, graphic generators, etc -->
-
-   <!-- The CSV report generated can be plugged in to a spreadsheet to gen=
erate graphs, etc. -->
-   <report
-		outputFile=3D"performance.csv"
-		generator=3D"org.cachebench.reportgenerators.CSVReportGenerator" />
-		=

-</cachebench>

Deleted: cache-bench-fwk/trunk/conf/cachebench-jbc-async.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- cache-bench-fwk/trunk/conf/cachebench-jbc-async.xml	2008-01-03 06:51:03=
 UTC (rev 4954)
+++ cache-bench-fwk/trunk/conf/cachebench-jbc-async.xml	2008-01-03 07:05:03=
 UTC (rev 4955)
@@ -1,73 +0,0 @@
-<!--
-	Configures and controls the behaviour of the cache benchmarking framework.
-
-	sampleSize - this is the number of putsgets to be performed, an average i=
s used in metrics.
-	gcBetweenTestsEnabled - if true, the framework pauses between each test a=
nd requests System.gc() - use this if you find yourself running out of mem!
-	sleepBetweenTests - ms to sleep between tests.  useful to allow the JVM s=
ome time to do a gc
-	emptyCacheBetweenTests - again, use if you're running out of mem.
-	numThreads - the number of executor threads to use to perform the require=
d number of operations.  =

--->
-<cachebench sampleSize=3D"100000" gcBetweenTestsEnabled=3D"true" sleepBetw=
eenTests=3D"1000" emptyCacheBetweenTests=3D"true" numThreads=3D"10">
-
-	<!-- Each testcase represents either a single configuration or a cacheing=
 product.
-		  =

-		 For example, WhirlyCache would be one test case. JBossCache-standalone =
could be another, JBossCache-replicated could be yet another =

-		 =

-		 See the javadoc for org.cachebench.CacheWrapper for the cacheWrapper pr=
operty
-		 -->
-
-   <!--
-      Note that if you are using REPLICATED tests, using the "ant runSlave=
" command, you can only run one test at a time.
-      Otherwise, if you are using the test in standalone mode (testing a L=
OCAL cache), you can add multiple "testcase" elements.
-   -->
-
-   <!-- Make SURE you read the docs - especially when using Terracotta as =
this involves some additional setup -->
-
-   <!-- Legacy stuff -->
-   <!--<testcase name=3D"JBossCache140-Pessimistic-REPL_SYNC" cacheWrapper=
=3D"org.cachebench.cachewrappers.JBossCacheWrapper">-->
-   <!--<testcase name=3D"EHCache124-replicated" cacheWrapper=3D"org.cacheb=
ench.cachewrappers.EHCacheWrapper">-->
-   <!--<testcase name=3D"Terracotta230" cacheWrapper=3D"org.cachebench.cac=
hewrappers.TerracottaWrapper">-->
-
-
-    <testcase name=3D"JBossCache2x-Pessimistic-REPL_SYNC_BR" cacheWrapper=
=3D"org.cachebench.cachewrappers.JBossCache200Wrapper">
-    <!--<testcase name=3D"JBossCache2x-Pessimistic-REPL_ASYNC" cacheWrappe=
r=3D"org.cachebench.cachewrappers.JBossCache200Wrapper">-->
-    <!--<testcase name=3D"Coherence-3.x" cacheWrapper=3D"org.cachebench.ca=
chewrappers.CoherenceWrapper">-->
-
-      <!--
-         * The "name" attrib is just used for display in the reports.
-         * You can write your own custom testClass.
-         * weight is currently unused.
-      -->
-      <test name=3D"Strings" testClass=3D"org.cachebench.tests.StringTest"=
 weight=3D"2.0" />
-
-       <!--
-      <test name=3D"Primitive Wrappers" testClass=3D"org.cachebench.tests.=
PrimitiveTest" weight=3D"1.0" />
-		<test name=3D"Custom Class Types" testClass=3D"org.cachebench.tests.Cust=
omClassTest" weight=3D"1.0" />
-		<test name=3D"Custom Subclasses of Abstracts" testClass=3D"org.cachebenc=
h.tests.SubclassTest" weight=3D"1.5" />
-		<test name=3D"Custom Types With Transients" testClass=3D"org.cachebench.=
tests.TransientTest" weight=3D"1.0" />
-		<test name=3D"Custom Types With Statics" testClass=3D"org.cachebench.tes=
ts.StaticsTest" weight=3D"1.5" />
-		<test name=3D"Custom Types With Associations" testClass=3D"org.cachebenc=
h.tests.AssociationsTest" weight=3D"2.0" />
-		-->
-
-		<!-- arbitrary params may be passed into the cacheWrapper implementation=
, typically used to pass in config files for the cache product. -->
-      <!-- JBoss Cache 1.4.x and 2.x -->
-      <!--<param name=3D"config" value=3D"pess-repl-sync-br.xml" />       =
-->
-      <param name=3D"config" value=3D"pess-repl-async.xml" />
-
-      <!-- EHCache -->
-      <!--<param name=3D"config" value=3D"ehcache-repl-sync.xml" />-->
-
-      <!-- Terracotta -->
-      <!--<param name=3D"config" value=3D"tc-config-pojo.xml" />-->
-   </testcase>
-
-
-	<!-- Currently we only have a CSVReportGenerator.  See javadocs for org.c=
achebench.reportgenerators.ReportGenerator for writing your
-		own report generators such as XML generators, graphic generators, etc -->
-
-   <!-- The CSV report generated can be plugged in to a spreadsheet to gen=
erate graphs, etc. -->
-   <report
-		outputFile=3D"performance.csv"
-		generator=3D"org.cachebench.reportgenerators.CSVReportGenerator" />
-		=

-</cachebench>

Deleted: cache-bench-fwk/trunk/conf/cachebench-jbc-br-async.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- cache-bench-fwk/trunk/conf/cachebench-jbc-br-async.xml	2008-01-03 06:51=
:03 UTC (rev 4954)
+++ cache-bench-fwk/trunk/conf/cachebench-jbc-br-async.xml	2008-01-03 07:05=
:03 UTC (rev 4955)
@@ -1,73 +0,0 @@
-<!--
-	Configures and controls the behaviour of the cache benchmarking framework.
-
-	sampleSize - this is the number of putsgets to be performed, an average i=
s used in metrics.
-	gcBetweenTestsEnabled - if true, the framework pauses between each test a=
nd requests System.gc() - use this if you find yourself running out of mem!
-	sleepBetweenTests - ms to sleep between tests.  useful to allow the JVM s=
ome time to do a gc
-	emptyCacheBetweenTests - again, use if you're running out of mem.
-	numThreads - the number of executor threads to use to perform the require=
d number of operations.  =

--->
-<cachebench sampleSize=3D"100000" gcBetweenTestsEnabled=3D"true" sleepBetw=
eenTests=3D"1000" emptyCacheBetweenTests=3D"true" numThreads=3D"10">
-
-	<!-- Each testcase represents either a single configuration or a cacheing=
 product.
-		  =

-		 For example, WhirlyCache would be one test case. JBossCache-standalone =
could be another, JBossCache-replicated could be yet another =

-		 =

-		 See the javadoc for org.cachebench.CacheWrapper for the cacheWrapper pr=
operty
-		 -->
-
-   <!--
-      Note that if you are using REPLICATED tests, using the "ant runSlave=
" command, you can only run one test at a time.
-      Otherwise, if you are using the test in standalone mode (testing a L=
OCAL cache), you can add multiple "testcase" elements.
-   -->
-
-   <!-- Make SURE you read the docs - especially when using Terracotta as =
this involves some additional setup -->
-
-   <!-- Legacy stuff -->
-   <!--<testcase name=3D"JBossCache140-Pessimistic-REPL_SYNC" cacheWrapper=
=3D"org.cachebench.cachewrappers.JBossCacheWrapper">-->
-   <!--<testcase name=3D"EHCache124-replicated" cacheWrapper=3D"org.cacheb=
ench.cachewrappers.EHCacheWrapper">-->
-   <!--<testcase name=3D"Terracotta230" cacheWrapper=3D"org.cachebench.cac=
hewrappers.TerracottaWrapper">-->
-
-
-    <!--<testcase name=3D"JBossCache2x-Pessimistic-REPL_SYNC_BR" cacheWrap=
per=3D"org.cachebench.cachewrappers.JBossCache200Wrapper">-->
-    <testcase name=3D"JBossCache2x-Pessimistic-REPL_ASYNC" cacheWrapper=3D=
"org.cachebench.cachewrappers.JBossCache200Wrapper">
-    <!--<testcase name=3D"Coherence-3.x" cacheWrapper=3D"org.cachebench.ca=
chewrappers.CoherenceWrapper">-->
-
-      <!--
-         * The "name" attrib is just used for display in the reports.
-         * You can write your own custom testClass.
-         * weight is currently unused.
-      -->
-      <test name=3D"Strings" testClass=3D"org.cachebench.tests.StringTest"=
 weight=3D"2.0" />
-
-       <!--
-      <test name=3D"Primitive Wrappers" testClass=3D"org.cachebench.tests.=
PrimitiveTest" weight=3D"1.0" />
-		<test name=3D"Custom Class Types" testClass=3D"org.cachebench.tests.Cust=
omClassTest" weight=3D"1.0" />
-		<test name=3D"Custom Subclasses of Abstracts" testClass=3D"org.cachebenc=
h.tests.SubclassTest" weight=3D"1.5" />
-		<test name=3D"Custom Types With Transients" testClass=3D"org.cachebench.=
tests.TransientTest" weight=3D"1.0" />
-		<test name=3D"Custom Types With Statics" testClass=3D"org.cachebench.tes=
ts.StaticsTest" weight=3D"1.5" />
-		<test name=3D"Custom Types With Associations" testClass=3D"org.cachebenc=
h.tests.AssociationsTest" weight=3D"2.0" />
-		-->
-
-		<!-- arbitrary params may be passed into the cacheWrapper implementation=
, typically used to pass in config files for the cache product. -->
-      <!-- JBoss Cache 1.4.x and 2.x -->
-      <!--<param name=3D"config" value=3D"pess-repl-sync-br.xml" />       =
-->
-      <param name=3D"config" value=3D"pess-repl-async-br.xml" />
-
-      <!-- EHCache -->
-      <!--<param name=3D"config" value=3D"ehcache-repl-sync.xml" />-->
-
-      <!-- Terracotta -->
-      <!--<param name=3D"config" value=3D"tc-config-pojo.xml" />-->
-   </testcase>
-
-
-	<!-- Currently we only have a CSVReportGenerator.  See javadocs for org.c=
achebench.reportgenerators.ReportGenerator for writing your
-		own report generators such as XML generators, graphic generators, etc -->
-
-   <!-- The CSV report generated can be plugged in to a spreadsheet to gen=
erate graphs, etc. -->
-   <report
-		outputFile=3D"performance.csv"
-		generator=3D"org.cachebench.reportgenerators.CSVReportGenerator" />
-		=

-</cachebench>

Deleted: cache-bench-fwk/trunk/conf/cachebench-jbc-br.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- cache-bench-fwk/trunk/conf/cachebench-jbc-br.xml	2008-01-03 06:51:03 UT=
C (rev 4954)
+++ cache-bench-fwk/trunk/conf/cachebench-jbc-br.xml	2008-01-03 07:05:03 UT=
C (rev 4955)
@@ -1,73 +0,0 @@
-<!--
-	Configures and controls the behaviour of the cache benchmarking framework.
-
-	sampleSize - this is the number of putsgets to be performed, an average i=
s used in metrics.
-	gcBetweenTestsEnabled - if true, the framework pauses between each test a=
nd requests System.gc() - use this if you find yourself running out of mem!
-	sleepBetweenTests - ms to sleep between tests.  useful to allow the JVM s=
ome time to do a gc
-	emptyCacheBetweenTests - again, use if you're running out of mem.
-	numThreads - the number of executor threads to use to perform the require=
d number of operations.  =

--->
-<cachebench sampleSize=3D"100000" gcBetweenTestsEnabled=3D"true" sleepBetw=
eenTests=3D"1000" emptyCacheBetweenTests=3D"true" numThreads=3D"10">
-
-	<!-- Each testcase represents either a single configuration or a cacheing=
 product.
-		  =

-		 For example, WhirlyCache would be one test case. JBossCache-standalone =
could be another, JBossCache-replicated could be yet another =

-		 =

-		 See the javadoc for org.cachebench.CacheWrapper for the cacheWrapper pr=
operty
-		 -->
-
-   <!--
-      Note that if you are using REPLICATED tests, using the "ant runSlave=
" command, you can only run one test at a time.
-      Otherwise, if you are using the test in standalone mode (testing a L=
OCAL cache), you can add multiple "testcase" elements.
-   -->
-
-   <!-- Make SURE you read the docs - especially when using Terracotta as =
this involves some additional setup -->
-
-   <!-- Legacy stuff -->
-   <!--<testcase name=3D"JBossCache140-Pessimistic-REPL_SYNC" cacheWrapper=
=3D"org.cachebench.cachewrappers.JBossCacheWrapper">-->
-   <!--<testcase name=3D"EHCache124-replicated" cacheWrapper=3D"org.cacheb=
ench.cachewrappers.EHCacheWrapper">-->
-   <!--<testcase name=3D"Terracotta230" cacheWrapper=3D"org.cachebench.cac=
hewrappers.TerracottaWrapper">-->
-
-
-    <!--<testcase name=3D"JBossCache2x-Pessimistic-REPL_SYNC_BR" cacheWrap=
per=3D"org.cachebench.cachewrappers.JBossCache200Wrapper">-->
-    <testcase name=3D"JBossCache2x-Pessimistic-REPL_ASYNC" cacheWrapper=3D=
"org.cachebench.cachewrappers.JBossCache200Wrapper">
-    <!--<testcase name=3D"Coherence-3.x" cacheWrapper=3D"org.cachebench.ca=
chewrappers.CoherenceWrapper">-->
-
-      <!--
-         * The "name" attrib is just used for display in the reports.
-         * You can write your own custom testClass.
-         * weight is currently unused.
-      -->
-      <test name=3D"Strings" testClass=3D"org.cachebench.tests.StringTest"=
 weight=3D"2.0" />
-
-       <!--
-      <test name=3D"Primitive Wrappers" testClass=3D"org.cachebench.tests.=
PrimitiveTest" weight=3D"1.0" />
-		<test name=3D"Custom Class Types" testClass=3D"org.cachebench.tests.Cust=
omClassTest" weight=3D"1.0" />
-		<test name=3D"Custom Subclasses of Abstracts" testClass=3D"org.cachebenc=
h.tests.SubclassTest" weight=3D"1.5" />
-		<test name=3D"Custom Types With Transients" testClass=3D"org.cachebench.=
tests.TransientTest" weight=3D"1.0" />
-		<test name=3D"Custom Types With Statics" testClass=3D"org.cachebench.tes=
ts.StaticsTest" weight=3D"1.5" />
-		<test name=3D"Custom Types With Associations" testClass=3D"org.cachebenc=
h.tests.AssociationsTest" weight=3D"2.0" />
-		-->
-
-		<!-- arbitrary params may be passed into the cacheWrapper implementation=
, typically used to pass in config files for the cache product. -->
-      <!-- JBoss Cache 1.4.x and 2.x -->
-      <param name=3D"config" value=3D"pess-repl-sync-br.xml" />
-      <!--<param name=3D"config" value=3D"pess-repl-async.xml" />-->
-
-      <!-- EHCache -->
-      <!--<param name=3D"config" value=3D"ehcache-repl-sync.xml" />-->
-
-      <!-- Terracotta -->
-      <!--<param name=3D"config" value=3D"tc-config-pojo.xml" />-->
-   </testcase>
-
-
-	<!-- Currently we only have a CSVReportGenerator.  See javadocs for org.c=
achebench.reportgenerators.ReportGenerator for writing your
-		own report generators such as XML generators, graphic generators, etc -->
-
-   <!-- The CSV report generated can be plugged in to a spreadsheet to gen=
erate graphs, etc. -->
-   <report
-		outputFile=3D"performance.csv"
-		generator=3D"org.cachebench.reportgenerators.CSVReportGenerator" />
-		=

-</cachebench>

Deleted: cache-bench-fwk/trunk/conf/cachebench-jbc-sync.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- cache-bench-fwk/trunk/conf/cachebench-jbc-sync.xml	2008-01-03 06:51:03 =
UTC (rev 4954)
+++ cache-bench-fwk/trunk/conf/cachebench-jbc-sync.xml	2008-01-03 07:05:03 =
UTC (rev 4955)
@@ -1,73 +0,0 @@
-<!--
-	Configures and controls the behaviour of the cache benchmarking framework.
-
-	sampleSize - this is the number of putsgets to be performed, an average i=
s used in metrics.
-	gcBetweenTestsEnabled - if true, the framework pauses between each test a=
nd requests System.gc() - use this if you find yourself running out of mem!
-	sleepBetweenTests - ms to sleep between tests.  useful to allow the JVM s=
ome time to do a gc
-	emptyCacheBetweenTests - again, use if you're running out of mem.
-	numThreads - the number of executor threads to use to perform the require=
d number of operations.  =

--->
-<cachebench sampleSize=3D"100000" gcBetweenTestsEnabled=3D"true" sleepBetw=
eenTests=3D"1000" emptyCacheBetweenTests=3D"true" numThreads=3D"10">
-
-	<!-- Each testcase represents either a single configuration or a cacheing=
 product.
-		  =

-		 For example, WhirlyCache would be one test case. JBossCache-standalone =
could be another, JBossCache-replicated could be yet another =

-		 =

-		 See the javadoc for org.cachebench.CacheWrapper for the cacheWrapper pr=
operty
-		 -->
-
-   <!--
-      Note that if you are using REPLICATED tests, using the "ant runSlave=
" command, you can only run one test at a time.
-      Otherwise, if you are using the test in standalone mode (testing a L=
OCAL cache), you can add multiple "testcase" elements.
-   -->
-
-   <!-- Make SURE you read the docs - especially when using Terracotta as =
this involves some additional setup -->
-
-   <!-- Legacy stuff -->
-   <!--<testcase name=3D"JBossCache140-Pessimistic-REPL_SYNC" cacheWrapper=
=3D"org.cachebench.cachewrappers.JBossCacheWrapper">-->
-   <!--<testcase name=3D"EHCache124-replicated" cacheWrapper=3D"org.cacheb=
ench.cachewrappers.EHCacheWrapper">-->
-   <!--<testcase name=3D"Terracotta230" cacheWrapper=3D"org.cachebench.cac=
hewrappers.TerracottaWrapper">-->
-
-
-    <testcase name=3D"JBossCache2x-Pessimistic-REPL_SYNC_BR" cacheWrapper=
=3D"org.cachebench.cachewrappers.JBossCache200Wrapper">
-    <!--<testcase name=3D"JBossCache2x-Pessimistic-REPL_ASYNC" cacheWrappe=
r=3D"org.cachebench.cachewrappers.JBossCache200Wrapper">-->
-    <!--<testcase name=3D"Coherence-3.x" cacheWrapper=3D"org.cachebench.ca=
chewrappers.CoherenceWrapper">-->
-
-      <!--
-         * The "name" attrib is just used for display in the reports.
-         * You can write your own custom testClass.
-         * weight is currently unused.
-      -->
-      <test name=3D"Strings" testClass=3D"org.cachebench.tests.StringTest"=
 weight=3D"2.0" />
-
-       <!--
-      <test name=3D"Primitive Wrappers" testClass=3D"org.cachebench.tests.=
PrimitiveTest" weight=3D"1.0" />
-		<test name=3D"Custom Class Types" testClass=3D"org.cachebench.tests.Cust=
omClassTest" weight=3D"1.0" />
-		<test name=3D"Custom Subclasses of Abstracts" testClass=3D"org.cachebenc=
h.tests.SubclassTest" weight=3D"1.5" />
-		<test name=3D"Custom Types With Transients" testClass=3D"org.cachebench.=
tests.TransientTest" weight=3D"1.0" />
-		<test name=3D"Custom Types With Statics" testClass=3D"org.cachebench.tes=
ts.StaticsTest" weight=3D"1.5" />
-		<test name=3D"Custom Types With Associations" testClass=3D"org.cachebenc=
h.tests.AssociationsTest" weight=3D"2.0" />
-		-->
-
-		<!-- arbitrary params may be passed into the cacheWrapper implementation=
, typically used to pass in config files for the cache product. -->
-      <!-- JBoss Cache 1.4.x and 2.x -->
-      <param name=3D"config" value=3D"pess-repl-sync.xml" />       =

-      <!--<param name=3D"config" value=3D"pess-repl-async.xml" />-->
-
-      <!-- EHCache -->
-      <!--<param name=3D"config" value=3D"ehcache-repl-sync.xml" />-->
-
-      <!-- Terracotta -->
-      <!--<param name=3D"config" value=3D"tc-config-pojo.xml" />-->
-   </testcase>
-
-
-	<!-- Currently we only have a CSVReportGenerator.  See javadocs for org.c=
achebench.reportgenerators.ReportGenerator for writing your
-		own report generators such as XML generators, graphic generators, etc -->
-
-   <!-- The CSV report generated can be plugged in to a spreadsheet to gen=
erate graphs, etc. -->
-   <report
-		outputFile=3D"performance.csv"
-		generator=3D"org.cachebench.reportgenerators.CSVReportGenerator" />
-		=

-</cachebench>


--===============3551703396153125216==--

From jbosscache-commits at lists.jboss.org Thu Jan  3 02:17:39 2008
Content-Type: multipart/mixed; boundary="===============5617275190714137524=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r4956 -
 cache-bench-fwk/trunk/conf.
Date: Thu, 03 Jan 2008 02:17:38 -0500
Message-ID: <E1JAKKg-0002g8-Uy@committer01.frg.pub.inap.atl.jboss.com>

--===============5617275190714137524==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: mircea.markus
Date: 2008-01-03 02:17:38 -0500 (Thu, 03 Jan 2008)
New Revision: 4956

Modified:
   cache-bench-fwk/trunk/conf/cachebench.xml
Log:
removed other onfig files as they are utdated

Modified: cache-bench-fwk/trunk/conf/cachebench.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- cache-bench-fwk/trunk/conf/cachebench.xml	2008-01-03 07:05:03 UTC (rev =
4955)
+++ cache-bench-fwk/trunk/conf/cachebench.xml	2008-01-03 07:17:38 UTC (rev =
4956)
@@ -46,7 +46,7 @@
       <!-- warms up the cache by doing operation on it; simulates a real-w=
orld environment. If no warmup is needed use
       org.cachebench.warmup.NoCacheWarmup
       -->
-      <warmup warmupClass=3D"org.cachebench.warmup.NoCacheWarmup">
+      <warmup warmupClass=3D"org.cachebench.warmup.PutGetCacheWarmup">
          <param name=3D"operationCount" value=3D"100"/>
       </warmup>
 =



--===============5617275190714137524==--

From jbosscache-commits at lists.jboss.org Thu Jan  3 02:48:53 2008
Content-Type: multipart/mixed; boundary="===============0475396500354997251=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r4957 -
 cache-bench-fwk/trunk/conf.
Date: Thu, 03 Jan 2008 02:48:53 -0500
Message-ID: <E1JAKov-0008Ot-Jc@committer01.frg.pub.inap.atl.jboss.com>

--===============0475396500354997251==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: mircea.markus
Date: 2008-01-03 02:48:53 -0500 (Thu, 03 Jan 2008)
New Revision: 4957

Modified:
   cache-bench-fwk/trunk/conf/log4j.xml
Log:
removed other onfig files as they are utdated

Modified: cache-bench-fwk/trunk/conf/log4j.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- cache-bench-fwk/trunk/conf/log4j.xml	2008-01-03 07:17:38 UTC (rev 4956)
+++ cache-bench-fwk/trunk/conf/log4j.xml	2008-01-03 07:48:53 UTC (rev 4957)
@@ -43,22 +43,11 @@
     </category>
 =

     <category name=3D"org.cachebench" additivity=3D"false">
-        <priority value=3D"DEBUG"/>
-        <appender-ref ref=3D"FILE"/>
-        <appender-ref ref=3D"CONSOLE"/>
-    </category>
-
-    <category name=3D"org.cachebench.cluster" additivity=3D"false">
         <priority value=3D"INFO"/>
         <appender-ref ref=3D"FILE"/>
         <appender-ref ref=3D"CONSOLE"/>
     </category>
 =

-    <category name=3D"org.cachebench.tests" additivity=3D"false">
-        <priority value=3D"INFO"/>
-        <appender-ref ref=3D"CONSOLE"/>
-    </category>
-
     <category name=3D"net.sf.ehcache" additivity=3D"false">
         <priority value=3D"DEBUG"/>
         <appender-ref ref=3D"FILE"/>
@@ -79,11 +68,6 @@
         <appender-ref ref=3D"FILE"/>
     </category>
    =

-   <category name=3D"org.cachebench.tests.ReplicationOccursTest" additivit=
y=3D"false">
-        <priority value=3D"TRACE"/>
-        <appender-ref ref=3D"CONSOLE"/>
-    </category>
-
    <category name=3D"org.jboss.cache">
         <priority value=3D"WARN"/>
         <appender-ref ref=3D"FILE"/>


--===============0475396500354997251==--

From jbosscache-commits at lists.jboss.org Thu Jan  3 03:14:40 2008
Content-Type: multipart/mixed; boundary="===============7286702675557968441=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r4958 -
 cache-bench-fwk/trunk/conf.
Date: Thu, 03 Jan 2008 03:14:39 -0500
Message-ID: <E1JALDr-0004xG-3w@committer01.frg.pub.inap.atl.jboss.com>

--===============7286702675557968441==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: mircea.markus
Date: 2008-01-03 03:14:38 -0500 (Thu, 03 Jan 2008)
New Revision: 4958

Modified:
   cache-bench-fwk/trunk/conf/log4j.xml
Log:
removed other onfig files as they are utdated

Modified: cache-bench-fwk/trunk/conf/log4j.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- cache-bench-fwk/trunk/conf/log4j.xml	2008-01-03 07:48:53 UTC (rev 4957)
+++ cache-bench-fwk/trunk/conf/log4j.xml	2008-01-03 08:14:38 UTC (rev 4958)
@@ -68,7 +68,7 @@
         <appender-ref ref=3D"FILE"/>
     </category>
    =

-   <category name=3D"org.jboss.cache">
+   <category name=3D"org.jboss.cache" additivity=3D"false">
         <priority value=3D"WARN"/>
         <appender-ref ref=3D"FILE"/>
         <appender-ref ref=3D"CONSOLE"/>


--===============7286702675557968441==--

From jbosscache-commits at lists.jboss.org Thu Jan  3 03:19:10 2008
Content-Type: multipart/mixed; boundary="===============7106684431311003038=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r4959 -
 cache-bench-fwk/trunk/conf.
Date: Thu, 03 Jan 2008 03:19:09 -0500
Message-ID: <E1JALID-0005uC-Ul@committer01.frg.pub.inap.atl.jboss.com>

--===============7106684431311003038==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: mircea.markus
Date: 2008-01-03 03:19:09 -0500 (Thu, 03 Jan 2008)
New Revision: 4959

Modified:
   cache-bench-fwk/trunk/conf/log4j.xml
Log:
updated log config

Modified: cache-bench-fwk/trunk/conf/log4j.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- cache-bench-fwk/trunk/conf/log4j.xml	2008-01-03 08:14:38 UTC (rev 4958)
+++ cache-bench-fwk/trunk/conf/log4j.xml	2008-01-03 08:19:09 UTC (rev 4959)
@@ -67,7 +67,7 @@
         <priority value=3D"ERROR"/>
         <appender-ref ref=3D"FILE"/>
     </category>
-   =

+
    <category name=3D"org.jboss.cache" additivity=3D"false">
         <priority value=3D"WARN"/>
         <appender-ref ref=3D"FILE"/>


--===============7106684431311003038==--

From jbosscache-commits at lists.jboss.org Thu Jan  3 04:26:18 2008
Content-Type: multipart/mixed; boundary="===============6862520994711800109=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r4960 - cache-bench-fwk/trunk.
Date: Thu, 03 Jan 2008 04:26:18 -0500
Message-ID: <E1JAMLC-0002Qa-Hk@committer01.frg.pub.inap.atl.jboss.com>

--===============6862520994711800109==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: mircea.markus
Date: 2008-01-03 04:26:18 -0500 (Thu, 03 Jan 2008)
New Revision: 4960

Modified:
   cache-bench-fwk/trunk/runNode.sh
Log:
updated log config

Modified: cache-bench-fwk/trunk/runNode.sh
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- cache-bench-fwk/trunk/runNode.sh	2008-01-03 08:19:09 UTC (rev 4959)
+++ cache-bench-fwk/trunk/runNode.sh	2008-01-03 09:26:18 UTC (rev 4960)
@@ -1,25 +1,23 @@
 #!/bin/bash
 # author: Mircea.Markus(a)jboss.com
-# cygwin users: add the scripts from :pserver:anoncvs(a)cygwin.com:/cvs/cy=
gwin-apps/wrappers/java to the cygwin_home/usr/local/bin
+# cygwin users: add the scripts from :pserver:anoncvs(a)cygwin.com:/cvs/cy=
gwin-apps/wrappers/java to the $cygwin_home/usr/local/bin
 # those would make an automatic conversion from unix CLASSPATH to win clas=
spath, needed when executing java -cp
 =

-BIND_ADDRESS=3D127.0.0.1
 CACHE_DEBUG=3Dtrue
 preferIPv4Stack=3Dtrue
 =

 if [ -z $1 ]
 then
    echo "Usage:"
-   echo "     ./runNode.sh currentNodeIndex testConfig [other params]"
-   echo "currentNodeIndex : the index of this node in the list of nodes in=
 the cluster, zero based"
-   echo "testConfig       : must be on of the directories form cache produ=
cts"
-   echo "other params     : this will be passed as argument to the cache b=
enchmark class."
-   echo "                 Might be used, for e.g. to pass -D arguments to =
the custom plugins"
-   echo "                 configured in cachebench.xml"   =

+   echo "     ./runNode.sh currentNodeIndex testConfig otherSysProps custo=
mConfigFile"
+   echo "currentNodeIndex : the index of this node in the list of nodes in=
 the cluster(0..n)"
+   echo "testConfig       : must be one of the directories names under 'ca=
che-products'"
+   echo "other params     : should be used to pass -D arguments to the cus=
tom plugins. e.g. JBossCache might need an 'bindAddress' argument"
+   echo "customConfigFile : the path to the a custom 'cachebenchmark.xml' =
(other than the one in 'conf' dir which is loaded by default)"
    exit 0
 fi
 =

-export SYS_PROPS=3D"-Dbind.address=3D$BIND_ADDRESS -DcurrentIndex=3D$1 -Do=
rg.cachebench.debug=3D$CACHE_DEBUG -Djava.net.preferIPv4Stack=3D$preferIPv4=
Stack"
+export SYS_PROPS=3D"-DcurrentIndex=3D$1 -Dorg.cachebench.debug=3D$CACHE_DE=
BUG -Djava.net.preferIPv4Stack=3D$preferIPv4Stack"
 =

 #libraries needed by the fwk, add them to the classpath
 for JAR in ./lib/*
@@ -49,6 +47,6 @@
 else   =

    TO_EXECUTE=3D"java -cp $CLASSPATH $SYS_PROPS org.cachebench.CacheBenchm=
arkRunner $3"
    echo executing $TO_EXECUTE
-   java -cp $CLASSPATH $SYS_PROPS org.cachebench.CacheBenchmarkRunner $3
+   java -cp $CLASSPATH $3 $SYS_PROPS org.cachebench.CacheBenchmarkRunner $4
 fi
 =



--===============6862520994711800109==--

From jbosscache-commits at lists.jboss.org Thu Jan  3 04:37:09 2008
Content-Type: multipart/mixed; boundary="===============2872351506154711449=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r4961 - in
 cache-bench-fwk/trunk: src/org/cachebench and 1 other directory.
Date: Thu, 03 Jan 2008 04:37:07 -0500
Message-ID: <E1JAMVf-0004KF-6m@committer01.frg.pub.inap.atl.jboss.com>

--===============2872351506154711449==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: mircea.markus
Date: 2008-01-03 04:37:07 -0500 (Thu, 03 Jan 2008)
New Revision: 4961

Modified:
   cache-bench-fwk/trunk/runNode.sh
   cache-bench-fwk/trunk/src/org/cachebench/CacheBenchmarkRunner.java
Log:
logging enhanced and bsh chanages

Modified: cache-bench-fwk/trunk/runNode.sh
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- cache-bench-fwk/trunk/runNode.sh	2008-01-03 09:26:18 UTC (rev 4960)
+++ cache-bench-fwk/trunk/runNode.sh	2008-01-03 09:37:07 UTC (rev 4961)
@@ -4,7 +4,6 @@
 # those would make an automatic conversion from unix CLASSPATH to win clas=
spath, needed when executing java -cp
 =

 CACHE_DEBUG=3Dtrue
-preferIPv4Stack=3Dtrue
 =

 if [ -z $1 ]
 then
@@ -17,7 +16,7 @@
    exit 0
 fi
 =

-export SYS_PROPS=3D"-DcurrentIndex=3D$1 -Dorg.cachebench.debug=3D$CACHE_DE=
BUG -Djava.net.preferIPv4Stack=3D$preferIPv4Stack"
+export SYS_PROPS=3D"-DcurrentIndex=3D$1 -Dorg.cachebench.debug=3D$CACHE_DE=
BUG "
 =

 #libraries needed by the fwk, add them to the classpath
 for JAR in ./lib/*

Modified: cache-bench-fwk/trunk/src/org/cachebench/CacheBenchmarkRunner.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- cache-bench-fwk/trunk/src/org/cachebench/CacheBenchmarkRunner.java	2008=
-01-03 09:26:18 UTC (rev 4960)
+++ cache-bench-fwk/trunk/src/org/cachebench/CacheBenchmarkRunner.java	2008=
-01-03 09:37:07 UTC (rev 4961)
@@ -131,7 +131,8 @@
       barrier.setConfig(conf.getClusterConfig());
       barrier.setAcknowledge(true);
       barrier.barrier(messageName);
-      logger.trace("Barrier finished");
+      logger.info("Barrier for '" + messageName + "' finished");
+
    }
 =

    private void warmupCache(TestCase test, CacheWrapper cache) throws Exce=
ption


--===============2872351506154711449==--

From jbosscache-commits at lists.jboss.org Thu Jan  3 04:46:10 2008
Content-Type: multipart/mixed; boundary="===============8069518389987236395=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r4962 - cache-bench-fwk/trunk.
Date: Thu, 03 Jan 2008 04:46:10 -0500
Message-ID: <E1JAMeQ-0006Dp-IM@committer01.frg.pub.inap.atl.jboss.com>

--===============8069518389987236395==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: mircea.markus
Date: 2008-01-03 04:46:10 -0500 (Thu, 03 Jan 2008)
New Revision: 4962

Modified:
   cache-bench-fwk/trunk/runNode.sh
Log:
added preferIpV4 ...

Modified: cache-bench-fwk/trunk/runNode.sh
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- cache-bench-fwk/trunk/runNode.sh	2008-01-03 09:37:07 UTC (rev 4961)
+++ cache-bench-fwk/trunk/runNode.sh	2008-01-03 09:46:10 UTC (rev 4962)
@@ -4,6 +4,7 @@
 # those would make an automatic conversion from unix CLASSPATH to win clas=
spath, needed when executing java -cp
 =

 CACHE_DEBUG=3Dtrue
+preferIPv4Stack=3Dtrue
 =

 if [ -z $1 ]
 then
@@ -16,7 +17,7 @@
    exit 0
 fi
 =

-export SYS_PROPS=3D"-DcurrentIndex=3D$1 -Dorg.cachebench.debug=3D$CACHE_DE=
BUG "
+export SYS_PROPS=3D"-DcurrentIndex=3D$1 -Dorg.cachebench.debug=3D$CACHE_DE=
BUG -Djava.net.preferIPv4Stack=3D$preferIPv4Stack"
 =

 #libraries needed by the fwk, add them to the classpath
 for JAR in ./lib/*


--===============8069518389987236395==--

From jbosscache-commits at lists.jboss.org Thu Jan  3 05:06:42 2008
Content-Type: multipart/mixed; boundary="===============8226157073387383863=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r4963 - in
 cache-bench-fwk/trunk/src/org/cachebench: config and 2 other directories.
Date: Thu, 03 Jan 2008 05:02:41 -0500
Message-ID: <E1JAMuP-0000qv-SK@committer01.frg.pub.inap.atl.jboss.com>

--===============8226157073387383863==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: mircea.markus
Date: 2008-01-03 05:02:41 -0500 (Thu, 03 Jan 2008)
New Revision: 4963

Modified:
   cache-bench-fwk/trunk/src/org/cachebench/CacheBenchmarkRunner.java
   cache-bench-fwk/trunk/src/org/cachebench/config/TestCase.java
   cache-bench-fwk/trunk/src/org/cachebench/tests/SimpleTest.java
   cache-bench-fwk/trunk/src/org/cachebench/warmup/PutGetCacheWarmup.java
Log:
enhanced logging

Modified: cache-bench-fwk/trunk/src/org/cachebench/CacheBenchmarkRunner.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- cache-bench-fwk/trunk/src/org/cachebench/CacheBenchmarkRunner.java	2008=
-01-03 09:46:10 UTC (rev 4962)
+++ cache-bench-fwk/trunk/src/org/cachebench/CacheBenchmarkRunner.java	2008=
-01-03 10:02:41 UTC (rev 4963)
@@ -137,11 +137,13 @@
 =

    private void warmupCache(TestCase test, CacheWrapper cache) throws Exce=
ption
    {
+      logger.info("Warming up..");
       CacheWarmupConfig warmupConfig =3D test.getCacheWarmupConfig();
       logger.trace("Warmup config is: " + warmupConfig);
       CacheWarmup warmup =3D (CacheWarmup) Instantiator.getInstance().crea=
teClass(warmupConfig.getWarmupClass());
       warmup.setConfigParams(warmupConfig.getParams());
       warmup.warmup(cache);
+      logger.info("Warmup ended!");
    }
 =

    /**

Modified: cache-bench-fwk/trunk/src/org/cachebench/config/TestCase.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- cache-bench-fwk/trunk/src/org/cachebench/config/TestCase.java	2008-01-0=
3 09:46:10 UTC (rev 4962)
+++ cache-bench-fwk/trunk/src/org/cachebench/config/TestCase.java	2008-01-0=
3 10:02:41 UTC (rev 4963)
@@ -9,7 +9,7 @@
    private String name;
    private String cacheWrapper;
 =

-   private boolean stopOnFailure;
+   private boolean stopOnFailure =3D true;
 =

    private List<TestConfig> tests =3D new ArrayList<TestConfig>();
 =


Modified: cache-bench-fwk/trunk/src/org/cachebench/tests/SimpleTest.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- cache-bench-fwk/trunk/src/org/cachebench/tests/SimpleTest.java	2008-01-=
03 09:46:10 UTC (rev 4962)
+++ cache-bench-fwk/trunk/src/org/cachebench/tests/SimpleTest.java	2008-01-=
03 10:02:41 UTC (rev 4963)
@@ -41,7 +41,7 @@
       result.setTestTime(new Date());
       result.setTestType(testName);
 =

-      log.info("Performing PUTs");
+      log.info("Performing '" + sampleSize + "' PUTs");
       DescriptiveStatistics putStats =3D doPuts(cache, valueClass, sampleS=
ize);
       executor =3D Executors.newFixedThreadPool(numThreads);
       log.info("Performing GETs");

Modified: cache-bench-fwk/trunk/src/org/cachebench/warmup/PutGetCacheWarmup=
.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- cache-bench-fwk/trunk/src/org/cachebench/warmup/PutGetCacheWarmup.java	=
2008-01-03 09:46:10 UTC (rev 4962)
+++ cache-bench-fwk/trunk/src/org/cachebench/warmup/PutGetCacheWarmup.java	=
2008-01-03 10:02:41 UTC (rev 4963)
@@ -17,7 +17,7 @@
    public void performWarmupOperations(CacheWrapper wrapper) throws Except=
ion
    {
       Integer opCount =3D Integer.parseInt(getConfigParam("operationCount"=
));
-      log.trace("Cache launched, performing " + opCount + " put and get op=
erations ");
+      log.info("Cache launched, performing " + opCount + " put and get ope=
rations ");
       for (int i =3D 0; i < opCount; i++)
       {
          wrapper.put(String.valueOf(opCount), String.valueOf(opCount));


--===============8226157073387383863==--

From jbosscache-commits at lists.jboss.org Thu Jan  3 05:36:35 2008
Content-Type: multipart/mixed; boundary="===============0999304266049836072=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r4964 - in
 cache-bench-fwk/trunk: src/org/cachebench and 2 other directories.
Date: Thu, 03 Jan 2008 05:32:35 -0500
Message-ID: <E1JANNL-0006dm-DO@committer01.frg.pub.inap.atl.jboss.com>

--===============0999304266049836072==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: mircea.markus
Date: 2008-01-03 05:32:35 -0500 (Thu, 03 Jan 2008)
New Revision: 4964

Modified:
   cache-bench-fwk/trunk/conf/cachebench.xml
   cache-bench-fwk/trunk/src/org/cachebench/CacheBenchmarkRunner.java
   cache-bench-fwk/trunk/src/org/cachebench/reportgenerators/AbstractReport=
Generator.java
   cache-bench-fwk/trunk/src/org/cachebench/reportgenerators/ClusterReportG=
enerator.java
   cache-bench-fwk/trunk/src/org/cachebench/reportgenerators/ReportGenerato=
r.java
   cache-bench-fwk/trunk/src/org/cachebench/tests/ReplicationOccursTest.java
Log:
enhanced logging

Modified: cache-bench-fwk/trunk/conf/cachebench.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- cache-bench-fwk/trunk/conf/cachebench.xml	2008-01-03 10:02:41 UTC (rev =
4963)
+++ cache-bench-fwk/trunk/conf/cachebench.xml	2008-01-03 10:32:35 UTC (rev =
4964)
@@ -21,8 +21,8 @@
    -->
    <cluster bindAddress=3D"127.0.0.1">
       <member host=3D"127.0.0.1" port=3D"7800"/>
-      <member host=3D"127.0.0.1" port=3D"7801"/>
-      <member host=3D"127.0.0.1" port=3D"7802"/>
+      <!--<member host=3D"127.0.0.1" port=3D"7801"/>-->
+      <!--<member host=3D"127.0.0.1" port=3D"7802"/>-->
    </cluster>
 =

    <!-- Each testcase represents either a single configuration or a cachei=
ng product.
@@ -92,8 +92,8 @@
 	   See javadocs for org.cachebench.reportgenerators.ReportGenerator for w=
riting your
 		own report generators such as XML generators, graphic generators, etc
    -->
-   <!-- The CSV report generated can be plugged in to a spreadsheet to gen=
erate graphs, cluster size is
-   needed so that the . -->
-   <report outputFile=3D"performance.csv" generator=3D"org.cachebench.repo=
rtgenerators.ClusterReportGenerator"/>
+   <!-- The CSV report generated can be plugged in to a spreadsheet to gen=
erate graphs. If 'outputFile is set to
+   '-generic-' then the name would be generated as follows: 'performance-<=
clusterSize>.csv' -->
+   <report outputFile=3D"-generic-" generator=3D"org.cachebench.reportgene=
rators.ClusterReportGenerator"/>
 =

 </cachebench>

Modified: cache-bench-fwk/trunk/src/org/cachebench/CacheBenchmarkRunner.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- cache-bench-fwk/trunk/src/org/cachebench/CacheBenchmarkRunner.java	2008=
-01-03 10:02:41 UTC (rev 4963)
+++ cache-bench-fwk/trunk/src/org/cachebench/CacheBenchmarkRunner.java	2008=
-01-03 10:32:35 UTC (rev 4964)
@@ -238,8 +238,8 @@
             {
                generator.setConfigParams(report.getParams());
                generator.setResults(results);
-               generator.setOutputFile(new File(report.getOutputFile()));
                generator.setClusterConfig(conf.getClusterConfig());
+               generator.setOutputFile(report.getOutputFile());
                generator.generate();
                logger.info("Report Generation Completed");
             }

Modified: cache-bench-fwk/trunk/src/org/cachebench/reportgenerators/Abstrac=
tReportGenerator.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- cache-bench-fwk/trunk/src/org/cachebench/reportgenerators/AbstractRepor=
tGenerator.java	2008-01-03 10:02:41 UTC (rev 4963)
+++ cache-bench-fwk/trunk/src/org/cachebench/reportgenerators/AbstractRepor=
tGenerator.java	2008-01-03 10:32:35 UTC (rev 4964)
@@ -17,11 +17,20 @@
    protected Log log;
    protected ClusterConfig clusterConfig;
 =

-   public void setOutputFile(File output)
+   public void setOutputFile(String fileName)
    {
-      this.output =3D output;
+      this.output =3D new File(getFileName(fileName));
    }
 =

+   private String getFileName(String fileName)
+   {
+      if (fileName.indexOf("-generic-") >=3D0 )
+      {
+         return "performance-" + clusterConfig.getClusterSize() + ".csv";
+      }
+      return fileName;
+   }
+
    public void setResults(List<TestResult> results)
    {
       this.results =3D results;

Modified: cache-bench-fwk/trunk/src/org/cachebench/reportgenerators/Cluster=
ReportGenerator.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- cache-bench-fwk/trunk/src/org/cachebench/reportgenerators/ClusterReport=
Generator.java	2008-01-03 10:02:41 UTC (rev 4963)
+++ cache-bench-fwk/trunk/src/org/cachebench/reportgenerators/ClusterReport=
Generator.java	2008-01-03 10:32:35 UTC (rev 4964)
@@ -65,7 +65,7 @@
    {
       CSVReportGenerator generator =3D new CSVReportGenerator();
       generator.setResults(mergedResults);
-      generator.setOutputFile(output);
+      generator.output =3D output;
       generator.generate();
    }
 =


Modified: cache-bench-fwk/trunk/src/org/cachebench/reportgenerators/ReportG=
enerator.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- cache-bench-fwk/trunk/src/org/cachebench/reportgenerators/ReportGenerat=
or.java	2008-01-03 10:02:41 UTC (rev 4963)
+++ cache-bench-fwk/trunk/src/org/cachebench/reportgenerators/ReportGenerat=
or.java	2008-01-03 10:32:35 UTC (rev 4964)
@@ -16,7 +16,7 @@
 {
    public void setConfigParams(Map<String, String> configParams);
    =

-   public void setOutputFile(File output);
+   public void setOutputFile(String fileName);
 =

    public void setResults(List<TestResult> results);
 =


Modified: cache-bench-fwk/trunk/src/org/cachebench/tests/ReplicationOccursT=
est.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- cache-bench-fwk/trunk/src/org/cachebench/tests/ReplicationOccursTest.ja=
va	2008-01-03 10:02:41 UTC (rev 4963)
+++ cache-bench-fwk/trunk/src/org/cachebench/tests/ReplicationOccursTest.ja=
va	2008-01-03 10:32:35 UTC (rev 4964)
@@ -39,8 +39,17 @@
       cache.put(PREFIX + currentNodeIndex, "true");
       Thread.sleep(2000);//just to make sure that prev barrier closed its =
sockets etc
 =

+      if (conf.getClusterConfig().getClusterSize() =3D=3D 1)
+      {
+         log.info("Cluster size is one, no replication expected");
+         TestResult result =3D new TestResult();
+         result.setTestPassed(true);
+         result.setSkipReport(true);
+         return result;
+      }
+
       boolean allNodesReplicated =3D nodesReplicated(cache, testCaseName, =
testName);
-      =

+
       Map<SocketAddress, Object> receivedValues =3D broadcastReplicationRe=
sult(allNodesReplicated);
       cache.empty();
       return allReplicatedFine(receivedValues);
@@ -52,7 +61,7 @@
       ClusterBarrier barrier =3D new ClusterBarrier();
       barrier.setConfig(conf.getClusterConfig());
       barrier.barrier(String.valueOf(allNodesReplicated));
-      Map<SocketAddress,Object> receivedValues =3D barrier.getReceivedMess=
ages();
+      Map<SocketAddress, Object> receivedValues =3D barrier.getReceivedMes=
sages();
       log.info("Recieved following responses from barrier:" + receivedValu=
es);
       return receivedValues;
    }
@@ -70,7 +79,7 @@
    {
       TestResult result =3D new TestResult();
       result.setSkipReport(true);
-      for (Object value: receivedValues.values())
+      for (Object value : receivedValues.values())
       {
          if (!"true".equals(value))
          {


--===============0999304266049836072==--

From jbosscache-commits at lists.jboss.org Thu Jan  3 07:42:33 2008
Content-Type: multipart/mixed; boundary="===============7563685611305222257=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r4965 -
 core/trunk/src/test/java/org/jboss/cache/eviction/minttl.
Date: Thu, 03 Jan 2008 07:42:33 -0500
Message-ID: <E1JAPP7-0005we-1t@committer01.frg.pub.inap.atl.jboss.com>

--===============7563685611305222257==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: manik.surtani(a)jboss.com
Date: 2008-01-03 07:42:32 -0500 (Thu, 03 Jan 2008)
New Revision: 4965

Modified:
   core/trunk/src/test/java/org/jboss/cache/eviction/minttl/MinTTLTestBase.=
java
Log:
increased sleep time to wait for eviction thread

Modified: core/trunk/src/test/java/org/jboss/cache/eviction/minttl/MinTTLTe=
stBase.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/test/java/org/jboss/cache/eviction/minttl/MinTTLTestBase=
.java	2008-01-03 10:32:35 UTC (rev 4964)
+++ core/trunk/src/test/java/org/jboss/cache/eviction/minttl/MinTTLTestBase=
.java	2008-01-03 12:42:32 UTC (rev 4965)
@@ -98,7 +98,7 @@
       // the last cache.get() would have updated the last modified tstamp =
so we need to wait at least 3 secs (+1 sec maybe for the eviction thread)
       // to make sure this is evicted.
 =

-      TestingUtil.sleepThread(4500);
+      TestingUtil.sleepThread(5000);
 =

       assert cache.get(fqn, "k") =3D=3D null : "Node should have been evic=
ted";
    }


--===============7563685611305222257==--

From jbosscache-commits at lists.jboss.org Thu Jan  3 08:20:33 2008
Content-Type: multipart/mixed; boundary="===============9218822642626045821=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r4966 - in core/trunk/src:
 test/java/org/jboss/cache/loader and 1 other directory.
Date: Thu, 03 Jan 2008 08:20:32 -0500
Message-ID: <E1JAPzs-0005F2-3C@committer01.frg.pub.inap.atl.jboss.com>

--===============9218822642626045821==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: manik.surtani(a)jboss.com
Date: 2008-01-03 08:20:31 -0500 (Thu, 03 Jan 2008)
New Revision: 4966

Modified:
   core/trunk/src/main/java/org/jboss/cache/loader/ClusteredCacheLoader.java
   core/trunk/src/test/java/org/jboss/cache/loader/ClusteredCacheLoaderRegi=
onBasedTest.java
Log:
Fixed CCL making remote calls before the cache is started

Modified: core/trunk/src/main/java/org/jboss/cache/loader/ClusteredCacheLoa=
der.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/java/org/jboss/cache/loader/ClusteredCacheLoader.ja=
va	2008-01-03 12:42:32 UTC (rev 4965)
+++ core/trunk/src/main/java/org/jboss/cache/loader/ClusteredCacheLoader.ja=
va	2008-01-03 13:20:31 UTC (rev 4966)
@@ -9,6 +9,7 @@
 import net.jcip.annotations.ThreadSafe;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.jboss.cache.CacheStatus;
 import org.jboss.cache.Fqn;
 import org.jboss.cache.Modification;
 import org.jboss.cache.NodeSPI;
@@ -48,6 +49,17 @@
    private ClusteredCacheLoaderConfig config;
 =

    /**
+    * A test to check whether the cache is in it's started state.  If not,=
 calls should not be made as the channel may
+    * not have properly started, blocks due to state transfers may be in p=
rogress, etc.
+    *
+    * @return true if the cache is in it's STARTED state.
+    */
+   protected boolean isCacheReady()
+   {
+      return cache.getCacheStatus() =3D=3D CacheStatus.STARTED;
+   }
+
+   /**
     * Sets the configuration.
     * A property <code>timeout</code> is used as the timeout value.
     */
@@ -70,7 +82,7 @@
 =

    public Set getChildrenNames(Fqn fqn) throws Exception
    {
-      if (!cache.getInvocationContext().isOriginLocal()) return Collection=
s.emptySet();
+      if (!isCacheReady() || !cache.getInvocationContext().isOriginLocal()=
) return Collections.emptySet();
       lock.acquireLock(fqn, true);
       try
       {
@@ -143,7 +155,7 @@
    protected Map get0(Fqn name) throws Exception
    {
       // DON'T make a remote call if this is a remote call in the first pl=
ace - leads to deadlocks - JBCACHE-1103
-      if (!cache.getInvocationContext().isOriginLocal()) return Collection=
s.emptyMap();
+      if (!isCacheReady() || !cache.getInvocationContext().isOriginLocal()=
) return Collections.emptyMap();
       lock.acquireLock(name, true);
       try
       {
@@ -160,7 +172,7 @@
    public boolean exists(Fqn name) throws Exception
    {
       // DON'T make a remote call if this is a remote call in the first pl=
ace - leads to deadlocks - JBCACHE-1103
-      if (!cache.getInvocationContext().isOriginLocal()) return false;
+      if (!isCacheReady() || !cache.getInvocationContext().isOriginLocal()=
) return false;
 =

       lock.acquireLock(name, false);
       try
@@ -178,32 +190,26 @@
 =

    public Object put(Fqn name, Object key, Object value) throws Exception
    {
-      if (cache.getInvocationContext().isOriginLocal())
+      // DON'T make a remote call if this is a remote call in the first pl=
ace - leads to deadlocks - JBCACHE-1103
+      if (!isCacheReady() || !cache.getInvocationContext().isOriginLocal()=
) return null;
+      lock.acquireLock(name, true);
+      try
       {
-         lock.acquireLock(name, true);
-         try
+         NodeSPI n =3D cache.peek(name, false);
+         if (n =3D=3D null)
          {
-            NodeSPI n =3D cache.peek(name, false);
-            if (n =3D=3D null)
-            {
-               MethodCall call =3D MethodCallFactory.create(MethodDeclarat=
ions.getKeyValueMethodLocal, name, key, true);
-               return callRemote(call);
-            }
-            else
-            {
-               // dont bother with a remote call
-               return n.getDirect(key);
-            }
+            MethodCall call =3D MethodCallFactory.create(MethodDeclaration=
s.getKeyValueMethodLocal, name, key, true);
+            return callRemote(call);
          }
-         finally
+         else
          {
-            lock.releaseLock(name);
+            // dont bother with a remote call
+            return n.getDirect(key);
          }
       }
-      else
+      finally
       {
-         log.trace("Call originated remotely.  Not bothering to try and do=
 a clustered get() for this put().  Returning null.");
-         return null;
+         lock.releaseLock(name);
       }
    }
 =

@@ -228,32 +234,26 @@
     */
    public Object remove(Fqn name, Object key) throws Exception
    {
-      if (cache.getInvocationContext().isOriginLocal())
+      // DON'T make a remote call if this is a remote call in the first pl=
ace - leads to deadlocks - JBCACHE-1103
+      if (!isCacheReady() || !cache.getInvocationContext().isOriginLocal()=
) return false;
+      lock.acquireLock(name, true);
+      try
       {
-         lock.acquireLock(name, true);
-         try
+         NodeSPI n =3D cache.peek(name, true);
+         if (n =3D=3D null)
          {
-            NodeSPI n =3D cache.peek(name, true);
-            if (n =3D=3D null)
-            {
-               MethodCall call =3D MethodCallFactory.create(MethodDeclarat=
ions.getKeyValueMethodLocal, name, key, true);
-               return callRemote(call);
-            }
-            else
-            {
-               // dont bother with a remote call
-               return n.getDirect(key);
-            }
+            MethodCall call =3D MethodCallFactory.create(MethodDeclaration=
s.getKeyValueMethodLocal, name, key, true);
+            return callRemote(call);
          }
-         finally
+         else
          {
-            lock.releaseLock(name);
+            // dont bother with a remote call
+            return n.getDirect(key);
          }
       }
-      else
+      finally
       {
-         log.trace("Call originated remotely.  Not bothering to try and do=
 a clustered get() for this remove().  Returning null.");
-         return null;
+         lock.releaseLock(name);
       }
    }
 =


Modified: core/trunk/src/test/java/org/jboss/cache/loader/ClusteredCacheLoa=
derRegionBasedTest.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/test/java/org/jboss/cache/loader/ClusteredCacheLoaderReg=
ionBasedTest.java	2008-01-03 12:42:32 UTC (rev 4965)
+++ core/trunk/src/test/java/org/jboss/cache/loader/ClusteredCacheLoaderReg=
ionBasedTest.java	2008-01-03 13:20:31 UTC (rev 4966)
@@ -1,5 +1,8 @@
 package org.jboss.cache.loader;
 =

+import org.testng.annotations.Test;
+
+(a)Test(groups =3D {"functional"})
 public class ClusteredCacheLoaderRegionBasedTest extends ClusteredCacheLoa=
derTest
 {
    public ClusteredCacheLoaderRegionBasedTest()


--===============9218822642626045821==--

From jbosscache-commits at lists.jboss.org Thu Jan  3 08:29:36 2008
Content-Type: multipart/mixed; boundary="===============9220341577911909077=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r4967 -
 core/trunk/src/test/java/org/jboss/cache/marshall.
Date: Thu, 03 Jan 2008 08:29:35 -0500
Message-ID: <E1JAQ8d-0006KR-VM@committer01.frg.pub.inap.atl.jboss.com>

--===============9220341577911909077==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: manik.surtani(a)jboss.com
Date: 2008-01-03 08:29:35 -0500 (Thu, 03 Jan 2008)
New Revision: 4967

Modified:
   core/trunk/src/test/java/org/jboss/cache/marshall/ReturnValueMarshalling=
Test.java
Log:
fixed broken unit test

Modified: core/trunk/src/test/java/org/jboss/cache/marshall/ReturnValueMars=
hallingTest.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/test/java/org/jboss/cache/marshall/ReturnValueMarshallin=
gTest.java	2008-01-03 13:20:31 UTC (rev 4966)
+++ core/trunk/src/test/java/org/jboss/cache/marshall/ReturnValueMarshallin=
gTest.java	2008-01-03 13:29:35 UTC (rev 4967)
@@ -85,12 +85,9 @@
       assertSame(listClass, cache2.get(fqn, key).getClass());
 =

       // now test if this is the same when obtained using a clustered get =
mcall
-      MethodCall call =3D MethodCallFactory.create(MethodDeclarations.repl=
icateMethod,
-            MethodCallFactory.create(MethodDeclarations.clusteredGetMethod,
-                  MethodCallFactory.create(MethodDeclarations.getKeyValueM=
ethodLocal, fqn, key, false),
-                  false
-            )
-      );
+      MethodCall call =3D MethodCallFactory.create(MethodDeclarations.clus=
teredGetMethod,
+            MethodCallFactory.create(MethodDeclarations.getKeyValueMethodL=
ocal, fqn, key, false),
+            false);
 =

       List responses =3D cache1.getRPCManager().callRemoteMethods(null, ca=
ll, true, true, 15000);
       List response1 =3D (List) responses.get(0);// response from the firs=
t (and only) node
@@ -117,11 +114,8 @@
       assertSame(listClass, cache2.get(fqn, key).getClass());
 =

       // now test if this is the same when obtained using a data gravitate=
 call
-      MethodCall call =3D MethodCallFactory.create(MethodDeclarations.repl=
icateMethod,
-            MethodCallFactory.create(MethodDeclarations.dataGravitationMet=
hod,
-                  fqn, false
-            )
-      );
+      MethodCall call =3D MethodCallFactory.create(MethodDeclarations.data=
GravitationMethod,
+            fqn, false);
 =

       List responses =3D cache1.getRPCManager().callRemoteMethods(null, ca=
ll, true, true, 15000);
       GravitateResult data =3D (GravitateResult) responses.get(0);// respo=
nse from the first (and only) node


--===============9220341577911909077==--

From jbosscache-commits at lists.jboss.org Thu Jan  3 14:17:11 2008
Content-Type: multipart/mixed; boundary="===============4912209702877865203=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r4968 - in core/trunk/src:
 main/java/org/jboss/cache/buddyreplication and 6 other directories.
Date: Thu, 03 Jan 2008 14:17:09 -0500
Message-ID: <E1JAVYz-0006hu-Lx@committer01.frg.pub.inap.atl.jboss.com>

--===============4912209702877865203==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: manik.surtani(a)jboss.com
Date: 2008-01-03 14:17:09 -0500 (Thu, 03 Jan 2008)
New Revision: 4968

Modified:
   core/trunk/src/main/java/org/jboss/cache/CacheImpl.java
   core/trunk/src/main/java/org/jboss/cache/Fqn.java
   core/trunk/src/main/java/org/jboss/cache/buddyreplication/BuddyManager.j=
ava
   core/trunk/src/main/java/org/jboss/cache/interceptors/ActivationIntercep=
tor.java
   core/trunk/src/main/java/org/jboss/cache/interceptors/BaseRpcInterceptor=
.java
   core/trunk/src/main/java/org/jboss/cache/interceptors/BaseTransactionalC=
ontextInterceptor.java
   core/trunk/src/main/java/org/jboss/cache/interceptors/CacheLoaderInterce=
ptor.java
   core/trunk/src/main/java/org/jboss/cache/interceptors/CacheMgmtIntercept=
or.java
   core/trunk/src/main/java/org/jboss/cache/interceptors/CacheStoreIntercep=
tor.java
   core/trunk/src/main/java/org/jboss/cache/interceptors/CallInterceptor.ja=
va
   core/trunk/src/main/java/org/jboss/cache/interceptors/DataGravitatorInte=
rceptor.java
   core/trunk/src/main/java/org/jboss/cache/interceptors/EvictionIntercepto=
r.java
   core/trunk/src/main/java/org/jboss/cache/interceptors/Interceptor.java
   core/trunk/src/main/java/org/jboss/cache/interceptors/InvalidationInterc=
eptor.java
   core/trunk/src/main/java/org/jboss/cache/interceptors/InvocationContextI=
nterceptor.java
   core/trunk/src/main/java/org/jboss/cache/interceptors/MethodDispacherInt=
erceptor.java
   core/trunk/src/main/java/org/jboss/cache/interceptors/NotificationInterc=
eptor.java
   core/trunk/src/main/java/org/jboss/cache/interceptors/OptimisticCreateIf=
NotExistsInterceptor.java
   core/trunk/src/main/java/org/jboss/cache/interceptors/OptimisticIntercep=
tor.java
   core/trunk/src/main/java/org/jboss/cache/interceptors/OptimisticLockingI=
nterceptor.java
   core/trunk/src/main/java/org/jboss/cache/interceptors/OptimisticNodeInte=
rceptor.java
   core/trunk/src/main/java/org/jboss/cache/interceptors/OptimisticReplicat=
ionInterceptor.java
   core/trunk/src/main/java/org/jboss/cache/interceptors/OptimisticValidato=
rInterceptor.java
   core/trunk/src/main/java/org/jboss/cache/interceptors/PassivationInterce=
ptor.java
   core/trunk/src/main/java/org/jboss/cache/interceptors/PessimisticLockInt=
erceptor.java
   core/trunk/src/main/java/org/jboss/cache/interceptors/ReplicationInterce=
ptor.java
   core/trunk/src/main/java/org/jboss/cache/interceptors/TxInterceptor.java
   core/trunk/src/main/java/org/jboss/cache/interceptors/UnlockInterceptor.=
java
   core/trunk/src/main/java/org/jboss/cache/lock/NodeLock.java
   core/trunk/src/main/java/org/jboss/cache/marshall/MethodDeclarations.java
   core/trunk/src/test/java/org/jboss/cache/FqnTest.java
   core/trunk/src/test/java/org/jboss/cache/marshall/CrudMethodTest.java
   core/trunk/src/test/java/org/jboss/cache/profiling/ProfileTest.java
Log:
Optimised fqns and interceptors

Modified: core/trunk/src/main/java/org/jboss/cache/CacheImpl.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/java/org/jboss/cache/CacheImpl.java	2008-01-03 13:2=
9:35 UTC (rev 4967)
+++ core/trunk/src/main/java/org/jboss/cache/CacheImpl.java	2008-01-03 19:1=
7:09 UTC (rev 4968)
@@ -183,6 +183,8 @@
    private CacheSPI spi;
    private Interceptor interceptorChain;
 =

+   private boolean trace;
+
    /**
     * Constructs an uninitialized CacheImpl.
     */
@@ -1074,7 +1076,7 @@
          return;// node does not exist. Maybe it has been recursively remo=
ved.
       }
 =

-      if (log.isTraceEnabled())
+      if (trace)
       {
          log.trace("_evictSubtree(" + subtree + ")");
       }
@@ -1124,7 +1126,7 @@
          boolean localTx =3D deadOwner.getAddress().equals(getLocalAddress=
());
          boolean broken =3D LockUtil.breakTransactionLock(lock, deadOwner,=
 localTx, this);
 =

-         if (broken && log.isTraceEnabled())
+         if (broken && trace)
          {
             log.trace("Broke lock for node " + node.getFqn() +
                   " held by " + deadOwner);
@@ -1244,7 +1246,7 @@
    public Object _get(Fqn<?> fqn, Object key, boolean sendNodeEvent) throw=
s CacheException
    {
       InvocationContext ctx =3D spi.getInvocationContext();
-      if (log.isTraceEnabled())
+      if (trace)
       {
          log.trace(new StringBuffer("_get(").append("\"").append(fqn).appe=
nd("\", \"").append(key).append("\", \"").
                append(sendNodeEvent).append("\")"));
@@ -1888,14 +1890,14 @@
       }
       if (validMembers.isEmpty())
       {
-         if (log.isTraceEnabled())
+         if (trace)
          {
             log.trace("destination list is empty, discarding call");
          }
          return null;
       }
 =

-      if (log.isTraceEnabled())
+      if (trace)
       {
          log.trace("callRemoteMethods(): valid members are " + validMember=
s + " methods: " + method_call.getArgs()[0]);
       }
@@ -1921,7 +1923,7 @@
          return Collections.EMPTY_LIST;// async case
       }
 =

-      if (log.isTraceEnabled())
+      if (trace)
       {
          log.trace("(" + getLocalAddress() + "): responses for method " + =
method_call.getName() + ":\n" + rsps);
       }
@@ -1949,7 +1951,7 @@
             if (value instanceof Exception && !(value instanceof Replicati=
onException))
             {
                // if we have any application-level exceptions make sure we=
 throw them!!
-               if (log.isTraceEnabled()) log.trace("Recieved exception'" +=
 value + "' from " + rsp.getSender());
+               if (trace) log.trace("Recieved exception'" + value + "' fro=
m " + rsp.getSender());
                throw (Exception) value;
             }
             retval.add(value);
@@ -2105,7 +2107,7 @@
    public void _put(GlobalTransaction tx, Fqn fqn, Map data, boolean creat=
e_undo_ops, boolean erase_contents)
          throws CacheException
    {
-      if (log.isTraceEnabled())
+      if (trace)
       {
          log.trace("_put(" + tx + ", \"" + fqn + "\", " + data + " undo=3D=
" + create_undo_ops + " erase=3D" + erase_contents + ")");
       }
@@ -2167,7 +2169,7 @@
    public Object _put(GlobalTransaction tx, Fqn fqn, Object key, Object va=
lue, boolean create_undo_ops)
          throws CacheException
    {
-      if (log.isTraceEnabled())
+      if (trace)
       {
          log.trace(new StringBuffer("_put(").append(tx).append(", \"").
                append(fqn).append("\", k=3D").append(key).append(", v=3D")=
.append(value).append(")"));
@@ -2268,7 +2270,7 @@
       NodeSPI parent_node;
       MethodCall undo_op =3D null;
 =

-      if (log.isTraceEnabled())
+      if (trace)
       {
          log.trace("_remove(" + tx + ", \"" + fqn + "\", undo=3D" + create=
_undo_ops + ")");
       }
@@ -2296,7 +2298,7 @@
       n =3D findNode(fqn, version, true);
       if (n =3D=3D null)
       {
-         if (log.isTraceEnabled())
+         if (trace)
          {
             log.trace("node " + fqn + " not found");
          }
@@ -2389,7 +2391,7 @@
       MethodCall undo_op =3D null;
       Object old_value =3D null;
 =

-      if (log.isTraceEnabled())
+      if (trace)
       {
          log.trace("_remove(" + tx + ", \"" + fqn + "\", key=3D" + key + "=
)");
       }
@@ -2469,7 +2471,7 @@
    {
       MethodCall undo_op =3D null;
 =

-      if (log.isTraceEnabled())
+      if (trace)
       {
          log.trace("_removeData(" + tx + ", \"" + fqn + "\")");
       }
@@ -2560,7 +2562,7 @@
       boolean create_undo_ops =3D false;
       boolean sendNodeEvent =3D false;
       boolean eviction =3D true;
-      if (log.isTraceEnabled())
+      if (trace)
       {
          log.trace("_evict(" + fqn + ")");
       }
@@ -2591,7 +2593,7 @@
       if (!exists(fqn))
          return true;// node does not exist
 =

-      if (log.isTraceEnabled())
+      if (trace)
       {
          log.trace("_evict(" + fqn + ", " + version + ")");
       }
@@ -2696,7 +2698,7 @@
          throws CacheException
    {
       NodeSPI childNode =3D (NodeSPI) cn;
-      if (log.isTraceEnabled())
+      if (trace)
       {
          log.trace("_addChild(\"" + parent_fqn + "\", \"" + child_name + "=
\", node=3D" + childNode + ")");
       }
@@ -2794,7 +2796,7 @@
 =

       // for now, perform a very simple series of getData calls.
       InvocationContext ctx =3D spi.getInvocationContext();
-      if (log.isTraceEnabled()) log.trace("Caller is asking for " + fqn);
+      if (trace) log.trace("Caller is asking for " + fqn);
 =

       try
       {
@@ -2806,7 +2808,7 @@
          Node actualNode =3D spi.getNode(fqn);
          ctx.getOptionOverrides().setSkipDataGravitation(false);
 =

-         if (log.isTraceEnabled()) log.trace("In local tree, this is " + a=
ctualNode);
+         if (trace) log.trace("In local tree, this is " + actualNode);
 =

          Fqn backupNodeFqn =3D null;
          if (actualNode =3D=3D null && searchSubtrees)
@@ -2829,7 +2831,7 @@
                      ctx.getOptionOverrides().setSkipDataGravitation(true);
                      actualNode =3D spi.getNode(backupNodeFqn);
                      ctx.getOptionOverrides().setSkipDataGravitation(false=
);
-                     if (log.isTraceEnabled())
+                     if (trace)
                         log.trace("Looking for " + backupNodeFqn + ". Sear=
ch result: " + actualNode);
                      if (actualNode !=3D null) break;
                   }
@@ -3101,6 +3103,7 @@
       }
       // replace .s with _s otherwise Log4J will strip them out
       log =3D LogFactory.getLog(category.toString());
+      trace =3D log.isTraceEnabled();
    }
 =

    /**
@@ -3322,7 +3325,7 @@
          TransactionEntry ent =3D configuration.isNodeLockingOptimistic() =
? new OptimisticTransactionEntry() : new TransactionEntry();
          ent.setTransaction(tx);
          transactionTable.put(gtx, ent);
-         if (log.isTraceEnabled())
+         if (trace)
          {
             log.trace("created new GTX: " + gtx + ", local TX=3D" + tx);
          }
@@ -3409,7 +3412,7 @@
       if (n =3D=3D null)
       {
          String errStr =3D "node " + fqn + " not found (gtx=3D" + tx + ", =
caller=3D" + Thread.currentThread() + ")";
-         if (log.isTraceEnabled())
+         if (trace)
          {
             log.trace(errStr);
          }
@@ -3433,7 +3436,7 @@
       }
 =

 =

-      if (log.isTraceEnabled()) log.trace("Performing a real remove for no=
de " + f + ", marked for removal.");
+      if (trace) log.trace("Performing a real remove for node " + f + ", m=
arked for removal.");
       if (skipMarkerCheck || n.isDeleted())
       {
          if (n.getFqn().isRoot())
@@ -3482,7 +3485,7 @@
       {
          // we need to check the version of the data node...
          DataVersion nodeVersion =3D toReturn.getVersion();
-         if (log.isTraceEnabled())
+         if (trace)
          {
             log.trace("looking for optimistic node [" + fqn + "] with vers=
ion [" + version + "].  My version is [" + nodeVersion + "]");
          }
@@ -3569,7 +3572,7 @@
                }
                else
                {
-                  if (log.isTraceEnabled())
+                  if (trace)
                   {
                      log.trace("Cache cluster properties: " + configuratio=
n.getClusterConfig());
                   }
@@ -3597,7 +3600,7 @@
       disp.setRequestMarshaller(marshaller);
       disp.setResponseMarshaller(marshaller);
 =

-      if (log.isTraceEnabled()) log.trace("Started with RpcDispatcher " + =
disp);
+      if (trace) log.trace("Started with RpcDispatcher " + disp);
    }
 =

    private JChannel getMultiplexerChannel() throws CacheException

Modified: core/trunk/src/main/java/org/jboss/cache/Fqn.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/java/org/jboss/cache/Fqn.java	2008-01-03 13:29:35 U=
TC (rev 4967)
+++ core/trunk/src/main/java/org/jboss/cache/Fqn.java	2008-01-03 19:17:09 U=
TC (rev 4968)
@@ -68,23 +68,24 @@
     * Separator between FQN elements.
     */
    public static final String SEPARATOR =3D "/";
-   =

+
    private static final long serialVersionUID =3D -5351930616956603651L;
-   =

+
    private static final Log log =3D LogFactory.getLog(Fqn.class);
-   =

+
    private List<E> elements;
    private transient int hash_code =3D 0;
+   private int size =3D 0;
 =

    /**
     * Immutable root FQN.
     */
    @SuppressWarnings("unchecked")
    public static final Fqn ROOT =3D new Fqn();
-   =

+
    /**
     * A cached string representation of this Fqn, used by toString to it i=
sn't calculated again every time.
-    */ =

+    */
    private String cachedStringRep;
 =

    /**
@@ -93,6 +94,7 @@
    public Fqn()
    {
       elements =3D Collections.emptyList();
+      size =3D 0;
    }
 =

    /**
@@ -120,10 +122,12 @@
       {
          // if not safe make a defensive copy
          elements =3D safe ? names : new ArrayList<E>(names);
+         size =3D elements.size();
       }
       else
       {
          elements =3D Collections.emptyList();
+         size =3D 0;
       }
    }
 =

@@ -162,6 +166,7 @@
       elements.addAll(base.elements);
       elements.addAll(relative);
       this.elements =3D elements;
+      size =3D elements.size();
    }
 =

    /**
@@ -176,6 +181,7 @@
       elements.addAll(base.elements);
       elements.addAll(Arrays.asList(childNames));
       this.elements =3D elements;
+      size =3D elements.size();
    }
 =

    /**
@@ -244,7 +250,7 @@
     */
    public Fqn<E> getSubFqn(int startIndex, int endIndex)
    {
-      return new Fqn<E>(elements.subList(startIndex, endIndex));
+      return new Fqn<E>(elements.subList(startIndex, endIndex), true);
    }
 =

    /**
@@ -252,7 +258,7 @@
     */
    public int size()
    {
-      return elements.size();
+      return size;
    }
 =

    /**
@@ -271,7 +277,7 @@
    public E getLastElement()
    {
       if (isRoot()) return null;
-      return elements.get(elements.size() - 1);
+      return elements.get(size - 1);
    }
 =

    /**
@@ -280,7 +286,7 @@
     */
    public boolean hasElement(E element)
    {
-      return elements.lastIndexOf(element) !=3D -1;
+      return elements.indexOf(element) !=3D -1;
    }
 =

    /**
@@ -314,7 +320,7 @@
          return false;
       }
       Fqn<?> other =3D (Fqn<?>) obj;
-      return elements.equals(other.elements);
+      return size =3D=3D other.size() && elements.equals(other.elements);
    }
 =

    /**
@@ -362,7 +368,7 @@
 =

    public void writeExternal(ObjectOutput out) throws IOException
    {
-      out.writeShort(elements.size());
+      out.writeShort(size);
       for (E element : elements)
       {
          out.writeObject(element);
@@ -372,9 +378,9 @@
    @SuppressWarnings("unchecked")
    public void readExternal(ObjectInput in) throws IOException, ClassNotFo=
undException
    {
-      short length =3D in.readShort();
-      this.elements =3D new ArrayList<E>(length);
-      for (int i =3D 0; i < length; i++)
+      size =3D in.readShort();
+      this.elements =3D new ArrayList<E>(size);
+      for (int i =3D 0; i < size; i++)
       {
          E e =3D (E) in.readObject();
          elements.add(e);
@@ -398,7 +404,7 @@
     */
    public boolean isChildOf(Fqn<E> parentFqn)
    {
-      return parentFqn.elements.size() !=3D elements.size() && isChildOrEq=
uals(parentFqn);
+      return parentFqn.size() !=3D size && isChildOrEquals(parentFqn);
    }
 =

    /**
@@ -418,7 +424,7 @@
    public boolean isChildOrEquals(Fqn<E> parentFqn)
    {
       List<E> parentList =3D parentFqn.elements;
-      if (parentList.size() > elements.size())
+      if (parentList.size() > size)
       {
          return false;
       }
@@ -470,18 +476,19 @@
     */
    public Fqn<E> getParent()
    {
-      switch (elements.size())
+      switch (size)
       {
          case 0:
          case 1:
             return root();
          default:
-            return new Fqn<E>(elements.subList(0, elements.size() - 1));
+            return new Fqn<E>(elements.subList(0, size - 1));
       }
    }
-   =

+
    @SuppressWarnings("unchecked")
-   public static <T> Fqn<T> root() {
+   public static <T> Fqn<T> root()
+   {
       return ROOT;
    }
 =

@@ -492,7 +499,7 @@
     */
    public boolean isRoot()
    {
-      return elements.isEmpty();
+      return size =3D=3D 0;
    }
 =

    /**

Modified: core/trunk/src/main/java/org/jboss/cache/buddyreplication/BuddyMa=
nager.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/java/org/jboss/cache/buddyreplication/BuddyManager.=
java	2008-01-03 13:29:35 UTC (rev 4967)
+++ core/trunk/src/main/java/org/jboss/cache/buddyreplication/BuddyManager.=
java	2008-01-03 19:17:09 UTC (rev 4968)
@@ -211,8 +211,7 @@
 =

    public static String getGroupNameFromAddress(Object address)
    {
-      String s =3D address.toString();
-      return s.replace(':', '_');
+      return address.toString().replace(':', '_');
    }
 =

    /**
@@ -622,12 +621,13 @@
    {
       if (isBackupFqn(origFqn))
          throw new CacheException("Cannot make a backup Fqn from a backup =
Fqn! Attempting to create a backup of " + origFqn);
-      List<Object> elements =3D new ArrayList<Object>();
+
+      List<Object> elements =3D new ArrayList<Object>(origFqn.size() + 2);
       elements.add(BUDDY_BACKUP_SUBTREE);
       elements.add(buddyGroupName);
       elements.addAll(origFqn.peekElements());
 =

-      return new Fqn(elements);
+      return new Fqn(elements, true);
    }
 =

    /**
@@ -640,17 +640,15 @@
     */
    public static Fqn getBackupFqn(Fqn buddyGroupRoot, Fqn origFqn)
    {
-      if (origFqn.isChildOf(buddyGroupRoot))
-      {
-         return origFqn;
-      }
+      if (isBackupFqn(origFqn))
+         throw new CacheException("Cannot make a backup Fqn from a backup =
Fqn! Attempting to create a backup of " + origFqn);
 =

-      List<Object> elements =3D new ArrayList<Object>();
+      List<Object> elements =3D new ArrayList<Object>(origFqn.size() + 2);
       elements.add(BUDDY_BACKUP_SUBTREE);
       elements.add(buddyGroupRoot.get(1));
       elements.addAll(origFqn.peekElements());
 =

-      return new Fqn(elements);
+      return new Fqn(elements, true);
    }
 =

    public static boolean isBackupFqn(Fqn name)
@@ -683,7 +681,7 @@
 =

    public MethodCall transformFqns(MethodCall call, boolean transformForCu=
rrentCall)
    {
-      if (call !=3D null && call.getArgs() !=3D null)
+      if (call !=3D null && call.getArgs() !=3D null && call.getMethodId()=
 !=3D MethodDeclarations.commitMethod_id)
       {
          MethodCall call2 =3D MethodCallFactory.create(call.getMethod(), c=
all.getArgs().clone());
          handleArgs(call2.getArgs(), transformForCurrentCall);
@@ -1009,13 +1007,7 @@
          if (args[i] instanceof MethodCall)
          {
             MethodCall call =3D (MethodCall) args[i];
-            boolean transformFqns =3D true;
-            if (call.getMethodId() =3D=3D MethodDeclarations.dataGravitati=
onCleanupMethod_id)
-            {
-               transformFqns =3D false;
-            }
-
-            args[i] =3D transformFqns((MethodCall) args[i], transformFqns);
+            args[i] =3D transformFqns((MethodCall) args[i], call.getMethod=
Id() !=3D MethodDeclarations.dataGravitationCleanupMethod_id);
          }
 =

          if (args[i] instanceof List && args[i] !=3D null)
@@ -1023,8 +1015,6 @@
             Object[] asArray =3D ((List) args[i]).toArray();
             handleArgs(asArray, transformForCurrentCall);
             List<Object> newList =3D new ArrayList<Object>(asArray.length);
-            // Oops! JDK 5.0!
-            //Collections.addAll(newList, asArray);
             newList.addAll(Arrays.asList(asArray));
             args[i] =3D newList;
          }

Modified: core/trunk/src/main/java/org/jboss/cache/interceptors/ActivationI=
nterceptor.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/java/org/jboss/cache/interceptors/ActivationInterce=
ptor.java	2008-01-03 13:29:35 UTC (rev 4967)
+++ core/trunk/src/main/java/org/jboss/cache/interceptors/ActivationInterce=
ptor.java	2008-01-03 19:17:09 UTC (rev 4968)
@@ -47,18 +47,15 @@
 =

    public ActivationInterceptor()
    {
-      this.useCacheStore =3D false;
-      isActivation =3D true;
+      initLogger();
    }
 =

    @Override
    protected Object handleRemoveDataMethod(InvocationContext ctx, GlobalTr=
ansaction tx, Fqn fqn, boolean createUndoOps) throws Throwable
    {
       Object returnValue =3D super.handleRemoveDataMethod(ctx, tx, fqn, cr=
eateUndoOps);
-      if (log.isTraceEnabled())
-      {
+      if (trace)
          log.trace("This is a remove data operation; removing the data fro=
m the loader, no activation processing needed.");
-      }
       loader.removeData(fqn);
       return returnValue;
    }
@@ -67,10 +64,8 @@
    protected Object handleRemoveNodeMethod(InvocationContext ctx, GlobalTr=
ansaction tx, Fqn fqn, boolean createUndoOps) throws Throwable
    {
       Object returnValue =3D super.handleRemoveNodeMethod(ctx, tx, fqn, cr=
eateUndoOps);
-      if (log.isTraceEnabled())
-      {
+      if (trace)
          log.trace("This is a remove operation; removing the node from the=
 loader, no activation processing needed.");
-      }
       loader.remove(fqn);
       return returnValue;
    }

Modified: core/trunk/src/main/java/org/jboss/cache/interceptors/BaseRpcInte=
rceptor.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/java/org/jboss/cache/interceptors/BaseRpcIntercepto=
r.java	2008-01-03 13:29:35 UTC (rev 4967)
+++ core/trunk/src/main/java/org/jboss/cache/interceptors/BaseRpcIntercepto=
r.java	2008-01-03 19:17:09 UTC (rev 4968)
@@ -70,24 +70,24 @@
       }
    }
 =

-   protected void replicateCall(MethodCall call, boolean sync, Option o) t=
hrows Throwable
+   protected void replicateCall(InvocationContext ctx, MethodCall call, bo=
olean sync, Option o) throws Throwable
    {
-      replicateCall(null, call, sync, o);
+      replicateCall(ctx, null, call, sync, o);
    }
 =

-   protected void replicateCall(List<Address> recipients, MethodCall call,=
 boolean sync, Option o) throws Throwable
+   protected void replicateCall(InvocationContext ctx, List<Address> recip=
ients, MethodCall call, boolean sync, Option o) throws Throwable
    {
-      replicateCall(recipients, call, sync, o, true);
+      replicateCall(ctx, recipients, call, sync, o, true);
    }
 =

-   protected void replicateCall(List<Address> recipients, MethodCall call,=
 boolean sync, Option o, boolean wrapMethodCallInReplicateMethod) throws Th=
rowable
+   protected void replicateCall(InvocationContext ctx, List<Address> recip=
ients, MethodCall call, boolean sync, Option o, boolean wrapMethodCallInRep=
licateMethod) throws Throwable
    {
 =

-      if (log.isTraceEnabled()) log.trace("Broadcasting call " + call + " =
to recipient list " + recipients);
-      Transaction tx =3D null;
-      if (cache.getTransactionManager() !=3D null && (tx =3D cache.getTran=
sactionManager().getTransaction()) !=3D null)
+      if (trace) log.trace("Broadcasting call " + call + " to recipient li=
st " + recipients);
+      Transaction tx =3D ctx.getTransaction();
+      if (tx !=3D null)
       {
-         GlobalTransaction gtx =3D cache.getTransactionTable().get(tx);
+         GlobalTransaction gtx =3D ctx.getGlobalTransaction();
          TransactionEntry te =3D cache.getTransactionTable().get(gtx);
          if (te !=3D null)
          {
@@ -107,7 +107,7 @@
          if (callRecipients =3D=3D null)
          {
             callRecipients =3D usingBuddyReplication ? buddyManager.getBud=
dyAddresses() : cache.getMembers();
-            if (log.isTraceEnabled())
+            if (trace)
                log.trace("Setting call recipients to " + callRecipients + =
" since the original list of recipients passed in is null.");
          }
 =

@@ -121,10 +121,7 @@
                sync, // is synchronised?
                true, // ignore self?
                (int) syncReplTimeout);
-         if (log.isTraceEnabled())
-         {
-            log.trace("responses=3D" + rsps);
-         }
+         if (trace) log.trace("responses=3D" + rsps);
          if (sync) checkResponses(rsps);
       }
 =


Modified: core/trunk/src/main/java/org/jboss/cache/interceptors/BaseTransac=
tionalContextInterceptor.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/java/org/jboss/cache/interceptors/BaseTransactional=
ContextInterceptor.java	2008-01-03 13:29:35 UTC (rev 4967)
+++ core/trunk/src/main/java/org/jboss/cache/interceptors/BaseTransactional=
ContextInterceptor.java	2008-01-03 19:17:09 UTC (rev 4968)
@@ -44,8 +44,11 @@
 =

    protected void setTransactionalContext(Transaction tx, GlobalTransactio=
n gtx, InvocationContext ctx)
    {
-      log.trace("Setting up transactional context.");
-      if (log.isTraceEnabled()) log.trace("Setting tx as " + tx + " and gt=
x as " + gtx);
+      if (trace)
+      {
+         log.trace("Setting up transactional context.");
+         log.trace("Setting tx as " + tx + " and gtx as " + gtx);
+      }
       ctx.setTransaction(tx);
       ctx.setGlobalTransaction(gtx);
    }

Modified: core/trunk/src/main/java/org/jboss/cache/interceptors/CacheLoader=
Interceptor.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/java/org/jboss/cache/interceptors/CacheLoaderInterc=
eptor.java	2008-01-03 13:29:35 UTC (rev 4967)
+++ core/trunk/src/main/java/org/jboss/cache/interceptors/CacheLoaderInterc=
eptor.java	2008-01-03 19:17:09 UTC (rev 4968)
@@ -1,6 +1,5 @@
 package org.jboss.cache.interceptors;
 =

-import org.apache.commons.logging.LogFactory;
 import org.jboss.cache.CacheException;
 import org.jboss.cache.Fqn;
 import org.jboss.cache.InvocationContext;
@@ -45,7 +44,7 @@
 =

    public CacheLoaderInterceptor()
    {
-      log =3D LogFactory.getLog(getClass());
+      initLogger();
    }
 =

    /**
@@ -211,8 +210,7 @@
    protected Object handleRollbackMethod(InvocationContext ctx, GlobalTran=
saction globalTransaction) throws Throwable
    {
       // clean up nodesCreated map
-      boolean traceEnabled =3D log.isTraceEnabled();
-      log.trace("Removing temporarily created nodes from treecache");
+      if (trace) log.trace("Removing temporarily created nodes from treeca=
che");
 =

       // this needs to be done in reverse order.
       List list =3D getTransactionEntry(ctx).getDummyNodesCreatedByCacheLo=
ader();
@@ -228,7 +226,7 @@
             }
             catch (CacheException e)
             {
-               if (traceEnabled) log.trace("Unable to evict node " + fqn, =
e);
+               if (trace) log.trace("Unable to evict node " + fqn, e);
             }
          }
       }
@@ -270,7 +268,7 @@
       NodeSPI n =3D cache.peek(fqn, true, true);
 =

       boolean mustLoad =3D mustLoad(n, key, allKeys);
-      if (log.isTraceEnabled())
+      if (trace)
       {
          log.trace("load element " + fqn + " mustLoad=3D" + mustLoad);
       }
@@ -333,12 +331,12 @@
 =

       if (node !=3D null && node.isChildrenLoaded())
       {
-         log.trace("Children already loaded!");
+         if (trace) log.trace("Children already loaded!");
          return;
       }
       Set children_names =3D loader.getChildrenNames(fqn);
 =

-      if (log.isTraceEnabled())
+      if (trace)
       {
          log.trace("load children " + fqn + " children=3D" + children_name=
s);
       }
@@ -396,7 +394,7 @@
    {
       if (n =3D=3D null)
       {
-         log.trace("must load, node null");
+         if (trace) log.trace("must load, node null");
          return true;
       }
 =

@@ -404,7 +402,7 @@
       if (!n.isValid() && cache.getConfiguration().isNodeLockingOptimistic=
())
       {
          // attempt to load again; this only happens if we have tombstones=
 lying around, or we are using invalidation.
-         log.trace("loading again from cache loader since in-memory node i=
s marked as invalid");
+         if (trace) log.trace("loading again from cache loader since in-me=
mory node is marked as invalid");
          return true;
       }
 =

@@ -414,18 +412,18 @@
          // if we are not looking for a specific key don't bother loading!
          if (key =3D=3D null)
          {
-            log.trace("don't load, key requested is null");
+            if (trace) log.trace("don't load, key requested is null");
             return false;
          }
          if (n.getKeysDirect().contains(key))
          {
-            log.trace("don't load, already have necessary key in memory");
+            if (trace) log.trace("don't load, already have necessary key i=
n memory");
             return false;
          }
       }
       if (!n.isDataLoaded())
       {
-         log.trace("must Load, uninitialized");
+         if (trace) log.trace("must Load, uninitialized");
          return true;
       }
       return false;
@@ -520,11 +518,11 @@
     */
    private NodeSPI loadNode(InvocationContext ctx, Fqn fqn, NodeSPI n, Tra=
nsactionEntry entry) throws Exception
    {
-      if (log.isTraceEnabled()) log.trace("loadNode " + fqn);
+      if (trace) log.trace("loadNode " + fqn);
       Map nodeData =3D loadData(fqn);
       if (nodeData !=3D null)
       {
-         log.trace("Node data is not null, loading");
+         if (trace) log.trace("Node data is not null, loading");
 =

          cache.getNotifier().notifyNodeLoaded(fqn, true, Collections.empty=
Map(), ctx);
          if (isActivation)
@@ -548,7 +546,7 @@
 =

       if (n !=3D null && !n.isDataLoaded())
       {
-         log.trace("Setting dataLoaded to true");
+         if (trace) log.trace("Setting dataLoaded to true");
          n.setDataLoaded(true);
       }
       return n;
@@ -561,7 +559,7 @@
    {
       NodeSPI n =3D createNodes(fqn, entry);
       n.setDataLoaded(false);
-      if (log.isTraceEnabled())
+      if (trace)
       {
          log.trace("createTempNode n " + n);
       }
@@ -623,7 +621,7 @@
 =

       Map nodeData =3D loader.get(fqn);
       boolean nodeExists =3D (nodeData !=3D null);
-      if (log.isTraceEnabled()) log.trace("nodeExists " + nodeExists);
+      if (trace) log.trace("nodeExists " + nodeExists);
 =

       if (configuration.getExposeManagementStatistics() && getStatisticsEn=
abled())
       {

Modified: core/trunk/src/main/java/org/jboss/cache/interceptors/CacheMgmtIn=
terceptor.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/java/org/jboss/cache/interceptors/CacheMgmtIntercep=
tor.java	2008-01-03 13:29:35 UTC (rev 4967)
+++ core/trunk/src/main/java/org/jboss/cache/interceptors/CacheMgmtIntercep=
tor.java	2008-01-03 19:17:09 UTC (rev 4968)
@@ -21,7 +21,6 @@
  */
 package org.jboss.cache.interceptors;
 =

-import org.apache.commons.logging.LogFactory;
 import org.jboss.cache.Fqn;
 import org.jboss.cache.InvocationContext;
 import org.jboss.cache.optimistic.DataVersion;
@@ -50,7 +49,7 @@
 =

    public CacheMgmtInterceptor()
    {
-      log =3D LogFactory.getLog(getClass());
+      initLogger();
    }
 =

    @Override

Modified: core/trunk/src/main/java/org/jboss/cache/interceptors/CacheStoreI=
nterceptor.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/java/org/jboss/cache/interceptors/CacheStoreInterce=
ptor.java	2008-01-03 13:29:35 UTC (rev 4967)
+++ core/trunk/src/main/java/org/jboss/cache/interceptors/CacheStoreInterce=
ptor.java	2008-01-03 19:17:09 UTC (rev 4968)
@@ -1,6 +1,5 @@
 package org.jboss.cache.interceptors;
 =

-import org.apache.commons.logging.LogFactory;
 import org.jboss.cache.CacheException;
 import org.jboss.cache.Fqn;
 import org.jboss.cache.InvocationContext;
@@ -48,7 +47,7 @@
 =

    public CacheStoreInterceptor()
    {
-      log =3D LogFactory.getLog(getClass());
+      initLogger();
    }
 =

    @Start
@@ -68,7 +67,7 @@
    {
       if (!ctx.isOriginLocal() && loaderConfig.isShared())
       {
-         if (log.isTraceEnabled())
+         if (trace)
          {
             log.trace("Passing up method call and bypassing this intercept=
or since the cache loader is shared and this call originated remotely.");
          }
@@ -82,11 +81,11 @@
    {
       if (inTransaction())
       {
-         log.trace("transactional so don't put stuff in the cloader yet.");
+         if (trace) log.trace("transactional so don't put stuff in the clo=
ader yet.");
          if (ctx.isTxHasMods())
          {
             // this is a commit call.
-            if (log.isTraceEnabled()) log.trace("Calling loader.commit() f=
or gtx " + gtx);
+            if (trace) log.trace("Calling loader.commit() for gtx " + gtx);
             // sync call (a write) on the loader
             // ignore modified FQNs
             // List fqnsModified =3D getFqnsFromModificationList(tx_table.=
get(gtx).getCacheLoaderModifications());
@@ -119,7 +118,7 @@
          }
          else
          {
-            log.trace("Commit called with no modifications; ignoring.");
+            if (trace) log.trace("Commit called with no modifications; ign=
oring.");
          }
       }
       return nextInterceptor(ctx);
@@ -130,7 +129,7 @@
    {
       if (inTransaction())
       {
-         log.trace("transactional so don't put stuff in the cloader yet.");
+         if (trace) log.trace("transactional so don't put stuff in the clo=
ader yet.");
          if (ctx.isTxHasMods())
          {
             // this is a rollback method
@@ -146,7 +145,7 @@
          }
          else
          {
-            log.trace("Rollback called with no modifications; ignoring.");
+            if (trace) log.trace("Rollback called with no modifications; i=
gnoring.");
          }
       }
       return nextInterceptor(ctx);
@@ -157,7 +156,7 @@
    {
       if (inTransaction())
       {
-         log.trace("transactional so don't put stuff in the cloader yet.");
+         if (trace) log.trace("transactional so don't put stuff in the clo=
ader yet.");
          prepareCacheLoader(gtx, ctx.getMethodCall().isOnePhaseCommitPrepa=
reMehod());
       }
       return nextInterceptor(ctx);
@@ -168,7 +167,7 @@
    {
       if (inTransaction())
       {
-         log.trace("transactional so don't put stuff in the cloader yet.");
+         if (trace) log.trace("transactional so don't put stuff in the clo=
ader yet.");
          prepareCacheLoader(gtx, ctx.getMethodCall().isOnePhaseCommitPrepa=
reMehod());
       }
       return nextInterceptor(ctx);
@@ -368,10 +367,10 @@
       modifications =3D entry.getCacheLoaderModifications();
       if (modifications.size() =3D=3D 0)
       {
-         log.trace("Transaction has not logged any modifications!");
+         if (trace) log.trace("Transaction has not logged any modification=
s!");
          return;
       }
-      if (log.isTraceEnabled()) log.trace("Cache loader modification list:=
 " + modifications);
+      if (trace) log.trace("Cache loader modification list: " + modificati=
ons);
       List cache_loader_modifications =3D new ArrayList();
       for (MethodCall methodCall : modifications)
       {
@@ -388,7 +387,7 @@
             }
          }
       }
-      if (log.isTraceEnabled())
+      if (trace)
       {
          log.trace("Converted method calls to cache loader modifications. =
 List size: " + cache_loader_modifications.size());
       }
@@ -410,7 +409,7 @@
     */
    private Modification convertMethodCallToModification(MethodCall methodC=
all, Set<Fqn> affectedFqns) throws Exception
    {
-      if (log.isTraceEnabled()) log.trace("Converting method call " + meth=
odCall + " to modification.");
+      if (trace) log.trace("Converting method call " + methodCall + " to m=
odification.");
       Method method =3D methodCall.getMethod();
       Object[] args;
       if (method =3D=3D null)
@@ -457,7 +456,7 @@
             throw new CacheException("method call " + method.getName() + "=
 cannot be converted to a modification");
       }
       affectedFqns.add(fqn);
-      if (log.isTraceEnabled()) log.trace("Converted " + methodCall + " to=
 Modification of type " + mod.getType());
+      if (trace) log.trace("Converted " + methodCall + " to Modification o=
f type " + mod.getType());
       return mod;
    }
 }

Modified: core/trunk/src/main/java/org/jboss/cache/interceptors/CallInterce=
ptor.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/java/org/jboss/cache/interceptors/CallInterceptor.j=
ava	2008-01-03 13:29:35 UTC (rev 4967)
+++ core/trunk/src/main/java/org/jboss/cache/interceptors/CallInterceptor.j=
ava	2008-01-03 19:17:09 UTC (rev 4968)
@@ -28,6 +28,11 @@
    private CacheImpl cacheImpl;
    private CacheSPI remoteDelegate;
 =

+   public CallInterceptor()
+   {
+      initLogger();
+   }
+
    @Inject
    private void injectDependencies(CacheImpl cacheImpl, @ComponentName("re=
moteDelegate")CacheSPI remoteDelegate)
    {
@@ -42,7 +47,7 @@
 =

       if (!MethodDeclarations.isTransactionLifecycleMethod(m.getMethodId()=
))
       {
-         if (log.isTraceEnabled()) log.trace("Passing up method " + m + " =
so it gets invoked on cache.");
+         if (trace) log.trace("Passing up method " + m + " so it gets invo=
ked on cache.");
          try
          {
             retval =3D m.invoke(m.getMethodId() =3D=3D MethodDeclarations.=
dataGravitationCleanupMethod_id ? remoteDelegate : cacheImpl);
@@ -54,7 +59,7 @@
       }
       else
       {
-         if (log.isTraceEnabled()) log.trace("Suppressing invocation of me=
thod " + m + " on cache.");
+         if (trace) log.trace("Suppressing invocation of method " + m + " =
on cache.");
       }
 =

       Transaction tx =3D ctx.getTransaction();

Modified: core/trunk/src/main/java/org/jboss/cache/interceptors/DataGravita=
torInterceptor.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/java/org/jboss/cache/interceptors/DataGravitatorInt=
erceptor.java	2008-01-03 13:29:35 UTC (rev 4967)
+++ core/trunk/src/main/java/org/jboss/cache/interceptors/DataGravitatorInt=
erceptor.java	2008-01-03 19:17:09 UTC (rev 4968)
@@ -6,7 +6,6 @@
  */
 package org.jboss.cache.interceptors;
 =

-import org.apache.commons.logging.LogFactory;
 import org.jboss.cache.CacheException;
 import org.jboss.cache.CacheSPI;
 import org.jboss.cache.Fqn;
@@ -61,7 +60,7 @@
 =

    public DataGravitatorInterceptor()
    {
-      log =3D LogFactory.getLog(getClass());
+      initLogger();
    }
 =

    @Override
@@ -166,7 +165,7 @@
       if (isGravitationEnabled(ctx))
       {
          // test that the Fqn being requested exists locally in the cache.
-         if (log.isTraceEnabled()) log.trace("Checking local existence of =
fqn " + fqn);
+         if (trace) log.trace("Checking local existence of fqn " + fqn);
          if (BuddyManager.isBackupFqn(fqn))
          {
             log.info("Is call for a backup Fqn, not performing any gravita=
tion.  Direct calls on internal backup nodes are *not* supported.");
@@ -175,12 +174,12 @@
          {
             if (cache.peek(fqn, false) =3D=3D null)
             {
-               log.trace("Gravitating from local backup tree");
+               if (trace) log.trace("Gravitating from local backup tree");
                BackupData data =3D localBackupGet(fqn, ctx);
 =

                if (data =3D=3D null)
                {
-                  log.trace("Gravitating from remote backup tree");
+                  if (trace) log.trace("Gravitating from remote backup tre=
e");
                   // gravitate remotely.
                   data =3D remoteBackupGet(fqn);
                }
@@ -191,7 +190,8 @@
                   // when I do the put() call to the cluster!
                   //createNode(data.backupData, true);
                   // Make sure I replicate to my buddies.
-                  log.trace("Passing the put call locally to make sure sta=
te is persisted and ownership is correctly established.");
+                  if (trace)
+                     log.trace("Passing the put call locally to make sure =
state is persisted and ownership is correctly established.");
                   createNode(data.backupData, false);
 =

                   // very strange, the invocation contexts get twisted up =
here, and will need preservation.
@@ -204,13 +204,13 @@
             }
             else
             {
-               log.trace("No need to gravitate; have this already.");
+               if (trace) log.trace("No need to gravitate; have this alrea=
dy.");
             }
          }
       }
       else
       {
-         if (log.isTraceEnabled())
+         if (trace)
          {
             log.trace("Suppressing data gravitation for this call.");
          }
@@ -234,7 +234,7 @@
    private void doPrepare(GlobalTransaction gtx, InvocationContext ctx) th=
rows Throwable
    {
       MethodCall cleanup =3D transactionMods.get(gtx);
-      if (log.isTraceEnabled()) log.trace("Broadcasting prepare for cleanu=
p ops " + cleanup);
+      if (trace) log.trace("Broadcasting prepare for cleanup ops " + clean=
up);
       if (cleanup !=3D null)
       {
          MethodCall prepare;
@@ -249,11 +249,11 @@
             prepare =3D MethodCallFactory.create(MethodDeclarations.prepar=
eMethod, gtx, mods, cache.getLocalAddress(), syncCommunications);
          }
 =

-         replicateCall(getMembersOutsideBuddyGroup(), prepare, syncCommuni=
cations, ctx.getOptionOverrides());
+         replicateCall(ctx, getMembersOutsideBuddyGroup(), prepare, syncCo=
mmunications, ctx.getOptionOverrides());
       }
       else
       {
-         if (log.isTraceEnabled()) log.trace("Nothing to broadcast in prep=
are phase for gtx " + gtx);
+         if (trace) log.trace("Nothing to broadcast in prepare phase for g=
tx " + gtx);
       }
    }
 =

@@ -261,12 +261,12 @@
    {
       if (transactionMods.containsKey(gtx))
       {
-         if (log.isTraceEnabled()) log.trace("Broadcasting commit for gtx =
" + gtx);
-         replicateCall(getMembersOutsideBuddyGroup(), MethodCallFactory.cr=
eate(MethodDeclarations.commitMethod, gtx), syncCommunications, ctx.getOpti=
onOverrides());
+         if (trace) log.trace("Broadcasting commit for gtx " + gtx);
+         replicateCall(ctx, getMembersOutsideBuddyGroup(), MethodCallFacto=
ry.create(MethodDeclarations.commitMethod, gtx), syncCommunications, ctx.ge=
tOptionOverrides());
       }
       else
       {
-         if (log.isTraceEnabled()) log.trace("Nothing to broadcast in comm=
it phase for gtx " + gtx);
+         if (trace) log.trace("Nothing to broadcast in commit phase for gt=
x " + gtx);
       }
    }
 =

@@ -287,7 +287,7 @@
 =

       if (gr.isDataFound())
       {
-         if (log.isTraceEnabled())
+         if (trace)
          {
             log.trace("Got response " + gr);
          }
@@ -303,18 +303,18 @@
       MethodCall cleanup =3D MethodCallFactory.create(MethodDeclarations.d=
ataGravitationCleanupMethod, backup.primaryFqn, backup.backupFqn);
 =

 =

-      if (log.isTraceEnabled()) log.trace("Performing cleanup on [" + back=
up.primaryFqn + "]");
+      if (trace) log.trace("Performing cleanup on [" + backup.primaryFqn +=
 "]");
       if (gtx =3D=3D null)
       {
          // broadcast removes
          // remove main Fqn
-         if (log.isTraceEnabled()) log.trace("Performing cleanup on [" + b=
ackup.backupFqn + "]");
+         if (trace) log.trace("Performing cleanup on [" + backup.backupFqn=
 + "]");
          // remove backup Fqn
-         replicateCall(cache.getMembers(), cleanup, syncCommunications, ct=
x.getOptionOverrides(), false);
+         replicateCall(ctx, cache.getMembers(), cleanup, syncCommunication=
s, ctx.getOptionOverrides(), false);
       }
       else
       {
-         if (log.isTraceEnabled())
+         if (trace)
          {
             log.trace("Data gravitation performed under global transaction=
 " + gtx + ".  Not broadcasting cleanups until the tx commits.  Adding to t=
x mod list instead.");
          }
@@ -326,7 +326,7 @@
 =

    private GravitateResult gravitateData(Fqn fqn) throws Exception
    {
-      if (log.isTraceEnabled())
+      if (trace)
       {
          log.trace("cache=3D" + cache.getLocalAddress() + "; requesting da=
ta gravitation for Fqn " + fqn);
       }
@@ -336,7 +336,7 @@
       // doing a GET_ALL is crappy but necessary since JGroups' GET_FIRST =
could return null results from nodes that do
       // not have either the primary OR backup, and stop polling other val=
id nodes.
       List resps =3D cache.getRPCManager().callRemoteMethods(mbrs, dGrav, =
GroupRequest.GET_ALL, true, buddyManager.getBuddyCommunicationTimeout(), ne=
w ResponseValidityFilter(mbrs, cache.getLocalAddress()));
-      if (log.isTraceEnabled())
+      if (trace)
       {
          log.trace("got responses " + resps);
       }
@@ -409,7 +409,7 @@
          NodeSPI child_node =3D n.addChildDirect(new Fqn<Object>(child_nam=
e));
          if (child_node =3D=3D null)
          {
-            if (log.isTraceEnabled())
+            if (trace)
             {
                log.trace("failed to find or create child " + child_name + =
" of node " + n.getFqn());
             }

Modified: core/trunk/src/main/java/org/jboss/cache/interceptors/EvictionInt=
erceptor.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/java/org/jboss/cache/interceptors/EvictionIntercept=
or.java	2008-01-03 13:29:35 UTC (rev 4967)
+++ core/trunk/src/main/java/org/jboss/cache/interceptors/EvictionIntercept=
or.java	2008-01-03 19:17:09 UTC (rev 4968)
@@ -7,7 +7,6 @@
  */
 package org.jboss.cache.interceptors;
 =

-import org.apache.commons.logging.LogFactory;
 import org.jboss.cache.Fqn;
 import org.jboss.cache.InvocationContext;
 import org.jboss.cache.NodeSPI;
@@ -42,13 +41,13 @@
    @Inject
    void setRegionManager(RegionManager regionManager)
    {
-      log.trace("Having region manager " + regionManager + " injected.");
+      if (trace) log.trace("Having region manager " + regionManager + " in=
jected.");
       this.regionManager =3D regionManager;
    }
 =

    public EvictionInterceptor()
    {
-      log =3D LogFactory.getLog(getClass());
+      initLogger();
    }
 =

    @Override
@@ -100,7 +99,7 @@
       {
          if (newData =3D=3D null)
          {
-            if (log.isTraceEnabled())
+            if (trace)
             {
                log.trace("Putting null data under fqn " + fqn + ".");
             }
@@ -128,7 +127,7 @@
       {
          if (data =3D=3D null)
          {
-            if (log.isTraceEnabled())
+            if (trace)
             {
                log.trace("Putting null data under fqn " + fqn + ".");
             }
@@ -153,7 +152,7 @@
       Object retVal =3D nextInterceptor(ctx);
       if (retVal =3D=3D null)
       {
-         if (log.isTraceEnabled())
+         if (trace)
          {
             log.trace("No event added. Element does not exist");
          }
@@ -175,7 +174,7 @@
       Object retVal =3D nextInterceptor(ctx);
       if (retVal =3D=3D null)
       {
-         if (log.isTraceEnabled())
+         if (trace)
          {
             log.trace("No event added. Node does not exist");
          }
@@ -202,7 +201,7 @@
       Object retVal =3D nextInterceptor(ctx);
       if (retVal =3D=3D null)
       {
-         if (log.isTraceEnabled())
+         if (trace)
          {
             log.trace("No event added. Element does not exist");
          }
@@ -249,12 +248,12 @@
       Region region =3D regionManager.getRegion(event.getFqn(), false);
       region.putNodeEvent(event);
 =

-      if (log.isTraceEnabled())
+      if (trace)
       {
          log.trace("Adding event " + event + " to region at " + region.get=
Fqn());
       }
 =

-      if (log.isTraceEnabled())
+      if (trace)
       {
          log.trace("Finished updating node");
       }

Modified: core/trunk/src/main/java/org/jboss/cache/interceptors/Interceptor=
.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/java/org/jboss/cache/interceptors/Interceptor.java	=
2008-01-03 13:29:35 UTC (rev 4967)
+++ core/trunk/src/main/java/org/jboss/cache/interceptors/Interceptor.java	=
2008-01-03 19:17:09 UTC (rev 4968)
@@ -49,10 +49,17 @@
    protected Log log =3D null;
    protected Configuration configuration;
    private boolean statsEnabled =3D false;
+   protected boolean trace;
 =

    public Interceptor()
    {
+      initLogger();
+   }
+
+   protected void initLogger()
+   {
       log =3D LogFactory.getLog(getClass());
+      trace =3D log.isTraceEnabled();
    }
 =

    public void setNext(Interceptor i)

Modified: core/trunk/src/main/java/org/jboss/cache/interceptors/Invalidatio=
nInterceptor.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/java/org/jboss/cache/interceptors/InvalidationInter=
ceptor.java	2008-01-03 13:29:35 UTC (rev 4967)
+++ core/trunk/src/main/java/org/jboss/cache/interceptors/InvalidationInter=
ceptor.java	2008-01-03 19:17:09 UTC (rev 4968)
@@ -6,7 +6,6 @@
  */
 package org.jboss.cache.interceptors;
 =

-import org.apache.commons.logging.LogFactory;
 import org.jboss.cache.CacheSPI;
 import org.jboss.cache.Fqn;
 import org.jboss.cache.InvocationContext;
@@ -56,7 +55,7 @@
 =

    public InvalidationInterceptor()
    {
-      log =3D LogFactory.getLog(getClass());
+      initLogger();
    }
 =

    public void setCache(CacheSPI cache)
@@ -81,7 +80,7 @@
          // skip replication!!
          return true;
       }
-      if (log.isTraceEnabled()) log.trace("(" + cache.getLocalAddress() + =
") method call " + ctx.getMethodCall());
+      if (trace) log.trace("(" + cache.getLocalAddress() + ") method call =
" + ctx.getMethodCall());
       return false;
    }
 =

@@ -338,7 +337,7 @@
 =

       if (log.isDebugEnabled()) log.debug("Cache [" + cache.getLocalAddres=
s() + "] replicating " + call);
       // voila, invalidated!
-      replicateCall(call, synchronous, ctx.getOptionOverrides());
+      replicateCall(ctx, call, synchronous, ctx.getOptionOverrides());
    }
 =

    protected DataVersion getNodeVersion(TransactionWorkspace w, Fqn f)

Modified: core/trunk/src/main/java/org/jboss/cache/interceptors/InvocationC=
ontextInterceptor.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/java/org/jboss/cache/interceptors/InvocationContext=
Interceptor.java	2008-01-03 13:29:35 UTC (rev 4967)
+++ core/trunk/src/main/java/org/jboss/cache/interceptors/InvocationContext=
Interceptor.java	2008-01-03 19:17:09 UTC (rev 4968)
@@ -6,7 +6,6 @@
  */
 package org.jboss.cache.interceptors;
 =

-import org.apache.commons.logging.LogFactory;
 import org.jboss.cache.InvocationContext;
 import org.jboss.cache.config.Option;
 import org.jboss.cache.marshall.MethodCall;
@@ -25,7 +24,7 @@
 {
    public InvocationContextInterceptor()
    {
-      log =3D LogFactory.getLog(getClass());
+      initLogger();
    }
 =

    @Override
@@ -37,9 +36,11 @@
       Transaction suspendedTransaction =3D null;
       boolean resumeSuspended =3D false;
 =

-      if (log.isTraceEnabled())
+      if (trace)
          log.trace("Invoked on cache instance [" + cache.getLocalAddress()=
 + "] and InvocationContext [" + ctx + "]");
 =

+      if (MethodDeclarations.isBlockUnblockMethod(call.getMethodId())) ret=
urn nextInterceptor(ctx);
+
       try
       {
          Transaction tx =3D getTransaction();
@@ -56,12 +57,12 @@
                {
                   suspendedTransaction =3D txManager.suspend();
                   setTransactionalContext(null, null, ctx);
-                  if (log.isTraceEnabled()) log.trace("Suspending transact=
ion " + suspendedTransaction);
+                  if (trace) log.trace("Suspending transaction " + suspend=
edTransaction);
                   resumeSuspended =3D true;
                }
                else
                {
-                  log.trace("No ongoing transaction to suspend");
+                  if (trace) log.trace("No ongoing transaction to suspend"=
);
                }
             }
          }
@@ -92,7 +93,7 @@
       finally
       {
          // clean up any invocation-scope options set up
-         log.trace("Resetting invocation-scope options");
+         if (trace) log.trace("Resetting invocation-scope options");
          ctx.getOptionOverrides().reset();
 =

          if (resumeSuspended)
@@ -111,16 +112,9 @@
 =

    private GlobalTransaction getGlobalTransaction(Transaction tx, MethodCa=
ll call)
    {
-      GlobalTransaction gtx =3D null;
-      if (MethodDeclarations.isTransactionLifecycleMethod(call.getMethodId=
()))
-      {
-         gtx =3D findGlobalTransaction(call.getArgs());
-         gtx.setRemote(isRemoteGlobalTx(gtx));
-      }
-      else
-      {
-         gtx =3D cache.getCurrentTransaction(tx, false);
-      }
+      GlobalTransaction gtx =3D findGlobalTransaction(call.getArgs());
+      if (gtx =3D=3D null) gtx =3D cache.getCurrentTransaction(tx, false);
+      if (gtx !=3D null) gtx.setRemote(isRemoteGlobalTx(gtx));
 =

       return gtx;
    }
@@ -130,7 +124,7 @@
       // this creates a context if one did not exist.
       if (txManager =3D=3D null)
       {
-         log.trace("no transaction manager configured, setting tx as null.=
");
+         if (trace) log.trace("no transaction manager configured, setting =
tx as null.");
          return null;
       }
       else

Modified: core/trunk/src/main/java/org/jboss/cache/interceptors/MethodDispa=
cherInterceptor.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/java/org/jboss/cache/interceptors/MethodDispacherIn=
terceptor.java	2008-01-03 13:29:35 UTC (rev 4967)
+++ core/trunk/src/main/java/org/jboss/cache/interceptors/MethodDispacherIn=
terceptor.java	2008-01-03 19:17:09 UTC (rev 4968)
@@ -10,10 +10,8 @@
 import org.jboss.cache.transaction.GlobalTransaction;
 import org.jgroups.Address;
 =

-import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
-import java.util.Set;
 =

 /**
  * The purpose of this interceptor is to supply a nicer way of handling th=
e interception of desired methods:
@@ -36,32 +34,37 @@
 public abstract class MethodDispacherInterceptor extends Interceptor
 {
    /**
-    * List of the method the extending interceptor pverwrites. It is only =
those methods that will be called.
+    * Methods that have been overridden.  This is encoded in the bits of a=
n integer, with each ordinal position representing a method id.
+    * This was originally a Set but that proved way too inefficient with c=
onstant boxing/unboxing of ints and doing Set.contains()
+    * for each invocation for each interceptor.  - Manik, Jan '08.
     */
-   private Set<Integer> overriddenMethods =3D new HashSet<Integer>();
+   private long overriddenMethods =3D 0;
 =

    protected MethodDispacherInterceptor()
    {
       findOverriddenMethods();
    }
 =

+   private boolean noHandlersRegistered(int id)
+   {
+      return (overriddenMethods & ((long) 1 << id)) < 1;
+   }
+
    /**
     * Acts like a 'switch case' that delegates the call to the appropriate=
 method.
     */
    public Object invoke(InvocationContext ctx) throws Throwable
    {
-      if (log.isTraceEnabled())
-      {
-         log.trace("Invoked with method call " + ctx.getMethodCall());
-      }
+      if (trace) log.trace("Invoked with method call " + ctx.getMethodCall=
());
+
       if (skipMethodCall(ctx))
       {
          return nextInterceptor(ctx);
       }
       MethodCall m =3D ctx.getMethodCall();
-      if (!overriddenMethods.contains(m.getMethodId()))
+      if (noHandlersRegistered(m.getMethodId()))
       {
-         log.trace("Not registered for any handlers, passing up the chain.=
");
+         if (trace) log.trace("Not registered for any handlers, passing up=
 the chain.");
          return nextInterceptor(ctx);
       }
       Object[] args =3D m.getArgs();
@@ -468,7 +471,7 @@
     */
    private Object defaultHandlersBehavior()
    {
-      throw new IllegalStateException("this is either called from a derive=
d class or nt overwritten and accidentally called. Either way, is not corre=
ct.");
+      throw new IllegalStateException("this is either called from a derive=
d class or not overridden and accidentally called. Either way, is not corre=
ct.");
    }
 =

    /**
@@ -510,7 +513,6 @@
       checkIfOverridden(MethodDeclarations.blockChannelMethodLocal_id, "ha=
ndleBlockChannelMethod", InvocationContext.class);
       checkIfOverridden(MethodDeclarations.unblockChannelMethodLocal_id, "=
handleUnblockChannelMethod", InvocationContext.class);
       checkIfOverridden(MethodDeclarations.lockMethodLocal_id, "handleLock=
Method", InvocationContext.class, Fqn.class, NodeLock.LockType.class, boole=
an.class);
-
    }
 =

    private void checkIfOverridden(int methodId, String methodName, Class..=
. args)
@@ -522,7 +524,7 @@
          try
          {
             currentClass.getDeclaredMethod(methodName, args);
-            this.overriddenMethods.add(methodId);
+            overriddenMethods |=3D ((long) 1 << methodId);
          }
          catch (NoSuchMethodException e)
          {

Modified: core/trunk/src/main/java/org/jboss/cache/interceptors/Notificatio=
nInterceptor.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/java/org/jboss/cache/interceptors/NotificationInter=
ceptor.java	2008-01-03 13:29:35 UTC (rev 4967)
+++ core/trunk/src/main/java/org/jboss/cache/interceptors/NotificationInter=
ceptor.java	2008-01-03 19:17:09 UTC (rev 4968)
@@ -1,6 +1,5 @@
 package org.jboss.cache.interceptors;
 =

-import org.apache.commons.logging.LogFactory;
 import org.jboss.cache.InvocationContext;
 import org.jboss.cache.transaction.GlobalTransaction;
 =

@@ -14,7 +13,7 @@
 {
    public NotificationInterceptor()
    {
-      log =3D LogFactory.getLog(getClass());
+      initLogger();
    }
 =

    @Override

Modified: core/trunk/src/main/java/org/jboss/cache/interceptors/OptimisticC=
reateIfNotExistsInterceptor.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/java/org/jboss/cache/interceptors/OptimisticCreateI=
fNotExistsInterceptor.java	2008-01-03 13:29:35 UTC (rev 4967)
+++ core/trunk/src/main/java/org/jboss/cache/interceptors/OptimisticCreateI=
fNotExistsInterceptor.java	2008-01-03 19:17:09 UTC (rev 4968)
@@ -40,6 +40,11 @@
     */
    private NodeFactory nodeFactory;
 =

+   public OptimisticCreateIfNotExistsInterceptor()
+   {
+      initLogger();
+   }
+
    @Inject
    private void injectDependencies(NodeFactory nodeFactory)
    {

Modified: core/trunk/src/main/java/org/jboss/cache/interceptors/OptimisticI=
nterceptor.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/java/org/jboss/cache/interceptors/OptimisticInterce=
ptor.java	2008-01-03 13:29:35 UTC (rev 4967)
+++ core/trunk/src/main/java/org/jboss/cache/interceptors/OptimisticInterce=
ptor.java	2008-01-03 19:17:09 UTC (rev 4968)
@@ -29,15 +29,12 @@
 {
    protected TransactionManager txManager =3D null;
    protected TransactionTable txTable =3D null;
-   protected boolean trace;
 =

    @Inject
    private void injectDependencies(TransactionManager txManager, Transacti=
onTable txTable)
    {
       this.txManager =3D txManager;
       this.txTable =3D txTable;
-      trace =3D log !=3D null && log.isTraceEnabled();
-
    }
 =

    protected TransactionWorkspace getTransactionWorkspace(GlobalTransactio=
n gtx) throws CacheException

Modified: core/trunk/src/main/java/org/jboss/cache/interceptors/OptimisticL=
ockingInterceptor.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/java/org/jboss/cache/interceptors/OptimisticLocking=
Interceptor.java	2008-01-03 13:29:35 UTC (rev 4967)
+++ core/trunk/src/main/java/org/jboss/cache/interceptors/OptimisticLocking=
Interceptor.java	2008-01-03 19:17:09 UTC (rev 4968)
@@ -41,6 +41,11 @@
       lockAcquisitionTimeout =3D cache.getConfiguration().getLockAcquisiti=
onTimeout();
    }
 =

+   public OptimisticLockingInterceptor()
+   {
+      initLogger();
+   }
+
    @Override
    protected Object handleOptimisticPrepareMethod(InvocationContext ctx, G=
lobalTransaction gtx, List modifications, Map data, Address address, boolea=
n onePhaseCommit) throws Throwable
    {

Modified: core/trunk/src/main/java/org/jboss/cache/interceptors/OptimisticN=
odeInterceptor.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/java/org/jboss/cache/interceptors/OptimisticNodeInt=
erceptor.java	2008-01-03 13:29:35 UTC (rev 4967)
+++ core/trunk/src/main/java/org/jboss/cache/interceptors/OptimisticNodeInt=
erceptor.java	2008-01-03 19:17:09 UTC (rev 4968)
@@ -51,6 +51,11 @@
       this.nodeFactory =3D nodeFactory;
    }
 =

+   public OptimisticNodeInterceptor()
+   {
+      initLogger();
+   }
+
    @Override
    public Object invoke(InvocationContext ctx) throws Throwable
    {

Modified: core/trunk/src/main/java/org/jboss/cache/interceptors/OptimisticR=
eplicationInterceptor.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/java/org/jboss/cache/interceptors/OptimisticReplica=
tionInterceptor.java	2008-01-03 13:29:35 UTC (rev 4967)
+++ core/trunk/src/main/java/org/jboss/cache/interceptors/OptimisticReplica=
tionInterceptor.java	2008-01-03 19:17:09 UTC (rev 4968)
@@ -6,7 +6,6 @@
  */
 package org.jboss.cache.interceptors;
 =

-import org.apache.commons.logging.LogFactory;
 import org.jboss.cache.CacheException;
 import org.jboss.cache.Fqn;
 import org.jboss.cache.InvocationContext;
@@ -49,7 +48,7 @@
 =

    public OptimisticReplicationInterceptor()
    {
-      log =3D LogFactory.getLog(getClass());
+      initLogger();
    }
 =

    @Override
@@ -189,7 +188,7 @@
                   + " (" + num_mods + " modifications");
          }
 =

-         replicateCall(toBroadcast, remoteCallSync, ctx.getOptionOverrides=
());
+         replicateCall(ctx, toBroadcast, remoteCallSync, ctx.getOptionOver=
rides());
       }
       else
       {
@@ -218,7 +217,7 @@
             if (log.isDebugEnabled())
                log.debug("running remote commit for " + gtx + " and coord=
=3D" + cache.getLocalAddress());
 =

-            replicateCall(commit_method, remoteCallSync, ctx.getOptionOver=
rides());
+            replicateCall(ctx, commit_method, remoteCallSync, ctx.getOptio=
nOverrides());
          }
          catch (Exception e)
          {
@@ -242,7 +241,7 @@
 =

             if (log.isDebugEnabled())
                log.debug("running remote rollback for " + gtx + " and coor=
d=3D" + cache.getLocalAddress());
-            replicateCall(rollback_method, remoteCallSync, ctx.getOptionOv=
errides());
+            replicateCall(ctx, rollback_method, remoteCallSync, ctx.getOpt=
ionOverrides());
          }
          catch (Exception e)
          {
@@ -306,13 +305,13 @@
       WorkspaceNode n =3D w.getNode(f);
       if (n =3D=3D null)
       {
-         if (log.isTraceEnabled()) log.trace("Fqn " + f + " not found in w=
orkspace; not using a data version.");
+         if (trace) log.trace("Fqn " + f + " not found in workspace; not u=
sing a data version.");
          return null;
       }
       if (n.isVersioningImplicit())
       {
          DefaultDataVersion v =3D (DefaultDataVersion) n.getVersion();
-         if (log.isTraceEnabled())
+         if (trace)
             log.trace("Fqn " + f + " has implicit versioning.  Broadcastin=
g an incremented version.");
 =

          // potential bug here - need to check if we *need* to increment a=
t all, because of Configuration.isLockParentForChildInsertRemove() =

@@ -320,7 +319,7 @@
       }
       else
       {
-         if (log.isTraceEnabled()) log.trace("Fqn " + f + " has explicit v=
ersioning.  Broadcasting the version as-is.");
+         if (trace) log.trace("Fqn " + f + " has explicit versioning.  Bro=
adcasting the version as-is.");
          return n.getVersion();
       }
    }

Modified: core/trunk/src/main/java/org/jboss/cache/interceptors/OptimisticV=
alidatorInterceptor.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/java/org/jboss/cache/interceptors/OptimisticValidat=
orInterceptor.java	2008-01-03 13:29:35 UTC (rev 4967)
+++ core/trunk/src/main/java/org/jboss/cache/interceptors/OptimisticValidat=
orInterceptor.java	2008-01-03 19:17:09 UTC (rev 4968)
@@ -47,6 +47,11 @@
 {
    private boolean useTombstones;
 =

+   public OptimisticValidatorInterceptor()
+   {
+      initLogger();
+   }
+
    @Override
    public void setCache(CacheSPI cache)
    {
@@ -189,7 +194,7 @@
             boolean updateVersion =3D false;
             if (workspaceNode.isChildrenModified())
             {
-               log.trace("Updating children since node has modified childr=
en");
+               if (trace) log.trace("Updating children since node has modi=
fied children");
                // merge children.
                List<Set<Fqn>> deltas =3D workspaceNode.getMergedChildren();
 =

@@ -220,7 +225,7 @@
 =

             if (workspaceNode.isModified())
             {
-               log.trace("Merging data since node is dirty");
+               if (trace) log.trace("Merging data since node is dirty");
                Map mergedData =3D workspaceNode.getMergedData();
                underlyingNode.clearDataDirect();
                underlyingNode.putAllDirect(mergedData);

Modified: core/trunk/src/main/java/org/jboss/cache/interceptors/Passivation=
Interceptor.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/java/org/jboss/cache/interceptors/PassivationInterc=
eptor.java	2008-01-03 13:29:35 UTC (rev 4967)
+++ core/trunk/src/main/java/org/jboss/cache/interceptors/PassivationInterc=
eptor.java	2008-01-03 19:17:09 UTC (rev 4968)
@@ -1,6 +1,5 @@
 package org.jboss.cache.interceptors;
 =

-import org.apache.commons.logging.LogFactory;
 import org.jboss.cache.CacheSPI;
 import org.jboss.cache.Fqn;
 import org.jboss.cache.InvocationContext;
@@ -27,7 +26,7 @@
 =

    public PassivationInterceptor()
    {
-      log =3D LogFactory.getLog(getClass());
+      initLogger();
    }
 =

 =

@@ -60,7 +59,7 @@
       }
       catch (NodeNotLoadedException e)
       {
-         if (log.isTraceEnabled())
+         if (trace)
          {
             log.trace("Node " + fqn + " not loaded in memory; passivation =
skipped");
          }

Modified: core/trunk/src/main/java/org/jboss/cache/interceptors/Pessimistic=
LockInterceptor.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/java/org/jboss/cache/interceptors/PessimisticLockIn=
terceptor.java	2008-01-03 13:29:35 UTC (rev 4967)
+++ core/trunk/src/main/java/org/jboss/cache/interceptors/PessimisticLockIn=
terceptor.java	2008-01-03 19:17:09 UTC (rev 4968)
@@ -6,7 +6,6 @@
  */
 package org.jboss.cache.interceptors;
 =

-import org.apache.commons.logging.LogFactory;
 import org.jboss.cache.CacheImpl;
 import org.jboss.cache.Fqn;
 import org.jboss.cache.InvocationContext;
@@ -53,19 +52,23 @@
 {
    private TransactionTable tx_table;
    private CacheImpl cacheImpl;
+   private NodeSPI rootNode;
+
    /**
     * Map<Thread, List<NodeLock>>. Keys =3D threads, values =3D lists of l=
ocks held by that thread
     */
    private Map<Thread, List<NodeLock>> lockTable;
+   //         private ThreadLocal<List<NodeLock>> lockTable;
    private long lock_acquisition_timeout;
 =

    public PessimisticLockInterceptor()
    {
-      log =3D LogFactory.getLog(getClass());
+      initLogger();
    }
 =

    @Inject
    public void injectDependencies(@ComponentName("LockTable")Map<Thread, L=
ist<NodeLock>> lockTable, Configuration configuration, CacheImpl cacheImpl,=
 TransactionTable txTable)
+//         public void injectDependencies(@ComponentName("LockTable")Threa=
dLocal<List<NodeLock>> lockTable, Configuration configuration, CacheImpl ca=
cheImpl, TransactionTable txTable)
    {
       this.lockTable =3D lockTable;
       lock_acquisition_timeout =3D configuration.getLockAcquisitionTimeout=
();
@@ -73,6 +76,13 @@
       this.tx_table =3D txTable;
    }
 =

+   @Override
+   public Object invoke(InvocationContext ctx) throws Throwable
+   {
+      if (rootNode =3D=3D null) rootNode =3D cache.getRoot();
+      return super.invoke(ctx);
+   }
+
    protected Object handlePutDataMethod(InvocationContext ctx, GlobalTrans=
action tx, Fqn fqn, Map data, boolean createUndoOps) throws Throwable
    {
       return handlePutMethod(ctx, fqn);
@@ -93,10 +103,9 @@
    {
       if ((ctx.getOptionOverrides() !=3D null && ctx.getOptionOverrides().=
isSuppressLocking()) || configuration.getIsolationLevel() =3D=3D IsolationL=
evel.NONE)
       {
-         log.trace("Suppressing locking");
-         log.trace("Creating nodes if necessary");
+         if (trace) log.trace("Suppressing locking, creating nodes if nece=
ssary");
          int treeNodeSize =3D fqn.size();
-         NodeSPI n =3D cache.getRoot();
+         NodeSPI n =3D rootNode;
          for (int i =3D 0; i < treeNodeSize; i++)
          {
             Object childName =3D fqn.get(i);
@@ -149,7 +158,7 @@
    protected Object handleCommitMethod(InvocationContext ctx, GlobalTransa=
ction globalTransaction) throws Throwable
    {
       commit(globalTransaction);
-      log.trace("bypassed locking as method commit() doesn't require locki=
ng");
+      if (trace) log.trace("bypassed locking as method commit() doesn't re=
quire locking");
       Object retVal =3D nextInterceptor(ctx);
       tx_table.cleanup(globalTransaction);
       return retVal;
@@ -158,7 +167,7 @@
    protected Object handleRollbackMethod(InvocationContext ctx, GlobalTran=
saction globalTransaction) throws Throwable
    {
       TransactionEntry entry =3D tx_table.get(globalTransaction);
-      if (log.isTraceEnabled())
+      if (trace)
       {
          log.trace("called to rollback cache with GlobalTransaction=3D" + =
globalTransaction);
       }
@@ -178,7 +187,7 @@
          // 1. Revert the modifications by running the undo-op list in rev=
erse. This *cannot* throw any exceptions !
          entry.undoOperations(cache);
       }
-      if (log.isTraceEnabled())
+      if (trace)
       {
          log.trace("bypassed locking as method rollback() doesn't require =
locking");
       }
@@ -191,7 +200,7 @@
    {
       long timeout =3D ctx.getContextLockAcquisitionTimeout(lock_acquisiti=
on_timeout);
       // this call will ensure the node gets a WL and it's current parent =
gets RL.
-      if (log.isTraceEnabled()) log.trace("Attempting to get WL on node to=
 be moved [" + from + "]");
+      if (trace) log.trace("Attempting to get WL on node to be moved [" + =
from + "]");
       if (from !=3D null && !(configuration.getIsolationLevel() =3D=3D Iso=
lationLevel.NONE))
       {
          lock(ctx, from, NodeLock.LockType.WRITE, false, timeout, true, fa=
lse);
@@ -204,7 +213,7 @@
       if (to !=3D null && !(configuration.getIsolationLevel() =3D=3D Isola=
tionLevel.NONE))
       {
          //now for an RL for the new parent.
-         if (log.isTraceEnabled()) log.trace("Attempting to get RL on new =
parent [" + to + "]");
+         if (trace) log.trace("Attempting to get RL on new parent [" + to =
+ "]");
          lock(ctx, to, NodeLock.LockType.READ, false, timeout, false, fals=
e);
          acquireLocksOnChildren(cache.peek(to, true), NodeLock.LockType.RE=
AD, ctx);
       }
@@ -225,7 +234,7 @@
       {
          cache.getTransactionTable().get(ctx.getGlobalTransaction()).addRe=
movedNode(fqn);
       }
-      acquireLocksOnChildren(cache.getRoot().getChildDirect(fqn), NodeLock=
.LockType.WRITE, ctx);
+      acquireLocksOnChildren(rootNode.getChildDirect(fqn), NodeLock.LockTy=
pe.WRITE, ctx);
       Object retVal =3D nextInterceptor(ctx);
       if (ctx.getGlobalTransaction() =3D=3D null)
       {
@@ -355,9 +364,9 @@
       }
       Object owner =3D (gtx !=3D null) ? gtx : currentThread;
       NodeSPI currentNode;
-      if (log.isTraceEnabled()) log.trace("Attempting to lock node " + fqn=
 + " for owner " + owner);
+      if (trace) log.trace("Attempting to lock node " + fqn + " for owner =
" + owner);
       long expiryTime =3D System.currentTimeMillis() + timeout;
-      currentNode =3D cache.getRoot();
+      currentNode =3D rootNode;
       NodeSPI parent =3D null;
       Object childName =3D null;
       int currentIndex =3D -1;
@@ -369,11 +378,11 @@
             {
                currentNode =3D parent.addChildDirect(new Fqn(childName));
                created =3D true;
-               if (log.isTraceEnabled()) log.trace("Child node was null, s=
o created child node " + childName);
+               if (trace) log.trace("Child node was null, so created child=
 node " + childName);
             }
             else
             {
-               if (log.isTraceEnabled())
+               if (trace)
                   log.trace("failed to find or create child " + childName =
+ " of node " + currentNode);
                return false;
             }
@@ -394,7 +403,7 @@
          NodeSPI repeek =3D cache.peek(currentNode.getFqn(), true, true);
          if (currentNode !=3D repeek)
          {
-            if (log.isTraceEnabled())
+            if (trace)
                log.trace("Was waiting for and obtained a lock on a node th=
at doesn't exist anymore!  Attempting lock acquisition again.");
             // we have an orphan!! Lose the unnecessary lock and re-acquir=
e the lock (and potentially recreate the node).
             // check if the parent exists!!
@@ -403,9 +412,9 @@
             if (cache.peek(parent.getFqn(), true, true) =3D=3D null)
             {
                // crap!
-               if (log.isTraceEnabled())
+               if (trace)
                   log.trace("Parent has been deleted again.  Go through th=
e lock method all over again.");
-               currentNode =3D cache.getRoot();
+               currentNode =3D rootNode;
                parent =3D null;
             }
             else
@@ -472,7 +481,7 @@
       int treeNodeSize =3D targetFqn.size();
       // write lock forced!!
       boolean isTargetNode =3D currentNodeIndex =3D=3D (treeNodeSize - 1);
-      if (ctx.getOptionOverrides().isForceWriteLock() && isTargetNode) ret=
urn true;
+      if (isTargetNode && ctx.getOptionOverrides().isForceWriteLock()) ret=
urn true;
       //this can be injected, from the caller as a param named wlParent
       if (currentNode.isLockForChildInsertRemove())
       {
@@ -480,7 +489,8 @@
          {
             return true;// we're doing a remove and we've reached the PARE=
NT node of the target to be removed.
          }
-         if (!isTargetNode && cache.peek(new Fqn(currentNode.getFqn(), tar=
getFqn.get(currentNodeIndex + 1)), false) =3D=3D null)
+         if (!isTargetNode && cache.peek(targetFqn.getAncestor(currentNode=
Index + 2), false) =3D=3D null)
+         //if (!isTargetNode && cache.peek(new Fqn(currentNode.getFqn(), t=
argetFqn.get(currentNodeIndex + 1)), false) =3D=3D null)
          {
             return createIfNotExists;// we're at a node in the tree, not y=
et at the target node, and we need to create the next node.  So we need a W=
L here.
          }
@@ -490,11 +500,11 @@
 =

    private void acquireNodeLock(NodeSPI node, Object owner, GlobalTransact=
ion gtx, NodeLock.LockType lockType, long lockTimeout) throws LockingExcept=
ion, TimeoutException, InterruptedException
    {
-      boolean acquired =3D node.getLock().acquire(owner, lockTimeout, lock=
Type);
+      NodeLock lock =3D node.getLock();
+      boolean acquired =3D lock.acquire(owner, lockTimeout, lockType);
       if (acquired)
       {
          // Record the lock for release on method return or tx commit/roll=
back
-         NodeLock lock =3D node.getLock();
          if (gtx !=3D null)
          {
             cache.getTransactionTable().recordNodeLock(gtx, lock);
@@ -520,6 +530,7 @@
       if (locks =3D=3D null)
       {
          locks =3D Collections.synchronizedList(new LinkedList<NodeLock>()=
);
+//         lockTable.set(locks);
          lockTable.put(currentThread, locks);
       }
       return locks;
@@ -544,7 +555,7 @@
     */
    private void commit(GlobalTransaction gtx)
    {
-      if (log.isTraceEnabled()) log.trace("committing cache with gtx " + g=
tx);
+      if (trace) log.trace("committing cache with gtx " + gtx);
       TransactionEntry entry =3D tx_table.get(gtx);
       if (entry =3D=3D null)
       {

Modified: core/trunk/src/main/java/org/jboss/cache/interceptors/Replication=
Interceptor.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/java/org/jboss/cache/interceptors/ReplicationInterc=
eptor.java	2008-01-03 13:29:35 UTC (rev 4967)
+++ core/trunk/src/main/java/org/jboss/cache/interceptors/ReplicationInterc=
eptor.java	2008-01-03 19:17:09 UTC (rev 4968)
@@ -1,6 +1,5 @@
 package org.jboss.cache.interceptors;
 =

-import org.apache.commons.logging.LogFactory;
 import org.jboss.cache.Fqn;
 import org.jboss.cache.InvocationContext;
 import org.jboss.cache.config.Configuration;
@@ -26,7 +25,7 @@
 {
    public ReplicationInterceptor()
    {
-      log =3D LogFactory.getLog(getClass());
+      initLogger();
    }
 =

    protected boolean skipMethodCall(InvocationContext ctx)
@@ -34,7 +33,7 @@
       Option optionOverride =3D ctx.getOptionOverrides();
       if (optionOverride !=3D null && optionOverride.isCacheModeLocal() &&=
 ctx.getTransaction() =3D=3D null)
       {
-         log.trace("skip replication");
+         if (trace) log.trace("skip replication");
          return true;
       }
       return false;
@@ -46,7 +45,7 @@
       {
          return nextInterceptor(ctx);
       }
-      replicateCall(ctx.getMethodCall(), configuration.isSyncCommitPhase()=
, ctx.getOptionOverrides());
+      replicateCall(ctx, ctx.getMethodCall(), configuration.isSyncCommitPh=
ase(), ctx.getOptionOverrides());
       return nextInterceptor(ctx);
    }
 =

@@ -69,7 +68,7 @@
       }
       if (!ctx.isLocalRollbackOnly())
       {
-         replicateCall(ctx.getMethodCall(), configuration.isSyncRollbackPh=
ase(), ctx.getOptionOverrides());
+         replicateCall(ctx, ctx.getMethodCall(), configuration.isSyncRollb=
ackPhase(), ctx.getOptionOverrides());
       }
       return nextInterceptor(ctx);
 =

@@ -101,7 +100,7 @@
    {
       GlobalTransaction gtx =3D ctx.getGlobalTransaction();
       boolean isInitiatedHere =3D gtx !=3D null && !gtx.isRemote();
-      if (log.isTraceEnabled()) log.trace("isInitiatedHere? " + isInitiate=
dHere + "; gtx =3D " + gtx);
+      if (trace) log.trace("isInitiatedHere? " + isInitiatedHere + "; gtx =
=3D " + gtx);
       return !isTransactionalAndLocal(ctx) || !containsModifications(ctx);
    }
 =

@@ -202,7 +201,7 @@
       if (ctx.getTransaction() =3D=3D null && ctx.isOriginLocal())
       {
          MethodCall m =3D ctx.getMethodCall();
-         if (log.isTraceEnabled())
+         if (trace)
          {
             log.trace("invoking method " + m + ", members=3D" + cache.getM=
embers() + ", mode=3D" +
                   configuration.getCacheMode() + ", exclude_self=3D" + tru=
e + ", timeout=3D" +
@@ -211,13 +210,13 @@
          if (!isSynchronous(ctx.getOptionOverrides()) || m.getMethodId() =
=3D=3D MethodDeclarations.putForExternalReadMethodLocal_id)
          {
             // 2. Replicate change to all *other* members (exclude self !)
-            replicateCall(m, false, ctx.getOptionOverrides());
+            replicateCall(ctx, m, false, ctx.getOptionOverrides());
          }
          else
          {
             // REVISIT Needs to exclude itself and apply the local change =
manually.
             // This is needed such that transient field is modified proper=
ly in-VM.
-            replicateCall(m, true, ctx.getOptionOverrides());
+            replicateCall(ctx, m, true, ctx.getOptionOverrides());
          }
       }
       return returnValue;
@@ -240,12 +239,12 @@
    protected void runPreparePhase(MethodCall prepareMethod, GlobalTransact=
ion gtx, InvocationContext ctx) throws Throwable
    {
       boolean async =3D configuration.getCacheMode() =3D=3D Configuration.=
CacheMode.REPL_ASYNC;
-      if (log.isTraceEnabled())
+      if (trace)
       {
          log.trace("(" + cache.getLocalAddress() + "): running remote prep=
are for global tx " + gtx + " with async mode=3D" + async);
       }
 =

       // this method will return immediately if we're the only member (bec=
ause exclude_self=3Dtrue)
-      replicateCall(prepareMethod, !async, ctx.getOptionOverrides());
+      replicateCall(ctx, prepareMethod, !async, ctx.getOptionOverrides());
    }
 }

Modified: core/trunk/src/main/java/org/jboss/cache/interceptors/TxIntercept=
or.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/java/org/jboss/cache/interceptors/TxInterceptor.jav=
a	2008-01-03 13:29:35 UTC (rev 4967)
+++ core/trunk/src/main/java/org/jboss/cache/interceptors/TxInterceptor.jav=
a	2008-01-03 19:17:09 UTC (rev 4968)
@@ -6,7 +6,6 @@
  */
 package org.jboss.cache.interceptors;
 =

-import org.apache.commons.logging.LogFactory;
 import org.jboss.cache.CacheException;
 import org.jboss.cache.Fqn;
 import org.jboss.cache.InvocationContext;
@@ -58,7 +57,7 @@
 =

    public TxInterceptor()
    {
-      log =3D LogFactory.getLog(getClass());
+      initLogger();
    }
 =

    @SuppressWarnings("unchecked")
@@ -82,7 +81,7 @@
          }
          else
          {
-            if (log.isTraceEnabled()) log.trace("received my own message (=
discarding it)");
+            if (trace) log.trace("received my own message (discarding it)"=
);
             result =3D null;
          }
       }
@@ -109,7 +108,7 @@
       boolean scrubTxsOnExit =3D false;
       try
       {
-         if (log.isTraceEnabled())
+         if (trace)
          {
             log.trace("(" + cache.getLocalAddress() + ") call on method ["=
 + ctx.getMethodCall() + "]");
          }
@@ -120,7 +119,7 @@
          }
          else
          {
-            if (log.isTraceEnabled()) log.trace("received my own message (=
discarding it)");
+            if (trace) log.trace("received my own message (discarding it)"=
);
             result =3D null;
          }
       }
@@ -287,7 +286,8 @@
       boolean shouldRethtrow =3D optionOverride =3D=3D null || !optionOver=
ride.isFailSilently();
       if (!shouldRethtrow)
       {
-         log.trace("There was a problem handling this request, but failSil=
ently was set, so suppressing exception", e);
+         if (trace)
+            log.trace("There was a problem handling this request, but fail=
Silently was set, so suppressing exception", e);
       }
       throw e;
    }
@@ -372,7 +372,7 @@
          }
 =

 =

-         if (log.isTraceEnabled())
+         if (trace)
          {
             log.trace("Resuming existing transaction " + ltx + ", global T=
X=3D" + gtx);
          }
@@ -391,7 +391,7 @@
             entry.setTransaction(ltx);
             log.debug("creating new tx entry");
             txTable.put(gtx, entry);
-            if (log.isTraceEnabled()) log.trace("TxTable contents: " + txT=
able);
+            if (trace) log.trace("TxTable contents: " + txTable);
          }
 =

          setTransactionalContext(ltx, gtx, ctx);
@@ -513,7 +513,7 @@
       {
          log.debug(" local transaction exists - registering global tx if n=
ot present for " + Thread.currentThread());
       }
-      if (log.isTraceEnabled())
+      if (trace)
       {
          GlobalTransaction tempGtx =3D txTable.get(tx);
          log.trace("Associated gtx in txTable is " + tempGtx);
@@ -575,7 +575,8 @@
             replayModifications(modifications, ctx, false);
             if (m.isOnePhaseCommitPrepareMehod())
             {
-               log.trace("Using one-phase prepare.  Not propagating the pr=
epare call up the stack until called to do so by the sync handler.");
+               if (trace)
+                  log.trace("Using one-phase prepare.  Not propagating the=
 prepare call up the stack until called to do so by the sync handler.");
             }
             else
             {
@@ -604,7 +605,7 @@
       finally
       {
 =

-         if (log.isTraceEnabled())
+         if (trace)
          {
             log.trace("Are we running a 1-phase commit? " + commit);
          }
@@ -788,7 +789,7 @@
          //resume the old transaction if we suspended it
          if (resumeCurrentTxOnCompletion)
          {
-            if (log.isTraceEnabled()) log.trace("Resuming suspended transa=
ction " + currentTx);
+            if (trace) log.trace("Resuming suspended transaction " + curre=
ntTx);
             txManager.suspend();
             if (currentTx !=3D null)
             {
@@ -887,7 +888,7 @@
             commitMethod =3D MethodCallFactory.create(MethodDeclarations.c=
ommitMethod, gtx);
          }
 =

-         if (log.isTraceEnabled())
+         if (trace)
          {
             log.trace(" running commit for " + gtx);
          }
@@ -942,7 +943,7 @@
          // JBCACHE-457
          //            MethodCall rollbackMethod =3D MethodCall(CacheImpl.=
rollbackMethod, new Object[]{gtx, hasMods ? true : false});
          MethodCall rollbackMethod =3D MethodCallFactory.create(MethodDecl=
arations.rollbackMethod, gtx);
-         if (log.isTraceEnabled())
+         if (trace)
          {
             log.trace(" running rollback for " + gtx);
          }
@@ -993,7 +994,7 @@
       else
       {
          // this is a REPL_ASYNC call - do 1-phase commit.  break!
-         log.trace("This is a REPL_ASYNC call (1 phase commit) - do nothin=
g for beforeCompletion()");
+         if (trace) log.trace("This is a REPL_ASYNC call (1 phase commit) =
- do nothing for beforeCompletion()");
          return null;
       }
 =

@@ -1040,14 +1041,14 @@
          if (gtx.isRemote())
          {
             // should be no need to register a handler since this a remote=
ly initiated gtx
-            if (log.isTraceEnabled())
+            if (trace)
             {
                log.trace("is a remotely initiated gtx so no need to regist=
er a tx for it");
             }
          }
          else
          {
-            if (log.isTraceEnabled())
+            if (trace)
             {
                log.trace("Registering sync handler for tx " + tx + ", gtx =
" + gtx);
             }
@@ -1079,7 +1080,7 @@
    {
       OrderedSynchronizationHandler orderedHandler =3D OrderedSynchronizat=
ionHandler.getInstance(tx);
 =

-      if (log.isTraceEnabled()) log.trace("registering for TX completion: =
SynchronizationHandler(" + handler + ")");
+      if (trace) log.trace("registering for TX completion: Synchronization=
Handler(" + handler + ")");
 =

       orderedHandler.registerAtHead(handler);// needs to be invoked first =
on TX commit
 =

@@ -1117,7 +1118,7 @@
     */
    private Transaction createLocalTx() throws Exception
    {
-      if (log.isTraceEnabled())
+      if (trace)
       {
          log.trace("Creating transaction for thread " + Thread.currentThre=
ad());
       }
@@ -1141,7 +1142,7 @@
       txTable.put(localTx, gtx);
       // attach this to the context
       ctx.setTransaction(localTx);
-      if (log.isTraceEnabled()) log.trace("Created new tx for gtx " + gtx);
+      if (trace) log.trace("Created new tx for gtx " + gtx);
       return localTx;
    }
 =

@@ -1169,7 +1170,7 @@
 =

       public void beforeCompletion()
       {
-         if (log.isTraceEnabled()) log.trace("Running beforeCompletion on =
gtx " + gtx);
+         if (trace) log.trace("Running beforeCompletion on gtx " + gtx);
          entry =3D txTable.get(gtx);
          if (entry =3D=3D null)
          {
@@ -1220,7 +1221,7 @@
             }
 =

 =

-            if (log.isTraceEnabled()) log.trace("calling aftercompletion f=
or " + gtx);
+            if (trace) log.trace("calling aftercompletion for " + gtx);
             // set any transaction wide options as current for this thread.
             if (entry !=3D null)
             {
@@ -1334,7 +1335,7 @@
          setTransactionalContext(tx, gtx, ctx);
          if (modifications.size() =3D=3D 0)
          {
-            if (log.isTraceEnabled()) log.trace("No modifications in this =
tx.  Skipping beforeCompletion()");
+            if (trace) log.trace("No modifications in this tx.  Skipping b=
eforeCompletion()");
             return;
          }
 =


Modified: core/trunk/src/main/java/org/jboss/cache/interceptors/UnlockInter=
ceptor.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/java/org/jboss/cache/interceptors/UnlockInterceptor=
.java	2008-01-03 13:29:35 UTC (rev 4967)
+++ core/trunk/src/main/java/org/jboss/cache/interceptors/UnlockInterceptor=
.java	2008-01-03 19:17:09 UTC (rev 4968)
@@ -3,12 +3,10 @@
 import org.jboss.cache.InvocationContext;
 import org.jboss.cache.factories.annotations.ComponentName;
 import org.jboss.cache.factories.annotations.Inject;
-import org.jboss.cache.lock.IdentityLock;
 import org.jboss.cache.lock.NodeLock;
 =

 import javax.transaction.Transaction;
 import java.util.List;
-import java.util.ListIterator;
 import java.util.Map;
 =

 /**
@@ -22,10 +20,16 @@
 {
 =

    Map<Thread, List<NodeLock>> lockTable =3D null;
-   boolean trace =3D log.isTraceEnabled();
+//   ThreadLocal<List<NodeLock>> lockTable;
 =

+   public UnlockInterceptor()
+   {
+      initLogger();
+   }
+
    @Inject
    private void injectDependencies(@ComponentName("LockTable")Map<Thread, =
List<NodeLock>> lockTable)
+//         private void injectDependencies(@ComponentName("LockTable")Thre=
adLocal<List<NodeLock>> lockTable)
    {
       this.lockTable =3D lockTable;
    }
@@ -52,7 +56,7 @@
             else
             { // no TX
                Thread currentThread =3D Thread.currentThread();
-               List locks =3D lockTable.get(currentThread);
+               List<NodeLock> locks =3D lockTable.get(currentThread);
                if (trace) log.trace("Attempting to release locks on curren=
t thread.  Lock table is " + lockTable);
 =

                if (locks !=3D null && locks.size() > 0)
@@ -65,15 +69,13 @@
       }
    }
 =

-   private void releaseLocks(List locks, Thread currentThread)
+   private void releaseLocks(List<NodeLock> locks, Thread currentThread)
    {
-      IdentityLock lock;
-      for (ListIterator it =3D locks.listIterator(locks.size()); it.hasPre=
vious();)
+      NodeLock[] locksArray =3D locks.toArray(new NodeLock[]{});
+      for (int i =3D locksArray.length - 1; i > -1; i--)
       {
-         lock =3D (IdentityLock) it.previous();
-         if (trace)
-            log.trace("releasing lock for " + lock.getFqn() + ": " + lock);
-         lock.release(currentThread);
+         if (trace) log.trace("releasing lock for " + locksArray[i].getFqn=
() + ": " + locksArray[i]);
+         locksArray[i].release(currentThread);
       }
    }
 =


Modified: core/trunk/src/main/java/org/jboss/cache/lock/NodeLock.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/java/org/jboss/cache/lock/NodeLock.java	2008-01-03 =
13:29:35 UTC (rev 4967)
+++ core/trunk/src/main/java/org/jboss/cache/lock/NodeLock.java	2008-01-03 =
19:17:09 UTC (rev 4968)
@@ -1,5 +1,7 @@
 package org.jboss.cache.lock;
 =

+import org.jboss.cache.Fqn;
+
 import java.util.Collection;
 import java.util.Set;
 =

@@ -9,12 +11,13 @@
  */
 public interface NodeLock
 {
-
    public enum LockType
    {
       NONE, READ, WRITE
    }
 =

+   Fqn getFqn();
+
    /**
     * Returns a copy of the reader lock owner in List.
     * Size is zero is not available. Note that this list

Modified: core/trunk/src/main/java/org/jboss/cache/marshall/MethodDeclarati=
ons.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/java/org/jboss/cache/marshall/MethodDeclarations.ja=
va	2008-01-03 13:29:35 UTC (rev 4967)
+++ core/trunk/src/main/java/org/jboss/cache/marshall/MethodDeclarations.ja=
va	2008-01-03 19:17:09 UTC (rev 4968)
@@ -38,11 +38,6 @@
 {
    private static Log log =3D LogFactory.getLog(MethodDeclarations.class);
 =

-   static final Set<Integer> crudMethodIds =3D new HashSet<Integer>();
-   static final Set<Integer> transactionLifecycleMethodIds =3D new HashSet=
<Integer>();
-   static final Set<Integer> buddyGroupOrganisationMethodIds =3D new HashS=
et<Integer>();
-   static final Set<Integer> blockUnblockMethodIds =3D new HashSet<Integer=
>();
-   static final Set<Integer> putMethodIds =3D new HashSet<Integer>();
    static final Set<Integer> methodsThatNeedToReturnValuesToRemoteCallers =
=3D new HashSet<Integer>();
 =

    // maintain a list of method IDs that correspond to Methods in CacheImpl
@@ -356,42 +351,9 @@
       {
          methodIds.put(methods.get(id), id);
       }
-
-      putMethodIds.add(putDataMethodLocal_id);
-      putMethodIds.add(putDataEraseMethodLocal_id);
-      putMethodIds.add(putKeyValMethodLocal_id);
-      putMethodIds.add(putDataEraseVersionedMethodLocal_id);
-      putMethodIds.add(putDataVersionedMethodLocal_id);
-      putMethodIds.add(putKeyValVersionedMethodLocal_id);
-      putMethodIds.add(putForExternalReadMethodLocal_id);
-      putMethodIds.add(putForExternalReadVersionedMethodLocal_id);
-
-      crudMethodIds.addAll(putMethodIds);
-      crudMethodIds.add(removeNodeMethodLocal_id);
-      crudMethodIds.add(removeKeyMethodLocal_id);
-      crudMethodIds.add(removeDataMethodLocal_id);
-      crudMethodIds.add(dataGravitationCleanupMethod_id);
-      crudMethodIds.add(moveMethodLocal_id);
-      crudMethodIds.add(removeNodeVersionedMethodLocal_id);
-      crudMethodIds.add(removeKeyVersionedMethodLocal_id);
-      crudMethodIds.add(removeDataVersionedMethodLocal_id);
-
-
-      transactionLifecycleMethodIds.add(commitMethod_id);
-      transactionLifecycleMethodIds.add(rollbackMethod_id);
-      transactionLifecycleMethodIds.add(prepareMethod_id);
-      transactionLifecycleMethodIds.add(optimisticPrepareMethod_id);
-
-      buddyGroupOrganisationMethodIds.add(remoteAnnounceBuddyPoolNameMetho=
d_id);
-      buddyGroupOrganisationMethodIds.add(remoteAssignToBuddyGroupMethod_i=
d);
-      buddyGroupOrganisationMethodIds.add(remoteRemoveFromBuddyGroupMethod=
_id);
-
-      blockUnblockMethodIds.add(blockChannelMethodLocal_id);
-      blockUnblockMethodIds.add(unblockChannelMethodLocal_id);
-
    }
 =

-   protected static int lookupMethodId(Method method)
+   public static int lookupMethodId(Method method)
    {
       Integer methodIdInteger =3D methodIds.get(method);
       int methodId =3D -1;
@@ -411,7 +373,7 @@
       return methodId;
    }
 =

-   protected static Method lookupMethod(int id)
+   public static Method lookupMethod(int id)
    {
       Method method =3D methods.get(id);
       if (method =3D=3D null)
@@ -430,22 +392,39 @@
     */
    public static boolean isCrudMethod(int id)
    {
-      return crudMethodIds.contains(Integer.valueOf(id));
+      return isPutMethod(id) ||
+            id =3D=3D removeNodeMethodLocal_id ||
+            id =3D=3D removeKeyMethodLocal_id ||
+            id =3D=3D removeDataMethodLocal_id ||
+            id =3D=3D dataGravitationCleanupMethod_id ||
+            id =3D=3D moveMethodLocal_id ||
+            id =3D=3D removeNodeVersionedMethodLocal_id ||
+            id =3D=3D removeKeyVersionedMethodLocal_id ||
+            id =3D=3D removeDataVersionedMethodLocal_id;
    }
 =

    public static boolean isTransactionLifecycleMethod(int id)
    {
-      return transactionLifecycleMethodIds.contains(id);
+      // transactional lifecycle methods consist of just commit, rollback,=
 prepare and optimistic prepare.
+      return id =3D=3D commitMethod_id || id =3D=3D optimisticPrepareMetho=
d_id || id =3D=3D prepareMethod_id || id =3D=3D rollbackMethod_id;
    }
 =

    public static boolean isBuddyGroupOrganisationMethod(int id)
    {
-      return buddyGroupOrganisationMethodIds.contains(id);
+      return id =3D=3D remoteAssignToBuddyGroupMethod_id || id =3D=3D remo=
teRemoveFromBuddyGroupMethod_id || id =3D=3D remoteAnnounceBuddyPoolNameMet=
hod_id;
    }
 =

    public static boolean isPutMethod(int id)
    {
-      return putMethodIds.contains(id);
+      return
+            id =3D=3D putDataMethodLocal_id ||
+                  id =3D=3D putDataEraseMethodLocal_id ||
+                  id =3D=3D putKeyValMethodLocal_id ||
+                  id =3D=3D putDataEraseVersionedMethodLocal_id ||
+                  id =3D=3D putDataVersionedMethodLocal_id ||
+                  id =3D=3D putKeyValVersionedMethodLocal_id ||
+                  id =3D=3D putForExternalReadMethodLocal_id ||
+                  id =3D=3D putForExternalReadVersionedMethodLocal_id;
    }
 =

    public static boolean isGetMethod(int methodId)
@@ -456,7 +435,7 @@
 =

    public static boolean isBlockUnblockMethod(int id)
    {
-      return blockUnblockMethodIds.contains(id);
+      return id =3D=3D blockChannelMethodLocal_id || id =3D=3D unblockChan=
nelMethodLocal_id;
    }
 =

    /**

Modified: core/trunk/src/test/java/org/jboss/cache/FqnTest.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/test/java/org/jboss/cache/FqnTest.java	2008-01-03 13:29:=
35 UTC (rev 4967)
+++ core/trunk/src/test/java/org/jboss/cache/FqnTest.java	2008-01-03 19:17:=
09 UTC (rev 4968)
@@ -21,6 +21,7 @@
  * @author <a href=3D"mailto:bela(a)jboss.org">Bela Ban</a> May 9, 2003
  * @version $Revision$
  */
+(a)Test(groups =3D "functional")
 public class FqnTest
 {
    private Cache<Object, Object> cache;
@@ -41,7 +42,6 @@
       }
    }
 =

-   @Test(groups =3D {"functional"})
    public void testNull()
    {
       Fqn fqn =3D new Fqn();
@@ -51,7 +51,6 @@
       assert hcode !=3D -1;
    }
 =

-   @Test(groups =3D {"functional"})
    public void testOne()
    {
       Fqn<Integer> fqn =3D new Fqn<Integer>(22);
@@ -61,7 +60,6 @@
       assert hcode !=3D -1;
    }
 =

-   @Test(groups =3D {"functional"})
    public void testEmptyFqn()
    {
       Fqn f1 =3D new Fqn();
@@ -69,7 +67,6 @@
       assert f1.equals(f2);
    }
 =

-   @Test(groups =3D {"functional"})
    public void testFqn()
    {
       Fqn<String> fqn =3D Fqn.fromString("/a/b/c");
@@ -83,7 +80,6 @@
       assert fqn.hashCode() =3D=3D fqn2.hashCode();
    }
 =

-   @Test(groups =3D {"functional"})
    public void testHereogeneousNames()
    {
       Fqn<Object> fqn =3D new Fqn<Object>("string", 38, true);
@@ -95,7 +91,6 @@
       assert fqn.hashCode() =3D=3D fqn2.hashCode();
    }
 =

-   @Test(groups =3D {"functional"})
    public void testHashcode()
    {
       Fqn fqn1, fqn2;
@@ -111,7 +106,6 @@
       assert map.get(fqn1).equals(34);
    }
 =

-   @Test(groups =3D {"functional"})
    public void testHashcode2()
    {
       Fqn<Integer> fqn =3D new Fqn<Integer>(-1);
@@ -121,7 +115,6 @@
       assert hcode =3D=3D -1;
    }
 =

-   @Test(groups =3D {"functional"})
    public void testEquals()
    {
       Fqn<String> fqn1 =3D new Fqn<String>("person/test");
@@ -145,7 +138,6 @@
 =

    }
 =

-   @Test(groups =3D {"functional"})
    public void testEquals2()
    {
       Fqn<String> f1;
@@ -161,7 +153,6 @@
       assert !f1.equals(f2);
    }
 =

-   @Test(groups =3D {"functional"})
    public void testEquals2WithMarshalling() throws Exception
    {
       Fqn<String> f1, f2;
@@ -170,7 +161,6 @@
       assert f1.equals(f2);
    }
 =

-   @Test(groups =3D {"functional"})
    public void testEquals3()
    {
       Fqn<Object> f1;
@@ -190,7 +180,6 @@
       assert f1.equals(f2);
    }
 =

-   @Test(groups =3D {"functional"})
    public void testEquals3WithMarshalling() throws Exception
    {
       Fqn<Object> f1, f2;
@@ -212,7 +201,6 @@
       assert f1.equals(f2);
    }
 =

-   @Test(groups =3D {"functional"})
    public void testEquals4()
    {
       Fqn<String> fqn =3D Fqn.fromString("X");
@@ -231,7 +219,6 @@
       assert fqn1.hashCode() =3D=3D fqn2.hashCode();
    }
 =

-   @Test(groups =3D {"functional"})
    public void testNullElements() throws CloneNotSupportedException
    {
       Fqn<Object> fqn0 =3D new Fqn<Object>((Object) null);
@@ -246,7 +233,6 @@
       assert fqn1.equals(fqn1.clone());
    }
 =

-   @Test(groups =3D {"functional"})
    public void testIteration()
    {
       Fqn<String> fqn =3D Fqn.fromString("/a/b/c");
@@ -263,7 +249,6 @@
       assert fqn.equals(tmp_fqn);
    }
 =

-   @Test(groups =3D {"functional"})
    public void testIsChildOf()
    {
       Fqn<String> child =3D Fqn.fromString("/a/b");
@@ -277,14 +262,12 @@
       assert child.isChildOf(parent);
    }
 =

-   @Test(groups =3D {"functional"})
    public void testIsChildOf2()
    {
       Fqn<String> child =3D Fqn.fromString("/a/b/c/d");
       assert "/b/c/d".equals(child.getSubFqn(1, child.size()).toString());
    }
 =

-   @Test(groups =3D {"functional"})
    public void testParentage()
    {
       Fqn<String> fqnRoot =3D new Fqn<String>();
@@ -308,7 +291,6 @@
 =

    }
 =

-   @Test(groups =3D {"functional"})
    public void testRoot()
    {
       Fqn<String> fqn =3D new Fqn<String>();
@@ -318,7 +300,6 @@
       assert !fqn.isRoot();
    }
 =

-   @Test(groups =3D {"functional"})
    public void testGetName()
    {
       Fqn<Integer> integerFqn =3D new Fqn<Integer>(1);
@@ -329,7 +310,6 @@
       assert object.toString().equals(objectFqn.getLastElementAsString());
    }
 =

-   @Test(groups =3D {"functional"})
    public void testCloningString() throws CloneNotSupportedException
    {
       Fqn<String> f =3D Fqn.fromString("/a/b/c");
@@ -343,7 +323,6 @@
       assert f.equals(f.clone());
    }
 =

-   @Test(groups =3D {"functional"})
    public void testRemovalNonString() throws Exception
    {
       Fqn<Object> f =3D new Fqn<Object>("test", 1);
@@ -372,7 +351,6 @@
 =

    // testing generics
 =

-   @Test(groups =3D {"functional"})
    public void testGenerics()
    {
       Fqn<String> f =3D Fqn.fromString("/blah/blah");
@@ -387,7 +365,21 @@
       assert f3.getParent().equals(f4);
    }
 =

-   @Test(groups =3D {"functional"})
+   public void testSize()
+   {
+      Fqn f =3D new Fqn();
+      assert f.size() =3D=3D 0;
+      assert f.isRoot();
+
+      f =3D Fqn.fromString("/");
+      assert f.size() =3D=3D 0;
+      assert f.isRoot();
+
+      f =3D Fqn.fromString("/hello");
+      assert f.size() =3D=3D 1;
+      assert !f.isRoot();
+   }
+
    public void testGenerations()
    {
       Fqn<Integer> f =3D new Fqn<Integer>(1, 2, 3, 4, 5, 6, 7);

Modified: core/trunk/src/test/java/org/jboss/cache/marshall/CrudMethodTest.=
java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/test/java/org/jboss/cache/marshall/CrudMethodTest.java	2=
008-01-03 13:29:35 UTC (rev 4967)
+++ core/trunk/src/test/java/org/jboss/cache/marshall/CrudMethodTest.java	2=
008-01-03 19:17:09 UTC (rev 4968)
@@ -8,11 +8,10 @@
 =

 package org.jboss.cache.marshall;
 =

-import static org.testng.AssertJUnit.assertEquals;
 import static org.testng.AssertJUnit.assertFalse;
 import static org.testng.AssertJUnit.assertTrue;
-
 import org.testng.annotations.Test;
+
 /**
  * Checks CRUD methods
  *
@@ -32,8 +31,6 @@
       assertTrue(MethodDeclarations.isPutMethod(MethodDeclarations.putKeyV=
alVersionedMethodLocal_id));
       assertTrue(MethodDeclarations.isPutMethod(MethodDeclarations.putForE=
xternalReadMethodLocal_id));
       assertTrue(MethodDeclarations.isPutMethod(MethodDeclarations.putForE=
xternalReadVersionedMethodLocal_id));
-
-      assertEquals(8, MethodDeclarations.putMethodIds.size());
    }
 =

    public void testTransactionLifecycleMethods()
@@ -42,8 +39,6 @@
       assertTrue(MethodDeclarations.isTransactionLifecycleMethod(MethodDec=
larations.rollbackMethod_id));
       assertTrue(MethodDeclarations.isTransactionLifecycleMethod(MethodDec=
larations.prepareMethod_id));
       assertTrue(MethodDeclarations.isTransactionLifecycleMethod(MethodDec=
larations.optimisticPrepareMethod_id));
-
-      assertEquals(4, MethodDeclarations.transactionLifecycleMethodIds.siz=
e());
    }
 =

    public void testCrudMethods()
@@ -65,8 +60,6 @@
       assertTrue(MethodDeclarations.isCrudMethod(MethodDeclarations.putFor=
ExternalReadMethodLocal_id));
       assertTrue(MethodDeclarations.isCrudMethod(MethodDeclarations.putFor=
ExternalReadVersionedMethodLocal_id));
 =

-      assertEquals(16, MethodDeclarations.crudMethodIds.size());
-
       assertFalse(MethodDeclarations.isCrudMethod(MethodDeclarations.getKe=
yValueMethodLocal_id));
       assertFalse(MethodDeclarations.isCrudMethod(MethodDeclarations.getNo=
deMethodLocal_id));
       assertFalse(MethodDeclarations.isCrudMethod(MethodDeclarations.getKe=
ysMethodLocal_id));
@@ -78,7 +71,5 @@
       assertTrue(MethodDeclarations.isBuddyGroupOrganisationMethod(MethodD=
eclarations.remoteAnnounceBuddyPoolNameMethod_id));
       assertTrue(MethodDeclarations.isBuddyGroupOrganisationMethod(MethodD=
eclarations.remoteAssignToBuddyGroupMethod_id));
       assertTrue(MethodDeclarations.isBuddyGroupOrganisationMethod(MethodD=
eclarations.remoteRemoveFromBuddyGroupMethod_id));
-
-      assertEquals(3, MethodDeclarations.buddyGroupOrganisationMethodIds.s=
ize());
    }
 }

Modified: core/trunk/src/test/java/org/jboss/cache/profiling/ProfileTest.ja=
va
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/test/java/org/jboss/cache/profiling/ProfileTest.java	200=
8-01-03 13:29:35 UTC (rev 4967)
+++ core/trunk/src/test/java/org/jboss/cache/profiling/ProfileTest.java	200=
8-01-03 19:17:09 UTC (rev 4968)
@@ -1,14 +1,16 @@
 package org.jboss.cache.profiling;
 =

+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.jboss.cache.Fqn;
 import org.jboss.cache.config.BuddyReplicationConfig;
 import org.jboss.cache.config.Configuration;
 import org.jboss.cache.misc.TestingUtil;
 import org.jboss.cache.transaction.DummyTransactionManagerLookup;
-import org.testng.annotations.BeforeTest;
 import org.testng.annotations.Test;
 =

 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 import java.util.Random;
 import java.util.concurrent.ExecutorService;
@@ -34,62 +36,34 @@
    /*
       Test configuration options
     */
-   protected static final long DURATION =3D 2 * 60000;
+   protected static final long DURATION =3D 2 * 60 * 1000;
    protected static final int NUM_THREADS =3D 10;
    protected static final int MAX_RANDOM_SLEEP_MILLIS =3D 100;
    protected static final int MAX_DEPTH =3D 8;
    protected static final int MAX_OVERALL_NODES =3D 100;
+   protected static final int WARMUP_LOOPS =3D 10000;
 =

-
    private List<Fqn> fqns =3D new ArrayList<Fqn>(MAX_OVERALL_NODES);
    private Random r =3D new Random();
 =

-   @BeforeTest
-   public void initialiseFqns()
-   {
-      fqns.clear();
-      for (int i =3D 0; i < MAX_OVERALL_NODES; i++)
-      {
-         Fqn fqn =3D createRandomFqn(r);
-         while (fqns.contains(fqn)) fqn =3D createRandomFqn(r);
-         if (i % 100 =3D=3D 0) System.out.println("Generated " + i + " fqn=
s");
-         fqns.add(fqn);
-      }
-      System.gc();
-      System.out.println("Finished initialising.  Starting test.");
-   }
+   private Log log =3D LogFactory.getLog(ProfileTest.class);
 =

-   private Fqn createRandomFqn(Random r)
-   {
-      String s =3D "/";
-      int depth =3D r.nextInt(MAX_DEPTH);
-      for (int i =3D 0; i < depth; i++)
-      {
-         s +=3D r.nextInt(Integer.MAX_VALUE) + "/";
-      }
-
-      return Fqn.fromString(s);
-   }
-
    public void testReplSync() throws Exception
    {
-      cache.start();
-      doTest();
+      runCompleteTest();
    }
 =

    public void testReplAsync() throws Exception
    {
       cache.getConfiguration().setCacheMode(Configuration.CacheMode.REPL_A=
SYNC);
-      cache.start();
-      doTest();
+      runCompleteTest();
    }
 =

    public void testReplSyncOptimistic() throws Exception
    {
       cache.getConfiguration().setNodeLockingScheme(Configuration.NodeLock=
ingScheme.OPTIMISTIC);
       cache.getConfiguration().setTransactionManagerLookupClass(DummyTrans=
actionManagerLookup.class.getName());
-      cache.start();
-      doTest();
+      runCompleteTest();
    }
 =

    public void testReplAsyncOptimistic() throws Exception
@@ -97,8 +71,7 @@
       cache.getConfiguration().setCacheMode(Configuration.CacheMode.REPL_A=
SYNC);
       cache.getConfiguration().setNodeLockingScheme(Configuration.NodeLock=
ingScheme.OPTIMISTIC);
       cache.getConfiguration().setTransactionManagerLookupClass(DummyTrans=
actionManagerLookup.class.getName());
-      cache.start();
-      doTest();
+      runCompleteTest();
    }
 =

    public void testReplSyncBR() throws Exception
@@ -133,15 +106,92 @@
       testReplAsyncOptimistic();
    }
 =

+   private void runCompleteTest() throws Exception
+   {
+      init();
+      startup();
+      warmup();
+      doTest();
+   }
+
+   /**
+    * Thr following test phases can be profiled individually using trigger=
s in JProfiler.
+    */
+
+   protected void init()
+   {
+      long startTime =3D System.currentTimeMillis();
+      log.warn("Starting init() phase");
+      fqns.clear();
+      for (int i =3D 0; i < MAX_OVERALL_NODES; i++)
+      {
+         Fqn fqn =3D createRandomFqn(r);
+         while (fqns.contains(fqn)) fqn =3D createRandomFqn(r);
+         if (i % 10 =3D=3D 0)
+         {
+            log.warn("Generated " + i + " fqns");
+         }
+         fqns.add(fqn);
+      }
+      System.gc();
+      long duration =3D System.currentTimeMillis() - startTime;
+      log.warn("Finished init() phase.  " + printDuration(duration));
+   }
+
+   private Fqn createRandomFqn(Random r)
+   {
+      String s =3D "/";
+      int depth =3D r.nextInt(MAX_DEPTH);
+      for (int i =3D 0; i < depth; i++)
+      {
+         s +=3D r.nextInt(Integer.MAX_VALUE) + "/";
+      }
+
+      return Fqn.fromString(s);
+   }
+
+
+   private void startup()
+   {
+      long startTime =3D System.currentTimeMillis();
+      log.warn("Starting cache");
+      cache.start();
+      long duration =3D System.currentTimeMillis() - startTime;
+      log.warn("Started cache.  " + printDuration(duration));
+   }
+
+   private void warmup()
+   {
+      long startTime =3D System.currentTimeMillis();
+      log.warn("Starting warmup");
+      // creates all the Fqns since this can be expensive and we don't rea=
lly want to measure this (for now)
+      for (Fqn f : fqns)
+      {
+         // this will create the necessary nodes.
+         cache.put(f, Collections.emptyMap());
+      }
+
+      // loop through WARMUP_LOOPS gets and puts for JVM optimisation
+      for (int i =3D 0; i < WARMUP_LOOPS; i++)
+      {
+         Fqn f =3D fqns.get(r.nextInt(MAX_OVERALL_NODES));
+         cache.get(f, "");
+         cache.put(f, "k", "v");
+         cache.remove(f, "k");
+      }
+
+      long duration =3D System.currentTimeMillis() - startTime;
+      log.warn("Finished warmup.  " + printDuration(duration));
+   }
+
    private void doTest() throws Exception
    {
       ExecutorService exec =3D Executors.newFixedThreadPool(NUM_THREADS);
       long end =3D System.currentTimeMillis() + DURATION;
-      int i =3D 0;
-      long start =3D System.currentTimeMillis();
+      long startTime =3D System.currentTimeMillis();
+      log.warn("Starting test");
       while (System.currentTimeMillis() < end)
       {
-         i++;
          exec.execute(new Runnable()
          {
             public void run()
@@ -153,12 +203,12 @@
          });
          TestingUtil.sleepRandom(MAX_RANDOM_SLEEP_MILLIS);
       }
-
+      log.warn("Finished generating runnables; awaiting executor completio=
n");
       // wait for executors to complete!
       exec.shutdown();
       exec.awaitTermination(10000, TimeUnit.MILLISECONDS);
-      double durationSecs =3D (System.currentTimeMillis() - start) / 1000;
-      System.out.println("Completed Test!  Achieved " + ((double) i / dura=
tionSecs) + " TPS.");
+      long duration =3D System.currentTimeMillis() - startTime;
+      log.warn("Finished test.  " + printDuration(duration));
    }
 =

    private String getRandomString()
@@ -172,4 +222,17 @@
       }
       return sb.toString();
    }
+
+   private String printDuration(long duration)
+   {
+      if (duration > 2000)
+      {
+         double dSecs =3D ((double) duration / (double) 1000);
+         return "Duration: " + dSecs + " seconds";
+      }
+      else
+      {
+         return "Duration: " + duration + " millis";
+      }
+   }
 }


--===============4912209702877865203==--

From jbosscache-commits at lists.jboss.org Thu Jan  3 19:48:29 2008
Content-Type: multipart/mixed; boundary="===============6339376881472931462=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r4969 - in core/trunk/src:
 main/java/org/jboss/cache/util and 1 other directories.
Date: Thu, 03 Jan 2008 19:48:29 -0500
Message-ID: <E1JAajd-0002wD-4y@committer01.frg.pub.inap.atl.jboss.com>

--===============6339376881472931462==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: manik.surtani(a)jboss.com
Date: 2008-01-03 19:48:28 -0500 (Thu, 03 Jan 2008)
New Revision: 4969

Added:
   core/trunk/src/main/java/org/jboss/cache/util/BitEncodedIntegerSet.java
   core/trunk/src/test/java/org/jboss/cache/util/BitEncodedIntegerSetTest.j=
ava
Modified:
   core/trunk/src/main/java/org/jboss/cache/interceptors/MethodDispacherInt=
erceptor.java
Log:
Moved bit encoding of method ints into separate utility class

Modified: core/trunk/src/main/java/org/jboss/cache/interceptors/MethodDispa=
cherInterceptor.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/java/org/jboss/cache/interceptors/MethodDispacherIn=
terceptor.java	2008-01-03 19:17:09 UTC (rev 4968)
+++ core/trunk/src/main/java/org/jboss/cache/interceptors/MethodDispacherIn=
terceptor.java	2008-01-04 00:48:28 UTC (rev 4969)
@@ -8,6 +8,7 @@
 import org.jboss.cache.marshall.MethodDeclarations;
 import org.jboss.cache.optimistic.DataVersion;
 import org.jboss.cache.transaction.GlobalTransaction;
+import org.jboss.cache.util.BitEncodedIntegerSet;
 import org.jgroups.Address;
 =

 import java.util.List;
@@ -34,22 +35,15 @@
 public abstract class MethodDispacherInterceptor extends Interceptor
 {
    /**
-    * Methods that have been overridden.  This is encoded in the bits of a=
n integer, with each ordinal position representing a method id.
-    * This was originally a Set but that proved way too inefficient with c=
onstant boxing/unboxing of ints and doing Set.contains()
-    * for each invocation for each interceptor.  - Manik, Jan '08.
+    * Methods that have been overridden.
     */
-   private long overriddenMethods =3D 0;
+   private BitEncodedIntegerSet overriddenMethods =3D new BitEncodedIntege=
rSet();
 =

    protected MethodDispacherInterceptor()
    {
       findOverriddenMethods();
    }
 =

-   private boolean noHandlersRegistered(int id)
-   {
-      return (overriddenMethods & ((long) 1 << id)) < 1;
-   }
-
    /**
     * Acts like a 'switch case' that delegates the call to the appropriate=
 method.
     */
@@ -62,7 +56,7 @@
          return nextInterceptor(ctx);
       }
       MethodCall m =3D ctx.getMethodCall();
-      if (noHandlersRegistered(m.getMethodId()))
+      if (!overriddenMethods.contains(m.getMethodId()))
       {
          if (trace) log.trace("Not registered for any handlers, passing up=
 the chain.");
          return nextInterceptor(ctx);
@@ -524,7 +518,7 @@
          try
          {
             currentClass.getDeclaredMethod(methodName, args);
-            overriddenMethods |=3D ((long) 1 << methodId);
+            overriddenMethods.add(methodId);
          }
          catch (NoSuchMethodException e)
          {

Added: core/trunk/src/main/java/org/jboss/cache/util/BitEncodedIntegerSet.j=
ava
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/java/org/jboss/cache/util/BitEncodedIntegerSet.java=
	                        (rev 0)
+++ core/trunk/src/main/java/org/jboss/cache/util/BitEncodedIntegerSet.java=
	2008-01-04 00:48:28 UTC (rev 4969)
@@ -0,0 +1,92 @@
+package org.jboss.cache.util;
+
+import net.jcip.annotations.NotThreadSafe;
+
+/**
+ * A Set that encodes integers as bits in a long.  Does not implement java=
.util.Set since autoboxing is unnecessarily
+ * expensive for the ints stored, but follows very similar semantics to Se=
t: no nulls, no duplicates, and order not guaranteed,
+ * and adds one more: this can only store ints from 0 to 63, inclusive.
+ * <p/>
+ * Integers in this set are packed into a single long, setting bit values =
accordingly and hence the strict range on allowable
+ * integers.  The upshot is a guaranteed limit on how much memory is consu=
med, as well as very efficient operations on the set.
+ * <p/>
+ *
+ * @author Manik Surtani (<a href=3D"mailto:manik(a)jboss.org">manik(a)jbo=
ss.org</a>)
+ * @since 2.1.0
+ */
+(a)NotThreadSafe
+public class BitEncodedIntegerSet
+{
+   private long encoded =3D 0;
+
+   /**
+    * Adds an integer to the set.
+    *
+    * @param i integer to add
+    */
+   public void add(int i)
+   {
+      encoded |=3D ((long) 1 << i);
+   }
+
+   /**
+    * Removes an integer from the set
+    *
+    * @param i integer to remove
+    */
+   public void remove(int i)
+   {
+      encoded &=3D ~((long) 1 << i);
+   }
+
+   /**
+    * Tests whether the set contains an integer
+    *
+    * @param i integer to check for
+    * @return true if contained; false otherwise
+    */
+   public boolean contains(int i)
+   {
+      return (encoded & ((long) 1 << i)) !=3D 0;
+   }
+
+   @Override
+   public boolean equals(Object o)
+   {
+      if (o =3D=3D null || getClass() !=3D o.getClass()) return false;
+
+      BitEncodedIntegerSet that =3D (BitEncodedIntegerSet) o;
+
+      return encoded =3D=3D that.encoded;
+   }
+
+   @Override
+   public int hashCode()
+   {
+      return (int) (encoded ^ (encoded >>> 32));
+   }
+
+   /**
+    * Clears the set
+    */
+   public void clear()
+   {
+      encoded =3D 0;
+   }
+
+   /**
+    * Tests if the set is empty
+    *
+    * @return true if empty
+    */
+   public boolean isEmpty()
+   {
+      return encoded =3D=3D 0;
+   }
+
+   @Override
+   public String toString()
+   {
+      return "BitEncodedSet (encoded as: " + Long.toBinaryString(encoded) =
+ ")";
+   }
+}

Added: core/trunk/src/test/java/org/jboss/cache/util/BitEncodedIntegerSetTe=
st.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/test/java/org/jboss/cache/util/BitEncodedIntegerSetTest.=
java	                        (rev 0)
+++ core/trunk/src/test/java/org/jboss/cache/util/BitEncodedIntegerSetTest.=
java	2008-01-04 00:48:28 UTC (rev 4969)
@@ -0,0 +1,113 @@
+package org.jboss.cache.util;
+
+import org.testng.annotations.Test;
+
+/**
+ * @author Manik Surtani (<a href=3D"mailto:manik(a)jboss.org">manik(a)jbo=
ss.org</a>)
+ * @since 2.1.0
+ */
+(a)Test(groups =3D "functional")
+public class BitEncodedIntegerSetTest
+{
+   public void testLimits()
+   {
+      BitEncodedIntegerSet set =3D new BitEncodedIntegerSet();
+      set.add(0);
+      set.add(1);
+      set.add(62);
+      set.add(63);
+
+      for (int i =3D 0; i < 64; i++)
+      {
+         if (i =3D=3D 0 || i =3D=3D 1 || i =3D=3D 62 || i =3D=3D 63)
+         {
+            assert set.contains(i) : "Should contain " + i;
+         }
+         else
+         {
+            assert !set.contains(i) : "Should not contain " + i;
+         }
+      }
+   }
+
+   public void testRemoval()
+   {
+      BitEncodedIntegerSet set =3D new BitEncodedIntegerSet();
+      set.add(0);
+      set.add(1);
+      set.add(62);
+      set.add(63);
+
+      set.remove(0);
+      set.remove(63);
+
+      for (int i =3D 0; i < 64; i++)
+      {
+         if (i =3D=3D 1 || i =3D=3D 62)
+         {
+            assert set.contains(i);
+         }
+         else
+         {
+            assert !set.contains(i);
+         }
+      }
+
+   }
+
+   public void testClear()
+   {
+      BitEncodedIntegerSet set =3D new BitEncodedIntegerSet();
+      set.add(0);
+      set.add(1);
+      set.add(62);
+      set.add(63);
+
+      for (int i =3D 0; i < 64; i++)
+      {
+         if (i =3D=3D 0 || i =3D=3D 1 || i =3D=3D 62 || i =3D=3D 63)
+         {
+            assert set.contains(i);
+         }
+         else
+         {
+            assert !set.contains(i);
+         }
+      }
+      set.clear();
+
+      assert set.isEmpty();
+   }
+
+   public void testIsEmpty()
+   {
+      BitEncodedIntegerSet set =3D new BitEncodedIntegerSet();
+      assert set.isEmpty();
+   }
+
+   public void testEquals()
+   {
+      BitEncodedIntegerSet set1 =3D new BitEncodedIntegerSet();
+      BitEncodedIntegerSet set2 =3D new BitEncodedIntegerSet();
+
+      assert set1.equals(set2);
+      assert set2.equals(set1);
+
+      set1.add(1);
+
+      assert !set1.equals(set2);
+      assert !set2.equals(set1);
+
+      set2.add(1);
+
+      assert set1.equals(set2);
+      assert set2.equals(set1);
+
+      set2.add(2);
+
+      assert !set1.equals(set2);
+      assert !set2.equals(set1);
+   }
+
+
+}


--===============6339376881472931462==--

From jbosscache-commits at lists.jboss.org Thu Jan  3 20:07:29 2008
Content-Type: multipart/mixed; boundary="===============1873626657879310346=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r4970 -
 core/trunk/src/main/java/org/jboss/cache/interceptors.
Date: Thu, 03 Jan 2008 20:07:19 -0500
Message-ID: <E1JAb1r-0006qY-38@committer01.frg.pub.inap.atl.jboss.com>

--===============1873626657879310346==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: manik.surtani(a)jboss.com
Date: 2008-01-03 20:07:18 -0500 (Thu, 03 Jan 2008)
New Revision: 4970

Modified:
   core/trunk/src/main/java/org/jboss/cache/interceptors/ActivationIntercep=
tor.java
Log:
restored setting isActivation flag

Modified: core/trunk/src/main/java/org/jboss/cache/interceptors/ActivationI=
nterceptor.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/java/org/jboss/cache/interceptors/ActivationInterce=
ptor.java	2008-01-04 00:48:28 UTC (rev 4969)
+++ core/trunk/src/main/java/org/jboss/cache/interceptors/ActivationInterce=
ptor.java	2008-01-04 01:07:18 UTC (rev 4970)
@@ -48,6 +48,7 @@
    public ActivationInterceptor()
    {
       initLogger();
+      isActivation =3D true;
    }
 =

    @Override


--===============1873626657879310346==--

From jbosscache-commits at lists.jboss.org Thu Jan  3 20:58:33 2008
Content-Type: multipart/mixed; boundary="===============0585745417040526427=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r4971 -
 core/trunk/src/test/java/org/jboss/cache/loader/deadlock.
Date: Thu, 03 Jan 2008 20:58:33 -0500
Message-ID: <E1JAbpR-00080y-5W@committer01.frg.pub.inap.atl.jboss.com>

--===============0585745417040526427==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: manik.surtani(a)jboss.com
Date: 2008-01-03 20:58:33 -0500 (Thu, 03 Jan 2008)
New Revision: 4971

Modified:
   core/trunk/src/test/java/org/jboss/cache/loader/deadlock/ConcurrentCreat=
ionDeadlockTest.java
Log:
re-added test

Modified: core/trunk/src/test/java/org/jboss/cache/loader/deadlock/Concurre=
ntCreationDeadlockTest.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/test/java/org/jboss/cache/loader/deadlock/ConcurrentCrea=
tionDeadlockTest.java	2008-01-04 01:07:18 UTC (rev 4970)
+++ core/trunk/src/test/java/org/jboss/cache/loader/deadlock/ConcurrentCrea=
tionDeadlockTest.java	2008-01-04 01:58:33 UTC (rev 4971)
@@ -7,6 +7,7 @@
 import org.jboss.cache.config.Configuration.CacheMode;
 import org.jboss.cache.factories.UnitTestCacheConfigurationFactory;
 import org.jboss.cache.loader.AbstractCacheLoaderTestBase;
+import org.jboss.cache.loader.DummyInMemoryCacheLoader;
 import org.jboss.cache.transaction.DummyTransactionManager;
 import org.testng.annotations.AfterMethod;
 import org.testng.annotations.BeforeMethod;
@@ -62,7 +63,7 @@
  * CacheLoader/StoreInterceptor's...</li>
  * </ul>
  */
-(a)Test(groups =3D {"functional"}, enabled =3D false)
+(a)Test(groups =3D {"functional"}, enabled =3D true)
 // Disabling since this has issues with ReadWriteWithUpgradeLock.  See JBC=
ACHE-461
 public class ConcurrentCreationDeadlockTest extends AbstractCacheLoaderTes=
tBase
 {
@@ -161,47 +162,8 @@
       cache.start();
    }
 =

-   /**
-    * Test for a local cache without cache loader and single modification =
per
-    * transaction.<br>
-    * This test has never failed up to now.
-    *
-    * @throws Exception Any exception if thrown by the cache.
-    */
-   public void disabledtestLocalNoCacheLoader1Modification() throws Except=
ion
-   {
-      startCache(Configuration.CacheMode.LOCAL, null);
-      performTest(1);
-   }
 =

    /**
-    * Test for a local cache without cache loader and two modifications per
-    * transaction.<br>
-    * This test has never failed up to now.
-    *
-    * @throws Exception Any exception if thrown by the cache.
-    */
-   public void disabledtestLocalNoCacheLoader2Modifications()
-         throws Exception
-   {
-      startCache(Configuration.CacheMode.LOCAL, null);
-      performTest(2);
-   }
-
-   /**
-    * Test for a local cache with cache loader and single modification per
-    * transaction.<br>
-    * This test has never failed up to now.
-    *
-    * @throws Exception Any exception if thrown by the cache.
-    */
-   public void disabledtestLocalCacheLoader1Modification() throws Exception
-   {
-      startCache(Configuration.CacheMode.LOCAL, "org.jboss.cache.loader.Du=
mmyCacheLoader");
-      performTest(1);
-   }
-
-   /**
     * Test for a local cache with cache loader and two modifications per
     * transaction.<br>
     * This test does very often fail with a TimeoutException.
@@ -210,109 +172,11 @@
     */
    public void testLocalCacheLoader2Modifications() throws Exception
    {
-      startCache(Configuration.CacheMode.LOCAL, "org.jboss.cache.loader.Du=
mmyCacheLoader");
+      startCache(Configuration.CacheMode.LOCAL, DummyInMemoryCacheLoader.c=
lass.getName());
       performTest(2);
    }
 =

    /**
-    * Test for an asynchronously replicated cache without cache loader and
-    * single modification per transaction.<br>
-    * This test has never failed up to now.
-    *
-    * @throws Exception Any exception if thrown by the cache.
-    */
-   public void disabledtestReplAsyncNoCacheLoader1Modification()
-         throws Exception
-   {
-      startCache(Configuration.CacheMode.REPL_ASYNC, null);
-      performTest(1);
-   }
-
-   /**
-    * Test for an asynchronously replicated cache without cache loader and=
 two
-    * modifications per transaction.<br>
-    * This test has never failed up to now.
-    *
-    * @throws Exception Any exception if thrown by the cache.
-    */
-   public void disabledtestReplAsyncNoCacheLoader2Modifications()
-         throws Exception
-   {
-      startCache(Configuration.CacheMode.REPL_ASYNC, null);
-      performTest(2);
-   }
-
-   /**
-    * Test for an asynchronously replicated cache with cache loader and si=
ngle
-    * modification per transaction.<br>
-    * This test has never failed up to now.
-    *
-    * @throws Exception Any exception if thrown by the cache.
-    */
-   public void disabledtestReplAsyncCacheLoader1Modification()
-         throws Exception
-   {
-      startCache(Configuration.CacheMode.REPL_ASYNC, "org.jboss.cache.load=
er.DummyCacheLoader");
-      performTest(1);
-   }
-
-   /**
-    * Test for an asynchronously replicated cache with cache loader and two
-    * modification per transaction.<br>
-    * This test mysteriously never fails, although it should as the LOCAL
-    * and REPL_SYNC do.
-    *
-    * @throws Exception Any exception if thrown by the cache.
-    */
-   public void disabledtestReplAsyncCacheLoader2Modifications()
-         throws Exception
-   {
-      startCache(Configuration.CacheMode.REPL_ASYNC, "org.jboss.cache.load=
er.DummyCacheLoader");
-      performTest(2);
-   }
-
-   /**
-    * Test for a synchronously replicated cache without cache loader and s=
ingle
-    * modification per transaction.<br>
-    * This test has never failed up to now.
-    *
-    * @throws Exception Any exception if thrown by the cache.
-    */
-   public void disabledtestReplSyncNoCacheLoader1Modification()
-         throws Exception
-   {
-      startCache(Configuration.CacheMode.REPL_SYNC, null);
-      performTest(1);
-   }
-
-   /**
-    * Test for a synchronously replicated cache without cache loader and t=
wo
-    * modification per transaction.<br>
-    * This test has never failed up to now.
-    *
-    * @throws Exception Any exception if thrown by the cache.
-    */
-   public void disabledtestReplSyncNoCacheLoader2Modifications()
-         throws Exception
-   {
-      startCache(Configuration.CacheMode.REPL_SYNC, null);
-      performTest(2);
-   }
-
-   /**
-    * Test for a synchronously replicated cache with cache loader and sing=
le
-    * modification per transaction.<br>
-    * This test has never failed up to now.
-    *
-    * @throws Exception Any exception if thrown by the cache.
-    */
-   public void disabledtestReplSyncCacheLoader1Modification() throws Excep=
tion
-   {
-      startCache(Configuration.CacheMode.REPL_SYNC, "org.jboss.cache.loade=
r.DummyCacheLoader");
-      performTest(1);
-   }
-
-   /**
     * Test for a synchronously replicated cache with cache loader and two
     * modifications per transaction.<br>
     * This test fails very often with a TimeoutException.
@@ -322,7 +186,7 @@
    public void testReplSyncCacheLoader2Modifications()
          throws Exception
    {
-      startCache(Configuration.CacheMode.REPL_SYNC, "org.jboss.cache.loade=
r.DummyCacheLoader");
+      startCache(Configuration.CacheMode.REPL_SYNC, DummyInMemoryCacheLoad=
er.class.getName());
       performTest(2);
    }
 =



--===============0585745417040526427==--

From jbosscache-commits at lists.jboss.org Thu Jan  3 20:59:29 2008
Content-Type: multipart/mixed; boundary="===============0975307240562607636=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r4972 -
 core/trunk/src/main/java/org/jboss/cache/interceptors.
Date: Thu, 03 Jan 2008 20:59:29 -0500
Message-ID: <E1JAbqL-00082Q-5p@committer01.frg.pub.inap.atl.jboss.com>

--===============0975307240562607636==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: manik.surtani(a)jboss.com
Date: 2008-01-03 20:59:29 -0500 (Thu, 03 Jan 2008)
New Revision: 4972

Modified:
   core/trunk/src/main/java/org/jboss/cache/interceptors/ActivationIntercep=
tor.java
   core/trunk/src/main/java/org/jboss/cache/interceptors/CacheLoaderInterce=
ptor.java
   core/trunk/src/main/java/org/jboss/cache/interceptors/CacheStoreIntercep=
tor.java
   core/trunk/src/main/java/org/jboss/cache/interceptors/DataGravitatorInte=
rceptor.java
   core/trunk/src/main/java/org/jboss/cache/interceptors/EvictionIntercepto=
r.java
   core/trunk/src/main/java/org/jboss/cache/interceptors/Interceptor.java
   core/trunk/src/main/java/org/jboss/cache/interceptors/InvocationContextI=
nterceptor.java
   core/trunk/src/main/java/org/jboss/cache/interceptors/OptimisticCreateIf=
NotExistsInterceptor.java
   core/trunk/src/main/java/org/jboss/cache/interceptors/PassivationInterce=
ptor.java
   core/trunk/src/main/java/org/jboss/cache/interceptors/PessimisticLockInt=
erceptor.java
Log:
JBCACHE-881 - cache node references in invocation context to save on multip=
le expensive cache.peek() calls.

Modified: core/trunk/src/main/java/org/jboss/cache/interceptors/ActivationI=
nterceptor.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/java/org/jboss/cache/interceptors/ActivationInterce=
ptor.java	2008-01-04 01:58:33 UTC (rev 4971)
+++ core/trunk/src/main/java/org/jboss/cache/interceptors/ActivationInterce=
ptor.java	2008-01-04 01:59:29 UTC (rev 4972)
@@ -49,6 +49,7 @@
    {
       initLogger();
       isActivation =3D true;
+      useCacheStore =3D false;
    }
 =

    @Override
@@ -176,7 +177,7 @@
    private void removeNodeFromCacheLoader(InvocationContext ctx, Fqn fqn) =
throws Throwable
    {
       NodeSPI n;
-      if (((n =3D getNode(fqn)) !=3D null) && n.isDataLoaded() && loader.e=
xists(fqn))
+      if (((n =3D peekNode(ctx, fqn, false, true)) !=3D null) && n.isDataL=
oaded() && loader.exists(fqn))
       {
          // node not null and attributes have been loaded?
          if (!n.getChildrenDirect().isEmpty())
@@ -338,9 +339,9 @@
                // AND it was found in the cache loader (nodeLoaded =3D tru=
e).
                // Then notify the listeners that the node has been activat=
ed.
                Fqn fqn =3D (Fqn) args[1];
-               if (fqn !=3D null && cache.peek(fqn, false) !=3D null && lo=
ader.exists(fqn))
+               if (fqn !=3D null && peekNode(ctx, fqn, false, false) !=3D =
null && loader.exists(fqn))
                {
-                  NodeSPI n =3D getNode(fqn);// don't load
+                  NodeSPI n =3D peekNode(ctx, fqn, false, true);// don't l=
oad
                   // node not null and attributes have been loaded?
                   if (n !=3D null && n.isDataLoaded())
                   {

Modified: core/trunk/src/main/java/org/jboss/cache/interceptors/CacheLoader=
Interceptor.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/java/org/jboss/cache/interceptors/CacheLoaderInterc=
eptor.java	2008-01-04 01:58:33 UTC (rev 4971)
+++ core/trunk/src/main/java/org/jboss/cache/interceptors/CacheLoaderInterc=
eptor.java	2008-01-04 01:59:29 UTC (rev 4972)
@@ -468,16 +468,6 @@
 //      nextInterceptor(m);
    }
 =

-   /**
-    * Retrieves a node from memory; doesn't access the cache loader
-    *
-    * @param fqn
-    */
-   protected NodeSPI getNode(Fqn fqn)
-   {
-      return cache.peek(fqn, true);
-   }
-
    private TransactionEntry getTransactionEntry(InvocationContext ctx)
    {
       GlobalTransaction gtx =3D ctx.getGlobalTransaction();

Modified: core/trunk/src/main/java/org/jboss/cache/interceptors/CacheStoreI=
nterceptor.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/java/org/jboss/cache/interceptors/CacheStoreInterce=
ptor.java	2008-01-04 01:58:33 UTC (rev 4971)
+++ core/trunk/src/main/java/org/jboss/cache/interceptors/CacheStoreInterce=
ptor.java	2008-01-04 01:59:29 UTC (rev 4972)
@@ -212,7 +212,7 @@
       {
          loader.removeData(fqn);
          // we need to mark this node as data loaded
-         NodeSPI n =3D cache.peek(fqn, false);
+         NodeSPI n =3D peekNode(ctx, fqn, false, false);//cache.peek(fqn, =
false);
          if (n !=3D null)
          {
             n.setDataLoaded(true);
@@ -245,7 +245,7 @@
       }
       loader.removeData(fqn);
       // if we are erasing all the data then consider this node loaded
-      NodeSPI n =3D cache.peek(fqn, false);
+      NodeSPI n =3D peekNode(ctx, fqn, false, false);//cache.peek(fqn, fal=
se);
       n.setDataLoaded(true);
       return returnValue;
    }

Modified: core/trunk/src/main/java/org/jboss/cache/interceptors/DataGravita=
torInterceptor.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/java/org/jboss/cache/interceptors/DataGravitatorInt=
erceptor.java	2008-01-04 01:58:33 UTC (rev 4971)
+++ core/trunk/src/main/java/org/jboss/cache/interceptors/DataGravitatorInt=
erceptor.java	2008-01-04 01:59:29 UTC (rev 4972)
@@ -172,7 +172,7 @@
          }
          else
          {
-            if (cache.peek(fqn, false) =3D=3D null)
+            if (peekNode(ctx, fqn, false, false) =3D=3D null)
             {
                if (trace) log.trace("Gravitating from local backup tree");
                BackupData data =3D localBackupGet(fqn, ctx);
@@ -192,7 +192,7 @@
                   // Make sure I replicate to my buddies.
                   if (trace)
                      log.trace("Passing the put call locally to make sure =
state is persisted and ownership is correctly established.");
-                  createNode(data.backupData, false);
+                  createNode(ctx, data.backupData, false);
 =

                   // very strange, the invocation contexts get twisted up =
here, and will need preservation.
                   // a bit crappy and hacky, all will be solved when we mo=
ve to JBoss AOP in 2.1.0
@@ -379,13 +379,14 @@
    }
 =

    @SuppressWarnings("unchecked")
-   private void createNode(List<NodeData> nodeData, boolean localOnly) thr=
ows CacheException
+   private void createNode(InvocationContext ctx, List<NodeData> nodeData,=
 boolean localOnly) throws CacheException
    {
       for (NodeData data : nodeData)
       {
          if (localOnly)
          {
-            if (cache.peek(data.getFqn(), false) =3D=3D null)
+//            if (cache.peek(data.getFqn(), false) =3D=3D null)
+            if (peekNode(ctx, data.getFqn(), false, false) =3D=3D null)
             {
                createNodesLocally(data.getFqn(), data.getAttributes());
             }

Modified: core/trunk/src/main/java/org/jboss/cache/interceptors/EvictionInt=
erceptor.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/java/org/jboss/cache/interceptors/EvictionIntercept=
or.java	2008-01-04 01:58:33 UTC (rev 4971)
+++ core/trunk/src/main/java/org/jboss/cache/interceptors/EvictionIntercept=
or.java	2008-01-04 01:59:29 UTC (rev 4972)
@@ -68,7 +68,7 @@
       {
          if (fqn !=3D null && !canIgnoreEvent(fqn, NodeEventType.ADD_NODE_=
EVENT))
          {
-            registerEvictionEventToRegionManager(new EvictedEventNode(fqn,=
 NodeEventType.ADD_NODE_EVENT, 0));
+            registerEvictionEventToRegionManager(new EvictedEventNode(fqn,=
 NodeEventType.ADD_NODE_EVENT, 0), ctx);
          }
       }
       return retVal;
@@ -86,7 +86,7 @@
       Object retVal =3D nextInterceptor(ctx);
       if (fqn !=3D null && key !=3D null && !canIgnoreEvent(fqn, NodeEvent=
Type.ADD_ELEMENT_EVENT))
       {
-         registerEvictionEventToRegionManager(new EvictedEventNode(fqn, No=
deEventType.ADD_ELEMENT_EVENT, 1));
+         registerEvictionEventToRegionManager(new EvictedEventNode(fqn, No=
deEventType.ADD_ELEMENT_EVENT, 1), ctx);
       }
       return retVal;
    }
@@ -113,7 +113,7 @@
             }
             EvictedEventNode event =3D new EvictedEventNode(fqn, NodeEvent=
Type.ADD_NODE_EVENT, size);
             event.setResetElementCount(eraseContents);
-            registerEvictionEventToRegionManager(event);
+            registerEvictionEventToRegionManager(event, ctx);
          }
       }
       return retVal;
@@ -140,7 +140,7 @@
             {
                size =3D data.size();
             }
-            registerEvictionEventToRegionManager(new EvictedEventNode(fqn,=
 NodeEventType.ADD_NODE_EVENT, size));
+            registerEvictionEventToRegionManager(new EvictedEventNode(fqn,=
 NodeEventType.ADD_NODE_EVENT, size), ctx);
          }
       }
       return retVal;
@@ -162,7 +162,7 @@
       {
          if (fqn !=3D null && key !=3D null && !canIgnoreEvent(fqn, NodeEv=
entType.REMOVE_ELEMENT_EVENT))
          {
-            registerEvictionEventToRegionManager(new EvictedEventNode(fqn,=
 NodeEventType.REMOVE_ELEMENT_EVENT, 1));
+            registerEvictionEventToRegionManager(new EvictedEventNode(fqn,=
 NodeEventType.REMOVE_ELEMENT_EVENT, 1), ctx);
          }
       }
       return retVal;
@@ -183,7 +183,7 @@
       {
          if (fqn !=3D null && !canIgnoreEvent(fqn, NodeEventType.VISIT_NOD=
E_EVENT))
          {
-            registerEvictionEventToRegionManager(new EvictedEventNode(fqn,=
 NodeEventType.VISIT_NODE_EVENT));
+            registerEvictionEventToRegionManager(new EvictedEventNode(fqn,=
 NodeEventType.VISIT_NODE_EVENT), ctx);
          }
       }
       return retVal;
@@ -208,7 +208,7 @@
       }
       else if (fqn !=3D null && key !=3D null && !canIgnoreEvent(fqn, Node=
EventType.VISIT_NODE_EVENT))
       {
-         registerEvictionEventToRegionManager(new EvictedEventNode(fqn, No=
deEventType.VISIT_NODE_EVENT));
+         registerEvictionEventToRegionManager(new EvictedEventNode(fqn, No=
deEventType.VISIT_NODE_EVENT), ctx);
       }
       return retVal;
    }
@@ -219,7 +219,7 @@
       Object retVal =3D nextInterceptor(ctx);
       if (fqn !=3D null && !canIgnoreEvent(fqn, NodeEventType.REMOVE_NODE_=
EVENT))
       {
-         registerEvictionEventToRegionManager(new EvictedEventNode(fqn, No=
deEventType.REMOVE_NODE_EVENT));
+         registerEvictionEventToRegionManager(new EvictedEventNode(fqn, No=
deEventType.REMOVE_NODE_EVENT), ctx);
       }
       return retVal;
    }
@@ -230,7 +230,7 @@
       return handleRemoveNodeMethod(ctx, tx, fqn, createUndoOps);
    }
 =

-   private void registerEvictionEventToRegionManager(EvictedEventNode even=
t)
+   private void registerEvictionEventToRegionManager(EvictedEventNode even=
t, InvocationContext ctx)
    {
       if (event =3D=3D null)
       {
@@ -238,7 +238,7 @@
          return;
       }
 =

-      NodeSPI<?, ?> nodeSPI =3D cache.peek(event.getFqn(), false);
+      NodeSPI<?, ?> nodeSPI =3D peekNode(ctx, event.getFqn(), false, false=
);//cache.peek(event.getFqn(), false);
       //we do not trigger eviction events for resident nodes
       if (nodeSPI !=3D null && nodeSPI.isResident())
       {

Modified: core/trunk/src/main/java/org/jboss/cache/interceptors/Interceptor=
.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/java/org/jboss/cache/interceptors/Interceptor.java	=
2008-01-04 01:58:33 UTC (rev 4971)
+++ core/trunk/src/main/java/org/jboss/cache/interceptors/Interceptor.java	=
2008-01-04 01:59:29 UTC (rev 4972)
@@ -25,7 +25,9 @@
 import org.apache.commons.logging.LogFactory;
 import org.jboss.cache.CacheException;
 import org.jboss.cache.CacheSPI;
+import org.jboss.cache.Fqn;
 import org.jboss.cache.InvocationContext;
+import org.jboss.cache.NodeSPI;
 import org.jboss.cache.config.Configuration;
 import org.jboss.cache.factories.annotations.Inject;
 import org.jboss.cache.factories.annotations.Start;
@@ -220,4 +222,29 @@
             + (getLast() =3D=3D null ? null : getLast().getClass())
             + "}";
    }
+
+   /**
+    * First checks the invocation context for previously obtained referenc=
e to a node, if this doesn't exist, performs
+    * a cache.peek() and holds on to the node reference.
+    *
+    * @param ctx                 invocation context
+    * @param f                   fqn to find
+    * @param forceRefresh        forces calling cache.peek() even if we ho=
ld a reference to the relevant node.
+    * @param includeDeletedNodes includes nodes marked for deletion if thi=
s is true
+    * @return a node, or null if one cannot be found.
+    * @since 2.1.0
+    */
+   public NodeSPI peekNode(InvocationContext ctx, Fqn f, boolean forceRefr=
esh, boolean includeDeletedNodes)
+   {
+      NodeSPI n;
+      if (forceRefresh || (n =3D ctx.getPeekedNode(f)) =3D=3D null)
+      {
+         n =3D cache.peek(f, true);
+         // put this in the invocation cache
+         ctx.savePeekedNode(n, f);
+      }
+
+      if (n !=3D null && !includeDeletedNodes && n.isDeleted()) return nul=
l;
+      return n;
+   }
 }

Modified: core/trunk/src/main/java/org/jboss/cache/interceptors/InvocationC=
ontextInterceptor.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/java/org/jboss/cache/interceptors/InvocationContext=
Interceptor.java	2008-01-04 01:58:33 UTC (rev 4971)
+++ core/trunk/src/main/java/org/jboss/cache/interceptors/InvocationContext=
Interceptor.java	2008-01-04 01:59:29 UTC (rev 4972)
@@ -107,6 +107,8 @@
                copyInvocationScopeOptionsToTxScope(ctx);
             }
          }
+
+         ctx.wipePeekedNodes();
       }
    }
 =


Modified: core/trunk/src/main/java/org/jboss/cache/interceptors/OptimisticC=
reateIfNotExistsInterceptor.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/java/org/jboss/cache/interceptors/OptimisticCreateI=
fNotExistsInterceptor.java	2008-01-04 01:58:33 UTC (rev 4971)
+++ core/trunk/src/main/java/org/jboss/cache/interceptors/OptimisticCreateI=
fNotExistsInterceptor.java	2008-01-04 01:59:29 UTC (rev 4972)
@@ -136,7 +136,8 @@
     */
    private void createNode(InvocationContext ctx, Fqn targetFqn, boolean s=
uppressNotification) throws CacheException
    {
-      if (cache.peek(targetFqn, false) !=3D null) return;
+//      if (cache.peek(targetFqn, false) !=3D null) return;
+      if (peekNode(ctx, targetFqn, false, false) !=3D null) return;
       // we do nothing if targetFqn is null
       if (targetFqn =3D=3D null) return;
 =


Modified: core/trunk/src/main/java/org/jboss/cache/interceptors/Passivation=
Interceptor.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/java/org/jboss/cache/interceptors/PassivationInterc=
eptor.java	2008-01-04 01:58:33 UTC (rev 4971)
+++ core/trunk/src/main/java/org/jboss/cache/interceptors/PassivationInterc=
eptor.java	2008-01-04 01:59:29 UTC (rev 4972)
@@ -47,7 +47,7 @@
       {
          // evict method local doesn't hold attributes therefore we have
          // to get them manually
-         Map attributes =3D getNodeAttributes(fqn);
+         Map attributes =3D getNodeAttributes(ctx, fqn);
          // notify listeners that this node is about to be passivated
          cache.getNotifier().notifyNodePassivated(fqn, true, attributes, c=
tx);
          loader.put(fqn, attributes);
@@ -88,13 +88,13 @@
    /**
     * Returns attributes for a node.
     */
-   private Map getNodeAttributes(Fqn fqn) throws NodeNotLoadedException
+   private Map getNodeAttributes(InvocationContext ctx, Fqn fqn) throws No=
deNotLoadedException
    {
       if (fqn =3D=3D null)
       {
          throw new NodeNotLoadedException();
       }
-      NodeSPI n =3D cache.peek(fqn, true);
+      NodeSPI n =3D peekNode(ctx, fqn, false, true);
 =

       if (n !=3D null)
       {

Modified: core/trunk/src/main/java/org/jboss/cache/interceptors/Pessimistic=
LockInterceptor.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/java/org/jboss/cache/interceptors/PessimisticLockIn=
terceptor.java	2008-01-04 01:58:33 UTC (rev 4971)
+++ core/trunk/src/main/java/org/jboss/cache/interceptors/PessimisticLockIn=
terceptor.java	2008-01-04 01:59:29 UTC (rev 4972)
@@ -133,7 +133,8 @@
       acquireLocksWithTimeout(ctx, fqn, lockType, false, false, false, fal=
se);
       if (recursive)
       {
-         acquireLocksOnChildren(cache.peek(fqn, false), lockType, ctx);
+         //acquireLocksOnChildren(cache.peek(fqn, false), lockType, ctx);
+         acquireLocksOnChildren(peekNode(ctx, fqn, false, false), lockType=
, ctx);
       }
       return null;
    }
@@ -208,18 +209,18 @@
          {
             cache.getTransactionTable().get(ctx.getGlobalTransaction()).ad=
dRemovedNode(from);
          }
-         acquireLocksOnChildren(cache.peek(from, true), NodeLock.LockType.=
WRITE, ctx);
+         acquireLocksOnChildren(peekNode(ctx, from, false, true), NodeLock=
.LockType.WRITE, ctx);
       }
       if (to !=3D null && !(configuration.getIsolationLevel() =3D=3D Isola=
tionLevel.NONE))
       {
          //now for an RL for the new parent.
          if (trace) log.trace("Attempting to get RL on new parent [" + to =
+ "]");
          lock(ctx, to, NodeLock.LockType.READ, false, timeout, false, fals=
e);
-         acquireLocksOnChildren(cache.peek(to, true), NodeLock.LockType.RE=
AD, ctx);
+         acquireLocksOnChildren(peekNode(ctx, to, false, true), NodeLock.L=
ockType.READ, ctx);
       }
       Object retValue =3D nextInterceptor(ctx);
       // do a REAL remove here.
-      NodeSPI n =3D cache.peek(from, true);
+      NodeSPI n =3D peekNode(ctx, from, false, true);
       if (n !=3D null)
       {
          n.getLock().releaseAll(Thread.currentThread());
@@ -239,7 +240,7 @@
       if (ctx.getGlobalTransaction() =3D=3D null)
       {
          cacheImpl.realRemove(fqn, true);
-         NodeSPI n =3D cache.peek(fqn, true);
+         NodeSPI n =3D peekNode(ctx, fqn, false, true);
          if (n !=3D null)
          {
             n.getLock().releaseAll(Thread.currentThread());
@@ -336,7 +337,7 @@
          created =3D lock(ctx, fqn, lockType, createIfNotExists, timeout, =
acquireLockOnParent, reverseRemoveCheck);
          firstTry =3D false;
       }
-      while (createIfNotExists && cache.peek(fqn, true) =3D=3D null);// ke=
ep trying until we have the lock (fixes concurrent remove())
+      while (createIfNotExists && peekNode(ctx, fqn, false, true) =3D=3D n=
ull);// keep trying until we have the lock (fixes concurrent remove())
       return created;
    }
 =

@@ -489,7 +490,8 @@
          {
             return true;// we're doing a remove and we've reached the PARE=
NT node of the target to be removed.
          }
-         if (!isTargetNode && cache.peek(targetFqn.getAncestor(currentNode=
Index + 2), false) =3D=3D null)
+         if (!isTargetNode && peekNode(ctx, targetFqn.getAncestor(currentN=
odeIndex + 2), false, false) =3D=3D null)
+         //if (!isTargetNode && cache.peek(targetFqn.getAncestor(currentNo=
deIndex + 2), false) =3D=3D null)
          //if (!isTargetNode && cache.peek(new Fqn(currentNode.getFqn(), t=
argetFqn.get(currentNodeIndex + 1)), false) =3D=3D null)
          {
             return createIfNotExists;// we're at a node in the tree, not y=
et at the target node, and we need to create the next node.  So we need a W=
L here.


--===============0975307240562607636==--

From jbosscache-commits at lists.jboss.org Thu Jan  3 20:59:48 2008
Content-Type: multipart/mixed; boundary="===============5520224681255309167=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r4973 -
 core/trunk/src/main/java/org/jboss/cache.
Date: Thu, 03 Jan 2008 20:59:48 -0500
Message-ID: <E1JAbqe-0008O9-Bv@committer01.frg.pub.inap.atl.jboss.com>

--===============5520224681255309167==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: manik.surtani(a)jboss.com
Date: 2008-01-03 20:59:48 -0500 (Thu, 03 Jan 2008)
New Revision: 4973

Modified:
   core/trunk/src/main/java/org/jboss/cache/InvocationContext.java
Log:
JBCACHE-881 - cache node references in invocation context to save on multip=
le expensive cache.peek() calls.

Modified: core/trunk/src/main/java/org/jboss/cache/InvocationContext.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/java/org/jboss/cache/InvocationContext.java	2008-01=
-04 01:59:29 UTC (rev 4972)
+++ core/trunk/src/main/java/org/jboss/cache/InvocationContext.java	2008-01=
-04 01:59:48 UTC (rev 4973)
@@ -11,6 +11,8 @@
 import org.jboss.cache.transaction.GlobalTransaction;
 =

 import javax.transaction.Transaction;
+import java.util.HashMap;
+import java.util.Map;
 =

 /**
  * This context holds information specific to a method invocation.
@@ -28,12 +30,49 @@
    private boolean localRollbackOnly;
    private MethodCall methodCall;
 =

+   // used to store cache peeks within the scope of a single context. Perf=
orming a cache peek can be a huge bottle neck.
+   // See JBCACHE-811
+   private Map<Fqn, NodeSPI> peekedNodes =3D new HashMap<Fqn, NodeSPI>();
+
+   /**
+    * Retrieves a node that may have previously been "peeked" within the s=
cope of the same invocation.
+    *
+    * @param f fqn of node to find
+    * @return node, if previously peeked, or null if not.
+    * @since 2.1.0
+    */
+   public NodeSPI getPeekedNode(Fqn f)
+   {
+      return peekedNodes.get(f);
+   }
+
+   /**
+    * Adds a node to the previously peeked list.
+    *
+    * @param n node to add
+    * @param f fqn of node
+    * @since 2.1.0
+    */
+   public void savePeekedNode(NodeSPI n, Fqn f)
+   {
+      peekedNodes.put(f, n);
+   }
+
+   /**
+    * Wipe list of previously peeked nodes.
+    *
+    * @since 2.1.0
+    */
+   public void wipePeekedNodes()
+   {
+      peekedNodes.clear();
+   }
+
    public void setLocalRollbackOnly(boolean localRollbackOnly)
    {
       this.localRollbackOnly =3D localRollbackOnly;
    }
 =

-
    /**
     * Retrieves the transaction associated with this invocation
     *


--===============5520224681255309167==--

From jbosscache-commits at lists.jboss.org Thu Jan  3 21:40:51 2008
Content-Type: multipart/mixed; boundary="===============2756170036137266347=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r4974 -
 core/trunk/src/main/java/org/jboss/cache/marshall.
Date: Thu, 03 Jan 2008 21:36:51 -0500
Message-ID: <E1JAcQV-0007No-Nm@committer01.frg.pub.inap.atl.jboss.com>

--===============2756170036137266347==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: manik.surtani(a)jboss.com
Date: 2008-01-03 21:36:51 -0500 (Thu, 03 Jan 2008)
New Revision: 4974

Modified:
   core/trunk/src/main/java/org/jboss/cache/marshall/CacheMarshaller200.java
Log:
Perf improvements

Modified: core/trunk/src/main/java/org/jboss/cache/marshall/CacheMarshaller=
200.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/java/org/jboss/cache/marshall/CacheMarshaller200.ja=
va	2008-01-04 01:59:48 UTC (rev 4973)
+++ core/trunk/src/main/java/org/jboss/cache/marshall/CacheMarshaller200.ja=
va	2008-01-04 02:36:51 UTC (rev 4974)
@@ -230,11 +230,11 @@
    private Fqn extractFqnRegion(MethodCall call) throws Exception
    {
       Fqn fqn;
-      if (call.getMethod().equals(MethodDeclarations.replicateMethod))
+      if (isReplicateMethod(call))
       {
          fqn =3D extractFqnFromMethodCall(call);
       }
-      else if (call.getMethod().equals(MethodDeclarations.replicateAllMeth=
od))
+      else if (isReplicateAllMethod(call))
       {
          fqn =3D extractFqnFromListOfMethodCall(call);
       }
@@ -247,6 +247,15 @@
       return r =3D=3D null ? null : r.getFqn();
    }
 =

+   protected boolean isReplicateMethod(MethodCall call)
+   {
+      return call.getMethodId() =3D=3D MethodDeclarations.replicateMethod_=
id || call.getMethod().equals(MethodDeclarations.replicateMethod);
+   }
+
+   protected boolean isReplicateAllMethod(MethodCall call)
+   {
+      return call.getMethodId() =3D=3D MethodDeclarations.replicateAllMeth=
od_id || call.getMethod().equals(MethodDeclarations.replicateAllMethod);
+   }
    // --------- Marshalling methods
 =

    private void marshallObject(Object o, ObjectOutputStream out, Map<Objec=
t, Integer> refMap) throws Exception
@@ -445,9 +454,9 @@
       if (!isRoot)
       {
          out.writeShort(fqn.size());
-         for (int i =3D 0; i < fqn.size(); i++)
+         for (Object o : fqn.peekElements())
          {
-            marshallObject(fqn.get(i), out, refMap);
+            marshallObject(o, out, refMap);
          }
       }
    }


--===============2756170036137266347==--

From jbosscache-commits at lists.jboss.org Fri Jan  4 04:44:30 2008
Content-Type: multipart/mixed; boundary="===============7377480035219061609=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r4975 - in
 cache-bench-fwk/trunk: conf and 5 other directories.
Date: Fri, 04 Jan 2008 04:44:30 -0500
Message-ID: <E1JAj6M-0003nD-8y@committer01.frg.pub.inap.atl.jboss.com>

--===============7377480035219061609==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: mircea.markus
Date: 2008-01-04 04:44:30 -0500 (Fri, 04 Jan 2008)
New Revision: 4975

Added:
   cache-bench-fwk/trunk/smartfrog/cacheBenchComponent.sf
   cache-bench-fwk/trunk/smartfrog/main.sf
   cache-bench-fwk/trunk/src/org/cachebench/smartfrog/
   cache-bench-fwk/trunk/src/org/cachebench/smartfrog/CacheBenchmarkPrim.ja=
va
Modified:
   cache-bench-fwk/trunk/build.xml
   cache-bench-fwk/trunk/conf/cachebench.xml
   cache-bench-fwk/trunk/runNode.sh
   cache-bench-fwk/trunk/src/org/cachebench/config/ClusterConfig.java
   cache-bench-fwk/trunk/src/org/cachebench/tests/SimpleTest.java
Log:
SF integration

Modified: cache-bench-fwk/trunk/build.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- cache-bench-fwk/trunk/build.xml	2008-01-04 02:36:51 UTC (rev 4974)
+++ cache-bench-fwk/trunk/build.xml	2008-01-04 09:44:30 UTC (rev 4975)
@@ -60,6 +60,7 @@
     <pathelement location=3D"${module.framework.basedir}/lib/commons-diges=
ter.jar"/>
     <pathelement location=3D"${module.framework.basedir}/lib/commons-beanu=
tils.jar"/>
     <pathelement location=3D"${module.framework.basedir}/lib/commons-math-=
1.0.jar"/>
+    <pathelement location=3D"${module.framework.basedir}/lib/smartfrog-3.1=
2.014.jar"/>
     <pathelement location=3D"${module.framework.basedir}/conf"/>
   </path>
   =

@@ -149,6 +150,7 @@
   <target name=3D"clean.module.framework" description=3D"cleanup module">
     <delete dir=3D"${framework.output.dir}"/>
     <delete dir=3D"${framework.testoutput.dir}"/>
+    <delete dir=3D"${basedir}/smartfrog/sfClasses"/>
   </target>
   =

   =

@@ -504,4 +506,15 @@
       </java>
    </target>
 =

+   <target name=3D"deploy.sf" depends=3D"compile.module.framework" descrip=
tion=3D"builds the smartfrog jar and deploys it">
+      <rmic classname=3D"org.cachebench.smartfrog.CacheBenchmarkPrim" base=
=3D"${framework.output.dir}" verify=3D"true" debug=3D"true">
+         <classpath refid=3D"framework.module.classpath"/>
+      </rmic>
+      <delete dir=3D"${basedir}/smartfrog/sfClasses"/>
+      <mkdir dir=3D"${basedir}/smartfrog/sfClasses"/>
+      <jar destfile=3D"${basedir}/smartfrog/sfClasses/cacheBenchmark-sf.ja=
r">
+         <fileset dir=3D"${framework.output.dir}" includes=3D"**/smartfrog=
/**"/>
+         <fileset dir=3D"${basedir}/smartfrog" excludes=3D"**/sfClasses/**=
"/>
+      </jar>
+   </target>
 </project>

Modified: cache-bench-fwk/trunk/conf/cachebench.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- cache-bench-fwk/trunk/conf/cachebench.xml	2008-01-04 02:36:51 UTC (rev =
4974)
+++ cache-bench-fwk/trunk/conf/cachebench.xml	2008-01-04 09:44:30 UTC (rev =
4975)
@@ -21,8 +21,8 @@
    -->
    <cluster bindAddress=3D"127.0.0.1">
       <member host=3D"127.0.0.1" port=3D"7800"/>
-      <!--<member host=3D"127.0.0.1" port=3D"7801"/>-->
-      <!--<member host=3D"127.0.0.1" port=3D"7802"/>-->
+      <member host=3D"127.0.0.1" port=3D"7801"/>
+      <member host=3D"127.0.0.1" port=3D"7802"/>
    </cluster>
 =

    <!-- Each testcase represents either a single configuration or a cachei=
ng product.

Modified: cache-bench-fwk/trunk/runNode.sh
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- cache-bench-fwk/trunk/runNode.sh	2008-01-04 02:36:51 UTC (rev 4974)
+++ cache-bench-fwk/trunk/runNode.sh	2008-01-04 09:44:30 UTC (rev 4975)
@@ -45,7 +45,7 @@
    echo executing command $START_NODE_COMMAND
    $START_NODE_COMMAND
 else   =

-   TO_EXECUTE=3D"java -cp $CLASSPATH $SYS_PROPS org.cachebench.CacheBenchm=
arkRunner $3"
+   TO_EXECUTE=3D"java -cp $CLASSPATH $3 $SYS_PROPS org.cachebench.CacheBen=
chmarkRunner $4"
    echo executing $TO_EXECUTE
    java -cp $CLASSPATH $3 $SYS_PROPS org.cachebench.CacheBenchmarkRunner $4
 fi

Added: cache-bench-fwk/trunk/smartfrog/cacheBenchComponent.sf
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- cache-bench-fwk/trunk/smartfrog/cacheBenchComponent.sf	                =
        (rev 0)
+++ cache-bench-fwk/trunk/smartfrog/cacheBenchComponent.sf	2008-01-04 09:44=
:30 UTC (rev 4975)
@@ -0,0 +1,20 @@
+#include "org/smartfrog/components.sf"
+
+BaseCacheBenchPrim extends Prim {
+   sfClass "org.cachebench.smartfrog.CacheBenchmarkPrim";
+
+   scriptToExec "runNode.sh"
+
+   //FQN of the directory where the framework was checked out (noramally i=
s th eparent of the dir that contains this file)
+   //this should be edited
+   cacheBenchmarkHome "c:/projects/jboss/cache/benchmark/cache-bench-fwk";
+
+   //should be the name of a subdirectory of 'cache-products' directory.
+   cacheDistribution "jbosscache-2.0.0";
+
+   //defines on how many nodes the benchmark will run
+   clusterSize 1;
+
+   //might take a value from 0..max_nr_of_nodes, representing the index of=
 the current node in the cluster
+   nodeIndex TBD;
+}
\ No newline at end of file

Added: cache-bench-fwk/trunk/smartfrog/main.sf
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- cache-bench-fwk/trunk/smartfrog/main.sf	                        (rev 0)
+++ cache-bench-fwk/trunk/smartfrog/main.sf	2008-01-04 09:44:30 UTC (rev 49=
75)
@@ -0,0 +1,13 @@
+#include "org/smartfrog/components.sf"
+#include "cacheBenchComponent.sf"
+
+sfConfig extends Compound {
+
+   node1 extends BaseCacheBenchPrim{
+      sfProcessHost "localhost";
+      nodeIndex 1;
+      scriptToExec "runNode.bat"
+   }
+   =

+}
+

Modified: cache-bench-fwk/trunk/src/org/cachebench/config/ClusterConfig.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- cache-bench-fwk/trunk/src/org/cachebench/config/ClusterConfig.java	2008=
-01-04 02:36:51 UTC (rev 4974)
+++ cache-bench-fwk/trunk/src/org/cachebench/config/ClusterConfig.java	2008=
-01-04 09:44:30 UTC (rev 4975)
@@ -1,5 +1,8 @@
 package org.cachebench.config;
 =

+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
 import java.net.InetSocketAddress;
 import java.util.ArrayList;
 import java.util.List;
@@ -11,8 +14,13 @@
  */
 public class ClusterConfig
 {
+
+   public static final Log log =3D LogFactory.getLog(ClusterConfig.class);
+
    private int currentNodeIndex =3D -1;
 =

+   private int clusterSize =3D -1;
+
    private List<NodeAddress> members =3D new ArrayList<NodeAddress>();
 =

    private String bindAddress;
@@ -35,18 +43,36 @@
 =

    public List<NodeAddress> getMembers()
    {
+      if (members.size() > getClusterSize())
+      {
+         return members.subList(0, clusterSize);
+      }
       return members;
    }
 =

    public int getPortForThisNode()
    {
-      NodeAddress address =3D members.get(getCurrentNodeIndex());
+      NodeAddress address =3D getMembers().get(getCurrentNodeIndex());
       return Integer.parseInt(address.getPort());
    }
 =

    public int getClusterSize()
    {
-      return members.size();
+      if (clusterSize < 0)
+      {
+         String clusterSizeStr =3D System.getProperty("clusterSize");
+         if (clusterSizeStr !=3D null)
+         {
+            int size =3D Integer.parseInt(clusterSizeStr);
+            log.info("Received cluster size: " + size);
+            clusterSize =3D size;
+         }
+         else
+         {
+            return members.size();
+         }
+      }
+      return clusterSize;
    }
 =

    public boolean isMaster()
@@ -59,11 +85,6 @@
       members.add(member);
    }
 =

-   public void setCurrentNodeIndex(int currentNodeIndex)
-   {
-      this.currentNodeIndex =3D currentNodeIndex;
-   }
-
    public String getBindAddress()
    {
       return bindAddress;
@@ -86,6 +107,6 @@
 =

    public String toString()
    {
-      return "{bindAddress:" + bindAddress + ", members:" + members + "}";
+      return "{bindAddress:" + bindAddress + ", members:" + getMembers() +=
 ", clusterSize:" + getClusterSize() + "}";
    }
 }

Added: cache-bench-fwk/trunk/src/org/cachebench/smartfrog/CacheBenchmarkPri=
m.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- cache-bench-fwk/trunk/src/org/cachebench/smartfrog/CacheBenchmarkPrim.j=
ava	                        (rev 0)
+++ cache-bench-fwk/trunk/src/org/cachebench/smartfrog/CacheBenchmarkPrim.j=
ava	2008-01-04 09:44:30 UTC (rev 4975)
@@ -0,0 +1,90 @@
+package org.cachebench.smartfrog;
+
+import org.smartfrog.sfcore.common.SmartFrogException;
+import org.smartfrog.sfcore.common.SmartFrogResolutionException;
+import org.smartfrog.sfcore.logging.LogSF;
+import org.smartfrog.sfcore.prim.Prim;
+import org.smartfrog.sfcore.prim.PrimImpl;
+import org.smartfrog.sfcore.prim.TerminationRecord;
+
+import java.io.File;
+import java.rmi.RemoteException;
+
+/**
+ * @author Mircea.Markus(a)jboss.com
+ */
+public class CacheBenchmarkPrim extends PrimImpl implements Prim
+{
+   private static LogSF log;
+
+   private int nodeIndex =3D -1;
+   private String cacheDistribution;
+   private File toRunIn;
+   private int clusterSize =3D -1;
+   private String scriptToExec;
+
+   public CacheBenchmarkPrim() throws RemoteException
+   {
+   }
+
+   public synchronized void sfDeploy() throws SmartFrogException, RemoteEx=
ception
+   {
+      super.sfDeploy();
+      log =3D super.sfGetApplicationLog();
+      log.setLevel(LogSF.LOG_LEVEL_ALL);
+      log.trace("deploy started");
+      //reading the attributes here
+      nodeIndex =3D (Integer) sfResolve("nodeIndex");
+      log.info("Received current index: " + nodeIndex);
+      cacheDistribution =3D (String) sfResolve("cacheDistribution");
+      log.info("Received cache distribution: " + cacheDistribution);
+      toRunIn =3D getFwkHomeDir();
+      log.info("Received homedir: " + toRunIn);
+      clusterSize =3D (Integer)sfResolve("clusterSize");
+      log.info("Received cluster size: " + clusterSize);
+      scriptToExec =3D (String) sfResolve("scriptToExec");
+      log.info("Received stringToExec: " + scriptToExec);
+      log.trace("Deploy finished");
+   }
+
+   public synchronized void sfStart() throws SmartFrogException, RemoteExc=
eption
+   {
+      super.sfStart();
+      log.trace("parsing the configuration...");
+      try
+      {
+         String command =3D scriptToExec + " " + nodeIndex + " " + cacheDi=
stribution + " -DclusterSize=3D" + clusterSize;
+         log.info("Executing command: " + command);
+         Process process =3D Runtime.getRuntime().exec(command, null, toRu=
nIn);
+         int exitValue =3D process.waitFor();
+         if (exitValue !=3D 0)
+         {
+            sfTerminate(new TerminationRecord(TerminationRecord.ABNORMAL, =
"we have an not 0 exit code: " + exitValue, null));
+         }
+      }
+      catch (Exception e)
+      {
+         log.error("Unexpected error:" + e.getMessage(), e);
+         throw new RemoteException("Unexpected error",e);
+      }
+   }
+
+   private File getFwkHomeDir()
+         throws SmartFrogResolutionException, RemoteException
+   {
+      File toRunIn;
+      String cacheBenchmarkHome =3D sfResolve("cacheBenchmarkHome") + "";
+      toRunIn =3D new File(cacheBenchmarkHome);
+      if (!toRunIn.isDirectory())
+      {
+         log.error("cacheBenchmarkHome is not specified correctly: " + cac=
heBenchmarkHome);
+      }
+      return toRunIn;
+   }
+
+   protected synchronized void sfTerminateWith(TerminationRecord terminati=
onRecord)
+   {
+      super.sfTerminateWith(terminationRecord);
+      log.trace("sfTerminateWith called with value:" +  terminationRecord);
+   }
+}

Modified: cache-bench-fwk/trunk/src/org/cachebench/tests/SimpleTest.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- cache-bench-fwk/trunk/src/org/cachebench/tests/SimpleTest.java	2008-01-=
04 02:36:51 UTC (rev 4974)
+++ cache-bench-fwk/trunk/src/org/cachebench/tests/SimpleTest.java	2008-01-=
04 09:44:30 UTC (rev 4975)
@@ -191,7 +191,6 @@
                      cache.put(key + cycleNumber, value);
                      long statValue =3D (System.currentTimeMillis() - star=
tTime);
                      stats.addValue(statValue);
-                     log.debug("The Put stat : " + statValue);
                   }
                   else
                   {
@@ -201,7 +200,6 @@
                      sCache.putSerializable(key + cycleNumber, sValue);
                      long statValue =3D (System.currentTimeMillis() - star=
tTime);
                      stats.addValue(statValue);
-                     log.debug("The Put stat : " + statValue);
                   }
                }
                catch (Exception e)


--===============7377480035219061609==--

From jbosscache-commits at lists.jboss.org Fri Jan  4 04:45:36 2008
Content-Type: multipart/mixed; boundary="===============0693375846197398265=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r4976 -
 cache-bench-fwk/trunk/lib.
Date: Fri, 04 Jan 2008 04:45:36 -0500
Message-ID: <E1JAj7Q-0004D9-4G@committer01.frg.pub.inap.atl.jboss.com>

--===============0693375846197398265==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: mircea.markus
Date: 2008-01-04 04:45:35 -0500 (Fri, 04 Jan 2008)
New Revision: 4976

Added:
   cache-bench-fwk/trunk/lib/smartfrog-3.12.014.jar
Log:
SF integration

Added: cache-bench-fwk/trunk/lib/smartfrog-3.12.014.jar
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)


Property changes on: cache-bench-fwk/trunk/lib/smartfrog-3.12.014.jar
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream


--===============0693375846197398265==--

From jbosscache-commits at lists.jboss.org Fri Jan  4 07:19:48 2008
Content-Type: multipart/mixed; boundary="===============0629595627871486589=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r4977 - in core/trunk/src:
 main/java/org/jboss/cache/buddyreplication and 10 other directories.
Date: Fri, 04 Jan 2008 07:19:46 -0500
Message-ID: <E1JAlWc-0008H5-MX@committer01.frg.pub.inap.atl.jboss.com>

--===============0629595627871486589==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: manik.surtani(a)jboss.com
Date: 2008-01-04 07:19:46 -0500 (Fri, 04 Jan 2008)
New Revision: 4977

Modified:
   core/trunk/src/main/java/org/jboss/cache/CacheImpl.java
   core/trunk/src/main/java/org/jboss/cache/RPCManager.java
   core/trunk/src/main/java/org/jboss/cache/RPCManagerImpl.java
   core/trunk/src/main/java/org/jboss/cache/ReplicationQueue.java
   core/trunk/src/main/java/org/jboss/cache/UnversionedNode.java
   core/trunk/src/main/java/org/jboss/cache/buddyreplication/BuddyManager.j=
ava
   core/trunk/src/main/java/org/jboss/cache/interceptors/BaseRpcInterceptor=
.java
   core/trunk/src/main/java/org/jboss/cache/interceptors/CacheLoaderInterce=
ptor.java
   core/trunk/src/main/java/org/jboss/cache/interceptors/DataGravitatorInte=
rceptor.java
   core/trunk/src/main/java/org/jboss/cache/interceptors/InvalidationInterc=
eptor.java
   core/trunk/src/main/java/org/jboss/cache/interceptors/OptimisticReplicat=
ionInterceptor.java
   core/trunk/src/main/java/org/jboss/cache/interceptors/TxInterceptor.java
   core/trunk/src/main/java/org/jboss/cache/invocation/CacheInvocationDeleg=
ate.java
   core/trunk/src/main/java/org/jboss/cache/invocation/RemoteCacheInvocatio=
nDelegate.java
   core/trunk/src/main/java/org/jboss/cache/loader/ClusteredCacheLoader.java
   core/trunk/src/main/java/org/jboss/cache/marshall/AbstractMarshaller.java
   core/trunk/src/main/java/org/jboss/cache/marshall/CacheMarshaller200.java
   core/trunk/src/main/java/org/jboss/cache/marshall/MethodCallFactory.java
   core/trunk/src/main/java/org/jboss/cache/marshall/MethodDeclarations.java
   core/trunk/src/main/java/org/jboss/cache/marshall/VersionAwareMarshaller=
.java
   core/trunk/src/main/java/org/jboss/cache/util/BitEncodedIntegerSet.java
   core/trunk/src/test/java/org/jboss/cache/buddyreplication/BuddyManagerTe=
st.java
   core/trunk/src/test/java/org/jboss/cache/interceptors/EvictionIntercepto=
rTest.java
   core/trunk/src/test/java/org/jboss/cache/marshall/ActiveInactiveTest.java
   core/trunk/src/test/java/org/jboss/cache/marshall/CacheMarshaller200Test=
.java
   core/trunk/src/test/java/org/jboss/cache/marshall/CacheMarshaller210Test=
.java
   core/trunk/src/test/java/org/jboss/cache/marshall/CacheMarshallerTestBas=
e.java
   core/trunk/src/test/java/org/jboss/cache/marshall/MethodCallFactoryTest.=
java
   core/trunk/src/test/java/org/jboss/cache/marshall/MethodIdPreservationTe=
st.java
   core/trunk/src/test/java/org/jboss/cache/marshall/RemoteCallerReturnValu=
esTest.java
   core/trunk/src/test/java/org/jboss/cache/marshall/ReturnValueMarshalling=
Test.java
   core/trunk/src/test/java/org/jboss/cache/optimistic/AbstractOptimisticTe=
stCase.java
   core/trunk/src/test/java/org/jboss/cache/optimistic/CacheTest.java
   core/trunk/src/test/java/org/jboss/cache/optimistic/OptimisticReplicatio=
nInterceptorTest.java
   core/trunk/src/test/java/org/jboss/cache/optimistic/TxInterceptorTest.ja=
va
   core/trunk/src/test/java/org/jboss/cache/optimistic/ValidatorInterceptor=
Test.java
   core/trunk/src/test/java/org/jboss/cache/util/BitEncodedIntegerSetTest.j=
ava
Log:
MethodFactory to use MethodIDs instead of Methods
Improved performance of MethodDeclaration lookups

Modified: core/trunk/src/main/java/org/jboss/cache/CacheImpl.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/java/org/jboss/cache/CacheImpl.java	2008-01-04 09:4=
5:35 UTC (rev 4976)
+++ core/trunk/src/main/java/org/jboss/cache/CacheImpl.java	2008-01-04 12:1=
9:46 UTC (rev 4977)
@@ -59,7 +59,6 @@
 import javax.transaction.Transaction;
 import javax.transaction.TransactionManager;
 import java.io.NotSerializableException;
-import java.lang.reflect.Method;
 import java.util.*;
 =

 /**
@@ -1172,7 +1171,7 @@
     */
    public Node get(Fqn<?> fqn) throws CacheException
    {
-      MethodCall m =3D MethodCallFactory.create(MethodDeclarations.getNode=
MethodLocal, fqn);
+      MethodCall m =3D MethodCallFactory.create(MethodDeclarations.getNode=
MethodLocal_id, fqn);
       return (Node) invokeMethod(m, true);
    }
 =

@@ -1203,7 +1202,7 @@
     */
    public Map getData(Fqn<?> fqn) throws CacheException
    {
-      MethodCall m =3D MethodCallFactory.create(MethodDeclarations.getData=
MapMethodLocal, fqn);
+      MethodCall m =3D MethodCallFactory.create(MethodDeclarations.getData=
MapMethodLocal_id, fqn);
       return (Map) invokeMethod(m, true);
    }
 =

@@ -1265,7 +1264,7 @@
 =

    protected Object get(Fqn<?> fqn, Object key, boolean sendNodeEvent) thr=
ows CacheException
    {
-      MethodCall m =3D MethodCallFactory.create(MethodDeclarations.getKeyV=
alueMethodLocal, fqn, key, sendNodeEvent);
+      MethodCall m =3D MethodCallFactory.create(MethodDeclarations.getKeyV=
alueMethodLocal_id, fqn, key, sendNodeEvent);
       return invokeMethod(m, true);
    }
 =

@@ -1389,11 +1388,11 @@
       MethodCall m;
       if (erase)
       {
-         m =3D MethodCallFactory.create(MethodDeclarations.putDataEraseMet=
hodLocal, tx, fqn, data, true, true);
+         m =3D MethodCallFactory.create(MethodDeclarations.putDataEraseMet=
hodLocal_id, tx, fqn, data, true, true);
       }
       else
       {
-         m =3D MethodCallFactory.create(MethodDeclarations.putDataMethodLo=
cal, tx, fqn, data, true);
+         m =3D MethodCallFactory.create(MethodDeclarations.putDataMethodLo=
cal_id, tx, fqn, data, true);
       }
       invokeMethod(m, true);
    }
@@ -1426,7 +1425,7 @@
    public Object put(Fqn<?> fqn, Object key, Object value) throws CacheExc=
eption
    {
       GlobalTransaction tx =3D getCurrentTransaction();
-      MethodCall m =3D MethodCallFactory.create(MethodDeclarations.putKeyV=
alMethodLocal, tx, fqn, key, value, true);
+      MethodCall m =3D MethodCallFactory.create(MethodDeclarations.putKeyV=
alMethodLocal_id, tx, fqn, key, value, true);
       return invokeMethod(m, true);
    }
 =

@@ -1465,7 +1464,7 @@
       }
       else
       {
-         MethodCall m =3D MethodCallFactory.create(MethodDeclarations.remo=
veNodeMethodLocal, tx, fqn, true);
+         MethodCall m =3D MethodCallFactory.create(MethodDeclarations.remo=
veNodeMethodLocal_id, tx, fqn, true);
          Object retval =3D invokeMethod(m, true);
          return retval !=3D null && (Boolean) retval;
       }
@@ -1497,7 +1496,7 @@
       }
       else
       {
-         MethodCall m =3D MethodCallFactory.create(MethodDeclarations.evic=
tNodeMethodLocal, fqn);
+         MethodCall m =3D MethodCallFactory.create(MethodDeclarations.evic=
tNodeMethodLocal_id, fqn);
          invokeMethod(m, true);
       }
    }
@@ -1524,7 +1523,7 @@
    public Object remove(Fqn<?> fqn, Object key) throws CacheException
    {
       GlobalTransaction tx =3D getCurrentTransaction();
-      MethodCall m =3D MethodCallFactory.create(MethodDeclarations.removeK=
eyMethodLocal, tx, fqn, key, true);
+      MethodCall m =3D MethodCallFactory.create(MethodDeclarations.removeK=
eyMethodLocal_id, tx, fqn, key, true);
       return invokeMethod(m, true);
    }
 =

@@ -1567,7 +1566,7 @@
     */
    public void releaseAllLocks(Fqn fqn)
    {
-      MethodCall m =3D MethodCallFactory.create(MethodDeclarations.release=
AllLocksMethodLocal, fqn);
+      MethodCall m =3D MethodCallFactory.create(MethodDeclarations.release=
AllLocksMethodLocal_id, fqn);
       try
       {
          invokeMethod(m, true);
@@ -1593,7 +1592,7 @@
     */
    public String print(Fqn fqn)
    {
-      MethodCall m =3D MethodCallFactory.create(MethodDeclarations.printMe=
thodLocal, fqn);
+      MethodCall m =3D MethodCallFactory.create(MethodDeclarations.printMe=
thodLocal_id, fqn);
       Object retval =3D null;
       try
       {
@@ -1622,7 +1621,7 @@
     */
    public <E> Set<E> getChildrenNames(Fqn<E> fqn) throws CacheException
    {
-      MethodCall m =3D MethodCallFactory.create(MethodDeclarations.getChil=
drenNamesMethodLocal, fqn);
+      MethodCall m =3D MethodCallFactory.create(MethodDeclarations.getChil=
drenNamesMethodLocal_id, fqn);
       Set<E> retval =3D null;
       retval =3D (Set<E>) invokeMethod(m, true);
       if (retval !=3D null)
@@ -1960,47 +1959,6 @@
       return retval;
    }
 =

-   /**
-    * @param members
-    * @param method
-    * @param args
-    * @param synchronous
-    * @param exclude_self
-    * @param timeout
-    * @return
-    * @throws Exception
-    * @deprecated Note this is due to be moved to an interceptor.
-    */
-   @Deprecated
-   public List callRemoteMethods(List<Address> members, Method method, Obj=
ect[] args,
-                                 boolean synchronous, boolean exclude_self=
, long timeout)
-         throws Exception
-   {
-      return callRemoteMethods(members, MethodCallFactory.create(method, a=
rgs), synchronous, exclude_self, timeout);
-   }
-
-   /**
-    * @param members
-    * @param method_name
-    * @param types
-    * @param args
-    * @param synchronous
-    * @param exclude_self
-    * @param timeout
-    * @return
-    * @throws Exception
-    * @deprecated Note this is due to be moved to an interceptor.
-    */
-   @Deprecated
-   public List callRemoteMethods(Vector<Address> members, String method_na=
me,
-                                 Class[] types, Object[] args,
-                                 boolean synchronous, boolean exclude_self=
, long timeout)
-         throws Exception
-   {
-      Method method =3D getClass().getDeclaredMethod(method_name, types);
-      return callRemoteMethods(members, method, args, synchronous, exclude=
_self, timeout);
-   }
-
    /* -------------------- End Remote method calls ------------------ */
 =

    /* --------------------- Callbacks -------------------------- */
@@ -2122,7 +2080,7 @@
       if (tx !=3D null && create_undo_ops)
       {
          // erase and set to previous hashmap contents
-         MethodCall undo_op =3D MethodCallFactory.create(MethodDeclaration=
s.putDataEraseMethodLocal, tx, fqn, new HashMap(rawData), false, true);
+         MethodCall undo_op =3D MethodCallFactory.create(MethodDeclaration=
s.putDataEraseMethodLocal_id, tx, fqn, new HashMap(rawData), false, true);
          transactionTable.addUndoOperation(tx, undo_op);
       }
 =

@@ -2195,11 +2153,11 @@
          MethodCall undo_op;
          if (old_value =3D=3D null)
          {
-            undo_op =3D MethodCallFactory.create(MethodDeclarations.remove=
KeyMethodLocal, tx, fqn, key, false);
+            undo_op =3D MethodCallFactory.create(MethodDeclarations.remove=
KeyMethodLocal_id, tx, fqn, key, false);
          }
          else
          {
-            undo_op =3D MethodCallFactory.create(MethodDeclarations.putKey=
ValMethodLocal, tx, fqn, key, old_value, false);
+            undo_op =3D MethodCallFactory.create(MethodDeclarations.putKey=
ValMethodLocal_id, tx, fqn, key, old_value, false);
          }
          // 1. put undo-op in TX' undo-operations list (needed to rollback=
 TX)
          transactionTable.addUndoOperation(tx, undo_op);
@@ -2344,7 +2302,7 @@
       // this modification) and put it into the TX's undo list.
       if (tx !=3D null && create_undo_ops && !eviction && found)
       {
-         undo_op =3D MethodCallFactory.create(MethodDeclarations.addChildM=
ethodLocal, tx, parent_node.getFqn(), n.getFqn().getLastElement(), n, false=
);
+         undo_op =3D MethodCallFactory.create(MethodDeclarations.addChildM=
ethodLocal_id, tx, parent_node.getFqn(), n.getFqn().getLastElement(), n, fa=
lse);
 =

          // 1. put undo-op in TX' undo-operations list (needed to rollback=
 TX)
          transactionTable.addUndoOperation(tx, undo_op);
@@ -2415,7 +2373,7 @@
       // this modification) and put it into the TX's undo list.
       if (tx !=3D null && create_undo_ops && old_value !=3D null)
       {
-         undo_op =3D MethodCallFactory.create(MethodDeclarations.putKeyVal=
MethodLocal, tx, fqn, key, old_value, false);
+         undo_op =3D MethodCallFactory.create(MethodDeclarations.putKeyVal=
MethodLocal_id, tx, fqn, key, old_value, false);
          // 1. put undo-op in TX' undo-operations list (needed to rollback=
 TX)
          transactionTable.addUndoOperation(tx, undo_op);
       }
@@ -2494,7 +2452,7 @@
       {
          if (!data.isEmpty())
          {
-            undo_op =3D MethodCallFactory.create(MethodDeclarations.putDat=
aMethodLocal,
+            undo_op =3D MethodCallFactory.create(MethodDeclarations.putDat=
aMethodLocal_id,
                   tx, fqn, new HashMap(data), false);
          }
       }
@@ -2730,7 +2688,7 @@
       if (gtx !=3D null && undoOps)
       {
          // 1. put undo-op in TX' undo-operations list (needed to rollback=
 TX)
-         transactionTable.addUndoOperation(gtx, MethodCallFactory.create(M=
ethodDeclarations.removeNodeMethodLocal, gtx, fqn, false));
+         transactionTable.addUndoOperation(gtx, MethodCallFactory.create(M=
ethodDeclarations.removeNodeMethodLocal_id, gtx, fqn, false));
       }
 =

       if (!isRollback) notifier.notifyNodeCreated(fqn, false, ctx);
@@ -3009,7 +2967,7 @@
    public void move(Fqn<?> nodeToMove, Fqn<?> newParent)
    {
       // this needs to be passed up the interceptor chain
-      MethodCall m =3D MethodCallFactory.create(MethodDeclarations.moveMet=
hodLocal, nodeToMove, newParent);
+      MethodCall m =3D MethodCallFactory.create(MethodDeclarations.moveMet=
hodLocal_id, nodeToMove, newParent);
       invokeMethod(m, true);
    }
 =

@@ -3060,7 +3018,7 @@
       // now register an undo op
       if (ctx.getTransaction() !=3D null)
       {
-         MethodCall undo =3D MethodCallFactory.create(MethodDeclarations.m=
oveMethodLocal, new Fqn(newParentFqn, nodeToMoveFqn.getLastElement()), oldP=
arent.getFqn());
+         MethodCall undo =3D MethodCallFactory.create(MethodDeclarations.m=
oveMethodLocal_id, new Fqn(newParentFqn, nodeToMoveFqn.getLastElement()), o=
ldParent.getFqn());
          transactionTable.addUndoOperation(ctx.getGlobalTransaction(), und=
o);
       }
    }
@@ -3811,7 +3769,7 @@
       {
          spi.getInvocationContext().getOptionOverrides().setFailSilently(t=
rue);
          GlobalTransaction tx =3D getCurrentTransaction();
-         MethodCall m =3D MethodCallFactory.create(MethodDeclarations.putF=
orExternalReadMethodLocal, tx, fqn, key, value);
+         MethodCall m =3D MethodCallFactory.create(MethodDeclarations.putF=
orExternalReadMethodLocal_id, tx, fqn, key, value);
          invokeMethod(m, true);
       }
       else

Modified: core/trunk/src/main/java/org/jboss/cache/RPCManager.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/java/org/jboss/cache/RPCManager.java	2008-01-04 09:=
45:35 UTC (rev 4976)
+++ core/trunk/src/main/java/org/jboss/cache/RPCManager.java	2008-01-04 12:=
19:46 UTC (rev 4977)
@@ -4,7 +4,6 @@
 import org.jgroups.Address;
 import org.jgroups.blocks.RspFilter;
 =

-import java.lang.reflect.Method;
 import java.util.List;
 =

 public interface RPCManager
@@ -23,8 +22,6 @@
 =

    public List callRemoteMethods(List<Address> recipients, MethodCall meth=
odCall, boolean synchronous, boolean excludeSelf, int timeout) throws Excep=
tion;
 =

-   public List callRemoteMethods(List<Address> recipients, Method method, =
Object[] arguments, boolean synchronous, boolean excludeSelf, long timeout)=
 throws Exception;
-
    /**
     * @return Returns the replication queue (if one is used), null otherwi=
se.
     */

Modified: core/trunk/src/main/java/org/jboss/cache/RPCManagerImpl.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/java/org/jboss/cache/RPCManagerImpl.java	2008-01-04=
 09:45:35 UTC (rev 4976)
+++ core/trunk/src/main/java/org/jboss/cache/RPCManagerImpl.java	2008-01-04=
 12:19:46 UTC (rev 4977)
@@ -11,7 +11,6 @@
 import org.jgroups.Address;
 import org.jgroups.blocks.RspFilter;
 =

-import java.lang.reflect.Method;
 import java.util.List;
 =

 /**
@@ -71,12 +70,6 @@
       return c.callRemoteMethods(recipients, methodCall, synchronous, excl=
udeSelf, timeout);
    }
 =

-   @SuppressWarnings("deprecation")
-   public List callRemoteMethods(List<Address> recipients, Method method, =
Object[] arguments, boolean synchronous, boolean excludeSelf, long timeout)=
 throws Exception
-   {
-      return c.callRemoteMethods(recipients, method, arguments, synchronou=
s, excludeSelf, timeout);
-   }
-
    /**
     * @return Returns the replication queue (if one is used), null otherwi=
se.
     */

Modified: core/trunk/src/main/java/org/jboss/cache/ReplicationQueue.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/java/org/jboss/cache/ReplicationQueue.java	2008-01-=
04 09:45:35 UTC (rev 4976)
+++ core/trunk/src/main/java/org/jboss/cache/ReplicationQueue.java	2008-01-=
04 12:19:46 UTC (rev 4977)
@@ -10,6 +10,7 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.jboss.cache.marshall.MethodCall;
+import org.jboss.cache.marshall.MethodCallFactory;
 import org.jboss.cache.marshall.MethodDeclarations;
 =

 import java.util.ArrayList;
@@ -119,8 +120,8 @@
          {
             timer =3D new Timer(true);
             timer.schedule(task,
-                           500, // delay before initial flush
-                           interval); // interval between flushes
+                  500, // delay before initial flush
+                  interval); // interval between flushes
          }
       }
    }
@@ -177,7 +178,7 @@
          try
          {
             // send to all live nodes in the cluster
-            cache.getRPCManager().callRemoteMethods(null, MethodDeclaratio=
ns.replicateAllMethod, new Object[]{l}, false, true, 5000);
+            cache.getRPCManager().callRemoteMethods(null, MethodCallFactor=
y.create(MethodDeclarations.replicateAllMethod_id, l), false, true, 5000);
          }
          catch (Throwable t)
          {

Modified: core/trunk/src/main/java/org/jboss/cache/UnversionedNode.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/java/org/jboss/cache/UnversionedNode.java	2008-01-0=
4 09:45:35 UTC (rev 4976)
+++ core/trunk/src/main/java/org/jboss/cache/UnversionedNode.java	2008-01-0=
4 12:19:46 UTC (rev 4977)
@@ -285,7 +285,7 @@
                children.put(child_name, child);
                if (gtx !=3D null)
                {
-                  MethodCall undo_op =3D MethodCallFactory.create(MethodDe=
clarations.removeNodeMethodLocal,
+                  MethodCall undo_op =3D MethodCallFactory.create(MethodDe=
clarations.removeNodeMethodLocal_id,
                         gtx, child_fqn, false);
                   cacheImpl.addUndoOperation(gtx, undo_op);
                   // add the node name to the list maintained for the curr=
ent tx

Modified: core/trunk/src/main/java/org/jboss/cache/buddyreplication/BuddyMa=
nager.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/java/org/jboss/cache/buddyreplication/BuddyManager.=
java	2008-01-04 09:45:35 UTC (rev 4976)
+++ core/trunk/src/main/java/org/jboss/cache/buddyreplication/BuddyManager.=
java	2008-01-04 12:19:46 UTC (rev 4977)
@@ -683,7 +683,7 @@
    {
       if (call !=3D null && call.getArgs() !=3D null && call.getMethodId()=
 !=3D MethodDeclarations.commitMethod_id)
       {
-         MethodCall call2 =3D MethodCallFactory.create(call.getMethod(), c=
all.getArgs().clone());
+         MethodCall call2 =3D MethodCallFactory.create(call.getMethodId(),=
 call.getArgs().clone());
          handleArgs(call2.getArgs(), transformForCurrentCall);
          return call2;
       }
@@ -703,7 +703,7 @@
       }
       buddyGroup.removeBuddies(buddies);
       // now broadcast a message to the removed buddies.
-      MethodCall membershipCall =3D MethodCallFactory.create(MethodDeclara=
tions.remoteRemoveFromBuddyGroupMethod, buddyGroup.getGroupName());
+      MethodCall membershipCall =3D MethodCallFactory.create(MethodDeclara=
tions.remoteRemoveFromBuddyGroupMethod_id, buddyGroup.getGroupName());
 =

       int attemptsLeft =3D UNINIT_BUDDIES_RETRIES;
       int currentAttempt =3D 0;
@@ -804,7 +804,7 @@
       }
 =

       // now broadcast a message to the newly assigned buddies.
-      MethodCall membershipCall =3D MethodCallFactory.create(MethodDeclara=
tions.remoteAssignToBuddyGroupMethod, buddyGroup, stateMap);
+      MethodCall membershipCall =3D MethodCallFactory.create(MethodDeclara=
tions.remoteAssignToBuddyGroupMethod_id, buddyGroup, stateMap);
 =

       int attemptsLeft =3D UNINIT_BUDDIES_RETRIES;
       int currentAttempt =3D 0;
@@ -967,7 +967,7 @@
          log.debug("Instance " + buddyGroup.getDataOwner() + " broadcastin=
g membership in buddy pool " + config.getBuddyPoolName() + " to recipients =
" + recipients);
       }
 =

-      MethodCall membershipCall =3D MethodCallFactory.create(MethodDeclara=
tions.remoteAnnounceBuddyPoolNameMethod, buddyGroup.getDataOwner(), config.=
getBuddyPoolName());
+      MethodCall membershipCall =3D MethodCallFactory.create(MethodDeclara=
tions.remoteAnnounceBuddyPoolNameMethod_id, buddyGroup.getDataOwner(), conf=
ig.getBuddyPoolName());
 =

       try
       {

Modified: core/trunk/src/main/java/org/jboss/cache/interceptors/BaseRpcInte=
rceptor.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/java/org/jboss/cache/interceptors/BaseRpcIntercepto=
r.java	2008-01-04 09:45:35 UTC (rev 4976)
+++ core/trunk/src/main/java/org/jboss/cache/interceptors/BaseRpcIntercepto=
r.java	2008-01-04 12:19:46 UTC (rev 4977)
@@ -114,7 +114,7 @@
          long syncReplTimeout =3D o.getSyncReplTimeout();
          if (syncReplTimeout < 0) syncReplTimeout =3D configuration.getSyn=
cReplTimeout();
 =

-         MethodCall toCall =3D wrapMethodCallInReplicateMethod ? toCall =
=3D MethodCallFactory.create(MethodDeclarations.replicateMethod, call) : ca=
ll;
+         MethodCall toCall =3D wrapMethodCallInReplicateMethod ? toCall =
=3D MethodCallFactory.create(MethodDeclarations.replicateMethod_id, call) :=
 call;
 =

          List rsps =3D rpcManager.callRemoteMethods(callRecipients,
                toCall,
@@ -130,7 +130,7 @@
    protected void putCallOnAsyncReplicationQueue(MethodCall call)
    {
       if (log.isDebugEnabled()) log.debug("Putting call " + call + " on th=
e replication queue.");
-      rpcManager.getReplicationQueue().add(MethodCallFactory.create(Method=
Declarations.replicateMethod, call));
+      rpcManager.getReplicationQueue().add(MethodCallFactory.create(Method=
Declarations.replicateMethod_id, call));
    }
 =

    //todo info expt for this is InvocationContext, move method there

Modified: core/trunk/src/main/java/org/jboss/cache/interceptors/CacheLoader=
Interceptor.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/java/org/jboss/cache/interceptors/CacheLoaderInterc=
eptor.java	2008-01-04 09:45:35 UTC (rev 4976)
+++ core/trunk/src/main/java/org/jboss/cache/interceptors/CacheLoaderInterc=
eptor.java	2008-01-04 12:19:46 UTC (rev 4977)
@@ -460,7 +460,7 @@
 =

       if (configuration.isNodeLockingOptimistic()) return;
 =

-      MethodCall m =3D MethodCallFactory.create(MethodDeclarations.lockMet=
hodLocal,
+      MethodCall m =3D MethodCallFactory.create(MethodDeclarations.lockMet=
hodLocal_id,
             fqn, lock_type, recursive);
 =

       // hacky

Modified: core/trunk/src/main/java/org/jboss/cache/interceptors/DataGravita=
torInterceptor.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/java/org/jboss/cache/interceptors/DataGravitatorInt=
erceptor.java	2008-01-04 09:45:35 UTC (rev 4976)
+++ core/trunk/src/main/java/org/jboss/cache/interceptors/DataGravitatorInt=
erceptor.java	2008-01-04 12:19:46 UTC (rev 4977)
@@ -242,11 +242,11 @@
          mods.add(cleanup);
          if (configuration.isNodeLockingOptimistic())
          {
-            prepare =3D MethodCallFactory.create(MethodDeclarations.optimi=
sticPrepareMethod, gtx, mods, null, cache.getLocalAddress(), false);
+            prepare =3D MethodCallFactory.create(MethodDeclarations.optimi=
sticPrepareMethod_id, gtx, mods, null, cache.getLocalAddress(), false);
          }
          else
          {
-            prepare =3D MethodCallFactory.create(MethodDeclarations.prepar=
eMethod, gtx, mods, cache.getLocalAddress(), syncCommunications);
+            prepare =3D MethodCallFactory.create(MethodDeclarations.prepar=
eMethod_id, gtx, mods, cache.getLocalAddress(), syncCommunications);
          }
 =

          replicateCall(ctx, getMembersOutsideBuddyGroup(), prepare, syncCo=
mmunications, ctx.getOptionOverrides());
@@ -262,7 +262,7 @@
       if (transactionMods.containsKey(gtx))
       {
          if (trace) log.trace("Broadcasting commit for gtx " + gtx);
-         replicateCall(ctx, getMembersOutsideBuddyGroup(), MethodCallFacto=
ry.create(MethodDeclarations.commitMethod, gtx), syncCommunications, ctx.ge=
tOptionOverrides());
+         replicateCall(ctx, getMembersOutsideBuddyGroup(), MethodCallFacto=
ry.create(MethodDeclarations.commitMethod_id, gtx), syncCommunications, ctx=
.getOptionOverrides());
       }
       else
       {
@@ -300,7 +300,7 @@
 =

    private void cleanBackupData(BackupData backup, GlobalTransaction gtx, =
InvocationContext ctx) throws Throwable
    {
-      MethodCall cleanup =3D MethodCallFactory.create(MethodDeclarations.d=
ataGravitationCleanupMethod, backup.primaryFqn, backup.backupFqn);
+      MethodCall cleanup =3D MethodCallFactory.create(MethodDeclarations.d=
ataGravitationCleanupMethod_id, backup.primaryFqn, backup.backupFqn);
 =

 =

       if (trace) log.trace("Performing cleanup on [" + backup.primaryFqn +=
 "]");
@@ -332,7 +332,7 @@
       }
       List<Address> mbrs =3D cache.getMembers();
       Boolean searchSubtrees =3D (buddyManager.isDataGravitationSearchBack=
upTrees() ? Boolean.TRUE : Boolean.FALSE);
-      MethodCall dGrav =3D MethodCallFactory.create(MethodDeclarations.dat=
aGravitationMethod, fqn, searchSubtrees);
+      MethodCall dGrav =3D MethodCallFactory.create(MethodDeclarations.dat=
aGravitationMethod_id, fqn, searchSubtrees);
       // doing a GET_ALL is crappy but necessary since JGroups' GET_FIRST =
could return null results from nodes that do
       // not have either the primary OR backup, and stop polling other val=
id nodes.
       List resps =3D cache.getRPCManager().callRemoteMethods(mbrs, dGrav, =
GroupRequest.GET_ALL, true, buddyManager.getBuddyCommunicationTimeout(), ne=
w ResponseValidityFilter(mbrs, cache.getLocalAddress()));

Modified: core/trunk/src/main/java/org/jboss/cache/interceptors/Invalidatio=
nInterceptor.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/java/org/jboss/cache/interceptors/InvalidationInter=
ceptor.java	2008-01-04 09:45:35 UTC (rev 4976)
+++ core/trunk/src/main/java/org/jboss/cache/interceptors/InvalidationInter=
ceptor.java	2008-01-04 12:19:46 UTC (rev 4977)
@@ -333,7 +333,7 @@
               MethodCallFactory.create(MethodDeclarations.evictVersionedNo=
deMethodLocal, fqn, workspace.getNode(fqn).getVersion()) :
               MethodCallFactory.create(MethodDeclarations.evictNodeMethodL=
ocal, fqn);
               */
-      MethodCall call =3D MethodCallFactory.create(MethodDeclarations.inva=
lidateMethodLocal, fqn, getNodeVersion(workspace, fqn));
+      MethodCall call =3D MethodCallFactory.create(MethodDeclarations.inva=
lidateMethodLocal_id, fqn, getNodeVersion(workspace, fqn));
 =

       if (log.isDebugEnabled()) log.debug("Cache [" + cache.getLocalAddres=
s() + "] replicating " + call);
       // voila, invalidated!

Modified: core/trunk/src/main/java/org/jboss/cache/interceptors/OptimisticR=
eplicationInterceptor.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/java/org/jboss/cache/interceptors/OptimisticReplica=
tionInterceptor.java	2008-01-04 09:45:35 UTC (rev 4976)
+++ core/trunk/src/main/java/org/jboss/cache/interceptors/OptimisticReplica=
tionInterceptor.java	2008-01-04 12:19:46 UTC (rev 4977)
@@ -212,7 +212,7 @@
          try
          {
             broadcastTxs.remove(gtx);
-            MethodCall commit_method =3D MethodCallFactory.create(MethodDe=
clarations.commitMethod, gtx);
+            MethodCall commit_method =3D MethodCallFactory.create(MethodDe=
clarations.commitMethod_id, gtx);
 =

             if (log.isDebugEnabled())
                log.debug("running remote commit for " + gtx + " and coord=
=3D" + cache.getLocalAddress());
@@ -237,7 +237,7 @@
          try
          {
             broadcastTxs.remove(gtx);
-            MethodCall rollback_method =3D MethodCallFactory.create(Method=
Declarations.rollbackMethod, gtx);
+            MethodCall rollback_method =3D MethodCallFactory.create(Method=
Declarations.rollbackMethod_id, gtx);
 =

             if (log.isDebugEnabled())
                log.debug("running remote rollback for " + gtx + " and coor=
d=3D" + cache.getLocalAddress());
@@ -254,7 +254,7 @@
    private MethodCall mapDataVersionedMethodCalls(MethodCall m, Transactio=
nWorkspace w)
    {
       Object[] origArgs =3D m.getArgs();
-      return MethodCallFactory.create(m.getMethod(), origArgs[0], translat=
e((List<MethodCall>) origArgs[1], w), origArgs[2], origArgs[3], origArgs[4]=
);
+      return MethodCallFactory.create(m.getMethodId(), origArgs[0], transl=
ate((List<MethodCall>) origArgs[1], w), origArgs[2], origArgs[3], origArgs[=
4]);
    }
 =

    /**
@@ -287,7 +287,7 @@
             newArgs[origArgs.length] =3D versionToBroadcast;
 =

             // now create a new method call which contains this data versi=
on
-            MethodCall newCall =3D MethodCallFactory.create(MethodDeclarat=
ions.getVersionedMethod(origCall.getMethodId()), newArgs);
+            MethodCall newCall =3D MethodCallFactory.create(MethodDeclarat=
ions.getVersionedMethodId(origCall.getMethodId()), newArgs);
 =

             // and add it to the new list.
             newList.add(newCall);

Modified: core/trunk/src/main/java/org/jboss/cache/interceptors/TxIntercept=
or.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/java/org/jboss/cache/interceptors/TxInterceptor.jav=
a	2008-01-04 09:45:35 UTC (rev 4976)
+++ core/trunk/src/main/java/org/jboss/cache/interceptors/TxInterceptor.jav=
a	2008-01-04 12:19:46 UTC (rev 4977)
@@ -681,7 +681,7 @@
                   Object[] args =3D new Object[origArgs.length - 1];
                   System.arraycopy(origArgs, 0, args, 0, args.length);
 =

-                  ctx.setMethodCall(MethodCallFactory.create(MethodDeclara=
tions.getUnversionedMethod(modification.getMethodId()), args));
+                  ctx.setMethodCall(MethodCallFactory.create(MethodDeclara=
tions.getUnversionedMethodId(modification.getMethodId()), args));
                   if (o !=3D null) ctx.setOptionOverrides(o);
                }
                else
@@ -873,19 +873,19 @@
             // running a 1-phase commit.
             if (configuration.isNodeLockingOptimistic())
             {
-               commitMethod =3D MethodCallFactory.create(MethodDeclaration=
s.optimisticPrepareMethod,
+               commitMethod =3D MethodCallFactory.create(MethodDeclaration=
s.optimisticPrepareMethod_id,
                      gtx, modifications, null, cache.getLocalAddress(), tr=
ue);
             }
             else
             {
-               commitMethod =3D MethodCallFactory.create(MethodDeclaration=
s.prepareMethod,
+               commitMethod =3D MethodCallFactory.create(MethodDeclaration=
s.prepareMethod_id,
                      gtx, modifications, cache.getLocalAddress(),
                      true);
             }
          }
          else
          {
-            commitMethod =3D MethodCallFactory.create(MethodDeclarations.c=
ommitMethod, gtx);
+            commitMethod =3D MethodCallFactory.create(MethodDeclarations.c=
ommitMethod_id, gtx);
          }
 =

          if (trace)
@@ -942,7 +942,7 @@
          ctx.setTxHasMods(modifications !=3D null && modifications.size() =
> 0);
          // JBCACHE-457
          //            MethodCall rollbackMethod =3D MethodCall(CacheImpl.=
rollbackMethod, new Object[]{gtx, hasMods ? true : false});
-         MethodCall rollbackMethod =3D MethodCallFactory.create(MethodDecl=
arations.rollbackMethod, gtx);
+         MethodCall rollbackMethod =3D MethodCallFactory.create(MethodDecl=
arations.rollbackMethod_id, gtx);
          if (trace)
          {
             log.trace(" running rollback for " + gtx);
@@ -982,11 +982,11 @@
       // running a 2-phase commit.
       if (configuration.isNodeLockingOptimistic())
       {
-         prepareMethod =3D MethodCallFactory.create(MethodDeclarations.opt=
imisticPrepareMethod, gtx, modifications, null, cache.getLocalAddress(), fa=
lse);
+         prepareMethod =3D MethodCallFactory.create(MethodDeclarations.opt=
imisticPrepareMethod_id, gtx, modifications, null, cache.getLocalAddress(),=
 false);
       }
       else if (configuration.getCacheMode() !=3D Configuration.CacheMode.R=
EPL_ASYNC)
       {
-         prepareMethod =3D MethodCallFactory.create(MethodDeclarations.pre=
pareMethod,
+         prepareMethod =3D MethodCallFactory.create(MethodDeclarations.pre=
pareMethod_id,
                gtx, modifications, cache.getLocalAddress(),
                false);// don't commit or rollback - wait for call
       }

Modified: core/trunk/src/main/java/org/jboss/cache/invocation/CacheInvocati=
onDelegate.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/java/org/jboss/cache/invocation/CacheInvocationDele=
gate.java	2008-01-04 09:45:35 UTC (rev 4976)
+++ core/trunk/src/main/java/org/jboss/cache/invocation/CacheInvocationDele=
gate.java	2008-01-04 12:19:46 UTC (rev 4977)
@@ -322,7 +322,7 @@
 =

    public void move(Fqn<?> nodeToMove, Fqn<?> newParent) throws NodeNotExi=
stsException
    {
-      MethodCall m =3D MethodCallFactory.create(MethodDeclarations.moveMet=
hodLocal, nodeToMove, newParent);
+      MethodCall m =3D MethodCallFactory.create(MethodDeclarations.moveMet=
hodLocal_id, nodeToMove, newParent);
       invoke(m);
    }
 =

@@ -392,14 +392,14 @@
       }
       else
       {
-         MethodCall m =3D MethodCallFactory.create(MethodDeclarations.evic=
tNodeMethodLocal, fqn);
+         MethodCall m =3D MethodCallFactory.create(MethodDeclarations.evic=
tNodeMethodLocal_id, fqn);
          invoke(m);
       }
    }
 =

    public V get(Fqn<?> fqn, K key)
    {
-      MethodCall m =3D MethodCallFactory.create(MethodDeclarations.getKeyV=
alueMethodLocal, fqn, key, true);
+      MethodCall m =3D MethodCallFactory.create(MethodDeclarations.getKeyV=
alueMethodLocal_id, fqn, key, true);
       return (V) invoke(m);
    }
 =

@@ -432,7 +432,7 @@
       }
       else
       {
-         MethodCall m =3D MethodCallFactory.create(MethodDeclarations.remo=
veNodeMethodLocal, tx, fqn, true);
+         MethodCall m =3D MethodCallFactory.create(MethodDeclarations.remo=
veNodeMethodLocal_id, tx, fqn, true);
          Object retval =3D invoke(m);
          return retval !=3D null && (Boolean) retval;
       }
@@ -446,7 +446,7 @@
 =

    public Node getNode(Fqn<?> fqn)
    {
-      MethodCall m =3D MethodCallFactory.create(MethodDeclarations.getNode=
MethodLocal, fqn);
+      MethodCall m =3D MethodCallFactory.create(MethodDeclarations.getNode=
MethodLocal_id, fqn);
       return (Node) invoke(m);
    }
 =

@@ -458,7 +458,7 @@
    public V remove(Fqn<?> fqn, K key) throws CacheException
    {
       GlobalTransaction tx =3D cache.getCurrentTransaction();
-      MethodCall m =3D MethodCallFactory.create(MethodDeclarations.removeK=
eyMethodLocal, tx, fqn, key, true);
+      MethodCall m =3D MethodCallFactory.create(MethodDeclarations.removeK=
eyMethodLocal_id, tx, fqn, key, true);
       return (V) invoke(m);
    }
 =

@@ -470,7 +470,7 @@
    public void put(Fqn<?> fqn, Map<K, V> data)
    {
       GlobalTransaction tx =3D cache.getCurrentTransaction();
-      MethodCall m =3D MethodCallFactory.create(MethodDeclarations.putData=
MethodLocal, tx, fqn, data, true);
+      MethodCall m =3D MethodCallFactory.create(MethodDeclarations.putData=
MethodLocal_id, tx, fqn, data, true);
       invoke(m);
    }
 =

@@ -487,7 +487,7 @@
          getInvocationContext().getOptionOverrides().setFailSilently(true);
          getInvocationContext().getOptionOverrides().setForceAsynchronous(=
true);
          //GlobalTransaction tx =3D cache.getCurrentTransaction();
-         MethodCall m =3D MethodCallFactory.create(MethodDeclarations.putF=
orExternalReadMethodLocal, null, fqn, key, value);
+         MethodCall m =3D MethodCallFactory.create(MethodDeclarations.putF=
orExternalReadMethodLocal_id, null, fqn, key, value);
          invoke(m);
       }
       else
@@ -500,7 +500,7 @@
    public V put(Fqn<?> fqn, K key, V value)
    {
       GlobalTransaction tx =3D cache.getCurrentTransaction();
-      MethodCall m =3D MethodCallFactory.create(MethodDeclarations.putKeyV=
alMethodLocal, tx, fqn, key, value, true);
+      MethodCall m =3D MethodCallFactory.create(MethodDeclarations.putKeyV=
alMethodLocal_id, tx, fqn, key, value, true);
       return (V) invoke(m);
    }
 =

@@ -533,7 +533,7 @@
     */
    public Map<K, V> getData(Fqn<?> fqn)
    {
-      MethodCall m =3D MethodCallFactory.create(MethodDeclarations.getData=
MapMethodLocal, fqn);
+      MethodCall m =3D MethodCallFactory.create(MethodDeclarations.getData=
MapMethodLocal_id, fqn);
       return (Map<K, V>) invoke(m);
    }
 =

@@ -558,7 +558,7 @@
     */
    public Set<K> getKeys(Fqn<?> fqn)
    {
-      MethodCall m =3D MethodCallFactory.create(MethodDeclarations.getKeys=
MethodLocal, fqn);
+      MethodCall m =3D MethodCallFactory.create(MethodDeclarations.getKeys=
MethodLocal_id, fqn);
       return (Set<K>) invoke(m);
    }
 =

@@ -576,7 +576,7 @@
    public void clearData(Fqn fqn)
    {
       GlobalTransaction tx =3D getCurrentTransaction();
-      MethodCall m =3D MethodCallFactory.create(MethodDeclarations.removeD=
ataMethodLocal, tx, fqn, true);
+      MethodCall m =3D MethodCallFactory.create(MethodDeclarations.removeD=
ataMethodLocal_id, tx, fqn, true);
       invoke(m);
    }
 =

@@ -589,7 +589,7 @@
     */
    public <E> Set<E> getChildrenNames(Fqn<E> fqn)
    {
-      MethodCall m =3D MethodCallFactory.create(MethodDeclarations.getChil=
drenNamesMethodLocal, fqn);
+      MethodCall m =3D MethodCallFactory.create(MethodDeclarations.getChil=
drenNamesMethodLocal_id, fqn);
       Set<E> retval =3D null;
       retval =3D (Set<E>) invoke(m);
       if (retval !=3D null)

Modified: core/trunk/src/main/java/org/jboss/cache/invocation/RemoteCacheIn=
vocationDelegate.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/java/org/jboss/cache/invocation/RemoteCacheInvocati=
onDelegate.java	2008-01-04 09:45:35 UTC (rev 4976)
+++ core/trunk/src/main/java/org/jboss/cache/invocation/RemoteCacheInvocati=
onDelegate.java	2008-01-04 12:19:46 UTC (rev 4977)
@@ -132,13 +132,13 @@
 =

    public void block()
    {
-      MethodCall m =3D MethodCallFactory.create(MethodDeclarations.blockCh=
annelLocal);
+      MethodCall m =3D MethodCallFactory.create(MethodDeclarations.blockCh=
annelMethodLocal_id);
       invoke(m, true);
    }
 =

    public void unblock()
    {
-      MethodCall m =3D MethodCallFactory.create(MethodDeclarations.unblock=
ChannelLocal);
+      MethodCall m =3D MethodCallFactory.create(MethodDeclarations.unblock=
ChannelMethodLocal_id);
       invoke(m, true);
    }
 =


Modified: core/trunk/src/main/java/org/jboss/cache/loader/ClusteredCacheLoa=
der.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/java/org/jboss/cache/loader/ClusteredCacheLoader.ja=
va	2008-01-04 09:45:35 UTC (rev 4976)
+++ core/trunk/src/main/java/org/jboss/cache/loader/ClusteredCacheLoader.ja=
va	2008-01-04 12:19:46 UTC (rev 4977)
@@ -86,7 +86,7 @@
       lock.acquireLock(fqn, true);
       try
       {
-         MethodCall call =3D MethodCallFactory.create(MethodDeclarations.g=
etChildrenNamesMethodLocal, fqn);
+         MethodCall call =3D MethodCallFactory.create(MethodDeclarations.g=
etChildrenNamesMethodLocal_id, fqn);
          Object resp =3D callRemote(call);
          return (Set) resp;
       }
@@ -100,7 +100,7 @@
    {
       if (log.isTraceEnabled()) log.trace("cache=3D" + cache.getLocalAddre=
ss() + "; calling with " + call);
       List<Address> mbrs =3D cache.getMembers();
-      MethodCall clusteredGet =3D MethodCallFactory.create(MethodDeclarati=
ons.clusteredGetMethod, call, false);
+      MethodCall clusteredGet =3D MethodCallFactory.create(MethodDeclarati=
ons.clusteredGetMethod_id, call, false);
       List resps =3D null;
       // JBCACHE-1186
       resps =3D cache.getRPCManager().callRemoteMethods(mbrs, clusteredGet=
, GroupRequest.GET_ALL, true, config.getTimeout(), new ResponseValidityFilt=
er(mbrs, cache.getLocalAddress()));
@@ -159,7 +159,7 @@
       lock.acquireLock(name, true);
       try
       {
-         MethodCall call =3D MethodCallFactory.create(MethodDeclarations.g=
etDataMapMethodLocal, name);
+         MethodCall call =3D MethodCallFactory.create(MethodDeclarations.g=
etDataMapMethodLocal_id, name);
          Object resp =3D callRemote(call);
          return (Map) resp;
       }
@@ -177,7 +177,7 @@
       lock.acquireLock(name, false);
       try
       {
-         MethodCall call =3D MethodCallFactory.create(MethodDeclarations.e=
xistsMethod, name);
+         MethodCall call =3D MethodCallFactory.create(MethodDeclarations.e=
xistsMethod_id, name);
          Object resp =3D callRemote(call);
 =

          return resp !=3D null && (Boolean) resp;
@@ -198,7 +198,7 @@
          NodeSPI n =3D cache.peek(name, false);
          if (n =3D=3D null)
          {
-            MethodCall call =3D MethodCallFactory.create(MethodDeclaration=
s.getKeyValueMethodLocal, name, key, true);
+            MethodCall call =3D MethodCallFactory.create(MethodDeclaration=
s.getKeyValueMethodLocal_id, name, key, true);
             return callRemote(call);
          }
          else
@@ -242,7 +242,7 @@
          NodeSPI n =3D cache.peek(name, true);
          if (n =3D=3D null)
          {
-            MethodCall call =3D MethodCallFactory.create(MethodDeclaration=
s.getKeyValueMethodLocal, name, key, true);
+            MethodCall call =3D MethodCallFactory.create(MethodDeclaration=
s.getKeyValueMethodLocal_id, name, key, true);
             return callRemote(call);
          }
          else

Modified: core/trunk/src/main/java/org/jboss/cache/marshall/AbstractMarshal=
ler.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/java/org/jboss/cache/marshall/AbstractMarshaller.ja=
va	2008-01-04 09:45:35 UTC (rev 4976)
+++ core/trunk/src/main/java/org/jboss/cache/marshall/AbstractMarshaller.ja=
va	2008-01-04 12:19:46 UTC (rev 4977)
@@ -35,7 +35,8 @@
    protected boolean useRegionBasedMarshalling;
    protected RegionManager regionManager;
    protected boolean defaultInactive;
-   protected Log log =3D LogFactory.getLog(AbstractMarshaller.class);
+   protected Log log;
+   protected boolean trace;
 =

    /**
     * Map<GlobalTransaction, Fqn> for prepared tx that have not committed
@@ -57,6 +58,12 @@
       this.defaultInactive =3D configuration.isInactiveOnStartup();
    }
 =

+   protected void initLogger()
+   {
+      log =3D LogFactory.getLog(getClass());
+      trace =3D log.isTraceEnabled();
+   }
+
    // implement the basic contract set in RPcDispatcher.AbstractMarshaller
    public byte[] objectToByteBuffer(Object obj) throws Exception
    {
@@ -179,7 +186,7 @@
 =

       }
 =

-      if (log.isTraceEnabled())
+      if (trace)
       {
          log.trace("extract(): received " + methodCall + "extracted fqn: "=
 + fqn);
       }

Modified: core/trunk/src/main/java/org/jboss/cache/marshall/CacheMarshaller=
200.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/java/org/jboss/cache/marshall/CacheMarshaller200.ja=
va	2008-01-04 09:45:35 UTC (rev 4976)
+++ core/trunk/src/main/java/org/jboss/cache/marshall/CacheMarshaller200.ja=
va	2008-01-04 12:19:46 UTC (rev 4977)
@@ -6,7 +6,6 @@
  */
 package org.jboss.cache.marshall;
 =

-import org.apache.commons.logging.LogFactory;
 import org.jboss.cache.Fqn;
 import org.jboss.cache.Region;
 import static org.jboss.cache.Region.Status;
@@ -64,7 +63,6 @@
 =

    public CacheMarshaller200()
    {
-      log =3D LogFactory.getLog(CacheMarshaller200.class);
    }
 =

    /**
@@ -99,7 +97,7 @@
             // a Fqn region.
             region =3D regionForCall.get();
             regionForCall.remove();
-            if (log.isTraceEnabled())
+            if (trace)
                log.trace("Suspect this is a return value.  Extract region =
from ThreadLocal as " + region);
 =

             // otherwise, we need to marshall the retval.
@@ -111,13 +109,13 @@
             MethodCall call =3D (MethodCall) o;
             region =3D extractFqnRegion(call);
          }
-         if (log.isTraceEnabled()) log.trace("Region based call.  Using re=
gion " + region);
+         if (trace) log.trace("Region based call.  Using region " + region=
);
          objectToObjectStream(o, out, region);
       }
       else
       {
          // not region based!
-         if (log.isTraceEnabled()) log.trace("Marshalling object " + o);
+         if (trace) log.trace("Marshalling object " + o);
          Map<Object, Integer> refMap =3D new HashMap<Object, Integer>();
          marshallObject(o, out, refMap);
       }
@@ -133,14 +131,14 @@
       {
          Map<Integer, Object> refMap =3D new HashMap<Integer, Object>();
          Object retValue =3D unmarshallObject(in, refMap);
-         if (log.isTraceEnabled()) log.trace("Unmarshalled object " + retV=
alue);
+         if (trace) log.trace("Unmarshalled object " + retValue);
          return retValue;
       }
    }
 =

    public void objectToObjectStream(Object o, ObjectOutputStream out, Fqn =
region) throws Exception
    {
-      if (log.isTraceEnabled()) log.trace("Marshalling object " + o);
+      if (trace) log.trace("Marshalling object " + o);
       Map<Object, Integer> refMap =3D new HashMap<Object, Integer>();
       if (useRegionBasedMarshalling) // got to check again in case this me=
th is called directly
       {
@@ -165,7 +163,7 @@
          regionFqn =3D (Fqn) o;
       }
 =

-      if (log.isTraceEnabled()) log.trace("Unmarshalled regionFqn " + regi=
onFqn + " from stream");
+      if (trace) log.trace("Unmarshalled regionFqn " + regionFqn + " from =
stream");
 =

       Region region =3D null;
       Object retValue;
@@ -187,7 +185,7 @@
          // only set this if this is an incoming method call and not a ret=
urn value.
          if (!isReturnValue(retValue)) regionForCall.set(regionFqn);
       }
-      if (log.isTraceEnabled()) log.trace("Unmarshalled object " + retValu=
e);
+      if (trace) log.trace("Unmarshalled object " + retValue);
       return retValue;
    }
 =

@@ -389,7 +387,7 @@
       }
       else if (o instanceof Serializable)
       {
-         if (log.isTraceEnabled())
+         if (trace)
          {
             log.trace("Warning: using object serialization for " + o.getCl=
ass());
          }
@@ -638,7 +636,7 @@
             args[i] =3D unmarshallObject(in, refMap);
          }
       }
-      return MethodCallFactory.create(MethodDeclarations.lookupMethod(meth=
odId), args);
+      return MethodCallFactory.create(methodId, args);
    }
 =

    private GlobalTransaction unmarshallGlobalTransaction(ObjectInputStream=
 in, Map<Integer, Object> refMap) throws Exception

Modified: core/trunk/src/main/java/org/jboss/cache/marshall/MethodCallFacto=
ry.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/java/org/jboss/cache/marshall/MethodCallFactory.jav=
a	2008-01-04 09:45:35 UTC (rev 4976)
+++ core/trunk/src/main/java/org/jboss/cache/marshall/MethodCallFactory.jav=
a	2008-01-04 12:19:46 UTC (rev 4977)
@@ -20,14 +20,13 @@
    /**
     * Creates and initialised an instance of MethodCall.
     *
-    * @param method    Method instance of the MethodCall
-    * @param target    The InvocationTarget instance to invoke the call on
+    * @param methodId  Method ID of the MethodCall
     * @param arguments list of parameters
     * @return a new instance of MethodCall with the method id initialised
     */
-   public static MethodCall create(Method method, Object... arguments)
+   public static MethodCall create(int methodId, Object... arguments)
    {
-      return new MethodCall(method, MethodDeclarations.lookupMethodId(meth=
od), arguments);
+      return new MethodCall(MethodDeclarations.lookupMethod(methodId), met=
hodId, arguments);
    }
 =

    /**

Modified: core/trunk/src/main/java/org/jboss/cache/marshall/MethodDeclarati=
ons.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/java/org/jboss/cache/marshall/MethodDeclarations.ja=
va	2008-01-04 09:45:35 UTC (rev 4976)
+++ core/trunk/src/main/java/org/jboss/cache/marshall/MethodDeclarations.ja=
va	2008-01-04 12:19:46 UTC (rev 4977)
@@ -18,14 +18,13 @@
 import org.jboss.cache.lock.NodeLock;
 import org.jboss.cache.optimistic.DataVersion;
 import org.jboss.cache.transaction.GlobalTransaction;
+import org.jboss.cache.util.BitEncodedIntegerSet;
 import org.jgroups.Address;
 =

 import java.lang.reflect.Method;
 import java.util.HashMap;
-import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
-import java.util.Set;
 =

 /**
  * Class containing Method and Method id definitions as well methods
@@ -38,10 +37,16 @@
 {
    private static Log log =3D LogFactory.getLog(MethodDeclarations.class);
 =

-   static final Set<Integer> methodsThatNeedToReturnValuesToRemoteCallers =
=3D new HashSet<Integer>();
+   static final BitEncodedIntegerSet crudMethodIds =3D new BitEncodedInteg=
erSet();
+   static final BitEncodedIntegerSet transactionLifecycleMethodIds =3D new=
 BitEncodedIntegerSet();
+   static final BitEncodedIntegerSet buddyGroupOrganisationMethodIds =3D n=
ew BitEncodedIntegerSet();
+   static final BitEncodedIntegerSet blockUnblockMethodIds =3D new BitEnco=
dedIntegerSet();
+   static final BitEncodedIntegerSet putMethodIds =3D new BitEncodedIntege=
rSet();
+   static final BitEncodedIntegerSet methodsThatNeedToReturnValuesToRemote=
Callers =3D new BitEncodedIntegerSet();
 =

-   // maintain a list of method IDs that correspond to Methods in CacheImpl
-   static final Map<Integer, Method> methods =3D new HashMap<Integer, Meth=
od>();
+   // maintain a list of method IDs that correspond to Methods
+   // Mapping ids to Methods are done via an array lookup where the subscr=
ipt is a method id.
+   static final Method[] methods =3D new Method[48]; // the largest method=
 id is 47 so this array needs to accommodate a subscript of 47.
 =

    // and for reverse lookup
    static final Map<Method, Integer> methodIds =3D new HashMap<Method, Int=
eger>();
@@ -108,9 +113,9 @@
 =

    public static final Method moveMethodLocal;
 =

-   public static final Method blockChannelLocal;
+   public static final Method blockChannelMethodLocal;
 =

-   public static final Method unblockChannelLocal;
+   public static final Method unblockChannelMethodLocal;
 =

    public static final Method putForExternalReadMethodLocal;
 =

@@ -278,8 +283,8 @@
          moveMethodLocal =3D CacheImpl.class.getDeclaredMethod("_move", Fq=
n.class, Fqn.class);
 =

          // ------------ Channel BLOCK event =

-         blockChannelLocal =3D CacheImpl.class.getDeclaredMethod("_block");
-         unblockChannelLocal =3D CacheImpl.class.getDeclaredMethod("_unblo=
ck");
+         blockChannelMethodLocal =3D CacheImpl.class.getDeclaredMethod("_b=
lock");
+         unblockChannelMethodLocal =3D CacheImpl.class.getDeclaredMethod("=
_unblock");
 =

          // ------------ version-aware methods - see JBCACHE-843
          putDataVersionedMethodLocal =3D CacheImpl.class.getDeclaredMethod=
("_put", GlobalTransaction.class, Fqn.class, Map.class, boolean.class, Data=
Version.class);
@@ -298,59 +303,92 @@
          throw new ExceptionInInitializerError(e);
       }
 =

-      methods.put(putDataMethodLocal_id, putDataMethodLocal);
-      methods.put(putDataEraseMethodLocal_id, putDataEraseMethodLocal);
-      methods.put(putKeyValMethodLocal_id, putKeyValMethodLocal);
-      methods.put(removeNodeMethodLocal_id, removeNodeMethodLocal);
-      methods.put(removeKeyMethodLocal_id, removeKeyMethodLocal);
-      methods.put(removeDataMethodLocal_id, removeDataMethodLocal);
-      methods.put(evictNodeMethodLocal_id, evictNodeMethodLocal);
-      methods.put(evictVersionedNodeMethodLocal_id, evictVersionedNodeMeth=
odLocal);
-      methods.put(prepareMethod_id, prepareMethod);
-      methods.put(commitMethod_id, commitMethod);
-      methods.put(rollbackMethod_id, rollbackMethod);
-      methods.put(replicateMethod_id, replicateMethod);
-      methods.put(replicateAllMethod_id, replicateAllMethod);
-      methods.put(addChildMethodLocal_id, addChildMethodLocal);
-      methods.put(existsMethod_id, existsMethod);
-      methods.put(releaseAllLocksMethodLocal_id, releaseAllLocksMethodLoca=
l);
-      methods.put(optimisticPrepareMethod_id, optimisticPrepareMethod);
-      methods.put(clusteredGetMethod_id, clusteredGetMethod);
-      methods.put(getChildrenNamesMethodLocal_id, getChildrenNamesMethodLo=
cal);
-      methods.put(getDataMapMethodLocal_id, getDataMapMethodLocal);
-      methods.put(getKeysMethodLocal_id, getKeysMethodLocal);
-      methods.put(getKeyValueMethodLocal_id, getKeyValueMethodLocal);
-      methods.put(remoteAnnounceBuddyPoolNameMethod_id, remoteAnnounceBudd=
yPoolNameMethod);
-      methods.put(remoteAssignToBuddyGroupMethod_id, remoteAssignToBuddyGr=
oupMethod);
-      methods.put(remoteRemoveFromBuddyGroupMethod_id, remoteRemoveFromBud=
dyGroupMethod);
+      methods[putDataMethodLocal_id] =3D putDataMethodLocal;
+      methods[putDataEraseMethodLocal_id] =3D putDataEraseMethodLocal;
+      methods[putKeyValMethodLocal_id] =3D putKeyValMethodLocal;
+      methods[removeNodeMethodLocal_id] =3D removeNodeMethodLocal;
+      methods[removeKeyMethodLocal_id] =3D removeKeyMethodLocal;
+      methods[removeDataMethodLocal_id] =3D removeDataMethodLocal;
+      methods[evictNodeMethodLocal_id] =3D evictNodeMethodLocal;
+      methods[evictVersionedNodeMethodLocal_id] =3D evictVersionedNodeMeth=
odLocal;
+      methods[prepareMethod_id] =3D prepareMethod;
+      methods[commitMethod_id] =3D commitMethod;
+      methods[rollbackMethod_id] =3D rollbackMethod;
+      methods[replicateMethod_id] =3D replicateMethod;
+      methods[replicateAllMethod_id] =3D replicateAllMethod;
+      methods[addChildMethodLocal_id] =3D addChildMethodLocal;
+      methods[existsMethod_id] =3D existsMethod;
+      methods[releaseAllLocksMethodLocal_id] =3D releaseAllLocksMethodLoca=
l;
+      methods[optimisticPrepareMethod_id] =3D optimisticPrepareMethod;
+      methods[clusteredGetMethod_id] =3D clusteredGetMethod;
+      methods[getChildrenNamesMethodLocal_id] =3D getChildrenNamesMethodLo=
cal;
+      methods[getDataMapMethodLocal_id] =3D getDataMapMethodLocal;
+      methods[getKeysMethodLocal_id] =3D getKeysMethodLocal;
+      methods[getKeyValueMethodLocal_id] =3D getKeyValueMethodLocal;
+      methods[remoteAnnounceBuddyPoolNameMethod_id] =3D remoteAnnounceBudd=
yPoolNameMethod;
+      methods[remoteAssignToBuddyGroupMethod_id] =3D remoteAssignToBuddyGr=
oupMethod;
+      methods[remoteRemoveFromBuddyGroupMethod_id] =3D remoteRemoveFromBud=
dyGroupMethod;
       /* Mappings added as they did not exist before refactoring */
-      methods.put(getNodeMethodLocal_id, getNodeMethodLocal);
-      methods.put(printMethodLocal_id, printMethodLocal);
-      methods.put(lockMethodLocal_id, lockMethodLocal);
+      methods[getNodeMethodLocal_id] =3D getNodeMethodLocal;
+      methods[printMethodLocal_id] =3D printMethodLocal;
+      methods[lockMethodLocal_id] =3D lockMethodLocal;
 =

-      methods.put(dataGravitationCleanupMethod_id, dataGravitationCleanupM=
ethod);
-      methods.put(dataGravitationMethod_id, dataGravitationMethod);
+      methods[dataGravitationCleanupMethod_id] =3D dataGravitationCleanupM=
ethod;
+      methods[dataGravitationMethod_id] =3D dataGravitationMethod;
 =

-      methods.put(moveMethodLocal_id, moveMethodLocal);
-      methods.put(blockChannelMethodLocal_id, blockChannelLocal);
-      methods.put(unblockChannelMethodLocal_id, unblockChannelLocal);
+      methods[moveMethodLocal_id] =3D moveMethodLocal;
+      methods[blockChannelMethodLocal_id] =3D blockChannelMethodLocal;
+      methods[unblockChannelMethodLocal_id] =3D unblockChannelMethodLocal;
 =

-      methods.put(putDataVersionedMethodLocal_id, putDataVersionedMethodLo=
cal);
-      methods.put(putDataEraseVersionedMethodLocal_id, putDataEraseVersion=
edMethodLocal);
-      methods.put(putKeyValVersionedMethodLocal_id, putKeyValVersionedMeth=
odLocal);
-      methods.put(removeDataVersionedMethodLocal_id, removeDataVersionedMe=
thodLocal);
-      methods.put(removeKeyVersionedMethodLocal_id, removeKeyVersionedMeth=
odLocal);
-      methods.put(removeNodeVersionedMethodLocal_id, removeNodeVersionedMe=
thodLocal);
+      methods[putDataVersionedMethodLocal_id] =3D putDataVersionedMethodLo=
cal;
+      methods[putDataEraseVersionedMethodLocal_id] =3D putDataEraseVersion=
edMethodLocal;
+      methods[putKeyValVersionedMethodLocal_id] =3D putKeyValVersionedMeth=
odLocal;
+      methods[removeDataVersionedMethodLocal_id] =3D removeDataVersionedMe=
thodLocal;
+      methods[removeKeyVersionedMethodLocal_id] =3D removeKeyVersionedMeth=
odLocal;
+      methods[removeNodeVersionedMethodLocal_id] =3D removeNodeVersionedMe=
thodLocal;
 =

-      methods.put(putForExternalReadVersionedMethodLocal_id, putForExterna=
lReadVersionedMethodLocal);
-      methods.put(putForExternalReadMethodLocal_id, putForExternalReadMeth=
odLocal);
+      methods[putForExternalReadVersionedMethodLocal_id] =3D putForExterna=
lReadVersionedMethodLocal;
+      methods[putForExternalReadMethodLocal_id] =3D putForExternalReadMeth=
odLocal;
 =

-      methods.put(invalidateMethodLocal_id, invalidateMethodLocal);
+      methods[invalidateMethodLocal_id] =3D invalidateMethodLocal;
 =

-      for (Integer id : methods.keySet())
+      for (int id =3D 0; id < methods.length; id++)
       {
-         methodIds.put(methods.get(id), id);
+         if (methods[id] !=3D null) methodIds.put(methods[id], id);
       }
+
+      putMethodIds.add(putDataMethodLocal_id);
+      putMethodIds.add(putDataEraseMethodLocal_id);
+      putMethodIds.add(putKeyValMethodLocal_id);
+      putMethodIds.add(putDataEraseVersionedMethodLocal_id);
+      putMethodIds.add(putDataVersionedMethodLocal_id);
+      putMethodIds.add(putKeyValVersionedMethodLocal_id);
+      putMethodIds.add(putForExternalReadMethodLocal_id);
+      putMethodIds.add(putForExternalReadVersionedMethodLocal_id);
+
+      crudMethodIds.addAll(putMethodIds);
+      crudMethodIds.add(removeNodeMethodLocal_id);
+      crudMethodIds.add(removeKeyMethodLocal_id);
+      crudMethodIds.add(removeDataMethodLocal_id);
+      crudMethodIds.add(dataGravitationCleanupMethod_id);
+      crudMethodIds.add(moveMethodLocal_id);
+      crudMethodIds.add(removeNodeVersionedMethodLocal_id);
+      crudMethodIds.add(removeKeyVersionedMethodLocal_id);
+      crudMethodIds.add(removeDataVersionedMethodLocal_id);
+
+
+      transactionLifecycleMethodIds.add(commitMethod_id);
+      transactionLifecycleMethodIds.add(rollbackMethod_id);
+      transactionLifecycleMethodIds.add(prepareMethod_id);
+      transactionLifecycleMethodIds.add(optimisticPrepareMethod_id);
+
+      buddyGroupOrganisationMethodIds.add(remoteAnnounceBuddyPoolNameMetho=
d_id);
+      buddyGroupOrganisationMethodIds.add(remoteAssignToBuddyGroupMethod_i=
d);
+      buddyGroupOrganisationMethodIds.add(remoteRemoveFromBuddyGroupMethod=
_id);
+
+      blockUnblockMethodIds.add(blockChannelMethodLocal_id);
+      blockUnblockMethodIds.add(unblockChannelMethodLocal_id);
+
    }
 =

    public static int lookupMethodId(Method method)
@@ -375,7 +413,7 @@
 =

    public static Method lookupMethod(int id)
    {
-      Method method =3D methods.get(id);
+      Method method =3D methods[id];
       if (method =3D=3D null)
       {
          if (log.isErrorEnabled())
@@ -392,39 +430,22 @@
     */
    public static boolean isCrudMethod(int id)
    {
-      return isPutMethod(id) ||
-            id =3D=3D removeNodeMethodLocal_id ||
-            id =3D=3D removeKeyMethodLocal_id ||
-            id =3D=3D removeDataMethodLocal_id ||
-            id =3D=3D dataGravitationCleanupMethod_id ||
-            id =3D=3D moveMethodLocal_id ||
-            id =3D=3D removeNodeVersionedMethodLocal_id ||
-            id =3D=3D removeKeyVersionedMethodLocal_id ||
-            id =3D=3D removeDataVersionedMethodLocal_id;
+      return crudMethodIds.contains(Integer.valueOf(id));
    }
 =

    public static boolean isTransactionLifecycleMethod(int id)
    {
-      // transactional lifecycle methods consist of just commit, rollback,=
 prepare and optimistic prepare.
-      return id =3D=3D commitMethod_id || id =3D=3D optimisticPrepareMetho=
d_id || id =3D=3D prepareMethod_id || id =3D=3D rollbackMethod_id;
+      return transactionLifecycleMethodIds.contains(id);
    }
 =

    public static boolean isBuddyGroupOrganisationMethod(int id)
    {
-      return id =3D=3D remoteAssignToBuddyGroupMethod_id || id =3D=3D remo=
teRemoveFromBuddyGroupMethod_id || id =3D=3D remoteAnnounceBuddyPoolNameMet=
hod_id;
+      return buddyGroupOrganisationMethodIds.contains(id);
    }
 =

    public static boolean isPutMethod(int id)
    {
-      return
-            id =3D=3D putDataMethodLocal_id ||
-                  id =3D=3D putDataEraseMethodLocal_id ||
-                  id =3D=3D putKeyValMethodLocal_id ||
-                  id =3D=3D putDataEraseVersionedMethodLocal_id ||
-                  id =3D=3D putDataVersionedMethodLocal_id ||
-                  id =3D=3D putKeyValVersionedMethodLocal_id ||
-                  id =3D=3D putForExternalReadMethodLocal_id ||
-                  id =3D=3D putForExternalReadVersionedMethodLocal_id;
+      return putMethodIds.contains(id);
    }
 =

    public static boolean isGetMethod(int methodId)
@@ -435,7 +456,7 @@
 =

    public static boolean isBlockUnblockMethod(int id)
    {
-      return id =3D=3D blockChannelMethodLocal_id || id =3D=3D unblockChan=
nelMethodLocal_id;
+      return blockUnblockMethodIds.contains(id);
    }
 =

    /**
@@ -443,34 +464,7 @@
     */
    public static Method getVersionedMethod(int methodId)
    {
-      if (isCrudMethod(methodId))
-      {
-         switch (methodId)
-         {
-            case putForExternalReadMethodLocal_id:
-               return putForExternalReadVersionedMethodLocal;
-            case putDataEraseMethodLocal_id:
-               return putDataEraseVersionedMethodLocal;
-            case putDataMethodLocal_id:
-               return putDataVersionedMethodLocal;
-            case putKeyValMethodLocal_id:
-               return putKeyValVersionedMethodLocal;
-            case removeDataMethodLocal_id:
-               return removeDataVersionedMethodLocal;
-            case removeKeyMethodLocal_id:
-               return removeKeyVersionedMethodLocal;
-            case removeNodeMethodLocal_id:
-               return removeNodeVersionedMethodLocal;
-            case moveMethodLocal_id:
-               return moveMethodLocal;
-            default:
-               throw new CacheException("Unrecognised method id " + method=
Id);
-         }
-      }
-      else
-      {
-         throw new CacheException("Attempting to look up a versioned equiv=
alent of a non-crud method");
-      }
+      return methods[getVersionedMethodId(methodId)];
    }
 =

    /**
@@ -478,26 +472,48 @@
     */
    public static Method getUnversionedMethod(int methodId)
    {
+      return methods[getUnversionedMethodId(methodId)];
+   }
+
+
+   public static boolean isDataGravitationMethod(int methodId)
+   {
+      return methodId =3D=3D MethodDeclarations.dataGravitationCleanupMeth=
od_id || methodId =3D=3D MethodDeclarations.dataGravitationMethod_id;
+   }
+
+   /**
+    * Tests whether remote calls to this method should return the value to=
 the caller or just return a null (more efficient if the caller won't use t=
his value anyway)
+    *
+    * @param methodId
+    * @return true if the caller expects the value to come back.
+    */
+   public static boolean returnValueForRemoteCall(int methodId)
+   {
+      return methodsThatNeedToReturnValuesToRemoteCallers.contains(methodI=
d);
+   }
+
+   public static int getUnversionedMethodId(int methodId)
+   {
       if (isCrudMethod(methodId))
       {
          switch (methodId)
          {
             case putForExternalReadVersionedMethodLocal_id:
-               return putForExternalReadMethodLocal;
+               return putForExternalReadMethodLocal_id;
             case putDataEraseVersionedMethodLocal_id:
-               return putDataEraseMethodLocal;
+               return putDataEraseMethodLocal_id;
             case putDataVersionedMethodLocal_id:
-               return putDataMethodLocal;
+               return putDataMethodLocal_id;
             case putKeyValVersionedMethodLocal_id:
-               return putKeyValMethodLocal;
+               return putKeyValMethodLocal_id;
             case removeDataVersionedMethodLocal_id:
-               return removeDataMethodLocal;
+               return removeDataMethodLocal_id;
             case removeKeyVersionedMethodLocal_id:
-               return removeKeyMethodLocal;
+               return removeKeyMethodLocal_id;
             case removeNodeVersionedMethodLocal_id:
-               return removeNodeMethodLocal;
+               return removeNodeMethodLocal_id;
             case moveMethodLocal_id:
-               return moveMethodLocal;
+               return moveMethodLocal_id;
             default:
                throw new CacheException("Unrecognised method id " + method=
Id);
          }
@@ -508,21 +524,36 @@
       }
    }
 =

-
-   public static boolean isDataGravitationMethod(int methodId)
+   public static int getVersionedMethodId(int methodId)
    {
-      return methodId =3D=3D MethodDeclarations.dataGravitationCleanupMeth=
od_id || methodId =3D=3D MethodDeclarations.dataGravitationMethod_id;
+      if (isCrudMethod(methodId))
+      {
+         switch (methodId)
+         {
+            case putForExternalReadMethodLocal_id:
+               return putForExternalReadVersionedMethodLocal_id;
+            case putDataEraseMethodLocal_id:
+               return putDataEraseVersionedMethodLocal_id;
+            case putDataMethodLocal_id:
+               return putDataVersionedMethodLocal_id;
+            case putKeyValMethodLocal_id:
+               return putKeyValVersionedMethodLocal_id;
+            case removeDataMethodLocal_id:
+               return removeDataVersionedMethodLocal_id;
+            case removeKeyMethodLocal_id:
+               return removeKeyVersionedMethodLocal_id;
+            case removeNodeMethodLocal_id:
+               return removeNodeVersionedMethodLocal_id;
+            case moveMethodLocal_id:
+               return moveMethodLocal_id;
+            default:
+               throw new CacheException("Unrecognised method id " + method=
Id);
+         }
+      }
+      else
+      {
+         throw new CacheException("Attempting to look up a versioned equiv=
alent of a non-crud method");
+      }
    }
-
-   /**
-    * Tests whether remote calls to this method should return the value to=
 the caller or just return a null (more efficient if the caller won't use t=
his value anyway)
-    *
-    * @param methodId
-    * @return true if the caller expects the value to come back.
-    */
-   public static boolean returnValueForRemoteCall(int methodId)
-   {
-      return methodsThatNeedToReturnValuesToRemoteCallers.contains(methodI=
d);
-   }
 }
 =


Modified: core/trunk/src/main/java/org/jboss/cache/marshall/VersionAwareMar=
shaller.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/java/org/jboss/cache/marshall/VersionAwareMarshalle=
r.java	2008-01-04 09:45:35 UTC (rev 4976)
+++ core/trunk/src/main/java/org/jboss/cache/marshall/VersionAwareMarshalle=
r.java	2008-01-04 12:19:46 UTC (rev 4977)
@@ -53,7 +53,8 @@
          String marshallerClass =3D configuration.getMarshallerClass();
          if (marshallerClass !=3D null)
          {
-            log.trace("Cache marshaller implementation specified as " + ma=
rshallerClass + ".  Overriding any version strings passed in. ");
+            if (trace)
+               log.trace("Cache marshaller implementation specified as " +=
 marshallerClass + ".  Overriding any version strings passed in. ");
             try
             {
                defaultMarshaller =3D (Marshaller) Util.loadClass(marshalle=
rClass).newInstance();
@@ -75,7 +76,7 @@
       }
       else
       {
-         log.debug("Using the marshaller passed in - " + defaultMarshaller=
);
+         if (log.isDebugEnabled()) log.debug("Using the marshaller passed =
in - " + defaultMarshaller);
          versionInt =3D getCustomMarshallerVersionInt();
          marshallers.put(versionInt, defaultMarshaller);
       }
@@ -144,7 +145,7 @@
       // based on the default marshaller, construct an object output strea=
m based on what's compatible.
       out =3D ObjectSerializationFactory.createObjectOutputStream(bos);
       out.writeShort(versionInt);
-      if (log.isTraceEnabled()) log.trace("Wrote version " + versionInt);
+      if (trace) log.trace("Wrote version " + versionInt);
 =

       //now marshall the contents of the object
       defaultMarshaller.objectToObjectStream(obj, out);
@@ -163,7 +164,7 @@
       {
          in =3D ObjectSerializationFactory.createObjectInputStream(buf);
          versionId =3D in.readShort();
-         if (log.isTraceEnabled()) log.trace("Read version " + versionId);
+         if (trace) log.trace("Read version " + versionId);
       }
       catch (Exception e)
       {
@@ -185,7 +186,7 @@
       {
          in =3D ObjectSerializationFactory.createObjectInputStream(is);
          versionId =3D in.readShort();
-         if (log.isTraceEnabled()) log.trace("Read version " + versionId);
+         if (trace) log.trace("Read version " + versionId);
       }
       catch (Exception e)
       {
@@ -201,7 +202,7 @@
    public void objectToObjectStream(Object obj, ObjectOutputStream out, Fq=
n region) throws Exception
    {
       out.writeShort(versionInt);
-      if (log.isTraceEnabled()) log.trace("Wrote version " + versionInt);
+      if (trace) log.trace("Wrote version " + versionInt);
       defaultMarshaller.objectToObjectStream(obj, out, region);
    }
 =

@@ -232,7 +233,7 @@
          case VERSION_210:
             knownVersion =3D true;
          default:
-            if (!knownVersion)
+            if (!knownVersion && log.isWarnEnabled())
                log.warn("Unknown replication version String.  Falling back=
 to the default marshaller installed.");
             marshaller =3D marshallers.get(VERSION_210);
             if (marshaller =3D=3D null)
@@ -251,7 +252,7 @@
    public void objectToObjectStream(Object obj, ObjectOutputStream out) th=
rows Exception
    {
       out.writeShort(versionInt);
-      if (log.isTraceEnabled()) log.trace("Wrote version " + versionInt);
+      if (trace) log.trace("Wrote version " + versionInt);
       defaultMarshaller.objectToObjectStream(obj, out);
    }
 =

@@ -262,7 +263,7 @@
       try
       {
          versionId =3D in.readShort();
-         if (log.isTraceEnabled()) log.trace("Read version " + versionId);
+         if (trace) log.trace("Read version " + versionId);
       }
       catch (Exception e)
       {

Modified: core/trunk/src/main/java/org/jboss/cache/util/BitEncodedIntegerSe=
t.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/java/org/jboss/cache/util/BitEncodedIntegerSet.java=
	2008-01-04 09:45:35 UTC (rev 4976)
+++ core/trunk/src/main/java/org/jboss/cache/util/BitEncodedIntegerSet.java=
	2008-01-04 12:19:46 UTC (rev 4977)
@@ -89,4 +89,14 @@
    {
       return "BitEncodedSet (encoded as: " + Long.toBinaryString(encoded) =
+ ")";
    }
+
+   /**
+    * Adds all elements of another BitEncodedIntegerSet to the current set.
+    *
+    * @param otherSet other set to add
+    */
+   public void addAll(BitEncodedIntegerSet otherSet)
+   {
+      encoded |=3D otherSet.encoded;
+   }
 }

Modified: core/trunk/src/test/java/org/jboss/cache/buddyreplication/BuddyMa=
nagerTest.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/test/java/org/jboss/cache/buddyreplication/BuddyManagerT=
est.java	2008-01-04 09:45:35 UTC (rev 4976)
+++ core/trunk/src/test/java/org/jboss/cache/buddyreplication/BuddyManagerT=
est.java	2008-01-04 12:19:46 UTC (rev 4977)
@@ -6,13 +6,6 @@
  */
 package org.jboss.cache.buddyreplication;
 =

-import static org.testng.AssertJUnit.assertEquals;
-import static org.testng.AssertJUnit.assertNull;
-import static org.testng.AssertJUnit.assertTrue;
-
-import java.util.ArrayList;
-import java.util.List;
-
 import org.jboss.cache.Fqn;
 import org.jboss.cache.config.BuddyReplicationConfig;
 import org.jboss.cache.factories.XmlConfigurationParser;
@@ -20,9 +13,13 @@
 import org.jboss.cache.marshall.MethodCallFactory;
 import org.jboss.cache.marshall.MethodDeclarations;
 import org.jboss.cache.xml.XmlHelper;
+import static org.testng.AssertJUnit.*;
 import org.testng.annotations.Test;
 import org.w3c.dom.Element;
 =

+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * Tests the BuddyManager class
  *
@@ -39,8 +36,8 @@
    public void testConstruction1() throws Exception
    {
       String xmlConfig =3D "<config><buddyReplicationEnabled>true</buddyRe=
plicationEnabled>\n" +
-              "          <buddyLocatorProperties>numBuddies =3D 3</buddyLo=
catorProperties>\n" +
-              "          <buddyPoolName>groupOne</buddyPoolName></config>";
+            "          <buddyLocatorProperties>numBuddies =3D 3</buddyLoca=
torProperties>\n" +
+            "          <buddyPoolName>groupOne</buddyPoolName></config>";
       Element element =3D XmlHelper.stringToElement(xmlConfig);
       BuddyReplicationConfig config =3D XmlConfigurationParser.parseBuddyR=
eplicationConfig(element);
       BuddyManager mgr =3D new BuddyManager(config);
@@ -61,9 +58,9 @@
    public void testConstruction2() throws Exception
    {
       String xmlConfig =3D "<config><buddyReplicationEnabled>true</buddyRe=
plicationEnabled>\n" +
-              "          <buddyLocatorClass>org.i.dont.exist.PhantomBuddyL=
ocator</buddyLocatorClass>\n" +
-              "          <buddyLocatorProperties>numBuddies =3D 3</buddyLo=
catorProperties>\n" +
-              "          <buddyPoolName>groupOne</buddyPoolName></config>";
+            "          <buddyLocatorClass>org.i.dont.exist.PhantomBuddyLoc=
ator</buddyLocatorClass>\n" +
+            "          <buddyLocatorProperties>numBuddies =3D 3</buddyLoca=
torProperties>\n" +
+            "          <buddyPoolName>groupOne</buddyPoolName></config>";
       Element element =3D XmlHelper.stringToElement(xmlConfig);
       BuddyReplicationConfig config =3D XmlConfigurationParser.parseBuddyR=
eplicationConfig(element);
       BuddyManager mgr =3D new BuddyManager(config);
@@ -135,8 +132,8 @@
    {
       Fqn fqn1 =3D Fqn.fromString("/hello/world");
 =

-      MethodCall call1 =3D MethodCallFactory.create(MethodDeclarations.put=
KeyValMethodLocal, fqn1, "key", "value");
-      MethodCall call2 =3D MethodCallFactory.create(MethodDeclarations.rep=
licateMethod, call1);
+      MethodCall call1 =3D MethodCallFactory.create(MethodDeclarations.put=
KeyValMethodLocal_id, fqn1, "key", "value");
+      MethodCall call2 =3D MethodCallFactory.create(MethodDeclarations.rep=
licateMethod_id, call1);
 =

       BuddyManager bm =3D createBasicBuddyManager();
 =

@@ -153,8 +150,8 @@
    {
       Fqn fqn1 =3D Fqn.ROOT;
 =

-      MethodCall call1 =3D MethodCallFactory.create(MethodDeclarations.put=
KeyValMethodLocal, fqn1, "key", "value");
-      MethodCall call2 =3D MethodCallFactory.create(MethodDeclarations.rep=
licateMethod, call1);
+      MethodCall call1 =3D MethodCallFactory.create(MethodDeclarations.put=
KeyValMethodLocal_id, fqn1, "key", "value");
+      MethodCall call2 =3D MethodCallFactory.create(MethodDeclarations.rep=
licateMethod_id, call1);
 =

       BuddyManager bm =3D createBasicBuddyManager();
 =

@@ -173,17 +170,17 @@
       Fqn fqn3 =3D Fqn.fromString("/hello/again");
       Fqn fqn4 =3D Fqn.fromString("/buddy/replication");
 =

-      MethodCall call1 =3D MethodCallFactory.create(MethodDeclarations.put=
KeyValMethodLocal, fqn1, "key", "value");
-      MethodCall call2 =3D MethodCallFactory.create(MethodDeclarations.put=
KeyValMethodLocal, fqn2, "key", "value");
-      MethodCall call3 =3D MethodCallFactory.create(MethodDeclarations.put=
KeyValMethodLocal, fqn3, "key", "value");
-      MethodCall call4 =3D MethodCallFactory.create(MethodDeclarations.put=
KeyValMethodLocal, fqn4, "key", "value");
+      MethodCall call1 =3D MethodCallFactory.create(MethodDeclarations.put=
KeyValMethodLocal_id, fqn1, "key", "value");
+      MethodCall call2 =3D MethodCallFactory.create(MethodDeclarations.put=
KeyValMethodLocal_id, fqn2, "key", "value");
+      MethodCall call3 =3D MethodCallFactory.create(MethodDeclarations.put=
KeyValMethodLocal_id, fqn3, "key", "value");
+      MethodCall call4 =3D MethodCallFactory.create(MethodDeclarations.put=
KeyValMethodLocal_id, fqn4, "key", "value");
       List<MethodCall> list =3D new ArrayList<MethodCall>();
       list.add(call1);
       list.add(call2);
       list.add(call3);
       list.add(call4);
 =

-      MethodCall call5 =3D MethodCallFactory.create(MethodDeclarations.rep=
licateAllMethod, list);
+      MethodCall call5 =3D MethodCallFactory.create(MethodDeclarations.rep=
licateAllMethod_id, list);
 =

       BuddyManager bm =3D createBasicBuddyManager();
 =

@@ -200,7 +197,8 @@
       assertEquals(expected + "/buddy/replication", ((MethodCall) l.get(i)=
).getArgs()[0].toString());
    }
 =

-   public void testGetActualFqn() {
+   public void testGetActualFqn()
+   {
       Fqn<String> x =3D new Fqn<String>("x");
       Fqn backup =3D BuddyManager.getBackupFqn("y", x);
       assertEquals(x, BuddyManager.getActualFqn(backup));

Modified: core/trunk/src/test/java/org/jboss/cache/interceptors/EvictionInt=
erceptorTest.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/test/java/org/jboss/cache/interceptors/EvictionIntercept=
orTest.java	2008-01-04 09:45:35 UTC (rev 4976)
+++ core/trunk/src/test/java/org/jboss/cache/interceptors/EvictionIntercept=
orTest.java	2008-01-04 12:19:46 UTC (rev 4977)
@@ -93,7 +93,7 @@
    {
       // make sure node that doesn't exist does not result in a node visit=
 event.
 =

-      MethodCall mc =3D MethodCallFactory.create(MethodDeclarations.getNod=
eMethodLocal,
+      MethodCall mc =3D MethodCallFactory.create(MethodDeclarations.getNod=
eMethodLocal_id,
             Fqn.fromString(fqn1));
       interceptor.invoke(InvocationContext.fromMethodCall(mc));
       Region regionABC =3D regionManager.getRegion(fqn1, false);
@@ -110,7 +110,7 @@
       assertEquals("value", node.getDirect("key"));
 =

 =

-      mc =3D MethodCallFactory.create(MethodDeclarations.getNodeMethodLoca=
l,
+      mc =3D MethodCallFactory.create(MethodDeclarations.getNodeMethodLoca=
l_id,
             Fqn.fromString(fqn1));
       interceptor.invoke(InvocationContext.fromMethodCall(mc));
 =

@@ -120,7 +120,7 @@
       assertEquals(fqn1, event.getFqn().toString());
       assertNull(regionABC.takeLastEventNode());
 =

-      mc =3D MethodCallFactory.create(MethodDeclarations.getNodeMethodLoca=
l,
+      mc =3D MethodCallFactory.create(MethodDeclarations.getNodeMethodLoca=
l_id,
             Fqn.fromString(fqn2));
       interceptor.invoke(InvocationContext.fromMethodCall(mc));
 =

@@ -130,7 +130,7 @@
       assertEquals(fqn2, event.getFqn().toString());
       assertNull(regionAB.takeLastEventNode());
 =

-      mc =3D MethodCallFactory.create(MethodDeclarations.getDataMapMethodL=
ocal, Fqn.fromString(fqn3));
+      mc =3D MethodCallFactory.create(MethodDeclarations.getDataMapMethodL=
ocal_id, Fqn.fromString(fqn3));
       interceptor.invoke(InvocationContext.fromMethodCall(mc));
       Region regionABD =3D regionManager.getRegion(fqn3, false);
       event =3D regionABD.takeLastEventNode();
@@ -141,7 +141,7 @@
       for (int i =3D 0; i < 10; i++)
       {
          Fqn fqn =3D Fqn.fromString(fqn3);
-         mc =3D MethodCallFactory.create(MethodDeclarations.getNodeMethodL=
ocal, fqn);
+         mc =3D MethodCallFactory.create(MethodDeclarations.getNodeMethodL=
ocal_id, fqn);
          interceptor.invoke(InvocationContext.fromMethodCall(mc));
       }
 =

@@ -156,7 +156,7 @@
       assertNull(regionManager.getRegion(fqn3, false).takeLastEventNode());
 =

       // check null handling.
-      mc =3D MethodCallFactory.create(MethodDeclarations.getDataMapMethodL=
ocal, new Object[]{null});
+      mc =3D MethodCallFactory.create(MethodDeclarations.getDataMapMethodL=
ocal_id, new Object[]{null});
       interceptor.invoke(InvocationContext.fromMethodCall(mc));
 =

    }
@@ -200,7 +200,7 @@
       // aka MarshRegion.
       Fqn fqn =3D Fqn.fromString(fqn4);
       Object key =3D "key";
-      MethodCall mc =3D MethodCallFactory.create(MethodDeclarations.getKey=
ValueMethodLocal, fqn, key, false);
+      MethodCall mc =3D MethodCallFactory.create(MethodDeclarations.getKey=
ValueMethodLocal_id, fqn, key, false);
       interceptor.invoke(InvocationContext.fromMethodCall(mc));
       Region region =3D regionManager.getRegion(fqn.toString(), false);
       assertNull(region.takeLastEventNode());
@@ -208,13 +208,13 @@
       // add the node but try to get on a null element should result in no=
 cache events being added to Region.
       putQuietly(fqn, "wrongkey", "");
 =

-      mc =3D MethodCallFactory.create(MethodDeclarations.getKeyValueMethod=
Local, fqn, key, false);
+      mc =3D MethodCallFactory.create(MethodDeclarations.getKeyValueMethod=
Local_id, fqn, key, false);
       interceptor.invoke(InvocationContext.fromMethodCall(mc));
       assertNull(region.takeLastEventNode());
 =

       // now make sure if we try to get on the node/key we just created in=
 cache, that this DOES add a EvictedEventNode to
       // the MarshRegion.
-      mc =3D MethodCallFactory.create(MethodDeclarations.getKeyValueMethod=
Local, fqn, "wrongkey", false);
+      mc =3D MethodCallFactory.create(MethodDeclarations.getKeyValueMethod=
Local_id, fqn, "wrongkey", false);
       interceptor.invoke(InvocationContext.fromMethodCall(mc));
       EvictedEventNode event =3D region.takeLastEventNode();
       assertEquals(fqn, event.getFqn());
@@ -226,7 +226,7 @@
 =

       // test on element granularity configured node.
       fqn =3D Fqn.fromString(fqn4);
-      mc =3D MethodCallFactory.create(MethodDeclarations.getKeyValueMethod=
Local, fqn, key, false);
+      mc =3D MethodCallFactory.create(MethodDeclarations.getKeyValueMethod=
Local_id, fqn, key, false);
       interceptor.invoke(InvocationContext.fromMethodCall(mc));
 =

       region =3D regionManager.getRegion(fqn.toString(), false);
@@ -244,7 +244,7 @@
 =

          putQuietly("/d/e/g", key, "");
 =

-         mc =3D MethodCallFactory.create(MethodDeclarations.getKeyValueMet=
hodLocal, fqn, key, true);
+         mc =3D MethodCallFactory.create(MethodDeclarations.getKeyValueMet=
hodLocal_id, fqn, key, true);
          interceptor.invoke(InvocationContext.fromMethodCall(mc));
       }
 =

@@ -260,7 +260,7 @@
       putQuietly("/a/b/c", key, "");
       fqn =3D Fqn.fromString("/a/b/c");
 =

-      mc =3D MethodCallFactory.create(MethodDeclarations.getKeyValueMethod=
Local, fqn, key, false);
+      mc =3D MethodCallFactory.create(MethodDeclarations.getKeyValueMethod=
Local_id, fqn, key, false);
       interceptor.invoke(InvocationContext.fromMethodCall(mc));
 =

       region =3D regionManager.getRegion(fqn.toString(), false);
@@ -276,7 +276,7 @@
 =

          putQuietly(fqn, key, "");
 =

-         mc =3D MethodCallFactory.create(MethodDeclarations.getKeyValueMet=
hodLocal, fqn, key, true);
+         mc =3D MethodCallFactory.create(MethodDeclarations.getKeyValueMet=
hodLocal_id, fqn, key, true);
          interceptor.invoke(InvocationContext.fromMethodCall(mc));
       }
 =

@@ -301,7 +301,7 @@
       // this region is node granularity
       Fqn fqn =3D Fqn.fromString("/a/b/c");
 =

-      MethodCall mc =3D MethodCallFactory.create(MethodDeclarations.putDat=
aMethodLocal, null, fqn, data, false);
+      MethodCall mc =3D MethodCallFactory.create(MethodDeclarations.putDat=
aMethodLocal_id, null, fqn, data, false);
       interceptor.invoke(InvocationContext.fromMethodCall(mc));
 =

       Region region =3D regionManager.getRegion(fqn.toString(), false);
@@ -322,7 +322,7 @@
 =

       for (int i =3D 0; i < 100; i++)
       {
-         mc =3D MethodCallFactory.create(MethodDeclarations.putKeyValMetho=
dLocal, null, fqn, i,
+         mc =3D MethodCallFactory.create(MethodDeclarations.putKeyValMetho=
dLocal_id, null, fqn, i,
                "value", false);
          interceptor.invoke(InvocationContext.fromMethodCall(mc));
 =

@@ -340,7 +340,7 @@
       assertNull(region.takeLastEventNode());
 =

       fqn =3D Fqn.fromString("/a/b");
-      mc =3D MethodCallFactory.create(MethodDeclarations.putDataEraseMetho=
dLocal, null, fqn, data, false, false);
+      mc =3D MethodCallFactory.create(MethodDeclarations.putDataEraseMetho=
dLocal_id, null, fqn, data, false, false);
       interceptor.invoke(InvocationContext.fromMethodCall(mc));
       event =3D regionManager.getRegion(fqn.toString(), false).takeLastEve=
ntNode();
       assertFalse(event.isResetElementCount());
@@ -359,7 +359,7 @@
          assertEquals(i, node.getDirect(i));
       }
 =

-      mc =3D MethodCallFactory.create(MethodDeclarations.putDataEraseMetho=
dLocal, null, fqn, data, false, true);
+      mc =3D MethodCallFactory.create(MethodDeclarations.putDataEraseMetho=
dLocal_id, null, fqn, data, false, true);
       interceptor.invoke(InvocationContext.fromMethodCall(mc));
       event =3D regionManager.getRegion(fqn.toString(), false).takeLastEve=
ntNode();
       assertEquals(NodeEventType.ADD_NODE_EVENT, event.getEventType());
@@ -388,7 +388,7 @@
       Object key =3D "key";
       Object value =3D "value";
 =

-      MethodCall mc =3D MethodCallFactory.create(MethodDeclarations.putKey=
ValMethodLocal,
+      MethodCall mc =3D MethodCallFactory.create(MethodDeclarations.putKey=
ValMethodLocal_id,
             null, fqn, key, value, false);
       interceptor.invoke(InvocationContext.fromMethodCall(mc));
       assertEquals("value", cache.peek(fqn, false, false).getDirect(key));
@@ -399,7 +399,7 @@
       assertEquals("value", cache.peek(fqn, false, false).getDirect(key));
       assertNull(region.takeLastEventNode());
 =

-      mc =3D MethodCallFactory.create(MethodDeclarations.putKeyValMethodLo=
cal,
+      mc =3D MethodCallFactory.create(MethodDeclarations.putKeyValMethodLo=
cal_id,
             null, fqn, key, value, false);
       interceptor.invoke(InvocationContext.fromMethodCall(mc));
       assertEquals("value", cache.peek(fqn, false, false).getDirect(key));
@@ -418,7 +418,7 @@
       putQuietly(fqn, "a", "b");
       putQuietly(fqn, "b", "c");
 =

-      MethodCall mc =3D MethodCallFactory.create(MethodDeclarations.remove=
DataMethodLocal, null, fqn, false);
+      MethodCall mc =3D MethodCallFactory.create(MethodDeclarations.remove=
DataMethodLocal_id, null, fqn, false);
       interceptor.invoke(InvocationContext.fromMethodCall(mc));
 =

       assertEquals(0, cache.peek(fqn, false, false).getDataDirect().size()=
);
@@ -428,7 +428,7 @@
       assertEquals(fqn, event.getFqn());
       assertNull(region.takeLastEventNode());
 =

-      mc =3D MethodCallFactory.create(MethodDeclarations.removeNodeMethodL=
ocal, null, fqn, false);
+      mc =3D MethodCallFactory.create(MethodDeclarations.removeNodeMethodL=
ocal_id, null, fqn, false);
       interceptor.invoke(InvocationContext.fromMethodCall(mc));
 =

       assertNull(cache.peek(fqn, false, false));
@@ -444,7 +444,7 @@
       putQuietly(fqn, "a", "b");
       putQuietly(fqn, "b", "c");
 =

-      MethodCall mc =3D MethodCallFactory.create(MethodDeclarations.remove=
KeyMethodLocal,
+      MethodCall mc =3D MethodCallFactory.create(MethodDeclarations.remove=
KeyMethodLocal_id,
             null, fqn, "a", false);
       interceptor.invoke(InvocationContext.fromMethodCall(mc));
 =

@@ -456,7 +456,7 @@
       assertEquals(1, event.getElementDifference());
       assertNull(region.takeLastEventNode());
 =

-      mc =3D MethodCallFactory.create(MethodDeclarations.removeKeyMethodLo=
cal,
+      mc =3D MethodCallFactory.create(MethodDeclarations.removeKeyMethodLo=
cal_id,
             null, fqn, "b", false);
       interceptor.invoke(InvocationContext.fromMethodCall(mc));
 =

@@ -467,7 +467,7 @@
       assertEquals(1, event.getElementDifference());
       assertNull(region.takeLastEventNode());
 =

-      mc =3D MethodCallFactory.create(MethodDeclarations.removeKeyMethodLo=
cal,
+      mc =3D MethodCallFactory.create(MethodDeclarations.removeKeyMethodLo=
cal_id,
             null, fqn, "b", false);
       interceptor.invoke(InvocationContext.fromMethodCall(mc));
 =

@@ -486,7 +486,7 @@
       // this region is node granularity
       Fqn fqn =3D Fqn.fromString("/a/b/c");
 =

-      MethodCall mc =3D MethodCallFactory.create(MethodDeclarations.putDat=
aMethodLocal, null, fqn, data, false);
+      MethodCall mc =3D MethodCallFactory.create(MethodDeclarations.putDat=
aMethodLocal_id, null, fqn, data, false);
       interceptor.invoke(InvocationContext.fromMethodCall(mc));
 =

       Region region =3D regionManager.getRegion(fqn.toString(), false);
@@ -497,7 +497,7 @@
       assertEquals(100, event.getElementDifference());
       assertNull(region.takeLastEventNode());
 =

-      mc =3D MethodCallFactory.create(MethodDeclarations.getNodeMethodLoca=
l,
+      mc =3D MethodCallFactory.create(MethodDeclarations.getNodeMethodLoca=
l_id,
             fqn);
       interceptor.invoke(InvocationContext.fromMethodCall(mc));
       event =3D region.takeLastEventNode();
@@ -505,7 +505,7 @@
       assertEquals(fqn, event.getFqn());
       assertNull(region.takeLastEventNode());
 =

-      mc =3D MethodCallFactory.create(MethodDeclarations.removeNodeMethodL=
ocal, null, fqn, false);
+      mc =3D MethodCallFactory.create(MethodDeclarations.removeNodeMethodL=
ocal_id, null, fqn, false);
       interceptor.invoke(InvocationContext.fromMethodCall(mc));
       assertNull(cache.getNode(fqn));
       event =3D region.takeLastEventNode();
@@ -515,7 +515,7 @@
 =

       Object key =3D "key";
       Object value =3D "value";
-      mc =3D MethodCallFactory.create(MethodDeclarations.putKeyValMethodLo=
cal,
+      mc =3D MethodCallFactory.create(MethodDeclarations.putKeyValMethodLo=
cal_id,
             null, fqn, key, value, false);
       interceptor.invoke(InvocationContext.fromMethodCall(mc));
       assertEquals("value", cache.peek(fqn, false, false).getDirect(key));
@@ -526,7 +526,7 @@
       assertEquals("value", cache.peek(fqn, false, false).getDirect(key));
       assertNull(region.takeLastEventNode());
 =

-      mc =3D MethodCallFactory.create(MethodDeclarations.getKeyValueMethod=
Local, fqn, key, false);
+      mc =3D MethodCallFactory.create(MethodDeclarations.getKeyValueMethod=
Local_id, fqn, key, false);
       interceptor.invoke(InvocationContext.fromMethodCall(mc));
       region =3D regionManager.getRegion(fqn.toString(), false);
       event =3D region.takeLastEventNode();
@@ -534,7 +534,7 @@
       assertEquals(fqn, event.getFqn());
       assertNull(region.takeLastEventNode());
 =

-      mc =3D MethodCallFactory.create(MethodDeclarations.removeKeyMethodLo=
cal,
+      mc =3D MethodCallFactory.create(MethodDeclarations.removeKeyMethodLo=
cal_id,
             null, fqn, key, false);
       interceptor.invoke(InvocationContext.fromMethodCall(mc));
 =


Modified: core/trunk/src/test/java/org/jboss/cache/marshall/ActiveInactiveT=
est.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/test/java/org/jboss/cache/marshall/ActiveInactiveTest.ja=
va	2008-01-04 09:45:35 UTC (rev 4976)
+++ core/trunk/src/test/java/org/jboss/cache/marshall/ActiveInactiveTest.ja=
va	2008-01-04 12:19:46 UTC (rev 4977)
@@ -153,10 +153,10 @@
 =

    public void testObjectFromByteBuffer() throws Exception
    {
-      MethodCall put =3D MethodCallFactory.create(MethodDeclarations.putKe=
yValMethodLocal,
+      MethodCall put =3D MethodCallFactory.create(MethodDeclarations.putKe=
yValMethodLocal_id,
             null, A_B, "name", "Joe", false);
 =

-      MethodCall replicate =3D MethodCallFactory.create(MethodDeclarations=
.replicateMethod, put);
+      MethodCall replicate =3D MethodCallFactory.create(MethodDeclarations=
.replicateMethod_id, put);
 =

       rman.setDefaultInactive(true);
       // register A as an inactive marshalling region

Modified: core/trunk/src/test/java/org/jboss/cache/marshall/CacheMarshaller=
200Test.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/test/java/org/jboss/cache/marshall/CacheMarshaller200Tes=
t.java	2008-01-04 09:45:35 UTC (rev 4976)
+++ core/trunk/src/test/java/org/jboss/cache/marshall/CacheMarshaller200Tes=
t.java	2008-01-04 12:19:46 UTC (rev 4977)
@@ -92,7 +92,7 @@
       final Fqn region =3D Fqn.fromString("/hello");
       Region r =3D rm.getRegion(region, true);
       r.registerContextClassLoader(this.getClass().getClassLoader());
-      cm200.objectToObjectStream(MethodCallFactory.create(MethodDeclaratio=
ns.clusteredGetMethod, null), oos, region);
+      cm200.objectToObjectStream(MethodCallFactory.create(MethodDeclaratio=
ns.clusteredGetMethod_id, null), oos, region);
       oos.close();
 =

       final byte[] stream =3D baos.toByteArray();

Modified: core/trunk/src/test/java/org/jboss/cache/marshall/CacheMarshaller=
210Test.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/test/java/org/jboss/cache/marshall/CacheMarshaller210Tes=
t.java	2008-01-04 09:45:35 UTC (rev 4976)
+++ core/trunk/src/test/java/org/jboss/cache/marshall/CacheMarshaller210Tes=
t.java	2008-01-04 12:19:46 UTC (rev 4977)
@@ -11,7 +11,7 @@
 import java.util.HashMap;
 import java.util.Map;
 =

-(a)Test (groups =3D {"functional"})
+(a)Test(groups =3D {"functional"})
 public class CacheMarshaller210Test extends CacheMarshaller200Test
 {
    public CacheMarshaller210Test()
@@ -26,8 +26,8 @@
       Map map =3D createMap(size);
       Fqn fqn =3D Fqn.fromString("/my/stuff");
       String key =3D "key";
-      MethodCall putMethod =3D MethodCallFactory.create(MethodDeclarations=
.putKeyValMethodLocal, fqn, key, map);
-      MethodCall replicateMethod =3D MethodCallFactory.create(MethodDeclar=
ations.replicateMethod, putMethod);
+      MethodCall putMethod =3D MethodCallFactory.create(MethodDeclarations=
.putKeyValMethodLocal_id, fqn, key, map);
+      MethodCall replicateMethod =3D MethodCallFactory.create(MethodDeclar=
ations.replicateMethod_id, putMethod);
 =

       byte[] buf =3D marshaller.objectToByteBuffer(replicateMethod);
 =

@@ -37,7 +37,7 @@
    protected Map createMap(int size)
    {
       Map map =3D new HashMap(size);
-      for (int i=3D0; i<size; i++) map.put("key-" + i, "value-" + i);
+      for (int i =3D 0; i < size; i++) map.put("key-" + i, "value-" + i);
       return map;
    }
 =

@@ -52,11 +52,11 @@
       CacheMarshaller210 cm210 =3D (CacheMarshaller210) marshaller.default=
Marshaller;
       CacheMarshaller200 cm200 =3D (CacheMarshaller200) marshaller.getMars=
haller(20);
       int[] ints =3D {2, 100, 500, 12000, 20000, 500000, 2000000, Integer.=
MAX_VALUE};
-      =

+
       for (int i : ints)
       {
-         System.out.println("CM200: Number of bytes (i=3D"+i+") : " + getA=
ndTestSize(cm200, i));
-         System.out.println("CM210: Number of bytes (i=3D"+i+") : " + getA=
ndTestSize(cm210, i));
+         System.out.println("CM200: Number of bytes (i=3D" + i + ") : " + =
getAndTestSize(cm200, i));
+         System.out.println("CM210: Number of bytes (i=3D" + i + ") : " + =
getAndTestSize(cm210, i));
       }
    }
 =

@@ -69,8 +69,8 @@
 =

       for (long i : ints)
       {
-         System.out.println("CM200: Number of bytes (i=3D"+i+") : " + getA=
ndTestSize(cm200, i));
-         System.out.println("CM210: Number of bytes (i=3D"+i+") : " + getA=
ndTestSize(cm210, i));
+         System.out.println("CM200: Number of bytes (i=3D" + i + ") : " + =
getAndTestSize(cm200, i));
+         System.out.println("CM210: Number of bytes (i=3D" + i + ") : " + =
getAndTestSize(cm210, i));
       }
    }
 =


Modified: core/trunk/src/test/java/org/jboss/cache/marshall/CacheMarshaller=
TestBase.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/test/java/org/jboss/cache/marshall/CacheMarshallerTestBa=
se.java	2008-01-04 09:45:35 UTC (rev 4976)
+++ core/trunk/src/test/java/org/jboss/cache/marshall/CacheMarshallerTestBa=
se.java	2008-01-04 12:19:46 UTC (rev 4977)
@@ -132,7 +132,7 @@
    public void testMethodCall() throws Exception
    {
       Fqn fqn =3D new Fqn<Object>(3, false);
-      MethodCall call =3D MethodCallFactory.create(MethodDeclarations.putK=
eyValMethodLocal, fqn, "key", "value", true);
+      MethodCall call =3D MethodCallFactory.create(MethodDeclarations.putK=
eyValMethodLocal_id, fqn, "key", "value", true);
       byte[] asBytes =3D marshaller.objectToByteBuffer(call);
       Object o2 =3D marshaller.objectFromByteBuffer(asBytes);
 =

@@ -145,8 +145,8 @@
    public void testNestedMethodCall() throws Exception
    {
       Fqn fqn =3D new Fqn<Object>(3, false);
-      MethodCall call =3D MethodCallFactory.create(MethodDeclarations.putK=
eyValMethodLocal, fqn, "key", "value", true);
-      MethodCall replicateCall =3D MethodCallFactory.create(MethodDeclarat=
ions.replicateMethod, call);
+      MethodCall call =3D MethodCallFactory.create(MethodDeclarations.putK=
eyValMethodLocal_id, fqn, "key", "value", true);
+      MethodCall replicateCall =3D MethodCallFactory.create(MethodDeclarat=
ions.replicateMethod_id, call);
       byte[] asBytes =3D marshaller.objectToByteBuffer(replicateCall);
       Object o2 =3D marshaller.objectFromByteBuffer(asBytes);
       assertTrue("Unmarshalled object should be a method call", o2 instanc=
eof MethodCall);
@@ -235,17 +235,17 @@
       Fqn f =3D new Fqn<Object>("BlahBlah", 3, false);
       String k =3D "key", v =3D "value";
 =

-      MethodCall actualCall =3D MethodCallFactory.create(MethodDeclaration=
s.putKeyValMethodLocal, null, f, k, v, true);
-      MethodCall replicateCall =3D MethodCallFactory.create(MethodDeclarat=
ions.replicateMethod, actualCall);
+      MethodCall actualCall =3D MethodCallFactory.create(MethodDeclaration=
s.putKeyValMethodLocal_id, null, f, k, v, true);
+      MethodCall replicateCall =3D MethodCallFactory.create(MethodDeclarat=
ions.replicateMethod_id, actualCall);
 =

       calls.add(replicateCall);
 =

-      actualCall =3D MethodCallFactory.create(MethodDeclarations.putKeyVal=
MethodLocal, null, f, k, v, true);
-      replicateCall =3D MethodCallFactory.create(MethodDeclarations.replic=
ateMethod, actualCall);
+      actualCall =3D MethodCallFactory.create(MethodDeclarations.putKeyVal=
MethodLocal_id, null, f, k, v, true);
+      replicateCall =3D MethodCallFactory.create(MethodDeclarations.replic=
ateMethod_id, actualCall);
 =

       calls.add(replicateCall);
 =

-      MethodCall call =3D MethodCallFactory.create(MethodDeclarations.repl=
icateAllMethod, calls);
+      MethodCall call =3D MethodCallFactory.create(MethodDeclarations.repl=
icateAllMethod_id, calls);
 =

       byte[] buf =3D marshaller.objectToByteBuffer(call);
 =


Modified: core/trunk/src/test/java/org/jboss/cache/marshall/MethodCallFacto=
ryTest.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/test/java/org/jboss/cache/marshall/MethodCallFactoryTest=
.java	2008-01-04 09:45:35 UTC (rev 4976)
+++ core/trunk/src/test/java/org/jboss/cache/marshall/MethodCallFactoryTest=
.java	2008-01-04 12:19:46 UTC (rev 4977)
@@ -13,7 +13,7 @@
    public void testVarArgsMethod()
    {
       GlobalTransaction gtx =3D new GlobalTransaction();
-      MethodCall c =3D MethodCallFactory.create(MethodDeclarations.commitM=
ethod, gtx);
+      MethodCall c =3D MethodCallFactory.create(MethodDeclarations.commitM=
ethod_id, gtx);
 =

       assertEquals(gtx, c.getArgs()[0]);
    }
@@ -21,7 +21,7 @@
    public void testObjectArrayMethod()
    {
       GlobalTransaction gtx =3D new GlobalTransaction();
-      MethodCall c =3D MethodCallFactory.create(MethodDeclarations.commitM=
ethod, gtx);
+      MethodCall c =3D MethodCallFactory.create(MethodDeclarations.commitM=
ethod_id, gtx);
 =

       assertEquals(gtx, c.getArgs()[0]);
    }
@@ -29,7 +29,7 @@
    public void testMultipleArrayElems()
    {
       GlobalTransaction gtx =3D new GlobalTransaction();
-      MethodCall c =3D MethodCallFactory.create(MethodDeclarations.commitM=
ethod, gtx, gtx, gtx);
+      MethodCall c =3D MethodCallFactory.create(MethodDeclarations.commitM=
ethod_id, gtx, gtx, gtx);
 =

       assertEquals(gtx, c.getArgs()[0]);
       assertEquals(gtx, c.getArgs()[1]);

Modified: core/trunk/src/test/java/org/jboss/cache/marshall/MethodIdPreserv=
ationTest.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/test/java/org/jboss/cache/marshall/MethodIdPreservationT=
est.java	2008-01-04 09:45:35 UTC (rev 4976)
+++ core/trunk/src/test/java/org/jboss/cache/marshall/MethodIdPreservationT=
est.java	2008-01-04 12:19:46 UTC (rev 4977)
@@ -32,12 +32,12 @@
    {
       byteStream =3D new ByteArrayOutputStream();
       stream =3D new ObjectOutputStream(byteStream);
-      call1 =3D MethodCallFactory.create(MethodDeclarations.putDataMethodL=
ocal, Fqn.ROOT, null, null, true);
-      call2 =3D MethodCallFactory.create(MethodDeclarations.putDataMethodL=
ocal, Fqn.ROOT, null, null, true);
+      call1 =3D MethodCallFactory.create(MethodDeclarations.putDataMethodL=
ocal_id, Fqn.ROOT, null, null, true);
+      call2 =3D MethodCallFactory.create(MethodDeclarations.putDataMethodL=
ocal_id, Fqn.ROOT, null, null, true);
       list.clear();
       list.add(call1);
       list.add(call2);
-      prepareCall =3D MethodCallFactory.create(MethodDeclarations.prepareM=
ethod, null, list, null, true);
+      prepareCall =3D MethodCallFactory.create(MethodDeclarations.prepareM=
ethod_id, null, list, null, true);
    }
 =

    public void testSingleMethodCall() throws Exception

Modified: core/trunk/src/test/java/org/jboss/cache/marshall/RemoteCallerRet=
urnValuesTest.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/test/java/org/jboss/cache/marshall/RemoteCallerReturnVal=
uesTest.java	2008-01-04 09:45:35 UTC (rev 4976)
+++ core/trunk/src/test/java/org/jboss/cache/marshall/RemoteCallerReturnVal=
uesTest.java	2008-01-04 12:19:46 UTC (rev 4977)
@@ -70,8 +70,8 @@
       doNullReturnTest(MethodDeclarations.moveMethodLocal, fqn, Fqn.ROOT);
 =

       // ------------ Channel BLOCK event
-      doNullReturnTest(MethodDeclarations.blockChannelLocal);
-      doNullReturnTest(MethodDeclarations.unblockChannelLocal);
+      doNullReturnTest(MethodDeclarations.blockChannelMethodLocal);
+      doNullReturnTest(MethodDeclarations.unblockChannelMethodLocal);
    }
 =

 =


Modified: core/trunk/src/test/java/org/jboss/cache/marshall/ReturnValueMars=
hallingTest.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/test/java/org/jboss/cache/marshall/ReturnValueMarshallin=
gTest.java	2008-01-04 09:45:35 UTC (rev 4976)
+++ core/trunk/src/test/java/org/jboss/cache/marshall/ReturnValueMarshallin=
gTest.java	2008-01-04 12:19:46 UTC (rev 4977)
@@ -85,8 +85,8 @@
       assertSame(listClass, cache2.get(fqn, key).getClass());
 =

       // now test if this is the same when obtained using a clustered get =
mcall
-      MethodCall call =3D MethodCallFactory.create(MethodDeclarations.clus=
teredGetMethod,
-            MethodCallFactory.create(MethodDeclarations.getKeyValueMethodL=
ocal, fqn, key, false),
+      MethodCall call =3D MethodCallFactory.create(MethodDeclarations.clus=
teredGetMethod_id,
+            MethodCallFactory.create(MethodDeclarations.getKeyValueMethodL=
ocal_id, fqn, key, false),
             false);
 =

       List responses =3D cache1.getRPCManager().callRemoteMethods(null, ca=
ll, true, true, 15000);
@@ -114,7 +114,7 @@
       assertSame(listClass, cache2.get(fqn, key).getClass());
 =

       // now test if this is the same when obtained using a data gravitate=
 call
-      MethodCall call =3D MethodCallFactory.create(MethodDeclarations.data=
GravitationMethod,
+      MethodCall call =3D MethodCallFactory.create(MethodDeclarations.data=
GravitationMethod_id,
             fqn, false);
 =

       List responses =3D cache1.getRPCManager().callRemoteMethods(null, ca=
ll, true, true, 15000);

Modified: core/trunk/src/test/java/org/jboss/cache/optimistic/AbstractOptim=
isticTestCase.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/test/java/org/jboss/cache/optimistic/AbstractOptimisticT=
estCase.java	2008-01-04 09:45:35 UTC (rev 4976)
+++ core/trunk/src/test/java/org/jboss/cache/optimistic/AbstractOptimisticT=
estCase.java	2008-01-04 12:19:46 UTC (rev 4977)
@@ -299,7 +299,7 @@
          System.out.println("*** " + oa.length);
          System.arraycopy(oa, 0, na, 0, oa.length);
          na[oa.length] =3D new DefaultDataVersion();
-         newList.add(MethodCallFactory.create(MethodDeclarations.getVersio=
nedMethod(c.getMethodId()), na));
+         newList.add(MethodCallFactory.create(MethodDeclarations.getVersio=
nedMethodId(c.getMethodId()), na));
       }
       return newList;
    }

Modified: core/trunk/src/test/java/org/jboss/cache/optimistic/CacheTest.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/test/java/org/jboss/cache/optimistic/CacheTest.java	2008=
-01-04 09:45:35 UTC (rev 4976)
+++ core/trunk/src/test/java/org/jboss/cache/optimistic/CacheTest.java	2008=
-01-04 12:19:46 UTC (rev 4977)
@@ -218,7 +218,7 @@
 =

       meth.getArgs()[0] =3D remoteGtx;
       //call our remote method
-      MethodCall prepareMethod =3D MethodCallFactory.create(MethodDeclarat=
ions.optimisticPrepareMethod, remoteGtx, injectDataVersion(entry.getModific=
ations()), null,
+      MethodCall prepareMethod =3D MethodCallFactory.create(MethodDeclarat=
ions.optimisticPrepareMethod_id, remoteGtx, injectDataVersion(entry.getModi=
fications()), null,
             remoteGtx.getAddress(), Boolean.FALSE);
       TestingUtil.getRemoteDelegate(c)._replicate(prepareMethod);
 =


Modified: core/trunk/src/test/java/org/jboss/cache/optimistic/OptimisticRep=
licationInterceptorTest.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/test/java/org/jboss/cache/optimistic/OptimisticReplicati=
onInterceptorTest.java	2008-01-04 09:45:35 UTC (rev 4976)
+++ core/trunk/src/test/java/org/jboss/cache/optimistic/OptimisticReplicati=
onInterceptorTest.java	2008-01-04 12:19:46 UTC (rev 4977)
@@ -81,8 +81,8 @@
 =

       List calls =3D dummy.getAllCalled();
 =

-      assertEquals(MethodDeclarations.optimisticPrepareMethod, calls.get(0=
));
-      assertEquals(MethodDeclarations.commitMethod, calls.get(1));
+      assertEquals(MethodDeclarations.optimisticPrepareMethod_id, calls.ge=
t(0));
+      assertEquals(MethodDeclarations.commitMethod_id, calls.get(1));
    }
 =

    public void testRollbackTransaction() throws Exception
@@ -108,7 +108,7 @@
       List calls =3D dummy.getAllCalled();
 =

       assertEquals(1, calls.size());
-      assertEquals(MethodDeclarations.rollbackMethod, calls.get(0));
+      assertEquals(MethodDeclarations.rollbackMethod_id, calls.get(0));
    }
 =

    public void testRemotePrepareTransaction() throws Exception
@@ -144,7 +144,7 @@
 =

       meth.getArgs()[0] =3D remoteGtx;
       //call our remote method
-      MethodCall prepareMethod =3D MethodCallFactory.create(MethodDeclarat=
ions.optimisticPrepareMethod, remoteGtx, injectDataVersion(entry.getModific=
ations()), null, remoteGtx.getAddress(), false);
+      MethodCall prepareMethod =3D MethodCallFactory.create(MethodDeclarat=
ions.optimisticPrepareMethod_id, remoteGtx, injectDataVersion(entry.getModi=
fications()), null, remoteGtx.getAddress(), false);
       try
       {
          TestingUtil.getRemoteDelegate(cache)._replicate(prepareMethod);
@@ -167,7 +167,7 @@
       assertEquals(3, entry.getTransactionWorkSpace().getNodes().size());
       assertEquals(1, entry.getModifications().size());
       List calls =3D dummy.getAllCalled();
-      assertEquals(MethodDeclarations.optimisticPrepareMethod, calls.get(2=
));
+      assertEquals(MethodDeclarations.optimisticPrepareMethod_id, calls.ge=
t(2));
 =

 =

       assertEquals(1, cache.getTransactionTable().getNumGlobalTransactions=
());
@@ -209,7 +209,7 @@
 =

       meth.getArgs()[0] =3D remoteGtx;
       //call our remote method
-      MethodCall prepareMethod =3D MethodCallFactory.create(MethodDeclarat=
ions.optimisticPrepareMethod, remoteGtx, injectDataVersion(entry.getModific=
ations()), null, remoteGtx.getAddress(), false);
+      MethodCall prepareMethod =3D MethodCallFactory.create(MethodDeclarat=
ions.optimisticPrepareMethod_id, remoteGtx, injectDataVersion(entry.getModi=
fications()), null, remoteGtx.getAddress(), false);
       try
       {
          TestingUtil.getRemoteDelegate(cache)._replicate(prepareMethod);
@@ -231,14 +231,14 @@
       assertEquals(3, entry.getTransactionWorkSpace().getNodes().size());
       assertEquals(1, entry.getModifications().size());
       List calls =3D dummy.getAllCalled();
-      assertEquals(MethodDeclarations.optimisticPrepareMethod, calls.get(2=
));
+      assertEquals(MethodDeclarations.optimisticPrepareMethod_id, calls.ge=
t(2));
 =

 =

       assertEquals(1, cache.getTransactionTable().getNumGlobalTransactions=
());
       assertEquals(1, cache.getTransactionTable().getNumLocalTransactions(=
));
 =

       //	    call our remote method
-      MethodCall rollbackMethod =3D MethodCallFactory.create(MethodDeclara=
tions.rollbackMethod, remoteGtx);
+      MethodCall rollbackMethod =3D MethodCallFactory.create(MethodDeclara=
tions.rollbackMethod_id, remoteGtx);
       try
       {
          TestingUtil.getRemoteDelegate(cache)._replicate(rollbackMethod);
@@ -249,7 +249,7 @@
       }
       //we should have the commit as well now
       assertNull(mgr.getTransaction());
-      assertEquals(MethodDeclarations.rollbackMethod, calls.get(3));
+      assertEquals(MethodDeclarations.rollbackMethod_id, calls.get(3));
       assertEquals(0, cache.getTransactionTable().getNumGlobalTransactions=
());
       assertEquals(0, cache.getTransactionTable().getNumLocalTransactions(=
));
    }
@@ -297,7 +297,7 @@
       assertEquals(0, cache.getTransactionTable().getNumLocalTransactions(=
));
 =

       //	    call our remote method
-      MethodCall commitMethod =3D MethodCallFactory.create(MethodDeclarati=
ons.commitMethod, remoteGtx);
+      MethodCall commitMethod =3D MethodCallFactory.create(MethodDeclarati=
ons.commitMethod_id, remoteGtx);
       try
       {
          TestingUtil.getRemoteDelegate(cache)._replicate(commitMethod);
@@ -358,7 +358,7 @@
       assertEquals(0, cache.getTransactionTable().getNumLocalTransactions(=
));
 =

       //	    call our remote method
-      MethodCall rollbackMethod =3D MethodCallFactory.create(MethodDeclara=
tions.rollbackMethod, remoteGtx);
+      MethodCall rollbackMethod =3D MethodCallFactory.create(MethodDeclara=
tions.rollbackMethod_id, remoteGtx);
 =

       TestingUtil.getRemoteDelegate(cache)._replicate(rollbackMethod);
       assertTrue("Should be handled on the remote end without barfing, in =
the event of a rollback without a prepare", true);
@@ -404,7 +404,7 @@
 =

       meth.getArgs()[0] =3D remoteGtx;
       //call our remote method
-      MethodCall prepareMethod =3D MethodCallFactory.create(MethodDeclarat=
ions.optimisticPrepareMethod, remoteGtx, injectDataVersion(entry.getModific=
ations()), null, remoteGtx.getAddress(), false);
+      MethodCall prepareMethod =3D MethodCallFactory.create(MethodDeclarat=
ions.optimisticPrepareMethod_id, remoteGtx, injectDataVersion(entry.getModi=
fications()), null, remoteGtx.getAddress(), false);
       try
       {
          TestingUtil.getRemoteDelegate(cache)._replicate(prepareMethod);
@@ -427,14 +427,14 @@
       assertEquals(3, entry.getTransactionWorkSpace().getNodes().size());
       assertEquals(1, entry.getModifications().size());
       List calls =3D dummy.getAllCalled();
-      assertEquals(MethodDeclarations.optimisticPrepareMethod, calls.get(2=
));
+      assertEquals(MethodDeclarations.optimisticPrepareMethod_id, calls.ge=
t(2));
 =

 =

       assertEquals(1, cache.getTransactionTable().getNumGlobalTransactions=
());
       assertEquals(1, cache.getTransactionTable().getNumLocalTransactions(=
));
 =

       //	    call our remote method
-      MethodCall commitMethod =3D MethodCallFactory.create(MethodDeclarati=
ons.commitMethod, remoteGtx);
+      MethodCall commitMethod =3D MethodCallFactory.create(MethodDeclarati=
ons.commitMethod_id, remoteGtx);
       try
       {
          TestingUtil.getRemoteDelegate(cache)._replicate(commitMethod);
@@ -445,7 +445,7 @@
       }
       //we should have the commit as well now
       assertNull(mgr.getTransaction());
-      assertEquals(MethodDeclarations.commitMethod, calls.get(3));
+      assertEquals(MethodDeclarations.commitMethod_id, calls.get(3));
       assertEquals(0, cache.getTransactionTable().getNumGlobalTransactions=
());
       assertEquals(0, cache.getTransactionTable().getNumLocalTransactions(=
));
    }
@@ -493,12 +493,12 @@
 =

       List calls =3D dummy.getAllCalled();
 =

-      assertEquals(MethodDeclarations.optimisticPrepareMethod, calls.get(0=
));
-      assertEquals(MethodDeclarations.commitMethod, calls.get(1));
+      assertEquals(MethodDeclarations.optimisticPrepareMethod_id, calls.ge=
t(0));
+      assertEquals(MethodDeclarations.commitMethod_id, calls.get(1));
 =

       List calls2 =3D dummy2.getAllCalled();
-      assertEquals(MethodDeclarations.optimisticPrepareMethod, calls2.get(=
0));
-      assertEquals(MethodDeclarations.commitMethod, calls2.get(1));
+      assertEquals(MethodDeclarations.optimisticPrepareMethod_id, calls2.g=
et(0));
+      assertEquals(MethodDeclarations.commitMethod_id, calls2.get(1));
 =

       destroyCache(cache2);
    }
@@ -555,12 +555,12 @@
 =

 =

       List calls =3D dummy.getAllCalled();
-      assertEquals(MethodDeclarations.optimisticPrepareMethod, calls.get(0=
));
-      assertEquals(MethodDeclarations.rollbackMethod, calls.get(1));
+      assertEquals(MethodDeclarations.optimisticPrepareMethod_id, calls.ge=
t(0));
+      assertEquals(MethodDeclarations.rollbackMethod_id, calls.get(1));
 =

       //we have no prepare - as it failed - but we have a commit
       List calls2 =3D dummy2.getAllCalled();
-      assertEquals(MethodDeclarations.rollbackMethod, calls2.get(0));
+      assertEquals(MethodDeclarations.rollbackMethod_id, calls2.get(0));
 =

       destroyCache(cache2);
    }
@@ -619,7 +619,7 @@
 =

 =

       List calls =3D dummy.getAllCalled();
-      assertEquals(MethodDeclarations.rollbackMethod, calls.get(0));
+      assertEquals(MethodDeclarations.rollbackMethod_id, calls.get(0));
 =

       //we have no prepare - as it failed - but we have a commit
       List calls2 =3D dummy2.getAllCalled();

Modified: core/trunk/src/test/java/org/jboss/cache/optimistic/TxInterceptor=
Test.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/test/java/org/jboss/cache/optimistic/TxInterceptorTest.j=
ava	2008-01-04 09:45:35 UTC (rev 4976)
+++ core/trunk/src/test/java/org/jboss/cache/optimistic/TxInterceptorTest.j=
ava	2008-01-04 12:19:46 UTC (rev 4977)
@@ -55,8 +55,8 @@
 =

       List<?> calls =3D dummy.getAllCalled();
 =

-      assertEquals(MethodDeclarations.optimisticPrepareMethod, calls.get(0=
));
-      assertEquals(MethodDeclarations.commitMethod, calls.get(1));
+      assertEquals(MethodDeclarations.optimisticPrepareMethod_id, calls.ge=
t(0));
+      assertEquals(MethodDeclarations.commitMethod_id, calls.get(1));
       //flesh this out a bit more
 =

    }
@@ -89,8 +89,8 @@
       assertNull(mgr.getTransaction());
 =

       List<?> calls =3D dummy.getAllCalled();
-      assertEquals(MethodDeclarations.optimisticPrepareMethod, calls.get(0=
));
-      assertEquals(MethodDeclarations.commitMethod, calls.get(1));
+      assertEquals(MethodDeclarations.optimisticPrepareMethod_id, calls.ge=
t(0));
+      assertEquals(MethodDeclarations.commitMethod_id, calls.get(1));
 =

       assertEquals(0, cache.getTransactionTable().getNumGlobalTransactions=
());
       assertEquals(0, cache.getTransactionTable().getNumLocalTransactions(=
));
@@ -121,7 +121,7 @@
 =

       List<?> calls =3D dummy.getAllCalled();
       assertEquals(1, calls.size());
-      assertEquals(MethodDeclarations.rollbackMethod, calls.get(0));
+      assertEquals(MethodDeclarations.rollbackMethod_id, calls.get(0));
 =

 =

       assertEquals(0, cache.getTransactionTable().getNumGlobalTransactions=
());
@@ -207,8 +207,8 @@
       assertNull(mgr.getTransaction());
 =

       List<?> calls =3D dummy.getAllCalled();
-      assertEquals(MethodDeclarations.optimisticPrepareMethod, calls.get(0=
));
-      assertEquals(MethodDeclarations.commitMethod, calls.get(1));
+      assertEquals(MethodDeclarations.optimisticPrepareMethod_id, calls.ge=
t(0));
+      assertEquals(MethodDeclarations.commitMethod_id, calls.get(1));
       boolean failed =3D false;
       try
       {
@@ -254,8 +254,8 @@
       assertNull(mgr.getTransaction());
 =

       List<?> calls =3D dummy.getAllCalled();
-      assertEquals(MethodDeclarations.optimisticPrepareMethod, calls.get(0=
));
-      assertEquals(MethodDeclarations.commitMethod, calls.get(1));
+      assertEquals(MethodDeclarations.optimisticPrepareMethod_id, calls.ge=
t(0));
+      assertEquals(MethodDeclarations.commitMethod_id, calls.get(1));
 =

 =

       assertEquals(0, cache.getTransactionTable().getNumGlobalTransactions=
());
@@ -291,8 +291,8 @@
 =

       //test local calls
       List<?> calls =3D dummy.getAllCalled();
-      assertEquals(MethodDeclarations.optimisticPrepareMethod, calls.get(0=
));
-      assertEquals(MethodDeclarations.commitMethod, calls.get(1));
+      assertEquals(MethodDeclarations.optimisticPrepareMethod_id, calls.ge=
t(0));
+      assertEquals(MethodDeclarations.commitMethod_id, calls.get(1));
       assertNull(mgr.getTransaction());
 =

       assertEquals(0, cache.getTransactionTable().getNumGlobalTransactions=
());
@@ -307,7 +307,7 @@
 =

       meth.getArgs()[0] =3D remoteGtx;
       //call our remote method
-      MethodCall prepareMethod =3D MethodCallFactory.create(MethodDeclarat=
ions.optimisticPrepareMethod, remoteGtx, injectDataVersion(entry.getModific=
ations()), null, remoteGtx.getAddress(), Boolean.FALSE);
+      MethodCall prepareMethod =3D MethodCallFactory.create(MethodDeclarat=
ions.optimisticPrepareMethod_id, remoteGtx, injectDataVersion(entry.getModi=
fications()), null, remoteGtx.getAddress(), Boolean.FALSE);
       try
       {
          TestingUtil.getRemoteDelegate(cache)._replicate(prepareMethod);
@@ -326,7 +326,7 @@
 =

       //assert that the method has been passed up the stack
       calls =3D dummy.getAllCalled();
-      assertEquals(MethodDeclarations.optimisticPrepareMethod, calls.get(2=
));
+      assertEquals(MethodDeclarations.optimisticPrepareMethod_id, calls.ge=
t(2));
 =

       //assert we have the tx in th table
       assertEquals(1, cache.getTransactionTable().getNumGlobalTransactions=
());
@@ -367,7 +367,7 @@
 =

       meth.getArgs()[0] =3D remoteGtx;
       //call our remote method
-      MethodCall prepareMethod =3D MethodCallFactory.create(MethodDeclarat=
ions.optimisticPrepareMethod, remoteGtx, injectDataVersion(entry.getModific=
ations()), null, remoteGtx.getAddress(), Boolean.FALSE);
+      MethodCall prepareMethod =3D MethodCallFactory.create(MethodDeclarat=
ions.optimisticPrepareMethod_id, remoteGtx, injectDataVersion(entry.getModi=
fications()), null, remoteGtx.getAddress(), Boolean.FALSE);
       try
       {
          TestingUtil.getRemoteDelegate(cache)._replicate(prepareMethod);
@@ -387,7 +387,7 @@
 =

 =

       List<?> calls =3D dummy.getAllCalled();
-      assertEquals(MethodDeclarations.optimisticPrepareMethod, calls.get(0=
));
+      assertEquals(MethodDeclarations.optimisticPrepareMethod_id, calls.ge=
t(0));
 =

       //assert we have two current transactions
       assertEquals(2, cache.getTransactionTable().getNumGlobalTransactions=
());
@@ -398,8 +398,8 @@
 =

       //check local calls
       calls =3D dummy.getAllCalled();
-      assertEquals(MethodDeclarations.optimisticPrepareMethod, calls.get(1=
));
-      assertEquals(MethodDeclarations.commitMethod, calls.get(2));
+      assertEquals(MethodDeclarations.optimisticPrepareMethod_id, calls.ge=
t(1));
+      assertEquals(MethodDeclarations.commitMethod_id, calls.get(2));
 =

       //assert we have only 1 transaction left
 =

@@ -451,7 +451,7 @@
 =

       meth.getArgs()[0] =3D remoteGtx;
       //call our remote method
-      MethodCall prepareMethod =3D MethodCallFactory.create(MethodDeclarat=
ions.optimisticPrepareMethod, remoteGtx, injectDataVersion(entry.getModific=
ations()), null, remoteGtx.getAddress(), Boolean.FALSE);
+      MethodCall prepareMethod =3D MethodCallFactory.create(MethodDeclarat=
ions.optimisticPrepareMethod_id, remoteGtx, injectDataVersion(entry.getModi=
fications()), null, remoteGtx.getAddress(), Boolean.FALSE);
       try
       {
          TestingUtil.getRemoteDelegate(cache)._replicate(prepareMethod);
@@ -465,7 +465,7 @@
       assertEquals(2, cache.getTransactionTable().getNumLocalTransactions(=
));
 =

 //		    call our remote method
-      MethodCall commitMethod =3D MethodCallFactory.create(MethodDeclarati=
ons.commitMethod, remoteGtx);
+      MethodCall commitMethod =3D MethodCallFactory.create(MethodDeclarati=
ons.commitMethod_id, remoteGtx);
       try
       {
          TestingUtil.getRemoteDelegate(cache)._replicate(commitMethod);
@@ -484,8 +484,8 @@
       assertNull(table.getLocalTransaction(remoteGtx));
 =

       List<?> calls =3D dummy.getAllCalled();
-      assertEquals(MethodDeclarations.optimisticPrepareMethod, calls.get(0=
));
-      assertEquals(MethodDeclarations.commitMethod, calls.get(1));
+      assertEquals(MethodDeclarations.optimisticPrepareMethod_id, calls.ge=
t(0));
+      assertEquals(MethodDeclarations.commitMethod_id, calls.get(1));
 =

       assertEquals(1, cache.getTransactionTable().getNumGlobalTransactions=
());
       assertEquals(1, cache.getTransactionTable().getNumLocalTransactions(=
));
@@ -494,8 +494,8 @@
       mgr.commit();
 =

       calls =3D dummy.getAllCalled();
-      assertEquals(MethodDeclarations.optimisticPrepareMethod, calls.get(2=
));
-      assertEquals(MethodDeclarations.commitMethod, calls.get(3));
+      assertEquals(MethodDeclarations.optimisticPrepareMethod_id, calls.ge=
t(2));
+      assertEquals(MethodDeclarations.commitMethod_id, calls.get(3));
 =

 =

       assertEquals(0, cache.getTransactionTable().getNumGlobalTransactions=
());
@@ -540,7 +540,7 @@
 =

       meth.getArgs()[0] =3D remoteGtx;
       //call our remote method
-      MethodCall prepareMethod =3D MethodCallFactory.create(MethodDeclarat=
ions.optimisticPrepareMethod, remoteGtx, injectDataVersion(entry.getModific=
ations()), null, remoteGtx.getAddress(), Boolean.FALSE);
+      MethodCall prepareMethod =3D MethodCallFactory.create(MethodDeclarat=
ions.optimisticPrepareMethod_id, remoteGtx, injectDataVersion(entry.getModi=
fications()), null, remoteGtx.getAddress(), Boolean.FALSE);
       try
       {
          TestingUtil.getRemoteDelegate(cache)._replicate(prepareMethod);
@@ -554,7 +554,7 @@
       assertEquals(2, cache.getTransactionTable().getNumLocalTransactions(=
));
 =

 //		    call our remote method
-      MethodCall rollbackMethod =3D MethodCallFactory.create(MethodDeclara=
tions.rollbackMethod, remoteGtx);
+      MethodCall rollbackMethod =3D MethodCallFactory.create(MethodDeclara=
tions.rollbackMethod_id, remoteGtx);
       try
       {
          TestingUtil.getRemoteDelegate(cache)._replicate(rollbackMethod);
@@ -572,8 +572,8 @@
       assertNull(table.getLocalTransaction(remoteGtx));
 =

       List<?> calls =3D dummy.getAllCalled();
-      assertEquals(MethodDeclarations.optimisticPrepareMethod, calls.get(0=
));
-      assertEquals(MethodDeclarations.rollbackMethod, calls.get(1));
+      assertEquals(MethodDeclarations.optimisticPrepareMethod_id, calls.ge=
t(0));
+      assertEquals(MethodDeclarations.rollbackMethod_id, calls.get(1));
 =

       assertEquals(1, cache.getTransactionTable().getNumGlobalTransactions=
());
       assertEquals(1, cache.getTransactionTable().getNumLocalTransactions(=
));
@@ -582,8 +582,8 @@
       mgr.commit();
 =

       calls =3D dummy.getAllCalled();
-      assertEquals(MethodDeclarations.optimisticPrepareMethod, calls.get(2=
));
-      assertEquals(MethodDeclarations.commitMethod, calls.get(3));
+      assertEquals(MethodDeclarations.optimisticPrepareMethod_id, calls.ge=
t(2));
+      assertEquals(MethodDeclarations.commitMethod_id, calls.get(3));
 =

 =

       assertEquals(0, cache.getTransactionTable().getNumGlobalTransactions=
());
@@ -621,8 +621,8 @@
 =

       //test local calls
       List<?> calls =3D dummy.getAllCalled();
-      assertEquals(MethodDeclarations.optimisticPrepareMethod, calls.get(0=
));
-      assertEquals(MethodDeclarations.commitMethod, calls.get(1));
+      assertEquals(MethodDeclarations.optimisticPrepareMethod_id, calls.ge=
t(0));
+      assertEquals(MethodDeclarations.commitMethod_id, calls.get(1));
 =

       assertNull(mgr.getTransaction());
 =

@@ -639,7 +639,7 @@
 =

       meth.getArgs()[0] =3D remoteGtx;
       //call our remote method
-      MethodCall prepareMethod =3D MethodCallFactory.create(MethodDeclarat=
ions.optimisticPrepareMethod, remoteGtx, injectDataVersion(entry.getModific=
ations()), null, remoteGtx.getAddress(), Boolean.FALSE);
+      MethodCall prepareMethod =3D MethodCallFactory.create(MethodDeclarat=
ions.optimisticPrepareMethod_id, remoteGtx, injectDataVersion(entry.getModi=
fications()), null, remoteGtx.getAddress(), Boolean.FALSE);
       try
       {
          TestingUtil.getRemoteDelegate(cache)._replicate(prepareMethod);
@@ -661,11 +661,11 @@
       assertEquals(1, table.get(remoteGtx).getModifications().size());
 =

       calls =3D dummy.getAllCalled();
-      assertEquals(MethodDeclarations.optimisticPrepareMethod, calls.get(2=
));
+      assertEquals(MethodDeclarations.optimisticPrepareMethod_id, calls.ge=
t(2));
 =

       assertNull(mgr.getTransaction());
 //	    call our remote method
-      MethodCall commitMethod =3D MethodCallFactory.create(MethodDeclarati=
ons.commitMethod, remoteGtx, Boolean.TRUE);
+      MethodCall commitMethod =3D MethodCallFactory.create(MethodDeclarati=
ons.commitMethod_id, remoteGtx, Boolean.TRUE);
       try
       {
          TestingUtil.getRemoteDelegate(cache)._replicate(commitMethod);
@@ -713,8 +713,8 @@
 =

       //test local calls
       List<?> calls =3D dummy.getAllCalled();
-      assertEquals(MethodDeclarations.optimisticPrepareMethod, calls.get(0=
));
-      assertEquals(MethodDeclarations.commitMethod, calls.get(1));
+      assertEquals(MethodDeclarations.optimisticPrepareMethod_id, calls.ge=
t(0));
+      assertEquals(MethodDeclarations.commitMethod_id, calls.get(1));
 =

       GlobalTransaction remoteGtx =3D new GlobalTransaction();
 =

@@ -725,7 +725,7 @@
 =

       meth.getArgs()[0] =3D remoteGtx;
       //call our remote method
-      MethodCall prepareMethod =3D MethodCallFactory.create(MethodDeclarat=
ions.optimisticPrepareMethod, remoteGtx, injectDataVersion(entry.getModific=
ations()), null, remoteGtx.getAddress(), Boolean.FALSE);
+      MethodCall prepareMethod =3D MethodCallFactory.create(MethodDeclarat=
ions.optimisticPrepareMethod_id, remoteGtx, injectDataVersion(entry.getModi=
fications()), null, remoteGtx.getAddress(), Boolean.FALSE);
       try
       {
          TestingUtil.getRemoteDelegate(cache)._replicate(prepareMethod);
@@ -745,10 +745,10 @@
       assertEquals(1, table.get(remoteGtx).getModifications().size());
 =

       calls =3D dummy.getAllCalled();
-      assertEquals(MethodDeclarations.optimisticPrepareMethod, calls.get(2=
));
+      assertEquals(MethodDeclarations.optimisticPrepareMethod_id, calls.ge=
t(2));
 =

 //	    call our remote method
-      MethodCall rollbackMethod =3D MethodCallFactory.create(MethodDeclara=
tions.rollbackMethod, remoteGtx);
+      MethodCall rollbackMethod =3D MethodCallFactory.create(MethodDeclara=
tions.rollbackMethod_id, remoteGtx);
       try
       {
          TestingUtil.getRemoteDelegate(cache)._replicate(rollbackMethod);
@@ -759,8 +759,8 @@
       }
 =

       calls =3D dummy.getAllCalled();
-      assertEquals(MethodDeclarations.optimisticPrepareMethod, calls.get(2=
));
-      assertEquals(MethodDeclarations.rollbackMethod, calls.get(3));
+      assertEquals(MethodDeclarations.optimisticPrepareMethod_id, calls.ge=
t(2));
+      assertEquals(MethodDeclarations.rollbackMethod_id, calls.get(3));
 =

       assertNull(table.get(remoteGtx));
       assertNull(table.getLocalTransaction(remoteGtx));
@@ -801,11 +801,11 @@
 =

 =

       List<?> calls =3D dummy.getAllCalled();
-      assertEquals(MethodDeclarations.optimisticPrepareMethod, calls.get(0=
));
-      assertEquals(MethodDeclarations.commitMethod, calls.get(1));
+      assertEquals(MethodDeclarations.optimisticPrepareMethod_id, calls.ge=
t(0));
+      assertEquals(MethodDeclarations.commitMethod_id, calls.get(1));
 =

-      assertEquals(MethodDeclarations.optimisticPrepareMethod, calls.get(2=
));
-      assertEquals(MethodDeclarations.commitMethod, calls.get(3));
+      assertEquals(MethodDeclarations.optimisticPrepareMethod_id, calls.ge=
t(2));
+      assertEquals(MethodDeclarations.commitMethod_id, calls.get(3));
       cache.stop();
    }
 =


Modified: core/trunk/src/test/java/org/jboss/cache/optimistic/ValidatorInte=
rceptorTest.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/test/java/org/jboss/cache/optimistic/ValidatorIntercepto=
rTest.java	2008-01-04 09:45:35 UTC (rev 4976)
+++ core/trunk/src/test/java/org/jboss/cache/optimistic/ValidatorIntercepto=
rTest.java	2008-01-04 12:19:46 UTC (rev 4977)
@@ -107,7 +107,7 @@
       assertEquals(null, dummy.getCalled());
 =

       //now let us do a prepare
-      MethodCall prepareMethod =3D MethodCallFactory.create(MethodDeclarat=
ions.optimisticPrepareMethod, gtx, entry.getModifications(), null, gtx.getA=
ddress(), Boolean.FALSE);
+      MethodCall prepareMethod =3D MethodCallFactory.create(MethodDeclarat=
ions.optimisticPrepareMethod_id, gtx, entry.getModifications(), null, gtx.g=
etAddress(), Boolean.FALSE);
       TestingUtil.getRemoteDelegate(cache)._replicate(prepareMethod);
 =

 =

@@ -159,7 +159,7 @@
       //lets change one of the underlying version numbers
       workspace.getNode(Fqn.fromString("/one/two")).getNode().setVersion(n=
ew DefaultDataVersion(2));
       //now let us do a prepare
-      MethodCall prepareMethod =3D MethodCallFactory.create(MethodDeclarat=
ions.optimisticPrepareMethod, gtx, entry.getModifications(), null, gtx.getA=
ddress(), Boolean.FALSE);
+      MethodCall prepareMethod =3D MethodCallFactory.create(MethodDeclarat=
ions.optimisticPrepareMethod_id, gtx, entry.getModifications(), null, gtx.g=
etAddress(), Boolean.FALSE);
       try
       {
          TestingUtil.getRemoteDelegate(cache)._replicate(prepareMethod);
@@ -206,7 +206,7 @@
 =

       //lets change one of the underlying version numbers
       //now let us do a prepare
-      MethodCall prepareMethod =3D MethodCallFactory.create(MethodDeclarat=
ions.optimisticPrepareMethod, gtx, entry.getModifications(), null, gtx.getA=
ddress(), Boolean.FALSE);
+      MethodCall prepareMethod =3D MethodCallFactory.create(MethodDeclarat=
ions.optimisticPrepareMethod_id, gtx, entry.getModifications(), null, gtx.g=
etAddress(), Boolean.FALSE);
       try
       {
          TestingUtil.getRemoteDelegate(cache)._replicate(prepareMethod);
@@ -217,7 +217,7 @@
          assertTrue(true);
       }
 =

-      MethodCall commitMethod =3D MethodCallFactory.create(MethodDeclarati=
ons.commitMethod, gtx);
+      MethodCall commitMethod =3D MethodCallFactory.create(MethodDeclarati=
ons.commitMethod_id, gtx);
       TestingUtil.getRemoteDelegate(cache)._replicate(commitMethod);
 =

 =

@@ -283,7 +283,7 @@
 =

       //lets change one of the underlying version numbers
       //now let us do a prepare
-      MethodCall prepareMethod =3D MethodCallFactory.create(MethodDeclarat=
ions.optimisticPrepareMethod, gtx, entry.getModifications(), null, gtx.getA=
ddress(), Boolean.FALSE);
+      MethodCall prepareMethod =3D MethodCallFactory.create(MethodDeclarat=
ions.optimisticPrepareMethod_id, gtx, entry.getModifications(), null, gtx.g=
etAddress(), Boolean.FALSE);
       try
       {
          TestingUtil.getRemoteDelegate(cache)._replicate(prepareMethod);
@@ -295,7 +295,7 @@
       }
 =

 =

-      MethodCall commitMethod =3D MethodCallFactory.create(MethodDeclarati=
ons.commitMethod, gtx);
+      MethodCall commitMethod =3D MethodCallFactory.create(MethodDeclarati=
ons.commitMethod_id, gtx);
       TestingUtil.getRemoteDelegate(cache)._replicate(commitMethod);
 =

 =

@@ -362,7 +362,7 @@
 =

       //lets change one of the underlying version numbers
       //now let us do a prepare
-      MethodCall prepareMethod =3D MethodCallFactory.create(MethodDeclarat=
ions.optimisticPrepareMethod, gtx, entry.getModifications(), null, gtx.getA=
ddress(), Boolean.FALSE);
+      MethodCall prepareMethod =3D MethodCallFactory.create(MethodDeclarat=
ions.optimisticPrepareMethod_id, gtx, entry.getModifications(), null, gtx.g=
etAddress(), Boolean.FALSE);
 =

       try
       {
@@ -374,7 +374,7 @@
          assertTrue(true);
       }
 =

-      MethodCall rollbackMethod =3D MethodCallFactory.create(MethodDeclara=
tions.rollbackMethod, gtx);
+      MethodCall rollbackMethod =3D MethodCallFactory.create(MethodDeclara=
tions.rollbackMethod_id, gtx);
       TestingUtil.getRemoteDelegate(cache)._replicate(rollbackMethod);
 =

 =


Modified: core/trunk/src/test/java/org/jboss/cache/util/BitEncodedIntegerSe=
tTest.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/test/java/org/jboss/cache/util/BitEncodedIntegerSetTest.=
java	2008-01-04 09:45:35 UTC (rev 4976)
+++ core/trunk/src/test/java/org/jboss/cache/util/BitEncodedIntegerSetTest.=
java	2008-01-04 12:19:46 UTC (rev 4977)
@@ -55,6 +55,59 @@
 =

    }
 =

+   public void testAddAll()
+   {
+      BitEncodedIntegerSet set =3D new BitEncodedIntegerSet();
+      set.add(0);
+      set.add(1);
+      set.add(62);
+      set.add(63);
+
+      for (int i =3D 0; i < 64; i++)
+      {
+         if (i =3D=3D 0 || i =3D=3D 1 || i =3D=3D 62 || i =3D=3D 63)
+         {
+            assert set.contains(i);
+         }
+         else
+         {
+            assert !set.contains(i);
+         }
+      }
+
+      BitEncodedIntegerSet set2 =3D new BitEncodedIntegerSet();
+      set2.add(0);
+      set2.add(1);
+      set2.add(44);
+      set2.add(55);
+
+      for (int i =3D 0; i < 64; i++)
+      {
+         if (i =3D=3D 0 || i =3D=3D 1 || i =3D=3D 44 || i =3D=3D 55)
+         {
+            assert set2.contains(i);
+         }
+         else
+         {
+            assert !set2.contains(i);
+         }
+      }
+
+      set.addAll(set2);
+
+      for (int i =3D 0; i < 64; i++)
+      {
+         if (i =3D=3D 0 || i =3D=3D 1 || i =3D=3D 62 || i =3D=3D 63 || i =
=3D=3D 44 || i =3D=3D 55)
+         {
+            assert set.contains(i) : "Should contain " + i;
+         }
+         else
+         {
+            assert !set.contains(i);
+         }
+      }
+   }
+
    public void testClear()
    {
       BitEncodedIntegerSet set =3D new BitEncodedIntegerSet();


--===============0629595627871486589==--

From jbosscache-commits at lists.jboss.org Fri Jan  4 08:01:55 2008
Content-Type: multipart/mixed; boundary="===============8263267512167762334=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r4978 -
 core/trunk/src/main/java/org/jboss/cache/marshall.
Date: Fri, 04 Jan 2008 08:01:55 -0500
Message-ID: <E1JAmBP-0008T6-LG@committer01.frg.pub.inap.atl.jboss.com>

--===============8263267512167762334==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: manik.surtani(a)jboss.com
Date: 2008-01-04 08:01:55 -0500 (Fri, 04 Jan 2008)
New Revision: 4978

Modified:
   core/trunk/src/main/java/org/jboss/cache/marshall/MethodDeclarations.java
Log:
Unnecessary boxing

Modified: core/trunk/src/main/java/org/jboss/cache/marshall/MethodDeclarati=
ons.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/java/org/jboss/cache/marshall/MethodDeclarations.ja=
va	2008-01-04 12:19:46 UTC (rev 4977)
+++ core/trunk/src/main/java/org/jboss/cache/marshall/MethodDeclarations.ja=
va	2008-01-04 13:01:55 UTC (rev 4978)
@@ -430,7 +430,7 @@
     */
    public static boolean isCrudMethod(int id)
    {
-      return crudMethodIds.contains(Integer.valueOf(id));
+      return crudMethodIds.contains(id);
    }
 =

    public static boolean isTransactionLifecycleMethod(int id)


--===============8263267512167762334==--

From jbosscache-commits at lists.jboss.org Fri Jan  4 08:02:24 2008
Content-Type: multipart/mixed; boundary="===============5716647183599005563=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r4979 -
 core/trunk/src/main/java/org/jboss/cache/optimistic.
Date: Fri, 04 Jan 2008 08:02:24 -0500
Message-ID: <E1JAmBs-0000DF-Dj@committer01.frg.pub.inap.atl.jboss.com>

--===============5716647183599005563==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: manik.surtani(a)jboss.com
Date: 2008-01-04 08:02:24 -0500 (Fri, 04 Jan 2008)
New Revision: 4979

Modified:
   core/trunk/src/main/java/org/jboss/cache/optimistic/WorkspaceNodeImpl.ja=
va
Log:
Lazy construction of internal collections

Modified: core/trunk/src/main/java/org/jboss/cache/optimistic/WorkspaceNode=
Impl.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/java/org/jboss/cache/optimistic/WorkspaceNodeImpl.j=
ava	2008-01-04 13:01:55 UTC (rev 4978)
+++ core/trunk/src/main/java/org/jboss/cache/optimistic/WorkspaceNodeImpl.j=
ava	2008-01-04 13:02:24 UTC (rev 4979)
@@ -44,8 +44,8 @@
    private boolean created;
    private boolean childrenModified;
    private Map<Object, NodeSPI<K, V>> optimisticChildNodeMap;
-   private Set<Fqn> childrenAdded =3D new HashSet<Fqn>();
-   private Set<Fqn> childrenRemoved =3D new HashSet<Fqn>();
+   private Set<Fqn> childrenAdded;// =3D new HashSet<Fqn>();
+   private Set<Fqn> childrenRemoved;// =3D new HashSet<Fqn>();
    private Map<K, V> optimisticDataMap;
    private boolean versioningImplicit =3D true; // default
 =

@@ -61,7 +61,8 @@
       }
       this.node =3D node;
       this.workspace =3D workspace;
-      optimisticDataMap =3D new HashMap<K, V>(node.getDataDirect());
+      Map<K, V> nodeData =3D node.getDataDirect();
+      if (!nodeData.isEmpty()) optimisticDataMap =3D new HashMap<K, V>(nod=
eData);
       this.version =3D node.getVersion();
       if (version =3D=3D null)
       {
@@ -69,6 +70,18 @@
       }
    }
 =

+   protected Set<Fqn> getChildrenAddedSet()
+   {
+      if (childrenAdded =3D=3D null) childrenAdded =3D new HashSet<Fqn>();
+      return childrenAdded;
+   }
+
+   protected Set<Fqn> getChildrenRemovedSet()
+   {
+      if (childrenRemoved =3D=3D null) childrenRemoved =3D new HashSet<Fqn=
>();
+      return childrenRemoved;
+   }
+
    public boolean isChildrenModified()
    {
       return childrenModified;
@@ -117,6 +130,7 @@
    public V put(K key, V value)
    {
       modified =3D true;
+      if (optimisticDataMap =3D=3D null) optimisticDataMap =3D new HashMap=
<K, V>();
       return optimisticDataMap.put(key, value);
 =

    }
@@ -124,17 +138,19 @@
    public V remove(K key)
    {
       modified =3D true;
+      if (optimisticDataMap =3D=3D null) return null;
       return optimisticDataMap.remove(key);
 =

    }
 =

    public V get(K key)
    {
-      return optimisticDataMap.get(key);
+      return optimisticDataMap =3D=3D null ? null : optimisticDataMap.get(=
key);
    }
 =

    public Set<K> getKeys()
    {
+      if (optimisticDataMap =3D=3D null) return Collections.emptySet();
       return optimisticDataMap.keySet();
    }
 =

@@ -149,8 +165,8 @@
       Set<Object> names =3D new HashSet<Object>(optimisticChildNodeMap.key=
Set());
 =

       // process deltas
-      for (Fqn child : childrenAdded) names.add(child.getLastElement());
-      for (Fqn child : childrenRemoved) names.remove(child.getLastElement(=
));
+      if (childrenAdded !=3D null) for (Fqn child : childrenAdded) names.a=
dd(child.getLastElement());
+      if (childrenRemoved !=3D null) for (Fqn child : childrenRemoved) nam=
es.remove(child.getLastElement());
 =

       return names;
    }
@@ -170,11 +186,15 @@
    private void realPut(Map<K, V> data, boolean eraseData, boolean forceDi=
rtyFlag)
    {
       if (forceDirtyFlag) modified =3D true;
-      if (eraseData)
+      if (eraseData && optimisticDataMap !=3D null)
       {
          optimisticDataMap.clear();
       }
-      if (data !=3D null) optimisticDataMap.putAll(data);
+      if (data !=3D null)
+      {
+         if (optimisticDataMap =3D=3D null) optimisticDataMap =3D new Hash=
Map<K, V>();
+         optimisticDataMap.putAll(data);
+      }
    }
 =

    public Node<K, V> getParent()
@@ -190,18 +210,10 @@
          return null;
       }
 =

-      //see if we already have it
-//      NodeSPI<K, V> child =3D optimisticChildNodeMap.get(child_name);
-
-      // if not we need to create it
-//      if (child =3D=3D null)
-//      {
       NodeFactory<K, V> factory =3D cache.getConfiguration().getRuntimeCon=
fig().getNodeFactory();
       NodeSPI<K, V> child =3D (NodeSPI<K, V>) factory.createNodeOfType(par=
ent, child_name, parent, null);
-//         optimisticChildNodeMap.put(child_name, child);
-      childrenAdded.add(child.getFqn());
-      childrenRemoved.remove(child.getFqn());
-//      }
+      getChildrenAddedSet().add(child.getFqn());
+      if (childrenRemoved !=3D null) childrenRemoved.remove(child.getFqn()=
);
       childrenModified =3D true;
       return child;
    }
@@ -238,17 +250,27 @@
       this.version =3D version;
    }
 =

+   @SuppressWarnings("unchecked")
    public List<Set<Fqn>> getMergedChildren()
    {
-      //return optimisticChildNodeMap;
-      List<Set<Fqn>> l =3D new ArrayList<Set<Fqn>>(2);
-      l.add(childrenAdded);
-      l.add(childrenRemoved);
+      List l =3D new ArrayList(2);
+
+      if (childrenAdded !=3D null)
+         l.add(childrenAdded);
+      else
+         l.add(Collections.emptySet());
+
+      if (childrenRemoved !=3D null)
+         l.add(childrenRemoved);
+      else
+         l.add(Collections.emptySet());
+
       return l;
    }
 =

    public Map<K, V> getMergedData()
    {
+      if (optimisticDataMap =3D=3D null) return Collections.emptyMap();
       return optimisticDataMap;
    }
 =

@@ -266,12 +288,18 @@
    {
       created =3D true;
       // created !=3D modified!!!
-//      modified =3D true;
    }
 =

    public Map<K, V> getData()
    {
-      return Collections.unmodifiableMap(optimisticDataMap);
+      if (optimisticDataMap =3D=3D null)
+      {
+         return Collections.emptyMap();
+      }
+      else
+      {
+         return Collections.unmodifiableMap(optimisticDataMap);
+      }
    }
 =

    public String toString()
@@ -322,21 +350,23 @@
 =

    public void addChild(WorkspaceNode<K, V> child)
    {
-//      optimisticChildNodeMap.put(child.getFqn().getLastElement(), child.=
getNode());
-      childrenAdded.add(child.getFqn());
-      childrenRemoved.remove(child.getFqn());
+      getChildrenAddedSet().add(child.getFqn());
+      if (childrenRemoved !=3D null) childrenRemoved.remove(child.getFqn()=
);
       if (log.isTraceEnabled()) log.trace("Adding child " + child.getFqn()=
);
    }
 =

    public void clearData()
    {
-      modified =3D true;
-      optimisticDataMap.clear();
+      if (optimisticDataMap !=3D null)
+      {
+         optimisticDataMap.clear();
+         modified =3D true;
+      }
    }
 =

    public int dataSize()
    {
-      return optimisticDataMap.size();
+      return optimisticDataMap =3D=3D null ? 0 : optimisticDataMap.size();
    }
 =

    public boolean hasChild(Object o)
@@ -411,8 +441,8 @@
       Fqn childFqn =3D new Fqn(getFqn(), childName);
       /*if (n !=3D null)
       {*/
-      childrenRemoved.add(childFqn);
-      childrenAdded.remove(childFqn);
+      getChildrenRemovedSet().add(childFqn);
+      if (childrenAdded !=3D null) childrenAdded.remove(childFqn);
       childrenModified =3D true;
       return node.getChildDirect(childName) !=3D null;
       /*}


--===============5716647183599005563==--

From jbosscache-commits at lists.jboss.org Fri Jan  4 08:34:45 2008
Content-Type: multipart/mixed; boundary="===============0161075052718598933=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r4980 -
 core/trunk/src/main/java/org/jboss/cache.
Date: Fri, 04 Jan 2008 08:34:45 -0500
Message-ID: <E1JAmhB-0006Gn-4s@committer01.frg.pub.inap.atl.jboss.com>

--===============0161075052718598933==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: manik.surtani(a)jboss.com
Date: 2008-01-04 08:34:44 -0500 (Fri, 04 Jan 2008)
New Revision: 4980

Modified:
   core/trunk/src/main/java/org/jboss/cache/CacheImpl.java
Log:
JBCACHE-1204 - proper behaviour of shutdown hook when other sources may tri=
gger a shutdown - such as an MBean server, microcontainer, manual shutdown,=
 etc.

Modified: core/trunk/src/main/java/org/jboss/cache/CacheImpl.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/java/org/jboss/cache/CacheImpl.java	2008-01-04 13:0=
2:24 UTC (rev 4979)
+++ core/trunk/src/main/java/org/jboss/cache/CacheImpl.java	2008-01-04 13:3=
4:44 UTC (rev 4980)
@@ -53,7 +53,6 @@
 import org.jgroups.util.Rsp;
 import org.jgroups.util.RspList;
 =

-import javax.management.MBeanServerFactory;
 import javax.transaction.Status;
 import javax.transaction.SystemException;
 import javax.transaction.Transaction;
@@ -183,6 +182,15 @@
    private Interceptor interceptorChain;
 =

    private boolean trace;
+   /**
+    * Hook to shut down the cache when the JVM exits.
+    */
+   private Thread shutdownHook;
+   /**
+    * A flag that the shutdown hook sets before calling cache.stop().  All=
ows stop() to identify if it has been called
+    * from a shutdown hook.
+    */
+   private boolean invokedFromShutdownHook;
 =

    /**
     * Constructs an uninitialized CacheImpl.
@@ -769,25 +777,26 @@
 =

    private void addShutdownHook()
    {
-      ArrayList al =3D MBeanServerFactory.findMBeanServer(null);
-      if (al.size() =3D=3D 0)
+      // *Always* register a shutdown hook.  If cache.stop() is called man=
ually or from an MBean server or microcontainer,
+      // cache.stop will de-register the shutdown hook to prevent shutdown=
 from happening again when the JVM exits.
+
+      shutdownHook =3D new Thread()
       {
-         // the only MBean server is the system (JDK) server.  So we need =
to register a shutdown hook.
-         // install a VM shutdown hook
-         Thread shutdownHook =3D new Thread()
+         public void run()
          {
-            public void run()
+            try
             {
+               invokedFromShutdownHook =3D true;
                CacheImpl.this.stop();
             }
-         };
+            finally
+            {
+               invokedFromShutdownHook =3D false;
+            }
+         }
+      };
 =

-         Runtime.getRuntime().addShutdownHook(shutdownHook);
-      }
-      else
-      {
-         log.trace("Running in an MBeanServer environment.  Not registerin=
g a shutdown hook with the VM as the MBeanServer will handle lifecycle.");
-      }
+      Runtime.getRuntime().addShutdownHook(shutdownHook);
    }
 =

    /**
@@ -895,6 +904,9 @@
    {
       cacheStatus =3D CacheStatus.STOPPING;
 =

+      // if this is called from a source other than the shutdown hook, der=
egister the shutdown hook.      =

+      if (!invokedFromShutdownHook) Runtime.getRuntime().removeShutdownHoo=
k(shutdownHook);
+
       componentRegistry.stop();
 =

       // before closing the channel stop the buddy manager


--===============0161075052718598933==--

From jbosscache-commits at lists.jboss.org Fri Jan  4 09:24:13 2008
Content-Type: multipart/mixed; boundary="===============1496872476657225934=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r4981 -
 core/trunk/src/main/java/org/jboss/cache/marshall.
Date: Fri, 04 Jan 2008 09:24:13 -0500
Message-ID: <E1JAnT3-0007Py-Om@committer01.frg.pub.inap.atl.jboss.com>

--===============1496872476657225934==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: manik.surtani(a)jboss.com
Date: 2008-01-04 09:24:13 -0500 (Fri, 04 Jan 2008)
New Revision: 4981

Modified:
   core/trunk/src/main/java/org/jboss/cache/marshall/CacheMarshaller200.java
   core/trunk/src/main/java/org/jboss/cache/marshall/CacheMarshaller210.java
Log:
Initialised loggers in constructor

Modified: core/trunk/src/main/java/org/jboss/cache/marshall/CacheMarshaller=
200.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/java/org/jboss/cache/marshall/CacheMarshaller200.ja=
va	2008-01-04 13:34:44 UTC (rev 4980)
+++ core/trunk/src/main/java/org/jboss/cache/marshall/CacheMarshaller200.ja=
va	2008-01-04 14:24:13 UTC (rev 4981)
@@ -63,6 +63,7 @@
 =

    public CacheMarshaller200()
    {
+      initLogger();
    }
 =

    /**

Modified: core/trunk/src/main/java/org/jboss/cache/marshall/CacheMarshaller=
210.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/java/org/jboss/cache/marshall/CacheMarshaller210.ja=
va	2008-01-04 13:34:44 UTC (rev 4980)
+++ core/trunk/src/main/java/org/jboss/cache/marshall/CacheMarshaller210.ja=
va	2008-01-04 14:24:13 UTC (rev 4981)
@@ -1,7 +1,5 @@
 package org.jboss.cache.marshall;
 =

-import org.apache.commons.logging.LogFactory;
-
 import java.io.IOException;
 import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
@@ -20,7 +18,7 @@
 {
    public CacheMarshaller210()
    {
-      log =3D LogFactory.getLog(CacheMarshaller210.class);
+      initLogger();
    }
 =

    /**


--===============1496872476657225934==--

From jbosscache-commits at lists.jboss.org Fri Jan  4 09:38:53 2008
Content-Type: multipart/mixed; boundary="===============4810165010711579213=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r4982 -
 core/trunk/src/test/java/org/jboss/cache/optimistic.
Date: Fri, 04 Jan 2008 09:38:52 -0500
Message-ID: <E1JAnhE-0001rL-QY@committer01.frg.pub.inap.atl.jboss.com>

--===============4810165010711579213==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: manik.surtani(a)jboss.com
Date: 2008-01-04 09:38:52 -0500 (Fri, 04 Jan 2008)
New Revision: 4982

Modified:
   core/trunk/src/test/java/org/jboss/cache/optimistic/MockFailureIntercept=
or.java
   core/trunk/src/test/java/org/jboss/cache/optimistic/MockInterceptor.java
   core/trunk/src/test/java/org/jboss/cache/optimistic/OptimisticReplicatio=
nInterceptorTest.java
   core/trunk/src/test/java/org/jboss/cache/optimistic/TxInterceptorTest.ja=
va
Log:
Patched some tests that should expect ids instead of methods

Modified: core/trunk/src/test/java/org/jboss/cache/optimistic/MockFailureIn=
terceptor.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/test/java/org/jboss/cache/optimistic/MockFailureIntercep=
tor.java	2008-01-04 14:24:13 UTC (rev 4981)
+++ core/trunk/src/test/java/org/jboss/cache/optimistic/MockFailureIntercep=
tor.java	2008-01-04 14:38:52 UTC (rev 4982)
@@ -20,7 +20,8 @@
 public class MockFailureInterceptor extends Interceptor
 {
    private List<Method> allCalled =3D new ArrayList<Method>();
-   private List failurelist =3D new ArrayList();
+   private List<Method> failurelist =3D new ArrayList<Method>();
+   private List<Integer> allCalledIdsList =3D new ArrayList<Integer>();
 =

    @Override
    public Object invoke(InvocationContext ctx) throws Throwable
@@ -30,6 +31,7 @@
       {
          if (failurelist.contains(m.getMethod())) throw new Exception("Fai=
lure in method " + m);
          allCalled.add(m.getMethod());
+         allCalledIdsList.add(m.getMethodId());
       }
 =

       return null;
@@ -38,7 +40,7 @@
    /**
     * @return Returns the failurelist.
     */
-   public List getFailurelist()
+   public List<Method> getFailurelist()
    {
       return failurelist;
    }
@@ -46,7 +48,7 @@
    /**
     * @param failurelist The failurelist to set.
     */
-   public void setFailurelist(List failurelist)
+   public void setFailurelist(List<Method> failurelist)
    {
       this.failurelist =3D failurelist;
    }
@@ -66,4 +68,9 @@
    {
       this.allCalled =3D called;
    }
+
+   public List<Integer> getAllCalledIds()
+   {
+      return allCalledIdsList;
+   }
 }
\ No newline at end of file

Modified: core/trunk/src/test/java/org/jboss/cache/optimistic/MockIntercept=
or.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/test/java/org/jboss/cache/optimistic/MockInterceptor.jav=
a	2008-01-04 14:24:13 UTC (rev 4981)
+++ core/trunk/src/test/java/org/jboss/cache/optimistic/MockInterceptor.jav=
a	2008-01-04 14:38:52 UTC (rev 4982)
@@ -22,6 +22,7 @@
    private Method called =3D null;
 =

    private List<Method> calledlist =3D new ArrayList<Method>();
+   private List<Integer> calledIdsList =3D new ArrayList<Integer>();
 =

    @Override
    public synchronized Object invoke(InvocationContext ctx) throws Throwab=
le
@@ -30,6 +31,7 @@
       if (!MethodDeclarations.isBlockUnblockMethod(m.getMethodId()))
       {
          calledlist.add(m.getMethod());
+         calledIdsList.add(m.getMethodId());
          called =3D m.getMethod();
       }
 =

@@ -49,6 +51,11 @@
       return calledlist;
    }
 =

+   public List<Integer> getAllCalledIds()
+   {
+      return calledIdsList;
+   }
+
    /**
     * @param called The called to set.
     */

Modified: core/trunk/src/test/java/org/jboss/cache/optimistic/OptimisticRep=
licationInterceptorTest.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/test/java/org/jboss/cache/optimistic/OptimisticReplicati=
onInterceptorTest.java	2008-01-04 14:24:13 UTC (rev 4981)
+++ core/trunk/src/test/java/org/jboss/cache/optimistic/OptimisticReplicati=
onInterceptorTest.java	2008-01-04 14:38:52 UTC (rev 4982)
@@ -79,7 +79,7 @@
 =

       //make sure all calls were done in right order
 =

-      List calls =3D dummy.getAllCalled();
+      List calls =3D dummy.getAllCalledIds();
 =

       assertEquals(MethodDeclarations.optimisticPrepareMethod_id, calls.ge=
t(0));
       assertEquals(MethodDeclarations.commitMethod_id, calls.get(1));
@@ -105,7 +105,7 @@
 =

       //make sure all calls were done in right order
 =

-      List calls =3D dummy.getAllCalled();
+      List calls =3D dummy.getAllCalledIds();
 =

       assertEquals(1, calls.size());
       assertEquals(MethodDeclarations.rollbackMethod_id, calls.get(0));
@@ -166,7 +166,7 @@
       //assert that the remote prepare has populated the local workspace
       assertEquals(3, entry.getTransactionWorkSpace().getNodes().size());
       assertEquals(1, entry.getModifications().size());
-      List calls =3D dummy.getAllCalled();
+      List calls =3D dummy.getAllCalledIds();
       assertEquals(MethodDeclarations.optimisticPrepareMethod_id, calls.ge=
t(2));
 =

 =

@@ -230,7 +230,7 @@
 =

       assertEquals(3, entry.getTransactionWorkSpace().getNodes().size());
       assertEquals(1, entry.getModifications().size());
-      List calls =3D dummy.getAllCalled();
+      List calls =3D dummy.getAllCalledIds();
       assertEquals(MethodDeclarations.optimisticPrepareMethod_id, calls.ge=
t(2));
 =

 =

@@ -289,7 +289,7 @@
       meth.getArgs()[0] =3D remoteGtx;
 =

 =

-      List calls =3D dummy.getAllCalled();
+      List calls =3D dummy.getAllCalledIds();
       assertEquals(2, calls.size());
 =

 =

@@ -350,7 +350,7 @@
       meth.getArgs()[0] =3D remoteGtx;
 =

 =

-      List calls =3D dummy.getAllCalled();
+      List calls =3D dummy.getAllCalledIds();
       assertEquals(2, calls.size());
 =

 =

@@ -426,7 +426,7 @@
       //assert that the remote prepare has populated the local workspace
       assertEquals(3, entry.getTransactionWorkSpace().getNodes().size());
       assertEquals(1, entry.getModifications().size());
-      List calls =3D dummy.getAllCalled();
+      List calls =3D dummy.getAllCalledIds();
       assertEquals(MethodDeclarations.optimisticPrepareMethod_id, calls.ge=
t(2));
 =

 =

@@ -491,12 +491,12 @@
       assertEquals(0, cache2.getTransactionTable().getNumLocalTransactions=
());
 =

 =

-      List calls =3D dummy.getAllCalled();
+      List calls =3D dummy.getAllCalledIds();
 =

       assertEquals(MethodDeclarations.optimisticPrepareMethod_id, calls.ge=
t(0));
       assertEquals(MethodDeclarations.commitMethod_id, calls.get(1));
 =

-      List calls2 =3D dummy2.getAllCalled();
+      List calls2 =3D dummy2.getAllCalledIds();
       assertEquals(MethodDeclarations.optimisticPrepareMethod_id, calls2.g=
et(0));
       assertEquals(MethodDeclarations.commitMethod_id, calls2.get(1));
 =

@@ -554,12 +554,12 @@
       assertEquals(0, cache2.getTransactionTable().getNumLocalTransactions=
());
 =

 =

-      List calls =3D dummy.getAllCalled();
+      List calls =3D dummy.getAllCalledIds();
       assertEquals(MethodDeclarations.optimisticPrepareMethod_id, calls.ge=
t(0));
       assertEquals(MethodDeclarations.rollbackMethod_id, calls.get(1));
 =

       //we have no prepare - as it failed - but we have a commit
-      List calls2 =3D dummy2.getAllCalled();
+      List calls2 =3D dummy2.getAllCalledIds();
       assertEquals(MethodDeclarations.rollbackMethod_id, calls2.get(0));
 =

       destroyCache(cache2);
@@ -618,11 +618,11 @@
       assertEquals(0, cache2.getTransactionTable().getNumLocalTransactions=
());
 =

 =

-      List calls =3D dummy.getAllCalled();
+      List calls =3D dummy.getAllCalledIds();
       assertEquals(MethodDeclarations.rollbackMethod_id, calls.get(0));
 =

       //we have no prepare - as it failed - but we have a commit
-      List calls2 =3D dummy2.getAllCalled();
+      List calls2 =3D dummy2.getAllCalledIds();
       assertEquals(0, calls2.size());
 =

       destroyCache(cache2);

Modified: core/trunk/src/test/java/org/jboss/cache/optimistic/TxInterceptor=
Test.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/test/java/org/jboss/cache/optimistic/TxInterceptorTest.j=
ava	2008-01-04 14:24:13 UTC (rev 4981)
+++ core/trunk/src/test/java/org/jboss/cache/optimistic/TxInterceptorTest.j=
ava	2008-01-04 14:38:52 UTC (rev 4982)
@@ -53,7 +53,7 @@
 =

       //make sure all calls were done in right order
 =

-      List<?> calls =3D dummy.getAllCalled();
+      List<?> calls =3D dummy.getAllCalledIds();
 =

       assertEquals(MethodDeclarations.optimisticPrepareMethod_id, calls.ge=
t(0));
       assertEquals(MethodDeclarations.commitMethod_id, calls.get(1));
@@ -88,7 +88,7 @@
 =

       assertNull(mgr.getTransaction());
 =

-      List<?> calls =3D dummy.getAllCalled();
+      List<?> calls =3D dummy.getAllCalledIds();
       assertEquals(MethodDeclarations.optimisticPrepareMethod_id, calls.ge=
t(0));
       assertEquals(MethodDeclarations.commitMethod_id, calls.get(1));
 =

@@ -119,7 +119,7 @@
 =

       assertNull(mgr.getTransaction());
 =

-      List<?> calls =3D dummy.getAllCalled();
+      List<?> calls =3D dummy.getAllCalledIds();
       assertEquals(1, calls.size());
       assertEquals(MethodDeclarations.rollbackMethod_id, calls.get(0));
 =

@@ -206,7 +206,7 @@
 =

       assertNull(mgr.getTransaction());
 =

-      List<?> calls =3D dummy.getAllCalled();
+      List<?> calls =3D dummy.getAllCalledIds();
       assertEquals(MethodDeclarations.optimisticPrepareMethod_id, calls.ge=
t(0));
       assertEquals(MethodDeclarations.commitMethod_id, calls.get(1));
       boolean failed =3D false;
@@ -253,7 +253,7 @@
 =

       assertNull(mgr.getTransaction());
 =

-      List<?> calls =3D dummy.getAllCalled();
+      List<?> calls =3D dummy.getAllCalledIds();
       assertEquals(MethodDeclarations.optimisticPrepareMethod_id, calls.ge=
t(0));
       assertEquals(MethodDeclarations.commitMethod_id, calls.get(1));
 =

@@ -290,7 +290,7 @@
       mgr.commit();
 =

       //test local calls
-      List<?> calls =3D dummy.getAllCalled();
+      List<?> calls =3D dummy.getAllCalledIds();
       assertEquals(MethodDeclarations.optimisticPrepareMethod_id, calls.ge=
t(0));
       assertEquals(MethodDeclarations.commitMethod_id, calls.get(1));
       assertNull(mgr.getTransaction());
@@ -325,7 +325,7 @@
       assertNotNull(table.getLocalTransaction(remoteGtx));
 =

       //assert that the method has been passed up the stack
-      calls =3D dummy.getAllCalled();
+      calls =3D dummy.getAllCalledIds();
       assertEquals(MethodDeclarations.optimisticPrepareMethod_id, calls.ge=
t(2));
 =

       //assert we have the tx in th table
@@ -386,7 +386,7 @@
       assertNotNull(table.getLocalTransaction(remoteGtx));
 =

 =

-      List<?> calls =3D dummy.getAllCalled();
+      List<?> calls =3D dummy.getAllCalledIds();
       assertEquals(MethodDeclarations.optimisticPrepareMethod_id, calls.ge=
t(0));
 =

       //assert we have two current transactions
@@ -397,7 +397,7 @@
       mgr.commit();
 =

       //check local calls
-      calls =3D dummy.getAllCalled();
+      calls =3D dummy.getAllCalledIds();
       assertEquals(MethodDeclarations.optimisticPrepareMethod_id, calls.ge=
t(1));
       assertEquals(MethodDeclarations.commitMethod_id, calls.get(2));
 =

@@ -483,7 +483,7 @@
       assertNull(table.get(remoteGtx));
       assertNull(table.getLocalTransaction(remoteGtx));
 =

-      List<?> calls =3D dummy.getAllCalled();
+      List<?> calls =3D dummy.getAllCalledIds();
       assertEquals(MethodDeclarations.optimisticPrepareMethod_id, calls.ge=
t(0));
       assertEquals(MethodDeclarations.commitMethod_id, calls.get(1));
 =

@@ -493,7 +493,7 @@
       //commit the local tx
       mgr.commit();
 =

-      calls =3D dummy.getAllCalled();
+      calls =3D dummy.getAllCalledIds();
       assertEquals(MethodDeclarations.optimisticPrepareMethod_id, calls.ge=
t(2));
       assertEquals(MethodDeclarations.commitMethod_id, calls.get(3));
 =

@@ -571,7 +571,7 @@
       assertNull(table.get(remoteGtx));
       assertNull(table.getLocalTransaction(remoteGtx));
 =

-      List<?> calls =3D dummy.getAllCalled();
+      List<?> calls =3D dummy.getAllCalledIds();
       assertEquals(MethodDeclarations.optimisticPrepareMethod_id, calls.ge=
t(0));
       assertEquals(MethodDeclarations.rollbackMethod_id, calls.get(1));
 =

@@ -581,7 +581,7 @@
       //commit the local tx
       mgr.commit();
 =

-      calls =3D dummy.getAllCalled();
+      calls =3D dummy.getAllCalledIds();
       assertEquals(MethodDeclarations.optimisticPrepareMethod_id, calls.ge=
t(2));
       assertEquals(MethodDeclarations.commitMethod_id, calls.get(3));
 =

@@ -620,7 +620,7 @@
       mgr.commit();
 =

       //test local calls
-      List<?> calls =3D dummy.getAllCalled();
+      List<?> calls =3D dummy.getAllCalledIds();
       assertEquals(MethodDeclarations.optimisticPrepareMethod_id, calls.ge=
t(0));
       assertEquals(MethodDeclarations.commitMethod_id, calls.get(1));
 =

@@ -660,7 +660,7 @@
       //this is not populated until replication interceptor is used
       assertEquals(1, table.get(remoteGtx).getModifications().size());
 =

-      calls =3D dummy.getAllCalled();
+      calls =3D dummy.getAllCalledIds();
       assertEquals(MethodDeclarations.optimisticPrepareMethod_id, calls.ge=
t(2));
 =

       assertNull(mgr.getTransaction());
@@ -712,7 +712,7 @@
       mgr.commit();
 =

       //test local calls
-      List<?> calls =3D dummy.getAllCalled();
+      List<?> calls =3D dummy.getAllCalledIds();
       assertEquals(MethodDeclarations.optimisticPrepareMethod_id, calls.ge=
t(0));
       assertEquals(MethodDeclarations.commitMethod_id, calls.get(1));
 =

@@ -744,7 +744,7 @@
       //this is not populated until replication interceptor is used
       assertEquals(1, table.get(remoteGtx).getModifications().size());
 =

-      calls =3D dummy.getAllCalled();
+      calls =3D dummy.getAllCalledIds();
       assertEquals(MethodDeclarations.optimisticPrepareMethod_id, calls.ge=
t(2));
 =

 //	    call our remote method
@@ -758,7 +758,7 @@
          fail();
       }
 =

-      calls =3D dummy.getAllCalled();
+      calls =3D dummy.getAllCalledIds();
       assertEquals(MethodDeclarations.optimisticPrepareMethod_id, calls.ge=
t(2));
       assertEquals(MethodDeclarations.rollbackMethod_id, calls.get(3));
 =

@@ -800,7 +800,7 @@
       mgr.commit();
 =

 =

-      List<?> calls =3D dummy.getAllCalled();
+      List<?> calls =3D dummy.getAllCalledIds();
       assertEquals(MethodDeclarations.optimisticPrepareMethod_id, calls.ge=
t(0));
       assertEquals(MethodDeclarations.commitMethod_id, calls.get(1));
 =



--===============4810165010711579213==--

From jbosscache-commits at lists.jboss.org Fri Jan  4 10:56:39 2008
Content-Type: multipart/mixed; boundary="===============5884787168161547217=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r4983 - in
 core/branches/1.4.X/src/org/jboss/cache: marshall and 1 other directory.
Date: Fri, 04 Jan 2008 10:56:39 -0500
Message-ID: <E1JAouV-0000R6-LC@committer01.frg.pub.inap.atl.jboss.com>

--===============5884787168161547217==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: manik.surtani(a)jboss.com
Date: 2008-01-04 10:56:39 -0500 (Fri, 04 Jan 2008)
New Revision: 4983

Modified:
   core/branches/1.4.X/src/org/jboss/cache/Node.java
   core/branches/1.4.X/src/org/jboss/cache/TreeCache.java
   core/branches/1.4.X/src/org/jboss/cache/marshall/JBCMethodCall.java
Log:
JBCACHE-1230 - reduced noisy toString() implementations

Modified: core/branches/1.4.X/src/org/jboss/cache/Node.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/branches/1.4.X/src/org/jboss/cache/Node.java	2008-01-04 14:38:52 U=
TC (rev 4982)
+++ core/branches/1.4.X/src/org/jboss/cache/Node.java	2008-01-04 15:56:39 U=
TC (rev 4983)
@@ -445,7 +445,31 @@
       synchronized (this)
       {
          if (data !=3D null)
-            sb.append("\ndata=3D" + data);
+            sb.append("\ndata=3D[");
+            Set keys =3D data.keySet();
+            int i=3D0;
+            for (Iterator it =3D keys.iterator(); it.hasNext();)
+            {
+               i++;
+               sb.append(it.next());
+
+               if (i =3D=3D 5)
+               {
+                  int more =3D keys.size() - 5;
+                  if (more > 1)
+                  {
+                     sb.append(", and ");
+                     sb.append(more);
+                     sb.append(" more");
+                     break;
+                  }
+               }
+               else
+               {
+                  sb.append(", ");
+               }
+            }
+            sb.append("]");         =

       }
       if (lock_ !=3D null)
       {

Modified: core/branches/1.4.X/src/org/jboss/cache/TreeCache.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/branches/1.4.X/src/org/jboss/cache/TreeCache.java	2008-01-04 14:38=
:52 UTC (rev 4982)
+++ core/branches/1.4.X/src/org/jboss/cache/TreeCache.java	2008-01-04 15:56=
:39 UTC (rev 4983)
@@ -4422,7 +4422,7 @@
       if (rsps =3D=3D null)
       {
          // return null;
-         throw new NotSerializableException("RpcDispatcher returned a null=
.  This is most often caused by args for " + method_call + " not being seri=
alizable.");
+         throw new NotSerializableException("RpcDispatcher returned a null=
.  This is most often caused by args for " + method_call.getName() + " not =
being serializable.");
       }
 =

       if (mode =3D=3D GroupRequest.GET_NONE)

Modified: core/branches/1.4.X/src/org/jboss/cache/marshall/JBCMethodCall.ja=
va
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/branches/1.4.X/src/org/jboss/cache/marshall/JBCMethodCall.java	200=
8-01-04 14:38:52 UTC (rev 4982)
+++ core/branches/1.4.X/src/org/jboss/cache/marshall/JBCMethodCall.java	200=
8-01-04 15:56:39 UTC (rev 4983)
@@ -65,17 +65,12 @@
       ret.append(method_name);
       ret.append("; id:");
       ret.append(methodId);
-      ret.append('(');
-      if (args !=3D null)
+      ret.append("; Args: (");
+      if (args !=3D null && args.length > 0)
       {
-         for (int i =3D 0; i < args.length; i++)
-         {
-            if (first)
-               first =3D false;
-            else
-               ret.append(", ");
-            ret.append(args[i]);
-         }
+         ret.append(" arg[0] =3D ");
+         ret.append(args[0]);
+         if (args.length > 1) ret.append(" ...");
       }
       ret.append(')');
       return ret.toString();


--===============5884787168161547217==--

From jbosscache-commits at lists.jboss.org Fri Jan  4 10:57:04 2008
Content-Type: multipart/mixed; boundary="===============2409597929506146656=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r4984 - in
 core/trunk/src/main/java/org/jboss/cache: marshall and 1 other directory.
Date: Fri, 04 Jan 2008 10:57:04 -0500
Message-ID: <E1JAouu-0000SS-Iy@committer01.frg.pub.inap.atl.jboss.com>

--===============2409597929506146656==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: manik.surtani(a)jboss.com
Date: 2008-01-04 10:57:04 -0500 (Fri, 04 Jan 2008)
New Revision: 4984

Modified:
   core/trunk/src/main/java/org/jboss/cache/CacheImpl.java
   core/trunk/src/main/java/org/jboss/cache/UnversionedNode.java
   core/trunk/src/main/java/org/jboss/cache/marshall/MethodCall.java
Log:
JBCACHE-1230 - reduced noisy toString() impls

Modified: core/trunk/src/main/java/org/jboss/cache/CacheImpl.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/java/org/jboss/cache/CacheImpl.java	2008-01-04 15:5=
6:39 UTC (rev 4983)
+++ core/trunk/src/main/java/org/jboss/cache/CacheImpl.java	2008-01-04 15:5=
7:04 UTC (rev 4984)
@@ -1910,7 +1910,7 @@
 =

       if (trace)
       {
-         log.trace("callRemoteMethods(): valid members are " + validMember=
s + " methods: " + method_call.getArgs()[0]);
+         log.trace("callRemoteMethods(): valid members are " + validMember=
s + " methods: " + method_call);
       }
 =

       if (channel.flushSupported())
@@ -1927,7 +1927,7 @@
       if (rsps =3D=3D null)
       {
          // return null;
-         throw new NotSerializableException("RpcDispatcher returned a null=
.  This is most often caused by args for " + method_call + " not being seri=
alizable.");
+         throw new NotSerializableException("RpcDispatcher returned a null=
.  This is most often caused by args for " + method_call.getName() + " not =
being serializable.");
       }
       if (mode =3D=3D GroupRequest.GET_NONE)
       {

Modified: core/trunk/src/main/java/org/jboss/cache/UnversionedNode.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/java/org/jboss/cache/UnversionedNode.java	2008-01-0=
4 15:56:39 UTC (rev 4983)
+++ core/trunk/src/main/java/org/jboss/cache/UnversionedNode.java	2008-01-0=
4 15:57:04 UTC (rev 4984)
@@ -332,7 +332,7 @@
    @Override
    public String toString()
    {
-      StringBuffer sb =3D new StringBuffer();
+      StringBuilder sb =3D new StringBuilder();
       sb.append(getClass().getSimpleName());
       if (!valid) sb.append(" (INVALID!) ");
 =

@@ -348,12 +348,61 @@
       {
          synchronized (data)
          {
-            sb.append(" data=3D").append(data.keySet());
+            sb.append(" data=3D[");
+            Set keys =3D data.keySet();
+            int i =3D 0;
+            for (Object o : keys)
+            {
+               i++;
+               sb.append(o);
+
+               if (i =3D=3D 5)
+               {
+                  int more =3D keys.size() - 5;
+                  if (more > 1)
+                  {
+                     sb.append(", and ");
+                     sb.append(more);
+                     sb.append(" more");
+                     break;
+                  }
+               }
+               else
+               {
+                  sb.append(", ");
+               }
+            }
+            sb.append("]");
          }
       }
       if (children !=3D null && !children.isEmpty())
       {
-         sb.append(" child=3D").append(getChildrenNamesDirect());
+         sb.append(" children=3D[");
+         Set names =3D getChildrenNamesDirect();
+         int i =3D 0;
+         for (Object o : names)
+         {
+            i++;
+            sb.append(o);
+
+            if (i =3D=3D 5)
+            {
+               int more =3D names.size() - 5;
+               if (more > 1)
+               {
+                  sb.append(", and ");
+                  sb.append(more);
+                  sb.append(" more");
+                  break;
+               }
+            }
+            else
+            {
+               sb.append(", ");
+            }
+         }
+         sb.append("]");
+
       }
       if (lock_ !=3D null)
       {

Modified: core/trunk/src/main/java/org/jboss/cache/marshall/MethodCall.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/java/org/jboss/cache/marshall/MethodCall.java	2008-=
01-04 15:56:39 UTC (rev 4983)
+++ core/trunk/src/main/java/org/jboss/cache/marshall/MethodCall.java	2008-=
01-04 15:57:04 UTC (rev 4984)
@@ -37,21 +37,21 @@
       // for serialization
    }
 =

-    /**
-     * This only works for prepare() and optimisticPrepare() method calls.
-     */
-    public boolean isOnePhaseCommitPrepareMehod()
-    {
-       switch (this.getMethodId())
-       {
-          case MethodDeclarations.prepareMethod_id:
-             return (Boolean) this.getArgs()[3];
-          case MethodDeclarations.optimisticPrepareMethod_id:
-             return (Boolean) this.getArgs()[4];
-          default:
-             return false;
-       }
-    }
+   /**
+    * This only works for prepare() and optimisticPrepare() method calls.
+    */
+   public boolean isOnePhaseCommitPrepareMehod()
+   {
+      switch (this.getMethodId())
+      {
+         case MethodDeclarations.prepareMethod_id:
+            return (Boolean) this.getArgs()[3];
+         case MethodDeclarations.optimisticPrepareMethod_id:
+            return (Boolean) this.getArgs()[4];
+         default:
+            return false;
+      }
+   }
 =

 =

    protected MethodCall(Method method, Object... arguments)
@@ -90,23 +90,13 @@
       ret.append("; MethodIdInteger: ");
       ret.append(methodIdInteger);
       ret.append("; Args: (");
-      if (args !=3D null)
+      if (args !=3D null && args.length > 0)
       {
-         for (Object arg : args)
-         {
-            if (first)
-            {
-               first =3D false;
-            }
-            else
-            {
-               ret.append(", ");
-            }
-            ret.append(arg);
-         }
+         ret.append(" arg[0] =3D ");
+         ret.append(args[0]);
+         if (args.length > 1) ret.append(" ...");
       }
       ret.append(')');
       return ret.toString();
-
    }
 }


--===============2409597929506146656==--

From jbosscache-commits at lists.jboss.org Fri Jan  4 11:20:23 2008
Content-Type: multipart/mixed; boundary="===============3839885183998206218=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r4985 -
 cache-bench-fwk/trunk/src/org/cachebench/smartfrog.
Date: Fri, 04 Jan 2008 11:20:23 -0500
Message-ID: <E1JApHT-0005LH-Kg@committer01.frg.pub.inap.atl.jboss.com>

--===============3839885183998206218==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: mircea.markus
Date: 2008-01-04 11:20:23 -0500 (Fri, 04 Jan 2008)
New Revision: 4985

Modified:
   cache-bench-fwk/trunk/src/org/cachebench/smartfrog/CacheBenchmarkPrim.ja=
va
Log:
the Prim was enhanced to log the output of the run script

Modified: cache-bench-fwk/trunk/src/org/cachebench/smartfrog/CacheBenchmark=
Prim.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- cache-bench-fwk/trunk/src/org/cachebench/smartfrog/CacheBenchmarkPrim.j=
ava	2008-01-04 15:57:04 UTC (rev 4984)
+++ cache-bench-fwk/trunk/src/org/cachebench/smartfrog/CacheBenchmarkPrim.j=
ava	2008-01-04 16:20:23 UTC (rev 4985)
@@ -7,7 +7,10 @@
 import org.smartfrog.sfcore.prim.PrimImpl;
 import org.smartfrog.sfcore.prim.TerminationRecord;
 =

+import java.io.BufferedReader;
 import java.io.File;
+import java.io.InputStreamReader;
+import java.io.LineNumberReader;
 import java.rmi.RemoteException;
 =

 /**
@@ -56,6 +59,13 @@
          String command =3D scriptToExec + " " + nodeIndex + " " + cacheDi=
stribution + " -DclusterSize=3D" + clusterSize;
          log.info("Executing command: " + command);
          Process process =3D Runtime.getRuntime().exec(command, null, toRu=
nIn);
+         InputStreamReader reader =3D new InputStreamReader(process.getInp=
utStream());
+         BufferedReader bufferedReader =3D new LineNumberReader(reader);
+         String line;
+         while ((line =3D bufferedReader.readLine()) !=3D null)
+         {
+            log.debug(scriptToExec + ">>>" + line);
+         }
          int exitValue =3D process.waitFor();
          if (exitValue !=3D 0)
          {


--===============3839885183998206218==--

From jbosscache-commits at lists.jboss.org Fri Jan  4 11:55:08 2008
Content-Type: multipart/mixed; boundary="===============4381408720091464154=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r4986 -
 core/trunk/src/main/java/org/jboss/cache/interceptors.
Date: Fri, 04 Jan 2008 11:55:01 -0500
Message-ID: <E1JApoz-0003bB-7h@committer01.frg.pub.inap.atl.jboss.com>

--===============4381408720091464154==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: manik.surtani(a)jboss.com
Date: 2008-01-04 11:55:01 -0500 (Fri, 04 Jan 2008)
New Revision: 4986

Modified:
   core/trunk/src/main/java/org/jboss/cache/interceptors/ActivationIntercep=
tor.java
   core/trunk/src/main/java/org/jboss/cache/interceptors/CacheLoaderInterce=
ptor.java
   core/trunk/src/main/java/org/jboss/cache/interceptors/CacheStoreIntercep=
tor.java
   core/trunk/src/main/java/org/jboss/cache/interceptors/DataGravitatorInte=
rceptor.java
   core/trunk/src/main/java/org/jboss/cache/interceptors/EvictionIntercepto=
r.java
   core/trunk/src/main/java/org/jboss/cache/interceptors/Interceptor.java
   core/trunk/src/main/java/org/jboss/cache/interceptors/OptimisticCreateIf=
NotExistsInterceptor.java
   core/trunk/src/main/java/org/jboss/cache/interceptors/OptimisticNodeInte=
rceptor.java
   core/trunk/src/main/java/org/jboss/cache/interceptors/OptimisticValidato=
rInterceptor.java
   core/trunk/src/main/java/org/jboss/cache/interceptors/PassivationInterce=
ptor.java
   core/trunk/src/main/java/org/jboss/cache/interceptors/PessimisticLockInt=
erceptor.java
Log:
JBCACHE-811 - more efficiencies with peek()

Modified: core/trunk/src/main/java/org/jboss/cache/interceptors/ActivationI=
nterceptor.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/java/org/jboss/cache/interceptors/ActivationInterce=
ptor.java	2008-01-04 16:20:23 UTC (rev 4985)
+++ core/trunk/src/main/java/org/jboss/cache/interceptors/ActivationInterce=
ptor.java	2008-01-04 16:55:01 UTC (rev 4986)
@@ -177,7 +177,7 @@
    private void removeNodeFromCacheLoader(InvocationContext ctx, Fqn fqn) =
throws Throwable
    {
       NodeSPI n;
-      if (((n =3D peekNode(ctx, fqn, false, true)) !=3D null) && n.isDataL=
oaded() && loader.exists(fqn))
+      if (((n =3D peekNode(ctx, fqn, false, true, false)) !=3D null) && n.=
isDataLoaded() && loader.exists(fqn))
       {
          // node not null and attributes have been loaded?
          if (!n.getChildrenDirect().isEmpty())
@@ -339,9 +339,9 @@
                // AND it was found in the cache loader (nodeLoaded =3D tru=
e).
                // Then notify the listeners that the node has been activat=
ed.
                Fqn fqn =3D (Fqn) args[1];
-               if (fqn !=3D null && peekNode(ctx, fqn, false, false) !=3D =
null && loader.exists(fqn))
+               if (fqn !=3D null && peekNode(ctx, fqn, false, false, false=
) !=3D null && loader.exists(fqn))
                {
-                  NodeSPI n =3D peekNode(ctx, fqn, false, true);// don't l=
oad
+                  NodeSPI n =3D peekNode(ctx, fqn, false, true, false);// =
don't load
                   // node not null and attributes have been loaded?
                   if (n !=3D null && n.isDataLoaded())
                   {

Modified: core/trunk/src/main/java/org/jboss/cache/interceptors/CacheLoader=
Interceptor.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/java/org/jboss/cache/interceptors/CacheLoaderInterc=
eptor.java	2008-01-04 16:20:23 UTC (rev 4985)
+++ core/trunk/src/main/java/org/jboss/cache/interceptors/CacheLoaderInterc=
eptor.java	2008-01-04 16:55:01 UTC (rev 4986)
@@ -265,7 +265,7 @@
 =

    private void loadIfNeeded(InvocationContext ctx, Fqn fqn, Object key, b=
oolean allKeys, boolean initNode, boolean acquireLock, MethodCall m, Transa=
ctionEntry entry, boolean recursive, boolean isMove, boolean bypassLoadingD=
ata) throws Throwable
    {
-      NodeSPI n =3D cache.peek(fqn, true, true);
+      NodeSPI n =3D peekNode(ctx, fqn, false, true, true);
 =

       boolean mustLoad =3D mustLoad(n, key, allKeys);
       if (trace)

Modified: core/trunk/src/main/java/org/jboss/cache/interceptors/CacheStoreI=
nterceptor.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/java/org/jboss/cache/interceptors/CacheStoreInterce=
ptor.java	2008-01-04 16:20:23 UTC (rev 4985)
+++ core/trunk/src/main/java/org/jboss/cache/interceptors/CacheStoreInterce=
ptor.java	2008-01-04 16:55:01 UTC (rev 4986)
@@ -112,7 +112,7 @@
             Set<Fqn> affectedFqns =3D preparingTxs.remove(gtx);
             if (affectedFqns !=3D null)
             {
-               storeInternalState(affectedFqns);
+               storeInternalState(ctx, affectedFqns);
             }
             return returnValue;
          }
@@ -212,7 +212,7 @@
       {
          loader.removeData(fqn);
          // we need to mark this node as data loaded
-         NodeSPI n =3D peekNode(ctx, fqn, false, false);//cache.peek(fqn, =
false);
+         NodeSPI n =3D peekNode(ctx, fqn, false, false, false);//cache.pee=
k(fqn, false);
          if (n !=3D null)
          {
             n.setDataLoaded(true);
@@ -245,7 +245,7 @@
       }
       loader.removeData(fqn);
       // if we are erasing all the data then consider this node loaded
-      NodeSPI n =3D peekNode(ctx, fqn, false, false);//cache.peek(fqn, fal=
se);
+      NodeSPI n =3D peekNode(ctx, fqn, false, false, false);//cache.peek(f=
qn, false);
       n.setDataLoaded(true);
       return returnValue;
    }
@@ -299,14 +299,14 @@
       return tx_mgr !=3D null && tx_mgr.getTransaction() !=3D null;
    }
 =

-   private void storeInternalState(Set<Fqn> affectedFqns) throws Exception
+   private void storeInternalState(InvocationContext ctx, Set<Fqn> affecte=
dFqns) throws Exception
    {
       if (cache.getConfiguration().isNodeLockingOptimistic())
       {
          for (Fqn f : affectedFqns)
          {
             // NOT going to store tombstones!!
-            NodeSPI n =3D cache.peek(f, false, false);
+            NodeSPI n =3D peekNode(ctx, f, false, false, false);
             if (n !=3D null)
             {
                Map internalState =3D n.getInternalState(true);

Modified: core/trunk/src/main/java/org/jboss/cache/interceptors/DataGravita=
torInterceptor.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/java/org/jboss/cache/interceptors/DataGravitatorInt=
erceptor.java	2008-01-04 16:20:23 UTC (rev 4985)
+++ core/trunk/src/main/java/org/jboss/cache/interceptors/DataGravitatorInt=
erceptor.java	2008-01-04 16:55:01 UTC (rev 4986)
@@ -172,7 +172,7 @@
          }
          else
          {
-            if (peekNode(ctx, fqn, false, false) =3D=3D null)
+            if (peekNode(ctx, fqn, false, false, false) =3D=3D null)
             {
                if (trace) log.trace("Gravitating from local backup tree");
                BackupData data =3D localBackupGet(fqn, ctx);
@@ -386,7 +386,7 @@
          if (localOnly)
          {
 //            if (cache.peek(data.getFqn(), false) =3D=3D null)
-            if (peekNode(ctx, data.getFqn(), false, false) =3D=3D null)
+            if (peekNode(ctx, data.getFqn(), false, false, false) =3D=3D n=
ull)
             {
                createNodesLocally(data.getFqn(), data.getAttributes());
             }

Modified: core/trunk/src/main/java/org/jboss/cache/interceptors/EvictionInt=
erceptor.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/java/org/jboss/cache/interceptors/EvictionIntercept=
or.java	2008-01-04 16:20:23 UTC (rev 4985)
+++ core/trunk/src/main/java/org/jboss/cache/interceptors/EvictionIntercept=
or.java	2008-01-04 16:55:01 UTC (rev 4986)
@@ -238,7 +238,7 @@
          return;
       }
 =

-      NodeSPI<?, ?> nodeSPI =3D peekNode(ctx, event.getFqn(), false, false=
);//cache.peek(event.getFqn(), false);
+      NodeSPI<?, ?> nodeSPI =3D peekNode(ctx, event.getFqn(), false, false=
, false);//cache.peek(event.getFqn(), false);
       //we do not trigger eviction events for resident nodes
       if (nodeSPI !=3D null && nodeSPI.isResident())
       {

Modified: core/trunk/src/main/java/org/jboss/cache/interceptors/Interceptor=
.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/java/org/jboss/cache/interceptors/Interceptor.java	=
2008-01-04 16:20:23 UTC (rev 4985)
+++ core/trunk/src/main/java/org/jboss/cache/interceptors/Interceptor.java	=
2008-01-04 16:55:01 UTC (rev 4986)
@@ -231,20 +231,25 @@
     * @param f                   fqn to find
     * @param forceRefresh        forces calling cache.peek() even if we ho=
ld a reference to the relevant node.
     * @param includeDeletedNodes includes nodes marked for deletion if thi=
s is true
+    * @param includeInvalidNodes includes nodes marked as invalid if this =
is true
     * @return a node, or null if one cannot be found.
     * @since 2.1.0
     */
-   public NodeSPI peekNode(InvocationContext ctx, Fqn f, boolean forceRefr=
esh, boolean includeDeletedNodes)
+   public NodeSPI peekNode(InvocationContext ctx, Fqn f, boolean forceRefr=
esh, boolean includeDeletedNodes, boolean includeInvalidNodes)
    {
       NodeSPI n;
       if (forceRefresh || (n =3D ctx.getPeekedNode(f)) =3D=3D null)
       {
-         n =3D cache.peek(f, true);
+         n =3D cache.peek(f, true, true);
          // put this in the invocation cache
          ctx.savePeekedNode(n, f);
       }
 =

-      if (n !=3D null && !includeDeletedNodes && n.isDeleted()) return nul=
l;
+      if (n !=3D null)
+      {
+         if (!includeDeletedNodes && n.isDeleted()) return null;
+         if (!includeInvalidNodes && !n.isValid()) return null;
+      }
       return n;
    }
 }

Modified: core/trunk/src/main/java/org/jboss/cache/interceptors/OptimisticC=
reateIfNotExistsInterceptor.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/java/org/jboss/cache/interceptors/OptimisticCreateI=
fNotExistsInterceptor.java	2008-01-04 16:20:23 UTC (rev 4985)
+++ core/trunk/src/main/java/org/jboss/cache/interceptors/OptimisticCreateI=
fNotExistsInterceptor.java	2008-01-04 16:55:01 UTC (rev 4986)
@@ -114,7 +114,7 @@
       fqns.add((Fqn) to);
 =

       //  peek into Node and get a hold of all child fqns as these need to=
 be in the workspace.
-      NodeSPI node =3D cache.peek((Fqn) from, true, true);
+      NodeSPI node =3D peekNode(ctx, (Fqn) from, false, true, true);
       greedyGetFqns(fqns, node, (Fqn) to);
 =

 =

@@ -137,7 +137,7 @@
    private void createNode(InvocationContext ctx, Fqn targetFqn, boolean s=
uppressNotification) throws CacheException
    {
 //      if (cache.peek(targetFqn, false) !=3D null) return;
-      if (peekNode(ctx, targetFqn, false, false) !=3D null) return;
+      if (peekNode(ctx, targetFqn, false, false, false) !=3D null) return;
       // we do nothing if targetFqn is null
       if (targetFqn =3D=3D null) return;
 =


Modified: core/trunk/src/main/java/org/jboss/cache/interceptors/OptimisticN=
odeInterceptor.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/java/org/jboss/cache/interceptors/OptimisticNodeInt=
erceptor.java	2008-01-04 16:20:23 UTC (rev 4985)
+++ core/trunk/src/main/java/org/jboss/cache/interceptors/OptimisticNodeInt=
erceptor.java	2008-01-04 16:55:01 UTC (rev 4986)
@@ -69,12 +69,12 @@
          GlobalTransaction gtx =3D getGlobalTransaction(ctx);
          TransactionWorkspace workspace =3D getTransactionWorkspace(gtx);
          Fqn fqn =3D getFqn(args, m.getMethodId());
-         WorkspaceNode workspaceNode =3D fetchWorkspaceNode(fqn, workspace=
, true, true);
+         WorkspaceNode workspaceNode =3D fetchWorkspaceNode(ctx, fqn, work=
space, true, true);
 =

          // in the case of a data gravitation cleanup, if the primary Fqn =
does not exist the backup one may.
          if (workspaceNode =3D=3D null && m.getMethodId() =3D=3D MethodDec=
larations.dataGravitationCleanupMethod_id)
          {
-            workspaceNode =3D fetchWorkspaceNode(getBackupFqn(args), works=
pace, true, true);
+            workspaceNode =3D fetchWorkspaceNode(ctx, getBackupFqn(args), =
workspace, true, true);
          }
 =

          if (workspaceNode !=3D null)
@@ -238,7 +238,7 @@
          return;
       }
 =

-      WorkspaceNode oldParent =3D fetchWorkspaceNode(nodeFqn.getParent(), =
ws, false, true);
+      WorkspaceNode oldParent =3D fetchWorkspaceNode(ctx, nodeFqn.getParen=
t(), ws, false, true);
       if (oldParent =3D=3D null) throw new NodeNotExistsException("Node " =
+ nodeFqn.getParent() + " does not exist!");
 =

       if (parentFqn.equals(oldParent.getFqn()))
@@ -247,7 +247,7 @@
          return;
       }
       // retrieve parent
-      WorkspaceNode parent =3D fetchWorkspaceNode(parentFqn, ws, false, tr=
ue);
+      WorkspaceNode parent =3D fetchWorkspaceNode(ctx, parentFqn, ws, fals=
e, true);
       if (parent =3D=3D null) throw new NodeNotExistsException("Node " + p=
arentFqn + " does not exist!");
 =

       Object nodeName =3D nodeFqn.getLastElement();
@@ -262,7 +262,7 @@
 =

       // pre-notify
       notifier.notifyNodeMoved(nodeFqn, nodeNewFqn, true, ctx);
-      recursiveMoveNode(node, parent.getFqn(), ws);
+      recursiveMoveNode(ctx, node, parent.getFqn(), ws);
 =

       // remove old nodes. this may mark some nodes which have already bee=
n moved as deleted
       removeNode(ws, node, false, ctx);
@@ -278,17 +278,17 @@
     * @param newBase new base Fqn under which the given node will now exist
     * @param ws      transaction workspace
     */
-   private void recursiveMoveNode(WorkspaceNode node, Fqn newBase, Transac=
tionWorkspace ws)
+   private void recursiveMoveNode(InvocationContext ctx, WorkspaceNode nod=
e, Fqn newBase, TransactionWorkspace ws)
    {
       Fqn newFqn =3D new Fqn(newBase, node.getFqn().getLastElement());
-      WorkspaceNode movedNode =3D fetchWorkspaceNode(newFqn, ws, true, tru=
e);
+      WorkspaceNode movedNode =3D fetchWorkspaceNode(ctx, newFqn, ws, true=
, true);
       movedNode.putAll(node.getData());
 =

       // process children
       for (Object n : node.getChildrenNames())
       {
-         WorkspaceNode child =3D fetchWorkspaceNode(new Fqn(node.getFqn(),=
 n), ws, false, true);
-         if (child !=3D null) recursiveMoveNode(child, newFqn, ws);
+         WorkspaceNode child =3D fetchWorkspaceNode(ctx, new Fqn(node.getF=
qn(), n), ws, false, true);
+         if (child !=3D null) recursiveMoveNode(ctx, child, newFqn, ws);
       }
    }
 =

@@ -329,7 +329,7 @@
       if (workspaceNode =3D=3D null) return false;
 =

       Fqn parentFqn =3D workspaceNode.getFqn().getParent();
-      WorkspaceNode parentNode =3D fetchWorkspaceNode(parentFqn, workspace=
, true, true);
+      WorkspaceNode parentNode =3D fetchWorkspaceNode(ctx, parentFqn, work=
space, true, true);
       if (parentNode =3D=3D null) throw new NodeNotExistsException("Unable=
 to find parent node with fqn " + parentFqn);
 =

       // pre-notify
@@ -396,7 +396,7 @@
    {
       Fqn fqn =3D (Fqn) args[0];
       Object key =3D args[1];
-      WorkspaceNode workspaceNode =3D fetchWorkspaceNode(fqn, workspace, f=
alse, false);
+      WorkspaceNode workspaceNode =3D fetchWorkspaceNode(ctx, fqn, workspa=
ce, false, false);
 =

       if (workspaceNode =3D=3D null)
       {
@@ -418,7 +418,7 @@
    {
       Fqn fqn =3D (Fqn) args[0];
 =

-      WorkspaceNode workspaceNode =3D fetchWorkspaceNode(fqn, workspace, f=
alse, false);
+      WorkspaceNode workspaceNode =3D fetchWorkspaceNode(ctx, fqn, workspa=
ce, false, false);
 =

       if (workspaceNode =3D=3D null)
       {
@@ -443,7 +443,7 @@
    {
       Fqn fqn =3D (Fqn) args[0];
 =

-      WorkspaceNode workspaceNode =3D fetchWorkspaceNode(fqn, workspace, f=
alse, false);
+      WorkspaceNode workspaceNode =3D fetchWorkspaceNode(ctx, fqn, workspa=
ce, false, false);
 =

       if (workspaceNode =3D=3D null)
       {
@@ -464,7 +464,7 @@
    {
       Fqn fqn =3D (Fqn) args[0];
 =

-      WorkspaceNode workspaceNode =3D fetchWorkspaceNode(fqn, workspace, f=
alse, false);
+      WorkspaceNode workspaceNode =3D fetchWorkspaceNode(ctx, fqn, workspa=
ce, false, false);
 =

       if (workspaceNode =3D=3D null)
       {
@@ -485,7 +485,7 @@
    {
       Fqn fqn =3D (Fqn) args[0];
 =

-      WorkspaceNode workspaceNode =3D fetchWorkspaceNode(fqn, workspace, f=
alse, false);
+      WorkspaceNode workspaceNode =3D fetchWorkspaceNode(ctx, fqn, workspa=
ce, false, false);
 =

       if (workspaceNode =3D=3D null)
       {
@@ -522,13 +522,13 @@
     * @param includeInvalidNodes
     * @return a node, if found, or null if not.
     */
-   private WorkspaceNode fetchWorkspaceNode(Fqn fqn, TransactionWorkspace =
workspace, boolean undeleteIfNecessary, boolean includeInvalidNodes)
+   private WorkspaceNode fetchWorkspaceNode(InvocationContext ctx, Fqn fqn=
, TransactionWorkspace workspace, boolean undeleteIfNecessary, boolean incl=
udeInvalidNodes)
    {
       WorkspaceNode workspaceNode =3D workspace.getNode(fqn);
       // if we do not have the node then we need to add it to the workspace
       if (workspaceNode =3D=3D null)
       {
-         NodeSPI node =3D cache.peek(fqn, true, includeInvalidNodes);
+         NodeSPI node =3D peekNode(ctx, fqn, false, true, includeInvalidNo=
des);
          if (node =3D=3D null) return null;
 =

          // create new workspace node based on the node from the underlyin=
g data structure
@@ -546,7 +546,7 @@
          {
             workspaceNode.markAsDeleted(false);
             // re-add to parent
-            WorkspaceNode parent =3D fetchWorkspaceNode(fqn.getParent(), w=
orkspace, true, includeInvalidNodes);
+            WorkspaceNode parent =3D fetchWorkspaceNode(ctx, fqn.getParent=
(), workspace, true, includeInvalidNodes);
             parent.addChild(workspaceNode);
          }
          else
@@ -564,7 +564,7 @@
 =

       // now make sure all parents are in the wsp as well
       if (workspaceNode !=3D null && !fqn.isRoot())
-         fetchWorkspaceNode(fqn.getParent(), workspace, false, includeInva=
lidNodes);
+         fetchWorkspaceNode(ctx, fqn.getParent(), workspace, false, includ=
eInvalidNodes);
 =

       return workspaceNode;
    }

Modified: core/trunk/src/main/java/org/jboss/cache/interceptors/OptimisticV=
alidatorInterceptor.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/java/org/jboss/cache/interceptors/OptimisticValidat=
orInterceptor.java	2008-01-04 16:20:23 UTC (rev 4985)
+++ core/trunk/src/main/java/org/jboss/cache/interceptors/OptimisticValidat=
orInterceptor.java	2008-01-04 16:55:01 UTC (rev 4986)
@@ -78,7 +78,7 @@
             if (trace) log.trace("Validating version for node [" + fqn + "=
]");
 =

             NodeSPI underlyingNode;
-            underlyingNode =3D cache.peek(fqn, true, true);
+            underlyingNode =3D peekNode(ctx, fqn, false, true, true);
 =

             // if this is a newly created node then we expect the underlyi=
ng node to be null.
             // also, if the node has been deleted in the WS and the underl=
ying node is null, this *may* be ok ... will test again later when comparin=
g versions

Modified: core/trunk/src/main/java/org/jboss/cache/interceptors/Passivation=
Interceptor.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/java/org/jboss/cache/interceptors/PassivationInterc=
eptor.java	2008-01-04 16:20:23 UTC (rev 4985)
+++ core/trunk/src/main/java/org/jboss/cache/interceptors/PassivationInterc=
eptor.java	2008-01-04 16:55:01 UTC (rev 4986)
@@ -94,7 +94,7 @@
       {
          throw new NodeNotLoadedException();
       }
-      NodeSPI n =3D peekNode(ctx, fqn, false, true);
+      NodeSPI n =3D peekNode(ctx, fqn, false, true, false);
 =

       if (n !=3D null)
       {

Modified: core/trunk/src/main/java/org/jboss/cache/interceptors/Pessimistic=
LockInterceptor.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/java/org/jboss/cache/interceptors/PessimisticLockIn=
terceptor.java	2008-01-04 16:20:23 UTC (rev 4985)
+++ core/trunk/src/main/java/org/jboss/cache/interceptors/PessimisticLockIn=
terceptor.java	2008-01-04 16:55:01 UTC (rev 4986)
@@ -134,7 +134,7 @@
       if (recursive)
       {
          //acquireLocksOnChildren(cache.peek(fqn, false), lockType, ctx);
-         acquireLocksOnChildren(peekNode(ctx, fqn, false, false), lockType=
, ctx);
+         acquireLocksOnChildren(peekNode(ctx, fqn, false, false, false), l=
ockType, ctx);
       }
       return null;
    }
@@ -209,18 +209,18 @@
          {
             cache.getTransactionTable().get(ctx.getGlobalTransaction()).ad=
dRemovedNode(from);
          }
-         acquireLocksOnChildren(peekNode(ctx, from, false, true), NodeLock=
.LockType.WRITE, ctx);
+         acquireLocksOnChildren(peekNode(ctx, from, false, true, false), N=
odeLock.LockType.WRITE, ctx);
       }
       if (to !=3D null && !(configuration.getIsolationLevel() =3D=3D Isola=
tionLevel.NONE))
       {
          //now for an RL for the new parent.
          if (trace) log.trace("Attempting to get RL on new parent [" + to =
+ "]");
          lock(ctx, to, NodeLock.LockType.READ, false, timeout, false, fals=
e);
-         acquireLocksOnChildren(peekNode(ctx, to, false, true), NodeLock.L=
ockType.READ, ctx);
+         acquireLocksOnChildren(peekNode(ctx, to, false, true, false), Nod=
eLock.LockType.READ, ctx);
       }
       Object retValue =3D nextInterceptor(ctx);
       // do a REAL remove here.
-      NodeSPI n =3D peekNode(ctx, from, false, true);
+      NodeSPI n =3D peekNode(ctx, from, false, true, false);
       if (n !=3D null)
       {
          n.getLock().releaseAll(Thread.currentThread());
@@ -240,7 +240,7 @@
       if (ctx.getGlobalTransaction() =3D=3D null)
       {
          cacheImpl.realRemove(fqn, true);
-         NodeSPI n =3D peekNode(ctx, fqn, false, true);
+         NodeSPI n =3D peekNode(ctx, fqn, false, true, false);
          if (n !=3D null)
          {
             n.getLock().releaseAll(Thread.currentThread());
@@ -337,7 +337,7 @@
          created =3D lock(ctx, fqn, lockType, createIfNotExists, timeout, =
acquireLockOnParent, reverseRemoveCheck);
          firstTry =3D false;
       }
-      while (createIfNotExists && peekNode(ctx, fqn, false, true) =3D=3D n=
ull);// keep trying until we have the lock (fixes concurrent remove())
+      while (createIfNotExists && peekNode(ctx, fqn, false, true, false) =
=3D=3D null);// keep trying until we have the lock (fixes concurrent remove=
())
       return created;
    }
 =

@@ -401,7 +401,7 @@
 =

          // make sure the lock we acquired isn't on a deleted node/is an o=
rphan!!
          // look into invalidated nodes as well
-         NodeSPI repeek =3D cache.peek(currentNode.getFqn(), true, true);
+         NodeSPI repeek =3D peekNode(ctx, currentNode.getFqn(), true, true=
, true);
          if (currentNode !=3D repeek)
          {
             if (trace)
@@ -410,7 +410,7 @@
             // check if the parent exists!!
             // look into invalidated nodes as well
             currentNode.getLock().releaseAll(owner);
-            if (cache.peek(parent.getFqn(), true, true) =3D=3D null)
+            if (peekNode(ctx, parent.getFqn(), true, true, true) =3D=3D nu=
ll)
             {
                // crap!
                if (trace)
@@ -490,7 +490,7 @@
          {
             return true;// we're doing a remove and we've reached the PARE=
NT node of the target to be removed.
          }
-         if (!isTargetNode && peekNode(ctx, targetFqn.getAncestor(currentN=
odeIndex + 2), false, false) =3D=3D null)
+         if (!isTargetNode && peekNode(ctx, targetFqn.getAncestor(currentN=
odeIndex + 2), false, false, false) =3D=3D null)
          //if (!isTargetNode && cache.peek(targetFqn.getAncestor(currentNo=
deIndex + 2), false) =3D=3D null)
          //if (!isTargetNode && cache.peek(new Fqn(currentNode.getFqn(), t=
argetFqn.get(currentNodeIndex + 1)), false) =3D=3D null)
          {


--===============4381408720091464154==--

From jbosscache-commits at lists.jboss.org Fri Jan  4 12:18:34 2008
Content-Type: multipart/mixed; boundary="===============0820067775893541546=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r4987 -
 core/trunk/src/main/java/org/jboss/cache/interceptors.
Date: Fri, 04 Jan 2008 12:18:34 -0500
Message-ID: <E1JAqBm-0007mT-3s@committer01.frg.pub.inap.atl.jboss.com>

--===============0820067775893541546==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: manik.surtani(a)jboss.com
Date: 2008-01-04 12:18:33 -0500 (Fri, 04 Jan 2008)
New Revision: 4987

Modified:
   core/trunk/src/main/java/org/jboss/cache/interceptors/PessimisticLockInt=
erceptor.java
Log:
JBCACHE-1251 - Re-adding invalidated node fails with invalidation + pessimi=
stic locking

Modified: core/trunk/src/main/java/org/jboss/cache/interceptors/Pessimistic=
LockInterceptor.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/java/org/jboss/cache/interceptors/PessimisticLockIn=
terceptor.java	2008-01-04 16:55:01 UTC (rev 4986)
+++ core/trunk/src/main/java/org/jboss/cache/interceptors/PessimisticLockIn=
terceptor.java	2008-01-04 17:18:33 UTC (rev 4987)
@@ -388,6 +388,10 @@
                return false;
             }
          }
+         else
+         {
+            if (!currentNode.isValid() && createIfNotExists) currentNode.s=
etValid(true, false);
+         }
          NodeLock.LockType lockTypeRequired =3D NodeLock.LockType.READ;
          if (created || writeLockNeeded(ctx, lockType, currentIndex, acqui=
reWriteLockOnParent, createIfNotExists, fqn, currentNode))
          {


--===============0820067775893541546==--

From jbosscache-commits at lists.jboss.org Fri Jan  4 12:32:54 2008
Content-Type: multipart/mixed; boundary="===============8894997980064734724=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r4988 -
 core/trunk/src/test/java/org/jboss/cache/buddyreplication.
Date: Fri, 04 Jan 2008 12:32:54 -0500
Message-ID: <E1JAqPe-0002CK-EW@committer01.frg.pub.inap.atl.jboss.com>

--===============8894997980064734724==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: manik.surtani(a)jboss.com
Date: 2008-01-04 12:32:54 -0500 (Fri, 04 Jan 2008)
New Revision: 4988

Added:
   core/trunk/src/test/java/org/jboss/cache/buddyreplication/GravitationCle=
anupTest.java
Log:
Added test to ensure proper cleanup after gravitation

Added: core/trunk/src/test/java/org/jboss/cache/buddyreplication/Gravitatio=
nCleanupTest.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/test/java/org/jboss/cache/buddyreplication/GravitationCl=
eanupTest.java	                        (rev 0)
+++ core/trunk/src/test/java/org/jboss/cache/buddyreplication/GravitationCl=
eanupTest.java	2008-01-04 17:32:54 UTC (rev 4988)
@@ -0,0 +1,55 @@
+package org.jboss.cache.buddyreplication;
+
+import org.jboss.cache.CacheSPI;
+import org.jboss.cache.Fqn;
+import org.jboss.cache.util.CachePrinter;
+import org.testng.annotations.Test;
+
+/**
+ * @author Manik Surtani (<a href=3D"mailto:manik(a)jboss.org">manik(a)jbo=
ss.org</a>)
+ * @since 2.1.0
+ */
+(a)Test(groups =3D "functional")
+public class GravitationCleanupTest extends BuddyReplicationTestsBase
+{
+   Fqn fqn =3D Fqn.fromString("/a/b/c");
+   Object key =3D "key", value =3D "value";
+
+   public void testStaleRegionOnDataOwner() throws Exception
+   {
+      caches =3D createCaches(1, 2, false, true, false);
+
+      // add some stuff on the primary
+      CacheSPI dataOwner =3D caches.get(0);
+      CacheSPI buddy =3D caches.get(1);
+
+      dataOwner.put(fqn, key, value);
+
+      System.out.println("dataOwner: " + CachePrinter.printCacheLockingInf=
o(dataOwner));
+      System.out.println("buddy: " + CachePrinter.printCacheLockingInfo(bu=
ddy));
+
+      assert dataOwner.peek(fqn, false) !=3D null : "Should have data";
+      assert dataOwner.peek(new Fqn(BuddyManager.BUDDY_BACKUP_SUBTREE_FQN,=
 BuddyManager.getGroupNameFromAddress(buddy.getLocalAddress())), false) !=
=3D null : "Should have backup node for buddy";
+      assert dataOwner.peek(new Fqn(BuddyManager.BUDDY_BACKUP_SUBTREE_FQN,=
 BuddyManager.getGroupNameFromAddress(dataOwner.getLocalAddress())), false)=
 =3D=3D null : "Should NOT have backup node for self!";
+
+      assert buddy.peek(fqn, false) =3D=3D null : "Should not have data";
+      assert buddy.peek(new Fqn(BuddyManager.BUDDY_BACKUP_SUBTREE_FQN, Bud=
dyManager.getGroupNameFromAddress(buddy.getLocalAddress())), false) =3D=3D =
null : "Should NOT have backup node for self!";
+      assert buddy.peek(new Fqn(BuddyManager.BUDDY_BACKUP_SUBTREE_FQN, Bud=
dyManager.getGroupNameFromAddress(dataOwner.getLocalAddress())), false) !=
=3D null : "Should have backup node for buddy";
+      assert buddy.peek(BuddyManager.getBackupFqn(dataOwner.getLocalAddres=
s(), fqn), false) !=3D null : "Should have backup data";
+
+      // now do a gravitate call.
+      assert buddy.get(fqn, key).equals(value) : "Data should have gravita=
ted!";
+
+      System.out.println("dataOwner: " + CachePrinter.printCacheLockingInf=
o(dataOwner));
+      System.out.println("buddy: " + CachePrinter.printCacheLockingInfo(bu=
ddy));
+
+      assert buddy.peek(fqn, false) !=3D null : "Should have data";
+      assert buddy.peek(new Fqn(BuddyManager.BUDDY_BACKUP_SUBTREE_FQN, Bud=
dyManager.getGroupNameFromAddress(dataOwner.getLocalAddress())), false) !=
=3D null : "Should have backup node for buddy";
+      assert buddy.peek(new Fqn(BuddyManager.BUDDY_BACKUP_SUBTREE_FQN, Bud=
dyManager.getGroupNameFromAddress(buddy.getLocalAddress())), false) =3D=3D =
null : "Should NOT have backup node for self!";
+
+      assert dataOwner.peek(fqn, false) =3D=3D null : "Should not have dat=
a";
+      assert dataOwner.peek(new Fqn(BuddyManager.BUDDY_BACKUP_SUBTREE_FQN,=
 BuddyManager.getGroupNameFromAddress(dataOwner.getLocalAddress())), false)=
 =3D=3D null : "Should NOT have backup node for self!";
+      assert dataOwner.peek(new Fqn(BuddyManager.BUDDY_BACKUP_SUBTREE_FQN,=
 BuddyManager.getGroupNameFromAddress(buddy.getLocalAddress())), false) !=
=3D null : "Should have backup node for buddy";
+      assert dataOwner.peek(BuddyManager.getBackupFqn(buddy.getLocalAddres=
s(), fqn), false) !=3D null : "Should have backup data";
+   }
+}


--===============8894997980064734724==--

From jbosscache-commits at lists.jboss.org Fri Jan  4 12:49:21 2008
Content-Type: multipart/mixed; boundary="===============4961816513251634918=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r4989 - in
 core/trunk/src/main/java/org/jboss/cache: marshall and 1 other directory.
Date: Fri, 04 Jan 2008 12:49:20 -0500
Message-ID: <E1JAqfY-0005AI-UZ@committer01.frg.pub.inap.atl.jboss.com>

--===============4961816513251634918==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: manik.surtani(a)jboss.com
Date: 2008-01-04 12:49:20 -0500 (Fri, 04 Jan 2008)
New Revision: 4989

Modified:
   core/trunk/src/main/java/org/jboss/cache/UnversionedNode.java
   core/trunk/src/main/java/org/jboss/cache/marshall/MethodCall.java
Log:
Optional toString() verbosity if trace is enabled.

Modified: core/trunk/src/main/java/org/jboss/cache/UnversionedNode.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/java/org/jboss/cache/UnversionedNode.java	2008-01-0=
4 17:32:54 UTC (rev 4988)
+++ core/trunk/src/main/java/org/jboss/cache/UnversionedNode.java	2008-01-0=
4 17:49:20 UTC (rev 4989)
@@ -42,6 +42,7 @@
     * Debug log.
     */
    protected static Log log =3D LogFactory.getLog(UnversionedNode.class);
+   protected static boolean trace =3D log.isTraceEnabled();
 =

    /**
     * True if all children have been loaded. This is set when CacheImpl.ge=
tChildrenNames() is called.
@@ -298,7 +299,7 @@
          // notify if we actually created a new child
          if (newChild =3D=3D child)
          {
-            if (log.isTraceEnabled())
+            if (trace)
             {
                log.trace("created child: fqn=3D" + child_fqn);
             }
@@ -348,17 +349,59 @@
       {
          synchronized (data)
          {
-            sb.append(" data=3D[");
-            Set keys =3D data.keySet();
+            if (trace)
+            {
+               sb.append(" data=3D").append(data.keySet());
+            }
+            else
+            {
+               sb.append(" data=3D[");
+               Set keys =3D data.keySet();
+               int i =3D 0;
+               for (Object o : keys)
+               {
+                  i++;
+                  sb.append(o);
+
+                  if (i =3D=3D 5)
+                  {
+                     int more =3D keys.size() - 5;
+                     if (more > 1)
+                     {
+                        sb.append(", and ");
+                        sb.append(more);
+                        sb.append(" more");
+                        break;
+                     }
+                  }
+                  else
+                  {
+                     sb.append(", ");
+                  }
+               }
+               sb.append("]");
+            }
+         }
+      }
+      if (children !=3D null && !children.isEmpty())
+      {
+         if (trace)
+         {
+            sb.append(" children=3D").append(getChildrenNamesDirect());
+         }
+         else
+         {
+            sb.append(" children=3D[");
+            Set names =3D getChildrenNamesDirect();
             int i =3D 0;
-            for (Object o : keys)
+            for (Object o : names)
             {
                i++;
                sb.append(o);
 =

                if (i =3D=3D 5)
                {
-                  int more =3D keys.size() - 5;
+                  int more =3D names.size() - 5;
                   if (more > 1)
                   {
                      sb.append(", and ");
@@ -375,35 +418,6 @@
             sb.append("]");
          }
       }
-      if (children !=3D null && !children.isEmpty())
-      {
-         sb.append(" children=3D[");
-         Set names =3D getChildrenNamesDirect();
-         int i =3D 0;
-         for (Object o : names)
-         {
-            i++;
-            sb.append(o);
-
-            if (i =3D=3D 5)
-            {
-               int more =3D names.size() - 5;
-               if (more > 1)
-               {
-                  sb.append(", and ");
-                  sb.append(more);
-                  sb.append(" more");
-                  break;
-               }
-            }
-            else
-            {
-               sb.append(", ");
-            }
-         }
-         sb.append("]");
-
-      }
       if (lock_ !=3D null)
       {
          if (isReadLocked())
@@ -728,7 +742,7 @@
 =

    public void setFqn(Fqn fqn)
    {
-      if (log.isTraceEnabled())
+      if (trace)
       {
          log.trace(getFqn() + " set FQN " + fqn);
       }
@@ -864,7 +878,7 @@
    public void setValid(boolean valid, boolean recursive)
    {
       this.valid =3D valid;
-      if (log.isTraceEnabled()) log.trace("Marking node " + getFqn() + " a=
s " + (valid ? "" : "in") + "valid");
+      if (trace) log.trace("Marking node " + getFqn() + " as " + (valid ? =
"" : "in") + "valid");
       if (recursive)
       {
          for (Node child : children().values())

Modified: core/trunk/src/main/java/org/jboss/cache/marshall/MethodCall.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/java/org/jboss/cache/marshall/MethodCall.java	2008-=
01-04 17:32:54 UTC (rev 4988)
+++ core/trunk/src/main/java/org/jboss/cache/marshall/MethodCall.java	2008-=
01-04 17:49:20 UTC (rev 4989)
@@ -6,6 +6,8 @@
  */
 package org.jboss.cache.marshall;
 =

+import org.apache.commons.logging.LogFactory;
+
 import java.lang.reflect.Method;
 =

 /**
@@ -25,6 +27,7 @@
  */
 public class MethodCall extends org.jgroups.blocks.MethodCall
 {
+   private static boolean trace =3D LogFactory.getLog(MethodCall.class).is=
TraceEnabled();
    /**
     * It's unclear why this class would be serialized.
     */
@@ -84,7 +87,6 @@
    public String toString()
    {
       StringBuffer ret =3D new StringBuffer();
-      boolean first =3D true;
       ret.append("MethodName: ");
       ret.append(method_name);
       ret.append("; MethodIdInteger: ");
@@ -92,10 +94,25 @@
       ret.append("; Args: (");
       if (args !=3D null && args.length > 0)
       {
-         ret.append(" arg[0] =3D ");
-         ret.append(args[0]);
-         if (args.length > 1) ret.append(" ...");
+         if (trace)
+         {
+            boolean first =3D true;
+            for (Object arg : args)
+            {
+               if (first) first =3D false;
+               else ret.append(", ");
+
+               ret.append(arg);
+            }
+         }
+         else
+         {
+            ret.append(" arg[0] =3D ");
+            ret.append(args[0]);
+            if (args.length > 1) ret.append(" ...");
+         }
       }
+
       ret.append(')');
       return ret.toString();
    }


--===============4961816513251634918==--

From jbosscache-commits at lists.jboss.org Fri Jan  4 12:54:32 2008
Content-Type: multipart/mixed; boundary="===============4500432163125450523=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r4990 - in
 core/branches/1.4.X/src/org/jboss/cache: marshall and 1 other directory.
Date: Fri, 04 Jan 2008 12:54:32 -0500
Message-ID: <E1JAqka-00067V-JO@committer01.frg.pub.inap.atl.jboss.com>

--===============4500432163125450523==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: manik.surtani(a)jboss.com
Date: 2008-01-04 12:54:32 -0500 (Fri, 04 Jan 2008)
New Revision: 4990

Modified:
   core/branches/1.4.X/src/org/jboss/cache/Node.java
   core/branches/1.4.X/src/org/jboss/cache/marshall/JBCMethodCall.java
Log:
Optionally more verbosity in toString() if trace is enabled.

Modified: core/branches/1.4.X/src/org/jboss/cache/Node.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/branches/1.4.X/src/org/jboss/cache/Node.java	2008-01-04 17:49:20 U=
TC (rev 4989)
+++ core/branches/1.4.X/src/org/jboss/cache/Node.java	2008-01-04 17:54:32 U=
TC (rev 4990)
@@ -445,31 +445,40 @@
       synchronized (this)
       {
          if (data !=3D null)
-            sb.append("\ndata=3D[");
-            Set keys =3D data.keySet();
-            int i=3D0;
-            for (Iterator it =3D keys.iterator(); it.hasNext();)
+         {
+            if (trace)
             {
-               i++;
-               sb.append(it.next());
+               sb.append("\ndata=3D").append(data.keySet());
+            }
+            else
+            {
+               sb.append("\ndata=3D[");
+               Set keys =3D data.keySet();
+               int i=3D0;
+               for (Iterator it =3D keys.iterator(); it.hasNext();)
+               {
+                  i++;
+                  sb.append(it.next());
 =

-               if (i =3D=3D 5)
-               {
-                  int more =3D keys.size() - 5;
-                  if (more > 1)
+                  if (i =3D=3D 5)
                   {
-                     sb.append(", and ");
-                     sb.append(more);
-                     sb.append(" more");
-                     break;
+                     int more =3D keys.size() - 5;
+                     if (more > 1)
+                     {
+                        sb.append(", and ");
+                        sb.append(more);
+                        sb.append(" more");
+                        break;
+                     }
                   }
+                  else
+                  {
+                     sb.append(", ");
+                  }
                }
-               else
-               {
-                  sb.append(", ");
-               }
             }
-            sb.append("]");         =

+            sb.append("]");
+         }
       }
       if (lock_ !=3D null)
       {

Modified: core/branches/1.4.X/src/org/jboss/cache/marshall/JBCMethodCall.ja=
va
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/branches/1.4.X/src/org/jboss/cache/marshall/JBCMethodCall.java	200=
8-01-04 17:49:20 UTC (rev 4989)
+++ core/branches/1.4.X/src/org/jboss/cache/marshall/JBCMethodCall.java	200=
8-01-04 17:54:32 UTC (rev 4990)
@@ -7,6 +7,7 @@
 package org.jboss.cache.marshall;
 =

 import org.jgroups.blocks.MethodCall;
+import org.apache.commons.logging.LogFactory;
 =

 import java.lang.reflect.Method;
 =

@@ -22,6 +23,7 @@
 {
    private int methodId;
    private static final long serialVersionUID =3D -4826713878871338199L;
+   private static boolean trace =3D LogFactory.getLog(JBCMethodCall.class)=
.isTraceEnabled();
 =

    public JBCMethodCall()
    {
@@ -61,16 +63,28 @@
    public String toString()
    {
       StringBuffer ret =3D new StringBuffer();
-      boolean first =3D true;
       ret.append(method_name);
       ret.append("; id:");
       ret.append(methodId);
       ret.append("; Args: (");
       if (args !=3D null && args.length > 0)
       {
-         ret.append(" arg[0] =3D ");
-         ret.append(args[0]);
-         if (args.length > 1) ret.append(" ...");
+         if (trace)
+         {
+            boolean first =3D true;
+            for (int i=3D0; i<args.length; i++)
+            {
+               if (first) first =3D false;
+               else ret.append(", ");
+               ret.append(args[i]);
+            }
+         }
+         else
+         {
+            ret.append(" arg[0] =3D ");
+            ret.append(args[0]);
+            if (args.length > 1) ret.append(" ...");
+         }
       }
       ret.append(')');
       return ret.toString();


--===============4500432163125450523==--

From jbosscache-commits at lists.jboss.org Fri Jan  4 13:51:20 2008
Content-Type: multipart/mixed; boundary="===============8727670712537680817=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r4991 -
 cache-bench-fwk/trunk/smartfrog.
Date: Fri, 04 Jan 2008 13:51:20 -0500
Message-ID: <E1JArdY-0000oX-08@committer01.frg.pub.inap.atl.jboss.com>

--===============8727670712537680817==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: mircea.markus
Date: 2008-01-04 13:51:19 -0500 (Fri, 04 Jan 2008)
New Revision: 4991

Modified:
   cache-bench-fwk/trunk/smartfrog/main.sf
Log:
chnaged config =


Modified: cache-bench-fwk/trunk/smartfrog/main.sf
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- cache-bench-fwk/trunk/smartfrog/main.sf	2008-01-04 17:54:32 UTC (rev 49=
90)
+++ cache-bench-fwk/trunk/smartfrog/main.sf	2008-01-04 18:51:19 UTC (rev 49=
91)
@@ -1,13 +1,64 @@
-#include "org/smartfrog/components.sf"
-#include "cacheBenchComponent.sf"
-
-sfConfig extends Compound {
-
-   node1 extends BaseCacheBenchPrim{
-      sfProcessHost "localhost";
-      nodeIndex 1;
-      scriptToExec "runNode.bat"
-   }
-   =

-}
-
+#include "org/smartfrog/components.sf"
+
+
+BaseCacheBenchPrim extends Prim {
+   sfClass "org.cachebench.smartfrog.CacheBenchmarkPrim";
+
+   scriptToExec "./runNode.sh"
+
+   //FQN of the directory where the framework was checked out (noramally i=
s th eparent of the dir that contains this file)
+   //this should be edited
+   cacheBenchmarkHome "/qa/home/mmarkus/code/cache-bench-fwk";
+
+   //should be the name of a subdirectory of 'cache-products' directory.
+   cacheDistribution "jbosscache-2.0.0";
+
+   //defines on how many nodes the benchmark will run
+   clusterSize 1;
+
+   //might take a value from 0..max_nr_of_nodes, representing the index of=
 the current node in the cluster
+   nodeIndex TBD;
+}
+
+sfConfig extends Compound {
+
+   node1 extends BaseCacheBenchPrim{
+      sfProcessHost "cluster01";
+      nodeIndex 0;
+   }
+   =

+   node2 extends BaseCacheBenchPrim{
+      sfProcessHost "cluster02";
+      nodeIndex 1;
+   }
+      =

+   node3 extends BaseCacheBenchPrim{
+      sfProcessHost "cluster03";
+      nodeIndex 2;
+   }
+      =

+   node4 extends BaseCacheBenchPrim{
+      sfProcessHost "cluster04";
+      nodeIndex 3;
+   }
+   =

+   node5 extends BaseCacheBenchPrim{
+      sfProcessHost "cluster05";
+      nodeIndex 4;
+   }
+   =

+   node6 extends BaseCacheBenchPrim{
+      sfProcessHost "cluster06";
+      nodeIndex 5;
+   }
+   =

+   node7 extends BaseCacheBenchPrim{
+      sfProcessHost "cluster07";
+      nodeIndex 6;
+   }
+   =

+   node8 extends BaseCacheBenchPrim{
+      sfProcessHost "cluster08";
+      nodeIndex 7;
+   }
+}


--===============8727670712537680817==--

From jbosscache-commits at lists.jboss.org Fri Jan  4 13:52:20 2008
Content-Type: multipart/mixed; boundary="===============1206317847010801812=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r4992 - cache-bench-fwk/trunk.
Date: Fri, 04 Jan 2008 13:52:20 -0500
Message-ID: <E1JAreW-0000rl-MP@committer01.frg.pub.inap.atl.jboss.com>

--===============1206317847010801812==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: mircea.markus
Date: 2008-01-04 13:52:20 -0500 (Fri, 04 Jan 2008)
New Revision: 4992

Modified:
   cache-bench-fwk/trunk/build.xml
Log:
the Prim was enhanced to log the output of the run script

Modified: cache-bench-fwk/trunk/build.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- cache-bench-fwk/trunk/build.xml	2008-01-04 18:51:19 UTC (rev 4991)
+++ cache-bench-fwk/trunk/build.xml	2008-01-04 18:52:20 UTC (rev 4992)
@@ -514,7 +514,7 @@
       <mkdir dir=3D"${basedir}/smartfrog/sfClasses"/>
       <jar destfile=3D"${basedir}/smartfrog/sfClasses/cacheBenchmark-sf.ja=
r">
          <fileset dir=3D"${framework.output.dir}" includes=3D"**/smartfrog=
/**"/>
-         <fileset dir=3D"${basedir}/smartfrog" excludes=3D"**/sfClasses/**=
"/>
+         <!--<fileset dir=3D"${basedir}/smartfrog" excludes=3D"**/sfClasse=
s/**"/>-->
       </jar>
    </target>
 </project>


--===============1206317847010801812==--

From jbosscache-commits at lists.jboss.org Fri Jan  4 14:03:15 2008
Content-Type: multipart/mixed; boundary="===============2480413118868141261=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r4993 - in core/trunk/src:
 main/java/org/jboss/cache/invocation and 2 other directories.
Date: Fri, 04 Jan 2008 14:03:15 -0500
Message-ID: <E1JArp5-0002yD-HR@committer01.frg.pub.inap.atl.jboss.com>

--===============2480413118868141261==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: manik.surtani(a)jboss.com
Date: 2008-01-04 14:03:15 -0500 (Fri, 04 Jan 2008)
New Revision: 4993

Modified:
   core/trunk/src/main/java/org/jboss/cache/interceptors/PessimisticLockInt=
erceptor.java
   core/trunk/src/main/java/org/jboss/cache/invocation/RemoteCacheInvocatio=
nDelegate.java
   core/trunk/src/test/java/org/jboss/cache/api/CacheAPIOptimisticTest.java
   core/trunk/src/test/java/org/jboss/cache/api/CacheAPITest.java
   core/trunk/src/test/java/org/jboss/cache/buddyreplication/GravitationCle=
anupTest.java
Log:
JBCACHE-1256 -  PessimisticLockInterceptor does not clean up all temporary =
nodes created during a removeNode() call

Modified: core/trunk/src/main/java/org/jboss/cache/interceptors/Pessimistic=
LockInterceptor.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/java/org/jboss/cache/interceptors/PessimisticLockIn=
terceptor.java	2008-01-04 18:52:20 UTC (rev 4992)
+++ core/trunk/src/main/java/org/jboss/cache/interceptors/PessimisticLockIn=
terceptor.java	2008-01-04 19:03:15 UTC (rev 4993)
@@ -118,7 +118,7 @@
       }
       else
       {
-         acquireLocksWithTimeout(ctx, fqn, NodeLock.LockType.WRITE, true, =
false, false, true);
+         acquireLocksWithTimeout(ctx, fqn, NodeLock.LockType.WRITE, true, =
false, false, true, null, false);
       }
       return nextInterceptor(ctx);
    }
@@ -130,7 +130,7 @@
 =

    protected Object handleLockMethod(InvocationContext ctx, Fqn fqn, NodeL=
ock.LockType lockType, boolean recursive) throws Throwable
    {
-      acquireLocksWithTimeout(ctx, fqn, lockType, false, false, false, fal=
se);
+      acquireLocksWithTimeout(ctx, fqn, lockType, false, false, false, fal=
se, null, false);
       if (recursive)
       {
          //acquireLocksOnChildren(cache.peek(fqn, false), lockType, ctx);
@@ -204,7 +204,7 @@
       if (trace) log.trace("Attempting to get WL on node to be moved [" + =
from + "]");
       if (from !=3D null && !(configuration.getIsolationLevel() =3D=3D Iso=
lationLevel.NONE))
       {
-         lock(ctx, from, NodeLock.LockType.WRITE, false, timeout, true, fa=
lse);
+         lock(ctx, from, NodeLock.LockType.WRITE, false, timeout, true, fa=
lse, null, false);
          if (ctx.getGlobalTransaction() !=3D null)
          {
             cache.getTransactionTable().get(ctx.getGlobalTransaction()).ad=
dRemovedNode(from);
@@ -215,7 +215,7 @@
       {
          //now for an RL for the new parent.
          if (trace) log.trace("Attempting to get RL on new parent [" + to =
+ "]");
-         lock(ctx, to, NodeLock.LockType.READ, false, timeout, false, fals=
e);
+         lock(ctx, to, NodeLock.LockType.READ, false, timeout, false, fals=
e, null, false);
          acquireLocksOnChildren(peekNode(ctx, to, false, true, false), Nod=
eLock.LockType.READ, ctx);
       }
       Object retValue =3D nextInterceptor(ctx);
@@ -230,16 +230,27 @@
 =

    protected Object handleRemoveNodeMethod(InvocationContext ctx, GlobalTr=
ansaction tx, Fqn fqn, boolean createUndoOps) throws Throwable
    {
-      boolean created =3D acquireLocksWithTimeout(ctx, fqn, NodeLock.LockT=
ype.WRITE, true, false, true, false);
+      // need to make a note of ALL nodes created here!!
+      List<Fqn> createdNodes =3D new LinkedList<Fqn>();
+      // we need to mark new nodes created as deleted since they are only =
created to form a path to the node being removed, to
+      // create a lock.
+      boolean created =3D acquireLocksWithTimeout(ctx, fqn, NodeLock.LockT=
ype.WRITE, true, false, true, false, createdNodes, true);
       if (ctx.getGlobalTransaction() !=3D null)
       {
-         cache.getTransactionTable().get(ctx.getGlobalTransaction()).addRe=
movedNode(fqn);
+         TransactionEntry entry =3D tx_table.get(ctx.getGlobalTransaction(=
));
+         entry.addRemovedNode(fqn);
+         for (Fqn f : createdNodes) entry.addRemovedNode(f);
       }
-      acquireLocksOnChildren(rootNode.getChildDirect(fqn), NodeLock.LockTy=
pe.WRITE, ctx);
+      acquireLocksOnChildren(peekNode(ctx, fqn, false, false, false), Node=
Lock.LockType.WRITE, ctx);
       Object retVal =3D nextInterceptor(ctx);
+
+      // and make sure we remove all nodes we've created for the sake of l=
ater removal.
       if (ctx.getGlobalTransaction() =3D=3D null)
       {
+
+         for (Fqn f : createdNodes) cacheImpl.realRemove(f, true);
          cacheImpl.realRemove(fqn, true);
+
          NodeSPI n =3D peekNode(ctx, fqn, false, true, false);
          if (n !=3D null)
          {
@@ -252,7 +263,7 @@
 =

    protected Object handlePutForExternalReadMethod(InvocationContext ctx, =
GlobalTransaction tx, Fqn fqn, Object key, Object value) throws Throwable
    {
-      acquireLocksWithTimeout(ctx, fqn, NodeLock.LockType.READ, true, true=
, false, true);
+      acquireLocksWithTimeout(ctx, fqn, NodeLock.LockType.READ, true, true=
, false, true, null, false);
       return nextInterceptor(ctx);
    }
 =

@@ -263,61 +274,61 @@
 =

    protected Object handleRemoveDataMethod(InvocationContext ctx, GlobalTr=
ansaction tx, Fqn fqn, boolean createUndoOps) throws Throwable
    {
-      acquireLocksWithTimeout(ctx, fqn, NodeLock.LockType.WRITE, false, fa=
lse, false, false);
+      acquireLocksWithTimeout(ctx, fqn, NodeLock.LockType.WRITE, false, fa=
lse, false, false, null, false);
       return nextInterceptor(ctx);
    }
 =

    protected Object handleAddChildMethod(InvocationContext ctx, GlobalTran=
saction tx, Fqn parentFqn, Object childName, Node cn, boolean createUndoOps=
) throws Throwable
    {
-      acquireLocksWithTimeout(ctx, parentFqn, NodeLock.LockType.READ, fals=
e, false, false, false);
+      acquireLocksWithTimeout(ctx, parentFqn, NodeLock.LockType.READ, fals=
e, false, false, false, null, false);
       return nextInterceptor(ctx);
    }
 =

    protected Object handleEvictMethod(InvocationContext ctx, Fqn fqn) thro=
ws Throwable
    {
-      acquireLocksWithTimeout(ctx, fqn, NodeLock.LockType.WRITE, false, tr=
ue, false, false);
+      acquireLocksWithTimeout(ctx, fqn, NodeLock.LockType.WRITE, false, tr=
ue, false, false, null, false);
       return nextInterceptor(ctx);
    }
 =

    protected Object handleGetKeyValueMethod(InvocationContext ctx, Fqn fqn=
, Object key, boolean sendNodeEvent) throws Throwable
    {
-      acquireLocksWithTimeout(ctx, fqn, NodeLock.LockType.READ, false, fal=
se, false, false);
+      acquireLocksWithTimeout(ctx, fqn, NodeLock.LockType.READ, false, fal=
se, false, false, null, false);
       return nextInterceptor(ctx);
    }
 =

    protected Object handleGetNodeMethod(InvocationContext ctx, Fqn fqn) th=
rows Throwable
    {
-      acquireLocksWithTimeout(ctx, fqn, NodeLock.LockType.READ, false, fal=
se, false, false);
+      acquireLocksWithTimeout(ctx, fqn, NodeLock.LockType.READ, false, fal=
se, false, false, null, false);
       return nextInterceptor(ctx);
    }
 =

    protected Object handleGetKeysMethod(InvocationContext ctx, Fqn fqn) th=
rows Throwable
    {
-      acquireLocksWithTimeout(ctx, fqn, NodeLock.LockType.READ, false, fal=
se, false, false);
+      acquireLocksWithTimeout(ctx, fqn, NodeLock.LockType.READ, false, fal=
se, false, false, null, false);
       return nextInterceptor(ctx);
    }
 =

    protected Object handleGetChildrenNamesMethod(InvocationContext ctx, Fq=
n fqn) throws Throwable
    {
-      acquireLocksWithTimeout(ctx, fqn, NodeLock.LockType.READ, false, fal=
se, false, false);
+      acquireLocksWithTimeout(ctx, fqn, NodeLock.LockType.READ, false, fal=
se, false, false, null, false);
       return nextInterceptor(ctx);
    }
 =

    protected Object handlePrintMethod(InvocationContext ctx, Fqn fqn) thro=
ws Throwable
    {
-      acquireLocksWithTimeout(ctx, fqn, NodeLock.LockType.READ, false, fal=
se, false, false);
+      acquireLocksWithTimeout(ctx, fqn, NodeLock.LockType.READ, false, fal=
se, false, false, null, false);
       return nextInterceptor(ctx);
    }
 =

    protected Object handleReleaseAllLocksMethod(InvocationContext ctx, Fqn=
 fqn) throws Throwable
    {
-      acquireLocksWithTimeout(ctx, fqn, NodeLock.LockType.READ, false, fal=
se, false, false);
+      acquireLocksWithTimeout(ctx, fqn, NodeLock.LockType.READ, false, fal=
se, false, false, null, false);
       return nextInterceptor(ctx);
    }
 =

    private boolean acquireLocksWithTimeout(InvocationContext ctx, Fqn fqn,=
 NodeLock.LockType lockType,
                                            boolean createIfNotExists, bool=
ean zeroLockTimeout,
-                                           boolean acquireLockOnParent, bo=
olean reverseRemoveCheck)
+                                           boolean acquireLockOnParent, bo=
olean reverseRemoveCheck, List<Fqn> createdNodes, boolean markNewNodesAsDel=
eted)
          throws InterruptedException
    {
       if (fqn =3D=3D null || configuration.getIsolationLevel() =3D=3D Isol=
ationLevel.NONE) return false;
@@ -334,7 +345,7 @@
          {
             throw new TimeoutException("Unable to acquire lock on Fqn " + =
fqn + " after " + timeout + " millis");
          }
-         created =3D lock(ctx, fqn, lockType, createIfNotExists, timeout, =
acquireLockOnParent, reverseRemoveCheck);
+         created =3D lock(ctx, fqn, lockType, createIfNotExists, timeout, =
acquireLockOnParent, reverseRemoveCheck, createdNodes, markNewNodesAsDelete=
d);
          firstTry =3D false;
       }
       while (createIfNotExists && peekNode(ctx, fqn, false, true, false) =
=3D=3D null);// keep trying until we have the lock (fixes concurrent remove=
())
@@ -347,12 +358,14 @@
     * 2) acquireWriteLockOnParent is true. If so AND {@link org.jboss.cach=
e.Node#isLockForChildInsertRemove()} then a read
     * lock will be aquired for the parent of the node.
     *
-    * @param createIfNotExists  if true, then missing nodes will be cretae=
d on the fly. If false, method returns if we
-    *                           reach a node that does not exists
-    * @param reverseRemoveCheck see {@link #manageReverseRemove(org.jboss.=
cache.transaction.GlobalTransaction, org.jboss.cache.NodeSPI, boolean)}
+    * @param createIfNotExists     if true, then missing nodes will be cre=
taed on the fly. If false, method returns if we
+    *                              reach a node that does not exists
+    * @param reverseRemoveCheck    see {@link #manageReverseRemove(org.jbo=
ss.cache.transaction.GlobalTransaction, org.jboss.cache.NodeSPI, boolean)}
+    * @param createdNodes          a list to which any nodes created can r=
egister their Fqns so that calling code is aware of which nodes have been n=
ewly created.
+    * @param markNewNodesAsDeleted
     */
    private boolean lock(InvocationContext ctx, Fqn fqn, NodeLock.LockType =
lockType, boolean createIfNotExists, long timeout,
-                        boolean acquireWriteLockOnParent, boolean reverseR=
emoveCheck)
+                        boolean acquireWriteLockOnParent, boolean reverseR=
emoveCheck, List<Fqn> createdNodes, boolean markNewNodesAsDeleted)
          throws TimeoutException, LockingException, InterruptedException
    {
       Thread currentThread =3D Thread.currentThread();
@@ -380,6 +393,8 @@
                currentNode =3D parent.addChildDirect(new Fqn(childName));
                created =3D true;
                if (trace) log.trace("Child node was null, so created child=
 node " + childName);
+               if (createdNodes !=3D null) createdNodes.add(currentNode.ge=
tFqn());
+               if (markNewNodesAsDeleted) currentNode.markAsDeleted(true);
             }
             else
             {
@@ -478,7 +493,7 @@
    }
 =

    /**
-    * Used by {@link #lock(org.jboss.cache.InvocationContext, org.jboss.ca=
che.Fqn, org.jboss.cache.lock.NodeLock.LockType, boolean, long, boolean, bo=
olean)}.
+    * Used by lock()
     * Determins whter an arbitrary node from the supplied fqn needs an wri=
te lock.
     */
    private boolean writeLockNeeded(InvocationContext ctx, NodeLock.LockTyp=
e lockType, int currentNodeIndex, boolean acquireWriteLockOnParent, boolean=
 createIfNotExists, Fqn targetFqn, NodeSPI currentNode)

Modified: core/trunk/src/main/java/org/jboss/cache/invocation/RemoteCacheIn=
vocationDelegate.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/java/org/jboss/cache/invocation/RemoteCacheInvocati=
onDelegate.java	2008-01-04 18:52:20 UTC (rev 4992)
+++ core/trunk/src/main/java/org/jboss/cache/invocation/RemoteCacheInvocati=
onDelegate.java	2008-01-04 19:03:15 UTC (rev 4993)
@@ -73,12 +73,14 @@
       {
          if (log.isTraceEnabled())
             log.trace("DataGravitationCleanup: Removing primary (" + prima=
ry + ") and backup (" + backup + ")");
-         //primaryDataCleanup =3D MethodCallFactory.create(MethodDeclarati=
ons.removeNodeMethodLocal, primary, false);
+
          getInvocationContext().getOptionOverrides().setCacheModeLocal(tru=
e);
-         removeNode(primary);
-         //backupDataCleanup =3D MethodCallFactory.create(MethodDeclaratio=
ns.removeNodeMethodLocal, backup, false);
-         getInvocationContext().getOptionOverrides().setCacheModeLocal(tru=
e);
-         removeNode(backup);
+         if (!removeNode(primary))
+         {
+            // only attempt to clean up the backup if the primary did not =
exist - a waste of a call otherwise.
+            getInvocationContext().getOptionOverrides().setCacheModeLocal(=
true);
+            removeNode(backup);
+         }
       }
       else
       {

Modified: core/trunk/src/test/java/org/jboss/cache/api/CacheAPIOptimisticTe=
st.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/test/java/org/jboss/cache/api/CacheAPIOptimisticTest.jav=
a	2008-01-04 18:52:20 UTC (rev 4992)
+++ core/trunk/src/test/java/org/jboss/cache/api/CacheAPIOptimisticTest.jav=
a	2008-01-04 19:03:15 UTC (rev 4993)
@@ -1,9 +1,12 @@
 package org.jboss.cache.api;
 =

+import org.testng.annotations.Test;
 =

+
 /**
  * Optimistically locked version of {@link org.jboss.cache.api.CacheAPITes=
t}
  */
+(a)Test(groups =3D "functional")
 public class CacheAPIOptimisticTest extends CacheAPITest
 {
    public CacheAPIOptimisticTest()

Modified: core/trunk/src/test/java/org/jboss/cache/api/CacheAPITest.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/test/java/org/jboss/cache/api/CacheAPITest.java	2008-01-=
04 18:52:20 UTC (rev 4992)
+++ core/trunk/src/test/java/org/jboss/cache/api/CacheAPITest.java	2008-01-=
04 19:03:15 UTC (rev 4993)
@@ -2,6 +2,7 @@
 =

 import org.jboss.cache.Cache;
 import org.jboss.cache.CacheFactory;
+import org.jboss.cache.CacheSPI;
 import org.jboss.cache.DefaultCacheFactory;
 import org.jboss.cache.Fqn;
 import org.jboss.cache.Node;
@@ -12,11 +13,13 @@
 import org.jboss.cache.notifications.annotation.NodeCreated;
 import org.jboss.cache.notifications.event.Event;
 import org.jboss.cache.transaction.GenericTransactionManagerLookup;
+import org.jboss.cache.util.CachePrinter;
 import static org.testng.AssertJUnit.*;
 import org.testng.annotations.AfterMethod;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 =

+import javax.transaction.TransactionManager;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -28,7 +31,7 @@
  * @author <a href=3D"mailto:manik(a)jboss.org">Manik Surtani</a>
  */
 =

-(a)Test(groups =3D {"functional"})
+(a)Test(groups =3D "functional")
 public class CacheAPITest
 {
    private Cache<String, String> cache;
@@ -185,6 +188,8 @@
       assertFalse(cache.getRoot().hasChild(fqn));
       assertEquals(false, cache.removeNode(fqn));
 =

+      System.out.println("Cache: " + CachePrinter.printCacheDetails(cache)=
);
+
       // Check that it's removed if it has a child
       Fqn<String> child =3D Fqn.fromString("/test/fqn/child");
       cache.getRoot().addChild(child);
@@ -350,6 +355,29 @@
       assertTrue(cache.getRoot().getChildren().isEmpty());
    }
 =

+   public void testPhantomStructuralNodesOnRemove()
+   {
+      CacheSPI spi =3D (CacheSPI) cache;
+      assert spi.peek(Fqn.fromString("/a/b/c"), true, true) =3D=3D null;
+      assert !spi.removeNode("/a/b/c");
+      assert spi.peek(Fqn.fromString("/a/b/c"), true, true) =3D=3D null;
+      assert spi.peek(Fqn.fromString("/a/b"), true, true) =3D=3D null;
+      assert spi.peek(Fqn.fromString("/a"), true, true) =3D=3D null;
+   }
+
+   public void testPhantomStructuralNodesOnRemoveTransactional() throws Ex=
ception
+   {
+      CacheSPI spi =3D (CacheSPI) cache;
+      TransactionManager tm =3D spi.getTransactionManager();
+      assert spi.peek(Fqn.fromString("/a/b/c"), true, true) =3D=3D null;
+      tm.begin();
+      assert !spi.removeNode("/a/b/c");
+      tm.commit();
+      assert spi.peek(Fqn.fromString("/a/b/c"), true, true) =3D=3D null;
+      assert spi.peek(Fqn.fromString("/a/b"), true, true) =3D=3D null;
+      assert spi.peek(Fqn.fromString("/a"), true, true) =3D=3D null;
+   }
+
    @CacheListener
    public class Listener
    {

Modified: core/trunk/src/test/java/org/jboss/cache/buddyreplication/Gravita=
tionCleanupTest.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/test/java/org/jboss/cache/buddyreplication/GravitationCl=
eanupTest.java	2008-01-04 18:52:20 UTC (rev 4992)
+++ core/trunk/src/test/java/org/jboss/cache/buddyreplication/GravitationCl=
eanupTest.java	2008-01-04 19:03:15 UTC (rev 4993)
@@ -15,10 +15,30 @@
    Fqn fqn =3D Fqn.fromString("/a/b/c");
    Object key =3D "key", value =3D "value";
 =

-   public void testStaleRegionOnDataOwner() throws Exception
+   public void testStaleRegionOnDataOwnerPessimistic() throws Exception
    {
-      caches =3D createCaches(1, 2, false, true, false);
+      testDataOwner(false);
+   }
 =

+   public void testStaleRegionOnDataOwnerOptimistic() throws Exception
+   {
+      testDataOwner(true);
+   }
+
+   public void testStaleRegionOnBuddyPessimistic() throws Exception
+   {
+      testBuddy(false);
+   }
+
+   public void testStaleRegionOnBuddyOptimistic() throws Exception
+   {
+      testBuddy(true);
+   }
+
+   private void testDataOwner(boolean optimistic) throws Exception
+   {
+      caches =3D createCaches(1, 2, false, true, optimistic);
+
       // add some stuff on the primary
       CacheSPI dataOwner =3D caches.get(0);
       CacheSPI buddy =3D caches.get(1);
@@ -52,4 +72,54 @@
       assert dataOwner.peek(new Fqn(BuddyManager.BUDDY_BACKUP_SUBTREE_FQN,=
 BuddyManager.getGroupNameFromAddress(buddy.getLocalAddress())), false) !=
=3D null : "Should have backup node for buddy";
       assert dataOwner.peek(BuddyManager.getBackupFqn(buddy.getLocalAddres=
s(), fqn), false) !=3D null : "Should have backup data";
    }
+
+   private void testBuddy(boolean optimistic) throws Exception
+   {
+      caches =3D createCaches(1, 3, false, true, optimistic);
+
+      // add some stuff on the primary
+      CacheSPI dataOwner =3D caches.get(0);
+      CacheSPI buddy =3D caches.get(1);
+      CacheSPI thirdInstance =3D caches.get(2);
+
+      assertIsBuddy(dataOwner, buddy, true);
+      assertIsBuddy(buddy, thirdInstance, true);
+      assertIsBuddy(thirdInstance, dataOwner, true);
+
+      dataOwner.put(fqn, key, value);
+
+      System.out.println("dataOwner: " + CachePrinter.printCacheLockingInf=
o(dataOwner));
+      System.out.println("buddy: " + CachePrinter.printCacheLockingInfo(bu=
ddy));
+      System.out.println("thirdInstance: " + CachePrinter.printCacheLockin=
gInfo(thirdInstance));
+
+      assert dataOwner.peek(fqn, false) !=3D null : "Should have data";
+      assert dataOwner.peek(new Fqn(BuddyManager.BUDDY_BACKUP_SUBTREE_FQN,=
 BuddyManager.getGroupNameFromAddress(thirdInstance.getLocalAddress())), fa=
lse) !=3D null : "Should have backup node for buddy";
+      assert dataOwner.peek(new Fqn(BuddyManager.BUDDY_BACKUP_SUBTREE_FQN,=
 BuddyManager.getGroupNameFromAddress(dataOwner.getLocalAddress())), false)=
 =3D=3D null : "Should NOT have backup node for self!";
+      assert dataOwner.peek(new Fqn(BuddyManager.BUDDY_BACKUP_SUBTREE_FQN,=
 BuddyManager.getGroupNameFromAddress(buddy.getLocalAddress())), false) =3D=
=3D null : "Should NOT have backup node for 2nd instance!";
+
+      assert buddy.peek(fqn, false) =3D=3D null : "Should not have data";
+      assert buddy.peek(new Fqn(BuddyManager.BUDDY_BACKUP_SUBTREE_FQN, Bud=
dyManager.getGroupNameFromAddress(buddy.getLocalAddress())), false) =3D=3D =
null : "Should NOT have backup node for self!";
+      assert buddy.peek(new Fqn(BuddyManager.BUDDY_BACKUP_SUBTREE_FQN, Bud=
dyManager.getGroupNameFromAddress(dataOwner.getLocalAddress())), false) !=
=3D null : "Should have backup node for buddy";
+      assert buddy.peek(BuddyManager.getBackupFqn(dataOwner.getLocalAddres=
s(), fqn), false) !=3D null : "Should have backup data";
+
+      // now do a gravitate call.
+      assert thirdInstance.get(fqn, key).equals(value) : "Data should have=
 gravitated!";
+
+      System.out.println("dataOwner: " + CachePrinter.printCacheLockingInf=
o(dataOwner));
+      System.out.println("buddy: " + CachePrinter.printCacheLockingInfo(bu=
ddy));
+      System.out.println("thirdInstance: " + CachePrinter.printCacheLockin=
gInfo(thirdInstance));
+
+      assert thirdInstance.peek(fqn, false) !=3D null : "Should have data";
+      assert thirdInstance.peek(new Fqn(BuddyManager.BUDDY_BACKUP_SUBTREE_=
FQN, BuddyManager.getGroupNameFromAddress(buddy.getLocalAddress())), false)=
 !=3D null : "Should have backup node for buddy";
+      assert thirdInstance.peek(new Fqn(BuddyManager.BUDDY_BACKUP_SUBTREE_=
FQN, BuddyManager.getGroupNameFromAddress(thirdInstance.getLocalAddress()))=
, false) =3D=3D null : "Should NOT have backup node for self!";
+
+      assert dataOwner.peek(fqn, false) =3D=3D null : "Should not have dat=
a";
+      assert dataOwner.peek(new Fqn(BuddyManager.BUDDY_BACKUP_SUBTREE_FQN,=
 BuddyManager.getGroupNameFromAddress(dataOwner.getLocalAddress())), false)=
 =3D=3D null : "Should NOT have backup node for self!";
+      assert dataOwner.peek(new Fqn(BuddyManager.BUDDY_BACKUP_SUBTREE_FQN,=
 BuddyManager.getGroupNameFromAddress(thirdInstance.getLocalAddress())), fa=
lse) !=3D null : "Should have backup node for buddy";
+      assert dataOwner.peek(BuddyManager.getBackupFqn(thirdInstance.getLoc=
alAddress(), fqn), false) !=3D null : "Should have backup data";
+      assert buddy.peek(fqn, false) =3D=3D null : "Should not have data";
+      assert buddy.peek(fqn.getParent(), false) =3D=3D null : "Should not =
have any part of the data";
+      assert buddy.peek(BuddyManager.getBackupFqn(dataOwner.getLocalAddres=
s(), fqn), false) =3D=3D null : "Should NOT have backup data";
+
+   }
 }


--===============2480413118868141261==--

From jbosscache-commits at lists.jboss.org Fri Jan  4 14:22:10 2008
Content-Type: multipart/mixed; boundary="===============4754603816176457661=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r4994 -
 cache-bench-fwk/trunk/src/org/cachebench/smartfrog.
Date: Fri, 04 Jan 2008 14:22:10 -0500
Message-ID: <E1JAs7O-0006s5-KM@committer01.frg.pub.inap.atl.jboss.com>

--===============4754603816176457661==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: mircea.markus
Date: 2008-01-04 14:22:10 -0500 (Fri, 04 Jan 2008)
New Revision: 4994

Modified:
   cache-bench-fwk/trunk/src/org/cachebench/smartfrog/CacheBenchmarkPrim.ja=
va
Log:
the Prim was enhanced to log the output of the run script

Modified: cache-bench-fwk/trunk/src/org/cachebench/smartfrog/CacheBenchmark=
Prim.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- cache-bench-fwk/trunk/src/org/cachebench/smartfrog/CacheBenchmarkPrim.j=
ava	2008-01-04 19:03:15 UTC (rev 4993)
+++ cache-bench-fwk/trunk/src/org/cachebench/smartfrog/CacheBenchmarkPrim.j=
ava	2008-01-04 19:22:10 UTC (rev 4994)
@@ -53,7 +53,7 @@
    public synchronized void sfStart() throws SmartFrogException, RemoteExc=
eption
    {
       super.sfStart();
-      log.trace("parsing the configuration...");
+      log.trace("Entered sfStart...");
       try
       {
          String command =3D scriptToExec + " " + nodeIndex + " " + cacheDi=
stribution + " -DclusterSize=3D" + clusterSize;
@@ -77,6 +77,11 @@
          log.error("Unexpected error:" + e.getMessage(), e);
          throw new RemoteException("Unexpected error",e);
       }
+      log.trace("Terminating the tests...");
+      TerminationRecord terminationRecord =3D new TerminationRecord(Termin=
ationRecord.NORMAL, "terminated the benchmark " +
+            getDescription(), null);
+      sfTerminate(terminationRecord);
+      log.debug("Test terminated successfully " + getDescription());
    }
 =

    private File getFwkHomeDir()
@@ -97,4 +102,9 @@
       super.sfTerminateWith(terminationRecord);
       log.trace("sfTerminateWith called with value:" +  terminationRecord);
    }
+
+   public String getDescription()
+   {
+      return "( clusterSize:" + clusterSize + ", nodeIndex:" + this.nodeIn=
dex + " )";
+   }
 }


--===============4754603816176457661==--

From jbosscache-commits at lists.jboss.org Fri Jan  4 14:23:11 2008
Content-Type: multipart/mixed; boundary="===============4005889035188147153=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r4995 -
 core/branches/1.4.X/tests/functional/org/jboss/cache.
Date: Fri, 04 Jan 2008 14:23:10 -0500
Message-ID: <E1JAs8M-0006sl-Rr@committer01.frg.pub.inap.atl.jboss.com>

--===============4005889035188147153==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: manik.surtani(a)jboss.com
Date: 2008-01-04 14:23:10 -0500 (Fri, 04 Jan 2008)
New Revision: 4995

Added:
   core/branches/1.4.X/tests/functional/org/jboss/cache/RemoveNodeOptimisti=
cTest.java
   core/branches/1.4.X/tests/functional/org/jboss/cache/RemoveNodeTest.java
Log:
Added tests for JBCACHE-1256

Added: core/branches/1.4.X/tests/functional/org/jboss/cache/RemoveNodeOptim=
isticTest.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/branches/1.4.X/tests/functional/org/jboss/cache/RemoveNodeOptimist=
icTest.java	                        (rev 0)
+++ core/branches/1.4.X/tests/functional/org/jboss/cache/RemoveNodeOptimist=
icTest.java	2008-01-04 19:23:10 UTC (rev 4995)
@@ -0,0 +1,9 @@
+package org.jboss.cache;
+
+public class RemoveNodeOptimisticTest extends RemoveNodeTest
+{
+   public RemoveNodeOptimisticTest()
+   {
+      optimistic =3D true;
+   }
+}

Added: core/branches/1.4.X/tests/functional/org/jboss/cache/RemoveNodeTest.=
java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/branches/1.4.X/tests/functional/org/jboss/cache/RemoveNodeTest.jav=
a	                        (rev 0)
+++ core/branches/1.4.X/tests/functional/org/jboss/cache/RemoveNodeTest.jav=
a	2008-01-04 19:23:10 UTC (rev 4995)
@@ -0,0 +1,54 @@
+package org.jboss.cache;
+
+import junit.framework.TestCase;
+
+import javax.transaction.TransactionManager;
+
+/**
+ * Tests removing deep, nonexistent nodes
+ *
+ * @author Manik Surtani (<a href=3D"mailto:manik(a)jboss.org">manik(a)jbo=
ss.org</a>)
+ */
+public class RemoveNodeTest extends TestCase
+{
+   protected boolean optimistic =3D false;
+   protected TreeCache cache;
+
+   protected void setUp() throws Exception
+   {
+      cache =3D new TreeCache();
+      if (optimistic) cache.setNodeLockingScheme("OPTIMISTIC");
+      cache.setTransactionManagerLookupClass(DummyTransactionManagerLookup=
.class.getName());
+      cache.start();
+   }
+
+   protected void tearDown()
+   {
+      cache.stop();
+   }
+
+   public void testPhantomStructuralNodesOnRemove() throws Exception
+   {
+      assert cache.peek(Fqn.fromString("/a/b/c")) =3D=3D null;
+      cache.remove("/a/b/c");
+      assert cache.peek(Fqn.fromString("/a/b/c")) =3D=3D null;
+      assert cache.peek(Fqn.fromString("/a/b")) =3D=3D null;
+      assert cache.peek(Fqn.fromString("/a")) =3D=3D null;
+
+      System.out.println("Cache: " + cache.printDetails());
+   }
+
+   public void testPhantomStructuralNodesOnRemoveTransactional() throws Ex=
ception
+   {
+      TransactionManager tm =3D cache.getTransactionManager();
+      assert cache.peek(Fqn.fromString("/a/b/c")) =3D=3D null;
+      tm.begin();
+      cache.remove("/a/b/c");
+      tm.commit();
+      assert cache.peek(Fqn.fromString("/a/b/c")) =3D=3D null;
+      assert cache.peek(Fqn.fromString("/a/b")) =3D=3D null;
+      assert cache.peek(Fqn.fromString("/a")) =3D=3D null;
+
+      System.out.println("Cache: " + cache.printDetails());
+   }
+}


--===============4005889035188147153==--

From jboss-qa-internal at redhat.com Fri Jan  4 14:37:37 2008
Content-Type: multipart/mixed; boundary="===============4595486157393587921=="
MIME-Version: 1.0
From: jboss-qa-internal at redhat.com
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] Hudson build became unstable:
 jboss-cache-1.4.X-jdk1.5 #51
Date: Fri, 04 Jan 2008 14:37:16 -0500
Message-ID: <11088292.11871199475436568.JavaMail.hudson@dev45.qa.atl2.redhat.com>

--===============4595486157393587921==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

See http://hudson.qa.jboss.com/hudson/job/jboss-cache-1.4.X-jdk1.5/51/chang=
es



--===============4595486157393587921==--

From jbosscache-commits at lists.jboss.org Fri Jan  4 15:25:50 2008
Content-Type: multipart/mixed; boundary="===============4627728519380517671=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r4996 -
 cache-bench-fwk/trunk/src/org/cachebench.
Date: Fri, 04 Jan 2008 15:25:50 -0500
Message-ID: <E1JAt70-0002aB-CF@committer01.frg.pub.inap.atl.jboss.com>

--===============4627728519380517671==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: mircea.markus
Date: 2008-01-04 15:25:50 -0500 (Fri, 04 Jan 2008)
New Revision: 4996

Modified:
   cache-bench-fwk/trunk/src/org/cachebench/CacheBenchmarkRunner.java
Log:
the Prim was enhanced to log the output of the run script

Modified: cache-bench-fwk/trunk/src/org/cachebench/CacheBenchmarkRunner.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- cache-bench-fwk/trunk/src/org/cachebench/CacheBenchmarkRunner.java	2008=
-01-04 19:23:10 UTC (rev 4995)
+++ cache-bench-fwk/trunk/src/org/cachebench/CacheBenchmarkRunner.java	2008=
-01-04 20:25:50 UTC (rev 4996)
@@ -75,7 +75,7 @@
             {
                logger.warn("No Results to be reported");
             }
-            logger.info("Benchmarking Completed.  Hope you enjoyed using t=
his!");
+            logger.info("Benchmarking Completed.  Hope you enjoyed using t=
his! \n");
          }
          catch (Exception e)
          {


--===============4627728519380517671==--

From jboss-qa-internal at redhat.com Fri Jan  4 15:50:07 2008
Content-Type: multipart/mixed; boundary="===============6284869274457947132=="
MIME-Version: 1.0
From: jboss-qa-internal at redhat.com
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] Hudson build completed: jboss-cache-1.4.X-jdk1.5
 #52
Date: Fri, 04 Jan 2008 15:50:00 -0500
Message-ID: <29284170.11901199479800411.JavaMail.hudson@dev45.qa.atl2.redhat.com>

--===============6284869274457947132==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

See http://hudson.qa.jboss.com/hudson/job/jboss-cache-1.4.X-jdk1.5/52/chang=
es



--===============6284869274457947132==--

From jbosscache-commits at lists.jboss.org Sat Jan  5 07:52:33 2008
Content-Type: multipart/mixed; boundary="===============2222071503695194919=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r4997 -
 core/trunk/src/main/java/org/jboss/cache.
Date: Sat, 05 Jan 2008 07:52:33 -0500
Message-ID: <E1JB8Vt-00073t-6S@committer01.frg.pub.inap.atl.jboss.com>

--===============2222071503695194919==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: manik.surtani(a)jboss.com
Date: 2008-01-05 07:52:33 -0500 (Sat, 05 Jan 2008)
New Revision: 4997

Modified:
   core/trunk/src/main/java/org/jboss/cache/Fqn.java
Log:
Added comments on deprecation

Modified: core/trunk/src/main/java/org/jboss/cache/Fqn.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/java/org/jboss/cache/Fqn.java	2008-01-04 20:25:50 U=
TC (rev 4996)
+++ core/trunk/src/main/java/org/jboss/cache/Fqn.java	2008-01-05 12:52:33 U=
TC (rev 4997)
@@ -57,13 +57,16 @@
  * <p/>
  * Another way to look at it is that the "/" separarator is only parsed wh=
en it forms
  * part of a String passed in to Fqn.fromString() and not otherwise.
+ * <p/>
+ * <B>NOTE</B> that support for custom object elements of Fqns will be <i>=
dropped</i> from JBoss Cache 3.0.0 onwards.  Consider
+ * it's use in 2.x as a deprecated feature.. From 3.0.0 onwards, Fqns will=
 only be able to contain <tt>String</tt>s or
+ * Java primitives (<tt>byte</tt>, <tt>short</tt>, <tt>int</tt>, <tt>long<=
/tt>, <tt>float</tt>, <tt>double</tt>, <tt>char</tt> and <tt>boolean</tt>).
  *
  * @version $Revision$
  */
 @Immutable
 public class Fqn<E> implements Cloneable, Externalizable, Comparable<Fqn<?=
>>
 {
-
    /**
     * Separator between FQN elements.
     */


--===============2222071503695194919==--

From jbosscache-commits at lists.jboss.org Sat Jan  5 07:52:51 2008
Content-Type: multipart/mixed; boundary="===============1578660573618460087=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r4998 -
 core/trunk/src/main/java/org/jboss/cache/marshall.
Date: Sat, 05 Jan 2008 07:52:51 -0500
Message-ID: <E1JB8WB-000747-72@committer01.frg.pub.inap.atl.jboss.com>

--===============1578660573618460087==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: manik.surtani(a)jboss.com
Date: 2008-01-05 07:52:51 -0500 (Sat, 05 Jan 2008)
New Revision: 4998

Modified:
   core/trunk/src/main/java/org/jboss/cache/marshall/CacheMarshaller200.java
Log:
Improved performance of reference mapping collection

Modified: core/trunk/src/main/java/org/jboss/cache/marshall/CacheMarshaller=
200.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/java/org/jboss/cache/marshall/CacheMarshaller200.ja=
va	2008-01-05 12:52:33 UTC (rev 4997)
+++ core/trunk/src/main/java/org/jboss/cache/marshall/CacheMarshaller200.ja=
va	2008-01-05 12:52:51 UTC (rev 4998)
@@ -117,7 +117,7 @@
       {
          // not region based!
          if (trace) log.trace("Marshalling object " + o);
-         Map<Object, Integer> refMap =3D new HashMap<Object, Integer>();
+         ReferencesMap refMap =3D new ReferencesMap();
          marshallObject(o, out, refMap);
       }
    }
@@ -140,7 +140,7 @@
    public void objectToObjectStream(Object o, ObjectOutputStream out, Fqn =
region) throws Exception
    {
       if (trace) log.trace("Marshalling object " + o);
-      Map<Object, Integer> refMap =3D new HashMap<Object, Integer>();
+      ReferencesMap refMap =3D new ReferencesMap();
       if (useRegionBasedMarshalling) // got to check again in case this me=
th is called directly
       {
          log.trace("Writing region " + region + " to stream");
@@ -257,16 +257,18 @@
    }
    // --------- Marshalling methods
 =

-   private void marshallObject(Object o, ObjectOutputStream out, Map<Objec=
t, Integer> refMap) throws Exception
+   private void marshallObject(Object o, ObjectOutputStream out, Reference=
sMap refMap) throws Exception
    {
+      int reference;
+
       if (o =3D=3D null)
       {
          out.writeByte(MAGICNUMBER_NULL);
       }
-      else if (refMap.containsKey(o))// see if this object has been marsha=
lled before.
+      else if ((reference =3D refMap.getReference(o)) > -1)// see if this =
object has been marshalled before.
       {
          out.writeByte(MAGICNUMBER_REF);
-         writeReference(out, refMap.get(o));
+         writeReference(out, reference);
       }
       else if (o instanceof MethodCall)
       {
@@ -402,7 +404,7 @@
       }
    }
 =

-   private void marshallGravitateResult(GravitateResult gravitateResult, O=
bjectOutputStream out, Map<Object, Integer> refMap) throws Exception
+   private void marshallGravitateResult(GravitateResult gravitateResult, O=
bjectOutputStream out, ReferencesMap refMap) throws Exception
    {
       marshallObject(gravitateResult.isDataFound(), out, refMap);
       if (gravitateResult.isDataFound())
@@ -413,20 +415,19 @@
 =

    }
 =

-   private int createReference(Object o, Map<Object, Integer> refMap)
+   private int createReference(Object o, ReferencesMap refMap)
    {
-      int reference =3D refMap.size();
-      refMap.put(o, reference);
+      int reference =3D refMap.nextAvailableReference();
+      refMap.put(reference, o);
       return reference;
    }
 =

    private void marshallString(String s, ObjectOutputStream out) throws Ex=
ception
    {
-      //StringUtil.saveString(out, s);
       out.writeObject(s);
    }
 =

-   private void marshallMethodCall(MethodCall methodCall, ObjectOutputStre=
am out, Map<Object, Integer> refMap) throws Exception
+   private void marshallMethodCall(MethodCall methodCall, ObjectOutputStre=
am out, ReferencesMap refMap) throws Exception
    {
       out.writeShort(methodCall.getMethodId());
       Object[] args =3D methodCall.getArgs();
@@ -439,14 +440,14 @@
       }
    }
 =

-   private void marshallGlobalTransaction(GlobalTransaction globalTransact=
ion, ObjectOutputStream out, Map<Object, Integer> refMap) throws Exception
+   private void marshallGlobalTransaction(GlobalTransaction globalTransact=
ion, ObjectOutputStream out, ReferencesMap refMap) throws Exception
    {
       out.writeLong(globalTransaction.getId());
       marshallObject(globalTransaction.getAddress(), out, refMap);
    }
 =

 =

-   private void marshallFqn(Fqn fqn, ObjectOutputStream out, Map<Object, I=
nteger> refMap) throws Exception
+   private void marshallFqn(Fqn fqn, ObjectOutputStream out, ReferencesMap=
 refMap) throws Exception
    {
       boolean isRoot =3D fqn.isRoot();
       out.writeBoolean(isRoot);
@@ -465,7 +466,7 @@
       ipAddress.writeExternal(out);
    }
 =

-   private void marshallCollection(Collection c, ObjectOutputStream out, M=
ap refMap) throws Exception
+   private void marshallCollection(Collection c, ObjectOutputStream out, R=
eferencesMap refMap) throws Exception
    {
       writeUnsignedInt(out, c.size());
       for (Object o : c)
@@ -474,7 +475,7 @@
       }
    }
 =

-   private void marshallMap(Map map, ObjectOutputStream out, Map<Object, I=
nteger> refMap) throws Exception
+   private void marshallMap(Map map, ObjectOutputStream out, ReferencesMap=
 refMap) throws Exception
    {
       int mapSize =3D map.size();
       writeUnsignedInt(out, mapSize);
@@ -809,3 +810,28 @@
       out.writeLong(i);
    }
 }
+
+class ReferencesMap
+{
+   private ArrayList<Object> referencedObjects =3D new ArrayList<Object>();
+
+   void put(int reference, Object object)
+   {
+      referencedObjects.add(reference, object);
+   }
+
+   Object get(int reference)
+   {
+      return referencedObjects.get(reference);
+   }
+
+   int nextAvailableReference()
+   {
+      return referencedObjects.size();
+   }
+
+   int getReference(Object object)
+   {
+      return referencedObjects.indexOf(object);
+   }
+}


--===============1578660573618460087==--

From jbosscache-commits at lists.jboss.org Sat Jan  5 10:47:33 2008
Content-Type: multipart/mixed; boundary="===============2536781757247518085=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r4999 -
 cache-bench-fwk/trunk/src/org/cachebench/smartfrog.
Date: Sat, 05 Jan 2008 10:47:33 -0500
Message-ID: <E1JBBFF-0007rz-6f@committer01.frg.pub.inap.atl.jboss.com>

--===============2536781757247518085==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: mircea.markus
Date: 2008-01-05 10:47:33 -0500 (Sat, 05 Jan 2008)
New Revision: 4999

Modified:
   cache-bench-fwk/trunk/src/org/cachebench/smartfrog/CacheBenchmarkPrim.ja=
va
Log:
only designated nodes trigger the script now

Modified: cache-bench-fwk/trunk/src/org/cachebench/smartfrog/CacheBenchmark=
Prim.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- cache-bench-fwk/trunk/src/org/cachebench/smartfrog/CacheBenchmarkPrim.j=
ava	2008-01-05 12:52:51 UTC (rev 4998)
+++ cache-bench-fwk/trunk/src/org/cachebench/smartfrog/CacheBenchmarkPrim.j=
ava	2008-01-05 15:47:33 UTC (rev 4999)
@@ -54,6 +54,11 @@
    {
       super.sfStart();
       log.trace("Entered sfStart...");
+      if (clusterSize <=3D nodeIndex)
+      {
+         log.info("Not processing this node" + getNodeDescription());
+         return;
+      }
       try
       {
          String command =3D scriptToExec + " " + nodeIndex + " " + cacheDi=
stribution + " -DclusterSize=3D" + clusterSize;
@@ -64,12 +69,13 @@
          String line;
          while ((line =3D bufferedReader.readLine()) !=3D null)
          {
-            log.debug(scriptToExec + ">>>" + line);
+            log.debug(scriptToExec + " >>> " + line);
          }
+         bufferedReader.close();
          int exitValue =3D process.waitFor();
          if (exitValue !=3D 0)
          {
-            sfTerminate(new TerminationRecord(TerminationRecord.ABNORMAL, =
"we have an not 0 exit code: " + exitValue, null));
+            sfTerminate(new TerminationRecord(TerminationRecord.ABNORMAL, =
"we have an NOT zero exit code: " + exitValue, null));
          }
       }
       catch (Exception e)
@@ -77,11 +83,11 @@
          log.error("Unexpected error:" + e.getMessage(), e);
          throw new RemoteException("Unexpected error",e);
       }
-      log.trace("Terminating the tests...");
+      log.debug("Terminating the tests...");
       TerminationRecord terminationRecord =3D new TerminationRecord(Termin=
ationRecord.NORMAL, "terminated the benchmark " +
-            getDescription(), null);
+            getNodeDescription(), null);
       sfTerminate(terminationRecord);
-      log.debug("Test terminated successfully " + getDescription());
+      log.debug("Test terminated successfully " + getNodeDescription());
    }
 =

    private File getFwkHomeDir()
@@ -103,7 +109,7 @@
       log.trace("sfTerminateWith called with value:" +  terminationRecord);
    }
 =

-   public String getDescription()
+   public String getNodeDescription()
    {
       return "( clusterSize:" + clusterSize + ", nodeIndex:" + this.nodeIn=
dex + " )";
    }


--===============2536781757247518085==--

From jbosscache-commits at lists.jboss.org Sat Jan  5 15:16:51 2008
Content-Type: multipart/mixed; boundary="===============4999962734584914188=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r5000 -
 cache-bench-fwk/trunk/src/org/cachebench/smartfrog.
Date: Sat, 05 Jan 2008 15:16:51 -0500
Message-ID: <E1JBFRr-00017K-7K@committer01.frg.pub.inap.atl.jboss.com>

--===============4999962734584914188==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: mircea.markus
Date: 2008-01-05 15:16:51 -0500 (Sat, 05 Jan 2008)
New Revision: 5000

Modified:
   cache-bench-fwk/trunk/src/org/cachebench/smartfrog/CacheBenchmarkPrim.ja=
va
Log:


Modified: cache-bench-fwk/trunk/src/org/cachebench/smartfrog/CacheBenchmark=
Prim.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- cache-bench-fwk/trunk/src/org/cachebench/smartfrog/CacheBenchmarkPrim.j=
ava	2008-01-05 15:47:33 UTC (rev 4999)
+++ cache-bench-fwk/trunk/src/org/cachebench/smartfrog/CacheBenchmarkPrim.j=
ava	2008-01-05 20:16:51 UTC (rev 5000)
@@ -52,6 +52,25 @@
 =

    public synchronized void sfStart() throws SmartFrogException, RemoteExc=
eption
    {
+      Thread thread =3D new Thread()
+      {
+         public void run()
+         {
+            try
+            {
+               runBenchmark();
+            } catch (Exception e)
+            {
+               throw new IllegalStateException(e);
+            }
+         }
+      };
+      thread.start();
+   }
+
+   private void runBenchmark()
+         throws SmartFrogException, RemoteException
+   {
       super.sfStart();
       log.trace("Entered sfStart...");
       if (clusterSize <=3D nodeIndex)


--===============4999962734584914188==--

From jbosscache-commits at lists.jboss.org Sat Jan  5 16:25:24 2008
Content-Type: multipart/mixed; boundary="===============1365742430277372009=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r5001 - cache-bench-fwk/trunk.
Date: Sat, 05 Jan 2008 16:25:23 -0500
Message-ID: <E1JBGWB-0005pw-VC@committer01.frg.pub.inap.atl.jboss.com>

--===============1365742430277372009==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: mircea.markus
Date: 2008-01-05 16:25:23 -0500 (Sat, 05 Jan 2008)
New Revision: 5001

Modified:
   cache-bench-fwk/trunk/runNode.sh
Log:
increased the memory size for the JVM

Modified: cache-bench-fwk/trunk/runNode.sh
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- cache-bench-fwk/trunk/runNode.sh	2008-01-05 20:16:51 UTC (rev 5000)
+++ cache-bench-fwk/trunk/runNode.sh	2008-01-05 21:25:23 UTC (rev 5001)
@@ -5,6 +5,7 @@
 =

 CACHE_DEBUG=3Dtrue
 preferIPv4Stack=3Dtrue
+export JVM_ARGS=3D-Xmx1024m
 =

 if [ -z $1 ]
 then
@@ -45,8 +46,8 @@
    echo executing command $START_NODE_COMMAND
    $START_NODE_COMMAND
 else   =

-   TO_EXECUTE=3D"java -cp $CLASSPATH $3 $SYS_PROPS org.cachebench.CacheBen=
chmarkRunner $4"
+   TO_EXECUTE=3D"java $JVM_ARGS -cp $CLASSPATH $3 $SYS_PROPS org.cachebenc=
h.CacheBenchmarkRunner $4"
    echo executing $TO_EXECUTE
-   java -cp $CLASSPATH $3 $SYS_PROPS org.cachebench.CacheBenchmarkRunner $4
+   java $JVM_ARGS -cp $CLASSPATH $3 $SYS_PROPS org.cachebench.CacheBenchma=
rkRunner $4
 fi
 =



--===============1365742430277372009==--

From jbosscache-commits at lists.jboss.org Sat Jan  5 16:51:35 2008
Content-Type: multipart/mixed; boundary="===============5847078284604906466=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r5002 - in
 cache-bench-fwk/trunk: src/org/cachebench/smartfrog and 1 other directory.
Date: Sat, 05 Jan 2008 16:51:31 -0500
Message-ID: <E1JBGvT-0002XR-RS@committer01.frg.pub.inap.atl.jboss.com>

--===============5847078284604906466==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: mircea.markus
Date: 2008-01-05 16:51:31 -0500 (Sat, 05 Jan 2008)
New Revision: 5002

Modified:
   cache-bench-fwk/trunk/runNode.sh
   cache-bench-fwk/trunk/src/org/cachebench/smartfrog/CacheBenchmarkPrim.ja=
va
Log:
increased the memory size for the JVM

Modified: cache-bench-fwk/trunk/runNode.sh
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- cache-bench-fwk/trunk/runNode.sh	2008-01-05 21:25:23 UTC (rev 5001)
+++ cache-bench-fwk/trunk/runNode.sh	2008-01-05 21:51:31 UTC (rev 5002)
@@ -20,6 +20,9 @@
 =

 export SYS_PROPS=3D"-DcurrentIndex=3D$1 -Dorg.cachebench.debug=3D$CACHE_DE=
BUG -Djava.net.preferIPv4Stack=3D$preferIPv4Stack"
 =

+#first kill all the exisiting processes as they might interfere with the n=
ew ones/ not sure this works on cygwin
+ps -fe | grep CacheBenchmarkRunner | cut -c 10-20 | xargs kill
+
 #libraries needed by the fwk, add them to the classpath
 for JAR in ./lib/*
 do

Modified: cache-bench-fwk/trunk/src/org/cachebench/smartfrog/CacheBenchmark=
Prim.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- cache-bench-fwk/trunk/src/org/cachebench/smartfrog/CacheBenchmarkPrim.j=
ava	2008-01-05 21:25:23 UTC (rev 5001)
+++ cache-bench-fwk/trunk/src/org/cachebench/smartfrog/CacheBenchmarkPrim.j=
ava	2008-01-05 21:51:31 UTC (rev 5002)
@@ -7,10 +7,7 @@
 import org.smartfrog.sfcore.prim.PrimImpl;
 import org.smartfrog.sfcore.prim.TerminationRecord;
 =

-import java.io.BufferedReader;
-import java.io.File;
-import java.io.InputStreamReader;
-import java.io.LineNumberReader;
+import java.io.*;
 import java.rmi.RemoteException;
 =

 /**
@@ -59,17 +56,34 @@
             try
             {
                runBenchmark();
-            } catch (Exception e)
+            } catch (SmartFrogException e)
             {
-               throw new IllegalStateException(e);
+                  log.error("Unexpected error:" + e.getMessage(), e);
+
+            } catch (IOException e)
+            {
+               log.warn("Does the script have X rights?", e);
+               terminate(e);
+
+            } catch (InterruptedException e)
+            {
+               log.err("This is quite strange", e);
+               terminate(e);
             }
          }
+         private void terminate(Exception e)
+         {
+            TerminationRecord terminationRecord =3D new TerminationRecord(=
TerminationRecord.ABNORMAL , "terminated the benchmark " +
+                  getNodeDescription(),null, e);
+            sfTerminate(terminationRecord);
+
+         }
       };
       thread.start();
    }
 =

    private void runBenchmark()
-         throws SmartFrogException, RemoteException
+         throws SmartFrogException, IOException, InterruptedException
    {
       super.sfStart();
       log.trace("Entered sfStart...");
@@ -78,8 +92,6 @@
          log.info("Not processing this node" + getNodeDescription());
          return;
       }
-      try
-      {
          String command =3D scriptToExec + " " + nodeIndex + " " + cacheDi=
stribution + " -DclusterSize=3D" + clusterSize;
          log.info("Executing command: " + command);
          Process process =3D Runtime.getRuntime().exec(command, null, toRu=
nIn);
@@ -96,12 +108,6 @@
          {
             sfTerminate(new TerminationRecord(TerminationRecord.ABNORMAL, =
"we have an NOT zero exit code: " + exitValue, null));
          }
-      }
-      catch (Exception e)
-      {
-         log.error("Unexpected error:" + e.getMessage(), e);
-         throw new RemoteException("Unexpected error",e);
-      }
       log.debug("Terminating the tests...");
       TerminationRecord terminationRecord =3D new TerminationRecord(Termin=
ationRecord.NORMAL, "terminated the benchmark " +
             getNodeDescription(), null);


--===============5847078284604906466==--

From jbosscache-commits at lists.jboss.org Sat Jan  5 18:24:50 2008
Content-Type: multipart/mixed; boundary="===============7504087203216929386=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r5003 - cache-bench-fwk/trunk.
Date: Sat, 05 Jan 2008 18:24:50 -0500
Message-ID: <E1JBINm-0003GB-D0@committer01.frg.pub.inap.atl.jboss.com>

--===============7504087203216929386==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: mircea.markus
Date: 2008-01-05 18:24:50 -0500 (Sat, 05 Jan 2008)
New Revision: 5003

Modified:
   cache-bench-fwk/trunk/runNode.sh
Log:
added aditional check

Modified: cache-bench-fwk/trunk/runNode.sh
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- cache-bench-fwk/trunk/runNode.sh	2008-01-05 21:51:31 UTC (rev 5002)
+++ cache-bench-fwk/trunk/runNode.sh	2008-01-05 23:24:50 UTC (rev 5003)
@@ -21,13 +21,17 @@
 export SYS_PROPS=3D"-DcurrentIndex=3D$1 -Dorg.cachebench.debug=3D$CACHE_DE=
BUG -Djava.net.preferIPv4Stack=3D$preferIPv4Stack"
 =

 #first kill all the exisiting processes as they might interfere with the n=
ew ones/ not sure this works on cygwin
-ps -fe | grep CacheBenchmarkRunner | cut -c 10-20 | xargs kill
+for PID in `ps -fe | grep "Cache*BenchmarkRunner" | cut -c 10-20`
+do
+   kill PID
+done
 =

 #libraries needed by the fwk, add them to the classpath
 for JAR in ./lib/*
 do
    FWK_CLASS_PATH=3D$FWK_CLASS_PATH:$JAR
 done
+
 FWK_CLASS_PATH=3D$FWK_CLASS_PATH:./conf:./classes/production/Framework
 export FWK_CLASS_PATH
 =



--===============7504087203216929386==--

From jbosscache-commits at lists.jboss.org Sat Jan  5 18:33:10 2008
Content-Type: multipart/mixed; boundary="===============7934519075926664166=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r5004 -
 cache-bench-fwk/trunk/src/org/cachebench/tests.
Date: Sat, 05 Jan 2008 18:33:10 -0500
Message-ID: <E1JBIVq-00051O-NN@committer01.frg.pub.inap.atl.jboss.com>

--===============7934519075926664166==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: mircea.markus
Date: 2008-01-05 18:33:10 -0500 (Sat, 05 Jan 2008)
New Revision: 5004

Modified:
   cache-bench-fwk/trunk/src/org/cachebench/tests/ReplicationOccursTest.java
Log:
increased the memory size for the JVM

Modified: cache-bench-fwk/trunk/src/org/cachebench/tests/ReplicationOccursT=
est.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- cache-bench-fwk/trunk/src/org/cachebench/tests/ReplicationOccursTest.ja=
va	2008-01-05 23:24:50 UTC (rev 5003)
+++ cache-bench-fwk/trunk/src/org/cachebench/tests/ReplicationOccursTest.ja=
va	2008-01-05 23:33:10 UTC (rev 5004)
@@ -6,10 +6,11 @@
 import org.cachebench.TestResult;
 import org.cachebench.cluster.ClusterBarrier;
 import org.cachebench.config.Configuration;
+import org.cachebench.config.TestCase;
 import org.cachebench.config.TestConfig;
-import org.cachebench.config.TestCase;
 =

 import java.net.SocketAddress;
+import java.util.Collection;
 import java.util.Map;
 =

 /**
@@ -126,8 +127,30 @@
       log.info("Number of caches that replicated here is " + replicaCount);
       if (isPartialReplication(testCaseName, testName))
       {
-         return replicaCount > 0;
+         return verifyClusterReplication(replicaCount);
       }
       return replicaCount =3D=3D conf.getClusterConfig().getClusterSize() =
- 1;
    }
+
+   /**
+    * Checks whether the sum of replciations across the cluster is bigger =
than the number of nodes in the cluster, in
+    * other words each node replicated at least once.
+    */
+   private boolean verifyClusterReplication(int replicaCount) throws Excep=
tion
+   {
+      ClusterBarrier barrier =3D new ClusterBarrier();
+      barrier.setConfig(conf.getClusterConfig());
+      barrier.barrier(replicaCount);
+      Collection recievedValues =3D barrier.getReceivedMessages().values();
+      log.trace("Recieved the following repilcation counts: " + recievedVa=
lues);
+      int totalValue =3D 0;
+      for (Object val : recievedValues)
+      {
+         totalValue +=3D Integer.valueOf(val.toString());
+      }
+      log.info("Overall replication count is: " + totalValue);
+      boolean isReplicationSuccess =3D totalValue >=3D this.conf.getCluste=
rConfig().getClusterSize();
+      log.info("Is replication passed? " + isReplicationSuccess);
+      return isReplicationSuccess;
+   }
 }


--===============7934519075926664166==--

From jbosscache-commits at lists.jboss.org Sat Jan  5 19:37:11 2008
Content-Type: multipart/mixed; boundary="===============3163578146200765492=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r5005 -
 cache-bench-fwk/trunk/src/org/cachebench/tests.
Date: Sat, 05 Jan 2008 19:37:11 -0500
Message-ID: <E1JBJVn-0000b4-Eb@committer01.frg.pub.inap.atl.jboss.com>

--===============3163578146200765492==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: mircea.markus
Date: 2008-01-05 19:37:11 -0500 (Sat, 05 Jan 2008)
New Revision: 5005

Modified:
   cache-bench-fwk/trunk/src/org/cachebench/tests/ReplicationOccursTest.java
Log:
changed replication tests semantics

Modified: cache-bench-fwk/trunk/src/org/cachebench/tests/ReplicationOccursT=
est.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- cache-bench-fwk/trunk/src/org/cachebench/tests/ReplicationOccursTest.ja=
va	2008-01-05 23:33:10 UTC (rev 5004)
+++ cache-bench-fwk/trunk/src/org/cachebench/tests/ReplicationOccursTest.ja=
va	2008-01-06 00:37:11 UTC (rev 5005)
@@ -148,8 +148,15 @@
       {
          totalValue +=3D Integer.valueOf(val.toString());
       }
-      log.info("Overall replication count is: " + totalValue);
-      boolean isReplicationSuccess =3D totalValue >=3D this.conf.getCluste=
rConfig().getClusterSize();
+      log.info("********** Overall replication count is: " + totalValue);
+      //this means SOME replication occurred. This does not mean, though, =
that all nodes replicated successfuly.
+      //correct condition would be >=3D this.conf.getClusterConfig().getCl=
usterSize()
+      //todo/FIXME - this seem not to work with all the products, so we wi=
ll accept 'some replication'
+      if (totalValue < this.conf.getClusterConfig().getClusterSize())
+      {
+         log.warn("The replication was not total, but partial!!");
+      }
+      boolean isReplicationSuccess =3D totalValue > 0;
       log.info("Is replication passed? " + isReplicationSuccess);
       return isReplicationSuccess;
    }


--===============3163578146200765492==--

From jbosscache-commits at lists.jboss.org Sun Jan  6 06:13:53 2008
Content-Type: multipart/mixed; boundary="===============2162318116056268069=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r5006 - in
 cache-bench-fwk/trunk/src/org/cachebench: tests and 1 other directory.
Date: Sun, 06 Jan 2008 06:13:53 -0500
Message-ID: <E1JBTRx-0005s2-6c@committer01.frg.pub.inap.atl.jboss.com>

--===============2162318116056268069==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: mircea.markus
Date: 2008-01-06 06:13:52 -0500 (Sun, 06 Jan 2008)
New Revision: 5006

Modified:
   cache-bench-fwk/trunk/src/org/cachebench/smartfrog/CacheBenchmarkPrim.ja=
va
   cache-bench-fwk/trunk/src/org/cachebench/tests/SimpleTest.java
Log:
added some more logging

Modified: cache-bench-fwk/trunk/src/org/cachebench/smartfrog/CacheBenchmark=
Prim.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- cache-bench-fwk/trunk/src/org/cachebench/smartfrog/CacheBenchmarkPrim.j=
ava	2008-01-06 00:37:11 UTC (rev 5005)
+++ cache-bench-fwk/trunk/src/org/cachebench/smartfrog/CacheBenchmarkPrim.j=
ava	2008-01-06 11:13:52 UTC (rev 5006)
@@ -106,7 +106,8 @@
          int exitValue =3D process.waitFor();
          if (exitValue !=3D 0)
          {
-            sfTerminate(new TerminationRecord(TerminationRecord.ABNORMAL, =
"we have an NOT zero exit code: " + exitValue, null));
+            sfTerminate(new TerminationRecord(TerminationRecord.ABNORMAL, =
"we have an NOT zero exit code: " + exitValue
+                  + ", originated from " +  getNodeDescription(), null));
          }
       log.debug("Terminating the tests...");
       TerminationRecord terminationRecord =3D new TerminationRecord(Termin=
ationRecord.NORMAL, "terminated the benchmark " +

Modified: cache-bench-fwk/trunk/src/org/cachebench/tests/SimpleTest.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- cache-bench-fwk/trunk/src/org/cachebench/tests/SimpleTest.java	2008-01-=
06 00:37:11 UTC (rev 5005)
+++ cache-bench-fwk/trunk/src/org/cachebench/tests/SimpleTest.java	2008-01-=
06 11:13:52 UTC (rev 5006)
@@ -30,6 +30,7 @@
    protected ExecutorService executor;
    private static final int EXECUTOR_SHUTDOWN_TIMEOUT_POLL_SECS =3D 60;
    protected Configuration configuration;
+   protected final int LOG_FREQUENCY =3D 5000;
 =

    protected TestResult performTestWithObjectType(String testCaseName, Cac=
heWrapper cache, Class valueClass, String testName, int sampleSize, int num=
Threads) throws Exception
    {
@@ -101,6 +102,7 @@
 =

       for (int i =3D 0; i < sampleSize; i++)
       {
+         logOperation(i, "GETS");
          final int cycleNumber =3D i;
          Runnable r =3D new Runnable()
          {
@@ -147,6 +149,14 @@
       return stats;
    }
 =

+   private void logOperation(int i, String s)
+   {
+      if ((i + 1) % LOG_FREQUENCY =3D=3D 0)
+      {
+         log.info((i + 1) + " " + s + " were performed");
+      }
+   }
+
    /**
     * @param cache      The Cachewrapper on which the bechmark is conducte=
d.
     * @param valueClass The value class instance which is going to be inse=
rted into the Cache.
@@ -165,6 +175,7 @@
 =

       for (int i =3D 0; i < sampleSize; i++)
       {
+         logOperation(i,"PUTS");
          final int cycleNumber =3D i;
          Runnable r =3D new Runnable()
          {


--===============2162318116056268069==--

From jbosscache-commits at lists.jboss.org Sun Jan  6 07:54:44 2008
Content-Type: multipart/mixed; boundary="===============2756835353221083398=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r5007 -
 cache-bench-fwk/trunk/src/org/cachebench/tests.
Date: Sun, 06 Jan 2008 07:54:44 -0500
Message-ID: <E1JBV1Y-0007WC-3C@committer01.frg.pub.inap.atl.jboss.com>

--===============2756835353221083398==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: mircea.markus
Date: 2008-01-06 07:54:43 -0500 (Sun, 06 Jan 2008)
New Revision: 5007

Modified:
   cache-bench-fwk/trunk/src/org/cachebench/tests/SimpleTest.java
Log:
added some more logging

Modified: cache-bench-fwk/trunk/src/org/cachebench/tests/SimpleTest.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- cache-bench-fwk/trunk/src/org/cachebench/tests/SimpleTest.java	2008-01-=
06 11:13:52 UTC (rev 5006)
+++ cache-bench-fwk/trunk/src/org/cachebench/tests/SimpleTest.java	2008-01-=
06 12:54:43 UTC (rev 5007)
@@ -102,7 +102,6 @@
 =

       for (int i =3D 0; i < sampleSize; i++)
       {
-         logOperation(i, "GETS");
          final int cycleNumber =3D i;
          Runnable r =3D new Runnable()
          {
@@ -128,6 +127,7 @@
                      stats.addValue(statValue);
                      log.debug("The Get stat : " + statValue);
                   }
+                  logOperation(cycleNumber, "GETS");
                }
                catch (Exception e)
                {
@@ -175,7 +175,6 @@
 =

       for (int i =3D 0; i < sampleSize; i++)
       {
-         logOperation(i,"PUTS");
          final int cycleNumber =3D i;
          Runnable r =3D new Runnable()
          {
@@ -212,6 +211,7 @@
                      long statValue =3D (System.currentTimeMillis() - star=
tTime);
                      stats.addValue(statValue);
                   }
+                  logOperation(cycleNumber,"PUTS");
                }
                catch (Exception e)
                {


--===============2756835353221083398==--

From jbosscache-commits at lists.jboss.org Sun Jan  6 08:20:56 2008
Content-Type: multipart/mixed; boundary="===============0601820920292659296=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r5008 - cache-bench-fwk/trunk.
Date: Sun, 06 Jan 2008 08:20:53 -0500
Message-ID: <E1JBVQr-0004px-3d@committer01.frg.pub.inap.atl.jboss.com>

--===============0601820920292659296==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: mircea.markus
Date: 2008-01-06 08:20:52 -0500 (Sun, 06 Jan 2008)
New Revision: 5008

Modified:
   cache-bench-fwk/trunk/runNode.sh
Log:
changed the cleanup logic

Modified: cache-bench-fwk/trunk/runNode.sh
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- cache-bench-fwk/trunk/runNode.sh	2008-01-06 12:54:43 UTC (rev 5007)
+++ cache-bench-fwk/trunk/runNode.sh	2008-01-06 13:20:52 UTC (rev 5008)
@@ -5,7 +5,7 @@
 =

 CACHE_DEBUG=3Dtrue
 preferIPv4Stack=3Dtrue
-export JVM_ARGS=3D-Xmx1024m
+export JVM_ARGS=3D-Xmx2048m
 =

 if [ -z $1 ]
 then
@@ -21,10 +21,11 @@
 export SYS_PROPS=3D"-DcurrentIndex=3D$1 -Dorg.cachebench.debug=3D$CACHE_DE=
BUG -Djava.net.preferIPv4Stack=3D$preferIPv4Stack"
 =

 #first kill all the exisiting processes as they might interfere with the n=
ew ones/ not sure this works on cygwin
-for PID in `ps -fe | grep "Cache*BenchmarkRunner" | cut -c 10-20`
-do
-   kill PID
-done
+ps -fe | grep "Cache*BenchmarkRunner" | cut -c 10-20 | xargs -r kill
+#for PID in `ps -fe | grep "Cache*BenchmarkRunner" | cut -c 10-20`
+#do
+#   kill PID
+#done
 =

 #libraries needed by the fwk, add them to the classpath
 for JAR in ./lib/*


--===============0601820920292659296==--

From jbosscache-commits at lists.jboss.org Sun Jan  6 11:11:03 2008
Content-Type: multipart/mixed; boundary="===============8450386592784695218=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r5009 - in
 cache-bench-fwk/trunk: src/org/cachebench/smartfrog and 1 other directories.
Date: Sun, 06 Jan 2008 11:11:03 -0500
Message-ID: <E1JBY5X-0003oA-AB@committer01.frg.pub.inap.atl.jboss.com>

--===============8450386592784695218==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: mircea.markus
Date: 2008-01-06 11:11:03 -0500 (Sun, 06 Jan 2008)
New Revision: 5009

Modified:
   cache-bench-fwk/trunk/smartfrog/cacheBenchComponent.sf
   cache-bench-fwk/trunk/smartfrog/main.sf
   cache-bench-fwk/trunk/src/org/cachebench/smartfrog/CacheBenchmarkPrim.ja=
va
   cache-bench-fwk/trunk/src/org/cachebench/warmup/CacheWarmup.java
Log:
we can run tests on multiple cluster configs now

Modified: cache-bench-fwk/trunk/smartfrog/cacheBenchComponent.sf
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- cache-bench-fwk/trunk/smartfrog/cacheBenchComponent.sf	2008-01-06 13:20=
:52 UTC (rev 5008)
+++ cache-bench-fwk/trunk/smartfrog/cacheBenchComponent.sf	2008-01-06 16:11=
:03 UTC (rev 5009)
@@ -3,7 +3,7 @@
 BaseCacheBenchPrim extends Prim {
    sfClass "org.cachebench.smartfrog.CacheBenchmarkPrim";
 =

-   scriptToExec "runNode.sh"
+   scriptToExec "./runNode.sh"
 =

    //FQN of the directory where the framework was checked out (noramally i=
s th eparent of the dir that contains this file)
    //this should be edited

Modified: cache-bench-fwk/trunk/smartfrog/main.sf
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- cache-bench-fwk/trunk/smartfrog/main.sf	2008-01-06 13:20:52 UTC (rev 50=
08)
+++ cache-bench-fwk/trunk/smartfrog/main.sf	2008-01-06 16:11:03 UTC (rev 50=
09)
@@ -4,61 +4,431 @@
 BaseCacheBenchPrim extends Prim {
    sfClass "org.cachebench.smartfrog.CacheBenchmarkPrim";
 =

-   scriptToExec "./runNode.sh"
+   scriptToExec "runNode.bat"
 =

    //FQN of the directory where the framework was checked out (noramally i=
s th eparent of the dir that contains this file)
    //this should be edited
-   cacheBenchmarkHome "/qa/home/mmarkus/code/cache-bench-fwk";
+   cacheBenchmarkHome "/projects/jboss/cache/benchmark/cache-bench-fwk";
 =

    //should be the name of a subdirectory of 'cache-products' directory.
    cacheDistribution "jbosscache-2.0.0";
 =

+   //might take a value from 0..max_nr_of_nodes, representing the index of=
 the current node in the cluster
+   nodeIndex TBD;
+
    //defines on how many nodes the benchmark will run
-   clusterSize 1;
+   clusterSize TBD;
+   minClusterSize TBD;
+   maxClusterSize TBD;
 =

-   //might take a value from 0..max_nr_of_nodes, representing the index of=
 the current node in the cluster
-   nodeIndex TBD;
 }
 =

 sfConfig extends Compound {
 =

-   node1 extends BaseCacheBenchPrim{
-      sfProcessHost "cluster01";
-      nodeIndex 0;
+   minimumClusterSize 0;
+   maximumClusterSize 9;
+
+   oneClusterSize extends Compound {
+
+      c1FirstMember extends BaseCacheBenchPrim {
+          sfProcessHost "localhost";
+          nodeIndex 0;
+          clusterSize 1;
+          minClusterSize ATTRIB minimumClusterSize;
+          maxClusterSize ATTRIB maximumClusterSize;
+      }
    }
-   =

-   node2 extends BaseCacheBenchPrim{
-      sfProcessHost "cluster02";
-      nodeIndex 1;
+
+   twoClusterSize extends Compound {
+
+      sizeOfTheCluster 2;
+
+      c2FirstMember extends BaseCacheBenchPrim {
+          sfProcessHost "localhost";
+          nodeIndex 0;
+          clusterSize ATTRIB sizeOfTheCluster;
+          minClusterSize ATTRIB minimumClusterSize;
+          maxClusterSize ATTRIB maximumClusterSize;
+      }
+
+      c2SecondMember extends BaseCacheBenchPrim {
+          sfProcessHost "localhost";
+          nodeIndex 1;
+          clusterSize ATTRIB sizeOfTheCluster;
+          minClusterSize ATTRIB minimumClusterSize;
+          maxClusterSize ATTRIB maximumClusterSize;
+      }
    }
-      =

-   node3 extends BaseCacheBenchPrim{
-      sfProcessHost "cluster03";
-      nodeIndex 2;
+
+   threeClusterSize extends Compound {
+
+      sizeOfTheCluster 3;
+
+      c3FirstMember extends BaseCacheBenchPrim {
+          sfProcessHost "localhost";
+          nodeIndex 0;
+          clusterSize ATTRIB sizeOfTheCluster;
+          minClusterSize ATTRIB minimumClusterSize;
+          maxClusterSize ATTRIB maximumClusterSize;
+      }
+
+      c3SecondMember extends BaseCacheBenchPrim {
+          sfProcessHost "localhost";
+          nodeIndex 1;
+          clusterSize ATTRIB sizeOfTheCluster;
+          minClusterSize ATTRIB minimumClusterSize;
+          maxClusterSize ATTRIB maximumClusterSize;
+      }
+
+      c3ThirdMember extends BaseCacheBenchPrim {
+          sfProcessHost "localhost";
+          nodeIndex 2;
+          clusterSize ATTRIB sizeOfTheCluster;
+          minClusterSize ATTRIB minimumClusterSize;
+          maxClusterSize ATTRIB maximumClusterSize;
+      }
    }
-      =

-   node4 extends BaseCacheBenchPrim{
-      sfProcessHost "cluster04";
-      nodeIndex 3;
+
+   fourClusterSize extends Compound {
+
+      sizeOfTheCluster 4;
+
+      c4FirstMember extends BaseCacheBenchPrim {
+          sfProcessHost "localhost";
+          nodeIndex 0;
+          clusterSize ATTRIB sizeOfTheCluster;
+          minClusterSize ATTRIB minimumClusterSize;
+          maxClusterSize ATTRIB maximumClusterSize;
+      }
+
+      c4SecondMember extends BaseCacheBenchPrim {
+          sfProcessHost "localhost";
+          nodeIndex 1;
+          clusterSize ATTRIB sizeOfTheCluster;
+          minClusterSize ATTRIB minimumClusterSize;
+          maxClusterSize ATTRIB maximumClusterSize;
+      }
+
+      c4ThirdMember extends BaseCacheBenchPrim {
+          sfProcessHost "localhost";
+          nodeIndex 2;
+          clusterSize ATTRIB sizeOfTheCluster;
+          minClusterSize ATTRIB minimumClusterSize;
+          maxClusterSize ATTRIB maximumClusterSize;
+      }
+
+      c4ForthMember extends BaseCacheBenchPrim {
+          sfProcessHost "localhost";
+          nodeIndex 3;
+          clusterSize ATTRIB sizeOfTheCluster;
+          minClusterSize ATTRIB minimumClusterSize;
+          maxClusterSize ATTRIB maximumClusterSize;
+      }
    }
    =

-   node5 extends BaseCacheBenchPrim{
-      sfProcessHost "cluster05";
-      nodeIndex 4;
+   fiveClusterSize extends Compound {
+
+      sizeOfTheCluster 5;
+
+      c5FirstMember extends BaseCacheBenchPrim {
+          sfProcessHost "localhost";
+          nodeIndex 0;
+          clusterSize ATTRIB sizeOfTheCluster;
+          minClusterSize ATTRIB minimumClusterSize;
+          maxClusterSize ATTRIB maximumClusterSize;
+      }
+
+      c5SecondMember extends BaseCacheBenchPrim {
+          sfProcessHost "localhost";
+          nodeIndex 1;
+          clusterSize ATTRIB sizeOfTheCluster;
+          minClusterSize ATTRIB minimumClusterSize;
+          maxClusterSize ATTRIB maximumClusterSize;
+      }
+
+      c5ThirdMember extends BaseCacheBenchPrim {
+          sfProcessHost "localhost";
+          nodeIndex 2;
+          clusterSize ATTRIB sizeOfTheCluster;
+          minClusterSize ATTRIB minimumClusterSize;
+          maxClusterSize ATTRIB maximumClusterSize;
+      }
+
+      c5ForthMember extends BaseCacheBenchPrim {
+          sfProcessHost "localhost";
+          nodeIndex 3;
+          clusterSize ATTRIB sizeOfTheCluster;
+          minClusterSize ATTRIB minimumClusterSize;
+          maxClusterSize ATTRIB maximumClusterSize;
+      }
+      =

+      c5FifthMember extends BaseCacheBenchPrim {
+          sfProcessHost "localhost";
+          nodeIndex 4;
+          clusterSize ATTRIB sizeOfTheCluster;
+          minClusterSize ATTRIB minimumClusterSize;
+          maxClusterSize ATTRIB maximumClusterSize;
+      }
    }
+
+   sixClusterSize extends Compound {
+
+      sizeOfTheCluster 6;
+
+      c6FirstMember extends BaseCacheBenchPrim {
+          sfProcessHost "localhost";
+          nodeIndex 0;
+          clusterSize ATTRIB sizeOfTheCluster;
+          minClusterSize ATTRIB minimumClusterSize;
+          maxClusterSize ATTRIB maximumClusterSize;
+      }
+
+      c6SecondMember extends BaseCacheBenchPrim {
+          sfProcessHost "localhost";
+          nodeIndex 1;
+          clusterSize ATTRIB sizeOfTheCluster;
+          minClusterSize ATTRIB minimumClusterSize;
+          maxClusterSize ATTRIB maximumClusterSize;
+      }
+
+      c6ThirdMember extends BaseCacheBenchPrim {
+          sfProcessHost "localhost";
+          nodeIndex 2;
+          clusterSize ATTRIB sizeOfTheCluster;
+          minClusterSize ATTRIB minimumClusterSize;
+          maxClusterSize ATTRIB maximumClusterSize;
+      }
+
+      c6ForthMember extends BaseCacheBenchPrim {
+          sfProcessHost "localhost";
+          nodeIndex 3;
+          clusterSize ATTRIB sizeOfTheCluster;
+          minClusterSize ATTRIB minimumClusterSize;
+          maxClusterSize ATTRIB maximumClusterSize;
+      }
+
+      c6FifthMember extends BaseCacheBenchPrim {
+          sfProcessHost "localhost";
+          nodeIndex 4;
+          clusterSize ATTRIB sizeOfTheCluster;
+          minClusterSize ATTRIB minimumClusterSize;
+          maxClusterSize ATTRIB maximumClusterSize;
+      }
+
+      c6SixthMember extends BaseCacheBenchPrim {
+          sfProcessHost "localhost";
+          nodeIndex 5;
+          clusterSize ATTRIB sizeOfTheCluster;
+          minClusterSize ATTRIB minimumClusterSize;
+          maxClusterSize ATTRIB maximumClusterSize;
+      }
+   }
    =

-   node6 extends BaseCacheBenchPrim{
-      sfProcessHost "cluster06";
-      nodeIndex 5;
+   sevenClusterSize extends Compound {
+
+      sizeOfTheCluster 7;
+
+      c7FirstMember extends BaseCacheBenchPrim {
+          sfProcessHost "localhost";
+          nodeIndex 0;
+          clusterSize ATTRIB sizeOfTheCluster;
+          minClusterSize ATTRIB minimumClusterSize;
+          maxClusterSize ATTRIB maximumClusterSize;
+      }
+
+      c7SecondMember extends BaseCacheBenchPrim {
+          sfProcessHost "localhost";
+          nodeIndex 1;
+          clusterSize ATTRIB sizeOfTheCluster;
+          minClusterSize ATTRIB minimumClusterSize;
+          maxClusterSize ATTRIB maximumClusterSize;
+      }
+
+      c7ThirdMember extends BaseCacheBenchPrim {
+          sfProcessHost "localhost";
+          nodeIndex 2;
+          clusterSize ATTRIB sizeOfTheCluster;
+          minClusterSize ATTRIB minimumClusterSize;
+          maxClusterSize ATTRIB maximumClusterSize;
+      }
+
+      c7ForthMember extends BaseCacheBenchPrim {
+          sfProcessHost "localhost";
+          nodeIndex 3;
+          clusterSize ATTRIB sizeOfTheCluster;
+          minClusterSize ATTRIB minimumClusterSize;
+          maxClusterSize ATTRIB maximumClusterSize;
+      }
+
+      c7FifthMember extends BaseCacheBenchPrim {
+          sfProcessHost "localhost";
+          nodeIndex 4;
+          clusterSize ATTRIB sizeOfTheCluster;
+          minClusterSize ATTRIB minimumClusterSize;
+          maxClusterSize ATTRIB maximumClusterSize;
+      }
+
+      c7SixthMember extends BaseCacheBenchPrim {
+          sfProcessHost "localhost";
+          nodeIndex 5;
+          clusterSize ATTRIB sizeOfTheCluster;
+          minClusterSize ATTRIB minimumClusterSize;
+          maxClusterSize ATTRIB maximumClusterSize;
+      }
+      =

+      c7SeventhMember extends BaseCacheBenchPrim {
+          sfProcessHost "localhost";
+          nodeIndex 6;
+          clusterSize ATTRIB sizeOfTheCluster;
+          minClusterSize ATTRIB minimumClusterSize;
+          maxClusterSize ATTRIB maximumClusterSize;
+      }
    }
    =

-   node7 extends BaseCacheBenchPrim{
-      sfProcessHost "cluster07";
-      nodeIndex 6;
+   eightClusterSize extends Compound {
+
+      sizeOfTheCluster 8;
+
+      c8FirstMember extends BaseCacheBenchPrim {
+          sfProcessHost "localhost";
+          nodeIndex 0;
+          clusterSize ATTRIB sizeOfTheCluster;
+          minClusterSize ATTRIB minimumClusterSize;
+          maxClusterSize ATTRIB maximumClusterSize;
+      }
+
+      c8SecondMember extends BaseCacheBenchPrim {
+          sfProcessHost "localhost";
+          nodeIndex 1;
+          clusterSize ATTRIB sizeOfTheCluster;
+          minClusterSize ATTRIB minimumClusterSize;
+          maxClusterSize ATTRIB maximumClusterSize;
+      }
+
+      c8ThirdMember extends BaseCacheBenchPrim {
+          sfProcessHost "localhost";
+          nodeIndex 2;
+          clusterSize ATTRIB sizeOfTheCluster;
+          minClusterSize ATTRIB minimumClusterSize;
+          maxClusterSize ATTRIB maximumClusterSize;
+      }
+
+      c8ForthMember extends BaseCacheBenchPrim {
+          sfProcessHost "localhost";
+          nodeIndex 3;
+          clusterSize ATTRIB sizeOfTheCluster;
+          minClusterSize ATTRIB minimumClusterSize;
+          maxClusterSize ATTRIB maximumClusterSize;
+      }
+
+      c8FifthMember extends BaseCacheBenchPrim {
+          sfProcessHost "localhost";
+          nodeIndex 4;
+          clusterSize ATTRIB sizeOfTheCluster;
+          minClusterSize ATTRIB minimumClusterSize;
+          maxClusterSize ATTRIB maximumClusterSize;
+      }
+
+      c8SixthMember extends BaseCacheBenchPrim {
+          sfProcessHost "localhost";
+          nodeIndex 5;
+          clusterSize ATTRIB sizeOfTheCluster;
+          minClusterSize ATTRIB minimumClusterSize;
+          maxClusterSize ATTRIB maximumClusterSize;
+      }
+
+      c8SeventhMember extends BaseCacheBenchPrim {
+          sfProcessHost "localhost";
+          nodeIndex 6;
+          clusterSize ATTRIB sizeOfTheCluster;
+          minClusterSize ATTRIB minimumClusterSize;
+          maxClusterSize ATTRIB maximumClusterSize;
+      }
+
+      c8EighthMember extends BaseCacheBenchPrim {
+          sfProcessHost "localhost";
+          nodeIndex 7;
+          clusterSize ATTRIB sizeOfTheCluster;
+          minClusterSize ATTRIB minimumClusterSize;
+          maxClusterSize ATTRIB maximumClusterSize;
+      }
    }
    =

-   node8 extends BaseCacheBenchPrim{
-      sfProcessHost "cluster08";
-      nodeIndex 7;
+   nineClusterSize extends Compound {
+
+      sizeOfTheCluster 9;
+
+      c9FirstMember extends BaseCacheBenchPrim {
+          sfProcessHost "localhost";
+          nodeIndex 0;
+          clusterSize ATTRIB sizeOfTheCluster;
+          minClusterSize ATTRIB minimumClusterSize;
+          maxClusterSize ATTRIB maximumClusterSize;
+      }
+
+      c9SecondMember extends BaseCacheBenchPrim {
+          sfProcessHost "localhost";
+          nodeIndex 1;
+          clusterSize ATTRIB sizeOfTheCluster;
+          minClusterSize ATTRIB minimumClusterSize;
+          maxClusterSize ATTRIB maximumClusterSize;
+      }
+
+      c9ThirdMember extends BaseCacheBenchPrim {
+          sfProcessHost "localhost";
+          nodeIndex 2;
+          clusterSize ATTRIB sizeOfTheCluster;
+          minClusterSize ATTRIB minimumClusterSize;
+          maxClusterSize ATTRIB maximumClusterSize;
+      }
+
+      c9ForthMember extends BaseCacheBenchPrim {
+          sfProcessHost "localhost";
+          nodeIndex 3;
+          clusterSize ATTRIB sizeOfTheCluster;
+          minClusterSize ATTRIB minimumClusterSize;
+          maxClusterSize ATTRIB maximumClusterSize;
+      }
+
+      c9FifthMember extends BaseCacheBenchPrim {
+          sfProcessHost "localhost";
+          nodeIndex 4;
+          clusterSize ATTRIB sizeOfTheCluster;
+          minClusterSize ATTRIB minimumClusterSize;
+          maxClusterSize ATTRIB maximumClusterSize;
+      }
+
+      c9SixthMember extends BaseCacheBenchPrim {
+          sfProcessHost "localhost";
+          nodeIndex 5;
+          clusterSize ATTRIB sizeOfTheCluster;
+          minClusterSize ATTRIB minimumClusterSize;
+          maxClusterSize ATTRIB maximumClusterSize;
+      }
+
+      c9SeventhMember extends BaseCacheBenchPrim {
+          sfProcessHost "localhost";
+          nodeIndex 6;
+          clusterSize ATTRIB sizeOfTheCluster;
+          minClusterSize ATTRIB minimumClusterSize;
+          maxClusterSize ATTRIB maximumClusterSize;
+      }
+
+      c9EighthMember extends BaseCacheBenchPrim {
+          sfProcessHost "localhost";
+          nodeIndex 7;
+          clusterSize ATTRIB sizeOfTheCluster;
+          minClusterSize ATTRIB minimumClusterSize;
+          maxClusterSize ATTRIB maximumClusterSize;
+      }
+
+      c9NinthMember extends BaseCacheBenchPrim {
+          sfProcessHost "localhost";
+          nodeIndex 7;
+          clusterSize ATTRIB sizeOfTheCluster;
+          minClusterSize ATTRIB minimumClusterSize;
+          maxClusterSize ATTRIB maximumClusterSize;
+      }
    }
+
 }

Modified: cache-bench-fwk/trunk/src/org/cachebench/smartfrog/CacheBenchmark=
Prim.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- cache-bench-fwk/trunk/src/org/cachebench/smartfrog/CacheBenchmarkPrim.j=
ava	2008-01-06 13:20:52 UTC (rev 5008)
+++ cache-bench-fwk/trunk/src/org/cachebench/smartfrog/CacheBenchmarkPrim.j=
ava	2008-01-06 16:11:03 UTC (rev 5009)
@@ -22,6 +22,8 @@
    private File toRunIn;
    private int clusterSize =3D -1;
    private String scriptToExec;
+   private int minClusterSize;
+   private int maxClusterSize;
 =

    public CacheBenchmarkPrim() throws RemoteException
    {
@@ -31,7 +33,6 @@
    {
       super.sfDeploy();
       log =3D super.sfGetApplicationLog();
-      log.setLevel(LogSF.LOG_LEVEL_ALL);
       log.trace("deploy started");
       //reading the attributes here
       nodeIndex =3D (Integer) sfResolve("nodeIndex");
@@ -42,6 +43,10 @@
       log.info("Received homedir: " + toRunIn);
       clusterSize =3D (Integer)sfResolve("clusterSize");
       log.info("Received cluster size: " + clusterSize);
+      minClusterSize =3D (Integer) sfResolve("minClusterSize");
+      log.info("Received MIN cluster size: " + minClusterSize);
+      maxClusterSize =3D (Integer) sfResolve("maxClusterSize");
+      log.info("Received MAX cluster size: " + maxClusterSize);
       scriptToExec =3D (String) sfResolve("scriptToExec");
       log.info("Received stringToExec: " + scriptToExec);
       log.trace("Deploy finished");
@@ -49,49 +54,37 @@
 =

    public synchronized void sfStart() throws SmartFrogException, RemoteExc=
eption
    {
-      Thread thread =3D new Thread()
+      if ((nodeIndex + 1) < clusterSize)
       {
-         public void run()
+         log.info("Running in a separate thread, not last node in the comp=
ound" + getNodeDescription());
+         Thread thread =3D new Thread()
          {
-            try
+            public void run()
             {
                runBenchmark();
-            } catch (SmartFrogException e)
-            {
-                  log.error("Unexpected error:" + e.getMessage(), e);
-
-            } catch (IOException e)
-            {
-               log.warn("Does the script have X rights?", e);
-               terminate(e);
-
-            } catch (InterruptedException e)
-            {
-               log.err("This is quite strange", e);
-               terminate(e);
             }
-         }
-         private void terminate(Exception e)
-         {
-            TerminationRecord terminationRecord =3D new TerminationRecord(=
TerminationRecord.ABNORMAL , "terminated the benchmark " +
-                  getNodeDescription(),null, e);
-            sfTerminate(terminationRecord);
-
-         }
-      };
-      thread.start();
+         };
+         thread.start();
+      }
+      //the last node should run in a sync manner so that the coumpound wo=
uld only end when the test ends
+      else
+      {
+         log.info("Running in the same thread as this is the last node in =
the compound " + getNodeDescription());
+         runBenchmark();
+      }
    }
 =

    private void runBenchmark()
-         throws SmartFrogException, IOException, InterruptedException
    {
-      super.sfStart();
-      log.trace("Entered sfStart...");
-      if (clusterSize <=3D nodeIndex)
+      try
       {
-         log.info("Not processing this node" + getNodeDescription());
-         return;
-      }
+         super.sfStart();
+         log.trace("Entered sfStart...");
+         if (clusterSize <=3D nodeIndex)
+         {
+            log.info("Not processing this node" + getNodeDescription());
+            return;
+         }
          String command =3D scriptToExec + " " + nodeIndex + " " + cacheDi=
stribution + " -DclusterSize=3D" + clusterSize;
          log.info("Executing command: " + command);
          Process process =3D Runtime.getRuntime().exec(command, null, toRu=
nIn);
@@ -100,20 +93,54 @@
          String line;
          while ((line =3D bufferedReader.readLine()) !=3D null)
          {
-            log.debug(scriptToExec + " >>> " + line);
+            log.info(scriptToExec + " >>> " + line);
          }
          bufferedReader.close();
          int exitValue =3D process.waitFor();
          if (exitValue !=3D 0)
          {
             sfTerminate(new TerminationRecord(TerminationRecord.ABNORMAL, =
"we have an NOT zero exit code: " + exitValue
-                  + ", originated from " +  getNodeDescription(), null));
+                  + ", originated from " + getNodeDescription(), null));
          }
-      log.debug("Terminating the tests...");
-      TerminationRecord terminationRecord =3D new TerminationRecord(Termin=
ationRecord.NORMAL, "terminated the benchmark " +
-            getNodeDescription(), null);
+
+         correctTerminationOfTestsIfNeeded();
+      } catch (SmartFrogException e)
+      {
+         log.error("Unexpected error:" + e.getMessage(), e);
+         terminate(e);
+      } catch (IOException e)
+      {
+         log.warn("Does the script have X rights?", e);
+         terminate(e);
+
+      } catch (InterruptedException e)
+      {
+         log.err("This is quite strange", e);
+         terminate(e);
+      }
+   }
+
+   /**
+    * The test will only be terminated if this is the last cluster compoun=
d running.
+    */
+   private void correctTerminationOfTestsIfNeeded()
+   {
+      if (this.clusterSize =3D=3D this.maxClusterSize)
+      {
+         log.info("Good news, terminating ALL the tests, terminator is " +=
 getNodeDescription());
+         TerminationRecord terminationRecord =3D new TerminationRecord(Ter=
minationRecord.NORMAL, "terminated the benchmark " +
+               getNodeDescription(), null);
+         sfTerminate(terminationRecord);
+         log.info("Test terminated successfully " + getNodeDescription());
+      }
+   }
+
+   private void terminate(Exception e)
+   {
+      TerminationRecord terminationRecord =3D new TerminationRecord(Termin=
ationRecord.ABNORMAL , "terminated the benchmark " +
+            getNodeDescription(),null, e);
       sfTerminate(terminationRecord);
-      log.debug("Test terminated successfully " + getNodeDescription());
+
    }
 =

    private File getFwkHomeDir()

Modified: cache-bench-fwk/trunk/src/org/cachebench/warmup/CacheWarmup.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- cache-bench-fwk/trunk/src/org/cachebench/warmup/CacheWarmup.java	2008-0=
1-06 13:20:52 UTC (rev 5008)
+++ cache-bench-fwk/trunk/src/org/cachebench/warmup/CacheWarmup.java	2008-0=
1-06 16:11:03 UTC (rev 5009)
@@ -1,7 +1,8 @@
 package org.cachebench.warmup;
 =

+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.cachebench.CacheWrapper;
-import org.cachebench.config.NVPair;
 =

 import java.util.HashMap;
 import java.util.Map;
@@ -15,6 +16,8 @@
 public abstract class CacheWarmup
 {
 =

+   private static final Log log =3D LogFactory.getLog(CacheWarmup.class);
+
    private Map<String, String> configParams =3D new HashMap<String, String=
>();
 =

    public void setConfigParams(Map<String, String> configParams)
@@ -32,7 +35,9 @@
     */
    public final void warmup(CacheWrapper cacheWrapper) throws Exception
    {
+      long startTime =3D System.currentTimeMillis();
       performWarmupOperations(cacheWrapper);
+      log.info("The warmup took: " + ((System.currentTimeMillis() - startT=
ime) / 1000) + " seconds." );
       cacheWrapper.empty();
    }
 =



--===============8450386592784695218==--

From jbosscache-commits at lists.jboss.org Sun Jan  6 11:54:31 2008
Content-Type: multipart/mixed; boundary="===============4211180632859498298=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r5010 -
 cache-bench-fwk/trunk/src/org/cachebench/smartfrog.
Date: Sun, 06 Jan 2008 11:54:30 -0500
Message-ID: <E1JBYla-00030E-KU@committer01.frg.pub.inap.atl.jboss.com>

--===============4211180632859498298==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: mircea.markus
Date: 2008-01-06 11:54:29 -0500 (Sun, 06 Jan 2008)
New Revision: 5010

Modified:
   cache-bench-fwk/trunk/src/org/cachebench/smartfrog/CacheBenchmarkPrim.ja=
va
Log:
we can run tests on multiple cluster configs now

Modified: cache-bench-fwk/trunk/src/org/cachebench/smartfrog/CacheBenchmark=
Prim.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- cache-bench-fwk/trunk/src/org/cachebench/smartfrog/CacheBenchmarkPrim.j=
ava	2008-01-06 16:11:03 UTC (rev 5009)
+++ cache-bench-fwk/trunk/src/org/cachebench/smartfrog/CacheBenchmarkPrim.j=
ava	2008-01-06 16:54:29 UTC (rev 5010)
@@ -82,9 +82,16 @@
          log.trace("Entered sfStart...");
          if (clusterSize <=3D nodeIndex)
          {
-            log.info("Not processing this node" + getNodeDescription());
+            log.info("Not processing this node as compund is smaller than =
" + nodeIndex + getNodeDescription());
             return;
          }
+         if (clusterSize < minClusterSize || clusterSize > maxClusterSize)
+         {
+            log.info("Only clusters with size in range (" + minClusterSize=
 + ", " + maxClusterSize + ") are " +
+                  "processed, skiping this one" + getNodeDescription());
+            correctTerminationOfTestsIfNeeded();
+            return;
+         }
          String command =3D scriptToExec + " " + nodeIndex + " " + cacheDi=
stribution + " -DclusterSize=3D" + clusterSize;
          log.info("Executing command: " + command);
          Process process =3D Runtime.getRuntime().exec(command, null, toRu=
nIn);


--===============4211180632859498298==--

From jbosscache-commits at lists.jboss.org Sun Jan  6 12:35:48 2008
Content-Type: multipart/mixed; boundary="===============2890745923799801237=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r5011 -
 cache-bench-fwk/trunk/src/org/cachebench/smartfrog.
Date: Sun, 06 Jan 2008 12:35:48 -0500
Message-ID: <E1JBZPY-0003Af-MB@committer01.frg.pub.inap.atl.jboss.com>

--===============2890745923799801237==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: mircea.markus
Date: 2008-01-06 12:35:48 -0500 (Sun, 06 Jan 2008)
New Revision: 5011

Modified:
   cache-bench-fwk/trunk/src/org/cachebench/smartfrog/CacheBenchmarkPrim.ja=
va
Log:
we can run tests on multiple cluster configs now

Modified: cache-bench-fwk/trunk/src/org/cachebench/smartfrog/CacheBenchmark=
Prim.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- cache-bench-fwk/trunk/src/org/cachebench/smartfrog/CacheBenchmarkPrim.j=
ava	2008-01-06 16:54:29 UTC (rev 5010)
+++ cache-bench-fwk/trunk/src/org/cachebench/smartfrog/CacheBenchmarkPrim.j=
ava	2008-01-06 17:35:48 UTC (rev 5011)
@@ -166,7 +166,7 @@
    protected synchronized void sfTerminateWith(TerminationRecord terminati=
onRecord)
    {
       super.sfTerminateWith(terminationRecord);
-      log.trace("sfTerminateWith called with value:" +  terminationRecord);
+      log.info("sfTerminateWith called with value:" +  terminationRecord);
    }
 =

    public String getNodeDescription()


--===============2890745923799801237==--

From jbosscache-commits at lists.jboss.org Sun Jan  6 16:17:02 2008
Content-Type: multipart/mixed; boundary="===============1366611031785240792=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r5012 -
 cache-bench-fwk/trunk/src/org/cachebench/smartfrog.
Date: Sun, 06 Jan 2008 16:17:02 -0500
Message-ID: <E1JBcre-0003Sm-Cs@committer01.frg.pub.inap.atl.jboss.com>

--===============1366611031785240792==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: mircea.markus
Date: 2008-01-06 16:17:01 -0500 (Sun, 06 Jan 2008)
New Revision: 5012

Modified:
   cache-bench-fwk/trunk/src/org/cachebench/smartfrog/CacheBenchmarkPrim.ja=
va
Log:


Modified: cache-bench-fwk/trunk/src/org/cachebench/smartfrog/CacheBenchmark=
Prim.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- cache-bench-fwk/trunk/src/org/cachebench/smartfrog/CacheBenchmarkPrim.j=
ava	2008-01-06 17:35:48 UTC (rev 5011)
+++ cache-bench-fwk/trunk/src/org/cachebench/smartfrog/CacheBenchmarkPrim.j=
ava	2008-01-06 21:17:01 UTC (rev 5012)
@@ -2,6 +2,7 @@
 =

 import org.smartfrog.sfcore.common.SmartFrogException;
 import org.smartfrog.sfcore.common.SmartFrogResolutionException;
+import org.smartfrog.sfcore.common.SmartFrogLivenessException;
 import org.smartfrog.sfcore.logging.LogSF;
 import org.smartfrog.sfcore.prim.Prim;
 import org.smartfrog.sfcore.prim.PrimImpl;
@@ -29,6 +30,11 @@
    {
    }
 =

+   public void sfPing(Object o) throws SmartFrogLivenessException, RemoteE=
xception
+   {
+      super.sfPing(o);    //To change body of overridden methods use File =
| Settings | File Templates.
+   }
+
    public synchronized void sfDeploy() throws SmartFrogException, RemoteEx=
ception
    {
       super.sfDeploy();
@@ -173,4 +179,14 @@
    {
       return "( clusterSize:" + clusterSize + ", nodeIndex:" + this.nodeIn=
dex + " )";
    }
+
+   /**
+    * Ugly HACK - seems like if the parent is pending in an sfRun, e.g. th=
en it would not send hart beat checks
+    * to the childrens so they would consider a issues.
+    * Might be that this is not a totally proper scenarion for using the f=
ramework, but it solves our needs.
+    */
+   protected void sfLivenessFailure(Object source, Object target, Throwabl=
e failure)
+   {
+      log.warn("Recieved liveness error, ignoring. Source:" + source + ", =
target:" + target + ", failure: " + failure);
+   }
 }


--===============1366611031785240792==--

From jbosscache-commits at lists.jboss.org Sun Jan  6 16:26:35 2008
Content-Type: multipart/mixed; boundary="===============0968909030910390533=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r5013 - in core/trunk/src:
 main/java/org/jboss/cache/notifications and 3 other directories.
Date: Sun, 06 Jan 2008 16:26:35 -0500
Message-ID: <E1JBd0t-0005LN-4G@committer01.frg.pub.inap.atl.jboss.com>

--===============0968909030910390533==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: manik.surtani(a)jboss.com
Date: 2008-01-06 16:26:34 -0500 (Sun, 06 Jan 2008)
New Revision: 5013

Added:
   core/trunk/src/main/java/org/jboss/cache/notifications/annotation/BuddyG=
roupChanged.java
   core/trunk/src/main/java/org/jboss/cache/notifications/event/BuddyGroupC=
hangedEvent.java
   core/trunk/src/test/java/org/jboss/cache/notifications/BuddyGroupChangeN=
otificationTest.java
Modified:
   core/trunk/src/main/java/org/jboss/cache/buddyreplication/BuddyManager.j=
ava
   core/trunk/src/main/java/org/jboss/cache/notifications/Notifier.java
   core/trunk/src/main/java/org/jboss/cache/notifications/event/Event.java
   core/trunk/src/main/java/org/jboss/cache/notifications/event/EventImpl.j=
ava
Log:
JBCACHE-1257 - added notification callback for buddy group changes

Modified: core/trunk/src/main/java/org/jboss/cache/buddyreplication/BuddyMa=
nager.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/java/org/jboss/cache/buddyreplication/BuddyManager.=
java	2008-01-06 21:17:01 UTC (rev 5012)
+++ core/trunk/src/main/java/org/jboss/cache/buddyreplication/BuddyManager.=
java	2008-01-06 21:26:34 UTC (rev 5013)
@@ -25,6 +25,7 @@
 import org.jboss.cache.marshall.MethodCall;
 import org.jboss.cache.marshall.MethodCallFactory;
 import org.jboss.cache.marshall.MethodDeclarations;
+import org.jboss.cache.notifications.Notifier;
 import org.jboss.cache.notifications.annotation.CacheListener;
 import org.jboss.cache.notifications.annotation.ViewChanged;
 import org.jboss.cache.notifications.event.ViewChangedEvent;
@@ -71,6 +72,7 @@
    private CacheSPI<?, ?> cache;
    private Configuration configuration;
    private RegionManager regionManager;
+   private Notifier notifier;
    private StateTransferManager stateTransferManager;
    private RPCManager rpcManager;
    /**
@@ -169,13 +171,14 @@
    }
 =

    @Inject
-   private void injectDependencies(CacheSPI cache, Configuration configura=
tion, RegionManager regionManager, StateTransferManager stateTransferManage=
r, RPCManager rpcManager)
+   private void injectDependencies(CacheSPI cache, Configuration configura=
tion, RegionManager regionManager, StateTransferManager stateTransferManage=
r, RPCManager rpcManager, Notifier notifier)
    {
       this.cache =3D cache;
       this.configuration =3D configuration;
       this.regionManager =3D regionManager;
       this.stateTransferManager =3D stateTransferManager;
       this.rpcManager =3D rpcManager;
+      this.notifier =3D notifier;
 =

       setupInternals(configuration.getBuddyReplicationConfig());
    }
@@ -374,20 +377,20 @@
       }
 =

       // Update buddy list
-      boolean buddyGroupMutated =3D false;
+      boolean buddyGroupMutated =3D !obsoleteBuddies.isEmpty() && !uniniti=
alisedBuddies.isEmpty();
+//      if (buddyGroupMutated) notifier.notifyBuddyGroupChange(buddyGroup,=
 true);
       if (!obsoleteBuddies.isEmpty())
       {
          removeFromGroup(obsoleteBuddies);
-         buddyGroupMutated =3D true;
       }
       else
       {
          log.trace("No obsolete buddies found, nothing to announce.");
       }
+
       if (!uninitialisedBuddies.isEmpty())
       {
          addBuddies(newBuddies);
-         buddyGroupMutated =3D true;
       }
       else
       {
@@ -398,6 +401,7 @@
       {
          if (log.isInfoEnabled()) log.info("Buddy group members have chang=
ed. New buddy group: " + buddyGroup);
          configuration.getRuntimeConfig().setBuddyGroup(buddyGroup);
+         notifier.notifyBuddyGroupChange(buddyGroup, false);
       }
       else
          log.debug("Nothing has changed; new buddy list is identical to th=
e old one.");

Modified: core/trunk/src/main/java/org/jboss/cache/notifications/Notifier.j=
ava
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/java/org/jboss/cache/notifications/Notifier.java	20=
08-01-06 21:17:01 UTC (rev 5012)
+++ core/trunk/src/main/java/org/jboss/cache/notifications/Notifier.java	20=
08-01-06 21:26:34 UTC (rev 5013)
@@ -13,6 +13,7 @@
 import org.jboss.cache.CacheSPI;
 import org.jboss.cache.Fqn;
 import org.jboss.cache.InvocationContext;
+import org.jboss.cache.buddyreplication.BuddyGroup;
 import org.jboss.cache.factories.annotations.Inject;
 import org.jboss.cache.notifications.annotation.*;
 import org.jboss.cache.notifications.event.*;
@@ -48,12 +49,12 @@
    private static final Class[] allowedMethodAnnotations =3D
          {
                CacheStarted.class, CacheStopped.class, CacheBlocked.class,=
 CacheUnblocked.class, NodeCreated.class, NodeRemoved.class, NodeVisited.cl=
ass, NodeModified.class, NodeMoved.class,
-               NodeActivated.class, NodePassivated.class, NodeLoaded.class=
, NodeEvicted.class, TransactionRegistered.class, TransactionCompleted.clas=
s, ViewChanged.class
+               NodeActivated.class, NodePassivated.class, NodeLoaded.class=
, NodeEvicted.class, TransactionRegistered.class, TransactionCompleted.clas=
s, ViewChanged.class, BuddyGroupChanged.class
          };
    private static final Class[] parameterTypes =3D
          {
                CacheStartedEvent.class, CacheStoppedEvent.class, CacheBloc=
kedEvent.class, CacheUnblockedEvent.class, NodeCreatedEvent.class, NodeRemo=
vedEvent.class, NodeVisitedEvent.class, NodeModifiedEvent.class, NodeMovedE=
vent.class,
-               NodeActivatedEvent.class, NodePassivatedEvent.class, NodeLo=
adedEvent.class, NodeEvictedEvent.class, TransactionRegisteredEvent.class, =
TransactionCompletedEvent.class, ViewChangedEvent.class
+               NodeActivatedEvent.class, NodePassivatedEvent.class, NodeLo=
adedEvent.class, NodeEvictedEvent.class, TransactionRegisteredEvent.class, =
TransactionCompletedEvent.class, ViewChangedEvent.class, BuddyGroupChangedE=
vent.class
          };
    final Map<Class, List<ListenerInvocation>> listenerInvocations =3D new =
ConcurrentHashMap<Class, List<ListenerInvocation>>();
 =

@@ -529,6 +530,30 @@
    }
 =

    /**
+    * Notifies all registered listeners of a buddy group change event.  No=
te that buddy group change notifications are ALWAYS sent
+    * immediately.
+    *
+    * @param buddyGroup buddy group to set
+    * @param pre        if true, this has occured before the buddy group m=
essage is broadcast to the cluster
+    */
+   public void notifyBuddyGroupChange(final BuddyGroup buddyGroup, boolean=
 pre)
+   {
+      List<ListenerInvocation> listeners =3D listenerInvocations.get(Buddy=
GroupChanged.class);
+
+      if (listeners !=3D null && !listeners.isEmpty())
+      {
+//         InvocationContext backup =3D resetInvocationContext(ctx);
+         EventImpl e =3D new EventImpl();
+         e.setCache(cache);
+         e.setBuddyGroup(buddyGroup);
+         e.setPre(pre);
+         e.setType(BUDDY_GROUP_CHANGED);
+         for (ListenerInvocation listener : listeners) listener.invoke(e);
+//         restoreInvocationContext(backup);
+      }
+   }
+
+   /**
     * Notifies all registered listeners of a transaction completion event.
     *
     * @param transaction the transaction that has just completed

Added: core/trunk/src/main/java/org/jboss/cache/notifications/annotation/Bu=
ddyGroupChanged.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/java/org/jboss/cache/notifications/annotation/Buddy=
GroupChanged.java	                        (rev 0)
+++ core/trunk/src/main/java/org/jboss/cache/notifications/annotation/Buddy=
GroupChanged.java	2008-01-06 21:26:34 UTC (rev 5013)
@@ -0,0 +1,28 @@
+package org.jboss.cache.notifications.annotation;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * This annotation should be used on methods that need to be notified when=
 a buddy group changes.
+ * <p/>
+ * Methods annotated with this annotation should be public and take in a s=
ingle parameter, a {@link org.jboss.cache.notifications.event.BuddyGroupCha=
ngedEvent}
+ * otherwise an {@link org.jboss.cache.notifications.IncorrectCacheListene=
rException} will be thrown when registering
+ * your cache listener.
+ * <p/>
+ * This call back only occurs when a buddy group structure is changed.  In=
 a cache setup where buddy replication is not
+ * enabled, this call back would never occur.
+ * <p/>
+ *
+ * @author <a href=3D"mailto:manik(a)jboss.org">Manik Surtani</a>
+ * @see CacheListener
+ * @see org.jboss.cache.notifications.event.CacheBlockedEvent
+ * @since 2.1.0
+ */
+(a)Retention(RetentionPolicy.RUNTIME)
+(a)Target(ElementType.METHOD)
+public @interface BuddyGroupChanged
+{
+}

Copied: core/trunk/src/main/java/org/jboss/cache/notifications/event/BuddyG=
roupChangedEvent.java (from rev 4932, core/trunk/src/main/java/org/jboss/ca=
che/notifications/event/CacheBlockedEvent.java)
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/java/org/jboss/cache/notifications/event/BuddyGroup=
ChangedEvent.java	                        (rev 0)
+++ core/trunk/src/main/java/org/jboss/cache/notifications/event/BuddyGroup=
ChangedEvent.java	2008-01-06 21:26:34 UTC (rev 5013)
@@ -0,0 +1,18 @@
+package org.jboss.cache.notifications.event;
+
+import org.jboss.cache.buddyreplication.BuddyGroup;
+
+/**
+ * This event is passed in to any method annotated with {@link org.jboss.c=
ache.notifications.annotation.BuddyGroupChanged}.
+ *
+ * @author <a href=3D"mailto:manik(a)jboss.org">Manik Surtani</a>
+ * @since 2.1.0
+ */
+public interface BuddyGroupChangedEvent extends Event
+{
+   /**
+    * @return the new buddy group
+    * @since 2.1.0
+    */
+   BuddyGroup getBuddyGroup();
+}
\ No newline at end of file

Modified: core/trunk/src/main/java/org/jboss/cache/notifications/event/Even=
t.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/java/org/jboss/cache/notifications/event/Event.java=
	2008-01-06 21:17:01 UTC (rev 5012)
+++ core/trunk/src/main/java/org/jboss/cache/notifications/event/Event.java=
	2008-01-06 21:26:34 UTC (rev 5013)
@@ -14,7 +14,7 @@
    {
       CACHE_STARTED, CACHE_STOPPED, CACHE_BLOCKED, CACHE_UNBLOCKED, NODE_A=
CTIVATED, NODE_PASSIVATED,
       NODE_LOADED, NODE_EVICTED, NODE_CREATED, NODE_REMOVED, NODE_MODIFIED=
, NODE_MOVED, NODE_VISITED,
-      TRANSACTION_COMPLETED, TRANSACTION_REGISTERED, VIEW_CHANGED
+      TRANSACTION_COMPLETED, TRANSACTION_REGISTERED, VIEW_CHANGED, BUDDY_G=
ROUP_CHANGED
    }
 =

    /**

Modified: core/trunk/src/main/java/org/jboss/cache/notifications/event/Even=
tImpl.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/java/org/jboss/cache/notifications/event/EventImpl.=
java	2008-01-06 21:17:01 UTC (rev 5012)
+++ core/trunk/src/main/java/org/jboss/cache/notifications/event/EventImpl.=
java	2008-01-06 21:26:34 UTC (rev 5013)
@@ -2,6 +2,7 @@
 =

 import org.jboss.cache.Cache;
 import org.jboss.cache.Fqn;
+import org.jboss.cache.buddyreplication.BuddyGroup;
 import org.jgroups.View;
 =

 import javax.transaction.Transaction;
@@ -16,7 +17,7 @@
 public class EventImpl implements CacheBlockedEvent, CacheUnblockedEvent, =
CacheStartedEvent, CacheStoppedEvent,
       NodeActivatedEvent, NodeCreatedEvent, NodeEvictedEvent, NodeLoadedEv=
ent, NodeModifiedEvent, NodeMovedEvent,
       NodePassivatedEvent, NodeRemovedEvent, NodeVisitedEvent, Transaction=
CompletedEvent, TransactionRegisteredEvent,
-      ViewChangedEvent
+      ViewChangedEvent, BuddyGroupChangedEvent
 {
    private boolean pre =3D false; // by default events are after the fact
    private Cache cache;
@@ -29,6 +30,7 @@
    private boolean successful;
    private View newView;
    private Type type;
+   private BuddyGroup buddyGroup;
 =

 =

    public EventImpl(boolean pre, Cache cache, ModificationType modificatio=
nType, Map data, Fqn fqn, Transaction transaction, boolean originLocal, Fqn=
 targetFqn, boolean successful, View newView, Type type)
@@ -162,6 +164,10 @@
       this.type =3D type;
    }
 =

+   public void setBuddyGroup(BuddyGroup buddyGroup)
+   {
+      this.buddyGroup =3D buddyGroup;
+   }
 =

    public boolean equals(Object o)
    {
@@ -180,6 +186,7 @@
       if (targetFqn !=3D null ? !targetFqn.equals(event.targetFqn) : event=
.targetFqn !=3D null) return false;
       if (transaction !=3D null ? !transaction.equals(event.transaction) :=
 event.transaction !=3D null) return false;
       if (newView !=3D null ? !newView.equals(event.newView) : event.newVi=
ew !=3D null) return false;
+      if (buddyGroup !=3D null ? !buddyGroup.equals(event.buddyGroup) : ev=
ent.buddyGroup !=3D null) return false;
       if (type !=3D null ? !type.equals(event.type) : event.type !=3D null=
) return false;
 =

       return true;
@@ -198,6 +205,7 @@
       result =3D 31 * result + (targetFqn !=3D null ? targetFqn.hashCode()=
 : 0);
       result =3D 31 * result + (successful ? 1 : 0);
       result =3D 31 * result + (newView !=3D null ? newView.hashCode() : 0=
);
+      result =3D 31 * result + (buddyGroup !=3D null ? buddyGroup.hashCode=
() : 0);
       result =3D 31 * result + (type !=3D null ? type.hashCode() : 0);
       return result;
    }
@@ -217,7 +225,12 @@
             ", targetFqn=3D" + targetFqn +
             ", successful=3D" + successful +
             ", newView=3D" + newView +
+            ", buddyGroup=3D" + buddyGroup +
             '}';
    }
 =

+   public BuddyGroup getBuddyGroup()
+   {
+      return buddyGroup;
+   }
 }

Added: core/trunk/src/test/java/org/jboss/cache/notifications/BuddyGroupCha=
ngeNotificationTest.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/test/java/org/jboss/cache/notifications/BuddyGroupChange=
NotificationTest.java	                        (rev 0)
+++ core/trunk/src/test/java/org/jboss/cache/notifications/BuddyGroupChange=
NotificationTest.java	2008-01-06 21:26:34 UTC (rev 5013)
@@ -0,0 +1,134 @@
+package org.jboss.cache.notifications;
+
+import org.jboss.cache.Cache;
+import org.jboss.cache.CacheFactory;
+import org.jboss.cache.DefaultCacheFactory;
+import org.jboss.cache.buddyreplication.BuddyGroup;
+import org.jboss.cache.buddyreplication.BuddyReplicationTestsBase;
+import org.jboss.cache.config.BuddyReplicationConfig;
+import org.jboss.cache.config.Configuration;
+import org.jboss.cache.misc.TestingUtil;
+import org.jboss.cache.notifications.annotation.BuddyGroupChanged;
+import org.jboss.cache.notifications.annotation.CacheListener;
+import org.jboss.cache.notifications.annotation.ViewChanged;
+import org.jboss.cache.notifications.event.BuddyGroupChangedEvent;
+import org.jboss.cache.notifications.event.ViewChangedEvent;
+import org.testng.annotations.AfterMethod;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.Test;
+
+import java.util.concurrent.CountDownLatch;
+
+/**
+ * @author Manik Surtani (<a href=3D"mailto:manik(a)jboss.org">manik(a)jbo=
ss.org</a>)
+ * @since 2.1.0
+ */
+(a)Test(groups =3D "functional")
+public class BuddyGroupChangeNotificationTest extends BuddyReplicationTest=
sBase
+{
+   Cache c1, c2, c3;
+   Listener listener;
+   static CountDownLatch latch1 =3D new CountDownLatch(1);
+   static CountDownLatch latch2 =3D new CountDownLatch(1);
+   static boolean stage2 =3D false;
+   static boolean notificationsReceived =3D true;
+
+   @BeforeMethod
+   public void setUp() throws CloneNotSupportedException
+   {
+      CacheFactory cf =3D new DefaultCacheFactory();
+      c1 =3D cf.createCache(false);
+
+      c1.getConfiguration().setCacheMode(Configuration.CacheMode.REPL_SYNC=
);
+      BuddyReplicationConfig brc =3D new BuddyReplicationConfig();
+      brc.setEnabled(true);
+      c1.getConfiguration().setBuddyReplicationConfig(brc);
+
+      c2 =3D cf.createCache(c1.getConfiguration().clone(), false);
+      c3 =3D cf.createCache(c1.getConfiguration().clone(), false);
+
+      c1.start();
+      c2.start();
+      c3.start();
+
+      // make sure views are received and groups are formed first
+      TestingUtil.blockUntilViewsReceived(60000, c1, c2, c3);
+
+      Cache[] caches =3D new Cache[]{c1, c2, c3};
+
+      listener =3D new Listener(caches);
+
+      c2.addCacheListener(listener);
+   }
+
+   @AfterMethod
+   public void tearDown()
+   {
+      TestingUtil.killCaches(c1, c2, c3);
+   }
+
+   @Test(timeOut =3D 60000)
+   public void testChangingGroups() throws InterruptedException
+   {
+      // initial state
+      assertIsBuddy(c1, c2, true);
+      assertIsBuddy(c2, c3, true);
+      assertIsBuddy(c3, c1, true);
+
+      // kill c3
+      c3.stop();
+      latch1.await();
+
+      assertIsBuddy(c1, c2, true);
+      assertIsBuddy(c2, c1, true);
+
+      stage2 =3D true;
+      c3.start();
+      latch2.await();
+
+      assertIsBuddy(c1, c2, true);
+      assertIsBuddy(c2, c3, true);
+      assertIsBuddy(c3, c1, true);
+
+      assert notificationsReceived;
+   }
+
+   @CacheListener
+   public static class Listener
+   {
+      Cache[] caches;
+      int numActiveCaches;
+
+      public Listener(Cache[] caches)
+      {
+         this.caches =3D caches;
+      }
+
+      @ViewChanged
+      public void viewChanged(ViewChangedEvent e)
+      {
+         numActiveCaches =3D e.getNewView().getMembers().size();
+      }
+
+      @BuddyGroupChanged
+      public void buddyChanged(BuddyGroupChangedEvent e)
+      {
+         System.out.println("Received event " + e);
+         if (!e.isPre())
+         {
+            BuddyGroup bg =3D e.getBuddyGroup();
+
+            boolean passed =3D bg.getDataOwner().equals(caches[1].getLocal=
Address()) &&
+                  bg.getBuddies().size() =3D=3D 1 &&
+                  bg.getBuddies().contains(caches[(numActiveCaches =3D=3D =
3) ? 2 : 0].getLocalAddress());
+
+            notificationsReceived =3D notificationsReceived && passed;
+
+            if (stage2)
+               latch2.countDown();
+            else
+               latch1.countDown();
+         }
+      }
+   }
+}


--===============0968909030910390533==--

From jbosscache-commits at lists.jboss.org Sun Jan  6 16:32:52 2008
Content-Type: multipart/mixed; boundary="===============2167530138040274305=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r5014 -
 cache-bench-fwk/trunk/src/org/cachebench/smartfrog.
Date: Sun, 06 Jan 2008 16:32:51 -0500
Message-ID: <E1JBd6x-0006Js-9F@committer01.frg.pub.inap.atl.jboss.com>

--===============2167530138040274305==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: mircea.markus
Date: 2008-01-06 16:32:51 -0500 (Sun, 06 Jan 2008)
New Revision: 5014

Modified:
   cache-bench-fwk/trunk/src/org/cachebench/smartfrog/CacheBenchmarkPrim.ja=
va
Log:


Modified: cache-bench-fwk/trunk/src/org/cachebench/smartfrog/CacheBenchmark=
Prim.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- cache-bench-fwk/trunk/src/org/cachebench/smartfrog/CacheBenchmarkPrim.j=
ava	2008-01-06 21:26:34 UTC (rev 5013)
+++ cache-bench-fwk/trunk/src/org/cachebench/smartfrog/CacheBenchmarkPrim.j=
ava	2008-01-06 21:32:51 UTC (rev 5014)
@@ -187,6 +187,6 @@
     */
    protected void sfLivenessFailure(Object source, Object target, Throwabl=
e failure)
    {
-      log.warn("Recieved liveness error, ignoring. Source:" + source + ", =
target:" + target + ", failure: " + failure);
+      log.trace("Recieved liveness error, ignoring. Source:" + source + ",=
 target:" + target + ", failure: " + failure);
    }
 }


--===============2167530138040274305==--

From jbosscache-commits at lists.jboss.org Sun Jan  6 17:35:59 2008
Content-Type: multipart/mixed; boundary="===============1570135271276778589=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r5015 - cache-bench-fwk/trunk.
Date: Sun, 06 Jan 2008 17:35:59 -0500
Message-ID: <E1JBe63-0001vp-I2@committer01.frg.pub.inap.atl.jboss.com>

--===============1570135271276778589==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: mircea.markus
Date: 2008-01-06 17:35:59 -0500 (Sun, 06 Jan 2008)
New Revision: 5015

Modified:
   cache-bench-fwk/trunk/build.xml
Log:


Modified: cache-bench-fwk/trunk/build.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- cache-bench-fwk/trunk/build.xml	2008-01-06 21:32:51 UTC (rev 5014)
+++ cache-bench-fwk/trunk/build.xml	2008-01-06 22:35:59 UTC (rev 5015)
@@ -150,7 +150,6 @@
   <target name=3D"clean.module.framework" description=3D"cleanup module">
     <delete dir=3D"${framework.output.dir}"/>
     <delete dir=3D"${framework.testoutput.dir}"/>
-    <delete dir=3D"${basedir}/smartfrog/sfClasses"/>
   </target>
   =

   =



--===============1570135271276778589==--

From jbosscache-commits at lists.jboss.org Sun Jan  6 17:48:42 2008
Content-Type: multipart/mixed; boundary="===============8274178586603250239=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r5016 -
 cache-bench-fwk/trunk/src/org/cachebench/reportgenerators.
Date: Sun, 06 Jan 2008 17:48:42 -0500
Message-ID: <E1JBeIM-0003sw-EC@committer01.frg.pub.inap.atl.jboss.com>

--===============8274178586603250239==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: mircea.markus
Date: 2008-01-06 17:48:42 -0500 (Sun, 06 Jan 2008)
New Revision: 5016

Modified:
   cache-bench-fwk/trunk/src/org/cachebench/reportgenerators/AbstractReport=
Generator.java
   cache-bench-fwk/trunk/src/org/cachebench/reportgenerators/CSVReportGener=
ator.java
   cache-bench-fwk/trunk/src/org/cachebench/reportgenerators/ClusterReportG=
enerator.java
Log:


Modified: cache-bench-fwk/trunk/src/org/cachebench/reportgenerators/Abstrac=
tReportGenerator.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- cache-bench-fwk/trunk/src/org/cachebench/reportgenerators/AbstractRepor=
tGenerator.java	2008-01-06 22:35:59 UTC (rev 5015)
+++ cache-bench-fwk/trunk/src/org/cachebench/reportgenerators/AbstractRepor=
tGenerator.java	2008-01-06 22:48:42 UTC (rev 5016)
@@ -28,6 +28,7 @@
       {
          return "performance-" + clusterConfig.getClusterSize() + ".csv";
       }
+      log.info("Filename for report generation is: " + fileName);
       return fileName;
    }
 =


Modified: cache-bench-fwk/trunk/src/org/cachebench/reportgenerators/CSVRepo=
rtGenerator.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- cache-bench-fwk/trunk/src/org/cachebench/reportgenerators/CSVReportGene=
rator.java	2008-01-06 22:35:59 UTC (rev 5015)
+++ cache-bench-fwk/trunk/src/org/cachebench/reportgenerators/CSVReportGene=
rator.java	2008-01-06 22:48:42 UTC (rev 5016)
@@ -30,23 +30,34 @@
 =

    public void generate() throws Exception
    {
-      BufferedWriter writer =3D null;
-      log.debug("Opening output file [" + output + "]");
-      writer =3D new BufferedWriter(new FileWriter(output));
-      writeHeaderLine(writer); // Write the Header of the Report
-      // Write the results
-      for (TestResult result : results)
+      try
       {
-         writeTestResult(result, writer);
-      }
-      // Write the Footnotes (if available)
-      if (footNotes !=3D null)
+         BufferedWriter writer =3D null;
+         log.debug("Opening output file [" + output + "]");
+         writer =3D new BufferedWriter(new FileWriter(output));
+         writeHeaderLine(writer); // Write the Header of the Report
+         // Write the results
+         for (TestResult result : results)
+         {
+            writeTestResult(result, writer);
+         }
+         // Write the Footnotes (if available)
+         if (footNotes !=3D null)
+         {
+            writeFoodNotes(writer);
+         }
+
+         writer.close();
+         log.debug("Report complete");
+         if  (output.exists())
+         {
+            log.error("Expected report file:'" + output.getAbsoluteFile() =
+ "'does not exist!");
+            throw new IllegalStateException("The report file does not exis=
t - weird!");
+         }
+      } catch (IOException e)
       {
-         writeFoodNotes(writer);
+         log.error("Error appeared while generatin report:", e);
       }
-
-      writer.close();
-      log.debug("Report complete");
    }
 =

    /**

Modified: cache-bench-fwk/trunk/src/org/cachebench/reportgenerators/Cluster=
ReportGenerator.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- cache-bench-fwk/trunk/src/org/cachebench/reportgenerators/ClusterReport=
Generator.java	2008-01-06 22:35:59 UTC (rev 5015)
+++ cache-bench-fwk/trunk/src/org/cachebench/reportgenerators/ClusterReport=
Generator.java	2008-01-06 22:48:42 UTC (rev 5016)
@@ -37,6 +37,7 @@
          log.trace(" Starting generating. Is master? " + clusterConfig.isM=
aster());
          if (clusterConfig.isMaster())
          {
+            log.info("Master node, generating report");
             log.trace("Received following results: " + results);
             generateReport(barrier.getReceivedMessages());
          }


--===============8274178586603250239==--

From jbosscache-commits at lists.jboss.org Sun Jan  6 18:05:51 2008
Content-Type: multipart/mixed; boundary="===============0962049265058923176=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r5017 -
 cache-bench-fwk/trunk/src/org/cachebench/reportgenerators.
Date: Sun, 06 Jan 2008 18:05:50 -0500
Message-ID: <E1JBeYw-0007m4-Vq@committer01.frg.pub.inap.atl.jboss.com>

--===============0962049265058923176==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: mircea.markus
Date: 2008-01-06 18:05:50 -0500 (Sun, 06 Jan 2008)
New Revision: 5017

Modified:
   cache-bench-fwk/trunk/src/org/cachebench/reportgenerators/CSVReportGener=
ator.java
Log:


Modified: cache-bench-fwk/trunk/src/org/cachebench/reportgenerators/CSVRepo=
rtGenerator.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- cache-bench-fwk/trunk/src/org/cachebench/reportgenerators/CSVReportGene=
rator.java	2008-01-06 22:48:42 UTC (rev 5016)
+++ cache-bench-fwk/trunk/src/org/cachebench/reportgenerators/CSVReportGene=
rator.java	2008-01-06 23:05:50 UTC (rev 5017)
@@ -34,6 +34,8 @@
       {
          BufferedWriter writer =3D null;
          log.debug("Opening output file [" + output + "]");
+         String fileName =3D output.getAbsolutePath() + ".old." + System.c=
urrentTimeMillis();
+         prepareReportFile(fileName);
          writer =3D new BufferedWriter(new FileWriter(output));
          writeHeaderLine(writer); // Write the Header of the Report
          // Write the results
@@ -51,8 +53,7 @@
          log.debug("Report complete");
          if  (output.exists())
          {
-            log.error("Expected report file:'" + output.getAbsoluteFile() =
+ "'does not exist!");
-            throw new IllegalStateException("The report file does not exis=
t - weird!");
+            log.warn("Expected report file:'" + output.getAbsoluteFile() +=
 "'does not exist!");
          }
       } catch (IOException e)
       {
@@ -60,6 +61,25 @@
       }
    }
 =

+   private void prepareReportFile(String fileName)
+         throws IOException
+   {
+      if (output.exists())
+      {
+         log.info("A file named: '" + output.getAbsolutePath() + "' alread=
y exist. Renaming to '" + fileName + "'");
+         if (output.renameTo(new File(fileName))) {
+            log.warn("Could not rename!!!");
+         }
+      } else
+      {
+         if (output.createNewFile()) {
+            log.info("Successfully created report file:" + output.getAbsol=
utePath());
+         } else {
+            log.warn("Failed to create the report file!");
+         }
+      }
+   }
+
    /**
     * Writes out the report.
     * The method checkes whether the result is passed or failed. And based=
 on the status would generate the report with


--===============0962049265058923176==--

From jbosscache-commits at lists.jboss.org Sun Jan  6 18:49:55 2008
Content-Type: multipart/mixed; boundary="===============1644545521638230523=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r5018 -
 cache-bench-fwk/trunk/src/org/cachebench/reportgenerators.
Date: Sun, 06 Jan 2008 18:49:55 -0500
Message-ID: <E1JBfFb-0007Pl-AH@committer01.frg.pub.inap.atl.jboss.com>

--===============1644545521638230523==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: mircea.markus
Date: 2008-01-06 18:49:55 -0500 (Sun, 06 Jan 2008)
New Revision: 5018

Modified:
   cache-bench-fwk/trunk/src/org/cachebench/reportgenerators/ClusterReportG=
enerator.java
Log:


Modified: cache-bench-fwk/trunk/src/org/cachebench/reportgenerators/Cluster=
ReportGenerator.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- cache-bench-fwk/trunk/src/org/cachebench/reportgenerators/ClusterReport=
Generator.java	2008-01-06 23:05:50 UTC (rev 5017)
+++ cache-bench-fwk/trunk/src/org/cachebench/reportgenerators/ClusterReport=
Generator.java	2008-01-06 23:49:55 UTC (rev 5018)
@@ -41,13 +41,22 @@
             log.trace("Received following results: " + results);
             generateReport(barrier.getReceivedMessages());
          }
+         barrierUntilReportIsGenerated();
       } catch (Exception e)
       {
          log.error("Error while generating report!", e);
       }
    }
 =

+   private void barrierUntilReportIsGenerated() throws Exception
+   {
+      ClusterBarrier barrier =3D new ClusterBarrier();
+      barrier.setConfig(this.clusterConfig);
+      barrier.setAcknowledge(true);
+      barrier.barrier("AFTER_REPORT_GENERATED_BARRIER");
+   }
 =

+
    private void generateReport(Map<SocketAddress, Object> receivedMessages=
) throws Exception
    {
       log.trace("Received " + receivedMessages.size() + " results!");


--===============1644545521638230523==--

From jbosscache-commits at lists.jboss.org Sun Jan  6 19:48:41 2008
Content-Type: multipart/mixed; boundary="===============0186455536715449749=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r5019 -
 core/trunk/src/main/java/org/jboss/cache/buddyreplication.
Date: Sun, 06 Jan 2008 19:48:41 -0500
Message-ID: <E1JBgAT-0001eN-HC@committer01.frg.pub.inap.atl.jboss.com>

--===============0186455536715449749==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: manik.surtani(a)jboss.com
Date: 2008-01-06 19:48:41 -0500 (Sun, 06 Jan 2008)
New Revision: 5019

Modified:
   core/trunk/src/main/java/org/jboss/cache/buddyreplication/BuddyManager.j=
ava
Log:
wc

Modified: core/trunk/src/main/java/org/jboss/cache/buddyreplication/BuddyMa=
nager.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/java/org/jboss/cache/buddyreplication/BuddyManager.=
java	2008-01-06 23:49:55 UTC (rev 5018)
+++ core/trunk/src/main/java/org/jboss/cache/buddyreplication/BuddyManager.=
java	2008-01-07 00:48:41 UTC (rev 5019)
@@ -377,8 +377,8 @@
       }
 =

       // Update buddy list
-      boolean buddyGroupMutated =3D !obsoleteBuddies.isEmpty() && !uniniti=
alisedBuddies.isEmpty();
-//      if (buddyGroupMutated) notifier.notifyBuddyGroupChange(buddyGroup,=
 true);
+      boolean buddyGroupMutated =3D !obsoleteBuddies.isEmpty() || !uniniti=
alisedBuddies.isEmpty();
+
       if (!obsoleteBuddies.isEmpty())
       {
          removeFromGroup(obsoleteBuddies);


--===============0186455536715449749==--

From jbosscache-commits at lists.jboss.org Sun Jan  6 21:09:45 2008
Content-Type: multipart/mixed; boundary="===============7564690727133147438=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN:  r5020 - /.
Date: Sun, 06 Jan 2008 21:09:45 -0500
Message-ID: <E1JBhQv-0000fk-DV@committer01.frg.pub.inap.atl.jboss.com>

--===============7564690727133147438==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: manik.surtani(a)jboss.com
Date: 2008-01-06 21:09:45 -0500 (Sun, 06 Jan 2008)
New Revision: 5020

Added:
   demos/
Log:
created demos dir


--===============7564690727133147438==--

From jbosscache-commits at lists.jboss.org Sun Jan  6 21:10:15 2008
Content-Type: multipart/mixed; boundary="===============3050334112434327318=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN:  r5021 - demos.
Date: Sun, 06 Jan 2008 21:10:15 -0500
Message-ID: <E1JBhRP-0001CC-9k@committer01.frg.pub.inap.atl.jboss.com>

--===============3050334112434327318==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: manik.surtani(a)jboss.com
Date: 2008-01-06 21:10:15 -0500 (Sun, 06 Jan 2008)
New Revision: 5021

Added:
   demos/core-demo-gui/
Log:
created demos dir


--===============3050334112434327318==--

From jbosscache-commits at lists.jboss.org Sun Jan  6 21:10:23 2008
Content-Type: multipart/mixed; boundary="===============3187048068990104178=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r5022 - demos/core-demo-gui.
Date: Sun, 06 Jan 2008 21:10:23 -0500
Message-ID: <E1JBhRX-0001Ch-Cr@committer01.frg.pub.inap.atl.jboss.com>

--===============3187048068990104178==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: manik.surtani(a)jboss.com
Date: 2008-01-06 21:10:23 -0500 (Sun, 06 Jan 2008)
New Revision: 5022

Added:
   demos/core-demo-gui/trunk/
Log:
created demos dir


--===============3187048068990104178==--

From jbosscache-commits at lists.jboss.org Sun Jan  6 21:11:54 2008
Content-Type: multipart/mixed; boundary="===============5023430879122990535=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r5023 - in
 demos/core-demo-gui/trunk: src and 8 other directories.
Date: Sun, 06 Jan 2008 21:11:53 -0500
Message-ID: <E1JBhSz-0001FH-Lh@committer01.frg.pub.inap.atl.jboss.com>

--===============5023430879122990535==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: manik.surtani(a)jboss.com
Date: 2008-01-06 21:11:53 -0500 (Sun, 06 Jan 2008)
New Revision: 5023

Added:
   demos/core-demo-gui/trunk/README.txt
   demos/core-demo-gui/trunk/assembly.xml
   demos/core-demo-gui/trunk/pom.xml
   demos/core-demo-gui/trunk/src/
   demos/core-demo-gui/trunk/src/main/
   demos/core-demo-gui/trunk/src/main/java/
   demos/core-demo-gui/trunk/src/main/java/org/
   demos/core-demo-gui/trunk/src/main/java/org/jboss/
   demos/core-demo-gui/trunk/src/main/java/org/jboss/cache/
   demos/core-demo-gui/trunk/src/main/java/org/jboss/cache/demo/
   demos/core-demo-gui/trunk/src/main/java/org/jboss/cache/demo/DataTreeRef=
resher.java
   demos/core-demo-gui/trunk/src/main/java/org/jboss/cache/demo/JBossCacheD=
emo.form
   demos/core-demo-gui/trunk/src/main/java/org/jboss/cache/demo/JBossCacheD=
emo.java
   demos/core-demo-gui/trunk/src/main/resources/
   demos/core-demo-gui/trunk/src/main/resources/bin/
   demos/core-demo-gui/trunk/src/main/resources/bin/run.sh
   demos/core-demo-gui/trunk/src/main/resources/demo-cache-config.xml
   demos/core-demo-gui/trunk/src/main/resources/log4j.xml
Log:
Initial checkin

Added: demos/core-demo-gui/trunk/README.txt
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- demos/core-demo-gui/trunk/README.txt	                        (rev 0)
+++ demos/core-demo-gui/trunk/README.txt	2008-01-07 02:11:53 UTC (rev 5023)
@@ -0,0 +1,21 @@
+This is a demo GUI for JBoss Cache.
+
+* Running the demo
+------------------
+
+To run the demo, all you need is a Java 5 compliant JVM.  All dependencies=
 are packaged in the demo ZIP file, which
+can be downloaded from http://www.jbosscache.org
+
+Simply unzip the demo distribution and use the "run.sh" shell script to la=
unch the demo GUI.
+
+* Building the demo
+-------------------
+
+You need to use Maven 2 to build the demo from sources.  Simply check out =
the sources for the demo from http://anonsvn.jboss.org/repos/jbosscache/dem=
o/trunk
+and build using "mvn clean install", which will generate the ZIP distribut=
ion in "target/distribution"
+
+* Developing the demo
+---------------------
+
+You need to use IntelliJ IDEA's UIDesigner to edit the Swing forms in this=
 project.  To generate IDEA project files,
+run "mvn idea:idea" and then open the resulting project file in IntelliJ.

Added: demos/core-demo-gui/trunk/assembly.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- demos/core-demo-gui/trunk/assembly.xml	                        (rev 0)
+++ demos/core-demo-gui/trunk/assembly.xml	2008-01-07 02:11:53 UTC (rev 502=
3)
@@ -0,0 +1,64 @@
+<assembly>
+   <id>bin</id>
+
+   <formats>
+      <format>zip</format>
+   </formats>
+
+   <includeBaseDirectory>true</includeBaseDirectory>
+
+   <fileSets>
+      <!-- code -->
+      <fileSet>
+         <directory>target</directory>
+         <outputDirectory/>
+         <includes>
+            <include>*.jar</include>
+         </includes>
+         <excludes>
+            <exclude>*test*.jar</exclude>
+         </excludes>
+      </fileSet>
+
+      <!-- resources -->
+      <fileSet>
+         <directory>src/main/resources</directory>
+         <outputDirectory>etc</outputDirectory>
+      </fileSet>
+
+      <!-- EULAs and license files -->
+      <fileSet>
+         <directory>src/main/resources/bin</directory>
+         <outputDirectory/>
+         <includes>
+            <include>**/*</include>
+         </includes>
+         <fileMode>0755</fileMode>
+      </fileSet>
+
+      <fileSet>
+         <directory />
+         <outputDirectory/>
+         <includes>
+            <include>README.txt</include>
+         </includes>
+      </fileSet>
+
+   </fileSets>
+
+   <!-- Make sure we filter out the junk that jboss-common-core pulls in -=
->
+   <dependencySets>
+      <dependencySet>
+         <outputDirectory>lib</outputDirectory>
+         <outputFileNameMapping>${artifactId}.${extension}</outputFileName=
Mapping>
+         <unpack>false</unpack>
+         <scope>runtime</scope>
+         <excludes>
+            <exclude>apache-xerces:xml-apis</exclude>
+            <exclude>apache-httpclient:commons-httpclient</exclude>
+            <exclude>apache-slide:webdavlib</exclude>
+         </excludes>
+      </dependencySet>
+   </dependencySets>
+
+</assembly>

Added: demos/core-demo-gui/trunk/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- demos/core-demo-gui/trunk/pom.xml	                        (rev 0)
+++ demos/core-demo-gui/trunk/pom.xml	2008-01-07 02:11:53 UTC (rev 5023)
@@ -0,0 +1,94 @@
+<?xml version=3D"1.0"?>
+<project xmlns=3D"http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi=3D"http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation=3D"http://maven.apache.org/POM/4.0.0 http://ma=
ven.apache.org/xsd/maven-4.0.0.xsd">
+   <modelVersion>4.0.0</modelVersion>
+   <properties>
+      <jbosscache-core-version>2.1.0-SNAPSHOT</jbosscache-core-version>
+   </properties>
+   <parent>
+      <groupId>org.jboss.cache</groupId>
+      <artifactId>jbosscache-common-parent</artifactId>
+      <version>1.1-SNAPSHOT</version>
+   </parent>
+   <groupId>org.jboss.cache</groupId>
+   <artifactId>jbosscache-demo</artifactId>
+   <version>${jbosscache-core-version}</version>
+   <name>JBoss Cache - Core Edition GUI Demo</name>
+   <description>JBoss Cache - Core Edition GUI Demo</description>
+   <packaging>jar</packaging>
+   <dependencies>
+      <dependency>
+         <groupId>org.jboss.cache</groupId>
+         <artifactId>jbosscache-core</artifactId>
+         <version>2.1.0-SNAPSHOT</version>
+      </dependency>
+      <dependency>
+         <groupId>jgoodies</groupId>
+         <artifactId>forms</artifactId>
+         <version>1.0.5</version>
+      </dependency>
+      <dependency>
+         <groupId>com.intellij</groupId>
+         <artifactId>forms_rt</artifactId>
+         <version>6.0.5</version>
+      </dependency>
+   </dependencies>
+
+   <build>
+      <plugins>
+         <plugin>
+            <artifactId>maven-assembly-plugin</artifactId>
+            <version>2.2-beta-1</version>
+            <executions>
+               <execution>
+                  <id>assemble</id>
+                  <phase>install</phase>
+                  <goals>
+                     <goal>attached</goal>
+                  </goals>
+                  <configuration>
+                     <descriptors>
+                        <descriptor>assembly.xml</descriptor>
+                     </descriptors>
+                     <finalName>${artifactId}</finalName>
+                     <outputDirectory>target/distribution</outputDirectory>
+                     <workDirectory>target/assembly/work</workDirectory>
+                  </configuration>
+               </execution>
+            </executions>
+         </plugin>
+
+         <plugin>
+            <groupId>org.codehaus.mojo</groupId>
+            <artifactId>ideauidesigner-maven-plugin</artifactId>
+            <executions>
+               <execution>
+                  <goals>
+                     <goal>javac2</goal>
+                  </goals>
+               </execution>
+            </executions>
+            <configuration>
+               <fork>true</fork>
+               <debug>true</debug>
+               <failOnError>true</failOnError>
+            </configuration>
+         </plugin>
+
+
+      </plugins>
+   </build>
+
+   <!-- basic JBoss repository so that the common parent POM in jbosscache=
-support can be found -->
+   <repositories>
+      <repository>
+         <id>repository.jboss.org</id>
+         <url>http://repository.jboss.org/maven2</url>
+      </repository>
+      <repository>
+         <id>snapshots.jboss.org</id>
+         <url>http://snapshots.jboss.org/maven2</url>
+      </repository>
+   </repositories>
+</project>

Added: demos/core-demo-gui/trunk/src/main/java/org/jboss/cache/demo/DataTre=
eRefresher.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- demos/core-demo-gui/trunk/src/main/java/org/jboss/cache/demo/DataTreeRe=
fresher.java	                        (rev 0)
+++ demos/core-demo-gui/trunk/src/main/java/org/jboss/cache/demo/DataTreeRe=
fresher.java	2008-01-07 02:11:53 UTC (rev 5023)
@@ -0,0 +1,196 @@
+package org.jboss.cache.demo;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.jboss.cache.Cache;
+import org.jboss.cache.Fqn;
+import org.jboss.cache.FqnComparator;
+import org.jboss.cache.Node;
+
+import javax.swing.*;
+import javax.swing.tree.DefaultMutableTreeNode;
+import javax.swing.tree.DefaultTreeModel;
+import javax.swing.tree.TreeModel;
+import javax.swing.tree.TreeNode;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Enumeration;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
+/**
+ * // TODO Document this
+ *
+ * @author Manik Surtani (<a href=3D"mailto:manik(a)jboss.org">manik(a)jbo=
ss.org</a>)
+ * @since 2.1.0
+ */
+public class DataTreeRefresher
+{
+   private JTree tree;
+   private Map<Fqn<String>, FqnTreeNode> treeNodes =3D new ConcurrentHashM=
ap<Fqn<String>, FqnTreeNode>();
+   private Cache<String, String> cache;
+   private Log log =3D LogFactory.getLog(DataTreeRefresher.class);
+   private JBossCacheDemo.NodeDataTableModel tableModel;
+
+   public DataTreeRefresher(JTree tree, Cache<String, String> cache, JBoss=
CacheDemo.NodeDataTableModel tableModel)
+   {
+      this.tree =3D tree;
+      this.cache =3D cache;
+      this.tableModel =3D tableModel;
+      populateDataTree();
+   }
+
+   private void populateDataTree()
+   {
+      // initialise the root.
+      FqnTreeNode node =3D new FqnTreeNode(Fqn.ROOT);
+      // put this in the treeNodes map
+      treeNodes.put(Fqn.ROOT, node);
+
+      TreeModel model =3D new OrderedTreeModel(node);
+      tree.setModel(model);
+
+      // now traverse the cache nodes and populate the tree.
+      populateChildren(cache.getRoot());
+
+      repaint();
+   }
+
+   private void populateChildren(Node<String, String> cacheNode)
+   {
+      for (Node<String, String> cacheChild : cacheNode.getChildren())
+      {
+         getOrCreateTreeNode(cacheChild.getFqn());
+         // now go deep
+         populateChildren(cacheChild);
+      }
+   }
+
+   private FqnTreeNode getOrCreateTreeNode(Fqn<String> f)
+   {
+      FqnTreeNode treeNode =3D treeNodes.get(f);
+      if (treeNode =3D=3D null)
+      {
+         treeNode =3D new FqnTreeNode(f);
+         FqnTreeNode parent =3D getOrCreateTreeNode(f.getParent());
+         parent.add(treeNode);
+         treeNode.setParent(parent);
+         treeNodes.put(f, treeNode);
+      }
+      return treeNode;
+   }
+
+   public void addNode(Fqn<String> f)
+   {
+      getOrCreateTreeNode(f);
+   }
+
+   public void removeNode(Fqn<String> f)
+   {
+      if (treeNodes.containsKey(f))
+      {
+         removeTreeNode(treeNodes.get(f));
+      }
+   }
+
+   private void removeTreeNode(FqnTreeNode treeNode)
+   {
+      // clear children
+      for (Enumeration en =3D treeNode.children(); en.hasMoreElements();)
+      {
+         FqnTreeNode child =3D (FqnTreeNode) en.nextElement();
+         removeTreeNode(child);
+      }
+
+      if (!treeNode.getFqn().isRoot())
+      {
+         // then remove node
+         treeNodes.remove(treeNode.getFqn());
+         treeNode.removeFromParent();
+      }
+   }
+
+   public void repaint()
+   {
+      tableModel.setCurrentFqn(null);
+      Map<String, String> m =3D Collections.emptyMap();
+      tableModel.setData(m);
+      tree.repaint();
+      ((DefaultTreeModel) tree.getModel()).reload();
+   }
+
+   class FqnTreeNode extends DefaultMutableTreeNode implements Comparable
+   {
+      private Fqn fqn;
+
+      FqnTreeNode(Fqn fqn)
+      {
+         super(fqn.isRoot() ? "/" : fqn.getLastElement());
+         this.fqn =3D fqn;
+      }
+
+      public Fqn getFqn()
+      {
+         return fqn;
+      }
+
+      public void setFqn(Fqn fqn)
+      {
+         this.fqn =3D fqn;
+      }
+
+      public int compareTo(Object o)
+      {
+         FqnTreeNode other =3D (FqnTreeNode) o;
+         return FqnComparator.INSTANCE.compare(fqn, other.getFqn());
+      }
+   }
+
+   class OrderedTreeModel extends DefaultTreeModel
+   {
+      public OrderedTreeModel(TreeNode root)
+      {
+         super(root);
+      }
+
+      public OrderedTreeModel(TreeNode root, boolean asksAllowsChildren)
+      {
+         super(root, asksAllowsChildren);
+      }
+
+      @Override
+      public int getIndexOfChild(Object parent, Object child)
+      {
+         this.orderChildren(parent);
+         return super.getIndexOfChild(parent, child);
+      }
+
+      @Override
+      public Object getChild(Object parent, int index)
+      {
+         this.orderChildren(parent);
+         return super.getChild(parent, index);
+      }
+
+      /**
+       * Orders the children of a DefaultMutableTreeNode
+       *
+       * @param parent
+       */
+      private void orderChildren(Object parent)
+      {
+         if (parent =3D=3D null) return;
+
+         if (parent instanceof FqnTreeNode)
+         {
+            FqnTreeNode node =3D (FqnTreeNode) parent;
+            ArrayList children =3D Collections.list(node.children());
+            Collections.sort(children);
+            node.removeAllChildren();
+            Iterator childrenIterator =3D children.iterator();
+            while (childrenIterator.hasNext()) node.add((FqnTreeNode) chil=
drenIterator.next());
+         }
+      }
+   }
+}

Added: demos/core-demo-gui/trunk/src/main/java/org/jboss/cache/demo/JBossCa=
cheDemo.form
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- demos/core-demo-gui/trunk/src/main/java/org/jboss/cache/demo/JBossCache=
Demo.form	                        (rev 0)
+++ demos/core-demo-gui/trunk/src/main/java/org/jboss/cache/demo/JBossCache=
Demo.form	2008-01-07 02:11:53 UTC (rev 5023)
@@ -0,0 +1,627 @@
+<?xml version=3D"1.0" encoding=3D"UTF-8"?>
+<form xmlns=3D"http://www.intellij.com/uidesigner/form/" version=3D"1" bin=
d-to-class=3D"org.jboss.cache.demo.JBossCacheDemo">
+  <grid id=3D"27dc6" binding=3D"panel1" default-binding=3D"true" layout-ma=
nager=3D"FormLayout">
+    <rowspec value=3D"center:max(d;4px):noGrow"/>
+    <rowspec value=3D"top:3dlu:noGrow"/>
+    <rowspec value=3D"center:600px:grow"/>
+    <rowspec value=3D"top:3dlu:noGrow"/>
+    <rowspec value=3D"center:max(d;4px):noGrow"/>
+    <colspec value=3D"fill:800px:grow"/>
+    <colspec value=3D"left:4dlu:noGrow"/>
+    <colspec value=3D"fill:100px:grow"/>
+    <constraints>
+      <xy x=3D"20" y=3D"20" width=3D"918" height=3D"661"/>
+    </constraints>
+    <properties/>
+    <border type=3D"line" title=3D"JBoss Cache Demo Application">
+      <font size=3D"14" style=3D"3"/>
+      <title-color color=3D"-16750951"/>
+      <color color=3D"-16750951"/>
+    </border>
+    <children>
+      <tabbedpane id=3D"d853c" binding=3D"mainPane">
+        <constraints>
+          <grid row=3D"2" column=3D"0" row-span=3D"1" col-span=3D"3" vsize=
-policy=3D"3" hsize-policy=3D"3" anchor=3D"0" fill=3D"3" indent=3D"0" use-p=
arent-layout=3D"false">
+            <preferred-size width=3D"200" height=3D"200"/>
+          </grid>
+          <forms defaultalign-vert=3D"false"/>
+        </constraints>
+        <properties>
+          <background color=3D"-3355648"/>
+        </properties>
+        <border type=3D"none"/>
+        <children>
+          <grid id=3D"7aed3" binding=3D"controlPanelTab" layout-manager=3D=
"FormLayout">
+            <rowspec value=3D"center:m:noGrow"/>
+            <rowspec value=3D"top:3dlu:noGrow"/>
+            <rowspec value=3D"center:max(d;4px):noGrow"/>
+            <rowspec value=3D"top:3dlu:noGrow"/>
+            <rowspec value=3D"center:d:grow"/>
+            <colspec value=3D"fill:d:noGrow"/>
+            <colspec value=3D"left:4dlu:noGrow"/>
+            <colspec value=3D"fill:max(d;4px):noGrow"/>
+            <colspec value=3D"left:4dlu:noGrow"/>
+            <colspec value=3D"fill:d:grow"/>
+            <constraints>
+              <tabbedpane title=3D"Control panel">
+                <tooltip value=3D"This tab contains cache controls and gen=
eral information about the cache configuration."/>
+              </tabbedpane>
+            </constraints>
+            <properties>
+              <toolTipText value=3D""/>
+            </properties>
+            <border type=3D"none"/>
+            <children>
+              <component id=3D"953e7" class=3D"javax.swing.JLabel">
+                <constraints>
+                  <grid row=3D"0" column=3D"0" row-span=3D"1" col-span=3D"=
1" vsize-policy=3D"0" hsize-policy=3D"0" anchor=3D"9" fill=3D"0" indent=3D"=
0" use-parent-layout=3D"false"/>
+                  <forms defaultalign-vert=3D"false"/>
+                </constraints>
+                <properties>
+                  <text value=3D"Command"/>
+                </properties>
+              </component>
+              <component id=3D"82b76" class=3D"javax.swing.JButton" bindin=
g=3D"actionButton">
+                <constraints>
+                  <grid row=3D"0" column=3D"2" row-span=3D"1" col-span=3D"=
1" vsize-policy=3D"0" hsize-policy=3D"3" anchor=3D"1" fill=3D"1" indent=3D"=
0" use-parent-layout=3D"false"/>
+                  <forms defaultalign-vert=3D"false"/>
+                </constraints>
+                <properties>
+                  <text value=3D"Button"/>
+                </properties>
+              </component>
+              <vspacer id=3D"8cdf4">
+                <constraints>
+                  <grid row=3D"4" column=3D"0" row-span=3D"1" col-span=3D"=
1" vsize-policy=3D"6" hsize-policy=3D"1" anchor=3D"0" fill=3D"2" indent=3D"=
0" use-parent-layout=3D"false"/>
+                  <forms defaultalign-vert=3D"false"/>
+                </constraints>
+              </vspacer>
+              <hspacer id=3D"bfe90">
+                <constraints>
+                  <grid row=3D"0" column=3D"4" row-span=3D"1" col-span=3D"=
1" vsize-policy=3D"1" hsize-policy=3D"6" anchor=3D"0" fill=3D"1" indent=3D"=
0" use-parent-layout=3D"false"/>
+                  <forms defaultalign-horz=3D"false"/>
+                </constraints>
+              </hspacer>
+              <component id=3D"458fc" class=3D"javax.swing.JLabel">
+                <constraints>
+                  <grid row=3D"2" column=3D"0" row-span=3D"1" col-span=3D"=
1" vsize-policy=3D"0" hsize-policy=3D"0" anchor=3D"9" fill=3D"0" indent=3D"=
0" use-parent-layout=3D"false"/>
+                  <forms defaultalign-vert=3D"false"/>
+                </constraints>
+                <properties>
+                  <text value=3D"Cache configuration file"/>
+                </properties>
+              </component>
+              <component id=3D"1eef8" class=3D"javax.swing.JLabel" binding=
=3D"configFileName">
+                <constraints>
+                  <grid row=3D"2" column=3D"2" row-span=3D"1" col-span=3D"=
3" vsize-policy=3D"0" hsize-policy=3D"0" anchor=3D"9" fill=3D"0" indent=3D"=
0" use-parent-layout=3D"false"/>
+                  <forms defaultalign-vert=3D"false"/>
+                </constraints>
+                <properties>
+                  <font style=3D"3"/>
+                  <text value=3D" "/>
+                </properties>
+              </component>
+              <scrollpane id=3D"4638">
+                <constraints>
+                  <grid row=3D"4" column=3D"2" row-span=3D"1" col-span=3D"=
3" vsize-policy=3D"7" hsize-policy=3D"7" anchor=3D"0" fill=3D"3" indent=3D"=
0" use-parent-layout=3D"false"/>
+                  <forms defaultalign-horz=3D"false" defaultalign-vert=3D"=
false"/>
+                </constraints>
+                <properties/>
+                <border type=3D"none"/>
+                <children>
+                  <component id=3D"ded97" class=3D"javax.swing.JTextArea" =
binding=3D"configFileContents">
+                    <constraints/>
+                    <properties>
+                      <background color=3D"-103"/>
+                      <font name=3D"Courier New" size=3D"10"/>
+                    </properties>
+                  </component>
+                </children>
+              </scrollpane>
+            </children>
+          </grid>
+          <grid id=3D"73867" binding=3D"dataViewTab" layout-manager=3D"For=
mLayout">
+            <rowspec value=3D"center:d:grow"/>
+            <colspec value=3D"fill:d:grow"/>
+            <colspec value=3D"left:4dlu:noGrow"/>
+            <colspec value=3D"fill:m:grow"/>
+            <constraints>
+              <tabbedpane title=3D"Data view" enabled=3D"false">
+                <tooltip value=3D"This tab contains a view of all the data=
 in the cache."/>
+              </tabbedpane>
+            </constraints>
+            <properties>
+              <enabled value=3D"true"/>
+              <toolTipText value=3D""/>
+            </properties>
+            <border type=3D"none"/>
+            <children>
+              <scrollpane id=3D"ea4d">
+                <constraints>
+                  <grid row=3D"0" column=3D"0" row-span=3D"1" col-span=3D"=
1" vsize-policy=3D"7" hsize-policy=3D"7" anchor=3D"0" fill=3D"3" indent=3D"=
0" use-parent-layout=3D"false"/>
+                  <forms defaultalign-horz=3D"false" defaultalign-vert=3D"=
false"/>
+                </constraints>
+                <properties/>
+                <border type=3D"none"/>
+                <children>
+                  <component id=3D"a805d" class=3D"javax.swing.JTree" bind=
ing=3D"dataTree">
+                    <constraints/>
+                    <properties>
+                      <background color=3D"-1"/>
+                      <showsRootHandles value=3D"true"/>
+                      <toolTipText value=3D"Tree view of the cache"/>
+                    </properties>
+                  </component>
+                </children>
+              </scrollpane>
+              <scrollpane id=3D"f78a6" binding=3D"nodeData">
+                <constraints>
+                  <grid row=3D"0" column=3D"2" row-span=3D"1" col-span=3D"=
1" vsize-policy=3D"7" hsize-policy=3D"7" anchor=3D"0" fill=3D"3" indent=3D"=
0" use-parent-layout=3D"false"/>
+                  <forms defaultalign-horz=3D"false" defaultalign-vert=3D"=
false"/>
+                </constraints>
+                <properties/>
+                <border type=3D"none"/>
+                <children>
+                  <component id=3D"41fa4" class=3D"javax.swing.JTable" bin=
ding=3D"nodeDataTable">
+                    <constraints/>
+                    <properties>
+                      <background color=3D"-103"/>
+                      <gridColor color=3D"-16777216"/>
+                      <intercellSpacing width=3D"3" height=3D"3"/>
+                      <toolTipText value=3D"Data in currently selected nod=
e"/>
+                    </properties>
+                  </component>
+                </children>
+              </scrollpane>
+            </children>
+          </grid>
+          <grid id=3D"b4b20" binding=3D"clusterViewTab" layout-manager=3D"=
FormLayout">
+            <rowspec value=3D"center:d:grow"/>
+            <colspec value=3D"fill:d:grow"/>
+            <constraints>
+              <tabbedpane title=3D"Cluster view" enabled=3D"false">
+                <tooltip value=3D"This tab contains a view of the cluster =
topology"/>
+              </tabbedpane>
+            </constraints>
+            <properties>
+              <toolTipText value=3D""/>
+            </properties>
+            <border type=3D"none"/>
+            <children>
+              <scrollpane id=3D"b9d5f">
+                <constraints>
+                  <grid row=3D"0" column=3D"0" row-span=3D"1" col-span=3D"=
1" vsize-policy=3D"7" hsize-policy=3D"7" anchor=3D"0" fill=3D"3" indent=3D"=
0" use-parent-layout=3D"false"/>
+                  <forms defaultalign-horz=3D"false" defaultalign-vert=3D"=
false"/>
+                </constraints>
+                <properties>
+                  <background color=3D"-16737895"/>
+                  <horizontalScrollBarPolicy value=3D"30"/>
+                </properties>
+                <border type=3D"none"/>
+                <children>
+                  <component id=3D"d96d2" class=3D"javax.swing.JTable" bin=
ding=3D"clusterTable">
+                    <constraints/>
+                    <properties>
+                      <background color=3D"-103"/>
+                      <gridColor color=3D"-16777216"/>
+                      <intercellSpacing width=3D"3" height=3D"3"/>
+                      <showHorizontalLines value=3D"true"/>
+                      <showVerticalLines value=3D"false"/>
+                    </properties>
+                  </component>
+                </children>
+              </scrollpane>
+            </children>
+          </grid>
+          <grid id=3D"43cd8" binding=3D"statisticsTab" layout-manager=3D"F=
ormLayout">
+            <rowspec value=3D"center:d:noGrow"/>
+            <rowspec value=3D"top:3dlu:noGrow"/>
+            <rowspec value=3D"center:max(d;4px):noGrow"/>
+            <rowspec value=3D"top:3dlu:noGrow"/>
+            <rowspec value=3D"center:max(d;4px):noGrow"/>
+            <rowspec value=3D"top:3dlu:noGrow"/>
+            <rowspec value=3D"center:max(d;4px):noGrow"/>
+            <rowspec value=3D"top:3dlu:noGrow"/>
+            <rowspec value=3D"center:max(d;4px):noGrow"/>
+            <colspec value=3D"fill:d:noGrow"/>
+            <colspec value=3D"left:4dlu:noGrow"/>
+            <colspec value=3D"fill:max(d;4px):noGrow"/>
+            <constraints>
+              <tabbedpane title=3D"Statistics" enabled=3D"false">
+                <tooltip value=3D"This tab contains various statistics on =
the running cache."/>
+              </tabbedpane>
+            </constraints>
+            <properties>
+              <toolTipText value=3D""/>
+            </properties>
+            <border type=3D"none"/>
+            <children>
+              <component id=3D"cc9c" class=3D"javax.swing.JLabel">
+                <constraints>
+                  <grid row=3D"0" column=3D"0" row-span=3D"1" col-span=3D"=
1" vsize-policy=3D"0" hsize-policy=3D"0" anchor=3D"8" fill=3D"0" indent=3D"=
0" use-parent-layout=3D"false"/>
+                  <forms/>
+                </constraints>
+                <properties>
+                  <text value=3D"Number of nodes"/>
+                </properties>
+              </component>
+              <component id=3D"5d05" class=3D"javax.swing.JLabel" binding=
=3D"statsNumberOfNodes">
+                <constraints>
+                  <grid row=3D"0" column=3D"2" row-span=3D"1" col-span=3D"=
1" vsize-policy=3D"0" hsize-policy=3D"0" anchor=3D"8" fill=3D"0" indent=3D"=
0" use-parent-layout=3D"false"/>
+                  <forms/>
+                </constraints>
+                <properties>
+                  <text value=3D""/>
+                </properties>
+              </component>
+              <component id=3D"9ba3c" class=3D"javax.swing.JLabel">
+                <constraints>
+                  <grid row=3D"2" column=3D"0" row-span=3D"1" col-span=3D"=
1" vsize-policy=3D"0" hsize-policy=3D"0" anchor=3D"8" fill=3D"0" indent=3D"=
0" use-parent-layout=3D"false"/>
+                  <forms/>
+                </constraints>
+                <properties>
+                  <text value=3D"Number of keys"/>
+                </properties>
+              </component>
+              <component id=3D"4e154" class=3D"javax.swing.JLabel">
+                <constraints>
+                  <grid row=3D"4" column=3D"0" row-span=3D"1" col-span=3D"=
1" vsize-policy=3D"0" hsize-policy=3D"0" anchor=3D"8" fill=3D"0" indent=3D"=
0" use-parent-layout=3D"false"/>
+                  <forms/>
+                </constraints>
+                <properties>
+                  <text value=3D"Size of data cached"/>
+                </properties>
+              </component>
+              <component id=3D"ff6b" class=3D"javax.swing.JLabel" binding=
=3D"statsNumberOfKeys">
+                <constraints>
+                  <grid row=3D"2" column=3D"2" row-span=3D"1" col-span=3D"=
1" vsize-policy=3D"0" hsize-policy=3D"0" anchor=3D"8" fill=3D"0" indent=3D"=
0" use-parent-layout=3D"false"/>
+                  <forms/>
+                </constraints>
+                <properties>
+                  <text value=3D""/>
+                </properties>
+              </component>
+              <component id=3D"333b4" class=3D"javax.swing.JLabel" binding=
=3D"statsSizeOfCachedData">
+                <constraints>
+                  <grid row=3D"4" column=3D"2" row-span=3D"1" col-span=3D"=
1" vsize-policy=3D"0" hsize-policy=3D"0" anchor=3D"8" fill=3D"0" indent=3D"=
0" use-parent-layout=3D"false"/>
+                  <forms/>
+                </constraints>
+                <properties>
+                  <text value=3D""/>
+                </properties>
+              </component>
+              <component id=3D"69403" class=3D"javax.swing.JButton" bindin=
g=3D"updateStatsButton" default-binding=3D"true">
+                <constraints>
+                  <grid row=3D"8" column=3D"2" row-span=3D"1" col-span=3D"=
1" vsize-policy=3D"0" hsize-policy=3D"3" anchor=3D"8" fill=3D"0" indent=3D"=
0" use-parent-layout=3D"false"/>
+                  <forms defaultalign-horz=3D"false"/>
+                </constraints>
+                <properties>
+                  <text value=3D"&amp;Update stats"/>
+                </properties>
+              </component>
+              <component id=3D"5ebe9" class=3D"javax.swing.JLabel">
+                <constraints>
+                  <grid row=3D"6" column=3D"0" row-span=3D"1" col-span=3D"=
1" vsize-policy=3D"0" hsize-policy=3D"0" anchor=3D"8" fill=3D"0" indent=3D"=
0" use-parent-layout=3D"false"/>
+                  <forms/>
+                </constraints>
+                <properties>
+                  <text value=3D"Time last updated"/>
+                </properties>
+              </component>
+              <component id=3D"8eaca" class=3D"javax.swing.JLabel" binding=
=3D"statsLastUpdated">
+                <constraints>
+                  <grid row=3D"6" column=3D"2" row-span=3D"1" col-span=3D"=
1" vsize-policy=3D"0" hsize-policy=3D"0" anchor=3D"8" fill=3D"0" indent=3D"=
0" use-parent-layout=3D"false"/>
+                  <forms/>
+                </constraints>
+                <properties>
+                  <text value=3D""/>
+                </properties>
+              </component>
+            </children>
+          </grid>
+          <grid id=3D"54b2f" binding=3D"dataGeneratorTab" layout-manager=
=3D"FormLayout">
+            <rowspec value=3D"center:max(d;4px):noGrow"/>
+            <rowspec value=3D"top:3dlu:noGrow"/>
+            <rowspec value=3D"center:d:noGrow"/>
+            <rowspec value=3D"top:3dlu:noGrow"/>
+            <rowspec value=3D"center:max(d;4px):noGrow"/>
+            <rowspec value=3D"top:3dlu:noGrow"/>
+            <rowspec value=3D"center:max(d;4px):noGrow"/>
+            <rowspec value=3D"top:3dlu:noGrow"/>
+            <rowspec value=3D"center:max(d;4px):noGrow"/>
+            <rowspec value=3D"top:3dlu:noGrow"/>
+            <rowspec value=3D"center:max(d;4px):noGrow"/>
+            <rowspec value=3D"top:3dlu:noGrow"/>
+            <rowspec value=3D"center:max(d;4px):noGrow"/>
+            <rowspec value=3D"top:3dlu:noGrow"/>
+            <rowspec value=3D"center:d:grow"/>
+            <rowspec value=3D"top:3dlu:noGrow"/>
+            <rowspec value=3D"center:max(d;4px):noGrow"/>
+            <rowspec value=3D"top:3dlu:noGrow"/>
+            <rowspec value=3D"center:max(d;4px):noGrow"/>
+            <rowspec value=3D"top:3dlu:noGrow"/>
+            <rowspec value=3D"center:max(d;4px):noGrow"/>
+            <rowspec value=3D"top:3dlu:noGrow"/>
+            <rowspec value=3D"center:max(d;4px):noGrow"/>
+            <rowspec value=3D"top:3dlu:noGrow"/>
+            <rowspec value=3D"center:max(d;4px):noGrow"/>
+            <rowspec value=3D"top:3dlu:noGrow"/>
+            <rowspec value=3D"center:d:grow"/>
+            <rowspec value=3D"top:3dlu:noGrow"/>
+            <rowspec value=3D"center:max(d;4px):noGrow"/>
+            <rowspec value=3D"top:3dlu:noGrow"/>
+            <rowspec value=3D"center:max(d;4px):noGrow"/>
+            <colspec value=3D"fill:d:noGrow"/>
+            <colspec value=3D"left:4dlu:noGrow"/>
+            <colspec value=3D"fill:200px:noGrow"/>
+            <colspec value=3D"left:4dlu:noGrow"/>
+            <colspec value=3D"fill:200px:grow"/>
+            <constraints>
+              <tabbedpane title=3D"Data generator" enabled=3D"false">
+                <tooltip value=3D"This tab provides you with the ability t=
o add or remove data from the cache."/>
+              </tabbedpane>
+            </constraints>
+            <properties>
+              <toolTipText value=3D""/>
+            </properties>
+            <border type=3D"none"/>
+            <children>
+              <component id=3D"236d9" class=3D"javax.swing.JLabel">
+                <constraints>
+                  <grid row=3D"2" column=3D"0" row-span=3D"1" col-span=3D"=
1" vsize-policy=3D"0" hsize-policy=3D"0" anchor=3D"8" fill=3D"0" indent=3D"=
0" use-parent-layout=3D"false"/>
+                  <forms/>
+                </constraints>
+                <properties>
+                  <labelFor value=3D"fc98"/>
+                  <text value=3D"Fqn"/>
+                </properties>
+              </component>
+              <component id=3D"7917a" class=3D"javax.swing.JLabel">
+                <constraints>
+                  <grid row=3D"4" column=3D"0" row-span=3D"1" col-span=3D"=
1" vsize-policy=3D"0" hsize-policy=3D"0" anchor=3D"8" fill=3D"0" indent=3D"=
0" use-parent-layout=3D"false"/>
+                  <forms/>
+                </constraints>
+                <properties>
+                  <labelFor value=3D"4e02"/>
+                  <text value=3D"Key"/>
+                </properties>
+              </component>
+              <component id=3D"b834" class=3D"javax.swing.JLabel">
+                <constraints>
+                  <grid row=3D"6" column=3D"0" row-span=3D"1" col-span=3D"=
1" vsize-policy=3D"0" hsize-policy=3D"0" anchor=3D"8" fill=3D"0" indent=3D"=
0" use-parent-layout=3D"false"/>
+                  <forms/>
+                </constraints>
+                <properties>
+                  <labelFor value=3D"5eb9b"/>
+                  <text value=3D"Value"/>
+                </properties>
+              </component>
+              <component id=3D"fc98" class=3D"javax.swing.JTextField" bind=
ing=3D"fqnTextField" default-binding=3D"true">
+                <constraints>
+                  <grid row=3D"2" column=3D"2" row-span=3D"1" col-span=3D"=
1" vsize-policy=3D"0" hsize-policy=3D"6" anchor=3D"8" fill=3D"1" indent=3D"=
0" use-parent-layout=3D"false">
+                    <preferred-size width=3D"150" height=3D"-1"/>
+                  </grid>
+                  <forms defaultalign-horz=3D"false"/>
+                </constraints>
+                <properties/>
+              </component>
+              <component id=3D"4e02" class=3D"javax.swing.JTextField" bind=
ing=3D"keyTextField" default-binding=3D"true">
+                <constraints>
+                  <grid row=3D"4" column=3D"2" row-span=3D"1" col-span=3D"=
1" vsize-policy=3D"0" hsize-policy=3D"6" anchor=3D"8" fill=3D"1" indent=3D"=
0" use-parent-layout=3D"false">
+                    <preferred-size width=3D"150" height=3D"-1"/>
+                  </grid>
+                  <forms defaultalign-horz=3D"false"/>
+                </constraints>
+                <properties/>
+              </component>
+              <component id=3D"ca2af" class=3D"javax.swing.JRadioButton" b=
inding=3D"createNodeRadioButton" default-binding=3D"true">
+                <constraints>
+                  <grid row=3D"8" column=3D"2" row-span=3D"1" col-span=3D"=
1" vsize-policy=3D"0" hsize-policy=3D"3" anchor=3D"8" fill=3D"0" indent=3D"=
0" use-parent-layout=3D"false"/>
+                  <forms/>
+                </constraints>
+                <properties>
+                  <selected value=3D"true"/>
+                  <text value=3D"&amp;Create Node"/>
+                </properties>
+              </component>
+              <component id=3D"e9453" class=3D"javax.swing.JRadioButton" b=
inding=3D"removeNodeRadioButton" default-binding=3D"true">
+                <constraints>
+                  <grid row=3D"10" column=3D"2" row-span=3D"1" col-span=3D=
"1" vsize-policy=3D"0" hsize-policy=3D"3" anchor=3D"8" fill=3D"0" indent=3D=
"0" use-parent-layout=3D"false"/>
+                  <forms/>
+                </constraints>
+                <properties>
+                  <text value=3D"&amp;Remove Node"/>
+                </properties>
+              </component>
+              <component id=3D"11f60" class=3D"javax.swing.JButton" bindin=
g=3D"goButton" default-binding=3D"true">
+                <constraints>
+                  <grid row=3D"12" column=3D"2" row-span=3D"1" col-span=3D=
"1" vsize-policy=3D"0" hsize-policy=3D"3" anchor=3D"8" fill=3D"0" indent=3D=
"0" use-parent-layout=3D"false"/>
+                  <forms defaultalign-horz=3D"false"/>
+                </constraints>
+                <properties>
+                  <text value=3D"&amp;Go"/>
+                </properties>
+              </component>
+              <component id=3D"f9bf" class=3D"javax.swing.JRadioButton" bi=
nding=3D"addKeyRadioButton" default-binding=3D"true">
+                <constraints>
+                  <grid row=3D"8" column=3D"4" row-span=3D"1" col-span=3D"=
1" vsize-policy=3D"0" hsize-policy=3D"3" anchor=3D"8" fill=3D"0" indent=3D"=
0" use-parent-layout=3D"false"/>
+                  <forms/>
+                </constraints>
+                <properties>
+                  <text value=3D"Add &amp;Key"/>
+                </properties>
+              </component>
+              <component id=3D"f2b07" class=3D"javax.swing.JRadioButton" b=
inding=3D"removeKeyRadioButton" default-binding=3D"true">
+                <constraints>
+                  <grid row=3D"10" column=3D"4" row-span=3D"1" col-span=3D=
"1" vsize-policy=3D"0" hsize-policy=3D"3" anchor=3D"8" fill=3D"0" indent=3D=
"0" use-parent-layout=3D"false"/>
+                  <forms/>
+                </constraints>
+                <properties>
+                  <text value=3D"R&amp;emove Key"/>
+                </properties>
+              </component>
+              <component id=3D"5eb9b" class=3D"javax.swing.JTextField" bin=
ding=3D"valueTextField" default-binding=3D"true">
+                <constraints>
+                  <grid row=3D"6" column=3D"2" row-span=3D"1" col-span=3D"=
1" vsize-policy=3D"0" hsize-policy=3D"6" anchor=3D"8" fill=3D"1" indent=3D"=
0" use-parent-layout=3D"false">
+                    <preferred-size width=3D"150" height=3D"-1"/>
+                  </grid>
+                  <forms defaultalign-horz=3D"false"/>
+                </constraints>
+                <properties/>
+              </component>
+              <component id=3D"24ed" class=3D"javax.swing.JLabel">
+                <constraints>
+                  <grid row=3D"0" column=3D"2" row-span=3D"1" col-span=3D"=
1" vsize-policy=3D"0" hsize-policy=3D"0" anchor=3D"8" fill=3D"0" indent=3D"=
0" use-parent-layout=3D"false"/>
+                  <forms/>
+                </constraints>
+                <properties>
+                  <font style=3D"3"/>
+                  <text value=3D"Single node manipulator"/>
+                </properties>
+              </component>
+              <component id=3D"aacea" class=3D"javax.swing.JLabel">
+                <constraints>
+                  <grid row=3D"16" column=3D"2" row-span=3D"1" col-span=3D=
"1" vsize-policy=3D"0" hsize-policy=3D"0" anchor=3D"8" fill=3D"0" indent=3D=
"0" use-parent-layout=3D"false"/>
+                  <forms/>
+                </constraints>
+                <properties>
+                  <font style=3D"3"/>
+                  <text value=3D"Multiple node generator"/>
+                </properties>
+              </component>
+              <component id=3D"bf689" class=3D"javax.swing.JSeparator">
+                <constraints>
+                  <grid row=3D"14" column=3D"2" row-span=3D"1" col-span=3D=
"1" vsize-policy=3D"6" hsize-policy=3D"6" anchor=3D"0" fill=3D"3" indent=3D=
"0" use-parent-layout=3D"false"/>
+                  <forms defaultalign-horz=3D"false" defaultalign-vert=3D"=
false"/>
+                </constraints>
+                <properties/>
+              </component>
+              <component id=3D"dbe5d" class=3D"javax.swing.JLabel">
+                <constraints>
+                  <grid row=3D"20" column=3D"0" row-span=3D"1" col-span=3D=
"1" vsize-policy=3D"0" hsize-policy=3D"0" anchor=3D"8" fill=3D"0" indent=3D=
"0" use-parent-layout=3D"false"/>
+                  <forms/>
+                </constraints>
+                <properties>
+                  <labelFor value=3D"b6c72"/>
+                  <text value=3D"Max depth"/>
+                </properties>
+              </component>
+              <component id=3D"c9835" class=3D"javax.swing.JLabel">
+                <constraints>
+                  <grid row=3D"18" column=3D"0" row-span=3D"1" col-span=3D=
"1" vsize-policy=3D"0" hsize-policy=3D"0" anchor=3D"8" fill=3D"0" indent=3D=
"0" use-parent-layout=3D"false"/>
+                  <forms/>
+                </constraints>
+                <properties>
+                  <labelFor value=3D"513f3"/>
+                  <text value=3D"Max nodes"/>
+                </properties>
+              </component>
+              <component id=3D"922d3" class=3D"javax.swing.JLabel">
+                <constraints>
+                  <grid row=3D"22" column=3D"0" row-span=3D"1" col-span=3D=
"1" vsize-policy=3D"0" hsize-policy=3D"0" anchor=3D"8" fill=3D"0" indent=3D=
"0" use-parent-layout=3D"false"/>
+                  <forms/>
+                </constraints>
+                <properties>
+                  <labelFor value=3D"3108a"/>
+                  <text value=3D"Number of keys per node"/>
+                </properties>
+              </component>
+              <component id=3D"32377" class=3D"javax.swing.JButton" bindin=
g=3D"randomGeneratorButton">
+                <constraints>
+                  <grid row=3D"24" column=3D"2" row-span=3D"1" col-span=3D=
"1" vsize-policy=3D"0" hsize-policy=3D"3" anchor=3D"8" fill=3D"0" indent=3D=
"0" use-parent-layout=3D"false"/>
+                  <forms defaultalign-horz=3D"false"/>
+                </constraints>
+                <properties>
+                  <text value=3D"Ge&amp;nerate"/>
+                </properties>
+              </component>
+              <component id=3D"513f3" class=3D"javax.swing.JTextField" bin=
ding=3D"maxNodesTextField" default-binding=3D"true">
+                <constraints>
+                  <grid row=3D"18" column=3D"2" row-span=3D"1" col-span=3D=
"1" vsize-policy=3D"0" hsize-policy=3D"6" anchor=3D"8" fill=3D"1" indent=3D=
"0" use-parent-layout=3D"false">
+                    <preferred-size width=3D"150" height=3D"-1"/>
+                  </grid>
+                  <forms defaultalign-horz=3D"false"/>
+                </constraints>
+                <properties/>
+              </component>
+              <component id=3D"b6c72" class=3D"javax.swing.JTextField" bin=
ding=3D"maxDepthTextField" default-binding=3D"true">
+                <constraints>
+                  <grid row=3D"20" column=3D"2" row-span=3D"1" col-span=3D=
"1" vsize-policy=3D"0" hsize-policy=3D"6" anchor=3D"8" fill=3D"1" indent=3D=
"0" use-parent-layout=3D"false">
+                    <preferred-size width=3D"150" height=3D"-1"/>
+                  </grid>
+                  <forms defaultalign-horz=3D"false"/>
+                </constraints>
+                <properties/>
+              </component>
+              <component id=3D"3108a" class=3D"javax.swing.JTextField" bin=
ding=3D"numberOfKeysPerTextField" default-binding=3D"true">
+                <constraints>
+                  <grid row=3D"22" column=3D"2" row-span=3D"1" col-span=3D=
"1" vsize-policy=3D"0" hsize-policy=3D"6" anchor=3D"8" fill=3D"1" indent=3D=
"0" use-parent-layout=3D"false">
+                    <preferred-size width=3D"150" height=3D"-1"/>
+                  </grid>
+                  <forms defaultalign-horz=3D"false"/>
+                </constraints>
+                <properties/>
+              </component>
+              <component id=3D"f036" class=3D"javax.swing.JSeparator">
+                <constraints>
+                  <grid row=3D"26" column=3D"2" row-span=3D"1" col-span=3D=
"1" vsize-policy=3D"6" hsize-policy=3D"6" anchor=3D"0" fill=3D"3" indent=3D=
"0" use-parent-layout=3D"false"/>
+                  <forms defaultalign-horz=3D"false" defaultalign-vert=3D"=
false"/>
+                </constraints>
+                <properties/>
+              </component>
+              <component id=3D"43cf0" class=3D"javax.swing.JButton" bindin=
g=3D"cacheClearButton">
+                <constraints>
+                  <grid row=3D"30" column=3D"2" row-span=3D"1" col-span=3D=
"1" vsize-policy=3D"0" hsize-policy=3D"3" anchor=3D"8" fill=3D"0" indent=3D=
"0" use-parent-layout=3D"false"/>
+                  <forms defaultalign-horz=3D"false"/>
+                </constraints>
+                <properties>
+                  <text value=3D"C&amp;lear cache"/>
+                </properties>
+              </component>
+              <component id=3D"dae1c" class=3D"javax.swing.JLabel">
+                <constraints>
+                  <grid row=3D"28" column=3D"2" row-span=3D"1" col-span=3D=
"1" vsize-policy=3D"0" hsize-policy=3D"0" anchor=3D"8" fill=3D"0" indent=3D=
"0" use-parent-layout=3D"false"/>
+                  <forms/>
+                </constraints>
+                <properties>
+                  <font style=3D"3"/>
+                  <text value=3D"Clear cache"/>
+                </properties>
+              </component>
+            </children>
+          </grid>
+        </children>
+      </tabbedpane>
+      <component id=3D"97005" class=3D"javax.swing.JLabel" binding=3D"cach=
eStatus">
+        <constraints>
+          <grid row=3D"4" column=3D"0" row-span=3D"1" col-span=3D"1" vsize=
-policy=3D"0" hsize-policy=3D"0" anchor=3D"8" fill=3D"0" indent=3D"0" use-p=
arent-layout=3D"false"/>
+          <forms/>
+        </constraints>
+        <properties>
+          <font style=3D"3"/>
+          <text value=3D"Initialising"/>
+          <toolTipText value=3D"Cache status"/>
+          <verticalAlignment value=3D"3"/>
+        </properties>
+      </component>
+      <component id=3D"4afab" class=3D"javax.swing.JProgressBar" binding=
=3D"cacheStatusProgressBar">
+        <constraints>
+          <grid row=3D"4" column=3D"2" row-span=3D"1" col-span=3D"1" vsize=
-policy=3D"0" hsize-policy=3D"6" anchor=3D"8" fill=3D"0" indent=3D"0" use-p=
arent-layout=3D"false"/>
+          <forms defaultalign-horz=3D"false"/>
+        </constraints>
+        <properties>
+          <indeterminate value=3D"true"/>
+          <orientation value=3D"0"/>
+        </properties>
+      </component>
+    </children>
+  </grid>
+  <buttonGroups>
+    <group name=3D"cacheFunction">
+      <member id=3D"ca2af"/>
+      <member id=3D"e9453"/>
+      <member id=3D"f9bf"/>
+      <member id=3D"f2b07"/>
+    </group>
+  </buttonGroups>
+</form>

Added: demos/core-demo-gui/trunk/src/main/java/org/jboss/cache/demo/JBossCa=
cheDemo.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- demos/core-demo-gui/trunk/src/main/java/org/jboss/cache/demo/JBossCache=
Demo.java	                        (rev 0)
+++ demos/core-demo-gui/trunk/src/main/java/org/jboss/cache/demo/JBossCache=
Demo.java	2008-01-07 02:11:53 UTC (rev 5023)
@@ -0,0 +1,728 @@
+package org.jboss.cache.demo;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.jboss.cache.Cache;
+import org.jboss.cache.CacheStatus;
+import static org.jboss.cache.CacheStatus.*;
+import org.jboss.cache.DefaultCacheFactory;
+import org.jboss.cache.Fqn;
+import org.jboss.cache.CacheSPI;
+import org.jboss.cache.Node;
+import org.jboss.cache.notifications.annotation.NodeCreated;
+import org.jboss.cache.notifications.annotation.NodeRemoved;
+import org.jboss.cache.notifications.annotation.ViewChanged;
+import org.jboss.cache.notifications.annotation.BuddyGroupChanged;
+import org.jboss.cache.notifications.event.NodeCreatedEvent;
+import org.jboss.cache.notifications.event.NodeRemovedEvent;
+import org.jboss.cache.notifications.event.ViewChangedEvent;
+import org.jboss.cache.notifications.event.BuddyGroupChangedEvent;
+import org.jgroups.Address;
+
+import javax.swing.*;
+import javax.swing.border.TitledBorder;
+import javax.swing.event.TreeSelectionEvent;
+import javax.swing.event.TreeSelectionListener;
+import javax.swing.table.AbstractTableModel;
+import javax.swing.tree.TreePath;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.*;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Random;
+import java.util.Set;
+import java.util.Date;
+import java.util.Collections;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ThreadPoolExecutor;
+import java.util.concurrent.BlockingQueue;
+import java.text.NumberFormat;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.Reader;
+import java.io.InputStreamReader;
+import java.io.BufferedReader;
+
+import com.jgoodies.forms.layout.FormLayout;
+import com.jgoodies.forms.layout.CellConstraints;
+
+/**
+ * // TODO Document this
+ *
+ * @author Manik Surtani (<a href=3D"mailto:manik(a)jboss.org">manik(a)jbo=
ss.org</a>)
+ * @since 2.1.0
+ */
+public class JBossCacheDemo
+{
+   private static Log log =3D LogFactory.getLog(JBossCacheDemo.class);
+   private static JFrame frame;
+   private JTabbedPane mainPane;
+   private JPanel panel1;
+   private JLabel cacheStatus;
+   private JPanel dataGeneratorTab;
+   private JPanel statisticsTab;
+   private JPanel clusterViewTab;
+   private JPanel dataViewTab;
+   private JPanel controlPanelTab;
+   private JTree dataTree;
+   private JTable clusterTable;
+   private JButton actionButton;
+   private JLabel configFileName;
+   private JProgressBar cacheStatusProgressBar;
+   private JTextField fqnTextField;
+   private JTextField keyTextField;
+   private JTextField valueTextField;
+   private JRadioButton createNodeRadioButton;
+   private JRadioButton removeNodeRadioButton;
+   private JRadioButton addKeyRadioButton;
+   private JRadioButton removeKeyRadioButton;
+   private JButton goButton;
+   private JTable nodeDataTable;
+   private JScrollPane nodeData;
+   private JButton randomGeneratorButton;
+   private JTextField maxNodesTextField;
+   private JTextField maxDepthTextField;
+   private JTextField numberOfKeysPerTextField;
+   private JButton cacheClearButton;
+   private JButton updateStatsButton;
+   private JLabel statsNumberOfNodes;
+   private JLabel statsNumberOfKeys;
+   private JLabel statsSizeOfCachedData;
+   private JLabel statsLastUpdated;
+   private JTextArea configFileContents;
+   private String cacheConfigFile;
+   private Cache<String, String> cache;
+   private String startCacheButtonLabel =3D "Start Cache", stopCacheButton=
Label =3D "Stop Cache";
+   private String statusStarting =3D "Starting Cache ... ", statusStarted =
=3D "Cache Running.", statusStopping =3D "Stopping Cache ...", statusStoppe=
d =3D "Cache Stopped.";
+   private ExecutorService asyncExecutor;
+   private BlockingQueue<Runnable> asyncTaskQueue;
+   private ClusterTableModel clusterDataModel;
+   private NodeDataTableModel nodeDataTableModel;
+   private DataTreeRefresher treeRefresher;
+   private Random r =3D new Random();
+
+   public static void main(String[] args)
+   {
+      String cfgFileName =3D "demo-cache-config.xml";
+      if (args.length =3D=3D 1 && args[0] !=3D null && args[0].toLowerCase=
().endsWith(".xml"))
+      {
+         // the first arg is the name of the config file.
+         cfgFileName =3D args[0];
+      }
+
+      frame =3D new JFrame("JBossCacheDemo (STOPPED)");
+      frame.setContentPane(new JBossCacheDemo(cfgFileName).panel1);
+      frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
+      frame.pack();
+      frame.setVisible(true);
+      frame.setResizable(false);
+   }
+
+   public JBossCacheDemo(String cfgFileName)
+   {
+      asyncExecutor =3D Executors.newFixedThreadPool(1);
+      asyncTaskQueue =3D ((ThreadPoolExecutor) asyncExecutor).getQueue();
+
+      cacheConfigFile =3D cfgFileName;
+      cacheStatusProgressBar.setVisible(false);
+      cacheStatusProgressBar.setEnabled(false);
+      configFileName.setText(cacheConfigFile);
+      // default state of the action button should be unstarted.
+      actionButton.setText(startCacheButtonLabel);
+      cacheStatus.setText(statusStopped);
+
+      clusterDataModel =3D new ClusterTableModel();
+      clusterTable.setModel(clusterDataModel);
+
+      nodeDataTableModel =3D new NodeDataTableModel();
+      nodeDataTable.setModel(nodeDataTableModel);
+
+      // when we start up scan the classpath for a file named
+      actionButton.addActionListener(new ActionListener()
+      {
+         public void actionPerformed(ActionEvent e)
+         {
+            if (actionButton.getText().equals(startCacheButtonLabel))
+            {
+               // start cache
+               startCache();
+            }
+            else if (actionButton.getText().equals(stopCacheButtonLabel))
+            {
+               // stop cache
+               stopCache();
+            }
+         }
+      });
+      goButton.addActionListener(new ActionListener()
+      {
+         public void actionPerformed(ActionEvent e)
+         {
+            processAction(goButton, true);
+
+            // do this in a separate thread
+            asyncExecutor.execute(new Runnable()
+            {
+               public void run()
+               {
+                  // based on the value of the radio button:
+                  if (createNodeRadioButton.isSelected())
+                  {
+                     cache.put(fqnTextField.getText(), keyTextField.getTex=
t(), valueTextField.getText());
+//               treeRefresher.addNode(Fqn.fromString(fqnTextField.getText=
()));
+                  }
+                  else if (removeNodeRadioButton.isSelected())
+                  {
+                     cache.removeNode(fqnTextField.getText());
+//               treeRefresher.removeNode(Fqn.fromString(fqnTextField.getT=
ext()));
+                  }
+                  else if (addKeyRadioButton.isSelected())
+                  {
+                     cache.put(fqnTextField.getText(), keyTextField.getTex=
t(), valueTextField.getText());
+//               treeRefresher.updateNode(Fqn.fromString(fqnTextField.getT=
ext()));
+                  }
+                  else if (removeKeyRadioButton.isSelected())
+                  {
+                     cache.remove(fqnTextField.getText(), keyTextField.get=
Text());
+//               treeRefresher.updateNode(Fqn.fromString(fqnTextField.getT=
ext()));
+                  }
+                  treeRefresher.repaint();
+                  dataViewTab.repaint();
+                  processAction(goButton, false);
+               }
+            });
+         }
+      });
+      removeNodeRadioButton.addActionListener(new ActionListener()
+      {
+         public void actionPerformed(ActionEvent e)
+         {
+            fqnTextField.setEnabled(true);
+            keyTextField.setEnabled(false);
+            valueTextField.setEnabled(false);
+         }
+      });
+      removeKeyRadioButton.addActionListener(new ActionListener()
+      {
+         public void actionPerformed(ActionEvent e)
+         {
+            fqnTextField.setEnabled(true);
+            keyTextField.setEnabled(true);
+            valueTextField.setEnabled(false);
+         }
+      });
+      createNodeRadioButton.addActionListener(new ActionListener()
+      {
+         public void actionPerformed(ActionEvent e)
+         {
+            fqnTextField.setEnabled(true);
+            keyTextField.setEnabled(true);
+            valueTextField.setEnabled(true);
+         }
+      });
+      addKeyRadioButton.addActionListener(new ActionListener()
+      {
+         public void actionPerformed(ActionEvent e)
+         {
+            fqnTextField.setEnabled(true);
+            keyTextField.setEnabled(true);
+            valueTextField.setEnabled(true);
+         }
+      });
+      dataTree.addTreeSelectionListener(new TreeSelectionListener()
+      {
+         public void valueChanged(TreeSelectionEvent e)
+         {
+            TreePath path =3D e.getPath();
+            DataTreeRefresher.FqnTreeNode node =3D (DataTreeRefresher.FqnT=
reeNode) path.getLastPathComponent();
+            Fqn f =3D node.getFqn();
+            if (!f.equals(nodeDataTableModel.getCurrentFqn()))
+            {
+               nodeDataTableModel.setCurrentFqn(f);
+               nodeDataTableModel.setData(cache.getNode(f).getData());
+            }
+         }
+      });
+      randomGeneratorButton.addActionListener(new ActionListener()
+      {
+         public void actionPerformed(ActionEvent e)
+         {
+            processAction(randomGeneratorButton, true);
+
+            // process this asynchronously
+            asyncExecutor.execute(new Runnable()
+            {
+               public void run()
+               {
+                  int depth =3D 1;
+                  try
+                  {
+                     depth =3D Integer.parseInt(maxDepthTextField.getText(=
));
+                  }
+                  catch (NumberFormatException nfe)
+                  {
+                     log.warn("Entered a non-integer for depth.  Using 1."=
, nfe);
+                  }
+
+                  int maxNodes =3D 1;
+                  try
+                  {
+                     maxNodes =3D Integer.parseInt(maxNodesTextField.getTe=
xt());
+                  }
+                  catch (NumberFormatException nfe)
+                  {
+                     log.warn("Entered a non-integer for max nodes.  Using=
 1.", nfe);
+                  }
+
+                  int attribsPerNode =3D 1;
+                  try
+                  {
+                     attribsPerNode =3D Integer.parseInt(numberOfKeysPerTe=
xtField.getText());
+                  }
+                  catch (NumberFormatException nfe)
+                  {
+                     log.warn("Entered a non-integer for keys per node.  U=
sing 1.", nfe);
+                  }
+
+                  Set<Fqn> fqns =3D new HashSet<Fqn>();
+                  for (int i =3D 0; i < maxNodes; i++)
+                  {
+                     Fqn fqn =3D createRandomFqn(depth);
+                     while (fqns.contains(fqn)) fqn =3D createRandomFqn(de=
pth);
+                     fqns.add(fqn);
+                  }
+
+                  for (Fqn f : fqns)
+                  {
+                     Map m =3D new HashMap();
+                     for (int i =3D 0; i < attribsPerNode; i++) m.put(rand=
omString(), randomString());
+                     cache.put(f, m);
+                  }
+
+                  processAction(randomGeneratorButton, false);
+               }
+            });
+         }
+
+         private Fqn createRandomFqn(int depth)
+         {
+            String s =3D "/";
+            for (int i =3D 0; i < r.nextInt(depth); i++)
+            {
+               s +=3D randomString() + "/";
+            }
+            return Fqn.fromString(s);
+         }
+
+         private String randomString()
+         {
+            return Integer.toHexString(r.nextInt(Integer.MAX_VALUE)).toUpp=
erCase();
+         }
+      });
+      cacheClearButton.addActionListener(new ActionListener()
+      {
+         public void actionPerformed(ActionEvent e)
+         {
+            processAction(cacheClearButton, true);
+            asyncExecutor.execute(new Runnable()
+            {
+               public void run()
+               {
+                  cache.removeNode(Fqn.ROOT);
+                  cache.getRoot().clearData();
+                  processAction(cacheClearButton, false);
+               }
+            });
+         }
+      });
+      updateStatsButton.addActionListener(new ActionListener()
+      {
+         public void actionPerformed(ActionEvent e)
+         {
+            processAction(updateStatsButton, true);
+            asyncExecutor.execute(new Runnable()
+            {
+               public void run()
+               {
+                  updateStats();
+                  processAction(updateStatsButton, false);
+               }
+            });
+         }
+      });
+   }
+
+   private void updateStats()
+   {
+      int numNodes =3D ((CacheSPI) cache).getNumberOfNodes();
+      statsNumberOfNodes.setText(numNodes + " nodes");
+      Map<String, Long> values =3D new HashMap<String, Long>();
+      values.put("NumKeys", 0l);
+      values.put("Size", 0l);
+      processRecursively(cache.getRoot(), values);
+      statsNumberOfKeys.setText(values.get("NumKeys") + " keys");
+      NumberFormat format =3D NumberFormat.getIntegerInstance();
+      statsSizeOfCachedData.setText(format.format(values.get("Size")) + " =
bytes");
+      statsLastUpdated.setText(new Date().toString());
+   }
+
+   private void processRecursively(Node<String, String> node, Map<String, =
Long> values)
+   {
+      // process children first
+      for (Node child : node.getChildren())
+      {
+         processRecursively(child, values);
+      }
+      // now process current node
+      Map data =3D node.getData();
+      values.put("NumKeys", values.get("NumKeys") + data.size());
+      values.put("Size", values.get("Size") + calculateSize(data));
+   }
+
+   private int calculateSize(Map<String, String> data)
+   {
+      // since all we have are strings:
+      int size =3D 0;
+      for (String key : data.keySet())
+      {
+         size +=3D key.length();
+         size +=3D data.get(key).length();
+      }
+      return size;
+   }
+
+   private void moveCacheToState(CacheStatus state)
+   {
+      switch (state)
+      {
+         case STARTING:
+            cacheStatus.setText(statusStarting);
+            processAction(actionButton, true);
+            break;
+         case STARTED:
+            setCacheTabsStatus(true);
+            actionButton.setText(stopCacheButtonLabel);
+            processAction(actionButton, false);
+            cacheStatus.setText(statusStarted);
+            updateTitleBar();
+            break;
+         case STOPPING:
+            cacheStatus.setText(statusStopping);
+            processAction(actionButton, true);
+            break;
+         case STOPPED:
+            setCacheTabsStatus(false);
+            actionButton.setText(startCacheButtonLabel);
+            processAction(actionButton, false);
+            cacheStatus.setText(statusStopped);
+            updateTitleBar();
+      }
+      controlPanelTab.repaint();
+   }
+
+   private void processAction(JButton button, boolean start)
+   {
+      button.setEnabled(!start);
+      cacheStatusProgressBar.setVisible(start);
+      cacheStatusProgressBar.setEnabled(start);
+   }
+
+   private String readContents(InputStream is) throws IOException
+   {
+      BufferedReader r =3D new BufferedReader(new InputStreamReader(is));
+      String s;
+      StringBuilder sb =3D new StringBuilder();
+      while ((s =3D r.readLine()) !=3D null)
+      {
+         sb.append(s);
+         sb.append("\n");
+      }
+      return sb.toString();
+   }
+
+   private void startCache()
+   {
+      moveCacheToState(STARTING);
+
+      // actually start the cache asynchronously.
+      asyncExecutor.execute(new Runnable()
+      {
+         public void run()
+         {
+            if (cache =3D=3D null)
+            {
+               URL resource =3D getClass().getClassLoader().getResource(ca=
cheConfigFile);
+               String contents;
+               // update config file display
+               if (resource !=3D null)
+               {
+                  configFileName.setText(resource.toString());
+               }
+               else
+               {
+                  configFileName.setText(cacheConfigFile);
+               }
+               configFileName.repaint();
+
+               try
+               {
+                  configFileContents.setText(readContents(resource =3D=3D =
null ? new FileInputStream(cacheConfigFile) : resource.openStream()));
+               }
+               catch (Exception e)
+               {
+                  log.warn("Unable to open config file for display", e);
+               }
+               configFileContents.repaint();
+
+               cache =3D new DefaultCacheFactory().createCache(cacheConfig=
File);
+            }
+            else
+            {
+               cache.start();
+            }
+
+            updateClusterTable(cache.getMembers());
+            treeRefresher =3D new DataTreeRefresher(dataTree, cache, nodeD=
ataTableModel);
+            cache.addCacheListener(new CacheListener());
+            moveCacheToState(STARTED);
+         }
+      });
+   }
+
+   private void stopCache()
+   {
+      moveCacheToState(CacheStatus.STOPPING);
+      // actually stop the cache asynchronously
+      asyncExecutor.execute(new Runnable()
+      {
+         public void run()
+         {
+            if (cache !=3D null) cache.stop();
+            moveCacheToState(STOPPED);
+         }
+      });
+   }
+
+   private void setCacheTabsStatus(boolean enabled)
+   {
+      int numTabs =3D mainPane.getTabCount();
+      for (int i =3D 1; i < numTabs; i++) mainPane.setEnabledAt(i, enabled=
);
+      panel1.repaint();
+   }
+
+   private void updateClusterTable(List<Address> members)
+   {
+      log.debug("Updating cluster table with new member list " + members);
+      clusterDataModel.setMembers(members);
+      updateTitleBar();
+   }
+
+   private void updateTitleBar()
+   {
+      String title =3D "JBossCacheDemo";
+      if (cache !=3D null && cache.getCacheStatus() =3D=3D STARTED)
+      {
+         title +=3D " (STARTED) " + cache.getLocalAddress() + " Cluster si=
ze: " + cache.getMembers().size();
+      }
+      else
+      {
+         title +=3D " (STOPPED)";
+      }
+      frame.setTitle(title);
+   }
+
+   @org.jboss.cache.notifications.annotation.CacheListener
+   public class CacheListener
+   {
+      @ViewChanged
+      public void viewChangeEvent(ViewChangedEvent e)
+      {
+         updateClusterTable(e.getNewView().getMembers());
+      }
+
+      @BuddyGroupChanged
+      public void buddyGroupChanged(BuddyGroupChangedEvent e)
+      {
+         clusterDataModel.setBuddies();
+      }
+
+      @NodeCreated
+      public void nodeCreated(NodeCreatedEvent e)
+      {
+         if (!e.isPre())
+         {
+            final Fqn fqn =3D e.getFqn();
+            asyncExecutor.execute(new Runnable()
+            {
+               public void run()
+               {
+                  treeRefresher.addNode(fqn);
+                  // only refresh if there are no more tasks queued up
+                  if (asyncTaskQueue.isEmpty()) treeRefresher.repaint();
+               }
+            });
+         }
+      }
+
+      @NodeRemoved
+      public void nodeRemoved(NodeRemovedEvent e)
+      {
+         if (!e.isPre())
+         {
+            final Fqn fqn =3D e.getFqn();
+            asyncExecutor.execute(new Runnable()
+            {
+               public void run()
+               {
+                  treeRefresher.removeNode(fqn);
+                  // only refresh if there are no more tasks queued up
+                  if (asyncTaskQueue.isEmpty()) treeRefresher.repaint();
+               }
+            });
+         }
+      }
+
+      // dont bother with node modified events since the tree GUI widget w=
ill refresh each node when it is selected.
+   }
+
+   public class ClusterTableModel extends AbstractTableModel
+   {
+      List<Address> members =3D new ArrayList<Address>();
+      List<String> memberStates =3D new ArrayList<String>();
+
+      public void setMembers(List<Address> members)
+      {
+         if (this.members !=3D members)
+         {
+            this.members.clear();
+            this.members.addAll(members);
+         }
+
+         CacheSPI spi =3D (CacheSPI) cache;
+
+         List<Address> buddies =3D Collections.emptyList();
+         if (spi.getBuddyManager() !=3D null)
+         {
+            buddies =3D spi.getBuddyManager().getBuddyAddresses();
+            log.debug("Buddy addresses: " + buddies);
+         }
+
+         memberStates =3D new ArrayList<String>(members.size());
+         for (Address a : members)
+         {
+            String extraInfo =3D "Member";
+            // if this is the first member then this is the coordinator
+            if (memberStates.isEmpty()) extraInfo +=3D " (coord)";
+            if (a.equals(cache.getLocalAddress()))
+               extraInfo +=3D " (me)";
+            else if (buddies.contains(a))
+               extraInfo +=3D " (buddy)";
+            memberStates.add(extraInfo);
+         }
+
+         fireTableDataChanged();
+      }
+
+      public void setBuddies()
+      {
+         setMembers(members);
+      }
+
+      public int getRowCount()
+      {
+         return members.size();
+      }
+
+      public int getColumnCount()
+      {
+         return 2;
+      }
+
+      public Object getValueAt(int rowIndex, int columnIndex)
+      {
+         switch (columnIndex)
+         {
+            case 0:
+               return members.get(rowIndex);
+            case 1:
+               return memberStates.get(rowIndex);
+         }
+         return "NULL!";
+      }
+
+      public String getColumnName(int c)
+      {
+         if (c =3D=3D 0) return "Member Address";
+         if (c =3D=3D 1) return "Member Info";
+         return "NULL!";
+      }
+   }
+
+   public class NodeDataTableModel extends AbstractTableModel
+   {
+      String[] keys =3D {};
+      String[] values =3D {};
+      private Fqn currentFqn;
+
+      public void setData(Map<String, String> data)
+      {
+         keys =3D new String[data.size()];
+         values =3D new String[data.size()];
+         int i =3D 0;
+         for (String key : data.keySet())
+         {
+            keys[i] =3D key;
+            values[i] =3D data.get(key);
+            i++;
+         }
+
+         fireTableDataChanged();
+      }
+
+      public int getRowCount()
+      {
+         return keys.length;
+      }
+
+      public int getColumnCount()
+      {
+         return 2;
+      }
+
+      public Object getValueAt(int rowIndex, int columnIndex)
+      {
+         switch (columnIndex)
+         {
+            case 0:
+               return keys[rowIndex];
+            case 1:
+               return values[rowIndex];
+         }
+         return "NULL!";
+      }
+
+      public String getColumnName(int c)
+      {
+         if (c =3D=3D 0) return "Key";
+         if (c =3D=3D 1) return "Value";
+         return "NULL!";
+      }
+
+      public Fqn getCurrentFqn()
+      {
+         return currentFqn;
+      }
+
+      public void setCurrentFqn(Fqn currentFqn)
+      {
+         this.currentFqn =3D currentFqn;
+      }
+   }
+}

Added: demos/core-demo-gui/trunk/src/main/resources/bin/run.sh
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- demos/core-demo-gui/trunk/src/main/resources/bin/run.sh	               =
         (rev 0)
+++ demos/core-demo-gui/trunk/src/main/resources/bin/run.sh	2008-01-07 02:1=
1:53 UTC (rev 5023)
@@ -0,0 +1,11 @@
+#!/bin/bash
+
+CP=3D./etc/
+
+for i in lib/*.jar ; do
+   CP=3D${i}:${CP}
+done
+
+CP=3Djbosscache-demo.jar:${CP}
+
+java -cp ${CP} org.jboss.cache.demo.JBossCacheDemo ${*}


Property changes on: demos/core-demo-gui/trunk/src/main/resources/bin/run.sh
___________________________________________________________________
Name: svn:executable
   + *

Added: demos/core-demo-gui/trunk/src/main/resources/demo-cache-config.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- demos/core-demo-gui/trunk/src/main/resources/demo-cache-config.xml	    =
                    (rev 0)
+++ demos/core-demo-gui/trunk/src/main/resources/demo-cache-config.xml	2008=
-01-07 02:11:53 UTC (rev 5023)
@@ -0,0 +1,211 @@
+<?xml version=3D"1.0" encoding=3D"UTF-8"?>
+
+<!-- =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D -->
+<!--                                                                      =
 -->
+<!--  Sample TreeCache Service Configuration                              =
 -->
+<!--                                                                      =
 -->
+<!-- =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D -->
+
+<server>
+
+   <!-- =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D -->
+   <!-- Defines TreeCache configuration                                   =
   -->
+   <!-- =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D -->
+
+   <mbean code=3D"org.jboss.cache.jmx.CacheJmxWrapper"
+          name=3D"jboss.cache:service=3DTreeCache">
+
+      <depends>jboss:service=3DNaming</depends>
+      <depends>jboss:service=3DTransactionManager</depends>
+
+      <!--
+          Configure the TransactionManager
+      -->
+      <attribute name=3D"TransactionManagerLookupClass">org.jboss.cache.tr=
ansaction.GenericTransactionManagerLookup
+      </attribute>
+
+      <!--
+          Isolation level : SERIALIZABLE
+                            REPEATABLE_READ (default)
+                            READ_COMMITTED
+                            READ_UNCOMMITTED
+                            NONE
+      -->
+      <attribute name=3D"IsolationLevel">REPEATABLE_READ</attribute>
+
+      <!--
+           Valid modes are LOCAL
+                           REPL_ASYNC
+                           REPL_SYNC
+                           INVALIDATION_ASYNC
+                           INVALIDATION_SYNC
+      -->
+      <attribute name=3D"CacheMode">REPL_SYNC</attribute>
+
+      <!--
+      Just used for async repl: use a replication queue
+      -->
+      <attribute name=3D"UseReplQueue">false</attribute>
+
+      <!--
+          Replication interval for replication queue (in ms)
+      -->
+      <attribute name=3D"ReplQueueInterval">0</attribute>
+
+      <!--
+          Max number of elements which trigger replication
+      -->
+      <attribute name=3D"ReplQueueMaxElements">0</attribute>
+
+      <!-- Name of cluster. Needs to be the same for all TreeCache nodes i=
n a
+           cluster in order to find each other.
+      -->
+      <attribute name=3D"ClusterName">JBossCache-Cluster</attribute>
+
+      <!--Uncomment next three statements to enable JGroups multiplexer.
+This configuration is dependent on the JGroups multiplexer being
+registered in an MBean server such as JBossAS.  -->
+      <!--
+      <depends>jgroups.mux:name=3DMultiplexer</depends>
+      <attribute name=3D"MultiplexerService">jgroups.mux:name=3DMultiplexe=
r</attribute>
+      <attribute name=3D"MultiplexerStack">fc-fast-minimalthreads</attribu=
te>
+      -->
+
+      <!-- JGroups protocol stack properties.
+         ClusterConfig isn't used if the multiplexer is enabled and succes=
sfully initialized.
+      -->
+      <attribute name=3D"ClusterConfig">
+         <config>
+            <UDP mcast_addr=3D"228.10.10.10"
+                 mcast_port=3D"45588"
+                 tos=3D"8"
+                 ucast_recv_buf_size=3D"20000000"
+                 ucast_send_buf_size=3D"640000"
+                 mcast_recv_buf_size=3D"25000000"
+                 mcast_send_buf_size=3D"640000"
+                 loopback=3D"false"
+                 discard_incompatible_packets=3D"true"
+                 max_bundle_size=3D"64000"
+                 max_bundle_timeout=3D"30"
+                 use_incoming_packet_handler=3D"true"
+                 ip_ttl=3D"2"
+                 enable_bundling=3D"false"
+                 enable_diagnostics=3D"true"
+
+                 use_concurrent_stack=3D"true"
+
+                 thread_naming_pattern=3D"pl"
+
+                 thread_pool.enabled=3D"true"
+                 thread_pool.min_threads=3D"1"
+                 thread_pool.max_threads=3D"25"
+                 thread_pool.keep_alive_time=3D"30000"
+                 thread_pool.queue_enabled=3D"true"
+                 thread_pool.queue_max_size=3D"10"
+                 thread_pool.rejection_policy=3D"Run"
+
+                 oob_thread_pool.enabled=3D"true"
+                 oob_thread_pool.min_threads=3D"1"
+                 oob_thread_pool.max_threads=3D"4"
+                 oob_thread_pool.keep_alive_time=3D"10000"
+                 oob_thread_pool.queue_enabled=3D"true"
+                 oob_thread_pool.queue_max_size=3D"10"
+                 oob_thread_pool.rejection_policy=3D"Run"/>
+
+            <PING timeout=3D"2000" num_initial_members=3D"3"/>
+            <MERGE2 max_interval=3D"30000" min_interval=3D"10000"/>
+            <FD_SOCK/>
+            <FD timeout=3D"10000" max_tries=3D"5" shun=3D"true"/>
+            <VERIFY_SUSPECT timeout=3D"1500"/>
+            <pbcast.NAKACK use_mcast_xmit=3D"false" gc_lag=3D"0"
+                           retransmit_timeout=3D"300,600,1200,2400,4800"
+                           discard_delivered_msgs=3D"true"/>
+            <UNICAST timeout=3D"300,600,1200,2400,3600"/>
+            <pbcast.STABLE stability_delay=3D"1000" desired_avg_gossip=3D"=
50000"
+                           max_bytes=3D"400000"/>
+            <pbcast.GMS print_local_addr=3D"true" join_timeout=3D"5000" sh=
un=3D"false"
+                        view_bundling=3D"true" view_ack_collection_timeout=
=3D"5000"/>
+            <FRAG2 frag_size=3D"60000"/>
+            <pbcast.STREAMING_STATE_TRANSFER use_reading_thread=3D"true"/>
+            <!-- <pbcast.STATE_TRANSFER/> -->
+            <pbcast.FLUSH timeout=3D"0"/>
+         </config>
+      </attribute>
+
+
+      <!--
+       Whether or not to fetch state on joining a cluster
+       NOTE this used to be called FetchStateOnStartup and has been rename=
d to be more descriptive.
+      -->
+      <attribute name=3D"FetchInMemoryState">true</attribute>
+
+      <!--
+          The max amount of time (in milliseconds) we wait until the
+          state (ie. the contents of the cache) are retrieved from
+          existing members in a clustered environment
+      -->
+      <attribute name=3D"StateRetrievalTimeout">15000</attribute>
+
+      <!--
+          Number of milliseconds to wait until all responses for a
+          synchronous call have been received.
+      -->
+      <attribute name=3D"SyncReplTimeout">15000</attribute>
+
+      <!-- Max number of milliseconds to wait for a lock acquisition -->
+      <attribute name=3D"LockAcquisitionTimeout">10000</attribute>
+
+         <!-- Buddy Replication config -->
+      <attribute name=3D"BuddyReplicationConfig">
+         <config>
+            <buddyReplicationEnabled>true</buddyReplicationEnabled>
+            <!-- these are the default values anyway -->
+            <buddyLocatorClass>org.jboss.cache.buddyreplication.NextMember=
BuddyLocator</buddyLocatorClass>
+            <!-- numBuddies is the number of backup nodes each node mainta=
ins.  ignoreColocatedBuddies means that
+                 each node will *try* to select a buddy on a different phy=
sical host.  If not able to do so though,
+                 it will fall back to colocated nodes. -->
+            <buddyLocatorProperties>
+               numBuddies =3D 1
+               ignoreColocatedBuddies =3D true
+            </buddyLocatorProperties>
+
+            <!-- A way to specify a preferred replication group.  If speci=
fied, we try and pick a buddy why shares
+                 the same pool name (falling back to other buddies if not =
available).  This allows the sysdmin to hint at
+                 backup buddies are picked, so for example, nodes may be h=
inted topick buddies on a different physical rack
+                 or power supply for added fault tolerance.  -->
+            <buddyPoolName>myBuddyPoolReplicationGroup</buddyPoolName>
+
+            <!-- communication timeout for inter-buddy group organisation =
messages (such as assigning to and removing
+                 from groups -->
+            <buddyCommunicationTimeout>2000</buddyCommunicationTimeout>
+
+            <!-- the following three elements, all relating to data gravit=
ation, default to false -->
+            <!-- Should data gravitation be attempted whenever there is a =
cache miss on finding a node?
+                  If false, data will only be gravitated if an Option is s=
et enabling it -->
+            <autoDataGravitation>false</autoDataGravitation>
+
+            <!-- removes data on remote caches' trees and backup subtrees =
when gravitated to a new data owner -->
+            <dataGravitationRemoveOnFind>true</dataGravitationRemoveOnFind>
+
+            <!-- search backup subtrees as well for data when gravitating.=
  Results in backup nodes being able to
+                 answer data gravitation requests. -->
+            <dataGravitationSearchBackupTrees>true</dataGravitationSearchB=
ackupTrees>
+         </config>
+      </attribute>
+
+      <!--
+         Indicate whether to use region based marshalling or not. Set this=
 to true if you are running under a scoped
+         class loader, e.g., inside an application server. Default is "fal=
se".
+      -->
+      <attribute name=3D"UseRegionBasedMarshalling">false</attribute>
+   </mbean>
+
+
+   <!--  Uncomment to get a graphical view of the TreeCache MBean above -->
+   <!--   <mbean code=3D"org.jboss.cache.TreeCacheView" name=3D"jboss.cach=
e:service=3DTreeCacheView">-->
+   <!--      <depends>jboss.cache:service=3DTreeCache</depends>-->
+   <!--      <attribute name=3D"CacheService">jboss.cache:service=3DTreeCa=
che</attribute>-->
+   <!--   </mbean>-->
+
+
+</server>

Added: demos/core-demo-gui/trunk/src/main/resources/log4j.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- demos/core-demo-gui/trunk/src/main/resources/log4j.xml	                =
        (rev 0)
+++ demos/core-demo-gui/trunk/src/main/resources/log4j.xml	2008-01-07 02:11=
:53 UTC (rev 5023)
@@ -0,0 +1,90 @@
+<?xml version=3D"1.0" encoding=3D"UTF-8"?>
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
+
+<!-- =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D -->
+<!--                                                                      =
 -->
+<!--  Log4j Configuration                                                 =
 -->
+<!--                                                                      =
 -->
+<!-- =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D -->
+
+<!-- $Id: log4j.xml 4661 2007-10-22 12:00:07Z manik.surtani(a)jboss.com $ =
-->
+
+<!--
+   | For more configuration infromation and examples see the Jakarta Log4j
+   | owebsite: http://jakarta.apache.org/log4j
+ -->
+
+<log4j:configuration xmlns:log4j=3D"http://jakarta.apache.org/log4j/" debu=
g=3D"false">
+
+   <!-- =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D -->
+   <!-- Preserve messages in a local file -->
+   <!-- =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D -->
+
+   <!-- A time/date based rolling appender -->
+   <appender name=3D"FILE" class=3D"org.apache.log4j.DailyRollingFileAppen=
der">
+      <param name=3D"File" value=3D"output/jbosscache.log"/>
+      <param name=3D"Append" value=3D"true"/>
+
+      <!-- Rollover at midnight each day -->
+      <param name=3D"DatePattern" value=3D"'.'yyyy-MM-dd"/>
+
+      <!-- Rollover at the top of each hour
+      <param name=3D"DatePattern" value=3D"'.'yyyy-MM-dd-HH"/>
+      -->
+      <param name=3D"Threshold" value=3D"DEBUG"/>
+
+      <layout class=3D"org.apache.log4j.PatternLayout">
+         <!-- The default pattern: Date Priority [Category] Message\n -->
+         <param name=3D"ConversionPattern" value=3D"%d %-5p [%c] (%t) %m%n=
"/>
+
+         <!-- The full pattern: Date MS Priority [Category] (Thread:NDC) M=
essage\n
+        <param name=3D"ConversionPattern" value=3D"%d %-5r %-5p [%c] (%t:%=
x) %m%n"/>
+         -->
+      </layout>
+   </appender>
+
+   <!-- =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D -->
+   <!-- Append messages to the console -->
+   <!-- =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D -->
+
+   <appender name=3D"CONSOLE" class=3D"org.apache.log4j.ConsoleAppender">
+      <param name=3D"Threshold" value=3D"TRACE"/>
+      <param name=3D"Target" value=3D"System.out"/>
+
+      <layout class=3D"org.apache.log4j.PatternLayout">
+         <!-- The default pattern: Date Priority [Category] Message\n -->
+         <param name=3D"ConversionPattern" value=3D"%d %-5p [%c{1}] (%t) %=
m%n"/>
+      </layout>
+   </appender>
+
+
+   <!-- =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D -->
+   <!-- Limit categories -->
+   <!-- =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D -->
+
+   <category name=3D"org.jboss.cache.demo">
+      <priority value=3D"WARN"/>
+   </category>
+
+   <category name=3D"org.jboss.cache">
+      <priority value=3D"WARN"/>
+   </category>
+
+   <category name=3D"org.jboss">
+      <priority value=3D"WARN"/>
+   </category>
+
+   <category name=3D"org.jgroups">
+      <priority value=3D"WARN"/>
+   </category>
+
+   <!-- =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D -->
+   <!-- Setup the Root category -->
+   <!-- =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D -->
+
+   <root>
+      <appender-ref ref=3D"CONSOLE"/>
+      <!--<appender-ref ref=3D"FILE"/>-->
+   </root>
+
+</log4j:configuration>


--===============5023430879122990535==--

From jbosscache-commits at lists.jboss.org Sun Jan  6 21:14:05 2008
Content-Type: multipart/mixed; boundary="===============4485262706171500090=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r5024 - in
 demos/core-demo-gui/trunk: src/main/java/org/jboss/cache/demo and 1 other
 directory.
Date: Sun, 06 Jan 2008 21:14:05 -0500
Message-ID: <E1JBhV7-0001LK-Ot@committer01.frg.pub.inap.atl.jboss.com>

--===============4485262706171500090==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: manik.surtani(a)jboss.com
Date: 2008-01-06 21:14:05 -0500 (Sun, 06 Jan 2008)
New Revision: 5024

Modified:
   demos/core-demo-gui/trunk/pom.xml
   demos/core-demo-gui/trunk/src/main/java/org/jboss/cache/demo/DataTreeRef=
resher.java
   demos/core-demo-gui/trunk/src/main/java/org/jboss/cache/demo/JBossCacheD=
emo.java
Log:


Modified: demos/core-demo-gui/trunk/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- demos/core-demo-gui/trunk/pom.xml	2008-01-07 02:11:53 UTC (rev 5023)
+++ demos/core-demo-gui/trunk/pom.xml	2008-01-07 02:14:05 UTC (rev 5024)
@@ -13,7 +13,7 @@
    </parent>
    <groupId>org.jboss.cache</groupId>
    <artifactId>jbosscache-demo</artifactId>
-   <version>${jbosscache-core-version}</version>
+   <version>1.0-SNAPSHOT</version>
    <name>JBoss Cache - Core Edition GUI Demo</name>
    <description>JBoss Cache - Core Edition GUI Demo</description>
    <packaging>jar</packaging>
@@ -75,8 +75,6 @@
                <failOnError>true</failOnError>
             </configuration>
          </plugin>
-
-
       </plugins>
    </build>
 =


Modified: demos/core-demo-gui/trunk/src/main/java/org/jboss/cache/demo/Data=
TreeRefresher.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- demos/core-demo-gui/trunk/src/main/java/org/jboss/cache/demo/DataTreeRe=
fresher.java	2008-01-07 02:11:53 UTC (rev 5023)
+++ demos/core-demo-gui/trunk/src/main/java/org/jboss/cache/demo/DataTreeRe=
fresher.java	2008-01-07 02:14:05 UTC (rev 5024)
@@ -20,10 +20,7 @@
 import java.util.concurrent.ConcurrentHashMap;
 =

 /**
- * // TODO Document this
- *
  * @author Manik Surtani (<a href=3D"mailto:manik(a)jboss.org">manik(a)jbo=
ss.org</a>)
- * @since 2.1.0
  */
 public class DataTreeRefresher
 {

Modified: demos/core-demo-gui/trunk/src/main/java/org/jboss/cache/demo/JBos=
sCacheDemo.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- demos/core-demo-gui/trunk/src/main/java/org/jboss/cache/demo/JBossCache=
Demo.java	2008-01-07 02:11:53 UTC (rev 5023)
+++ demos/core-demo-gui/trunk/src/main/java/org/jboss/cache/demo/JBossCache=
Demo.java	2008-01-07 02:14:05 UTC (rev 5024)
@@ -54,10 +54,7 @@
 import com.jgoodies.forms.layout.CellConstraints;
 =

 /**
- * // TODO Document this
- *
  * @author Manik Surtani (<a href=3D"mailto:manik(a)jboss.org">manik(a)jbo=
ss.org</a>)
- * @since 2.1.0
  */
 public class JBossCacheDemo
 {
@@ -117,7 +114,7 @@
          cfgFileName =3D args[0];
       }
 =

-      frame =3D new JFrame("JBossCacheDemo (STOPPED)");
+      frame =3D new JFrame("JBoss Cache GUI Demo (STOPPED)");
       frame.setContentPane(new JBossCacheDemo(cfgFileName).panel1);
       frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
       frame.pack();
@@ -526,7 +523,7 @@
 =

    private void updateTitleBar()
    {
-      String title =3D "JBossCacheDemo";
+      String title =3D "JBoss Cache GUI Demo";
       if (cache !=3D null && cache.getCacheStatus() =3D=3D STARTED)
       {
          title +=3D " (STARTED) " + cache.getLocalAddress() + " Cluster si=
ze: " + cache.getMembers().size();


--===============4485262706171500090==--

From jbosscache-commits at lists.jboss.org Sun Jan  6 21:16:42 2008
Content-Type: multipart/mixed; boundary="===============5926360467503390017=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r5025 -
 demos/core-demo-gui/trunk/src/main/java/org/jboss/cache/demo.
Date: Sun, 06 Jan 2008 21:16:42 -0500
Message-ID: <E1JBhXe-0002Du-2C@committer01.frg.pub.inap.atl.jboss.com>

--===============5926360467503390017==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: manik.surtani(a)jboss.com
Date: 2008-01-06 21:16:41 -0500 (Sun, 06 Jan 2008)
New Revision: 5025

Modified:
   demos/core-demo-gui/trunk/src/main/java/org/jboss/cache/demo/JBossCacheD=
emo.form
Log:
Changed form title

Modified: demos/core-demo-gui/trunk/src/main/java/org/jboss/cache/demo/JBos=
sCacheDemo.form
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- demos/core-demo-gui/trunk/src/main/java/org/jboss/cache/demo/JBossCache=
Demo.form	2008-01-07 02:14:05 UTC (rev 5024)
+++ demos/core-demo-gui/trunk/src/main/java/org/jboss/cache/demo/JBossCache=
Demo.form	2008-01-07 02:16:41 UTC (rev 5025)
@@ -13,7 +13,7 @@
       <xy x=3D"20" y=3D"20" width=3D"918" height=3D"661"/>
     </constraints>
     <properties/>
-    <border type=3D"line" title=3D"JBoss Cache Demo Application">
+    <border type=3D"line" title=3D"JBoss Cache GUI Demo Application">
       <font size=3D"14" style=3D"3"/>
       <title-color color=3D"-16750951"/>
       <color color=3D"-16750951"/>


--===============5926360467503390017==--

From jbosscache-commits at lists.jboss.org Sun Jan  6 21:18:01 2008
Content-Type: multipart/mixed; boundary="===============2960190657622012418=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r5026 -
 demos/core-demo-gui/trunk.
Date: Sun, 06 Jan 2008 21:18:01 -0500
Message-ID: <E1JBhYv-0002Hy-Hh@committer01.frg.pub.inap.atl.jboss.com>

--===============2960190657622012418==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: manik.surtani(a)jboss.com
Date: 2008-01-06 21:18:01 -0500 (Sun, 06 Jan 2008)
New Revision: 5026

Modified:
   demos/core-demo-gui/trunk/README.txt
Log:
Updated URL

Modified: demos/core-demo-gui/trunk/README.txt
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- demos/core-demo-gui/trunk/README.txt	2008-01-07 02:16:41 UTC (rev 5025)
+++ demos/core-demo-gui/trunk/README.txt	2008-01-07 02:18:01 UTC (rev 5026)
@@ -11,7 +11,7 @@
 * Building the demo
 -------------------
 =

-You need to use Maven 2 to build the demo from sources.  Simply check out =
the sources for the demo from http://anonsvn.jboss.org/repos/jbosscache/dem=
o/trunk
+You need to use Maven 2 to build the demo from sources.  Simply check out =
the sources for the demo from http://anonsvn.jboss.org/repos/jbosscache/dem=
os/core-demo-gui/trunk
 and build using "mvn clean install", which will generate the ZIP distribut=
ion in "target/distribution"
 =

 * Developing the demo


--===============2960190657622012418==--

From jbosscache-commits at lists.jboss.org Sun Jan  6 21:27:01 2008
Content-Type: multipart/mixed; boundary="===============5641879824087903393=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r5027 -
 demos/core-demo-gui/trunk.
Date: Sun, 06 Jan 2008 21:27:01 -0500
Message-ID: <E1JBhhd-0004Bs-DE@committer01.frg.pub.inap.atl.jboss.com>

--===============5641879824087903393==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: manik.surtani(a)jboss.com
Date: 2008-01-06 21:27:01 -0500 (Sun, 06 Jan 2008)
New Revision: 5027

Modified:
   demos/core-demo-gui/trunk/README.txt
Log:
Updated README

Modified: demos/core-demo-gui/trunk/README.txt
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- demos/core-demo-gui/trunk/README.txt	2008-01-07 02:18:01 UTC (rev 5026)
+++ demos/core-demo-gui/trunk/README.txt	2008-01-07 02:27:01 UTC (rev 5027)
@@ -4,9 +4,10 @@
 ------------------
 =

 To run the demo, all you need is a Java 5 compliant JVM.  All dependencies=
 are packaged in the demo ZIP file, which
-can be downloaded from http://www.jbosscache.org
+can be downloaded from http://snapshots.jboss.org/maven2/org/jboss/cache/j=
bosscache-demo/1.0-SNAPSHOT/
 =

-Simply unzip the demo distribution and use the "run.sh" shell script to la=
unch the demo GUI.
+Simply unzip the demo distribution and use the "run.sh" shell script to la=
unch the demo GUI.  Click around,
+it's mostly pretty intuitive but some documentation will come along in goo=
d time.
 =

 * Building the demo
 -------------------


--===============5641879824087903393==--

From jbosscache-commits at lists.jboss.org Sun Jan  6 21:40:19 2008
Content-Type: multipart/mixed; boundary="===============8195788364891157988=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r5028 -
 demos/core-demo-gui/trunk/src/main/java/org/jboss/cache/demo.
Date: Sun, 06 Jan 2008 21:40:18 -0500
Message-ID: <E1JBhuU-0006yn-BX@committer01.frg.pub.inap.atl.jboss.com>

--===============8195788364891157988==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: manik.surtani(a)jboss.com
Date: 2008-01-06 21:40:18 -0500 (Sun, 06 Jan 2008)
New Revision: 5028

Modified:
   demos/core-demo-gui/trunk/src/main/java/org/jboss/cache/demo/JBossCacheD=
emo.form
   demos/core-demo-gui/trunk/src/main/java/org/jboss/cache/demo/JBossCacheD=
emo.java
Log:
Updated editable flag on cfg file display and some labels

Modified: demos/core-demo-gui/trunk/src/main/java/org/jboss/cache/demo/JBos=
sCacheDemo.form
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- demos/core-demo-gui/trunk/src/main/java/org/jboss/cache/demo/JBossCache=
Demo.form	2008-01-07 02:27:01 UTC (rev 5027)
+++ demos/core-demo-gui/trunk/src/main/java/org/jboss/cache/demo/JBossCache=
Demo.form	2008-01-07 02:40:18 UTC (rev 5028)
@@ -486,12 +486,12 @@
                 </constraints>
                 <properties>
                   <font style=3D"3"/>
-                  <text value=3D"Multiple node generator"/>
+                  <text value=3D"Random data generator"/>
                 </properties>
               </component>
               <component id=3D"bf689" class=3D"javax.swing.JSeparator">
                 <constraints>
-                  <grid row=3D"14" column=3D"2" row-span=3D"1" col-span=3D=
"1" vsize-policy=3D"6" hsize-policy=3D"6" anchor=3D"0" fill=3D"3" indent=3D=
"0" use-parent-layout=3D"false"/>
+                  <grid row=3D"14" column=3D"0" row-span=3D"1" col-span=3D=
"5" vsize-policy=3D"6" hsize-policy=3D"6" anchor=3D"0" fill=3D"3" indent=3D=
"0" use-parent-layout=3D"false"/>
                   <forms defaultalign-horz=3D"false" defaultalign-vert=3D"=
false"/>
                 </constraints>
                 <properties/>
@@ -564,7 +564,7 @@
               </component>
               <component id=3D"f036" class=3D"javax.swing.JSeparator">
                 <constraints>
-                  <grid row=3D"26" column=3D"2" row-span=3D"1" col-span=3D=
"1" vsize-policy=3D"6" hsize-policy=3D"6" anchor=3D"0" fill=3D"3" indent=3D=
"0" use-parent-layout=3D"false"/>
+                  <grid row=3D"26" column=3D"0" row-span=3D"1" col-span=3D=
"5" vsize-policy=3D"6" hsize-policy=3D"6" anchor=3D"0" fill=3D"3" indent=3D=
"0" use-parent-layout=3D"false"/>
                   <forms defaultalign-horz=3D"false" defaultalign-vert=3D"=
false"/>
                 </constraints>
                 <properties/>

Modified: demos/core-demo-gui/trunk/src/main/java/org/jboss/cache/demo/JBos=
sCacheDemo.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- demos/core-demo-gui/trunk/src/main/java/org/jboss/cache/demo/JBossCache=
Demo.java	2008-01-07 02:27:01 UTC (rev 5027)
+++ demos/core-demo-gui/trunk/src/main/java/org/jboss/cache/demo/JBossCache=
Demo.java	2008-01-07 02:40:18 UTC (rev 5028)
@@ -471,6 +471,7 @@
                try
                {
                   configFileContents.setText(readContents(resource =3D=3D =
null ? new FileInputStream(cacheConfigFile) : resource.openStream()));
+                  configFileContents.setEditable(false);                  =

                }
                catch (Exception e)
                {


--===============8195788364891157988==--

From jbosscache-commits at lists.jboss.org Sun Jan  6 21:43:18 2008
Content-Type: multipart/mixed; boundary="===============6172858465196957841=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r5029 - in
 cache-bench-fwk/trunk: cache-products/terracotta-2.5.0 and 1 other directory.
Date: Sun, 06 Jan 2008 21:43:18 -0500
Message-ID: <E1JBhxO-000757-Jm@committer01.frg.pub.inap.atl.jboss.com>

--===============6172858465196957841==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: mircea.markus
Date: 2008-01-06 21:43:18 -0500 (Sun, 06 Jan 2008)
New Revision: 5029

Modified:
   cache-bench-fwk/trunk/cache-products/terracotta-2.5.0/config.sh
   cache-bench-fwk/trunk/runNode.sh
Log:
updated terracotta script

Modified: cache-bench-fwk/trunk/cache-products/terracotta-2.5.0/config.sh
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- cache-bench-fwk/trunk/cache-products/terracotta-2.5.0/config.sh	2008-01=
-07 02:40:18 UTC (rev 5028)
+++ cache-bench-fwk/trunk/cache-products/terracotta-2.5.0/config.sh	2008-01=
-07 02:43:18 UTC (rev 5029)
@@ -6,4 +6,11 @@
 #export START_NODE_COMMAND=3D"$TC_HOME/bin/dso-java.sh -cp $CLASSPATH $SYS=
_PROPS org.cachebench.CacheBenchmarkRunner"
 =

 =

-export START_NODE_COMMAND=3D"java -Dtc.install-root=3D${TC_HOME} -Xbootcla=
sspath/p:${TC_HOME}/lib/dso-boot/dso-boot-hotspot_win32_150_14.jar $SYS_PRO=
PS -cp $CLASSPATH org.cachebench.CacheBenchmarkRunner"
\ No newline at end of file
+export START_NODE_COMMAND=3D"java $JVM_ARGS -Dtc.install-root=3D${TC_HOME}=
 -Xbootclasspath/p:${TC_HOME}/lib/dso-boot/dso-boot-hotspot_win32_150_14.ja=
r $SYS_PROPS -cp $CLASSPATH $OTHER_SYS_ARGS org.cachebench.CacheBenchmarkRu=
nner"
+
+#${JAVA_HOME}/bin/java -Dtc.install-root=3D${TC_HOME} -Xbootclasspath/p:<d=
so-boot-jar-path> -Dtc.config=3D<tc-config-path> <startup-classname>
+#executing command java -Xmx1024m -Dtc.install-root=3D/cygdrive/c/java/ter=
racotta-2
+#.5.0 -Xbootclasspath/p:/cygdrive/c/java/terracotta-2.5.0/lib/dso-boot/dso=
-boot-h
+#otspot_win32_150_14.jar -DcurrentIndex=3D0 -Dorg.cachebench.debug=3Dtrue =
-Djava.net.preferIPv4Stack=3Dtrue -Dtc.config=3D./cache-products/terracotta=
-2.5.0/tc-client-con
+#fig.xml -cp :./lib/commons-beanutils.jar:./lib/commons-digester.jar:./lib=
/commons-logging.jar:./lib/commons-math-1.0.jar:./lib/log4j.jar:./lib/smart=
frog-3.12.014.jar:./conf:./classes/production/Framework::./classes/producti=
on/terracotta-2.5.0 org.cachebench.CacheBenchmarkRunner
+#java -Dtc.install-root=3Dc:\java\terracotta-2.5.0 -DcurrentIndex=3D0 -Dor=
g.cachebench.debug=3Dtrue -Djava.net.preferIPv4Stack=3Dtrue -Xbootclasspath=
/p:"c:\java\terracotta-2.5.0\lib\dso-boot\dso-boot-hotspot_win32_150_14.jar=
" -Dtc.config=3DC:\projects\jboss\cache\benchmark\cache-bench-fwk\cache-pro=
ducts\terracotta-2.5.0\tc-client-config.xml -cp ./lib/commons-beanutils.jar=
;./lib/commons-digester.jar;./lib/commons-logging.jar;./lib/commons-math-1.=
0.jar;./lib/log4j.jar;./conf;./classes/production/Framework;./classes/produ=
ction/terracotta-2.5.0 org.cachebench.CacheBenchmarkRunner
\ No newline at end of file

Modified: cache-bench-fwk/trunk/runNode.sh
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- cache-bench-fwk/trunk/runNode.sh	2008-01-07 02:40:18 UTC (rev 5028)
+++ cache-bench-fwk/trunk/runNode.sh	2008-01-07 02:43:18 UTC (rev 5029)
@@ -5,7 +5,8 @@
 =

 CACHE_DEBUG=3Dtrue
 preferIPv4Stack=3Dtrue
-export JVM_ARGS=3D-Xmx2048m
+export JVM_ARGS=3D-Xmx1024m
+export OTHER_SYS_ARGS=3D$3
 =

 if [ -z $1 ]
 then
@@ -54,8 +55,8 @@
    echo executing command $START_NODE_COMMAND
    $START_NODE_COMMAND
 else   =

-   TO_EXECUTE=3D"java $JVM_ARGS -cp $CLASSPATH $3 $SYS_PROPS org.cachebenc=
h.CacheBenchmarkRunner $4"
+   TO_EXECUTE=3D"java $JVM_ARGS -cp $CLASSPATH $OTHER_SYS_ARGS $SYS_PROPS =
org.cachebench.CacheBenchmarkRunner $4"
    echo executing $TO_EXECUTE
-   java $JVM_ARGS -cp $CLASSPATH $3 $SYS_PROPS org.cachebench.CacheBenchma=
rkRunner $4
+   java $JVM_ARGS -cp $CLASSPATH $OTHER_SYS_ARGS $SYS_PROPS org.cachebench=
.CacheBenchmarkRunner $4
 fi
 =



--===============6172858465196957841==--

From jbosscache-commits at lists.jboss.org Mon Jan  7 06:57:26 2008
Content-Type: multipart/mixed; boundary="===============4438161028505175119=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r5030 -
 demos/core-demo-gui/trunk/src/main/java/org/jboss/cache/demo.
Date: Mon, 07 Jan 2008 06:57:26 -0500
Message-ID: <E1JBqbe-0004PX-66@committer01.frg.pub.inap.atl.jboss.com>

--===============4438161028505175119==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: manik.surtani(a)jboss.com
Date: 2008-01-07 06:57:26 -0500 (Mon, 07 Jan 2008)
New Revision: 5030

Modified:
   demos/core-demo-gui/trunk/src/main/java/org/jboss/cache/demo/JBossCacheD=
emo.form
   demos/core-demo-gui/trunk/src/main/java/org/jboss/cache/demo/JBossCacheD=
emo.java
Log:
updated colours, labels, resizability, added a get node option

Modified: demos/core-demo-gui/trunk/src/main/java/org/jboss/cache/demo/JBos=
sCacheDemo.form
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- demos/core-demo-gui/trunk/src/main/java/org/jboss/cache/demo/JBossCache=
Demo.form	2008-01-07 02:43:18 UTC (rev 5029)
+++ demos/core-demo-gui/trunk/src/main/java/org/jboss/cache/demo/JBossCache=
Demo.form	2008-01-07 11:57:26 UTC (rev 5030)
@@ -26,9 +26,7 @@
           </grid>
           <forms defaultalign-vert=3D"false"/>
         </constraints>
-        <properties>
-          <background color=3D"-3355648"/>
-        </properties>
+        <properties/>
         <border type=3D"none"/>
         <children>
           <grid id=3D"7aed3" binding=3D"controlPanelTab" layout-manager=3D=
"FormLayout">
@@ -112,7 +110,7 @@
                   <component id=3D"ded97" class=3D"javax.swing.JTextArea" =
binding=3D"configFileContents">
                     <constraints/>
                     <properties>
-                      <background color=3D"-103"/>
+                      <background color=3D"-3355444"/>
                       <font name=3D"Courier New" size=3D"10"/>
                     </properties>
                   </component>
@@ -148,6 +146,7 @@
                     <constraints/>
                     <properties>
                       <background color=3D"-1"/>
+                      <editable value=3D"false"/>
                       <showsRootHandles value=3D"true"/>
                       <toolTipText value=3D"Tree view of the cache"/>
                     </properties>
@@ -165,7 +164,7 @@
                   <component id=3D"41fa4" class=3D"javax.swing.JTable" bin=
ding=3D"nodeDataTable">
                     <constraints/>
                     <properties>
-                      <background color=3D"-103"/>
+                      <background color=3D"-992313"/>
                       <gridColor color=3D"-16777216"/>
                       <intercellSpacing width=3D"3" height=3D"3"/>
                       <toolTipText value=3D"Data in currently selected nod=
e"/>
@@ -202,7 +201,7 @@
                   <component id=3D"d96d2" class=3D"javax.swing.JTable" bin=
ding=3D"clusterTable">
                     <constraints/>
                     <properties>
-                      <background color=3D"-103"/>
+                      <background color=3D"-992313"/>
                       <gridColor color=3D"-16777216"/>
                       <intercellSpacing width=3D"3" height=3D"3"/>
                       <showHorizontalLines value=3D"true"/>
@@ -334,6 +333,8 @@
             <rowspec value=3D"top:3dlu:noGrow"/>
             <rowspec value=3D"center:max(d;4px):noGrow"/>
             <rowspec value=3D"top:3dlu:noGrow"/>
+            <rowspec value=3D"center:max(d;4px):noGrow"/>
+            <rowspec value=3D"top:3dlu:noGrow"/>
             <rowspec value=3D"center:d:grow"/>
             <rowspec value=3D"top:3dlu:noGrow"/>
             <rowspec value=3D"center:max(d;4px):noGrow"/>
@@ -357,7 +358,7 @@
             <colspec value=3D"left:4dlu:noGrow"/>
             <colspec value=3D"fill:200px:grow"/>
             <constraints>
-              <tabbedpane title=3D"Data generator" enabled=3D"false">
+              <tabbedpane title=3D"Manipulate data" enabled=3D"false">
                 <tooltip value=3D"This tab provides you with the ability t=
o add or remove data from the cache."/>
               </tabbedpane>
             </constraints>
@@ -435,7 +436,7 @@
               </component>
               <component id=3D"11f60" class=3D"javax.swing.JButton" bindin=
g=3D"goButton" default-binding=3D"true">
                 <constraints>
-                  <grid row=3D"12" column=3D"2" row-span=3D"1" col-span=3D=
"1" vsize-policy=3D"0" hsize-policy=3D"3" anchor=3D"8" fill=3D"0" indent=3D=
"0" use-parent-layout=3D"false"/>
+                  <grid row=3D"14" column=3D"2" row-span=3D"1" col-span=3D=
"1" vsize-policy=3D"0" hsize-policy=3D"3" anchor=3D"8" fill=3D"0" indent=3D=
"0" use-parent-layout=3D"false"/>
                   <forms defaultalign-horz=3D"false"/>
                 </constraints>
                 <properties>
@@ -481,7 +482,7 @@
               </component>
               <component id=3D"aacea" class=3D"javax.swing.JLabel">
                 <constraints>
-                  <grid row=3D"16" column=3D"2" row-span=3D"1" col-span=3D=
"1" vsize-policy=3D"0" hsize-policy=3D"0" anchor=3D"8" fill=3D"0" indent=3D=
"0" use-parent-layout=3D"false"/>
+                  <grid row=3D"18" column=3D"2" row-span=3D"1" col-span=3D=
"1" vsize-policy=3D"0" hsize-policy=3D"0" anchor=3D"8" fill=3D"0" indent=3D=
"0" use-parent-layout=3D"false"/>
                   <forms/>
                 </constraints>
                 <properties>
@@ -491,14 +492,14 @@
               </component>
               <component id=3D"bf689" class=3D"javax.swing.JSeparator">
                 <constraints>
-                  <grid row=3D"14" column=3D"0" row-span=3D"1" col-span=3D=
"5" vsize-policy=3D"6" hsize-policy=3D"6" anchor=3D"0" fill=3D"3" indent=3D=
"0" use-parent-layout=3D"false"/>
+                  <grid row=3D"16" column=3D"0" row-span=3D"1" col-span=3D=
"5" vsize-policy=3D"6" hsize-policy=3D"6" anchor=3D"0" fill=3D"3" indent=3D=
"0" use-parent-layout=3D"false"/>
                   <forms defaultalign-horz=3D"false" defaultalign-vert=3D"=
false"/>
                 </constraints>
                 <properties/>
               </component>
               <component id=3D"dbe5d" class=3D"javax.swing.JLabel">
                 <constraints>
-                  <grid row=3D"20" column=3D"0" row-span=3D"1" col-span=3D=
"1" vsize-policy=3D"0" hsize-policy=3D"0" anchor=3D"8" fill=3D"0" indent=3D=
"0" use-parent-layout=3D"false"/>
+                  <grid row=3D"22" column=3D"0" row-span=3D"1" col-span=3D=
"1" vsize-policy=3D"0" hsize-policy=3D"0" anchor=3D"8" fill=3D"0" indent=3D=
"0" use-parent-layout=3D"false"/>
                   <forms/>
                 </constraints>
                 <properties>
@@ -508,7 +509,7 @@
               </component>
               <component id=3D"c9835" class=3D"javax.swing.JLabel">
                 <constraints>
-                  <grid row=3D"18" column=3D"0" row-span=3D"1" col-span=3D=
"1" vsize-policy=3D"0" hsize-policy=3D"0" anchor=3D"8" fill=3D"0" indent=3D=
"0" use-parent-layout=3D"false"/>
+                  <grid row=3D"20" column=3D"0" row-span=3D"1" col-span=3D=
"1" vsize-policy=3D"0" hsize-policy=3D"0" anchor=3D"8" fill=3D"0" indent=3D=
"0" use-parent-layout=3D"false"/>
                   <forms/>
                 </constraints>
                 <properties>
@@ -518,7 +519,7 @@
               </component>
               <component id=3D"922d3" class=3D"javax.swing.JLabel">
                 <constraints>
-                  <grid row=3D"22" column=3D"0" row-span=3D"1" col-span=3D=
"1" vsize-policy=3D"0" hsize-policy=3D"0" anchor=3D"8" fill=3D"0" indent=3D=
"0" use-parent-layout=3D"false"/>
+                  <grid row=3D"24" column=3D"0" row-span=3D"1" col-span=3D=
"1" vsize-policy=3D"0" hsize-policy=3D"0" anchor=3D"8" fill=3D"0" indent=3D=
"0" use-parent-layout=3D"false"/>
                   <forms/>
                 </constraints>
                 <properties>
@@ -528,7 +529,7 @@
               </component>
               <component id=3D"32377" class=3D"javax.swing.JButton" bindin=
g=3D"randomGeneratorButton">
                 <constraints>
-                  <grid row=3D"24" column=3D"2" row-span=3D"1" col-span=3D=
"1" vsize-policy=3D"0" hsize-policy=3D"3" anchor=3D"8" fill=3D"0" indent=3D=
"0" use-parent-layout=3D"false"/>
+                  <grid row=3D"26" column=3D"2" row-span=3D"1" col-span=3D=
"1" vsize-policy=3D"0" hsize-policy=3D"3" anchor=3D"8" fill=3D"0" indent=3D=
"0" use-parent-layout=3D"false"/>
                   <forms defaultalign-horz=3D"false"/>
                 </constraints>
                 <properties>
@@ -537,7 +538,7 @@
               </component>
               <component id=3D"513f3" class=3D"javax.swing.JTextField" bin=
ding=3D"maxNodesTextField" default-binding=3D"true">
                 <constraints>
-                  <grid row=3D"18" column=3D"2" row-span=3D"1" col-span=3D=
"1" vsize-policy=3D"0" hsize-policy=3D"6" anchor=3D"8" fill=3D"1" indent=3D=
"0" use-parent-layout=3D"false">
+                  <grid row=3D"20" column=3D"2" row-span=3D"1" col-span=3D=
"1" vsize-policy=3D"0" hsize-policy=3D"6" anchor=3D"8" fill=3D"1" indent=3D=
"0" use-parent-layout=3D"false">
                     <preferred-size width=3D"150" height=3D"-1"/>
                   </grid>
                   <forms defaultalign-horz=3D"false"/>
@@ -546,7 +547,7 @@
               </component>
               <component id=3D"b6c72" class=3D"javax.swing.JTextField" bin=
ding=3D"maxDepthTextField" default-binding=3D"true">
                 <constraints>
-                  <grid row=3D"20" column=3D"2" row-span=3D"1" col-span=3D=
"1" vsize-policy=3D"0" hsize-policy=3D"6" anchor=3D"8" fill=3D"1" indent=3D=
"0" use-parent-layout=3D"false">
+                  <grid row=3D"22" column=3D"2" row-span=3D"1" col-span=3D=
"1" vsize-policy=3D"0" hsize-policy=3D"6" anchor=3D"8" fill=3D"1" indent=3D=
"0" use-parent-layout=3D"false">
                     <preferred-size width=3D"150" height=3D"-1"/>
                   </grid>
                   <forms defaultalign-horz=3D"false"/>
@@ -555,7 +556,7 @@
               </component>
               <component id=3D"3108a" class=3D"javax.swing.JTextField" bin=
ding=3D"numberOfKeysPerTextField" default-binding=3D"true">
                 <constraints>
-                  <grid row=3D"22" column=3D"2" row-span=3D"1" col-span=3D=
"1" vsize-policy=3D"0" hsize-policy=3D"6" anchor=3D"8" fill=3D"1" indent=3D=
"0" use-parent-layout=3D"false">
+                  <grid row=3D"24" column=3D"2" row-span=3D"1" col-span=3D=
"1" vsize-policy=3D"0" hsize-policy=3D"6" anchor=3D"8" fill=3D"1" indent=3D=
"0" use-parent-layout=3D"false">
                     <preferred-size width=3D"150" height=3D"-1"/>
                   </grid>
                   <forms defaultalign-horz=3D"false"/>
@@ -564,14 +565,14 @@
               </component>
               <component id=3D"f036" class=3D"javax.swing.JSeparator">
                 <constraints>
-                  <grid row=3D"26" column=3D"0" row-span=3D"1" col-span=3D=
"5" vsize-policy=3D"6" hsize-policy=3D"6" anchor=3D"0" fill=3D"3" indent=3D=
"0" use-parent-layout=3D"false"/>
+                  <grid row=3D"28" column=3D"0" row-span=3D"1" col-span=3D=
"5" vsize-policy=3D"6" hsize-policy=3D"6" anchor=3D"0" fill=3D"3" indent=3D=
"0" use-parent-layout=3D"false"/>
                   <forms defaultalign-horz=3D"false" defaultalign-vert=3D"=
false"/>
                 </constraints>
                 <properties/>
               </component>
               <component id=3D"43cf0" class=3D"javax.swing.JButton" bindin=
g=3D"cacheClearButton">
                 <constraints>
-                  <grid row=3D"30" column=3D"2" row-span=3D"1" col-span=3D=
"1" vsize-policy=3D"0" hsize-policy=3D"3" anchor=3D"8" fill=3D"0" indent=3D=
"0" use-parent-layout=3D"false"/>
+                  <grid row=3D"32" column=3D"2" row-span=3D"1" col-span=3D=
"1" vsize-policy=3D"0" hsize-policy=3D"3" anchor=3D"8" fill=3D"0" indent=3D=
"0" use-parent-layout=3D"false"/>
                   <forms defaultalign-horz=3D"false"/>
                 </constraints>
                 <properties>
@@ -580,7 +581,7 @@
               </component>
               <component id=3D"dae1c" class=3D"javax.swing.JLabel">
                 <constraints>
-                  <grid row=3D"28" column=3D"2" row-span=3D"1" col-span=3D=
"1" vsize-policy=3D"0" hsize-policy=3D"0" anchor=3D"8" fill=3D"0" indent=3D=
"0" use-parent-layout=3D"false"/>
+                  <grid row=3D"30" column=3D"2" row-span=3D"1" col-span=3D=
"1" vsize-policy=3D"0" hsize-policy=3D"0" anchor=3D"8" fill=3D"0" indent=3D=
"0" use-parent-layout=3D"false"/>
                   <forms/>
                 </constraints>
                 <properties>
@@ -588,6 +589,15 @@
                   <text value=3D"Clear cache"/>
                 </properties>
               </component>
+              <component id=3D"41b43" class=3D"javax.swing.JRadioButton" b=
inding=3D"getNodeRadioButton" default-binding=3D"true">
+                <constraints>
+                  <grid row=3D"12" column=3D"2" row-span=3D"1" col-span=3D=
"1" vsize-policy=3D"0" hsize-policy=3D"3" anchor=3D"8" fill=3D"0" indent=3D=
"0" use-parent-layout=3D"false"/>
+                  <forms/>
+                </constraints>
+                <properties>
+                  <text value=3D"Get &amp;Node"/>
+                </properties>
+              </component>
             </children>
           </grid>
         </children>
@@ -622,6 +632,7 @@
       <member id=3D"e9453"/>
       <member id=3D"f9bf"/>
       <member id=3D"f2b07"/>
+      <member id=3D"41b43"/>
     </group>
   </buttonGroups>
 </form>

Modified: demos/core-demo-gui/trunk/src/main/java/org/jboss/cache/demo/JBos=
sCacheDemo.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- demos/core-demo-gui/trunk/src/main/java/org/jboss/cache/demo/JBossCache=
Demo.java	2008-01-07 02:43:18 UTC (rev 5029)
+++ demos/core-demo-gui/trunk/src/main/java/org/jboss/cache/demo/JBossCache=
Demo.java	2008-01-07 11:57:26 UTC (rev 5030)
@@ -3,56 +3,50 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.jboss.cache.Cache;
+import org.jboss.cache.CacheSPI;
 import org.jboss.cache.CacheStatus;
 import static org.jboss.cache.CacheStatus.*;
 import org.jboss.cache.DefaultCacheFactory;
 import org.jboss.cache.Fqn;
-import org.jboss.cache.CacheSPI;
 import org.jboss.cache.Node;
+import org.jboss.cache.notifications.annotation.BuddyGroupChanged;
 import org.jboss.cache.notifications.annotation.NodeCreated;
 import org.jboss.cache.notifications.annotation.NodeRemoved;
 import org.jboss.cache.notifications.annotation.ViewChanged;
-import org.jboss.cache.notifications.annotation.BuddyGroupChanged;
+import org.jboss.cache.notifications.event.BuddyGroupChangedEvent;
 import org.jboss.cache.notifications.event.NodeCreatedEvent;
 import org.jboss.cache.notifications.event.NodeRemovedEvent;
 import org.jboss.cache.notifications.event.ViewChangedEvent;
-import org.jboss.cache.notifications.event.BuddyGroupChangedEvent;
 import org.jgroups.Address;
 =

 import javax.swing.*;
-import javax.swing.border.TitledBorder;
 import javax.swing.event.TreeSelectionEvent;
 import javax.swing.event.TreeSelectionListener;
 import javax.swing.table.AbstractTableModel;
 import javax.swing.tree.TreePath;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
-import java.awt.*;
+import java.io.BufferedReader;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
 import java.net.URL;
+import java.text.NumberFormat;
 import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Random;
 import java.util.Set;
-import java.util.Date;
-import java.util.Collections;
+import java.util.concurrent.BlockingQueue;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.ThreadPoolExecutor;
-import java.util.concurrent.BlockingQueue;
-import java.text.NumberFormat;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.Reader;
-import java.io.InputStreamReader;
-import java.io.BufferedReader;
 =

-import com.jgoodies.forms.layout.FormLayout;
-import com.jgoodies.forms.layout.CellConstraints;
-
 /**
  * @author Manik Surtani (<a href=3D"mailto:manik(a)jboss.org">manik(a)jbo=
ss.org</a>)
  */
@@ -94,6 +88,7 @@
    private JLabel statsSizeOfCachedData;
    private JLabel statsLastUpdated;
    private JTextArea configFileContents;
+   private JRadioButton getNodeRadioButton;
    private String cacheConfigFile;
    private Cache<String, String> cache;
    private String startCacheButtonLabel =3D "Start Cache", stopCacheButton=
Label =3D "Stop Cache";
@@ -104,6 +99,7 @@
    private NodeDataTableModel nodeDataTableModel;
    private DataTreeRefresher treeRefresher;
    private Random r =3D new Random();
+   private boolean isUsingBuddyReplication;
 =

    public static void main(String[] args)
    {
@@ -119,7 +115,7 @@
       frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
       frame.pack();
       frame.setVisible(true);
-      frame.setResizable(false);
+      frame.setResizable(true);
    }
 =

    public JBossCacheDemo(String cfgFileName)
@@ -173,26 +169,32 @@
                   if (createNodeRadioButton.isSelected())
                   {
                      cache.put(fqnTextField.getText(), keyTextField.getTex=
t(), valueTextField.getText());
-//               treeRefresher.addNode(Fqn.fromString(fqnTextField.getText=
()));
                   }
                   else if (removeNodeRadioButton.isSelected())
                   {
                      cache.removeNode(fqnTextField.getText());
-//               treeRefresher.removeNode(Fqn.fromString(fqnTextField.getT=
ext()));
                   }
                   else if (addKeyRadioButton.isSelected())
                   {
                      cache.put(fqnTextField.getText(), keyTextField.getTex=
t(), valueTextField.getText());
-//               treeRefresher.updateNode(Fqn.fromString(fqnTextField.getT=
ext()));
                   }
                   else if (removeKeyRadioButton.isSelected())
                   {
                      cache.remove(fqnTextField.getText(), keyTextField.get=
Text());
-//               treeRefresher.updateNode(Fqn.fromString(fqnTextField.getT=
ext()));
                   }
+                  else if (getNodeRadioButton.isSelected())
+                  {
+                     // do a cache.get on the Fqn first, this may involve =
a data gravitation
+                     // only do this if BR is enabled as it may involve a =
data gravitation event
+                     if (isUsingBuddyReplication)
+                        cache.getInvocationContext().getOptionOverrides().=
setForceDataGravitation(true);
+                     cache.getNode(fqnTextField.getText());
+                  }
                   treeRefresher.repaint();
                   dataViewTab.repaint();
                   processAction(goButton, false);
+                  // now switch to the data pane
+                  mainPane.setSelectedIndex(1);
                }
             });
          }
@@ -233,6 +235,16 @@
             valueTextField.setEnabled(true);
          }
       });
+      getNodeRadioButton.addActionListener(new ActionListener()
+      {
+         public void actionPerformed(ActionEvent e)
+         {
+            fqnTextField.setEnabled(true);
+            keyTextField.setEnabled(false);
+            valueTextField.setEnabled(false);
+         }
+      });
+
       dataTree.addTreeSelectionListener(new TreeSelectionListener()
       {
          public void valueChanged(TreeSelectionEvent e)
@@ -243,7 +255,8 @@
             if (!f.equals(nodeDataTableModel.getCurrentFqn()))
             {
                nodeDataTableModel.setCurrentFqn(f);
-               nodeDataTableModel.setData(cache.getNode(f).getData());
+               Node n =3D cache.getNode(f);
+               if (n !=3D null) nodeDataTableModel.setData(n.getData());
             }
          }
       });
@@ -304,6 +317,8 @@
                   }
 =

                   processAction(randomGeneratorButton, false);
+                  // now switch to the data pane
+                  mainPane.setSelectedIndex(1);
                }
             });
          }
@@ -335,6 +350,8 @@
                   cache.removeNode(Fqn.ROOT);
                   cache.getRoot().clearData();
                   processAction(cacheClearButton, false);
+                  // now switch to the data pane
+                  mainPane.setSelectedIndex(1);
                }
             });
          }
@@ -471,7 +488,7 @@
                try
                {
                   configFileContents.setText(readContents(resource =3D=3D =
null ? new FileInputStream(cacheConfigFile) : resource.openStream()));
-                  configFileContents.setEditable(false);                  =

+                  configFileContents.setEditable(false);
                }
                catch (Exception e)
                {
@@ -480,6 +497,7 @@
                configFileContents.repaint();
 =

                cache =3D new DefaultCacheFactory().createCache(cacheConfig=
File);
+               isUsingBuddyReplication =3D cache.getConfiguration().getBud=
dyReplicationConfig() !=3D null && cache.getConfiguration().getBuddyReplica=
tionConfig().isEnabled();
             }
             else
             {
@@ -603,12 +621,10 @@
             this.members.addAll(members);
          }
 =

-         CacheSPI spi =3D (CacheSPI) cache;
-
          List<Address> buddies =3D Collections.emptyList();
-         if (spi.getBuddyManager() !=3D null)
+         if (isUsingBuddyReplication)
          {
-            buddies =3D spi.getBuddyManager().getBuddyAddresses();
+            buddies =3D ((CacheSPI) cache).getBuddyManager().getBuddyAddre=
sses();
             log.debug("Buddy addresses: " + buddies);
          }
 =



--===============4438161028505175119==--

From jbosscache-commits at lists.jboss.org Mon Jan  7 07:53:25 2008
Content-Type: multipart/mixed; boundary="===============5727988981754106870=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r5031 -
 core/trunk/src/main/java/org/jboss/cache/marshall.
Date: Mon, 07 Jan 2008 07:53:25 -0500
Message-ID: <E1JBrTp-0006Zy-F6@committer01.frg.pub.inap.atl.jboss.com>

--===============5727988981754106870==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: manik.surtani(a)jboss.com
Date: 2008-01-07 07:53:25 -0500 (Mon, 07 Jan 2008)
New Revision: 5031

Modified:
   core/trunk/src/main/java/org/jboss/cache/marshall/CacheMarshaller200.java
Log:
fixed class cast exceptions when comparing IpAddress instances

Modified: core/trunk/src/main/java/org/jboss/cache/marshall/CacheMarshaller=
200.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/java/org/jboss/cache/marshall/CacheMarshaller200.ja=
va	2008-01-07 11:57:26 UTC (rev 5030)
+++ core/trunk/src/main/java/org/jboss/cache/marshall/CacheMarshaller200.ja=
va	2008-01-07 12:53:25 UTC (rev 5031)
@@ -813,7 +813,29 @@
 =

 class ReferencesMap
 {
-   private ArrayList<Object> referencedObjects =3D new ArrayList<Object>();
+   private ArrayList<Object> referencedObjects =3D new ArrayList<Object>()
+   {
+      @Override
+      public int indexOf(Object elem)
+      {
+         if (elem =3D=3D null)
+         {
+            for (int i =3D 0; i < size(); i++)
+            {
+               if (get(i) =3D=3D null) return i;
+            }
+         }
+         else
+         {
+            for (int i =3D 0; i < size(); i++)
+            {
+               Object elInList =3D get(i);
+               if (elInList.getClass().equals(elem.getClass()) && elem.equ=
als(elInList)) return i;
+            }
+         }
+         return -1;
+      }
+   };
 =

    void put(int reference, Object object)
    {


--===============5727988981754106870==--

From jbosscache-commits at lists.jboss.org Mon Jan  7 08:40:59 2008
Content-Type: multipart/mixed; boundary="===============6094082351595602688=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r5032 -
 demos/core-demo-gui/trunk/src/main/java/org/jboss/cache/demo.
Date: Mon, 07 Jan 2008 08:40:59 -0500
Message-ID: <E1JBsDr-0007nW-Oa@committer01.frg.pub.inap.atl.jboss.com>

--===============6094082351595602688==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: manik.surtani(a)jboss.com
Date: 2008-01-07 08:40:59 -0500 (Mon, 07 Jan 2008)
New Revision: 5032

Modified:
   demos/core-demo-gui/trunk/src/main/java/org/jboss/cache/demo/DataTreeRef=
resher.java
   demos/core-demo-gui/trunk/src/main/java/org/jboss/cache/demo/JBossCacheD=
emo.form
   demos/core-demo-gui/trunk/src/main/java/org/jboss/cache/demo/JBossCacheD=
emo.java
Log:
UI refresh changes/improvements

Modified: demos/core-demo-gui/trunk/src/main/java/org/jboss/cache/demo/Data=
TreeRefresher.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- demos/core-demo-gui/trunk/src/main/java/org/jboss/cache/demo/DataTreeRe=
fresher.java	2008-01-07 12:53:25 UTC (rev 5031)
+++ demos/core-demo-gui/trunk/src/main/java/org/jboss/cache/demo/DataTreeRe=
fresher.java	2008-01-07 13:40:59 UTC (rev 5032)
@@ -12,6 +12,7 @@
 import javax.swing.tree.DefaultTreeModel;
 import javax.swing.tree.TreeModel;
 import javax.swing.tree.TreeNode;
+import javax.swing.tree.TreePath;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Enumeration;
@@ -110,11 +111,13 @@
 =

    public void repaint()
    {
+      TreePath path =3D tree.getSelectionPath();
       tableModel.setCurrentFqn(null);
       Map<String, String> m =3D Collections.emptyMap();
       tableModel.setData(m);
-      tree.repaint();
       ((DefaultTreeModel) tree.getModel()).reload();
+      tree.setSelectionPath(path);
+      if (path !=3D null) while ((path =3D path.getParentPath()) !=3D null=
) tree.expandPath(path);
    }
 =

    class FqnTreeNode extends DefaultMutableTreeNode implements Comparable

Modified: demos/core-demo-gui/trunk/src/main/java/org/jboss/cache/demo/JBos=
sCacheDemo.form
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- demos/core-demo-gui/trunk/src/main/java/org/jboss/cache/demo/JBossCache=
Demo.form	2008-01-07 12:53:25 UTC (rev 5031)
+++ demos/core-demo-gui/trunk/src/main/java/org/jboss/cache/demo/JBossCache=
Demo.form	2008-01-07 13:40:59 UTC (rev 5032)
@@ -120,9 +120,9 @@
           </grid>
           <grid id=3D"73867" binding=3D"dataViewTab" layout-manager=3D"For=
mLayout">
             <rowspec value=3D"center:d:grow"/>
-            <colspec value=3D"fill:d:grow"/>
+            <colspec value=3D"left:340px:grow"/>
             <colspec value=3D"left:4dlu:noGrow"/>
-            <colspec value=3D"fill:m:grow"/>
+            <colspec value=3D"fill:p:grow"/>
             <constraints>
               <tabbedpane title=3D"Data view" enabled=3D"false">
                 <tooltip value=3D"This tab contains a view of all the data=
 in the cache."/>
@@ -134,44 +134,56 @@
             </properties>
             <border type=3D"none"/>
             <children>
-              <scrollpane id=3D"ea4d">
+              <splitpane id=3D"5a803">
                 <constraints>
-                  <grid row=3D"0" column=3D"0" row-span=3D"1" col-span=3D"=
1" vsize-policy=3D"7" hsize-policy=3D"7" anchor=3D"0" fill=3D"3" indent=3D"=
0" use-parent-layout=3D"false"/>
+                  <grid row=3D"0" column=3D"0" row-span=3D"1" col-span=3D"=
3" vsize-policy=3D"3" hsize-policy=3D"3" anchor=3D"0" fill=3D"3" indent=3D"=
0" use-parent-layout=3D"false">
+                    <preferred-size width=3D"200" height=3D"200"/>
+                  </grid>
                   <forms defaultalign-horz=3D"false" defaultalign-vert=3D"=
false"/>
                 </constraints>
-                <properties/>
+                <properties>
+                  <dividerLocation value=3D"600"/>
+                </properties>
                 <border type=3D"none"/>
                 <children>
-                  <component id=3D"a805d" class=3D"javax.swing.JTree" bind=
ing=3D"dataTree">
-                    <constraints/>
-                    <properties>
-                      <background color=3D"-1"/>
-                      <editable value=3D"false"/>
-                      <showsRootHandles value=3D"true"/>
-                      <toolTipText value=3D"Tree view of the cache"/>
-                    </properties>
-                  </component>
+                  <scrollpane id=3D"ea4d" binding=3D"treeScrollPane">
+                    <constraints>
+                      <splitpane position=3D"left"/>
+                    </constraints>
+                    <properties/>
+                    <border type=3D"none"/>
+                    <children>
+                      <component id=3D"a805d" class=3D"javax.swing.JTree" =
binding=3D"dataTree">
+                        <constraints/>
+                        <properties>
+                          <background color=3D"-1"/>
+                          <editable value=3D"false"/>
+                          <showsRootHandles value=3D"true"/>
+                          <toolTipText value=3D"Tree view of the cache"/>
+                        </properties>
+                      </component>
+                    </children>
+                  </scrollpane>
+                  <scrollpane id=3D"f78a6" binding=3D"nodeDataScrollPane">
+                    <constraints>
+                      <splitpane position=3D"right"/>
+                    </constraints>
+                    <properties/>
+                    <border type=3D"none"/>
+                    <children>
+                      <component id=3D"41fa4" class=3D"javax.swing.JTable"=
 binding=3D"nodeDataTable">
+                        <constraints/>
+                        <properties>
+                          <background color=3D"-992313"/>
+                          <gridColor color=3D"-16777216"/>
+                          <intercellSpacing width=3D"3" height=3D"3"/>
+                          <toolTipText value=3D"Data in currently selected=
 node"/>
+                        </properties>
+                      </component>
+                    </children>
+                  </scrollpane>
                 </children>
-              </scrollpane>
-              <scrollpane id=3D"f78a6" binding=3D"nodeData">
-                <constraints>
-                  <grid row=3D"0" column=3D"2" row-span=3D"1" col-span=3D"=
1" vsize-policy=3D"7" hsize-policy=3D"7" anchor=3D"0" fill=3D"3" indent=3D"=
0" use-parent-layout=3D"false"/>
-                  <forms defaultalign-horz=3D"false" defaultalign-vert=3D"=
false"/>
-                </constraints>
-                <properties/>
-                <border type=3D"none"/>
-                <children>
-                  <component id=3D"41fa4" class=3D"javax.swing.JTable" bin=
ding=3D"nodeDataTable">
-                    <constraints/>
-                    <properties>
-                      <background color=3D"-992313"/>
-                      <gridColor color=3D"-16777216"/>
-                      <intercellSpacing width=3D"3" height=3D"3"/>
-                      <toolTipText value=3D"Data in currently selected nod=
e"/>
-                    </properties>
-                  </component>
-                </children>
-              </scrollpane>
+              </splitpane>
             </children>
           </grid>
           <grid id=3D"b4b20" binding=3D"clusterViewTab" layout-manager=3D"=
FormLayout">

Modified: demos/core-demo-gui/trunk/src/main/java/org/jboss/cache/demo/JBos=
sCacheDemo.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- demos/core-demo-gui/trunk/src/main/java/org/jboss/cache/demo/JBossCache=
Demo.java	2008-01-07 12:53:25 UTC (rev 5031)
+++ demos/core-demo-gui/trunk/src/main/java/org/jboss/cache/demo/JBossCache=
Demo.java	2008-01-07 13:40:59 UTC (rev 5032)
@@ -11,10 +11,12 @@
 import org.jboss.cache.Node;
 import org.jboss.cache.notifications.annotation.BuddyGroupChanged;
 import org.jboss.cache.notifications.annotation.NodeCreated;
+import org.jboss.cache.notifications.annotation.NodeModified;
 import org.jboss.cache.notifications.annotation.NodeRemoved;
 import org.jboss.cache.notifications.annotation.ViewChanged;
 import org.jboss.cache.notifications.event.BuddyGroupChangedEvent;
 import org.jboss.cache.notifications.event.NodeCreatedEvent;
+import org.jboss.cache.notifications.event.NodeModifiedEvent;
 import org.jboss.cache.notifications.event.NodeRemovedEvent;
 import org.jboss.cache.notifications.event.ViewChangedEvent;
 import org.jgroups.Address;
@@ -76,7 +78,7 @@
    private JRadioButton removeKeyRadioButton;
    private JButton goButton;
    private JTable nodeDataTable;
-   private JScrollPane nodeData;
+   private JScrollPane nodeDataScrollPane;
    private JButton randomGeneratorButton;
    private JTextField maxNodesTextField;
    private JTextField maxDepthTextField;
@@ -89,6 +91,7 @@
    private JLabel statsLastUpdated;
    private JTextArea configFileContents;
    private JRadioButton getNodeRadioButton;
+   private JScrollPane treeScrollPane;
    private String cacheConfigFile;
    private Cache<String, String> cache;
    private String startCacheButtonLabel =3D "Start Cache", stopCacheButton=
Label =3D "Stop Cache";
@@ -569,6 +572,19 @@
          clusterDataModel.setBuddies();
       }
 =

+      @NodeModified
+      public void nodeModified(NodeModifiedEvent e)
+      {
+         if (!e.isPre())
+         {
+            // only if this is the current node selected in the tree do we=
 bother refreshing it
+            if (nodeDataTableModel.getCurrentFqn() !=3D null && nodeDataTa=
bleModel.getCurrentFqn().equals(e.getFqn()))
+            {
+               nodeDataTableModel.updateCurrentNode();
+            }
+         }
+      }
+
       @NodeCreated
       public void nodeCreated(NodeCreatedEvent e)
       {
@@ -738,5 +754,10 @@
       {
          this.currentFqn =3D currentFqn;
       }
+
+      public void updateCurrentNode()
+      {
+         setData(cache.getData(currentFqn));
+      }
    }
 }


--===============6094082351595602688==--

From jbosscache-commits at lists.jboss.org Mon Jan  7 09:07:28 2008
Content-Type: multipart/mixed; boundary="===============6228546695282939956=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r5033 -
 cache-bench-fwk/trunk/smartfrog.
Date: Mon, 07 Jan 2008 09:07:27 -0500
Message-ID: <E1JBsdT-0004Pq-GP@committer01.frg.pub.inap.atl.jboss.com>

--===============6228546695282939956==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: mircea.markus
Date: 2008-01-07 09:07:27 -0500 (Mon, 07 Jan 2008)
New Revision: 5033

Modified:
   cache-bench-fwk/trunk/smartfrog/main.sf
Log:
overwritting with cluster config

Modified: cache-bench-fwk/trunk/smartfrog/main.sf
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- cache-bench-fwk/trunk/smartfrog/main.sf	2008-01-07 13:40:59 UTC (rev 50=
32)
+++ cache-bench-fwk/trunk/smartfrog/main.sf	2008-01-07 14:07:27 UTC (rev 50=
33)
@@ -3,15 +3,16 @@
 =

 BaseCacheBenchPrim extends Prim {
    sfClass "org.cachebench.smartfrog.CacheBenchmarkPrim";
+   sfRootLocatorPort 3801;
 =

-   scriptToExec "runNode.bat"
+   scriptToExec "./runNode.sh";
 =

    //FQN of the directory where the framework was checked out (noramally i=
s th eparent of the dir that contains this file)
    //this should be edited
-   cacheBenchmarkHome "/projects/jboss/cache/benchmark/cache-bench-fwk";
+   cacheBenchmarkHome "/qa/home/mmarkus/code/cache-bench-fwk";
 =

    //should be the name of a subdirectory of 'cache-products' directory.
-   cacheDistribution "jbosscache-2.0.0";
+   cacheDistribution "terracotta-2.5.0";
 =

    //might take a value from 0..max_nr_of_nodes, representing the index of=
 the current node in the cluster
    nodeIndex TBD;
@@ -25,13 +26,14 @@
 =

 sfConfig extends Compound {
 =

-   minimumClusterSize 0;
-   maximumClusterSize 9;
+   minimumClusterSize 2;
+   maximumClusterSize 7;
 =

    oneClusterSize extends Compound {
 =

       c1FirstMember extends BaseCacheBenchPrim {
-          sfProcessHost "localhost";
+    	   	  =

+          sfProcessHost "cluster01";
           nodeIndex 0;
           clusterSize 1;
           minClusterSize ATTRIB minimumClusterSize;
@@ -44,7 +46,8 @@
       sizeOfTheCluster 2;
 =

       c2FirstMember extends BaseCacheBenchPrim {
-          sfProcessHost "localhost";
+    	   =

+          sfProcessHost "cluster01";
           nodeIndex 0;
           clusterSize ATTRIB sizeOfTheCluster;
           minClusterSize ATTRIB minimumClusterSize;
@@ -52,7 +55,8 @@
       }
 =

       c2SecondMember extends BaseCacheBenchPrim {
-          sfProcessHost "localhost";
+    	   =

+          sfProcessHost "cluster02";
           nodeIndex 1;
           clusterSize ATTRIB sizeOfTheCluster;
           minClusterSize ATTRIB minimumClusterSize;
@@ -65,7 +69,8 @@
       sizeOfTheCluster 3;
 =

       c3FirstMember extends BaseCacheBenchPrim {
-          sfProcessHost "localhost";
+    	   =

+          sfProcessHost "cluster01";
           nodeIndex 0;
           clusterSize ATTRIB sizeOfTheCluster;
           minClusterSize ATTRIB minimumClusterSize;
@@ -73,7 +78,8 @@
       }
 =

       c3SecondMember extends BaseCacheBenchPrim {
-          sfProcessHost "localhost";
+    	   =

+          sfProcessHost "cluster02";
           nodeIndex 1;
           clusterSize ATTRIB sizeOfTheCluster;
           minClusterSize ATTRIB minimumClusterSize;
@@ -81,7 +87,8 @@
       }
 =

       c3ThirdMember extends BaseCacheBenchPrim {
-          sfProcessHost "localhost";
+    	   =

+          sfProcessHost "cluster03";
           nodeIndex 2;
           clusterSize ATTRIB sizeOfTheCluster;
           minClusterSize ATTRIB minimumClusterSize;
@@ -94,7 +101,8 @@
       sizeOfTheCluster 4;
 =

       c4FirstMember extends BaseCacheBenchPrim {
-          sfProcessHost "localhost";
+    	   =

+          sfProcessHost "cluster01";
           nodeIndex 0;
           clusterSize ATTRIB sizeOfTheCluster;
           minClusterSize ATTRIB minimumClusterSize;
@@ -102,7 +110,8 @@
       }
 =

       c4SecondMember extends BaseCacheBenchPrim {
-          sfProcessHost "localhost";
+    	   =

+          sfProcessHost "cluster02";
           nodeIndex 1;
           clusterSize ATTRIB sizeOfTheCluster;
           minClusterSize ATTRIB minimumClusterSize;
@@ -110,7 +119,8 @@
       }
 =

       c4ThirdMember extends BaseCacheBenchPrim {
-          sfProcessHost "localhost";
+    	   =

+          sfProcessHost "cluster03";
           nodeIndex 2;
           clusterSize ATTRIB sizeOfTheCluster;
           minClusterSize ATTRIB minimumClusterSize;
@@ -118,7 +128,8 @@
       }
 =

       c4ForthMember extends BaseCacheBenchPrim {
-          sfProcessHost "localhost";
+    	   =

+          sfProcessHost "cluster04";
           nodeIndex 3;
           clusterSize ATTRIB sizeOfTheCluster;
           minClusterSize ATTRIB minimumClusterSize;
@@ -131,7 +142,8 @@
       sizeOfTheCluster 5;
 =

       c5FirstMember extends BaseCacheBenchPrim {
-          sfProcessHost "localhost";
+    	   =

+          sfProcessHost "cluster01";
           nodeIndex 0;
           clusterSize ATTRIB sizeOfTheCluster;
           minClusterSize ATTRIB minimumClusterSize;
@@ -139,7 +151,8 @@
       }
 =

       c5SecondMember extends BaseCacheBenchPrim {
-          sfProcessHost "localhost";
+    	   =

+          sfProcessHost "cluster02";
           nodeIndex 1;
           clusterSize ATTRIB sizeOfTheCluster;
           minClusterSize ATTRIB minimumClusterSize;
@@ -147,7 +160,8 @@
       }
 =

       c5ThirdMember extends BaseCacheBenchPrim {
-          sfProcessHost "localhost";
+    	   =

+          sfProcessHost "cluster03";
           nodeIndex 2;
           clusterSize ATTRIB sizeOfTheCluster;
           minClusterSize ATTRIB minimumClusterSize;
@@ -155,7 +169,8 @@
       }
 =

       c5ForthMember extends BaseCacheBenchPrim {
-          sfProcessHost "localhost";
+    	   =

+          sfProcessHost "cluster04";
           nodeIndex 3;
           clusterSize ATTRIB sizeOfTheCluster;
           minClusterSize ATTRIB minimumClusterSize;
@@ -163,7 +178,8 @@
       }
       =

       c5FifthMember extends BaseCacheBenchPrim {
-          sfProcessHost "localhost";
+    	   =

+          sfProcessHost "cluster05";
           nodeIndex 4;
           clusterSize ATTRIB sizeOfTheCluster;
           minClusterSize ATTRIB minimumClusterSize;
@@ -176,7 +192,8 @@
       sizeOfTheCluster 6;
 =

       c6FirstMember extends BaseCacheBenchPrim {
-          sfProcessHost "localhost";
+    	   =

+          sfProcessHost "cluster01";
           nodeIndex 0;
           clusterSize ATTRIB sizeOfTheCluster;
           minClusterSize ATTRIB minimumClusterSize;
@@ -184,7 +201,8 @@
       }
 =

       c6SecondMember extends BaseCacheBenchPrim {
-          sfProcessHost "localhost";
+    	   =

+          sfProcessHost "cluster02";
           nodeIndex 1;
           clusterSize ATTRIB sizeOfTheCluster;
           minClusterSize ATTRIB minimumClusterSize;
@@ -192,7 +210,8 @@
       }
 =

       c6ThirdMember extends BaseCacheBenchPrim {
-          sfProcessHost "localhost";
+    	   =

+          sfProcessHost "cluster03";
           nodeIndex 2;
           clusterSize ATTRIB sizeOfTheCluster;
           minClusterSize ATTRIB minimumClusterSize;
@@ -200,7 +219,8 @@
       }
 =

       c6ForthMember extends BaseCacheBenchPrim {
-          sfProcessHost "localhost";
+    	   =

+          sfProcessHost "cluster04";
           nodeIndex 3;
           clusterSize ATTRIB sizeOfTheCluster;
           minClusterSize ATTRIB minimumClusterSize;
@@ -208,7 +228,8 @@
       }
 =

       c6FifthMember extends BaseCacheBenchPrim {
-          sfProcessHost "localhost";
+    	   =

+          sfProcessHost "cluster05";
           nodeIndex 4;
           clusterSize ATTRIB sizeOfTheCluster;
           minClusterSize ATTRIB minimumClusterSize;
@@ -216,7 +237,8 @@
       }
 =

       c6SixthMember extends BaseCacheBenchPrim {
-          sfProcessHost "localhost";
+    	   =

+          sfProcessHost "cluster06";
           nodeIndex 5;
           clusterSize ATTRIB sizeOfTheCluster;
           minClusterSize ATTRIB minimumClusterSize;
@@ -229,7 +251,8 @@
       sizeOfTheCluster 7;
 =

       c7FirstMember extends BaseCacheBenchPrim {
-          sfProcessHost "localhost";
+    	   =

+          sfProcessHost "cluster01";
           nodeIndex 0;
           clusterSize ATTRIB sizeOfTheCluster;
           minClusterSize ATTRIB minimumClusterSize;
@@ -237,7 +260,8 @@
       }
 =

       c7SecondMember extends BaseCacheBenchPrim {
-          sfProcessHost "localhost";
+    	   =

+          sfProcessHost "cluster02";
           nodeIndex 1;
           clusterSize ATTRIB sizeOfTheCluster;
           minClusterSize ATTRIB minimumClusterSize;
@@ -245,7 +269,8 @@
       }
 =

       c7ThirdMember extends BaseCacheBenchPrim {
-          sfProcessHost "localhost";
+    	   =

+          sfProcessHost "cluster03";
           nodeIndex 2;
           clusterSize ATTRIB sizeOfTheCluster;
           minClusterSize ATTRIB minimumClusterSize;
@@ -253,7 +278,8 @@
       }
 =

       c7ForthMember extends BaseCacheBenchPrim {
-          sfProcessHost "localhost";
+    	   =

+          sfProcessHost "cluster04";
           nodeIndex 3;
           clusterSize ATTRIB sizeOfTheCluster;
           minClusterSize ATTRIB minimumClusterSize;
@@ -261,7 +287,8 @@
       }
 =

       c7FifthMember extends BaseCacheBenchPrim {
-          sfProcessHost "localhost";
+    	   =

+          sfProcessHost "cluster05";
           nodeIndex 4;
           clusterSize ATTRIB sizeOfTheCluster;
           minClusterSize ATTRIB minimumClusterSize;
@@ -269,7 +296,8 @@
       }
 =

       c7SixthMember extends BaseCacheBenchPrim {
-          sfProcessHost "localhost";
+    	   =

+          sfProcessHost "cluster06";
           nodeIndex 5;
           clusterSize ATTRIB sizeOfTheCluster;
           minClusterSize ATTRIB minimumClusterSize;
@@ -277,7 +305,8 @@
       }
       =

       c7SeventhMember extends BaseCacheBenchPrim {
-          sfProcessHost "localhost";
+    	   =

+          sfProcessHost "cluster07";
           nodeIndex 6;
           clusterSize ATTRIB sizeOfTheCluster;
           minClusterSize ATTRIB minimumClusterSize;
@@ -290,7 +319,8 @@
       sizeOfTheCluster 8;
 =

       c8FirstMember extends BaseCacheBenchPrim {
-          sfProcessHost "localhost";
+    	   =

+          sfProcessHost "cluster01";
           nodeIndex 0;
           clusterSize ATTRIB sizeOfTheCluster;
           minClusterSize ATTRIB minimumClusterSize;
@@ -298,7 +328,8 @@
       }
 =

       c8SecondMember extends BaseCacheBenchPrim {
-          sfProcessHost "localhost";
+    	   =

+          sfProcessHost "cluster02";
           nodeIndex 1;
           clusterSize ATTRIB sizeOfTheCluster;
           minClusterSize ATTRIB minimumClusterSize;
@@ -306,7 +337,8 @@
       }
 =

       c8ThirdMember extends BaseCacheBenchPrim {
-          sfProcessHost "localhost";
+    	   =

+          sfProcessHost "cluster03";
           nodeIndex 2;
           clusterSize ATTRIB sizeOfTheCluster;
           minClusterSize ATTRIB minimumClusterSize;
@@ -314,7 +346,8 @@
       }
 =

       c8ForthMember extends BaseCacheBenchPrim {
-          sfProcessHost "localhost";
+    	   =

+          sfProcessHost "cluster04";
           nodeIndex 3;
           clusterSize ATTRIB sizeOfTheCluster;
           minClusterSize ATTRIB minimumClusterSize;
@@ -322,7 +355,8 @@
       }
 =

       c8FifthMember extends BaseCacheBenchPrim {
-          sfProcessHost "localhost";
+    	   =

+          sfProcessHost "cluster05";
           nodeIndex 4;
           clusterSize ATTRIB sizeOfTheCluster;
           minClusterSize ATTRIB minimumClusterSize;
@@ -330,7 +364,8 @@
       }
 =

       c8SixthMember extends BaseCacheBenchPrim {
-          sfProcessHost "localhost";
+    	   =

+          sfProcessHost "cluster06";
           nodeIndex 5;
           clusterSize ATTRIB sizeOfTheCluster;
           minClusterSize ATTRIB minimumClusterSize;
@@ -338,7 +373,8 @@
       }
 =

       c8SeventhMember extends BaseCacheBenchPrim {
-          sfProcessHost "localhost";
+    	   =

+          sfProcessHost "cluster07";
           nodeIndex 6;
           clusterSize ATTRIB sizeOfTheCluster;
           minClusterSize ATTRIB minimumClusterSize;
@@ -346,7 +382,8 @@
       }
 =

       c8EighthMember extends BaseCacheBenchPrim {
-          sfProcessHost "localhost";
+    	   =

+          sfProcessHost "cluster08";
           nodeIndex 7;
           clusterSize ATTRIB sizeOfTheCluster;
           minClusterSize ATTRIB minimumClusterSize;
@@ -359,7 +396,8 @@
       sizeOfTheCluster 9;
 =

       c9FirstMember extends BaseCacheBenchPrim {
-          sfProcessHost "localhost";
+    	   =

+          sfProcessHost "cluster01";
           nodeIndex 0;
           clusterSize ATTRIB sizeOfTheCluster;
           minClusterSize ATTRIB minimumClusterSize;
@@ -367,7 +405,8 @@
       }
 =

       c9SecondMember extends BaseCacheBenchPrim {
-          sfProcessHost "localhost";
+    	   =

+          sfProcessHost "cluster02";
           nodeIndex 1;
           clusterSize ATTRIB sizeOfTheCluster;
           minClusterSize ATTRIB minimumClusterSize;
@@ -375,7 +414,8 @@
       }
 =

       c9ThirdMember extends BaseCacheBenchPrim {
-          sfProcessHost "localhost";
+    	   =

+          sfProcessHost "cluster03";
           nodeIndex 2;
           clusterSize ATTRIB sizeOfTheCluster;
           minClusterSize ATTRIB minimumClusterSize;
@@ -383,7 +423,8 @@
       }
 =

       c9ForthMember extends BaseCacheBenchPrim {
-          sfProcessHost "localhost";
+    	   =

+          sfProcessHost "cluster04";
           nodeIndex 3;
           clusterSize ATTRIB sizeOfTheCluster;
           minClusterSize ATTRIB minimumClusterSize;
@@ -391,7 +432,8 @@
       }
 =

       c9FifthMember extends BaseCacheBenchPrim {
-          sfProcessHost "localhost";
+    	   =

+          sfProcessHost "cluster05";
           nodeIndex 4;
           clusterSize ATTRIB sizeOfTheCluster;
           minClusterSize ATTRIB minimumClusterSize;
@@ -399,7 +441,8 @@
       }
 =

       c9SixthMember extends BaseCacheBenchPrim {
-          sfProcessHost "localhost";
+    	   =

+          sfProcessHost "cluster06";
           nodeIndex 5;
           clusterSize ATTRIB sizeOfTheCluster;
           minClusterSize ATTRIB minimumClusterSize;
@@ -407,7 +450,8 @@
       }
 =

       c9SeventhMember extends BaseCacheBenchPrim {
-          sfProcessHost "localhost";
+    	   =

+          sfProcessHost "cluster07";
           nodeIndex 6;
           clusterSize ATTRIB sizeOfTheCluster;
           minClusterSize ATTRIB minimumClusterSize;
@@ -415,7 +459,8 @@
       }
 =

       c9EighthMember extends BaseCacheBenchPrim {
-          sfProcessHost "localhost";
+    	   =

+          sfProcessHost "cluster08";
           nodeIndex 7;
           clusterSize ATTRIB sizeOfTheCluster;
           minClusterSize ATTRIB minimumClusterSize;
@@ -423,12 +468,13 @@
       }
 =

       c9NinthMember extends BaseCacheBenchPrim {
-          sfProcessHost "localhost";
-          nodeIndex 7;
+    	   =

+          sfProcessHost "cluster09";
+          nodeIndex 8;
           clusterSize ATTRIB sizeOfTheCluster;
           minClusterSize ATTRIB minimumClusterSize;
           maxClusterSize ATTRIB maximumClusterSize;
       }
    }
+}
 =

-}


--===============6228546695282939956==--

From jbosscache-commits at lists.jboss.org Mon Jan  7 09:10:03 2008
Content-Type: multipart/mixed; boundary="===============2602865321541456494=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r5034 - in
 cache-bench-fwk/trunk: smartfrog and 6 other directories.
Date: Mon, 07 Jan 2008 09:10:03 -0500
Message-ID: <E1JBsfz-0004yH-8x@committer01.frg.pub.inap.atl.jboss.com>

--===============2602865321541456494==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: mircea.markus
Date: 2008-01-07 09:10:02 -0500 (Mon, 07 Jan 2008)
New Revision: 5034

Added:
   cache-bench-fwk/trunk/smartfrog/main_dev.sf
   cache-bench-fwk/trunk/src/org/cachebench/reportgenerators/CsvBaseReportG=
enerator.java
   cache-bench-fwk/trunk/src/org/cachebench/reportgenerators/CsvSessionSiml=
atorReportGenerator.java
   cache-bench-fwk/trunk/src/org/cachebench/tests/SessionSimulatorTest.java
   cache-bench-fwk/trunk/src/org/cachebench/tests/SessionSimulatorTestResul=
t.java
   cache-bench-fwk/trunk/src/org/cachebench/tests/results/
   cache-bench-fwk/trunk/src/org/cachebench/tests/results/BaseTestResult.ja=
va
   cache-bench-fwk/trunk/src/org/cachebench/tests/results/StatisticTestResu=
lt.java
   cache-bench-fwk/trunk/src/org/cachebench/tests/results/TestResult.java
   cache-bench-fwk/trunk/src/org/cachebench/tests/simpletests/
   cache-bench-fwk/trunk/src/org/cachebench/tests/simpletests/AssociationsT=
est.java
   cache-bench-fwk/trunk/src/org/cachebench/tests/simpletests/CustomClassTe=
st.java
   cache-bench-fwk/trunk/src/org/cachebench/tests/simpletests/PrimitiveTest=
.java
   cache-bench-fwk/trunk/src/org/cachebench/tests/simpletests/SimpleTest.ja=
va
   cache-bench-fwk/trunk/src/org/cachebench/tests/simpletests/StaticsTest.j=
ava
   cache-bench-fwk/trunk/src/org/cachebench/tests/simpletests/StringTest.ja=
va
   cache-bench-fwk/trunk/src/org/cachebench/tests/simpletests/SubclassTest.=
java
   cache-bench-fwk/trunk/src/org/cachebench/tests/simpletests/TransientTest=
.java
Removed:
   cache-bench-fwk/trunk/smartfrog/cacheBenchComponent.sf
   cache-bench-fwk/trunk/smartfrog/conf.sf
   cache-bench-fwk/trunk/src/org/cachebench/TestResult.java
   cache-bench-fwk/trunk/src/org/cachebench/reportgenerators/CSVReportGener=
ator.java
   cache-bench-fwk/trunk/src/org/cachebench/tests/AssociationsTest.java
   cache-bench-fwk/trunk/src/org/cachebench/tests/CustomClassTest.java
   cache-bench-fwk/trunk/src/org/cachebench/tests/PrimitiveTest.java
   cache-bench-fwk/trunk/src/org/cachebench/tests/SimpleTest.java
   cache-bench-fwk/trunk/src/org/cachebench/tests/StaticsTest.java
   cache-bench-fwk/trunk/src/org/cachebench/tests/StringTest.java
   cache-bench-fwk/trunk/src/org/cachebench/tests/SubclassTest.java
   cache-bench-fwk/trunk/src/org/cachebench/tests/TransientTest.java
Modified:
   cache-bench-fwk/trunk/conf/cachebench.xml
   cache-bench-fwk/trunk/src/org/cachebench/CacheBenchmarkRunner.java
   cache-bench-fwk/trunk/src/org/cachebench/config/GenericParamsConfig.java
   cache-bench-fwk/trunk/src/org/cachebench/reportgenerators/AbstractReport=
Generator.java
   cache-bench-fwk/trunk/src/org/cachebench/reportgenerators/ClusterReportG=
enerator.java
   cache-bench-fwk/trunk/src/org/cachebench/reportgenerators/ReportGenerato=
r.java
   cache-bench-fwk/trunk/src/org/cachebench/tests/CacheTest.java
   cache-bench-fwk/trunk/src/org/cachebench/tests/ReplicationOccursTest.java
Log:
added session simulator test + refactoring

Modified: cache-bench-fwk/trunk/conf/cachebench.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- cache-bench-fwk/trunk/conf/cachebench.xml	2008-01-07 14:07:27 UTC (rev =
5033)
+++ cache-bench-fwk/trunk/conf/cachebench.xml	2008-01-07 14:10:02 UTC (rev =
5034)
@@ -47,7 +47,7 @@
       org.cachebench.warmup.NoCacheWarmup
       -->
       <warmup warmupClass=3D"org.cachebench.warmup.PutGetCacheWarmup">
-         <param name=3D"operationCount" value=3D"100"/>
+         <param name=3D"operationCount" value=3D"10000"/>
       </warmup>
 =

       <!--
@@ -63,15 +63,22 @@
          * You can write your own custom testClass.
          * weight is currently unused.
       -->
-       <test name=3D"Strings" testClass=3D"org.cachebench.tests.StringTest=
" weight=3D"2.0" />
+       <!--<test name=3D"Strings" testClass=3D"org.cachebench.tests.simple=
tests.StringTest" weight=3D"2.0" />-->
+       =

+       <test name=3D"Strings" testClass=3D"org.cachebench.tests.SessionSim=
ulatorTest" weight=3D"2.0" >
+          <param name=3D"numberOfRequest" value=3D"1000000"/>
+          <param name=3D"numberOfAttributes" value=3D"100"/>
+          <param name=3D"writePercentage" value=3D"20"/>
+          <param name=3D"sizeOfAnAttribute" value=3D"1000"/>
+       </test>
 =

        <!--
-      <test name=3D"Primitive Wrappers" testClass=3D"org.cachebench.tests.=
PrimitiveTest" weight=3D"1.0" />
-		<test name=3D"Custom Class Types" testClass=3D"org.cachebench.tests.Cust=
omClassTest" weight=3D"1.0" />
-		<test name=3D"Custom Subclasses of Abstracts" testClass=3D"org.cachebenc=
h.tests.SubclassTest" weight=3D"1.5" />
-		<test name=3D"Custom Types With Transients" testClass=3D"org.cachebench.=
tests.TransientTest" weight=3D"1.0" />
-		<test name=3D"Custom Types With Statics" testClass=3D"org.cachebench.tes=
ts.StaticsTest" weight=3D"1.5" />
-		<test name=3D"Custom Types With Associations" testClass=3D"org.cachebenc=
h.tests.AssociationsTest" weight=3D"2.0" />
+      <test name=3D"Primitive Wrappers" testClass=3D"org.cachebench.tests.=
simpletests.PrimitiveTest" weight=3D"1.0" />
+		<test name=3D"Custom Class Types" testClass=3D"org.cachebench.tests.simp=
letests.CustomClassTest" weight=3D"1.0" />
+		<test name=3D"Custom Subclasses of Abstracts" testClass=3D"org.cachebenc=
h.tests.simpletests.SubclassTest" weight=3D"1.5" />
+		<test name=3D"Custom Types With Transients" testClass=3D"org.cachebench.=
tests.simpletests.TransientTest" weight=3D"1.0" />
+		<test name=3D"Custom Types With Statics" testClass=3D"org.cachebench.tes=
ts.simpletests.StaticsTest" weight=3D"1.5" />
+		<test name=3D"Custom Types With Associations" testClass=3D"org.cachebenc=
h.tests.simpletests.AssociationsTest" weight=3D"2.0" />
 		-->
 =

 		<!-- arbitrary params may be passed into the cacheWrapper implementation=
, typically used to pass in config files for the cache product. -->
@@ -93,7 +100,7 @@
 		own report generators such as XML generators, graphic generators, etc
    -->
    <!-- The CSV report generated can be plugged in to a spreadsheet to gen=
erate graphs. If 'outputFile is set to
-   '-generic-' then the name would be generated as follows: 'performance-<=
clusterSize>.csv' -->
+   '-generic-' then the name would be generated as follows: 'performance-<=
nodeIndeInCluster>.csv' -->
    <report outputFile=3D"-generic-" generator=3D"org.cachebench.reportgene=
rators.ClusterReportGenerator"/>
 =

 </cachebench>

Deleted: cache-bench-fwk/trunk/smartfrog/cacheBenchComponent.sf
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- cache-bench-fwk/trunk/smartfrog/cacheBenchComponent.sf	2008-01-07 14:07=
:27 UTC (rev 5033)
+++ cache-bench-fwk/trunk/smartfrog/cacheBenchComponent.sf	2008-01-07 14:10=
:02 UTC (rev 5034)
@@ -1,20 +0,0 @@
-#include "org/smartfrog/components.sf"
-
-BaseCacheBenchPrim extends Prim {
-   sfClass "org.cachebench.smartfrog.CacheBenchmarkPrim";
-
-   scriptToExec "./runNode.sh"
-
-   //FQN of the directory where the framework was checked out (noramally i=
s th eparent of the dir that contains this file)
-   //this should be edited
-   cacheBenchmarkHome "c:/projects/jboss/cache/benchmark/cache-bench-fwk";
-
-   //should be the name of a subdirectory of 'cache-products' directory.
-   cacheDistribution "jbosscache-2.0.0";
-
-   //defines on how many nodes the benchmark will run
-   clusterSize 1;
-
-   //might take a value from 0..max_nr_of_nodes, representing the index of=
 the current node in the cluster
-   nodeIndex TBD;
-}
\ No newline at end of file

Deleted: cache-bench-fwk/trunk/smartfrog/conf.sf
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- cache-bench-fwk/trunk/smartfrog/conf.sf	2008-01-07 14:07:27 UTC (rev 50=
33)
+++ cache-bench-fwk/trunk/smartfrog/conf.sf	2008-01-07 14:10:02 UTC (rev 50=
34)
@@ -1,33 +0,0 @@
-//Most sf files start with this line.  Compound is a sf component that can=
 have children components.
-sfConfig extends Compound
-{
-
-   //The CacheBenchController starts up the slaves, runs the master, then =
collects the results.
-   controller extends CacheBenchController
-   {
-      //List of cluster sizes to test.  In this case the first cluster wou=
ld be a single master.  Second cluster would be one master and one slave.
-      clusterConfigs [1,2];
-
-      //Pool of hosts to deploy the slaves onto.
-      slaves [ "cluster02", "cluster03", "cluster04", "cluster05", "cluste=
r06", "cluster07", "cluster08" ];
-
-      //Template used for slave components.  Each slave will be a copy of =
this component, with the sfHost attribute replaced by one of the hostnames =
above.
-      slaveTemplate extends LAZY CacheBenchSlave
-      {
-         plugin "jbosscache-1.4.1";
-         //bindAddress "10.1.5.2";
-         homeDir "/home/pthurmond/sandbox/cachebench/CacheBenchFwk";
-      }
-
-      //Master component.
-      master extends LAZY CacheBenchMaster
-      {                             =

-        sfHost "localhost";
-        autoStart true;
-        //Which cache provider?  This is based on the directory structure =
in the CacheBenchFwk cvs.  Sort of fragile imo.  Maybe the classpath could =
be simplified some?
-        plugin "jbosscache-1.4.1";
-        homeDir "/home/pthurmond/sandbox/cachebench/CacheBenchFwk";
-        //bindAddress "10.1.5.1";
-      }
-   }
-}
\ No newline at end of file

Added: cache-bench-fwk/trunk/smartfrog/main_dev.sf
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- cache-bench-fwk/trunk/smartfrog/main_dev.sf	                        (re=
v 0)
+++ cache-bench-fwk/trunk/smartfrog/main_dev.sf	2008-01-07 14:10:02 UTC (re=
v 5034)
@@ -0,0 +1,434 @@
+#include "org/smartfrog/components.sf"
+
+
+BaseCacheBenchPrim extends Prim {
+   sfClass "org.cachebench.smartfrog.CacheBenchmarkPrim";
+
+   scriptToExec "./runNode.sh"
+
+   //FQN of the directory where the framework was checked out (noramally i=
s th eparent of the dir that contains this file)
+   //this should be edited
+   cacheBenchmarkHome "/projects/jboss/cache/benchmark/cache-bench-fwk";
+
+   //should be the name of a subdirectory of 'cache-products' directory.
+   cacheDistribution "jbosscache-2.0.0";
+
+   //might take a value from 0..max_nr_of_nodes, representing the index of=
 the current node in the cluster
+   nodeIndex TBD;
+
+   //defines on how many nodes the benchmark will run
+   clusterSize TBD;
+   minClusterSize TBD;
+   maxClusterSize TBD;
+
+}
+
+sfConfig extends Compound {
+
+   minimumClusterSize 3;
+   maximumClusterSize 5;
+
+   oneClusterSize extends Compound {
+
+      c1FirstMember extends BaseCacheBenchPrim {
+          sfProcessHost "localhost";
+          nodeIndex 0;
+          clusterSize 1;
+          minClusterSize ATTRIB minimumClusterSize;
+          maxClusterSize ATTRIB maximumClusterSize;
+      }
+   }
+
+   twoClusterSize extends Compound {
+
+      sizeOfTheCluster 2;
+
+      c2FirstMember extends BaseCacheBenchPrim {
+          sfProcessHost "localhost";
+          nodeIndex 0;
+          clusterSize ATTRIB sizeOfTheCluster;
+          minClusterSize ATTRIB minimumClusterSize;
+          maxClusterSize ATTRIB maximumClusterSize;
+      }
+
+      c2SecondMember extends BaseCacheBenchPrim {
+          sfProcessHost "localhost";
+          nodeIndex 1;
+          clusterSize ATTRIB sizeOfTheCluster;
+          minClusterSize ATTRIB minimumClusterSize;
+          maxClusterSize ATTRIB maximumClusterSize;
+      }
+   }
+
+   threeClusterSize extends Compound {
+
+      sizeOfTheCluster 3;
+
+      c3FirstMember extends BaseCacheBenchPrim {
+          sfProcessHost "localhost";
+          nodeIndex 0;
+          clusterSize ATTRIB sizeOfTheCluster;
+          minClusterSize ATTRIB minimumClusterSize;
+          maxClusterSize ATTRIB maximumClusterSize;
+      }
+
+      c3SecondMember extends BaseCacheBenchPrim {
+          sfProcessHost "localhost";
+          nodeIndex 1;
+          clusterSize ATTRIB sizeOfTheCluster;
+          minClusterSize ATTRIB minimumClusterSize;
+          maxClusterSize ATTRIB maximumClusterSize;
+      }
+
+      c3ThirdMember extends BaseCacheBenchPrim {
+          sfProcessHost "localhost";
+          nodeIndex 2;
+          clusterSize ATTRIB sizeOfTheCluster;
+          minClusterSize ATTRIB minimumClusterSize;
+          maxClusterSize ATTRIB maximumClusterSize;
+      }
+   }
+
+   fourClusterSize extends Compound {
+
+      sizeOfTheCluster 4;
+
+      c4FirstMember extends BaseCacheBenchPrim {
+          sfProcessHost "localhost";
+          nodeIndex 0;
+          clusterSize ATTRIB sizeOfTheCluster;
+          minClusterSize ATTRIB minimumClusterSize;
+          maxClusterSize ATTRIB maximumClusterSize;
+      }
+
+      c4SecondMember extends BaseCacheBenchPrim {
+          sfProcessHost "localhost";
+          nodeIndex 1;
+          clusterSize ATTRIB sizeOfTheCluster;
+          minClusterSize ATTRIB minimumClusterSize;
+          maxClusterSize ATTRIB maximumClusterSize;
+      }
+
+      c4ThirdMember extends BaseCacheBenchPrim {
+          sfProcessHost "localhost";
+          nodeIndex 2;
+          clusterSize ATTRIB sizeOfTheCluster;
+          minClusterSize ATTRIB minimumClusterSize;
+          maxClusterSize ATTRIB maximumClusterSize;
+      }
+
+      c4ForthMember extends BaseCacheBenchPrim {
+          sfProcessHost "localhost";
+          nodeIndex 3;
+          clusterSize ATTRIB sizeOfTheCluster;
+          minClusterSize ATTRIB minimumClusterSize;
+          maxClusterSize ATTRIB maximumClusterSize;
+      }
+   }
+
+   fiveClusterSize extends Compound {
+
+      sizeOfTheCluster 5;
+
+      c5FirstMember extends BaseCacheBenchPrim {
+          sfProcessHost "localhost";
+          nodeIndex 0;
+          clusterSize ATTRIB sizeOfTheCluster;
+          minClusterSize ATTRIB minimumClusterSize;
+          maxClusterSize ATTRIB maximumClusterSize;
+      }
+
+      c5SecondMember extends BaseCacheBenchPrim {
+          sfProcessHost "localhost";
+          nodeIndex 1;
+          clusterSize ATTRIB sizeOfTheCluster;
+          minClusterSize ATTRIB minimumClusterSize;
+          maxClusterSize ATTRIB maximumClusterSize;
+      }
+
+      c5ThirdMember extends BaseCacheBenchPrim {
+          sfProcessHost "localhost";
+          nodeIndex 2;
+          clusterSize ATTRIB sizeOfTheCluster;
+          minClusterSize ATTRIB minimumClusterSize;
+          maxClusterSize ATTRIB maximumClusterSize;
+      }
+
+      c5ForthMember extends BaseCacheBenchPrim {
+          sfProcessHost "localhost";
+          nodeIndex 3;
+          clusterSize ATTRIB sizeOfTheCluster;
+          minClusterSize ATTRIB minimumClusterSize;
+          maxClusterSize ATTRIB maximumClusterSize;
+      }
+
+      c5FifthMember extends BaseCacheBenchPrim {
+          sfProcessHost "localhost";
+          nodeIndex 4;
+          clusterSize ATTRIB sizeOfTheCluster;
+          minClusterSize ATTRIB minimumClusterSize;
+          maxClusterSize ATTRIB maximumClusterSize;
+      }
+   }
+
+   sixClusterSize extends Compound {
+
+      sizeOfTheCluster 6;
+
+      c6FirstMember extends BaseCacheBenchPrim {
+          sfProcessHost "localhost";
+          nodeIndex 0;
+          clusterSize ATTRIB sizeOfTheCluster;
+          minClusterSize ATTRIB minimumClusterSize;
+          maxClusterSize ATTRIB maximumClusterSize;
+      }
+
+      c6SecondMember extends BaseCacheBenchPrim {
+          sfProcessHost "localhost";
+          nodeIndex 1;
+          clusterSize ATTRIB sizeOfTheCluster;
+          minClusterSize ATTRIB minimumClusterSize;
+          maxClusterSize ATTRIB maximumClusterSize;
+      }
+
+      c6ThirdMember extends BaseCacheBenchPrim {
+          sfProcessHost "localhost";
+          nodeIndex 2;
+          clusterSize ATTRIB sizeOfTheCluster;
+          minClusterSize ATTRIB minimumClusterSize;
+          maxClusterSize ATTRIB maximumClusterSize;
+      }
+
+      c6ForthMember extends BaseCacheBenchPrim {
+          sfProcessHost "localhost";
+          nodeIndex 3;
+          clusterSize ATTRIB sizeOfTheCluster;
+          minClusterSize ATTRIB minimumClusterSize;
+          maxClusterSize ATTRIB maximumClusterSize;
+      }
+
+      c6FifthMember extends BaseCacheBenchPrim {
+          sfProcessHost "localhost";
+          nodeIndex 4;
+          clusterSize ATTRIB sizeOfTheCluster;
+          minClusterSize ATTRIB minimumClusterSize;
+          maxClusterSize ATTRIB maximumClusterSize;
+      }
+
+      c6SixthMember extends BaseCacheBenchPrim {
+          sfProcessHost "localhost";
+          nodeIndex 5;
+          clusterSize ATTRIB sizeOfTheCluster;
+          minClusterSize ATTRIB minimumClusterSize;
+          maxClusterSize ATTRIB maximumClusterSize;
+      }
+   }
+
+   sevenClusterSize extends Compound {
+
+      sizeOfTheCluster 7;
+
+      c7FirstMember extends BaseCacheBenchPrim {
+          sfProcessHost "localhost";
+          nodeIndex 0;
+          clusterSize ATTRIB sizeOfTheCluster;
+          minClusterSize ATTRIB minimumClusterSize;
+          maxClusterSize ATTRIB maximumClusterSize;
+      }
+
+      c7SecondMember extends BaseCacheBenchPrim {
+          sfProcessHost "localhost";
+          nodeIndex 1;
+          clusterSize ATTRIB sizeOfTheCluster;
+          minClusterSize ATTRIB minimumClusterSize;
+          maxClusterSize ATTRIB maximumClusterSize;
+      }
+
+      c7ThirdMember extends BaseCacheBenchPrim {
+          sfProcessHost "localhost";
+          nodeIndex 2;
+          clusterSize ATTRIB sizeOfTheCluster;
+          minClusterSize ATTRIB minimumClusterSize;
+          maxClusterSize ATTRIB maximumClusterSize;
+      }
+
+      c7ForthMember extends BaseCacheBenchPrim {
+          sfProcessHost "localhost";
+          nodeIndex 3;
+          clusterSize ATTRIB sizeOfTheCluster;
+          minClusterSize ATTRIB minimumClusterSize;
+          maxClusterSize ATTRIB maximumClusterSize;
+      }
+
+      c7FifthMember extends BaseCacheBenchPrim {
+          sfProcessHost "localhost";
+          nodeIndex 4;
+          clusterSize ATTRIB sizeOfTheCluster;
+          minClusterSize ATTRIB minimumClusterSize;
+          maxClusterSize ATTRIB maximumClusterSize;
+      }
+
+      c7SixthMember extends BaseCacheBenchPrim {
+          sfProcessHost "localhost";
+          nodeIndex 5;
+          clusterSize ATTRIB sizeOfTheCluster;
+          minClusterSize ATTRIB minimumClusterSize;
+          maxClusterSize ATTRIB maximumClusterSize;
+      }
+
+      c7SeventhMember extends BaseCacheBenchPrim {
+          sfProcessHost "localhost";
+          nodeIndex 6;
+          clusterSize ATTRIB sizeOfTheCluster;
+          minClusterSize ATTRIB minimumClusterSize;
+          maxClusterSize ATTRIB maximumClusterSize;
+      }
+   }
+
+   eightClusterSize extends Compound {
+
+      sizeOfTheCluster 8;
+
+      c8FirstMember extends BaseCacheBenchPrim {
+          sfProcessHost "localhost";
+          nodeIndex 0;
+          clusterSize ATTRIB sizeOfTheCluster;
+          minClusterSize ATTRIB minimumClusterSize;
+          maxClusterSize ATTRIB maximumClusterSize;
+      }
+
+      c8SecondMember extends BaseCacheBenchPrim {
+          sfProcessHost "localhost";
+          nodeIndex 1;
+          clusterSize ATTRIB sizeOfTheCluster;
+          minClusterSize ATTRIB minimumClusterSize;
+          maxClusterSize ATTRIB maximumClusterSize;
+      }
+
+      c8ThirdMember extends BaseCacheBenchPrim {
+          sfProcessHost "localhost";
+          nodeIndex 2;
+          clusterSize ATTRIB sizeOfTheCluster;
+          minClusterSize ATTRIB minimumClusterSize;
+          maxClusterSize ATTRIB maximumClusterSize;
+      }
+
+      c8ForthMember extends BaseCacheBenchPrim {
+          sfProcessHost "localhost";
+          nodeIndex 3;
+          clusterSize ATTRIB sizeOfTheCluster;
+          minClusterSize ATTRIB minimumClusterSize;
+          maxClusterSize ATTRIB maximumClusterSize;
+      }
+
+      c8FifthMember extends BaseCacheBenchPrim {
+          sfProcessHost "localhost";
+          nodeIndex 4;
+          clusterSize ATTRIB sizeOfTheCluster;
+          minClusterSize ATTRIB minimumClusterSize;
+          maxClusterSize ATTRIB maximumClusterSize;
+      }
+
+      c8SixthMember extends BaseCacheBenchPrim {
+          sfProcessHost "localhost";
+          nodeIndex 5;
+          clusterSize ATTRIB sizeOfTheCluster;
+          minClusterSize ATTRIB minimumClusterSize;
+          maxClusterSize ATTRIB maximumClusterSize;
+      }
+
+      c8SeventhMember extends BaseCacheBenchPrim {
+          sfProcessHost "localhost";
+          nodeIndex 6;
+          clusterSize ATTRIB sizeOfTheCluster;
+          minClusterSize ATTRIB minimumClusterSize;
+          maxClusterSize ATTRIB maximumClusterSize;
+      }
+
+      c8EighthMember extends BaseCacheBenchPrim {
+          sfProcessHost "localhost";
+          nodeIndex 7;
+          clusterSize ATTRIB sizeOfTheCluster;
+          minClusterSize ATTRIB minimumClusterSize;
+          maxClusterSize ATTRIB maximumClusterSize;
+      }
+   }
+
+   nineClusterSize extends Compound {
+
+      sizeOfTheCluster 9;
+
+      c9FirstMember extends BaseCacheBenchPrim {
+          sfProcessHost "localhost";
+          nodeIndex 0;
+          clusterSize ATTRIB sizeOfTheCluster;
+          minClusterSize ATTRIB minimumClusterSize;
+          maxClusterSize ATTRIB maximumClusterSize;
+      }
+
+      c9SecondMember extends BaseCacheBenchPrim {
+          sfProcessHost "localhost";
+          nodeIndex 1;
+          clusterSize ATTRIB sizeOfTheCluster;
+          minClusterSize ATTRIB minimumClusterSize;
+          maxClusterSize ATTRIB maximumClusterSize;
+      }
+
+      c9ThirdMember extends BaseCacheBenchPrim {
+          sfProcessHost "localhost";
+          nodeIndex 2;
+          clusterSize ATTRIB sizeOfTheCluster;
+          minClusterSize ATTRIB minimumClusterSize;
+          maxClusterSize ATTRIB maximumClusterSize;
+      }
+
+      c9ForthMember extends BaseCacheBenchPrim {
+          sfProcessHost "localhost";
+          nodeIndex 3;
+          clusterSize ATTRIB sizeOfTheCluster;
+          minClusterSize ATTRIB minimumClusterSize;
+          maxClusterSize ATTRIB maximumClusterSize;
+      }
+
+      c9FifthMember extends BaseCacheBenchPrim {
+          sfProcessHost "localhost";
+          nodeIndex 4;
+          clusterSize ATTRIB sizeOfTheCluster;
+          minClusterSize ATTRIB minimumClusterSize;
+          maxClusterSize ATTRIB maximumClusterSize;
+      }
+
+      c9SixthMember extends BaseCacheBenchPrim {
+          sfProcessHost "localhost";
+          nodeIndex 5;
+          clusterSize ATTRIB sizeOfTheCluster;
+          minClusterSize ATTRIB minimumClusterSize;
+          maxClusterSize ATTRIB maximumClusterSize;
+      }
+
+      c9SeventhMember extends BaseCacheBenchPrim {
+          sfProcessHost "localhost";
+          nodeIndex 6;
+          clusterSize ATTRIB sizeOfTheCluster;
+          minClusterSize ATTRIB minimumClusterSize;
+          maxClusterSize ATTRIB maximumClusterSize;
+      }
+
+      c9EighthMember extends BaseCacheBenchPrim {
+          sfProcessHost "localhost";
+          nodeIndex 7;
+          clusterSize ATTRIB sizeOfTheCluster;
+          minClusterSize ATTRIB minimumClusterSize;
+          maxClusterSize ATTRIB maximumClusterSize;
+      }
+
+      c9NinthMember extends BaseCacheBenchPrim {
+          sfProcessHost "localhost";
+          nodeIndex 7;
+          clusterSize ATTRIB sizeOfTheCluster;
+          minClusterSize ATTRIB minimumClusterSize;
+          maxClusterSize ATTRIB maximumClusterSize;
+      }
+   }
+
+}

Modified: cache-bench-fwk/trunk/src/org/cachebench/CacheBenchmarkRunner.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- cache-bench-fwk/trunk/src/org/cachebench/CacheBenchmarkRunner.java	2008=
-01-07 14:07:27 UTC (rev 5033)
+++ cache-bench-fwk/trunk/src/org/cachebench/CacheBenchmarkRunner.java	2008=
-01-07 14:10:02 UTC (rev 5034)
@@ -3,14 +3,15 @@
 =

 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.cachebench.cluster.ClusterBarrier;
 import org.cachebench.config.*;
 import org.cachebench.reportgenerators.ReportGenerator;
 import org.cachebench.tests.CacheTest;
-import org.cachebench.cluster.ClusterBarrier;
+import org.cachebench.tests.results.BaseTestResult;
+import org.cachebench.tests.results.TestResult;
 import org.cachebench.utils.Instantiator;
 import org.cachebench.warmup.CacheWarmup;
 =

-import java.io.File;
 import java.net.URL;
 import java.util.ArrayList;
 import java.util.Date;
@@ -200,7 +201,7 @@
             catch (Exception e)
             {
                // The test failed. We should add a test result object with=
 a error message and indicate that it failed.
-               result =3D new TestResult();
+               result =3D new BaseTestResult();
                result.setTestName(testCaseName);
                result.setTestTime(new Date());
                result.setTestType(testName);

Deleted: cache-bench-fwk/trunk/src/org/cachebench/TestResult.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- cache-bench-fwk/trunk/src/org/cachebench/TestResult.java	2008-01-07 14:=
07:27 UTC (rev 5033)
+++ cache-bench-fwk/trunk/src/org/cachebench/TestResult.java	2008-01-07 14:=
10:02 UTC (rev 5034)
@@ -1,188 +0,0 @@
-package org.cachebench;
-
-import org.apache.commons.math.stat.descriptive.DescriptiveStatistics;
-
-import java.io.Serializable;
-import java.util.Date;
-
-
-/**
- * @author Manik Surtani (manik(a)surtani.org)
- * @version $Id: TestResult.java,v 1.4 2007/04/18 19:09:30 msurtani Exp $
- */
-public class TestResult implements Serializable
-{
-   private String testName;
-   private String testType;
-   private Date testTime;
-   private DescriptiveStatistics putData, getData;
-   private boolean testPassed; // This is to indicate whether the test is =
passed/failed.
-   private String errorMsg =3D ""; // This holds the error message if any =
error had occured in the test.
-   private String footNote =3D ""; // This is utilized if special notes ne=
ed to be captured for this test.
-   private int throughputTransactionsPerSecond;
-   private int throughputBytesPerSecond;
-   private int numMembers;
-   private int numThreads;
-   private boolean skipReport;
-
-   public DescriptiveStatistics getGetData()
-   {
-      return getData;
-   }
-
-   public void setGetData(DescriptiveStatistics getData)
-   {
-      this.getData =3D getData;
-   }
-
-   public DescriptiveStatistics getPutData()
-   {
-      return putData;
-   }
-
-   public void setPutData(DescriptiveStatistics putData)
-   {
-      this.putData =3D putData;
-   }
-
-   public String getTestName()
-   {
-      return testName;
-   }
-
-   public void setTestName(String testName)
-   {
-      this.testName =3D testName;
-   }
-
-   public String getTestType()
-   {
-      return testType;
-   }
-
-   public void setTestType(String testType)
-   {
-      this.testType =3D testType;
-   }
-
-   public Date getTestTime()
-   {
-      return testTime;
-   }
-
-   public void setTestTime(Date testTime)
-   {
-      this.testTime =3D testTime;
-   }
-
-   public boolean isTestPassed()
-   {
-      return testPassed;
-   }
-
-   public void setTestPassed(boolean testPassed)
-   {
-      this.testPassed =3D testPassed;
-   }
-
-   public String getErrorMsg()
-   {
-      return errorMsg;
-   }
-
-   public void setErrorMsg(String errorMsg)
-   {
-      this.errorMsg =3D errorMsg;
-   }
-
-   public String getFootNote()
-   {
-      return footNote;
-   }
-
-   public void setFootNote(String footNote)
-   {
-      this.footNote =3D footNote;
-   }
-
-   /**
-    * This is only measured on put() operations as it has little meaning f=
or get()s.
-    */
-   public int getThroughputTransactionsPerSecond()
-   {
-      return throughputTransactionsPerSecond;
-   }
-
-   public void setThroughputTransactionsPerSecond(int throughputTransactio=
nsPerSecond)
-   {
-      this.throughputTransactionsPerSecond =3D throughputTransactionsPerSe=
cond;
-   }
-
-   /**
-    * This is only measured on put() operations as it has little meaning f=
or get()s.  Note that the serialized size of objects
-    * are used to calculate this, not the ACTUAL bytes transmitted, as som=
e cache impls (JBoss Cache >=3D 1.4) has internal
-    * marshallers that reduce object sizes to smaller than what they would=
 be if serialized.  For the sake of comparing though,
-    * one must still consider that an object of, say, 200 bytes when seria=
lized was transmitted, even if the cache compresses
-    * this to 100 bytes.
-    */
-   public int getThroughputBytesPerSecond()
-   {
-      return throughputBytesPerSecond;
-   }
-
-   public void setThroughputBytesPerSecond(int throughputBytesPerSecond)
-   {
-      this.throughputBytesPerSecond =3D throughputBytesPerSecond;
-   }
-
-   public int getNumMembers()
-   {
-      return numMembers;
-   }
-
-   public void setNumMembers(int numMembers)
-   {
-      this.numMembers =3D numMembers;
-   }
-
-   public int getNumThreads()
-   {
-      return numThreads;
-   }
-
-   public void setNumThreads(int numThreads)
-   {
-      this.numThreads =3D numThreads;
-   }
-
-   public String toString()
-   {
-      return "TestResult{" +
-            "testName=3D'" + testName + '\'' +
-            ", testType=3D'" + testType + '\'' +
-            ", testTime=3D" + testTime +
-            ", putData=3D" + putData +
-            ", getData=3D" + getData +
-            ", testPassed=3D" + testPassed +
-            ", errorMsg=3D'" + errorMsg + '\'' +
-            ", footNote=3D'" + footNote + '\'' +
-            ", throughputTransactionsPerSecond=3D" + throughputTransaction=
sPerSecond +
-            ", throughputBytesPerSecond=3D" + throughputBytesPerSecond +
-            ", numMembers=3D" + numMembers +
-            ", numThreads=3D" + numThreads +
-            '}';
-   }
-
-   /**
-    * If set to true, no reports will be generated from this test result.
-    */
-   public boolean isSkipReport()
-   {
-      return skipReport;
-   }
-
-   public void setSkipReport(boolean skipReport)
-   {
-      this.skipReport =3D skipReport;
-   }
-}

Modified: cache-bench-fwk/trunk/src/org/cachebench/config/GenericParamsConf=
ig.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- cache-bench-fwk/trunk/src/org/cachebench/config/GenericParamsConfig.jav=
a	2008-01-07 14:07:27 UTC (rev 5033)
+++ cache-bench-fwk/trunk/src/org/cachebench/config/GenericParamsConfig.jav=
a	2008-01-07 14:10:02 UTC (rev 5034)
@@ -31,4 +31,9 @@
    {
       return configParams.get(name);
    }
+
+   public int getIntValue(String name)
+   {
+      return Integer.parseInt(configParams.get(name));
+   }
 }

Modified: cache-bench-fwk/trunk/src/org/cachebench/reportgenerators/Abstrac=
tReportGenerator.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- cache-bench-fwk/trunk/src/org/cachebench/reportgenerators/AbstractRepor=
tGenerator.java	2008-01-07 14:07:27 UTC (rev 5033)
+++ cache-bench-fwk/trunk/src/org/cachebench/reportgenerators/AbstractRepor=
tGenerator.java	2008-01-07 14:10:02 UTC (rev 5034)
@@ -1,10 +1,11 @@
 package org.cachebench.reportgenerators;
 =

 import org.apache.commons.logging.Log;
-import org.cachebench.TestResult;
 import org.cachebench.config.ClusterConfig;
+import org.cachebench.tests.results.TestResult;
 =

 import java.io.File;
+import java.util.ArrayList;
 import java.util.List;
 =

 /**
@@ -34,7 +35,8 @@
 =

    public void setResults(List<TestResult> results)
    {
-      this.results =3D results;
+
+      this.results =3D new ArrayList(results);
    }
 =

    public void setClusterConfig(ClusterConfig clusterConfig)

Deleted: cache-bench-fwk/trunk/src/org/cachebench/reportgenerators/CSVRepor=
tGenerator.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- cache-bench-fwk/trunk/src/org/cachebench/reportgenerators/CSVReportGene=
rator.java	2008-01-07 14:07:27 UTC (rev 5033)
+++ cache-bench-fwk/trunk/src/org/cachebench/reportgenerators/CSVReportGene=
rator.java	2008-01-07 14:10:02 UTC (rev 5034)
@@ -1,197 +0,0 @@
-package org.cachebench.reportgenerators;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.commons.math.stat.descriptive.DescriptiveStatistics;
-import org.cachebench.TestResult;
-
-import java.io.BufferedWriter;
-import java.io.File;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-
-/**
- * @author Manik Surtani (manik(a)surtani.org)
- * @version $Id: CSVReportGenerator.java,v 1.5 2007/04/18 19:09:31 msurtan=
i Exp $
- */
-public class CSVReportGenerator extends AbstractReportGenerator
-{
-   private ArrayList footNotes;
-
-
-   public CSVReportGenerator()
-   {
-      log =3D LogFactory.getLog(this.getClass());
-   }
-
-   public void generate() throws Exception
-   {
-      try
-      {
-         BufferedWriter writer =3D null;
-         log.debug("Opening output file [" + output + "]");
-         String fileName =3D output.getAbsolutePath() + ".old." + System.c=
urrentTimeMillis();
-         prepareReportFile(fileName);
-         writer =3D new BufferedWriter(new FileWriter(output));
-         writeHeaderLine(writer); // Write the Header of the Report
-         // Write the results
-         for (TestResult result : results)
-         {
-            writeTestResult(result, writer);
-         }
-         // Write the Footnotes (if available)
-         if (footNotes !=3D null)
-         {
-            writeFoodNotes(writer);
-         }
-
-         writer.close();
-         log.debug("Report complete");
-         if  (output.exists())
-         {
-            log.warn("Expected report file:'" + output.getAbsoluteFile() +=
 "'does not exist!");
-         }
-      } catch (IOException e)
-      {
-         log.error("Error appeared while generatin report:", e);
-      }
-   }
-
-   private void prepareReportFile(String fileName)
-         throws IOException
-   {
-      if (output.exists())
-      {
-         log.info("A file named: '" + output.getAbsolutePath() + "' alread=
y exist. Renaming to '" + fileName + "'");
-         if (output.renameTo(new File(fileName))) {
-            log.warn("Could not rename!!!");
-         }
-      } else
-      {
-         if (output.createNewFile()) {
-            log.info("Successfully created report file:" + output.getAbsol=
utePath());
-         } else {
-            log.warn("Failed to create the report file!");
-         }
-      }
-   }
-
-   /**
-    * Writes out the report.
-    * The method checkes whether the result is passed or failed. And based=
 on the status would generate the report with
-    * appropriate content. The method also checks whether the report has a=
ny foot notes attached to the test case. If
-    * any foot note is found, then its added to the <code>footNotes</code>=
 ArrayList for later processing.
-    */
-   private void writeTestResult(TestResult result, BufferedWriter writer) =
throws IOException
-   {
-      log.debug("Writing the Result to the Report");
-      StringBuffer buf =3D new StringBuffer();
-      if (result.isTestPassed())
-      {
-         // This test has pased. Lets add this test results to the report.
-         DescriptiveStatistics putData =3D result.getPutData();
-         DescriptiveStatistics getData =3D result.getGetData();
-
-         buf.append(result.getTestName());
-         buf.append(",");
-         buf.append(result.getTestTime());
-         buf.append(",");
-         buf.append(result.getTestType());
-         buf.append(",");
-         buf.append(result.getNumMembers());
-         buf.append(",");
-         buf.append(result.getNumThreads());
-         buf.append(",");
-         buf.append(putData.getSum()/1000);
-         buf.append(",");
-         buf.append(getData.getSum()/1000);
-         buf.append(",");
-         buf.append(putData.getMean());
-         buf.append(",");
-         buf.append(getData.getMean());
-         buf.append(",");
-         // medians are the 50th percentile...
-         buf.append(putData.getPercentile(50));
-         buf.append(",");
-         buf.append(getData.getPercentile(50));
-         buf.append(",");
-         buf.append(putData.getStandardDeviation());
-         buf.append(",");
-         buf.append(getData.getStandardDeviation());
-         buf.append(",");
-         buf.append(putData.getMax());
-         buf.append(",");
-         buf.append(getData.getMax());
-         buf.append(",");
-         buf.append(putData.getMin());
-         buf.append(",");
-         buf.append(getData.getMin());
-         buf.append(",");
-         buf.append(result.getThroughputTransactionsPerSecond());
-         buf.append(",");
-         buf.append(result.getThroughputBytesPerSecond());
-      }
-      else
-      {
-         // This test has failed. Need to add this to the report.
-         buf.append(result.getTestName());
-         buf.append(",");
-         buf.append(result.getTestTime());
-         buf.append(",");
-         buf.append(result.getTestType());
-         buf.append(",");
-         buf.append(result.getErrorMsg());
-      }
-
-      // write details of this test to file.
-      writer.write(buf.toString());
-      writer.newLine();
-
-      // Now check if we have foot notes for this error
-      if (!"".equals(result.getFootNote()))
-      {
-         // We hae footnotes
-         if (footNotes =3D=3D null)
-         {
-            footNotes =3D new ArrayList();
-         }
-         footNotes.add(result.getFootNote());
-      }
-      log.debug("Completed writing test result");
-   }
-
-   private void writeHeaderLine(BufferedWriter writer) throws IOException
-   {
-      log.debug("Write the Report Header");
-      writer.write("TEST NAME, TEST DATE, TEST TYPE, NUM MEMBERS, NUM THRE=
ADS, TOTAL PUT TIME (secs), TOTAL GET TIME (secs), MEAN PUT TIME, MEAN GET =
TIME, MEDIAN PUT TIME, MEDIAN GET TIME, STANDARD DEVIATION PUT TIME, STANDA=
RD DEVIATION GET TIME, MAX PUT TIME, MAX GET TIME, MIN PUT TIME, MIN GET TI=
ME, THROUGHPUT TRANSACTIONS PER SEC, THROUGHPUT BYTES PER SEC");
-      writer.newLine();
-      log.debug("Complted the Report Header");
-   }
-
-   private void writeFoodNotes(BufferedWriter writer) throws IOException
-   {
-      log.debug("Writing the Footnotes");
-      writer.newLine();
-      writer.newLine();
-      writer.newLine();
-      writer.newLine();
-      writer.write("Report FootNotes");
-      writer.newLine();
-      int footNoteSize =3D footNotes.size();
-      for (int i =3D 0; i < footNoteSize; i++)
-      {
-         writer.write((String) footNotes.get(i));
-         writer.newLine();
-      }
-      log.debug("Complted the Footnotes");
-   }
-
-   public void setConfigParams(Map configParams)
-   {
-      //we are not intereseted in any params, yet (e.g. may be we want to =
change separator from comma to tab)
-   }
-}

Modified: cache-bench-fwk/trunk/src/org/cachebench/reportgenerators/Cluster=
ReportGenerator.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- cache-bench-fwk/trunk/src/org/cachebench/reportgenerators/ClusterReport=
Generator.java	2008-01-07 14:07:27 UTC (rev 5033)
+++ cache-bench-fwk/trunk/src/org/cachebench/reportgenerators/ClusterReport=
Generator.java	2008-01-07 14:10:02 UTC (rev 5034)
@@ -2,8 +2,8 @@
 =

 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.cachebench.TestResult;
 import org.cachebench.cluster.ClusterBarrier;
+import org.cachebench.tests.results.TestResult;
 =

 import java.net.SocketAddress;
 import java.util.ArrayList;
@@ -20,10 +20,12 @@
 public class ClusterReportGenerator extends AbstractReportGenerator
 {
    private static Log log =3D LogFactory.getLog(ClusterReportGenerator.cla=
ss);
+   private String reportGeneratorClassName;
 =

    public void setConfigParams(Map<String, String> configParams)
    {
       log.trace("Received config params: " + configParams);
+      reportGeneratorClassName =3D configParams.get("generatorClassName");
    }
 =

    public void generate() throws Exception
@@ -41,10 +43,11 @@
             log.trace("Received following results: " + results);
             generateReport(barrier.getReceivedMessages());
          }
-         barrierUntilReportIsGenerated();
       } catch (Exception e)
       {
          log.error("Error while generating report!", e);
+      } finally {
+         barrierUntilReportIsGenerated();
       }
    }
 =

@@ -73,12 +76,32 @@
 =

    private void generateReportFile(List<TestResult> mergedResults) throws =
Exception
    {
-      CSVReportGenerator generator =3D new CSVReportGenerator();
+      if (mergedResults.isEmpty())
+      {
+         log.warn("Result list is emty, not generating any report");
+         return;
+      }
+      String genClassName =3D mergedResults.get(0).getReportGeneratorClass=
Name();
+      AbstractReportGenerator generator =3D instantiateReportGenerator(gen=
ClassName);
       generator.setResults(mergedResults);
+      log.debug("Generating reports to file: " + output);
       generator.output =3D output;
       generator.generate();
    }
 =

+   private AbstractReportGenerator instantiateReportGenerator(String genCl=
assName)
+   {
+      try
+      {
+         log.debug("Using generator class: " + genClassName);
+         return (AbstractReportGenerator) Class.forName(genClassName).newI=
nstance();
+      } catch (Exception e)
+      {
+         log.error("Could not instantiate report generators", e);
+         throw new IllegalStateException(e);
+      }
+   }
+
    private List<TestResult> mergerTestResultsAndGenerateReport(List<List<T=
estResult>> results)
    {
       List<TestResult> mergedResults =3D new ArrayList<TestResult>();

Added: cache-bench-fwk/trunk/src/org/cachebench/reportgenerators/CsvBaseRep=
ortGenerator.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- cache-bench-fwk/trunk/src/org/cachebench/reportgenerators/CsvBaseReport=
Generator.java	                        (rev 0)
+++ cache-bench-fwk/trunk/src/org/cachebench/reportgenerators/CsvBaseReport=
Generator.java	2008-01-07 14:10:02 UTC (rev 5034)
@@ -0,0 +1,120 @@
+package org.cachebench.reportgenerators;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.cachebench.tests.results.TestResult;
+
+import java.io.BufferedWriter;
+import java.io.File;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Map;
+
+/**
+ * @author Mircea.Markus(a)jboss.com
+ * @since 2.2
+ */
+public abstract class CsvBaseReportGenerator extends AbstractReportGenerat=
or
+{
+   protected static Log log =3D LogFactory.getLog(CsvBaseReportGenerator.c=
lass); =

+
+   protected Map<String,String> configParams;
+   private ArrayList footNotes;
+
+   public void setConfigParams(Map<String, String> configParams)
+   {
+      this.configParams =3D configParams;
+   }
+
+   public void generate() throws Exception
+   {
+      try
+      {
+         BufferedWriter writer =3D null;
+
+         log.debug("Opening output file [" + output + "]");
+         prepareReportFile();
+         writer =3D new BufferedWriter(new FileWriter(output));
+         writeHeaderLine(writer);
+
+         for (TestResult result : results)
+         {
+            writeTestResult(result, writer);
+            checkForFootnotes(result);
+         }
+         // Write the Footnotes (if available)
+         if (footNotes !=3D null)
+         {
+            writeFoodNotes(writer);
+         }
+         writer.close();
+         log.debug("Report complete");
+         if  (output.exists())
+         {
+            log.warn("Expected report file:'" + output.getAbsoluteFile() +=
 "'does not exist!");
+         }
+      } catch (IOException e)
+      {
+         log.error("Error appeared while generatin report:", e);
+      }
+   }
+
+   private void checkForFootnotes(TestResult result)
+   {
+      // Now check if we have foot notes for this error
+      if (!"".equals(result.getFootNote()))
+      {
+         // We hae footnotes
+         if (footNotes =3D=3D null)
+         {
+            footNotes =3D new ArrayList();
+         }
+         footNotes.add(result.getFootNote());
+         log.debug("Foot node found, added " + result.getFootNote());
+      }
+   }
+
+   protected abstract void writeTestResult(TestResult result, BufferedWrit=
er writer) throws IOException;
+
+   protected abstract void writeHeaderLine(BufferedWriter writer) throws I=
OException;
+
+   private void prepareReportFile() throws IOException
+   {
+      String fileName =3D output.getAbsolutePath() + ".old." + System.curr=
entTimeMillis();
+      if (output.exists())
+      {
+         log.info("A file named: '" + output.getAbsolutePath() + "' alread=
y exist. Renaming to '" + fileName + "'");
+         if (output.renameTo(new File(fileName))) {
+            log.warn("Could not rename!!!");
+         }
+      } else
+      {
+         if (output.createNewFile()) {
+            log.info("Successfully created report file:" + output.getAbsol=
utePath());
+         } else {
+            log.warn("Failed to create the report file!");
+         }
+      }
+   }
+
+   private void writeFoodNotes(BufferedWriter writer) throws IOException
+   {
+      log.debug("Writing the Footnotes");
+      writer.newLine();
+      writer.newLine();
+      writer.newLine();
+      writer.newLine();
+      writer.write("Report FootNotes");
+      writer.newLine();
+      int footNoteSize =3D footNotes.size();
+      for (int i =3D 0; i < footNoteSize; i++)
+      {
+         writer.write((String) footNotes.get(i));
+         writer.newLine();
+      }
+      log.debug("Complted the Footnotes");
+   }
+
+
+}

Added: cache-bench-fwk/trunk/src/org/cachebench/reportgenerators/CsvSession=
SimlatorReportGenerator.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- cache-bench-fwk/trunk/src/org/cachebench/reportgenerators/CsvSessionSim=
latorReportGenerator.java	                        (rev 0)
+++ cache-bench-fwk/trunk/src/org/cachebench/reportgenerators/CsvSessionSim=
latorReportGenerator.java	2008-01-07 14:10:02 UTC (rev 5034)
@@ -0,0 +1,65 @@
+package org.cachebench.reportgenerators;
+
+import org.cachebench.tests.SessionSimulatorTestResult;
+import org.cachebench.tests.results.TestResult;
+
+import java.io.BufferedWriter;
+import java.io.IOException;
+
+/**
+ * @author Mircea.Markus(a)jboss.com
+ * @since 2.2
+ */
+public class CsvSessionSimlatorReportGenerator extends CsvBaseReportGenera=
tor
+{
+   protected void writeTestResult(TestResult result, BufferedWriter writer=
) throws IOException
+   {
+      SessionSimulatorTestResult ssResult =3D (SessionSimulatorTestResult)=
 result;
+      log.debug("Writing the Result to the Report");
+      StringBuffer buf =3D new StringBuffer();
+      if (ssResult.isTestPassed())
+      {
+         buf.append(ssResult.getTestName());
+         buf.append(",");
+         buf.append(ssResult.getTestTime());
+         buf.append(",");
+         buf.append(ssResult.getNoRequestPerSec());
+         buf.append(",");
+         buf.append(ssResult.getBytesRead());
+         buf.append(",");
+         buf.append(ssResult.getBytesWritten());
+         buf.append(",");
+         buf.append(ssResult.getDurration());
+         buf.append(",");
+         buf.append(ssResult.getTotalOperationCount());
+         buf.append(",");
+         buf.append(ssResult.getReadCount());
+         buf.append(",");
+         buf.append(ssResult.getWriteCount());
+      }
+      else
+      {
+         // This test has failed. Need to add this to the report.
+         buf.append(ssResult.getTestName());
+         buf.append(",");
+         buf.append(ssResult.getTestTime());
+         buf.append(",");
+         buf.append(ssResult.getTestType());
+         buf.append(",");
+         buf.append(ssResult.getErrorMsg());
+      }
+
+      // write details of this test to file.
+      writer.write(buf.toString());
+      writer.newLine();
+   }
+
+   protected void writeHeaderLine(BufferedWriter writer) throws IOException
+   {
+      log.debug("Write the Report Header");
+      writer.write("TEST NAME, TEST DATE, REQ PER SEC, BYTES READ, BYTES W=
RITTEN, DURRATION, TOTOAL OPERATION COUNT, READ COUNT, WRITE COUNT" );
+      writer.newLine();
+      log.debug("Complted the Report Header");
+
+   }
+}

Modified: cache-bench-fwk/trunk/src/org/cachebench/reportgenerators/ReportG=
enerator.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- cache-bench-fwk/trunk/src/org/cachebench/reportgenerators/ReportGenerat=
or.java	2008-01-07 14:07:27 UTC (rev 5033)
+++ cache-bench-fwk/trunk/src/org/cachebench/reportgenerators/ReportGenerat=
or.java	2008-01-07 14:10:02 UTC (rev 5034)
@@ -1,9 +1,8 @@
 package org.cachebench.reportgenerators;
 =

-import org.cachebench.TestResult;
 import org.cachebench.config.ClusterConfig;
+import org.cachebench.tests.results.TestResult;
 =

-import java.io.File;
 import java.util.List;
 import java.util.Map;
 =


Deleted: cache-bench-fwk/trunk/src/org/cachebench/tests/AssociationsTest.ja=
va
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- cache-bench-fwk/trunk/src/org/cachebench/tests/AssociationsTest.java	20=
08-01-07 14:07:27 UTC (rev 5033)
+++ cache-bench-fwk/trunk/src/org/cachebench/tests/AssociationsTest.java	20=
08-01-07 14:10:02 UTC (rev 5034)
@@ -1,26 +0,0 @@
-package org.cachebench.tests;
-
-import org.cachebench.CacheWrapper;
-import org.cachebench.SerializableCacheWrapper;
-import org.cachebench.TestResult;
-import org.cachebench.testobjects.CustomTypeWithAssocs;
-import org.cachebench.testobjects.SerializableCustomTypeWithAssocs;
-
-
-/**
- * @author Manik Surtani (manik(a)surtani.org)
- *         (C) Manik Surtani, 2004
- */
-public class AssociationsTest extends SimpleTest
-{
-
-   /* (non-Javadoc)
-   * @see org.cachebench.tests.CacheTest#doTest(org.cachebench.config.Test=
Config)
-   */
-   public TestResult doTest(String testName, CacheWrapper cache, String te=
stCaseName, int sampleSize, int numThreads) throws Exception
-   {
-      return performTestWithObjectType(testName, cache, cache instanceof S=
erializableCacheWrapper ? SerializableCustomTypeWithAssocs.class : CustomTy=
peWithAssocs.class, testCaseName, sampleSize, numThreads);
-
-   }
-
-}

Modified: cache-bench-fwk/trunk/src/org/cachebench/tests/CacheTest.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- cache-bench-fwk/trunk/src/org/cachebench/tests/CacheTest.java	2008-01-0=
7 14:07:27 UTC (rev 5033)
+++ cache-bench-fwk/trunk/src/org/cachebench/tests/CacheTest.java	2008-01-0=
7 14:10:02 UTC (rev 5034)
@@ -1,8 +1,8 @@
 package org.cachebench.tests;
 =

 import org.cachebench.CacheWrapper;
-import org.cachebench.TestResult;
 import org.cachebench.config.Configuration;
+import org.cachebench.tests.results.TestResult;
 =

 =

 /**

Deleted: cache-bench-fwk/trunk/src/org/cachebench/tests/CustomClassTest.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- cache-bench-fwk/trunk/src/org/cachebench/tests/CustomClassTest.java	200=
8-01-07 14:07:27 UTC (rev 5033)
+++ cache-bench-fwk/trunk/src/org/cachebench/tests/CustomClassTest.java	200=
8-01-07 14:10:02 UTC (rev 5034)
@@ -1,26 +0,0 @@
-package org.cachebench.tests;
-
-import org.cachebench.CacheWrapper;
-import org.cachebench.SerializableCacheWrapper;
-import org.cachebench.TestResult;
-import org.cachebench.testobjects.CustomType;
-import org.cachebench.testobjects.SerializableCustomType;
-
-
-/**
- * @author Manik Surtani (manik(a)surtani.org)
- *         (C) Manik Surtani, 2004
- */
-public class CustomClassTest extends SimpleTest
-{
-
-   /* (non-Javadoc)
-   * @see org.cachebench.tests.CacheTest#doTest(org.cachebench.config.Test=
Config)
-   */
-   public TestResult doTest(String testName, CacheWrapper cache, String te=
stCaseName, int sampleSize, int numThreads) throws Exception
-   {
-      return performTestWithObjectType(testName, cache, cache instanceof S=
erializableCacheWrapper ? SerializableCustomType.class : CustomType.class, =
testCaseName, sampleSize, numThreads);
-
-   }
-
-}

Deleted: cache-bench-fwk/trunk/src/org/cachebench/tests/PrimitiveTest.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- cache-bench-fwk/trunk/src/org/cachebench/tests/PrimitiveTest.java	2008-=
01-07 14:07:27 UTC (rev 5033)
+++ cache-bench-fwk/trunk/src/org/cachebench/tests/PrimitiveTest.java	2008-=
01-07 14:10:02 UTC (rev 5034)
@@ -1,23 +0,0 @@
-package org.cachebench.tests;
-
-import org.cachebench.CacheWrapper;
-import org.cachebench.TestResult;
-
-
-/**
- * @author Manik Surtani (manik(a)surtani.org)
- *         (C) Manik Surtani, 2004
- */
-public class PrimitiveTest extends SimpleTest
-{
-
-   /* (non-Javadoc)
-   * @see org.cachebench.tests.CacheTest#doTest(org.cachebench.config.Test=
Config)
-   */
-   public TestResult doTest(String testName, CacheWrapper cache, String te=
stCaseName, int sampleSize, int numThreads) throws Exception
-   {
-      return performTestWithObjectType(testName, cache, Integer.class, tes=
tCaseName, sampleSize, numThreads);
-
-   }
-
-}

Modified: cache-bench-fwk/trunk/src/org/cachebench/tests/ReplicationOccursT=
est.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- cache-bench-fwk/trunk/src/org/cachebench/tests/ReplicationOccursTest.ja=
va	2008-01-07 14:07:27 UTC (rev 5033)
+++ cache-bench-fwk/trunk/src/org/cachebench/tests/ReplicationOccursTest.ja=
va	2008-01-07 14:10:02 UTC (rev 5034)
@@ -3,7 +3,7 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.cachebench.CacheWrapper;
-import org.cachebench.TestResult;
+import org.cachebench.tests.results.StatisticTestResult;
 import org.cachebench.cluster.ClusterBarrier;
 import org.cachebench.config.Configuration;
 import org.cachebench.config.TestCase;
@@ -31,7 +31,7 @@
       this.conf =3D configuration;
    }
 =

-   public TestResult doTest(String testName, CacheWrapper cache, String te=
stCaseName, int sampleSize, int numThreads) throws Exception
+   public StatisticTestResult doTest(String testName, CacheWrapper cache, =
String testCaseName, int sampleSize, int numThreads) throws Exception
    {
       log.trace("TestCase =3D '" + testCaseName + "', TestName =3D " + tes=
tName);
       barrierBeforeReplicationTest();
@@ -43,7 +43,7 @@
       if (conf.getClusterConfig().getClusterSize() =3D=3D 1)
       {
          log.info("Cluster size is one, no replication expected");
-         TestResult result =3D new TestResult();
+         StatisticTestResult result =3D new StatisticTestResult();
          result.setTestPassed(true);
          result.setSkipReport(true);
          return result;
@@ -76,9 +76,9 @@
       barrier.barrier("BEFORE_REPLICATION_OCCURS_BARRIER");
    }
 =

-   private TestResult allReplicatedFine(Map<SocketAddress, Object> receive=
dValues)
+   private StatisticTestResult allReplicatedFine(Map<SocketAddress, Object=
> receivedValues)
    {
-      TestResult result =3D new TestResult();
+      StatisticTestResult result =3D new StatisticTestResult();
       result.setSkipReport(true);
       for (Object value : receivedValues.values())
       {

Added: cache-bench-fwk/trunk/src/org/cachebench/tests/SessionSimulatorTest.=
java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- cache-bench-fwk/trunk/src/org/cachebench/tests/SessionSimulatorTest.jav=
a	                        (rev 0)
+++ cache-bench-fwk/trunk/src/org/cachebench/tests/SessionSimulatorTest.jav=
a	2008-01-07 14:10:02 UTC (rev 5034)
@@ -0,0 +1,145 @@
+package org.cachebench.tests;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.cachebench.CacheWrapper;
+import org.cachebench.config.Configuration;
+import org.cachebench.config.TestCase;
+import org.cachebench.config.TestConfig;
+import org.cachebench.tests.results.TestResult;
+
+import java.util.Random;
+import java.util.Date;
+
+/**
+ * @author Mircea.Markus(a)jboss.com
+ * @since 2.2
+ */
+public class SessionSimulatorTest implements CacheTest
+{
+   private static final Log log =3D LogFactory.getLog(SessionSimulatorTest=
.class);
+
+   public static final String SESSION_PREFIX =3D "SESSION_";
+   Configuration configuration;
+   private TestConfig thisTestConfig;
+   private String sessionId;
+   private CacheWrapper cacheWrapper;
+
+   /**
+    * total number of request to be made against this session: reads + wri=
tes
+    */
+   private int numberOfRequests;
+
+   /**
+    * for each session there will be created fixed number of attributes. O=
n those attributes all the GETs and PUTs
+    * are performed (for PUT is overwrite)
+    */
+   private int numberOfAttributes;
+
+   /**
+    * Each attribute will be a byte[] of this size
+    */
+   private int sizeOfAnAttribute;
+
+   /**
+    * Out of the total number of request, this define the frequency of wri=
tes (percentage)
+    */
+   private int writePercentage;
+
+   public void setConfiguration(Configuration configuration)
+   {
+      this.configuration =3D configuration;
+   }
+
+   public TestResult doTest(String testName, CacheWrapper cache, String te=
stCaseName, int sampleSize, int numThreads) throws Exception
+   {
+      this.cacheWrapper =3D cache;
+      TestCase testCase =3D configuration.getTestCase(testCaseName);
+      thisTestConfig =3D testCase.getTest(testName);
+      readParams();
+      initSession();
+      return stressSession(testName, testCaseName);
+   }
+
+   private SessionSimulatorTestResult stressSession(String testName, Strin=
g testCaseName) throws Exception
+   {
+
+      long totalBytesRead =3D 0;
+      long totalBytesWritten =3D 0;
+      long reads =3D 0;
+      long writes =3D 0;
+      int readPercentage =3D 100 - writePercentage;
+      Random r =3D new Random();
+      int randomAction;
+      int randomAttribute;
+      long start=3DSystem.currentTimeMillis();
+      for (int i =3D 0; i < numberOfRequests; i++)
+      {
+         randomAction =3D r.nextInt(100);
+         randomAttribute =3D r.nextInt(numberOfAttributes - 1);
+         byte[] buf;
+         if (randomAction < readPercentage)
+         { // read
+            try
+            {
+               buf =3D (byte[]) cacheWrapper.get(getSessionEntry(randomAtt=
ribute));
+               totalBytesRead +=3D buf.length;
+               reads++;
+            } catch (Exception e)
+            {
+               log.trace("Error appeared whilst reading from cache:" + e.g=
etMessage());
+            }
+         } else
+         {             // write
+            buf =3D new byte[this.sizeOfAnAttribute];
+            try
+            {
+               cacheWrapper.put(getSessionEntry(randomAttribute), buf);
+               totalBytesWritten +=3D buf.length;
+               writes++;
+            } catch (Exception e)
+            {
+               log.trace("Error appeared whilst writing to cache:" + e.get=
Message());
+            }
+         }
+      }
+      long durration =3D System.currentTimeMillis() - start;
+      SessionSimulatorTestResult result =3D new SessionSimulatorTestResult=
(reads, writes, durration, totalBytesRead, totalBytesWritten);
+      result.setTestPassed(true);
+      result.setTestName(testCaseName + getNodeIndex());
+      result.setTestTime(new Date());
+      result.setTestType(testName);
+      log.trace("Returning result:" + result);
+      return result;
+   }
+
+   private void initSession() throws Exception
+   {
+      for (int i =3D 0; i < numberOfAttributes; i++)
+      {
+         cacheWrapper.put(getSessionEntry(i), new byte[sizeOfAnAttribute]);
+      }
+   }
+
+   private String getSessionEntry(int i)
+   {
+      return sessionId + i;
+   }
+
+   private void readParams ()
+   {
+      sessionId =3D SESSION_PREFIX + configuration.getClusterConfig().getC=
urrentNodeIndex();
+      log.debug("Session id is: " + sessionId);
+      numberOfRequests =3D thisTestConfig.getIntValue("numberOfRequest");
+      numberOfAttributes =3D thisTestConfig.getIntValue("numberOfAttribute=
s");
+      writePercentage =3D thisTestConfig.getIntValue("writePercentage");
+      sizeOfAnAttribute =3D thisTestConfig.getIntValue("sizeOfAnAttribute"=
);
+      log.debug("recieved follosing params[ numberOfRequests=3D" + numberO=
fRequests + ", numberOfAttributes=3D"
+            + numberOfAttributes + ", writePercentage=3D" + writePercentag=
e + ", sizeOfAnAttribute=3D" + sizeOfAnAttribute + " ]");
+   }
+
+   public String getNodeIndex()
+   {
+      return configuration.getClusterConfig().getCurrentNodeIndex() + "";
+   }
+}

Added: cache-bench-fwk/trunk/src/org/cachebench/tests/SessionSimulatorTestR=
esult.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- cache-bench-fwk/trunk/src/org/cachebench/tests/SessionSimulatorTestResu=
lt.java	                        (rev 0)
+++ cache-bench-fwk/trunk/src/org/cachebench/tests/SessionSimulatorTestResu=
lt.java	2008-01-07 14:10:02 UTC (rev 5034)
@@ -0,0 +1,68 @@
+package org.cachebench.tests;
+
+import org.cachebench.tests.results.BaseTestResult;
+import org.cachebench.reportgenerators.CsvSessionSimlatorReportGenerator;
+
+/**
+ * @author Mircea.Markus(a)jboss.com
+ * @since 2.2
+ */
+public class SessionSimulatorTestResult extends BaseTestResult
+{
+
+   long readCount;
+   long writeCount;
+   long durration;
+   long bytesRead;
+   long bytesWritten;
+
+
+   public SessionSimulatorTestResult(long readCount, long writeCount, long=
 durration, long bytesRead, long bytesWritten)
+   {
+      this.readCount =3D readCount;
+      this.writeCount =3D writeCount;
+      this.durration =3D durration;
+      this.bytesRead =3D bytesRead;
+      this.bytesWritten =3D bytesWritten;
+   }
+
+   public long getTotalOperationCount()
+   {
+      return readCount + writeCount;
+   }
+
+   public long getReadCount()
+   {
+      return readCount;
+   }
+
+   public long getWriteCount()
+   {
+      return writeCount;
+   }
+
+   public double getNoRequestPerSec()
+   {
+      return getTotalOperationCount() / (durration / 1000.0);
+   }
+
+   public long getBytesRead()
+   {
+      return bytesRead;
+   }
+
+   public long getBytesWritten()
+   {
+      return bytesWritten;
+   }
+
+   public long getDurration()
+   {
+      return durration;
+   }
+
+   public String getReportGeneratorClassName()
+   {
+      return CsvSessionSimlatorReportGenerator.class.getName();
+   }
+}

Deleted: cache-bench-fwk/trunk/src/org/cachebench/tests/SimpleTest.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- cache-bench-fwk/trunk/src/org/cachebench/tests/SimpleTest.java	2008-01-=
07 14:07:27 UTC (rev 5033)
+++ cache-bench-fwk/trunk/src/org/cachebench/tests/SimpleTest.java	2008-01-=
07 14:10:02 UTC (rev 5034)
@@ -1,296 +0,0 @@
-package org.cachebench.tests;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.commons.math.stat.descriptive.DescriptiveStatistics;
-import org.cachebench.CacheWrapper;
-import org.cachebench.SerializableCacheWrapper;
-import org.cachebench.TestResult;
-import org.cachebench.config.Configuration;
-
-import java.io.Serializable;
-import java.io.ByteArrayOutputStream;
-import java.io.ObjectOutputStream;
-import java.util.Date;
-import java.util.concurrent.Executors;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.atomic.AtomicLong;
-
-
-/**
- * @author Manik Surtani (manik(a)surtani.org)
- *         (C) Manik Surtani, 2004
- */
-public abstract class SimpleTest implements CacheTest
-{
-   protected Log log =3D LogFactory.getLog(this.getClass());
-   protected AtomicLong numberOfBytesPut =3D new AtomicLong(0);
-   protected long elapsedSecondsForAllPuts =3D 0;
-   protected ExecutorService executor;
-   private static final int EXECUTOR_SHUTDOWN_TIMEOUT_POLL_SECS =3D 60;
-   protected Configuration configuration;
-   protected final int LOG_FREQUENCY =3D 5000;
-
-   protected TestResult performTestWithObjectType(String testCaseName, Cac=
heWrapper cache, Class valueClass, String testName, int sampleSize, int num=
Threads) throws Exception
-   {
-      log.info("Number of threads " + numThreads);
-      executor =3D Executors.newFixedThreadPool(numThreads);
-
-      TestResult result =3D new TestResult();
-      result.setTestName(testCaseName + getNodeIndex());
-      result.setTestTime(new Date());
-      result.setTestType(testName);
-
-      log.info("Performing '" + sampleSize + "' PUTs");
-      DescriptiveStatistics putStats =3D doPuts(cache, valueClass, sampleS=
ize);
-      executor =3D Executors.newFixedThreadPool(numThreads);
-      log.info("Performing GETs");
-      DescriptiveStatistics getStats =3D doGets(cache, sampleSize);
-
-      result.setGetData(getStats);
-      result.setPutData(putStats);
-      result.setTestPassed(true); // The test is passed. The report would =
make use of this attribute.
-
-      // calculate throughput, in transactions per second.
-      // we only measure put operations for throughput.
-
-      // calc tps.
-
-      System.out.println("*** sum of time: " + elapsedSecondsForAllPuts);
-      System.out.println("*** num puts occured: " + putStats.getN());
-
-      try
-      {
-         result.setThroughputTransactionsPerSecond((int) (sampleSize / ela=
psedSecondsForAllPuts));
-      }
-      catch (ArithmeticException ae)
-      {
-         log.warn("Divide by 0 - elapsedSecondsForAllPuts =3D 0?");
-         result.setThroughputTransactionsPerSecond(-999);
-      }
-
-      try
-      {
-         result.setThroughputBytesPerSecond((int) (numberOfBytesPut.longVa=
lue() / elapsedSecondsForAllPuts));
-      }
-      catch (ArithmeticException ae)
-      {
-         log.warn("Divide by 0 - elapsedSecondsForAllPuts =3D 0?");
-         result.setThroughputBytesPerSecond(-999);
-      }
-
-
-      // set the number of members in the cluster
-      result.setNumMembers(cache.getNumMembers());
-      result.setNumThreads(numThreads);
-
-      return result;
-   }
-
-   /**
-    * @param cache      The Cachewrapper on which the bechmark is conducte=
d.
-    * @param sampleSize The size of the cache.
-    * @return The Descriptive statistics of the cache benchmarking.
-    */
-   private DescriptiveStatistics doGets(final CacheWrapper cache, int samp=
leSize) throws Exception
-   {
-      log.debug("Inside doGets for : " + cache);
-      final String key =3D "baseKey";
-      final DescriptiveStatistics stats =3D DescriptiveStatistics.newInsta=
nce();
-      final boolean useSerializable =3D cache instanceof SerializableCache=
Wrapper;
-
-      for (int i =3D 0; i < sampleSize; i++)
-      {
-         final int cycleNumber =3D i;
-         Runnable r =3D new Runnable()
-         {
-            public void run()
-            {
-               try
-               {
-                  if (!useSerializable)
-                  {
-                     // start your timer...
-                     long startTime =3D System.currentTimeMillis();
-                     cache.get(key + cycleNumber);
-                     long statValue =3D (System.currentTimeMillis() - star=
tTime);
-                     stats.addValue(statValue);
-                     log.debug("The Get stat : " + statValue);
-                  }
-                  else
-                  {
-                     SerializableCacheWrapper sCache =3D (SerializableCach=
eWrapper) cache;
-                     long startTime =3D System.currentTimeMillis();
-                     sCache.getSerializable(key + cycleNumber);
-                     long statValue =3D (System.currentTimeMillis() - star=
tTime);
-                     stats.addValue(statValue);
-                     log.debug("The Get stat : " + statValue);
-                  }
-                  logOperation(cycleNumber, "GETS");
-               }
-               catch (Exception e)
-               {
-                  // how should we handle this?  Log for now...
-                  log.error("Operation failed!", e);
-               }
-            }
-         };
-
-         // submit task to be executed
-         executor.execute(r);
-      }
-
-      // only leave once the task queue is empty!!
-      blockTillTasksComplete();
-
-      // return the raw data
-      log.debug("Leaving doGets for : " + cache);
-      return stats;
-   }
-
-   private void logOperation(int i, String s)
-   {
-      if ((i + 1) % LOG_FREQUENCY =3D=3D 0)
-      {
-         log.info((i + 1) + " " + s + " were performed");
-      }
-   }
-
-   /**
-    * @param cache      The Cachewrapper on which the bechmark is conducte=
d.
-    * @param valueClass The value class instance which is going to be inse=
rted into the Cache.
-    * @param sampleSize The size of the cache.
-    * @return The Descriptive statistics of the cache benchmarking.
-    */
-   private DescriptiveStatistics doPuts(final CacheWrapper cache, final Cl=
ass valueClass, int sampleSize) throws Exception
-   {
-      log.debug("Inside doPuts for " + cache);
-      final String key =3D "baseKey";
-      final DescriptiveStatistics stats =3D DescriptiveStatistics.newInsta=
nce();
-      final boolean useSerializable =3D cache instanceof SerializableCache=
Wrapper;
-      numberOfBytesPut.set(0);
-      elapsedSecondsForAllPuts =3D 0;
-      long startElapsedTime =3D System.currentTimeMillis();
-
-      for (int i =3D 0; i < sampleSize; i++)
-      {
-         final int cycleNumber =3D i;
-         Runnable r =3D new Runnable()
-         {
-            public void run()
-            {
-               try
-               {
-                  // generate some value
-                  Object value;
-                  if (valueClass =3D=3D null) value =3D null;
-                  else if (valueClass.getName().equals("java.lang.String")=
) value =3D "value" + cycleNumber;
-                  else if (valueClass.getName().equals("java.lang.Integer"=
)) value =3D cycleNumber;
-                  else value =3D valueClass.newInstance();
-
-                  // even though some impls may use special marshalling to=
 reduce the amount of data transmitted (such as JBoss Cache's
-                  // CacheMarshaller) we still want to measure the seriali=
zed size of objects for this metric.
-
-                  numberOfBytesPut.getAndAdd(calculateSerializedSize(value=
));
-
-                  if (!useSerializable)
-                  {
-                     // start your timer...
-                     long startTime =3D System.currentTimeMillis();
-                     cache.put(key + cycleNumber, value);
-                     long statValue =3D (System.currentTimeMillis() - star=
tTime);
-                     stats.addValue(statValue);
-                  }
-                  else
-                  {
-                     SerializableCacheWrapper sCache =3D (SerializableCach=
eWrapper) cache;
-                     Serializable sValue =3D (Serializable) value;
-                     long startTime =3D System.currentTimeMillis();
-                     sCache.putSerializable(key + cycleNumber, sValue);
-                     long statValue =3D (System.currentTimeMillis() - star=
tTime);
-                     stats.addValue(statValue);
-                  }
-                  logOperation(cycleNumber,"PUTS");
-               }
-               catch (Exception e)
-               {
-                  // how should we handle this?  Log for now...
-                  log.error("Operation failed!", e);
-               }
-            }
-         };
-         // submit task to be executed
-         executor.execute(r);
-      }
-
-      // only leave once the task queue is empty!!
-      blockTillTasksComplete();
-      elapsedSecondsForAllPuts =3D (System.currentTimeMillis() - startElap=
sedTime) / 1000;
-
-      // return the raw data
-      log.debug("Leaving doPuts for " + cache);
-      return stats;
-   }
-
-   private void blockTillTasksComplete()
-   {
-      // now that just told us that all the tasks have been submitted.  Le=
ts check that the executor has finished everything.
-      executor.shutdown();
-      while (!executor.isTerminated())
-      {
-         try
-         {
-            executor.awaitTermination(EXECUTOR_SHUTDOWN_TIMEOUT_POLL_SECS,=
 TimeUnit.SECONDS);
-         }
-         catch (InterruptedException e)
-         {
-            // do nothing?
-         }
-      }
-   }
-
-   private long calculateSerializedSize(Object value)
-   {
-      ByteArrayOutputStream baos =3D null;
-      ObjectOutputStream oos =3D null;
-      try
-      {
-         baos =3D new ByteArrayOutputStream();
-         oos =3D new ObjectOutputStream(baos);
-         oos.writeObject(value);
-         oos.close();
-         baos.close();
-         return baos.size();
-      }
-      catch (Exception e)
-      {
-         log.warn("Unable to calculate serialized size of object " + value=
, e);
-         try
-         {
-            if (oos !=3D null) oos.close();
-            if (baos !=3D null) baos.close();
-         }
-         catch (Exception e2)
-         {
-            log.warn("Unable to close streams", e2);
-         }
-      }
-      return 0;
-   }
-
-   public String getNodeIndex()
-   {
-      try
-      {
-         return " - " + Integer.parseInt(System.getProperty("currentIndex"=
));
-      } catch (Exception e) {
-         return "";
-      }
-   }
-
-   public void setConfiguration(Configuration configuration)
-   {
-      this.configuration =3D configuration;
-   }
-}

Deleted: cache-bench-fwk/trunk/src/org/cachebench/tests/StaticsTest.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- cache-bench-fwk/trunk/src/org/cachebench/tests/StaticsTest.java	2008-01=
-07 14:07:27 UTC (rev 5033)
+++ cache-bench-fwk/trunk/src/org/cachebench/tests/StaticsTest.java	2008-01=
-07 14:10:02 UTC (rev 5034)
@@ -1,25 +0,0 @@
-package org.cachebench.tests;
-
-import org.cachebench.CacheWrapper;
-import org.cachebench.SerializableCacheWrapper;
-import org.cachebench.TestResult;
-import org.cachebench.testobjects.CustomTypeWithStatics;
-import org.cachebench.testobjects.SerializableCustomTypeWithStatics;
-
-
-/**
- * @author Manik Surtani (manik(a)surtani.org)
- *         (C) Manik Surtani, 2004
- */
-public class StaticsTest extends SimpleTest
-{
-
-   /* (non-Javadoc)
-   * @see org.cachebench.tests.CacheTest#doTest(org.cachebench.config.Test=
Config)
-   */
-   public TestResult doTest(String testName, CacheWrapper cache, String te=
stCaseName, int sampleSize, int numThreads) throws Exception
-   {
-      return performTestWithObjectType(testName, cache, cache instanceof S=
erializableCacheWrapper ? SerializableCustomTypeWithStatics.class : CustomT=
ypeWithStatics.class, testCaseName, sampleSize, numThreads);
-   }
-
-}

Deleted: cache-bench-fwk/trunk/src/org/cachebench/tests/StringTest.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- cache-bench-fwk/trunk/src/org/cachebench/tests/StringTest.java	2008-01-=
07 14:07:27 UTC (rev 5033)
+++ cache-bench-fwk/trunk/src/org/cachebench/tests/StringTest.java	2008-01-=
07 14:10:02 UTC (rev 5034)
@@ -1,23 +0,0 @@
-package org.cachebench.tests;
-
-import org.cachebench.CacheWrapper;
-import org.cachebench.TestResult;
-
-
-/**
- * @author Manik Surtani (manik(a)surtani.org)
- *         (C) Manik Surtani, 2004
- */
-public class StringTest extends SimpleTest
-{
-
-   /* (non-Javadoc)
-   * @see org.cachebench.tests.CacheTest#doTest(org.cachebench.config.Test=
Config)
-   */
-   public TestResult doTest(String testName, CacheWrapper cache, String te=
stCaseName, int sampleSize, int numThreads) throws Exception
-   {
-      return performTestWithObjectType(testName, cache, String.class, test=
CaseName, sampleSize, numThreads);
-
-   }
-
-}

Deleted: cache-bench-fwk/trunk/src/org/cachebench/tests/SubclassTest.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- cache-bench-fwk/trunk/src/org/cachebench/tests/SubclassTest.java	2008-0=
1-07 14:07:27 UTC (rev 5033)
+++ cache-bench-fwk/trunk/src/org/cachebench/tests/SubclassTest.java	2008-0=
1-07 14:10:02 UTC (rev 5034)
@@ -1,26 +0,0 @@
-package org.cachebench.tests;
-
-import org.cachebench.CacheWrapper;
-import org.cachebench.SerializableCacheWrapper;
-import org.cachebench.TestResult;
-import org.cachebench.testobjects.CustomTypeSubclassOfAbstract;
-import org.cachebench.testobjects.SerializableCustomTypeSubclassOfAbstract;
-
-
-/**
- * @author Manik Surtani (manik(a)surtani.org)
- *         (C) Manik Surtani, 2004
- */
-public class SubclassTest extends SimpleTest
-{
-
-   /* (non-Javadoc)
-   * @see org.cachebench.tests.CacheTest#doTest(org.cachebench.config.Test=
Config)
-   */
-   public TestResult doTest(String testName, CacheWrapper cache, String te=
stCaseName, int sampleSize, int numThreads) throws Exception
-   {
-      return performTestWithObjectType(testName, cache, cache instanceof S=
erializableCacheWrapper ? SerializableCustomTypeSubclassOfAbstract.class : =
CustomTypeSubclassOfAbstract.class, testCaseName, sampleSize, numThreads);
-
-   }
-
-}

Deleted: cache-bench-fwk/trunk/src/org/cachebench/tests/TransientTest.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- cache-bench-fwk/trunk/src/org/cachebench/tests/TransientTest.java	2008-=
01-07 14:07:27 UTC (rev 5033)
+++ cache-bench-fwk/trunk/src/org/cachebench/tests/TransientTest.java	2008-=
01-07 14:10:02 UTC (rev 5034)
@@ -1,26 +0,0 @@
-package org.cachebench.tests;
-
-import org.cachebench.CacheWrapper;
-import org.cachebench.SerializableCacheWrapper;
-import org.cachebench.TestResult;
-import org.cachebench.testobjects.CustomTypeWithTransient;
-import org.cachebench.testobjects.SerializableCustomTypeWithTransient;
-
-
-/**
- * @author Manik Surtani (manik(a)surtani.org)
- *         (C) Manik Surtani, 2004
- */
-public class TransientTest extends SimpleTest
-{
-
-   /* (non-Javadoc)
-   * @see org.cachebench.tests.CacheTest#doTest(org.cachebench.config.Test=
Config)
-   */
-   public TestResult doTest(String testName, CacheWrapper cache, String te=
stCaseName, int sampleSize, int numThreads) throws Exception
-   {
-      return performTestWithObjectType(testName, cache, cache instanceof S=
erializableCacheWrapper ? SerializableCustomTypeWithTransient.class : Custo=
mTypeWithTransient.class, testCaseName, sampleSize, numThreads);
-
-   }
-
-}

Added: cache-bench-fwk/trunk/src/org/cachebench/tests/results/BaseTestResul=
t.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- cache-bench-fwk/trunk/src/org/cachebench/tests/results/BaseTestResult.j=
ava	                        (rev 0)
+++ cache-bench-fwk/trunk/src/org/cachebench/tests/results/BaseTestResult.j=
ava	2008-01-07 14:10:02 UTC (rev 5034)
@@ -0,0 +1,99 @@
+package org.cachebench.tests.results;
+
+import java.util.Date;
+
+/**
+ * @author Mircea.Markus(a)jboss.com
+ * @since 2.2
+ */
+public class BaseTestResult implements TestResult
+{
+
+   protected String testName;
+   protected String testType;
+   protected Date testTime;
+   protected boolean testPassed;
+   protected String errorMsg;
+   protected boolean skipReport;
+   protected String footNote =3D ""; // This is utilized if special notes =
need to be captured for this test.
+
+
+   public void setTestName(String testName)
+   {
+      this.testName =3D testName;
+   }
+
+   public void setTestType(String testType)
+   {
+      this.testType =3D testType;
+   }
+
+   public void setTestTime(Date testTime)
+   {
+      this.testTime =3D testTime;
+   }
+
+   public boolean isTestPassed()
+   {
+      return testPassed;
+   }
+
+   public void setTestPassed(boolean testPassed)
+   {
+      this.testPassed =3D testPassed;
+   }
+
+   public void setErrorMsg(String errorMsg)
+   {
+      this.errorMsg =3D errorMsg;
+   }
+   /**
+    * If set to true, no reports will be generated from this test result.
+    */
+   public boolean isSkipReport()
+   {
+      return skipReport;
+   }
+
+   public void setSkipReport(boolean skipReport)
+   {
+      this.skipReport =3D skipReport;
+   }
+
+
+   public String getTestName()
+   {
+      return testName;
+   }
+
+   public String getTestType()
+   {
+      return testType;
+   }
+
+   public Date getTestTime()
+   {
+      return testTime;
+   }
+
+   public String getErrorMsg()
+   {
+      return errorMsg;
+   }
+
+   public String getFootNote()
+   {
+      return footNote;
+   }
+
+   public void setFootNote(String footNote)
+   {
+      this.footNote =3D footNote;
+   }
+
+
+   public String getReportGeneratorClassName()
+   {
+      return null;
+   }
+}

Copied: cache-bench-fwk/trunk/src/org/cachebench/tests/results/StatisticTes=
tResult.java (from rev 4958, cache-bench-fwk/trunk/src/org/cachebench/TestR=
esult.java)
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- cache-bench-fwk/trunk/src/org/cachebench/tests/results/StatisticTestRes=
ult.java	                        (rev 0)
+++ cache-bench-fwk/trunk/src/org/cachebench/tests/results/StatisticTestRes=
ult.java	2008-01-07 14:10:02 UTC (rev 5034)
@@ -0,0 +1,112 @@
+package org.cachebench.tests.results;
+
+import org.apache.commons.math.stat.descriptive.DescriptiveStatistics;
+import org.cachebench.reportgenerators.CsvStatisticReportGenerator;
+
+
+/**
+ * @author Manik Surtani (manik(a)surtani.org)
+ * @version $Id: StatisticTestResult.java,v 1.4 2007/04/18 19:09:30 msurta=
ni Exp $
+ */
+public class StatisticTestResult extends BaseTestResult
+{
+   private DescriptiveStatistics putData, getData;
+   private int throughputTransactionsPerSecond;
+   private int throughputBytesPerSecond;
+   private int numMembers;
+   private int numThreads;
+
+   public DescriptiveStatistics getGetData()
+   {
+      return getData;
+   }
+
+   public void setGetData(DescriptiveStatistics getData)
+   {
+      this.getData =3D getData;
+   }
+
+   public DescriptiveStatistics getPutData()
+   {
+      return putData;
+   }
+
+   public void setPutData(DescriptiveStatistics putData)
+   {
+      this.putData =3D putData;
+   }
+
+
+   /**
+    * This is only measured on put() operations as it has little meaning f=
or get()s.
+    */
+   public int getThroughputTransactionsPerSecond()
+   {
+      return throughputTransactionsPerSecond;
+   }
+
+   public void setThroughputTransactionsPerSecond(int throughputTransactio=
nsPerSecond)
+   {
+      this.throughputTransactionsPerSecond =3D throughputTransactionsPerSe=
cond;
+   }
+
+   /**
+    * This is only measured on put() operations as it has little meaning f=
or get()s.  Note that the serialized size of objects
+    * are used to calculate this, not the ACTUAL bytes transmitted, as som=
e cache impls (JBoss Cache >=3D 1.4) has internal
+    * marshallers that reduce object sizes to smaller than what they would=
 be if serialized.  For the sake of comparing though,
+    * one must still consider that an object of, say, 200 bytes when seria=
lized was transmitted, even if the cache compresses
+    * this to 100 bytes.
+    */
+   public int getThroughputBytesPerSecond()
+   {
+      return throughputBytesPerSecond;
+   }
+
+   public void setThroughputBytesPerSecond(int throughputBytesPerSecond)
+   {
+      this.throughputBytesPerSecond =3D throughputBytesPerSecond;
+   }
+
+   public int getNumMembers()
+   {
+      return numMembers;
+   }
+
+   public void setNumMembers(int numMembers)
+   {
+      this.numMembers =3D numMembers;
+   }
+
+   public int getNumThreads()
+   {
+      return numThreads;
+   }
+
+   public void setNumThreads(int numThreads)
+   {
+      this.numThreads =3D numThreads;
+   }
+
+   public String toString()
+   {
+      return "StatisticTestResult{" +
+            "testName=3D'" + testName + '\'' +
+            ", testType=3D'" + testType + '\'' +
+            ", testTime=3D" + testTime +
+            ", putData=3D" + putData +
+            ", getData=3D" + getData +
+            ", testPassed=3D" + testPassed +
+            ", errorMsg=3D'" + errorMsg + '\'' +
+            ", footNote=3D'" + footNote + '\'' +
+            ", throughputTransactionsPerSecond=3D" + throughputTransaction=
sPerSecond +
+            ", throughputBytesPerSecond=3D" + throughputBytesPerSecond +
+            ", numMembers=3D" + numMembers +
+            ", numThreads=3D" + numThreads +
+            '}';
+   }
+
+   public String getReportGeneratorClassName()
+   {
+      return CsvStatisticReportGenerator.class.getName();
+   }
+}

Added: cache-bench-fwk/trunk/src/org/cachebench/tests/results/TestResult.ja=
va
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- cache-bench-fwk/trunk/src/org/cachebench/tests/results/TestResult.java	=
                        (rev 0)
+++ cache-bench-fwk/trunk/src/org/cachebench/tests/results/TestResult.java	=
2008-01-07 14:10:02 UTC (rev 5034)
@@ -0,0 +1,36 @@
+package org.cachebench.tests.results;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @author Mircea.Markus(a)jboss.com
+ * @since 2.2
+ */
+public interface TestResult extends Serializable
+{
+
+   public String getReportGeneratorClassName();
+
+   void setTestName(String testCaseName);
+
+   void setTestTime(Date date);
+
+   void setTestType(String testName);
+
+   void setTestPassed(boolean b);
+
+   void setErrorMsg(String s);
+
+   boolean isTestPassed();
+
+   boolean isSkipReport();
+
+   String getTestName();
+
+   String getTestType();
+
+   void setFootNote(String s);
+
+   String getFootNote();
+}

Copied: cache-bench-fwk/trunk/src/org/cachebench/tests/simpletests/Associat=
ionsTest.java (from rev 4958, cache-bench-fwk/trunk/src/org/cachebench/test=
s/AssociationsTest.java)
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- cache-bench-fwk/trunk/src/org/cachebench/tests/simpletests/Associations=
Test.java	                        (rev 0)
+++ cache-bench-fwk/trunk/src/org/cachebench/tests/simpletests/Associations=
Test.java	2008-01-07 14:10:02 UTC (rev 5034)
@@ -0,0 +1,26 @@
+package org.cachebench.tests.simpletests;
+
+import org.cachebench.CacheWrapper;
+import org.cachebench.SerializableCacheWrapper;
+import org.cachebench.tests.results.StatisticTestResult;
+import org.cachebench.testobjects.CustomTypeWithAssocs;
+import org.cachebench.testobjects.SerializableCustomTypeWithAssocs;
+
+
+/**
+ * @author Manik Surtani (manik(a)surtani.org)
+ *         (C) Manik Surtani, 2004
+ */
+public class AssociationsTest extends SimpleTest
+{
+
+   /* (non-Javadoc)
+   * @see org.cachebench.tests.CacheTest#doTest(org.cachebench.config.Test=
Config)
+   */
+   public StatisticTestResult doTest(String testName, CacheWrapper cache, =
String testCaseName, int sampleSize, int numThreads) throws Exception
+   {
+      return performTestWithObjectType(testName, cache, cache instanceof S=
erializableCacheWrapper ? SerializableCustomTypeWithAssocs.class : CustomTy=
peWithAssocs.class, testCaseName, sampleSize, numThreads);
+
+   }
+
+}

Copied: cache-bench-fwk/trunk/src/org/cachebench/tests/simpletests/CustomCl=
assTest.java (from rev 4958, cache-bench-fwk/trunk/src/org/cachebench/tests=
/CustomClassTest.java)
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- cache-bench-fwk/trunk/src/org/cachebench/tests/simpletests/CustomClassT=
est.java	                        (rev 0)
+++ cache-bench-fwk/trunk/src/org/cachebench/tests/simpletests/CustomClassT=
est.java	2008-01-07 14:10:02 UTC (rev 5034)
@@ -0,0 +1,26 @@
+package org.cachebench.tests.simpletests;
+
+import org.cachebench.CacheWrapper;
+import org.cachebench.SerializableCacheWrapper;
+import org.cachebench.tests.results.StatisticTestResult;
+import org.cachebench.testobjects.CustomType;
+import org.cachebench.testobjects.SerializableCustomType;
+
+
+/**
+ * @author Manik Surtani (manik(a)surtani.org)
+ *         (C) Manik Surtani, 2004
+ */
+public class CustomClassTest extends SimpleTest
+{
+
+   /* (non-Javadoc)
+   * @see org.cachebench.tests.CacheTest#doTest(org.cachebench.config.Test=
Config)
+   */
+   public StatisticTestResult doTest(String testName, CacheWrapper cache, =
String testCaseName, int sampleSize, int numThreads) throws Exception
+   {
+      return performTestWithObjectType(testName, cache, cache instanceof S=
erializableCacheWrapper ? SerializableCustomType.class : CustomType.class, =
testCaseName, sampleSize, numThreads);
+
+   }
+
+}

Copied: cache-bench-fwk/trunk/src/org/cachebench/tests/simpletests/Primitiv=
eTest.java (from rev 4958, cache-bench-fwk/trunk/src/org/cachebench/tests/P=
rimitiveTest.java)
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- cache-bench-fwk/trunk/src/org/cachebench/tests/simpletests/PrimitiveTes=
t.java	                        (rev 0)
+++ cache-bench-fwk/trunk/src/org/cachebench/tests/simpletests/PrimitiveTes=
t.java	2008-01-07 14:10:02 UTC (rev 5034)
@@ -0,0 +1,23 @@
+package org.cachebench.tests.simpletests;
+
+import org.cachebench.CacheWrapper;
+import org.cachebench.tests.results.StatisticTestResult;
+
+
+/**
+ * @author Manik Surtani (manik(a)surtani.org)
+ *         (C) Manik Surtani, 2004
+ */
+public class PrimitiveTest extends SimpleTest
+{
+
+   /* (non-Javadoc)
+   * @see org.cachebench.tests.CacheTest#doTest(org.cachebench.config.Test=
Config)
+   */
+   public StatisticTestResult doTest(String testName, CacheWrapper cache, =
String testCaseName, int sampleSize, int numThreads) throws Exception
+   {
+      return performTestWithObjectType(testName, cache, Integer.class, tes=
tCaseName, sampleSize, numThreads);
+
+   }
+
+}

Copied: cache-bench-fwk/trunk/src/org/cachebench/tests/simpletests/SimpleTe=
st.java (from rev 5007, cache-bench-fwk/trunk/src/org/cachebench/tests/Simp=
leTest.java)
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- cache-bench-fwk/trunk/src/org/cachebench/tests/simpletests/SimpleTest.j=
ava	                        (rev 0)
+++ cache-bench-fwk/trunk/src/org/cachebench/tests/simpletests/SimpleTest.j=
ava	2008-01-07 14:10:02 UTC (rev 5034)
@@ -0,0 +1,297 @@
+package org.cachebench.tests.simpletests;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.commons.math.stat.descriptive.DescriptiveStatistics;
+import org.cachebench.CacheWrapper;
+import org.cachebench.SerializableCacheWrapper;
+import org.cachebench.tests.results.StatisticTestResult;
+import org.cachebench.tests.CacheTest;
+import org.cachebench.config.Configuration;
+
+import java.io.Serializable;
+import java.io.ByteArrayOutputStream;
+import java.io.ObjectOutputStream;
+import java.util.Date;
+import java.util.concurrent.Executors;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.atomic.AtomicLong;
+
+
+/**
+ * @author Manik Surtani (manik(a)surtani.org)
+ *         (C) Manik Surtani, 2004
+ */
+public abstract class SimpleTest implements CacheTest
+{
+   protected Log log =3D LogFactory.getLog(this.getClass());
+   protected AtomicLong numberOfBytesPut =3D new AtomicLong(0);
+   protected long elapsedSecondsForAllPuts =3D 0;
+   protected ExecutorService executor;
+   private static final int EXECUTOR_SHUTDOWN_TIMEOUT_POLL_SECS =3D 60;
+   protected Configuration configuration;
+   protected final int LOG_FREQUENCY =3D 5000;
+
+   protected StatisticTestResult performTestWithObjectType(String testCase=
Name, CacheWrapper cache, Class valueClass, String testName, int sampleSize=
, int numThreads) throws Exception
+   {
+      log.info("Number of threads " + numThreads);
+      executor =3D Executors.newFixedThreadPool(numThreads);
+
+      StatisticTestResult result =3D new StatisticTestResult();
+      result.setTestName(testCaseName + getNodeIndex());
+      result.setTestTime(new Date());
+      result.setTestType(testName);
+
+      log.info("Performing '" + sampleSize + "' PUTs");
+      DescriptiveStatistics putStats =3D doPuts(cache, valueClass, sampleS=
ize);
+      executor =3D Executors.newFixedThreadPool(numThreads);
+      log.info("Performing GETs");
+      DescriptiveStatistics getStats =3D doGets(cache, sampleSize);
+
+      result.setGetData(getStats);
+      result.setPutData(putStats);
+      result.setTestPassed(true); // The test is passed. The report would =
make use of this attribute.
+
+      // calculate throughput, in transactions per second.
+      // we only measure put operations for throughput.
+
+      // calc tps.
+
+      System.out.println("*** sum of time: " + elapsedSecondsForAllPuts);
+      System.out.println("*** num puts occured: " + putStats.getN());
+
+      try
+      {
+         result.setThroughputTransactionsPerSecond((int) (sampleSize / ela=
psedSecondsForAllPuts));
+      }
+      catch (ArithmeticException ae)
+      {
+         log.warn("Divide by 0 - elapsedSecondsForAllPuts =3D 0?");
+         result.setThroughputTransactionsPerSecond(-999);
+      }
+
+      try
+      {
+         result.setThroughputBytesPerSecond((int) (numberOfBytesPut.longVa=
lue() / elapsedSecondsForAllPuts));
+      }
+      catch (ArithmeticException ae)
+      {
+         log.warn("Divide by 0 - elapsedSecondsForAllPuts =3D 0?");
+         result.setThroughputBytesPerSecond(-999);
+      }
+
+
+      // set the number of members in the cluster
+      result.setNumMembers(cache.getNumMembers());
+      result.setNumThreads(numThreads);
+
+      return result;
+   }
+
+   /**
+    * @param cache      The Cachewrapper on which the bechmark is conducte=
d.
+    * @param sampleSize The size of the cache.
+    * @return The Descriptive statistics of the cache benchmarking.
+    */
+   private DescriptiveStatistics doGets(final CacheWrapper cache, int samp=
leSize) throws Exception
+   {
+      log.debug("Inside doGets for : " + cache);
+      final String key =3D "baseKey";
+      final DescriptiveStatistics stats =3D DescriptiveStatistics.newInsta=
nce();
+      final boolean useSerializable =3D cache instanceof SerializableCache=
Wrapper;
+
+      for (int i =3D 0; i < sampleSize; i++)
+      {
+         final int cycleNumber =3D i;
+         Runnable r =3D new Runnable()
+         {
+            public void run()
+            {
+               try
+               {
+                  if (!useSerializable)
+                  {
+                     // start your timer...
+                     long startTime =3D System.currentTimeMillis();
+                     cache.get(key + cycleNumber);
+                     long statValue =3D (System.currentTimeMillis() - star=
tTime);
+                     stats.addValue(statValue);
+                     log.debug("The Get stat : " + statValue);
+                  }
+                  else
+                  {
+                     SerializableCacheWrapper sCache =3D (SerializableCach=
eWrapper) cache;
+                     long startTime =3D System.currentTimeMillis();
+                     sCache.getSerializable(key + cycleNumber);
+                     long statValue =3D (System.currentTimeMillis() - star=
tTime);
+                     stats.addValue(statValue);
+                     log.debug("The Get stat : " + statValue);
+                  }
+                  logOperation(cycleNumber, "GETS");
+               }
+               catch (Exception e)
+               {
+                  // how should we handle this?  Log for now...
+                  log.error("Operation failed!", e);
+               }
+            }
+         };
+
+         // submit task to be executed
+         executor.execute(r);
+      }
+
+      // only leave once the task queue is empty!!
+      blockTillTasksComplete();
+
+      // return the raw data
+      log.debug("Leaving doGets for : " + cache);
+      return stats;
+   }
+
+   private void logOperation(int i, String s)
+   {
+      if ((i + 1) % LOG_FREQUENCY =3D=3D 0)
+      {
+         log.info((i + 1) + " " + s + " were performed");
+      }
+   }
+
+   /**
+    * @param cache      The Cachewrapper on which the bechmark is conducte=
d.
+    * @param valueClass The value class instance which is going to be inse=
rted into the Cache.
+    * @param sampleSize The size of the cache.
+    * @return The Descriptive statistics of the cache benchmarking.
+    */
+   private DescriptiveStatistics doPuts(final CacheWrapper cache, final Cl=
ass valueClass, int sampleSize) throws Exception
+   {
+      log.debug("Inside doPuts for " + cache);
+      final String key =3D "baseKey";
+      final DescriptiveStatistics stats =3D DescriptiveStatistics.newInsta=
nce();
+      final boolean useSerializable =3D cache instanceof SerializableCache=
Wrapper;
+      numberOfBytesPut.set(0);
+      elapsedSecondsForAllPuts =3D 0;
+      long startElapsedTime =3D System.currentTimeMillis();
+
+      for (int i =3D 0; i < sampleSize; i++)
+      {
+         final int cycleNumber =3D i;
+         Runnable r =3D new Runnable()
+         {
+            public void run()
+            {
+               try
+               {
+                  // generate some value
+                  Object value;
+                  if (valueClass =3D=3D null) value =3D null;
+                  else if (valueClass.getName().equals("java.lang.String")=
) value =3D "value" + cycleNumber;
+                  else if (valueClass.getName().equals("java.lang.Integer"=
)) value =3D cycleNumber;
+                  else value =3D valueClass.newInstance();
+
+                  // even though some impls may use special marshalling to=
 reduce the amount of data transmitted (such as JBoss Cache's
+                  // CacheMarshaller) we still want to measure the seriali=
zed size of objects for this metric.
+
+                  numberOfBytesPut.getAndAdd(calculateSerializedSize(value=
));
+
+                  if (!useSerializable)
+                  {
+                     // start your timer...
+                     long startTime =3D System.currentTimeMillis();
+                     cache.put(key + cycleNumber, value);
+                     long statValue =3D (System.currentTimeMillis() - star=
tTime);
+                     stats.addValue(statValue);
+                  }
+                  else
+                  {
+                     SerializableCacheWrapper sCache =3D (SerializableCach=
eWrapper) cache;
+                     Serializable sValue =3D (Serializable) value;
+                     long startTime =3D System.currentTimeMillis();
+                     sCache.putSerializable(key + cycleNumber, sValue);
+                     long statValue =3D (System.currentTimeMillis() - star=
tTime);
+                     stats.addValue(statValue);
+                  }
+                  logOperation(cycleNumber,"PUTS");
+               }
+               catch (Exception e)
+               {
+                  // how should we handle this?  Log for now...
+                  log.error("Operation failed!", e);
+               }
+            }
+         };
+         // submit task to be executed
+         executor.execute(r);
+      }
+
+      // only leave once the task queue is empty!!
+      blockTillTasksComplete();
+      elapsedSecondsForAllPuts =3D (System.currentTimeMillis() - startElap=
sedTime) / 1000;
+
+      // return the raw data
+      log.debug("Leaving doPuts for " + cache);
+      return stats;
+   }
+
+   private void blockTillTasksComplete()
+   {
+      // now that just told us that all the tasks have been submitted.  Le=
ts check that the executor has finished everything.
+      executor.shutdown();
+      while (!executor.isTerminated())
+      {
+         try
+         {
+            executor.awaitTermination(EXECUTOR_SHUTDOWN_TIMEOUT_POLL_SECS,=
 TimeUnit.SECONDS);
+         }
+         catch (InterruptedException e)
+         {
+            // do nothing?
+         }
+      }
+   }
+
+   private long calculateSerializedSize(Object value)
+   {
+      ByteArrayOutputStream baos =3D null;
+      ObjectOutputStream oos =3D null;
+      try
+      {
+         baos =3D new ByteArrayOutputStream();
+         oos =3D new ObjectOutputStream(baos);
+         oos.writeObject(value);
+         oos.close();
+         baos.close();
+         return baos.size();
+      }
+      catch (Exception e)
+      {
+         log.warn("Unable to calculate serialized size of object " + value=
, e);
+         try
+         {
+            if (oos !=3D null) oos.close();
+            if (baos !=3D null) baos.close();
+         }
+         catch (Exception e2)
+         {
+            log.warn("Unable to close streams", e2);
+         }
+      }
+      return 0;
+   }
+
+   public String getNodeIndex()
+   {
+      try
+      {
+         return " - " + Integer.parseInt(System.getProperty("currentIndex"=
));
+      } catch (Exception e) {
+         return "";
+      }
+   }
+
+   public void setConfiguration(Configuration configuration)
+   {
+      this.configuration =3D configuration;
+   }
+}

Copied: cache-bench-fwk/trunk/src/org/cachebench/tests/simpletests/StaticsT=
est.java (from rev 4958, cache-bench-fwk/trunk/src/org/cachebench/tests/Sta=
ticsTest.java)
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- cache-bench-fwk/trunk/src/org/cachebench/tests/simpletests/StaticsTest.=
java	                        (rev 0)
+++ cache-bench-fwk/trunk/src/org/cachebench/tests/simpletests/StaticsTest.=
java	2008-01-07 14:10:02 UTC (rev 5034)
@@ -0,0 +1,25 @@
+package org.cachebench.tests.simpletests;
+
+import org.cachebench.CacheWrapper;
+import org.cachebench.SerializableCacheWrapper;
+import org.cachebench.tests.results.StatisticTestResult;
+import org.cachebench.testobjects.CustomTypeWithStatics;
+import org.cachebench.testobjects.SerializableCustomTypeWithStatics;
+
+
+/**
+ * @author Manik Surtani (manik(a)surtani.org)
+ *         (C) Manik Surtani, 2004
+ */
+public class StaticsTest extends SimpleTest
+{
+
+   /* (non-Javadoc)
+   * @see org.cachebench.tests.CacheTest#doTest(org.cachebench.config.Test=
Config)
+   */
+   public StatisticTestResult doTest(String testName, CacheWrapper cache, =
String testCaseName, int sampleSize, int numThreads) throws Exception
+   {
+      return performTestWithObjectType(testName, cache, cache instanceof S=
erializableCacheWrapper ? SerializableCustomTypeWithStatics.class : CustomT=
ypeWithStatics.class, testCaseName, sampleSize, numThreads);
+   }
+
+}

Copied: cache-bench-fwk/trunk/src/org/cachebench/tests/simpletests/StringTe=
st.java (from rev 4958, cache-bench-fwk/trunk/src/org/cachebench/tests/Stri=
ngTest.java)
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- cache-bench-fwk/trunk/src/org/cachebench/tests/simpletests/StringTest.j=
ava	                        (rev 0)
+++ cache-bench-fwk/trunk/src/org/cachebench/tests/simpletests/StringTest.j=
ava	2008-01-07 14:10:02 UTC (rev 5034)
@@ -0,0 +1,23 @@
+package org.cachebench.tests.simpletests;
+
+import org.cachebench.CacheWrapper;
+import org.cachebench.tests.results.StatisticTestResult;
+
+
+/**
+ * @author Manik Surtani (manik(a)surtani.org)
+ *         (C) Manik Surtani, 2004
+ */
+public class StringTest extends SimpleTest
+{
+
+   /* (non-Javadoc)
+   * @see org.cachebench.tests.CacheTest#doTest(org.cachebench.config.Test=
Config)
+   */
+   public StatisticTestResult doTest(String testName, CacheWrapper cache, =
String testCaseName, int sampleSize, int numThreads) throws Exception
+   {
+      return performTestWithObjectType(testName, cache, String.class, test=
CaseName, sampleSize, numThreads);
+
+   }
+
+}

Copied: cache-bench-fwk/trunk/src/org/cachebench/tests/simpletests/Subclass=
Test.java (from rev 4958, cache-bench-fwk/trunk/src/org/cachebench/tests/Su=
bclassTest.java)
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- cache-bench-fwk/trunk/src/org/cachebench/tests/simpletests/SubclassTest=
.java	                        (rev 0)
+++ cache-bench-fwk/trunk/src/org/cachebench/tests/simpletests/SubclassTest=
.java	2008-01-07 14:10:02 UTC (rev 5034)
@@ -0,0 +1,26 @@
+package org.cachebench.tests.simpletests;
+
+import org.cachebench.CacheWrapper;
+import org.cachebench.SerializableCacheWrapper;
+import org.cachebench.tests.results.StatisticTestResult;
+import org.cachebench.testobjects.CustomTypeSubclassOfAbstract;
+import org.cachebench.testobjects.SerializableCustomTypeSubclassOfAbstract;
+
+
+/**
+ * @author Manik Surtani (manik(a)surtani.org)
+ *         (C) Manik Surtani, 2004
+ */
+public class SubclassTest extends SimpleTest
+{
+
+   /* (non-Javadoc)
+   * @see org.cachebench.tests.CacheTest#doTest(org.cachebench.config.Test=
Config)
+   */
+   public StatisticTestResult doTest(String testName, CacheWrapper cache, =
String testCaseName, int sampleSize, int numThreads) throws Exception
+   {
+      return performTestWithObjectType(testName, cache, cache instanceof S=
erializableCacheWrapper ? SerializableCustomTypeSubclassOfAbstract.class : =
CustomTypeSubclassOfAbstract.class, testCaseName, sampleSize, numThreads);
+
+   }
+
+}

Copied: cache-bench-fwk/trunk/src/org/cachebench/tests/simpletests/Transien=
tTest.java (from rev 4958, cache-bench-fwk/trunk/src/org/cachebench/tests/T=
ransientTest.java)
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- cache-bench-fwk/trunk/src/org/cachebench/tests/simpletests/TransientTes=
t.java	                        (rev 0)
+++ cache-bench-fwk/trunk/src/org/cachebench/tests/simpletests/TransientTes=
t.java	2008-01-07 14:10:02 UTC (rev 5034)
@@ -0,0 +1,26 @@
+package org.cachebench.tests.simpletests;
+
+import org.cachebench.CacheWrapper;
+import org.cachebench.SerializableCacheWrapper;
+import org.cachebench.tests.results.StatisticTestResult;
+import org.cachebench.testobjects.CustomTypeWithTransient;
+import org.cachebench.testobjects.SerializableCustomTypeWithTransient;
+
+
+/**
+ * @author Manik Surtani (manik(a)surtani.org)
+ *         (C) Manik Surtani, 2004
+ */
+public class TransientTest extends SimpleTest
+{
+
+   /* (non-Javadoc)
+   * @see org.cachebench.tests.CacheTest#doTest(org.cachebench.config.Test=
Config)
+   */
+   public StatisticTestResult doTest(String testName, CacheWrapper cache, =
String testCaseName, int sampleSize, int numThreads) throws Exception
+   {
+      return performTestWithObjectType(testName, cache, cache instanceof S=
erializableCacheWrapper ? SerializableCustomTypeWithTransient.class : Custo=
mTypeWithTransient.class, testCaseName, sampleSize, numThreads);
+
+   }
+
+}


--===============2602865321541456494==--

From jbosscache-commits at lists.jboss.org Mon Jan  7 09:18:24 2008
Content-Type: multipart/mixed; boundary="===============3266720339931653740=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r5035 -
 cache-bench-fwk/trunk/src/org/cachebench/reportgenerators.
Date: Mon, 07 Jan 2008 09:18:23 -0500
Message-ID: <E1JBso3-0006Li-CP@committer01.frg.pub.inap.atl.jboss.com>

--===============3266720339931653740==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: mircea.markus
Date: 2008-01-07 09:18:23 -0500 (Mon, 07 Jan 2008)
New Revision: 5035

Added:
   cache-bench-fwk/trunk/src/org/cachebench/reportgenerators/CsvStatisticRe=
portGenerator.java
Log:
added session simulator test + refactoring

Added: cache-bench-fwk/trunk/src/org/cachebench/reportgenerators/CsvStatist=
icReportGenerator.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- cache-bench-fwk/trunk/src/org/cachebench/reportgenerators/CsvStatisticR=
eportGenerator.java	                        (rev 0)
+++ cache-bench-fwk/trunk/src/org/cachebench/reportgenerators/CsvStatisticR=
eportGenerator.java	2008-01-07 14:18:23 UTC (rev 5035)
@@ -0,0 +1,106 @@
+package org.cachebench.reportgenerators;
+
+import org.apache.commons.logging.LogFactory;
+import org.apache.commons.math.stat.descriptive.DescriptiveStatistics;
+import org.cachebench.tests.results.StatisticTestResult;
+import org.cachebench.tests.results.TestResult;
+
+import java.io.BufferedWriter;
+import java.io.FileWriter;
+import java.io.IOException;
+
+
+/**
+ * @author Manik Surtani (manik(a)surtani.org)
+ * @version $Id: CsvStatisticReportGenerator.java,v 1.5 2007/04/18 19:09:3=
1 msurtani Exp $
+ */
+public class CsvStatisticReportGenerator extends CsvBaseReportGenerator
+{
+   public CsvStatisticReportGenerator()
+   {
+      log =3D LogFactory.getLog(this.getClass());
+   }
+
+   /**
+    * Writes out the report.
+    * The method checkes whether the result is passed or failed. And based=
 on the status would generate the report with
+    * appropriate content. The method also checks whether the report has a=
ny foot notes attached to the test case. If
+    * any foot note is found, then its added to the <code>footNotes</code>=
 ArrayList for later processing.
+    */
+   protected void writeTestResult(TestResult results, BufferedWriter write=
r) throws IOException
+   {
+      StatisticTestResult stResults =3D (StatisticTestResult) results;
+      log.debug("Writing the Result to the Report");
+      StringBuffer buf =3D new StringBuffer();
+      if (stResults.isTestPassed())
+      {
+         // This test has pased. Lets add this test results to the report.
+         DescriptiveStatistics putData =3D stResults.getPutData();
+         DescriptiveStatistics getData =3D stResults.getGetData();
+
+         buf.append(stResults.getTestName());
+         buf.append(",");
+         buf.append(stResults.getTestTime());
+         buf.append(",");
+         buf.append(stResults.getTestType());
+         buf.append(",");
+         buf.append(stResults.getNumMembers());
+         buf.append(",");
+         buf.append(stResults.getNumThreads());
+         buf.append(",");
+         buf.append(putData.getSum()/1000);
+         buf.append(",");
+         buf.append(getData.getSum()/1000);
+         buf.append(",");
+         buf.append(putData.getMean());
+         buf.append(",");
+         buf.append(getData.getMean());
+         buf.append(",");
+         // medians are the 50th percentile...
+         buf.append(putData.getPercentile(50));
+         buf.append(",");
+         buf.append(getData.getPercentile(50));
+         buf.append(",");
+         buf.append(putData.getStandardDeviation());
+         buf.append(",");
+         buf.append(getData.getStandardDeviation());
+         buf.append(",");
+         buf.append(putData.getMax());
+         buf.append(",");
+         buf.append(getData.getMax());
+         buf.append(",");
+         buf.append(putData.getMin());
+         buf.append(",");
+         buf.append(getData.getMin());
+         buf.append(",");
+         buf.append(stResults.getThroughputTransactionsPerSecond());
+         buf.append(",");
+         buf.append(stResults.getThroughputBytesPerSecond());
+      }
+      else
+      {
+         // This test has failed. Need to add this to the report.
+         buf.append(stResults.getTestName());
+         buf.append(",");
+         buf.append(stResults.getTestTime());
+         buf.append(",");
+         buf.append(stResults.getTestType());
+         buf.append(",");
+         buf.append(stResults.getErrorMsg());
+      }
+
+      // write details of this test to file.
+      writer.write(buf.toString());
+      writer.newLine();
+   }
+
+   protected void writeHeaderLine(BufferedWriter writer) throws IOException
+   {
+      log.debug("Write the Report Header");
+      writer.write("TEST NAME, TEST DATE, TEST TYPE, NUM MEMBERS, NUM THRE=
ADS, TOTAL PUT TIME (secs), TOTAL GET TIME (secs), MEAN PUT TIME, MEAN GET =
TIME, MEDIAN PUT TIME, MEDIAN GET TIME, STANDARD DEVIATION PUT TIME, STANDA=
RD DEVIATION GET TIME, MAX PUT TIME, MAX GET TIME, MIN PUT TIME, MIN GET TI=
ME, THROUGHPUT TRANSACTIONS PER SEC, THROUGHPUT BYTES PER SEC");
+      writer.newLine();
+      log.debug("Complted the Report Header");
+   }
+
+
+}


--===============3266720339931653740==--

From jbosscache-commits at lists.jboss.org Mon Jan  7 10:34:10 2008
Content-Type: multipart/mixed; boundary="===============1576266440572488459=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r5036 -
 cache-bench-fwk/trunk/src/org/cachebench/tests.
Date: Mon, 07 Jan 2008 10:34:10 -0500
Message-ID: <E1JBtzO-00040k-QB@committer01.frg.pub.inap.atl.jboss.com>

--===============1576266440572488459==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: mircea.markus
Date: 2008-01-07 10:34:10 -0500 (Mon, 07 Jan 2008)
New Revision: 5036

Modified:
   cache-bench-fwk/trunk/src/org/cachebench/tests/SessionSimulatorTest.java
Log:
added session simulator test + refactoring

Modified: cache-bench-fwk/trunk/src/org/cachebench/tests/SessionSimulatorTe=
st.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- cache-bench-fwk/trunk/src/org/cachebench/tests/SessionSimulatorTest.jav=
a	2008-01-07 14:18:23 UTC (rev 5035)
+++ cache-bench-fwk/trunk/src/org/cachebench/tests/SessionSimulatorTest.jav=
a	2008-01-07 15:34:10 UTC (rev 5036)
@@ -20,11 +20,13 @@
    private static final Log log =3D LogFactory.getLog(SessionSimulatorTest=
.class);
 =

    public static final String SESSION_PREFIX =3D "SESSION_";
+   private static int LOG_AFTER_OPERATION_COUNT =3D 5000;
    Configuration configuration;
    private TestConfig thisTestConfig;
    private String sessionId;
    private CacheWrapper cacheWrapper;
 =

+
    /**
     * total number of request to be made against this session: reads + wri=
tes
     */
@@ -75,6 +77,7 @@
       long start=3DSystem.currentTimeMillis();
       for (int i =3D 0; i < numberOfRequests; i++)
       {
+         logRunCount(i);
          randomAction =3D r.nextInt(100);
          randomAttribute =3D r.nextInt(numberOfAttributes - 1);
          byte[] buf;
@@ -113,6 +116,14 @@
       return result;
    }
 =

+   private void logRunCount(int i)
+   {
+      if (i % LOG_AFTER_OPERATION_COUNT =3D=3D 0)
+      {
+         log.info("SessionSimulatorTest performed " + i + " oprations");
+      }
+   }
+
    private void initSession() throws Exception
    {
       for (int i =3D 0; i < numberOfAttributes; i++)


--===============1576266440572488459==--

From jbosscache-commits at lists.jboss.org Mon Jan  7 10:37:51 2008
Content-Type: multipart/mixed; boundary="===============9085444171694346905=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN:  r5037 - /.
Date: Mon, 07 Jan 2008 10:37:50 -0500
Message-ID: <E1JBu2w-0004v5-Vu@committer01.frg.pub.inap.atl.jboss.com>

--===============9085444171694346905==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: manik.surtani(a)jboss.com
Date: 2008-01-07 10:37:50 -0500 (Mon, 07 Jan 2008)
New Revision: 5037

Added:
   benchmarks/
Log:



--===============9085444171694346905==--

From jbosscache-commits at lists.jboss.org Mon Jan  7 12:04:25 2008
Content-Type: multipart/mixed; boundary="===============7693506491482885982=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r5038 -
 core/trunk/src/main/java/org/jboss/cache/marshall.
Date: Mon, 07 Jan 2008 12:04:24 -0500
Message-ID: <E1JBvOi-0004Yq-Us@committer01.frg.pub.inap.atl.jboss.com>

--===============7693506491482885982==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: manik.surtani(a)jboss.com
Date: 2008-01-07 12:04:24 -0500 (Mon, 07 Jan 2008)
New Revision: 5038

Modified:
   core/trunk/src/main/java/org/jboss/cache/marshall/CacheMarshaller200.java
Log:
reverting back to this for now

Modified: core/trunk/src/main/java/org/jboss/cache/marshall/CacheMarshaller=
200.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/java/org/jboss/cache/marshall/CacheMarshaller200.ja=
va	2008-01-07 15:37:50 UTC (rev 5037)
+++ core/trunk/src/main/java/org/jboss/cache/marshall/CacheMarshaller200.ja=
va	2008-01-07 17:04:24 UTC (rev 5038)
@@ -117,7 +117,7 @@
       {
          // not region based!
          if (trace) log.trace("Marshalling object " + o);
-         ReferencesMap refMap =3D new ReferencesMap();
+         Map<Object, Integer> refMap =3D new HashMap<Object, Integer>();
          marshallObject(o, out, refMap);
       }
    }
@@ -140,7 +140,7 @@
    public void objectToObjectStream(Object o, ObjectOutputStream out, Fqn =
region) throws Exception
    {
       if (trace) log.trace("Marshalling object " + o);
-      ReferencesMap refMap =3D new ReferencesMap();
+      Map<Object, Integer> refMap =3D new HashMap<Object, Integer>();
       if (useRegionBasedMarshalling) // got to check again in case this me=
th is called directly
       {
          log.trace("Writing region " + region + " to stream");
@@ -257,18 +257,16 @@
    }
    // --------- Marshalling methods
 =

-   private void marshallObject(Object o, ObjectOutputStream out, Reference=
sMap refMap) throws Exception
+   private void marshallObject(Object o, ObjectOutputStream out, Map<Objec=
t, Integer> refMap) throws Exception
    {
-      int reference;
-
       if (o =3D=3D null)
       {
          out.writeByte(MAGICNUMBER_NULL);
       }
-      else if ((reference =3D refMap.getReference(o)) > -1)// see if this =
object has been marshalled before.
+      else if (refMap.containsKey(o))// see if this object has been marsha=
lled before.
       {
          out.writeByte(MAGICNUMBER_REF);
-         writeReference(out, reference);
+         writeReference(out, refMap.get(o));
       }
       else if (o instanceof MethodCall)
       {
@@ -404,7 +402,7 @@
       }
    }
 =

-   private void marshallGravitateResult(GravitateResult gravitateResult, O=
bjectOutputStream out, ReferencesMap refMap) throws Exception
+   private void marshallGravitateResult(GravitateResult gravitateResult, O=
bjectOutputStream out, Map<Object, Integer> refMap) throws Exception
    {
       marshallObject(gravitateResult.isDataFound(), out, refMap);
       if (gravitateResult.isDataFound())
@@ -415,19 +413,20 @@
 =

    }
 =

-   private int createReference(Object o, ReferencesMap refMap)
+   private int createReference(Object o, Map<Object, Integer> refMap)
    {
-      int reference =3D refMap.nextAvailableReference();
-      refMap.put(reference, o);
+      int reference =3D refMap.size();
+      refMap.put(o, reference);
       return reference;
    }
 =

    private void marshallString(String s, ObjectOutputStream out) throws Ex=
ception
    {
+      //StringUtil.saveString(out, s);
       out.writeObject(s);
    }
 =

-   private void marshallMethodCall(MethodCall methodCall, ObjectOutputStre=
am out, ReferencesMap refMap) throws Exception
+   private void marshallMethodCall(MethodCall methodCall, ObjectOutputStre=
am out, Map<Object, Integer> refMap) throws Exception
    {
       out.writeShort(methodCall.getMethodId());
       Object[] args =3D methodCall.getArgs();
@@ -440,14 +439,14 @@
       }
    }
 =

-   private void marshallGlobalTransaction(GlobalTransaction globalTransact=
ion, ObjectOutputStream out, ReferencesMap refMap) throws Exception
+   private void marshallGlobalTransaction(GlobalTransaction globalTransact=
ion, ObjectOutputStream out, Map<Object, Integer> refMap) throws Exception
    {
       out.writeLong(globalTransaction.getId());
       marshallObject(globalTransaction.getAddress(), out, refMap);
    }
 =

 =

-   private void marshallFqn(Fqn fqn, ObjectOutputStream out, ReferencesMap=
 refMap) throws Exception
+   private void marshallFqn(Fqn fqn, ObjectOutputStream out, Map<Object, I=
nteger> refMap) throws Exception
    {
       boolean isRoot =3D fqn.isRoot();
       out.writeBoolean(isRoot);
@@ -466,7 +465,7 @@
       ipAddress.writeExternal(out);
    }
 =

-   private void marshallCollection(Collection c, ObjectOutputStream out, R=
eferencesMap refMap) throws Exception
+   private void marshallCollection(Collection c, ObjectOutputStream out, M=
ap refMap) throws Exception
    {
       writeUnsignedInt(out, c.size());
       for (Object o : c)
@@ -475,7 +474,7 @@
       }
    }
 =

-   private void marshallMap(Map map, ObjectOutputStream out, ReferencesMap=
 refMap) throws Exception
+   private void marshallMap(Map map, ObjectOutputStream out, Map<Object, I=
nteger> refMap) throws Exception
    {
       int mapSize =3D map.size();
       writeUnsignedInt(out, mapSize);
@@ -810,50 +809,3 @@
       out.writeLong(i);
    }
 }
-
-class ReferencesMap
-{
-   private ArrayList<Object> referencedObjects =3D new ArrayList<Object>()
-   {
-      @Override
-      public int indexOf(Object elem)
-      {
-         if (elem =3D=3D null)
-         {
-            for (int i =3D 0; i < size(); i++)
-            {
-               if (get(i) =3D=3D null) return i;
-            }
-         }
-         else
-         {
-            for (int i =3D 0; i < size(); i++)
-            {
-               Object elInList =3D get(i);
-               if (elInList.getClass().equals(elem.getClass()) && elem.equ=
als(elInList)) return i;
-            }
-         }
-         return -1;
-      }
-   };
-
-   void put(int reference, Object object)
-   {
-      referencedObjects.add(reference, object);
-   }
-
-   Object get(int reference)
-   {
-      return referencedObjects.get(reference);
-   }
-
-   int nextAvailableReference()
-   {
-      return referencedObjects.size();
-   }
-
-   int getReference(Object object)
-   {
-      return referencedObjects.indexOf(object);
-   }
-}


--===============7693506491482885982==--

From jboss-qa-internal at redhat.com Mon Jan  7 12:05:45 2008
Content-Type: multipart/mixed; boundary="===============2224713700887197676=="
MIME-Version: 1.0
From: jboss-qa-internal at redhat.com
To: jbosscache-commits at lists.jboss.org
Subject: =?utf-8?q?=5Bjbosscache-commits=5D_Build_failed_in_Hudson=3A_jboss-cache-?=
 =?utf-8?q?core-jdk1=2E6_=C2=BB_JBoss_Cache_-_Core_Edition_=23153?=
Date: Mon, 07 Jan 2008 12:05:44 -0500
Message-ID: <11775667.12841199725544363.JavaMail.hudson@dev45.qa.atl2.redhat.com>

--===============2224713700887197676==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

See https://hudson.jboss.org/hudson/job/jboss-cache-core-jdk1.6/org.jboss.c=
ache$jbosscache-core/153/changes

Changes:

[manik.surtani(a)jboss.com] fixed class cast exceptions when comparing IpAd=
dress instances

------------------------------------------
started
Building remotely on dev03-linux
$ /qa/tools/opt/jdk1.6.0_02/bin/java -Xmx256m -cp /home/hudson/hudson_works=
pace/maven-agent.jar:/qa/tools/opt/maven-2.0.6/boot/classworlds-1.1.jar hud=
son.maven.agent.Main /qa/tools/opt/maven-2.0.6 /qa/services/hudson/hudson_1=
.149/slave.jar /home/hudson/hudson_workspace/maven-interceptor.jar
FATAL: null
java.io.InterruptedIOException
	at java.io.PipedInputStream.read(PipedInputStream.java:262)
	at hudson.remoting.Channel.<init>(Channel.java:155)
	at hudson.remoting.Channel.<init>(Channel.java:116)
	at hudson.Launcher$RemoteLauncher.launchChannel(Launcher.java:356)
	at hudson.maven.MavenProcessFactory.newProcess(MavenProcessFactory.java:57)
	at hudson.maven.ProcessCache.get(ProcessCache.java:166)
	at hudson.maven.MavenBuild$RunnerImpl.doRun(MavenBuild.java:322)
	at hudson.model.AbstractBuild$AbstractRunner.run(AbstractBuild.java:182)
	at hudson.model.Run.run(Run.java:579)
	at hudson.maven.MavenBuild.run(MavenBuild.java:106)
	at hudson.model.ResourceController.execute(ResourceController.java:70)
	at hudson.model.Executor.run(Executor.java:62)


--===============2224713700887197676==--

From jbosscache-commits at lists.jboss.org Mon Jan  7 13:09:54 2008
Content-Type: multipart/mixed; boundary="===============5727137062146934631=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r5039 - in
 core/trunk/src/main/java/org/jboss/cache: interceptors and 1 other
 directories.
Date: Mon, 07 Jan 2008 13:09:54 -0500
Message-ID: <E1JBwQ6-0001Ae-3G@committer01.frg.pub.inap.atl.jboss.com>

--===============5727137062146934631==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: manik.surtani(a)jboss.com
Date: 2008-01-07 13:09:53 -0500 (Mon, 07 Jan 2008)
New Revision: 5039

Modified:
   core/trunk/src/main/java/org/jboss/cache/NodeSPI.java
   core/trunk/src/main/java/org/jboss/cache/UnversionedNode.java
   core/trunk/src/main/java/org/jboss/cache/interceptors/PessimisticLockInt=
erceptor.java
   core/trunk/src/main/java/org/jboss/cache/invocation/NodeInvocationDelega=
te.java
Log:
Suppress notifications for nodes created as a part of removeNode()

Modified: core/trunk/src/main/java/org/jboss/cache/NodeSPI.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/java/org/jboss/cache/NodeSPI.java	2008-01-07 17:04:=
24 UTC (rev 5038)
+++ core/trunk/src/main/java/org/jboss/cache/NodeSPI.java	2008-01-07 18:09:=
53 UTC (rev 5039)
@@ -246,6 +246,19 @@
    NodeSPI<K, V> addChildDirect(Fqn childName);
 =

    /**
+    * Same as {@link #addChildDirect(Fqn)} except that it optionally allow=
s you to suppress notification events for
+    * the creation of this node.
+    *
+    * @param f      name of child
+    * @param notify if true, notification events are sent; if false, they =
are not
+    * @return child node
+    * @throws org.jboss.cache.lock.LockingException
+    *          if locking was not obtained
+    * @see #addChild(Fqn)
+    */
+   NodeSPI<K, V> addChildDirect(Fqn f, boolean notify);
+
+   /**
     * Directly adds the node passed in to the children map of the current =
node.  Will throw a CacheException if
     * <tt>child.getFqn().getParent().equals(getFqn())</tt> returns false.
     *
@@ -443,9 +456,9 @@
     * using special <tt>_JBOSS_INTERNAL_XXX</tt> Strings as keys.  Designe=
d to be used by {@link org.jboss.cache.statetransfer.StateTransferGenerator}
     * and {@link org.jboss.cache.interceptors.CacheStoreInterceptor} which=
 attempt to serialize nodes into a stream for storage or transfer.
     *
+    * @param onlyInternalState if true, the map will only contain internal=
 state and no other data.
     * @return a map containing data as well as additional information abou=
t this node.
     * @since 2.1.0
-    * @param onlyInternalState if true, the map will only contain internal=
 state and no other data.
     */
    Map getInternalState(boolean onlyInternalState);
 =

@@ -463,7 +476,8 @@
    /**
     * Sets the validity of a node.  By default, all nodes are valid unless=
 they are deleted, invalidated or moved, either
     * locally or remotely.  To be used in conjunction with {@link #isValid=
()}.
-    * @param valid if true, the node is marked as valid; if false, the nod=
e is invalid.
+    *
+    * @param valid     if true, the node is marked as valid; if false, the=
 node is invalid.
     * @param recursive if true, the validity flag passed in is applied to =
all children as well.
     * @since 2.1.0
     */

Modified: core/trunk/src/main/java/org/jboss/cache/UnversionedNode.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/java/org/jboss/cache/UnversionedNode.java	2008-01-0=
7 17:04:24 UTC (rev 5038)
+++ core/trunk/src/main/java/org/jboss/cache/UnversionedNode.java	2008-01-0=
7 18:09:53 UTC (rev 5039)
@@ -248,12 +248,12 @@
       return data.put(key, value);
    }
 =

-   public NodeSPI<K, V> getOrCreateChild(Object child_name, GlobalTransact=
ion gtx)
+   public NodeSPI<K, V> getOrCreateChild(Object child_name, GlobalTransact=
ion gtx, boolean notify)
    {
-      return getOrCreateChild(child_name, gtx, true);
+      return getOrCreateChild(child_name, gtx, true, notify);
    }
 =

-   private NodeSPI<K, V> getOrCreateChild(Object child_name, GlobalTransac=
tion gtx, boolean createIfNotExists)
+   private NodeSPI<K, V> getOrCreateChild(Object child_name, GlobalTransac=
tion gtx, boolean createIfNotExists, boolean notify)
    {
 =

       NodeSPI<K, V> child;
@@ -281,7 +281,7 @@
             child =3D (NodeSPI<K, V>) children().get(child_name);
             if (child =3D=3D null)
             {
-               cache.getNotifier().notifyNodeCreated(child_fqn, true, ctx);
+               if (notify) cache.getNotifier().notifyNodeCreated(child_fqn=
, true, ctx);
                child =3D newChild;
                children.put(child_name, child);
                if (gtx !=3D null)
@@ -303,7 +303,7 @@
             {
                log.trace("created child: fqn=3D" + child_fqn);
             }
-            cache.getNotifier().notifyNodeCreated(child_fqn, false, ctx);
+            if (notify) cache.getNotifier().notifyNodeCreated(child_fqn, f=
alse, ctx);
          }
       }
       return child;
@@ -456,10 +456,15 @@
 =

    public NodeSPI<K, V> addChildDirect(Fqn f)
    {
+      return addChildDirect(f, true);
+   }
+
+   public NodeSPI<K, V> addChildDirect(Fqn f, boolean notify)
+   {
       if (f.size() =3D=3D 1)
       {
          GlobalTransaction gtx =3D cache.getInvocationContext().getGlobalT=
ransaction();
-         return getOrCreateChild(f.getLastElement(), gtx);
+         return getOrCreateChild(f.getLastElement(), gtx, notify, notify);
       }
       else
       {

Modified: core/trunk/src/main/java/org/jboss/cache/interceptors/Pessimistic=
LockInterceptor.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/java/org/jboss/cache/interceptors/PessimisticLockIn=
terceptor.java	2008-01-07 17:04:24 UTC (rev 5038)
+++ core/trunk/src/main/java/org/jboss/cache/interceptors/PessimisticLockIn=
terceptor.java	2008-01-07 18:09:53 UTC (rev 5039)
@@ -390,7 +390,8 @@
          {
             if (createIfNotExists)
             {
-               currentNode =3D parent.addChildDirect(new Fqn(childName));
+               // if the new node is to be marked as deleted, do not notif=
y!
+               currentNode =3D parent.addChildDirect(new Fqn(childName), !=
markNewNodesAsDeleted);
                created =3D true;
                if (trace) log.trace("Child node was null, so created child=
 node " + childName);
                if (createdNodes !=3D null) createdNodes.add(currentNode.ge=
tFqn());

Modified: core/trunk/src/main/java/org/jboss/cache/invocation/NodeInvocatio=
nDelegate.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/java/org/jboss/cache/invocation/NodeInvocationDeleg=
ate.java	2008-01-07 17:04:24 UTC (rev 5038)
+++ core/trunk/src/main/java/org/jboss/cache/invocation/NodeInvocationDeleg=
ate.java	2008-01-07 18:09:53 UTC (rev 5039)
@@ -77,7 +77,7 @@
 =

    public NodeSPI<K, V> getOrCreateChild(Object name, GlobalTransaction tx)
    {
-      return node.getOrCreateChild(name, tx);
+      return node.getOrCreateChild(name, tx, true);
    }
 =

    public NodeLock getLock()
@@ -155,6 +155,11 @@
       return node.addChildDirect(childName);
    }
 =

+   public NodeSPI<K, V> addChildDirect(Fqn f, boolean notify)
+   {
+      return node.addChildDirect(f, notify);
+   }
+
    public void addChildDirect(NodeSPI<K, V> child)
    {
       node.addChildDirect(child);


--===============5727137062146934631==--

From jboss-qa-internal at redhat.com Mon Jan  7 13:32:14 2008
Content-Type: multipart/mixed; boundary="===============5022585906952305081=="
MIME-Version: 1.0
From: jboss-qa-internal at redhat.com
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] Hudson build became unstable:
 jboss-cache-1.4.X-jdk1.5 #53
Date: Mon, 07 Jan 2008 13:32:12 -0500
Message-ID: <12958185.12921199730732788.JavaMail.hudson@dev45.qa.atl2.redhat.com>

--===============5022585906952305081==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

See http://hudson.qa.jboss.com/hudson/job/jboss-cache-1.4.X-jdk1.5/53/chang=
es



--===============5022585906952305081==--

From jboss-qa-internal at redhat.com Mon Jan  7 14:51:16 2008
Content-Type: multipart/mixed; boundary="===============4283632214386502497=="
MIME-Version: 1.0
From: jboss-qa-internal at redhat.com
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] Hudson build completed: jboss-cache-1.4.X-jdk1.5
 #54
Date: Mon, 07 Jan 2008 14:50:36 -0500
Message-ID: <16052131.12961199735436933.JavaMail.hudson@dev45.qa.atl2.redhat.com>

--===============4283632214386502497==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

See http://hudson.qa.jboss.com/hudson/job/jboss-cache-1.4.X-jdk1.5/54/chang=
es



--===============4283632214386502497==--

From jbosscache-commits at lists.jboss.org Mon Jan  7 19:26:23 2008
Content-Type: multipart/mixed; boundary="===============1293370725748207277=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r5040 - in core/trunk/src:
 test/java/org/jboss/cache/notifications and 1 other directory.
Date: Mon, 07 Jan 2008 19:26:23 -0500
Message-ID: <E1JC2IR-0006YX-9R@committer01.frg.pub.inap.atl.jboss.com>

--===============1293370725748207277==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: manik.surtani(a)jboss.com
Date: 2008-01-07 19:26:22 -0500 (Mon, 07 Jan 2008)
New Revision: 5040

Modified:
   core/trunk/src/main/java/org/jboss/cache/UnversionedNode.java
   core/trunk/src/test/java/org/jboss/cache/notifications/CacheListenerOpti=
misticTest.java
   core/trunk/src/test/java/org/jboss/cache/notifications/CacheListenerTest=
.java
   core/trunk/src/test/java/org/jboss/cache/notifications/RemoteCacheListen=
erTest.java
Log:
Added tests for notifications on removal on nonexistent node and fixed typo

Modified: core/trunk/src/main/java/org/jboss/cache/UnversionedNode.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/java/org/jboss/cache/UnversionedNode.java	2008-01-0=
7 18:09:53 UTC (rev 5039)
+++ core/trunk/src/main/java/org/jboss/cache/UnversionedNode.java	2008-01-0=
8 00:26:22 UTC (rev 5040)
@@ -464,7 +464,7 @@
       if (f.size() =3D=3D 1)
       {
          GlobalTransaction gtx =3D cache.getInvocationContext().getGlobalT=
ransaction();
-         return getOrCreateChild(f.getLastElement(), gtx, notify, notify);
+         return getOrCreateChild(f.getLastElement(), gtx, true, notify);
       }
       else
       {

Modified: core/trunk/src/test/java/org/jboss/cache/notifications/CacheListe=
nerOptimisticTest.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/test/java/org/jboss/cache/notifications/CacheListenerOpt=
imisticTest.java	2008-01-07 18:09:53 UTC (rev 5039)
+++ core/trunk/src/test/java/org/jboss/cache/notifications/CacheListenerOpt=
imisticTest.java	2008-01-08 00:26:22 UTC (rev 5040)
@@ -6,6 +6,9 @@
  */
 package org.jboss.cache.notifications;
 =

+import org.testng.annotations.Test;
+
+(a)Test(groups =3D "functional")
 public class CacheListenerOptimisticTest extends CacheListenerTest
 {
    public CacheListenerOptimisticTest()

Modified: core/trunk/src/test/java/org/jboss/cache/notifications/CacheListe=
nerTest.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/test/java/org/jboss/cache/notifications/CacheListenerTes=
t.java	2008-01-07 18:09:53 UTC (rev 5039)
+++ core/trunk/src/test/java/org/jboss/cache/notifications/CacheListenerTes=
t.java	2008-01-08 00:26:22 UTC (rev 5040)
@@ -38,7 +38,7 @@
  *
  * @since 2.0.0
  */
-(a)Test(groups =3D {"functional"})
+(a)Test(groups =3D "functional")
 public class CacheListenerTest
 {
    protected boolean optLocking =3D false;
@@ -165,6 +165,20 @@
       assertNull("Should be null", cache.getRoot().getChild(fqn));
    }
 =

+   public void testNonexistentRemove() throws Exception
+   {
+      cache.removeNode("/does/not/exist");
+      List<Event> expected =3D new ArrayList<Event>();
+
+      if (optLocking)
+      {
+         expected.add(new EventImpl(false, cache, null, null, null, null, =
true, null, false, null, TRANSACTION_REGISTERED));
+         expected.add(new EventImpl(false, cache, null, null, null, null, =
true, null, true, null, TRANSACTION_COMPLETED));
+         eventLog.scrubImplicitTransactions();
+      }
+      assertEquals(expected, eventLog.events);
+   }
+
    public void testRemoveData() throws Exception
    {
       assertEquals("Event log should be empty", Collections.emptyList(), e=
ventLog.events);
@@ -262,6 +276,18 @@
 =

    // -- now the transactional ones
 =

+   public void testTxNonexistentRemove() throws Exception
+   {
+      tm.begin();
+      Transaction tx =3D tm.getTransaction();
+      cache.removeNode("/does/not/exist");
+      tm.commit();
+      List<Event> expected =3D new ArrayList<Event>();
+      expected.add(new EventImpl(false, cache, null, null, null, tx, true,=
 null, false, null, TRANSACTION_REGISTERED));
+      expected.add(new EventImpl(false, cache, null, null, null, tx, true,=
 null, true, null, TRANSACTION_COMPLETED));
+      assertEquals(expected, eventLog.events);
+   }
+
    public void testTxCreationCommit() throws Exception
    {
       assertEquals("Event log should be empty", Collections.emptyList(), e=
ventLog.events);

Modified: core/trunk/src/test/java/org/jboss/cache/notifications/RemoteCach=
eListenerTest.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/test/java/org/jboss/cache/notifications/RemoteCacheListe=
nerTest.java	2008-01-07 18:09:53 UTC (rev 5039)
+++ core/trunk/src/test/java/org/jboss/cache/notifications/RemoteCacheListe=
nerTest.java	2008-01-08 00:26:22 UTC (rev 5040)
@@ -160,6 +160,25 @@
       assertEquals("value", cache1.get(fqn, "key"));
    }
 =

+   public void testNonexistentRemove() throws Exception
+   {
+      cache1.removeNode("/does/not/exist");
+      List<Event> expected =3D new ArrayList<Event>();
+
+      if (optLocking)
+      {
+         expected.add(new EventImpl(false, cache1, null, null, null, null,=
 true, null, false, null, TRANSACTION_REGISTERED));
+         expected.add(new EventImpl(false, cache1, null, null, null, null,=
 true, null, true, null, TRANSACTION_COMPLETED));
+         eventLog1.scrubImplicitTransactions();
+         eventLog2.scrubImplicitTransactions();
+      }
+      assertEquals(expected, eventLog1.events);
+      setCache(cache2, expected);
+      markOriginRemote(expected);
+      assertEquals(expected, eventLog2.events);
+   }
+
+
    public void testOnlyModification() throws Exception
    {
       assertNull(cache1.get(fqn, "key"));
@@ -405,6 +424,23 @@
       assertEquals("value", cache2.get(fqn, "key"));
    }
 =

+   public void testTxNonexistentRemove() throws Exception
+   {
+      tm1.begin();
+      Transaction tx =3D tm1.getTransaction();
+      cache1.removeNode("/does/not/exist");
+      tm1.commit();
+      List<Event> expected =3D new ArrayList<Event>();
+      expected.add(new EventImpl(false, cache1, null, null, null, tx, true=
, null, false, null, TRANSACTION_REGISTERED));
+      expected.add(new EventImpl(false, cache1, null, null, null, tx, true=
, null, true, null, TRANSACTION_COMPLETED));
+      assertEquals(expected, eventLog1.events);
+      setCache(cache2, expected);
+      markOriginRemote(expected);
+      scrubTransactions(expected);
+      eventLog2.scrubImplicitTransactions();
+      assertEquals(expected, eventLog2.events);
+   }
+
    public void testTxCreationRollback() throws Exception
    {
       assertEquals("Event log should be empty", Collections.emptyList(), e=
ventLog2.events);


--===============1293370725748207277==--

From jbosscache-commits at lists.jboss.org Mon Jan  7 20:12:05 2008
Content-Type: multipart/mixed; boundary="===============2908265546853621350=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r5041 -
 demos/core-demo-gui/trunk/src/main/java/org/jboss/cache/demo.
Date: Mon, 07 Jan 2008 20:12:04 -0500
Message-ID: <E1JC30e-0006qQ-RC@committer01.frg.pub.inap.atl.jboss.com>

--===============2908265546853621350==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: manik.surtani(a)jboss.com
Date: 2008-01-07 20:12:04 -0500 (Mon, 07 Jan 2008)
New Revision: 5041

Modified:
   demos/core-demo-gui/trunk/src/main/java/org/jboss/cache/demo/JBossCacheD=
emo.form
   demos/core-demo-gui/trunk/src/main/java/org/jboss/cache/demo/JBossCacheD=
emo.java
Log:
Updated GUI

Modified: demos/core-demo-gui/trunk/src/main/java/org/jboss/cache/demo/JBos=
sCacheDemo.form
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- demos/core-demo-gui/trunk/src/main/java/org/jboss/cache/demo/JBossCache=
Demo.form	2008-01-08 00:26:22 UTC (rev 5040)
+++ demos/core-demo-gui/trunk/src/main/java/org/jboss/cache/demo/JBossCache=
Demo.form	2008-01-08 01:12:04 UTC (rev 5041)
@@ -612,6 +612,48 @@
               </component>
             </children>
           </grid>
+          <grid id=3D"ffd9b" binding=3D"debugTab" layout-manager=3D"GridLa=
youtManager" row-count=3D"2" column-count=3D"3" same-size-horizontally=3D"f=
alse" same-size-vertically=3D"false" hgap=3D"-1" vgap=3D"-1">
+            <margin top=3D"0" left=3D"0" bottom=3D"0" right=3D"0"/>
+            <constraints>
+              <tabbedpane title=3D"Debug" enabled=3D"false"/>
+            </constraints>
+            <properties/>
+            <border type=3D"none"/>
+            <children>
+              <component id=3D"cda62" class=3D"javax.swing.JButton" bindin=
g=3D"cacheDetailsButton">
+                <constraints>
+                  <grid row=3D"0" column=3D"0" row-span=3D"1" col-span=3D"=
1" vsize-policy=3D"0" hsize-policy=3D"3" anchor=3D"0" fill=3D"1" indent=3D"=
0" use-parent-layout=3D"false"/>
+                </constraints>
+                <properties>
+                  <text value=3D"Print cache details"/>
+                </properties>
+              </component>
+              <component id=3D"3a0c2" class=3D"javax.swing.JButton" bindin=
g=3D"cacheLockInfoButton">
+                <constraints>
+                  <grid row=3D"0" column=3D"1" row-span=3D"1" col-span=3D"=
1" vsize-policy=3D"0" hsize-policy=3D"3" anchor=3D"0" fill=3D"1" indent=3D"=
0" use-parent-layout=3D"false"/>
+                </constraints>
+                <properties>
+                  <text value=3D"Print cache locking info"/>
+                </properties>
+              </component>
+              <component id=3D"7423b" class=3D"javax.swing.JTextArea" bind=
ing=3D"debugTextArea">
+                <constraints>
+                  <grid row=3D"1" column=3D"0" row-span=3D"1" col-span=3D"=
3" vsize-policy=3D"6" hsize-policy=3D"6" anchor=3D"0" fill=3D"3" indent=3D"=
0" use-parent-layout=3D"false">
+                    <preferred-size width=3D"150" height=3D"50"/>
+                  </grid>
+                </constraints>
+                <properties>
+                  <background color=3D"-3355444"/>
+                  <font name=3D"Courier New" size=3D"10"/>
+                </properties>
+              </component>
+              <hspacer id=3D"75f56">
+                <constraints>
+                  <grid row=3D"0" column=3D"2" row-span=3D"1" col-span=3D"=
1" vsize-policy=3D"1" hsize-policy=3D"6" anchor=3D"0" fill=3D"1" indent=3D"=
0" use-parent-layout=3D"false"/>
+                </constraints>
+              </hspacer>
+            </children>
+          </grid>
         </children>
       </tabbedpane>
       <component id=3D"97005" class=3D"javax.swing.JLabel" binding=3D"cach=
eStatus">

Modified: demos/core-demo-gui/trunk/src/main/java/org/jboss/cache/demo/JBos=
sCacheDemo.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- demos/core-demo-gui/trunk/src/main/java/org/jboss/cache/demo/JBossCache=
Demo.java	2008-01-08 00:26:22 UTC (rev 5040)
+++ demos/core-demo-gui/trunk/src/main/java/org/jboss/cache/demo/JBossCache=
Demo.java	2008-01-08 01:12:04 UTC (rev 5041)
@@ -9,6 +9,7 @@
 import org.jboss.cache.DefaultCacheFactory;
 import org.jboss.cache.Fqn;
 import org.jboss.cache.Node;
+import org.jboss.cache.util.CachePrinter;
 import org.jboss.cache.notifications.annotation.BuddyGroupChanged;
 import org.jboss.cache.notifications.annotation.NodeCreated;
 import org.jboss.cache.notifications.annotation.NodeModified;
@@ -48,6 +49,9 @@
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.ThreadPoolExecutor;
+import java.util.concurrent.AbstractExecutorService;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.LinkedBlockingQueue;
 =

 /**
  * @author Manik Surtani (<a href=3D"mailto:manik(a)jboss.org">manik(a)jbo=
ss.org</a>)
@@ -92,6 +96,10 @@
    private JTextArea configFileContents;
    private JRadioButton getNodeRadioButton;
    private JScrollPane treeScrollPane;
+   private JPanel debugTab;
+   private JButton cacheDetailsButton;
+   private JButton cacheLockInfoButton;
+   private JTextArea debugTextArea;
    private String cacheConfigFile;
    private Cache<String, String> cache;
    private String startCacheButtonLabel =3D "Start Cache", stopCacheButton=
Label =3D "Stop Cache";
@@ -374,6 +382,20 @@
             });
          }
       });
+      cacheDetailsButton.addActionListener(new ActionListener()
+      {
+         public void actionPerformed(ActionEvent e)
+         {
+            if (cache !=3D null) debugTextArea.setText(CachePrinter.printC=
acheDetails(cache));
+         }
+      });
+      cacheLockInfoButton.addActionListener(new ActionListener()
+      {
+         public void actionPerformed(ActionEvent e)
+         {
+            if (cache !=3D null) debugTextArea.setText(CachePrinter.printC=
acheLockingInfo(cache));
+         }
+      });
    }
 =

    private void updateStats()


--===============2908265546853621350==--

From jbosscache-commits at lists.jboss.org Mon Jan  7 20:12:23 2008
Content-Type: multipart/mixed; boundary="===============0869562405495780015=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r5042 -
 demos/core-demo-gui/trunk/src/main/java/org/jboss/cache/demo.
Date: Mon, 07 Jan 2008 20:12:23 -0500
Message-ID: <E1JC30x-0006rH-4x@committer01.frg.pub.inap.atl.jboss.com>

--===============0869562405495780015==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: manik.surtani(a)jboss.com
Date: 2008-01-07 20:12:23 -0500 (Mon, 07 Jan 2008)
New Revision: 5042

Modified:
   demos/core-demo-gui/trunk/src/main/java/org/jboss/cache/demo/DataTreeRef=
resher.java
Log:
Updated GUI

Modified: demos/core-demo-gui/trunk/src/main/java/org/jboss/cache/demo/Data=
TreeRefresher.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- demos/core-demo-gui/trunk/src/main/java/org/jboss/cache/demo/DataTreeRe=
fresher.java	2008-01-08 01:12:04 UTC (rev 5041)
+++ demos/core-demo-gui/trunk/src/main/java/org/jboss/cache/demo/DataTreeRe=
fresher.java	2008-01-08 01:12:23 UTC (rev 5042)
@@ -81,6 +81,8 @@
 =

    public void addNode(Fqn<String> f)
    {
+      // node added!!
+      log.debug("Adding node " + f, new Throwable());
       getOrCreateTreeNode(f);
    }
 =



--===============0869562405495780015==--

From jbosscache-commits at lists.jboss.org Tue Jan  8 06:51:00 2008
Content-Type: multipart/mixed; boundary="===============7103865531058955870=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r5043 -
 core/trunk/src/test/java/org/jboss/cache/marshall.
Date: Tue, 08 Jan 2008 06:51:00 -0500
Message-ID: <E1JCCyy-00038v-K2@committer01.frg.pub.inap.atl.jboss.com>

--===============7103865531058955870==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: manik.surtani(a)jboss.com
Date: 2008-01-08 06:51:00 -0500 (Tue, 08 Jan 2008)
New Revision: 5043

Modified:
   core/trunk/src/test/java/org/jboss/cache/marshall/RemoteCallerReturnValu=
esTest.java
Log:
Implemented missing tests

Modified: core/trunk/src/test/java/org/jboss/cache/marshall/RemoteCallerRet=
urnValuesTest.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/test/java/org/jboss/cache/marshall/RemoteCallerReturnVal=
uesTest.java	2008-01-08 01:12:23 UTC (rev 5042)
+++ core/trunk/src/test/java/org/jboss/cache/marshall/RemoteCallerReturnVal=
uesTest.java	2008-01-08 11:51:00 UTC (rev 5043)
@@ -3,13 +3,16 @@
 import org.jboss.cache.CacheSPI;
 import org.jboss.cache.DefaultCacheFactory;
 import org.jboss.cache.Fqn;
-import org.jboss.cache.buddyreplication.BuddyGroup;
+import org.jboss.cache.invocation.RemoteCacheInvocationDelegate;
+import org.jboss.cache.misc.TestingUtil;
 import org.testng.annotations.AfterMethod;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 =

+import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.util.Collections;
+import java.util.List;
 =

 /**
  * Tests whether remote calls to RPC methods suppress return values (as so=
metimes expected)
@@ -24,12 +27,16 @@
    private Fqn fqn =3D Fqn.fromString("/a");
    private Object key =3D "key";
    private Object value =3D "value";
+   private RemoteCacheInvocationDelegate rcid;
+   private Method invokeMethod;
 =

    @BeforeMethod(alwaysRun =3D true)
    public void setUp() throws Exception
    {
       cache =3D (CacheSPI<Object, Object>) new DefaultCacheFactory().creat=
eCache();
       cache.put(fqn, key, value);
+      rcid =3D TestingUtil.getRemoteDelegate(cache);
+      invokeMethod =3D cache.getClass().getSuperclass().getDeclaredMethod(=
"invoke", MethodCall.class);
    }
 =

    @AfterMethod(alwaysRun =3D true)
@@ -40,47 +47,48 @@
 =

    public void testMethodsThatShouldReturnValues() throws Throwable
    {
-      assert false : "Implement me";
-      /*
-      Object retval =3D cache._replicate(MethodCallFactory.create(MethodDe=
clarations.clusteredGetMethod, MethodCallFactory.create(MethodDeclarations.=
getKeyValueMethodLocal, fqn), false));
-      assertNotNull(retval);
+      MethodCall mc =3D MethodCallFactory.create(MethodDeclarations.getKey=
sMethodLocal_id, fqn);
+      assert rcid._replicate(mc) =3D=3D null;
+      List l =3D rcid.clusteredGet(mc, false);
 =

-      assertNotNull(cache._replicate(MethodCallFactory.create(MethodDeclar=
ations.dataGravitationMethod, fqn, false)));
-      */
+      assert l !=3D null;
+      assert (Boolean) l.get(0);
+      assert l.get(1).equals(Collections.singleton(key));
    }
 =

 =

+   /**
+    * The purpose of this test is to ensure that these remote method calls=
 - when called using _replicate - will always return null
+    * since a return value is not neeeded.
+    *
+    * @throws Throwable
+    */
    public void testMethodsThatShouldReturnNull() throws Throwable
    {
-      doNullReturnTest(MethodDeclarations.getDataMapMethodLocal, fqn);
-      doNullReturnTest(MethodDeclarations.existsMethod, fqn);
-      doNullReturnTest(MethodDeclarations.getNodeMethodLocal, fqn);
-      doNullReturnTest(MethodDeclarations.getKeysMethodLocal, fqn);
-      doNullReturnTest(MethodDeclarations.getChildrenNamesMethodLocal, fqn=
);
-      doNullReturnTest(MethodDeclarations.releaseAllLocksMethodLocal, fqn);
-      doNullReturnTest(MethodDeclarations.printMethodLocal, fqn);
+      doNullReturnTest(MethodDeclarations.getDataMapMethodLocal_id, Collec=
tions.singletonMap(key, value), fqn);
+      doNullReturnTest(MethodDeclarations.getNodeMethodLocal_id, cache.get=
Node(fqn), fqn);
+      doNullReturnTest(MethodDeclarations.getKeysMethodLocal_id, Collectio=
ns.singleton(key), fqn);
+      doNullReturnTest(MethodDeclarations.getChildrenNamesMethodLocal_id, =
Collections.emptySet(), fqn);
+      doNullReturnTest(MethodDeclarations.putKeyValMethodLocal_id, value, =
null, fqn, key, value, true);
+      doNullReturnTest(MethodDeclarations.removeKeyMethodLocal_id, value, =
null, fqn, key, true);
+   }
 =

-      // ------------ buddy replication
 =

-      doNullReturnTest(MethodDeclarations.remoteAnnounceBuddyPoolNameMetho=
d, cache.getLocalAddress(), null);
-      doNullReturnTest(MethodDeclarations.remoteRemoveFromBuddyGroupMethod=
, "arse");
-      doNullReturnTest(MethodDeclarations.remoteAssignToBuddyGroupMethod, =
new BuddyGroup(), Collections.emptyMap());
+   private void doNullReturnTest(int methodId, Object expectedretValForLoc=
alTest, Object... args) throws Throwable
+   {
+      MethodCall mc =3D MethodCallFactory.create(methodId, args);
+      // "local" version of the call:
+      Object retVal =3D invokeCallDirectly(mc);
+      assert retVal !=3D null && retVal.equals(expectedretValForLocalTest);
 =

-      // ------------ move() api
-      doNullReturnTest(MethodDeclarations.moveMethodLocal, fqn, Fqn.ROOT);
-
-      // ------------ Channel BLOCK event
-      doNullReturnTest(MethodDeclarations.blockChannelMethodLocal);
-      doNullReturnTest(MethodDeclarations.unblockChannelMethodLocal);
+      // now try this using the replicate method.
+      Object retVal2 =3D rcid._replicate(mc);
+      assert retVal2 =3D=3D null;
    }
 =

-
-   private void doNullReturnTest(Method m, Object... args)
+   private Object invokeCallDirectly(MethodCall mc) throws NoSuchMethodExc=
eption, IllegalAccessException, InvocationTargetException
    {
-      assert false : "Implement me";
-      /*
-      MethodCall c =3D MethodCallFactory.create(m, args);
-      assertNull(m + " should return a null when called remotely", cache._=
replicate(c));
-      */
+      invokeMethod.setAccessible(true);
+      return invokeMethod.invoke(cache, mc);
    }
 }


--===============7103865531058955870==--

From jbosscache-commits at lists.jboss.org Tue Jan  8 07:34:45 2008
Content-Type: multipart/mixed; boundary="===============8106542954137711651=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r5044 -
 core/trunk/src/main/java/org/jboss/cache.
Date: Tue, 08 Jan 2008 07:34:45 -0500
Message-ID: <E1JCDfJ-0002in-5q@committer01.frg.pub.inap.atl.jboss.com>

--===============8106542954137711651==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: manik.surtani(a)jboss.com
Date: 2008-01-08 07:34:45 -0500 (Tue, 08 Jan 2008)
New Revision: 5044

Modified:
   core/trunk/src/main/java/org/jboss/cache/RegionManager.java
Log:
deal with default region and default inactive flag

Modified: core/trunk/src/main/java/org/jboss/cache/RegionManager.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/java/org/jboss/cache/RegionManager.java	2008-01-08 =
11:51:00 UTC (rev 5043)
+++ core/trunk/src/main/java/org/jboss/cache/RegionManager.java	2008-01-08 =
12:34:45 UTC (rev 5044)
@@ -319,6 +319,7 @@
       {
          if (log.isTraceEnabled()) log.trace("Activating region " + fqn);
          Region r =3D getRegion(fqn, false);
+         if (r !=3D null && r.getFqn() !=3D null && r.getFqn().isRoot() &&=
 !fqn.isRoot() && defaultInactive) return;
          if (r !=3D null)
          {
             if (!defaultInactive && r.getClassLoader() =3D=3D null)
@@ -721,6 +722,7 @@
 =

          if (region !=3D null)
          {
+            if (region.getFqn().isRoot() && !fqn.isRoot() && !defaultInact=
ive) return;
             if (defaultInactive && region.getClassLoader() =3D=3D null)
             {
                // This region's state will no match that of a non-existent=
 one


--===============8106542954137711651==--

From jbosscache-commits at lists.jboss.org Tue Jan  8 08:08:47 2008
Content-Type: multipart/mixed; boundary="===============6841883751087226479=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN:  r5045 - benchmarks.
Date: Tue, 08 Jan 2008 08:08:47 -0500
Message-ID: <E1JCECF-00013o-50@committer01.frg.pub.inap.atl.jboss.com>

--===============6841883751087226479==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: bela(a)jboss.com
Date: 2008-01-08 08:08:47 -0500 (Tue, 08 Jan 2008)
New Revision: 5045

Added:
   benchmarks/CacheTests/
Log:



--===============6841883751087226479==--

From jbosscache-commits at lists.jboss.org Tue Jan  8 08:08:55 2008
Content-Type: multipart/mixed; boundary="===============5974691656180009737=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r5046 - benchmarks/CacheTests.
Date: Tue, 08 Jan 2008 08:08:54 -0500
Message-ID: <E1JCECM-000142-Oy@committer01.frg.pub.inap.atl.jboss.com>

--===============5974691656180009737==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: bela(a)jboss.com
Date: 2008-01-08 08:08:54 -0500 (Tue, 08 Jan 2008)
New Revision: 5046

Added:
   benchmarks/CacheTests/trunk/
Log:



--===============5974691656180009737==--

From jbosscache-commits at lists.jboss.org Tue Jan  8 08:20:17 2008
Content-Type: multipart/mixed; boundary="===============2033068340620572035=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r5047 - benchmarks/CacheTests.
Date: Tue, 08 Jan 2008 08:20:16 -0500
Message-ID: <E1JCENM-0003lj-BZ@committer01.frg.pub.inap.atl.jboss.com>

--===============2033068340620572035==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: bela(a)jboss.com
Date: 2008-01-08 08:20:16 -0500 (Tue, 08 Jan 2008)
New Revision: 5047

Removed:
   benchmarks/CacheTests/trunk/
Log:



--===============2033068340620572035==--

From jbosscache-commits at lists.jboss.org Tue Jan  8 08:24:23 2008
Content-Type: multipart/mixed; boundary="===============4015275662627740931=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r5048 - in benchmarks: trunk
 and 8 other directories.
Date: Tue, 08 Jan 2008 08:24:23 -0500
Message-ID: <E1JCERL-00040P-0D@committer01.frg.pub.inap.atl.jboss.com>

--===============4015275662627740931==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: bela(a)jboss.com
Date: 2008-01-08 08:24:22 -0500 (Tue, 08 Jan 2008)
New Revision: 5048

Added:
   benchmarks/branches/
   benchmarks/tags/
   benchmarks/trunk/
   benchmarks/trunk/CacheTests.iml
   benchmarks/trunk/CacheTests.ipr
   benchmarks/trunk/CacheTests.iws
   benchmarks/trunk/Tests.iml
   benchmarks/trunk/ch.sh
   benchmarks/trunk/config.xml
   benchmarks/trunk/jbc.sh
   benchmarks/trunk/lib/
   benchmarks/trunk/lib/activation.jar
   benchmarks/trunk/lib/ant.jar
   benchmarks/trunk/lib/c3p0.jar
   benchmarks/trunk/lib/commons-codec-1.3.jar
   benchmarks/trunk/lib/commons-logging.jar
   benchmarks/trunk/lib/derby.jar
   benchmarks/trunk/lib/dtdparser121.jar
   benchmarks/trunk/lib/javassist.jar
   benchmarks/trunk/lib/jboss-aop.jar
   benchmarks/trunk/lib/jboss-common-core.jar
   benchmarks/trunk/lib/jboss-common-logging-spi.jar
   benchmarks/trunk/lib/jboss-container.jar
   benchmarks/trunk/lib/jboss-javaee.jar
   benchmarks/trunk/lib/jboss-logging-spi.jar
   benchmarks/trunk/lib/jbosscache-core.jar
   benchmarks/trunk/lib/jbosscache-pojo.jar
   benchmarks/trunk/lib/jbossxb.jar
   benchmarks/trunk/lib/jcip-annotations.jar
   benchmarks/trunk/lib/jdbm.jar
   benchmarks/trunk/lib/jgroups.jar
   benchmarks/trunk/lib/junit.jar
   benchmarks/trunk/lib/log4j.jar
   benchmarks/trunk/lib/pojocache-aop.xml
   benchmarks/trunk/lib/qdox.jar
   benchmarks/trunk/lib/testng.jar
   benchmarks/trunk/lib/trove.jar
   benchmarks/trunk/lib/xercesImpl.jar
   benchmarks/trunk/obsolete/
   benchmarks/trunk/obsolete/SessionTestCoherence.old
   benchmarks/trunk/obsolete/SessionTestJBC.java.old
   benchmarks/trunk/obsolete/SessionTestPC.java.old
   benchmarks/trunk/obsolete/SessionTestTC.java.old
   benchmarks/trunk/pc.sh
   benchmarks/trunk/pojocache-aop.xml
   benchmarks/trunk/run.sh
   benchmarks/trunk/src/
   benchmarks/trunk/src/perf/
   benchmarks/trunk/src/perf/Session.java
   benchmarks/trunk/src/perf/SessionFactory.java
   benchmarks/trunk/src/perf/SessionTest.java
   benchmarks/trunk/src/perf/coherence/
   benchmarks/trunk/src/perf/coherence/SessionCoherence.java
   benchmarks/trunk/src/perf/coherence/SessionFactoryCoherence.java
   benchmarks/trunk/src/perf/jbosscache/
   benchmarks/trunk/src/perf/jbosscache/SessionFactoryJBC.java
   benchmarks/trunk/src/perf/jbosscache/SessionJBC.java
   benchmarks/trunk/src/perf/pojocache/
   benchmarks/trunk/src/perf/pojocache/SessionFactoryPC.java
   benchmarks/trunk/src/perf/pojocache/SessionPC.java
   benchmarks/trunk/src/perf/terracotta/
   benchmarks/trunk/src/perf/terracotta/SessionFactoryTC.java
   benchmarks/trunk/src/perf/terracotta/SessionTC.java
   benchmarks/trunk/tc.sh
   benchmarks/trunk/tc5-config.xml
   benchmarks/trunk/tmp.sh
Log:
initial import

Added: benchmarks/trunk/CacheTests.iml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- benchmarks/trunk/CacheTests.iml	                        (rev 0)
+++ benchmarks/trunk/CacheTests.iml	2008-01-08 13:24:22 UTC (rev 5048)
@@ -0,0 +1,295 @@
+<?xml version=3D"1.0" encoding=3D"UTF-8"?>
+<module relativePaths=3D"true" type=3D"JAVA_MODULE" version=3D"4">
+  <component name=3D"NewModuleRootManager" inherit-compiler-output=3D"fals=
e">
+    <output url=3D"file://$MODULE_DIR$/classes" />
+    <exclude-output />
+    <output-test url=3D"file://$MODULE_DIR$/classes" />
+    <content url=3D"file://$MODULE_DIR$">
+      <sourceFolder url=3D"file://$MODULE_DIR$/src" isTestSource=3D"false"=
 />
+      <excludeFolder url=3D"file://$MODULE_DIR$/obsolete" />
+    </content>
+    <orderEntry type=3D"inheritedJdk" />
+    <orderEntry type=3D"sourceFolder" forTests=3D"false" />
+    <orderEntry type=3D"module-library">
+      <library>
+        <CLASSES>
+          <root url=3D"jar://$MODULE_DIR$/lib/junit.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type=3D"module-library">
+      <library>
+        <CLASSES>
+          <root url=3D"jar://$MODULE_DIR$/lib/httpclient.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type=3D"module-library">
+      <library>
+        <CLASSES>
+          <root url=3D"jar://$MODULE_DIR$/lib/jboss-common-core.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type=3D"module-library">
+      <library>
+        <CLASSES>
+          <root url=3D"jar://$MODULE_DIR$/lib/c3p0.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type=3D"module-library">
+      <library>
+        <CLASSES>
+          <root url=3D"jar://$MODULE_DIR$/lib/jboss-common-logging-spi.jar=
!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type=3D"module-library">
+      <library>
+        <CLASSES>
+          <root url=3D"jar://$MODULE_DIR$/lib/jboss-container.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type=3D"module-library">
+      <library>
+        <CLASSES>
+          <root url=3D"jar://$MODULE_DIR$/lib/jbosscache-pojo.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type=3D"module-library">
+      <library>
+        <CLASSES>
+          <root url=3D"jar://$MODULE_DIR$/lib/testng.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type=3D"module-library">
+      <library>
+        <CLASSES>
+          <root url=3D"jar://$MODULE_DIR$/lib/commons-logging.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type=3D"module-library">
+      <library>
+        <CLASSES>
+          <root url=3D"jar://$MODULE_DIR$/lib/javassist.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type=3D"module-library">
+      <library>
+        <CLASSES>
+          <root url=3D"jar://$MODULE_DIR$/lib/derby.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type=3D"module-library">
+      <library>
+        <CLASSES>
+          <root url=3D"jar://$MODULE_DIR$/lib/jboss-logging-spi.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type=3D"module-library">
+      <library>
+        <CLASSES>
+          <root url=3D"jar://$MODULE_DIR$/lib/coherence.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type=3D"module-library">
+      <library>
+        <CLASSES>
+          <root url=3D"jar://$MODULE_DIR$/lib/tangosol.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type=3D"module-library">
+      <library>
+        <CLASSES>
+          <root url=3D"jar://$MODULE_DIR$/lib/qdox.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type=3D"module-library">
+      <library>
+        <CLASSES>
+          <root url=3D"jar://$MODULE_DIR$/lib/dtdparser121.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type=3D"module-library">
+      <library>
+        <CLASSES>
+          <root url=3D"jar://$MODULE_DIR$/lib/trove.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type=3D"module-library">
+      <library>
+        <CLASSES>
+          <root url=3D"jar://$MODULE_DIR$/lib/commons-codec-1.3.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type=3D"module-library">
+      <library>
+        <CLASSES>
+          <root url=3D"jar://$MODULE_DIR$/lib/tc.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type=3D"module-library">
+      <library>
+        <CLASSES>
+          <root url=3D"jar://$MODULE_DIR$/lib/jboss-aop.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type=3D"module-library">
+      <library>
+        <CLASSES>
+          <root url=3D"jar://$MODULE_DIR$/lib/jcip-annotations.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type=3D"module-library">
+      <library>
+        <CLASSES>
+          <root url=3D"jar://$MODULE_DIR$/lib/jdbm.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type=3D"module-library">
+      <library>
+        <CLASSES>
+          <root url=3D"jar://$MODULE_DIR$/lib/activation.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type=3D"module-library">
+      <library>
+        <CLASSES>
+          <root url=3D"jar://$MODULE_DIR$/lib/je.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type=3D"module-library">
+      <library>
+        <CLASSES>
+          <root url=3D"jar://$MODULE_DIR$/lib/log4j.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type=3D"module-library">
+      <library>
+        <CLASSES>
+          <root url=3D"jar://$MODULE_DIR$/lib/xercesImpl.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type=3D"module-library">
+      <library>
+        <CLASSES>
+          <root url=3D"jar://$MODULE_DIR$/lib/jbossxb.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type=3D"module-library">
+      <library>
+        <CLASSES>
+          <root url=3D"jar://$MODULE_DIR$/lib/jbosscache-core.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type=3D"module-library">
+      <library>
+        <CLASSES>
+          <root url=3D"jar://$MODULE_DIR$/lib/jgroups.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type=3D"module-library">
+      <library>
+        <CLASSES>
+          <root url=3D"jar://$MODULE_DIR$/lib/ant.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type=3D"module-library">
+      <library>
+        <CLASSES>
+          <root url=3D"jar://$MODULE_DIR$/lib/jboss-javaee.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntryProperties />
+  </component>
+</module>
+

Added: benchmarks/trunk/CacheTests.ipr
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- benchmarks/trunk/CacheTests.ipr	                        (rev 0)
+++ benchmarks/trunk/CacheTests.ipr	2008-01-08 13:24:22 UTC (rev 5048)
@@ -0,0 +1,710 @@
+<?xml version=3D"1.0" encoding=3D"UTF-8"?>
+<project relativePaths=3D"false" version=3D"4">
+  <component name=3D"AntConfiguration">
+    <defaultAnt bundledAnt=3D"true" />
+  </component>
+  <component name=3D"BuildJarProjectSettings">
+    <option name=3D"BUILD_JARS_ON_MAKE" value=3D"false" />
+  </component>
+  <component name=3D"ChangeBrowserSettings">
+    <option name=3D"MAIN_SPLITTER_PROPORTION" value=3D"0.3" />
+    <option name=3D"MESSAGES_SPLITTER_PROPORTION" value=3D"0.8" />
+    <option name=3D"USE_DATE_BEFORE_FILTER" value=3D"false" />
+    <option name=3D"USE_DATE_AFTER_FILTER" value=3D"false" />
+    <option name=3D"USE_CHANGE_BEFORE_FILTER" value=3D"false" />
+    <option name=3D"USE_CHANGE_AFTER_FILTER" value=3D"false" />
+    <option name=3D"DATE_BEFORE" value=3D"" />
+    <option name=3D"DATE_AFTER" value=3D"" />
+    <option name=3D"CHANGE_BEFORE" value=3D"" />
+    <option name=3D"CHANGE_AFTER" value=3D"" />
+    <option name=3D"USE_USER_FILTER" value=3D"false" />
+    <option name=3D"USER" value=3D"" />
+  </component>
+  <component name=3D"CodeStyleProjectProfileManger">
+    <option name=3D"PROJECT_PROFILE" />
+    <option name=3D"USE_PROJECT_LEVEL_SETTINGS" value=3D"false" />
+  </component>
+  <component name=3D"CodeStyleSettingsManager">
+    <option name=3D"PER_PROJECT_SETTINGS" />
+    <option name=3D"USE_PER_PROJECT_SETTINGS" value=3D"false" />
+  </component>
+  <component name=3D"CompilerConfiguration">
+    <option name=3D"DEFAULT_COMPILER" value=3D"Javac" />
+    <option name=3D"DEPLOY_AFTER_MAKE" value=3D"0" />
+    <resourceExtensions>
+      <entry name=3D".+\.(properties|xml|html|dtd|tld)" />
+      <entry name=3D".+\.(gif|png|jpeg|jpg)" />
+    </resourceExtensions>
+    <wildcardResourcePatterns>
+      <entry name=3D"?*.properties" />
+      <entry name=3D"?*.xml" />
+      <entry name=3D"?*.gif" />
+      <entry name=3D"?*.png" />
+      <entry name=3D"?*.jpeg" />
+      <entry name=3D"?*.jpg" />
+      <entry name=3D"?*.html" />
+      <entry name=3D"?*.dtd" />
+      <entry name=3D"?*.tld" />
+    </wildcardResourcePatterns>
+  </component>
+  <component name=3D"Cvs2Configuration">
+    <option name=3D"PRUNE_EMPTY_DIRECTORIES" value=3D"true" />
+    <option name=3D"MERGING_MODE" value=3D"0" />
+    <option name=3D"MERGE_WITH_BRANCH1_NAME" value=3D"HEAD" />
+    <option name=3D"MERGE_WITH_BRANCH2_NAME" value=3D"HEAD" />
+    <option name=3D"RESET_STICKY" value=3D"false" />
+    <option name=3D"CREATE_NEW_DIRECTORIES" value=3D"true" />
+    <option name=3D"DEFAULT_TEXT_FILE_SUBSTITUTION" value=3D"kv" />
+    <option name=3D"PROCESS_UNKNOWN_FILES" value=3D"false" />
+    <option name=3D"PROCESS_DELETED_FILES" value=3D"false" />
+    <option name=3D"PROCESS_IGNORED_FILES" value=3D"false" />
+    <option name=3D"RESERVED_EDIT" value=3D"false" />
+    <option name=3D"CHECKOUT_DATE_OR_REVISION_SETTINGS">
+      <value>
+        <option name=3D"BRANCH" value=3D"" />
+        <option name=3D"DATE" value=3D"" />
+        <option name=3D"USE_BRANCH" value=3D"false" />
+        <option name=3D"USE_DATE" value=3D"false" />
+      </value>
+    </option>
+    <option name=3D"UPDATE_DATE_OR_REVISION_SETTINGS">
+      <value>
+        <option name=3D"BRANCH" value=3D"" />
+        <option name=3D"DATE" value=3D"" />
+        <option name=3D"USE_BRANCH" value=3D"false" />
+        <option name=3D"USE_DATE" value=3D"false" />
+      </value>
+    </option>
+    <option name=3D"SHOW_CHANGES_REVISION_SETTINGS">
+      <value>
+        <option name=3D"BRANCH" value=3D"" />
+        <option name=3D"DATE" value=3D"" />
+        <option name=3D"USE_BRANCH" value=3D"false" />
+        <option name=3D"USE_DATE" value=3D"false" />
+      </value>
+    </option>
+    <option name=3D"SHOW_OUTPUT" value=3D"false" />
+    <option name=3D"ADD_WATCH_INDEX" value=3D"0" />
+    <option name=3D"REMOVE_WATCH_INDEX" value=3D"0" />
+    <option name=3D"UPDATE_KEYWORD_SUBSTITUTION" />
+    <option name=3D"MAKE_NEW_FILES_READONLY" value=3D"false" />
+    <option name=3D"SHOW_CORRUPTED_PROJECT_FILES" value=3D"0" />
+    <option name=3D"TAG_AFTER_PROJECT_COMMIT" value=3D"false" />
+    <option name=3D"OVERRIDE_EXISTING_TAG_FOR_PROJECT" value=3D"true" />
+    <option name=3D"TAG_AFTER_PROJECT_COMMIT_NAME" value=3D"" />
+    <option name=3D"CLEAN_COPY" value=3D"false" />
+  </component>
+  <component name=3D"DependenciesAnalyzeManager">
+    <option name=3D"myForwardDirection" value=3D"false" />
+  </component>
+  <component name=3D"DependencyValidationManager">
+    <option name=3D"SKIP_IMPORT_STATEMENTS" value=3D"false" />
+  </component>
+  <component name=3D"EclipseCompilerSettings">
+    <option name=3D"DEBUGGING_INFO" value=3D"true" />
+    <option name=3D"GENERATE_NO_WARNINGS" value=3D"true" />
+    <option name=3D"DEPRECATION" value=3D"false" />
+    <option name=3D"ADDITIONAL_OPTIONS_STRING" value=3D"" />
+    <option name=3D"MAXIMUM_HEAP_SIZE" value=3D"128" />
+  </component>
+  <component name=3D"EclipseEmbeddedCompilerSettings">
+    <option name=3D"DEBUGGING_INFO" value=3D"true" />
+    <option name=3D"GENERATE_NO_WARNINGS" value=3D"true" />
+    <option name=3D"DEPRECATION" value=3D"false" />
+    <option name=3D"ADDITIONAL_OPTIONS_STRING" value=3D"" />
+    <option name=3D"MAXIMUM_HEAP_SIZE" value=3D"128" />
+  </component>
+  <component name=3D"EntryPointsManager">
+    <entry_points version=3D"2.0" />
+  </component>
+  <component name=3D"ErrorOptionsConfigurable.UI">
+    <option name=3D"proportions">
+      <SplitterProportionsDataImpl />
+    </option>
+  </component>
+  <component name=3D"ExportToHTMLSettings">
+    <option name=3D"PRINT_LINE_NUMBERS" value=3D"false" />
+    <option name=3D"OPEN_IN_BROWSER" value=3D"false" />
+    <option name=3D"OUTPUT_DIRECTORY" />
+  </component>
+  <component name=3D"IdProvider" IDEtalkID=3D"07662B52393BA0D44F4C3ECDDE1A=
49E1" />
+  <component name=3D"InspectionProjectProfileManager">
+    <option name=3D"PROJECT_PROFILE" value=3D"Project Default" />
+    <option name=3D"USE_PROJECT_LEVEL_SETTINGS" value=3D"false" />
+    <scopes />
+    <profiles>
+      <profile version=3D"1.0" is_locked=3D"false">
+        <option name=3D"myName" value=3D"Project Default" />
+        <option name=3D"myLocal" value=3D"false" />
+        <inspection_tool class=3D"FinalPrivateMethod" level=3D"WARNING" en=
abled=3D"false" />
+        <inspection_tool class=3D"FinalStaticMethod" level=3D"WARNING" ena=
bled=3D"false" />
+        <inspection_tool class=3D"InfiniteLoopStatement" level=3D"WARNING"=
 enabled=3D"false" />
+        <inspection_tool class=3D"ErrorRethrown" level=3D"WARNING" enabled=
=3D"true" />
+        <inspection_tool class=3D"ThreadDeathRethrown" level=3D"WARNING" e=
nabled=3D"true" />
+        <inspection_tool class=3D"NonFinalFieldOfException" level=3D"WARNI=
NG" enabled=3D"true" />
+        <inspection_tool class=3D"UnusedImport" level=3D"WARNING" enabled=
=3D"true" />
+        <inspection_tool class=3D"TestCaseWithConstructor" level=3D"WARNIN=
G" enabled=3D"true" />
+        <inspection_tool class=3D"MisorderedAssertEqualsParameters" level=
=3D"WARNING" enabled=3D"true" />
+        <inspection_tool class=3D"SetupCallsSuperSetup" level=3D"WARNING" =
enabled=3D"true" />
+        <inspection_tool class=3D"MisspelledSetUp" level=3D"WARNING" enabl=
ed=3D"true" />
+        <inspection_tool class=3D"SetupIsPublicVoidNoArg" level=3D"WARNING=
" enabled=3D"true" />
+        <inspection_tool class=3D"SimplifiableJUnitAssertion" level=3D"WAR=
NING" enabled=3D"true" />
+        <inspection_tool class=3D"StaticSuite" level=3D"WARNING" enabled=
=3D"true" />
+        <inspection_tool class=3D"TeardownCallsSuperTeardown" level=3D"WAR=
NING" enabled=3D"true" />
+        <inspection_tool class=3D"MisspelledTearDown" level=3D"WARNING" en=
abled=3D"true" />
+        <inspection_tool class=3D"TeardownIsPublicVoidNoArg" level=3D"WARN=
ING" enabled=3D"true" />
+        <inspection_tool class=3D"TestMethodIsPublicVoidNoArg" level=3D"WA=
RNING" enabled=3D"true" />
+        <inspection_tool class=3D"UnconstructableTestCase" level=3D"WARNIN=
G" enabled=3D"true" />
+        <inspection_tool class=3D"TrivialStringConcatenation" level=3D"WAR=
NING" enabled=3D"true" />
+        <inspection_tool class=3D"InnerClassMayBeStatic" level=3D"WARNING"=
 enabled=3D"true" />
+        <inspection_tool class=3D"SubstringZero" level=3D"WARNING" enabled=
=3D"true" />
+        <inspection_tool class=3D"StringEqualsEmptyString" level=3D"WARNIN=
G" enabled=3D"true" />
+        <inspection_tool class=3D"StringBufferToStringInConcatenation" lev=
el=3D"WARNING" enabled=3D"true" />
+        <inspection_tool class=3D"AssignmentUsedAsCondition" level=3D"WARN=
ING" enabled=3D"true" />
+        <inspection_tool class=3D"CastConflictsWithInstanceof" level=3D"WA=
RNING" enabled=3D"true" />
+        <inspection_tool class=3D"CastToIncompatibleInterface" level=3D"WA=
RNING" enabled=3D"true" />
+        <inspection_tool class=3D"CollectionAddedToSelf" level=3D"WARNING"=
 enabled=3D"true" />
+        <inspection_tool class=3D"MisspelledCompareTo" level=3D"WARNING" e=
nabled=3D"true" />
+        <inspection_tool class=3D"CovariantCompareTo" level=3D"WARNING" en=
abled=3D"true" />
+        <inspection_tool class=3D"CovariantEquals" level=3D"WARNING" enabl=
ed=3D"true" />
+        <inspection_tool class=3D"EmptyInitializer" level=3D"WARNING" enab=
led=3D"true" />
+        <inspection_tool class=3D"MisspelledEquals" level=3D"WARNING" enab=
led=3D"true" />
+        <inspection_tool class=3D"EqualsBetweenInconvertibleTypes" level=
=3D"WARNING" enabled=3D"true" />
+        <inspection_tool class=3D"ArrayEquals" level=3D"WARNING" enabled=
=3D"true" />
+        <inspection_tool class=3D"ForLoopThatDoesntUseLoopVariable" level=
=3D"WARNING" enabled=3D"true" />
+        <inspection_tool class=3D"MisspelledHashcode" level=3D"WARNING" en=
abled=3D"true" />
+        <inspection_tool class=3D"InstanceofIncompatibleInterface" level=
=3D"WARNING" enabled=3D"true" />
+        <inspection_tool class=3D"IteratorHasNextCallsIteratorNext" level=
=3D"WARNING" enabled=3D"true" />
+        <inspection_tool class=3D"IteratorNextDoesNotThrowNoSuchElementExc=
eption" level=3D"WARNING" enabled=3D"true" />
+        <inspection_tool class=3D"NonShortCircuitBoolean" level=3D"WARNING=
" enabled=3D"true" />
+        <inspection_tool class=3D"ResultOfObjectAllocationIgnored" level=
=3D"WARNING" enabled=3D"true" />
+        <inspection_tool class=3D"StaticFieldReferenceOnSubclass" level=3D=
"WARNING" enabled=3D"true" />
+        <inspection_tool class=3D"StaticCallOnSubclass" level=3D"WARNING" =
enabled=3D"true" />
+        <inspection_tool class=3D"SubtractionInCompareTo" level=3D"WARNING=
" enabled=3D"true" />
+        <inspection_tool class=3D"SuspiciousToArrayCall" level=3D"WARNING"=
 enabled=3D"true" />
+        <inspection_tool class=3D"SuspiciousSystemArraycopy" level=3D"WARN=
ING" enabled=3D"true" />
+        <inspection_tool class=3D"TextLabelInSwitchStatement" level=3D"WAR=
NING" enabled=3D"true" />
+        <inspection_tool class=3D"MisspelledToString" level=3D"WARNING" en=
abled=3D"true" />
+        <inspection_tool class=3D"ExternalizableWithSerializationMethods" =
level=3D"WARNING" enabled=3D"true" />
+        <inspection_tool class=3D"ReadObjectInitialization" level=3D"WARNI=
NG" enabled=3D"true" />
+        <inspection_tool class=3D"NonSerializableWithSerializationMethods"=
 level=3D"WARNING" enabled=3D"true" />
+        <inspection_tool class=3D"NonSerializableWithSerialVersionUIDField=
" level=3D"WARNING" enabled=3D"true" />
+        <inspection_tool class=3D"ReadObjectAndWriteObjectPrivate" level=
=3D"WARNING" enabled=3D"true" />
+        <inspection_tool class=3D"ReadResolveAndWriteReplaceProtected" lev=
el=3D"WARNING" enabled=3D"true" />
+        <inspection_tool class=3D"SerializableWithUnconstructableAncestor"=
 level=3D"WARNING" enabled=3D"true" />
+        <inspection_tool class=3D"SerializableHasSerialVersionUIDField" le=
vel=3D"WARNING" enabled=3D"true">
+          <option name=3D"superClassString" value=3D"java.awt.Component" />
+        </inspection_tool>
+        <inspection_tool class=3D"SerializableInnerClassHasSerialVersionUI=
DField" level=3D"WARNING" enabled=3D"true">
+          <option name=3D"superClassString" value=3D"java.awt.Component" />
+        </inspection_tool>
+        <inspection_tool class=3D"SerializableInnerClassWithNonSerializabl=
eOuterClass" level=3D"WARNING" enabled=3D"true">
+          <option name=3D"superClassString" value=3D"java.awt.Component" />
+        </inspection_tool>
+        <inspection_tool class=3D"SerialPersistentFieldsWithWrongSignature=
" level=3D"WARNING" enabled=3D"true" />
+        <inspection_tool class=3D"SerialVersionUIDNotStaticFinal" level=3D=
"WARNING" enabled=3D"true" />
+        <inspection_tool class=3D"TransientFieldInNonSerializableClass" le=
vel=3D"WARNING" enabled=3D"true" />
+        <inspection_tool class=3D"AwaitNotInLoop" level=3D"WARNING" enable=
d=3D"true" />
+        <inspection_tool class=3D"ConditionSignal" level=3D"WARNING" enabl=
ed=3D"true" />
+        <inspection_tool class=3D"SystemRunFinalizersOnExit" level=3D"WARN=
ING" enabled=3D"true" />
+        <inspection_tool class=3D"ThreadRun" level=3D"WARNING" enabled=3D"=
true" />
+        <inspection_tool class=3D"ThreadStartInConstruction" level=3D"WARN=
ING" enabled=3D"true" />
+        <inspection_tool class=3D"ThreadStopSuspendResume" level=3D"WARNIN=
G" enabled=3D"true" />
+        <inspection_tool class=3D"ThreadYield" level=3D"WARNING" enabled=
=3D"true" />
+        <inspection_tool class=3D"SleepWhileHoldingLock" level=3D"WARNING"=
 enabled=3D"true" />
+        <inspection_tool class=3D"DoubleCheckedLocking" level=3D"WARNING" =
enabled=3D"true">
+          <option name=3D"ignoreOnVolatileVariables" value=3D"false" />
+        </inspection_tool>
+        <inspection_tool class=3D"EmptySynchronizedStatement" level=3D"WAR=
NING" enabled=3D"true" />
+        <inspection_tool class=3D"ThreadWithDefaultRunMethod" level=3D"WAR=
NING" enabled=3D"true" />
+        <inspection_tool class=3D"NonSynchronizedMethodOverridesSynchroniz=
edMethod" level=3D"WARNING" enabled=3D"true" />
+        <inspection_tool class=3D"NotifyCalledOnCondition" level=3D"WARNIN=
G" enabled=3D"true" />
+        <inspection_tool class=3D"NotifyNotInSynchronizedContext" level=3D=
"WARNING" enabled=3D"true" />
+        <inspection_tool class=3D"SynchronizeOnLock" level=3D"WARNING" ena=
bled=3D"true" />
+        <inspection_tool class=3D"UnconditionalWait" level=3D"WARNING" ena=
bled=3D"true" />
+        <inspection_tool class=3D"VolatileArrayField" level=3D"WARNING" en=
abled=3D"true" />
+        <inspection_tool class=3D"VolatileLongOrDoubleField" level=3D"WARN=
ING" enabled=3D"true" />
+        <inspection_tool class=3D"WaitCalledOnCondition" level=3D"WARNING"=
 enabled=3D"true" />
+        <inspection_tool class=3D"WaitWhileHoldingTwoLocks" level=3D"WARNI=
NG" enabled=3D"true" />
+        <inspection_tool class=3D"WaitNotInSynchronizedContext" level=3D"W=
ARNING" enabled=3D"true" />
+        <inspection_tool class=3D"WhileLoopSpinsOnField" level=3D"WARNING"=
 enabled=3D"true">
+          <option name=3D"ignoreNonEmtpyLoops" value=3D"false" />
+        </inspection_tool>
+        <inspection_tool class=3D"ClassEscapesItsScope" level=3D"WARNING" =
enabled=3D"true" />
+        <inspection_tool class=3D"FieldHidesSuperclassField" level=3D"WARN=
ING" enabled=3D"true">
+          <option name=3D"m_ignoreInvisibleFields" value=3D"true" />
+        </inspection_tool>
+        <inspection_tool class=3D"InnerClassVariableHidesOuterClassVariabl=
e" level=3D"WARNING" enabled=3D"true">
+          <option name=3D"m_ignoreInvisibleFields" value=3D"true" />
+        </inspection_tool>
+        <inspection_tool class=3D"LocalVariableHidingMemberVariable" level=
=3D"WARNING" enabled=3D"true">
+          <option name=3D"m_ignoreInvisibleFields" value=3D"true" />
+          <option name=3D"m_ignoreStaticMethods" value=3D"true" />
+        </inspection_tool>
+        <inspection_tool class=3D"MethodOverloadsParentMethod" level=3D"WA=
RNING" enabled=3D"true" />
+        <inspection_tool class=3D"MethodOverridesPackageLocalMethod" level=
=3D"WARNING" enabled=3D"true" />
+        <inspection_tool class=3D"MethodOverridesPrivateMethod" level=3D"W=
ARNING" enabled=3D"true" />
+        <inspection_tool class=3D"MethodOverridesStaticMethod" level=3D"WA=
RNING" enabled=3D"true" />
+        <inspection_tool class=3D"TypeParameterHidesVisibleType" level=3D"=
WARNING" enabled=3D"true" />
+        <inspection_tool class=3D"IncompatibleMask" level=3D"WARNING" enab=
led=3D"false" />
+        <inspection_tool class=3D"PointlessBitwiseExpression" level=3D"WAR=
NING" enabled=3D"false">
+          <option name=3D"m_ignoreExpressionsContainingConstants" value=3D=
"false" />
+        </inspection_tool>
+        <inspection_tool class=3D"ShiftOutOfRange" level=3D"WARNING" enabl=
ed=3D"false" />
+        <inspection_tool class=3D"ExtendsObject" level=3D"WARNING" enabled=
=3D"false" />
+        <inspection_tool class=3D"TypeParameterExtendsObject" level=3D"WAR=
NING" enabled=3D"false" />
+        <inspection_tool class=3D"UnnecessarySemicolon" level=3D"WARNING" =
enabled=3D"false" />
+        <inspection_tool class=3D"ConditionalExpressionWithIdenticalBranch=
es" level=3D"WARNING" enabled=3D"true" />
+        <inspection_tool class=3D"DuplicateCondition" level=3D"WARNING" en=
abled=3D"true">
+          <option name=3D"ignoreMethodCalls" value=3D"false" />
+        </inspection_tool>
+        <inspection_tool class=3D"WeakerAccess" level=3D"WARNING" enabled=
=3D"false">
+          <option name=3D"SUGGEST_PACKAGE_LOCAL_FOR_MEMBERS" value=3D"true=
" />
+          <option name=3D"SUGGEST_PACKAGE_LOCAL_FOR_TOP_CLASSES" value=3D"=
true" />
+          <option name=3D"SUGGEST_PRIVATE_FOR_INNERS" value=3D"false" />
+        </inspection_tool>
+        <inspection_tool class=3D"EmptyMethod" level=3D"WARNING" enabled=
=3D"false" />
+        <inspection_tool class=3D"NoExplicitFinalizeCalls" level=3D"WARNIN=
G" enabled=3D"false" />
+        <inspection_tool class=3D"FinalizeCallsSuperFinalize" level=3D"WAR=
NING" enabled=3D"false">
+          <option name=3D"m_ignoreForObjectSubclasses" value=3D"false" />
+        </inspection_tool>
+        <inspection_tool class=3D"JavaDoc" level=3D"WARNING" enabled=3D"fa=
lse">
+          <option name=3D"TOP_LEVEL_CLASS_OPTIONS">
+            <value>
+              <option name=3D"ACCESS_JAVADOC_REQUIRED_FOR" value=3D"none" =
/>
+              <option name=3D"REQUIRED_TAGS" value=3D"" />
+            </value>
+          </option>
+          <option name=3D"INNER_CLASS_OPTIONS">
+            <value>
+              <option name=3D"ACCESS_JAVADOC_REQUIRED_FOR" value=3D"none" =
/>
+              <option name=3D"REQUIRED_TAGS" value=3D"" />
+            </value>
+          </option>
+          <option name=3D"METHOD_OPTIONS">
+            <value>
+              <option name=3D"ACCESS_JAVADOC_REQUIRED_FOR" value=3D"none" =
/>
+              <option name=3D"REQUIRED_TAGS" value=3D"@return(a)param@thro=
ws or @exception" />
+            </value>
+          </option>
+          <option name=3D"FIELD_OPTIONS">
+            <value>
+              <option name=3D"ACCESS_JAVADOC_REQUIRED_FOR" value=3D"none" =
/>
+              <option name=3D"REQUIRED_TAGS" value=3D"" />
+            </value>
+          </option>
+          <option name=3D"IGNORE_DEPRECATED" value=3D"false" />
+          <option name=3D"IGNORE_JAVADOC_PERIOD" value=3D"true" />
+          <option name=3D"myAdditionalJavadocTags" value=3D"" />
+        </inspection_tool>
+        <inspection_tool class=3D"ExtendsAnnotation" level=3D"WARNING" ena=
bled=3D"false" />
+        <inspection_tool class=3D"AbstractMethodCallInConstructor" level=
=3D"WARNING" enabled=3D"true" />
+        <inspection_tool class=3D"InstanceVariableUninitializedUse" level=
=3D"WARNING" enabled=3D"true">
+          <option name=3D"m_ignorePrimitives" value=3D"false" />
+        </inspection_tool>
+        <inspection_tool class=3D"StaticVariableInitialization" level=3D"W=
ARNING" enabled=3D"true">
+          <option name=3D"m_ignorePrimitives" value=3D"false" />
+        </inspection_tool>
+        <inspection_tool class=3D"StaticVariableUninitializedUse" level=3D=
"WARNING" enabled=3D"true">
+          <option name=3D"m_ignorePrimitives" value=3D"false" />
+        </inspection_tool>
+        <inspection_tool class=3D"NonThreadSafeLazyInitialization" level=
=3D"WARNING" enabled=3D"true" />
+        <inspection_tool class=3D"StaticCollection" level=3D"WARNING" enab=
led=3D"true">
+          <option name=3D"m_ignoreWeakCollections" value=3D"false" />
+        </inspection_tool>
+        <inspection_tool class=3D"StringBufferField" level=3D"WARNING" ena=
bled=3D"true" />
+        <inspection_tool class=3D"StringBufferReplaceableByStringBuilder" =
level=3D"WARNING" enabled=3D"true" />
+        <inspection_tool class=3D"NullArgumentToVariableArgMethod" level=
=3D"WARNING" enabled=3D"false" />
+        <inspection_tool class=3D"NullableProblems" level=3D"WARNING" enab=
led=3D"false">
+          <option name=3D"REPORT_NULLABLE_METHOD_OVERRIDES_NOTNULL" value=
=3D"true" />
+          <option name=3D"REPORT_NOT_ANNOTATED_METHOD_OVERRIDES_NOTNULL" v=
alue=3D"true" />
+          <option name=3D"REPORT_NOTNULL_PARAMETER_OVERRIDES_NULLABLE" val=
ue=3D"true" />
+          <option name=3D"REPORT_NOT_ANNOTATED_PARAMETER_OVERRIDES_NOTNULL=
" value=3D"true" />
+          <option name=3D"REPORT_NOT_ANNOTATED_GETTER" value=3D"true" />
+          <option name=3D"REPORT_NOT_ANNOTATED_SETTER_PARAMETER" value=3D"=
true" />
+          <option name=3D"REPORT_ANNOTATION_NOT_PROPAGATED_TO_OVERRIDERS" =
value=3D"true" />
+        </inspection_tool>
+        <inspection_tool class=3D"PointlessBooleanExpression" level=3D"WAR=
NING" enabled=3D"false">
+          <option name=3D"m_ignoreExpressionsContainingConstants" value=3D=
"false" />
+        </inspection_tool>
+        <inspection_tool class=3D"EmptyCatchBlock" level=3D"WARNING" enabl=
ed=3D"false">
+          <option name=3D"m_includeComments" value=3D"true" />
+          <option name=3D"m_ignoreTestCases" value=3D"true" />
+          <option name=3D"m_ignoreIgnoreParameter" value=3D"true" />
+        </inspection_tool>
+        <inspection_tool class=3D"UnusedAssignment" level=3D"WARNING" enab=
led=3D"false">
+          <option name=3D"REPORT_PREFIX_EXPRESSIONS" value=3D"false" />
+          <option name=3D"REPORT_POSTFIX_EXPRESSIONS" value=3D"true" />
+          <option name=3D"REPORT_REDUNDANT_INITIALIZER" value=3D"true" />
+        </inspection_tool>
+        <inspection_tool class=3D"CloneCallsSuperClone" level=3D"WARNING" =
enabled=3D"false" />
+        <inspection_tool class=3D"IgnoreResultOfCall" level=3D"WARNING" en=
abled=3D"false">
+          <option name=3D"m_reportAllNonLibraryCalls" value=3D"false" />
+          <option name=3D"callCheckString" value=3D"java.io.InputStream,re=
ad,java.io.InputStream,skip,java.lang.StringBuffer,toString,java.lang.Strin=
gBuilder,toString,java.lang.String,.*,java.math.BigInteger,.*,java.math.Big=
Decimal,.*,java.net.InetAddress,.*" />
+        </inspection_tool>
+        <inspection_tool class=3D"CloneDeclaresCloneNotSupported" level=3D=
"WARNING" enabled=3D"false" />
+        <inspection_tool class=3D"PointlessArithmeticExpression" level=3D"=
WARNING" enabled=3D"false">
+          <option name=3D"m_ignoreExpressionsContainingConstants" value=3D=
"false" />
+        </inspection_tool>
+        <inspection_tool class=3D"FieldCanBeLocal" level=3D"WARNING" enabl=
ed=3D"false" />
+        <inspection_tool class=3D"StringConcatenationInsideStringBufferApp=
end" level=3D"WARNING" enabled=3D"false" />
+        <inspection_tool class=3D"MismatchedCollectionQueryUpdate" level=
=3D"WARNING" enabled=3D"false" />
+        <inspection_tool class=3D"JavadocReference" level=3D"WARNING" enab=
led=3D"true" />
+        <inspection_tool class=3D"UnnecessaryBlockStatement" level=3D"WARN=
ING" enabled=3D"true" />
+        <inspection_tool class=3D"ClassWithMultipleLoggers" level=3D"WARNI=
NG" enabled=3D"true">
+          <option name=3D"loggerClassName" value=3D"java.util.logging.Logg=
er" />
+        </inspection_tool>
+        <inspection_tool class=3D"ConstantStringIntern" level=3D"WARNING" =
enabled=3D"true" />
+        <inspection_tool class=3D"FieldMayBeStatic" level=3D"WARNING" enab=
led=3D"true" />
+        <inspection_tool class=3D"SizeReplaceableByIsEmpty" level=3D"WARNI=
NG" enabled=3D"true">
+          <option name=3D"ignoreNegations" value=3D"false" />
+        </inspection_tool>
+        <inspection_tool class=3D"NestedSynchronizedStatement" level=3D"WA=
RNING" enabled=3D"true" />
+        <inspection_tool class=3D"NakedNotify" level=3D"WARNING" enabled=
=3D"true" />
+        <inspection_tool class=3D"IndexOfReplaceableByContains" level=3D"W=
ARNING" enabled=3D"true" />
+        <inspection_tool class=3D"WhileCanBeForeach" level=3D"WARNING" ena=
bled=3D"false" />
+        <inspection_tool class=3D"ForCanBeForeach" level=3D"WARNING" enabl=
ed=3D"false">
+          <option name=3D"REPORT_INDEXED_LOOP" value=3D"true" />
+        </inspection_tool>
+        <inspection_tool class=3D"UnnecessaryBoxing" level=3D"WARNING" ena=
bled=3D"false" />
+        <inspection_tool class=3D"UnnecessaryUnboxing" level=3D"WARNING" e=
nabled=3D"false" />
+        <inspection_tool class=3D"UNCHECKED_WARNING" level=3D"WARNING" ena=
bled=3D"false" />
+        <inspection_tool class=3D"NonStaticFinalLogger" level=3D"WARNING" =
enabled=3D"true">
+          <option name=3D"loggerClassName" value=3D"java.util.logging.Logg=
er" />
+        </inspection_tool>
+        <inspection_tool class=3D"StringBufferReplaceableByString" level=
=3D"WARNING" enabled=3D"true" />
+        <inspection_tool class=3D"AwaitWithoutCorrespondingSignal" level=
=3D"WARNING" enabled=3D"true" />
+        <inspection_tool class=3D"EmptyStatementBody" level=3D"WARNING" en=
abled=3D"false">
+          <option name=3D"m_reportEmptyBlocks" value=3D"false" />
+        </inspection_tool>
+        <inspection_tool class=3D"MethodMayBeStatic" level=3D"WARNING" ena=
bled=3D"true">
+          <option name=3D"m_onlyPrivateOrFinal" value=3D"false" />
+          <option name=3D"m_ignoreEmptyMethods" value=3D"true" />
+        </inspection_tool>
+        <inspection_tool class=3D"EqualsWhichDoesntCheckParameterClass" le=
vel=3D"WARNING" enabled=3D"true" />
+        <inspection_tool class=3D"ArithmeticOnVolatileField" level=3D"WARN=
ING" enabled=3D"true" />
+      </profile>
+    </profiles>
+    <list size=3D"0" />
+  </component>
+  <component name=3D"JavacSettings">
+    <option name=3D"DEBUGGING_INFO" value=3D"true" />
+    <option name=3D"GENERATE_NO_WARNINGS" value=3D"false" />
+    <option name=3D"DEPRECATION" value=3D"true" />
+    <option name=3D"ADDITIONAL_OPTIONS_STRING" value=3D"" />
+    <option name=3D"MAXIMUM_HEAP_SIZE" value=3D"128" />
+  </component>
+  <component name=3D"JavadocGenerationManager">
+    <option name=3D"OUTPUT_DIRECTORY" />
+    <option name=3D"OPTION_SCOPE" value=3D"protected" />
+    <option name=3D"OPTION_HIERARCHY" value=3D"true" />
+    <option name=3D"OPTION_NAVIGATOR" value=3D"true" />
+    <option name=3D"OPTION_INDEX" value=3D"true" />
+    <option name=3D"OPTION_SEPARATE_INDEX" value=3D"true" />
+    <option name=3D"OPTION_DOCUMENT_TAG_USE" value=3D"false" />
+    <option name=3D"OPTION_DOCUMENT_TAG_AUTHOR" value=3D"false" />
+    <option name=3D"OPTION_DOCUMENT_TAG_VERSION" value=3D"false" />
+    <option name=3D"OPTION_DOCUMENT_TAG_DEPRECATED" value=3D"true" />
+    <option name=3D"OPTION_DEPRECATED_LIST" value=3D"true" />
+    <option name=3D"OTHER_OPTIONS" value=3D"" />
+    <option name=3D"HEAP_SIZE" />
+    <option name=3D"LOCALE" />
+    <option name=3D"OPEN_IN_BROWSER" value=3D"true" />
+  </component>
+  <component name=3D"JikesSettings">
+    <option name=3D"JIKES_PATH" value=3D"" />
+    <option name=3D"DEBUGGING_INFO" value=3D"true" />
+    <option name=3D"DEPRECATION" value=3D"true" />
+    <option name=3D"GENERATE_NO_WARNINGS" value=3D"false" />
+    <option name=3D"IS_EMACS_ERRORS_MODE" value=3D"true" />
+    <option name=3D"ADDITIONAL_OPTIONS_STRING" value=3D"" />
+  </component>
+  <component name=3D"LogConsolePreferences">
+    <option name=3D"FILTER_ERRORS" value=3D"false" />
+    <option name=3D"FILTER_WARNINGS" value=3D"false" />
+    <option name=3D"FILTER_INFO" value=3D"true" />
+    <option name=3D"CUSTOM_FILTER" />
+  </component>
+  <component name=3D"Palette2">
+    <group name=3D"Swing">
+      <item class=3D"com.intellij.uiDesigner.HSpacer" tooltip-text=3D"Hori=
zontal Spacer" icon=3D"/com/intellij/uiDesigner/icons/hspacer.png" removabl=
e=3D"false" auto-create-binding=3D"false" can-attach-label=3D"false">
+        <default-constraints vsize-policy=3D"1" hsize-policy=3D"6" anchor=
=3D"0" fill=3D"1" />
+      </item>
+      <item class=3D"com.intellij.uiDesigner.VSpacer" tooltip-text=3D"Vert=
ical Spacer" icon=3D"/com/intellij/uiDesigner/icons/vspacer.png" removable=
=3D"false" auto-create-binding=3D"false" can-attach-label=3D"false">
+        <default-constraints vsize-policy=3D"6" hsize-policy=3D"1" anchor=
=3D"0" fill=3D"2" />
+      </item>
+      <item class=3D"javax.swing.JPanel" icon=3D"/com/intellij/uiDesigner/=
icons/panel.png" removable=3D"false" auto-create-binding=3D"false" can-atta=
ch-label=3D"false">
+        <default-constraints vsize-policy=3D"3" hsize-policy=3D"3" anchor=
=3D"0" fill=3D"3" />
+      </item>
+      <item class=3D"javax.swing.JScrollPane" icon=3D"/com/intellij/uiDesi=
gner/icons/scrollPane.png" removable=3D"false" auto-create-binding=3D"false=
" can-attach-label=3D"true">
+        <default-constraints vsize-policy=3D"7" hsize-policy=3D"7" anchor=
=3D"0" fill=3D"3" />
+      </item>
+      <item class=3D"javax.swing.JButton" icon=3D"/com/intellij/uiDesigner=
/icons/button.png" removable=3D"false" auto-create-binding=3D"true" can-att=
ach-label=3D"false">
+        <default-constraints vsize-policy=3D"0" hsize-policy=3D"3" anchor=
=3D"0" fill=3D"1" />
+        <initial-values>
+          <property name=3D"text" value=3D"Button" />
+        </initial-values>
+      </item>
+      <item class=3D"javax.swing.JRadioButton" icon=3D"/com/intellij/uiDes=
igner/icons/radioButton.png" removable=3D"false" auto-create-binding=3D"tru=
e" can-attach-label=3D"false">
+        <default-constraints vsize-policy=3D"0" hsize-policy=3D"3" anchor=
=3D"8" fill=3D"0" />
+        <initial-values>
+          <property name=3D"text" value=3D"RadioButton" />
+        </initial-values>
+      </item>
+      <item class=3D"javax.swing.JCheckBox" icon=3D"/com/intellij/uiDesign=
er/icons/checkBox.png" removable=3D"false" auto-create-binding=3D"true" can=
-attach-label=3D"false">
+        <default-constraints vsize-policy=3D"0" hsize-policy=3D"3" anchor=
=3D"8" fill=3D"0" />
+        <initial-values>
+          <property name=3D"text" value=3D"CheckBox" />
+        </initial-values>
+      </item>
+      <item class=3D"javax.swing.JLabel" icon=3D"/com/intellij/uiDesigner/=
icons/label.png" removable=3D"false" auto-create-binding=3D"false" can-atta=
ch-label=3D"false">
+        <default-constraints vsize-policy=3D"0" hsize-policy=3D"0" anchor=
=3D"8" fill=3D"0" />
+        <initial-values>
+          <property name=3D"text" value=3D"Label" />
+        </initial-values>
+      </item>
+      <item class=3D"javax.swing.JTextField" icon=3D"/com/intellij/uiDesig=
ner/icons/textField.png" removable=3D"false" auto-create-binding=3D"true" c=
an-attach-label=3D"true">
+        <default-constraints vsize-policy=3D"0" hsize-policy=3D"6" anchor=
=3D"8" fill=3D"1">
+          <preferred-size width=3D"150" height=3D"-1" />
+        </default-constraints>
+      </item>
+      <item class=3D"javax.swing.JPasswordField" icon=3D"/com/intellij/uiD=
esigner/icons/passwordField.png" removable=3D"false" auto-create-binding=3D=
"true" can-attach-label=3D"true">
+        <default-constraints vsize-policy=3D"0" hsize-policy=3D"6" anchor=
=3D"8" fill=3D"1">
+          <preferred-size width=3D"150" height=3D"-1" />
+        </default-constraints>
+      </item>
+      <item class=3D"javax.swing.JFormattedTextField" icon=3D"/com/intelli=
j/uiDesigner/icons/formattedTextField.png" removable=3D"false" auto-create-=
binding=3D"true" can-attach-label=3D"true">
+        <default-constraints vsize-policy=3D"0" hsize-policy=3D"6" anchor=
=3D"8" fill=3D"1">
+          <preferred-size width=3D"150" height=3D"-1" />
+        </default-constraints>
+      </item>
+      <item class=3D"javax.swing.JTextArea" icon=3D"/com/intellij/uiDesign=
er/icons/textArea.png" removable=3D"false" auto-create-binding=3D"true" can=
-attach-label=3D"true">
+        <default-constraints vsize-policy=3D"6" hsize-policy=3D"6" anchor=
=3D"0" fill=3D"3">
+          <preferred-size width=3D"150" height=3D"50" />
+        </default-constraints>
+      </item>
+      <item class=3D"javax.swing.JTextPane" icon=3D"/com/intellij/uiDesign=
er/icons/textPane.png" removable=3D"false" auto-create-binding=3D"true" can=
-attach-label=3D"true">
+        <default-constraints vsize-policy=3D"6" hsize-policy=3D"6" anchor=
=3D"0" fill=3D"3">
+          <preferred-size width=3D"150" height=3D"50" />
+        </default-constraints>
+      </item>
+      <item class=3D"javax.swing.JEditorPane" icon=3D"/com/intellij/uiDesi=
gner/icons/editorPane.png" removable=3D"false" auto-create-binding=3D"true"=
 can-attach-label=3D"true">
+        <default-constraints vsize-policy=3D"6" hsize-policy=3D"6" anchor=
=3D"0" fill=3D"3">
+          <preferred-size width=3D"150" height=3D"50" />
+        </default-constraints>
+      </item>
+      <item class=3D"javax.swing.JComboBox" icon=3D"/com/intellij/uiDesign=
er/icons/comboBox.png" removable=3D"false" auto-create-binding=3D"true" can=
-attach-label=3D"true">
+        <default-constraints vsize-policy=3D"0" hsize-policy=3D"2" anchor=
=3D"8" fill=3D"1" />
+      </item>
+      <item class=3D"javax.swing.JTable" icon=3D"/com/intellij/uiDesigner/=
icons/table.png" removable=3D"false" auto-create-binding=3D"true" can-attac=
h-label=3D"false">
+        <default-constraints vsize-policy=3D"6" hsize-policy=3D"6" anchor=
=3D"0" fill=3D"3">
+          <preferred-size width=3D"150" height=3D"50" />
+        </default-constraints>
+      </item>
+      <item class=3D"javax.swing.JList" icon=3D"/com/intellij/uiDesigner/i=
cons/list.png" removable=3D"false" auto-create-binding=3D"true" can-attach-=
label=3D"false">
+        <default-constraints vsize-policy=3D"6" hsize-policy=3D"2" anchor=
=3D"0" fill=3D"3">
+          <preferred-size width=3D"150" height=3D"50" />
+        </default-constraints>
+      </item>
+      <item class=3D"javax.swing.JTree" icon=3D"/com/intellij/uiDesigner/i=
cons/tree.png" removable=3D"false" auto-create-binding=3D"true" can-attach-=
label=3D"false">
+        <default-constraints vsize-policy=3D"6" hsize-policy=3D"6" anchor=
=3D"0" fill=3D"3">
+          <preferred-size width=3D"150" height=3D"50" />
+        </default-constraints>
+      </item>
+      <item class=3D"javax.swing.JTabbedPane" icon=3D"/com/intellij/uiDesi=
gner/icons/tabbedPane.png" removable=3D"false" auto-create-binding=3D"true"=
 can-attach-label=3D"false">
+        <default-constraints vsize-policy=3D"3" hsize-policy=3D"3" anchor=
=3D"0" fill=3D"3">
+          <preferred-size width=3D"200" height=3D"200" />
+        </default-constraints>
+      </item>
+      <item class=3D"javax.swing.JSplitPane" icon=3D"/com/intellij/uiDesig=
ner/icons/splitPane.png" removable=3D"false" auto-create-binding=3D"false" =
can-attach-label=3D"false">
+        <default-constraints vsize-policy=3D"3" hsize-policy=3D"3" anchor=
=3D"0" fill=3D"3">
+          <preferred-size width=3D"200" height=3D"200" />
+        </default-constraints>
+      </item>
+      <item class=3D"javax.swing.JSpinner" icon=3D"/com/intellij/uiDesigne=
r/icons/spinner.png" removable=3D"false" auto-create-binding=3D"true" can-a=
ttach-label=3D"true">
+        <default-constraints vsize-policy=3D"0" hsize-policy=3D"6" anchor=
=3D"8" fill=3D"1" />
+      </item>
+      <item class=3D"javax.swing.JSlider" icon=3D"/com/intellij/uiDesigner=
/icons/slider.png" removable=3D"false" auto-create-binding=3D"true" can-att=
ach-label=3D"false">
+        <default-constraints vsize-policy=3D"0" hsize-policy=3D"6" anchor=
=3D"8" fill=3D"1" />
+      </item>
+      <item class=3D"javax.swing.JSeparator" icon=3D"/com/intellij/uiDesig=
ner/icons/separator.png" removable=3D"false" auto-create-binding=3D"false" =
can-attach-label=3D"false">
+        <default-constraints vsize-policy=3D"6" hsize-policy=3D"6" anchor=
=3D"0" fill=3D"3" />
+      </item>
+      <item class=3D"javax.swing.JProgressBar" icon=3D"/com/intellij/uiDes=
igner/icons/progressbar.png" removable=3D"false" auto-create-binding=3D"tru=
e" can-attach-label=3D"false">
+        <default-constraints vsize-policy=3D"0" hsize-policy=3D"6" anchor=
=3D"0" fill=3D"1" />
+      </item>
+      <item class=3D"javax.swing.JToolBar" icon=3D"/com/intellij/uiDesigne=
r/icons/toolbar.png" removable=3D"false" auto-create-binding=3D"false" can-=
attach-label=3D"false">
+        <default-constraints vsize-policy=3D"0" hsize-policy=3D"6" anchor=
=3D"0" fill=3D"1">
+          <preferred-size width=3D"-1" height=3D"20" />
+        </default-constraints>
+      </item>
+      <item class=3D"javax.swing.JToolBar$Separator" icon=3D"/com/intellij=
/uiDesigner/icons/toolbarSeparator.png" removable=3D"false" auto-create-bin=
ding=3D"false" can-attach-label=3D"false">
+        <default-constraints vsize-policy=3D"0" hsize-policy=3D"0" anchor=
=3D"0" fill=3D"1" />
+      </item>
+      <item class=3D"javax.swing.JScrollBar" icon=3D"/com/intellij/uiDesig=
ner/icons/scrollbar.png" removable=3D"false" auto-create-binding=3D"true" c=
an-attach-label=3D"false">
+        <default-constraints vsize-policy=3D"6" hsize-policy=3D"0" anchor=
=3D"0" fill=3D"2" />
+      </item>
+    </group>
+  </component>
+  <component name=3D"PerforceChangeBrowserSettings">
+    <option name=3D"USE_CLIENT_FILTER" value=3D"true" />
+    <option name=3D"CLIENT" value=3D"" />
+  </component>
+  <component name=3D"PerforceDirect.Settings">
+    <option name=3D"useP4CONFIG" value=3D"true" />
+    <option name=3D"port" value=3D"&lt;perforce_server&gt;:1666" />
+    <option name=3D"client" value=3D"" />
+    <option name=3D"user" value=3D"" />
+    <option name=3D"passwd" value=3D"" />
+    <option name=3D"showCmds" value=3D"false" />
+    <option name=3D"useNativeApi" value=3D"true" />
+    <option name=3D"pathToExec" value=3D"p4" />
+    <option name=3D"useCustomPathToExec" value=3D"false" />
+    <option name=3D"SYNC_FORCE" value=3D"false" />
+    <option name=3D"SYNC_RUN_RESOLVE" value=3D"true" />
+    <option name=3D"REVERT_UNCHANGED_FILES" value=3D"true" />
+    <option name=3D"CHARSET" value=3D"none" />
+    <option name=3D"SHOW_BRANCHES_HISTORY" value=3D"true" />
+    <option name=3D"ENABLED" value=3D"true" />
+    <option name=3D"USE_LOGIN" value=3D"false" />
+    <option name=3D"LOGIN_SILENTLY" value=3D"false" />
+    <option name=3D"INTEGRATE_RUN_RESOLVE" value=3D"true" />
+    <option name=3D"INTEGRATE_REVERT_UNCHANGED" value=3D"true" />
+    <option name=3D"SERVER_TIMEOUT" value=3D"20000" />
+  </component>
+  <component name=3D"ProjectFileVersion" converted=3D"true" />
+  <component name=3D"ProjectModuleManager">
+    <modules>
+      <module fileurl=3D"file://$PROJECT_DIR$/CacheTests.iml" filepath=3D"=
$PROJECT_DIR$/CacheTests.iml" />
+    </modules>
+  </component>
+  <component name=3D"ProjectRootConfigurable.UI">
+    <option name=3D"proportions">
+      <SplitterProportionsDataImpl />
+    </option>
+  </component>
+  <component name=3D"ProjectRootManager" version=3D"2" assert-keyword=3D"t=
rue" jdk-15=3D"true" project-jdk-name=3D"1.6" project-jdk-type=3D"JavaSDK">
+    <output url=3D"file://$PROJECT_DIR$/classes" />
+  </component>
+  <component name=3D"RmicSettings">
+    <option name=3D"IS_EANABLED" value=3D"false" />
+    <option name=3D"DEBUGGING_INFO" value=3D"true" />
+    <option name=3D"GENERATE_NO_WARNINGS" value=3D"false" />
+    <option name=3D"GENERATE_IIOP_STUBS" value=3D"false" />
+    <option name=3D"ADDITIONAL_OPTIONS_STRING" value=3D"" />
+  </component>
+  <component name=3D"ScopeChooserConfigurable.UI">
+    <option name=3D"proportions">
+      <SplitterProportionsDataImpl />
+    </option>
+  </component>
+  <component name=3D"StarteamConfiguration">
+    <option name=3D"SERVER" value=3D"" />
+    <option name=3D"PORT" value=3D"49201" />
+    <option name=3D"USER" value=3D"" />
+    <option name=3D"PASSWORD" value=3D"" />
+    <option name=3D"PROJECT" value=3D"" />
+    <option name=3D"VIEW" value=3D"" />
+    <option name=3D"ALTERNATIVE_WORKING_PATH" value=3D"" />
+    <option name=3D"LOCK_ON_CHECKOUT" value=3D"false" />
+    <option name=3D"UNLOCK_ON_CHECKIN" value=3D"false" />
+  </component>
+  <component name=3D"Struts Assistant">
+    <option name=3D"showInputs" value=3D"true" />
+    <option name=3D"resources">
+      <value>
+        <option name=3D"strutsPath" />
+        <option name=3D"strutsHelp" />
+      </value>
+    </option>
+    <option name=3D"selectedTaglibs" />
+    <option name=3D"selectedTaglibs" />
+    <option name=3D"myStrutsValidationEnabled" value=3D"true" />
+    <option name=3D"myTilesValidationEnabled" value=3D"true" />
+    <option name=3D"myValidatorValidationEnabled" value=3D"true" />
+    <option name=3D"myReportErrorsAsWarnings" value=3D"true" />
+  </component>
+  <component name=3D"SvnChangesBrowserSettings">
+    <option name=3D"USE_AUTHOR_FIELD" value=3D"true" />
+    <option name=3D"AUTHOR" value=3D"" />
+    <option name=3D"LOCATION" value=3D"" />
+    <option name=3D"USE_PROJECT_SETTINGS" value=3D"true" />
+    <option name=3D"USE_ALTERNATE_LOCATION" value=3D"false" />
+  </component>
+  <component name=3D"VCS.FileViewConfiguration">
+    <option name=3D"SELECTED_STATUSES" value=3D"DEFAULT" />
+    <option name=3D"SELECTED_COLUMNS" value=3D"DEFAULT" />
+    <option name=3D"SHOW_FILTERS" value=3D"true" />
+    <option name=3D"CUSTOMIZE_VIEW" value=3D"true" />
+    <option name=3D"SHOW_FILE_HISTORY_AS_TREE" value=3D"true" />
+  </component>
+  <component name=3D"VcsDirectoryMappings">
+    <mapping directory=3D"" vcs=3D"svn" />
+  </component>
+  <component name=3D"VssConfiguration">
+    <option name=3D"CLIENT_PATH" value=3D"" />
+    <option name=3D"SRCSAFEINI_PATH" value=3D"" />
+    <option name=3D"USER_NAME" value=3D"" />
+    <option name=3D"PWD" value=3D"" />
+    <option name=3D"VSS_IS_INITIALIZED" value=3D"false" />
+    <CheckoutOptions>
+      <option name=3D"COMMENT" value=3D"" />
+      <option name=3D"DO_NOT_GET_LATEST_VERSION" value=3D"false" />
+      <option name=3D"REPLACE_WRITABLE" value=3D"false" />
+      <option name=3D"RECURSIVE" value=3D"false" />
+    </CheckoutOptions>
+    <CheckinOptions>
+      <option name=3D"COMMENT" value=3D"" />
+      <option name=3D"KEEP_CHECKED_OUT" value=3D"false" />
+      <option name=3D"RECURSIVE" value=3D"false" />
+    </CheckinOptions>
+    <AddOptions>
+      <option name=3D"STORE_ONLY_LATEST_VERSION" value=3D"false" />
+      <option name=3D"CHECK_OUT_IMMEDIATELY" value=3D"false" />
+      <option name=3D"FILE_TYPE" value=3D"0" />
+    </AddOptions>
+    <UndocheckoutOptions>
+      <option name=3D"MAKE_WRITABLE" value=3D"false" />
+      <option name=3D"REPLACE_LOCAL_COPY" value=3D"0" />
+      <option name=3D"RECURSIVE" value=3D"false" />
+    </UndocheckoutOptions>
+    <GetOptions>
+      <option name=3D"REPLACE_WRITABLE" value=3D"0" />
+      <option name=3D"MAKE_WRITABLE" value=3D"false" />
+      <option name=3D"ANSWER_NEGATIVELY" value=3D"false" />
+      <option name=3D"ANSWER_POSITIVELY" value=3D"false" />
+      <option name=3D"RECURSIVE" value=3D"false" />
+      <option name=3D"VERSION" />
+    </GetOptions>
+    <VssConfigurableExcludedFilesTag />
+  </component>
+  <component name=3D"WebServicesPlugin" addRequiredLibraries=3D"true" />
+  <component name=3D"com.intellij.ide.util.scopeChooser.ScopeChooserConfig=
urable" proportions=3D"" version=3D"1">
+    <option name=3D"myLastEditedConfigurable" />
+  </component>
+  <component name=3D"com.intellij.jsf.UserDefinedFacesConfigs">
+    <option name=3D"USER_DEFINED_CONFIGS">
+      <value>
+        <list size=3D"0" />
+      </value>
+    </option>
+  </component>
+  <component name=3D"com.intellij.openapi.roots.ui.configuration.projectRo=
ot.ProjectRootMasterDetailsConfigurable" proportions=3D"" version=3D"1">
+    <option name=3D"myPlainMode" value=3D"false" />
+    <option name=3D"myLastEditedConfigurable" />
+  </component>
+  <component name=3D"com.intellij.profile.ui.ErrorOptionsConfigurable" pro=
portions=3D"" version=3D"1">
+    <option name=3D"myLastEditedConfigurable" />
+  </component>
+  <component name=3D"testng.defaultConfiguration">
+    <outputDirectory />
+    <properties />
+    <groups />
+  </component>
+  <component name=3D"uidesigner-configuration">
+    <option name=3D"INSTRUMENT_CLASSES" value=3D"true" />
+    <option name=3D"COPY_FORMS_RUNTIME_TO_OUTPUT" value=3D"true" />
+    <option name=3D"DEFAULT_LAYOUT_MANAGER" value=3D"GridLayoutManager" />
+  </component>
+</project>
+

Added: benchmarks/trunk/CacheTests.iws
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- benchmarks/trunk/CacheTests.iws	                        (rev 0)
+++ benchmarks/trunk/CacheTests.iws	2008-01-08 13:24:22 UTC (rev 5048)
@@ -0,0 +1,477 @@
+<?xml version=3D"1.0" encoding=3D"UTF-8"?>
+<project relativePaths=3D"false" version=3D"4">
+  <component name=3D"ChangeListManager">
+    <list default=3D"true" name=3D"Default" comment=3D"" />
+    <ignored path=3D"CacheTests.iws" />
+    <ignored path=3D".idea/workspace.xml" />
+  </component>
+  <component name=3D"ChangesViewManager" flattened_view=3D"true" show_igno=
red=3D"false" />
+  <component name=3D"Commander">
+    <leftPanel />
+    <rightPanel />
+    <splitter proportion=3D"0.5" />
+  </component>
+  <component name=3D"CreatePatchCommitExecutor">
+    <option name=3D"PATCH_PATH" value=3D"" />
+    <option name=3D"REVERSE_PATCH" value=3D"false" />
+  </component>
+  <component name=3D"DaemonCodeAnalyzer">
+    <disable_hints />
+  </component>
+  <component name=3D"DebuggerManager">
+    <breakpoint_any>
+      <breakpoint>
+        <option name=3D"NOTIFY_CAUGHT" value=3D"true" />
+        <option name=3D"NOTIFY_UNCAUGHT" value=3D"true" />
+        <option name=3D"ENABLED" value=3D"false" />
+        <option name=3D"LOG_ENABLED" value=3D"false" />
+        <option name=3D"LOG_EXPRESSION_ENABLED" value=3D"false" />
+        <option name=3D"SUSPEND_POLICY" value=3D"SuspendAll" />
+        <option name=3D"COUNT_FILTER_ENABLED" value=3D"false" />
+        <option name=3D"COUNT_FILTER" value=3D"0" />
+        <option name=3D"CONDITION_ENABLED" value=3D"false" />
+        <option name=3D"CLASS_FILTERS_ENABLED" value=3D"false" />
+        <option name=3D"INSTANCE_FILTERS_ENABLED" value=3D"false" />
+        <option name=3D"CONDITION" value=3D"" />
+        <option name=3D"LOG_MESSAGE" value=3D"" />
+      </breakpoint>
+      <breakpoint>
+        <option name=3D"NOTIFY_CAUGHT" value=3D"true" />
+        <option name=3D"NOTIFY_UNCAUGHT" value=3D"true" />
+        <option name=3D"ENABLED" value=3D"false" />
+        <option name=3D"LOG_ENABLED" value=3D"false" />
+        <option name=3D"LOG_EXPRESSION_ENABLED" value=3D"false" />
+        <option name=3D"SUSPEND_POLICY" value=3D"SuspendAll" />
+        <option name=3D"COUNT_FILTER_ENABLED" value=3D"false" />
+        <option name=3D"COUNT_FILTER" value=3D"0" />
+        <option name=3D"CONDITION_ENABLED" value=3D"false" />
+        <option name=3D"CLASS_FILTERS_ENABLED" value=3D"false" />
+        <option name=3D"INSTANCE_FILTERS_ENABLED" value=3D"false" />
+        <option name=3D"CONDITION" value=3D"" />
+        <option name=3D"LOG_MESSAGE" value=3D"" />
+      </breakpoint>
+    </breakpoint_any>
+    <breakpoint_rules />
+    <ui_properties />
+  </component>
+  <component name=3D"ErrorTreeViewConfiguration">
+    <option name=3D"IS_AUTOSCROLL_TO_SOURCE" value=3D"false" />
+    <option name=3D"HIDE_WARNINGS" value=3D"false" />
+  </component>
+  <component name=3D"FavoritesManager">
+    <favorites_list name=3D"CacheTests" />
+  </component>
+  <component name=3D"FileEditorManager">
+    <leaf>
+      <file leaf-file-name=3D"SessionTest.java" pinned=3D"false" current=
=3D"false" current-in-tab=3D"false">
+        <entry file=3D"file://$PROJECT_DIR$/src/perf/SessionTest.java">
+          <provider selected=3D"true" editor-type-id=3D"text-editor">
+            <state line=3D"60" column=3D"38" selection-start=3D"2310" sele=
ction-end=3D"2310" vertical-scroll-proportion=3D"0.9424084">
+              <folding>
+                <element signature=3D"imports" expanded=3D"true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name=3D"SessionFactoryJBC.java" pinned=3D"false" cur=
rent=3D"false" current-in-tab=3D"false">
+        <entry file=3D"file://$PROJECT_DIR$/src/perf/jbosscache/SessionFac=
toryJBC.java">
+          <provider selected=3D"true" editor-type-id=3D"text-editor">
+            <state line=3D"33" column=3D"27" selection-start=3D"1038" sele=
ction-end=3D"1038" vertical-scroll-proportion=3D"0.5183246">
+              <folding>
+                <element signature=3D"imports" expanded=3D"true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name=3D"config.xml" pinned=3D"false" current=3D"true=
" current-in-tab=3D"true">
+        <entry file=3D"file://$PROJECT_DIR$/config.xml">
+          <provider selected=3D"true" editor-type-id=3D"text-editor">
+            <state line=3D"153" column=3D"27" selection-start=3D"6489" sel=
ection-end=3D"6489" vertical-scroll-proportion=3D"2.2777777">
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name=3D"SessionFactoryPC.java" pinned=3D"false" curr=
ent=3D"false" current-in-tab=3D"false">
+        <entry file=3D"file://$PROJECT_DIR$/src/perf/pojocache/SessionFact=
oryPC.java">
+          <provider selected=3D"true" editor-type-id=3D"text-editor">
+            <state line=3D"29" column=3D"8" selection-start=3D"689" select=
ion-end=3D"689" vertical-scroll-proportion=3D"0.2984293">
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name=3D"SessionJBC.java" pinned=3D"false" current=3D=
"false" current-in-tab=3D"false">
+        <entry file=3D"file://$PROJECT_DIR$/src/perf/jbosscache/SessionJBC=
.java">
+          <provider selected=3D"true" editor-type-id=3D"text-editor">
+            <state line=3D"21" column=3D"27" selection-start=3D"416" selec=
tion-end=3D"416" vertical-scroll-proportion=3D"0.32984293">
+              <folding>
+                <element signature=3D"imports" expanded=3D"true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+    </leaf>
+  </component>
+  <component name=3D"FindManager">
+    <FindUsagesManager>
+      <setting name=3D"OPEN_NEW_TAB" value=3D"false" />
+    </FindUsagesManager>
+  </component>
+  <component name=3D"HierarchyBrowserManager">
+    <option name=3D"IS_AUTOSCROLL_TO_SOURCE" value=3D"false" />
+    <option name=3D"SORT_ALPHABETICALLY" value=3D"false" />
+    <option name=3D"HIDE_CLASSES_WHERE_METHOD_NOT_IMPLEMENTED" value=3D"fa=
lse" />
+  </component>
+  <component name=3D"ModuleEditorState">
+    <option name=3D"LAST_EDITED_MODULE_NAME" />
+    <option name=3D"LAST_EDITED_TAB_NAME" />
+  </component>
+  <component name=3D"ProjectLevelVcsManager">
+    <OptionsSetting value=3D"true" id=3D"Add" />
+    <OptionsSetting value=3D"true" id=3D"Remove" />
+    <OptionsSetting value=3D"true" id=3D"Checkin" />
+    <OptionsSetting value=3D"true" id=3D"Checkout" />
+    <OptionsSetting value=3D"true" id=3D"Update" />
+    <OptionsSetting value=3D"true" id=3D"Status" />
+    <OptionsSetting value=3D"true" id=3D"Edit" />
+    <ConfirmationsSetting value=3D"0" id=3D"Add" />
+    <ConfirmationsSetting value=3D"0" id=3D"Remove" />
+  </component>
+  <component name=3D"ProjectPane">
+    <subPane>
+      <PATH>
+        <PATH_ELEMENT>
+          <option name=3D"myItemId" value=3D"CacheTests" />
+          <option name=3D"myItemType" value=3D"com.intellij.ide.projectVie=
w.impl.nodes.ProjectViewProjectNode" />
+        </PATH_ELEMENT>
+        <PATH_ELEMENT>
+          <option name=3D"myItemId" value=3D"CacheTests" />
+          <option name=3D"myItemType" value=3D"com.intellij.ide.projectVie=
w.impl.nodes.ProjectViewModuleNode" />
+        </PATH_ELEMENT>
+      </PATH>
+      <PATH>
+        <PATH_ELEMENT>
+          <option name=3D"myItemId" value=3D"CacheTests" />
+          <option name=3D"myItemType" value=3D"com.intellij.ide.projectVie=
w.impl.nodes.ProjectViewProjectNode" />
+        </PATH_ELEMENT>
+        <PATH_ELEMENT>
+          <option name=3D"myItemId" value=3D"CacheTests" />
+          <option name=3D"myItemType" value=3D"com.intellij.ide.projectVie=
w.impl.nodes.ProjectViewModuleNode" />
+        </PATH_ELEMENT>
+        <PATH_ELEMENT>
+          <option name=3D"myItemId" value=3D"PsiDirectory:$PROJECT_DIR$" />
+          <option name=3D"myItemType" value=3D"com.intellij.ide.projectVie=
w.impl.nodes.PsiDirectoryNode" />
+        </PATH_ELEMENT>
+      </PATH>
+    </subPane>
+  </component>
+  <component name=3D"ProjectReloadState">
+    <option name=3D"STATE" value=3D"2" />
+  </component>
+  <component name=3D"ProjectView">
+    <navigator currentView=3D"ProjectPane" proportions=3D"0.40088105" vers=
ion=3D"1" splitterProportion=3D"0.5">
+      <flattenPackages />
+      <showMembers />
+      <showModules />
+      <showLibraryContents />
+      <hideEmptyPackages />
+      <abbreviatePackageNames />
+      <showStructure ProjectPane=3D"true" />
+      <autoscrollToSource ProjectPane=3D"true" />
+      <autoscrollFromSource />
+      <sortByType />
+    </navigator>
+  </component>
+  <component name=3D"PropertiesComponent">
+    <property name=3D"GoToFile.includeJavaFiles" value=3D"false" />
+    <property name=3D"GoToClass.toSaveIncludeLibraries" value=3D"false" />
+    <property name=3D"MemberChooser.sorted" value=3D"false" />
+    <property name=3D"MemberChooser.showClasses" value=3D"true" />
+    <property name=3D"GoToClass.includeLibraries" value=3D"false" />
+    <property name=3D"MemberChooser.copyJavadoc" value=3D"false" />
+  </component>
+  <component name=3D"RecentsManager">
+    <key name=3D"CopyClassDialog.RECENTS_KEY">
+      <recent name=3D"perf" />
+    </key>
+    <key name=3D"MoveClassesOrPackagesDialog.RECENTS_KEY">
+      <recent name=3D"perf.pojocache" />
+    </key>
+  </component>
+  <component name=3D"RunManager">
+    <configuration default=3D"true" type=3D"Remote" factoryName=3D"Remote">
+      <option name=3D"USE_SOCKET_TRANSPORT" value=3D"true" />
+      <option name=3D"SERVER_MODE" value=3D"false" />
+      <option name=3D"SHMEM_ADDRESS" value=3D"javadebug" />
+      <option name=3D"HOST" value=3D"localhost" />
+      <option name=3D"PORT" value=3D"5005" />
+    </configuration>
+    <configuration default=3D"true" type=3D"JUnit" factoryName=3D"JUnit" e=
nabled=3D"false" merge=3D"false">
+      <module name=3D"" />
+      <option name=3D"ALTERNATIVE_JRE_PATH_ENABLED" value=3D"false" />
+      <option name=3D"ALTERNATIVE_JRE_PATH" />
+      <option name=3D"PACKAGE_NAME" />
+      <option name=3D"MAIN_CLASS_NAME" />
+      <option name=3D"METHOD_NAME" />
+      <option name=3D"TEST_OBJECT" value=3D"class" />
+      <option name=3D"VM_PARAMETERS" />
+      <option name=3D"PARAMETERS" />
+      <option name=3D"WORKING_DIRECTORY" value=3D"$PROJECT_DIR$" />
+      <option name=3D"ENV_VARIABLES" />
+      <option name=3D"PASS_PARENT_ENVS" value=3D"true" />
+      <option name=3D"ADDITIONAL_CLASS_PATH" />
+      <option name=3D"TEST_SEARCH_SCOPE">
+        <value defaultName=3D"wholeProject" />
+      </option>
+      <envs />
+      <method>
+        <option name=3D"Make" value=3D"true" />
+      </method>
+    </configuration>
+    <configuration default=3D"true" type=3D"Applet" factoryName=3D"Applet">
+      <module name=3D"" />
+      <option name=3D"MAIN_CLASS_NAME" />
+      <option name=3D"HTML_FILE_NAME" />
+      <option name=3D"HTML_USED" value=3D"false" />
+      <option name=3D"WIDTH" value=3D"400" />
+      <option name=3D"HEIGHT" value=3D"300" />
+      <option name=3D"POLICY_FILE" value=3D"C:/Program Files/JetBrains/Int=
elliJ IDEA 6.0/bin/appletviewer.policy" />
+      <option name=3D"VM_PARAMETERS" />
+      <option name=3D"ALTERNATIVE_JRE_PATH_ENABLED" value=3D"false" />
+      <option name=3D"ALTERNATIVE_JRE_PATH" />
+    </configuration>
+    <configuration default=3D"true" type=3D"Application" factoryName=3D"Ap=
plication" enabled=3D"false" merge=3D"false">
+      <option name=3D"MAIN_CLASS_NAME" />
+      <option name=3D"VM_PARAMETERS" />
+      <option name=3D"PROGRAM_PARAMETERS" />
+      <option name=3D"WORKING_DIRECTORY" value=3D"$PROJECT_DIR$" />
+      <option name=3D"ALTERNATIVE_JRE_PATH_ENABLED" value=3D"false" />
+      <option name=3D"ALTERNATIVE_JRE_PATH" />
+      <option name=3D"ENABLE_SWING_INSPECTOR" value=3D"false" />
+      <option name=3D"ENV_VARIABLES" />
+      <option name=3D"PASS_PARENT_ENVS" value=3D"true" />
+      <module name=3D"" />
+      <envs />
+      <method>
+        <option name=3D"Make" value=3D"true" />
+      </method>
+    </configuration>
+    <list size=3D"0" />
+  </component>
+  <component name=3D"StructureViewFactory">
+    <option name=3D"AUTOSCROLL_MODE" value=3D"true" />
+    <option name=3D"AUTOSCROLL_FROM_SOURCE" value=3D"false" />
+    <option name=3D"ACTIVE_ACTIONS" value=3D"SHOW_INHERITED,SHOW_INTERFACE=
S,SHOW_FIELDS" />
+  </component>
+  <component name=3D"SvnConfiguration">
+    <option name=3D"USER" value=3D"" />
+    <option name=3D"PASSWORD" value=3D"" />
+    <option name=3D"LAST_MERGED_REVISION" />
+    <option name=3D"UPDATE_RUN_STATUS" value=3D"false" />
+    <option name=3D"UPDATE_RECURSIVELY" value=3D"true" />
+    <option name=3D"MERGE_DRY_RUN" value=3D"false" />
+    <configuration useDefault=3D"true">/home/bela/.subversion</configurati=
on>
+  </component>
+  <component name=3D"TodoView" selected-index=3D"0">
+    <todo-panel id=3D"selected-file">
+      <are-packages-shown value=3D"false" />
+      <are-modules-shown value=3D"false" />
+      <flatten-packages value=3D"false" />
+      <is-autoscroll-to-source value=3D"true" />
+    </todo-panel>
+    <todo-panel id=3D"all">
+      <are-packages-shown value=3D"true" />
+      <are-modules-shown value=3D"false" />
+      <flatten-packages value=3D"false" />
+      <is-autoscroll-to-source value=3D"true" />
+    </todo-panel>
+    <todo-panel id=3D"default-changelist">
+      <are-packages-shown value=3D"false" />
+      <are-modules-shown value=3D"false" />
+      <flatten-packages value=3D"false" />
+      <is-autoscroll-to-source value=3D"false" />
+    </todo-panel>
+  </component>
+  <component name=3D"ToolWindowManager">
+    <frame x=3D"86" y=3D"39" width=3D"1411" height=3D"1131" extended-state=
=3D"0" />
+    <editor active=3D"false" />
+    <layout>
+      <window_info id=3D"Changes" active=3D"false" anchor=3D"bottom" auto_=
hide=3D"false" internal_type=3D"DOCKED" type=3D"DOCKED" visible=3D"false" w=
eight=3D"0.33" order=3D"8" />
+      <window_info id=3D"Palette" active=3D"false" anchor=3D"right" auto_h=
ide=3D"false" internal_type=3D"DOCKED" type=3D"DOCKED" visible=3D"false" we=
ight=3D"0.33" order=3D"3" />
+      <window_info id=3D"Ant Build" active=3D"false" anchor=3D"right" auto=
_hide=3D"false" internal_type=3D"DOCKED" type=3D"DOCKED" visible=3D"false" =
weight=3D"0.25" order=3D"1" />
+      <window_info id=3D"Find" active=3D"false" anchor=3D"bottom" auto_hid=
e=3D"false" internal_type=3D"DOCKED" type=3D"DOCKED" visible=3D"false" weig=
ht=3D"0.3296146" order=3D"1" />
+      <window_info id=3D"Debug" active=3D"false" anchor=3D"bottom" auto_hi=
de=3D"false" internal_type=3D"DOCKED" type=3D"DOCKED" visible=3D"false" wei=
ght=3D"0.4" order=3D"3" />
+      <window_info id=3D"Version Control" active=3D"false" anchor=3D"botto=
m" auto_hide=3D"false" internal_type=3D"DOCKED" type=3D"DOCKED" visible=3D"=
false" weight=3D"0.33" order=3D"8" />
+      <window_info id=3D"Messages" active=3D"false" anchor=3D"bottom" auto=
_hide=3D"false" internal_type=3D"DOCKED" type=3D"DOCKED" visible=3D"false" =
weight=3D"0.3296146" order=3D"8" />
+      <window_info id=3D"TODO" active=3D"false" anchor=3D"bottom" auto_hid=
e=3D"false" internal_type=3D"DOCKED" type=3D"DOCKED" visible=3D"false" weig=
ht=3D"0.33" order=3D"7" />
+      <window_info id=3D"Structure" active=3D"false" anchor=3D"left" auto_=
hide=3D"false" internal_type=3D"DOCKED" type=3D"DOCKED" visible=3D"false" w=
eight=3D"0.25" order=3D"1" />
+      <window_info id=3D"Commander" active=3D"false" anchor=3D"right" auto=
_hide=3D"false" internal_type=3D"DOCKED" type=3D"DOCKED" visible=3D"false" =
weight=3D"0.4" order=3D"0" />
+      <window_info id=3D"Maven projects" active=3D"false" anchor=3D"right"=
 auto_hide=3D"false" internal_type=3D"DOCKED" type=3D"DOCKED" visible=3D"fa=
lse" weight=3D"0.33" order=3D"3" />
+      <window_info id=3D"Module Dependencies" active=3D"false" anchor=3D"r=
ight" auto_hide=3D"false" internal_type=3D"DOCKED" type=3D"DOCKED" visible=
=3D"false" weight=3D"0.33" order=3D"3" />
+      <window_info id=3D"Project" active=3D"false" anchor=3D"left" auto_hi=
de=3D"false" internal_type=3D"DOCKED" type=3D"DOCKED" visible=3D"true" weig=
ht=3D"0.24926035" order=3D"0" />
+      <window_info id=3D"Dependency Viewer" active=3D"false" anchor=3D"bot=
tom" auto_hide=3D"false" internal_type=3D"DOCKED" type=3D"DOCKED" visible=
=3D"false" weight=3D"0.33" order=3D"8" />
+      <window_info id=3D"Hierarchy" active=3D"false" anchor=3D"right" auto=
_hide=3D"false" internal_type=3D"DOCKED" type=3D"DOCKED" visible=3D"false" =
weight=3D"0.25" order=3D"2" />
+      <window_info id=3D"Inspection" active=3D"false" anchor=3D"bottom" au=
to_hide=3D"false" internal_type=3D"DOCKED" type=3D"DOCKED" visible=3D"false=
" weight=3D"0.4" order=3D"6" />
+      <window_info id=3D"Duplicates" active=3D"false" anchor=3D"bottom" au=
to_hide=3D"false" internal_type=3D"DOCKED" type=3D"DOCKED" visible=3D"false=
" weight=3D"0.33" order=3D"8" />
+      <window_info id=3D"Run" active=3D"false" anchor=3D"bottom" auto_hide=
=3D"false" internal_type=3D"DOCKED" type=3D"DOCKED" visible=3D"false" weigh=
t=3D"0.33" order=3D"2" />
+      <window_info id=3D"Cvs" active=3D"false" anchor=3D"bottom" auto_hide=
=3D"false" internal_type=3D"DOCKED" type=3D"DOCKED" visible=3D"false" weigh=
t=3D"0.25" order=3D"5" />
+      <window_info id=3D"Message" active=3D"false" anchor=3D"bottom" auto_=
hide=3D"false" internal_type=3D"DOCKED" type=3D"DOCKED" visible=3D"false" w=
eight=3D"0.33" order=3D"0" />
+      <window_info id=3D"SVN Repositories" active=3D"true" anchor=3D"botto=
m" auto_hide=3D"false" internal_type=3D"DOCKED" type=3D"DOCKED" visible=3D"=
true" weight=3D"0.3296146" order=3D"-1" />
+      <window_info id=3D"Web" active=3D"false" anchor=3D"left" auto_hide=
=3D"false" internal_type=3D"DOCKED" type=3D"DOCKED" visible=3D"false" weigh=
t=3D"0.25" order=3D"2" />
+      <window_info id=3D"EJB" active=3D"false" anchor=3D"bottom" auto_hide=
=3D"false" internal_type=3D"DOCKED" type=3D"DOCKED" visible=3D"false" weigh=
t=3D"0.25" order=3D"4" />
+    </layout>
+  </component>
+  <component name=3D"VcsManagerConfiguration">
+    <option name=3D"OFFER_MOVE_TO_ANOTHER_CHANGELIST_ON_PARTIAL_COMMIT" va=
lue=3D"true" />
+    <option name=3D"CHECK_CODE_SMELLS_BEFORE_PROJECT_COMMIT" value=3D"true=
" />
+    <option name=3D"PERFORM_UPDATE_IN_BACKGROUND" value=3D"true" />
+    <option name=3D"PERFORM_COMMIT_IN_BACKGROUND" value=3D"true" />
+    <option name=3D"PERFORM_EDIT_IN_BACKGROUND" value=3D"true" />
+    <option name=3D"PERFORM_ADD_REMOVE_IN_BACKGROUND" value=3D"true" />
+    <option name=3D"FORCE_NON_EMPTY_COMMENT" value=3D"false" />
+    <option name=3D"LAST_COMMIT_MESSAGE" />
+    <option name=3D"OPTIMIZE_IMPORTS_BEFORE_PROJECT_COMMIT" value=3D"false=
" />
+    <option name=3D"REFORMAT_BEFORE_PROJECT_COMMIT" value=3D"false" />
+    <option name=3D"REFORMAT_BEFORE_FILE_COMMIT" value=3D"false" />
+    <option name=3D"FILE_HISTORY_DIALOG_COMMENTS_SPLITTER_PROPORTION" valu=
e=3D"0.8" />
+    <option name=3D"FILE_HISTORY_DIALOG_SPLITTER_PROPORTION" value=3D"0.5"=
 />
+    <option name=3D"ACTIVE_VCS_NAME" />
+    <option name=3D"UPDATE_GROUP_BY_PACKAGES" value=3D"false" />
+    <option name=3D"UPDATE_GROUP_BY_CHANGELIST" value=3D"false" />
+    <option name=3D"SHOW_FILE_HISTORY_AS_TREE" value=3D"false" />
+    <option name=3D"FILE_HISTORY_SPLITTER_PROPORTION" value=3D"0.6" />
+  </component>
+  <component name=3D"antWorkspaceConfiguration">
+    <option name=3D"IS_AUTOSCROLL_TO_SOURCE" value=3D"false" />
+    <option name=3D"FILTER_TARGETS" value=3D"false" />
+  </component>
+  <component name=3D"editorHistoryManager">
+    <entry file=3D"file://$PROJECT_DIR$/pc.sh">
+      <provider selected=3D"true" editor-type-id=3D"text-editor">
+        <state line=3D"4" column=3D"0" selection-start=3D"24" selection-en=
d=3D"24" vertical-scroll-proportion=3D"0.06382979">
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file=3D"file://$PROJECT_DIR$/CacheTests.iml">
+      <provider selected=3D"true" editor-type-id=3D"text-editor">
+        <state line=3D"0" column=3D"0" selection-start=3D"0" selection-end=
=3D"0" vertical-scroll-proportion=3D"0.0">
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file=3D"file://$PROJECT_DIR$/run.sh">
+      <provider selected=3D"true" editor-type-id=3D"text-editor">
+        <state line=3D"9" column=3D"123" selection-start=3D"188" selection=
-end=3D"188" vertical-scroll-proportion=3D"0.14361702">
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file=3D"file://$PROJECT_DIR$/tc.sh">
+      <provider selected=3D"true" editor-type-id=3D"text-editor">
+        <state line=3D"12" column=3D"0" selection-start=3D"161" selection-=
end=3D"276" vertical-scroll-proportion=3D"0.19148937">
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file=3D"file://$PROJECT_DIR$/obsolete/SessionTestPC.java.old">
+      <provider selected=3D"true" editor-type-id=3D"text-editor">
+        <state line=3D"0" column=3D"0" selection-start=3D"0" selection-end=
=3D"0" vertical-scroll-proportion=3D"-0.4712042">
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file=3D"file://$PROJECT_DIR$/src/perf/coherence/SessionCoherenc=
e.java">
+      <provider selected=3D"true" editor-type-id=3D"text-editor">
+        <state line=3D"11" column=3D"0" selection-start=3D"215" selection-=
end=3D"215" vertical-scroll-proportion=3D"0.17277487">
+          <folding>
+            <element signature=3D"imports" expanded=3D"true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file=3D"file://$PROJECT_DIR$/src/perf/coherence/SessionFactoryC=
oherence.java">
+      <provider selected=3D"true" editor-type-id=3D"text-editor">
+        <state line=3D"20" column=3D"35" selection-start=3D"456" selection=
-end=3D"472" vertical-scroll-proportion=3D"0.31413612">
+          <folding>
+            <element signature=3D"imports" expanded=3D"true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file=3D"file://$PROJECT_DIR$/ch.sh">
+      <provider selected=3D"true" editor-type-id=3D"text-editor">
+        <state line=3D"2" column=3D"0" selection-start=3D"61" selection-en=
d=3D"61" vertical-scroll-proportion=3D"0.03141361">
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file=3D"file://$PROJECT_DIR$/jbc.sh">
+      <provider selected=3D"true" editor-type-id=3D"text-editor">
+        <state line=3D"2" column=3D"0" selection-start=3D"56" selection-en=
d=3D"56" vertical-scroll-proportion=3D"0.03141361">
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file=3D"jar://$PROJECT_DIR$/lib/jbosscache-core.jar!/org/jboss/=
cache/Node.class">
+      <provider selected=3D"true" editor-type-id=3D"text-editor">
+        <state line=3D"25" column=3D"30" selection-start=3D"710" selection=
-end=3D"710" vertical-scroll-proportion=3D"0.3329843">
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file=3D"file://$PROJECT_DIR$/src/perf/SessionTest.java">
+      <provider selected=3D"true" editor-type-id=3D"text-editor">
+        <state line=3D"60" column=3D"38" selection-start=3D"2310" selectio=
n-end=3D"2310" vertical-scroll-proportion=3D"0.9424084">
+          <folding>
+            <element signature=3D"imports" expanded=3D"true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file=3D"file://$PROJECT_DIR$/src/perf/pojocache/SessionPC.java">
+      <provider selected=3D"true" editor-type-id=3D"text-editor">
+        <state line=3D"13" column=3D"13" selection-start=3D"238" selection=
-end=3D"238" vertical-scroll-proportion=3D"0.14136125">
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file=3D"file://$PROJECT_DIR$/src/perf/jbosscache/SessionJBC.jav=
a">
+      <provider selected=3D"true" editor-type-id=3D"text-editor">
+        <state line=3D"21" column=3D"27" selection-start=3D"416" selection=
-end=3D"416" vertical-scroll-proportion=3D"0.32984293">
+          <folding>
+            <element signature=3D"imports" expanded=3D"true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file=3D"file://$PROJECT_DIR$/src/perf/pojocache/SessionFactoryP=
C.java">
+      <provider selected=3D"true" editor-type-id=3D"text-editor">
+        <state line=3D"29" column=3D"8" selection-start=3D"689" selection-=
end=3D"689" vertical-scroll-proportion=3D"0.2984293">
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file=3D"file://$PROJECT_DIR$/src/perf/jbosscache/SessionFactory=
JBC.java">
+      <provider selected=3D"true" editor-type-id=3D"text-editor">
+        <state line=3D"33" column=3D"27" selection-start=3D"1038" selectio=
n-end=3D"1038" vertical-scroll-proportion=3D"0.5183246">
+          <folding>
+            <element signature=3D"imports" expanded=3D"true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file=3D"file://$PROJECT_DIR$/config.xml">
+      <provider selected=3D"true" editor-type-id=3D"text-editor">
+        <state line=3D"153" column=3D"27" selection-start=3D"6489" selecti=
on-end=3D"6489" vertical-scroll-proportion=3D"2.2777777">
+          <folding />
+        </state>
+      </provider>
+    </entry>
+  </component>
+</project>
+

Added: benchmarks/trunk/Tests.iml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- benchmarks/trunk/Tests.iml	                        (rev 0)
+++ benchmarks/trunk/Tests.iml	2008-01-08 13:24:22 UTC (rev 5048)
@@ -0,0 +1,313 @@
+<?xml version=3D"1.0" encoding=3D"UTF-8"?>
+<module relativePaths=3D"true" type=3D"JAVA_MODULE" version=3D"4">
+  <component name=3D"NewModuleRootManager" inherit-compiler-output=3D"fals=
e">
+    <output url=3D"file://$MODULE_DIR$/classes" />
+    <exclude-output />
+    <output-test url=3D"file://$MODULE_DIR$/classes" />
+    <content url=3D"file://$MODULE_DIR$">
+      <sourceFolder url=3D"file://$MODULE_DIR$" isTestSource=3D"false" pac=
kagePrefix=3D"multicast" />
+    </content>
+    <orderEntry type=3D"inheritedJdk" />
+    <orderEntry type=3D"sourceFolder" forTests=3D"false" />
+    <orderEntry type=3D"module-library">
+      <library>
+        <CLASSES>
+          <root url=3D"jar://$APPLICATION_HOME_DIR$/lib/javaee.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type=3D"module-library">
+      <library>
+        <CLASSES>
+          <root url=3D"jar://$MODULE_DIR$/lib/commons-logging.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type=3D"module-library">
+      <library>
+        <CLASSES>
+          <root url=3D"jar://$MODULE_DIR$/lib/jgroups.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type=3D"module-library">
+      <library>
+        <CLASSES>
+          <root url=3D"jar://$MODULE_DIR$/lib/jboss-logging-spi.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type=3D"module-library">
+      <library>
+        <CLASSES>
+          <root url=3D"jar://$MODULE_DIR$/lib/jbosscache-core.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type=3D"module-library">
+      <library>
+        <CLASSES>
+          <root url=3D"jar://$MODULE_DIR$/lib/tangosol.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type=3D"module-library">
+      <library>
+        <CLASSES>
+          <root url=3D"jar://$MODULE_DIR$/lib/log4j.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type=3D"module-library">
+      <library>
+        <CLASSES>
+          <root url=3D"jar://$MODULE_DIR$/lib/ant.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type=3D"module-library">
+      <library>
+        <CLASSES>
+          <root url=3D"jar://$MODULE_DIR$/lib/jcip-annotations.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type=3D"module-library">
+      <library>
+        <CLASSES>
+          <root url=3D"jar://$MODULE_DIR$/lib/junit.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type=3D"module-library">
+      <library>
+        <CLASSES>
+          <root url=3D"jar://$MODULE_DIR$/lib/httpclient.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type=3D"module-library">
+      <library>
+        <CLASSES>
+          <root url=3D"jar://$MODULE_DIR$/lib/jbosscache-core-tests.jar!/"=
 />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type=3D"module-library">
+      <library>
+        <CLASSES>
+          <root url=3D"jar://$MODULE_DIR$/lib/dtdparser121.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type=3D"module-library">
+      <library>
+        <CLASSES>
+          <root url=3D"jar://$MODULE_DIR$/lib/testng.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type=3D"module-library">
+      <library>
+        <CLASSES>
+          <root url=3D"jar://$MODULE_DIR$/lib/jboss-common-logging-spi.jar=
!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type=3D"module-library">
+      <library>
+        <CLASSES>
+          <root url=3D"jar://$MODULE_DIR$/lib/jboss-aop.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type=3D"module-library">
+      <library>
+        <CLASSES>
+          <root url=3D"jar://$MODULE_DIR$/lib/jbossxb.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type=3D"module-library">
+      <library>
+        <CLASSES>
+          <root url=3D"jar://$MODULE_DIR$/lib/je.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type=3D"module-library">
+      <library>
+        <CLASSES>
+          <root url=3D"jar://$MODULE_DIR$/lib/qdox.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type=3D"module-library">
+      <library>
+        <CLASSES>
+          <root url=3D"jar://$MODULE_DIR$/lib/jboss-javaee.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type=3D"module-library">
+      <library>
+        <CLASSES>
+          <root url=3D"jar://$MODULE_DIR$/lib/tc.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type=3D"module-library">
+      <library>
+        <CLASSES>
+          <root url=3D"jar://$MODULE_DIR$/lib/activation.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type=3D"module-library">
+      <library>
+        <CLASSES>
+          <root url=3D"jar://$MODULE_DIR$/lib/commons-codec-1.3.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type=3D"module-library">
+      <library>
+        <CLASSES>
+          <root url=3D"jar://$MODULE_DIR$/lib/derby.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type=3D"module-library">
+      <library>
+        <CLASSES>
+          <root url=3D"jar://$MODULE_DIR$/lib/jdbm.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type=3D"module-library">
+      <library>
+        <CLASSES>
+          <root url=3D"jar://$MODULE_DIR$/lib/trove.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type=3D"module-library">
+      <library>
+        <CLASSES>
+          <root url=3D"jar://$MODULE_DIR$/lib/jbosscache-pojo.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type=3D"module-library">
+      <library>
+        <CLASSES>
+          <root url=3D"jar://$MODULE_DIR$/lib/jboss-container.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type=3D"module-library">
+      <library>
+        <CLASSES>
+          <root url=3D"jar://$MODULE_DIR$/lib/jboss-common-core.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type=3D"module-library">
+      <library>
+        <CLASSES>
+          <root url=3D"jar://$MODULE_DIR$/lib/javassist.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type=3D"module-library">
+      <library>
+        <CLASSES>
+          <root url=3D"jar://$MODULE_DIR$/lib/coherence.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type=3D"module-library">
+      <library>
+        <CLASSES>
+          <root url=3D"jar://$MODULE_DIR$/lib/c3p0.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type=3D"module-library">
+      <library>
+        <CLASSES>
+          <root url=3D"jar://$MODULE_DIR$/lib/xercesImpl.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type=3D"library" name=3D"lib" level=3D"project" />
+    <orderEntryProperties />
+  </component>
+</module>
+

Added: benchmarks/trunk/ch.sh
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- benchmarks/trunk/ch.sh	                        (rev 0)
+++ benchmarks/trunk/ch.sh	2008-01-08 13:24:22 UTC (rev 5048)
@@ -0,0 +1,2 @@
+./run.sh -factory perf.coherence.SessionFactoryCoherence $*
+


Property changes on: benchmarks/trunk/ch.sh
___________________________________________________________________
Name: svn:executable
   + =


Added: benchmarks/trunk/config.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- benchmarks/trunk/config.xml	                        (rev 0)
+++ benchmarks/trunk/config.xml	2008-01-08 13:24:22 UTC (rev 5048)
@@ -0,0 +1,254 @@
+<?xml version=3D"1.0" encoding=3D"UTF-8"?>
+
+<!-- =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D -->
+<!--                                                                      =
 -->
+<!--  Sample TreeCache Service Configuration                              =
 -->
+<!--                                                                      =
 -->
+<!-- =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D -->
+
+<server>
+
+   <!-- =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D -->
+   <!-- Defines TreeCache configuration                                   =
   -->
+   <!-- =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D -->
+
+   <mbean code=3D"org.jboss.cache.jmx.CacheJmxWrapper"
+          name=3D"jboss.cache:service=3DTreeCache">
+
+      <depends>jboss:service=3DNaming</depends>
+      <depends>jboss:service=3DTransactionManager</depends>
+
+      <!--
+          Configure the TransactionManager
+      -->
+      <attribute name=3D"TransactionManagerLookupClass">org.jboss.cache.tr=
ansaction.GenericTransactionManagerLookup
+      </attribute>
+
+      <!--
+          Isolation level : SERIALIZABLE
+                            REPEATABLE_READ (default)
+                            READ_COMMITTED
+                            READ_UNCOMMITTED
+                            NONE
+      -->
+      <attribute name=3D"IsolationLevel">REPEATABLE_READ</attribute>
+
+       <!--<attribute name=3D"NodeLockingScheme">OPTIMISTIC</attribute>-->
+
+      <!--
+           Valid modes are LOCAL
+                           REPL_ASYNC
+                           REPL_SYNC
+                           INVALIDATION_ASYNC
+                           INVALIDATION_SYNC
+      -->
+      <attribute name=3D"CacheMode">REPL_ASYNC</attribute>
+
+      <!--
+      Just used for async repl: use a replication queue
+      -->
+      <attribute name=3D"UseReplQueue">false</attribute>
+
+      <!--
+          Replication interval for replication queue (in ms)
+      -->
+      <attribute name=3D"ReplQueueInterval">0</attribute>
+
+      <!--
+          Max number of elements which trigger replication
+      -->
+      <attribute name=3D"ReplQueueMaxElements">0</attribute>
+
+      <!-- Name of cluster. Needs to be the same for all TreeCache nodes i=
n a
+           cluster in order to find each other.
+      -->
+      <attribute name=3D"ClusterName">JBossCache-Cluster</attribute>
+
+      <!--Uncomment next three statements to enable JGroups multiplexer.
+This configuration is dependent on the JGroups multiplexer being
+registered in an MBean server such as JBossAS.  -->
+      <!--
+      <depends>jgroups.mux:name=3DMultiplexer</depends>
+      <attribute name=3D"MultiplexerService">jgroups.mux:name=3DMultiplexe=
r</attribute>
+      <attribute name=3D"MultiplexerStack">fc-fast-minimalthreads</attribu=
te>
+      -->
+
+      <!-- JGroups protocol stack properties.
+         ClusterConfig isn't used if the multiplexer is enabled and succes=
sfully initialized.
+      -->
+      <attribute name=3D"ClusterConfig">
+         <config>
+             <!--<UDP mcast_addr=3D"232.10.10.10"
+                              mcast_port=3D"45588"
+                              tos=3D"8"
+                              ucast_recv_buf_size=3D"20000000"
+                              ucast_send_buf_size=3D"640000"
+                              mcast_recv_buf_size=3D"25000000"
+                              mcast_send_buf_size=3D"640000"
+                              loopback=3D"false"
+                              discard_incompatible_packets=3D"true"
+                              max_bundle_size=3D"64000"
+                              max_bundle_timeout=3D"30"
+                              use_incoming_packet_handler=3D"true"
+                              ip_ttl=3D"2"
+                              enable_bundling=3D"false"
+                              enable_unicast_bundling=3D"false"
+                              enable_diagnostics=3D"true"
+
+                              use_concurrent_stack=3D"true"
+
+                              thread_naming_pattern=3D"pl"
+
+                              thread_pool.enabled=3D"true"
+                              thread_pool.min_threads=3D"1"
+                              thread_pool.max_threads=3D"4"
+                              thread_pool.keep_alive_time=3D"30000"
+                              thread_pool.queue_enabled=3D"true"
+                              thread_pool.queue_max_size=3D"50000"
+                              thread_pool.rejection_policy=3D"discard"
+
+                              oob_thread_pool.enabled=3D"true"
+                              oob_thread_pool.min_threads=3D"2"
+                              oob_thread_pool.max_threads=3D"4"
+                              oob_thread_pool.keep_alive_time=3D"10000"
+                              oob_thread_pool.queue_enabled=3D"false"
+                              oob_thread_pool.queue_max_size=3D"10"
+                              oob_thread_pool.rejection_policy=3D"Run"/>-->
+
+            <TCP recv_buf_size=3D"20000000" use_send_queues=3D"false"
+                 loopback=3D"false"
+                 discard_incompatible_packets=3D"true"
+                 max_bundle_size=3D"64000"
+                 max_bundle_timeout=3D"30"
+                 use_incoming_packet_handler=3D"true"
+                 enable_bundling=3D"true"
+                 enable_unicast_bundling=3D"true"
+                 enable_diagnostics=3D"true"
+
+                 use_concurrent_stack=3D"true"
+
+                 thread_naming_pattern=3D"pl"
+
+                 thread_pool.enabled=3D"true"
+                 thread_pool.min_threads=3D"1"
+                 thread_pool.max_threads=3D"4"
+                 thread_pool.keep_alive_time=3D"30000"
+                 thread_pool.queue_enabled=3D"true"
+                 thread_pool.queue_max_size=3D"50000"
+                 thread_pool.rejection_policy=3D"discard"
+
+                 oob_thread_pool.enabled=3D"true"
+                 oob_thread_pool.min_threads=3D"2"
+                 oob_thread_pool.max_threads=3D"4"
+                 oob_thread_pool.keep_alive_time=3D"10000"
+                 oob_thread_pool.queue_enabled=3D"false"
+                 oob_thread_pool.queue_max_size=3D"10"
+                 oob_thread_pool.rejection_policy=3D"Run"/>
+
+            <!--<PING timeout=3D"2000" num_initial_members=3D"3"/>-->
+             <MPING mcast_addr=3D"232.1.2.3" timeout=3D"2000" num_initial_=
members=3D"3"/>
+            <MERGE2 max_interval=3D"30000" min_interval=3D"10000"/>
+            <FD_SOCK/>
+            <FD timeout=3D"10000" max_tries=3D"5" shun=3D"true"/>
+            <VERIFY_SUSPECT timeout=3D"1500"/>
+            <pbcast.NAKACK use_mcast_xmit=3D"false" gc_lag=3D"0"
+                           retransmit_timeout=3D"300,600,1200,2400,4800"
+                           discard_delivered_msgs=3D"true"/>
+            <!--<UNICAST timeout=3D"30,60,120,300,600,1200,2400,3600"/>-->
+            <pbcast.STABLE stability_delay=3D"1000" desired_avg_gossip=3D"=
50000"
+                           max_bytes=3D"400000"/>
+            <pbcast.GMS print_local_addr=3D"true" join_timeout=3D"5000"
+                        join_retry_timeout=3D"2000" shun=3D"false"
+                        view_bundling=3D"true" view_ack_collection_timeout=
=3D"5000"/>
+              <FC max_credits=3D"5000000"
+                    min_threshold=3D"0.20"/>
+            <FRAG2 frag_size=3D"60000"/>
+            <pbcast.STREAMING_STATE_TRANSFER use_reading_thread=3D"true"/>
+            <!-- <pbcast.STATE_TRANSFER/> -->
+            <pbcast.FLUSH timeout=3D"0"/>
+         </config>
+      </attribute>
+
+
+      <!--
+       Whether or not to fetch state on joining a cluster
+       NOTE this used to be called FetchStateOnStartup and has been rename=
d to be more descriptive.
+      -->
+      <attribute name=3D"FetchInMemoryState">true</attribute>
+
+      <!--
+          The max amount of time (in milliseconds) we wait until the
+          state (ie. the contents of the cache) are retrieved from
+          existing members in a clustered environment
+      -->
+      <attribute name=3D"StateRetrievalTimeout">15000</attribute>
+
+      <!--
+          Number of milliseconds to wait until all responses for a
+          synchronous call have been received.
+      -->
+      <attribute name=3D"SyncReplTimeout">15000</attribute>
+
+      <!-- Max number of milliseconds to wait for a lock acquisition -->
+      <attribute name=3D"LockAcquisitionTimeout">10000</attribute>
+
+      <!--
+         Indicate whether to use region based marshalling or not. Set this=
 to true if you are running under a scoped
+         class loader, e.g., inside an application server. Default is "fal=
se".
+      -->
+      <attribute name=3D"UseRegionBasedMarshalling">true</attribute>
+
+
+       <attribute name=3D"BuddyReplicationConfig">
+           <config>
+
+               <!-- Enables buddy replication. This is the ONLY mandatory =
configuration element here. -->
+               <buddyReplicationEnabled>true</buddyReplicationEnabled>
+
+               <!-- These are the default values anyway -->
+               <buddyLocatorClass>org.jboss.cache.buddyreplication.NextMem=
berBuddyLocator</buddyLocatorClass>
+
+               <!--  numBuddies is the number of backup nodes each node ma=
intains. ignoreColocatedBuddies means
+            that each node will *try* to select a buddy on a different phy=
sical host. If not able to do so though,
+            it will fall back to colocated nodes. -->
+               <buddyLocatorProperties>
+                   numBuddies =3D 1
+                   ignoreColocatedBuddies =3D true
+               </buddyLocatorProperties>
+
+               <!-- A way to specify a preferred replication group. If spe=
cified, we try and pick a buddy which shares
+           the same pool name (falling back to other buddies if not availa=
ble). This allows the sysdmin to
+           hint at backup buddies are picked, so for example, nodes may be=
 hinted topick buddies on a different
+           physical rack or power supply for added fault tolerance. -->
+               <buddyPoolName>myBuddyPoolReplicationGroup</buddyPoolName>
+
+               <!-- Communication timeout for inter-buddy group organisati=
on messages (such as assigning to and
+           removing from groups, defaults to 1000. -->
+               <buddyCommunicationTimeout>2000</buddyCommunicationTimeout>
+
+               <!-- Whether data is removed from old owners when gravitate=
d to a new owner. Defaults to true. -->
+               <dataGravitationRemoveOnFind>true</dataGravitationRemoveOnF=
ind>
+
+               <!-- Whether backup nodes can respond to data gravitation r=
equests, or only the data owner is
+           supposed to respond.  Defaults to true. -->
+               <dataGravitationSearchBackupTrees>true</dataGravitationSear=
chBackupTrees>
+
+               <!-- Whether all cache misses result in a data gravitation =
request. Defaults to false, requiring
+           callers to enable data gravitation on a per-invocation basis us=
ing the Options API. -->
+               <autoDataGravitation>false</autoDataGravitation>
+
+           </config>
+       </attribute>
+
+       =

+   </mbean>
+
+
+   <!--  Uncomment to get a graphical view of the TreeCache MBean above -->
+   <!--   <mbean code=3D"org.jboss.cache.TreeCacheView" name=3D"jboss.cach=
e:service=3DTreeCacheView">-->
+   <!--      <depends>jboss.cache:service=3DTreeCache</depends>-->
+   <!--      <attribute name=3D"CacheService">jboss.cache:service=3DTreeCa=
che</attribute>-->
+   <!--   </mbean>-->
+
+
+</server>


Property changes on: benchmarks/trunk/config.xml
___________________________________________________________________
Name: svn:executable
   + =


Added: benchmarks/trunk/jbc.sh
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- benchmarks/trunk/jbc.sh	                        (rev 0)
+++ benchmarks/trunk/jbc.sh	2008-01-08 13:24:22 UTC (rev 5048)
@@ -0,0 +1,2 @@
+
+./run.sh -factory perf.jbosscache.SessionFactoryJBC $*


Property changes on: benchmarks/trunk/jbc.sh
___________________________________________________________________
Name: svn:executable
   + =


Added: benchmarks/trunk/lib/activation.jar
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)


Property changes on: benchmarks/trunk/lib/activation.jar
___________________________________________________________________
Name: svn:executable
   + =

Name: svn:mime-type
   + application/octet-stream

Added: benchmarks/trunk/lib/ant.jar
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)


Property changes on: benchmarks/trunk/lib/ant.jar
___________________________________________________________________
Name: svn:executable
   + =

Name: svn:mime-type
   + application/octet-stream

Added: benchmarks/trunk/lib/c3p0.jar
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)


Property changes on: benchmarks/trunk/lib/c3p0.jar
___________________________________________________________________
Name: svn:executable
   + =

Name: svn:mime-type
   + application/octet-stream

Added: benchmarks/trunk/lib/commons-codec-1.3.jar
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)


Property changes on: benchmarks/trunk/lib/commons-codec-1.3.jar
___________________________________________________________________
Name: svn:executable
   + =

Name: svn:mime-type
   + application/octet-stream

Added: benchmarks/trunk/lib/commons-logging.jar
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)


Property changes on: benchmarks/trunk/lib/commons-logging.jar
___________________________________________________________________
Name: svn:executable
   + =

Name: svn:mime-type
   + application/octet-stream

Added: benchmarks/trunk/lib/derby.jar
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)


Property changes on: benchmarks/trunk/lib/derby.jar
___________________________________________________________________
Name: svn:executable
   + =

Name: svn:mime-type
   + application/octet-stream

Added: benchmarks/trunk/lib/dtdparser121.jar
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)


Property changes on: benchmarks/trunk/lib/dtdparser121.jar
___________________________________________________________________
Name: svn:executable
   + =

Name: svn:mime-type
   + application/octet-stream

Added: benchmarks/trunk/lib/javassist.jar
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)


Property changes on: benchmarks/trunk/lib/javassist.jar
___________________________________________________________________
Name: svn:executable
   + =

Name: svn:mime-type
   + application/octet-stream

Added: benchmarks/trunk/lib/jboss-aop.jar
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)


Property changes on: benchmarks/trunk/lib/jboss-aop.jar
___________________________________________________________________
Name: svn:executable
   + =

Name: svn:mime-type
   + application/octet-stream

Added: benchmarks/trunk/lib/jboss-common-core.jar
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)


Property changes on: benchmarks/trunk/lib/jboss-common-core.jar
___________________________________________________________________
Name: svn:executable
   + =

Name: svn:mime-type
   + application/octet-stream

Added: benchmarks/trunk/lib/jboss-common-logging-spi.jar
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)


Property changes on: benchmarks/trunk/lib/jboss-common-logging-spi.jar
___________________________________________________________________
Name: svn:executable
   + =

Name: svn:mime-type
   + application/octet-stream

Added: benchmarks/trunk/lib/jboss-container.jar
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)


Property changes on: benchmarks/trunk/lib/jboss-container.jar
___________________________________________________________________
Name: svn:executable
   + =

Name: svn:mime-type
   + application/octet-stream

Added: benchmarks/trunk/lib/jboss-javaee.jar
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)


Property changes on: benchmarks/trunk/lib/jboss-javaee.jar
___________________________________________________________________
Name: svn:executable
   + =

Name: svn:mime-type
   + application/octet-stream

Added: benchmarks/trunk/lib/jboss-logging-spi.jar
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)


Property changes on: benchmarks/trunk/lib/jboss-logging-spi.jar
___________________________________________________________________
Name: svn:executable
   + =

Name: svn:mime-type
   + application/octet-stream

Added: benchmarks/trunk/lib/jbosscache-core.jar
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)


Property changes on: benchmarks/trunk/lib/jbosscache-core.jar
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: benchmarks/trunk/lib/jbosscache-pojo.jar
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)


Property changes on: benchmarks/trunk/lib/jbosscache-pojo.jar
___________________________________________________________________
Name: svn:executable
   + =

Name: svn:mime-type
   + application/octet-stream

Added: benchmarks/trunk/lib/jbossxb.jar
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)


Property changes on: benchmarks/trunk/lib/jbossxb.jar
___________________________________________________________________
Name: svn:executable
   + =

Name: svn:mime-type
   + application/octet-stream

Added: benchmarks/trunk/lib/jcip-annotations.jar
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)


Property changes on: benchmarks/trunk/lib/jcip-annotations.jar
___________________________________________________________________
Name: svn:executable
   + =

Name: svn:mime-type
   + application/octet-stream

Added: benchmarks/trunk/lib/jdbm.jar
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)


Property changes on: benchmarks/trunk/lib/jdbm.jar
___________________________________________________________________
Name: svn:executable
   + =

Name: svn:mime-type
   + application/octet-stream

Added: benchmarks/trunk/lib/jgroups.jar
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)


Property changes on: benchmarks/trunk/lib/jgroups.jar
___________________________________________________________________
Name: svn:executable
   + =

Name: svn:mime-type
   + application/octet-stream

Added: benchmarks/trunk/lib/junit.jar
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)


Property changes on: benchmarks/trunk/lib/junit.jar
___________________________________________________________________
Name: svn:executable
   + =

Name: svn:mime-type
   + application/octet-stream

Added: benchmarks/trunk/lib/log4j.jar
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)


Property changes on: benchmarks/trunk/lib/log4j.jar
___________________________________________________________________
Name: svn:executable
   + =

Name: svn:mime-type
   + application/octet-stream

Added: benchmarks/trunk/lib/pojocache-aop.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- benchmarks/trunk/lib/pojocache-aop.xml	                        (rev 0)
+++ benchmarks/trunk/lib/pojocache-aop.xml	2008-01-08 13:24:22 UTC (rev 504=
8)
@@ -0,0 +1,146 @@
+<?xml version=3D"1.0" encoding=3D"UTF-8"?>
+<!--
+    This is the PojoCache configuration file that specifies:
+      1. Interceptor stack for API
+      2. Annotation binding for POJO (via "prepare" element)
+
+    Basically, this is a variant of jboss-aop.xml. Note that
+    except for the customization of interceptor stack, you should
+    not need to modify this file.
+
+    To run PojoCache, you will need to define a system property:
+    jboss.aop.path that contains the path to this file such that JBoss Aop
+    can locate it.
+-->
+<aop>
+
+   <!--
+   This defines the PojoCache 2.0 interceptor stack. Unless necessary, don=
't modify the stack here!
+   -->
+
+   <!-- Check id range validity -->
+   <interceptor name=3D"CheckId" class=3D"org.jboss.cache.pojo.interceptor=
s.CheckIdInterceptor"
+                scope=3D"PER_INSTANCE"/>
+
+   <!-- Track Tx undo operation -->
+   <interceptor name=3D"Undo" class=3D"org.jboss.cache.pojo.interceptors.P=
ojoTxUndoInterceptor"
+                scope=3D"PER_INSTANCE"/>
+
+   <!-- Begining of interceptor chain -->
+   <interceptor name=3D"Start" class=3D"org.jboss.cache.pojo.interceptors.=
PojoBeginInterceptor"
+                scope=3D"PER_INSTANCE">
+   </interceptor>
+
+   <!-- Check if we need a local tx for batch processing -->
+   <interceptor name=3D"Tx" class=3D"org.jboss.cache.pojo.interceptors.Poj=
oTxInterceptor"
+                scope=3D"PER_INSTANCE"/>
+
+   <!--
+      Mockup failed tx for testing. You will need to set PojoFailedTxMocku=
pInterceptor.setRollback(true)
+      to activate it.
+    -->
+   <interceptor name=3D"MockupTx" class=3D"org.jboss.cache.pojo.intercepto=
rs.PojoFailedTxMockupInterceptor"
+                scope=3D"PER_INSTANCE"/>
+
+   <!-- Perform parent level node locking -->
+   <interceptor name=3D"TxLock" class=3D"org.jboss.cache.pojo.interceptors=
.PojoTxLockInterceptor"
+                scope=3D"PER_INSTANCE"/>
+
+   <!-- Interceptor to perform Pojo level rollback -->
+   <interceptor name=3D"TxUndo" class=3D"org.jboss.cache.pojo.interceptors=
.PojoTxUndoSynchronizationInterceptor"
+                scope=3D"PER_INSTANCE"/>
+
+   <!-- Interceptor to used to check recursive field interception. -->
+   <interceptor name=3D"ReentrantToString" class=3D"org.jboss.cache.pojo.i=
nterceptors.MethodReentrancyStopperInterceptor"
+                scope=3D"PER_INSTANCE">
+               <attribute name=3D"MethodName">toString</attribute>
+   </interceptor>
+
+   <interceptor name=3D"ReentrantHashCode" class=3D"org.jboss.cache.pojo.i=
nterceptors.MethodReentrancyStopperInterceptor"
+                scope=3D"PER_INSTANCE">
+               <attribute name=3D"MethodName">hashCode</attribute>
+   </interceptor>
+
+   <!-- Whether to allow non-serializable pojo. Default is false. -->
+   <interceptor name=3D"MarshallNonSerializable"
+                class=3D"org.jboss.cache.pojo.interceptors.CheckNonSeriali=
zableInterceptor"
+                scope=3D"PER_INSTANCE">
+         <attribute name=3D"marshallNonSerializable">false</attribute>
+                </interceptor>
+
+   <!-- This defines the stack macro -->
+   <stack name=3D"Attach">
+      <interceptor-ref name=3D"Start"/>
+      <interceptor-ref name=3D"CheckId"/>
+      <interceptor-ref name=3D"MarshallNonSerializable"/>
+      <interceptor-ref name=3D"Tx"/>
+      <!-- NOTE: You can comment this out during production although leavi=
ng it here is OK. -->
+      <interceptor-ref name=3D"MockupTx"/>
+      <interceptor-ref name=3D"TxLock"/>
+      <interceptor-ref name=3D"TxUndo"/>
+   </stack>
+
+   <stack name=3D"Detach">
+      <interceptor-ref name=3D"Start"/>
+      <interceptor-ref name=3D"CheckId"/>
+      <interceptor-ref name=3D"Tx"/>
+      <!-- NOTE: You can comment this out during production although leavi=
ng it here is OK. -->
+      <interceptor-ref name=3D"MockupTx"/>
+      <interceptor-ref name=3D"TxLock"/>
+      <interceptor-ref name=3D"TxUndo"/>
+   </stack>
+
+   <stack name=3D"Find">
+      <interceptor-ref name=3D"Start"/>
+      <interceptor-ref name=3D"CheckId"/>
+   </stack>
+
+   <!--
+      The following section should be READ-ONLY!! It defines the annotatio=
n binding to the stack.
+   -->
+
+   <!-- This binds the jointpoint to specific in-memory operations. Curren=
tly in PojoUtil. -->
+   <bind pointcut=3D"execution(*
+      @org.jboss.cache.pojo.annotation.Reentrant->toString())">
+      <interceptor-ref name=3D"ReentrantToString"/>
+   </bind>
+
+   <bind pointcut=3D"execution(*
+      @org.jboss.cache.pojo.annotation.Reentrant->hashCode())">
+      <interceptor-ref name=3D"ReentrantHashCode"/>
+   </bind>
+
+   <bind pointcut=3D"execution(*
+      org.jboss.cache.pojo.impl.PojoUtil->@org.jboss.cache.pojo.annotation=
.TxUndo(..))">
+      <interceptor-ref name=3D"Undo"/>
+   </bind>
+
+   <bind pointcut=3D"execution(* org.jboss.cache.pojo.impl.PojoCacheImpl->=
@org.jboss.cache.pojo.annotation.Attach(..))">
+      <stack-ref name=3D"Attach"/>
+   </bind>
+
+   <bind pointcut=3D"execution(* org.jboss.cache.pojo.impl.PojoCacheImpl->=
@org.jboss.cache.pojo.annotation.Detach(..))">
+      <stack-ref name=3D"Detach"/>
+   </bind>
+
+   <bind pointcut=3D"execution(* org.jboss.cache.pojo.impl.PojoCacheImpl->=
@org.jboss.cache.pojo.annotation.Find(..))">
+      <stack-ref name=3D"Find"/>
+   </bind>
+
+
+   <!--
+      Following is declaration for JDK50 annotation. You use the specific =
annotation on your
+      POJO such that it can be instrumented. Idea is user will then need o=
nly to annotate like:
+        @org.jboss.cache.pojo.annotation.Replicable
+      in his POJO. There will be no need of jboss-aop.xml from user's side.
+      Note that this annotation is inheritant, meaning the subclass will be
+      instrumented as well.
+   -->
+
+   <!-- If a POJO has PojoCachable annotation, it will be asepectized. -->
+   <!--
+   Supports inheritance and polymorphism. It can either be a concrete class
+   or an interface. All sub-classes or interface implementors will be inst=
rumeneted.
+   -->
+   <prepare expr=3D"field(* $instanceof{@org.jboss.cache.pojo.annotation.R=
eplicable}->*)" />
+</aop>


Property changes on: benchmarks/trunk/lib/pojocache-aop.xml
___________________________________________________________________
Name: svn:executable
   + =


Added: benchmarks/trunk/lib/qdox.jar
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)


Property changes on: benchmarks/trunk/lib/qdox.jar
___________________________________________________________________
Name: svn:executable
   + =

Name: svn:mime-type
   + application/octet-stream

Added: benchmarks/trunk/lib/testng.jar
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)


Property changes on: benchmarks/trunk/lib/testng.jar
___________________________________________________________________
Name: svn:executable
   + =

Name: svn:mime-type
   + application/octet-stream

Added: benchmarks/trunk/lib/trove.jar
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)


Property changes on: benchmarks/trunk/lib/trove.jar
___________________________________________________________________
Name: svn:executable
   + =

Name: svn:mime-type
   + application/octet-stream

Added: benchmarks/trunk/lib/xercesImpl.jar
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)


Property changes on: benchmarks/trunk/lib/xercesImpl.jar
___________________________________________________________________
Name: svn:executable
   + =

Name: svn:mime-type
   + application/octet-stream

Added: benchmarks/trunk/obsolete/SessionTestCoherence.old
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- benchmarks/trunk/obsolete/SessionTestCoherence.old	                    =
    (rev 0)
+++ benchmarks/trunk/obsolete/SessionTestCoherence.old	2008-01-08 13:24:22 =
UTC (rev 5048)
@@ -0,0 +1,168 @@
+package perf;
+
+
+import com.tangosol.net.CacheFactory;
+import com.tangosol.net.NamedCache;
+import org.jboss.cache.transaction.DummyTransactionManager;
+import org.jgroups.util.Util;
+
+import javax.naming.Context;
+import javax.naming.InitialContext;
+import javax.naming.NamingException;
+import javax.transaction.SystemException;
+import javax.transaction.UserTransaction;
+import java.io.IOException;
+import java.util.Properties;
+
+/**
+ * @author Bela Ban
+ * @version $Id$
+ */
+public class SessionTestCoherence {
+    // private final Map<Integer,Session> sessions=3Dnew ConcurrentHashMap=
<Integer,Session>();
+    private final static String ROOT=3D"/SESSIONS/";
+    NamedCache cache=3Dnull;
+    CacheFactory factory;
+    UserTransaction tx;
+    int write_percentage=3D-1, read_percentage=3D-1;
+
+    private void start(int session_id, int num_requests, int num_attrs, in=
t size, int write_percentage) throws NamingException {
+        this.write_percentage=3Dwrite_percentage;
+        read_percentage=3D100 - write_percentage;
+        init(session_id, num_attrs, size);
+        loop(session_id, num_requests, num_attrs, size);
+    }
+
+    /** Create NUM_SESSIONS sessions with NUM_ATTRS attributes of SIZE siz=
e. Total size is multiplication of the 3 */
+    private void init(int session_id, int num_attrs, int size) throws Nami=
ngException {
+        DummyTransactionManager.getInstance();
+        Properties p =3D new Properties();
+        p.put(Context.INITIAL_CONTEXT_FACTORY, "org.jboss.cache.transactio=
n.DummyContextFactory");
+        tx=3D(UserTransaction)new InitialContext(p).lookup("UserTransactio=
n");
+
+        cache=3DCacheFactory.getReplicatedCache();
+
+        System.out.println("cache is " + cache);
+
+        input("Press enter to start");
+
+        for(int j=3D0; j < num_attrs; j++) {
+            cache.put(ROOT + session_id + "/" + j, new byte[size]);
+        }
+    }
+
+    private void loop(int session_id, int num_requests, int num_attrs, int=
 size) {
+        int random, attr_id;
+        long total_bytes_read=3D0, total_bytes_written=3D0, reads=3D0, wri=
tes=3D0;
+        int print=3Dnum_requests / 10;
+
+        System.out.println("*** accessing session \"" + session_id + "\"");
+        byte[] buf=3Dnull;
+        long start=3DSystem.currentTimeMillis();
+        for(int i=3D0; i < num_requests; i++) {
+            random=3D(int)Util.random(100);
+            attr_id=3D(int)Util.random(num_attrs -1);
+            if(random <=3D read_percentage) { // read
+                try {
+                    tx.begin();
+
+                    buf=3D(byte[])cache.get(ROOT + session_id + "/" + attr=
_id);
+                    total_bytes_read+=3Dbuf.length;
+                    reads++;
+                    tx.commit();
+                }
+                catch(Exception e) {
+                    try {tx.rollback();} catch(SystemException e1) {}
+                }
+            }
+            else {             // write
+                buf=3Dnew byte[size];
+                try {
+                    tx.begin();
+                    cache.put(ROOT + session_id + "/" + attr_id, buf);
+                    total_bytes_written+=3Dbuf.length;
+                    writes++;
+                    tx.commit();
+                }
+                catch(Exception e) {
+                    System.err.println("write failed, TX was rolled back");
+                }
+            }
+            if((reads + writes) % print =3D=3D 0)
+                System.out.println(reads + writes + " / " + num_requests);
+        }
+        long time=3DSystem.currentTimeMillis() - start;
+        long total=3Dreads + writes;
+        double requests_sec=3Dtotal / (time / 1000.0);
+        System.out.println(total + " requests (" + reads + " reads, " + wr=
ites + " writes): " +
+                requests_sec + " requests/sec");
+        System.out.println("bytes read: " + total_bytes_read + ", bytes wr=
itten: " + total_bytes_written);
+        input("Presss enter to stop");
+    }
+
+
+
+
+    private static void input(String msg) {
+        int c;
+        try {
+            System.in.skip(System.in.available());
+            System.out.println("\n" + msg);
+            c=3DSystem.in.read();
+        }
+        catch(IOException e) {
+        }
+    }
+
+    public static void main(String[] args) throws NamingException {
+        int session_id=3D-1;
+        int num_requests=3D1000;
+        int num_attrs=3D100;
+        int size=3D1000;
+        int write_percentage=3D20; // percent
+
+        for(int i=3D0; i < args.length; i++) {
+            if(args[i].equals("-id")) {
+                session_id=3DInteger.parseInt(args[++i]);
+                continue;
+            }
+            if(args[i].equals("-num_requests")) {
+                num_requests=3DInteger.parseInt(args[++i]);
+                continue;
+            }
+            if(args[i].equals("-num_attrs")) {
+                num_attrs=3DInteger.parseInt(args[++i]);
+                continue;
+            }
+            if(args[i].equals("-size")) {
+                size=3DInteger.parseInt(args[++i]);
+                continue;
+            }
+            if(args[i].equals("-write_percentage")) {
+                write_percentage=3DInteger.parseInt(args[++i]);
+                if(write_percentage < 0 || write_percentage > 100) {
+                    System.err.println("write_percentage (" + write_percen=
tage + ") has to be >=3D 0 && <=3D 100");
+                    return;
+                }
+                continue;
+            }
+            help();
+            return;
+        }
+
+        if(session_id < 0) {
+            help();
+            return;
+        }
+        new SessionTestCoherence().start(session_id, num_requests, num_att=
rs, size, write_percentage);
+    }
+
+    private static void help() {
+        System.out.println("SessionTestTC [-id <session ID>] [-num_request=
s <requests>] [-num_attrs <attrs>] " +
+                "[-size <bytes>] [-write_percentage <percentage, 0-100>] [=
-num_members <number>]");
+    }
+
+
+
+
+}
\ No newline at end of file

Added: benchmarks/trunk/obsolete/SessionTestJBC.java.old
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- benchmarks/trunk/obsolete/SessionTestJBC.java.old	                     =
   (rev 0)
+++ benchmarks/trunk/obsolete/SessionTestJBC.java.old	2008-01-08 13:24:22 U=
TC (rev 5048)
@@ -0,0 +1,223 @@
+package perf;
+
+import org.jboss.cache.Cache;
+import org.jboss.cache.DefaultCacheFactory;
+import org.jboss.cache.Fqn;
+import org.jboss.cache.Node;
+import org.jboss.cache.config.Configuration;
+import org.jboss.cache.notifications.annotation.CacheListener;
+import org.jboss.cache.notifications.annotation.ViewChanged;
+import org.jboss.cache.notifications.event.ViewChangedEvent;
+import org.jboss.cache.transaction.DummyTransactionManager;
+import org.jgroups.View;
+import org.jgroups.util.Util;
+
+import javax.naming.Context;
+import javax.naming.InitialContext;
+import javax.naming.NamingException;
+import javax.transaction.SystemException;
+import javax.transaction.UserTransaction;
+import java.io.IOException;
+import java.util.Properties;
+import java.util.Set;
+
+/**
+ * @author Bela Ban
+ * @version $Id$
+ */
+public class SessionTestJBC {
+    // private final Map<Integer,Session> sessions=3Dnew ConcurrentHashMap=
<Integer,Session>();
+    private final static String ROOT=3D"/SESSIONS/";
+    Cache cache=3Dnull;
+    UserTransaction tx;
+    int write_percentage=3D-1, read_percentage=3D-1;
+
+    private void start(int session_id, int num_requests, int num_attrs, in=
t size, int write_percentage) throws NamingException {
+        this.write_percentage=3Dwrite_percentage;
+        read_percentage=3D100 - write_percentage;
+        try {
+            init(session_id, num_attrs, size);
+            loop(session_id, num_requests, num_attrs, size);
+        }
+        finally {
+            if(cache !=3D null)
+                cache.stop();
+        }
+    }
+
+    /** Create NUM_SESSIONS sessions with NUM_ATTRS attributes of SIZE siz=
e. Total size is multiplication of the 3 */
+    private void init(int session_id, int num_attrs, int size) throws Nami=
ngException {
+        DummyTransactionManager.getInstance();
+        Properties p =3D new Properties();
+        p.put(Context.INITIAL_CONTEXT_FACTORY, "org.jboss.cache.transactio=
n.DummyContextFactory");
+        tx=3D(UserTransaction)new InitialContext(p).lookup("UserTransactio=
n");
+
+        cache=3Dnew DefaultCacheFactory().createCache("config.xml", false);
+        =

+        cache.start(); // includes state transfer
+        System.out.println("cache is " + cache);
+
+        if(cache.getConfiguration().getCacheMode() !=3D Configuration.Cach=
eMode.LOCAL) {
+            cache.addCacheListener(new MyCacheListener());
+            input("Press enter to start");
+        }
+
+        cache.put(Fqn.fromString(ROOT + session_id), null);
+
+        Node session=3Dcache.getRoot().getChild(Fqn.fromString(ROOT)).getC=
hild(Fqn.fromString(Integer.toString(session_id)));
+        for(int j=3D0; j < num_attrs; j++) {
+            session.putIfAbsent(j, new byte[size]);
+        }
+    }
+
+    private void loop(int session_id, int num_requests, int num_attrs, int=
 size) {
+        int random, attr_id;
+        long total_bytes_read=3D0, total_bytes_written=3D0, reads=3D0, wri=
tes=3D0;
+        int print=3Dnum_requests / 10;
+
+        Node session=3Dcache.getRoot().getChild(Fqn.fromString(ROOT)).getC=
hild(Fqn.fromString(Integer.toString(session_id)));
+        System.out.println("*** accessing session \"" + session_id + "\"");
+        byte[] buf=3Dnull;
+        long start=3DSystem.currentTimeMillis();
+        for(int i=3D0; i < num_requests; i++) {
+            random=3D(int)Util.random(100);
+            attr_id=3D(int)Util.random(num_attrs -1);
+            if(random <=3D read_percentage) { // read
+                try {
+                    tx.begin();
+                    buf=3D(byte[])session.get(attr_id);
+                    total_bytes_read+=3Dbuf.length;
+                    reads++;
+                    tx.commit();
+                }
+                catch(Exception e) {
+                    try {tx.rollback();} catch(SystemException e1) {}
+                }
+            }
+            else {             // write
+                buf=3Dnew byte[size];
+                try {
+                    tx.begin();
+                    session.put(attr_id, buf);
+                    total_bytes_written+=3Dbuf.length;
+                    writes++;
+                    tx.commit();
+                }
+                catch(Exception e) {
+                    System.err.println("write failed, TX was rolled back");
+                }
+            }
+            if((reads + writes) % print =3D=3D 0)
+                System.out.println(reads + writes + " / " + num_requests);
+        }
+        long time=3DSystem.currentTimeMillis() - start;
+        long total=3Dreads + writes;
+        double requests_sec=3Dtotal / (time / 1000.0);
+        System.out.println(total + " requests (" + reads + " reads, " + wr=
ites + " writes): " +
+                requests_sec + " requests/sec");
+        System.out.println("bytes read: " + total_bytes_read + ", bytes wr=
itten: " + total_bytes_written);
+
+       =

+
+        if(cache.getConfiguration().getCacheMode() !=3D Configuration.Cach=
eMode.LOCAL) {
+            input("Presss enter to stop");
+        }
+
+    }
+
+
+    private static String print(Cache cache) {
+        StringBuilder sb=3Dnew StringBuilder();
+        _print(cache.getRoot().getChild(Fqn.fromString(ROOT)), sb, 0);
+        return sb.toString();
+    }
+
+    private static void _print(Node node, StringBuilder sb, int indent) {
+        if(node =3D=3D null)
+            return;
+        for(int i=3D0; i < indent; i++)
+            sb.append(" ");
+        sb.append(node.getFqn().getLastElementAsString());
+        if(!node.getData().isEmpty())
+            sb.append(": ").append(node.getData());
+        sb.append("\n");
+        Set<Node> children=3Dnode.getChildren();
+        if(children !=3D null && !children.isEmpty()) {
+            for(Node child: children) {
+                _print(child, sb, indent +4);
+            }
+        }
+    }
+
+    private static void input(String msg) {
+        int c;
+        try {
+            System.in.skip(System.in.available());
+            System.out.println("\n" + msg);
+            c=3DSystem.in.read();
+        }
+        catch(IOException e) {
+        }
+    }
+
+    public static void main(String[] args) throws NamingException {
+        int session_id=3D-1;
+        int num_requests=3D1000;
+        int num_attrs=3D100;
+        int size=3D1000;
+        int write_percentage=3D20; // percent
+
+        for(int i=3D0; i < args.length; i++) {
+            if(args[i].equals("-id")) {
+                session_id=3DInteger.parseInt(args[++i]);
+                continue;
+            }
+            if(args[i].equals("-num_requests")) {
+                num_requests=3DInteger.parseInt(args[++i]);
+                continue;
+            }
+            if(args[i].equals("-num_attrs")) {
+                num_attrs=3DInteger.parseInt(args[++i]);
+                continue;
+            }
+            if(args[i].equals("-size")) {
+                size=3DInteger.parseInt(args[++i]);
+                continue;
+            }
+            if(args[i].equals("-write_percentage")) {
+                write_percentage=3DInteger.parseInt(args[++i]);
+                if(write_percentage < 0 || write_percentage > 100) {
+                    System.err.println("write_percentage (" + write_percen=
tage + ") has to be >=3D 0 && <=3D 100");
+                    return;
+                }
+                continue;
+            }
+            help();
+            return;
+        }
+
+        if(session_id < 0) {
+            help();
+            return;
+        }
+        new SessionTestJBC().start(session_id, num_requests, num_attrs, si=
ze, write_percentage);
+    }
+
+    private static void help() {
+        System.out.println("SessionTestTC [-id <session ID>] [-num_request=
s <requests>] [-num_attrs <attrs>] " +
+                "[-size <bytes>] [-write_percentage <percentage, 0-100>] [=
-num_members <number>]");
+    }
+
+
+    @CacheListener
+    public static class MyCacheListener {
+
+        @ViewChanged
+        public void viewChanged(ViewChangedEvent evt) {
+            View view=3Devt.getNewView();
+            System.out.println("-- view: " + view);
+        }
+
+    }
+
+}


Property changes on: benchmarks/trunk/obsolete/SessionTestJBC.java.old
___________________________________________________________________
Name: svn:executable
   + =


Added: benchmarks/trunk/obsolete/SessionTestPC.java.old
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- benchmarks/trunk/obsolete/SessionTestPC.java.old	                      =
  (rev 0)
+++ benchmarks/trunk/obsolete/SessionTestPC.java.old	2008-01-08 13:24:22 UT=
C (rev 5048)
@@ -0,0 +1,185 @@
+package perf;
+
+import org.jboss.cache.Cache;
+import org.jboss.cache.Fqn;
+import org.jboss.cache.Node;
+import org.jboss.cache.pojo.PojoCache;
+import org.jboss.cache.pojo.PojoCacheFactory;
+import org.jboss.cache.transaction.DummyTransactionManager;
+import org.jgroups.util.Util;
+
+import javax.naming.Context;
+import javax.naming.InitialContext;
+import javax.naming.NamingException;
+import javax.transaction.SystemException;
+import javax.transaction.UserTransaction;
+import java.util.Properties;
+import java.util.Set;
+
+import perf.pojocache.SessionPC;
+
+/**
+ * @author Bela Ban
+ * @version $Id$
+ */
+public class SessionTestPC {
+    // private final Map<Integer,Session> sessions=3Dnew ConcurrentHashMap=
<Integer,Session>();
+    private final static String ROOT=3D"/SESSIONS/";
+    PojoCache cache=3Dnull;
+    UserTransaction tx;
+
+    private void start(int session_id, int num_requests, int num_attrs, in=
t size) throws NamingException {
+        try {
+            init(session_id, num_attrs, size);
+            loop(session_id, num_requests, num_attrs, size);
+        }
+        finally {
+            if(cache !=3D null)
+                cache.stop();
+        }
+    }
+
+    /** Create NUM_SESSIONS sessions with NUM_ATTRS attributes of SIZE siz=
e. Total size is multiplication of the 3 */
+    private void init(int session_id, int num_attrs, int size) throws Nami=
ngException {
+
+        DummyTransactionManager.getInstance();
+        Properties p =3D new Properties();
+        p.put(Context.INITIAL_CONTEXT_FACTORY, "org.jboss.cache.transactio=
n.DummyContextFactory");
+        tx=3D(UserTransaction)new InitialContext(p).lookup("UserTransactio=
n");
+
+        cache=3DPojoCacheFactory.createCache("config.xml", true);
+        System.out.println("cache is " + cache);
+        Session session=3D(Session)cache.find(ROOT + session_id);
+        if(session =3D=3D null) {
+            session=3Dnew SessionPC();
+            cache.attach(ROOT + session_id, session);
+        }
+        for(int j=3D0; j < num_attrs; j++) {
+            byte[] buf=3Dsession.getAttribute(j);
+            if(buf =3D=3D null)
+                session.setAttribute(j, new byte[size]);
+        }
+    }
+
+    private void loop(int session_id, int num_requests, int num_attrs, int=
 size) {
+        int random, attr_id;
+        long total_bytes_read=3D0, total_bytes_written=3D0, reads=3D0, wri=
tes=3D0;
+        int print=3Dnum_requests / 10;
+        Session session=3D(Session)cache.find(ROOT + session_id);
+
+        System.out.println("*** accessing session \"" + session_id + "\"");
+        byte[] buf=3Dnull;
+        long start=3DSystem.currentTimeMillis();
+        for(int i=3D0; i < num_requests; i++) {
+            random=3D(int)Util.random(100);
+            attr_id=3D(int)Util.random(num_attrs -1);
+            if(random <=3D 80) { // read
+                try {
+                    tx.begin();
+                    buf=3Dsession.getAttribute(attr_id);
+                    total_bytes_read+=3Dbuf.length;
+                    reads++;
+                    tx.commit();
+                }
+                catch(Exception e) {
+                    try {tx.rollback();} catch(SystemException e1) {}
+                }
+            }
+            else {             // write
+                buf=3Dnew byte[size];
+                try {
+                    tx.begin();
+                    session.setAttribute(attr_id, buf);
+                    total_bytes_written+=3Dbuf.length;
+                    writes++;
+                    tx.commit();
+                }
+                catch(Exception e) {
+                    System.err.println("write failed, TX was rolled back");
+                }
+            }
+            if((reads + writes) % print =3D=3D 0)
+                System.out.println(reads + writes + " / " + num_requests);
+        }
+        long time=3DSystem.currentTimeMillis() - start;
+        long total=3Dreads + writes;
+        double requests_sec=3Dtotal / (time / 1000.0);
+        System.out.println(total + " requests (" + reads + " reads, " + wr=
ites + " writes): " +
+                requests_sec + " requests/sec");
+        System.out.println("bytes read: " + total_bytes_read + ", bytes wr=
itten: " + total_bytes_written);
+
+        Cache c=3Dcache.getCache();
+        try {
+            tx.begin();
+            System.out.println("cache contents:\n" + print(c));
+            tx.commit();
+        }
+        catch(Exception e) {
+        }
+    }
+
+
+    private static String print(Cache cache) {
+        StringBuilder sb=3Dnew StringBuilder();
+        _print(cache.getRoot().getChild(Fqn.fromString(ROOT)), sb, 0);
+        return sb.toString();
+    }
+
+    private static void _print(Node node, StringBuilder sb, int indent) {
+        if(node =3D=3D null)
+            return;
+        for(int i=3D0; i < indent; i++)
+            sb.append(" ");
+        sb.append(node.getFqn().getLastElementAsString());
+        if(!node.getData().isEmpty())
+            sb.append(": ").append(node.getData());
+        sb.append("\n");
+        Set<Node> children=3Dnode.getChildren();
+        if(children !=3D null && !children.isEmpty()) {
+            for(Node child: children) {
+                _print(child, sb, indent +4);
+            }
+        }
+    }
+
+
+    public static void main(String[] args) throws NamingException {
+        int session_id=3D-1;
+        int num_requests=3D1000;
+        int num_attrs=3D100;
+        int size=3D1000;
+
+        for(int i=3D0; i < args.length; i++) {
+            if(args[i].equals("-id")) {
+                session_id=3DInteger.parseInt(args[++i]);
+                continue;
+            }
+            if(args[i].equals("-num_requests")) {
+                num_requests=3DInteger.parseInt(args[++i]);
+                continue;
+            }
+            if(args[i].equals("-num_attrs")) {
+                num_attrs=3DInteger.parseInt(args[++i]);
+                continue;
+            }
+            if(args[i].equals("-size")) {
+                size=3DInteger.parseInt(args[++i]);
+                continue;
+            }
+            help();
+            return;
+        }
+
+        if(session_id < 0) {
+            help();
+            return;
+        }
+        new SessionTestPC().start(session_id, num_requests, num_attrs, siz=
e);
+    }
+
+    private static void help() {
+        System.out.println("SessionTestTC [-id <session ID>] [-num_request=
s <requests>] [-num_attrs <attrs>] [-size <bytes>]");
+    }
+
+
+}


Property changes on: benchmarks/trunk/obsolete/SessionTestPC.java.old
___________________________________________________________________
Name: svn:executable
   + =


Added: benchmarks/trunk/obsolete/SessionTestTC.java.old
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- benchmarks/trunk/obsolete/SessionTestTC.java.old	                      =
  (rev 0)
+++ benchmarks/trunk/obsolete/SessionTestTC.java.old	2008-01-08 13:24:22 UT=
C (rev 5048)
@@ -0,0 +1,114 @@
+package perf;
+
+import org.jgroups.util.Util;
+
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
+import perf.terracotta.SessionTC;
+
+/**
+ * @author Bela Ban
+ * @version $Id$
+ */
+public class SessionTestTC {
+    private final Map<Integer,Session> sessions=3Dnew ConcurrentHashMap<In=
teger,Session>();
+
+    private void start(int session_id, int num_requests, int num_attrs, in=
t size) {
+        init(session_id, num_attrs, size);
+        loop(session_id, num_requests, num_attrs, size);
+    }
+
+    /** Create NUM_SESSIONS sessions with NUM_ATTRS attributes of SIZE siz=
e. Total size is multiplication of the 3 */
+    private void init(int session_id, int num_attrs, int size) {
+        Session session=3Dsessions.get(session_id);
+        if(session =3D=3D null) {
+            session=3Dnew SessionTC();
+            sessions.put(session_id, session);
+        }
+        for(int j=3D0; j < num_attrs; j++) {
+            byte[] buf=3Dsession.getAttribute(j);
+            if(buf =3D=3D null)
+                session.setAttribute(j, new byte[size]);
+        }
+    }
+
+    private void loop(int session_id, int num_requests, int num_attrs, int=
 size) {
+        int random, attr_id;
+        long total_bytes_read=3D0, total_bytes_written=3D0, reads=3D0, wri=
tes=3D0;
+        int print=3Dnum_requests / 10;
+        Session session=3Dsessions.get(session_id);
+
+        System.out.println("*** accessing session \"" + session_id + "\"");
+        long start=3DSystem.currentTimeMillis();
+        for(int i=3D0; i < num_requests; i++) {
+            random=3D(int)Util.random(100);
+            attr_id=3D(int)Util.random(num_attrs -1);
+            if(random <=3D 80) { // read
+                synchronized(session) {
+                    byte[] buf=3Dsession.getAttribute(attr_id);
+                    total_bytes_read+=3Dbuf.length;
+                    reads++;
+                }
+
+            }
+            else {             // write
+                byte[] buf=3Dnew byte[size];
+                synchronized(session) {
+                    session.setAttribute(attr_id, buf);
+                    total_bytes_written+=3Dbuf.length;
+                    writes++;
+                }
+            }
+            if((reads + writes) % print =3D=3D 0)
+                System.out.println(reads + writes + " / " + num_requests);
+        }
+        long time=3DSystem.currentTimeMillis() - start;
+        long total=3Dreads + writes;
+        double requests_sec=3Dtotal / (time / 1000.0);
+        System.out.println(total + " requests (" + reads + " reads, " + wr=
ites + " writes): " +
+                requests_sec + " requests/sec");
+        System.out.println("bytes read: " + total_bytes_read + ", bytes wr=
itten: " + total_bytes_written);
+    }
+
+
+    public static void main(String[] args) {
+        int session_id=3D-1;
+        int num_requests=3D1000;
+        int num_attrs=3D100;
+        int size=3D1000;
+
+        for(int i=3D0; i < args.length; i++) {
+            if(args[i].equals("-id")) {
+                session_id=3DInteger.parseInt(args[++i]);
+                continue;
+            }
+            if(args[i].equals("-num_requests")) {
+                num_requests=3DInteger.parseInt(args[++i]);
+                continue;
+            }
+            if(args[i].equals("-num_attrs")) {
+                num_attrs=3DInteger.parseInt(args[++i]);
+                continue;
+            }
+            if(args[i].equals("-size")) {
+                size=3DInteger.parseInt(args[++i]);
+                continue;
+            }
+            help();
+            return;
+        }
+
+        if(session_id < 0) {
+            help();
+            return;
+        }
+        new SessionTestTC().start(session_id, num_requests, num_attrs, siz=
e);
+    }
+
+    private static void help() {
+        System.out.println("SessionTestTC [-id <session ID>] [-num_request=
s <requests>] [-num_attrs <attrs>] [-size <bytes>]");
+    }
+
+
+}


Property changes on: benchmarks/trunk/obsolete/SessionTestTC.java.old
___________________________________________________________________
Name: svn:executable
   + =


Added: benchmarks/trunk/pc.sh
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- benchmarks/trunk/pc.sh	                        (rev 0)
+++ benchmarks/trunk/pc.sh	2008-01-08 13:24:22 UTC (rev 5048)
@@ -0,0 +1,10 @@
+
+
+for i in lib/*.jar
+do
+    CP=3D$CP:${i}
+done
+
+CP=3D./classes:$CP
+
+java  -Dlog4j.configuration=3Dfile:${HOME}/log4j.properties -Djgroups.bind=
_addr=3D192.168.2.5 -classpath ${CP} -javaagent:lib/jboss-aop.jar -Djboss.a=
op.path=3D./pojocache-aop.xml perf.SessionTest -factory perf.pojocache.Sess=
ionFactoryPC -num_requests 100000 -num_attrs 100 -size 1000 -id 1 $*


Property changes on: benchmarks/trunk/pc.sh
___________________________________________________________________
Name: svn:executable
   + =


Added: benchmarks/trunk/pojocache-aop.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- benchmarks/trunk/pojocache-aop.xml	                        (rev 0)
+++ benchmarks/trunk/pojocache-aop.xml	2008-01-08 13:24:22 UTC (rev 5048)
@@ -0,0 +1,146 @@
+<?xml version=3D"1.0" encoding=3D"UTF-8"?>
+<!--
+    This is the PojoCache configuration file that specifies:
+      1. Interceptor stack for API
+      2. Annotation binding for POJO (via "prepare" element)
+
+    Basically, this is a variant of jboss-aop.xml. Note that
+    except for the customization of interceptor stack, you should
+    not need to modify this file.
+
+    To run PojoCache, you will need to define a system property:
+    jboss.aop.path that contains the path to this file such that JBoss Aop
+    can locate it.
+-->
+<aop>
+
+   <!--
+   This defines the PojoCache 2.0 interceptor stack. Unless necessary, don=
't modify the stack here!
+   -->
+
+   <!-- Check id range validity -->
+   <interceptor name=3D"CheckId" class=3D"org.jboss.cache.pojo.interceptor=
s.CheckIdInterceptor"
+                scope=3D"PER_INSTANCE"/>
+
+   <!-- Track Tx undo operation -->
+   <interceptor name=3D"Undo" class=3D"org.jboss.cache.pojo.interceptors.P=
ojoTxUndoInterceptor"
+                scope=3D"PER_INSTANCE"/>
+
+   <!-- Begining of interceptor chain -->
+   <interceptor name=3D"Start" class=3D"org.jboss.cache.pojo.interceptors.=
PojoBeginInterceptor"
+                scope=3D"PER_INSTANCE">
+   </interceptor>
+
+   <!-- Check if we need a local tx for batch processing -->
+   <interceptor name=3D"Tx" class=3D"org.jboss.cache.pojo.interceptors.Poj=
oTxInterceptor"
+                scope=3D"PER_INSTANCE"/>
+
+   <!--
+      Mockup failed tx for testing. You will need to set PojoFailedTxMocku=
pInterceptor.setRollback(true)
+      to activate it.
+    -->
+   <interceptor name=3D"MockupTx" class=3D"org.jboss.cache.pojo.intercepto=
rs.PojoFailedTxMockupInterceptor"
+                scope=3D"PER_INSTANCE"/>
+
+   <!-- Perform parent level node locking -->
+   <interceptor name=3D"TxLock" class=3D"org.jboss.cache.pojo.interceptors=
.PojoTxLockInterceptor"
+                scope=3D"PER_INSTANCE"/>
+
+   <!-- Interceptor to perform Pojo level rollback -->
+   <interceptor name=3D"TxUndo" class=3D"org.jboss.cache.pojo.interceptors=
.PojoTxUndoSynchronizationInterceptor"
+                scope=3D"PER_INSTANCE"/>
+
+   <!-- Interceptor to used to check recursive field interception. -->
+   <interceptor name=3D"ReentrantToString" class=3D"org.jboss.cache.pojo.i=
nterceptors.MethodReentrancyStopperInterceptor"
+                scope=3D"PER_INSTANCE">
+               <attribute name=3D"MethodName">toString</attribute>
+   </interceptor>
+
+   <interceptor name=3D"ReentrantHashCode" class=3D"org.jboss.cache.pojo.i=
nterceptors.MethodReentrancyStopperInterceptor"
+                scope=3D"PER_INSTANCE">
+               <attribute name=3D"MethodName">hashCode</attribute>
+   </interceptor>
+
+   <!-- Whether to allow non-serializable pojo. Default is false. -->
+   <interceptor name=3D"MarshallNonSerializable"
+                class=3D"org.jboss.cache.pojo.interceptors.CheckNonSeriali=
zableInterceptor"
+                scope=3D"PER_INSTANCE">
+         <attribute name=3D"marshallNonSerializable">false</attribute>
+                </interceptor>
+
+   <!-- This defines the stack macro -->
+   <stack name=3D"Attach">
+      <interceptor-ref name=3D"Start"/>
+      <interceptor-ref name=3D"CheckId"/>
+      <interceptor-ref name=3D"MarshallNonSerializable"/>
+      <interceptor-ref name=3D"Tx"/>
+      <!-- NOTE: You can comment this out during production although leavi=
ng it here is OK. -->
+      <interceptor-ref name=3D"MockupTx"/>
+      <interceptor-ref name=3D"TxLock"/>
+      <interceptor-ref name=3D"TxUndo"/>
+   </stack>
+
+   <stack name=3D"Detach">
+      <interceptor-ref name=3D"Start"/>
+      <interceptor-ref name=3D"CheckId"/>
+      <interceptor-ref name=3D"Tx"/>
+      <!-- NOTE: You can comment this out during production although leavi=
ng it here is OK. -->
+      <interceptor-ref name=3D"MockupTx"/>
+      <interceptor-ref name=3D"TxLock"/>
+      <interceptor-ref name=3D"TxUndo"/>
+   </stack>
+
+   <stack name=3D"Find">
+      <interceptor-ref name=3D"Start"/>
+      <interceptor-ref name=3D"CheckId"/>
+   </stack>
+
+   <!--
+      The following section should be READ-ONLY!! It defines the annotatio=
n binding to the stack.
+   -->
+
+   <!-- This binds the jointpoint to specific in-memory operations. Curren=
tly in PojoUtil. -->
+   <bind pointcut=3D"execution(*
+      @org.jboss.cache.pojo.annotation.Reentrant->toString())">
+      <interceptor-ref name=3D"ReentrantToString"/>
+   </bind>
+
+   <bind pointcut=3D"execution(*
+      @org.jboss.cache.pojo.annotation.Reentrant->hashCode())">
+      <interceptor-ref name=3D"ReentrantHashCode"/>
+   </bind>
+
+   <bind pointcut=3D"execution(*
+      org.jboss.cache.pojo.impl.PojoUtil->@org.jboss.cache.pojo.annotation=
.TxUndo(..))">
+      <interceptor-ref name=3D"Undo"/>
+   </bind>
+
+   <bind pointcut=3D"execution(* org.jboss.cache.pojo.impl.PojoCacheImpl->=
@org.jboss.cache.pojo.annotation.Attach(..))">
+      <stack-ref name=3D"Attach"/>
+   </bind>
+
+   <bind pointcut=3D"execution(* org.jboss.cache.pojo.impl.PojoCacheImpl->=
@org.jboss.cache.pojo.annotation.Detach(..))">
+      <stack-ref name=3D"Detach"/>
+   </bind>
+
+   <bind pointcut=3D"execution(* org.jboss.cache.pojo.impl.PojoCacheImpl->=
@org.jboss.cache.pojo.annotation.Find(..))">
+      <stack-ref name=3D"Find"/>
+   </bind>
+
+
+   <!--
+      Following is declaration for JDK50 annotation. You use the specific =
annotation on your
+      POJO such that it can be instrumented. Idea is user will then need o=
nly to annotate like:
+        @org.jboss.cache.pojo.annotation.Replicable
+      in his POJO. There will be no need of jboss-aop.xml from user's side.
+      Note that this annotation is inheritant, meaning the subclass will be
+      instrumented as well.
+   -->
+
+   <!-- If a POJO has PojoCachable annotation, it will be asepectized. -->
+   <!--
+   Supports inheritance and polymorphism. It can either be a concrete class
+   or an interface. All sub-classes or interface implementors will be inst=
rumeneted.
+   -->
+   <prepare expr=3D"field(* $instanceof{@org.jboss.cache.pojo.annotation.R=
eplicable}->*)" />
+</aop>


Property changes on: benchmarks/trunk/pojocache-aop.xml
___________________________________________________________________
Name: svn:executable
   + =


Added: benchmarks/trunk/run.sh
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- benchmarks/trunk/run.sh	                        (rev 0)
+++ benchmarks/trunk/run.sh	2008-01-08 13:24:22 UTC (rev 5048)
@@ -0,0 +1,10 @@
+
+
+for i in lib/*.jar
+do =

+    CP=3D$CP:${i}
+done
+
+CP=3D./classes:$CP
+
+java  -Dlog4j.configuration=3Dfile:${HOME}/log4j.properties -Djgroups.bind=
_addr=3D192.168.2.5 -classpath ${CP} perf.SessionTest -num_requests 100000 =
-num_attrs 100 -size 1000 -id 1 $*


Property changes on: benchmarks/trunk/run.sh
___________________________________________________________________
Name: svn:executable
   + =


Added: benchmarks/trunk/src/perf/Session.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- benchmarks/trunk/src/perf/Session.java	                        (rev 0)
+++ benchmarks/trunk/src/perf/Session.java	2008-01-08 13:24:22 UTC (rev 504=
8)
@@ -0,0 +1,12 @@
+package perf;
+
+
+/**
+ * @author Bela Ban
+ * @version $Id$
+ */
+public interface Session {
+    void setAttribute(int id, byte[] val);
+    byte[] getAttribute(int id);
+    String toString();
+}


Property changes on: benchmarks/trunk/src/perf/Session.java
___________________________________________________________________
Name: svn:executable
   + =


Added: benchmarks/trunk/src/perf/SessionFactory.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- benchmarks/trunk/src/perf/SessionFactory.java	                        (=
rev 0)
+++ benchmarks/trunk/src/perf/SessionFactory.java	2008-01-08 13:24:22 UTC (=
rev 5048)
@@ -0,0 +1,12 @@
+package perf;
+
+/**
+ * @author Bela Ban
+ * @version $Id$
+ */
+public interface SessionFactory {
+    void init();
+    void destroy();
+    Session createSession(int session_id);
+    void destroySession(Session session);
+}

Added: benchmarks/trunk/src/perf/SessionTest.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- benchmarks/trunk/src/perf/SessionTest.java	                        (rev=
 0)
+++ benchmarks/trunk/src/perf/SessionTest.java	2008-01-08 13:24:22 UTC (rev=
 5048)
@@ -0,0 +1,196 @@
+package perf;
+
+import org.jboss.cache.transaction.DummyTransactionManager;
+import org.jgroups.util.Util;
+
+import javax.naming.Context;
+import javax.naming.InitialContext;
+import javax.naming.NamingException;
+import javax.transaction.SystemException;
+import javax.transaction.UserTransaction;
+import java.util.Properties;
+import java.io.IOException;
+
+/**
+ * @author Bela Ban
+ * @version $Id$
+ */
+public class SessionTest {
+    private UserTransaction tx;
+    int write_percentage=3D-1, read_percentage=3D-1;
+
+
+    private void start(String factory_class, int session_id, int num_reque=
sts,
+                       int num_attrs, int size, int write_percentage) thro=
ws ClassNotFoundException, IllegalAccessException,
+                                                                          =
   InstantiationException, NamingException {
+        this.write_percentage=3Dwrite_percentage;
+        read_percentage=3D100 - write_percentage;
+
+        SessionFactory factory=3Dnull;
+        try {
+            factory=3D(SessionFactory)Class.forName(factory_class).newInst=
ance();
+        }
+        catch(InstantiationException e) {
+            System.err.println("Class '" + factory_class + "' could not be=
 created, you probably need to define " +
+                    "an empty public constructor");
+            return;
+        }
+        catch(IllegalAccessException e) {
+            e.printStackTrace();
+        }
+        catch(ClassNotFoundException e) {
+            System.err.println("Class '" + factory_class + " was not found=
, please specify the absolute classname " +
+                    "with \"-factory\"");
+            return;
+        }
+
+        Session session=3Dnull;
+        DummyTransactionManager.getInstance();
+        Properties p =3D new Properties();
+        p.put(Context.INITIAL_CONTEXT_FACTORY, "org.jboss.cache.transactio=
n.DummyContextFactory");
+        tx=3D(UserTransaction)new InitialContext(p).lookup("UserTransactio=
n");
+
+        try {
+            if(factory =3D=3D null)
+                throw new NullPointerException("factory is null");
+            factory.init();
+            session=3Dfactory.createSession(session_id);
+            input("Press enter to start");
+            init(session, num_attrs, size);
+            loop(session, session_id, num_requests, num_attrs, size);
+            input("Press enter to stop");
+        }
+        finally {
+            if(factory !=3D null) {
+                factory.destroySession(session);
+                factory.destroy();
+            }
+        }
+    }
+
+    /** Create NUM_SESSIONS sessions with NUM_ATTRS attributes of SIZE siz=
e. Total size is multiplication of the 3 */
+    private static void init(Session session, int num_attrs, int size) thr=
ows NamingException {
+        for(int j=3D0; j < num_attrs; j++) {
+            byte[] buf=3Dsession.getAttribute(j);
+            if(buf =3D=3D null)
+                session.setAttribute(j, new byte[size]);
+        }
+    }
+
+    private void loop(Session session, int session_id, int num_requests, i=
nt num_attrs, int size) {
+        int random, attr_id;
+        long total_bytes_read=3D0, total_bytes_written=3D0, reads=3D0, wri=
tes=3D0;
+        int print=3Dnum_requests / 10;
+
+        System.out.println("*** accessing session \"" + session_id + "\"");
+        byte[] buf=3Dnull;
+        long start=3DSystem.currentTimeMillis();
+        for(int i=3D0; i < num_requests; i++) {
+            random=3D(int)Util.random(100);
+            attr_id=3D(int)Util.random(num_attrs -1);
+            if(random <=3D read_percentage) { // read
+                try {
+                    tx.begin();
+                    buf=3Dsession.getAttribute(attr_id);
+                    total_bytes_read+=3Dbuf.length;
+                    reads++;
+                    tx.commit();
+                }
+                catch(Exception e) {
+                    try {tx.rollback();} catch(SystemException e1) {}
+                }
+            }
+            else {             // write
+                buf=3Dnew byte[size];
+                try {
+                    tx.begin();
+                    session.setAttribute(attr_id, buf);
+                    total_bytes_written+=3Dbuf.length;
+                    writes++;
+                    tx.commit();
+                }
+                catch(Exception e) {
+                    System.err.println("write failed, TX was rolled back");
+                }
+            }
+            if((reads + writes) % print =3D=3D 0)
+                System.out.println(reads + writes + " / " + num_requests);
+        }
+        long time=3DSystem.currentTimeMillis() - start;
+        long total=3Dreads + writes;
+        double requests_sec=3Dtotal / (time / 1000.0);
+        System.out.println(total + " requests (" + reads + " reads, " + wr=
ites + " writes): " +
+                requests_sec + " requests/sec");
+        System.out.println("bytes read: " + total_bytes_read + ", bytes wr=
itten: " + total_bytes_written);
+    }
+
+
+    private static void input(String msg) {
+        try {
+            System.in.skip(System.in.available());
+            System.out.println("\n" + msg);
+            System.in.read();
+        }
+        catch(IOException e) {
+        }
+    }
+
+
+   =

+
+
+    public static void main(String[] args) throws Exception {
+        int session_id=3D-1;
+        int num_requests=3D1000;
+        int num_attrs=3D100;
+        int size=3D1000;
+        int write_percentage=3D20; // percent
+        String factory=3D"perf.jbosscache.SessionFactoryJBC";
+
+        for(int i=3D0; i < args.length; i++) {
+            if(args[i].equals("-id")) {
+                session_id=3DInteger.parseInt(args[++i]);
+                continue;
+            }
+            if(args[i].equals("-num_requests")) {
+                num_requests=3DInteger.parseInt(args[++i]);
+                continue;
+            }
+            if(args[i].equals("-num_attrs")) {
+                num_attrs=3DInteger.parseInt(args[++i]);
+                continue;
+            }
+            if(args[i].equals("-size")) {
+                size=3DInteger.parseInt(args[++i]);
+                continue;
+            }
+            if(args[i].equals("-write_percentage")) {
+                write_percentage=3DInteger.parseInt(args[++i]);
+                if(write_percentage < 0 || write_percentage > 100) {
+                    System.err.println("write_percentage (" + write_percen=
tage + ") has to be >=3D 0 && <=3D 100");
+                    return;
+                }
+                continue;
+            }
+            if(args[i].equals("-factory")) {
+                factory=3Dargs[++i];
+                continue;
+            }
+            help();
+            return;
+        }
+
+        if(session_id < 0) {
+            help();
+            return;
+        }
+        new SessionTest().start(factory, session_id, num_requests, num_att=
rs, size, write_percentage);
+    }
+
+    private static void help() {
+        System.out.println("SessionTest [-factory <classname>] [-id <sessi=
on ID>] [-num_requests <requests>] " +
+                "[-num_attrs <attrs>] [-size <bytes>] [-write_percentage <=
percentage, 0-100>]");
+    }
+
+
+}
\ No newline at end of file

Added: benchmarks/trunk/src/perf/coherence/SessionCoherence.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- benchmarks/trunk/src/perf/coherence/SessionCoherence.java	             =
           (rev 0)
+++ benchmarks/trunk/src/perf/coherence/SessionCoherence.java	2008-01-08 13=
:24:22 UTC (rev 5048)
@@ -0,0 +1,24 @@
+package perf.coherence;
+
+import perf.Session;
+import com.tangosol.net.NamedCache;
+
+/**
+ * @author Bela Ban
+ * @version $Id$
+ */
+public class SessionCoherence implements Session {
+    private final NamedCache cache;
+
+    public SessionCoherence(NamedCache cache) {
+        this.cache=3Dcache;
+    }
+
+    public void setAttribute(int id, byte[] val) {
+        cache.put(id, val);
+    }
+
+    public byte[] getAttribute(int id) {
+        return (byte[])cache.get(id);
+    }
+}

Added: benchmarks/trunk/src/perf/coherence/SessionFactoryCoherence.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- benchmarks/trunk/src/perf/coherence/SessionFactoryCoherence.java	      =
                  (rev 0)
+++ benchmarks/trunk/src/perf/coherence/SessionFactoryCoherence.java	2008-0=
1-08 13:24:22 UTC (rev 5048)
@@ -0,0 +1,26 @@
+package perf.coherence;
+
+import perf.SessionFactory;
+import perf.Session;
+import com.tangosol.net.CacheFactory;
+import com.tangosol.net.NamedCache;
+
+/**
+ * @author Bela Ban
+ * @version $Id$
+ */
+public class SessionFactoryCoherence implements SessionFactory {
+    public void init() {
+    }
+
+    public void destroy() {
+    }
+
+    public Session createSession(int session_id) {
+        NamedCache cache=3DCacheFactory.getReplicatedCache();
+        return new SessionCoherence(cache);
+    }
+
+    public void destroySession(Session session) {
+    }
+}

Added: benchmarks/trunk/src/perf/jbosscache/SessionFactoryJBC.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- benchmarks/trunk/src/perf/jbosscache/SessionFactoryJBC.java	           =
             (rev 0)
+++ benchmarks/trunk/src/perf/jbosscache/SessionFactoryJBC.java	2008-01-08 =
13:24:22 UTC (rev 5048)
@@ -0,0 +1,59 @@
+package perf.jbosscache;
+
+import perf.SessionFactory;
+import perf.Session;
+import org.jboss.cache.Cache;
+import org.jboss.cache.DefaultCacheFactory;
+import org.jboss.cache.Fqn;
+import org.jboss.cache.Node;
+import org.jboss.cache.notifications.annotation.CacheListener;
+import org.jboss.cache.notifications.annotation.ViewChanged;
+import org.jboss.cache.notifications.event.ViewChangedEvent;
+import org.jboss.cache.config.Configuration;
+import org.jgroups.View;
+
+/**
+ * @author Bela Ban
+ * @version $Id$
+ */
+public class SessionFactoryJBC implements SessionFactory {
+    private final static String ROOT=3D"/SESSIONS/";
+    private Cache cache=3Dnull;
+
+
+    public void init() {
+        cache=3Dnew DefaultCacheFactory().createCache("config.xml", false);
+        if(cache.getConfiguration().getCacheMode() !=3D Configuration.Cach=
eMode.LOCAL) {
+            cache.addCacheListener(new MyCacheListener());
+        }
+
+        cache.start(); // includes state transfer
+        System.out.println("cache is " + cache);
+    }
+
+    public void destroy() {
+        if(cache !=3D null)
+            cache.stop();
+    }
+
+    public Session createSession(int session_id) {
+        cache.put(Fqn.fromString(ROOT + session_id), null);
+        Node node=3Dcache.getRoot().getChild(Fqn.fromString(ROOT)).getChil=
d(Fqn.fromString(Integer.toString(session_id)));
+        return new SessionJBC(node);
+    }
+
+    public void destroySession(Session session) {
+    }
+
+
+    @CacheListener
+    public static class MyCacheListener {
+
+        @ViewChanged
+        public void viewChanged(ViewChangedEvent evt) {
+            View view=3Devt.getNewView();
+            System.out.println("-- view: " + view);
+        }
+
+    }
+}

Added: benchmarks/trunk/src/perf/jbosscache/SessionJBC.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- benchmarks/trunk/src/perf/jbosscache/SessionJBC.java	                  =
      (rev 0)
+++ benchmarks/trunk/src/perf/jbosscache/SessionJBC.java	2008-01-08 13:24:2=
2 UTC (rev 5048)
@@ -0,0 +1,24 @@
+package perf.jbosscache;
+
+import perf.Session;
+import org.jboss.cache.Node;
+
+/**
+ * @author Bela Ban
+ * @version $Id$
+ */
+public class SessionJBC implements Session {
+    private final Node node;
+
+    public SessionJBC(Node node) {
+        this.node=3Dnode;
+    }
+
+    public void setAttribute(int id, byte[] val) {
+        node.put(id, val);
+    }
+
+    public byte[] getAttribute(int id) {
+        return (byte[])node.get(id);
+    }
+}

Added: benchmarks/trunk/src/perf/pojocache/SessionFactoryPC.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- benchmarks/trunk/src/perf/pojocache/SessionFactoryPC.java	             =
           (rev 0)
+++ benchmarks/trunk/src/perf/pojocache/SessionFactoryPC.java	2008-01-08 13=
:24:22 UTC (rev 5048)
@@ -0,0 +1,81 @@
+package perf.pojocache;
+
+import org.jboss.cache.pojo.PojoCache;
+import org.jboss.cache.pojo.PojoCacheFactory;
+import org.jboss.cache.Cache;
+import org.jboss.cache.Fqn;
+import org.jboss.cache.Node;
+import org.jboss.cache.config.Configuration;
+import perf.Session;
+import perf.SessionFactory;
+import perf.jbosscache.SessionFactoryJBC;
+
+import java.util.Set;
+
+/**
+ * @author Bela Ban
+ * @version $Id$
+ */
+public class SessionFactoryPC implements SessionFactory {
+    private final static String ROOT=3D"/SESSIONS/";
+    private PojoCache cache=3Dnull;
+
+    =

+    public SessionFactoryPC() {
+
+    }
+
+    public void init() {
+        cache=3DPojoCacheFactory.createCache("config.xml", false);
+        Cache c=3Dcache.getCache();
+        if(c.getConfiguration().getCacheMode() !=3D Configuration.CacheMod=
e.LOCAL) {
+            c.addCacheListener(new SessionFactoryJBC.MyCacheListener());
+        }
+        cache.start();
+        System.out.println("cache is " + cache);
+    }
+
+
+    public void destroy() {
+        if(cache !=3D null)
+            cache.stop();
+    }
+
+    public Session createSession(int session_id) {
+        SessionPC session=3D(SessionPC)cache.find(ROOT + session_id);
+        if(session =3D=3D null) {
+            session=3Dnew SessionPC();
+            cache.attach(ROOT + session_id, session);
+        }
+        return session;
+    }
+
+    public void destroySession(Session session) {
+        Cache c=3Dcache.getCache();
+        System.out.println("cache contents:\n" + print(c));
+    }
+    =

+
+    private static String print(Cache cache) {
+        StringBuilder sb=3Dnew StringBuilder();
+        _print(cache.getRoot().getChild(Fqn.fromString(ROOT)), sb, 0);
+        return sb.toString();
+    }
+
+    private static void _print(Node node, StringBuilder sb, int indent) {
+        if(node =3D=3D null)
+            return;
+        for(int i=3D0; i < indent; i++)
+            sb.append(" ");
+        sb.append(node.getFqn().getLastElementAsString());
+        if(!node.getData().isEmpty())
+            sb.append(": ").append(node.getData());
+        sb.append("\n");
+        Set<Node> children=3Dnode.getChildren();
+        if(children !=3D null && !children.isEmpty()) {
+            for(Node child: children) {
+                _print(child, sb, indent +4);
+            }
+        }
+    }
+}

Added: benchmarks/trunk/src/perf/pojocache/SessionPC.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- benchmarks/trunk/src/perf/pojocache/SessionPC.java	                    =
    (rev 0)
+++ benchmarks/trunk/src/perf/pojocache/SessionPC.java	2008-01-08 13:24:22 =
UTC (rev 5048)
@@ -0,0 +1,34 @@
+package perf.pojocache;
+
+import org.jboss.cache.pojo.annotation.Replicable;
+import perf.Session;
+
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
+/**
+ * @author Bela Ban
+ * @version $Id$
+ */
+(a)Replicable
+public class SessionPC implements Session {
+    private Map<Integer,byte[]> attrs=3Dnew ConcurrentHashMap<Integer, byt=
e[]>();
+
+    public void setAttribute(int id, byte[] val) {
+        attrs.put(id, val);
+    }
+
+    public byte[] getAttribute(int id) {
+        return attrs.get(id);
+    }
+
+    public String toString() {
+        int num_attrs=3Dattrs.size();
+        int total_bytes=3D0;
+        for(byte[] val: attrs.values()) {
+            if(val !=3D null)
+                total_bytes+=3Dval.length;
+        }
+        return num_attrs + " attributes, total size=3D" + total_bytes + " =
bytes";
+    }
+}

Added: benchmarks/trunk/src/perf/terracotta/SessionFactoryTC.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- benchmarks/trunk/src/perf/terracotta/SessionFactoryTC.java	            =
            (rev 0)
+++ benchmarks/trunk/src/perf/terracotta/SessionFactoryTC.java	2008-01-08 1=
3:24:22 UTC (rev 5048)
@@ -0,0 +1,36 @@
+package perf.terracotta;
+
+import perf.SessionFactory;
+import perf.Session;
+
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
+/**
+ * @author Bela Ban
+ * @version $Id$
+ */
+public class SessionFactoryTC implements SessionFactory {
+    private final Map<Integer,Session> sessions=3Dnew ConcurrentHashMap<In=
teger,Session>();
+
+
+    public void init() {
+        ;
+    }
+
+    public void destroy() {
+        ;
+    }
+
+    public Session createSession(int session_id) {
+        Session session=3Dsessions.get(session_id);
+        if(session =3D=3D null) {
+            session=3Dnew SessionTC();
+            sessions.put(session_id, session);
+        }
+        return session;
+    }
+
+    public void destroySession(Session session) {
+    }
+}

Added: benchmarks/trunk/src/perf/terracotta/SessionTC.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- benchmarks/trunk/src/perf/terracotta/SessionTC.java	                   =
     (rev 0)
+++ benchmarks/trunk/src/perf/terracotta/SessionTC.java	2008-01-08 13:24:22=
 UTC (rev 5048)
@@ -0,0 +1,38 @@
+package perf.terracotta;
+
+import perf.Session;
+
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
+/**
+ * @author Bela Ban
+ * @version $Id$
+ */
+public class SessionTC implements Session {
+    private Map<Integer,byte[]> attrs=3Dnew ConcurrentHashMap<Integer, byt=
e[]>();
+
+    public void setAttribute(int id, byte[] val) {
+        synchronized(this) {
+            attrs.put(id, val);
+        }
+    }
+
+    public byte[] getAttribute(int id) {
+        synchronized(this) {
+            return attrs.get(id);
+        }
+    }
+
+
+    public String toString() {
+        int num_attrs=3Dattrs.size();
+        int total_bytes=3D0;
+        for(byte[] val: attrs.values()) {
+            if(val !=3D null)
+                total_bytes+=3Dval.length;
+        }
+        return num_attrs + " attributes, total size=3D" + total_bytes + " =
bytes";
+    }
+
+}

Added: benchmarks/trunk/tc.sh
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- benchmarks/trunk/tc.sh	                        (rev 0)
+++ benchmarks/trunk/tc.sh	2008-01-08 13:24:22 UTC (rev 5048)
@@ -0,0 +1,12 @@
+
+CLASSPATH=3D$CLASSPATH:./classes
+
+
+for i in lib/*.jar
+do =

+    CLASSPATH=3D$CLASSPATH:${i}
+done
+
+
+
+../terracotta-2.5.0/bin/dso-java.sh -Dtc.config=3D./tc5-config.xml  perf.S=
essionTest -factory perf.terracotta.SessionFactoryTC -num_requests 100000 -=
num_attrs 100 -size 1000 -id 1 $*


Property changes on: benchmarks/trunk/tc.sh
___________________________________________________________________
Name: svn:executable
   + =


Added: benchmarks/trunk/tc5-config.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- benchmarks/trunk/tc5-config.xml	                        (rev 0)
+++ benchmarks/trunk/tc5-config.xml	2008-01-08 13:24:22 UTC (rev 5048)
@@ -0,0 +1,33 @@
+<?xml version=3D"1.0" encoding=3D"UTF-8"?>
+<tc:tc-config xmlns:tc=3D"http://www.terracotta.org/config">
+
+
+    <application>
+        <dso>
+            <roots>
+                <root>
+                    <field-name>perf.terracotta.SessionFactoryTC.sessions<=
/field-name>
+                </root>
+            </roots>
+            <locks>
+                <autolock>
+                    <method-expression>* perf.terracotta.SessionTC.*(..)</=
method-expression>
+                    <lock-level>write</lock-level>
+                </autolock>
+                <autolock>
+                    <method-expression>* perf.terracotta.SessionTC.getAttr=
ibute(..)</method-expression>
+                    <lock-level>read</lock-level>
+                </autolock>
+            </locks>
+            <instrumented-classes>
+                <include>
+                    <class-expression>perf.terracotta.SessionTC</class-exp=
ression>
+                </include>
+                <include>
+                    <class-expression>perf.terracotta.SessionFactoryTC</cl=
ass-expression>
+                </include>
+            </instrumented-classes>
+        </dso>
+    </application>
+</tc:tc-config>
+


Property changes on: benchmarks/trunk/tc5-config.xml
___________________________________________________________________
Name: svn:executable
   + =


Added: benchmarks/trunk/tmp.sh
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- benchmarks/trunk/tmp.sh	                        (rev 0)
+++ benchmarks/trunk/tmp.sh	2008-01-08 13:24:22 UTC (rev 5048)
@@ -0,0 +1,10 @@
+
+
+for i in lib/*.jar
+do =

+    CP=3D$CP:${i}
+done
+
+CP=3D./classes:$CP
+
+java  -Dlog4j.configuration=3Dfile:${HOME}/log4j.properties -Djgroups.bind=
_addr=3D192.168.2.5 -classpath ${CP} perf.SessionTestCoherence -num_request=
s 100000 -num_attrs 100 -size 1000 -id 1 $*


Property changes on: benchmarks/trunk/tmp.sh
___________________________________________________________________
Name: svn:executable
   + =



--===============4015275662627740931==--

From jbosscache-commits at lists.jboss.org Tue Jan  8 08:26:27 2008
Content-Type: multipart/mixed; boundary="===============2777290962468771237=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r5049 - in benchmarks:
 CacheTests and 1 other directory.
Date: Tue, 08 Jan 2008 08:26:26 -0500
Message-ID: <E1JCETK-0004ts-UF@committer01.frg.pub.inap.atl.jboss.com>

--===============2777290962468771237==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: bela(a)jboss.com
Date: 2008-01-08 08:26:26 -0500 (Tue, 08 Jan 2008)
New Revision: 5049

Added:
   benchmarks/CacheTests/branches/
Removed:
   benchmarks/branches/
Log:
moved

Copied: benchmarks/CacheTests/branches (from rev 5048, benchmarks/branches)


--===============2777290962468771237==--

From jbosscache-commits at lists.jboss.org Tue Jan  8 08:26:47 2008
Content-Type: multipart/mixed; boundary="===============0258085570375578822=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r5050 - in benchmarks:
 CacheTests and 1 other directory.
Date: Tue, 08 Jan 2008 08:26:47 -0500
Message-ID: <E1JCETf-0004v4-91@committer01.frg.pub.inap.atl.jboss.com>

--===============0258085570375578822==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: bela(a)jboss.com
Date: 2008-01-08 08:26:47 -0500 (Tue, 08 Jan 2008)
New Revision: 5050

Added:
   benchmarks/CacheTests/tags/
Removed:
   benchmarks/tags/
Log:
moved

Copied: benchmarks/CacheTests/tags (from rev 5049, benchmarks/tags)


--===============0258085570375578822==--

From jbosscache-commits at lists.jboss.org Tue Jan  8 08:27:15 2008
Content-Type: multipart/mixed; boundary="===============6121445928226095670=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r5051 - in benchmarks:
 CacheTests and 1 other directory.
Date: Tue, 08 Jan 2008 08:27:15 -0500
Message-ID: <E1JCEU7-0004wY-CB@committer01.frg.pub.inap.atl.jboss.com>

--===============6121445928226095670==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: bela(a)jboss.com
Date: 2008-01-08 08:27:14 -0500 (Tue, 08 Jan 2008)
New Revision: 5051

Added:
   benchmarks/CacheTests/trunk/
Removed:
   benchmarks/trunk/
Log:
moved

Copied: benchmarks/CacheTests/trunk (from rev 5050, benchmarks/trunk)


--===============6121445928226095670==--

From jbosscache-commits at lists.jboss.org Tue Jan  8 08:32:44 2008
Content-Type: multipart/mixed; boundary="===============8478653662807095984=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r5052 -
 benchmarks/CacheTests/trunk.
Date: Tue, 08 Jan 2008 08:32:44 -0500
Message-ID: <E1JCEZQ-0005uR-48@committer01.frg.pub.inap.atl.jboss.com>

--===============8478653662807095984==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: bela(a)jboss.com
Date: 2008-01-08 08:32:43 -0500 (Tue, 08 Jan 2008)
New Revision: 5052

Removed:
   benchmarks/CacheTests/trunk/CacheTests.iml
   benchmarks/CacheTests/trunk/CacheTests.ipr
   benchmarks/CacheTests/trunk/CacheTests.iws
Log:
deleted local IDEA config files

Deleted: benchmarks/CacheTests/trunk/CacheTests.iml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- benchmarks/CacheTests/trunk/CacheTests.iml	2008-01-08 13:27:14 UTC (rev=
 5051)
+++ benchmarks/CacheTests/trunk/CacheTests.iml	2008-01-08 13:32:43 UTC (rev=
 5052)
@@ -1,295 +0,0 @@
-<?xml version=3D"1.0" encoding=3D"UTF-8"?>
-<module relativePaths=3D"true" type=3D"JAVA_MODULE" version=3D"4">
-  <component name=3D"NewModuleRootManager" inherit-compiler-output=3D"fals=
e">
-    <output url=3D"file://$MODULE_DIR$/classes" />
-    <exclude-output />
-    <output-test url=3D"file://$MODULE_DIR$/classes" />
-    <content url=3D"file://$MODULE_DIR$">
-      <sourceFolder url=3D"file://$MODULE_DIR$/src" isTestSource=3D"false"=
 />
-      <excludeFolder url=3D"file://$MODULE_DIR$/obsolete" />
-    </content>
-    <orderEntry type=3D"inheritedJdk" />
-    <orderEntry type=3D"sourceFolder" forTests=3D"false" />
-    <orderEntry type=3D"module-library">
-      <library>
-        <CLASSES>
-          <root url=3D"jar://$MODULE_DIR$/lib/junit.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type=3D"module-library">
-      <library>
-        <CLASSES>
-          <root url=3D"jar://$MODULE_DIR$/lib/httpclient.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type=3D"module-library">
-      <library>
-        <CLASSES>
-          <root url=3D"jar://$MODULE_DIR$/lib/jboss-common-core.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type=3D"module-library">
-      <library>
-        <CLASSES>
-          <root url=3D"jar://$MODULE_DIR$/lib/c3p0.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type=3D"module-library">
-      <library>
-        <CLASSES>
-          <root url=3D"jar://$MODULE_DIR$/lib/jboss-common-logging-spi.jar=
!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type=3D"module-library">
-      <library>
-        <CLASSES>
-          <root url=3D"jar://$MODULE_DIR$/lib/jboss-container.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type=3D"module-library">
-      <library>
-        <CLASSES>
-          <root url=3D"jar://$MODULE_DIR$/lib/jbosscache-pojo.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type=3D"module-library">
-      <library>
-        <CLASSES>
-          <root url=3D"jar://$MODULE_DIR$/lib/testng.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type=3D"module-library">
-      <library>
-        <CLASSES>
-          <root url=3D"jar://$MODULE_DIR$/lib/commons-logging.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type=3D"module-library">
-      <library>
-        <CLASSES>
-          <root url=3D"jar://$MODULE_DIR$/lib/javassist.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type=3D"module-library">
-      <library>
-        <CLASSES>
-          <root url=3D"jar://$MODULE_DIR$/lib/derby.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type=3D"module-library">
-      <library>
-        <CLASSES>
-          <root url=3D"jar://$MODULE_DIR$/lib/jboss-logging-spi.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type=3D"module-library">
-      <library>
-        <CLASSES>
-          <root url=3D"jar://$MODULE_DIR$/lib/coherence.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type=3D"module-library">
-      <library>
-        <CLASSES>
-          <root url=3D"jar://$MODULE_DIR$/lib/tangosol.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type=3D"module-library">
-      <library>
-        <CLASSES>
-          <root url=3D"jar://$MODULE_DIR$/lib/qdox.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type=3D"module-library">
-      <library>
-        <CLASSES>
-          <root url=3D"jar://$MODULE_DIR$/lib/dtdparser121.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type=3D"module-library">
-      <library>
-        <CLASSES>
-          <root url=3D"jar://$MODULE_DIR$/lib/trove.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type=3D"module-library">
-      <library>
-        <CLASSES>
-          <root url=3D"jar://$MODULE_DIR$/lib/commons-codec-1.3.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type=3D"module-library">
-      <library>
-        <CLASSES>
-          <root url=3D"jar://$MODULE_DIR$/lib/tc.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type=3D"module-library">
-      <library>
-        <CLASSES>
-          <root url=3D"jar://$MODULE_DIR$/lib/jboss-aop.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type=3D"module-library">
-      <library>
-        <CLASSES>
-          <root url=3D"jar://$MODULE_DIR$/lib/jcip-annotations.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type=3D"module-library">
-      <library>
-        <CLASSES>
-          <root url=3D"jar://$MODULE_DIR$/lib/jdbm.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type=3D"module-library">
-      <library>
-        <CLASSES>
-          <root url=3D"jar://$MODULE_DIR$/lib/activation.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type=3D"module-library">
-      <library>
-        <CLASSES>
-          <root url=3D"jar://$MODULE_DIR$/lib/je.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type=3D"module-library">
-      <library>
-        <CLASSES>
-          <root url=3D"jar://$MODULE_DIR$/lib/log4j.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type=3D"module-library">
-      <library>
-        <CLASSES>
-          <root url=3D"jar://$MODULE_DIR$/lib/xercesImpl.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type=3D"module-library">
-      <library>
-        <CLASSES>
-          <root url=3D"jar://$MODULE_DIR$/lib/jbossxb.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type=3D"module-library">
-      <library>
-        <CLASSES>
-          <root url=3D"jar://$MODULE_DIR$/lib/jbosscache-core.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type=3D"module-library">
-      <library>
-        <CLASSES>
-          <root url=3D"jar://$MODULE_DIR$/lib/jgroups.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type=3D"module-library">
-      <library>
-        <CLASSES>
-          <root url=3D"jar://$MODULE_DIR$/lib/ant.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type=3D"module-library">
-      <library>
-        <CLASSES>
-          <root url=3D"jar://$MODULE_DIR$/lib/jboss-javaee.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntryProperties />
-  </component>
-</module>
-

Deleted: benchmarks/CacheTests/trunk/CacheTests.ipr
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- benchmarks/CacheTests/trunk/CacheTests.ipr	2008-01-08 13:27:14 UTC (rev=
 5051)
+++ benchmarks/CacheTests/trunk/CacheTests.ipr	2008-01-08 13:32:43 UTC (rev=
 5052)
@@ -1,710 +0,0 @@
-<?xml version=3D"1.0" encoding=3D"UTF-8"?>
-<project relativePaths=3D"false" version=3D"4">
-  <component name=3D"AntConfiguration">
-    <defaultAnt bundledAnt=3D"true" />
-  </component>
-  <component name=3D"BuildJarProjectSettings">
-    <option name=3D"BUILD_JARS_ON_MAKE" value=3D"false" />
-  </component>
-  <component name=3D"ChangeBrowserSettings">
-    <option name=3D"MAIN_SPLITTER_PROPORTION" value=3D"0.3" />
-    <option name=3D"MESSAGES_SPLITTER_PROPORTION" value=3D"0.8" />
-    <option name=3D"USE_DATE_BEFORE_FILTER" value=3D"false" />
-    <option name=3D"USE_DATE_AFTER_FILTER" value=3D"false" />
-    <option name=3D"USE_CHANGE_BEFORE_FILTER" value=3D"false" />
-    <option name=3D"USE_CHANGE_AFTER_FILTER" value=3D"false" />
-    <option name=3D"DATE_BEFORE" value=3D"" />
-    <option name=3D"DATE_AFTER" value=3D"" />
-    <option name=3D"CHANGE_BEFORE" value=3D"" />
-    <option name=3D"CHANGE_AFTER" value=3D"" />
-    <option name=3D"USE_USER_FILTER" value=3D"false" />
-    <option name=3D"USER" value=3D"" />
-  </component>
-  <component name=3D"CodeStyleProjectProfileManger">
-    <option name=3D"PROJECT_PROFILE" />
-    <option name=3D"USE_PROJECT_LEVEL_SETTINGS" value=3D"false" />
-  </component>
-  <component name=3D"CodeStyleSettingsManager">
-    <option name=3D"PER_PROJECT_SETTINGS" />
-    <option name=3D"USE_PER_PROJECT_SETTINGS" value=3D"false" />
-  </component>
-  <component name=3D"CompilerConfiguration">
-    <option name=3D"DEFAULT_COMPILER" value=3D"Javac" />
-    <option name=3D"DEPLOY_AFTER_MAKE" value=3D"0" />
-    <resourceExtensions>
-      <entry name=3D".+\.(properties|xml|html|dtd|tld)" />
-      <entry name=3D".+\.(gif|png|jpeg|jpg)" />
-    </resourceExtensions>
-    <wildcardResourcePatterns>
-      <entry name=3D"?*.properties" />
-      <entry name=3D"?*.xml" />
-      <entry name=3D"?*.gif" />
-      <entry name=3D"?*.png" />
-      <entry name=3D"?*.jpeg" />
-      <entry name=3D"?*.jpg" />
-      <entry name=3D"?*.html" />
-      <entry name=3D"?*.dtd" />
-      <entry name=3D"?*.tld" />
-    </wildcardResourcePatterns>
-  </component>
-  <component name=3D"Cvs2Configuration">
-    <option name=3D"PRUNE_EMPTY_DIRECTORIES" value=3D"true" />
-    <option name=3D"MERGING_MODE" value=3D"0" />
-    <option name=3D"MERGE_WITH_BRANCH1_NAME" value=3D"HEAD" />
-    <option name=3D"MERGE_WITH_BRANCH2_NAME" value=3D"HEAD" />
-    <option name=3D"RESET_STICKY" value=3D"false" />
-    <option name=3D"CREATE_NEW_DIRECTORIES" value=3D"true" />
-    <option name=3D"DEFAULT_TEXT_FILE_SUBSTITUTION" value=3D"kv" />
-    <option name=3D"PROCESS_UNKNOWN_FILES" value=3D"false" />
-    <option name=3D"PROCESS_DELETED_FILES" value=3D"false" />
-    <option name=3D"PROCESS_IGNORED_FILES" value=3D"false" />
-    <option name=3D"RESERVED_EDIT" value=3D"false" />
-    <option name=3D"CHECKOUT_DATE_OR_REVISION_SETTINGS">
-      <value>
-        <option name=3D"BRANCH" value=3D"" />
-        <option name=3D"DATE" value=3D"" />
-        <option name=3D"USE_BRANCH" value=3D"false" />
-        <option name=3D"USE_DATE" value=3D"false" />
-      </value>
-    </option>
-    <option name=3D"UPDATE_DATE_OR_REVISION_SETTINGS">
-      <value>
-        <option name=3D"BRANCH" value=3D"" />
-        <option name=3D"DATE" value=3D"" />
-        <option name=3D"USE_BRANCH" value=3D"false" />
-        <option name=3D"USE_DATE" value=3D"false" />
-      </value>
-    </option>
-    <option name=3D"SHOW_CHANGES_REVISION_SETTINGS">
-      <value>
-        <option name=3D"BRANCH" value=3D"" />
-        <option name=3D"DATE" value=3D"" />
-        <option name=3D"USE_BRANCH" value=3D"false" />
-        <option name=3D"USE_DATE" value=3D"false" />
-      </value>
-    </option>
-    <option name=3D"SHOW_OUTPUT" value=3D"false" />
-    <option name=3D"ADD_WATCH_INDEX" value=3D"0" />
-    <option name=3D"REMOVE_WATCH_INDEX" value=3D"0" />
-    <option name=3D"UPDATE_KEYWORD_SUBSTITUTION" />
-    <option name=3D"MAKE_NEW_FILES_READONLY" value=3D"false" />
-    <option name=3D"SHOW_CORRUPTED_PROJECT_FILES" value=3D"0" />
-    <option name=3D"TAG_AFTER_PROJECT_COMMIT" value=3D"false" />
-    <option name=3D"OVERRIDE_EXISTING_TAG_FOR_PROJECT" value=3D"true" />
-    <option name=3D"TAG_AFTER_PROJECT_COMMIT_NAME" value=3D"" />
-    <option name=3D"CLEAN_COPY" value=3D"false" />
-  </component>
-  <component name=3D"DependenciesAnalyzeManager">
-    <option name=3D"myForwardDirection" value=3D"false" />
-  </component>
-  <component name=3D"DependencyValidationManager">
-    <option name=3D"SKIP_IMPORT_STATEMENTS" value=3D"false" />
-  </component>
-  <component name=3D"EclipseCompilerSettings">
-    <option name=3D"DEBUGGING_INFO" value=3D"true" />
-    <option name=3D"GENERATE_NO_WARNINGS" value=3D"true" />
-    <option name=3D"DEPRECATION" value=3D"false" />
-    <option name=3D"ADDITIONAL_OPTIONS_STRING" value=3D"" />
-    <option name=3D"MAXIMUM_HEAP_SIZE" value=3D"128" />
-  </component>
-  <component name=3D"EclipseEmbeddedCompilerSettings">
-    <option name=3D"DEBUGGING_INFO" value=3D"true" />
-    <option name=3D"GENERATE_NO_WARNINGS" value=3D"true" />
-    <option name=3D"DEPRECATION" value=3D"false" />
-    <option name=3D"ADDITIONAL_OPTIONS_STRING" value=3D"" />
-    <option name=3D"MAXIMUM_HEAP_SIZE" value=3D"128" />
-  </component>
-  <component name=3D"EntryPointsManager">
-    <entry_points version=3D"2.0" />
-  </component>
-  <component name=3D"ErrorOptionsConfigurable.UI">
-    <option name=3D"proportions">
-      <SplitterProportionsDataImpl />
-    </option>
-  </component>
-  <component name=3D"ExportToHTMLSettings">
-    <option name=3D"PRINT_LINE_NUMBERS" value=3D"false" />
-    <option name=3D"OPEN_IN_BROWSER" value=3D"false" />
-    <option name=3D"OUTPUT_DIRECTORY" />
-  </component>
-  <component name=3D"IdProvider" IDEtalkID=3D"07662B52393BA0D44F4C3ECDDE1A=
49E1" />
-  <component name=3D"InspectionProjectProfileManager">
-    <option name=3D"PROJECT_PROFILE" value=3D"Project Default" />
-    <option name=3D"USE_PROJECT_LEVEL_SETTINGS" value=3D"false" />
-    <scopes />
-    <profiles>
-      <profile version=3D"1.0" is_locked=3D"false">
-        <option name=3D"myName" value=3D"Project Default" />
-        <option name=3D"myLocal" value=3D"false" />
-        <inspection_tool class=3D"FinalPrivateMethod" level=3D"WARNING" en=
abled=3D"false" />
-        <inspection_tool class=3D"FinalStaticMethod" level=3D"WARNING" ena=
bled=3D"false" />
-        <inspection_tool class=3D"InfiniteLoopStatement" level=3D"WARNING"=
 enabled=3D"false" />
-        <inspection_tool class=3D"ErrorRethrown" level=3D"WARNING" enabled=
=3D"true" />
-        <inspection_tool class=3D"ThreadDeathRethrown" level=3D"WARNING" e=
nabled=3D"true" />
-        <inspection_tool class=3D"NonFinalFieldOfException" level=3D"WARNI=
NG" enabled=3D"true" />
-        <inspection_tool class=3D"UnusedImport" level=3D"WARNING" enabled=
=3D"true" />
-        <inspection_tool class=3D"TestCaseWithConstructor" level=3D"WARNIN=
G" enabled=3D"true" />
-        <inspection_tool class=3D"MisorderedAssertEqualsParameters" level=
=3D"WARNING" enabled=3D"true" />
-        <inspection_tool class=3D"SetupCallsSuperSetup" level=3D"WARNING" =
enabled=3D"true" />
-        <inspection_tool class=3D"MisspelledSetUp" level=3D"WARNING" enabl=
ed=3D"true" />
-        <inspection_tool class=3D"SetupIsPublicVoidNoArg" level=3D"WARNING=
" enabled=3D"true" />
-        <inspection_tool class=3D"SimplifiableJUnitAssertion" level=3D"WAR=
NING" enabled=3D"true" />
-        <inspection_tool class=3D"StaticSuite" level=3D"WARNING" enabled=
=3D"true" />
-        <inspection_tool class=3D"TeardownCallsSuperTeardown" level=3D"WAR=
NING" enabled=3D"true" />
-        <inspection_tool class=3D"MisspelledTearDown" level=3D"WARNING" en=
abled=3D"true" />
-        <inspection_tool class=3D"TeardownIsPublicVoidNoArg" level=3D"WARN=
ING" enabled=3D"true" />
-        <inspection_tool class=3D"TestMethodIsPublicVoidNoArg" level=3D"WA=
RNING" enabled=3D"true" />
-        <inspection_tool class=3D"UnconstructableTestCase" level=3D"WARNIN=
G" enabled=3D"true" />
-        <inspection_tool class=3D"TrivialStringConcatenation" level=3D"WAR=
NING" enabled=3D"true" />
-        <inspection_tool class=3D"InnerClassMayBeStatic" level=3D"WARNING"=
 enabled=3D"true" />
-        <inspection_tool class=3D"SubstringZero" level=3D"WARNING" enabled=
=3D"true" />
-        <inspection_tool class=3D"StringEqualsEmptyString" level=3D"WARNIN=
G" enabled=3D"true" />
-        <inspection_tool class=3D"StringBufferToStringInConcatenation" lev=
el=3D"WARNING" enabled=3D"true" />
-        <inspection_tool class=3D"AssignmentUsedAsCondition" level=3D"WARN=
ING" enabled=3D"true" />
-        <inspection_tool class=3D"CastConflictsWithInstanceof" level=3D"WA=
RNING" enabled=3D"true" />
-        <inspection_tool class=3D"CastToIncompatibleInterface" level=3D"WA=
RNING" enabled=3D"true" />
-        <inspection_tool class=3D"CollectionAddedToSelf" level=3D"WARNING"=
 enabled=3D"true" />
-        <inspection_tool class=3D"MisspelledCompareTo" level=3D"WARNING" e=
nabled=3D"true" />
-        <inspection_tool class=3D"CovariantCompareTo" level=3D"WARNING" en=
abled=3D"true" />
-        <inspection_tool class=3D"CovariantEquals" level=3D"WARNING" enabl=
ed=3D"true" />
-        <inspection_tool class=3D"EmptyInitializer" level=3D"WARNING" enab=
led=3D"true" />
-        <inspection_tool class=3D"MisspelledEquals" level=3D"WARNING" enab=
led=3D"true" />
-        <inspection_tool class=3D"EqualsBetweenInconvertibleTypes" level=
=3D"WARNING" enabled=3D"true" />
-        <inspection_tool class=3D"ArrayEquals" level=3D"WARNING" enabled=
=3D"true" />
-        <inspection_tool class=3D"ForLoopThatDoesntUseLoopVariable" level=
=3D"WARNING" enabled=3D"true" />
-        <inspection_tool class=3D"MisspelledHashcode" level=3D"WARNING" en=
abled=3D"true" />
-        <inspection_tool class=3D"InstanceofIncompatibleInterface" level=
=3D"WARNING" enabled=3D"true" />
-        <inspection_tool class=3D"IteratorHasNextCallsIteratorNext" level=
=3D"WARNING" enabled=3D"true" />
-        <inspection_tool class=3D"IteratorNextDoesNotThrowNoSuchElementExc=
eption" level=3D"WARNING" enabled=3D"true" />
-        <inspection_tool class=3D"NonShortCircuitBoolean" level=3D"WARNING=
" enabled=3D"true" />
-        <inspection_tool class=3D"ResultOfObjectAllocationIgnored" level=
=3D"WARNING" enabled=3D"true" />
-        <inspection_tool class=3D"StaticFieldReferenceOnSubclass" level=3D=
"WARNING" enabled=3D"true" />
-        <inspection_tool class=3D"StaticCallOnSubclass" level=3D"WARNING" =
enabled=3D"true" />
-        <inspection_tool class=3D"SubtractionInCompareTo" level=3D"WARNING=
" enabled=3D"true" />
-        <inspection_tool class=3D"SuspiciousToArrayCall" level=3D"WARNING"=
 enabled=3D"true" />
-        <inspection_tool class=3D"SuspiciousSystemArraycopy" level=3D"WARN=
ING" enabled=3D"true" />
-        <inspection_tool class=3D"TextLabelInSwitchStatement" level=3D"WAR=
NING" enabled=3D"true" />
-        <inspection_tool class=3D"MisspelledToString" level=3D"WARNING" en=
abled=3D"true" />
-        <inspection_tool class=3D"ExternalizableWithSerializationMethods" =
level=3D"WARNING" enabled=3D"true" />
-        <inspection_tool class=3D"ReadObjectInitialization" level=3D"WARNI=
NG" enabled=3D"true" />
-        <inspection_tool class=3D"NonSerializableWithSerializationMethods"=
 level=3D"WARNING" enabled=3D"true" />
-        <inspection_tool class=3D"NonSerializableWithSerialVersionUIDField=
" level=3D"WARNING" enabled=3D"true" />
-        <inspection_tool class=3D"ReadObjectAndWriteObjectPrivate" level=
=3D"WARNING" enabled=3D"true" />
-        <inspection_tool class=3D"ReadResolveAndWriteReplaceProtected" lev=
el=3D"WARNING" enabled=3D"true" />
-        <inspection_tool class=3D"SerializableWithUnconstructableAncestor"=
 level=3D"WARNING" enabled=3D"true" />
-        <inspection_tool class=3D"SerializableHasSerialVersionUIDField" le=
vel=3D"WARNING" enabled=3D"true">
-          <option name=3D"superClassString" value=3D"java.awt.Component" />
-        </inspection_tool>
-        <inspection_tool class=3D"SerializableInnerClassHasSerialVersionUI=
DField" level=3D"WARNING" enabled=3D"true">
-          <option name=3D"superClassString" value=3D"java.awt.Component" />
-        </inspection_tool>
-        <inspection_tool class=3D"SerializableInnerClassWithNonSerializabl=
eOuterClass" level=3D"WARNING" enabled=3D"true">
-          <option name=3D"superClassString" value=3D"java.awt.Component" />
-        </inspection_tool>
-        <inspection_tool class=3D"SerialPersistentFieldsWithWrongSignature=
" level=3D"WARNING" enabled=3D"true" />
-        <inspection_tool class=3D"SerialVersionUIDNotStaticFinal" level=3D=
"WARNING" enabled=3D"true" />
-        <inspection_tool class=3D"TransientFieldInNonSerializableClass" le=
vel=3D"WARNING" enabled=3D"true" />
-        <inspection_tool class=3D"AwaitNotInLoop" level=3D"WARNING" enable=
d=3D"true" />
-        <inspection_tool class=3D"ConditionSignal" level=3D"WARNING" enabl=
ed=3D"true" />
-        <inspection_tool class=3D"SystemRunFinalizersOnExit" level=3D"WARN=
ING" enabled=3D"true" />
-        <inspection_tool class=3D"ThreadRun" level=3D"WARNING" enabled=3D"=
true" />
-        <inspection_tool class=3D"ThreadStartInConstruction" level=3D"WARN=
ING" enabled=3D"true" />
-        <inspection_tool class=3D"ThreadStopSuspendResume" level=3D"WARNIN=
G" enabled=3D"true" />
-        <inspection_tool class=3D"ThreadYield" level=3D"WARNING" enabled=
=3D"true" />
-        <inspection_tool class=3D"SleepWhileHoldingLock" level=3D"WARNING"=
 enabled=3D"true" />
-        <inspection_tool class=3D"DoubleCheckedLocking" level=3D"WARNING" =
enabled=3D"true">
-          <option name=3D"ignoreOnVolatileVariables" value=3D"false" />
-        </inspection_tool>
-        <inspection_tool class=3D"EmptySynchronizedStatement" level=3D"WAR=
NING" enabled=3D"true" />
-        <inspection_tool class=3D"ThreadWithDefaultRunMethod" level=3D"WAR=
NING" enabled=3D"true" />
-        <inspection_tool class=3D"NonSynchronizedMethodOverridesSynchroniz=
edMethod" level=3D"WARNING" enabled=3D"true" />
-        <inspection_tool class=3D"NotifyCalledOnCondition" level=3D"WARNIN=
G" enabled=3D"true" />
-        <inspection_tool class=3D"NotifyNotInSynchronizedContext" level=3D=
"WARNING" enabled=3D"true" />
-        <inspection_tool class=3D"SynchronizeOnLock" level=3D"WARNING" ena=
bled=3D"true" />
-        <inspection_tool class=3D"UnconditionalWait" level=3D"WARNING" ena=
bled=3D"true" />
-        <inspection_tool class=3D"VolatileArrayField" level=3D"WARNING" en=
abled=3D"true" />
-        <inspection_tool class=3D"VolatileLongOrDoubleField" level=3D"WARN=
ING" enabled=3D"true" />
-        <inspection_tool class=3D"WaitCalledOnCondition" level=3D"WARNING"=
 enabled=3D"true" />
-        <inspection_tool class=3D"WaitWhileHoldingTwoLocks" level=3D"WARNI=
NG" enabled=3D"true" />
-        <inspection_tool class=3D"WaitNotInSynchronizedContext" level=3D"W=
ARNING" enabled=3D"true" />
-        <inspection_tool class=3D"WhileLoopSpinsOnField" level=3D"WARNING"=
 enabled=3D"true">
-          <option name=3D"ignoreNonEmtpyLoops" value=3D"false" />
-        </inspection_tool>
-        <inspection_tool class=3D"ClassEscapesItsScope" level=3D"WARNING" =
enabled=3D"true" />
-        <inspection_tool class=3D"FieldHidesSuperclassField" level=3D"WARN=
ING" enabled=3D"true">
-          <option name=3D"m_ignoreInvisibleFields" value=3D"true" />
-        </inspection_tool>
-        <inspection_tool class=3D"InnerClassVariableHidesOuterClassVariabl=
e" level=3D"WARNING" enabled=3D"true">
-          <option name=3D"m_ignoreInvisibleFields" value=3D"true" />
-        </inspection_tool>
-        <inspection_tool class=3D"LocalVariableHidingMemberVariable" level=
=3D"WARNING" enabled=3D"true">
-          <option name=3D"m_ignoreInvisibleFields" value=3D"true" />
-          <option name=3D"m_ignoreStaticMethods" value=3D"true" />
-        </inspection_tool>
-        <inspection_tool class=3D"MethodOverloadsParentMethod" level=3D"WA=
RNING" enabled=3D"true" />
-        <inspection_tool class=3D"MethodOverridesPackageLocalMethod" level=
=3D"WARNING" enabled=3D"true" />
-        <inspection_tool class=3D"MethodOverridesPrivateMethod" level=3D"W=
ARNING" enabled=3D"true" />
-        <inspection_tool class=3D"MethodOverridesStaticMethod" level=3D"WA=
RNING" enabled=3D"true" />
-        <inspection_tool class=3D"TypeParameterHidesVisibleType" level=3D"=
WARNING" enabled=3D"true" />
-        <inspection_tool class=3D"IncompatibleMask" level=3D"WARNING" enab=
led=3D"false" />
-        <inspection_tool class=3D"PointlessBitwiseExpression" level=3D"WAR=
NING" enabled=3D"false">
-          <option name=3D"m_ignoreExpressionsContainingConstants" value=3D=
"false" />
-        </inspection_tool>
-        <inspection_tool class=3D"ShiftOutOfRange" level=3D"WARNING" enabl=
ed=3D"false" />
-        <inspection_tool class=3D"ExtendsObject" level=3D"WARNING" enabled=
=3D"false" />
-        <inspection_tool class=3D"TypeParameterExtendsObject" level=3D"WAR=
NING" enabled=3D"false" />
-        <inspection_tool class=3D"UnnecessarySemicolon" level=3D"WARNING" =
enabled=3D"false" />
-        <inspection_tool class=3D"ConditionalExpressionWithIdenticalBranch=
es" level=3D"WARNING" enabled=3D"true" />
-        <inspection_tool class=3D"DuplicateCondition" level=3D"WARNING" en=
abled=3D"true">
-          <option name=3D"ignoreMethodCalls" value=3D"false" />
-        </inspection_tool>
-        <inspection_tool class=3D"WeakerAccess" level=3D"WARNING" enabled=
=3D"false">
-          <option name=3D"SUGGEST_PACKAGE_LOCAL_FOR_MEMBERS" value=3D"true=
" />
-          <option name=3D"SUGGEST_PACKAGE_LOCAL_FOR_TOP_CLASSES" value=3D"=
true" />
-          <option name=3D"SUGGEST_PRIVATE_FOR_INNERS" value=3D"false" />
-        </inspection_tool>
-        <inspection_tool class=3D"EmptyMethod" level=3D"WARNING" enabled=
=3D"false" />
-        <inspection_tool class=3D"NoExplicitFinalizeCalls" level=3D"WARNIN=
G" enabled=3D"false" />
-        <inspection_tool class=3D"FinalizeCallsSuperFinalize" level=3D"WAR=
NING" enabled=3D"false">
-          <option name=3D"m_ignoreForObjectSubclasses" value=3D"false" />
-        </inspection_tool>
-        <inspection_tool class=3D"JavaDoc" level=3D"WARNING" enabled=3D"fa=
lse">
-          <option name=3D"TOP_LEVEL_CLASS_OPTIONS">
-            <value>
-              <option name=3D"ACCESS_JAVADOC_REQUIRED_FOR" value=3D"none" =
/>
-              <option name=3D"REQUIRED_TAGS" value=3D"" />
-            </value>
-          </option>
-          <option name=3D"INNER_CLASS_OPTIONS">
-            <value>
-              <option name=3D"ACCESS_JAVADOC_REQUIRED_FOR" value=3D"none" =
/>
-              <option name=3D"REQUIRED_TAGS" value=3D"" />
-            </value>
-          </option>
-          <option name=3D"METHOD_OPTIONS">
-            <value>
-              <option name=3D"ACCESS_JAVADOC_REQUIRED_FOR" value=3D"none" =
/>
-              <option name=3D"REQUIRED_TAGS" value=3D"@return(a)param@thro=
ws or @exception" />
-            </value>
-          </option>
-          <option name=3D"FIELD_OPTIONS">
-            <value>
-              <option name=3D"ACCESS_JAVADOC_REQUIRED_FOR" value=3D"none" =
/>
-              <option name=3D"REQUIRED_TAGS" value=3D"" />
-            </value>
-          </option>
-          <option name=3D"IGNORE_DEPRECATED" value=3D"false" />
-          <option name=3D"IGNORE_JAVADOC_PERIOD" value=3D"true" />
-          <option name=3D"myAdditionalJavadocTags" value=3D"" />
-        </inspection_tool>
-        <inspection_tool class=3D"ExtendsAnnotation" level=3D"WARNING" ena=
bled=3D"false" />
-        <inspection_tool class=3D"AbstractMethodCallInConstructor" level=
=3D"WARNING" enabled=3D"true" />
-        <inspection_tool class=3D"InstanceVariableUninitializedUse" level=
=3D"WARNING" enabled=3D"true">
-          <option name=3D"m_ignorePrimitives" value=3D"false" />
-        </inspection_tool>
-        <inspection_tool class=3D"StaticVariableInitialization" level=3D"W=
ARNING" enabled=3D"true">
-          <option name=3D"m_ignorePrimitives" value=3D"false" />
-        </inspection_tool>
-        <inspection_tool class=3D"StaticVariableUninitializedUse" level=3D=
"WARNING" enabled=3D"true">
-          <option name=3D"m_ignorePrimitives" value=3D"false" />
-        </inspection_tool>
-        <inspection_tool class=3D"NonThreadSafeLazyInitialization" level=
=3D"WARNING" enabled=3D"true" />
-        <inspection_tool class=3D"StaticCollection" level=3D"WARNING" enab=
led=3D"true">
-          <option name=3D"m_ignoreWeakCollections" value=3D"false" />
-        </inspection_tool>
-        <inspection_tool class=3D"StringBufferField" level=3D"WARNING" ena=
bled=3D"true" />
-        <inspection_tool class=3D"StringBufferReplaceableByStringBuilder" =
level=3D"WARNING" enabled=3D"true" />
-        <inspection_tool class=3D"NullArgumentToVariableArgMethod" level=
=3D"WARNING" enabled=3D"false" />
-        <inspection_tool class=3D"NullableProblems" level=3D"WARNING" enab=
led=3D"false">
-          <option name=3D"REPORT_NULLABLE_METHOD_OVERRIDES_NOTNULL" value=
=3D"true" />
-          <option name=3D"REPORT_NOT_ANNOTATED_METHOD_OVERRIDES_NOTNULL" v=
alue=3D"true" />
-          <option name=3D"REPORT_NOTNULL_PARAMETER_OVERRIDES_NULLABLE" val=
ue=3D"true" />
-          <option name=3D"REPORT_NOT_ANNOTATED_PARAMETER_OVERRIDES_NOTNULL=
" value=3D"true" />
-          <option name=3D"REPORT_NOT_ANNOTATED_GETTER" value=3D"true" />
-          <option name=3D"REPORT_NOT_ANNOTATED_SETTER_PARAMETER" value=3D"=
true" />
-          <option name=3D"REPORT_ANNOTATION_NOT_PROPAGATED_TO_OVERRIDERS" =
value=3D"true" />
-        </inspection_tool>
-        <inspection_tool class=3D"PointlessBooleanExpression" level=3D"WAR=
NING" enabled=3D"false">
-          <option name=3D"m_ignoreExpressionsContainingConstants" value=3D=
"false" />
-        </inspection_tool>
-        <inspection_tool class=3D"EmptyCatchBlock" level=3D"WARNING" enabl=
ed=3D"false">
-          <option name=3D"m_includeComments" value=3D"true" />
-          <option name=3D"m_ignoreTestCases" value=3D"true" />
-          <option name=3D"m_ignoreIgnoreParameter" value=3D"true" />
-        </inspection_tool>
-        <inspection_tool class=3D"UnusedAssignment" level=3D"WARNING" enab=
led=3D"false">
-          <option name=3D"REPORT_PREFIX_EXPRESSIONS" value=3D"false" />
-          <option name=3D"REPORT_POSTFIX_EXPRESSIONS" value=3D"true" />
-          <option name=3D"REPORT_REDUNDANT_INITIALIZER" value=3D"true" />
-        </inspection_tool>
-        <inspection_tool class=3D"CloneCallsSuperClone" level=3D"WARNING" =
enabled=3D"false" />
-        <inspection_tool class=3D"IgnoreResultOfCall" level=3D"WARNING" en=
abled=3D"false">
-          <option name=3D"m_reportAllNonLibraryCalls" value=3D"false" />
-          <option name=3D"callCheckString" value=3D"java.io.InputStream,re=
ad,java.io.InputStream,skip,java.lang.StringBuffer,toString,java.lang.Strin=
gBuilder,toString,java.lang.String,.*,java.math.BigInteger,.*,java.math.Big=
Decimal,.*,java.net.InetAddress,.*" />
-        </inspection_tool>
-        <inspection_tool class=3D"CloneDeclaresCloneNotSupported" level=3D=
"WARNING" enabled=3D"false" />
-        <inspection_tool class=3D"PointlessArithmeticExpression" level=3D"=
WARNING" enabled=3D"false">
-          <option name=3D"m_ignoreExpressionsContainingConstants" value=3D=
"false" />
-        </inspection_tool>
-        <inspection_tool class=3D"FieldCanBeLocal" level=3D"WARNING" enabl=
ed=3D"false" />
-        <inspection_tool class=3D"StringConcatenationInsideStringBufferApp=
end" level=3D"WARNING" enabled=3D"false" />
-        <inspection_tool class=3D"MismatchedCollectionQueryUpdate" level=
=3D"WARNING" enabled=3D"false" />
-        <inspection_tool class=3D"JavadocReference" level=3D"WARNING" enab=
led=3D"true" />
-        <inspection_tool class=3D"UnnecessaryBlockStatement" level=3D"WARN=
ING" enabled=3D"true" />
-        <inspection_tool class=3D"ClassWithMultipleLoggers" level=3D"WARNI=
NG" enabled=3D"true">
-          <option name=3D"loggerClassName" value=3D"java.util.logging.Logg=
er" />
-        </inspection_tool>
-        <inspection_tool class=3D"ConstantStringIntern" level=3D"WARNING" =
enabled=3D"true" />
-        <inspection_tool class=3D"FieldMayBeStatic" level=3D"WARNING" enab=
led=3D"true" />
-        <inspection_tool class=3D"SizeReplaceableByIsEmpty" level=3D"WARNI=
NG" enabled=3D"true">
-          <option name=3D"ignoreNegations" value=3D"false" />
-        </inspection_tool>
-        <inspection_tool class=3D"NestedSynchronizedStatement" level=3D"WA=
RNING" enabled=3D"true" />
-        <inspection_tool class=3D"NakedNotify" level=3D"WARNING" enabled=
=3D"true" />
-        <inspection_tool class=3D"IndexOfReplaceableByContains" level=3D"W=
ARNING" enabled=3D"true" />
-        <inspection_tool class=3D"WhileCanBeForeach" level=3D"WARNING" ena=
bled=3D"false" />
-        <inspection_tool class=3D"ForCanBeForeach" level=3D"WARNING" enabl=
ed=3D"false">
-          <option name=3D"REPORT_INDEXED_LOOP" value=3D"true" />
-        </inspection_tool>
-        <inspection_tool class=3D"UnnecessaryBoxing" level=3D"WARNING" ena=
bled=3D"false" />
-        <inspection_tool class=3D"UnnecessaryUnboxing" level=3D"WARNING" e=
nabled=3D"false" />
-        <inspection_tool class=3D"UNCHECKED_WARNING" level=3D"WARNING" ena=
bled=3D"false" />
-        <inspection_tool class=3D"NonStaticFinalLogger" level=3D"WARNING" =
enabled=3D"true">
-          <option name=3D"loggerClassName" value=3D"java.util.logging.Logg=
er" />
-        </inspection_tool>
-        <inspection_tool class=3D"StringBufferReplaceableByString" level=
=3D"WARNING" enabled=3D"true" />
-        <inspection_tool class=3D"AwaitWithoutCorrespondingSignal" level=
=3D"WARNING" enabled=3D"true" />
-        <inspection_tool class=3D"EmptyStatementBody" level=3D"WARNING" en=
abled=3D"false">
-          <option name=3D"m_reportEmptyBlocks" value=3D"false" />
-        </inspection_tool>
-        <inspection_tool class=3D"MethodMayBeStatic" level=3D"WARNING" ena=
bled=3D"true">
-          <option name=3D"m_onlyPrivateOrFinal" value=3D"false" />
-          <option name=3D"m_ignoreEmptyMethods" value=3D"true" />
-        </inspection_tool>
-        <inspection_tool class=3D"EqualsWhichDoesntCheckParameterClass" le=
vel=3D"WARNING" enabled=3D"true" />
-        <inspection_tool class=3D"ArithmeticOnVolatileField" level=3D"WARN=
ING" enabled=3D"true" />
-      </profile>
-    </profiles>
-    <list size=3D"0" />
-  </component>
-  <component name=3D"JavacSettings">
-    <option name=3D"DEBUGGING_INFO" value=3D"true" />
-    <option name=3D"GENERATE_NO_WARNINGS" value=3D"false" />
-    <option name=3D"DEPRECATION" value=3D"true" />
-    <option name=3D"ADDITIONAL_OPTIONS_STRING" value=3D"" />
-    <option name=3D"MAXIMUM_HEAP_SIZE" value=3D"128" />
-  </component>
-  <component name=3D"JavadocGenerationManager">
-    <option name=3D"OUTPUT_DIRECTORY" />
-    <option name=3D"OPTION_SCOPE" value=3D"protected" />
-    <option name=3D"OPTION_HIERARCHY" value=3D"true" />
-    <option name=3D"OPTION_NAVIGATOR" value=3D"true" />
-    <option name=3D"OPTION_INDEX" value=3D"true" />
-    <option name=3D"OPTION_SEPARATE_INDEX" value=3D"true" />
-    <option name=3D"OPTION_DOCUMENT_TAG_USE" value=3D"false" />
-    <option name=3D"OPTION_DOCUMENT_TAG_AUTHOR" value=3D"false" />
-    <option name=3D"OPTION_DOCUMENT_TAG_VERSION" value=3D"false" />
-    <option name=3D"OPTION_DOCUMENT_TAG_DEPRECATED" value=3D"true" />
-    <option name=3D"OPTION_DEPRECATED_LIST" value=3D"true" />
-    <option name=3D"OTHER_OPTIONS" value=3D"" />
-    <option name=3D"HEAP_SIZE" />
-    <option name=3D"LOCALE" />
-    <option name=3D"OPEN_IN_BROWSER" value=3D"true" />
-  </component>
-  <component name=3D"JikesSettings">
-    <option name=3D"JIKES_PATH" value=3D"" />
-    <option name=3D"DEBUGGING_INFO" value=3D"true" />
-    <option name=3D"DEPRECATION" value=3D"true" />
-    <option name=3D"GENERATE_NO_WARNINGS" value=3D"false" />
-    <option name=3D"IS_EMACS_ERRORS_MODE" value=3D"true" />
-    <option name=3D"ADDITIONAL_OPTIONS_STRING" value=3D"" />
-  </component>
-  <component name=3D"LogConsolePreferences">
-    <option name=3D"FILTER_ERRORS" value=3D"false" />
-    <option name=3D"FILTER_WARNINGS" value=3D"false" />
-    <option name=3D"FILTER_INFO" value=3D"true" />
-    <option name=3D"CUSTOM_FILTER" />
-  </component>
-  <component name=3D"Palette2">
-    <group name=3D"Swing">
-      <item class=3D"com.intellij.uiDesigner.HSpacer" tooltip-text=3D"Hori=
zontal Spacer" icon=3D"/com/intellij/uiDesigner/icons/hspacer.png" removabl=
e=3D"false" auto-create-binding=3D"false" can-attach-label=3D"false">
-        <default-constraints vsize-policy=3D"1" hsize-policy=3D"6" anchor=
=3D"0" fill=3D"1" />
-      </item>
-      <item class=3D"com.intellij.uiDesigner.VSpacer" tooltip-text=3D"Vert=
ical Spacer" icon=3D"/com/intellij/uiDesigner/icons/vspacer.png" removable=
=3D"false" auto-create-binding=3D"false" can-attach-label=3D"false">
-        <default-constraints vsize-policy=3D"6" hsize-policy=3D"1" anchor=
=3D"0" fill=3D"2" />
-      </item>
-      <item class=3D"javax.swing.JPanel" icon=3D"/com/intellij/uiDesigner/=
icons/panel.png" removable=3D"false" auto-create-binding=3D"false" can-atta=
ch-label=3D"false">
-        <default-constraints vsize-policy=3D"3" hsize-policy=3D"3" anchor=
=3D"0" fill=3D"3" />
-      </item>
-      <item class=3D"javax.swing.JScrollPane" icon=3D"/com/intellij/uiDesi=
gner/icons/scrollPane.png" removable=3D"false" auto-create-binding=3D"false=
" can-attach-label=3D"true">
-        <default-constraints vsize-policy=3D"7" hsize-policy=3D"7" anchor=
=3D"0" fill=3D"3" />
-      </item>
-      <item class=3D"javax.swing.JButton" icon=3D"/com/intellij/uiDesigner=
/icons/button.png" removable=3D"false" auto-create-binding=3D"true" can-att=
ach-label=3D"false">
-        <default-constraints vsize-policy=3D"0" hsize-policy=3D"3" anchor=
=3D"0" fill=3D"1" />
-        <initial-values>
-          <property name=3D"text" value=3D"Button" />
-        </initial-values>
-      </item>
-      <item class=3D"javax.swing.JRadioButton" icon=3D"/com/intellij/uiDes=
igner/icons/radioButton.png" removable=3D"false" auto-create-binding=3D"tru=
e" can-attach-label=3D"false">
-        <default-constraints vsize-policy=3D"0" hsize-policy=3D"3" anchor=
=3D"8" fill=3D"0" />
-        <initial-values>
-          <property name=3D"text" value=3D"RadioButton" />
-        </initial-values>
-      </item>
-      <item class=3D"javax.swing.JCheckBox" icon=3D"/com/intellij/uiDesign=
er/icons/checkBox.png" removable=3D"false" auto-create-binding=3D"true" can=
-attach-label=3D"false">
-        <default-constraints vsize-policy=3D"0" hsize-policy=3D"3" anchor=
=3D"8" fill=3D"0" />
-        <initial-values>
-          <property name=3D"text" value=3D"CheckBox" />
-        </initial-values>
-      </item>
-      <item class=3D"javax.swing.JLabel" icon=3D"/com/intellij/uiDesigner/=
icons/label.png" removable=3D"false" auto-create-binding=3D"false" can-atta=
ch-label=3D"false">
-        <default-constraints vsize-policy=3D"0" hsize-policy=3D"0" anchor=
=3D"8" fill=3D"0" />
-        <initial-values>
-          <property name=3D"text" value=3D"Label" />
-        </initial-values>
-      </item>
-      <item class=3D"javax.swing.JTextField" icon=3D"/com/intellij/uiDesig=
ner/icons/textField.png" removable=3D"false" auto-create-binding=3D"true" c=
an-attach-label=3D"true">
-        <default-constraints vsize-policy=3D"0" hsize-policy=3D"6" anchor=
=3D"8" fill=3D"1">
-          <preferred-size width=3D"150" height=3D"-1" />
-        </default-constraints>
-      </item>
-      <item class=3D"javax.swing.JPasswordField" icon=3D"/com/intellij/uiD=
esigner/icons/passwordField.png" removable=3D"false" auto-create-binding=3D=
"true" can-attach-label=3D"true">
-        <default-constraints vsize-policy=3D"0" hsize-policy=3D"6" anchor=
=3D"8" fill=3D"1">
-          <preferred-size width=3D"150" height=3D"-1" />
-        </default-constraints>
-      </item>
-      <item class=3D"javax.swing.JFormattedTextField" icon=3D"/com/intelli=
j/uiDesigner/icons/formattedTextField.png" removable=3D"false" auto-create-=
binding=3D"true" can-attach-label=3D"true">
-        <default-constraints vsize-policy=3D"0" hsize-policy=3D"6" anchor=
=3D"8" fill=3D"1">
-          <preferred-size width=3D"150" height=3D"-1" />
-        </default-constraints>
-      </item>
-      <item class=3D"javax.swing.JTextArea" icon=3D"/com/intellij/uiDesign=
er/icons/textArea.png" removable=3D"false" auto-create-binding=3D"true" can=
-attach-label=3D"true">
-        <default-constraints vsize-policy=3D"6" hsize-policy=3D"6" anchor=
=3D"0" fill=3D"3">
-          <preferred-size width=3D"150" height=3D"50" />
-        </default-constraints>
-      </item>
-      <item class=3D"javax.swing.JTextPane" icon=3D"/com/intellij/uiDesign=
er/icons/textPane.png" removable=3D"false" auto-create-binding=3D"true" can=
-attach-label=3D"true">
-        <default-constraints vsize-policy=3D"6" hsize-policy=3D"6" anchor=
=3D"0" fill=3D"3">
-          <preferred-size width=3D"150" height=3D"50" />
-        </default-constraints>
-      </item>
-      <item class=3D"javax.swing.JEditorPane" icon=3D"/com/intellij/uiDesi=
gner/icons/editorPane.png" removable=3D"false" auto-create-binding=3D"true"=
 can-attach-label=3D"true">
-        <default-constraints vsize-policy=3D"6" hsize-policy=3D"6" anchor=
=3D"0" fill=3D"3">
-          <preferred-size width=3D"150" height=3D"50" />
-        </default-constraints>
-      </item>
-      <item class=3D"javax.swing.JComboBox" icon=3D"/com/intellij/uiDesign=
er/icons/comboBox.png" removable=3D"false" auto-create-binding=3D"true" can=
-attach-label=3D"true">
-        <default-constraints vsize-policy=3D"0" hsize-policy=3D"2" anchor=
=3D"8" fill=3D"1" />
-      </item>
-      <item class=3D"javax.swing.JTable" icon=3D"/com/intellij/uiDesigner/=
icons/table.png" removable=3D"false" auto-create-binding=3D"true" can-attac=
h-label=3D"false">
-        <default-constraints vsize-policy=3D"6" hsize-policy=3D"6" anchor=
=3D"0" fill=3D"3">
-          <preferred-size width=3D"150" height=3D"50" />
-        </default-constraints>
-      </item>
-      <item class=3D"javax.swing.JList" icon=3D"/com/intellij/uiDesigner/i=
cons/list.png" removable=3D"false" auto-create-binding=3D"true" can-attach-=
label=3D"false">
-        <default-constraints vsize-policy=3D"6" hsize-policy=3D"2" anchor=
=3D"0" fill=3D"3">
-          <preferred-size width=3D"150" height=3D"50" />
-        </default-constraints>
-      </item>
-      <item class=3D"javax.swing.JTree" icon=3D"/com/intellij/uiDesigner/i=
cons/tree.png" removable=3D"false" auto-create-binding=3D"true" can-attach-=
label=3D"false">
-        <default-constraints vsize-policy=3D"6" hsize-policy=3D"6" anchor=
=3D"0" fill=3D"3">
-          <preferred-size width=3D"150" height=3D"50" />
-        </default-constraints>
-      </item>
-      <item class=3D"javax.swing.JTabbedPane" icon=3D"/com/intellij/uiDesi=
gner/icons/tabbedPane.png" removable=3D"false" auto-create-binding=3D"true"=
 can-attach-label=3D"false">
-        <default-constraints vsize-policy=3D"3" hsize-policy=3D"3" anchor=
=3D"0" fill=3D"3">
-          <preferred-size width=3D"200" height=3D"200" />
-        </default-constraints>
-      </item>
-      <item class=3D"javax.swing.JSplitPane" icon=3D"/com/intellij/uiDesig=
ner/icons/splitPane.png" removable=3D"false" auto-create-binding=3D"false" =
can-attach-label=3D"false">
-        <default-constraints vsize-policy=3D"3" hsize-policy=3D"3" anchor=
=3D"0" fill=3D"3">
-          <preferred-size width=3D"200" height=3D"200" />
-        </default-constraints>
-      </item>
-      <item class=3D"javax.swing.JSpinner" icon=3D"/com/intellij/uiDesigne=
r/icons/spinner.png" removable=3D"false" auto-create-binding=3D"true" can-a=
ttach-label=3D"true">
-        <default-constraints vsize-policy=3D"0" hsize-policy=3D"6" anchor=
=3D"8" fill=3D"1" />
-      </item>
-      <item class=3D"javax.swing.JSlider" icon=3D"/com/intellij/uiDesigner=
/icons/slider.png" removable=3D"false" auto-create-binding=3D"true" can-att=
ach-label=3D"false">
-        <default-constraints vsize-policy=3D"0" hsize-policy=3D"6" anchor=
=3D"8" fill=3D"1" />
-      </item>
-      <item class=3D"javax.swing.JSeparator" icon=3D"/com/intellij/uiDesig=
ner/icons/separator.png" removable=3D"false" auto-create-binding=3D"false" =
can-attach-label=3D"false">
-        <default-constraints vsize-policy=3D"6" hsize-policy=3D"6" anchor=
=3D"0" fill=3D"3" />
-      </item>
-      <item class=3D"javax.swing.JProgressBar" icon=3D"/com/intellij/uiDes=
igner/icons/progressbar.png" removable=3D"false" auto-create-binding=3D"tru=
e" can-attach-label=3D"false">
-        <default-constraints vsize-policy=3D"0" hsize-policy=3D"6" anchor=
=3D"0" fill=3D"1" />
-      </item>
-      <item class=3D"javax.swing.JToolBar" icon=3D"/com/intellij/uiDesigne=
r/icons/toolbar.png" removable=3D"false" auto-create-binding=3D"false" can-=
attach-label=3D"false">
-        <default-constraints vsize-policy=3D"0" hsize-policy=3D"6" anchor=
=3D"0" fill=3D"1">
-          <preferred-size width=3D"-1" height=3D"20" />
-        </default-constraints>
-      </item>
-      <item class=3D"javax.swing.JToolBar$Separator" icon=3D"/com/intellij=
/uiDesigner/icons/toolbarSeparator.png" removable=3D"false" auto-create-bin=
ding=3D"false" can-attach-label=3D"false">
-        <default-constraints vsize-policy=3D"0" hsize-policy=3D"0" anchor=
=3D"0" fill=3D"1" />
-      </item>
-      <item class=3D"javax.swing.JScrollBar" icon=3D"/com/intellij/uiDesig=
ner/icons/scrollbar.png" removable=3D"false" auto-create-binding=3D"true" c=
an-attach-label=3D"false">
-        <default-constraints vsize-policy=3D"6" hsize-policy=3D"0" anchor=
=3D"0" fill=3D"2" />
-      </item>
-    </group>
-  </component>
-  <component name=3D"PerforceChangeBrowserSettings">
-    <option name=3D"USE_CLIENT_FILTER" value=3D"true" />
-    <option name=3D"CLIENT" value=3D"" />
-  </component>
-  <component name=3D"PerforceDirect.Settings">
-    <option name=3D"useP4CONFIG" value=3D"true" />
-    <option name=3D"port" value=3D"&lt;perforce_server&gt;:1666" />
-    <option name=3D"client" value=3D"" />
-    <option name=3D"user" value=3D"" />
-    <option name=3D"passwd" value=3D"" />
-    <option name=3D"showCmds" value=3D"false" />
-    <option name=3D"useNativeApi" value=3D"true" />
-    <option name=3D"pathToExec" value=3D"p4" />
-    <option name=3D"useCustomPathToExec" value=3D"false" />
-    <option name=3D"SYNC_FORCE" value=3D"false" />
-    <option name=3D"SYNC_RUN_RESOLVE" value=3D"true" />
-    <option name=3D"REVERT_UNCHANGED_FILES" value=3D"true" />
-    <option name=3D"CHARSET" value=3D"none" />
-    <option name=3D"SHOW_BRANCHES_HISTORY" value=3D"true" />
-    <option name=3D"ENABLED" value=3D"true" />
-    <option name=3D"USE_LOGIN" value=3D"false" />
-    <option name=3D"LOGIN_SILENTLY" value=3D"false" />
-    <option name=3D"INTEGRATE_RUN_RESOLVE" value=3D"true" />
-    <option name=3D"INTEGRATE_REVERT_UNCHANGED" value=3D"true" />
-    <option name=3D"SERVER_TIMEOUT" value=3D"20000" />
-  </component>
-  <component name=3D"ProjectFileVersion" converted=3D"true" />
-  <component name=3D"ProjectModuleManager">
-    <modules>
-      <module fileurl=3D"file://$PROJECT_DIR$/CacheTests.iml" filepath=3D"=
$PROJECT_DIR$/CacheTests.iml" />
-    </modules>
-  </component>
-  <component name=3D"ProjectRootConfigurable.UI">
-    <option name=3D"proportions">
-      <SplitterProportionsDataImpl />
-    </option>
-  </component>
-  <component name=3D"ProjectRootManager" version=3D"2" assert-keyword=3D"t=
rue" jdk-15=3D"true" project-jdk-name=3D"1.6" project-jdk-type=3D"JavaSDK">
-    <output url=3D"file://$PROJECT_DIR$/classes" />
-  </component>
-  <component name=3D"RmicSettings">
-    <option name=3D"IS_EANABLED" value=3D"false" />
-    <option name=3D"DEBUGGING_INFO" value=3D"true" />
-    <option name=3D"GENERATE_NO_WARNINGS" value=3D"false" />
-    <option name=3D"GENERATE_IIOP_STUBS" value=3D"false" />
-    <option name=3D"ADDITIONAL_OPTIONS_STRING" value=3D"" />
-  </component>
-  <component name=3D"ScopeChooserConfigurable.UI">
-    <option name=3D"proportions">
-      <SplitterProportionsDataImpl />
-    </option>
-  </component>
-  <component name=3D"StarteamConfiguration">
-    <option name=3D"SERVER" value=3D"" />
-    <option name=3D"PORT" value=3D"49201" />
-    <option name=3D"USER" value=3D"" />
-    <option name=3D"PASSWORD" value=3D"" />
-    <option name=3D"PROJECT" value=3D"" />
-    <option name=3D"VIEW" value=3D"" />
-    <option name=3D"ALTERNATIVE_WORKING_PATH" value=3D"" />
-    <option name=3D"LOCK_ON_CHECKOUT" value=3D"false" />
-    <option name=3D"UNLOCK_ON_CHECKIN" value=3D"false" />
-  </component>
-  <component name=3D"Struts Assistant">
-    <option name=3D"showInputs" value=3D"true" />
-    <option name=3D"resources">
-      <value>
-        <option name=3D"strutsPath" />
-        <option name=3D"strutsHelp" />
-      </value>
-    </option>
-    <option name=3D"selectedTaglibs" />
-    <option name=3D"selectedTaglibs" />
-    <option name=3D"myStrutsValidationEnabled" value=3D"true" />
-    <option name=3D"myTilesValidationEnabled" value=3D"true" />
-    <option name=3D"myValidatorValidationEnabled" value=3D"true" />
-    <option name=3D"myReportErrorsAsWarnings" value=3D"true" />
-  </component>
-  <component name=3D"SvnChangesBrowserSettings">
-    <option name=3D"USE_AUTHOR_FIELD" value=3D"true" />
-    <option name=3D"AUTHOR" value=3D"" />
-    <option name=3D"LOCATION" value=3D"" />
-    <option name=3D"USE_PROJECT_SETTINGS" value=3D"true" />
-    <option name=3D"USE_ALTERNATE_LOCATION" value=3D"false" />
-  </component>
-  <component name=3D"VCS.FileViewConfiguration">
-    <option name=3D"SELECTED_STATUSES" value=3D"DEFAULT" />
-    <option name=3D"SELECTED_COLUMNS" value=3D"DEFAULT" />
-    <option name=3D"SHOW_FILTERS" value=3D"true" />
-    <option name=3D"CUSTOMIZE_VIEW" value=3D"true" />
-    <option name=3D"SHOW_FILE_HISTORY_AS_TREE" value=3D"true" />
-  </component>
-  <component name=3D"VcsDirectoryMappings">
-    <mapping directory=3D"" vcs=3D"svn" />
-  </component>
-  <component name=3D"VssConfiguration">
-    <option name=3D"CLIENT_PATH" value=3D"" />
-    <option name=3D"SRCSAFEINI_PATH" value=3D"" />
-    <option name=3D"USER_NAME" value=3D"" />
-    <option name=3D"PWD" value=3D"" />
-    <option name=3D"VSS_IS_INITIALIZED" value=3D"false" />
-    <CheckoutOptions>
-      <option name=3D"COMMENT" value=3D"" />
-      <option name=3D"DO_NOT_GET_LATEST_VERSION" value=3D"false" />
-      <option name=3D"REPLACE_WRITABLE" value=3D"false" />
-      <option name=3D"RECURSIVE" value=3D"false" />
-    </CheckoutOptions>
-    <CheckinOptions>
-      <option name=3D"COMMENT" value=3D"" />
-      <option name=3D"KEEP_CHECKED_OUT" value=3D"false" />
-      <option name=3D"RECURSIVE" value=3D"false" />
-    </CheckinOptions>
-    <AddOptions>
-      <option name=3D"STORE_ONLY_LATEST_VERSION" value=3D"false" />
-      <option name=3D"CHECK_OUT_IMMEDIATELY" value=3D"false" />
-      <option name=3D"FILE_TYPE" value=3D"0" />
-    </AddOptions>
-    <UndocheckoutOptions>
-      <option name=3D"MAKE_WRITABLE" value=3D"false" />
-      <option name=3D"REPLACE_LOCAL_COPY" value=3D"0" />
-      <option name=3D"RECURSIVE" value=3D"false" />
-    </UndocheckoutOptions>
-    <GetOptions>
-      <option name=3D"REPLACE_WRITABLE" value=3D"0" />
-      <option name=3D"MAKE_WRITABLE" value=3D"false" />
-      <option name=3D"ANSWER_NEGATIVELY" value=3D"false" />
-      <option name=3D"ANSWER_POSITIVELY" value=3D"false" />
-      <option name=3D"RECURSIVE" value=3D"false" />
-      <option name=3D"VERSION" />
-    </GetOptions>
-    <VssConfigurableExcludedFilesTag />
-  </component>
-  <component name=3D"WebServicesPlugin" addRequiredLibraries=3D"true" />
-  <component name=3D"com.intellij.ide.util.scopeChooser.ScopeChooserConfig=
urable" proportions=3D"" version=3D"1">
-    <option name=3D"myLastEditedConfigurable" />
-  </component>
-  <component name=3D"com.intellij.jsf.UserDefinedFacesConfigs">
-    <option name=3D"USER_DEFINED_CONFIGS">
-      <value>
-        <list size=3D"0" />
-      </value>
-    </option>
-  </component>
-  <component name=3D"com.intellij.openapi.roots.ui.configuration.projectRo=
ot.ProjectRootMasterDetailsConfigurable" proportions=3D"" version=3D"1">
-    <option name=3D"myPlainMode" value=3D"false" />
-    <option name=3D"myLastEditedConfigurable" />
-  </component>
-  <component name=3D"com.intellij.profile.ui.ErrorOptionsConfigurable" pro=
portions=3D"" version=3D"1">
-    <option name=3D"myLastEditedConfigurable" />
-  </component>
-  <component name=3D"testng.defaultConfiguration">
-    <outputDirectory />
-    <properties />
-    <groups />
-  </component>
-  <component name=3D"uidesigner-configuration">
-    <option name=3D"INSTRUMENT_CLASSES" value=3D"true" />
-    <option name=3D"COPY_FORMS_RUNTIME_TO_OUTPUT" value=3D"true" />
-    <option name=3D"DEFAULT_LAYOUT_MANAGER" value=3D"GridLayoutManager" />
-  </component>
-</project>
-

Deleted: benchmarks/CacheTests/trunk/CacheTests.iws
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- benchmarks/CacheTests/trunk/CacheTests.iws	2008-01-08 13:27:14 UTC (rev=
 5051)
+++ benchmarks/CacheTests/trunk/CacheTests.iws	2008-01-08 13:32:43 UTC (rev=
 5052)
@@ -1,477 +0,0 @@
-<?xml version=3D"1.0" encoding=3D"UTF-8"?>
-<project relativePaths=3D"false" version=3D"4">
-  <component name=3D"ChangeListManager">
-    <list default=3D"true" name=3D"Default" comment=3D"" />
-    <ignored path=3D"CacheTests.iws" />
-    <ignored path=3D".idea/workspace.xml" />
-  </component>
-  <component name=3D"ChangesViewManager" flattened_view=3D"true" show_igno=
red=3D"false" />
-  <component name=3D"Commander">
-    <leftPanel />
-    <rightPanel />
-    <splitter proportion=3D"0.5" />
-  </component>
-  <component name=3D"CreatePatchCommitExecutor">
-    <option name=3D"PATCH_PATH" value=3D"" />
-    <option name=3D"REVERSE_PATCH" value=3D"false" />
-  </component>
-  <component name=3D"DaemonCodeAnalyzer">
-    <disable_hints />
-  </component>
-  <component name=3D"DebuggerManager">
-    <breakpoint_any>
-      <breakpoint>
-        <option name=3D"NOTIFY_CAUGHT" value=3D"true" />
-        <option name=3D"NOTIFY_UNCAUGHT" value=3D"true" />
-        <option name=3D"ENABLED" value=3D"false" />
-        <option name=3D"LOG_ENABLED" value=3D"false" />
-        <option name=3D"LOG_EXPRESSION_ENABLED" value=3D"false" />
-        <option name=3D"SUSPEND_POLICY" value=3D"SuspendAll" />
-        <option name=3D"COUNT_FILTER_ENABLED" value=3D"false" />
-        <option name=3D"COUNT_FILTER" value=3D"0" />
-        <option name=3D"CONDITION_ENABLED" value=3D"false" />
-        <option name=3D"CLASS_FILTERS_ENABLED" value=3D"false" />
-        <option name=3D"INSTANCE_FILTERS_ENABLED" value=3D"false" />
-        <option name=3D"CONDITION" value=3D"" />
-        <option name=3D"LOG_MESSAGE" value=3D"" />
-      </breakpoint>
-      <breakpoint>
-        <option name=3D"NOTIFY_CAUGHT" value=3D"true" />
-        <option name=3D"NOTIFY_UNCAUGHT" value=3D"true" />
-        <option name=3D"ENABLED" value=3D"false" />
-        <option name=3D"LOG_ENABLED" value=3D"false" />
-        <option name=3D"LOG_EXPRESSION_ENABLED" value=3D"false" />
-        <option name=3D"SUSPEND_POLICY" value=3D"SuspendAll" />
-        <option name=3D"COUNT_FILTER_ENABLED" value=3D"false" />
-        <option name=3D"COUNT_FILTER" value=3D"0" />
-        <option name=3D"CONDITION_ENABLED" value=3D"false" />
-        <option name=3D"CLASS_FILTERS_ENABLED" value=3D"false" />
-        <option name=3D"INSTANCE_FILTERS_ENABLED" value=3D"false" />
-        <option name=3D"CONDITION" value=3D"" />
-        <option name=3D"LOG_MESSAGE" value=3D"" />
-      </breakpoint>
-    </breakpoint_any>
-    <breakpoint_rules />
-    <ui_properties />
-  </component>
-  <component name=3D"ErrorTreeViewConfiguration">
-    <option name=3D"IS_AUTOSCROLL_TO_SOURCE" value=3D"false" />
-    <option name=3D"HIDE_WARNINGS" value=3D"false" />
-  </component>
-  <component name=3D"FavoritesManager">
-    <favorites_list name=3D"CacheTests" />
-  </component>
-  <component name=3D"FileEditorManager">
-    <leaf>
-      <file leaf-file-name=3D"SessionTest.java" pinned=3D"false" current=
=3D"false" current-in-tab=3D"false">
-        <entry file=3D"file://$PROJECT_DIR$/src/perf/SessionTest.java">
-          <provider selected=3D"true" editor-type-id=3D"text-editor">
-            <state line=3D"60" column=3D"38" selection-start=3D"2310" sele=
ction-end=3D"2310" vertical-scroll-proportion=3D"0.9424084">
-              <folding>
-                <element signature=3D"imports" expanded=3D"true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name=3D"SessionFactoryJBC.java" pinned=3D"false" cur=
rent=3D"false" current-in-tab=3D"false">
-        <entry file=3D"file://$PROJECT_DIR$/src/perf/jbosscache/SessionFac=
toryJBC.java">
-          <provider selected=3D"true" editor-type-id=3D"text-editor">
-            <state line=3D"33" column=3D"27" selection-start=3D"1038" sele=
ction-end=3D"1038" vertical-scroll-proportion=3D"0.5183246">
-              <folding>
-                <element signature=3D"imports" expanded=3D"true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name=3D"config.xml" pinned=3D"false" current=3D"true=
" current-in-tab=3D"true">
-        <entry file=3D"file://$PROJECT_DIR$/config.xml">
-          <provider selected=3D"true" editor-type-id=3D"text-editor">
-            <state line=3D"153" column=3D"27" selection-start=3D"6489" sel=
ection-end=3D"6489" vertical-scroll-proportion=3D"2.2777777">
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name=3D"SessionFactoryPC.java" pinned=3D"false" curr=
ent=3D"false" current-in-tab=3D"false">
-        <entry file=3D"file://$PROJECT_DIR$/src/perf/pojocache/SessionFact=
oryPC.java">
-          <provider selected=3D"true" editor-type-id=3D"text-editor">
-            <state line=3D"29" column=3D"8" selection-start=3D"689" select=
ion-end=3D"689" vertical-scroll-proportion=3D"0.2984293">
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name=3D"SessionJBC.java" pinned=3D"false" current=3D=
"false" current-in-tab=3D"false">
-        <entry file=3D"file://$PROJECT_DIR$/src/perf/jbosscache/SessionJBC=
.java">
-          <provider selected=3D"true" editor-type-id=3D"text-editor">
-            <state line=3D"21" column=3D"27" selection-start=3D"416" selec=
tion-end=3D"416" vertical-scroll-proportion=3D"0.32984293">
-              <folding>
-                <element signature=3D"imports" expanded=3D"true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-    </leaf>
-  </component>
-  <component name=3D"FindManager">
-    <FindUsagesManager>
-      <setting name=3D"OPEN_NEW_TAB" value=3D"false" />
-    </FindUsagesManager>
-  </component>
-  <component name=3D"HierarchyBrowserManager">
-    <option name=3D"IS_AUTOSCROLL_TO_SOURCE" value=3D"false" />
-    <option name=3D"SORT_ALPHABETICALLY" value=3D"false" />
-    <option name=3D"HIDE_CLASSES_WHERE_METHOD_NOT_IMPLEMENTED" value=3D"fa=
lse" />
-  </component>
-  <component name=3D"ModuleEditorState">
-    <option name=3D"LAST_EDITED_MODULE_NAME" />
-    <option name=3D"LAST_EDITED_TAB_NAME" />
-  </component>
-  <component name=3D"ProjectLevelVcsManager">
-    <OptionsSetting value=3D"true" id=3D"Add" />
-    <OptionsSetting value=3D"true" id=3D"Remove" />
-    <OptionsSetting value=3D"true" id=3D"Checkin" />
-    <OptionsSetting value=3D"true" id=3D"Checkout" />
-    <OptionsSetting value=3D"true" id=3D"Update" />
-    <OptionsSetting value=3D"true" id=3D"Status" />
-    <OptionsSetting value=3D"true" id=3D"Edit" />
-    <ConfirmationsSetting value=3D"0" id=3D"Add" />
-    <ConfirmationsSetting value=3D"0" id=3D"Remove" />
-  </component>
-  <component name=3D"ProjectPane">
-    <subPane>
-      <PATH>
-        <PATH_ELEMENT>
-          <option name=3D"myItemId" value=3D"CacheTests" />
-          <option name=3D"myItemType" value=3D"com.intellij.ide.projectVie=
w.impl.nodes.ProjectViewProjectNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name=3D"myItemId" value=3D"CacheTests" />
-          <option name=3D"myItemType" value=3D"com.intellij.ide.projectVie=
w.impl.nodes.ProjectViewModuleNode" />
-        </PATH_ELEMENT>
-      </PATH>
-      <PATH>
-        <PATH_ELEMENT>
-          <option name=3D"myItemId" value=3D"CacheTests" />
-          <option name=3D"myItemType" value=3D"com.intellij.ide.projectVie=
w.impl.nodes.ProjectViewProjectNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name=3D"myItemId" value=3D"CacheTests" />
-          <option name=3D"myItemType" value=3D"com.intellij.ide.projectVie=
w.impl.nodes.ProjectViewModuleNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name=3D"myItemId" value=3D"PsiDirectory:$PROJECT_DIR$" />
-          <option name=3D"myItemType" value=3D"com.intellij.ide.projectVie=
w.impl.nodes.PsiDirectoryNode" />
-        </PATH_ELEMENT>
-      </PATH>
-    </subPane>
-  </component>
-  <component name=3D"ProjectReloadState">
-    <option name=3D"STATE" value=3D"2" />
-  </component>
-  <component name=3D"ProjectView">
-    <navigator currentView=3D"ProjectPane" proportions=3D"0.40088105" vers=
ion=3D"1" splitterProportion=3D"0.5">
-      <flattenPackages />
-      <showMembers />
-      <showModules />
-      <showLibraryContents />
-      <hideEmptyPackages />
-      <abbreviatePackageNames />
-      <showStructure ProjectPane=3D"true" />
-      <autoscrollToSource ProjectPane=3D"true" />
-      <autoscrollFromSource />
-      <sortByType />
-    </navigator>
-  </component>
-  <component name=3D"PropertiesComponent">
-    <property name=3D"GoToFile.includeJavaFiles" value=3D"false" />
-    <property name=3D"GoToClass.toSaveIncludeLibraries" value=3D"false" />
-    <property name=3D"MemberChooser.sorted" value=3D"false" />
-    <property name=3D"MemberChooser.showClasses" value=3D"true" />
-    <property name=3D"GoToClass.includeLibraries" value=3D"false" />
-    <property name=3D"MemberChooser.copyJavadoc" value=3D"false" />
-  </component>
-  <component name=3D"RecentsManager">
-    <key name=3D"CopyClassDialog.RECENTS_KEY">
-      <recent name=3D"perf" />
-    </key>
-    <key name=3D"MoveClassesOrPackagesDialog.RECENTS_KEY">
-      <recent name=3D"perf.pojocache" />
-    </key>
-  </component>
-  <component name=3D"RunManager">
-    <configuration default=3D"true" type=3D"Remote" factoryName=3D"Remote">
-      <option name=3D"USE_SOCKET_TRANSPORT" value=3D"true" />
-      <option name=3D"SERVER_MODE" value=3D"false" />
-      <option name=3D"SHMEM_ADDRESS" value=3D"javadebug" />
-      <option name=3D"HOST" value=3D"localhost" />
-      <option name=3D"PORT" value=3D"5005" />
-    </configuration>
-    <configuration default=3D"true" type=3D"JUnit" factoryName=3D"JUnit" e=
nabled=3D"false" merge=3D"false">
-      <module name=3D"" />
-      <option name=3D"ALTERNATIVE_JRE_PATH_ENABLED" value=3D"false" />
-      <option name=3D"ALTERNATIVE_JRE_PATH" />
-      <option name=3D"PACKAGE_NAME" />
-      <option name=3D"MAIN_CLASS_NAME" />
-      <option name=3D"METHOD_NAME" />
-      <option name=3D"TEST_OBJECT" value=3D"class" />
-      <option name=3D"VM_PARAMETERS" />
-      <option name=3D"PARAMETERS" />
-      <option name=3D"WORKING_DIRECTORY" value=3D"$PROJECT_DIR$" />
-      <option name=3D"ENV_VARIABLES" />
-      <option name=3D"PASS_PARENT_ENVS" value=3D"true" />
-      <option name=3D"ADDITIONAL_CLASS_PATH" />
-      <option name=3D"TEST_SEARCH_SCOPE">
-        <value defaultName=3D"wholeProject" />
-      </option>
-      <envs />
-      <method>
-        <option name=3D"Make" value=3D"true" />
-      </method>
-    </configuration>
-    <configuration default=3D"true" type=3D"Applet" factoryName=3D"Applet">
-      <module name=3D"" />
-      <option name=3D"MAIN_CLASS_NAME" />
-      <option name=3D"HTML_FILE_NAME" />
-      <option name=3D"HTML_USED" value=3D"false" />
-      <option name=3D"WIDTH" value=3D"400" />
-      <option name=3D"HEIGHT" value=3D"300" />
-      <option name=3D"POLICY_FILE" value=3D"C:/Program Files/JetBrains/Int=
elliJ IDEA 6.0/bin/appletviewer.policy" />
-      <option name=3D"VM_PARAMETERS" />
-      <option name=3D"ALTERNATIVE_JRE_PATH_ENABLED" value=3D"false" />
-      <option name=3D"ALTERNATIVE_JRE_PATH" />
-    </configuration>
-    <configuration default=3D"true" type=3D"Application" factoryName=3D"Ap=
plication" enabled=3D"false" merge=3D"false">
-      <option name=3D"MAIN_CLASS_NAME" />
-      <option name=3D"VM_PARAMETERS" />
-      <option name=3D"PROGRAM_PARAMETERS" />
-      <option name=3D"WORKING_DIRECTORY" value=3D"$PROJECT_DIR$" />
-      <option name=3D"ALTERNATIVE_JRE_PATH_ENABLED" value=3D"false" />
-      <option name=3D"ALTERNATIVE_JRE_PATH" />
-      <option name=3D"ENABLE_SWING_INSPECTOR" value=3D"false" />
-      <option name=3D"ENV_VARIABLES" />
-      <option name=3D"PASS_PARENT_ENVS" value=3D"true" />
-      <module name=3D"" />
-      <envs />
-      <method>
-        <option name=3D"Make" value=3D"true" />
-      </method>
-    </configuration>
-    <list size=3D"0" />
-  </component>
-  <component name=3D"StructureViewFactory">
-    <option name=3D"AUTOSCROLL_MODE" value=3D"true" />
-    <option name=3D"AUTOSCROLL_FROM_SOURCE" value=3D"false" />
-    <option name=3D"ACTIVE_ACTIONS" value=3D"SHOW_INHERITED,SHOW_INTERFACE=
S,SHOW_FIELDS" />
-  </component>
-  <component name=3D"SvnConfiguration">
-    <option name=3D"USER" value=3D"" />
-    <option name=3D"PASSWORD" value=3D"" />
-    <option name=3D"LAST_MERGED_REVISION" />
-    <option name=3D"UPDATE_RUN_STATUS" value=3D"false" />
-    <option name=3D"UPDATE_RECURSIVELY" value=3D"true" />
-    <option name=3D"MERGE_DRY_RUN" value=3D"false" />
-    <configuration useDefault=3D"true">/home/bela/.subversion</configurati=
on>
-  </component>
-  <component name=3D"TodoView" selected-index=3D"0">
-    <todo-panel id=3D"selected-file">
-      <are-packages-shown value=3D"false" />
-      <are-modules-shown value=3D"false" />
-      <flatten-packages value=3D"false" />
-      <is-autoscroll-to-source value=3D"true" />
-    </todo-panel>
-    <todo-panel id=3D"all">
-      <are-packages-shown value=3D"true" />
-      <are-modules-shown value=3D"false" />
-      <flatten-packages value=3D"false" />
-      <is-autoscroll-to-source value=3D"true" />
-    </todo-panel>
-    <todo-panel id=3D"default-changelist">
-      <are-packages-shown value=3D"false" />
-      <are-modules-shown value=3D"false" />
-      <flatten-packages value=3D"false" />
-      <is-autoscroll-to-source value=3D"false" />
-    </todo-panel>
-  </component>
-  <component name=3D"ToolWindowManager">
-    <frame x=3D"86" y=3D"39" width=3D"1411" height=3D"1131" extended-state=
=3D"0" />
-    <editor active=3D"false" />
-    <layout>
-      <window_info id=3D"Changes" active=3D"false" anchor=3D"bottom" auto_=
hide=3D"false" internal_type=3D"DOCKED" type=3D"DOCKED" visible=3D"false" w=
eight=3D"0.33" order=3D"8" />
-      <window_info id=3D"Palette" active=3D"false" anchor=3D"right" auto_h=
ide=3D"false" internal_type=3D"DOCKED" type=3D"DOCKED" visible=3D"false" we=
ight=3D"0.33" order=3D"3" />
-      <window_info id=3D"Ant Build" active=3D"false" anchor=3D"right" auto=
_hide=3D"false" internal_type=3D"DOCKED" type=3D"DOCKED" visible=3D"false" =
weight=3D"0.25" order=3D"1" />
-      <window_info id=3D"Find" active=3D"false" anchor=3D"bottom" auto_hid=
e=3D"false" internal_type=3D"DOCKED" type=3D"DOCKED" visible=3D"false" weig=
ht=3D"0.3296146" order=3D"1" />
-      <window_info id=3D"Debug" active=3D"false" anchor=3D"bottom" auto_hi=
de=3D"false" internal_type=3D"DOCKED" type=3D"DOCKED" visible=3D"false" wei=
ght=3D"0.4" order=3D"3" />
-      <window_info id=3D"Version Control" active=3D"false" anchor=3D"botto=
m" auto_hide=3D"false" internal_type=3D"DOCKED" type=3D"DOCKED" visible=3D"=
false" weight=3D"0.33" order=3D"8" />
-      <window_info id=3D"Messages" active=3D"false" anchor=3D"bottom" auto=
_hide=3D"false" internal_type=3D"DOCKED" type=3D"DOCKED" visible=3D"false" =
weight=3D"0.3296146" order=3D"8" />
-      <window_info id=3D"TODO" active=3D"false" anchor=3D"bottom" auto_hid=
e=3D"false" internal_type=3D"DOCKED" type=3D"DOCKED" visible=3D"false" weig=
ht=3D"0.33" order=3D"7" />
-      <window_info id=3D"Structure" active=3D"false" anchor=3D"left" auto_=
hide=3D"false" internal_type=3D"DOCKED" type=3D"DOCKED" visible=3D"false" w=
eight=3D"0.25" order=3D"1" />
-      <window_info id=3D"Commander" active=3D"false" anchor=3D"right" auto=
_hide=3D"false" internal_type=3D"DOCKED" type=3D"DOCKED" visible=3D"false" =
weight=3D"0.4" order=3D"0" />
-      <window_info id=3D"Maven projects" active=3D"false" anchor=3D"right"=
 auto_hide=3D"false" internal_type=3D"DOCKED" type=3D"DOCKED" visible=3D"fa=
lse" weight=3D"0.33" order=3D"3" />
-      <window_info id=3D"Module Dependencies" active=3D"false" anchor=3D"r=
ight" auto_hide=3D"false" internal_type=3D"DOCKED" type=3D"DOCKED" visible=
=3D"false" weight=3D"0.33" order=3D"3" />
-      <window_info id=3D"Project" active=3D"false" anchor=3D"left" auto_hi=
de=3D"false" internal_type=3D"DOCKED" type=3D"DOCKED" visible=3D"true" weig=
ht=3D"0.24926035" order=3D"0" />
-      <window_info id=3D"Dependency Viewer" active=3D"false" anchor=3D"bot=
tom" auto_hide=3D"false" internal_type=3D"DOCKED" type=3D"DOCKED" visible=
=3D"false" weight=3D"0.33" order=3D"8" />
-      <window_info id=3D"Hierarchy" active=3D"false" anchor=3D"right" auto=
_hide=3D"false" internal_type=3D"DOCKED" type=3D"DOCKED" visible=3D"false" =
weight=3D"0.25" order=3D"2" />
-      <window_info id=3D"Inspection" active=3D"false" anchor=3D"bottom" au=
to_hide=3D"false" internal_type=3D"DOCKED" type=3D"DOCKED" visible=3D"false=
" weight=3D"0.4" order=3D"6" />
-      <window_info id=3D"Duplicates" active=3D"false" anchor=3D"bottom" au=
to_hide=3D"false" internal_type=3D"DOCKED" type=3D"DOCKED" visible=3D"false=
" weight=3D"0.33" order=3D"8" />
-      <window_info id=3D"Run" active=3D"false" anchor=3D"bottom" auto_hide=
=3D"false" internal_type=3D"DOCKED" type=3D"DOCKED" visible=3D"false" weigh=
t=3D"0.33" order=3D"2" />
-      <window_info id=3D"Cvs" active=3D"false" anchor=3D"bottom" auto_hide=
=3D"false" internal_type=3D"DOCKED" type=3D"DOCKED" visible=3D"false" weigh=
t=3D"0.25" order=3D"5" />
-      <window_info id=3D"Message" active=3D"false" anchor=3D"bottom" auto_=
hide=3D"false" internal_type=3D"DOCKED" type=3D"DOCKED" visible=3D"false" w=
eight=3D"0.33" order=3D"0" />
-      <window_info id=3D"SVN Repositories" active=3D"true" anchor=3D"botto=
m" auto_hide=3D"false" internal_type=3D"DOCKED" type=3D"DOCKED" visible=3D"=
true" weight=3D"0.3296146" order=3D"-1" />
-      <window_info id=3D"Web" active=3D"false" anchor=3D"left" auto_hide=
=3D"false" internal_type=3D"DOCKED" type=3D"DOCKED" visible=3D"false" weigh=
t=3D"0.25" order=3D"2" />
-      <window_info id=3D"EJB" active=3D"false" anchor=3D"bottom" auto_hide=
=3D"false" internal_type=3D"DOCKED" type=3D"DOCKED" visible=3D"false" weigh=
t=3D"0.25" order=3D"4" />
-    </layout>
-  </component>
-  <component name=3D"VcsManagerConfiguration">
-    <option name=3D"OFFER_MOVE_TO_ANOTHER_CHANGELIST_ON_PARTIAL_COMMIT" va=
lue=3D"true" />
-    <option name=3D"CHECK_CODE_SMELLS_BEFORE_PROJECT_COMMIT" value=3D"true=
" />
-    <option name=3D"PERFORM_UPDATE_IN_BACKGROUND" value=3D"true" />
-    <option name=3D"PERFORM_COMMIT_IN_BACKGROUND" value=3D"true" />
-    <option name=3D"PERFORM_EDIT_IN_BACKGROUND" value=3D"true" />
-    <option name=3D"PERFORM_ADD_REMOVE_IN_BACKGROUND" value=3D"true" />
-    <option name=3D"FORCE_NON_EMPTY_COMMENT" value=3D"false" />
-    <option name=3D"LAST_COMMIT_MESSAGE" />
-    <option name=3D"OPTIMIZE_IMPORTS_BEFORE_PROJECT_COMMIT" value=3D"false=
" />
-    <option name=3D"REFORMAT_BEFORE_PROJECT_COMMIT" value=3D"false" />
-    <option name=3D"REFORMAT_BEFORE_FILE_COMMIT" value=3D"false" />
-    <option name=3D"FILE_HISTORY_DIALOG_COMMENTS_SPLITTER_PROPORTION" valu=
e=3D"0.8" />
-    <option name=3D"FILE_HISTORY_DIALOG_SPLITTER_PROPORTION" value=3D"0.5"=
 />
-    <option name=3D"ACTIVE_VCS_NAME" />
-    <option name=3D"UPDATE_GROUP_BY_PACKAGES" value=3D"false" />
-    <option name=3D"UPDATE_GROUP_BY_CHANGELIST" value=3D"false" />
-    <option name=3D"SHOW_FILE_HISTORY_AS_TREE" value=3D"false" />
-    <option name=3D"FILE_HISTORY_SPLITTER_PROPORTION" value=3D"0.6" />
-  </component>
-  <component name=3D"antWorkspaceConfiguration">
-    <option name=3D"IS_AUTOSCROLL_TO_SOURCE" value=3D"false" />
-    <option name=3D"FILTER_TARGETS" value=3D"false" />
-  </component>
-  <component name=3D"editorHistoryManager">
-    <entry file=3D"file://$PROJECT_DIR$/pc.sh">
-      <provider selected=3D"true" editor-type-id=3D"text-editor">
-        <state line=3D"4" column=3D"0" selection-start=3D"24" selection-en=
d=3D"24" vertical-scroll-proportion=3D"0.06382979">
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file=3D"file://$PROJECT_DIR$/CacheTests.iml">
-      <provider selected=3D"true" editor-type-id=3D"text-editor">
-        <state line=3D"0" column=3D"0" selection-start=3D"0" selection-end=
=3D"0" vertical-scroll-proportion=3D"0.0">
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file=3D"file://$PROJECT_DIR$/run.sh">
-      <provider selected=3D"true" editor-type-id=3D"text-editor">
-        <state line=3D"9" column=3D"123" selection-start=3D"188" selection=
-end=3D"188" vertical-scroll-proportion=3D"0.14361702">
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file=3D"file://$PROJECT_DIR$/tc.sh">
-      <provider selected=3D"true" editor-type-id=3D"text-editor">
-        <state line=3D"12" column=3D"0" selection-start=3D"161" selection-=
end=3D"276" vertical-scroll-proportion=3D"0.19148937">
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file=3D"file://$PROJECT_DIR$/obsolete/SessionTestPC.java.old">
-      <provider selected=3D"true" editor-type-id=3D"text-editor">
-        <state line=3D"0" column=3D"0" selection-start=3D"0" selection-end=
=3D"0" vertical-scroll-proportion=3D"-0.4712042">
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file=3D"file://$PROJECT_DIR$/src/perf/coherence/SessionCoherenc=
e.java">
-      <provider selected=3D"true" editor-type-id=3D"text-editor">
-        <state line=3D"11" column=3D"0" selection-start=3D"215" selection-=
end=3D"215" vertical-scroll-proportion=3D"0.17277487">
-          <folding>
-            <element signature=3D"imports" expanded=3D"true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file=3D"file://$PROJECT_DIR$/src/perf/coherence/SessionFactoryC=
oherence.java">
-      <provider selected=3D"true" editor-type-id=3D"text-editor">
-        <state line=3D"20" column=3D"35" selection-start=3D"456" selection=
-end=3D"472" vertical-scroll-proportion=3D"0.31413612">
-          <folding>
-            <element signature=3D"imports" expanded=3D"true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file=3D"file://$PROJECT_DIR$/ch.sh">
-      <provider selected=3D"true" editor-type-id=3D"text-editor">
-        <state line=3D"2" column=3D"0" selection-start=3D"61" selection-en=
d=3D"61" vertical-scroll-proportion=3D"0.03141361">
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file=3D"file://$PROJECT_DIR$/jbc.sh">
-      <provider selected=3D"true" editor-type-id=3D"text-editor">
-        <state line=3D"2" column=3D"0" selection-start=3D"56" selection-en=
d=3D"56" vertical-scroll-proportion=3D"0.03141361">
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file=3D"jar://$PROJECT_DIR$/lib/jbosscache-core.jar!/org/jboss/=
cache/Node.class">
-      <provider selected=3D"true" editor-type-id=3D"text-editor">
-        <state line=3D"25" column=3D"30" selection-start=3D"710" selection=
-end=3D"710" vertical-scroll-proportion=3D"0.3329843">
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file=3D"file://$PROJECT_DIR$/src/perf/SessionTest.java">
-      <provider selected=3D"true" editor-type-id=3D"text-editor">
-        <state line=3D"60" column=3D"38" selection-start=3D"2310" selectio=
n-end=3D"2310" vertical-scroll-proportion=3D"0.9424084">
-          <folding>
-            <element signature=3D"imports" expanded=3D"true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file=3D"file://$PROJECT_DIR$/src/perf/pojocache/SessionPC.java">
-      <provider selected=3D"true" editor-type-id=3D"text-editor">
-        <state line=3D"13" column=3D"13" selection-start=3D"238" selection=
-end=3D"238" vertical-scroll-proportion=3D"0.14136125">
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file=3D"file://$PROJECT_DIR$/src/perf/jbosscache/SessionJBC.jav=
a">
-      <provider selected=3D"true" editor-type-id=3D"text-editor">
-        <state line=3D"21" column=3D"27" selection-start=3D"416" selection=
-end=3D"416" vertical-scroll-proportion=3D"0.32984293">
-          <folding>
-            <element signature=3D"imports" expanded=3D"true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file=3D"file://$PROJECT_DIR$/src/perf/pojocache/SessionFactoryP=
C.java">
-      <provider selected=3D"true" editor-type-id=3D"text-editor">
-        <state line=3D"29" column=3D"8" selection-start=3D"689" selection-=
end=3D"689" vertical-scroll-proportion=3D"0.2984293">
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file=3D"file://$PROJECT_DIR$/src/perf/jbosscache/SessionFactory=
JBC.java">
-      <provider selected=3D"true" editor-type-id=3D"text-editor">
-        <state line=3D"33" column=3D"27" selection-start=3D"1038" selectio=
n-end=3D"1038" vertical-scroll-proportion=3D"0.5183246">
-          <folding>
-            <element signature=3D"imports" expanded=3D"true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file=3D"file://$PROJECT_DIR$/config.xml">
-      <provider selected=3D"true" editor-type-id=3D"text-editor">
-        <state line=3D"153" column=3D"27" selection-start=3D"6489" selecti=
on-end=3D"6489" vertical-scroll-proportion=3D"2.2777777">
-          <folding />
-        </state>
-      </provider>
-    </entry>
-  </component>
-</project>
-


--===============8478653662807095984==--

From jbosscache-commits at lists.jboss.org Tue Jan  8 08:41:50 2008
Content-Type: multipart/mixed; boundary="===============1889011748430024036=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r5053 - in
 benchmarks/CacheTests/trunk: lib and 1 other directory.
Date: Tue, 08 Jan 2008 08:41:50 -0500
Message-ID: <E1JCEiE-0007mo-Jg@committer01.frg.pub.inap.atl.jboss.com>

--===============1889011748430024036==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: bela(a)jboss.com
Date: 2008-01-08 08:41:50 -0500 (Tue, 08 Jan 2008)
New Revision: 5053

Removed:
   benchmarks/CacheTests/trunk/Tests.iml
Modified:
   benchmarks/CacheTests/trunk/
   benchmarks/CacheTests/trunk/lib/
Log:



Property changes on: benchmarks/CacheTests/trunk
___________________________________________________________________
Name: svn:ignore
   + CacheTests.i*


Deleted: benchmarks/CacheTests/trunk/Tests.iml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- benchmarks/CacheTests/trunk/Tests.iml	2008-01-08 13:32:43 UTC (rev 5052)
+++ benchmarks/CacheTests/trunk/Tests.iml	2008-01-08 13:41:50 UTC (rev 5053)
@@ -1,313 +0,0 @@
-<?xml version=3D"1.0" encoding=3D"UTF-8"?>
-<module relativePaths=3D"true" type=3D"JAVA_MODULE" version=3D"4">
-  <component name=3D"NewModuleRootManager" inherit-compiler-output=3D"fals=
e">
-    <output url=3D"file://$MODULE_DIR$/classes" />
-    <exclude-output />
-    <output-test url=3D"file://$MODULE_DIR$/classes" />
-    <content url=3D"file://$MODULE_DIR$">
-      <sourceFolder url=3D"file://$MODULE_DIR$" isTestSource=3D"false" pac=
kagePrefix=3D"multicast" />
-    </content>
-    <orderEntry type=3D"inheritedJdk" />
-    <orderEntry type=3D"sourceFolder" forTests=3D"false" />
-    <orderEntry type=3D"module-library">
-      <library>
-        <CLASSES>
-          <root url=3D"jar://$APPLICATION_HOME_DIR$/lib/javaee.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type=3D"module-library">
-      <library>
-        <CLASSES>
-          <root url=3D"jar://$MODULE_DIR$/lib/commons-logging.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type=3D"module-library">
-      <library>
-        <CLASSES>
-          <root url=3D"jar://$MODULE_DIR$/lib/jgroups.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type=3D"module-library">
-      <library>
-        <CLASSES>
-          <root url=3D"jar://$MODULE_DIR$/lib/jboss-logging-spi.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type=3D"module-library">
-      <library>
-        <CLASSES>
-          <root url=3D"jar://$MODULE_DIR$/lib/jbosscache-core.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type=3D"module-library">
-      <library>
-        <CLASSES>
-          <root url=3D"jar://$MODULE_DIR$/lib/tangosol.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type=3D"module-library">
-      <library>
-        <CLASSES>
-          <root url=3D"jar://$MODULE_DIR$/lib/log4j.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type=3D"module-library">
-      <library>
-        <CLASSES>
-          <root url=3D"jar://$MODULE_DIR$/lib/ant.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type=3D"module-library">
-      <library>
-        <CLASSES>
-          <root url=3D"jar://$MODULE_DIR$/lib/jcip-annotations.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type=3D"module-library">
-      <library>
-        <CLASSES>
-          <root url=3D"jar://$MODULE_DIR$/lib/junit.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type=3D"module-library">
-      <library>
-        <CLASSES>
-          <root url=3D"jar://$MODULE_DIR$/lib/httpclient.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type=3D"module-library">
-      <library>
-        <CLASSES>
-          <root url=3D"jar://$MODULE_DIR$/lib/jbosscache-core-tests.jar!/"=
 />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type=3D"module-library">
-      <library>
-        <CLASSES>
-          <root url=3D"jar://$MODULE_DIR$/lib/dtdparser121.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type=3D"module-library">
-      <library>
-        <CLASSES>
-          <root url=3D"jar://$MODULE_DIR$/lib/testng.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type=3D"module-library">
-      <library>
-        <CLASSES>
-          <root url=3D"jar://$MODULE_DIR$/lib/jboss-common-logging-spi.jar=
!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type=3D"module-library">
-      <library>
-        <CLASSES>
-          <root url=3D"jar://$MODULE_DIR$/lib/jboss-aop.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type=3D"module-library">
-      <library>
-        <CLASSES>
-          <root url=3D"jar://$MODULE_DIR$/lib/jbossxb.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type=3D"module-library">
-      <library>
-        <CLASSES>
-          <root url=3D"jar://$MODULE_DIR$/lib/je.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type=3D"module-library">
-      <library>
-        <CLASSES>
-          <root url=3D"jar://$MODULE_DIR$/lib/qdox.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type=3D"module-library">
-      <library>
-        <CLASSES>
-          <root url=3D"jar://$MODULE_DIR$/lib/jboss-javaee.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type=3D"module-library">
-      <library>
-        <CLASSES>
-          <root url=3D"jar://$MODULE_DIR$/lib/tc.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type=3D"module-library">
-      <library>
-        <CLASSES>
-          <root url=3D"jar://$MODULE_DIR$/lib/activation.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type=3D"module-library">
-      <library>
-        <CLASSES>
-          <root url=3D"jar://$MODULE_DIR$/lib/commons-codec-1.3.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type=3D"module-library">
-      <library>
-        <CLASSES>
-          <root url=3D"jar://$MODULE_DIR$/lib/derby.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type=3D"module-library">
-      <library>
-        <CLASSES>
-          <root url=3D"jar://$MODULE_DIR$/lib/jdbm.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type=3D"module-library">
-      <library>
-        <CLASSES>
-          <root url=3D"jar://$MODULE_DIR$/lib/trove.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type=3D"module-library">
-      <library>
-        <CLASSES>
-          <root url=3D"jar://$MODULE_DIR$/lib/jbosscache-pojo.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type=3D"module-library">
-      <library>
-        <CLASSES>
-          <root url=3D"jar://$MODULE_DIR$/lib/jboss-container.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type=3D"module-library">
-      <library>
-        <CLASSES>
-          <root url=3D"jar://$MODULE_DIR$/lib/jboss-common-core.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type=3D"module-library">
-      <library>
-        <CLASSES>
-          <root url=3D"jar://$MODULE_DIR$/lib/javassist.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type=3D"module-library">
-      <library>
-        <CLASSES>
-          <root url=3D"jar://$MODULE_DIR$/lib/coherence.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type=3D"module-library">
-      <library>
-        <CLASSES>
-          <root url=3D"jar://$MODULE_DIR$/lib/c3p0.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type=3D"module-library">
-      <library>
-        <CLASSES>
-          <root url=3D"jar://$MODULE_DIR$/lib/xercesImpl.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type=3D"library" name=3D"lib" level=3D"project" />
-    <orderEntryProperties />
-  </component>
-</module>
-


Property changes on: benchmarks/CacheTests/trunk/lib
___________________________________________________________________
Name: svn:ignore
   + je*.jar
coherence*.jar
tc*.jar
tangosol*.jar



--===============1889011748430024036==--

From jbosscache-commits at lists.jboss.org Tue Jan  8 08:44:33 2008
Content-Type: multipart/mixed; boundary="===============6134686113718224807=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r5054 -
 benchmarks/CacheTests/trunk.
Date: Tue, 08 Jan 2008 08:44:33 -0500
Message-ID: <E1JCEkr-0007uE-F1@committer01.frg.pub.inap.atl.jboss.com>

--===============6134686113718224807==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: bela(a)jboss.com
Date: 2008-01-08 08:44:33 -0500 (Tue, 08 Jan 2008)
New Revision: 5054

Added:
   benchmarks/CacheTests/trunk/README
Log:
ns

Added: benchmarks/CacheTests/trunk/README
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- benchmarks/CacheTests/trunk/README	                        (rev 0)
+++ benchmarks/CacheTests/trunk/README	2008-01-08 13:44:33 UTC (rev 5054)
@@ -0,0 +1,10 @@
+
+
+Version: $Id$
+
+Benchmarking Coherence and Terracotta
+=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
+
+Download the following JARs from the respetive web sites and copy them int=
o the ./lib directory:
+- for Terracotta: tc.jar, je.jar
+- for Coherence: tangosol.jar and coherence.jar


--===============6134686113718224807==--

From jbosscache-commits at lists.jboss.org Tue Jan  8 08:51:06 2008
Content-Type: multipart/mixed; boundary="===============3260516219962551752=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r5055 -
 benchmarks/CacheTests/trunk.
Date: Tue, 08 Jan 2008 08:51:05 -0500
Message-ID: <E1JCErB-0001Il-K4@committer01.frg.pub.inap.atl.jboss.com>

--===============3260516219962551752==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: bela(a)jboss.com
Date: 2008-01-08 08:51:05 -0500 (Tue, 08 Jan 2008)
New Revision: 5055

Added:
   benchmarks/CacheTests/trunk/build.xml
Log:
ns

Added: benchmarks/CacheTests/trunk/build.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- benchmarks/CacheTests/trunk/build.xml	                        (rev 0)
+++ benchmarks/CacheTests/trunk/build.xml	2008-01-08 13:51:05 UTC (rev 5055)
@@ -0,0 +1,111 @@
+<?xml version=3D"1.0" encoding=3D"ISO-8859-1"?>
+<project name=3D"cachetests" default=3D"all">
+  =

+  =

+
+  <!-- Compiler options -->
+  =

+  <property name=3D"compiler.debug" value=3D"on"/>
+  <property name=3D"compiler.generate.no.warnings" value=3D"off"/>
+  <property name=3D"compiler.args" value=3D""/>
+  <property name=3D"compiler.max.memory" value=3D"128m"/>
+  <patternset id=3D"ignored.files">
+    <exclude name=3D"**/CVS/**"/>
+    <exclude name=3D"**/SCCS/**"/>
+    <exclude name=3D"**/RCS/**"/>
+    <exclude name=3D"**/rcs/**"/>
+    <exclude name=3D"**/.DS_Store/**"/>
+    <exclude name=3D"**/.svn/**"/>
+    <exclude name=3D"**/vssver.scc/**"/>
+    <exclude name=3D"**/vssver2.scc/**"/>
+    <exclude name=3D"**/.sbas/**"/>
+    <exclude name=3D"**/.IJI.*/**"/>
+  </patternset>
+  <patternset id=3D"compiler.resources">
+    <include name=3D"**/?*.properties"/>
+    <include name=3D"**/?*.xml"/>
+    <include name=3D"**/?*.gif"/>
+    <include name=3D"**/?*.png"/>
+    <include name=3D"**/?*.jpeg"/>
+    <include name=3D"**/?*.jpg"/>
+    <include name=3D"**/?*.html"/>
+    <include name=3D"**/?*.dtd"/>
+    <include name=3D"**/?*.tld"/>
+  </patternset>
+  =

+
+
+  =

+  <!-- Module CacheTests -->
+  =

+  <dirname property=3D"module.cachetests.basedir" file=3D"${ant.file}"/>
+    <property name=3D"lib.dir" value=3D"./lib"/>
+  =

+  =

+
+  <property name=3D"compiler.args.cachetests" value=3D"${compiler.args}"/>
+  =

+  <property name=3D"cachetests.output.dir" value=3D"${module.cachetests.ba=
sedir}/classes"/>
+  <property name=3D"cachetests.testoutput.dir" value=3D"${module.cachetest=
s.basedir}/classes"/>
+  =

+  <path id=3D"cachetests.module.bootclasspath">
+    <!-- Paths to be included in compilation bootclasspath -->
+  </path>
+  =

+  <path id=3D"cachetests.module.classpath">
+      <fileset dir=3D"${lib.dir}">
+          <include name=3D"*.jar"/>
+      </fileset>
+  </path>
+  =

+
+  <patternset id=3D"excluded.from.module.cachetests">
+    <patternset refid=3D"ignored.files"/>
+  </patternset>
+  =

+  <patternset id=3D"excluded.from.compilation.cachetests">
+    <patternset refid=3D"excluded.from.module.cachetests"/>
+  </patternset>
+  =

+  <path id=3D"cachetests.module.sourcepath">
+    <dirset dir=3D"${module.cachetests.basedir}">
+      <include name=3D"src"/>
+    </dirset>
+  </path>
+  =

+  =

+  <target name=3D"compile.module.cachetests" depends=3D"compile.module.cac=
hetests.production,compile.module.cachetests.tests" description=3D"Compile =
module CacheTests"/>
+  =

+  <target name=3D"compile.module.cachetests.production" description=3D"Com=
pile module CacheTests; production classes">
+    <mkdir dir=3D"${cachetests.output.dir}"/>
+    <javac destdir=3D"${cachetests.output.dir}" debug=3D"${compiler.debug}=
" nowarn=3D"${compiler.generate.no.warnings}" memorymaximumsize=3D"${compil=
er.max.memory}" fork=3D"true">
+      <compilerarg line=3D"${compiler.args.cachetests}"/>
+      <bootclasspath refid=3D"cachetests.module.bootclasspath"/>
+      <classpath refid=3D"cachetests.module.classpath"/>
+      <src refid=3D"cachetests.module.sourcepath"/>
+      <patternset refid=3D"excluded.from.compilation.cachetests"/>
+    </javac>
+    =

+    <copy todir=3D"${cachetests.output.dir}">
+      <fileset dir=3D"${module.cachetests.basedir}/src">
+        <patternset refid=3D"compiler.resources"/>
+        <type type=3D"file"/>
+      </fileset>
+    </copy>
+  </target>
+  =

+  <target name=3D"compile.module.cachetests.tests" depends=3D"compile.modu=
le.cachetests.production" description=3D"compile module CacheTests; test cl=
asses" unless=3D"skip.tests"/>
+  =

+  <target name=3D"clean.module.cachetests" description=3D"cleanup module">
+    <delete dir=3D"${cachetests.output.dir}"/>
+    <delete dir=3D"${cachetests.testoutput.dir}"/>
+  </target>
+  =

+  <target name=3D"init" description=3D"Build initialization">
+    <!-- Perform any build initialization in this target -->
+  </target>
+  =

+  <target name=3D"clean" depends=3D"clean.module.cachetests" description=
=3D"cleanup all"/>
+  =

+  <target name=3D"all" depends=3D"init, clean, compile.module.cachetests" =
description=3D"build all"/>
+</project>
\ No newline at end of file


--===============3260516219962551752==--

From jbosscache-commits at lists.jboss.org Tue Jan  8 08:55:44 2008
Content-Type: multipart/mixed; boundary="===============2429107099022899308=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r5056 -
 benchmarks/CacheTests/trunk.
Date: Tue, 08 Jan 2008 08:55:42 -0500
Message-ID: <E1JCEve-0002De-4a@committer01.frg.pub.inap.atl.jboss.com>

--===============2429107099022899308==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: bela(a)jboss.com
Date: 2008-01-08 08:55:42 -0500 (Tue, 08 Jan 2008)
New Revision: 5056

Modified:
   benchmarks/CacheTests/trunk/README
Log:
ns

Modified: benchmarks/CacheTests/trunk/README
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- benchmarks/CacheTests/trunk/README	2008-01-08 13:51:05 UTC (rev 5055)
+++ benchmarks/CacheTests/trunk/README	2008-01-08 13:55:42 UTC (rev 5056)
@@ -2,9 +2,29 @@
 =

 Version: $Id$
 =

+
+
 Benchmarking Coherence and Terracotta
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
 =

 Download the following JARs from the respetive web sites and copy them int=
o the ./lib directory:
 - for Terracotta: tc.jar, je.jar
 - for Coherence: tangosol.jar and coherence.jar
+
+
+Building
+--------
+
+"ant clean all" compiles all classes into ./classes
+
+Running
+-------
+
+The various *.sh scripts run the individual cache tests:
+
+- ch.sh: Coherence
+- jbc.sh: JBossCache
+- pc.sh: PojoCache. Note that -Djboss.aop.path needs to be defined, plus t=
he -javaagent:lib/jboss-aop.jar option
+                    needs to be set
+- tc.sh: Terracotta. You may have to change the location of Terracotta, e.=
g. ../terracotta-2.5.0/bin/dso-java.sh
+


--===============2429107099022899308==--

From jbosscache-commits at lists.jboss.org Tue Jan  8 08:56:52 2008
Content-Type: multipart/mixed; boundary="===============0498476211944336175=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r5057 -
 benchmarks/CacheTests/trunk.
Date: Tue, 08 Jan 2008 08:56:51 -0500
Message-ID: <E1JCEwl-0002FG-RT@committer01.frg.pub.inap.atl.jboss.com>

--===============0498476211944336175==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: bela(a)jboss.com
Date: 2008-01-08 08:56:51 -0500 (Tue, 08 Jan 2008)
New Revision: 5057

Modified:
   benchmarks/CacheTests/trunk/README
Log:
ns

Modified: benchmarks/CacheTests/trunk/README
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- benchmarks/CacheTests/trunk/README	2008-01-08 13:55:42 UTC (rev 5056)
+++ benchmarks/CacheTests/trunk/README	2008-01-08 13:56:51 UTC (rev 5057)
@@ -1,9 +1,11 @@
 =

 =

 Version: $Id$
+last changes: $LastChangedDate$
 =

 =

 =

+
 Benchmarking Coherence and Terracotta
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
 =



--===============0498476211944336175==--

From jbosscache-commits at lists.jboss.org Tue Jan  8 08:58:59 2008
Content-Type: multipart/mixed; boundary="===============1415268702706711403=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r5058 -
 benchmarks/CacheTests/trunk.
Date: Tue, 08 Jan 2008 08:58:59 -0500
Message-ID: <E1JCEyp-0002K1-8y@committer01.frg.pub.inap.atl.jboss.com>

--===============1415268702706711403==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: bela(a)jboss.com
Date: 2008-01-08 08:58:59 -0500 (Tue, 08 Jan 2008)
New Revision: 5058

Modified:
   benchmarks/CacheTests/trunk/README
Log:
ns


Property changes on: benchmarks/CacheTests/trunk/README
___________________________________________________________________
Name: svn:keywords
   + Id LastChangedDate


--===============1415268702706711403==--

From jbosscache-commits at lists.jboss.org Tue Jan  8 09:00:58 2008
Content-Type: multipart/mixed; boundary="===============4190232913105479965=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r5059 - in
 benchmarks/CacheTests/trunk: lib and 6 other directories.
Date: Tue, 08 Jan 2008 09:00:58 -0500
Message-ID: <E1JCF0k-0003Ey-Mc@committer01.frg.pub.inap.atl.jboss.com>

--===============4190232913105479965==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: bela(a)jboss.com
Date: 2008-01-08 09:00:58 -0500 (Tue, 08 Jan 2008)
New Revision: 5059

Modified:
   benchmarks/CacheTests/trunk/README
   benchmarks/CacheTests/trunk/build.xml
   benchmarks/CacheTests/trunk/ch.sh
   benchmarks/CacheTests/trunk/config.xml
   benchmarks/CacheTests/trunk/jbc.sh
   benchmarks/CacheTests/trunk/lib/activation.jar
   benchmarks/CacheTests/trunk/lib/ant.jar
   benchmarks/CacheTests/trunk/lib/c3p0.jar
   benchmarks/CacheTests/trunk/lib/commons-codec-1.3.jar
   benchmarks/CacheTests/trunk/lib/commons-logging.jar
   benchmarks/CacheTests/trunk/lib/derby.jar
   benchmarks/CacheTests/trunk/lib/dtdparser121.jar
   benchmarks/CacheTests/trunk/lib/javassist.jar
   benchmarks/CacheTests/trunk/lib/jboss-aop.jar
   benchmarks/CacheTests/trunk/lib/jboss-common-core.jar
   benchmarks/CacheTests/trunk/lib/jboss-common-logging-spi.jar
   benchmarks/CacheTests/trunk/lib/jboss-container.jar
   benchmarks/CacheTests/trunk/lib/jboss-javaee.jar
   benchmarks/CacheTests/trunk/lib/jboss-logging-spi.jar
   benchmarks/CacheTests/trunk/lib/jbosscache-core.jar
   benchmarks/CacheTests/trunk/lib/jbosscache-pojo.jar
   benchmarks/CacheTests/trunk/lib/jbossxb.jar
   benchmarks/CacheTests/trunk/lib/jcip-annotations.jar
   benchmarks/CacheTests/trunk/lib/jdbm.jar
   benchmarks/CacheTests/trunk/lib/jgroups.jar
   benchmarks/CacheTests/trunk/lib/junit.jar
   benchmarks/CacheTests/trunk/lib/log4j.jar
   benchmarks/CacheTests/trunk/lib/pojocache-aop.xml
   benchmarks/CacheTests/trunk/lib/qdox.jar
   benchmarks/CacheTests/trunk/lib/testng.jar
   benchmarks/CacheTests/trunk/lib/trove.jar
   benchmarks/CacheTests/trunk/lib/xercesImpl.jar
   benchmarks/CacheTests/trunk/obsolete/SessionTestCoherence.old
   benchmarks/CacheTests/trunk/obsolete/SessionTestJBC.java.old
   benchmarks/CacheTests/trunk/obsolete/SessionTestPC.java.old
   benchmarks/CacheTests/trunk/obsolete/SessionTestTC.java.old
   benchmarks/CacheTests/trunk/pc.sh
   benchmarks/CacheTests/trunk/pojocache-aop.xml
   benchmarks/CacheTests/trunk/run.sh
   benchmarks/CacheTests/trunk/src/perf/Session.java
   benchmarks/CacheTests/trunk/src/perf/SessionFactory.java
   benchmarks/CacheTests/trunk/src/perf/SessionTest.java
   benchmarks/CacheTests/trunk/src/perf/coherence/SessionCoherence.java
   benchmarks/CacheTests/trunk/src/perf/coherence/SessionFactoryCoherence.j=
ava
   benchmarks/CacheTests/trunk/src/perf/jbosscache/SessionFactoryJBC.java
   benchmarks/CacheTests/trunk/src/perf/jbosscache/SessionJBC.java
   benchmarks/CacheTests/trunk/src/perf/pojocache/SessionFactoryPC.java
   benchmarks/CacheTests/trunk/src/perf/pojocache/SessionPC.java
   benchmarks/CacheTests/trunk/src/perf/terracotta/SessionFactoryTC.java
   benchmarks/CacheTests/trunk/src/perf/terracotta/SessionTC.java
   benchmarks/CacheTests/trunk/tc.sh
   benchmarks/CacheTests/trunk/tc5-config.xml
   benchmarks/CacheTests/trunk/tmp.sh
Log:
ns

Modified: benchmarks/CacheTests/trunk/README
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- benchmarks/CacheTests/trunk/README	2008-01-08 13:58:59 UTC (rev 5058)
+++ benchmarks/CacheTests/trunk/README	2008-01-08 14:00:58 UTC (rev 5059)
@@ -1,7 +1,7 @@
 =

 =

 Version: $Id$
-last changes: $LastChangedDate$
+last changes: $LastChangedDate: 2008-01-08 14:58:59 +0100 (Tue, 08 Jan 200=
8) $
 =

 =

 =



Property changes on: benchmarks/CacheTests/trunk/README
___________________________________________________________________
Name: svn:keywords
   - Id LastChangedDate
   + Rev Id HeadURL


Property changes on: benchmarks/CacheTests/trunk/build.xml
___________________________________________________________________
Name: svn:keywords
   + Rev Id HeadURL


Property changes on: benchmarks/CacheTests/trunk/ch.sh
___________________________________________________________________
Name: svn:keywords
   + Rev Id HeadURL


Property changes on: benchmarks/CacheTests/trunk/config.xml
___________________________________________________________________
Name: svn:keywords
   + Rev Id HeadURL


Property changes on: benchmarks/CacheTests/trunk/jbc.sh
___________________________________________________________________
Name: svn:keywords
   + Rev Id HeadURL


Property changes on: benchmarks/CacheTests/trunk/lib/activation.jar
___________________________________________________________________
Name: svn:keywords
   + Rev Id HeadURL


Property changes on: benchmarks/CacheTests/trunk/lib/ant.jar
___________________________________________________________________
Name: svn:keywords
   + Rev Id HeadURL


Property changes on: benchmarks/CacheTests/trunk/lib/c3p0.jar
___________________________________________________________________
Name: svn:keywords
   + Rev Id HeadURL


Property changes on: benchmarks/CacheTests/trunk/lib/commons-codec-1.3.jar
___________________________________________________________________
Name: svn:keywords
   + Rev Id HeadURL


Property changes on: benchmarks/CacheTests/trunk/lib/commons-logging.jar
___________________________________________________________________
Name: svn:keywords
   + Rev Id HeadURL


Property changes on: benchmarks/CacheTests/trunk/lib/derby.jar
___________________________________________________________________
Name: svn:keywords
   + Rev Id HeadURL


Property changes on: benchmarks/CacheTests/trunk/lib/dtdparser121.jar
___________________________________________________________________
Name: svn:keywords
   + Rev Id HeadURL


Property changes on: benchmarks/CacheTests/trunk/lib/javassist.jar
___________________________________________________________________
Name: svn:keywords
   + Rev Id HeadURL


Property changes on: benchmarks/CacheTests/trunk/lib/jboss-aop.jar
___________________________________________________________________
Name: svn:keywords
   + Rev Id HeadURL


Property changes on: benchmarks/CacheTests/trunk/lib/jboss-common-core.jar
___________________________________________________________________
Name: svn:keywords
   + Rev Id HeadURL


Property changes on: benchmarks/CacheTests/trunk/lib/jboss-common-logging-s=
pi.jar
___________________________________________________________________
Name: svn:keywords
   + Rev Id HeadURL


Property changes on: benchmarks/CacheTests/trunk/lib/jboss-container.jar
___________________________________________________________________
Name: svn:keywords
   + Rev Id HeadURL


Property changes on: benchmarks/CacheTests/trunk/lib/jboss-javaee.jar
___________________________________________________________________
Name: svn:keywords
   + Rev Id HeadURL


Property changes on: benchmarks/CacheTests/trunk/lib/jboss-logging-spi.jar
___________________________________________________________________
Name: svn:keywords
   + Rev Id HeadURL


Property changes on: benchmarks/CacheTests/trunk/lib/jbosscache-core.jar
___________________________________________________________________
Name: svn:keywords
   + Rev Id HeadURL


Property changes on: benchmarks/CacheTests/trunk/lib/jbosscache-pojo.jar
___________________________________________________________________
Name: svn:keywords
   + Rev Id HeadURL


Property changes on: benchmarks/CacheTests/trunk/lib/jbossxb.jar
___________________________________________________________________
Name: svn:keywords
   + Rev Id HeadURL


Property changes on: benchmarks/CacheTests/trunk/lib/jcip-annotations.jar
___________________________________________________________________
Name: svn:keywords
   + Rev Id HeadURL


Property changes on: benchmarks/CacheTests/trunk/lib/jdbm.jar
___________________________________________________________________
Name: svn:keywords
   + Rev Id HeadURL


Property changes on: benchmarks/CacheTests/trunk/lib/jgroups.jar
___________________________________________________________________
Name: svn:keywords
   + Rev Id HeadURL


Property changes on: benchmarks/CacheTests/trunk/lib/junit.jar
___________________________________________________________________
Name: svn:keywords
   + Rev Id HeadURL


Property changes on: benchmarks/CacheTests/trunk/lib/log4j.jar
___________________________________________________________________
Name: svn:keywords
   + Rev Id HeadURL


Property changes on: benchmarks/CacheTests/trunk/lib/pojocache-aop.xml
___________________________________________________________________
Name: svn:keywords
   + Rev Id HeadURL


Property changes on: benchmarks/CacheTests/trunk/lib/qdox.jar
___________________________________________________________________
Name: svn:keywords
   + Rev Id HeadURL


Property changes on: benchmarks/CacheTests/trunk/lib/testng.jar
___________________________________________________________________
Name: svn:keywords
   + Rev Id HeadURL


Property changes on: benchmarks/CacheTests/trunk/lib/trove.jar
___________________________________________________________________
Name: svn:keywords
   + Rev Id HeadURL


Property changes on: benchmarks/CacheTests/trunk/lib/xercesImpl.jar
___________________________________________________________________
Name: svn:keywords
   + Rev Id HeadURL


Property changes on: benchmarks/CacheTests/trunk/obsolete/SessionTestCohere=
nce.old
___________________________________________________________________
Name: svn:keywords
   + Rev Id HeadURL


Property changes on: benchmarks/CacheTests/trunk/obsolete/SessionTestJBC.ja=
va.old
___________________________________________________________________
Name: svn:keywords
   + Rev Id HeadURL


Property changes on: benchmarks/CacheTests/trunk/obsolete/SessionTestPC.jav=
a.old
___________________________________________________________________
Name: svn:keywords
   + Rev Id HeadURL


Property changes on: benchmarks/CacheTests/trunk/obsolete/SessionTestTC.jav=
a.old
___________________________________________________________________
Name: svn:keywords
   + Rev Id HeadURL


Property changes on: benchmarks/CacheTests/trunk/pc.sh
___________________________________________________________________
Name: svn:keywords
   + Rev Id HeadURL


Property changes on: benchmarks/CacheTests/trunk/pojocache-aop.xml
___________________________________________________________________
Name: svn:keywords
   + Rev Id HeadURL


Property changes on: benchmarks/CacheTests/trunk/run.sh
___________________________________________________________________
Name: svn:keywords
   + Rev Id HeadURL


Property changes on: benchmarks/CacheTests/trunk/src/perf/Session.java
___________________________________________________________________
Name: svn:keywords
   + Rev Id HeadURL


Property changes on: benchmarks/CacheTests/trunk/src/perf/SessionFactory.ja=
va
___________________________________________________________________
Name: svn:keywords
   + Rev Id HeadURL


Property changes on: benchmarks/CacheTests/trunk/src/perf/SessionTest.java
___________________________________________________________________
Name: svn:keywords
   + Rev Id HeadURL


Property changes on: benchmarks/CacheTests/trunk/src/perf/coherence/Session=
Coherence.java
___________________________________________________________________
Name: svn:keywords
   + Rev Id HeadURL


Property changes on: benchmarks/CacheTests/trunk/src/perf/coherence/Session=
FactoryCoherence.java
___________________________________________________________________
Name: svn:keywords
   + Rev Id HeadURL


Property changes on: benchmarks/CacheTests/trunk/src/perf/jbosscache/Sessio=
nFactoryJBC.java
___________________________________________________________________
Name: svn:keywords
   + Rev Id HeadURL


Property changes on: benchmarks/CacheTests/trunk/src/perf/jbosscache/Sessio=
nJBC.java
___________________________________________________________________
Name: svn:keywords
   + Rev Id HeadURL


Property changes on: benchmarks/CacheTests/trunk/src/perf/pojocache/Session=
FactoryPC.java
___________________________________________________________________
Name: svn:keywords
   + Rev Id HeadURL


Property changes on: benchmarks/CacheTests/trunk/src/perf/pojocache/Session=
PC.java
___________________________________________________________________
Name: svn:keywords
   + Rev Id HeadURL


Property changes on: benchmarks/CacheTests/trunk/src/perf/terracotta/Sessio=
nFactoryTC.java
___________________________________________________________________
Name: svn:keywords
   + Rev Id HeadURL


Property changes on: benchmarks/CacheTests/trunk/src/perf/terracotta/Sessio=
nTC.java
___________________________________________________________________
Name: svn:keywords
   + Rev Id HeadURL


Property changes on: benchmarks/CacheTests/trunk/tc.sh
___________________________________________________________________
Name: svn:keywords
   + Rev Id HeadURL


Property changes on: benchmarks/CacheTests/trunk/tc5-config.xml
___________________________________________________________________
Name: svn:keywords
   + Rev Id HeadURL


Property changes on: benchmarks/CacheTests/trunk/tmp.sh
___________________________________________________________________
Name: svn:keywords
   + Rev Id HeadURL


--===============4190232913105479965==--

From jbosscache-commits at lists.jboss.org Tue Jan  8 09:01:44 2008
Content-Type: multipart/mixed; boundary="===============4575259933139962651=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r5060 -
 benchmarks/CacheTests/trunk.
Date: Tue, 08 Jan 2008 09:01:44 -0500
Message-ID: <E1JCF1U-0003HQ-C8@committer01.frg.pub.inap.atl.jboss.com>

--===============4575259933139962651==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: bela(a)jboss.com
Date: 2008-01-08 09:01:44 -0500 (Tue, 08 Jan 2008)
New Revision: 5060

Modified:
   benchmarks/CacheTests/trunk/README
Log:
ns

Modified: benchmarks/CacheTests/trunk/README
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- benchmarks/CacheTests/trunk/README	2008-01-08 14:00:58 UTC (rev 5059)
+++ benchmarks/CacheTests/trunk/README	2008-01-08 14:01:44 UTC (rev 5060)
@@ -2,10 +2,11 @@
 =

 Version: $Id$
 last changes: $LastChangedDate: 2008-01-08 14:58:59 +0100 (Tue, 08 Jan 200=
8) $
+URL: $URL$
+URL: $HeadURL$
 =

 =

 =

-
 Benchmarking Coherence and Terracotta
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
 =



--===============4575259933139962651==--

From jbosscache-commits at lists.jboss.org Tue Jan  8 09:28:09 2008
Content-Type: multipart/mixed; boundary="===============3363173718874824867=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r5061 -
 benchmarks/CacheTests/trunk.
Date: Tue, 08 Jan 2008 09:28:09 -0500
Message-ID: <E1JCFR3-0008FP-Jb@committer01.frg.pub.inap.atl.jboss.com>

--===============3363173718874824867==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: bela(a)jboss.com
Date: 2008-01-08 09:28:09 -0500 (Tue, 08 Jan 2008)
New Revision: 5061

Modified:
   benchmarks/CacheTests/trunk/README
Log:
ns

Modified: benchmarks/CacheTests/trunk/README
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- benchmarks/CacheTests/trunk/README	2008-01-08 14:01:44 UTC (rev 5060)
+++ benchmarks/CacheTests/trunk/README	2008-01-08 14:28:09 UTC (rev 5061)
@@ -1,14 +1,11 @@
 =

 =

 Version: $Id$
-last changes: $LastChangedDate: 2008-01-08 14:58:59 +0100 (Tue, 08 Jan 200=
8) $
-URL: $URL$
-URL: $HeadURL$
 =

 =

 =

 Benchmarking Coherence and Terracotta
-=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
+-------------------------------------
 =

 Download the following JARs from the respetive web sites and copy them int=
o the ./lib directory:
 - for Terracotta: tc.jar, je.jar
@@ -31,3 +28,5 @@
                     needs to be set
 - tc.sh: Terracotta. You may have to change the location of Terracotta, e.=
g. ../terracotta-2.5.0/bin/dso-java.sh
 =

+
+The -Djgroups.bind_addr property needs to point to a valid interface.
\ No newline at end of file


--===============3363173718874824867==--

From jbosscache-commits at lists.jboss.org Tue Jan  8 09:29:08 2008
Content-Type: multipart/mixed; boundary="===============8336040224527800485=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r5062 -
 benchmarks/CacheTests/trunk.
Date: Tue, 08 Jan 2008 09:29:07 -0500
Message-ID: <E1JCFRz-0008GD-OE@committer01.frg.pub.inap.atl.jboss.com>

--===============8336040224527800485==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: bela(a)jboss.com
Date: 2008-01-08 09:29:07 -0500 (Tue, 08 Jan 2008)
New Revision: 5062

Modified:
   benchmarks/CacheTests/trunk/pc.sh
   benchmarks/CacheTests/trunk/run.sh
Log:
ns

Modified: benchmarks/CacheTests/trunk/pc.sh
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- benchmarks/CacheTests/trunk/pc.sh	2008-01-08 14:28:09 UTC (rev 5061)
+++ benchmarks/CacheTests/trunk/pc.sh	2008-01-08 14:29:07 UTC (rev 5062)
@@ -7,4 +7,4 @@
 =

 CP=3D./classes:$CP
 =

-java  -Dlog4j.configuration=3Dfile:${HOME}/log4j.properties -Djgroups.bind=
_addr=3D192.168.2.5 -classpath ${CP} -javaagent:lib/jboss-aop.jar -Djboss.a=
op.path=3D./pojocache-aop.xml perf.SessionTest -factory perf.pojocache.Sess=
ionFactoryPC -num_requests 100000 -num_attrs 100 -size 1000 -id 1 $*
+java  -Dlog4j.configuration=3Dfile:${HOME}/log4j.properties -Djgroups.bind=
_addr=3D$MYTESTIP_1 -classpath ${CP} -javaagent:lib/jboss-aop.jar -Djboss.a=
op.path=3D./pojocache-aop.xml perf.SessionTest -factory perf.pojocache.Sess=
ionFactoryPC -num_requests 100000 -num_attrs 100 -size 1000 -id 1 $*

Modified: benchmarks/CacheTests/trunk/run.sh
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- benchmarks/CacheTests/trunk/run.sh	2008-01-08 14:28:09 UTC (rev 5061)
+++ benchmarks/CacheTests/trunk/run.sh	2008-01-08 14:29:07 UTC (rev 5062)
@@ -7,4 +7,4 @@
 =

 CP=3D./classes:$CP
 =

-java  -Dlog4j.configuration=3Dfile:${HOME}/log4j.properties -Djgroups.bind=
_addr=3D192.168.2.5 -classpath ${CP} perf.SessionTest -num_requests 100000 =
-num_attrs 100 -size 1000 -id 1 $*
+java  -Dlog4j.configuration=3Dfile:${HOME}/log4j.properties -Djgroups.bind=
_addr=3D$MYTESTIP_1 -classpath ${CP} perf.SessionTest -num_requests 100000 =
-num_attrs 100 -size 1000 -id 1 $*


--===============8336040224527800485==--

From jbosscache-commits at lists.jboss.org Tue Jan  8 09:49:43 2008
Content-Type: multipart/mixed; boundary="===============2216803583410952004=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r5063 -
 cache-bench-fwk/trunk/cache-products/jbosscache-2.0.0/src/org/cachebench/cachewrappers.
Date: Tue, 08 Jan 2008 09:49:43 -0500
Message-ID: <E1JCFlv-0003eE-Dj@committer01.frg.pub.inap.atl.jboss.com>

--===============2216803583410952004==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: mircea.markus
Date: 2008-01-08 09:49:43 -0500 (Tue, 08 Jan 2008)
New Revision: 5063

Modified:
   cache-bench-fwk/trunk/cache-products/jbosscache-2.0.0/src/org/cachebench=
/cachewrappers/JBossCache200Wrapper.java
Log:
added session simulator test + refactoring

Modified: cache-bench-fwk/trunk/cache-products/jbosscache-2.0.0/src/org/cac=
hebench/cachewrappers/JBossCache200Wrapper.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- cache-bench-fwk/trunk/cache-products/jbosscache-2.0.0/src/org/cachebenc=
h/cachewrappers/JBossCache200Wrapper.java	2008-01-08 14:29:07 UTC (rev 5062)
+++ cache-bench-fwk/trunk/cache-products/jbosscache-2.0.0/src/org/cachebenc=
h/cachewrappers/JBossCache200Wrapper.java	2008-01-08 14:49:43 UTC (rev 5063)
@@ -1,5 +1,7 @@
 package org.cachebench.cachewrappers;
 =

+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.cachebench.CacheWrapper;
 import org.jboss.cache.Cache;
 import org.jboss.cache.CacheSPI;
@@ -13,10 +15,13 @@
 public class JBossCache200Wrapper implements CacheWrapper
 {
    private Cache cache;
+   private Log log =3D LogFactory.getLog(JBossCache200Wrapper.class);
 =

    public void init(Map parameters) throws Exception
    {
+      log.info("Creating cache with the following configuration: " + param=
eters);
       cache =3D DefaultCacheFactory.getInstance().createCache((String)para=
meters.get("config"));
+      log.info("Running cache with following config:" + cache.getConfigura=
tion());
    }
 =

    public void setUp() throws Exception


--===============2216803583410952004==--

From jbosscache-commits at lists.jboss.org Tue Jan  8 10:01:41 2008
Content-Type: multipart/mixed; boundary="===============1743057406234213638=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r5064 -
 benchmarks/CacheTests/trunk/src/perf.
Date: Tue, 08 Jan 2008 10:01:40 -0500
Message-ID: <E1JCFxU-0006QE-UL@committer01.frg.pub.inap.atl.jboss.com>

--===============1743057406234213638==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: bela(a)jboss.com
Date: 2008-01-08 10:01:40 -0500 (Tue, 08 Jan 2008)
New Revision: 5064

Modified:
   benchmarks/CacheTests/trunk/src/perf/SessionTest.java
Log:
ns

Modified: benchmarks/CacheTests/trunk/src/perf/SessionTest.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- benchmarks/CacheTests/trunk/src/perf/SessionTest.java	2008-01-08 14:49:=
43 UTC (rev 5063)
+++ benchmarks/CacheTests/trunk/src/perf/SessionTest.java	2008-01-08 15:01:=
40 UTC (rev 5064)
@@ -144,7 +144,7 @@
         int num_requests=3D1000;
         int num_attrs=3D100;
         int size=3D1000;
-        int write_percentage=3D20; // percent
+        int write_percentage=3D10; // percent
         String factory=3D"perf.jbosscache.SessionFactoryJBC";
 =

         for(int i=3D0; i < args.length; i++) {


--===============1743057406234213638==--

From jbosscache-commits at lists.jboss.org Tue Jan  8 10:13:16 2008
Content-Type: multipart/mixed; boundary="===============3711188175771128944=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r5065 - in core/trunk/src:
 main/java/org/jboss/cache/factories and 7 other directories.
Date: Tue, 08 Jan 2008 10:13:16 -0500
Message-ID: <E1JCG8i-0000AI-1w@committer01.frg.pub.inap.atl.jboss.com>

--===============3711188175771128944==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: manik.surtani(a)jboss.com
Date: 2008-01-08 10:13:15 -0500 (Tue, 08 Jan 2008)
New Revision: 5065

Removed:
   core/trunk/src/main/java/org/jboss/cache/factories/CacheLoaderConfigFact=
ory.java
Modified:
   core/trunk/src/main/java/org/jboss/cache/CacheImpl.java
   core/trunk/src/main/java/org/jboss/cache/DefaultCacheFactory.java
   core/trunk/src/main/java/org/jboss/cache/factories/ComponentRegistry.java
   core/trunk/src/main/java/org/jboss/cache/factories/InterceptorChainFacto=
ry.java
   core/trunk/src/main/java/org/jboss/cache/loader/CacheLoaderManager.java
   core/trunk/src/main/java/org/jboss/cache/util/BeanUtils.java
   core/trunk/src/test/java/org/jboss/cache/api/pfer/PutForExternalReadTest=
Base.java
   core/trunk/src/test/java/org/jboss/cache/factories/ComponentRegistryFunc=
tionalTest.java
   core/trunk/src/test/java/org/jboss/cache/factories/ComponentRegistryUnit=
Test.java
   core/trunk/src/test/java/org/jboss/cache/misc/TestingUtil.java
   core/trunk/src/test/java/org/jboss/cache/optimistic/NodeInterceptorGetCh=
ildrenNamesTest.java
   core/trunk/src/test/java/org/jboss/cache/statetransfer/CorruptedFileCach=
eLoader.java
   core/trunk/src/test/java/org/jboss/cache/statetransfer/FailedStateTransf=
erTest.java
   core/trunk/src/test/java/org/jboss/cache/statetransfer/StateTransfer200T=
est.java
   core/trunk/src/test/java/org/jboss/cache/statetransfer/StateTransferTest=
Base.java
Log:
Fixed failing state transfer issues plus cache startup changes wrt componen=
t registry

Modified: core/trunk/src/main/java/org/jboss/cache/CacheImpl.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/java/org/jboss/cache/CacheImpl.java	2008-01-08 15:0=
1:40 UTC (rev 5064)
+++ core/trunk/src/main/java/org/jboss/cache/CacheImpl.java	2008-01-08 15:1=
3:15 UTC (rev 5065)
@@ -517,54 +517,11 @@
       configureLogCategory();
 =

       componentRegistry.wire();
-
-      // initialise the node factory and set this in the runtime.
-//      NodeFactory nf;
-//      if ((nf =3D configuration.getRuntimeConfig().getNodeFactory()) =3D=
=3D null)
-//      {
-//         nf =3D new NodeFactory(this);
-//         configuration.getRuntimeConfig().setNodeFactory(nf);
-//      }
-//      else
-//      {
-//         // don't create a new one each and every time.  After stopping =
and starting the cache, the old NodeFactory may still be valid.
-//         nf.init();
-//      }
-
-//      if (notifier =3D=3D null)
-//         notifier =3D new Notifier(this);
-
       correctRootNodeType();
 =

-//      if (configuration.getCacheLoaderConfig() !=3D null && cacheLoaderM=
anager =3D=3D null)
-//      {
-//         initialiseCacheLoaderManager();
-//      }
-      // first set up the Buddy Manager and an RPCManager
-//      if (configuration.getCacheMode() !=3D Configuration.CacheMode.LOCA=
L)
-//      {
-      //getConfiguration().getRuntimeConfig().setRPCManager(new RPCManager=
Impl(this));
-//         setBuddyReplicationConfig(configuration.getBuddyReplicationConf=
ig());
-//      }
-      // build interceptor chain
-//      try
-//      {
-//         interceptor_chain =3D InterceptorChainFactory.getInstance().bui=
ldInterceptorChain(configuration, componentRegistry);
-//      }
-//      catch (Exception e)
-//      {
-//         throw new CacheException("Unable to build interceptor chain", e=
);
-//      }
-
-
       setUseReplQueue(configuration.isUseReplQueue());
       setIsolationLevel(configuration.getIsolationLevel());
 =

-      //createEvictionPolicy();
-
-      // now done inside the regionManager
-      //regionManager.setDefaultInactive(configuration.isInactiveOnStartup=
());
-
       cacheStatus =3D CacheStatus.CREATED;
    }
 =

@@ -626,20 +583,11 @@
     */
    private void internalStart() throws CacheException, IllegalArgumentExce=
ption
    {
-      // re-wire all dependencies in case stuff has changed since the cach=
e was created?
-      // TODO: Do we really need to nuke old deps?  :/
-      CacheSPI spi =3D componentRegistry.getComponent(CacheSPI.class);
+      // re-wire all dependencies in case stuff has changed since the cach=
e was created
 =

       // remove the Interceptor.class component though, since it may perta=
in to an old config
       componentRegistry.unregisterComponent(Interceptor.class);
 =

-      // re-do the bootstrap sequence
-      componentRegistry.registerComponent(configuration);
-      componentRegistry.registerComponent(this);
-      componentRegistry.registerComponent(CacheSPI.class.getName(), spi);
-      componentRegistry.registerComponent(Cache.class.getName(), spi);
-      componentRegistry.registerComponent(componentRegistry);
-
       componentRegistry.updateDependencies();
       componentRegistry.wireDependencies(root);
 =

@@ -656,20 +604,6 @@
 =

       correctRootNodeType();
 =

-//      createTransactionManager();
-
-      // cache loaders should be initialised *before* any state transfers =
take place to prevent
-      // exceptions involving cache loaders not being started. - Manik
-      // create cache loader
-
-      // now done in the CLM
-//      if (cacheLoaderManager !=3D null)
-//      {
-//         cacheLoaderManager.startCacheLoader();
-//      }
-      // now that we have a TM we can init the interceptor chain
-//      InterceptorChainFactory.getInstance().initialiseInterceptors(inter=
ceptor_chain, this);
-
       switch (configuration.getCacheMode())
       {
          case LOCAL:
@@ -905,7 +839,7 @@
       cacheStatus =3D CacheStatus.STOPPING;
 =

       // if this is called from a source other than the shutdown hook, der=
egister the shutdown hook.      =

-      if (!invokedFromShutdownHook) Runtime.getRuntime().removeShutdownHoo=
k(shutdownHook);
+      if (!invokedFromShutdownHook && shutdownHook !=3D null) Runtime.getR=
untime().removeShutdownHook(shutdownHook);
 =

       componentRegistry.stop();
 =

@@ -3646,7 +3580,7 @@
 =

    private void setInterceptorChain(Interceptor startOfNewChain)
    {
-      componentRegistry.registerComponent(Interceptor.class.getName(), sta=
rtOfNewChain);
+      componentRegistry.registerComponent(Interceptor.class.getName(), sta=
rtOfNewChain, Interceptor.class);
    }
 =

    public synchronized void addInterceptor(Interceptor i, int position)
@@ -3712,7 +3646,7 @@
 =

       if (found)
       {
-         componentRegistry.registerComponent(i);
+         componentRegistry.registerComponent(i, Interceptor.class);
          interceptors.add(++position, i);
          setInterceptorChain(factory.correctInterceptorChaining(intercepto=
rs));
       }

Modified: core/trunk/src/main/java/org/jboss/cache/DefaultCacheFactory.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/java/org/jboss/cache/DefaultCacheFactory.java	2008-=
01-08 15:01:40 UTC (rev 5064)
+++ core/trunk/src/main/java/org/jboss/cache/DefaultCacheFactory.java	2008-=
01-08 15:13:15 UTC (rev 5065)
@@ -135,8 +135,8 @@
       this.configuration =3D configuration;
 =

       // make sure we set the CacheImpl and CacheSPI instance in the compo=
nent registry.
-      componentRegistry.registerComponent(cache);
-      componentRegistry.registerComponent(CacheSPI.class.getName(), spi);
+      componentRegistry.registerComponent(cache, CacheImpl.class);
+      componentRegistry.registerComponent(CacheSPI.class.getName(), spi, C=
acheSPI.class);
    }
 =

    public Cache<K, V> createCache(InputStream is) throws ConfigurationExce=
ption

Deleted: core/trunk/src/main/java/org/jboss/cache/factories/CacheLoaderConf=
igFactory.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/java/org/jboss/cache/factories/CacheLoaderConfigFac=
tory.java	2008-01-08 15:01:40 UTC (rev 5064)
+++ core/trunk/src/main/java/org/jboss/cache/factories/CacheLoaderConfigFac=
tory.java	2008-01-08 15:13:15 UTC (rev 5065)
@@ -1,21 +0,0 @@
-package org.jboss.cache.factories;
-
-import org.jboss.cache.config.CacheLoaderConfig;
-import org.jboss.cache.factories.annotations.DefaultFactoryFor;
-
-/**
- * Factory class to create cache loader managers
- *
- * @author Manik Surtani (<a href=3D"mailto:manik(a)jboss.org">manik(a)jbo=
ss.org</a>)
- * @since 2.1.0
- */
-(a)DefaultFactoryFor(classes =3D {CacheLoaderConfig.class})
-public class CacheLoaderConfigFactory extends ComponentFactory
-{
-   @Override
-   @SuppressWarnings("unchecked")
-   protected <T> T construct(String componentName, Class<T> componentType)
-   {
-      return (T) configuration.getCacheLoaderConfig();
-   }
-}

Modified: core/trunk/src/main/java/org/jboss/cache/factories/ComponentRegis=
try.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/java/org/jboss/cache/factories/ComponentRegistry.ja=
va	2008-01-08 15:01:40 UTC (rev 5064)
+++ core/trunk/src/main/java/org/jboss/cache/factories/ComponentRegistry.ja=
va	2008-01-08 15:13:15 UTC (rev 5065)
@@ -14,6 +14,7 @@
 import org.jboss.cache.factories.annotations.Inject;
 import org.jboss.cache.factories.annotations.Start;
 import org.jboss.cache.factories.annotations.Stop;
+import org.jboss.cache.invocation.RemoteCacheInvocationDelegate;
 import org.jboss.cache.util.BeanUtils;
 import org.jboss.cache.util.reflect.ClasspathScanner;
 import org.jboss.cache.util.reflect.ReflectionUtil;
@@ -83,14 +84,14 @@
    public ComponentRegistry(Configuration configuration)
    {
       // bootstrap.
-      registerComponent(this);
-      registerComponent(configuration);
+      registerComponent(this, ComponentRegistry.class);
+      registerComponent(configuration, Configuration.class);
    }
 =

    /**
     * Adds a singleton instance to the registry.  Note that if an instance=
 of this component already exists in the
     * registry it is overwritten.  The instance is registered under type <=
tt>component.getClass()</tt>.  If the component
-    * implements an interface or extends an abstract class, it may make mo=
re sense to use {@link #registerComponent(String, Object)}
+    * implements an interface or extends an abstract class, it may make mo=
re sense to use {@link #registerComponent(String, Object, Class)}
     * <p/>
     * The status of the component is updated th the overall state of the r=
egistry, which may involve calling of methods annotated
     * with {@link org.jboss.cache.factories.annotations.Inject}, {@link or=
g.jboss.cache.factories.annotations.Start} or
@@ -99,9 +100,9 @@
     *
     * @param component component to add to the registry.
     */
-   public void registerComponent(Object component)
+   public void registerComponent(Object component, Class type)
    {
-      registerComponent(component.getClass().getName(), component);
+      registerComponent(component.getClass().getName(), component, type);
    }
 =

    /**
@@ -116,13 +117,22 @@
     * @param name      name of the instance
     * @param component component to add
     */
-   public void registerComponent(String name, Object component)
+   public void registerComponent(String name, Object component, Class type)
    {
       // this will make sure all dependent components are stopped or set t=
o CONSTRUCTED so they can be re-wired later.
-      Component c =3D new Component(name, component);
+      Component c =3D new Component(name, component, type);
       Component old =3D componentLookup.get(name);
+      if (log.isTraceEnabled())
+         log.trace("Registering component " + c + " under name " + name + =
" replacing old component " + old);
       if (old !=3D null)
       {
+         // if they are equal don't bother
+         if (old.instance.equals(component))
+         {
+            if (log.isTraceEnabled())
+               log.trace("Attempting to register a component equal to one =
that already exists under the same name (" + name + ").  Not doing anything=
.");
+            return;
+         }
          // unregister the old component so that components that depend on=
 it can be stopped if necessary
          unregisterComponent(name);
          // components that depended on the old component should now depen=
d on the new one.
@@ -256,32 +266,34 @@
 =

          if (component !=3D null)
          {
-            registerComponent(componentNameToUse, component);
+            registerComponent(componentNameToUse, component, componentClas=
s);
          }
          else if (attemptedFactoryConstruction)
          {
-            registerNullComponent(componentNameToUse);
+            if (log.isTraceEnabled()) log.trace("Registering a null for co=
mponent " + componentNameToUse);
+            registerNullComponent(componentNameToUse, componentClass);
          }
       }
       return component;
    }
 =

    // registers a special "null" component that has no dependencies.
-   void registerNullComponent(String componentName)
+   void registerNullComponent(String componentName, Class type)
    {
-      registerComponent(componentName, NULL_COMPONENT);
+      registerComponent(componentName, NULL_COMPONENT, type);
    }
 =

    private boolean isNonBootstrap(Class<?> componentClass)
    {
       return !(componentClass.equals(CacheSPI.class) || componentClass.equ=
als(CacheImpl.class) || componentClass.equals(Cache.class)
-            || componentClass.equals(ComponentRegistry.class));
+            || componentClass.equals(ComponentRegistry.class) || component=
Class.equals(Configuration.class));
    }
 =

    @SuppressWarnings("unchecked")
          <T> T getFromConfiguration(Class<T> componentClass)
    {
-      //if (log.isDebugEnabled()) log.debug("Looking in configuration for =
an instance of " + componentClass + " that may have been injected from an e=
xternal source.");
+      if (log.isDebugEnabled())
+         log.debug("Looking in configuration for an instance of " + compon=
entClass + " that may have been injected from an external source.");
       Method getter =3D BeanUtils.getterMethod(Configuration.class, compon=
entClass);
       T returnValue =3D null;
 =

@@ -328,8 +340,20 @@
    public void updateDependencies()
    {
       State originalState =3D overallState;
-      moveComponentsToState(overallState =3D=3D STARTED ? CONSTRUCTED : ST=
OPPED);
+      moveComponentsToState(overallState =3D=3D STARTED ? STOPPED : CONSTR=
UCTED);
       moveComponentsToState(originalState);
+      // re- add a few key components - this is a hack for now
+      CacheImpl ci =3D getComponent(CacheImpl.class);
+      CacheSPI rcid =3D getComponent("remoteDelegate", RemoteCacheInvocati=
onDelegate.class);
+      CacheSPI spi =3D getComponent(CacheSPI.class.getName(), CacheSPI.cla=
ss);
+
+      unregisterComponent(CacheImpl.class);
+      unregisterComponent(CacheSPI.class.getName());
+      unregisterComponent("remoteDelegate");
+
+      registerComponent(CacheImpl.class.getName(), ci, CacheImpl.class);
+      registerComponent(CacheSPI.class.getName(), spi, CacheSPI.class);
+      registerComponent("remoteDelegate", rcid, RemoteCacheInvocationDeleg=
ate.class);
    }
 =

    /**
@@ -464,7 +488,7 @@
          if (cf !=3D null)
          {
             // we simply register this factory.  Registration will take ca=
re of constructing any dependencies.
-            registerComponent(cf);
+            registerComponent(cf, cfClass);
          }
       }
 =

@@ -677,6 +701,7 @@
    {
       Object instance;
       String name;
+      Class type;
       State state =3D CONSTRUCTED;
       Set<Dependency> dependencies =3D new HashSet<Dependency>(3);
       Set<Dependency> dependencyFor =3D new HashSet<Dependency>(3);
@@ -690,10 +715,11 @@
        * @param name     name of component
        * @param instance component instance
        */
-      public Component(String name, Object instance)
+      public Component(String name, Object instance, Class type)
       {
          this.instance =3D instance;
          this.name =3D name;
+         this.type =3D type;
 =

          // now scan the instance for all dependencies.
          List<Method> injectionMethods =3D ReflectionUtil.getAllMethods(in=
stance.getClass(), Inject.class);
@@ -707,7 +733,7 @@
        */
       Dependency asDependency()
       {
-         if (me =3D=3D null) me =3D new Dependency(name, null);
+         if (me =3D=3D null) me =3D new Dependency(name, type);
          return me;
       }
 =

@@ -753,6 +779,12 @@
             for (Dependency d : dependentComponents)
             {
                Component c =3D componentLookup.get(d.name);
+//               if (c =3D=3D null && increase)
+//               {
+//                  if (log.isTraceEnabled()) log.trace(name + " depends o=
n " + d.name + " (type "+d.type+") but it does not exist in the registry, a=
ttempting to create.");
+//                  getOrCreateComponent(d.name, d.type);
+//                  c =3D componentLookup.get(d.name);
+//               }
                if (c !=3D null)
                {
                   if (isShallowCyclic(c))
@@ -764,10 +796,21 @@
                   {
                      // of we are "moving up" - only do this if the compon=
ent is lower than what is needed.
                      if ((increase && newState.isGreaterThan(c.state)) || =
(!increase && newState.isLessThan(c.state)))
+                     {
+                        if (c.name.endsWith("CacheLoaderManager"))
+                        {
+                           boolean itrue =3D true;
+                        }
                         c.changeState(newState);
+                     }
 =

                   }
                }
+               else
+               {
+                  if (log.isTraceEnabled())
+                     log.trace(name + " depends on " + d.name + " (type " =
+ d.type + ") but it does not exist in the registry");
+               }
             }
 =

             // NOW we update our state.

Modified: core/trunk/src/main/java/org/jboss/cache/factories/InterceptorCha=
inFactory.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/java/org/jboss/cache/factories/InterceptorChainFact=
ory.java	2008-01-08 15:01:40 UTC (rev 5064)
+++ core/trunk/src/main/java/org/jboss/cache/factories/InterceptorChainFact=
ory.java	2008-01-08 15:13:15 UTC (rev 5065)
@@ -65,7 +65,7 @@
          i =3D clazz.newInstance();
 //         componentRegistry.wireDependencies(i);
          // add this interceptor as a NAMED component into the registry
-         componentRegistry.registerComponent(clazz.getName(), i);
+         componentRegistry.registerComponent(clazz.getName(), i, clazz);
       }
       else
       {
@@ -608,7 +608,7 @@
       // now set the 'last' pointer.
       Interceptor i =3D setLastInterceptorPointer(first, last);
       // re-register this interceptor
-      componentRegistry.registerComponent(Interceptor.class.getName(), i);
+      componentRegistry.registerComponent(Interceptor.class.getName(), i, =
Interceptor.class);
       return i;
    }
 =


Modified: core/trunk/src/main/java/org/jboss/cache/loader/CacheLoaderManage=
r.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/java/org/jboss/cache/loader/CacheLoaderManager.java=
	2008-01-08 15:01:40 UTC (rev 5064)
+++ core/trunk/src/main/java/org/jboss/cache/loader/CacheLoaderManager.java=
	2008-01-08 15:13:15 UTC (rev 5065)
@@ -70,14 +70,33 @@
    private boolean fetchPersistentState;
    private Configuration configuration;
 =

+   @Inject
+   private void injectDependencies(CacheSPI cache, Configuration configura=
tion)
+   {
+      this.config =3D configuration.getCacheLoaderConfig();
+      this.cache =3D cache;
+      this.configuration =3D configuration;
+
+      if (config !=3D null)
+      {
+         try
+         {
+            loader =3D createCacheLoader();
+         }
+         catch (Exception e)
+         {
+            throw new CacheException("Unable to create cache loaders", e);
+         }
+      }
+   }
+
    /**
-    * Sets a configuration object and creates a cacheloader accordingly.
+    * Sets a configuration object and creates a cacheloader accordingly.  =
Primarily used for testing.
     *
     * @param config
     * @param cache
     * @throws CacheException
     */
-   @Inject
    public void setConfig(CacheLoaderConfig config, CacheSPI cache, Configu=
ration configuration) throws CacheException
    {
       this.config =3D config =3D=3D null ? configuration.getCacheLoaderCon=
fig() : config;

Modified: core/trunk/src/main/java/org/jboss/cache/util/BeanUtils.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/java/org/jboss/cache/util/BeanUtils.java	2008-01-08=
 15:01:40 UTC (rev 5064)
+++ core/trunk/src/main/java/org/jboss/cache/util/BeanUtils.java	2008-01-08=
 15:13:15 UTC (rev 5065)
@@ -44,6 +44,7 @@
     */
    public static String getterName(Class componentClass)
    {
+      if (componentClass =3D=3D null) return null;
       StringBuilder sb =3D new StringBuilder("get");
       sb.append(componentClass.getSimpleName());
       return sb.toString();
@@ -57,6 +58,7 @@
     */
    public static String setterName(Class componentClass)
    {
+      if (componentClass =3D=3D null) return null;
       StringBuilder sb =3D new StringBuilder("set");
       sb.append(componentClass.getSimpleName());
       return sb.toString();
@@ -81,6 +83,10 @@
          //if (log.isTraceEnabled()) log.trace("Unable to find method " + =
getterName(componentClass) + " in class " + target);
          return null;
       }
+      catch (NullPointerException e)
+      {
+         return null;
+      }
    }
 =

    /**
@@ -101,5 +107,9 @@
          //if (log.isTraceEnabled()) log.trace("Unable to find method " + =
setterName(componentClass) + " in class " + target);
          return null;
       }
+      catch (NullPointerException e)
+      {
+         return null;
+      }
    }
 }

Modified: core/trunk/src/test/java/org/jboss/cache/api/pfer/PutForExternalR=
eadTestBase.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/test/java/org/jboss/cache/api/pfer/PutForExternalReadTes=
tBase.java	2008-01-08 15:01:40 UTC (rev 5064)
+++ core/trunk/src/test/java/org/jboss/cache/api/pfer/PutForExternalReadTes=
tBase.java	2008-01-08 15:13:15 UTC (rev 5065)
@@ -171,7 +171,7 @@
 =

       // inject a mock RPC manager so that we can test whether calls made =
are sync or async.
       //cache1.getConfiguration().getRuntimeConfig().setRPCManager(rpcMana=
ger);
-      TestingUtil.extractComponentRegistry(cache1).registerComponent(RPCMa=
nager.class.getName(), rpcManager);
+      TestingUtil.extractComponentRegistry(cache1).registerComponent(RPCMa=
nager.class.getName(), rpcManager, RPCManager.class);
 =

       // invalidations will not trigger any rpc call sfor PFER
       if (!isUsingInvalidation())
@@ -189,7 +189,7 @@
       verify(rpcManager);
 =

       // cleanup
-      TestingUtil.extractComponentRegistry(cache1).registerComponent(RPCMa=
nager.class.getName(), originalRpcManager);
+      TestingUtil.extractComponentRegistry(cache1).registerComponent(RPCMa=
nager.class.getName(), originalRpcManager, RPCManager.class);
       cache1.removeNode(fqn);
    }
 =

@@ -244,7 +244,7 @@
          }
       };
 =

-      TestingUtil.extractComponentRegistry(cache1).registerComponent(RPCMa=
nager.class.getName(), barfingRpcManager);
+      TestingUtil.extractComponentRegistry(cache1).registerComponent(RPCMa=
nager.class.getName(), barfingRpcManager, RPCManager.class);
       cache1.getConfiguration().getRuntimeConfig().setRPCManager(barfingRp=
cManager);
 =

       try

Modified: core/trunk/src/test/java/org/jboss/cache/factories/ComponentRegis=
tryFunctionalTest.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/test/java/org/jboss/cache/factories/ComponentRegistryFun=
ctionalTest.java	2008-01-08 15:01:40 UTC (rev 5064)
+++ core/trunk/src/test/java/org/jboss/cache/factories/ComponentRegistryFun=
ctionalTest.java	2008-01-08 15:13:15 UTC (rev 5065)
@@ -78,7 +78,7 @@
 =

    public void testNamedComponents()
    {
-      cr.registerComponent("blah", new Object());
+      cr.registerComponent("blah", new Object(), Object.class);
       Object namedComponent1 =3D cr.getOrCreateComponent("blah", Object.cl=
ass);
       Object namedComponent2 =3D cr.getOrCreateComponent("blah", Object.cl=
ass);
 =


Modified: core/trunk/src/test/java/org/jboss/cache/factories/ComponentRegis=
tryUnitTest.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/test/java/org/jboss/cache/factories/ComponentRegistryUni=
tTest.java	2008-01-08 15:01:40 UTC (rev 5064)
+++ core/trunk/src/test/java/org/jboss/cache/factories/ComponentRegistryUni=
tTest.java	2008-01-08 15:13:15 UTC (rev 5065)
@@ -25,9 +25,9 @@
 =

    public void testChangingComponentState()
    {
-      cr.registerComponent("c2", new C2());
-      cr.registerComponent("c1", new C1());
-      cr.registerComponent("c3", new C3());
+      cr.registerComponent("c2", new C2(), C2.class);
+      cr.registerComponent("c1", new C1(), C1.class);
+      cr.registerComponent("c3", new C3(), C3.class);
 =

       ComponentRegistry.Component c1 =3D cr.componentLookup.get("c1");
       ComponentRegistry.Component c2 =3D cr.componentLookup.get("c2");

Modified: core/trunk/src/test/java/org/jboss/cache/misc/TestingUtil.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/test/java/org/jboss/cache/misc/TestingUtil.java	2008-01-=
08 15:01:40 UTC (rev 5064)
+++ core/trunk/src/test/java/org/jboss/cache/misc/TestingUtil.java	2008-01-=
08 15:13:15 UTC (rev 5065)
@@ -518,7 +518,7 @@
 =

       // This will replace the previous interceptor chain in the component=
 registry
       // as well as update dependencies!
-      cr.registerComponent(Interceptor.class.getName(), interceptor);
+      cr.registerComponent(Interceptor.class.getName(), interceptor, Inter=
ceptor.class);
    }
 =

    /**

Modified: core/trunk/src/test/java/org/jboss/cache/optimistic/NodeIntercept=
orGetChildrenNamesTest.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/test/java/org/jboss/cache/optimistic/NodeInterceptorGetC=
hildrenNamesTest.java	2008-01-08 15:01:40 UTC (rev 5064)
+++ core/trunk/src/test/java/org/jboss/cache/optimistic/NodeInterceptorGetC=
hildrenNamesTest.java	2008-01-08 15:13:15 UTC (rev 5065)
@@ -40,11 +40,11 @@
       ComponentRegistry cr =3D TestingUtil.extractComponentRegistry(cache);
 =

       Interceptor interceptor =3D new OptimisticCreateIfNotExistsIntercept=
or();
-      cr.registerComponent(interceptor);
+      cr.registerComponent(interceptor, OptimisticCreateIfNotExistsInterce=
ptor.class);
       Interceptor nodeInterceptor =3D new OptimisticNodeInterceptor();
-      cr.registerComponent(nodeInterceptor);
+      cr.registerComponent(nodeInterceptor, OptimisticNodeInterceptor.clas=
s);
       dummy =3D new MockInterceptor();
-      cr.registerComponent(dummy);
+      cr.registerComponent(dummy, MockInterceptor.class);
 =

       interceptor.setNext(nodeInterceptor);
       nodeInterceptor.setNext(dummy);

Modified: core/trunk/src/test/java/org/jboss/cache/statetransfer/CorruptedF=
ileCacheLoader.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/test/java/org/jboss/cache/statetransfer/CorruptedFileCac=
heLoader.java	2008-01-08 15:01:40 UTC (rev 5064)
+++ core/trunk/src/test/java/org/jboss/cache/statetransfer/CorruptedFileCac=
heLoader.java	2008-01-08 15:13:15 UTC (rev 5065)
@@ -1,6 +1,9 @@
 package org.jboss.cache.statetransfer;
 =

+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.jboss.cache.Fqn;
+import org.jboss.cache.config.CacheLoaderConfig;
 import org.jboss.cache.loader.FileCacheLoader;
 =

 import java.io.IOException;
@@ -8,8 +11,23 @@
 =

 public class CorruptedFileCacheLoader extends FileCacheLoader
 {
+   private Log log =3D LogFactory.getLog(CorruptedFileCacheLoader.class);
+   private CacheLoaderConfig.IndividualCacheLoaderConfig cfg;
 =

    @Override
+   public void setConfig(CacheLoaderConfig.IndividualCacheLoaderConfig bas=
e)
+   {
+      this.cfg =3D base;
+      super.setConfig(base);
+   }
+
+   @Override
+   public CacheLoaderConfig.IndividualCacheLoaderConfig getConfig()
+   {
+      return cfg;
+   }
+
+   @Override
    public void loadState(Fqn subtree, ObjectOutputStream os) throws Except=
ion
    {
       throw new IOException("see StateTransfer200Test#testCacheLoaderFailu=
re()");

Modified: core/trunk/src/test/java/org/jboss/cache/statetransfer/FailedStat=
eTransferTest.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/test/java/org/jboss/cache/statetransfer/FailedStateTrans=
ferTest.java	2008-01-08 15:01:40 UTC (rev 5064)
+++ core/trunk/src/test/java/org/jboss/cache/statetransfer/FailedStateTrans=
ferTest.java	2008-01-08 15:13:15 UTC (rev 5065)
@@ -61,9 +61,9 @@
 =

       // inject our own message listener and re-wire deps
       ComponentRegistry cr =3D TestingUtil.extractComponentRegistry(cache);
-      cr.unregisterComponent(CacheMessageListener.class);
-      cr.registerComponent(new SecretiveStateCacheMessageListener());
-      cr.updateDependencies();
+//      cr.unregisterComponent(CacheMessageListener.class);
+      cr.registerComponent(CacheMessageListener.class.getName(), new Secre=
tiveStateCacheMessageListener(), CacheMessageListener.class);
+//      cr.updateDependencies();
 =

       cache.start();
 =

@@ -80,9 +80,9 @@
 =

       // inject our own message listener and re-wire deps
       cr =3D TestingUtil.extractComponentRegistry(recipient);
-      cr.unregisterComponent(CacheMessageListener.class);
-      cr.registerComponent(new SecretiveStateCacheMessageListener());
-      cr.updateDependencies();
+      //cr.unregisterComponent(CacheMessageListener.class);
+      cr.registerComponent(CacheMessageListener.class.getName(), new Secre=
tiveStateCacheMessageListener(), CacheMessageListener.class);
+      //cr.updateDependencies();
 =

       try
       {

Modified: core/trunk/src/test/java/org/jboss/cache/statetransfer/StateTrans=
fer200Test.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/test/java/org/jboss/cache/statetransfer/StateTransfer200=
Test.java	2008-01-08 15:01:40 UTC (rev 5064)
+++ core/trunk/src/test/java/org/jboss/cache/statetransfer/StateTransfer200=
Test.java	2008-01-08 15:13:15 UTC (rev 5065)
@@ -93,7 +93,7 @@
    @SuppressWarnings("null")
    public void testCacheLoaderFailure() throws Exception
    {
-      CacheSPI<Object, Object> cache1 =3D createCache("cache1", false, fal=
se, "org.jboss.cache.statetransfer.CorruptedFileCacheLoader", false, true);
+      CacheSPI<Object, Object> cache1 =3D createCache("cache1", false, fal=
se, CorruptedFileCacheLoader.class.getName(), false, true);
 =

       cache1.put(A_B, "name", JOE);
       cache1.put(A_B, "age", TWENTY);

Modified: core/trunk/src/test/java/org/jboss/cache/statetransfer/StateTrans=
ferTestBase.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/test/java/org/jboss/cache/statetransfer/StateTransferTes=
tBase.java	2008-01-08 15:01:40 UTC (rev 5064)
+++ core/trunk/src/test/java/org/jboss/cache/statetransfer/StateTransferTes=
tBase.java	2008-01-08 15:13:15 UTC (rev 5065)
@@ -134,7 +134,7 @@
       }
       if (cacheLoaderClass !=3D null && cacheLoaderClass.length() > 0)
       {
-         configureCacheLoader(c, cacheLoaderClass, cacheID, useMarshalling=
, cacheLoaderAsync);
+         configureCacheLoader(c, cacheLoaderClass, cacheID, cacheLoaderAsy=
nc);
       }
       //      tree.setConfiguration(c);
       //c.setLockAcquisitionTimeout(60000);
@@ -198,14 +198,13 @@
 =

    protected void configureCacheLoader(Configuration c,
                                        String cacheID,
-                                       boolean useExtended,
                                        boolean async)
          throws Exception
    {
-      configureCacheLoader(c, "org.jboss.cache.loader.FileCacheLoader", ca=
cheID, useExtended, async);
+      configureCacheLoader(c, "org.jboss.cache.loader.FileCacheLoader", ca=
cheID, async);
    }
 =

-   protected void configureCacheLoader(Configuration c, String cacheloader=
Class, String cacheID, boolean useExtended,
+   protected void configureCacheLoader(Configuration c, String cacheloader=
Class, String cacheID,
                                        boolean async) throws Exception
    {
       if (cacheloaderClass !=3D null)


--===============3711188175771128944==--

From jbosscache-commits at lists.jboss.org Tue Jan  8 10:38:13 2008
Content-Type: multipart/mixed; boundary="===============0746961843693976314=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r5066 - in core/trunk/src:
 test/java/org/jboss/cache/replicated and 1 other directory.
Date: Tue, 08 Jan 2008 10:38:10 -0500
Message-ID: <E1JCGWo-00052M-VG@committer01.frg.pub.inap.atl.jboss.com>

--===============0746961843693976314==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: manik.surtani(a)jboss.com
Date: 2008-01-08 10:38:10 -0500 (Tue, 08 Jan 2008)
New Revision: 5066

Modified:
   core/trunk/src/main/java/org/jboss/cache/CacheImpl.java
   core/trunk/src/test/java/org/jboss/cache/replicated/SyncReplTxTest.java
Log:
Refactored a lot of unnecessary code in CacheImpl

Modified: core/trunk/src/main/java/org/jboss/cache/CacheImpl.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/java/org/jboss/cache/CacheImpl.java	2008-01-08 15:1=
3:15 UTC (rev 5065)
+++ core/trunk/src/main/java/org/jboss/cache/CacheImpl.java	2008-01-08 15:3=
8:10 UTC (rev 5066)
@@ -11,7 +11,6 @@
 import org.jboss.cache.buddyreplication.BuddyManager;
 import org.jboss.cache.buddyreplication.GravitateResult;
 import org.jboss.cache.config.Configuration;
-import org.jboss.cache.config.Option;
 import org.jboss.cache.config.RuntimeConfig;
 import org.jboss.cache.factories.ComponentRegistry;
 import org.jboss.cache.factories.InterceptorChainFactory;
@@ -20,7 +19,6 @@
 import org.jboss.cache.interceptors.Interceptor;
 import org.jboss.cache.invocation.NodeInvocationDelegate;
 import org.jboss.cache.invocation.RemoteCacheInvocationDelegate;
-import org.jboss.cache.loader.CacheLoader;
 import org.jboss.cache.loader.CacheLoaderManager;
 import org.jboss.cache.lock.IsolationLevel;
 import org.jboss.cache.lock.LockStrategyFactory;
@@ -131,7 +129,7 @@
     * Set<Fqn> of Fqns of the topmost node of internal regions that should
     * not included in standard state transfers.
     */
-   private Set<Fqn> internalFqns =3D new HashSet<Fqn>();
+   private final Set<Fqn> internalFqns =3D new HashSet<Fqn>();
 =

    /**
     * Marshaller if register to handle marshalling
@@ -163,11 +161,6 @@
     */
    private BuddyManager buddyManager;
 =

-   /**
-    * State transfer manager. Do not access this field directly -- use the=
 getter
-    */
-   private StateTransferManager stateTransferManager;
-
    private RemoteCacheInvocationDelegate remoteDelegate;
 =

    /**
@@ -195,7 +188,7 @@
    /**
     * Constructs an uninitialized CacheImpl.
     */
-   protected CacheImpl() throws Exception
+   protected CacheImpl()
    {
       this(new Configuration());
    }
@@ -203,7 +196,7 @@
    /**
     * Constructs an uninitialized CacheImpl.
     */
-   protected CacheImpl(Configuration configuration) throws Exception
+   protected CacheImpl(Configuration configuration)
    {
       this.configuration =3D configuration;
       this.componentRegistry =3D new ComponentRegistry(configuration);
@@ -223,7 +216,7 @@
 =

    @Inject
    private void injectDependencies(Notifier notifier, RegionManager region=
Manager, TransactionManager transactionManager, Marshaller marshaller,
-                                   TransactionTable transactionTable, Stat=
eTransferManager stateTransferManager, NodeFactory nodeFactory,
+                                   TransactionTable transactionTable, Node=
Factory nodeFactory,
                                    CacheSPI spi, CacheMessageListener mess=
ageListener, @ComponentName("remoteDelegate")RemoteCacheInvocationDelegate =
remoteDelegate,
                                    Interceptor interceptorChain, BuddyMana=
ger buddyManager)
    {
@@ -231,7 +224,6 @@
       this.regionManager =3D regionManager;
       this.transactionManager =3D transactionManager;
       this.transactionTable =3D transactionTable;
-      this.stateTransferManager =3D stateTransferManager;
       this.nodeFactory =3D nodeFactory;
       this.spi =3D spi;
       this.messageListener =3D messageListener;
@@ -298,24 +290,6 @@
       return transactionTable;
    }
 =

-   /**
-    * Returns the contents of the TransactionTable as a string.
-    */
-   public String dumpTransactionTable()
-   {
-      return transactionTable.toString(true);
-   }
-
-   /**
-    * Returns the underlying cache loader in use.
-    */
-   public CacheLoader getCacheLoader()
-   {
-      if (cacheLoaderManager =3D=3D null)
-         return null;
-      return cacheLoaderManager.getCacheLoader();
-   }
-
    private void setUseReplQueue(boolean flag)
    {
       if (flag)
@@ -339,7 +313,6 @@
       }
    }
 =

-
    /**
     * Returns the replication queue.
     */
@@ -843,13 +816,6 @@
 =

       componentRegistry.stop();
 =

-      // before closing the channel stop the buddy manager
-//      if (buddyManager !=3D null && buddyManager.isEnabled())
-//      {
-//         log.debug("stop(): stopping buddy manager");
-//         buddyManager.stop();
-//      }
-
       if (channel !=3D null)
       {
          log.info("stop(): closing the channel");
@@ -879,16 +845,6 @@
          repl_queue.stop();
       }
 =

-      // now done in the CLM
-//      if (cacheLoaderManager !=3D null)
-//      {
-//         log.debug("stop(): stopping cache loader manager");
-//         cacheLoaderManager.stopCacheLoader();
-//      }
-
-      // now done in the region manager
-//      if (regionManager.isUsingEvictions()) regionManager.stopEvictionTh=
read();
-
       if (notifier !=3D null)
       {
          notifier.notifyCacheStopped(spi, spi.getInvocationContext());
@@ -910,42 +866,8 @@
       return cacheStatus;
    }
 =

-   /* ----------------------- End of MBeanSupport ----------------------- =
*/
 =

-   /* ----------------------- Start of buddy replication specific methods =
------------*/
-
    /**
-    * Sets the buddy replication configuration element
-    *
-    * @param config
-    */
-//   private void setBuddyReplicationConfig(BuddyReplicationConfig config)
-//   {
-//      if (config !=3D null)
-//      {
-//         buddyManager =3D new BuddyManager(config);
-//         if (!buddyManager.isEnabled())
-//         {
-//            buddyManager =3D null;
-//         }
-//         else
-//         {
-//            internalFqns.add(BuddyManager.BUDDY_BACKUP_SUBTREE_FQN);
-//         }
-//      }
-//   }
-
-   /**
-    * Retrieves the Buddy Manager configured.
-    *
-    * @return null if buddy replication is not enabled.
-    */
-   public BuddyManager getBuddyManager()
-   {
-      return buddyManager;
-   }
-
-   /**
     * Returns a Set<Fqn> of Fqns of the topmost node of internal regions t=
hat
     * should not included in standard state transfers. Will include
     * {@link BuddyManager#BUDDY_BACKUP_SUBTREE} if buddy replication is
@@ -958,24 +880,7 @@
       return Collections.unmodifiableSet(internalFqns);
    }
 =

-   /* ----------------------- End of buddy replication specific methods --=
----------*/
-
    /**
-    * Loads the indicated Fqn, plus all parents recursively from the
-    * CacheLoader. If no CacheLoader is present, this is a no-op
-    *
-    * @param fqn
-    * @throws Exception
-    */
-   public void load(String fqn) throws Exception
-   {
-      if (cacheLoaderManager !=3D null)
-      {
-         cacheLoaderManager.preload(Fqn.fromString(fqn), true, true);
-      }
-   }
-
-   /**
     * Returns the address of the coordinator or null if there is no
     * coordinator.
     * Waits until the membership view is updated.
@@ -1027,7 +932,7 @@
       }
 =

       // Recursively remove any children
-      Set children =3D getChildrenNames(subtree);
+      Set children =3D spi.getChildrenNames(subtree);
       if (children !=3D null)
       {
          for (Object s : children)
@@ -1099,29 +1004,6 @@
    // -----------  End Marshalling and State Transfer --------------------=
---
 =

    /**
-    * @param fqn fqn String name to retrieve from cache
-    * @return DataNode corresponding to the fqn. Null if does not exist. N=
o guarantees wrt replication,
-    *         cache loading are given if the underlying node is modified
-    */
-   public Node get(String fqn) throws CacheException
-   {
-      return get(Fqn.fromString(fqn));
-   }
-
-   /**
-    * Returns a DataNode corresponding to the fully qualified name or null=
 if
-    * does not exist.
-    * No guarantees wrt replication, cache loading are given if the underl=
ying node is modified
-    *
-    * @param fqn name of the DataNode to retreive
-    */
-   public Node get(Fqn<?> fqn) throws CacheException
-   {
-      MethodCall m =3D MethodCallFactory.create(MethodDeclarations.getNode=
MethodLocal_id, fqn);
-      return (Node) invokeMethod(m, true);
-   }
-
-   /**
     * Returns the raw data of the node; called externally internally.
     */
    public Node _get(Fqn<?> fqn) throws CacheException
@@ -1139,19 +1021,6 @@
       return n.getDataDirect();
    }
 =

-   /**
-    * Retrieves a defensively copied data map of the underlying node.
-    *
-    * @param fqn
-    * @return map of data, or an empty map
-    * @throws CacheException
-    */
-   public Map getData(Fqn<?> fqn) throws CacheException
-   {
-      MethodCall m =3D MethodCallFactory.create(MethodDeclarations.getData=
MapMethodLocal_id, fqn);
-      return (Map) invokeMethod(m, true);
-   }
-
    public Set _getKeys(Fqn<?> fqn) throws CacheException
    {
       NodeSPI n =3D findNode(fqn);
@@ -1163,31 +1032,6 @@
       return new HashSet(keys);
    }
 =

-   /**
-    * Finds a node given its name and returns the value associated with a =
given key in its <code>data</code>
-    * map. Returns null if the node was not found in the cache or the key =
was not found in the hashmap.
-    *
-    * @param fqn The fully qualified name of the node.
-    * @param key The key.
-    */
-   public Object get(String fqn, Object key) throws CacheException
-   {
-      return get(Fqn.fromString(fqn), key);
-   }
-
-
-   /**
-    * Finds a node given its name and returns the value associated with a =
given key in its <code>data</code>
-    * map. Returns null if the node was not found in the cache or the key =
was not found in the hashmap.
-    *
-    * @param fqn The fully qualified name of the node.
-    * @param key The key.
-    */
-   public Object get(Fqn<?> fqn, Object key) throws CacheException
-   {
-      return get(fqn, key, true);
-   }
-
    public Object _get(Fqn<?> fqn, Object key, boolean sendNodeEvent) throw=
s CacheException
    {
       InvocationContext ctx =3D spi.getInvocationContext();
@@ -1207,13 +1051,6 @@
       return n.getDirect(key);
    }
 =

-
-   protected Object get(Fqn<?> fqn, Object key, boolean sendNodeEvent) thr=
ows CacheException
-   {
-      MethodCall m =3D MethodCallFactory.create(MethodDeclarations.getKeyV=
alueMethodLocal_id, fqn, key, sendNodeEvent);
-      return invokeMethod(m, true);
-   }
-
    /**
     * Checks whether a given node exists in current in-memory state of the=
 cache.
     * Does not acquire any locks in doing so (result may be dirty read). D=
oes
@@ -1286,8 +1123,7 @@
 =

 =

    /**
-    * Checks whether a given key exists in the given node. Does not intera=
ct with CacheLoader, so the behavior is
-    * different from {@link #get(Fqn,Object)}
+    * Checks whether a given key exists in the given node. Does not intera=
ct with the interceptor stack.
     *
     * @param fqn The fully qualified name of the node
     * @param key
@@ -1299,284 +1135,6 @@
       return n !=3D null && n.getKeysDirect().contains(key);
    }
 =

-
-   /**
-    * Adds a new node to the cache and sets its data. If the node doesn no=
t yet exist, it will be created.
-    * Also, parent nodes will be created if not existent. If the node alre=
ady has data, then the new data
-    * will override the old one. If the node already existed, a nodeModifi=
ed() notification will be generated.
-    * Otherwise a nodeCreated() motification will be emitted.
-    *
-    * @param fqn  The fully qualified name of the new node
-    * @param data The new data. May be null if no data should be set in th=
e node.
-    */
-   public void put(String fqn, Map data) throws CacheException
-   {
-      put(Fqn.fromString(fqn), data);
-   }
-
-   /**
-    * Sets a node's data. If the node does not yet exist, it will be creat=
ed.
-    * Also, parent nodes will be created if not existent. If the node alre=
ady has data, then the new data
-    * will override the old one. If the node already existed, a nodeModifi=
ed() notification will be generated.
-    * Otherwise a nodeCreated() motification will be emitted.
-    *
-    * @param fqn  The fully qualified name of the new node
-    * @param data The new data. May be null if no data should be set in th=
e node.
-    */
-   public void put(Fqn<?> fqn, Map data) throws CacheException
-   {
-      put(fqn, data, false);
-   }
-
-   public void put(Fqn<?> fqn, Map data, boolean erase) throws CacheExcept=
ion
-   {
-      GlobalTransaction tx =3D getCurrentTransaction();
-      MethodCall m;
-      if (erase)
-      {
-         m =3D MethodCallFactory.create(MethodDeclarations.putDataEraseMet=
hodLocal_id, tx, fqn, data, true, true);
-      }
-      else
-      {
-         m =3D MethodCallFactory.create(MethodDeclarations.putDataMethodLo=
cal_id, tx, fqn, data, true);
-      }
-      invokeMethod(m, true);
-   }
-
-   /**
-    * Adds a key and value to a given node. If the node doesn't exist, it =
will be created. If the node
-    * already existed, a nodeModified() notification will be generated. Ot=
herwise a
-    * nodeCreated() motification will be emitted.
-    *
-    * @param fqn   The fully qualified name of the node
-    * @param key   The key
-    * @param value The value
-    * @return Object The previous value (if any), if node was present
-    */
-   public Object put(String fqn, Object key, Object value) throws CacheExc=
eption
-   {
-      return put(Fqn.fromString(fqn), key, value);
-   }
-
-   /**
-    * Adds a key and value to a given node. If the node doesn't exist, it =
will be created. If the node
-    * already existed, a nodeModified() notification will be generated. Ot=
herwise a
-    * nodeCreated() motification will be emitted.
-    *
-    * @param fqn   The fully qualified name of the node
-    * @param key   The key
-    * @param value The value
-    * @return Object The previous value (if any), if node was present
-    */
-   public Object put(Fqn<?> fqn, Object key, Object value) throws CacheExc=
eption
-   {
-      GlobalTransaction tx =3D getCurrentTransaction();
-      MethodCall m =3D MethodCallFactory.create(MethodDeclarations.putKeyV=
alMethodLocal_id, tx, fqn, key, value, true);
-      return invokeMethod(m, true);
-   }
-
-   /**
-    * Removes the node from the cache.
-    *
-    * @param fqn The fully qualified name of the node.
-    */
-   public void remove(String fqn) throws CacheException
-   {
-      remove(Fqn.fromString(fqn));
-   }
-
-   /**
-    * Removes the node from the cache.
-    *
-    * @param fqn The fully qualified name of the node.
-    */
-   public boolean remove(Fqn fqn) throws CacheException
-   {
-      GlobalTransaction tx =3D getCurrentTransaction();
-      // special case if we are removing the root.  Remove all children in=
stead.
-      if (fqn.isRoot())
-      {
-         boolean result =3D true;
-         // we need to preserve options
-         InvocationContext ctx =3D spi.getInvocationContext();
-         Option o =3D ctx.getOptionOverrides();
-         for (Object childName : _getChildrenNames(fqn))
-         {
-            ctx.setOptionOverrides(o);
-            result =3D remove(new Fqn<Object>(fqn, childName)) && result;
-         }
-
-         return result;
-      }
-      else
-      {
-         MethodCall m =3D MethodCallFactory.create(MethodDeclarations.remo=
veNodeMethodLocal_id, tx, fqn, true);
-         Object retval =3D invokeMethod(m, true);
-         return retval !=3D null && (Boolean) retval;
-      }
-   }
-
-   /**
-    * Called by eviction policy provider. Note that eviction is done only =
in
-    * local mode, that is, it doesn't replicate the node removal. This will
-    * cause the replication nodes to not be synchronizing, which is fine s=
ince
-    * the value will be fetched again when {@link #get} returns null. After
-    * that, the contents will be in sync.
-    *
-    * @param fqn Will remove everythign assoicated with this fqn.
-    * @throws CacheException
-    */
-   public void evict(Fqn fqn) throws CacheException
-   {
-      if (fqn.isRoot())
-      {
-         // special treatment for root eviction
-         // we need to preserve options
-         InvocationContext ctx =3D spi.getInvocationContext();
-         Option o =3D ctx.getOptionOverrides();
-         for (Object childName : _getChildrenNames(fqn))
-         {
-            ctx.setOptionOverrides(o);
-            evict(new Fqn<Object>(fqn, childName));
-         }
-      }
-      else
-      {
-         MethodCall m =3D MethodCallFactory.create(MethodDeclarations.evic=
tNodeMethodLocal_id, fqn);
-         invokeMethod(m, true);
-      }
-   }
-
-   /**
-    * Removes <code>key</code> from the node's hashmap
-    *
-    * @param fqn The fullly qualified name of the node
-    * @param key The key to be removed
-    * @return The previous value, or null if none was associated with the =
given key
-    */
-   public Object remove(String fqn, Object key) throws CacheException
-   {
-      return remove(Fqn.fromString(fqn), key);
-   }
-
-   /**
-    * Removes <code>key</code> from the node's hashmap
-    *
-    * @param fqn The fullly qualified name of the node
-    * @param key The key to be removed
-    * @return The previous value, or null if none was associated with the =
given key
-    */
-   public Object remove(Fqn<?> fqn, Object key) throws CacheException
-   {
-      GlobalTransaction tx =3D getCurrentTransaction();
-      MethodCall m =3D MethodCallFactory.create(MethodDeclarations.removeK=
eyMethodLocal_id, tx, fqn, key, true);
-      return invokeMethod(m, true);
-   }
-
-   /**
-    * Lock a given node (or the entire subtree starting at this node)
-    * @param fqn The FQN of the node
-    * @param owner The owner. This is simply a key into a hashtable, and c=
an be anything, e.g.
-    * a GlobalTransaction, the current thread, or a special object. If nul=
l, it is set to Thread.currentThread()
-    * @param lock_type The type of lock (RO, RW). Needs to be of type Data=
Node.LOCK_TYPE_READ or DataNode.LOCK_TYPE_WRITE
-    * @param lock_recursive If true, the entire subtree is locked, else on=
ly the given node
-    * @throws CacheException If node doesn't exist, a NodeNotExistsExcepti=
on is throw. Other exceptions are
-    * LockingException, TimeoutException and UpgradeException
-    */
-   //   public void lock(Fqn fqn, Object owner, int lock_type, boolean loc=
k_recursive) throws CacheException {
-   //
-   //   }
-
-   /**
-    * Unlock a given node (or the entire subtree starting at this node)
-    * @param fqn The FQN of the node
-    * @param owner The owner. This is simply a key into a hashtable, and c=
an be anything, e.g.
-    * a GlobalTransaction, the current thread, or a special object. If nul=
l, it is set to Thread.currentThread()
-    * @param unlock_recursive If true, the entire subtree is unlocked, els=
e only the given node
-    * @param force Release the lock even if we're not the owner
-    */
-   //   public void unlock(Fqn fqn, Object owner, boolean unlock_recursive=
, boolean force) {
-   //
-   //   }
-
-   /**
-    * Releases all locks for this node and the entire node subtree.
-    */
-   public void releaseAllLocks(String fqn)
-   {
-      releaseAllLocks(Fqn.fromString(fqn));
-   }
-
-   /**
-    * Releases all locks for this node and the entire node subtree.
-    */
-   public void releaseAllLocks(Fqn fqn)
-   {
-      MethodCall m =3D MethodCallFactory.create(MethodDeclarations.release=
AllLocksMethodLocal_id, fqn);
-      try
-      {
-         invokeMethod(m, true);
-      }
-      catch (CacheException e)
-      {
-         log.error("failed releasing all locks for " + fqn, e);
-      }
-   }
-
-   /**
-    * Prints a representation of the node defined by <code>fqn</code>.
-    * Output includes name, fqn and data.
-    */
-   public String print(String fqn)
-   {
-      return print(Fqn.fromString(fqn));
-   }
-
-   /**
-    * Prints a representation of the node defined by <code>fqn</code>.
-    * Output includes name, fqn and data.
-    */
-   public String print(Fqn fqn)
-   {
-      MethodCall m =3D MethodCallFactory.create(MethodDeclarations.printMe=
thodLocal_id, fqn);
-      Object retval =3D null;
-      try
-      {
-         retval =3D invokeMethod(m, true);
-      }
-      catch (Throwable e)
-      {
-         retval =3D e;
-      }
-      if (retval !=3D null)
-      {
-         return retval.toString();
-      }
-      else
-      {
-         return "";
-      }
-   }
-
-   /**
-    * Returns all children of a given node.  Returns an empty set if there=
 are no children.
-    * The set is unmodifiable.
-    *
-    * @param fqn The fully qualified name of the node
-    * @return Set an unmodifiable set of children names, Object.
-    */
-   public <E> Set<E> getChildrenNames(Fqn<E> fqn) throws CacheException
-   {
-      MethodCall m =3D MethodCallFactory.create(MethodDeclarations.getChil=
drenNamesMethodLocal_id, fqn);
-      Set<E> retval =3D null;
-      retval =3D (Set<E>) invokeMethod(m, true);
-      if (retval !=3D null)
-         retval =3D Collections.unmodifiableSet(new HashSet<E>(retval));
-      else
-         retval =3D Collections.emptySet();
-      return retval;
-   }
-
    @SuppressWarnings("unchecked")
    public <E> Set<E> _getChildrenNames(Fqn<E> fqn) throws CacheException
    {
@@ -1805,7 +1363,7 @@
       if ((preferredMode =3D spi.getInvocationContext().getOptionOverrides=
().getGroupRequestMode()) > -1)
          modeToUse =3D preferredMode;
 =

-      RspList rsps =3D null;
+      RspList rsps;
       List retval;
       Vector<Address> validMembers;
 =

@@ -1814,7 +1372,6 @@
          return null;
       }
 =

-      validMembers =3D null;
       if (mbrs !=3D null)
          validMembers =3D new Vector<Address>(mbrs);
       else
@@ -2172,7 +1729,7 @@
 =

       NodeSPI n;
       NodeSPI parent_node;
-      MethodCall undo_op =3D null;
+      MethodCall undo_op;
 =

       if (trace)
       {
@@ -2292,8 +1849,8 @@
    public Object _remove(GlobalTransaction tx, Fqn fqn, Object key, boolea=
n create_undo_ops)
          throws CacheException
    {
-      MethodCall undo_op =3D null;
-      Object old_value =3D null;
+      MethodCall undo_op;
+      Object old_value;
 =

       if (trace)
       {
@@ -2581,21 +2138,6 @@
    }
 =

    /**
-    * Evicts a key/value pair from a node's attributes. Note that this is =
<em>local</em>, will not be replicated.
-    * @param fqn
-    * @param key
-    * @throws CacheException
-    */
-   //    public void _evict(Fqn fqn, Object key) throws CacheException {
-   //       if(!exists(fqn)) return;
-   //       boolean create_undo_ops =3D false;
-   //       boolean sendNodeEvent =3D false;
-   //       boolean eviction=3Dtrue;
-   //       _removeData(null, fqn, create_undo_ops, sendNodeEvent, evictio=
n);
-   //    }
-
-
-   /**
     * Compensating method to {@link #_remove(GlobalTransaction,Fqn,boolean=
)}.
     */
    public void _addChild(GlobalTransaction gtx, Fqn parent_fqn, Object chi=
ld_name, Node cn, boolean undoOps)
@@ -2642,49 +2184,6 @@
 =

 =

    /**
-    * Replicates changes across to other nodes in the cluster.  Invoked by=
 the
-    * ReplicationInterceptor.  Calls need to be forwarded to the
-    * ReplicationInterceptor in this interceptor chain. This method will l=
ater
-    * be moved entirely into the ReplicationInterceptor.
-    */
-   public Object _replicate(MethodCall method_call) throws Throwable
-   {
-      try
-      {
-         Object retVal =3D invokeMethod(method_call, false);
-         // we only need to return values for a set of remote calls; not e=
very call.
-         if (MethodDeclarations.returnValueForRemoteCall(method_call.getMe=
thodId()))
-         {
-            return retVal;
-         }
-         else
-         {
-            return null;
-         }
-      }
-      catch (Throwable ex)
-      {
-         if (method_call.getMethodId() !=3D MethodDeclarations.putForExter=
nalReadMethodLocal_id
-               || method_call.getMethodId() !=3D MethodDeclarations.putFor=
ExternalReadVersionedMethodLocal_id)
-         {
-            if (!MethodDeclarations.isBuddyGroupOrganisationMethod(method_=
call.getMethodId()) && log.isWarnEnabled())
-               log.warn("replication failure with method_call " + method_c=
all + " exception", ex);
-            throw ex;
-         }
-         else return null;
-
-      }
-   }
-
-   /**
-    * Replicates a list of method calls.
-    */
-   public void _replicate(List<MethodCall> methodCalls) throws Throwable
-   {
-      for (MethodCall methodCall : methodCalls) _replicate(methodCall);
-   }
-
-   /**
     * Used with buddy replication's data gravitation interceptor.  If mars=
halling is necessary, ensure that the cache is
     * configured to use {@link org.jboss.cache.config.Configuration#useReg=
ionBasedMarshalling} and the {@link org.jboss.cache.Region}
     * pertaining to the Fqn passed in is activated, and has an appropriate=
 ClassLoader.
@@ -2882,42 +2381,6 @@
    }
 =

    /**
-    * Returns the CacheLoaderManager.
-    */
-   public CacheLoaderManager getCacheLoaderManager()
-   {
-      return cacheLoaderManager;
-   }
-
-   /**
-    * Sets the CacheLoaderManager.
-    */
-   public void setCacheLoaderManager(CacheLoaderManager cacheLoaderManager)
-   {
-      this.cacheLoaderManager =3D cacheLoaderManager;
-   }
-
-   /**
-    * @return an instance of {@link Notifier} which has been configured wi=
th this instance of CacheImpl.
-    */
-   public Notifier getNotifier()
-   {
-      return notifier;
-   }
-
-   /**
-    * New API to efficiently relocate a node
-    *
-    * @since 2.0.0
-    */
-   public void move(Fqn<?> nodeToMove, Fqn<?> newParent)
-   {
-      // this needs to be passed up the interceptor chain
-      MethodCall m =3D MethodCallFactory.create(MethodDeclarations.moveMet=
hodLocal_id, nodeToMove, newParent);
-      invokeMethod(m, true);
-   }
-
-   /**
     * Called by reflection
     *
     * @param newParentFqn
@@ -3019,7 +2482,6 @@
       {
          channel.disconnect();
          channel.close();
-//         channel.disconnect();
       }
    }
 =

@@ -3132,7 +2594,7 @@
    private boolean isValid(Transaction tx)
    {
       if (tx =3D=3D null) return false;
-      int status =3D -1;
+      int status;
       try
       {
          status =3D tx.getStatus();
@@ -3237,36 +2699,7 @@
       return gtx;
    }
 =

-
-   private void blockUntilCacheStarts() throws InterruptedException
-   {
-      int pollFrequencyMS =3D 100;
-      long startupWaitTime =3D configuration.getStateRetrievalTimeout();
-      long giveUpTime =3D System.currentTimeMillis() + startupWaitTime;
-
-      while (System.currentTimeMillis() < giveUpTime)
-      {
-         if (cacheStatus.allowInvocations()) break;
-         Thread.sleep(pollFrequencyMS);
-      }
-
-   }
-
    /**
-    * Invokes a method against this object. Contains the logger_ic for han=
dling
-    * the various use cases, e.g. mode (local, repl_async, repl_sync),
-    * transaction (yes or no) and locking (yes or no).
-    * <p/>
-    * Only sets originLocal on the invocation context IF this is explicitl=
y passed in as <tt>false</tt>
-    * If passed in as <tt>true</tt> then it is not set; but whatever defau=
lt exists in the invocation
-    * context is used.  For example, it may be set prior to calling invoke=
Method()
-    */
-   protected Object invokeMethod(MethodCall m, boolean originLocal) throws=
 CacheException
-   {
-      throw new UnsupportedOperationException("DEPRECATED and should not b=
e used!!");
-   }
-
-   /**
     * Returns an object suitable for use in node locking, either the curre=
nt
     * transaction or the current thread if there is no transaction.
     */
@@ -3402,50 +2835,6 @@
       return toReturn;
    }
 =

-//   private void initialiseCacheLoaderManager() throws CacheException
-//   {
-//      if (cacheLoaderManager =3D=3D null)
-//      {
-//         cacheLoaderManager =3D new CacheLoaderManager();
-//      }
-//      cacheLoaderManager.setConfig(configuration.getCacheLoaderConfig(),=
 spi);
-//   }
-
-   /**
-    * Sets the CacheLoader to use.
-    * Provided for backwards compatibility.
-    *
-    * @param loader
-    * @deprecated only provided for backward compat
-    */
-//   @Deprecated
-//   public void setCacheLoader(CacheLoader loader)
-//   {
-//      log.warn("Using deprecated config method setCacheLoader.  This ele=
ment will be removed in future, please use CacheLoaderConfiguration instead=
.");
-//
-//      try
-//      {
-//         if (cacheLoaderManager =3D=3D null) initialiseCacheLoaderManage=
r();
-//      }
-//      catch (Exception e)
-//      {
-//         log.warn("Problem setting cache loader.  Perhaps your cache loa=
der config has not been set yet?");
-//      }
-//      cacheLoaderManager.setCacheLoader(loader);
-//   }
-
-   /**
-    * Purges the contents of all configured {@link CacheLoader}s
-    */
-   public void purgeCacheLoaders() throws Exception
-   {
-      if (cacheLoaderManager !=3D null) cacheLoaderManager.purgeLoaders(tr=
ue);
-   }
-
-   // ---------------------------------------------------------------
-   // END: Methods to provide backward compatibility with older cache load=
er config settings
-   // ---------------------------------------------------------------
-
    private void initialiseChannelAndRpcDispatcher() throws CacheException
    {
       channel =3D configuration.getRuntimeConfig().getChannel();
@@ -3499,7 +2888,6 @@
       // always use the InactiveRegionAwareRpcDispatcher - exceptions due =
to regions not being active should not propagate to remote
       // nodes as errors. - Manik
       disp =3D new InactiveRegionAwareRpcDispatcher(channel, messageListen=
er, new MembershipListenerAdaptor(), remoteDelegate);
-      //            disp =3D new RpcDispatcher(channel, ml, this, this);
 =

       disp.setRequestMarshaller(marshaller);
       disp.setResponseMarshaller(marshaller);
@@ -3538,44 +2926,9 @@
       return modifiable =3D=3D null ? null : Collections.unmodifiableList(=
modifiable);
    }
 =

-   public void addCacheListener(Object listener)
-   {
-      getNotifier().addCacheListener(listener);
-   }
-
-   public void addCacheListener(Fqn<?> region, Object listener)
-   {
-      throw new UnsupportedOperationException("Not implemented in this rel=
ease");
-   }
-
-   public void removeCacheListener(Object listener)
-   {
-      // BES 2007/5/23 workaround to avoid NPE while we decide whether
-      // to remove notifier in destroy()
-      Notifier n =3D getNotifier();
-      if (n !=3D null)
-         n.removeCacheListener(listener);
-   }
-
-   public void removeCacheListener(Fqn<?> region, Object listener)
-   {
-      throw new UnsupportedOperationException("Not implemented in this rel=
ease");
-   }
-
-   public Set<Object> getCacheListeners()
-   {
-      return getNotifier().getCacheListeners();
-   }
-
-   public Set<Object> getCacheListeners(Fqn<?> region)
-   {
-      throw new UnsupportedOperationException("Not implemented in this rel=
ease");
-   }
-
    private List<Interceptor> getInterceptors()
    {
-      InterceptorChainFactory icf =3D componentRegistry.getComponent(Inter=
ceptorChainFactory.class);
-      return icf.asList(interceptorChain);
+      return InterceptorChainFactory.asList(interceptorChain);
    }
 =

    private void setInterceptorChain(Interceptor startOfNewChain)
@@ -3663,36 +3016,6 @@
       return getConfiguration().getClusterName();
    }
 =

-   public void evict(Fqn<?> fqn, boolean recursive)
-   {
-      //this method should be called by eviction thread only, so no transa=
ction - expected (sec param is false)
-      Node node =3D peek(fqn, false);
-      if (node !=3D null && node.isResident())
-      {
-         return;
-      }
-      if (recursive)
-      {
-         if (node !=3D null)
-         {
-            evictChildren((NodeSPI) node);
-         }
-      }
-      else
-      {
-         evict(fqn);
-      }
-   }
-
-   private void evictChildren(NodeSPI n)
-   {
-      for (Object child : n.getChildrenDirect())
-      {
-         evictChildren((NodeSPI) child);
-      }
-      evict(n.getFqn());
-   }
-
    public Region getRegion(Fqn<?> fqn, boolean createIfAbsent)
    {
       return regionManager.getRegion(fqn, createIfAbsent);
@@ -3703,35 +3026,8 @@
       return regionManager.removeRegion(fqn);
    }
 =

-   public boolean removeNode(Fqn<?> fqn)
-   {
-      return remove(fqn);
-   }
-
-   public void putForExternalRead(Fqn<?> fqn, Object key, Object value)
-   {
-      // if the node exists then this should be a no-op.
-      if (!exists(fqn))
-      {
-         spi.getInvocationContext().getOptionOverrides().setFailSilently(t=
rue);
-         GlobalTransaction tx =3D getCurrentTransaction();
-         MethodCall m =3D MethodCallFactory.create(MethodDeclarations.putF=
orExternalReadMethodLocal_id, tx, fqn, key, value);
-         invokeMethod(m, true);
-      }
-      else
-      {
-         if (log.isDebugEnabled())
-            log.debug("putForExternalRead() called with Fqn " + fqn + " an=
d this node already exists.  This method is hence a no op.");
-      }
-   }
-
    public void _putForExternalRead(GlobalTransaction gtx, Fqn fqn, Object =
key, Object value)
    {
       _put(gtx, fqn, key, value, true);
    }
-
-   public boolean isStarted()
-   {
-      return getCacheStatus() =3D=3D CacheStatus.STARTED;
-   }
 }

Modified: core/trunk/src/test/java/org/jboss/cache/replicated/SyncReplTxTes=
t.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/test/java/org/jboss/cache/replicated/SyncReplTxTest.java=
	2008-01-08 15:13:15 UTC (rev 5065)
+++ core/trunk/src/test/java/org/jboss/cache/replicated/SyncReplTxTest.java=
	2008-01-08 15:38:10 UTC (rev 5066)
@@ -11,7 +11,6 @@
 import org.apache.commons.logging.LogFactory;
 import org.jboss.cache.Cache;
 import org.jboss.cache.CacheException;
-import org.jboss.cache.CacheImpl;
 import org.jboss.cache.CacheSPI;
 import org.jboss.cache.DefaultCacheFactory;
 import org.jboss.cache.Fqn;
@@ -1337,56 +1336,4 @@
 =

    }
 =

-   @CacheListener
-   static class TransactionAborterListener
-   {
-
-      TransactionManager callbackTM;
-      Object mutex =3D new Object();
-      Exception ex;
-
-      TransactionAborterListener(CacheImpl cache)
-      {
-         callbackTM =3D cache.getTransactionManager();
-         cache.getNotifier().addCacheListener(this);
-      }
-
-      @NodeModified
-      public void nodeModified(NodeEvent ne)
-      {
-         if (!ne.isPre())
-         {
-            synchronized (mutex)
-            {
-               try
-               {
-                  Transaction tx =3D callbackTM.getTransaction();
-                  if (tx !=3D null && tx.getStatus() =3D=3D Status.STATUS_=
ACTIVE)
-                  {
-                     // this will rollback the transaction
-                     tx.setRollbackOnly();
-                  }
-               }
-               catch (Exception e)
-               {
-                  e.printStackTrace();
-                  if (ex =3D=3D null)
-                  {
-                     ex =3D e;
-                  }
-               }
-            }
-         }
-      }
-
-      Exception getCallbackException()
-      {
-         synchronized (mutex)
-         {
-            return ex;
-         }
-      }
-
-   }
-
 }


--===============0746961843693976314==--

From jbosscache-commits at lists.jboss.org Tue Jan  8 10:46:04 2008
Content-Type: multipart/mixed; boundary="===============8008386864816137386=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r5067 -
 benchmarks/CacheTests/trunk/src/perf.
Date: Tue, 08 Jan 2008 10:46:04 -0500
Message-ID: <E1JCGeS-0006t7-Eh@committer01.frg.pub.inap.atl.jboss.com>

--===============8008386864816137386==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: bela(a)jboss.com
Date: 2008-01-08 10:46:04 -0500 (Tue, 08 Jan 2008)
New Revision: 5067

Modified:
   benchmarks/CacheTests/trunk/src/perf/SessionTest.java
Log:
ns

Modified: benchmarks/CacheTests/trunk/src/perf/SessionTest.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- benchmarks/CacheTests/trunk/src/perf/SessionTest.java	2008-01-08 15:38:=
10 UTC (rev 5066)
+++ benchmarks/CacheTests/trunk/src/perf/SessionTest.java	2008-01-08 15:46:=
04 UTC (rev 5067)
@@ -69,12 +69,19 @@
     }
 =

     /** Create NUM_SESSIONS sessions with NUM_ATTRS attributes of SIZE siz=
e. Total size is multiplication of the 3 */
-    private static void init(Session session, int num_attrs, int size) thr=
ows NamingException {
-        for(int j=3D0; j < num_attrs; j++) {
-            byte[] buf=3Dsession.getAttribute(j);
-            if(buf =3D=3D null)
-                session.setAttribute(j, new byte[size]);
+    private void init(Session session, int num_attrs, int size) throws Nam=
ingException {
+        try {
+            tx.begin();
+            for(int j=3D0; j < num_attrs; j++) {
+                byte[] buf=3Dsession.getAttribute(j);
+                if(buf =3D=3D null)
+                    session.setAttribute(j, new byte[size]);
+            }
+            tx.commit();
         }
+        catch(Exception ex) {
+            try {tx.rollback();} catch(SystemException e) {}
+        }
     }
 =

     private void loop(Session session, int session_id, int num_requests, i=
nt num_attrs, int size) {
@@ -141,7 +148,7 @@
 =

     public static void main(String[] args) throws Exception {
         int session_id=3D-1;
-        int num_requests=3D1000;
+        int num_requests=3D100000;
         int num_attrs=3D100;
         int size=3D1000;
         int write_percentage=3D10; // percent


--===============8008386864816137386==--

From jbosscache-commits at lists.jboss.org Tue Jan  8 11:44:18 2008
Content-Type: multipart/mixed; boundary="===============8680855251222299877=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r5069 -
 benchmarks/CacheTests/trunk.
Date: Tue, 08 Jan 2008 11:40:18 -0500
Message-ID: <E1JCHUw-0000uf-7e@committer01.frg.pub.inap.atl.jboss.com>

--===============8680855251222299877==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: bela(a)jboss.com
Date: 2008-01-08 11:40:18 -0500 (Tue, 08 Jan 2008)
New Revision: 5069

Modified:
   benchmarks/CacheTests/trunk/run.sh
Log:
ns

Modified: benchmarks/CacheTests/trunk/run.sh
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- benchmarks/CacheTests/trunk/run.sh	2008-01-08 16:40:06 UTC (rev 5068)
+++ benchmarks/CacheTests/trunk/run.sh	2008-01-08 16:40:18 UTC (rev 5069)
@@ -7,4 +7,4 @@
 =

 CP=3D./classes:$CP
 =

-java  -Dlog4j.configuration=3Dfile:${HOME}/log4j.properties -Djgroups.bind=
_addr=3D$MYTESTIP_1 -classpath ${CP} perf.SessionTest -num_requests 100000 =
-num_attrs 100 -size 1000 -id 1 $*
+java -Djava.net.preferIPv4Stack=3Dtrue -Dlog4j.configuration=3Dfile:${HOME=
}/log4j.properties -Djgroups.bind_addr=3D$MYTESTIP_1 -classpath ${CP} perf.=
SessionTest -num_requests 100000 -num_attrs 100 -size 1000 -id 1 $*


--===============8680855251222299877==--

From jbosscache-commits at lists.jboss.org Tue Jan  8 11:44:28 2008
Content-Type: multipart/mixed; boundary="===============5921105959980813357=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r5070 -
 benchmarks/CacheTests/trunk.
Date: Tue, 08 Jan 2008 11:40:28 -0500
Message-ID: <E1JCHV6-0000vH-5U@committer01.frg.pub.inap.atl.jboss.com>

--===============5921105959980813357==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: bela(a)jboss.com
Date: 2008-01-08 11:40:28 -0500 (Tue, 08 Jan 2008)
New Revision: 5070

Modified:
   benchmarks/CacheTests/trunk/tc.sh
Log:
ns

Modified: benchmarks/CacheTests/trunk/tc.sh
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- benchmarks/CacheTests/trunk/tc.sh	2008-01-08 16:40:18 UTC (rev 5069)
+++ benchmarks/CacheTests/trunk/tc.sh	2008-01-08 16:40:28 UTC (rev 5070)
@@ -9,4 +9,4 @@
 =

 =

 =

-../terracotta-2.5.0/bin/dso-java.sh -Dtc.config=3D./tc5-config.xml  perf.S=
essionTest -factory perf.terracotta.SessionFactoryTC -num_requests 100000 -=
num_attrs 100 -size 1000 -id 1 $*
+../terracotta-2.5.0/bin/dso-java.sh -Dtc.config=3D./tc5-config.xml -Djava.=
net.preferIPv4Stack=3Dtrue perf.SessionTest -factory perf.terracotta.Sessio=
nFactoryTC -num_requests 100000 -num_attrs 100 -size 1000 -id 1 $*


--===============5921105959980813357==--

From jbosscache-commits at lists.jboss.org Tue Jan  8 11:44:41 2008
Content-Type: multipart/mixed; boundary="===============6900028216201890004=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r5071 -
 benchmarks/CacheTests/trunk.
Date: Tue, 08 Jan 2008 11:40:41 -0500
Message-ID: <E1JCHVJ-0000vw-Kz@committer01.frg.pub.inap.atl.jboss.com>

--===============6900028216201890004==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: bela(a)jboss.com
Date: 2008-01-08 11:40:41 -0500 (Tue, 08 Jan 2008)
New Revision: 5071

Modified:
   benchmarks/CacheTests/trunk/tmp.sh
Log:
ns

Modified: benchmarks/CacheTests/trunk/tmp.sh
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- benchmarks/CacheTests/trunk/tmp.sh	2008-01-08 16:40:28 UTC (rev 5070)
+++ benchmarks/CacheTests/trunk/tmp.sh	2008-01-08 16:40:41 UTC (rev 5071)
@@ -7,4 +7,4 @@
 =

 CP=3D./classes:$CP
 =

-java  -Dlog4j.configuration=3Dfile:${HOME}/log4j.properties -Djgroups.bind=
_addr=3D192.168.2.5 -classpath ${CP} perf.SessionTestCoherence -num_request=
s 100000 -num_attrs 100 -size 1000 -id 1 $*
+java  -Dlog4j.configuration=3Dfile:${HOME}/log4j.properties -Djgroups.bind=
_addr=3D192.168.2.5 -classpath ${CP} -javaagent:lib/jboss-aop.jar -Djboss.a=
op.path=3D./pojocache-aop.xml perf.SessionTestPC -num_requests 100000 -num_=
attrs 100 -size 1000 -id 1 $*


--===============6900028216201890004==--

From jbosscache-commits at lists.jboss.org Tue Jan  8 11:45:47 2008
Content-Type: multipart/mixed; boundary="===============4915107376736520412=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r5068 -
 benchmarks/CacheTests/trunk.
Date: Tue, 08 Jan 2008 11:40:07 -0500
Message-ID: <E1JCHUl-0000u2-4O@committer01.frg.pub.inap.atl.jboss.com>

--===============4915107376736520412==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: bela(a)jboss.com
Date: 2008-01-08 11:40:06 -0500 (Tue, 08 Jan 2008)
New Revision: 5068

Modified:
   benchmarks/CacheTests/trunk/pc.sh
Log:
ns

Modified: benchmarks/CacheTests/trunk/pc.sh
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- benchmarks/CacheTests/trunk/pc.sh	2008-01-08 15:46:04 UTC (rev 5067)
+++ benchmarks/CacheTests/trunk/pc.sh	2008-01-08 16:40:06 UTC (rev 5068)
@@ -7,4 +7,4 @@
 =

 CP=3D./classes:$CP
 =

-java  -Dlog4j.configuration=3Dfile:${HOME}/log4j.properties -Djgroups.bind=
_addr=3D$MYTESTIP_1 -classpath ${CP} -javaagent:lib/jboss-aop.jar -Djboss.a=
op.path=3D./pojocache-aop.xml perf.SessionTest -factory perf.pojocache.Sess=
ionFactoryPC -num_requests 100000 -num_attrs 100 -size 1000 -id 1 $*
+java -Djava.net.preferIPv4Stack=3Dtrue -Dlog4j.configuration=3Dfile:${HOME=
}/log4j.properties -Djgroups.bind_addr=3D$MYTESTIP_1 -classpath ${CP} -java=
agent:lib/jboss-aop.jar -Djboss.aop.path=3D./pojocache-aop.xml perf.Session=
Test -factory perf.pojocache.SessionFactoryPC -num_requests 100000 -num_att=
rs 100 -size 1000 -id 1 $*


--===============4915107376736520412==--

From jbosscache-commits at lists.jboss.org Tue Jan  8 12:18:29 2008
Content-Type: multipart/mixed; boundary="===============0550817035675080497=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r5072 -
 benchmarks/CacheTests/trunk/lib.
Date: Tue, 08 Jan 2008 12:18:28 -0500
Message-ID: <E1JCI5s-0007u5-R1@committer01.frg.pub.inap.atl.jboss.com>

--===============0550817035675080497==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: jason.greene(a)jboss.com
Date: 2008-01-08 12:18:28 -0500 (Tue, 08 Jan 2008)
New Revision: 5072

Modified:
   benchmarks/CacheTests/trunk/lib/jbosscache-core.jar
   benchmarks/CacheTests/trunk/lib/jbosscache-pojo.jar
Log:
Use trunk


Modified: benchmarks/CacheTests/trunk/lib/jbosscache-core.jar
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)

Modified: benchmarks/CacheTests/trunk/lib/jbosscache-pojo.jar
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)


--===============0550817035675080497==--

From jbosscache-commits at lists.jboss.org Tue Jan  8 12:35:43 2008
Content-Type: multipart/mixed; boundary="===============4597897714298612501=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r5073 - in
 benchmarks/CacheTests/trunk: conf and 1 other directory.
Date: Tue, 08 Jan 2008 12:35:42 -0500
Message-ID: <E1JCIMY-0003Bm-OG@committer01.frg.pub.inap.atl.jboss.com>

--===============4597897714298612501==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: bela(a)jboss.com
Date: 2008-01-08 12:35:42 -0500 (Tue, 08 Jan 2008)
New Revision: 5073

Added:
   benchmarks/CacheTests/trunk/conf/
   benchmarks/CacheTests/trunk/conf/config.xml
Removed:
   benchmarks/CacheTests/trunk/config.xml
Modified:
   benchmarks/CacheTests/trunk/pc.sh
   benchmarks/CacheTests/trunk/run.sh
   benchmarks/CacheTests/trunk/tmp.sh
Log:
moved config.xml to conf

Copied: benchmarks/CacheTests/trunk/conf/config.xml (from rev 5072, benchma=
rks/CacheTests/trunk/config.xml)
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- benchmarks/CacheTests/trunk/conf/config.xml	                        (re=
v 0)
+++ benchmarks/CacheTests/trunk/conf/config.xml	2008-01-08 17:35:42 UTC (re=
v 5073)
@@ -0,0 +1,254 @@
+<?xml version=3D"1.0" encoding=3D"UTF-8"?>
+
+<!-- =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D -->
+<!--                                                                      =
 -->
+<!--  Sample TreeCache Service Configuration                              =
 -->
+<!--                                                                      =
 -->
+<!-- =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D -->
+
+<server>
+
+   <!-- =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D -->
+   <!-- Defines TreeCache configuration                                   =
   -->
+   <!-- =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D -->
+
+   <mbean code=3D"org.jboss.cache.jmx.CacheJmxWrapper"
+          name=3D"jboss.cache:service=3DTreeCache">
+
+      <depends>jboss:service=3DNaming</depends>
+      <depends>jboss:service=3DTransactionManager</depends>
+
+      <!--
+          Configure the TransactionManager
+      -->
+      <attribute name=3D"TransactionManagerLookupClass">org.jboss.cache.tr=
ansaction.GenericTransactionManagerLookup
+      </attribute>
+
+      <!--
+          Isolation level : SERIALIZABLE
+                            REPEATABLE_READ (default)
+                            READ_COMMITTED
+                            READ_UNCOMMITTED
+                            NONE
+      -->
+      <attribute name=3D"IsolationLevel">REPEATABLE_READ</attribute>
+
+       <!--<attribute name=3D"NodeLockingScheme">OPTIMISTIC</attribute>-->
+
+      <!--
+           Valid modes are LOCAL
+                           REPL_ASYNC
+                           REPL_SYNC
+                           INVALIDATION_ASYNC
+                           INVALIDATION_SYNC
+      -->
+      <attribute name=3D"CacheMode">REPL_ASYNC</attribute>
+
+      <!--
+      Just used for async repl: use a replication queue
+      -->
+      <attribute name=3D"UseReplQueue">false</attribute>
+
+      <!--
+          Replication interval for replication queue (in ms)
+      -->
+      <attribute name=3D"ReplQueueInterval">0</attribute>
+
+      <!--
+          Max number of elements which trigger replication
+      -->
+      <attribute name=3D"ReplQueueMaxElements">0</attribute>
+
+      <!-- Name of cluster. Needs to be the same for all TreeCache nodes i=
n a
+           cluster in order to find each other.
+      -->
+      <attribute name=3D"ClusterName">JBossCache-Cluster</attribute>
+
+      <!--Uncomment next three statements to enable JGroups multiplexer.
+This configuration is dependent on the JGroups multiplexer being
+registered in an MBean server such as JBossAS.  -->
+      <!--
+      <depends>jgroups.mux:name=3DMultiplexer</depends>
+      <attribute name=3D"MultiplexerService">jgroups.mux:name=3DMultiplexe=
r</attribute>
+      <attribute name=3D"MultiplexerStack">fc-fast-minimalthreads</attribu=
te>
+      -->
+
+      <!-- JGroups protocol stack properties.
+         ClusterConfig isn't used if the multiplexer is enabled and succes=
sfully initialized.
+      -->
+      <attribute name=3D"ClusterConfig">
+         <config>
+             <!--<UDP mcast_addr=3D"232.10.10.10"
+                              mcast_port=3D"45588"
+                              tos=3D"8"
+                              ucast_recv_buf_size=3D"20000000"
+                              ucast_send_buf_size=3D"640000"
+                              mcast_recv_buf_size=3D"25000000"
+                              mcast_send_buf_size=3D"640000"
+                              loopback=3D"false"
+                              discard_incompatible_packets=3D"true"
+                              max_bundle_size=3D"64000"
+                              max_bundle_timeout=3D"30"
+                              use_incoming_packet_handler=3D"true"
+                              ip_ttl=3D"2"
+                              enable_bundling=3D"false"
+                              enable_unicast_bundling=3D"false"
+                              enable_diagnostics=3D"true"
+
+                              use_concurrent_stack=3D"true"
+
+                              thread_naming_pattern=3D"pl"
+
+                              thread_pool.enabled=3D"true"
+                              thread_pool.min_threads=3D"1"
+                              thread_pool.max_threads=3D"4"
+                              thread_pool.keep_alive_time=3D"30000"
+                              thread_pool.queue_enabled=3D"true"
+                              thread_pool.queue_max_size=3D"50000"
+                              thread_pool.rejection_policy=3D"discard"
+
+                              oob_thread_pool.enabled=3D"true"
+                              oob_thread_pool.min_threads=3D"2"
+                              oob_thread_pool.max_threads=3D"4"
+                              oob_thread_pool.keep_alive_time=3D"10000"
+                              oob_thread_pool.queue_enabled=3D"false"
+                              oob_thread_pool.queue_max_size=3D"10"
+                              oob_thread_pool.rejection_policy=3D"Run"/>-->
+
+            <TCP recv_buf_size=3D"20000000" use_send_queues=3D"false"
+                 loopback=3D"false"
+                 discard_incompatible_packets=3D"true"
+                 max_bundle_size=3D"64000"
+                 max_bundle_timeout=3D"30"
+                 use_incoming_packet_handler=3D"true"
+                 enable_bundling=3D"true"
+                 enable_unicast_bundling=3D"true"
+                 enable_diagnostics=3D"true"
+
+                 use_concurrent_stack=3D"true"
+
+                 thread_naming_pattern=3D"pl"
+
+                 thread_pool.enabled=3D"true"
+                 thread_pool.min_threads=3D"1"
+                 thread_pool.max_threads=3D"4"
+                 thread_pool.keep_alive_time=3D"30000"
+                 thread_pool.queue_enabled=3D"true"
+                 thread_pool.queue_max_size=3D"50000"
+                 thread_pool.rejection_policy=3D"discard"
+
+                 oob_thread_pool.enabled=3D"true"
+                 oob_thread_pool.min_threads=3D"2"
+                 oob_thread_pool.max_threads=3D"4"
+                 oob_thread_pool.keep_alive_time=3D"10000"
+                 oob_thread_pool.queue_enabled=3D"false"
+                 oob_thread_pool.queue_max_size=3D"10"
+                 oob_thread_pool.rejection_policy=3D"Run"/>
+
+            <!--<PING timeout=3D"2000" num_initial_members=3D"3"/>-->
+             <MPING mcast_addr=3D"232.1.2.3" timeout=3D"2000" num_initial_=
members=3D"3"/>
+            <MERGE2 max_interval=3D"30000" min_interval=3D"10000"/>
+            <FD_SOCK/>
+            <FD timeout=3D"10000" max_tries=3D"5" shun=3D"true"/>
+            <VERIFY_SUSPECT timeout=3D"1500"/>
+            <pbcast.NAKACK use_mcast_xmit=3D"false" gc_lag=3D"0"
+                           retransmit_timeout=3D"300,600,1200,2400,4800"
+                           discard_delivered_msgs=3D"true"/>
+            <!--<UNICAST timeout=3D"30,60,120,300,600,1200,2400,3600"/>-->
+            <pbcast.STABLE stability_delay=3D"1000" desired_avg_gossip=3D"=
50000"
+                           max_bytes=3D"400000"/>
+            <pbcast.GMS print_local_addr=3D"true" join_timeout=3D"5000"
+                        join_retry_timeout=3D"2000" shun=3D"false"
+                        view_bundling=3D"true" view_ack_collection_timeout=
=3D"5000"/>
+              <FC max_credits=3D"5000000"
+                    min_threshold=3D"0.20"/>
+            <FRAG2 frag_size=3D"60000"/>
+            <pbcast.STREAMING_STATE_TRANSFER use_reading_thread=3D"true"/>
+            <!-- <pbcast.STATE_TRANSFER/> -->
+            <pbcast.FLUSH timeout=3D"0"/>
+         </config>
+      </attribute>
+
+
+      <!--
+       Whether or not to fetch state on joining a cluster
+       NOTE this used to be called FetchStateOnStartup and has been rename=
d to be more descriptive.
+      -->
+      <attribute name=3D"FetchInMemoryState">true</attribute>
+
+      <!--
+          The max amount of time (in milliseconds) we wait until the
+          state (ie. the contents of the cache) are retrieved from
+          existing members in a clustered environment
+      -->
+      <attribute name=3D"StateRetrievalTimeout">15000</attribute>
+
+      <!--
+          Number of milliseconds to wait until all responses for a
+          synchronous call have been received.
+      -->
+      <attribute name=3D"SyncReplTimeout">15000</attribute>
+
+      <!-- Max number of milliseconds to wait for a lock acquisition -->
+      <attribute name=3D"LockAcquisitionTimeout">10000</attribute>
+
+      <!--
+         Indicate whether to use region based marshalling or not. Set this=
 to true if you are running under a scoped
+         class loader, e.g., inside an application server. Default is "fal=
se".
+      -->
+      <attribute name=3D"UseRegionBasedMarshalling">true</attribute>
+
+
+       <attribute name=3D"BuddyReplicationConfig">
+           <config>
+
+               <!-- Enables buddy replication. This is the ONLY mandatory =
configuration element here. -->
+               <buddyReplicationEnabled>true</buddyReplicationEnabled>
+
+               <!-- These are the default values anyway -->
+               <buddyLocatorClass>org.jboss.cache.buddyreplication.NextMem=
berBuddyLocator</buddyLocatorClass>
+
+               <!--  numBuddies is the number of backup nodes each node ma=
intains. ignoreColocatedBuddies means
+            that each node will *try* to select a buddy on a different phy=
sical host. If not able to do so though,
+            it will fall back to colocated nodes. -->
+               <buddyLocatorProperties>
+                   numBuddies =3D 1
+                   ignoreColocatedBuddies =3D true
+               </buddyLocatorProperties>
+
+               <!-- A way to specify a preferred replication group. If spe=
cified, we try and pick a buddy which shares
+           the same pool name (falling back to other buddies if not availa=
ble). This allows the sysdmin to
+           hint at backup buddies are picked, so for example, nodes may be=
 hinted topick buddies on a different
+           physical rack or power supply for added fault tolerance. -->
+               <buddyPoolName>myBuddyPoolReplicationGroup</buddyPoolName>
+
+               <!-- Communication timeout for inter-buddy group organisati=
on messages (such as assigning to and
+           removing from groups, defaults to 1000. -->
+               <buddyCommunicationTimeout>2000</buddyCommunicationTimeout>
+
+               <!-- Whether data is removed from old owners when gravitate=
d to a new owner. Defaults to true. -->
+               <dataGravitationRemoveOnFind>true</dataGravitationRemoveOnF=
ind>
+
+               <!-- Whether backup nodes can respond to data gravitation r=
equests, or only the data owner is
+           supposed to respond.  Defaults to true. -->
+               <dataGravitationSearchBackupTrees>true</dataGravitationSear=
chBackupTrees>
+
+               <!-- Whether all cache misses result in a data gravitation =
request. Defaults to false, requiring
+           callers to enable data gravitation on a per-invocation basis us=
ing the Options API. -->
+               <autoDataGravitation>false</autoDataGravitation>
+
+           </config>
+       </attribute>
+
+       =

+   </mbean>
+
+
+   <!--  Uncomment to get a graphical view of the TreeCache MBean above -->
+   <!--   <mbean code=3D"org.jboss.cache.TreeCacheView" name=3D"jboss.cach=
e:service=3DTreeCacheView">-->
+   <!--      <depends>jboss.cache:service=3DTreeCache</depends>-->
+   <!--      <attribute name=3D"CacheService">jboss.cache:service=3DTreeCa=
che</attribute>-->
+   <!--   </mbean>-->
+
+
+</server>


Property changes on: benchmarks/CacheTests/trunk/conf/config.xml
___________________________________________________________________
Name: svn:executable
   + =

Name: svn:keywords
   + Rev Id HeadURL

Deleted: benchmarks/CacheTests/trunk/config.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- benchmarks/CacheTests/trunk/config.xml	2008-01-08 17:18:28 UTC (rev 507=
2)
+++ benchmarks/CacheTests/trunk/config.xml	2008-01-08 17:35:42 UTC (rev 507=
3)
@@ -1,254 +0,0 @@
-<?xml version=3D"1.0" encoding=3D"UTF-8"?>
-
-<!-- =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D -->
-<!--                                                                      =
 -->
-<!--  Sample TreeCache Service Configuration                              =
 -->
-<!--                                                                      =
 -->
-<!-- =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D -->
-
-<server>
-
-   <!-- =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D -->
-   <!-- Defines TreeCache configuration                                   =
   -->
-   <!-- =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D -->
-
-   <mbean code=3D"org.jboss.cache.jmx.CacheJmxWrapper"
-          name=3D"jboss.cache:service=3DTreeCache">
-
-      <depends>jboss:service=3DNaming</depends>
-      <depends>jboss:service=3DTransactionManager</depends>
-
-      <!--
-          Configure the TransactionManager
-      -->
-      <attribute name=3D"TransactionManagerLookupClass">org.jboss.cache.tr=
ansaction.GenericTransactionManagerLookup
-      </attribute>
-
-      <!--
-          Isolation level : SERIALIZABLE
-                            REPEATABLE_READ (default)
-                            READ_COMMITTED
-                            READ_UNCOMMITTED
-                            NONE
-      -->
-      <attribute name=3D"IsolationLevel">REPEATABLE_READ</attribute>
-
-       <!--<attribute name=3D"NodeLockingScheme">OPTIMISTIC</attribute>-->
-
-      <!--
-           Valid modes are LOCAL
-                           REPL_ASYNC
-                           REPL_SYNC
-                           INVALIDATION_ASYNC
-                           INVALIDATION_SYNC
-      -->
-      <attribute name=3D"CacheMode">REPL_ASYNC</attribute>
-
-      <!--
-      Just used for async repl: use a replication queue
-      -->
-      <attribute name=3D"UseReplQueue">false</attribute>
-
-      <!--
-          Replication interval for replication queue (in ms)
-      -->
-      <attribute name=3D"ReplQueueInterval">0</attribute>
-
-      <!--
-          Max number of elements which trigger replication
-      -->
-      <attribute name=3D"ReplQueueMaxElements">0</attribute>
-
-      <!-- Name of cluster. Needs to be the same for all TreeCache nodes i=
n a
-           cluster in order to find each other.
-      -->
-      <attribute name=3D"ClusterName">JBossCache-Cluster</attribute>
-
-      <!--Uncomment next three statements to enable JGroups multiplexer.
-This configuration is dependent on the JGroups multiplexer being
-registered in an MBean server such as JBossAS.  -->
-      <!--
-      <depends>jgroups.mux:name=3DMultiplexer</depends>
-      <attribute name=3D"MultiplexerService">jgroups.mux:name=3DMultiplexe=
r</attribute>
-      <attribute name=3D"MultiplexerStack">fc-fast-minimalthreads</attribu=
te>
-      -->
-
-      <!-- JGroups protocol stack properties.
-         ClusterConfig isn't used if the multiplexer is enabled and succes=
sfully initialized.
-      -->
-      <attribute name=3D"ClusterConfig">
-         <config>
-             <!--<UDP mcast_addr=3D"232.10.10.10"
-                              mcast_port=3D"45588"
-                              tos=3D"8"
-                              ucast_recv_buf_size=3D"20000000"
-                              ucast_send_buf_size=3D"640000"
-                              mcast_recv_buf_size=3D"25000000"
-                              mcast_send_buf_size=3D"640000"
-                              loopback=3D"false"
-                              discard_incompatible_packets=3D"true"
-                              max_bundle_size=3D"64000"
-                              max_bundle_timeout=3D"30"
-                              use_incoming_packet_handler=3D"true"
-                              ip_ttl=3D"2"
-                              enable_bundling=3D"false"
-                              enable_unicast_bundling=3D"false"
-                              enable_diagnostics=3D"true"
-
-                              use_concurrent_stack=3D"true"
-
-                              thread_naming_pattern=3D"pl"
-
-                              thread_pool.enabled=3D"true"
-                              thread_pool.min_threads=3D"1"
-                              thread_pool.max_threads=3D"4"
-                              thread_pool.keep_alive_time=3D"30000"
-                              thread_pool.queue_enabled=3D"true"
-                              thread_pool.queue_max_size=3D"50000"
-                              thread_pool.rejection_policy=3D"discard"
-
-                              oob_thread_pool.enabled=3D"true"
-                              oob_thread_pool.min_threads=3D"2"
-                              oob_thread_pool.max_threads=3D"4"
-                              oob_thread_pool.keep_alive_time=3D"10000"
-                              oob_thread_pool.queue_enabled=3D"false"
-                              oob_thread_pool.queue_max_size=3D"10"
-                              oob_thread_pool.rejection_policy=3D"Run"/>-->
-
-            <TCP recv_buf_size=3D"20000000" use_send_queues=3D"false"
-                 loopback=3D"false"
-                 discard_incompatible_packets=3D"true"
-                 max_bundle_size=3D"64000"
-                 max_bundle_timeout=3D"30"
-                 use_incoming_packet_handler=3D"true"
-                 enable_bundling=3D"true"
-                 enable_unicast_bundling=3D"true"
-                 enable_diagnostics=3D"true"
-
-                 use_concurrent_stack=3D"true"
-
-                 thread_naming_pattern=3D"pl"
-
-                 thread_pool.enabled=3D"true"
-                 thread_pool.min_threads=3D"1"
-                 thread_pool.max_threads=3D"4"
-                 thread_pool.keep_alive_time=3D"30000"
-                 thread_pool.queue_enabled=3D"true"
-                 thread_pool.queue_max_size=3D"50000"
-                 thread_pool.rejection_policy=3D"discard"
-
-                 oob_thread_pool.enabled=3D"true"
-                 oob_thread_pool.min_threads=3D"2"
-                 oob_thread_pool.max_threads=3D"4"
-                 oob_thread_pool.keep_alive_time=3D"10000"
-                 oob_thread_pool.queue_enabled=3D"false"
-                 oob_thread_pool.queue_max_size=3D"10"
-                 oob_thread_pool.rejection_policy=3D"Run"/>
-
-            <!--<PING timeout=3D"2000" num_initial_members=3D"3"/>-->
-             <MPING mcast_addr=3D"232.1.2.3" timeout=3D"2000" num_initial_=
members=3D"3"/>
-            <MERGE2 max_interval=3D"30000" min_interval=3D"10000"/>
-            <FD_SOCK/>
-            <FD timeout=3D"10000" max_tries=3D"5" shun=3D"true"/>
-            <VERIFY_SUSPECT timeout=3D"1500"/>
-            <pbcast.NAKACK use_mcast_xmit=3D"false" gc_lag=3D"0"
-                           retransmit_timeout=3D"300,600,1200,2400,4800"
-                           discard_delivered_msgs=3D"true"/>
-            <!--<UNICAST timeout=3D"30,60,120,300,600,1200,2400,3600"/>-->
-            <pbcast.STABLE stability_delay=3D"1000" desired_avg_gossip=3D"=
50000"
-                           max_bytes=3D"400000"/>
-            <pbcast.GMS print_local_addr=3D"true" join_timeout=3D"5000"
-                        join_retry_timeout=3D"2000" shun=3D"false"
-                        view_bundling=3D"true" view_ack_collection_timeout=
=3D"5000"/>
-              <FC max_credits=3D"5000000"
-                    min_threshold=3D"0.20"/>
-            <FRAG2 frag_size=3D"60000"/>
-            <pbcast.STREAMING_STATE_TRANSFER use_reading_thread=3D"true"/>
-            <!-- <pbcast.STATE_TRANSFER/> -->
-            <pbcast.FLUSH timeout=3D"0"/>
-         </config>
-      </attribute>
-
-
-      <!--
-       Whether or not to fetch state on joining a cluster
-       NOTE this used to be called FetchStateOnStartup and has been rename=
d to be more descriptive.
-      -->
-      <attribute name=3D"FetchInMemoryState">true</attribute>
-
-      <!--
-          The max amount of time (in milliseconds) we wait until the
-          state (ie. the contents of the cache) are retrieved from
-          existing members in a clustered environment
-      -->
-      <attribute name=3D"StateRetrievalTimeout">15000</attribute>
-
-      <!--
-          Number of milliseconds to wait until all responses for a
-          synchronous call have been received.
-      -->
-      <attribute name=3D"SyncReplTimeout">15000</attribute>
-
-      <!-- Max number of milliseconds to wait for a lock acquisition -->
-      <attribute name=3D"LockAcquisitionTimeout">10000</attribute>
-
-      <!--
-         Indicate whether to use region based marshalling or not. Set this=
 to true if you are running under a scoped
-         class loader, e.g., inside an application server. Default is "fal=
se".
-      -->
-      <attribute name=3D"UseRegionBasedMarshalling">true</attribute>
-
-
-       <attribute name=3D"BuddyReplicationConfig">
-           <config>
-
-               <!-- Enables buddy replication. This is the ONLY mandatory =
configuration element here. -->
-               <buddyReplicationEnabled>true</buddyReplicationEnabled>
-
-               <!-- These are the default values anyway -->
-               <buddyLocatorClass>org.jboss.cache.buddyreplication.NextMem=
berBuddyLocator</buddyLocatorClass>
-
-               <!--  numBuddies is the number of backup nodes each node ma=
intains. ignoreColocatedBuddies means
-            that each node will *try* to select a buddy on a different phy=
sical host. If not able to do so though,
-            it will fall back to colocated nodes. -->
-               <buddyLocatorProperties>
-                   numBuddies =3D 1
-                   ignoreColocatedBuddies =3D true
-               </buddyLocatorProperties>
-
-               <!-- A way to specify a preferred replication group. If spe=
cified, we try and pick a buddy which shares
-           the same pool name (falling back to other buddies if not availa=
ble). This allows the sysdmin to
-           hint at backup buddies are picked, so for example, nodes may be=
 hinted topick buddies on a different
-           physical rack or power supply for added fault tolerance. -->
-               <buddyPoolName>myBuddyPoolReplicationGroup</buddyPoolName>
-
-               <!-- Communication timeout for inter-buddy group organisati=
on messages (such as assigning to and
-           removing from groups, defaults to 1000. -->
-               <buddyCommunicationTimeout>2000</buddyCommunicationTimeout>
-
-               <!-- Whether data is removed from old owners when gravitate=
d to a new owner. Defaults to true. -->
-               <dataGravitationRemoveOnFind>true</dataGravitationRemoveOnF=
ind>
-
-               <!-- Whether backup nodes can respond to data gravitation r=
equests, or only the data owner is
-           supposed to respond.  Defaults to true. -->
-               <dataGravitationSearchBackupTrees>true</dataGravitationSear=
chBackupTrees>
-
-               <!-- Whether all cache misses result in a data gravitation =
request. Defaults to false, requiring
-           callers to enable data gravitation on a per-invocation basis us=
ing the Options API. -->
-               <autoDataGravitation>false</autoDataGravitation>
-
-           </config>
-       </attribute>
-
-       =

-   </mbean>
-
-
-   <!--  Uncomment to get a graphical view of the TreeCache MBean above -->
-   <!--   <mbean code=3D"org.jboss.cache.TreeCacheView" name=3D"jboss.cach=
e:service=3DTreeCacheView">-->
-   <!--      <depends>jboss.cache:service=3DTreeCache</depends>-->
-   <!--      <attribute name=3D"CacheService">jboss.cache:service=3DTreeCa=
che</attribute>-->
-   <!--   </mbean>-->
-
-
-</server>

Modified: benchmarks/CacheTests/trunk/pc.sh
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- benchmarks/CacheTests/trunk/pc.sh	2008-01-08 17:18:28 UTC (rev 5072)
+++ benchmarks/CacheTests/trunk/pc.sh	2008-01-08 17:35:42 UTC (rev 5073)
@@ -5,6 +5,6 @@
     CP=3D$CP:${i}
 done
 =

-CP=3D./classes:$CP
+CP=3D./conf:./classes:$CP
 =

 java -Djava.net.preferIPv4Stack=3Dtrue -Dlog4j.configuration=3Dfile:${HOME=
}/log4j.properties -Djgroups.bind_addr=3D$MYTESTIP_1 -classpath ${CP} -java=
agent:lib/jboss-aop.jar -Djboss.aop.path=3D./pojocache-aop.xml perf.Session=
Test -factory perf.pojocache.SessionFactoryPC -num_requests 100000 -num_att=
rs 100 -size 1000 -id 1 $*

Modified: benchmarks/CacheTests/trunk/run.sh
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- benchmarks/CacheTests/trunk/run.sh	2008-01-08 17:18:28 UTC (rev 5072)
+++ benchmarks/CacheTests/trunk/run.sh	2008-01-08 17:35:42 UTC (rev 5073)
@@ -5,6 +5,6 @@
     CP=3D$CP:${i}
 done
 =

-CP=3D./classes:$CP
+CP=3D./conf:./classes:$CP
 =

 java -Djava.net.preferIPv4Stack=3Dtrue -Dlog4j.configuration=3Dfile:${HOME=
}/log4j.properties -Djgroups.bind_addr=3D$MYTESTIP_1 -classpath ${CP} perf.=
SessionTest -num_requests 100000 -num_attrs 100 -size 1000 -id 1 $*

Modified: benchmarks/CacheTests/trunk/tmp.sh
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- benchmarks/CacheTests/trunk/tmp.sh	2008-01-08 17:18:28 UTC (rev 5072)
+++ benchmarks/CacheTests/trunk/tmp.sh	2008-01-08 17:35:42 UTC (rev 5073)
@@ -5,6 +5,6 @@
     CP=3D$CP:${i}
 done
 =

-CP=3D./classes:$CP
+CP=3D./conf:./classes:$CP
 =

 java  -Dlog4j.configuration=3Dfile:${HOME}/log4j.properties -Djgroups.bind=
_addr=3D192.168.2.5 -classpath ${CP} -javaagent:lib/jboss-aop.jar -Djboss.a=
op.path=3D./pojocache-aop.xml perf.SessionTestPC -num_requests 100000 -num_=
attrs 100 -size 1000 -id 1 $*


--===============4597897714298612501==--

From jbosscache-commits at lists.jboss.org Tue Jan  8 12:43:06 2008
Content-Type: multipart/mixed; boundary="===============8237629907696769006=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r5074 -
 benchmarks/CacheTests/trunk/src/perf.
Date: Tue, 08 Jan 2008 12:43:06 -0500
Message-ID: <E1JCITi-0004DC-1P@committer01.frg.pub.inap.atl.jboss.com>

--===============8237629907696769006==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: bela(a)jboss.com
Date: 2008-01-08 12:43:05 -0500 (Tue, 08 Jan 2008)
New Revision: 5074

Modified:
   benchmarks/CacheTests/trunk/src/perf/SessionTest.java
Log:
ns

Modified: benchmarks/CacheTests/trunk/src/perf/SessionTest.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- benchmarks/CacheTests/trunk/src/perf/SessionTest.java	2008-01-08 17:35:=
42 UTC (rev 5073)
+++ benchmarks/CacheTests/trunk/src/perf/SessionTest.java	2008-01-08 17:43:=
05 UTC (rev 5074)
@@ -60,6 +60,9 @@
             loop(session, session_id, num_requests, num_attrs, size);
             input("Press enter to stop");
         }
+        catch(Exception ex) {
+            ex.printStackTrace();
+        }
         finally {
             if(factory !=3D null) {
                 factory.destroySession(session);


--===============8237629907696769006==--

From jbosscache-commits at lists.jboss.org Tue Jan  8 14:13:05 2008
Content-Type: multipart/mixed; boundary="===============1735575730711012529=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r5075 - in
 cache-bench-fwk/trunk/cache-products: jbosscache-2.1.0cr2 and 4 other
 directories.
Date: Tue, 08 Jan 2008 14:13:03 -0500
Message-ID: <E1JCJsl-0005BL-R1@committer01.frg.pub.inap.atl.jboss.com>

--===============1735575730711012529==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: mircea.markus
Date: 2008-01-08 14:13:03 -0500 (Tue, 08 Jan 2008)
New Revision: 5075

Added:
   cache-bench-fwk/trunk/cache-products/jbosscache-2.1.0cr2/
   cache-bench-fwk/trunk/cache-products/jbosscache-2.1.0cr2/conf/
   cache-bench-fwk/trunk/cache-products/jbosscache-2.1.0cr2/lib/
   cache-bench-fwk/trunk/cache-products/jbosscache-2.1.0cr2/src/
   cache-bench-fwk/trunk/cache-products/jbosscache-2.1.0cr2/src/org/
   cache-bench-fwk/trunk/cache-products/jbosscache-2.1.0cr2/src/org/cachebe=
nch/
   cache-bench-fwk/trunk/cache-products/jbosscache-2.1.0cr2/src/org/cachebe=
nch/cachewrappers/
   cache-bench-fwk/trunk/cache-products/jbosscache-2.1.0cr2/src/org/cachebe=
nch/cachewrappers/JBossCache210Cr2Wrapper.java
Log:


Added: cache-bench-fwk/trunk/cache-products/jbosscache-2.1.0cr2/src/org/cac=
hebench/cachewrappers/JBossCache210Cr2Wrapper.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- cache-bench-fwk/trunk/cache-products/jbosscache-2.1.0cr2/src/org/cacheb=
ench/cachewrappers/JBossCache210Cr2Wrapper.java	                        (re=
v 0)
+++ cache-bench-fwk/trunk/cache-products/jbosscache-2.1.0cr2/src/org/cacheb=
ench/cachewrappers/JBossCache210Cr2Wrapper.java	2008-01-08 19:13:03 UTC (re=
v 5075)
@@ -0,0 +1,83 @@
+package org.cachebench.cachewrappers;
+
+import org.jboss.cache.Cache;
+import org.jboss.cache.DefaultCacheFactory;
+import org.jboss.cache.Fqn;
+import org.jboss.cache.CacheSPI;
+import org.jboss.cache.marshall.NodeData;
+import org.jboss.cache.buddyreplication.GravitateResult;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.cachebench.CacheWrapper;
+
+import java.util.Map;
+
+/**
+ * @author Mircea.Markus(a)jboss.com
+ * @since 2.2
+ */
+public class JBossCache210Cr2Wrapper implements CacheWrapper
+{
+   private Cache cache;
+   private Log log =3D LogFactory.getLog(JBossCache210Cr2Wrapper.class);
+
+   public void init(Map parameters) throws Exception
+   {
+      log.info("Creating cache with the following configuration: " + param=
eters);
+      cache =3D DefaultCacheFactory.getInstance().createCache((String)para=
meters.get("config"));
+      log.info("Running cache with following config: " + cache.getConfigur=
ation());
+      log.info("Running follwing JBossCacheVersion: " + org.jboss.cache.Ve=
rsion.version);
+      log.info("Running follwing JBossCacheCodeName: " + org.jboss.cache.V=
ersion.codename);
+   }
+
+   public void setUp() throws Exception
+   {
+   }
+
+   public void tearDown() throws Exception
+   {
+      cache.stop();
+   }
+
+   public void put(Object key, Object value) throws Exception
+   {
+      // make sure the threads don't conflict!
+      Fqn f =3D new Fqn("test", key);
+      cache.put(f, key, value);
+   }
+
+   public Object get(Object key) throws Exception
+   {
+      Fqn f =3D new Fqn("test", key);
+      return cache.get(f, key);
+   }
+
+   public void empty() throws Exception
+   {
+      //not removing root because there it fails with buddy replication: h=
ttp://jira.jboss.com/jira/browse/JBCACHE-1241
+      cache.removeNode(new Fqn("test"));
+   }
+
+   public int getNumMembers()
+   {
+      return cache.getMembers().size();
+   }
+
+   public String getInfo()
+   {
+      return "Num direct children: " + cache.getRoot().getChildren().size(=
);
+   }
+
+   public Object getReplicatedData(String key) throws Exception
+   {
+      CacheSPI cacheSpi =3D (CacheSPI) cache;
+      GravitateResult result =3D cacheSpi.gravitateData(new Fqn("test", ke=
y), true);
+      if (!result.isDataFound())
+      {
+         //totall replication?
+         return get(key);
+      }
+      NodeData nodeData =3D result.getNodeData().get(0);
+      return nodeData.getAttributes().get(key);
+   }
+}


--===============1735575730711012529==--

From jbosscache-commits at lists.jboss.org Tue Jan  8 14:13:38 2008
Content-Type: multipart/mixed; boundary="===============4842460445359893759=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r5076 - in
 cache-bench-fwk/trunk/cache-products: jbosscache-2.0.0 and 3 other
 directories.
Date: Tue, 08 Jan 2008 14:13:38 -0500
Message-ID: <E1JCJtK-0005Bf-4N@committer01.frg.pub.inap.atl.jboss.com>

--===============4842460445359893759==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: mircea.markus
Date: 2008-01-08 14:13:37 -0500 (Tue, 08 Jan 2008)
New Revision: 5076

Added:
   cache-bench-fwk/trunk/cache-products/config.sh
Removed:
   cache-bench-fwk/trunk/cache-products/jbosscache-2.0.0/jbosscache-2.0.0.i=
ml
   cache-bench-fwk/trunk/cache-products/jbosscache-2.0.0/lib/jbosscache-cor=
e-2.1.0.CR2.jar
Modified:
   cache-bench-fwk/trunk/cache-products/jbosscache-2.0.0/config.sh
   cache-bench-fwk/trunk/cache-products/jbosscache-2.0.0/src/org/cachebench=
/cachewrappers/JBossCache200Wrapper.java
   cache-bench-fwk/trunk/cache-products/terracotta-2.5.0/config.sh
Log:


Added: cache-bench-fwk/trunk/cache-products/config.sh
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- cache-bench-fwk/trunk/cache-products/config.sh	                        =
(rev 0)
+++ cache-bench-fwk/trunk/cache-products/config.sh	2008-01-08 19:13:37 UTC =
(rev 5076)
@@ -0,0 +1,42 @@
+#!/bin/bash
+
+#this is a template file. Implementation of this should be present in each=
 benchmark directory,
+#e.g. ./jbosscache-2.0.0/config.sh
+# This file will be called by FWK_ROOT/runNode.sh, and is intended for add=
ing specific config params
+# to the benchmark runner.
+
+#Uncomment and append values to the variables below, as needed by a specif=
ic product
+
+#CLASSPATH=3D$CLASSPATH:<some other needed values>
+#JVM_OPTIONS=3DJVM_OPTIONS:-DsomeSysProp=3Dvalue1:-Xprop=3Dvalue2
+
+java -DcurrentIndex=3D0 -DclusterSize=3D3 -Xmx1024m -DpreferIPv4Stack=3Dtr=
ue -cp :./lib/commons-beanutils.jar:
+./lib/commons-digester.jar:./lib/commons-logging.jar:./lib/commons-math-1.=
0.jar:
+./lib/log4j.jar:./lib/smartfrog-3.12.014.jar:./conf:./classes/production/F=
ramework:
+./cache-products/jbosscache-2.1.0CR2/lib/jboss-common-core-2.0.4.GA.jar:
+./cache-products/jbosscache-2.1.0CR2/lib/jboss-javaee-5.0.0.Beta3.jar:
+./cache-products/jbosscache-2.1.0CR2/lib/jbosscache-core.jar:
+./cache-products/jbosscache-2.1.0CR2/lib/jcip-annotations-1.0.jar:
+./cache-products/jbosscache-2.1.0CR2/lib/jgroups-2.6.0.GA.jar:
+./classes/production/jbosscache-2.1.0CR2:
+./cache-products/jbosscache-2.1.0CR2/conf
+org.cachebench.CacheBenchmarkRunner
+
+org.cachebench.cachewrappers.JBossCache210Cr2Wrapper
+org.cachebench.cachewrappers.JBossCache210Cr2Wrapper
+org.cachebench.cachewrappers.JBossCache210Cr2Wrapper
+
+java -DcurrentIndex=3D0 -DclusterSize=3D3 -Xmx1024m -DpreferIPv4Stack=3Dtr=
ue -cp :./lib/commons-beanutils.jar:
+./lib/commons-digester.jar:./lib/commons-logging.jar:./lib/commons-math-1.=
0.jar:
+./lib/log4j.jar:./lib/smartfrog-3.12.014.jar:./conf:./classes/production/F=
ramework:
+./cache-products/jbosscache-2.0.0/lib/concurrent.jar:
+./cache-products/jbosscache-2.0.0/lib/jboss-common-core.jar:
+./cache-products/jbosscache-2.0.0/lib/jboss-j2ee.jar:
+./cache-products/jbosscache-2.0.0/lib/jbosscache.jar:
+./cache-products/jbosscache-2.0.0/lib/jcip-annotations.jar:
+./cache-products/jbosscache-2.0.0/lib/jgroups-2.6.1.jar:
+./cache-products/jbosscache-2.0.0/lib/jgroups.jar:
+./cache-products/jbosscache-2.0.0/lib/trove.jar:
+./classes/production/jbosscache-2.0.0:
+./cache-products/jbosscache-2.0.0/conf
+org.cachebench.CacheBenchmarkRunner

Modified: cache-bench-fwk/trunk/cache-products/jbosscache-2.0.0/config.sh
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- cache-bench-fwk/trunk/cache-products/jbosscache-2.0.0/config.sh	2008-01=
-08 19:13:03 UTC (rev 5075)
+++ cache-bench-fwk/trunk/cache-products/jbosscache-2.0.0/config.sh	2008-01=
-08 19:13:37 UTC (rev 5076)
@@ -1,12 +1,18 @@
 #!/bin/bash
 =

+#see "$CACHE_ROOT/cache-products/cache.sh" for details
+
 THIS_DIR=3D"./cache-products/jbosscache-2.0.0"
 =

-#adding lib files to classpath =

+#setting up classpath
 for JAR in $THIS_DIR/lib/*
 do   =

    CLASSPATH=3D$CLASSPATH:$JAR
 done
 CLASSPATH=3D$CLASSPATH:./classes/production/jbosscache-2.0.0
 CLASSPATH=3D$CLASSPATH:$THIS_DIR/conf
+#--classpath was set
 =

+#additional JVM options
+JVM_OPTIONS=3D"$JVM_OPTIONS -Xmx1024m -DpreferIPv4Stack=3Dtrue"
+

Deleted: cache-bench-fwk/trunk/cache-products/jbosscache-2.0.0/jbosscache-2=
.0.0.iml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- cache-bench-fwk/trunk/cache-products/jbosscache-2.0.0/jbosscache-2.0.0.=
iml	2008-01-08 19:13:03 UTC (rev 5075)
+++ cache-bench-fwk/trunk/cache-products/jbosscache-2.0.0/jbosscache-2.0.0.=
iml	2008-01-08 19:13:37 UTC (rev 5076)
@@ -1,185 +0,0 @@
-<?xml version=3D"1.0" encoding=3D"UTF-8"?>
-<module relativePaths=3D"true" type=3D"JAVA_MODULE" version=3D"4">
-  <component name=3D"NewModuleRootManager" inherit-compiler-output=3D"true=
">
-    <exclude-output />
-    <content url=3D"file://$MODULE_DIR$">
-      <sourceFolder url=3D"file://$MODULE_DIR$/src" isTestSource=3D"false"=
 />
-    </content>
-    <orderEntry type=3D"inheritedJdk" />
-    <orderEntry type=3D"sourceFolder" forTests=3D"false" />
-    <orderEntry type=3D"module-library">
-      <library>
-        <CLASSES>
-          <root url=3D"jar://$MODULE_DIR$/../jbosscache-1.4.1/lib/commons-=
logging.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type=3D"module-library">
-      <library>
-        <CLASSES>
-          <root url=3D"jar://$MODULE_DIR$/../jbosscache-1.4.1/lib/jgroups.=
jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type=3D"module-library">
-      <library>
-        <CLASSES>
-          <root url=3D"jar://$MODULE_DIR$/../jbosscache-1.4.1/lib/jboss-ca=
che.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type=3D"module-library">
-      <library>
-        <CLASSES>
-          <root url=3D"jar://$MODULE_DIR$/../jbosscache-1.4.1/lib/jboss-sy=
stem.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type=3D"module-library">
-      <library>
-        <CLASSES>
-          <root url=3D"jar://$MODULE_DIR$/../jbosscache-1.4.1/lib/jboss-j2=
ee.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type=3D"module-library">
-      <library>
-        <CLASSES>
-          <root url=3D"jar://$MODULE_DIR$/../jbosscache-1.4.1/lib/jboss-ao=
p.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type=3D"module-library">
-      <library>
-        <CLASSES>
-          <root url=3D"jar://$MODULE_DIR$/../jbosscache-1.4.1/lib/jboss-mi=
nimal.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type=3D"module-library">
-      <library>
-        <CLASSES>
-          <root url=3D"jar://$MODULE_DIR$/../jbosscache-1.4.1/lib/jboss-se=
rialization.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type=3D"module-library">
-      <library>
-        <CLASSES>
-          <root url=3D"jar://$MODULE_DIR$/../jbosscache-1.4.1/lib/concurre=
nt.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type=3D"module-library">
-      <library>
-        <CLASSES>
-          <root url=3D"jar://$MODULE_DIR$/../jbosscache-1.4.1/lib/jboss-jm=
x.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type=3D"module-library">
-      <library>
-        <CLASSES>
-          <root url=3D"jar://$MODULE_DIR$/../jbosscache-1.4.1/lib/trove.ja=
r!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type=3D"module-library">
-      <library>
-        <CLASSES>
-          <root url=3D"jar://$MODULE_DIR$/../jbosscache-1.4.1/lib/jboss-co=
mmon.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type=3D"module-library">
-      <library>
-        <CLASSES>
-          <root url=3D"jar://$MODULE_DIR$/lib/jboss-j2ee.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type=3D"module-library">
-      <library>
-        <CLASSES>
-          <root url=3D"jar://$MODULE_DIR$/lib/jcip-annotations.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type=3D"module-library">
-      <library>
-        <CLASSES>
-          <root url=3D"jar://$MODULE_DIR$/lib/jboss-common-core.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type=3D"module-library">
-      <library>
-        <CLASSES>
-          <root url=3D"jar://$MODULE_DIR$/lib/concurrent.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type=3D"module-library">
-      <library>
-        <CLASSES>
-          <root url=3D"jar://$MODULE_DIR$/lib/jbosscache.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type=3D"module-library">
-      <library>
-        <CLASSES>
-          <root url=3D"jar://$MODULE_DIR$/lib/trove.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type=3D"module-library">
-      <library>
-        <CLASSES>
-          <root url=3D"jar://$MODULE_DIR$/lib/jgroups.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type=3D"module" module-name=3D"Trunk" />
-    <orderEntryProperties />
-  </component>
-</module>
-

Deleted: cache-bench-fwk/trunk/cache-products/jbosscache-2.0.0/lib/jbosscac=
he-core-2.1.0.CR2.jar
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)

Modified: cache-bench-fwk/trunk/cache-products/jbosscache-2.0.0/src/org/cac=
hebench/cachewrappers/JBossCache200Wrapper.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- cache-bench-fwk/trunk/cache-products/jbosscache-2.0.0/src/org/cachebenc=
h/cachewrappers/JBossCache200Wrapper.java	2008-01-08 19:13:03 UTC (rev 5075)
+++ cache-bench-fwk/trunk/cache-products/jbosscache-2.0.0/src/org/cachebenc=
h/cachewrappers/JBossCache200Wrapper.java	2008-01-08 19:13:37 UTC (rev 5076)
@@ -21,8 +21,8 @@
    {
       log.info("Creating cache with the following configuration: " + param=
eters);
       cache =3D DefaultCacheFactory.getInstance().createCache((String)para=
meters.get("config"));
-      log.info("Running cache with following config:" + cache.getConfigura=
tion());
-   }
+      log.info("Running follwing JBossCacheVersion: " + org.jboss.cache.Ve=
rsion.version);
+      log.info("Running follwing JBossCacheCodeName: " + org.jboss.cache.V=
ersion.codename);   }
 =

    public void setUp() throws Exception
    {
@@ -74,5 +74,4 @@
       NodeData nodeData =3D result.getNodeData().get(0);
       return nodeData.getAttributes().get(key);
    }
-
 }

Modified: cache-bench-fwk/trunk/cache-products/terracotta-2.5.0/config.sh
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- cache-bench-fwk/trunk/cache-products/terracotta-2.5.0/config.sh	2008-01=
-08 19:13:03 UTC (rev 5075)
+++ cache-bench-fwk/trunk/cache-products/terracotta-2.5.0/config.sh	2008-01=
-08 19:13:37 UTC (rev 5076)
@@ -1,16 +1,14 @@
 #!/bin/bash
+
+#see "$CACHE_ROOT/cache-products/cache.sh" for details
+
 THIS_DIR=3D./cache-products/terracotta-2.5.0
 TC_HOME=3D"/cygdrive/c/java/terracotta-2.5.0"
+
+#addint terracotta wrapper class to classpath
 CLASSPATH=3D$CLASSPATH:./classes/production/terracotta-2.5.0
-SYS_PROPS=3D"$SYS_PROPS -Dtc.config=3D$THIS_DIR/tc-client-config.xml"
-#export START_NODE_COMMAND=3D"$TC_HOME/bin/dso-java.sh -cp $CLASSPATH $SYS=
_PROPS org.cachebench.CacheBenchmarkRunner"
 =

+#other specific JVM options
+JVM_OPTIONS=3D"$JVM_OPTIONS -Xmx1024m -DpreferIPv4Stack=3Dtrue -Dtc.config=
=3D$THIS_DIR/tc-client-config.xml -Dtc.install-root=3D${TC_HOME}"
+JVM_OPTIONS=3D"$JVM_OPTIONS -Xbootclasspath/p:${TC_HOME}/lib/dso-boot/dso-=
boot-hotspot_win32_150_14.jar"
 =

-export START_NODE_COMMAND=3D"java $JVM_ARGS -Dtc.install-root=3D${TC_HOME}=
 -Xbootclasspath/p:${TC_HOME}/lib/dso-boot/dso-boot-hotspot_win32_150_14.ja=
r $SYS_PROPS -cp $CLASSPATH $OTHER_SYS_ARGS org.cachebench.CacheBenchmarkRu=
nner"
-
-#${JAVA_HOME}/bin/java -Dtc.install-root=3D${TC_HOME} -Xbootclasspath/p:<d=
so-boot-jar-path> -Dtc.config=3D<tc-config-path> <startup-classname>
-#executing command java -Xmx1024m -Dtc.install-root=3D/cygdrive/c/java/ter=
racotta-2
-#.5.0 -Xbootclasspath/p:/cygdrive/c/java/terracotta-2.5.0/lib/dso-boot/dso=
-boot-h
-#otspot_win32_150_14.jar -DcurrentIndex=3D0 -Dorg.cachebench.debug=3Dtrue =
-Djava.net.preferIPv4Stack=3Dtrue -Dtc.config=3D./cache-products/terracotta=
-2.5.0/tc-client-con
-#fig.xml -cp :./lib/commons-beanutils.jar:./lib/commons-digester.jar:./lib=
/commons-logging.jar:./lib/commons-math-1.0.jar:./lib/log4j.jar:./lib/smart=
frog-3.12.014.jar:./conf:./classes/production/Framework::./classes/producti=
on/terracotta-2.5.0 org.cachebench.CacheBenchmarkRunner
-#java -Dtc.install-root=3Dc:\java\terracotta-2.5.0 -DcurrentIndex=3D0 -Dor=
g.cachebench.debug=3Dtrue -Djava.net.preferIPv4Stack=3Dtrue -Xbootclasspath=
/p:"c:\java\terracotta-2.5.0\lib\dso-boot\dso-boot-hotspot_win32_150_14.jar=
" -Dtc.config=3DC:\projects\jboss\cache\benchmark\cache-bench-fwk\cache-pro=
ducts\terracotta-2.5.0\tc-client-config.xml -cp ./lib/commons-beanutils.jar=
;./lib/commons-digester.jar;./lib/commons-logging.jar;./lib/commons-math-1.=
0.jar;./lib/log4j.jar;./conf;./classes/production/Framework;./classes/produ=
ction/terracotta-2.5.0 org.cachebench.CacheBenchmarkRunner
\ No newline at end of file


--===============4842460445359893759==--

From jbosscache-commits at lists.jboss.org Tue Jan  8 14:24:39 2008
Content-Type: multipart/mixed; boundary="===============4721179971753783792=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r5077 - cache-bench-fwk and 1
 other directory.
Date: Tue, 08 Jan 2008 14:24:38 -0500
Message-ID: <E1JCK3y-00078t-PS@committer01.frg.pub.inap.atl.jboss.com>

--===============4721179971753783792==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: mircea.markus
Date: 2008-01-08 14:24:38 -0500 (Tue, 08 Jan 2008)
New Revision: 5077

Added:
   benchmarks/trunk/
Removed:
   cache-bench-fwk/trunk/
Log:
moving to a common benchmark dir

Copied: benchmarks/trunk (from rev 5076, cache-bench-fwk/trunk)


--===============4721179971753783792==--

From jbosscache-commits at lists.jboss.org Tue Jan  8 14:26:25 2008
Content-Type: multipart/mixed; boundary="===============1361203115022045132=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN:  r5078 - benchmarks.
Date: Tue, 08 Jan 2008 14:26:25 -0500
Message-ID: <E1JCK5h-0007zl-Jt@committer01.frg.pub.inap.atl.jboss.com>

--===============1361203115022045132==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: mircea.markus
Date: 2008-01-08 14:26:25 -0500 (Tue, 08 Jan 2008)
New Revision: 5078

Added:
   benchmarks/benchmark-fwk/
Removed:
   benchmarks/trunk/
Log:
moving to a common benchmark dir

Copied: benchmarks/benchmark-fwk (from rev 5077, benchmarks/trunk)


--===============1361203115022045132==--

From jbosscache-commits at lists.jboss.org Tue Jan  8 14:27:50 2008
Content-Type: multipart/mixed; boundary="===============5499856534398284580=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN:  r5079 - /.
Date: Tue, 08 Jan 2008 14:27:50 -0500
Message-ID: <E1JCK74-00082h-Ma@committer01.frg.pub.inap.atl.jboss.com>

--===============5499856534398284580==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: mircea.markus
Date: 2008-01-08 14:27:50 -0500 (Tue, 08 Jan 2008)
New Revision: 5079

Removed:
   cache-bench-fwk/
Log:
removing dir as fwk was moved


--===============5499856534398284580==--

From jbosscache-commits at lists.jboss.org Tue Jan  8 14:28:59 2008
Content-Type: multipart/mixed; boundary="===============5722186787846953764=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r5080 -
 benchmarks/benchmark-fwk.
Date: Tue, 08 Jan 2008 14:28:59 -0500
Message-ID: <E1JCK8B-00086H-GL@committer01.frg.pub.inap.atl.jboss.com>

--===============5722186787846953764==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: mircea.markus
Date: 2008-01-08 14:28:59 -0500 (Tue, 08 Jan 2008)
New Revision: 5080

Removed:
   benchmarks/benchmark-fwk/Trunk.iml
Log:
removing IDE files

Deleted: benchmarks/benchmark-fwk/Trunk.iml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- benchmarks/benchmark-fwk/Trunk.iml	2008-01-08 19:27:50 UTC (rev 5079)
+++ benchmarks/benchmark-fwk/Trunk.iml	2008-01-08 19:28:59 UTC (rev 5080)
@@ -1,184 +0,0 @@
-<?xml version=3D"1.0" encoding=3D"UTF-8"?>
-<module relativePaths=3D"true" type=3D"JAVA_MODULE" version=3D"4">
-  <component name=3D"NewModuleRootManager" inherit-compiler-output=3D"true=
">
-    <exclude-output />
-    <content url=3D"file://$MODULE_DIR$">
-      <sourceFolder url=3D"file://$MODULE_DIR$/src" isTestSource=3D"false"=
 />
-    </content>
-    <orderEntry type=3D"inheritedJdk" />
-    <orderEntry type=3D"sourceFolder" forTests=3D"false" />
-    <orderEntry type=3D"module-library">
-      <library>
-        <CLASSES>
-          <root url=3D"jar://$MODULE_DIR$/cache-products/jbosscache-1.4.1/=
lib/commons-logging.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type=3D"module-library">
-      <library>
-        <CLASSES>
-          <root url=3D"jar://$MODULE_DIR$/cache-products/jbosscache-1.4.1/=
lib/jgroups.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type=3D"module-library">
-      <library>
-        <CLASSES>
-          <root url=3D"jar://$MODULE_DIR$/cache-products/jbosscache-1.4.1/=
lib/jboss-cache.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type=3D"module-library">
-      <library>
-        <CLASSES>
-          <root url=3D"jar://$MODULE_DIR$/cache-products/jbosscache-1.4.1/=
lib/jboss-system.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type=3D"module-library">
-      <library>
-        <CLASSES>
-          <root url=3D"jar://$MODULE_DIR$/cache-products/jbosscache-1.4.1/=
lib/jboss-j2ee.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type=3D"module-library">
-      <library>
-        <CLASSES>
-          <root url=3D"jar://$MODULE_DIR$/cache-products/jbosscache-1.4.1/=
lib/jboss-aop.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type=3D"module-library">
-      <library>
-        <CLASSES>
-          <root url=3D"jar://$MODULE_DIR$/cache-products/jbosscache-1.4.1/=
lib/jboss-minimal.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type=3D"module-library">
-      <library>
-        <CLASSES>
-          <root url=3D"jar://$MODULE_DIR$/cache-products/jbosscache-1.4.1/=
lib/jboss-serialization.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type=3D"module-library">
-      <library>
-        <CLASSES>
-          <root url=3D"jar://$MODULE_DIR$/cache-products/jbosscache-1.4.1/=
lib/concurrent.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type=3D"module-library">
-      <library>
-        <CLASSES>
-          <root url=3D"jar://$MODULE_DIR$/cache-products/jbosscache-1.4.1/=
lib/jboss-jmx.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type=3D"module-library">
-      <library>
-        <CLASSES>
-          <root url=3D"jar://$MODULE_DIR$/cache-products/jbosscache-1.4.1/=
lib/trove.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type=3D"module-library">
-      <library>
-        <CLASSES>
-          <root url=3D"jar://$MODULE_DIR$/cache-products/jbosscache-1.4.1/=
lib/jboss-common.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type=3D"module-library">
-      <library>
-        <CLASSES>
-          <root url=3D"jar://$MODULE_DIR$/cache-products/ehcache-1.2.4/lib=
/commons-logging.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type=3D"module-library">
-      <library>
-        <CLASSES>
-          <root url=3D"jar://$MODULE_DIR$/cache-products/ehcache-1.2.4/lib=
/ehcache.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type=3D"module-library">
-      <library>
-        <CLASSES>
-          <root url=3D"jar://$MODULE_DIR$/lib/log4j.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type=3D"module-library">
-      <library>
-        <CLASSES>
-          <root url=3D"jar://$MODULE_DIR$/lib/commons-beanutils.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type=3D"module-library">
-      <library>
-        <CLASSES>
-          <root url=3D"jar://$MODULE_DIR$/lib/commons-digester.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type=3D"module-library">
-      <library>
-        <CLASSES>
-          <root url=3D"jar://$MODULE_DIR$/lib/commons-math-1.0.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type=3D"module-library">
-      <library>
-        <CLASSES>
-          <root url=3D"jar://$MODULE_DIR$/lib/commons-logging.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntryProperties />
-  </component>
-</module>
-


--===============5722186787846953764==--

From jbosscache-commits at lists.jboss.org Tue Jan  8 14:29:28 2008
Content-Type: multipart/mixed; boundary="===============9130173203331330553=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r5081 -
 benchmarks/benchmark-fwk.
Date: Tue, 08 Jan 2008 14:29:27 -0500
Message-ID: <E1JCK8d-000882-TR@committer01.frg.pub.inap.atl.jboss.com>

--===============9130173203331330553==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: mircea.markus
Date: 2008-01-08 14:29:27 -0500 (Tue, 08 Jan 2008)
New Revision: 5081

Removed:
   benchmarks/benchmark-fwk/cache-bench-fwk.ipr
Log:
removing IDE files

Deleted: benchmarks/benchmark-fwk/cache-bench-fwk.ipr
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- benchmarks/benchmark-fwk/cache-bench-fwk.ipr	2008-01-08 19:28:59 UTC (r=
ev 5080)
+++ benchmarks/benchmark-fwk/cache-bench-fwk.ipr	2008-01-08 19:29:27 UTC (r=
ev 5081)
@@ -1,312 +0,0 @@
-<?xml version=3D"1.0" encoding=3D"UTF-8"?>
-<project relativePaths=3D"false" version=3D"4">
-  <component name=3D"AntConfiguration">
-    <defaultAnt bundledAnt=3D"true" />
-  </component>
-  <component name=3D"BuildJarProjectSettings">
-    <option name=3D"BUILD_JARS_ON_MAKE" value=3D"false" />
-  </component>
-  <component name=3D"CCaseConfig">
-    <option name=3D"checkoutReserved" value=3D"false" />
-    <option name=3D"markExternalChangeAsUpToDate" value=3D"true" />
-    <option name=3D"checkInUseHijack" value=3D"true" />
-    <option name=3D"useUcmModel" value=3D"true" />
-    <option name=3D"isOffline" value=3D"false" />
-    <option name=3D"synchOutside" value=3D"false" />
-    <option name=3D"isHistoryResticted" value=3D"true" />
-    <option name=3D"useIdenticalSwitch" value=3D"true" />
-    <option name=3D"lastScr" value=3D"" />
-    <option name=3D"scrTextFileName" value=3D"" />
-    <option name=3D"lastViewType" />
-    <option name=3D"historyRevisionsNumber" value=3D"4" />
-  </component>
-  <component name=3D"CodeStyleProjectProfileManger">
-    <option name=3D"PROJECT_PROFILE" />
-    <option name=3D"USE_PROJECT_LEVEL_SETTINGS" value=3D"false" />
-  </component>
-  <component name=3D"CodeStyleSettingsManager">
-    <option name=3D"PER_PROJECT_SETTINGS" />
-    <option name=3D"USE_PER_PROJECT_SETTINGS" value=3D"false" />
-  </component>
-  <component name=3D"CompilerConfiguration">
-    <option name=3D"DEFAULT_COMPILER" value=3D"Javac" />
-    <option name=3D"DEPLOY_AFTER_MAKE" value=3D"0" />
-    <resourceExtensions>
-      <entry name=3D".+\.(properties|xml|html|dtd|tld)" />
-      <entry name=3D".+\.(gif|png|jpeg|jpg)" />
-    </resourceExtensions>
-    <wildcardResourcePatterns>
-      <entry name=3D"?*.properties" />
-      <entry name=3D"?*.xml" />
-      <entry name=3D"?*.gif" />
-      <entry name=3D"?*.png" />
-      <entry name=3D"?*.jpeg" />
-      <entry name=3D"?*.jpg" />
-      <entry name=3D"?*.html" />
-      <entry name=3D"?*.dtd" />
-      <entry name=3D"?*.tld" />
-    </wildcardResourcePatterns>
-  </component>
-  <component name=3D"DependenciesAnalyzeManager">
-    <option name=3D"myForwardDirection" value=3D"false" />
-  </component>
-  <component name=3D"DependencyValidationManager">
-    <option name=3D"SKIP_IMPORT_STATEMENTS" value=3D"false" />
-  </component>
-  <component name=3D"EclipseCompilerSettings">
-    <option name=3D"DEBUGGING_INFO" value=3D"true" />
-    <option name=3D"GENERATE_NO_WARNINGS" value=3D"true" />
-    <option name=3D"DEPRECATION" value=3D"false" />
-    <option name=3D"ADDITIONAL_OPTIONS_STRING" value=3D"" />
-    <option name=3D"MAXIMUM_HEAP_SIZE" value=3D"128" />
-  </component>
-  <component name=3D"EclipseEmbeddedCompilerSettings">
-    <option name=3D"DEBUGGING_INFO" value=3D"true" />
-    <option name=3D"GENERATE_NO_WARNINGS" value=3D"true" />
-    <option name=3D"DEPRECATION" value=3D"false" />
-    <option name=3D"ADDITIONAL_OPTIONS_STRING" value=3D"" />
-    <option name=3D"MAXIMUM_HEAP_SIZE" value=3D"128" />
-  </component>
-  <component name=3D"EntryPointsManager">
-    <entry_points version=3D"2.0" />
-  </component>
-  <component name=3D"IdProvider" IDEtalkID=3D"8B2D8C7FCAE4223CAFD10479F423=
18C6" />
-  <component name=3D"InspectionProjectProfileManager">
-    <option name=3D"PROJECT_PROFILE" value=3D"Project Default" />
-    <option name=3D"USE_PROJECT_LEVEL_SETTINGS" value=3D"false" />
-    <scopes />
-    <profiles>
-      <profile version=3D"1.0" is_locked=3D"false">
-        <option name=3D"myName" value=3D"Project Default" />
-        <option name=3D"myLocal" value=3D"false" />
-      </profile>
-    </profiles>
-    <list size=3D"0" />
-  </component>
-  <component name=3D"JavacSettings">
-    <option name=3D"DEBUGGING_INFO" value=3D"true" />
-    <option name=3D"GENERATE_NO_WARNINGS" value=3D"false" />
-    <option name=3D"DEPRECATION" value=3D"true" />
-    <option name=3D"ADDITIONAL_OPTIONS_STRING" value=3D"" />
-    <option name=3D"MAXIMUM_HEAP_SIZE" value=3D"128" />
-  </component>
-  <component name=3D"JavadocGenerationManager">
-    <option name=3D"OUTPUT_DIRECTORY" />
-    <option name=3D"OPTION_SCOPE" value=3D"protected" />
-    <option name=3D"OPTION_HIERARCHY" value=3D"true" />
-    <option name=3D"OPTION_NAVIGATOR" value=3D"true" />
-    <option name=3D"OPTION_INDEX" value=3D"true" />
-    <option name=3D"OPTION_SEPARATE_INDEX" value=3D"true" />
-    <option name=3D"OPTION_DOCUMENT_TAG_USE" value=3D"false" />
-    <option name=3D"OPTION_DOCUMENT_TAG_AUTHOR" value=3D"false" />
-    <option name=3D"OPTION_DOCUMENT_TAG_VERSION" value=3D"false" />
-    <option name=3D"OPTION_DOCUMENT_TAG_DEPRECATED" value=3D"true" />
-    <option name=3D"OPTION_DEPRECATED_LIST" value=3D"true" />
-    <option name=3D"OTHER_OPTIONS" value=3D"" />
-    <option name=3D"HEAP_SIZE" />
-    <option name=3D"LOCALE" />
-    <option name=3D"OPEN_IN_BROWSER" value=3D"true" />
-  </component>
-  <component name=3D"JikesSettings">
-    <option name=3D"JIKES_PATH" value=3D"" />
-    <option name=3D"DEBUGGING_INFO" value=3D"true" />
-    <option name=3D"DEPRECATION" value=3D"true" />
-    <option name=3D"GENERATE_NO_WARNINGS" value=3D"false" />
-    <option name=3D"IS_EMACS_ERRORS_MODE" value=3D"true" />
-    <option name=3D"ADDITIONAL_OPTIONS_STRING" value=3D"" />
-  </component>
-  <component name=3D"Palette2">
-    <group name=3D"Swing">
-      <item class=3D"com.intellij.uiDesigner.HSpacer" tooltip-text=3D"Hori=
zontal Spacer" icon=3D"/com/intellij/uiDesigner/icons/hspacer.png" removabl=
e=3D"false" auto-create-binding=3D"false" can-attach-label=3D"false">
-        <default-constraints vsize-policy=3D"1" hsize-policy=3D"6" anchor=
=3D"0" fill=3D"1" />
-      </item>
-      <item class=3D"com.intellij.uiDesigner.VSpacer" tooltip-text=3D"Vert=
ical Spacer" icon=3D"/com/intellij/uiDesigner/icons/vspacer.png" removable=
=3D"false" auto-create-binding=3D"false" can-attach-label=3D"false">
-        <default-constraints vsize-policy=3D"6" hsize-policy=3D"1" anchor=
=3D"0" fill=3D"2" />
-      </item>
-      <item class=3D"javax.swing.JPanel" icon=3D"/com/intellij/uiDesigner/=
icons/panel.png" removable=3D"false" auto-create-binding=3D"false" can-atta=
ch-label=3D"false">
-        <default-constraints vsize-policy=3D"3" hsize-policy=3D"3" anchor=
=3D"0" fill=3D"3" />
-      </item>
-      <item class=3D"javax.swing.JScrollPane" icon=3D"/com/intellij/uiDesi=
gner/icons/scrollPane.png" removable=3D"false" auto-create-binding=3D"false=
" can-attach-label=3D"true">
-        <default-constraints vsize-policy=3D"7" hsize-policy=3D"7" anchor=
=3D"0" fill=3D"3" />
-      </item>
-      <item class=3D"javax.swing.JButton" icon=3D"/com/intellij/uiDesigner=
/icons/button.png" removable=3D"false" auto-create-binding=3D"true" can-att=
ach-label=3D"false">
-        <default-constraints vsize-policy=3D"0" hsize-policy=3D"3" anchor=
=3D"0" fill=3D"1" />
-        <initial-values>
-          <property name=3D"text" value=3D"Button" />
-        </initial-values>
-      </item>
-      <item class=3D"javax.swing.JRadioButton" icon=3D"/com/intellij/uiDes=
igner/icons/radioButton.png" removable=3D"false" auto-create-binding=3D"tru=
e" can-attach-label=3D"false">
-        <default-constraints vsize-policy=3D"0" hsize-policy=3D"3" anchor=
=3D"8" fill=3D"0" />
-        <initial-values>
-          <property name=3D"text" value=3D"RadioButton" />
-        </initial-values>
-      </item>
-      <item class=3D"javax.swing.JCheckBox" icon=3D"/com/intellij/uiDesign=
er/icons/checkBox.png" removable=3D"false" auto-create-binding=3D"true" can=
-attach-label=3D"false">
-        <default-constraints vsize-policy=3D"0" hsize-policy=3D"3" anchor=
=3D"8" fill=3D"0" />
-        <initial-values>
-          <property name=3D"text" value=3D"CheckBox" />
-        </initial-values>
-      </item>
-      <item class=3D"javax.swing.JLabel" icon=3D"/com/intellij/uiDesigner/=
icons/label.png" removable=3D"false" auto-create-binding=3D"false" can-atta=
ch-label=3D"false">
-        <default-constraints vsize-policy=3D"0" hsize-policy=3D"0" anchor=
=3D"8" fill=3D"0" />
-        <initial-values>
-          <property name=3D"text" value=3D"Label" />
-        </initial-values>
-      </item>
-      <item class=3D"javax.swing.JTextField" icon=3D"/com/intellij/uiDesig=
ner/icons/textField.png" removable=3D"false" auto-create-binding=3D"true" c=
an-attach-label=3D"true">
-        <default-constraints vsize-policy=3D"0" hsize-policy=3D"6" anchor=
=3D"8" fill=3D"1">
-          <preferred-size width=3D"150" height=3D"-1" />
-        </default-constraints>
-      </item>
-      <item class=3D"javax.swing.JPasswordField" icon=3D"/com/intellij/uiD=
esigner/icons/passwordField.png" removable=3D"false" auto-create-binding=3D=
"true" can-attach-label=3D"true">
-        <default-constraints vsize-policy=3D"0" hsize-policy=3D"6" anchor=
=3D"8" fill=3D"1">
-          <preferred-size width=3D"150" height=3D"-1" />
-        </default-constraints>
-      </item>
-      <item class=3D"javax.swing.JFormattedTextField" icon=3D"/com/intelli=
j/uiDesigner/icons/formattedTextField.png" removable=3D"false" auto-create-=
binding=3D"true" can-attach-label=3D"true">
-        <default-constraints vsize-policy=3D"0" hsize-policy=3D"6" anchor=
=3D"8" fill=3D"1">
-          <preferred-size width=3D"150" height=3D"-1" />
-        </default-constraints>
-      </item>
-      <item class=3D"javax.swing.JTextArea" icon=3D"/com/intellij/uiDesign=
er/icons/textArea.png" removable=3D"false" auto-create-binding=3D"true" can=
-attach-label=3D"true">
-        <default-constraints vsize-policy=3D"6" hsize-policy=3D"6" anchor=
=3D"0" fill=3D"3">
-          <preferred-size width=3D"150" height=3D"50" />
-        </default-constraints>
-      </item>
-      <item class=3D"javax.swing.JTextPane" icon=3D"/com/intellij/uiDesign=
er/icons/textPane.png" removable=3D"false" auto-create-binding=3D"true" can=
-attach-label=3D"true">
-        <default-constraints vsize-policy=3D"6" hsize-policy=3D"6" anchor=
=3D"0" fill=3D"3">
-          <preferred-size width=3D"150" height=3D"50" />
-        </default-constraints>
-      </item>
-      <item class=3D"javax.swing.JEditorPane" icon=3D"/com/intellij/uiDesi=
gner/icons/editorPane.png" removable=3D"false" auto-create-binding=3D"true"=
 can-attach-label=3D"true">
-        <default-constraints vsize-policy=3D"6" hsize-policy=3D"6" anchor=
=3D"0" fill=3D"3">
-          <preferred-size width=3D"150" height=3D"50" />
-        </default-constraints>
-      </item>
-      <item class=3D"javax.swing.JComboBox" icon=3D"/com/intellij/uiDesign=
er/icons/comboBox.png" removable=3D"false" auto-create-binding=3D"true" can=
-attach-label=3D"true">
-        <default-constraints vsize-policy=3D"0" hsize-policy=3D"2" anchor=
=3D"8" fill=3D"1" />
-      </item>
-      <item class=3D"javax.swing.JTable" icon=3D"/com/intellij/uiDesigner/=
icons/table.png" removable=3D"false" auto-create-binding=3D"true" can-attac=
h-label=3D"false">
-        <default-constraints vsize-policy=3D"6" hsize-policy=3D"6" anchor=
=3D"0" fill=3D"3">
-          <preferred-size width=3D"150" height=3D"50" />
-        </default-constraints>
-      </item>
-      <item class=3D"javax.swing.JList" icon=3D"/com/intellij/uiDesigner/i=
cons/list.png" removable=3D"false" auto-create-binding=3D"true" can-attach-=
label=3D"false">
-        <default-constraints vsize-policy=3D"6" hsize-policy=3D"2" anchor=
=3D"0" fill=3D"3">
-          <preferred-size width=3D"150" height=3D"50" />
-        </default-constraints>
-      </item>
-      <item class=3D"javax.swing.JTree" icon=3D"/com/intellij/uiDesigner/i=
cons/tree.png" removable=3D"false" auto-create-binding=3D"true" can-attach-=
label=3D"false">
-        <default-constraints vsize-policy=3D"6" hsize-policy=3D"6" anchor=
=3D"0" fill=3D"3">
-          <preferred-size width=3D"150" height=3D"50" />
-        </default-constraints>
-      </item>
-      <item class=3D"javax.swing.JTabbedPane" icon=3D"/com/intellij/uiDesi=
gner/icons/tabbedPane.png" removable=3D"false" auto-create-binding=3D"true"=
 can-attach-label=3D"false">
-        <default-constraints vsize-policy=3D"3" hsize-policy=3D"3" anchor=
=3D"0" fill=3D"3">
-          <preferred-size width=3D"200" height=3D"200" />
-        </default-constraints>
-      </item>
-      <item class=3D"javax.swing.JSplitPane" icon=3D"/com/intellij/uiDesig=
ner/icons/splitPane.png" removable=3D"false" auto-create-binding=3D"false" =
can-attach-label=3D"false">
-        <default-constraints vsize-policy=3D"3" hsize-policy=3D"3" anchor=
=3D"0" fill=3D"3">
-          <preferred-size width=3D"200" height=3D"200" />
-        </default-constraints>
-      </item>
-      <item class=3D"javax.swing.JSpinner" icon=3D"/com/intellij/uiDesigne=
r/icons/spinner.png" removable=3D"false" auto-create-binding=3D"true" can-a=
ttach-label=3D"true">
-        <default-constraints vsize-policy=3D"0" hsize-policy=3D"6" anchor=
=3D"8" fill=3D"1" />
-      </item>
-      <item class=3D"javax.swing.JSlider" icon=3D"/com/intellij/uiDesigner=
/icons/slider.png" removable=3D"false" auto-create-binding=3D"true" can-att=
ach-label=3D"false">
-        <default-constraints vsize-policy=3D"0" hsize-policy=3D"6" anchor=
=3D"8" fill=3D"1" />
-      </item>
-      <item class=3D"javax.swing.JSeparator" icon=3D"/com/intellij/uiDesig=
ner/icons/separator.png" removable=3D"false" auto-create-binding=3D"false" =
can-attach-label=3D"false">
-        <default-constraints vsize-policy=3D"6" hsize-policy=3D"6" anchor=
=3D"0" fill=3D"3" />
-      </item>
-      <item class=3D"javax.swing.JProgressBar" icon=3D"/com/intellij/uiDes=
igner/icons/progressbar.png" removable=3D"false" auto-create-binding=3D"tru=
e" can-attach-label=3D"false">
-        <default-constraints vsize-policy=3D"0" hsize-policy=3D"6" anchor=
=3D"0" fill=3D"1" />
-      </item>
-      <item class=3D"javax.swing.JToolBar" icon=3D"/com/intellij/uiDesigne=
r/icons/toolbar.png" removable=3D"false" auto-create-binding=3D"false" can-=
attach-label=3D"false">
-        <default-constraints vsize-policy=3D"0" hsize-policy=3D"6" anchor=
=3D"0" fill=3D"1">
-          <preferred-size width=3D"-1" height=3D"20" />
-        </default-constraints>
-      </item>
-      <item class=3D"javax.swing.JToolBar$Separator" icon=3D"/com/intellij=
/uiDesigner/icons/toolbarSeparator.png" removable=3D"false" auto-create-bin=
ding=3D"false" can-attach-label=3D"false">
-        <default-constraints vsize-policy=3D"0" hsize-policy=3D"0" anchor=
=3D"0" fill=3D"1" />
-      </item>
-      <item class=3D"javax.swing.JScrollBar" icon=3D"/com/intellij/uiDesig=
ner/icons/scrollbar.png" removable=3D"false" auto-create-binding=3D"true" c=
an-attach-label=3D"false">
-        <default-constraints vsize-policy=3D"6" hsize-policy=3D"0" anchor=
=3D"0" fill=3D"2" />
-      </item>
-    </group>
-  </component>
-  <component name=3D"ProjectFileVersion" converted=3D"true" />
-  <component name=3D"ProjectModuleManager">
-    <modules>
-      <module fileurl=3D"file://$PROJECT_DIR$/Trunk.iml" filepath=3D"$PROJ=
ECT_DIR$/Trunk.iml" />
-    </modules>
-  </component>
-  <component name=3D"ProjectRootManager" version=3D"2" assert-keyword=3D"t=
rue" jdk-15=3D"true" project-jdk-name=3D"1.5" project-jdk-type=3D"JavaSDK">
-    <output url=3D"file://$PROJECT_DIR$/out" />
-  </component>
-  <component name=3D"ResourceManagerContainer">
-    <option name=3D"myResourceBundles">
-      <value>
-        <list size=3D"0" />
-      </value>
-    </option>
-  </component>
-  <component name=3D"RmicSettings">
-    <option name=3D"IS_EANABLED" value=3D"false" />
-    <option name=3D"DEBUGGING_INFO" value=3D"true" />
-    <option name=3D"GENERATE_NO_WARNINGS" value=3D"false" />
-    <option name=3D"GENERATE_IIOP_STUBS" value=3D"false" />
-    <option name=3D"ADDITIONAL_OPTIONS_STRING" value=3D"" />
-  </component>
-  <component name=3D"StarteamConfiguration">
-    <option name=3D"SERVER" value=3D"" />
-    <option name=3D"PORT" value=3D"49201" />
-    <option name=3D"USER" value=3D"" />
-    <option name=3D"PASSWORD" value=3D"" />
-    <option name=3D"PROJECT" value=3D"" />
-    <option name=3D"VIEW" value=3D"" />
-    <option name=3D"ALTERNATIVE_WORKING_PATH" value=3D"" />
-    <option name=3D"LOCK_ON_CHECKOUT" value=3D"false" />
-    <option name=3D"UNLOCK_ON_CHECKIN" value=3D"false" />
-  </component>
-  <component name=3D"VcsDirectoryMappings">
-    <mapping directory=3D"" vcs=3D"svn" />
-  </component>
-  <component name=3D"VssConfiguration">
-    <option name=3D"CLIENT_PATH" value=3D"" />
-    <option name=3D"SRCSAFEINI_PATH" value=3D"" />
-    <option name=3D"USER_NAME" value=3D"" />
-    <option name=3D"PWD" value=3D"" />
-    <CheckoutOptions>
-      <option name=3D"COMMENT" value=3D"" />
-      <option name=3D"DO_NOT_GET_LATEST_VERSION" value=3D"false" />
-      <option name=3D"REPLACE_WRITABLE" value=3D"false" />
-      <option name=3D"RECURSIVE" value=3D"false" />
-    </CheckoutOptions>
-    <CheckinOptions>
-      <option name=3D"COMMENT" value=3D"" />
-      <option name=3D"KEEP_CHECKED_OUT" value=3D"false" />
-      <option name=3D"RECURSIVE" value=3D"false" />
-    </CheckinOptions>
-    <AddOptions>
-      <option name=3D"STORE_ONLY_LATEST_VERSION" value=3D"false" />
-      <option name=3D"CHECK_OUT_IMMEDIATELY" value=3D"false" />
-    </AddOptions>
-    <UndocheckoutOptions>
-      <option name=3D"MAKE_WRITABLE" value=3D"false" />
-      <option name=3D"REPLACE_LOCAL_COPY" value=3D"0" />
-      <option name=3D"RECURSIVE" value=3D"false" />
-    </UndocheckoutOptions>
-    <GetOptions>
-      <option name=3D"REPLACE_WRITABLE" value=3D"0" />
-      <option name=3D"MAKE_WRITABLE" value=3D"false" />
-      <option name=3D"ANSWER_NEGATIVELY" value=3D"false" />
-      <option name=3D"ANSWER_POSITIVELY" value=3D"false" />
-      <option name=3D"RECURSIVE" value=3D"false" />
-      <option name=3D"VERSION" />
-    </GetOptions>
-  </component>
-  <component name=3D"WebServicesPlugin" addRequiredLibraries=3D"true" />
-</project>
-


--===============9130173203331330553==--

From jbosscache-commits at lists.jboss.org Tue Jan  8 14:35:42 2008
Content-Type: multipart/mixed; boundary="===============7964750667058000498=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r5082 -
 benchmarks/benchmark-fwk/cache-products/ehcache-1.2.4.
Date: Tue, 08 Jan 2008 14:35:36 -0500
Message-ID: <E1JCKEa-0001WD-E5@committer01.frg.pub.inap.atl.jboss.com>

--===============7964750667058000498==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: mircea.markus
Date: 2008-01-08 14:35:36 -0500 (Tue, 08 Jan 2008)
New Revision: 5082

Removed:
   benchmarks/benchmark-fwk/cache-products/ehcache-1.2.4/ehcache-1.2.4.iml
Log:
removing IDE files

Deleted: benchmarks/benchmark-fwk/cache-products/ehcache-1.2.4/ehcache-1.2.=
4.iml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- benchmarks/benchmark-fwk/cache-products/ehcache-1.2.4/ehcache-1.2.4.iml=
	2008-01-08 19:29:27 UTC (rev 5081)
+++ benchmarks/benchmark-fwk/cache-products/ehcache-1.2.4/ehcache-1.2.4.iml=
	2008-01-08 19:35:36 UTC (rev 5082)
@@ -1,185 +0,0 @@
-<?xml version=3D"1.0" encoding=3D"UTF-8"?>
-<module relativePaths=3D"true" type=3D"JAVA_MODULE" version=3D"4">
-  <component name=3D"NewModuleRootManager" inherit-compiler-output=3D"true=
">
-    <exclude-output />
-    <content url=3D"file://$MODULE_DIR$">
-      <sourceFolder url=3D"file://$MODULE_DIR$/src" isTestSource=3D"false"=
 />
-    </content>
-    <orderEntry type=3D"inheritedJdk" />
-    <orderEntry type=3D"sourceFolder" forTests=3D"false" />
-    <orderEntry type=3D"module-library">
-      <library>
-        <CLASSES>
-          <root url=3D"jar://$MODULE_DIR$/../jbosscache-1.4.1/lib/commons-=
logging.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type=3D"module-library">
-      <library>
-        <CLASSES>
-          <root url=3D"jar://$MODULE_DIR$/../jbosscache-1.4.1/lib/jgroups.=
jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type=3D"module-library">
-      <library>
-        <CLASSES>
-          <root url=3D"jar://$MODULE_DIR$/../jbosscache-1.4.1/lib/jboss-ca=
che.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type=3D"module-library">
-      <library>
-        <CLASSES>
-          <root url=3D"jar://$MODULE_DIR$/../jbosscache-1.4.1/lib/jboss-sy=
stem.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type=3D"module-library">
-      <library>
-        <CLASSES>
-          <root url=3D"jar://$MODULE_DIR$/../jbosscache-1.4.1/lib/jboss-j2=
ee.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type=3D"module-library">
-      <library>
-        <CLASSES>
-          <root url=3D"jar://$MODULE_DIR$/../jbosscache-1.4.1/lib/jboss-ao=
p.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type=3D"module-library">
-      <library>
-        <CLASSES>
-          <root url=3D"jar://$MODULE_DIR$/../jbosscache-1.4.1/lib/jboss-mi=
nimal.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type=3D"module-library">
-      <library>
-        <CLASSES>
-          <root url=3D"jar://$MODULE_DIR$/../jbosscache-1.4.1/lib/jboss-se=
rialization.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type=3D"module-library">
-      <library>
-        <CLASSES>
-          <root url=3D"jar://$MODULE_DIR$/../jbosscache-1.4.1/lib/concurre=
nt.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type=3D"module-library">
-      <library>
-        <CLASSES>
-          <root url=3D"jar://$MODULE_DIR$/../jbosscache-1.4.1/lib/jboss-jm=
x.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type=3D"module-library">
-      <library>
-        <CLASSES>
-          <root url=3D"jar://$MODULE_DIR$/../jbosscache-1.4.1/lib/trove.ja=
r!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type=3D"module-library">
-      <library>
-        <CLASSES>
-          <root url=3D"jar://$MODULE_DIR$/../jbosscache-1.4.1/lib/jboss-co=
mmon.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type=3D"module-library">
-      <library>
-        <CLASSES>
-          <root url=3D"jar://$MODULE_DIR$/lib/commons-logging.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type=3D"module-library">
-      <library>
-        <CLASSES>
-          <root url=3D"jar://$MODULE_DIR$/lib/ehcache.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type=3D"module-library">
-      <library>
-        <CLASSES>
-          <root url=3D"jar://$MODULE_DIR$/../../lib/log4j.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type=3D"module-library">
-      <library>
-        <CLASSES>
-          <root url=3D"jar://$MODULE_DIR$/../../lib/commons-beanutils.jar!=
/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type=3D"module-library">
-      <library>
-        <CLASSES>
-          <root url=3D"jar://$MODULE_DIR$/../../lib/commons-digester.jar!/=
" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type=3D"module-library">
-      <library>
-        <CLASSES>
-          <root url=3D"jar://$MODULE_DIR$/../../lib/commons-math-1.0.jar!/=
" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type=3D"module-library">
-      <library>
-        <CLASSES>
-          <root url=3D"jar://$MODULE_DIR$/../../lib/commons-logging.jar!/"=
 />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type=3D"module" module-name=3D"Trunk" />
-    <orderEntryProperties />
-  </component>
-</module>
-


--===============7964750667058000498==--

From jbosscache-commits at lists.jboss.org Tue Jan  8 14:36:31 2008
Content-Type: multipart/mixed; boundary="===============3351598673535202516=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r5083 -
 benchmarks/benchmark-fwk/cache-products/jbosscache-1.4.1.
Date: Tue, 08 Jan 2008 14:36:29 -0500
Message-ID: <E1JCKFR-0001XX-Jb@committer01.frg.pub.inap.atl.jboss.com>

--===============3351598673535202516==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: mircea.markus
Date: 2008-01-08 14:36:29 -0500 (Tue, 08 Jan 2008)
New Revision: 5083

Removed:
   benchmarks/benchmark-fwk/cache-products/jbosscache-1.4.1/jbosscache-1.4.=
1.iml
Log:
removing IDE files

Deleted: benchmarks/benchmark-fwk/cache-products/jbosscache-1.4.1/jbosscach=
e-1.4.1.iml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- benchmarks/benchmark-fwk/cache-products/jbosscache-1.4.1/jbosscache-1.4=
.1.iml	2008-01-08 19:35:36 UTC (rev 5082)
+++ benchmarks/benchmark-fwk/cache-products/jbosscache-1.4.1/jbosscache-1.4=
.1.iml	2008-01-08 19:36:29 UTC (rev 5083)
@@ -1,248 +0,0 @@
-<?xml version=3D"1.0" encoding=3D"UTF-8"?>
-<module relativePaths=3D"true" type=3D"JAVA_MODULE" version=3D"4">
-  <component name=3D"NewModuleRootManager" inherit-compiler-output=3D"true=
">
-    <exclude-output />
-    <content url=3D"file://$MODULE_DIR$">
-      <sourceFolder url=3D"file://$MODULE_DIR$/src" isTestSource=3D"false"=
 />
-    </content>
-    <orderEntry type=3D"inheritedJdk" />
-    <orderEntry type=3D"sourceFolder" forTests=3D"false" />
-    <orderEntry type=3D"module-library">
-      <library>
-        <CLASSES>
-          <root url=3D"jar://$MODULE_DIR$/lib/commons-logging.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type=3D"module-library">
-      <library>
-        <CLASSES>
-          <root url=3D"jar://$MODULE_DIR$/lib/jgroups.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type=3D"module-library">
-      <library>
-        <CLASSES>
-          <root url=3D"jar://$MODULE_DIR$/lib/jboss-cache.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type=3D"module-library">
-      <library>
-        <CLASSES>
-          <root url=3D"jar://$MODULE_DIR$/lib/jboss-system.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type=3D"module-library">
-      <library>
-        <CLASSES>
-          <root url=3D"jar://$MODULE_DIR$/lib/jboss-j2ee.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type=3D"module-library">
-      <library>
-        <CLASSES>
-          <root url=3D"jar://$MODULE_DIR$/lib/jboss-aop.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type=3D"module-library">
-      <library>
-        <CLASSES>
-          <root url=3D"jar://$MODULE_DIR$/lib/jboss-minimal.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type=3D"module-library">
-      <library>
-        <CLASSES>
-          <root url=3D"jar://$MODULE_DIR$/lib/jboss-serialization.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type=3D"module-library">
-      <library>
-        <CLASSES>
-          <root url=3D"jar://$MODULE_DIR$/lib/concurrent.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type=3D"module-library">
-      <library>
-        <CLASSES>
-          <root url=3D"jar://$MODULE_DIR$/lib/jboss-jmx.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type=3D"module-library">
-      <library>
-        <CLASSES>
-          <root url=3D"jar://$MODULE_DIR$/lib/trove.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type=3D"module-library">
-      <library>
-        <CLASSES>
-          <root url=3D"jar://$MODULE_DIR$/lib/jboss-common.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type=3D"module-library">
-      <library>
-        <CLASSES>
-          <root url=3D"jar://$MODULE_DIR$/../jbosscache-2.0.0/lib/jboss-j2=
ee.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type=3D"module-library">
-      <library>
-        <CLASSES>
-          <root url=3D"jar://$MODULE_DIR$/../jbosscache-2.0.0/lib/jcip-ann=
otations.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type=3D"module-library">
-      <library>
-        <CLASSES>
-          <root url=3D"jar://$MODULE_DIR$/../jbosscache-2.0.0/lib/jboss-co=
mmon-core.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type=3D"module-library">
-      <library>
-        <CLASSES>
-          <root url=3D"jar://$MODULE_DIR$/../jbosscache-2.0.0/lib/concurre=
nt.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type=3D"module-library">
-      <library>
-        <CLASSES>
-          <root url=3D"jar://$MODULE_DIR$/../jbosscache-2.0.0/lib/jbosscac=
he.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type=3D"module-library">
-      <library>
-        <CLASSES>
-          <root url=3D"jar://$MODULE_DIR$/../jbosscache-2.0.0/lib/trove.ja=
r!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type=3D"module-library">
-      <library>
-        <CLASSES>
-          <root url=3D"jar://$MODULE_DIR$/../jbosscache-2.0.0/lib/jgroups.=
jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type=3D"module-library">
-      <library>
-        <CLASSES>
-          <root url=3D"jar://$MODULE_DIR$/../ehcache-1.2.4/lib/commons-log=
ging.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type=3D"module-library">
-      <library>
-        <CLASSES>
-          <root url=3D"jar://$MODULE_DIR$/../ehcache-1.2.4/lib/ehcache.jar=
!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type=3D"module-library">
-      <library>
-        <CLASSES>
-          <root url=3D"jar://$MODULE_DIR$/../../lib/log4j.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type=3D"module-library">
-      <library>
-        <CLASSES>
-          <root url=3D"jar://$MODULE_DIR$/../../lib/commons-beanutils.jar!=
/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type=3D"module-library">
-      <library>
-        <CLASSES>
-          <root url=3D"jar://$MODULE_DIR$/../../lib/commons-digester.jar!/=
" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type=3D"module-library">
-      <library>
-        <CLASSES>
-          <root url=3D"jar://$MODULE_DIR$/../../lib/commons-math-1.0.jar!/=
" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type=3D"module-library">
-      <library>
-        <CLASSES>
-          <root url=3D"jar://$MODULE_DIR$/../../lib/commons-logging.jar!/"=
 />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type=3D"module" module-name=3D"Trunk" />
-    <orderEntryProperties />
-  </component>
-</module>
-


--===============3351598673535202516==--

From jbosscache-commits at lists.jboss.org Tue Jan  8 14:37:19 2008
Content-Type: multipart/mixed; boundary="===============6721772045973310321=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r5084 -
 benchmarks/benchmark-fwk/cache-products/coherence-3.2.2.
Date: Tue, 08 Jan 2008 14:37:19 -0500
Message-ID: <E1JCKGF-0001Zu-1J@committer01.frg.pub.inap.atl.jboss.com>

--===============6721772045973310321==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: mircea.markus
Date: 2008-01-08 14:37:18 -0500 (Tue, 08 Jan 2008)
New Revision: 5084

Removed:
   benchmarks/benchmark-fwk/cache-products/coherence-3.2.2/coherence-3.2.2.=
iml
Log:
dropping ide file

Deleted: benchmarks/benchmark-fwk/cache-products/coherence-3.2.2/coherence-=
3.2.2.iml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- benchmarks/benchmark-fwk/cache-products/coherence-3.2.2/coherence-3.2.2=
.iml	2008-01-08 19:36:29 UTC (rev 5083)
+++ benchmarks/benchmark-fwk/cache-products/coherence-3.2.2/coherence-3.2.2=
.iml	2008-01-08 19:37:18 UTC (rev 5084)
@@ -1,14 +0,0 @@
-<?xml version=3D"1.0" encoding=3D"UTF-8"?>
-<module relativePaths=3D"true" type=3D"JAVA_MODULE" version=3D"4">
-  <component name=3D"NewModuleRootManager" inherit-compiler-output=3D"true=
">
-    <exclude-output />
-    <content url=3D"file://$MODULE_DIR$">
-      <sourceFolder url=3D"file://$MODULE_DIR$/src" isTestSource=3D"false"=
 />
-    </content>
-    <orderEntry type=3D"inheritedJdk" />
-    <orderEntry type=3D"sourceFolder" forTests=3D"false" />
-    <orderEntry type=3D"module" module-name=3D"Trunk" />
-    <orderEntryProperties />
-  </component>
-</module>
-


--===============6721772045973310321==--

From jbosscache-commits at lists.jboss.org Tue Jan  8 14:38:05 2008
Content-Type: multipart/mixed; boundary="===============0244320395874914704=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r5085 -
 benchmarks/benchmark-fwk/cache-products/terracotta-2.4.8.
Date: Tue, 08 Jan 2008 14:38:04 -0500
Message-ID: <E1JCKGy-0001cH-Tj@committer01.frg.pub.inap.atl.jboss.com>

--===============0244320395874914704==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: mircea.markus
Date: 2008-01-08 14:38:04 -0500 (Tue, 08 Jan 2008)
New Revision: 5085

Removed:
   benchmarks/benchmark-fwk/cache-products/terracotta-2.4.8/terracotta-2.3.=
0.iml
Log:
dropping ide file

Deleted: benchmarks/benchmark-fwk/cache-products/terracotta-2.4.8/terracott=
a-2.3.0.iml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- benchmarks/benchmark-fwk/cache-products/terracotta-2.4.8/terracotta-2.3=
.0.iml	2008-01-08 19:37:18 UTC (rev 5084)
+++ benchmarks/benchmark-fwk/cache-products/terracotta-2.4.8/terracotta-2.3=
.0.iml	2008-01-08 19:38:04 UTC (rev 5085)
@@ -1,14 +0,0 @@
-<?xml version=3D"1.0" encoding=3D"UTF-8"?>
-<module relativePaths=3D"true" type=3D"JAVA_MODULE" version=3D"4">
-  <component name=3D"NewModuleRootManager" inherit-compiler-output=3D"true=
">
-    <exclude-output />
-    <content url=3D"file://$MODULE_DIR$">
-      <sourceFolder url=3D"file://$MODULE_DIR$/src" isTestSource=3D"false"=
 />
-    </content>
-    <orderEntry type=3D"inheritedJdk" />
-    <orderEntry type=3D"sourceFolder" forTests=3D"false" />
-    <orderEntry type=3D"module" module-name=3D"Trunk" />
-    <orderEntryProperties />
-  </component>
-</module>
-


--===============0244320395874914704==--

From jbosscache-commits at lists.jboss.org Tue Jan  8 14:54:55 2008
Content-Type: multipart/mixed; boundary="===============0873962052733344172=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r5086 -
 benchmarks/benchmark-fwk/cache-products/terracotta-2.5.0.
Date: Tue, 08 Jan 2008 14:54:54 -0500
Message-ID: <E1JCKXG-0005OE-Ow@committer01.frg.pub.inap.atl.jboss.com>

--===============0873962052733344172==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: mircea.markus
Date: 2008-01-08 14:54:54 -0500 (Tue, 08 Jan 2008)
New Revision: 5086

Modified:
   benchmarks/benchmark-fwk/cache-products/terracotta-2.5.0/config.sh
Log:


Modified: benchmarks/benchmark-fwk/cache-products/terracotta-2.5.0/config.sh
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- benchmarks/benchmark-fwk/cache-products/terracotta-2.5.0/config.sh	2008=
-01-08 19:38:04 UTC (rev 5085)
+++ benchmarks/benchmark-fwk/cache-products/terracotta-2.5.0/config.sh	2008=
-01-08 19:54:54 UTC (rev 5086)
@@ -3,12 +3,12 @@
 #see "$CACHE_ROOT/cache-products/cache.sh" for details
 =

 THIS_DIR=3D./cache-products/terracotta-2.5.0
-TC_HOME=3D"/cygdrive/c/java/terracotta-2.5.0"
+TC_HOME=3D"/qa/home/mmarkus/java/terracotta-2.5.0"
 =

 #addint terracotta wrapper class to classpath
 CLASSPATH=3D$CLASSPATH:./classes/production/terracotta-2.5.0
 =

 #other specific JVM options
 JVM_OPTIONS=3D"$JVM_OPTIONS -Xmx1024m -DpreferIPv4Stack=3Dtrue -Dtc.config=
=3D$THIS_DIR/tc-client-config.xml -Dtc.install-root=3D${TC_HOME}"
-JVM_OPTIONS=3D"$JVM_OPTIONS -Xbootclasspath/p:${TC_HOME}/lib/dso-boot/dso-=
boot-hotspot_win32_150_14.jar"
+JVM_OPTIONS=3D"$JVM_OPTIONS -Xbootclasspath/p:${TC_HOME}/lib/dso-boot/dso-=
boot-hotspot_linux_150_11.jar"
 =



--===============0873962052733344172==--

From jbosscache-commits at lists.jboss.org Tue Jan  8 15:05:42 2008
Content-Type: multipart/mixed; boundary="===============0371682494896711819=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r5087 -
 benchmarks/benchmark-fwk.
Date: Tue, 08 Jan 2008 15:05:42 -0500
Message-ID: <E1JCKhi-0007V3-7j@committer01.frg.pub.inap.atl.jboss.com>

--===============0371682494896711819==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: mircea.markus
Date: 2008-01-08 15:05:42 -0500 (Tue, 08 Jan 2008)
New Revision: 5087

Modified:
   benchmarks/benchmark-fwk/runNode.sh
Log:


Modified: benchmarks/benchmark-fwk/runNode.sh
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- benchmarks/benchmark-fwk/runNode.sh	2008-01-08 19:54:54 UTC (rev 5086)
+++ benchmarks/benchmark-fwk/runNode.sh	2008-01-08 20:05:42 UTC (rev 5087)
@@ -3,10 +3,8 @@
 # cygwin users: add the scripts from :pserver:anoncvs(a)cygwin.com:/cvs/cy=
gwin-apps/wrappers/java to the $cygwin_home/usr/local/bin
 # those would make an automatic conversion from unix CLASSPATH to win clas=
spath, needed when executing java -cp
 =

-CACHE_DEBUG=3Dtrue
 preferIPv4Stack=3Dtrue
-export JVM_ARGS=3D-Xmx1024m
-export OTHER_SYS_ARGS=3D$3
+export JVM_OPTIONS=3D" -DcurrentIndex=3D$1 -DclusterSize=3D$3 " =

 =

 if [ -z $1 ]
 then
@@ -14,12 +12,12 @@
    echo "     ./runNode.sh currentNodeIndex testConfig otherSysProps custo=
mConfigFile"
    echo "currentNodeIndex : the index of this node in the list of nodes in=
 the cluster(0..n)"
    echo "testConfig       : must be one of the directories names under 'ca=
che-products'"
-   echo "other params     : should be used to pass -D arguments to the cus=
tom plugins. e.g. JBossCache might need an 'bindAddress' argument"
-   echo "customConfigFile : the path to the a custom 'cachebenchmark.xml' =
(other than the one in 'conf' dir which is loaded by default)"
+   echo "cluster size"
+   echo "Ex: ./runNode.sh 0 jbosscache-2.0.0 3"
    exit 0
 fi
 =

-export SYS_PROPS=3D"-DcurrentIndex=3D$1 -Dorg.cachebench.debug=3D$CACHE_DE=
BUG -Djava.net.preferIPv4Stack=3D$preferIPv4Stack"
+export SYS_PROPS=3D"-DcurrentIndex=3D$1 -Djava.net.preferIPv4Stack=3D$pref=
erIPv4Stack"
 =

 #first kill all the exisiting processes as they might interfere with the n=
ew ones/ not sure this works on cygwin
 ps -fe | grep "Cache*BenchmarkRunner" | cut -c 10-20 | xargs -r kill
@@ -31,14 +29,11 @@
 #libraries needed by the fwk, add them to the classpath
 for JAR in ./lib/*
 do
-   FWK_CLASS_PATH=3D$FWK_CLASS_PATH:$JAR
+   CLASSPATH=3D$CLASSPATH:$JAR
 done
 =

-FWK_CLASS_PATH=3D$FWK_CLASS_PATH:./conf:./classes/production/Framework
-export FWK_CLASS_PATH
+export CLASSPATH=3D$CLASSPATH:./conf:./classes/production/Framework
 =

-CLASSPATH=3D$FWK_CLASS_PATH:$CLASSPATH
-
 configFile=3D./cache-products/$2/config.sh
 =

 #first check whether the config file exists and load it
@@ -50,13 +45,8 @@
   exit 1
 fi
 =

-if [ -n "$START_NODE_COMMAND" ]
-then
-   echo executing command $START_NODE_COMMAND
-   $START_NODE_COMMAND
-else   =

-   TO_EXECUTE=3D"java $JVM_ARGS -cp $CLASSPATH $OTHER_SYS_ARGS $SYS_PROPS =
org.cachebench.CacheBenchmarkRunner $4"
-   echo executing $TO_EXECUTE
-   java $JVM_ARGS -cp $CLASSPATH $OTHER_SYS_ARGS $SYS_PROPS org.cachebench=
.CacheBenchmarkRunner $4
-fi
+TO_EXECUTE=3D"java $JVM_OPTIONS -cp $CLASSPATH org.cachebench.CacheBenchma=
rkRunner"
+echo executing:
+echo $TO_EXECUTE
+java $JVM_OPTIONS -cp $CLASSPATH org.cachebench.CacheBenchmarkRunner
 =



--===============0371682494896711819==--

From jbosscache-commits at lists.jboss.org Tue Jan  8 15:11:52 2008
Content-Type: multipart/mixed; boundary="===============7385996849579811904=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r5088 -
 benchmarks/benchmark-fwk/cache-products/jbosscache-2.1.0cr2/lib.
Date: Tue, 08 Jan 2008 15:11:52 -0500
Message-ID: <E1JCKng-00005E-16@committer01.frg.pub.inap.atl.jboss.com>

--===============7385996849579811904==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: mircea.markus
Date: 2008-01-08 15:11:51 -0500 (Tue, 08 Jan 2008)
New Revision: 5088

Added:
   benchmarks/benchmark-fwk/cache-products/jbosscache-2.1.0cr2/lib/jboss-co=
mmon-core-2.0.4.GA.jar
   benchmarks/benchmark-fwk/cache-products/jbosscache-2.1.0cr2/lib/jboss-ja=
vaee-5.0.0.Beta3.jar
   benchmarks/benchmark-fwk/cache-products/jbosscache-2.1.0cr2/lib/jbosscac=
he-core.jar
   benchmarks/benchmark-fwk/cache-products/jbosscache-2.1.0cr2/lib/jcip-ann=
otations-1.0.jar
   benchmarks/benchmark-fwk/cache-products/jbosscache-2.1.0cr2/lib/jgroups-=
2.6.0.GA.jar
Log:


Added: benchmarks/benchmark-fwk/cache-products/jbosscache-2.1.0cr2/lib/jbos=
s-common-core-2.0.4.GA.jar
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)


Property changes on: benchmarks/benchmark-fwk/cache-products/jbosscache-2.1=
.0cr2/lib/jboss-common-core-2.0.4.GA.jar
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: benchmarks/benchmark-fwk/cache-products/jbosscache-2.1.0cr2/lib/jbos=
s-javaee-5.0.0.Beta3.jar
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)


Property changes on: benchmarks/benchmark-fwk/cache-products/jbosscache-2.1=
.0cr2/lib/jboss-javaee-5.0.0.Beta3.jar
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: benchmarks/benchmark-fwk/cache-products/jbosscache-2.1.0cr2/lib/jbos=
scache-core.jar
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)


Property changes on: benchmarks/benchmark-fwk/cache-products/jbosscache-2.1=
.0cr2/lib/jbosscache-core.jar
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: benchmarks/benchmark-fwk/cache-products/jbosscache-2.1.0cr2/lib/jcip=
-annotations-1.0.jar
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)


Property changes on: benchmarks/benchmark-fwk/cache-products/jbosscache-2.1=
.0cr2/lib/jcip-annotations-1.0.jar
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: benchmarks/benchmark-fwk/cache-products/jbosscache-2.1.0cr2/lib/jgro=
ups-2.6.0.GA.jar
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)


Property changes on: benchmarks/benchmark-fwk/cache-products/jbosscache-2.1=
.0cr2/lib/jgroups-2.6.0.GA.jar
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream


--===============7385996849579811904==--

From jbosscache-commits at lists.jboss.org Tue Jan  8 15:15:07 2008
Content-Type: multipart/mixed; boundary="===============3699210140125687040=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r5089 -
 benchmarks/benchmark-fwk/cache-products/jbosscache-2.1.0cr2/conf.
Date: Tue, 08 Jan 2008 15:15:07 -0500
Message-ID: <E1JCKqp-0000zo-28@committer01.frg.pub.inap.atl.jboss.com>

--===============3699210140125687040==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: mircea.markus
Date: 2008-01-08 15:15:06 -0500 (Tue, 08 Jan 2008)
New Revision: 5089

Added:
   benchmarks/benchmark-fwk/cache-products/jbosscache-2.1.0cr2/conf/opt-rep=
l-async.xml
   benchmarks/benchmark-fwk/cache-products/jbosscache-2.1.0cr2/conf/opt-rep=
l-sync.xml
   benchmarks/benchmark-fwk/cache-products/jbosscache-2.1.0cr2/conf/pess-re=
pl-async-br.xml
   benchmarks/benchmark-fwk/cache-products/jbosscache-2.1.0cr2/conf/pess-re=
pl-async.xml
   benchmarks/benchmark-fwk/cache-products/jbosscache-2.1.0cr2/conf/pess-re=
pl-sync-br.xml
   benchmarks/benchmark-fwk/cache-products/jbosscache-2.1.0cr2/conf/pess-re=
pl-sync.xml
Log:


Added: benchmarks/benchmark-fwk/cache-products/jbosscache-2.1.0cr2/conf/opt=
-repl-async.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- benchmarks/benchmark-fwk/cache-products/jbosscache-2.1.0cr2/conf/opt-re=
pl-async.xml	                        (rev 0)
+++ benchmarks/benchmark-fwk/cache-products/jbosscache-2.1.0cr2/conf/opt-re=
pl-async.xml	2008-01-08 20:15:06 UTC (rev 5089)
@@ -0,0 +1,81 @@
+<?xml version=3D"1.0" encoding=3D"UTF-8"?>
+
+<server>
+
+   <classpath codebase=3D"./lib" archives=3D"jboss-cache.jar, jgroups.jar"=
/>
+
+
+   <mbean code=3D"org.jboss.cache.CacheImpl"
+          name=3D"jboss.cache:service=3DTreeCache">
+
+      <depends>jboss:service=3DNaming</depends>
+      <depends>jboss:service=3DTransactionManager</depends>
+
+      <attribute name=3D"TransactionManagerLookupClass">org.jboss.cache.tr=
ansaction.GenericTransactionManagerLookup</attribute>
+      <attribute name=3D"NodeLockingScheme">OPTIMISTIC</attribute>
+      <attribute name=3D"CacheMode">REPL_ASYNC</attribute>
+      <attribute name=3D"UseReplQueue">false</attribute>
+      <attribute name=3D"ReplQueueInterval">0</attribute>
+      <attribute name=3D"ReplQueueMaxElements">0</attribute>
+      <attribute name=3D"ClusterName">JBossCache-Cluster</attribute>
+      <attribute name=3D"ClusterConfig">
+         <config>
+            <UDP mcast_addr=3D"229.10.10.10"
+                 mcast_port=3D"45599"
+                 tos=3D"8"
+                 ucast_recv_buf_size=3D"20000000"
+                 ucast_send_buf_size=3D"640000"
+                 mcast_recv_buf_size=3D"25000000"
+                 mcast_send_buf_size=3D"640000"
+                 loopback=3D"false"
+                 discard_incompatible_packets=3D"true"
+                 max_bundle_size=3D"64000"
+                 max_bundle_timeout=3D"30"
+                 use_incoming_packet_handler=3D"true"
+                 use_outgoing_packet_handler=3D"false"
+                 ip_ttl=3D"2"
+                 down_thread=3D"false" up_thread=3D"false"
+                 enable_bundling=3D"false"/>
+            <PING timeout=3D"2000"
+                  down_thread=3D"false" up_thread=3D"false" num_initial_me=
mbers=3D"3"/>
+            <MERGE2 max_interval=3D"100000"
+                    down_thread=3D"false" up_thread=3D"false" min_interval=
=3D"20000"/>
+            <FD_SOCK down_thread=3D"false" up_thread=3D"false"/>
+            <FD timeout=3D"10000" max_tries=3D"5" down_thread=3D"false" up=
_thread=3D"false" shun=3D"true"/>
+            <VERIFY_SUSPECT timeout=3D"1500" down_thread=3D"false" up_thre=
ad=3D"false"/>
+            <pbcast.NAKACK max_xmit_size=3D"60000"
+                           use_mcast_xmit=3D"false" gc_lag=3D"0"
+                           retransmit_timeout=3D"300,600,1200,2400,4800"
+                           down_thread=3D"false" up_thread=3D"false"
+                           discard_delivered_msgs=3D"true"/>
+            <UNICAST timeout=3D"300,600,1200,2400,3600"
+                     down_thread=3D"false" up_thread=3D"false"/>
+            <pbcast.STABLE stability_delay=3D"1000" desired_avg_gossip=3D"=
50000"
+                           down_thread=3D"false" up_thread=3D"false"
+                           max_bytes=3D"400000"/>
+            <pbcast.GMS print_local_addr=3D"true" join_timeout=3D"3000" us=
e_flush=3D"true" flush_timeout=3D"3000"
+                        down_thread=3D"false" up_thread=3D"false"
+                        join_retry_timeout=3D"2000" shun=3D"false"
+                        view_bundling=3D"true"/>
+            <FC max_credits=3D"2000000" down_thread=3D"false" up_thread=3D=
"false"
+                min_threshold=3D"0.20"/>
+            <FRAG2 frag_size=3D"60000" down_thread=3D"false" up_thread=3D"=
false"/>
+            <!-- <pbcast.STREAMING_STATE_TRANSFER down_thread=3D"false" up=
_thread=3D"false"
+                                         use_flush=3D"true" flush_timeout=
=3D"3000" use_reading_thread=3D"true"/> -->
+            <pbcast.STATE_TRANSFER down_thread=3D"false" up_thread=3D"fals=
e" use_flush=3D"true" flush_timeout=3D"3000"/>
+            <pbcast.FLUSH down_thread=3D"false" up_thread=3D"false" timeou=
t=3D"8000" auto_flush_conf=3D"false"/>
+         </config>
+      </attribute>
+      <attribute name=3D"FetchInMemoryState">true</attribute>
+      <attribute name=3D"InitialStateRetrievalTimeout">15000</attribute>
+      <attribute name=3D"SyncReplTimeout">60000</attribute>
+      <attribute name=3D"LockAcquisitionTimeout">10000</attribute>
+      <attribute name=3D"EvictionPolicyConfig">
+      </attribute>
+    =

+      <attribute name=3D"CacheLoaderConfiguration">
+      </attribute>
+
+      <attribute name=3D"UseRegionBasedMarshalling">false</attribute>
+   </mbean>
+</server>

Added: benchmarks/benchmark-fwk/cache-products/jbosscache-2.1.0cr2/conf/opt=
-repl-sync.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- benchmarks/benchmark-fwk/cache-products/jbosscache-2.1.0cr2/conf/opt-re=
pl-sync.xml	                        (rev 0)
+++ benchmarks/benchmark-fwk/cache-products/jbosscache-2.1.0cr2/conf/opt-re=
pl-sync.xml	2008-01-08 20:15:06 UTC (rev 5089)
@@ -0,0 +1,81 @@
+<?xml version=3D"1.0" encoding=3D"UTF-8"?>
+
+<server>
+
+   <classpath codebase=3D"./lib" archives=3D"jboss-cache.jar, jgroups.jar"=
/>
+
+
+   <mbean code=3D"org.jboss.cache.CacheImpl"
+          name=3D"jboss.cache:service=3DTreeCache">
+
+      <depends>jboss:service=3DNaming</depends>
+      <depends>jboss:service=3DTransactionManager</depends>
+
+      <attribute name=3D"TransactionManagerLookupClass">org.jboss.cache.tr=
ansaction.GenericTransactionManagerLookup</attribute>
+      <attribute name=3D"NodeLockingScheme">PESSIMISTIC</attribute>
+      <attribute name=3D"CacheMode">REPL_SYNC</attribute>
+      <attribute name=3D"UseReplQueue">false</attribute>
+      <attribute name=3D"ReplQueueInterval">0</attribute>
+      <attribute name=3D"ReplQueueMaxElements">0</attribute>
+      <attribute name=3D"ClusterName">JBossCache-Cluster</attribute>
+      <attribute name=3D"ClusterConfig">
+         <config>
+            <UDP mcast_addr=3D"229.10.10.10"
+                 mcast_port=3D"45599"
+                 tos=3D"8"
+                 ucast_recv_buf_size=3D"20000000"
+                 ucast_send_buf_size=3D"640000"
+                 mcast_recv_buf_size=3D"25000000"
+                 mcast_send_buf_size=3D"640000"
+                 loopback=3D"false"
+                 discard_incompatible_packets=3D"true"
+                 max_bundle_size=3D"64000"
+                 max_bundle_timeout=3D"30"
+                 use_incoming_packet_handler=3D"true"
+                 use_outgoing_packet_handler=3D"false"
+                 ip_ttl=3D"2"
+                 down_thread=3D"false" up_thread=3D"false"
+                 enable_bundling=3D"false"/>
+            <PING timeout=3D"2000"
+                  down_thread=3D"false" up_thread=3D"false" num_initial_me=
mbers=3D"3"/>
+            <MERGE2 max_interval=3D"100000"
+                    down_thread=3D"false" up_thread=3D"false" min_interval=
=3D"20000"/>
+            <FD_SOCK down_thread=3D"false" up_thread=3D"false"/>
+            <FD timeout=3D"10000" max_tries=3D"5" down_thread=3D"false" up=
_thread=3D"false" shun=3D"true"/>
+            <VERIFY_SUSPECT timeout=3D"1500" down_thread=3D"false" up_thre=
ad=3D"false"/>
+            <pbcast.NAKACK max_xmit_size=3D"60000"
+                           use_mcast_xmit=3D"false" gc_lag=3D"0"
+                           retransmit_timeout=3D"300,600,1200,2400,4800"
+                           down_thread=3D"false" up_thread=3D"false"
+                           discard_delivered_msgs=3D"true"/>
+            <UNICAST timeout=3D"300,600,1200,2400,3600"
+                     down_thread=3D"false" up_thread=3D"false"/>
+            <pbcast.STABLE stability_delay=3D"1000" desired_avg_gossip=3D"=
50000"
+                           down_thread=3D"false" up_thread=3D"false"
+                           max_bytes=3D"400000"/>
+            <pbcast.GMS print_local_addr=3D"true" join_timeout=3D"3000" us=
e_flush=3D"true" flush_timeout=3D"3000"
+                        down_thread=3D"false" up_thread=3D"false"
+                        join_retry_timeout=3D"2000" shun=3D"false"
+                        view_bundling=3D"true"/>
+            <FC max_credits=3D"2000000" down_thread=3D"false" up_thread=3D=
"false"
+                min_threshold=3D"0.20"/>
+            <FRAG2 frag_size=3D"60000" down_thread=3D"false" up_thread=3D"=
false"/>
+            <!-- <pbcast.STREAMING_STATE_TRANSFER down_thread=3D"false" up=
_thread=3D"false"
+                                         use_flush=3D"true" flush_timeout=
=3D"3000" use_reading_thread=3D"true"/> -->
+            <pbcast.STATE_TRANSFER down_thread=3D"false" up_thread=3D"fals=
e" use_flush=3D"true" flush_timeout=3D"3000"/>
+            <pbcast.FLUSH down_thread=3D"false" up_thread=3D"false" timeou=
t=3D"8000" auto_flush_conf=3D"false"/>
+         </config>
+      </attribute>
+      <attribute name=3D"FetchInMemoryState">true</attribute>
+      <attribute name=3D"InitialStateRetrievalTimeout">15000</attribute>
+      <attribute name=3D"SyncReplTimeout">60000</attribute>
+      <attribute name=3D"LockAcquisitionTimeout">10000</attribute>
+      <attribute name=3D"EvictionPolicyConfig">
+      </attribute>    =

+
+      <attribute name=3D"CacheLoaderConfiguration">
+      </attribute>
+
+      <attribute name=3D"UseRegionBasedMarshalling">false</attribute>
+   </mbean>
+</server>

Added: benchmarks/benchmark-fwk/cache-products/jbosscache-2.1.0cr2/conf/pes=
s-repl-async-br.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- benchmarks/benchmark-fwk/cache-products/jbosscache-2.1.0cr2/conf/pess-r=
epl-async-br.xml	                        (rev 0)
+++ benchmarks/benchmark-fwk/cache-products/jbosscache-2.1.0cr2/conf/pess-r=
epl-async-br.xml	2008-01-08 20:15:06 UTC (rev 5089)
@@ -0,0 +1,176 @@
+<?xml version=3D"1.0" encoding=3D"UTF-8"?>
+
+<server>
+
+   <classpath codebase=3D"./lib" archives=3D"jboss-cache.jar, jgroups.jar"=
/>
+
+
+   <mbean code=3D"org.jboss.cache.CacheImpl"
+          name=3D"jboss.cache:service=3DTreeCache">
+
+      <depends>jboss:service=3DNaming</depends>
+      <depends>jboss:service=3DTransactionManager</depends>
+
+      <attribute name=3D"TransactionManagerLookupClass">org.jboss.cache.tr=
ansaction.GenericTransactionManagerLookup</attribute>
+      <attribute name=3D"IsolationLevel">READ_COMMITTED</attribute>
+      <attribute name=3D"CacheMode">REPL_ASYNC</attribute>
+      <attribute name=3D"UseReplQueue">false</attribute>
+      <attribute name=3D"ReplQueueInterval">0</attribute>
+      <attribute name=3D"ReplQueueMaxElements">0</attribute>
+      <attribute name=3D"ClusterName">JBossCache-Cluster</attribute>
+      <attribute name=3D"ClusterConfig">
+         <config>
+            <!--<UDP mcast_addr=3D"232.10.10.10"-->
+                 <!--mcast_port=3D"45599"-->
+                 <!--tos=3D"8"-->
+                 <!--ucast_recv_buf_size=3D"20000000"-->
+                 <!--ucast_send_buf_size=3D"640000"-->
+                 <!--mcast_recv_buf_size=3D"25000000"-->
+                 <!--mcast_send_buf_size=3D"640000"-->
+                 <!--loopback=3D"false"-->
+                 <!--discard_incompatible_packets=3D"true"-->
+                 <!--max_bundle_size=3D"64000"-->
+                 <!--max_bundle_timeout=3D"30"-->
+                 <!--use_incoming_packet_handler=3D"true"-->
+                 <!--use_outgoing_packet_handler=3D"false"-->
+                 <!--ip_ttl=3D"2"-->
+                 <!--down_thread=3D"false" up_thread=3D"false"-->
+                 <!--enable_bundling=3D"true"/>-->
+            <!--<PING timeout=3D"2000"-->
+                  <!--down_thread=3D"false" up_thread=3D"false" num_initia=
l_members=3D"3"/>-->
+
+            <!--<TCP-->
+                 <!--loopback=3D"false"-->
+                 <!--discard_incompatible_packets=3D"true"-->
+                 <!--max_bundle_size=3D"64000"-->
+                 <!--max_bundle_timeout=3D"30"-->
+                 <!--use_incoming_packet_handler=3D"true"-->
+                 <!--use_outgoing_packet_handler=3D"false"-->
+                 <!--bind_addr=3D"127.0.0.1"-->
+                 <!--start_port=3D"7800"-->
+                 <!--enable_bundling=3D"false"-->
+                 <!--tcp_nodelay=3D"true"-->
+                 <!--/>-->
+            <!--<MPING timeout=3D"2000" num_initial_members=3D"3" mcast_ad=
dr=3D"224.10.10.15" mcast_port=3D"44553"/>-->
+            <!--<MERGE2 max_interval=3D"100000"-->
+                    <!--down_thread=3D"false" up_thread=3D"false" min_inte=
rval=3D"20000"/>-->
+            <!--<FD_SOCK down_thread=3D"false" up_thread=3D"false"/>-->
+            <!--<FD timeout=3D"10000" max_tries=3D"5" down_thread=3D"false=
" up_thread=3D"false" shun=3D"true"/>-->
+            <!--<VERIFY_SUSPECT timeout=3D"1500" down_thread=3D"false" up_=
thread=3D"false"/>-->
+            <!--<pbcast.NAKACK max_xmit_size=3D"60000"-->
+                           <!--use_mcast_xmit=3D"false" gc_lag=3D"0"-->
+                           <!--retransmit_timeout=3D"300,600,1200,2400,480=
0"-->
+                           <!--down_thread=3D"false" up_thread=3D"false"-->
+                           <!--discard_delivered_msgs=3D"true"/>-->
+            <!--<UNICAST timeout=3D"300,600,1200,2400,3600"-->
+                     <!--down_thread=3D"false" up_thread=3D"false"/>-->
+            <!--<pbcast.STABLE stability_delay=3D"1000" desired_avg_gossip=
=3D"50000"-->
+                           <!--down_thread=3D"false" up_thread=3D"false"-->
+                           <!--max_bytes=3D"400000"/>-->
+            <!--<pbcast.GMS print_local_addr=3D"true" join_timeout=3D"3000=
" use_flush=3D"true" flush_timeout=3D"3000"-->
+                        <!--down_thread=3D"false" up_thread=3D"false"-->
+                        <!--join_retry_timeout=3D"2000" shun=3D"false"-->
+                        <!--view_bundling=3D"true"/>-->
+            <!--<FC max_credits=3D"2000000" down_thread=3D"false" up_threa=
d=3D"false"-->
+                <!--min_threshold=3D"0.20"/>-->
+            <!--<FRAG2 frag_size=3D"60000" down_thread=3D"false" up_thread=
=3D"false"/>-->
+            <!-- <pbcast.STREAMING_STATE_TRANSFER down_thread=3D"false" up=
_thread=3D"false"-->
+                                         <!--use_flush=3D"true" flush_time=
out=3D"3000" use_reading_thread=3D"true"/> -->
+            <!--<pbcast.STATE_TRANSFER down_thread=3D"false" up_thread=3D"=
false" use_flush=3D"true" flush_timeout=3D"3000"/>-->
+            <!--<pbcast.FLUSH down_thread=3D"false" up_thread=3D"false" ti=
meout=3D"8000" auto_flush_conf=3D"false"/>-->
+
+              <TCP start_port=3D"7580"
+         loopback=3D"false"
+         discard_incompatible_packets=3D"true"
+         max_bundle_size=3D"64000"
+         max_bundle_timeout=3D"30"
+         use_incoming_packet_handler=3D"true"
+         enable_bundling=3D"true"
+         enable_diagnostics=3D"true"
+         thread_naming_pattern=3D"cl"
+
+         use_concurrent_stack=3D"true"
+
+	 recv_buf_size=3D"20000000"
+	 send_buf_size=3D"20000000"
+
+         thread_pool.enabled=3D"true"
+         thread_pool.min_threads=3D"2"
+         thread_pool.max_threads=3D"4"
+         thread_pool.keep_alive_time=3D"5000"
+         thread_pool.queue_enabled=3D"true"
+         thread_pool.queue_max_size=3D"100000"
+         thread_pool.rejection_policy=3D"discard"
+
+         oob_thread_pool.enabled=3D"true"
+         oob_thread_pool.min_threads=3D"4"
+         oob_thread_pool.max_threads=3D"8"
+         oob_thread_pool.keep_alive_time=3D"5000"
+         oob_thread_pool.queue_enabled=3D"false"
+         oob_thread_pool.queue_max_size=3D"100"
+         oob_thread_pool.rejection_policy=3D"Run"/>
+
+    <MPING timeout=3D"2000" mcast_addr=3D"232.1.2.3"
+            num_initial_members=3D"3"/>
+    <MERGE2 max_interval=3D"30000"
+            min_interval=3D"10000"/>
+    <FD_SOCK/>
+    <FD timeout=3D"10000" max_tries=3D"5"   shun=3D"true"/>
+    <VERIFY_SUSPECT timeout=3D"1500"  />
+    <BARRIER />
+    <pbcast.NAKACK use_stats_for_retransmission=3D"false"
+                   exponential_backoff=3D"150"
+                   use_mcast_xmit=3D"false" gc_lag=3D"0"
+                   retransmit_timeout=3D"50,300,600,1200"
+                   discard_delivered_msgs=3D"true"/>
+    <pbcast.STABLE stability_delay=3D"1000" desired_avg_gossip=3D"50000"
+                   max_bytes=3D"1000000"/>
+    <VIEW_SYNC avg_send_interval=3D"60000"   />
+    <pbcast.GMS print_local_addr=3D"true" join_timeout=3D"3000"
+                shun=3D"false"
+                view_bundling=3D"true"/>
+    <FC max_credits=3D"10000000"
+                    min_threshold=3D"0.20"/>
+    <FRAG2 frag_size=3D"60000"  />
+    <pbcast.STATE_TRANSFER  />
+
+         </config>
+      </attribute>
+      <attribute name=3D"FetchInMemoryState">true</attribute>
+      <attribute name=3D"InitialStateRetrievalTimeout">15000</attribute>
+      <attribute name=3D"SyncReplTimeout">60000</attribute>
+      <attribute name=3D"LockAcquisitionTimeout">10000</attribute>
+      <attribute name=3D"EvictionPolicyConfig">
+      </attribute>
+
+      <attribute name=3D"CacheLoaderConfiguration">
+      </attribute>
+
+      <attribute name=3D"UseRegionBasedMarshalling">false</attribute>
+
+      <!-- Buddy Replication config -->
+      <attribute name=3D"BuddyReplicationConfig">
+         <config>
+            <buddyReplicationEnabled>true</buddyReplicationEnabled>
+            <buddyLocatorClass>org.jboss.cache.buddyreplication.NextMember=
BuddyLocator</buddyLocatorClass>
+            <buddyLocatorProperties>
+               numBuddies =3D 1
+               ignoreColocatedBuddies =3D true
+            </buddyLocatorProperties>
+
+            <buddyPoolName>myBuddyPoolReplicationGroup</buddyPoolName>
+
+            <buddyCommunicationTimeout>2000</buddyCommunicationTimeout>
+
+
+            <autoDataGravitation>false</autoDataGravitation>
+
+            <dataGravitationRemoveOnFind>true</dataGravitationRemoveOnFind>
+
+            <dataGravitationSearchBackupTrees>true</dataGravitationSearchB=
ackupTrees>
+
+         </config>
+      </attribute>
+
+   </mbean>
+</server>

Added: benchmarks/benchmark-fwk/cache-products/jbosscache-2.1.0cr2/conf/pes=
s-repl-async.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- benchmarks/benchmark-fwk/cache-products/jbosscache-2.1.0cr2/conf/pess-r=
epl-async.xml	                        (rev 0)
+++ benchmarks/benchmark-fwk/cache-products/jbosscache-2.1.0cr2/conf/pess-r=
epl-async.xml	2008-01-08 20:15:06 UTC (rev 5089)
@@ -0,0 +1,81 @@
+<?xml version=3D"1.0" encoding=3D"UTF-8"?>
+
+<server>
+
+   <classpath codebase=3D"./lib" archives=3D"jboss-cache.jar, jgroups.jar"=
/>
+
+
+   <mbean code=3D"org.jboss.cache.CacheImpl"
+          name=3D"jboss.cache:service=3DTreeCache">
+
+      <depends>jboss:service=3DNaming</depends>
+      <depends>jboss:service=3DTransactionManager</depends>
+
+      <attribute name=3D"TransactionManagerLookupClass">org.jboss.cache.tr=
ansaction.GenericTransactionManagerLookup</attribute>
+      <attribute name=3D"IsolationLevel">READ_COMMITTED</attribute>
+      <attribute name=3D"CacheMode">REPL_ASYNC</attribute>
+      <attribute name=3D"UseReplQueue">true</attribute>
+      <attribute name=3D"ReplQueueInterval">0</attribute>
+      <attribute name=3D"ReplQueueMaxElements">100</attribute>
+      <attribute name=3D"ClusterName">JBossCache-Cluster</attribute>
+      <attribute name=3D"ClusterConfig">
+         <config>
+            <UDP mcast_addr=3D"232.10.10.10"
+                 mcast_port=3D"45599"
+                 tos=3D"8"
+                 ucast_recv_buf_size=3D"20000000"
+                 ucast_send_buf_size=3D"640000"
+                 mcast_recv_buf_size=3D"25000000"
+                 mcast_send_buf_size=3D"640000"
+                 loopback=3D"false"
+                 discard_incompatible_packets=3D"true"
+                 max_bundle_size=3D"64000"
+                 max_bundle_timeout=3D"30"
+                 use_incoming_packet_handler=3D"true"
+                 use_outgoing_packet_handler=3D"false"
+                 ip_ttl=3D"2"
+                 down_thread=3D"false" up_thread=3D"false"
+                 enable_bundling=3D"false"/>
+            <PING timeout=3D"2000"
+                  down_thread=3D"false" up_thread=3D"false" num_initial_me=
mbers=3D"3"/>
+            <MERGE2 max_interval=3D"100000"
+                    down_thread=3D"false" up_thread=3D"false" min_interval=
=3D"20000"/>
+            <FD_SOCK down_thread=3D"false" up_thread=3D"false"/>
+            <FD timeout=3D"10000" max_tries=3D"5" down_thread=3D"false" up=
_thread=3D"false" shun=3D"true"/>
+            <VERIFY_SUSPECT timeout=3D"1500" down_thread=3D"false" up_thre=
ad=3D"false"/>
+            <pbcast.NAKACK max_xmit_size=3D"60000"
+                           use_mcast_xmit=3D"false" gc_lag=3D"0"
+                           retransmit_timeout=3D"300,600,1200,2400,4800"
+                           down_thread=3D"false" up_thread=3D"false"
+                           discard_delivered_msgs=3D"true"/>
+            <UNICAST timeout=3D"300,600,1200,2400,3600"
+                     down_thread=3D"false" up_thread=3D"false"/>
+            <pbcast.STABLE stability_delay=3D"1000" desired_avg_gossip=3D"=
50000"
+                           down_thread=3D"false" up_thread=3D"false"
+                           max_bytes=3D"400000"/>
+            <pbcast.GMS print_local_addr=3D"true" join_timeout=3D"3000" us=
e_flush=3D"true" flush_timeout=3D"3000"
+                        down_thread=3D"false" up_thread=3D"false"
+                        join_retry_timeout=3D"2000" shun=3D"false"
+                        view_bundling=3D"true"/>
+            <FC max_credits=3D"2000000" down_thread=3D"false" up_thread=3D=
"false"
+                min_threshold=3D"0.20"/>
+            <FRAG2 frag_size=3D"60000" down_thread=3D"false" up_thread=3D"=
false"/>
+            <!-- <pbcast.STREAMING_STATE_TRANSFER down_thread=3D"false" up=
_thread=3D"false"
+                                         use_flush=3D"true" flush_timeout=
=3D"3000" use_reading_thread=3D"true"/> -->
+            <pbcast.STATE_TRANSFER down_thread=3D"false" up_thread=3D"fals=
e" use_flush=3D"true" flush_timeout=3D"3000"/>
+            <pbcast.FLUSH down_thread=3D"false" up_thread=3D"false" timeou=
t=3D"8000" auto_flush_conf=3D"false"/>
+         </config>
+      </attribute>
+      <attribute name=3D"FetchInMemoryState">true</attribute>
+      <attribute name=3D"InitialStateRetrievalTimeout">15000</attribute>
+      <attribute name=3D"SyncReplTimeout">60000</attribute>
+      <attribute name=3D"LockAcquisitionTimeout">10000</attribute>
+      <attribute name=3D"EvictionPolicyConfig">
+      </attribute>
+
+      <attribute name=3D"CacheLoaderConfiguration">
+      </attribute>
+
+      <attribute name=3D"UseRegionBasedMarshalling">false</attribute>
+   </mbean>
+</server>

Added: benchmarks/benchmark-fwk/cache-products/jbosscache-2.1.0cr2/conf/pes=
s-repl-sync-br.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- benchmarks/benchmark-fwk/cache-products/jbosscache-2.1.0cr2/conf/pess-r=
epl-sync-br.xml	                        (rev 0)
+++ benchmarks/benchmark-fwk/cache-products/jbosscache-2.1.0cr2/conf/pess-r=
epl-sync-br.xml	2008-01-08 20:15:06 UTC (rev 5089)
@@ -0,0 +1,116 @@
+<?xml version=3D"1.0" encoding=3D"UTF-8"?>
+
+<server>
+
+   <classpath codebase=3D"./lib" archives=3D"jboss-cache.jar, jgroups.jar"=
/>
+
+
+   <mbean code=3D"org.jboss.cache.CacheImpl"
+          name=3D"jboss.cache:service=3DTreeCache">
+
+      <depends>jboss:service=3DNaming</depends>
+      <depends>jboss:service=3DTransactionManager</depends>
+
+      <attribute name=3D"TransactionManagerLookupClass">org.jboss.cache.tr=
ansaction.GenericTransactionManagerLookup</attribute>
+      <attribute name=3D"IsolationLevel">READ_COMMITTED</attribute>
+      <attribute name=3D"CacheMode">REPL_SYNC</attribute>
+      <attribute name=3D"UseReplQueue">false</attribute>
+      <attribute name=3D"ReplQueueInterval">0</attribute>
+      <attribute name=3D"ReplQueueMaxElements">0</attribute>
+      <attribute name=3D"ClusterName">JBossCache-Cluster</attribute>
+      <attribute name=3D"ClusterConfig">
+         <config>
+            <TCP start_port=3D"7580"
+         loopback=3D"false"
+         discard_incompatible_packets=3D"true"
+         max_bundle_size=3D"64000"
+         max_bundle_timeout=3D"30"
+         use_incoming_packet_handler=3D"true"
+         enable_bundling=3D"true"
+         enable_diagnostics=3D"true"
+         thread_naming_pattern=3D"cl"
+
+         use_concurrent_stack=3D"true"
+
+	 recv_buf_size=3D"20000000"
+	 send_buf_size=3D"20000000"
+
+         thread_pool.enabled=3D"true"
+         thread_pool.min_threads=3D"2"
+         thread_pool.max_threads=3D"4"
+         thread_pool.keep_alive_time=3D"5000"
+         thread_pool.queue_enabled=3D"true"
+         thread_pool.queue_max_size=3D"100000"
+         thread_pool.rejection_policy=3D"discard"
+
+         oob_thread_pool.enabled=3D"true"
+         oob_thread_pool.min_threads=3D"4"
+         oob_thread_pool.max_threads=3D"8"
+         oob_thread_pool.keep_alive_time=3D"5000"
+         oob_thread_pool.queue_enabled=3D"false"
+         oob_thread_pool.queue_max_size=3D"100"
+         oob_thread_pool.rejection_policy=3D"Run"/>
+
+    <MPING timeout=3D"2000" mcast_addr=3D"232.1.2.3"
+            num_initial_members=3D"3"/>
+    <MERGE2 max_interval=3D"30000"
+            min_interval=3D"10000"/>
+    <FD_SOCK/>
+    <FD timeout=3D"10000" max_tries=3D"5"   shun=3D"true"/>
+    <VERIFY_SUSPECT timeout=3D"1500"  />
+    <BARRIER />
+    <pbcast.NAKACK use_stats_for_retransmission=3D"false"
+                   exponential_backoff=3D"150"
+                   use_mcast_xmit=3D"false" gc_lag=3D"0"
+                   retransmit_timeout=3D"50,300,600,1200"
+                   discard_delivered_msgs=3D"true"/>
+    <pbcast.STABLE stability_delay=3D"1000" desired_avg_gossip=3D"50000"
+                   max_bytes=3D"1000000"/>
+    <VIEW_SYNC avg_send_interval=3D"60000"   />
+    <pbcast.GMS print_local_addr=3D"true" join_timeout=3D"3000"
+                shun=3D"false"
+                view_bundling=3D"true"/>
+    <FC max_credits=3D"10000000"
+                    min_threshold=3D"0.20"/>
+    <FRAG2 frag_size=3D"60000"  />
+    <pbcast.STATE_TRANSFER  />
+         </config>
+      </attribute>
+      <attribute name=3D"FetchInMemoryState">true</attribute>
+      <attribute name=3D"InitialStateRetrievalTimeout">15000</attribute>
+      <attribute name=3D"SyncReplTimeout">60000</attribute>
+      <attribute name=3D"LockAcquisitionTimeout">10000</attribute>
+      <attribute name=3D"EvictionPolicyConfig">
+      </attribute>
+
+      <attribute name=3D"CacheLoaderConfiguration">
+      </attribute>
+
+      <attribute name=3D"UseRegionBasedMarshalling">false</attribute>
+
+      <!-- Buddy Replication config -->
+      <attribute name=3D"BuddyReplicationConfig">
+         <config>
+            <buddyReplicationEnabled>true</buddyReplicationEnabled>
+            <buddyLocatorClass>org.jboss.cache.buddyreplication.NextMember=
BuddyLocator</buddyLocatorClass>
+            <buddyLocatorProperties>
+               numBuddies =3D 1
+               ignoreColocatedBuddies =3D true
+            </buddyLocatorProperties>
+
+            <buddyPoolName>myBuddyPoolReplicationGroup</buddyPoolName>
+
+            <buddyCommunicationTimeout>2000</buddyCommunicationTimeout>
+
+
+            <autoDataGravitation>false</autoDataGravitation>
+
+            <dataGravitationRemoveOnFind>true</dataGravitationRemoveOnFind>
+
+            <dataGravitationSearchBackupTrees>true</dataGravitationSearchB=
ackupTrees>
+
+         </config>
+      </attribute>
+
+   </mbean>
+</server>

Added: benchmarks/benchmark-fwk/cache-products/jbosscache-2.1.0cr2/conf/pes=
s-repl-sync.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- benchmarks/benchmark-fwk/cache-products/jbosscache-2.1.0cr2/conf/pess-r=
epl-sync.xml	                        (rev 0)
+++ benchmarks/benchmark-fwk/cache-products/jbosscache-2.1.0cr2/conf/pess-r=
epl-sync.xml	2008-01-08 20:15:06 UTC (rev 5089)
@@ -0,0 +1,82 @@
+<?xml version=3D"1.0" encoding=3D"UTF-8"?>
+
+<server>
+
+   <classpath codebase=3D"./lib" archives=3D"jboss-cache.jar, jgroups.jar"=
/>
+
+
+   <mbean code=3D"org.jboss.cache.CacheImpl"
+          name=3D"jboss.cache:service=3DTreeCache">
+
+      <depends>jboss:service=3DNaming</depends>
+      <depends>jboss:service=3DTransactionManager</depends>
+
+      <attribute name=3D"TransactionManagerLookupClass">org.jboss.cache.tr=
ansaction.GenericTransactionManagerLookup</attribute>
+      <attribute name=3D"IsolationLevel">REPEATABLE_READ</attribute>
+      <attribute name=3D"CacheMode">REPL_SYNC</attribute>
+      <attribute name=3D"UseReplQueue">false</attribute>
+      <attribute name=3D"ReplQueueInterval">0</attribute>
+      <attribute name=3D"ReplQueueMaxElements">0</attribute>
+      <attribute name=3D"ClusterName">JBossCache-Cluster</attribute>
+      <attribute name=3D"ClusterConfig">
+         <config>
+            <UDP mcast_addr=3D"224.10.10.10"
+                 mcast_port=3D"45599"
+                 tos=3D"8"
+                 ucast_recv_buf_size=3D"20000000"
+                 ucast_send_buf_size=3D"640000"
+                 mcast_recv_buf_size=3D"25000000"
+                 mcast_send_buf_size=3D"640000"
+                 loopback=3D"false"
+                 discard_incompatible_packets=3D"true"
+                 max_bundle_size=3D"64000"
+                 max_bundle_timeout=3D"30"
+                 use_incoming_packet_handler=3D"true"
+                 use_outgoing_packet_handler=3D"false"
+                 ip_ttl=3D"2"
+                 down_thread=3D"false" up_thread=3D"false"
+                 bind_addr=3D"127.0.0.1"
+                 enable_bundling=3D"false"/>
+            <PING timeout=3D"2000"
+                  down_thread=3D"false" up_thread=3D"false" num_initial_me=
mbers=3D"3"/>
+            <MERGE2 max_interval=3D"100000"
+                    down_thread=3D"false" up_thread=3D"false" min_interval=
=3D"20000"/>
+            <FD_SOCK down_thread=3D"false" up_thread=3D"false"/>
+            <FD timeout=3D"10000" max_tries=3D"5" down_thread=3D"false" up=
_thread=3D"false" shun=3D"true"/>
+            <VERIFY_SUSPECT timeout=3D"1500" down_thread=3D"false" up_thre=
ad=3D"false"/>
+            <pbcast.NAKACK max_xmit_size=3D"60000"
+                           use_mcast_xmit=3D"false" gc_lag=3D"0"
+                           retransmit_timeout=3D"300,600,1200,2400,4800"
+                           down_thread=3D"false" up_thread=3D"false"
+                           discard_delivered_msgs=3D"true"/>
+            <UNICAST timeout=3D"300,600,1200,2400,3600"
+                     down_thread=3D"false" up_thread=3D"false"/>
+            <pbcast.STABLE stability_delay=3D"1000" desired_avg_gossip=3D"=
50000"
+                           down_thread=3D"false" up_thread=3D"false"
+                           max_bytes=3D"400000"/>
+            <pbcast.GMS print_local_addr=3D"true" join_timeout=3D"3000" us=
e_flush=3D"true" flush_timeout=3D"3000"
+                        down_thread=3D"false" up_thread=3D"false"
+                        join_retry_timeout=3D"2000" shun=3D"false"
+                        view_bundling=3D"true"/>
+            <FC max_credits=3D"2000000" down_thread=3D"false" up_thread=3D=
"false"
+                min_threshold=3D"0.20"/>
+            <FRAG2 frag_size=3D"60000" down_thread=3D"false" up_thread=3D"=
false"/>
+            <!-- <pbcast.STREAMING_STATE_TRANSFER down_thread=3D"false" up=
_thread=3D"false"
+                                         use_flush=3D"true" flush_timeout=
=3D"3000" use_reading_thread=3D"true"/> -->
+            <pbcast.STATE_TRANSFER down_thread=3D"false" up_thread=3D"fals=
e" use_flush=3D"true" flush_timeout=3D"3000"/>
+            <pbcast.FLUSH down_thread=3D"false" up_thread=3D"false" timeou=
t=3D"8000" auto_flush_conf=3D"false"/>
+         </config>
+      </attribute>
+      <attribute name=3D"FetchInMemoryState">false</attribute>
+      <attribute name=3D"InitialStateRetrievalTimeout">15000</attribute>
+      <attribute name=3D"SyncReplTimeout">60000</attribute>
+      <attribute name=3D"LockAcquisitionTimeout">10000</attribute>
+      <attribute name=3D"EvictionPolicyConfig">
+      </attribute>
+
+      <attribute name=3D"CacheLoaderConfiguration">
+      </attribute>
+
+      <attribute name=3D"UseRegionBasedMarshalling">false</attribute>
+   </mbean>
+</server>


--===============3699210140125687040==--

From jbosscache-commits at lists.jboss.org Tue Jan  8 15:15:41 2008
Content-Type: multipart/mixed; boundary="===============6861344687047679950=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r5090 -
 benchmarks/benchmark-fwk/cache-products/jbosscache-2.1.0cr2.
Date: Tue, 08 Jan 2008 15:15:40 -0500
Message-ID: <E1JCKrM-00011e-SR@committer01.frg.pub.inap.atl.jboss.com>

--===============6861344687047679950==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: mircea.markus
Date: 2008-01-08 15:15:40 -0500 (Tue, 08 Jan 2008)
New Revision: 5090

Added:
   benchmarks/benchmark-fwk/cache-products/jbosscache-2.1.0cr2/config.sh
Log:


Added: benchmarks/benchmark-fwk/cache-products/jbosscache-2.1.0cr2/config.sh
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- benchmarks/benchmark-fwk/cache-products/jbosscache-2.1.0cr2/config.sh	 =
                       (rev 0)
+++ benchmarks/benchmark-fwk/cache-products/jbosscache-2.1.0cr2/config.sh	2=
008-01-08 20:15:40 UTC (rev 5090)
@@ -0,0 +1,18 @@
+#!/bin/bash
+
+#see "$CACHE_ROOT/cache-products/cache.sh" for details
+
+THIS_DIR=3D"./cache-products/jbosscache-2.1.0CR2"
+
+#setting up classpath
+for JAR in $THIS_DIR/lib/*
+do
+   CLASSPATH=3D$CLASSPATH:$JAR
+done
+
+CLASSPATH=3D"$CLASSPATH:./classes/production/jbosscache-2.1.0CR2"
+CLASSPATH=3D"$CLASSPATH:$THIS_DIR/conf"
+#--classpath was set
+
+#additional JVM options
+JVM_OPTIONS=3D"$JVM_OPTIONS -Xmx1024m -DpreferIPv4Stack=3Dtrue"
\ No newline at end of file


--===============6861344687047679950==--

From jbosscache-commits at lists.jboss.org Tue Jan  8 15:29:49 2008
Content-Type: multipart/mixed; boundary="===============2124840654241689676=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r5091 -
 benchmarks/benchmark-fwk.
Date: Tue, 08 Jan 2008 15:29:49 -0500
Message-ID: <E1JCL53-0003YW-Cg@committer01.frg.pub.inap.atl.jboss.com>

--===============2124840654241689676==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: mircea.markus
Date: 2008-01-08 15:29:49 -0500 (Tue, 08 Jan 2008)
New Revision: 5091

Modified:
   benchmarks/benchmark-fwk/build.xml
Log:



Modified: benchmarks/benchmark-fwk/build.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- benchmarks/benchmark-fwk/build.xml	2008-01-08 20:15:40 UTC (rev 5090)
+++ benchmarks/benchmark-fwk/build.xml	2008-01-08 20:29:49 UTC (rev 5091)
@@ -147,12 +147,7 @@
   =

   <target name=3D"compile.module.framework.tests" depends=3D"compile.modul=
e.framework.production" description=3D"compile module Framework; test class=
es" unless=3D"skip.tests"/>
   =

-  <target name=3D"clean.module.framework" description=3D"cleanup module">
-    <delete dir=3D"${framework.output.dir}"/>
-    <delete dir=3D"${framework.testoutput.dir}"/>
-  </target>
-  =

-  =

+
   <!-- Module ehcache-1.2.4 -->
   =

   <dirname property=3D"module.ehcache124-plugin.basedir" file=3D"${ant.fil=
e}"/>
@@ -214,13 +209,8 @@
   =

   <target name=3D"compile.module.ehcache124-plugin.tests" depends=3D"compi=
le.module.ehcache124-plugin.production" description=3D"compile module ehcac=
he-1.2.4; test classes" unless=3D"skip.tests"/>
   =

-  <target name=3D"clean.module.ehcache124-plugin" description=3D"cleanup m=
odule">
-    <delete dir=3D"${ehcache124-plugin.output.dir}"/>
-    <delete dir=3D"${ehcache124-plugin.testoutput.dir}"/>
-  </target>
 =

 =

-
    <!-- Module coherence-3.2.2 -->
 =

   <dirname property=3D"module.coherence322-plugin.basedir" file=3D"${ant.f=
ile}"/>
@@ -414,21 +404,17 @@
   =

   <target name=3D"compile.module.jbosscache140-plugin.tests" depends=3D"co=
mpile.module.jbosscache140-plugin.production" description=3D"compile module=
 jbosscache-1.4.1; test classes" unless=3D"skip.tests"/>
   =

-  <target name=3D"clean.module.jbosscache140-plugin" description=3D"cleanu=
p module">
-    <delete dir=3D"${jbosscache140-plugin.output.dir}"/>
-    <delete dir=3D"${jbosscache140-plugin.testoutput.dir}"/>
-  </target>
-  =

-  =

   <!-- Module jbosscache-2.0.0 -->
   =

   <dirname property=3D"module.jbosscache200-plugin.basedir" file=3D"${ant.=
file}"/>
+  <dirname property=3D"module.jbosscache210CR2-plugin.basedir" file=3D"${a=
nt.file}"/>
+
   =

   =

-  =

   <property name=3D"compiler.args.jbosscache200-plugin" value=3D"${compile=
r.args}"/>
   =

   <property name=3D"jbosscache200-plugin.output.dir" value=3D"${module.jbo=
sscache200-plugin.basedir}/classes/production/jbosscache-2.0.0"/>
+  <property name=3D"jbosscache210CR2-plugin.output.dir" value=3D"${module.=
jbosscache210CR2-plugin.basedir}/classes/production/jbosscache-2.1.0CR2"/>
   <property name=3D"jbosscache200-plugin.testoutput.dir" value=3D"${module=
.jbosscache200-plugin.basedir}/classes/test/jbosscache-2.0.0"/>
   =

   <path id=3D"jbosscache200-plugin.module.bootclasspath">
@@ -438,10 +424,19 @@
   <path id=3D"jbosscache200-plugin.module.classpath">
     <fileset dir=3D"${module.jbosscache200-plugin.basedir}/cache-products/=
jbosscache-2.0.0/lib" includes=3D"*.jar" />
     <pathelement location=3D"${module.jbosscache200-plugin.basedir}/cache-=
products/jbosscache-2.0.0/conf"/>
+    <pathelement location=3D"${module.framework.basedir}/lib/commons-loggi=
ng.jar"/>
     <pathelement location=3D"${framework.output.dir}"/>
     <pathelement location=3D"${framework.testoutput.dir}"/>
     <pathelement location=3D"${jbosscache200-plugin.output.dir}" />
   </path>
+
+  <path id=3D"jbosscache210CR2-plugin.module.classpath">
+    <fileset dir=3D"${module.jbosscache210CR2-plugin.basedir}/cache-produc=
ts/jbosscache-2.1.0CR2/lib" includes=3D"*.jar" />
+    <pathelement location=3D"${module.framework.basedir}/lib/commons-loggi=
ng.jar"/>
+    <pathelement location=3D"${framework.output.dir}"/>
+    <pathelement location=3D"${framework.testoutput.dir}"/>
+    <pathelement location=3D"${jbosscache210CR2-plugin.output.dir}" />
+  </path>
   =

   =

   <patternset id=3D"excluded.from.module.jbosscache200-plugin">
@@ -460,11 +455,11 @@
   =

   =

   <target name=3D"compile.module.jbosscache200-plugin" depends=3D"compile.=
module.jbosscache200-plugin.production,compile.module.jbosscache200-plugin.=
tests" description=3D"Compile module jbosscache-2.0.0"/>
-  =

+
   <target name=3D"compile.module.jbosscache200-plugin.production" depends=
=3D"compile.module.framework" description=3D"Compile module jbosscache-2.0.=
0; production classes">
     <mkdir dir=3D"${jbosscache200-plugin.output.dir}"/>
     <javac destdir=3D"${jbosscache200-plugin.output.dir}" debug=3D"${compi=
ler.debug}" nowarn=3D"${compiler.generate.no.warnings}" memorymaximumsize=
=3D"${compiler.max.memory}" fork=3D"true">
-      <compilerarg line=3D"${compiler.args.jbosscache200-plugin}"/>
+      <compilerarg line=3D"${compiler.args}"/>
       <bootclasspath refid=3D"jbosscache200-plugin.module.bootclasspath"/>
       <classpath refid=3D"jbosscache200-plugin.module.classpath"/>
       <src refid=3D"jbosscache200-plugin.module.sourcepath"/>
@@ -478,21 +473,28 @@
       </fileset>
     </copy>
   </target>
-  =

+
+  <target name=3D"compile.module.jbosscache210CR2-plugin.production" depen=
ds=3D"compile.module.framework" description=3D"Compile module jbosscache-2.=
1.0CR2; production classes">
+    <mkdir dir=3D"${jbosscache210CR2-plugin.output.dir}"/>
+    <javac destdir=3D"${jbosscache210CR2-plugin.output.dir}" debug=3D"${co=
mpiler.debug}" nowarn=3D"${compiler.generate.no.warnings}" memorymaximumsiz=
e=3D"${compiler.max.memory}" fork=3D"true">
+      <compilerarg line=3D"${compiler.args}"/>
+      <classpath refid=3D"jbosscache210CR2-plugin.module.classpath"/>
+      <src path=3D"${module.jbosscache210CR2-plugin.basedir}/cache-product=
s/jbosscache-2.1.0CR2"/>
+    </javac>
+  </target>
+
   <target name=3D"compile.module.jbosscache200-plugin.tests" depends=3D"co=
mpile.module.jbosscache200-plugin.production" description=3D"compile module=
 jbosscache-2.0.0; test classes" unless=3D"skip.tests"/>
   =

-  <target name=3D"clean.module.jbosscache200-plugin" description=3D"cleanu=
p module">
-    <delete dir=3D"${jbosscache200-plugin.output.dir}"/>
-    <delete dir=3D"${jbosscache200-plugin.testoutput.dir}"/>
-  </target>
-  =

+
   <target name=3D"init" description=3D"Build initialization">
     <!-- Perform any build initialization in this target -->
   </target>
   =

-  <target name=3D"clean" depends=3D"clean.module.framework, clean.module.e=
hcache124-plugin, clean.module.jbosscache140-plugin, clean.module.jbosscach=
e200-plugin" description=3D"cleanup all"/>
+  <target name=3D"clean" description=3D"cleanup all">
+     <delete dir=3D"${module.framework.basedir}/classes"/>
+  </target>
   =

-  <target name=3D"all" depends=3D"init, clean, compile.module.framework, c=
ompile.module.ehcache124-plugin, compile.module.coherence322-plugin,compile=
.module.jbosscache140-plugin, compile.module.jbosscache200-plugin, compile.=
module.terracotta-plugin" description=3D"build all"/>
+  <target name=3D"all" depends=3D"init, clean, compile.module.framework, c=
ompile.module.ehcache124-plugin, compile.module.coherence322-plugin,compile=
.module.jbosscache140-plugin, compile.module.jbosscache200-plugin, compile.=
module.jbosscache210CR2-plugin.production, compile.module.terracotta-plugin=
" description=3D"build all"/>
 =

    <target name=3D"checkClusterAddresses" depends=3D"compile.module.framew=
ork.production"
            description=3D"Check whether the cluster config is a valid one">


--===============2124840654241689676==--

From jbosscache-commits at lists.jboss.org Tue Jan  8 15:44:04 2008
Content-Type: multipart/mixed; boundary="===============3892038033069099019=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r5092 -
 benchmarks/benchmark-fwk.
Date: Tue, 08 Jan 2008 15:44:04 -0500
Message-ID: <E1JCLIq-000617-2f@committer01.frg.pub.inap.atl.jboss.com>

--===============3892038033069099019==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: mircea.markus
Date: 2008-01-08 15:44:03 -0500 (Tue, 08 Jan 2008)
New Revision: 5092

Modified:
   benchmarks/benchmark-fwk/build.xml
Log:


Modified: benchmarks/benchmark-fwk/build.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- benchmarks/benchmark-fwk/build.xml	2008-01-08 20:29:49 UTC (rev 5091)
+++ benchmarks/benchmark-fwk/build.xml	2008-01-08 20:44:03 UTC (rev 5092)
@@ -407,14 +407,14 @@
   <!-- Module jbosscache-2.0.0 -->
   =

   <dirname property=3D"module.jbosscache200-plugin.basedir" file=3D"${ant.=
file}"/>
-  <dirname property=3D"module.jbosscache210CR2-plugin.basedir" file=3D"${a=
nt.file}"/>
+  <dirname property=3D"module.jbosscache210cr2-plugin.basedir" file=3D"${a=
nt.file}"/>
 =

   =

   =

   <property name=3D"compiler.args.jbosscache200-plugin" value=3D"${compile=
r.args}"/>
   =

   <property name=3D"jbosscache200-plugin.output.dir" value=3D"${module.jbo=
sscache200-plugin.basedir}/classes/production/jbosscache-2.0.0"/>
-  <property name=3D"jbosscache210CR2-plugin.output.dir" value=3D"${module.=
jbosscache210CR2-plugin.basedir}/classes/production/jbosscache-2.1.0CR2"/>
+  <property name=3D"jbosscache210cr2-plugin.output.dir" value=3D"${module.=
jbosscache210cr2-plugin.basedir}/classes/production/jbosscache-2.1.0CR2"/>
   <property name=3D"jbosscache200-plugin.testoutput.dir" value=3D"${module=
.jbosscache200-plugin.basedir}/classes/test/jbosscache-2.0.0"/>
   =

   <path id=3D"jbosscache200-plugin.module.bootclasspath">
@@ -430,12 +430,12 @@
     <pathelement location=3D"${jbosscache200-plugin.output.dir}" />
   </path>
 =

-  <path id=3D"jbosscache210CR2-plugin.module.classpath">
-    <fileset dir=3D"${module.jbosscache210CR2-plugin.basedir}/cache-produc=
ts/jbosscache-2.1.0CR2/lib" includes=3D"*.jar" />
+  <path id=3D"jbosscache210cr2-plugin.module.classpath">
+    <fileset dir=3D"${module.jbosscache210cr2-plugin.basedir}/cache-produc=
ts/jbosscache-2.1.0CR2/lib" includes=3D"*.jar" />
     <pathelement location=3D"${module.framework.basedir}/lib/commons-loggi=
ng.jar"/>
     <pathelement location=3D"${framework.output.dir}"/>
     <pathelement location=3D"${framework.testoutput.dir}"/>
-    <pathelement location=3D"${jbosscache210CR2-plugin.output.dir}" />
+    <pathelement location=3D"${jbosscache210cr2-plugin.output.dir}" />
   </path>
   =

   =

@@ -474,12 +474,12 @@
     </copy>
   </target>
 =

-  <target name=3D"compile.module.jbosscache210CR2-plugin.production" depen=
ds=3D"compile.module.framework" description=3D"Compile module jbosscache-2.=
1.0CR2; production classes">
-    <mkdir dir=3D"${jbosscache210CR2-plugin.output.dir}"/>
-    <javac destdir=3D"${jbosscache210CR2-plugin.output.dir}" debug=3D"${co=
mpiler.debug}" nowarn=3D"${compiler.generate.no.warnings}" memorymaximumsiz=
e=3D"${compiler.max.memory}" fork=3D"true">
+  <target name=3D"compile.module.jbosscache210cr2-plugin.production" depen=
ds=3D"compile.module.framework" description=3D"Compile module jbosscache-2.=
1.0CR2; production classes">
+    <mkdir dir=3D"${jbosscache210cr2-plugin.output.dir}"/>
+    <javac destdir=3D"${jbosscache210cr2-plugin.output.dir}" debug=3D"${co=
mpiler.debug}" nowarn=3D"${compiler.generate.no.warnings}" memorymaximumsiz=
e=3D"${compiler.max.memory}" fork=3D"true">
       <compilerarg line=3D"${compiler.args}"/>
-      <classpath refid=3D"jbosscache210CR2-plugin.module.classpath"/>
-      <src path=3D"${module.jbosscache210CR2-plugin.basedir}/cache-product=
s/jbosscache-2.1.0CR2"/>
+      <classpath refid=3D"jbosscache210cr2-plugin.module.classpath"/>
+      <src path=3D"${module.jbosscache210cr2-plugin.basedir}/cache-product=
s/jbosscache-2.1.0CR2"/>
     </javac>
   </target>
 =

@@ -494,7 +494,7 @@
      <delete dir=3D"${module.framework.basedir}/classes"/>
   </target>
   =

-  <target name=3D"all" depends=3D"init, clean, compile.module.framework, c=
ompile.module.ehcache124-plugin, compile.module.coherence322-plugin,compile=
.module.jbosscache140-plugin, compile.module.jbosscache200-plugin, compile.=
module.jbosscache210CR2-plugin.production, compile.module.terracotta-plugin=
" description=3D"build all"/>
+  <target name=3D"all" depends=3D"init, clean, compile.module.framework, c=
ompile.module.ehcache124-plugin, compile.module.coherence322-plugin,compile=
.module.jbosscache140-plugin, compile.module.jbosscache200-plugin, compile.=
module.jbosscache210cr2-plugin.production, compile.module.terracotta-plugin=
" description=3D"build all"/>
 =

    <target name=3D"checkClusterAddresses" depends=3D"compile.module.framew=
ork.production"
            description=3D"Check whether the cluster config is a valid one">


--===============3892038033069099019==--

From jbosscache-commits at lists.jboss.org Tue Jan  8 15:46:09 2008
Content-Type: multipart/mixed; boundary="===============0969865909566696721=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r5093 -
 benchmarks/benchmark-fwk.
Date: Tue, 08 Jan 2008 15:46:09 -0500
Message-ID: <E1JCLKr-0006u8-0F@committer01.frg.pub.inap.atl.jboss.com>

--===============0969865909566696721==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: mircea.markus
Date: 2008-01-08 15:46:08 -0500 (Tue, 08 Jan 2008)
New Revision: 5093

Modified:
   benchmarks/benchmark-fwk/build.xml
Log:
renamed file

Modified: benchmarks/benchmark-fwk/build.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- benchmarks/benchmark-fwk/build.xml	2008-01-08 20:44:03 UTC (rev 5092)
+++ benchmarks/benchmark-fwk/build.xml	2008-01-08 20:46:08 UTC (rev 5093)
@@ -414,7 +414,7 @@
   <property name=3D"compiler.args.jbosscache200-plugin" value=3D"${compile=
r.args}"/>
   =

   <property name=3D"jbosscache200-plugin.output.dir" value=3D"${module.jbo=
sscache200-plugin.basedir}/classes/production/jbosscache-2.0.0"/>
-  <property name=3D"jbosscache210cr2-plugin.output.dir" value=3D"${module.=
jbosscache210cr2-plugin.basedir}/classes/production/jbosscache-2.1.0CR2"/>
+  <property name=3D"jbosscache210cr2-plugin.output.dir" value=3D"${module.=
jbosscache210cr2-plugin.basedir}/classes/production/jbosscache-2.1.0cr2"/>
   <property name=3D"jbosscache200-plugin.testoutput.dir" value=3D"${module=
.jbosscache200-plugin.basedir}/classes/test/jbosscache-2.0.0"/>
   =

   <path id=3D"jbosscache200-plugin.module.bootclasspath">
@@ -431,7 +431,7 @@
   </path>
 =

   <path id=3D"jbosscache210cr2-plugin.module.classpath">
-    <fileset dir=3D"${module.jbosscache210cr2-plugin.basedir}/cache-produc=
ts/jbosscache-2.1.0CR2/lib" includes=3D"*.jar" />
+    <fileset dir=3D"${module.jbosscache210cr2-plugin.basedir}/cache-produc=
ts/jbosscache-2.1.0cr2/lib" includes=3D"*.jar" />
     <pathelement location=3D"${module.framework.basedir}/lib/commons-loggi=
ng.jar"/>
     <pathelement location=3D"${framework.output.dir}"/>
     <pathelement location=3D"${framework.testoutput.dir}"/>
@@ -474,12 +474,12 @@
     </copy>
   </target>
 =

-  <target name=3D"compile.module.jbosscache210cr2-plugin.production" depen=
ds=3D"compile.module.framework" description=3D"Compile module jbosscache-2.=
1.0CR2; production classes">
+  <target name=3D"compile.module.jbosscache210cr2-plugin.production" depen=
ds=3D"compile.module.framework" description=3D"Compile module jbosscache-2.=
1.0cr2; production classes">
     <mkdir dir=3D"${jbosscache210cr2-plugin.output.dir}"/>
     <javac destdir=3D"${jbosscache210cr2-plugin.output.dir}" debug=3D"${co=
mpiler.debug}" nowarn=3D"${compiler.generate.no.warnings}" memorymaximumsiz=
e=3D"${compiler.max.memory}" fork=3D"true">
       <compilerarg line=3D"${compiler.args}"/>
       <classpath refid=3D"jbosscache210cr2-plugin.module.classpath"/>
-      <src path=3D"${module.jbosscache210cr2-plugin.basedir}/cache-product=
s/jbosscache-2.1.0CR2"/>
+      <src path=3D"${module.jbosscache210cr2-plugin.basedir}/cache-product=
s/jbosscache-2.1.0cr2"/>
     </javac>
   </target>
 =



--===============0969865909566696721==--

From jbosscache-commits at lists.jboss.org Tue Jan  8 15:53:03 2008
Content-Type: multipart/mixed; boundary="===============4083972624552253073=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r5094 -
 benchmarks/benchmark-fwk/src/org/cachebench/smartfrog.
Date: Tue, 08 Jan 2008 15:53:03 -0500
Message-ID: <E1JCLRX-0007tb-0c@committer01.frg.pub.inap.atl.jboss.com>

--===============4083972624552253073==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: mircea.markus
Date: 2008-01-08 15:53:02 -0500 (Tue, 08 Jan 2008)
New Revision: 5094

Modified:
   benchmarks/benchmark-fwk/src/org/cachebench/smartfrog/CacheBenchmarkPrim=
.java
Log:
changed as the runNode.sh changed

Modified: benchmarks/benchmark-fwk/src/org/cachebench/smartfrog/CacheBenchm=
arkPrim.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- benchmarks/benchmark-fwk/src/org/cachebench/smartfrog/CacheBenchmarkPri=
m.java	2008-01-08 20:46:08 UTC (rev 5093)
+++ benchmarks/benchmark-fwk/src/org/cachebench/smartfrog/CacheBenchmarkPri=
m.java	2008-01-08 20:53:02 UTC (rev 5094)
@@ -98,7 +98,7 @@
             correctTerminationOfTestsIfNeeded();
             return;
          }
-         String command =3D scriptToExec + " " + nodeIndex + " " + cacheDi=
stribution + " -DclusterSize=3D" + clusterSize;
+         String command =3D scriptToExec + " " + nodeIndex + " " + cacheDi=
stribution + " " + clusterSize;
          log.info("Executing command: " + command);
          Process process =3D Runtime.getRuntime().exec(command, null, toRu=
nIn);
          InputStreamReader reader =3D new InputStreamReader(process.getInp=
utStream());


--===============4083972624552253073==--

From jbosscache-commits at lists.jboss.org Tue Jan  8 17:14:05 2008
Content-Type: multipart/mixed; boundary="===============4034280339120378045=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r5095 -
 benchmarks/benchmark-fwk/cache-products/jbosscache-2.0.0/lib.
Date: Tue, 08 Jan 2008 17:14:01 -0500
Message-ID: <E1JCMht-0006xo-AL@committer01.frg.pub.inap.atl.jboss.com>

--===============4034280339120378045==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: mircea.markus
Date: 2008-01-08 17:14:01 -0500 (Tue, 08 Jan 2008)
New Revision: 5095

Added:
   benchmarks/benchmark-fwk/cache-products/jbosscache-2.0.0/lib/jgroups-all=
.jar
Removed:
   benchmarks/benchmark-fwk/cache-products/jbosscache-2.0.0/lib/jgroups-2.6=
.1.jar
   benchmarks/benchmark-fwk/cache-products/jbosscache-2.0.0/lib/jgroups.jar
Modified:
   benchmarks/benchmark-fwk/cache-products/jbosscache-2.0.0/lib/jboss-commo=
n-core.jar
Log:
changed the lib

Modified: benchmarks/benchmark-fwk/cache-products/jbosscache-2.0.0/lib/jbos=
s-common-core.jar
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)

Deleted: benchmarks/benchmark-fwk/cache-products/jbosscache-2.0.0/lib/jgrou=
ps-2.6.1.jar
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)

Added: benchmarks/benchmark-fwk/cache-products/jbosscache-2.0.0/lib/jgroups=
-all.jar
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)


Property changes on: benchmarks/benchmark-fwk/cache-products/jbosscache-2.0=
.0/lib/jgroups-all.jar
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Deleted: benchmarks/benchmark-fwk/cache-products/jbosscache-2.0.0/lib/jgrou=
ps.jar
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)


--===============4034280339120378045==--

From jbosscache-commits at lists.jboss.org Tue Jan  8 17:29:59 2008
Content-Type: multipart/mixed; boundary="===============0010478364989395797=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r5096 - in
 benchmarks/benchmark-fwk/cache-products: jbosscache-2.0.0/conf and 2 other
 directories.
Date: Tue, 08 Jan 2008 17:25:59 -0500
Message-ID: <E1JCMtT-0001Ju-MK@committer01.frg.pub.inap.atl.jboss.com>

--===============0010478364989395797==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: mircea.markus
Date: 2008-01-08 17:25:59 -0500 (Tue, 08 Jan 2008)
New Revision: 5096

Modified:
   benchmarks/benchmark-fwk/cache-products/jbosscache-2.0.0/conf/pess-repl-=
sync-br.xml
   benchmarks/benchmark-fwk/cache-products/jbosscache-2.0.0/config.sh
   benchmarks/benchmark-fwk/cache-products/jbosscache-2.0.0/src/org/cachebe=
nch/cachewrappers/JBossCache200Wrapper.java
   benchmarks/benchmark-fwk/cache-products/jbosscache-2.1.0cr2/config.sh
Log:
added prefer IP v4....

Modified: benchmarks/benchmark-fwk/cache-products/jbosscache-2.0.0/conf/pes=
s-repl-sync-br.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- benchmarks/benchmark-fwk/cache-products/jbosscache-2.0.0/conf/pess-repl=
-sync-br.xml	2008-01-08 22:14:01 UTC (rev 5095)
+++ benchmarks/benchmark-fwk/cache-products/jbosscache-2.0.0/conf/pess-repl=
-sync-br.xml	2008-01-08 22:25:59 UTC (rev 5096)
@@ -20,60 +20,61 @@
       <attribute name=3D"ClusterName">JBossCache-Cluster</attribute>
       <attribute name=3D"ClusterConfig">
          <config>
-            <TCP start_port=3D"7580"
-         loopback=3D"false"
-         discard_incompatible_packets=3D"true"
-         max_bundle_size=3D"64000"
-         max_bundle_timeout=3D"30"
-         use_incoming_packet_handler=3D"true"
-         enable_bundling=3D"true"
-         enable_diagnostics=3D"true"
-         thread_naming_pattern=3D"cl"
+            <UDP mcast_addr=3D"228.10.10.10"
+                 mcast_port=3D"45588"
+                 tos=3D"8"
+                 ucast_recv_buf_size=3D"20000000"
+                 ucast_send_buf_size=3D"640000"
+                 mcast_recv_buf_size=3D"25000000"
+                 mcast_send_buf_size=3D"640000"
+                 loopback=3D"false"
+                 discard_incompatible_packets=3D"true"
+                 max_bundle_size=3D"64000"
+                 max_bundle_timeout=3D"30"
+                 use_incoming_packet_handler=3D"true"
+                 ip_ttl=3D"2"
+                 enable_bundling=3D"false"
+                 enable_diagnostics=3D"true"
 =

-         use_concurrent_stack=3D"true"
+                 use_concurrent_stack=3D"true"
 =

-	 recv_buf_size=3D"20000000"
-	 send_buf_size=3D"20000000"
+                 thread_naming_pattern=3D"pl"
 =

-         thread_pool.enabled=3D"true"
-         thread_pool.min_threads=3D"2"
-         thread_pool.max_threads=3D"4"
-         thread_pool.keep_alive_time=3D"5000"
-         thread_pool.queue_enabled=3D"true"
-         thread_pool.queue_max_size=3D"100000"
-         thread_pool.rejection_policy=3D"discard"
+                 thread_pool.enabled=3D"true"
+                 thread_pool.min_threads=3D"1"
+                 thread_pool.max_threads=3D"25"
+                 thread_pool.keep_alive_time=3D"30000"
+                 thread_pool.queue_enabled=3D"true"
+                 thread_pool.queue_max_size=3D"10"
+                 thread_pool.rejection_policy=3D"Run"
 =

-         oob_thread_pool.enabled=3D"true"
-         oob_thread_pool.min_threads=3D"4"
-         oob_thread_pool.max_threads=3D"8"
-         oob_thread_pool.keep_alive_time=3D"5000"
-         oob_thread_pool.queue_enabled=3D"false"
-         oob_thread_pool.queue_max_size=3D"100"
-         oob_thread_pool.rejection_policy=3D"Run"/>
+                 oob_thread_pool.enabled=3D"true"
+                 oob_thread_pool.min_threads=3D"1"
+                 oob_thread_pool.max_threads=3D"4"
+                 oob_thread_pool.keep_alive_time=3D"10000"
+                 oob_thread_pool.queue_enabled=3D"true"
+                 oob_thread_pool.queue_max_size=3D"10"
+                 oob_thread_pool.rejection_policy=3D"Run"/>
 =

-    <MPING timeout=3D"2000" mcast_addr=3D"232.1.2.3"
-            num_initial_members=3D"3"/>
-    <MERGE2 max_interval=3D"30000"
-            min_interval=3D"10000"/>
-    <FD_SOCK/>
-    <FD timeout=3D"10000" max_tries=3D"5"   shun=3D"true"/>
-    <VERIFY_SUSPECT timeout=3D"1500"  />
-    <BARRIER />
-    <pbcast.NAKACK use_stats_for_retransmission=3D"false"
-                   exponential_backoff=3D"150"
-                   use_mcast_xmit=3D"false" gc_lag=3D"0"
-                   retransmit_timeout=3D"50,300,600,1200"
-                   discard_delivered_msgs=3D"true"/>
-    <pbcast.STABLE stability_delay=3D"1000" desired_avg_gossip=3D"50000"
-                   max_bytes=3D"1000000"/>
-    <VIEW_SYNC avg_send_interval=3D"60000"   />
-    <pbcast.GMS print_local_addr=3D"true" join_timeout=3D"3000"
-                shun=3D"false"
-                view_bundling=3D"true"/>
-    <FC max_credits=3D"10000000"
-                    min_threshold=3D"0.20"/>
-    <FRAG2 frag_size=3D"60000"  />
-    <pbcast.STATE_TRANSFER  />
+            <PING timeout=3D"2000" num_initial_members=3D"3"/>
+            <MERGE2 max_interval=3D"30000" min_interval=3D"10000"/>
+            <FD_SOCK/>
+            <FD timeout=3D"10000" max_tries=3D"5" shun=3D"true"/>
+            <VERIFY_SUSPECT timeout=3D"1500"/>
+            <pbcast.NAKACK max_xmit_size=3D"60000"
+                           use_mcast_xmit=3D"false" gc_lag=3D"0"
+                           retransmit_timeout=3D"300,600,1200,2400,4800"
+                           discard_delivered_msgs=3D"true"/>
+            <UNICAST timeout=3D"300,600,1200,2400,3600"/>
+            <pbcast.STABLE stability_delay=3D"1000" desired_avg_gossip=3D"=
50000"
+                           max_bytes=3D"400000"/>
+            <pbcast.GMS print_local_addr=3D"true" join_timeout=3D"5000"
+                        join_retry_timeout=3D"2000" shun=3D"false"
+                        view_bundling=3D"true" view_ack_collection_timeout=
=3D"5000"/>
+            <FRAG2 frag_size=3D"60000"/>
+            <pbcast.STREAMING_STATE_TRANSFER use_reading_thread=3D"true"/>
+            <!-- <pbcast.STATE_TRANSFER/> -->
+            <pbcast.FLUSH timeout=3D"0"/>
          </config>
       </attribute>
       <attribute name=3D"FetchInMemoryState">true</attribute>

Modified: benchmarks/benchmark-fwk/cache-products/jbosscache-2.0.0/config.sh
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- benchmarks/benchmark-fwk/cache-products/jbosscache-2.0.0/config.sh	2008=
-01-08 22:14:01 UTC (rev 5095)
+++ benchmarks/benchmark-fwk/cache-products/jbosscache-2.0.0/config.sh	2008=
-01-08 22:25:59 UTC (rev 5096)
@@ -14,5 +14,5 @@
 #--classpath was set
 =

 #additional JVM options
-JVM_OPTIONS=3D"$JVM_OPTIONS -Xmx1024m -DpreferIPv4Stack=3Dtrue"
+JVM_OPTIONS=3D"$JVM_OPTIONS -Xmx1024m -Djava.net.preferIPv4Stack=3Dtrue"
 =


Modified: benchmarks/benchmark-fwk/cache-products/jbosscache-2.0.0/src/org/=
cachebench/cachewrappers/JBossCache200Wrapper.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- benchmarks/benchmark-fwk/cache-products/jbosscache-2.0.0/src/org/cacheb=
ench/cachewrappers/JBossCache200Wrapper.java	2008-01-08 22:14:01 UTC (rev 5=
095)
+++ benchmarks/benchmark-fwk/cache-products/jbosscache-2.0.0/src/org/cacheb=
ench/cachewrappers/JBossCache200Wrapper.java	2008-01-08 22:25:59 UTC (rev 5=
096)
@@ -10,6 +10,7 @@
 import org.jboss.cache.buddyreplication.GravitateResult;
 import org.jboss.cache.marshall.NodeData;
 =

+import java.net.URL;
 import java.util.Map;
 =

 public class JBossCache200Wrapper implements CacheWrapper
@@ -20,9 +21,13 @@
    public void init(Map parameters) throws Exception
    {
       log.info("Creating cache with the following configuration: " + param=
eters);
-      cache =3D DefaultCacheFactory.getInstance().createCache((String)para=
meters.get("config"));
+      String configFile =3D (String) parameters.get("config");
+      URL url =3D Thread.currentThread().getContextClassLoader().getResour=
ce(configFile);
+      log.info("Loading cache with config file: " + url);
       log.info("Running follwing JBossCacheVersion: " + org.jboss.cache.Ve=
rsion.version);
-      log.info("Running follwing JBossCacheCodeName: " + org.jboss.cache.V=
ersion.codename);   }
+      log.info("Running follwing JBossCacheCodeName: " + org.jboss.cache.V=
ersion.codename);
+      cache =3D DefaultCacheFactory.getInstance().createCache(configFile);
+   }
 =

    public void setUp() throws Exception
    {

Modified: benchmarks/benchmark-fwk/cache-products/jbosscache-2.1.0cr2/confi=
g.sh
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- benchmarks/benchmark-fwk/cache-products/jbosscache-2.1.0cr2/config.sh	2=
008-01-08 22:14:01 UTC (rev 5095)
+++ benchmarks/benchmark-fwk/cache-products/jbosscache-2.1.0cr2/config.sh	2=
008-01-08 22:25:59 UTC (rev 5096)
@@ -15,4 +15,4 @@
 #--classpath was set
 =

 #additional JVM options
-JVM_OPTIONS=3D"$JVM_OPTIONS -Xmx1024m -DpreferIPv4Stack=3Dtrue"
\ No newline at end of file
+JVM_OPTIONS=3D"$JVM_OPTIONS -Xmx1024m -Djava.net.preferIPv4Stack=3Dtrue"
\ No newline at end of file


--===============0010478364989395797==--

From jbosscache-commits at lists.jboss.org Tue Jan  8 17:58:52 2008
Content-Type: multipart/mixed; boundary="===============0096631920512824161=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN:  r5097 - benchmarks.
Date: Tue, 08 Jan 2008 17:54:52 -0500
Message-ID: <E1JCNLQ-0006ZB-Ny@committer01.frg.pub.inap.atl.jboss.com>

--===============0096631920512824161==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: mircea.markus
Date: 2008-01-08 17:54:52 -0500 (Tue, 08 Jan 2008)
New Revision: 5097

Added:
   benchmarks/trunk/
Removed:
   benchmarks/benchmark-fwk/
Log:
moving benchmark fwk

Copied: benchmarks/trunk (from rev 5096, benchmarks/benchmark-fwk)


--===============0096631920512824161==--

From jbosscache-commits at lists.jboss.org Tue Jan  8 17:59:28 2008
Content-Type: multipart/mixed; boundary="===============8223895573913962456=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN:  r5098 - benchmarks.
Date: Tue, 08 Jan 2008 17:55:28 -0500
Message-ID: <E1JCNM0-00073z-L4@committer01.frg.pub.inap.atl.jboss.com>

--===============8223895573913962456==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: mircea.markus
Date: 2008-01-08 17:55:28 -0500 (Tue, 08 Jan 2008)
New Revision: 5098

Added:
   benchmarks/benchmark-fwk/
Log:



--===============8223895573913962456==--

From jbosscache-commits at lists.jboss.org Tue Jan  8 17:59:58 2008
Content-Type: multipart/mixed; boundary="===============2127716896695529752=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r5099 - in benchmarks:
 benchmark-fwk and 1 other directory.
Date: Tue, 08 Jan 2008 17:55:58 -0500
Message-ID: <E1JCNMU-00075r-It@committer01.frg.pub.inap.atl.jboss.com>

--===============2127716896695529752==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: mircea.markus
Date: 2008-01-08 17:55:58 -0500 (Tue, 08 Jan 2008)
New Revision: 5099

Added:
   benchmarks/benchmark-fwk/trunk/
Removed:
   benchmarks/trunk/
Log:
 =


Copied: benchmarks/benchmark-fwk/trunk (from rev 5098, benchmarks/trunk)


--===============2127716896695529752==--

From jbosscache-commits at lists.jboss.org Tue Jan  8 18:00:49 2008
Content-Type: multipart/mixed; boundary="===============3089309060789040474=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r5100 -
 benchmarks/benchmark-fwk.
Date: Tue, 08 Jan 2008 17:56:49 -0500
Message-ID: <E1JCNNJ-00078c-1T@committer01.frg.pub.inap.atl.jboss.com>

--===============3089309060789040474==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: mircea.markus
Date: 2008-01-08 17:56:48 -0500 (Tue, 08 Jan 2008)
New Revision: 5100

Added:
   benchmarks/benchmark-fwk/tags/
Log:



--===============3089309060789040474==--

From jbosscache-commits at lists.jboss.org Tue Jan  8 18:01:05 2008
Content-Type: multipart/mixed; boundary="===============8518476619791332923=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r5101 -
 benchmarks/benchmark-fwk.
Date: Tue, 08 Jan 2008 17:57:05 -0500
Message-ID: <E1JCNNZ-00079Z-6f@committer01.frg.pub.inap.atl.jboss.com>

--===============8518476619791332923==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: mircea.markus
Date: 2008-01-08 17:57:05 -0500 (Tue, 08 Jan 2008)
New Revision: 5101

Added:
   benchmarks/benchmark-fwk/branches/
Log:



--===============8518476619791332923==--

From jbosscache-commits at lists.jboss.org Tue Jan  8 19:45:11 2008
Content-Type: multipart/mixed; boundary="===============5542859377967143357=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r5102 -
 core/trunk/src/main/java/org/jboss/cache/factories.
Date: Tue, 08 Jan 2008 19:45:11 -0500
Message-ID: <E1JCP4B-00039r-Ec@committer01.frg.pub.inap.atl.jboss.com>

--===============5542859377967143357==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: manik.surtani(a)jboss.com
Date: 2008-01-08 19:45:11 -0500 (Tue, 08 Jan 2008)
New Revision: 5102

Modified:
   core/trunk/src/main/java/org/jboss/cache/factories/ComponentRegistry.java
Log:
Fixed proper bootstrapping after a reset

Modified: core/trunk/src/main/java/org/jboss/cache/factories/ComponentRegis=
try.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/java/org/jboss/cache/factories/ComponentRegistry.ja=
va	2008-01-08 22:57:05 UTC (rev 5101)
+++ core/trunk/src/main/java/org/jboss/cache/factories/ComponentRegistry.ja=
va	2008-01-09 00:45:11 UTC (rev 5102)
@@ -75,6 +75,7 @@
    Map<Class, Class<? extends ComponentFactory>> defaultFactories =3D null;
 =

    private static Log log =3D LogFactory.getLog(ComponentRegistry.class);
+   private Bootstrap bootstrap;
 =

    /**
     * Creates an instance of the component registry.  The configuration pa=
ssed in is automatically registered.
@@ -560,13 +561,8 @@
       conf.changeState(CONSTRUCTED);
       cr.changeState(CONSTRUCTED);
 =

-      componentLookup.put(Configuration.class.getName(), conf);
-      componentLookup.put(ComponentRegistry.class.getName(), cr);
-      componentLookup.put(CacheImpl.class.getName(), impl);
-      componentLookup.put(CacheSPI.class.getName(), spi);
+      bootstrap =3D new Bootstrap((CacheImpl) impl.instance, (CacheSPI) sp=
i.instance, (ComponentRegistry) cr.instance, (Configuration) conf.instance);
 =

-      spi.changeState(WIRED);
-
       overallState =3D null;
    }
 =

@@ -591,15 +587,20 @@
     */
    public void wire()
    {
+      if (bootstrap !=3D null && !bootstrap.isBootstrapped())
+      {
+         bootstrap.bootstrap();
+      }
+
       moveComponentsToState(WIRED);
    }
 =

    void moveComponentsToState(State state)
    {
-      if (overallState =3D=3D null)
+      if (overallState =3D=3D null && bootstrap !=3D null && !bootstrap.is=
Bootstrapped())
       {
          // we have been destroyed!  Need to bootstrap again.
-         bootstrap();
+         bootstrap.bootstrap();
       }
 =

       for (Component c : componentLookup.values())
@@ -610,22 +611,6 @@
    }
 =

    /**
-    * Always assumes that the 4 core bootstrap components are in the regis=
try. Will now attempt to make sure their dependencies are built.
-    */
-   void bootstrap()
-   {
-      // the bootstrap classes
-      Component spi =3D componentLookup.get(CacheSPI.class.getName());
-      Component impl =3D componentLookup.get(CacheImpl.class.getName());
-      Component conf =3D componentLookup.get(Configuration.class.getName()=
);
-      Component cr =3D componentLookup.get(ComponentRegistry.class.getName=
());
-      addComponentDependencies(spi, true);
-      addComponentDependencies(impl, true);
-      addComponentDependencies(conf, true);
-      addComponentDependencies(cr, true);
-   }
-
-   /**
     * Represents the state of a component
     */
    enum State
@@ -797,10 +782,6 @@
                      // of we are "moving up" - only do this if the compon=
ent is lower than what is needed.
                      if ((increase && newState.isGreaterThan(c.state)) || =
(!increase && newState.isLessThan(c.state)))
                      {
-                        if (c.name.endsWith("CacheLoaderManager"))
-                        {
-                           boolean itrue =3D true;
-                        }
                         c.changeState(newState);
                      }
 =

@@ -911,4 +892,37 @@
          return "Component (name =3D " + name + ", state =3D " + state + "=
)";
       }
    }
+
+   class Bootstrap
+   {
+      CacheImpl cacheImpl;
+      CacheSPI cacheSPI;
+      ComponentRegistry componentRegistry;
+      Configuration configuration;
+
+      Bootstrap(CacheImpl cacheImpl, CacheSPI cacheSPI, ComponentRegistry =
componentRegistry, Configuration configuration)
+      {
+         this.cacheImpl =3D cacheImpl;
+         this.cacheSPI =3D cacheSPI;
+         this.componentRegistry =3D componentRegistry;
+         this.configuration =3D configuration;
+      }
+
+      boolean isBootstrapped()
+      {
+         return componentLookup.containsKey(Configuration.class.getName())=
 &&
+               componentLookup.containsKey(CacheImpl.class.getName()) &&
+               componentLookup.containsKey(CacheSPI.class.getName()) &&
+               componentLookup.containsKey(ComponentRegistry.class.getName=
());
+      }
+
+      void bootstrap()
+      {
+         overallState =3D CONSTRUCTED;
+         registerComponent(Configuration.class.getName(), configuration, C=
onfiguration.class);
+         registerComponent(ComponentRegistry.class.getName(), componentReg=
istry, ComponentRegistry.class);
+         registerComponent(CacheImpl.class.getName(), cacheImpl, CacheImpl=
.class);
+         registerComponent(CacheSPI.class.getName(), cacheSPI, CacheSPI.cl=
ass);
+      }
+   }
 }
\ No newline at end of file


--===============5542859377967143357==--

From jboss-qa-internal at redhat.com Wed Jan  9 01:38:40 2008
Content-Type: multipart/mixed; boundary="===============0314641893683474984=="
MIME-Version: 1.0
From: jboss-qa-internal at redhat.com
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] Hudson build became unstable:
 jboss-cache-1.4.X-jdk1.5 #55
Date: Wed, 09 Jan 2008 01:38:12 -0500
Message-ID: <12723427.14171199860692795.JavaMail.hudson@dev45.qa.atl2.redhat.com>

--===============0314641893683474984==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

See http://hudson.qa.jboss.com/hudson/job/jboss-cache-1.4.X-jdk1.5/55/chang=
es



--===============0314641893683474984==--

From jbosscache-commits at lists.jboss.org Wed Jan  9 06:52:26 2008
Content-Type: multipart/mixed; boundary="===============7935531129141282734=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r5103 - in core/trunk/src:
 main/java/org/jboss/cache/config and 4 other directories.
Date: Wed, 09 Jan 2008 06:52:25 -0500
Message-ID: <E1JCZTt-0005Tg-Ou@committer01.frg.pub.inap.atl.jboss.com>

--===============7935531129141282734==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: manik.surtani(a)jboss.com
Date: 2008-01-09 06:52:25 -0500 (Wed, 09 Jan 2008)
New Revision: 5103

Added:
   core/trunk/src/main/java/org/jboss/cache/loader/LocalDelegatingCacheLoad=
erConfig.java
Modified:
   core/trunk/src/main/java/org/jboss/cache/CacheImpl.java
   core/trunk/src/main/java/org/jboss/cache/config/CacheLoaderConfig.java
   core/trunk/src/main/java/org/jboss/cache/config/Configuration.java
   core/trunk/src/main/java/org/jboss/cache/factories/ComponentRegistry.java
   core/trunk/src/main/java/org/jboss/cache/loader/CacheLoaderManager.java
   core/trunk/src/main/java/org/jboss/cache/loader/LocalDelegatingCacheLoad=
er.java
   core/trunk/src/test/java/org/jboss/cache/loader/CacheLoaderMethodCallCou=
nterTest.java
   core/trunk/src/test/java/org/jboss/cache/loader/InterceptorSynchronizati=
onTest.java
   core/trunk/src/test/java/org/jboss/cache/loader/LocalDelegatingCacheLoad=
erTest.java
   core/trunk/src/test/java/org/jboss/cache/loader/UnnecessaryLoadingTest.j=
ava
   core/trunk/src/test/java/org/jboss/cache/passivation/PassivationToLocalD=
elegatingCacheLoaderTest.java
Log:
Fixed stuff, plus JBCACHE-1204 - shutdown hook

Modified: core/trunk/src/main/java/org/jboss/cache/CacheImpl.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/java/org/jboss/cache/CacheImpl.java	2008-01-09 00:4=
5:11 UTC (rev 5102)
+++ core/trunk/src/main/java/org/jboss/cache/CacheImpl.java	2008-01-09 11:5=
2:25 UTC (rev 5103)
@@ -51,6 +51,7 @@
 import org.jgroups.util.Rsp;
 import org.jgroups.util.RspList;
 =

+import javax.management.MBeanServerFactory;
 import javax.transaction.Status;
 import javax.transaction.SystemException;
 import javax.transaction.Transaction;
@@ -684,26 +685,37 @@
 =

    private void addShutdownHook()
    {
-      // *Always* register a shutdown hook.  If cache.stop() is called man=
ually or from an MBean server or microcontainer,
-      // cache.stop will de-register the shutdown hook to prevent shutdown=
 from happening again when the JVM exits.
+      ArrayList al =3D MBeanServerFactory.findMBeanServer(null);
+      boolean registerShutdownHook =3D (configuration.getShutdownHookBehav=
ior() =3D=3D Configuration.ShutdownHookBehavior.DEFAULT && al.size() =3D=3D=
 0)
+            || configuration.getShutdownHookBehavior() =3D=3D Configuratio=
n.ShutdownHookBehavior.REGISTER;
 =

-      shutdownHook =3D new Thread()
+      if (registerShutdownHook)
       {
-         public void run()
+         if (trace)
+            log.trace("Registering a shutdown hook.  Configured behavior =
=3D " + configuration.getShutdownHookBehavior());
+         shutdownHook =3D new Thread()
          {
-            try
+            public void run()
             {
-               invokedFromShutdownHook =3D true;
-               CacheImpl.this.stop();
+               try
+               {
+                  invokedFromShutdownHook =3D true;
+                  CacheImpl.this.stop();
+               }
+               finally
+               {
+                  invokedFromShutdownHook =3D false;
+               }
             }
-            finally
-            {
-               invokedFromShutdownHook =3D false;
-            }
-         }
-      };
+         };
 =

-      Runtime.getRuntime().addShutdownHook(shutdownHook);
+         Runtime.getRuntime().addShutdownHook(shutdownHook);
+      }
+      else
+      {
+         if (trace)
+            log.trace("Not registering a shutdown hook.  Configured behavi=
or =3D " + configuration.getShutdownHookBehavior());
+      }
    }
 =

    /**

Modified: core/trunk/src/main/java/org/jboss/cache/config/CacheLoaderConfig=
.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/java/org/jboss/cache/config/CacheLoaderConfig.java	=
2008-01-09 00:45:11 UTC (rev 5102)
+++ core/trunk/src/main/java/org/jboss/cache/config/CacheLoaderConfig.java	=
2008-01-09 11:52:25 UTC (rev 5103)
@@ -6,6 +6,7 @@
  */
 package org.jboss.cache.config;
 =

+import org.jboss.cache.loader.CacheLoader;
 import org.jboss.cache.loader.SingletonStoreCacheLoader;
 import org.jboss.cache.xml.XmlHelper;
 =

@@ -181,6 +182,7 @@
       private Properties properties;
 =

       private SingletonStoreConfig singletonStoreConfig;
+      private CacheLoader cacheLoader;
 =

       protected void populateFromBaseConfig(IndividualCacheLoaderConfig ba=
se)
       {
@@ -287,6 +289,30 @@
          this.singletonStoreConfig =3D singletonStoreConfig;
       }
 =

+      /**
+       * Provides the ability to get and set a running cache loader, which=
, if exists, will be used rather than
+       * constructing a new one.  Primarily to facilitate testing with moc=
k objects.
+       *
+       * @return cache loader, if one exists
+       * @since 2.1.0
+       */
+      public CacheLoader getCacheLoader()
+      {
+         return cacheLoader;
+      }
+
+      /**
+       * Provides the ability to get and set a running cache loader, which=
, if exists, will be used rather than
+       * constructing a new one.  Primarily to facilitate testing with moc=
k objects.
+       *
+       * @param cacheLoader cacheLoader to set
+       * @since 2.1.0
+       */
+      public void setCacheLoader(CacheLoader cacheLoader)
+      {
+         this.cacheLoader =3D cacheLoader;
+      }
+
       @Override
       public boolean equals(Object obj)
       {
@@ -342,7 +368,6 @@
                .toString();
       }
 =

-
       @Override
       public IndividualCacheLoaderConfig clone() throws CloneNotSupportedE=
xception
       {
@@ -351,10 +376,10 @@
             clone.properties =3D (Properties) properties.clone();
          if (singletonStoreConfig !=3D null)
             clone.setSingletonStoreConfig(singletonStoreConfig.clone());
+         clone.cacheLoader =3D cacheLoader;
          return clone;
       }
 =

-
       /**
        * Configuration for a SingletonStoreCacheLoader
        */
@@ -460,8 +485,6 @@
                clone.singletonStoreproperties =3D (Properties) singletonSt=
oreproperties.clone();
             return clone;
          }
-
-
       }
    }
 }

Modified: core/trunk/src/main/java/org/jboss/cache/config/Configuration.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/java/org/jboss/cache/config/Configuration.java	2008=
-01-09 00:45:11 UTC (rev 5102)
+++ core/trunk/src/main/java/org/jboss/cache/config/Configuration.java	2008=
-01-09 11:52:25 UTC (rev 5103)
@@ -40,6 +40,25 @@
    }
 =

    /**
+    * Behavior of the JVM shutdown hook registered by the cache
+    */
+   public enum ShutdownHookBehavior
+   {
+      /**
+       * By default a shutdown hook is registered if no MBean server (apar=
t from the JDK default) is detected.
+       */
+      DEFAULT,
+      /**
+       * Forces the cache to register a shutdown hook even if an MBean ser=
ver is detected.
+       */
+      REGISTER,
+      /**
+       * Forces the cache NOT to register a shutdown hook, even if no MBea=
n server is detected.
+       */
+      DONT_REGISTER
+   }
+
+   /**
     * Cache replication mode.
     */
    public enum CacheMode
@@ -165,7 +184,8 @@
    private String muxStackName =3D null;
    private boolean usingMultiplexer =3D false;
    private transient RuntimeConfig runtimeConfig;
-   private String marshallerClass;// =3D "org.jboss.cache.marshall.Version=
AwareMarshaller";
+   private String marshallerClass;
+   private ShutdownHookBehavior shutdownHookBehavior =3D ShutdownHookBehav=
ior.DEFAULT;
 =

    // --------------------------------------------------------------------=
----------------------------------------
    //   SETTERS - MAKE SURE ALL SETTERS PERFORM testImmutability()!!!
@@ -347,13 +367,6 @@
       this.nodeLockingOptimistic =3D nodeLockingOptimistic;
    }
 =

-   @Deprecated
-   public void setInitialStateRetrievalTimeout(long stateRetrievalTimeout)
-   {
-      log.info("Do not use InitialStateRetrievalTimeout - this is deprecat=
ed and may disappear in future releases.  Use StateRetrievalTimeout instead=
.");
-      setStateRetrievalTimeout(stateRetrievalTimeout);
-   }
-
    public void setStateRetrievalTimeout(long stateRetrievalTimeout)
    {
       testImmutability("stateRetrievalTimeout");
@@ -444,11 +457,35 @@
       this.usingMultiplexer =3D usingMultiplexer;
    }
 =

+   public void setShutdownHookBehavior(ShutdownHookBehavior shutdownHookBe=
havior)
+   {
+      testImmutability("shutdownHookBehavior");
+      this.shutdownHookBehavior =3D shutdownHookBehavior;
+   }
+
+   public void setShutdownHookBehavior(String shutdownHookBehavior)
+   {
+      testImmutability("shutdownHookBehavior");
+      if (shutdownHookBehavior =3D=3D null)
+         throw new ConfigurationException("Shutdown hook behavior cannot b=
e null", "ShutdownHookBehavior");
+      this.shutdownHookBehavior =3D ShutdownHookBehavior.valueOf(uc(shutdo=
wnHookBehavior));
+      if (this.shutdownHookBehavior =3D=3D null)
+      {
+         log.warn("Unknown shutdown hook behavior '" + shutdownHookBehavio=
r + "', using defaults.");
+         this.shutdownHookBehavior =3D ShutdownHookBehavior.DEFAULT;
+      }
+   }
+
    // --------------------------------------------------------------------=
----------------------------------------
    //   GETTERS
    // --------------------------------------------------------------------=
----------------------------------------
 =

 =

+   public ShutdownHookBehavior getShutdownHookBehavior()
+   {
+      return this.shutdownHookBehavior;
+   }
+
    public boolean isNodeLockingOptimistic()
    {
       return nodeLockingOptimistic;
@@ -570,12 +607,6 @@
       return nodeLockingScheme;
    }
 =

-   @Deprecated
-   public long getInitialStateRetrievalTimeout()
-   {
-      return getStateRetrievalTimeout();
-   }
-
    public long getStateRetrievalTimeout()
    {
       return stateRetrievalTimeout;

Modified: core/trunk/src/main/java/org/jboss/cache/factories/ComponentRegis=
try.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/java/org/jboss/cache/factories/ComponentRegistry.ja=
va	2008-01-09 00:45:11 UTC (rev 5102)
+++ core/trunk/src/main/java/org/jboss/cache/factories/ComponentRegistry.ja=
va	2008-01-09 11:52:25 UTC (rev 5103)
@@ -352,9 +352,14 @@
       unregisterComponent(CacheSPI.class.getName());
       unregisterComponent("remoteDelegate");
 =

+      overallState =3D CONSTRUCTED;
+
       registerComponent(CacheImpl.class.getName(), ci, CacheImpl.class);
       registerComponent(CacheSPI.class.getName(), spi, CacheSPI.class);
       registerComponent("remoteDelegate", rcid, RemoteCacheInvocationDeleg=
ate.class);
+
+      overallState =3D originalState;
+      moveComponentsToState(overallState);
    }
 =

    /**

Modified: core/trunk/src/main/java/org/jboss/cache/loader/CacheLoaderManage=
r.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/java/org/jboss/cache/loader/CacheLoaderManager.java=
	2008-01-09 00:45:11 UTC (rev 5102)
+++ core/trunk/src/main/java/org/jboss/cache/loader/CacheLoaderManager.java=
	2008-01-09 11:52:25 UTC (rev 5103)
@@ -11,6 +11,7 @@
 import org.jboss.cache.CacheException;
 import org.jboss.cache.CacheSPI;
 import org.jboss.cache.Fqn;
+import org.jboss.cache.RegionManager;
 import org.jboss.cache.config.CacheLoaderConfig;
 import org.jboss.cache.config.CacheLoaderConfig.IndividualCacheLoaderConfi=
g;
 import org.jboss.cache.config.CacheLoaderConfig.IndividualCacheLoaderConfi=
g.SingletonStoreConfig;
@@ -69,10 +70,12 @@
    private CacheLoader loader;
    private boolean fetchPersistentState;
    private Configuration configuration;
+   private RegionManager regionManager;
 =

    @Inject
-   private void injectDependencies(CacheSPI cache, Configuration configura=
tion)
+   private void injectDependencies(CacheSPI cache, Configuration configura=
tion, RegionManager regionManager)
    {
+      this.regionManager =3D regionManager;
       this.config =3D configuration.getCacheLoaderConfig();
       this.cache =3D cache;
       this.configuration =3D configuration;
@@ -174,7 +177,7 @@
       {
          CacheLoaderConfig.IndividualCacheLoaderConfig cfg =3D config.getI=
ndividualCacheLoaderConfigs().get(0);
          tmpLoader =3D createCacheLoader(cfg, cache);
-         finalConfigs.add(tmpLoader.getConfig());
+         finalConfigs.add(tmpLoader.getConfig() =3D=3D null ? cfg : tmpLoa=
der.getConfig());
          fetchPersistentState =3D cfg.isFetchPersistentState();
       }
 =

@@ -196,7 +199,7 @@
    private CacheLoader createCacheLoader(CacheLoaderConfig.IndividualCache=
LoaderConfig cfg, CacheSPI cache) throws Exception
    {
       // create loader
-      CacheLoader tmpLoader =3D createInstance(cfg.getClassName());
+      CacheLoader tmpLoader =3D cfg.getCacheLoader() =3D=3D null ? createI=
nstance(cfg.getClassName()) : cfg.getCacheLoader();
 =

       if (tmpLoader !=3D null)
       {
@@ -247,7 +250,7 @@
          //           tmpLoader.start();
          if (configuration !=3D null && configuration.isUseRegionBasedMars=
halling())
          {
-            tmpLoader.setRegionManager(cache.getRegionManager());
+            tmpLoader.setRegionManager(regionManager);
          }
       }
       return tmpLoader;
@@ -371,17 +374,6 @@
    }
 =

    /**
-    * Overrides generated cache loader with the one provided,for backward =
compat.  Deprecated, may not prote to all interceptors that need it.
-    *
-    * @param loader
-    */
-   @Deprecated
-   public void setCacheLoader(CacheLoader loader)
-   {
-      this.loader =3D loader;
-   }
-
-   /**
     * Tests if we're using passivation
     */
    public boolean isPassivation()

Modified: core/trunk/src/main/java/org/jboss/cache/loader/LocalDelegatingCa=
cheLoader.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/java/org/jboss/cache/loader/LocalDelegatingCacheLoa=
der.java	2008-01-09 00:45:11 UTC (rev 5102)
+++ core/trunk/src/main/java/org/jboss/cache/loader/LocalDelegatingCacheLoa=
der.java	2008-01-09 11:52:25 UTC (rev 5103)
@@ -40,18 +40,13 @@
    IndividualCacheLoaderConfig config;
    CacheSPI delegate =3D null;
 =

-   public LocalDelegatingCacheLoader()
-   {
-   }
-
-   public LocalDelegatingCacheLoader(CacheSPI delegate)
-   {
-      this.delegate =3D delegate;
-   }
-
    public void setConfig(IndividualCacheLoaderConfig config)
    {
       this.config =3D config;
+      if (config instanceof LocalDelegatingCacheLoaderConfig)
+      {
+         delegate =3D (CacheSPI) ((LocalDelegatingCacheLoaderConfig) confi=
g).getDelegate();
+      }
    }
 =

    public IndividualCacheLoaderConfig getConfig()

Copied: core/trunk/src/main/java/org/jboss/cache/loader/LocalDelegatingCach=
eLoaderConfig.java (from rev 5102, core/trunk/src/main/java/org/jboss/cache=
/loader/FileCacheLoaderConfig.java)
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/java/org/jboss/cache/loader/LocalDelegatingCacheLoa=
derConfig.java	                        (rev 0)
+++ core/trunk/src/main/java/org/jboss/cache/loader/LocalDelegatingCacheLoa=
derConfig.java	2008-01-09 11:52:25 UTC (rev 5103)
@@ -0,0 +1,65 @@
+package org.jboss.cache.loader;
+
+import org.jboss.cache.Cache;
+import org.jboss.cache.config.CacheLoaderConfig.IndividualCacheLoaderConfi=
g;
+
+import java.util.Properties;
+
+public class LocalDelegatingCacheLoaderConfig extends IndividualCacheLoade=
rConfig
+{
+   private static final long serialVersionUID =3D 4626734068542420865L;
+
+   private Cache delegate;
+
+   public LocalDelegatingCacheLoaderConfig()
+   {
+      setClassName(LocalDelegatingCacheLoader.class.getName());
+   }
+
+   /**
+    * For use by {@link org.jboss.cache.loader.FileCacheLoader}.
+    *
+    * @param base generic config object created by XML parsing.
+    */
+   LocalDelegatingCacheLoaderConfig(IndividualCacheLoaderConfig base)
+   {
+      setClassName(LocalDelegatingCacheLoader.class.getName());
+      populateFromBaseConfig(base);
+   }
+
+   @Override
+   public void setProperties(Properties props)
+   {
+      super.setProperties(props);
+   }
+
+   @Override
+   public boolean equals(Object obj)
+   {
+      return obj instanceof LocalDelegatingCacheLoaderConfig && equalsExcl=
udingProperties(obj) && delegate =3D=3D ((LocalDelegatingCacheLoaderConfig)=
 obj).delegate;
+   }
+
+   @Override
+   public int hashCode()
+   {
+      return 31 * hashCodeExcludingProperties() + (delegate =3D=3D null ? =
0 : delegate.hashCode());
+   }
+
+   @Override
+   public LocalDelegatingCacheLoaderConfig clone() throws CloneNotSupporte=
dException
+   {
+      LocalDelegatingCacheLoaderConfig clone =3D (LocalDelegatingCacheLoad=
erConfig) super.clone();
+      clone.delegate =3D delegate;
+      return clone;
+   }
+
+   public Cache getDelegate()
+   {
+      return delegate;
+   }
+
+   public void setDelegate(Cache delegate)
+   {
+      this.delegate =3D delegate;
+   }
+}
\ No newline at end of file

Modified: core/trunk/src/test/java/org/jboss/cache/loader/CacheLoaderMethod=
CallCounterTest.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/test/java/org/jboss/cache/loader/CacheLoaderMethodCallCo=
unterTest.java	2008-01-09 00:45:11 UTC (rev 5102)
+++ core/trunk/src/test/java/org/jboss/cache/loader/CacheLoaderMethodCallCo=
unterTest.java	2008-01-09 11:52:25 UTC (rev 5103)
@@ -8,15 +8,18 @@
 =

 import org.jboss.cache.CacheSPI;
 import org.jboss.cache.DefaultCacheFactory;
+import org.jboss.cache.misc.TestingUtil;
 import static org.testng.AssertJUnit.assertEquals;
 import org.testng.annotations.AfterMethod;
 import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.Test;
 =

 /**
  * A simple non-failing unit test to measure how many times each method on=
 a cache loader is called.
  *
  * @author <a href=3D"mailto:manik(a)jboss.org">Manik Surtani (manik(a)jbo=
ss.org)</a>
  */
+(a)Test(groups =3D "functional")
 public class CacheLoaderMethodCallCounterTest extends AbstractCacheLoaderT=
estBase
 {
    private CacheSPI cache;
@@ -35,12 +38,7 @@
    @AfterMethod(alwaysRun =3D true)
    public void tearDown()
    {
-      if (cache !=3D null)
-      {
-         cache.stop();
-      }
-      cache.destroy();
-      cache =3D null;
+      TestingUtil.killCaches(cache);
    }
 =

 =


Modified: core/trunk/src/test/java/org/jboss/cache/loader/InterceptorSynchr=
onizationTest.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/test/java/org/jboss/cache/loader/InterceptorSynchronizat=
ionTest.java	2008-01-09 00:45:11 UTC (rev 5102)
+++ core/trunk/src/test/java/org/jboss/cache/loader/InterceptorSynchronizat=
ionTest.java	2008-01-09 11:52:25 UTC (rev 5103)
@@ -43,7 +43,8 @@
       //setCacheLoader(new TestSlowCacheLoader());
       CacheLoaderConfig clc =3D new CacheLoaderConfig();
       IndividualCacheLoaderConfig iclc =3D new IndividualCacheLoaderConfig=
();
-      iclc.setClassName(TestSlowCacheLoader.class.getName());
+      //iclc.setClassName(TestSlowCacheLoader.class.getName());
+      iclc.setCacheLoader(new TestSlowCacheLoader());
       clc.addIndividualCacheLoaderConfig(iclc);
       cache.getConfiguration().setCacheLoaderConfig(clc);
       cache.start();

Modified: core/trunk/src/test/java/org/jboss/cache/loader/LocalDelegatingCa=
cheLoaderTest.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/test/java/org/jboss/cache/loader/LocalDelegatingCacheLoa=
derTest.java	2008-01-09 00:45:11 UTC (rev 5102)
+++ core/trunk/src/test/java/org/jboss/cache/loader/LocalDelegatingCacheLoa=
derTest.java	2008-01-09 11:52:25 UTC (rev 5103)
@@ -2,11 +2,8 @@
 =

 import org.jboss.cache.CacheSPI;
 import org.jboss.cache.DefaultCacheFactory;
+import org.jboss.cache.config.CacheLoaderConfig;
 import org.jboss.cache.config.Configuration;
-import org.jboss.cache.interceptors.ActivationInterceptor;
-import org.jboss.cache.interceptors.PassivationInterceptor;
-import org.jboss.cache.misc.TestingUtil;
-import org.jboss.cache.util.reflect.ReflectionUtil;
 import org.testng.annotations.AfterMethod;
 import org.testng.annotations.Test;
 =

@@ -22,14 +19,13 @@
       delegating_cache.create();
       delegating_cache.start();
 =

-      // setCache first ...
-      cache.getConfiguration().setCacheLoaderConfig(getSingleCacheLoaderCo=
nfig("", "org.jboss.cache.loader.LocalDelegatingCacheLoader", "", false, fa=
lse, false));
-
-      // force our own cache loader instance
-      LocalDelegatingCacheLoader cacheLoader =3D new LocalDelegatingCacheL=
oader(delegating_cache);
-
-      ReflectionUtil.setValue(TestingUtil.findInterceptor(cache, Passivati=
onInterceptor.class), "loader", cacheLoader);
-      ReflectionUtil.setValue(TestingUtil.findInterceptor(cache, Activatio=
nInterceptor.class), "loader", cacheLoader);
+      LocalDelegatingCacheLoaderConfig cfg =3D new LocalDelegatingCacheLoa=
derConfig();
+      cfg.setDelegate(delegating_cache);
+      cfg.setAsync(false);
+      cfg.setFetchPersistentState(false);
+      CacheLoaderConfig cacheLoaderConfig =3D new CacheLoaderConfig();
+      cacheLoaderConfig.addIndividualCacheLoaderConfig(cfg);
+      cache.getConfiguration().setCacheLoaderConfig(cacheLoaderConfig);
    }
 =

    protected void postConfigure()

Modified: core/trunk/src/test/java/org/jboss/cache/loader/UnnecessaryLoadin=
gTest.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/test/java/org/jboss/cache/loader/UnnecessaryLoadingTest.=
java	2008-01-09 00:45:11 UTC (rev 5102)
+++ core/trunk/src/test/java/org/jboss/cache/loader/UnnecessaryLoadingTest.=
java	2008-01-09 11:52:25 UTC (rev 5103)
@@ -1,16 +1,11 @@
 package org.jboss.cache.loader;
 =

-import org.easymock.EasyMock;
 import static org.easymock.EasyMock.*;
 import org.jboss.cache.CacheSPI;
 import org.jboss.cache.DefaultCacheFactory;
 import org.jboss.cache.Fqn;
 import org.jboss.cache.Node;
 import org.jboss.cache.config.CacheLoaderConfig;
-import org.jboss.cache.interceptors.CacheLoaderInterceptor;
-import org.jboss.cache.interceptors.CacheStoreInterceptor;
-import org.jboss.cache.misc.TestingUtil;
-import org.jboss.cache.util.reflect.ReflectionUtil;
 import static org.testng.AssertJUnit.*;
 import org.testng.annotations.AfterMethod;
 import org.testng.annotations.BeforeMethod;
@@ -35,31 +30,55 @@
    private CacheLoader mockCacheLoader;
 =

    @BeforeMethod(alwaysRun =3D true)
-   public void setUp()
+   public void setUp() throws Exception
    {
       cache =3D (CacheSPI<Object, Object>) new DefaultCacheFactory().creat=
eCache(false);
       CacheLoaderConfig clc =3D new CacheLoaderConfig();
       CacheLoaderConfig.IndividualCacheLoaderConfig iclc =3D new CacheLoad=
erConfig.IndividualCacheLoaderConfig();
-      iclc.setClassName(DummyInMemoryCacheLoader.class.getName());
       clc.addIndividualCacheLoaderConfig(iclc);
       cache.getConfiguration().setCacheLoaderConfig(clc);
-      cache.start();
-      mockCacheLoader =3D EasyMock.createMock(CacheLoader.class);
+      mockCacheLoader =3D createMock(CacheLoader.class);
 =

-      cache.getCacheLoaderManager().setCacheLoader(mockCacheLoader);
-      ReflectionUtil.setValue(TestingUtil.findInterceptor(cache, CacheLoad=
erInterceptor.class), "loader", mockCacheLoader);
-      ReflectionUtil.setValue(TestingUtil.findInterceptor(cache, CacheStor=
eInterceptor.class), "loader", mockCacheLoader);
-
-      // lifecycle stuff
+      expect(mockCacheLoader.getConfig()).andReturn(null).anyTimes();
+      mockCacheLoader.setCache((CacheSPI) anyObject());
+      expectLastCall().anyTimes();
+      mockCacheLoader.setConfig((CacheLoaderConfig.IndividualCacheLoaderCo=
nfig) anyObject());
+      expectLastCall().anyTimes();
+      mockCacheLoader.create();
+      expectLastCall().anyTimes();
+      mockCacheLoader.start();
+      expectLastCall().anyTimes();
       mockCacheLoader.stop();
-      EasyMock.expectLastCall().times(0, 1);
+      expectLastCall().anyTimes();
       mockCacheLoader.destroy();
-      EasyMock.expectLastCall().times(0, 1);
+      expectLastCall().anyTimes();
+      replay(mockCacheLoader);
+
+      iclc.setCacheLoader(mockCacheLoader);
+      cache.start();
+
+      reset(mockCacheLoader);
    }
 =

    @AfterMethod(alwaysRun =3D true)
-   public void tearDown()
+   public void tearDown() throws Exception
    {
+      reset(mockCacheLoader);
+      expect(mockCacheLoader.getConfig()).andReturn(null).anyTimes();
+      mockCacheLoader.setCache((CacheSPI) anyObject());
+      expectLastCall().anyTimes();
+      mockCacheLoader.setConfig((CacheLoaderConfig.IndividualCacheLoaderCo=
nfig) anyObject());
+      expectLastCall().anyTimes();
+      mockCacheLoader.create();
+      expectLastCall().anyTimes();
+      mockCacheLoader.start();
+      expectLastCall().anyTimes();
+      mockCacheLoader.stop();
+      expectLastCall().anyTimes();
+      mockCacheLoader.destroy();
+      expectLastCall().anyTimes();
+      replay(mockCacheLoader);
+
       cache.stop();
    }
 =


Modified: core/trunk/src/test/java/org/jboss/cache/passivation/PassivationT=
oLocalDelegatingCacheLoaderTest.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/test/java/org/jboss/cache/passivation/PassivationToLocal=
DelegatingCacheLoaderTest.java	2008-01-09 00:45:11 UTC (rev 5102)
+++ core/trunk/src/test/java/org/jboss/cache/passivation/PassivationToLocal=
DelegatingCacheLoaderTest.java	2008-01-09 11:52:25 UTC (rev 5103)
@@ -2,13 +2,10 @@
 =

 import org.jboss.cache.CacheSPI;
 import org.jboss.cache.DefaultCacheFactory;
+import org.jboss.cache.config.CacheLoaderConfig;
 import org.jboss.cache.config.Configuration;
-import org.jboss.cache.interceptors.ActivationInterceptor;
-import org.jboss.cache.interceptors.PassivationInterceptor;
 import org.jboss.cache.loader.CacheLoader;
-import org.jboss.cache.loader.LocalDelegatingCacheLoader;
-import org.jboss.cache.misc.TestingUtil;
-import org.jboss.cache.util.reflect.ReflectionUtil;
+import org.jboss.cache.loader.LocalDelegatingCacheLoaderConfig;
 import org.testng.annotations.AfterMethod;
 import org.testng.annotations.Test;
 =

@@ -24,20 +21,21 @@
    CacheSPI delegating_cache;
    CacheLoader cache_loader;
 =

-   @SuppressWarnings("deprecation")
    protected void configureCache() throws Exception
    {
       delegating_cache =3D (CacheSPI) new DefaultCacheFactory().createCach=
e(false);
       delegating_cache.getConfiguration().setCacheMode(Configuration.Cache=
Mode.LOCAL);
       delegating_cache.create();
       delegating_cache.start();
-      cache_loader =3D new LocalDelegatingCacheLoader(delegating_cache);
-      // setCache first ...
-      cache.getConfiguration().setCacheLoaderConfig(getCacheLoaderConfig("=
", "org.jboss.cache.loader.LocalDelegatingCacheLoader", "", false, false));
-      cache.getCacheLoaderManager().setCacheLoader(cache_loader);
 =

-      ReflectionUtil.setValue(TestingUtil.findInterceptor(cache, Passivati=
onInterceptor.class), "loader", cache_loader);
-      ReflectionUtil.setValue(TestingUtil.findInterceptor(cache, Activatio=
nInterceptor.class), "loader", cache_loader);
+      LocalDelegatingCacheLoaderConfig cfg =3D new LocalDelegatingCacheLoa=
derConfig();
+      cfg.setDelegate(delegating_cache);
+      cfg.setAsync(false);
+      cfg.setFetchPersistentState(false);
+      CacheLoaderConfig cacheLoaderConfig =3D new CacheLoaderConfig();
+      cacheLoaderConfig.addIndividualCacheLoaderConfig(cfg);
+      cacheLoaderConfig.setPassivation(true);
+      cache.getConfiguration().setCacheLoaderConfig(cacheLoaderConfig);
    }
 =

    @AfterMethod(alwaysRun =3D true)


--===============7935531129141282734==--

From jbosscache-commits at lists.jboss.org Wed Jan  9 10:02:25 2008
Content-Type: multipart/mixed; boundary="===============1054216600764037282=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r5104 - in core/trunk/src:
 main/java/org/jboss/cache/loader and 1 other directories.
Date: Wed, 09 Jan 2008 10:02:25 -0500
Message-ID: <E1JCcRl-0000XM-Ea@committer01.frg.pub.inap.atl.jboss.com>

--===============1054216600764037282==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: manik.surtani(a)jboss.com
Date: 2008-01-09 10:02:25 -0500 (Wed, 09 Jan 2008)
New Revision: 5104

Modified:
   core/trunk/src/main/java/org/jboss/cache/interceptors/EvictionIntercepto=
r.java
   core/trunk/src/main/java/org/jboss/cache/loader/TcpDelegatingCacheLoader=
.java
   core/trunk/src/main/java/org/jboss/cache/loader/TcpDelegatingCacheLoader=
Config.java
   core/trunk/src/test/java/org/jboss/cache/loader/TcpCacheLoaderTest.java
Log:
JBCACHE-1260 - TcpDelegatingCacheLoader to be made tolerant of TcpCacheServ=
er restarts

Modified: core/trunk/src/main/java/org/jboss/cache/interceptors/EvictionInt=
erceptor.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/java/org/jboss/cache/interceptors/EvictionIntercept=
or.java	2008-01-09 11:52:25 UTC (rev 5103)
+++ core/trunk/src/main/java/org/jboss/cache/interceptors/EvictionIntercept=
or.java	2008-01-09 15:02:25 UTC (rev 5104)
@@ -41,7 +41,6 @@
    @Inject
    void setRegionManager(RegionManager regionManager)
    {
-      if (trace) log.trace("Having region manager " + regionManager + " in=
jected.");
       this.regionManager =3D regionManager;
    }
 =


Modified: core/trunk/src/main/java/org/jboss/cache/loader/TcpDelegatingCach=
eLoader.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/java/org/jboss/cache/loader/TcpDelegatingCacheLoade=
r.java	2008-01-09 11:52:25 UTC (rev 5103)
+++ core/trunk/src/main/java/org/jboss/cache/loader/TcpDelegatingCacheLoade=
r.java	2008-01-09 15:02:25 UTC (rev 5104)
@@ -6,6 +6,9 @@
  */
 package org.jboss.cache.loader;
 =

+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.jboss.cache.CacheException;
 import org.jboss.cache.Fqn;
 import org.jboss.cache.Modification;
 import org.jboss.cache.config.CacheLoaderConfig.IndividualCacheLoaderConfi=
g;
@@ -16,7 +19,10 @@
 import java.io.IOException;
 import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
 import java.net.Socket;
+import java.net.SocketException;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -41,27 +47,31 @@
    private TcpDelegatingCacheLoaderConfig config;
    ObjectInputStream in;
    ObjectOutputStream out;
+   private static Log log =3D LogFactory.getLog(TcpDelegatingCacheLoader.c=
lass);
+   private static Method GET_CHILDREN_METHOD, GET_METHOD, PUT_KEY_METHOD, =
PUT_DATA_METHOD, REMOVE_KEY_METHOD, REMOVE_METHOD, PUT_MODS_METHOD, EXISTS_=
METHOD, REMOVE_DATA_METHOD;
 =

-
-   /**
-    * Default constructor.
-    */
-   public TcpDelegatingCacheLoader()
+   static
    {
-      // Empty.
-   }
+      try
+      {
+         GET_CHILDREN_METHOD =3D TcpDelegatingCacheLoader.class.getDeclare=
dMethod("_getChildrenNames", Fqn.class);
+         GET_METHOD =3D TcpDelegatingCacheLoader.class.getDeclaredMethod("=
_get", Fqn.class);
+         EXISTS_METHOD =3D TcpDelegatingCacheLoader.class.getDeclaredMetho=
d("_exists", Fqn.class);
+         PUT_KEY_METHOD =3D TcpDelegatingCacheLoader.class.getDeclaredMeth=
od("_put", Fqn.class, Object.class, Object.class);
+         PUT_DATA_METHOD =3D TcpDelegatingCacheLoader.class.getDeclaredMet=
hod("_put", Fqn.class, Map.class);
+         REMOVE_KEY_METHOD =3D TcpDelegatingCacheLoader.class.getDeclaredM=
ethod("_remove", Fqn.class, Object.class);
+         REMOVE_DATA_METHOD =3D TcpDelegatingCacheLoader.class.getDeclared=
Method("_removeData", Fqn.class);
+         REMOVE_METHOD =3D TcpDelegatingCacheLoader.class.getDeclaredMetho=
d("_remove", Fqn.class);
+         PUT_MODS_METHOD =3D TcpDelegatingCacheLoader.class.getDeclaredMet=
hod("_put", List.class);
 =

-   /**
-    * Allows programmatic configuration.
-    *
-    * @param host The host on which to look up the remote object.
-    * @param port The port on which to look up the remote object.
-    */
-   public TcpDelegatingCacheLoader(String host, int port)
-   {
-      this.config =3D new TcpDelegatingCacheLoaderConfig(host, port);
+      }
+      catch (Exception e)
+      {
+         log.fatal("Unable to initialise reflection methods", e);
+      }
    }
 =

+
    /**
     * Allows configuration via XML config file.
     */
@@ -82,9 +92,105 @@
       return config;
    }
 =

+   /**
+    * Invokes the specified Method with the specified parameters, catching=
 SocketExceptions and attempting to reconnect
+    * to the TcpCacheServer if necessary.
+    *
+    * @param m      method to invoke
+    * @param params parameters
+    * @return method return value
+    */
+   protected Object invokeWithRetries(Method m, Object... params)
+   {
+      long endTime =3D System.currentTimeMillis() + config.getTimeout();
+      do
+      {
+         try
+         {
+            return m.invoke(this, params);
+         }
+         catch (IllegalAccessException e)
+         {
+            log.error("Should never get here!", e);
+         }
+         catch (InvocationTargetException e)
+         {
+            if (e.getCause() instanceof SocketException)
+            {
+               try
+               {
+                  // sleep 250 ms
+                  Thread.sleep(config.getReconnectWaitTime());
+                  restart();
+               }
+               catch (IOException e1)
+               {
+                  // IOException starting; sleep a bit and retry
+               }
+               catch (InterruptedException e1)
+               {
+                  // do nothing
+               }
+            }
+         }
+      } while (System.currentTimeMillis() < endTime);
+      throw new CacheException("Unable to communicate with TCPCacheServer(=
" + config.getHost() + ":" + config.getPort() + ") after " + config.getTime=
out() + " millis, with reconnects every " + config.getReconnectWaitTime() +=
 " millis.");
+   }
+
+   // ------------------ CacheLoader interface methods, which delegate to =
retry-aware methods
+
    public Set<?> getChildrenNames(Fqn fqn) throws Exception
    {
-      Set cn =3D null;
+
+      return (Set<?>) invokeWithRetries(GET_CHILDREN_METHOD, fqn);
+   }
+
+   public Map<Object, Object> get(Fqn name) throws Exception
+   {
+      return (Map<Object, Object>) invokeWithRetries(GET_METHOD, name);
+   }
+
+   public boolean exists(Fqn name) throws Exception
+   {
+      return (Boolean) invokeWithRetries(EXISTS_METHOD, name);
+   }
+
+   public Object put(Fqn name, Object key, Object value) throws Exception
+   {
+      return invokeWithRetries(PUT_KEY_METHOD, name, key, value);
+   }
+
+   public void put(Fqn name, Map<Object, Object> attributes) throws Except=
ion
+   {
+      invokeWithRetries(PUT_DATA_METHOD, name, attributes);
+   }
+
+   @Override
+   public void put(List<Modification> modifications) throws Exception
+   {
+      invokeWithRetries(PUT_MODS_METHOD, modifications);
+   }
+
+   public Object remove(Fqn fqn, Object key) throws Exception
+   {
+      return invokeWithRetries(REMOVE_KEY_METHOD, fqn, key);
+   }
+
+   public void remove(Fqn fqn) throws Exception
+   {
+      invokeWithRetries(REMOVE_METHOD, fqn);
+   }
+
+   public void removeData(Fqn fqn) throws Exception
+   {
+      invokeWithRetries(REMOVE_DATA_METHOD, fqn);
+   }
+
+   // ------------------ Retry-aware CacheLoader interface method counterp=
arts
+
+   protected Set<?> _getChildrenNames(Fqn fqn) throws Exception
+   {
+      Set cn;
       synchronized (out)
       {
          out.reset();
@@ -104,7 +210,7 @@
       return cn;
    }
 =

-   public Map<Object, Object> get(Fqn name) throws Exception
+   protected Map<Object, Object> _get(Fqn name) throws Exception
    {
       synchronized (out)
       {
@@ -122,7 +228,7 @@
       }
    }
 =

-   public boolean exists(Fqn name) throws Exception
+   protected boolean _exists(Fqn name) throws Exception
    {
       synchronized (out)
       {
@@ -140,7 +246,7 @@
       }
    }
 =

-   public Object put(Fqn name, Object key, Object value) throws Exception
+   protected Object _put(Fqn name, Object key, Object value) throws Except=
ion
    {
       synchronized (out)
       {
@@ -160,7 +266,7 @@
       }
    }
 =

-   public void put(Fqn name, Map<Object, Object> attributes) throws Except=
ion
+   protected void _put(Fqn name, Map<Object, Object> attributes) throws Ex=
ception
    {
       synchronized (out)
       {
@@ -178,51 +284,8 @@
       }
    }
 =

-   @Override
-   public void start() throws Exception
+   protected void _put(List<Modification> modifications) throws Exception
    {
-      init();
-   }
-
-   @Override
-   public void stop()
-   {
-      try
-      {
-         if (in !=3D null) in.close();
-      }
-      catch (IOException e)
-      {
-      }
-      try
-      {
-         if (out !=3D null) out.close();
-      }
-      catch (IOException e)
-      {
-      }
-      try
-      {
-         if (sock !=3D null) sock.close();
-      }
-      catch (IOException e)
-      {
-      }
-   }
-
-
-   private void init() throws IOException
-   {
-      sock =3D new Socket(config.getHost(), config.getPort());
-      out =3D new ObjectOutputStream(new BufferedOutputStream(sock.getOutp=
utStream()));
-      out.flush();
-      in =3D new ObjectInputStream(new BufferedInputStream(sock.getInputSt=
ream()));
-   }
-
-
-   @Override
-   public void put(List<Modification> modifications) throws Exception
-   {
       synchronized (out)
       {
          out.reset();
@@ -230,7 +293,7 @@
          out.writeByte(TcpCacheOperations.PUT_LIST);
          int length =3D modifications.size();
          out.writeInt(length);
-         for (Modification m : modifications) =

+         for (Modification m : modifications)
          {
             m.writeExternal(out);
          }
@@ -243,7 +306,7 @@
       }
    }
 =

-   public Object remove(Fqn fqn, Object key) throws Exception
+   protected Object _remove(Fqn fqn, Object key) throws Exception
    {
       synchronized (out)
       {
@@ -262,7 +325,7 @@
       }
    }
 =

-   public void remove(Fqn fqn) throws Exception
+   protected void _remove(Fqn fqn) throws Exception
    {
       synchronized (out)
       {
@@ -279,7 +342,7 @@
       }
    }
 =

-   public void removeData(Fqn fqn) throws Exception
+   protected void _removeData(Fqn fqn) throws Exception
    {
       synchronized (out)
       {
@@ -296,7 +359,51 @@
       }
    }
 =

+   // ----------------- Lifecycle and no-op methods
+
+
    @Override
+   public void start() throws IOException
+   {
+      sock =3D new Socket(config.getHost(), config.getPort());
+      out =3D new ObjectOutputStream(new BufferedOutputStream(sock.getOutp=
utStream()));
+      out.flush();
+      in =3D new ObjectInputStream(new BufferedInputStream(sock.getInputSt=
ream()));
+   }
+
+   @Override
+   public void stop()
+   {
+      try
+      {
+         if (in !=3D null) in.close();
+      }
+      catch (IOException e)
+      {
+      }
+      try
+      {
+         if (out !=3D null) out.close();
+      }
+      catch (IOException e)
+      {
+      }
+      try
+      {
+         if (sock !=3D null) sock.close();
+      }
+      catch (IOException e)
+      {
+      }
+   }
+
+   protected void restart() throws IOException
+   {
+      stop();
+      start();
+   }
+
+   @Override
    public void loadEntireState(ObjectOutputStream os) throws Exception
    {
       throw new UnsupportedOperationException("operation is not currently =
supported - need to define semantics first");
@@ -319,5 +426,4 @@
    {
       throw new UnsupportedOperationException("operation is not currently =
supported - need to define semantics first");
    }
-
 }

Modified: core/trunk/src/main/java/org/jboss/cache/loader/TcpDelegatingCach=
eLoaderConfig.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/java/org/jboss/cache/loader/TcpDelegatingCacheLoade=
rConfig.java	2008-01-09 11:52:25 UTC (rev 5103)
+++ core/trunk/src/main/java/org/jboss/cache/loader/TcpDelegatingCacheLoade=
rConfig.java	2008-01-09 15:02:25 UTC (rev 5104)
@@ -13,6 +13,8 @@
 =

    private String host =3D "localhost";
    private int port =3D 7500;
+   private int timeout =3D 5000;
+   private int reconnectWaitTime =3D 500;
 =

    public TcpDelegatingCacheLoaderConfig()
    {
@@ -33,14 +35,16 @@
    /**
     * For use by {@link TcpDelegatingCacheLoader}.
     *
-    * @param host hostname of the delegate
-    * @param port port the delegate is listening on
+    * @param host    hostname of the delegate
+    * @param port    port the delegate is listening on
+    * @param timeout after which to throw an IOException
     */
-   TcpDelegatingCacheLoaderConfig(String host, int port)
+   TcpDelegatingCacheLoaderConfig(String host, int port, int timeout)
    {
       setClassName(TcpDelegatingCacheLoader.class.getName());
       this.host =3D host;
       this.port =3D port;
+      this.timeout =3D timeout;
    }
 =

    public String getHost()
@@ -65,6 +69,29 @@
       this.port =3D port;
    }
 =

+   public int getTimeout()
+   {
+      return timeout;
+   }
+
+   public void setTimeout(int timeout)
+   {
+      testImmutability("timeout");
+      this.timeout =3D timeout;
+   }
+
+   public int getReconnectWaitTime()
+   {
+      return reconnectWaitTime;
+   }
+
+   public void setReconnectWaitTime(int reconnectWaitTime)
+   {
+      testImmutability("reconnectWaitTime");
+      this.reconnectWaitTime =3D reconnectWaitTime;
+   }
+
+   @Override
    public void setProperties(Properties props)
    {
       super.setProperties(props);
@@ -78,8 +105,21 @@
       {
          this.port =3D Integer.parseInt(s);
       }
+
+      s =3D props.getProperty("timeout");
+      if (s !=3D null && s.length() > 0)
+      {
+         this.timeout =3D Integer.parseInt(s);
+      }
+
+      s =3D props.getProperty("reconnectWaitTime");
+      if (s !=3D null && s.length() > 0)
+      {
+         this.reconnectWaitTime =3D Integer.parseInt(s);
+      }
    }
 =

+   @Override
    public boolean equals(Object obj)
    {
       if (obj instanceof TcpDelegatingCacheLoaderConfig && equalsExcluding=
Properties(obj))
@@ -87,16 +127,19 @@
          TcpDelegatingCacheLoaderConfig other =3D (TcpDelegatingCacheLoade=
rConfig) obj;
 =

          return safeEquals(host, other.host)
-                 && (port =3D=3D other.port);
+               && (port =3D=3D other.port) && (timeout =3D=3D other.timeou=
t) && (reconnectWaitTime =3D=3D other.reconnectWaitTime);
       }
       return false;
    }
 =

+   @Override
    public int hashCode()
    {
       int result =3D hashCodeExcludingProperties();
       result =3D 31 * result + (host =3D=3D null ? 0 : host.hashCode());
       result =3D 31 * result + port;
+      result =3D 31 * result + timeout;
+      result =3D 31 * result + reconnectWaitTime;
 =

       return result;
    }
@@ -106,6 +149,4 @@
    {
       return (TcpDelegatingCacheLoaderConfig) super.clone();
    }
-
-
 }
\ No newline at end of file

Modified: core/trunk/src/test/java/org/jboss/cache/loader/TcpCacheLoaderTes=
t.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/test/java/org/jboss/cache/loader/TcpCacheLoaderTest.java=
	2008-01-09 11:52:25 UTC (rev 5103)
+++ core/trunk/src/test/java/org/jboss/cache/loader/TcpCacheLoaderTest.java=
	2008-01-09 15:02:25 UTC (rev 5104)
@@ -1,21 +1,39 @@
 package org.jboss.cache.loader;
 =

+import org.jboss.cache.CacheException;
+import org.jboss.cache.interceptors.OrderedSynchronizationHandler;
 import org.jboss.cache.loader.tcp.TcpCacheServer;
 import org.jboss.cache.misc.TestingUtil;
+import org.jboss.cache.notifications.annotation.CacheListener;
+import org.jboss.cache.notifications.annotation.NodeCreated;
+import org.jboss.cache.notifications.event.Event;
+import org.testng.annotations.AfterClass;
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.Test;
 =

+import javax.transaction.Synchronization;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+
 /**
  * Tests the TcpDelegatingCacheLoader
  *
  * @author Bela Ban
  * @version $Id$
  */
+(a)Test(groups =3D "functional")
 public class TcpCacheLoaderTest extends CacheLoaderTestsBase
 {
+   protected static final int CACHE_SERVER_RESTART_DELAY_MS =3D 1000;
+   protected static final int TCP_CACHE_LOADER_TIMEOUT_MS =3D 2000;
+   protected static int START_COUNT =3D 0;
    static TcpCacheServer cache_server =3D null;
 =

-   static
+   @BeforeClass
+   public static void startCacheServer()
    {
-      Thread runner =3D new Thread()
+      Thread t =3D new Thread()
       {
          public void run()
          {
@@ -25,9 +43,10 @@
                cache_server =3D new TcpCacheServer();
                cache_server.setBindAddress("127.0.0.1");
                cache_server.setPort(12121);
-               cache_server.setConfig("META-INF/local-service.xml"); // mu=
st be in classpath (./etc/META-INF)
+               cache_server.setConfig("META-INF/local-service.xml"); // mu=
st be in classpath
                cache_server.create();
                cache_server.start();
+               START_COUNT++;
             }
             catch (Exception ex)
             {
@@ -35,41 +54,194 @@
             }
          }
       };
+      t.setDaemon(true);
+      t.start();
+      // give the cache server 2 secs to start up
+      TestingUtil.sleepThread(2000);
+   }
 =

-      Runtime.getRuntime().addShutdownHook(new Thread()
+   @AfterClass
+   public static void stopCacheServer()
+   {
+      if (cache_server !=3D null)
       {
-         public void run()
-         {
-            if (cache_server !=3D null)
-            {
-               System.out.println("Stopping TcpCacheServer");
-               cache_server.stop();
-            }
-         }
-      });
+         System.out.println("Stopping TcpCacheServer");
+         cache_server.stop();
+      }
+   }
 =

-      runner.start();
+   protected static void restartCacheServer()
+   {
+      stopCacheServer();
+      startCacheServer();
    }
 =

+   @Override
    public void testPartialLoadAndStore()
    {
       // do nothing
    }
 =

+   @Override
    public void testBuddyBackupStore()
    {
       // do nothing
    }
 =

-
    protected void configureCache() throws Exception
    {
       cache.getConfiguration().setCacheLoaderConfig(getSingleCacheLoaderCo=
nfig("",
-              "org.jboss.cache.loader.TcpDelegatingCacheLoader",
-              "host=3D127.0.0.1\nport=3D12121", false, true, false));
+            TcpDelegatingCacheLoader.class.getName(),
+            "host=3D127.0.0.1\nport=3D12121\ntimeout=3D" + TCP_CACHE_LOADE=
R_TIMEOUT_MS, false, true, false));
 =

       // give the tcp cache server time to start up
-      TestingUtil.sleepThread(2000);
+      //TestingUtil.sleepThread(2000);
    }
 =

+   // restart tests
+
+   public void testCacheServerRestartMidCall() throws Exception
+   {
+      CacheServerRestarter restarter =3D new CacheServerRestarter();
+      restarter.restart =3D true;
+      cache.addCacheListener(restarter);
+      int oldStartCount =3D START_COUNT;
+      // a restart of the cache server will happen before the cache loader=
 interceptor is called.
+      cache.put(FQN, "key", "value");
+
+      assert oldStartCount + 1 =3D=3D START_COUNT : "Cache server should h=
ave restarted!";
+      assert loader.get(FQN).equals(Collections.singletonMap("key", "value=
"));
+   }
+
+   public void testCacheServerDelayedRestartMidCall() throws Exception
+   {
+      CacheServerRestarter restarter =3D new CacheServerRestarter();
+      restarter.restart =3D false;
+      restarter.delayedRestart =3D true;
+      restarter.startAfter =3D CACHE_SERVER_RESTART_DELAY_MS;
+      cache.addCacheListener(restarter);
+      int oldStartCount =3D START_COUNT;
+
+      // the cache server will STOP before the cache laoder interceptor is=
 called.
+      // it will be restarted in a separate thread, startAfter millis late=
r.
+      // this should be less than the TcpCacheLoader timeout.
+      cache.put(FQN, "key", "value");
+
+      assert oldStartCount + 1 =3D=3D START_COUNT : "Cache server should h=
ave restarted!";
+      assert loader.get(FQN).equals(Collections.singletonMap("key", "value=
"));
+   }
+
+   public void testCacheServerTimeoutMidCall() throws Exception
+   {
+      CacheServerRestarter restarter =3D new CacheServerRestarter();
+      restarter.restart =3D false;
+      restarter.delayedRestart =3D true;
+      restarter.startAfter =3D -1;
+      cache.addCacheListener(restarter);
+      int oldStartCount =3D START_COUNT;
+
+      // the cache server will STOP before the cache laoder interceptor is=
 called.
+      // it will be restarted in a separate thread, startAfter millis late=
r.
+      // this should be less than the TcpCacheLoader timeout.
+      try
+      {
+         cache.put(FQN, "key", "value");
+         assert false : "Should have failed";
+      }
+      catch (CacheException expected)
+      {
+
+      }
+
+      assert oldStartCount =3D=3D START_COUNT : "Cache server should NOT h=
ave restarted!";
+      // start the TCP server again
+      startCacheServer();
+      assert loader.get(FQN) =3D=3D null;
+   }
+
+   public void testCacheServerRestartMidTransaction() throws Exception
+   {
+      int oldStartCount =3D START_COUNT;
+      cache.getTransactionManager().begin();
+      cache.put(FQN, "key", "value");
+      restartCacheServer();
+      cache.put(FQN, "key2", "value2");
+      cache.getTransactionManager().commit();
+
+      Map m =3D new HashMap();
+      m.put("key", "value");
+      m.put("key2", "value2");
+
+      assert oldStartCount + 1 =3D=3D START_COUNT : "Cache server should h=
ave restarted!";
+      assert loader.get(FQN).equals(m);
+   }
+
+   public void testCacheServerRestartMidTransactionAfterPrepare() throws E=
xception
+   {
+      int oldStartCount =3D START_COUNT;
+      cache.getTransactionManager().begin();
+      OrderedSynchronizationHandler.getInstance(cache.getTransactionManage=
r().getTransaction()).registerAtTail(
+            new Synchronization()
+            {
+
+               public void beforeCompletion()
+               {
+                  // this will be called after the cache's prepare() phase=
.  Restart the cache server.
+                  restartCacheServer();
+               }
+
+               public void afterCompletion(int i)
+               {
+                  // do nothing
+               }
+            }
+      );
+
+      cache.put(FQN, "key", "value");
+      cache.put(FQN, "key2", "value2");
+      cache.getTransactionManager().commit();
+
+      Map m =3D new HashMap();
+      m.put("key", "value");
+      m.put("key2", "value2");
+
+      assert oldStartCount + 1 =3D=3D START_COUNT : "Cache server should h=
ave restarted!";
+      assert loader.get(FQN).equals(m);
+
+   }
+
+   @CacheListener
+   public static class CacheServerRestarter
+   {
+      boolean restart;
+      boolean delayedRestart;
+      int startAfter;
+
+      @NodeCreated
+      public void restart(Event e)
+      {
+         if (e.isPre())
+         {
+            if (restart)
+            {
+               restartCacheServer();
+            }
+            else if (delayedRestart)
+            {
+               stopCacheServer();
+               new Thread()
+               {
+                  public void run()
+                  {
+                     if (startAfter > 0)
+                     {
+                        TestingUtil.sleepThread(startAfter);
+                        startCacheServer();
+                     }
+                  }
+               }.start();
+            }
+         }
+      }
+   }
 }
\ No newline at end of file


--===============1054216600764037282==--

From jbosscache-commits at lists.jboss.org Wed Jan  9 11:16:25 2008
Content-Type: multipart/mixed; boundary="===============6044425981902362022=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r5105 - in core/trunk/src:
 main/java/org/jboss/cache/marshall and 1 other directories.
Date: Wed, 09 Jan 2008 11:16:25 -0500
Message-ID: <E1JCdbN-0006hY-7d@committer01.frg.pub.inap.atl.jboss.com>

--===============6044425981902362022==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: manik.surtani(a)jboss.com
Date: 2008-01-09 11:16:24 -0500 (Wed, 09 Jan 2008)
New Revision: 5105

Added:
   core/trunk/src/test/java/org/jboss/cache/marshall/AbstractVersionAwareMa=
rshallerTest.java
Modified:
   core/trunk/src/main/java/org/jboss/cache/factories/ComponentRegistry.java
   core/trunk/src/main/java/org/jboss/cache/marshall/AbstractMarshaller.java
   core/trunk/src/main/java/org/jboss/cache/marshall/CacheMarshaller200.java
   core/trunk/src/main/java/org/jboss/cache/marshall/VersionAwareMarshaller=
.java
   core/trunk/src/test/java/org/jboss/cache/marshall/ActiveInactiveTest.java
   core/trunk/src/test/java/org/jboss/cache/marshall/CacheMarshaller200Test=
.java
   core/trunk/src/test/java/org/jboss/cache/marshall/CacheMarshallerTestBas=
e.java
   core/trunk/src/test/java/org/jboss/cache/marshall/VersionAwareMarshaller=
Test.java
Log:
JBCACHE-1232 - default class loader used by marshallers

Modified: core/trunk/src/main/java/org/jboss/cache/factories/ComponentRegis=
try.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/java/org/jboss/cache/factories/ComponentRegistry.ja=
va	2008-01-09 15:02:25 UTC (rev 5104)
+++ core/trunk/src/main/java/org/jboss/cache/factories/ComponentRegistry.ja=
va	2008-01-09 16:16:24 UTC (rev 5105)
@@ -85,6 +85,7 @@
    public ComponentRegistry(Configuration configuration)
    {
       // bootstrap.
+      registerComponent("deployerClassLoader", getClass().getClassLoader()=
, ClassLoader.class);
       registerComponent(this, ComponentRegistry.class);
       registerComponent(configuration, Configuration.class);
    }
@@ -554,6 +555,7 @@
    public void reset()
    {
       // the bootstrap classes
+      Component deployerClassLoader =3D componentLookup.get("deployerClass=
Loader");
       Component spi =3D componentLookup.get(CacheSPI.class.getName());
       Component impl =3D componentLookup.get(CacheImpl.class.getName());
       Component conf =3D componentLookup.get(Configuration.class.getName()=
);
@@ -561,12 +563,13 @@
 =

       componentLookup.clear();
 =

+      deployerClassLoader.changeState(CONSTRUCTED);
       spi.changeState(CONSTRUCTED);
       impl.changeState(CONSTRUCTED);
       conf.changeState(CONSTRUCTED);
       cr.changeState(CONSTRUCTED);
 =

-      bootstrap =3D new Bootstrap((CacheImpl) impl.instance, (CacheSPI) sp=
i.instance, (ComponentRegistry) cr.instance, (Configuration) conf.instance);
+      bootstrap =3D new Bootstrap((ClassLoader) deployerClassLoader.instan=
ce, (CacheImpl) impl.instance, (CacheSPI) spi.instance, (ComponentRegistry)=
 cr.instance, (Configuration) conf.instance);
 =

       overallState =3D null;
    }
@@ -904,9 +907,11 @@
       CacheSPI cacheSPI;
       ComponentRegistry componentRegistry;
       Configuration configuration;
+      private ClassLoader deployerClassLoader;
 =

-      Bootstrap(CacheImpl cacheImpl, CacheSPI cacheSPI, ComponentRegistry =
componentRegistry, Configuration configuration)
+      Bootstrap(ClassLoader deployerClassLoader, CacheImpl cacheImpl, Cach=
eSPI cacheSPI, ComponentRegistry componentRegistry, Configuration configura=
tion)
       {
+         this.deployerClassLoader =3D deployerClassLoader;
          this.cacheImpl =3D cacheImpl;
          this.cacheSPI =3D cacheSPI;
          this.componentRegistry =3D componentRegistry;
@@ -918,12 +923,14 @@
          return componentLookup.containsKey(Configuration.class.getName())=
 &&
                componentLookup.containsKey(CacheImpl.class.getName()) &&
                componentLookup.containsKey(CacheSPI.class.getName()) &&
-               componentLookup.containsKey(ComponentRegistry.class.getName=
());
+               componentLookup.containsKey(ComponentRegistry.class.getName=
()) &&
+               componentLookup.containsKey("deployerClassLoader");
       }
 =

       void bootstrap()
       {
          overallState =3D CONSTRUCTED;
+         registerComponent("deployerClassLoader", deployerClassLoader, Cla=
ssLoader.class);
          registerComponent(Configuration.class.getName(), configuration, C=
onfiguration.class);
          registerComponent(ComponentRegistry.class.getName(), componentReg=
istry, ComponentRegistry.class);
          registerComponent(CacheImpl.class.getName(), cacheImpl, CacheImpl=
.class);

Modified: core/trunk/src/main/java/org/jboss/cache/marshall/AbstractMarshal=
ler.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/java/org/jboss/cache/marshall/AbstractMarshaller.ja=
va	2008-01-09 15:02:25 UTC (rev 5104)
+++ core/trunk/src/main/java/org/jboss/cache/marshall/AbstractMarshaller.ja=
va	2008-01-09 16:16:24 UTC (rev 5105)
@@ -13,6 +13,7 @@
 import org.jboss.cache.RegionManager;
 import org.jboss.cache.buddyreplication.BuddyManager;
 import org.jboss.cache.config.Configuration;
+import org.jboss.cache.factories.annotations.ComponentName;
 import org.jboss.cache.factories.annotations.Inject;
 import org.jboss.cache.factories.annotations.Start;
 import org.jboss.cache.transaction.GlobalTransaction;
@@ -43,10 +44,12 @@
     */
    private Map<GlobalTransaction, Fqn> transactions =3D new ConcurrentHash=
Map<GlobalTransaction, Fqn>(16);
    protected Configuration configuration;
+   protected ClassLoader defaultClassLoader;
 =

    @Inject
-   void injectDependencies(RegionManager regionManager, Configuration conf=
iguration)
+   void injectDependencies(RegionManager regionManager, Configuration conf=
iguration, @ComponentName("deployerClassLoader")ClassLoader defaultClassLoa=
der)
    {
+      this.defaultClassLoader =3D defaultClassLoader;
       this.regionManager =3D regionManager;
       this.configuration =3D configuration;
    }

Modified: core/trunk/src/main/java/org/jboss/cache/marshall/CacheMarshaller=
200.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/java/org/jboss/cache/marshall/CacheMarshaller200.ja=
va	2008-01-09 15:02:25 UTC (rev 5104)
+++ core/trunk/src/main/java/org/jboss/cache/marshall/CacheMarshaller200.ja=
va	2008-01-09 16:16:24 UTC (rev 5105)
@@ -117,8 +117,7 @@
       {
          // not region based!
          if (trace) log.trace("Marshalling object " + o);
-         Map<Object, Integer> refMap =3D new HashMap<Object, Integer>();
-         marshallObject(o, out, refMap);
+         objectToObjectStream(o, out, null);
       }
    }
 =

@@ -131,7 +130,7 @@
       else
       {
          Map<Integer, Object> refMap =3D new HashMap<Integer, Object>();
-         Object retValue =3D unmarshallObject(in, refMap);
+         Object retValue =3D unmarshallObject(in, defaultClassLoader, refM=
ap);
          if (trace) log.trace("Unmarshalled object " + retValue);
          return retValue;
       }
@@ -141,12 +140,31 @@
    {
       if (trace) log.trace("Marshalling object " + o);
       Map<Object, Integer> refMap =3D new HashMap<Object, Integer>();
-      if (useRegionBasedMarshalling) // got to check again in case this me=
th is called directly
+      ClassLoader toUse =3D defaultClassLoader;
+      Thread current =3D Thread.currentThread();
+      ClassLoader old =3D current.getContextClassLoader();
+
+      try
       {
-         log.trace("Writing region " + region + " to stream");
-         marshallObject(region, out, refMap);
+         if (useRegionBasedMarshalling) // got to check again in case this=
 meth is called directly
+         {
+            log.trace("Writing region " + region + " to stream");
+            Region r =3D null;
+            if (region !=3D null) r =3D regionManager.getRegion(region, fa=
lse);
+            if (r !=3D null && r.getClassLoader() !=3D null) toUse =3D r.g=
etClassLoader();
+            current.setContextClassLoader(toUse);
+            marshallObject(region, out, refMap);
+         }
+         else
+         {
+            current.setContextClassLoader(toUse);
+         }
+         marshallObject(o, out, refMap);
       }
-      marshallObject(o, out, refMap);
+      finally
+      {
+         current.setContextClassLoader(old);
+      }
    }
 =

    protected Object objectFromObjectStreamRegionBased(ObjectInputStream in=
) throws Exception
@@ -177,7 +195,7 @@
       {
          if (log.isDebugEnabled())
             log.debug("Region does not exist for Fqn " + regionFqn + " - n=
ot using a context classloader.");
-         retValue =3D unmarshallObject(in, refMap);
+         retValue =3D unmarshallObject(in, defaultClassLoader, refMap);
       }
       else
       {

Modified: core/trunk/src/main/java/org/jboss/cache/marshall/VersionAwareMar=
shaller.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/java/org/jboss/cache/marshall/VersionAwareMarshalle=
r.java	2008-01-09 15:02:25 UTC (rev 5104)
+++ core/trunk/src/main/java/org/jboss/cache/marshall/VersionAwareMarshalle=
r.java	2008-01-09 16:16:24 UTC (rev 5105)
@@ -9,6 +9,8 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.jboss.cache.Fqn;
+import org.jboss.cache.factories.ComponentRegistry;
+import org.jboss.cache.factories.annotations.Inject;
 import org.jboss.cache.factories.annotations.Start;
 import org.jboss.cache.util.Util;
 =

@@ -31,16 +33,23 @@
  */
 public class VersionAwareMarshaller extends AbstractMarshaller
 {
-
    private static final Log log =3D LogFactory.getLog(VersionAwareMarshall=
er.class);
    private static final int VERSION_200 =3D 20;
    private static final int VERSION_210 =3D 21;
    private static final int CUSTOM_MARSHALLER =3D 999;
 =

+   private ComponentRegistry componentRegistry;
+
    Marshaller defaultMarshaller;
    Map<Integer, Marshaller> marshallers =3D new HashMap<Integer, Marshalle=
r>();
    private int versionInt;
 =

+   @Inject
+   void injectComponentRegistry(ComponentRegistry componentRegistry)
+   {
+      this.componentRegistry =3D componentRegistry;
+   }
+
    @Start
    public void initReplicationVersions()
    {
@@ -225,7 +234,7 @@
             {
                am =3D new CacheMarshaller200();
                marshaller =3D am;
-               am.injectDependencies(regionManager, configuration);
+               componentRegistry.wireDependencies(am);
                am.init();
                marshallers.put(VERSION_200, marshaller);
             }
@@ -240,7 +249,7 @@
             {
                am =3D new CacheMarshaller210();
                marshaller =3D am;
-               am.injectDependencies(regionManager, configuration);
+               componentRegistry.wireDependencies(am);
                am.init();
                marshallers.put(VERSION_210, marshaller);
             }

Added: core/trunk/src/test/java/org/jboss/cache/marshall/AbstractVersionAwa=
reMarshallerTest.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/test/java/org/jboss/cache/marshall/AbstractVersionAwareM=
arshallerTest.java	                        (rev 0)
+++ core/trunk/src/test/java/org/jboss/cache/marshall/AbstractVersionAwareM=
arshallerTest.java	2008-01-09 16:16:24 UTC (rev 5105)
@@ -0,0 +1,32 @@
+package org.jboss.cache.marshall;
+
+import org.jboss.cache.RegionManager;
+import org.jboss.cache.config.Configuration;
+import org.jboss.cache.factories.ComponentRegistry;
+
+/**
+ * @author Manik Surtani (<a href=3D"mailto:manik(a)jboss.org">manik(a)jbo=
ss.org</a>)
+ * @since 2.1.0
+ */
+public abstract class AbstractVersionAwareMarshallerTest
+{
+   protected VersionAwareMarshaller createVAM(String replVersion)
+   {
+      Configuration c =3D new Configuration();
+      c.setReplVersionString(replVersion);
+      return createVAM(c, new RegionManager());
+   }
+
+   protected VersionAwareMarshaller createVAM(Configuration c, RegionManag=
er rm)
+   {
+      ComponentRegistry cr =3D new ComponentRegistry(c);
+      cr.registerComponent(rm, RegionManager.class);
+      c.setReplVersionString(c.getReplVersionString());
+      VersionAwareMarshaller vam =3D new VersionAwareMarshaller();
+
+      cr.wireDependencies(vam);
+      vam.init();
+      vam.initReplicationVersions();
+      return vam;
+   }
+}

Modified: core/trunk/src/test/java/org/jboss/cache/marshall/ActiveInactiveT=
est.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/test/java/org/jboss/cache/marshall/ActiveInactiveTest.ja=
va	2008-01-09 15:02:25 UTC (rev 5104)
+++ core/trunk/src/test/java/org/jboss/cache/marshall/ActiveInactiveTest.ja=
va	2008-01-09 16:16:24 UTC (rev 5105)
@@ -27,8 +27,8 @@
  * @author <a href=3D"mailto://brian.stansberry(a)jboss.com">Brian Stansbe=
rry</a>
  * @version $Revision$
  */
-(a)Test(groups =3D {"functional"})
-public class ActiveInactiveTest
+(a)Test(groups =3D "functional")
+public class ActiveInactiveTest extends AbstractVersionAwareMarshallerTest
 {
    RegionManager rman;
    CacheSPI c;
@@ -166,10 +166,7 @@
       Configuration c =3D new Configuration();
       c.setUseRegionBasedMarshalling(true);
       c.setInactiveOnStartup(true);
-      VersionAwareMarshaller testee =3D new VersionAwareMarshaller();
-      testee.injectDependencies(rman, c);
-      testee.init();
-      testee.initReplicationVersions();
+      VersionAwareMarshaller testee =3D createVAM(c, rman);
 =

       byte[] callBytes =3D testee.objectToByteBuffer(replicate);
 =


Modified: core/trunk/src/test/java/org/jboss/cache/marshall/CacheMarshaller=
200Test.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/test/java/org/jboss/cache/marshall/CacheMarshaller200Tes=
t.java	2008-01-09 15:02:25 UTC (rev 5104)
+++ core/trunk/src/test/java/org/jboss/cache/marshall/CacheMarshaller200Tes=
t.java	2008-01-09 16:16:24 UTC (rev 5105)
@@ -37,7 +37,7 @@
       // need to test what's going on with =

       CacheMarshaller200 cm200 =3D new CacheMarshaller200();
       c.setUseRegionBasedMarshalling(true);
-      cm200.injectDependencies(new RegionManager(), c);
+      cm200.injectDependencies(new RegionManager(), c, getClass().getClass=
Loader());
       cm200.init();
       ByteArrayOutputStream baos =3D new ByteArrayOutputStream();
       ObjectOutputStream oos =3D new ObjectOutputStream(baos);
@@ -85,7 +85,7 @@
       RegionManager rm =3D new RegionManager();
       final CacheMarshaller200 cm200 =3D new CacheMarshaller200();
       c.setUseRegionBasedMarshalling(true);
-      cm200.injectDependencies(new RegionManager(), c);
+      cm200.injectDependencies(new RegionManager(), c, getClass().getClass=
Loader());
       cm200.init();
       ByteArrayOutputStream baos =3D new ByteArrayOutputStream();
       ObjectOutputStream oos =3D new ObjectOutputStream(baos);

Modified: core/trunk/src/test/java/org/jboss/cache/marshall/CacheMarshaller=
TestBase.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/test/java/org/jboss/cache/marshall/CacheMarshallerTestBa=
se.java	2008-01-09 15:02:25 UTC (rev 5104)
+++ core/trunk/src/test/java/org/jboss/cache/marshall/CacheMarshallerTestBa=
se.java	2008-01-09 16:16:24 UTC (rev 5105)
@@ -17,8 +17,8 @@
 import java.util.ArrayList;
 import java.util.List;
 =

-(a)Test(groups =3D {"functional"})
-public abstract class CacheMarshallerTestBase
+(a)Test(groups =3D "functional")
+public abstract class CacheMarshallerTestBase extends AbstractVersionAware=
MarshallerTest
 {
    protected String currentVersion;
    protected int currentVersionShort;
@@ -35,10 +35,7 @@
       c.setUseRegionBasedMarshalling(false);
       c.setInactiveOnStartup(false);
       c.setReplVersionString(currentVersion);
-      marshaller =3D new VersionAwareMarshaller();
-      marshaller.injectDependencies(regionManager, c);
-      marshaller.init();
-      marshaller.initReplicationVersions();
+      marshaller =3D createVAM(c, regionManager);
    }
 =

    @AfterMethod(alwaysRun =3D true)

Modified: core/trunk/src/test/java/org/jboss/cache/marshall/VersionAwareMar=
shallerTest.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/test/java/org/jboss/cache/marshall/VersionAwareMarshalle=
rTest.java	2008-01-09 15:02:25 UTC (rev 5104)
+++ core/trunk/src/test/java/org/jboss/cache/marshall/VersionAwareMarshalle=
rTest.java	2008-01-09 16:16:24 UTC (rev 5105)
@@ -6,9 +6,7 @@
  */
 package org.jboss.cache.marshall;
 =

-import org.jboss.cache.RegionManager;
 import org.jboss.cache.Version;
-import org.jboss.cache.config.Configuration;
 import static org.testng.AssertJUnit.assertEquals;
 import org.testng.annotations.Test;
 =

@@ -20,52 +18,41 @@
  * @author <a href=3D"mailto:manik(a)jboss.org">Manik Surtani (manik(a)jbo=
ss.org)</a>
  */
 @Test(groups =3D {"functional"})
-public class VersionAwareMarshallerTest
+public class VersionAwareMarshallerTest extends AbstractVersionAwareMarsha=
llerTest
 {
    public void testMarshallerSelection()
    {
-      VersionAwareMarshaller marshaller =3D createAndConfigure("2.1.0.GA");
+      VersionAwareMarshaller marshaller =3D createVAM("2.1.0.GA");
       assertEquals(CacheMarshaller210.class, marshaller.defaultMarshaller.=
getClass());
 =

-      marshaller =3D createAndConfigure("2.0.0.GA");
+      marshaller =3D createVAM("2.0.0.GA");
       assertEquals(CacheMarshaller200.class, marshaller.defaultMarshaller.=
getClass());
 =

-      marshaller =3D createAndConfigure("1.4.0.GA");
+      marshaller =3D createVAM("1.4.0.GA");
       assertEquals(CacheMarshaller210.class, marshaller.defaultMarshaller.=
getClass());
 =

-      marshaller =3D createAndConfigure("1.5.0.GA");
+      marshaller =3D createVAM("1.5.0.GA");
       assertEquals(CacheMarshaller210.class, marshaller.defaultMarshaller.=
getClass());
 =

-      marshaller =3D createAndConfigure("1.3.0.GA");
+      marshaller =3D createVAM("1.3.0.GA");
       assertEquals(CacheMarshaller210.class, marshaller.defaultMarshaller.=
getClass());
 =

-      marshaller =3D createAndConfigure("1.3.0.SP2");
+      marshaller =3D createVAM("1.3.0.SP2");
       assertEquals(CacheMarshaller210.class, marshaller.defaultMarshaller.=
getClass());
 =

-      marshaller =3D createAndConfigure("1.3.1.GA");
+      marshaller =3D createVAM("1.3.1.GA");
       assertEquals(CacheMarshaller210.class, marshaller.defaultMarshaller.=
getClass());
 =

-      marshaller =3D createAndConfigure("1.2.4.SP2");
+      marshaller =3D createVAM("1.2.4.SP2");
       assertEquals(CacheMarshaller210.class, marshaller.defaultMarshaller.=
getClass());
 =

-      marshaller =3D createAndConfigure("1.2.3");
+      marshaller =3D createVAM("1.2.3");
       assertEquals(CacheMarshaller210.class, marshaller.defaultMarshaller.=
getClass());
    }
 =

-   private VersionAwareMarshaller createAndConfigure(String replVersion)
-   {
-      Configuration c =3D new Configuration();
-      c.setReplVersionString(replVersion);
-      VersionAwareMarshaller vam =3D new VersionAwareMarshaller();
-      vam.injectDependencies(new RegionManager(), c);
-      vam.init();
-      vam.initReplicationVersions();
-      return vam;
-   }
-
    public void testVersionHeaderDefaultCurrent() throws Exception
    {
-      VersionAwareMarshaller marshaller =3D createAndConfigure(Version.get=
VersionString(Version.getVersionShort()));
+      VersionAwareMarshaller marshaller =3D createVAM(Version.getVersionSt=
ring(Version.getVersionShort()));
       byte[] bytes =3D marshaller.objectToByteBuffer("Hello");
 =

       // expect that this has been serialized using JBoss Serialization so=
 use this to get an OIS.
@@ -75,7 +62,7 @@
 =

    public void testVersionHeader200() throws Exception
    {
-      VersionAwareMarshaller marshaller =3D createAndConfigure("2.0.0.GA");
+      VersionAwareMarshaller marshaller =3D createVAM("2.0.0.GA");
       byte[] bytes =3D marshaller.objectToByteBuffer("Hello");
 =

       // expect that this has been serialized using JBoss Serialization so=
 use this to get an OIS.


--===============6044425981902362022==--

From jbosscache-commits at lists.jboss.org Wed Jan  9 11:30:06 2008
Content-Type: multipart/mixed; boundary="===============4182200902366212569=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r5106 -
 core/trunk/src/test/java/org/jboss/cache/statetransfer.
Date: Wed, 09 Jan 2008 11:30:06 -0500
Message-ID: <E1JCdoc-00018V-1H@committer01.frg.pub.inap.atl.jboss.com>

--===============4182200902366212569==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: manik.surtani(a)jboss.com
Date: 2008-01-09 11:30:05 -0500 (Wed, 09 Jan 2008)
New Revision: 5106

Modified:
   core/trunk/src/test/java/org/jboss/cache/statetransfer/ForcedStateTransf=
erTest.java
   core/trunk/src/test/java/org/jboss/cache/statetransfer/StateTransfer200T=
est.java
   core/trunk/src/test/java/org/jboss/cache/statetransfer/StateTransferTest=
Base.java
Log:
Modified test to verify JBCACHE-1226

Modified: core/trunk/src/test/java/org/jboss/cache/statetransfer/ForcedStat=
eTransferTest.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/test/java/org/jboss/cache/statetransfer/ForcedStateTrans=
ferTest.java	2008-01-09 16:16:24 UTC (rev 5105)
+++ core/trunk/src/test/java/org/jboss/cache/statetransfer/ForcedStateTrans=
ferTest.java	2008-01-09 16:30:05 UTC (rev 5106)
@@ -45,7 +45,8 @@
  * @author Brian Stansberry
  * @version $Revision$
  */
-(a)Test(groups =3D {"functional"}, enabled =3D false) // this has always b=
een disabled since 1.4.x.  See JBCACHE-315
+(a)Test(groups =3D {"functional"}, enabled =3D false)
+// this has always been disabled since 1.4.x.  See JBCACHE-315
 public class ForcedStateTransferTest extends StateTransferTestBase
 {
    /**
@@ -378,7 +379,7 @@
 =

       // Start threads that will do operations on the cache and then hang
       TxRunner[] runners =3D
-              initializeTransactionRunners(values, sender, "/LOCK", rollba=
ck);
+            initializeTransactionRunners(values, sender, "/LOCK", rollback=
);
 =

       // Create and start the cache that requests a state transfer
       CacheSPI<Object, Object> receiver =3D startReceiver(isolationLevel, =
false, false);
@@ -455,11 +456,11 @@
       while (!(runner.isAsleep()))
       {
          assertTrue(runner.getClass().getName() + " " + runner.value +
-                 " is alive", runner.isAlive());
+               " is alive", runner.isAlive());
          // Avoid hanging test fixture by only waiting 1 sec before failing
          assertFalse(runner.getClass().getName() + " " + runner.value +
-                 " has not timed out",
-                 (System.currentTimeMillis() - start) > 1000);
+               " has not timed out",
+               (System.currentTimeMillis() - start) > 1000);
       }
    }
 =

@@ -496,12 +497,12 @@
          if (allowValues)
          {
             assertEquals("Correct value in " + runners[i].fqn,
-                    runners[i].value, receiver.get(runners[i].fqn, "KEY"));
+                  runners[i].value, receiver.get(runners[i].fqn, "KEY"));
          }
          else
          {
             assertNull("No value in " + runners[i].fqn,
-                    receiver.get(runners[i].fqn, "KEY"));
+                  receiver.get(runners[i].fqn, "KEY"));
          }
       }
    }
@@ -595,7 +596,7 @@
 =

       String[] values =3D {"A", "B", "C"};
       SynchronizationTxRunner[] runners =3D
-              initializeSynchronizationTxRunners(values, sender, "/LOCK", =
hangBefore);
+            initializeSynchronizationTxRunners(values, sender, "/LOCK", ha=
ngBefore);
 =

       CacheSPI<Object, Object> receiver =3D startReceiver("REPEATABLE_READ=
", false, false);
 =

@@ -624,7 +625,7 @@
                                                                         bo=
olean hangBefore)
    {
       SynchronizationTxRunner[] runners =3D
-              new SynchronizationTxRunner[values.length];
+            new SynchronizationTxRunner[values.length];
       for (int i =3D 0; i < values.length; i++)
       {
          runners[i] =3D new SynchronizationTxRunner(sender, rootFqn, value=
s[i], hangBefore);
@@ -704,23 +705,23 @@
       // to catch; will create a separate locking test that shows it
       String[] val1 =3D {"A", "B", "C"};
       SynchronizationTxRunner[] after =3D
-              initializeSynchronizationTxRunners(val1, sender, rootFqn, fa=
lse);
+            initializeSynchronizationTxRunners(val1, sender, rootFqn, fals=
e);
 =

       String[] val2 =3D {"D", "E", "F"};
       SynchronizationTxRunner[] before =3D
-              initializeSynchronizationTxRunners(val2, sender, rootFqn, tr=
ue);
+            initializeSynchronizationTxRunners(val2, sender, rootFqn, true=
);
 =

       String[] val3 =3D {"G", "H", "I"};
       TxRunner[] active =3D
-              initializeTransactionRunners(val3, sender, rootFqn, false);
+            initializeTransactionRunners(val3, sender, rootFqn, false);
 =

       String[] val4 =3D {"J", "K", "L"};
       TxRunner[] rollback =3D
-              initializeTransactionRunners(val4, sender, rootFqn, true);
+            initializeTransactionRunners(val4, sender, rootFqn, true);
 =

       String[] val5 =3D {"M", "N", "O"};
       HangThreadRunner[] threads =3D
-              initializeHangThreadRunners(val5, sender, rootFqn);
+            initializeHangThreadRunners(val5, sender, rootFqn);
 =

       CacheSPI<Object, Object> receiver =3D startReceiver(isolationLevel, =
replSync, useMarshalling);
 =

@@ -779,10 +780,10 @@
                                                 boolean replSync,
                                                 boolean useMarshalling,
                                                 boolean startCache)
-           throws Exception
+         throws Exception
    {
       CacheSPI<Object, Object> result =3D super.createCache(cacheID, replS=
ync,
-              useMarshalling, false, false, false);
+            useMarshalling, false, false, false, true);
       result.getConfiguration().setStateRetrievalTimeout(0);
       result.getConfiguration().setLockAcquisitionTimeout(1000);
       result.getConfiguration().setIsolationLevel(isolationLevel);

Modified: core/trunk/src/test/java/org/jboss/cache/statetransfer/StateTrans=
fer200Test.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/test/java/org/jboss/cache/statetransfer/StateTransfer200=
Test.java	2008-01-09 16:16:24 UTC (rev 5105)
+++ core/trunk/src/test/java/org/jboss/cache/statetransfer/StateTransfer200=
Test.java	2008-01-09 16:30:05 UTC (rev 5106)
@@ -7,6 +7,7 @@
 =

 package org.jboss.cache.statetransfer;
 =

+import org.jboss.cache.Cache;
 import org.jboss.cache.CacheSPI;
 import org.jboss.cache.Fqn;
 import org.jboss.cache.Region;
@@ -41,7 +42,7 @@
 =

    public void testBuddyBackupExclusion() throws Exception
    {
-      CacheSPI<Object, Object> cache1 =3D createCache("cache1", false, fal=
se, false, false, false);
+      CacheSPI<Object, Object> cache1 =3D createCache("cache1", false, fal=
se, false, false, false, true);
 =

 =

       cache1.getConfiguration().setBuddyReplicationConfig(getBuddyConfig()=
);
@@ -64,7 +65,7 @@
 =

    public void testBuddyIntegration() throws Exception
    {
-      CacheSPI<Object, Object> cache1 =3D createCache("cache1", false, fal=
se, false, false, false);
+      CacheSPI<Object, Object> cache1 =3D createCache("cache1", false, fal=
se, false, false, false, true);
       cache1.getConfiguration().setBuddyReplicationConfig(getBuddyConfig()=
);
       cache1.start();
 =

@@ -75,7 +76,7 @@
       cache1.put(A_C, "name", JANE);
 =

       // now start up cache 2
-      CacheSPI<Object, Object> cache2 =3D createCache("cache2", false, fal=
se, false, false, false);
+      CacheSPI<Object, Object> cache2 =3D createCache("cache2", false, fal=
se, false, false, false, true);
       cache2.getConfiguration().setBuddyReplicationConfig(getBuddyConfig()=
);
       cache2.start();
 =

@@ -93,7 +94,7 @@
    @SuppressWarnings("null")
    public void testCacheLoaderFailure() throws Exception
    {
-      CacheSPI<Object, Object> cache1 =3D createCache("cache1", false, fal=
se, CorruptedFileCacheLoader.class.getName(), false, true);
+      CacheSPI<Object, Object> cache1 =3D createCache("cache1", false, fal=
se, CorruptedFileCacheLoader.class.getName(), false, true, true);
 =

       cache1.put(A_B, "name", JOE);
       cache1.put(A_B, "age", TWENTY);
@@ -103,7 +104,7 @@
       CacheSPI cache2 =3D null;
       try
       {
-         cache2 =3D createCache("cache2", false, false, true, false, false=
);
+         cache2 =3D createCache("cache2", false, false, true, false, false=
, true);
          cache2.create();
          cache2.start();
 =

@@ -360,7 +361,7 @@
             false, // async
             true, // use marshaller
             true, // use cacheloader
-            false, false);// don't start
+            false, false, true);// don't start
       ClassLoader cl1 =3D getClassLoader();
       cache1.getRegion(A, true).registerContextClassLoader(cl1);
       startCache(cache1);
@@ -376,7 +377,7 @@
             false, // async
             true, // use marshalling
             true, // use cacheloader
-            false, true);// start
+            false, true, true);// start
 =

       // Pause to give caches time to see each other
       TestingUtil.blockUntilViewsReceived(new CacheSPI[]{cache1, cache2}, =
60000);
@@ -401,6 +402,35 @@
 =

    }
 =

+   public void testStalePersistentState() throws Exception
+   {
+      CacheSPI c1 =3D createCache("1", true, false, true, false);
+      c1.put(A, "K", "V");
+
+      assert c1.get(A, "K").equals("V");
+      CacheLoader l1 =3D c1.getCacheLoaderManager().getCacheLoader();
+      assert l1 !=3D null;
+
+      assert l1.exists(A);
+      assert l1.get(A).get("K").equals("V");
+
+      // test persistence
+      c1.stop();
+
+      assert l1.exists(A);
+      assert l1.get(A).get("K").equals("V");
+
+      Cache c2 =3D createCache("2", true, false, true, false);
+
+      c2.put(B, "K", "V");
+
+      c1.start();
+
+      assert c1.get(B, "K").equals("V");
+      assert c1.get(A, "K") =3D=3D null;
+      assert !l1.exists(A);
+   }
+
    private Object createBen(ClassLoader loader) throws Exception
    {
       Class addrClazz =3D loader.loadClass(ADDRESS_CLASSNAME);

Modified: core/trunk/src/test/java/org/jboss/cache/statetransfer/StateTrans=
ferTestBase.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/test/java/org/jboss/cache/statetransfer/StateTransferTes=
tBase.java	2008-01-09 16:16:24 UTC (rev 5105)
+++ core/trunk/src/test/java/org/jboss/cache/statetransfer/StateTransferTes=
tBase.java	2008-01-09 16:30:05 UTC (rev 5106)
@@ -87,29 +87,38 @@
                                                   boolean useCacheLoader)
          throws Exception
    {
-      return createCache(cacheID, sync, useMarshalling, useCacheLoader, fa=
lse, true);
+      return createCache(cacheID, sync, useMarshalling, useCacheLoader, fa=
lse, true, true);
    }
 =

    protected CacheSPI<Object, Object> createCache(String cacheID,
                                                   boolean sync,
                                                   boolean useMarshalling,
+                                                  boolean useCacheLoader, =
boolean fetchPersistentState)
+         throws Exception
+   {
+      return createCache(cacheID, sync, useMarshalling, useCacheLoader, fa=
lse, true, fetchPersistentState);
+   }
+
+   protected CacheSPI<Object, Object> createCache(String cacheID,
+                                                  boolean sync,
+                                                  boolean useMarshalling,
                                                   boolean useCacheLoader,
                                                   boolean cacheLoaderAsync,
-                                                  boolean startCache)
+                                                  boolean startCache, bool=
ean fetchPersistentState)
          throws Exception
    {
       if (useCacheLoader)
       {
-         return createCache(cacheID, sync, useMarshalling, "org.jboss.cach=
e.loader.FileCacheLoader", cacheLoaderAsync, startCache);
+         return createCache(cacheID, sync, useMarshalling, "org.jboss.cach=
e.loader.FileCacheLoader", cacheLoaderAsync, startCache, fetchPersistentSta=
te);
       }
       else
       {
-         return createCache(cacheID, sync, useMarshalling, null, cacheLoad=
erAsync, startCache);
+         return createCache(cacheID, sync, useMarshalling, null, cacheLoad=
erAsync, startCache, fetchPersistentState);
       }
    }
 =

    protected CacheSPI<Object, Object> createCache(String cacheID, boolean =
sync, boolean useMarshalling, String cacheLoaderClass,
-                                                  boolean cacheLoaderAsync=
, boolean startCache) throws Exception
+                                                  boolean cacheLoaderAsync=
, boolean startCache, boolean fetchPersistentState) throws Exception
    {
       if (caches.get(cacheID) !=3D null)
       {
@@ -134,7 +143,7 @@
       }
       if (cacheLoaderClass !=3D null && cacheLoaderClass.length() > 0)
       {
-         configureCacheLoader(c, cacheLoaderClass, cacheID, cacheLoaderAsy=
nc);
+         configureCacheLoader(c, cacheLoaderClass, cacheID, cacheLoaderAsy=
nc, fetchPersistentState);
       }
       //      tree.setConfiguration(c);
       //c.setLockAcquisitionTimeout(60000);
@@ -201,11 +210,11 @@
                                        boolean async)
          throws Exception
    {
-      configureCacheLoader(c, "org.jboss.cache.loader.FileCacheLoader", ca=
cheID, async);
+      configureCacheLoader(c, "org.jboss.cache.loader.FileCacheLoader", ca=
cheID, async, true);
    }
 =

    protected void configureCacheLoader(Configuration c, String cacheloader=
Class, String cacheID,
-                                       boolean async) throws Exception
+                                       boolean async, boolean fetchPersist=
entState) throws Exception
    {
       if (cacheloaderClass !=3D null)
       {
@@ -243,21 +252,21 @@
 =

             tmp_location =3D escapeWindowsPath(tmp_location);
             String props =3D "location =3D " + tmp_location + "\n";
-            c.setCacheLoaderConfig(getSingleCacheLoaderConfig("", cacheloa=
derClass, props, async, true, false));
+            c.setCacheLoaderConfig(getSingleCacheLoaderConfig("", cacheloa=
derClass, props, async, fetchPersistentState, false));
          }
       }
    }
 =

    protected void initialStateTferWithLoaderTest(String cacheLoaderClass1,=
 String cacheLoaderClass2, boolean asyncLoader) throws Exception
    {
-      CacheSPI<Object, Object> cache1 =3D createCache("cache1", false, fal=
se, cacheLoaderClass1, false, true);
+      CacheSPI<Object, Object> cache1 =3D createCache("cache1", false, fal=
se, cacheLoaderClass1, false, true, true);
 =

       cache1.put(A_B, "name", JOE);
       cache1.put(A_B, "age", TWENTY);
       cache1.put(A_C, "name", BOB);
       cache1.put(A_C, "age", FORTY);
 =

-      CacheSPI<Object, Object> cache2 =3D createCache("cache2", false, fal=
se, cacheLoaderClass2, asyncLoader, false);
+      CacheSPI<Object, Object> cache2 =3D createCache("cache2", false, fal=
se, cacheLoaderClass2, asyncLoader, false, true);
 =

       cache2.start();
 =



--===============4182200902366212569==--

From jbosscache-commits at lists.jboss.org Wed Jan  9 17:24:50 2008
Content-Type: multipart/mixed; boundary="===============5753176497862985702=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r5107 -
 core/trunk/src/test/java/org/jboss/cache/notifications.
Date: Wed, 09 Jan 2008 17:24:49 -0500
Message-ID: <E1JCjLt-0003Wt-Tn@committer01.frg.pub.inap.atl.jboss.com>

--===============5753176497862985702==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: manik.surtani(a)jboss.com
Date: 2008-01-09 17:24:49 -0500 (Wed, 09 Jan 2008)
New Revision: 5107

Modified:
   core/trunk/src/test/java/org/jboss/cache/notifications/RemoteCacheListen=
erTest.java
Log:
Fixed broken test

Modified: core/trunk/src/test/java/org/jboss/cache/notifications/RemoteCach=
eListenerTest.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/test/java/org/jboss/cache/notifications/RemoteCacheListe=
nerTest.java	2008-01-09 16:30:05 UTC (rev 5106)
+++ core/trunk/src/test/java/org/jboss/cache/notifications/RemoteCacheListe=
nerTest.java	2008-01-09 22:24:49 UTC (rev 5107)
@@ -658,6 +658,10 @@
       List<Event> expected =3D new ArrayList<Event>();
       // public EventImpl(boolean pre, Cache cache, ModificationType modif=
icationType, Map data, Fqn fqn,
       // Transaction transaction, boolean originLocal, Fqn targetFqn, bool=
ean successful, View newView, Type type)
+      if (optLocking)
+         expected.add(new EventImpl(false, cache2, null, null, null, null,=
 true, null, false, null, TRANSACTION_REGISTERED));
+      if (optLocking)
+         expected.add(new EventImpl(false, cache2, null, null, null, null,=
 true, null, true, null, TRANSACTION_COMPLETED));
 =

       expected.add(new EventImpl(true, cache2, null, null, Fqn.ROOT, null,=
 false, null, false, null, NODE_CREATED));
       expected.add(new EventImpl(false, cache2, null, null, Fqn.ROOT, null=
, false, null, false, null, NODE_CREATED));
@@ -672,6 +676,9 @@
       expected.add(new EventImpl(true, cache2, NodeModifiedEvent.Modificat=
ionType.PUT_MAP, Collections.emptyMap(), fqnB, null, false, null, false, nu=
ll, NODE_MODIFIED));
       expected.add(new EventImpl(false, cache2, NodeModifiedEvent.Modifica=
tionType.PUT_MAP, data, fqnB, null, false, null, false, null, NODE_MODIFIED=
));
 =

+
+      scrubTransactions(expected);
+      if (optLocking) eventLog2.scrubImplicitTransactions();
       assertEquals(expected, eventLog2.events);
    }
 =



--===============5753176497862985702==--

From jbosscache-commits at lists.jboss.org Thu Jan 10 06:28:01 2008
Content-Type: multipart/mixed; boundary="===============1359729987049431733=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r5108 -
 benchmarks/benchmark-fwk/trunk/src/org/cachebench/warmup.
Date: Thu, 10 Jan 2008 06:28:01 -0500
Message-ID: <E1JCvZp-0005VA-Nx@committer01.frg.pub.inap.atl.jboss.com>

--===============1359729987049431733==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: mircea.markus
Date: 2008-01-10 06:28:01 -0500 (Thu, 10 Jan 2008)
New Revision: 5108

Modified:
   benchmarks/benchmark-fwk/trunk/src/org/cachebench/warmup/CacheWarmup.java
   benchmarks/benchmark-fwk/trunk/src/org/cachebench/warmup/PutGetCacheWarm=
up.java
Log:
warmup does not throw any exception now

Modified: benchmarks/benchmark-fwk/trunk/src/org/cachebench/warmup/CacheWar=
mup.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- benchmarks/benchmark-fwk/trunk/src/org/cachebench/warmup/CacheWarmup.ja=
va	2008-01-09 22:24:49 UTC (rev 5107)
+++ benchmarks/benchmark-fwk/trunk/src/org/cachebench/warmup/CacheWarmup.ja=
va	2008-01-10 11:28:01 UTC (rev 5108)
@@ -33,12 +33,24 @@
    /**
     * Calls {@link #performWarmupOperations(CacheWrapper)} amd clears the =
cache.
     */
-   public final void warmup(CacheWrapper cacheWrapper) throws Exception
+   public final void warmup(CacheWrapper cacheWrapper)
    {
       long startTime =3D System.currentTimeMillis();
-      performWarmupOperations(cacheWrapper);
+      try
+      {
+         performWarmupOperations(cacheWrapper);
+      } catch (Exception e)
+      {
+         log.warn("Received exception durring cache warmup");
+      }
       log.info("The warmup took: " + ((System.currentTimeMillis() - startT=
ime) / 1000) + " seconds." );
-      cacheWrapper.empty();
+      try
+      {
+         cacheWrapper.empty();
+      } catch (Exception e)
+      {
+         log.warn("Received exception durring cache warmup");
+      }
    }
 =

    public abstract void performWarmupOperations(CacheWrapper wrapper) thro=
ws Exception;

Modified: benchmarks/benchmark-fwk/trunk/src/org/cachebench/warmup/PutGetCa=
cheWarmup.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- benchmarks/benchmark-fwk/trunk/src/org/cachebench/warmup/PutGetCacheWar=
mup.java	2008-01-09 22:24:49 UTC (rev 5107)
+++ benchmarks/benchmark-fwk/trunk/src/org/cachebench/warmup/PutGetCacheWar=
mup.java	2008-01-10 11:28:01 UTC (rev 5108)
@@ -20,7 +20,13 @@
       log.info("Cache launched, performing " + opCount + " put and get ope=
rations ");
       for (int i =3D 0; i < opCount; i++)
       {
-         wrapper.put(String.valueOf(opCount), String.valueOf(opCount));
+         try
+         {
+            wrapper.put(String.valueOf(opCount), String.valueOf(opCount));
+         } catch (Exception e)
+         {
+            log.warn("Exception on cache warmup:", e);
+         }
       }
 =

       for (int i =3D 0; i < opCount; i++)


--===============1359729987049431733==--

From jbosscache-commits at lists.jboss.org Thu Jan 10 06:36:55 2008
Content-Type: multipart/mixed; boundary="===============8040943898658871138=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r5109 -
 benchmarks/benchmark-fwk/trunk/src/org/cachebench/warmup.
Date: Thu, 10 Jan 2008 06:36:51 -0500
Message-ID: <E1JCviN-0006Xn-R2@committer01.frg.pub.inap.atl.jboss.com>

--===============8040943898658871138==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: mircea.markus
Date: 2008-01-10 06:36:51 -0500 (Thu, 10 Jan 2008)
New Revision: 5109

Modified:
   benchmarks/benchmark-fwk/trunk/src/org/cachebench/warmup/CacheWarmup.java
   benchmarks/benchmark-fwk/trunk/src/org/cachebench/warmup/PutGetCacheWarm=
up.java
Log:


Modified: benchmarks/benchmark-fwk/trunk/src/org/cachebench/warmup/CacheWar=
mup.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- benchmarks/benchmark-fwk/trunk/src/org/cachebench/warmup/CacheWarmup.ja=
va	2008-01-10 11:28:01 UTC (rev 5108)
+++ benchmarks/benchmark-fwk/trunk/src/org/cachebench/warmup/CacheWarmup.ja=
va	2008-01-10 11:36:51 UTC (rev 5109)
@@ -41,7 +41,7 @@
          performWarmupOperations(cacheWrapper);
       } catch (Exception e)
       {
-         log.warn("Received exception durring cache warmup");
+         log.warn("Received exception durring cache warmup" , e.getMessage=
());
       }
       log.info("The warmup took: " + ((System.currentTimeMillis() - startT=
ime) / 1000) + " seconds." );
       try

Modified: benchmarks/benchmark-fwk/trunk/src/org/cachebench/warmup/PutGetCa=
cheWarmup.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- benchmarks/benchmark-fwk/trunk/src/org/cachebench/warmup/PutGetCacheWar=
mup.java	2008-01-10 11:28:01 UTC (rev 5108)
+++ benchmarks/benchmark-fwk/trunk/src/org/cachebench/warmup/PutGetCacheWar=
mup.java	2008-01-10 11:36:51 UTC (rev 5109)
@@ -25,7 +25,7 @@
             wrapper.put(String.valueOf(opCount), String.valueOf(opCount));
          } catch (Exception e)
          {
-            log.warn("Exception on cache warmup:", e);
+            log.warn("Exception on cache warmup:", e.getMessage());
          }
       }
 =



--===============8040943898658871138==--

From jbosscache-commits at lists.jboss.org Thu Jan 10 06:38:04 2008
Content-Type: multipart/mixed; boundary="===============8130660273046281145=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r5110 -
 benchmarks/benchmark-fwk/trunk/src/org/cachebench/warmup.
Date: Thu, 10 Jan 2008 06:38:01 -0500
Message-ID: <E1JCvjV-0006aE-LD@committer01.frg.pub.inap.atl.jboss.com>

--===============8130660273046281145==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: mircea.markus
Date: 2008-01-10 06:38:01 -0500 (Thu, 10 Jan 2008)
New Revision: 5110

Modified:
   benchmarks/benchmark-fwk/trunk/src/org/cachebench/warmup/CacheWarmup.java
   benchmarks/benchmark-fwk/trunk/src/org/cachebench/warmup/PutGetCacheWarm=
up.java
Log:


Modified: benchmarks/benchmark-fwk/trunk/src/org/cachebench/warmup/CacheWar=
mup.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- benchmarks/benchmark-fwk/trunk/src/org/cachebench/warmup/CacheWarmup.ja=
va	2008-01-10 11:36:51 UTC (rev 5109)
+++ benchmarks/benchmark-fwk/trunk/src/org/cachebench/warmup/CacheWarmup.ja=
va	2008-01-10 11:38:01 UTC (rev 5110)
@@ -41,7 +41,7 @@
          performWarmupOperations(cacheWrapper);
       } catch (Exception e)
       {
-         log.warn("Received exception durring cache warmup" , e.getMessage=
());
+         log.warn("Received exception durring cache warmup" + e.getMessage=
());
       }
       log.info("The warmup took: " + ((System.currentTimeMillis() - startT=
ime) / 1000) + " seconds." );
       try

Modified: benchmarks/benchmark-fwk/trunk/src/org/cachebench/warmup/PutGetCa=
cheWarmup.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- benchmarks/benchmark-fwk/trunk/src/org/cachebench/warmup/PutGetCacheWar=
mup.java	2008-01-10 11:36:51 UTC (rev 5109)
+++ benchmarks/benchmark-fwk/trunk/src/org/cachebench/warmup/PutGetCacheWar=
mup.java	2008-01-10 11:38:01 UTC (rev 5110)
@@ -25,7 +25,7 @@
             wrapper.put(String.valueOf(opCount), String.valueOf(opCount));
          } catch (Exception e)
          {
-            log.warn("Exception on cache warmup:", e.getMessage());
+            log.warn("Exception on cache warmup:" + e.getMessage());
          }
       }
 =



--===============8130660273046281145==--

From jbosscache-commits at lists.jboss.org Thu Jan 10 09:30:44 2008
Content-Type: multipart/mixed; boundary="===============6414295233072030918=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r5111 - in
 benchmarks/benchmark-fwk/trunk: src/org/cachebench/smartfrog and 1 other
 directory.
Date: Thu, 10 Jan 2008 09:30:43 -0500
Message-ID: <E1JCyQd-0007xc-RQ@committer01.frg.pub.inap.atl.jboss.com>

--===============6414295233072030918==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: mircea.markus
Date: 2008-01-10 09:30:43 -0500 (Thu, 10 Jan 2008)
New Revision: 5111

Modified:
   benchmarks/benchmark-fwk/trunk/runNode.sh
   benchmarks/benchmark-fwk/trunk/src/org/cachebench/smartfrog/CacheBenchma=
rkPrim.java
Log:
added extra logging

Modified: benchmarks/benchmark-fwk/trunk/runNode.sh
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- benchmarks/benchmark-fwk/trunk/runNode.sh	2008-01-10 11:38:01 UTC (rev =
5110)
+++ benchmarks/benchmark-fwk/trunk/runNode.sh	2008-01-10 14:30:43 UTC (rev =
5111)
@@ -14,7 +14,7 @@
    echo "testConfig       : must be one of the directories names under 'ca=
che-products'"
    echo "cluster size"
    echo "Ex: ./runNode.sh 0 jbosscache-2.0.0 3"
-   exit 0
+   exit 1
 fi
 =

 export SYS_PROPS=3D"-DcurrentIndex=3D$1 -Djava.net.preferIPv4Stack=3D$pref=
erIPv4Stack"
@@ -40,9 +40,10 @@
 if [ -f $configFile ]
 then
   . $configFile
+  echo "Calling $configFile exit code is $?"
 else
   echo could not find config file $configFile, exit!
-  exit 1
+  exit 2
 fi
 =

 TO_EXECUTE=3D"java $JVM_OPTIONS -cp $CLASSPATH org.cachebench.CacheBenchma=
rkRunner"

Modified: benchmarks/benchmark-fwk/trunk/src/org/cachebench/smartfrog/Cache=
BenchmarkPrim.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- benchmarks/benchmark-fwk/trunk/src/org/cachebench/smartfrog/CacheBenchm=
arkPrim.java	2008-01-10 11:38:01 UTC (rev 5110)
+++ benchmarks/benchmark-fwk/trunk/src/org/cachebench/smartfrog/CacheBenchm=
arkPrim.java	2008-01-10 14:30:43 UTC (rev 5111)
@@ -110,8 +110,9 @@
          }
          bufferedReader.close();
          int exitValue =3D process.waitFor();
-         if (exitValue !=3D 0)
+         if (exitValue !=3D 0 )
          {
+            log.info("Exiting with exit code: " + exitValue);
             sfTerminate(new TerminationRecord(TerminationRecord.ABNORMAL, =
"we have an NOT zero exit code: " + exitValue
                   + ", originated from " + getNodeDescription(), null));
          }


--===============6414295233072030918==--

From jbosscache-commits at lists.jboss.org Thu Jan 10 09:32:02 2008
Content-Type: multipart/mixed; boundary="===============7749559212535405353=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r5112 -
 benchmarks/benchmark-fwk/trunk.
Date: Thu, 10 Jan 2008 09:32:02 -0500
Message-ID: <E1JCyRu-0007zc-O9@committer01.frg.pub.inap.atl.jboss.com>

--===============7749559212535405353==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: mircea.markus
Date: 2008-01-10 09:32:02 -0500 (Thu, 10 Jan 2008)
New Revision: 5112

Modified:
   benchmarks/benchmark-fwk/trunk/runNode.sh
Log:
added extra logging

Modified: benchmarks/benchmark-fwk/trunk/runNode.sh
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- benchmarks/benchmark-fwk/trunk/runNode.sh	2008-01-10 14:30:43 UTC (rev =
5111)
+++ benchmarks/benchmark-fwk/trunk/runNode.sh	2008-01-10 14:32:02 UTC (rev =
5112)
@@ -50,4 +50,5 @@
 echo executing:
 echo $TO_EXECUTE
 java $JVM_OPTIONS -cp $CLASSPATH org.cachebench.CacheBenchmarkRunner
+echo "Return code from benchmark runner is $?"
 =



--===============7749559212535405353==--

From jbosscache-commits at lists.jboss.org Thu Jan 10 09:48:26 2008
Content-Type: multipart/mixed; boundary="===============6298870710868603636=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r5113 -
 benchmarks/benchmark-fwk/trunk/src/org/cachebench/smartfrog.
Date: Thu, 10 Jan 2008 09:48:25 -0500
Message-ID: <E1JCyhl-0002SH-Qx@committer01.frg.pub.inap.atl.jboss.com>

--===============6298870710868603636==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: mircea.markus
Date: 2008-01-10 09:48:25 -0500 (Thu, 10 Jan 2008)
New Revision: 5113

Modified:
   benchmarks/benchmark-fwk/trunk/src/org/cachebench/smartfrog/CacheBenchma=
rkPrim.java
Log:
added extra logging

Modified: benchmarks/benchmark-fwk/trunk/src/org/cachebench/smartfrog/Cache=
BenchmarkPrim.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- benchmarks/benchmark-fwk/trunk/src/org/cachebench/smartfrog/CacheBenchm=
arkPrim.java	2008-01-10 14:32:02 UTC (rev 5112)
+++ benchmarks/benchmark-fwk/trunk/src/org/cachebench/smartfrog/CacheBenchm=
arkPrim.java	2008-01-10 14:48:25 UTC (rev 5113)
@@ -112,9 +112,7 @@
          int exitValue =3D process.waitFor();
          if (exitValue !=3D 0 )
          {
-            log.info("Exiting with exit code: " + exitValue);
-            sfTerminate(new TerminationRecord(TerminationRecord.ABNORMAL, =
"we have an NOT zero exit code: " + exitValue
-                  + ", originated from " + getNodeDescription(), null));
+             log.warn("Script exited with code: " + exitValue);
          }
 =

          correctTerminationOfTestsIfNeeded();


--===============6298870710868603636==--

From jbosscache-commits at lists.jboss.org Thu Jan 10 10:55:35 2008
Content-Type: multipart/mixed; boundary="===============8817137217163892033=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r5114 -
 core/trunk/src/main/java/org/jboss/cache/factories.
Date: Thu, 10 Jan 2008 10:55:35 -0500
Message-ID: <E1JCzkl-0007iy-Ot@committer01.frg.pub.inap.atl.jboss.com>

--===============8817137217163892033==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: manik.surtani(a)jboss.com
Date: 2008-01-10 10:55:35 -0500 (Thu, 10 Jan 2008)
New Revision: 5114

Modified:
   core/trunk/src/main/java/org/jboss/cache/factories/ComponentRegistry.java
Log:
Only wire if we are "moving up"

Modified: core/trunk/src/main/java/org/jboss/cache/factories/ComponentRegis=
try.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/java/org/jboss/cache/factories/ComponentRegistry.ja=
va	2008-01-10 14:48:25 UTC (rev 5113)
+++ core/trunk/src/main/java/org/jboss/cache/factories/ComponentRegistry.ja=
va	2008-01-10 15:55:35 UTC (rev 5114)
@@ -809,7 +809,7 @@
                   stop();
                   break;
                case WIRED:
-                  wire();
+                  if (increase) wire();
                   break;
                case STARTED:
                   start();


--===============8817137217163892033==--

From jbosscache-commits at lists.jboss.org Thu Jan 10 10:56:23 2008
Content-Type: multipart/mixed; boundary="===============6453131498494070336=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r5115 -
 core/trunk/src/main/docbook/userguide/en/modules.
Date: Thu, 10 Jan 2008 10:56:22 -0500
Message-ID: <E1JCzlW-0007jz-Pz@committer01.frg.pub.inap.atl.jboss.com>

--===============6453131498494070336==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: manik.surtani(a)jboss.com
Date: 2008-01-10 10:56:22 -0500 (Thu, 10 Jan 2008)
New Revision: 5115

Modified:
   core/trunk/src/main/docbook/userguide/en/modules/cache_loaders.xml
   core/trunk/src/main/docbook/userguide/en/modules/configuration_reference=
.xml
Log:
Documented TCP Cacheloader shutdown hook and marshalled value config elemen=
ts

Modified: core/trunk/src/main/docbook/userguide/en/modules/cache_loaders.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/docbook/userguide/en/modules/cache_loaders.xml	2008=
-01-10 15:55:35 UTC (rev 5114)
+++ core/trunk/src/main/docbook/userguide/en/modules/cache_loaders.xml	2008=
-01-10 15:56:22 UTC (rev 5115)
@@ -35,7 +35,6 @@
          </mediaobject>
       </figure>
 =

-
       <para>The interaction between JBoss Cache and a
          <literal>CacheLoader</literal>
          implementation is as follows. When
@@ -931,11 +930,19 @@
             dependency injection).
          </para>
 =

-         <para>The TcpDelegatingCacheLoader is configured with the host and
-            port of the remote TcpCacheServer, and uses this to communicat=
e to
-            it.
+         <para>
+            As of JBoss Cache 2.1.0, the TcpDelegatingCacheLoader transpar=
ently handles reconnects if the connection
+            to the TcpCacheServer is lost.
          </para>
 =

+         <para>The TcpDelegatingCacheLoader is configured with the host an=
d port of the remote TcpCacheServer, and uses this to communicate to
+            it.  In addition, 2 new optional parameters are used to contro=
l transparent reconnecting to the TcpCacheServer.
+            The <literal>timeout</literal> property (defaults to 5000) spe=
cifies the length of time the cache loader must continue
+            retrying to connect to the TcpCacheServer before giving up and=
 throwing an exception.  The <literal>reconnectWaitTime</literal>
+            (defaults to 500) is how long the cache loader should wait bef=
ore attempting a reconnect if it detects a communication failure.
+            The last two parameters can be used to add a level of fault to=
lerance to the cache loader, do deal with TcpCacheServer restarts.
+         </para>
+
          <para>The configuration looks as follows:</para>
 =

          <programlisting>
@@ -947,6 +954,8 @@
       <properties>
          host=3DmyRemoteServer
          port=3D7500
+         timeout=3D10000
+         reconnectWaitTime=3D250
       </properties>
    </cacheloader>
 </config>

Modified: core/trunk/src/main/docbook/userguide/en/modules/configuration_re=
ference.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/docbook/userguide/en/modules/configuration_referenc=
e.xml	2008-01-10 15:55:35 UTC (rev 5114)
+++ core/trunk/src/main/docbook/userguide/en/modules/configuration_referenc=
e.xml	2008-01-10 15:56:22 UTC (rev 5115)
@@ -116,7 +116,13 @@
       <!-- Max number of milliseconds to wait for a lock acquisition -->
       <attribute name=3D"LockAcquisitionTimeout">15000</attribute>
 =

+      <!-- Shutdown hook behavior.  Valid choices are: DEFAULT, REGISTER a=
nd DONT_REGISTER.
+           If this element is omitted, DEFAULT is used.  -->
+      <attribute name=3D"ShutdownHookBehavior">DEFAULT</attribute>
 =

+      <!-- Enables or disables lazy unmarshalling.  If omitted, the defaul=
t is that lazy unmarshalling is enabled. -->
+      <attribute name=3D"UseLazyDeserialization">true</attribute>      =

+
       <!-- Specific eviction policy configurations. This is LRU -->
       <attribute name=3D"EvictionConfig">
          <config>
@@ -656,6 +662,35 @@
                      </para>
                   </entry>
                </row>
+
+               <row>
+                  <entry>
+                     <para>ShutdownHookBehavior</para>
+                  </entry>
+
+                  <entry>
+                     <para>An optional parameter that controls whether JBo=
ss Cache registers a shutdown hook with the JVM
+                        runtime.  Allowed values are <literal>DEFAULT</lit=
eral>, <literal>REGISTER</literal> and
+                        <literal>DONT_REGISTER</literal>.  <literal>REGIST=
ER</literal> and <literal>DONT_REGISTER</literal>
+                        forces or suppresses the registration of a shutdow=
n hook, respectively, and <literal>DEFAULT</literal>
+                        registers one if an MBean server (other than the J=
DK default) cannot be found and it is assumed that the
+                        cache is running in a managed environment.  The de=
fault if unspecified is, as expected, <literal>DEFAULT</literal>.
+                     </para>
+                  </entry>
+               </row>
+
+               <row>
+                  <entry>
+                     <para>UseLazyDeserialization</para>
+                  </entry>
+
+                  <entry>
+                     <para>An optional parameter that can be used to enabl=
e or disable the use of lazy deserialization
+                        for cached objects. Defaults to <literal>true</lit=
eral>.
+                     </para>
+                  </entry>
+               </row>
+
             </tbody>
          </tgroup>
       </informaltable>


--===============6453131498494070336==--

From jbosscache-commits at lists.jboss.org Fri Jan 11 09:07:11 2008
Content-Type: multipart/mixed; boundary="===============8891328927509702696=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r5116 - in core/trunk/src:
 test/java/org/jboss/cache/factories and 1 other directory.
Date: Fri, 11 Jan 2008 09:07:11 -0500
Message-ID: <E1JDKXP-0005tM-3p@committer01.frg.pub.inap.atl.jboss.com>

--===============8891328927509702696==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: manik.surtani(a)jboss.com
Date: 2008-01-11 09:07:10 -0500 (Fri, 11 Jan 2008)
New Revision: 5116

Added:
   core/trunk/src/test/java/org/jboss/cache/factories/LateConfigurationTest=
.java
Modified:
   core/trunk/src/main/java/org/jboss/cache/CacheImpl.java
Log:
Ensure that late configuration of transaction managers, etc are allowed.  A=
dded test for tis.

Modified: core/trunk/src/main/java/org/jboss/cache/CacheImpl.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/java/org/jboss/cache/CacheImpl.java	2008-01-10 15:5=
6:22 UTC (rev 5115)
+++ core/trunk/src/main/java/org/jboss/cache/CacheImpl.java	2008-01-11 14:0=
7:10 UTC (rev 5116)
@@ -549,6 +549,16 @@
       }
    }
 =

+   private void removeConfigurationDependentComponents()
+   {
+      // remove the Interceptor.class component though, since it may perta=
in to an old config
+      componentRegistry.unregisterComponent(Interceptor.class);
+      componentRegistry.unregisterComponent(Marshaller.class);
+      componentRegistry.unregisterComponent(TransactionManager.class);
+      componentRegistry.unregisterComponent(BuddyManager.class);
+      componentRegistry.unregisterComponent(CacheLoaderManager.class);
+   }
+
    /**
     * The actual start implementation.
     *
@@ -559,9 +569,10 @@
    {
       // re-wire all dependencies in case stuff has changed since the cach=
e was created
 =

-      // remove the Interceptor.class component though, since it may perta=
in to an old config
-      componentRegistry.unregisterComponent(Interceptor.class);
+      // remove any components whose construction may have depended upon a=
 configuration that may have changed.
+      removeConfigurationDependentComponents();
 =

+      // this will recreate any missing components based on the current co=
nfig
       componentRegistry.updateDependencies();
       componentRegistry.wireDependencies(root);
 =


Added: core/trunk/src/test/java/org/jboss/cache/factories/LateConfiguration=
Test.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/test/java/org/jboss/cache/factories/LateConfigurationTes=
t.java	                        (rev 0)
+++ core/trunk/src/test/java/org/jboss/cache/factories/LateConfigurationTes=
t.java	2008-01-11 14:07:10 UTC (rev 5116)
@@ -0,0 +1,115 @@
+package org.jboss.cache.factories;
+
+import org.jboss.cache.CacheSPI;
+import org.jboss.cache.DefaultCacheFactory;
+import org.jboss.cache.Fqn;
+import org.jboss.cache.config.CacheLoaderConfig;
+import org.jboss.cache.interceptors.OptimisticLockingInterceptor;
+import org.jboss.cache.loader.DummyInMemoryCacheLoader;
+import org.jboss.cache.marshall.AbstractMarshaller;
+import org.jboss.cache.marshall.VersionAwareMarshaller;
+import org.jboss.cache.misc.TestingUtil;
+import org.jboss.cache.transaction.DummyTransactionManager;
+import org.jboss.cache.transaction.DummyTransactionManagerLookup;
+import org.testng.annotations.AfterMethod;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.Test;
+
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+
+/**
+ * @author Manik Surtani (<a href=3D"mailto:manik(a)jboss.org">manik(a)jbo=
ss.org</a>)
+ * @since 2.1.0
+ */
+(a)Test(groups =3D "functional")
+public class LateConfigurationTest
+{
+   CacheSPI c;
+
+   @BeforeMethod
+   public void setUp()
+   {
+      c =3D (CacheSPI) new DefaultCacheFactory().createCache(false);
+   }
+
+   @AfterMethod
+   public void tearDown()
+   {
+      TestingUtil.killCaches(c);
+   }
+
+   public void testTransactionManager()
+   {
+      assert c.getTransactionManager() =3D=3D null;
+
+      c.getConfiguration().setTransactionManagerLookupClass(DummyTransacti=
onManagerLookup.class.getName());
+
+      assert c.getTransactionManager() =3D=3D null;
+      c.start();
+      assert c.getTransactionManager() =3D=3D DummyTransactionManager.getI=
nstance();
+   }
+
+   public void testTransactionManagerinRuntime()
+   {
+      assert c.getTransactionManager() =3D=3D null;
+
+      c.getConfiguration().getRuntimeConfig().setTransactionManager(DummyT=
ransactionManager.getInstance());
+
+      assert c.getTransactionManager() =3D=3D null;
+      c.start();
+      assert c.getTransactionManager() =3D=3D DummyTransactionManager.getI=
nstance();
+   }
+
+
+   public void testCacheLoader()
+   {
+      assert c.getCacheLoaderManager() !=3D null;
+      assert c.getCacheLoaderManager().getCacheLoader() =3D=3D null;
+
+      CacheLoaderConfig clc =3D new CacheLoaderConfig();
+      CacheLoaderConfig.IndividualCacheLoaderConfig iclc =3D new CacheLoad=
erConfig.IndividualCacheLoaderConfig();
+      iclc.setCacheLoader(new DummyInMemoryCacheLoader());
+      clc.addIndividualCacheLoaderConfig(iclc);
+      c.getConfiguration().setCacheLoaderConfig(clc);
+
+      c.start();
+      assert c.getCacheLoaderManager() !=3D null;
+      assert c.getCacheLoaderManager().getCacheLoader() instanceof DummyIn=
MemoryCacheLoader;
+   }
+
+   public void testInterceptors()
+   {
+      assert TestingUtil.findInterceptor(c, OptimisticLockingInterceptor.c=
lass) =3D=3D null;
+
+      c.getConfiguration().setNodeLockingScheme("OPTIMISTIC");
+      assert TestingUtil.findInterceptor(c, OptimisticLockingInterceptor.c=
lass) =3D=3D null;
+      c.start();
+      assert TestingUtil.findInterceptor(c, OptimisticLockingInterceptor.c=
lass) !=3D null;
+   }
+
+   public void testCacheMarshaller()
+   {
+      assert c.getMarshaller() instanceof VersionAwareMarshaller;
+
+      c.getConfiguration().setCacheMarshaller(new AbstractMarshaller()
+      {
+         public void objectToObjectStream(Object obj, ObjectOutputStream o=
ut) throws Exception
+         {
+         }
+
+         public Object objectFromObjectStream(ObjectInputStream in) throws=
 Exception
+         {
+            return null;
+         }
+
+         public void objectToObjectStream(Object obj, ObjectOutputStream o=
ut, Fqn region)
+         {
+         }
+      });
+
+      c.start();
+
+      assert !(c.getMarshaller() instanceof VersionAwareMarshaller) && c.g=
etMarshaller() !=3D null;
+   }
+}


--===============8891328927509702696==--

From jbosscache-commits at lists.jboss.org Fri Jan 11 09:32:31 2008
Content-Type: multipart/mixed; boundary="===============1869223257902148380=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r5117 -
 core/trunk/src/test/java/org/jboss/cache/factories.
Date: Fri, 11 Jan 2008 09:32:29 -0500
Message-ID: <E1JDKvt-00029j-Da@committer01.frg.pub.inap.atl.jboss.com>

--===============1869223257902148380==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: manik.surtani(a)jboss.com
Date: 2008-01-11 09:32:29 -0500 (Fri, 11 Jan 2008)
New Revision: 5117

Modified:
   core/trunk/src/test/java/org/jboss/cache/factories/LateConfigurationTest=
.java
Log:
Added buddy replication cfg to test

Modified: core/trunk/src/test/java/org/jboss/cache/factories/LateConfigurat=
ionTest.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/test/java/org/jboss/cache/factories/LateConfigurationTes=
t.java	2008-01-11 14:07:10 UTC (rev 5116)
+++ core/trunk/src/test/java/org/jboss/cache/factories/LateConfigurationTes=
t.java	2008-01-11 14:32:29 UTC (rev 5117)
@@ -3,6 +3,7 @@
 import org.jboss.cache.CacheSPI;
 import org.jboss.cache.DefaultCacheFactory;
 import org.jboss.cache.Fqn;
+import org.jboss.cache.config.BuddyReplicationConfig;
 import org.jboss.cache.config.CacheLoaderConfig;
 import org.jboss.cache.interceptors.OptimisticLockingInterceptor;
 import org.jboss.cache.loader.DummyInMemoryCacheLoader;
@@ -78,6 +79,19 @@
       assert c.getCacheLoaderManager().getCacheLoader() instanceof DummyIn=
MemoryCacheLoader;
    }
 =

+   public void testBuddyManager()
+   {
+      assert c.getBuddyManager() =3D=3D null;
+
+      BuddyReplicationConfig brc =3D new BuddyReplicationConfig();
+      brc.setEnabled(true);
+      c.getConfiguration().setBuddyReplicationConfig(brc);
+
+      c.start();
+      assert c.getBuddyManager() !=3D null;
+      assert c.getBuddyManager().isEnabled();
+   }
+
    public void testInterceptors()
    {
       assert TestingUtil.findInterceptor(c, OptimisticLockingInterceptor.c=
lass) =3D=3D null;


--===============1869223257902148380==--

From jbosscache-commits at lists.jboss.org Fri Jan 11 10:54:20 2008
Content-Type: multipart/mixed; boundary="===============3054434114244861455=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r5118 -
 core/trunk/src/main/java/org/jboss/cache.
Date: Fri, 11 Jan 2008 10:54:20 -0500
Message-ID: <E1JDMD6-0000Y0-Nr@committer01.frg.pub.inap.atl.jboss.com>

--===============3054434114244861455==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: bstansberry(a)jboss.com
Date: 2008-01-11 10:54:20 -0500 (Fri, 11 Jan 2008)
New Revision: 5118

Modified:
   core/trunk/src/main/java/org/jboss/cache/Cache.java
Log:
Javadoc @link fixes

Modified: core/trunk/src/main/java/org/jboss/cache/Cache.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/java/org/jboss/cache/Cache.java	2008-01-11 14:32:29=
 UTC (rev 5117)
+++ core/trunk/src/main/java/org/jboss/cache/Cache.java	2008-01-11 15:54:20=
 UTC (rev 5118)
@@ -95,16 +95,16 @@
    Node<K, V> getRoot();
 =

    /**
-    * Adds a {@link @org.jboss.cache.notifications.annotation.CacheListene=
r}-annotated object to the entire cache.  The object passed in needs to be =
properly annotated with the
-    * {@link @org.jboss.cache.notifications.annotation.CacheListener} anno=
tation otherwise an {@link org.jboss.cache.notifications.IncorrectCacheList=
enerException} will be thrown.
+    * Adds a {@link org.jboss.cache.notifications.annotation.CacheListener=
}-annotated object to the entire cache.  The object passed in needs to be p=
roperly annotated with the
+    * {@link org.jboss.cache.notifications.annotation.CacheListener} annot=
ation otherwise an {@link org.jboss.cache.notifications.IncorrectCacheListe=
nerException} will be thrown.
     *
     * @param listener listener to add
     */
    void addCacheListener(Object listener);
 =

    /**
-    * Adds a {@link @org.jboss.cache.notifications.annotation.CacheListene=
r}-annotated object to a given region.  The object passed in needs to be pr=
operly annotated with the
-    * {@link @org.jboss.cache.notifications.annotation.CacheListener} anno=
tation otherwise an {@link org.jboss.cache.notifications.IncorrectCacheList=
enerException} will be thrown.
+    * Adds a {@link org.jboss.cache.notifications.annotation.CacheListener=
}-annotated object to a given region.  The object passed in needs to be pro=
perly annotated with the
+    * {@link org.jboss.cache.notifications.annotation.CacheListener} annot=
ation otherwise an {@link org.jboss.cache.notifications.IncorrectCacheListe=
nerException} will be thrown.
     *
     * @param region   region to add listener to
     * @param listener listener to add
@@ -112,16 +112,16 @@
    void addCacheListener(Fqn<?> region, Object listener);
 =

    /**
-    * Removes a {@link @org.jboss.cache.notifications.annotation.CacheList=
ener}-annotated object from the cache.  The object passed in needs to be pr=
operly annotated with the
-    * {@link @org.jboss.cache.notifications.annotation.CacheListener} anno=
tation otherwise an {@link org.jboss.cache.notifications.IncorrectCacheList=
enerException} will be thrown.
+    * Removes a {@link org.jboss.cache.notifications.annotation.CacheListe=
ner}-annotated object from the cache.  The object passed in needs to be pro=
perly annotated with the
+    * {@link org.jboss.cache.notifications.annotation.CacheListener} annot=
ation otherwise an {@link org.jboss.cache.notifications.IncorrectCacheListe=
nerException} will be thrown.
     *
     * @param listener listener to remove
     */
    void removeCacheListener(Object listener);
 =

    /**
-    * Removes a {@link @org.jboss.cache.notifications.annotation.CacheList=
ener}-annotated object from a given region.  The object passed in needs to =
be properly annotated with the
-    * {@link @org.jboss.cache.notifications.annotation.CacheListener} anno=
tation otherwise an {@link org.jboss.cache.notifications.IncorrectCacheList=
enerException} will be thrown.
+    * Removes a {@link org.jboss.cache.notifications.annotation.CacheListe=
ner}-annotated object from a given region.  The object passed in needs to b=
e properly annotated with the
+    * {@link org.jboss.cache.notifications.annotation.CacheListener} annot=
ation otherwise an {@link org.jboss.cache.notifications.IncorrectCacheListe=
nerException} will be thrown.
     *
     * @param region   region from which to remove listener
     * @param listener listener to remove


--===============3054434114244861455==--

From jbosscache-commits at lists.jboss.org Fri Jan 11 16:27:26 2008
Content-Type: multipart/mixed; boundary="===============1601480862225389613=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r5119 - in core/trunk/src:
 main/resources/META-INF and 1 other directories.
Date: Fri, 11 Jan 2008 16:27:25 -0500
Message-ID: <E1JDRPR-00072I-1B@committer01.frg.pub.inap.atl.jboss.com>

--===============1601480862225389613==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: bstansberry(a)jboss.com
Date: 2008-01-11 16:27:24 -0500 (Fri, 11 Jan 2008)
New Revision: 5119

Added:
   core/trunk/src/main/java/org/jboss/cache/eviction/NullEvictionAlgorithm.=
java
   core/trunk/src/main/java/org/jboss/cache/eviction/NullEvictionPolicy.java
   core/trunk/src/main/java/org/jboss/cache/eviction/NullEvictionPolicyConf=
ig.java
   core/trunk/src/main/java/org/jboss/cache/eviction/NullEvictionQueue.java
   core/trunk/src/main/resources/META-INF/local-null-eviction-service.xml
   core/trunk/src/test/java/org/jboss/cache/eviction/NullEvictionConfigTest=
.java
   core/trunk/src/test/java/org/jboss/cache/eviction/NullEvictionPolicyTest=
.java
Log:
[JBCACHE-1215] NullEvictionPolicy

Added: core/trunk/src/main/java/org/jboss/cache/eviction/NullEvictionAlgori=
thm.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/java/org/jboss/cache/eviction/NullEvictionAlgorithm=
.java	                        (rev 0)
+++ core/trunk/src/main/java/org/jboss/cache/eviction/NullEvictionAlgorithm=
.java	2008-01-11 21:27:24 UTC (rev 5119)
@@ -0,0 +1,45 @@
+/**
+ * =

+ */
+package org.jboss.cache.eviction;
+
+import org.jboss.cache.Region;
+
+/**
+ * Algorithm for {@link NullEvictionPolicy}.
+ * =

+ * @author Brian Stansberry
+ */
+public class NullEvictionAlgorithm implements EvictionAlgorithm
+{
+   /** Singleton instance of this class. */
+   public static final NullEvictionAlgorithm INSTANCE =3D new NullEviction=
Algorithm();
+   =

+   /**
+    * Constructs a new NullEvictionAlgorithm.
+    */
+   private NullEvictionAlgorithm()
+   {
+   }
+
+   /**
+    * Returns {@link NullEvictionQueue#INSTANCE}.
+    */
+   public EvictionQueue getEvictionQueue()
+   {
+      return NullEvictionQueue.INSTANCE;
+   }
+
+   /** No-op */
+   public void process(Region region) throws EvictionException
+   {
+      // no-op
+   }
+
+   /** No-op */
+   public void resetEvictionQueue(Region region)
+   {
+      // no-op
+   }
+
+}


Property changes on: core/trunk/src/main/java/org/jboss/cache/eviction/Null=
EvictionAlgorithm.java
___________________________________________________________________
Name: svn:executable
   + *

Added: core/trunk/src/main/java/org/jboss/cache/eviction/NullEvictionPolicy=
.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/java/org/jboss/cache/eviction/NullEvictionPolicy.ja=
va	                        (rev 0)
+++ core/trunk/src/main/java/org/jboss/cache/eviction/NullEvictionPolicy.ja=
va	2008-01-11 21:27:24 UTC (rev 5119)
@@ -0,0 +1,69 @@
+/**
+ * =

+ */
+package org.jboss.cache.eviction;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.jboss.cache.CacheSPI;
+import org.jboss.cache.Fqn;
+import org.jboss.cache.config.EvictionPolicyConfig;
+
+/**
+ * Eviction policy that does nothing and always tells the eviction =

+ * interceptor an event can be ignored, saving the overhead of
+ * constructing and processing event objects. Basically useful
+ * as a default policy for a cache or subtree that is =

+ * shared between multiple usages, some of which don't =

+ * want eviction.
+ * =

+ * @author Brian Stansberry
+ */
+public class NullEvictionPolicy implements EvictionPolicy
+{
+   private static final Log log =3D LogFactory.getLog(NullEvictionPolicy.c=
lass);
+   =

+   private CacheSPI cache;
+   =

+   /**
+    * Constructs a new NullEvictionPolicy.
+    */
+   public NullEvictionPolicy()
+   {
+   }
+
+   /** Returns <code>true</code> */
+   public boolean canIgnoreEvent(Fqn fqn, NodeEventType eventType)
+   {
+      return true;
+   }
+
+   /** No-op */
+   public void evict(Fqn fqn) throws Exception
+   {
+      log.debug("evict should not be called on NullEvictionPolicy");
+   }
+
+   /** Returns {@link NullEvictionAlgorithm#INSTANCE}. */
+   public EvictionAlgorithm getEvictionAlgorithm()
+   {
+      return NullEvictionAlgorithm.INSTANCE;
+   }
+
+   /** Returns {@link NullEvictionPolicyConfig}. */
+   public Class<? extends EvictionPolicyConfig> getEvictionConfigurationCl=
ass()
+   {
+      return NullEvictionPolicyConfig.class;
+   }
+
+   public CacheSPI getCache()
+   {
+      return cache;
+   }
+
+   public void setCache(CacheSPI cache)
+   {
+      this.cache =3D cache;
+   }
+
+}


Property changes on: core/trunk/src/main/java/org/jboss/cache/eviction/Null=
EvictionPolicy.java
___________________________________________________________________
Name: svn:executable
   + *

Added: core/trunk/src/main/java/org/jboss/cache/eviction/NullEvictionPolicy=
Config.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/java/org/jboss/cache/eviction/NullEvictionPolicyCon=
fig.java	                        (rev 0)
+++ core/trunk/src/main/java/org/jboss/cache/eviction/NullEvictionPolicyCon=
fig.java	2008-01-11 21:27:24 UTC (rev 5119)
@@ -0,0 +1,49 @@
+/**
+ * =

+ */
+package org.jboss.cache.eviction;
+
+import org.jboss.cache.config.ConfigurationComponent;
+import org.jboss.cache.config.ConfigurationException;
+import org.jboss.cache.config.EvictionPolicyConfig;
+
+/**
+ * Configuration class for {@link NullEvictionPolicy}.
+ * =

+ * @author Brian Stansberry
+ */
+public class NullEvictionPolicyConfig
+   extends ConfigurationComponent
+   implements EvictionPolicyConfig
+{
+
+   private static final long serialVersionUID =3D -6591180473728241737L;
+
+   /**
+    * Constructs a new NullEvictionPolicyConfig.
+    */
+   public NullEvictionPolicyConfig()
+   {
+   }
+
+   /**
+    * Returns {@link NullEvictionPolicy}.
+    */
+   public String getEvictionPolicyClass()
+   {
+      return NullEvictionPolicy.class.getName();
+   }
+
+   /** No-op */
+   public void reset()
+   {
+      // no-op
+   }
+
+   /** No-op */
+   public void validate() throws ConfigurationException
+   {
+      // no-op
+   }
+
+}


Property changes on: core/trunk/src/main/java/org/jboss/cache/eviction/Null=
EvictionPolicyConfig.java
___________________________________________________________________
Name: svn:executable
   + *

Added: core/trunk/src/main/java/org/jboss/cache/eviction/NullEvictionQueue.=
java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/java/org/jboss/cache/eviction/NullEvictionQueue.jav=
a	                        (rev 0)
+++ core/trunk/src/main/java/org/jboss/cache/eviction/NullEvictionQueue.jav=
a	2008-01-11 21:27:24 UTC (rev 5119)
@@ -0,0 +1,119 @@
+/**
+ * =

+ */
+package org.jboss.cache.eviction;
+
+import java.util.Iterator;
+import java.util.NoSuchElementException;
+
+import org.jboss.cache.Fqn;
+
+/**
+ * A queue that does nothing.
+ * =

+ * @author Brian Stansberry
+ */
+public class NullEvictionQueue implements EvictionQueue
+{
+   /** Singleton instance of this class. */
+   public static final NullEvictionQueue INSTANCE =3D new NullEvictionQueu=
e();
+   =

+   /**
+    * Constructs a new NullEvictionQueue.
+    */
+   private NullEvictionQueue()
+   {
+   }
+
+   /** No-op */
+   public void addNodeEntry(NodeEntry entry)
+   {
+      // no-op
+   }
+
+   /** No-op */
+   public void clear()
+   {
+      // no-op
+   }
+
+   /** Returns <code>false</code> */
+   public boolean containsNodeEntry(NodeEntry entry)
+   {
+      return false;
+   }
+
+   /** Returns <code>null</code> */
+   public NodeEntry getFirstNodeEntry()
+   {
+      return null;
+   }
+
+   /** Returns <code>null</code> */
+   public NodeEntry getNodeEntry(Fqn fqn)
+   {
+      return null;
+   }
+
+   /** Returns <code>null</code> */
+   public NodeEntry getNodeEntry(String fqn)
+   {
+      return null;
+   }
+
+   /** Returns <code>0</code> */
+   public int getNumberOfElements()
+   {
+      return 0;
+   }
+
+   /** Returns <code>0</code> */
+   public int getNumberOfNodes()
+   {
+      return 0;
+   }
+
+   /** =

+    * Returns an <code>Iterator</code> whose
+    * <code>hasNext()</code> returns <code>false</code>.
+    */
+   public Iterator iterate()
+   {
+      return NullQueueIterator.INSTANCE;
+   }
+
+   /** No-op */
+   public void modifyElementCount(int difference)
+   {
+      // no-op
+   }
+
+   /** No-op */
+   public void removeNodeEntry(NodeEntry entry)
+   {
+      // no-op
+   }
+   =

+   static class NullQueueIterator implements Iterator
+   {
+      private static final NullQueueIterator INSTANCE =3D new NullQueueIte=
rator();
+
+      private NullQueueIterator() {}
+      =

+      public boolean hasNext()
+      {
+         return false;
+      }
+
+      public Object next()
+      {
+         throw new NoSuchElementException("No more elements");
+      }
+
+      public void remove()
+      {
+         throw new IllegalStateException("Must call next() before remove()=
");
+      }
+   }
+
+}


Property changes on: core/trunk/src/main/java/org/jboss/cache/eviction/Null=
EvictionQueue.java
___________________________________________________________________
Name: svn:executable
   + *

Added: core/trunk/src/main/resources/META-INF/local-null-eviction-service.x=
ml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/resources/META-INF/local-null-eviction-service.xml	=
                        (rev 0)
+++ core/trunk/src/main/resources/META-INF/local-null-eviction-service.xml	=
2008-01-11 21:27:24 UTC (rev 5119)
@@ -0,0 +1,105 @@
+<?xml version=3D"1.0" encoding=3D"UTF-8"?>
+
+<!-- =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D -->
+<!--                                                                      =
 -->
+<!--  Sample JBoss Cache Service Configuration                            =
   -->
+<!--                                                                      =
 -->
+<!-- =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D -->
+
+<server>
+
+   <!-- =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D -->
+   <!-- Defines JBoss Cache configuration                                 =
     -->
+   <!-- =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D -->
+
+   <mbean code=3D"org.jboss.cache.jmx.CacheJmxWrapper"
+          name=3D"jboss.cache:service=3DCache">
+
+      <depends>jboss:service=3DNaming</depends>
+      <depends>jboss:service=3DTransactionManager</depends>
+
+      <!--
+          Configure the TransactionManager
+      -->
+      <attribute name=3D"TransactionManagerLookupClass">org.jboss.cache.tr=
ansaction.GenericTransactionManagerLookup
+      </attribute>
+
+
+      <!--
+          Node locking level : SERIALIZABLE
+                               REPEATABLE_READ (default)
+                               READ_COMMITTED
+                               READ_UNCOMMITTED
+                               NONE
+      -->
+      <attribute name=3D"IsolationLevel">REPEATABLE_READ</attribute>
+
+      <!--
+           Valid modes are LOCAL
+                           REPL_ASYNC
+                           REPL_SYNC
+                           INVALIDATION_ASYNC
+                           INVALIDATION_SYNC
+      -->
+      <attribute name=3D"CacheMode">LOCAL</attribute>
+
+      <!-- Name of cluster. Needs to be the same for all TreeCache nodes i=
n a
+           cluster in order to find each other.
+      -->
+      <attribute name=3D"ClusterName">JBossCache-Cluster</attribute>
+
+      <!--Uncomment next three statements to enable JGroups multiplexer.
+         This configuration is dependent on the JGroups multiplexer being
+         registered in an MBean server such as JBossAS.  -->
+      <!--
+      <depends>jgroups.mux:name=3DMultiplexer</depends>
+      <attribute name=3D"MultiplexerService">jgroups.mux:name=3DMultiplexe=
r</attribute>
+      <attribute name=3D"MultiplexerStack">fc-fast-minimalthreads</attribu=
te>
+      -->
+
+      <!-- JGroups protocol stack properties NOT NEEDED since CacheMode is=
 LOCAL -->
+
+
+      <!--
+          The max amount of time (in milliseconds) we wait until the
+          state (ie. the contents of the cache) are retrieved from
+          existing members in a clustered environment
+      -->
+      <attribute name=3D"StateRetrievalTimeout">20000</attribute>
+
+      <!--
+          Number of milliseconds to wait until all responses for a
+          synchronous call have been received.
+      -->
+      <attribute name=3D"SyncReplTimeout">20000</attribute>
+
+      <!-- Max number of milliseconds to wait for a lock acquisition -->
+      <attribute name=3D"LockAcquisitionTimeout">15000</attribute>
+
+      <!-- Specific eviction policy configurations. This is LRU -->
+      <attribute name=3D"EvictionPolicyConfig">
+         <config>
+            <attribute name=3D"wakeUpIntervalSeconds">1</attribute>
+            <!-- This defaults to 200000 if not specified -->
+            <attribute name=3D"eventQueueSize">200000</attribute>
+            <attribute name=3D"policyClass">org.jboss.cache.eviction.NullE=
victionPolicy</attribute>
+
+            <!-- Cache wide default -->
+            <region name=3D"/_default_">
+               <attribute name=3D"maxNodes">5000</attribute>
+               <attribute name=3D"timeToLiveSeconds">1</attribute>
+            </region>
+            <region name=3D"/test" policyClass=3D"org.jboss.cache.eviction=
.NullEvictionPolicy">
+               <attribute name=3D"maxNodes">10000</attribute>
+               <attribute name=3D"timeToLiveSeconds">1</attribute>
+            </region>
+            <region name=3D"/lru" policyClass=3D"org.jboss.cache.eviction.=
LRUPolicy">
+               <attribute name=3D"maxNodes">10000</attribute>
+               <attribute name=3D"timeToLiveSeconds">1</attribute>
+            </region>
+         </config>
+      </attribute>
+   </mbean>
+
+
+</server>

Added: core/trunk/src/test/java/org/jboss/cache/eviction/NullEvictionConfig=
Test.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/test/java/org/jboss/cache/eviction/NullEvictionConfigTes=
t.java	                        (rev 0)
+++ core/trunk/src/test/java/org/jboss/cache/eviction/NullEvictionConfigTes=
t.java	2008-01-11 21:27:24 UTC (rev 5119)
@@ -0,0 +1,87 @@
+/*
+ * JBoss, the OpenSource J2EE webOS
+ *
+ * Distributable under LGPL license.
+ * See terms of license at gnu.org.
+ */
+package org.jboss.cache.eviction;
+
+import static org.testng.AssertJUnit.fail;
+
+import org.jboss.cache.factories.XmlConfigurationParser;
+import org.jboss.cache.xml.XmlHelper;
+import org.testng.annotations.Test;
+import org.w3c.dom.Element;
+
+/**
+ * Unit tests for NullEvictionPolicyConfig.
+ *
+ * @author Daniel Huang (dhuang(a)jboss.org)
+ * @version $Revision: 4444 $
+ */
+(a)Test(groups =3D {"functional"})
+public class NullEvictionConfigTest
+{
+   /** =

+    * Creates a bunch of region elements with LRU configs and confirms
+    * that NullEvictionPolicyConfig doesn't barf.
+    * =

+    * @throws Exception
+    */
+   public void testXMLParsing() throws Exception
+   {
+      String xml =3D
+            "<region name=3D\"/org/jboss/data\">\n" +
+                  "<attribute name=3D\"maxNodes\">5000</attribute>\n" +
+                  "<attribute name=3D\"timeToLiveSeconds\">1000</attribute=
>\n" +
+                  "</region>";
+      =

+      testConfigBlock(xml);
+      =

+      xml =3D "<region name=3D\"/maxAgeTest/\">\n" +
+            "<attribute name=3D\"maxNodes\">10000</attribute>\n" +
+            "<attribute name=3D\"timeToLiveSeconds\">8</attribute>\n" +
+            "<attribute name=3D\"maxAgeSeconds\">10</attribute>\n" +
+            "</region>";
+      =

+      testConfigBlock(xml);
+
+      xml =3D "<region name=3D\"/maxAgeTest/\">\n" +
+            "<attribute name=3D\"maxNodes\">10000</attribute>\n" +
+            "<attribute name=3D\"maxAgeSeconds\">10</attribute>\n" +
+            "</region>";
+      =

+      testConfigBlock(xml);
+
+      xml =3D "<region name=3D\"/maxAgeTest/\">\n" +
+            "<attribute name=3D\"timeToLiveSeconds\">8</attribute>\n" +
+            "<attribute name=3D\"maxAgeSeconds\">10</attribute>\n" +
+            "</region>";
+      =

+      testConfigBlock(xml);
+
+      xml =3D "<region name=3D\"/maxAgeTest/\"/>\n";
+      =

+      testConfigBlock(xml);
+   }
+
+   /**
+    * FIXME Comment this
+    * =

+    * @param xml
+    * @throws Exception
+    */
+   private void testConfigBlock(String xml) throws Exception
+   {
+      Element element =3D XmlHelper.stringToElement(xml);
+      NullEvictionPolicyConfig config =3D new NullEvictionPolicyConfig();
+      try
+      {
+         XmlConfigurationParser.parseEvictionPolicyConfig(element, config);
+      }
+      catch (Exception e)
+      {
+         fail(e.getMessage());
+      }
+   }
+}

Added: core/trunk/src/test/java/org/jboss/cache/eviction/NullEvictionPolicy=
Test.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/test/java/org/jboss/cache/eviction/NullEvictionPolicyTes=
t.java	                        (rev 0)
+++ core/trunk/src/test/java/org/jboss/cache/eviction/NullEvictionPolicyTes=
t.java	2008-01-11 21:27:24 UTC (rev 5119)
@@ -0,0 +1,113 @@
+package org.jboss.cache.eviction;
+
+
+import org.jboss.cache.CacheSPI;
+import org.jboss.cache.DefaultCacheFactory;
+import org.jboss.cache.Fqn;
+import org.jboss.cache.lock.IsolationLevel;
+import org.jboss.cache.misc.TestingUtil;
+import static org.testng.AssertJUnit.*;
+import org.testng.annotations.AfterMethod;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.Test;
+
+/**
+ * Unit tests for LRU Policy.
+ *
+ * @author Ben Wang, Feb 11, 2004
+ * @author Daniel Huang - dhuang(a)jboss.org
+ * @version $Revision: 4880 $
+ */
+(a)Test(groups =3D {"functional"})
+public class NullEvictionPolicyTest
+{
+   CacheSPI<Object, Object> cache_;
+
+   @BeforeMethod(alwaysRun =3D true)
+   public void setUp() throws Exception
+   {
+      cache_ =3D null;
+   }
+
+   @AfterMethod(alwaysRun =3D true)
+   public void tearDown() throws Exception
+   {
+      if (cache_ !=3D null)
+      {
+         cache_.stop();
+         cache_.destroy();
+      }      =

+   }
+
+   /**
+    * Builds a cache was null eviction by default and in "/test" region,
+    * LRU in "/lru" region.  Does a mix of puts/reads/removes, wakes for
+    * eviction thread to kick in, checks that nothing was evicted from the
+    * null policy regions but was from lru region.
+    */
+   public void testEviction()
+   {      =

+      cache_ =3D (CacheSPI<Object, Object>) new DefaultCacheFactory().crea=
teCache("META-INF/local-null-eviction-service.xml", false);// read in gener=
ic local xml
+      cache_.getConfiguration().setTransactionManagerLookupClass("org.jbos=
s.cache.transaction.DummyTransactionManagerLookup");
+      cache_.getConfiguration().setIsolationLevel(IsolationLevel.SERIALIZA=
BLE);
+      cache_.start();
+      =

+      String dfltRootStr =3D "/a/";
+      String testRootStr =3D "/test/";
+      String lruRootStr =3D "/lru/";
+      =

+      for (int i =3D 0; i < 20; i++)
+      {                 =

+         if (i % 1 =3D=3D 0 || i % 3 =3D=3D 0)
+         {
+            Fqn dflt =3D Fqn.fromString(dfltRootStr + i);
+            Fqn test =3D Fqn.fromString(testRootStr + i);
+            Fqn lru =3D Fqn.fromString(lruRootStr + i);
+            cache_.put(dflt, "key", "value");
+            cache_.put(test, "key", "value");
+            cache_.put(lru, "key", "value");
+         }
+         else
+         {
+            Fqn dflt =3D Fqn.fromString(dfltRootStr + (i - 1));
+            Fqn test =3D Fqn.fromString(testRootStr + (i - 1));
+            Fqn lru =3D Fqn.fromString(lruRootStr + (i - 1));
+            if (i % 2 =3D=3D 0)
+            {
+               assertEquals("value", cache_.get(dflt, "key"));
+               assertEquals("value", cache_.get(test, "key"));
+               assertEquals("value", cache_.get(lru, "key"));
+            }
+            else
+            {
+               cache_.removeNode(dflt);
+               cache_.removeNode(test);
+               cache_.removeNode(lru);
+            }
+         }
+      }
+      =

+      TestingUtil.sleepThread(2500);
+      =

+      for (int i =3D 0; i < 20; i++)
+      {
+         Fqn dflt =3D Fqn.fromString(dfltRootStr + i);
+         Fqn test =3D Fqn.fromString(testRootStr + i);
+         Fqn lru =3D Fqn.fromString(lruRootStr + i);
+         =

+         if (i % 1 =3D=3D 0)
+         {
+            assertEquals("value", cache_.get(dflt, "key"));
+            assertEquals("value", cache_.get(test, "key"));
+            assertNull(cache_.get(lru, "key"));
+         }
+         else if (i % 3 =3D=3D 0)
+         {
+            assertNull(cache_.get(dflt, "key"));
+            assertNull(cache_.get(test, "key"));
+            assertNull(cache_.get(lru, "key"));
+         }
+      }
+   }
+
+}


--===============1601480862225389613==--

From jbosscache-commits at lists.jboss.org Mon Jan 14 05:42:35 2008
Content-Type: multipart/mixed; boundary="===============0236799546631722734=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r5120 - in
 core/trunk/src/main/java/org/jboss/cache: factories and 1 other directory.
Date: Mon, 14 Jan 2008 05:42:35 -0500
Message-ID: <E1JEMm3-0003yA-Ax@committer01.frg.pub.inap.atl.jboss.com>

--===============0236799546631722734==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: manik.surtani(a)jboss.com
Date: 2008-01-14 05:42:35 -0500 (Mon, 14 Jan 2008)
New Revision: 5120

Modified:
   core/trunk/src/main/java/org/jboss/cache/CacheImpl.java
   core/trunk/src/main/java/org/jboss/cache/factories/TransactionManagerFac=
tory.java
Log:
Moved logging from TMF to CacheImpl

Modified: core/trunk/src/main/java/org/jboss/cache/CacheImpl.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/java/org/jboss/cache/CacheImpl.java	2008-01-11 21:2=
7:24 UTC (rev 5119)
+++ core/trunk/src/main/java/org/jboss/cache/CacheImpl.java	2008-01-14 10:4=
2:35 UTC (rev 5120)
@@ -586,6 +586,10 @@
          log.info("Interceptor chain is:\n" + CachePrinter.printIntercepto=
rChain(interceptorChain));
       }
 =

+      if (configuration.getNodeLockingScheme() =3D=3D Configuration.NodeLo=
ckingScheme.OPTIMISTIC && transactionManager =3D=3D null)
+      {
+         log.fatal("No transaction manager lookup class has been defined. =
Transactions cannot be used and thus OPTIMISTIC locking cannot be used!  Ex=
pect errors!!");
+      }
 =

       correctRootNodeType();
 =


Modified: core/trunk/src/main/java/org/jboss/cache/factories/TransactionMan=
agerFactory.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/java/org/jboss/cache/factories/TransactionManagerFa=
ctory.java	2008-01-11 21:27:24 UTC (rev 5119)
+++ core/trunk/src/main/java/org/jboss/cache/factories/TransactionManagerFa=
ctory.java	2008-01-14 10:42:35 UTC (rev 5120)
@@ -1,6 +1,5 @@
 package org.jboss.cache.factories;
 =

-import org.jboss.cache.config.Configuration;
 import org.jboss.cache.config.ConfigurationException;
 import org.jboss.cache.factories.annotations.DefaultFactoryFor;
 import org.jboss.cache.transaction.TransactionManagerLookup;
@@ -16,8 +15,6 @@
 @DefaultFactoryFor(classes =3D {TransactionManager.class})
 public class TransactionManagerFactory extends ComponentFactory
 {
-   boolean messageLogged =3D false;
-
    @Override
    @SuppressWarnings("unchecked")
    protected <T> T construct(String componentName, Class<T> componentType)
@@ -49,21 +46,6 @@
                transactionManager =3D lookup.getTransactionManager();
                configuration.getRuntimeConfig().setTransactionManager(tran=
sactionManager);
             }
-            else
-            {
-               if (!messageLogged)
-               {
-                  messageLogged =3D true;
-                  if (configuration.getNodeLockingScheme() =3D=3D Configur=
ation.NodeLockingScheme.OPTIMISTIC)
-                  {
-                     log.fatal("No transaction manager lookup class has be=
en defined. Transactions cannot be used and thus OPTIMISTIC locking cannot =
be used");
-                  }
-                  else
-                  {
-                     log.info("No transaction manager lookup class has bee=
n defined. Transactions cannot be used");
-                  }
-               }
-            }
          }
          catch (Exception e)
          {


--===============0236799546631722734==--

From jbosscache-commits at lists.jboss.org Mon Jan 14 09:30:23 2008
Content-Type: multipart/mixed; boundary="===============3777989527824043033=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r5121 -
 core/trunk/src/main/java/org/jboss/cache/config.
Date: Mon, 14 Jan 2008 09:30:23 -0500
Message-ID: <E1JEQKV-0006y4-DC@committer01.frg.pub.inap.atl.jboss.com>

--===============3777989527824043033==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: manik.surtani(a)jboss.com
Date: 2008-01-14 09:30:23 -0500 (Mon, 14 Jan 2008)
New Revision: 5121

Modified:
   core/trunk/src/main/java/org/jboss/cache/config/Configuration.java
Log:
Lazy deserialization configuration option

Modified: core/trunk/src/main/java/org/jboss/cache/config/Configuration.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/java/org/jboss/cache/config/Configuration.java	2008=
-01-14 10:42:35 UTC (rev 5120)
+++ core/trunk/src/main/java/org/jboss/cache/config/Configuration.java	2008=
-01-14 14:30:23 UTC (rev 5121)
@@ -186,6 +186,7 @@
    private transient RuntimeConfig runtimeConfig;
    private String marshallerClass;
    private ShutdownHookBehavior shutdownHookBehavior =3D ShutdownHookBehav=
ior.DEFAULT;
+   private boolean useLazyDeserialization =3D true;
 =

    // --------------------------------------------------------------------=
----------------------------------------
    //   SETTERS - MAKE SURE ALL SETTERS PERFORM testImmutability()!!!
@@ -476,6 +477,11 @@
       }
    }
 =

+   public void setUseLazyDeserialization(boolean useLazyDeserialization)
+   {
+      this.useLazyDeserialization =3D useLazyDeserialization;
+   }
+
    // --------------------------------------------------------------------=
----------------------------------------
    //   GETTERS
    // --------------------------------------------------------------------=
----------------------------------------
@@ -617,6 +623,11 @@
       return muxStackName;
    }
 =

+   public boolean isUseLazyDeserialization()
+   {
+      return useLazyDeserialization;
+   }
+
    public synchronized RuntimeConfig getRuntimeConfig()
    {
       if (runtimeConfig =3D=3D null)


--===============3777989527824043033==--

From jbosscache-commits at lists.jboss.org Mon Jan 14 09:53:44 2008
Content-Type: multipart/mixed; boundary="===============1715063025877549633=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r5122 -
 core/trunk/src/main/java/org/jboss/cache/invocation.
Date: Mon, 14 Jan 2008 09:53:44 -0500
Message-ID: <E1JEQh6-0002WI-Jo@committer01.frg.pub.inap.atl.jboss.com>

--===============1715063025877549633==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: manik.surtani(a)jboss.com
Date: 2008-01-14 09:53:44 -0500 (Mon, 14 Jan 2008)
New Revision: 5122

Modified:
   core/trunk/src/main/java/org/jboss/cache/invocation/NodeInvocationDelega=
te.java
Log:
JBCACHE-1263 - addChild() adds child even if one exists, causing unnecessar=
y replication.

Modified: core/trunk/src/main/java/org/jboss/cache/invocation/NodeInvocatio=
nDelegate.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/java/org/jboss/cache/invocation/NodeInvocationDeleg=
ate.java	2008-01-14 14:30:23 UTC (rev 5121)
+++ core/trunk/src/main/java/org/jboss/cache/invocation/NodeInvocationDeleg=
ate.java	2008-01-14 14:53:44 UTC (rev 5122)
@@ -273,8 +273,13 @@
       // TODO: Revisit.  Is this really threadsafe?  See comment in putIfA=
bsent() - same solution should be applied here too.
       assertValid();
       Fqn nf =3D new Fqn(getFqn(), f);
-      spi.put(nf, null);
-      return getChild(f);
+      Node<K, V> child =3D getChild(f);
+      if (child =3D=3D null)
+      {
+         spi.put(nf, null);
+         child =3D getChild(f);
+      }
+      return child;
    }
 =

    public boolean removeChild(Fqn<?> f)


--===============1715063025877549633==--

From jbosscache-commits at lists.jboss.org Mon Jan 14 10:34:10 2008
Content-Type: multipart/mixed; boundary="===============3052709756073511971=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r5123 - in core/trunk/src:
 test/java/org/jboss/cache/marshall and 1 other directory.
Date: Mon, 14 Jan 2008 10:34:07 -0500
Message-ID: <E1JERKB-00025K-GU@committer01.frg.pub.inap.atl.jboss.com>

--===============3052709756073511971==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: manik.surtani(a)jboss.com
Date: 2008-01-14 10:34:07 -0500 (Mon, 14 Jan 2008)
New Revision: 5123

Modified:
   core/trunk/src/main/java/org/jboss/cache/RegionManager.java
   core/trunk/src/test/java/org/jboss/cache/marshall/CacheMarshaller200Test=
.java
   core/trunk/src/test/java/org/jboss/cache/marshall/RegionManagerTest.java
Log:
Fixed default region activation issues

Modified: core/trunk/src/main/java/org/jboss/cache/RegionManager.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/java/org/jboss/cache/RegionManager.java	2008-01-14 =
14:53:44 UTC (rev 5122)
+++ core/trunk/src/main/java/org/jboss/cache/RegionManager.java	2008-01-14 =
15:34:07 UTC (rev 5123)
@@ -56,20 +56,8 @@
    protected final Set<Fqn> activationChangeNodes =3D Collections.synchron=
izedSet(new HashSet<Fqn>());
    protected Configuration configuration;
 =

-   /**
-    * Constructs a new instance not attached to a cache.
-    */
-   public RegionManager()
-   {
-      // always create a default MARSHALLING region!
-      Region r =3D new RegionImpl(Fqn.ROOT, this);
-      r.registerContextClassLoader(Thread.currentThread().getContextClassL=
oader() =3D=3D null ? this.getClass().getClassLoader() : Thread.currentThre=
ad().getContextClassLoader());
-      r.setActive(true);
-      regionsRegistry.put(Fqn.ROOT, r);
-   }
-
    @Inject
-   private void injectDependencies(CacheSPI cache, Configuration configura=
tion)
+   void injectDependencies(CacheSPI cache, Configuration configuration)
    {
       this.cache =3D cache;
       this.configuration =3D configuration;
@@ -92,8 +80,6 @@
       }
 =

       setDefaultInactive(configuration.isInactiveOnStartup());
-
-      if (defaultInactive) regionsRegistry.get(Fqn.ROOT).setActive(false);
    }
 =

    @Stop
@@ -319,7 +305,6 @@
       {
          if (log.isTraceEnabled()) log.trace("Activating region " + fqn);
          Region r =3D getRegion(fqn, false);
-         if (r !=3D null && r.getFqn() !=3D null && r.getFqn().isRoot() &&=
 !fqn.isRoot() && defaultInactive) return;
          if (r !=3D null)
          {
             if (!defaultInactive && r.getClassLoader() =3D=3D null)
@@ -363,16 +348,6 @@
       {
          throw new RuntimeException(e);
       }
-
-//      if (!fqn.isRoot())
-//      {
-//         // activate parent regions
-//         Region parent =3D getRegion(fqn.getParent(), false);
-//         if (parent !=3D null && !parent.isActive())
-//         {
-//            activate(parent.getFqn(), suppressRegionNotEmptyException);
-//         }
-//      }
    }
 =

    /**
@@ -722,7 +697,6 @@
 =

          if (region !=3D null)
          {
-            if (region.getFqn().isRoot() && !fqn.isRoot() && !defaultInact=
ive) return;
             if (defaultInactive && region.getClassLoader() =3D=3D null)
             {
                // This region's state will no match that of a non-existent=
 one

Modified: core/trunk/src/test/java/org/jboss/cache/marshall/CacheMarshaller=
200Test.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/test/java/org/jboss/cache/marshall/CacheMarshaller200Tes=
t.java	2008-01-14 14:53:44 UTC (rev 5122)
+++ core/trunk/src/test/java/org/jboss/cache/marshall/CacheMarshaller200Tes=
t.java	2008-01-14 15:34:07 UTC (rev 5123)
@@ -9,6 +9,7 @@
 import org.jboss.cache.Fqn;
 import org.jboss.cache.Region;
 import org.jboss.cache.RegionManager;
+import org.jboss.cache.factories.ComponentRegistry;
 import org.testng.annotations.Test;
 =

 import java.io.ByteArrayInputStream;
@@ -82,11 +83,15 @@
       // 3.  marshall a (primitive response) - case such as a state transf=
er sending out boolean status
 =

       // first create a stream to unmarshall.
-      RegionManager rm =3D new RegionManager();
+//      RegionManager rm =3D new RegionManager();
       final CacheMarshaller200 cm200 =3D new CacheMarshaller200();
+      c.setInactiveOnStartup(false);
       c.setUseRegionBasedMarshalling(true);
-      cm200.injectDependencies(new RegionManager(), c, getClass().getClass=
Loader());
-      cm200.init();
+      ComponentRegistry cr =3D new ComponentRegistry(c);
+      cr.registerComponent(cm200, CacheMarshaller200.class);
+      cr.start();
+
+      RegionManager rm =3D cr.getComponent(RegionManager.class);
       ByteArrayOutputStream baos =3D new ByteArrayOutputStream();
       ObjectOutputStream oos =3D new ObjectOutputStream(baos);
       final Fqn region =3D Fqn.fromString("/hello");

Modified: core/trunk/src/test/java/org/jboss/cache/marshall/RegionManagerTe=
st.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/test/java/org/jboss/cache/marshall/RegionManagerTest.jav=
a	2008-01-14 14:53:44 UTC (rev 5122)
+++ core/trunk/src/test/java/org/jboss/cache/marshall/RegionManagerTest.jav=
a	2008-01-14 15:34:07 UTC (rev 5123)
@@ -82,7 +82,7 @@
       assertFalse("Should not be expecting any more regions", expectedRegi=
ons.hasNext());
    }
 =

-   public void testDefaultRegion()
+   public void testNoDefaultRegion()
    {
       Fqn fqn1 =3D Fqn.fromString("/a/b/c");
       Fqn fqn2 =3D Fqn.fromString("/a/b/");
@@ -90,10 +90,17 @@
       r.getRegion(fqn1, true);
       r.getRegion(fqn2, true);
 =

-      Region region =3D r.getRegion("/a", false);
+      Region region =3D null;
+      try
+      {
+         region =3D r.getRegion("/a", false);
+      }
+      catch (Exception e)
+      {
+         fail("If we don't set the default region, it still should be ok!"=
);
+      }
 =

-      assertNotNull("Default region is not null!", region);
-      assert region.getFqn().equals(Fqn.ROOT) : "Should be the default reg=
ion";
+      assertNull("Default region is not null!", region);
    }
 =

 =

@@ -120,28 +127,28 @@
       Region r2 =3D r.getRegion(fqn2, true);
       Region r3 =3D r.getRegion(fqn3, true);
 =

-      assertEquals("Expecting 4 regions", 4, r.getAllRegions(Region.Type.A=
NY).size());
+      assertEquals("Expecting 3 regions", 3, r.getAllRegions(Region.Type.A=
NY).size());
 =

       // test that removal doesn't affect parent traversal.
       assertEquals(r3, r.getRegion(fqn3, false));
 =

       r.removeRegion(Fqn.fromString(fqn3));
 =

-      assertEquals("Expecting 3 regions", 3, r.getAllRegions(Region.Type.A=
NY).size());
+      assertEquals("Expecting 2 regions", 2, r.getAllRegions(Region.Type.A=
NY).size());
 =

       // test that removal doesn't affect parent traversal.
       assertEquals("Should have retrieved parent region", r2, r.getRegion(=
fqn3, false));
 =

       r.removeRegion(Fqn.fromString(fqn2));
 =

-      assertEquals("Expecting 2 region", 2, r.getAllRegions(Region.Type.AN=
Y).size());
+      assertEquals("Expecting 1 region", 1, r.getAllRegions(Region.Type.AN=
Y).size());
 =

       // test that removal doesn't affect parent traversal.
       assertEquals("Should have retrieved parent region", r1, r.getRegion(=
fqn3, false));
 =

       r.removeRegion(Fqn.fromString(fqn1));
 =

-      assertEquals("Expecting 1 regions (default region)", 1, r.getAllRegi=
ons(Region.Type.ANY).size());
+      assertEquals("Expecting 0 regions", 0, r.getAllRegions(Region.Type.A=
NY).size());
    }
 =

    public void testGetRegionsMethods()
@@ -153,7 +160,7 @@
       @SuppressWarnings("unused")
       Region r1 =3D r.getRegion(f1, true), r2 =3D r.getRegion(f2, true), r=
3 =3D r.getRegion(f3, true), r4 =3D r.getRegion(f4, true);
 =

-      assertEquals("5 regions should exist", 5, r.getAllRegions(Region.Typ=
e.ANY).size());
+      assertEquals("4 regions should exist", 4, r.getAllRegions(Region.Typ=
e.ANY).size());
 =

       assertEquals("None of the regions should marshalling or active", 0, =
r.getAllRegions(Region.Type.MARSHALLING).size());
 =



--===============3052709756073511971==--

From jbosscache-commits at lists.jboss.org Mon Jan 14 11:03:21 2008
Content-Type: multipart/mixed; boundary="===============3964160328690542557=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN:  r5124 - core/tags.
Date: Mon, 14 Jan 2008 10:59:21 -0500
Message-ID: <E1JERib-0006uA-I8@committer01.frg.pub.inap.atl.jboss.com>

--===============3964160328690542557==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: manik.surtani(a)jboss.com
Date: 2008-01-14 10:59:21 -0500 (Mon, 14 Jan 2008)
New Revision: 5124

Added:
   core/tags/2.1.0.CR3/
Log:
CR3

Copied: core/tags/2.1.0.CR3 (from rev 5123, core/trunk)


--===============3964160328690542557==--

From jbosscache-commits at lists.jboss.org Mon Jan 14 11:06:58 2008
Content-Type: multipart/mixed; boundary="===============2313380588243108257=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r5125 - in core/tags/2.1.0.CR3:
 src/main/java/org/jboss/cache and 1 other directory.
Date: Mon, 14 Jan 2008 11:02:58 -0500
Message-ID: <E1JERm6-00081H-K3@committer01.frg.pub.inap.atl.jboss.com>

--===============2313380588243108257==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: manik.surtani(a)jboss.com
Date: 2008-01-14 11:02:58 -0500 (Mon, 14 Jan 2008)
New Revision: 5125

Modified:
   core/tags/2.1.0.CR3/pom.xml
   core/tags/2.1.0.CR3/src/main/java/org/jboss/cache/Version.java
Log:
UPdated version numbers

Modified: core/tags/2.1.0.CR3/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/tags/2.1.0.CR3/pom.xml	2008-01-14 15:59:21 UTC (rev 5124)
+++ core/tags/2.1.0.CR3/pom.xml	2008-01-14 16:02:58 UTC (rev 5125)
@@ -4,7 +4,7 @@
          xsi:schemaLocation=3D"http://maven.apache.org/POM/4.0.0 http://ma=
ven.apache.org/xsd/maven-4.0.0.xsd">
    <modelVersion>4.0.0</modelVersion>
    <properties>
-      <jbosscache-core-version>2.1.0-SNAPSHOT</jbosscache-core-version>
+      <jbosscache-core-version>2.1.0.CR3</jbosscache-core-version>
    </properties>
    <parent>
       <groupId>org.jboss.cache</groupId>

Modified: core/tags/2.1.0.CR3/src/main/java/org/jboss/cache/Version.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/tags/2.1.0.CR3/src/main/java/org/jboss/cache/Version.java	2008-01-=
14 15:59:21 UTC (rev 5124)
+++ core/tags/2.1.0.CR3/src/main/java/org/jboss/cache/Version.java	2008-01-=
14 16:02:58 UTC (rev 5125)
@@ -11,10 +11,10 @@
 @Immutable
 public class Version
 {
-   public static final String version =3D "2.1.0-SNAPSHOT";
+   public static final String version =3D "2.1.0.CR3";
    public static final String codename =3D "Alegrias";
    public static final String cvs =3D "$Id: Version.java 4592 2007-10-10 1=
6:44:36Z manik.surtani(a)jboss.com $";
-   static final byte[] version_id =3D {'0', '2', '1', '0', 'S'};
+   static final byte[] version_id =3D {'0', '2', '1', '0', 'C', '3'};
 =

    private static final int MAJOR_SHIFT =3D 11;
    private static final int MINOR_SHIFT =3D 6;


--===============2313380588243108257==--

From jboss-qa-internal at redhat.com Mon Jan 14 11:56:04 2008
Content-Type: multipart/mixed; boundary="===============4798419795464269568=="
MIME-Version: 1.0
From: jboss-qa-internal at redhat.com
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] Hudson build completed: jboss-cache-1.4.X-jdk1.5
 #56
Date: Mon, 14 Jan 2008 11:54:39 -0500
Message-ID: <18202418.17781200329679924.JavaMail.hudson@dev45.qa.atl2.redhat.com>

--===============4798419795464269568==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

See http://hudson.qa.jboss.com/hudson/job/jboss-cache-1.4.X-jdk1.5/56/chang=
es



--===============4798419795464269568==--

From jbosscache-commits at lists.jboss.org Mon Jan 14 16:43:42 2008
Content-Type: multipart/mixed; boundary="===============1118436887120443493=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r5126 -
 pojo/trunk/src/main/java/org/jboss/cache/pojo/jmx.
Date: Mon, 14 Jan 2008 16:43:41 -0500
Message-ID: <E1JEX5p-0008OT-Tp@committer01.frg.pub.inap.atl.jboss.com>

--===============1118436887120443493==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: bstansberry(a)jboss.com
Date: 2008-01-14 16:43:41 -0500 (Mon, 14 Jan 2008)
New Revision: 5126

Modified:
   pojo/trunk/src/main/java/org/jboss/cache/pojo/jmx/PojoCacheJmxWrapper.ja=
va
Log:
Avoid NPE if asked to send a notification before plainCacheWrapper is assig=
ned

Modified: pojo/trunk/src/main/java/org/jboss/cache/pojo/jmx/PojoCacheJmxWra=
pper.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- pojo/trunk/src/main/java/org/jboss/cache/pojo/jmx/PojoCacheJmxWrapper.j=
ava	2008-01-14 16:02:58 UTC (rev 5125)
+++ pojo/trunk/src/main/java/org/jboss/cache/pojo/jmx/PojoCacheJmxWrapper.j=
ava	2008-01-14 21:43:41 UTC (rev 5126)
@@ -934,17 +934,20 @@
     */
    private void sendStateChangeNotification(int oldState, int newState, St=
ring msg, Throwable t)
    {
-      long now =3D System.currentTimeMillis();
-
-      AttributeChangeNotification stateChangeNotification =3D new Attribut=
eChangeNotification(
-              this,
-              plainCacheWrapper.getNextNotificationSequenceNumber(), now, =
msg,
-              "State", "java.lang.Integer",
-              new Integer(oldState), new Integer(newState)
-      );
-      stateChangeNotification.setUserData(t);
-
-      plainCacheWrapper.sendNotification(stateChangeNotification);
+      if (plainCacheWrapper !=3D null)
+      {
+         long now =3D System.currentTimeMillis();
+   =

+         AttributeChangeNotification stateChangeNotification =3D new Attri=
buteChangeNotification(
+                 this,
+                 plainCacheWrapper.getNextNotificationSequenceNumber(), no=
w, msg,
+                 "State", "java.lang.Integer",
+                 new Integer(oldState), new Integer(newState)
+         );
+         stateChangeNotification.setUserData(t);
+   =

+         plainCacheWrapper.sendNotification(stateChangeNotification);
+      }
    }
 =

    /**


--===============1118436887120443493==--

From jbosscache-commits at lists.jboss.org Mon Jan 14 16:46:01 2008
Content-Type: multipart/mixed; boundary="===============8359065733321450722=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r5127 -
 pojo/trunk/src/main/java/org/jboss/cache/pojo/jmx.
Date: Mon, 14 Jan 2008 16:46:01 -0500
Message-ID: <E1JEX85-0000pR-Ne@committer01.frg.pub.inap.atl.jboss.com>

--===============8359065733321450722==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: bstansberry(a)jboss.com
Date: 2008-01-14 16:46:01 -0500 (Mon, 14 Jan 2008)
New Revision: 5127

Modified:
   pojo/trunk/src/main/java/org/jboss/cache/pojo/jmx/PojoCacheJmxWrapper.ja=
va
Log:
Avoid NPEs in destroy()

Modified: pojo/trunk/src/main/java/org/jboss/cache/pojo/jmx/PojoCacheJmxWra=
pper.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- pojo/trunk/src/main/java/org/jboss/cache/pojo/jmx/PojoCacheJmxWrapper.j=
ava	2008-01-14 21:43:41 UTC (rev 5126)
+++ pojo/trunk/src/main/java/org/jboss/cache/pojo/jmx/PojoCacheJmxWrapper.j=
ava	2008-01-14 21:46:01 UTC (rev 5127)
@@ -251,13 +251,15 @@
       {
          cacheStatus =3D CacheStatus.DESTROYING;
 =

-         pojoCache.destroy();
+         if (pojoCache !=3D null)
+            pojoCache.destroy();
 =

          // The cache is destroyed, so we shouldn't leave it registered
          // in JMX even if we didn't register it in create()
          unregisterPlainCache();
 =

-         plainCacheWrapper.destroy();
+         if (plainCacheWrapper !=3D null)
+            plainCacheWrapper.destroy();
       }
       finally
       {


--===============8359065733321450722==--

From jbosscache-commits at lists.jboss.org Mon Jan 14 17:50:47 2008
Content-Type: multipart/mixed; boundary="===============7534258286801411060=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r5128 -
 core/trunk/src/main/java/org/jboss/cache/jmx.
Date: Mon, 14 Jan 2008 17:50:46 -0500
Message-ID: <E1JEY8k-0005Cl-QD@committer01.frg.pub.inap.atl.jboss.com>

--===============7534258286801411060==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: bstansberry(a)jboss.com
Date: 2008-01-14 17:50:46 -0500 (Mon, 14 Jan 2008)
New Revision: 5128

Modified:
   core/trunk/src/main/java/org/jboss/cache/jmx/CacheJmxWrapper.java
Log:
Avoid NPEs in destroy()

Modified: core/trunk/src/main/java/org/jboss/cache/jmx/CacheJmxWrapper.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/java/org/jboss/cache/jmx/CacheJmxWrapper.java	2008-=
01-14 21:46:01 UTC (rev 5127)
+++ core/trunk/src/main/java/org/jboss/cache/jmx/CacheJmxWrapper.java	2008-=
01-14 22:50:46 UTC (rev 5128)
@@ -680,7 +680,8 @@
          // in JMX, even if we didn't register them in create
          unregisterInterceptors();
 =

-         cache.destroy();
+         if (cache !=3D null)
+            cache.destroy();
       }
       finally
       {


--===============7534258286801411060==--

From jbosscache-commits at lists.jboss.org Mon Jan 14 19:19:02 2008
Content-Type: multipart/mixed; boundary="===============3401716991038807474=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r5129 - in pojo/branches/2.1:
 src/test/java/org/jboss/cache/pojo and 6 other directories.
Date: Mon, 14 Jan 2008 19:19:02 -0500
Message-ID: <E1JEZWA-0006j8-DJ@committer01.frg.pub.inap.atl.jboss.com>

--===============3401716991038807474==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: jason.greene(a)jboss.com
Date: 2008-01-14 19:19:02 -0500 (Mon, 14 Jan 2008)
New Revision: 5129

Removed:
   pojo/branches/2.1/src/test/java/org/jboss/cache/pojo/TestingUtil.java
Modified:
   pojo/branches/2.1/pom.xml
   pojo/branches/2.1/src/test/java/org/jboss/cache/pojo/LocalConcurrentTest=
.java
   pojo/branches/2.1/src/test/java/org/jboss/cache/pojo/LocalTxTest.java
   pojo/branches/2.1/src/test/java/org/jboss/cache/pojo/NewReplicatedTxTest=
.java
   pojo/branches/2.1/src/test/java/org/jboss/cache/pojo/ReplicatedCircularG=
raphTest.java
   pojo/branches/2.1/src/test/java/org/jboss/cache/pojo/ReplicatedObjectGra=
phTest.java
   pojo/branches/2.1/src/test/java/org/jboss/cache/pojo/ReplicatedTxTest.ja=
va
   pojo/branches/2.1/src/test/java/org/jboss/cache/pojo/jmx/NotificationTes=
t.java
   pojo/branches/2.1/src/test/java/org/jboss/cache/pojo/memory/ReplicatedTe=
st.java
   pojo/branches/2.1/src/test/java/org/jboss/cache/pojo/optimistic/Abstract=
OptimisticTestCase.java
   pojo/branches/2.1/src/test/java/org/jboss/cache/pojo/region/LocalConcurr=
entTest.java
   pojo/branches/2.1/src/test/java/org/jboss/cache/pojo/region/LocalTest.ja=
va
   pojo/branches/2.1/src/test/java/org/jboss/cache/pojo/rollback/Replicated=
TxTest.java
   pojo/branches/2.1/src/test/java/org/jboss/cache/pojo/statetransfer/Repli=
catedTest.java
Log:
Prepare for a CR3 release


Modified: pojo/branches/2.1/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- pojo/branches/2.1/pom.xml	2008-01-14 22:50:46 UTC (rev 5128)
+++ pojo/branches/2.1/pom.xml	2008-01-15 00:19:02 UTC (rev 5129)
@@ -4,9 +4,9 @@
   xsi:schemaLocation=3D"http://maven.apache.org/POM/4.0.0 http://maven.apa=
che.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <properties>
-    <jbosscache-pojo-version>2.1.0.CR2</jbosscache-pojo-version>
-    <jbosscache-core-version>2.1.0.CR2</jbosscache-core-version>
-    <jboss.aop.version>2.0.0.beta1</jboss.aop.version>
+    <jbosscache-pojo-version>2.1.0.CR3</jbosscache-pojo-version>
+    <jbosscache-core-version>2.1.0.CR3</jbosscache-core-version>
+    <jboss.aop.version>2.0.0.CR3</jboss.aop.version>
   </properties>
   <parent>
     <groupId>org.jboss.cache</groupId>
@@ -105,11 +105,6 @@
         <!-- HACK: AOP project and plugin has broken deps -->
         <dependencies>    =

           <dependency>
-            <groupId>org.jboss.microcontainer</groupId>
-            <artifactId>jboss-container</artifactId>
-            <version>2.0.0.Beta4</version>
-          </dependency>
-          <dependency>
             <groupId>commons-logging</groupId>
             <artifactId>commons-logging</artifactId>
             <version>1.0.4</version>
@@ -119,7 +114,12 @@
             <artifactId>jbosscache-core</artifactId>
             <version>${jbosscache-core-version}</version>
           </dependency>
-        </dependencies>    =

+          <dependency>
+            <groupId>org.jboss.aop</groupId>
+            <artifactId>jboss-aop</artifactId>
+            <version>${jboss.aop.version}</version>
+          </dependency>
+        </dependencies> =

         <executions>
           <execution>
             <id>aopc</id>

Modified: pojo/branches/2.1/src/test/java/org/jboss/cache/pojo/LocalConcurr=
entTest.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- pojo/branches/2.1/src/test/java/org/jboss/cache/pojo/LocalConcurrentTes=
t.java	2008-01-14 22:50:46 UTC (rev 5128)
+++ pojo/branches/2.1/src/test/java/org/jboss/cache/pojo/LocalConcurrentTes=
t.java	2008-01-15 00:19:02 UTC (rev 5129)
@@ -18,6 +18,7 @@
 =

 import org.jboss.cache.config.Configuration;
 import org.jboss.cache.lock.UpgradeException;
+import org.jboss.cache.misc.TestingUtil;
 import org.jboss.cache.pojo.test.Address;
 import org.jboss.cache.pojo.test.Person;
 import org.jboss.cache.transaction.DummyTransactionManager;

Modified: pojo/branches/2.1/src/test/java/org/jboss/cache/pojo/LocalTxTest.=
java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- pojo/branches/2.1/src/test/java/org/jboss/cache/pojo/LocalTxTest.java	2=
008-01-14 22:50:46 UTC (rev 5128)
+++ pojo/branches/2.1/src/test/java/org/jboss/cache/pojo/LocalTxTest.java	2=
008-01-15 00:19:02 UTC (rev 5129)
@@ -24,6 +24,7 @@
 =

 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.jboss.cache.misc.TestingUtil;
 import org.jboss.cache.pojo.test.Address;
 import org.jboss.cache.pojo.test.Person;
 import org.jboss.cache.transaction.DummyTransactionManager;

Modified: pojo/branches/2.1/src/test/java/org/jboss/cache/pojo/NewReplicate=
dTxTest.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- pojo/branches/2.1/src/test/java/org/jboss/cache/pojo/NewReplicatedTxTes=
t.java	2008-01-14 22:50:46 UTC (rev 5128)
+++ pojo/branches/2.1/src/test/java/org/jboss/cache/pojo/NewReplicatedTxTes=
t.java	2008-01-15 00:19:02 UTC (rev 5129)
@@ -26,6 +26,7 @@
 import org.apache.commons.logging.LogFactory;
 import org.jboss.cache.config.Configuration.CacheMode;
 import org.jboss.cache.factories.UnitTestCacheConfigurationFactory;
+import org.jboss.cache.misc.TestingUtil;
 import org.jboss.cache.pojo.test.Address;
 import org.jboss.cache.pojo.test.Person;
 import org.jboss.cache.transaction.DummyTransactionManager;

Modified: pojo/branches/2.1/src/test/java/org/jboss/cache/pojo/ReplicatedCi=
rcularGraphTest.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- pojo/branches/2.1/src/test/java/org/jboss/cache/pojo/ReplicatedCircular=
GraphTest.java	2008-01-14 22:50:46 UTC (rev 5128)
+++ pojo/branches/2.1/src/test/java/org/jboss/cache/pojo/ReplicatedCircular=
GraphTest.java	2008-01-15 00:19:02 UTC (rev 5129)
@@ -19,6 +19,7 @@
 import org.jboss.cache.Fqn;
 import org.jboss.cache.config.Configuration.CacheMode;
 import org.jboss.cache.factories.UnitTestCacheConfigurationFactory;
+import org.jboss.cache.misc.TestingUtil;
 import org.jboss.cache.pojo.test.Link;
 import org.jboss.cache.pojo.test.NodeManager;
 import org.jboss.cache.pojo.test.Person;

Modified: pojo/branches/2.1/src/test/java/org/jboss/cache/pojo/ReplicatedOb=
jectGraphTest.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- pojo/branches/2.1/src/test/java/org/jboss/cache/pojo/ReplicatedObjectGr=
aphTest.java	2008-01-14 22:50:46 UTC (rev 5128)
+++ pojo/branches/2.1/src/test/java/org/jboss/cache/pojo/ReplicatedObjectGr=
aphTest.java	2008-01-15 00:19:02 UTC (rev 5129)
@@ -7,6 +7,7 @@
 import org.jboss.cache.Fqn;
 import org.jboss.cache.config.Configuration.CacheMode;
 import org.jboss.cache.factories.UnitTestCacheConfigurationFactory;
+import org.jboss.cache.misc.TestingUtil;
 import org.jboss.cache.pojo.test.Address;
 import org.jboss.cache.pojo.test.Person;
 import org.testng.annotations.AfterMethod;

Modified: pojo/branches/2.1/src/test/java/org/jboss/cache/pojo/ReplicatedTx=
Test.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- pojo/branches/2.1/src/test/java/org/jboss/cache/pojo/ReplicatedTxTest.j=
ava	2008-01-14 22:50:46 UTC (rev 5128)
+++ pojo/branches/2.1/src/test/java/org/jboss/cache/pojo/ReplicatedTxTest.j=
ava	2008-01-15 00:19:02 UTC (rev 5129)
@@ -19,6 +19,7 @@
 import org.apache.commons.logging.LogFactory;
 import org.jboss.cache.config.Configuration.CacheMode;
 import org.jboss.cache.factories.UnitTestCacheConfigurationFactory;
+import org.jboss.cache.misc.TestingUtil;
 import org.jboss.cache.pojo.test.Person;
 import org.jboss.cache.transaction.DummyTransactionManager;
 import org.testng.annotations.AfterMethod;

Deleted: pojo/branches/2.1/src/test/java/org/jboss/cache/pojo/TestingUtil.j=
ava
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- pojo/branches/2.1/src/test/java/org/jboss/cache/pojo/TestingUtil.java	2=
008-01-14 22:50:46 UTC (rev 5128)
+++ pojo/branches/2.1/src/test/java/org/jboss/cache/pojo/TestingUtil.java	2=
008-01-15 00:19:02 UTC (rev 5129)
@@ -1,139 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- *
- * Distributable under LGPL license.
- * See terms of license at gnu.org.
- */
-
-package org.jboss.cache.pojo;
-
-import org.jboss.cache.CacheImpl;
-import org.jgroups.Address;
-
-import java.util.List;
-
-/**
- * Utilities for unit testing JBossCache.
- *
- * @author <a href=3D"mailto://brian.stansberry(a)jboss.com">Brian Stansbe=
rry</a>
- * @version $Revision$
- */
-public class TestingUtil
-{
-
-   /**
-    * @param caches  caches which must all have consistent views
-    * @param timeout max number of ms to loop
-    * @throws RuntimeException if <code>timeout</code> ms have elapse with=
out
-    *                          all caches having the same number of member=
s.
-    */
-   public static void blockUntilViewsReceived(PojoCache[] caches, long tim=
eout)
-   {
-      long failTime =3D System.currentTimeMillis() + timeout;
-
-      while (System.currentTimeMillis() < failTime)
-      {
-         org.jboss.cache.pojo.TestingUtil.sleepThread(100);
-         if (org.jboss.cache.pojo.TestingUtil.areCacheViewsComplete(caches=
))
-            return;
-      }
-
-      throw new RuntimeException("timed out before caches had complete vie=
ws");
-   }
-
-   /**
-    */
-   public static void blockUntilViewReceived(PojoCache cache, int groupSiz=
e, long timeout)
-   {
-      long failTime =3D System.currentTimeMillis() + timeout;
-
-      CacheImpl<Object, Object> tcache =3D (CacheImpl<Object, Object>) cac=
he.getCache();
-      while (System.currentTimeMillis() < failTime)
-      {
-         org.jboss.cache.pojo.TestingUtil.sleepThread(100);
-         if (org.jboss.cache.pojo.TestingUtil.isCacheViewComplete(tcache, =
groupSize))
-            return;
-      }
-
-      throw new RuntimeException("timed out before caches had complete vie=
ws");
-   }
-
-   /**
-    * Checks each cache to see if the number of elements in the array
-    * returned by {@link org.jboss.cache.CacheImpl#getMembers()} matches t=
he size of
-    * the <code>caches</code> parameter.
-    *
-    * @param caches caches that should form a View
-    * @return <code>true</code> if all caches have
-    *         <code>caches.length</code> members; false otherwise
-    * @throws IllegalStateException if any of the caches have MORE view
-    *                               members than caches.length
-    */
-   public static boolean areCacheViewsComplete(PojoCache[] caches)
-   {
-      int memberCount =3D caches.length;
-
-      for (int i =3D 0; i < memberCount; i++)
-      {
-         CacheImpl<Object, Object> cache =3D (CacheImpl<Object, Object>) c=
aches[i].getCache();
-         return org.jboss.cache.pojo.TestingUtil.isCacheViewComplete(cache=
, memberCount);
-      }
-
-      return true;
-   }
-
-   /**
-    * FIXME Comment this
-    *
-    * @param cache
-    * @param memberCount
-    */
-   public static boolean isCacheViewComplete(CacheImpl<Object, Object> cac=
he, int memberCount)
-   {
-      List<Address> members =3D cache.getMembers();
-      if (members =3D=3D null || memberCount > members.size())
-      {
-         return false;
-      }
-      else if (memberCount < members.size())
-      {
-         // This is an exceptional condition
-         StringBuffer sb =3D new StringBuffer("Cache at address ");
-         sb.append(cache.getLocalAddress());
-         sb.append(" had ");
-         sb.append(members.size());
-         sb.append(" members; expecting ");
-         sb.append(memberCount);
-         sb.append(". Members were (");
-         for (int j =3D 0; j < members.size(); j++)
-         {
-            if (j > 0)
-               sb.append(", ");
-            sb.append(members.get(j));
-         }
-         sb.append(')');
-
-         throw new IllegalStateException(sb.toString());
-      }
-
-      return true;
-   }
-
-
-   /**
-    * Puts the current thread to sleep for the desired number of ms, suppr=
essing
-    * any exceptions.
-    *
-    * @param sleeptime number of ms to sleep
-    */
-   public static void sleepThread(long sleeptime)
-   {
-      try
-      {
-         Thread.sleep(sleeptime);
-      }
-      catch (InterruptedException ie)
-      {
-      }
-   }
-}

Modified: pojo/branches/2.1/src/test/java/org/jboss/cache/pojo/jmx/Notifica=
tionTest.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- pojo/branches/2.1/src/test/java/org/jboss/cache/pojo/jmx/NotificationTe=
st.java	2008-01-14 22:50:46 UTC (rev 5128)
+++ pojo/branches/2.1/src/test/java/org/jboss/cache/pojo/jmx/NotificationTe=
st.java	2008-01-15 00:19:02 UTC (rev 5129)
@@ -2,7 +2,7 @@
 =

 import javax.management.ObjectName;
 =

-import org.jboss.cache.CacheImpl;
+import org.jboss.cache.CacheSPI;
 import org.jboss.cache.config.Configuration;
 import org.jboss.cache.pojo.PojoCache;
 import org.jboss.cache.pojo.PojoCacheFactory;
@@ -26,7 +26,7 @@
    protected Object createCacheAndJmxWrapper() throws Exception
    {
       pojoCache =3D createCache(CLUSTER_NAME);
-      cache =3D (CacheImpl<Object, Object>) pojoCache.getCache();
+      cache =3D (CacheSPI<Object, Object>)pojoCache.getCache();
       return new PojoCacheJmxWrapper(pojoCache);
    }
 =


Modified: pojo/branches/2.1/src/test/java/org/jboss/cache/pojo/memory/Repli=
catedTest.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- pojo/branches/2.1/src/test/java/org/jboss/cache/pojo/memory/ReplicatedT=
est.java	2008-01-14 22:50:46 UTC (rev 5128)
+++ pojo/branches/2.1/src/test/java/org/jboss/cache/pojo/memory/ReplicatedT=
est.java	2008-01-15 00:19:02 UTC (rev 5129)
@@ -19,9 +19,9 @@
 import org.jboss.cache.Fqn;
 import org.jboss.cache.config.Configuration.CacheMode;
 import org.jboss.cache.factories.UnitTestCacheConfigurationFactory;
+import org.jboss.cache.misc.TestingUtil;
 import org.jboss.cache.pojo.PojoCache;
 import org.jboss.cache.pojo.PojoCacheFactory;
-import org.jboss.cache.pojo.TestingUtil;
 import org.jboss.cache.pojo.test.Address;
 import org.jboss.cache.pojo.test.Person;
 import org.jboss.cache.pojo.test.SerializedAddress;

Modified: pojo/branches/2.1/src/test/java/org/jboss/cache/pojo/optimistic/A=
bstractOptimisticTestCase.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- pojo/branches/2.1/src/test/java/org/jboss/cache/pojo/optimistic/Abstrac=
tOptimisticTestCase.java	2008-01-14 22:50:46 UTC (rev 5128)
+++ pojo/branches/2.1/src/test/java/org/jboss/cache/pojo/optimistic/Abstrac=
tOptimisticTestCase.java	2008-01-15 00:19:02 UTC (rev 5129)
@@ -370,7 +370,7 @@
          System.out.println("*** " + oa.length);
          System.arraycopy(oa, 0, na, 0, oa.length);
          na[oa.length] =3D new DefaultDataVersion();
-         newList.add(MethodCallFactory.create(MethodDeclarations.getVersio=
nedMethod(c.getMethodId()), na));
+         newList.add(MethodCallFactory.create(c.getMethodId(), na));
       }
       return newList;
    }

Modified: pojo/branches/2.1/src/test/java/org/jboss/cache/pojo/region/Local=
ConcurrentTest.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- pojo/branches/2.1/src/test/java/org/jboss/cache/pojo/region/LocalConcur=
rentTest.java	2008-01-14 22:50:46 UTC (rev 5128)
+++ pojo/branches/2.1/src/test/java/org/jboss/cache/pojo/region/LocalConcur=
rentTest.java	2008-01-15 00:19:02 UTC (rev 5129)
@@ -17,9 +17,9 @@
 =

 import org.jboss.cache.Fqn;
 import org.jboss.cache.lock.UpgradeException;
+import org.jboss.cache.misc.TestingUtil;
 import org.jboss.cache.pojo.PojoCache;
 import org.jboss.cache.pojo.PojoCacheFactory;
-import org.jboss.cache.pojo.TestingUtil;
 import org.jboss.cache.pojo.test.Address;
 import org.jboss.cache.pojo.test.Person;
 import org.jboss.cache.transaction.DummyTransactionManager;

Modified: pojo/branches/2.1/src/test/java/org/jboss/cache/pojo/region/Local=
Test.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- pojo/branches/2.1/src/test/java/org/jboss/cache/pojo/region/LocalTest.j=
ava	2008-01-14 22:50:46 UTC (rev 5128)
+++ pojo/branches/2.1/src/test/java/org/jboss/cache/pojo/region/LocalTest.j=
ava	2008-01-15 00:19:02 UTC (rev 5129)
@@ -107,7 +107,7 @@
       Fqn<String> fqn =3D new Fqn<String>(Fqn.fromString(REGION), Internal=
Constant.JBOSS_INTERNAL);
       assertTrue("Internal region node should exist ",
               cache_.getCache().getRoot().hasChild(fqn));
-      System.out.println("Cache content: " +((org.jboss.cache.CacheImpl<Ob=
ject, Object>)cache_.getCache()).printDetails());
+      //System.out.println("Cache content: " +((org.jboss.cache.CacheImpl<=
Object, Object>)cache_.getCache()).printDetails());
    }
 =

    public void testModification() throws Exception
@@ -123,8 +123,8 @@
       createPerson("person/test3", "Joe", 32);
       cache_.detach("person/test3");
 =

-      String str =3D ((CacheImpl<Object, Object>) cache_.getCache()).print=
Details();
-      System.out.println("**** Details ***/n" + str);
+      //String str =3D ((CacheImpl<Object, Object>) cache_.getCache()).pri=
ntDetails();
+      //System.out.println("**** Details ***/n" + str);
 =

       Fqn<String> fqn =3D new Fqn<String>(Fqn.fromString(REGION), Internal=
Constant.JBOSS_INTERNAL);
       Node<Object, Object> n =3D cache_.getCache().getRoot().getChild(fqn);

Modified: pojo/branches/2.1/src/test/java/org/jboss/cache/pojo/rollback/Rep=
licatedTxTest.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- pojo/branches/2.1/src/test/java/org/jboss/cache/pojo/rollback/Replicate=
dTxTest.java	2008-01-14 22:50:46 UTC (rev 5128)
+++ pojo/branches/2.1/src/test/java/org/jboss/cache/pojo/rollback/Replicate=
dTxTest.java	2008-01-15 00:19:02 UTC (rev 5129)
@@ -26,9 +26,9 @@
 import org.apache.commons.logging.LogFactory;
 import org.jboss.cache.config.Configuration.CacheMode;
 import org.jboss.cache.factories.UnitTestCacheConfigurationFactory;
+import org.jboss.cache.misc.TestingUtil;
 import org.jboss.cache.pojo.PojoCache;
 import org.jboss.cache.pojo.PojoCacheFactory;
-import org.jboss.cache.pojo.TestingUtil;
 import org.jboss.cache.pojo.test.Person;
 import org.jboss.cache.transaction.DummyTransactionManager;
 import org.testng.annotations.AfterMethod;

Modified: pojo/branches/2.1/src/test/java/org/jboss/cache/pojo/statetransfe=
r/ReplicatedTest.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- pojo/branches/2.1/src/test/java/org/jboss/cache/pojo/statetransfer/Repl=
icatedTest.java	2008-01-14 22:50:46 UTC (rev 5128)
+++ pojo/branches/2.1/src/test/java/org/jboss/cache/pojo/statetransfer/Repl=
icatedTest.java	2008-01-15 00:19:02 UTC (rev 5129)
@@ -79,13 +79,13 @@
       cache =3D PojoCacheFactory.createCache(UnitTestCacheConfigurationFac=
tory.createConfiguration(CacheMode.REPL_SYNC), toStart);
       Person ben =3D createPerson("/person/test1", "Ben Wang", 40);
 =

-      System.out.println("\n*** I ***");
-      System.out.println(((CacheImpl<Object, Object>) cache.getCache()).pr=
intDetails());
+      //System.out.println("\n*** I ***");
+      //System.out.println(((CacheImpl<Object, Object>) cache.getCache()).=
printDetails());
       cache1 =3D PojoCacheFactory.createCache(UnitTestCacheConfigurationFa=
ctory.createConfiguration(CacheMode.REPL_SYNC), toStart);
       cache1.start();
 =

-      System.out.println("\n*** II ***");
-      System.out.println(((CacheImpl<Object, Object>) cache1.getCache()).p=
rintDetails());
+      //System.out.println("\n*** II ***");
+      //System.out.println(((CacheImpl<Object, Object>) cache1.getCache())=
.printDetails());
 =

       log.info("testSimple() ....");
       assertEquals("Ben Wang", ben.getName());


--===============3401716991038807474==--

From jbosscache-commits at lists.jboss.org Mon Jan 14 22:51:56 2008
Content-Type: multipart/mixed; boundary="===============1671937988120569686=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r5130 -
 core/trunk/src/test/java/org/jboss/cache/options/cachemodelocal.
Date: Mon, 14 Jan 2008 22:51:56 -0500
Message-ID: <E1JEcqC-0000go-Fv@committer01.frg.pub.inap.atl.jboss.com>

--===============1671937988120569686==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: bstansberry(a)jboss.com
Date: 2008-01-14 22:51:56 -0500 (Mon, 14 Jan 2008)
New Revision: 5130

Modified:
   core/trunk/src/test/java/org/jboss/cache/options/cachemodelocal/CacheMod=
eLocalTestBase.java
Log:
[JBCACHE-1265] Setting cacheModeLocal=3Dtrue ineffective for addChild(Fqn) =
call
Duplicate the other tests using the Node API.

Modified: core/trunk/src/test/java/org/jboss/cache/options/cachemodelocal/C=
acheModeLocalTestBase.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/test/java/org/jboss/cache/options/cachemodelocal/CacheMo=
deLocalTestBase.java	2008-01-15 00:19:02 UTC (rev 5129)
+++ core/trunk/src/test/java/org/jboss/cache/options/cachemodelocal/CacheMo=
deLocalTestBase.java	2008-01-15 03:51:56 UTC (rev 5130)
@@ -10,9 +10,11 @@
 import org.jboss.cache.CacheSPI;
 import org.jboss.cache.DefaultCacheFactory;
 import org.jboss.cache.Fqn;
+import org.jboss.cache.Node;
 import org.jboss.cache.config.Configuration;
 import static org.testng.AssertJUnit.assertEquals;
 import static org.testng.AssertJUnit.assertNull;
+import static org.testng.AssertJUnit.assertTrue;
 import org.testng.annotations.AfterMethod;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
@@ -156,6 +158,57 @@
       }
    }
 =

+   public void testPutKeyValueViaNodeAPI() throws Exception
+   {
+      Node node1 =3D cache1.getRoot().addChild(fqn);
+      cache1.getInvocationContext().getOptionOverrides().setCacheModeLocal=
(true);
+      node1.put(key, "value");
+      delay();
+      // cache1 should still have this
+      assertEquals("value", cache1.get(fqn, key));
+
+      // cache 2 should not
+      assertNull("Should be null", cache2.get(fqn, key));
+
+      // now try again with passing the default options
+      cache1.getInvocationContext().getOptionOverrides().reset();
+      node1.put(key, "value");
+      delay();
+      // cache1 should still have this
+      assertEquals("value", cache1.get(fqn, key));
+
+      // cache 2 should as well
+      if (!isInvalidation)
+      {
+         assertEquals("value", cache2.get(fqn, key));
+      }
+      else
+      {
+         assertNull("should be invalidated", cache2.get(fqn, key));
+      }
+
+      // now cache2
+      Node node2 =3D cache2.getRoot().getChild(fqn);
+      cache2.getInvocationContext().getOptionOverrides().setCacheModeLocal=
(true);
+      node2.put(key, "value2");
+      delay();
+      assertEquals("value2", cache2.get(fqn, key));
+      assertEquals("value", cache1.get(fqn, key));
+
+      cache2.getInvocationContext().getOptionOverrides().reset();
+      node2.put(key, "value2");
+      delay();
+      assertEquals("value2", cache2.get(fqn, key));
+      if (!isInvalidation)
+      {
+         assertEquals("value2", cache1.get(fqn, key));
+      }
+      else
+      {
+         assertNull("should be invalidated", cache1.get(fqn, key));
+      }
+   }
+
    public void testPutData() throws Exception
    {
       Map<String, String> map =3D new HashMap<String, String>();
@@ -207,6 +260,59 @@
       }
    }
 =

+   public void testPutDataViaNodeAPI() throws Exception
+   {
+      Map<String, String> map =3D new HashMap<String, String>();
+      map.put(key, "value");
+
+      Node node1 =3D cache1.getRoot().addChild(fqn);
+      cache1.getInvocationContext().getOptionOverrides().setCacheModeLocal=
(true);
+      node1.putAll(map);
+      delay();
+      // cache1 should still have this
+      assertEquals("value", cache1.get(fqn, key));
+      // cache 2 should not
+      assertNull("Should be null", cache2.get(fqn, key));
+
+      // now try again with passing the default options
+      cache1.getInvocationContext().getOptionOverrides().setCacheModeLocal=
(false);
+      node1.putAll(map);
+      delay();
+      // cache1 should still have this
+      assertEquals("value", cache1.get(fqn, key));
+      // cache 2 should as well
+      if (!isInvalidation)
+      {
+         assertEquals("value", cache2.get(fqn, key));
+      }
+      else
+      {
+         assertNull("should be invalidated", cache2.get(fqn, key));
+      }
+
+      // now cache2
+      Node node2 =3D cache2.getRoot().getChild(fqn);
+      map.put(key, "value2");
+      cache2.getInvocationContext().getOptionOverrides().setCacheModeLocal=
(true);
+      node2.putAll(map);
+      delay();
+      assertEquals("value2", cache2.get(fqn, key));
+      assertEquals("value", cache1.get(fqn, key));
+
+      cache2.getInvocationContext().getOptionOverrides().reset();
+      node2.put(key, "value2");
+      delay();
+      assertEquals("value2", cache2.get(fqn, key));
+      if (!isInvalidation)
+      {
+         assertEquals("value2", cache1.get(fqn, key));
+      }
+      else
+      {
+         assertNull("should be invalidated", cache1.get(fqn, key));
+      }
+   }
+
    public void testRemoveNode() throws Exception
    {
       // put some stuff in the cache first
@@ -263,6 +369,62 @@
       assertNull("should be null", cache2.get(fqn, key));
    }
 =

+   public void testRemoveNodeViaNodeAPI() throws Exception
+   {
+      // put some stuff in the cache first
+      // make sure we cleanup thread local vars.
+      cache1.getInvocationContext().setOptionOverrides(null);
+      cache1.put(fqn, key, "value");
+      delay();
+      assertEquals("value", cache1.get(fqn, key));
+      if (isInvalidation)
+      {
+         assertNull("Should be null", cache2.get(fqn, key));
+      }
+      else
+      {
+         assertEquals("value", cache2.get(fqn, key));
+      }
+
+      cache1.getInvocationContext().getOptionOverrides().setCacheModeLocal=
(true);
+      cache1.getRoot().removeChild(fqn);
+      delay();
+
+      // should be removed in cache1
+      assertNull("should be null", cache1.get(fqn, key));
+      // Not in cache2
+      if (isInvalidation)
+      {
+         assertNull("Should be null", cache2.get(fqn, key));
+      }
+      else
+      {
+         assertEquals("value", cache2.get(fqn, key));
+      }
+
+      // replace cache entries
+      cache1.put(fqn, key, "value");
+      delay();
+      assertEquals("value", cache1.get(fqn, key));
+      if (isInvalidation)
+      {
+         assertNull("Should be null", cache2.get(fqn, key));
+      }
+      else
+      {
+         assertEquals("value", cache2.get(fqn, key));
+      }
+
+      // now try again with passing the default options
+      cache1.getInvocationContext().getOptionOverrides().setCacheModeLocal=
(false);
+      cache1.getRoot().removeChild(fqn);
+      delay();
+
+      // both should be null
+      assertNull("should be null", cache1.get(fqn, key));
+      assertNull("should be null", cache2.get(fqn, key));
+   }
+
    public void testRemoveKey() throws Exception
    {
       // put some stuff in the cache first
@@ -318,6 +480,62 @@
       assertNull("should be null", cache2.get(fqn, key));
    }
 =

+   public void testRemoveKeyViaNodeAPI() throws Exception
+   {
+      // put some stuff in the cache first
+      Node node1 =3D cache1.getRoot().addChild(fqn);
+      cache1.getInvocationContext().setOptionOverrides(null);
+      node1.put(key, "value");
+      delay();
+      assertEquals("value", cache1.get(fqn, key));
+      if (isInvalidation)
+      {
+         assertNull("Should be null", cache2.get(fqn, key));
+      }
+      else
+      {
+         assertEquals("value", cache2.get(fqn, key));
+      }
+
+      cache1.getInvocationContext().getOptionOverrides().setCacheModeLocal=
(true);
+      node1.remove(key);
+      delay();
+
+      // should be removed in cache1
+      assertNull("should be null", cache1.get(fqn, key));
+      // Not in cache2
+      if (isInvalidation)
+      {
+         assertNull("Should be null", cache2.get(fqn, key));
+      }
+      else
+      {
+         assertEquals("value", cache2.get(fqn, key));
+      }
+
+      // replace cache entries
+      node1.put(key, "value");
+      delay();
+      assertEquals("value", cache1.get(fqn, key));
+      if (isInvalidation)
+      {
+         assertNull("Should be null", cache2.get(fqn, key));
+      }
+      else
+      {
+         assertEquals("value", cache2.get(fqn, key));
+      }
+
+      // now try again with passing the default options
+      cache1.getInvocationContext().getOptionOverrides().reset();
+      node1.remove(key);
+      delay();
+
+      // both should be null
+      assertNull("should be null", cache1.get(fqn, key));
+      assertNull("should be null", cache2.get(fqn, key));
+   }
+
    public void testTransactionalBehaviour() throws Exception
    {
       TransactionManager mgr =3D cache1.getTransactionManager();
@@ -401,6 +619,120 @@
 =

    }
 =

+   public void testTransactionalBehaviourViaNodeAPI() throws Exception
+   {
+      Node node1 =3D cache1.getRoot().addChild(fqn);
+      TransactionManager mgr =3D cache1.getTransactionManager();
+      mgr.begin();
+      cache1.getInvocationContext().getOptionOverrides().reset();
+      node1.put(key, "value1");
+      cache1.getInvocationContext().getOptionOverrides().setCacheModeLocal=
(true);
+      node1.put(key, "value2");
+      mgr.commit();
+      delay();
+      // cache1 should still have this
+      assertEquals("value2", cache1.get(fqn, key));
+
+      if (!isInvalidation)
+      {
+         assertEquals("value1", cache2.get(fqn, key));
+      }
+      else
+      {
+         assertNull(cache2.get(fqn, key));
+      }
+
+      // now try again with passing the default options
+      mgr.begin();
+      cache1.getInvocationContext().getOptionOverrides().setCacheModeLocal=
(true);
+      node1.put(key, "value3");
+      cache1.getInvocationContext().getOptionOverrides().reset();
+      node1.put(key, "value");
+      mgr.commit();
+      delay();
+      // cache1 should still have this
+      assertEquals("value", cache1.get(fqn, key));
+
+      // cache 2 should as well
+      if (!isInvalidation)
+      {
+         assertEquals("value", cache2.get(fqn, key));
+      }
+      else
+      {
+         assertNull("should be invalidated", cache2.get(fqn, key));
+      }
+
+      // now cache2
+      Node node2 =3D cache2.getRoot().addChild(fqn);
+      mgr =3D cache2.getTransactionManager();
+      mgr.begin();
+      cache2.getInvocationContext().getOptionOverrides().setCacheModeLocal=
(false);
+      node2.put(key, "value3");
+      cache2.getInvocationContext().getOptionOverrides().setCacheModeLocal=
(true);
+      node2.put(key, "value2");
+      mgr.commit();
+      delay();
+
+      assertEquals("value2", cache2.get(fqn, key));
+
+      if (!isInvalidation)
+      {
+         assertEquals("value3", cache1.get(fqn, key));
+      }
+      else
+      {
+         assertNull(cache1.get(fqn, key));
+      }
+
+      mgr.begin();
+      cache2.getInvocationContext().getOptionOverrides().setCacheModeLocal=
(true);
+      node2.put(key, "value2");
+      cache2.getInvocationContext().getOptionOverrides().reset();
+      node2.put(key, "value2");
+      mgr.commit();
+      delay();
+      assertEquals("value2", cache2.get(fqn, key));
+      if (!isInvalidation)
+      {
+         assertEquals("value2", cache1.get(fqn, key));
+      }
+      else
+      {
+         assertNull("should be invalidated", cache1.get(fqn, key));
+      }
+
+   }
+
+   public void testAddChild() throws Exception
+   {
+      cache1.getInvocationContext().getOptionOverrides().setCacheModeLocal=
(true);
+      cache1.getRoot().addChild(fqn);
+      delay();
+      // cache1 should still have this
+      assertTrue(cache1.getRoot().hasChild(fqn));
+      // cache 2 should not
+      Node node2 =3D cache2.getRoot().getChild(fqn);
+      assertTrue("Should be null", node2 =3D=3D null || (isInvalidation &&=
 !node2.isValid()));
+
+      // now try again with passing the default options
+      cache1.getRoot().removeChild(fqn);
+      cache1.getInvocationContext().getOptionOverrides().setCacheModeLocal=
(false);
+      cache1.getRoot().addChild(fqn);
+      delay();
+      // cache1 should still have this
+      assertTrue(cache1.getRoot().hasChild(fqn));
+      // cache 2 should as well
+      if (!isInvalidation)
+      {
+         assertTrue(cache2.getRoot().hasChild(fqn));
+      }
+      else
+      {
+         assertTrue("Should be null", node2 =3D=3D null || !node2.isValid(=
));
+      }
+   }
+
    protected abstract void delay();
 =

 }
\ No newline at end of file


--===============1671937988120569686==--

From jbosscache-commits at lists.jboss.org Tue Jan 15 00:17:57 2008
Content-Type: multipart/mixed; boundary="===============7804324105580014719=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r5131 - in
 core/trunk/src/main/java/org/jboss/cache: buddyreplication and 1 other
 directory.
Date: Tue, 15 Jan 2008 00:17:56 -0500
Message-ID: <E1JEeBQ-0001pJ-Uq@committer01.frg.pub.inap.atl.jboss.com>

--===============7804324105580014719==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: bstansberry(a)jboss.com
Date: 2008-01-15 00:17:56 -0500 (Tue, 15 Jan 2008)
New Revision: 5131

Modified:
   core/trunk/src/main/java/org/jboss/cache/RegionManager.java
   core/trunk/src/main/java/org/jboss/cache/buddyreplication/BuddyManager.j=
ava
Log:
[JBCACHE-1266] Use Cache.put(Fqn, null) as workaround for Node.addChild(Fqn)

Modified: core/trunk/src/main/java/org/jboss/cache/RegionManager.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/java/org/jboss/cache/RegionManager.java	2008-01-15 =
03:51:56 UTC (rev 5130)
+++ core/trunk/src/main/java/org/jboss/cache/RegionManager.java	2008-01-15 =
05:17:56 UTC (rev 5131)
@@ -433,7 +433,11 @@
                   // need to obtain all necessary locks.
                   // needs to be a LOCAL call!
                   cache.getInvocationContext().getOptionOverrides().setCac=
heModeLocal(true);
-                  subtreeRoot =3D cache.getRoot().addChild(buddyRoot);
+                  // FIXME -- restore the next line and remove the 2 follo=
wing =

+                  // when JBCACHE-1265 is fixed
+                  //subtreeRoot =3D cache.getRoot().addChild(buddyRoot);
+                  cache.put(buddyRoot, null);
+                  subtreeRoot =3D cache.getRoot().getChild(buddyRoot);
                   cache.getInvocationContext().getOptionOverrides().setCac=
heModeLocal(false);
                }
                cache.fetchPartialState(sources, fqn, subtreeRoot.getFqn());

Modified: core/trunk/src/main/java/org/jboss/cache/buddyreplication/BuddyMa=
nager.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/java/org/jboss/cache/buddyreplication/BuddyManager.=
java	2008-01-15 03:51:56 UTC (rev 5130)
+++ core/trunk/src/main/java/org/jboss/cache/buddyreplication/BuddyManager.=
java	2008-01-15 05:17:56 UTC (rev 5131)
@@ -538,7 +538,10 @@
          o =3D cache.getInvocationContext().getOptionOverrides();
          o.setCacheModeLocal(true);
          o.setSkipCacheStatusCheck(true);
-         root.addChild(new Fqn<String>(BUDDY_BACKUP_SUBTREE, newGroup.getG=
roupName()));
+         // FIXME -- restore the next line and remove the following one =

+         // when JBCACHE-1265 is fixed
+//         root.addChild(new Fqn<String>(BUDDY_BACKUP_SUBTREE, newGroup.ge=
tGroupName()));
+         cache.put(new Fqn<String>(BUDDY_BACKUP_SUBTREE, newGroup.getGroup=
Name()), null);
       }
       else
       {


--===============7804324105580014719==--

From jbosscache-commits at lists.jboss.org Tue Jan 15 05:40:11 2008
Content-Type: multipart/mixed; boundary="===============5252476951542421654=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r5132 - in core/trunk/src:
 main/java/org/jboss/cache/invocation and 1 other directories.
Date: Tue, 15 Jan 2008 05:40:11 -0500
Message-ID: <E1JEjDH-0006zM-Ck@committer01.frg.pub.inap.atl.jboss.com>

--===============5252476951542421654==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: manik.surtani(a)jboss.com
Date: 2008-01-15 05:40:11 -0500 (Tue, 15 Jan 2008)
New Revision: 5132

Modified:
   core/trunk/src/main/java/org/jboss/cache/config/Option.java
   core/trunk/src/main/java/org/jboss/cache/invocation/NodeInvocationDelega=
te.java
   core/trunk/src/test/java/org/jboss/cache/options/cachemodelocal/CacheMod=
eLocalTestBase.java
Log:
JBCACHE-1263 Node.addChild() local mode suppression

Modified: core/trunk/src/main/java/org/jboss/cache/config/Option.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/java/org/jboss/cache/config/Option.java	2008-01-15 =
05:17:56 UTC (rev 5131)
+++ core/trunk/src/main/java/org/jboss/cache/config/Option.java	2008-01-15 =
10:40:11 UTC (rev 5132)
@@ -238,21 +238,29 @@
    public String toString()
    {
       return "Option{" +
-              "failSilently=3D" + failSilently +
-              ", cacheModeLocal=3D" + cacheModeLocal +
-              ", dataVersion=3D" + dataVersion +
-              ", suppressLocking=3D" + suppressLocking +
-              ", lockAcquisitionTimeout=3D" + lockAcquisitionTimeout +
-              ", forceDataGravitation=3D" + forceDataGravitation +
-              ", skipDataGravitation=3D" + skipDataGravitation +
-              ", forceAsynchronous=3D" + forceAsynchronous +
-              ", forceSynchronous=3D" + forceSynchronous +
-              '}';
+            "failSilently=3D" + failSilently +
+            ", cacheModeLocal=3D" + cacheModeLocal +
+            ", dataVersion=3D" + dataVersion +
+            ", suppressLocking=3D" + suppressLocking +
+            ", lockAcquisitionTimeout=3D" + lockAcquisitionTimeout +
+            ", forceDataGravitation=3D" + forceDataGravitation +
+            ", skipDataGravitation=3D" + skipDataGravitation +
+            ", forceAsynchronous=3D" + forceAsynchronous +
+            ", forceSynchronous=3D" + forceSynchronous +
+            '}';
    }
 =

-   public Option clone() throws CloneNotSupportedException
+   public Option clone()
    {
-      return (Option) super.clone();
+      try
+      {
+         return (Option) super.clone();
+      }
+      catch (CloneNotSupportedException e)
+      {
+         // should never happen!
+         throw new RuntimeException(e);
+      }
    }
 =

 =


Modified: core/trunk/src/main/java/org/jboss/cache/invocation/NodeInvocatio=
nDelegate.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/java/org/jboss/cache/invocation/NodeInvocationDeleg=
ate.java	2008-01-15 05:17:56 UTC (rev 5131)
+++ core/trunk/src/main/java/org/jboss/cache/invocation/NodeInvocationDeleg=
ate.java	2008-01-15 10:40:11 UTC (rev 5132)
@@ -6,6 +6,7 @@
 import org.jboss.cache.NodeNotValidException;
 import org.jboss.cache.NodeSPI;
 import org.jboss.cache.UnversionedNode;
+import org.jboss.cache.config.Option;
 import org.jboss.cache.factories.annotations.Inject;
 import org.jboss.cache.lock.NodeLock;
 import org.jboss.cache.optimistic.DataVersion;
@@ -273,10 +274,16 @@
       // TODO: Revisit.  Is this really threadsafe?  See comment in putIfA=
bsent() - same solution should be applied here too.
       assertValid();
       Fqn nf =3D new Fqn(getFqn(), f);
+      Option o1 =3D spi.getInvocationContext().getOptionOverrides().clone(=
);
       Node<K, V> child =3D getChild(f);
+
       if (child =3D=3D null)
       {
+         Option o2 =3D o1.clone();
+         spi.getInvocationContext().setOptionOverrides(o1);
          spi.put(nf, null);
+
+         spi.getInvocationContext().setOptionOverrides(o2);
          child =3D getChild(f);
       }
       return child;

Modified: core/trunk/src/test/java/org/jboss/cache/options/cachemodelocal/C=
acheModeLocalTestBase.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/test/java/org/jboss/cache/options/cachemodelocal/CacheMo=
deLocalTestBase.java	2008-01-15 05:17:56 UTC (rev 5131)
+++ core/trunk/src/test/java/org/jboss/cache/options/cachemodelocal/CacheMo=
deLocalTestBase.java	2008-01-15 10:40:11 UTC (rev 5132)
@@ -12,9 +12,7 @@
 import org.jboss.cache.Fqn;
 import org.jboss.cache.Node;
 import org.jboss.cache.config.Configuration;
-import static org.testng.AssertJUnit.assertEquals;
-import static org.testng.AssertJUnit.assertNull;
-import static org.testng.AssertJUnit.assertTrue;
+import static org.testng.AssertJUnit.*;
 import org.testng.annotations.AfterMethod;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
@@ -188,8 +186,9 @@
       }
 =

       // now cache2
-      Node node2 =3D cache2.getRoot().getChild(fqn);
       cache2.getInvocationContext().getOptionOverrides().setCacheModeLocal=
(true);
+      Node node2 =3D cache2.getRoot().addChild(fqn);
+      cache2.getInvocationContext().getOptionOverrides().setCacheModeLocal=
(true);
       node2.put(key, "value2");
       delay();
       assertEquals("value2", cache2.get(fqn, key));
@@ -291,7 +290,8 @@
       }
 =

       // now cache2
-      Node node2 =3D cache2.getRoot().getChild(fqn);
+      cache2.getInvocationContext().getOptionOverrides().setCacheModeLocal=
(true);
+      Node node2 =3D cache2.getRoot().addChild(fqn);
       map.put(key, "value2");
       cache2.getInvocationContext().getOptionOverrides().setCacheModeLocal=
(true);
       node2.putAll(map);


--===============5252476951542421654==--

From jbosscache-commits at lists.jboss.org Tue Jan 15 06:05:23 2008
Content-Type: multipart/mixed; boundary="===============2839444577577681778=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r5133 - in core/trunk/src:
 main/java/org/jboss/cache/util/reflect and 1 other directories.
Date: Tue, 15 Jan 2008 06:05:23 -0500
Message-ID: <E1JEjbf-0003w1-O6@committer01.frg.pub.inap.atl.jboss.com>

--===============2839444577577681778==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: manik.surtani(a)jboss.com
Date: 2008-01-15 06:05:23 -0500 (Tue, 15 Jan 2008)
New Revision: 5133

Removed:
   core/trunk/src/main/java/org/jboss/cache/util/reflect/ClasspathScanner.j=
ava
   core/trunk/src/test/java/org/jboss/cache/util/reflect/
Modified:
   core/trunk/src/main/java/org/jboss/cache/factories/ComponentRegistry.java
Log:
hard coded factory registration rather than using a classpath scanner

Modified: core/trunk/src/main/java/org/jboss/cache/factories/ComponentRegis=
try.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/java/org/jboss/cache/factories/ComponentRegistry.ja=
va	2008-01-15 10:40:11 UTC (rev 5132)
+++ core/trunk/src/main/java/org/jboss/cache/factories/ComponentRegistry.ja=
va	2008-01-15 11:05:23 UTC (rev 5133)
@@ -16,7 +16,6 @@
 import org.jboss.cache.factories.annotations.Stop;
 import org.jboss.cache.invocation.RemoteCacheInvocationDelegate;
 import org.jboss.cache.util.BeanUtils;
-import org.jboss.cache.util.reflect.ClasspathScanner;
 import org.jboss.cache.util.reflect.ReflectionUtil;
 =

 import java.lang.annotation.Annotation;
@@ -91,6 +90,28 @@
    }
 =

    /**
+    * This is hard coded for now, since scanning the classpath for factori=
es annotated with {@link org.jboss.cache.factories.annotations.DefaultFacto=
ryFor}
+    * does not work with all class loaders.  This is a temporary solution =
until a more elegant one can be designed.
+    * <p/>
+    * BE SURE TO ADD ANY NEW FACTORY TYPES ANNOTATED WITH DefaultFactoryFo=
r TO THIS SET!!
+    * <p/>
+    *
+    * @return set of known factory types.
+    */
+   private Set<Class<? extends ComponentFactory>> getHardcodedFactories()
+   {
+      Set<Class<? extends ComponentFactory>> s =3D new HashSet<Class<? ext=
ends ComponentFactory>>();
+      s.add(BuddyManagerFactory.class);
+      s.add(EmptyConstructorFactory.class);
+      s.add(InterceptorChainFactory.class);
+      s.add(LockTableFactory.class);
+      s.add(RuntimeConfigAwareFactory.class);
+      s.add(TransactionManagerFactory.class);
+      return s;
+   }
+
+
+   /**
     * Adds a singleton instance to the registry.  Note that if an instance=
 of this component already exists in the
     * registry it is overwritten.  The instance is registered under type <=
tt>component.getClass()</tt>.  If the component
     * implements an interface or extends an abstract class, it may make mo=
re sense to use {@link #registerComponent(String, Object, Class)}
@@ -518,10 +539,8 @@
    {
       defaultFactories =3D new HashMap<Class, Class<? extends ComponentFac=
tory>>();
 =

-      ClasspathScanner scanner =3D new ClasspathScanner();
+      Set<Class<? extends ComponentFactory>> factories =3D getHardcodedFac=
tories();
 =

-      Set<Class<? extends ComponentFactory>> factories =3D scanner.scan(De=
faultFactoryFor.class, ComponentFactory.class);
-
       for (Class<? extends ComponentFactory> factory : factories)
       {
          DefaultFactoryFor dFFAnnotation =3D factory.getAnnotation(Default=
FactoryFor.class);

Deleted: core/trunk/src/main/java/org/jboss/cache/util/reflect/ClasspathSca=
nner.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/java/org/jboss/cache/util/reflect/ClasspathScanner.=
java	2008-01-15 10:40:11 UTC (rev 5132)
+++ core/trunk/src/main/java/org/jboss/cache/util/reflect/ClasspathScanner.=
java	2008-01-15 11:05:23 UTC (rev 5133)
@@ -1,174 +0,0 @@
-package org.jboss.cache.util.reflect;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.jboss.cache.config.ConfigurationException;
-
-import java.io.File;
-import java.io.IOException;
-import java.lang.annotation.Annotation;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.net.URLClassLoader;
-import java.util.Collections;
-import java.util.Enumeration;
-import java.util.HashSet;
-import java.util.Set;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipFile;
-
-/**
- * Class for scanning archives and classpaths in the current JBoss Cache c=
lasspath for classes annotated with a given annotation.  Inspired by a simi=
lar class in
- * JBoss SEAM.
- *
- * @author Manik Surtani
- */
-public class ClasspathScanner
-{
-   private Log log =3D LogFactory.getLog(ClasspathScanner.class);
-   URLClassLoader classLoader;
-
-   /**
-    * Constructor with the type of annotation to scan for.
-    */
-   public ClasspathScanner()
-   {
-      classLoader =3D (URLClassLoader) ClasspathScanner.class.getClassLoad=
er();
-   }
-
-   /**
-    * Scans the class path element that contains JBoss Cache for all class=
es that contain the annotation type this class is
-    * initialised with.  Note that this only scans CLASSES for the annotat=
ion; not methods, etc.
-    *
-    * @param annotationType the type of annotation to scan for.
-    * @param classType      the type of class to scan for.  Subclasses wil=
l be scanned, others will not.
-    * @return a set of Classes that contain the specified annotation on th=
e class.
-    */
-   public <T> Set<Class<? extends T>> scan(Class<? extends Annotation> ann=
otationType, Class<T> classType)
-   {
-      Set<Class<? extends T>> classes =3D Collections.emptySet();
-
-      try
-      {
-         // only scan the current ClassPath location that contains this fi=
le.  Could be a directory or a JAR file.
-         URL url =3D getURLPathFromClassLoader("org/jboss/cache/Cache.clas=
s");
-         String urlPath =3D url.getFile();
-         if (urlPath.endsWith("/"))
-         {
-            urlPath =3D urlPath.substring(0, urlPath.length() - 1);
-         }
-
-         if (log.isDebugEnabled()) log.debug("scanning: " + urlPath);
-         File file =3D new File(urlPath);
-         if (file.isDirectory())
-         {
-            classes =3D handleDirectory(file, null, classType, annotationT=
ype);
-         }
-         else
-         {
-            classes =3D handleArchive(file, classType, annotationType);
-         }
-      }
-      catch (IOException ioe)
-      {
-         log.fatal("could not read entries", ioe);
-      }
-      catch (ClassNotFoundException e)
-      {
-         log.fatal("Unable to load class", e);
-      }
-
-      return classes;
-   }
-
-   URL getURLPathFromClassLoader(String resourceName) throws MalformedURLE=
xception
-   {
-      URL u2 =3D classLoader.findResource(resourceName);
-      String u2String =3D u2.toString();
-
-      boolean isJar =3D u2String.startsWith("jar:") && (u2String.toLowerCa=
se().contains(".jar!/") || u2String.toLowerCase().contains(".zip!/"));
-
-      for (URL u : classLoader.getURLs())
-      {
-         String originalUrlString =3D u.toString().replaceAll("\\/\\.\\/",=
 "/");
-         String urlString =3D originalUrlString;
-         if (isJar) urlString =3D "jar:" + urlString + "!/";
-         if (u2String.startsWith(urlString)) return new URL(originalUrlStr=
ing);
-      }
-
-      throw new ConfigurationException("Unable to find core JBoss Cache cl=
asses on classpath!");
-   }
-
-
-   private <T> Set<Class<? extends T>> handleArchive(File file, Class<T> c=
lassType, Class<? extends Annotation> annotationType) throws IOException, C=
lassNotFoundException
-   {
-      Set<Class<? extends T>> classesWithAnnotations =3D new HashSet<Class=
<? extends T>>();
-      ZipFile zip =3D new ZipFile(file);
-      Enumeration<? extends ZipEntry> entries =3D zip.entries();
-      while (entries.hasMoreElements())
-      {
-         ZipEntry entry =3D entries.nextElement();
-         String name =3D entry.getName();
-         Class<? extends T> c =3D handleItem(name, classType, annotationTy=
pe);
-         if (c !=3D null) classesWithAnnotations.add(c);
-      }
-
-      return classesWithAnnotations;
-   }
-
-   private <T> Set<Class<? extends T>> handleDirectory(File file, String p=
ath, Class<T> classType, Class<? extends Annotation> annotationType) throws=
 IOException, ClassNotFoundException
-   {
-      Set<Class<? extends T>> classesWithAnnotations =3D new HashSet<Class=
<? extends T>>();
-      for (File child : file.listFiles())
-      {
-         String newPath =3D path =3D=3D null ? child.getName() : path + '/=
' + child.getName();
-         if (child.isDirectory())
-         {
-            classesWithAnnotations.addAll(handleDirectory(child, newPath, =
classType, annotationType));
-         }
-         else
-         {
-            Class<? extends T> c =3D handleItem(newPath, classType, annota=
tionType);
-            if (c !=3D null)
-            {
-               classesWithAnnotations.add(c);
-            }
-         }
-      }
-
-      return classesWithAnnotations;
-   }
-
-   private <T> Class<? extends T> handleItem(String name, Class<T> classTy=
pe, Class<? extends Annotation> annotationType) throws IOException, ClassNo=
tFoundException
-   {
-      if (!name.endsWith(".class")) return null;
-
-      Class<? extends T> c =3D getClassFile(filenameToClassname(name), cla=
ssType);
-      if (c !=3D null && hasAnnotation(c, annotationType))
-      {
-         return c;
-      }
-      else
-      {
-         return null;
-      }
-   }
-
-   private <T> Class<? extends T> getClassFile(String name, Class<T> class=
Type) throws IOException, ClassNotFoundException
-   {
-      Class c =3D classLoader.loadClass(name);
-      if (c !=3D null && classType.isAssignableFrom(c)) return c;
-      else return null;
-   }
-
-   private boolean hasAnnotation(Class clazz, Class<? extends Annotation> =
annotationType)
-   {
-      return (clazz.isAnnotationPresent(annotationType));
-   }
-
-   private static String filenameToClassname(String filename)
-   {
-      return filename.substring(0, filename.lastIndexOf(".class")).replace=
('/', '.').replace('\\', '.');
-   }
-
-}


--===============2839444577577681778==--

From jbosscache-commits at lists.jboss.org Tue Jan 15 06:11:33 2008
Content-Type: multipart/mixed; boundary="===============2125429473248544983=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r5134 -
 core/trunk/src/test/java/org/jboss/cache/eviction.
Date: Tue, 15 Jan 2008 06:11:33 -0500
Message-ID: <E1JEjhd-00053b-1A@committer01.frg.pub.inap.atl.jboss.com>

--===============2125429473248544983==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: manik.surtani(a)jboss.com
Date: 2008-01-15 06:11:32 -0500 (Tue, 15 Jan 2008)
New Revision: 5134

Modified:
   core/trunk/src/test/java/org/jboss/cache/eviction/EvictionConfigurationT=
est.java
Log:
Fixed broken test

Modified: core/trunk/src/test/java/org/jboss/cache/eviction/EvictionConfigu=
rationTest.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/test/java/org/jboss/cache/eviction/EvictionConfiguration=
Test.java	2008-01-15 11:05:23 UTC (rev 5133)
+++ core/trunk/src/test/java/org/jboss/cache/eviction/EvictionConfiguration=
Test.java	2008-01-15 11:11:32 UTC (rev 5134)
@@ -193,14 +193,14 @@
 =

    public void testNoEviction() throws Exception
    {
-      cache =3D (CacheSPI<Object, Object>) new DefaultCacheFactory().creat=
eCache();
+      cache =3D (CacheSPI<Object, Object>) new DefaultCacheFactory<Object,=
 Object>().createCache();
       regionManager =3D cache.getRegionManager();
-      assertEquals(1, regionManager.getAllRegions(Region.Type.ANY).size());
+      assertEquals(0, regionManager.getAllRegions(Region.Type.ANY).size());
    }
 =

    private void setupCache(String configurationName)
    {
-      cache =3D (CacheSPI<Object, Object>) new DefaultCacheFactory().creat=
eCache(configurationName, false);
+      cache =3D (CacheSPI<Object, Object>) new DefaultCacheFactory<Object,=
 Object>().createCache(configurationName, false);
       cache.getConfiguration().setTransactionManagerLookupClass("org.jboss=
.cache.transaction.DummyTransactionManagerLookup");
       cache.getConfiguration().setIsolationLevel(IsolationLevel.SERIALIZAB=
LE);
       cache.start();


--===============2125429473248544983==--

From jbosscache-commits at lists.jboss.org Tue Jan 15 12:13:46 2008
Content-Type: multipart/mixed; boundary="===============4825952128650105377=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN:  r5135 - core/tags.
Date: Tue, 15 Jan 2008 12:09:45 -0500
Message-ID: <E1JEpIH-0001TQ-Qz@committer01.frg.pub.inap.atl.jboss.com>

--===============4825952128650105377==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: manik.surtani(a)jboss.com
Date: 2008-01-15 12:09:45 -0500 (Tue, 15 Jan 2008)
New Revision: 5135

Removed:
   core/tags/2.1.0.CR3/
Log:



--===============4825952128650105377==--

From jbosscache-commits at lists.jboss.org Tue Jan 15 12:14:08 2008
Content-Type: multipart/mixed; boundary="===============1070485209971233066=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN:  r5136 - core/tags.
Date: Tue, 15 Jan 2008 12:10:07 -0500
Message-ID: <E1JEpId-0001jo-EA@committer01.frg.pub.inap.atl.jboss.com>

--===============1070485209971233066==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: manik.surtani(a)jboss.com
Date: 2008-01-15 12:10:07 -0500 (Tue, 15 Jan 2008)
New Revision: 5136

Added:
   core/tags/2.1.0.CR3/
Log:


Copied: core/tags/2.1.0.CR3 (from rev 5135, core/trunk)


--===============1070485209971233066==--

From jbosscache-commits at lists.jboss.org Tue Jan 15 12:15:40 2008
Content-Type: multipart/mixed; boundary="===============3408285438758667172=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r5137 - in core/tags/2.1.0.CR3:
 src/main/java/org/jboss/cache and 1 other directory.
Date: Tue, 15 Jan 2008 12:11:40 -0500
Message-ID: <E1JEpK8-0002Jb-0S@committer01.frg.pub.inap.atl.jboss.com>

--===============3408285438758667172==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: manik.surtani(a)jboss.com
Date: 2008-01-15 12:11:39 -0500 (Tue, 15 Jan 2008)
New Revision: 5137

Modified:
   core/tags/2.1.0.CR3/pom.xml
   core/tags/2.1.0.CR3/src/main/java/org/jboss/cache/Version.java
Log:


Modified: core/tags/2.1.0.CR3/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/tags/2.1.0.CR3/pom.xml	2008-01-15 17:10:07 UTC (rev 5136)
+++ core/tags/2.1.0.CR3/pom.xml	2008-01-15 17:11:39 UTC (rev 5137)
@@ -4,7 +4,7 @@
          xsi:schemaLocation=3D"http://maven.apache.org/POM/4.0.0 http://ma=
ven.apache.org/xsd/maven-4.0.0.xsd">
    <modelVersion>4.0.0</modelVersion>
    <properties>
-      <jbosscache-core-version>2.1.0-SNAPSHOT</jbosscache-core-version>
+      <jbosscache-core-version>2.1.0.CR3</jbosscache-core-version>
    </properties>
    <parent>
       <groupId>org.jboss.cache</groupId>

Modified: core/tags/2.1.0.CR3/src/main/java/org/jboss/cache/Version.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/tags/2.1.0.CR3/src/main/java/org/jboss/cache/Version.java	2008-01-=
15 17:10:07 UTC (rev 5136)
+++ core/tags/2.1.0.CR3/src/main/java/org/jboss/cache/Version.java	2008-01-=
15 17:11:39 UTC (rev 5137)
@@ -11,10 +11,10 @@
 @Immutable
 public class Version
 {
-   public static final String version =3D "2.1.0-SNAPSHOT";
+   public static final String version =3D "2.1.0.CR3";
    public static final String codename =3D "Alegrias";
    public static final String cvs =3D "$Id: Version.java 4592 2007-10-10 1=
6:44:36Z manik.surtani(a)jboss.com $";
-   static final byte[] version_id =3D {'0', '2', '1', '0', 'S'};
+   static final byte[] version_id =3D {'0', '2', '1', '0', 'C', '3'};
 =

    private static final int MAJOR_SHIFT =3D 11;
    private static final int MINOR_SHIFT =3D 6;


--===============3408285438758667172==--

From jbosscache-commits at lists.jboss.org Tue Jan 15 17:09:30 2008
Content-Type: multipart/mixed; boundary="===============4796326325958121521=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r5138 - in
 pojo/branches/2.1/src/test/java/org/jboss/cache/pojo: collection and 1 other
 directory.
Date: Tue, 15 Jan 2008 17:09:29 -0500
Message-ID: <E1JEtyL-0005R8-Vi@committer01.frg.pub.inap.atl.jboss.com>

--===============4796326325958121521==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: jason.greene(a)jboss.com
Date: 2008-01-15 17:09:29 -0500 (Tue, 15 Jan 2008)
New Revision: 5138

Modified:
   pojo/branches/2.1/src/test/java/org/jboss/cache/pojo/NewReplicatedTest.j=
ava
   pojo/branches/2.1/src/test/java/org/jboss/cache/pojo/collection/Replicat=
edSyncListTest.java
Log:
Fix invalid cache usage


Modified: pojo/branches/2.1/src/test/java/org/jboss/cache/pojo/NewReplicate=
dTest.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- pojo/branches/2.1/src/test/java/org/jboss/cache/pojo/NewReplicatedTest.=
java	2008-01-15 17:11:39 UTC (rev 5137)
+++ pojo/branches/2.1/src/test/java/org/jboss/cache/pojo/NewReplicatedTest.=
java	2008-01-15 22:09:29 UTC (rev 5138)
@@ -251,7 +251,7 @@
 =

       // restart cache1_
       cache1_.stop();
-      cache1_.getCache().removeNode(Fqn.fromString("/a"));
+      //cache1_.getCache().removeNode(Fqn.fromString("/a"));
       cache1_.start();
       // Start from scratch for initial state transfer
       Person remote =3D (Person) cache1_.find("/a");

Modified: pojo/branches/2.1/src/test/java/org/jboss/cache/pojo/collection/R=
eplicatedSyncListTest.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- pojo/branches/2.1/src/test/java/org/jboss/cache/pojo/collection/Replica=
tedSyncListTest.java	2008-01-15 17:11:39 UTC (rev 5137)
+++ pojo/branches/2.1/src/test/java/org/jboss/cache/pojo/collection/Replica=
tedSyncListTest.java	2008-01-15 22:09:29 UTC (rev 5138)
@@ -48,7 +48,7 @@
    @AfterMethod(alwaysRun =3D true)
    protected void tearDown() throws Exception
    {
-      cache1.getCache().removeNode(Fqn.fromString("/"));
+      //cache1.getCache().removeNode(Fqn.fromString("/"));
       cache1.stop();
       cache2.stop();
    }


--===============4796326325958121521==--

From jbosscache-commits at lists.jboss.org Tue Jan 15 19:39:47 2008
Content-Type: multipart/mixed; boundary="===============5205816834256203592=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r5139 - in
 pojo/branches/2.1/src/test/java/org/jboss/cache/pojo: collection and 1 other
 directory.
Date: Tue, 15 Jan 2008 19:39:45 -0500
Message-ID: <E1JEwJl-0002mm-LL@committer01.frg.pub.inap.atl.jboss.com>

--===============5205816834256203592==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: jason.greene(a)jboss.com
Date: 2008-01-15 19:39:45 -0500 (Tue, 15 Jan 2008)
New Revision: 5139

Modified:
   pojo/branches/2.1/src/test/java/org/jboss/cache/pojo/NewReplicatedTest.j=
ava
   pojo/branches/2.1/src/test/java/org/jboss/cache/pojo/NewReplicatedTxTest=
.java
   pojo/branches/2.1/src/test/java/org/jboss/cache/pojo/collection/Replicat=
edSyncListTest.java
Log:
Disable tests that fail due to JBCACHE-1165


Modified: pojo/branches/2.1/src/test/java/org/jboss/cache/pojo/NewReplicate=
dTest.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- pojo/branches/2.1/src/test/java/org/jboss/cache/pojo/NewReplicatedTest.=
java	2008-01-15 22:09:29 UTC (rev 5138)
+++ pojo/branches/2.1/src/test/java/org/jboss/cache/pojo/NewReplicatedTest.=
java	2008-01-16 00:39:45 UTC (rev 5139)
@@ -30,7 +30,7 @@
  * @author Ben Wang
  */
 =

-(a)Test(groups =3D {"functional"})
+(a)Test(groups =3D {"functional"}, enabled=3Dfalse)
 public class NewReplicatedTest =

 {
    Log log_ =3D LogFactory.getLog(NewReplicatedTest.class);

Modified: pojo/branches/2.1/src/test/java/org/jboss/cache/pojo/NewReplicate=
dTxTest.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- pojo/branches/2.1/src/test/java/org/jboss/cache/pojo/NewReplicatedTxTes=
t.java	2008-01-15 22:09:29 UTC (rev 5138)
+++ pojo/branches/2.1/src/test/java/org/jboss/cache/pojo/NewReplicatedTxTes=
t.java	2008-01-16 00:39:45 UTC (rev 5139)
@@ -40,7 +40,7 @@
  * @author Ben Wang
  */
 =

-(a)Test(groups =3D {"functional"})
+(a)Test(groups =3D {"functional"}, enabled=3Dfalse)
 public class NewReplicatedTxTest =

 {
    Log log =3D LogFactory.getLog(NewReplicatedTxTest.class);

Modified: pojo/branches/2.1/src/test/java/org/jboss/cache/pojo/collection/R=
eplicatedSyncListTest.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- pojo/branches/2.1/src/test/java/org/jboss/cache/pojo/collection/Replica=
tedSyncListTest.java	2008-01-15 22:09:29 UTC (rev 5138)
+++ pojo/branches/2.1/src/test/java/org/jboss/cache/pojo/collection/Replica=
tedSyncListTest.java	2008-01-16 00:39:45 UTC (rev 5139)
@@ -29,7 +29,7 @@
  * @author Ben Wang
  */
 =

-(a)Test(groups =3D {"functional"})
+(a)Test(groups =3D {"functional"}, enabled=3Dfalse)
 public class ReplicatedSyncListTest =

 {
    Log log =3D LogFactory.getLog(ReplicatedSyncListTest.class);


--===============5205816834256203592==--

From jbosscache-commits at lists.jboss.org Tue Jan 15 19:43:29 2008
Content-Type: multipart/mixed; boundary="===============5090454985850310823=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r5140 - in pojo/tags: 2.1.0.CR3
 and 8 other directories.
Date: Tue, 15 Jan 2008 19:43:28 -0500
Message-ID: <E1JEwNM-0003Zo-GC@committer01.frg.pub.inap.atl.jboss.com>

--===============5090454985850310823==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: jason.greene(a)jboss.com
Date: 2008-01-15 19:43:28 -0500 (Tue, 15 Jan 2008)
New Revision: 5140

Added:
   pojo/tags/2.1.0.CR3/
   pojo/tags/2.1.0.CR3/pom.xml
   pojo/tags/2.1.0.CR3/src/test/java/org/jboss/cache/pojo/LocalConcurrentTe=
st.java
   pojo/tags/2.1.0.CR3/src/test/java/org/jboss/cache/pojo/LocalTxTest.java
   pojo/tags/2.1.0.CR3/src/test/java/org/jboss/cache/pojo/NewReplicatedTest=
.java
   pojo/tags/2.1.0.CR3/src/test/java/org/jboss/cache/pojo/NewReplicatedTxTe=
st.java
   pojo/tags/2.1.0.CR3/src/test/java/org/jboss/cache/pojo/ReplicatedCircula=
rGraphTest.java
   pojo/tags/2.1.0.CR3/src/test/java/org/jboss/cache/pojo/ReplicatedObjectG=
raphTest.java
   pojo/tags/2.1.0.CR3/src/test/java/org/jboss/cache/pojo/ReplicatedTxTest.=
java
   pojo/tags/2.1.0.CR3/src/test/java/org/jboss/cache/pojo/collection/Replic=
atedSyncListTest.java
   pojo/tags/2.1.0.CR3/src/test/java/org/jboss/cache/pojo/jmx/NotificationT=
est.java
   pojo/tags/2.1.0.CR3/src/test/java/org/jboss/cache/pojo/memory/Replicated=
Test.java
   pojo/tags/2.1.0.CR3/src/test/java/org/jboss/cache/pojo/optimistic/Abstra=
ctOptimisticTestCase.java
   pojo/tags/2.1.0.CR3/src/test/java/org/jboss/cache/pojo/region/LocalConcu=
rrentTest.java
   pojo/tags/2.1.0.CR3/src/test/java/org/jboss/cache/pojo/region/LocalTest.=
java
   pojo/tags/2.1.0.CR3/src/test/java/org/jboss/cache/pojo/rollback/Replicat=
edTxTest.java
   pojo/tags/2.1.0.CR3/src/test/java/org/jboss/cache/pojo/statetransfer/Rep=
licatedTest.java
Removed:
   pojo/tags/2.1.0.CR3/pom.xml
   pojo/tags/2.1.0.CR3/src/test/java/org/jboss/cache/pojo/LocalConcurrentTe=
st.java
   pojo/tags/2.1.0.CR3/src/test/java/org/jboss/cache/pojo/LocalTxTest.java
   pojo/tags/2.1.0.CR3/src/test/java/org/jboss/cache/pojo/NewReplicatedTest=
.java
   pojo/tags/2.1.0.CR3/src/test/java/org/jboss/cache/pojo/NewReplicatedTxTe=
st.java
   pojo/tags/2.1.0.CR3/src/test/java/org/jboss/cache/pojo/ReplicatedCircula=
rGraphTest.java
   pojo/tags/2.1.0.CR3/src/test/java/org/jboss/cache/pojo/ReplicatedObjectG=
raphTest.java
   pojo/tags/2.1.0.CR3/src/test/java/org/jboss/cache/pojo/ReplicatedTxTest.=
java
   pojo/tags/2.1.0.CR3/src/test/java/org/jboss/cache/pojo/TestingUtil.java
   pojo/tags/2.1.0.CR3/src/test/java/org/jboss/cache/pojo/collection/Replic=
atedSyncListTest.java
   pojo/tags/2.1.0.CR3/src/test/java/org/jboss/cache/pojo/jmx/NotificationT=
est.java
   pojo/tags/2.1.0.CR3/src/test/java/org/jboss/cache/pojo/memory/Replicated=
Test.java
   pojo/tags/2.1.0.CR3/src/test/java/org/jboss/cache/pojo/optimistic/Abstra=
ctOptimisticTestCase.java
   pojo/tags/2.1.0.CR3/src/test/java/org/jboss/cache/pojo/region/LocalConcu=
rrentTest.java
   pojo/tags/2.1.0.CR3/src/test/java/org/jboss/cache/pojo/region/LocalTest.=
java
   pojo/tags/2.1.0.CR3/src/test/java/org/jboss/cache/pojo/rollback/Replicat=
edTxTest.java
   pojo/tags/2.1.0.CR3/src/test/java/org/jboss/cache/pojo/statetransfer/Rep=
licatedTest.java
Log:
Tag CR3


Copied: pojo/tags/2.1.0.CR3 (from rev 4776, pojo/branches/2.1)

Deleted: pojo/tags/2.1.0.CR3/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- pojo/branches/2.1/pom.xml	2007-11-26 18:16:13 UTC (rev 4776)
+++ pojo/tags/2.1.0.CR3/pom.xml	2008-01-16 00:43:28 UTC (rev 5140)
@@ -1,288 +0,0 @@
-<?xml version=3D"1.0"?>
-<project xmlns=3D"http://maven.apache.org/POM/4.0.0"
-  xmlns:xsi=3D"http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation=3D"http://maven.apache.org/POM/4.0.0 http://maven.apa=
che.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <properties>
-    <jbosscache-pojo-version>2.1.0.CR2</jbosscache-pojo-version>
-    <jbosscache-core-version>2.1.0.CR2</jbosscache-core-version>
-    <jboss.aop.version>2.0.0.beta1</jboss.aop.version>
-  </properties>
-  <parent>
-    <groupId>org.jboss.cache</groupId>
-    <artifactId>jbosscache-common-parent</artifactId>
-    <version>1.1</version>
-  </parent>
-  <groupId>org.jboss.cache</groupId>
-  <artifactId>jbosscache-pojo</artifactId>
-  <version>${jbosscache-pojo-version}</version>
-  <name>JBoss Cache - POJO Edition</name>
-  <description>JBoss Cache - POJO Edition</description>
-  <packaging>jar</packaging>
-  <dependencies>
-    <dependency>
-      <groupId>org.jboss.aop</groupId>
-      <artifactId>jboss-aop</artifactId>
-      <version>${jboss.aop.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.jboss.cache</groupId>
-      <artifactId>jbosscache-core</artifactId>
-      <version>${jbosscache-core-version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.jboss.cache</groupId>
-      <artifactId>jbosscache-core</artifactId>
-      <version>${jbosscache-core-version}</version>
-      <type>test-jar</type>
-      <scope>test</scope>
-    </dependency>
-    <!-- Hack AOP has broken deps -->
-    <dependency>
-      <groupId>org.jboss.microcontainer</groupId>
-      <artifactId>jboss-container</artifactId>
-      <version>2.0.0.Beta4</version>
-      <scope>runtime</scope>
-    </dependency>
-  </dependencies>
-  <build>
-    <plugins>
-    <plugin>
-        <artifactId>maven-assembly-plugin</artifactId>
-        <version>2.2-beta-1</version>
-        <executions>
-          <execution>
-            <id>assemble</id>
-            <phase>install</phase>
-            <goals>
-              <goal>attached</goal>
-            </goals>
-            <configuration>
-              <descriptors>
-                <descriptor>assembly/bin.xml</descriptor>
-                <descriptor>assembly/doc.xml</descriptor>
-                <descriptor>assembly/all.xml</descriptor>
-              </descriptors>
-              <finalName>${artifactId}-${jbosscache-pojo-version}</finalNa=
me>
-              <outputDirectory>target/distribution</outputDirectory>
-              <workDirectory>target/assembly/work</workDirectory>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <version>2.3</version>
-        <configuration>
-          <systemProperties>
-            <property>
-              <name>bind.address</name>
-              <value>127.0.0.1</value>
-            </property>
-            <property>
-              <name>java.net.preferIPv4Stack</name>
-              <value>true</value>
-            </property>
-            <property>
-              <name>jgroups.stack</name>
-              <value>udp</value>
-            </property>
-          </systemProperties>
-          <groups>functional</groups>
-          <forkMode>always</forkMode>
-          <argLine>-Djboss.aop.path=3D${basedir}/src/main/resources/META-I=
NF/pojocache-aop.xml -javaagent:${settings.localRepository}/org/jboss/aop/j=
boss-aop/${jboss.aop.version}/jboss-aop-${jboss.aop.version}.jar</argLine>
-          <!-- Warning, this does not work right on 2.4-SNAPSHOT, (see SUR=
EFIRE-349) -->
-          <!-- This seems to fail in some cases on 2.3 as well, disable fo=
r now -->
-          <useSystemClassLoader>true</useSystemClassLoader>
-          <redirectTestOutputToFile>false</redirectTestOutputToFile>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.jboss.maven.plugins</groupId>
-        <artifactId>maven-jbossaop-plugin</artifactId>
-        <version>2.0.0.beta1</version>
-        <!-- HACK: AOP project and plugin has broken deps -->
-        <dependencies>    =

-          <dependency>
-            <groupId>org.jboss.microcontainer</groupId>
-            <artifactId>jboss-container</artifactId>
-            <version>2.0.0.Beta4</version>
-          </dependency>
-          <dependency>
-            <groupId>commons-logging</groupId>
-            <artifactId>commons-logging</artifactId>
-            <version>1.0.4</version>
-          </dependency>
-          <dependency>
-            <groupId>org.jboss.cache</groupId>
-            <artifactId>jbosscache-core</artifactId>
-            <version>${jbosscache-core-version}</version>
-          </dependency>
-        </dependencies>    =

-        <executions>
-          <execution>
-            <id>aopc</id>
-            <phase>compile</phase>
-            <goals>
-              <goal>compile</goal>
-            </goals>
-            <configuration>
-              <verbose>false</verbose>
-              <aoppaths>
-              <aoppath>${basedir}/src/main/resources/META-INF/pojocache-ao=
p.xml</aoppath>
-              </aoppaths>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-      <!-- the docbook generation plugin for the user guide -->
-      <plugin>
-        <groupId>org.jboss.maven.plugins</groupId>
-        <artifactId>maven-jdocbook-plugin</artifactId>
-        <version>2.0.0</version>
-        <extensions>true</extensions>
-        <dependencies>
-          <dependency>
-            <groupId>org.jboss.cache</groupId>
-            <artifactId>jbosscache-doc-xslt-support</artifactId>
-            <version>1.0</version>
-          </dependency>
-        </dependencies>
-        <executions>
-
-          <!-- The User Guide-->
-          <execution>
-            <id>userguide_en</id>
-            <phase>package</phase>
-            <goals>
-              <goal>resources</goal>
-              <goal>generate</goal>
-            </goals>
-            <configuration>
-              <sourceDocumentName>master.xml</sourceDocumentName>
-              <sourceDirectory>${basedir}/src/main/docbook/userguide/en</s=
ourceDirectory>
-              <imageResource>
-                <directory>${basedir}/src/main/docbook/images</directory>
-              </imageResource>
-              <cssResource>
-                <directory>${basedir}/src/main/docbook/css</directory>
-              </cssResource>
-              <targetDirectory>${basedir}/target/docbook/userguide_en</tar=
getDirectory>
-              <formats>
-                <format>
-                  <formatName>pdf</formatName>
-                  <stylesheetResource>classpath:/standard/fopdf.xsl</style=
sheetResource>
-                  <finalName>userguide_en.pdf</finalName>
-                </format>
-                <format>
-                  <formatName>html</formatName>
-                  <stylesheetResource>classpath:/standard/html_chunk.xsl</=
stylesheetResource>
-                  <finalName>index.html</finalName>
-                </format>
-                <format>
-                  <formatName>html_single</formatName>
-                  <stylesheetResource>classpath:/standard/html.xsl</styles=
heetResource>
-                  <finalName>index.html</finalName>
-                </format>
-              </formats>
-              <options>
-                <xincludeSupported>false</xincludeSupported>
-              </options>
-            </configuration>
-          </execution>
-
-          <!-- The Tutorial -->
-          <execution>
-            <id>tutorial_en</id>
-            <phase>package</phase>
-            <goals>
-              <goal>resources</goal>
-              <goal>generate</goal>
-            </goals>
-            <configuration>
-              <sourceDocumentName>master.xml</sourceDocumentName>
-              <sourceDirectory>${basedir}/src/main/docbook/tutorial/en</so=
urceDirectory>
-              <imageResource>
-                <directory>${basedir}/src/main/docbook/images</directory>
-              </imageResource>
-              <cssResource>
-                <directory>${basedir}/src/main/docbook/css</directory>
-              </cssResource>
-              <targetDirectory>${basedir}/target/docbook/tutorial_en</targ=
etDirectory>
-              <formats>
-                <format>
-                  <formatName>pdf</formatName>
-                  <stylesheetResource>classpath:/standard/fopdf.xsl</style=
sheetResource>
-                  <finalName>tutorial_en.pdf</finalName>
-                </format>
-                <format>
-                  <formatName>html</formatName>
-                  <stylesheetResource>classpath:/standard/html_chunk.xsl</=
stylesheetResource>
-                  <finalName>index.html</finalName>
-                </format>
-                <format>
-                  <formatName>html_single</formatName>
-                  <stylesheetResource>classpath:/standard/html.xsl</styles=
heetResource>
-                  <finalName>index.html</finalName>
-                </format>
-              </formats>
-              <options>
-                <xincludeSupported>false</xincludeSupported>
-              </options>
-            </configuration>
-          </execution>
-
-          <!-- the FAQs -->
-          <execution>
-            <id>faq_en</id>
-            <phase>package</phase>
-            <goals>
-              <goal>resources</goal>
-              <goal>generate</goal>
-            </goals>
-            <configuration>
-              <sourceDocumentName>master.xml</sourceDocumentName>
-              <sourceDirectory>${basedir}/src/main/docbook/faq/en</sourceD=
irectory>
-              <imageResource>
-                <directory>${basedir}/src/main/docbook/images</directory>
-              </imageResource>
-              <cssResource>
-                <directory>${basedir}/src/main/docbook/css</directory>
-              </cssResource>
-              <targetDirectory>${basedir}/target/docbook/faq_en</targetDir=
ectory>
-              <formats>
-                <format>
-                  <formatName>pdf</formatName>
-                  <stylesheetResource>classpath:/standard/fopdf.xsl</style=
sheetResource>
-                  <finalName>faq_en.pdf</finalName>
-                </format>
-                <format>
-                  <formatName>html</formatName>
-                  <stylesheetResource>classpath:/standard/html_chunk.xsl</=
stylesheetResource>
-                  <finalName>index.html</finalName>
-                </format>
-                <format>
-                  <formatName>html_single</formatName>
-                  <stylesheetResource>classpath:/standard/html.xsl</styles=
heetResource>
-                  <finalName>index.html</finalName>
-                </format>
-              </formats>
-              <options>
-                <xincludeSupported>false</xincludeSupported>
-              </options>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-  </build>
-
-  <!-- basic JBoss repository so that the common parent POM in jbosscache-=
support can be found -->
-  <repositories>
-    <repository>
-      <id>repository.jboss.org</id>
-      <url>http://repository.jboss.org/maven2</url>
-    </repository>
-  </repositories>
-</project>

Copied: pojo/tags/2.1.0.CR3/pom.xml (from rev 5129, pojo/branches/2.1/pom.x=
ml)
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- pojo/tags/2.1.0.CR3/pom.xml	                        (rev 0)
+++ pojo/tags/2.1.0.CR3/pom.xml	2008-01-16 00:43:28 UTC (rev 5140)
@@ -0,0 +1,288 @@
+<?xml version=3D"1.0"?>
+<project xmlns=3D"http://maven.apache.org/POM/4.0.0"
+  xmlns:xsi=3D"http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation=3D"http://maven.apache.org/POM/4.0.0 http://maven.apa=
che.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <properties>
+    <jbosscache-pojo-version>2.1.0.CR3</jbosscache-pojo-version>
+    <jbosscache-core-version>2.1.0.CR3</jbosscache-core-version>
+    <jboss.aop.version>2.0.0.CR3</jboss.aop.version>
+  </properties>
+  <parent>
+    <groupId>org.jboss.cache</groupId>
+    <artifactId>jbosscache-common-parent</artifactId>
+    <version>1.1</version>
+  </parent>
+  <groupId>org.jboss.cache</groupId>
+  <artifactId>jbosscache-pojo</artifactId>
+  <version>${jbosscache-pojo-version}</version>
+  <name>JBoss Cache - POJO Edition</name>
+  <description>JBoss Cache - POJO Edition</description>
+  <packaging>jar</packaging>
+  <dependencies>
+    <dependency>
+      <groupId>org.jboss.aop</groupId>
+      <artifactId>jboss-aop</artifactId>
+      <version>${jboss.aop.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.jboss.cache</groupId>
+      <artifactId>jbosscache-core</artifactId>
+      <version>${jbosscache-core-version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.jboss.cache</groupId>
+      <artifactId>jbosscache-core</artifactId>
+      <version>${jbosscache-core-version}</version>
+      <type>test-jar</type>
+      <scope>test</scope>
+    </dependency>
+    <!-- Hack AOP has broken deps -->
+    <dependency>
+      <groupId>org.jboss.microcontainer</groupId>
+      <artifactId>jboss-container</artifactId>
+      <version>2.0.0.Beta4</version>
+      <scope>runtime</scope>
+    </dependency>
+  </dependencies>
+  <build>
+    <plugins>
+    <plugin>
+        <artifactId>maven-assembly-plugin</artifactId>
+        <version>2.2-beta-1</version>
+        <executions>
+          <execution>
+            <id>assemble</id>
+            <phase>install</phase>
+            <goals>
+              <goal>attached</goal>
+            </goals>
+            <configuration>
+              <descriptors>
+                <descriptor>assembly/bin.xml</descriptor>
+                <descriptor>assembly/doc.xml</descriptor>
+                <descriptor>assembly/all.xml</descriptor>
+              </descriptors>
+              <finalName>${artifactId}-${jbosscache-pojo-version}</finalNa=
me>
+              <outputDirectory>target/distribution</outputDirectory>
+              <workDirectory>target/assembly/work</workDirectory>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <version>2.3</version>
+        <configuration>
+          <systemProperties>
+            <property>
+              <name>bind.address</name>
+              <value>127.0.0.1</value>
+            </property>
+            <property>
+              <name>java.net.preferIPv4Stack</name>
+              <value>true</value>
+            </property>
+            <property>
+              <name>jgroups.stack</name>
+              <value>udp</value>
+            </property>
+          </systemProperties>
+          <groups>functional</groups>
+          <forkMode>always</forkMode>
+          <argLine>-Djboss.aop.path=3D${basedir}/src/main/resources/META-I=
NF/pojocache-aop.xml -javaagent:${settings.localRepository}/org/jboss/aop/j=
boss-aop/${jboss.aop.version}/jboss-aop-${jboss.aop.version}.jar</argLine>
+          <!-- Warning, this does not work right on 2.4-SNAPSHOT, (see SUR=
EFIRE-349) -->
+          <!-- This seems to fail in some cases on 2.3 as well, disable fo=
r now -->
+          <useSystemClassLoader>true</useSystemClassLoader>
+          <redirectTestOutputToFile>false</redirectTestOutputToFile>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.jboss.maven.plugins</groupId>
+        <artifactId>maven-jbossaop-plugin</artifactId>
+        <version>2.0.0.beta1</version>
+        <!-- HACK: AOP project and plugin has broken deps -->
+        <dependencies>    =

+          <dependency>
+            <groupId>commons-logging</groupId>
+            <artifactId>commons-logging</artifactId>
+            <version>1.0.4</version>
+          </dependency>
+          <dependency>
+            <groupId>org.jboss.cache</groupId>
+            <artifactId>jbosscache-core</artifactId>
+            <version>${jbosscache-core-version}</version>
+          </dependency>
+          <dependency>
+            <groupId>org.jboss.aop</groupId>
+            <artifactId>jboss-aop</artifactId>
+            <version>${jboss.aop.version}</version>
+          </dependency>
+        </dependencies> =

+        <executions>
+          <execution>
+            <id>aopc</id>
+            <phase>compile</phase>
+            <goals>
+              <goal>compile</goal>
+            </goals>
+            <configuration>
+              <verbose>false</verbose>
+              <aoppaths>
+              <aoppath>${basedir}/src/main/resources/META-INF/pojocache-ao=
p.xml</aoppath>
+              </aoppaths>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+      <!-- the docbook generation plugin for the user guide -->
+      <plugin>
+        <groupId>org.jboss.maven.plugins</groupId>
+        <artifactId>maven-jdocbook-plugin</artifactId>
+        <version>2.0.0</version>
+        <extensions>true</extensions>
+        <dependencies>
+          <dependency>
+            <groupId>org.jboss.cache</groupId>
+            <artifactId>jbosscache-doc-xslt-support</artifactId>
+            <version>1.0</version>
+          </dependency>
+        </dependencies>
+        <executions>
+
+          <!-- The User Guide-->
+          <execution>
+            <id>userguide_en</id>
+            <phase>package</phase>
+            <goals>
+              <goal>resources</goal>
+              <goal>generate</goal>
+            </goals>
+            <configuration>
+              <sourceDocumentName>master.xml</sourceDocumentName>
+              <sourceDirectory>${basedir}/src/main/docbook/userguide/en</s=
ourceDirectory>
+              <imageResource>
+                <directory>${basedir}/src/main/docbook/images</directory>
+              </imageResource>
+              <cssResource>
+                <directory>${basedir}/src/main/docbook/css</directory>
+              </cssResource>
+              <targetDirectory>${basedir}/target/docbook/userguide_en</tar=
getDirectory>
+              <formats>
+                <format>
+                  <formatName>pdf</formatName>
+                  <stylesheetResource>classpath:/standard/fopdf.xsl</style=
sheetResource>
+                  <finalName>userguide_en.pdf</finalName>
+                </format>
+                <format>
+                  <formatName>html</formatName>
+                  <stylesheetResource>classpath:/standard/html_chunk.xsl</=
stylesheetResource>
+                  <finalName>index.html</finalName>
+                </format>
+                <format>
+                  <formatName>html_single</formatName>
+                  <stylesheetResource>classpath:/standard/html.xsl</styles=
heetResource>
+                  <finalName>index.html</finalName>
+                </format>
+              </formats>
+              <options>
+                <xincludeSupported>false</xincludeSupported>
+              </options>
+            </configuration>
+          </execution>
+
+          <!-- The Tutorial -->
+          <execution>
+            <id>tutorial_en</id>
+            <phase>package</phase>
+            <goals>
+              <goal>resources</goal>
+              <goal>generate</goal>
+            </goals>
+            <configuration>
+              <sourceDocumentName>master.xml</sourceDocumentName>
+              <sourceDirectory>${basedir}/src/main/docbook/tutorial/en</so=
urceDirectory>
+              <imageResource>
+                <directory>${basedir}/src/main/docbook/images</directory>
+              </imageResource>
+              <cssResource>
+                <directory>${basedir}/src/main/docbook/css</directory>
+              </cssResource>
+              <targetDirectory>${basedir}/target/docbook/tutorial_en</targ=
etDirectory>
+              <formats>
+                <format>
+                  <formatName>pdf</formatName>
+                  <stylesheetResource>classpath:/standard/fopdf.xsl</style=
sheetResource>
+                  <finalName>tutorial_en.pdf</finalName>
+                </format>
+                <format>
+                  <formatName>html</formatName>
+                  <stylesheetResource>classpath:/standard/html_chunk.xsl</=
stylesheetResource>
+                  <finalName>index.html</finalName>
+                </format>
+                <format>
+                  <formatName>html_single</formatName>
+                  <stylesheetResource>classpath:/standard/html.xsl</styles=
heetResource>
+                  <finalName>index.html</finalName>
+                </format>
+              </formats>
+              <options>
+                <xincludeSupported>false</xincludeSupported>
+              </options>
+            </configuration>
+          </execution>
+
+          <!-- the FAQs -->
+          <execution>
+            <id>faq_en</id>
+            <phase>package</phase>
+            <goals>
+              <goal>resources</goal>
+              <goal>generate</goal>
+            </goals>
+            <configuration>
+              <sourceDocumentName>master.xml</sourceDocumentName>
+              <sourceDirectory>${basedir}/src/main/docbook/faq/en</sourceD=
irectory>
+              <imageResource>
+                <directory>${basedir}/src/main/docbook/images</directory>
+              </imageResource>
+              <cssResource>
+                <directory>${basedir}/src/main/docbook/css</directory>
+              </cssResource>
+              <targetDirectory>${basedir}/target/docbook/faq_en</targetDir=
ectory>
+              <formats>
+                <format>
+                  <formatName>pdf</formatName>
+                  <stylesheetResource>classpath:/standard/fopdf.xsl</style=
sheetResource>
+                  <finalName>faq_en.pdf</finalName>
+                </format>
+                <format>
+                  <formatName>html</formatName>
+                  <stylesheetResource>classpath:/standard/html_chunk.xsl</=
stylesheetResource>
+                  <finalName>index.html</finalName>
+                </format>
+                <format>
+                  <formatName>html_single</formatName>
+                  <stylesheetResource>classpath:/standard/html.xsl</styles=
heetResource>
+                  <finalName>index.html</finalName>
+                </format>
+              </formats>
+              <options>
+                <xincludeSupported>false</xincludeSupported>
+              </options>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+
+  <!-- basic JBoss repository so that the common parent POM in jbosscache-=
support can be found -->
+  <repositories>
+    <repository>
+      <id>repository.jboss.org</id>
+      <url>http://repository.jboss.org/maven2</url>
+    </repository>
+  </repositories>
+</project>

Deleted: pojo/tags/2.1.0.CR3/src/test/java/org/jboss/cache/pojo/LocalConcur=
rentTest.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- pojo/branches/2.1/src/test/java/org/jboss/cache/pojo/LocalConcurrentTes=
t.java	2007-11-26 18:16:13 UTC (rev 4776)
+++ pojo/tags/2.1.0.CR3/src/test/java/org/jboss/cache/pojo/LocalConcurrentT=
est.java	2008-01-16 00:43:28 UTC (rev 5140)
@@ -1,269 +0,0 @@
-/*
- *
- * JBoss, the OpenSource J2EE webOS
- *
- * Distributable under LGPL license.
- * See terms of license at gnu.org.
- */
-
-package org.jboss.cache.pojo;
-
-import java.util.ArrayList;
-import java.util.Properties;
-import java.util.Random;
-
-import javax.naming.Context;
-import javax.naming.InitialContext;
-import javax.transaction.UserTransaction;
-
-import org.jboss.cache.config.Configuration;
-import org.jboss.cache.lock.UpgradeException;
-import org.jboss.cache.pojo.test.Address;
-import org.jboss.cache.pojo.test.Person;
-import org.jboss.cache.transaction.DummyTransactionManager;
-import org.testng.annotations.AfterMethod;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.Test;
-
-
-/**
- * Local concurrent test for PojoCache. Test attach and detach under load
- * and concurrency.
- *
- * @version $Revision$
- * @author<a href=3D"mailto:bwang(a)jboss.org">Ben Wang</a> December 2004
- */
-(a)Test(groups =3D {"functional"}, enabled =3D false)
-public class LocalConcurrentTest =

-{
-   static PojoCache cache_;
-   Configuration.CacheMode cachingMode_ =3D Configuration.CacheMode.LOCAL;
-   Properties p_;
-   String oldFactory_ =3D null;
-   final String FACTORY =3D "org.jboss.cache.transaction.DummyContextFacto=
ry";
-   static ArrayList<String> nodeList_;
-   static final int depth_ =3D 2;
-   static final int children_ =3D 2;
-   static final int MAX_LOOP =3D 100;
-   static final int SLEEP_TIME =3D 50;
-   static Exception thread_ex =3D null;
-   UserTransaction tx_ =3D null;
-
-   @BeforeMethod(alwaysRun =3D true)
-   public void setUp() throws Exception
-   {
-      oldFactory_ =3D System.getProperty(Context.INITIAL_CONTEXT_FACTORY);
-      System.setProperty(Context.INITIAL_CONTEXT_FACTORY, FACTORY);
-      DummyTransactionManager.getInstance();
-      if (p_ =3D=3D null)
-      {
-         p_ =3D new Properties();
-         p_.put(Context.INITIAL_CONTEXT_FACTORY, "org.jboss.cache.transact=
ion.DummyContextFactory");
-      }
-
-      tx_ =3D (UserTransaction) new InitialContext(p_).lookup("UserTransac=
tion");
-
-      initCaches(Configuration.CacheMode.LOCAL);
-      nodeList_ =3D nodeGen(depth_, children_);
-
-      log("LocalConcurrentTestCase: cacheMode=3DTRANSIENT, one cache");
-   }
-
-   @AfterMethod(alwaysRun =3D true)
-   public void tearDown() throws Exception
-   {
-      thread_ex =3D null;
-      DummyTransactionManager.destroy();
-      destroyCaches();
-
-      if (oldFactory_ !=3D null)
-      {
-         System.setProperty(Context.INITIAL_CONTEXT_FACTORY, oldFactory_);
-         oldFactory_ =3D null;
-      }
-
-   }
-
-   void initCaches(Configuration.CacheMode caching_mode) throws Exception
-   {
-      cachingMode_ =3D caching_mode;
-      boolean toStart =3D false;
-      cache_ =3D PojoCacheFactory.createCache("META-INF/local-service.xml"=
, toStart);
-      cache_.start();
-   }
-
-   void destroyCaches() throws Exception
-   {
-      cache_.stop();
-      cache_ =3D null;
-   }
-
-   public void testAll_RWLock() throws Exception
-   {
-      try
-      {
-         all();
-      }
-      catch (UpgradeException ue)
-      {
-         log("Upgrade exception. Can ingore for repeatable read. " + ue);
-      }
-      catch (Exception ex)
-      {
-         log("Exception: " + ex);
-         throw ex;
-      }
-   }
-
-   private void all() throws Exception
-   {
-      RunThread t1 =3D new RunThread(1);
-      RunThread t2 =3D new RunThread(2);
-      RunThread t3 =3D new RunThread(3);
-      RunThread t4 =3D new RunThread(4);
-
-      t1.start();
-      TestingUtil.sleepThread(100);
-      t2.start();
-      TestingUtil.sleepThread(100);
-      t3.start();
-      TestingUtil.sleepThread(100);
-      t4.start();
-
-      t1.join(60000);// wait for 20 secs
-      t2.join(60000);// wait for 20 secs
-      t3.join(60000);// wait for 20 secs
-      t4.join(60000);// wait for 20 secs
-
-      if (thread_ex !=3D null)
-      {
-         throw thread_ex;
-      }
-   }
-
-   class RunThread extends Thread
-   {
-      final int seed_;
-      Random random_;
-      Person person_;
-
-      public RunThread(int seed)
-      {
-         seed_ =3D seed;
-         random_ =3D new Random(seed);
-      }
-
-      private void createPerson()
-      {
-         person_ =3D new Person();
-         person_.setName("Ben");
-         person_.setAge(18);
-         ArrayList<String> lang =3D new ArrayList<String>();
-         lang.add("English");
-         lang.add("French");
-         lang.add("Mandarin");
-         person_.setLanguages(lang);
-         Address addr =3D new Address();
-         addr.setZip(95123);
-         addr.setStreet("Almeria");
-         addr.setCity("San Jose");
-         person_.setAddress(addr);
-      }
-
-      public void run()
-      {
-         try
-         {
-            _run();
-         }
-         catch (Exception e)
-         {
-            thread_ex =3D e;
-         }
-      }
-
-      /**
-       */
-      public void _run() throws Exception
-      {
-         for (int loop =3D 0; loop < MAX_LOOP; loop++)
-         {
-            createPerson();// create a new person instance every loop.
-            TestingUtil.sleepThread(random_.nextInt(50));
-            op1();
-         }
-      }
-
-      // Operation 1
-      private void op1()
-      {
-         int i =3D random_.nextInt(nodeList_.size() - 1);
-         if (i =3D=3D 0) return;// it is meaningless to test root
-         String node =3D nodeList_.get(i) + "/aop";
-         cache_.attach(node, person_);
-         TestingUtil.sleepThread(random_.nextInt(SLEEP_TIME));// sleep for=
 max 200 millis
-         TestingUtil.sleepThread(random_.nextInt(SLEEP_TIME));// sleep for=
 max 200 millis
-         cache_.detach(node);
-      }
-   }
-
-   /**
-    * Generate the tree nodes quasi-exponentially. I.e., depth is the level
-    * of the hierarchy and children is the number of children under each n=
ode.
-    * This strucutre is used to add, get, and remove for each node.
-    */
-   private ArrayList<String> nodeGen(int depth, int children)
-   {
-      ArrayList<String> strList =3D new ArrayList<String>();
-      ArrayList<String> oldList =3D new ArrayList<String>();
-      ArrayList<String> newList =3D new ArrayList<String>();
-
-      // Skip root node
-      oldList.add("/");
-      newList.add("/");
-      strList.add("/");
-
-      while (depth > 0)
-      {
-         // Trying to produce node name at this depth.
-         newList =3D new ArrayList<String>();
-         for (int i =3D 0; i < oldList.size(); i++)
-         {
-            for (int j =3D 0; j < children; j++)
-            {
-               String tmp =3D oldList.get(i);
-               tmp +=3D Integer.toString(j);
-               if (depth !=3D 1)
-               {
-                  tmp +=3D "/";
-               }
-
-               newList.add(tmp);
-            }
-         }
-         strList.addAll(newList);
-         oldList =3D newList;
-         depth--;
-      }
-
-      // let's prune out root node
-      for (int i =3D 0; i < strList.size(); i++)
-      {
-         if (strList.get(i).equals("/"))
-         {
-            strList.remove(i);
-            break;
-         }
-      }
-      log("Nodes generated: " + strList.size());
-      return strList;
-   }
-
-
-   private static void log(String str)
-   {
-      System.out.println("Thread: " + Thread.currentThread() + ": " + str);
-      //        System.out.println(str);
-   }
-
-}

Copied: pojo/tags/2.1.0.CR3/src/test/java/org/jboss/cache/pojo/LocalConcurr=
entTest.java (from rev 5129, pojo/branches/2.1/src/test/java/org/jboss/cach=
e/pojo/LocalConcurrentTest.java)
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- pojo/tags/2.1.0.CR3/src/test/java/org/jboss/cache/pojo/LocalConcurrentT=
est.java	                        (rev 0)
+++ pojo/tags/2.1.0.CR3/src/test/java/org/jboss/cache/pojo/LocalConcurrentT=
est.java	2008-01-16 00:43:28 UTC (rev 5140)
@@ -0,0 +1,270 @@
+/*
+ *
+ * JBoss, the OpenSource J2EE webOS
+ *
+ * Distributable under LGPL license.
+ * See terms of license at gnu.org.
+ */
+
+package org.jboss.cache.pojo;
+
+import java.util.ArrayList;
+import java.util.Properties;
+import java.util.Random;
+
+import javax.naming.Context;
+import javax.naming.InitialContext;
+import javax.transaction.UserTransaction;
+
+import org.jboss.cache.config.Configuration;
+import org.jboss.cache.lock.UpgradeException;
+import org.jboss.cache.misc.TestingUtil;
+import org.jboss.cache.pojo.test.Address;
+import org.jboss.cache.pojo.test.Person;
+import org.jboss.cache.transaction.DummyTransactionManager;
+import org.testng.annotations.AfterMethod;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.Test;
+
+
+/**
+ * Local concurrent test for PojoCache. Test attach and detach under load
+ * and concurrency.
+ *
+ * @version $Revision$
+ * @author<a href=3D"mailto:bwang(a)jboss.org">Ben Wang</a> December 2004
+ */
+(a)Test(groups =3D {"functional"}, enabled =3D false)
+public class LocalConcurrentTest =

+{
+   static PojoCache cache_;
+   Configuration.CacheMode cachingMode_ =3D Configuration.CacheMode.LOCAL;
+   Properties p_;
+   String oldFactory_ =3D null;
+   final String FACTORY =3D "org.jboss.cache.transaction.DummyContextFacto=
ry";
+   static ArrayList<String> nodeList_;
+   static final int depth_ =3D 2;
+   static final int children_ =3D 2;
+   static final int MAX_LOOP =3D 100;
+   static final int SLEEP_TIME =3D 50;
+   static Exception thread_ex =3D null;
+   UserTransaction tx_ =3D null;
+
+   @BeforeMethod(alwaysRun =3D true)
+   public void setUp() throws Exception
+   {
+      oldFactory_ =3D System.getProperty(Context.INITIAL_CONTEXT_FACTORY);
+      System.setProperty(Context.INITIAL_CONTEXT_FACTORY, FACTORY);
+      DummyTransactionManager.getInstance();
+      if (p_ =3D=3D null)
+      {
+         p_ =3D new Properties();
+         p_.put(Context.INITIAL_CONTEXT_FACTORY, "org.jboss.cache.transact=
ion.DummyContextFactory");
+      }
+
+      tx_ =3D (UserTransaction) new InitialContext(p_).lookup("UserTransac=
tion");
+
+      initCaches(Configuration.CacheMode.LOCAL);
+      nodeList_ =3D nodeGen(depth_, children_);
+
+      log("LocalConcurrentTestCase: cacheMode=3DTRANSIENT, one cache");
+   }
+
+   @AfterMethod(alwaysRun =3D true)
+   public void tearDown() throws Exception
+   {
+      thread_ex =3D null;
+      DummyTransactionManager.destroy();
+      destroyCaches();
+
+      if (oldFactory_ !=3D null)
+      {
+         System.setProperty(Context.INITIAL_CONTEXT_FACTORY, oldFactory_);
+         oldFactory_ =3D null;
+      }
+
+   }
+
+   void initCaches(Configuration.CacheMode caching_mode) throws Exception
+   {
+      cachingMode_ =3D caching_mode;
+      boolean toStart =3D false;
+      cache_ =3D PojoCacheFactory.createCache("META-INF/local-service.xml"=
, toStart);
+      cache_.start();
+   }
+
+   void destroyCaches() throws Exception
+   {
+      cache_.stop();
+      cache_ =3D null;
+   }
+
+   public void testAll_RWLock() throws Exception
+   {
+      try
+      {
+         all();
+      }
+      catch (UpgradeException ue)
+      {
+         log("Upgrade exception. Can ingore for repeatable read. " + ue);
+      }
+      catch (Exception ex)
+      {
+         log("Exception: " + ex);
+         throw ex;
+      }
+   }
+
+   private void all() throws Exception
+   {
+      RunThread t1 =3D new RunThread(1);
+      RunThread t2 =3D new RunThread(2);
+      RunThread t3 =3D new RunThread(3);
+      RunThread t4 =3D new RunThread(4);
+
+      t1.start();
+      TestingUtil.sleepThread(100);
+      t2.start();
+      TestingUtil.sleepThread(100);
+      t3.start();
+      TestingUtil.sleepThread(100);
+      t4.start();
+
+      t1.join(60000);// wait for 20 secs
+      t2.join(60000);// wait for 20 secs
+      t3.join(60000);// wait for 20 secs
+      t4.join(60000);// wait for 20 secs
+
+      if (thread_ex !=3D null)
+      {
+         throw thread_ex;
+      }
+   }
+
+   class RunThread extends Thread
+   {
+      final int seed_;
+      Random random_;
+      Person person_;
+
+      public RunThread(int seed)
+      {
+         seed_ =3D seed;
+         random_ =3D new Random(seed);
+      }
+
+      private void createPerson()
+      {
+         person_ =3D new Person();
+         person_.setName("Ben");
+         person_.setAge(18);
+         ArrayList<String> lang =3D new ArrayList<String>();
+         lang.add("English");
+         lang.add("French");
+         lang.add("Mandarin");
+         person_.setLanguages(lang);
+         Address addr =3D new Address();
+         addr.setZip(95123);
+         addr.setStreet("Almeria");
+         addr.setCity("San Jose");
+         person_.setAddress(addr);
+      }
+
+      public void run()
+      {
+         try
+         {
+            _run();
+         }
+         catch (Exception e)
+         {
+            thread_ex =3D e;
+         }
+      }
+
+      /**
+       */
+      public void _run() throws Exception
+      {
+         for (int loop =3D 0; loop < MAX_LOOP; loop++)
+         {
+            createPerson();// create a new person instance every loop.
+            TestingUtil.sleepThread(random_.nextInt(50));
+            op1();
+         }
+      }
+
+      // Operation 1
+      private void op1()
+      {
+         int i =3D random_.nextInt(nodeList_.size() - 1);
+         if (i =3D=3D 0) return;// it is meaningless to test root
+         String node =3D nodeList_.get(i) + "/aop";
+         cache_.attach(node, person_);
+         TestingUtil.sleepThread(random_.nextInt(SLEEP_TIME));// sleep for=
 max 200 millis
+         TestingUtil.sleepThread(random_.nextInt(SLEEP_TIME));// sleep for=
 max 200 millis
+         cache_.detach(node);
+      }
+   }
+
+   /**
+    * Generate the tree nodes quasi-exponentially. I.e., depth is the level
+    * of the hierarchy and children is the number of children under each n=
ode.
+    * This strucutre is used to add, get, and remove for each node.
+    */
+   private ArrayList<String> nodeGen(int depth, int children)
+   {
+      ArrayList<String> strList =3D new ArrayList<String>();
+      ArrayList<String> oldList =3D new ArrayList<String>();
+      ArrayList<String> newList =3D new ArrayList<String>();
+
+      // Skip root node
+      oldList.add("/");
+      newList.add("/");
+      strList.add("/");
+
+      while (depth > 0)
+      {
+         // Trying to produce node name at this depth.
+         newList =3D new ArrayList<String>();
+         for (int i =3D 0; i < oldList.size(); i++)
+         {
+            for (int j =3D 0; j < children; j++)
+            {
+               String tmp =3D oldList.get(i);
+               tmp +=3D Integer.toString(j);
+               if (depth !=3D 1)
+               {
+                  tmp +=3D "/";
+               }
+
+               newList.add(tmp);
+            }
+         }
+         strList.addAll(newList);
+         oldList =3D newList;
+         depth--;
+      }
+
+      // let's prune out root node
+      for (int i =3D 0; i < strList.size(); i++)
+      {
+         if (strList.get(i).equals("/"))
+         {
+            strList.remove(i);
+            break;
+         }
+      }
+      log("Nodes generated: " + strList.size());
+      return strList;
+   }
+
+
+   private static void log(String str)
+   {
+      System.out.println("Thread: " + Thread.currentThread() + ": " + str);
+      //        System.out.println(str);
+   }
+
+}

Deleted: pojo/tags/2.1.0.CR3/src/test/java/org/jboss/cache/pojo/LocalTxTest=
.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- pojo/branches/2.1/src/test/java/org/jboss/cache/pojo/LocalTxTest.java	2=
007-11-26 18:16:13 UTC (rev 4776)
+++ pojo/tags/2.1.0.CR3/src/test/java/org/jboss/cache/pojo/LocalTxTest.java=
	2008-01-16 00:43:28 UTC (rev 5140)
@@ -1,441 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- *
- * Distributable under LGPL license.
- * See terms of license at gnu.org.
- */
-
-package org.jboss.cache.pojo;
-
-import static org.testng.AssertJUnit.assertEquals;
-import static org.testng.AssertJUnit.fail;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Properties;
-
-import javax.naming.Context;
-import javax.naming.InitialContext;
-import javax.naming.NamingException;
-import javax.transaction.NotSupportedException;
-import javax.transaction.RollbackException;
-import javax.transaction.SystemException;
-import javax.transaction.UserTransaction;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.jboss.cache.pojo.test.Address;
-import org.jboss.cache.pojo.test.Person;
-import org.jboss.cache.transaction.DummyTransactionManager;
-import org.testng.annotations.AfterMethod;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.Test;
-
-/**
- */
-
-(a)Test(groups =3D {"functional"})
-public class LocalTxTest =

-{
-   Log log =3D LogFactory.getLog(LocalTxTest.class);
-   PojoCache cache;
-   final String FACTORY =3D "org.jboss.cache.transaction.DummyContextFacto=
ry";
-   DummyTransactionManager tx_mgr;
-   Throwable t1_ex, t2_ex;
-   long start =3D 0;
-
-
-
-   @BeforeMethod(alwaysRun =3D true)
-   protected void setUp() throws Exception
-   {
-      log.info("setUp() ....");
-      String configFile =3D "META-INF/local-service.xml";
-      boolean toStart =3D false;
-      cache =3D PojoCacheFactory.createCache(configFile, toStart);
-      cache.start();
-
-      System.setProperty(Context.INITIAL_CONTEXT_FACTORY, FACTORY);
-
-      tx_mgr =3D DummyTransactionManager.getInstance();
-      t1_ex =3D t2_ex =3D null;
-   }
-
-   @AfterMethod(alwaysRun =3D true)
-   protected void tearDown() throws Exception
-   {
-      cache.stop();
-
-      DummyTransactionManager.destroy();
-   }
-
-//   public void testDummy() {}
-
-   UserTransaction getTransaction() throws SystemException, NotSupportedEx=
ception, NamingException
-   {
-      Properties prop =3D new Properties();
-      prop.put(Context.INITIAL_CONTEXT_FACTORY,
-               "org.jboss.cache.transaction.DummyContextFactory");
-      return (UserTransaction) new InitialContext(prop).lookup("UserTransa=
ction");
-   }
-
-   private Person createPerson(String id, String name, int age)
-   {
-      Person p =3D new Person();
-      p.setName(name);
-      p.setAge(age);
-      cache.attach(id, p);
-      return p;
-   }
-
-   public void testSimple() throws Exception
-   {
-      log.info("testSimple() ....");
-      UserTransaction tx =3D getTransaction();
-      tx.begin();
-      Person p =3D createPerson("/person/test1", "Harald Gliebe", 32);
-      tx.commit();
-      tx.begin();
-      p.setName("Benoit");
-      tx.commit();
-      Person p1 =3D (Person) cache.find("/person/test1");
-      assertEquals("Benoit", p.getName());
-      assertEquals("Benoit", p1.getName());
-      tx.begin();
-      p1.setAge(61);
-      tx.commit();
-      assertEquals(61, p.getAge());
-      assertEquals(61, p1.getAge());
-   }
-
-   public void testModification() throws Exception
-   {
-      UserTransaction tx =3D getTransaction();
-      tx.begin();
-      Person p =3D createPerson("/person/test2", "Harald", 32);
-      p.setName("Harald Gliebe");
-      tx.commit();
-      Person p1 =3D (Person) cache.find("/person/test2");
-      tx.begin();
-      p1.setName("Benoit");
-      tx.commit();
-      assertEquals(p.getName(), "Benoit");
-      assertEquals(p1.getName(), "Benoit");
-      tx.begin();
-      p1.setName("Harald");
-      tx.rollback();
-      assertEquals(p.getName(), "Benoit");
-      assertEquals(p1.getName(), "Benoit");
-   }
-
-   public void testConcurrentSimplePuts() throws Exception
-   {
-      Thread t1 =3D new Thread("t1")
-      {
-         public void run()
-         {
-            try
-            {
-               Person p =3D (Person) cache.find("/person/test6");
-               Address addr =3D new Address();
-               addr.setCity("San Jose");
-               UserTransaction tx =3D getTransaction();
-               tx.begin();
-               // Note that this will create a write lock on p (on the JBo=
ssInternal node)
-               p.setAddress(addr);
-               TestingUtil.sleepThread(17000);
-               tx.commit();
-            }
-            catch (RollbackException rollback)
-            {
-               ;
-            }
-            catch (Exception ex)
-            {
-               t1_ex =3D ex;
-            }
-         }
-      };
-
-      Thread t2 =3D new Thread("t2")
-      {
-         public void run()
-         {
-            UserTransaction tx =3D null;
-            try
-            {
-               TestingUtil.sleepThread(1000); // give Thread1 time to crea=
tePerson
-               Person p =3D (Person) cache.find("/person/test6");
-               Address addr =3D new Address();
-               addr.setCity("Santa Clara");
-               tx =3D getTransaction();
-               tx.begin();
-               p.setAddress(addr);
-               tx.commit();
-            }
-            catch (RollbackException rollback)
-            {
-               ;
-            }
-            catch (org.jboss.cache.pojo.PojoCacheException tex)
-            {
-               // This will be a timeout exception. OK.
-            }
-            catch (Exception ex)
-            {
-//               t2_ex =3D ex;
-               if (tx !=3D null)
-               {
-                  try
-                  {
-                     tx.rollback();
-                  }
-                  catch (SystemException e)
-                  {
-                     e.printStackTrace();
-                     t2_ex =3D e;
-                  }
-               }
-               t2_ex =3D ex;
-               ex.printStackTrace();
-            }
-         }
-      };
-
-      Person p =3D createPerson("/person/test6", "p6", 50);
-
-      t1.start();
-      t2.start();
-
-      t1.join();
-      t2.join();
-
-      // t2 should rollback due to timeout while t2 should succeed
-      if (t2_ex !=3D null)
-         fail("Thread1 failed: " + t2_ex);
-      if (t1_ex !=3D null)
-         fail("Thread2 failed: " + t1_ex);
-
-      assertEquals("City ", "San Jose", p.getAddress().getCity());
-   }
-
-   public void testConcurrentPuts() throws Exception
-   {
-      Thread t1 =3D new Thread("t1")
-      {
-         public void run()
-         {
-            try
-            {
-               List<String> lang =3D ((Person) cache.find("/person/test6")=
).getLanguages();
-               UserTransaction tx =3D getTransaction();
-               tx.begin();
-               lang.add("German");
-               TestingUtil.sleepThread(17000);
-               tx.commit();
-            }
-            catch (RollbackException rollback)
-            {
-               ;
-            }
-            catch (Exception ex)
-            {
-               t1_ex =3D ex;
-            }
-         }
-      };
-
-      Thread t2 =3D new Thread("t2")
-      {
-         public void run()
-         {
-            UserTransaction tx =3D null;
-            try
-            {
-               TestingUtil.sleepThread(1000); // give Thread1 time to crea=
tePerson
-               List<String> lang =3D ((Person) cache.find("/person/test6")=
).getLanguages();
-               tx =3D getTransaction();
-               tx.begin();
-               lang.add("English");
-               tx.commit();
-            }
-            catch (RollbackException rollback)
-            {
-               ;
-            }
-            catch (org.jboss.cache.lock.TimeoutException tex)
-            {
-               //
-            }
-            catch (Exception ex)
-            {
-               if (tx !=3D null)
-               {
-                  try
-                  {
-                     tx.rollback();
-                  }
-                  catch (SystemException e)
-                  {
-                     e.printStackTrace();
-                     t2_ex =3D e;
-                  }
-               }
-               t2_ex =3D ex;
-               ex.printStackTrace();
-            }
-         }
-      };
-
-      Person p =3D createPerson("/person/test6", "p6", 50);
-      List<String> lang =3D new ArrayList<String>();
-      lang.add("German");
-      p.setLanguages(lang);
-
-      t1.start();
-      t2.start();
-
-      t1.join();
-      t2.join();
-
-      // t2 should rollback due to timeout while t2 should succeed
-      if (t2_ex !=3D null)
-         fail("Thread1 failed: " + t2_ex);
-      if (t1_ex !=3D null)
-         fail("Thread2 failed: " + t1_ex);
-
-      int size =3D ((Person) cache.find("/person/test6")).getLanguages().s=
ize();
-      assertEquals("number of languages ",
-                   2, size);
-   }
-
-   public void testConcurrentPutsNoWait() throws Exception
-   {
-      Thread t1 =3D new Thread("t1")
-      {
-         UserTransaction tx;
-
-         public void run()
-         {
-            try
-            {
-               for (int i =3D 0; i < 100; i++)
-               {
-                  String id =3D "/p1/test7";
-                  Person p =3D createPerson(id, "p6", 50);
-                  cache.detach(id);
-                  p =3D createPerson(id, "p6", 51);
-                  List<String> lang =3D new ArrayList<String>();
-                  tx =3D getTransaction();
-                  tx.begin();
-                  lang.add("German");
-                  lang.add("English");
-                  try
-                  {
-                     p.setLanguages(lang);
-                  }
-                  catch (PojoCacheException ex)
-                  {
-                     ex.printStackTrace();
-                  }
-                  tx.commit();
-                  TestingUtil.sleepThread(20); // give Thread1 time to cre=
atePerson
-               }
-            }
-            catch (RollbackException rollback)
-            {
-               rollback.printStackTrace();
-            }
-            catch (PojoCacheException pe)
-            {
-               pe.printStackTrace();
-            }
-            catch (Exception ex)
-            {
-               t1_ex =3D ex;
-            }
-         }
-      };
-
-      Thread t2 =3D new Thread("t2")
-      {
-         UserTransaction tx;
-
-         public void run()
-         {
-            try
-            {
-               for (int i =3D 0; i < 100; i++)
-               {
-                  String id =3D "/p1/test8";
-                  Person p =3D createPerson(id, "p6", 50);
-                  cache.detach(id);
-                  p =3D createPerson(id, "p6", 51);
-                  List<String> lang =3D new ArrayList<String>();
-                  tx =3D getTransaction();
-                  tx.begin();
-                  lang.add("German");
-                  lang.add("English");
-                  try
-                  {
-                     p.setLanguages(lang);
-                  }
-                  catch (PojoCacheException ex)
-                  {
-                     ex.printStackTrace();
-                  }
-                  tx.commit();
-                  TestingUtil.sleepThread(20); // give Thread1 time to cre=
atePerson
-               }
-            }
-            catch (RollbackException rollback)
-            {
-               rollback.printStackTrace();
-            }
-            catch (PojoCacheException pe)
-            {
-               pe.printStackTrace();
-            }
-            catch (Exception ex)
-            {
-               t2_ex =3D ex;
-               ex.printStackTrace();
-            }
-         }
-      };
-
-      createPerson("/p1/test6", "p6", 50);
-      createPerson("/p2/test6", "p6", 50);
-
-      t1.start();
-      t2.start();
-
-      t1.join();
-      t2.join();
-
-      // t2 should rollback due to timeout while t2 should succeed
-      if (t2_ex !=3D null)
-         fail("Thread1 failed: " + t2_ex);
-      if (t1_ex !=3D null)
-         fail("Thread2 failed: " + t1_ex);
-
-//      int size =3D ((Person) cache.find("/p1/test7")).getLanguages().siz=
e();
-//      assertEquals("number of languages ",
-//              2, size);
-   }
-
-   void log(String s)
-   {
-      long now;
-      if (start =3D=3D 0)
-         start =3D System.currentTimeMillis();
-      now =3D System.currentTimeMillis();
-
-      System.out.println("[" + Thread.currentThread().getName() + "] [" + =
(now - start) + "] " + s);
-   }
-
-
-
-
-
-}

Copied: pojo/tags/2.1.0.CR3/src/test/java/org/jboss/cache/pojo/LocalTxTest.=
java (from rev 5129, pojo/branches/2.1/src/test/java/org/jboss/cache/pojo/L=
ocalTxTest.java)
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- pojo/tags/2.1.0.CR3/src/test/java/org/jboss/cache/pojo/LocalTxTest.java=
	                        (rev 0)
+++ pojo/tags/2.1.0.CR3/src/test/java/org/jboss/cache/pojo/LocalTxTest.java=
	2008-01-16 00:43:28 UTC (rev 5140)
@@ -0,0 +1,442 @@
+/*
+ * JBoss, Home of Professional Open Source
+ *
+ * Distributable under LGPL license.
+ * See terms of license at gnu.org.
+ */
+
+package org.jboss.cache.pojo;
+
+import static org.testng.AssertJUnit.assertEquals;
+import static org.testng.AssertJUnit.fail;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Properties;
+
+import javax.naming.Context;
+import javax.naming.InitialContext;
+import javax.naming.NamingException;
+import javax.transaction.NotSupportedException;
+import javax.transaction.RollbackException;
+import javax.transaction.SystemException;
+import javax.transaction.UserTransaction;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.jboss.cache.misc.TestingUtil;
+import org.jboss.cache.pojo.test.Address;
+import org.jboss.cache.pojo.test.Person;
+import org.jboss.cache.transaction.DummyTransactionManager;
+import org.testng.annotations.AfterMethod;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.Test;
+
+/**
+ */
+
+(a)Test(groups =3D {"functional"})
+public class LocalTxTest =

+{
+   Log log =3D LogFactory.getLog(LocalTxTest.class);
+   PojoCache cache;
+   final String FACTORY =3D "org.jboss.cache.transaction.DummyContextFacto=
ry";
+   DummyTransactionManager tx_mgr;
+   Throwable t1_ex, t2_ex;
+   long start =3D 0;
+
+
+
+   @BeforeMethod(alwaysRun =3D true)
+   protected void setUp() throws Exception
+   {
+      log.info("setUp() ....");
+      String configFile =3D "META-INF/local-service.xml";
+      boolean toStart =3D false;
+      cache =3D PojoCacheFactory.createCache(configFile, toStart);
+      cache.start();
+
+      System.setProperty(Context.INITIAL_CONTEXT_FACTORY, FACTORY);
+
+      tx_mgr =3D DummyTransactionManager.getInstance();
+      t1_ex =3D t2_ex =3D null;
+   }
+
+   @AfterMethod(alwaysRun =3D true)
+   protected void tearDown() throws Exception
+   {
+      cache.stop();
+
+      DummyTransactionManager.destroy();
+   }
+
+//   public void testDummy() {}
+
+   UserTransaction getTransaction() throws SystemException, NotSupportedEx=
ception, NamingException
+   {
+      Properties prop =3D new Properties();
+      prop.put(Context.INITIAL_CONTEXT_FACTORY,
+               "org.jboss.cache.transaction.DummyContextFactory");
+      return (UserTransaction) new InitialContext(prop).lookup("UserTransa=
ction");
+   }
+
+   private Person createPerson(String id, String name, int age)
+   {
+      Person p =3D new Person();
+      p.setName(name);
+      p.setAge(age);
+      cache.attach(id, p);
+      return p;
+   }
+
+   public void testSimple() throws Exception
+   {
+      log.info("testSimple() ....");
+      UserTransaction tx =3D getTransaction();
+      tx.begin();
+      Person p =3D createPerson("/person/test1", "Harald Gliebe", 32);
+      tx.commit();
+      tx.begin();
+      p.setName("Benoit");
+      tx.commit();
+      Person p1 =3D (Person) cache.find("/person/test1");
+      assertEquals("Benoit", p.getName());
+      assertEquals("Benoit", p1.getName());
+      tx.begin();
+      p1.setAge(61);
+      tx.commit();
+      assertEquals(61, p.getAge());
+      assertEquals(61, p1.getAge());
+   }
+
+   public void testModification() throws Exception
+   {
+      UserTransaction tx =3D getTransaction();
+      tx.begin();
+      Person p =3D createPerson("/person/test2", "Harald", 32);
+      p.setName("Harald Gliebe");
+      tx.commit();
+      Person p1 =3D (Person) cache.find("/person/test2");
+      tx.begin();
+      p1.setName("Benoit");
+      tx.commit();
+      assertEquals(p.getName(), "Benoit");
+      assertEquals(p1.getName(), "Benoit");
+      tx.begin();
+      p1.setName("Harald");
+      tx.rollback();
+      assertEquals(p.getName(), "Benoit");
+      assertEquals(p1.getName(), "Benoit");
+   }
+
+   public void testConcurrentSimplePuts() throws Exception
+   {
+      Thread t1 =3D new Thread("t1")
+      {
+         public void run()
+         {
+            try
+            {
+               Person p =3D (Person) cache.find("/person/test6");
+               Address addr =3D new Address();
+               addr.setCity("San Jose");
+               UserTransaction tx =3D getTransaction();
+               tx.begin();
+               // Note that this will create a write lock on p (on the JBo=
ssInternal node)
+               p.setAddress(addr);
+               TestingUtil.sleepThread(17000);
+               tx.commit();
+            }
+            catch (RollbackException rollback)
+            {
+               ;
+            }
+            catch (Exception ex)
+            {
+               t1_ex =3D ex;
+            }
+         }
+      };
+
+      Thread t2 =3D new Thread("t2")
+      {
+         public void run()
+         {
+            UserTransaction tx =3D null;
+            try
+            {
+               TestingUtil.sleepThread(1000); // give Thread1 time to crea=
tePerson
+               Person p =3D (Person) cache.find("/person/test6");
+               Address addr =3D new Address();
+               addr.setCity("Santa Clara");
+               tx =3D getTransaction();
+               tx.begin();
+               p.setAddress(addr);
+               tx.commit();
+            }
+            catch (RollbackException rollback)
+            {
+               ;
+            }
+            catch (org.jboss.cache.pojo.PojoCacheException tex)
+            {
+               // This will be a timeout exception. OK.
+            }
+            catch (Exception ex)
+            {
+//               t2_ex =3D ex;
+               if (tx !=3D null)
+               {
+                  try
+                  {
+                     tx.rollback();
+                  }
+                  catch (SystemException e)
+                  {
+                     e.printStackTrace();
+                     t2_ex =3D e;
+                  }
+               }
+               t2_ex =3D ex;
+               ex.printStackTrace();
+            }
+         }
+      };
+
+      Person p =3D createPerson("/person/test6", "p6", 50);
+
+      t1.start();
+      t2.start();
+
+      t1.join();
+      t2.join();
+
+      // t2 should rollback due to timeout while t2 should succeed
+      if (t2_ex !=3D null)
+         fail("Thread1 failed: " + t2_ex);
+      if (t1_ex !=3D null)
+         fail("Thread2 failed: " + t1_ex);
+
+      assertEquals("City ", "San Jose", p.getAddress().getCity());
+   }
+
+   public void testConcurrentPuts() throws Exception
+   {
+      Thread t1 =3D new Thread("t1")
+      {
+         public void run()
+         {
+            try
+            {
+               List<String> lang =3D ((Person) cache.find("/person/test6")=
).getLanguages();
+               UserTransaction tx =3D getTransaction();
+               tx.begin();
+               lang.add("German");
+               TestingUtil.sleepThread(17000);
+               tx.commit();
+            }
+            catch (RollbackException rollback)
+            {
+               ;
+            }
+            catch (Exception ex)
+            {
+               t1_ex =3D ex;
+            }
+         }
+      };
+
+      Thread t2 =3D new Thread("t2")
+      {
+         public void run()
+         {
+            UserTransaction tx =3D null;
+            try
+            {
+               TestingUtil.sleepThread(1000); // give Thread1 time to crea=
tePerson
+               List<String> lang =3D ((Person) cache.find("/person/test6")=
).getLanguages();
+               tx =3D getTransaction();
+               tx.begin();
+               lang.add("English");
+               tx.commit();
+            }
+            catch (RollbackException rollback)
+            {
+               ;
+            }
+            catch (org.jboss.cache.lock.TimeoutException tex)
+            {
+               //
+            }
+            catch (Exception ex)
+            {
+               if (tx !=3D null)
+               {
+                  try
+                  {
+                     tx.rollback();
+                  }
+                  catch (SystemException e)
+                  {
+                     e.printStackTrace();
+                     t2_ex =3D e;
+                  }
+               }
+               t2_ex =3D ex;
+               ex.printStackTrace();
+            }
+         }
+      };
+
+      Person p =3D createPerson("/person/test6", "p6", 50);
+      List<String> lang =3D new ArrayList<String>();
+      lang.add("German");
+      p.setLanguages(lang);
+
+      t1.start();
+      t2.start();
+
+      t1.join();
+      t2.join();
+
+      // t2 should rollback due to timeout while t2 should succeed
+      if (t2_ex !=3D null)
+         fail("Thread1 failed: " + t2_ex);
+      if (t1_ex !=3D null)
+         fail("Thread2 failed: " + t1_ex);
+
+      int size =3D ((Person) cache.find("/person/test6")).getLanguages().s=
ize();
+      assertEquals("number of languages ",
+                   2, size);
+   }
+
+   public void testConcurrentPutsNoWait() throws Exception
+   {
+      Thread t1 =3D new Thread("t1")
+      {
+         UserTransaction tx;
+
+         public void run()
+         {
+            try
+            {
+               for (int i =3D 0; i < 100; i++)
+               {
+                  String id =3D "/p1/test7";
+                  Person p =3D createPerson(id, "p6", 50);
+                  cache.detach(id);
+                  p =3D createPerson(id, "p6", 51);
+                  List<String> lang =3D new ArrayList<String>();
+                  tx =3D getTransaction();
+                  tx.begin();
+                  lang.add("German");
+                  lang.add("English");
+                  try
+                  {
+                     p.setLanguages(lang);
+                  }
+                  catch (PojoCacheException ex)
+                  {
+                     ex.printStackTrace();
+                  }
+                  tx.commit();
+                  TestingUtil.sleepThread(20); // give Thread1 time to cre=
atePerson
+               }
+            }
+            catch (RollbackException rollback)
+            {
+               rollback.printStackTrace();
+            }
+            catch (PojoCacheException pe)
+            {
+               pe.printStackTrace();
+            }
+            catch (Exception ex)
+            {
+               t1_ex =3D ex;
+            }
+         }
+      };
+
+      Thread t2 =3D new Thread("t2")
+      {
+         UserTransaction tx;
+
+         public void run()
+         {
+            try
+            {
+               for (int i =3D 0; i < 100; i++)
+               {
+                  String id =3D "/p1/test8";
+                  Person p =3D createPerson(id, "p6", 50);
+                  cache.detach(id);
+                  p =3D createPerson(id, "p6", 51);
+                  List<String> lang =3D new ArrayList<String>();
+                  tx =3D getTransaction();
+                  tx.begin();
+                  lang.add("German");
+                  lang.add("English");
+                  try
+                  {
+                     p.setLanguages(lang);
+                  }
+                  catch (PojoCacheException ex)
+                  {
+                     ex.printStackTrace();
+                  }
+                  tx.commit();
+                  TestingUtil.sleepThread(20); // give Thread1 time to cre=
atePerson
+               }
+            }
+            catch (RollbackException rollback)
+            {
+               rollback.printStackTrace();
+            }
+            catch (PojoCacheException pe)
+            {
+               pe.printStackTrace();
+            }
+            catch (Exception ex)
+            {
+               t2_ex =3D ex;
+               ex.printStackTrace();
+            }
+         }
+      };
+
+      createPerson("/p1/test6", "p6", 50);
+      createPerson("/p2/test6", "p6", 50);
+
+      t1.start();
+      t2.start();
+
+      t1.join();
+      t2.join();
+
+      // t2 should rollback due to timeout while t2 should succeed
+      if (t2_ex !=3D null)
+         fail("Thread1 failed: " + t2_ex);
+      if (t1_ex !=3D null)
+         fail("Thread2 failed: " + t1_ex);
+
+//      int size =3D ((Person) cache.find("/p1/test7")).getLanguages().siz=
e();
+//      assertEquals("number of languages ",
+//              2, size);
+   }
+
+   void log(String s)
+   {
+      long now;
+      if (start =3D=3D 0)
+         start =3D System.currentTimeMillis();
+      now =3D System.currentTimeMillis();
+
+      System.out.println("[" + Thread.currentThread().getName() + "] [" + =
(now - start) + "] " + s);
+   }
+
+
+
+
+
+}

Deleted: pojo/tags/2.1.0.CR3/src/test/java/org/jboss/cache/pojo/NewReplicat=
edTest.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- pojo/branches/2.1/src/test/java/org/jboss/cache/pojo/NewReplicatedTest.=
java	2007-11-26 18:16:13 UTC (rev 4776)
+++ pojo/tags/2.1.0.CR3/src/test/java/org/jboss/cache/pojo/NewReplicatedTes=
t.java	2008-01-16 00:43:28 UTC (rev 5140)
@@ -1,265 +0,0 @@
-package org.jboss.cache.pojo;
-
-import static org.testng.AssertJUnit.assertEquals;
-import static org.testng.AssertJUnit.assertNull;
-import static org.testng.AssertJUnit.fail;
-
-import java.io.Serializable;
-import java.util.Properties;
-
-import javax.naming.Context;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.jboss.cache.Fqn;
-import org.jboss.cache.config.Configuration.CacheMode;
-import org.jboss.cache.factories.UnitTestCacheConfigurationFactory;
-import org.jboss.cache.pojo.test.Address;
-import org.jboss.cache.pojo.test.Person;
-import org.jboss.cache.pojo.test.SpecialSerializedAddress;
-import org.jboss.cache.pojo.test.Student;
-import org.testng.annotations.AfterMethod;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.Test;
-
-
-/**
- * Replication PojoCache test. This is the real beef as local mode for Poj=
oCache really does
- * not do anything.
- *
- * @author Ben Wang
- */
-
-(a)Test(groups =3D {"functional"})
-public class NewReplicatedTest =

-{
-   Log log_ =3D LogFactory.getLog(NewReplicatedTest.class);
-   PojoCache cache_;
-   PojoCache cache1_;
-
-
-   @BeforeMethod(alwaysRun =3D true)
-   protected void setUp() throws Exception
-   {
-      Properties prop =3D new Properties();
-      prop.put(Context.INITIAL_CONTEXT_FACTORY, "org.jboss.cache.transacti=
on.DummyContextFactory");
-      boolean toStart =3D false;
-      cache_ =3D PojoCacheFactory.createCache(UnitTestCacheConfigurationFa=
ctory.createConfiguration(CacheMode.REPL_SYNC), toStart);
-      cache1_ =3D PojoCacheFactory.createCache(UnitTestCacheConfigurationF=
actory.createConfiguration(CacheMode.REPL_SYNC), toStart);
-      cache_.start();
-      cache1_.start();
-   }
-
-   @AfterMethod(alwaysRun =3D true)
-   protected void tearDown() throws Exception
-   {
-      cache_.stop();
-      cache1_.stop();
-   }
-
-   /*
-   public void testObjectSizePut() throws Exception
-   {
-      org.jboss.cache.data.Student student =3D (org.jboss.cache.data.Stude=
nt)constructObject();
-      cache_.putObject("/joe", student);
-   }
-
-   static Object constructObject()
-   {
-      org.jboss.cache.data.Student joe =3D new org.jboss.cache.data.Studen=
t();
-      joe.setName("Joe");
-
-      Address add =3D new Address();
-      add.setZip(94086);
-      add.setCity("Sunnyvale)");
-      add.setStreet("Albertson");
-      joe.setAddress(add);
-
-      String str;
-      for(int i=3D0; i < 100; i++)
-      {
-         Course course =3D new Course();
-         str =3D RandomString.randomstring(10,20);
-         course.setInstructor(str);
-         str =3D RandomString.randomstring(10,20);
-         course.setTitle(str);
-         str =3D RandomString.randomstring(10,20);
-         course.setRoom(str);
-         joe.addCourse(course);
-      }
-
-      return joe;
-   }
-   */
-
-
-   public void testSubClass() throws Exception
-   {
-      log_.info("testsubClass() ....");
-      Student test =3D new Student();
-      test.setName("Ben");
-      test.setAge(10);
-      Address addr =3D new Address();
-      addr.setCity("Taipei");
-      addr.setZip(106);
-      test.setAddress(addr);
-      cache_.attach("/a", test);
-      Student result =3D (Student) cache_.find("/a");
-      assertEquals(" ", test, result);
-
-      Student remote =3D (Student) cache1_.find("/a");
-      System.out.println("Output on cache1: " + result);
-      System.out.println("Output on cache2: " + remote);
-      assertEquals("Age should be ", 10, remote.getAge());
-   }
-
-   public void testRemoteRemove() throws Exception
-   {
-      log_.info("testRemoteRemove() ....");
-      Person test =3D new Person();
-      test.setName("Ben");
-      test.setAge(10);
-      cache_.attach("/a", test);
-      Person result =3D (Person) cache_.find("/a");
-      assertEquals(" ", test, result);
-
-      Person remote =3D (Person) cache1_.find("/a");
-      assertEquals("Age should be ", 10, remote.getAge());
-
-      // Remote remove
-      cache1_.detach("/a");
-      assertNull("Object should be null ", cache_.find("/a"));
-
-      assertNull("Object should be null ", cache1_.find("/a"));
-      // It should still be 10
-      assertEquals("Age should be ", 10, remote.getAge());
-   }
-
-   public void testRemoteRemove2() throws Exception
-   {
-      log_.info("testRemoteRemove() ....");
-      Person test =3D new Person();
-      test.setName("Ben");
-      test.setAge(10);
-      cache_.attach("/a", test);
-      Person result =3D (Person) cache_.find("/a");
-      assertEquals(" ", test, result);
-
-      Person remote =3D (Person) cache1_.find("/a");
-      assertEquals("Age should be ", 10, remote.getAge());
-
-      // Remote remove
-      cache_.detach("/a");
-      assertNull("Object should be null ", cache_.find("/a"));
-
-      assertNull("Object should be null ", cache1_.find("/a"));
-      // this will trigger the PojoCacheAlreadyDetachedException
-      try
-      {
-         remote.getAge();
-         fail("Should throw out exception here.");
-      }
-      catch (PojoCacheAlreadyDetachedException pe)
-      {
-      }
-   }
-
-   /**
-    * Test for pojo detachment and then serialization.
-    *
-    * @throws Exception
-    */
-   public void testRemoteDetach() throws Exception
-   {
-      log_.info("testRemoteDetach() ....");
-      SpecialSerializedAddress addr =3D new SpecialSerializedAddress();
-      addr.setZip(95123);
-      addr.addResidents("Ben");
-      addr.addResidents("Joe");
-      // Test serialization first
-      Fqn<String> fqn =3D Fqn.fromString("/plain");
-      cache_.getCache().put(fqn, "test", addr);
-      cache_.getCache().remove(fqn, "test");
-
-      cache_.attach("/a", addr);
-      SpecialSerializedAddress result =3D (SpecialSerializedAddress) cache=
_.find("/a");
-      assertEquals(" ", addr, result);
-
-      // Remote remove
-      cache_.detach("/a");
-      assertNull("Object should be null ", cache_.find("/a"));
-
-      // Test serialization after detach
-      cache_.getCache().put(fqn, "test", addr);
-
-      SpecialSerializedAddress remote =3D (SpecialSerializedAddress)
-            cache1_.getCache().get(fqn, "test");
-      assertEquals("Name should be ", 95123, remote.getZip());
-   }
-
-   public void testPutArray1() throws Exception
-   {
-      log_.info("testPutArray1() ....");
-      long[] arr =3D new long[]{1, 2};
-      cache_.attach("array", arr);
-
-      long[] a2 =3D (long[]) cache1_.find("array");
-      assertEquals("arr 0", 1, a2[0]);
-   }
-
-   public static class PersonSerial implements Serializable
-   {
-      private static final long serialVersionUID =3D 1L;
-      public String name;
-      public int age;
-      =

-      public PersonSerial(String name, int age)
-      {
-         this.name =3D name;
-         this.age =3D age;
-      }
-   }
-
-   public void testPutArray2() throws Exception
-   {
-      log_.info("testPutArray2() ....");
-      PersonSerial p1 =3D new PersonSerial("Ben", 10);
-
-      PersonSerial p2 =3D new PersonSerial("Joe", 20);
-      PersonSerial[] arr =3D new PersonSerial[]{p1, p2};
-
-      cache_.attach("array", arr);
-
-      PersonSerial[] a2 =3D (PersonSerial[]) cache1_.find("array");
-      assertEquals("arr 0", "Ben", a2[0].name);
-   }
-
-   /**
-    * JBCACHE-200.
-    *
-    * @throws Exception
-    */
-   public void testStateTransfer() throws Exception
-   {
-      log_.info("testStateTransfer() ....");
-      Person test =3D new Person();
-      test.setName("Ben");
-      test.setAge(10);
-      cache_.attach("/a", test);
-      Person result =3D (Person) cache_.find("/a");
-      assertEquals(" ", test, result);
-
-      // restart cache1_
-      cache1_.stop();
-      cache1_.getCache().removeNode(Fqn.fromString("/a"));
-      cache1_.start();
-      // Start from scratch for initial state transfer
-      Person remote =3D (Person) cache1_.find("/a");
-      assertEquals("Age should be ", 10, remote.getAge());
-   }
-
-
-
-
-}
-

Copied: pojo/tags/2.1.0.CR3/src/test/java/org/jboss/cache/pojo/NewReplicate=
dTest.java (from rev 5139, pojo/branches/2.1/src/test/java/org/jboss/cache/=
pojo/NewReplicatedTest.java)
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- pojo/tags/2.1.0.CR3/src/test/java/org/jboss/cache/pojo/NewReplicatedTes=
t.java	                        (rev 0)
+++ pojo/tags/2.1.0.CR3/src/test/java/org/jboss/cache/pojo/NewReplicatedTes=
t.java	2008-01-16 00:43:28 UTC (rev 5140)
@@ -0,0 +1,265 @@
+package org.jboss.cache.pojo;
+
+import static org.testng.AssertJUnit.assertEquals;
+import static org.testng.AssertJUnit.assertNull;
+import static org.testng.AssertJUnit.fail;
+
+import java.io.Serializable;
+import java.util.Properties;
+
+import javax.naming.Context;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.jboss.cache.Fqn;
+import org.jboss.cache.config.Configuration.CacheMode;
+import org.jboss.cache.factories.UnitTestCacheConfigurationFactory;
+import org.jboss.cache.pojo.test.Address;
+import org.jboss.cache.pojo.test.Person;
+import org.jboss.cache.pojo.test.SpecialSerializedAddress;
+import org.jboss.cache.pojo.test.Student;
+import org.testng.annotations.AfterMethod;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.Test;
+
+
+/**
+ * Replication PojoCache test. This is the real beef as local mode for Poj=
oCache really does
+ * not do anything.
+ *
+ * @author Ben Wang
+ */
+
+(a)Test(groups =3D {"functional"}, enabled=3Dfalse)
+public class NewReplicatedTest =

+{
+   Log log_ =3D LogFactory.getLog(NewReplicatedTest.class);
+   PojoCache cache_;
+   PojoCache cache1_;
+
+
+   @BeforeMethod(alwaysRun =3D true)
+   protected void setUp() throws Exception
+   {
+      Properties prop =3D new Properties();
+      prop.put(Context.INITIAL_CONTEXT_FACTORY, "org.jboss.cache.transacti=
on.DummyContextFactory");
+      boolean toStart =3D false;
+      cache_ =3D PojoCacheFactory.createCache(UnitTestCacheConfigurationFa=
ctory.createConfiguration(CacheMode.REPL_SYNC), toStart);
+      cache1_ =3D PojoCacheFactory.createCache(UnitTestCacheConfigurationF=
actory.createConfiguration(CacheMode.REPL_SYNC), toStart);
+      cache_.start();
+      cache1_.start();
+   }
+
+   @AfterMethod(alwaysRun =3D true)
+   protected void tearDown() throws Exception
+   {
+      cache_.stop();
+      cache1_.stop();
+   }
+
+   /*
+   public void testObjectSizePut() throws Exception
+   {
+      org.jboss.cache.data.Student student =3D (org.jboss.cache.data.Stude=
nt)constructObject();
+      cache_.putObject("/joe", student);
+   }
+
+   static Object constructObject()
+   {
+      org.jboss.cache.data.Student joe =3D new org.jboss.cache.data.Studen=
t();
+      joe.setName("Joe");
+
+      Address add =3D new Address();
+      add.setZip(94086);
+      add.setCity("Sunnyvale)");
+      add.setStreet("Albertson");
+      joe.setAddress(add);
+
+      String str;
+      for(int i=3D0; i < 100; i++)
+      {
+         Course course =3D new Course();
+         str =3D RandomString.randomstring(10,20);
+         course.setInstructor(str);
+         str =3D RandomString.randomstring(10,20);
+         course.setTitle(str);
+         str =3D RandomString.randomstring(10,20);
+         course.setRoom(str);
+         joe.addCourse(course);
+      }
+
+      return joe;
+   }
+   */
+
+
+   public void testSubClass() throws Exception
+   {
+      log_.info("testsubClass() ....");
+      Student test =3D new Student();
+      test.setName("Ben");
+      test.setAge(10);
+      Address addr =3D new Address();
+      addr.setCity("Taipei");
+      addr.setZip(106);
+      test.setAddress(addr);
+      cache_.attach("/a", test);
+      Student result =3D (Student) cache_.find("/a");
+      assertEquals(" ", test, result);
+
+      Student remote =3D (Student) cache1_.find("/a");
+      System.out.println("Output on cache1: " + result);
+      System.out.println("Output on cache2: " + remote);
+      assertEquals("Age should be ", 10, remote.getAge());
+   }
+
+   public void testRemoteRemove() throws Exception
+   {
+      log_.info("testRemoteRemove() ....");
+      Person test =3D new Person();
+      test.setName("Ben");
+      test.setAge(10);
+      cache_.attach("/a", test);
+      Person result =3D (Person) cache_.find("/a");
+      assertEquals(" ", test, result);
+
+      Person remote =3D (Person) cache1_.find("/a");
+      assertEquals("Age should be ", 10, remote.getAge());
+
+      // Remote remove
+      cache1_.detach("/a");
+      assertNull("Object should be null ", cache_.find("/a"));
+
+      assertNull("Object should be null ", cache1_.find("/a"));
+      // It should still be 10
+      assertEquals("Age should be ", 10, remote.getAge());
+   }
+
+   public void testRemoteRemove2() throws Exception
+   {
+      log_.info("testRemoteRemove() ....");
+      Person test =3D new Person();
+      test.setName("Ben");
+      test.setAge(10);
+      cache_.attach("/a", test);
+      Person result =3D (Person) cache_.find("/a");
+      assertEquals(" ", test, result);
+
+      Person remote =3D (Person) cache1_.find("/a");
+      assertEquals("Age should be ", 10, remote.getAge());
+
+      // Remote remove
+      cache_.detach("/a");
+      assertNull("Object should be null ", cache_.find("/a"));
+
+      assertNull("Object should be null ", cache1_.find("/a"));
+      // this will trigger the PojoCacheAlreadyDetachedException
+      try
+      {
+         remote.getAge();
+         fail("Should throw out exception here.");
+      }
+      catch (PojoCacheAlreadyDetachedException pe)
+      {
+      }
+   }
+
+   /**
+    * Test for pojo detachment and then serialization.
+    *
+    * @throws Exception
+    */
+   public void testRemoteDetach() throws Exception
+   {
+      log_.info("testRemoteDetach() ....");
+      SpecialSerializedAddress addr =3D new SpecialSerializedAddress();
+      addr.setZip(95123);
+      addr.addResidents("Ben");
+      addr.addResidents("Joe");
+      // Test serialization first
+      Fqn<String> fqn =3D Fqn.fromString("/plain");
+      cache_.getCache().put(fqn, "test", addr);
+      cache_.getCache().remove(fqn, "test");
+
+      cache_.attach("/a", addr);
+      SpecialSerializedAddress result =3D (SpecialSerializedAddress) cache=
_.find("/a");
+      assertEquals(" ", addr, result);
+
+      // Remote remove
+      cache_.detach("/a");
+      assertNull("Object should be null ", cache_.find("/a"));
+
+      // Test serialization after detach
+      cache_.getCache().put(fqn, "test", addr);
+
+      SpecialSerializedAddress remote =3D (SpecialSerializedAddress)
+            cache1_.getCache().get(fqn, "test");
+      assertEquals("Name should be ", 95123, remote.getZip());
+   }
+
+   public void testPutArray1() throws Exception
+   {
+      log_.info("testPutArray1() ....");
+      long[] arr =3D new long[]{1, 2};
+      cache_.attach("array", arr);
+
+      long[] a2 =3D (long[]) cache1_.find("array");
+      assertEquals("arr 0", 1, a2[0]);
+   }
+
+   public static class PersonSerial implements Serializable
+   {
+      private static final long serialVersionUID =3D 1L;
+      public String name;
+      public int age;
+      =

+      public PersonSerial(String name, int age)
+      {
+         this.name =3D name;
+         this.age =3D age;
+      }
+   }
+
+   public void testPutArray2() throws Exception
+   {
+      log_.info("testPutArray2() ....");
+      PersonSerial p1 =3D new PersonSerial("Ben", 10);
+
+      PersonSerial p2 =3D new PersonSerial("Joe", 20);
+      PersonSerial[] arr =3D new PersonSerial[]{p1, p2};
+
+      cache_.attach("array", arr);
+
+      PersonSerial[] a2 =3D (PersonSerial[]) cache1_.find("array");
+      assertEquals("arr 0", "Ben", a2[0].name);
+   }
+
+   /**
+    * JBCACHE-200.
+    *
+    * @throws Exception
+    */
+   public void testStateTransfer() throws Exception
+   {
+      log_.info("testStateTransfer() ....");
+      Person test =3D new Person();
+      test.setName("Ben");
+      test.setAge(10);
+      cache_.attach("/a", test);
+      Person result =3D (Person) cache_.find("/a");
+      assertEquals(" ", test, result);
+
+      // restart cache1_
+      cache1_.stop();
+      //cache1_.getCache().removeNode(Fqn.fromString("/a"));
+      cache1_.start();
+      // Start from scratch for initial state transfer
+      Person remote =3D (Person) cache1_.find("/a");
+      assertEquals("Age should be ", 10, remote.getAge());
+   }
+
+
+
+
+}
+

Deleted: pojo/tags/2.1.0.CR3/src/test/java/org/jboss/cache/pojo/NewReplicat=
edTxTest.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- pojo/branches/2.1/src/test/java/org/jboss/cache/pojo/NewReplicatedTxTes=
t.java	2007-11-26 18:16:13 UTC (rev 4776)
+++ pojo/tags/2.1.0.CR3/src/test/java/org/jboss/cache/pojo/NewReplicatedTxT=
est.java	2008-01-16 00:43:28 UTC (rev 5140)
@@ -1,441 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- *
- * Distributable under LGPL license.
- * See terms of license at gnu.org.
- */
-
-package org.jboss.cache.pojo;
-
-import static org.testng.AssertJUnit.assertEquals;
-import static org.testng.AssertJUnit.fail;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Properties;
-
-import javax.naming.Context;
-import javax.naming.InitialContext;
-import javax.naming.NamingException;
-import javax.transaction.NotSupportedException;
-import javax.transaction.RollbackException;
-import javax.transaction.SystemException;
-import javax.transaction.UserTransaction;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.jboss.cache.config.Configuration.CacheMode;
-import org.jboss.cache.factories.UnitTestCacheConfigurationFactory;
-import org.jboss.cache.pojo.test.Address;
-import org.jboss.cache.pojo.test.Person;
-import org.jboss.cache.transaction.DummyTransactionManager;
-import org.testng.annotations.AfterMethod;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.Test;
-
-/**
- * PojoCache replicated test cases with tx.
- *
- * @author Ben Wang
- */
-
-(a)Test(groups =3D {"functional"})
-public class NewReplicatedTxTest =

-{
-   Log log =3D LogFactory.getLog(NewReplicatedTxTest.class);
-   PojoCache cache_;
-   PojoCache cache1_;
-   final String FACTORY =3D "org.jboss.cache.transaction.DummyContextFacto=
ry";
-   DummyTransactionManager tx_mgr;
-   Throwable t1_ex, t2_ex;
-   long start =3D 0;
-
-
-
-   @BeforeMethod(alwaysRun =3D true)
-   protected void setUp() throws Exception
-   {
-      log.info("setUp() ....");
-      Properties prop =3D new Properties();
-      prop.put(Context.INITIAL_CONTEXT_FACTORY, "org.jboss.cache.transacti=
on.DummyContextFactory");
-      boolean toStart =3D false;
-      cache_ =3D PojoCacheFactory.createCache(UnitTestCacheConfigurationFa=
ctory.createConfiguration(CacheMode.REPL_SYNC), toStart);
-      cache1_ =3D PojoCacheFactory.createCache(UnitTestCacheConfigurationF=
actory.createConfiguration(CacheMode.REPL_SYNC), toStart);
-      cache_.start();
-      cache1_.start();
-
-      tx_mgr =3D DummyTransactionManager.getInstance();
-      t1_ex =3D t2_ex =3D null;
-   }
-
-   @AfterMethod(alwaysRun =3D true)
-   protected void tearDown() throws Exception
-   {
-      cache_.stop();
-      cache1_.stop();
-      DummyTransactionManager.destroy();
-   }
-
-   UserTransaction getTransaction() throws SystemException, NotSupportedEx=
ception, NamingException
-   {
-      Properties prop =3D new Properties();
-      prop.put(Context.INITIAL_CONTEXT_FACTORY,
-              "org.jboss.cache.transaction.DummyContextFactory");
-      return (UserTransaction) new InitialContext(prop).lookup("UserTransa=
ction");
-   }
-
-   public void testSimpleTxWithRollback() throws Exception
-   {
-      log.info("testSimpleTxWithRollback() ....");
-      UserTransaction tx =3D getTransaction();
-
-      Person joe =3D new Person();
-      joe.setName("Joe");
-      Address add =3D new Address();
-      add.setZip(104);
-      add.setCity("Taipei");
-      joe.setAddress(add);
-
-      tx.begin();
-      cache_.attach("/person/joe", joe);
-      tx.commit();
-      Person p =3D (Person) cache1_.find("/person/joe");
-      assertEquals("Zip should be the same ", joe.getAddress().getZip(), p=
.getAddress().getZip());
-
-      // test rollback
-      Person ben =3D new Person();
-      ben.setName("Ben");
-      add =3D new Address();
-      add.setZip(104);
-      add.setCity("Taipei");
-      joe.setAddress(add);
-      tx.begin();
-      cache_.attach("/person/ben", ben);
-      tx.rollback();
-      assertEquals("Zip should be the same ", joe.getAddress().getZip(), p=
.getAddress().getZip());
-   }
-
-   public void testCollectionTxWithRollback() throws Exception
-   {
-      log.info("testCollectionTxWithRollback() ....");
-      UserTransaction tx =3D getTransaction();
-
-      Person joe =3D new Person();
-      joe.setName("Joe");
-      Address add =3D new Address();
-      add.setZip(104);
-      add.setCity("Taipei");
-      joe.setAddress(add);
-      ArrayList<String> lang =3D new ArrayList<String>();
-      lang.add("English");
-      lang.add("Taiwanese");
-      lang.add("Mandirin");
-      joe.setLanguages(lang);
-
-      tx.begin();
-      cache_.attach("/person/joe", joe);
-      tx.commit();
-      Person p =3D (Person) cache1_.find("/person/joe");
-      assertEquals("Zip should be the same ", joe.getAddress().getZip(), p=
.getAddress().getZip());
-
-      // test rollback
-      Person ben =3D new Person();
-      ben.setName("Ben");
-      add =3D new Address();
-      add.setZip(104);
-      add.setCity("Taipei");
-      ben.setAddress(add);
-      tx.begin();
-      cache_.attach("/person/ben", ben);
-      tx.rollback();
-      assertEquals("Zip should be the same ", joe.getAddress().getZip(), p=
.getAddress().getZip());
-      assertEquals("Langue 1 should be: ", "English", joe.getLanguages().g=
et(0));
-   }
-
-
-   public void testConcurrentPutsWithRollback() throws Exception
-   {
-      Thread t1 =3D new Thread()
-      {
-         public void run()
-         {
-            Person p =3D new Person();
-            p.setName("Ben");
-            Address add =3D new Address();
-            add.setCity("Taipei");
-            p.setAddress(add);
-            List<String> lang =3D new ArrayList<String>();
-            lang.add("English");
-            lang.add("Taiwanese");
-            lang.add("Japanese");
-            p.setLanguages(lang);
-            try
-            {
-               cache_.attach("/test/ben", p);
-            }
-            catch (Exception ex)
-            {
-               try
-               {
-                  throw new RuntimeException("PojoCache is not rolling bac=
k properly for Collection yet.");
-                  //                  cache_.attach("/test/ben", p);
-               }
-               catch (Exception ex1)
-               {
-                  t1_ex =3D ex1;
-               }
-            }
-         }
-      };
-
-      Thread t2 =3D new Thread()
-      {
-         public void run()
-         {
-            try
-            {
-               UserTransaction tx =3D getTransaction();
-               tx.begin();
-               Person p =3D new Person();
-               p.setName("Ben");
-               Address add =3D new Address();
-               add.setCity("Taipei");
-               p.setAddress(add);
-               cache1_.attach("/test/ben", p);
-               TestingUtil.sleepThread(1000);
-               tx.commit();
-            }
-            catch (RollbackException rollback)
-            {
-            }
-            catch (Exception ex)
-            {
-               t2_ex =3D ex;
-            }
-         }
-      };
-
-      t1.start();
-      t2.start();
-
-      t1.join();
-      t2.join();
-
-      // t2 should rollback due to timeout while t2 should succeed
-      if (t1_ex !=3D null)
-      {
-         fail("Thread1 failed: " + t1_ex);
-      }
-      if (t2_ex !=3D null)
-      {
-         fail("Thread2 failed: " + t2_ex);
-      }
-   }
-
-   public void testConcurrentTxPutsWithRollback() throws Exception
-   {
-      Thread t1 =3D new Thread()
-      {
-         public void run()
-         {
-            UserTransaction tx =3D null;
-            Person p =3D new Person();
-            p.setName("Ben");
-            Address add =3D new Address();
-            add.setCity("Taipei");
-            p.setAddress(add);
-            List<String> lang =3D new ArrayList<String>();
-            lang.add("English");
-            lang.add("Taiwanese");
-            lang.add("Japanese");
-            p.setLanguages(lang);
-            try
-            {
-               tx =3D getTransaction();
-               tx.begin();
-               cache_.attach("/test/ben", p);
-               TestingUtil.sleepThread(500);
-               tx.commit();
-            }
-            catch (RollbackException rollback)
-            {
-               try
-               {
-                  tx =3D getTransaction();
-                  tx.begin();
-                  //                  throw new RuntimeException("PojoCach=
e is not rolling back properly for Collection yet.");
-                  cache_.attach("/test/ben", p);
-                  tx.commit();
-               }
-               catch (Exception ex)
-               {
-                  t1_ex =3D ex;
-                  ex.printStackTrace();
-               }
-            }
-            catch (Exception ex)
-            {
-               t1_ex =3D ex;
-               ex.printStackTrace();
-            }
-         }
-      };
-
-      Thread t2 =3D new Thread()
-      {
-         public void run()
-         {
-            try
-            {
-               UserTransaction tx =3D getTransaction();
-               tx.begin();
-               Person p =3D new Person();
-               p.setName("Ben");
-               Address add =3D new Address();
-               add.setCity("Taipei");
-               p.setAddress(add);
-               cache1_.attach("/test/ben", p);
-               TestingUtil.sleepThread(1000);
-               tx.commit();
-            }
-            catch (RollbackException rollback)
-            {
-            }
-            catch (Exception ex)
-            {
-               t2_ex =3D ex;
-            }
-         }
-      };
-
-      t1.start();
-      t2.start();
-
-      t1.join();
-      t2.join();
-
-      // t2 should rollback due to timeout while t2 should succeed
-      if (t1_ex !=3D null)
-      {
-         fail("Thread1 failed: " + t1_ex);
-      }
-      if (t2_ex !=3D null)
-      {
-         fail("Thread2 failed: " + t2_ex);
-      }
-   }
-
-   public void testConcurrentTxPutsWithRollbackField() throws Exception
-   {
-      Person p =3D new Person();
-      p.setName("Ben");
-      Address add =3D new Address();
-      add.setCity("Taipei");
-      p.setAddress(add);
-      List<String> lang =3D new ArrayList<String>();
-      lang.add("1");
-      p.setLanguages(lang);
-      cache_.attach("/test/ben", p);
-
-      Thread t1 =3D new Thread()
-      {
-         public void run()
-         {
-            UserTransaction tx =3D null;
-            List<String> lang =3D null;
-            try
-            {
-               Person ben =3D (Person) cache_.find("/test/ben");
-               lang =3D ben.getLanguages();
-
-               tx =3D getTransaction();
-               tx.begin();
-               lang.add("2");
-               lang.add("3");
-               lang.remove(0);
-               TestingUtil.sleepThread(1000);
-               tx.commit();
-            }
-            catch (RollbackException rollback)
-            {
-               try
-               {
-                  tx =3D getTransaction();
-                  tx.begin();
-                  lang.add("2");
-                  lang.add("3");
-                  lang.remove(0);
-                  tx.commit();
-               }
-               catch (Exception ex)
-               {
-                  t1_ex =3D ex;
-               }
-            }
-            catch (Exception ex)
-            {
-               t1_ex =3D ex;
-            }
-         }
-      };
-
-      Thread t2 =3D new Thread()
-      {
-         public void run()
-         {
-            List<String> lang =3D null;
-            UserTransaction tx =3D null;
-            try
-            {
-               Person ben =3D (Person) cache1_.find("/test/ben");
-               lang =3D ben.getLanguages();
-
-               tx =3D getTransaction();
-               tx.begin();
-               lang.add("2");
-               TestingUtil.sleepThread(1000);
-               tx.commit();
-            }
-            catch (RollbackException rollback)
-            {
-               TestingUtil.sleepThread(1000);
-               try
-               {
-                  tx =3D getTransaction();
-                  tx.begin();
-                  lang.add("2");
-                  tx.commit();
-               }
-               catch (Exception e)
-               {
-                  e.printStackTrace();
-               }
-            }
-            catch (Exception ex)
-            {
-               t2_ex =3D ex;
-            }
-         }
-      };
-
-      t1.start();
-      t2.start();
-
-      t1.join();
-      t2.join();
-
-      // t2 should rollback due to timeout while t2 should succeed
-      if (t1_ex !=3D null)
-      {
-         fail("Thread1 failed: " + t1_ex);
-      }
-      if (t2_ex !=3D null)
-      {
-         fail("Thread2 failed: " + t2_ex);
-      }
-   }
-
-
-
-
-}

Copied: pojo/tags/2.1.0.CR3/src/test/java/org/jboss/cache/pojo/NewReplicate=
dTxTest.java (from rev 5139, pojo/branches/2.1/src/test/java/org/jboss/cach=
e/pojo/NewReplicatedTxTest.java)
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- pojo/tags/2.1.0.CR3/src/test/java/org/jboss/cache/pojo/NewReplicatedTxT=
est.java	                        (rev 0)
+++ pojo/tags/2.1.0.CR3/src/test/java/org/jboss/cache/pojo/NewReplicatedTxT=
est.java	2008-01-16 00:43:28 UTC (rev 5140)
@@ -0,0 +1,442 @@
+/*
+ * JBoss, Home of Professional Open Source
+ *
+ * Distributable under LGPL license.
+ * See terms of license at gnu.org.
+ */
+
+package org.jboss.cache.pojo;
+
+import static org.testng.AssertJUnit.assertEquals;
+import static org.testng.AssertJUnit.fail;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Properties;
+
+import javax.naming.Context;
+import javax.naming.InitialContext;
+import javax.naming.NamingException;
+import javax.transaction.NotSupportedException;
+import javax.transaction.RollbackException;
+import javax.transaction.SystemException;
+import javax.transaction.UserTransaction;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.jboss.cache.config.Configuration.CacheMode;
+import org.jboss.cache.factories.UnitTestCacheConfigurationFactory;
+import org.jboss.cache.misc.TestingUtil;
+import org.jboss.cache.pojo.test.Address;
+import org.jboss.cache.pojo.test.Person;
+import org.jboss.cache.transaction.DummyTransactionManager;
+import org.testng.annotations.AfterMethod;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.Test;
+
+/**
+ * PojoCache replicated test cases with tx.
+ *
+ * @author Ben Wang
+ */
+
+(a)Test(groups =3D {"functional"}, enabled=3Dfalse)
+public class NewReplicatedTxTest =

+{
+   Log log =3D LogFactory.getLog(NewReplicatedTxTest.class);
+   PojoCache cache_;
+   PojoCache cache1_;
+   final String FACTORY =3D "org.jboss.cache.transaction.DummyContextFacto=
ry";
+   DummyTransactionManager tx_mgr;
+   Throwable t1_ex, t2_ex;
+   long start =3D 0;
+
+
+
+   @BeforeMethod(alwaysRun =3D true)
+   protected void setUp() throws Exception
+   {
+      log.info("setUp() ....");
+      Properties prop =3D new Properties();
+      prop.put(Context.INITIAL_CONTEXT_FACTORY, "org.jboss.cache.transacti=
on.DummyContextFactory");
+      boolean toStart =3D false;
+      cache_ =3D PojoCacheFactory.createCache(UnitTestCacheConfigurationFa=
ctory.createConfiguration(CacheMode.REPL_SYNC), toStart);
+      cache1_ =3D PojoCacheFactory.createCache(UnitTestCacheConfigurationF=
actory.createConfiguration(CacheMode.REPL_SYNC), toStart);
+      cache_.start();
+      cache1_.start();
+
+      tx_mgr =3D DummyTransactionManager.getInstance();
+      t1_ex =3D t2_ex =3D null;
+   }
+
+   @AfterMethod(alwaysRun =3D true)
+   protected void tearDown() throws Exception
+   {
+      cache_.stop();
+      cache1_.stop();
+      DummyTransactionManager.destroy();
+   }
+
+   UserTransaction getTransaction() throws SystemException, NotSupportedEx=
ception, NamingException
+   {
+      Properties prop =3D new Properties();
+      prop.put(Context.INITIAL_CONTEXT_FACTORY,
+              "org.jboss.cache.transaction.DummyContextFactory");
+      return (UserTransaction) new InitialContext(prop).lookup("UserTransa=
ction");
+   }
+
+   public void testSimpleTxWithRollback() throws Exception
+   {
+      log.info("testSimpleTxWithRollback() ....");
+      UserTransaction tx =3D getTransaction();
+
+      Person joe =3D new Person();
+      joe.setName("Joe");
+      Address add =3D new Address();
+      add.setZip(104);
+      add.setCity("Taipei");
+      joe.setAddress(add);
+
+      tx.begin();
+      cache_.attach("/person/joe", joe);
+      tx.commit();
+      Person p =3D (Person) cache1_.find("/person/joe");
+      assertEquals("Zip should be the same ", joe.getAddress().getZip(), p=
.getAddress().getZip());
+
+      // test rollback
+      Person ben =3D new Person();
+      ben.setName("Ben");
+      add =3D new Address();
+      add.setZip(104);
+      add.setCity("Taipei");
+      joe.setAddress(add);
+      tx.begin();
+      cache_.attach("/person/ben", ben);
+      tx.rollback();
+      assertEquals("Zip should be the same ", joe.getAddress().getZip(), p=
.getAddress().getZip());
+   }
+
+   public void testCollectionTxWithRollback() throws Exception
+   {
+      log.info("testCollectionTxWithRollback() ....");
+      UserTransaction tx =3D getTransaction();
+
+      Person joe =3D new Person();
+      joe.setName("Joe");
+      Address add =3D new Address();
+      add.setZip(104);
+      add.setCity("Taipei");
+      joe.setAddress(add);
+      ArrayList<String> lang =3D new ArrayList<String>();
+      lang.add("English");
+      lang.add("Taiwanese");
+      lang.add("Mandirin");
+      joe.setLanguages(lang);
+
+      tx.begin();
+      cache_.attach("/person/joe", joe);
+      tx.commit();
+      Person p =3D (Person) cache1_.find("/person/joe");
+      assertEquals("Zip should be the same ", joe.getAddress().getZip(), p=
.getAddress().getZip());
+
+      // test rollback
+      Person ben =3D new Person();
+      ben.setName("Ben");
+      add =3D new Address();
+      add.setZip(104);
+      add.setCity("Taipei");
+      ben.setAddress(add);
+      tx.begin();
+      cache_.attach("/person/ben", ben);
+      tx.rollback();
+      assertEquals("Zip should be the same ", joe.getAddress().getZip(), p=
.getAddress().getZip());
+      assertEquals("Langue 1 should be: ", "English", joe.getLanguages().g=
et(0));
+   }
+
+
+   public void testConcurrentPutsWithRollback() throws Exception
+   {
+      Thread t1 =3D new Thread()
+      {
+         public void run()
+         {
+            Person p =3D new Person();
+            p.setName("Ben");
+            Address add =3D new Address();
+            add.setCity("Taipei");
+            p.setAddress(add);
+            List<String> lang =3D new ArrayList<String>();
+            lang.add("English");
+            lang.add("Taiwanese");
+            lang.add("Japanese");
+            p.setLanguages(lang);
+            try
+            {
+               cache_.attach("/test/ben", p);
+            }
+            catch (Exception ex)
+            {
+               try
+               {
+                  throw new RuntimeException("PojoCache is not rolling bac=
k properly for Collection yet.");
+                  //                  cache_.attach("/test/ben", p);
+               }
+               catch (Exception ex1)
+               {
+                  t1_ex =3D ex1;
+               }
+            }
+         }
+      };
+
+      Thread t2 =3D new Thread()
+      {
+         public void run()
+         {
+            try
+            {
+               UserTransaction tx =3D getTransaction();
+               tx.begin();
+               Person p =3D new Person();
+               p.setName("Ben");
+               Address add =3D new Address();
+               add.setCity("Taipei");
+               p.setAddress(add);
+               cache1_.attach("/test/ben", p);
+               TestingUtil.sleepThread(1000);
+               tx.commit();
+            }
+            catch (RollbackException rollback)
+            {
+            }
+            catch (Exception ex)
+            {
+               t2_ex =3D ex;
+            }
+         }
+      };
+
+      t1.start();
+      t2.start();
+
+      t1.join();
+      t2.join();
+
+      // t2 should rollback due to timeout while t2 should succeed
+      if (t1_ex !=3D null)
+      {
+         fail("Thread1 failed: " + t1_ex);
+      }
+      if (t2_ex !=3D null)
+      {
+         fail("Thread2 failed: " + t2_ex);
+      }
+   }
+
+   public void testConcurrentTxPutsWithRollback() throws Exception
+   {
+      Thread t1 =3D new Thread()
+      {
+         public void run()
+         {
+            UserTransaction tx =3D null;
+            Person p =3D new Person();
+            p.setName("Ben");
+            Address add =3D new Address();
+            add.setCity("Taipei");
+            p.setAddress(add);
+            List<String> lang =3D new ArrayList<String>();
+            lang.add("English");
+            lang.add("Taiwanese");
+            lang.add("Japanese");
+            p.setLanguages(lang);
+            try
+            {
+               tx =3D getTransaction();
+               tx.begin();
+               cache_.attach("/test/ben", p);
+               TestingUtil.sleepThread(500);
+               tx.commit();
+            }
+            catch (RollbackException rollback)
+            {
+               try
+               {
+                  tx =3D getTransaction();
+                  tx.begin();
+                  //                  throw new RuntimeException("PojoCach=
e is not rolling back properly for Collection yet.");
+                  cache_.attach("/test/ben", p);
+                  tx.commit();
+               }
+               catch (Exception ex)
+               {
+                  t1_ex =3D ex;
+                  ex.printStackTrace();
+               }
+            }
+            catch (Exception ex)
+            {
+               t1_ex =3D ex;
+               ex.printStackTrace();
+            }
+         }
+      };
+
+      Thread t2 =3D new Thread()
+      {
+         public void run()
+         {
+            try
+            {
+               UserTransaction tx =3D getTransaction();
+               tx.begin();
+               Person p =3D new Person();
+               p.setName("Ben");
+               Address add =3D new Address();
+               add.setCity("Taipei");
+               p.setAddress(add);
+               cache1_.attach("/test/ben", p);
+               TestingUtil.sleepThread(1000);
+               tx.commit();
+            }
+            catch (RollbackException rollback)
+            {
+            }
+            catch (Exception ex)
+            {
+               t2_ex =3D ex;
+            }
+         }
+      };
+
+      t1.start();
+      t2.start();
+
+      t1.join();
+      t2.join();
+
+      // t2 should rollback due to timeout while t2 should succeed
+      if (t1_ex !=3D null)
+      {
+         fail("Thread1 failed: " + t1_ex);
+      }
+      if (t2_ex !=3D null)
+      {
+         fail("Thread2 failed: " + t2_ex);
+      }
+   }
+
+   public void testConcurrentTxPutsWithRollbackField() throws Exception
+   {
+      Person p =3D new Person();
+      p.setName("Ben");
+      Address add =3D new Address();
+      add.setCity("Taipei");
+      p.setAddress(add);
+      List<String> lang =3D new ArrayList<String>();
+      lang.add("1");
+      p.setLanguages(lang);
+      cache_.attach("/test/ben", p);
+
+      Thread t1 =3D new Thread()
+      {
+         public void run()
+         {
+            UserTransaction tx =3D null;
+            List<String> lang =3D null;
+            try
+            {
+               Person ben =3D (Person) cache_.find("/test/ben");
+               lang =3D ben.getLanguages();
+
+               tx =3D getTransaction();
+               tx.begin();
+               lang.add("2");
+               lang.add("3");
+               lang.remove(0);
+               TestingUtil.sleepThread(1000);
+               tx.commit();
+            }
+            catch (RollbackException rollback)
+            {
+               try
+               {
+                  tx =3D getTransaction();
+                  tx.begin();
+                  lang.add("2");
+                  lang.add("3");
+                  lang.remove(0);
+                  tx.commit();
+               }
+               catch (Exception ex)
+               {
+                  t1_ex =3D ex;
+               }
+            }
+            catch (Exception ex)
+            {
+               t1_ex =3D ex;
+            }
+         }
+      };
+
+      Thread t2 =3D new Thread()
+      {
+         public void run()
+         {
+            List<String> lang =3D null;
+            UserTransaction tx =3D null;
+            try
+            {
+               Person ben =3D (Person) cache1_.find("/test/ben");
+               lang =3D ben.getLanguages();
+
+               tx =3D getTransaction();
+               tx.begin();
+               lang.add("2");
+               TestingUtil.sleepThread(1000);
+               tx.commit();
+            }
+            catch (RollbackException rollback)
+            {
+               TestingUtil.sleepThread(1000);
+               try
+               {
+                  tx =3D getTransaction();
+                  tx.begin();
+                  lang.add("2");
+                  tx.commit();
+               }
+               catch (Exception e)
+               {
+                  e.printStackTrace();
+               }
+            }
+            catch (Exception ex)
+            {
+               t2_ex =3D ex;
+            }
+         }
+      };
+
+      t1.start();
+      t2.start();
+
+      t1.join();
+      t2.join();
+
+      // t2 should rollback due to timeout while t2 should succeed
+      if (t1_ex !=3D null)
+      {
+         fail("Thread1 failed: " + t1_ex);
+      }
+      if (t2_ex !=3D null)
+      {
+         fail("Thread2 failed: " + t2_ex);
+      }
+   }
+
+
+
+
+}

Deleted: pojo/tags/2.1.0.CR3/src/test/java/org/jboss/cache/pojo/ReplicatedC=
ircularGraphTest.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- pojo/branches/2.1/src/test/java/org/jboss/cache/pojo/ReplicatedCircular=
GraphTest.java	2007-11-26 18:16:13 UTC (rev 4776)
+++ pojo/tags/2.1.0.CR3/src/test/java/org/jboss/cache/pojo/ReplicatedCircul=
arGraphTest.java	2008-01-16 00:43:28 UTC (rev 5140)
@@ -1,216 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- *
- * Distributable under LGPL license.
- * See terms of license at gnu.org.
- */
-
-package org.jboss.cache.pojo;
-
-import static org.testng.AssertJUnit.assertEquals;
-import static org.testng.AssertJUnit.assertNotNull;
-import static org.testng.AssertJUnit.assertNull;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.jboss.cache.Fqn;
-import org.jboss.cache.config.Configuration.CacheMode;
-import org.jboss.cache.factories.UnitTestCacheConfigurationFactory;
-import org.jboss.cache.pojo.test.Link;
-import org.jboss.cache.pojo.test.NodeManager;
-import org.jboss.cache.pojo.test.Person;
-import org.testng.annotations.AfterMethod;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.Test;
-
-/**
- * Test object graph handling in aop, e.g., circular reference, multiple r=
eference, link, etc.
- *
- * @author Ben Wang
- */
-
-(a)Test(groups =3D {"functional"})
-public class ReplicatedCircularGraphTest =

-{
-   Log log =3D LogFactory.getLog(ReplicatedCircularGraphTest.class);
-   PojoCache cache1;
-   PojoCache cache2;
-
-
-   @BeforeMethod(alwaysRun =3D true)
-   protected void setUp() throws Exception
-   {
-      log.info("setUp() ....");
-      cache1 =3D createCache("CacheGroup");
-      cache2 =3D createCache("CacheGroup");
-   }
-
-   @AfterMethod(alwaysRun =3D true)
-   protected void tearDown() throws Exception
-   {
-      cache1.getCache().removeNode(Fqn.fromString("/"));
-      cache1.stop();
-      cache2.stop();
-   }
-
-   private PojoCache createCache(String name) throws Exception
-   {
-      boolean toStart =3D false;
-      PojoCache tree =3D PojoCacheFactory.createCache(UnitTestCacheConfigu=
rationFactory.createConfiguration(CacheMode.REPL_SYNC), toStart);
-      tree.start();
-      return tree;
-   }
-
-//   public void testDummy() {}
-
-   protected Person createPerson(String name, int age)
-   {
-      Person p =3D new Person();
-      p.setName(name);
-      p.setAge(age);
-      return p;
-   }
-
-   public void testCircularReference1() throws Exception
-   {
-//        try {Thread.sleep(10000); } catch (Exception e) {};
-      log.info("testCircularReference1() ...");
-      Link parent =3D new Link("parent");
-      Link child =3D new Link("child");
-      parent.setLink(child);
-      child.setLink(parent);
-      cache1.attach("/link/parent", parent);
-      TestingUtil.sleepThread(100);
-      assertEquals("parent", ((Link) cache1.find("/link/parent")).getName(=
));
-      assertEquals("child", ((Link) cache1.find("/link/parent")).getLink()=
.getName());
-      assertEquals("parent", ((Link) cache2.find("/link/parent")).getName(=
));
-      assertEquals("child", ((Link) cache2.find("/link/parent")).getLink()=
.getName());
-      ((Link) cache2.find("/link/parent")).setLink(null);
-      assertNull("Child should be null", ((Link) cache2.find("/link/parent=
")).getLink());
-      Link link =3D (Link) cache1.detach("/link/parent");
-      assertNotNull("Link should not be null ", link);
-      System.out.println("Link: " + link);
-   }
-
-   public void testCircularReference2() throws Exception
-   {
-//        try {Thread.sleep(10000); } catch (Exception e) {};
-      log.info("testCircularReference2() ...");
-      Link parent =3D new Link("parent");
-      Link child =3D new Link("child");
-      cache1.attach("/link/parent", parent);
-      parent.setLink(child);
-      child.setLink(parent);
-      assertEquals("parent", ((Link) cache1.find("/link/parent")).getName(=
));
-      assertEquals("child", ((Link) cache1.find("/link/parent")).getLink()=
.getName());
-      assertEquals("parent", ((Link) cache2.find("/link/parent")).getName(=
));
-      assertEquals("child", ((Link) cache2.find("/link/parent")).getLink()=
.getName());
-      ((Link) cache2.find("/link/parent")).setLink(null);
-      assertNull("Child should be null", ((Link) cache2.find("/link/parent=
")).getLink());
-      Link link =3D (Link) cache1.detach("/link/parent");
-      assertNotNull("Link should not be null ", link);
-   }
-
-   public void testCircularReference3() throws Exception
-   {
-//        try {Thread.sleep(10000); } catch (Exception e) {};
-      log.info("testCircularReference3() ...");
-      Link parent =3D new Link("parent");
-      Link child =3D new Link("child");
-      cache1.attach("/link/parent", parent);
-      cache1.attach("/link/child", child);
-      TestingUtil.sleepThread(100);
-      parent.setLink(child);
-      child.setLink(parent);
-
-      Link p1 =3D (Link) cache1.find("/link/parent");
-      Link c1 =3D (Link) cache1.find("/link/child");
-      assertEquals("parent", p1.getName());
-      assertEquals("child", p1.getLink().getName());
-      assertEquals("child", c1.getName());
-      assertEquals("parent", c1.getLink().getName());
-
-      Link p2 =3D (Link) cache1.find("/link/parent");
-      Link c2 =3D (Link) cache1.find("/link/child");
-
-      assertEquals("parent", p2.getName());
-      assertEquals("child", p2.getLink().getName());
-      assertEquals("child", c2.getName());
-      assertEquals("parent", c2.getLink().getName());
-
-      p2.setLink(null);
-      assertNull("Child should be null", p2.getLink());
-      Link link =3D (Link) cache1.detach("/link/parent");
-      assertNotNull("Link should not be null ", link);
-   }
-
-   /**
-    * Setting the circular relationship and also as a shared object.
-    *
-    * @throws Exception
-    */
-   public void testCircularReference4() throws Exception
-   {
-//        try {Thread.sleep(10000); } catch (Exception e) {};
-      log.info("testCircularReference3() ...");
-      Link parent =3D new Link("parent");
-      Link child =3D new Link("child");
-      parent.setLink(child);
-      child.setLink(parent);
-
-      List<Link> list =3D new ArrayList<Link>();
-      list.add(parent);
-
-      cache1.attach("/list", list);
-      cache1.attach("/alias", list);
-
-      TestingUtil.sleepThread(100);
-      @SuppressWarnings("unchecked")
-      List<Link> list1 =3D (List<Link>) cache2.find("/list");
-      @SuppressWarnings("unchecked")
-      List<Link> list2 =3D (List<Link>) cache2.find("/alias");
-
-      assertEquals("parent", list1.get(0).getName());
-      assertEquals("child", list2.get(0).getLink().getName());
-   }
-
-   public void testCircularAndSharedReferences() throws Exception
-   {
-      log.info("testCircularAndSharedReferences() ...");
-      NodeManager pm_ =3D new NodeManager();
-
-      pm_.setRootNode("root");
-      pm_.addNode("root", "kanto");
-      pm_.addNode("root.kanto", "tokyo");
-      pm_.addNode("root.kanto", "kanagawa");
-
-      cache1.attach("/propagation", pm_);
-      assertEquals("kanagawa", pm_.findNode("root.kanto.kanagawa").getNode=
RDN());
-      pm_.addNode("root.kanto.tokyo", "hadanshita");
-      assertEquals("hadanshita", pm_.findNode("root.kanto.tokyo.hadanshita=
").getNodeRDN());
-
-      NodeManager pm2_ =3D (NodeManager) cache2.find("/propagation");
-      assertEquals("kanagawa", pm2_.findNode("root.kanto.kanagawa").getNod=
eRDN());
-      assertEquals("hadanshita", pm2_.findNode("root.kanto.tokyo.hadanshit=
a").getNodeRDN());
-
-/*
-      System.out.println("\n\n");
-      System.out.println("---------------------------------------------");
-      System.out.println("Initial pm state");
-      System.out.println("---------------------------------------------");
-      pm_.printNodes();
-
-      System.out.println("\n\n");
-      System.out.println("---------------------------------------------");
-      System.out.println("Initial cache content");
-      System.out.println(cache_.printDetails());
-      System.out.println("---------------------------------------------");
-*/
-   }
-
-
-
-}

Copied: pojo/tags/2.1.0.CR3/src/test/java/org/jboss/cache/pojo/ReplicatedCi=
rcularGraphTest.java (from rev 5129, pojo/branches/2.1/src/test/java/org/jb=
oss/cache/pojo/ReplicatedCircularGraphTest.java)
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- pojo/tags/2.1.0.CR3/src/test/java/org/jboss/cache/pojo/ReplicatedCircul=
arGraphTest.java	                        (rev 0)
+++ pojo/tags/2.1.0.CR3/src/test/java/org/jboss/cache/pojo/ReplicatedCircul=
arGraphTest.java	2008-01-16 00:43:28 UTC (rev 5140)
@@ -0,0 +1,217 @@
+/*
+ * JBoss, Home of Professional Open Source
+ *
+ * Distributable under LGPL license.
+ * See terms of license at gnu.org.
+ */
+
+package org.jboss.cache.pojo;
+
+import static org.testng.AssertJUnit.assertEquals;
+import static org.testng.AssertJUnit.assertNotNull;
+import static org.testng.AssertJUnit.assertNull;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.jboss.cache.Fqn;
+import org.jboss.cache.config.Configuration.CacheMode;
+import org.jboss.cache.factories.UnitTestCacheConfigurationFactory;
+import org.jboss.cache.misc.TestingUtil;
+import org.jboss.cache.pojo.test.Link;
+import org.jboss.cache.pojo.test.NodeManager;
+import org.jboss.cache.pojo.test.Person;
+import org.testng.annotations.AfterMethod;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.Test;
+
+/**
+ * Test object graph handling in aop, e.g., circular reference, multiple r=
eference, link, etc.
+ *
+ * @author Ben Wang
+ */
+
+(a)Test(groups =3D {"functional"})
+public class ReplicatedCircularGraphTest =

+{
+   Log log =3D LogFactory.getLog(ReplicatedCircularGraphTest.class);
+   PojoCache cache1;
+   PojoCache cache2;
+
+
+   @BeforeMethod(alwaysRun =3D true)
+   protected void setUp() throws Exception
+   {
+      log.info("setUp() ....");
+      cache1 =3D createCache("CacheGroup");
+      cache2 =3D createCache("CacheGroup");
+   }
+
+   @AfterMethod(alwaysRun =3D true)
+   protected void tearDown() throws Exception
+   {
+      cache1.getCache().removeNode(Fqn.fromString("/"));
+      cache1.stop();
+      cache2.stop();
+   }
+
+   private PojoCache createCache(String name) throws Exception
+   {
+      boolean toStart =3D false;
+      PojoCache tree =3D PojoCacheFactory.createCache(UnitTestCacheConfigu=
rationFactory.createConfiguration(CacheMode.REPL_SYNC), toStart);
+      tree.start();
+      return tree;
+   }
+
+//   public void testDummy() {}
+
+   protected Person createPerson(String name, int age)
+   {
+      Person p =3D new Person();
+      p.setName(name);
+      p.setAge(age);
+      return p;
+   }
+
+   public void testCircularReference1() throws Exception
+   {
+//        try {Thread.sleep(10000); } catch (Exception e) {};
+      log.info("testCircularReference1() ...");
+      Link parent =3D new Link("parent");
+      Link child =3D new Link("child");
+      parent.setLink(child);
+      child.setLink(parent);
+      cache1.attach("/link/parent", parent);
+      TestingUtil.sleepThread(100);
+      assertEquals("parent", ((Link) cache1.find("/link/parent")).getName(=
));
+      assertEquals("child", ((Link) cache1.find("/link/parent")).getLink()=
.getName());
+      assertEquals("parent", ((Link) cache2.find("/link/parent")).getName(=
));
+      assertEquals("child", ((Link) cache2.find("/link/parent")).getLink()=
.getName());
+      ((Link) cache2.find("/link/parent")).setLink(null);
+      assertNull("Child should be null", ((Link) cache2.find("/link/parent=
")).getLink());
+      Link link =3D (Link) cache1.detach("/link/parent");
+      assertNotNull("Link should not be null ", link);
+      System.out.println("Link: " + link);
+   }
+
+   public void testCircularReference2() throws Exception
+   {
+//        try {Thread.sleep(10000); } catch (Exception e) {};
+      log.info("testCircularReference2() ...");
+      Link parent =3D new Link("parent");
+      Link child =3D new Link("child");
+      cache1.attach("/link/parent", parent);
+      parent.setLink(child);
+      child.setLink(parent);
+      assertEquals("parent", ((Link) cache1.find("/link/parent")).getName(=
));
+      assertEquals("child", ((Link) cache1.find("/link/parent")).getLink()=
.getName());
+      assertEquals("parent", ((Link) cache2.find("/link/parent")).getName(=
));
+      assertEquals("child", ((Link) cache2.find("/link/parent")).getLink()=
.getName());
+      ((Link) cache2.find("/link/parent")).setLink(null);
+      assertNull("Child should be null", ((Link) cache2.find("/link/parent=
")).getLink());
+      Link link =3D (Link) cache1.detach("/link/parent");
+      assertNotNull("Link should not be null ", link);
+   }
+
+   public void testCircularReference3() throws Exception
+   {
+//        try {Thread.sleep(10000); } catch (Exception e) {};
+      log.info("testCircularReference3() ...");
+      Link parent =3D new Link("parent");
+      Link child =3D new Link("child");
+      cache1.attach("/link/parent", parent);
+      cache1.attach("/link/child", child);
+      TestingUtil.sleepThread(100);
+      parent.setLink(child);
+      child.setLink(parent);
+
+      Link p1 =3D (Link) cache1.find("/link/parent");
+      Link c1 =3D (Link) cache1.find("/link/child");
+      assertEquals("parent", p1.getName());
+      assertEquals("child", p1.getLink().getName());
+      assertEquals("child", c1.getName());
+      assertEquals("parent", c1.getLink().getName());
+
+      Link p2 =3D (Link) cache1.find("/link/parent");
+      Link c2 =3D (Link) cache1.find("/link/child");
+
+      assertEquals("parent", p2.getName());
+      assertEquals("child", p2.getLink().getName());
+      assertEquals("child", c2.getName());
+      assertEquals("parent", c2.getLink().getName());
+
+      p2.setLink(null);
+      assertNull("Child should be null", p2.getLink());
+      Link link =3D (Link) cache1.detach("/link/parent");
+      assertNotNull("Link should not be null ", link);
+   }
+
+   /**
+    * Setting the circular relationship and also as a shared object.
+    *
+    * @throws Exception
+    */
+   public void testCircularReference4() throws Exception
+   {
+//        try {Thread.sleep(10000); } catch (Exception e) {};
+      log.info("testCircularReference3() ...");
+      Link parent =3D new Link("parent");
+      Link child =3D new Link("child");
+      parent.setLink(child);
+      child.setLink(parent);
+
+      List<Link> list =3D new ArrayList<Link>();
+      list.add(parent);
+
+      cache1.attach("/list", list);
+      cache1.attach("/alias", list);
+
+      TestingUtil.sleepThread(100);
+      @SuppressWarnings("unchecked")
+      List<Link> list1 =3D (List<Link>) cache2.find("/list");
+      @SuppressWarnings("unchecked")
+      List<Link> list2 =3D (List<Link>) cache2.find("/alias");
+
+      assertEquals("parent", list1.get(0).getName());
+      assertEquals("child", list2.get(0).getLink().getName());
+   }
+
+   public void testCircularAndSharedReferences() throws Exception
+   {
+      log.info("testCircularAndSharedReferences() ...");
+      NodeManager pm_ =3D new NodeManager();
+
+      pm_.setRootNode("root");
+      pm_.addNode("root", "kanto");
+      pm_.addNode("root.kanto", "tokyo");
+      pm_.addNode("root.kanto", "kanagawa");
+
+      cache1.attach("/propagation", pm_);
+      assertEquals("kanagawa", pm_.findNode("root.kanto.kanagawa").getNode=
RDN());
+      pm_.addNode("root.kanto.tokyo", "hadanshita");
+      assertEquals("hadanshita", pm_.findNode("root.kanto.tokyo.hadanshita=
").getNodeRDN());
+
+      NodeManager pm2_ =3D (NodeManager) cache2.find("/propagation");
+      assertEquals("kanagawa", pm2_.findNode("root.kanto.kanagawa").getNod=
eRDN());
+      assertEquals("hadanshita", pm2_.findNode("root.kanto.tokyo.hadanshit=
a").getNodeRDN());
+
+/*
+      System.out.println("\n\n");
+      System.out.println("---------------------------------------------");
+      System.out.println("Initial pm state");
+      System.out.println("---------------------------------------------");
+      pm_.printNodes();
+
+      System.out.println("\n\n");
+      System.out.println("---------------------------------------------");
+      System.out.println("Initial cache content");
+      System.out.println(cache_.printDetails());
+      System.out.println("---------------------------------------------");
+*/
+   }
+
+
+
+}

Deleted: pojo/tags/2.1.0.CR3/src/test/java/org/jboss/cache/pojo/ReplicatedO=
bjectGraphTest.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- pojo/branches/2.1/src/test/java/org/jboss/cache/pojo/ReplicatedObjectGr=
aphTest.java	2007-11-26 18:16:13 UTC (rev 4776)
+++ pojo/tags/2.1.0.CR3/src/test/java/org/jboss/cache/pojo/ReplicatedObject=
GraphTest.java	2008-01-16 00:43:28 UTC (rev 5140)
@@ -1,231 +0,0 @@
-package org.jboss.cache.pojo;
-
-import static org.testng.AssertJUnit.assertEquals;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.jboss.cache.Fqn;
-import org.jboss.cache.config.Configuration.CacheMode;
-import org.jboss.cache.factories.UnitTestCacheConfigurationFactory;
-import org.jboss.cache.pojo.test.Address;
-import org.jboss.cache.pojo.test.Person;
-import org.testng.annotations.AfterMethod;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.Test;
-
-/**
- * Test object graph handling in aop, e.g., circular reference, multiple r=
eference, link, etc.
- *
- * @author Ben Wang
- */
-
-(a)Test(groups =3D {"functional"})
-public class ReplicatedObjectGraphTest =

-{
-   Log log =3D LogFactory.getLog(ReplicatedObjectGraphTest.class);
-   PojoCache cache1;
-   PojoCache cache2;
-
-
-   @BeforeMethod(alwaysRun =3D true)
-   protected void setUp() throws Exception
-   {
-      log.info("setUp() ....");
-      cache1 =3D createCache("CacheGroup");
-      cache2 =3D createCache("CacheGroup");
-   }
-
-   @AfterMethod(alwaysRun =3D true)
-   protected void tearDown() throws Exception
-   {
-      cache1.getCache().removeNode(Fqn.fromString("/"));
-      cache1.stop();
-      cache2.stop();
-   }
-
-   private PojoCache createCache(String name) throws Exception
-   {
-      boolean toStart =3D false;
-      PojoCache tree =3D PojoCacheFactory.createCache(UnitTestCacheConfigu=
rationFactory.createConfiguration(CacheMode.REPL_SYNC), toStart);
-      tree.start();
-      return tree;
-   }
-
-   //   public void testDummy() {}
-
-   protected Person createPerson(String name, int age)
-   {
-      Person p =3D new Person();
-      p.setName(name);
-      p.setAge(age);
-      return p;
-   }
-
-   private void stage0() throws Exception
-   {
-      cache1.attach("/person/joe", createPerson("Joe Black", 31));
-      Person joe =3D (Person) cache1.find("/person/joe");
-      cache1.attach("/person/ben", createPerson("Ben Hogan", 51));
-      Person ben =3D (Person) cache1.find("/person/ben");
-
-      Address addr =3D new Address();
-      addr.setStreet("123 Albert Ave.");
-      addr.setCity("Sunnyvale");
-      addr.setZip(94087);
-      cache1.attach("/address", addr);
-
-      // They share the sub-object: address
-      joe.setAddress(addr);
-      ben.setAddress(addr);
-      assertEquals("Joe's address should still be valid ", "Sunnyvale", jo=
e.getAddress().getCity());
-      assertEquals("Ben's address should still be valid ", "Sunnyvale", be=
n.getAddress().getCity());
-   }
-
-   private void stage1() throws Exception
-   {
-      cache1.attach("/person/joe", createPerson("Joe Black", 31));
-      Person joe =3D (Person) cache1.find("/person/joe");
-      cache1.attach("/person/ben", createPerson("Ben Hogan", 51));
-      Person ben =3D (Person) cache1.find("/person/ben");
-
-      Address addr =3D new Address();
-      addr.setStreet("123 Albert Ave.");
-      addr.setCity("Sunnyvale");
-      addr.setZip(94087);
-
-      // They share the sub-object: address
-      joe.setAddress(addr);
-      ben.setAddress(addr);
-      assertEquals("Joe's address should still be valid ", "Sunnyvale", jo=
e.getAddress().getCity());
-      assertEquals("Ben's address should still be valid ", "Sunnyvale", be=
n.getAddress().getCity());
-   }
-
-   private void stage2(PojoCache cache) throws Exception
-   {
-      //
-      cache.detach("/person/joe");
-      Person ben =3D (Person) cache.find("/person/ben");
-      assertEquals("Ben's address should still be valid ", "Sunnyvale", be=
n.getAddress().getCity());
-      Address addr =3D ben.getAddress();
-      addr.setCity("Santa Clara");
-      assertEquals("Ben's address should be changed ", "Santa Clara", ben.=
getAddress().getCity());
-   }
-
-   /**
-    * Test whether repeated update on the ref count will change the replic=
ated aop instances
-    *
-    * @throws Exception
-    */
-   public void testCheckReplInstance() throws Exception
-   {
-      log.info("testCheckReplInstance() ...");
-      stage0();
-      TestingUtil.sleepThread(100);
-      Person joe =3D (Person) cache1.find("/person/joe");
-      Person ben =3D (Person) cache1.find("/person/ben");
-      assertEquals("Ben and Joe's address should be the same ", joe.getAdd=
ress().getCity(),
-              ben.getAddress().getCity());
-
-      Address joe1 =3D (Address) cache2.find("/address");
-      assertEquals("Ben's address should not be changed ", joe.getAddress(=
).getCity(), joe1.getCity());
-      ben =3D (Person) cache2.find("/person/ben");
-      cache2.detach("/person/ben");
-      Address joe2 =3D (Address) cache2.find("/address");
-      assertEquals("Joe's reference should be the same.", joe1, joe2);
-   }
-
-   public void testRefCountCheckRepl() throws Exception
-   {
-      log.info("testRefCountCheckRepl() ...");
-      stage1();
-      TestingUtil.sleepThread(100);
-      Person joe =3D (Person) cache1.find("/person/joe");
-      Person ben =3D (Person) cache1.find("/person/ben");
-      assertEquals("Ben and Joe's address should be the same ", joe.getAdd=
ress().getCity(),
-              ben.getAddress().getCity());
-      TestingUtil.sleepThread(100);
-      stage2(cache2);
-      assertEquals("Ben's address should be changed on cache1 as well ", "=
Santa Clara", ben.getAddress().getCity());
-      cache2.detach("/person/ben");
-   }
-
-
-   public void testdetach1() throws Exception
-   {
-      log.info("testdetach1() ...");
-      cache1.attach("/person/joe", createPerson("Joe Black", 31));
-      Person joe =3D (Person) cache1.find("/person/joe");
-      cache1.attach("/person/ben", createPerson("Ben Hogan", 51));
-      Person ben =3D (Person) cache1.find("/person/ben");
-
-      Address addr =3D new Address();
-      addr.setStreet("123 Albert Ave.");
-      addr.setCity("Sunnyvale");
-      addr.setZip(94087);
-
-      // They share the sub-object: address
-      log.info("testMultipleReference(): set Joe address");
-      joe.setAddress(addr);
-      log.info("testMultipleReference(): set Ben address");
-      ben.setAddress(addr);
-
-      Address add1 =3D ((Person) cache2.find("/person/joe")).getAddress();
-      Address add2 =3D ((Person) cache2.find("/person/ben")).getAddress();
-      assertEquals(add1.getCity(), add2.getCity());
-      addr.setCity("Santa Clara");
-      assertEquals(add1.getCity(), add2.getCity());
-
-      // Remove pojo joe will relocate the address field to ben's
-      cache2.detach("/person/joe");
-      add2 =3D ((Person) cache2.find("/person/ben")).getAddress();
-
-      assertEquals("City ", "Santa Clara", add2.getCity());
-   }
-
-   public void testdetach2() throws Exception
-   {
-      log.info("testdetach2() ...");
-      cache1.attach("/person/joe", createPerson("Joe Black", 31));
-      Person joe =3D (Person) cache1.find("/person/joe");
-      cache1.attach("/person/ben", createPerson("Ben Hogan", 51));
-      Person ben =3D (Person) cache1.find("/person/ben");
-      cache1.attach("/person/john", createPerson("John Daly", 41));
-      Person john =3D (Person) cache1.find("/person/john");
-
-      Address addr =3D new Address();
-      addr.setStreet("123 Albert Ave.");
-      addr.setCity("Sunnyvale");
-      addr.setZip(94087);
-
-      Address addr1 =3D new Address();
-      addr1.setStreet("123 Albert Ave.");
-      addr1.setCity("San Jose");
-      addr1.setZip(94087);
-
-      // They share the sub-object: address
-      log.info("testMultipleReference(): set Joe address");
-      joe.setAddress(addr);
-      log.info("testMultipleReference(): set Ben address");
-      ben.setAddress(addr);
-      john.setAddress(addr);
-
-      Address add1 =3D ((Person) cache2.find("/person/joe")).getAddress();
-      Address add2 =3D ((Person) cache2.find("/person/ben")).getAddress();
-      assertEquals(add1.getCity(), add2.getCity());
-      addr.setCity("Santa Clara");
-      assertEquals(add1.getCity(), add2.getCity());
-
-      // Remove pojo joe will relocate the address field to ben's
-      joe.setAddress(addr1);
-      add2 =3D ((Person) cache2.find("/person/joe")).getAddress();
-      assertEquals("City ", "San Jose", add2.getCity());
-      add2 =3D ((Person) cache2.find("/person/ben")).getAddress();
-      assertEquals("City ", "Santa Clara", add2.getCity());
-      add2 =3D ((Person) cache2.find("/person/john")).getAddress();
-      assertEquals("City ", "Santa Clara", add2.getCity());
-   }
-
-
-
-}
-

Copied: pojo/tags/2.1.0.CR3/src/test/java/org/jboss/cache/pojo/ReplicatedOb=
jectGraphTest.java (from rev 5129, pojo/branches/2.1/src/test/java/org/jbos=
s/cache/pojo/ReplicatedObjectGraphTest.java)
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- pojo/tags/2.1.0.CR3/src/test/java/org/jboss/cache/pojo/ReplicatedObject=
GraphTest.java	                        (rev 0)
+++ pojo/tags/2.1.0.CR3/src/test/java/org/jboss/cache/pojo/ReplicatedObject=
GraphTest.java	2008-01-16 00:43:28 UTC (rev 5140)
@@ -0,0 +1,232 @@
+package org.jboss.cache.pojo;
+
+import static org.testng.AssertJUnit.assertEquals;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.jboss.cache.Fqn;
+import org.jboss.cache.config.Configuration.CacheMode;
+import org.jboss.cache.factories.UnitTestCacheConfigurationFactory;
+import org.jboss.cache.misc.TestingUtil;
+import org.jboss.cache.pojo.test.Address;
+import org.jboss.cache.pojo.test.Person;
+import org.testng.annotations.AfterMethod;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.Test;
+
+/**
+ * Test object graph handling in aop, e.g., circular reference, multiple r=
eference, link, etc.
+ *
+ * @author Ben Wang
+ */
+
+(a)Test(groups =3D {"functional"})
+public class ReplicatedObjectGraphTest =

+{
+   Log log =3D LogFactory.getLog(ReplicatedObjectGraphTest.class);
+   PojoCache cache1;
+   PojoCache cache2;
+
+
+   @BeforeMethod(alwaysRun =3D true)
+   protected void setUp() throws Exception
+   {
+      log.info("setUp() ....");
+      cache1 =3D createCache("CacheGroup");
+      cache2 =3D createCache("CacheGroup");
+   }
+
+   @AfterMethod(alwaysRun =3D true)
+   protected void tearDown() throws Exception
+   {
+      cache1.getCache().removeNode(Fqn.fromString("/"));
+      cache1.stop();
+      cache2.stop();
+   }
+
+   private PojoCache createCache(String name) throws Exception
+   {
+      boolean toStart =3D false;
+      PojoCache tree =3D PojoCacheFactory.createCache(UnitTestCacheConfigu=
rationFactory.createConfiguration(CacheMode.REPL_SYNC), toStart);
+      tree.start();
+      return tree;
+   }
+
+   //   public void testDummy() {}
+
+   protected Person createPerson(String name, int age)
+   {
+      Person p =3D new Person();
+      p.setName(name);
+      p.setAge(age);
+      return p;
+   }
+
+   private void stage0() throws Exception
+   {
+      cache1.attach("/person/joe", createPerson("Joe Black", 31));
+      Person joe =3D (Person) cache1.find("/person/joe");
+      cache1.attach("/person/ben", createPerson("Ben Hogan", 51));
+      Person ben =3D (Person) cache1.find("/person/ben");
+
+      Address addr =3D new Address();
+      addr.setStreet("123 Albert Ave.");
+      addr.setCity("Sunnyvale");
+      addr.setZip(94087);
+      cache1.attach("/address", addr);
+
+      // They share the sub-object: address
+      joe.setAddress(addr);
+      ben.setAddress(addr);
+      assertEquals("Joe's address should still be valid ", "Sunnyvale", jo=
e.getAddress().getCity());
+      assertEquals("Ben's address should still be valid ", "Sunnyvale", be=
n.getAddress().getCity());
+   }
+
+   private void stage1() throws Exception
+   {
+      cache1.attach("/person/joe", createPerson("Joe Black", 31));
+      Person joe =3D (Person) cache1.find("/person/joe");
+      cache1.attach("/person/ben", createPerson("Ben Hogan", 51));
+      Person ben =3D (Person) cache1.find("/person/ben");
+
+      Address addr =3D new Address();
+      addr.setStreet("123 Albert Ave.");
+      addr.setCity("Sunnyvale");
+      addr.setZip(94087);
+
+      // They share the sub-object: address
+      joe.setAddress(addr);
+      ben.setAddress(addr);
+      assertEquals("Joe's address should still be valid ", "Sunnyvale", jo=
e.getAddress().getCity());
+      assertEquals("Ben's address should still be valid ", "Sunnyvale", be=
n.getAddress().getCity());
+   }
+
+   private void stage2(PojoCache cache) throws Exception
+   {
+      //
+      cache.detach("/person/joe");
+      Person ben =3D (Person) cache.find("/person/ben");
+      assertEquals("Ben's address should still be valid ", "Sunnyvale", be=
n.getAddress().getCity());
+      Address addr =3D ben.getAddress();
+      addr.setCity("Santa Clara");
+      assertEquals("Ben's address should be changed ", "Santa Clara", ben.=
getAddress().getCity());
+   }
+
+   /**
+    * Test whether repeated update on the ref count will change the replic=
ated aop instances
+    *
+    * @throws Exception
+    */
+   public void testCheckReplInstance() throws Exception
+   {
+      log.info("testCheckReplInstance() ...");
+      stage0();
+      TestingUtil.sleepThread(100);
+      Person joe =3D (Person) cache1.find("/person/joe");
+      Person ben =3D (Person) cache1.find("/person/ben");
+      assertEquals("Ben and Joe's address should be the same ", joe.getAdd=
ress().getCity(),
+              ben.getAddress().getCity());
+
+      Address joe1 =3D (Address) cache2.find("/address");
+      assertEquals("Ben's address should not be changed ", joe.getAddress(=
).getCity(), joe1.getCity());
+      ben =3D (Person) cache2.find("/person/ben");
+      cache2.detach("/person/ben");
+      Address joe2 =3D (Address) cache2.find("/address");
+      assertEquals("Joe's reference should be the same.", joe1, joe2);
+   }
+
+   public void testRefCountCheckRepl() throws Exception
+   {
+      log.info("testRefCountCheckRepl() ...");
+      stage1();
+      TestingUtil.sleepThread(100);
+      Person joe =3D (Person) cache1.find("/person/joe");
+      Person ben =3D (Person) cache1.find("/person/ben");
+      assertEquals("Ben and Joe's address should be the same ", joe.getAdd=
ress().getCity(),
+              ben.getAddress().getCity());
+      TestingUtil.sleepThread(100);
+      stage2(cache2);
+      assertEquals("Ben's address should be changed on cache1 as well ", "=
Santa Clara", ben.getAddress().getCity());
+      cache2.detach("/person/ben");
+   }
+
+
+   public void testdetach1() throws Exception
+   {
+      log.info("testdetach1() ...");
+      cache1.attach("/person/joe", createPerson("Joe Black", 31));
+      Person joe =3D (Person) cache1.find("/person/joe");
+      cache1.attach("/person/ben", createPerson("Ben Hogan", 51));
+      Person ben =3D (Person) cache1.find("/person/ben");
+
+      Address addr =3D new Address();
+      addr.setStreet("123 Albert Ave.");
+      addr.setCity("Sunnyvale");
+      addr.setZip(94087);
+
+      // They share the sub-object: address
+      log.info("testMultipleReference(): set Joe address");
+      joe.setAddress(addr);
+      log.info("testMultipleReference(): set Ben address");
+      ben.setAddress(addr);
+
+      Address add1 =3D ((Person) cache2.find("/person/joe")).getAddress();
+      Address add2 =3D ((Person) cache2.find("/person/ben")).getAddress();
+      assertEquals(add1.getCity(), add2.getCity());
+      addr.setCity("Santa Clara");
+      assertEquals(add1.getCity(), add2.getCity());
+
+      // Remove pojo joe will relocate the address field to ben's
+      cache2.detach("/person/joe");
+      add2 =3D ((Person) cache2.find("/person/ben")).getAddress();
+
+      assertEquals("City ", "Santa Clara", add2.getCity());
+   }
+
+   public void testdetach2() throws Exception
+   {
+      log.info("testdetach2() ...");
+      cache1.attach("/person/joe", createPerson("Joe Black", 31));
+      Person joe =3D (Person) cache1.find("/person/joe");
+      cache1.attach("/person/ben", createPerson("Ben Hogan", 51));
+      Person ben =3D (Person) cache1.find("/person/ben");
+      cache1.attach("/person/john", createPerson("John Daly", 41));
+      Person john =3D (Person) cache1.find("/person/john");
+
+      Address addr =3D new Address();
+      addr.setStreet("123 Albert Ave.");
+      addr.setCity("Sunnyvale");
+      addr.setZip(94087);
+
+      Address addr1 =3D new Address();
+      addr1.setStreet("123 Albert Ave.");
+      addr1.setCity("San Jose");
+      addr1.setZip(94087);
+
+      // They share the sub-object: address
+      log.info("testMultipleReference(): set Joe address");
+      joe.setAddress(addr);
+      log.info("testMultipleReference(): set Ben address");
+      ben.setAddress(addr);
+      john.setAddress(addr);
+
+      Address add1 =3D ((Person) cache2.find("/person/joe")).getAddress();
+      Address add2 =3D ((Person) cache2.find("/person/ben")).getAddress();
+      assertEquals(add1.getCity(), add2.getCity());
+      addr.setCity("Santa Clara");
+      assertEquals(add1.getCity(), add2.getCity());
+
+      // Remove pojo joe will relocate the address field to ben's
+      joe.setAddress(addr1);
+      add2 =3D ((Person) cache2.find("/person/joe")).getAddress();
+      assertEquals("City ", "San Jose", add2.getCity());
+      add2 =3D ((Person) cache2.find("/person/ben")).getAddress();
+      assertEquals("City ", "Santa Clara", add2.getCity());
+      add2 =3D ((Person) cache2.find("/person/john")).getAddress();
+      assertEquals("City ", "Santa Clara", add2.getCity());
+   }
+
+
+
+}
+

Deleted: pojo/tags/2.1.0.CR3/src/test/java/org/jboss/cache/pojo/ReplicatedT=
xTest.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- pojo/branches/2.1/src/test/java/org/jboss/cache/pojo/ReplicatedTxTest.j=
ava	2007-11-26 18:16:13 UTC (rev 4776)
+++ pojo/tags/2.1.0.CR3/src/test/java/org/jboss/cache/pojo/ReplicatedTxTest=
.java	2008-01-16 00:43:28 UTC (rev 5140)
@@ -1,227 +0,0 @@
-package org.jboss.cache.pojo;
-
-import static org.testng.AssertJUnit.assertEquals;
-import static org.testng.AssertJUnit.fail;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Properties;
-
-import javax.naming.Context;
-import javax.naming.InitialContext;
-import javax.naming.NamingException;
-import javax.transaction.NotSupportedException;
-import javax.transaction.RollbackException;
-import javax.transaction.SystemException;
-import javax.transaction.UserTransaction;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.jboss.cache.config.Configuration.CacheMode;
-import org.jboss.cache.factories.UnitTestCacheConfigurationFactory;
-import org.jboss.cache.pojo.test.Person;
-import org.jboss.cache.transaction.DummyTransactionManager;
-import org.testng.annotations.AfterMethod;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.Test;
-
-/**
- */
-
-(a)Test(groups =3D {"functional"})
-public class ReplicatedTxTest =

-{
-   Log log =3D LogFactory.getLog(ReplicatedTxTest.class);
-   PojoCache cache, cache1;
-   final String FACTORY =3D "org.jboss.cache.transaction.DummyContextFacto=
ry";
-   DummyTransactionManager tx_mgr;
-   Throwable t1_ex, t2_ex;
-   long start =3D 0;
-
-
-
-   @BeforeMethod(alwaysRun =3D true)
-   protected void setUp() throws Exception
-   {
-      log.info("setUp() ....");
-      boolean toStart =3D false;
-      cache =3D PojoCacheFactory.createCache(UnitTestCacheConfigurationFac=
tory.createConfiguration(CacheMode.REPL_SYNC), toStart);
-      cache.start();
-      cache1 =3D PojoCacheFactory.createCache(UnitTestCacheConfigurationFa=
ctory.createConfiguration(CacheMode.REPL_SYNC), toStart);
-      cache1.start();
-
-      System.setProperty(Context.INITIAL_CONTEXT_FACTORY, FACTORY);
-
-      tx_mgr =3D DummyTransactionManager.getInstance();
-      t1_ex =3D t2_ex =3D null;
-   }
-
-   @AfterMethod(alwaysRun =3D true)
-   protected void tearDown() throws Exception
-   {
-      cache.stop();
-      cache1.stop();
-
-      DummyTransactionManager.destroy();
-   }
-
-//   public void testDummy() {}
-
-   UserTransaction getTransaction() throws SystemException, NotSupportedEx=
ception, NamingException
-   {
-      Properties prop =3D new Properties();
-      prop.put(Context.INITIAL_CONTEXT_FACTORY,
-              "org.jboss.cache.transaction.DummyContextFactory");
-      return (UserTransaction) new InitialContext(prop).lookup("UserTransa=
ction");
-   }
-
-   private Person createPerson(String id, String name, int age)
-   {
-      Person p =3D new Person();
-      p.setName(name);
-      p.setAge(age);
-      cache.attach(id, p);
-      return p;
-   }
-
-   public void testSimple() throws Exception
-   {
-      log.info("testSimple() ....");
-      UserTransaction tx =3D getTransaction();
-      tx.begin();
-      Person p =3D createPerson("/person/test1", "Harald Gliebe", 32);
-      tx.commit();
-      tx.begin();
-      p.setName("Benoit");
-      tx.commit();
-      Person p1 =3D (Person) cache1.find("/person/test1");
-      assertEquals("Benoit", p.getName());
-      assertEquals("Benoit", p1.getName());
-      tx.begin();
-      p1.setAge(61);
-      tx.commit();
-      assertEquals(61, p.getAge());
-      assertEquals(61, p1.getAge());
-   }
-
-   public void testModification() throws Exception
-   {
-      UserTransaction tx =3D getTransaction();
-      tx.begin();
-      Person p =3D createPerson("/person/test2", "Harald", 32);
-      p.setName("Harald Gliebe");
-      tx.commit();
-      Person p1 =3D (Person) cache1.find("/person/test2");
-      tx.begin();
-      p1.setName("Benoit");
-      tx.commit();
-      assertEquals(p.getName(), "Benoit");
-      assertEquals(p1.getName(), "Benoit");
-      tx.begin();
-      p1.setName("Harald");
-      tx.rollback();
-      assertEquals(p.getName(), "Benoit");
-      assertEquals(p1.getName(), "Benoit");
-   }
-
-   public void testConcurrentPuts() throws Exception
-   {
-      Thread t1 =3D new Thread()
-      {
-         public void run()
-         {
-            try
-            {
-               List<String> lang =3D ((Person) cache.find("/person/test6")=
).getLanguages();
-               UserTransaction tx =3D getTransaction();
-               tx.begin();
-               lang.add("German");
-               TestingUtil.sleepThread(17000);
-               tx.commit();
-            }
-            catch (RollbackException rollback)
-            {
-               ;
-            }
-            catch (Exception ex)
-            {
-               t1_ex =3D ex;
-            }
-         }
-      };
-
-      Thread t2 =3D new Thread()
-      {
-         public void run()
-         {
-            UserTransaction tx =3D null;
-            try
-            {
-               TestingUtil.sleepThread(1000); // give Thread1 time to crea=
tePerson
-               List<String> lang =3D ((Person) cache.find("/person/test6")=
).getLanguages();
-               tx =3D getTransaction();
-               tx.begin();
-               lang.add("English");
-               tx.commit();
-            }
-            catch (RollbackException rollback)
-            {
-               ;
-            }
-            catch (Exception ex)
-            {
-               try
-               {
-                  tx.rollback();
-               } catch (SystemException e)
-               {
-                  e.printStackTrace();
-                  t2_ex =3D e;
-               }
-            }
-         }
-      };
-
-      Person p =3D createPerson("/person/test6", "p6", 50);
-      List<String> lang =3D new ArrayList<String>();
-      lang.add("German");
-      p.setLanguages(lang);
-
-      t1.start();
-      t2.start();
-
-      t1.join();
-      t2.join();
-
-      // t2 should rollback due to timeout while t2 should succeed
-      if (t2_ex !=3D null)
-         fail("Thread1 failed: " + t2_ex);
-      if (t1_ex !=3D null)
-         fail("Thread2 failed: " + t1_ex);
-
-      int size =3D ((Person) cache.find("/person/test6")).getLanguages().s=
ize();
-      assertEquals("number of languages should be 2, but is " + size + " (=
" +
-              ((Person) cache.find("/person/test6")).getLanguages().size()=
 + ")",
-              2, size);
-      size =3D ((Person) cache1.find("/person/test6")).getLanguages().size=
();
-      assertEquals("number of languages should be 2, but is " + size + " (=
" +
-              ((Person) cache.find("/person/test6")).getLanguages().size()=
 + ")",
-              2, size);
-   }
-
-   void log(String s)
-   {
-      long now;
-      if (start =3D=3D 0)
-         start =3D System.currentTimeMillis();
-      now =3D System.currentTimeMillis();
-
-      System.out.println("[" + Thread.currentThread().getName() + "] [" + =
(now - start) + "] " + s);
-   }
-
-
-
-
-
-}
-

Copied: pojo/tags/2.1.0.CR3/src/test/java/org/jboss/cache/pojo/ReplicatedTx=
Test.java (from rev 5129, pojo/branches/2.1/src/test/java/org/jboss/cache/p=
ojo/ReplicatedTxTest.java)
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- pojo/tags/2.1.0.CR3/src/test/java/org/jboss/cache/pojo/ReplicatedTxTest=
.java	                        (rev 0)
+++ pojo/tags/2.1.0.CR3/src/test/java/org/jboss/cache/pojo/ReplicatedTxTest=
.java	2008-01-16 00:43:28 UTC (rev 5140)
@@ -0,0 +1,228 @@
+package org.jboss.cache.pojo;
+
+import static org.testng.AssertJUnit.assertEquals;
+import static org.testng.AssertJUnit.fail;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Properties;
+
+import javax.naming.Context;
+import javax.naming.InitialContext;
+import javax.naming.NamingException;
+import javax.transaction.NotSupportedException;
+import javax.transaction.RollbackException;
+import javax.transaction.SystemException;
+import javax.transaction.UserTransaction;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.jboss.cache.config.Configuration.CacheMode;
+import org.jboss.cache.factories.UnitTestCacheConfigurationFactory;
+import org.jboss.cache.misc.TestingUtil;
+import org.jboss.cache.pojo.test.Person;
+import org.jboss.cache.transaction.DummyTransactionManager;
+import org.testng.annotations.AfterMethod;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.Test;
+
+/**
+ */
+
+(a)Test(groups =3D {"functional"})
+public class ReplicatedTxTest =

+{
+   Log log =3D LogFactory.getLog(ReplicatedTxTest.class);
+   PojoCache cache, cache1;
+   final String FACTORY =3D "org.jboss.cache.transaction.DummyContextFacto=
ry";
+   DummyTransactionManager tx_mgr;
+   Throwable t1_ex, t2_ex;
+   long start =3D 0;
+
+
+
+   @BeforeMethod(alwaysRun =3D true)
+   protected void setUp() throws Exception
+   {
+      log.info("setUp() ....");
+      boolean toStart =3D false;
+      cache =3D PojoCacheFactory.createCache(UnitTestCacheConfigurationFac=
tory.createConfiguration(CacheMode.REPL_SYNC), toStart);
+      cache.start();
+      cache1 =3D PojoCacheFactory.createCache(UnitTestCacheConfigurationFa=
ctory.createConfiguration(CacheMode.REPL_SYNC), toStart);
+      cache1.start();
+
+      System.setProperty(Context.INITIAL_CONTEXT_FACTORY, FACTORY);
+
+      tx_mgr =3D DummyTransactionManager.getInstance();
+      t1_ex =3D t2_ex =3D null;
+   }
+
+   @AfterMethod(alwaysRun =3D true)
+   protected void tearDown() throws Exception
+   {
+      cache.stop();
+      cache1.stop();
+
+      DummyTransactionManager.destroy();
+   }
+
+//   public void testDummy() {}
+
+   UserTransaction getTransaction() throws SystemException, NotSupportedEx=
ception, NamingException
+   {
+      Properties prop =3D new Properties();
+      prop.put(Context.INITIAL_CONTEXT_FACTORY,
+              "org.jboss.cache.transaction.DummyContextFactory");
+      return (UserTransaction) new InitialContext(prop).lookup("UserTransa=
ction");
+   }
+
+   private Person createPerson(String id, String name, int age)
+   {
+      Person p =3D new Person();
+      p.setName(name);
+      p.setAge(age);
+      cache.attach(id, p);
+      return p;
+   }
+
+   public void testSimple() throws Exception
+   {
+      log.info("testSimple() ....");
+      UserTransaction tx =3D getTransaction();
+      tx.begin();
+      Person p =3D createPerson("/person/test1", "Harald Gliebe", 32);
+      tx.commit();
+      tx.begin();
+      p.setName("Benoit");
+      tx.commit();
+      Person p1 =3D (Person) cache1.find("/person/test1");
+      assertEquals("Benoit", p.getName());
+      assertEquals("Benoit", p1.getName());
+      tx.begin();
+      p1.setAge(61);
+      tx.commit();
+      assertEquals(61, p.getAge());
+      assertEquals(61, p1.getAge());
+   }
+
+   public void testModification() throws Exception
+   {
+      UserTransaction tx =3D getTransaction();
+      tx.begin();
+      Person p =3D createPerson("/person/test2", "Harald", 32);
+      p.setName("Harald Gliebe");
+      tx.commit();
+      Person p1 =3D (Person) cache1.find("/person/test2");
+      tx.begin();
+      p1.setName("Benoit");
+      tx.commit();
+      assertEquals(p.getName(), "Benoit");
+      assertEquals(p1.getName(), "Benoit");
+      tx.begin();
+      p1.setName("Harald");
+      tx.rollback();
+      assertEquals(p.getName(), "Benoit");
+      assertEquals(p1.getName(), "Benoit");
+   }
+
+   public void testConcurrentPuts() throws Exception
+   {
+      Thread t1 =3D new Thread()
+      {
+         public void run()
+         {
+            try
+            {
+               List<String> lang =3D ((Person) cache.find("/person/test6")=
).getLanguages();
+               UserTransaction tx =3D getTransaction();
+               tx.begin();
+               lang.add("German");
+               TestingUtil.sleepThread(17000);
+               tx.commit();
+            }
+            catch (RollbackException rollback)
+            {
+               ;
+            }
+            catch (Exception ex)
+            {
+               t1_ex =3D ex;
+            }
+         }
+      };
+
+      Thread t2 =3D new Thread()
+      {
+         public void run()
+         {
+            UserTransaction tx =3D null;
+            try
+            {
+               TestingUtil.sleepThread(1000); // give Thread1 time to crea=
tePerson
+               List<String> lang =3D ((Person) cache.find("/person/test6")=
).getLanguages();
+               tx =3D getTransaction();
+               tx.begin();
+               lang.add("English");
+               tx.commit();
+            }
+            catch (RollbackException rollback)
+            {
+               ;
+            }
+            catch (Exception ex)
+            {
+               try
+               {
+                  tx.rollback();
+               } catch (SystemException e)
+               {
+                  e.printStackTrace();
+                  t2_ex =3D e;
+               }
+            }
+         }
+      };
+
+      Person p =3D createPerson("/person/test6", "p6", 50);
+      List<String> lang =3D new ArrayList<String>();
+      lang.add("German");
+      p.setLanguages(lang);
+
+      t1.start();
+      t2.start();
+
+      t1.join();
+      t2.join();
+
+      // t2 should rollback due to timeout while t2 should succeed
+      if (t2_ex !=3D null)
+         fail("Thread1 failed: " + t2_ex);
+      if (t1_ex !=3D null)
+         fail("Thread2 failed: " + t1_ex);
+
+      int size =3D ((Person) cache.find("/person/test6")).getLanguages().s=
ize();
+      assertEquals("number of languages should be 2, but is " + size + " (=
" +
+              ((Person) cache.find("/person/test6")).getLanguages().size()=
 + ")",
+              2, size);
+      size =3D ((Person) cache1.find("/person/test6")).getLanguages().size=
();
+      assertEquals("number of languages should be 2, but is " + size + " (=
" +
+              ((Person) cache.find("/person/test6")).getLanguages().size()=
 + ")",
+              2, size);
+   }
+
+   void log(String s)
+   {
+      long now;
+      if (start =3D=3D 0)
+         start =3D System.currentTimeMillis();
+      now =3D System.currentTimeMillis();
+
+      System.out.println("[" + Thread.currentThread().getName() + "] [" + =
(now - start) + "] " + s);
+   }
+
+
+
+
+
+}
+

Deleted: pojo/tags/2.1.0.CR3/src/test/java/org/jboss/cache/pojo/TestingUtil=
.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- pojo/branches/2.1/src/test/java/org/jboss/cache/pojo/TestingUtil.java	2=
007-11-26 18:16:13 UTC (rev 4776)
+++ pojo/tags/2.1.0.CR3/src/test/java/org/jboss/cache/pojo/TestingUtil.java=
	2008-01-16 00:43:28 UTC (rev 5140)
@@ -1,139 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- *
- * Distributable under LGPL license.
- * See terms of license at gnu.org.
- */
-
-package org.jboss.cache.pojo;
-
-import org.jboss.cache.CacheImpl;
-import org.jgroups.Address;
-
-import java.util.List;
-
-/**
- * Utilities for unit testing JBossCache.
- *
- * @author <a href=3D"mailto://brian.stansberry(a)jboss.com">Brian Stansbe=
rry</a>
- * @version $Revision$
- */
-public class TestingUtil
-{
-
-   /**
-    * @param caches  caches which must all have consistent views
-    * @param timeout max number of ms to loop
-    * @throws RuntimeException if <code>timeout</code> ms have elapse with=
out
-    *                          all caches having the same number of member=
s.
-    */
-   public static void blockUntilViewsReceived(PojoCache[] caches, long tim=
eout)
-   {
-      long failTime =3D System.currentTimeMillis() + timeout;
-
-      while (System.currentTimeMillis() < failTime)
-      {
-         org.jboss.cache.pojo.TestingUtil.sleepThread(100);
-         if (org.jboss.cache.pojo.TestingUtil.areCacheViewsComplete(caches=
))
-            return;
-      }
-
-      throw new RuntimeException("timed out before caches had complete vie=
ws");
-   }
-
-   /**
-    */
-   public static void blockUntilViewReceived(PojoCache cache, int groupSiz=
e, long timeout)
-   {
-      long failTime =3D System.currentTimeMillis() + timeout;
-
-      CacheImpl<Object, Object> tcache =3D (CacheImpl<Object, Object>) cac=
he.getCache();
-      while (System.currentTimeMillis() < failTime)
-      {
-         org.jboss.cache.pojo.TestingUtil.sleepThread(100);
-         if (org.jboss.cache.pojo.TestingUtil.isCacheViewComplete(tcache, =
groupSize))
-            return;
-      }
-
-      throw new RuntimeException("timed out before caches had complete vie=
ws");
-   }
-
-   /**
-    * Checks each cache to see if the number of elements in the array
-    * returned by {@link org.jboss.cache.CacheImpl#getMembers()} matches t=
he size of
-    * the <code>caches</code> parameter.
-    *
-    * @param caches caches that should form a View
-    * @return <code>true</code> if all caches have
-    *         <code>caches.length</code> members; false otherwise
-    * @throws IllegalStateException if any of the caches have MORE view
-    *                               members than caches.length
-    */
-   public static boolean areCacheViewsComplete(PojoCache[] caches)
-   {
-      int memberCount =3D caches.length;
-
-      for (int i =3D 0; i < memberCount; i++)
-      {
-         CacheImpl<Object, Object> cache =3D (CacheImpl<Object, Object>) c=
aches[i].getCache();
-         return org.jboss.cache.pojo.TestingUtil.isCacheViewComplete(cache=
, memberCount);
-      }
-
-      return true;
-   }
-
-   /**
-    * FIXME Comment this
-    *
-    * @param cache
-    * @param memberCount
-    */
-   public static boolean isCacheViewComplete(CacheImpl<Object, Object> cac=
he, int memberCount)
-   {
-      List<Address> members =3D cache.getMembers();
-      if (members =3D=3D null || memberCount > members.size())
-      {
-         return false;
-      }
-      else if (memberCount < members.size())
-      {
-         // This is an exceptional condition
-         StringBuffer sb =3D new StringBuffer("Cache at address ");
-         sb.append(cache.getLocalAddress());
-         sb.append(" had ");
-         sb.append(members.size());
-         sb.append(" members; expecting ");
-         sb.append(memberCount);
-         sb.append(". Members were (");
-         for (int j =3D 0; j < members.size(); j++)
-         {
-            if (j > 0)
-               sb.append(", ");
-            sb.append(members.get(j));
-         }
-         sb.append(')');
-
-         throw new IllegalStateException(sb.toString());
-      }
-
-      return true;
-   }
-
-
-   /**
-    * Puts the current thread to sleep for the desired number of ms, suppr=
essing
-    * any exceptions.
-    *
-    * @param sleeptime number of ms to sleep
-    */
-   public static void sleepThread(long sleeptime)
-   {
-      try
-      {
-         Thread.sleep(sleeptime);
-      }
-      catch (InterruptedException ie)
-      {
-      }
-   }
-}

Deleted: pojo/tags/2.1.0.CR3/src/test/java/org/jboss/cache/pojo/collection/=
ReplicatedSyncListTest.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- pojo/branches/2.1/src/test/java/org/jboss/cache/pojo/collection/Replica=
tedSyncListTest.java	2007-11-26 18:16:13 UTC (rev 4776)
+++ pojo/tags/2.1.0.CR3/src/test/java/org/jboss/cache/pojo/collection/Repli=
catedSyncListTest.java	2008-01-16 00:43:28 UTC (rev 5140)
@@ -1,319 +0,0 @@
-package org.jboss.cache.pojo.collection;
-
-import static org.testng.AssertJUnit.assertEquals;
-import static org.testng.AssertJUnit.assertNotNull;
-import static org.testng.AssertJUnit.assertTrue;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.ListIterator;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.jboss.aop.proxy.ClassProxy;
-import org.jboss.cache.Fqn;
-import org.jboss.cache.config.Configuration.CacheMode;
-import org.jboss.cache.factories.UnitTestCacheConfigurationFactory;
-import org.jboss.cache.pojo.PojoCache;
-import org.jboss.cache.pojo.PojoCacheAlreadyDetachedException;
-import org.jboss.cache.pojo.PojoCacheFactory;
-import org.jboss.cache.pojo.test.Address;
-import org.jboss.cache.pojo.test.Person;
-import org.testng.annotations.AfterMethod;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.Test;
-
-/**
- * Test object graph handling in aop, e.g., circular reference, multiple r=
eference, link, etc.
- *
- * @author Ben Wang
- */
-
-(a)Test(groups =3D {"functional"})
-public class ReplicatedSyncListTest =

-{
-   Log log =3D LogFactory.getLog(ReplicatedSyncListTest.class);
-   PojoCache cache1;
-   PojoCache cache2;
-
-
-   @BeforeMethod(alwaysRun =3D true)
-   protected void setUp() throws Exception
-   {
-      log.info("setUp() ....");
-      cache1 =3D createCache("CacheGroup");
-      cache2 =3D createCache("CacheGroup");
-   }
-
-   @AfterMethod(alwaysRun =3D true)
-   protected void tearDown() throws Exception
-   {
-      cache1.getCache().removeNode(Fqn.fromString("/"));
-      cache1.stop();
-      cache2.stop();
-   }
-
-   private PojoCache createCache(String name) throws Exception
-   {
-      boolean toStart =3D false;
-      PojoCache cache =3D PojoCacheFactory.createCache(UnitTestCacheConfig=
urationFactory.createConfiguration(CacheMode.REPL_SYNC), toStart);
-      cache.start();
-      return cache;
-   }
-
-//   public void testDummy() {}
-
-
-   protected Person createPerson(String name, int age)
-   {
-      Person p =3D new Person();
-      p.setName(name);
-      p.setAge(age);
-      return p;
-   }
-
-   /**
-    * Test attachment and then detachment and attachment.
-    *
-    * @throws Exception
-    */
-   @SuppressWarnings("unchecked")
-   public void testAttachDetach() throws Exception
-   {
-      log.info("testAttachDetach() ....");
-      List<Address> list1 =3D new ArrayList<Address>();
-      Address addr =3D new Address();
-      addr.setCity("San Jose");
-      addr.setZip(95123);
-      list1.add(addr);
-
-      Address addr2 =3D new Address();
-      addr2.setCity("Santa Clara");
-      addr2.setZip(95131);
-
-      Address addr3 =3D new Address();
-      addr3.setCity("Sunnyvale");
-      addr3.setZip(94086);
-
-      // Pure list
-      cache1.attach("/list", list1);
-      list1 =3D (List<Address>) cache1.find("/list");
-      list1.add(addr2);
-      // The return value is the original reference.
-      list1 =3D (List<Address>) cache1.detach("/list");
-      assertEquals("Detached list should still be", 2, list1.size());
-      list1.add(addr3);
-      cache1.attach("/list", list1);
-
-      List list2 =3D (List) cache2.find("/list");
-      assertTrue("List size should not be 0 ", (list2.size() !=3D 0));
-      assertEquals("Both list values should be equal ", list1.get(0).getZi=
p(),
-                   ((Address) list2.get(0)).getZip());
-   }
-
-   @SuppressWarnings("unchecked")
-   public void testRemoteDetach() throws Exception
-   {
-      List<Object> list =3D new ArrayList<Object>();
-      Address addr =3D new Address();
-      addr.setCity("San Jose");
-      addr.setZip(95123);
-      list.add(addr);
-
-      Address addr2 =3D new Address();
-      addr2.setCity("Santa Clara");
-      addr2.setZip(95131);
-
-      cache1.attach("/list", list);
-      list =3D (List<Object>) cache2.find("/list");
-      cache1.detach("/list");
-
-      boolean pass =3D false;
-      try
-      {
-         list.add(addr);
-      }
-      catch (PojoCacheAlreadyDetachedException e)
-      {
-         pass =3D true;
-      }
-
-      assertTrue("Expected PojoCacheAlreadyDetachedExcpetion!", pass);
-   }
-
-   /**
-    * Two different keys share same list.
-    *
-    * @throws Exception
-    */
-   @SuppressWarnings("unchecked")
-   public void testRelationshipWithSharedList1() throws Exception
-   {
-      log.info("testRelationshipWithList() ....");
-      List<Address> list1 =3D new ArrayList<Address>();
-      Address addr =3D new Address();
-      addr.setCity("San Jose");
-      addr.setZip(95123);
-      list1.add(addr);
-
-      // Pure list
-      cache1.attach("/list", list1);
-      // We specifically need to use Proxy otherwise it won't work with mu=
ltiple references
-      list1 =3D (List<Address>) cache1.find("/list");
-      cache1.attach("/alias", list1);
-
-      List list2 =3D (List) cache1.find("/alias");
-      Address add1 =3D (Address) list2.get(0);
-      assertNotNull("Address should not be null", add1);
-      assertEquals("Zip ", 95123, add1.getZip());
-
-      list1 =3D (List<Address>) cache2.find("/list");
-      list2 =3D (List) cache2.find("/alias");
-      assertTrue("List size should not be 0 ", (list2.size() !=3D 0));
-      assertEquals("Both lists should be equal ", list1, list2);
-      assertEquals("Both list values should be equal ", list1.get(0), list=
2.get(0));
-   }
-
-   /**
-    * Shared object between two list item.
-    *
-    * @throws Exception
-    */
-   public void testRelationshipWithSharedList2() throws Exception
-   {
-      log.info("testRelationshipWithList2() ....");
-      // 2 lists with shared objects
-      List<Address> list1 =3D new ArrayList<Address>();
-      Address addr =3D new Address();
-      addr.setCity("San Jose");
-      addr.setZip(95123);
-      list1.add(addr);
-
-      List<Address> list2 =3D new ArrayList<Address>();
-      list2.add(addr);
-
-      cache1.attach("/list1", list1);
-      cache1.attach("/list2", list2);
-      @SuppressWarnings("unchecked")
-      Address add2 =3D ((List<Address>) cache2.find("/list2")).get(0);
-      @SuppressWarnings("unchecked")
-      Address add1 =3D ((List<Address>) cache2.find("/list1")).get(0);
-      assertEquals("Address should be the same", add1, add2);
-      assertEquals("Both shared object should be equal ", add2.getZip(), a=
dd1.getZip());
-   }
-
-   /**
-    * Shared object between regular POJO and List item.
-    *
-    * @throws Exception
-    */
-   public void testRelationshipWithSharedList3() throws Exception
-   {
-      log.info("testRelationshipWithList3() ....");
-      // 2 lists with shared objects
-      List<Address> list1 =3D new ArrayList<Address>();
-      Address addr =3D new Address();
-      addr.setCity("San Jose");
-      addr.setZip(95123);
-      list1.add(addr);
-
-      List<Address> list2 =3D new ArrayList<Address>();
-      list2.add(addr);
-
-      cache1.attach("/address", addr);
-      cache1.attach("/list1", list1);
-      @SuppressWarnings("unchecked")
-      Address add1 =3D ((List<Address>) cache2.find("/list1")).get(0);
-      Address add2 =3D (Address) cache2.find("/address");
-      assertEquals("Address should be the same", add1, add2);
-      assertEquals("Both shared object should be equal ", 95123, add1.getZ=
ip());
-   }
-
-   @SuppressWarnings("unchecked")
-   public void testNullWithSharedList1() throws Exception
-   {
-      log.info("testNullWithSharedList1() ....");
-      List<String> list1 =3D new ArrayList<String>();
-      list1.add("element 0");
-      list1.add(null);  // element 1
-      list1.add("element 2");
-      list1.add(null);  // element 3
-
-      // Pure set
-      cache1.attach("/list", list1);
-      // We specifically need to use Proxy otherwise it won't work with mu=
ltiple references
-      list1 =3D (List<String>) cache1.find("/list");
-      cache1.attach("/alias", list1);
-
-      List<String> list2 =3D (List) cache1.find("/alias");
-
-      list1 =3D (List<String>) cache2.find("/list");
-      list2 =3D (List<String>) cache2.find("/alias");
-      assertTrue("List size should not be 0 ", (list2.size() !=3D 0));
-      assertEquals("Both listss should be equal ", list1, list2);
-
-      Object a1[] =3D list1.toArray();
-      Object a2[] =3D list2.toArray();
-      assertTrue("element 1 is null", (a1[1] =3D=3D null));
-      assertTrue("element 1 is null", (a2[1] =3D=3D null));
-      assertTrue("element 3 is null", (a1[3] =3D=3D null));
-      assertTrue("element 3 is null", (a2[3] =3D=3D null));
-
-      assertTrue("contains test for null value", list1.contains(null));
-      assertTrue("contains test for null value", list2.contains(null));
-
-      assertTrue("index of null ", list2.indexOf(null) =3D=3D 1);
-      assertTrue("last index of null ", list2.lastIndexOf(null) =3D=3D 3);
-
-      list1.set(0, null);   // set first element to null
-      assertTrue("set first item to null", list2.get(0) =3D=3D null);
-      list1.set(0, "element 0");
-      assertTrue("set first item to 'element 0'", list2.get(0).equals("ele=
ment 0"));
-
-
-      ListIterator<String> listIter =3D list1.listIterator();
-      assertTrue("listiter has next", listIter.hasNext());
-      assertTrue("listiter 1st element is 'element 0'", listIter.next().eq=
uals("element 0"));
-      assertTrue("listiter has next", listIter.hasNext());
-      assertTrue("listiter 2nd element is null", listIter.next() =3D=3D nu=
ll);
-      listIter.remove();
-
-      assertTrue("2nd element should be 'element 2'", list2.get(1).equals(=
"element 2"));
-
-   }
-
-   @SuppressWarnings("unchecked")
-   public void testRecursion1() throws Exception
-   {
-      List<Object> list =3D new ArrayList<Object>();
-      list.add("1");
-      list.add("2");
-      cache1.attach("list", list);
-
-      list =3D (List<Object>) cache1.find("list");
-      list.add(list);
-
-      assertEquals("size ", 3, list.size());
-      List l2 =3D (List) list.get(2);
-      assertTrue("Instance of AopProxy", l2 instanceof ClassProxy);
-//      assertEquals("ClassProxy instance", list, l2);
-   }
-
-   @SuppressWarnings("unchecked")
-   public void testRecursion2() throws Exception
-   {
-      List<Object> list =3D new ArrayList<Object>();
-      list.add("1");
-      list.add("2");
-      list.add(list);
-
-      cache1.attach("list", list);
-
-      list =3D (List<Object>) cache1.find("list");
-      list.toString();
-   }
-
-
-
-}
-

Copied: pojo/tags/2.1.0.CR3/src/test/java/org/jboss/cache/pojo/collection/R=
eplicatedSyncListTest.java (from rev 5139, pojo/branches/2.1/src/test/java/=
org/jboss/cache/pojo/collection/ReplicatedSyncListTest.java)
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- pojo/tags/2.1.0.CR3/src/test/java/org/jboss/cache/pojo/collection/Repli=
catedSyncListTest.java	                        (rev 0)
+++ pojo/tags/2.1.0.CR3/src/test/java/org/jboss/cache/pojo/collection/Repli=
catedSyncListTest.java	2008-01-16 00:43:28 UTC (rev 5140)
@@ -0,0 +1,319 @@
+package org.jboss.cache.pojo.collection;
+
+import static org.testng.AssertJUnit.assertEquals;
+import static org.testng.AssertJUnit.assertNotNull;
+import static org.testng.AssertJUnit.assertTrue;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.ListIterator;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.jboss.aop.proxy.ClassProxy;
+import org.jboss.cache.Fqn;
+import org.jboss.cache.config.Configuration.CacheMode;
+import org.jboss.cache.factories.UnitTestCacheConfigurationFactory;
+import org.jboss.cache.pojo.PojoCache;
+import org.jboss.cache.pojo.PojoCacheAlreadyDetachedException;
+import org.jboss.cache.pojo.PojoCacheFactory;
+import org.jboss.cache.pojo.test.Address;
+import org.jboss.cache.pojo.test.Person;
+import org.testng.annotations.AfterMethod;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.Test;
+
+/**
+ * Test object graph handling in aop, e.g., circular reference, multiple r=
eference, link, etc.
+ *
+ * @author Ben Wang
+ */
+
+(a)Test(groups =3D {"functional"}, enabled=3Dfalse)
+public class ReplicatedSyncListTest =

+{
+   Log log =3D LogFactory.getLog(ReplicatedSyncListTest.class);
+   PojoCache cache1;
+   PojoCache cache2;
+
+
+   @BeforeMethod(alwaysRun =3D true)
+   protected void setUp() throws Exception
+   {
+      log.info("setUp() ....");
+      cache1 =3D createCache("CacheGroup");
+      cache2 =3D createCache("CacheGroup");
+   }
+
+   @AfterMethod(alwaysRun =3D true)
+   protected void tearDown() throws Exception
+   {
+      //cache1.getCache().removeNode(Fqn.fromString("/"));
+      cache1.stop();
+      cache2.stop();
+   }
+
+   private PojoCache createCache(String name) throws Exception
+   {
+      boolean toStart =3D false;
+      PojoCache cache =3D PojoCacheFactory.createCache(UnitTestCacheConfig=
urationFactory.createConfiguration(CacheMode.REPL_SYNC), toStart);
+      cache.start();
+      return cache;
+   }
+
+//   public void testDummy() {}
+
+
+   protected Person createPerson(String name, int age)
+   {
+      Person p =3D new Person();
+      p.setName(name);
+      p.setAge(age);
+      return p;
+   }
+
+   /**
+    * Test attachment and then detachment and attachment.
+    *
+    * @throws Exception
+    */
+   @SuppressWarnings("unchecked")
+   public void testAttachDetach() throws Exception
+   {
+      log.info("testAttachDetach() ....");
+      List<Address> list1 =3D new ArrayList<Address>();
+      Address addr =3D new Address();
+      addr.setCity("San Jose");
+      addr.setZip(95123);
+      list1.add(addr);
+
+      Address addr2 =3D new Address();
+      addr2.setCity("Santa Clara");
+      addr2.setZip(95131);
+
+      Address addr3 =3D new Address();
+      addr3.setCity("Sunnyvale");
+      addr3.setZip(94086);
+
+      // Pure list
+      cache1.attach("/list", list1);
+      list1 =3D (List<Address>) cache1.find("/list");
+      list1.add(addr2);
+      // The return value is the original reference.
+      list1 =3D (List<Address>) cache1.detach("/list");
+      assertEquals("Detached list should still be", 2, list1.size());
+      list1.add(addr3);
+      cache1.attach("/list", list1);
+
+      List list2 =3D (List) cache2.find("/list");
+      assertTrue("List size should not be 0 ", (list2.size() !=3D 0));
+      assertEquals("Both list values should be equal ", list1.get(0).getZi=
p(),
+                   ((Address) list2.get(0)).getZip());
+   }
+
+   @SuppressWarnings("unchecked")
+   public void testRemoteDetach() throws Exception
+   {
+      List<Object> list =3D new ArrayList<Object>();
+      Address addr =3D new Address();
+      addr.setCity("San Jose");
+      addr.setZip(95123);
+      list.add(addr);
+
+      Address addr2 =3D new Address();
+      addr2.setCity("Santa Clara");
+      addr2.setZip(95131);
+
+      cache1.attach("/list", list);
+      list =3D (List<Object>) cache2.find("/list");
+      cache1.detach("/list");
+
+      boolean pass =3D false;
+      try
+      {
+         list.add(addr);
+      }
+      catch (PojoCacheAlreadyDetachedException e)
+      {
+         pass =3D true;
+      }
+
+      assertTrue("Expected PojoCacheAlreadyDetachedExcpetion!", pass);
+   }
+
+   /**
+    * Two different keys share same list.
+    *
+    * @throws Exception
+    */
+   @SuppressWarnings("unchecked")
+   public void testRelationshipWithSharedList1() throws Exception
+   {
+      log.info("testRelationshipWithList() ....");
+      List<Address> list1 =3D new ArrayList<Address>();
+      Address addr =3D new Address();
+      addr.setCity("San Jose");
+      addr.setZip(95123);
+      list1.add(addr);
+
+      // Pure list
+      cache1.attach("/list", list1);
+      // We specifically need to use Proxy otherwise it won't work with mu=
ltiple references
+      list1 =3D (List<Address>) cache1.find("/list");
+      cache1.attach("/alias", list1);
+
+      List list2 =3D (List) cache1.find("/alias");
+      Address add1 =3D (Address) list2.get(0);
+      assertNotNull("Address should not be null", add1);
+      assertEquals("Zip ", 95123, add1.getZip());
+
+      list1 =3D (List<Address>) cache2.find("/list");
+      list2 =3D (List) cache2.find("/alias");
+      assertTrue("List size should not be 0 ", (list2.size() !=3D 0));
+      assertEquals("Both lists should be equal ", list1, list2);
+      assertEquals("Both list values should be equal ", list1.get(0), list=
2.get(0));
+   }
+
+   /**
+    * Shared object between two list item.
+    *
+    * @throws Exception
+    */
+   public void testRelationshipWithSharedList2() throws Exception
+   {
+      log.info("testRelationshipWithList2() ....");
+      // 2 lists with shared objects
+      List<Address> list1 =3D new ArrayList<Address>();
+      Address addr =3D new Address();
+      addr.setCity("San Jose");
+      addr.setZip(95123);
+      list1.add(addr);
+
+      List<Address> list2 =3D new ArrayList<Address>();
+      list2.add(addr);
+
+      cache1.attach("/list1", list1);
+      cache1.attach("/list2", list2);
+      @SuppressWarnings("unchecked")
+      Address add2 =3D ((List<Address>) cache2.find("/list2")).get(0);
+      @SuppressWarnings("unchecked")
+      Address add1 =3D ((List<Address>) cache2.find("/list1")).get(0);
+      assertEquals("Address should be the same", add1, add2);
+      assertEquals("Both shared object should be equal ", add2.getZip(), a=
dd1.getZip());
+   }
+
+   /**
+    * Shared object between regular POJO and List item.
+    *
+    * @throws Exception
+    */
+   public void testRelationshipWithSharedList3() throws Exception
+   {
+      log.info("testRelationshipWithList3() ....");
+      // 2 lists with shared objects
+      List<Address> list1 =3D new ArrayList<Address>();
+      Address addr =3D new Address();
+      addr.setCity("San Jose");
+      addr.setZip(95123);
+      list1.add(addr);
+
+      List<Address> list2 =3D new ArrayList<Address>();
+      list2.add(addr);
+
+      cache1.attach("/address", addr);
+      cache1.attach("/list1", list1);
+      @SuppressWarnings("unchecked")
+      Address add1 =3D ((List<Address>) cache2.find("/list1")).get(0);
+      Address add2 =3D (Address) cache2.find("/address");
+      assertEquals("Address should be the same", add1, add2);
+      assertEquals("Both shared object should be equal ", 95123, add1.getZ=
ip());
+   }
+
+   @SuppressWarnings("unchecked")
+   public void testNullWithSharedList1() throws Exception
+   {
+      log.info("testNullWithSharedList1() ....");
+      List<String> list1 =3D new ArrayList<String>();
+      list1.add("element 0");
+      list1.add(null);  // element 1
+      list1.add("element 2");
+      list1.add(null);  // element 3
+
+      // Pure set
+      cache1.attach("/list", list1);
+      // We specifically need to use Proxy otherwise it won't work with mu=
ltiple references
+      list1 =3D (List<String>) cache1.find("/list");
+      cache1.attach("/alias", list1);
+
+      List<String> list2 =3D (List) cache1.find("/alias");
+
+      list1 =3D (List<String>) cache2.find("/list");
+      list2 =3D (List<String>) cache2.find("/alias");
+      assertTrue("List size should not be 0 ", (list2.size() !=3D 0));
+      assertEquals("Both listss should be equal ", list1, list2);
+
+      Object a1[] =3D list1.toArray();
+      Object a2[] =3D list2.toArray();
+      assertTrue("element 1 is null", (a1[1] =3D=3D null));
+      assertTrue("element 1 is null", (a2[1] =3D=3D null));
+      assertTrue("element 3 is null", (a1[3] =3D=3D null));
+      assertTrue("element 3 is null", (a2[3] =3D=3D null));
+
+      assertTrue("contains test for null value", list1.contains(null));
+      assertTrue("contains test for null value", list2.contains(null));
+
+      assertTrue("index of null ", list2.indexOf(null) =3D=3D 1);
+      assertTrue("last index of null ", list2.lastIndexOf(null) =3D=3D 3);
+
+      list1.set(0, null);   // set first element to null
+      assertTrue("set first item to null", list2.get(0) =3D=3D null);
+      list1.set(0, "element 0");
+      assertTrue("set first item to 'element 0'", list2.get(0).equals("ele=
ment 0"));
+
+
+      ListIterator<String> listIter =3D list1.listIterator();
+      assertTrue("listiter has next", listIter.hasNext());
+      assertTrue("listiter 1st element is 'element 0'", listIter.next().eq=
uals("element 0"));
+      assertTrue("listiter has next", listIter.hasNext());
+      assertTrue("listiter 2nd element is null", listIter.next() =3D=3D nu=
ll);
+      listIter.remove();
+
+      assertTrue("2nd element should be 'element 2'", list2.get(1).equals(=
"element 2"));
+
+   }
+
+   @SuppressWarnings("unchecked")
+   public void testRecursion1() throws Exception
+   {
+      List<Object> list =3D new ArrayList<Object>();
+      list.add("1");
+      list.add("2");
+      cache1.attach("list", list);
+
+      list =3D (List<Object>) cache1.find("list");
+      list.add(list);
+
+      assertEquals("size ", 3, list.size());
+      List l2 =3D (List) list.get(2);
+      assertTrue("Instance of AopProxy", l2 instanceof ClassProxy);
+//      assertEquals("ClassProxy instance", list, l2);
+   }
+
+   @SuppressWarnings("unchecked")
+   public void testRecursion2() throws Exception
+   {
+      List<Object> list =3D new ArrayList<Object>();
+      list.add("1");
+      list.add("2");
+      list.add(list);
+
+      cache1.attach("list", list);
+
+      list =3D (List<Object>) cache1.find("list");
+      list.toString();
+   }
+
+
+
+}
+

Deleted: pojo/tags/2.1.0.CR3/src/test/java/org/jboss/cache/pojo/jmx/Notific=
ationTest.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- pojo/branches/2.1/src/test/java/org/jboss/cache/pojo/jmx/NotificationTe=
st.java	2007-11-26 18:16:13 UTC (rev 4776)
+++ pojo/tags/2.1.0.CR3/src/test/java/org/jboss/cache/pojo/jmx/Notification=
Test.java	2008-01-16 00:43:28 UTC (rev 5140)
@@ -1,62 +0,0 @@
-package org.jboss.cache.pojo.jmx;
-
-import javax.management.ObjectName;
-
-import org.jboss.cache.CacheImpl;
-import org.jboss.cache.config.Configuration;
-import org.jboss.cache.pojo.PojoCache;
-import org.jboss.cache.pojo.PojoCacheFactory;
-import org.jboss.cache.pojo.impl.PojoCacheImpl;
-import org.testng.annotations.Test;
-
-/**
- * Functional tests for CacheJmxWrapper broadcast of cache event notificat=
ions
- *
- * @author Jerry Gauthier
- * @version $Id$
- */
-(a)Test(groups =3D {"functional"})
-public class NotificationTest extends org.jboss.cache.jmx.NotificationTest
-{
-   private PojoCache pojoCache;
-
-
-
-   @Override
-   protected Object createCacheAndJmxWrapper() throws Exception
-   {
-      pojoCache =3D createCache(CLUSTER_NAME);
-      cache =3D (CacheImpl<Object, Object>) pojoCache.getCache();
-      return new PojoCacheJmxWrapper(pojoCache);
-   }
-
-   @Override
-   protected void destroyCache()
-   {
-      if (pojoCache !=3D null)
-      {
-         // stop the cache before the listener is unregistered
-         //cache1.stop();
-         pojoCache.destroy();
-         pojoCache =3D null;
-         cache =3D null;
-      }
-   }
-
-   protected ObjectName getWrapperObjectName() throws Exception
-   {
-      return new ObjectName(JmxUtil.PREFIX + CLUSTER_NAME);
-   }
-
-   protected PojoCacheImpl createCache(String clusterName) throws Exception
-   {
-      Configuration config =3D createConfiguration(clusterName);
-
-      PojoCacheImpl cache =3D (PojoCacheImpl) PojoCacheFactory.createCache=
(config, false);
-
-      cache.create();
-      // start the cache after the listener has been registered
-      //cache.start();
-      return cache;
-   }
-}
\ No newline at end of file

Copied: pojo/tags/2.1.0.CR3/src/test/java/org/jboss/cache/pojo/jmx/Notifica=
tionTest.java (from rev 5129, pojo/branches/2.1/src/test/java/org/jboss/cac=
he/pojo/jmx/NotificationTest.java)
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- pojo/tags/2.1.0.CR3/src/test/java/org/jboss/cache/pojo/jmx/Notification=
Test.java	                        (rev 0)
+++ pojo/tags/2.1.0.CR3/src/test/java/org/jboss/cache/pojo/jmx/Notification=
Test.java	2008-01-16 00:43:28 UTC (rev 5140)
@@ -0,0 +1,62 @@
+package org.jboss.cache.pojo.jmx;
+
+import javax.management.ObjectName;
+
+import org.jboss.cache.CacheSPI;
+import org.jboss.cache.config.Configuration;
+import org.jboss.cache.pojo.PojoCache;
+import org.jboss.cache.pojo.PojoCacheFactory;
+import org.jboss.cache.pojo.impl.PojoCacheImpl;
+import org.testng.annotations.Test;
+
+/**
+ * Functional tests for CacheJmxWrapper broadcast of cache event notificat=
ions
+ *
+ * @author Jerry Gauthier
+ * @version $Id$
+ */
+(a)Test(groups =3D {"functional"})
+public class NotificationTest extends org.jboss.cache.jmx.NotificationTest
+{
+   private PojoCache pojoCache;
+
+
+
+   @Override
+   protected Object createCacheAndJmxWrapper() throws Exception
+   {
+      pojoCache =3D createCache(CLUSTER_NAME);
+      cache =3D (CacheSPI<Object, Object>)pojoCache.getCache();
+      return new PojoCacheJmxWrapper(pojoCache);
+   }
+
+   @Override
+   protected void destroyCache()
+   {
+      if (pojoCache !=3D null)
+      {
+         // stop the cache before the listener is unregistered
+         //cache1.stop();
+         pojoCache.destroy();
+         pojoCache =3D null;
+         cache =3D null;
+      }
+   }
+
+   protected ObjectName getWrapperObjectName() throws Exception
+   {
+      return new ObjectName(JmxUtil.PREFIX + CLUSTER_NAME);
+   }
+
+   protected PojoCacheImpl createCache(String clusterName) throws Exception
+   {
+      Configuration config =3D createConfiguration(clusterName);
+
+      PojoCacheImpl cache =3D (PojoCacheImpl) PojoCacheFactory.createCache=
(config, false);
+
+      cache.create();
+      // start the cache after the listener has been registered
+      //cache.start();
+      return cache;
+   }
+}
\ No newline at end of file

Deleted: pojo/tags/2.1.0.CR3/src/test/java/org/jboss/cache/pojo/memory/Repl=
icatedTest.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- pojo/branches/2.1/src/test/java/org/jboss/cache/pojo/memory/ReplicatedT=
est.java	2007-11-26 18:16:13 UTC (rev 4776)
+++ pojo/tags/2.1.0.CR3/src/test/java/org/jboss/cache/pojo/memory/Replicate=
dTest.java	2008-01-16 00:43:28 UTC (rev 5140)
@@ -1,186 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- *
- * Distributable under LGPL license.
- * See terms of license at gnu.org.
- */
-
-package org.jboss.cache.pojo.memory;
-
-import static org.testng.AssertJUnit.assertEquals;
-import static org.testng.AssertJUnit.assertNull;
-import static org.testng.AssertJUnit.fail;
-
-import java.lang.ref.WeakReference;
-import java.util.ArrayList;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.jboss.cache.Fqn;
-import org.jboss.cache.config.Configuration.CacheMode;
-import org.jboss.cache.factories.UnitTestCacheConfigurationFactory;
-import org.jboss.cache.pojo.PojoCache;
-import org.jboss.cache.pojo.PojoCacheFactory;
-import org.jboss.cache.pojo.TestingUtil;
-import org.jboss.cache.pojo.test.Address;
-import org.jboss.cache.pojo.test.Person;
-import org.jboss.cache.pojo.test.SerializedAddress;
-import org.testng.annotations.AfterMethod;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.Test;
-
-/**
- * @author Ben Wang
- */
-
-(a)Test(groups =3D {"functional"})
-public class ReplicatedTest
-{
-   Log log_ =3D LogFactory.getLog(ReplicatedTest.class);
-   PojoCache cache_;
-   PojoCache cache1_;
-
-
-   @BeforeMethod(alwaysRun =3D true)
-   protected void setUp() throws Exception
-   {
-      boolean toStart =3D false;
-      cache_ =3D PojoCacheFactory.createCache(UnitTestCacheConfigurationFa=
ctory.createConfiguration(CacheMode.REPL_SYNC), toStart);
-      cache_.start();
-      cache1_ =3D PojoCacheFactory.createCache(UnitTestCacheConfigurationF=
actory.createConfiguration(CacheMode.REPL_SYNC), toStart);
-      cache1_.start();
-   }
-
-   @AfterMethod(alwaysRun =3D true)
-   protected void tearDown() throws Exception
-   {
-      cache_.stop();
-      cache1_.stop();
-   }
-
-//   public void testDummy() {}
-
-   /**
-    * Test replication with classloaders.
-    *
-    * @throws Exception
-    */
-   public void testCLLeakageBasic() throws Exception
-   {
-      SerializedAddress add =3D new SerializedAddress();
-      add.setCity("Taipei");
-
-      ClassLoader cla =3D getClassLoader();
-      WeakReference<ClassLoader> refa =3D new WeakReference<ClassLoader>(c=
la);
-      cache_.getCache().getRegion(new Fqn<String>("/aop"), true).registerC=
ontextClassLoader(cla);
-      ClassLoader clb =3D getClassLoader();
-      WeakReference<ClassLoader> refb =3D new WeakReference<ClassLoader>(c=
lb);
-      cache_.getCache().getRegion(new Fqn<String>("/aop"), true).registerC=
ontextClassLoader(clb);
-
-      Fqn<String> fqn =3D new Fqn<String>("/aop");
-      cache_.getCache().put(new Fqn<String>("/aop"), "add", add);
-
-      TestingUtil.sleepThread(100);
-      try
-      {
-         Object ben =3D cache1_.getCache().get(fqn, "add");
-         assertEquals(add.toString(), ben.toString());
-         ben =3D null;
-      }
-      catch (Exception ex)
-      {
-         fail("Test fails with exception " + ex);
-      }
-
-      cache_.getCache().remove(fqn, "add");
-
-      ClassLoader clc =3D getClassLoader();
-      cla =3D null;
-      clb =3D null;
-      cache_.getCache().getRegion(new Fqn<String>("/aop"), true).registerC=
ontextClassLoader(clc);
-      cache1_.getCache().getRegion(new Fqn<String>("/aop"), true).register=
ContextClassLoader(clc);
-      System.gc(); // force gc
-      Thread.sleep(1000);
-      assertNull("Classloader should be gced ", refa.get());
-      assertNull("Classloader should be gced ", refb.get());
-   }
-
-   private static void forceOutOfMemoryError() throws Exception
-   {
-      ArrayList<String> list =3D new ArrayList<String>();
-      try
-      {
-
-         long i =3D 0;
-         while (true)
-         {
-            list.add("BigBigBigBigBigBigBigBigBigBigBigBigBigBigBigBigBigB=
igBigBigBigBigBigBig" + (i++));
-         }
-      }
-      catch (Throwable ignored)
-      {
-      }
-      list.clear();
-      list =3D null;
-      System.gc();
-      Thread.sleep(1000);
-   }
-
-   /**
-    * Test replication with classloaders.
-    *
-    * @throws Exception
-    */
-   public void testCLLeakage() throws Exception
-   {
-      Person p =3D new Person();
-      p.setName("Ben");
-      Address add =3D new Address();
-      add.setCity("Taipei");
-
-      ClassLoader cla =3D getClassLoader();
-      WeakReference<ClassLoader> refa =3D new WeakReference<ClassLoader>(c=
la);
-      cache_.getCache().getRegion(new Fqn<String>("/aop"), true).registerC=
ontextClassLoader(cla);
-      ClassLoader clb =3D getClassLoader();
-      cache1_.getCache().getRegion(new Fqn<String>("/aop"), true).register=
ContextClassLoader(clb);
-      WeakReference<ClassLoader> refb =3D new WeakReference<ClassLoader>(c=
lb);
-
-      cache_.attach("/aop", p);
-
-      TestingUtil.sleepThread(100);
-      try
-      {
-         Object ben =3D cache1_.find("/aop");
-         assertEquals(p.toString(), ben.toString());
-         ben =3D null;
-      }
-      catch (Exception ex)
-      {
-         fail("Test fails with exception " + ex);
-      }
-
-      cache_.detach("/aop");
-      ClassLoader clc =3D getClassLoader();
-      cache_.getCache().getRegion(new Fqn<String>("/aop"), true).registerC=
ontextClassLoader(clc);
-      cache1_.getCache().getRegion(new Fqn<String>("/aop"), true).register=
ContextClassLoader(clc);
-      cla =3D null;
-      clb =3D null;
-      forceOutOfMemoryError();
-
-      assertNull("Classloader should be gced ", refa.get());
-      assertNull("Classloader should be gced ", refb.get());
-   }
-
-   protected ClassLoader getClassLoader() throws Exception
-   {
-      String[] includesClasses =3D {"org.jboss.cache.aop.test.Person",
-                                  "org.jboss.cache.aop.test.Address"};
-      String[] excludesClasses =3D {};
-      ClassLoader cl =3D Thread.currentThread().getContextClassLoader();
-      return new SelectedClassnameClassLoader(includesClasses, excludesCla=
sses, cl);
-   }
-
-
-
-
-}

Copied: pojo/tags/2.1.0.CR3/src/test/java/org/jboss/cache/pojo/memory/Repli=
catedTest.java (from rev 5129, pojo/branches/2.1/src/test/java/org/jboss/ca=
che/pojo/memory/ReplicatedTest.java)
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- pojo/tags/2.1.0.CR3/src/test/java/org/jboss/cache/pojo/memory/Replicate=
dTest.java	                        (rev 0)
+++ pojo/tags/2.1.0.CR3/src/test/java/org/jboss/cache/pojo/memory/Replicate=
dTest.java	2008-01-16 00:43:28 UTC (rev 5140)
@@ -0,0 +1,186 @@
+/*
+ * JBoss, Home of Professional Open Source
+ *
+ * Distributable under LGPL license.
+ * See terms of license at gnu.org.
+ */
+
+package org.jboss.cache.pojo.memory;
+
+import static org.testng.AssertJUnit.assertEquals;
+import static org.testng.AssertJUnit.assertNull;
+import static org.testng.AssertJUnit.fail;
+
+import java.lang.ref.WeakReference;
+import java.util.ArrayList;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.jboss.cache.Fqn;
+import org.jboss.cache.config.Configuration.CacheMode;
+import org.jboss.cache.factories.UnitTestCacheConfigurationFactory;
+import org.jboss.cache.misc.TestingUtil;
+import org.jboss.cache.pojo.PojoCache;
+import org.jboss.cache.pojo.PojoCacheFactory;
+import org.jboss.cache.pojo.test.Address;
+import org.jboss.cache.pojo.test.Person;
+import org.jboss.cache.pojo.test.SerializedAddress;
+import org.testng.annotations.AfterMethod;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.Test;
+
+/**
+ * @author Ben Wang
+ */
+
+(a)Test(groups =3D {"functional"})
+public class ReplicatedTest
+{
+   Log log_ =3D LogFactory.getLog(ReplicatedTest.class);
+   PojoCache cache_;
+   PojoCache cache1_;
+
+
+   @BeforeMethod(alwaysRun =3D true)
+   protected void setUp() throws Exception
+   {
+      boolean toStart =3D false;
+      cache_ =3D PojoCacheFactory.createCache(UnitTestCacheConfigurationFa=
ctory.createConfiguration(CacheMode.REPL_SYNC), toStart);
+      cache_.start();
+      cache1_ =3D PojoCacheFactory.createCache(UnitTestCacheConfigurationF=
actory.createConfiguration(CacheMode.REPL_SYNC), toStart);
+      cache1_.start();
+   }
+
+   @AfterMethod(alwaysRun =3D true)
+   protected void tearDown() throws Exception
+   {
+      cache_.stop();
+      cache1_.stop();
+   }
+
+//   public void testDummy() {}
+
+   /**
+    * Test replication with classloaders.
+    *
+    * @throws Exception
+    */
+   public void testCLLeakageBasic() throws Exception
+   {
+      SerializedAddress add =3D new SerializedAddress();
+      add.setCity("Taipei");
+
+      ClassLoader cla =3D getClassLoader();
+      WeakReference<ClassLoader> refa =3D new WeakReference<ClassLoader>(c=
la);
+      cache_.getCache().getRegion(new Fqn<String>("/aop"), true).registerC=
ontextClassLoader(cla);
+      ClassLoader clb =3D getClassLoader();
+      WeakReference<ClassLoader> refb =3D new WeakReference<ClassLoader>(c=
lb);
+      cache_.getCache().getRegion(new Fqn<String>("/aop"), true).registerC=
ontextClassLoader(clb);
+
+      Fqn<String> fqn =3D new Fqn<String>("/aop");
+      cache_.getCache().put(new Fqn<String>("/aop"), "add", add);
+
+      TestingUtil.sleepThread(100);
+      try
+      {
+         Object ben =3D cache1_.getCache().get(fqn, "add");
+         assertEquals(add.toString(), ben.toString());
+         ben =3D null;
+      }
+      catch (Exception ex)
+      {
+         fail("Test fails with exception " + ex);
+      }
+
+      cache_.getCache().remove(fqn, "add");
+
+      ClassLoader clc =3D getClassLoader();
+      cla =3D null;
+      clb =3D null;
+      cache_.getCache().getRegion(new Fqn<String>("/aop"), true).registerC=
ontextClassLoader(clc);
+      cache1_.getCache().getRegion(new Fqn<String>("/aop"), true).register=
ContextClassLoader(clc);
+      System.gc(); // force gc
+      Thread.sleep(1000);
+      assertNull("Classloader should be gced ", refa.get());
+      assertNull("Classloader should be gced ", refb.get());
+   }
+
+   private static void forceOutOfMemoryError() throws Exception
+   {
+      ArrayList<String> list =3D new ArrayList<String>();
+      try
+      {
+
+         long i =3D 0;
+         while (true)
+         {
+            list.add("BigBigBigBigBigBigBigBigBigBigBigBigBigBigBigBigBigB=
igBigBigBigBigBigBig" + (i++));
+         }
+      }
+      catch (Throwable ignored)
+      {
+      }
+      list.clear();
+      list =3D null;
+      System.gc();
+      Thread.sleep(1000);
+   }
+
+   /**
+    * Test replication with classloaders.
+    *
+    * @throws Exception
+    */
+   public void testCLLeakage() throws Exception
+   {
+      Person p =3D new Person();
+      p.setName("Ben");
+      Address add =3D new Address();
+      add.setCity("Taipei");
+
+      ClassLoader cla =3D getClassLoader();
+      WeakReference<ClassLoader> refa =3D new WeakReference<ClassLoader>(c=
la);
+      cache_.getCache().getRegion(new Fqn<String>("/aop"), true).registerC=
ontextClassLoader(cla);
+      ClassLoader clb =3D getClassLoader();
+      cache1_.getCache().getRegion(new Fqn<String>("/aop"), true).register=
ContextClassLoader(clb);
+      WeakReference<ClassLoader> refb =3D new WeakReference<ClassLoader>(c=
lb);
+
+      cache_.attach("/aop", p);
+
+      TestingUtil.sleepThread(100);
+      try
+      {
+         Object ben =3D cache1_.find("/aop");
+         assertEquals(p.toString(), ben.toString());
+         ben =3D null;
+      }
+      catch (Exception ex)
+      {
+         fail("Test fails with exception " + ex);
+      }
+
+      cache_.detach("/aop");
+      ClassLoader clc =3D getClassLoader();
+      cache_.getCache().getRegion(new Fqn<String>("/aop"), true).registerC=
ontextClassLoader(clc);
+      cache1_.getCache().getRegion(new Fqn<String>("/aop"), true).register=
ContextClassLoader(clc);
+      cla =3D null;
+      clb =3D null;
+      forceOutOfMemoryError();
+
+      assertNull("Classloader should be gced ", refa.get());
+      assertNull("Classloader should be gced ", refb.get());
+   }
+
+   protected ClassLoader getClassLoader() throws Exception
+   {
+      String[] includesClasses =3D {"org.jboss.cache.aop.test.Person",
+                                  "org.jboss.cache.aop.test.Address"};
+      String[] excludesClasses =3D {};
+      ClassLoader cl =3D Thread.currentThread().getContextClassLoader();
+      return new SelectedClassnameClassLoader(includesClasses, excludesCla=
sses, cl);
+   }
+
+
+
+
+}

Deleted: pojo/tags/2.1.0.CR3/src/test/java/org/jboss/cache/pojo/optimistic/=
AbstractOptimisticTestCase.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- pojo/branches/2.1/src/test/java/org/jboss/cache/pojo/optimistic/Abstrac=
tOptimisticTestCase.java	2007-11-26 18:16:13 UTC (rev 4776)
+++ pojo/tags/2.1.0.CR3/src/test/java/org/jboss/cache/pojo/optimistic/Abstr=
actOptimisticTestCase.java	2008-01-16 00:43:28 UTC (rev 5140)
@@ -1,378 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
-package org.jboss.cache.pojo.optimistic;
-
-import java.io.File;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Random;
-
-import javax.transaction.SystemException;
-import javax.transaction.TransactionManager;
-
-import org.jboss.cache.CacheSPI;
-import org.jboss.cache.Fqn;
-import org.jboss.cache.config.CacheLoaderConfig;
-import org.jboss.cache.config.Configuration;
-import org.jboss.cache.factories.XmlConfigurationParser;
-import org.jboss.cache.interceptors.Interceptor;
-import org.jboss.cache.interceptors.InvocationContextInterceptor;
-import org.jboss.cache.interceptors.OptimisticCreateIfNotExistsInterceptor;
-import org.jboss.cache.interceptors.OptimisticNodeInterceptor;
-import org.jboss.cache.interceptors.OptimisticReplicationInterceptor;
-import org.jboss.cache.interceptors.TxInterceptor;
-import org.jboss.cache.lock.IsolationLevel;
-import org.jboss.cache.marshall.MethodCall;
-import org.jboss.cache.marshall.MethodCallFactory;
-import org.jboss.cache.marshall.MethodDeclarations;
-import org.jboss.cache.misc.TestingUtil;
-import org.jboss.cache.optimistic.DefaultDataVersion;
-import org.jboss.cache.optimistic.TestListener;
-import org.jboss.cache.pojo.PojoCache;
-import org.jboss.cache.pojo.PojoCacheFactory;
-import org.jboss.cache.transaction.DummyTransactionManager;
-import org.jboss.cache.xml.XmlHelper;
-import org.testng.annotations.AfterMethod;
-import org.w3c.dom.Element;
-
-/**
- * Base test for optimistic locking. Copied from Cache counterpart.
- */
-public abstract class AbstractOptimisticTestCase
-{
-   private int instanceNumber;
-
-   // some test data shared among all the test cases
-   protected Fqn<String> fqn =3D Fqn.fromString("/blah");
-   protected String key =3D "myKey", value =3D "myValue";
-
-   protected String getTempDir()
-   {
-      return getTempDir("tempdir");
-   }
-
-   private String getTempDir(String name)
-   {
-      String tempDir =3D System.getProperty("java.io.tmpdir", "/tmp");
-      tempDir =3D tempDir + File.separator + name;
-      System.out.println("tmpdir property: " + System.getProperty("java.io=
.tmpdir"));
-      System.out.println("Attempting to create dir [" + tempDir + "]");
-      File tempDirFile =3D new File(tempDir);
-      if (!tempDirFile.exists())
-      {
-         tempDirFile.mkdirs();
-      }
-      return tempDir;
-   }
-
-   protected PojoCache createCacheUnstarted() throws Exception
-   {
-      return createCacheUnstarted(true);
-   }
-
-   protected PojoCache createCacheUnstarted(boolean optimistic) throws Exc=
eption
-   {
-      Configuration c =3D new Configuration();
-      if (optimistic) c.setNodeLockingScheme("OPTIMISTIC");
-
-      c.setTransactionManagerLookupClass("org.jboss.cache.transaction.Dumm=
yTransactionManagerLookup");
-      c.setCacheMode("LOCAL");
-      PojoCache cache =3D PojoCacheFactory.createCache(c, false);
-      return cache;
-   }
-
-   protected PojoCache createCacheWithListener() throws Exception
-   {
-      return createCacheWithListener(new TestListener());
-   }
-
-   protected PojoCache createCacheWithListener(Object listener) throws Exc=
eption
-   {
-      PojoCache cache =3D createCacheUnstarted();
-      cache.create();
-      cache.start();
-      cache.getCache().addCacheListener(listener);
-      return cache;
-   }
-
-   /**
-    * Returns a tree cache with passivation disabled in the loader.
-    *
-    * @return
-    * @throws Exception
-    */
-   protected PojoCache createCacheWithLoader() throws Exception
-   {
-      return createCacheWithLoader(false);
-   }
-
-   protected CacheLoaderConfig getCacheLoaderConfig(boolean shared, String=
 filename, boolean passivation) throws Exception
-   {
-      String xml =3D "            <config>\n" +
-              "                <passivation>" + passivation + "</passivati=
on>\n" +
-              "                <preload></preload>\n" +
-              "                <shared>" + shared + "</shared>\n" +
-              "                <cacheloader>\n" +
-              "                    <class>org.jboss.cache.loader.FileCache=
Loader</class>\n" +
-              "                    <properties>\n" +
-              "                    </properties>\n" +
-              "                    <async>false</async>\n" +
-              "                    <fetchPersistentState>" + (!shared) + "=
</fetchPersistentState>\n" +
-              "                    <ignoreModifications>false</ignoreModif=
ications>\n" +
-              "                </cacheloader>\n" +
-              "            </config>";
-      Element element =3D XmlHelper.stringToElement(xml);
-      return XmlConfigurationParser.parseCacheLoaderConfig(element);
-   }
-
-   protected PojoCache createCacheWithLoader(boolean passivationEnabled) t=
hrows Exception
-   {
-      PojoCache cache =3D createCacheUnstarted();
-      Configuration c =3D cache.getCache().getConfiguration();
-      c.setCacheLoaderConfig(getCacheLoaderConfig(true, getTempDir(), pass=
ivationEnabled));
-      cache.create();
-      cache.start();
-      return cache;
-   }
-
-   protected PojoCache createCache() throws Exception
-   {
-      PojoCache cache =3D createCacheUnstarted();
-      cache.create();
-      cache.start();
-      return cache;
-   }
-
-   protected void destroyCache(PojoCache c)
-   {
-      c.stop();
-      c.destroy();
-   }
-
-
-   protected PojoCache createPessimisticCache() throws Exception
-   {
-      Configuration c =3D new Configuration();
-      c.setClusterName("name");
-      c.setStateRetrievalTimeout(5000);
-      c.setClusterConfig(getDefaultProperties());
-      c.setCacheMode(Configuration.CacheMode.REPL_SYNC);
-      c.setIsolationLevel(IsolationLevel.REPEATABLE_READ);
-      c.setTransactionManagerLookupClass("org.jboss.cache.transaction.Dumm=
yTransactionManagerLookup");
-
-      PojoCache cache =3D PojoCacheFactory.createCache(c, false);
-      cache.create();
-      cache.start();
-
-
-      return cache;
-   }
-
-   protected PojoCache createPessimisticCacheLocal() throws Exception
-   {
-      Configuration c =3D new Configuration();
-
-      c.setClusterName("name");
-      c.setStateRetrievalTimeout(5000);
-      c.setClusterConfig(getDefaultProperties());
-
-      c.setCacheMode(Configuration.CacheMode.LOCAL);
-      c.setIsolationLevel(IsolationLevel.REPEATABLE_READ);
-      c.setTransactionManagerLookupClass("org.jboss.cache.transaction.Dumm=
yTransactionManagerLookup");
-      PojoCache cache =3D PojoCacheFactory.createCache(c, false);
-      cache.create();
-      cache.start();
-
-      return cache;
-   }
-
-   protected String getDefaultProperties()
-   {
-      return "UDP(mcast_addr=3D228.1.2.3;mcast_port=3D48866;ip_ttl=3D32;" +
-              "mcast_send_buf_size=3D150000;mcast_recv_buf_size=3D80000;lo=
opback=3Dtrue;ip_mcast=3Dtrue;bind_addr=3D127.0.0.1):" +
-              "PING(timeout=3D1000;num_initial_members=3D2):" +
-              "MERGE2(min_interval=3D5000;max_interval=3D10000):" +
-              "FD_SOCK:" +
-              "VERIFY_SUSPECT(timeout=3D1500):" +
-              "pbcast.NAKACK(gc_lag=3D50;max_xmit_size=3D8192;retransmit_t=
imeout=3D600,1200,2400,4800):" +
-              "UNICAST(timeout=3D600,1200,2400,4800):" +
-              "pbcast.STABLE(desired_avg_gossip=3D20000):" +
-              "FRAG(frag_size=3D8192;down_thread=3Dfalse;up_thread=3Dfalse=
):" +
-              "pbcast.GMS(join_timeout=3D5000;join_retry_timeout=3D2000;" +
-              "shun=3Dfalse;print_local_addr=3Dtrue):" +
-              "pbcast.STATE_TRANSFER";
-   }
-
-   protected PojoCache createReplicatedCache(Configuration.CacheMode mode)=
 throws Exception
-   {
-      return createReplicatedCache("test", mode);
-   }
-
-   protected PojoCache createReplicatedCache(String name, Configuration.Ca=
cheMode mode) throws Exception
-   {
-      Configuration c =3D new Configuration();
-
-      c.setClusterName(name);
-      c.setStateRetrievalTimeout(5000);
-      c.setClusterConfig(getDefaultProperties());
-      c.setCacheMode(mode);
-      if (mode =3D=3D Configuration.CacheMode.REPL_SYNC)
-      {
-         // make sure commits and rollbacks are sync as well
-         c.setSyncCommitPhase(true);
-         c.setSyncRollbackPhase(true);
-      }
-      c.setNodeLockingScheme("OPTIMISTIC");
-      c.setTransactionManagerLookupClass("org.jboss.cache.transaction.Dumm=
yTransactionManagerLookup");
-      PojoCache cache =3D PojoCacheFactory.createCache(c, false);
-      cache.create();
-      cache.start();
-
-      return cache;
-   }
-
-   protected PojoCache createReplicatedCacheWithLoader(boolean shared, Con=
figuration.CacheMode cacheMode) throws Exception
-   {
-      return createReplicatedCacheWithLoader("temp-loader", shared, cacheM=
ode);
-   }
-
-   protected PojoCache createReplicatedCacheWithLoader(boolean shared) thr=
ows Exception
-   {
-      return createReplicatedCacheWithLoader("temp-loader", shared, Config=
uration.CacheMode.REPL_SYNC);
-   }
-
-   protected PojoCache createReplicatedCacheWithLoader(String name, boolea=
n shared) throws Exception
-   {
-      return createReplicatedCacheWithLoader(name, shared, Configuration.C=
acheMode.REPL_SYNC);
-   }
-
-   protected PojoCache createReplicatedCacheWithLoader(String name, boolea=
n shared, Configuration.CacheMode cacheMode) throws Exception
-   {
-      Configuration c =3D new Configuration();
-      c.setClusterName(name);
-      c.setStateRetrievalTimeout(5000);
-      c.setClusterConfig(getDefaultProperties());
-      c.setCacheMode(cacheMode);
-      c.setSyncCommitPhase(true);
-      c.setSyncRollbackPhase(true);
-      c.setNodeLockingScheme("OPTIMISTIC");
-      c.setTransactionManagerLookupClass("org.jboss.cache.transaction.Dumm=
yTransactionManagerLookup");
-      c.setCacheLoaderConfig(getCacheLoaderConfig(shared, shared ? getTemp=
Dir(name + "-shared") : getTempDir(name + instanceNumber++), false));
-
-      PojoCache cache =3D PojoCacheFactory.createCache(c, false);
-      cache.create();
-      cache.start();
-      return cache;
-   }
-
-   protected Random random;
-
-   protected void randomSleep(int min, int max)
-   {
-      if (random =3D=3D null) random =3D new Random();
-      long l =3D -1;
-      while (l < min) l =3D random.nextInt(max);
-      TestingUtil.sleepThread(l);
-   }
-
-   @AfterMethod(alwaysRun =3D true)
-   protected void tearDown()
-   {
-      TransactionManager mgr =3D DummyTransactionManager.getInstance();
-      try
-      {
-         if (mgr.getTransaction() !=3D null)
-         {
-            mgr.rollback();
-         }
-      }
-      catch (SystemException e)
-      {
-         // do nothing
-      }
-   }
-
-   protected Interceptor getAlteredInterceptorChain(Interceptor newLast, C=
acheSPI<Object, Object> spi, boolean replicated)
-   {
-      Interceptor ici =3D new InvocationContextInterceptor();
-      ici.setCache(spi);
-
-      Interceptor txInterceptor =3D new TxInterceptor();
-      txInterceptor.setCache(spi);
-
-      Interceptor replicationInterceptor =3D new OptimisticReplicationInte=
rceptor();
-      replicationInterceptor.setCache(spi);
-
-      Interceptor createInterceptor =3D new OptimisticCreateIfNotExistsInt=
erceptor();
-      createInterceptor.setCache(spi);
-
-      Interceptor nodeInterceptor =3D new OptimisticNodeInterceptor();
-      nodeInterceptor.setCache(spi);
-
-      ici.setNext(txInterceptor);
-      if (replicated)
-      {
-         txInterceptor.setNext(replicationInterceptor);
-         replicationInterceptor.setNext(createInterceptor);
-      }
-      else
-      {
-         txInterceptor.setNext(createInterceptor);
-      }
-      createInterceptor.setNext(nodeInterceptor);
-      nodeInterceptor.setNext(newLast);
-
-      return ici;
-   }
-
-   public abstract class ExceptionThread extends Thread
-   {
-      protected Exception exception;
-
-      public void setException(Exception e)
-      {
-         exception =3D e;
-      }
-
-      public Exception getException()
-      {
-         return exception;
-      }
-   }
-
-   protected List<MethodCall> injectDataVersion(List<MethodCall> modificat=
ions)
-   {
-      List<MethodCall> newList =3D new LinkedList<MethodCall>();
-      for (MethodCall c : modifications)
-      {
-         Object[] oa =3D c.getArgs();
-         Object[] na =3D new Object[oa.length + 1];
-         System.out.println("*** " + oa.length);
-         System.arraycopy(oa, 0, na, 0, oa.length);
-         na[oa.length] =3D new DefaultDataVersion();
-         newList.add(MethodCallFactory.create(MethodDeclarations.getVersio=
nedMethod(c.getMethodId()), na));
-      }
-      return newList;
-   }
-
-}

Copied: pojo/tags/2.1.0.CR3/src/test/java/org/jboss/cache/pojo/optimistic/A=
bstractOptimisticTestCase.java (from rev 5129, pojo/branches/2.1/src/test/j=
ava/org/jboss/cache/pojo/optimistic/AbstractOptimisticTestCase.java)
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- pojo/tags/2.1.0.CR3/src/test/java/org/jboss/cache/pojo/optimistic/Abstr=
actOptimisticTestCase.java	                        (rev 0)
+++ pojo/tags/2.1.0.CR3/src/test/java/org/jboss/cache/pojo/optimistic/Abstr=
actOptimisticTestCase.java	2008-01-16 00:43:28 UTC (rev 5140)
@@ -0,0 +1,378 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package org.jboss.cache.pojo.optimistic;
+
+import java.io.File;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Random;
+
+import javax.transaction.SystemException;
+import javax.transaction.TransactionManager;
+
+import org.jboss.cache.CacheSPI;
+import org.jboss.cache.Fqn;
+import org.jboss.cache.config.CacheLoaderConfig;
+import org.jboss.cache.config.Configuration;
+import org.jboss.cache.factories.XmlConfigurationParser;
+import org.jboss.cache.interceptors.Interceptor;
+import org.jboss.cache.interceptors.InvocationContextInterceptor;
+import org.jboss.cache.interceptors.OptimisticCreateIfNotExistsInterceptor;
+import org.jboss.cache.interceptors.OptimisticNodeInterceptor;
+import org.jboss.cache.interceptors.OptimisticReplicationInterceptor;
+import org.jboss.cache.interceptors.TxInterceptor;
+import org.jboss.cache.lock.IsolationLevel;
+import org.jboss.cache.marshall.MethodCall;
+import org.jboss.cache.marshall.MethodCallFactory;
+import org.jboss.cache.marshall.MethodDeclarations;
+import org.jboss.cache.misc.TestingUtil;
+import org.jboss.cache.optimistic.DefaultDataVersion;
+import org.jboss.cache.optimistic.TestListener;
+import org.jboss.cache.pojo.PojoCache;
+import org.jboss.cache.pojo.PojoCacheFactory;
+import org.jboss.cache.transaction.DummyTransactionManager;
+import org.jboss.cache.xml.XmlHelper;
+import org.testng.annotations.AfterMethod;
+import org.w3c.dom.Element;
+
+/**
+ * Base test for optimistic locking. Copied from Cache counterpart.
+ */
+public abstract class AbstractOptimisticTestCase
+{
+   private int instanceNumber;
+
+   // some test data shared among all the test cases
+   protected Fqn<String> fqn =3D Fqn.fromString("/blah");
+   protected String key =3D "myKey", value =3D "myValue";
+
+   protected String getTempDir()
+   {
+      return getTempDir("tempdir");
+   }
+
+   private String getTempDir(String name)
+   {
+      String tempDir =3D System.getProperty("java.io.tmpdir", "/tmp");
+      tempDir =3D tempDir + File.separator + name;
+      System.out.println("tmpdir property: " + System.getProperty("java.io=
.tmpdir"));
+      System.out.println("Attempting to create dir [" + tempDir + "]");
+      File tempDirFile =3D new File(tempDir);
+      if (!tempDirFile.exists())
+      {
+         tempDirFile.mkdirs();
+      }
+      return tempDir;
+   }
+
+   protected PojoCache createCacheUnstarted() throws Exception
+   {
+      return createCacheUnstarted(true);
+   }
+
+   protected PojoCache createCacheUnstarted(boolean optimistic) throws Exc=
eption
+   {
+      Configuration c =3D new Configuration();
+      if (optimistic) c.setNodeLockingScheme("OPTIMISTIC");
+
+      c.setTransactionManagerLookupClass("org.jboss.cache.transaction.Dumm=
yTransactionManagerLookup");
+      c.setCacheMode("LOCAL");
+      PojoCache cache =3D PojoCacheFactory.createCache(c, false);
+      return cache;
+   }
+
+   protected PojoCache createCacheWithListener() throws Exception
+   {
+      return createCacheWithListener(new TestListener());
+   }
+
+   protected PojoCache createCacheWithListener(Object listener) throws Exc=
eption
+   {
+      PojoCache cache =3D createCacheUnstarted();
+      cache.create();
+      cache.start();
+      cache.getCache().addCacheListener(listener);
+      return cache;
+   }
+
+   /**
+    * Returns a tree cache with passivation disabled in the loader.
+    *
+    * @return
+    * @throws Exception
+    */
+   protected PojoCache createCacheWithLoader() throws Exception
+   {
+      return createCacheWithLoader(false);
+   }
+
+   protected CacheLoaderConfig getCacheLoaderConfig(boolean shared, String=
 filename, boolean passivation) throws Exception
+   {
+      String xml =3D "            <config>\n" +
+              "                <passivation>" + passivation + "</passivati=
on>\n" +
+              "                <preload></preload>\n" +
+              "                <shared>" + shared + "</shared>\n" +
+              "                <cacheloader>\n" +
+              "                    <class>org.jboss.cache.loader.FileCache=
Loader</class>\n" +
+              "                    <properties>\n" +
+              "                    </properties>\n" +
+              "                    <async>false</async>\n" +
+              "                    <fetchPersistentState>" + (!shared) + "=
</fetchPersistentState>\n" +
+              "                    <ignoreModifications>false</ignoreModif=
ications>\n" +
+              "                </cacheloader>\n" +
+              "            </config>";
+      Element element =3D XmlHelper.stringToElement(xml);
+      return XmlConfigurationParser.parseCacheLoaderConfig(element);
+   }
+
+   protected PojoCache createCacheWithLoader(boolean passivationEnabled) t=
hrows Exception
+   {
+      PojoCache cache =3D createCacheUnstarted();
+      Configuration c =3D cache.getCache().getConfiguration();
+      c.setCacheLoaderConfig(getCacheLoaderConfig(true, getTempDir(), pass=
ivationEnabled));
+      cache.create();
+      cache.start();
+      return cache;
+   }
+
+   protected PojoCache createCache() throws Exception
+   {
+      PojoCache cache =3D createCacheUnstarted();
+      cache.create();
+      cache.start();
+      return cache;
+   }
+
+   protected void destroyCache(PojoCache c)
+   {
+      c.stop();
+      c.destroy();
+   }
+
+
+   protected PojoCache createPessimisticCache() throws Exception
+   {
+      Configuration c =3D new Configuration();
+      c.setClusterName("name");
+      c.setStateRetrievalTimeout(5000);
+      c.setClusterConfig(getDefaultProperties());
+      c.setCacheMode(Configuration.CacheMode.REPL_SYNC);
+      c.setIsolationLevel(IsolationLevel.REPEATABLE_READ);
+      c.setTransactionManagerLookupClass("org.jboss.cache.transaction.Dumm=
yTransactionManagerLookup");
+
+      PojoCache cache =3D PojoCacheFactory.createCache(c, false);
+      cache.create();
+      cache.start();
+
+
+      return cache;
+   }
+
+   protected PojoCache createPessimisticCacheLocal() throws Exception
+   {
+      Configuration c =3D new Configuration();
+
+      c.setClusterName("name");
+      c.setStateRetrievalTimeout(5000);
+      c.setClusterConfig(getDefaultProperties());
+
+      c.setCacheMode(Configuration.CacheMode.LOCAL);
+      c.setIsolationLevel(IsolationLevel.REPEATABLE_READ);
+      c.setTransactionManagerLookupClass("org.jboss.cache.transaction.Dumm=
yTransactionManagerLookup");
+      PojoCache cache =3D PojoCacheFactory.createCache(c, false);
+      cache.create();
+      cache.start();
+
+      return cache;
+   }
+
+   protected String getDefaultProperties()
+   {
+      return "UDP(mcast_addr=3D228.1.2.3;mcast_port=3D48866;ip_ttl=3D32;" +
+              "mcast_send_buf_size=3D150000;mcast_recv_buf_size=3D80000;lo=
opback=3Dtrue;ip_mcast=3Dtrue;bind_addr=3D127.0.0.1):" +
+              "PING(timeout=3D1000;num_initial_members=3D2):" +
+              "MERGE2(min_interval=3D5000;max_interval=3D10000):" +
+              "FD_SOCK:" +
+              "VERIFY_SUSPECT(timeout=3D1500):" +
+              "pbcast.NAKACK(gc_lag=3D50;max_xmit_size=3D8192;retransmit_t=
imeout=3D600,1200,2400,4800):" +
+              "UNICAST(timeout=3D600,1200,2400,4800):" +
+              "pbcast.STABLE(desired_avg_gossip=3D20000):" +
+              "FRAG(frag_size=3D8192;down_thread=3Dfalse;up_thread=3Dfalse=
):" +
+              "pbcast.GMS(join_timeout=3D5000;join_retry_timeout=3D2000;" +
+              "shun=3Dfalse;print_local_addr=3Dtrue):" +
+              "pbcast.STATE_TRANSFER";
+   }
+
+   protected PojoCache createReplicatedCache(Configuration.CacheMode mode)=
 throws Exception
+   {
+      return createReplicatedCache("test", mode);
+   }
+
+   protected PojoCache createReplicatedCache(String name, Configuration.Ca=
cheMode mode) throws Exception
+   {
+      Configuration c =3D new Configuration();
+
+      c.setClusterName(name);
+      c.setStateRetrievalTimeout(5000);
+      c.setClusterConfig(getDefaultProperties());
+      c.setCacheMode(mode);
+      if (mode =3D=3D Configuration.CacheMode.REPL_SYNC)
+      {
+         // make sure commits and rollbacks are sync as well
+         c.setSyncCommitPhase(true);
+         c.setSyncRollbackPhase(true);
+      }
+      c.setNodeLockingScheme("OPTIMISTIC");
+      c.setTransactionManagerLookupClass("org.jboss.cache.transaction.Dumm=
yTransactionManagerLookup");
+      PojoCache cache =3D PojoCacheFactory.createCache(c, false);
+      cache.create();
+      cache.start();
+
+      return cache;
+   }
+
+   protected PojoCache createReplicatedCacheWithLoader(boolean shared, Con=
figuration.CacheMode cacheMode) throws Exception
+   {
+      return createReplicatedCacheWithLoader("temp-loader", shared, cacheM=
ode);
+   }
+
+   protected PojoCache createReplicatedCacheWithLoader(boolean shared) thr=
ows Exception
+   {
+      return createReplicatedCacheWithLoader("temp-loader", shared, Config=
uration.CacheMode.REPL_SYNC);
+   }
+
+   protected PojoCache createReplicatedCacheWithLoader(String name, boolea=
n shared) throws Exception
+   {
+      return createReplicatedCacheWithLoader(name, shared, Configuration.C=
acheMode.REPL_SYNC);
+   }
+
+   protected PojoCache createReplicatedCacheWithLoader(String name, boolea=
n shared, Configuration.CacheMode cacheMode) throws Exception
+   {
+      Configuration c =3D new Configuration();
+      c.setClusterName(name);
+      c.setStateRetrievalTimeout(5000);
+      c.setClusterConfig(getDefaultProperties());
+      c.setCacheMode(cacheMode);
+      c.setSyncCommitPhase(true);
+      c.setSyncRollbackPhase(true);
+      c.setNodeLockingScheme("OPTIMISTIC");
+      c.setTransactionManagerLookupClass("org.jboss.cache.transaction.Dumm=
yTransactionManagerLookup");
+      c.setCacheLoaderConfig(getCacheLoaderConfig(shared, shared ? getTemp=
Dir(name + "-shared") : getTempDir(name + instanceNumber++), false));
+
+      PojoCache cache =3D PojoCacheFactory.createCache(c, false);
+      cache.create();
+      cache.start();
+      return cache;
+   }
+
+   protected Random random;
+
+   protected void randomSleep(int min, int max)
+   {
+      if (random =3D=3D null) random =3D new Random();
+      long l =3D -1;
+      while (l < min) l =3D random.nextInt(max);
+      TestingUtil.sleepThread(l);
+   }
+
+   @AfterMethod(alwaysRun =3D true)
+   protected void tearDown()
+   {
+      TransactionManager mgr =3D DummyTransactionManager.getInstance();
+      try
+      {
+         if (mgr.getTransaction() !=3D null)
+         {
+            mgr.rollback();
+         }
+      }
+      catch (SystemException e)
+      {
+         // do nothing
+      }
+   }
+
+   protected Interceptor getAlteredInterceptorChain(Interceptor newLast, C=
acheSPI<Object, Object> spi, boolean replicated)
+   {
+      Interceptor ici =3D new InvocationContextInterceptor();
+      ici.setCache(spi);
+
+      Interceptor txInterceptor =3D new TxInterceptor();
+      txInterceptor.setCache(spi);
+
+      Interceptor replicationInterceptor =3D new OptimisticReplicationInte=
rceptor();
+      replicationInterceptor.setCache(spi);
+
+      Interceptor createInterceptor =3D new OptimisticCreateIfNotExistsInt=
erceptor();
+      createInterceptor.setCache(spi);
+
+      Interceptor nodeInterceptor =3D new OptimisticNodeInterceptor();
+      nodeInterceptor.setCache(spi);
+
+      ici.setNext(txInterceptor);
+      if (replicated)
+      {
+         txInterceptor.setNext(replicationInterceptor);
+         replicationInterceptor.setNext(createInterceptor);
+      }
+      else
+      {
+         txInterceptor.setNext(createInterceptor);
+      }
+      createInterceptor.setNext(nodeInterceptor);
+      nodeInterceptor.setNext(newLast);
+
+      return ici;
+   }
+
+   public abstract class ExceptionThread extends Thread
+   {
+      protected Exception exception;
+
+      public void setException(Exception e)
+      {
+         exception =3D e;
+      }
+
+      public Exception getException()
+      {
+         return exception;
+      }
+   }
+
+   protected List<MethodCall> injectDataVersion(List<MethodCall> modificat=
ions)
+   {
+      List<MethodCall> newList =3D new LinkedList<MethodCall>();
+      for (MethodCall c : modifications)
+      {
+         Object[] oa =3D c.getArgs();
+         Object[] na =3D new Object[oa.length + 1];
+         System.out.println("*** " + oa.length);
+         System.arraycopy(oa, 0, na, 0, oa.length);
+         na[oa.length] =3D new DefaultDataVersion();
+         newList.add(MethodCallFactory.create(c.getMethodId(), na));
+      }
+      return newList;
+   }
+
+}

Deleted: pojo/tags/2.1.0.CR3/src/test/java/org/jboss/cache/pojo/region/Loca=
lConcurrentTest.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- pojo/branches/2.1/src/test/java/org/jboss/cache/pojo/region/LocalConcur=
rentTest.java	2007-11-26 18:16:13 UTC (rev 4776)
+++ pojo/tags/2.1.0.CR3/src/test/java/org/jboss/cache/pojo/region/LocalConc=
urrentTest.java	2008-01-16 00:43:28 UTC (rev 5140)
@@ -1,268 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- *
- * Distributable under LGPL license.
- * See terms of license at gnu.org.
- */
-
-package org.jboss.cache.pojo.region;
-
-import java.util.ArrayList;
-import java.util.Properties;
-import java.util.Random;
-
-import javax.naming.Context;
-import javax.naming.InitialContext;
-import javax.transaction.UserTransaction;
-
-import org.jboss.cache.Fqn;
-import org.jboss.cache.lock.UpgradeException;
-import org.jboss.cache.pojo.PojoCache;
-import org.jboss.cache.pojo.PojoCacheFactory;
-import org.jboss.cache.pojo.TestingUtil;
-import org.jboss.cache.pojo.test.Address;
-import org.jboss.cache.pojo.test.Person;
-import org.jboss.cache.transaction.DummyTransactionManager;
-import org.testng.annotations.AfterMethod;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.Test;
-
-/**
- * Local concurrent test for PojoCache. Test attach and detach under load
- * and concurrency.
- *
- * @version $Revision$
- * @author<a href=3D"mailto:bwang(a)jboss.org">Ben Wang</a> December 2004
- */
-(a)Test(groups =3D {"functional"}, enabled =3D false)
-public class LocalConcurrentTest =

-{
-   static PojoCache cache_;
-   Properties p_;
-   String oldFactory_ =3D null;
-   final String FACTORY =3D "org.jboss.cache.transaction.DummyContextFacto=
ry";
-   static ArrayList<String> nodeList_;
-   static final int depth_ =3D 2;
-   static final int children_ =3D 2;
-   static final int MAX_LOOP =3D 100;
-   static final int SLEEP_TIME =3D 50;
-   static Exception thread_ex =3D null;
-   UserTransaction tx_ =3D null;
-
-   @BeforeMethod(alwaysRun =3D true)
-   public void setUp() throws Exception
-   {
-      oldFactory_ =3D System.getProperty(Context.INITIAL_CONTEXT_FACTORY);
-      System.setProperty(Context.INITIAL_CONTEXT_FACTORY, FACTORY);
-      DummyTransactionManager.getInstance();
-      if (p_ =3D=3D null)
-      {
-         p_ =3D new Properties();
-         p_.put(Context.INITIAL_CONTEXT_FACTORY, "org.jboss.cache.transact=
ion.DummyContextFactory");
-      }
-
-      tx_ =3D (UserTransaction) new InitialContext(p_).lookup("UserTransac=
tion");
-
-      initCaches();
-      nodeList_ =3D nodeGen(depth_, children_);
-
-      log("LocalConcurrentTestCase: cacheMode=3DTRANSIENT, one cache");
-   }
-
-   @AfterMethod(alwaysRun =3D true)
-   public void tearDown() throws Exception
-   {
-      thread_ex =3D null;
-      DummyTransactionManager.destroy();
-      destroyCaches();
-
-      if (oldFactory_ !=3D null)
-      {
-         System.setProperty(Context.INITIAL_CONTEXT_FACTORY, oldFactory_);
-         oldFactory_ =3D null;
-      }
-
-   }
-
-   void initCaches() throws Exception
-   {
-      boolean toStart =3D false;
-      cache_ =3D PojoCacheFactory.createCache("META-INF/local-service.xml"=
, toStart);
-      cache_.start();
-   }
-
-   void destroyCaches() throws Exception
-   {
-      cache_.stop();
-      cache_ =3D null;
-   }
-
-   public void testAll_RWLock() throws Exception
-   {
-      try
-      {
-         all();
-      }
-      catch (UpgradeException ue)
-      {
-         log("Upgrade exception. Can ingore for repeatable read. " + ue);
-      }
-      catch (Exception ex)
-      {
-         log("Exception: " + ex);
-         throw ex;
-      }
-   }
-
-   private void all() throws Exception
-   {
-      RunThread t1 =3D new RunThread(1, "t1");
-      RunThread t2 =3D new RunThread(2, "t2");
-      RunThread t3 =3D new RunThread(3, "t3");
-      RunThread t4 =3D new RunThread(4, "t4");
-
-      t1.start();
-      TestingUtil.sleepThread(100);
-      t2.start();
-      TestingUtil.sleepThread(100);
-      t3.start();
-      TestingUtil.sleepThread(100);
-      t4.start();
-
-      t1.join(60000); // wait for 20 secs
-      t2.join(60000); // wait for 20 secs
-      t3.join(60000); // wait for 20 secs
-      t4.join(60000); // wait for 20 secs
-
-      if (thread_ex !=3D null)
-         throw thread_ex;
-   }
-
-   class RunThread extends Thread
-   {
-      final int seed_;
-      Random random_;
-      Person person_;
-
-      public RunThread(int seed, String threadName)
-      {
-         super(threadName);
-         seed_ =3D seed;
-         random_ =3D new Random(seed);
-      }
-
-      private void createPerson()
-      {
-         person_ =3D new Person();
-         person_.setName("Ben");
-         person_.setAge(18);
-         ArrayList<String> lang =3D new ArrayList<String>();
-         lang.add("English");
-         lang.add("French");
-         lang.add("Mandarin");
-         person_.setLanguages(lang);
-         Address addr =3D new Address();
-         addr.setZip(95123);
-         addr.setStreet("Almeria");
-         addr.setCity("San Jose");
-         person_.setAddress(addr);
-      }
-
-      public void run()
-      {
-         try
-         {
-            cache_.getCache().getRegion(Fqn.fromString(Thread.currentThrea=
d().getName()), true);
-            _run();
-         }
-         catch (Exception e)
-         {
-            thread_ex =3D e;
-         }
-      }
-
-      /**
-       */
-      public void _run() throws Exception
-      {
-         for (int loop =3D 0; loop < MAX_LOOP; loop++)
-         {
-            createPerson();   // create a new person instance every loop.
-            op1();
-         }
-      }
-
-      // Operation 1
-      private void op1()
-      {
-         int i =3D random_.nextInt(nodeList_.size() - 1);
-         if (i =3D=3D 0) return; // it is meaningless to test root
-         String node =3D nodeList_.get(i) + "/aop";
-         cache_.attach(node, person_);
-         TestingUtil.sleepThread(random_.nextInt(SLEEP_TIME)); // sleep fo=
r max 200 millis
-         TestingUtil.sleepThread(random_.nextInt(SLEEP_TIME)); // sleep fo=
r max 200 millis
-         cache_.detach(node);
-      }
-   }
-
-   /**
-    * Generate the tree nodes quasi-exponentially. I.e., depth is the level
-    * of the hierarchy and children is the number of children under each n=
ode.
-    * This strucutre is used to add, get, and remove for each node.
-    */
-   private ArrayList<String> nodeGen(int depth, int children)
-   {
-      ArrayList<String> strList =3D new ArrayList<String>();
-      ArrayList<String> oldList =3D new ArrayList<String>();
-      ArrayList<String> newList =3D new ArrayList<String>();
-
-      // Skip root node
-      String str =3D Thread.currentThread().getName();
-      oldList.add(str);
-      newList.add(str);
-      strList.add(str);
-
-      while (depth > 0)
-      {
-         // Trying to produce node name at this depth.
-         newList =3D new ArrayList<String>();
-         for (int i =3D 0; i < oldList.size(); i++)
-         {
-            for (int j =3D 0; j < children; j++)
-            {
-               String tmp =3D oldList.get(i);
-               tmp +=3D Integer.toString(j);
-               if (depth !=3D 1)
-               {
-                  tmp +=3D "/";
-               }
-
-               newList.add(tmp);
-            }
-         }
-         strList.addAll(newList);
-         oldList =3D newList;
-         depth--;
-      }
-
-      // let's prune out root node
-      for (int i =3D 0; i < strList.size(); i++)
-      {
-         if (strList.get(i).equals("/"))
-         {
-            strList.remove(i);
-            break;
-         }
-      }
-      log("Nodes generated: " + strList.size());
-      return strList;
-   }
-
-
-   private static void log(String str)
-   {
-      System.out.println("Thread: " + Thread.currentThread() + ": " + str);
-//        System.out.println(str);
-   }
-
-}

Copied: pojo/tags/2.1.0.CR3/src/test/java/org/jboss/cache/pojo/region/Local=
ConcurrentTest.java (from rev 5129, pojo/branches/2.1/src/test/java/org/jbo=
ss/cache/pojo/region/LocalConcurrentTest.java)
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- pojo/tags/2.1.0.CR3/src/test/java/org/jboss/cache/pojo/region/LocalConc=
urrentTest.java	                        (rev 0)
+++ pojo/tags/2.1.0.CR3/src/test/java/org/jboss/cache/pojo/region/LocalConc=
urrentTest.java	2008-01-16 00:43:28 UTC (rev 5140)
@@ -0,0 +1,268 @@
+/*
+ * JBoss, Home of Professional Open Source
+ *
+ * Distributable under LGPL license.
+ * See terms of license at gnu.org.
+ */
+
+package org.jboss.cache.pojo.region;
+
+import java.util.ArrayList;
+import java.util.Properties;
+import java.util.Random;
+
+import javax.naming.Context;
+import javax.naming.InitialContext;
+import javax.transaction.UserTransaction;
+
+import org.jboss.cache.Fqn;
+import org.jboss.cache.lock.UpgradeException;
+import org.jboss.cache.misc.TestingUtil;
+import org.jboss.cache.pojo.PojoCache;
+import org.jboss.cache.pojo.PojoCacheFactory;
+import org.jboss.cache.pojo.test.Address;
+import org.jboss.cache.pojo.test.Person;
+import org.jboss.cache.transaction.DummyTransactionManager;
+import org.testng.annotations.AfterMethod;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.Test;
+
+/**
+ * Local concurrent test for PojoCache. Test attach and detach under load
+ * and concurrency.
+ *
+ * @version $Revision$
+ * @author<a href=3D"mailto:bwang(a)jboss.org">Ben Wang</a> December 2004
+ */
+(a)Test(groups =3D {"functional"}, enabled =3D false)
+public class LocalConcurrentTest =

+{
+   static PojoCache cache_;
+   Properties p_;
+   String oldFactory_ =3D null;
+   final String FACTORY =3D "org.jboss.cache.transaction.DummyContextFacto=
ry";
+   static ArrayList<String> nodeList_;
+   static final int depth_ =3D 2;
+   static final int children_ =3D 2;
+   static final int MAX_LOOP =3D 100;
+   static final int SLEEP_TIME =3D 50;
+   static Exception thread_ex =3D null;
+   UserTransaction tx_ =3D null;
+
+   @BeforeMethod(alwaysRun =3D true)
+   public void setUp() throws Exception
+   {
+      oldFactory_ =3D System.getProperty(Context.INITIAL_CONTEXT_FACTORY);
+      System.setProperty(Context.INITIAL_CONTEXT_FACTORY, FACTORY);
+      DummyTransactionManager.getInstance();
+      if (p_ =3D=3D null)
+      {
+         p_ =3D new Properties();
+         p_.put(Context.INITIAL_CONTEXT_FACTORY, "org.jboss.cache.transact=
ion.DummyContextFactory");
+      }
+
+      tx_ =3D (UserTransaction) new InitialContext(p_).lookup("UserTransac=
tion");
+
+      initCaches();
+      nodeList_ =3D nodeGen(depth_, children_);
+
+      log("LocalConcurrentTestCase: cacheMode=3DTRANSIENT, one cache");
+   }
+
+   @AfterMethod(alwaysRun =3D true)
+   public void tearDown() throws Exception
+   {
+      thread_ex =3D null;
+      DummyTransactionManager.destroy();
+      destroyCaches();
+
+      if (oldFactory_ !=3D null)
+      {
+         System.setProperty(Context.INITIAL_CONTEXT_FACTORY, oldFactory_);
+         oldFactory_ =3D null;
+      }
+
+   }
+
+   void initCaches() throws Exception
+   {
+      boolean toStart =3D false;
+      cache_ =3D PojoCacheFactory.createCache("META-INF/local-service.xml"=
, toStart);
+      cache_.start();
+   }
+
+   void destroyCaches() throws Exception
+   {
+      cache_.stop();
+      cache_ =3D null;
+   }
+
+   public void testAll_RWLock() throws Exception
+   {
+      try
+      {
+         all();
+      }
+      catch (UpgradeException ue)
+      {
+         log("Upgrade exception. Can ingore for repeatable read. " + ue);
+      }
+      catch (Exception ex)
+      {
+         log("Exception: " + ex);
+         throw ex;
+      }
+   }
+
+   private void all() throws Exception
+   {
+      RunThread t1 =3D new RunThread(1, "t1");
+      RunThread t2 =3D new RunThread(2, "t2");
+      RunThread t3 =3D new RunThread(3, "t3");
+      RunThread t4 =3D new RunThread(4, "t4");
+
+      t1.start();
+      TestingUtil.sleepThread(100);
+      t2.start();
+      TestingUtil.sleepThread(100);
+      t3.start();
+      TestingUtil.sleepThread(100);
+      t4.start();
+
+      t1.join(60000); // wait for 20 secs
+      t2.join(60000); // wait for 20 secs
+      t3.join(60000); // wait for 20 secs
+      t4.join(60000); // wait for 20 secs
+
+      if (thread_ex !=3D null)
+         throw thread_ex;
+   }
+
+   class RunThread extends Thread
+   {
+      final int seed_;
+      Random random_;
+      Person person_;
+
+      public RunThread(int seed, String threadName)
+      {
+         super(threadName);
+         seed_ =3D seed;
+         random_ =3D new Random(seed);
+      }
+
+      private void createPerson()
+      {
+         person_ =3D new Person();
+         person_.setName("Ben");
+         person_.setAge(18);
+         ArrayList<String> lang =3D new ArrayList<String>();
+         lang.add("English");
+         lang.add("French");
+         lang.add("Mandarin");
+         person_.setLanguages(lang);
+         Address addr =3D new Address();
+         addr.setZip(95123);
+         addr.setStreet("Almeria");
+         addr.setCity("San Jose");
+         person_.setAddress(addr);
+      }
+
+      public void run()
+      {
+         try
+         {
+            cache_.getCache().getRegion(Fqn.fromString(Thread.currentThrea=
d().getName()), true);
+            _run();
+         }
+         catch (Exception e)
+         {
+            thread_ex =3D e;
+         }
+      }
+
+      /**
+       */
+      public void _run() throws Exception
+      {
+         for (int loop =3D 0; loop < MAX_LOOP; loop++)
+         {
+            createPerson();   // create a new person instance every loop.
+            op1();
+         }
+      }
+
+      // Operation 1
+      private void op1()
+      {
+         int i =3D random_.nextInt(nodeList_.size() - 1);
+         if (i =3D=3D 0) return; // it is meaningless to test root
+         String node =3D nodeList_.get(i) + "/aop";
+         cache_.attach(node, person_);
+         TestingUtil.sleepThread(random_.nextInt(SLEEP_TIME)); // sleep fo=
r max 200 millis
+         TestingUtil.sleepThread(random_.nextInt(SLEEP_TIME)); // sleep fo=
r max 200 millis
+         cache_.detach(node);
+      }
+   }
+
+   /**
+    * Generate the tree nodes quasi-exponentially. I.e., depth is the level
+    * of the hierarchy and children is the number of children under each n=
ode.
+    * This strucutre is used to add, get, and remove for each node.
+    */
+   private ArrayList<String> nodeGen(int depth, int children)
+   {
+      ArrayList<String> strList =3D new ArrayList<String>();
+      ArrayList<String> oldList =3D new ArrayList<String>();
+      ArrayList<String> newList =3D new ArrayList<String>();
+
+      // Skip root node
+      String str =3D Thread.currentThread().getName();
+      oldList.add(str);
+      newList.add(str);
+      strList.add(str);
+
+      while (depth > 0)
+      {
+         // Trying to produce node name at this depth.
+         newList =3D new ArrayList<String>();
+         for (int i =3D 0; i < oldList.size(); i++)
+         {
+            for (int j =3D 0; j < children; j++)
+            {
+               String tmp =3D oldList.get(i);
+               tmp +=3D Integer.toString(j);
+               if (depth !=3D 1)
+               {
+                  tmp +=3D "/";
+               }
+
+               newList.add(tmp);
+            }
+         }
+         strList.addAll(newList);
+         oldList =3D newList;
+         depth--;
+      }
+
+      // let's prune out root node
+      for (int i =3D 0; i < strList.size(); i++)
+      {
+         if (strList.get(i).equals("/"))
+         {
+            strList.remove(i);
+            break;
+         }
+      }
+      log("Nodes generated: " + strList.size());
+      return strList;
+   }
+
+
+   private static void log(String str)
+   {
+      System.out.println("Thread: " + Thread.currentThread() + ": " + str);
+//        System.out.println(str);
+   }
+
+}

Deleted: pojo/tags/2.1.0.CR3/src/test/java/org/jboss/cache/pojo/region/Loca=
lTest.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- pojo/branches/2.1/src/test/java/org/jboss/cache/pojo/region/LocalTest.j=
ava	2007-11-26 18:16:13 UTC (rev 4776)
+++ pojo/tags/2.1.0.CR3/src/test/java/org/jboss/cache/pojo/region/LocalTest=
.java	2008-01-16 00:43:28 UTC (rev 5140)
@@ -1,374 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- *
- * Distributable under LGPL license.
- * See terms of license at gnu.org.
- */
-
-package org.jboss.cache.pojo.region;
-
-import static org.testng.AssertJUnit.assertEquals;
-import static org.testng.AssertJUnit.assertNull;
-import static org.testng.AssertJUnit.assertTrue;
-import static org.testng.AssertJUnit.fail;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.jboss.aop.proxy.ClassProxy;
-import org.jboss.cache.CacheImpl;
-import org.jboss.cache.Fqn;
-import org.jboss.cache.Node;
-import org.jboss.cache.pojo.PojoCache;
-import org.jboss.cache.pojo.PojoCacheFactory;
-import org.jboss.cache.pojo.impl.InternalConstant;
-import org.jboss.cache.pojo.test.Address;
-import org.jboss.cache.pojo.test.Person;
-import org.jboss.cache.pojo.test.Student;
-import org.testng.annotations.AfterMethod;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.Test;
-
-/**
- * Basic PojoCache test case.
- *
- * @author Ben Wang
- */
-
-(a)Test(groups =3D {"functional"})
-public class LocalTest
-{
-   Log log =3D LogFactory.getLog(org.jboss.cache.pojo.region.LocalTest.cla=
ss);
-   PojoCache cache_;
-   static final String REGION =3D "person";
-
-
-   @BeforeMethod(alwaysRun =3D true)
-   protected void setUp() throws Exception
-   {
-      log.info("setUp() ....");
-      String configFile =3D "META-INF/local-service.xml";
-      boolean toStart =3D false;
-      cache_ =3D PojoCacheFactory.createCache(configFile, toStart);
-      cache_.start();
-      cache_.getCache().getRegion(Fqn.fromString(REGION), true);
-      cache_.getCache().getRegion(Fqn.fromString("RANDOM"), true);
-   }
-
-   @AfterMethod(alwaysRun =3D true)
-   protected void tearDown() throws Exception
-   {
-      cache_.stop();
-   }
-
-//   public void testDummy() {}
-
-   private Person createPerson(String id, String name, int age)
-   {
-      Person p =3D new Person();
-      p.setName(name);
-      p.setAge(age);
-      Address add =3D new Address();
-      add.setZip(95123);
-      add.setCity("San Jose");
-      p.setAddress(add);
-      cache_.attach(id, p);
-      return p;
-   }
-
-   private Student createStudent(String id, String name, int age, String g=
rade)
-   {
-      Student p =3D new Student();
-      p.setName(name);
-      p.setAge(age);
-      p.setYear(grade);
-      Address add =3D new Address();
-      add.setZip(95123);
-      add.setCity("San Jose");
-      p.setAddress(add);
-      cache_.attach(id, p);
-      return p;
-   }
-
-   public void testSimple() throws Exception
-   {
-      log.info("testSimple() ....");
-      Person p =3D createPerson("person/test1", "Joe Black", 32);
-      assertEquals((Object) "Joe Black", p.getName());
-
-      assertTrue("Region node should exist ",
-              cache_.getCache().getRoot().hasChild(new Fqn<String>(REGION)=
));
-      Fqn<String> fqn =3D new Fqn<String>(Fqn.fromString(REGION), Internal=
Constant.JBOSS_INTERNAL);
-      assertTrue("Internal region node should exist ",
-              cache_.getCache().getRoot().hasChild(fqn));
-      System.out.println("Cache content: " +((org.jboss.cache.CacheImpl<Ob=
ject, Object>)cache_.getCache()).printDetails());
-   }
-
-   public void testModification() throws Exception
-   {
-      Person joe =3D createPerson("person/test2", "Joe", 32);
-      joe.setName("Joe Black");
-      assertEquals(joe.getName(), "Joe Black");
-      cache_.detach("person/test2");
-   }
-
-   public void testRemove() throws Exception
-   {
-      createPerson("person/test3", "Joe", 32);
-      cache_.detach("person/test3");
-
-      String str =3D ((CacheImpl<Object, Object>) cache_.getCache()).print=
Details();
-      System.out.println("**** Details ***/n" + str);
-
-      Fqn<String> fqn =3D new Fqn<String>(Fqn.fromString(REGION), Internal=
Constant.JBOSS_INTERNAL);
-      Node<Object, Object> n =3D cache_.getCache().getRoot().getChild(fqn);
-      assertTrue("Internal region node should not exist ",
-              n.getChildren() !=3D null);
-   }
-
-   public void testDynamicRefSwapping() throws Exception
-   {
-      Person person =3D createPerson("person/test3", "Joe", 32);
-      try
-      {
-         person.setAge(30);
-         List<String> med =3D person.getMedication();
-         assertNull("Medication should be null ", med);
-         person.setAge(60);
-         med =3D person.getMedication();
-         assertEquals("Medication ", (Object) "Lipitor", (Object) med.get(=
0));
-      }
-      catch (Exception e)
-      {
-         // should be thrown
-      }
-   }
-
-   public void testMap() throws Exception
-   {
-      log.info("testMap() ....");
-      Person ben =3D createPerson("person/test1", "Ben Wang", 40);
-      assertEquals((Object) "Ben Wang", ben.getName());
-      Map<String, String> hobbies =3D ben.getHobbies();
-      if (hobbies =3D=3D null)
-      {
-         hobbies =3D new HashMap<String, String>();
-         ben.setHobbies(hobbies);
-         // NB: it is neccessary to get hobbies again to get advised versi=
on
-         hobbies =3D ben.getHobbies();
-      }
-      hobbies.put("1", "English");
-      hobbies.put("2", "French");
-      if (!(hobbies instanceof ClassProxy))
-      {
-         fail("Hobbies is not an instance of ClassProxy");
-      }
-
-      hobbies =3D ben.getHobbies();
-      assertEquals("Hobbies size", 2, hobbies.size());
-      log.debug("Hobbies is " + hobbies.toString());
-   }
-
-   public void testMapDetachAttach() throws Exception
-   {
-      log.info("testMapDetachATtach() ....");
-      Person ben =3D createPerson("person/test1", "Ben Wang", 40);
-      assertEquals((Object) "Ben Wang", ben.getName());
-      Map<String, String> hobbies =3D ben.getHobbies();
-      if (hobbies =3D=3D null)
-      {
-         hobbies =3D new HashMap<String, String>();
-         ben.setHobbies(hobbies);
-         // NB: it is neccessary to get hobbies again to get advised versi=
on
-         hobbies =3D ben.getHobbies();
-      }
-      hobbies.put("1", "English");
-      hobbies.put("2", "French");
-      if (!(hobbies instanceof ClassProxy))
-      {
-         fail("Hobbies is not an instance of ClassProxy");
-      }
-
-      hobbies =3D ben.getHobbies();
-      assertEquals("Hobbies size", 2, hobbies.size());
-      log.debug("Hobbies is " + hobbies.toString());
-
-      cache_.detach("person/test1");
-
-      Fqn<String> fqn =3D new Fqn<String>(Fqn.fromString(REGION), Internal=
Constant.JBOSS_INTERNAL);
-      Node<Object, Object> n =3D cache_.getCache().getRoot().getChild(fqn);
-      assertTrue("Internal region node should not exist ",
-              n.getChildren() !=3D null);
-
-      hobbies =3D ben.getHobbies();
-      if ((hobbies instanceof ClassProxy))
-      {
-         fail("Hobbies should not be an instance of ClassProxy");
-      }
-
-      cache_.attach("person/1", ben);
-
-   }
-
-   public void testMap2() throws Throwable
-   {
-      Person joe =3D createPerson("person/test5", "Joe Black", 32);
-      Map<String, String> hobby =3D new HashMap<String, String>();
-      hobby.put("music", "guitar");
-      joe.setHobbies(hobby);
-      Object val =3D joe.getHobbies().get("music");
-      assertEquals("guitar", val);
-      hobby =3D joe.getHobbies();
-      hobby.put("novel", "English");
-      assertEquals("Size of map ", 2, joe.getHobbies().size());
-   }
-
-   public void testList() throws Throwable
-   {
-      Person joe =3D createPerson("person/test6", "Joe", 50);
-      List<String> language =3D new ArrayList<String>();
-      language.add("German");
-      language.add("English");
-      language.add("French");
-      joe.setLanguages(language);
-
-      assertEquals("Size of language ", 3, joe.getLanguages().size());
-      language =3D joe.getLanguages();
-      language.add("Mandarin");
-      language.add("Taiwanese");
-      language.add("Haka");
-      assertEquals("Size of language ", 6, joe.getLanguages().size());
-
-      String English =3D (String) language.get(1);
-      assertEquals((Object) "English", English);
-      cache_.detach("person/test6");
-   }
-
-   public void testListDetachAndAttach() throws Throwable
-   {
-      String id =3D "person/test6";
-      Person joe =3D new Person();
-      List<String> language =3D new ArrayList<String>();
-      language.add("German");
-      language.add("English");
-      language.add("French");
-      joe.setLanguages(language);
-
-      cache_.attach(id, joe);
-
-      cache_.detach(id);
-      joe.getAge();
-      cache_.attach(id, joe);
-   }
-
-   public void testListDetachAndAttach2() throws Throwable
-   {
-      String id =3D "person/test6";
-      Person joe =3D createPerson(id, "Joe", 50);
-      List<String> language =3D new ArrayList<String>();
-      language.add("German");
-      language.add("English");
-      language.add("French");
-      joe.setLanguages(language);
-
-      assertEquals("Size of language ", 3, joe.getLanguages().size());
-      language =3D joe.getLanguages();
-      language.add("Mandarin");
-      language.add("Taiwanese");
-      language.add("Haka");
-      assertEquals("Size of language ", 6, joe.getLanguages().size());
-
-      String English =3D (String) language.get(1);
-      assertEquals((Object) "English", English);
-
-      if (!(language instanceof ClassProxy))
-      {
-         fail("Language is not an instance of ClassProxy");
-      }
-
-      cache_.detach(id);
-      joe.getAge();
-      language =3D joe.getLanguages();
-      if ((language instanceof ClassProxy))
-      {
-         fail("Language is an instance of ClassProxy");
-      }
-
-      cache_.attach(id, joe);
-   }
-
-   public void testSet() throws Throwable
-   {
-      Person joe =3D createPerson("person/test7", "Joe", 27);
-      Set<String> skill =3D new HashSet<String>();
-      skill.add("Java");
-      skill.add("Java");
-      skill.add("Java");
-      joe.setSkills(skill);
-      skill =3D joe.getSkills();
-      assertEquals("Size of skill ", 1, skill.size());
-
-      skill.remove("Java");
-      assertTrue(skill.isEmpty());
-      skill.add("Java");
-      skill.add("J2EE");
-      skill.add("JBoss");
-      assertEquals(new Integer(3), new Integer(skill.size()));
-   }
-
-   public void testSetDetachAttach() throws Throwable
-   {
-      String id =3D "person/test7";
-      Person joe =3D createPerson(id, "Joe", 27);
-      Set<String> skill =3D new HashSet<String>();
-      skill.add("Java");
-      skill.add("Java");
-      skill.add("Java");
-      joe.setSkills(skill);
-      skill =3D joe.getSkills();
-      assertEquals("Size of skill ", 1, skill.size());
-
-      skill.remove("Java");
-      assertTrue(skill.isEmpty());
-      skill.add("Java");
-      skill.add("J2EE");
-      skill.add("JBoss");
-      assertEquals(new Integer(3), new Integer(skill.size()));
-
-      if (!(skill instanceof ClassProxy))
-      {
-         fail("Skill is not an instance of ClassProxy");
-      }
-
-      cache_.detach(id);
-      joe.getAge();
-      skill =3D joe.getSkills();
-      if ((skill instanceof ClassProxy))
-      {
-         fail("Skill is an instance of ClassProxy");
-      }
-
-      cache_.attach(id, joe);
-   }
-
-   public void testInheritance() throws Exception
-   {
-      Student joe =3D createStudent("person/joe", "Joe", 32, "Senior");
-      joe.setName("Joe Black");
-      assertEquals(joe.getName(), "Joe Black");
-      joe.setYear("Junior");
-      assertEquals(joe.getYear(), "Junior");
-      cache_.detach("person/joe");
-   }
-
-
-
-
-
-}

Copied: pojo/tags/2.1.0.CR3/src/test/java/org/jboss/cache/pojo/region/Local=
Test.java (from rev 5129, pojo/branches/2.1/src/test/java/org/jboss/cache/p=
ojo/region/LocalTest.java)
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- pojo/tags/2.1.0.CR3/src/test/java/org/jboss/cache/pojo/region/LocalTest=
.java	                        (rev 0)
+++ pojo/tags/2.1.0.CR3/src/test/java/org/jboss/cache/pojo/region/LocalTest=
.java	2008-01-16 00:43:28 UTC (rev 5140)
@@ -0,0 +1,374 @@
+/*
+ * JBoss, Home of Professional Open Source
+ *
+ * Distributable under LGPL license.
+ * See terms of license at gnu.org.
+ */
+
+package org.jboss.cache.pojo.region;
+
+import static org.testng.AssertJUnit.assertEquals;
+import static org.testng.AssertJUnit.assertNull;
+import static org.testng.AssertJUnit.assertTrue;
+import static org.testng.AssertJUnit.fail;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.jboss.aop.proxy.ClassProxy;
+import org.jboss.cache.CacheImpl;
+import org.jboss.cache.Fqn;
+import org.jboss.cache.Node;
+import org.jboss.cache.pojo.PojoCache;
+import org.jboss.cache.pojo.PojoCacheFactory;
+import org.jboss.cache.pojo.impl.InternalConstant;
+import org.jboss.cache.pojo.test.Address;
+import org.jboss.cache.pojo.test.Person;
+import org.jboss.cache.pojo.test.Student;
+import org.testng.annotations.AfterMethod;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.Test;
+
+/**
+ * Basic PojoCache test case.
+ *
+ * @author Ben Wang
+ */
+
+(a)Test(groups =3D {"functional"})
+public class LocalTest
+{
+   Log log =3D LogFactory.getLog(org.jboss.cache.pojo.region.LocalTest.cla=
ss);
+   PojoCache cache_;
+   static final String REGION =3D "person";
+
+
+   @BeforeMethod(alwaysRun =3D true)
+   protected void setUp() throws Exception
+   {
+      log.info("setUp() ....");
+      String configFile =3D "META-INF/local-service.xml";
+      boolean toStart =3D false;
+      cache_ =3D PojoCacheFactory.createCache(configFile, toStart);
+      cache_.start();
+      cache_.getCache().getRegion(Fqn.fromString(REGION), true);
+      cache_.getCache().getRegion(Fqn.fromString("RANDOM"), true);
+   }
+
+   @AfterMethod(alwaysRun =3D true)
+   protected void tearDown() throws Exception
+   {
+      cache_.stop();
+   }
+
+//   public void testDummy() {}
+
+   private Person createPerson(String id, String name, int age)
+   {
+      Person p =3D new Person();
+      p.setName(name);
+      p.setAge(age);
+      Address add =3D new Address();
+      add.setZip(95123);
+      add.setCity("San Jose");
+      p.setAddress(add);
+      cache_.attach(id, p);
+      return p;
+   }
+
+   private Student createStudent(String id, String name, int age, String g=
rade)
+   {
+      Student p =3D new Student();
+      p.setName(name);
+      p.setAge(age);
+      p.setYear(grade);
+      Address add =3D new Address();
+      add.setZip(95123);
+      add.setCity("San Jose");
+      p.setAddress(add);
+      cache_.attach(id, p);
+      return p;
+   }
+
+   public void testSimple() throws Exception
+   {
+      log.info("testSimple() ....");
+      Person p =3D createPerson("person/test1", "Joe Black", 32);
+      assertEquals((Object) "Joe Black", p.getName());
+
+      assertTrue("Region node should exist ",
+              cache_.getCache().getRoot().hasChild(new Fqn<String>(REGION)=
));
+      Fqn<String> fqn =3D new Fqn<String>(Fqn.fromString(REGION), Internal=
Constant.JBOSS_INTERNAL);
+      assertTrue("Internal region node should exist ",
+              cache_.getCache().getRoot().hasChild(fqn));
+      //System.out.println("Cache content: " +((org.jboss.cache.CacheImpl<=
Object, Object>)cache_.getCache()).printDetails());
+   }
+
+   public void testModification() throws Exception
+   {
+      Person joe =3D createPerson("person/test2", "Joe", 32);
+      joe.setName("Joe Black");
+      assertEquals(joe.getName(), "Joe Black");
+      cache_.detach("person/test2");
+   }
+
+   public void testRemove() throws Exception
+   {
+      createPerson("person/test3", "Joe", 32);
+      cache_.detach("person/test3");
+
+      //String str =3D ((CacheImpl<Object, Object>) cache_.getCache()).pri=
ntDetails();
+      //System.out.println("**** Details ***/n" + str);
+
+      Fqn<String> fqn =3D new Fqn<String>(Fqn.fromString(REGION), Internal=
Constant.JBOSS_INTERNAL);
+      Node<Object, Object> n =3D cache_.getCache().getRoot().getChild(fqn);
+      assertTrue("Internal region node should not exist ",
+              n.getChildren() !=3D null);
+   }
+
+   public void testDynamicRefSwapping() throws Exception
+   {
+      Person person =3D createPerson("person/test3", "Joe", 32);
+      try
+      {
+         person.setAge(30);
+         List<String> med =3D person.getMedication();
+         assertNull("Medication should be null ", med);
+         person.setAge(60);
+         med =3D person.getMedication();
+         assertEquals("Medication ", (Object) "Lipitor", (Object) med.get(=
0));
+      }
+      catch (Exception e)
+      {
+         // should be thrown
+      }
+   }
+
+   public void testMap() throws Exception
+   {
+      log.info("testMap() ....");
+      Person ben =3D createPerson("person/test1", "Ben Wang", 40);
+      assertEquals((Object) "Ben Wang", ben.getName());
+      Map<String, String> hobbies =3D ben.getHobbies();
+      if (hobbies =3D=3D null)
+      {
+         hobbies =3D new HashMap<String, String>();
+         ben.setHobbies(hobbies);
+         // NB: it is neccessary to get hobbies again to get advised versi=
on
+         hobbies =3D ben.getHobbies();
+      }
+      hobbies.put("1", "English");
+      hobbies.put("2", "French");
+      if (!(hobbies instanceof ClassProxy))
+      {
+         fail("Hobbies is not an instance of ClassProxy");
+      }
+
+      hobbies =3D ben.getHobbies();
+      assertEquals("Hobbies size", 2, hobbies.size());
+      log.debug("Hobbies is " + hobbies.toString());
+   }
+
+   public void testMapDetachAttach() throws Exception
+   {
+      log.info("testMapDetachATtach() ....");
+      Person ben =3D createPerson("person/test1", "Ben Wang", 40);
+      assertEquals((Object) "Ben Wang", ben.getName());
+      Map<String, String> hobbies =3D ben.getHobbies();
+      if (hobbies =3D=3D null)
+      {
+         hobbies =3D new HashMap<String, String>();
+         ben.setHobbies(hobbies);
+         // NB: it is neccessary to get hobbies again to get advised versi=
on
+         hobbies =3D ben.getHobbies();
+      }
+      hobbies.put("1", "English");
+      hobbies.put("2", "French");
+      if (!(hobbies instanceof ClassProxy))
+      {
+         fail("Hobbies is not an instance of ClassProxy");
+      }
+
+      hobbies =3D ben.getHobbies();
+      assertEquals("Hobbies size", 2, hobbies.size());
+      log.debug("Hobbies is " + hobbies.toString());
+
+      cache_.detach("person/test1");
+
+      Fqn<String> fqn =3D new Fqn<String>(Fqn.fromString(REGION), Internal=
Constant.JBOSS_INTERNAL);
+      Node<Object, Object> n =3D cache_.getCache().getRoot().getChild(fqn);
+      assertTrue("Internal region node should not exist ",
+              n.getChildren() !=3D null);
+
+      hobbies =3D ben.getHobbies();
+      if ((hobbies instanceof ClassProxy))
+      {
+         fail("Hobbies should not be an instance of ClassProxy");
+      }
+
+      cache_.attach("person/1", ben);
+
+   }
+
+   public void testMap2() throws Throwable
+   {
+      Person joe =3D createPerson("person/test5", "Joe Black", 32);
+      Map<String, String> hobby =3D new HashMap<String, String>();
+      hobby.put("music", "guitar");
+      joe.setHobbies(hobby);
+      Object val =3D joe.getHobbies().get("music");
+      assertEquals("guitar", val);
+      hobby =3D joe.getHobbies();
+      hobby.put("novel", "English");
+      assertEquals("Size of map ", 2, joe.getHobbies().size());
+   }
+
+   public void testList() throws Throwable
+   {
+      Person joe =3D createPerson("person/test6", "Joe", 50);
+      List<String> language =3D new ArrayList<String>();
+      language.add("German");
+      language.add("English");
+      language.add("French");
+      joe.setLanguages(language);
+
+      assertEquals("Size of language ", 3, joe.getLanguages().size());
+      language =3D joe.getLanguages();
+      language.add("Mandarin");
+      language.add("Taiwanese");
+      language.add("Haka");
+      assertEquals("Size of language ", 6, joe.getLanguages().size());
+
+      String English =3D (String) language.get(1);
+      assertEquals((Object) "English", English);
+      cache_.detach("person/test6");
+   }
+
+   public void testListDetachAndAttach() throws Throwable
+   {
+      String id =3D "person/test6";
+      Person joe =3D new Person();
+      List<String> language =3D new ArrayList<String>();
+      language.add("German");
+      language.add("English");
+      language.add("French");
+      joe.setLanguages(language);
+
+      cache_.attach(id, joe);
+
+      cache_.detach(id);
+      joe.getAge();
+      cache_.attach(id, joe);
+   }
+
+   public void testListDetachAndAttach2() throws Throwable
+   {
+      String id =3D "person/test6";
+      Person joe =3D createPerson(id, "Joe", 50);
+      List<String> language =3D new ArrayList<String>();
+      language.add("German");
+      language.add("English");
+      language.add("French");
+      joe.setLanguages(language);
+
+      assertEquals("Size of language ", 3, joe.getLanguages().size());
+      language =3D joe.getLanguages();
+      language.add("Mandarin");
+      language.add("Taiwanese");
+      language.add("Haka");
+      assertEquals("Size of language ", 6, joe.getLanguages().size());
+
+      String English =3D (String) language.get(1);
+      assertEquals((Object) "English", English);
+
+      if (!(language instanceof ClassProxy))
+      {
+         fail("Language is not an instance of ClassProxy");
+      }
+
+      cache_.detach(id);
+      joe.getAge();
+      language =3D joe.getLanguages();
+      if ((language instanceof ClassProxy))
+      {
+         fail("Language is an instance of ClassProxy");
+      }
+
+      cache_.attach(id, joe);
+   }
+
+   public void testSet() throws Throwable
+   {
+      Person joe =3D createPerson("person/test7", "Joe", 27);
+      Set<String> skill =3D new HashSet<String>();
+      skill.add("Java");
+      skill.add("Java");
+      skill.add("Java");
+      joe.setSkills(skill);
+      skill =3D joe.getSkills();
+      assertEquals("Size of skill ", 1, skill.size());
+
+      skill.remove("Java");
+      assertTrue(skill.isEmpty());
+      skill.add("Java");
+      skill.add("J2EE");
+      skill.add("JBoss");
+      assertEquals(new Integer(3), new Integer(skill.size()));
+   }
+
+   public void testSetDetachAttach() throws Throwable
+   {
+      String id =3D "person/test7";
+      Person joe =3D createPerson(id, "Joe", 27);
+      Set<String> skill =3D new HashSet<String>();
+      skill.add("Java");
+      skill.add("Java");
+      skill.add("Java");
+      joe.setSkills(skill);
+      skill =3D joe.getSkills();
+      assertEquals("Size of skill ", 1, skill.size());
+
+      skill.remove("Java");
+      assertTrue(skill.isEmpty());
+      skill.add("Java");
+      skill.add("J2EE");
+      skill.add("JBoss");
+      assertEquals(new Integer(3), new Integer(skill.size()));
+
+      if (!(skill instanceof ClassProxy))
+      {
+         fail("Skill is not an instance of ClassProxy");
+      }
+
+      cache_.detach(id);
+      joe.getAge();
+      skill =3D joe.getSkills();
+      if ((skill instanceof ClassProxy))
+      {
+         fail("Skill is an instance of ClassProxy");
+      }
+
+      cache_.attach(id, joe);
+   }
+
+   public void testInheritance() throws Exception
+   {
+      Student joe =3D createStudent("person/joe", "Joe", 32, "Senior");
+      joe.setName("Joe Black");
+      assertEquals(joe.getName(), "Joe Black");
+      joe.setYear("Junior");
+      assertEquals(joe.getYear(), "Junior");
+      cache_.detach("person/joe");
+   }
+
+
+
+
+
+}

Deleted: pojo/tags/2.1.0.CR3/src/test/java/org/jboss/cache/pojo/rollback/Re=
plicatedTxTest.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- pojo/branches/2.1/src/test/java/org/jboss/cache/pojo/rollback/Replicate=
dTxTest.java	2007-11-26 18:16:13 UTC (rev 4776)
+++ pojo/tags/2.1.0.CR3/src/test/java/org/jboss/cache/pojo/rollback/Replica=
tedTxTest.java	2008-01-16 00:43:28 UTC (rev 5140)
@@ -1,393 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- *
- * Distributable under LGPL license.
- * See terms of license at gnu.org.
- */
-
-package org.jboss.cache.pojo.rollback;
-
-import static org.testng.AssertJUnit.assertEquals;
-import static org.testng.AssertJUnit.fail;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Properties;
-
-import javax.naming.Context;
-import javax.naming.InitialContext;
-import javax.naming.NamingException;
-import javax.transaction.NotSupportedException;
-import javax.transaction.RollbackException;
-import javax.transaction.SystemException;
-import javax.transaction.UserTransaction;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.jboss.cache.config.Configuration.CacheMode;
-import org.jboss.cache.factories.UnitTestCacheConfigurationFactory;
-import org.jboss.cache.pojo.PojoCache;
-import org.jboss.cache.pojo.PojoCacheFactory;
-import org.jboss.cache.pojo.TestingUtil;
-import org.jboss.cache.pojo.test.Person;
-import org.jboss.cache.transaction.DummyTransactionManager;
-import org.testng.annotations.AfterMethod;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.Test;
-
-/**
- */
-
-(a)Test(groups =3D {"functional"})
-public class ReplicatedTxTest
-{
-   Log log =3D LogFactory.getLog(org.jboss.cache.pojo.rollback.ReplicatedT=
xTest.class);
-   PojoCache cache, cache1;
-   final String FACTORY =3D "org.jboss.cache.transaction.DummyContextFacto=
ry";
-   DummyTransactionManager tx_mgr;
-   Throwable t1_ex, t2_ex;
-   long start =3D 0;
-
-
-
-   @BeforeMethod(alwaysRun =3D true)
-   protected void setUp() throws Exception
-   {
-      log.info("setUp() ....");
-      boolean toStart =3D false;
-      cache =3D PojoCacheFactory.createCache(UnitTestCacheConfigurationFac=
tory.createConfiguration(CacheMode.REPL_SYNC), toStart);
-      cache.start();
-      cache1 =3D PojoCacheFactory.createCache(UnitTestCacheConfigurationFa=
ctory.createConfiguration(CacheMode.REPL_SYNC), toStart);
-      cache1.start();
-
-      System.setProperty(Context.INITIAL_CONTEXT_FACTORY, FACTORY);
-
-      tx_mgr =3D DummyTransactionManager.getInstance();
-      t1_ex =3D t2_ex =3D null;
-   }
-
-   @AfterMethod(alwaysRun =3D true)
-   protected void tearDown() throws Exception
-   {
-      cache.stop();
-      cache1.stop();
-
-      DummyTransactionManager.destroy();
-   }
-
-//   public void testDummy() {}
-
-   UserTransaction getTransaction() throws SystemException, NotSupportedEx=
ception, NamingException
-   {
-      Properties prop =3D new Properties();
-      prop.put(Context.INITIAL_CONTEXT_FACTORY,
-               "org.jboss.cache.transaction.DummyContextFactory");
-      return (UserTransaction) new InitialContext(prop).lookup("UserTransa=
ction");
-   }
-
-   private Person createPerson(String id, String name, int age)
-   {
-      Person p =3D new Person();
-      p.setName(name);
-      p.setAge(age);
-      return p;
-   }
-
-   public void testSimple() throws Exception
-   {
-      log.info("testSimple() ....");
-      UserTransaction tx =3D getTransaction();
-      tx.begin();
-      Person p =3D createPerson("/person/test1", "Harald Gliebe", 32);
-      cache.attach("/person/test1", p);
-
-      tx.commit();
-      tx.begin();
-      p.setName("Benoit");
-      tx.commit();
-      Person p1 =3D (Person) cache1.find("/person/test1");
-      assertEquals("Benoit", p.getName());
-      assertEquals("Benoit", p1.getName());
-      tx.begin();
-      p1.setAge(61);
-      tx.commit();
-      assertEquals(61, p.getAge());
-      assertEquals(61, p1.getAge());
-   }
-
-   /**
-    * Concurrent puts (whole POJO) from the same cache instance (different=
 threads) with rollback.
-    */
-   public void testConcurrentPuts() throws Exception
-   {
-      Thread t1 =3D new Thread()
-      {
-         public void run()
-         {
-            try
-            {
-               Person p =3D createPerson("/person/test6", "p6", 50);
-               List<String> lang =3D new ArrayList<String>();
-               lang.add("German");
-               p.setLanguages(lang);
-               UserTransaction tx =3D getTransaction();
-               tx.begin();
-               cache.attach("/person/test6", p);
-               TestingUtil.sleepThread(17000);
-               tx.commit();
-            }
-            catch (RollbackException rollback)
-            {
-               ;
-            }
-            catch (Exception ex)
-            {
-               t1_ex =3D ex;
-            }
-         }
-      };
-
-      Thread t2 =3D new Thread()
-      {
-         public void run()
-         {
-            UserTransaction tx =3D null;
-            Person p =3D createPerson("/person/test6", "p6", 50);
-            try
-            {
-               TestingUtil.sleepThread(1000); // give Thread1 time to crea=
tePerson
-               List<String> lang =3D new ArrayList<String>();
-               lang.add("German");
-               p.setLanguages(lang);
-               tx =3D getTransaction();
-               tx.begin();
-               cache.attach("/person/test6", p);
-               tx.commit();
-            }
-            catch (RollbackException rollback)
-            {
-               ;
-            }
-            catch (Exception ex)
-            {
-               try
-               {
-                  tx.rollback();
-               }
-               catch (SystemException e)
-               {
-                  e.printStackTrace();
-                  t2_ex =3D e;
-               }
-            }
-
-            cache.attach("/person/test6", p);
-
-         }
-      };
-
-      t1.start();
-      t2.start();
-
-      t1.join();
-      t2.join();
-
-      // t2 should rollback due to timeout while t2 should succeed
-      if (t2_ex !=3D null)
-         fail("Thread1 failed: " + t2_ex);
-      if (t1_ex !=3D null)
-         fail("Thread2 failed: " + t1_ex);
-
-      int size =3D ((Person) cache.find("/person/test6")).getLanguages().s=
ize();
-      assertEquals("number of languages", 1, size);
-      size =3D ((Person) cache1.find("/person/test6")).getLanguages().size=
();
-      assertEquals("number of languages", 1, size);
-   }
-
-   /**
-    * Concurrent puts from the same cache instance (different threads) wit=
h rollback.
-    */
-   public void testConcurrentPuts1() throws Exception
-   {
-      Thread t1 =3D new Thread()
-      {
-         public void run()
-         {
-            try
-            {
-               List<String> lang =3D ((Person) cache.find("/person/test6")=
).getLanguages();
-               UserTransaction tx =3D getTransaction();
-               tx.begin();
-               lang.add("German");
-               TestingUtil.sleepThread(17000);
-               tx.commit();
-            }
-            catch (RollbackException rollback)
-            {
-               ;
-            }
-            catch (Exception ex)
-            {
-               t1_ex =3D ex;
-            }
-         }
-      };
-
-      Thread t2 =3D new Thread()
-      {
-         public void run()
-         {
-            UserTransaction tx =3D null;
-            try
-            {
-               TestingUtil.sleepThread(1000); // give Thread1 time to crea=
tePerson
-               List<String> lang =3D ((Person) cache1.find("/person/test6"=
)).getLanguages();
-               tx =3D getTransaction();
-               tx.begin();
-               lang.add("English");
-               tx.commit();
-            }
-            catch (RollbackException rollback)
-            {
-               ;
-            }
-            catch (Exception ex)
-            {
-               try
-               {
-                  tx.rollback();
-               }
-               catch (SystemException e)
-               {
-                  e.printStackTrace();
-                  t2_ex =3D e;
-               }
-            }
-         }
-      };
-
-      Person p =3D createPerson("/person/test6", "p6", 50);
-      cache.attach("/person/test6", p);
-      List<String> lang =3D new ArrayList<String>();
-      lang.add("German");
-      p.setLanguages(lang);
-
-      t1.start();
-      t2.start();
-
-      t1.join();
-      t2.join();
-
-      // t2 should rollback due to timeout while t2 should succeed
-      if (t2_ex !=3D null)
-         fail("Thread1 failed: " + t2_ex);
-      if (t1_ex !=3D null)
-         fail("Thread2 failed: " + t1_ex);
-
-      int size =3D ((Person) cache.find("/person/test6")).getLanguages().s=
ize();
-      assertEquals("number of languages", 2, size);
-      size =3D ((Person) cache1.find("/person/test6")).getLanguages().size=
();
-      assertEquals("number of languages", 2, size);
-   }
-
-   /**
-    * Concurrent puts from the different cache instances (different thread=
s) with rollback.
-    */
-   public void testConcurrentPuts2() throws Exception
-   {
-      Thread t1 =3D new Thread()
-      {
-         public void run()
-         {
-            try
-            {
-               List<String> lang =3D ((Person) cache.find("/person/test6")=
).getLanguages();
-               UserTransaction tx =3D getTransaction();
-               tx.begin();
-               lang.add("German");
-               TestingUtil.sleepThread(17000);
-               tx.commit();
-            }
-            catch (RollbackException rollback)
-            {
-               ;
-            }
-            catch (Exception ex)
-            {
-               t1_ex =3D ex;
-            }
-         }
-      };
-
-      Thread t2 =3D new Thread()
-      {
-         public void run()
-         {
-            UserTransaction tx =3D null;
-            try
-            {
-               TestingUtil.sleepThread(1000); // give Thread1 time to crea=
tePerson
-               List<String> lang =3D ((Person) cache.find("/person/test6")=
).getLanguages();
-               tx =3D getTransaction();
-               tx.begin();
-               lang.add("English");
-               tx.commit();
-            }
-            catch (RollbackException rollback)
-            {
-               ;
-            }
-            catch (Exception ex)
-            {
-               try
-               {
-                  tx.rollback();
-               }
-               catch (SystemException e)
-               {
-                  e.printStackTrace();
-                  t2_ex =3D e;
-               }
-            }
-         }
-      };
-
-      Person p =3D createPerson("/person/test6", "p6", 50);
-      cache.attach("/person/test6", p);
-      List<String> lang =3D new ArrayList<String>();
-      lang.add("German");
-      p.setLanguages(lang);
-
-      t1.start();
-      t2.start();
-
-      t1.join();
-      t2.join();
-
-      // t2 should rollback due to timeout while t2 should succeed
-      if (t2_ex !=3D null)
-         fail("Thread1 failed: " + t2_ex);
-      if (t1_ex !=3D null)
-         fail("Thread2 failed: " + t1_ex);
-
-      int size =3D ((Person) cache.find("/person/test6")).getLanguages().s=
ize();
-      assertEquals("number of languages", 2, size);
-      size =3D ((Person) cache1.find("/person/test6")).getLanguages().size=
();
-      assertEquals("number of languages", 2, size);
-   }
-
-   void log(String s)
-   {
-      long now;
-      if (start =3D=3D 0)
-         start =3D System.currentTimeMillis();
-      now =3D System.currentTimeMillis();
-
-      System.out.println("[" + Thread.currentThread().getName() + "] [" + =
(now - start) + "] " + s);
-   }
-
-
-
-
-
-}

Copied: pojo/tags/2.1.0.CR3/src/test/java/org/jboss/cache/pojo/rollback/Rep=
licatedTxTest.java (from rev 5129, pojo/branches/2.1/src/test/java/org/jbos=
s/cache/pojo/rollback/ReplicatedTxTest.java)
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- pojo/tags/2.1.0.CR3/src/test/java/org/jboss/cache/pojo/rollback/Replica=
tedTxTest.java	                        (rev 0)
+++ pojo/tags/2.1.0.CR3/src/test/java/org/jboss/cache/pojo/rollback/Replica=
tedTxTest.java	2008-01-16 00:43:28 UTC (rev 5140)
@@ -0,0 +1,393 @@
+/*
+ * JBoss, Home of Professional Open Source
+ *
+ * Distributable under LGPL license.
+ * See terms of license at gnu.org.
+ */
+
+package org.jboss.cache.pojo.rollback;
+
+import static org.testng.AssertJUnit.assertEquals;
+import static org.testng.AssertJUnit.fail;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Properties;
+
+import javax.naming.Context;
+import javax.naming.InitialContext;
+import javax.naming.NamingException;
+import javax.transaction.NotSupportedException;
+import javax.transaction.RollbackException;
+import javax.transaction.SystemException;
+import javax.transaction.UserTransaction;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.jboss.cache.config.Configuration.CacheMode;
+import org.jboss.cache.factories.UnitTestCacheConfigurationFactory;
+import org.jboss.cache.misc.TestingUtil;
+import org.jboss.cache.pojo.PojoCache;
+import org.jboss.cache.pojo.PojoCacheFactory;
+import org.jboss.cache.pojo.test.Person;
+import org.jboss.cache.transaction.DummyTransactionManager;
+import org.testng.annotations.AfterMethod;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.Test;
+
+/**
+ */
+
+(a)Test(groups =3D {"functional"})
+public class ReplicatedTxTest
+{
+   Log log =3D LogFactory.getLog(org.jboss.cache.pojo.rollback.ReplicatedT=
xTest.class);
+   PojoCache cache, cache1;
+   final String FACTORY =3D "org.jboss.cache.transaction.DummyContextFacto=
ry";
+   DummyTransactionManager tx_mgr;
+   Throwable t1_ex, t2_ex;
+   long start =3D 0;
+
+
+
+   @BeforeMethod(alwaysRun =3D true)
+   protected void setUp() throws Exception
+   {
+      log.info("setUp() ....");
+      boolean toStart =3D false;
+      cache =3D PojoCacheFactory.createCache(UnitTestCacheConfigurationFac=
tory.createConfiguration(CacheMode.REPL_SYNC), toStart);
+      cache.start();
+      cache1 =3D PojoCacheFactory.createCache(UnitTestCacheConfigurationFa=
ctory.createConfiguration(CacheMode.REPL_SYNC), toStart);
+      cache1.start();
+
+      System.setProperty(Context.INITIAL_CONTEXT_FACTORY, FACTORY);
+
+      tx_mgr =3D DummyTransactionManager.getInstance();
+      t1_ex =3D t2_ex =3D null;
+   }
+
+   @AfterMethod(alwaysRun =3D true)
+   protected void tearDown() throws Exception
+   {
+      cache.stop();
+      cache1.stop();
+
+      DummyTransactionManager.destroy();
+   }
+
+//   public void testDummy() {}
+
+   UserTransaction getTransaction() throws SystemException, NotSupportedEx=
ception, NamingException
+   {
+      Properties prop =3D new Properties();
+      prop.put(Context.INITIAL_CONTEXT_FACTORY,
+               "org.jboss.cache.transaction.DummyContextFactory");
+      return (UserTransaction) new InitialContext(prop).lookup("UserTransa=
ction");
+   }
+
+   private Person createPerson(String id, String name, int age)
+   {
+      Person p =3D new Person();
+      p.setName(name);
+      p.setAge(age);
+      return p;
+   }
+
+   public void testSimple() throws Exception
+   {
+      log.info("testSimple() ....");
+      UserTransaction tx =3D getTransaction();
+      tx.begin();
+      Person p =3D createPerson("/person/test1", "Harald Gliebe", 32);
+      cache.attach("/person/test1", p);
+
+      tx.commit();
+      tx.begin();
+      p.setName("Benoit");
+      tx.commit();
+      Person p1 =3D (Person) cache1.find("/person/test1");
+      assertEquals("Benoit", p.getName());
+      assertEquals("Benoit", p1.getName());
+      tx.begin();
+      p1.setAge(61);
+      tx.commit();
+      assertEquals(61, p.getAge());
+      assertEquals(61, p1.getAge());
+   }
+
+   /**
+    * Concurrent puts (whole POJO) from the same cache instance (different=
 threads) with rollback.
+    */
+   public void testConcurrentPuts() throws Exception
+   {
+      Thread t1 =3D new Thread()
+      {
+         public void run()
+         {
+            try
+            {
+               Person p =3D createPerson("/person/test6", "p6", 50);
+               List<String> lang =3D new ArrayList<String>();
+               lang.add("German");
+               p.setLanguages(lang);
+               UserTransaction tx =3D getTransaction();
+               tx.begin();
+               cache.attach("/person/test6", p);
+               TestingUtil.sleepThread(17000);
+               tx.commit();
+            }
+            catch (RollbackException rollback)
+            {
+               ;
+            }
+            catch (Exception ex)
+            {
+               t1_ex =3D ex;
+            }
+         }
+      };
+
+      Thread t2 =3D new Thread()
+      {
+         public void run()
+         {
+            UserTransaction tx =3D null;
+            Person p =3D createPerson("/person/test6", "p6", 50);
+            try
+            {
+               TestingUtil.sleepThread(1000); // give Thread1 time to crea=
tePerson
+               List<String> lang =3D new ArrayList<String>();
+               lang.add("German");
+               p.setLanguages(lang);
+               tx =3D getTransaction();
+               tx.begin();
+               cache.attach("/person/test6", p);
+               tx.commit();
+            }
+            catch (RollbackException rollback)
+            {
+               ;
+            }
+            catch (Exception ex)
+            {
+               try
+               {
+                  tx.rollback();
+               }
+               catch (SystemException e)
+               {
+                  e.printStackTrace();
+                  t2_ex =3D e;
+               }
+            }
+
+            cache.attach("/person/test6", p);
+
+         }
+      };
+
+      t1.start();
+      t2.start();
+
+      t1.join();
+      t2.join();
+
+      // t2 should rollback due to timeout while t2 should succeed
+      if (t2_ex !=3D null)
+         fail("Thread1 failed: " + t2_ex);
+      if (t1_ex !=3D null)
+         fail("Thread2 failed: " + t1_ex);
+
+      int size =3D ((Person) cache.find("/person/test6")).getLanguages().s=
ize();
+      assertEquals("number of languages", 1, size);
+      size =3D ((Person) cache1.find("/person/test6")).getLanguages().size=
();
+      assertEquals("number of languages", 1, size);
+   }
+
+   /**
+    * Concurrent puts from the same cache instance (different threads) wit=
h rollback.
+    */
+   public void testConcurrentPuts1() throws Exception
+   {
+      Thread t1 =3D new Thread()
+      {
+         public void run()
+         {
+            try
+            {
+               List<String> lang =3D ((Person) cache.find("/person/test6")=
).getLanguages();
+               UserTransaction tx =3D getTransaction();
+               tx.begin();
+               lang.add("German");
+               TestingUtil.sleepThread(17000);
+               tx.commit();
+            }
+            catch (RollbackException rollback)
+            {
+               ;
+            }
+            catch (Exception ex)
+            {
+               t1_ex =3D ex;
+            }
+         }
+      };
+
+      Thread t2 =3D new Thread()
+      {
+         public void run()
+         {
+            UserTransaction tx =3D null;
+            try
+            {
+               TestingUtil.sleepThread(1000); // give Thread1 time to crea=
tePerson
+               List<String> lang =3D ((Person) cache1.find("/person/test6"=
)).getLanguages();
+               tx =3D getTransaction();
+               tx.begin();
+               lang.add("English");
+               tx.commit();
+            }
+            catch (RollbackException rollback)
+            {
+               ;
+            }
+            catch (Exception ex)
+            {
+               try
+               {
+                  tx.rollback();
+               }
+               catch (SystemException e)
+               {
+                  e.printStackTrace();
+                  t2_ex =3D e;
+               }
+            }
+         }
+      };
+
+      Person p =3D createPerson("/person/test6", "p6", 50);
+      cache.attach("/person/test6", p);
+      List<String> lang =3D new ArrayList<String>();
+      lang.add("German");
+      p.setLanguages(lang);
+
+      t1.start();
+      t2.start();
+
+      t1.join();
+      t2.join();
+
+      // t2 should rollback due to timeout while t2 should succeed
+      if (t2_ex !=3D null)
+         fail("Thread1 failed: " + t2_ex);
+      if (t1_ex !=3D null)
+         fail("Thread2 failed: " + t1_ex);
+
+      int size =3D ((Person) cache.find("/person/test6")).getLanguages().s=
ize();
+      assertEquals("number of languages", 2, size);
+      size =3D ((Person) cache1.find("/person/test6")).getLanguages().size=
();
+      assertEquals("number of languages", 2, size);
+   }
+
+   /**
+    * Concurrent puts from the different cache instances (different thread=
s) with rollback.
+    */
+   public void testConcurrentPuts2() throws Exception
+   {
+      Thread t1 =3D new Thread()
+      {
+         public void run()
+         {
+            try
+            {
+               List<String> lang =3D ((Person) cache.find("/person/test6")=
).getLanguages();
+               UserTransaction tx =3D getTransaction();
+               tx.begin();
+               lang.add("German");
+               TestingUtil.sleepThread(17000);
+               tx.commit();
+            }
+            catch (RollbackException rollback)
+            {
+               ;
+            }
+            catch (Exception ex)
+            {
+               t1_ex =3D ex;
+            }
+         }
+      };
+
+      Thread t2 =3D new Thread()
+      {
+         public void run()
+         {
+            UserTransaction tx =3D null;
+            try
+            {
+               TestingUtil.sleepThread(1000); // give Thread1 time to crea=
tePerson
+               List<String> lang =3D ((Person) cache.find("/person/test6")=
).getLanguages();
+               tx =3D getTransaction();
+               tx.begin();
+               lang.add("English");
+               tx.commit();
+            }
+            catch (RollbackException rollback)
+            {
+               ;
+            }
+            catch (Exception ex)
+            {
+               try
+               {
+                  tx.rollback();
+               }
+               catch (SystemException e)
+               {
+                  e.printStackTrace();
+                  t2_ex =3D e;
+               }
+            }
+         }
+      };
+
+      Person p =3D createPerson("/person/test6", "p6", 50);
+      cache.attach("/person/test6", p);
+      List<String> lang =3D new ArrayList<String>();
+      lang.add("German");
+      p.setLanguages(lang);
+
+      t1.start();
+      t2.start();
+
+      t1.join();
+      t2.join();
+
+      // t2 should rollback due to timeout while t2 should succeed
+      if (t2_ex !=3D null)
+         fail("Thread1 failed: " + t2_ex);
+      if (t1_ex !=3D null)
+         fail("Thread2 failed: " + t1_ex);
+
+      int size =3D ((Person) cache.find("/person/test6")).getLanguages().s=
ize();
+      assertEquals("number of languages", 2, size);
+      size =3D ((Person) cache1.find("/person/test6")).getLanguages().size=
();
+      assertEquals("number of languages", 2, size);
+   }
+
+   void log(String s)
+   {
+      long now;
+      if (start =3D=3D 0)
+         start =3D System.currentTimeMillis();
+      now =3D System.currentTimeMillis();
+
+      System.out.println("[" + Thread.currentThread().getName() + "] [" + =
(now - start) + "] " + s);
+   }
+
+
+
+
+
+}

Deleted: pojo/tags/2.1.0.CR3/src/test/java/org/jboss/cache/pojo/statetransf=
er/ReplicatedTest.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- pojo/branches/2.1/src/test/java/org/jboss/cache/pojo/statetransfer/Repl=
icatedTest.java	2007-11-26 18:16:13 UTC (rev 4776)
+++ pojo/tags/2.1.0.CR3/src/test/java/org/jboss/cache/pojo/statetransfer/Re=
plicatedTest.java	2008-01-16 00:43:28 UTC (rev 5140)
@@ -1,99 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
-package org.jboss.cache.pojo.statetransfer;
-
-import static org.testng.AssertJUnit.assertEquals;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.jboss.cache.CacheImpl;
-import org.jboss.cache.config.Configuration.CacheMode;
-import org.jboss.cache.factories.UnitTestCacheConfigurationFactory;
-import org.jboss.cache.pojo.PojoCache;
-import org.jboss.cache.pojo.PojoCacheFactory;
-import org.jboss.cache.pojo.test.Person;
-import org.testng.annotations.AfterMethod;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.Test;
-
-/**
- * Simple replicated test for state transfer
- *
- * @author Ben Wang
- */
-(a)Test(groups =3D {"functional"})
-public class ReplicatedTest
-{
-   Log log =3D LogFactory.getLog(ReplicatedTest.class);
-   PojoCache cache, cache1;
-
-
-
-   @BeforeMethod(alwaysRun =3D true)
-   protected void setUp() throws Exception
-   {
-      log.info("setUp() ....");
-   }
-
-   @AfterMethod(alwaysRun =3D true)
-   protected void tearDown() throws Exception
-   {
-      cache.stop();
-      cache1.stop();
-   }
-
-//   public void testDummy() {}
-
-   private Person createPerson(String id, String name, int age)
-   {
-      Person p =3D new Person();
-      p.setName(name);
-      p.setAge(age);
-      cache.attach(id, p);
-      return p;
-   }
-
-   public void testSimple() throws Exception
-   {
-      boolean toStart =3D true;
-      cache =3D PojoCacheFactory.createCache(UnitTestCacheConfigurationFac=
tory.createConfiguration(CacheMode.REPL_SYNC), toStart);
-      Person ben =3D createPerson("/person/test1", "Ben Wang", 40);
-
-      System.out.println("\n*** I ***");
-      System.out.println(((CacheImpl<Object, Object>) cache.getCache()).pr=
intDetails());
-      cache1 =3D PojoCacheFactory.createCache(UnitTestCacheConfigurationFa=
ctory.createConfiguration(CacheMode.REPL_SYNC), toStart);
-      cache1.start();
-
-      System.out.println("\n*** II ***");
-      System.out.println(((CacheImpl<Object, Object>) cache1.getCache()).p=
rintDetails());
-
-      log.info("testSimple() ....");
-      assertEquals("Ben Wang", ben.getName());
-      assertEquals("Ben Wang", ((Person) cache1.find("/person/test1")).get=
Name());
-      cache.detach("/person/test1");
-   }
-
-
-
-
-}

Copied: pojo/tags/2.1.0.CR3/src/test/java/org/jboss/cache/pojo/statetransfe=
r/ReplicatedTest.java (from rev 5129, pojo/branches/2.1/src/test/java/org/j=
boss/cache/pojo/statetransfer/ReplicatedTest.java)
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- pojo/tags/2.1.0.CR3/src/test/java/org/jboss/cache/pojo/statetransfer/Re=
plicatedTest.java	                        (rev 0)
+++ pojo/tags/2.1.0.CR3/src/test/java/org/jboss/cache/pojo/statetransfer/Re=
plicatedTest.java	2008-01-16 00:43:28 UTC (rev 5140)
@@ -0,0 +1,99 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package org.jboss.cache.pojo.statetransfer;
+
+import static org.testng.AssertJUnit.assertEquals;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.jboss.cache.CacheImpl;
+import org.jboss.cache.config.Configuration.CacheMode;
+import org.jboss.cache.factories.UnitTestCacheConfigurationFactory;
+import org.jboss.cache.pojo.PojoCache;
+import org.jboss.cache.pojo.PojoCacheFactory;
+import org.jboss.cache.pojo.test.Person;
+import org.testng.annotations.AfterMethod;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.Test;
+
+/**
+ * Simple replicated test for state transfer
+ *
+ * @author Ben Wang
+ */
+(a)Test(groups =3D {"functional"})
+public class ReplicatedTest
+{
+   Log log =3D LogFactory.getLog(ReplicatedTest.class);
+   PojoCache cache, cache1;
+
+
+
+   @BeforeMethod(alwaysRun =3D true)
+   protected void setUp() throws Exception
+   {
+      log.info("setUp() ....");
+   }
+
+   @AfterMethod(alwaysRun =3D true)
+   protected void tearDown() throws Exception
+   {
+      cache.stop();
+      cache1.stop();
+   }
+
+//   public void testDummy() {}
+
+   private Person createPerson(String id, String name, int age)
+   {
+      Person p =3D new Person();
+      p.setName(name);
+      p.setAge(age);
+      cache.attach(id, p);
+      return p;
+   }
+
+   public void testSimple() throws Exception
+   {
+      boolean toStart =3D true;
+      cache =3D PojoCacheFactory.createCache(UnitTestCacheConfigurationFac=
tory.createConfiguration(CacheMode.REPL_SYNC), toStart);
+      Person ben =3D createPerson("/person/test1", "Ben Wang", 40);
+
+      //System.out.println("\n*** I ***");
+      //System.out.println(((CacheImpl<Object, Object>) cache.getCache()).=
printDetails());
+      cache1 =3D PojoCacheFactory.createCache(UnitTestCacheConfigurationFa=
ctory.createConfiguration(CacheMode.REPL_SYNC), toStart);
+      cache1.start();
+
+      //System.out.println("\n*** II ***");
+      //System.out.println(((CacheImpl<Object, Object>) cache1.getCache())=
.printDetails());
+
+      log.info("testSimple() ....");
+      assertEquals("Ben Wang", ben.getName());
+      assertEquals("Ben Wang", ((Person) cache1.find("/person/test1")).get=
Name());
+      cache.detach("/person/test1");
+   }
+
+
+
+
+}


--===============5090454985850310823==--

From jbosscache-commits at lists.jboss.org Wed Jan 16 05:18:17 2008
Content-Type: multipart/mixed; boundary="===============8295359837747094463=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r5141 - in
 benchmarks/benchmark-fwk/trunk/cache-products: jbosscache-2.1.0/conf and 1
 other directories.
Date: Wed, 16 Jan 2008 05:18:16 -0500
Message-ID: <E1JF5Lc-000665-TG@committer01.frg.pub.inap.atl.jboss.com>

--===============8295359837747094463==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: mircea.markus
Date: 2008-01-16 05:18:16 -0500 (Wed, 16 Jan 2008)
New Revision: 5141

Added:
   benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.1.0/
   benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.1.0/conf/conf=
ig.xml
   benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.1.0/lib/jboss=
-common-core.jar
   benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.1.0/lib/jboss=
-javaee.jar
   benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.1.0/lib/jcip-=
annotations.jar
   benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.1.0/lib/jgrou=
ps.jar
Removed:
   benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.1.0/conf/opt-=
repl-async.xml
   benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.1.0/conf/opt-=
repl-sync.xml
   benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.1.0/conf/pess=
-repl-async-br.xml
   benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.1.0/conf/pess=
-repl-async.xml
   benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.1.0/conf/pess=
-repl-sync-br.xml
   benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.1.0/conf/pess=
-repl-sync.xml
   benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.1.0/lib/jboss=
-common-core-2.0.4.GA.jar
   benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.1.0/lib/jboss=
-javaee-5.0.0.Beta3.jar
   benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.1.0/lib/jcip-=
annotations-1.0.jar
   benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.1.0/lib/jgrou=
ps-2.6.0.GA.jar
   benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.1.0cr2/
Modified:
   benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.1.0/lib/jboss=
cache-core.jar
Log:
updated version

Copied: benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.1.0 (fro=
m rev 5140, benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.1.0c=
r2)

Added: benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.1.0/conf/=
config.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.1.0/conf/con=
fig.xml	                        (rev 0)
+++ benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.1.0/conf/con=
fig.xml	2008-01-16 10:18:16 UTC (rev 5141)
@@ -0,0 +1,254 @@
+<?xml version=3D"1.0" encoding=3D"UTF-8"?>
+
+<!-- =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D -->
+<!--                                                                      =
 -->
+<!--  Sample TreeCache Service Configuration                              =
 -->
+<!--                                                                      =
 -->
+<!-- =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D -->
+
+<server>
+
+   <!-- =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D -->
+   <!-- Defines TreeCache configuration                                   =
   -->
+   <!-- =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D -->
+
+   <mbean code=3D"org.jboss.cache.jmx.CacheJmxWrapper"
+          name=3D"jboss.cache:service=3DTreeCache">
+
+      <depends>jboss:service=3DNaming</depends>
+      <depends>jboss:service=3DTransactionManager</depends>
+
+      <!--
+          Configure the TransactionManager
+      -->
+      <attribute name=3D"TransactionManagerLookupClass">org.jboss.cache.tr=
ansaction.GenericTransactionManagerLookup
+      </attribute>
+
+      <!--
+          Isolation level : SERIALIZABLE
+                            REPEATABLE_READ (default)
+                            READ_COMMITTED
+                            READ_UNCOMMITTED
+                            NONE
+      -->
+      <attribute name=3D"IsolationLevel">REPEATABLE_READ</attribute>
+
+       <!--<attribute name=3D"NodeLockingScheme">OPTIMISTIC</attribute>-->
+
+      <!--
+           Valid modes are LOCAL
+                           REPL_ASYNC
+                           REPL_SYNC
+                           INVALIDATION_ASYNC
+                           INVALIDATION_SYNC
+      -->
+      <attribute name=3D"CacheMode">REPL_ASYNC</attribute>
+
+      <!--
+      Just used for async repl: use a replication queue
+      -->
+      <attribute name=3D"UseReplQueue">false</attribute>
+
+      <!--
+          Replication interval for replication queue (in ms)
+      -->
+      <attribute name=3D"ReplQueueInterval">0</attribute>
+
+      <!--
+          Max number of elements which trigger replication
+      -->
+      <attribute name=3D"ReplQueueMaxElements">0</attribute>
+
+      <!-- Name of cluster. Needs to be the same for all TreeCache nodes i=
n a
+           cluster in order to find each other.
+      -->
+      <attribute name=3D"ClusterName">JBossCache-Cluster</attribute>
+
+      <!--Uncomment next three statements to enable JGroups multiplexer.
+This configuration is dependent on the JGroups multiplexer being
+registered in an MBean server such as JBossAS.  -->
+      <!--
+      <depends>jgroups.mux:name=3DMultiplexer</depends>
+      <attribute name=3D"MultiplexerService">jgroups.mux:name=3DMultiplexe=
r</attribute>
+      <attribute name=3D"MultiplexerStack">fc-fast-minimalthreads</attribu=
te>
+      -->
+
+      <!-- JGroups protocol stack properties.
+         ClusterConfig isn't used if the multiplexer is enabled and succes=
sfully initialized.
+      -->
+      <attribute name=3D"ClusterConfig">
+         <config>
+             <!--<UDP mcast_addr=3D"232.10.10.10"
+                              mcast_port=3D"45588"
+                              tos=3D"8"
+                              ucast_recv_buf_size=3D"20000000"
+                              ucast_send_buf_size=3D"640000"
+                              mcast_recv_buf_size=3D"25000000"
+                              mcast_send_buf_size=3D"640000"
+                              loopback=3D"false"
+                              discard_incompatible_packets=3D"true"
+                              max_bundle_size=3D"64000"
+                              max_bundle_timeout=3D"30"
+                              use_incoming_packet_handler=3D"true"
+                              ip_ttl=3D"2"
+                              enable_bundling=3D"false"
+                              enable_unicast_bundling=3D"false"
+                              enable_diagnostics=3D"true"
+
+                              use_concurrent_stack=3D"true"
+
+                              thread_naming_pattern=3D"pl"
+
+                              thread_pool.enabled=3D"true"
+                              thread_pool.min_threads=3D"1"
+                              thread_pool.max_threads=3D"4"
+                              thread_pool.keep_alive_time=3D"30000"
+                              thread_pool.queue_enabled=3D"true"
+                              thread_pool.queue_max_size=3D"50000"
+                              thread_pool.rejection_policy=3D"discard"
+
+                              oob_thread_pool.enabled=3D"true"
+                              oob_thread_pool.min_threads=3D"2"
+                              oob_thread_pool.max_threads=3D"4"
+                              oob_thread_pool.keep_alive_time=3D"10000"
+                              oob_thread_pool.queue_enabled=3D"false"
+                              oob_thread_pool.queue_max_size=3D"10"
+                              oob_thread_pool.rejection_policy=3D"Run"/>-->
+
+            <TCP recv_buf_size=3D"20000000" use_send_queues=3D"false"
+                 loopback=3D"false"
+                 discard_incompatible_packets=3D"true"
+                 max_bundle_size=3D"64000"
+                 max_bundle_timeout=3D"30"
+                 use_incoming_packet_handler=3D"true"
+                 enable_bundling=3D"true"
+                 enable_unicast_bundling=3D"true"
+                 enable_diagnostics=3D"true"
+
+                 use_concurrent_stack=3D"true"
+
+                 thread_naming_pattern=3D"pl"
+
+                 thread_pool.enabled=3D"true"
+                 thread_pool.min_threads=3D"1"
+                 thread_pool.max_threads=3D"4"
+                 thread_pool.keep_alive_time=3D"30000"
+                 thread_pool.queue_enabled=3D"true"
+                 thread_pool.queue_max_size=3D"50000"
+                 thread_pool.rejection_policy=3D"discard"
+
+                 oob_thread_pool.enabled=3D"true"
+                 oob_thread_pool.min_threads=3D"2"
+                 oob_thread_pool.max_threads=3D"4"
+                 oob_thread_pool.keep_alive_time=3D"10000"
+                 oob_thread_pool.queue_enabled=3D"false"
+                 oob_thread_pool.queue_max_size=3D"10"
+                 oob_thread_pool.rejection_policy=3D"Run"/>
+
+            <!--<PING timeout=3D"2000" num_initial_members=3D"3"/>-->
+             <MPING mcast_addr=3D"232.1.2.3" timeout=3D"2000" num_initial_=
members=3D"3"/>
+            <MERGE2 max_interval=3D"30000" min_interval=3D"10000"/>
+            <FD_SOCK/>
+            <FD timeout=3D"10000" max_tries=3D"5" shun=3D"true"/>
+            <VERIFY_SUSPECT timeout=3D"1500"/>
+            <pbcast.NAKACK use_mcast_xmit=3D"false" gc_lag=3D"0"
+                           retransmit_timeout=3D"300,600,1200,2400,4800"
+                           discard_delivered_msgs=3D"true"/>
+            <!--<UNICAST timeout=3D"30,60,120,300,600,1200,2400,3600"/>-->
+            <pbcast.STABLE stability_delay=3D"1000" desired_avg_gossip=3D"=
50000"
+                           max_bytes=3D"400000"/>
+            <pbcast.GMS print_local_addr=3D"true" join_timeout=3D"5000"
+                        join_retry_timeout=3D"2000" shun=3D"false"
+                        view_bundling=3D"true" view_ack_collection_timeout=
=3D"5000"/>
+              <FC max_credits=3D"5000000"
+                    min_threshold=3D"0.20"/>
+            <FRAG2 frag_size=3D"60000"/>
+            <pbcast.STREAMING_STATE_TRANSFER use_reading_thread=3D"true"/>
+            <!-- <pbcast.STATE_TRANSFER/> -->
+            <pbcast.FLUSH timeout=3D"0"/>
+         </config>
+      </attribute>
+
+
+      <!--
+       Whether or not to fetch state on joining a cluster
+       NOTE this used to be called FetchStateOnStartup and has been rename=
d to be more descriptive.
+      -->
+      <attribute name=3D"FetchInMemoryState">true</attribute>
+
+      <!--
+          The max amount of time (in milliseconds) we wait until the
+          state (ie. the contents of the cache) are retrieved from
+          existing members in a clustered environment
+      -->
+      <attribute name=3D"StateRetrievalTimeout">15000</attribute>
+
+      <!--
+          Number of milliseconds to wait until all responses for a
+          synchronous call have been received.
+      -->
+      <attribute name=3D"SyncReplTimeout">15000</attribute>
+
+      <!-- Max number of milliseconds to wait for a lock acquisition -->
+      <attribute name=3D"LockAcquisitionTimeout">10000</attribute>
+
+      <!--
+         Indicate whether to use region based marshalling or not. Set this=
 to true if you are running under a scoped
+         class loader, e.g., inside an application server. Default is "fal=
se".
+      -->
+      <attribute name=3D"UseRegionBasedMarshalling">true</attribute>
+
+
+       <attribute name=3D"BuddyReplicationConfig">
+           <config>
+
+               <!-- Enables buddy replication. This is the ONLY mandatory =
configuration element here. -->
+               <buddyReplicationEnabled>true</buddyReplicationEnabled>
+
+               <!-- These are the default values anyway -->
+               <buddyLocatorClass>org.jboss.cache.buddyreplication.NextMem=
berBuddyLocator</buddyLocatorClass>
+
+               <!--  numBuddies is the number of backup nodes each node ma=
intains. ignoreColocatedBuddies means
+            that each node will *try* to select a buddy on a different phy=
sical host. If not able to do so though,
+            it will fall back to colocated nodes. -->
+               <buddyLocatorProperties>
+                   numBuddies =3D 1
+                   ignoreColocatedBuddies =3D true
+               </buddyLocatorProperties>
+
+               <!-- A way to specify a preferred replication group. If spe=
cified, we try and pick a buddy which shares
+           the same pool name (falling back to other buddies if not availa=
ble). This allows the sysdmin to
+           hint at backup buddies are picked, so for example, nodes may be=
 hinted topick buddies on a different
+           physical rack or power supply for added fault tolerance. -->
+               <buddyPoolName>myBuddyPoolReplicationGroup</buddyPoolName>
+
+               <!-- Communication timeout for inter-buddy group organisati=
on messages (such as assigning to and
+           removing from groups, defaults to 1000. -->
+               <buddyCommunicationTimeout>2000</buddyCommunicationTimeout>
+
+               <!-- Whether data is removed from old owners when gravitate=
d to a new owner. Defaults to true. -->
+               <dataGravitationRemoveOnFind>true</dataGravitationRemoveOnF=
ind>
+
+               <!-- Whether backup nodes can respond to data gravitation r=
equests, or only the data owner is
+           supposed to respond.  Defaults to true. -->
+               <dataGravitationSearchBackupTrees>true</dataGravitationSear=
chBackupTrees>
+
+               <!-- Whether all cache misses result in a data gravitation =
request. Defaults to false, requiring
+           callers to enable data gravitation on a per-invocation basis us=
ing the Options API. -->
+               <autoDataGravitation>false</autoDataGravitation>
+
+           </config>
+       </attribute>
+
+       =

+   </mbean>
+
+
+   <!--  Uncomment to get a graphical view of the TreeCache MBean above -->
+   <!--   <mbean code=3D"org.jboss.cache.TreeCacheView" name=3D"jboss.cach=
e:service=3DTreeCacheView">-->
+   <!--      <depends>jboss.cache:service=3DTreeCache</depends>-->
+   <!--      <attribute name=3D"CacheService">jboss.cache:service=3DTreeCa=
che</attribute>-->
+   <!--   </mbean>-->
+
+
+</server>

Deleted: benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.1.0/con=
f/opt-repl-async.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.1.0cr2/conf/=
opt-repl-async.xml	2008-01-16 00:43:28 UTC (rev 5140)
+++ benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.1.0/conf/opt=
-repl-async.xml	2008-01-16 10:18:16 UTC (rev 5141)
@@ -1,81 +0,0 @@
-<?xml version=3D"1.0" encoding=3D"UTF-8"?>
-
-<server>
-
-   <classpath codebase=3D"./lib" archives=3D"jboss-cache.jar, jgroups.jar"=
/>
-
-
-   <mbean code=3D"org.jboss.cache.CacheImpl"
-          name=3D"jboss.cache:service=3DTreeCache">
-
-      <depends>jboss:service=3DNaming</depends>
-      <depends>jboss:service=3DTransactionManager</depends>
-
-      <attribute name=3D"TransactionManagerLookupClass">org.jboss.cache.tr=
ansaction.GenericTransactionManagerLookup</attribute>
-      <attribute name=3D"NodeLockingScheme">OPTIMISTIC</attribute>
-      <attribute name=3D"CacheMode">REPL_ASYNC</attribute>
-      <attribute name=3D"UseReplQueue">false</attribute>
-      <attribute name=3D"ReplQueueInterval">0</attribute>
-      <attribute name=3D"ReplQueueMaxElements">0</attribute>
-      <attribute name=3D"ClusterName">JBossCache-Cluster</attribute>
-      <attribute name=3D"ClusterConfig">
-         <config>
-            <UDP mcast_addr=3D"229.10.10.10"
-                 mcast_port=3D"45599"
-                 tos=3D"8"
-                 ucast_recv_buf_size=3D"20000000"
-                 ucast_send_buf_size=3D"640000"
-                 mcast_recv_buf_size=3D"25000000"
-                 mcast_send_buf_size=3D"640000"
-                 loopback=3D"false"
-                 discard_incompatible_packets=3D"true"
-                 max_bundle_size=3D"64000"
-                 max_bundle_timeout=3D"30"
-                 use_incoming_packet_handler=3D"true"
-                 use_outgoing_packet_handler=3D"false"
-                 ip_ttl=3D"2"
-                 down_thread=3D"false" up_thread=3D"false"
-                 enable_bundling=3D"false"/>
-            <PING timeout=3D"2000"
-                  down_thread=3D"false" up_thread=3D"false" num_initial_me=
mbers=3D"3"/>
-            <MERGE2 max_interval=3D"100000"
-                    down_thread=3D"false" up_thread=3D"false" min_interval=
=3D"20000"/>
-            <FD_SOCK down_thread=3D"false" up_thread=3D"false"/>
-            <FD timeout=3D"10000" max_tries=3D"5" down_thread=3D"false" up=
_thread=3D"false" shun=3D"true"/>
-            <VERIFY_SUSPECT timeout=3D"1500" down_thread=3D"false" up_thre=
ad=3D"false"/>
-            <pbcast.NAKACK max_xmit_size=3D"60000"
-                           use_mcast_xmit=3D"false" gc_lag=3D"0"
-                           retransmit_timeout=3D"300,600,1200,2400,4800"
-                           down_thread=3D"false" up_thread=3D"false"
-                           discard_delivered_msgs=3D"true"/>
-            <UNICAST timeout=3D"300,600,1200,2400,3600"
-                     down_thread=3D"false" up_thread=3D"false"/>
-            <pbcast.STABLE stability_delay=3D"1000" desired_avg_gossip=3D"=
50000"
-                           down_thread=3D"false" up_thread=3D"false"
-                           max_bytes=3D"400000"/>
-            <pbcast.GMS print_local_addr=3D"true" join_timeout=3D"3000" us=
e_flush=3D"true" flush_timeout=3D"3000"
-                        down_thread=3D"false" up_thread=3D"false"
-                        join_retry_timeout=3D"2000" shun=3D"false"
-                        view_bundling=3D"true"/>
-            <FC max_credits=3D"2000000" down_thread=3D"false" up_thread=3D=
"false"
-                min_threshold=3D"0.20"/>
-            <FRAG2 frag_size=3D"60000" down_thread=3D"false" up_thread=3D"=
false"/>
-            <!-- <pbcast.STREAMING_STATE_TRANSFER down_thread=3D"false" up=
_thread=3D"false"
-                                         use_flush=3D"true" flush_timeout=
=3D"3000" use_reading_thread=3D"true"/> -->
-            <pbcast.STATE_TRANSFER down_thread=3D"false" up_thread=3D"fals=
e" use_flush=3D"true" flush_timeout=3D"3000"/>
-            <pbcast.FLUSH down_thread=3D"false" up_thread=3D"false" timeou=
t=3D"8000" auto_flush_conf=3D"false"/>
-         </config>
-      </attribute>
-      <attribute name=3D"FetchInMemoryState">true</attribute>
-      <attribute name=3D"InitialStateRetrievalTimeout">15000</attribute>
-      <attribute name=3D"SyncReplTimeout">60000</attribute>
-      <attribute name=3D"LockAcquisitionTimeout">10000</attribute>
-      <attribute name=3D"EvictionPolicyConfig">
-      </attribute>
-    =

-      <attribute name=3D"CacheLoaderConfiguration">
-      </attribute>
-
-      <attribute name=3D"UseRegionBasedMarshalling">false</attribute>
-   </mbean>
-</server>

Deleted: benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.1.0/con=
f/opt-repl-sync.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.1.0cr2/conf/=
opt-repl-sync.xml	2008-01-16 00:43:28 UTC (rev 5140)
+++ benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.1.0/conf/opt=
-repl-sync.xml	2008-01-16 10:18:16 UTC (rev 5141)
@@ -1,81 +0,0 @@
-<?xml version=3D"1.0" encoding=3D"UTF-8"?>
-
-<server>
-
-   <classpath codebase=3D"./lib" archives=3D"jboss-cache.jar, jgroups.jar"=
/>
-
-
-   <mbean code=3D"org.jboss.cache.CacheImpl"
-          name=3D"jboss.cache:service=3DTreeCache">
-
-      <depends>jboss:service=3DNaming</depends>
-      <depends>jboss:service=3DTransactionManager</depends>
-
-      <attribute name=3D"TransactionManagerLookupClass">org.jboss.cache.tr=
ansaction.GenericTransactionManagerLookup</attribute>
-      <attribute name=3D"NodeLockingScheme">PESSIMISTIC</attribute>
-      <attribute name=3D"CacheMode">REPL_SYNC</attribute>
-      <attribute name=3D"UseReplQueue">false</attribute>
-      <attribute name=3D"ReplQueueInterval">0</attribute>
-      <attribute name=3D"ReplQueueMaxElements">0</attribute>
-      <attribute name=3D"ClusterName">JBossCache-Cluster</attribute>
-      <attribute name=3D"ClusterConfig">
-         <config>
-            <UDP mcast_addr=3D"229.10.10.10"
-                 mcast_port=3D"45599"
-                 tos=3D"8"
-                 ucast_recv_buf_size=3D"20000000"
-                 ucast_send_buf_size=3D"640000"
-                 mcast_recv_buf_size=3D"25000000"
-                 mcast_send_buf_size=3D"640000"
-                 loopback=3D"false"
-                 discard_incompatible_packets=3D"true"
-                 max_bundle_size=3D"64000"
-                 max_bundle_timeout=3D"30"
-                 use_incoming_packet_handler=3D"true"
-                 use_outgoing_packet_handler=3D"false"
-                 ip_ttl=3D"2"
-                 down_thread=3D"false" up_thread=3D"false"
-                 enable_bundling=3D"false"/>
-            <PING timeout=3D"2000"
-                  down_thread=3D"false" up_thread=3D"false" num_initial_me=
mbers=3D"3"/>
-            <MERGE2 max_interval=3D"100000"
-                    down_thread=3D"false" up_thread=3D"false" min_interval=
=3D"20000"/>
-            <FD_SOCK down_thread=3D"false" up_thread=3D"false"/>
-            <FD timeout=3D"10000" max_tries=3D"5" down_thread=3D"false" up=
_thread=3D"false" shun=3D"true"/>
-            <VERIFY_SUSPECT timeout=3D"1500" down_thread=3D"false" up_thre=
ad=3D"false"/>
-            <pbcast.NAKACK max_xmit_size=3D"60000"
-                           use_mcast_xmit=3D"false" gc_lag=3D"0"
-                           retransmit_timeout=3D"300,600,1200,2400,4800"
-                           down_thread=3D"false" up_thread=3D"false"
-                           discard_delivered_msgs=3D"true"/>
-            <UNICAST timeout=3D"300,600,1200,2400,3600"
-                     down_thread=3D"false" up_thread=3D"false"/>
-            <pbcast.STABLE stability_delay=3D"1000" desired_avg_gossip=3D"=
50000"
-                           down_thread=3D"false" up_thread=3D"false"
-                           max_bytes=3D"400000"/>
-            <pbcast.GMS print_local_addr=3D"true" join_timeout=3D"3000" us=
e_flush=3D"true" flush_timeout=3D"3000"
-                        down_thread=3D"false" up_thread=3D"false"
-                        join_retry_timeout=3D"2000" shun=3D"false"
-                        view_bundling=3D"true"/>
-            <FC max_credits=3D"2000000" down_thread=3D"false" up_thread=3D=
"false"
-                min_threshold=3D"0.20"/>
-            <FRAG2 frag_size=3D"60000" down_thread=3D"false" up_thread=3D"=
false"/>
-            <!-- <pbcast.STREAMING_STATE_TRANSFER down_thread=3D"false" up=
_thread=3D"false"
-                                         use_flush=3D"true" flush_timeout=
=3D"3000" use_reading_thread=3D"true"/> -->
-            <pbcast.STATE_TRANSFER down_thread=3D"false" up_thread=3D"fals=
e" use_flush=3D"true" flush_timeout=3D"3000"/>
-            <pbcast.FLUSH down_thread=3D"false" up_thread=3D"false" timeou=
t=3D"8000" auto_flush_conf=3D"false"/>
-         </config>
-      </attribute>
-      <attribute name=3D"FetchInMemoryState">true</attribute>
-      <attribute name=3D"InitialStateRetrievalTimeout">15000</attribute>
-      <attribute name=3D"SyncReplTimeout">60000</attribute>
-      <attribute name=3D"LockAcquisitionTimeout">10000</attribute>
-      <attribute name=3D"EvictionPolicyConfig">
-      </attribute>    =

-
-      <attribute name=3D"CacheLoaderConfiguration">
-      </attribute>
-
-      <attribute name=3D"UseRegionBasedMarshalling">false</attribute>
-   </mbean>
-</server>

Deleted: benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.1.0/con=
f/pess-repl-async-br.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.1.0cr2/conf/=
pess-repl-async-br.xml	2008-01-16 00:43:28 UTC (rev 5140)
+++ benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.1.0/conf/pes=
s-repl-async-br.xml	2008-01-16 10:18:16 UTC (rev 5141)
@@ -1,176 +0,0 @@
-<?xml version=3D"1.0" encoding=3D"UTF-8"?>
-
-<server>
-
-   <classpath codebase=3D"./lib" archives=3D"jboss-cache.jar, jgroups.jar"=
/>
-
-
-   <mbean code=3D"org.jboss.cache.CacheImpl"
-          name=3D"jboss.cache:service=3DTreeCache">
-
-      <depends>jboss:service=3DNaming</depends>
-      <depends>jboss:service=3DTransactionManager</depends>
-
-      <attribute name=3D"TransactionManagerLookupClass">org.jboss.cache.tr=
ansaction.GenericTransactionManagerLookup</attribute>
-      <attribute name=3D"IsolationLevel">READ_COMMITTED</attribute>
-      <attribute name=3D"CacheMode">REPL_ASYNC</attribute>
-      <attribute name=3D"UseReplQueue">false</attribute>
-      <attribute name=3D"ReplQueueInterval">0</attribute>
-      <attribute name=3D"ReplQueueMaxElements">0</attribute>
-      <attribute name=3D"ClusterName">JBossCache-Cluster</attribute>
-      <attribute name=3D"ClusterConfig">
-         <config>
-            <!--<UDP mcast_addr=3D"232.10.10.10"-->
-                 <!--mcast_port=3D"45599"-->
-                 <!--tos=3D"8"-->
-                 <!--ucast_recv_buf_size=3D"20000000"-->
-                 <!--ucast_send_buf_size=3D"640000"-->
-                 <!--mcast_recv_buf_size=3D"25000000"-->
-                 <!--mcast_send_buf_size=3D"640000"-->
-                 <!--loopback=3D"false"-->
-                 <!--discard_incompatible_packets=3D"true"-->
-                 <!--max_bundle_size=3D"64000"-->
-                 <!--max_bundle_timeout=3D"30"-->
-                 <!--use_incoming_packet_handler=3D"true"-->
-                 <!--use_outgoing_packet_handler=3D"false"-->
-                 <!--ip_ttl=3D"2"-->
-                 <!--down_thread=3D"false" up_thread=3D"false"-->
-                 <!--enable_bundling=3D"true"/>-->
-            <!--<PING timeout=3D"2000"-->
-                  <!--down_thread=3D"false" up_thread=3D"false" num_initia=
l_members=3D"3"/>-->
-
-            <!--<TCP-->
-                 <!--loopback=3D"false"-->
-                 <!--discard_incompatible_packets=3D"true"-->
-                 <!--max_bundle_size=3D"64000"-->
-                 <!--max_bundle_timeout=3D"30"-->
-                 <!--use_incoming_packet_handler=3D"true"-->
-                 <!--use_outgoing_packet_handler=3D"false"-->
-                 <!--bind_addr=3D"127.0.0.1"-->
-                 <!--start_port=3D"7800"-->
-                 <!--enable_bundling=3D"false"-->
-                 <!--tcp_nodelay=3D"true"-->
-                 <!--/>-->
-            <!--<MPING timeout=3D"2000" num_initial_members=3D"3" mcast_ad=
dr=3D"224.10.10.15" mcast_port=3D"44553"/>-->
-            <!--<MERGE2 max_interval=3D"100000"-->
-                    <!--down_thread=3D"false" up_thread=3D"false" min_inte=
rval=3D"20000"/>-->
-            <!--<FD_SOCK down_thread=3D"false" up_thread=3D"false"/>-->
-            <!--<FD timeout=3D"10000" max_tries=3D"5" down_thread=3D"false=
" up_thread=3D"false" shun=3D"true"/>-->
-            <!--<VERIFY_SUSPECT timeout=3D"1500" down_thread=3D"false" up_=
thread=3D"false"/>-->
-            <!--<pbcast.NAKACK max_xmit_size=3D"60000"-->
-                           <!--use_mcast_xmit=3D"false" gc_lag=3D"0"-->
-                           <!--retransmit_timeout=3D"300,600,1200,2400,480=
0"-->
-                           <!--down_thread=3D"false" up_thread=3D"false"-->
-                           <!--discard_delivered_msgs=3D"true"/>-->
-            <!--<UNICAST timeout=3D"300,600,1200,2400,3600"-->
-                     <!--down_thread=3D"false" up_thread=3D"false"/>-->
-            <!--<pbcast.STABLE stability_delay=3D"1000" desired_avg_gossip=
=3D"50000"-->
-                           <!--down_thread=3D"false" up_thread=3D"false"-->
-                           <!--max_bytes=3D"400000"/>-->
-            <!--<pbcast.GMS print_local_addr=3D"true" join_timeout=3D"3000=
" use_flush=3D"true" flush_timeout=3D"3000"-->
-                        <!--down_thread=3D"false" up_thread=3D"false"-->
-                        <!--join_retry_timeout=3D"2000" shun=3D"false"-->
-                        <!--view_bundling=3D"true"/>-->
-            <!--<FC max_credits=3D"2000000" down_thread=3D"false" up_threa=
d=3D"false"-->
-                <!--min_threshold=3D"0.20"/>-->
-            <!--<FRAG2 frag_size=3D"60000" down_thread=3D"false" up_thread=
=3D"false"/>-->
-            <!-- <pbcast.STREAMING_STATE_TRANSFER down_thread=3D"false" up=
_thread=3D"false"-->
-                                         <!--use_flush=3D"true" flush_time=
out=3D"3000" use_reading_thread=3D"true"/> -->
-            <!--<pbcast.STATE_TRANSFER down_thread=3D"false" up_thread=3D"=
false" use_flush=3D"true" flush_timeout=3D"3000"/>-->
-            <!--<pbcast.FLUSH down_thread=3D"false" up_thread=3D"false" ti=
meout=3D"8000" auto_flush_conf=3D"false"/>-->
-
-              <TCP start_port=3D"7580"
-         loopback=3D"false"
-         discard_incompatible_packets=3D"true"
-         max_bundle_size=3D"64000"
-         max_bundle_timeout=3D"30"
-         use_incoming_packet_handler=3D"true"
-         enable_bundling=3D"true"
-         enable_diagnostics=3D"true"
-         thread_naming_pattern=3D"cl"
-
-         use_concurrent_stack=3D"true"
-
-	 recv_buf_size=3D"20000000"
-	 send_buf_size=3D"20000000"
-
-         thread_pool.enabled=3D"true"
-         thread_pool.min_threads=3D"2"
-         thread_pool.max_threads=3D"4"
-         thread_pool.keep_alive_time=3D"5000"
-         thread_pool.queue_enabled=3D"true"
-         thread_pool.queue_max_size=3D"100000"
-         thread_pool.rejection_policy=3D"discard"
-
-         oob_thread_pool.enabled=3D"true"
-         oob_thread_pool.min_threads=3D"4"
-         oob_thread_pool.max_threads=3D"8"
-         oob_thread_pool.keep_alive_time=3D"5000"
-         oob_thread_pool.queue_enabled=3D"false"
-         oob_thread_pool.queue_max_size=3D"100"
-         oob_thread_pool.rejection_policy=3D"Run"/>
-
-    <MPING timeout=3D"2000" mcast_addr=3D"232.1.2.3"
-            num_initial_members=3D"3"/>
-    <MERGE2 max_interval=3D"30000"
-            min_interval=3D"10000"/>
-    <FD_SOCK/>
-    <FD timeout=3D"10000" max_tries=3D"5"   shun=3D"true"/>
-    <VERIFY_SUSPECT timeout=3D"1500"  />
-    <BARRIER />
-    <pbcast.NAKACK use_stats_for_retransmission=3D"false"
-                   exponential_backoff=3D"150"
-                   use_mcast_xmit=3D"false" gc_lag=3D"0"
-                   retransmit_timeout=3D"50,300,600,1200"
-                   discard_delivered_msgs=3D"true"/>
-    <pbcast.STABLE stability_delay=3D"1000" desired_avg_gossip=3D"50000"
-                   max_bytes=3D"1000000"/>
-    <VIEW_SYNC avg_send_interval=3D"60000"   />
-    <pbcast.GMS print_local_addr=3D"true" join_timeout=3D"3000"
-                shun=3D"false"
-                view_bundling=3D"true"/>
-    <FC max_credits=3D"10000000"
-                    min_threshold=3D"0.20"/>
-    <FRAG2 frag_size=3D"60000"  />
-    <pbcast.STATE_TRANSFER  />
-
-         </config>
-      </attribute>
-      <attribute name=3D"FetchInMemoryState">true</attribute>
-      <attribute name=3D"InitialStateRetrievalTimeout">15000</attribute>
-      <attribute name=3D"SyncReplTimeout">60000</attribute>
-      <attribute name=3D"LockAcquisitionTimeout">10000</attribute>
-      <attribute name=3D"EvictionPolicyConfig">
-      </attribute>
-
-      <attribute name=3D"CacheLoaderConfiguration">
-      </attribute>
-
-      <attribute name=3D"UseRegionBasedMarshalling">false</attribute>
-
-      <!-- Buddy Replication config -->
-      <attribute name=3D"BuddyReplicationConfig">
-         <config>
-            <buddyReplicationEnabled>true</buddyReplicationEnabled>
-            <buddyLocatorClass>org.jboss.cache.buddyreplication.NextMember=
BuddyLocator</buddyLocatorClass>
-            <buddyLocatorProperties>
-               numBuddies =3D 1
-               ignoreColocatedBuddies =3D true
-            </buddyLocatorProperties>
-
-            <buddyPoolName>myBuddyPoolReplicationGroup</buddyPoolName>
-
-            <buddyCommunicationTimeout>2000</buddyCommunicationTimeout>
-
-
-            <autoDataGravitation>false</autoDataGravitation>
-
-            <dataGravitationRemoveOnFind>true</dataGravitationRemoveOnFind>
-
-            <dataGravitationSearchBackupTrees>true</dataGravitationSearchB=
ackupTrees>
-
-         </config>
-      </attribute>
-
-   </mbean>
-</server>

Deleted: benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.1.0/con=
f/pess-repl-async.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.1.0cr2/conf/=
pess-repl-async.xml	2008-01-16 00:43:28 UTC (rev 5140)
+++ benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.1.0/conf/pes=
s-repl-async.xml	2008-01-16 10:18:16 UTC (rev 5141)
@@ -1,81 +0,0 @@
-<?xml version=3D"1.0" encoding=3D"UTF-8"?>
-
-<server>
-
-   <classpath codebase=3D"./lib" archives=3D"jboss-cache.jar, jgroups.jar"=
/>
-
-
-   <mbean code=3D"org.jboss.cache.CacheImpl"
-          name=3D"jboss.cache:service=3DTreeCache">
-
-      <depends>jboss:service=3DNaming</depends>
-      <depends>jboss:service=3DTransactionManager</depends>
-
-      <attribute name=3D"TransactionManagerLookupClass">org.jboss.cache.tr=
ansaction.GenericTransactionManagerLookup</attribute>
-      <attribute name=3D"IsolationLevel">READ_COMMITTED</attribute>
-      <attribute name=3D"CacheMode">REPL_ASYNC</attribute>
-      <attribute name=3D"UseReplQueue">true</attribute>
-      <attribute name=3D"ReplQueueInterval">0</attribute>
-      <attribute name=3D"ReplQueueMaxElements">100</attribute>
-      <attribute name=3D"ClusterName">JBossCache-Cluster</attribute>
-      <attribute name=3D"ClusterConfig">
-         <config>
-            <UDP mcast_addr=3D"232.10.10.10"
-                 mcast_port=3D"45599"
-                 tos=3D"8"
-                 ucast_recv_buf_size=3D"20000000"
-                 ucast_send_buf_size=3D"640000"
-                 mcast_recv_buf_size=3D"25000000"
-                 mcast_send_buf_size=3D"640000"
-                 loopback=3D"false"
-                 discard_incompatible_packets=3D"true"
-                 max_bundle_size=3D"64000"
-                 max_bundle_timeout=3D"30"
-                 use_incoming_packet_handler=3D"true"
-                 use_outgoing_packet_handler=3D"false"
-                 ip_ttl=3D"2"
-                 down_thread=3D"false" up_thread=3D"false"
-                 enable_bundling=3D"false"/>
-            <PING timeout=3D"2000"
-                  down_thread=3D"false" up_thread=3D"false" num_initial_me=
mbers=3D"3"/>
-            <MERGE2 max_interval=3D"100000"
-                    down_thread=3D"false" up_thread=3D"false" min_interval=
=3D"20000"/>
-            <FD_SOCK down_thread=3D"false" up_thread=3D"false"/>
-            <FD timeout=3D"10000" max_tries=3D"5" down_thread=3D"false" up=
_thread=3D"false" shun=3D"true"/>
-            <VERIFY_SUSPECT timeout=3D"1500" down_thread=3D"false" up_thre=
ad=3D"false"/>
-            <pbcast.NAKACK max_xmit_size=3D"60000"
-                           use_mcast_xmit=3D"false" gc_lag=3D"0"
-                           retransmit_timeout=3D"300,600,1200,2400,4800"
-                           down_thread=3D"false" up_thread=3D"false"
-                           discard_delivered_msgs=3D"true"/>
-            <UNICAST timeout=3D"300,600,1200,2400,3600"
-                     down_thread=3D"false" up_thread=3D"false"/>
-            <pbcast.STABLE stability_delay=3D"1000" desired_avg_gossip=3D"=
50000"
-                           down_thread=3D"false" up_thread=3D"false"
-                           max_bytes=3D"400000"/>
-            <pbcast.GMS print_local_addr=3D"true" join_timeout=3D"3000" us=
e_flush=3D"true" flush_timeout=3D"3000"
-                        down_thread=3D"false" up_thread=3D"false"
-                        join_retry_timeout=3D"2000" shun=3D"false"
-                        view_bundling=3D"true"/>
-            <FC max_credits=3D"2000000" down_thread=3D"false" up_thread=3D=
"false"
-                min_threshold=3D"0.20"/>
-            <FRAG2 frag_size=3D"60000" down_thread=3D"false" up_thread=3D"=
false"/>
-            <!-- <pbcast.STREAMING_STATE_TRANSFER down_thread=3D"false" up=
_thread=3D"false"
-                                         use_flush=3D"true" flush_timeout=
=3D"3000" use_reading_thread=3D"true"/> -->
-            <pbcast.STATE_TRANSFER down_thread=3D"false" up_thread=3D"fals=
e" use_flush=3D"true" flush_timeout=3D"3000"/>
-            <pbcast.FLUSH down_thread=3D"false" up_thread=3D"false" timeou=
t=3D"8000" auto_flush_conf=3D"false"/>
-         </config>
-      </attribute>
-      <attribute name=3D"FetchInMemoryState">true</attribute>
-      <attribute name=3D"InitialStateRetrievalTimeout">15000</attribute>
-      <attribute name=3D"SyncReplTimeout">60000</attribute>
-      <attribute name=3D"LockAcquisitionTimeout">10000</attribute>
-      <attribute name=3D"EvictionPolicyConfig">
-      </attribute>
-
-      <attribute name=3D"CacheLoaderConfiguration">
-      </attribute>
-
-      <attribute name=3D"UseRegionBasedMarshalling">false</attribute>
-   </mbean>
-</server>

Deleted: benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.1.0/con=
f/pess-repl-sync-br.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.1.0cr2/conf/=
pess-repl-sync-br.xml	2008-01-16 00:43:28 UTC (rev 5140)
+++ benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.1.0/conf/pes=
s-repl-sync-br.xml	2008-01-16 10:18:16 UTC (rev 5141)
@@ -1,116 +0,0 @@
-<?xml version=3D"1.0" encoding=3D"UTF-8"?>
-
-<server>
-
-   <classpath codebase=3D"./lib" archives=3D"jboss-cache.jar, jgroups.jar"=
/>
-
-
-   <mbean code=3D"org.jboss.cache.CacheImpl"
-          name=3D"jboss.cache:service=3DTreeCache">
-
-      <depends>jboss:service=3DNaming</depends>
-      <depends>jboss:service=3DTransactionManager</depends>
-
-      <attribute name=3D"TransactionManagerLookupClass">org.jboss.cache.tr=
ansaction.GenericTransactionManagerLookup</attribute>
-      <attribute name=3D"IsolationLevel">READ_COMMITTED</attribute>
-      <attribute name=3D"CacheMode">REPL_SYNC</attribute>
-      <attribute name=3D"UseReplQueue">false</attribute>
-      <attribute name=3D"ReplQueueInterval">0</attribute>
-      <attribute name=3D"ReplQueueMaxElements">0</attribute>
-      <attribute name=3D"ClusterName">JBossCache-Cluster</attribute>
-      <attribute name=3D"ClusterConfig">
-         <config>
-            <TCP start_port=3D"7580"
-         loopback=3D"false"
-         discard_incompatible_packets=3D"true"
-         max_bundle_size=3D"64000"
-         max_bundle_timeout=3D"30"
-         use_incoming_packet_handler=3D"true"
-         enable_bundling=3D"true"
-         enable_diagnostics=3D"true"
-         thread_naming_pattern=3D"cl"
-
-         use_concurrent_stack=3D"true"
-
-	 recv_buf_size=3D"20000000"
-	 send_buf_size=3D"20000000"
-
-         thread_pool.enabled=3D"true"
-         thread_pool.min_threads=3D"2"
-         thread_pool.max_threads=3D"4"
-         thread_pool.keep_alive_time=3D"5000"
-         thread_pool.queue_enabled=3D"true"
-         thread_pool.queue_max_size=3D"100000"
-         thread_pool.rejection_policy=3D"discard"
-
-         oob_thread_pool.enabled=3D"true"
-         oob_thread_pool.min_threads=3D"4"
-         oob_thread_pool.max_threads=3D"8"
-         oob_thread_pool.keep_alive_time=3D"5000"
-         oob_thread_pool.queue_enabled=3D"false"
-         oob_thread_pool.queue_max_size=3D"100"
-         oob_thread_pool.rejection_policy=3D"Run"/>
-
-    <MPING timeout=3D"2000" mcast_addr=3D"232.1.2.3"
-            num_initial_members=3D"3"/>
-    <MERGE2 max_interval=3D"30000"
-            min_interval=3D"10000"/>
-    <FD_SOCK/>
-    <FD timeout=3D"10000" max_tries=3D"5"   shun=3D"true"/>
-    <VERIFY_SUSPECT timeout=3D"1500"  />
-    <BARRIER />
-    <pbcast.NAKACK use_stats_for_retransmission=3D"false"
-                   exponential_backoff=3D"150"
-                   use_mcast_xmit=3D"false" gc_lag=3D"0"
-                   retransmit_timeout=3D"50,300,600,1200"
-                   discard_delivered_msgs=3D"true"/>
-    <pbcast.STABLE stability_delay=3D"1000" desired_avg_gossip=3D"50000"
-                   max_bytes=3D"1000000"/>
-    <VIEW_SYNC avg_send_interval=3D"60000"   />
-    <pbcast.GMS print_local_addr=3D"true" join_timeout=3D"3000"
-                shun=3D"false"
-                view_bundling=3D"true"/>
-    <FC max_credits=3D"10000000"
-                    min_threshold=3D"0.20"/>
-    <FRAG2 frag_size=3D"60000"  />
-    <pbcast.STATE_TRANSFER  />
-         </config>
-      </attribute>
-      <attribute name=3D"FetchInMemoryState">true</attribute>
-      <attribute name=3D"InitialStateRetrievalTimeout">15000</attribute>
-      <attribute name=3D"SyncReplTimeout">60000</attribute>
-      <attribute name=3D"LockAcquisitionTimeout">10000</attribute>
-      <attribute name=3D"EvictionPolicyConfig">
-      </attribute>
-
-      <attribute name=3D"CacheLoaderConfiguration">
-      </attribute>
-
-      <attribute name=3D"UseRegionBasedMarshalling">false</attribute>
-
-      <!-- Buddy Replication config -->
-      <attribute name=3D"BuddyReplicationConfig">
-         <config>
-            <buddyReplicationEnabled>true</buddyReplicationEnabled>
-            <buddyLocatorClass>org.jboss.cache.buddyreplication.NextMember=
BuddyLocator</buddyLocatorClass>
-            <buddyLocatorProperties>
-               numBuddies =3D 1
-               ignoreColocatedBuddies =3D true
-            </buddyLocatorProperties>
-
-            <buddyPoolName>myBuddyPoolReplicationGroup</buddyPoolName>
-
-            <buddyCommunicationTimeout>2000</buddyCommunicationTimeout>
-
-
-            <autoDataGravitation>false</autoDataGravitation>
-
-            <dataGravitationRemoveOnFind>true</dataGravitationRemoveOnFind>
-
-            <dataGravitationSearchBackupTrees>true</dataGravitationSearchB=
ackupTrees>
-
-         </config>
-      </attribute>
-
-   </mbean>
-</server>

Deleted: benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.1.0/con=
f/pess-repl-sync.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.1.0cr2/conf/=
pess-repl-sync.xml	2008-01-16 00:43:28 UTC (rev 5140)
+++ benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.1.0/conf/pes=
s-repl-sync.xml	2008-01-16 10:18:16 UTC (rev 5141)
@@ -1,82 +0,0 @@
-<?xml version=3D"1.0" encoding=3D"UTF-8"?>
-
-<server>
-
-   <classpath codebase=3D"./lib" archives=3D"jboss-cache.jar, jgroups.jar"=
/>
-
-
-   <mbean code=3D"org.jboss.cache.CacheImpl"
-          name=3D"jboss.cache:service=3DTreeCache">
-
-      <depends>jboss:service=3DNaming</depends>
-      <depends>jboss:service=3DTransactionManager</depends>
-
-      <attribute name=3D"TransactionManagerLookupClass">org.jboss.cache.tr=
ansaction.GenericTransactionManagerLookup</attribute>
-      <attribute name=3D"IsolationLevel">REPEATABLE_READ</attribute>
-      <attribute name=3D"CacheMode">REPL_SYNC</attribute>
-      <attribute name=3D"UseReplQueue">false</attribute>
-      <attribute name=3D"ReplQueueInterval">0</attribute>
-      <attribute name=3D"ReplQueueMaxElements">0</attribute>
-      <attribute name=3D"ClusterName">JBossCache-Cluster</attribute>
-      <attribute name=3D"ClusterConfig">
-         <config>
-            <UDP mcast_addr=3D"224.10.10.10"
-                 mcast_port=3D"45599"
-                 tos=3D"8"
-                 ucast_recv_buf_size=3D"20000000"
-                 ucast_send_buf_size=3D"640000"
-                 mcast_recv_buf_size=3D"25000000"
-                 mcast_send_buf_size=3D"640000"
-                 loopback=3D"false"
-                 discard_incompatible_packets=3D"true"
-                 max_bundle_size=3D"64000"
-                 max_bundle_timeout=3D"30"
-                 use_incoming_packet_handler=3D"true"
-                 use_outgoing_packet_handler=3D"false"
-                 ip_ttl=3D"2"
-                 down_thread=3D"false" up_thread=3D"false"
-                 bind_addr=3D"127.0.0.1"
-                 enable_bundling=3D"false"/>
-            <PING timeout=3D"2000"
-                  down_thread=3D"false" up_thread=3D"false" num_initial_me=
mbers=3D"3"/>
-            <MERGE2 max_interval=3D"100000"
-                    down_thread=3D"false" up_thread=3D"false" min_interval=
=3D"20000"/>
-            <FD_SOCK down_thread=3D"false" up_thread=3D"false"/>
-            <FD timeout=3D"10000" max_tries=3D"5" down_thread=3D"false" up=
_thread=3D"false" shun=3D"true"/>
-            <VERIFY_SUSPECT timeout=3D"1500" down_thread=3D"false" up_thre=
ad=3D"false"/>
-            <pbcast.NAKACK max_xmit_size=3D"60000"
-                           use_mcast_xmit=3D"false" gc_lag=3D"0"
-                           retransmit_timeout=3D"300,600,1200,2400,4800"
-                           down_thread=3D"false" up_thread=3D"false"
-                           discard_delivered_msgs=3D"true"/>
-            <UNICAST timeout=3D"300,600,1200,2400,3600"
-                     down_thread=3D"false" up_thread=3D"false"/>
-            <pbcast.STABLE stability_delay=3D"1000" desired_avg_gossip=3D"=
50000"
-                           down_thread=3D"false" up_thread=3D"false"
-                           max_bytes=3D"400000"/>
-            <pbcast.GMS print_local_addr=3D"true" join_timeout=3D"3000" us=
e_flush=3D"true" flush_timeout=3D"3000"
-                        down_thread=3D"false" up_thread=3D"false"
-                        join_retry_timeout=3D"2000" shun=3D"false"
-                        view_bundling=3D"true"/>
-            <FC max_credits=3D"2000000" down_thread=3D"false" up_thread=3D=
"false"
-                min_threshold=3D"0.20"/>
-            <FRAG2 frag_size=3D"60000" down_thread=3D"false" up_thread=3D"=
false"/>
-            <!-- <pbcast.STREAMING_STATE_TRANSFER down_thread=3D"false" up=
_thread=3D"false"
-                                         use_flush=3D"true" flush_timeout=
=3D"3000" use_reading_thread=3D"true"/> -->
-            <pbcast.STATE_TRANSFER down_thread=3D"false" up_thread=3D"fals=
e" use_flush=3D"true" flush_timeout=3D"3000"/>
-            <pbcast.FLUSH down_thread=3D"false" up_thread=3D"false" timeou=
t=3D"8000" auto_flush_conf=3D"false"/>
-         </config>
-      </attribute>
-      <attribute name=3D"FetchInMemoryState">false</attribute>
-      <attribute name=3D"InitialStateRetrievalTimeout">15000</attribute>
-      <attribute name=3D"SyncReplTimeout">60000</attribute>
-      <attribute name=3D"LockAcquisitionTimeout">10000</attribute>
-      <attribute name=3D"EvictionPolicyConfig">
-      </attribute>
-
-      <attribute name=3D"CacheLoaderConfiguration">
-      </attribute>
-
-      <attribute name=3D"UseRegionBasedMarshalling">false</attribute>
-   </mbean>
-</server>

Deleted: benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.1.0/lib=
/jboss-common-core-2.0.4.GA.jar
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)

Added: benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.1.0/lib/j=
boss-common-core.jar
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)


Property changes on: benchmarks/benchmark-fwk/trunk/cache-products/jbosscac=
he-2.1.0/lib/jboss-common-core.jar
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Deleted: benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.1.0/lib=
/jboss-javaee-5.0.0.Beta3.jar
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)

Added: benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.1.0/lib/j=
boss-javaee.jar
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)


Property changes on: benchmarks/benchmark-fwk/trunk/cache-products/jbosscac=
he-2.1.0/lib/jboss-javaee.jar
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.1.0/li=
b/jbosscache-core.jar
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)

Deleted: benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.1.0/lib=
/jcip-annotations-1.0.jar
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)

Added: benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.1.0/lib/j=
cip-annotations.jar
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)


Property changes on: benchmarks/benchmark-fwk/trunk/cache-products/jbosscac=
he-2.1.0/lib/jcip-annotations.jar
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Deleted: benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.1.0/lib=
/jgroups-2.6.0.GA.jar
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)

Added: benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.1.0/lib/j=
groups.jar
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)


Property changes on: benchmarks/benchmark-fwk/trunk/cache-products/jbosscac=
he-2.1.0/lib/jgroups.jar
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream


--===============8295359837747094463==--

From jbosscache-commits at lists.jboss.org Wed Jan 16 05:30:57 2008
Content-Type: multipart/mixed; boundary="===============6405244023203816541=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r5142 -
 benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.1.0/conf.
Date: Wed, 16 Jan 2008 05:30:56 -0500
Message-ID: <E1JF5Xs-0000T3-Lj@committer01.frg.pub.inap.atl.jboss.com>

--===============6405244023203816541==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: mircea.markus
Date: 2008-01-16 05:30:56 -0500 (Wed, 16 Jan 2008)
New Revision: 5142

Added:
   benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.1.0/conf/jbc2=
10-br_tcp_mping.xml
Log:


Copied: benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.1.0/conf=
/jbc210-br_tcp_mping.xml (from rev 5141, benchmarks/benchmark-fwk/trunk/cac=
he-products/jbosscache-2.1.0/conf/config.xml)
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.1.0/conf/jbc=
210-br_tcp_mping.xml	                        (rev 0)
+++ benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.1.0/conf/jbc=
210-br_tcp_mping.xml	2008-01-16 10:30:56 UTC (rev 5142)
@@ -0,0 +1,254 @@
+<?xml version=3D"1.0" encoding=3D"UTF-8"?>
+
+<!-- =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D -->
+<!--                                                                      =
 -->
+<!--  Sample TreeCache Service Configuration                              =
 -->
+<!--                                                                      =
 -->
+<!-- =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D -->
+
+<server>
+
+   <!-- =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D -->
+   <!-- Defines TreeCache configuration                                   =
   -->
+   <!-- =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D -->
+
+   <mbean code=3D"org.jboss.cache.jmx.CacheJmxWrapper"
+          name=3D"jboss.cache:service=3DTreeCache">
+
+      <depends>jboss:service=3DNaming</depends>
+      <depends>jboss:service=3DTransactionManager</depends>
+
+      <!--
+          Configure the TransactionManager
+      -->
+      <attribute name=3D"TransactionManagerLookupClass">org.jboss.cache.tr=
ansaction.GenericTransactionManagerLookup
+      </attribute>
+
+      <!--
+          Isolation level : SERIALIZABLE
+                            REPEATABLE_READ (default)
+                            READ_COMMITTED
+                            READ_UNCOMMITTED
+                            NONE
+      -->
+      <attribute name=3D"IsolationLevel">REPEATABLE_READ</attribute>
+
+       <!--<attribute name=3D"NodeLockingScheme">OPTIMISTIC</attribute>-->
+
+      <!--
+           Valid modes are LOCAL
+                           REPL_ASYNC
+                           REPL_SYNC
+                           INVALIDATION_ASYNC
+                           INVALIDATION_SYNC
+      -->
+      <attribute name=3D"CacheMode">REPL_ASYNC</attribute>
+
+      <!--
+      Just used for async repl: use a replication queue
+      -->
+      <attribute name=3D"UseReplQueue">false</attribute>
+
+      <!--
+          Replication interval for replication queue (in ms)
+      -->
+      <attribute name=3D"ReplQueueInterval">0</attribute>
+
+      <!--
+          Max number of elements which trigger replication
+      -->
+      <attribute name=3D"ReplQueueMaxElements">0</attribute>
+
+      <!-- Name of cluster. Needs to be the same for all TreeCache nodes i=
n a
+           cluster in order to find each other.
+      -->
+      <attribute name=3D"ClusterName">JBossCache-Cluster</attribute>
+
+      <!--Uncomment next three statements to enable JGroups multiplexer.
+This configuration is dependent on the JGroups multiplexer being
+registered in an MBean server such as JBossAS.  -->
+      <!--
+      <depends>jgroups.mux:name=3DMultiplexer</depends>
+      <attribute name=3D"MultiplexerService">jgroups.mux:name=3DMultiplexe=
r</attribute>
+      <attribute name=3D"MultiplexerStack">fc-fast-minimalthreads</attribu=
te>
+      -->
+
+      <!-- JGroups protocol stack properties.
+         ClusterConfig isn't used if the multiplexer is enabled and succes=
sfully initialized.
+      -->
+      <attribute name=3D"ClusterConfig">
+         <config>
+             <!--<UDP mcast_addr=3D"232.10.10.10"
+                              mcast_port=3D"45588"
+                              tos=3D"8"
+                              ucast_recv_buf_size=3D"20000000"
+                              ucast_send_buf_size=3D"640000"
+                              mcast_recv_buf_size=3D"25000000"
+                              mcast_send_buf_size=3D"640000"
+                              loopback=3D"false"
+                              discard_incompatible_packets=3D"true"
+                              max_bundle_size=3D"64000"
+                              max_bundle_timeout=3D"30"
+                              use_incoming_packet_handler=3D"true"
+                              ip_ttl=3D"2"
+                              enable_bundling=3D"false"
+                              enable_unicast_bundling=3D"false"
+                              enable_diagnostics=3D"true"
+
+                              use_concurrent_stack=3D"true"
+
+                              thread_naming_pattern=3D"pl"
+
+                              thread_pool.enabled=3D"true"
+                              thread_pool.min_threads=3D"1"
+                              thread_pool.max_threads=3D"4"
+                              thread_pool.keep_alive_time=3D"30000"
+                              thread_pool.queue_enabled=3D"true"
+                              thread_pool.queue_max_size=3D"50000"
+                              thread_pool.rejection_policy=3D"discard"
+
+                              oob_thread_pool.enabled=3D"true"
+                              oob_thread_pool.min_threads=3D"2"
+                              oob_thread_pool.max_threads=3D"4"
+                              oob_thread_pool.keep_alive_time=3D"10000"
+                              oob_thread_pool.queue_enabled=3D"false"
+                              oob_thread_pool.queue_max_size=3D"10"
+                              oob_thread_pool.rejection_policy=3D"Run"/>-->
+
+            <TCP recv_buf_size=3D"20000000" use_send_queues=3D"false"
+                 loopback=3D"false"
+                 discard_incompatible_packets=3D"true"
+                 max_bundle_size=3D"64000"
+                 max_bundle_timeout=3D"30"
+                 use_incoming_packet_handler=3D"true"
+                 enable_bundling=3D"true"
+                 enable_unicast_bundling=3D"true"
+                 enable_diagnostics=3D"true"
+
+                 use_concurrent_stack=3D"true"
+
+                 thread_naming_pattern=3D"pl"
+
+                 thread_pool.enabled=3D"true"
+                 thread_pool.min_threads=3D"1"
+                 thread_pool.max_threads=3D"4"
+                 thread_pool.keep_alive_time=3D"30000"
+                 thread_pool.queue_enabled=3D"true"
+                 thread_pool.queue_max_size=3D"50000"
+                 thread_pool.rejection_policy=3D"discard"
+
+                 oob_thread_pool.enabled=3D"true"
+                 oob_thread_pool.min_threads=3D"2"
+                 oob_thread_pool.max_threads=3D"4"
+                 oob_thread_pool.keep_alive_time=3D"10000"
+                 oob_thread_pool.queue_enabled=3D"false"
+                 oob_thread_pool.queue_max_size=3D"10"
+                 oob_thread_pool.rejection_policy=3D"Run"/>
+
+            <!--<PING timeout=3D"2000" num_initial_members=3D"3"/>-->
+             <MPING mcast_addr=3D"232.1.2.3" timeout=3D"2000" num_initial_=
members=3D"3"/>
+            <MERGE2 max_interval=3D"30000" min_interval=3D"10000"/>
+            <FD_SOCK/>
+            <FD timeout=3D"10000" max_tries=3D"5" shun=3D"true"/>
+            <VERIFY_SUSPECT timeout=3D"1500"/>
+            <pbcast.NAKACK use_mcast_xmit=3D"false" gc_lag=3D"0"
+                           retransmit_timeout=3D"300,600,1200,2400,4800"
+                           discard_delivered_msgs=3D"true"/>
+            <!--<UNICAST timeout=3D"30,60,120,300,600,1200,2400,3600"/>-->
+            <pbcast.STABLE stability_delay=3D"1000" desired_avg_gossip=3D"=
50000"
+                           max_bytes=3D"400000"/>
+            <pbcast.GMS print_local_addr=3D"true" join_timeout=3D"5000"
+                        join_retry_timeout=3D"2000" shun=3D"false"
+                        view_bundling=3D"true" view_ack_collection_timeout=
=3D"5000"/>
+              <FC max_credits=3D"5000000"
+                    min_threshold=3D"0.20"/>
+            <FRAG2 frag_size=3D"60000"/>
+            <pbcast.STREAMING_STATE_TRANSFER use_reading_thread=3D"true"/>
+            <!-- <pbcast.STATE_TRANSFER/> -->
+            <pbcast.FLUSH timeout=3D"0"/>
+         </config>
+      </attribute>
+
+
+      <!--
+       Whether or not to fetch state on joining a cluster
+       NOTE this used to be called FetchStateOnStartup and has been rename=
d to be more descriptive.
+      -->
+      <attribute name=3D"FetchInMemoryState">true</attribute>
+
+      <!--
+          The max amount of time (in milliseconds) we wait until the
+          state (ie. the contents of the cache) are retrieved from
+          existing members in a clustered environment
+      -->
+      <attribute name=3D"StateRetrievalTimeout">15000</attribute>
+
+      <!--
+          Number of milliseconds to wait until all responses for a
+          synchronous call have been received.
+      -->
+      <attribute name=3D"SyncReplTimeout">15000</attribute>
+
+      <!-- Max number of milliseconds to wait for a lock acquisition -->
+      <attribute name=3D"LockAcquisitionTimeout">10000</attribute>
+
+      <!--
+         Indicate whether to use region based marshalling or not. Set this=
 to true if you are running under a scoped
+         class loader, e.g., inside an application server. Default is "fal=
se".
+      -->
+      <attribute name=3D"UseRegionBasedMarshalling">true</attribute>
+
+
+       <attribute name=3D"BuddyReplicationConfig">
+           <config>
+
+               <!-- Enables buddy replication. This is the ONLY mandatory =
configuration element here. -->
+               <buddyReplicationEnabled>true</buddyReplicationEnabled>
+
+               <!-- These are the default values anyway -->
+               <buddyLocatorClass>org.jboss.cache.buddyreplication.NextMem=
berBuddyLocator</buddyLocatorClass>
+
+               <!--  numBuddies is the number of backup nodes each node ma=
intains. ignoreColocatedBuddies means
+            that each node will *try* to select a buddy on a different phy=
sical host. If not able to do so though,
+            it will fall back to colocated nodes. -->
+               <buddyLocatorProperties>
+                   numBuddies =3D 1
+                   ignoreColocatedBuddies =3D true
+               </buddyLocatorProperties>
+
+               <!-- A way to specify a preferred replication group. If spe=
cified, we try and pick a buddy which shares
+           the same pool name (falling back to other buddies if not availa=
ble). This allows the sysdmin to
+           hint at backup buddies are picked, so for example, nodes may be=
 hinted topick buddies on a different
+           physical rack or power supply for added fault tolerance. -->
+               <buddyPoolName>myBuddyPoolReplicationGroup</buddyPoolName>
+
+               <!-- Communication timeout for inter-buddy group organisati=
on messages (such as assigning to and
+           removing from groups, defaults to 1000. -->
+               <buddyCommunicationTimeout>2000</buddyCommunicationTimeout>
+
+               <!-- Whether data is removed from old owners when gravitate=
d to a new owner. Defaults to true. -->
+               <dataGravitationRemoveOnFind>true</dataGravitationRemoveOnF=
ind>
+
+               <!-- Whether backup nodes can respond to data gravitation r=
equests, or only the data owner is
+           supposed to respond.  Defaults to true. -->
+               <dataGravitationSearchBackupTrees>true</dataGravitationSear=
chBackupTrees>
+
+               <!-- Whether all cache misses result in a data gravitation =
request. Defaults to false, requiring
+           callers to enable data gravitation on a per-invocation basis us=
ing the Options API. -->
+               <autoDataGravitation>false</autoDataGravitation>
+
+           </config>
+       </attribute>
+
+       =

+   </mbean>
+
+
+   <!--  Uncomment to get a graphical view of the TreeCache MBean above -->
+   <!--   <mbean code=3D"org.jboss.cache.TreeCacheView" name=3D"jboss.cach=
e:service=3DTreeCacheView">-->
+   <!--      <depends>jboss.cache:service=3DTreeCache</depends>-->
+   <!--      <attribute name=3D"CacheService">jboss.cache:service=3DTreeCa=
che</attribute>-->
+   <!--   </mbean>-->
+
+
+</server>


--===============6405244023203816541==--

From jbosscache-commits at lists.jboss.org Wed Jan 16 05:42:26 2008
Content-Type: multipart/mixed; boundary="===============4580424026163426736=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r5143 -
 benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.1.0.
Date: Wed, 16 Jan 2008 05:42:26 -0500
Message-ID: <E1JF5j0-0002TJ-L1@committer01.frg.pub.inap.atl.jboss.com>

--===============4580424026163426736==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: mircea.markus
Date: 2008-01-16 05:42:26 -0500 (Wed, 16 Jan 2008)
New Revision: 5143

Modified:
   benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.1.0/config.sh
Log:


Modified: benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.1.0/co=
nfig.sh
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.1.0/config.s=
h	2008-01-16 10:30:56 UTC (rev 5142)
+++ benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.1.0/config.s=
h	2008-01-16 10:42:26 UTC (rev 5143)
@@ -2,7 +2,7 @@
 =

 #see "$CACHE_ROOT/cache-products/cache.sh" for details
 =

-THIS_DIR=3D"./cache-products/jbosscache-2.1.0CR2"
+THIS_DIR=3D"./cache-products/jbosscache-2.1.0"
 =

 #setting up classpath
 for JAR in $THIS_DIR/lib/*
@@ -10,7 +10,7 @@
    CLASSPATH=3D$CLASSPATH:$JAR
 done
 =

-CLASSPATH=3D"$CLASSPATH:./classes/production/jbosscache-2.1.0CR2"
+CLASSPATH=3D"$CLASSPATH:./classes/production/jbosscache-2.1.0"
 CLASSPATH=3D"$CLASSPATH:$THIS_DIR/conf"
 #--classpath was set
 =



--===============4580424026163426736==--

From jbosscache-commits at lists.jboss.org Wed Jan 16 05:42:51 2008
Content-Type: multipart/mixed; boundary="===============2648002597045493199=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r5144 - in
 benchmarks/benchmark-fwk/trunk: cache-products/jbosscache-2.1.0/conf and 1
 other directory.
Date: Wed, 16 Jan 2008 05:42:50 -0500
Message-ID: <E1JF5jO-0002UQ-Uy@committer01.frg.pub.inap.atl.jboss.com>

--===============2648002597045493199==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: mircea.markus
Date: 2008-01-16 05:42:50 -0500 (Wed, 16 Jan 2008)
New Revision: 5144

Removed:
   benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.1.0/conf/conf=
ig.xml
Modified:
   benchmarks/benchmark-fwk/trunk/build.xml
Log:


Modified: benchmarks/benchmark-fwk/trunk/build.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- benchmarks/benchmark-fwk/trunk/build.xml	2008-01-16 10:42:26 UTC (rev 5=
143)
+++ benchmarks/benchmark-fwk/trunk/build.xml	2008-01-16 10:42:50 UTC (rev 5=
144)
@@ -407,14 +407,14 @@
   <!-- Module jbosscache-2.0.0 -->
   =

   <dirname property=3D"module.jbosscache200-plugin.basedir" file=3D"${ant.=
file}"/>
-  <dirname property=3D"module.jbosscache210cr2-plugin.basedir" file=3D"${a=
nt.file}"/>
+  <dirname property=3D"module.jbosscache210-plugin.basedir" file=3D"${ant.=
file}"/>
 =

   =

   =

   <property name=3D"compiler.args.jbosscache200-plugin" value=3D"${compile=
r.args}"/>
   =

   <property name=3D"jbosscache200-plugin.output.dir" value=3D"${module.jbo=
sscache200-plugin.basedir}/classes/production/jbosscache-2.0.0"/>
-  <property name=3D"jbosscache210cr2-plugin.output.dir" value=3D"${module.=
jbosscache210cr2-plugin.basedir}/classes/production/jbosscache-2.1.0cr2"/>
+  <property name=3D"jbosscache210-plugin.output.dir" value=3D"${module.jbo=
sscache210-plugin.basedir}/classes/production/jbosscache-2.1.0"/>
   <property name=3D"jbosscache200-plugin.testoutput.dir" value=3D"${module=
.jbosscache200-plugin.basedir}/classes/test/jbosscache-2.0.0"/>
   =

   <path id=3D"jbosscache200-plugin.module.bootclasspath">
@@ -430,12 +430,12 @@
     <pathelement location=3D"${jbosscache200-plugin.output.dir}" />
   </path>
 =

-  <path id=3D"jbosscache210cr2-plugin.module.classpath">
-    <fileset dir=3D"${module.jbosscache210cr2-plugin.basedir}/cache-produc=
ts/jbosscache-2.1.0cr2/lib" includes=3D"*.jar" />
+  <path id=3D"jbosscache210-plugin.module.classpath">
+    <fileset dir=3D"${module.jbosscache210-plugin.basedir}/cache-products/=
jbosscache-2.1.0/lib" includes=3D"*.jar" />
     <pathelement location=3D"${module.framework.basedir}/lib/commons-loggi=
ng.jar"/>
     <pathelement location=3D"${framework.output.dir}"/>
     <pathelement location=3D"${framework.testoutput.dir}"/>
-    <pathelement location=3D"${jbosscache210cr2-plugin.output.dir}" />
+    <pathelement location=3D"${jbosscache210-plugin.output.dir}" />
   </path>
   =

   =

@@ -474,12 +474,12 @@
     </copy>
   </target>
 =

-  <target name=3D"compile.module.jbosscache210cr2-plugin.production" depen=
ds=3D"compile.module.framework" description=3D"Compile module jbosscache-2.=
1.0cr2; production classes">
-    <mkdir dir=3D"${jbosscache210cr2-plugin.output.dir}"/>
-    <javac destdir=3D"${jbosscache210cr2-plugin.output.dir}" debug=3D"${co=
mpiler.debug}" nowarn=3D"${compiler.generate.no.warnings}" memorymaximumsiz=
e=3D"${compiler.max.memory}" fork=3D"true">
+  <target name=3D"compile.module.jbosscache210-plugin.production" depends=
=3D"compile.module.framework" description=3D"Compile module jbosscache-2.1.=
0cr2; production classes">
+    <mkdir dir=3D"${jbosscache210-plugin.output.dir}"/>
+    <javac destdir=3D"${jbosscache210-plugin.output.dir}" debug=3D"${compi=
ler.debug}" nowarn=3D"${compiler.generate.no.warnings}" memorymaximumsize=
=3D"${compiler.max.memory}" fork=3D"true">
       <compilerarg line=3D"${compiler.args}"/>
-      <classpath refid=3D"jbosscache210cr2-plugin.module.classpath"/>
-      <src path=3D"${module.jbosscache210cr2-plugin.basedir}/cache-product=
s/jbosscache-2.1.0cr2"/>
+      <classpath refid=3D"jbosscache210-plugin.module.classpath"/>
+      <src path=3D"${module.jbosscache210-plugin.basedir}/cache-products/j=
bosscache-2.1.0"/>
     </javac>
   </target>
 =

@@ -494,7 +494,7 @@
      <delete dir=3D"${module.framework.basedir}/classes"/>
   </target>
   =

-  <target name=3D"all" depends=3D"init, clean, compile.module.framework, c=
ompile.module.ehcache124-plugin, compile.module.coherence322-plugin,compile=
.module.jbosscache140-plugin, compile.module.jbosscache200-plugin, compile.=
module.jbosscache210cr2-plugin.production, compile.module.terracotta-plugin=
" description=3D"build all"/>
+  <target name=3D"all" depends=3D"init, clean, compile.module.framework, c=
ompile.module.ehcache124-plugin, compile.module.coherence322-plugin,compile=
.module.jbosscache140-plugin, compile.module.jbosscache200-plugin, compile.=
module.jbosscache210-plugin.production, compile.module.terracotta-plugin" d=
escription=3D"build all"/>
 =

    <target name=3D"checkClusterAddresses" depends=3D"compile.module.framew=
ork.production"
            description=3D"Check whether the cluster config is a valid one">

Deleted: benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.1.0/con=
f/config.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.1.0/conf/con=
fig.xml	2008-01-16 10:42:26 UTC (rev 5143)
+++ benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.1.0/conf/con=
fig.xml	2008-01-16 10:42:50 UTC (rev 5144)
@@ -1,254 +0,0 @@
-<?xml version=3D"1.0" encoding=3D"UTF-8"?>
-
-<!-- =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D -->
-<!--                                                                      =
 -->
-<!--  Sample TreeCache Service Configuration                              =
 -->
-<!--                                                                      =
 -->
-<!-- =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D -->
-
-<server>
-
-   <!-- =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D -->
-   <!-- Defines TreeCache configuration                                   =
   -->
-   <!-- =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D -->
-
-   <mbean code=3D"org.jboss.cache.jmx.CacheJmxWrapper"
-          name=3D"jboss.cache:service=3DTreeCache">
-
-      <depends>jboss:service=3DNaming</depends>
-      <depends>jboss:service=3DTransactionManager</depends>
-
-      <!--
-          Configure the TransactionManager
-      -->
-      <attribute name=3D"TransactionManagerLookupClass">org.jboss.cache.tr=
ansaction.GenericTransactionManagerLookup
-      </attribute>
-
-      <!--
-          Isolation level : SERIALIZABLE
-                            REPEATABLE_READ (default)
-                            READ_COMMITTED
-                            READ_UNCOMMITTED
-                            NONE
-      -->
-      <attribute name=3D"IsolationLevel">REPEATABLE_READ</attribute>
-
-       <!--<attribute name=3D"NodeLockingScheme">OPTIMISTIC</attribute>-->
-
-      <!--
-           Valid modes are LOCAL
-                           REPL_ASYNC
-                           REPL_SYNC
-                           INVALIDATION_ASYNC
-                           INVALIDATION_SYNC
-      -->
-      <attribute name=3D"CacheMode">REPL_ASYNC</attribute>
-
-      <!--
-      Just used for async repl: use a replication queue
-      -->
-      <attribute name=3D"UseReplQueue">false</attribute>
-
-      <!--
-          Replication interval for replication queue (in ms)
-      -->
-      <attribute name=3D"ReplQueueInterval">0</attribute>
-
-      <!--
-          Max number of elements which trigger replication
-      -->
-      <attribute name=3D"ReplQueueMaxElements">0</attribute>
-
-      <!-- Name of cluster. Needs to be the same for all TreeCache nodes i=
n a
-           cluster in order to find each other.
-      -->
-      <attribute name=3D"ClusterName">JBossCache-Cluster</attribute>
-
-      <!--Uncomment next three statements to enable JGroups multiplexer.
-This configuration is dependent on the JGroups multiplexer being
-registered in an MBean server such as JBossAS.  -->
-      <!--
-      <depends>jgroups.mux:name=3DMultiplexer</depends>
-      <attribute name=3D"MultiplexerService">jgroups.mux:name=3DMultiplexe=
r</attribute>
-      <attribute name=3D"MultiplexerStack">fc-fast-minimalthreads</attribu=
te>
-      -->
-
-      <!-- JGroups protocol stack properties.
-         ClusterConfig isn't used if the multiplexer is enabled and succes=
sfully initialized.
-      -->
-      <attribute name=3D"ClusterConfig">
-         <config>
-             <!--<UDP mcast_addr=3D"232.10.10.10"
-                              mcast_port=3D"45588"
-                              tos=3D"8"
-                              ucast_recv_buf_size=3D"20000000"
-                              ucast_send_buf_size=3D"640000"
-                              mcast_recv_buf_size=3D"25000000"
-                              mcast_send_buf_size=3D"640000"
-                              loopback=3D"false"
-                              discard_incompatible_packets=3D"true"
-                              max_bundle_size=3D"64000"
-                              max_bundle_timeout=3D"30"
-                              use_incoming_packet_handler=3D"true"
-                              ip_ttl=3D"2"
-                              enable_bundling=3D"false"
-                              enable_unicast_bundling=3D"false"
-                              enable_diagnostics=3D"true"
-
-                              use_concurrent_stack=3D"true"
-
-                              thread_naming_pattern=3D"pl"
-
-                              thread_pool.enabled=3D"true"
-                              thread_pool.min_threads=3D"1"
-                              thread_pool.max_threads=3D"4"
-                              thread_pool.keep_alive_time=3D"30000"
-                              thread_pool.queue_enabled=3D"true"
-                              thread_pool.queue_max_size=3D"50000"
-                              thread_pool.rejection_policy=3D"discard"
-
-                              oob_thread_pool.enabled=3D"true"
-                              oob_thread_pool.min_threads=3D"2"
-                              oob_thread_pool.max_threads=3D"4"
-                              oob_thread_pool.keep_alive_time=3D"10000"
-                              oob_thread_pool.queue_enabled=3D"false"
-                              oob_thread_pool.queue_max_size=3D"10"
-                              oob_thread_pool.rejection_policy=3D"Run"/>-->
-
-            <TCP recv_buf_size=3D"20000000" use_send_queues=3D"false"
-                 loopback=3D"false"
-                 discard_incompatible_packets=3D"true"
-                 max_bundle_size=3D"64000"
-                 max_bundle_timeout=3D"30"
-                 use_incoming_packet_handler=3D"true"
-                 enable_bundling=3D"true"
-                 enable_unicast_bundling=3D"true"
-                 enable_diagnostics=3D"true"
-
-                 use_concurrent_stack=3D"true"
-
-                 thread_naming_pattern=3D"pl"
-
-                 thread_pool.enabled=3D"true"
-                 thread_pool.min_threads=3D"1"
-                 thread_pool.max_threads=3D"4"
-                 thread_pool.keep_alive_time=3D"30000"
-                 thread_pool.queue_enabled=3D"true"
-                 thread_pool.queue_max_size=3D"50000"
-                 thread_pool.rejection_policy=3D"discard"
-
-                 oob_thread_pool.enabled=3D"true"
-                 oob_thread_pool.min_threads=3D"2"
-                 oob_thread_pool.max_threads=3D"4"
-                 oob_thread_pool.keep_alive_time=3D"10000"
-                 oob_thread_pool.queue_enabled=3D"false"
-                 oob_thread_pool.queue_max_size=3D"10"
-                 oob_thread_pool.rejection_policy=3D"Run"/>
-
-            <!--<PING timeout=3D"2000" num_initial_members=3D"3"/>-->
-             <MPING mcast_addr=3D"232.1.2.3" timeout=3D"2000" num_initial_=
members=3D"3"/>
-            <MERGE2 max_interval=3D"30000" min_interval=3D"10000"/>
-            <FD_SOCK/>
-            <FD timeout=3D"10000" max_tries=3D"5" shun=3D"true"/>
-            <VERIFY_SUSPECT timeout=3D"1500"/>
-            <pbcast.NAKACK use_mcast_xmit=3D"false" gc_lag=3D"0"
-                           retransmit_timeout=3D"300,600,1200,2400,4800"
-                           discard_delivered_msgs=3D"true"/>
-            <!--<UNICAST timeout=3D"30,60,120,300,600,1200,2400,3600"/>-->
-            <pbcast.STABLE stability_delay=3D"1000" desired_avg_gossip=3D"=
50000"
-                           max_bytes=3D"400000"/>
-            <pbcast.GMS print_local_addr=3D"true" join_timeout=3D"5000"
-                        join_retry_timeout=3D"2000" shun=3D"false"
-                        view_bundling=3D"true" view_ack_collection_timeout=
=3D"5000"/>
-              <FC max_credits=3D"5000000"
-                    min_threshold=3D"0.20"/>
-            <FRAG2 frag_size=3D"60000"/>
-            <pbcast.STREAMING_STATE_TRANSFER use_reading_thread=3D"true"/>
-            <!-- <pbcast.STATE_TRANSFER/> -->
-            <pbcast.FLUSH timeout=3D"0"/>
-         </config>
-      </attribute>
-
-
-      <!--
-       Whether or not to fetch state on joining a cluster
-       NOTE this used to be called FetchStateOnStartup and has been rename=
d to be more descriptive.
-      -->
-      <attribute name=3D"FetchInMemoryState">true</attribute>
-
-      <!--
-          The max amount of time (in milliseconds) we wait until the
-          state (ie. the contents of the cache) are retrieved from
-          existing members in a clustered environment
-      -->
-      <attribute name=3D"StateRetrievalTimeout">15000</attribute>
-
-      <!--
-          Number of milliseconds to wait until all responses for a
-          synchronous call have been received.
-      -->
-      <attribute name=3D"SyncReplTimeout">15000</attribute>
-
-      <!-- Max number of milliseconds to wait for a lock acquisition -->
-      <attribute name=3D"LockAcquisitionTimeout">10000</attribute>
-
-      <!--
-         Indicate whether to use region based marshalling or not. Set this=
 to true if you are running under a scoped
-         class loader, e.g., inside an application server. Default is "fal=
se".
-      -->
-      <attribute name=3D"UseRegionBasedMarshalling">true</attribute>
-
-
-       <attribute name=3D"BuddyReplicationConfig">
-           <config>
-
-               <!-- Enables buddy replication. This is the ONLY mandatory =
configuration element here. -->
-               <buddyReplicationEnabled>true</buddyReplicationEnabled>
-
-               <!-- These are the default values anyway -->
-               <buddyLocatorClass>org.jboss.cache.buddyreplication.NextMem=
berBuddyLocator</buddyLocatorClass>
-
-               <!--  numBuddies is the number of backup nodes each node ma=
intains. ignoreColocatedBuddies means
-            that each node will *try* to select a buddy on a different phy=
sical host. If not able to do so though,
-            it will fall back to colocated nodes. -->
-               <buddyLocatorProperties>
-                   numBuddies =3D 1
-                   ignoreColocatedBuddies =3D true
-               </buddyLocatorProperties>
-
-               <!-- A way to specify a preferred replication group. If spe=
cified, we try and pick a buddy which shares
-           the same pool name (falling back to other buddies if not availa=
ble). This allows the sysdmin to
-           hint at backup buddies are picked, so for example, nodes may be=
 hinted topick buddies on a different
-           physical rack or power supply for added fault tolerance. -->
-               <buddyPoolName>myBuddyPoolReplicationGroup</buddyPoolName>
-
-               <!-- Communication timeout for inter-buddy group organisati=
on messages (such as assigning to and
-           removing from groups, defaults to 1000. -->
-               <buddyCommunicationTimeout>2000</buddyCommunicationTimeout>
-
-               <!-- Whether data is removed from old owners when gravitate=
d to a new owner. Defaults to true. -->
-               <dataGravitationRemoveOnFind>true</dataGravitationRemoveOnF=
ind>
-
-               <!-- Whether backup nodes can respond to data gravitation r=
equests, or only the data owner is
-           supposed to respond.  Defaults to true. -->
-               <dataGravitationSearchBackupTrees>true</dataGravitationSear=
chBackupTrees>
-
-               <!-- Whether all cache misses result in a data gravitation =
request. Defaults to false, requiring
-           callers to enable data gravitation on a per-invocation basis us=
ing the Options API. -->
-               <autoDataGravitation>false</autoDataGravitation>
-
-           </config>
-       </attribute>
-
-       =

-   </mbean>
-
-
-   <!--  Uncomment to get a graphical view of the TreeCache MBean above -->
-   <!--   <mbean code=3D"org.jboss.cache.TreeCacheView" name=3D"jboss.cach=
e:service=3DTreeCacheView">-->
-   <!--      <depends>jboss.cache:service=3DTreeCache</depends>-->
-   <!--      <attribute name=3D"CacheService">jboss.cache:service=3DTreeCa=
che</attribute>-->
-   <!--   </mbean>-->
-
-
-</server>


--===============2648002597045493199==--

From jbosscache-commits at lists.jboss.org Wed Jan 16 05:56:33 2008
Content-Type: multipart/mixed; boundary="===============4508649601706347921=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r5145 -
 benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.1.0/src/org/cachebench/cachewrappers.
Date: Wed, 16 Jan 2008 05:56:33 -0500
Message-ID: <E1JF5wf-0005QL-7f@committer01.frg.pub.inap.atl.jboss.com>

--===============4508649601706347921==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: mircea.markus
Date: 2008-01-16 05:56:33 -0500 (Wed, 16 Jan 2008)
New Revision: 5145

Added:
   benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.1.0/src/org/c=
achebench/cachewrappers/JBossCache210Wrapper.java
Removed:
   benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.1.0/src/org/c=
achebench/cachewrappers/JBossCache210Cr2Wrapper.java
Log:


Deleted: benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.1.0/src=
/org/cachebench/cachewrappers/JBossCache210Cr2Wrapper.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.1.0/src/org/=
cachebench/cachewrappers/JBossCache210Cr2Wrapper.java	2008-01-16 10:42:50 U=
TC (rev 5144)
+++ benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.1.0/src/org/=
cachebench/cachewrappers/JBossCache210Cr2Wrapper.java	2008-01-16 10:56:33 U=
TC (rev 5145)
@@ -1,83 +0,0 @@
-package org.cachebench.cachewrappers;
-
-import org.jboss.cache.Cache;
-import org.jboss.cache.DefaultCacheFactory;
-import org.jboss.cache.Fqn;
-import org.jboss.cache.CacheSPI;
-import org.jboss.cache.marshall.NodeData;
-import org.jboss.cache.buddyreplication.GravitateResult;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.cachebench.CacheWrapper;
-
-import java.util.Map;
-
-/**
- * @author Mircea.Markus(a)jboss.com
- * @since 2.2
- */
-public class JBossCache210Cr2Wrapper implements CacheWrapper
-{
-   private Cache cache;
-   private Log log =3D LogFactory.getLog(JBossCache210Cr2Wrapper.class);
-
-   public void init(Map parameters) throws Exception
-   {
-      log.info("Creating cache with the following configuration: " + param=
eters);
-      cache =3D DefaultCacheFactory.getInstance().createCache((String)para=
meters.get("config"));
-      log.info("Running cache with following config: " + cache.getConfigur=
ation());
-      log.info("Running follwing JBossCacheVersion: " + org.jboss.cache.Ve=
rsion.version);
-      log.info("Running follwing JBossCacheCodeName: " + org.jboss.cache.V=
ersion.codename);
-   }
-
-   public void setUp() throws Exception
-   {
-   }
-
-   public void tearDown() throws Exception
-   {
-      cache.stop();
-   }
-
-   public void put(Object key, Object value) throws Exception
-   {
-      // make sure the threads don't conflict!
-      Fqn f =3D new Fqn("test", key);
-      cache.put(f, key, value);
-   }
-
-   public Object get(Object key) throws Exception
-   {
-      Fqn f =3D new Fqn("test", key);
-      return cache.get(f, key);
-   }
-
-   public void empty() throws Exception
-   {
-      //not removing root because there it fails with buddy replication: h=
ttp://jira.jboss.com/jira/browse/JBCACHE-1241
-      cache.removeNode(new Fqn("test"));
-   }
-
-   public int getNumMembers()
-   {
-      return cache.getMembers().size();
-   }
-
-   public String getInfo()
-   {
-      return "Num direct children: " + cache.getRoot().getChildren().size(=
);
-   }
-
-   public Object getReplicatedData(String key) throws Exception
-   {
-      CacheSPI cacheSpi =3D (CacheSPI) cache;
-      GravitateResult result =3D cacheSpi.gravitateData(new Fqn("test", ke=
y), true);
-      if (!result.isDataFound())
-      {
-         //totall replication?
-         return get(key);
-      }
-      NodeData nodeData =3D result.getNodeData().get(0);
-      return nodeData.getAttributes().get(key);
-   }
-}

Copied: benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.1.0/src/=
org/cachebench/cachewrappers/JBossCache210Wrapper.java (from rev 5141, benc=
hmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.1.0/src/org/cacheben=
ch/cachewrappers/JBossCache210Cr2Wrapper.java)
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.1.0/src/org/=
cachebench/cachewrappers/JBossCache210Wrapper.java	                        =
(rev 0)
+++ benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.1.0/src/org/=
cachebench/cachewrappers/JBossCache210Wrapper.java	2008-01-16 10:56:33 UTC =
(rev 5145)
@@ -0,0 +1,83 @@
+package org.cachebench.cachewrappers;
+
+import org.jboss.cache.Cache;
+import org.jboss.cache.DefaultCacheFactory;
+import org.jboss.cache.Fqn;
+import org.jboss.cache.CacheSPI;
+import org.jboss.cache.marshall.NodeData;
+import org.jboss.cache.buddyreplication.GravitateResult;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.cachebench.CacheWrapper;
+
+import java.util.Map;
+
+/**
+ * @author Mircea.Markus(a)jboss.com
+ * @since 2.2
+ */
+public class JBossCache210Wrapper implements CacheWrapper
+{
+   private Cache cache;
+   private Log log =3D LogFactory.getLog(JBossCache210Cr2Wrapper.class);
+
+   public void init(Map parameters) throws Exception
+   {
+      log.info("Creating cache with the following configuration: " + param=
eters);
+      cache =3D DefaultCacheFactory.getInstance().createCache((String)para=
meters.get("config"));
+      log.info("Running cache with following config: " + cache.getConfigur=
ation());
+      log.info("Running follwing JBossCacheVersion: " + org.jboss.cache.Ve=
rsion.version);
+      log.info("Running follwing JBossCacheCodeName: " + org.jboss.cache.V=
ersion.codename);
+   }
+
+   public void setUp() throws Exception
+   {
+   }
+
+   public void tearDown() throws Exception
+   {
+      cache.stop();
+   }
+
+   public void put(Object key, Object value) throws Exception
+   {
+      // make sure the threads don't conflict!
+      Fqn f =3D new Fqn("test", key);
+      cache.put(f, key, value);
+   }
+
+   public Object get(Object key) throws Exception
+   {
+      Fqn f =3D new Fqn("test", key);
+      return cache.get(f, key);
+   }
+
+   public void empty() throws Exception
+   {
+      //not removing root because there it fails with buddy replication: h=
ttp://jira.jboss.com/jira/browse/JBCACHE-1241
+      cache.removeNode(new Fqn("test"));
+   }
+
+   public int getNumMembers()
+   {
+      return cache.getMembers().size();
+   }
+
+   public String getInfo()
+   {
+      return "Num direct children: " + cache.getRoot().getChildren().size(=
);
+   }
+
+   public Object getReplicatedData(String key) throws Exception
+   {
+      CacheSPI cacheSpi =3D (CacheSPI) cache;
+      GravitateResult result =3D cacheSpi.gravitateData(new Fqn("test", ke=
y), true);
+      if (!result.isDataFound())
+      {
+         //totall replication?
+         return get(key);
+      }
+      NodeData nodeData =3D result.getNodeData().get(0);
+      return nodeData.getAttributes().get(key);
+   }
+}


--===============4508649601706347921==--

From jbosscache-commits at lists.jboss.org Wed Jan 16 05:58:54 2008
Content-Type: multipart/mixed; boundary="===============3599223358124858907=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r5146 -
 benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.1.0/src/org/cachebench/cachewrappers.
Date: Wed, 16 Jan 2008 05:58:53 -0500
Message-ID: <E1JF5yv-0005VY-QP@committer01.frg.pub.inap.atl.jboss.com>

--===============3599223358124858907==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: mircea.markus
Date: 2008-01-16 05:58:53 -0500 (Wed, 16 Jan 2008)
New Revision: 5146

Modified:
   benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.1.0/src/org/c=
achebench/cachewrappers/JBossCache210Wrapper.java
Log:


Modified: benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.1.0/sr=
c/org/cachebench/cachewrappers/JBossCache210Wrapper.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.1.0/src/org/=
cachebench/cachewrappers/JBossCache210Wrapper.java	2008-01-16 10:56:33 UTC =
(rev 5145)
+++ benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.1.0/src/org/=
cachebench/cachewrappers/JBossCache210Wrapper.java	2008-01-16 10:58:53 UTC =
(rev 5146)
@@ -19,7 +19,7 @@
 public class JBossCache210Wrapper implements CacheWrapper
 {
    private Cache cache;
-   private Log log =3D LogFactory.getLog(JBossCache210Cr2Wrapper.class);
+   private Log log =3D LogFactory.getLog(JBossCache210Wrapper.class);
 =

    public void init(Map parameters) throws Exception
    {


--===============3599223358124858907==--

From jboss-qa-internal at redhat.com Wed Jan 16 06:48:36 2008
Content-Type: multipart/mixed; boundary="===============2232055424720310124=="
MIME-Version: 1.0
From: jboss-qa-internal at redhat.com
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] Hudson build became unstable:
 jboss-cache-1.4.X-jdk1.5 #57
Date: Wed, 16 Jan 2008 06:48:34 -0500
Message-ID: <2439878.621200484114853.JavaMail.hudson@dev45.qa.atl2.redhat.com>

--===============2232055424720310124==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

See http://hudson.qa.jboss.com/hudson/job/jboss-cache-1.4.X-jdk1.5/57/chang=
es



--===============2232055424720310124==--

From jbosscache-commits at lists.jboss.org Wed Jan 16 07:24:14 2008
Content-Type: multipart/mixed; boundary="===============9206558234793886925=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r5147 -
 benchmarks/benchmark-fwk/trunk/src/org/cachebench/tests.
Date: Wed, 16 Jan 2008 07:24:13 -0500
Message-ID: <E1JF7JV-0005xM-6a@committer01.frg.pub.inap.atl.jboss.com>

--===============9206558234793886925==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: mircea.markus
Date: 2008-01-16 07:24:13 -0500 (Wed, 16 Jan 2008)
New Revision: 5147

Modified:
   benchmarks/benchmark-fwk/trunk/src/org/cachebench/tests/ReplicationOccur=
sTest.java
Log:


Modified: benchmarks/benchmark-fwk/trunk/src/org/cachebench/tests/Replicati=
onOccursTest.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- benchmarks/benchmark-fwk/trunk/src/org/cachebench/tests/ReplicationOccu=
rsTest.java	2008-01-16 10:58:53 UTC (rev 5146)
+++ benchmarks/benchmark-fwk/trunk/src/org/cachebench/tests/ReplicationOccu=
rsTest.java	2008-01-16 12:24:13 UTC (rev 5147)
@@ -25,6 +25,8 @@
 =

    private Configuration conf;
    private static final String PREFIX =3D "_ReplicationOccursTest_";
+   private static final int REPLICATION_TRY_COUNT =3D 5;
+   private static final int REPLICATION_TRY_SLEEP =3D 2000;
 =

    public void setConfiguration(Configuration configuration)
    {
@@ -38,7 +40,7 @@
 =

       Integer currentNodeIndex =3D conf.getClusterConfig().getCurrentNodeI=
ndex();
       cache.put(PREFIX + currentNodeIndex, "true");
-      Thread.sleep(2000);//just to make sure that prev barrier closed its =
sockets etc
+      Thread.sleep(REPLICATION_TRY_SLEEP);//just to make sure that prev ba=
rrier closed its sockets etc
 =

       if (conf.getClusterConfig().getClusterSize() =3D=3D 1)
       {
@@ -49,13 +51,32 @@
          return result;
       }
 =

-      boolean allNodesReplicated =3D nodesReplicated(cache, testCaseName, =
testName);
+      boolean allNodesReplicated =3D checkReplicationSeveralTimes(testName=
, cache, testCaseName);
 =

       Map<SocketAddress, Object> receivedValues =3D broadcastReplicationRe=
sult(allNodesReplicated);
       cache.empty();
       return allReplicatedFine(receivedValues);
    }
 =

+   /**
+    * If caches replicate async, then try several times.
+    */
+   private boolean checkReplicationSeveralTimes(String testName, CacheWrap=
per cache, String testCaseName)
+         throws Exception
+   {
+      for (int i =3D0; i < REPLICATION_TRY_COUNT; i++)
+      {
+         if (nodesReplicated(cache, testCaseName, testName))
+         {
+            return true;
+         }
+         log.info("Replication test faild, " + (i+1) + " tries so far. Sle=
eping for  " + REPLICATION_TRY_SLEEP
+               + " millies then try again");
+         Thread.sleep(REPLICATION_TRY_SLEEP);
+      }
+      return false;
+   }
+
    private Map<SocketAddress, Object> broadcastReplicationResult(boolean a=
llNodesReplicated)
          throws Exception
    {


--===============9206558234793886925==--

From jbosscache-commits at lists.jboss.org Wed Jan 16 15:52:01 2008
Content-Type: multipart/mixed; boundary="===============8079134280398934233=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r5148 -
 benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.1.0/lib.
Date: Wed, 16 Jan 2008 15:52:01 -0500
Message-ID: <E1JFFEv-0006Cx-H3@committer01.frg.pub.inap.atl.jboss.com>

--===============8079134280398934233==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: mircea.markus
Date: 2008-01-16 15:52:01 -0500 (Wed, 16 Jan 2008)
New Revision: 5148

Modified:
   benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.1.0/lib/jboss=
cache-core.jar
   benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.1.0/lib/jgrou=
ps.jar
Log:


Modified: benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.1.0/li=
b/jbosscache-core.jar
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)

Modified: benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.1.0/li=
b/jgroups.jar
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)


--===============8079134280398934233==--

From jbosscache-commits at lists.jboss.org Wed Jan 16 17:13:38 2008
Content-Type: multipart/mixed; boundary="===============3702605981307106762=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r5149 - in
 pojo/branches/2.1/src: main/java/org/jboss/cache/pojo/impl and 1 other
 directories.
Date: Wed, 16 Jan 2008 17:13:38 -0500
Message-ID: <E1JFGVu-0005sq-Ky@committer01.frg.pub.inap.atl.jboss.com>

--===============3702605981307106762==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: jason.greene(a)jboss.com
Date: 2008-01-16 17:13:38 -0500 (Wed, 16 Jan 2008)
New Revision: 5149

Added:
   pojo/branches/2.1/src/main/java/org/jboss/cache/pojo/PojoCacheThreadCont=
ext.java
   pojo/branches/2.1/src/main/java/org/jboss/cache/pojo/impl/PojoCacheThrea=
dContextImpl.java
   pojo/branches/2.1/src/test/java/org/jboss/cache/pojo/PojoCacheThreadCont=
extTest.java
Modified:
   pojo/branches/2.1/src/main/java/org/jboss/cache/pojo/PojoCache.java
   pojo/branches/2.1/src/main/java/org/jboss/cache/pojo/impl/InternalHelper=
.java
   pojo/branches/2.1/src/main/java/org/jboss/cache/pojo/impl/PojoCacheDeleg=
ate.java
   pojo/branches/2.1/src/main/java/org/jboss/cache/pojo/impl/PojoCacheImpl.=
java
   pojo/branches/2.1/src/test/java/org/jboss/cache/pojo/BuddyReplicationTes=
t.java
Log:
Implement PCACHE-59


Modified: pojo/branches/2.1/src/main/java/org/jboss/cache/pojo/PojoCache.ja=
va
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- pojo/branches/2.1/src/main/java/org/jboss/cache/pojo/PojoCache.java	200=
8-01-16 20:52:01 UTC (rev 5148)
+++ pojo/branches/2.1/src/main/java/org/jboss/cache/pojo/PojoCache.java	200=
8-01-16 22:13:38 UTC (rev 5149)
@@ -241,6 +241,13 @@
     * @param listener the listener to remove
     */
    void removeListener(Object listener);
+   =

+   /**
+    * Get's the thread context for all POJO Cache operations.
+    * =

+    * @return the current thread's context
+    */
+   PojoCacheThreadContext getThreadContext();
 =

    /**
     * Obtain the underlying generic cache system. Use this for non-POJO ca=
che operation, e.g.

Added: pojo/branches/2.1/src/main/java/org/jboss/cache/pojo/PojoCacheThread=
Context.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- pojo/branches/2.1/src/main/java/org/jboss/cache/pojo/PojoCacheThreadCon=
text.java	                        (rev 0)
+++ pojo/branches/2.1/src/main/java/org/jboss/cache/pojo/PojoCacheThreadCon=
text.java	2008-01-16 22:13:38 UTC (rev 5149)
@@ -0,0 +1,49 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2005, JBoss Inc., and individual contributors as indicated
+* by the @authors tag. See the copyright.txt in the distribution for a
+* full listing of individual contributors.
+*
+* This is free software; you can redistribute it and/or modify it
+* under the terms of the GNU Lesser General Public License as
+* published by the Free Software Foundation; either version 2.1 of
+* the License, or (at your option) any later version.
+*
+* This software is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this software; if not, write to the Free
+* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+*/
+
+package org.jboss.cache.pojo;
+
+
+/**
+ * Represents the thread specific context for POJO Cache operations agains=
t a particular cache instance. This is
+ * primarily used to change thread specific options. Once set, they remain=
 for the entire lifetime of the thread.
+ * =

+ * Instances of this class can only be obtained by {@link PojoCache#getThr=
eadContext}
+ * =

+ * @author Jason T. Greene
+ */
+public interface PojoCacheThreadContext
+{   =

+   /**
+    * Returns whether or not this thread should trigger gravitation when a=
 cache-miss occurs. The default is false.
+    * =

+    * @return true if gravitation should be triggered on cache-miss, false=
 if gravitation should not be triggered
+    */
+   public boolean isGravitationEnabled();
+   =

+   /**
+    * Enables or disables gravitation on cache-miss
+    * =

+    * @param gravitate  true if gravitation should be triggered on cache-m=
iss, false if gravitation should not be triggered
+    */
+   public void setGravitationEnabled(boolean gravitate);
+}
\ No newline at end of file

Modified: pojo/branches/2.1/src/main/java/org/jboss/cache/pojo/impl/Interna=
lHelper.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- pojo/branches/2.1/src/main/java/org/jboss/cache/pojo/impl/InternalHelpe=
r.java	2008-01-16 20:52:01 UTC (rev 5148)
+++ pojo/branches/2.1/src/main/java/org/jboss/cache/pojo/impl/InternalHelpe=
r.java	2008-01-16 22:13:38 UTC (rev 5149)
@@ -13,6 +13,7 @@
 import org.jboss.cache.Cache;
 import org.jboss.cache.CacheException;
 import org.jboss.cache.Fqn;
+import org.jboss.cache.pojo.PojoCache;
 import org.jboss.cache.pojo.PojoCacheException;
 import org.jboss.cache.pojo.util.ObjectUtil;
 =

@@ -26,11 +27,13 @@
 {
    private static  Log log =3D LogFactory.getLog(InternalHelper.class.getN=
ame());
 =

-   private Cache cache;
+   private Cache<Object, Object> cache;
+   private PojoCache pcache;
 =

-   InternalHelper(Cache cache)
+   InternalHelper(PojoCache pcache)
    {
-      this.cache =3D cache;
+      this.cache =3D pcache.getCache();
+      this.pcache =3D pcache;
    }
 =

    PojoInstance getPojoInstance(Fqn fqn) throws CacheException
@@ -86,7 +89,8 @@
 =

    private Object get(Fqn fqn, Object key, boolean gravitate) throws Cache=
Exception
    {
-      if (gravitate)
+      // Only gravitate when we have to and only when the user has enabled=
 it
+      if (gravitate && pcache.getThreadContext().isGravitationEnabled())
       {
          cache.getInvocationContext().getOptionOverrides().setForceDataGra=
vitation(true);
          Object obj =3D cache.get(fqn, key);

Modified: pojo/branches/2.1/src/main/java/org/jboss/cache/pojo/impl/PojoCac=
heDelegate.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- pojo/branches/2.1/src/main/java/org/jboss/cache/pojo/impl/PojoCacheDele=
gate.java	2008-01-16 20:52:01 UTC (rev 5148)
+++ pojo/branches/2.1/src/main/java/org/jboss/cache/pojo/impl/PojoCacheDele=
gate.java	2008-01-16 22:13:38 UTC (rev 5149)
@@ -58,7 +58,7 @@
    {
       pojoCache =3D cache;
       this.cache =3D pojoCache.getCache();
-      internal_ =3D new InternalHelper(this.cache);
+      internal_ =3D new InternalHelper(cache);
       graphHandler_ =3D new ObjectGraphHandler(pojoCache, internal_);
       collectionHandler_ =3D new CollectionClassHandler(pojoCache, interna=
l_);
       serializableHandler_ =3D new SerializableObjectHandler(pojoCache, in=
ternal_);

Modified: pojo/branches/2.1/src/main/java/org/jboss/cache/pojo/impl/PojoCac=
heImpl.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- pojo/branches/2.1/src/main/java/org/jboss/cache/pojo/impl/PojoCacheImpl=
.java	2008-01-16 20:52:01 UTC (rev 5148)
+++ pojo/branches/2.1/src/main/java/org/jboss/cache/pojo/impl/PojoCacheImpl=
.java	2008-01-16 22:13:38 UTC (rev 5149)
@@ -24,6 +24,7 @@
 import org.jboss.cache.factories.XmlConfigurationParser;
 import org.jboss.cache.pojo.PojoCache;
 import org.jboss.cache.pojo.PojoCacheException;
+import org.jboss.cache.pojo.PojoCacheThreadContext;
 import org.jboss.cache.pojo.annotation.Attach;
 import org.jboss.cache.pojo.annotation.Detach;
 import org.jboss.cache.pojo.annotation.Find;
@@ -44,6 +45,7 @@
    private Map cachedTypes_ =3D new WeakHashMap();
    private boolean hasCreate_ =3D false;
    private CacheListenerAdaptor listenerAdaptor =3D new CacheListenerAdapt=
or(this);
+   private PojoCacheThreadContext threadContext =3D new PojoCacheThreadCon=
textImpl();
 =

    public PojoCacheImpl(String configStr, boolean toStart)
    {
@@ -317,6 +319,11 @@
             cache.removeCacheListener(listenerAdaptor);
       }
    }
+   =

+   public PojoCacheThreadContext getThreadContext()
+   {
+      return threadContext;
+   }
 =

    public Cache<Object,Object> getCache()
    {

Added: pojo/branches/2.1/src/main/java/org/jboss/cache/pojo/impl/PojoCacheT=
hreadContextImpl.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- pojo/branches/2.1/src/main/java/org/jboss/cache/pojo/impl/PojoCacheThre=
adContextImpl.java	                        (rev 0)
+++ pojo/branches/2.1/src/main/java/org/jboss/cache/pojo/impl/PojoCacheThre=
adContextImpl.java	2008-01-16 22:13:38 UTC (rev 5149)
@@ -0,0 +1,46 @@
+package org.jboss.cache.pojo.impl;
+
+import org.jboss.cache.pojo.PojoCacheThreadContext;
+
+public class PojoCacheThreadContextImpl implements PojoCacheThreadContext
+{
+   private static final int GRAVITATE =3D 0;
+   private static final Boolean GRAVITATE_DEFAULT =3D false;
+   =

+   // Every cache instance gets it's own configuration
+   // An array is used to conserve memory usage since reclamation is slow =
with TLs, and prevent CL leaks
+   // In the future, if we get multiple booleans, use bitwise operations o=
n an integer =

+   // as the first entry
+   private final ThreadLocal<Object[]> state =3D new ThreadLocal<Object[]>=
()
+   {
+      @Override
+      protected Object[] initialValue()
+      {
+         return new Object[] {GRAVITATE_DEFAULT};
+      }
+   };
+   =

+   PojoCacheThreadContextImpl() =

+   {
+   }
+
+   /**
+    * Returns whether or not this thread should trigger gravitation when a=
 cache-miss occurs. The default is false.
+    * =

+    * @return true if gravitation should be triggered on cache-miss, false=
 if gravitation should not be triggered
+    */
+   public boolean isGravitationEnabled()
+   {
+      return (Boolean) state.get()[GRAVITATE];
+   }
+   =

+   /**
+    * Enables or disables gravitation on cache-miss
+    * =

+    * @param gravitate  true if gravitation should be triggered on cache-m=
iss, false if gravitation should not be triggered
+    */
+   public void setGravitationEnabled(boolean gravitate)
+   {
+      state.get()[GRAVITATE] =3D gravitate;
+   }
+}

Modified: pojo/branches/2.1/src/test/java/org/jboss/cache/pojo/BuddyReplica=
tionTest.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- pojo/branches/2.1/src/test/java/org/jboss/cache/pojo/BuddyReplicationTe=
st.java	2008-01-16 20:52:01 UTC (rev 5148)
+++ pojo/branches/2.1/src/test/java/org/jboss/cache/pojo/BuddyReplicationTe=
st.java	2008-01-16 22:13:38 UTC (rev 5149)
@@ -65,6 +65,10 @@
       addBuddyReplication(cfg2);
       cache1 =3D PojoCacheFactory.createCache(cfg2, toStart);
       cache1.start();
+      =

+      // Enable gravitation
+      cache.getThreadContext().setGravitationEnabled(true);
+      cache1.getThreadContext().setGravitationEnabled(true);
    }
 =

    @AfterMethod(alwaysRun =3D true)

Added: pojo/branches/2.1/src/test/java/org/jboss/cache/pojo/PojoCacheThread=
ContextTest.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- pojo/branches/2.1/src/test/java/org/jboss/cache/pojo/PojoCacheThreadCon=
textTest.java	                        (rev 0)
+++ pojo/branches/2.1/src/test/java/org/jboss/cache/pojo/PojoCacheThreadCon=
textTest.java	2008-01-16 22:13:38 UTC (rev 5149)
@@ -0,0 +1,132 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package org.jboss.cache.pojo;
+
+import static org.testng.AssertJUnit.assertEquals;
+import static org.testng.AssertJUnit.assertNotNull;
+import static org.testng.AssertJUnit.assertNull;
+
+import java.util.List;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.jboss.cache.buddyreplication.NextMemberBuddyLocatorConfig;
+import org.jboss.cache.config.BuddyReplicationConfig;
+import org.jboss.cache.config.Configuration;
+import org.jboss.cache.config.Configuration.CacheMode;
+import org.jboss.cache.factories.UnitTestCacheConfigurationFactory;
+import org.jboss.cache.pojo.test.Person;
+import org.testng.annotations.AfterMethod;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.Test;
+
+/**
+ * A BuddyReplicatedTest.
+ *
+ * @author <a href=3D"brian.stansberry(a)jboss.com">Brian Stansberry</a>
+ * @version $Revision: 4717 $
+ */
+(a)Test(groups =3D {"functional"})
+public class PojoCacheThreadContextTest =

+{
+   Log log =3D LogFactory.getLog(ReplicatedTest.class);
+   volatile PojoCache cache, cache1;
+
+   @BeforeMethod(alwaysRun =3D true)
+   protected void setUp() throws Exception
+   {
+      log.info("setUp() ....");
+      boolean toStart =3D false;
+      Configuration cfg1 =3D UnitTestCacheConfigurationFactory.createConfi=
guration(CacheMode.LOCAL);
+      cache =3D PojoCacheFactory.createCache(cfg1, toStart);
+      cache.start();
+      Configuration cfg2 =3D UnitTestCacheConfigurationFactory.createConfi=
guration(CacheMode.LOCAL);
+      cache1 =3D PojoCacheFactory.createCache(cfg2, toStart);
+      cache1.start();
+   }
+
+   @AfterMethod(alwaysRun =3D true)
+   protected void tearDown() throws Exception
+   {
+      cache.stop();
+      cache1.stop();
+   }
+
+   public void testDefault()
+   {
+      assertEquals(cache.getThreadContext().isGravitationEnabled(), false);
+      assertEquals(cache1.getThreadContext().isGravitationEnabled(), false=
);
+   }
+   =

+   private class TestThread extends Thread
+   {
+      public volatile Throwable t;
+
+      @Override
+      public void run()
+      {
+         try
+         {
+            cache1.getThreadContext().setGravitationEnabled(true);
+            assertEquals(cache.getThreadContext().isGravitationEnabled(), =
false);
+            assertEquals(cache1.getThreadContext().isGravitationEnabled(),=
 true);
+         =

+            cache.getThreadContext().setGravitationEnabled(true);
+            assertEquals(cache.getThreadContext().isGravitationEnabled(), =
true);
+            assertEquals(cache1.getThreadContext().isGravitationEnabled(),=
 true);
+         }
+         catch (Throwable t)
+         {
+            this.t =3D t;
+         }
+      }
+   };
+
+   public void testThreadIsolation() throws Throwable
+   {
+      assertEquals(cache.getThreadContext().isGravitationEnabled(), false);
+      assertEquals(cache1.getThreadContext().isGravitationEnabled(), false=
);
+      =

+      =

+      TestThread t1 =3D new TestThread();
+      t1.start();
+      t1.join();
+      if (t1.t !=3D null)
+         throw t1.t;
+      =

+      assertEquals(cache.getThreadContext().isGravitationEnabled(), false);
+      assertEquals(cache1.getThreadContext().isGravitationEnabled(), false=
);
+
+      cache1.getThreadContext().setGravitationEnabled(true);
+      assertEquals(cache.getThreadContext().isGravitationEnabled(), false);
+      assertEquals(cache1.getThreadContext().isGravitationEnabled(), true);
+      t1 =3D new TestThread();
+      t1.start();
+      t1.join();
+      if (t1.t !=3D null)
+         throw t1.t;
+      =

+      assertEquals(cache.getThreadContext().isGravitationEnabled(), false);
+      assertEquals(cache1.getThreadContext().isGravitationEnabled(), true);
+   }
+}


--===============3702605981307106762==--

From jbosscache-commits at lists.jboss.org Wed Jan 16 17:15:37 2008
Content-Type: multipart/mixed; boundary="===============5838968473077340674=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r5150 -
 pojo/branches/2.1/src/main/java/org/jboss/cache/pojo.
Date: Wed, 16 Jan 2008 17:15:37 -0500
Message-ID: <E1JFGXp-0006lK-Gk@committer01.frg.pub.inap.atl.jboss.com>

--===============5838968473077340674==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: jason.greene(a)jboss.com
Date: 2008-01-16 17:15:37 -0500 (Wed, 16 Jan 2008)
New Revision: 5150

Modified:
   pojo/branches/2.1/src/main/java/org/jboss/cache/pojo/PojoCache.java
   pojo/branches/2.1/src/main/java/org/jboss/cache/pojo/PojoCacheThreadCont=
ext.java
Log:
Add @since


Modified: pojo/branches/2.1/src/main/java/org/jboss/cache/pojo/PojoCache.ja=
va
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- pojo/branches/2.1/src/main/java/org/jboss/cache/pojo/PojoCache.java	200=
8-01-16 22:13:38 UTC (rev 5149)
+++ pojo/branches/2.1/src/main/java/org/jboss/cache/pojo/PojoCache.java	200=
8-01-16 22:15:37 UTC (rev 5150)
@@ -246,6 +246,7 @@
     * Get's the thread context for all POJO Cache operations.
     * =

     * @return the current thread's context
+    * @since 2.1
     */
    PojoCacheThreadContext getThreadContext();
 =


Modified: pojo/branches/2.1/src/main/java/org/jboss/cache/pojo/PojoCacheThr=
eadContext.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- pojo/branches/2.1/src/main/java/org/jboss/cache/pojo/PojoCacheThreadCon=
text.java	2008-01-16 22:13:38 UTC (rev 5149)
+++ pojo/branches/2.1/src/main/java/org/jboss/cache/pojo/PojoCacheThreadCon=
text.java	2008-01-16 22:15:37 UTC (rev 5150)
@@ -30,6 +30,7 @@
  * Instances of this class can only be obtained by {@link PojoCache#getThr=
eadContext}
  * =

  * @author Jason T. Greene
+ * @since 2.1
  */
 public interface PojoCacheThreadContext
 {   =



--===============5838968473077340674==--

From jbosscache-commits at lists.jboss.org Wed Jan 16 17:17:12 2008
Content-Type: multipart/mixed; boundary="===============5247629923259063342=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r5151 - in pojo/trunk/src:
 main/java/org/jboss/cache/pojo and 2 other directories.
Date: Wed, 16 Jan 2008 17:17:11 -0500
Message-ID: <E1JFGZL-0006qI-Tk@committer01.frg.pub.inap.atl.jboss.com>

--===============5247629923259063342==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: jason.greene(a)jboss.com
Date: 2008-01-16 17:17:11 -0500 (Wed, 16 Jan 2008)
New Revision: 5151

Added:
   pojo/trunk/src/main/java/org/jboss/cache/pojo/PojoCacheThreadContext.java
   pojo/trunk/src/main/java/org/jboss/cache/pojo/impl/PojoCacheThreadContex=
tImpl.java
   pojo/trunk/src/test/java/org/jboss/cache/pojo/PojoCacheThreadContextTest=
.java
Modified:
   pojo/trunk/src/main/docbook/userguide/en/modules/instrumentation.xml
   pojo/trunk/src/main/java/org/jboss/cache/pojo/PojoCache.java
   pojo/trunk/src/main/java/org/jboss/cache/pojo/impl/InternalHelper.java
   pojo/trunk/src/main/java/org/jboss/cache/pojo/impl/PojoCacheDelegate.java
   pojo/trunk/src/main/java/org/jboss/cache/pojo/impl/PojoCacheImpl.java
   pojo/trunk/src/test/java/org/jboss/cache/pojo/BuddyReplicationTest.java
Log:
Merge 5150 and 5149


Modified: pojo/trunk/src/main/docbook/userguide/en/modules/instrumentation.=
xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- pojo/trunk/src/main/docbook/userguide/en/modules/instrumentation.xml	20=
08-01-16 22:15:37 UTC (rev 5150)
+++ pojo/trunk/src/main/docbook/userguide/en/modules/instrumentation.xml	20=
08-01-16 22:17:11 UTC (rev 5151)
@@ -7,7 +7,7 @@
   approach since it preserves object identity and provides field granular
   replication. POJO Cache currently uses the JBoss AOP project to provide
   instrumentation, so the same processes described in the AOP documentation
-  can be used with POJO Cache.</para>
+  are used with POJO Cache.</para>
 =

   <para>The primary input to JBoss AOP is the AOP binding file, which is
   responsible for specifying which classes should be instrumented. POJO Ca=
che
@@ -57,86 +57,74 @@
    &lt;jvmarg value=3D"-Djboss.aop.path=3Detc/META-INF/pojocache-aop.xml"/=
&gt;
    &lt;classpath refid=3D"test.classpath"/&gt;
 &lt;/java&gt;      </programlisting>
+
+    <para>Once the JVM is executed in this manner, any class with the
+    <literal>@Replicable</literal> annotation will be instrumented when it=
 is
+    loaded.</para>
   </sect1>
 =

-  <para>For the first step, since we are using the dynamic Aop feature, a =
POJO
-  is only required to be declared "prepare". Basically, there are two ways=
 to
-  do this: either via explicit xml or annotation.</para>
+  <sect1>
+    <title>Compile-time instrumentation</title>
 =

-  <para>As for the second step, either we can ask JBoss Aop to do load-time
-  (through a special class loader, so-called load-time mode) or compile-ti=
me
-  instrumentation (use of an aopc pre-compiler, so-called precompiled mode=
).
-  Reader can read the JBoss Aop introduction chapter for more details.</pa=
ra>
+    <para>While load-time is the preffered approach, it is also possible to
+    instrument classes at compile-time. To do this, the aopc tool is used,
+    with the following requirements:</para>
 =

-  <sect1><title>XML descriptor</title> <para> To declare a POJO via XML
-  configuration file, you will need a
-  <literal>META-INF/jboss-aop.xml</literal> (or in the PojoCache case, it =
is
-  the equivalent <literal>pojocache-service.xml</literal> file located und=
er
-  the class path or listed in the <literal>jboss.aop.path</literal> system
-  property. JBoss AOP framework will read this file during startup to make
-  necessary byte code manipulation for advice and introduction. Or you can
-  pre-compile it using a pre-compiler called <literal>aopc</literal> such =
that
-  you won't need the XML file during load time. JBoss Aop provides a so-ca=
lled
-  <literal>pointcut</literal> language where it consists of a regular
-  expression set to specify the interception points (or
-  <literal>jointpoint</literal> in aop parlance). The jointpoint can be
-  constructor, method call, or field. You will need to declare any of your
-  POJO to be "prepared" so that AOP framework knows to start intercepting
-  either method, field, or constructor invocations using the dynamic Aop.
-  </para> <para> For PojoCache, we only allow all the fields (both read and
-  write) to be intercepted. That is, we don't care for the method level
-  interception since it is the state that we are interested in. So you sho=
uld
-  only need to change your POJO class name. For details of the pointcut
-  language, please refer to JBoss Aop. </para> <para> The standalone
-  <literal>JBoss Cache</literal> distribution package provides an example
-  declaration for the tutorial classes, namely, <literal>Person</literal> =
and
-  <literal>Address</literal> . Detailed class declaration for
-  <literal>Person</literal> and <literal>Address</literal> are provided in=
 the
-  Appendix section. But here is the snippet for
-  <literal>pojocache-aop.xml</literal> : </para> <programlisting>
-         &lt;aop&gt; &lt;prepare expr=3D"field(*
-         $instanceof{@org.jboss.cache.pojo.annotation.Replicable}-&gt;*)"
-         /&gt; &lt;/aop&gt;
-      </programlisting> and then notice the annotation @Replicable used in=
 the
-  <literal>Person</literal> and <literal>Address</literal> POJOs. Also note
-  that @Replicable is now inheritant. For example, sub-class of
-  <literal>Person</literal> such as <literal>Student</literal> will also be
-  aspectized by JBoss Aop as well. If you want to stop this inheritance
-  behavior, you can simply remove the <literal>$instanceof</literal>
-  declaration in the prepare statement, e.g., <programlisting>
-         &lt;aop&gt; &lt;prepare expr=3D"field(*
-         @org.jboss.cache.pojo.annotation.Replicable-&gt;*)" /&gt;
-         &lt;/aop&gt;
-      </programlisting> <para> Detailed semantics of
-  <literal>pojocache-aop.xml</literal> (or equivalently
-  <literal>pojocache-aop.xml</literal> ) can again be found in JBoss Aop. =
But
-  above statements basically declare all field read and write operations in
-  classes <code>Address</code> and <code>Person</code> will be "prepared" =
(or
-  "aspectized"). Note that: </para> <itemizedlist>
-      <listitem>The wildcard at the end of the expression signifies all fi=
elds
-      in the POJO</listitem>
+    <orderedlist>
+      <listitem>
+        <para>The <literal>aoppath</literal> option must point to the loca=
tion
+        of pojocache-aop.xml</para>
+      </listitem>
 =

-      <listitem>You can potentially replace specific class name with wildc=
ard
-      that includes all the POJOs inside the same package space</listitem>
+      <listitem>
+        <para>The <literal>src</literal> option must point to the location=
 of
+        your class files that are to be instrumented. This is typically the
+        output folder of a <literal>javac</literal> run.</para>
+      </listitem>
+    </orderedlist>
 =

-      <listitem>The <code>instanceof</code> operator declares any sub-type=
 or
-      sub-class of the specific POJO will also be "aspectized". For exampl=
e,
-      if a <code>Student</code> class is a subclass of <code>Person</code>=
 ,
-      JBossAop will automatically instrument it as well!</listitem>
+    <para>The following is an example ant task which performs compile-time
+    instrumentation:</para>
 =

-      <listitem>We intercept the field of all access levels (i.e.,
-      <literal>private</literal> , <literal>protected</literal> ,
-      <literal>public</literal> , etc.) The main reason being that we cons=
ider
-      all fields as stateful data. However, we can relax this requirement =
in
-      the future if there is a use case for it.</listitem>
+    <para><programlisting>&lt;taskdef name=3D"aopc" classname=3D"org.jboss=
.aop.ant.AopC" classpathref=3D"aop.classpath"/&gt; =

+&lt;target name=3D"aopc" depends=3D"compile" description=3D"Precompile aop=
 class"&gt;
+    &lt;aopc compilerclasspathref=3D"aop.classpath" verbose=3D"true"&gt; =

+       &lt;src path=3D"${build}"/&gt;
+       &lt;include name=3D"org/jboss/cache/aop/test/**/*.class"/&gt;
+       &lt;aoppath path=3D"${output}/resources/pojocache-aop.xml"/&gt;
+       &lt;classpath path=3D"${build}"/&gt; =

+       &lt;classpath refid=3D"lib.classpath"/&gt; =

+    &lt;/aopc&gt; =

+&lt;/target&gt;         </programlisting>In this example, once the aopc ta=
rget
+    is executeed the clasess in the build directory are modified. They can
+    then be packaged in a jar and loaded using the normal Java
+    mechanisms.</para>
+  </sect1>
 =

-      <listitem>We don't intercept field modifiers of <literal>final</lite=
ral>
-      and <literal>transient</literal> though. That is, field with these
-      modifiers are not stored in cache and is not replicated either. If y=
ou
-      don't want your field to be managed by the cache, you can declare th=
em
-      with these modifiers, e.g., transient.</listitem>
-    </itemizedlist></sect1>
+  <sect1>
+    <title>Understanding the provided AOP descriptor</title>
 =

+    <para>The advanced user might decide to alter the provided AOP descrit=
or.
+    In order to do this, it is important to understand the reaons behind w=
hat
+    is provided, and what is required by POJO Cache. Previous sections have
+    mentioned that any class with the <literal>@Replicable</literal>
+    annotation will be instrumented. This happens, because the provided AOP
+    descriptor, <literal>pojocache-aop.xml</literal>, has a perpare statem=
ent
+    which matches any class (or subclass) using the annotation. This is sh=
own
+    in the following snippet:</para>
+
+    <programlisting>&lt;prepare expr=3D"field(* $instanceof{@org.jboss.cac=
he.pojo.annotation.Replicable}-&gt;*)"/&gt;     </programlisting>
+
+    <para>More specifically, any code which accesses a field on a class wh=
ich
+    has been annotated with <literal>@Replicable</literal>, will be
+    instrumented: The "field" pointcut in the expression matches both read=
 and
+    write operations. The wildcard "*" indicates that all java protection
+    modes are intercepted (private, package, protected, public). The
+    <literal>$instanceof</literal> expression refers to any annotation that
+    subclasses <literal>@Replicable</literal>. Finally, the ending wildcard
+    allows the matched field to have any name.</para>
+  </sect1>
+
   <sect1>
     <title>Annotation</title>
 =

@@ -145,27 +133,51 @@
     declaration since there will be no need for external metadata xml
     descriptor.</para>
 =

-    <sect2><title>POJO annotation for instrumentation</title> <para> To
-    support annotation (in order to simplify user's development effort), t=
he
-    JBoss Cache distribution ships with a <literal>pojocache-aop.xml</lite=
ral>
-    under the <literal>resources</literal> directory. For reference, here =
is
-    annotation definition from <literal>pojocache-aop.xml</literal> again :
-    <programlisting>
+    <sect2>
+       =

+
+      <title>POJO annotation for instrumentation</title>
+
+       =

+
+      <para>To support annotation (in order to simplify user's development
+      effort), the JBoss Cache distribution ships with a
+      <literal>pojocache-aop.xml</literal> under the
+      <literal>resources</literal> directory. For reference, here is
+      annotation definition from <literal>pojocache-aop.xml</literal> agai=
n :
+      <programlisting>
                &lt;aop&gt; &lt;prepare expr=3D"field(*
                @org.jboss.cache.pojo.annotation.Replicable-&gt;*)"
                /&gt; &lt;/aop&gt;
             </programlisting> Basically, it simply states that any annotat=
ion
-    with both marker interfaces will be "aspectized" accordingly. </para>
-    <para> Here is a code snippet that illustrate the declaration: </para>
-    <programlisting>
+      with both marker interfaces will be "aspectized" accordingly.</para>
+
+       =

+
+      <para>Here is a code snippet that illustrate the declaration:</para>
+
+       =

+
+      <programlisting>
             @org.jboss.cache.pojo.annotation.Replicable public class
             Person {...}
-         </programlisting> The above declaration will instrument the class
-    <literal>Person</literal> and all of its sub-classes. That is, if
-    <literal>Student</literal> sub-class from <literal>Personal</literal> ,
-    then it will get instrumented automatically without further annotation
-    declaration.</sect2>
+         </programlisting>
 =

+       The above declaration will instrument the class =

+
+      <literal>Person</literal>
+
+       and all of its sub-classes. That is, if =

+
+      <literal>Student</literal>
+
+       sub-class from =

+
+      <literal>Personal</literal>
+
+       , then it will get instrumented automatically without further annot=
ation declaration. =

+    </sect2>
+
     <sect2>
       <title>JDK5.0 field level annotations</title>
 =


Modified: pojo/trunk/src/main/java/org/jboss/cache/pojo/PojoCache.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- pojo/trunk/src/main/java/org/jboss/cache/pojo/PojoCache.java	2008-01-16=
 22:15:37 UTC (rev 5150)
+++ pojo/trunk/src/main/java/org/jboss/cache/pojo/PojoCache.java	2008-01-16=
 22:17:11 UTC (rev 5151)
@@ -241,6 +241,14 @@
     * @param listener the listener to remove
     */
    void removeListener(Object listener);
+   =

+   /**
+    * Get's the thread context for all POJO Cache operations.
+    * =

+    * @return the current thread's context
+    * @since 2.1
+    */
+   PojoCacheThreadContext getThreadContext();
 =

    /**
     * Obtain the underlying generic cache system. Use this for non-POJO ca=
che operation, e.g.

Copied: pojo/trunk/src/main/java/org/jboss/cache/pojo/PojoCacheThreadContex=
t.java (from rev 5149, pojo/branches/2.1/src/main/java/org/jboss/cache/pojo=
/PojoCacheThreadContext.java)
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- pojo/trunk/src/main/java/org/jboss/cache/pojo/PojoCacheThreadContext.ja=
va	                        (rev 0)
+++ pojo/trunk/src/main/java/org/jboss/cache/pojo/PojoCacheThreadContext.ja=
va	2008-01-16 22:17:11 UTC (rev 5151)
@@ -0,0 +1,50 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2005, JBoss Inc., and individual contributors as indicated
+* by the @authors tag. See the copyright.txt in the distribution for a
+* full listing of individual contributors.
+*
+* This is free software; you can redistribute it and/or modify it
+* under the terms of the GNU Lesser General Public License as
+* published by the Free Software Foundation; either version 2.1 of
+* the License, or (at your option) any later version.
+*
+* This software is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this software; if not, write to the Free
+* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+*/
+
+package org.jboss.cache.pojo;
+
+
+/**
+ * Represents the thread specific context for POJO Cache operations agains=
t a particular cache instance. This is
+ * primarily used to change thread specific options. Once set, they remain=
 for the entire lifetime of the thread.
+ * =

+ * Instances of this class can only be obtained by {@link PojoCache#getThr=
eadContext}
+ * =

+ * @author Jason T. Greene
+ * @since 2.1
+ */
+public interface PojoCacheThreadContext
+{   =

+   /**
+    * Returns whether or not this thread should trigger gravitation when a=
 cache-miss occurs. The default is false.
+    * =

+    * @return true if gravitation should be triggered on cache-miss, false=
 if gravitation should not be triggered
+    */
+   public boolean isGravitationEnabled();
+   =

+   /**
+    * Enables or disables gravitation on cache-miss
+    * =

+    * @param gravitate  true if gravitation should be triggered on cache-m=
iss, false if gravitation should not be triggered
+    */
+   public void setGravitationEnabled(boolean gravitate);
+}
\ No newline at end of file

Modified: pojo/trunk/src/main/java/org/jboss/cache/pojo/impl/InternalHelper=
.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- pojo/trunk/src/main/java/org/jboss/cache/pojo/impl/InternalHelper.java	=
2008-01-16 22:15:37 UTC (rev 5150)
+++ pojo/trunk/src/main/java/org/jboss/cache/pojo/impl/InternalHelper.java	=
2008-01-16 22:17:11 UTC (rev 5151)
@@ -13,6 +13,7 @@
 import org.jboss.cache.Cache;
 import org.jboss.cache.CacheException;
 import org.jboss.cache.Fqn;
+import org.jboss.cache.pojo.PojoCache;
 import org.jboss.cache.pojo.PojoCacheException;
 import org.jboss.cache.pojo.util.ObjectUtil;
 =

@@ -26,11 +27,13 @@
 {
    private static  Log log =3D LogFactory.getLog(InternalHelper.class.getN=
ame());
 =

-   private Cache cache;
+   private Cache<Object, Object> cache;
+   private PojoCache pcache;
 =

-   InternalHelper(Cache cache)
+   InternalHelper(PojoCache pcache)
    {
-      this.cache =3D cache;
+      this.cache =3D pcache.getCache();
+      this.pcache =3D pcache;
    }
 =

    PojoInstance getPojoInstance(Fqn fqn) throws CacheException
@@ -86,7 +89,8 @@
 =

    private Object get(Fqn fqn, Object key, boolean gravitate) throws Cache=
Exception
    {
-      if (gravitate)
+      // Only gravitate when we have to and only when the user has enabled=
 it
+      if (gravitate && pcache.getThreadContext().isGravitationEnabled())
       {
          cache.getInvocationContext().getOptionOverrides().setForceDataGra=
vitation(true);
          Object obj =3D cache.get(fqn, key);

Modified: pojo/trunk/src/main/java/org/jboss/cache/pojo/impl/PojoCacheDeleg=
ate.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- pojo/trunk/src/main/java/org/jboss/cache/pojo/impl/PojoCacheDelegate.ja=
va	2008-01-16 22:15:37 UTC (rev 5150)
+++ pojo/trunk/src/main/java/org/jboss/cache/pojo/impl/PojoCacheDelegate.ja=
va	2008-01-16 22:17:11 UTC (rev 5151)
@@ -58,7 +58,7 @@
    {
       pojoCache =3D cache;
       this.cache =3D pojoCache.getCache();
-      internal_ =3D new InternalHelper(this.cache);
+      internal_ =3D new InternalHelper(cache);
       graphHandler_ =3D new ObjectGraphHandler(pojoCache, internal_);
       collectionHandler_ =3D new CollectionClassHandler(pojoCache, interna=
l_);
       serializableHandler_ =3D new SerializableObjectHandler(pojoCache, in=
ternal_);

Modified: pojo/trunk/src/main/java/org/jboss/cache/pojo/impl/PojoCacheImpl.=
java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- pojo/trunk/src/main/java/org/jboss/cache/pojo/impl/PojoCacheImpl.java	2=
008-01-16 22:15:37 UTC (rev 5150)
+++ pojo/trunk/src/main/java/org/jboss/cache/pojo/impl/PojoCacheImpl.java	2=
008-01-16 22:17:11 UTC (rev 5151)
@@ -24,6 +24,7 @@
 import org.jboss.cache.factories.XmlConfigurationParser;
 import org.jboss.cache.pojo.PojoCache;
 import org.jboss.cache.pojo.PojoCacheException;
+import org.jboss.cache.pojo.PojoCacheThreadContext;
 import org.jboss.cache.pojo.annotation.Attach;
 import org.jboss.cache.pojo.annotation.Detach;
 import org.jboss.cache.pojo.annotation.Find;
@@ -44,6 +45,7 @@
    private Map cachedTypes_ =3D new WeakHashMap();
    private boolean hasCreate_ =3D false;
    private CacheListenerAdaptor listenerAdaptor =3D new CacheListenerAdapt=
or(this);
+   private PojoCacheThreadContext threadContext =3D new PojoCacheThreadCon=
textImpl();
 =

    public PojoCacheImpl(String configStr, boolean toStart)
    {
@@ -319,6 +321,11 @@
             cache.removeCacheListener(listenerAdaptor);
       }
    }
+   =

+   public PojoCacheThreadContext getThreadContext()
+   {
+      return threadContext;
+   }
 =

    public Cache<Object,Object> getCache()
    {

Copied: pojo/trunk/src/main/java/org/jboss/cache/pojo/impl/PojoCacheThreadC=
ontextImpl.java (from rev 5149, pojo/branches/2.1/src/main/java/org/jboss/c=
ache/pojo/impl/PojoCacheThreadContextImpl.java)
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- pojo/trunk/src/main/java/org/jboss/cache/pojo/impl/PojoCacheThreadConte=
xtImpl.java	                        (rev 0)
+++ pojo/trunk/src/main/java/org/jboss/cache/pojo/impl/PojoCacheThreadConte=
xtImpl.java	2008-01-16 22:17:11 UTC (rev 5151)
@@ -0,0 +1,46 @@
+package org.jboss.cache.pojo.impl;
+
+import org.jboss.cache.pojo.PojoCacheThreadContext;
+
+public class PojoCacheThreadContextImpl implements PojoCacheThreadContext
+{
+   private static final int GRAVITATE =3D 0;
+   private static final Boolean GRAVITATE_DEFAULT =3D false;
+   =

+   // Every cache instance gets it's own configuration
+   // An array is used to conserve memory usage since reclamation is slow =
with TLs, and prevent CL leaks
+   // In the future, if we get multiple booleans, use bitwise operations o=
n an integer =

+   // as the first entry
+   private final ThreadLocal<Object[]> state =3D new ThreadLocal<Object[]>=
()
+   {
+      @Override
+      protected Object[] initialValue()
+      {
+         return new Object[] {GRAVITATE_DEFAULT};
+      }
+   };
+   =

+   PojoCacheThreadContextImpl() =

+   {
+   }
+
+   /**
+    * Returns whether or not this thread should trigger gravitation when a=
 cache-miss occurs. The default is false.
+    * =

+    * @return true if gravitation should be triggered on cache-miss, false=
 if gravitation should not be triggered
+    */
+   public boolean isGravitationEnabled()
+   {
+      return (Boolean) state.get()[GRAVITATE];
+   }
+   =

+   /**
+    * Enables or disables gravitation on cache-miss
+    * =

+    * @param gravitate  true if gravitation should be triggered on cache-m=
iss, false if gravitation should not be triggered
+    */
+   public void setGravitationEnabled(boolean gravitate)
+   {
+      state.get()[GRAVITATE] =3D gravitate;
+   }
+}

Modified: pojo/trunk/src/test/java/org/jboss/cache/pojo/BuddyReplicationTes=
t.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- pojo/trunk/src/test/java/org/jboss/cache/pojo/BuddyReplicationTest.java=
	2008-01-16 22:15:37 UTC (rev 5150)
+++ pojo/trunk/src/test/java/org/jboss/cache/pojo/BuddyReplicationTest.java=
	2008-01-16 22:17:11 UTC (rev 5151)
@@ -65,6 +65,10 @@
       addBuddyReplication(cfg2);
       cache1 =3D PojoCacheFactory.createCache(cfg2, toStart);
       cache1.start();
+      =

+      // Enable gravitation
+      cache.getThreadContext().setGravitationEnabled(true);
+      cache1.getThreadContext().setGravitationEnabled(true);
    }
 =

    @AfterMethod(alwaysRun =3D true)

Copied: pojo/trunk/src/test/java/org/jboss/cache/pojo/PojoCacheThreadContex=
tTest.java (from rev 5149, pojo/branches/2.1/src/test/java/org/jboss/cache/=
pojo/PojoCacheThreadContextTest.java)
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- pojo/trunk/src/test/java/org/jboss/cache/pojo/PojoCacheThreadContextTes=
t.java	                        (rev 0)
+++ pojo/trunk/src/test/java/org/jboss/cache/pojo/PojoCacheThreadContextTes=
t.java	2008-01-16 22:17:11 UTC (rev 5151)
@@ -0,0 +1,132 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package org.jboss.cache.pojo;
+
+import static org.testng.AssertJUnit.assertEquals;
+import static org.testng.AssertJUnit.assertNotNull;
+import static org.testng.AssertJUnit.assertNull;
+
+import java.util.List;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.jboss.cache.buddyreplication.NextMemberBuddyLocatorConfig;
+import org.jboss.cache.config.BuddyReplicationConfig;
+import org.jboss.cache.config.Configuration;
+import org.jboss.cache.config.Configuration.CacheMode;
+import org.jboss.cache.factories.UnitTestCacheConfigurationFactory;
+import org.jboss.cache.pojo.test.Person;
+import org.testng.annotations.AfterMethod;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.Test;
+
+/**
+ * A BuddyReplicatedTest.
+ *
+ * @author <a href=3D"brian.stansberry(a)jboss.com">Brian Stansberry</a>
+ * @version $Revision: 4717 $
+ */
+(a)Test(groups =3D {"functional"})
+public class PojoCacheThreadContextTest =

+{
+   Log log =3D LogFactory.getLog(ReplicatedTest.class);
+   volatile PojoCache cache, cache1;
+
+   @BeforeMethod(alwaysRun =3D true)
+   protected void setUp() throws Exception
+   {
+      log.info("setUp() ....");
+      boolean toStart =3D false;
+      Configuration cfg1 =3D UnitTestCacheConfigurationFactory.createConfi=
guration(CacheMode.LOCAL);
+      cache =3D PojoCacheFactory.createCache(cfg1, toStart);
+      cache.start();
+      Configuration cfg2 =3D UnitTestCacheConfigurationFactory.createConfi=
guration(CacheMode.LOCAL);
+      cache1 =3D PojoCacheFactory.createCache(cfg2, toStart);
+      cache1.start();
+   }
+
+   @AfterMethod(alwaysRun =3D true)
+   protected void tearDown() throws Exception
+   {
+      cache.stop();
+      cache1.stop();
+   }
+
+   public void testDefault()
+   {
+      assertEquals(cache.getThreadContext().isGravitationEnabled(), false);
+      assertEquals(cache1.getThreadContext().isGravitationEnabled(), false=
);
+   }
+   =

+   private class TestThread extends Thread
+   {
+      public volatile Throwable t;
+
+      @Override
+      public void run()
+      {
+         try
+         {
+            cache1.getThreadContext().setGravitationEnabled(true);
+            assertEquals(cache.getThreadContext().isGravitationEnabled(), =
false);
+            assertEquals(cache1.getThreadContext().isGravitationEnabled(),=
 true);
+         =

+            cache.getThreadContext().setGravitationEnabled(true);
+            assertEquals(cache.getThreadContext().isGravitationEnabled(), =
true);
+            assertEquals(cache1.getThreadContext().isGravitationEnabled(),=
 true);
+         }
+         catch (Throwable t)
+         {
+            this.t =3D t;
+         }
+      }
+   };
+
+   public void testThreadIsolation() throws Throwable
+   {
+      assertEquals(cache.getThreadContext().isGravitationEnabled(), false);
+      assertEquals(cache1.getThreadContext().isGravitationEnabled(), false=
);
+      =

+      =

+      TestThread t1 =3D new TestThread();
+      t1.start();
+      t1.join();
+      if (t1.t !=3D null)
+         throw t1.t;
+      =

+      assertEquals(cache.getThreadContext().isGravitationEnabled(), false);
+      assertEquals(cache1.getThreadContext().isGravitationEnabled(), false=
);
+
+      cache1.getThreadContext().setGravitationEnabled(true);
+      assertEquals(cache.getThreadContext().isGravitationEnabled(), false);
+      assertEquals(cache1.getThreadContext().isGravitationEnabled(), true);
+      t1 =3D new TestThread();
+      t1.start();
+      t1.join();
+      if (t1.t !=3D null)
+         throw t1.t;
+      =

+      assertEquals(cache.getThreadContext().isGravitationEnabled(), false);
+      assertEquals(cache1.getThreadContext().isGravitationEnabled(), true);
+   }
+}


--===============5247629923259063342==--

From jbosscache-commits at lists.jboss.org Wed Jan 16 17:36:23 2008
Content-Type: multipart/mixed; boundary="===============8055498387238614395=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r5152 -
 pojo/branches/2.1/src/main/java/org/jboss/cache/pojo/jmx.
Date: Wed, 16 Jan 2008 17:36:22 -0500
Message-ID: <E1JFGru-0002DT-Nz@committer01.frg.pub.inap.atl.jboss.com>

--===============8055498387238614395==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: jason.greene(a)jboss.com
Date: 2008-01-16 17:36:22 -0500 (Wed, 16 Jan 2008)
New Revision: 5152

Modified:
   pojo/branches/2.1/src/main/java/org/jboss/cache/pojo/jmx/PojoCacheJmxWra=
pper.java
Log:
Merge 5127


Modified: pojo/branches/2.1/src/main/java/org/jboss/cache/pojo/jmx/PojoCach=
eJmxWrapper.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- pojo/branches/2.1/src/main/java/org/jboss/cache/pojo/jmx/PojoCacheJmxWr=
apper.java	2008-01-16 22:17:11 UTC (rev 5151)
+++ pojo/branches/2.1/src/main/java/org/jboss/cache/pojo/jmx/PojoCacheJmxWr=
apper.java	2008-01-16 22:36:22 UTC (rev 5152)
@@ -251,13 +251,15 @@
       {
          cacheStatus =3D CacheStatus.DESTROYING;
 =

-         pojoCache.destroy();
+         if (pojoCache !=3D null)
+            pojoCache.destroy();
 =

          // The cache is destroyed, so we shouldn't leave it registered
          // in JMX even if we didn't register it in create()
          unregisterPlainCache();
 =

-         plainCacheWrapper.destroy();
+         if (plainCacheWrapper !=3D null)
+            plainCacheWrapper.destroy();
       }
       finally
       {


--===============8055498387238614395==--

From jbosscache-commits at lists.jboss.org Wed Jan 16 17:46:23 2008
Content-Type: multipart/mixed; boundary="===============0845154629865558315=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r5153 - in
 pojo/branches/2.1/src: main/java/org/jboss/cache/pojo/interceptors/dynamic
 and 3 other directories.
Date: Wed, 16 Jan 2008 17:46:23 -0500
Message-ID: <E1JFH1b-0004CP-AZ@committer01.frg.pub.inap.atl.jboss.com>

--===============0845154629865558315==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: jason.greene(a)jboss.com
Date: 2008-01-16 17:46:23 -0500 (Wed, 16 Jan 2008)
New Revision: 5153

Modified:
   pojo/branches/2.1/src/main/java/org/jboss/cache/pojo/impl/AdvisedPojoHan=
dler.java
   pojo/branches/2.1/src/main/java/org/jboss/cache/pojo/impl/CachedType.java
   pojo/branches/2.1/src/main/java/org/jboss/cache/pojo/interceptors/dynami=
c/CacheFieldInterceptor.java
   pojo/branches/2.1/src/main/resources/META-INF/pojocache-aop.xml
   pojo/branches/2.1/src/test/java/org/jboss/cache/pojo/LocalTest.java
   pojo/branches/2.1/src/test/java/org/jboss/cache/pojo/ReplicatedTest.java
   pojo/branches/2.1/src/test/java/org/jboss/cache/pojo/test/Person.java
Log:
Merge 4857 and 4858


Modified: pojo/branches/2.1/src/main/java/org/jboss/cache/pojo/impl/Advised=
PojoHandler.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- pojo/branches/2.1/src/main/java/org/jboss/cache/pojo/impl/AdvisedPojoHa=
ndler.java	2008-01-16 22:36:22 UTC (rev 5152)
+++ pojo/branches/2.1/src/main/java/org/jboss/cache/pojo/impl/AdvisedPojoHa=
ndler.java	2008-01-16 22:46:23 UTC (rev 5153)
@@ -26,6 +26,7 @@
 import org.jboss.cache.pojo.memory.FieldPersistentReference;
 import org.jboss.cache.pojo.util.AopUtil;
 import org.jboss.cache.pojo.util.Instantiator;
+import org.jboss.cache.pojo.util.ObjectUtil;
 =

 /**
  * Handling the advised pojo operations. No consideration of object graph =
here.
@@ -49,14 +50,33 @@
       util_ =3D util;
    }
 =

-   public Object get(Fqn<?> fqn, Class<?> clazz, PojoInstance pojoInstance)
-         throws CacheException
+   public Object get(Fqn<?> fqn, Class<?> clazz, PojoInstance pojoInstance=
) throws CacheException
    {
       CachedType type =3D pCache_.getCachedType(clazz);
-      Object obj =3DInstantiator.newInstance(clazz);
+      Object obj =3D Instantiator.newInstance(clazz);
+      =

+      // Eager initialize final fields, since these may not be intercepted
+      =

+      try
+      {
+         for (FieldPersistentReference ref : type.getFinalFields())
+         {
+            Field field =3D ref.getField();
+            Object result;
+         =

+            if (CachedType.isSimpleAttribute(field))
+               result =3D cache_.get(fqn, field.getName());
+            else
+               result =3D pCache_.getObject(fqn, field.getName());
+         =

+            field.set(obj, result);
+         }
+      }
+      catch (Exception e)
+      {
+         log.warn("Could not initialize final fields on object: " + Object=
Util.identityString(obj));
+      }
 =

-      // TODO Need to populate the object from the cache as well.
-      // Insert interceptor at runtime
       InstanceAdvisor advisor =3D ((Advised) obj)._getInstanceAdvisor();
       CacheFieldInterceptor interceptor =3D new CacheFieldInterceptor(pCac=
he_, fqn, type);
       interceptor.setAopInstance(pojoInstance);

Modified: pojo/branches/2.1/src/main/java/org/jboss/cache/pojo/impl/CachedT=
ype.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- pojo/branches/2.1/src/main/java/org/jboss/cache/pojo/impl/CachedType.ja=
va	2008-01-16 22:36:22 UTC (rev 5152)
+++ pojo/branches/2.1/src/main/java/org/jboss/cache/pojo/impl/CachedType.ja=
va	2008-01-16 22:46:23 UTC (rev 5153)
@@ -31,8 +31,8 @@
 public class CachedType
 {
    // Types that are considered "primitive".
-   private static final Set immediates =3D
-           new HashSet(Arrays.asList(new Object[]{
+   private static final Set<Object> immediates =3D
+           new HashSet<Object>(Arrays.asList(new Object[]{
                    String.class,
                    Boolean.class,
                    Double.class,
@@ -57,8 +57,9 @@
    private boolean immediate;
 =

    // Java fields . Will use special FieldPersistentReference to prevent c=
lassloader leakage.
-   private List fields =3D new ArrayList();
-   private Map fieldMap =3D new HashMap();// Name -> CachedAttribute
+   private List<FieldPersistentReference> fields =3D new ArrayList<FieldPe=
rsistentReference>();
+   private List<FieldPersistentReference> finalFields =3D new ArrayList<Fi=
eldPersistentReference>();
+   private Map<String, FieldPersistentReference> fieldMap =3D new HashMap<=
String, FieldPersistentReference>();// Name -> CachedAttribute
 =

    public CachedType()
    {
@@ -92,14 +93,19 @@
       return immutable;
    }
 =

-   public List getFields()
+   public List<FieldPersistentReference> getFields()
    {
       return fields;
    }
+   =

+   public List<FieldPersistentReference> getFinalFields()
+   {
+      return finalFields;
+   }
 =

    public Field getField(String name)
    {
-      FieldPersistentReference ref =3D (FieldPersistentReference) fieldMap=
.get(name);
+      FieldPersistentReference ref =3D fieldMap.get(name);
       if (ref =3D=3D null) return null;
       return (Field) ref.get();
    }
@@ -209,7 +215,7 @@
       for (int i =3D 0; i < classFields.length; i++)
       {
          Field f =3D classFields[i];
-         if (isNonReplicatable(f)) continue;
+         if (isNonReplicable(f)) continue;
 =

          PrivilegedCode.setAccessible(f);
 =

@@ -217,17 +223,20 @@
 =

          fields.add(persistentRef);
          fieldMap.put(f.getName(), persistentRef);
+       =

+         if (Modifier.isFinal(f.getModifiers()))
+            finalFields.add(persistentRef);
       }
    }
 =

-   public static boolean isNonReplicatable(Field field)
+   public static boolean isNonReplicable(Field field)
    {
       int mods =3D field.getModifiers();
       /**
        * The following modifiers are ignored in the cache, i.e., they will=
 not be stored in the cache.
        * Whenever, user trying to access these fields, it will be accessed=
 from the in-memory version.
        */
-      return Modifier.isStatic(mods) || Modifier.isTransient(mods) || Modi=
fier.isFinal(mods) ||
+      return Modifier.isStatic(mods) || Modifier.isTransient(mods) ||
          field.isAnnotationPresent(org.jboss.cache.pojo.annotation.Transie=
nt.class);
    }
 =


Modified: pojo/branches/2.1/src/main/java/org/jboss/cache/pojo/interceptors=
/dynamic/CacheFieldInterceptor.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- pojo/branches/2.1/src/main/java/org/jboss/cache/pojo/interceptors/dynam=
ic/CacheFieldInterceptor.java	2008-01-16 22:36:22 UTC (rev 5152)
+++ pojo/branches/2.1/src/main/java/org/jboss/cache/pojo/interceptors/dynam=
ic/CacheFieldInterceptor.java	2008-01-16 22:46:23 UTC (rev 5153)
@@ -112,7 +112,7 @@
          // Only if this field is replicatable. static, transient and fina=
l are not.
          CachedType fieldType =3D pCache_.getCachedType(field.getType());
          Object value =3D ((FieldWriteInvocation) fieldInvocation).getValu=
e();
-         if (!CachedType.isNonReplicatable(field))
+         if (!CachedType.isNonReplicable(field))
          {
             if (CachedType.isSimpleAttribute(field))
             {
@@ -136,7 +136,7 @@
 =

          // Only if this field is replicatable
          CachedType fieldType =3D pCache_.getCachedType(field.getType());
-         if (!CachedType.isNonReplicatable(field))
+         if (!CachedType.isNonReplicable(field))
          {
             Object result;
             if (CachedType.isSimpleAttribute(field))

Modified: pojo/branches/2.1/src/main/resources/META-INF/pojocache-aop.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- pojo/branches/2.1/src/main/resources/META-INF/pojocache-aop.xml	2008-01=
-16 22:36:22 UTC (rev 5152)
+++ pojo/branches/2.1/src/main/resources/META-INF/pojocache-aop.xml	2008-01=
-16 22:46:23 UTC (rev 5153)
@@ -137,10 +137,13 @@
       instrumented as well.
    -->
 =

-   <!-- If a POJO has PojoCachable annotation, it will be asepectized. -->
+   <!-- If a POJO has Replicable annotation, it will be asepectized. -->
    <!--
    Supports inheritance and polymorphism. It can either be a concrete class
    or an interface. All sub-classes or interface implementors will be inst=
rumeneted.
    -->
    <prepare expr=3D"field(* $instanceof{@org.jboss.cache.pojo.annotation.R=
eplicable}->*)" />
-</aop>
+   =

+   <!--  Work around that ensures annotated classes which do not access fi=
elds are instrumented -->
+   <introduction expr=3D"class($instanceof{@org.jboss.cache.pojo.annotatio=
n.Replicable})"/>   =

+</aop>
\ No newline at end of file

Modified: pojo/branches/2.1/src/test/java/org/jboss/cache/pojo/LocalTest.ja=
va
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- pojo/branches/2.1/src/test/java/org/jboss/cache/pojo/LocalTest.java	200=
8-01-16 22:36:22 UTC (rev 5152)
+++ pojo/branches/2.1/src/test/java/org/jboss/cache/pojo/LocalTest.java	200=
8-01-16 22:46:23 UTC (rev 5153)
@@ -58,7 +58,12 @@
 =

    private Person createPerson(String id, String name, int age)
    {
-      Person p =3D new Person();
+      return createPerson(id, name, age, null);
+   }
+   =

+   private Person createPerson(String id, String name, int age, Map<String=
, String> finalMap)
+   {
+      Person p =3D new Person(finalMap);
       p.setName(name);
       p.setAge(age);
       Address add =3D new Address();
@@ -154,6 +159,7 @@
       }
    }
 =

+
    public void testMap() throws Exception
    {
       log.info("testMap() ....");
@@ -178,7 +184,29 @@
       assertEquals("Hobbies size", 2, hobbies.size());
       log.debug("Hobbies is " + hobbies.toString());
    }
+   public void testFinalMap() throws Exception
+   {
+      log.info("testMap() ....");
+      Person ben =3D createPerson("/person/test1", "Ben Wang", 40, new Has=
hMap<String, String>());
+      assertEquals((Object) "Ben Wang", ben.getName());
+      Map<String, String> map =3D ben.getFinalMap();
+      if (!(map instanceof ClassProxy))
+      {
+         fail("Final map is not an instance of ClassProxy");
+      }
+      =

+      map.put("test1", "testa");
+      map.put("test2", "testb");
 =

+      assertEquals("Hobbies size", 2, map.size());
+      ben =3D (Person) cache_.detach("/person/test1");
+      map =3D ben.getFinalMap();
+      if (!(map instanceof HashMap))
+      {
+         fail("Final map is not an instance of HashMap");
+      }
+   }
+
    public void testMapDetachAttach() throws Exception
    {
       log.info("testMapDetachATtach() ....");

Modified: pojo/branches/2.1/src/test/java/org/jboss/cache/pojo/ReplicatedTe=
st.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- pojo/branches/2.1/src/test/java/org/jboss/cache/pojo/ReplicatedTest.jav=
a	2008-01-16 22:36:22 UTC (rev 5152)
+++ pojo/branches/2.1/src/test/java/org/jboss/cache/pojo/ReplicatedTest.jav=
a	2008-01-16 22:46:23 UTC (rev 5153)
@@ -4,7 +4,9 @@
 import static org.testng.AssertJUnit.assertNull;
 import static org.testng.AssertJUnit.assertTrue;
 =

+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 =

 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -49,7 +51,12 @@
 =

    private Person createPerson(String id, String name, int age)
    {
-      Person p =3D new Person();
+      return createPerson(id, name, age, null);
+   }
+   =

+   private Person createPerson(String id, String name, int age, Map<String=
, String> map)
+   {
+      Person p =3D new Person(map);
       p.setName(name);
       p.setAge(age);
       cache.attach(id, p);
@@ -112,6 +119,17 @@
               ((Person) cache1.find("/person/test1")).getCurrentStatus());
       cache.detach("/person/test1");
    }
+   =

+   public void testFinal() throws Exception
+   {
+      Person jason =3D createPerson("/person/test1", "Jason Greene", 28, n=
ew HashMap<String, String>());
+      jason.getFinalMap().put("test1", "testa");
+      jason.getFinalMap().put("test2", "testb");
+      =

+      Person jason2 =3D (Person) cache1.find("/person/test1");
+      assertEquals("testa", jason2.getFinalMap().get("test1"));
+      assertEquals("testb", jason2.getFinalMap().get("test2"));
+   }
 =

    public void testModification() throws Exception
    {

Modified: pojo/branches/2.1/src/test/java/org/jboss/cache/pojo/test/Person.=
java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- pojo/branches/2.1/src/test/java/org/jboss/cache/pojo/test/Person.java	2=
008-01-16 22:36:22 UTC (rev 5152)
+++ pojo/branches/2.1/src/test/java/org/jboss/cache/pojo/test/Person.java	2=
008-01-16 22:46:23 UTC (rev 5153)
@@ -7,6 +7,8 @@
 package org.jboss.cache.pojo.test;
 =

 import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
@@ -40,11 +42,17 @@
    private List<String> medication =3D null;
    private static final int AGE1 =3D 50;
    private static final int AGE2 =3D 60;
+   private final Map<String, String> finalMap;
 =

    public Person()
    {
-
+      this(null);
    }
+   =

+   public Person(Map<String, String> map)
+   {
+      finalMap =3D map;
+   }
 =

    public String getName()
    {
@@ -162,6 +170,11 @@
    {
       this.languages =3D languages;
    }
+   =

+   public Map<String, String> getFinalMap()
+   {
+      return this.finalMap;
+   }
 =

    public String toString()
    {


--===============0845154629865558315==--

From jbosscache-commits at lists.jboss.org Wed Jan 16 17:51:48 2008
Content-Type: multipart/mixed; boundary="===============6084912031777951278=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r5154 - in pojo/branches/2.1:
 src/main/release and 1 other directories.
Date: Wed, 16 Jan 2008 17:51:48 -0500
Message-ID: <E1JFH6q-0005BA-Cg@committer01.frg.pub.inap.atl.jboss.com>

--===============6084912031777951278==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: jason.greene(a)jboss.com
Date: 2008-01-16 17:51:48 -0500 (Wed, 16 Jan 2008)
New Revision: 5154

Added:
   pojo/branches/2.1/src/main/release/bin/
   pojo/branches/2.1/src/main/release/bin/pojo-run
Removed:
   pojo/branches/2.1/src/main/release/bin/pojo-run
Modified:
   pojo/branches/2.1/assembly/all.xml
   pojo/branches/2.1/assembly/bin.xml
Log:
Merge 4859 and 4860


Modified: pojo/branches/2.1/assembly/all.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- pojo/branches/2.1/assembly/all.xml	2008-01-16 22:46:23 UTC (rev 5153)
+++ pojo/branches/2.1/assembly/all.xml	2008-01-16 22:51:48 UTC (rev 5154)
@@ -46,12 +46,14 @@
     <fileSet>
       <directory>src/main/release</directory>
       <outputDirectory/>
-      <includes>
-        <include>**/*.txt</include>
-        <include>**/*.xml</include>
-      </includes>
     </fileSet>
 =

+    <fileSet>
+      <directory>src/main/release/bin</directory>
+      <outputDirectory>bin</outputDirectory>
+      <fileMode>0755</fileMode>
+    </fileSet>
+
     <!-- docs -->
     <fileSet>
       <directory>target/site/apidocs</directory>

Modified: pojo/branches/2.1/assembly/bin.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- pojo/branches/2.1/assembly/bin.xml	2008-01-16 22:46:23 UTC (rev 5153)
+++ pojo/branches/2.1/assembly/bin.xml	2008-01-16 22:51:48 UTC (rev 5154)
@@ -27,12 +27,14 @@
     <fileSet>
       <directory>src/main/release</directory>
       <outputDirectory/>
-      <includes>
-        <include>**/*.txt</include>
-        <include>**/*.xml</include>
-      </includes>
     </fileSet>
 =

+    <fileSet>
+      <directory>src/main/release/bin</directory>
+      <outputDirectory>bin</outputDirectory>
+      <fileMode>0755</fileMode>
+    </fileSet>
+
   </fileSets>
   <dependencySets>
     <dependencySet>

Copied: pojo/branches/2.1/src/main/release/bin (from rev 4860, pojo/trunk/s=
rc/main/release/bin)

Deleted: pojo/branches/2.1/src/main/release/bin/pojo-run
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- pojo/trunk/src/main/release/bin/pojo-run	2007-12-14 04:58:12 UTC (rev 4=
860)
+++ pojo/branches/2.1/src/main/release/bin/pojo-run	2008-01-16 22:51:48 UTC=
 (rev 5154)
@@ -1,75 +0,0 @@
-#!/bin/sh
-DIRNAME=3D`dirname $0`
-POJO_HOME=3D`cd $DIRNAME/..; pwd`
-
-if [ $# -lt 1 ]; then
-   echo Utility which executes the JVM with properties needed by POJO Cach=
e for load-time instrumentation. =

-   echo =

-   echo Usage:
-   echo "pojo-run [-classpath <classpath>] <main-class> [arguments...] "
-   echo "   classpath:        Classpath of your sourcefiles and all requir=
ed libraries"
-   echo "   main-class:       Normal Java main class"
-   echo =

-   echo Example:
-   echo "   pojo-run -classpath myclasses org.foo.Main"
-   exit 1
-fi
-
-cygwin=3Dfalse;
-case "`uname`" in
-    CYGWIN*)
-        cygwin=3Dtrue
-        ;;
-esac
-
-AOP_FILE=3D"pojocache-aop.xml"
-AOP_PATH=3D"$POJO_HOME/$AOP_FILE"
-
-if [ ! -f "$AOP_PATH" ]; then
-   AOP_PATH=3D"$POJO_HOME/etc/META-INF/$AOP_FILE"
-
-   if [ ! -f "$AOP_PATH" ]; then
-      echo "Could not locate pojocache-aop.xml in $POJO_HOME or $POJO_HOME=
/etc/META-INF"
-      exit 1
-   fi
-fi
-
-POJO_CLASSPATH=3D.:$POJO_HOME/jbosscache-pojo.jar
-
-for i in $POJO_HOME/lib/*.jar
-do
-    POJO_CLASSPATH=3D"$POJO_CLASSPATH:${i}"
-done
-
-while [ $# -ge 1 ]; do
-   case $1 in
-       "-classpath") POJO_CLASSPATH=3D"$POJO_CLASSPATH:$2"; shift;;
-       *) args=3D"$args \"$1\""; echo $1;;
-   esac
-   shift
-done
-
-
-#Check for cygwin and convert path if necessary
-if $cygwin; then
-   POJO_CLASSPATH=3D`cygpath --path --windows $POJO_CLASSPATH`
-fi
-
-# Setup the JVM
-if [ "x$JAVA" =3D "x" ]; then
-    if [ "x$JAVA_HOME" !=3D "x" ]; then
-	JAVA=3D"$JAVA_HOME/bin/java"
-    else
-	JAVA=3D"java"
-    fi
-fi
-
-#JPDA options. Uncomment and modify as appropriate to enable remote debugg=
ing .
-#JAVA_OPTS=3D"-classic -Xdebug -Xnoagent -Djava.compiler=3DNONE -Xrunjdwp:=
transport=3Ddt_socket,address=3D8787,server=3Dy,suspend=3Dn $JAVA_OPTS"
-
-# Execute the JVM
-eval "$JAVA" $JAVA_OPTS \
-   -javaagent:"$POJO_HOME/lib/jboss-aop.jar" \
-   -Djboss.aop.path=3D"$AOP_PATH" \
-   -classpath "$POJO_CLASSPATH" \
-   "$args"

Copied: pojo/branches/2.1/src/main/release/bin/pojo-run (from rev 4860, poj=
o/trunk/src/main/release/bin/pojo-run)
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- pojo/branches/2.1/src/main/release/bin/pojo-run	                       =
 (rev 0)
+++ pojo/branches/2.1/src/main/release/bin/pojo-run	2008-01-16 22:51:48 UTC=
 (rev 5154)
@@ -0,0 +1,75 @@
+#!/bin/sh
+DIRNAME=3D`dirname $0`
+POJO_HOME=3D`cd $DIRNAME/..; pwd`
+
+if [ $# -lt 1 ]; then
+   echo Utility which executes the JVM with properties needed by POJO Cach=
e for load-time instrumentation. =

+   echo =

+   echo Usage:
+   echo "pojo-run [-classpath <classpath>] <main-class> [arguments...] "
+   echo "   classpath:        Classpath of your sourcefiles and all requir=
ed libraries"
+   echo "   main-class:       Normal Java main class"
+   echo =

+   echo Example:
+   echo "   pojo-run -classpath myclasses org.foo.Main"
+   exit 1
+fi
+
+cygwin=3Dfalse;
+case "`uname`" in
+    CYGWIN*)
+        cygwin=3Dtrue
+        ;;
+esac
+
+AOP_FILE=3D"pojocache-aop.xml"
+AOP_PATH=3D"$POJO_HOME/$AOP_FILE"
+
+if [ ! -f "$AOP_PATH" ]; then
+   AOP_PATH=3D"$POJO_HOME/etc/META-INF/$AOP_FILE"
+
+   if [ ! -f "$AOP_PATH" ]; then
+      echo "Could not locate pojocache-aop.xml in $POJO_HOME or $POJO_HOME=
/etc/META-INF"
+      exit 1
+   fi
+fi
+
+POJO_CLASSPATH=3D.:$POJO_HOME/jbosscache-pojo.jar
+
+for i in $POJO_HOME/lib/*.jar
+do
+    POJO_CLASSPATH=3D"$POJO_CLASSPATH:${i}"
+done
+
+while [ $# -ge 1 ]; do
+   case $1 in
+       "-classpath") POJO_CLASSPATH=3D"$POJO_CLASSPATH:$2"; shift;;
+       *) args=3D"$args \"$1\""; echo $1;;
+   esac
+   shift
+done
+
+
+#Check for cygwin and convert path if necessary
+if $cygwin; then
+   POJO_CLASSPATH=3D`cygpath --path --windows $POJO_CLASSPATH`
+fi
+
+# Setup the JVM
+if [ "x$JAVA" =3D "x" ]; then
+    if [ "x$JAVA_HOME" !=3D "x" ]; then
+	JAVA=3D"$JAVA_HOME/bin/java"
+    else
+	JAVA=3D"java"
+    fi
+fi
+
+#JPDA options. Uncomment and modify as appropriate to enable remote debugg=
ing .
+#JAVA_OPTS=3D"-classic -Xdebug -Xnoagent -Djava.compiler=3DNONE -Xrunjdwp:=
transport=3Ddt_socket,address=3D8787,server=3Dy,suspend=3Dn $JAVA_OPTS"
+
+# Execute the JVM
+eval "$JAVA" $JAVA_OPTS \
+   -javaagent:"$POJO_HOME/lib/jboss-aop.jar" \
+   -Djboss.aop.path=3D"$AOP_PATH" \
+   -classpath "$POJO_CLASSPATH" \
+   "$args"


--===============6084912031777951278==--

From jbosscache-commits at lists.jboss.org Wed Jan 16 17:52:36 2008
Content-Type: multipart/mixed; boundary="===============5025942916515024607=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r5155 -
 pojo/branches/2.1/src/main/java/org/jboss/cache/pojo/jmx.
Date: Wed, 16 Jan 2008 17:52:32 -0500
Message-ID: <E1JFH7Y-0005Cr-NE@committer01.frg.pub.inap.atl.jboss.com>

--===============5025942916515024607==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: jason.greene(a)jboss.com
Date: 2008-01-16 17:52:32 -0500 (Wed, 16 Jan 2008)
New Revision: 5155

Modified:
   pojo/branches/2.1/src/main/java/org/jboss/cache/pojo/jmx/PojoCacheJmxWra=
pper.java
Log:
Merge 5126


Modified: pojo/branches/2.1/src/main/java/org/jboss/cache/pojo/jmx/PojoCach=
eJmxWrapper.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- pojo/branches/2.1/src/main/java/org/jboss/cache/pojo/jmx/PojoCacheJmxWr=
apper.java	2008-01-16 22:51:48 UTC (rev 5154)
+++ pojo/branches/2.1/src/main/java/org/jboss/cache/pojo/jmx/PojoCacheJmxWr=
apper.java	2008-01-16 22:52:32 UTC (rev 5155)
@@ -936,17 +936,20 @@
     */
    private void sendStateChangeNotification(int oldState, int newState, St=
ring msg, Throwable t)
    {
-      long now =3D System.currentTimeMillis();
-
-      AttributeChangeNotification stateChangeNotification =3D new Attribut=
eChangeNotification(
-              this,
-              plainCacheWrapper.getNextNotificationSequenceNumber(), now, =
msg,
-              "State", "java.lang.Integer",
-              new Integer(oldState), new Integer(newState)
-      );
-      stateChangeNotification.setUserData(t);
-
-      plainCacheWrapper.sendNotification(stateChangeNotification);
+      if (plainCacheWrapper !=3D null)
+      {
+         long now =3D System.currentTimeMillis();
+   =

+         AttributeChangeNotification stateChangeNotification =3D new Attri=
buteChangeNotification(
+                 this,
+                 plainCacheWrapper.getNextNotificationSequenceNumber(), no=
w, msg,
+                 "State", "java.lang.Integer",
+                 new Integer(oldState), new Integer(newState)
+         );
+         stateChangeNotification.setUserData(t);
+   =

+         plainCacheWrapper.sendNotification(stateChangeNotification);
+      }
    }
 =

    /**


--===============5025942916515024607==--

From jbosscache-commits at lists.jboss.org Wed Jan 16 18:51:09 2008
Content-Type: multipart/mixed; boundary="===============7417918890422120246=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r5156 - in
 pojo/branches/2.1/src: test/java/org/jboss/cache/pojo/notification and 1
 other directory.
Date: Wed, 16 Jan 2008 18:51:09 -0500
Message-ID: <E1JFI2H-0008Q2-C4@committer01.frg.pub.inap.atl.jboss.com>

--===============7417918890422120246==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: jason.greene(a)jboss.com
Date: 2008-01-16 18:51:09 -0500 (Wed, 16 Jan 2008)
New Revision: 5156

Added:
   pojo/branches/2.1/src/test/java/org/jboss/cache/pojo/notification/Listen=
erCountTest.java
Modified:
   pojo/branches/2.1/src/main/java/org/jboss/cache/pojo/impl/NotificationDi=
spatcher.java
   pojo/branches/2.1/src/main/java/org/jboss/cache/pojo/impl/PojoCacheImpl.=
java
Log:
Merge 4868 - Fix for PCACHE-56


Modified: pojo/branches/2.1/src/main/java/org/jboss/cache/pojo/impl/Notific=
ationDispatcher.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- pojo/branches/2.1/src/main/java/org/jboss/cache/pojo/impl/NotificationD=
ispatcher.java	2008-01-16 22:52:32 UTC (rev 5155)
+++ pojo/branches/2.1/src/main/java/org/jboss/cache/pojo/impl/NotificationD=
ispatcher.java	2008-01-16 23:51:09 UTC (rev 5156)
@@ -122,7 +122,8 @@
          if (! (o instanceof Entry))
             return false;
 =

-         return ((Entry)o).equals(listener);
+         // Must be the same instance
+         return ((Entry)o).listener =3D=3D this.listener;
       }
 =

       private static Map<Class<?>, List<Method>> buildNotifiers(Class claz=
z)

Modified: pojo/branches/2.1/src/main/java/org/jboss/cache/pojo/impl/PojoCac=
heImpl.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- pojo/branches/2.1/src/main/java/org/jboss/cache/pojo/impl/PojoCacheImpl=
.java	2008-01-16 22:52:32 UTC (rev 5155)
+++ pojo/branches/2.1/src/main/java/org/jboss/cache/pojo/impl/PojoCacheImpl=
.java	2008-01-16 23:51:09 UTC (rev 5156)
@@ -298,7 +298,10 @@
       {
          try
          {
+            boolean wasEmpty =3D listenerAdaptor.isEmpty();
             listenerAdaptor.addListener(listener, pattern);
+            if (wasEmpty)
+               cache.addCacheListener(listenerAdaptor);
          }
          catch (IllegalArgumentException e)
          {
@@ -306,7 +309,6 @@
             e.fillInStackTrace();
             throw e;
          }
-         cache.addCacheListener(listenerAdaptor);
       }
    }
 =


Copied: pojo/branches/2.1/src/test/java/org/jboss/cache/pojo/notification/L=
istenerCountTest.java (from rev 4868, pojo/trunk/src/test/java/org/jboss/ca=
che/pojo/notification/ListenerCountTest.java)
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- pojo/branches/2.1/src/test/java/org/jboss/cache/pojo/notification/Liste=
nerCountTest.java	                        (rev 0)
+++ pojo/branches/2.1/src/test/java/org/jboss/cache/pojo/notification/Liste=
nerCountTest.java	2008-01-16 23:51:09 UTC (rev 5156)
@@ -0,0 +1,74 @@
+/*
+ * JBoss, Home of Professional Open Source
+ *
+ * Distributable under LGPL license.
+ * See terms of license at gnu.org.
+ */
+
+package org.jboss.cache.pojo.notification;
+
+import static org.testng.AssertJUnit.assertEquals;
+
+import org.jboss.cache.pojo.PojoCache;
+import org.jboss.cache.pojo.PojoCacheFactory;
+import org.jboss.cache.pojo.impl.CacheListenerAdaptor;
+import org.testng.annotations.AfterMethod;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.Test;
+
+// $Id: ObjectTest.java 4698 2007-10-26 18:30:20Z jason.greene(a)jboss.com=
 $
+
+/**
+ * Tests that CacheListenerAdaptor is attached properly.
+ *
+ * @author Jason T. Greene
+ */
+(a)Test(groups =3D {"functional"})
+public class ListenerCountTest
+{
+   protected PojoCache cache;
+
+   @BeforeMethod(alwaysRun =3D true)
+   protected void setUp() throws Exception
+   {
+      String configFile =3D "META-INF/local-service.xml";
+      boolean toStart =3D false;
+      cache =3D PojoCacheFactory.createCache(configFile, toStart);
+      cache.start();
+   }
+
+   @AfterMethod(alwaysRun =3D true)
+   protected void tearDown() throws Exception
+   {
+      cache.stop();
+   }
+
+   public void testAddRemoveListener() throws Exception
+   {    =

+      assertEquals(0, getAdaptorCount());
+      =

+      Object listener1 =3D new Listener();
+      cache.addListener(listener1);
+      assertEquals(1, getAdaptorCount());
+      =

+      Object listener2 =3D new Listener();
+      cache.addListener(listener2);
+      assertEquals(1, getAdaptorCount());
+      =

+      cache.removeListener(listener1);      =

+      assertEquals(1, getAdaptorCount());
+      =

+      cache.removeListener(listener2);      =

+      assertEquals(0, getAdaptorCount());
+   }
+
+   private int getAdaptorCount()
+   {
+      int count =3D 0;
+      for (Object listener : cache.getCache().getCacheListeners())
+         if (listener instanceof CacheListenerAdaptor)
+            count++;
+      =

+      return count;
+   }
+}
\ No newline at end of file


--===============7417918890422120246==--

From jbosscache-commits at lists.jboss.org Wed Jan 16 19:11:23 2008
Content-Type: multipart/mixed; boundary="===============1524602662842253936=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r5157 -
 benchmarks/benchmark-fwk/trunk.
Date: Wed, 16 Jan 2008 19:11:22 -0500
Message-ID: <E1JFILq-00044s-Pz@committer01.frg.pub.inap.atl.jboss.com>

--===============1524602662842253936==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: mircea.markus
Date: 2008-01-16 19:11:22 -0500 (Wed, 16 Jan 2008)
New Revision: 5157

Modified:
   benchmarks/benchmark-fwk/trunk/runNode.sh
Log:


Modified: benchmarks/benchmark-fwk/trunk/runNode.sh
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- benchmarks/benchmark-fwk/trunk/runNode.sh	2008-01-16 23:51:09 UTC (rev =
5156)
+++ benchmarks/benchmark-fwk/trunk/runNode.sh	2008-01-17 00:11:22 UTC (rev =
5157)
@@ -9,11 +9,12 @@
 if [ -z $1 ]
 then
    echo "Usage:"
-   echo "     ./runNode.sh currentNodeIndex testConfig otherSysProps custo=
mConfigFile"
-   echo "currentNodeIndex : the index of this node in the list of nodes in=
 the cluster(0..n)"
-   echo "testConfig       : must be one of the directories names under 'ca=
che-products'"
-   echo "cluster size"
-   echo "Ex: ./runNode.sh 0 jbosscache-2.0.0 3"
+   echo =

+   echo "     ./runNode.sh <currentNodeIndex> <testConfig> <clusterSize>"
+   echo "param <currentNodeIndex> : the index of this node in the list of =
nodes in the cluster(0..<clusterSize>-1)"
+   echo "param <testConfig>       : must be one of the directories names u=
nder './cache-products'"
+   echo "param <clusterSize>      : total number of nodes that will run te=
sts. "
+   echo "Ex: './runNode.sh 0 jbosscache-2.0.0 3' will start the 1st node r=
unning an instance of jbc2.0.0 on a cluster made out of 3 nodes."
    exit 1
 fi
 =



--===============1524602662842253936==--

From jbosscache-commits at lists.jboss.org Wed Jan 16 19:17:07 2008
Content-Type: multipart/mixed; boundary="===============3983944822087307667=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r5158 -
 benchmarks/benchmark-fwk/trunk/src/org/cachebench/tests.
Date: Wed, 16 Jan 2008 19:17:07 -0500
Message-ID: <E1JFIRP-00052Q-Hc@committer01.frg.pub.inap.atl.jboss.com>

--===============3983944822087307667==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: mircea.markus
Date: 2008-01-16 19:17:07 -0500 (Wed, 16 Jan 2008)
New Revision: 5158

Modified:
   benchmarks/benchmark-fwk/trunk/src/org/cachebench/tests/CacheTest.java
Log:
added javadoc

Modified: benchmarks/benchmark-fwk/trunk/src/org/cachebench/tests/CacheTest=
.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- benchmarks/benchmark-fwk/trunk/src/org/cachebench/tests/CacheTest.java	=
2008-01-17 00:11:22 UTC (rev 5157)
+++ benchmarks/benchmark-fwk/trunk/src/org/cachebench/tests/CacheTest.java	=
2008-01-17 00:17:07 UTC (rev 5158)
@@ -6,12 +6,18 @@
 =

 =

 /**
+ * Each newly creted test should extend this class.
+ *
  * @author Manik Surtani (manik(a)surtani.org)
  *         (C) Manik Surtani, 2004
  */
 public interface CacheTest
 {
 =

+   /**
+    * Called before {@link #doTest(String, org.cachebench.CacheWrapper, St=
ring, int, int)}.
+    * Implemetations may cache this and further use on doTest method.
+    */
    public void setConfiguration(Configuration configuration);
 =

    /**


--===============3983944822087307667==--

From jbosscache-commits at lists.jboss.org Thu Jan 17 08:34:53 2008
Content-Type: multipart/mixed; boundary="===============3784352877500823723=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r5159 - in
 benchmarks/benchmark-fwk/trunk: cache-products and 5 other directories.
Date: Thu, 17 Jan 2008 08:34:52 -0500
Message-ID: <E1JFUtQ-00011U-SB@committer01.frg.pub.inap.atl.jboss.com>

--===============3784352877500823723==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: mircea.markus
Date: 2008-01-17 08:34:52 -0500 (Thu, 17 Jan 2008)
New Revision: 5159

Modified:
   benchmarks/benchmark-fwk/trunk/build.xml
   benchmarks/benchmark-fwk/trunk/cache-products/config.sh
   benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.1.0/config.sh
   benchmarks/benchmark-fwk/trunk/cache-products/terracotta-2.5.0/config.sh
   benchmarks/benchmark-fwk/trunk/cache-products/terracotta-2.5.0/tc-client=
-config.xml
   benchmarks/benchmark-fwk/trunk/conf/cachebench.xml
   benchmarks/benchmark-fwk/trunk/src/org/cachebench/config/TestCase.java
   benchmarks/benchmark-fwk/trunk/src/org/cachebench/warmup/CacheWarmup.java
Log:
updated terracotta config

Modified: benchmarks/benchmark-fwk/trunk/build.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- benchmarks/benchmark-fwk/trunk/build.xml	2008-01-17 00:17:07 UTC (rev 5=
158)
+++ benchmarks/benchmark-fwk/trunk/build.xml	2008-01-17 13:34:52 UTC (rev 5=
159)
@@ -494,7 +494,7 @@
      <delete dir=3D"${module.framework.basedir}/classes"/>
   </target>
   =

-  <target name=3D"all" depends=3D"init, clean, compile.module.framework, c=
ompile.module.ehcache124-plugin, compile.module.coherence322-plugin,compile=
.module.jbosscache140-plugin, compile.module.jbosscache200-plugin, compile.=
module.jbosscache210-plugin.production, compile.module.terracotta-plugin" d=
escription=3D"build all"/>
+  <target name=3D"all" depends=3D"init, clean, compile.module.framework,co=
mpile.module.jbosscache200-plugin, compile.module.jbosscache210-plugin.prod=
uction, compile.module.terracotta-plugin" description=3D"build all"/>
 =

    <target name=3D"checkClusterAddresses" depends=3D"compile.module.framew=
ork.production"
            description=3D"Check whether the cluster config is a valid one">

Modified: benchmarks/benchmark-fwk/trunk/cache-products/config.sh
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- benchmarks/benchmark-fwk/trunk/cache-products/config.sh	2008-01-17 00:1=
7:07 UTC (rev 5158)
+++ benchmarks/benchmark-fwk/trunk/cache-products/config.sh	2008-01-17 13:3=
4:52 UTC (rev 5159)
@@ -8,35 +8,8 @@
 #Uncomment and append values to the variables below, as needed by a specif=
ic product
 =

 #CLASSPATH=3D$CLASSPATH:<some other needed values>
-#JVM_OPTIONS=3DJVM_OPTIONS:-DsomeSysProp=3Dvalue1:-Xprop=3Dvalue2
+#JVM_OPTIONS=3D"$JVM_OPTIONS -DsomeSysProp=3Dvalue1 -Xprop=3Dvalue2"
 =

-java -DcurrentIndex=3D0 -DclusterSize=3D3 -Xmx1024m -DpreferIPv4Stack=3Dtr=
ue -cp :./lib/commons-beanutils.jar:
-./lib/commons-digester.jar:./lib/commons-logging.jar:./lib/commons-math-1.=
0.jar:
-./lib/log4j.jar:./lib/smartfrog-3.12.014.jar:./conf:./classes/production/F=
ramework:
-./cache-products/jbosscache-2.1.0CR2/lib/jboss-common-core-2.0.4.GA.jar:
-./cache-products/jbosscache-2.1.0CR2/lib/jboss-javaee-5.0.0.Beta3.jar:
-./cache-products/jbosscache-2.1.0CR2/lib/jbosscache-core.jar:
-./cache-products/jbosscache-2.1.0CR2/lib/jcip-annotations-1.0.jar:
-./cache-products/jbosscache-2.1.0CR2/lib/jgroups-2.6.0.GA.jar:
-./classes/production/jbosscache-2.1.0CR2:
-./cache-products/jbosscache-2.1.0CR2/conf
-org.cachebench.CacheBenchmarkRunner
+#specify the fqn of the class wrapper for specific cache products
+JVM_OPTIONS=3D"$JVM_OPTIONS -DcacheBenchFwk.cacheWrapperClassName=3D<fqn c=
ache wrapper>"
 =

-org.cachebench.cachewrappers.JBossCache210Cr2Wrapper
-org.cachebench.cachewrappers.JBossCache210Cr2Wrapper
-org.cachebench.cachewrappers.JBossCache210Cr2Wrapper
-
-java -DcurrentIndex=3D0 -DclusterSize=3D3 -Xmx1024m -DpreferIPv4Stack=3Dtr=
ue -cp :./lib/commons-beanutils.jar:
-./lib/commons-digester.jar:./lib/commons-logging.jar:./lib/commons-math-1.=
0.jar:
-./lib/log4j.jar:./lib/smartfrog-3.12.014.jar:./conf:./classes/production/F=
ramework:
-./cache-products/jbosscache-2.0.0/lib/concurrent.jar:
-./cache-products/jbosscache-2.0.0/lib/jboss-common-core.jar:
-./cache-products/jbosscache-2.0.0/lib/jboss-j2ee.jar:
-./cache-products/jbosscache-2.0.0/lib/jbosscache.jar:
-./cache-products/jbosscache-2.0.0/lib/jcip-annotations.jar:
-./cache-products/jbosscache-2.0.0/lib/jgroups-2.6.1.jar:
-./cache-products/jbosscache-2.0.0/lib/jgroups.jar:
-./cache-products/jbosscache-2.0.0/lib/trove.jar:
-./classes/production/jbosscache-2.0.0:
-./cache-products/jbosscache-2.0.0/conf
-org.cachebench.CacheBenchmarkRunner

Modified: benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.1.0/co=
nfig.sh
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.1.0/config.s=
h	2008-01-17 00:17:07 UTC (rev 5158)
+++ benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.1.0/config.s=
h	2008-01-17 13:34:52 UTC (rev 5159)
@@ -15,4 +15,5 @@
 #--classpath was set
 =

 #additional JVM options
-JVM_OPTIONS=3D"$JVM_OPTIONS -Xmx1024m -Djava.net.preferIPv4Stack=3Dtrue"
\ No newline at end of file
+JVM_OPTIONS=3D"$JVM_OPTIONS -Xmx1024m -Djava.net.preferIPv4Stack=3Dtrue"
+JVM_OPTIONS=3D"$JVM_OPTIONS -DcacheBenchFwk.cacheWrapperClassName=3Dorg.ca=
chebench.cachewrappers.JBossCache210Wrapper"
\ No newline at end of file

Modified: benchmarks/benchmark-fwk/trunk/cache-products/terracotta-2.5.0/co=
nfig.sh
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- benchmarks/benchmark-fwk/trunk/cache-products/terracotta-2.5.0/config.s=
h	2008-01-17 00:17:07 UTC (rev 5158)
+++ benchmarks/benchmark-fwk/trunk/cache-products/terracotta-2.5.0/config.s=
h	2008-01-17 13:34:52 UTC (rev 5159)
@@ -11,4 +11,5 @@
 #other specific JVM options
 JVM_OPTIONS=3D"$JVM_OPTIONS -Xmx1024m -DpreferIPv4Stack=3Dtrue -Dtc.config=
=3D$THIS_DIR/tc-client-config.xml -Dtc.install-root=3D${TC_HOME}"
 JVM_OPTIONS=3D"$JVM_OPTIONS -Xbootclasspath/p:${TC_HOME}/lib/dso-boot/dso-=
boot-hotspot_linux_150_11.jar"
+JVM_OPTIONS=3D"$JVM_OPTIONS -DcacheBenchFwk.cacheWrapperClassName=3Dorg.ca=
chebench.cachewrappers.TerracottaWrapper"
 =


Modified: benchmarks/benchmark-fwk/trunk/cache-products/terracotta-2.5.0/tc=
-client-config.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- benchmarks/benchmark-fwk/trunk/cache-products/terracotta-2.5.0/tc-clien=
t-config.xml	2008-01-17 00:17:07 UTC (rev 5158)
+++ benchmarks/benchmark-fwk/trunk/cache-products/terracotta-2.5.0/tc-clien=
t-config.xml	2008-01-17 13:34:52 UTC (rev 5159)
@@ -9,9 +9,13 @@
       </roots>
       <locks>
         <autolock>
-          <method-expression>* org.cachebench.cachewrappers.TerracottaWrap=
per*.*(..)</method-expression>
+          <method-expression>* org.cachebench.cachewrappers.TerracottaWrap=
per.*(..)</method-expression>
           <lock-level>write</lock-level>
         </autolock>
+        <autolock>
+          <method-expression>* org.cachebench.cachewrappers.TerracottaWrap=
per.get(..)</method-expression>
+          <lock-level>read</lock-level>
+        </autolock>
       </locks>
       <instrumented-classes>
         <include><class-expression>org.cachebench.cachewrappers..*</class-=
expression></include>

Modified: benchmarks/benchmark-fwk/trunk/conf/cachebench.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- benchmarks/benchmark-fwk/trunk/conf/cachebench.xml	2008-01-17 00:17:07 =
UTC (rev 5158)
+++ benchmarks/benchmark-fwk/trunk/conf/cachebench.xml	2008-01-17 13:34:52 =
UTC (rev 5159)
@@ -1,7 +1,8 @@
 <!--
 	Configures and controls the behaviour of the cache benchmarking framework.
 =

-	sampleSize - this is the number of putsgets to be performed, an average i=
s used in metrics.
+   TODO - sample size is test specific, moove it to the test that use it r=
ather than having it here
+	sampleSize -  this is the number of putsgets to be performed, an average =
is used in metrics.
 	gcBetweenTestsEnabled - if true, the framework pauses between each test a=
nd requests System.gc() - use this if you find yourself running out of mem!
 	sleepBetweenTests - ms to sleep between tests.  useful to allow the JVM s=
ome time to do a gc
 	emptyCacheBetweenTests - again, use if you're running out of mem.
@@ -20,33 +21,22 @@
          checkClusterAddresses ant target =

    -->
    <cluster bindAddress=3D"127.0.0.1">
-      <member host=3D"127.0.0.1" port=3D"7800"/>
-      <member host=3D"127.0.0.1" port=3D"7801"/>
-      <member host=3D"127.0.0.1" port=3D"7802"/>
+      <member host=3D"127.0.0.1" port=3D"7900"/>
+      <member host=3D"127.0.0.1" port=3D"7901"/>
+      <member host=3D"127.0.0.1" port=3D"7902"/>
    </cluster>
 =

    <!-- Each testcase represents either a single configuration or a cachei=
ng product.
    For example, WhirlyCache would be one test case. JBossCache-standalone =
could be another, JBossCache-replicated could be yet another
       testcase::stopOnFailure if set to true and one test in this testcase=
 fails then the process will exit
-   See the javadoc for org.cachebench.CacheWrapper for the cacheWrapper pr=
operty
    -->
 =

-  <!-- Make SURE you read the docs - especially when using Terracotta as t=
his involves some additional setup -->
+    <testcase name=3D"WebSessionReplicationTest" stopOnFailure=3D"true">
 =

-   <!-- Legacy stuff -->
-   <!--<testcase name=3D"JBossCache140-Pessimistic-REPL_SYNC" cacheWrapper=
=3D"org.cachebench.cachewrappers.JBossCacheWrapper">-->
-   <!--<testcase name=3D"EHCache124-replicated" cacheWrapper=3D"org.cacheb=
ench.cachewrappers.EHCacheWrapper">-->
-   <!--<testcase name=3D"Terracotta230" cacheWrapper=3D"org.cachebench.cac=
hewrappers.TerracottaWrapper">-->
-
-
-    <!--<testcase name=3D"JBossCache2x-Pessimistic-REPL_SYNC_BR" cacheWrap=
per=3D"org.cachebench.cachewrappers.JBossCache200Wrapper">-->
-    <testcase name=3D"JBossCache2x-Pessimistic-REPL_ASYNC" cacheWrapper=3D=
"org.cachebench.cachewrappers.JBossCache200Wrapper" stopOnFailure=3D"true">
-    <!--<testcase name=3D"JBossCache2.0" cacheWrapper=3D"org.cachebench.ca=
chewrappers.TerracottaWrapper" stopOnFailure=3D"true">-->
-
-      <!-- warms up the cache by doing operation on it; simulates a real-w=
orld environment. If no warmup is needed use
-      org.cachebench.warmup.NoCacheWarmup
+      <!-- org.cachebench.warmup.PutGetCacheWarmup warms up the cache by d=
oing operation on it; simulates a real-world environment.
+      If no warmup is needed use org.cachebench.warmup.NoCacheWarmup
       -->
-      <warmup warmupClass=3D"org.cachebench.warmup.PutGetCacheWarmup">
+      <warmup warmupClass=3D"org.cachebench.warmup.NoCacheWarmup">
          <param name=3D"operationCount" value=3D"10000"/>
       </warmup>
 =

@@ -83,7 +73,7 @@
 =

 		<!-- arbitrary params may be passed into the cacheWrapper implementation=
, typically used to pass in config files for the cache product. -->
       <!-- JBoss Cache 1.4.x and 2.x -->
-      <param name=3D"config" value=3D"pess-repl-sync-br.xml" />       =

+      <param name=3D"config" value=3D"jbc210-br_tcp_mping.xml" />       =

       <!--<param name=3D"config" value=3D"pess-repl-async.xml" />-->
 =

       <!-- EHCache -->

Modified: benchmarks/benchmark-fwk/trunk/src/org/cachebench/config/TestCase=
.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- benchmarks/benchmark-fwk/trunk/src/org/cachebench/config/TestCase.java	=
2008-01-17 00:17:07 UTC (rev 5158)
+++ benchmarks/benchmark-fwk/trunk/src/org/cachebench/config/TestCase.java	=
2008-01-17 13:34:52 UTC (rev 5159)
@@ -41,6 +41,15 @@
     */
    public String getCacheWrapper()
    {
+      if (cacheWrapper =3D=3D null)
+      {
+         cacheWrapper =3D System.getProperty("cacheBenchFwk.cacheWrapperCl=
assName");
+      }
+      if (cacheWrapper =3D=3D null)
+      {
+         throw new IllegalStateException("Null cache wrapper, it was not s=
pecified in neither in 'cachebench.xml' " +
+               " nor as sys prop 'cacheBenchFwk.cacheWrapperClassName'");
+      }
       return cacheWrapper;
    }
 =


Modified: benchmarks/benchmark-fwk/trunk/src/org/cachebench/warmup/CacheWar=
mup.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- benchmarks/benchmark-fwk/trunk/src/org/cachebench/warmup/CacheWarmup.ja=
va	2008-01-17 00:17:07 UTC (rev 5158)
+++ benchmarks/benchmark-fwk/trunk/src/org/cachebench/warmup/CacheWarmup.ja=
va	2008-01-17 13:34:52 UTC (rev 5159)
@@ -49,7 +49,7 @@
          cacheWrapper.empty();
       } catch (Exception e)
       {
-         log.warn("Received exception durring cache warmup");
+         log.warn("Received exception durring cache warmup", e);
       }
    }
 =



--===============3784352877500823723==--

From jbosscache-commits at lists.jboss.org Thu Jan 17 10:22:37 2008
Content-Type: multipart/mixed; boundary="===============0616983159485657720=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r5160 -
 benchmarks/benchmark-fwk/trunk/conf.
Date: Thu, 17 Jan 2008 10:22:36 -0500
Message-ID: <E1JFWZg-00059o-SC@committer01.frg.pub.inap.atl.jboss.com>

--===============0616983159485657720==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: mircea.markus
Date: 2008-01-17 10:22:36 -0500 (Thu, 17 Jan 2008)
New Revision: 5160

Modified:
   benchmarks/benchmark-fwk/trunk/conf/cachebench.xml
   benchmarks/benchmark-fwk/trunk/conf/log4j.xml
Log:


Modified: benchmarks/benchmark-fwk/trunk/conf/cachebench.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- benchmarks/benchmark-fwk/trunk/conf/cachebench.xml	2008-01-17 13:34:52 =
UTC (rev 5159)
+++ benchmarks/benchmark-fwk/trunk/conf/cachebench.xml	2008-01-17 15:22:36 =
UTC (rev 5160)
@@ -8,7 +8,7 @@
 	emptyCacheBetweenTests - again, use if you're running out of mem.
 	numThreads - the number of executor threads to use to perform the require=
d number of operations.  =

 -->
-<cachebench sampleSize=3D"10000" gcBetweenTestsEnabled=3D"true" sleepBetwe=
enTests=3D"1000" emptyCacheBetweenTests=3D"true" numThreads=3D"10">
+<cachebench sampleSize=3D"5500" gcBetweenTestsEnabled=3D"true" sleepBetwee=
nTests=3D"1000" emptyCacheBetweenTests=3D"true" numThreads=3D"10">
 =

 =

    <!--
@@ -20,10 +20,16 @@
          - for each node instance socket address is specified. You can mak=
e sure that addresses are available by using
          checkClusterAddresses ant target =

    -->
-   <cluster bindAddress=3D"127.0.0.1">
-      <member host=3D"127.0.0.1" port=3D"7900"/>
-      <member host=3D"127.0.0.1" port=3D"7901"/>
-      <member host=3D"127.0.0.1" port=3D"7902"/>
+   <cluster>
+      <member host=3D"cluster01" port=3D"17900"/>
+      <member host=3D"cluster02" port=3D"17900"/>
+      <member host=3D"cluster03" port=3D"17900"/> =

+      <member host=3D"cluster04" port=3D"17900"/> =

+      <member host=3D"cluster05" port=3D"17900"/> =

+      <member host=3D"cluster06" port=3D"17900"/> =

+      <member host=3D"cluster07" port=3D"17900"/> =

+      <member host=3D"cluster08" port=3D"17900"/> =

+      <member host=3D"cluster09" port=3D"17900"/> =

    </cluster>
 =

    <!-- Each testcase represents either a single configuration or a cachei=
ng product.
@@ -36,8 +42,8 @@
       <!-- org.cachebench.warmup.PutGetCacheWarmup warms up the cache by d=
oing operation on it; simulates a real-world environment.
       If no warmup is needed use org.cachebench.warmup.NoCacheWarmup
       -->
-      <warmup warmupClass=3D"org.cachebench.warmup.NoCacheWarmup">
-         <param name=3D"operationCount" value=3D"10000"/>
+      <warmup warmupClass=3D"org.cachebench.warmup.PutGetCacheWarmup">
+         <param name=3D"operationCount" value=3D"3000"/>
       </warmup>
 =

       <!--
@@ -56,7 +62,7 @@
        <!--<test name=3D"Strings" testClass=3D"org.cachebench.tests.simple=
tests.StringTest" weight=3D"2.0" />-->
        =

        <test name=3D"Strings" testClass=3D"org.cachebench.tests.SessionSim=
ulatorTest" weight=3D"2.0" >
-          <param name=3D"numberOfRequest" value=3D"1000000"/>
+          <param name=3D"numberOfRequest" value=3D"100000"/>
           <param name=3D"numberOfAttributes" value=3D"100"/>
           <param name=3D"writePercentage" value=3D"20"/>
           <param name=3D"sizeOfAnAttribute" value=3D"1000"/>

Modified: benchmarks/benchmark-fwk/trunk/conf/log4j.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- benchmarks/benchmark-fwk/trunk/conf/log4j.xml	2008-01-17 13:34:52 UTC (=
rev 5159)
+++ benchmarks/benchmark-fwk/trunk/conf/log4j.xml	2008-01-17 15:22:36 UTC (=
rev 5160)
@@ -49,17 +49,17 @@
     </category>
 =

     <category name=3D"net.sf.ehcache" additivity=3D"false">
-        <priority value=3D"DEBUG"/>
+        <priority value=3D"WARN"/>
         <appender-ref ref=3D"FILE"/>
     </category>
 =

    <category name=3D"com.tc" additivity=3D"false">
-        <priority value=3D"DEBUG"/>
+        <priority value=3D"WARN"/>
         <appender-ref ref=3D"FILE"/>
     </category>
 =

    <category name=3D"org.tc" additivity=3D"false">
-        <priority value=3D"DEBUG"/>
+        <priority value=3D"WARN"/>
         <appender-ref ref=3D"FILE"/>
     </category>
 =



--===============0616983159485657720==--

From jbosscache-commits at lists.jboss.org Thu Jan 17 17:34:37 2008
Content-Type: multipart/mixed; boundary="===============7319962786292016519=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r5161 - in core/trunk/src:
 main/java/org/jboss/cache/buddyreplication and 7 other directories.
Date: Thu, 17 Jan 2008 17:34:36 -0500
Message-ID: <E1JFdJk-0000dJ-Gx@committer01.frg.pub.inap.atl.jboss.com>

--===============7319962786292016519==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: manik.surtani(a)jboss.com
Date: 2008-01-17 17:34:36 -0500 (Thu, 17 Jan 2008)
New Revision: 5161

Added:
   core/trunk/src/main/java/org/jboss/cache/factories/ReplicationQueueFacto=
ry.java
Modified:
   core/trunk/src/main/java/org/jboss/cache/CacheImpl.java
   core/trunk/src/main/java/org/jboss/cache/CacheSPI.java
   core/trunk/src/main/java/org/jboss/cache/RPCManager.java
   core/trunk/src/main/java/org/jboss/cache/RPCManagerImpl.java
   core/trunk/src/main/java/org/jboss/cache/RegionManager.java
   core/trunk/src/main/java/org/jboss/cache/ReplicationQueue.java
   core/trunk/src/main/java/org/jboss/cache/buddyreplication/BuddyManager.j=
ava
   core/trunk/src/main/java/org/jboss/cache/factories/ComponentRegistry.java
   core/trunk/src/main/java/org/jboss/cache/factories/EmptyConstructorFacto=
ry.java
   core/trunk/src/main/java/org/jboss/cache/factories/InterceptorChainFacto=
ry.java
   core/trunk/src/main/java/org/jboss/cache/interceptors/BaseRpcInterceptor=
.java
   core/trunk/src/main/java/org/jboss/cache/interceptors/InvocationContextI=
nterceptor.java
   core/trunk/src/main/java/org/jboss/cache/invocation/CacheInvocationDeleg=
ate.java
   core/trunk/src/main/java/org/jboss/cache/lock/LockUtil.java
   core/trunk/src/test/java/org/jboss/cache/api/CacheSPITest.java
   core/trunk/src/test/java/org/jboss/cache/api/NodeAPITest.java
   core/trunk/src/test/java/org/jboss/cache/api/pfer/PutForExternalReadTest=
Base.java
   core/trunk/src/test/java/org/jboss/cache/misc/TestingUtil.java
Log:
Refactored RPCManager and CacheImpl so that the channel is now created and =
owned solely by the RPCManager

Modified: core/trunk/src/main/java/org/jboss/cache/CacheImpl.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/java/org/jboss/cache/CacheImpl.java	2008-01-17 15:2=
2:36 UTC (rev 5160)
+++ core/trunk/src/main/java/org/jboss/cache/CacheImpl.java	2008-01-17 22:3=
4:36 UTC (rev 5161)
@@ -11,7 +11,6 @@
 import org.jboss.cache.buddyreplication.BuddyManager;
 import org.jboss.cache.buddyreplication.GravitateResult;
 import org.jboss.cache.config.Configuration;
-import org.jboss.cache.config.RuntimeConfig;
 import org.jboss.cache.factories.ComponentRegistry;
 import org.jboss.cache.factories.InterceptorChainFactory;
 import org.jboss.cache.factories.annotations.ComponentName;
@@ -22,11 +21,9 @@
 import org.jboss.cache.loader.CacheLoaderManager;
 import org.jboss.cache.lock.IsolationLevel;
 import org.jboss.cache.lock.LockStrategyFactory;
-import org.jboss.cache.lock.LockUtil;
 import org.jboss.cache.lock.LockingException;
 import org.jboss.cache.lock.NodeLock;
 import org.jboss.cache.lock.TimeoutException;
-import org.jboss.cache.marshall.InactiveRegionAwareRpcDispatcher;
 import org.jboss.cache.marshall.Marshaller;
 import org.jboss.cache.marshall.MethodCall;
 import org.jboss.cache.marshall.MethodCallFactory;
@@ -35,29 +32,27 @@
 import org.jboss.cache.notifications.Notifier;
 import org.jboss.cache.notifications.event.NodeModifiedEvent;
 import org.jboss.cache.optimistic.DataVersion;
-import org.jboss.cache.remoting.jgroups.CacheMessageListener;
-import org.jboss.cache.statetransfer.StateTransferManager;
 import org.jboss.cache.transaction.GlobalTransaction;
 import org.jboss.cache.transaction.OptimisticTransactionEntry;
 import org.jboss.cache.transaction.TransactionEntry;
 import org.jboss.cache.transaction.TransactionTable;
 import org.jboss.cache.util.CachePrinter;
-import org.jboss.cache.util.ThreadGate;
-import org.jboss.cache.util.reflect.ReflectionUtil;
-import org.jgroups.*;
-import org.jgroups.blocks.GroupRequest;
-import org.jgroups.blocks.RpcDispatcher;
-import org.jgroups.blocks.RspFilter;
-import org.jgroups.util.Rsp;
-import org.jgroups.util.RspList;
+import org.jgroups.Address;
 =

 import javax.management.MBeanServerFactory;
 import javax.transaction.Status;
 import javax.transaction.SystemException;
 import javax.transaction.Transaction;
 import javax.transaction.TransactionManager;
-import java.io.NotSerializableException;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
 =

 /**
  * The default implementation class of {@link org.jboss.cache.Cache} and {=
@link org.jboss.cache.CacheSPI}.  This class
@@ -82,11 +77,6 @@
    private Log log =3D LogFactory.getLog(CacheImpl.class);
 =

    /**
-    * Thread gate used to block Dispatcher during JGroups FLUSH protocol
-    */
-   private final ThreadGate flushBlockGate =3D new ThreadGate();
-
-   /**
     * Root node.
     */
    private NodeSPI root;
@@ -97,31 +87,6 @@
    private RegionManager regionManager =3D null;
 =

    /**
-    * The JGroups JChannel in use.
-    */
-   protected Channel channel =3D null;
-
-   /**
-    * True if this CacheImpl is the coordinator.
-    */
-   private volatile boolean coordinator =3D false;
-
-   /**
-    * List of cluster group members.
-    */
-   private final Vector<Address> members =3D new Vector<Address>();
-
-   /**
-    * JGroups RpcDispatcher in use.
-    */
-   private RpcDispatcher disp =3D null;
-
-   /**
-    * JGroups message listener.
-    */
-   private CacheMessageListener messageListener;
-
-   /**
     * Maintains mapping of transactions (keys) and Modifications/Undo-Oper=
ations
     */
    private TransactionTable transactionTable;
@@ -148,11 +113,6 @@
    private CacheLoaderManager cacheLoaderManager;
 =

    /**
-    * Queue used to replicate updates when mode is repl-async
-    */
-   private ReplicationQueue repl_queue =3D null;
-
-   /**
     * The current lifecycle state.
     */
    CacheStatus cacheStatus;
@@ -185,6 +145,7 @@
     * from a shutdown hook.
     */
    private boolean invokedFromShutdownHook;
+   private RPCManager rpcManager;
 =

    /**
     * Constructs an uninitialized CacheImpl.
@@ -218,8 +179,8 @@
    @Inject
    private void injectDependencies(Notifier notifier, RegionManager region=
Manager, TransactionManager transactionManager, Marshaller marshaller,
                                    TransactionTable transactionTable, Node=
Factory nodeFactory,
-                                   CacheSPI spi, CacheMessageListener mess=
ageListener, @ComponentName("remoteDelegate")RemoteCacheInvocationDelegate =
remoteDelegate,
-                                   Interceptor interceptorChain, BuddyMana=
ger buddyManager)
+                                   CacheSPI spi, @ComponentName("remoteDel=
egate")RemoteCacheInvocationDelegate remoteDelegate,
+                                   Interceptor interceptorChain, BuddyMana=
ger buddyManager, RPCManager rpcManager)
    {
       this.notifier =3D notifier;
       this.regionManager =3D regionManager;
@@ -227,11 +188,11 @@
       this.transactionTable =3D transactionTable;
       this.nodeFactory =3D nodeFactory;
       this.spi =3D spi;
-      this.messageListener =3D messageListener;
       this.remoteDelegate =3D remoteDelegate;
       this.marshaller =3D marshaller;
       this.interceptorChain =3D interceptorChain;
       this.buddyManager =3D buddyManager;
+      this.rpcManager =3D rpcManager;
    }
 =

    public Configuration getConfiguration()
@@ -256,34 +217,6 @@
    }
 =

    /**
-    * Returns the local channel address.
-    */
-   public Address getLocalAddress()
-   {
-      return channel !=3D null ? channel.getLocalAddress() : null;
-   }
-
-   /**
-    * Returns the members as a List.
-    * This list may be concurrently modified.
-    */
-   public List<Address> getMembers()
-   {
-      synchronized (members)
-      {
-         return new ArrayList<Address>(members);
-      }
-   }
-
-   /**
-    * Returns <code>true</code> if this node is the group coordinator.
-    */
-   public boolean isCoordinator()
-   {
-      return coordinator;
-   }
-
-   /**
     * Returns the transaction table.
     */
    public TransactionTable getTransactionTable()
@@ -291,38 +224,7 @@
       return transactionTable;
    }
 =

-   private void setUseReplQueue(boolean flag)
-   {
-      if (flag)
-      {
-         if (repl_queue =3D=3D null)
-         {
-            repl_queue =3D new ReplicationQueue(this, configuration.getRep=
lQueueInterval(), configuration.getReplQueueMaxElements());
-            if (configuration.getReplQueueInterval() >=3D 0)
-            {
-               repl_queue.start();
-            }
-         }
-      }
-      else
-      {
-         if (repl_queue !=3D null)
-         {
-            repl_queue.stop();
-            repl_queue =3D null;
-         }
-      }
-   }
-
    /**
-    * Returns the replication queue.
-    */
-   public ReplicationQueue getReplicationQueue()
-   {
-      return repl_queue;
-   }
-
-   /**
     * Sets the cache locking isolation level.
     */
    private void setIsolationLevel(IsolationLevel level)
@@ -339,99 +241,6 @@
    }
 =

    /**
-    * Fetches the group state from the current coordinator. If successful,=
 this
-    * will trigger JChannel setState() call.
-    */
-   public void fetchState(long timeout) throws ChannelClosedException, Cha=
nnelNotConnectedException
-   {
-      if (channel =3D=3D null)
-      {
-         throw new ChannelNotConnectedException();
-      }
-      boolean rc =3D channel.getState(null, timeout);
-      if (rc)
-      {
-         log.debug("fetchState(): state was retrieved successfully");
-      }
-      else
-      {
-         log.debug("fetchState(): state could not be retrieved (first memb=
er)");
-      }
-   }
-
-   public void fetchPartialState(List<Address> sources, Fqn sourceTarget, =
Fqn integrationTarget) throws Exception
-   {
-      String encodedStateId =3D sourceTarget + StateTransferManager.PARTIA=
L_STATE_DELIMITER + integrationTarget;
-      fetchPartialState(sources, encodedStateId);
-   }
-
-   public void fetchPartialState(List<Address> sources, Fqn subtree) throw=
s Exception
-   {
-      if (subtree =3D=3D null)
-      {
-         throw new IllegalArgumentException("Cannot fetch partial state. N=
ull subtree.");
-      }
-      fetchPartialState(sources, subtree.toString());
-   }
-
-   private void fetchPartialState(List<Address> sources, String stateId) t=
hrows Exception
-   {
-      if (sources =3D=3D null || sources.isEmpty() || stateId =3D=3D null)
-      {
-         // should this really be throwing an exception?  Are there valid =
use cases where partial state may not be available? - Manik
-         // Yes -- cache is configured LOCAL but app doesn't know it -- Br=
ian
-         //throw new IllegalArgumentException("Cannot fetch partial state,=
 targets are " + sources + " and stateId is " + stateId);
-         if (log.isWarnEnabled())
-         {
-            log.warn("Cannot fetch partial state, targets are " + sources +
-                  " and stateId is " + stateId);
-         }
-         return;
-      }
-
-      List<Address> targets =3D new LinkedList<Address>(sources);
-
-      //skip *this* node as a target
-      targets.remove(getLocalAddress());
-
-      if (targets.isEmpty())
-      {
-         // Definitely no exception here -- this happens every time the 1s=
t node in the
-         // cluster activates a region!! -- Brian
-         log.debug("Cannot fetch partial state. There are no target member=
s specified");
-         return;
-      }
-
-      log.debug("Node " + getLocalAddress() + " fetching partial state " +=
 stateId + " from members " + targets);
-      boolean successfulTransfer =3D false;
-      for (Address target : targets)
-      {
-         log.debug("Node " + getLocalAddress() + " fetching partial state =
" + stateId + " from member " + target);
-         messageListener.setStateSet(false);
-         successfulTransfer =3D channel.getState(target, stateId, configur=
ation.getStateRetrievalTimeout());
-         if (successfulTransfer)
-         {
-            try
-            {
-               messageListener.waitForState();
-            }
-            catch (Exception transferFailed)
-            {
-               successfulTransfer =3D false;
-            }
-         }
-         log.debug("Node " + getLocalAddress() + " fetching partial state =
" + stateId + " from member " + target + (successfulTransfer ? " successful=
" : " failed"));
-         if (successfulTransfer)
-            break;
-      }
-
-      if (!successfulTransfer)
-      {
-         log.debug("Node " + getLocalAddress() + " could not fetch partial=
 state " + stateId + " from any member " + targets);
-      }
-   }
-
-   /**
     * Lifecycle method. This is like initialize.
     *
     * @throws Exception
@@ -493,18 +302,11 @@
       componentRegistry.wire();
       correctRootNodeType();
 =

-      setUseReplQueue(configuration.isUseReplQueue());
       setIsolationLevel(configuration.getIsolationLevel());
 =

       cacheStatus =3D CacheStatus.CREATED;
    }
 =

-   protected boolean shouldFetchStateOnStartup()
-   {
-      boolean loaderFetch =3D cacheLoaderManager !=3D null && cacheLoaderM=
anager.isFetchPersistentState();
-      return !configuration.isInactiveOnStartup() && buddyManager =3D=3D n=
ull && (configuration.isFetchInMemoryState() || loaderFetch);
-   }
-
    /**
     * Creates a new root node if one does not exist, or if the existing on=
e does not match the type according to the configuration.
     */
@@ -602,81 +404,17 @@
          case REPL_ASYNC:
          case INVALIDATION_ASYNC:
          case INVALIDATION_SYNC:
-            if (log.isDebugEnabled()) log.debug("cache mode is " + configu=
ration.getCacheMode());
-            initialiseChannelAndRpcDispatcher();
-
-            //connect and transfer state
-            if (shouldFetchStateOnStartup())
-            {
-               try
-               {
-                  long start =3D System.currentTimeMillis();
-                  channel.connect(configuration.getClusterName(), null, nu=
ll, configuration.getStateRetrievalTimeout());
-                  // reconfigure log category so that the instance name is=
 reflected as well.
-                  configureLogCategory();
-                  //if I am not the only and the first member than wait fo=
r a state to arrive
-                  if (getMembers().size() > 1)
-                  {
-                     messageListener.waitForState();
-                  }
-
-                  if (log.isDebugEnabled())
-                  {
-                     log.debug("connected, state was retrieved successfull=
y (in " + (System.currentTimeMillis() - start)
-                           + " milliseconds)");
-                  }
-               }
-               catch (StateTransferException ste)
-               {
-                  // make sure we disconnect from the channel before we th=
row this exception!
-                  // JBCACHE-761
-                  channel.disconnect();
-                  channel.close();
-                  throw new CacheException("Unable to fetch state on start=
up", ste);
-               }
-               catch (ChannelException e)
-               {
-                  throw new CacheException("Unable to connect to JGroups c=
hannel", e);
-               }
-               catch (Exception ex)
-               {
-                  throw new CacheException("Unable to fetch state on start=
up", ex);
-               }
-            }
-            //otherwise just connect
-            else
-            {
-               try
-               {
-                  channel.connect(configuration.getClusterName());
-                  // reconfigure log category so that the instance name is=
 reflected as well.
-                  configureLogCategory();
-               }
-               catch (ChannelException e)
-               {
-                  throw new CacheException("Unable to connect to JGroups c=
hannel", e);
-               }
-            }
-            if (log.isInfoEnabled())
-            {
-               log.info("CacheImpl local address is " + channel.getLocalAd=
dress());
-            }
-            if (buddyManager !=3D null && buddyManager.isEnabled())
-            {
-               //buddyManager.init(this);
-               buddyManager.init();
-               if (configuration.isUseReplQueue())
-               {
-                  log.warn("Replication queue not supported when using bud=
dy replication.  Disabling repliction queue.");
-                  configuration.setUseReplQueue(false);
-                  repl_queue =3D null;
-               }
-            }
+            // reconfigure log category so that the instance name is refle=
cted as well.
+            configureLogCategory();
             break;
          default:
             throw new IllegalArgumentException("cache mode " + configurati=
on.getCacheMode() + " is invalid");
       }
 =

+      // these 2 components need to be started manually since they can onl=
y be started after ALL other components have started.
+      if (rpcManager !=3D null) rpcManager.start();
+      if (buddyManager !=3D null) buddyManager.init();
+
       //now attempt to preload the cache from the loader - Manik
       if (cacheLoaderManager !=3D null)
       {
@@ -779,25 +517,8 @@
 =

       // The rest of these should have already been taken care of in stop,
       // but we do it here as well in case stop failed.
+      rpcManager.stop();
 =

-      if (channel !=3D null)
-      {
-         if (channel.isOpen())
-         {
-            try
-            {
-               channel.close();
-               channel.disconnect();
-            }
-            catch (Exception toLog)
-            {
-               log.error("Problem closing channel; setting it to null", to=
Log);
-            }
-         }
-         channel =3D null;
-         configuration.getRuntimeConfig().setChannel(null);
-      }
-      disp =3D null;
       transactionManager =3D null;
 =

       componentRegistry.reset();
@@ -843,35 +564,6 @@
 =

       componentRegistry.stop();
 =

-      if (channel !=3D null)
-      {
-         log.info("stop(): closing the channel");
-         killChannel();
-         channel =3D null;
-         configuration.getRuntimeConfig().setChannel(null);
-      }
-
-      if (disp !=3D null)
-      {
-         log.info("stop(): stopping the dispatcher");
-         disp.stop();
-         disp =3D null;
-      }
-      if (members !=3D null)
-      {
-         synchronized (members)
-         {
-            members.clear();
-         }
-      }
-
-      coordinator =3D false;
-
-      if (repl_queue !=3D null)
-      {
-         repl_queue.stop();
-      }
-
       if (notifier !=3D null)
       {
          notifier.notifyCacheStopped(spi, spi.getInvocationContext());
@@ -908,37 +600,6 @@
    }
 =

    /**
-    * Returns the address of the coordinator or null if there is no
-    * coordinator.
-    * Waits until the membership view is updated.
-    */
-   public Address getCoordinator()
-   {
-      if (channel =3D=3D null)
-      {
-         return null;
-      }
-
-      synchronized (members)
-      {
-         while (members.isEmpty())
-         {
-            log.debug("getCoordinator(): waiting on viewAccepted()");
-            try
-            {
-               members.wait();
-            }
-            catch (InterruptedException e)
-            {
-               log.error("getCoordinator(): Interrupted while waiting for =
members to be set", e);
-               break;
-            }
-         }
-         return members.size() > 0 ? members.get(0) : null;
-      }
-   }
-
-   /**
     * Evicts the node at <code>subtree</code> along with all descendant no=
des.
     *
     * @param subtree Fqn indicating the uppermost node in the
@@ -979,55 +640,6 @@
 =

    }
 =

-   private void removeLocksForDeadMembers(NodeSPI node, List deadMembers)
-   {
-      Set<GlobalTransaction> deadOwners =3D new HashSet<GlobalTransaction>=
();
-      NodeLock lock =3D node.getLock();
-      Object owner =3D lock.getWriterOwner();
-
-      if (isLockOwnerDead(owner, deadMembers))
-      {
-         deadOwners.add((GlobalTransaction) owner);
-      }
-
-      for (Object readOwner : lock.getReaderOwners())
-      {
-         if (isLockOwnerDead(readOwner, deadMembers))
-         {
-            deadOwners.add((GlobalTransaction) readOwner);
-         }
-      }
-
-      for (GlobalTransaction deadOwner : deadOwners)
-      {
-         boolean localTx =3D deadOwner.getAddress().equals(getLocalAddress=
());
-         boolean broken =3D LockUtil.breakTransactionLock(lock, deadOwner,=
 localTx, this);
-
-         if (broken && trace)
-         {
-            log.trace("Broke lock for node " + node.getFqn() +
-                  " held by " + deadOwner);
-         }
-      }
-
-      // Recursively unlock children
-      for (Object child : node.getChildrenDirect())
-      {
-         removeLocksForDeadMembers((NodeSPI) child, deadMembers);
-      }
-   }
-
-   private boolean isLockOwnerDead(Object owner, List deadMembers)
-   {
-      boolean result =3D false;
-      if (owner !=3D null && owner instanceof GlobalTransaction)
-      {
-         Object addr =3D ((GlobalTransaction) owner).getAddress();
-         result =3D deadMembers.contains(addr);
-      }
-      return result;
-   }
-
    // -----------  End Marshalling and State Transfer --------------------=
---
 =

    /**
@@ -1342,155 +954,6 @@
       return count;
    }
 =

-   /* ---------------------- Remote method calls -------------------- */
-
-   /**
-    * @param mbrs
-    * @param method_call
-    * @param synchronous
-    * @param exclude_self
-    * @param timeout
-    * @return
-    * @throws Exception
-    * @deprecated Note this is due to be moved to an interceptor.
-    */
-   @Deprecated
-   public List callRemoteMethods(List<Address> mbrs, MethodCall method_cal=
l,
-                                 boolean synchronous, boolean exclude_self=
, long timeout)
-         throws Exception
-   {
-      return callRemoteMethods(mbrs, method_call, synchronous ? GroupReque=
st.GET_ALL : GroupRequest.GET_NONE, exclude_self, timeout);
-   }
-
-   @Deprecated
-   public List callRemoteMethods(List<Address> mbrs, MethodCall method_cal=
l, int mode, boolean exclude_self, long timeout)
-         throws Exception
-   {
-      return callRemoteMethods(mbrs, method_call, mode, exclude_self, time=
out, null);
-   }
-
-   /**
-    * Overloaded to allow a finer grained control over JGroups mode
-    *
-    * @param mbrs
-    * @param method_call
-    * @param mode
-    * @param exclude_self
-    * @param timeout
-    * @return
-    * @throws Exception
-    * @deprecated Note this is due to be moved to an interceptor.
-    */
-   @Deprecated
-   public List callRemoteMethods(List<Address> mbrs, MethodCall method_cal=
l, int mode, boolean exclude_self, long timeout, RspFilter rspFilter)
-         throws Exception
-   {
-      int modeToUse =3D mode;
-      int preferredMode;
-      if ((preferredMode =3D spi.getInvocationContext().getOptionOverrides=
().getGroupRequestMode()) > -1)
-         modeToUse =3D preferredMode;
-
-      RspList rsps;
-      List retval;
-      Vector<Address> validMembers;
-
-      if (disp =3D=3D null)
-      {
-         return null;
-      }
-
-      if (mbrs !=3D null)
-         validMembers =3D new Vector<Address>(mbrs);
-      else
-      {
-         synchronized (members)
-         {
-            validMembers =3D new Vector<Address>(this.members);
-         }
-      }
-
-      if (exclude_self && !validMembers.isEmpty())
-      {
-         Object local_addr =3D getLocalAddress();
-         if (local_addr !=3D null)
-         {
-            validMembers.remove(local_addr);
-         }
-      }
-      if (validMembers.isEmpty())
-      {
-         if (trace)
-         {
-            log.trace("destination list is empty, discarding call");
-         }
-         return null;
-      }
-
-      if (trace)
-      {
-         log.trace("callRemoteMethods(): valid members are " + validMember=
s + " methods: " + method_call);
-      }
-
-      if (channel.flushSupported())
-      {
-         if (!flushBlockGate.await(configuration.getStateRetrievalTimeout(=
)))
-            throw new TimeoutException("State retrieval timed out waiting =
for flush unblock.");
-      }
-      rsps =3D rspFilter =3D=3D null
-            ? disp.callRemoteMethods(validMembers, method_call, modeToUse,=
 timeout, buddyManager !=3D null && buddyManager.isEnabled())
-            : disp.callRemoteMethods(validMembers, method_call, modeToUse,=
 timeout, buddyManager !=3D null && buddyManager.isEnabled(), false, rspFil=
ter);
-
-      // a null response is 99% likely to be due to a marshalling problem =
- we throw a NSE, this needs to be changed when
-      // JGroups supports http://jira.jboss.com/jira/browse/JGRP-193
-      if (rsps =3D=3D null)
-      {
-         // return null;
-         throw new NotSerializableException("RpcDispatcher returned a null=
.  This is most often caused by args for " + method_call.getName() + " not =
being serializable.");
-      }
-      if (mode =3D=3D GroupRequest.GET_NONE)
-      {
-         return Collections.EMPTY_LIST;// async case
-      }
-
-      if (trace)
-      {
-         log.trace("(" + getLocalAddress() + "): responses for method " + =
method_call.getName() + ":\n" + rsps);
-      }
-
-      retval =3D new ArrayList(rsps.size());
-
-      for (Rsp rsp : rsps.values())
-      {
-         if (rsp.wasSuspected() || !rsp.wasReceived())
-         {
-            CacheException ex;
-            if (rsp.wasSuspected())
-            {
-               ex =3D new SuspectException("Suspected member: " + rsp.getS=
ender());
-            }
-            else
-            {
-               ex =3D new TimeoutException("Replication timeout for " + rs=
p.getSender());
-            }
-            retval.add(new ReplicationException("rsp=3D" + rsp, ex));
-         }
-         else
-         {
-            Object value =3D rsp.getValue();
-            if (value instanceof Exception && !(value instanceof Replicati=
onException))
-            {
-               // if we have any application-level exceptions make sure we=
 throw them!!
-               if (trace) log.trace("Recieved exception'" + value + "' fro=
m " + rsp.getSender());
-               throw (Exception) value;
-            }
-            retval.add(value);
-         }
-      }
-      return retval;
-   }
-
-   /* -------------------- End Remote method calls ------------------ */
-
    /* --------------------- Callbacks -------------------------- */
 =

    /* ----- These are VERSIONED callbacks to facilitate JBCACHE-843.  Also=
 see docs/design/DataVersion.txt --- */
@@ -2281,7 +1744,7 @@
 =

          if (backupNodeFqn =3D=3D null && searchSubtrees)
          {
-            backupNodeFqn =3D BuddyManager.getBackupFqn(BuddyManager.getGr=
oupNameFromAddress(getLocalAddress()), fqn);
+            backupNodeFqn =3D BuddyManager.getBackupFqn(BuddyManager.getGr=
oupNameFromAddress(rpcManager.getLocalAddress()), fqn);
          }
 =

          List<NodeData> list =3D getNodeData(new LinkedList<NodeData>(), (=
NodeSPI) actualNode);
@@ -2483,114 +1946,31 @@
       StringBuilder category =3D new StringBuilder(getClass().getName());
       if (configuration !=3D null)
       {
-         String clusterName =3D configuration.getClusterName();
-         if (clusterName !=3D null)
+         if (rpcManager !=3D null)
          {
-            category.append('.');
-            category.append(clusterName);
-            if (channel !=3D null && channel.getLocalAddress() !=3D null)
+            String clusterName =3D configuration.getClusterName();
+            if (clusterName !=3D null)
             {
                category.append('.');
-               category.append(channel.getLocalAddress().toString().replac=
e('.', '_'));
+               category.append(clusterName);
+               if (rpcManager.getLocalAddress() !=3D null)
+               {
+                  category.append('.');
+                  category.append(rpcManager.getLocalAddress().toString().=
replace('.', '_'));
+               }
             }
          }
+         else
+         {
+            // we're in LOCAL mode
+            category.append("_LOCAL");
+         }
       }
       // replace .s with _s otherwise Log4J will strip them out
       log =3D LogFactory.getLog(category.toString());
       trace =3D log.isTraceEnabled();
    }
 =

-   /**
-    * Kills the JGroups channel; an unclean channel disconnect
-    */
-   public void killChannel()
-   {
-      if (channel !=3D null)
-      {
-         channel.disconnect();
-         channel.close();
-      }
-   }
-
-   /*----------------------- MembershipListener ------------------------*/
-
-   protected class MembershipListenerAdaptor implements ExtendedMembership=
Listener
-   {
-
-      public void viewAccepted(View new_view)
-      {
-         Vector<Address> new_mbrs =3D new_view.getMembers();
-         if (log.isInfoEnabled()) log.info("viewAccepted(): " + new_view);
-         synchronized (members)
-         {
-            boolean needNotification =3D false;
-            if (new_mbrs !=3D null)
-            {
-               // Determine what members have been removed
-               // and roll back any tx and break any locks
-               Vector<Address> removed =3D new Vector<Address>(members);
-               removed.removeAll(new_mbrs);
-               removeLocksForDeadMembers(root, removed);
-
-               members.removeAllElements();
-               members.addAll(new_mbrs);
-
-               needNotification =3D true;
-            }
-
-            // Now that we have a view, figure out if we are the coordinat=
or
-            coordinator =3D (members.size() !=3D 0 && members.get(0).equal=
s(getLocalAddress()));
-
-            // now notify listeners - *after* updating the coordinator. - =
JBCACHE-662
-            if (needNotification && notifier !=3D null)
-            {
-               InvocationContext ctx =3D spi.getInvocationContext();
-               notifier.notifyViewChange(new_view, ctx);
-            }
-
-            // Wake up any threads that are waiting to know who the members
-            // are so they can figure out who the coordinator is
-            members.notifyAll();
-         }
-      }
-
-      /**
-       * Called when a member is suspected.
-       */
-      public void suspect(Address suspected_mbr)
-      {
-      }
-
-      /**
-       * Indicates that a channel has received a BLOCK event from FLUSH pr=
otocol.
-       */
-      public void block()
-      {
-         flushBlockGate.close();
-         if (log.isDebugEnabled()) log.debug("Block received at " + getLoc=
alAddress());
-
-         remoteDelegate.block();
-
-         if (log.isDebugEnabled()) log.debug("Block processed at " + getLo=
calAddress());
-      }
-
-      /**
-       * Indicates that a channel has received a UNBLOCK event from FLUSH =
protocol.
-       */
-      public void unblock()
-      {
-         if (log.isDebugEnabled()) log.debug("UnBlock received at " + getL=
ocalAddress());
-
-         remoteDelegate.unblock();
-
-         if (log.isDebugEnabled()) log.debug("UnBlock processed at " + get=
LocalAddress());
-         flushBlockGate.open();
-      }
-
-   }
-
-   /*------------------- End of MembershipListener ----------------------*/
-
    /* ------------------------------ Private methods ---------------------=
------ */
 =

    /**
@@ -2712,7 +2092,7 @@
       GlobalTransaction gtx =3D transactionTable.get(tx);
       if (gtx =3D=3D null && createIfNotExists)
       {
-         Address addr =3D getLocalAddress();
+         Address addr =3D rpcManager.getLocalAddress();
          gtx =3D GlobalTransaction.create(addr);
          transactionTable.put(tx, gtx);
          TransactionEntry ent =3D configuration.isNodeLockingOptimistic() =
? new OptimisticTransactionEntry() : new TransactionEntry();
@@ -2862,89 +2242,6 @@
       return toReturn;
    }
 =

-   private void initialiseChannelAndRpcDispatcher() throws CacheException
-   {
-      channel =3D configuration.getRuntimeConfig().getChannel();
-      if (channel =3D=3D null)
-      {
-         // Try to create a multiplexer channel
-         channel =3D getMultiplexerChannel();
-
-         if (channel !=3D null)
-         {
-            ReflectionUtil.setValue(configuration, "accessible", true);
-            configuration.setUsingMultiplexer(true);
-            if (log.isDebugEnabled())
-            {
-               log.debug("Created Multiplexer Channel for cache cluster " =
+ configuration.getClusterName() +
-                     " using stack " + configuration.getMultiplexerStack()=
);
-            }
-         }
-         else
-         {
-
-            try
-            {
-               if (configuration.getClusterConfig() =3D=3D null)
-               {
-                  log.debug("setting cluster properties to default value");
-                  channel =3D new JChannel(configuration.getDefaultCluster=
Config());
-               }
-               else
-               {
-                  if (trace)
-                  {
-                     log.trace("Cache cluster properties: " + configuratio=
n.getClusterConfig());
-                  }
-                  channel =3D new JChannel(configuration.getClusterConfig(=
));
-               }
-            }
-            catch (ChannelException el)
-            {
-               el.printStackTrace();
-            }
-         }
-
-         configuration.getRuntimeConfig().setChannel(channel);
-      }
-
-      channel.setOpt(Channel.AUTO_RECONNECT, true);
-      channel.setOpt(Channel.AUTO_GETSTATE, true);
-      channel.setOpt(Channel.BLOCK, true);
-
-      // always use the InactiveRegionAwareRpcDispatcher - exceptions due =
to regions not being active should not propagate to remote
-      // nodes as errors. - Manik
-      disp =3D new InactiveRegionAwareRpcDispatcher(channel, messageListen=
er, new MembershipListenerAdaptor(), remoteDelegate);
-
-      disp.setRequestMarshaller(marshaller);
-      disp.setResponseMarshaller(marshaller);
-
-      if (trace) log.trace("Started with RpcDispatcher " + disp);
-   }
-
-   private JChannel getMultiplexerChannel() throws CacheException
-   {
-      String stackName =3D configuration.getMultiplexerStack();
-
-      RuntimeConfig rtc =3D configuration.getRuntimeConfig();
-      ChannelFactory channelFactory =3D rtc.getMuxChannelFactory();
-      JChannel muxchannel =3D null;
-
-      if (channelFactory !=3D null)
-      {
-         try
-         {
-            muxchannel =3D (JChannel) channelFactory.createMultiplexerChan=
nel(stackName, configuration.getClusterName());
-         }
-         catch (Exception e)
-         {
-            throw new CacheException("Failed to create multiplexed channel=
 using stack " + stackName, e);
-         }
-      }
-
-      return muxchannel;
-   }
-
    // =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D methods to im=
plement Cache and CacheSPI interfaces =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
 =

    public List<Interceptor> getInterceptorChain()

Modified: core/trunk/src/main/java/org/jboss/cache/CacheSPI.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/java/org/jboss/cache/CacheSPI.java	2008-01-17 15:22=
:36 UTC (rev 5160)
+++ core/trunk/src/main/java/org/jboss/cache/CacheSPI.java	2008-01-17 22:34=
:36 UTC (rev 5161)
@@ -18,7 +18,6 @@
 import org.jboss.cache.statetransfer.StateTransferManager;
 import org.jboss.cache.transaction.GlobalTransaction;
 import org.jboss.cache.transaction.TransactionTable;
-import org.jgroups.Address;
 =

 import javax.transaction.Transaction;
 import javax.transaction.TransactionManager;
@@ -285,12 +284,6 @@
     */
    Set<Fqn> getInternalFqns();
 =

-   @Deprecated
-   void fetchPartialState(List<Address> members, Fqn subtreeRoot) throws E=
xception;
-
-   @Deprecated
-   void fetchPartialState(List<Address> members, Fqn subtreeRoot, Fqn inte=
grationPoint) throws Exception;
-
    int getNumberOfLocksHeld();
 =

    /**

Modified: core/trunk/src/main/java/org/jboss/cache/RPCManager.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/java/org/jboss/cache/RPCManager.java	2008-01-17 15:=
22:36 UTC (rev 5160)
+++ core/trunk/src/main/java/org/jboss/cache/RPCManager.java	2008-01-17 22:=
34:36 UTC (rev 5161)
@@ -6,24 +6,120 @@
 =

 import java.util.List;
 =

+/**
+ * Provides a mechanism for communicating with other caches in the cluster=
.  For now this is based on JGroups as an underlying
+ * transport, and in future more transport options may become available.
+ * <p/>
+ * Implementations have a simple lifecycle:
+ * <ul>
+ * <li>start() - starts the underlying channel based on configuration opti=
ons injected, and connects the channel</li>
+ * <li>disconnect() - disconnects the channel</li>
+ * <li>stop() - stops the dispatcher and releases resources</li>
+ * </ul>
+ *
+ * @author Manik Surtani
+ * @since 2.1.0
+ */
 public interface RPCManager
 {
    /**
-    * The same as {@link #callRemoteMethods(java.util.List,org.jboss.cache=
.marshall.MethodCall,int,boolean,long)} except that it adds a JGroups
-    * {@link org.jgroups.blocks.RspFilter} to the list of parameters, whic=
h is used to filter results.
+    * Disconnects and closes the underlying JGroups channel.
     */
-   public List callRemoteMethods(List<Address> recipients, MethodCall meth=
odCall, int mode, boolean excludeSelf, long timeout, RspFilter responseFilt=
er) throws Exception;
+   void disconnect();
 =

-   public List callRemoteMethods(List<Address> recipients, MethodCall meth=
odCall, int mode, boolean excludeSelf, long timeout) throws Exception;
+   /**
+    * Stops the RPCDispatcher and frees resources.  Closes and disconnects=
 the underlying JGroups channel if this is
+    * still open/connected.
+    */
+   void stop();
 =

-   public boolean isCoordinator();
+   /**
+    * Starts the RPCManager by connecting the underlying JGroups channel (=
if configured for replication).  Connecting
+    * the channel may also involve state transfer (if configured) so the i=
nterceptor chain should be started and
+    * available before this method is called.
+    */
+   void start();
 =

-   public Address getCoordinator();
+   /**
+    * Invokes an RPC call on other caches in the cluster.
+    *
+    * @param recipients     a list of Addresses to invoke the call on.  If=
 this is null, the call is broadcast to the entire cluster.
+    * @param methodCall     the method call to invoke
+    * @param mode           the group request mode to use.  See {@link org=
.jgroups.blocks.GroupRequest}.
+    * @param excludeSelf    if true, the message is not looped back to the=
 originator.
+    * @param timeout        a timeout after which to throw a replication e=
xception.
+    * @param responseFilter a response filter with which to filter out fai=
led/unwanted/invalid responses.
+    * @return a list of responses from each member contacted.
+    * @throws Exception in the event of problems.
+    */
+   List<Object> callRemoteMethods(List<Address> recipients, MethodCall met=
hodCall, int mode, boolean excludeSelf, long timeout, RspFilter responseFil=
ter) throws Exception;
 =

-   public List callRemoteMethods(List<Address> recipients, MethodCall meth=
odCall, boolean synchronous, boolean excludeSelf, int timeout) throws Excep=
tion;
+   /**
+    * Invokes an RPC call on other caches in the cluster.
+    *
+    * @param recipients  a list of Addresses to invoke the call on.  If th=
is is null, the call is broadcast to the entire cluster.
+    * @param methodCall  the method call to invoke
+    * @param mode        the group request mode to use.  See {@link org.jg=
roups.blocks.GroupRequest}.
+    * @param excludeSelf if true, the message is not looped back to the or=
iginator.
+    * @param timeout     a timeout after which to throw a replication exce=
ption.
+    * @return a list of responses from each member contacted.
+    * @throws Exception in the event of problems.
+    */
+   List<Object> callRemoteMethods(List<Address> recipients, MethodCall met=
hodCall, int mode, boolean excludeSelf, long timeout) throws Exception;
 =

    /**
-    * @return Returns the replication queue (if one is used), null otherwi=
se.
+    * Invokes an RPC call on other caches in the cluster.
+    *
+    * @param recipients  a list of Addresses to invoke the call on.  If th=
is is null, the call is broadcast to the entire cluster.
+    * @param methodCall  the method call to invoke
+    * @param synchronous if true, sets group request mode to {@link org.jg=
roups.blocks.GroupRequest#GET_ALL}, and if false sets it to {@link org.jgro=
ups.blocks.GroupRequest#GET_NONE}.
+    * @param excludeSelf if true, the message is not looped back to the or=
iginator.
+    * @param timeout     a timeout after which to throw a replication exce=
ption.
+    * @return a list of responses from each member contacted.
+    * @throws Exception in the event of problems.
     */
-   public ReplicationQueue getReplicationQueue();
+   List<Object> callRemoteMethods(List<Address> recipients, MethodCall met=
hodCall, boolean synchronous, boolean excludeSelf, int timeout) throws Exce=
ption;
+
+   /**
+    * @return true if the current Channel is the coordinator of the cluste=
r.
+    */
+   boolean isCoordinator();
+
+   /**
+    * @return the Address of the current coordinator.
+    */
+   Address getCoordinator();
+
+   /**
+    * Retrieves the local JGroups channel's address
+    *
+    * @return an Address
+    */
+   Address getLocalAddress();
+
+   /**
+    * Returns a defensively copied list of  members in the current cluster=
 view.
+    */
+   List<Address> getMembers();
+
+   /**
+    * Retrieves partial state from remote instances.
+    *
+    * @param sources           sources to consider for a state transfer
+    * @param sourceTarget      Fqn on source to retrieve state for
+    * @param integrationTarget integration point on local cache to apply s=
tate
+    * @throws Exception in the event of problems
+    */
+   void fetchPartialState(List<Address> sources, Fqn sourceTarget, Fqn int=
egrationTarget) throws Exception;
+
+   /**
+    * Retrieves partial state from remote instances.
+    *
+    * @param sources sources to consider for a state transfer
+    * @param subtree Fqn subtree to retrieve.  Will be integrated at the s=
ame point.
+    * @throws Exception in the event of problems
+    */
+   void fetchPartialState(List<Address> sources, Fqn subtree) throws Excep=
tion;
+
+
 }

Modified: core/trunk/src/main/java/org/jboss/cache/RPCManagerImpl.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/java/org/jboss/cache/RPCManagerImpl.java	2008-01-17=
 15:22:36 UTC (rev 5160)
+++ core/trunk/src/main/java/org/jboss/cache/RPCManagerImpl.java	2008-01-17=
 22:34:36 UTC (rev 5161)
@@ -6,12 +6,52 @@
  */
 package org.jboss.cache;
 =

+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.jboss.cache.buddyreplication.BuddyManager;
+import org.jboss.cache.config.Configuration;
+import org.jboss.cache.config.RuntimeConfig;
+import org.jboss.cache.factories.annotations.ComponentName;
 import org.jboss.cache.factories.annotations.Inject;
+import org.jboss.cache.factories.annotations.Stop;
+import org.jboss.cache.invocation.RemoteCacheInvocationDelegate;
+import org.jboss.cache.loader.CacheLoaderManager;
+import org.jboss.cache.lock.LockUtil;
+import org.jboss.cache.lock.NodeLock;
+import org.jboss.cache.lock.TimeoutException;
+import org.jboss.cache.marshall.InactiveRegionAwareRpcDispatcher;
+import org.jboss.cache.marshall.Marshaller;
 import org.jboss.cache.marshall.MethodCall;
+import org.jboss.cache.notifications.Notifier;
+import org.jboss.cache.remoting.jgroups.CacheMessageListener;
+import org.jboss.cache.statetransfer.StateTransferManager;
+import org.jboss.cache.transaction.GlobalTransaction;
+import org.jboss.cache.transaction.TransactionTable;
+import org.jboss.cache.util.ThreadGate;
+import org.jboss.cache.util.reflect.ReflectionUtil;
 import org.jgroups.Address;
+import org.jgroups.Channel;
+import org.jgroups.ChannelException;
+import org.jgroups.ChannelFactory;
+import org.jgroups.ExtendedMembershipListener;
+import org.jgroups.JChannel;
+import org.jgroups.StateTransferException;
+import org.jgroups.View;
+import org.jgroups.blocks.GroupRequest;
+import org.jgroups.blocks.RpcDispatcher;
 import org.jgroups.blocks.RspFilter;
+import org.jgroups.util.Rsp;
+import org.jgroups.util.RspList;
 =

+import javax.transaction.TransactionManager;
+import java.io.NotSerializableException;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.LinkedList;
 import java.util.List;
+import java.util.Set;
+import java.util.Vector;
 =

 /**
  * Manager that handles all RPC calls between JBoss Cache instances
@@ -20,61 +60,603 @@
  */
 public class RPCManagerImpl implements RPCManager
 {
-   private CacheImpl c;
+   private Channel channel;
+   private Log log =3D LogFactory.getLog(RPCManagerImpl.class);
+   private List<Address> members =3D new LinkedList<Address>();
+   /**
+    * True if this Cache is the coordinator.
+    */
+   private volatile boolean coordinator =3D false;
+   /**
+    * Thread gate used to block Dispatcher during JGroups FLUSH protocol
+    */
+   private final ThreadGate flushBlockGate =3D new ThreadGate();
+   /**
+    * JGroups RpcDispatcher in use.
+    */
+   private RpcDispatcher disp =3D null;
 =

    /**
-    * Empty ctor for mock object creation/unit testing
+    * JGroups message listener.
     */
-   public RPCManagerImpl()
+   private CacheMessageListener messageListener;
+   private Configuration configuration;
+   private Notifier notifier;
+   private CacheSPI spi;
+   private boolean trace =3D log.isTraceEnabled();
+   private BuddyManager buddyManager;
+   private RemoteCacheInvocationDelegate remoteDelegate;
+   private CacheLoaderManager cacheLoaderManager;
+   private Marshaller marshaller;
+   private TransactionManager txManager;
+   private TransactionTable txTable;
+
+
+   @Inject
+   private void setupDependencies(CacheMessageListener messageListener, Co=
nfiguration configuration,
+                                  Notifier notifier, CacheSPI spi, BuddyMa=
nager buddyManager, Marshaller marshaller,
+                                  @ComponentName("remoteDelegate")RemoteCa=
cheInvocationDelegate remoteDelegate,
+                                  CacheLoaderManager cacheLoaderManager, T=
ransactionTable txTable, TransactionManager txManager)
    {
+      this.messageListener =3D messageListener;
+      this.configuration =3D configuration;
+      this.notifier =3D notifier;
+      this.spi =3D spi;
+      this.buddyManager =3D buddyManager;
+      this.remoteDelegate =3D remoteDelegate;
+      this.cacheLoaderManager =3D cacheLoaderManager;
+      this.marshaller =3D marshaller;
+      this.txManager =3D txManager;
+      this.txTable =3D txTable;
    }
 =

-   @Inject
-   private void setupDependencies(CacheImpl c)
+   // ------------ START: Lifecycle methods ------------
+
+   // This is called manually, rather than by using @Start, since it needs=
 to be called AFTER all other components are started.
+
+   public void start()
    {
-      this.c =3D c;
+      switch (configuration.getCacheMode())
+      {
+         case LOCAL:
+            log.debug("cache mode is local, will not create the channel");
+            break;
+         case REPL_SYNC:
+         case REPL_ASYNC:
+         case INVALIDATION_ASYNC:
+         case INVALIDATION_SYNC:
+            if (log.isDebugEnabled()) log.debug("Cache mode is " + configu=
ration.getCacheMode());
+
+            initialiseChannelAndRpcDispatcher();
+
+            if (shouldFetchStateOnStartup())
+            {
+               try
+               {
+                  long start =3D System.currentTimeMillis();
+                  // connect and state transfer
+                  channel.connect(configuration.getClusterName(), null, nu=
ll, configuration.getStateRetrievalTimeout());
+                  //if I am not the only and the first member than wait fo=
r a state to arrive
+                  if (getMembers().size() > 1) messageListener.waitForStat=
e();
+
+                  if (log.isDebugEnabled())
+                     log.debug("connected, state was retrieved successfull=
y (in " + (System.currentTimeMillis() - start) + " milliseconds)");
+               }
+               catch (StateTransferException ste)
+               {
+                  // make sure we disconnect from the channel before we th=
row this exception!
+                  // JBCACHE-761
+                  disconnect();
+                  throw new CacheException("Unable to fetch state on start=
up", ste);
+               }
+               catch (ChannelException e)
+               {
+                  throw new CacheException("Unable to connect to JGroups c=
hannel", e);
+               }
+               catch (Exception ex)
+               {
+                  throw new CacheException("Unable to fetch state on start=
up", ex);
+               }
+            }
+            else
+            {
+               //otherwise just connect
+               try
+               {
+                  channel.connect(configuration.getClusterName());
+               }
+               catch (ChannelException e)
+               {
+                  throw new CacheException("Unable to connect to JGroups c=
hannel", e);
+               }
+            }
+            if (log.isInfoEnabled()) log.info("Cache local address is " + =
getLocalAddress());
+      }
    }
 =

-   public RPCManagerImpl(CacheSPI c)
+   public void disconnect()
    {
-      this.c =3D (CacheImpl) c;
+      if (channel !=3D null && channel.isOpen())
+      {
+         log.info("Disconnecting and closing the Channel");
+         channel.disconnect();
+         channel.close();
+      }
    }
 =

-   // for now, we delegate RPC calls to deprecated methods in CacheImpl.
+   @Stop
+   public void stop()
+   {
+      try
+      {
+         disconnect();
+      }
+      catch (Exception toLog)
+      {
+         log.error("Problem closing channel; setting it to null", toLog);
+      }
 =

-   @SuppressWarnings("deprecation")
-   public List callRemoteMethods(List<Address> recipients, MethodCall meth=
odCall, int mode, boolean excludeSelf, long timeout, RspFilter responseFilt=
er) throws Exception
+      channel =3D null;
+      configuration.getRuntimeConfig().setChannel(null);
+      if (disp !=3D null)
+      {
+         log.info("Stopping the RpcDispatcher");
+         disp.stop();
+         disp =3D null;
+      }
+      if (members !=3D null)
+      {
+         synchronized (members)
+         {
+            members.clear();
+         }
+      }
+
+      coordinator =3D false;
+
+      disp =3D null;
+   }
+
+   /**
+    * @return true if we need to fetch state on startup.  I.e., initiate a=
 state transfer.
+    */
+   private boolean shouldFetchStateOnStartup()
    {
-      return c.callRemoteMethods(recipients, methodCall, mode, excludeSelf=
, timeout, responseFilter);
+      boolean loaderFetch =3D cacheLoaderManager !=3D null && cacheLoaderM=
anager.isFetchPersistentState();
+      return !configuration.isInactiveOnStartup() && buddyManager =3D=3D n=
ull && (configuration.isFetchInMemoryState() || loaderFetch);
    }
 =

-   @SuppressWarnings("deprecation")
-   public List callRemoteMethods(List<Address> recipients, MethodCall meth=
odCall, int mode, boolean excludeSelf, long timeout) throws Exception
+   private void initialiseChannelAndRpcDispatcher() throws CacheException
    {
-      return c.callRemoteMethods(recipients, methodCall, mode, excludeSelf=
, timeout);
+      channel =3D configuration.getRuntimeConfig().getChannel();
+      if (channel =3D=3D null)
+      {
+         // Try to create a multiplexer channel
+         channel =3D getMultiplexerChannel();
+
+         if (channel !=3D null)
+         {
+            ReflectionUtil.setValue(configuration, "accessible", true);
+            configuration.setUsingMultiplexer(true);
+            if (log.isDebugEnabled())
+               log.debug("Created Multiplexer Channel for cache cluster " =
+ configuration.getClusterName() + " using stack " + configuration.getMulti=
plexerStack());
+         }
+         else
+         {
+            try
+            {
+               if (configuration.getClusterConfig() =3D=3D null)
+               {
+                  log.debug("setting cluster properties to default value");
+                  channel =3D new JChannel(configuration.getDefaultCluster=
Config());
+               }
+               else
+               {
+                  if (trace)
+                  {
+                     log.trace("Cache cluster properties: " + configuratio=
n.getClusterConfig());
+                  }
+                  channel =3D new JChannel(configuration.getClusterConfig(=
));
+               }
+            }
+            catch (ChannelException el)
+            {
+               el.printStackTrace();
+            }
+         }
+
+         configuration.getRuntimeConfig().setChannel(channel);
+      }
+
+      channel.setOpt(Channel.AUTO_RECONNECT, true);
+      channel.setOpt(Channel.AUTO_GETSTATE, true);
+      channel.setOpt(Channel.BLOCK, true);
+
+      // always use the InactiveRegionAwareRpcDispatcher - exceptions due =
to regions not being active should not propagate to remote
+      // nodes as errors. - Manik
+      disp =3D new InactiveRegionAwareRpcDispatcher(channel, messageListen=
er, new MembershipListenerAdaptor(), remoteDelegate);
+
+      disp.setRequestMarshaller(marshaller);
+      disp.setResponseMarshaller(marshaller);
    }
 =

+   private JChannel getMultiplexerChannel() throws CacheException
+   {
+      String stackName =3D configuration.getMultiplexerStack();
+
+      RuntimeConfig rtc =3D configuration.getRuntimeConfig();
+      ChannelFactory channelFactory =3D rtc.getMuxChannelFactory();
+      JChannel muxchannel =3D null;
+
+      if (channelFactory !=3D null)
+      {
+         try
+         {
+            muxchannel =3D (JChannel) channelFactory.createMultiplexerChan=
nel(stackName, configuration.getClusterName());
+         }
+         catch (Exception e)
+         {
+            throw new CacheException("Failed to create multiplexed channel=
 using stack " + stackName, e);
+         }
+      }
+
+      return muxchannel;
+   }
+
+
+   private void removeLocksForDeadMembers(NodeSPI node, List deadMembers)
+   {
+      Set<GlobalTransaction> deadOwners =3D new HashSet<GlobalTransaction>=
();
+      NodeLock lock =3D node.getLock();
+      Object owner =3D lock.getWriterOwner();
+
+      if (isLockOwnerDead(owner, deadMembers))
+      {
+         deadOwners.add((GlobalTransaction) owner);
+      }
+
+      for (Object readOwner : lock.getReaderOwners())
+      {
+         if (isLockOwnerDead(readOwner, deadMembers))
+         {
+            deadOwners.add((GlobalTransaction) readOwner);
+         }
+      }
+
+      for (GlobalTransaction deadOwner : deadOwners)
+      {
+         boolean localTx =3D deadOwner.getAddress().equals(getLocalAddress=
());
+         boolean broken =3D LockUtil.breakTransactionLock(lock, deadOwner,=
 localTx, txTable, txManager);
+
+         if (broken && trace) log.trace("Broke lock for node " + node.getF=
qn() + " held by " + deadOwner);
+      }
+
+      // Recursively unlock children
+      for (Object child : node.getChildrenDirect())
+      {
+         removeLocksForDeadMembers((NodeSPI) child, deadMembers);
+      }
+   }
+
+   private boolean isLockOwnerDead(Object owner, List deadMembers)
+   {
+      boolean result =3D false;
+      if (owner !=3D null && owner instanceof GlobalTransaction)
+      {
+         Object addr =3D ((GlobalTransaction) owner).getAddress();
+         result =3D deadMembers.contains(addr);
+      }
+      return result;
+   }
+
+   // ------------ END: Lifecycle methods ------------
+
+   // ------------ START: RPC call methods ------------
+
+   public List<Object> callRemoteMethods(List<Address> recipients, MethodC=
all methodCall, int mode, boolean excludeSelf, long timeout) throws Excepti=
on
+   {
+      return callRemoteMethods(recipients, methodCall, mode, excludeSelf, =
timeout, null);
+   }
+
+   public List<Object> callRemoteMethods(List<Address> recipients, MethodC=
all methodCall, boolean synchronous, boolean excludeSelf, int timeout) thro=
ws Exception
+   {
+      return callRemoteMethods(recipients, methodCall, synchronous ? Group=
Request.GET_ALL : GroupRequest.GET_NONE, excludeSelf, timeout);
+   }
+
+   public List<Object> callRemoteMethods(List<Address> recipients, MethodC=
all methodCall, int mode, boolean excludeSelf, long timeout, RspFilter resp=
onseFilter) throws Exception
+   {
+      int modeToUse =3D mode;
+      int preferredMode;
+      if ((preferredMode =3D spi.getInvocationContext().getOptionOverrides=
().getGroupRequestMode()) > -1)
+         modeToUse =3D preferredMode;
+
+      RspList rsps;
+      List<Object> retval;
+      Vector<Address> validMembers;
+
+      if (disp =3D=3D null)
+      {
+         return null;
+      }
+
+      if (recipients !=3D null)
+         validMembers =3D new Vector<Address>(recipients);
+      else
+      {
+         synchronized (members)
+         {
+            validMembers =3D new Vector<Address>(members);
+         }
+      }
+
+      if (excludeSelf && !validMembers.isEmpty())
+      {
+         Address local_addr =3D getLocalAddress();
+         if (local_addr !=3D null) validMembers.remove(local_addr);
+      }
+
+      if (validMembers.isEmpty())
+      {
+         if (trace) log.trace("destination list is empty, discarding call"=
);
+         return null;
+      }
+
+      if (trace) log.trace("callRemoteMethods(): valid members are " + val=
idMembers + " methods: " + methodCall);
+
+      if (channel.flushSupported())
+      {
+         if (!flushBlockGate.await(configuration.getStateRetrievalTimeout(=
)))
+            throw new TimeoutException("State retrieval timed out waiting =
for flush unblock.");
+      }
+      rsps =3D responseFilter =3D=3D null
+            ? disp.callRemoteMethods(validMembers, methodCall, modeToUse, =
timeout, buddyManager !=3D null && buddyManager.isEnabled())
+            : disp.callRemoteMethods(validMembers, methodCall, modeToUse, =
timeout, buddyManager !=3D null && buddyManager.isEnabled(), false, respons=
eFilter);
+
+      // a null response is 99% likely to be due to a marshalling problem =
- we throw a NSE, this needs to be changed when
+      // JGroups supports http://jira.jboss.com/jira/browse/JGRP-193
+      if (rsps =3D=3D null)
+      {
+         // return null;
+         throw new NotSerializableException("RpcDispatcher returned a null=
.  This is most often caused by args for " + methodCall.getName() + " not b=
eing serializable.");
+      }
+      if (mode =3D=3D GroupRequest.GET_NONE) return Collections.emptyList(=
);// async case
+
+      if (trace) log.trace("(" + getLocalAddress() + "): responses for met=
hod " + methodCall.getName() + ":\n" + rsps);
+
+      retval =3D new ArrayList<Object>(rsps.size());
+
+      for (Rsp rsp : rsps.values())
+      {
+         if (rsp.wasSuspected() || !rsp.wasReceived())
+         {
+            CacheException ex;
+            if (rsp.wasSuspected())
+            {
+               ex =3D new SuspectException("Suspected member: " + rsp.getS=
ender());
+            }
+            else
+            {
+               ex =3D new TimeoutException("Replication timeout for " + rs=
p.getSender());
+            }
+            retval.add(new ReplicationException("rsp=3D" + rsp, ex));
+         }
+         else
+         {
+            Object value =3D rsp.getValue();
+            if (value instanceof Exception && !(value instanceof Replicati=
onException))
+            {
+               // if we have any application-level exceptions make sure we=
 throw them!!
+               if (trace) log.trace("Recieved exception'" + value + "' fro=
m " + rsp.getSender());
+               throw (Exception) value;
+            }
+            retval.add(value);
+         }
+      }
+      return retval;
+   }
+
+   // ------------ END: RPC call methods ------------
+
+   // ------------ START: Partial state transfer methods ------------
+
+   public void fetchPartialState(List<Address> sources, Fqn sourceTarget, =
Fqn integrationTarget) throws Exception
+   {
+      String encodedStateId =3D sourceTarget + StateTransferManager.PARTIA=
L_STATE_DELIMITER + integrationTarget;
+      fetchPartialState(sources, encodedStateId);
+   }
+
+   public void fetchPartialState(List<Address> sources, Fqn subtree) throw=
s Exception
+   {
+      if (subtree =3D=3D null)
+      {
+         throw new IllegalArgumentException("Cannot fetch partial state. N=
ull subtree.");
+      }
+      fetchPartialState(sources, subtree.toString());
+   }
+
+   private void fetchPartialState(List<Address> sources, String stateId) t=
hrows Exception
+   {
+      if (sources =3D=3D null || sources.isEmpty() || stateId =3D=3D null)
+      {
+         // should this really be throwing an exception?  Are there valid =
use cases where partial state may not be available? - Manik
+         // Yes -- cache is configured LOCAL but app doesn't know it -- Br=
ian
+         //throw new IllegalArgumentException("Cannot fetch partial state,=
 targets are " + sources + " and stateId is " + stateId);
+         if (log.isWarnEnabled())
+            log.warn("Cannot fetch partial state, targets are " + sources =
+ " and stateId is " + stateId);
+         return;
+      }
+
+      List<Address> targets =3D new LinkedList<Address>(sources);
+
+      //skip *this* node as a target
+      targets.remove(getLocalAddress());
+
+      if (targets.isEmpty())
+      {
+         // Definitely no exception here -- this happens every time the 1s=
t node in the
+         // cluster activates a region!! -- Brian
+         if (log.isDebugEnabled()) log.debug("Cannot fetch partial state. =
There are no target members specified");
+         return;
+      }
+
+      if (log.isDebugEnabled())
+         log.debug("Node " + getLocalAddress() + " fetching partial state =
" + stateId + " from members " + targets);
+      boolean successfulTransfer =3D false;
+      for (Address target : targets)
+      {
+         if (log.isDebugEnabled())
+            log.debug("Node " + getLocalAddress() + " fetching partial sta=
te " + stateId + " from member " + target);
+         messageListener.setStateSet(false);
+         successfulTransfer =3D channel.getState(target, stateId, configur=
ation.getStateRetrievalTimeout());
+         if (successfulTransfer)
+         {
+            try
+            {
+               messageListener.waitForState();
+            }
+            catch (Exception transferFailed)
+            {
+               successfulTransfer =3D false;
+            }
+         }
+         if (log.isDebugEnabled())
+            log.debug("Node " + getLocalAddress() + " fetching partial sta=
te " + stateId + " from member " + target + (successfulTransfer ? " success=
ful" : " failed"));
+         if (successfulTransfer) break;
+      }
+
+      if (!successfulTransfer)
+      {
+         if (log.isDebugEnabled())
+            log.debug("Node " + getLocalAddress() + " could not fetch part=
ial state " + stateId + " from any member " + targets);
+      }
+   }
+
+   // ------------ END: Partial state transfer methods ------------
+
+   // ------------ START: Informational methods ------------
+
+   public Address getLocalAddress()
+   {
+      return channel !=3D null ? channel.getLocalAddress() : null;
+   }
+
+   public List<Address> getMembers()
+   {
+      synchronized (members)
+      {
+         return new ArrayList<Address>(members);
+      }
+   }
+
    public boolean isCoordinator()
    {
-      return c.isCoordinator();
+      return coordinator;
    }
 =

    public Address getCoordinator()
    {
-      return c.getCoordinator();
+      if (channel =3D=3D null)
+      {
+         return null;
+      }
+
+      synchronized (members)
+      {
+         while (members.isEmpty())
+         {
+            log.debug("getCoordinator(): waiting on viewAccepted()");
+            try
+            {
+               members.wait();
+            }
+            catch (InterruptedException e)
+            {
+               log.error("getCoordinator(): Interrupted while waiting for =
members to be set", e);
+               break;
+            }
+         }
+         return members.size() > 0 ? members.get(0) : null;
+      }
    }
 =

-   @SuppressWarnings("deprecation")
-   public List callRemoteMethods(List<Address> recipients, MethodCall meth=
odCall, boolean synchronous, boolean excludeSelf, int timeout) throws Excep=
tion
+   // ------------ END: Informational methods ------------
+
+   /*----------------------- MembershipListener ------------------------*/
+
+   protected class MembershipListenerAdaptor implements ExtendedMembership=
Listener
    {
-      return c.callRemoteMethods(recipients, methodCall, synchronous, excl=
udeSelf, timeout);
+
+      public void viewAccepted(View new_view)
+      {
+         Vector<Address> new_mbrs =3D new_view.getMembers();
+         if (log.isInfoEnabled()) log.info("viewAccepted(): " + new_view);
+         synchronized (members)
+         {
+            boolean needNotification =3D false;
+            if (new_mbrs !=3D null)
+            {
+               // Determine what members have been removed
+               // and roll back any tx and break any locks
+               Vector<Address> removed =3D new Vector<Address>(members);
+               removed.removeAll(new_mbrs);
+               removeLocksForDeadMembers(spi.getRoot(), removed);
+
+               members.clear();
+               members.addAll(new_mbrs);
+
+               needNotification =3D true;
+            }
+
+            // Now that we have a view, figure out if we are the coordinat=
or
+            coordinator =3D (members.size() !=3D 0 && members.get(0).equal=
s(getLocalAddress()));
+
+            // now notify listeners - *after* updating the coordinator. - =
JBCACHE-662
+            if (needNotification && notifier !=3D null)
+            {
+               InvocationContext ctx =3D spi.getInvocationContext();
+               notifier.notifyViewChange(new_view, ctx);
+            }
+
+            // Wake up any threads that are waiting to know who the members
+            // are so they can figure out who the coordinator is
+            members.notifyAll();
+         }
+      }
+
+      /**
+       * Called when a member is suspected.
+       */
+      public void suspect(Address suspected_mbr)
+      {
+      }
+
+      /**
+       * Indicates that a channel has received a BLOCK event from FLUSH pr=
otocol.
+       */
+      public void block()
+      {
+         flushBlockGate.close();
+         if (log.isDebugEnabled()) log.debug("Block received at " + getLoc=
alAddress());
+
+         remoteDelegate.block();
+
+         if (log.isDebugEnabled()) log.debug("Block processed at " + getLo=
calAddress());
+      }
+
+      /**
+       * Indicates that a channel has received a UNBLOCK event from FLUSH =
protocol.
+       */
+      public void unblock()
+      {
+         if (log.isDebugEnabled()) log.debug("UnBlock received at " + getL=
ocalAddress());
+
+         remoteDelegate.unblock();
+
+         if (log.isDebugEnabled()) log.debug("UnBlock processed at " + get=
LocalAddress());
+         flushBlockGate.open();
+      }
+
    }
 =

-   /**
-    * @return Returns the replication queue (if one is used), null otherwi=
se.
-    */
-   public ReplicationQueue getReplicationQueue()
-   {
-      return c.getReplicationQueue();
-   }
-}
+   /*------------------- End of MembershipListener ----------------------*/
+}
\ No newline at end of file

Modified: core/trunk/src/main/java/org/jboss/cache/RegionManager.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/java/org/jboss/cache/RegionManager.java	2008-01-17 =
15:22:36 UTC (rev 5160)
+++ core/trunk/src/main/java/org/jboss/cache/RegionManager.java	2008-01-17 =
22:34:36 UTC (rev 5161)
@@ -55,11 +55,13 @@
 =

    protected final Set<Fqn> activationChangeNodes =3D Collections.synchron=
izedSet(new HashSet<Fqn>());
    protected Configuration configuration;
+   protected RPCManager rpcManager;
 =

    @Inject
-   void injectDependencies(CacheSPI cache, Configuration configuration)
+   void injectDependencies(CacheSPI cache, Configuration configuration, RP=
CManager rpcManager)
    {
       this.cache =3D cache;
+      this.rpcManager =3D rpcManager;
       this.configuration =3D configuration;
    }
 =

@@ -412,7 +414,7 @@
             }
 =

             List<Address> members =3D cache.getMembers();
-            cache.fetchPartialState(members, subtreeRoot.getFqn());
+            rpcManager.fetchPartialState(members, subtreeRoot.getFqn());
          }
          else if (!BuddyManager.isBackupFqn(fqn))
          {
@@ -440,7 +442,7 @@
                   subtreeRoot =3D cache.getRoot().getChild(buddyRoot);
                   cache.getInvocationContext().getOptionOverrides().setCac=
heModeLocal(false);
                }
-               cache.fetchPartialState(sources, fqn, subtreeRoot.getFqn());
+               rpcManager.fetchPartialState(sources, fqn, subtreeRoot.getF=
qn());
             }
          }
          else

Modified: core/trunk/src/main/java/org/jboss/cache/ReplicationQueue.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/java/org/jboss/cache/ReplicationQueue.java	2008-01-=
17 15:22:36 UTC (rev 5160)
+++ core/trunk/src/main/java/org/jboss/cache/ReplicationQueue.java	2008-01-=
17 22:34:36 UTC (rev 5161)
@@ -9,6 +9,10 @@
 =

 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.jboss.cache.config.Configuration;
+import org.jboss.cache.factories.annotations.Inject;
+import org.jboss.cache.factories.annotations.Start;
+import org.jboss.cache.factories.annotations.Stop;
 import org.jboss.cache.marshall.MethodCall;
 import org.jboss.cache.marshall.MethodCallFactory;
 import org.jboss.cache.marshall.MethodDeclarations;
@@ -31,8 +35,6 @@
 =

    private static Log log =3D LogFactory.getLog(ReplicationQueue.class);
 =

-   private CacheImpl cache =3D null;
-
    /**
     * We flush every 5 seconds. Inactive if -1 or 0
     */
@@ -57,71 +59,47 @@
     * The timer task, only calls flush() when executed by Timer
     */
    private MyTask task =3D null;
+   private RPCManager rpcManager;
+   private Configuration configuration;
+   private boolean enabled;
 =

-   public ReplicationQueue()
-   {
-   }
 =

-   /**
-    * Constructs a new ReplicationQueue.
-    */
-   public ReplicationQueue(CacheImpl cache, long interval, long max_elemen=
ts)
+   public boolean isEnabled()
    {
-      this.cache =3D cache;
-      this.interval =3D interval;
-      this.max_elements =3D max_elements;
+      return enabled;
    }
 =

-   /**
-    * Returns the flush interval in milliseconds.
-    */
-   public long getInterval()
+   @Inject
+   private void injectDependencies(RPCManager rpcManager, Configuration co=
nfiguration)
    {
-      return interval;
+      this.rpcManager =3D rpcManager;
+      this.configuration =3D configuration;
+      enabled =3D configuration.isUseReplQueue() && (configuration.getBudd=
yReplicationConfig() =3D=3D null || !configuration.getBuddyReplicationConfi=
g().isEnabled());
    }
 =

    /**
-    * Sets the flush interval in milliseconds.
-    */
-   public void setInterval(long interval)
-   {
-      this.interval =3D interval;
-      stop();
-      start();
-   }
-
-   /**
-    * Returns the maximum number of elements to hold.
-    * If the maximum number is reached, flushes in the calling thread.
-    */
-   public long getMax_elements()
-   {
-      return max_elements;
-   }
-
-   /**
-    * Sets the maximum number of elements to hold.
-    */
-   public void setMax_elements(long max_elements)
-   {
-      this.max_elements =3D max_elements;
-   }
-
-   /**
     * Starts the asynchronous flush queue.
     */
+   @Start
    public synchronized void start()
    {
-      if (interval > 0)
+      this.interval =3D configuration.getReplQueueInterval();
+      this.max_elements =3D configuration.getReplQueueMaxElements();
+      // check again
+      enabled =3D configuration.isUseReplQueue() && (configuration.getBudd=
yReplicationConfig() =3D=3D null || !configuration.getBuddyReplicationConfi=
g().isEnabled());
+      if (enabled)
       {
-         if (task =3D=3D null)
-            task =3D new MyTask();
-         if (timer =3D=3D null)
+         if (interval > 0)
          {
-            timer =3D new Timer(true);
-            timer.schedule(task,
-                  500, // delay before initial flush
-                  interval); // interval between flushes
+            if (task =3D=3D null)
+               task =3D new MyTask();
+            if (timer =3D=3D null)
+            {
+               timer =3D new Timer(true);
+               timer.schedule(task,
+                     500, // delay before initial flush
+                     interval); // interval between flushes
+            }
          }
       }
    }
@@ -129,6 +107,7 @@
    /**
     * Stops the asynchronous flush queue.
     */
+   @Stop
    public synchronized void stop()
    {
       if (task !=3D null)
@@ -178,7 +157,7 @@
          try
          {
             // send to all live nodes in the cluster
-            cache.getRPCManager().callRemoteMethods(null, MethodCallFactor=
y.create(MethodDeclarations.replicateAllMethod_id, l), false, true, 5000);
+            rpcManager.callRemoteMethods(null, MethodCallFactory.create(Me=
thodDeclarations.replicateAllMethod_id, l), false, true, 5000);
          }
          catch (Throwable t)
          {

Modified: core/trunk/src/main/java/org/jboss/cache/buddyreplication/BuddyMa=
nager.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/java/org/jboss/cache/buddyreplication/BuddyManager.=
java	2008-01-17 15:22:36 UTC (rev 5160)
+++ core/trunk/src/main/java/org/jboss/cache/buddyreplication/BuddyManager.=
java	2008-01-17 22:34:36 UTC (rev 5161)
@@ -240,7 +240,6 @@
       }
    }
 =

-   // For now, this is initialised MANUALLY from CacheImpl.internalStart()
    public void init() throws CacheException
    {
       log.debug("Starting BuddyManager");

Modified: core/trunk/src/main/java/org/jboss/cache/factories/ComponentRegis=
try.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/java/org/jboss/cache/factories/ComponentRegistry.ja=
va	2008-01-17 15:22:36 UTC (rev 5160)
+++ core/trunk/src/main/java/org/jboss/cache/factories/ComponentRegistry.ja=
va	2008-01-17 22:34:36 UTC (rev 5161)
@@ -107,6 +107,7 @@
       s.add(LockTableFactory.class);
       s.add(RuntimeConfigAwareFactory.class);
       s.add(TransactionManagerFactory.class);
+      s.add(ReplicationQueueFactory.class);
       return s;
    }
 =


Modified: core/trunk/src/main/java/org/jboss/cache/factories/EmptyConstruct=
orFactory.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/java/org/jboss/cache/factories/EmptyConstructorFact=
ory.java	2008-01-17 15:22:36 UTC (rev 5160)
+++ core/trunk/src/main/java/org/jboss/cache/factories/EmptyConstructorFact=
ory.java	2008-01-17 22:34:36 UTC (rev 5161)
@@ -19,7 +19,9 @@
  * @author Manik Surtani (<a href=3D"mailto:manik(a)jboss.org">manik(a)jbo=
ss.org</a>)
  * @since 2.1.0
  */
-(a)DefaultFactoryFor(classes =3D {StateTransferManager.class, TransactionT=
able.class, RegionManager.class, Notifier.class, CacheMessageListener.class=
, CacheLoaderManager.class, RemoteCacheInvocationDelegate.class, Marshaller=
.class, InvocationContextContainer.class})
+(a)DefaultFactoryFor(classes =3D {StateTransferManager.class, TransactionT=
able.class, RegionManager.class, Notifier.class,
+      CacheMessageListener.class, CacheLoaderManager.class, RemoteCacheInv=
ocationDelegate.class, Marshaller.class,
+      InvocationContextContainer.class})
 public class EmptyConstructorFactory extends ComponentFactory
 {
    @Override

Modified: core/trunk/src/main/java/org/jboss/cache/factories/InterceptorCha=
inFactory.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/java/org/jboss/cache/factories/InterceptorChainFact=
ory.java	2008-01-17 15:22:36 UTC (rev 5160)
+++ core/trunk/src/main/java/org/jboss/cache/factories/InterceptorChainFact=
ory.java	2008-01-17 22:34:36 UTC (rev 5161)
@@ -106,7 +106,10 @@
 =

 =

       call_interceptor =3D createInterceptor(CallInterceptor.class);
+      // load the icInterceptor first
+      first =3D setFirstInterceptor(invocationCtxInterceptor);
 =

+
       if (isUsingBuddyReplication()) dataGravitatorInterceptor =3D createI=
nterceptor(DataGravitatorInterceptor.class);
 =

       lock_interceptor =3D createInterceptor(PessimisticLockInterceptor.cl=
ass);
@@ -145,144 +148,45 @@
          }
       }
 =

-      // load the icInterceptor first
-      if (first =3D=3D null) first =3D invocationCtxInterceptor;
-
       // load the cache management interceptor next
       if (configuration.getExposeManagementStatistics())
       {
-         if (first =3D=3D null)
-         {
-            first =3D cacheMgmtInterceptor;
-         }
-         else
-         {
-            addInterceptor(first, cacheMgmtInterceptor);
-         }
+         addInterceptor(first, cacheMgmtInterceptor);
       }
 =

       // load the tx interceptor
-      if (first =3D=3D null)
-      {
-         first =3D txInterceptor;
-      }
-      else
-      {
-         addInterceptor(first, txInterceptor);
-      }
+      addInterceptor(first, txInterceptor);
 =

-      if (first =3D=3D null)
-         first =3D notificationInterceptor;
-      else
-         addInterceptor(first, notificationInterceptor);
+      addInterceptor(first, notificationInterceptor);
 =

-      if (repl_interceptor !=3D null)
-      {
-         if (first =3D=3D null)
-         {
-            first =3D repl_interceptor;
-         }
-         else
-         {
-            addInterceptor(first, repl_interceptor);
-         }
-      }
+      if (repl_interceptor !=3D null) addInterceptor(first, repl_intercept=
or);
 =

-      if (first =3D=3D null)
-      {
-         first =3D lock_interceptor;
-      }
-      else
-      {
-         addInterceptor(first, lock_interceptor);
-      }
+      addInterceptor(first, lock_interceptor);
 =

 =

-      if (unlock_interceptor !=3D null)
-      {
-         if (first =3D=3D null)
-         {
-            first =3D unlock_interceptor;
-         }
-         else
-         {
-            addInterceptor(first, unlock_interceptor);
-         }
-      }
+      if (unlock_interceptor !=3D null) addInterceptor(first, unlock_inter=
ceptor);
 =

       if (activation_interceptor !=3D null)
       {
-         if (first =3D=3D null)
-         {
-            first =3D activation_interceptor;
-         }
-         else
-         {
-            addInterceptor(first, activation_interceptor);
-         }
-         if (first =3D=3D null)
-         {
-            first =3D passivation_interceptor;
-         }
-         else
-         {
-            addInterceptor(first, passivation_interceptor);
-         }
+         addInterceptor(first, activation_interceptor);
+         addInterceptor(first, passivation_interceptor);
       }
 =

       if (cache_loader_interceptor !=3D null)
       {
-         if (first =3D=3D null)
-         {
-            first =3D cache_loader_interceptor;
-         }
-         else
-         {
-            addInterceptor(first, cache_loader_interceptor);
-         }
-         if (first =3D=3D null)
-         {
-            first =3D cache_store_interceptor;
-         }
-         else
-         {
-            addInterceptor(first, cache_store_interceptor);
-         }
+         addInterceptor(first, cache_loader_interceptor);
+         addInterceptor(first, cache_store_interceptor);
       }
 =

-      if (dataGravitatorInterceptor !=3D null)
-      {
-         if (first =3D=3D null)
-         {
-            first =3D dataGravitatorInterceptor;
-         }
-         else
-         {
-            addInterceptor(first, dataGravitatorInterceptor);
-         }
-      }
+      if (dataGravitatorInterceptor !=3D null) addInterceptor(first, dataG=
ravitatorInterceptor);
 =

       if (configuration.getEvictionConfig() !=3D null && configuration.get=
EvictionConfig().isValidConfig())
       {
          eviction_interceptor =3D createInterceptor(EvictionInterceptor.cl=
ass);
-         if (first =3D=3D null)
-         {
-            first =3D eviction_interceptor;
-         }
-         else
-         {
-            addInterceptor(first, eviction_interceptor);
-         }
+         addInterceptor(first, eviction_interceptor);
       }
 =

-      if (first =3D=3D null)
-      {
-         first =3D call_interceptor;
-      }
-      else
-      {
-         addInterceptor(first, call_interceptor);
-      }
+      addInterceptor(first, call_interceptor);
 =

       return setLastInterceptorPointer(first, call_interceptor);
    }
@@ -306,6 +210,10 @@
       Interceptor invocationCtxInterceptor =3D createInterceptor(Invocatio=
nContextInterceptor.class);
       Interceptor notificationInterceptor =3D createInterceptor(Notificati=
onInterceptor.class);
 =

+      // load the icInterceptor first
+      first =3D setFirstInterceptor(invocationCtxInterceptor);
+
+
       if (isUsingCacheLoaders())
       {
          if (configuration.getCacheLoaderConfig().isPassivation())
@@ -353,193 +261,81 @@
          evictionInterceptor =3D createInterceptor(EvictionInterceptor.cla=
ss);
       }
 =

-      if (first =3D=3D null) first =3D invocationCtxInterceptor;
-
       if (configuration.getExposeManagementStatistics())
       {
          cacheMgmtInterceptor =3D createInterceptor(CacheMgmtInterceptor.c=
lass);
-         if (first =3D=3D null)
-         {
-            first =3D cacheMgmtInterceptor;
-         }
-         else
-         {
-            addInterceptor(first, cacheMgmtInterceptor);
-         }
+         addInterceptor(first, cacheMgmtInterceptor);
       }
 =

       if (txInterceptor !=3D null)
       {
-         if (first =3D=3D null)
-         {
-            first =3D txInterceptor;
-         }
-         else
-         {
-            addInterceptor(first, txInterceptor);
-         }
+         addInterceptor(first, txInterceptor);
       }
 =

-      if (first =3D=3D null)
-         first =3D notificationInterceptor;
-      else
-         addInterceptor(first, notificationInterceptor);
+      addInterceptor(first, notificationInterceptor);
 =

-      if (first =3D=3D null)
-      {
-         first =3D replicationInterceptor;
-      }
-      else
-      {
-         addInterceptor(first, replicationInterceptor);
-      }
+      addInterceptor(first, replicationInterceptor);
 =

       if (passivationInterceptor !=3D null && !configuration.getCacheLoade=
rConfig().isFetchPersistentState())
       {
-         if (first =3D=3D null)
-         {
-            first =3D passivationInterceptor;
-         }
-         else
-         {
-            addInterceptor(first, passivationInterceptor);
-         }
+         addInterceptor(first, passivationInterceptor);
       }
 =

       // add the cache store interceptor here
       if (cacheStoreInterceptor !=3D null && !configuration.getCacheLoader=
Config().isFetchPersistentState())
       {
-         if (first =3D=3D null)
-         {
-            first =3D cacheStoreInterceptor;
-         }
-         else
-         {
-            addInterceptor(first, cacheStoreInterceptor);
-         }
+         addInterceptor(first, cacheStoreInterceptor);
       }
 =

       // cache loader interceptor is only invoked if we are ready to write=
 to the actual tree cache
       if (activationInterceptor !=3D null)
       {
-         if (first =3D=3D null)
-         {
-            first =3D activationInterceptor;
-         }
-         else
-         {
-            addInterceptor(first, activationInterceptor);
-         }
+         addInterceptor(first, activationInterceptor);
 =

          if (configuration.getCacheLoaderConfig().isFetchPersistentState())
          {
-            if (first =3D=3D null)
-            {
-               first =3D passivationInterceptor;
-            }
-            else
-            {
-               addInterceptor(first, passivationInterceptor);
-            }
+            addInterceptor(first, passivationInterceptor);
          }
       }
 =

       if (cacheLoaderInterceptor !=3D null)
       {
-         if (first =3D=3D null)
-         {
-            first =3D cacheLoaderInterceptor;
-         }
-         else
-         {
-            addInterceptor(first, cacheLoaderInterceptor);
-         }
+         addInterceptor(first, cacheLoaderInterceptor);
 =

          if (configuration.getCacheLoaderConfig().isFetchPersistentState())
          {
-            if (first =3D=3D null)
-            {
-               first =3D cacheStoreInterceptor;
-            }
-            else
-            {
-               addInterceptor(first, cacheStoreInterceptor);
-            }
+            addInterceptor(first, cacheStoreInterceptor);
          }
       }
 =

       if (dataGravitatorInterceptor !=3D null)
       {
-         if (first =3D=3D null)
-         {
-            first =3D dataGravitatorInterceptor;
-         }
-         else
-         {
-            addInterceptor(first, dataGravitatorInterceptor);
-         }
+         addInterceptor(first, dataGravitatorInterceptor);
       }
 =

 =

-      if (first =3D=3D null)
-      {
-         first =3D lockInterceptor;
-      }
-      else
-      {
-         addInterceptor(first, lockInterceptor);
-      }
+      addInterceptor(first, lockInterceptor);
 =

-      if (first =3D=3D null)
-      {
-         first =3D validationInterceptor;
-      }
-      else
-      {
-         addInterceptor(first, validationInterceptor);
-      }
+      addInterceptor(first, validationInterceptor);
+      addInterceptor(first, createIfNotExistsInterceptor);
 =

-      if (first =3D=3D null)
-      {
-         first =3D createIfNotExistsInterceptor;
-      }
-      else
-      {
-         addInterceptor(first, createIfNotExistsInterceptor);
-      }
-
       // eviction interceptor to come before the optimistic node intercept=
or
-      if (first =3D=3D null)
-      {
-         first =3D evictionInterceptor;
-      }
-      else
-      {
-         addInterceptor(first, evictionInterceptor);
-      }
+      addInterceptor(first, evictionInterceptor);
 =

-      if (first =3D=3D null)
-      {
-         first =3D nodeInterceptor;
-      }
-      else
-      {
-         addInterceptor(first, nodeInterceptor);
-      }
+      addInterceptor(first, nodeInterceptor);
 =

+      addInterceptor(first, invokerInterceptor);
 =

-      if (first =3D=3D null)
-      {
-         first =3D invokerInterceptor;
-      }
-      else
-      {
-         addInterceptor(first, invokerInterceptor);
-      }
-
       return setLastInterceptorPointer(first, invokerInterceptor);
    }
 =

+   public Interceptor setFirstInterceptor(Interceptor i)
+   {
+      componentRegistry.registerComponent(Interceptor.class.getName(), i, =
Interceptor.class);
+      return i;
+   }
+
+
    public static List<Interceptor> asList(Interceptor interceptor)
    {
       if (interceptor =3D=3D null)

Added: core/trunk/src/main/java/org/jboss/cache/factories/ReplicationQueueF=
actory.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/java/org/jboss/cache/factories/ReplicationQueueFact=
ory.java	                        (rev 0)
+++ core/trunk/src/main/java/org/jboss/cache/factories/ReplicationQueueFact=
ory.java	2008-01-17 22:34:36 UTC (rev 5161)
@@ -0,0 +1,29 @@
+package org.jboss.cache.factories;
+
+import org.jboss.cache.ReplicationQueue;
+import org.jboss.cache.config.Configuration;
+import org.jboss.cache.factories.annotations.DefaultFactoryFor;
+
+/**
+ * RPCManager factory
+ *
+ * @author Manik Surtani (<a href=3D"mailto:manik(a)jboss.org">manik(a)jbo=
ss.org</a>)
+ * @since 2.1.0
+ */
+(a)DefaultFactoryFor(classes =3D ReplicationQueue.class)
+public class ReplicationQueueFactory extends EmptyConstructorFactory
+{
+   @Override
+   public <T> T construct(String componentName, Class<T> componentType)
+   {
+      if ((configuration.getCacheMode() =3D=3D Configuration.CacheMode.REP=
L_ASYNC || configuration.getCacheMode() =3D=3D Configuration.CacheMode.INVA=
LIDATION_ASYNC)
+            && configuration.isUseReplQueue())
+      {
+         return super.construct(componentName, componentType);
+      }
+      else
+      {
+         return null;
+      }
+   }
+}
\ No newline at end of file

Modified: core/trunk/src/main/java/org/jboss/cache/interceptors/BaseRpcInte=
rceptor.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/java/org/jboss/cache/interceptors/BaseRpcIntercepto=
r.java	2008-01-17 15:22:36 UTC (rev 5160)
+++ core/trunk/src/main/java/org/jboss/cache/interceptors/BaseRpcIntercepto=
r.java	2008-01-17 22:34:36 UTC (rev 5161)
@@ -6,6 +6,7 @@
 import org.jboss.cache.CacheSPI;
 import org.jboss.cache.InvocationContext;
 import org.jboss.cache.RPCManager;
+import org.jboss.cache.ReplicationQueue;
 import org.jboss.cache.buddyreplication.BuddyManager;
 import org.jboss.cache.config.Configuration.CacheMode;
 import org.jboss.cache.config.Option;
@@ -32,11 +33,13 @@
    private RPCManager rpcManager;
    private boolean usingBuddyReplication;
    protected boolean defaultSynchronous;
+   private ReplicationQueue replicationQueue;
 =

    @Inject
-   private void injectComponents(RPCManager rpcManager, BuddyManager buddy=
Manager)
+   private void injectComponents(RPCManager rpcManager, BuddyManager buddy=
Manager, ReplicationQueue replicationQueue)
    {
       this.rpcManager =3D rpcManager;
+      this.replicationQueue =3D replicationQueue;
       this.buddyManager =3D buddyManager;
       usingBuddyReplication =3D buddyManager !=3D null && buddyManager.isE=
nabled();
    }
@@ -95,7 +98,7 @@
             else if (te.isForceSyncReplication()) sync =3D true;
          }
       }
-      if (!sync && rpcManager.getReplicationQueue() !=3D null && !usingBud=
dyReplication)
+      if (!sync && replicationQueue !=3D null && !usingBuddyReplication)
       {
          putCallOnAsyncReplicationQueue(call);
       }
@@ -130,7 +133,7 @@
    protected void putCallOnAsyncReplicationQueue(MethodCall call)
    {
       if (log.isDebugEnabled()) log.debug("Putting call " + call + " on th=
e replication queue.");
-      rpcManager.getReplicationQueue().add(MethodCallFactory.create(Method=
Declarations.replicateMethod_id, call));
+      replicationQueue.add(MethodCallFactory.create(MethodDeclarations.rep=
licateMethod_id, call));
    }
 =

    //todo info expt for this is InvocationContext, move method there

Modified: core/trunk/src/main/java/org/jboss/cache/interceptors/InvocationC=
ontextInterceptor.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/java/org/jboss/cache/interceptors/InvocationContext=
Interceptor.java	2008-01-17 15:22:36 UTC (rev 5160)
+++ core/trunk/src/main/java/org/jboss/cache/interceptors/InvocationContext=
Interceptor.java	2008-01-17 22:34:36 UTC (rev 5161)
@@ -37,7 +37,7 @@
       boolean resumeSuspended =3D false;
 =

       if (trace)
-         log.trace("Invoked on cache instance [" + cache.getLocalAddress()=
 + "] and InvocationContext [" + ctx + "]");
+         log.trace("Invoked with InvocationContext [" + ctx + "]");
 =

       if (MethodDeclarations.isBlockUnblockMethod(call.getMethodId())) ret=
urn nextInterceptor(ctx);
 =


Modified: core/trunk/src/main/java/org/jboss/cache/invocation/CacheInvocati=
onDelegate.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/java/org/jboss/cache/invocation/CacheInvocationDele=
gate.java	2008-01-17 15:22:36 UTC (rev 5160)
+++ core/trunk/src/main/java/org/jboss/cache/invocation/CacheInvocationDele=
gate.java	2008-01-17 22:34:36 UTC (rev 5161)
@@ -202,16 +202,6 @@
       return cache.getInternalFqns();
    }
 =

-   public void fetchPartialState(List<Address> members, Fqn subtreeRoot) t=
hrows Exception
-   {
-      cache.fetchPartialState(members, subtreeRoot);
-   }
-
-   public void fetchPartialState(List<Address> members, Fqn subtreeRoot, F=
qn integrationPoint) throws Exception
-   {
-      cache.fetchPartialState(members, subtreeRoot, integrationPoint);
-   }
-
    public int getNumberOfLocksHeld()
    {
       return cache.getNumberOfLocksHeld();
@@ -307,12 +297,12 @@
 =

    public Address getLocalAddress()
    {
-      return cache.getLocalAddress();
+      return rpcManager.getLocalAddress();
    }
 =

    public List<Address> getMembers()
    {
-      return cache.getMembers();
+      return rpcManager.getMembers();
    }
 =

    public String getVersion()

Modified: core/trunk/src/main/java/org/jboss/cache/lock/LockUtil.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/java/org/jboss/cache/lock/LockUtil.java	2008-01-17 =
15:22:36 UTC (rev 5160)
+++ core/trunk/src/main/java/org/jboss/cache/lock/LockUtil.java	2008-01-17 =
22:34:36 UTC (rev 5161)
@@ -2,9 +2,7 @@
 =

 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.jboss.cache.CacheImpl;
 import org.jboss.cache.Node;
-import org.jboss.cache.NodeSPI;
 import org.jboss.cache.statetransfer.StateTransferManager;
 import org.jboss.cache.transaction.GlobalTransaction;
 import org.jboss.cache.transaction.TransactionTable;
@@ -12,7 +10,6 @@
 import javax.transaction.Status;
 import javax.transaction.Transaction;
 import javax.transaction.TransactionManager;
-import java.util.Iterator;
 =

 public abstract class LockUtil
 {
@@ -26,11 +23,8 @@
    public static boolean breakTransactionLock(NodeLock lock,
                                               GlobalTransaction gtx,
                                               boolean localTx,
-                                              CacheImpl cache)
+                                              TransactionTable tx_table, T=
ransactionManager tm)
    {
-      TransactionTable tx_table =3D cache.getTransactionTable();
-      TransactionManager tm =3D cache.getTransactionManager();
-
       boolean broken =3D false;
       int tryCount =3D 0;
       int lastStatus =3D TransactionLockStatus.STATUS_BROKEN;
@@ -55,89 +49,6 @@
    }
 =

    /**
-    * Forcibly acquire a read lock on the given node for the given owner,
-    * breaking any existing locks that prevent the read lock.  If the
-    * existing lock is held by a GlobalTransaction, breaking the lock may
-    * result in a rollback of the transaction.
-    *
-    * @param node         the node
-    * @param newOwner     the new owner (usually a Thread or GlobalTransac=
tion)
-    * @param lockChildren <code>true</code> if this method should be recur=
sively
-    *                     applied to <code>node</code>'s children.
-    */
-   public static void forceAcquireLock(NodeSPI<?, ?> node,
-                                       Object newOwner,
-                                       CacheImpl cache,
-                                       boolean lockChildren)
-   {
-
-      NodeLock lock =3D node.getLock();
-      boolean acquired =3D lock.isOwner(newOwner);
-
-      if (!acquired && log.isDebugEnabled())
-      {
-         log.debug("Force acquiring lock on node " + node.getFqn());
-      }
-
-      TransactionTable tx_table =3D cache.getTransactionTable();
-      TransactionManager tm =3D cache.getTransactionManager();
-      Object localAddress =3D cache.getLocalAddress();
-      boolean serializable =3D cache.getConfiguration().getIsolationLevel(=
) =3D=3D IsolationLevel.SERIALIZABLE;
-
-      while (!acquired)
-      {
-         Object curOwner =3D null;
-         boolean attempted =3D false;
-
-         // Keep breaking write locks until we acquire a read lock
-         // or there are no more write locks
-         while (!acquired && ((curOwner =3D lock.getWriterOwner()) !=3D nu=
ll))
-         {
-            acquired =3D acquireLockFromOwner(node, lock, curOwner, newOwn=
er, tx_table, tm, localAddress);
-            attempted =3D true;
-         }
-
-         // If no more write locks, but we haven't acquired, see if we
-         // need to break read locks as well.
-         if (!acquired && serializable)
-         {
-            Iterator it =3D lock.getReaderOwners().iterator();
-            if (it.hasNext())
-            {
-               curOwner =3D it.next();
-               acquired =3D acquireLockFromOwner(node, lock, curOwner, new=
Owner, tx_table, tm, localAddress);
-               attempted =3D true;
-               // Don't keep iterating due to the risk of
-               // ConcurrentModificationException if readers are removed
-               // Just go back through our outer loop to get the nextInter=
ceptor one
-            }
-         }
-
-         if (!acquired && !attempted)
-         {
-            // We only try to acquire above if someone else has the lock.
-            // Seems no one is holding a lock and it's there for the takin=
g.
-            try
-            {
-               acquired =3D lock.acquire(newOwner, 1, NodeLock.LockType.RE=
AD);
-            }
-            catch (Exception ignored)
-            {
-            }
-         }
-      }
-
-      // Recursively unlock children
-      if (lockChildren)
-      {
-         for (NodeSPI n : node.getChildrenDirect())
-         {
-            forceAcquireLock(n, newOwner, cache, true);
-         }
-      }
-   }
-
-   /**
     * Attempts to acquire a read lock on <code>node</code> for
     * <code>newOwner</code>, if necessary breaking locks held by
     * <code>curOwner</code>.
@@ -158,7 +69,7 @@
       if (log.isTraceEnabled())
       {
          log.trace("Attempting to acquire lock for node " + node.getFqn() +
-                   " from owner " + curOwner);
+               " from owner " + curOwner);
       }
 =

       boolean acquired =3D false;
@@ -192,7 +103,7 @@
          if (broken && log.isTraceEnabled())
          {
             log.trace("Broke lock for node " + node.getFqn() +
-                      " held by owner " + curOwner);
+                  " held by owner " + curOwner);
          }
 =

          try
@@ -266,7 +177,7 @@
                      if (log.isTraceEnabled())
                      {
                         log.trace("Attempting to break transaction lock he=
ld " +
-                                  " by " + gtx + " by rolling back local t=
x");
+                              " by " + gtx + " by rolling back local tx");
                      }
                      // This thread has to join the tx
                      tm.resume(tx);
@@ -315,8 +226,8 @@
                      if (log.isTraceEnabled())
                      {
                         log.trace("Attempting to break transaction lock he=
ld " +
-                                  "by " + gtx + " by marking local tx as "=
 +
-                                  "rollback-only");
+                              "by " + gtx + " by marking local tx as " +
+                              "rollback-only");
                      }
                      tx.setRollbackOnly();
                      break;
@@ -349,7 +260,7 @@
          // Race condition; gtx was cleared from tx_table.
          // Just double check if gtx still holds a lock
          if (gtx =3D=3D lock.getWriterOwner()
-             || lock.getReaderOwners().contains(gtx))
+               || lock.getReaderOwners().contains(gtx))
          {
             // TODO should we throw an exception??
             lock.release(gtx);

Modified: core/trunk/src/test/java/org/jboss/cache/api/CacheSPITest.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/test/java/org/jboss/cache/api/CacheSPITest.java	2008-01-=
17 15:22:36 UTC (rev 5160)
+++ core/trunk/src/test/java/org/jboss/cache/api/CacheSPITest.java	2008-01-=
17 22:34:36 UTC (rev 5161)
@@ -89,8 +89,8 @@
       Configuration conf1 =3D UnitTestCacheConfigurationFactory.createConf=
iguration(CacheMode.REPL_SYNC);
       Configuration conf2 =3D UnitTestCacheConfigurationFactory.createConf=
iguration(CacheMode.REPL_SYNC);
 =

-      cache1 =3D (CacheSPI<Object, Object>) new DefaultCacheFactory().crea=
teCache(conf1, false);
-      cache2 =3D (CacheSPI<Object, Object>) new DefaultCacheFactory().crea=
teCache(conf2, false);
+      cache1 =3D (CacheSPI<Object, Object>) new DefaultCacheFactory<Object=
, Object>().createCache(conf1, false);
+      cache2 =3D (CacheSPI<Object, Object>) new DefaultCacheFactory<Object=
, Object>().createCache(conf2, false);
 =

       cache1.start();
       assertTrue("Cache1 is coordinator", cache1.getRPCManager().isCoordin=
ator());

Modified: core/trunk/src/test/java/org/jboss/cache/api/NodeAPITest.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/test/java/org/jboss/cache/api/NodeAPITest.java	2008-01-1=
7 15:22:36 UTC (rev 5160)
+++ core/trunk/src/test/java/org/jboss/cache/api/NodeAPITest.java	2008-01-1=
7 22:34:36 UTC (rev 5161)
@@ -28,7 +28,7 @@
  * @author <a href=3D"mailto:manik(a)jboss.org">Manik Surtani</a>
  * @since 2.0.0
  */
-(a)Test(groups =3D {"functional"})
+(a)Test(groups =3D "functional")
 public class NodeAPITest
 {
    private Node<Object, Object> rootNode;

Modified: core/trunk/src/test/java/org/jboss/cache/api/pfer/PutForExternalR=
eadTestBase.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/test/java/org/jboss/cache/api/pfer/PutForExternalReadTes=
tBase.java	2008-01-17 15:22:36 UTC (rev 5160)
+++ core/trunk/src/test/java/org/jboss/cache/api/pfer/PutForExternalReadTes=
tBase.java	2008-01-17 22:34:36 UTC (rev 5161)
@@ -9,7 +9,6 @@
 import org.jboss.cache.Fqn;
 import org.jboss.cache.NodeSPI;
 import org.jboss.cache.RPCManager;
-import org.jboss.cache.RPCManagerImpl;
 import org.jboss.cache.config.Configuration;
 import org.jboss.cache.config.Configuration.CacheMode;
 import org.jboss.cache.factories.UnitTestCacheConfigurationFactory;
@@ -166,11 +165,11 @@
 =

    public void testAsyncForce() throws Exception
    {
-      RPCManager rpcManager =3D EasyMock.createMock(RPCManager.class);
+      RPCManager rpcManager =3D EasyMock.createNiceMock(RPCManager.class);
       RPCManager originalRpcManager =3D cache1.getConfiguration().getRunti=
meConfig().getRPCManager();
-
+      List<Address> memberList =3D originalRpcManager.getMembers();
+      expect(rpcManager.getMembers()).andReturn(memberList).anyTimes();
       // inject a mock RPC manager so that we can test whether calls made =
are sync or async.
-      //cache1.getConfiguration().getRuntimeConfig().setRPCManager(rpcMana=
ger);
       TestingUtil.extractComponentRegistry(cache1).registerComponent(RPCMa=
nager.class.getName(), rpcManager, RPCManager.class);
 =

       // invalidations will not trigger any rpc call sfor PFER
@@ -178,7 +177,6 @@
       {
          // specify what we expect called on the mock Rpc Manager.  For pa=
rams we don't care about, just use ANYTHING.
          // setting the mock object to expect the "sync" param to be false.
-         expect(rpcManager.getReplicationQueue()).andReturn(null);
          expect(rpcManager.callRemoteMethods(anyAddresses(), (MethodCall) =
anyObject(), eq(false), anyBoolean(), anyInt())).andReturn(null);
       }
 =

@@ -233,52 +231,58 @@
          assertEquals("parent fqn tx should have completed", value, cache2=
.get(parentFqn, key));
    }
 =

-   public void testExceptionSuppression()
+   public void testExceptionSuppression() throws Exception
    {
-      RPCManager barfingRpcManager =3D new RPCManagerImpl()
+      RPCManager barfingRpcManager =3D EasyMock.createNiceMock(RPCManager.=
class);
+      RPCManager originalRpcManager =3D cache1.getConfiguration().getRunti=
meConfig().getRPCManager();
+      try
       {
-         @Override
-         public List callRemoteMethods(List<Address> recipients, MethodCal=
l method, boolean synchronous, boolean excludeSelf, int timeout)
-         {
-            throw new RuntimeException("Barf");
-         }
-      };
+         List<Address> memberList =3D originalRpcManager.getMembers();
+         expect(barfingRpcManager.getMembers()).andReturn(memberList).anyT=
imes();
+         expect(barfingRpcManager.getLocalAddress()).andReturn(originalRpc=
Manager.getLocalAddress()).anyTimes();
+         expect(barfingRpcManager.callRemoteMethods(anyAddresses(), (Metho=
dCall) anyObject(), anyBoolean(), anyBoolean(), anyInt())).andThrow(new Run=
timeException("Barf!")).anyTimes();
+         replay(barfingRpcManager);
 =

-      TestingUtil.extractComponentRegistry(cache1).registerComponent(RPCMa=
nager.class.getName(), barfingRpcManager, RPCManager.class);
-      cache1.getConfiguration().getRuntimeConfig().setRPCManager(barfingRp=
cManager);
+         TestingUtil.extractComponentRegistry(cache1).registerComponent(RP=
CManager.class.getName(), barfingRpcManager, RPCManager.class);
+         cache1.getConfiguration().getRuntimeConfig().setRPCManager(barfin=
gRpcManager);
 =

-      try
-      {
-         cache1.put(fqn, key, value);
-         if (!optimistic) fail("Should have barfed");
-      }
-      catch (RuntimeException re)
-      {
-      }
-
-      if (optimistic && !isUsingInvalidation())
-      {
-         // proves that the put did, in fact, barf.  Doesn't work for inva=
lidations since the inability to invalidate will not cause a rollback.
-         assertNull(cache1.get(fqn, key));
-      }
-      else
-      {
-         // clean up any indeterminate state left over
          try
          {
-            cache1.removeNode(fqn);
-            // as above, the inability to invalidate will not cause an exc=
eption
-            if (!isUsingInvalidation()) fail("Should have barfed");
+            cache1.put(fqn, key, value);
+            if (!optimistic) fail("Should have barfed");
          }
          catch (RuntimeException re)
          {
          }
-      }
 =

-      assertNull("Should have cleaned up", cache1.get(fqn, key));
+         if (optimistic && !isUsingInvalidation())
+         {
+            // proves that the put did, in fact, barf.  Doesn't work for i=
nvalidations since the inability to invalidate will not cause a rollback.
+            assertNull(cache1.get(fqn, key));
+         }
+         else
+         {
+            // clean up any indeterminate state left over
+            try
+            {
+               cache1.removeNode(fqn);
+               // as above, the inability to invalidate will not cause an =
exception
+               if (!isUsingInvalidation()) fail("Should have barfed");
+            }
+            catch (RuntimeException re)
+            {
+            }
+         }
 =

-      // should not barf
-      cache1.putForExternalRead(fqn, key, value);
+         assertNull("Should have cleaned up", cache1.get(fqn, key));
+
+         // should not barf
+         cache1.putForExternalRead(fqn, key, value);
+      }
+      finally
+      {
+         TestingUtil.extractComponentRegistry(cache1).registerComponent(RP=
CManager.class.getName(), originalRpcManager, RPCManager.class);
+      }
    }
 =

    public void testBasicPropagation() throws Exception

Modified: core/trunk/src/test/java/org/jboss/cache/misc/TestingUtil.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/test/java/org/jboss/cache/misc/TestingUtil.java	2008-01-=
17 15:22:36 UTC (rev 5160)
+++ core/trunk/src/test/java/org/jboss/cache/misc/TestingUtil.java	2008-01-=
17 22:34:36 UTC (rev 5161)
@@ -283,7 +283,7 @@
     */
    public static boolean isCacheViewComplete(CacheImpl cache, int memberCo=
unt)
    {
-      List members =3D cache.getMembers();
+      List members =3D cache.getRPCManager().getMembers();
       if (members =3D=3D null || memberCount > members.size())
       {
          return false;
@@ -292,7 +292,7 @@
       {
          // This is an exceptional condition
          StringBuffer sb =3D new StringBuffer("Cache at address ");
-         sb.append(cache.getLocalAddress());
+         sb.append(cache.getRPCManager().getLocalAddress());
          sb.append(" had ");
          sb.append(members.size());
          sb.append(" members; expecting ");


--===============7319962786292016519==--

From jbosscache-commits at lists.jboss.org Thu Jan 17 19:08:00 2008
Content-Type: multipart/mixed; boundary="===============5621226199647637522=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r5162 - in
 benchmarks/benchmark-fwk/trunk: doc and 2 other directories.
Date: Thu, 17 Jan 2008 19:08:00 -0500
Message-ID: <E1JFem8-0002fm-2f@committer01.frg.pub.inap.atl.jboss.com>

--===============5621226199647637522==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: mircea.markus
Date: 2008-01-17 19:07:59 -0500 (Thu, 17 Jan 2008)
New Revision: 5162

Removed:
   benchmarks/benchmark-fwk/trunk/doc/CacheReport.txt
   benchmarks/benchmark-fwk/trunk/doc/ExceptionHandling.txt
   benchmarks/benchmark-fwk/trunk/doc/TestTypes.txt
Modified:
   benchmarks/benchmark-fwk/trunk/conf/cachebench.xml
   benchmarks/benchmark-fwk/trunk/doc/Documentation.txt
   benchmarks/benchmark-fwk/trunk/doc/TODO.txt
   benchmarks/benchmark-fwk/trunk/src/org/cachebench/tests/SessionSimulator=
Test.java
   benchmarks/benchmark-fwk/trunk/src/org/cachebench/tests/simpletests/Asso=
ciationsTest.java
   benchmarks/benchmark-fwk/trunk/src/org/cachebench/tests/simpletests/Cust=
omClassTest.java
   benchmarks/benchmark-fwk/trunk/src/org/cachebench/tests/simpletests/Prim=
itiveTest.java
   benchmarks/benchmark-fwk/trunk/src/org/cachebench/tests/simpletests/Simp=
leTest.java
   benchmarks/benchmark-fwk/trunk/src/org/cachebench/tests/simpletests/Stat=
icsTest.java
   benchmarks/benchmark-fwk/trunk/src/org/cachebench/tests/simpletests/Stri=
ngTest.java
   benchmarks/benchmark-fwk/trunk/src/org/cachebench/tests/simpletests/Subc=
lassTest.java
   benchmarks/benchmark-fwk/trunk/src/org/cachebench/tests/simpletests/Tran=
sientTest.java
Log:
commented and cleaned up

Modified: benchmarks/benchmark-fwk/trunk/conf/cachebench.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- benchmarks/benchmark-fwk/trunk/conf/cachebench.xml	2008-01-17 22:34:36 =
UTC (rev 5161)
+++ benchmarks/benchmark-fwk/trunk/conf/cachebench.xml	2008-01-18 00:07:59 =
UTC (rev 5162)
@@ -1,7 +1,7 @@
 <!--
 	Configures and controls the behaviour of the cache benchmarking framework.
 =

-   TODO - sample size is test specific, moove it to the test that use it r=
ather than having it here
+   TODO - sample size is test specific, move it to the test that uses it r=
ather than having it here
 	sampleSize -  this is the number of putsgets to be performed, an average =
is used in metrics.
 	gcBetweenTestsEnabled - if true, the framework pauses between each test a=
nd requests System.gc() - use this if you find yourself running out of mem!
 	sleepBetweenTests - ms to sleep between tests.  useful to allow the JVM s=
ome time to do a gc
@@ -14,9 +14,7 @@
    <!--
          There are various steps we want to start executing at once: e.g. =
all the tests should start at the same time,
       otherwise (part of) cluster operations do not replicate on all insta=
nces. We configure here one socket addresses
-      on each tested node, so that the framework can communicate with all =
the nodes and sync whenever needed.
-         - bindAddress can be used on a multi-homed host for a ServerSocke=
t that will only accept connect requests to one
-         of its addresses
+      on each cluster node, so that the framework can communicate with all=
 the nodes and barrier whenever needed.
          - for each node instance socket address is specified. You can mak=
e sure that addresses are available by using
          checkClusterAddresses ant target =

    -->
@@ -32,9 +30,10 @@
       <member host=3D"cluster09" port=3D"17900"/> =

    </cluster>
 =

-   <!-- Each testcase represents either a single configuration or a cachei=
ng product.
-   For example, WhirlyCache would be one test case. JBossCache-standalone =
could be another, JBossCache-replicated could be yet another
-      testcase::stopOnFailure if set to true and one test in this testcase=
 fails then the process will exit
+   <!--
+     Locagically groups multiple tests.
+     param stopOnFailre : if true and one of the tests fails unexpectedly =
then the fwk will not run any other tests in
+                          testcase. By default set to true.
    -->
 =

     <testcase name=3D"WebSessionReplicationTest" stopOnFailure=3D"true">
@@ -61,7 +60,7 @@
       -->
        <!--<test name=3D"Strings" testClass=3D"org.cachebench.tests.simple=
tests.StringTest" weight=3D"2.0" />-->
        =

-       <test name=3D"Strings" testClass=3D"org.cachebench.tests.SessionSim=
ulatorTest" weight=3D"2.0" >
+       <test name=3D"SessionSimulator" testClass=3D"org.cachebench.tests.S=
essionSimulatorTest" weight=3D"2.0" >
           <param name=3D"numberOfRequest" value=3D"100000"/>
           <param name=3D"numberOfAttributes" value=3D"100"/>
           <param name=3D"writePercentage" value=3D"20"/>

Deleted: benchmarks/benchmark-fwk/trunk/doc/CacheReport.txt
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- benchmarks/benchmark-fwk/trunk/doc/CacheReport.txt	2008-01-17 22:34:36 =
UTC (rev 5161)
+++ benchmarks/benchmark-fwk/trunk/doc/CacheReport.txt	2008-01-18 00:07:59 =
UTC (rev 5162)
@@ -1,50 +0,0 @@
-This document describes the report generated by the Bech marker.
-
-The Release 1 of the tool only supports a CSV report with the following fi=
elds.
-
-TEST NAME
-The name of the cache product that has been tested. This maps to the testc=
ase/name of the cachebench.xml (The cach bechmarker configuration file).
-
-TEST DATE
-The time stamp of a test that has been executed.
-
-TEST TYPE
-The test that has been executed. This maps to the testcase/test/name of th=
e cachebench.xml (The cach bechmarker configuration file).
-
-MEAN PUT TIME
-The statistical average on the PUT time on specified test. The average is =
based on the number of tests specified in the cachebench/sampleSize of the =
cachebench.xml (The cach bechmarker configuration file).
-This statistic would help you identify the average time a prodcut takes to=
 perform a specific action for a given number of iterations and an anticipa=
ted load.
-
-MEAN GET TIME
-The statistical average on the GET time on specified test. The average is =
based on the number of tests specified in the cachebench/sampleSize of the =
cachebench.xml (The cach bechmarker configuration file).
-This statistic would help you identify the average time a prodcut takes to=
 perform a specific action for a given number of iterations and an anticipa=
ted load.
-
-MEDIAN PUT TIME
-The mid point of the PUT actions done on a specific test. The number of pu=
ts are based on the number specified in the cachebench/sampleSize of the ca=
chebench.xml (The cach bechmarker configuration file).
-This statistic would give a sense of the mid point of the series of times =
a particular action took on a specific test.
-
-MEDIAN GET TIME
-The mid point of the GET actions done on a specific test. The number of pu=
ts are based on the number specified in the cachebench/sampleSize of the ca=
chebench.xml (The cach bechmarker configuration file).
-This statistic would give a sense of the mid point of the series of times =
a particular action took on a specific test.
-
-STANDARD DEVIATION PUT TIME
-This is the stadard deviation of the times taken to perform the PUT operat=
ion for a specific test.
-This statistic helps understand the variability of the diffrent times take=
n to perform the PUT operations for the test.
-With a high standard deviation it shows that the the variability between t=
he times are high, and by that gives a sense of how well the test has perfo=
rmed with growing data.
-
-STANDARD DEVIATION GET TIME
-This is the stadard deviation of the times taken to perform the GET operat=
ion for a specific test.
-This statistic helps understand the variability of the diffrent times take=
n to perform the GET operations for the test.
-With a high standard deviation it shows that the the variability between t=
he times are high, and by that gives a sense of how well the test has perfo=
rmed with growing data.
-
-MAX PUT TIME
-This is the maximum PUT time that a test has taken during its iteration of=
 actions. The iterations depend on the cachebench/sampleSize specifed in th=
e cachebench.xml (The cach bechmarker configuration file).
-
-MAX GET TIME
-This is the maximum GET time that a test has taken during its iteration of=
 actions. The iterations depend on the cachebench/sampleSize specifed in th=
e cachebench.xml (The cach bechmarker configuration file).
-
-MIN PUT TIME
-This is the minimum PUT time that a test has taken during its iteration of=
 actions. The iterations depend on the cachebench/sampleSize specifed in th=
e cachebench.xml (The cach bechmarker configuration file).
-
-MAX GET TIME
-This is the minimum GET time that a test has taken during its iteration of=
 actions. The iterations depend on the cachebench/sampleSize specifed in th=
e cachebench.xml (The cach bechmarker configuration file).

Modified: benchmarks/benchmark-fwk/trunk/doc/Documentation.txt
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- benchmarks/benchmark-fwk/trunk/doc/Documentation.txt	2008-01-17 22:34:3=
6 UTC (rev 5161)
+++ benchmarks/benchmark-fwk/trunk/doc/Documentation.txt	2008-01-18 00:07:5=
9 UTC (rev 5162)
@@ -1,101 +1 @@
-Wrappers:
-=3D=3D=3D=3D=3D=3D=3D=3D=3D
-The goal of the CacheBenchFwk is to provide a harness which can test indiv=
idual caching products in a repeatable way and
-provide statistics to bechmark different caching products
-
-The framework is a simple set of wrappers around each cache product, each =
wrapper implementing the org.cachebench.
-CacheWrapper interface, to provide the framework with a standard way of ac=
cessing the cache's functionality.
-Some wrappers are in the org.cachebench.cachewrappers package.  We expect =
to have more wrappers here for specific
-caching products, and expect end users to create their own cache wrappers =
if necessary.
-
-A wrapper could be implemented in two ways:
- - Serializable
- - Non-serializable
-
-Serializable:
-Certain cache products, provide only serializable values to be processed i=
n cache. Thus, implementing
-a wrapper for such cache product, the SerializableCacheWrapper needs to be=
 implemented.
-
-Non-serializable:
-For Cache products that allow values which are non-serializable to be proc=
essed in cache, the CacheWrapper
-should be implemented.
-
-The cachebench.xml (The configuration file for the framework)
-=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
-The CacheBenchFwk is configured, entirely on the cachebench.xml. The xml p=
rovides the means to handle:
- - The tests that needs to be performed, and what product should be tested.
- - Provides additional information for the framework such as periodic brea=
ks in the cache operations, cache size etc.
- - Provides the means in configurating the report
-
-Following are the details of the different nodes and attributes of the cac=
hebench.xml:
-<cachebench>
-This is the root node of the xml.
-:sampleSize
-  - Integer value
-  - This indicates the maximum size of the cahce to be tested.
-:gcBetweenTestsEnabled
-
-:sleepBetweenTests
-
-:emptyCacheBetweenTests
-
-<testcase>
-This node holds the information about the tests that needs to be executed.=
 It would contain a collection of <test> nodes
-(which would explained further) and general test information that would de=
scribe the type of test that should be executed.
-:name
-  - String value
-  - This holds the name of the product under test
-:cacheWrapper
-  - String value
-  - This holds the fully qualified class name of the wrapper of the produc=
t under test (Ref: Documentation on wrappers)
-<test>
-This node defines the individual test to be executed. The name and class o=
f the test would be indicated here, for the
-framework to execute them.
-:name
-  - String value
-  - The name of the test to be executed.
-:testClass
-  - String value
-  - The fully qualified class name of the test class which will be execute=
d by the framework. (Ref: Documentation on Test types)
-:weight
-  - Double value
-  - This is the importance each test would be given by the framework. This=
 is yet to be implemented TODO.
-<test>
-<param>
-This node gives the means in adding any configurable attributes that might=
 be needed by different cache products.
-:name
-  - String value
-  - The name of the configurable parameter
-:value
-  - String value
-  - The value of the configurable parameter
-</param>
-</testcase>
-
-<report>
-This node defines the report that would be generated by the framework once=
 the tests are executed.
-:outputFile
-  - String value
-  - The file name of the report to be generated. The full path needs to be=
 indicated here.
-:generator
-  - String value
-  - The fully qualified class name of the report warpper used for the repo=
rt generation purpose (Ref: Documentation on Reports)
-</report>
-</cachebench>
-
-Running clustered tests
-=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
-
-There is some rudimentary support for clustered tests at the moment, with =
some limitations:
-
-1.  Only master/slave type tests are supported, where one node performs al=
l the cache puts and gets and performance is
-measured on this master node.  The other nodes just act as dummies which p=
articipate in the cluster by acting as recipients
-for network traffic.
-
-2.  Only one <testcase> element at a time is supported if using this setup=
.  Slaves will barf if configured to deal with
-more than one test case.
-
-3.  Slaves need to be started manually on each host using the runSlave.sh =
script.
-
-4.  Master nodes have no "intelligence" to wait for a specified number of =
slaves.  This needs to be done manually, by
-starting the required number of slaves before starting the master.
+http://wiki.jboss.org/wiki/Wiki.jsp?page=3DCacheBenchmarkFramework
\ No newline at end of file

Deleted: benchmarks/benchmark-fwk/trunk/doc/ExceptionHandling.txt
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- benchmarks/benchmark-fwk/trunk/doc/ExceptionHandling.txt	2008-01-17 22:=
34:36 UTC (rev 5161)
+++ benchmarks/benchmark-fwk/trunk/doc/ExceptionHandling.txt	2008-01-18 00:=
07:59 UTC (rev 5162)
@@ -1,15 +0,0 @@
-Exception Handling in the CacheBenchMarking Framework:
-
-This piece of documentation captures the exception handling mechanism in t=
he framework.
-In shows whats in the respective release. Unless otherwise the current rel=
ease of the framework doesn't have any specific
-notes in this documentation, the notes for previous release is applicable =
to the current.
-
-Release 1:
-The only exception dealt with within the framework is the java.lang.Except=
ion.
-Given the avaible functionality and features there hasn't been any need to=
 add framework specific exceptions. We'd get to framework
-specific exception only if the needs arises.
-All Exceptions are handled at only one level to avoid catching-rethrowing =
complexities. Thus, the CacheBenchMarker, which is the entry
-point to the framework hanldes all expcetions and logs them in the relevan=
t log files and appends them to the report as required.
-All exceptions with their detailed stack trace are logged in the applicati=
on's log file defined in the log4j configuration file.
-However, the exceptions occured while executing tests, are tracked separat=
ely as test results and added to the report. Also the exceptions
-that are generated by the external tasks that take place during the test e=
xecution are reported as foot notes to the report.

Modified: benchmarks/benchmark-fwk/trunk/doc/TODO.txt
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- benchmarks/benchmark-fwk/trunk/doc/TODO.txt	2008-01-17 22:34:36 UTC (re=
v 5161)
+++ benchmarks/benchmark-fwk/trunk/doc/TODO.txt	2008-01-18 00:07:59 UTC (re=
v 5162)
@@ -1,22 +1,4 @@
-$Id: TODO.txt,v 1.1 2007/03/13 16:25:15 msurtani Exp $
-The following lists out the featues in their order of priority (High prior=
ity --> Low)
-
-1. Add the cache size to the report. Cache size would be measured as the n=
umber of objects in the cache initially.
-This would give a method of comparing the put and get times respective to =
the number of objects in the cache. The number
-of objects would be hard-coded when this feature is completed.
-
-2. Add object count in to the configuration file
-This would give the user a method of configuring the number of objects tha=
t he/she wishes to see going into the cache.
-
-3. A way to customize a complex object that coule be used as the object th=
at goes in and out to the cache.
-This is to give the user a method of creating his/her own complex object d=
eclared in XML, which he could use to be used
-in the above load test. The user can indicate the number of attributes and=
 type of the attributes for the field.
-Thus giving the user define the test objects apart from the default test o=
bjects we have.
-
-4. Tag the gcBetweenTestsEnabled with a object count, so that different VM=
 parameters coule be tried out when
-benchmarking the chaching systems.
-
-5. Add a feature in the report that shows the object size in bytes.
-This would need some work.
-
-6.  Proper agent-based replicated tests where each node in the cluster is =
stressed.
+1) delegate the build of specific products to the cache-products/specific-=
product. Also
+2) make the replication test to run BEFORE warmup
+3) conf/config.xml sample size is test specific, move it to the test that =
uses it rather than having it in the cachebench element
+4) add a target for generating javadoc

Deleted: benchmarks/benchmark-fwk/trunk/doc/TestTypes.txt
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- benchmarks/benchmark-fwk/trunk/doc/TestTypes.txt	2008-01-17 22:34:36 UT=
C (rev 5161)
+++ benchmarks/benchmark-fwk/trunk/doc/TestTypes.txt	2008-01-18 00:07:59 UT=
C (rev 5162)
@@ -1,46 +0,0 @@
-Test Types:
-=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
-The framework provides some simple tests, in org.cachewrapper.tests.  Agai=
n, we expect users to write their own tests =

-such as to mimic their cache usage scenarios to provide a useful benchmark=
 of cache products, based on their usage scenarios.
-
-Following is a list of Tests provided by the Cache Benchmark Framework:
-
-- String Test
-This is a simple test of adding and getting java.lang.String objects in an=
d out of the cache.
-
-- Primitive Test
-This is a simple test of adding and getting java.lang.Integer objects in a=
nd out of the cache.
-
-- Custom Class Test
-This is a test on the time taken to add and get a custom object to and fro=
m the cache.
-There are two differnet custom objects that could be used based on the wra=
pper in use. If the wrapper is a serializable
-wrapper, then the SerializableCustomType object would be used. If the wrap=
per is not a serializable wrapper, then
-CustomType object would be used.
-Refer JavaDocs for SerializableCustomType and CustomType class structures.
-
-- Associations Test
-This is a test on the time taken to add and get a custom object to and fro=
m the cache with aggregated objects within it.
-There are two differnet custom objects that could be used based on the wra=
pper in use. If the wrapper is a serializable
-wrapper, then the SerializableCustomTypeWithAssocs object would be used. I=
f the wrapper is not a serializable wrapper, then
-CustomTypeWithAssocs object would be used.
-Refer JavaDocs for SerializableCustomTypeWithAssocs and CustomTypeWithAsso=
cs class structures.
-
-- Statics Test
-This is a test on the time taken to add and get a custom object to and fro=
m the cache with aggregated static objects within it.
-There are two differnet custom objects that could be used based on the wra=
pper in use. If the wrapper is a serializable
-wrapper, then the SerializableCustomTypeWithStatics object would be used. =
If the wrapper is not a serializable wrapper, then
-CustomTypeWithStatics object would be used.
-Refer JavaDocs for SerializableCustomTypeWithStatics and CustomTypeWithSta=
tics class structures.
-
-- Subclass Test
-This is a test on the time taken to add and get a object to and from the c=
ache with. The object under test in this instance,
-would be a sub class. Which means it would be inheriting from a parent and=
 would have a additional attributes which will go in the Cache.
-There two different sub class tests that would be done based on the wrappe=
r in use. If the wrapper is a Serializable,
-then the SerializableCustomTypeSubclassOfAbstract object would be used. If=
 the wrapper is not serializable, then
-the CustomTypeSubclassOfAbstract object would be used.
-
-- Transient Test
-This is a test on the time taken to add and get a object to and from the c=
ache with Transient objects. The object under test
-in this instance would be a Object which consists of transient objects. Th=
e type of object under test would also differ based
-on the wrapper in use. Thus if the wrapper in use is Serializable, the Ser=
ializableCustomTypeWithTransient object would be used.
-Else if the wrapper is not serializable, the CustomTypeWithTransient objec=
t would be used.

Modified: benchmarks/benchmark-fwk/trunk/src/org/cachebench/tests/SessionSi=
mulatorTest.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- benchmarks/benchmark-fwk/trunk/src/org/cachebench/tests/SessionSimulato=
rTest.java	2008-01-17 22:34:36 UTC (rev 5161)
+++ benchmarks/benchmark-fwk/trunk/src/org/cachebench/tests/SessionSimulato=
rTest.java	2008-01-18 00:07:59 UTC (rev 5162)
@@ -12,6 +12,8 @@
 import java.util.Date;
 =

 /**
+ * Simulates work with a web session.
+ * =

  * @author Mircea.Markus(a)jboss.com
  * @since 2.2
  */

Modified: benchmarks/benchmark-fwk/trunk/src/org/cachebench/tests/simpletes=
ts/AssociationsTest.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- benchmarks/benchmark-fwk/trunk/src/org/cachebench/tests/simpletests/Ass=
ociationsTest.java	2008-01-17 22:34:36 UTC (rev 5161)
+++ benchmarks/benchmark-fwk/trunk/src/org/cachebench/tests/simpletests/Ass=
ociationsTest.java	2008-01-18 00:07:59 UTC (rev 5162)
@@ -8,6 +8,12 @@
 =

 =

 /**
+ * This is a test on the time taken to add and get a custom object to and =
from the cache with aggregated objects within it.
+ * There are two differnet custom objects that could be used based on the =
wrapper in use. If the wrapper is a serializable
+ * wrapper, then the SerializableCustomTypeWithAssocs object would be used=
. If the wrapper is not a serializable wrapper, then
+ * CustomTypeWithAssocs object would be used.
+ * Refer JavaDocs for SerializableCustomTypeWithAssocs and CustomTypeWithA=
ssocs class structures.
+ *
  * @author Manik Surtani (manik(a)surtani.org)
  *         (C) Manik Surtani, 2004
  */

Modified: benchmarks/benchmark-fwk/trunk/src/org/cachebench/tests/simpletes=
ts/CustomClassTest.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- benchmarks/benchmark-fwk/trunk/src/org/cachebench/tests/simpletests/Cus=
tomClassTest.java	2008-01-17 22:34:36 UTC (rev 5161)
+++ benchmarks/benchmark-fwk/trunk/src/org/cachebench/tests/simpletests/Cus=
tomClassTest.java	2008-01-18 00:07:59 UTC (rev 5162)
@@ -8,6 +8,11 @@
 =

 =

 /**
+ * This is a test on the time taken to add and get a custom object to and =
from the cache.
+ * There are two differnet custom objects that could be used based on the =
wrapper in use. If the wrapper is a serializable
+ * wrapper, then the SerializableCustomType object would be used. If the w=
rapper is not a serializable wrapper, then
+ * CustomType object would be used.
+ *
  * @author Manik Surtani (manik(a)surtani.org)
  *         (C) Manik Surtani, 2004
  */

Modified: benchmarks/benchmark-fwk/trunk/src/org/cachebench/tests/simpletes=
ts/PrimitiveTest.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- benchmarks/benchmark-fwk/trunk/src/org/cachebench/tests/simpletests/Pri=
mitiveTest.java	2008-01-17 22:34:36 UTC (rev 5161)
+++ benchmarks/benchmark-fwk/trunk/src/org/cachebench/tests/simpletests/Pri=
mitiveTest.java	2008-01-18 00:07:59 UTC (rev 5162)
@@ -5,6 +5,8 @@
 =

 =

 /**
+ * This is a simple test of adding and getting java.lang.Integer objects i=
n and out of the cache.
+ * =

  * @author Manik Surtani (manik(a)surtani.org)
  *         (C) Manik Surtani, 2004
  */

Modified: benchmarks/benchmark-fwk/trunk/src/org/cachebench/tests/simpletes=
ts/SimpleTest.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- benchmarks/benchmark-fwk/trunk/src/org/cachebench/tests/simpletests/Sim=
pleTest.java	2008-01-17 22:34:36 UTC (rev 5161)
+++ benchmarks/benchmark-fwk/trunk/src/org/cachebench/tests/simpletests/Sim=
pleTest.java	2008-01-18 00:07:59 UTC (rev 5162)
@@ -20,6 +20,8 @@
 =

 =

 /**
+ *
+ *
  * @author Manik Surtani (manik(a)surtani.org)
  *         (C) Manik Surtani, 2004
  */

Modified: benchmarks/benchmark-fwk/trunk/src/org/cachebench/tests/simpletes=
ts/StaticsTest.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- benchmarks/benchmark-fwk/trunk/src/org/cachebench/tests/simpletests/Sta=
ticsTest.java	2008-01-17 22:34:36 UTC (rev 5161)
+++ benchmarks/benchmark-fwk/trunk/src/org/cachebench/tests/simpletests/Sta=
ticsTest.java	2008-01-18 00:07:59 UTC (rev 5162)
@@ -8,6 +8,12 @@
 =

 =

 /**
+ * This is a test on the time taken to add and get a custom object to and =
from the cache with aggregated static objects within it.
+ * There are two differnet custom objects that could be used based on the =
wrapper in use. If the wrapper is a serializable
+ * wrapper, then the SerializableCustomTypeWithStatics object would be use=
d. If the wrapper is not a serializable wrapper, then
+ * CustomTypeWithStatics object would be used.
+ * Refer JavaDocs for SerializableCustomTypeWithStatics and CustomTypeWith=
Statics class structures.
+ *
  * @author Manik Surtani (manik(a)surtani.org)
  *         (C) Manik Surtani, 2004
  */

Modified: benchmarks/benchmark-fwk/trunk/src/org/cachebench/tests/simpletes=
ts/StringTest.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- benchmarks/benchmark-fwk/trunk/src/org/cachebench/tests/simpletests/Str=
ingTest.java	2008-01-17 22:34:36 UTC (rev 5161)
+++ benchmarks/benchmark-fwk/trunk/src/org/cachebench/tests/simpletests/Str=
ingTest.java	2008-01-18 00:07:59 UTC (rev 5162)
@@ -5,6 +5,8 @@
 =

 =

 /**
+ * This is a simple test of adding and getting java.lang.String objects in=
 and out of the cache.
+ *
  * @author Manik Surtani (manik(a)surtani.org)
  *         (C) Manik Surtani, 2004
  */

Modified: benchmarks/benchmark-fwk/trunk/src/org/cachebench/tests/simpletes=
ts/SubclassTest.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- benchmarks/benchmark-fwk/trunk/src/org/cachebench/tests/simpletests/Sub=
classTest.java	2008-01-17 22:34:36 UTC (rev 5161)
+++ benchmarks/benchmark-fwk/trunk/src/org/cachebench/tests/simpletests/Sub=
classTest.java	2008-01-18 00:07:59 UTC (rev 5162)
@@ -8,6 +8,12 @@
 =

 =

 /**
+ * This is a test on the time taken to add and get a object to and from th=
e cache with. The object under test in this instance,
+ * would be a sub class. Which means it would be inheriting from a parent =
and would have a additional attributes which will go in the Cache.
+ * There two different sub class tests that would be done based on the wra=
pper in use. If the wrapper is a Serializable,
+ * then the SerializableCustomTypeSubclassOfAbstract object would be used.=
 If the wrapper is not serializable, then
+ * the CustomTypeSubclassOfAbstract object would be used.
+ *
  * @author Manik Surtani (manik(a)surtani.org)
  *         (C) Manik Surtani, 2004
  */

Modified: benchmarks/benchmark-fwk/trunk/src/org/cachebench/tests/simpletes=
ts/TransientTest.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- benchmarks/benchmark-fwk/trunk/src/org/cachebench/tests/simpletests/Tra=
nsientTest.java	2008-01-17 22:34:36 UTC (rev 5161)
+++ benchmarks/benchmark-fwk/trunk/src/org/cachebench/tests/simpletests/Tra=
nsientTest.java	2008-01-18 00:07:59 UTC (rev 5162)
@@ -8,6 +8,11 @@
 =

 =

 /**
+ * This is a test on the time taken to add and get a object to and from th=
e cache with Transient objects. The object under test
+ * in this instance would be a Object which consists of transient objects.=
 The type of object under test would also differ based
+ * on the wrapper in use. Thus if the wrapper in use is Serializable, the =
SerializableCustomTypeWithTransient object would be used.
+ * Else if the wrapper is not serializable, the CustomTypeWithTransient ob=
ject would be used.
+ *
  * @author Manik Surtani (manik(a)surtani.org)
  *         (C) Manik Surtani, 2004
  */
@@ -22,5 +27,4 @@
       return performTestWithObjectType(testName, cache, cache instanceof S=
erializableCacheWrapper ? SerializableCustomTypeWithTransient.class : Custo=
mTypeWithTransient.class, testCaseName, sampleSize, numThreads);
 =

    }
-
 }


--===============5621226199647637522==--

From jboss-qa-internal at redhat.com Fri Jan 18 08:22:01 2008
Content-Type: multipart/mixed; boundary="===============4142528391809646291=="
MIME-Version: 1.0
From: jboss-qa-internal at redhat.com
To: jbosscache-commits at lists.jboss.org
Subject: =?utf-8?q?=5Bjbosscache-commits=5D_Build_failed_in_Hudson=3A_jboss-cache-?=
 =?utf-8?q?core-jdk1=2E5_=C2=BB_JBoss_Cache_-_Core_Edition_=23230?=
Date: Fri, 18 Jan 2008 08:21:59 -0500
Message-ID: <6355179.3571200662519424.JavaMail.hudson@dev45.qa.atl2.redhat.com>

--===============4142528391809646291==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

See https://hudson.jboss.org/hudson/job/jboss-cache-core-jdk1.5/org.jboss.c=
ache$jbosscache-core/230/changes

Changes:

[manik.surtani(a)jboss.com] Refactored RPCManager and CacheImpl so that the=
 channel is now created and owned solely by the RPCManager

------------------------------------------
[...truncated 72114 lines...]
-------------------------------------------------------

-------------------------------------------------------
GMS: address is 127.0.0.1:60718
-------------------------------------------------------
*** Finished setUp()
*** In tearDown()
*** Finished tearDown()
*** In setUp()

-------------------------------------------------------
GMS: address is 127.0.0.1:60719
-------------------------------------------------------

-------------------------------------------------------
GMS: address is 127.0.0.1:60720
-------------------------------------------------------
*** Finished setUp()
*** In tearDown()
*** Finished tearDown()
Tests run: 3, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 16.884 sec
Running org.jboss.cache.options.SuppressLockingTest (of functional)
Tests run: 4, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 1.288 sec
Running org.jboss.cache.transaction.IsolationLevelReadCommittedNodeCreation=
RollbackTest (of functional)
Writing /a/1
writing a2
rolling back
first thread exits
Prevented from writing a2 -- Unable to acquire lock on child node /a/a afte=
r 10000 millis.
second thread exits
Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 11.079 sec
Running org.jboss.cache.eviction.LRUPolicyTest (of functional)
-- wakeupInterval is 5000
-- nodes/locks: 6/3
-- nodes/locks: 1048/3
-- nodes/locks: 2646/3
-- nodes/locks: 4404/3
-- nodes/locks: 5766/3
-- nodes/locks: 7695/3
-- nodes/locks: 9998/3
-- nodes/locks: 13659/3
-- nodes/locks: 16778/3
-- nodes/locks: 15426/3
-- nodes/locks: 14604/3
-- wakeupInterval is 5000
REGIONS: 	Region RegionImpl{fqn=3D/org/jboss/data; classloader=3Dnull; stat=
us=3DACTIVE; eviction=3Dtrue; timerThreadRegistered=3Dtrue}
	Region RegionImpl{fqn=3D/; classloader=3Dnull; status=3DACTIVE; eviction=
=3Dtrue; timerThreadRegistered=3Dtrue}
	Region RegionImpl{fqn=3D/test; classloader=3Dnull; status=3DACTIVE; evicti=
on=3Dtrue; timerThreadRegistered=3Dtrue}
	Region RegionImpl{fqn=3D/maxAgeTest; classloader=3Dnull; status=3DACTIVE; =
eviction=3Dtrue; timerThreadRegistered=3Dtrue}
	Region RegionImpl{fqn=3D/org/jboss/test/data; classloader=3Dnull; status=
=3DACTIVE; eviction=3Dtrue; timerThreadRegistered=3Dtrue}

-- sleeping for 3000ms
-- sleeping for 3000ms
-- sleeping for 3000ms
-- val=3Dnull
-- val=3D/org/jboss/test/data/7
-- sleeping for 6000ms
-- val=3Dnull
-- wakeupInterval is 5000
-- wakeupInterval is 5000
***************************** marking as in-use
-- wakeupInterval is 5000
-- wakeupInterval is 5000
org.jboss.cache.CacheImpl [14 nodes, 0 locks]
org.jboss.cache.CacheImpl [9 nodes, 0 locks]
-- wakeupInterval is 5000
-- wakeupInterval is 5000
-- period is 3000
Tests run: 8, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 101.914 sec
Running org.jboss.cache.multiplexer.ChannelInjectionPreferenceTest (of func=
tional)

-------------------------------------------------------
GMS: address is 127.0.0.1:60716
-------------------------------------------------------
Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 3.577 sec
Running org.jboss.cache.transaction.IsolationLevelRepeatableReadTest (of fu=
nctional)
reader thread exits
writer thread exits
Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 1.791 sec
Running org.jboss.cache.factories.InterceptorChainFactoryTest (of functiona=
l)
testTxConfig interceptors are:
[org.jboss.cache.interceptors.InvocationContextInterceptor{next: class org.=
jboss.cache.interceptors.TxInterceptor; last: class org.jboss.cache.interce=
ptors.CallInterceptor}, org.jboss.cache.interceptors.TxInterceptor{next: cl=
ass org.jboss.cache.interceptors.NotificationInterceptor; last: class org.j=
boss.cache.interceptors.CallInterceptor}, org.jboss.cache.interceptors.Noti=
ficationInterceptor{next: class org.jboss.cache.interceptors.PessimisticLoc=
kInterceptor; last: class org.jboss.cache.interceptors.CallInterceptor}, or=
g.jboss.cache.interceptors.PessimisticLockInterceptor{next: class org.jboss=
.cache.interceptors.UnlockInterceptor; last: class org.jboss.cache.intercep=
tors.CallInterceptor}, org.jboss.cache.interceptors.UnlockInterceptor{next:=
 class org.jboss.cache.interceptors.CallInterceptor; last: class org.jboss.=
cache.interceptors.CallInterceptor}, org.jboss.cache.interceptors.CallInter=
ceptor{next: null; last: class org.jboss.cache.interceptors.CallInterceptor=
}]
testBareConfig interceptors are:
[org.jboss.cache.interceptors.InvocationContextInterceptor{next: class org.=
jboss.cache.interceptors.TxInterceptor; last: class org.jboss.cache.interce=
ptors.CallInterceptor}, org.jboss.cache.interceptors.TxInterceptor{next: cl=
ass org.jboss.cache.interceptors.NotificationInterceptor; last: class org.j=
boss.cache.interceptors.CallInterceptor}, org.jboss.cache.interceptors.Noti=
ficationInterceptor{next: class org.jboss.cache.interceptors.PessimisticLoc=
kInterceptor; last: class org.jboss.cache.interceptors.CallInterceptor}, or=
g.jboss.cache.interceptors.PessimisticLockInterceptor{next: class org.jboss=
.cache.interceptors.UnlockInterceptor; last: class org.jboss.cache.intercep=
tors.CallInterceptor}, org.jboss.cache.interceptors.UnlockInterceptor{next:=
 class org.jboss.cache.interceptors.CallInterceptor; last: class org.jboss.=
cache.interceptors.CallInterceptor}, org.jboss.cache.interceptors.CallInter=
ceptor{next: null; last: class org.jboss.cache.interceptors.CallInterceptor=
}]
testEvictionInterceptorConfig interceptors are:
[org.jboss.cache.interceptors.InvocationContextInterceptor{next: class org.=
jboss.cache.interceptors.CacheMgmtInterceptor; last: class org.jboss.cache.=
interceptors.CallInterceptor}, org.jboss.cache.interceptors.CacheMgmtInterc=
eptor{next: class org.jboss.cache.interceptors.TxInterceptor; last: class o=
rg.jboss.cache.interceptors.CallInterceptor}, org.jboss.cache.interceptors.=
TxInterceptor{next: class org.jboss.cache.interceptors.NotificationIntercep=
tor; last: class org.jboss.cache.interceptors.CallInterceptor}, org.jboss.c=
ache.interceptors.NotificationInterceptor{next: class org.jboss.cache.inter=
ceptors.OptimisticReplicationInterceptor; last: class org.jboss.cache.inter=
ceptors.CallInterceptor}, org.jboss.cache.interceptors.OptimisticReplicatio=
nInterceptor{next: class org.jboss.cache.interceptors.DataGravitatorInterce=
ptor; last: class org.jboss.cache.interceptors.CallInterceptor}, org.jboss.=
cache.interceptors.DataGravitatorInterceptor{next: class org.jboss.cache.in=
terceptors.OptimisticLockingInterceptor; last: class org.jboss.cache.interc=
eptors.CallInterceptor}, org.jboss.cache.interceptors.OptimisticLockingInte=
rceptor{next: class org.jboss.cache.interceptors.OptimisticValidatorInterce=
ptor; last: class org.jboss.cache.interceptors.CallInterceptor}, org.jboss.=
cache.interceptors.OptimisticValidatorInterceptor{next: class org.jboss.cac=
he.interceptors.OptimisticCreateIfNotExistsInterceptor; last: class org.jbo=
ss.cache.interceptors.CallInterceptor}, org.jboss.cache.interceptors.Optimi=
sticCreateIfNotExistsInterceptor{next: class org.jboss.cache.interceptors.O=
ptimisticNodeInterceptor; last: class org.jboss.cache.interceptors.CallInte=
rceptor}, org.jboss.cache.interceptors.OptimisticNodeInterceptor{next: clas=
s org.jboss.cache.interceptors.CallInterceptor; last: class org.jboss.cache=
.interceptors.CallInterceptor}, org.jboss.cache.interceptors.CallIntercepto=
r{next: null; last: class org.jboss.cache.interceptors.CallInterceptor}]
testEvictionInterceptorConfig interceptors are:
[org.jboss.cache.interceptors.InvocationContextInterceptor{next: class org.=
jboss.cache.interceptors.CacheMgmtInterceptor; last: class org.jboss.cache.=
interceptors.CallInterceptor}, org.jboss.cache.interceptors.CacheMgmtInterc=
eptor{next: class org.jboss.cache.interceptors.TxInterceptor; last: class o=
rg.jboss.cache.interceptors.CallInterceptor}, org.jboss.cache.interceptors.=
TxInterceptor{next: class org.jboss.cache.interceptors.NotificationIntercep=
tor; last: class org.jboss.cache.interceptors.CallInterceptor}, org.jboss.c=
ache.interceptors.NotificationInterceptor{next: class org.jboss.cache.inter=
ceptors.PessimisticLockInterceptor; last: class org.jboss.cache.interceptor=
s.CallInterceptor}, org.jboss.cache.interceptors.PessimisticLockInterceptor=
{next: class org.jboss.cache.interceptors.UnlockInterceptor; last: class or=
g.jboss.cache.interceptors.CallInterceptor}, org.jboss.cache.interceptors.U=
nlockInterceptor{next: class org.jboss.cache.interceptors.EvictionIntercept=
or; last: class org.jboss.cache.interceptors.CallInterceptor}, org.jboss.ca=
che.interceptors.EvictionInterceptor{next: class org.jboss.cache.intercepto=
rs.CallInterceptor; last: class org.jboss.cache.interceptors.CallIntercepto=
r}, org.jboss.cache.interceptors.CallInterceptor{next: null; last: class or=
g.jboss.cache.interceptors.CallInterceptor}]
testEvictionInterceptorConfig interceptors are:
[org.jboss.cache.interceptors.InvocationContextInterceptor{next: class org.=
jboss.cache.interceptors.CacheMgmtInterceptor; last: class org.jboss.cache.=
interceptors.CallInterceptor}, org.jboss.cache.interceptors.CacheMgmtInterc=
eptor{next: class org.jboss.cache.interceptors.TxInterceptor; last: class o=
rg.jboss.cache.interceptors.CallInterceptor}, org.jboss.cache.interceptors.=
TxInterceptor{next: class org.jboss.cache.interceptors.NotificationIntercep=
tor; last: class org.jboss.cache.interceptors.CallInterceptor}, org.jboss.c=
ache.interceptors.NotificationInterceptor{next: class org.jboss.cache.inter=
ceptors.ReplicationInterceptor; last: class org.jboss.cache.interceptors.Ca=
llInterceptor}, org.jboss.cache.interceptors.ReplicationInterceptor{next: c=
lass org.jboss.cache.interceptors.PessimisticLockInterceptor; last: class o=
rg.jboss.cache.interceptors.CallInterceptor}, org.jboss.cache.interceptors.=
PessimisticLockInterceptor{next: class org.jboss.cache.interceptors.UnlockI=
nterceptor; last: class org.jboss.cache.interceptors.CallInterceptor}, org.=
jboss.cache.interceptors.UnlockInterceptor{next: class org.jboss.cache.inte=
rceptors.DataGravitatorInterceptor; last: class org.jboss.cache.interceptor=
s.CallInterceptor}, org.jboss.cache.interceptors.DataGravitatorInterceptor{=
next: class org.jboss.cache.interceptors.CallInterceptor; last: class org.j=
boss.cache.interceptors.CallInterceptor}, org.jboss.cache.interceptors.Call=
Interceptor{next: null; last: class org.jboss.cache.interceptors.CallInterc=
eptor}]
testTxAndRepl interceptors are:
[org.jboss.cache.interceptors.InvocationContextInterceptor{next: class org.=
jboss.cache.interceptors.TxInterceptor; last: class org.jboss.cache.interce=
ptors.CallInterceptor}, org.jboss.cache.interceptors.TxInterceptor{next: cl=
ass org.jboss.cache.interceptors.NotificationInterceptor; last: class org.j=
boss.cache.interceptors.CallInterceptor}, org.jboss.cache.interceptors.Noti=
ficationInterceptor{next: class org.jboss.cache.interceptors.ReplicationInt=
erceptor; last: class org.jboss.cache.interceptors.CallInterceptor}, org.jb=
oss.cache.interceptors.ReplicationInterceptor{next: class org.jboss.cache.i=
nterceptors.PessimisticLockInterceptor; last: class org.jboss.cache.interce=
ptors.CallInterceptor}, org.jboss.cache.interceptors.PessimisticLockInterce=
ptor{next: class org.jboss.cache.interceptors.UnlockInterceptor; last: clas=
s org.jboss.cache.interceptors.CallInterceptor}, org.jboss.cache.intercepto=
rs.UnlockInterceptor{next: class org.jboss.cache.interceptors.CallIntercept=
or; last: class org.jboss.cache.interceptors.CallInterceptor}, org.jboss.ca=
che.interceptors.CallInterceptor{next: null; last: class org.jboss.cache.in=
terceptors.CallInterceptor}]
testUnsharedCacheLoaderConfig interceptors are:
[org.jboss.cache.interceptors.InvocationContextInterceptor{next: class org.=
jboss.cache.interceptors.TxInterceptor; last: class org.jboss.cache.interce=
ptors.CallInterceptor}, org.jboss.cache.interceptors.TxInterceptor{next: cl=
ass org.jboss.cache.interceptors.NotificationInterceptor; last: class org.j=
boss.cache.interceptors.CallInterceptor}, org.jboss.cache.interceptors.Noti=
ficationInterceptor{next: class org.jboss.cache.interceptors.ReplicationInt=
erceptor; last: class org.jboss.cache.interceptors.CallInterceptor}, org.jb=
oss.cache.interceptors.ReplicationInterceptor{next: class org.jboss.cache.i=
nterceptors.PessimisticLockInterceptor; last: class org.jboss.cache.interce=
ptors.CallInterceptor}, org.jboss.cache.interceptors.PessimisticLockInterce=
ptor{next: class org.jboss.cache.interceptors.UnlockInterceptor; last: clas=
s org.jboss.cache.interceptors.CallInterceptor}, org.jboss.cache.intercepto=
rs.UnlockInterceptor{next: class org.jboss.cache.interceptors.CacheLoaderIn=
terceptor; last: class org.jboss.cache.interceptors.CallInterceptor}, org.j=
boss.cache.interceptors.CacheLoaderInterceptor{next: class org.jboss.cache.=
interceptors.CacheStoreInterceptor; last: class org.jboss.cache.interceptor=
s.CallInterceptor}, org.jboss.cache.interceptors.CacheStoreInterceptor{next=
: class org.jboss.cache.interceptors.CallInterceptor; last: class org.jboss=
.cache.interceptors.CallInterceptor}, org.jboss.cache.interceptors.CallInte=
rceptor{next: null; last: class org.jboss.cache.interceptors.CallIntercepto=
r}]
testCacheMgmtConfig interceptors are:
[org.jboss.cache.interceptors.InvocationContextInterceptor{next: class org.=
jboss.cache.interceptors.CacheMgmtInterceptor; last: class org.jboss.cache.=
interceptors.CallInterceptor}, org.jboss.cache.interceptors.CacheMgmtInterc=
eptor{next: class org.jboss.cache.interceptors.TxInterceptor; last: class o=
rg.jboss.cache.interceptors.CallInterceptor}, org.jboss.cache.interceptors.=
TxInterceptor{next: class org.jboss.cache.interceptors.NotificationIntercep=
tor; last: class org.jboss.cache.interceptors.CallInterceptor}, org.jboss.c=
ache.interceptors.NotificationInterceptor{next: class org.jboss.cache.inter=
ceptors.PessimisticLockInterceptor; last: class org.jboss.cache.interceptor=
s.CallInterceptor}, org.jboss.cache.interceptors.PessimisticLockInterceptor=
{next: class org.jboss.cache.interceptors.UnlockInterceptor; last: class or=
g.jboss.cache.interceptors.CallInterceptor}, org.jboss.cache.interceptors.U=
nlockInterceptor{next: class org.jboss.cache.interceptors.CallInterceptor; =
last: class org.jboss.cache.interceptors.CallInterceptor}, org.jboss.cache.=
interceptors.CallInterceptor{next: null; last: class org.jboss.cache.interc=
eptors.CallInterceptor}]
testSharedCacheLoaderConfig interceptors are:
[org.jboss.cache.interceptors.InvocationContextInterceptor{next: class org.=
jboss.cache.interceptors.TxInterceptor; last: class org.jboss.cache.interce=
ptors.CallInterceptor}, org.jboss.cache.interceptors.TxInterceptor{next: cl=
ass org.jboss.cache.interceptors.NotificationInterceptor; last: class org.j=
boss.cache.interceptors.CallInterceptor}, org.jboss.cache.interceptors.Noti=
ficationInterceptor{next: class org.jboss.cache.interceptors.ReplicationInt=
erceptor; last: class org.jboss.cache.interceptors.CallInterceptor}, org.jb=
oss.cache.interceptors.ReplicationInterceptor{next: class org.jboss.cache.i=
nterceptors.PessimisticLockInterceptor; last: class org.jboss.cache.interce=
ptors.CallInterceptor}, org.jboss.cache.interceptors.PessimisticLockInterce=
ptor{next: class org.jboss.cache.interceptors.UnlockInterceptor; last: clas=
s org.jboss.cache.interceptors.CallInterceptor}, org.jboss.cache.intercepto=
rs.UnlockInterceptor{next: class org.jboss.cache.interceptors.CacheLoaderIn=
terceptor; last: class org.jboss.cache.interceptors.CallInterceptor}, org.j=
boss.cache.interceptors.CacheLoaderInterceptor{next: class org.jboss.cache.=
interceptors.CacheStoreInterceptor; last: class org.jboss.cache.interceptor=
s.CallInterceptor}, org.jboss.cache.interceptors.CacheStoreInterceptor{next=
: class org.jboss.cache.interceptors.CallInterceptor; last: class org.jboss=
.cache.interceptors.CallInterceptor}, org.jboss.cache.interceptors.CallInte=
rceptor{next: null; last: class org.jboss.cache.interceptors.CallIntercepto=
r}]
Tests run: 14, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 2.462 sec
Running org.jboss.cache.transaction.SuspendTxTest (of functional)
Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 1.175 sec
Running org.jboss.cache.mgmt.PassivationTest (of functional)
count of misses 0
 DummyInMemoryCacheLoader debug: Getting data for fqn /Europe/Austria =3D n=
ull
 DummyInMemoryCacheLoader debug: Performing exists() on /Europe/Austria
 DummyInMemoryCacheLoader debug: Getting data for fqn /Europe/Poland =3D nu=
ll
 DummyInMemoryCacheLoader debug: Did a put on /Europe/Austria, data is {pop=
ulation=3D8184691, currency=3DEuro, capital=3DVIENNA}
 DummyInMemoryCacheLoader debug: Getting data for fqn /Europe/Austria =3D {=
population=3D8184691, currency=3DEuro, capital=3DVIENNA}
 DummyInMemoryCacheLoader debug: Performing exists() on /Europe/Austria
 DummyInMemoryCacheLoader debug: Calling getChildrenNames on Fqn /Europe/Au=
stria.  Data map =3D {/Europe=3DNode{data=3D{}, fqn=3D/Europe}, /=3DNode{da=
ta=3D{}, fqn=3D/}, /Europe/Austria=3DNode{data=3D{population=3D8184691, cur=
rency=3DEuro, capital=3DVIENNA}, fqn=3D/Europe/Austria}}
 DummyInMemoryCacheLoader debug: Fqn /Europe/Austria has children []
 DummyInMemoryCacheLoader debug: Removing fqn /Europe/Austria
 DummyInMemoryCacheLoader debug: Performing exists() on /Europe/Austria
 DummyInMemoryCacheLoader debug: Removing fqn /Europe/Austria
 DummyInMemoryCacheLoader debug: Performing exists() on /Europe/Austria
 DummyInMemoryCacheLoader debug: Getting data for fqn /Europe/Austria =3D n=
ull
 DummyInMemoryCacheLoader debug: Getting data for fqn /Europe/Austria =3D n=
ull
 DummyInMemoryCacheLoader debug: Getting data for fqn /Europe/Poland =3D nu=
ll
 DummyInMemoryCacheLoader debug: Performing exists() on /Europe/Poland
 DummyInMemoryCacheLoader debug: Performing exists() on /Europe/Poland
 DummyInMemoryCacheLoader debug: Did a put on /Europe/Poland, data is {curr=
ency=3DZloty, capital=3DWarsaw}
 DummyInMemoryCacheLoader debug: Getting data for fqn /Europe/Poland =3D {c=
urrency=3DZloty, capital=3DWarsaw}
 DummyInMemoryCacheLoader debug: Performing exists() on /Europe/Poland
 DummyInMemoryCacheLoader debug: Calling getChildrenNames on Fqn /Europe/Po=
land.  Data map =3D {/Europe/Poland=3DNode{data=3D{currency=3DZloty, capita=
l=3DWarsaw}, fqn=3D/Europe/Poland}, /Europe=3DNode{data=3D{}, fqn=3D/Europe=
}, /=3DNode{data=3D{}, fqn=3D/}}
 DummyInMemoryCacheLoader debug: Fqn /Europe/Poland has children []
 DummyInMemoryCacheLoader debug: Removing fqn /Europe/Poland
 DummyInMemoryCacheLoader debug: Did a put on /Europe/Poland, data is {curr=
ency=3DZloty, capital=3DWarsaw}
 DummyInMemoryCacheLoader debug: Getting data for fqn /Europe/Poland =3D {c=
urrency=3DZloty, capital=3DWarsaw}
 DummyInMemoryCacheLoader debug: Performing exists() on /Europe/Poland
 DummyInMemoryCacheLoader debug: Calling getChildrenNames on Fqn /Europe/Po=
land.  Data map =3D {/Europe/Poland=3DNode{data=3D{currency=3DZloty, capita=
l=3DWarsaw}, fqn=3D/Europe/Poland}, /Europe=3DNode{data=3D{}, fqn=3D/Europe=
}, /=3DNode{data=3D{}, fqn=3D/}}
 DummyInMemoryCacheLoader debug: Fqn /Europe/Poland has children []
 DummyInMemoryCacheLoader debug: Removing fqn /Europe/Poland
Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.9 sec
Running org.jboss.cache.CacheFactoryTest (of functional)

-------------------------------------------------------
GMS: address is 127.0.0.1:60716
-------------------------------------------------------

-------------------------------------------------------
GMS: address is 127.0.0.1:60717
-------------------------------------------------------

-------------------------------------------------------
GMS: address is 127.0.0.1:60718
-------------------------------------------------------

-------------------------------------------------------
GMS: address is 127.0.0.1:60719
-------------------------------------------------------

-------------------------------------------------------
GMS: address is 127.0.0.1:60720
-------------------------------------------------------
Tests run: 8, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 12.586 sec
Running org.jboss.cache.optimistic.NodeInterceptorRemoveKeyValTest (of func=
tional)
Tests run: 3, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 1.339 sec
Running org.jboss.cache.eviction.LFUPolicyTest (of functional)
-- wakeupInterval is 3000
-- sleeping for 3500ms
-- wakeupInterval is 3000
-- nodes/locks: 32/3
-- nodes/locks: 1245/3
-- nodes/locks: 3042/3
-- nodes/locks: 5215/3
-- nodes/locks: 6563/3
-- nodes/locks: 6192/2
-- nodes/locks: 3676/3
-- nodes/locks: 6423/3
-- nodes/locks: 1695/3
-- nodes/locks: 4751/3
-- nodes/locks: 8040/3
-- wakeupInterval is 3000
-- wakeupInterval is 3000
-- period is 3500
Tests run: 4, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 42.263 sec
Running org.jboss.cache.eviction.ElementSizeAlgorithmTest (of functional)
Fqn: /a/b/6 CreateTime: 1200662389099 NodeVisits: 7 ModifiedTime: 120066238=
9099 NumberOfElements: 6 CurrentlyInUse: false
Fqn: /a/b/4 CreateTime: 1200662389099 NodeVisits: 5 ModifiedTime: 120066238=
9099 NumberOfElements: 4 CurrentlyInUse: false
Fqn: /a/b/2 CreateTime: 1200662389099 NodeVisits: 3 ModifiedTime: 120066238=
9099 NumberOfElements: 2 CurrentlyInUse: false
Fqn: /a/b/0 CreateTime: 1200662389099 NodeVisits: 1 ModifiedTime: 120066238=
9099 NumberOfElements: 0 CurrentlyInUse: false
Fqn: /a/b/1 CreateTime: 1200662389099 NodeVisits: 1 ModifiedTime: 120066238=
9099 NumberOfElements: 0 CurrentlyInUse: false
Fqn: /a/b/3 CreateTime: 1200662389099 NodeVisits: 1 ModifiedTime: 120066238=
9099 NumberOfElements: 0 CurrentlyInUse: false
Fqn: /a/b/5 CreateTime: 1200662389099 NodeVisits: 1 ModifiedTime: 120066238=
9099 NumberOfElements: 0 CurrentlyInUse: false
Fqn: /a/b/7 CreateTime: 1200662389099 NodeVisits: 1 ModifiedTime: 120066238=
9099 NumberOfElements: 0 CurrentlyInUse: false
Fqn: /a/b/9 CreateTime: 1200662389099 NodeVisits: 1 ModifiedTime: 120066238=
9099 NumberOfElements: 0 CurrentlyInUse: false
Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.433 sec
Running org.jboss.cache.loader.SharedCacheLoaderTest (of functional)

-------------------------------------------------------
GMS: address is 127.0.0.1:60716
-------------------------------------------------------

-------------------------------------------------------
GMS: address is 127.0.0.1:60717
-------------------------------------------------------
Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 5.986 sec

Results :

Failed tests: =


Tests run: 2482, Failures: 5, Errors: 0, Skipped: 0

[ERROR] There are test failures.
[HUDSON] Recording test results
-----------------------------------------------------
this realm =3D app0.child-container[org.apache.maven.plugins:maven-jar-plug=
in]
urls[0] =3D file:/home/hudson/.m2/repository/org/apache/maven/plugins/maven=
-jar-plugin/2.2/maven-jar-plugin-2.2.jar
urls[1] =3D file:/home/hudson/.m2/repository/org/codehaus/plexus/plexus-uti=
ls/1.1/plexus-utils-1.1.jar
Number of imports: 4
import: org.codehaus.classworlds.Entry(a)4891bb28
import: org.codehaus.classworlds.Entry(a)f8e44ca4
import: org.codehaus.classworlds.Entry(a)c51bc9e7
import: org.codehaus.classworlds.Entry(a)bece5185


this realm =3D plexus.core.maven
Number of imports: 4
import: org.codehaus.classworlds.Entry(a)4891bb28
import: org.codehaus.classworlds.Entry(a)f8e44ca4
import: org.codehaus.classworlds.Entry(a)c51bc9e7
import: org.codehaus.classworlds.Entry(a)bece5185


this realm =3D plexus.core
urls[0] =3D file:/home/hudson/hudson_workspace/maven-interceptor.jar
urls[1] =3D file:/qa/tools/opt/maven-2.0.6/lib/maven-core-2.0.6-uber.jar
Number of imports: 4
import: org.codehaus.classworlds.Entry(a)4891bb28
import: org.codehaus.classworlds.Entry(a)f8e44ca4
import: org.codehaus.classworlds.Entry(a)c51bc9e7
import: org.codehaus.classworlds.Entry(a)bece5185
-----------------------------------------------------
[HUDSON] Archiving /home/hudson/hudson_workspace/workspace/jboss-cache-core=
-jdk1.5/./pom.xml
[INFO] --------------------------------------------------------------------=
----
[ERROR] BUILD ERROR
[INFO] --------------------------------------------------------------------=
----
[INFO] Internal error in the plugin manager executing goal 'org.apache.mave=
n.plugins:maven-jar-plugin:2.2:jar': Unable to find the mojo 'org.apache.ma=
ven.plugins:maven-jar-plugin:2.2:jar' in the plugin 'org.apache.maven.plugi=
ns:maven-jar-plugin'
org/apache/maven/archiver/MavenArchiveConfiguration
[INFO] --------------------------------------------------------------------=
----
[INFO] For more information, run Maven with the -e switch
[INFO] --------------------------------------------------------------------=
----
[INFO] Total time: 112 minutes 11 seconds
[INFO] Finished at: Fri Jan 18 08:21:46 EST 2008
[INFO] Final Memory: 13M/55M
[INFO] --------------------------------------------------------------------=
----
Sending e-mails to: dpospisi(a)redhat.com manik.surtani(a)jboss.com
Build was marked for publishing on https://hudson.jboss.org/hudson/
finished: FAILURE



--===============4142528391809646291==--

From jbosscache-commits at lists.jboss.org Fri Jan 18 09:18:18 2008
Content-Type: multipart/mixed; boundary="===============2705930941986811047=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r5163 - in
 core/trunk/src/test/java/org/jboss/cache: notifications and 1 other
 directory.
Date: Fri, 18 Jan 2008 09:18:18 -0500
Message-ID: <E1JFs30-0002LB-HC@committer01.frg.pub.inap.atl.jboss.com>

--===============2705930941986811047==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: manik.surtani(a)jboss.com
Date: 2008-01-18 09:18:18 -0500 (Fri, 18 Jan 2008)
New Revision: 5163

Modified:
   core/trunk/src/test/java/org/jboss/cache/factories/LateConfigurationTest=
.java
   core/trunk/src/test/java/org/jboss/cache/notifications/RemoteCacheListen=
erTest.java
Log:
Fixed failing tests

Modified: core/trunk/src/test/java/org/jboss/cache/factories/LateConfigurat=
ionTest.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/test/java/org/jboss/cache/factories/LateConfigurationTes=
t.java	2008-01-18 00:07:59 UTC (rev 5162)
+++ core/trunk/src/test/java/org/jboss/cache/factories/LateConfigurationTes=
t.java	2008-01-18 14:18:18 UTC (rev 5163)
@@ -5,6 +5,7 @@
 import org.jboss.cache.Fqn;
 import org.jboss.cache.config.BuddyReplicationConfig;
 import org.jboss.cache.config.CacheLoaderConfig;
+import org.jboss.cache.config.Configuration;
 import org.jboss.cache.interceptors.OptimisticLockingInterceptor;
 import org.jboss.cache.loader.DummyInMemoryCacheLoader;
 import org.jboss.cache.marshall.AbstractMarshaller;
@@ -79,8 +80,24 @@
       assert c.getCacheLoaderManager().getCacheLoader() instanceof DummyIn=
MemoryCacheLoader;
    }
 =

+   public void testBuddyManagerLocal()
+   {
+      // leaving cache mode as local
+      assert c.getBuddyManager() =3D=3D null;
+
+      BuddyReplicationConfig brc =3D new BuddyReplicationConfig();
+      brc.setEnabled(true);
+      c.getConfiguration().setBuddyReplicationConfig(brc);
+
+      c.start();
+      assert c.getBuddyManager() !=3D null;
+      assert !c.getBuddyManager().isEnabled();
+   }
+
    public void testBuddyManager()
    {
+      // we need to not be LOCAL if we want things to work with BR!
+      c.getConfiguration().setCacheMode(Configuration.CacheMode.REPL_SYNC);
       assert c.getBuddyManager() =3D=3D null;
 =

       BuddyReplicationConfig brc =3D new BuddyReplicationConfig();
@@ -92,6 +109,7 @@
       assert c.getBuddyManager().isEnabled();
    }
 =

+
    public void testInterceptors()
    {
       assert TestingUtil.findInterceptor(c, OptimisticLockingInterceptor.c=
lass) =3D=3D null;

Modified: core/trunk/src/test/java/org/jboss/cache/notifications/RemoteCach=
eListenerTest.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/test/java/org/jboss/cache/notifications/RemoteCacheListe=
nerTest.java	2008-01-18 00:07:59 UTC (rev 5162)
+++ core/trunk/src/test/java/org/jboss/cache/notifications/RemoteCacheListe=
nerTest.java	2008-01-18 14:18:18 UTC (rev 5163)
@@ -122,7 +122,7 @@
       spi2 =3D (CacheSPI) cache2;
 =

       assert spi1.getRPCManager() !=3D spi2.getRPCManager();
-      assert TestingUtil.extractField(spi1.getRPCManager(), "c") !=3D Test=
ingUtil.extractField(spi2.getRPCManager(), "c");
+      assert TestingUtil.extractField(spi1.getRPCManager(), "channel") !=
=3D TestingUtil.extractField(spi2.getRPCManager(), "channel");
    }
 =

    // simple tests first


--===============2705930941986811047==--

From jbosscache-commits at lists.jboss.org Fri Jan 18 09:18:59 2008
Content-Type: multipart/mixed; boundary="===============9137461394799107327=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r5164 - in
 core/trunk/src/main/java/org/jboss/cache: buddyreplication and 1 other
 directory.
Date: Fri, 18 Jan 2008 09:18:58 -0500
Message-ID: <E1JFs3e-0002LP-SX@committer01.frg.pub.inap.atl.jboss.com>

--===============9137461394799107327==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: manik.surtani(a)jboss.com
Date: 2008-01-18 09:18:58 -0500 (Fri, 18 Jan 2008)
New Revision: 5164

Modified:
   core/trunk/src/main/java/org/jboss/cache/CacheImpl.java
   core/trunk/src/main/java/org/jboss/cache/RPCManagerImpl.java
   core/trunk/src/main/java/org/jboss/cache/buddyreplication/BuddyManager.j=
ava
Log:
Optimised a few things

Modified: core/trunk/src/main/java/org/jboss/cache/CacheImpl.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/java/org/jboss/cache/CacheImpl.java	2008-01-18 14:1=
8:18 UTC (rev 5163)
+++ core/trunk/src/main/java/org/jboss/cache/CacheImpl.java	2008-01-18 14:1=
8:58 UTC (rev 5164)
@@ -412,6 +412,9 @@
       }
 =

       // these 2 components need to be started manually since they can onl=
y be started after ALL other components have started.
+      // i.e., rpcManager's start() method may do state transfers.  State =
transfers will rely on the interceptor chain being started.
+      // the interceptor chain cannot start until the rpcManager is starte=
d.  And similarly, the buddyManager relies on the
+      // rpcManager being started.
       if (rpcManager !=3D null) rpcManager.start();
       if (buddyManager !=3D null) buddyManager.init();
 =


Modified: core/trunk/src/main/java/org/jboss/cache/RPCManagerImpl.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/java/org/jboss/cache/RPCManagerImpl.java	2008-01-18=
 14:18:18 UTC (rev 5163)
+++ core/trunk/src/main/java/org/jboss/cache/RPCManagerImpl.java	2008-01-18=
 14:18:58 UTC (rev 5164)
@@ -8,14 +8,12 @@
 =

 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.jboss.cache.buddyreplication.BuddyManager;
 import org.jboss.cache.config.Configuration;
 import org.jboss.cache.config.RuntimeConfig;
 import org.jboss.cache.factories.annotations.ComponentName;
 import org.jboss.cache.factories.annotations.Inject;
 import org.jboss.cache.factories.annotations.Stop;
 import org.jboss.cache.invocation.RemoteCacheInvocationDelegate;
-import org.jboss.cache.loader.CacheLoaderManager;
 import org.jboss.cache.lock.LockUtil;
 import org.jboss.cache.lock.NodeLock;
 import org.jboss.cache.lock.TimeoutException;
@@ -84,27 +82,24 @@
    private Notifier notifier;
    private CacheSPI spi;
    private boolean trace =3D log.isTraceEnabled();
-   private BuddyManager buddyManager;
    private RemoteCacheInvocationDelegate remoteDelegate;
-   private CacheLoaderManager cacheLoaderManager;
    private Marshaller marshaller;
    private TransactionManager txManager;
    private TransactionTable txTable;
 =

+   private boolean isUsingBuddyReplication;
 =

    @Inject
    private void setupDependencies(CacheMessageListener messageListener, Co=
nfiguration configuration,
-                                  Notifier notifier, CacheSPI spi, BuddyMa=
nager buddyManager, Marshaller marshaller,
+                                  Notifier notifier, CacheSPI spi, Marshal=
ler marshaller,
                                   @ComponentName("remoteDelegate")RemoteCa=
cheInvocationDelegate remoteDelegate,
-                                  CacheLoaderManager cacheLoaderManager, T=
ransactionTable txTable, TransactionManager txManager)
+                                  TransactionTable txTable, TransactionMan=
ager txManager)
    {
       this.messageListener =3D messageListener;
       this.configuration =3D configuration;
       this.notifier =3D notifier;
       this.spi =3D spi;
-      this.buddyManager =3D buddyManager;
       this.remoteDelegate =3D remoteDelegate;
-      this.cacheLoaderManager =3D cacheLoaderManager;
       this.marshaller =3D marshaller;
       this.txManager =3D txManager;
       this.txTable =3D txTable;
@@ -112,7 +107,7 @@
 =

    // ------------ START: Lifecycle methods ------------
 =

-   // This is called manually, rather than by using @Start, since it needs=
 to be called AFTER all other components are started.
+   // TODO: This needs to be started manually for now, rather than by @Sta=
rt.  See CacheImpl.internalStart()
 =

    public void start()
    {
@@ -172,6 +167,8 @@
             }
             if (log.isInfoEnabled()) log.info("Cache local address is " + =
getLocalAddress());
       }
+
+      isUsingBuddyReplication =3D configuration.getBuddyReplicationConfig(=
) !=3D null && configuration.getBuddyReplicationConfig().isEnabled();
    }
 =

    public void disconnect()
@@ -222,8 +219,8 @@
     */
    private boolean shouldFetchStateOnStartup()
    {
-      boolean loaderFetch =3D cacheLoaderManager !=3D null && cacheLoaderM=
anager.isFetchPersistentState();
-      return !configuration.isInactiveOnStartup() && buddyManager =3D=3D n=
ull && (configuration.isFetchInMemoryState() || loaderFetch);
+      boolean loaderFetch =3D configuration.getCacheLoaderConfig() !=3D nu=
ll && configuration.getCacheLoaderConfig().isFetchPersistentState();
+      return !configuration.isInactiveOnStartup() && !isUsingBuddyReplicat=
ion && (configuration.isFetchInMemoryState() || loaderFetch);
    }
 =

    private void initialiseChannelAndRpcDispatcher() throws CacheException
@@ -409,8 +406,8 @@
             throw new TimeoutException("State retrieval timed out waiting =
for flush unblock.");
       }
       rsps =3D responseFilter =3D=3D null
-            ? disp.callRemoteMethods(validMembers, methodCall, modeToUse, =
timeout, buddyManager !=3D null && buddyManager.isEnabled())
-            : disp.callRemoteMethods(validMembers, methodCall, modeToUse, =
timeout, buddyManager !=3D null && buddyManager.isEnabled(), false, respons=
eFilter);
+            ? disp.callRemoteMethods(validMembers, methodCall, modeToUse, =
timeout, isUsingBuddyReplication)
+            : disp.callRemoteMethods(validMembers, methodCall, modeToUse, =
timeout, isUsingBuddyReplication, false, responseFilter);
 =

       // a null response is 99% likely to be due to a marshalling problem =
- we throw a NSE, this needs to be changed when
       // JGroups supports http://jira.jboss.com/jira/browse/JGRP-193

Modified: core/trunk/src/main/java/org/jboss/cache/buddyreplication/BuddyMa=
nager.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/java/org/jboss/cache/buddyreplication/BuddyManager.=
java	2008-01-18 14:18:18 UTC (rev 5163)
+++ core/trunk/src/main/java/org/jboss/cache/buddyreplication/BuddyManager.=
java	2008-01-18 14:18:58 UTC (rev 5164)
@@ -32,6 +32,7 @@
 import org.jboss.cache.statetransfer.StateTransferManager;
 import org.jboss.cache.util.ExposedByteArrayOutputStream;
 import org.jboss.cache.util.concurrent.ConcurrentHashSet;
+import org.jboss.cache.util.reflect.ReflectionUtil;
 import org.jboss.util.stream.MarshalledValueInputStream;
 import org.jboss.util.stream.MarshalledValueOutputStream;
 import org.jgroups.Address;
@@ -240,12 +241,28 @@
       }
    }
 =

+   // TODO: This needs to be started manually for now, rather than by @Sta=
rt.  See CacheImpl.internalStart()  =

    public void init() throws CacheException
    {
       log.debug("Starting BuddyManager");
       buddyGroup =3D new BuddyGroup();
       buddyGroup.setDataOwner(cache.getLocalAddress());
-      buddyGroup.setGroupName(getGroupNameFromAddress(cache.getLocalAddres=
s()));
+      Address localAddress =3D rpcManager.getLocalAddress();
+      if (localAddress =3D=3D null)
+      {
+         if (configuration.getCacheMode() =3D=3D Configuration.CacheMode.L=
OCAL)
+         {
+            log.warn("Buddy replication is enabled but cache mode is LOCAL=
 - not starting BuddyManager!");
+            ReflectionUtil.setValue(config, "accessible", true);
+            config.setEnabled(false);
+            return;
+         }
+         else
+         {
+            throw new CacheException("Unable to initialize BuddyManager - =
the RPCManager has not connected to the cluster and local Address is null!"=
);
+         }
+      }
+      buddyGroup.setGroupName(getGroupNameFromAddress(localAddress));
 =

       if (config.getBuddyPoolName() !=3D null)
       {


--===============9137461394799107327==--

From jbosscache-commits at lists.jboss.org Mon Jan 21 09:17:57 2008
Content-Type: multipart/mixed; boundary="===============3740564469567516634=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r5165 -
 core/trunk/src/main/java/org/jboss/cache/factories.
Date: Mon, 21 Jan 2008 09:17:57 -0500
Message-ID: <E1JGxTJ-0000Hf-8y@committer01.frg.pub.inap.atl.jboss.com>

--===============3740564469567516634==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: manik.surtani(a)jboss.com
Date: 2008-01-21 09:17:57 -0500 (Mon, 21 Jan 2008)
New Revision: 5165

Modified:
   core/trunk/src/main/java/org/jboss/cache/factories/InterceptorChainFacto=
ry.java
Log:
Simplified chain construction logic

Modified: core/trunk/src/main/java/org/jboss/cache/factories/InterceptorCha=
inFactory.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/java/org/jboss/cache/factories/InterceptorChainFact=
ory.java	2008-01-18 14:18:58 UTC (rev 5164)
+++ core/trunk/src/main/java/org/jboss/cache/factories/InterceptorChainFact=
ory.java	2008-01-21 14:17:57 UTC (rev 5165)
@@ -77,6 +77,16 @@
    }
 =

    /**
+    * Crates and adds an interceptor at the end of the chain
+    */
+   private void addInterceptor(Interceptor first, Class<? extends Intercep=
tor> clazz) throws IllegalAccessException, InstantiationException
+   {
+      if (first =3D=3D null) return;
+      while (first.getNext() !=3D null) first =3D first.getNext();
+      first.setNext(createInterceptor(clazz));
+   }
+
+   /**
     * Adds an interceptor at the end of the chain
     */
    private void addInterceptor(Interceptor first, Interceptor i)
@@ -88,107 +98,60 @@
 =

    private Interceptor createPessimisticInterceptorChain() throws IllegalA=
ccessException, InstantiationException, ClassNotFoundException
    {
-      Interceptor call_interceptor;
-      Interceptor lock_interceptor;
-      Interceptor repl_interceptor =3D null;
-      Interceptor cache_loader_interceptor =3D null;
-      Interceptor cache_store_interceptor =3D null;
-      Interceptor unlock_interceptor;
-      Interceptor passivation_interceptor =3D null;
-      Interceptor activation_interceptor =3D null;
-      Interceptor cacheMgmtInterceptor;
-      Interceptor txInterceptor;
-      Interceptor eviction_interceptor;
-      Interceptor dataGravitatorInterceptor =3D null;
-      Interceptor invocationCtxInterceptor =3D createInterceptor(Invocatio=
nContextInterceptor.class);
-      Interceptor notificationInterceptor =3D createInterceptor(Notificati=
onInterceptor.class);
-      Interceptor first =3D null;
-
-
-      call_interceptor =3D createInterceptor(CallInterceptor.class);
       // load the icInterceptor first
-      first =3D setFirstInterceptor(invocationCtxInterceptor);
+      Interceptor first =3D setFirstInterceptor(InvocationContextIntercept=
or.class);
 =

+      // load the cache management interceptor next
+      if (configuration.getExposeManagementStatistics()) addInterceptor(fi=
rst, CacheMgmtInterceptor.class);
 =

-      if (isUsingBuddyReplication()) dataGravitatorInterceptor =3D createI=
nterceptor(DataGravitatorInterceptor.class);
+      // load the tx interceptor
+      addInterceptor(first, TxInterceptor.class);
 =

-      lock_interceptor =3D createInterceptor(PessimisticLockInterceptor.cl=
ass);
+      addInterceptor(first, NotificationInterceptor.class);
 =

-      unlock_interceptor =3D createInterceptor(UnlockInterceptor.class);
-
-      cacheMgmtInterceptor =3D createInterceptor(CacheMgmtInterceptor.clas=
s);
-
-      txInterceptor =3D createInterceptor(TxInterceptor.class);
-
       switch (configuration.getCacheMode())
       {
          case REPL_SYNC:
          case REPL_ASYNC:
-            repl_interceptor =3D createInterceptor(ReplicationInterceptor.=
class);
+            addInterceptor(first, ReplicationInterceptor.class);
             break;
          case INVALIDATION_SYNC:
          case INVALIDATION_ASYNC:
-            repl_interceptor =3D createInterceptor(InvalidationInterceptor=
.class);
+            addInterceptor(first, InvalidationInterceptor.class);
             break;
          case LOCAL:
             //Nothing...
       }
 =

+      addInterceptor(first, PessimisticLockInterceptor.class);
+      addInterceptor(first, UnlockInterceptor.class);
+
       if (isUsingCacheLoaders())
       {
          if (configuration.getCacheLoaderConfig().isPassivation())
          {
-            activation_interceptor =3D createInterceptor(ActivationInterce=
ptor.class);
-            passivation_interceptor =3D createInterceptor(PassivationInter=
ceptor.class);
+            addInterceptor(first, ActivationInterceptor.class);
+            addInterceptor(first, PassivationInterceptor.class);
+
          }
          else
          {
-            cache_loader_interceptor =3D createInterceptor(CacheLoaderInte=
rceptor.class);
-            cache_store_interceptor =3D createInterceptor(CacheStoreInterc=
eptor.class);
+            addInterceptor(first, CacheLoaderInterceptor.class);
+            addInterceptor(first, CacheStoreInterceptor.class);
+
          }
       }
 =

-      // load the cache management interceptor next
-      if (configuration.getExposeManagementStatistics())
-      {
-         addInterceptor(first, cacheMgmtInterceptor);
-      }
+      if (isUsingBuddyReplication()) addInterceptor(first, DataGravitatorI=
nterceptor.class);
 =

-      // load the tx interceptor
-      addInterceptor(first, txInterceptor);
-
-      addInterceptor(first, notificationInterceptor);
-
-      if (repl_interceptor !=3D null) addInterceptor(first, repl_intercept=
or);
-
-      addInterceptor(first, lock_interceptor);
-
-
-      if (unlock_interceptor !=3D null) addInterceptor(first, unlock_inter=
ceptor);
-
-      if (activation_interceptor !=3D null)
-      {
-         addInterceptor(first, activation_interceptor);
-         addInterceptor(first, passivation_interceptor);
-      }
-
-      if (cache_loader_interceptor !=3D null)
-      {
-         addInterceptor(first, cache_loader_interceptor);
-         addInterceptor(first, cache_store_interceptor);
-      }
-
-      if (dataGravitatorInterceptor !=3D null) addInterceptor(first, dataG=
ravitatorInterceptor);
-
       if (configuration.getEvictionConfig() !=3D null && configuration.get=
EvictionConfig().isValidConfig())
       {
-         eviction_interceptor =3D createInterceptor(EvictionInterceptor.cl=
ass);
-         addInterceptor(first, eviction_interceptor);
+         addInterceptor(first, EvictionInterceptor.class);
       }
 =

-      addInterceptor(first, call_interceptor);
-
-      return setLastInterceptorPointer(first, call_interceptor);
+      Interceptor callInterceptor =3D createInterceptor(CallInterceptor.cl=
ass);
+      addInterceptor(first, callInterceptor);
+      return setLastInterceptorPointer(first, callInterceptor);
    }
 =

    private boolean isUsingCacheLoaders()
@@ -203,79 +166,43 @@
 =

    private Interceptor createOptimisticInterceptorChain() throws IllegalAc=
cessException, InstantiationException, ClassNotFoundException
    {
-      Interceptor txInterceptor, replicationInterceptor =3D null, lockInte=
rceptor, validationInterceptor;
-      Interceptor createIfNotExistsInterceptor, nodeInterceptor, invokerIn=
terceptor, activationInterceptor =3D null;
-      Interceptor passivationInterceptor =3D null, cacheLoaderInterceptor =
=3D null, cacheStoreInterceptor =3D null, first =3D null;
-      Interceptor cacheMgmtInterceptor, evictionInterceptor =3D null, data=
GravitatorInterceptor =3D null;
-      Interceptor invocationCtxInterceptor =3D createInterceptor(Invocatio=
nContextInterceptor.class);
-      Interceptor notificationInterceptor =3D createInterceptor(Notificati=
onInterceptor.class);
-
       // load the icInterceptor first
-      first =3D setFirstInterceptor(invocationCtxInterceptor);
+      Interceptor first =3D setFirstInterceptor(InvocationContextIntercept=
or.class);
 =

+      if (configuration.getExposeManagementStatistics()) addInterceptor(fi=
rst, CacheMgmtInterceptor.class);
 =

-      if (isUsingCacheLoaders())
-      {
-         if (configuration.getCacheLoaderConfig().isPassivation())
-         {
-            activationInterceptor =3D createInterceptor(ActivationIntercep=
tor.class);
-            passivationInterceptor =3D createInterceptor(PassivationInterc=
eptor.class);
-         }
-         else
-         {
-            cacheLoaderInterceptor =3D createInterceptor(CacheLoaderInterc=
eptor.class);
-            cacheStoreInterceptor =3D createInterceptor(CacheStoreIntercep=
tor.class);
-         }
-      }
+      addInterceptor(first, TxInterceptor.class);
+      addInterceptor(first, NotificationInterceptor.class);
 =

-      txInterceptor =3D createInterceptor(TxInterceptor.class);
-
-      if (isUsingBuddyReplication()) dataGravitatorInterceptor =3D createI=
nterceptor(DataGravitatorInterceptor.class);
-
       switch (configuration.getCacheMode())
       {
          case REPL_SYNC:
          case REPL_ASYNC:
-            replicationInterceptor =3D createInterceptor(OptimisticReplica=
tionInterceptor.class);
+            addInterceptor(first, OptimisticReplicationInterceptor.class);
             break;
          case INVALIDATION_SYNC:
          case INVALIDATION_ASYNC:
-            replicationInterceptor =3D createInterceptor(InvalidationInter=
ceptor.class);
+            addInterceptor(first, InvalidationInterceptor.class);
             break;
          case LOCAL:
             //Nothing...
       }
 =

-      lockInterceptor =3D createInterceptor(OptimisticLockingInterceptor.c=
lass);
-
-      validationInterceptor =3D createInterceptor(OptimisticValidatorInter=
ceptor.class);
-
-      createIfNotExistsInterceptor =3D createInterceptor(OptimisticCreateI=
fNotExistsInterceptor.class);
-
-      nodeInterceptor =3D createInterceptor(OptimisticNodeInterceptor.clas=
s);
-
-      invokerInterceptor =3D createInterceptor(CallInterceptor.class);
-
-      if (configuration.getEvictionConfig() !=3D null && configuration.get=
EvictionConfig().isValidConfig())
+      Interceptor activationInterceptor =3D null, passivationInterceptor =
=3D null, cacheLoaderInterceptor =3D null, cacheStoreInterceptor =3D null;
+      if (isUsingCacheLoaders())
       {
-         evictionInterceptor =3D createInterceptor(EvictionInterceptor.cla=
ss);
+         if (configuration.getCacheLoaderConfig().isPassivation())
+         {
+            activationInterceptor =3D createInterceptor(ActivationIntercep=
tor.class);
+            passivationInterceptor =3D createInterceptor(PassivationInterc=
eptor.class);
+         }
+         else
+         {
+            cacheLoaderInterceptor =3D createInterceptor(CacheLoaderInterc=
eptor.class);
+            cacheStoreInterceptor =3D createInterceptor(CacheStoreIntercep=
tor.class);
+         }
       }
 =

-      if (configuration.getExposeManagementStatistics())
-      {
-         cacheMgmtInterceptor =3D createInterceptor(CacheMgmtInterceptor.c=
lass);
-         addInterceptor(first, cacheMgmtInterceptor);
-      }
-
-      if (txInterceptor !=3D null)
-      {
-         addInterceptor(first, txInterceptor);
-      }
-
-      addInterceptor(first, notificationInterceptor);
-
-      addInterceptor(first, replicationInterceptor);
-
       if (passivationInterceptor !=3D null && !configuration.getCacheLoade=
rConfig().isFetchPersistentState())
       {
          addInterceptor(first, passivationInterceptor);
@@ -308,25 +235,26 @@
          }
       }
 =

-      if (dataGravitatorInterceptor !=3D null)
-      {
-         addInterceptor(first, dataGravitatorInterceptor);
-      }
+      if (isUsingBuddyReplication()) addInterceptor(first, DataGravitatorI=
nterceptor.class);
 =

+      addInterceptor(first, OptimisticLockingInterceptor.class);
 =

-      addInterceptor(first, lockInterceptor);
-
-      addInterceptor(first, validationInterceptor);
-      addInterceptor(first, createIfNotExistsInterceptor);
-
+      addInterceptor(first, OptimisticValidatorInterceptor.class);
+      addInterceptor(first, OptimisticCreateIfNotExistsInterceptor.class);
       // eviction interceptor to come before the optimistic node intercept=
or
-      addInterceptor(first, evictionInterceptor);
+      if (configuration.getEvictionConfig() !=3D null && configuration.get=
EvictionConfig().isValidConfig())
+         addInterceptor(first, EvictionInterceptor.class);
 =

-      addInterceptor(first, nodeInterceptor);
+      addInterceptor(first, OptimisticNodeInterceptor.class);
 =

-      addInterceptor(first, invokerInterceptor);
+      Interceptor callInterceptor =3D createInterceptor(CallInterceptor.cl=
ass);
+      addInterceptor(first, callInterceptor);
+      return setLastInterceptorPointer(first, callInterceptor);
+   }
 =

-      return setLastInterceptorPointer(first, invokerInterceptor);
+   public Interceptor setFirstInterceptor(Class<? extends Interceptor> cla=
zz) throws IllegalAccessException, InstantiationException
+   {
+      return setFirstInterceptor(createInterceptor(clazz));
    }
 =

    public Interceptor setFirstInterceptor(Interceptor i)


--===============3740564469567516634==--

From jbosscache-commits at lists.jboss.org Mon Jan 21 09:26:51 2008
Content-Type: multipart/mixed; boundary="===============1332024461298342915=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r5166 -
 core/trunk/src/main/java/org/jboss/cache/factories.
Date: Mon, 21 Jan 2008 09:26:51 -0500
Message-ID: <E1JGxbv-0002G0-24@committer01.frg.pub.inap.atl.jboss.com>

--===============1332024461298342915==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: manik.surtani(a)jboss.com
Date: 2008-01-21 09:26:50 -0500 (Mon, 21 Jan 2008)
New Revision: 5166

Modified:
   core/trunk/src/main/java/org/jboss/cache/factories/InterceptorChainFacto=
ry.java
Log:
Simplified chain construction logic

Modified: core/trunk/src/main/java/org/jboss/cache/factories/InterceptorCha=
inFactory.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/java/org/jboss/cache/factories/InterceptorChainFact=
ory.java	2008-01-21 14:17:57 UTC (rev 5165)
+++ core/trunk/src/main/java/org/jboss/cache/factories/InterceptorChainFact=
ory.java	2008-01-21 14:26:50 UTC (rev 5166)
@@ -34,18 +34,6 @@
       return new InterceptorChainFactory();
    }
 =

-   public Interceptor buildInterceptorChain() throws IllegalAccessExceptio=
n, ClassNotFoundException, InstantiationException
-   {
-      if (configuration.isNodeLockingOptimistic())
-      {
-         return createOptimisticInterceptorChain();
-      }
-      else
-      {
-         return createPessimisticInterceptorChain();
-      }
-   }
-
    public static Interceptor setLastInterceptorPointer(Interceptor first, =
Interceptor last)
    {
       Interceptor i =3D first;
@@ -96,8 +84,9 @@
       first.setNext(i);
    }
 =

-   private Interceptor createPessimisticInterceptorChain() throws IllegalA=
ccessException, InstantiationException, ClassNotFoundException
+   public Interceptor buildInterceptorChain() throws IllegalAccessExceptio=
n, InstantiationException, ClassNotFoundException
    {
+      boolean optimistic =3D configuration.isNodeLockingOptimistic();
       // load the icInterceptor first
       Interceptor first =3D setFirstInterceptor(InvocationContextIntercept=
or.class);
 =

@@ -123,8 +112,11 @@
             //Nothing...
       }
 =

-      addInterceptor(first, PessimisticLockInterceptor.class);
-      addInterceptor(first, UnlockInterceptor.class);
+      if (!optimistic)
+      {
+         addInterceptor(first, PessimisticLockInterceptor.class);
+         addInterceptor(first, UnlockInterceptor.class);
+      }
 =

       if (isUsingCacheLoaders())
       {
@@ -144,11 +136,18 @@
 =

       if (isUsingBuddyReplication()) addInterceptor(first, DataGravitatorI=
nterceptor.class);
 =

-      if (configuration.getEvictionConfig() !=3D null && configuration.get=
EvictionConfig().isValidConfig())
+      if (optimistic)
       {
-         addInterceptor(first, EvictionInterceptor.class);
+         addInterceptor(first, OptimisticLockingInterceptor.class);
+         addInterceptor(first, OptimisticValidatorInterceptor.class);
+         addInterceptor(first, OptimisticCreateIfNotExistsInterceptor.clas=
s);
       }
+      // eviction interceptor to come before the optimistic node intercept=
or
+      if (configuration.getEvictionConfig() !=3D null && configuration.get=
EvictionConfig().isValidConfig())
+         addInterceptor(first, EvictionInterceptor.class);
 =

+      if (optimistic) addInterceptor(first, OptimisticNodeInterceptor.clas=
s);
+
       Interceptor callInterceptor =3D createInterceptor(CallInterceptor.cl=
ass);
       addInterceptor(first, callInterceptor);
       return setLastInterceptorPointer(first, callInterceptor);
@@ -164,94 +163,6 @@
       return configuration.getBuddyReplicationConfig() !=3D null && config=
uration.getBuddyReplicationConfig().isEnabled();
    }
 =

-   private Interceptor createOptimisticInterceptorChain() throws IllegalAc=
cessException, InstantiationException, ClassNotFoundException
-   {
-      // load the icInterceptor first
-      Interceptor first =3D setFirstInterceptor(InvocationContextIntercept=
or.class);
-
-      if (configuration.getExposeManagementStatistics()) addInterceptor(fi=
rst, CacheMgmtInterceptor.class);
-
-      addInterceptor(first, TxInterceptor.class);
-      addInterceptor(first, NotificationInterceptor.class);
-
-      switch (configuration.getCacheMode())
-      {
-         case REPL_SYNC:
-         case REPL_ASYNC:
-            addInterceptor(first, OptimisticReplicationInterceptor.class);
-            break;
-         case INVALIDATION_SYNC:
-         case INVALIDATION_ASYNC:
-            addInterceptor(first, InvalidationInterceptor.class);
-            break;
-         case LOCAL:
-            //Nothing...
-      }
-
-      Interceptor activationInterceptor =3D null, passivationInterceptor =
=3D null, cacheLoaderInterceptor =3D null, cacheStoreInterceptor =3D null;
-      if (isUsingCacheLoaders())
-      {
-         if (configuration.getCacheLoaderConfig().isPassivation())
-         {
-            activationInterceptor =3D createInterceptor(ActivationIntercep=
tor.class);
-            passivationInterceptor =3D createInterceptor(PassivationInterc=
eptor.class);
-         }
-         else
-         {
-            cacheLoaderInterceptor =3D createInterceptor(CacheLoaderInterc=
eptor.class);
-            cacheStoreInterceptor =3D createInterceptor(CacheStoreIntercep=
tor.class);
-         }
-      }
-
-      if (passivationInterceptor !=3D null && !configuration.getCacheLoade=
rConfig().isFetchPersistentState())
-      {
-         addInterceptor(first, passivationInterceptor);
-      }
-
-      // add the cache store interceptor here
-      if (cacheStoreInterceptor !=3D null && !configuration.getCacheLoader=
Config().isFetchPersistentState())
-      {
-         addInterceptor(first, cacheStoreInterceptor);
-      }
-
-      // cache loader interceptor is only invoked if we are ready to write=
 to the actual tree cache
-      if (activationInterceptor !=3D null)
-      {
-         addInterceptor(first, activationInterceptor);
-
-         if (configuration.getCacheLoaderConfig().isFetchPersistentState())
-         {
-            addInterceptor(first, passivationInterceptor);
-         }
-      }
-
-      if (cacheLoaderInterceptor !=3D null)
-      {
-         addInterceptor(first, cacheLoaderInterceptor);
-
-         if (configuration.getCacheLoaderConfig().isFetchPersistentState())
-         {
-            addInterceptor(first, cacheStoreInterceptor);
-         }
-      }
-
-      if (isUsingBuddyReplication()) addInterceptor(first, DataGravitatorI=
nterceptor.class);
-
-      addInterceptor(first, OptimisticLockingInterceptor.class);
-
-      addInterceptor(first, OptimisticValidatorInterceptor.class);
-      addInterceptor(first, OptimisticCreateIfNotExistsInterceptor.class);
-      // eviction interceptor to come before the optimistic node intercept=
or
-      if (configuration.getEvictionConfig() !=3D null && configuration.get=
EvictionConfig().isValidConfig())
-         addInterceptor(first, EvictionInterceptor.class);
-
-      addInterceptor(first, OptimisticNodeInterceptor.class);
-
-      Interceptor callInterceptor =3D createInterceptor(CallInterceptor.cl=
ass);
-      addInterceptor(first, callInterceptor);
-      return setLastInterceptorPointer(first, callInterceptor);
-   }
-
    public Interceptor setFirstInterceptor(Class<? extends Interceptor> cla=
zz) throws IllegalAccessException, InstantiationException
    {
       return setFirstInterceptor(createInterceptor(clazz));


--===============1332024461298342915==--

From jbosscache-commits at lists.jboss.org Mon Jan 21 09:28:04 2008
Content-Type: multipart/mixed; boundary="===============7959259332331158078=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r5167 -
 core/trunk/src/main/java/org/jboss/cache/factories.
Date: Mon, 21 Jan 2008 09:28:04 -0500
Message-ID: <E1JGxd6-0002JO-5p@committer01.frg.pub.inap.atl.jboss.com>

--===============7959259332331158078==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: manik.surtani(a)jboss.com
Date: 2008-01-21 09:28:04 -0500 (Mon, 21 Jan 2008)
New Revision: 5167

Modified:
   core/trunk/src/main/java/org/jboss/cache/factories/InterceptorChainFacto=
ry.java
Log:
Simplified chain construction logic

Modified: core/trunk/src/main/java/org/jboss/cache/factories/InterceptorCha=
inFactory.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/java/org/jboss/cache/factories/InterceptorChainFact=
ory.java	2008-01-21 14:26:50 UTC (rev 5166)
+++ core/trunk/src/main/java/org/jboss/cache/factories/InterceptorChainFact=
ory.java	2008-01-21 14:28:04 UTC (rev 5167)
@@ -102,7 +102,7 @@
       {
          case REPL_SYNC:
          case REPL_ASYNC:
-            addInterceptor(first, ReplicationInterceptor.class);
+            addInterceptor(first, optimistic ? OptimisticReplicationInterc=
eptor.class : ReplicationInterceptor.class);
             break;
          case INVALIDATION_SYNC:
          case INVALIDATION_ASYNC:


--===============7959259332331158078==--

From jbosscache-commits at lists.jboss.org Mon Jan 21 12:28:14 2008
Content-Type: multipart/mixed; boundary="===============1353699642001317989=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r5168 -
 benchmarks/benchmark-fwk/tags.
Date: Mon, 21 Jan 2008 12:28:13 -0500
Message-ID: <E1JH0RR-0005I8-VK@committer01.frg.pub.inap.atl.jboss.com>

--===============1353699642001317989==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: mircea.markus
Date: 2008-01-21 12:28:13 -0500 (Mon, 21 Jan 2008)
New Revision: 5168

Added:
   benchmarks/benchmark-fwk/tags/bench_JBC210cr3_tc250/
Log:
made a copy

Copied: benchmarks/benchmark-fwk/tags/bench_JBC210cr3_tc250 (from rev 5167,=
 benchmarks/benchmark-fwk/trunk)


--===============1353699642001317989==--

From jbosscache-commits at lists.jboss.org Mon Jan 21 15:29:45 2008
Content-Type: multipart/mixed; boundary="===============1566946338308621650=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r5169 - in
 benchmarks/benchmark-fwk/trunk: doc and 1 other directory.
Date: Mon, 21 Jan 2008 15:29:45 -0500
Message-ID: <E1JH3H7-0001bO-Ov@committer01.frg.pub.inap.atl.jboss.com>

--===============1566946338308621650==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: mircea.markus
Date: 2008-01-21 15:29:45 -0500 (Mon, 21 Jan 2008)
New Revision: 5169

Added:
   benchmarks/benchmark-fwk/trunk/cluster.sh
Modified:
   benchmarks/benchmark-fwk/trunk/doc/TODO.txt
Log:
added script to starup cluster

Added: benchmarks/benchmark-fwk/trunk/cluster.sh
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- benchmarks/benchmark-fwk/trunk/cluster.sh	                        (rev =
0)
+++ benchmarks/benchmark-fwk/trunk/cluster.sh	2008-01-21 20:29:45 UTC (rev =
5169)
@@ -0,0 +1,29 @@
+#!/bin/bash
+
+CACHE_DIST=3D${1}
+NUM_SERVERS=3D${2}
+COMMAND=3Dstart
+
+SERVER_POSTFIX=3D"qa.atl.jboss.com"
+SERVERS=3D( cluster01 cluster02 cluster03 cluster04 cluster05 cluster06 cl=
uster07 cluster08 cluster09 cluster10 )
+
+CACHE_BENCHMARK_HOME=3D`pwd`/code/cache-bench-fwk
+echo "Using cache benchmark home: $CACHE_BENCHMARK_HOME"
+
+case $COMMAND in
+    start)
+         for ((idx=3D0; idx < NUM_SERVERS ; idx++))
+         do
+            server=3D"${SERVERS[idx]}"
+            echo "jboss: Startup CacheBenchmarkFramework@$server"
+            ssh $server.$SERVER_POSTFIX "cd ${CACHE_BENCHMARK_HOME} &&  ./=
runNode.sh &"
+            sleep 5
+         done
+        ;;
+    stop)
+      echo "stop not implemented yet"
+      ;;
+    *)
+        echo "Usage: $0 [start] CACHE_DIST NUM_SERVERS"
+        ;;
+esac

Modified: benchmarks/benchmark-fwk/trunk/doc/TODO.txt
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- benchmarks/benchmark-fwk/trunk/doc/TODO.txt	2008-01-21 17:28:13 UTC (re=
v 5168)
+++ benchmarks/benchmark-fwk/trunk/doc/TODO.txt	2008-01-21 20:29:45 UTC (re=
v 5169)
@@ -1,4 +1,5 @@
 1) delegate the build of specific products to the cache-products/specific-=
product. Also
 2) make the replication test to run BEFORE warmup
 3) conf/config.xml sample size is test specific, move it to the test that =
uses it rather than having it in the cachebench element
-4) add a target for generating javadoc
+4) add a ant target for generating javadoc
+5) useful: add email notification on any step's failure or success so that=
 a user will be notified whenever needed


--===============1566946338308621650==--

From jbosscache-commits at lists.jboss.org Mon Jan 21 17:30:40 2008
Content-Type: multipart/mixed; boundary="===============7036235416189205501=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r5170 - in
 pojo/branches/2.1/src: main/java/org/jboss/cache/pojo/impl and 1 other
 directories.
Date: Mon, 21 Jan 2008 17:30:40 -0500
Message-ID: <E1JH5A8-0001Qu-GR@committer01.frg.pub.inap.atl.jboss.com>

--===============7036235416189205501==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: jason.greene(a)jboss.com
Date: 2008-01-21 17:30:40 -0500 (Mon, 21 Jan 2008)
New Revision: 5170

Modified:
   pojo/branches/2.1/src/main/java/org/jboss/cache/pojo/PojoCacheThreadCont=
ext.java
   pojo/branches/2.1/src/main/java/org/jboss/cache/pojo/impl/PojoCacheThrea=
dContextImpl.java
   pojo/branches/2.1/src/test/java/org/jboss/cache/pojo/PojoCacheThreadCont=
extTest.java
Log:
Further reduce memory allocation used by thread context with lazy loading
Add clear() to the API which is a combined free + reset


Modified: pojo/branches/2.1/src/main/java/org/jboss/cache/pojo/PojoCacheThr=
eadContext.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- pojo/branches/2.1/src/main/java/org/jboss/cache/pojo/PojoCacheThreadCon=
text.java	2008-01-21 20:29:45 UTC (rev 5169)
+++ pojo/branches/2.1/src/main/java/org/jboss/cache/pojo/PojoCacheThreadCon=
text.java	2008-01-21 22:30:40 UTC (rev 5170)
@@ -47,4 +47,10 @@
     * @param gravitate  true if gravitation should be triggered on cache-m=
iss, false if gravitation should not be triggered
     */
    public void setGravitationEnabled(boolean gravitate);
+   =

+   /**
+    * Clears all thread settings stored on this context. After invoked, de=
faults will be returned. This will also reclaim
+    * any memory used to store this thread's settings.
+    */
+   public void clear();
 }
\ No newline at end of file

Modified: pojo/branches/2.1/src/main/java/org/jboss/cache/pojo/impl/PojoCac=
heThreadContextImpl.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- pojo/branches/2.1/src/main/java/org/jboss/cache/pojo/impl/PojoCacheThre=
adContextImpl.java	2008-01-21 20:29:45 UTC (rev 5169)
+++ pojo/branches/2.1/src/main/java/org/jboss/cache/pojo/impl/PojoCacheThre=
adContextImpl.java	2008-01-21 22:30:40 UTC (rev 5170)
@@ -9,6 +9,7 @@
    =

    // Every cache instance gets it's own configuration
    // An array is used to conserve memory usage since reclamation is slow =
with TLs, and prevent CL leaks
+   // To further reduce leaks, allocation should be lazily initialized
    // In the future, if we get multiple booleans, use bitwise operations o=
n an integer =

    // as the first entry
    private final ThreadLocal<Object[]> state =3D new ThreadLocal<Object[]>=
()
@@ -16,7 +17,7 @@
       @Override
       protected Object[] initialValue()
       {
-         return new Object[] {GRAVITATE_DEFAULT};
+         return null;
       }
    };
    =

@@ -31,7 +32,8 @@
     */
    public boolean isGravitationEnabled()
    {
-      return (Boolean) state.get()[GRAVITATE];
+      Object[] values =3D state.get();
+      return values =3D=3D null ? GRAVITATE_DEFAULT : (Boolean) values[GRA=
VITATE];
    }
    =

    /**
@@ -40,7 +42,24 @@
     * @param gravitate  true if gravitation should be triggered on cache-m=
iss, false if gravitation should not be triggered
     */
    public void setGravitationEnabled(boolean gravitate)
+   {  =

+      Object[] values =3D state.get();
+      if (values =3D=3D null)
+      {
+         // Don't initialize if this is the default
+         if (gravitate =3D=3D GRAVITATE_DEFAULT)
+            return;
+      =

+         state.set(new Object[] {gravitate});
+      }
+      else
+      {
+         values[GRAVITATE] =3D gravitate;
+      }
+   }
+   =

+   public void clear()
    {
-      state.get()[GRAVITATE] =3D gravitate;
+      state.remove();
    }
-}
+}
\ No newline at end of file

Modified: pojo/branches/2.1/src/test/java/org/jboss/cache/pojo/PojoCacheThr=
eadContextTest.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- pojo/branches/2.1/src/test/java/org/jboss/cache/pojo/PojoCacheThreadCon=
textTest.java	2008-01-21 20:29:45 UTC (rev 5169)
+++ pojo/branches/2.1/src/test/java/org/jboss/cache/pojo/PojoCacheThreadCon=
textTest.java	2008-01-21 22:30:40 UTC (rev 5170)
@@ -23,28 +23,20 @@
 package org.jboss.cache.pojo;
 =

 import static org.testng.AssertJUnit.assertEquals;
-import static org.testng.AssertJUnit.assertNotNull;
-import static org.testng.AssertJUnit.assertNull;
 =

-import java.util.List;
-
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.jboss.cache.buddyreplication.NextMemberBuddyLocatorConfig;
-import org.jboss.cache.config.BuddyReplicationConfig;
 import org.jboss.cache.config.Configuration;
 import org.jboss.cache.config.Configuration.CacheMode;
 import org.jboss.cache.factories.UnitTestCacheConfigurationFactory;
-import org.jboss.cache.pojo.test.Person;
 import org.testng.annotations.AfterMethod;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 =

 /**
- * A BuddyReplicatedTest.
+ * Tests the usage and behavior of PojoCacheThreadContext
  *
- * @author <a href=3D"brian.stansberry(a)jboss.com">Brian Stansberry</a>
- * @version $Revision: 4717 $
+ * @author Jason T. Greene
  */
 @Test(groups =3D {"functional"})
 public class PojoCacheThreadContextTest =

@@ -78,6 +70,20 @@
       assertEquals(cache1.getThreadContext().isGravitationEnabled(), false=
);
    }
    =

+   public void testClear()
+   {
+      cache1.getThreadContext().setGravitationEnabled(true);
+      cache.getThreadContext().setGravitationEnabled(true);
+      =

+      assertEquals(cache.getThreadContext().isGravitationEnabled(), true);
+      assertEquals(cache1.getThreadContext().isGravitationEnabled(), true);
+      =

+      cache1.getThreadContext().clear();
+      =

+      assertEquals(cache.getThreadContext().isGravitationEnabled(), true);
+      assertEquals(cache1.getThreadContext().isGravitationEnabled(), false=
);
+   }
+   =

    private class TestThread extends Thread
    {
       public volatile Throwable t;


--===============7036235416189205501==--

From jbosscache-commits at lists.jboss.org Mon Jan 21 17:31:13 2008
Content-Type: multipart/mixed; boundary="===============1330137116248172225=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r5171 -
 benchmarks/benchmark-fwk/trunk/conf.
Date: Mon, 21 Jan 2008 17:31:13 -0500
Message-ID: <E1JH5Af-0001Ru-3O@committer01.frg.pub.inap.atl.jboss.com>

--===============1330137116248172225==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: mircea.markus
Date: 2008-01-21 17:31:12 -0500 (Mon, 21 Jan 2008)
New Revision: 5171

Modified:
   benchmarks/benchmark-fwk/trunk/conf/cachebench.xml
Log:
added script to starup cluster

Modified: benchmarks/benchmark-fwk/trunk/conf/cachebench.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- benchmarks/benchmark-fwk/trunk/conf/cachebench.xml	2008-01-21 22:30:40 =
UTC (rev 5170)
+++ benchmarks/benchmark-fwk/trunk/conf/cachebench.xml	2008-01-21 22:31:12 =
UTC (rev 5171)
@@ -95,7 +95,7 @@
 		own report generators such as XML generators, graphic generators, etc
    -->
    <!-- The CSV report generated can be plugged in to a spreadsheet to gen=
erate graphs. If 'outputFile is set to
-   '-generic-' then the name would be generated as follows: 'performance-<=
nodeIndeInCluster>.csv' -->
+   '-generic-' then the name would be generated as follows: 'performance-<=
nodeIndexInCluster>.csv' -->
    <report outputFile=3D"-generic-" generator=3D"org.cachebench.reportgene=
rators.ClusterReportGenerator"/>
 =

 </cachebench>


--===============1330137116248172225==--

From jbosscache-commits at lists.jboss.org Mon Jan 21 17:31:27 2008
Content-Type: multipart/mixed; boundary="===============0727101562260328130=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r5172 - in pojo/trunk/src:
 main/java/org/jboss/cache/pojo/impl and 1 other directories.
Date: Mon, 21 Jan 2008 17:31:27 -0500
Message-ID: <E1JH5At-0001Sj-NH@committer01.frg.pub.inap.atl.jboss.com>

--===============0727101562260328130==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: jason.greene(a)jboss.com
Date: 2008-01-21 17:31:27 -0500 (Mon, 21 Jan 2008)
New Revision: 5172

Modified:
   pojo/trunk/src/main/java/org/jboss/cache/pojo/PojoCacheThreadContext.java
   pojo/trunk/src/main/java/org/jboss/cache/pojo/impl/PojoCacheThreadContex=
tImpl.java
   pojo/trunk/src/test/java/org/jboss/cache/pojo/PojoCacheThreadContextTest=
.java
Log:
Merge 5170 from branches/2.1


Modified: pojo/trunk/src/main/java/org/jboss/cache/pojo/PojoCacheThreadCont=
ext.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- pojo/trunk/src/main/java/org/jboss/cache/pojo/PojoCacheThreadContext.ja=
va	2008-01-21 22:31:12 UTC (rev 5171)
+++ pojo/trunk/src/main/java/org/jboss/cache/pojo/PojoCacheThreadContext.ja=
va	2008-01-21 22:31:27 UTC (rev 5172)
@@ -47,4 +47,10 @@
     * @param gravitate  true if gravitation should be triggered on cache-m=
iss, false if gravitation should not be triggered
     */
    public void setGravitationEnabled(boolean gravitate);
+   =

+   /**
+    * Clears all thread settings stored on this context. After invoked, de=
faults will be returned. This will also reclaim
+    * any memory used to store this thread's settings.
+    */
+   public void clear();
 }
\ No newline at end of file

Modified: pojo/trunk/src/main/java/org/jboss/cache/pojo/impl/PojoCacheThrea=
dContextImpl.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- pojo/trunk/src/main/java/org/jboss/cache/pojo/impl/PojoCacheThreadConte=
xtImpl.java	2008-01-21 22:31:12 UTC (rev 5171)
+++ pojo/trunk/src/main/java/org/jboss/cache/pojo/impl/PojoCacheThreadConte=
xtImpl.java	2008-01-21 22:31:27 UTC (rev 5172)
@@ -9,6 +9,7 @@
    =

    // Every cache instance gets it's own configuration
    // An array is used to conserve memory usage since reclamation is slow =
with TLs, and prevent CL leaks
+   // To further reduce leaks, allocation should be lazily initialized
    // In the future, if we get multiple booleans, use bitwise operations o=
n an integer =

    // as the first entry
    private final ThreadLocal<Object[]> state =3D new ThreadLocal<Object[]>=
()
@@ -16,7 +17,7 @@
       @Override
       protected Object[] initialValue()
       {
-         return new Object[] {GRAVITATE_DEFAULT};
+         return null;
       }
    };
    =

@@ -31,7 +32,8 @@
     */
    public boolean isGravitationEnabled()
    {
-      return (Boolean) state.get()[GRAVITATE];
+      Object[] values =3D state.get();
+      return values =3D=3D null ? GRAVITATE_DEFAULT : (Boolean) values[GRA=
VITATE];
    }
    =

    /**
@@ -40,7 +42,24 @@
     * @param gravitate  true if gravitation should be triggered on cache-m=
iss, false if gravitation should not be triggered
     */
    public void setGravitationEnabled(boolean gravitate)
+   {  =

+      Object[] values =3D state.get();
+      if (values =3D=3D null)
+      {
+         // Don't initialize if this is the default
+         if (gravitate =3D=3D GRAVITATE_DEFAULT)
+            return;
+      =

+         state.set(new Object[] {gravitate});
+      }
+      else
+      {
+         values[GRAVITATE] =3D gravitate;
+      }
+   }
+   =

+   public void clear()
    {
-      state.get()[GRAVITATE] =3D gravitate;
+      state.remove();
    }
-}
+}
\ No newline at end of file

Modified: pojo/trunk/src/test/java/org/jboss/cache/pojo/PojoCacheThreadCont=
extTest.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- pojo/trunk/src/test/java/org/jboss/cache/pojo/PojoCacheThreadContextTes=
t.java	2008-01-21 22:31:12 UTC (rev 5171)
+++ pojo/trunk/src/test/java/org/jboss/cache/pojo/PojoCacheThreadContextTes=
t.java	2008-01-21 22:31:27 UTC (rev 5172)
@@ -23,28 +23,20 @@
 package org.jboss.cache.pojo;
 =

 import static org.testng.AssertJUnit.assertEquals;
-import static org.testng.AssertJUnit.assertNotNull;
-import static org.testng.AssertJUnit.assertNull;
 =

-import java.util.List;
-
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.jboss.cache.buddyreplication.NextMemberBuddyLocatorConfig;
-import org.jboss.cache.config.BuddyReplicationConfig;
 import org.jboss.cache.config.Configuration;
 import org.jboss.cache.config.Configuration.CacheMode;
 import org.jboss.cache.factories.UnitTestCacheConfigurationFactory;
-import org.jboss.cache.pojo.test.Person;
 import org.testng.annotations.AfterMethod;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 =

 /**
- * A BuddyReplicatedTest.
+ * Tests the usage and behavior of PojoCacheThreadContext
  *
- * @author <a href=3D"brian.stansberry(a)jboss.com">Brian Stansberry</a>
- * @version $Revision: 4717 $
+ * @author Jason T. Greene
  */
 @Test(groups =3D {"functional"})
 public class PojoCacheThreadContextTest =

@@ -78,6 +70,20 @@
       assertEquals(cache1.getThreadContext().isGravitationEnabled(), false=
);
    }
    =

+   public void testClear()
+   {
+      cache1.getThreadContext().setGravitationEnabled(true);
+      cache.getThreadContext().setGravitationEnabled(true);
+      =

+      assertEquals(cache.getThreadContext().isGravitationEnabled(), true);
+      assertEquals(cache1.getThreadContext().isGravitationEnabled(), true);
+      =

+      cache1.getThreadContext().clear();
+      =

+      assertEquals(cache.getThreadContext().isGravitationEnabled(), true);
+      assertEquals(cache1.getThreadContext().isGravitationEnabled(), false=
);
+   }
+   =

    private class TestThread extends Thread
    {
       public volatile Throwable t;


--===============0727101562260328130==--

From jbosscache-commits at lists.jboss.org Mon Jan 21 17:51:17 2008
Content-Type: multipart/mixed; boundary="===============4932859744062201813=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN:  r5173 - pojo/branches/2.1.
Date: Mon, 21 Jan 2008 17:51:17 -0500
Message-ID: <E1JH5U5-0005Rf-Bx@committer01.frg.pub.inap.atl.jboss.com>

--===============4932859744062201813==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: jason.greene(a)jboss.com
Date: 2008-01-21 17:51:17 -0500 (Mon, 21 Jan 2008)
New Revision: 5173

Modified:
   pojo/branches/2.1/pom.xml
Log:
prepare for CR4


Modified: pojo/branches/2.1/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- pojo/branches/2.1/pom.xml	2008-01-21 22:31:27 UTC (rev 5172)
+++ pojo/branches/2.1/pom.xml	2008-01-21 22:51:17 UTC (rev 5173)
@@ -4,8 +4,8 @@
   xsi:schemaLocation=3D"http://maven.apache.org/POM/4.0.0 http://maven.apa=
che.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <properties>
-    <jbosscache-pojo-version>2.1.0.CR3</jbosscache-pojo-version>
-    <jbosscache-core-version>2.1.0.CR3</jbosscache-core-version>
+    <jbosscache-pojo-version>2.1.0.CR4</jbosscache-pojo-version>
+    <jbosscache-core-version>2.1.0.CR4</jbosscache-core-version>
     <jboss.aop.version>2.0.0.CR3</jboss.aop.version>
   </properties>
   <parent>


--===============4932859744062201813==--

From jbosscache-commits at lists.jboss.org Mon Jan 21 17:52:16 2008
Content-Type: multipart/mixed; boundary="===============3250366578804151962=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN:  r5174 - pojo/branches/2.1.
Date: Mon, 21 Jan 2008 17:52:16 -0500
Message-ID: <E1JH5V2-0005UE-7e@committer01.frg.pub.inap.atl.jboss.com>

--===============3250366578804151962==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: jason.greene(a)jboss.com
Date: 2008-01-21 17:52:16 -0500 (Mon, 21 Jan 2008)
New Revision: 5174

Modified:
   pojo/branches/2.1/pom.xml
Log:
Depend on core CR3


Modified: pojo/branches/2.1/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- pojo/branches/2.1/pom.xml	2008-01-21 22:51:17 UTC (rev 5173)
+++ pojo/branches/2.1/pom.xml	2008-01-21 22:52:16 UTC (rev 5174)
@@ -5,7 +5,7 @@
   <modelVersion>4.0.0</modelVersion>
   <properties>
     <jbosscache-pojo-version>2.1.0.CR4</jbosscache-pojo-version>
-    <jbosscache-core-version>2.1.0.CR4</jbosscache-core-version>
+    <jbosscache-core-version>2.1.0.CR3</jbosscache-core-version>
     <jboss.aop.version>2.0.0.CR3</jboss.aop.version>
   </properties>
   <parent>


--===============3250366578804151962==--

From jbosscache-commits at lists.jboss.org Mon Jan 21 18:13:15 2008
Content-Type: multipart/mixed; boundary="===============9100911831130105318=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r5175 -
 benchmarks/CacheTests/trunk/lib.
Date: Mon, 21 Jan 2008 18:13:15 -0500
Message-ID: <E1JH5pL-0001IY-Es@committer01.frg.pub.inap.atl.jboss.com>

--===============9100911831130105318==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: jason.greene(a)jboss.com
Date: 2008-01-21 18:13:15 -0500 (Mon, 21 Jan 2008)
New Revision: 5175

Modified:
   benchmarks/CacheTests/trunk/lib/jboss-aop.jar
   benchmarks/CacheTests/trunk/lib/jbosscache-core.jar
   benchmarks/CacheTests/trunk/lib/jbosscache-pojo.jar
Log:
Update to the following versions:
POJO Cache 2.1.SNAPSHOT
Core Cache 2.1.0.CR3
AOP 2.1.0.CR3


Modified: benchmarks/CacheTests/trunk/lib/jboss-aop.jar
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)

Modified: benchmarks/CacheTests/trunk/lib/jbosscache-core.jar
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)

Modified: benchmarks/CacheTests/trunk/lib/jbosscache-pojo.jar
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)


--===============9100911831130105318==--

From jbosscache-commits at lists.jboss.org Mon Jan 21 20:06:23 2008
Content-Type: multipart/mixed; boundary="===============6060620288143646221=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r5176 - in core/trunk/src:
 main/java/org/jboss/cache and 11 other directories.
Date: Mon, 21 Jan 2008 20:06:22 -0500
Message-ID: <E1JH7ao-0008QO-MO@committer01.frg.pub.inap.atl.jboss.com>

--===============6060620288143646221==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: manik.surtani(a)jboss.com
Date: 2008-01-21 20:06:22 -0500 (Mon, 21 Jan 2008)
New Revision: 5176

Added:
   core/trunk/src/main/java/org/jboss/cache/interceptors/MarshalledValueInt=
erceptor.java
   core/trunk/src/main/java/org/jboss/cache/marshall/MarshalledValue.java
   core/trunk/src/main/java/org/jboss/cache/marshall/MarshalledValueHelper.=
java
   core/trunk/src/main/java/org/jboss/cache/marshall/MarshalledValueMap.java
   core/trunk/src/test/java/org/jboss/cache/interceptors/MarshalledValueInt=
erceptorTest.java
   core/trunk/src/test/java/org/jboss/cache/marshall/AsyncReplMarshalledVal=
uesTest.java
   core/trunk/src/test/java/org/jboss/cache/marshall/MarshalledValueTest.ja=
va
   core/trunk/src/test/java/org/jboss/cache/marshall/ReturnValueMarshalling=
MarshalledValuesTest.java
   core/trunk/src/test/java/org/jboss/cache/marshall/SyncReplMarshalledValu=
esTest.java
Modified:
   core/trunk/src/main/docbook/userguide/en/modules/configuration_reference=
.xml
   core/trunk/src/main/java/org/jboss/cache/Cache.java
   core/trunk/src/main/java/org/jboss/cache/CacheSPI.java
   core/trunk/src/main/java/org/jboss/cache/Node.java
   core/trunk/src/main/java/org/jboss/cache/UnversionedNode.java
   core/trunk/src/main/java/org/jboss/cache/config/Configuration.java
   core/trunk/src/main/java/org/jboss/cache/config/Option.java
   core/trunk/src/main/java/org/jboss/cache/factories/InterceptorChainFacto=
ry.java
   core/trunk/src/main/java/org/jboss/cache/invocation/CacheInvocationDeleg=
ate.java
   core/trunk/src/main/java/org/jboss/cache/invocation/NodeInvocationDelega=
te.java
   core/trunk/src/main/java/org/jboss/cache/marshall/CacheMarshaller200.java
   core/trunk/src/main/java/org/jboss/cache/marshall/MethodDeclarations.java
   core/trunk/src/main/java/org/jboss/cache/notifications/Notifier.java
   core/trunk/src/main/java/org/jboss/cache/optimistic/WorkspaceNodeImpl.ja=
va
   core/trunk/src/test/java/org/jboss/cache/factories/InterceptorChainFacto=
ryTest.java
   core/trunk/src/test/java/org/jboss/cache/lock/IdentityLockTest.java
   core/trunk/src/test/java/org/jboss/cache/lock/LockReleaseTest.java
   core/trunk/src/test/java/org/jboss/cache/marshall/AsyncReplTest.java
   core/trunk/src/test/java/org/jboss/cache/marshall/CustomCollectionTest.j=
ava
   core/trunk/src/test/java/org/jboss/cache/marshall/RegionBasedMarshalling=
TestBase.java
   core/trunk/src/test/java/org/jboss/cache/marshall/ReturnValueMarshalling=
Test.java
   core/trunk/src/test/java/org/jboss/cache/marshall/SelectedClassnameClass=
Loader.java
   core/trunk/src/test/java/org/jboss/cache/marshall/SyncReplTest.java
Log:
JBCACHE-1231 - Implicit marshalled values

Modified: core/trunk/src/main/docbook/userguide/en/modules/configuration_re=
ference.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/docbook/userguide/en/modules/configuration_referenc=
e.xml	2008-01-21 23:13:15 UTC (rev 5175)
+++ core/trunk/src/main/docbook/userguide/en/modules/configuration_referenc=
e.xml	2008-01-22 01:06:22 UTC (rev 5176)
@@ -645,6 +645,11 @@
                         support use of different classloaders for differen=
t cache regions. This defaults to
                         <literal>false</literal>
                         if unspecified.
+                        <p/>
+                        <b>DEPRECATED.</b>
+                        This option will disappear in JBoss Cache 3.x. See
+                        <literal>UseLazyDeserialization</literal>
+                        instead.
                      </para>
                   </entry>
                </row>
@@ -669,12 +674,21 @@
                   </entry>
 =

                   <entry>
-                     <para>An optional parameter that controls whether JBo=
ss Cache registers a shutdown hook with the JVM
-                        runtime.  Allowed values are <literal>DEFAULT</lit=
eral>, <literal>REGISTER</literal> and
-                        <literal>DONT_REGISTER</literal>.  <literal>REGIST=
ER</literal> and <literal>DONT_REGISTER</literal>
-                        forces or suppresses the registration of a shutdow=
n hook, respectively, and <literal>DEFAULT</literal>
-                        registers one if an MBean server (other than the J=
DK default) cannot be found and it is assumed that the
-                        cache is running in a managed environment.  The de=
fault if unspecified is, as expected, <literal>DEFAULT</literal>.
+                     <para>An optional parameter that controls whether JBo=
ss Cache registers a shutdown hook with the
+                        JVM
+                        runtime. Allowed values are<literal>DEFAULT</liter=
al>,
+                        <literal>REGISTER</literal>
+                        and
+                        <literal>DONT_REGISTER</literal>.
+                        <literal>REGISTER</literal>
+                        and
+                        <literal>DONT_REGISTER</literal>
+                        forces or suppresses the registration of a shutdow=
n hook, respectively, and
+                        <literal>DEFAULT</literal>
+                        registers one if an MBean server (other than the J=
DK default) cannot be found and it is assumed
+                        that the
+                        cache is running in a managed environment. The def=
ault if unspecified is, as expected,<literal>
+                        DEFAULT</literal>.
                      </para>
                   </entry>
                </row>
@@ -686,7 +700,8 @@
 =

                   <entry>
                      <para>An optional parameter that can be used to enabl=
e or disable the use of lazy deserialization
-                        for cached objects. Defaults to <literal>true</lit=
eral>.
+                        for cached objects. Defaults to<literal>true</lite=
ral>. If lazy deserialization is disabled,
+                        support for implicitly using context class loaders=
 registered with the calling thread goes away.
                      </para>
                   </entry>
                </row>

Modified: core/trunk/src/main/java/org/jboss/cache/Cache.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/java/org/jboss/cache/Cache.java	2008-01-21 23:13:15=
 UTC (rev 5175)
+++ core/trunk/src/main/java/org/jboss/cache/Cache.java	2008-01-22 01:06:22=
 UTC (rev 5176)
@@ -240,12 +240,12 @@
     * @param fqn fqn of the node to retrieve
     * @return a Node object, or a null if the node does not exist.
     */
-   Node getNode(Fqn<?> fqn);
+   Node<K, V> getNode(Fqn<?> fqn);
 =

    /**
     * Convenience method that takes a string representation of an Fqn.  Ot=
herwise identical to {@link #getNode(Fqn)}
     */
-   Node getNode(String fqn);
+   Node<K, V> getNode(String fqn);
 =

 =

    /**

Modified: core/trunk/src/main/java/org/jboss/cache/CacheSPI.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/java/org/jboss/cache/CacheSPI.java	2008-01-21 23:13=
:15 UTC (rev 5175)
+++ core/trunk/src/main/java/org/jboss/cache/CacheSPI.java	2008-01-22 01:06=
:22 UTC (rev 5176)
@@ -52,6 +52,23 @@
    NodeSPI<K, V> getRoot();
 =

    /**
+    * Overrides {@link Cache#getNode(String)} to return a {@link org.jboss=
.cache.NodeSPI} instead of a {@link org.jboss.cache.Node}.
+    *
+    * @param s string representation of an Fqn
+    * @return a NodeSPI
+    */
+   NodeSPI<K, V> getNode(String s);
+
+   /**
+    * Overrides {@link Cache#getNode(Fqn)} to return a {@link org.jboss.ca=
che.NodeSPI} instead of a {@link org.jboss.cache.Node}.
+    *
+    * @param f an Fqn
+    * @return a NodeSPI
+    */
+   NodeSPI<K, V> getNode(Fqn<?> f);
+
+
+   /**
     * Retrieves a reference to a running {@link javax.transaction.Transact=
ionManager}, if one is configured.
     * <p/>
     * From 2.1.0, Interceptor authors should obtain this by injection rath=
er than this method.  See the

Modified: core/trunk/src/main/java/org/jboss/cache/Node.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/java/org/jboss/cache/Node.java	2008-01-21 23:13:15 =
UTC (rev 5175)
+++ core/trunk/src/main/java/org/jboss/cache/Node.java	2008-01-22 01:06:22 =
UTC (rev 5176)
@@ -272,19 +272,19 @@
    /**
     * Tests if a node reference is still valid.  A node reference may beco=
me invalid if it has been removed, invalidated
     * or moved, either locally or remotely.  If a node is invalid, it shou=
ld be fetched again from the cache or a valid
-    * parent node.  Operations on invalid nodes will throw a {@link org.jb=
oss.cache.NodeNotValidException}. =

+    * parent node.  Operations on invalid nodes will throw a {@link org.jb=
oss.cache.NodeNotValidException}.
     *
     * @return true if the node is valid.
     */
    boolean isValid();
 =

-     /**
+   /**
     * Nodes marked resident would be ignored by the eviction algorithms. E=
.g. if the algorithm is
     * "keep LRU 10 nodes" - the resident nodes won't be counted within tho=
se 10 nodes,
     * and also won't be evicted when the threshold is reached.
     * N.B. calling this method won't have any effect on node's eviction, e=
.g. we won't consider this node as being
     * 'used' in a LRU scenario. If the cache is used in a replicated envir=
onment then the resident property is NOT
-    * replicated across the cluster. Also the property is not transactiona=
ble. =

+    * replicated across the cluster. Also the property is not transactiona=
ble.
     */
    boolean isResident();
 =

@@ -295,12 +295,13 @@
 =

    /**
     * Tests whether this node is configured to be exclusively locked when =
inserting or removing children.
-    * <p />
+    * <p/>
     * The default
     * value for this is what is configured in the <tt>LockParentForChildIn=
sertRemove</tt> configuration property,
     * programatically reachable by querying {@link org.jboss.cache.config.=
Configuration#isLockParentForChildInsertRemove()}
-    * <p />
+    * <p/>
     * This can also be configured on a per-node basis using {@link #setLoc=
kForChildInsertRemove(boolean)}
+    *
     * @return true if the node is configured to be exclusively locked for =
child insertions and removal, false otherwise.
     * @since 2.1.0
     */
@@ -308,9 +309,21 @@
 =

    /**
     * Configures the behaviour of how this node is locked when adding/remo=
ving children.
+    *
     * @param lockForChildInsertRemove if true, exclusive locks will be obt=
ained when children are added/removed.  If
-    * false, a shared "read lock" will be obtained instead.
+    *                                 false, a shared "read lock" will be =
obtained instead.
     * @since 2.1.0
     */
    void setLockForChildInsertRemove(boolean lockForChildInsertRemove);
+
+   /**
+    * Method that releases object references of cached objects held in the=
 cache by serializing them to byte buffers.
+    * Cached objects are lazily deserialized when accessed again, based on=
 the calling thread's context class loader.
+    * <p/>
+    * This can be expensive, based on the effort required to serialize cac=
hed objects.
+    * <p/>
+    *
+    * @param recursive if true, child nodes will have their object referen=
ces released as well.
+    */
+   void releaseObjectReferences(boolean recursive);
 }

Modified: core/trunk/src/main/java/org/jboss/cache/UnversionedNode.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/java/org/jboss/cache/UnversionedNode.java	2008-01-2=
1 23:13:15 UTC (rev 5175)
+++ core/trunk/src/main/java/org/jboss/cache/UnversionedNode.java	2008-01-2=
2 01:06:22 UTC (rev 5176)
@@ -10,6 +10,7 @@
 import org.apache.commons.logging.LogFactory;
 import org.jboss.cache.factories.annotations.Inject;
 import org.jboss.cache.lock.IdentityLock;
+import org.jboss.cache.marshall.MarshalledValue;
 import org.jboss.cache.marshall.MethodCall;
 import org.jboss.cache.marshall.MethodCallFactory;
 import org.jboss.cache.marshall.MethodDeclarations;
@@ -919,4 +920,36 @@
       if (data =3D=3D null) return new HashMap(0);
       return new HashMap(data);
    }
+
+   public void releaseObjectReferences(boolean recursive)
+   {
+      if (recursive && children !=3D null)
+      {
+         for (Node child : children.values())
+         {
+            child.releaseObjectReferences(recursive);
+         }
+      }
+
+      if (data !=3D null)
+      {
+         for (Object key : data.keySet())
+         {
+            // get the key first, before attempting to serialize stuff sin=
ce data.get() may deserialize the key if doing
+            // a hashcode() or equals().
+
+            Object value =3D data.get(key);
+            if (key instanceof MarshalledValue)
+            {
+               ((MarshalledValue) key).compact(true, true);
+            }
+
+            if (value instanceof MarshalledValue)
+            {
+               ((MarshalledValue) value).compact(true, true);
+            }
+
+         }
+      }
+   }
 }

Modified: core/trunk/src/main/java/org/jboss/cache/config/Configuration.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/java/org/jboss/cache/config/Configuration.java	2008=
-01-21 23:13:15 UTC (rev 5175)
+++ core/trunk/src/main/java/org/jboss/cache/config/Configuration.java	2008=
-01-22 01:06:22 UTC (rev 5176)
@@ -304,6 +304,15 @@
       this.evictionConfig =3D config;
    }
 =

+   /**
+    * This is a deprecated configuration option.  While it will be support=
ed for the 2.x series for backward compatibility,
+    * expect to see it disappear in 3.x.
+    * <p/>
+    * With {@link #isUseLazyDeserialization()}, which is enabled by defaul=
t, custom class loaders are handled implicitly.
+    * See the user guide for details on how this is handled.
+    * <p/>
+    */
+   @Deprecated
    public void setUseRegionBasedMarshalling(boolean useRegionBasedMarshall=
ing)
    {
       testImmutability("useRegionBasedMarshalling");
@@ -578,6 +587,15 @@
       return lockParentForChildInsertRemove;
    }
 =

+   /**
+    * This is a deprecated configuration option.  While it will be support=
ed for the 2.x series for backward compatibility,
+    * expect to see it disappear in 3.x.
+    * <p/>
+    * With {@link #isUseLazyDeserialization()}, which is enabled by defaul=
t, custom class loaders are handled implicitly.
+    * See the user guide for details on how this is handled.
+    * <p/>
+    */
+   @Deprecated
    public boolean isUseRegionBasedMarshalling()
    {
       return useRegionBasedMarshalling;

Modified: core/trunk/src/main/java/org/jboss/cache/config/Option.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/java/org/jboss/cache/config/Option.java	2008-01-21 =
23:13:15 UTC (rev 5175)
+++ core/trunk/src/main/java/org/jboss/cache/config/Option.java	2008-01-22 =
01:06:22 UTC (rev 5176)
@@ -250,17 +250,9 @@
             '}';
    }
 =

-   public Option clone()
+   public Option clone() throws CloneNotSupportedException
    {
-      try
-      {
-         return (Option) super.clone();
-      }
-      catch (CloneNotSupportedException e)
-      {
-         // should never happen!
-         throw new RuntimeException(e);
-      }
+      return (Option) super.clone();
    }
 =

 =


Modified: core/trunk/src/main/java/org/jboss/cache/factories/InterceptorCha=
inFactory.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/java/org/jboss/cache/factories/InterceptorChainFact=
ory.java	2008-01-21 23:13:15 UTC (rev 5175)
+++ core/trunk/src/main/java/org/jboss/cache/factories/InterceptorChainFact=
ory.java	2008-01-22 01:06:22 UTC (rev 5176)
@@ -95,7 +95,7 @@
 =

       // load the tx interceptor
       addInterceptor(first, TxInterceptor.class);
-
+      if (configuration.isUseLazyDeserialization()) addInterceptor(first, =
MarshalledValueInterceptor.class);
       addInterceptor(first, NotificationInterceptor.class);
 =

       switch (configuration.getCacheMode())

Added: core/trunk/src/main/java/org/jboss/cache/interceptors/MarshalledValu=
eInterceptor.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/java/org/jboss/cache/interceptors/MarshalledValueIn=
terceptor.java	                        (rev 0)
+++ core/trunk/src/main/java/org/jboss/cache/interceptors/MarshalledValueIn=
terceptor.java	2008-01-22 01:06:22 UTC (rev 5176)
@@ -0,0 +1,121 @@
+package org.jboss.cache.interceptors;
+
+import org.jboss.cache.InvocationContext;
+import org.jboss.cache.marshall.MarshalledValue;
+import org.jboss.cache.marshall.MarshalledValueHelper;
+import org.jboss.cache.marshall.MethodCall;
+import org.jboss.cache.marshall.MethodDeclarations;
+
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+
+/**
+ * Interceptor that handles the wrapping and unwrapping of cached data usi=
ng {@link org.jboss.cache.marshall.MarshalledValue}s.
+ * Known "excluded" types are not wrapped/unwrapped, which at this time in=
clude {@link String}, Java primitives
+ * and their Object wrappers, as well as arrays of excluded types.
+ * <p/>
+ * The {@link org.jboss.cache.marshall.MarshalledValue} wrapper handles la=
zy deserialization from byte array representations.
+ *
+ * @author Manik Surtani (<a href=3D"mailto:manik(a)jboss.org">manik(a)jbo=
ss.org</a>)
+ * @see org.jboss.cache.marshall.MarshalledValue
+ * @since 2.1.0
+ */
+public class MarshalledValueInterceptor extends Interceptor
+{
+   @Override
+   public Object invoke(InvocationContext context) throws Throwable
+   {
+      MethodCall call =3D context.getMethodCall();
+      boolean isAPICall =3D false;
+      int id =3D call.getMethodId();
+      Set<MarshalledValue> marshalledValues =3D null;
+
+      // needs to work for *all* API method calls.
+      if (MethodDeclarations.isAPIMethodCall(id) && id !=3D MethodDeclarat=
ions.getNodeMethodLocal_id && id !=3D MethodDeclarations.removeNodeMethodLo=
cal_id)
+      {
+         marshalledValues =3D new HashSet<MarshalledValue>();
+         isAPICall =3D true;
+         if (trace) log.trace("Is API method; wrapping any args that need =
to be wrapped");
+         // check arguments for any user-defined objects that may need to =
be wrapped.
+         Object[] args =3D call.getArgs();
+         Object[] replacementArgs =3D new Object[args.length];
+         int counter =3D -1;
+
+         for (Object o : args)
+         {
+            counter++;
+            if (MarshalledValueHelper.excludeFromMarshalledValueWrapping(o=
) || isInternalCollection(counter, id))
+            {
+               replacementArgs[counter] =3D o;
+            }
+            else if (needToReplaceMap(counter, id))
+            {
+               if (trace) log.trace("Wrapping map contents of argument " +=
 counter);
+               replacementArgs[counter] =3D wrapMap((Map) o, marshalledVal=
ues, context);
+            }
+            else
+            {
+               if (trace) log.trace("Wrapping argument " + counter + " whi=
ch contains type " + o.getClass());
+               replacementArgs[counter] =3D createAndAddMarshalledValue(o,=
 marshalledValues, context);
+            }
+         }
+         call.setArgs(replacementArgs);
+      }
+
+      Object retVal =3D nextInterceptor(context);
+
+      if (isAPICall)
+      {
+         if (trace) log.trace("Compacting MarshalledValues created");
+         for (MarshalledValue mv : marshalledValues) mv.compact(false, fal=
se);
+
+         if (retVal instanceof MarshalledValue)
+         {
+            if (trace) log.trace("Return value is a MarshalledValue.  Unwr=
apping.");
+            return ((MarshalledValue) retVal).get();
+         }
+      }
+
+      return retVal;
+   }
+
+   /**
+    * prepare methods include Maps and Lists in args.  These should not be=
 mistaken for needing wrapping as MarshalledValues.
+    */
+   protected boolean isInternalCollection(int argSubscript, int methodId)
+   {
+      return (methodId =3D=3D MethodDeclarations.prepareMethod_id && argSu=
bscript =3D=3D 1) || (methodId =3D=3D MethodDeclarations.optimisticPrepareM=
ethod_id && (argSubscript =3D=3D 1 || argSubscript =3D=3D 2));
+   }
+
+   /**
+    * put(Map) contents should not be wrapped since the map will need to b=
e iterated over.  The contents of the Map, however, should be wrapped.
+    */
+   protected boolean needToReplaceMap(int argSubscript, int methodId)
+   {
+      return ((methodId =3D=3D MethodDeclarations.putDataEraseMethodLocal_=
id || methodId =3D=3D MethodDeclarations.putDataMethodLocal_id) &&
+            argSubscript =3D=3D 2);
+   }
+
+   @SuppressWarnings("unchecked")
+   protected Map wrapMap(Map m, Set<MarshalledValue> marshalledValues, Inv=
ocationContext ctx)
+   {
+      Map copy =3D new HashMap();
+      for (Object key : m.keySet())
+      {
+         Object value =3D m.get(key);
+         copy.put(MarshalledValueHelper.excludeFromMarshalledValueWrapping=
(key) ? key : createAndAddMarshalledValue(key, marshalledValues, ctx),
+               MarshalledValueHelper.excludeFromMarshalledValueWrapping(va=
lue) ? value : createAndAddMarshalledValue(value, marshalledValues, ctx));
+      }
+      return copy;
+   }
+
+   protected MarshalledValue createAndAddMarshalledValue(Object toWrap, Se=
t<MarshalledValue> marshalledValues, InvocationContext ctx)
+   {
+      MarshalledValue mv =3D new MarshalledValue(toWrap);
+      marshalledValues.add(mv);
+      if (!ctx.isOriginLocal()) mv.setEqualityPreferenceForInstance(false);
+      return mv;
+   }
+}

Modified: core/trunk/src/main/java/org/jboss/cache/invocation/CacheInvocati=
onDelegate.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/java/org/jboss/cache/invocation/CacheInvocationDele=
gate.java	2008-01-21 23:13:15 UTC (rev 5175)
+++ core/trunk/src/main/java/org/jboss/cache/invocation/CacheInvocationDele=
gate.java	2008-01-22 01:06:22 UTC (rev 5176)
@@ -434,13 +434,13 @@
       return removeNode(Fqn.fromString(fqn));
    }
 =

-   public Node getNode(Fqn<?> fqn)
+   public NodeSPI<K, V> getNode(Fqn<?> fqn)
    {
       MethodCall m =3D MethodCallFactory.create(MethodDeclarations.getNode=
MethodLocal_id, fqn);
-      return (Node) invoke(m);
+      return (NodeSPI) invoke(m);
    }
 =

-   public Node getNode(String fqn)
+   public NodeSPI<K, V> getNode(String fqn)
    {
       return getNode(Fqn.fromString(fqn));
    }

Modified: core/trunk/src/main/java/org/jboss/cache/invocation/NodeInvocatio=
nDelegate.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/java/org/jboss/cache/invocation/NodeInvocationDeleg=
ate.java	2008-01-21 23:13:15 UTC (rev 5175)
+++ core/trunk/src/main/java/org/jboss/cache/invocation/NodeInvocationDeleg=
ate.java	2008-01-22 01:06:22 UTC (rev 5176)
@@ -274,12 +274,30 @@
       // TODO: Revisit.  Is this really threadsafe?  See comment in putIfA=
bsent() - same solution should be applied here too.
       assertValid();
       Fqn nf =3D new Fqn(getFqn(), f);
-      Option o1 =3D spi.getInvocationContext().getOptionOverrides().clone(=
);
+      Option o1 =3D null;
+      try
+      {
+         o1 =3D spi.getInvocationContext().getOptionOverrides().clone();
+      }
+      catch (CloneNotSupportedException e)
+      {
+         // should never happen
+         throw new RuntimeException(e);
+      }
       Node<K, V> child =3D getChild(f);
 =

       if (child =3D=3D null)
       {
-         Option o2 =3D o1.clone();
+         Option o2 =3D null;
+         try
+         {
+            o2 =3D o1.clone();
+         }
+         catch (CloneNotSupportedException e)
+         {
+            // should never happen
+            throw new RuntimeException(e);
+         }
          spi.getInvocationContext().setOptionOverrides(o1);
          spi.put(nf, null);
 =

@@ -442,6 +460,11 @@
       node.setLockForChildInsertRemove(lockForChildInsertRemove);
    }
 =

+   public void releaseObjectReferences(boolean recursive)
+   {
+      node.releaseObjectReferences(recursive);
+   }
+
    public boolean hasChildrenDirect()
    {
       return node.hasChildrenDirect();

Modified: core/trunk/src/main/java/org/jboss/cache/marshall/CacheMarshaller=
200.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/java/org/jboss/cache/marshall/CacheMarshaller200.ja=
va	2008-01-21 23:13:15 UTC (rev 5175)
+++ core/trunk/src/main/java/org/jboss/cache/marshall/CacheMarshaller200.ja=
va	2008-01-22 01:06:22 UTC (rev 5176)
@@ -52,6 +52,7 @@
    protected static final int MAGICNUMBER_GRAVITATERESULT =3D 19;
    protected static final int MAGICNUMBER_SHORT =3D 20;
    protected static final int MAGICNUMBER_MAPCOPY =3D 21;
+   protected static final int MAGICNUMBER_MARSHALLEDVALUE =3D 22;
    protected static final int MAGICNUMBER_NULL =3D 99;
    protected static final int MAGICNUMBER_SERIALIZABLE =3D 100;
    protected static final int MAGICNUMBER_REF =3D 101;
@@ -143,12 +144,13 @@
       ClassLoader toUse =3D defaultClassLoader;
       Thread current =3D Thread.currentThread();
       ClassLoader old =3D current.getContextClassLoader();
+      if (old !=3D null) toUse =3D old;
 =

       try
       {
          if (useRegionBasedMarshalling) // got to check again in case this=
 meth is called directly
          {
-            log.trace("Writing region " + region + " to stream");
+            if (trace) log.trace("Writing region " + region + " to stream"=
);
             Region r =3D null;
             if (region !=3D null) r =3D regionManager.getRegion(region, fa=
lse);
             if (r !=3D null && r.getClassLoader() !=3D null) toUse =3D r.g=
etClassLoader();
@@ -301,6 +303,11 @@
             throw new IllegalArgumentException("MethodCall does not have a=
 valid method id.  Was this method call created with MethodCallFactory?");
          }
       }
+      else if (o instanceof MarshalledValue)
+      {
+         out.writeByte(MAGICNUMBER_MARSHALLEDVALUE);
+         ((MarshalledValue) o).writeExternal(out);
+      }
       else if (o instanceof Fqn)
       {
          out.writeByte(MAGICNUMBER_FQN);
@@ -550,6 +557,10 @@
             retVal =3D in.readObject();
             refMap.put(reference, retVal);
             return retVal;
+         case MAGICNUMBER_MARSHALLEDVALUE:
+            MarshalledValue mv =3D new MarshalledValue();
+            mv.readExternal(in);
+            return mv;
          case MAGICNUMBER_METHODCALL:
             retVal =3D unmarshallMethodCall(in, refMap);
             return retVal;

Added: core/trunk/src/main/java/org/jboss/cache/marshall/MarshalledValue.ja=
va
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/java/org/jboss/cache/marshall/MarshalledValue.java	=
                        (rev 0)
+++ core/trunk/src/main/java/org/jboss/cache/marshall/MarshalledValue.java	=
2008-01-22 01:06:22 UTC (rev 5176)
@@ -0,0 +1,200 @@
+package org.jboss.cache.marshall;
+
+import org.jboss.cache.CacheException;
+import org.jboss.util.stream.MarshalledValueInputStream;
+
+import java.io.*;
+import java.util.Arrays;
+
+/**
+ * Wrapper that wraps cached data, providing lazy deserialization using th=
e calling thread's context class loader.
+ * <p/>
+ * The {@link org.jboss.cache.interceptors.MarshalledValueInterceptor} han=
dles transparent
+ * wrapping/unwrapping of cached data.
+ * <p/>
+ *
+ * @author Manik Surtani (<a href=3D"mailto:manik(a)jboss.org">manik(a)jbo=
ss.org</a>)
+ * @see org.jboss.cache.interceptors.MarshalledValueInterceptor
+ * @since 2.1.0
+ */
+public class MarshalledValue implements Externalizable
+{
+   protected Object instance;
+   protected byte[] raw;
+   private int cachedHashCode =3D 0;
+   // by default equals() will test on the istance rather than the byte ar=
ray if conversion is required.
+   private transient boolean equalityPreferenceForInstance =3D true;
+
+   public MarshalledValue(Object instance)
+   {
+      if (instance =3D=3D null) throw new NullPointerException("Null value=
s cannot be wrapped as MarshalledValues!");
+
+      if (instance instanceof Serializable)
+         this.instance =3D instance;
+      else
+         throw new CacheException(new NotSerializableException("Marshalled=
 values can only wrap Objects that are serializable!  Instance of " + insta=
nce.getClass() + " won't Serialize."));
+   }
+
+   public MarshalledValue()
+   {
+      // empty ctor for serialization
+   }
+
+   public void setEqualityPreferenceForInstance(boolean equalityPreference=
ForInstance)
+   {
+      this.equalityPreferenceForInstance =3D equalityPreferenceForInstance;
+   }
+
+   public synchronized void serialize()
+   {
+      if (raw =3D=3D null)
+      {
+         try
+         {
+            ByteArrayOutputStream baos =3D new ByteArrayOutputStream();
+            ObjectOutputStream oos =3D new ObjectOutputStream(baos);
+            oos.writeObject(instance);
+            oos.close();
+            baos.close();
+            // Do NOT set instance to null over here, since it may be used=
 elsewhere (e.g., in a cache listener).
+            // this will be compacted by the MarshalledValueInterceptor wh=
en the call returns.
+//            instance =3D null;
+            raw =3D baos.toByteArray();
+         }
+         catch (Exception e)
+         {
+            throw new
+                  CacheException("Unable to marshall value " + instance);
+         }
+      }
+   }
+
+   public synchronized void deserialize()
+   {
+      if (instance =3D=3D null)
+      {
+         try
+         {
+            ByteArrayInputStream bais =3D new ByteArrayInputStream(raw);
+            // use a MarshalledValueInputStream since it needs to be aware=
 of any context class loaders on the current thread.
+            ObjectInputStream ois =3D new MarshalledValueInputStream(bais);
+            instance =3D ois.readObject();
+            ois.close();
+            bais.close();
+//            raw =3D null;
+         }
+         catch (Exception e)
+         {
+            throw new CacheException("Unable to unmarshall value", e);
+         }
+      }
+   }
+
+   /**
+    * Compacts the references held by this class to a single reference.  I=
f only one representation exists this method
+    * is a no-op unless the 'force' parameter is used, in which case the r=
eference held is forcefully switched to the
+    * 'preferred representation'.
+    * <p/>
+    * Either way, a call to compact() will ensure that only one representa=
tion is held.
+    * <p/>
+    *
+    * @param preferSerializedRepresentation if true and both representatio=
ns exist, the serialized representation is favoured.  If false, the deseria=
lized representation is preferred.
+    * @param force                          ensures the preferred represen=
tation is maintained and the other released, even if this means serializing=
 or deserializing.
+    */
+   public void compact(boolean preferSerializedRepresentation, boolean for=
ce)
+   {
+      // reset the equalityPreference
+      equalityPreferenceForInstance =3D true;
+      if (force)
+      {
+         if (preferSerializedRepresentation && raw =3D=3D null) serialize(=
);
+         else if (!preferSerializedRepresentation && instance =3D=3D null)=
 deserialize();
+      }
+
+      if (instance !=3D null && raw !=3D null)
+      {
+         // need to lose one representation!
+
+         if (preferSerializedRepresentation)
+         {
+            instance =3D null;
+         }
+         else
+         {
+            raw =3D null;
+         }
+      }
+   }
+
+   public void writeExternal(ObjectOutput out) throws IOException
+   {
+      if (raw =3D=3D null) serialize();
+      out.writeInt(raw.length);
+      out.write(raw);
+      out.writeInt(hashCode());
+   }
+
+   public void readExternal(ObjectInput in) throws IOException, ClassNotFo=
undException
+   {
+      int size =3D in.readInt();
+      raw =3D new byte[size];
+      cachedHashCode =3D 0;
+      in.read(raw);
+      cachedHashCode =3D in.readInt();
+   }
+
+   public Object get() throws IOException, ClassNotFoundException
+   {
+      if (instance =3D=3D null) deserialize();
+      return instance;
+   }
+
+   @Override
+   public boolean equals(Object o)
+   {
+      if (this =3D=3D o) return true;
+      if (o =3D=3D null || getClass() !=3D o.getClass()) return false;
+
+      MarshalledValue that =3D (MarshalledValue) o;
+
+      // if both versions are serialized or deserialized, just compare the=
 relevant representations.
+      if (raw !=3D null && that.raw !=3D null) return Arrays.equals(raw, t=
hat.raw);
+      if (instance !=3D null && that.instance !=3D null) return instance.e=
quals(that.instance);
+
+      // if conversion of one representation to the other is necessary, th=
en see which we prefer converting.
+      if (equalityPreferenceForInstance)
+      {
+         if (instance =3D=3D null) deserialize();
+         if (that.instance =3D=3D null) that.deserialize();
+         return instance.equals(that.instance);
+      }
+      else
+      {
+         if (raw =3D=3D null) serialize();
+         if (that.raw =3D=3D null) that.serialize();
+         return Arrays.equals(raw, that.raw);
+      }
+   }
+
+   @Override
+   public int hashCode()
+   {
+      if (cachedHashCode =3D=3D 0)
+      {
+         // always calculate the hashcode based on the instance since this=
 is where we're getting the equals()
+         if (instance =3D=3D null) deserialize();
+         cachedHashCode =3D instance.hashCode();
+         if (cachedHashCode =3D=3D 0) // degenerate case
+         {
+            cachedHashCode =3D 0xFEED;
+         }
+      }
+      return cachedHashCode;
+   }
+
+   @Override
+   public String toString()
+   {
+      return "MarshalledValue(cachedHashCode=3D" + cachedHashCode + "; ser=
ialized=3D" + (raw !=3D null) + ")";
+   }
+}

Added: core/trunk/src/main/java/org/jboss/cache/marshall/MarshalledValueHel=
per.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/java/org/jboss/cache/marshall/MarshalledValueHelper=
.java	                        (rev 0)
+++ core/trunk/src/main/java/org/jboss/cache/marshall/MarshalledValueHelper=
.java	2008-01-22 01:06:22 UTC (rev 5176)
@@ -0,0 +1,56 @@
+package org.jboss.cache.marshall;
+
+import org.jboss.cache.Fqn;
+import org.jboss.cache.transaction.GlobalTransaction;
+import org.jgroups.Address;
+
+/**
+ * Common functionality used by the {@link org.jboss.cache.interceptors.Ma=
rshalledValueInterceptor} and the {@link MarshalledValueMap}.
+ *
+ * @author Manik Surtani (<a href=3D"mailto:manik(a)jboss.org">manik(a)jbo=
ss.org</a>)
+ * @see MarshalledValue
+ * @see org.jboss.cache.interceptors.MarshalledValueInterceptor
+ * @see org.jboss.cache.marshall.MarshalledValueMap
+ * @since 2.1.0
+ */
+public class MarshalledValueHelper
+{
+   /**
+    * Tests whether the type should be excluded from MarshalledValue wrapp=
ing.
+    *
+    * @param type type to test.  Should not be null.
+    * @return true if it should be excluded from MarshalledValue wrapping.
+    */
+   public static boolean isTypeExcluded(Class type)
+   {
+      return type.equals(String.class) || type.isPrimitive() ||
+            type.equals(Void.class) || type.equals(Boolean.class) || type.=
equals(Character.class) ||
+            type.equals(Byte.class) || type.equals(Short.class) || type.eq=
uals(Integer.class) ||
+            type.equals(Long.class) || type.equals(Float.class) || type.eq=
uals(Double.class) ||
+            (type.isArray() && isTypeExcluded(type.getComponentType()));
+   }
+
+   /**
+    * Tests if the type is a JBoss Cache system type, and hence excluded f=
rom MarshalledValue wrapping.
+    *
+    * @param type type to test.  Should not be null.
+    * @return true if this is a system type.
+    */
+   public static boolean isSystemType(Class type)
+   {
+      return type.equals(Fqn.class) || type.equals(GlobalTransaction.class=
) || type.equals(Address.class) ||
+            type.equals(MethodCall.class) || type.equals(MarshalledValue.c=
lass);
+   }
+
+   /**
+    * Tests if an object should be excluded from being wrapped as a Marsha=
lledValue.  Excluded if the object is null or
+    * if it's type returns true when passed into {@link #isTypeExcluded(Cl=
ass)} or {@link #isSystemType(Class)}.
+    *
+    * @param object object to test
+    * @return true if it is to be excluded from MarshalledValue wrapping.
+    */
+   public static boolean excludeFromMarshalledValueWrapping(Object object)
+   {
+      return object =3D=3D null || isSystemType(object.getClass()) || isTy=
peExcluded(object.getClass());
+   }
+}

Added: core/trunk/src/main/java/org/jboss/cache/marshall/MarshalledValueMap=
.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/java/org/jboss/cache/marshall/MarshalledValueMap.ja=
va	                        (rev 0)
+++ core/trunk/src/main/java/org/jboss/cache/marshall/MarshalledValueMap.ja=
va	2008-01-22 01:06:22 UTC (rev 5176)
@@ -0,0 +1,182 @@
+package org.jboss.cache.marshall;
+
+import net.jcip.annotations.Immutable;
+import org.jboss.cache.CacheException;
+
+import java.io.IOException;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+/**
+ * A Map that is able to wrap/unwrap MarshalledValues in keys or values.  =
Note that calling keySet(), entrySet() or values()
+ * could be expensive if this map is large!!
+ * <p/>
+ * Also note that this is an immutable Map.
+ * <p/>
+ *
+ * @author Manik Surtani (<a href=3D"mailto:manik(a)jboss.org">manik(a)jbo=
ss.org</a>)
+ * @see MarshalledValue
+ * @since 2.1.0
+ */
+(a)Immutable
+public class MarshalledValueMap implements Map
+{
+   Map delegate;
+   Map<Object, MarshalledValue> marshalledValues;
+
+   public MarshalledValueMap(Map delegate)
+   {
+      this.delegate =3D delegate;
+   }
+
+   protected MarshalledValue getMarshalledValue(Object o)
+   {
+      if (marshalledValues =3D=3D null) marshalledValues =3D new HashMap<O=
bject, MarshalledValue>();
+      if (marshalledValues.containsKey(o)) return marshalledValues.get(o);
+      MarshalledValue mv =3D new MarshalledValue(o);
+      marshalledValues.put(o, mv);
+      return mv;
+   }
+
+   public int size()
+   {
+      return delegate.size();
+   }
+
+   public boolean isEmpty()
+   {
+      return delegate.isEmpty();
+   }
+
+   public boolean containsKey(Object key)
+   {
+      if (MarshalledValueHelper.excludeFromMarshalledValueWrapping(key))
+      {
+         return delegate.containsKey(key);
+      }
+      else
+      {
+         return delegate.containsKey(getMarshalledValue(key));
+      }
+   }
+
+   public boolean containsValue(Object value)
+   {
+      if (MarshalledValueHelper.excludeFromMarshalledValueWrapping(value))
+      {
+         return delegate.containsValue(value);
+      }
+      else
+      {
+         return delegate.containsValue(getMarshalledValue(value));
+      }
+   }
+
+   public Object get(Object key)
+   {
+      Object retVal;
+      if (MarshalledValueHelper.excludeFromMarshalledValueWrapping(key))
+      {
+         retVal =3D delegate.get(key);
+      }
+      else
+      {
+         retVal =3D delegate.get(getMarshalledValue(key));
+      }
+
+      if (retVal instanceof MarshalledValue) try
+      {
+         retVal =3D ((MarshalledValue) retVal).get();
+      }
+      catch (Exception e)
+      {
+         throw new CacheException("Unable to unmarshall MarshalledValue", =
e);
+      }
+
+      return retVal;
+   }
+
+   public Object put(Object key, Object value)
+   {
+      throw new UnsupportedOperationException("This is an immutable map!");
+   }
+
+   public Object remove(Object key)
+   {
+      throw new UnsupportedOperationException("This is an immutable map!");
+   }
+
+   public void putAll(Map t)
+   {
+      throw new UnsupportedOperationException("This is an immutable map!");
+   }
+
+   public void clear()
+   {
+      throw new UnsupportedOperationException("This is an immutable map!");
+   }
+
+   public Set keySet()
+   {
+      try
+      {
+         return unmarshallSet(delegate.keySet());
+      }
+      catch (Exception e)
+      {
+         throw new CacheException("Unable to unmarshall MarshalledValues i=
n collection", e);
+      }
+   }
+
+   public Collection values()
+   {
+      try
+      {
+         return unmarshallList(delegate.values());
+      }
+      catch (Exception e)
+      {
+         throw new CacheException("Unable to unmarshall MarshalledValues i=
n collection", e);
+      }
+   }
+
+   public Set entrySet()
+   {
+      try
+      {
+         return unmarshallSet(delegate.entrySet());
+      }
+      catch (Exception e)
+      {
+         throw new CacheException("Unable to unmarshall MarshalledValues i=
n collection", e);
+      }
+   }
+
+   @SuppressWarnings("unchecked")
+   protected Set unmarshallSet(Set set) throws IOException, ClassNotFoundE=
xception
+   {
+      Set newSet =3D new HashSet();
+      for (Object o : set)
+      {
+         newSet.add(o instanceof MarshalledValue ? ((MarshalledValue) o).g=
et() : o);
+      }
+      return Collections.unmodifiableSet(newSet);
+   }
+
+   @SuppressWarnings("unchecked")
+   protected List unmarshallList(Collection c) throws IOException, ClassNo=
tFoundException
+   {
+      List newList =3D new LinkedList();
+      for (Object o : c)
+      {
+         newList.add(o instanceof MarshalledValue ? ((MarshalledValue) o).=
get() : o);
+      }
+      return Collections.unmodifiableList(newList);
+   }
+}

Modified: core/trunk/src/main/java/org/jboss/cache/marshall/MethodDeclarati=
ons.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/java/org/jboss/cache/marshall/MethodDeclarations.ja=
va	2008-01-21 23:13:15 UTC (rev 5175)
+++ core/trunk/src/main/java/org/jboss/cache/marshall/MethodDeclarations.ja=
va	2008-01-22 01:06:22 UTC (rev 5176)
@@ -555,5 +555,17 @@
          throw new CacheException("Attempting to look up a versioned equiv=
alent of a non-crud method");
       }
    }
+
+   /**
+    * Returns true if the method call is declared in the public Cache API.=
  This includes all put, get, remove, getChildrenNames,
+    * exists calls, but not calls like commit, rollback, prepare, block, u=
nblock, etc.
+    *
+    * @param id method call id to test
+    * @return true if this is an API method call.
+    */
+   public static boolean isAPIMethodCall(int id)
+   {
+      return isCrudMethod(id) || isGetMethod(id);
+   }
 }
 =


Modified: core/trunk/src/main/java/org/jboss/cache/notifications/Notifier.j=
ava
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/java/org/jboss/cache/notifications/Notifier.java	20=
08-01-21 23:13:15 UTC (rev 5175)
+++ core/trunk/src/main/java/org/jboss/cache/notifications/Notifier.java	20=
08-01-22 01:06:22 UTC (rev 5176)
@@ -15,6 +15,7 @@
 import org.jboss.cache.InvocationContext;
 import org.jboss.cache.buddyreplication.BuddyGroup;
 import org.jboss.cache.factories.annotations.Inject;
+import org.jboss.cache.marshall.MarshalledValueMap;
 import org.jboss.cache.notifications.annotation.*;
 import org.jboss.cache.notifications.event.*;
 import static org.jboss.cache.notifications.event.Event.Type.*;
@@ -634,8 +635,8 @@
 =

    private static Map copy(Map data)
    {
-      if (safe(data)) return data;
-      return new MapCopy(data);
+      if (safe(data)) return new MarshalledValueMap(data);
+      return new MarshalledValueMap(new MapCopy(data));
    }
 =

    private void restoreInvocationContext(InvocationContext backup)

Modified: core/trunk/src/main/java/org/jboss/cache/optimistic/WorkspaceNode=
Impl.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/java/org/jboss/cache/optimistic/WorkspaceNodeImpl.j=
ava	2008-01-21 23:13:15 UTC (rev 5175)
+++ core/trunk/src/main/java/org/jboss/cache/optimistic/WorkspaceNodeImpl.j=
ava	2008-01-22 01:06:22 UTC (rev 5176)
@@ -389,6 +389,11 @@
       throw new UnsupportedOperationException();
    }
 =

+   public void releaseObjectReferences(boolean recursive)
+   {
+      throw new UnsupportedOperationException();
+   }
+
    public NodeSPI<K, V> getChild(Fqn f)
    {
       if (f.size() > 1)

Modified: core/trunk/src/test/java/org/jboss/cache/factories/InterceptorCha=
inFactoryTest.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/test/java/org/jboss/cache/factories/InterceptorChainFact=
oryTest.java	2008-01-21 23:13:15 UTC (rev 5175)
+++ core/trunk/src/test/java/org/jboss/cache/factories/InterceptorChainFact=
oryTest.java	2008-01-22 01:06:22 UTC (rev 5176)
@@ -29,6 +29,7 @@
    {
       cache =3D (CacheSPI) new DefaultCacheFactory().createCache(false);
       cache.getConfiguration().setCacheMode("LOCAL");
+      cache.getConfiguration().setUseLazyDeserialization(false);
    }
 =

    @AfterMethod(alwaysRun =3D true)

Added: core/trunk/src/test/java/org/jboss/cache/interceptors/MarshalledValu=
eInterceptorTest.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/test/java/org/jboss/cache/interceptors/MarshalledValueIn=
terceptorTest.java	                        (rev 0)
+++ core/trunk/src/test/java/org/jboss/cache/interceptors/MarshalledValueIn=
terceptorTest.java	2008-01-22 01:06:22 UTC (rev 5176)
@@ -0,0 +1,140 @@
+package org.jboss.cache.interceptors;
+
+import org.jboss.cache.CacheSPI;
+import org.jboss.cache.DefaultCacheFactory;
+import org.jboss.cache.config.Configuration;
+import org.jboss.cache.marshall.MarshalledValueHelper;
+import org.jboss.cache.misc.TestingUtil;
+import org.jboss.cache.util.CachePrinter;
+import org.testng.annotations.AfterMethod;
+import org.testng.annotations.Test;
+
+import java.util.Collection;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author Manik Surtani (<a href=3D"mailto:manik(a)jboss.org">manik(a)jbo=
ss.org</a>)
+ * @since 2.1.0
+ */
+(a)Test(groups =3D "functional")
+public class MarshalledValueInterceptorTest
+{
+   CacheSPI c;
+
+   @AfterMethod
+   public void tearDown()
+   {
+      TestingUtil.killCaches(c);
+   }
+
+   public void testDefaultInterceptorStack()
+   {
+      c =3D (CacheSPI) new DefaultCacheFactory().createCache();
+
+      System.out.println(CachePrinter.printCacheInterceptors(c));
+      assert TestingUtil.findInterceptor(c, MarshalledValueInterceptor.cla=
ss) !=3D null;
+   }
+
+   public void testEnabledInterceptorStack()
+   {
+      Configuration cfg =3D new Configuration();
+      cfg.setUseLazyDeserialization(true);
+      c =3D (CacheSPI) new DefaultCacheFactory().createCache(cfg);
+
+      System.out.println(CachePrinter.printCacheInterceptors(c));
+      assert TestingUtil.findInterceptor(c, MarshalledValueInterceptor.cla=
ss) !=3D null;
+   }
+
+   public void testDisabledInterceptorStack()
+   {
+      Configuration cfg =3D new Configuration();
+      cfg.setUseLazyDeserialization(false);
+      c =3D (CacheSPI) new DefaultCacheFactory().createCache(cfg);
+
+      System.out.println(CachePrinter.printCacheInterceptors(c));
+      assert TestingUtil.findInterceptor(c, MarshalledValueInterceptor.cla=
ss) =3D=3D null;
+   }
+
+   public void testExcludedTypes()
+   {
+      // Strings
+      assert MarshalledValueHelper.isTypeExcluded(String.class);
+      assert MarshalledValueHelper.isTypeExcluded(String[].class);
+      assert MarshalledValueHelper.isTypeExcluded(String[][].class);
+      assert MarshalledValueHelper.isTypeExcluded(String[][][].class);
+
+      // primitives
+      assert MarshalledValueHelper.isTypeExcluded(void.class);
+      assert MarshalledValueHelper.isTypeExcluded(boolean.class);
+      assert MarshalledValueHelper.isTypeExcluded(char.class);
+      assert MarshalledValueHelper.isTypeExcluded(byte.class);
+      assert MarshalledValueHelper.isTypeExcluded(short.class);
+      assert MarshalledValueHelper.isTypeExcluded(int.class);
+      assert MarshalledValueHelper.isTypeExcluded(long.class);
+      assert MarshalledValueHelper.isTypeExcluded(float.class);
+      assert MarshalledValueHelper.isTypeExcluded(double.class);
+
+      assert MarshalledValueHelper.isTypeExcluded(boolean[].class);
+      assert MarshalledValueHelper.isTypeExcluded(char[].class);
+      assert MarshalledValueHelper.isTypeExcluded(byte[].class);
+      assert MarshalledValueHelper.isTypeExcluded(short[].class);
+      assert MarshalledValueHelper.isTypeExcluded(int[].class);
+      assert MarshalledValueHelper.isTypeExcluded(long[].class);
+      assert MarshalledValueHelper.isTypeExcluded(float[].class);
+      assert MarshalledValueHelper.isTypeExcluded(double[].class);
+
+      assert MarshalledValueHelper.isTypeExcluded(boolean[][].class);
+      assert MarshalledValueHelper.isTypeExcluded(char[][].class);
+      assert MarshalledValueHelper.isTypeExcluded(byte[][].class);
+      assert MarshalledValueHelper.isTypeExcluded(short[][].class);
+      assert MarshalledValueHelper.isTypeExcluded(int[][].class);
+      assert MarshalledValueHelper.isTypeExcluded(long[][].class);
+      assert MarshalledValueHelper.isTypeExcluded(float[][].class);
+      assert MarshalledValueHelper.isTypeExcluded(double[][].class);
+
+      assert MarshalledValueHelper.isTypeExcluded(Void.class);
+      assert MarshalledValueHelper.isTypeExcluded(Boolean.class);
+      assert MarshalledValueHelper.isTypeExcluded(Character.class);
+      assert MarshalledValueHelper.isTypeExcluded(Byte.class);
+      assert MarshalledValueHelper.isTypeExcluded(Short.class);
+      assert MarshalledValueHelper.isTypeExcluded(Integer.class);
+      assert MarshalledValueHelper.isTypeExcluded(Long.class);
+      assert MarshalledValueHelper.isTypeExcluded(Float.class);
+      assert MarshalledValueHelper.isTypeExcluded(Double.class);
+
+      assert MarshalledValueHelper.isTypeExcluded(Boolean[].class);
+      assert MarshalledValueHelper.isTypeExcluded(Character[].class);
+      assert MarshalledValueHelper.isTypeExcluded(Byte[].class);
+      assert MarshalledValueHelper.isTypeExcluded(Short[].class);
+      assert MarshalledValueHelper.isTypeExcluded(Integer[].class);
+      assert MarshalledValueHelper.isTypeExcluded(Long[].class);
+      assert MarshalledValueHelper.isTypeExcluded(Float[].class);
+      assert MarshalledValueHelper.isTypeExcluded(Double[].class);
+
+      assert MarshalledValueHelper.isTypeExcluded(Boolean[][].class);
+      assert MarshalledValueHelper.isTypeExcluded(Character[][].class);
+      assert MarshalledValueHelper.isTypeExcluded(Byte[][].class);
+      assert MarshalledValueHelper.isTypeExcluded(Short[][].class);
+      assert MarshalledValueHelper.isTypeExcluded(Integer[][].class);
+      assert MarshalledValueHelper.isTypeExcluded(Long[][].class);
+      assert MarshalledValueHelper.isTypeExcluded(Float[][].class);
+      assert MarshalledValueHelper.isTypeExcluded(Double[][].class);
+   }
+
+   public void testNonExcludedTypes()
+   {
+      assert !MarshalledValueHelper.isTypeExcluded(Object.class);
+      assert !MarshalledValueHelper.isTypeExcluded(List.class);
+      assert !MarshalledValueHelper.isTypeExcluded(Collection.class);
+      assert !MarshalledValueHelper.isTypeExcluded(Map.class);
+      assert !MarshalledValueHelper.isTypeExcluded(Date.class);
+      assert !MarshalledValueHelper.isTypeExcluded(Thread.class);
+      assert !MarshalledValueHelper.isTypeExcluded(Collection.class);
+      assert !MarshalledValueHelper.isTypeExcluded(new Object()
+      {
+         String blah;
+      }.getClass());
+   }
+}

Modified: core/trunk/src/test/java/org/jboss/cache/lock/IdentityLockTest.ja=
va
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/test/java/org/jboss/cache/lock/IdentityLockTest.java	200=
8-01-21 23:13:15 UTC (rev 5175)
+++ core/trunk/src/test/java/org/jboss/cache/lock/IdentityLockTest.java	200=
8-01-22 01:06:22 UTC (rev 5176)
@@ -7,18 +7,12 @@
 package org.jboss.cache.lock;
 =

 =

-import static org.testng.AssertJUnit.assertFalse;
-import static org.testng.AssertJUnit.assertTrue;
-import static org.testng.AssertJUnit.fail;
-
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.jboss.cache.NodeSPI;
 import org.jboss.cache.misc.TestingUtil;
 import org.jboss.cache.transaction.GlobalTransaction;
 import org.testng.annotations.AfterMethod;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.Test;
+
 /**
  * Testing of different locking semantics.
  *
@@ -278,6 +272,7 @@
       };
 =

       t1.start();
+      TestingUtil.sleepThread(100);
       t2.start();
       TestingUtil.sleepThread(1000);
 =


Modified: core/trunk/src/test/java/org/jboss/cache/lock/LockReleaseTest.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/test/java/org/jboss/cache/lock/LockReleaseTest.java	2008=
-01-21 23:13:15 UTC (rev 5175)
+++ core/trunk/src/test/java/org/jboss/cache/lock/LockReleaseTest.java	2008=
-01-22 01:06:22 UTC (rev 5176)
@@ -157,7 +157,7 @@
       cache.put(NODE2, KEY, VAL1);
       assertEquals("we ran outside of a TX, locks should have been release=
d: ", 0, cache.getNumberOfLocksHeld());
 =

-      Set<String> keys =3D cache.getNode(NODE2).getChildrenNames();
+      Set<Object> keys =3D cache.getNode(NODE2).getChildrenNames();
       System.out.println("keys of " + NODE2 + " are " + keys);
       assertEquals("getChildrenNames() called outside the TX should have r=
eleased all locks", 0,
             cache.getNumberOfLocksHeld());

Added: core/trunk/src/test/java/org/jboss/cache/marshall/AsyncReplMarshalle=
dValuesTest.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/test/java/org/jboss/cache/marshall/AsyncReplMarshalledVa=
luesTest.java	                        (rev 0)
+++ core/trunk/src/test/java/org/jboss/cache/marshall/AsyncReplMarshalledVa=
luesTest.java	2008-01-22 01:06:22 UTC (rev 5176)
@@ -0,0 +1,13 @@
+package org.jboss.cache.marshall;
+
+/**
+ * @author Manik Surtani (<a href=3D"mailto:manik(a)jboss.org">manik(a)jbo=
ss.org</a>)
+ * @since 2.1.0
+ */
+public class AsyncReplMarshalledValuesTest extends AsyncReplTest
+{
+   public AsyncReplMarshalledValuesTest()
+   {
+      useMarshalledValues =3D true;
+   }
+}

Modified: core/trunk/src/test/java/org/jboss/cache/marshall/AsyncReplTest.j=
ava
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/test/java/org/jboss/cache/marshall/AsyncReplTest.java	20=
08-01-21 23:13:15 UTC (rev 5175)
+++ core/trunk/src/test/java/org/jboss/cache/marshall/AsyncReplTest.java	20=
08-01-22 01:06:22 UTC (rev 5176)
@@ -47,6 +47,7 @@
    Address addr_;
    Throwable ex_;
    private Fqn<String> aop =3D Fqn.fromString("/aop");
+   protected boolean useMarshalledValues =3D false;
 =

    @BeforeMethod(alwaysRun =3D true)
    public void setUp() throws Exception
@@ -73,7 +74,9 @@
       CacheSPI<Object, Object> cache =3D (CacheSPI<Object, Object>) new De=
faultCacheFactory().createCache(UnitTestCacheConfigurationFactory.createCon=
figuration(CacheMode.REPL_ASYNC), false);
       cache.getConfiguration().setClusterName(name);
       // Use marshaller
-      cache.getConfiguration().setUseRegionBasedMarshalling(true);
+      cache.getConfiguration().setUseLazyDeserialization(useMarshalledValu=
es);
+      cache.getConfiguration().setUseRegionBasedMarshalling(!useMarshalled=
Values);
+
       cache.create();
       cache.start();
       return cache;

Modified: core/trunk/src/test/java/org/jboss/cache/marshall/CustomCollectio=
nTest.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/test/java/org/jboss/cache/marshall/CustomCollectionTest.=
java	2008-01-21 23:13:15 UTC (rev 5175)
+++ core/trunk/src/test/java/org/jboss/cache/marshall/CustomCollectionTest.=
java	2008-01-22 01:06:22 UTC (rev 5176)
@@ -6,11 +6,13 @@
 import org.jboss.cache.Region;
 import org.jboss.cache.config.Configuration;
 import org.jboss.cache.lock.IsolationLevel;
+import static org.jboss.cache.marshall.CustomCollectionTest.MarshallingMod=
e.*;
 import static org.testng.AssertJUnit.*;
 import org.testng.annotations.AfterMethod;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 =

+import java.io.Serializable;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -22,10 +24,10 @@
  * @author <a href=3D"mailto:manik(a)jboss.org">Manik Surtani (manik(a)jbo=
ss.org)</a>
  */
 @Test(groups =3D {"functional"})
-public class CustomCollectionTest
+public class CustomCollectionTest extends RegionBasedMarshallingTestBase i=
mplements Serializable
 {
-   private Cache<Object, Object> cache1 =3D null;
-   private Cache<Object, Object> cache2 =3D null;
+   private transient Cache<Object, Object> cache1 =3D null;
+   private transient Cache<Object, Object> cache2 =3D null;
    private String myListClass =3D MyList.class.getName();
    private String mySetClass =3D MySet.class.getName();
    private String myMapClass =3D MyMap.class.getName();
@@ -46,55 +48,96 @@
 =

    public void testMap() throws Exception
    {
-      doMapTest(false);
+      doMapTest(DEFAULT_WITHOUT_MARSHALLED_VALUES);
    }
 =

    public void testMapWithRegions() throws Exception
    {
-      doMapTest(true);
+      doMapTest(CUSTOM_CLASSLOADER_WITH_REGIONS);
    }
 =

+   public void testMapWithMarshalledValues() throws Exception
+   {
+      doMapTest(CUSTOM_CLASSLOADER_WITH_MARSHALLEDVALUES);
+   }
+
+   public void testMapWithMarshalledValuesDefaultClassloader() throws Exce=
ption
+   {
+      doMapTest(DEFAULT_WITH_MARSHALLED_VALUES);
+   }
+
    public void testSet() throws Exception
    {
-      doSetTest(false);
+      doSetTest(DEFAULT_WITHOUT_MARSHALLED_VALUES);
    }
 =

    public void testSetWithRegions() throws Exception
    {
-      doSetTest(true);
+      doSetTest(CUSTOM_CLASSLOADER_WITH_REGIONS);
    }
 =

+   public void testSetWithMarshalledValues() throws Exception
+   {
+      doSetTest(CUSTOM_CLASSLOADER_WITH_MARSHALLEDVALUES);
+   }
+
+   public void testSetWithMarshalledValuesDefaultClassloader() throws Exce=
ption
+   {
+      doSetTest(DEFAULT_WITH_MARSHALLED_VALUES);
+   }
+
    public void testList() throws Exception
    {
-      doListTest(false);
+      doListTest(DEFAULT_WITHOUT_MARSHALLED_VALUES);
    }
 =

    public void testListWithRegions() throws Exception
    {
-      doListTest(true);
+      doListTest(CUSTOM_CLASSLOADER_WITH_REGIONS);
    }
 =

+   public void testListWithMarshalledValues() throws Exception
+   {
+      doListTest(CUSTOM_CLASSLOADER_WITH_MARSHALLEDVALUES);
+   }
+
+   public void testListWithMarshalledValuesDefaultClassloader() throws Exc=
eption
+   {
+      doListTest(DEFAULT_WITH_MARSHALLED_VALUES);
+   }
+
+   enum MarshallingMode
+   {
+      DEFAULT_WITH_MARSHALLED_VALUES, DEFAULT_WITHOUT_MARSHALLED_VALUES, C=
USTOM_CLASSLOADER_WITH_REGIONS, CUSTOM_CLASSLOADER_WITH_MARSHALLEDVALUES;
+
+      boolean isUsingCustomClassLoader()
+      {
+         return this =3D=3D CUSTOM_CLASSLOADER_WITH_MARSHALLEDVALUES || th=
is =3D=3D CUSTOM_CLASSLOADER_WITH_REGIONS;
+      }
+   }
+
    @SuppressWarnings("unchecked")
-   private void doMapTest(boolean contextClassLoader) throws Exception
+   private void doMapTest(MarshallingMode marshallingMode) throws Exception
    {
-      ClassLoader customClassLoader =3D getClassLoader();
+      ClassLoader customClassLoader =3D getCollectionsClassLoader();
       Class mapClass =3D customClassLoader.loadClass(myMapClass);
-      Map map =3D (Map) (contextClassLoader ? mapClass.newInstance() : new=
 MyMap());
+      Map map =3D (Map) (marshallingMode.isUsingCustomClassLoader() ? mapC=
lass.newInstance() : new MyMap());
 =

       map.put("k", "v");
 =

-      if (contextClassLoader)
-      {
-         enableRegionBasedClassLoading(customClassLoader);
-      }
+      configureCaches(customClassLoader, marshallingMode);
 =

       cache1.start();
       cache2.start();
 =

+      if (marshallingMode =3D=3D CUSTOM_CLASSLOADER_WITH_MARSHALLEDVALUES)
+         Thread.currentThread().setContextClassLoader(customClassLoader);
       cache1.put(fqn("/a"), "key", map);
       Object o =3D cache2.get(fqn("/a"), "key");
+      if (marshallingMode =3D=3D CUSTOM_CLASSLOADER_WITH_MARSHALLEDVALUES)=
 resetContextClassLoader();
+
       assertTrue(o instanceof Map);
-      if (contextClassLoader)
+      if (marshallingMode.isUsingCustomClassLoader())
       {
          assertNotSame(MyMap.class, o.getClass());
          assertSame(mapClass, o.getClass());
@@ -108,27 +151,27 @@
    }
 =

    @SuppressWarnings("unchecked")
-   private void doSetTest(boolean contextClassLoader) throws Exception
+   private void doSetTest(MarshallingMode marshallingMode) throws Exception
    {
-
-      ClassLoader customClassLoader =3D getClassLoader();
+      ClassLoader customClassLoader =3D getCollectionsClassLoader();
       Class setClass =3D customClassLoader.loadClass(mySetClass);
-      Set set =3D (Set) (contextClassLoader ? setClass.newInstance() : new=
 MySet());
+      Set set =3D (Set) (marshallingMode.isUsingCustomClassLoader() ? setC=
lass.newInstance() : new MySet());
 =

       set.add("k");
 =

-      if (contextClassLoader)
-      {
-         enableRegionBasedClassLoading(customClassLoader);
-      }
+      configureCaches(customClassLoader, marshallingMode);
 =

       cache1.start();
       cache2.start();
 =

+      if (marshallingMode =3D=3D CUSTOM_CLASSLOADER_WITH_MARSHALLEDVALUES)
+         Thread.currentThread().setContextClassLoader(customClassLoader);
       cache1.put(fqn("/a"), "key", set);
       Object o =3D cache2.get(fqn("/a"), "key");
+      if (marshallingMode =3D=3D CUSTOM_CLASSLOADER_WITH_MARSHALLEDVALUES)=
 resetContextClassLoader();
+
       assertTrue(o instanceof Set);
-      if (contextClassLoader)
+      if (marshallingMode.isUsingCustomClassLoader())
       {
          assertNotSame(MySet.class, o.getClass());
          assertSame(setClass, o.getClass());
@@ -142,28 +185,29 @@
    }
 =

    @SuppressWarnings("unchecked")
-   private void doListTest(boolean contextClassLoader) throws Exception
+   private void doListTest(MarshallingMode marshallingMode) throws Excepti=
on
    {
 =

-      ClassLoader customClassLoader =3D getClassLoader();
+      ClassLoader customClassLoader =3D getCollectionsClassLoader();
       Class listClass =3D customClassLoader.loadClass(myListClass);
 =

-      List list =3D (List) (contextClassLoader ? listClass.newInstance() :=
 new MyList());
+      List list =3D (List) (marshallingMode.isUsingCustomClassLoader() ? l=
istClass.newInstance() : new MyList());
 =

       list.add("k");
 =

-      if (contextClassLoader)
-      {
-         enableRegionBasedClassLoading(customClassLoader);
-      }
+      configureCaches(customClassLoader, marshallingMode);
 =

       cache1.start();
       cache2.start();
 =

+      if (marshallingMode =3D=3D CUSTOM_CLASSLOADER_WITH_MARSHALLEDVALUES)
+         Thread.currentThread().setContextClassLoader(customClassLoader);
       cache1.put(fqn("/a"), "key", list);
       Object o =3D cache2.get(fqn("/a"), "key");
+      if (marshallingMode =3D=3D CUSTOM_CLASSLOADER_WITH_MARSHALLEDVALUES)=
 resetContextClassLoader();
+
       assertTrue(o instanceof List);
-      if (contextClassLoader)
+      if (marshallingMode.isUsingCustomClassLoader())
       {
          assertSame(listClass, o.getClass());
          assertNotSame(MyList.class, o.getClass());
@@ -178,7 +222,7 @@
 =

    public void testHarnessClassLoader() throws Exception
    {
-      Class myListFromCustomLoader =3D getClassLoader().loadClass(myListCl=
ass);
+      Class myListFromCustomLoader =3D getCollectionsClassLoader().loadCla=
ss(myListClass);
       assertNotNull(myListFromCustomLoader);
       assertFalse(MyList.class.equals(myListFromCustomLoader));
 =

@@ -195,23 +239,31 @@
       }
    }
 =

-   private void enableRegionBasedClassLoading(ClassLoader customClassLoade=
r)
+   private void configureCaches(ClassLoader customClassLoader, Marshalling=
Mode marshallingMode)
    {
-      cache1.getConfiguration().setUseRegionBasedMarshalling(true);
-      Region region1 =3D cache1.getRegion(fqn("/a"), true);
-      region1.registerContextClassLoader(customClassLoader);
-//      cache1.getRegionManager().createRegion("/a", customClassLoader);
-//      cache1.getMarshaller().defaultMarshaller.registerClassLoader("/a",=
 customClassLoader);
-//      cache1.getMarshaller().defaultMarshaller.useRegionBasedMarshalling=
 =3D true;
-      cache2.getConfiguration().setUseRegionBasedMarshalling(true);
-      Region region2 =3D cache2.getRegion(fqn("/a"), true);
-      region2.registerContextClassLoader(customClassLoader);
-//      cache2.getRegionManager().createRegion("/a", customClassLoader);
-//      cache2.getMarshaller().defaultMarshaller.registerClassLoader("/a",=
 customClassLoader);
-//      cache2.getMarshaller().defaultMarshaller.useRegionBasedMarshalling=
 =3D true;
+      switch (marshallingMode)
+      {
+         case CUSTOM_CLASSLOADER_WITH_REGIONS:
+            cache1.getConfiguration().setUseRegionBasedMarshalling(true);
+            Region region1 =3D cache1.getRegion(fqn("/a"), true);
+            region1.registerContextClassLoader(customClassLoader);
+            cache2.getConfiguration().setUseRegionBasedMarshalling(true);
+            Region region2 =3D cache2.getRegion(fqn("/a"), true);
+            region2.registerContextClassLoader(customClassLoader);
+            // and carry on to the same setting as DEFAULT_WITHOUT_MARSHAL=
LED_VALUES
+         case DEFAULT_WITHOUT_MARSHALLED_VALUES:
+            cache1.getConfiguration().setUseLazyDeserialization(false);
+            cache2.getConfiguration().setUseLazyDeserialization(false);
+            break;
+         case DEFAULT_WITH_MARSHALLED_VALUES:
+         case CUSTOM_CLASSLOADER_WITH_MARSHALLEDVALUES:
+            cache1.getConfiguration().setUseLazyDeserialization(true);
+            cache2.getConfiguration().setUseLazyDeserialization(true);
+            break;
+      }
    }
 =

-   private ClassLoader getClassLoader()
+   private ClassLoader getCollectionsClassLoader()
    {
       String[] includesClasses =3D {myListClass, mySetClass, myMapClass};
       String[] excludesClasses =3D {};

Added: core/trunk/src/test/java/org/jboss/cache/marshall/MarshalledValueTes=
t.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/test/java/org/jboss/cache/marshall/MarshalledValueTest.j=
ava	                        (rev 0)
+++ core/trunk/src/test/java/org/jboss/cache/marshall/MarshalledValueTest.j=
ava	2008-01-22 01:06:22 UTC (rev 5176)
@@ -0,0 +1,375 @@
+package org.jboss.cache.marshall;
+
+import org.jboss.cache.CacheException;
+import org.jboss.cache.CacheSPI;
+import org.jboss.cache.DefaultCacheFactory;
+import org.jboss.cache.InvocationContext;
+import org.jboss.cache.NodeSPI;
+import org.jboss.cache.config.CacheLoaderConfig;
+import org.jboss.cache.config.Configuration;
+import org.jboss.cache.factories.ComponentRegistry;
+import org.jboss.cache.factories.UnitTestCacheConfigurationFactory;
+import org.jboss.cache.interceptors.Interceptor;
+import org.jboss.cache.interceptors.MarshalledValueInterceptor;
+import org.jboss.cache.loader.DummyInMemoryCacheLoader;
+import org.jboss.cache.misc.TestingUtil;
+import org.jboss.cache.notifications.annotation.CacheListener;
+import org.jboss.cache.notifications.annotation.NodeModified;
+import org.jboss.cache.notifications.event.NodeModifiedEvent;
+import org.testng.annotations.AfterMethod;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.Test;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutput;
+import java.io.ObjectOutputStream;
+import java.util.Map;
+
+/**
+ * Tests implicit marshalled values
+ *
+ * @author Manik Surtani (<a href=3D"mailto:manik(a)jboss.org">manik(a)jbo=
ss.org</a>)
+ * @since 2.1.0
+ */
+(a)Test(groups =3D "functional")
+public class MarshalledValueTest
+{
+   private CacheSPI<Object, Object> cache1, cache2;
+   private MarshalledValueListenerInterceptor mvli;
+
+
+   @BeforeMethod
+   public void setUp()
+   {
+      cache1 =3D (CacheSPI<Object, Object>) new DefaultCacheFactory<Object=
, Object>().createCache(UnitTestCacheConfigurationFactory.createConfigurati=
on(Configuration.CacheMode.REPL_SYNC));
+      cache2 =3D (CacheSPI<Object, Object>) new DefaultCacheFactory<Object=
, Object>().createCache(UnitTestCacheConfigurationFactory.createConfigurati=
on(Configuration.CacheMode.REPL_SYNC));
+
+      assert TestingUtil.findInterceptor(cache1, MarshalledValueIntercepto=
r.class) !=3D null : "Marshalled value interceptor not in chain!";
+      assert TestingUtil.findInterceptor(cache2, MarshalledValueIntercepto=
r.class) !=3D null : "Marshalled value interceptor not in chain!";
+
+      mvli =3D new MarshalledValueListenerInterceptor();
+      cache1.addInterceptor(mvli, MarshalledValueInterceptor.class);
+   }
+
+   @AfterMethod
+   public void tearDown()
+   {
+      TestingUtil.killCaches(cache1, cache2);
+      Pojo.serializationCount =3D 0;
+      Pojo.deserializationCount =3D 0;
+   }
+
+   private void assertOnlyOneRepresentationExists(MarshalledValue mv)
+   {
+      assert (mv.instance !=3D null && mv.raw =3D=3D null) || (mv.instance=
 =3D=3D null && mv.raw !=3D null) : "Only instance or raw representations s=
hould exist in a MarshalledValue; never both";
+   }
+
+   private void assertSerialized(MarshalledValue mv)
+   {
+      assert mv.raw !=3D null : "Should be serialized";
+   }
+
+   private void assertDeserialized(MarshalledValue mv)
+   {
+      assert mv.instance !=3D null : "Should be deserialized";
+   }
+
+   private void assertSerializationCounts(int serializationCount, int dese=
rializationCount)
+   {
+      assert Pojo.serializationCount =3D=3D serializationCount : "Serializ=
ation count: expected " + serializationCount + " but was " + Pojo.serializa=
tionCount;
+      assert Pojo.deserializationCount =3D=3D deserializationCount : "Dese=
rialization count: expected " + deserializationCount + " but was " + Pojo.d=
eserializationCount;
+   }
+
+   public void testNonSerializable()
+   {
+      try
+      {
+         cache1.put("/a", "Hello", new Object());
+         assert false : "Should have failed";
+      }
+      catch (CacheException expected)
+      {
+
+      }
+
+      assert mvli.invocationCount =3D=3D 0 : "Call should not have gone be=
yond the MarshalledValueInterceptor";
+
+      try
+      {
+         cache1.put("/a", new Object(), "Hello");
+         assert false : "Should have failed";
+      }
+      catch (CacheException expected)
+      {
+
+      }
+
+      assert mvli.invocationCount =3D=3D 0 : "Call should not have gone be=
yond the MarshalledValueInterceptor";
+   }
+
+   public void testNodeReleaseObjectValueReferences()
+   {
+      Pojo value =3D new Pojo();
+      cache1.put("/a", "key", value);
+      assertSerializationCounts(1, 0);
+      NodeSPI<Object, Object> node =3D cache1.getNode("/a");
+      Object o =3D node.getDirect("key");
+      assert o instanceof MarshalledValue;
+      MarshalledValue mv =3D (MarshalledValue) o;
+      assertDeserialized(mv);
+      assert node.get("key").equals(value);
+      assertDeserialized(mv);
+      assertSerializationCounts(1, 0);
+      node.releaseObjectReferences(false);
+      assertSerializationCounts(2, 0);
+      assertOnlyOneRepresentationExists(mv);
+      assertSerialized(mv);
+
+      // now on cache 2
+      node =3D cache2.getNode("/a");
+      o =3D node.getDirect("key");
+      assert o instanceof MarshalledValue;
+      mv =3D (MarshalledValue) o;
+      assertSerialized(mv); // this proves that unmarshalling on the recip=
ient cache instance is lazy
+
+      assert node.get("key").equals(value);
+      assertDeserialized(mv);
+      assertSerializationCounts(2, 1);
+      node.releaseObjectReferences(false);
+      assertSerializationCounts(2, 1);
+      assertOnlyOneRepresentationExists(mv);
+      assertSerialized(mv);
+   }
+
+   public void testNodeReleaseObjectKeyReferences() throws IOException, Cl=
assNotFoundException
+   {
+      Pojo key =3D new Pojo();
+      cache1.put("/a", key, "value");
+
+      assertSerializationCounts(1, 0);
+
+      NodeSPI<Object, Object> node =3D cache1.getNode("/a");
+      Object o =3D node.getKeysDirect().iterator().next();
+      assert o instanceof MarshalledValue;
+      MarshalledValue mv =3D (MarshalledValue) o;
+      assertDeserialized(mv);
+
+      assert node.get(key).equals("value");
+      assertDeserialized(mv);
+      assertSerializationCounts(1, 0);
+      node.releaseObjectReferences(false);
+      assertSerializationCounts(2, 0);
+      assertOnlyOneRepresentationExists(mv);
+      assertSerialized(mv);
+
+      // now on cache 2
+      node =3D cache2.getNode("/a");
+      o =3D node.getKeysDirect().iterator().next();
+      assert o instanceof MarshalledValue;
+      mv =3D (MarshalledValue) o;
+      assertSerialized(mv);
+      assert node.get(key).equals("value");
+      assertSerializationCounts(2, 1);
+      assertDeserialized(mv);
+      node.releaseObjectReferences(false);
+
+      assertOnlyOneRepresentationExists(mv);
+      assertSerialized(mv);
+      assertSerializationCounts(2, 1);
+   }
+
+   public void testEqualsAndHashCode() throws Exception
+   {
+      Pojo pojo =3D new Pojo();
+      MarshalledValue mv =3D new MarshalledValue(pojo);
+      assertDeserialized(mv);
+      int oldHashCode =3D mv.hashCode();
+
+      mv.serialize();
+      assertSerialized(mv);
+      assert oldHashCode =3D=3D mv.hashCode();
+
+      MarshalledValue mv2 =3D new MarshalledValue(pojo);
+      assertSerialized(mv);
+      assertDeserialized(mv2);
+
+      assert mv2.hashCode() =3D=3D oldHashCode;
+      assert mv.equals(mv2);
+   }
+
+   public void assertUseOfMagicNumbers() throws Exception
+   {
+      Pojo pojo =3D new Pojo();
+      MarshalledValue mv =3D new MarshalledValue(pojo);
+
+      Configuration c =3D new Configuration();
+      ComponentRegistry cr =3D new ComponentRegistry(c);
+
+      Marshaller marshaller =3D new CacheMarshaller210();
+      cr.registerComponent(marshaller, Marshaller.class);
+
+      // Wire the marshaller
+      cr.start();
+
+      // start the test
+      ByteArrayOutputStream bout =3D new ByteArrayOutputStream();
+      ObjectOutputStream out =3D new ObjectOutputStream(bout);
+      marshaller.objectToObjectStream(mv, out);
+      out.close();
+      bout.close();
+
+      // check that the rest just contains a byte stream which a Marshalle=
dValue will be able to deserialize.
+      ByteArrayInputStream bin =3D new ByteArrayInputStream(bout.toByteArr=
ay());
+      ObjectInputStream in =3D new ObjectInputStream(bin);
+
+      assert in.read() =3D=3D CacheMarshaller200.MAGICNUMBER_MARSHALLEDVAL=
UE;
+      MarshalledValue recreated =3D new MarshalledValue();
+      recreated.readExternal(in);
+
+      // there should be nothing more
+      assert in.available() =3D=3D 0;
+      in.close();
+      bin.close();
+
+      assertSerialized(recreated);
+      assert recreated.equals(mv);
+
+      // since both objects being compared are serialized, the equals() ab=
ove should just compare byte arrays.  =

+      assertSerialized(recreated);
+      assertOnlyOneRepresentationExists(recreated);
+   }
+
+   public void testCacheLoaders() throws CloneNotSupportedException
+   {
+      tearDown();
+      cache1 =3D (CacheSPI<Object, Object>) new DefaultCacheFactory<Object=
, Object>().createCache(UnitTestCacheConfigurationFactory.createConfigurati=
on(Configuration.CacheMode.REPL_SYNC), false);
+      cache2 =3D (CacheSPI<Object, Object>) new DefaultCacheFactory<Object=
, Object>().createCache(UnitTestCacheConfigurationFactory.createConfigurati=
on(Configuration.CacheMode.REPL_SYNC), false);
+
+      CacheLoaderConfig clc =3D new CacheLoaderConfig();
+      CacheLoaderConfig.IndividualCacheLoaderConfig iclc =3D new CacheLoad=
erConfig.IndividualCacheLoaderConfig();
+      iclc.setClassName(DummyInMemoryCacheLoader.class.getName());
+      clc.addIndividualCacheLoaderConfig(iclc);
+      cache1.getConfiguration().setCacheLoaderConfig(clc);
+      cache2.getConfiguration().setCacheLoaderConfig(clc.clone());
+
+      cache1.start();
+      cache2.start();
+
+      TestingUtil.blockUntilViewsReceived(60000, cache1, cache2);
+
+      Pojo pojo =3D new Pojo();
+      cache1.put("/a", "key", pojo);
+
+      assertSerializationCounts(1, 0);
+
+      cache2.get("/a", "key");
+
+      assertSerializationCounts(1, 1);
+   }
+
+   public void testCallbackValues()
+   {
+      Listener l =3D new Listener();
+      cache1.addCacheListener(l);
+      Pojo pojo =3D new Pojo();
+      cache1.put("/a", "key", pojo);
+
+      assert l.modData.size() =3D=3D 1;
+      assert l.modData.get("key") instanceof Pojo;
+      assertSerializationCounts(1, 0);
+   }
+
+   public void testRemoteCallbackValues()
+   {
+      Listener l =3D new Listener();
+      cache2.addCacheListener(l);
+      Pojo pojo =3D new Pojo();
+      cache1.put("/a", "key", pojo);
+
+      assert l.modData.size() =3D=3D 1;
+      pojo =3D (Pojo) l.modData.get("key");
+      assert pojo !=3D null;
+      assertSerializationCounts(1, 1);
+   }
+
+   @CacheListener
+   public static class Listener
+   {
+      Map modData;
+
+      @NodeModified
+      public void nodeModified(NodeModifiedEvent e)
+      {
+         if (!e.isPre()) modData =3D e.getData();
+      }
+   }
+
+   class MarshalledValueListenerInterceptor extends Interceptor
+   {
+      int invocationCount =3D 0;
+
+      public Object invoke(InvocationContext ctx) throws Throwable
+      {
+         invocationCount++;
+         MethodCall mc =3D ctx.getMethodCall();
+         for (Object arg : mc.getArgs())
+         {
+            if (arg instanceof MarshalledValue) assertOnlyOneRepresentatio=
nExists((MarshalledValue) arg);
+         }
+
+         Object retval =3D nextInterceptor(ctx);
+
+         if (retval instanceof MarshalledValue) assertOnlyOneRepresentatio=
nExists((MarshalledValue) retval);
+         return retval;
+      }
+   }
+
+   public static class Pojo implements Externalizable
+   {
+      int i;
+      boolean b;
+      static int serializationCount, deserializationCount;
+
+      public boolean equals(Object o)
+      {
+         if (this =3D=3D o) return true;
+         if (o =3D=3D null || getClass() !=3D o.getClass()) return false;
+
+         Pojo pojo =3D (Pojo) o;
+
+         if (b !=3D pojo.b) return false;
+         if (i !=3D pojo.i) return false;
+
+         return true;
+      }
+
+      public int hashCode()
+      {
+         int result;
+         result =3D i;
+         result =3D 31 * result + (b ? 1 : 0);
+         return result;
+      }
+
+      public void writeExternal(ObjectOutput out) throws IOException
+      {
+         out.writeInt(i);
+         out.writeBoolean(b);
+         serializationCount++;
+      }
+
+      public void readExternal(ObjectInput in) throws IOException, ClassNo=
tFoundException
+      {
+         i =3D in.readInt();
+         b =3D in.readBoolean();
+         deserializationCount++;
+      }
+   }
+}
+
+

Modified: core/trunk/src/test/java/org/jboss/cache/marshall/RegionBasedMars=
hallingTestBase.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/test/java/org/jboss/cache/marshall/RegionBasedMarshallin=
gTestBase.java	2008-01-21 23:13:15 UTC (rev 5175)
+++ core/trunk/src/test/java/org/jboss/cache/marshall/RegionBasedMarshallin=
gTestBase.java	2008-01-22 01:06:22 UTC (rev 5176)
@@ -7,14 +7,27 @@
 {
    protected static final String ADDRESS_CLASSNAME =3D "org.jboss.cache.ma=
rshall.data.Address";
    protected static final String PERSON_CLASSNAME =3D "org.jboss.cache.mar=
shall.data.Person";
+   protected ClassLoader originalClassLoader =3D Thread.currentThread().ge=
tContextClassLoader();
 =

    protected ClassLoader getClassLoader() throws Exception
    {
       String[] includesClasses =3D {PERSON_CLASSNAME, ADDRESS_CLASSNAME};
-      String [] excludesClasses =3D {};
+      String[] excludesClasses =3D {};
       ClassLoader cl =3D Thread.currentThread().getContextClassLoader();
       return new SelectedClassnameClassLoader(includesClasses, excludesCla=
sses, cl);
    }
 =

+   protected ClassLoader getFailingClassLoader() throws Exception
+   {
+      String[] includesClasses =3D {};
+      String[] excludesClasses =3D {};
+      String[] failingClasses =3D {PERSON_CLASSNAME, ADDRESS_CLASSNAME};
+      ClassLoader cl =3D Thread.currentThread().getContextClassLoader();
+      return new SelectedClassnameClassLoader(includesClasses, excludesCla=
sses, failingClasses, cl);
+   }
 =

+   protected void resetContextClassLoader()
+   {
+      Thread.currentThread().setContextClassLoader(originalClassLoader);
+   }
 }

Added: core/trunk/src/test/java/org/jboss/cache/marshall/ReturnValueMarshal=
lingMarshalledValuesTest.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/test/java/org/jboss/cache/marshall/ReturnValueMarshallin=
gMarshalledValuesTest.java	                        (rev 0)
+++ core/trunk/src/test/java/org/jboss/cache/marshall/ReturnValueMarshallin=
gMarshalledValuesTest.java	2008-01-22 01:06:22 UTC (rev 5176)
@@ -0,0 +1,16 @@
+package org.jboss.cache.marshall;
+
+import org.testng.annotations.Test;
+
+/**
+ * @author Manik Surtani (<a href=3D"mailto:manik(a)jboss.org">manik(a)jbo=
ss.org</a>)
+ * @since 2.1.0
+ */
+(a)Test(groups =3D {"functional", "jgroups"})
+public class ReturnValueMarshallingMarshalledValuesTest extends ReturnValu=
eMarshallingTest
+{
+   public ReturnValueMarshallingMarshalledValuesTest()
+   {
+      useMarshalledValues =3D true;
+   }
+}

Modified: core/trunk/src/test/java/org/jboss/cache/marshall/ReturnValueMars=
hallingTest.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/test/java/org/jboss/cache/marshall/ReturnValueMarshallin=
gTest.java	2008-01-21 23:13:15 UTC (rev 5175)
+++ core/trunk/src/test/java/org/jboss/cache/marshall/ReturnValueMarshallin=
gTest.java	2008-01-22 01:06:22 UTC (rev 5176)
@@ -21,8 +21,9 @@
  * @since 2.0.0
  */
 @Test(groups =3D {"functional", "jgroups"})
-public class ReturnValueMarshallingTest
+public class ReturnValueMarshallingTest extends RegionBasedMarshallingTest=
Base
 {
+   protected boolean useMarshalledValues =3D false;
    private CacheSPI<Object, Object> cache1, cache2;
    private Fqn fqn =3D Fqn.fromString("/a");
    private ClassLoader classLoader;
@@ -34,26 +35,30 @@
    public void setUp() throws Exception
    {
       cache1 =3D (CacheSPI<Object, Object>) new DefaultCacheFactory().crea=
teCache(false);
-      cache1.getConfiguration().setUseRegionBasedMarshalling(true);
+      cache1.getConfiguration().setUseLazyDeserialization(useMarshalledVal=
ues);
+      cache1.getConfiguration().setUseRegionBasedMarshalling(!useMarshalle=
dValues);
       cache1.getConfiguration().setCacheMode(Configuration.CacheMode.REPL_=
SYNC);
       cache1.getConfiguration().setSyncReplTimeout(60000);// to aid with d=
ebugging
       cache1.start();
 =

       cache2 =3D (CacheSPI<Object, Object>) new DefaultCacheFactory().crea=
teCache(false);
-      cache2.getConfiguration().setUseRegionBasedMarshalling(true);
+      cache2.getConfiguration().setUseLazyDeserialization(useMarshalledVal=
ues);
+      cache2.getConfiguration().setUseRegionBasedMarshalling(!useMarshalle=
dValues);
       cache2.getConfiguration().setCacheMode(Configuration.CacheMode.REPL_=
SYNC);
       cache2.getConfiguration().setSyncReplTimeout(60000);// to aid with d=
ebugging
       cache2.start();
 =

       classLoader =3D getClassLoader();
-      Region r1 =3D cache1.getRegion(fqn, true);
-      r1.setActive(true);
-      r1.registerContextClassLoader(classLoader);
+      if (!useMarshalledValues)
+      {
+         Region r1 =3D cache1.getRegion(fqn, true);
+         r1.setActive(true);
+         r1.registerContextClassLoader(classLoader);
+         Region r2 =3D cache2.getRegion(fqn, true);
+         r2.setActive(true);
+         r2.registerContextClassLoader(classLoader);
+      }
 =

-      Region r2 =3D cache2.getRegion(fqn, true);
-      r2.setActive(true);
-      r2.registerContextClassLoader(classLoader);
-
       listClass =3D classLoader.loadClass(className);
       value =3D listClass.newInstance();
 =

@@ -64,9 +69,11 @@
    public void tearDown()
    {
       TestingUtil.killCaches(cache1, cache2);
+      resetContextClassLoader();
    }
 =

-   private ClassLoader getClassLoader()
+   @Override
+   protected ClassLoader getClassLoader()
    {
       String[] includesClasses =3D {className};
       String[] excludesClasses =3D {};
@@ -76,6 +83,7 @@
 =

    public void testClusteredGet() throws Exception
    {
+      if (useMarshalledValues) Thread.currentThread().setContextClassLoade=
r(classLoader);
       assertNotNull(cache1.get(fqn, key));
       assertNotSame(MyList.class, cache1.get(fqn, key).getClass());
       assertSame(listClass, cache1.get(fqn, key).getClass());
@@ -99,12 +107,14 @@
 =

       // now test that the data returned has been marshalled using the app=
ropriate class loader.
       assertNotNull(data);
+      if (useMarshalledValues) data =3D ((MarshalledValue) data).get();
       assertNotSame(MyList.class, data.getClass());
       assertSame(listClass, data.getClass());
    }
 =

    public void testDataGravitation() throws Exception
    {
+      if (useMarshalledValues) Thread.currentThread().setContextClassLoade=
r(classLoader);
       assertNotNull(cache1.get(fqn, key));
       assertNotSame(MyList.class, cache1.get(fqn, key).getClass());
       assertSame(listClass, cache1.get(fqn, key).getClass());
@@ -125,6 +135,7 @@
       Object value =3D data.getNodeData().get(0).getAttributes().get(key);
 =

       assertNotNull(value);
+      if (useMarshalledValues) value =3D ((MarshalledValue) value).get();
       assertNotSame(MyList.class, value.getClass());
       assertSame(listClass, value.getClass());
    }

Modified: core/trunk/src/test/java/org/jboss/cache/marshall/SelectedClassna=
meClassLoader.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/test/java/org/jboss/cache/marshall/SelectedClassnameClas=
sLoader.java	2008-01-21 23:13:15 UTC (rev 5175)
+++ core/trunk/src/test/java/org/jboss/cache/marshall/SelectedClassnameClas=
sLoader.java	2008-01-22 01:06:22 UTC (rev 5176)
@@ -131,7 +131,6 @@
 =

    protected Class<?> findClass(String name) throws ClassNotFoundException
    {
-
       log.info("In SelectedClassnameClassLoader.findClass()");
       Class result =3D classes.get(name);
       if (result !=3D null)

Added: core/trunk/src/test/java/org/jboss/cache/marshall/SyncReplMarshalled=
ValuesTest.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/test/java/org/jboss/cache/marshall/SyncReplMarshalledVal=
uesTest.java	                        (rev 0)
+++ core/trunk/src/test/java/org/jboss/cache/marshall/SyncReplMarshalledVal=
uesTest.java	2008-01-22 01:06:22 UTC (rev 5176)
@@ -0,0 +1,22 @@
+package org.jboss.cache.marshall;
+
+import org.testng.annotations.Test;
+
+/**
+ * @author Manik Surtani (<a href=3D"mailto:manik(a)jboss.org">manik(a)jbo=
ss.org</a>)
+ * @since 2.1.0
+ */
+(a)Test(groups =3D {"functional", "jgroups"})
+public class SyncReplMarshalledValuesTest extends SyncReplTest
+{
+   public SyncReplMarshalledValuesTest()
+   {
+      useMarshalledValues =3D true;
+   }
+
+   @Override
+   public void testCustomFqn()
+   {
+      // meaningless when using marshalled values
+   }
+}

Modified: core/trunk/src/test/java/org/jboss/cache/marshall/SyncReplTest.ja=
va
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/test/java/org/jboss/cache/marshall/SyncReplTest.java	200=
8-01-21 23:13:15 UTC (rev 5175)
+++ core/trunk/src/test/java/org/jboss/cache/marshall/SyncReplTest.java	200=
8-01-22 01:06:22 UTC (rev 5176)
@@ -44,6 +44,7 @@
    Address addr_;
    Throwable ex_;
    private Fqn aop =3D Fqn.fromString("/aop");
+   protected boolean useMarshalledValues =3D false;
 =

    @BeforeMethod(alwaysRun =3D true)
    public void setUp() throws Exception
@@ -69,7 +70,9 @@
       CacheSPI<Object, Object> cache =3D (CacheSPI<Object, Object>) new De=
faultCacheFactory().createCache(UnitTestCacheConfigurationFactory.createCon=
figuration(CacheMode.REPL_SYNC), false);
       cache.getConfiguration().setClusterName(name);
       // Use marshaller
-      cache.getConfiguration().setUseRegionBasedMarshalling(true);
+      cache.getConfiguration().setUseLazyDeserialization(useMarshalledValu=
es);
+      cache.getConfiguration().setUseRegionBasedMarshalling(!useMarshalled=
Values);
+
       cache.create();
       cache.start();
       return cache;
@@ -90,6 +93,8 @@
          log("stopping cache2");
          cache2.stop();
       }
+
+      resetContextClassLoader();
    }
 =

    public void testPlainPut() throws Exception
@@ -102,17 +107,26 @@
 =

    public void testCCE() throws Exception
    {
-      ClassLoader cl =3D getClassLoader();
-      Region r1 =3D cache1.getRegion(aop, false) =3D=3D null ? cache1.getR=
egion(aop, true) : cache1.getRegion(aop, false);
-      r1.registerContextClassLoader(cl);
+      ClassLoader c1 =3D getClassLoader();
+      ClassLoader c2 =3D getClassLoader();
 =

-      cl =3D getClassLoader();
-      Region r2 =3D cache2.getRegion(aop, false) =3D=3D null ? cache2.getR=
egion(aop, true) : cache2.getRegion(aop, false);
-      r2.registerContextClassLoader(cl);
+      if (!useMarshalledValues)
+      {
+         Region r1 =3D cache1.getRegion(aop, false) =3D=3D null ? cache1.g=
etRegion(aop, true) : cache1.getRegion(aop, false);
+         r1.registerContextClassLoader(c1);
 =

+
+         Region r2 =3D cache2.getRegion(aop, false) =3D=3D null ? cache2.g=
etRegion(aop, true) : cache2.getRegion(aop, false);
+         r2.registerContextClassLoader(c2);
+      }
+
+      if (useMarshalledValues) Thread.currentThread().setContextClassLoade=
r(c1);
       cache1.put(aop, "person", ben_);
+      if (useMarshalledValues) resetContextClassLoader();
+      if (useMarshalledValues) Thread.currentThread().setContextClassLoade=
r(getFailingClassLoader());
       try
       {
+         if (useMarshalledValues) Thread.currentThread().setContextClassLo=
ader(c2);
          @SuppressWarnings("unused")
          Person person =3D (Person) cache2.get(aop, "person");
       }
@@ -127,16 +141,20 @@
    public void testPut() throws Exception
    {
       ClassLoader cla =3D getClassLoader();
-      Region r1 =3D cache1.getRegion(aop, false) =3D=3D null ? cache1.getR=
egion(aop, true) : cache1.getRegion(aop, false);
-      r1.registerContextClassLoader(cla);
       ClassLoader clb =3D getClassLoader();
-      Region r2 =3D cache2.getRegion(aop, false) =3D=3D null ? cache2.getR=
egion(aop, true) : cache2.getRegion(aop, false);
-      r2.registerContextClassLoader(clb);
-
+      if (!useMarshalledValues)
+      {
+         Region r1 =3D cache1.getRegion(aop, false) =3D=3D null ? cache1.g=
etRegion(aop, true) : cache1.getRegion(aop, false);
+         r1.registerContextClassLoader(cla);
+         Region r2 =3D cache2.getRegion(aop, false) =3D=3D null ? cache2.g=
etRegion(aop, true) : cache2.getRegion(aop, false);
+         r2.registerContextClassLoader(clb);
+      }
+      if (useMarshalledValues) Thread.currentThread().setContextClassLoade=
r(cla);
       cache1.put(aop, "person", ben_);
 =

       Object ben2;
-      // Can't cast it to Person. CCE will resutl.
+      // Can't cast it to Person. CCE will result.
+      if (useMarshalledValues) Thread.currentThread().setContextClassLoade=
r(clb);
       ben2 =3D cache2.get(aop, "person");
       assertEquals(ben_.toString(), ben2.toString());
    }
@@ -144,35 +162,31 @@
    public void testCLSet() throws Exception
    {
       ClassLoader cla =3D getClassLoader();
-      Region r1 =3D cache1.getRegion(aop, false) =3D=3D null ? cache1.getR=
egion(aop, true) : cache1.getRegion(aop, false);
-      r1.registerContextClassLoader(cla);
       ClassLoader clb =3D getClassLoader();
-      Region r2 =3D cache2.getRegion(aop, false) =3D=3D null ? cache2.getR=
egion(aop, true) : cache2.getRegion(aop, false);
-      r2.registerContextClassLoader(clb);
+      if (!useMarshalledValues)
+      {
+         Region r1 =3D cache1.getRegion(aop, false) =3D=3D null ? cache1.g=
etRegion(aop, true) : cache1.getRegion(aop, false);
+         r1.registerContextClassLoader(cla);
+         Region r2 =3D cache2.getRegion(aop, false) =3D=3D null ? cache2.g=
etRegion(aop, true) : cache2.getRegion(aop, false);
+         r2.registerContextClassLoader(clb);
+      }
 =

+      if (useMarshalledValues) Thread.currentThread().setContextClassLoade=
r(cla);
       cache1.put(aop, "person", ben_);
 =

       Object ben2;
-      // Can't cast it to Person. CCE will resutl.
+      // Can't cast it to Person. CCE will result.
+      if (useMarshalledValues) Thread.currentThread().setContextClassLoade=
r(clb);
       ben2 =3D cache2.get(aop, "person");
       assertEquals(ben_.toString(), ben2.toString());
 =

       Class claz =3D clb.loadClass(ADDRESS_CLASSNAME);
       Object add =3D claz.newInstance();
-      {
-         Class[] types =3D {String.class};
-         Method setValue =3D claz.getMethod("setCity", types);
-         Object[] margs =3D {"Sunnyvale"};
-         setValue.invoke(add, margs);
-      }
-
-      {
-         Class clasz1 =3D clb.loadClass(PERSON_CLASSNAME);
-         Class[] types =3D {claz};
-         Method setValue =3D clasz1.getMethod("setAddress", types);
-         Object[] margs =3D {add};
-         setValue.invoke(ben2, margs);
-      }
+      Method setValue =3D claz.getMethod("setCity", String.class);
+      setValue.invoke(add, "Sunnyvale");
+      Class clasz1 =3D clb.loadClass(PERSON_CLASSNAME);
+      setValue =3D clasz1.getMethod("setAddress", claz);
+      setValue.invoke(ben2, add);
    }
 =

    /**
@@ -183,111 +197,121 @@
    public void testCLSet2() throws Exception
    {
       ClassLoader cla =3D getClassLoader();
-      Region r1 =3D cache1.getRegion(aop, false) =3D=3D null ? cache1.getR=
egion(aop, true) : cache1.getRegion(aop, false);
-      r1.registerContextClassLoader(cla);
       ClassLoader clb =3D getClassLoader();
-      Region r2 =3D cache2.getRegion(aop, false) =3D=3D null ? cache2.getR=
egion(aop, true) : cache2.getRegion(aop, false);
-      r2.registerContextClassLoader(clb);
 =

+      if (!useMarshalledValues)
+      {
+         Region r1 =3D cache1.getRegion(aop, false) =3D=3D null ? cache1.g=
etRegion(aop, true) : cache1.getRegion(aop, false);
+         r1.registerContextClassLoader(cla);
+         Region r2 =3D cache2.getRegion(aop, false) =3D=3D null ? cache2.g=
etRegion(aop, true) : cache2.getRegion(aop, false);
+         r2.registerContextClassLoader(clb);
+      }
+
+      if (useMarshalledValues) Thread.currentThread().setContextClassLoade=
r(cla);
       cache1.put(aop, "person", ben_);
 =

       Object ben2;
-      // Can't cast it to Person. CCE will resutl.
+      // Can't cast it to Person. CCE will result.
+      if (useMarshalledValues) Thread.currentThread().setContextClassLoade=
r(clb);
       ben2 =3D cache2.get(aop, "person");
       assertEquals(ben_.toString(), ben2.toString());
 =

       Class claz =3D clb.loadClass(ADDRESS_CLASSNAME);
       Object add =3D claz.newInstance();
-      {
-         Class[] types =3D {String.class};
-         Method setValue =3D claz.getMethod("setCity", types);
-         Object[] margs =3D {"Sunnyvale"};
-         setValue.invoke(add, margs);
-      }
+      Method setValue =3D claz.getMethod("setCity", String.class);
+      setValue.invoke(add, "Sunnyvale");
+      Class clasz1 =3D clb.loadClass(PERSON_CLASSNAME);
+      setValue =3D clasz1.getMethod("setAddress", claz);
+      setValue.invoke(ben2, add);
 =

-      {
-         Class clasz1 =3D clb.loadClass(PERSON_CLASSNAME);
-         Class[] types =3D {claz};
-         Method setValue =3D clasz1.getMethod("setAddress", types);
-         Object[] margs =3D {add};
-         setValue.invoke(ben2, margs);
-      }
-
       // Set it back to the cache
       // Can't cast it to Person. CCE will resutl.
       cache2.put(aop, "person", ben2);
+
+      if (useMarshalledValues) Thread.currentThread().setContextClassLoade=
r(cla);
       Object ben3 =3D cache1.get(aop, "person");
       assertEquals(ben2.toString(), ben3.toString());
-
    }
 =

    public void testPuts() throws Exception
    {
-      ClassLoader cl =3D getClassLoader();
-      Region r1 =3D cache1.getRegion(aop, false) =3D=3D null ? cache1.getR=
egion(aop, true) : cache1.getRegion(aop, false);
-      r1.registerContextClassLoader(cl);
+      ClassLoader cla =3D getClassLoader();
+      ClassLoader clb =3D getClassLoader();
 =

+      if (!useMarshalledValues)
+      {
+         Region r1 =3D cache1.getRegion(aop, false) =3D=3D null ? cache1.g=
etRegion(aop, true) : cache1.getRegion(aop, false);
+         r1.registerContextClassLoader(cla);
+         Region r2 =3D cache2.getRegion(aop, false) =3D=3D null ? cache2.g=
etRegion(aop, true) : cache2.getRegion(aop, false);
+         r2.registerContextClassLoader(clb);
+      }
+
       // Create an empty Person loaded by this classloader
-      Object scopedBen1 =3D getPersonFromClassloader(cl);
-
-      cl =3D getClassLoader();
-      Region r2 =3D cache2.getRegion(aop, false) =3D=3D null ? cache2.getR=
egion(aop, true) : cache2.getRegion(aop, false);
-      r2.registerContextClassLoader(cl);
-
+      Object scopedBen1 =3D getPersonFromClassloader(cla);
       // Create another empty Person loaded by this classloader
-      Object scopedBen2 =3D getPersonFromClassloader(cl);
+      Object scopedBen2 =3D getPersonFromClassloader(clb);
 =

+      if (useMarshalledValues) Thread.currentThread().setContextClassLoade=
r(cla);
       cache1.put(Fqn.fromString("/aop/1"), "person", ben_);
       cache1.put(Fqn.fromString("/aop/2"), "person", scopedBen1);
+      if (useMarshalledValues) resetContextClassLoader();
+      Object ben2;
+      // Can't cast it to Person. CCE will resutl.
+      if (useMarshalledValues) Thread.currentThread().setContextClassLoade=
r(clb);
+      ben2 =3D cache2.get(Fqn.fromString("/aop/1"), "person");
+      if (useMarshalledValues) resetContextClassLoader();
+      assertEquals(ben_.toString(), ben2.toString());
 =

-      Object ben2 =3D null;
-      try
-      {
-         // Can't cast it to Person. CCE will resutl.
-         ben2 =3D cache2.get(Fqn.fromString("/aop/1"), "person");
-         assertEquals(ben_.toString(), ben2.toString());
-
-         ben2 =3D cache2.get(Fqn.fromString("/aop/2"), "person");
-         assertFalse("cache2 deserialized with scoped classloader", ben2 i=
nstanceof Person);
-         assertFalse("cache2 deserialized with cache2 classloader", scoped=
Ben1.equals(ben2));
-         assertEquals("scopedBen deserialized properly", scopedBen2, ben2);
-      }
-      catch (Exception ex)
-      {
-         fail("Test fails with exception " + ex);
-      }
-
+      if (useMarshalledValues) Thread.currentThread().setContextClassLoade=
r(clb);
+      ben2 =3D cache2.get(Fqn.fromString("/aop/2"), "person");
+      if (useMarshalledValues) resetContextClassLoader();
+      assertFalse("cache2 deserialized with scoped classloader", ben2 inst=
anceof Person);
+      assertFalse("cache2 deserialized with cache2 classloader", scopedBen=
1.equals(ben2));
+      assertEquals("scopedBen deserialized properly", scopedBen2, ben2);
    }
 =

    public void testMethodCall() throws Exception
    {
-      ClassLoader cl =3D getClassLoader();
-      Region r1 =3D cache1.getRegion(aop, false) =3D=3D null ? cache1.getR=
egion(aop, true) : cache1.getRegion(aop, false);
-      r1.registerContextClassLoader(cl);
-      cl =3D getClassLoader();
-      Region r2 =3D cache2.getRegion(aop, false) =3D=3D null ? cache2.getR=
egion(aop, true) : cache2.getRegion(aop, false);
-      r2.registerContextClassLoader(cl);
+      ClassLoader cla =3D getClassLoader();
+      ClassLoader clb =3D getClassLoader();
 =

+      if (!useMarshalledValues)
+      {
+         Region r1 =3D cache1.getRegion(aop, false) =3D=3D null ? cache1.g=
etRegion(aop, true) : cache1.getRegion(aop, false);
+         r1.registerContextClassLoader(cla);
+
+         Region r2 =3D cache2.getRegion(aop, false) =3D=3D null ? cache2.g=
etRegion(aop, true) : cache2.getRegion(aop, false);
+         r2.registerContextClassLoader(clb);
+      }
+
+      if (useMarshalledValues) Thread.currentThread().setContextClassLoade=
r(cla);
       cache1.put(Fqn.fromString("/aop/1"), "person", ben_);
       cache1.remove(Fqn.fromString("/aop/1"), "person");
       HashMap<Object, Object> map =3D new HashMap<Object, Object>();
       map.put("1", "1");
       map.put("2", "2");
+
       cache1.put(Fqn.fromString("/aop/2"), map);
       cache1.removeNode(Fqn.fromString("/aop/2"));
-
+      if (useMarshalledValues) resetContextClassLoader();
       TestingUtil.sleepThread(1000);
    }
 =

    public void testTxMethodCall() throws Exception
    {
-      ClassLoader cl =3D getClassLoader();
-      Region r1 =3D cache1.getRegion(aop, false) =3D=3D null ? cache1.getR=
egion(aop, true) : cache1.getRegion(aop, false);
-      r1.registerContextClassLoader(cl);
-      cl =3D getClassLoader();
-      Region r2 =3D cache2.getRegion(aop, false) =3D=3D null ? cache2.getR=
egion(aop, true) : cache2.getRegion(aop, false);
-      r2.registerContextClassLoader(cl);
+      ClassLoader cla =3D getClassLoader();
+      ClassLoader clb =3D getClassLoader();
 =

+      if (!useMarshalledValues)
+      {
+         Region r1 =3D cache1.getRegion(aop, false) =3D=3D null ? cache1.g=
etRegion(aop, true) : cache1.getRegion(aop, false);
+         r1.registerContextClassLoader(cla);
+
+         Region r2 =3D cache2.getRegion(aop, false) =3D=3D null ? cache2.g=
etRegion(aop, true) : cache2.getRegion(aop, false);
+         r2.registerContextClassLoader(clb);
+      }
+
+      if (useMarshalledValues) Thread.currentThread().setContextClassLoade=
r(cla);
       TransactionManager tm =3D beginTransaction();
       cache1.put(Fqn.fromString("/aop/1"), "person", ben_);
       cache1.remove(Fqn.fromString("/aop/1"), "person");
@@ -299,70 +323,53 @@
       tm.commit();
 =

       TestingUtil.sleepThread(1000);
+      if (useMarshalledValues) resetContextClassLoader();
    }
 =

-   public void testTxPut() throws Exception
-   {
-      TransactionManager tm =3D beginTransaction();
-      cache1.put(aop, "person", ben_);
-      cache1.put(aop, "person1", ben_);
-      cache1.removeNode(aop);
-      cache1.put(aop, "person", ben_);
-      tm.commit();
-      Person ben2 =3D (Person) cache2.get(aop, "person");
-      assertNotNull("Person from 2nd cache should not be null ", ben2);
-      assertEquals(ben_.toString(), ben2.toString());
-   }
-
-   public void testTxRollback() throws Exception
-   {
-      TransactionManager tm =3D beginTransaction();
-      cache1.put(aop, "person", ben_);
-      cache1.put(aop, "person1", ben_);
-      tm.rollback();
-      Person ben2 =3D (Person) cache2.get(aop, "person");
-      assertNull("Person from 2nd cache should be null ", ben2);
-   }
-
    public void testTxCLSet2() throws Exception
    {
       ClassLoader cla =3D getClassLoader();
-      Region r1 =3D cache1.getRegion(aop, false) =3D=3D null ? cache1.getR=
egion(aop, true) : cache1.getRegion(aop, false);
-      r1.registerContextClassLoader(cla);
+      if (!useMarshalledValues)
+      {
+         Region r1 =3D cache1.getRegion(aop, false) =3D=3D null ? cache1.g=
etRegion(aop, true) : cache1.getRegion(aop, false);
+         r1.registerContextClassLoader(cla);
+      }
       ClassLoader clb =3D getClassLoader();
-      Region r2 =3D cache2.getRegion(aop, false) =3D=3D null ? cache2.getR=
egion(aop, true) : cache2.getRegion(aop, false);
-      r2.registerContextClassLoader(clb);
+      if (!useMarshalledValues)
+      {
+         Region r2 =3D cache2.getRegion(aop, false) =3D=3D null ? cache2.g=
etRegion(aop, true) : cache2.getRegion(aop, false);
+         r2.registerContextClassLoader(clb);
+      }
 =

       TransactionManager tm =3D beginTransaction();
+      if (useMarshalledValues) Thread.currentThread().setContextClassLoade=
r(cla);
       cache1.put(aop, "person", ben_);
       tm.commit();
+      if (useMarshalledValues) resetContextClassLoader();
 =

       Object ben2;
       // Can't cast it to Person. CCE will resutl.
+      if (useMarshalledValues) Thread.currentThread().setContextClassLoade=
r(clb);
       ben2 =3D cache2.get(aop, "person");
+      if (useMarshalledValues) resetContextClassLoader();
       assertEquals(ben_.toString(), ben2.toString());
 =

       Class claz =3D clb.loadClass(ADDRESS_CLASSNAME);
       Object add =3D claz.newInstance();
-      {
-         Class[] types =3D {String.class};
-         Method setValue =3D claz.getMethod("setCity", types);
-         Object[] margs =3D {"Sunnyvale"};
-         setValue.invoke(add, margs);
-      }
+      Method setValue =3D claz.getMethod("setCity", String.class);
+      setValue.invoke(add, "Sunnyvale");
+      Class clasz1 =3D clb.loadClass(PERSON_CLASSNAME);
+      setValue =3D clasz1.getMethod("setAddress", claz);
+      setValue.invoke(ben2, add);
 =

-      {
-         Class clasz1 =3D clb.loadClass(PERSON_CLASSNAME);
-         Class[] types =3D {claz};
-         Method setValue =3D clasz1.getMethod("setAddress", types);
-         Object[] margs =3D {add};
-         setValue.invoke(ben2, margs);
-      }
-
       // Set it back to the cache
       // Can't cast it to Person. CCE will resutl.
+      if (useMarshalledValues) Thread.currentThread().setContextClassLoade=
r(clb);
       cache2.put(aop, "person", ben2);
+      if (useMarshalledValues) resetContextClassLoader();
+      if (useMarshalledValues) Thread.currentThread().setContextClassLoade=
r(cla);
       Object ben3 =3D cache1.get(aop, "person");
+      if (useMarshalledValues) resetContextClassLoader();
       assertEquals(ben2.toString(), ben3.toString());
    }
 =



--===============6060620288143646221==--

From jbosscache-commits at lists.jboss.org Mon Jan 21 20:08:04 2008
Content-Type: multipart/mixed; boundary="===============2147474158501769322=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r5177 -
 core/trunk/src/test/java/org/jboss/cache/lock.
Date: Mon, 21 Jan 2008 20:08:04 -0500
Message-ID: <E1JH7cS-0008U9-NA@committer01.frg.pub.inap.atl.jboss.com>

--===============2147474158501769322==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: manik.surtani(a)jboss.com
Date: 2008-01-21 20:08:04 -0500 (Mon, 21 Jan 2008)
New Revision: 5177

Modified:
   core/trunk/src/test/java/org/jboss/cache/lock/IdentityLockTest.java
Log:
JBCACHE-1231 - Implicit marshalled values

Modified: core/trunk/src/test/java/org/jboss/cache/lock/IdentityLockTest.ja=
va
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/test/java/org/jboss/cache/lock/IdentityLockTest.java	200=
8-01-22 01:06:22 UTC (rev 5176)
+++ core/trunk/src/test/java/org/jboss/cache/lock/IdentityLockTest.java	200=
8-01-22 01:08:04 UTC (rev 5177)
@@ -9,9 +9,13 @@
 =

 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.jboss.cache.NodeSPI;
 import org.jboss.cache.misc.TestingUtil;
 import org.jboss.cache.transaction.GlobalTransaction;
+import static org.testng.AssertJUnit.*;
 import org.testng.annotations.AfterMethod;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.Test;
 =

 /**
  * Testing of different locking semantics.


--===============2147474158501769322==--

From jbosscache-commits at lists.jboss.org Mon Jan 21 20:11:45 2008
Content-Type: multipart/mixed; boundary="===============8172712145843937525=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r5178 -
 core/trunk/src/test/java/org/jboss/cache/factories.
Date: Mon, 21 Jan 2008 20:11:45 -0500
Message-ID: <E1JH7g1-000121-1k@committer01.frg.pub.inap.atl.jboss.com>

--===============8172712145843937525==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: manik.surtani(a)jboss.com
Date: 2008-01-21 20:11:44 -0500 (Mon, 21 Jan 2008)
New Revision: 5178

Modified:
   core/trunk/src/test/java/org/jboss/cache/factories/InterceptorChainFacto=
ryTest.java
Log:
Fixed broken test (to go with InterceptorChainFactory optimisation)

Modified: core/trunk/src/test/java/org/jboss/cache/factories/InterceptorCha=
inFactoryTest.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/test/java/org/jboss/cache/factories/InterceptorChainFact=
oryTest.java	2008-01-22 01:08:04 UTC (rev 5177)
+++ core/trunk/src/test/java/org/jboss/cache/factories/InterceptorChainFact=
oryTest.java	2008-01-22 01:11:44 UTC (rev 5178)
@@ -197,7 +197,6 @@
 =

    public void testOptimisticChain() throws Exception
    {
-      CacheSPI cache =3D (CacheSPI) new DefaultCacheFactory().createCache(=
false);
       cache.getConfiguration().setExposeManagementStatistics(false);
       cache.getConfiguration().setNodeLockingOptimistic(true);
 =

@@ -223,7 +222,6 @@
 =

    public void testOptimisticReplicatedChain() throws Exception
    {
-      CacheSPI cache =3D (CacheSPI) new DefaultCacheFactory().createCache(=
false);
       cache.getConfiguration().setExposeManagementStatistics(false);
       cache.getConfiguration().setNodeLockingOptimistic(true);
       cache.getConfiguration().setCacheMode("REPL_SYNC");
@@ -251,7 +249,6 @@
 =

    public void testOptimisticCacheLoaderChain() throws Exception
    {
-      CacheSPI cache =3D (CacheSPI) new DefaultCacheFactory().createCache(=
false);
       cache.getConfiguration().setExposeManagementStatistics(false);
       cache.getConfiguration().setNodeLockingOptimistic(true);
       cache.getConfiguration().setCacheLoaderConfig(getCacheLoaderConfig(f=
alse, false));
@@ -267,8 +264,8 @@
       assertEquals(InvocationContextInterceptor.class, interceptors.next()=
.getClass());
       assertEquals(TxInterceptor.class, interceptors.next().getClass());
       assertEquals(NotificationInterceptor.class, interceptors.next().getC=
lass());
-      assertEquals(CacheStoreInterceptor.class, interceptors.next().getCla=
ss());
       assertEquals(CacheLoaderInterceptor.class, interceptors.next().getCl=
ass());
+      assertEquals(CacheStoreInterceptor.class, interceptors.next().getCla=
ss());
       assertEquals(OptimisticLockingInterceptor.class, interceptors.next()=
.getClass());
       assertEquals(OptimisticValidatorInterceptor.class, interceptors.next=
().getClass());
       assertEquals(OptimisticCreateIfNotExistsInterceptor.class, intercept=
ors.next().getClass());
@@ -280,7 +277,6 @@
 =

    public void testOptimisticPassivationCacheLoaderChain() throws Exception
    {
-      CacheSPI cache =3D (CacheSPI) new DefaultCacheFactory().createCache(=
false);
       cache.getConfiguration().setExposeManagementStatistics(false);
       cache.getConfiguration().setNodeLockingOptimistic(true);
       cache.getConfiguration().setCacheLoaderConfig(getCacheLoaderConfig(t=
rue, false));
@@ -296,8 +292,8 @@
       assertEquals(InvocationContextInterceptor.class, interceptors.next()=
.getClass());
       assertEquals(TxInterceptor.class, interceptors.next().getClass());
       assertEquals(NotificationInterceptor.class, interceptors.next().getC=
lass());
-      assertEquals(PassivationInterceptor.class, interceptors.next().getCl=
ass());
       assertEquals(ActivationInterceptor.class, interceptors.next().getCla=
ss());
+      assertEquals(PassivationInterceptor.class, interceptors.next().getCl=
ass());
       assertEquals(OptimisticLockingInterceptor.class, interceptors.next()=
.getClass());
       assertEquals(OptimisticValidatorInterceptor.class, interceptors.next=
().getClass());
       assertEquals(OptimisticCreateIfNotExistsInterceptor.class, intercept=
ors.next().getClass());
@@ -309,7 +305,6 @@
 =

    public void testInvalidationInterceptorChain() throws Exception
    {
-      CacheSPI cache =3D (CacheSPI) new DefaultCacheFactory().createCache(=
false);
       cache.getConfiguration().setExposeManagementStatistics(false);
       cache.getConfiguration().setCacheMode("REPL_ASYNC");
 =

@@ -332,7 +327,6 @@
       // ok, my replication chain looks good.
 =

       // now for my invalidation chain.
-      cache =3D (CacheSPI) new DefaultCacheFactory().createCache(false);
       cache.getConfiguration().setExposeManagementStatistics(false);
       cache.getConfiguration().setCacheMode("INVALIDATION_ASYNC");
       chain =3D getInterceptorChainFactory(cache).buildInterceptorChain();


--===============8172712145843937525==--

From jbosscache-commits at lists.jboss.org Mon Jan 21 20:19:43 2008
Content-Type: multipart/mixed; boundary="===============7467274821561132114=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r5179 -
 demos/core-demo-gui/trunk.
Date: Mon, 21 Jan 2008 20:19:43 -0500
Message-ID: <E1JH7nj-0002Dw-PH@committer01.frg.pub.inap.atl.jboss.com>

--===============7467274821561132114==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: manik.surtani(a)jboss.com
Date: 2008-01-21 20:19:43 -0500 (Mon, 21 Jan 2008)
New Revision: 5179

Modified:
   demos/core-demo-gui/trunk/README.txt
   demos/core-demo-gui/trunk/pom.xml
Log:
Updated to use 2.1.0.CR3 and updated README

Modified: demos/core-demo-gui/trunk/README.txt
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- demos/core-demo-gui/trunk/README.txt	2008-01-22 01:11:44 UTC (rev 5178)
+++ demos/core-demo-gui/trunk/README.txt	2008-01-22 01:19:43 UTC (rev 5179)
@@ -4,15 +4,25 @@
 ------------------
 =

 To run the demo, all you need is a Java 5 compliant JVM.  All dependencies=
 are packaged in the demo ZIP file, which
-can be downloaded from http://snapshots.jboss.org/maven2/org/jboss/cache/j=
bosscache-demo/1.0-SNAPSHOT/
+can be downloaded from the JBoss.org Maven2 repository [1].
 =

 Simply unzip the demo distribution and use the "run.sh" shell script to la=
unch the demo GUI.  Click around,
 it's mostly pretty intuitive but some documentation will come along in goo=
d time.
 =

+You would typically want to edit the demo-cache-config.xml file to suit th=
e features you hope to see in action.  You
+also probably want to start several instances of the demo to watch how dat=
a replicates, and how the caches behave when
+instances leave the cluster nicely (the "stop cache" button) or not-so-nic=
ely (kill the process).
+
+* Feedback
+----------
+
+Please provide all feedback on the JBoss Cache User Forum [2] for now.  In=
 future we may decide to set up a separate forum
+for this demo.
+
 * Building the demo
 -------------------
 =

-You need to use Maven 2 to build the demo from sources.  Simply check out =
the sources for the demo from http://anonsvn.jboss.org/repos/jbosscache/dem=
os/core-demo-gui/trunk
+You need to use Maven 2 to build the demo from sources.  Simply check out =
the sources for the demo from Subversion [3]
 and build using "mvn clean install", which will generate the ZIP distribut=
ion in "target/distribution"
 =

 * Developing the demo
@@ -20,3 +30,7 @@
 =

 You need to use IntelliJ IDEA's UIDesigner to edit the Swing forms in this=
 project.  To generate IDEA project files,
 run "mvn idea:idea" and then open the resulting project file in IntelliJ.
+
+[1] http://snapshots.jboss.org/maven2/org/jboss/cache/jbosscache-demo/1.0-=
SNAPSHOT/
+[2] http://www.jboss.com/index.html?module=3Dbb&op=3Dviewforum&f=3D157
+[3] http://anonsvn.jboss.org/repos/jbosscache/demos/core-demo-gui/trunk
\ No newline at end of file

Modified: demos/core-demo-gui/trunk/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- demos/core-demo-gui/trunk/pom.xml	2008-01-22 01:11:44 UTC (rev 5178)
+++ demos/core-demo-gui/trunk/pom.xml	2008-01-22 01:19:43 UTC (rev 5179)
@@ -13,7 +13,7 @@
    </parent>
    <groupId>org.jboss.cache</groupId>
    <artifactId>jbosscache-demo</artifactId>
-   <version>1.0-SNAPSHOT</version>
+   <version>1.0.BETA1</version>
    <name>JBoss Cache - Core Edition GUI Demo</name>
    <description>JBoss Cache - Core Edition GUI Demo</description>
    <packaging>jar</packaging>
@@ -21,7 +21,7 @@
       <dependency>
          <groupId>org.jboss.cache</groupId>
          <artifactId>jbosscache-core</artifactId>
-         <version>2.1.0-SNAPSHOT</version>
+         <version>2.1.0.CR3</version>
       </dependency>
       <dependency>
          <groupId>jgoodies</groupId>


--===============7467274821561132114==--

From jbosscache-commits at lists.jboss.org Mon Jan 21 20:20:46 2008
Content-Type: multipart/mixed; boundary="===============2528576168980796521=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r5180 - demos/core-demo-gui.
Date: Mon, 21 Jan 2008 20:20:46 -0500
Message-ID: <E1JH7ok-000311-LO@committer01.frg.pub.inap.atl.jboss.com>

--===============2528576168980796521==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: manik.surtani(a)jboss.com
Date: 2008-01-21 20:20:46 -0500 (Mon, 21 Jan 2008)
New Revision: 5180

Added:
   demos/core-demo-gui/tags/
Log:



--===============2528576168980796521==--

From jbosscache-commits at lists.jboss.org Mon Jan 21 20:39:47 2008
Content-Type: multipart/mixed; boundary="===============3460015757048542255=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r5181 - in
 demos/core-demo-gui/trunk: src/main/resources and 1 other directories.
Date: Mon, 21 Jan 2008 20:39:46 -0500
Message-ID: <E1JH878-0006I1-TD@committer01.frg.pub.inap.atl.jboss.com>

--===============3460015757048542255==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: manik.surtani(a)jboss.com
Date: 2008-01-21 20:39:46 -0500 (Mon, 21 Jan 2008)
New Revision: 5181

Modified:
   demos/core-demo-gui/trunk/pom.xml
   demos/core-demo-gui/trunk/src/main/resources/bin/run.sh
   demos/core-demo-gui/trunk/src/main/resources/demo-cache-config.xml
   demos/core-demo-gui/trunk/src/main/resources/log4j.xml
Log:
Updated a bunch of things

Modified: demos/core-demo-gui/trunk/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- demos/core-demo-gui/trunk/pom.xml	2008-01-22 01:20:46 UTC (rev 5180)
+++ demos/core-demo-gui/trunk/pom.xml	2008-01-22 01:39:46 UTC (rev 5181)
@@ -3,9 +3,6 @@
          xmlns:xsi=3D"http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation=3D"http://maven.apache.org/POM/4.0.0 http://ma=
ven.apache.org/xsd/maven-4.0.0.xsd">
    <modelVersion>4.0.0</modelVersion>
-   <properties>
-      <jbosscache-core-version>2.1.0-SNAPSHOT</jbosscache-core-version>
-   </properties>
    <parent>
       <groupId>org.jboss.cache</groupId>
       <artifactId>jbosscache-common-parent</artifactId>
@@ -13,7 +10,7 @@
    </parent>
    <groupId>org.jboss.cache</groupId>
    <artifactId>jbosscache-demo</artifactId>
-   <version>1.0.BETA1</version>
+   <version>1.0-SNAPSHOT</version>
    <name>JBoss Cache - Core Edition GUI Demo</name>
    <description>JBoss Cache - Core Edition GUI Demo</description>
    <packaging>jar</packaging>
@@ -33,6 +30,11 @@
          <artifactId>forms_rt</artifactId>
          <version>6.0.5</version>
       </dependency>
+      <dependency>
+         <groupId>log4j</groupId>
+         <artifactId>log4j</artifactId>
+         <version>1.2.13</version>
+      </dependency>
    </dependencies>
 =

    <build>
@@ -51,7 +53,7 @@
                      <descriptors>
                         <descriptor>assembly.xml</descriptor>
                      </descriptors>
-                     <finalName>${artifactId}</finalName>
+                     <finalName>${artifactId}-${version}</finalName>
                      <outputDirectory>target/distribution</outputDirectory>
                      <workDirectory>target/assembly/work</workDirectory>
                   </configuration>

Modified: demos/core-demo-gui/trunk/src/main/resources/bin/run.sh
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- demos/core-demo-gui/trunk/src/main/resources/bin/run.sh	2008-01-22 01:2=
0:46 UTC (rev 5180)
+++ demos/core-demo-gui/trunk/src/main/resources/bin/run.sh	2008-01-22 01:3=
9:46 UTC (rev 5181)
@@ -1,6 +1,6 @@
 #!/bin/bash
 =

-CP=3D./etc/
+CP=3D./etc
 =

 for i in lib/*.jar ; do
    CP=3D${i}:${CP}
@@ -8,4 +8,6 @@
 =

 CP=3Djbosscache-demo.jar:${CP}
 =

-java -cp ${CP} org.jboss.cache.demo.JBossCacheDemo ${*}
+JVM_PARAMS=3D"-Dbind.address=3D127.0.0.1 -Djava.net.preferIPv4Stack=3Dtrue=
 -Dlog4j.configuration=3D./etc/log4j.xml"
+
+java -cp ${CP} ${JVM_PARAMS} org.jboss.cache.demo.JBossCacheDemo ${*}

Modified: demos/core-demo-gui/trunk/src/main/resources/demo-cache-config.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- demos/core-demo-gui/trunk/src/main/resources/demo-cache-config.xml	2008=
-01-22 01:20:46 UTC (rev 5180)
+++ demos/core-demo-gui/trunk/src/main/resources/demo-cache-config.xml	2008=
-01-22 01:39:46 UTC (rev 5181)
@@ -126,7 +126,7 @@
             <pbcast.GMS print_local_addr=3D"true" join_timeout=3D"5000" sh=
un=3D"false"
                         view_bundling=3D"true" view_ack_collection_timeout=
=3D"5000"/>
             <FRAG2 frag_size=3D"60000"/>
-            <pbcast.STREAMING_STATE_TRANSFER use_reading_thread=3D"true"/>
+            <pbcast.STREAMING_STATE_TRANSFER/>
             <!-- <pbcast.STATE_TRANSFER/> -->
             <pbcast.FLUSH timeout=3D"0"/>
          </config>
@@ -155,7 +155,7 @@
       <!-- Max number of milliseconds to wait for a lock acquisition -->
       <attribute name=3D"LockAcquisitionTimeout">10000</attribute>
 =

-         <!-- Buddy Replication config -->
+      <!-- Buddy Replication config -->
       <attribute name=3D"BuddyReplicationConfig">
          <config>
             <buddyReplicationEnabled>true</buddyReplicationEnabled>

Modified: demos/core-demo-gui/trunk/src/main/resources/log4j.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- demos/core-demo-gui/trunk/src/main/resources/log4j.xml	2008-01-22 01:20=
:46 UTC (rev 5180)
+++ demos/core-demo-gui/trunk/src/main/resources/log4j.xml	2008-01-22 01:39=
:46 UTC (rev 5181)
@@ -66,7 +66,7 @@
       <priority value=3D"WARN"/>
    </category>
 =

-   <category name=3D"org.jboss.cache">
+   <category name=3D"org.jboss.cache.*">
       <priority value=3D"WARN"/>
    </category>
 =



--===============3460015757048542255==--

From jbosscache-commits at lists.jboss.org Mon Jan 21 20:40:37 2008
Content-Type: multipart/mixed; boundary="===============4497148687148111874=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r5182 -
 demos/core-demo-gui/tags.
Date: Mon, 21 Jan 2008 20:40:37 -0500
Message-ID: <E1JH87x-00072T-Fx@committer01.frg.pub.inap.atl.jboss.com>

--===============4497148687148111874==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: manik.surtani(a)jboss.com
Date: 2008-01-21 20:40:37 -0500 (Mon, 21 Jan 2008)
New Revision: 5182

Added:
   demos/core-demo-gui/tags/1.0.BETA1/
Log:


Copied: demos/core-demo-gui/tags/1.0.BETA1 (from rev 5181, demos/core-demo-=
gui/trunk)


--===============4497148687148111874==--

From jbosscache-commits at lists.jboss.org Mon Jan 21 20:41:16 2008
Content-Type: multipart/mixed; boundary="===============6032551973850620273=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r5183 -
 demos/core-demo-gui/tags/1.0.BETA1.
Date: Mon, 21 Jan 2008 20:41:16 -0500
Message-ID: <E1JH88a-00073V-1b@committer01.frg.pub.inap.atl.jboss.com>

--===============6032551973850620273==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: manik.surtani(a)jboss.com
Date: 2008-01-21 20:41:15 -0500 (Mon, 21 Jan 2008)
New Revision: 5183

Modified:
   demos/core-demo-gui/tags/1.0.BETA1/pom.xml
Log:


Modified: demos/core-demo-gui/tags/1.0.BETA1/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- demos/core-demo-gui/tags/1.0.BETA1/pom.xml	2008-01-22 01:40:37 UTC (rev=
 5182)
+++ demos/core-demo-gui/tags/1.0.BETA1/pom.xml	2008-01-22 01:41:15 UTC (rev=
 5183)
@@ -10,7 +10,7 @@
    </parent>
    <groupId>org.jboss.cache</groupId>
    <artifactId>jbosscache-demo</artifactId>
-   <version>1.0-SNAPSHOT</version>
+   <version>1.0.BETA1</version>
    <name>JBoss Cache - Core Edition GUI Demo</name>
    <description>JBoss Cache - Core Edition GUI Demo</description>
    <packaging>jar</packaging>


--===============6032551973850620273==--

From jboss-qa-internal at redhat.com Mon Jan 21 21:29:42 2008
Content-Type: multipart/mixed; boundary="===============0424083114775233378=="
MIME-Version: 1.0
From: jboss-qa-internal at redhat.com
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] Hudson build became unstable:
 jboss-cache-1.4.X-jdk1.5 #58
Date: Mon, 21 Jan 2008 21:29:41 -0500
Message-ID: <8447827.6411200968981438.JavaMail.hudson@dev45.qa.atl2.redhat.com>

--===============0424083114775233378==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

See http://hudson.qa.jboss.com/hudson/job/jboss-cache-1.4.X-jdk1.5/58/chang=
es



--===============0424083114775233378==--

From jbosscache-commits at lists.jboss.org Tue Jan 22 05:34:20 2008
Content-Type: multipart/mixed; boundary="===============4432090773260248231=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN:  r5184 - core/tags.
Date: Tue, 22 Jan 2008 05:34:19 -0500
Message-ID: <E1JHGSR-0004sd-Sv@committer01.frg.pub.inap.atl.jboss.com>

--===============4432090773260248231==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: manik.surtani(a)jboss.com
Date: 2008-01-22 05:34:19 -0500 (Tue, 22 Jan 2008)
New Revision: 5184

Added:
   core/tags/1.4.1.SP9/
Log:


Copied: core/tags/1.4.1.SP9 (from rev 5183, core/branches/1.4.X)


--===============4432090773260248231==--

From jbosscache-commits at lists.jboss.org Tue Jan 22 05:48:02 2008
Content-Type: multipart/mixed; boundary="===============2578698646865748565=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r5185 - in core/tags/1.4.1.SP9:
 src/org/jboss/cache/marshall and 1 other directories.
Date: Tue, 22 Jan 2008 05:48:02 -0500
Message-ID: <E1JHGfi-0007qx-Am@committer01.frg.pub.inap.atl.jboss.com>

--===============2578698646865748565==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: manik.surtani(a)jboss.com
Date: 2008-01-22 05:48:02 -0500 (Tue, 22 Jan 2008)
New Revision: 5185

Removed:
   core/tags/1.4.1.SP9/tests/functional/org/jboss/cache/buddyreplication/Re=
moveRootBuddyTest.java
Modified:
   core/tags/1.4.1.SP9/src/org/jboss/cache/Node.java
   core/tags/1.4.1.SP9/src/org/jboss/cache/TreeCache.java
   core/tags/1.4.1.SP9/src/org/jboss/cache/marshall/JBCMethodCall.java
Log:
Reverted JBCACHE-1230 and JBCACHE-1241

Modified: core/tags/1.4.1.SP9/src/org/jboss/cache/Node.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/tags/1.4.1.SP9/src/org/jboss/cache/Node.java	2008-01-22 10:34:19 U=
TC (rev 5184)
+++ core/tags/1.4.1.SP9/src/org/jboss/cache/Node.java	2008-01-22 10:48:02 U=
TC (rev 5185)
@@ -446,37 +446,7 @@
       {
          if (data !=3D null)
          {
-            if (trace)
-            {
-               sb.append("\ndata=3D").append(data.keySet());
-            }
-            else
-            {
-               sb.append("\ndata=3D[");
-               Set keys =3D data.keySet();
-               int i=3D0;
-               for (Iterator it =3D keys.iterator(); it.hasNext();)
-               {
-                  i++;
-                  sb.append(it.next());
-
-                  if (i =3D=3D 5)
-                  {
-                     int more =3D keys.size() - 5;
-                     if (more > 1)
-                     {
-                        sb.append(", and ");
-                        sb.append(more);
-                        sb.append(" more");
-                        break;
-                     }
-                  }
-                  else
-                  {
-                     sb.append(", ");
-                  }
-               }
-            }
+            sb.append("\ndata=3D").append(data.keySet());
             sb.append("]");
          }
       }

Modified: core/tags/1.4.1.SP9/src/org/jboss/cache/TreeCache.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/tags/1.4.1.SP9/src/org/jboss/cache/TreeCache.java	2008-01-22 10:34=
:19 UTC (rev 5184)
+++ core/tags/1.4.1.SP9/src/org/jboss/cache/TreeCache.java	2008-01-22 10:48=
:02 UTC (rev 5185)
@@ -3887,7 +3887,7 @@
             for (Iterator i =3D children.iterator(); i.hasNext();)
             {
                Fqn childFqn =3D new Fqn(fqn, i.next());
-               if (!internalFqns.contains(childFqn)) remove(childFqn, o);
+               remove(childFqn, o);
             }
          }
       }
@@ -3919,7 +3919,7 @@
             for (Iterator i =3D children.iterator(); i.hasNext();)
             {
                Fqn childFqn =3D new Fqn(fqn, i.next());
-               if (!internalFqns.contains(childFqn)) evict(childFqn);
+               evict(childFqn);
             }
          }
       }

Modified: core/tags/1.4.1.SP9/src/org/jboss/cache/marshall/JBCMethodCall.ja=
va
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/tags/1.4.1.SP9/src/org/jboss/cache/marshall/JBCMethodCall.java	200=
8-01-22 10:34:19 UTC (rev 5184)
+++ core/tags/1.4.1.SP9/src/org/jboss/cache/marshall/JBCMethodCall.java	200=
8-01-22 10:48:02 UTC (rev 5185)
@@ -69,22 +69,13 @@
       ret.append("; Args: (");
       if (args !=3D null && args.length > 0)
       {
-         if (trace)
+         boolean first =3D true;
+         for (int i=3D0; i<args.length; i++)
          {
-            boolean first =3D true;
-            for (int i=3D0; i<args.length; i++)
-            {
-               if (first) first =3D false;
-               else ret.append(", ");
-               ret.append(args[i]);
-            }
+            if (first) first =3D false;
+            else ret.append(", ");
+            ret.append(args[i]);
          }
-         else
-         {
-            ret.append(" arg[0] =3D ");
-            ret.append(args[0]);
-            if (args.length > 1) ret.append(" ...");
-         }
       }
       ret.append(')');
       return ret.toString();

Deleted: core/tags/1.4.1.SP9/tests/functional/org/jboss/cache/buddyreplicat=
ion/RemoveRootBuddyTest.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/tags/1.4.1.SP9/tests/functional/org/jboss/cache/buddyreplication/R=
emoveRootBuddyTest.java	2008-01-22 10:34:19 UTC (rev 5184)
+++ core/tags/1.4.1.SP9/tests/functional/org/jboss/cache/buddyreplication/R=
emoveRootBuddyTest.java	2008-01-22 10:48:02 UTC (rev 5185)
@@ -1,44 +0,0 @@
-package org.jboss.cache.buddyreplication;
-
-import org.jboss.cache.Fqn;
-import org.jboss.cache.TreeCache;
-import org.jboss.cache.misc.TestingUtil;
-
-import java.util.ArrayList;
-
-/**
- * Test added to replicate a found issue - JBCACHE-1241
- *
- * @author Mircea.Markus(a)jboss.com
- */
-public class RemoveRootBuddyTest extends BuddyReplicationTestsBase
-{
-   TreeCache cache1, cache2;
-
-   protected void setUp() throws Exception
-   {
-      cache1 =3D createCache(false, 1, "myBuddyPoolReplicationGroup", fals=
e, true, true);
-      cache2 =3D createCache(false, 1, "myBuddyPoolReplicationGroup", fals=
e, true, true);
-
-      TestingUtil.blockUntilViewsReceived(new TreeCache[]{cache1, cache2},=
 60000);
-   }
-
-   protected void tearDown()
-   {
-      cache1.stop();
-      cache2.stop();
-   }
-
-   public void testRemoveRootNode() throws Exception
-   {
-      int opCount =3D 10;
-      for (int i =3D 0; i < opCount; i++)
-      {
-         String key =3D String.valueOf(opCount);
-         String value =3D String.valueOf(opCount);
-         Fqn f =3D Fqn.fromString("/test" + key);
-         cache1.put(f, key, value);
-      }
-      cache1.remove(Fqn.ROOT);
-   }
-}


--===============2578698646865748565==--

From jbosscache-commits at lists.jboss.org Tue Jan 22 05:50:20 2008
Content-Type: multipart/mixed; boundary="===============2829917194474661854=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r5186 - in core/tags/1.4.1.SP9:
 docs and 1 other directories.
Date: Tue, 22 Jan 2008 05:50:19 -0500
Message-ID: <E1JHGhv-0000Jc-Sv@committer01.frg.pub.inap.atl.jboss.com>

--===============2829917194474661854==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: manik.surtani(a)jboss.com
Date: 2008-01-22 05:50:19 -0500 (Tue, 22 Jan 2008)
New Revision: 5186

Modified:
   core/tags/1.4.1.SP9/build.xml
   core/tags/1.4.1.SP9/docs/Changelog.txt
   core/tags/1.4.1.SP9/src/org/jboss/cache/Version.java
Log:
Updated version details to release 1.4.1.SP9

Modified: core/tags/1.4.1.SP9/build.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/tags/1.4.1.SP9/build.xml	2008-01-22 10:48:02 UTC (rev 5185)
+++ core/tags/1.4.1.SP9/build.xml	2008-01-22 10:50:19 UTC (rev 5186)
@@ -6,7 +6,7 @@
 =

    <property name=3D"module.name" value=3D"JBossCache"/>
    <!--We now requires version to have no white space since Ant+JBossAop w=
ill sometime choke. -->
-   <property name=3D"module.version" value=3D"1.4.1.SP8"/>
+   <property name=3D"module.version" value=3D"1.4.1.SP9"/>
    <property name=3D"implementation.url" value=3D"http://www.jboss.com/pro=
ducts/jbosscache"/>
    <property file=3D"build.properties"/>
    <property name=3D"root.dir" value=3D"${basedir}"/>

Modified: core/tags/1.4.1.SP9/docs/Changelog.txt
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/tags/1.4.1.SP9/docs/Changelog.txt	2008-01-22 10:48:02 UTC (rev 518=
5)
+++ core/tags/1.4.1.SP9/docs/Changelog.txt	2008-01-22 10:50:19 UTC (rev 518=
6)
@@ -1,5 +1,14 @@
 $Id$
 =

+
+Release 1.4.1.SP9 (January 22, 2008)
+=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
+Patch release on 1.4.1.GA
+
+** Bug
+    *  [ JBCACHE-1246 ] TransactionTable leaks memory when used with FAIL_=
SILENTLY option
+    *  [ JBCACHE-1255 ] setUseInterceptorMbeans not available in TreeCache=
MBean interface, causing problems when deployed in JBoss AS
+
 Release 1.4.1.SP8 (December 12, 2007)
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
 Patch release on 1.4.1.GA

Modified: core/tags/1.4.1.SP9/src/org/jboss/cache/Version.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/tags/1.4.1.SP9/src/org/jboss/cache/Version.java	2008-01-22 10:48:0=
2 UTC (rev 5185)
+++ core/tags/1.4.1.SP9/src/org/jboss/cache/Version.java	2008-01-22 10:50:1=
9 UTC (rev 5186)
@@ -10,9 +10,9 @@
  */
 public class Version
 {
-   public static final String version =3D "1.4.1.SP8";
+   public static final String version =3D "1.4.1.SP9";
    public static final String codename =3D "Cayenne";
-   public static byte[] version_id =3D {'0', '1', '4', '1', 'S', 'P', '8'};
+   public static byte[] version_id =3D {'0', '1', '4', '1', 'S', 'P', '9'};
    public static final String cvs =3D "$Id$";
 =

    private static final int MAJOR_SHIFT =3D 11;


--===============2829917194474661854==--

From jbosscache-commits at lists.jboss.org Tue Jan 22 05:57:59 2008
Content-Type: multipart/mixed; boundary="===============8548987269483528699=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r5187 -
 core/tags/1.4.1.SP9/src/org/jboss/cache.
Date: Tue, 22 Jan 2008 05:57:59 -0500
Message-ID: <E1JHGpL-0001Pf-3k@committer01.frg.pub.inap.atl.jboss.com>

--===============8548987269483528699==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: manik.surtani(a)jboss.com
Date: 2008-01-22 05:57:58 -0500 (Tue, 22 Jan 2008)
New Revision: 5187

Modified:
   core/tags/1.4.1.SP9/src/org/jboss/cache/TreeCacheMBean.java
Log:
JBCACHE-1255

Modified: core/tags/1.4.1.SP9/src/org/jboss/cache/TreeCacheMBean.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/tags/1.4.1.SP9/src/org/jboss/cache/TreeCacheMBean.java	2008-01-22 =
10:50:19 UTC (rev 5186)
+++ core/tags/1.4.1.SP9/src/org/jboss/cache/TreeCacheMBean.java	2008-01-22 =
10:57:58 UTC (rev 5187)
@@ -984,4 +984,6 @@
      * Purges the contents of all configured {@link CacheLoader}s
      */
     void purgeCacheLoaders() throws Exception;
+
+   void setUseInterceptorMbeans(boolean b);
 }


--===============8548987269483528699==--

From jbosscache-commits at lists.jboss.org Tue Jan 22 06:00:00 2008
Content-Type: multipart/mixed; boundary="===============5140016169801248130=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r5188 -
 core/branches/1.4.X/src/org/jboss/cache.
Date: Tue, 22 Jan 2008 05:59:59 -0500
Message-ID: <E1JHGrH-0002JI-Vh@committer01.frg.pub.inap.atl.jboss.com>

--===============5140016169801248130==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: manik.surtani(a)jboss.com
Date: 2008-01-22 05:59:59 -0500 (Tue, 22 Jan 2008)
New Revision: 5188

Modified:
   core/branches/1.4.X/src/org/jboss/cache/TreeCacheMBean.java
Log:
JBCACHE-1255

Modified: core/branches/1.4.X/src/org/jboss/cache/TreeCacheMBean.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/branches/1.4.X/src/org/jboss/cache/TreeCacheMBean.java	2008-01-22 =
10:57:58 UTC (rev 5187)
+++ core/branches/1.4.X/src/org/jboss/cache/TreeCacheMBean.java	2008-01-22 =
10:59:59 UTC (rev 5188)
@@ -984,4 +984,6 @@
      * Purges the contents of all configured {@link CacheLoader}s
      */
     void purgeCacheLoaders() throws Exception;
+
+   void setUseInterceptorMbeans(boolean b);
 }


--===============5140016169801248130==--

From jbosscache-commits at lists.jboss.org Tue Jan 22 08:30:37 2008
Content-Type: multipart/mixed; boundary="===============8386384160189575494=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r5189 - in core/trunk/src:
 main/java/org/jboss/cache/loader and 8 other directories.
Date: Tue, 22 Jan 2008 08:30:37 -0500
Message-ID: <E1JHJD3-0007RI-2L@committer01.frg.pub.inap.atl.jboss.com>

--===============8386384160189575494==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: manik.surtani(a)jboss.com
Date: 2008-01-22 08:30:36 -0500 (Tue, 22 Jan 2008)
New Revision: 5189

Modified:
   core/trunk/src/main/java/org/jboss/cache/interceptors/MarshalledValueInt=
erceptor.java
   core/trunk/src/main/java/org/jboss/cache/loader/TcpDelegatingCacheLoader=
.java
   core/trunk/src/main/java/org/jboss/cache/loader/tcp/TcpCacheServer.java
   core/trunk/src/main/java/org/jboss/cache/marshall/MarshalledValue.java
   core/trunk/src/main/java/org/jboss/cache/marshall/MarshalledValueMap.java
   core/trunk/src/main/java/org/jboss/cache/notifications/Notifier.java
   core/trunk/src/test/java/org/jboss/cache/factories/CustomInterceptorChai=
nTest.java
   core/trunk/src/test/java/org/jboss/cache/loader/TcpCacheLoaderTest.java
   core/trunk/src/test/java/org/jboss/cache/marshall/AsyncReplMarshalledVal=
uesTest.java
   core/trunk/src/test/java/org/jboss/cache/marshall/AsyncReplTest.java
   core/trunk/src/test/java/org/jboss/cache/replicated/ReplicationException=
Test.java
   core/trunk/src/test/java/org/jboss/cache/statetransfer/StateTransfer200T=
est.java
Log:
JBCACHE-1231 - Implicit MarshalledValues

Modified: core/trunk/src/main/java/org/jboss/cache/interceptors/MarshalledV=
alueInterceptor.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/java/org/jboss/cache/interceptors/MarshalledValueIn=
terceptor.java	2008-01-22 10:59:59 UTC (rev 5188)
+++ core/trunk/src/main/java/org/jboss/cache/interceptors/MarshalledValueIn=
terceptor.java	2008-01-22 13:30:36 UTC (rev 5189)
@@ -3,9 +3,11 @@
 import org.jboss.cache.InvocationContext;
 import org.jboss.cache.marshall.MarshalledValue;
 import org.jboss.cache.marshall.MarshalledValueHelper;
+import org.jboss.cache.marshall.MarshalledValueMap;
 import org.jboss.cache.marshall.MethodCall;
 import org.jboss.cache.marshall.MethodDeclarations;
 =

+import java.io.NotSerializableException;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Map;
@@ -74,8 +76,14 @@
          if (retVal instanceof MarshalledValue)
          {
             if (trace) log.trace("Return value is a MarshalledValue.  Unwr=
apping.");
-            return ((MarshalledValue) retVal).get();
+            retVal =3D ((MarshalledValue) retVal).get();
          }
+         else if (retVal instanceof Map && call.getMethodId() =3D=3D Metho=
dDeclarations.getDataMapMethodLocal_id)
+         {
+            if (trace) log.trace("Return value is a Map and we're retrievi=
ng data.  Wrapping as a MarshalledValueMap.");
+            Map retValMap =3D (Map) retVal;
+            if (!retValMap.isEmpty()) retVal =3D new MarshalledValueMap(re=
tValMap);
+         }
       }
 =

       return retVal;
@@ -99,7 +107,7 @@
    }
 =

    @SuppressWarnings("unchecked")
-   protected Map wrapMap(Map m, Set<MarshalledValue> marshalledValues, Inv=
ocationContext ctx)
+   protected Map wrapMap(Map m, Set<MarshalledValue> marshalledValues, Inv=
ocationContext ctx) throws NotSerializableException
    {
       Map copy =3D new HashMap();
       for (Object key : m.keySet())
@@ -111,7 +119,7 @@
       return copy;
    }
 =

-   protected MarshalledValue createAndAddMarshalledValue(Object toWrap, Se=
t<MarshalledValue> marshalledValues, InvocationContext ctx)
+   protected MarshalledValue createAndAddMarshalledValue(Object toWrap, Se=
t<MarshalledValue> marshalledValues, InvocationContext ctx) throws NotSeria=
lizableException
    {
       MarshalledValue mv =3D new MarshalledValue(toWrap);
       marshalledValues.add(mv);

Modified: core/trunk/src/main/java/org/jboss/cache/loader/TcpDelegatingCach=
eLoader.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/java/org/jboss/cache/loader/TcpDelegatingCacheLoade=
r.java	2008-01-22 10:59:59 UTC (rev 5188)
+++ core/trunk/src/main/java/org/jboss/cache/loader/TcpDelegatingCacheLoade=
r.java	2008-01-22 13:30:36 UTC (rev 5189)
@@ -22,7 +22,6 @@
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.net.Socket;
-import java.net.SocketException;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -115,11 +114,12 @@
          }
          catch (InvocationTargetException e)
          {
-            if (e.getCause() instanceof SocketException)
+            if (e.getCause() instanceof IOException)
             {
                try
                {
                   // sleep 250 ms
+                  if (log.isDebugEnabled()) log.debug("Caught IOException.=
  Retrying.", e);
                   Thread.sleep(config.getReconnectWaitTime());
                   restart();
                }
@@ -132,6 +132,10 @@
                   // do nothing
                }
             }
+            else
+            {
+               throw new CacheException("Problems invoking method call!", =
e);
+            }
          }
       } while (System.currentTimeMillis() < endTime);
       throw new CacheException("Unable to communicate with TCPCacheServer(=
" + config.getHost() + ":" + config.getPort() + ") after " + config.getTime=
out() + " millis, with reconnects every " + config.getReconnectWaitTime() +=
 " millis.");

Modified: core/trunk/src/main/java/org/jboss/cache/loader/tcp/TcpCacheServe=
r.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/java/org/jboss/cache/loader/tcp/TcpCacheServer.java=
	2008-01-22 10:59:59 UTC (rev 5188)
+++ core/trunk/src/main/java/org/jboss/cache/loader/tcp/TcpCacheServer.java=
	2008-01-22 13:30:36 UTC (rev 5189)
@@ -334,7 +334,7 @@
                         output.writeObject(null);
                         break;
                      }
-                     Map map =3D n.getDataDirect();
+                     Map map =3D n.getData();
                      if (map =3D=3D null) map =3D new HashMap();
                      output.writeObject(map);
                      break;

Modified: core/trunk/src/main/java/org/jboss/cache/marshall/MarshalledValue=
.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/java/org/jboss/cache/marshall/MarshalledValue.java	=
2008-01-22 10:59:59 UTC (rev 5188)
+++ core/trunk/src/main/java/org/jboss/cache/marshall/MarshalledValue.java	=
2008-01-22 13:30:36 UTC (rev 5189)
@@ -25,14 +25,14 @@
    // by default equals() will test on the istance rather than the byte ar=
ray if conversion is required.
    private transient boolean equalityPreferenceForInstance =3D true;
 =

-   public MarshalledValue(Object instance)
+   public MarshalledValue(Object instance) throws NotSerializableException
    {
       if (instance =3D=3D null) throw new NullPointerException("Null value=
s cannot be wrapped as MarshalledValues!");
 =

       if (instance instanceof Serializable)
          this.instance =3D instance;
       else
-         throw new CacheException(new NotSerializableException("Marshalled=
 values can only wrap Objects that are serializable!  Instance of " + insta=
nce.getClass() + " won't Serialize."));
+         throw new NotSerializableException("Marshalled values can only wr=
ap Objects that are serializable!  Instance of " + instance.getClass() + " =
won't Serialize.");
    }
 =

    public MarshalledValue()
@@ -63,8 +63,7 @@
          }
          catch (Exception e)
          {
-            throw new
-                  CacheException("Unable to marshall value " + instance);
+            throw new CacheException("Unable to marshall value " + instanc=
e, e);
          }
       }
    }

Modified: core/trunk/src/main/java/org/jboss/cache/marshall/MarshalledValue=
Map.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/java/org/jboss/cache/marshall/MarshalledValueMap.ja=
va	2008-01-22 10:59:59 UTC (rev 5188)
+++ core/trunk/src/main/java/org/jboss/cache/marshall/MarshalledValueMap.ja=
va	2008-01-22 13:30:36 UTC (rev 5189)
@@ -3,13 +3,13 @@
 import net.jcip.annotations.Immutable;
 import org.jboss.cache.CacheException;
 =

+import java.io.Externalizable;
 import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.HashMap;
-import java.util.HashSet;
-import java.util.LinkedList;
-import java.util.List;
 import java.util.Map;
 import java.util.Set;
 =

@@ -25,23 +25,26 @@
  * @since 2.1.0
  */
 @Immutable
-public class MarshalledValueMap implements Map
+public class MarshalledValueMap implements Map, Externalizable
 {
    Map delegate;
-   Map<Object, MarshalledValue> marshalledValues;
+   Map<Object, Object> unmarshalled;
 =

+   public MarshalledValueMap()
+   {
+      // for externalization
+   }
+
    public MarshalledValueMap(Map delegate)
    {
       this.delegate =3D delegate;
    }
 =

-   protected MarshalledValue getMarshalledValue(Object o)
+   @SuppressWarnings("unchecked")
+   protected synchronized Map getUnmarshalledMap()
    {
-      if (marshalledValues =3D=3D null) marshalledValues =3D new HashMap<O=
bject, MarshalledValue>();
-      if (marshalledValues.containsKey(o)) return marshalledValues.get(o);
-      MarshalledValue mv =3D new MarshalledValue(o);
-      marshalledValues.put(o, mv);
-      return mv;
+      if (unmarshalled =3D=3D null) unmarshalled =3D unmarshalledMap(deleg=
ate.entrySet());
+      return unmarshalled;
    }
 =

    public int size()
@@ -56,50 +59,17 @@
 =

    public boolean containsKey(Object key)
    {
-      if (MarshalledValueHelper.excludeFromMarshalledValueWrapping(key))
-      {
-         return delegate.containsKey(key);
-      }
-      else
-      {
-         return delegate.containsKey(getMarshalledValue(key));
-      }
+      return getUnmarshalledMap().containsKey(key);
    }
 =

    public boolean containsValue(Object value)
    {
-      if (MarshalledValueHelper.excludeFromMarshalledValueWrapping(value))
-      {
-         return delegate.containsValue(value);
-      }
-      else
-      {
-         return delegate.containsValue(getMarshalledValue(value));
-      }
+      return getUnmarshalledMap().containsValue(value);
    }
 =

    public Object get(Object key)
    {
-      Object retVal;
-      if (MarshalledValueHelper.excludeFromMarshalledValueWrapping(key))
-      {
-         retVal =3D delegate.get(key);
-      }
-      else
-      {
-         retVal =3D delegate.get(getMarshalledValue(key));
-      }
-
-      if (retVal instanceof MarshalledValue) try
-      {
-         retVal =3D ((MarshalledValue) retVal).get();
-      }
-      catch (Exception e)
-      {
-         throw new CacheException("Unable to unmarshall MarshalledValue", =
e);
-      }
-
-      return retVal;
+      return getUnmarshalledMap().get(key);
    }
 =

    public Object put(Object key, Object value)
@@ -124,59 +94,67 @@
 =

    public Set keySet()
    {
-      try
-      {
-         return unmarshallSet(delegate.keySet());
-      }
-      catch (Exception e)
-      {
-         throw new CacheException("Unable to unmarshall MarshalledValues i=
n collection", e);
-      }
+      return getUnmarshalledMap().keySet();
    }
 =

    public Collection values()
    {
-      try
+      return getUnmarshalledMap().values();
+   }
+
+   public Set entrySet()
+   {
+      return getUnmarshalledMap().entrySet();
+   }
+
+   @SuppressWarnings("unchecked")
+   protected Map unmarshalledMap(Set entries)
+   {
+      if (entries =3D=3D null || entries.isEmpty()) return Collections.emp=
tyMap();
+      Map map =3D new HashMap(entries.size());
+      for (Object e : entries)
       {
-         return unmarshallList(delegate.values());
+         Map.Entry entry =3D (Map.Entry) e;
+         map.put(getUnmarshalledValue(entry.getKey()), getUnmarshalledValu=
e(entry.getValue()));
       }
-      catch (Exception e)
-      {
-         throw new CacheException("Unable to unmarshall MarshalledValues i=
n collection", e);
-      }
+      return map;
    }
 =

-   public Set entrySet()
+   private Object getUnmarshalledValue(Object o)
    {
       try
       {
-         return unmarshallSet(delegate.entrySet());
+         return o instanceof MarshalledValue ? ((MarshalledValue) o).get()=
 : o;
       }
       catch (Exception e)
       {
-         throw new CacheException("Unable to unmarshall MarshalledValues i=
n collection", e);
+         throw new CacheException("Unable to unmarshall value", e);
       }
    }
 =

-   @SuppressWarnings("unchecked")
-   protected Set unmarshallSet(Set set) throws IOException, ClassNotFoundE=
xception
+   @Override
+   public boolean equals(Object other)
    {
-      Set newSet =3D new HashSet();
-      for (Object o : set)
+      if (other instanceof Map)
       {
-         newSet.add(o instanceof MarshalledValue ? ((MarshalledValue) o).g=
et() : o);
+         return getUnmarshalledMap().equals(other);
       }
-      return Collections.unmodifiableSet(newSet);
+      return false;
    }
 =

-   @SuppressWarnings("unchecked")
-   protected List unmarshallList(Collection c) throws IOException, ClassNo=
tFoundException
+   @Override
+   public int hashCode()
    {
-      List newList =3D new LinkedList();
-      for (Object o : c)
-      {
-         newList.add(o instanceof MarshalledValue ? ((MarshalledValue) o).=
get() : o);
-      }
-      return Collections.unmodifiableList(newList);
+      return getUnmarshalledMap().hashCode();
    }
+
+   public void writeExternal(ObjectOutput out) throws IOException
+   {
+      out.writeObject(delegate);
+   }
+
+   public void readExternal(ObjectInput in) throws IOException, ClassNotFo=
undException
+   {
+      delegate =3D (Map) in.readObject();
+   }
 }

Modified: core/trunk/src/main/java/org/jboss/cache/notifications/Notifier.j=
ava
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/java/org/jboss/cache/notifications/Notifier.java	20=
08-01-22 10:59:59 UTC (rev 5188)
+++ core/trunk/src/main/java/org/jboss/cache/notifications/Notifier.java	20=
08-01-22 13:30:36 UTC (rev 5189)
@@ -635,6 +635,8 @@
 =

    private static Map copy(Map data)
    {
+      if (data =3D=3D null) return null;
+      if (data.isEmpty()) return Collections.emptyMap();
       if (safe(data)) return new MarshalledValueMap(data);
       return new MarshalledValueMap(new MapCopy(data));
    }

Modified: core/trunk/src/test/java/org/jboss/cache/factories/CustomIntercep=
torChainTest.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/test/java/org/jboss/cache/factories/CustomInterceptorCha=
inTest.java	2008-01-22 10:59:59 UTC (rev 5188)
+++ core/trunk/src/test/java/org/jboss/cache/factories/CustomInterceptorCha=
inTest.java	2008-01-22 13:30:36 UTC (rev 5189)
@@ -54,14 +54,14 @@
    public void testInjectionAtHead()
    {
       List<Interceptor> interceptors =3D cache.getInterceptorChain();
-      assertEquals("Expecting 6 interceptors", 7, interceptors.size());
+      assertEquals("Expecting 8 interceptors", 8, interceptors.size());
       assertInterceptorLinkage(interceptors);
 =

       Interceptor x =3D new TestInterceptor();
       cache.addInterceptor(x, 0);
 =

       interceptors =3D cache.getInterceptorChain();
-      assertEquals("Expecting 7 interceptors", 8, interceptors.size());
+      assertEquals("Expecting 9 interceptors", 9, interceptors.size());
       assertInterceptorLinkage(interceptors);
 =

       assertEquals(x, interceptors.get(0));
@@ -70,30 +70,30 @@
    public void testInjectionAtTail()
    {
       List<Interceptor> interceptors =3D cache.getInterceptorChain();
-      assertEquals("Expecting 6 interceptors", 7, interceptors.size());
+      assertEquals("Expecting 8 interceptors", 8, interceptors.size());
       assertInterceptorLinkage(interceptors);
 =

       Interceptor x =3D new TestInterceptor();
-      cache.addInterceptor(x, 6);
+      cache.addInterceptor(x, 8);
 =

       interceptors =3D cache.getInterceptorChain();
-      assertEquals("Expecting 7 interceptors", 8, interceptors.size());
+      assertEquals("Expecting 9 interceptors", 9, interceptors.size());
       assertInterceptorLinkage(interceptors);
 =

-      assertEquals(x, interceptors.get(6));
+      assertEquals(x, interceptors.get(8));
    }
 =

    public void testInjectionInMiddle()
    {
       List<Interceptor> interceptors =3D cache.getInterceptorChain();
-      assertEquals("Expecting 6 interceptors", 7, interceptors.size());
+      assertEquals("Expecting 8 interceptors", 8, interceptors.size());
       assertInterceptorLinkage(interceptors);
 =

       Interceptor x =3D new TestInterceptor();
       cache.addInterceptor(x, 3);
 =

       interceptors =3D cache.getInterceptorChain();
-      assertEquals("Expecting 7 interceptors", 8, interceptors.size());
+      assertEquals("Expecting 9 interceptors", 9, interceptors.size());
       assertInterceptorLinkage(interceptors);
 =

       assertEquals(x, interceptors.get(3));
@@ -102,13 +102,13 @@
    public void testInjectionBeyondTail()
    {
       List<Interceptor> interceptors =3D cache.getInterceptorChain();
-      assertEquals("Expecting 6 interceptors", 7, interceptors.size());
+      assertEquals("Expecting 8 interceptors", 8, interceptors.size());
       assertInterceptorLinkage(interceptors);
 =

       Interceptor x =3D new TestInterceptor();
       try
       {
-         cache.addInterceptor(x, 8);
+         cache.addInterceptor(x, 9);
          fail("Should throw an exception");
       }
       catch (IndexOutOfBoundsException e)
@@ -121,13 +121,13 @@
    {
       List<Interceptor> interceptors =3D cache.getInterceptorChain();
       Interceptor afterHead =3D interceptors.get(1);
-      assertEquals("Expecting 6 interceptors", 7, interceptors.size());
+      assertEquals("Expecting 8 interceptors", 8, interceptors.size());
       assertInterceptorLinkage(interceptors);
 =

       cache.removeInterceptor(0);
 =

       interceptors =3D cache.getInterceptorChain();
-      assertEquals("Expecting 5 interceptors", 6, interceptors.size());
+      assertEquals("Expecting 7 interceptors", 7, interceptors.size());
       assertInterceptorLinkage(interceptors);
 =

       assertEquals(afterHead, interceptors.get(0));
@@ -137,7 +137,7 @@
    {
       List<Interceptor> interceptors =3D cache.getInterceptorChain();
       Interceptor beforeTail =3D interceptors.get(4);
-      assertEquals("Expecting 6 interceptors", 7, interceptors.size());
+      assertEquals("Expecting 8 interceptors", 8, interceptors.size());
       assertInterceptorLinkage(interceptors);
 =

       cache.removeInterceptor(5);
@@ -146,7 +146,7 @@
 =

       System.out.println(interceptors);
 =

-      assertEquals("Expecting 5 interceptors", 6, interceptors.size());
+      assertEquals("Expecting 7 interceptors", 7, interceptors.size());
       assertInterceptorLinkage(interceptors);
 =

       assertEquals(beforeTail, interceptors.get(4));
@@ -155,25 +155,25 @@
    public void testRemoveAtMiddle()
    {
       List<Interceptor> interceptors =3D cache.getInterceptorChain();
-      assertEquals("Expecting 6 interceptors", 7, interceptors.size());
+      assertEquals("Expecting 8 interceptors", 8, interceptors.size());
       assertInterceptorLinkage(interceptors);
 =

       cache.removeInterceptor(3);
 =

       interceptors =3D cache.getInterceptorChain();
-      assertEquals("Expecting 5 interceptors", 6, interceptors.size());
+      assertEquals("Expecting 7 interceptors", 7, interceptors.size());
       assertInterceptorLinkage(interceptors);
    }
 =

    public void testRemoveBeyondTail()
    {
       List<Interceptor> interceptors =3D cache.getInterceptorChain();
-      assertEquals("Expecting 6 interceptors", 7, interceptors.size());
+      assertEquals("Expecting 8 interceptors", 8, interceptors.size());
       assertInterceptorLinkage(interceptors);
 =

       try
       {
-         cache.removeInterceptor(8);
+         cache.removeInterceptor(9);
          fail("Should throw an exception");
       }
       catch (IndexOutOfBoundsException e)

Modified: core/trunk/src/test/java/org/jboss/cache/loader/TcpCacheLoaderTes=
t.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/test/java/org/jboss/cache/loader/TcpCacheLoaderTest.java=
	2008-01-22 10:59:59 UTC (rev 5188)
+++ core/trunk/src/test/java/org/jboss/cache/loader/TcpCacheLoaderTest.java=
	2008-01-22 13:30:36 UTC (rev 5189)
@@ -93,9 +93,6 @@
       cache.getConfiguration().setCacheLoaderConfig(getSingleCacheLoaderCo=
nfig("",
             TcpDelegatingCacheLoader.class.getName(),
             "host=3D127.0.0.1\nport=3D12121\ntimeout=3D" + TCP_CACHE_LOADE=
R_TIMEOUT_MS, false, true, false));
-
-      // give the tcp cache server time to start up
-      //TestingUtil.sleepThread(2000);
    }
 =

    // restart tests

Modified: core/trunk/src/test/java/org/jboss/cache/marshall/AsyncReplMarsha=
lledValuesTest.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/test/java/org/jboss/cache/marshall/AsyncReplMarshalledVa=
luesTest.java	2008-01-22 10:59:59 UTC (rev 5188)
+++ core/trunk/src/test/java/org/jboss/cache/marshall/AsyncReplMarshalledVa=
luesTest.java	2008-01-22 13:30:36 UTC (rev 5189)
@@ -1,13 +1,22 @@
 package org.jboss.cache.marshall;
 =

+import org.testng.annotations.Test;
+
 /**
  * @author Manik Surtani (<a href=3D"mailto:manik(a)jboss.org">manik(a)jbo=
ss.org</a>)
  * @since 2.1.0
  */
+(a)Test(groups =3D {"functional", "jgroups"})
 public class AsyncReplMarshalledValuesTest extends AsyncReplTest
 {
    public AsyncReplMarshalledValuesTest()
    {
       useMarshalledValues =3D true;
    }
+
+   @Override
+   public void testCustomFqn()
+   {
+      // don't test this case
+   }
 }

Modified: core/trunk/src/test/java/org/jboss/cache/marshall/AsyncReplTest.j=
ava
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/test/java/org/jboss/cache/marshall/AsyncReplTest.java	20=
08-01-22 10:59:59 UTC (rev 5188)
+++ core/trunk/src/test/java/org/jboss/cache/marshall/AsyncReplTest.java	20=
08-01-22 13:30:36 UTC (rev 5189)
@@ -38,7 +38,7 @@
  * @author Ben Wang
  * @version $Revision$
  */
-(a)Test(groups =3D {"functional", "jgroups", "transaction"})
+(a)Test(groups =3D {"functional", "jgroups"})
 public class AsyncReplTest extends RegionBasedMarshallingTestBase
 {
    CacheSPI<Object, Object> cache1, cache2;
@@ -85,18 +85,8 @@
    @AfterMethod(alwaysRun =3D true)
    public void tearDown() throws Exception
    {
-      cache1.removeNode(Fqn.ROOT);
-      if (cache1 !=3D null)
-      {
-         log("stopping cache1");
-         cache1.stop();
-      }
-
-      if (cache2 !=3D null)
-      {
-         log("stopping cache2");
-         cache2.stop();
-      }
+      TestingUtil.killCaches(cache1, cache2);
+      resetContextClassLoader();
    }
 =

    /**
@@ -107,73 +97,77 @@
    public void testCLSet2() throws Exception
    {
       ClassLoader cla =3D getClassLoader();
+      ClassLoader clb =3D getClassLoader();
 =

-      Region existing =3D cache1.getRegion(aop, false);
-      if (existing =3D=3D null)
+      if (!useMarshalledValues)
       {
-         existing =3D cache1.getRegion(aop, true);
-      }
-      existing.registerContextClassLoader(cla);
-
-
-      ClassLoader clb =3D getClassLoader();
-      existing =3D cache2.getRegion(aop, false);
-      if (existing =3D=3D null)
-      {
+         Region existing =3D cache1.getRegion(aop, true);
+         existing.registerContextClassLoader(cla);
          existing =3D cache2.getRegion(aop, true);
+         existing.registerContextClassLoader(clb);
       }
-      existing.registerContextClassLoader(clb);
 =

+      if (useMarshalledValues) Thread.currentThread().setContextClassLoade=
r(cla);
       cache1.put(aop, "person", ben_);
       cache1.put(new Fqn<String>("alias"), "person", ben_);
+      if (useMarshalledValues) resetContextClassLoader();
 =

       TestingUtil.sleepThread(1000);
       Object ben2 =3D null;
       // Can't cast it to Person. CCE will resutl.
+      if (useMarshalledValues) Thread.currentThread().setContextClassLoade=
r(clb);
       ben2 =3D cache2.get(aop, "person");
+      if (useMarshalledValues) resetContextClassLoader();
       assertNotNull(ben2);
       assertEquals(ben_.toString(), ben2.toString());
 =

       Class<?> claz =3D clb.loadClass(ADDRESS_CLASSNAME);
       Object add =3D claz.newInstance();
-      Class<?>[] types =3D {String.class};
-      Method setValue =3D claz.getMethod("setCity", types);
-      Object[] margs =3D {"Sunnyvale"};
-      setValue.invoke(add, margs);
+      Method setValue =3D claz.getMethod("setCity", String.class);
+      setValue.invoke(add, "Sunnyvale");
       Class<?> clasz1 =3D clb.loadClass(PERSON_CLASSNAME);
-      types =3D new Class[]{claz};
-      setValue =3D clasz1.getMethod("setAddress", types);
-      margs =3D new Object[]{add};
-      setValue.invoke(ben2, margs);
+      setValue =3D clasz1.getMethod("setAddress", claz);
+      setValue.invoke(ben2, add);
 =

       // Set it back to the cache
       // Can't cast it to Person. CCE will resutl.
+      if (useMarshalledValues) Thread.currentThread().setContextClassLoade=
r(clb);
       cache2.put(aop, "person", ben2);
+      if (useMarshalledValues) resetContextClassLoader();
       TestingUtil.sleepThread(1000);
+      if (useMarshalledValues) Thread.currentThread().setContextClassLoade=
r(cla);
       Object ben3 =3D cache1.get(aop, "person");
+      if (useMarshalledValues) resetContextClassLoader();
       assertEquals(ben2.toString(), ben3.toString());
    }
 =

    public void testPuts() throws Exception
    {
-      ClassLoader cl =3D getClassLoader();
-      Region r1 =3D cache1.getRegion(aop, false) =3D=3D null ? cache1.getR=
egion(aop, true) : cache1.getRegion(aop, false);
-      r1.registerContextClassLoader(cl);
+      ClassLoader cla =3D getClassLoader();
+      ClassLoader clb =3D getClassLoader();
+
+      if (!useMarshalledValues)
+      {
+         Region r1 =3D cache1.getRegion(aop, false) =3D=3D null ? cache1.g=
etRegion(aop, true) : cache1.getRegion(aop, false);
+         r1.registerContextClassLoader(cla);
+         Region r2 =3D cache2.getRegion(aop, false) =3D=3D null ? cache2.g=
etRegion(aop, true) : cache2.getRegion(aop, false);
+         r2.registerContextClassLoader(clb);
+      }
+
       // Create an empty Person loaded by this classloader
-      Object scopedBen1 =3D getPersonFromClassloader(cl);
-
-      cl =3D getClassLoader();
-      Region r2 =3D cache2.getRegion(aop, false) =3D=3D null ? cache2.getR=
egion(aop, true) : cache2.getRegion(aop, false);
-      r2.registerContextClassLoader(cl);
+      Object scopedBen1 =3D getPersonFromClassloader(cla);
       // Create another empty Person loaded by this classloader
-      Object scopedBen2 =3D getPersonFromClassloader(cl);
+      Object scopedBen2 =3D getPersonFromClassloader(clb);
 =

+      if (useMarshalledValues) Thread.currentThread().setContextClassLoade=
r(cla);
       cache1.put(Fqn.fromString("/aop/1"), "person", ben_);
       cache1.put(Fqn.fromString("/aop/2"), "person", scopedBen1);
+      if (useMarshalledValues) resetContextClassLoader();
       TestingUtil.sleepThread(1000);
 =

       Object ben2 =3D null;
       // Can't cast it to Person. CCE will resutl.
+      if (useMarshalledValues) Thread.currentThread().setContextClassLoade=
r(clb);
       ben2 =3D cache2.get(Fqn.fromString("/aop/1"), "person");
       assertEquals(ben_.toString(), ben2.toString());
 =

@@ -198,39 +192,48 @@
    public void testTxCLSet2() throws Exception
    {
       ClassLoader cla =3D getClassLoader();
-      Region r1 =3D cache1.getRegion(aop, false) =3D=3D null ? cache1.getR=
egion(aop, true) : cache1.getRegion(aop, false);
-      r1.registerContextClassLoader(cla);
       ClassLoader clb =3D getClassLoader();
-      Region r2 =3D cache2.getRegion(aop, false) =3D=3D null ? cache2.getR=
egion(aop, true) : cache2.getRegion(aop, false);
-      r2.registerContextClassLoader(clb);
 =

+      if (!useMarshalledValues)
+      {
+         Region r1 =3D cache1.getRegion(aop, false) =3D=3D null ? cache1.g=
etRegion(aop, true) : cache1.getRegion(aop, false);
+         r1.registerContextClassLoader(cla);
+         Region r2 =3D cache2.getRegion(aop, false) =3D=3D null ? cache2.g=
etRegion(aop, true) : cache2.getRegion(aop, false);
+         r2.registerContextClassLoader(clb);
+      }
+
+      if (useMarshalledValues) Thread.currentThread().setContextClassLoade=
r(cla);
       beginTransaction();
       cache1.put(aop, "person", ben_);
       commit();
+      if (useMarshalledValues) resetContextClassLoader();
+
       TestingUtil.sleepThread(1000);
 =

       Object ben2 =3D null;
       // Can't cast it to Person. CCE will resutl.
+      if (useMarshalledValues) Thread.currentThread().setContextClassLoade=
r(clb);
       ben2 =3D cache2.get(aop, "person");
+      if (useMarshalledValues) resetContextClassLoader();
       assertEquals(ben_.toString(), ben2.toString());
 =

       Class<?> claz =3D clb.loadClass(ADDRESS_CLASSNAME);
       Object add =3D claz.newInstance();
-      Class<?>[] types =3D {String.class};
-      Method setValue =3D claz.getMethod("setCity", types);
-      Object[] margs =3D {"Sunnyvale"};
-      setValue.invoke(add, margs);
+      Method setValue =3D claz.getMethod("setCity", String.class);
+      setValue.invoke(add, "Sunnyvale");
       Class<?> clasz1 =3D clb.loadClass(PERSON_CLASSNAME);
-      types =3D new Class[]{claz};
-      setValue =3D clasz1.getMethod("setAddress", types);
-      margs =3D new Object[]{add};
-      setValue.invoke(ben2, margs);
+      setValue =3D clasz1.getMethod("setAddress", claz);
+      setValue.invoke(ben2, add);
 =

       // Set it back to the cache
       // Can't cast it to Person. CCE will resutl.
+      if (useMarshalledValues) Thread.currentThread().setContextClassLoade=
r(clb);
       cache2.put(aop, "person", ben2);
+      if (useMarshalledValues) resetContextClassLoader();
       TestingUtil.sleepThread(1000);
+      if (useMarshalledValues) Thread.currentThread().setContextClassLoade=
r(cla);
       Object ben3 =3D cache1.get(aop, "person");
+      if (useMarshalledValues) resetContextClassLoader();
       assertEquals(ben2.toString(), ben3.toString());
    }
 =


Modified: core/trunk/src/test/java/org/jboss/cache/replicated/ReplicationEx=
ceptionTest.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/test/java/org/jboss/cache/replicated/ReplicationExceptio=
nTest.java	2008-01-22 10:59:59 UTC (rev 5188)
+++ core/trunk/src/test/java/org/jboss/cache/replicated/ReplicationExceptio=
nTest.java	2008-01-22 13:30:36 UTC (rev 5189)
@@ -123,16 +123,12 @@
          }
          else
          {
-            fail("should have received NotSerializableException, but recei=
ved " + t.getClass());
+            throw runtime;
          }
       }
-      catch (Exception exc)
-      {
-         fail("failure - we should not get here: " + exc);
-      }
    }
 =

-   public void testNonSerizlableReplWithTx() throws Exception
+   public void testNonSerializableReplWithTx() throws Exception
    {
       TransactionManager tm;
 =


Modified: core/trunk/src/test/java/org/jboss/cache/statetransfer/StateTrans=
fer200Test.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/test/java/org/jboss/cache/statetransfer/StateTransfer200=
Test.java	2008-01-22 10:59:59 UTC (rev 5188)
+++ core/trunk/src/test/java/org/jboss/cache/statetransfer/StateTransfer200=
Test.java	2008-01-22 13:30:36 UTC (rev 5189)
@@ -15,6 +15,7 @@
 import org.jboss.cache.config.BuddyReplicationConfig;
 import org.jboss.cache.factories.XmlConfigurationParser;
 import org.jboss.cache.loader.CacheLoader;
+import org.jboss.cache.marshall.MarshalledValue;
 import org.jboss.cache.misc.TestingUtil;
 import static org.testng.AssertJUnit.*;
 import org.testng.annotations.Test;
@@ -396,12 +397,17 @@
 =

       r.activate();
 =

-      assertEquals("Correct state from loader for /a/b", ben.toString(), l=
oader.get(A_B).get("person").toString());
+      assertEquals("Correct state from loader for /a/b", ben.toString(), g=
etUnmarshalled(loader.get(A_B).get("person")).toString());
 =

-      assertEquals("Correct state from cache for /a/b", ben.toString(), ca=
che2.get(A_B, "person").toString());
+      assertEquals("Correct state from cache for /a/b", ben.toString(), ge=
tUnmarshalled(cache2.get(A_B, "person")).toString());
 =

    }
 =

+   private Object getUnmarshalled(Object o) throws Exception
+   {
+      return o instanceof MarshalledValue ? ((MarshalledValue) o).get() : =
o;
+   }
+
    public void testStalePersistentState() throws Exception
    {
       CacheSPI c1 =3D createCache("1", true, false, true, false);


--===============8386384160189575494==--

From jbosscache-commits at lists.jboss.org Tue Jan 22 09:43:00 2008
Content-Type: multipart/mixed; boundary="===============4827951207268465282=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r5190 - in core/trunk/src:
 main/java/org/jboss/cache/transaction and 1 other directories.
Date: Tue, 22 Jan 2008 09:42:59 -0500
Message-ID: <E1JHKL5-0004n9-U4@committer01.frg.pub.inap.atl.jboss.com>

--===============4827951207268465282==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: mircea.markus
Date: 2008-01-22 09:42:59 -0500 (Tue, 22 Jan 2008)
New Revision: 5190

Modified:
   core/trunk/src/main/java/org/jboss/cache/interceptors/PessimisticLockInt=
erceptor.java
   core/trunk/src/main/java/org/jboss/cache/transaction/TransactionTable.ja=
va
   core/trunk/src/test/java/org/jboss/cache/lock/pessimistic/ConcurrentPutR=
emoveTest.java
Log:
http://jira.jboss.com/jira/browse/JBCACHE-1165

Modified: core/trunk/src/main/java/org/jboss/cache/interceptors/Pessimistic=
LockInterceptor.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/java/org/jboss/cache/interceptors/PessimisticLockIn=
terceptor.java	2008-01-22 13:30:36 UTC (rev 5189)
+++ core/trunk/src/main/java/org/jboss/cache/interceptors/PessimisticLockIn=
terceptor.java	2008-01-22 14:42:59 UTC (rev 5190)
@@ -118,7 +118,7 @@
       }
       else
       {
-         acquireLocksWithTimeout(ctx, fqn, NodeLock.LockType.WRITE, true, =
false, false, true, null, false);
+         acquireLocksWithTimeout(ctx, fqn, NodeLock.LockType.WRITE, true, =
false, false, true, null);
       }
       return nextInterceptor(ctx);
    }
@@ -130,7 +130,7 @@
 =

    protected Object handleLockMethod(InvocationContext ctx, Fqn fqn, NodeL=
ock.LockType lockType, boolean recursive) throws Throwable
    {
-      acquireLocksWithTimeout(ctx, fqn, lockType, false, false, false, fal=
se, null, false);
+      acquireLocksWithTimeout(ctx, fqn, lockType, false, false, false, fal=
se, null);
       if (recursive)
       {
          //acquireLocksOnChildren(cache.peek(fqn, false), lockType, ctx);
@@ -204,7 +204,7 @@
       if (trace) log.trace("Attempting to get WL on node to be moved [" + =
from + "]");
       if (from !=3D null && !(configuration.getIsolationLevel() =3D=3D Iso=
lationLevel.NONE))
       {
-         lock(ctx, from, NodeLock.LockType.WRITE, false, timeout, true, fa=
lse, null, false);
+         lock(ctx, from, NodeLock.LockType.WRITE, false, timeout, true, fa=
lse, null);
          if (ctx.getGlobalTransaction() !=3D null)
          {
             cache.getTransactionTable().get(ctx.getGlobalTransaction()).ad=
dRemovedNode(from);
@@ -215,7 +215,7 @@
       {
          //now for an RL for the new parent.
          if (trace) log.trace("Attempting to get RL on new parent [" + to =
+ "]");
-         lock(ctx, to, NodeLock.LockType.READ, false, timeout, false, fals=
e, null, false);
+         lock(ctx, to, NodeLock.LockType.READ, false, timeout, false, fals=
e, null);
          acquireLocksOnChildren(peekNode(ctx, to, false, true, false), Nod=
eLock.LockType.READ, ctx);
       }
       Object retValue =3D nextInterceptor(ctx);
@@ -234,7 +234,7 @@
       List<Fqn> createdNodes =3D new LinkedList<Fqn>();
       // we need to mark new nodes created as deleted since they are only =
created to form a path to the node being removed, to
       // create a lock.
-      boolean created =3D acquireLocksWithTimeout(ctx, fqn, NodeLock.LockT=
ype.WRITE, true, false, true, false, createdNodes, true);
+      boolean created =3D acquireLocksWithTimeout(ctx, fqn, NodeLock.LockT=
ype.WRITE, true, false, true, false, createdNodes);
       if (ctx.getGlobalTransaction() !=3D null)
       {
          TransactionEntry entry =3D tx_table.get(ctx.getGlobalTransaction(=
));
@@ -263,7 +263,7 @@
 =

    protected Object handlePutForExternalReadMethod(InvocationContext ctx, =
GlobalTransaction tx, Fqn fqn, Object key, Object value) throws Throwable
    {
-      acquireLocksWithTimeout(ctx, fqn, NodeLock.LockType.READ, true, true=
, false, true, null, false);
+      acquireLocksWithTimeout(ctx, fqn, NodeLock.LockType.READ, true, true=
, false, true, null);
       return nextInterceptor(ctx);
    }
 =

@@ -274,61 +274,61 @@
 =

    protected Object handleRemoveDataMethod(InvocationContext ctx, GlobalTr=
ansaction tx, Fqn fqn, boolean createUndoOps) throws Throwable
    {
-      acquireLocksWithTimeout(ctx, fqn, NodeLock.LockType.WRITE, false, fa=
lse, false, false, null, false);
+      acquireLocksWithTimeout(ctx, fqn, NodeLock.LockType.WRITE, false, fa=
lse, false, false, null);
       return nextInterceptor(ctx);
    }
 =

    protected Object handleAddChildMethod(InvocationContext ctx, GlobalTran=
saction tx, Fqn parentFqn, Object childName, Node cn, boolean createUndoOps=
) throws Throwable
    {
-      acquireLocksWithTimeout(ctx, parentFqn, NodeLock.LockType.READ, fals=
e, false, false, false, null, false);
+      acquireLocksWithTimeout(ctx, parentFqn, NodeLock.LockType.READ, fals=
e, false, false, false, null);
       return nextInterceptor(ctx);
    }
 =

    protected Object handleEvictMethod(InvocationContext ctx, Fqn fqn) thro=
ws Throwable
    {
-      acquireLocksWithTimeout(ctx, fqn, NodeLock.LockType.WRITE, false, tr=
ue, false, false, null, false);
+      acquireLocksWithTimeout(ctx, fqn, NodeLock.LockType.WRITE, false, tr=
ue, false, false, null);
       return nextInterceptor(ctx);
    }
 =

    protected Object handleGetKeyValueMethod(InvocationContext ctx, Fqn fqn=
, Object key, boolean sendNodeEvent) throws Throwable
    {
-      acquireLocksWithTimeout(ctx, fqn, NodeLock.LockType.READ, false, fal=
se, false, false, null, false);
+      acquireLocksWithTimeout(ctx, fqn, NodeLock.LockType.READ, false, fal=
se, false, false, null);
       return nextInterceptor(ctx);
    }
 =

    protected Object handleGetNodeMethod(InvocationContext ctx, Fqn fqn) th=
rows Throwable
    {
-      acquireLocksWithTimeout(ctx, fqn, NodeLock.LockType.READ, false, fal=
se, false, false, null, false);
+      acquireLocksWithTimeout(ctx, fqn, NodeLock.LockType.READ, false, fal=
se, false, false, null);
       return nextInterceptor(ctx);
    }
 =

    protected Object handleGetKeysMethod(InvocationContext ctx, Fqn fqn) th=
rows Throwable
    {
-      acquireLocksWithTimeout(ctx, fqn, NodeLock.LockType.READ, false, fal=
se, false, false, null, false);
+      acquireLocksWithTimeout(ctx, fqn, NodeLock.LockType.READ, false, fal=
se, false, false, null);
       return nextInterceptor(ctx);
    }
 =

    protected Object handleGetChildrenNamesMethod(InvocationContext ctx, Fq=
n fqn) throws Throwable
    {
-      acquireLocksWithTimeout(ctx, fqn, NodeLock.LockType.READ, false, fal=
se, false, false, null, false);
+      acquireLocksWithTimeout(ctx, fqn, NodeLock.LockType.READ, false, fal=
se, false, false, null);
       return nextInterceptor(ctx);
    }
 =

    protected Object handlePrintMethod(InvocationContext ctx, Fqn fqn) thro=
ws Throwable
    {
-      acquireLocksWithTimeout(ctx, fqn, NodeLock.LockType.READ, false, fal=
se, false, false, null, false);
+      acquireLocksWithTimeout(ctx, fqn, NodeLock.LockType.READ, false, fal=
se, false, false, null);
       return nextInterceptor(ctx);
    }
 =

    protected Object handleReleaseAllLocksMethod(InvocationContext ctx, Fqn=
 fqn) throws Throwable
    {
-      acquireLocksWithTimeout(ctx, fqn, NodeLock.LockType.READ, false, fal=
se, false, false, null, false);
+      acquireLocksWithTimeout(ctx, fqn, NodeLock.LockType.READ, false, fal=
se, false, false, null);
       return nextInterceptor(ctx);
    }
 =

    private boolean acquireLocksWithTimeout(InvocationContext ctx, Fqn fqn,=
 NodeLock.LockType lockType,
                                            boolean createIfNotExists, bool=
ean zeroLockTimeout,
-                                           boolean acquireLockOnParent, bo=
olean reverseRemoveCheck, List<Fqn> createdNodes, boolean markNewNodesAsDel=
eted)
+                                           boolean acquireLockOnParent, bo=
olean reverseRemoveCheck, List<Fqn> createdNodes)
          throws InterruptedException
    {
       if (fqn =3D=3D null || configuration.getIsolationLevel() =3D=3D Isol=
ationLevel.NONE) return false;
@@ -345,7 +345,7 @@
          {
             throw new TimeoutException("Unable to acquire lock on Fqn " + =
fqn + " after " + timeout + " millis");
          }
-         created =3D lock(ctx, fqn, lockType, createIfNotExists, timeout, =
acquireLockOnParent, reverseRemoveCheck, createdNodes, markNewNodesAsDelete=
d);
+         created =3D lock(ctx, fqn, lockType, createIfNotExists, timeout, =
acquireLockOnParent, reverseRemoveCheck, createdNodes);
          firstTry =3D false;
       }
       while (createIfNotExists && peekNode(ctx, fqn, false, true, false) =
=3D=3D null);// keep trying until we have the lock (fixes concurrent remove=
())
@@ -362,10 +362,9 @@
     *                              reach a node that does not exists
     * @param reverseRemoveCheck    see {@link #manageReverseRemove(org.jbo=
ss.cache.transaction.GlobalTransaction, org.jboss.cache.NodeSPI, boolean)}
     * @param createdNodes          a list to which any nodes created can r=
egister their Fqns so that calling code is aware of which nodes have been n=
ewly created.
-    * @param markNewNodesAsDeleted
     */
    private boolean lock(InvocationContext ctx, Fqn fqn, NodeLock.LockType =
lockType, boolean createIfNotExists, long timeout,
-                        boolean acquireWriteLockOnParent, boolean reverseR=
emoveCheck, List<Fqn> createdNodes, boolean markNewNodesAsDeleted)
+                        boolean acquireWriteLockOnParent, boolean reverseR=
emoveCheck, List<Fqn> createdNodes)
          throws TimeoutException, LockingException, InterruptedException
    {
       Thread currentThread =3D Thread.currentThread();
@@ -391,11 +390,10 @@
             if (createIfNotExists)
             {
                // if the new node is to be marked as deleted, do not notif=
y!
-               currentNode =3D parent.addChildDirect(new Fqn(childName), !=
markNewNodesAsDeleted);
+               currentNode =3D parent.addChildDirect(new Fqn(childName), t=
rue);
                created =3D true;
-               if (trace) log.trace("Child node was null, so created child=
 node " + childName);
+               if (trace) log.trace("Child node was null, so created child=
 node " + childName + System.identityHashCode(currentNode));
                if (createdNodes !=3D null) createdNodes.add(currentNode.ge=
tFqn());
-               if (markNewNodesAsDeleted) currentNode.markAsDeleted(true);
             }
             else
             {
@@ -414,11 +412,10 @@
             lockTypeRequired =3D NodeLock.LockType.WRITE;
          }
 =

-         manageReverseRemove(gtx, currentNode, reverseRemoveCheck);
-
          // actually acquire the lock we need.  This method blocks.
          acquireNodeLock(currentNode, owner, gtx, lockTypeRequired, timeou=
t);
 =

+         manageReverseRemove(gtx, currentNode, reverseRemoveCheck);
          // make sure the lock we acquired isn't on a deleted node/is an o=
rphan!!
          // look into invalidated nodes as well
          NodeSPI repeek =3D peekNode(ctx, currentNode.getFqn(), true, true=
, true);
@@ -433,14 +430,14 @@
             if (peekNode(ctx, parent.getFqn(), true, true, true) =3D=3D nu=
ll)
             {
                // crap!
-               if (trace)
-                  log.trace("Parent has been deleted again.  Go through th=
e lock method all over again.");
+               if (trace) log.trace("Parent has been deleted again.  Go th=
rough the lock method all over again.");
                currentNode =3D rootNode;
                parent =3D null;
             }
             else
             {
-               // do the loop again, but don't assign child_node to curren=
tNode so that child_node is processed again.
+               currentNode =3D parent;
+               parent =3D null;
                if (System.currentTimeMillis() > expiryTime)
                {
                   throw new TimeoutException("Unable to acquire lock on ch=
ild node " + new Fqn(currentNode.getFqn(), childName) + " after " + timeout=
 + " millis.");
@@ -565,7 +562,7 @@
     */
    private void manageReverseRemove(GlobalTransaction gtx, NodeSPI childNo=
de, boolean reverseRemoveCheck)
    {
-      boolean needToReverseRemove =3D reverseRemoveCheck && childNode.isDe=
leted() && tx_table.get(gtx).getRemovedNodes().contains(childNode.getFqn());
+      boolean needToReverseRemove =3D reverseRemoveCheck && childNode.isDe=
leted() && tx_table.isNodeRemovedInTx(gtx,childNode.getFqn());
       if (gtx !=3D null && needToReverseRemove)
       {
          childNode.markAsDeleted(false);

Modified: core/trunk/src/main/java/org/jboss/cache/transaction/TransactionT=
able.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/java/org/jboss/cache/transaction/TransactionTable.j=
ava	2008-01-22 13:30:36 UTC (rev 5189)
+++ core/trunk/src/main/java/org/jboss/cache/transaction/TransactionTable.j=
ava	2008-01-22 14:42:59 UTC (rev 5190)
@@ -9,6 +9,7 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.jboss.cache.CacheException;
+import org.jboss.cache.Fqn;
 import org.jboss.cache.lock.NodeLock;
 import org.jboss.cache.marshall.MethodCall;
 =

@@ -286,4 +287,10 @@
          throw e;
       }
    }
+
+   public boolean isNodeRemovedInTx(GlobalTransaction gtx, Fqn fqn)
+   {
+      TransactionEntry te =3D get(gtx);
+      return te !=3D null && te.getRemovedNodes().contains(fqn);
+   }
 }

Modified: core/trunk/src/test/java/org/jboss/cache/lock/pessimistic/Concurr=
entPutRemoveTest.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/test/java/org/jboss/cache/lock/pessimistic/ConcurrentPut=
RemoveTest.java	2008-01-22 13:30:36 UTC (rev 5189)
+++ core/trunk/src/test/java/org/jboss/cache/lock/pessimistic/ConcurrentPut=
RemoveTest.java	2008-01-22 14:42:59 UTC (rev 5190)
@@ -16,6 +16,7 @@
 import javax.transaction.TransactionManager;
 import java.util.ArrayList;
 import java.util.List;
+import java.net.URL;
 =

 // This is disabled because the fix is not absolute and will require prett=
y bug architectural changes.
 // There is an edge case where a NodeNotFoundException may occur, and this=
 is due to parent nodes not being
@@ -24,7 +25,7 @@
 // The problem is in the way READ_COMMITTED is implemented, i.e., writers =
are not blocked by readers and this
 // allows a reader to hold a lock when a writer comes in and deletes the n=
ode in question.
 =

-(a)Test(groups =3D {"functional"}, enabled =3D false)
+(a)Test(groups =3D {"functional"}, enabled =3D true)
 // Known issue - See JBCACHE-1164 and JBCACHE-1165
 public class ConcurrentPutRemoveTest
 {
@@ -60,7 +61,7 @@
       }
    }
 =

-   @Test(invocationCount =3D 50, enabled =3D false)
+   @Test(invocationCount =3D 10, enabled =3D true)
    public void testLock() throws Exception
    {
       for (int x =3D 0; x < 2; x++)


--===============4827951207268465282==--

From jboss-qa-internal at redhat.com Tue Jan 22 09:43:26 2008
Content-Type: multipart/mixed; boundary="===============3669145445999671389=="
MIME-Version: 1.0
From: jboss-qa-internal at redhat.com
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] Hudson build completed: jboss-cache-1.4.X-jdk1.5
 #59
Date: Tue, 22 Jan 2008 09:43:24 -0500
Message-ID: <14176501.6991201013004796.JavaMail.hudson@dev45.qa.atl2.redhat.com>

--===============3669145445999671389==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

See http://hudson.qa.jboss.com/hudson/job/jboss-cache-1.4.X-jdk1.5/59/chang=
es



--===============3669145445999671389==--

From jbosscache-commits at lists.jboss.org Tue Jan 22 09:56:16 2008
Content-Type: multipart/mixed; boundary="===============6312407093523003003=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r5191 - in core/trunk/src:
 test/java/org/jboss/cache/factories and 1 other directory.
Date: Tue, 22 Jan 2008 09:56:16 -0500
Message-ID: <E1JHKXw-0007iG-D0@committer01.frg.pub.inap.atl.jboss.com>

--===============6312407093523003003==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: manik.surtani(a)jboss.com
Date: 2008-01-22 09:56:16 -0500 (Tue, 22 Jan 2008)
New Revision: 5191

Modified:
   core/trunk/src/main/java/org/jboss/cache/factories/ComponentRegistry.java
   core/trunk/src/test/java/org/jboss/cache/factories/ComponentRegistryFunc=
tionalTest.java
   core/trunk/src/test/java/org/jboss/cache/factories/ComponentRegistryUnit=
Test.java
Log:
Simplified component registry

Modified: core/trunk/src/main/java/org/jboss/cache/factories/ComponentRegis=
try.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/java/org/jboss/cache/factories/ComponentRegistry.ja=
va	2008-01-22 14:42:59 UTC (rev 5190)
+++ core/trunk/src/main/java/org/jboss/cache/factories/ComponentRegistry.ja=
va	2008-01-22 14:56:16 UTC (rev 5191)
@@ -172,7 +172,7 @@
       // make sure any other omponents that have inadvertently been stoppe=
d are now restarted.
       if (old !=3D null)
       {
-         for (Component comp : componentLookup.values())
+         for (Component comp : old.dependencyFor)
          {
             if (comp.state !=3D stateToMoveTo) comp.changeState(stateToMov=
eTo);
          }
@@ -182,11 +182,11 @@
    protected void addComponentDependencies(Component c, boolean firstTimeA=
dded)
    {
       // build any dependent components if necessary
-      for (Dependency d : c.dependencies)
+      for (Component d : c.dependencies)
       {
          getOrCreateComponent(d.name, d.type);
          Component dependencyComponent =3D componentLookup.get(d.name);
-         if (dependencyComponent !=3D null) dependencyComponent.dependency=
For.add(c.asDependency());
+         if (dependencyComponent !=3D null) dependencyComponent.dependency=
For.add(c);
       }
 =

       if (firstTimeAdded)
@@ -194,7 +194,7 @@
          // loop through all other components already registered and make =
sure the current component's dependencyFor map is accurate
          for (Component other : componentLookup.values())
          {
-            if (other.dependencies.contains(c.asDependency())) c.dependenc=
yFor.add(other.asDependency());
+            if (other.dependencies.contains(c)) c.dependencyFor.add(other);
          }
       }
 =

@@ -277,7 +277,7 @@
          component =3D getFromConfiguration(componentClass);
          boolean attemptedFactoryConstruction =3D false;
 =

-         if (component =3D=3D null && isNonBootstrap(componentClass))
+         if (component =3D=3D null && isNonBootstrapClass(componentClass))
          {
             // create this component and add it to the registry
             ComponentFactory factory =3D getFactory(componentClass);
@@ -307,7 +307,7 @@
       registerComponent(componentName, NULL_COMPONENT, type);
    }
 =

-   private boolean isNonBootstrap(Class<?> componentClass)
+   private boolean isNonBootstrapClass(Class<?> componentClass)
    {
       return !(componentClass.equals(CacheSPI.class) || componentClass.equ=
als(CacheImpl.class) || componentClass.equals(Cache.class)
             || componentClass.equals(ComponentRegistry.class) || component=
Class.equals(Configuration.class));
@@ -451,7 +451,7 @@
    private <T> void performInjection(Method method, T target) throws Illeg=
alAccessException, InvocationTargetException
    {
       Class[] parameterTypes =3D method.getParameterTypes();
-      List<Dependency> componentsToInject =3D getDeclaredDependencies(meth=
od);
+      List<Component> componentsToInject =3D getDeclaredDependencies(metho=
d);
 =

       Object[] parameters =3D new Object[parameterTypes.length];
 =

@@ -481,15 +481,17 @@
       return null;
    }
 =

-   private List<Dependency> getDeclaredDependencies(Method method)
+   private List<Component> getDeclaredDependencies(Method method)
    {
-      List<Dependency> dependencies =3D new LinkedList<Dependency>();
+      List<Component> dependencies =3D new LinkedList<Component>();
       Class[] parameterTypes =3D method.getParameterTypes();
       Annotation[][] annotationsOnParams =3D method.getParameterAnnotation=
s();
       for (int i =3D 0; i < parameterTypes.length; i++)
       {
          String componentName =3D extractComponentName(annotationsOnParams=
[i]);
-         Dependency d =3D new Dependency(componentName =3D=3D null ? param=
eterTypes[i].getName() : componentName, parameterTypes[i]);
+         String componentNameToUse =3D componentName =3D=3D null ? paramet=
erTypes[i].getName() : componentName;
+         // if the component exists in the lookup, use it.  Otherwise use =
a placeholder which will be constructed later, on demand.
+         Component d =3D componentLookup.containsKey(componentNameToUse) ?=
 componentLookup.get(componentNameToUse) : new Component(componentNameToUse=
, parameterTypes[i]);
          dependencies.add(d);
       }
       return dependencies;
@@ -615,11 +617,6 @@
     */
    public void wire()
    {
-      if (bootstrap !=3D null && !bootstrap.isBootstrapped())
-      {
-         bootstrap.bootstrap();
-      }
-
       moveComponentsToState(WIRED);
    }
 =

@@ -678,36 +675,6 @@
    }
 =

    /**
-    * Represents a potentially unconstructed dependency.  A simple wrapper=
 around a name and type pair.
-    */
-   class Dependency
-   {
-      String name;
-      Class<?> type;
-
-      public Dependency(String name, Class type)
-      {
-         this.name =3D name;
-         this.type =3D type;
-      }
-
-      public int hashCode()
-      {
-         return 31 * name.hashCode();
-      }
-
-      public boolean equals(Object other)
-      {
-         return other instanceof Dependency && name.equals(((Dependency) o=
ther).name);
-      }
-
-      public String toString()
-      {
-         return "Dependency (name =3D " + name + ")";
-      }
-   }
-
-   /**
     * Represents a component in the registry, along with state and depende=
ncies.
     */
    class Component
@@ -716,11 +683,16 @@
       String name;
       Class type;
       State state =3D CONSTRUCTED;
-      Set<Dependency> dependencies =3D new HashSet<Dependency>(3);
-      Set<Dependency> dependencyFor =3D new HashSet<Dependency>(3);
-      Dependency me;
+      Set<Component> dependencies =3D new HashSet<Component>(3);
+      Set<Component> dependencyFor =3D new HashSet<Component>(3);
       boolean deepRecursionDetector =3D false;
 =

+      public Component(String name, Class type)
+      {
+         this.name =3D name;
+         this.type =3D type;
+      }
+
       /**
        * Constructs a Component out of an instance and a name.  Scans inst=
ance for dependencies and populates
        * the "dependencies" and "dependencyFor" collections.
@@ -730,9 +702,8 @@
        */
       public Component(String name, Object instance, Class type)
       {
+         this(name, type);
          this.instance =3D instance;
-         this.name =3D name;
-         this.type =3D type;
 =

          // now scan the instance for all dependencies.
          List<Method> injectionMethods =3D ReflectionUtil.getAllMethods(in=
stance.getClass(), Inject.class);
@@ -742,15 +713,6 @@
       }
 =

       /**
-       * @return a {@link org.jboss.cache.factories.ComponentRegistry.Depe=
ndency} object that represents the current component
-       */
-      Dependency asDependency()
-      {
-         if (me =3D=3D null) me =3D new Dependency(name, type);
-         return me;
-      }
-
-      /**
        * Changes the state of a component - along with all dependent compo=
nents - to a new state.  This method is recursion
        * and cyclic dependency safe.
        *
@@ -773,7 +735,7 @@
             }
 =

             // now we update the state of dependent components accordingly.
-            Set<Dependency> dependentComponents =3D new HashSet<Dependency=
>();
+            Set<Component> dependentComponents =3D new HashSet<Component>(=
);
             Set<Component> shallowCyclic =3D new HashSet<Component>();
 =

             if (increase)
@@ -789,36 +751,39 @@
 =

             // switch on the deep recursion detector
             deepRecursionDetector =3D true;
-            for (Dependency d : dependentComponents)
+            for (Component d : dependentComponents)
             {
-               Component c =3D componentLookup.get(d.name);
-//               if (c =3D=3D null && increase)
-//               {
-//                  if (log.isTraceEnabled()) log.trace(name + " depends o=
n " + d.name + " (type "+d.type+") but it does not exist in the registry, a=
ttempting to create.");
-//                  getOrCreateComponent(d.name, d.type);
-//                  c =3D componentLookup.get(d.name);
-//               }
-               if (c !=3D null)
+               if (d.instance =3D=3D null)
                {
-                  if (isShallowCyclic(c))
+                  // this is a "hollow" component that has not been constr=
ucted yet.  Another "constructed" version probably exists in the
+                  // componentLookup.  Make sure we replace this.
+                  Component c =3D componentLookup.get(d.name);
+                  if (increase)
                   {
-                     // don't process shallow cyclic deps here - shoud do =
that after we set our state.
-                     shallowCyclic.add(c);
+                     dependencies.remove(d);
+                     dependencies.add(c);
                   }
                   else
                   {
-                     // of we are "moving up" - only do this if the compon=
ent is lower than what is needed.
-                     if ((increase && newState.isGreaterThan(c.state)) || =
(!increase && newState.isLessThan(c.state)))
-                     {
-                        c.changeState(newState);
-                     }
-
+                     dependencyFor.remove(d);
+                     dependencies.add(c);
                   }
+                  d =3D c;
                }
+
+               if (isShallowCyclic(d))
+               {
+                  // don't process shallow cyclic deps here - shoud do tha=
t after we set our state.
+                  shallowCyclic.add(d);
+               }
                else
                {
-                  if (log.isTraceEnabled())
-                     log.trace(name + " depends on " + d.name + " (type " =
+ d.type + ") but it does not exist in the registry");
+                  // of we are "moving up" - only do this if the component=
 is lower than what is needed.
+                  if ((increase && newState.isGreaterThan(d.state)) || (!i=
ncrease && newState.isLessThan(d.state)))
+                  {
+                     d.changeState(newState);
+                  }
+
                }
             }
 =

@@ -861,7 +826,7 @@
        */
       private boolean isShallowCyclic(Component c)
       {
-         return (dependencies.contains(c.asDependency()) && c.dependencies=
.contains(asDependency()));
+         return (dependencies.contains(c) && c.dependencies.contains(this)=
);
       }
 =

       /**
@@ -915,10 +880,24 @@
          }
       }
 =

+      @Override
       public String toString()
       {
          return "Component (name =3D " + name + ", state =3D " + state + "=
)";
       }
+
+      @Override
+      public int hashCode()
+      {
+         return 31 * name.hashCode();
+      }
+
+      @Override
+      public boolean equals(Object other)
+      {
+         return other instanceof Component && name.equals(((Component) oth=
er).name);
+      }
+
    }
 =

    class Bootstrap

Modified: core/trunk/src/test/java/org/jboss/cache/factories/ComponentRegis=
tryFunctionalTest.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/test/java/org/jboss/cache/factories/ComponentRegistryFun=
ctionalTest.java	2008-01-22 14:42:59 UTC (rev 5190)
+++ core/trunk/src/test/java/org/jboss/cache/factories/ComponentRegistryFun=
ctionalTest.java	2008-01-22 14:56:16 UTC (rev 5191)
@@ -59,18 +59,18 @@
       for (ComponentRegistry.Component component : cr.componentLookup.valu=
es())
       {
          // test that this component appears in all dependencies' dependen=
cyFor collection.
-         for (ComponentRegistry.Dependency dep : component.dependencies)
+         for (ComponentRegistry.Component dep : component.dependencies)
          {
-            assert cr.componentLookup.get(dep.name).dependencyFor.contains=
(component.asDependency()) : "Dependency " + dep.name + " does not have com=
ponent " + component.name + " in it's dependencyFor collection.";
+            assert cr.componentLookup.get(dep.name).dependencyFor.contains=
(component) : "Dependency " + dep.name + " does not have component " + comp=
onent.name + " in it's dependencyFor collection.";
          }
       }
 =

       for (ComponentRegistry.Component component : cr.componentLookup.valu=
es())
       {
          // test that this component appears in all dependencies' dependen=
cyFor collection.
-         for (ComponentRegistry.Dependency dep : component.dependencyFor)
+         for (ComponentRegistry.Component dep : component.dependencyFor)
          {
-            assert cr.componentLookup.get(dep.name).dependencies.contains(=
component.asDependency()) : "Dependency " + dep.name + " does not have comp=
onent " + component.name + " in it's dependencies collection.";
+            assert cr.componentLookup.get(dep.name).dependencies.contains(=
component) : "Dependency " + dep.name + " does not have component " + compo=
nent.name + " in it's dependencies collection.";
          }
       }
    }

Modified: core/trunk/src/test/java/org/jboss/cache/factories/ComponentRegis=
tryUnitTest.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/test/java/org/jboss/cache/factories/ComponentRegistryUni=
tTest.java	2008-01-22 14:42:59 UTC (rev 5190)
+++ core/trunk/src/test/java/org/jboss/cache/factories/ComponentRegistryUni=
tTest.java	2008-01-22 14:56:16 UTC (rev 5191)
@@ -34,9 +34,9 @@
       ComponentRegistry.Component c3 =3D cr.componentLookup.get("c3");
 =

       // add some dependencies
-      ComponentRegistry.Dependency d1 =3D cr.new Dependency("c1", null);
-      ComponentRegistry.Dependency d2 =3D cr.new Dependency("c2", null);
-      ComponentRegistry.Dependency d3 =3D cr.new Dependency("c3", null);
+      ComponentRegistry.Component d1 =3D cr.new Component("c1", null);
+      ComponentRegistry.Component d2 =3D cr.new Component("c2", null);
+      ComponentRegistry.Component d3 =3D cr.new Component("c3", null);
 =

       // c1 depends on c2
       // c3 depends on c1


--===============6312407093523003003==--

From jbosscache-commits at lists.jboss.org Tue Jan 22 12:56:09 2008
Content-Type: multipart/mixed; boundary="===============3293818926328437305=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r5192 -
 core/trunk/src/main/resources/META-INF.
Date: Tue, 22 Jan 2008 12:56:08 -0500
Message-ID: <E1JHNM0-0002LW-OA@committer01.frg.pub.inap.atl.jboss.com>

--===============3293818926328437305==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: mircea.markus
Date: 2008-01-22 12:56:08 -0500 (Tue, 22 Jan 2008)
New Revision: 5192

Modified:
   core/trunk/src/main/resources/META-INF/buddyreplication-service.xml
   core/trunk/src/main/resources/META-INF/clonable-config-service.xml
   core/trunk/src/main/resources/META-INF/hibernate-recommended-config.xml
   core/trunk/src/main/resources/META-INF/jdbcCacheLoader-service.xml
   core/trunk/src/main/resources/META-INF/local-elementsize-eviction-servic=
e.xml
   core/trunk/src/main/resources/META-INF/local-eviction-cacheloader-servic=
e.xml
   core/trunk/src/main/resources/META-INF/local-expiration-eviction-service=
.xml
   core/trunk/src/main/resources/META-INF/local-fifo-eviction-service.xml
   core/trunk/src/main/resources/META-INF/local-lfu-eviction-service.xml
   core/trunk/src/main/resources/META-INF/local-lru-eviction-service.xml
   core/trunk/src/main/resources/META-INF/local-mru-eviction-service.xml
   core/trunk/src/main/resources/META-INF/local-null-eviction-service.xml
   core/trunk/src/main/resources/META-INF/local-passivation-service.xml
   core/trunk/src/main/resources/META-INF/local-service.xml
   core/trunk/src/main/resources/META-INF/local-tx-service.xml
   core/trunk/src/main/resources/META-INF/mixedPolicy-eviction-service.xml
   core/trunk/src/main/resources/META-INF/mux-service.xml
   core/trunk/src/main/resources/META-INF/optimistic-eviction.xml
   core/trunk/src/main/resources/META-INF/pojocache-passivation-service.xml
   core/trunk/src/main/resources/META-INF/pojocache-passivation-service2.xml
   core/trunk/src/main/resources/META-INF/policyPerRegion-eviction-service.=
xml
   core/trunk/src/main/resources/META-INF/replAsync-service.xml
   core/trunk/src/main/resources/META-INF/replSync-passivation-service.xml
   core/trunk/src/main/resources/META-INF/replSync-service-test.xml
   core/trunk/src/main/resources/META-INF/replSync-service.xml
Log:
http://jira.jboss.com/jira/browse/JBCACHE-1269

Modified: core/trunk/src/main/resources/META-INF/buddyreplication-service.x=
ml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/resources/META-INF/buddyreplication-service.xml	200=
8-01-22 14:56:16 UTC (rev 5191)
+++ core/trunk/src/main/resources/META-INF/buddyreplication-service.xml	200=
8-01-22 17:56:08 UTC (rev 5192)
@@ -65,20 +65,14 @@
       -->
       <attribute name=3D"ClusterConfig">
          <config>
-            <UDP mcast_addr=3D"228.10.10.10"
-                 mcast_port=3D"45588"
-                 tos=3D"8"
-                 ucast_recv_buf_size=3D"20000000"
-                 ucast_send_buf_size=3D"640000"
-                 mcast_recv_buf_size=3D"25000000"
-                 mcast_send_buf_size=3D"640000"
+            <TCP recv_buf_size=3D"20000000" use_send_queues=3D"false"
                  loopback=3D"false"
                  discard_incompatible_packets=3D"true"
                  max_bundle_size=3D"64000"
                  max_bundle_timeout=3D"30"
                  use_incoming_packet_handler=3D"true"
-                 ip_ttl=3D"2"
-                 enable_bundling=3D"false"
+                 enable_bundling=3D"true"
+                 enable_unicast_bundling=3D"true"
                  enable_diagnostics=3D"true"
 =

                  use_concurrent_stack=3D"true"
@@ -87,34 +81,37 @@
 =

                  thread_pool.enabled=3D"true"
                  thread_pool.min_threads=3D"1"
-                 thread_pool.max_threads=3D"25"
+                 thread_pool.max_threads=3D"4"
                  thread_pool.keep_alive_time=3D"30000"
                  thread_pool.queue_enabled=3D"true"
-                 thread_pool.queue_max_size=3D"10"
-                 thread_pool.rejection_policy=3D"Run"
+                 thread_pool.queue_max_size=3D"50000"
+                 thread_pool.rejection_policy=3D"discard"
 =

                  oob_thread_pool.enabled=3D"true"
-                 oob_thread_pool.min_threads=3D"1"
+                 oob_thread_pool.min_threads=3D"2"
                  oob_thread_pool.max_threads=3D"4"
                  oob_thread_pool.keep_alive_time=3D"10000"
-                 oob_thread_pool.queue_enabled=3D"true"
+                 oob_thread_pool.queue_enabled=3D"false"
                  oob_thread_pool.queue_max_size=3D"10"
                  oob_thread_pool.rejection_policy=3D"Run"/>
 =

-            <PING timeout=3D"2000" num_initial_members=3D"3"/>
+            <!--<PING timeout=3D"2000" num_initial_members=3D"3"/>-->
+             <MPING mcast_addr=3D"232.1.2.3" timeout=3D"2000" num_initial_=
members=3D"3"/>
             <MERGE2 max_interval=3D"30000" min_interval=3D"10000"/>
             <FD_SOCK/>
             <FD timeout=3D"10000" max_tries=3D"5" shun=3D"true"/>
             <VERIFY_SUSPECT timeout=3D"1500"/>
-            <pbcast.NAKACK
-                    use_mcast_xmit=3D"false" gc_lag=3D"0"
-                    retransmit_timeout=3D"300,600,1200,2400,4800"
-                    discard_delivered_msgs=3D"true"/>
-            <UNICAST timeout=3D"300,600,1200,2400,3600"/>
+            <pbcast.NAKACK use_mcast_xmit=3D"false" gc_lag=3D"0"
+                           retransmit_timeout=3D"300,600,1200,2400,4800"
+                           discard_delivered_msgs=3D"true"/>
+            <!--<UNICAST timeout=3D"30,60,120,300,600,1200,2400,3600"/>-->
             <pbcast.STABLE stability_delay=3D"1000" desired_avg_gossip=3D"=
50000"
                            max_bytes=3D"400000"/>
-            <pbcast.GMS print_local_addr=3D"true" join_timeout=3D"5000" sh=
un=3D"false"
+            <pbcast.GMS print_local_addr=3D"true" join_timeout=3D"5000"
+                        join_retry_timeout=3D"2000" shun=3D"false"
                         view_bundling=3D"true" view_ack_collection_timeout=
=3D"5000"/>
+              <FC max_credits=3D"5000000"
+                    min_threshold=3D"0.20"/>
             <FRAG2 frag_size=3D"60000"/>
             <pbcast.STREAMING_STATE_TRANSFER use_reading_thread=3D"true"/>
             <!-- <pbcast.STATE_TRANSFER/> -->
@@ -123,6 +120,7 @@
       </attribute>
 =

 =

+
       <!--
           The max amount of time (in milliseconds) we wait until the
           state (ie. the contents of the cache) are retrieved from

Modified: core/trunk/src/main/resources/META-INF/clonable-config-service.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/resources/META-INF/clonable-config-service.xml	2008=
-01-22 14:56:16 UTC (rev 5191)
+++ core/trunk/src/main/resources/META-INF/clonable-config-service.xml	2008=
-01-22 17:56:08 UTC (rev 5192)
@@ -26,59 +26,48 @@
       <attribute name=3D"MultiplexerStack">udp</attribute>      =

       <attribute name=3D"ClusterConfig">
          <config>
-            <UDP mcast_addr=3D"228.10.10.10"
-                 mcast_port=3D"45588"
-                 tos=3D"8"
-                 ucast_recv_buf_size=3D"20000000"
-                 ucast_send_buf_size=3D"640000"
-                 mcast_recv_buf_size=3D"25000000"
-                 mcast_send_buf_size=3D"640000"
+            <TCP recv_buf_size=3D"20000000" use_send_queues=3D"false"
                  loopback=3D"false"
                  discard_incompatible_packets=3D"true"
                  max_bundle_size=3D"64000"
                  max_bundle_timeout=3D"30"
                  use_incoming_packet_handler=3D"true"
-                 ip_ttl=3D"2"
-                 enable_bundling=3D"false"
+                 enable_bundling=3D"true"
+                 enable_unicast_bundling=3D"true"
                  enable_diagnostics=3D"true"
-
                  use_concurrent_stack=3D"true"
-
                  thread_naming_pattern=3D"pl"
-
                  thread_pool.enabled=3D"true"
                  thread_pool.min_threads=3D"1"
-                 thread_pool.max_threads=3D"25"
+                 thread_pool.max_threads=3D"4"
                  thread_pool.keep_alive_time=3D"30000"
                  thread_pool.queue_enabled=3D"true"
-                 thread_pool.queue_max_size=3D"10"
-                 thread_pool.rejection_policy=3D"Run"
-
+                 thread_pool.queue_max_size=3D"50000"
+                 thread_pool.rejection_policy=3D"discard"
                  oob_thread_pool.enabled=3D"true"
-                 oob_thread_pool.min_threads=3D"1"
+                 oob_thread_pool.min_threads=3D"2"
                  oob_thread_pool.max_threads=3D"4"
                  oob_thread_pool.keep_alive_time=3D"10000"
-                 oob_thread_pool.queue_enabled=3D"true"
+                 oob_thread_pool.queue_enabled=3D"false"
                  oob_thread_pool.queue_max_size=3D"10"
                  oob_thread_pool.rejection_policy=3D"Run"/>
-
-            <PING timeout=3D"2000" num_initial_members=3D"3"/>
+            <MPING mcast_addr=3D"232.1.2.3" timeout=3D"2000" num_initial_m=
embers=3D"3"/>
             <MERGE2 max_interval=3D"30000" min_interval=3D"10000"/>
             <FD_SOCK/>
             <FD timeout=3D"10000" max_tries=3D"5" shun=3D"true"/>
             <VERIFY_SUSPECT timeout=3D"1500"/>
-            <pbcast.NAKACK
-                    use_mcast_xmit=3D"false" gc_lag=3D"0"
-                    retransmit_timeout=3D"300,600,1200,2400,4800"
-                    discard_delivered_msgs=3D"true"/>
-            <UNICAST timeout=3D"300,600,1200,2400,3600"/>
+            <pbcast.NAKACK use_mcast_xmit=3D"false" gc_lag=3D"0"
+                           retransmit_timeout=3D"300,600,1200,2400,4800"
+                           discard_delivered_msgs=3D"true"/>
             <pbcast.STABLE stability_delay=3D"1000" desired_avg_gossip=3D"=
50000"
                            max_bytes=3D"400000"/>
-            <pbcast.GMS print_local_addr=3D"true" join_timeout=3D"5000" sh=
un=3D"false"
+            <pbcast.GMS print_local_addr=3D"true" join_timeout=3D"5000"
+                        join_retry_timeout=3D"2000" shun=3D"false"
                         view_bundling=3D"true" view_ack_collection_timeout=
=3D"5000"/>
+              <FC max_credits=3D"5000000"
+                    min_threshold=3D"0.20"/>
             <FRAG2 frag_size=3D"60000"/>
             <pbcast.STREAMING_STATE_TRANSFER use_reading_thread=3D"true"/>
-            <!-- <pbcast.STATE_TRANSFER/> -->
             <pbcast.FLUSH timeout=3D"0"/>
          </config>
       </attribute>

Modified: core/trunk/src/main/resources/META-INF/hibernate-recommended-conf=
ig.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/resources/META-INF/hibernate-recommended-config.xml=
	2008-01-22 14:56:16 UTC (rev 5191)
+++ core/trunk/src/main/resources/META-INF/hibernate-recommended-config.xml=
	2008-01-22 17:56:08 UTC (rev 5192)
@@ -87,33 +87,64 @@
       <!-- JGroups protocol stack properties.
          ClusterConfig isn't used if the multiplexer is enabled and succes=
sfully initialized.
       -->
+
       <attribute name=3D"ClusterConfig">
          <config>
-            <!-- UDP: if you have a multihomed machine,
-  set the bind_addr attribute to the appropriate NIC IP address -->
-            <!-- UDP: On Windows machines, because of the media sense feat=
ure
-      being broken with multicast (even after disabling media sense)
-      set the loopback attribute to true -->
-            <UDP mcast_addr=3D"228.1.2.3" mcast_port=3D"48866"
-                 ip_ttl=3D"64" ip_mcast=3D"true"
-                 mcast_send_buf_size=3D"150000" mcast_recv_buf_size=3D"800=
00"
-                 ucast_send_buf_size=3D"150000" ucast_recv_buf_size=3D"800=
00"
-                 loopback=3D"false"/>
-            <PING timeout=3D"2000" num_initial_members=3D"3"/>
-            <MERGE2 min_interval=3D"10000" max_interval=3D"20000"/>
-            <!--        <FD shun=3D"true"/>-->
+            <TCP recv_buf_size=3D"20000000" use_send_queues=3D"false"
+                 loopback=3D"false"
+                 discard_incompatible_packets=3D"true"
+                 max_bundle_size=3D"64000"
+                 max_bundle_timeout=3D"30"
+                 use_incoming_packet_handler=3D"true"
+                 enable_bundling=3D"true"
+                 enable_unicast_bundling=3D"true"
+                 enable_diagnostics=3D"true"
+
+                 use_concurrent_stack=3D"true"
+
+                 thread_naming_pattern=3D"pl"
+
+                 thread_pool.enabled=3D"true"
+                 thread_pool.min_threads=3D"1"
+                 thread_pool.max_threads=3D"4"
+                 thread_pool.keep_alive_time=3D"30000"
+                 thread_pool.queue_enabled=3D"true"
+                 thread_pool.queue_max_size=3D"50000"
+                 thread_pool.rejection_policy=3D"discard"
+
+                 oob_thread_pool.enabled=3D"true"
+                 oob_thread_pool.min_threads=3D"2"
+                 oob_thread_pool.max_threads=3D"4"
+                 oob_thread_pool.keep_alive_time=3D"10000"
+                 oob_thread_pool.queue_enabled=3D"false"
+                 oob_thread_pool.queue_max_size=3D"10"
+                 oob_thread_pool.rejection_policy=3D"Run"/>
+
+            <!--<PING timeout=3D"2000" num_initial_members=3D"3"/>-->
+             <MPING mcast_addr=3D"232.1.2.3" timeout=3D"2000" num_initial_=
members=3D"3"/>
+            <MERGE2 max_interval=3D"30000" min_interval=3D"10000"/>
             <FD_SOCK/>
+            <FD timeout=3D"10000" max_tries=3D"5" shun=3D"true"/>
             <VERIFY_SUSPECT timeout=3D"1500"/>
-            <pbcast.NAKACK gc_lag=3D"50" retransmit_timeout=3D"600,1200,24=
00,4800"/>
-            <UNICAST timeout=3D"600,1200,2400"/>
-            <pbcast.STABLE desired_avg_gossip=3D"20000"/>
-            <FRAG frag_size=3D"8192"/>
-            <pbcast.GMS join_timeout=3D"5000"
-                        shun=3D"true" print_local_addr=3D"true"/>
-            <pbcast.STATE_TRANSFER/>
+            <pbcast.NAKACK use_mcast_xmit=3D"false" gc_lag=3D"0"
+                           retransmit_timeout=3D"300,600,1200,2400,4800"
+                           discard_delivered_msgs=3D"true"/>
+            <!--<UNICAST timeout=3D"30,60,120,300,600,1200,2400,3600"/>-->
+            <pbcast.STABLE stability_delay=3D"1000" desired_avg_gossip=3D"=
50000"
+                           max_bytes=3D"400000"/>
+            <pbcast.GMS print_local_addr=3D"true" join_timeout=3D"5000"
+                        join_retry_timeout=3D"2000" shun=3D"false"
+                        view_bundling=3D"true" view_ack_collection_timeout=
=3D"5000"/>
+              <FC max_credits=3D"5000000"
+                    min_threshold=3D"0.20"/>
+            <FRAG2 frag_size=3D"60000"/>
+            <pbcast.STREAMING_STATE_TRANSFER use_reading_thread=3D"true"/>
+            <!-- <pbcast.STATE_TRANSFER/> -->
+            <pbcast.FLUSH timeout=3D"0"/>
          </config>
       </attribute>
 =

+
       <!--
        Whether or not to fetch state on joining a cluster
        NOTE this used to be called FetchStateOnStartup and has been rename=
d to be more descriptive.

Modified: core/trunk/src/main/resources/META-INF/jdbcCacheLoader-service.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/resources/META-INF/jdbcCacheLoader-service.xml	2008=
-01-22 14:56:16 UTC (rev 5191)
+++ core/trunk/src/main/resources/META-INF/jdbcCacheLoader-service.xml	2008=
-01-22 17:56:08 UTC (rev 5192)
@@ -76,31 +76,62 @@
 =

       <attribute name=3D"ClusterConfig">
          <config>
-            <!-- UDP: if you have a multihomed machine,
-  set the bind_addr attribute to the appropriate NIC IP address -->
-            <!-- UDP: On Windows machines, because of the media sense feat=
ure
-      being broken with multicast (even after disabling media sense)
-      set the loopback attribute to true -->
-            <UDP mcast_addr=3D"230.8.8.8" mcast_port=3D"56677"
-                 ip_ttl=3D"32" ip_mcast=3D"true"
-                 mcast_send_buf_size=3D"80000" mcast_recv_buf_size=3D"1500=
00"
-                 ucast_send_buf_size=3D"80000" ucast_recv_buf_size=3D"1500=
00"
-                 loopback=3D"false"/>
-            <PING timeout=3D"2000" num_initial_members=3D"3"/>
-            <MERGE2 min_interval=3D"10000" max_interval=3D"20000"/>
-            <FD shun=3D"true"/>
+            <TCP recv_buf_size=3D"20000000" use_send_queues=3D"false"
+                 loopback=3D"false"
+                 discard_incompatible_packets=3D"true"
+                 max_bundle_size=3D"64000"
+                 max_bundle_timeout=3D"30"
+                 use_incoming_packet_handler=3D"true"
+                 enable_bundling=3D"true"
+                 enable_unicast_bundling=3D"true"
+                 enable_diagnostics=3D"true"
+
+                 use_concurrent_stack=3D"true"
+
+                 thread_naming_pattern=3D"pl"
+
+                 thread_pool.enabled=3D"true"
+                 thread_pool.min_threads=3D"1"
+                 thread_pool.max_threads=3D"4"
+                 thread_pool.keep_alive_time=3D"30000"
+                 thread_pool.queue_enabled=3D"true"
+                 thread_pool.queue_max_size=3D"50000"
+                 thread_pool.rejection_policy=3D"discard"
+
+                 oob_thread_pool.enabled=3D"true"
+                 oob_thread_pool.min_threads=3D"2"
+                 oob_thread_pool.max_threads=3D"4"
+                 oob_thread_pool.keep_alive_time=3D"10000"
+                 oob_thread_pool.queue_enabled=3D"false"
+                 oob_thread_pool.queue_max_size=3D"10"
+                 oob_thread_pool.rejection_policy=3D"Run"/>
+
+            <!--<PING timeout=3D"2000" num_initial_members=3D"3"/>-->
+             <MPING mcast_addr=3D"232.1.2.3" timeout=3D"2000" num_initial_=
members=3D"3"/>
+            <MERGE2 max_interval=3D"30000" min_interval=3D"10000"/>
+            <FD_SOCK/>
+            <FD timeout=3D"10000" max_tries=3D"5" shun=3D"true"/>
             <VERIFY_SUSPECT timeout=3D"1500"/>
-            <pbcast.NAKACK gc_lag=3D"50" retransmit_timeout=3D"600,1200,24=
00,4800"/>
-            <UNICAST timeout=3D"600,1200,2400" window_size=3D"100" min_thr=
eshold=3D"10"/>
-            <pbcast.STABLE desired_avg_gossip=3D"20000"/>
-            <FRAG frag_size=3D"8192"/>
-            <pbcast.GMS join_timeout=3D"5000"
-                        shun=3D"true" print_local_addr=3D"true"/>
-            <pbcast.STATE_TRANSFER/>
+            <pbcast.NAKACK use_mcast_xmit=3D"false" gc_lag=3D"0"
+                           retransmit_timeout=3D"300,600,1200,2400,4800"
+                           discard_delivered_msgs=3D"true"/>
+            <!--<UNICAST timeout=3D"30,60,120,300,600,1200,2400,3600"/>-->
+            <pbcast.STABLE stability_delay=3D"1000" desired_avg_gossip=3D"=
50000"
+                           max_bytes=3D"400000"/>
+            <pbcast.GMS print_local_addr=3D"true" join_timeout=3D"5000"
+                        join_retry_timeout=3D"2000" shun=3D"false"
+                        view_bundling=3D"true" view_ack_collection_timeout=
=3D"5000"/>
+              <FC max_credits=3D"5000000"
+                    min_threshold=3D"0.20"/>
+            <FRAG2 frag_size=3D"60000"/>
+            <pbcast.STREAMING_STATE_TRANSFER use_reading_thread=3D"true"/>
+            <!-- <pbcast.STATE_TRANSFER/> -->
+            <pbcast.FLUSH timeout=3D"0"/>
          </config>
       </attribute>
 =

 =

+
       <!--
           The max amount of time (in milliseconds) we wait until the
           state (ie. the contents of the cache) are retrieved from

Modified: core/trunk/src/main/resources/META-INF/local-elementsize-eviction=
-service.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/resources/META-INF/local-elementsize-eviction-servi=
ce.xml	2008-01-22 14:56:16 UTC (rev 5191)
+++ core/trunk/src/main/resources/META-INF/local-elementsize-eviction-servi=
ce.xml	2008-01-22 17:56:08 UTC (rev 5192)
@@ -41,35 +41,6 @@
       -->
       <attribute name=3D"CacheMode">LOCAL</attribute>
 =

-      <!-- Name of cluster. Needs to be the same for all TreeCache nodes i=
n a
-           cluster in order to find each other.
-      -->
-      <attribute name=3D"ClusterName">JBossCache-Cluster</attribute>
-
-      <!--Uncomment next three statements to enable JGroups multiplexer.
-This configuration is dependent on the JGroups multiplexer being
-registered in an MBean server such as JBossAS.  -->
-      <!--
-      <depends>jgroups.mux:name=3DMultiplexer</depends>
-      <attribute name=3D"MultiplexerService">jgroups.mux:name=3DMultiplexe=
r</attribute>
-      <attribute name=3D"MultiplexerStack">fc-fast-minimalthreads</attribu=
te>
-      -->
-
-      <!-- JGroups protocol stack properties NOT NEEDED since CacheMode is=
 LOCAL -->
-
-      <!--
-          The max amount of time (in milliseconds) we wait until the
-          state (ie. the contents of the cache) are retrieved from
-          existing members in a clustered environment
-      -->
-      <attribute name=3D"StateRetrievalTimeout">20000</attribute>
-
-      <!--
-          Number of milliseconds to wait until all responses for a
-          synchronous call have been received.
-      -->
-      <attribute name=3D"SyncReplTimeout">20000</attribute>
-
       <!-- Max number of milliseconds to wait for a lock acquisition -->
       <attribute name=3D"LockAcquisitionTimeout">15000</attribute>
 =


Modified: core/trunk/src/main/resources/META-INF/local-eviction-cacheloader=
-service.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/resources/META-INF/local-eviction-cacheloader-servi=
ce.xml	2008-01-22 14:56:16 UTC (rev 5191)
+++ core/trunk/src/main/resources/META-INF/local-eviction-cacheloader-servi=
ce.xml	2008-01-22 17:56:08 UTC (rev 5192)
@@ -41,26 +41,6 @@
       -->
       <attribute name=3D"CacheMode">LOCAL</attribute>
 =

-      <!-- Name of cluster. Needs to be the same for all clusters, in order
-           to find each other
-      -->
-      <attribute name=3D"ClusterName">JBossCache-Cluster</attribute>
-
-      <!-- JGroups protocol stack properties NOT NEEDED since CacheMode is=
 LOCAL -->
-
-      <!--
-          The max amount of time (in milliseconds) we wait until the
-          state (ie. the contents of the cache) are retrieved from
-          existing members in a clustered environment
-      -->
-      <attribute name=3D"StateRetrievalTimeout">20000</attribute>
-
-      <!--
-          Number of milliseconds to wait until all responses for a
-          synchronous call have been received.
-      -->
-      <attribute name=3D"SyncReplTimeout">20000</attribute>
-
       <!-- Max number of milliseconds to wait for a lock acquisition -->
       <attribute name=3D"LockAcquisitionTimeout">15000</attribute>
 =


Modified: core/trunk/src/main/resources/META-INF/local-expiration-eviction-=
service.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/resources/META-INF/local-expiration-eviction-servic=
e.xml	2008-01-22 14:56:16 UTC (rev 5191)
+++ core/trunk/src/main/resources/META-INF/local-expiration-eviction-servic=
e.xml	2008-01-22 17:56:08 UTC (rev 5192)
@@ -41,35 +41,6 @@
       -->
       <attribute name=3D"CacheMode">LOCAL</attribute>
 =

-      <!-- Name of cluster. Needs to be the same for all TreeCache nodes i=
n a
-           cluster in order to find each other.
-      -->
-      <attribute name=3D"ClusterName">JBossCache-Cluster</attribute>
-
-      <!--Uncomment next three statements to enable JGroups multiplexer.
-This configuration is dependent on the JGroups multiplexer being
-registered in an MBean server such as JBossAS.  -->
-      <!--
-      <depends>jgroups.mux:name=3DMultiplexer</depends>
-      <attribute name=3D"MultiplexerService">jgroups.mux:name=3DMultiplexe=
r</attribute>
-      <attribute name=3D"MultiplexerStack">fc-fast-minimalthreads</attribu=
te>
-      -->
-
-      <!-- JGroups protocol stack properties NOT NEEDED since CacheMode is=
 LOCAL -->
-
-      <!--
-          The max amount of time (in milliseconds) we wait until the
-          state (ie. the contents of the cache) are retrieved from
-          existing members in a clustered environment
-      -->
-      <attribute name=3D"StateRetrievalTimeout">20000</attribute>
-
-      <!--
-          Number of milliseconds to wait until all responses for a
-          synchronous call have been received.
-      -->
-      <attribute name=3D"SyncReplTimeout">20000</attribute>
-
       <!-- Max number of milliseconds to wait for a lock acquisition -->
       <attribute name=3D"LockAcquisitionTimeout">15000</attribute>
 =


Modified: core/trunk/src/main/resources/META-INF/local-fifo-eviction-servic=
e.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/resources/META-INF/local-fifo-eviction-service.xml	=
2008-01-22 14:56:16 UTC (rev 5191)
+++ core/trunk/src/main/resources/META-INF/local-fifo-eviction-service.xml	=
2008-01-22 17:56:08 UTC (rev 5192)
@@ -41,39 +41,9 @@
       -->
       <attribute name=3D"CacheMode">LOCAL</attribute>
 =

-      <!-- Name of cluster. Needs to be the same for all TreeCache nodes i=
n a
-           cluster in order to find each other.
-      -->
-      <attribute name=3D"ClusterName">JBossCache-Cluster</attribute>
-
-      <!--Uncomment next three statements to enable JGroups multiplexer.
-This configuration is dependent on the JGroups multiplexer being
-registered in an MBean server such as JBossAS.  -->
-      <!--
-      <depends>jgroups.mux:name=3DMultiplexer</depends>
-      <attribute name=3D"MultiplexerService">jgroups.mux:name=3DMultiplexe=
r</attribute>
-      <attribute name=3D"MultiplexerStack">fc-fast-minimalthreads</attribu=
te>
-      -->
-
-      <!-- JGroups protocol stack properties NOT NEEDED since CacheMode is=
 LOCAL -->
-
-      <!--
-          The max amount of time (in milliseconds) we wait until the
-          state (ie. the contents of the cache) are retrieved from
-          existing members in a clustered environment
-      -->
-      <attribute name=3D"StateRetrievalTimeout">20000</attribute>
-
-      <!--
-          Number of milliseconds to wait until all responses for a
-          synchronous call have been received.
-      -->
-      <attribute name=3D"SyncReplTimeout">20000</attribute>
-
       <!-- Max number of milliseconds to wait for a lock acquisition -->
       <attribute name=3D"LockAcquisitionTimeout">15000</attribute>
 =

-
       <!-- Specific eviction policy configurations. This is LRU -->
       <attribute name=3D"EvictionPolicyConfig">
          <config>

Modified: core/trunk/src/main/resources/META-INF/local-lfu-eviction-service=
.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/resources/META-INF/local-lfu-eviction-service.xml	2=
008-01-22 14:56:16 UTC (rev 5191)
+++ core/trunk/src/main/resources/META-INF/local-lfu-eviction-service.xml	2=
008-01-22 17:56:08 UTC (rev 5192)
@@ -41,37 +41,6 @@
       -->
       <attribute name=3D"CacheMode">LOCAL</attribute>
 =

-      <!-- Name of cluster. Needs to be the same for all TreeCache nodes i=
n a
-           cluster in order to find each other.
-      -->
-      <attribute name=3D"ClusterName">JBossCache-Cluster</attribute>
-
-      <!--Uncomment next three statements to enable JGroups multiplexer.
-This configuration is dependent on the JGroups multiplexer being
-registered in an MBean server such as JBossAS.  -->
-      <!--
-      <depends>jgroups.mux:name=3DMultiplexer</depends>
-      <attribute name=3D"MultiplexerService">jgroups.mux:name=3DMultiplexe=
r</attribute>
-      <attribute name=3D"MultiplexerStack">fc-fast-minimalthreads</attribu=
te>
-      -->
-
-
-      <!-- JGroups protocol stack properties NOT NEEDED since CacheMode is=
 LOCAL -->
-
-
-      <!--
-          The max amount of time (in milliseconds) we wait until the
-          state (ie. the contents of the cache) are retrieved from
-          existing members in a clustered environment
-      -->
-      <attribute name=3D"StateRetrievalTimeout">20000</attribute>
-
-      <!--
-          Number of milliseconds to wait until all responses for a
-          synchronous call have been received.
-      -->
-      <attribute name=3D"SyncReplTimeout">20000</attribute>
-
       <!-- Max number of milliseconds to wait for a lock acquisition -->
       <attribute name=3D"LockAcquisitionTimeout">15000</attribute>
 =


Modified: core/trunk/src/main/resources/META-INF/local-lru-eviction-service=
.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/resources/META-INF/local-lru-eviction-service.xml	2=
008-01-22 14:56:16 UTC (rev 5191)
+++ core/trunk/src/main/resources/META-INF/local-lru-eviction-service.xml	2=
008-01-22 17:56:08 UTC (rev 5192)
@@ -43,36 +43,6 @@
       -->
       <attribute name=3D"CacheMode">LOCAL</attribute>
 =

-      <!-- Name of cluster. Needs to be the same for all TreeCache nodes i=
n a
-           cluster in order to find each other.
-      -->
-      <attribute name=3D"ClusterName">JBossCache-Cluster</attribute>
-
-      <!--Uncomment next three statements to enable JGroups multiplexer.
-         This configuration is dependent on the JGroups multiplexer being
-         registered in an MBean server such as JBossAS.  -->
-      <!--
-      <depends>jgroups.mux:name=3DMultiplexer</depends>
-      <attribute name=3D"MultiplexerService">jgroups.mux:name=3DMultiplexe=
r</attribute>
-      <attribute name=3D"MultiplexerStack">fc-fast-minimalthreads</attribu=
te>
-      -->
-
-      <!-- JGroups protocol stack properties NOT NEEDED since CacheMode is=
 LOCAL -->
-
-
-      <!--
-          The max amount of time (in milliseconds) we wait until the
-          state (ie. the contents of the cache) are retrieved from
-          existing members in a clustered environment
-      -->
-      <attribute name=3D"StateRetrievalTimeout">20000</attribute>
-
-      <!--
-          Number of milliseconds to wait until all responses for a
-          synchronous call have been received.
-      -->
-      <attribute name=3D"SyncReplTimeout">20000</attribute>
-
       <!-- Max number of milliseconds to wait for a lock acquisition -->
       <attribute name=3D"LockAcquisitionTimeout">15000</attribute>
 =


Modified: core/trunk/src/main/resources/META-INF/local-mru-eviction-service=
.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/resources/META-INF/local-mru-eviction-service.xml	2=
008-01-22 14:56:16 UTC (rev 5191)
+++ core/trunk/src/main/resources/META-INF/local-mru-eviction-service.xml	2=
008-01-22 17:56:08 UTC (rev 5192)
@@ -24,7 +24,6 @@
       <attribute name=3D"TransactionManagerLookupClass">org.jboss.cache.tr=
ansaction.GenericTransactionManagerLookup
       </attribute>
 =

-
       <!--
           Node locking level : SERIALIZABLE
                                REPEATABLE_READ (default)
@@ -41,40 +40,9 @@
       -->
       <attribute name=3D"CacheMode">LOCAL</attribute>
 =

-      <!-- Name of cluster. Needs to be the same for all TreeCache nodes i=
n a
-           cluster in order to find each other.
-      -->
-      <attribute name=3D"ClusterName">JBossCache-Cluster</attribute>
-
-      <!--Uncomment next three statements to enable JGroups multiplexer.
-This configuration is dependent on the JGroups multiplexer being
-registered in an MBean server such as JBossAS.  -->
-      <!--
-      <depends>jgroups.mux:name=3DMultiplexer</depends>
-      <attribute name=3D"MultiplexerService">jgroups.mux:name=3DMultiplexe=
r</attribute>
-      <attribute name=3D"MultiplexerStack">fc-fast-minimalthreads</attribu=
te>
-      -->
-
-      <!-- JGroups protocol stack properties NOT NEEDED since CacheMode is=
 LOCAL -->
-
-
-      <!--
-          The max amount of time (in milliseconds) we wait until the
-          state (ie. the contents of the cache) are retrieved from
-          existing members in a clustered environment
-      -->
-      <attribute name=3D"StateRetrievalTimeout">20000</attribute>
-
-      <!--
-          Number of milliseconds to wait until all responses for a
-          synchronous call have been received.
-      -->
-      <attribute name=3D"SyncReplTimeout">20000</attribute>
-
       <!-- Max number of milliseconds to wait for a lock acquisition -->
       <attribute name=3D"LockAcquisitionTimeout">15000</attribute>
 =

-
       <!-- Specific eviction policy configurations. This is LRU -->
       <attribute name=3D"EvictionPolicyConfig">
          <config>

Modified: core/trunk/src/main/resources/META-INF/local-null-eviction-servic=
e.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/resources/META-INF/local-null-eviction-service.xml	=
2008-01-22 14:56:16 UTC (rev 5191)
+++ core/trunk/src/main/resources/META-INF/local-null-eviction-service.xml	=
2008-01-22 17:56:08 UTC (rev 5192)
@@ -43,36 +43,6 @@
       -->
       <attribute name=3D"CacheMode">LOCAL</attribute>
 =

-      <!-- Name of cluster. Needs to be the same for all TreeCache nodes i=
n a
-           cluster in order to find each other.
-      -->
-      <attribute name=3D"ClusterName">JBossCache-Cluster</attribute>
-
-      <!--Uncomment next three statements to enable JGroups multiplexer.
-         This configuration is dependent on the JGroups multiplexer being
-         registered in an MBean server such as JBossAS.  -->
-      <!--
-      <depends>jgroups.mux:name=3DMultiplexer</depends>
-      <attribute name=3D"MultiplexerService">jgroups.mux:name=3DMultiplexe=
r</attribute>
-      <attribute name=3D"MultiplexerStack">fc-fast-minimalthreads</attribu=
te>
-      -->
-
-      <!-- JGroups protocol stack properties NOT NEEDED since CacheMode is=
 LOCAL -->
-
-
-      <!--
-          The max amount of time (in milliseconds) we wait until the
-          state (ie. the contents of the cache) are retrieved from
-          existing members in a clustered environment
-      -->
-      <attribute name=3D"StateRetrievalTimeout">20000</attribute>
-
-      <!--
-          Number of milliseconds to wait until all responses for a
-          synchronous call have been received.
-      -->
-      <attribute name=3D"SyncReplTimeout">20000</attribute>
-
       <!-- Max number of milliseconds to wait for a lock acquisition -->
       <attribute name=3D"LockAcquisitionTimeout">15000</attribute>
 =


Modified: core/trunk/src/main/resources/META-INF/local-passivation-service.=
xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/resources/META-INF/local-passivation-service.xml	20=
08-01-22 14:56:16 UTC (rev 5191)
+++ core/trunk/src/main/resources/META-INF/local-passivation-service.xml	20=
08-01-22 17:56:08 UTC (rev 5192)
@@ -41,41 +41,9 @@
       -->
       <attribute name=3D"CacheMode">LOCAL</attribute>
 =

-      <!-- Name of cluster. Needs to be the same for all TreeCache nodes i=
n a
-           cluster in order to find each other.
-      -->
-      <attribute name=3D"ClusterName">JBossCache-Cluster</attribute>
-
-      <!--Uncomment next three statements to enable JGroups multiplexer.
-This configuration is dependent on the JGroups multiplexer being
-registered in an MBean server such as JBossAS.  -->
-      <!--
-      <depends>jgroups.mux:name=3DMultiplexer</depends>
-      <attribute name=3D"MultiplexerService">jgroups.mux:name=3DMultiplexe=
r</attribute>
-      <attribute name=3D"MultiplexerStack">fc-fast-minimalthreads</attribu=
te>
-      -->
-
-
-      <!-- JGroups protocol stack properties NOT NEEDED since CacheMode is=
 LOCAL -->
-
-
-      <!--
-          The max amount of time (in milliseconds) we wait until the
-          state (ie. the contents of the cache) are retrieved from
-          existing members in a clustered environment
-      -->
-      <attribute name=3D"StateRetrievalTimeout">20000</attribute>
-
-      <!--
-          Number of milliseconds to wait until all responses for a
-          synchronous call have been received.
-      -->
-      <attribute name=3D"SyncReplTimeout">20000</attribute>
-
       <!-- Max number of milliseconds to wait for a lock acquisition -->
       <attribute name=3D"LockAcquisitionTimeout">15000</attribute>
 =

-
       <!-- Specific eviction policy configurations. This is LRU -->
       <attribute name=3D"EvictionPolicyConfig">
          <config>

Modified: core/trunk/src/main/resources/META-INF/local-service.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/resources/META-INF/local-service.xml	2008-01-22 14:=
56:16 UTC (rev 5191)
+++ core/trunk/src/main/resources/META-INF/local-service.xml	2008-01-22 17:=
56:08 UTC (rev 5192)
@@ -42,36 +42,6 @@
       -->
       <attribute name=3D"CacheMode">LOCAL</attribute>
 =

-      <!-- Name of cluster. Needs to be the same for all TreeCache nodes i=
n a
-           cluster in order to find each other.
-      -->
-      <attribute name=3D"ClusterName">JBossCache-Cluster</attribute>
-
-      <!--Uncomment next three statements to enable JGroups multiplexer.
-This configuration is dependent on the JGroups multiplexer being
-registered in an MBean server such as JBossAS.  -->
-      <!--
-      <depends>jgroups.mux:name=3DMultiplexer</depends>
-      <attribute name=3D"MultiplexerService">jgroups.mux:name=3DMultiplexe=
r</attribute>
-      <attribute name=3D"MultiplexerStack">fc-fast-minimalthreads</attribu=
te>
-      -->
-
-      <!-- JGroups protocol stack properties NOT NEEDED since CacheMode is=
 LOCAL -->
-
-
-      <!--
-          The max amount of time (in milliseconds) we wait until the
-          state (ie. the contents of the cache) are retrieved from
-          existing members in a clustered environment
-      -->
-      <attribute name=3D"StateRetrievalTimeout">20000</attribute>
-
-      <!--
-          Number of milliseconds to wait until all responses for a
-          synchronous call have been received.
-      -->
-      <attribute name=3D"SyncReplTimeout">20000</attribute>
-
       <!-- Max number of milliseconds to wait for a lock acquisition -->
       <attribute name=3D"LockAcquisitionTimeout">15000</attribute>
 =


Modified: core/trunk/src/main/resources/META-INF/local-tx-service.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/resources/META-INF/local-tx-service.xml	2008-01-22 =
14:56:16 UTC (rev 5191)
+++ core/trunk/src/main/resources/META-INF/local-tx-service.xml	2008-01-22 =
17:56:08 UTC (rev 5192)
@@ -42,32 +42,6 @@
       -->
       <attribute name=3D"CacheMode">LOCAL</attribute>
 =

-      <!-- Name of cluster. Needs to be the same for all clusters, in order
-           to find each other
-      -->
-      <attribute name=3D"ClusterName">JBossCache-Cluster</attribute>
-
-      <!-- JGroups protocol stack properties. Can also be a URL,
-           e.g. file:/home/bela/default.xml
-         <attribute name=3D"ClusterProperties"></attribute>
-      -->
-
-      <!-- JGroups protocol stack properties NOT NEEDED since CacheMode is=
 LOCAL -->
-
-
-      <!--
-          The max amount of time (in milliseconds) we wait until the
-          state (ie. the contents of the cache) are retrieved from
-          existing members in a clustered environment
-      -->
-      <attribute name=3D"StateRetrievalTimeout">20000</attribute>
-
-      <!--
-          Number of milliseconds to wait until all responses for a
-          synchronous call have been received.
-      -->
-      <attribute name=3D"SyncReplTimeout">20000</attribute>
-
       <!-- Max number of milliseconds to wait for a lock acquisition -->
       <attribute name=3D"LockAcquisitionTimeout">15000</attribute>
 =


Modified: core/trunk/src/main/resources/META-INF/mixedPolicy-eviction-servi=
ce.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/resources/META-INF/mixedPolicy-eviction-service.xml=
	2008-01-22 14:56:16 UTC (rev 5191)
+++ core/trunk/src/main/resources/META-INF/mixedPolicy-eviction-service.xml=
	2008-01-22 17:56:08 UTC (rev 5192)
@@ -41,101 +41,7 @@
       -->
       <attribute name=3D"CacheMode">LOCAL</attribute>
 =

-      <!-- Name of cluster. Needs to be the same for all TreeCache nodes i=
n a
-           cluster in order to find each other.
-      -->
-      <attribute name=3D"ClusterName">JBossCache-Cluster</attribute>
 =

-      <!--Uncomment next three statements to enable JGroups multiplexer.
-This configuration is dependent on the JGroups multiplexer being
-registered in an MBean server such as JBossAS.  -->
-      <!--
-      <depends>jgroups.mux:name=3DMultiplexer</depends>
-      <attribute name=3D"MultiplexerService">jgroups.mux:name=3DMultiplexe=
r</attribute>
-      <attribute name=3D"MultiplexerStack">fc-fast-minimalthreads</attribu=
te>
-      -->
-
-      <!-- JGroups protocol stack properties.
-         ClusterConfig isn't used if the multiplexer is enabled and succes=
sfully initialized.
-      -->
-      <attribute name=3D"ClusterConfig">
-         <config>
-            <UDP mcast_addr=3D"228.10.10.10"
-                 mcast_port=3D"45588"
-                 tos=3D"8"
-                 ucast_recv_buf_size=3D"20000000"
-                 ucast_send_buf_size=3D"640000"
-                 mcast_recv_buf_size=3D"25000000"
-                 mcast_send_buf_size=3D"640000"
-                 loopback=3D"false"
-                 discard_incompatible_packets=3D"true"
-                 max_bundle_size=3D"64000"
-                 max_bundle_timeout=3D"30"
-                 use_incoming_packet_handler=3D"true"
-                 ip_ttl=3D"2"
-                 enable_bundling=3D"false"
-                 enable_diagnostics=3D"true"
-
-                 use_concurrent_stack=3D"true"
-
-                 thread_naming_pattern=3D"pl"
-
-                 thread_pool.enabled=3D"true"
-                 thread_pool.min_threads=3D"1"
-                 thread_pool.max_threads=3D"25"
-                 thread_pool.keep_alive_time=3D"30000"
-                 thread_pool.queue_enabled=3D"true"
-                 thread_pool.queue_max_size=3D"10"
-                 thread_pool.rejection_policy=3D"Run"
-
-                 oob_thread_pool.enabled=3D"true"
-                 oob_thread_pool.min_threads=3D"1"
-                 oob_thread_pool.max_threads=3D"4"
-                 oob_thread_pool.keep_alive_time=3D"10000"
-                 oob_thread_pool.queue_enabled=3D"true"
-                 oob_thread_pool.queue_max_size=3D"10"
-                 oob_thread_pool.rejection_policy=3D"Run"/>
-
-            <PING timeout=3D"2000" num_initial_members=3D"3"/>
-            <MERGE2 max_interval=3D"30000" min_interval=3D"10000"/>
-            <FD_SOCK/>
-            <FD timeout=3D"10000" max_tries=3D"5" shun=3D"true"/>
-            <VERIFY_SUSPECT timeout=3D"1500"/>
-            <pbcast.NAKACK
-                    use_mcast_xmit=3D"false" gc_lag=3D"0"
-                    retransmit_timeout=3D"300,600,1200,2400,4800"
-                    discard_delivered_msgs=3D"true"/>
-            <UNICAST timeout=3D"300,600,1200,2400,3600"/>
-            <pbcast.STABLE stability_delay=3D"1000" desired_avg_gossip=3D"=
50000"
-                           max_bytes=3D"400000"/>
-            <pbcast.GMS print_local_addr=3D"true" join_timeout=3D"5000" sh=
un=3D"false"
-                        view_bundling=3D"true" view_ack_collection_timeout=
=3D"5000"/>
-            <FC max_credits=3D"20000000" min_threshold=3D"0.10"/>
-            <FRAG2 frag_size=3D"60000"/>
-            <pbcast.STREAMING_STATE_TRANSFER use_reading_thread=3D"true"/>
-            <!-- <pbcast.STATE_TRANSFER/> -->
-            <pbcast.FLUSH timeout=3D"0"/>
-         </config>
-      </attribute>
-
-
-      <!--
-          The max amount of time (in milliseconds) we wait until the
-          state (ie. the contents of the cache) are retrieved from
-          existing members in a clustered environment
-      -->
-      <attribute name=3D"StateRetrievalTimeout">20000</attribute>
-
-      <!--
-          Number of milliseconds to wait until all responses for a
-          synchronous call have been received.
-      -->
-      <attribute name=3D"SyncReplTimeout">20000</attribute>
-
-      <!-- Max number of milliseconds to wait for a lock acquisition -->
-      <attribute name=3D"LockAcquisitionTimeout">15000</attribute>
-
-
       <!-- Specific eviction policy configurations. This is LRU -->
       <attribute name=3D"EvictionPolicyConfig">
          <config>

Modified: core/trunk/src/main/resources/META-INF/mux-service.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/resources/META-INF/mux-service.xml	2008-01-22 14:56=
:16 UTC (rev 5191)
+++ core/trunk/src/main/resources/META-INF/mux-service.xml	2008-01-22 17:56=
:08 UTC (rev 5192)
@@ -48,19 +48,7 @@
       -->
       <attribute name=3D"CacheMode">LOCAL</attribute>
 =

-      <!-- Name of cluster. Needs to be the same for all nodes in a cluste=
rs, in order
-           to find each other.
-      -->
-      <attribute name=3D"ClusterName">JBossCache-Cluster</attribute>
-
       <!--
-          The max amount of time (in milliseconds) we wait until the
-          state (ie. the contents of the cache) are retrieved from
-          existing members in a clustered environment
-      -->
-      <attribute name=3D"StateRetrievalTimeout">20000</attribute>
-
-      <!--
           Number of milliseconds to wait until all responses for a
           synchronous call have been received.
       -->

Modified: core/trunk/src/main/resources/META-INF/optimistic-eviction.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/resources/META-INF/optimistic-eviction.xml	2008-01-=
22 14:56:16 UTC (rev 5191)
+++ core/trunk/src/main/resources/META-INF/optimistic-eviction.xml	2008-01-=
22 17:56:08 UTC (rev 5192)
@@ -54,11 +54,6 @@
       -->
       <attribute name=3D"CacheMode">LOCAL</attribute>
 =

-      <!-- Name of cluster. Needs to be the same for all clusters, in order
-           to find each other
-      -->
-      <attribute name=3D"ClusterName">Infa-Cache-Cluster</attribute>
-
       <!-- Max number of milliseconds to wait for a lock acquisition -->
       <attribute name=3D"LockAcquisitionTimeout">10000</attribute>
 =


Modified: core/trunk/src/main/resources/META-INF/pojocache-passivation-serv=
ice.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/resources/META-INF/pojocache-passivation-service.xm=
l	2008-01-22 14:56:16 UTC (rev 5191)
+++ core/trunk/src/main/resources/META-INF/pojocache-passivation-service.xm=
l	2008-01-22 17:56:08 UTC (rev 5192)
@@ -58,22 +58,16 @@
       <!-- JGroups protocol stack properties.
          ClusterConfig isn't used if the multiplexer is enabled and succes=
sfully initialized.
       -->
-      <attribute name=3D"ClusterConfig">
+<attribute name=3D"ClusterConfig">
          <config>
-            <UDP mcast_addr=3D"228.10.10.10"
-                 mcast_port=3D"45588"
-                 tos=3D"8"
-                 ucast_recv_buf_size=3D"20000000"
-                 ucast_send_buf_size=3D"640000"
-                 mcast_recv_buf_size=3D"25000000"
-                 mcast_send_buf_size=3D"640000"
+            <TCP recv_buf_size=3D"20000000" use_send_queues=3D"false"
                  loopback=3D"false"
                  discard_incompatible_packets=3D"true"
                  max_bundle_size=3D"64000"
                  max_bundle_timeout=3D"30"
                  use_incoming_packet_handler=3D"true"
-                 ip_ttl=3D"2"
-                 enable_bundling=3D"false"
+                 enable_bundling=3D"true"
+                 enable_unicast_bundling=3D"true"
                  enable_diagnostics=3D"true"
 =

                  use_concurrent_stack=3D"true"
@@ -82,21 +76,22 @@
 =

                  thread_pool.enabled=3D"true"
                  thread_pool.min_threads=3D"1"
-                 thread_pool.max_threads=3D"25"
+                 thread_pool.max_threads=3D"4"
                  thread_pool.keep_alive_time=3D"30000"
                  thread_pool.queue_enabled=3D"true"
-                 thread_pool.queue_max_size=3D"10"
-                 thread_pool.rejection_policy=3D"Run"
+                 thread_pool.queue_max_size=3D"50000"
+                 thread_pool.rejection_policy=3D"discard"
 =

                  oob_thread_pool.enabled=3D"true"
-                 oob_thread_pool.min_threads=3D"1"
+                 oob_thread_pool.min_threads=3D"2"
                  oob_thread_pool.max_threads=3D"4"
                  oob_thread_pool.keep_alive_time=3D"10000"
-                 oob_thread_pool.queue_enabled=3D"true"
+                 oob_thread_pool.queue_enabled=3D"false"
                  oob_thread_pool.queue_max_size=3D"10"
                  oob_thread_pool.rejection_policy=3D"Run"/>
 =

-            <PING timeout=3D"2000" num_initial_members=3D"3"/>
+            <!--<PING timeout=3D"2000" num_initial_members=3D"3"/>-->
+             <MPING mcast_addr=3D"232.1.2.3" timeout=3D"2000" num_initial_=
members=3D"3"/>
             <MERGE2 max_interval=3D"30000" min_interval=3D"10000"/>
             <FD_SOCK/>
             <FD timeout=3D"10000" max_tries=3D"5" shun=3D"true"/>
@@ -104,12 +99,14 @@
             <pbcast.NAKACK use_mcast_xmit=3D"false" gc_lag=3D"0"
                            retransmit_timeout=3D"300,600,1200,2400,4800"
                            discard_delivered_msgs=3D"true"/>
-            <UNICAST timeout=3D"300,600,1200,2400,3600"/>
+            <!--<UNICAST timeout=3D"30,60,120,300,600,1200,2400,3600"/>-->
             <pbcast.STABLE stability_delay=3D"1000" desired_avg_gossip=3D"=
50000"
                            max_bytes=3D"400000"/>
-            <pbcast.GMS print_local_addr=3D"true" join_timeout=3D"5000" sh=
un=3D"false"
+            <pbcast.GMS print_local_addr=3D"true" join_timeout=3D"5000"
+                        join_retry_timeout=3D"2000" shun=3D"false"
                         view_bundling=3D"true" view_ack_collection_timeout=
=3D"5000"/>
-            <FC max_credits=3D"20000000" min_threshold=3D"0.10"/>
+              <FC max_credits=3D"5000000"
+                    min_threshold=3D"0.20"/>
             <FRAG2 frag_size=3D"60000"/>
             <pbcast.STREAMING_STATE_TRANSFER use_reading_thread=3D"true"/>
             <!-- <pbcast.STATE_TRANSFER/> -->
@@ -117,7 +114,6 @@
          </config>
       </attribute>
 =

-
       <!--
           The max amount of time (in milliseconds) we wait until the
           state (ie. the contents of the cache) are retrieved from

Modified: core/trunk/src/main/resources/META-INF/pojocache-passivation-serv=
ice2.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/resources/META-INF/pojocache-passivation-service2.x=
ml	2008-01-22 14:56:16 UTC (rev 5191)
+++ core/trunk/src/main/resources/META-INF/pojocache-passivation-service2.x=
ml	2008-01-22 17:56:08 UTC (rev 5192)
@@ -60,20 +60,14 @@
       -->
       <attribute name=3D"ClusterConfig">
          <config>
-            <UDP mcast_addr=3D"228.10.10.10"
-                 mcast_port=3D"45588"
-                 tos=3D"8"
-                 ucast_recv_buf_size=3D"20000000"
-                 ucast_send_buf_size=3D"640000"
-                 mcast_recv_buf_size=3D"25000000"
-                 mcast_send_buf_size=3D"640000"
+            <TCP recv_buf_size=3D"20000000" use_send_queues=3D"false"
                  loopback=3D"false"
                  discard_incompatible_packets=3D"true"
                  max_bundle_size=3D"64000"
                  max_bundle_timeout=3D"30"
                  use_incoming_packet_handler=3D"true"
-                 ip_ttl=3D"2"
-                 enable_bundling=3D"false"
+                 enable_bundling=3D"true"
+                 enable_unicast_bundling=3D"true"
                  enable_diagnostics=3D"true"
 =

                  use_concurrent_stack=3D"true"
@@ -82,21 +76,22 @@
 =

                  thread_pool.enabled=3D"true"
                  thread_pool.min_threads=3D"1"
-                 thread_pool.max_threads=3D"25"
+                 thread_pool.max_threads=3D"4"
                  thread_pool.keep_alive_time=3D"30000"
                  thread_pool.queue_enabled=3D"true"
-                 thread_pool.queue_max_size=3D"10"
-                 thread_pool.rejection_policy=3D"Run"
+                 thread_pool.queue_max_size=3D"50000"
+                 thread_pool.rejection_policy=3D"discard"
 =

                  oob_thread_pool.enabled=3D"true"
-                 oob_thread_pool.min_threads=3D"1"
+                 oob_thread_pool.min_threads=3D"2"
                  oob_thread_pool.max_threads=3D"4"
                  oob_thread_pool.keep_alive_time=3D"10000"
-                 oob_thread_pool.queue_enabled=3D"true"
+                 oob_thread_pool.queue_enabled=3D"false"
                  oob_thread_pool.queue_max_size=3D"10"
                  oob_thread_pool.rejection_policy=3D"Run"/>
 =

-            <PING timeout=3D"2000" num_initial_members=3D"3"/>
+            <!--<PING timeout=3D"2000" num_initial_members=3D"3"/>-->
+             <MPING mcast_addr=3D"232.1.2.3" timeout=3D"2000" num_initial_=
members=3D"3"/>
             <MERGE2 max_interval=3D"30000" min_interval=3D"10000"/>
             <FD_SOCK/>
             <FD timeout=3D"10000" max_tries=3D"5" shun=3D"true"/>
@@ -104,12 +99,14 @@
             <pbcast.NAKACK use_mcast_xmit=3D"false" gc_lag=3D"0"
                            retransmit_timeout=3D"300,600,1200,2400,4800"
                            discard_delivered_msgs=3D"true"/>
-            <UNICAST timeout=3D"300,600,1200,2400,3600"/>
+            <!--<UNICAST timeout=3D"30,60,120,300,600,1200,2400,3600"/>-->
             <pbcast.STABLE stability_delay=3D"1000" desired_avg_gossip=3D"=
50000"
                            max_bytes=3D"400000"/>
-            <pbcast.GMS print_local_addr=3D"true" join_timeout=3D"5000" sh=
un=3D"false"
+            <pbcast.GMS print_local_addr=3D"true" join_timeout=3D"5000"
+                        join_retry_timeout=3D"2000" shun=3D"false"
                         view_bundling=3D"true" view_ack_collection_timeout=
=3D"5000"/>
-            <FC max_credits=3D"20000000" min_threshold=3D"0.10"/>
+              <FC max_credits=3D"5000000"
+                    min_threshold=3D"0.20"/>
             <FRAG2 frag_size=3D"60000"/>
             <pbcast.STREAMING_STATE_TRANSFER use_reading_thread=3D"true"/>
             <!-- <pbcast.STATE_TRANSFER/> -->
@@ -117,7 +114,6 @@
          </config>
       </attribute>
 =

-
       <!--
           The max amount of time (in milliseconds) we wait until the
           state (ie. the contents of the cache) are retrieved from

Modified: core/trunk/src/main/resources/META-INF/policyPerRegion-eviction-s=
ervice.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/resources/META-INF/policyPerRegion-eviction-service=
.xml	2008-01-22 14:56:16 UTC (rev 5191)
+++ core/trunk/src/main/resources/META-INF/policyPerRegion-eviction-service=
.xml	2008-01-22 17:56:08 UTC (rev 5192)
@@ -60,43 +60,33 @@
       -->
       <attribute name=3D"ClusterConfig">
          <config>
-            <UDP mcast_addr=3D"228.10.10.10"
-                 mcast_port=3D"45588"
-                 tos=3D"8"
-                 ucast_recv_buf_size=3D"20000000"
-                 ucast_send_buf_size=3D"640000"
-                 mcast_recv_buf_size=3D"25000000"
-                 mcast_send_buf_size=3D"640000"
+            <TCP recv_buf_size=3D"20000000" use_send_queues=3D"false"
                  loopback=3D"false"
                  discard_incompatible_packets=3D"true"
                  max_bundle_size=3D"64000"
                  max_bundle_timeout=3D"30"
                  use_incoming_packet_handler=3D"true"
-                 ip_ttl=3D"2"
-                 enable_bundling=3D"false"
+                 enable_bundling=3D"true"
+                 enable_unicast_bundling=3D"true"
                  enable_diagnostics=3D"true"
-
                  use_concurrent_stack=3D"true"
-
                  thread_naming_pattern=3D"pl"
-
                  thread_pool.enabled=3D"true"
                  thread_pool.min_threads=3D"1"
-                 thread_pool.max_threads=3D"25"
+                 thread_pool.max_threads=3D"4"
                  thread_pool.keep_alive_time=3D"30000"
                  thread_pool.queue_enabled=3D"true"
-                 thread_pool.queue_max_size=3D"10"
-                 thread_pool.rejection_policy=3D"Run"
-
+                 thread_pool.queue_max_size=3D"50000"
+                 thread_pool.rejection_policy=3D"discard"
                  oob_thread_pool.enabled=3D"true"
-                 oob_thread_pool.min_threads=3D"1"
+                 oob_thread_pool.min_threads=3D"2"
                  oob_thread_pool.max_threads=3D"4"
                  oob_thread_pool.keep_alive_time=3D"10000"
-                 oob_thread_pool.queue_enabled=3D"true"
+                 oob_thread_pool.queue_enabled=3D"false"
                  oob_thread_pool.queue_max_size=3D"10"
                  oob_thread_pool.rejection_policy=3D"Run"/>
-
-            <PING timeout=3D"2000" num_initial_members=3D"3"/>
+            <!--<PING timeout=3D"2000" num_initial_members=3D"3"/>-->
+             <MPING mcast_addr=3D"232.1.2.3" timeout=3D"2000" num_initial_=
members=3D"3"/>
             <MERGE2 max_interval=3D"30000" min_interval=3D"10000"/>
             <FD_SOCK/>
             <FD timeout=3D"10000" max_tries=3D"5" shun=3D"true"/>
@@ -104,12 +94,14 @@
             <pbcast.NAKACK use_mcast_xmit=3D"false" gc_lag=3D"0"
                            retransmit_timeout=3D"300,600,1200,2400,4800"
                            discard_delivered_msgs=3D"true"/>
-            <UNICAST timeout=3D"300,600,1200,2400,3600"/>
+            <!--<UNICAST timeout=3D"30,60,120,300,600,1200,2400,3600"/>-->
             <pbcast.STABLE stability_delay=3D"1000" desired_avg_gossip=3D"=
50000"
                            max_bytes=3D"400000"/>
-            <pbcast.GMS print_local_addr=3D"true" join_timeout=3D"5000" sh=
un=3D"false"
+            <pbcast.GMS print_local_addr=3D"true" join_timeout=3D"5000"
+                        join_retry_timeout=3D"2000" shun=3D"false"
                         view_bundling=3D"true" view_ack_collection_timeout=
=3D"5000"/>
-            <FC max_credits=3D"20000000" min_threshold=3D"0.10"/>
+              <FC max_credits=3D"5000000"
+                    min_threshold=3D"0.20"/>
             <FRAG2 frag_size=3D"60000"/>
             <pbcast.STREAMING_STATE_TRANSFER use_reading_thread=3D"true"/>
             <!-- <pbcast.STATE_TRANSFER/> -->

Modified: core/trunk/src/main/resources/META-INF/replAsync-service.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/resources/META-INF/replAsync-service.xml	2008-01-22=
 14:56:16 UTC (rev 5191)
+++ core/trunk/src/main/resources/META-INF/replAsync-service.xml	2008-01-22=
 17:56:08 UTC (rev 5192)
@@ -76,43 +76,33 @@
       -->
       <attribute name=3D"ClusterConfig">
          <config>
-            <UDP mcast_addr=3D"228.10.10.10"
-                 mcast_port=3D"45588"
-                 tos=3D"8"
-                 ucast_recv_buf_size=3D"20000000"
-                 ucast_send_buf_size=3D"640000"
-                 mcast_recv_buf_size=3D"25000000"
-                 mcast_send_buf_size=3D"640000"
+            <TCP recv_buf_size=3D"20000000" use_send_queues=3D"false"
                  loopback=3D"false"
                  discard_incompatible_packets=3D"true"
                  max_bundle_size=3D"64000"
                  max_bundle_timeout=3D"30"
                  use_incoming_packet_handler=3D"true"
-                 ip_ttl=3D"2"
-                 enable_bundling=3D"false"
+                 enable_bundling=3D"true"
+                 enable_unicast_bundling=3D"true"
                  enable_diagnostics=3D"true"
-
                  use_concurrent_stack=3D"true"
-
                  thread_naming_pattern=3D"pl"
-
                  thread_pool.enabled=3D"true"
                  thread_pool.min_threads=3D"1"
-                 thread_pool.max_threads=3D"25"
+                 thread_pool.max_threads=3D"4"
                  thread_pool.keep_alive_time=3D"30000"
                  thread_pool.queue_enabled=3D"true"
-                 thread_pool.queue_max_size=3D"10"
-                 thread_pool.rejection_policy=3D"Run"
-
+                 thread_pool.queue_max_size=3D"50000"
+                 thread_pool.rejection_policy=3D"discard"
                  oob_thread_pool.enabled=3D"true"
-                 oob_thread_pool.min_threads=3D"1"
+                 oob_thread_pool.min_threads=3D"2"
                  oob_thread_pool.max_threads=3D"4"
                  oob_thread_pool.keep_alive_time=3D"10000"
-                 oob_thread_pool.queue_enabled=3D"true"
+                 oob_thread_pool.queue_enabled=3D"false"
                  oob_thread_pool.queue_max_size=3D"10"
                  oob_thread_pool.rejection_policy=3D"Run"/>
-
-            <PING timeout=3D"2000" num_initial_members=3D"3"/>
+            <!--<PING timeout=3D"2000" num_initial_members=3D"3"/>-->
+             <MPING mcast_addr=3D"232.1.2.3" timeout=3D"2000" num_initial_=
members=3D"3"/>
             <MERGE2 max_interval=3D"30000" min_interval=3D"10000"/>
             <FD_SOCK/>
             <FD timeout=3D"10000" max_tries=3D"5" shun=3D"true"/>
@@ -120,12 +110,14 @@
             <pbcast.NAKACK use_mcast_xmit=3D"false" gc_lag=3D"0"
                            retransmit_timeout=3D"300,600,1200,2400,4800"
                            discard_delivered_msgs=3D"true"/>
-            <UNICAST timeout=3D"300,600,1200,2400,3600"/>
+            <!--<UNICAST timeout=3D"30,60,120,300,600,1200,2400,3600"/>-->
             <pbcast.STABLE stability_delay=3D"1000" desired_avg_gossip=3D"=
50000"
                            max_bytes=3D"400000"/>
-            <pbcast.GMS print_local_addr=3D"true" join_timeout=3D"5000" sh=
un=3D"false"
+            <pbcast.GMS print_local_addr=3D"true" join_timeout=3D"5000"
+                        join_retry_timeout=3D"2000" shun=3D"false"
                         view_bundling=3D"true" view_ack_collection_timeout=
=3D"5000"/>
-            <FC max_credits=3D"20000000" min_threshold=3D"0.10"/>
+              <FC max_credits=3D"5000000"
+                    min_threshold=3D"0.20"/>
             <FRAG2 frag_size=3D"60000"/>
             <pbcast.STREAMING_STATE_TRANSFER use_reading_thread=3D"true"/>
             <!-- <pbcast.STATE_TRANSFER/> -->

Modified: core/trunk/src/main/resources/META-INF/replSync-passivation-servi=
ce.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/resources/META-INF/replSync-passivation-service.xml=
	2008-01-22 14:56:16 UTC (rev 5191)
+++ core/trunk/src/main/resources/META-INF/replSync-passivation-service.xml=
	2008-01-22 17:56:08 UTC (rev 5192)
@@ -60,43 +60,33 @@
       -->
       <attribute name=3D"ClusterConfig">
          <config>
-            <UDP mcast_addr=3D"228.10.10.10"
-                 mcast_port=3D"45588"
-                 tos=3D"8"
-                 ucast_recv_buf_size=3D"20000000"
-                 ucast_send_buf_size=3D"640000"
-                 mcast_recv_buf_size=3D"25000000"
-                 mcast_send_buf_size=3D"640000"
+            <TCP recv_buf_size=3D"20000000" use_send_queues=3D"false"
                  loopback=3D"false"
                  discard_incompatible_packets=3D"true"
                  max_bundle_size=3D"64000"
                  max_bundle_timeout=3D"30"
                  use_incoming_packet_handler=3D"true"
-                 ip_ttl=3D"2"
-                 enable_bundling=3D"false"
+                 enable_bundling=3D"true"
+                 enable_unicast_bundling=3D"true"
                  enable_diagnostics=3D"true"
-
                  use_concurrent_stack=3D"true"
-
                  thread_naming_pattern=3D"pl"
-
                  thread_pool.enabled=3D"true"
                  thread_pool.min_threads=3D"1"
-                 thread_pool.max_threads=3D"25"
+                 thread_pool.max_threads=3D"4"
                  thread_pool.keep_alive_time=3D"30000"
                  thread_pool.queue_enabled=3D"true"
-                 thread_pool.queue_max_size=3D"10"
-                 thread_pool.rejection_policy=3D"Run"
-
+                 thread_pool.queue_max_size=3D"50000"
+                 thread_pool.rejection_policy=3D"discard"
                  oob_thread_pool.enabled=3D"true"
-                 oob_thread_pool.min_threads=3D"1"
+                 oob_thread_pool.min_threads=3D"2"
                  oob_thread_pool.max_threads=3D"4"
                  oob_thread_pool.keep_alive_time=3D"10000"
-                 oob_thread_pool.queue_enabled=3D"true"
+                 oob_thread_pool.queue_enabled=3D"false"
                  oob_thread_pool.queue_max_size=3D"10"
                  oob_thread_pool.rejection_policy=3D"Run"/>
-
-            <PING timeout=3D"2000" num_initial_members=3D"3"/>
+            <!--<PING timeout=3D"2000" num_initial_members=3D"3"/>-->
+             <MPING mcast_addr=3D"232.1.2.3" timeout=3D"2000" num_initial_=
members=3D"3"/>
             <MERGE2 max_interval=3D"30000" min_interval=3D"10000"/>
             <FD_SOCK/>
             <FD timeout=3D"10000" max_tries=3D"5" shun=3D"true"/>
@@ -104,11 +94,14 @@
             <pbcast.NAKACK use_mcast_xmit=3D"false" gc_lag=3D"0"
                            retransmit_timeout=3D"300,600,1200,2400,4800"
                            discard_delivered_msgs=3D"true"/>
-            <UNICAST timeout=3D"300,600,1200,2400,3600"/>
+            <!--<UNICAST timeout=3D"30,60,120,300,600,1200,2400,3600"/>-->
             <pbcast.STABLE stability_delay=3D"1000" desired_avg_gossip=3D"=
50000"
                            max_bytes=3D"400000"/>
-            <pbcast.GMS print_local_addr=3D"true" join_timeout=3D"5000" sh=
un=3D"false"
+            <pbcast.GMS print_local_addr=3D"true" join_timeout=3D"5000"
+                        join_retry_timeout=3D"2000" shun=3D"false"
                         view_bundling=3D"true" view_ack_collection_timeout=
=3D"5000"/>
+              <FC max_credits=3D"5000000"
+                    min_threshold=3D"0.20"/>
             <FRAG2 frag_size=3D"60000"/>
             <pbcast.STREAMING_STATE_TRANSFER use_reading_thread=3D"true"/>
             <!-- <pbcast.STATE_TRANSFER/> -->

Modified: core/trunk/src/main/resources/META-INF/replSync-service-test.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/resources/META-INF/replSync-service-test.xml	2008-0=
1-22 14:56:16 UTC (rev 5191)
+++ core/trunk/src/main/resources/META-INF/replSync-service-test.xml	2008-0=
1-22 17:56:08 UTC (rev 5192)
@@ -76,43 +76,33 @@
       -->
       <attribute name=3D"ClusterConfig">
          <config>
-            <UDP mcast_addr=3D"228.10.10.10"
-                 mcast_port=3D"45588"
-                 tos=3D"8"
-                 ucast_recv_buf_size=3D"20000000"
-                 ucast_send_buf_size=3D"640000"
-                 mcast_recv_buf_size=3D"25000000"
-                 mcast_send_buf_size=3D"640000"
+            <TCP recv_buf_size=3D"20000000" use_send_queues=3D"false"
                  loopback=3D"false"
                  discard_incompatible_packets=3D"true"
                  max_bundle_size=3D"64000"
                  max_bundle_timeout=3D"30"
                  use_incoming_packet_handler=3D"true"
-                 ip_ttl=3D"2"
-                 enable_bundling=3D"false"
+                 enable_bundling=3D"true"
+                 enable_unicast_bundling=3D"true"
                  enable_diagnostics=3D"true"
-
                  use_concurrent_stack=3D"true"
-
                  thread_naming_pattern=3D"pl"
-
                  thread_pool.enabled=3D"true"
                  thread_pool.min_threads=3D"1"
-                 thread_pool.max_threads=3D"25"
+                 thread_pool.max_threads=3D"4"
                  thread_pool.keep_alive_time=3D"30000"
                  thread_pool.queue_enabled=3D"true"
-                 thread_pool.queue_max_size=3D"10"
-                 thread_pool.rejection_policy=3D"Run"
-
+                 thread_pool.queue_max_size=3D"50000"
+                 thread_pool.rejection_policy=3D"discard"
                  oob_thread_pool.enabled=3D"true"
-                 oob_thread_pool.min_threads=3D"1"
+                 oob_thread_pool.min_threads=3D"2"
                  oob_thread_pool.max_threads=3D"4"
                  oob_thread_pool.keep_alive_time=3D"10000"
-                 oob_thread_pool.queue_enabled=3D"true"
+                 oob_thread_pool.queue_enabled=3D"false"
                  oob_thread_pool.queue_max_size=3D"10"
                  oob_thread_pool.rejection_policy=3D"Run"/>
-
-            <PING timeout=3D"2000" num_initial_members=3D"3"/>
+            <!--<PING timeout=3D"2000" num_initial_members=3D"3"/>-->
+             <MPING mcast_addr=3D"232.1.2.3" timeout=3D"2000" num_initial_=
members=3D"3"/>
             <MERGE2 max_interval=3D"30000" min_interval=3D"10000"/>
             <FD_SOCK/>
             <FD timeout=3D"10000" max_tries=3D"5" shun=3D"true"/>
@@ -120,11 +110,14 @@
             <pbcast.NAKACK use_mcast_xmit=3D"false" gc_lag=3D"0"
                            retransmit_timeout=3D"300,600,1200,2400,4800"
                            discard_delivered_msgs=3D"true"/>
-            <UNICAST timeout=3D"300,600,1200,2400,3600"/>
+            <!--<UNICAST timeout=3D"30,60,120,300,600,1200,2400,3600"/>-->
             <pbcast.STABLE stability_delay=3D"1000" desired_avg_gossip=3D"=
50000"
                            max_bytes=3D"400000"/>
-            <pbcast.GMS print_local_addr=3D"true" join_timeout=3D"5000" sh=
un=3D"false"
+            <pbcast.GMS print_local_addr=3D"true" join_timeout=3D"5000"
+                        join_retry_timeout=3D"2000" shun=3D"false"
                         view_bundling=3D"true" view_ack_collection_timeout=
=3D"5000"/>
+              <FC max_credits=3D"5000000"
+                    min_threshold=3D"0.20"/>
             <FRAG2 frag_size=3D"60000"/>
             <pbcast.STREAMING_STATE_TRANSFER use_reading_thread=3D"true"/>
             <!-- <pbcast.STATE_TRANSFER/> -->

Modified: core/trunk/src/main/resources/META-INF/replSync-service.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/resources/META-INF/replSync-service.xml	2008-01-22 =
14:56:16 UTC (rev 5191)
+++ core/trunk/src/main/resources/META-INF/replSync-service.xml	2008-01-22 =
17:56:08 UTC (rev 5192)
@@ -76,43 +76,33 @@
       -->
       <attribute name=3D"ClusterConfig">
          <config>
-            <UDP mcast_addr=3D"228.10.10.10"
-                 mcast_port=3D"45588"
-                 tos=3D"8"
-                 ucast_recv_buf_size=3D"20000000"
-                 ucast_send_buf_size=3D"640000"
-                 mcast_recv_buf_size=3D"25000000"
-                 mcast_send_buf_size=3D"640000"
+            <TCP recv_buf_size=3D"20000000" use_send_queues=3D"false"
                  loopback=3D"false"
                  discard_incompatible_packets=3D"true"
                  max_bundle_size=3D"64000"
                  max_bundle_timeout=3D"30"
                  use_incoming_packet_handler=3D"true"
-                 ip_ttl=3D"2"
-                 enable_bundling=3D"false"
+                 enable_bundling=3D"true"
+                 enable_unicast_bundling=3D"true"
                  enable_diagnostics=3D"true"
-
                  use_concurrent_stack=3D"true"
-
                  thread_naming_pattern=3D"pl"
-
                  thread_pool.enabled=3D"true"
                  thread_pool.min_threads=3D"1"
-                 thread_pool.max_threads=3D"25"
+                 thread_pool.max_threads=3D"4"
                  thread_pool.keep_alive_time=3D"30000"
                  thread_pool.queue_enabled=3D"true"
-                 thread_pool.queue_max_size=3D"10"
-                 thread_pool.rejection_policy=3D"Run"
-
+                 thread_pool.queue_max_size=3D"50000"
+                 thread_pool.rejection_policy=3D"discard"
                  oob_thread_pool.enabled=3D"true"
-                 oob_thread_pool.min_threads=3D"1"
+                 oob_thread_pool.min_threads=3D"2"
                  oob_thread_pool.max_threads=3D"4"
                  oob_thread_pool.keep_alive_time=3D"10000"
-                 oob_thread_pool.queue_enabled=3D"true"
+                 oob_thread_pool.queue_enabled=3D"false"
                  oob_thread_pool.queue_max_size=3D"10"
                  oob_thread_pool.rejection_policy=3D"Run"/>
-
-            <PING timeout=3D"2000" num_initial_members=3D"3"/>
+            <!--<PING timeout=3D"2000" num_initial_members=3D"3"/>-->
+             <MPING mcast_addr=3D"232.1.2.3" timeout=3D"2000" num_initial_=
members=3D"3"/>
             <MERGE2 max_interval=3D"30000" min_interval=3D"10000"/>
             <FD_SOCK/>
             <FD timeout=3D"10000" max_tries=3D"5" shun=3D"true"/>
@@ -120,11 +110,14 @@
             <pbcast.NAKACK use_mcast_xmit=3D"false" gc_lag=3D"0"
                            retransmit_timeout=3D"300,600,1200,2400,4800"
                            discard_delivered_msgs=3D"true"/>
-            <UNICAST timeout=3D"300,600,1200,2400,3600"/>
+            <!--<UNICAST timeout=3D"30,60,120,300,600,1200,2400,3600"/>-->
             <pbcast.STABLE stability_delay=3D"1000" desired_avg_gossip=3D"=
50000"
                            max_bytes=3D"400000"/>
-            <pbcast.GMS print_local_addr=3D"true" join_timeout=3D"5000" sh=
un=3D"false"
+            <pbcast.GMS print_local_addr=3D"true" join_timeout=3D"5000"
+                        join_retry_timeout=3D"2000" shun=3D"false"
                         view_bundling=3D"true" view_ack_collection_timeout=
=3D"5000"/>
+              <FC max_credits=3D"5000000"
+                    min_threshold=3D"0.20"/>
             <FRAG2 frag_size=3D"60000"/>
             <pbcast.STREAMING_STATE_TRANSFER use_reading_thread=3D"true"/>
             <!-- <pbcast.STATE_TRANSFER/> -->


--===============3293818926328437305==--

From jbosscache-commits at lists.jboss.org Tue Jan 22 13:05:44 2008
Content-Type: multipart/mixed; boundary="===============4444414396883072747=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r5193 -
 core/trunk/src/main/resources/META-INF.
Date: Tue, 22 Jan 2008 13:05:44 -0500
Message-ID: <E1JHNVI-0004W1-1p@committer01.frg.pub.inap.atl.jboss.com>

--===============4444414396883072747==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: mircea.markus
Date: 2008-01-22 13:05:43 -0500 (Tue, 22 Jan 2008)
New Revision: 5193

Added:
   core/trunk/src/main/resources/META-INF/cacheserver-service-jmx.xml
   core/trunk/src/main/resources/META-INF/cacheserver-service-tcp.xml
Removed:
   core/trunk/src/main/resources/META-INF/tcp-cacheserver-service.xml
Log:
http://jira.jboss.com/jira/browse/JBCACHE-1269

Added: core/trunk/src/main/resources/META-INF/cacheserver-service-jmx.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/resources/META-INF/cacheserver-service-jmx.xml	    =
                    (rev 0)
+++ core/trunk/src/main/resources/META-INF/cacheserver-service-jmx.xml	2008=
-01-22 18:05:43 UTC (rev 5193)
@@ -0,0 +1,51 @@
+<?xml version=3D"1.0" encoding=3D"UTF-8"?>
+
+<server>
+
+   <classpath codebase=3D"./lib" archives=3D"jboss-cache.jar"/>
+
+   <mbean code=3D"org.jboss.cache.jmx.CacheJmxWrapper"
+          name=3D"jboss.cache:service=3DTreeCache">
+
+      <depends>jboss:service=3DNaming</depends>
+      <depends>jboss:service=3DTransactionManager</depends>
+
+      <!-- Configure the TransactionManager -->
+      <attribute name=3D"TransactionManagerLookupClass">org.jboss.cache.tr=
ansaction.BatchModeTransactionManagerLookup
+      </attribute>
+
+
+      <!--
+          Node locking level : SERIALIZABLE
+                               REPEATABLE_READ (default)
+                               READ_COMMITTED
+                               READ_UNCOMMITTED
+                               NONE
+      -->
+      <attribute name=3D"IsolationLevel">REPEATABLE_READ</attribute>
+
+      <!--
+           Valid modes are LOCAL
+                           REPL_ASYNC
+                           REPL_SYNC
+                           INVALIDATION_ASYNC
+                           INVALIDATION_SYNC
+      -->
+      <attribute name=3D"CacheMode">LOCAL</attribute>
+
+      <!-- Name of cluster. Needs to be the same for all TreeCache nodes i=
n a
+           cluster in order to find each other.
+      -->
+      <attribute name=3D"ClusterName">JBossCache-Cluster</attribute>
+
+      <!-- JGroups protocol stack properties NOT NEEDED since CacheMode is=
 LOCAL -->
+
+      <!--
+         Indicate whether to use region based marshalling or not. Set this=
 to true if you are running under a scoped
+         class loader, e.g., inside an application server. Default is "fal=
se".
+      -->
+      <attribute name=3D"UseRegionBasedMarshalling">false</attribute>
+   </mbean>
+
+
+</server>

Copied: core/trunk/src/main/resources/META-INF/cacheserver-service-tcp.xml =
(from rev 5189, core/trunk/src/main/resources/META-INF/tcp-cacheserver-serv=
ice.xml)
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/resources/META-INF/cacheserver-service-tcp.xml	    =
                    (rev 0)
+++ core/trunk/src/main/resources/META-INF/cacheserver-service-tcp.xml	2008=
-01-22 18:05:43 UTC (rev 5193)
@@ -0,0 +1,14 @@
+<?xml version=3D"1.0" encoding=3D"UTF-8"?>
+
+<server>
+
+   <classpath codebase=3D"./lib" archives=3D"jboss-cache.jar"/>
+
+   <mbean code=3D"org.jboss.cache.loader.tcp.TcpCacheServer" name=3D"jboss=
.cache:service=3DTcpCacheServer">
+      <depends optional-attribute-name=3D"CacheJmxWrapper"
+               proxy-type=3D"attribute">jboss.cache:service=3DTreeCache</d=
epends>
+      <attribute name=3D"BindAddress">${jboss.bind.address:localhost}</att=
ribute>
+      <attribute name=3D"Port">7500</attribute>
+   </mbean>
+
+</server>


Property changes on: core/trunk/src/main/resources/META-INF/cacheserver-ser=
vice-tcp.xml
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: core/trunk/src/main/resources/META-INF/tcp-cacheserver-service.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/resources/META-INF/tcp-cacheserver-service.xml	2008=
-01-22 17:56:08 UTC (rev 5192)
+++ core/trunk/src/main/resources/META-INF/tcp-cacheserver-service.xml	2008=
-01-22 18:05:43 UTC (rev 5193)
@@ -1,58 +0,0 @@
-<?xml version=3D"1.0" encoding=3D"UTF-8"?>
-
-<server>
-
-   <classpath codebase=3D"./lib" archives=3D"jboss-cache.jar"/>
-
-   <mbean code=3D"org.jboss.cache.loader.tcp.TcpCacheServer" name=3D"jboss=
.cache:service=3DTcpCacheServer">
-      <depends optional-attribute-name=3D"CacheJmxWrapper"
-               proxy-type=3D"attribute">jboss.cache:service=3DTreeCache</d=
epends>
-      <attribute name=3D"BindAddress">${jboss.bind.address:localhost}</att=
ribute>
-      <attribute name=3D"Port">7500</attribute>
-   </mbean>
-
-   <mbean code=3D"org.jboss.cache.jmx.CacheJmxWrapper"
-          name=3D"jboss.cache:service=3DTreeCache">
-
-      <depends>jboss:service=3DNaming</depends>
-      <depends>jboss:service=3DTransactionManager</depends>
-
-      <!-- Configure the TransactionManager -->
-      <attribute name=3D"TransactionManagerLookupClass">org.jboss.cache.tr=
ansaction.BatchModeTransactionManagerLookup</attribute>
-
-
-      <!--
-          Node locking level : SERIALIZABLE
-                               REPEATABLE_READ (default)
-                               READ_COMMITTED
-                               READ_UNCOMMITTED
-                               NONE
-      -->
-      <attribute name=3D"IsolationLevel">REPEATABLE_READ</attribute>
-
-      <!--
-           Valid modes are LOCAL
-                           REPL_ASYNC
-                           REPL_SYNC
-                           INVALIDATION_ASYNC
-                           INVALIDATION_SYNC
-      -->
-      <attribute name=3D"CacheMode">LOCAL</attribute>
-
-      <!-- Name of cluster. Needs to be the same for all TreeCache nodes i=
n a
-           cluster in order to find each other.
-      -->
-      <attribute name=3D"ClusterName">JBossCache-Cluster</attribute>
-
-      <!-- JGroups protocol stack properties NOT NEEDED since CacheMode is=
 LOCAL -->
-
-      <!--
-         Indicate whether to use region based marshalling or not. Set this=
 to true if you are running under a scoped
-         class loader, e.g., inside an application server. Default is "fal=
se".
-      -->
-      <attribute name=3D"UseRegionBasedMarshalling">false</attribute>
-   </mbean>
-   =

-
-
-</server>


--===============4444414396883072747==--

From jbosscache-commits at lists.jboss.org Tue Jan 22 14:00:19 2008
Content-Type: multipart/mixed; boundary="===============1132198606403965041=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN:  r5194 - core.
Date: Tue, 22 Jan 2008 14:00:19 -0500
Message-ID: <E1JHOM7-0006rx-P5@committer01.frg.pub.inap.atl.jboss.com>

--===============1132198606403965041==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: manik.surtani(a)jboss.com
Date: 2008-01-22 14:00:19 -0500 (Tue, 22 Jan 2008)
New Revision: 5194

Added:
   core/cp_tags/
Log:



--===============1132198606403965041==--

From jbosscache-commits at lists.jboss.org Tue Jan 22 14:01:11 2008
Content-Type: multipart/mixed; boundary="===============5734615975461099103=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r5195 - in core: tags and 1
 other directory.
Date: Tue, 22 Jan 2008 14:01:11 -0500
Message-ID: <E1JHOMx-0006vA-CS@committer01.frg.pub.inap.atl.jboss.com>

--===============5734615975461099103==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: manik.surtani(a)jboss.com
Date: 2008-01-22 14:01:11 -0500 (Tue, 22 Jan 2008)
New Revision: 5195

Added:
   core/cp_tags/1.4.1.SP8_CP01/
Removed:
   core/tags/1.4.1.SP9/
Log:


Copied: core/cp_tags/1.4.1.SP8_CP01 (from rev 5194, core/tags/1.4.1.SP9)


--===============5734615975461099103==--

From jbosscache-commits at lists.jboss.org Tue Jan 22 14:06:36 2008
Content-Type: multipart/mixed; boundary="===============2854508287351172353=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r5196 - in
 core/cp_tags/1.4.1.SP8_CP01: src/org/jboss/cache and 1 other directory.
Date: Tue, 22 Jan 2008 14:06:36 -0500
Message-ID: <E1JHOSC-00086L-F9@committer01.frg.pub.inap.atl.jboss.com>

--===============2854508287351172353==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: manik.surtani(a)jboss.com
Date: 2008-01-22 14:06:36 -0500 (Tue, 22 Jan 2008)
New Revision: 5196

Modified:
   core/cp_tags/1.4.1.SP8_CP01/build.xml
   core/cp_tags/1.4.1.SP8_CP01/src/org/jboss/cache/Version.java
Log:


Modified: core/cp_tags/1.4.1.SP8_CP01/build.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/cp_tags/1.4.1.SP8_CP01/build.xml	2008-01-22 19:01:11 UTC (rev 5195)
+++ core/cp_tags/1.4.1.SP8_CP01/build.xml	2008-01-22 19:06:36 UTC (rev 5196)
@@ -6,7 +6,7 @@
 =

    <property name=3D"module.name" value=3D"JBossCache"/>
    <!--We now requires version to have no white space since Ant+JBossAop w=
ill sometime choke. -->
-   <property name=3D"module.version" value=3D"1.4.1.SP9"/>
+   <property name=3D"module.version" value=3D"1.4.1.SP8_CP01"/>
    <property name=3D"implementation.url" value=3D"http://www.jboss.com/pro=
ducts/jbosscache"/>
    <property file=3D"build.properties"/>
    <property name=3D"root.dir" value=3D"${basedir}"/>

Modified: core/cp_tags/1.4.1.SP8_CP01/src/org/jboss/cache/Version.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/cp_tags/1.4.1.SP8_CP01/src/org/jboss/cache/Version.java	2008-01-22=
 19:01:11 UTC (rev 5195)
+++ core/cp_tags/1.4.1.SP8_CP01/src/org/jboss/cache/Version.java	2008-01-22=
 19:06:36 UTC (rev 5196)
@@ -10,9 +10,9 @@
  */
 public class Version
 {
-   public static final String version =3D "1.4.1.SP9";
+   public static final String version =3D "1.4.1.SP8_CP01";
    public static final String codename =3D "Cayenne";
-   public static byte[] version_id =3D {'0', '1', '4', '1', 'S', 'P', '9'};
+   public static byte[] version_id =3D {'0', '1', '4', '1', 'S', 'P', '8',=
 'C', 'P', '1'};
    public static final String cvs =3D "$Id$";
 =

    private static final int MAJOR_SHIFT =3D 11;


--===============2854508287351172353==--

From jbosscache-commits at lists.jboss.org Tue Jan 22 14:34:41 2008
Content-Type: multipart/mixed; boundary="===============6898474118094151133=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r5197 - in core/trunk/src:
 main/java/org/jboss/cache/buddyreplication and 5 other directories.
Date: Tue, 22 Jan 2008 14:34:41 -0500
Message-ID: <E1JHOtN-0004d8-2R@committer01.frg.pub.inap.atl.jboss.com>

--===============6898474118094151133==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: manik.surtani(a)jboss.com
Date: 2008-01-22 14:34:40 -0500 (Tue, 22 Jan 2008)
New Revision: 5197

Added:
   core/trunk/src/test/java/org/jboss/cache/transaction/PrepareCommitConten=
tionTest.java
Modified:
   core/trunk/src/main/java/org/jboss/cache/RPCManager.java
   core/trunk/src/main/java/org/jboss/cache/RPCManagerImpl.java
   core/trunk/src/main/java/org/jboss/cache/ReplicationQueue.java
   core/trunk/src/main/java/org/jboss/cache/buddyreplication/BuddyManager.j=
ava
   core/trunk/src/main/java/org/jboss/cache/interceptors/BaseRpcInterceptor=
.java
   core/trunk/src/main/java/org/jboss/cache/interceptors/DataGravitatorInte=
rceptor.java
   core/trunk/src/main/java/org/jboss/cache/interceptors/OptimisticReplicat=
ionInterceptor.java
   core/trunk/src/main/java/org/jboss/cache/interceptors/ReplicationInterce=
ptor.java
   core/trunk/src/main/java/org/jboss/cache/loader/ClusteredCacheLoader.java
   core/trunk/src/test/java/org/jboss/cache/api/pfer/PutForExternalReadTest=
Base.java
   core/trunk/src/test/java/org/jboss/cache/marshall/ReturnValueMarshalling=
Test.java
Log:
JBCACHE-1270 - use OOB messages for 2-phase commit messages

Modified: core/trunk/src/main/java/org/jboss/cache/RPCManager.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/java/org/jboss/cache/RPCManager.java	2008-01-22 19:=
06:36 UTC (rev 5196)
+++ core/trunk/src/main/java/org/jboss/cache/RPCManager.java	2008-01-22 19:=
34:40 UTC (rev 5197)
@@ -43,42 +43,45 @@
    /**
     * Invokes an RPC call on other caches in the cluster.
     *
-    * @param recipients     a list of Addresses to invoke the call on.  If=
 this is null, the call is broadcast to the entire cluster.
-    * @param methodCall     the method call to invoke
-    * @param mode           the group request mode to use.  See {@link org=
.jgroups.blocks.GroupRequest}.
-    * @param excludeSelf    if true, the message is not looped back to the=
 originator.
-    * @param timeout        a timeout after which to throw a replication e=
xception.
-    * @param responseFilter a response filter with which to filter out fai=
led/unwanted/invalid responses.
+    * @param recipients          a list of Addresses to invoke the call on=
.  If this is null, the call is broadcast to the entire cluster.
+    * @param methodCall          the method call to invoke
+    * @param mode                the group request mode to use.  See {@lin=
k org.jgroups.blocks.GroupRequest}.
+    * @param excludeSelf         if true, the message is not looped back t=
o the originator.
+    * @param timeout             a timeout after which to throw a replicat=
ion exception.
+    * @param responseFilter      a response filter with which to filter ou=
t failed/unwanted/invalid responses.
+    * @param useOutOfBandMessage if true, the message is put on JGroups' O=
OB queue.  See JGroups docs for more info.
     * @return a list of responses from each member contacted.
     * @throws Exception in the event of problems.
     */
-   List<Object> callRemoteMethods(List<Address> recipients, MethodCall met=
hodCall, int mode, boolean excludeSelf, long timeout, RspFilter responseFil=
ter) throws Exception;
+   List<Object> callRemoteMethods(List<Address> recipients, MethodCall met=
hodCall, int mode, boolean excludeSelf, long timeout, RspFilter responseFil=
ter, boolean useOutOfBandMessage) throws Exception;
 =

    /**
     * Invokes an RPC call on other caches in the cluster.
     *
-    * @param recipients  a list of Addresses to invoke the call on.  If th=
is is null, the call is broadcast to the entire cluster.
-    * @param methodCall  the method call to invoke
-    * @param mode        the group request mode to use.  See {@link org.jg=
roups.blocks.GroupRequest}.
-    * @param excludeSelf if true, the message is not looped back to the or=
iginator.
-    * @param timeout     a timeout after which to throw a replication exce=
ption.
+    * @param recipients          a list of Addresses to invoke the call on=
.  If this is null, the call is broadcast to the entire cluster.
+    * @param methodCall          the method call to invoke
+    * @param mode                the group request mode to use.  See {@lin=
k org.jgroups.blocks.GroupRequest}.
+    * @param excludeSelf         if true, the message is not looped back t=
o the originator.
+    * @param timeout             a timeout after which to throw a replicat=
ion exception.
+    * @param useOutOfBandMessage if true, the message is put on JGroups' O=
OB queue.  See JGroups docs for more info.
     * @return a list of responses from each member contacted.
     * @throws Exception in the event of problems.
     */
-   List<Object> callRemoteMethods(List<Address> recipients, MethodCall met=
hodCall, int mode, boolean excludeSelf, long timeout) throws Exception;
+   List<Object> callRemoteMethods(List<Address> recipients, MethodCall met=
hodCall, int mode, boolean excludeSelf, long timeout, boolean useOutOfBandM=
essage) throws Exception;
 =

    /**
     * Invokes an RPC call on other caches in the cluster.
     *
-    * @param recipients  a list of Addresses to invoke the call on.  If th=
is is null, the call is broadcast to the entire cluster.
-    * @param methodCall  the method call to invoke
-    * @param synchronous if true, sets group request mode to {@link org.jg=
roups.blocks.GroupRequest#GET_ALL}, and if false sets it to {@link org.jgro=
ups.blocks.GroupRequest#GET_NONE}.
-    * @param excludeSelf if true, the message is not looped back to the or=
iginator.
-    * @param timeout     a timeout after which to throw a replication exce=
ption.
+    * @param recipients          a list of Addresses to invoke the call on=
.  If this is null, the call is broadcast to the entire cluster.
+    * @param methodCall          the method call to invoke
+    * @param synchronous         if true, sets group request mode to {@lin=
k org.jgroups.blocks.GroupRequest#GET_ALL}, and if false sets it to {@link =
org.jgroups.blocks.GroupRequest#GET_NONE}.
+    * @param excludeSelf         if true, the message is not looped back t=
o the originator.
+    * @param timeout             a timeout after which to throw a replicat=
ion exception.
+    * @param useOutOfBandMessage if true, the message is put on JGroups' O=
OB queue.  See JGroups docs for more info.
     * @return a list of responses from each member contacted.
     * @throws Exception in the event of problems.
     */
-   List<Object> callRemoteMethods(List<Address> recipients, MethodCall met=
hodCall, boolean synchronous, boolean excludeSelf, int timeout) throws Exce=
ption;
+   List<Object> callRemoteMethods(List<Address> recipients, MethodCall met=
hodCall, boolean synchronous, boolean excludeSelf, int timeout, boolean use=
OutOfBandMessage) throws Exception;
 =

    /**
     * @return true if the current Channel is the coordinator of the cluste=
r.

Modified: core/trunk/src/main/java/org/jboss/cache/RPCManagerImpl.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/java/org/jboss/cache/RPCManagerImpl.java	2008-01-22=
 19:06:36 UTC (rev 5196)
+++ core/trunk/src/main/java/org/jboss/cache/RPCManagerImpl.java	2008-01-22=
 19:34:40 UTC (rev 5197)
@@ -20,6 +20,7 @@
 import org.jboss.cache.marshall.InactiveRegionAwareRpcDispatcher;
 import org.jboss.cache.marshall.Marshaller;
 import org.jboss.cache.marshall.MethodCall;
+import org.jboss.cache.marshall.MethodDeclarations;
 import org.jboss.cache.notifications.Notifier;
 import org.jboss.cache.remoting.jgroups.CacheMessageListener;
 import org.jboss.cache.statetransfer.StateTransferManager;
@@ -350,17 +351,17 @@
 =

    // ------------ START: RPC call methods ------------
 =

-   public List<Object> callRemoteMethods(List<Address> recipients, MethodC=
all methodCall, int mode, boolean excludeSelf, long timeout) throws Excepti=
on
+   public List<Object> callRemoteMethods(List<Address> recipients, MethodC=
all methodCall, int mode, boolean excludeSelf, long timeout, boolean useOut=
OfBandMessage) throws Exception
    {
-      return callRemoteMethods(recipients, methodCall, mode, excludeSelf, =
timeout, null);
+      return callRemoteMethods(recipients, methodCall, mode, excludeSelf, =
timeout, null, useOutOfBandMessage);
    }
 =

-   public List<Object> callRemoteMethods(List<Address> recipients, MethodC=
all methodCall, boolean synchronous, boolean excludeSelf, int timeout) thro=
ws Exception
+   public List<Object> callRemoteMethods(List<Address> recipients, MethodC=
all methodCall, boolean synchronous, boolean excludeSelf, int timeout, bool=
ean useOutOfBandMessage) throws Exception
    {
-      return callRemoteMethods(recipients, methodCall, synchronous ? Group=
Request.GET_ALL : GroupRequest.GET_NONE, excludeSelf, timeout);
+      return callRemoteMethods(recipients, methodCall, synchronous ? Group=
Request.GET_ALL : GroupRequest.GET_NONE, excludeSelf, timeout, useOutOfBand=
Message);
    }
 =

-   public List<Object> callRemoteMethods(List<Address> recipients, MethodC=
all methodCall, int mode, boolean excludeSelf, long timeout, RspFilter resp=
onseFilter) throws Exception
+   public List<Object> callRemoteMethods(List<Address> recipients, MethodC=
all methodCall, int mode, boolean excludeSelf, long timeout, RspFilter resp=
onseFilter, boolean useOutOfBandMessage) throws Exception
    {
       int modeToUse =3D mode;
       int preferredMode;
@@ -406,8 +407,8 @@
             throw new TimeoutException("State retrieval timed out waiting =
for flush unblock.");
       }
       rsps =3D responseFilter =3D=3D null
-            ? disp.callRemoteMethods(validMembers, methodCall, modeToUse, =
timeout, isUsingBuddyReplication)
-            : disp.callRemoteMethods(validMembers, methodCall, modeToUse, =
timeout, isUsingBuddyReplication, false, responseFilter);
+            ? disp.callRemoteMethods(validMembers, methodCall, modeToUse, =
timeout, isUsingBuddyReplication, useOutOfBandMessage)
+            : disp.callRemoteMethods(validMembers, methodCall, modeToUse, =
timeout, isUsingBuddyReplication, useOutOfBandMessage, responseFilter);
 =

       // a null response is 99% likely to be due to a marshalling problem =
- we throw a NSE, this needs to be changed when
       // JGroups supports http://jira.jboss.com/jira/browse/JGRP-193
@@ -452,6 +453,12 @@
       return retval;
    }
 =

+   private boolean isCommitMethod(MethodCall call)
+   {
+      return call.getMethodId() =3D=3D MethodDeclarations.commitMethod_id =
||
+            (call.getMethodId() =3D=3D MethodDeclarations.replicateMethod_=
id && isCommitMethod((MethodCall) call.getArgs()[0]));
+   }
+
    // ------------ END: RPC call methods ------------
 =

    // ------------ START: Partial state transfer methods ------------

Modified: core/trunk/src/main/java/org/jboss/cache/ReplicationQueue.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/java/org/jboss/cache/ReplicationQueue.java	2008-01-=
22 19:06:36 UTC (rev 5196)
+++ core/trunk/src/main/java/org/jboss/cache/ReplicationQueue.java	2008-01-=
22 19:34:40 UTC (rev 5197)
@@ -157,7 +157,7 @@
          try
          {
             // send to all live nodes in the cluster
-            rpcManager.callRemoteMethods(null, MethodCallFactory.create(Me=
thodDeclarations.replicateAllMethod_id, l), false, true, 5000);
+            rpcManager.callRemoteMethods(null, MethodCallFactory.create(Me=
thodDeclarations.replicateAllMethod_id, l), false, true, 5000, false);
          }
          catch (Throwable t)
          {

Modified: core/trunk/src/main/java/org/jboss/cache/buddyreplication/BuddyMa=
nager.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/java/org/jboss/cache/buddyreplication/BuddyManager.=
java	2008-01-22 19:06:36 UTC (rev 5196)
+++ core/trunk/src/main/java/org/jboss/cache/buddyreplication/BuddyManager.=
java	2008-01-22 19:34:40 UTC (rev 5197)
@@ -1019,7 +1019,7 @@
          }
       }
 =

-      rpcManager.callRemoteMethods(recipients, call, sync, true, config.ge=
tBuddyCommunicationTimeout());
+      rpcManager.callRemoteMethods(recipients, call, sync, true, config.ge=
tBuddyCommunicationTimeout(), false);
    }
 =

 =


Modified: core/trunk/src/main/java/org/jboss/cache/interceptors/BaseRpcInte=
rceptor.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/java/org/jboss/cache/interceptors/BaseRpcIntercepto=
r.java	2008-01-22 19:06:36 UTC (rev 5196)
+++ core/trunk/src/main/java/org/jboss/cache/interceptors/BaseRpcIntercepto=
r.java	2008-01-22 19:34:40 UTC (rev 5197)
@@ -73,6 +73,11 @@
       }
    }
 =

+   protected void replicateCall(InvocationContext ctx, MethodCall call, bo=
olean sync, Option o, boolean useOutOfBandMessage) throws Throwable
+   {
+      replicateCall(ctx, null, call, sync, o, true, useOutOfBandMessage);
+   }
+
    protected void replicateCall(InvocationContext ctx, MethodCall call, bo=
olean sync, Option o) throws Throwable
    {
       replicateCall(ctx, null, call, sync, o);
@@ -80,10 +85,10 @@
 =

    protected void replicateCall(InvocationContext ctx, List<Address> recip=
ients, MethodCall call, boolean sync, Option o) throws Throwable
    {
-      replicateCall(ctx, recipients, call, sync, o, true);
+      replicateCall(ctx, recipients, call, sync, o, true, false);
    }
 =

-   protected void replicateCall(InvocationContext ctx, List<Address> recip=
ients, MethodCall call, boolean sync, Option o, boolean wrapMethodCallInRep=
licateMethod) throws Throwable
+   protected void replicateCall(InvocationContext ctx, List<Address> recip=
ients, MethodCall call, boolean sync, Option o, boolean wrapMethodCallInRep=
licateMethod, boolean useOutOfBandMessage) throws Throwable
    {
 =

       if (trace) log.trace("Broadcasting call " + call + " to recipient li=
st " + recipients);
@@ -123,7 +128,9 @@
                toCall,
                sync, // is synchronised?
                true, // ignore self?
-               (int) syncReplTimeout);
+               (int) syncReplTimeout,
+               useOutOfBandMessage
+         );
          if (trace) log.trace("responses=3D" + rsps);
          if (sync) checkResponses(rsps);
       }

Modified: core/trunk/src/main/java/org/jboss/cache/interceptors/DataGravita=
torInterceptor.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/java/org/jboss/cache/interceptors/DataGravitatorInt=
erceptor.java	2008-01-22 19:06:36 UTC (rev 5196)
+++ core/trunk/src/main/java/org/jboss/cache/interceptors/DataGravitatorInt=
erceptor.java	2008-01-22 19:34:40 UTC (rev 5197)
@@ -262,7 +262,7 @@
       if (transactionMods.containsKey(gtx))
       {
          if (trace) log.trace("Broadcasting commit for gtx " + gtx);
-         replicateCall(ctx, getMembersOutsideBuddyGroup(), MethodCallFacto=
ry.create(MethodDeclarations.commitMethod_id, gtx), syncCommunications, ctx=
.getOptionOverrides());
+         replicateCall(ctx, getMembersOutsideBuddyGroup(), MethodCallFacto=
ry.create(MethodDeclarations.commitMethod_id, gtx), syncCommunications, ctx=
.getOptionOverrides(), true, true);
       }
       else
       {
@@ -310,7 +310,7 @@
          // remove main Fqn
          if (trace) log.trace("Performing cleanup on [" + backup.backupFqn=
 + "]");
          // remove backup Fqn
-         replicateCall(ctx, cache.getMembers(), cleanup, syncCommunication=
s, ctx.getOptionOverrides(), false);
+         replicateCall(ctx, cache.getMembers(), cleanup, syncCommunication=
s, ctx.getOptionOverrides(), false, false);
       }
       else
       {
@@ -335,7 +335,7 @@
       MethodCall dGrav =3D MethodCallFactory.create(MethodDeclarations.dat=
aGravitationMethod_id, fqn, searchSubtrees);
       // doing a GET_ALL is crappy but necessary since JGroups' GET_FIRST =
could return null results from nodes that do
       // not have either the primary OR backup, and stop polling other val=
id nodes.
-      List resps =3D cache.getRPCManager().callRemoteMethods(mbrs, dGrav, =
GroupRequest.GET_ALL, true, buddyManager.getBuddyCommunicationTimeout(), ne=
w ResponseValidityFilter(mbrs, cache.getLocalAddress()));
+      List resps =3D cache.getRPCManager().callRemoteMethods(mbrs, dGrav, =
GroupRequest.GET_ALL, true, buddyManager.getBuddyCommunicationTimeout(), ne=
w ResponseValidityFilter(mbrs, cache.getLocalAddress()), false);
       if (trace)
       {
          log.trace("got responses " + resps);

Modified: core/trunk/src/main/java/org/jboss/cache/interceptors/OptimisticR=
eplicationInterceptor.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/java/org/jboss/cache/interceptors/OptimisticReplica=
tionInterceptor.java	2008-01-22 19:06:36 UTC (rev 5196)
+++ core/trunk/src/main/java/org/jboss/cache/interceptors/OptimisticReplica=
tionInterceptor.java	2008-01-22 19:34:40 UTC (rev 5197)
@@ -217,7 +217,7 @@
             if (log.isDebugEnabled())
                log.debug("running remote commit for " + gtx + " and coord=
=3D" + cache.getLocalAddress());
 =

-            replicateCall(ctx, commit_method, remoteCallSync, ctx.getOptio=
nOverrides());
+            replicateCall(ctx, commit_method, remoteCallSync, ctx.getOptio=
nOverrides(), true);
          }
          catch (Exception e)
          {

Modified: core/trunk/src/main/java/org/jboss/cache/interceptors/Replication=
Interceptor.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/java/org/jboss/cache/interceptors/ReplicationInterc=
eptor.java	2008-01-22 19:06:36 UTC (rev 5196)
+++ core/trunk/src/main/java/org/jboss/cache/interceptors/ReplicationInterc=
eptor.java	2008-01-22 19:34:40 UTC (rev 5197)
@@ -45,7 +45,7 @@
       {
          return nextInterceptor(ctx);
       }
-      replicateCall(ctx, ctx.getMethodCall(), configuration.isSyncCommitPh=
ase(), ctx.getOptionOverrides());
+      replicateCall(ctx, ctx.getMethodCall(), configuration.isSyncCommitPh=
ase(), ctx.getOptionOverrides(), true);
       return nextInterceptor(ctx);
    }
 =


Modified: core/trunk/src/main/java/org/jboss/cache/loader/ClusteredCacheLoa=
der.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/java/org/jboss/cache/loader/ClusteredCacheLoader.ja=
va	2008-01-22 19:06:36 UTC (rev 5196)
+++ core/trunk/src/main/java/org/jboss/cache/loader/ClusteredCacheLoader.ja=
va	2008-01-22 19:34:40 UTC (rev 5197)
@@ -103,7 +103,7 @@
       MethodCall clusteredGet =3D MethodCallFactory.create(MethodDeclarati=
ons.clusteredGetMethod_id, call, false);
       List resps =3D null;
       // JBCACHE-1186
-      resps =3D cache.getRPCManager().callRemoteMethods(mbrs, clusteredGet=
, GroupRequest.GET_ALL, true, config.getTimeout(), new ResponseValidityFilt=
er(mbrs, cache.getLocalAddress()));
+      resps =3D cache.getRPCManager().callRemoteMethods(mbrs, clusteredGet=
, GroupRequest.GET_ALL, true, config.getTimeout(), new ResponseValidityFilt=
er(mbrs, cache.getLocalAddress()), false);
 =

       if (resps =3D=3D null)
       {

Modified: core/trunk/src/test/java/org/jboss/cache/api/pfer/PutForExternalR=
eadTestBase.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/test/java/org/jboss/cache/api/pfer/PutForExternalReadTes=
tBase.java	2008-01-22 19:06:36 UTC (rev 5196)
+++ core/trunk/src/test/java/org/jboss/cache/api/pfer/PutForExternalReadTes=
tBase.java	2008-01-22 19:34:40 UTC (rev 5197)
@@ -177,7 +177,7 @@
       {
          // specify what we expect called on the mock Rpc Manager.  For pa=
rams we don't care about, just use ANYTHING.
          // setting the mock object to expect the "sync" param to be false.
-         expect(rpcManager.callRemoteMethods(anyAddresses(), (MethodCall) =
anyObject(), eq(false), anyBoolean(), anyInt())).andReturn(null);
+         expect(rpcManager.callRemoteMethods(anyAddresses(), (MethodCall) =
anyObject(), eq(false), anyBoolean(), anyInt(), anyBoolean())).andReturn(nu=
ll);
       }
 =

       replay(rpcManager);
@@ -240,7 +240,7 @@
          List<Address> memberList =3D originalRpcManager.getMembers();
          expect(barfingRpcManager.getMembers()).andReturn(memberList).anyT=
imes();
          expect(barfingRpcManager.getLocalAddress()).andReturn(originalRpc=
Manager.getLocalAddress()).anyTimes();
-         expect(barfingRpcManager.callRemoteMethods(anyAddresses(), (Metho=
dCall) anyObject(), anyBoolean(), anyBoolean(), anyInt())).andThrow(new Run=
timeException("Barf!")).anyTimes();
+         expect(barfingRpcManager.callRemoteMethods(anyAddresses(), (Metho=
dCall) anyObject(), anyBoolean(), anyBoolean(), anyInt(), anyBoolean())).an=
dThrow(new RuntimeException("Barf!")).anyTimes();
          replay(barfingRpcManager);
 =

          TestingUtil.extractComponentRegistry(cache1).registerComponent(RP=
CManager.class.getName(), barfingRpcManager, RPCManager.class);

Modified: core/trunk/src/test/java/org/jboss/cache/marshall/ReturnValueMars=
hallingTest.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/test/java/org/jboss/cache/marshall/ReturnValueMarshallin=
gTest.java	2008-01-22 19:06:36 UTC (rev 5196)
+++ core/trunk/src/test/java/org/jboss/cache/marshall/ReturnValueMarshallin=
gTest.java	2008-01-22 19:34:40 UTC (rev 5197)
@@ -97,7 +97,7 @@
             MethodCallFactory.create(MethodDeclarations.getKeyValueMethodL=
ocal_id, fqn, key, false),
             false);
 =

-      List responses =3D cache1.getRPCManager().callRemoteMethods(null, ca=
ll, true, true, 15000);
+      List responses =3D cache1.getRPCManager().callRemoteMethods(null, ca=
ll, true, true, 15000, false);
       List response1 =3D (List) responses.get(0);// response from the firs=
t (and only) node
 =

       Boolean found =3D (Boolean) response1.get(0);
@@ -127,7 +127,7 @@
       MethodCall call =3D MethodCallFactory.create(MethodDeclarations.data=
GravitationMethod_id,
             fqn, false);
 =

-      List responses =3D cache1.getRPCManager().callRemoteMethods(null, ca=
ll, true, true, 15000);
+      List responses =3D cache1.getRPCManager().callRemoteMethods(null, ca=
ll, true, true, 15000, false);
       GravitateResult data =3D (GravitateResult) responses.get(0);// respo=
nse from the first (and only) node
 =

       assertTrue("Should have found remote data", data.isDataFound());

Added: core/trunk/src/test/java/org/jboss/cache/transaction/PrepareCommitCo=
ntentionTest.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/test/java/org/jboss/cache/transaction/PrepareCommitConte=
ntionTest.java	                        (rev 0)
+++ core/trunk/src/test/java/org/jboss/cache/transaction/PrepareCommitConte=
ntionTest.java	2008-01-22 19:34:40 UTC (rev 5197)
@@ -0,0 +1,208 @@
+package org.jboss.cache.transaction;
+
+import org.jboss.cache.CacheSPI;
+import org.jboss.cache.DefaultCacheFactory;
+import org.jboss.cache.RPCManager;
+import org.jboss.cache.RPCManagerImpl;
+import org.jboss.cache.config.Configuration;
+import org.jboss.cache.factories.ComponentRegistry;
+import org.jboss.cache.marshall.MethodCall;
+import org.jboss.cache.marshall.MethodDeclarations;
+import org.jboss.cache.misc.TestingUtil;
+import org.jgroups.Address;
+import org.jgroups.blocks.GroupRequest;
+import org.jgroups.blocks.RspFilter;
+import org.testng.annotations.AfterMethod;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.Test;
+
+import javax.transaction.TransactionManager;
+import java.util.Collections;
+import java.util.List;
+import java.util.concurrent.CountDownLatch;
+
+/**
+ * This is to test the scenario described in http://jira.jboss.org/jira/br=
owse/JBCACHE-1270
+ * <p/>
+ * i) Node A sends prepare for GTX1; synchronous. Gets applied on Node B. =
Locks are held on B.
+ * ii) Node A sends commit for GTX1; *asynchronous*.
+ * iii) Node A sends lots of other messages related to other sessions.
+ * iv) Node A sends prepare for GTX2; synchronous.
+ * v) Node B is busy, and by luck the GTX2 prepare gets to UNICAST before =
the GTX1 commit.
+ * vi) GTX2 prepare blocks due to locks from GTX1.
+ * vii) GTX1 commit is blocked in UNICAST because another thread from Node=
 A is executing.
+ *
+ * @author Manik Surtani (<a href=3D"mailto:manik(a)jboss.org">manik(a)jbo=
ss.org</a>)
+ * @since 2.1.0
+ */
+(a)Test(groups =3D "functional")
+public class PrepareCommitContentionTest
+{
+   CacheSPI<Object, Object> c1, c2;
+
+   @BeforeMethod
+   public void setUp() throws CloneNotSupportedException
+   {
+      c1 =3D (CacheSPI<Object, Object>) new DefaultCacheFactory<Object, Ob=
ject>().createCache(false);
+      c1.getConfiguration().setCacheMode(Configuration.CacheMode.REPL_SYNC=
);
+      c1.getConfiguration().setTransactionManagerLookupClass(DummyTransact=
ionManagerLookup.class.getName());
+      c1.getConfiguration().setLockAcquisitionTimeout(5000);
+      c2 =3D (CacheSPI<Object, Object>) new DefaultCacheFactory<Object, Ob=
ject>().createCache(c1.getConfiguration().clone(), false);
+   }
+
+   @AfterMethod
+   public void tearDown()
+   {
+      TestingUtil.killCaches(c1, c2);
+   }
+
+   public void testWithSyncCommitPhase() throws Exception
+   {
+      doTest(true, false);
+   }
+
+   public void testWithDefautCommitPhase() throws Exception
+   {
+      doTest(false, false);
+   }
+
+   public void testControl() throws Exception
+   {
+      try
+      {
+         doTest(false, true);
+         assert false : "Should fail if we don't use out of band messages =
for non-sync commits";
+      }
+      catch (AssertionError expected)
+      {
+         // should fail
+      }
+   }
+
+   private void doTest(final boolean syncCommit, boolean noOutOfBandMessag=
es) throws Exception
+   {
+      c1.getConfiguration().setSyncCommitPhase(syncCommit);
+      c2.getConfiguration().setSyncCommitPhase(syncCommit);
+
+      final CountDownLatch mainThreadCommitLatch =3D new CountDownLatch(1);
+      final CountDownLatch secondThreadPrepareLatch =3D new CountDownLatch=
(1);
+
+      DelayingRPCManager delayingRPCManager =3D new DelayingRPCManager(mai=
nThreadCommitLatch, secondThreadPrepareLatch, syncCommit, noOutOfBandMessag=
es);
+      ComponentRegistry cr =3D TestingUtil.extractComponentRegistry(c1);
+      cr.registerComponent(RPCManager.class.getName(), delayingRPCManager,=
 RPCManager.class);
+
+      c1.start();
+      c2.start();
+
+      TestingUtil.blockUntilViewsReceived(60000, c1, c2);
+
+      TransactionManager tm =3D c1.getTransactionManager();
+
+      Thread secondTransaction =3D new Thread("SecondThread")
+      {
+         public void run()
+         {
+            // wait until thread1 finishes the prepare.
+            try
+            {
+               secondThreadPrepareLatch.await();
+            }
+            catch (InterruptedException e)
+            {
+               // do nothing
+            }
+
+            try
+            {
+               // now replicate a put on a DIFFERENT node so there is no l=
ock contention
+               TransactionManager tm =3D c1.getTransactionManager();
+               if (syncCommit)
+                  mainThreadCommitLatch.countDown(); // we need to release=
 the main thread commit latch first otherwise it will deadlock!
+
+               tm.begin();
+               c1.put("/a/b/c", "k", "v2");
+               tm.commit();
+            }
+            catch (Exception e)
+            {
+               e.printStackTrace();
+            }
+         }
+      };
+      secondTransaction.start();
+
+
+      tm.begin();
+      c1.put("/a/b/c", "k", "v");
+      tm.commit();
+
+      secondTransaction.join();
+
+      // now assert that both transactions have succeeded
+      assert c1.get("/a/b/c", "k").equals("v2");
+      assert c2.get("/a/b/c", "k").equals("v2");
+   }
+
+   public static class DelayingRPCManager extends RPCManagerImpl
+   {
+      CountDownLatch mainThreadLatch, secondThreadLatch;
+      boolean syncCommit;
+      boolean noOOBMessages =3D false;
+
+      public DelayingRPCManager(CountDownLatch latch1, CountDownLatch latc=
h2, boolean syncCommit, boolean noOOBMessages)
+      {
+         mainThreadLatch =3D latch1;
+         secondThreadLatch =3D latch2;
+         this.syncCommit =3D syncCommit;
+         this.noOOBMessages =3D noOOBMessages;
+      }
+
+      @Override
+      public List<Object> callRemoteMethods(final List<Address> recipients=
, final MethodCall methodCall, final int mode, final boolean excludeSelf, f=
inal long timeout, final RspFilter responseFilter, final boolean oob) throw=
s Exception
+      {
+         if (isPrepareMethod(methodCall) && Thread.currentThread().getName=
().equals("SecondThread"))
+         {
+            if (!syncCommit) mainThreadLatch.countDown();
+         }
+         else if (isCommitMethod(methodCall) && !Thread.currentThread().ge=
tName().equals("SecondThread"))
+         {
+            Thread th =3D new Thread()
+            {
+               public void run()
+               {
+                  try
+                  {
+                     secondThreadLatch.countDown(); // let the 2nd thread =
start it's prepapre
+                     mainThreadLatch.await(); // and block arbitrarily unt=
il
+                     Thread.sleep(1000);
+                     DelayingRPCManager.super.callRemoteMethods(recipients=
, methodCall, mode, excludeSelf, timeout, responseFilter, !noOOBMessages &&=
 oob);
+                  }
+                  catch (Exception e)
+                  {
+                     e.printStackTrace();
+                  }
+               }
+            };
+            th.start();
+            if (mode =3D=3D GroupRequest.GET_ALL) // sync mode!
+            {
+               th.join();
+            }
+            return Collections.emptyList();
+         }
+         return super.callRemoteMethods(recipients, methodCall, mode, excl=
udeSelf, timeout, responseFilter, !noOOBMessages && oob);
+      }
+
+      private boolean isCommitMethod(MethodCall call)
+      {
+         return call.getMethodId() =3D=3D MethodDeclarations.commitMethod_=
id ||
+               (call.getMethodId() =3D=3D MethodDeclarations.replicateMeth=
od_id && isCommitMethod((MethodCall) call.getArgs()[0]));
+      }
+
+      private boolean isPrepareMethod(MethodCall call)
+      {
+         return call.getMethodId() =3D=3D MethodDeclarations.prepareMethod=
_id ||
+               (call.getMethodId() =3D=3D MethodDeclarations.replicateMeth=
od_id && isPrepareMethod((MethodCall) call.getArgs()[0]));
+      }
+   }
+}


--===============6898474118094151133==--

From jbosscache-commits at lists.jboss.org Tue Jan 22 14:46:29 2008
Content-Type: multipart/mixed; boundary="===============7988878164731804648=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r5198 -
 core/trunk/src/test/java/org/jboss/cache/transaction.
Date: Tue, 22 Jan 2008 14:46:29 -0500
Message-ID: <E1JHP4n-0007VN-0d@committer01.frg.pub.inap.atl.jboss.com>

--===============7988878164731804648==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: manik.surtani(a)jboss.com
Date: 2008-01-22 14:46:28 -0500 (Tue, 22 Jan 2008)
New Revision: 5198

Modified:
   core/trunk/src/test/java/org/jboss/cache/transaction/PrepareCommitConten=
tionTest.java
Log:
JBCACHE-1270 - use OOB messages for 2-phase commit messages

Modified: core/trunk/src/test/java/org/jboss/cache/transaction/PrepareCommi=
tContentionTest.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/test/java/org/jboss/cache/transaction/PrepareCommitConte=
ntionTest.java	2008-01-22 19:34:40 UTC (rev 5197)
+++ core/trunk/src/test/java/org/jboss/cache/transaction/PrepareCommitConte=
ntionTest.java	2008-01-22 19:46:28 UTC (rev 5198)
@@ -2,6 +2,7 @@
 =

 import org.jboss.cache.CacheSPI;
 import org.jboss.cache.DefaultCacheFactory;
+import org.jboss.cache.Fqn;
 import org.jboss.cache.RPCManager;
 import org.jboss.cache.RPCManagerImpl;
 import org.jboss.cache.config.Configuration;
@@ -10,7 +11,6 @@
 import org.jboss.cache.marshall.MethodDeclarations;
 import org.jboss.cache.misc.TestingUtil;
 import org.jgroups.Address;
-import org.jgroups.blocks.GroupRequest;
 import org.jgroups.blocks.RspFilter;
 import org.testng.annotations.AfterMethod;
 import org.testng.annotations.BeforeMethod;
@@ -86,6 +86,7 @@
 =

       final CountDownLatch mainThreadCommitLatch =3D new CountDownLatch(1);
       final CountDownLatch secondThreadPrepareLatch =3D new CountDownLatch=
(1);
+      final Fqn fqn =3D Fqn.fromString("/a/b/c");
 =

       DelayingRPCManager delayingRPCManager =3D new DelayingRPCManager(mai=
nThreadCommitLatch, secondThreadPrepareLatch, syncCommit, noOutOfBandMessag=
es);
       ComponentRegistry cr =3D TestingUtil.extractComponentRegistry(c1);
@@ -114,13 +115,13 @@
 =

             try
             {
-               // now replicate a put on a DIFFERENT node so there is no l=
ock contention
+               // now replicate a put on the SAME node so there is lock co=
ntention
                TransactionManager tm =3D c1.getTransactionManager();
                if (syncCommit)
                   mainThreadCommitLatch.countDown(); // we need to release=
 the main thread commit latch first otherwise it will deadlock!
 =

                tm.begin();
-               c1.put("/a/b/c", "k", "v2");
+               c1.put(fqn, "k", "v2");
                tm.commit();
             }
             catch (Exception e)
@@ -133,14 +134,14 @@
 =

 =

       tm.begin();
-      c1.put("/a/b/c", "k", "v");
+      c1.put(fqn, "k", "v");
       tm.commit();
 =

       secondTransaction.join();
 =

       // now assert that both transactions have succeeded
-      assert c1.get("/a/b/c", "k").equals("v2");
-      assert c2.get("/a/b/c", "k").equals("v2");
+      assert c1.get(fqn, "k").equals("v2");
+      assert c2.get(fqn, "k").equals("v2");
    }
 =

    public static class DelayingRPCManager extends RPCManagerImpl
@@ -172,8 +173,8 @@
                {
                   try
                   {
-                     secondThreadLatch.countDown(); // let the 2nd thread =
start it's prepapre
-                     mainThreadLatch.await(); // and block arbitrarily unt=
il
+                     secondThreadLatch.countDown(); // let the secondTrans=
action start it's prepapre
+                     mainThreadLatch.await(); // and block arbitrarily unt=
il the secondTransaction informs us to proceed
                      Thread.sleep(1000);
                      DelayingRPCManager.super.callRemoteMethods(recipients=
, methodCall, mode, excludeSelf, timeout, responseFilter, !noOOBMessages &&=
 oob);
                   }
@@ -184,10 +185,8 @@
                }
             };
             th.start();
-            if (mode =3D=3D GroupRequest.GET_ALL) // sync mode!
-            {
-               th.join();
-            }
+            if (syncCommit) th.join();
+
             return Collections.emptyList();
          }
          return super.callRemoteMethods(recipients, methodCall, mode, excl=
udeSelf, timeout, responseFilter, !noOOBMessages && oob);


--===============7988878164731804648==--

From jbosscache-commits at lists.jboss.org Tue Jan 22 15:45:06 2008
Content-Type: multipart/mixed; boundary="===============4040516389507376945=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r5199 -
 core/trunk/src/main/docbook/faq/en.
Date: Tue, 22 Jan 2008 15:45:06 -0500
Message-ID: <E1JHPzW-00035e-6B@committer01.frg.pub.inap.atl.jboss.com>

--===============4040516389507376945==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: manik.surtani(a)jboss.com
Date: 2008-01-22 15:45:06 -0500 (Tue, 22 Jan 2008)
New Revision: 5199

Modified:
   core/trunk/src/main/docbook/faq/en/master.xml
Log:
Added some FAQs

Modified: core/trunk/src/main/docbook/faq/en/master.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/docbook/faq/en/master.xml	2008-01-22 19:46:28 UTC (=
rev 5198)
+++ core/trunk/src/main/docbook/faq/en/master.xml	2008-01-22 20:45:06 UTC (=
rev 5199)
@@ -1,7 +1,7 @@
 <?xml version=3D"1.0" encoding=3D"UTF-8"?>
 <!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"
-        "../../../../docbook-support/support/docbook-dtd/docbookx.dtd"
-        >
+      "../../../../docbook-support/support/docbook-dtd/docbookx.dtd"
+      >
 <book lang=3D"en">
    <bookinfo>
       <title>Frequently Asked Questions about JBoss Cache</title>
@@ -260,7 +260,10 @@
                <para>How can I migrate my application and configuration fr=
om using JBoss Cache 1.x to 2.x?</para>
             </question>
             <answer>
-               <para>Look at <ulink url=3D"http://wiki.jboss.org/wiki/Wiki=
.jsp?page=3DJBossCache200Migration">this wiki page</ulink> for help.</para>
+               <para>Look at
+                  <ulink url=3D"http://wiki.jboss.org/wiki/Wiki.jsp?page=
=3DJBossCache200Migration">this wiki page</ulink>
+                  for help.
+               </para>
             </answer>
          </qandaentry>
 =

@@ -272,7 +275,7 @@
             <answer>
                <para>Please report any bugs or problems to
                   <ulink
-                          url=3D"http://www.jboss.org/index.html?module=3D=
bb&amp;op=3Dviewforum&amp;f=3D157">JBoss Cache
+                        url=3D"http://www.jboss.org/index.html?module=3Dbb=
&amp;op=3Dviewforum&amp;f=3D157">JBoss Cache
                      User Forum
                   </ulink>
                   .
@@ -1521,7 +1524,7 @@
                   distribute your product with BdbjeCacheLoader, you have =
to purchase
                   a commercial license from Oracle. See details at
                   <ulink
-                          url=3D"http://www.sleepycat.com/jeforjbosscache"=
>http://www.sleepycat.com/jeforjbosscache
+                        url=3D"http://www.sleepycat.com/jeforjbosscache">h=
ttp://www.sleepycat.com/jeforjbosscache
                   </ulink>
                   .
                </para>
@@ -1530,6 +1533,39 @@
 =

          <qandaentry>
             <question>
+               <para>Are there any tools available to monitor the Berkeley=
 DB instance?</para>
+            </question>
+
+            <answer>
+               <para>
+                  Yes. Oracle ships a JMX-based monitoring tool, called
+                  <ulink
+                        url=3D"http://www.oracle.com/technology/documentat=
ion/berkeley-db/je/java/com/sleepycat/je/jmx/JEMonitor.html">
+                     JEMonitor
+                  </ulink>
+                  which can be downloaded from the Oracle website.
+               </para>
+            </answer>
+         </qandaentry>
+
+         <qandaentry>
+            <question>
+               <para>When tuning my Berkeley DB instance, where should I p=
ut my je.properties file?</para>
+            </question>
+
+            <answer>
+               <para>
+                  <literal>je.properties</literal>
+                  should reside in your Berkeley DB home directory. This i=
s the directory you pass
+                  in to the BDBJECacheLoader's
+                  <literal>location</literal>
+                  configuration property.
+               </para>
+            </answer>
+         </qandaentry>
+
+         <qandaentry>
+            <question>
                <para>Can I use more than one cache loader?</para>
             </question>
 =

@@ -1560,6 +1596,26 @@
             </answer>
          </qandaentry>
 =

+         <qandaentry>
+            <question>
+               <para>
+                  Is the TCPDelegatingCacheLoader resilient to TCPCacheSer=
ver restarts?
+               </para>
+            </question>
+
+            <answer>
+               <para>
+                  As of JBoss Cache 2.1.0, the answer is yes. See the User=
 Guide for details on how to configure and
+                  tune
+                  your retries and wait period for reestablishing the TCP =
connection.
+               </para>
+               <para>
+                  Prior to that, restarting the TCPCacheServer would also =
mean
+                  restarting your application that uses the cache.
+               </para>
+            </answer>
+         </qandaentry>
+
       </qandaset>
    </chapter>
    <chapter id=3D"troubleshooting">


--===============4040516389507376945==--

From jbosscache-commits at lists.jboss.org Wed Jan 23 08:22:46 2008
Content-Type: multipart/mixed; boundary="===============1737831949478407038=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r5200 -
 core/trunk/src/main/java/org/jboss/cache.
Date: Wed, 23 Jan 2008 08:22:45 -0500
Message-ID: <E1JHfYz-00087E-6O@committer01.frg.pub.inap.atl.jboss.com>

--===============1737831949478407038==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: manik.surtani(a)jboss.com
Date: 2008-01-23 08:22:45 -0500 (Wed, 23 Jan 2008)
New Revision: 5200

Modified:
   core/trunk/src/main/java/org/jboss/cache/RPCManagerImpl.java
Log:
Added some logging for OOB messages

Modified: core/trunk/src/main/java/org/jboss/cache/RPCManagerImpl.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/java/org/jboss/cache/RPCManagerImpl.java	2008-01-22=
 20:45:06 UTC (rev 5199)
+++ core/trunk/src/main/java/org/jboss/cache/RPCManagerImpl.java	2008-01-23=
 13:22:45 UTC (rev 5200)
@@ -399,13 +399,17 @@
          return null;
       }
 =

-      if (trace) log.trace("callRemoteMethods(): valid members are " + val=
idMembers + " methods: " + methodCall);
+      if (trace)
+         log.trace("callRemoteMethods(): valid members are " + validMember=
s + " methods: " + methodCall + " Using OOB? " + useOutOfBandMessage);
 =

       if (channel.flushSupported())
       {
          if (!flushBlockGate.await(configuration.getStateRetrievalTimeout(=
)))
             throw new TimeoutException("State retrieval timed out waiting =
for flush unblock.");
       }
+
+//      useOutOfBandMessage =3D false;
+
       rsps =3D responseFilter =3D=3D null
             ? disp.callRemoteMethods(validMembers, methodCall, modeToUse, =
timeout, isUsingBuddyReplication, useOutOfBandMessage)
             : disp.callRemoteMethods(validMembers, methodCall, modeToUse, =
timeout, isUsingBuddyReplication, useOutOfBandMessage, responseFilter);


--===============1737831949478407038==--

From jbosscache-commits at lists.jboss.org Wed Jan 23 08:23:23 2008
Content-Type: multipart/mixed; boundary="===============7999283010044346496=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r5201 -
 core/trunk/src/main/java/org/jboss/cache/interceptors.
Date: Wed, 23 Jan 2008 08:23:23 -0500
Message-ID: <E1JHfZb-00089P-4x@committer01.frg.pub.inap.atl.jboss.com>

--===============7999283010044346496==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: manik.surtani(a)jboss.com
Date: 2008-01-23 08:23:22 -0500 (Wed, 23 Jan 2008)
New Revision: 5201

Modified:
   core/trunk/src/main/java/org/jboss/cache/interceptors/OptimisticReplicat=
ionInterceptor.java
Log:
JBCACHE-1270 Optimistic commits dont need to use OOB messages since O/L gua=
rantees non-blocking reads.

Modified: core/trunk/src/main/java/org/jboss/cache/interceptors/OptimisticR=
eplicationInterceptor.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/java/org/jboss/cache/interceptors/OptimisticReplica=
tionInterceptor.java	2008-01-23 13:22:45 UTC (rev 5200)
+++ core/trunk/src/main/java/org/jboss/cache/interceptors/OptimisticReplica=
tionInterceptor.java	2008-01-23 13:23:22 UTC (rev 5201)
@@ -217,7 +217,8 @@
             if (log.isDebugEnabled())
                log.debug("running remote commit for " + gtx + " and coord=
=3D" + cache.getLocalAddress());
 =

-            replicateCall(ctx, commit_method, remoteCallSync, ctx.getOptio=
nOverrides(), true);
+            // for an optimistic commit we don't need to force an OOB mess=
age since O/L means we have non-blocking reads.
+            replicateCall(ctx, commit_method, remoteCallSync, ctx.getOptio=
nOverrides(), false);
          }
          catch (Exception e)
          {


--===============7999283010044346496==--

From jbosscache-commits at lists.jboss.org Wed Jan 23 11:42:36 2008
Content-Type: multipart/mixed; boundary="===============5764586218737635514=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r5202 -
 core/trunk/src/main/java/org/jboss/cache/jmx.
Date: Wed, 23 Jan 2008 11:42:36 -0500
Message-ID: <E1JHigO-0006OS-FN@committer01.frg.pub.inap.atl.jboss.com>

--===============5764586218737635514==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: manik.surtani(a)jboss.com
Date: 2008-01-23 11:42:36 -0500 (Wed, 23 Jan 2008)
New Revision: 5202

Modified:
   core/trunk/src/main/java/org/jboss/cache/jmx/CacheJmxWrapper.java
Log:
Deprecated old config element

Modified: core/trunk/src/main/java/org/jboss/cache/jmx/CacheJmxWrapper.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/java/org/jboss/cache/jmx/CacheJmxWrapper.java	2008-=
01-23 13:23:22 UTC (rev 5201)
+++ core/trunk/src/main/java/org/jboss/cache/jmx/CacheJmxWrapper.java	2008-=
01-23 16:42:36 UTC (rev 5202)
@@ -349,6 +349,7 @@
       return getConfiguration().getTransactionManagerLookupClass();
    }
 =

+   @Deprecated
    public boolean getUseRegionBasedMarshalling()
    {
       return getConfiguration().isUseRegionBasedMarshalling();


--===============5764586218737635514==--

From jbosscache-commits at lists.jboss.org Wed Jan 23 11:43:44 2008
Content-Type: multipart/mixed; boundary="===============8374644169701090205=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r5203 -
 core/trunk/src/main/java/org/jboss/cache/jmx.
Date: Wed, 23 Jan 2008 11:43:44 -0500
Message-ID: <E1JHihU-0006Og-Eq@committer01.frg.pub.inap.atl.jboss.com>

--===============8374644169701090205==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: manik.surtani(a)jboss.com
Date: 2008-01-23 11:43:44 -0500 (Wed, 23 Jan 2008)
New Revision: 5203

Modified:
   core/trunk/src/main/java/org/jboss/cache/jmx/CacheJmxWrapper.java
Log:
New cfg element

Modified: core/trunk/src/main/java/org/jboss/cache/jmx/CacheJmxWrapper.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/java/org/jboss/cache/jmx/CacheJmxWrapper.java	2008-=
01-23 16:42:36 UTC (rev 5202)
+++ core/trunk/src/main/java/org/jboss/cache/jmx/CacheJmxWrapper.java	2008-=
01-23 16:43:44 UTC (rev 5203)
@@ -355,6 +355,11 @@
       return getConfiguration().isUseRegionBasedMarshalling();
    }
 =

+   public boolean isUseLazyDeserialization()
+   {
+      return getConfiguration().isUseLazyDeserialization();
+   }
+
    public boolean getUseReplQueue()
    {
       return getConfiguration().isUseReplQueue();


--===============8374644169701090205==--

From jbosscache-commits at lists.jboss.org Wed Jan 23 12:08:04 2008
Content-Type: multipart/mixed; boundary="===============3940853691469972817=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r5204 -
 core/trunk/src/test/java/org/jboss/cache/optimistic.
Date: Wed, 23 Jan 2008 12:08:03 -0500
Message-ID: <E1JHj51-00034s-Pe@committer01.frg.pub.inap.atl.jboss.com>

--===============3940853691469972817==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: manik.surtani(a)jboss.com
Date: 2008-01-23 12:08:03 -0500 (Wed, 23 Jan 2008)
New Revision: 5204

Modified:
   core/trunk/src/test/java/org/jboss/cache/optimistic/AbstractOptimisticTe=
stCase.java
Log:
Updated to use indirection to get transaction manager based on environment =
settings

Modified: core/trunk/src/test/java/org/jboss/cache/optimistic/AbstractOptim=
isticTestCase.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/test/java/org/jboss/cache/optimistic/AbstractOptimisticT=
estCase.java	2008-01-23 16:43:44 UTC (rev 5203)
+++ core/trunk/src/test/java/org/jboss/cache/optimistic/AbstractOptimisticT=
estCase.java	2008-01-23 17:08:03 UTC (rev 5204)
@@ -9,6 +9,7 @@
 import org.jboss.cache.Fqn;
 import org.jboss.cache.config.CacheLoaderConfig;
 import org.jboss.cache.config.Configuration;
+import org.jboss.cache.factories.UnitTestCacheConfigurationFactory;
 import org.jboss.cache.factories.XmlConfigurationParser;
 import org.jboss.cache.interceptors.CacheMgmtInterceptor;
 import org.jboss.cache.interceptors.CallInterceptor;
@@ -59,11 +60,9 @@
 =

    protected CacheSPI<Object, Object> createCacheUnstarted(boolean optimis=
tic) throws Exception
    {
-      CacheSPI<Object, Object> cache =3D (CacheSPI<Object, Object>) new De=
faultCacheFactory().createCache(false);
-      if (optimistic) cache.getConfiguration().setNodeLockingScheme("OPTIM=
ISTIC");
 =

-      cache.getConfiguration().setTransactionManagerLookupClass(DummyTrans=
actionManagerLookup.class.getName());
-      cache.getConfiguration().setCacheMode(Configuration.CacheMode.LOCAL);
+      CacheSPI<Object, Object> cache =3D (CacheSPI<Object, Object>) new De=
faultCacheFactory<Object, Object>().createCache(UnitTestCacheConfigurationF=
actory.createConfiguration(Configuration.CacheMode.LOCAL), false);
+      if (optimistic) cache.getConfiguration().setNodeLockingScheme("OPTIM=
ISTIC");
       return cache;
    }
 =



--===============3940853691469972817==--

From jbosscache-commits at lists.jboss.org Wed Jan 23 12:08:29 2008
Content-Type: multipart/mixed; boundary="===============4350458522834578909=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r5205 -
 core/trunk/src/test/java/org/jboss/cache/optimistic.
Date: Wed, 23 Jan 2008 12:08:29 -0500
Message-ID: <E1JHj5R-00036W-1P@committer01.frg.pub.inap.atl.jboss.com>

--===============4350458522834578909==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: manik.surtani(a)jboss.com
Date: 2008-01-23 12:08:28 -0500 (Wed, 23 Jan 2008)
New Revision: 5205

Modified:
   core/trunk/src/test/java/org/jboss/cache/optimistic/OptimisticWithCacheL=
oaderTest.java
Log:
Added a test method and added this test to the 'transaction' group

Modified: core/trunk/src/test/java/org/jboss/cache/optimistic/OptimisticWit=
hCacheLoaderTest.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/test/java/org/jboss/cache/optimistic/OptimisticWithCache=
LoaderTest.java	2008-01-23 17:08:03 UTC (rev 5204)
+++ core/trunk/src/test/java/org/jboss/cache/optimistic/OptimisticWithCache=
LoaderTest.java	2008-01-23 17:08:28 UTC (rev 5205)
@@ -19,7 +19,7 @@
  *
  * @author Manik Surtani (<a href=3D"mailto:manik(a)jboss.org">manik(a)jbo=
ss.org</a>)
  */
-(a)Test(groups =3D "functional")
+(a)Test(groups =3D {"functional", "transaction"})
 public class OptimisticWithCacheLoaderTest extends AbstractOptimisticTestC=
ase
 {
 =

@@ -124,6 +124,38 @@
       loader.remove(fqn);
    }
 =

+
+   public void testCacheStoringImplicitTx() throws Exception
+   {
+      CacheSPI<Object, Object> cache =3D createCacheWithLoader();
+      CacheLoader loader =3D cache.getCacheLoaderManager().getCacheLoader(=
);
+
+      // test the cache ...
+      DummyTransactionManager mgr =3D DummyTransactionManager.getInstance(=
);
+      assertNull(mgr.getTransaction());
+      cache.put(fqn, key, value);
+
+      assertEquals(value, cache.get(fqn, key));
+
+      //now lets see if the state has been persisted in the cache loader
+      assertEquals(value, loader.get(fqn).get(key));
+
+
+      cache.removeNode(fqn);
+
+      assertNull(cache.get(fqn, key));
+      //now lets see if the state has been persisted in the cache loader
+      assertNull(loader.get(fqn));
+
+      cache.put(fqn, key, value);
+
+      assertEquals(value, cache.get(fqn, key));
+      assertEquals(value, loader.get(fqn).get(key));
+
+      // clean up loader
+      loader.remove(fqn);
+   }
+
    public void testCacheLoading() throws Exception
    {
       CacheSPI<Object, Object> cache =3D createCacheWithLoader();


--===============4350458522834578909==--

From jbosscache-commits at lists.jboss.org Wed Jan 23 12:14:58 2008
Content-Type: multipart/mixed; boundary="===============8822361980091145723=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r5206 -
 core/trunk/src/test/java/org/jboss/cache/optimistic.
Date: Wed, 23 Jan 2008 12:14:55 -0500
Message-ID: <E1JHjBf-0004fR-Vj@committer01.frg.pub.inap.atl.jboss.com>

--===============8822361980091145723==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: manik.surtani(a)jboss.com
Date: 2008-01-23 12:14:55 -0500 (Wed, 23 Jan 2008)
New Revision: 5206

Modified:
   core/trunk/src/test/java/org/jboss/cache/optimistic/OptimisticWithCacheL=
oaderTest.java
Log:
Removed all direct refs to DummyTM

Modified: core/trunk/src/test/java/org/jboss/cache/optimistic/OptimisticWit=
hCacheLoaderTest.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/test/java/org/jboss/cache/optimistic/OptimisticWithCache=
LoaderTest.java	2008-01-23 17:08:28 UTC (rev 5205)
+++ core/trunk/src/test/java/org/jboss/cache/optimistic/OptimisticWithCache=
LoaderTest.java	2008-01-23 17:14:55 UTC (rev 5206)
@@ -8,11 +8,11 @@
 =

 import org.jboss.cache.CacheSPI;
 import org.jboss.cache.loader.CacheLoader;
-import org.jboss.cache.transaction.DummyTransactionManager;
 import static org.testng.AssertJUnit.*;
 import org.testng.annotations.Test;
 =

 import javax.transaction.Transaction;
+import javax.transaction.TransactionManager;
 =

 /**
  * Tests optimistic locking with cache loaders
@@ -46,7 +46,7 @@
          CacheSPI<Object, Object> cache =3D createCacheWithLoader();
          loader =3D cache.getCacheLoaderManager().getCacheLoader();
 =

-         DummyTransactionManager mgr =3D DummyTransactionManager.getInstan=
ce();
+         TransactionManager mgr =3D cache.getTransactionManager();
          Transaction tx;
 =

          // make sure the fqn is not in cache
@@ -84,7 +84,7 @@
       CacheLoader loader =3D cache.getCacheLoaderManager().getCacheLoader(=
);
 =

       // test the cache ...
-      DummyTransactionManager mgr =3D DummyTransactionManager.getInstance(=
);
+      TransactionManager mgr =3D cache.getTransactionManager();
       assertNull(mgr.getTransaction());
       mgr.begin();
       cache.put(fqn, key, value);
@@ -131,7 +131,7 @@
       CacheLoader loader =3D cache.getCacheLoaderManager().getCacheLoader(=
);
 =

       // test the cache ...
-      DummyTransactionManager mgr =3D DummyTransactionManager.getInstance(=
);
+      TransactionManager mgr =3D cache.getTransactionManager();
       assertNull(mgr.getTransaction());
       cache.put(fqn, key, value);
 =

@@ -186,7 +186,7 @@
       CacheLoader loader2 =3D cache2.getCacheLoaderManager().getCacheLoade=
r();
 =

       // test the cache ...
-      DummyTransactionManager mgr =3D DummyTransactionManager.getInstance(=
);
+      TransactionManager mgr =3D cache1.getTransactionManager();
       assertNull(mgr.getTransaction());
 =

       mgr.begin();
@@ -210,7 +210,7 @@
       assertEquals(value, cache2.get(fqn, key));
 =

       // cache2 removes entry
-      mgr.begin();
+      cache2.getTransactionManager().begin();
       cache2.removeNode(fqn);
       assertNull(cache2.get(fqn, key));
       // test that loader1, loader2 and cache2 have the entry
@@ -219,7 +219,7 @@
       assertEquals(value, loader2.get(fqn).get(key));
 =

       // commit
-      mgr.commit();
+      cache2.getTransactionManager().commit();
 =

       // test that the entry has been removed everywhere.
       assertNull(cache1.getNode(fqn));
@@ -238,7 +238,7 @@
       CacheLoader loader2 =3D cache2.getCacheLoaderManager().getCacheLoade=
r();
 =

       // test the cache ...
-      DummyTransactionManager mgr =3D DummyTransactionManager.getInstance(=
);
+      TransactionManager mgr =3D cache1.getTransactionManager();
       assertNull(mgr.getTransaction());
 =

       mgr.begin();
@@ -263,7 +263,7 @@
       assertEquals(value, cache2.get(fqn, key));
 =

       // cache2 removes entry
-      mgr.begin();
+      cache2.getTransactionManager().begin();
       cache2.removeNode(fqn);
       assertNull(cache2.get(fqn, key));
       // test that loader1, loader2 and cache2 have the entry
@@ -272,7 +272,7 @@
       assertEquals(value, loader2.get(fqn).get(key));
 =

       // commit
-      mgr.commit();
+      cache2.getTransactionManager().commit();
 =

       // test that the entry has been removed everywhere.
       assertNull(cache1.getNode(fqn));


--===============8822361980091145723==--

From jbosscache-commits at lists.jboss.org Wed Jan 23 12:56:12 2008
Content-Type: multipart/mixed; boundary="===============0992017820397597110=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN:  r5207 - core/trunk.
Date: Wed, 23 Jan 2008 12:56:11 -0500
Message-ID: <E1JHjpb-0004Rd-Jk@committer01.frg.pub.inap.atl.jboss.com>

--===============0992017820397597110==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: manik.surtani(a)jboss.com
Date: 2008-01-23 12:56:11 -0500 (Wed, 23 Jan 2008)
New Revision: 5207

Modified:
   core/trunk/README-Maven.txt
Log:
Updated readme

Modified: core/trunk/README-Maven.txt
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/README-Maven.txt	2008-01-23 17:14:55 UTC (rev 5206)
+++ core/trunk/README-Maven.txt	2008-01-23 17:56:11 UTC (rev 5207)
@@ -1,14 +1,16 @@
-Working with Maven
-------------------
 =

+1. WORKING WITH MAVEN
+=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
+
 Requirements:
 =

 * Java 5.0 and above
 * Maven 2.x
 =

-Typical lifecycle phases
-------------------------
 =

+1.1. Typical lifecycle phases
+-----------------------------
+
 Maven will create a target/ directory under the root for the creation of
 output at every stage.
 =

@@ -16,19 +18,26 @@
 =

 * mvn compile: compiles java source code.
 =

-* mvn test: runs the TestNG unit test suite on the compiled code.  Will al=
so compile the tests. See the testing section below for more information.
+* mvn test: runs the TestNG unit test suite on the compiled code.  Will al=
so compile the tests. See the testing section
+  below for more information.
 =

 * mvn package: packages the module as a jar file and builds the javadocs a=
nd user documentation from docbook sources.
 =

-* mvn install: will install the artifacts in your local repo for use by ot=
her projects (such as JBoss Cache POJO edition which depends on JBoss Cache=
 Core).  Will also use Maven's assembly plugin to build ZIP files for downl=
oad (in target/distribution)
+* mvn install: will install the artifacts in your local repo for use by ot=
her projects (such as JBoss Cache POJO edition
+  which depends on JBoss Cache Core).  Will also use Maven's assembly plug=
in to build ZIP files for download
+  (in target/distribution)
 =

-* mvn deploy: will build and deploy the project to the JBoss snapshots rep=
ository.  Note that you should have your WebDAV username and password set u=
p.  (Deploys snapshots to http://snapshots.jboss.org/maven2/org/jboss/cache=
/).  If you have a non-SNAPSHOT version number in your pom.xml, it will be =
deployed to the live releases repository (see below)
+* mvn deploy: will build and deploy the project to the JBoss snapshots rep=
ository.  Note that you should have your WebDAV
+  username and password set up.  (Deploys snapshots to http://snapshots.jb=
oss.org/maven2/org/jboss/cache/).  If you have
+  a non-SNAPSHOT version number in your pom.xml, it will be deployed to th=
e live releases repository (see below)
 =

 =

-Setting up your WebDAV username and password to deploy project snapshots
-------------------------------------------------------------------------
+1.2. Setting up your WebDAV username and password to deploy project snapsh=
ots
+--------------------------------------------------------------------------=
---
 =

-You will also have to configure maven to use your username and password to=
 access this repository. For this, you will have to modify the servers sect=
ion of maven settings file ($MAVEN_HOME/conf/settings.xml, or ~/.m2/setting=
s.xml). Something similar to the following should be added:
+You will also have to configure maven to use your username and password to=
 access this repository. For this, you will
+have to modify the servers section of maven settings file ($MAVEN_HOME/con=
f/settings.xml, or ~/.m2/settings.xml).
+Something similar to the following should be added:
 =

 <settings>
 =

@@ -49,12 +58,13 @@
 =

 </settings>
 =

-Deploying a release to a live repository
-----------------------------------------
+1.3. Deploying a release to a live repository
+---------------------------------------------
 =

-Very simple.  Make sure you have the version number in your pom.xml set to=
 a non-SNAPSHOT version.  Maven will pick up on this and deploy to your rel=
ease repository rather than the snapshot repository.
+Very simple.  Make sure you have the version number in your pom.xml set to=
 a non-SNAPSHOT version.  Maven will pick up
+on this and deploy to your release repository rather than the snapshot rep=
ository.
 =

-Sadly JBoss release repository cannot be accessed via WebDAV, as the snaps=
hot repository can.  So what you need to do is:
+JBoss release repository cannot be accessed via WebDAV, as the snapshot re=
pository can.  So what you need to do is:
 =

 1) Check out the release repository from Subversion (svn co https://svn.jb=
oss.org/repos/repository.jboss.org/maven2)
 2) Add a property in ~/.m2/settings.xml to point to this 'local' copy of t=
he repo.  (See maven settings below)
@@ -62,8 +72,8 @@
 4) Deploy your project (mvn clean deploy)
 5) Check in your 'local' copy of the repo checked out in (1), adding any n=
ew directories/files created by (4).
 =

-Maven settings.xml
-------------------
+1.4. Maven settings.xml
+-----------------------
 =

 Working with the JBoss Cache source tree, I have configured my ~/.m2/setti=
ngs.xml to look like:
 =

@@ -93,79 +103,114 @@
 =

 </settings>
 =

-Testing
-=3D=3D=3D=3D=3D=3D=3D
+2. TESTING
+=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
 =

-Tests are written against the TestNG testing framework. Each test should b=
elong to one or more group. The group acts as a filter, and is used to sele=
ct which tests are ran as part of the maven test lifecycle. There are 3 gro=
ups that are currently in use, but there is not formal, you can make up any=
 group name if you like.
+Tests are written against the TestNG testing framework. Each test should b=
elong to one or more group. The group acts as
+a filter, and is used to select which tests are ran as part of the maven t=
est lifecycle. There are 3 groups that are
+currently in use, but there is not formal, you can make up any group name =
if you like.
 =

-Current Groups
---------------
+2.1. Current Groups
+-------------------
 * functional - Tests which test the general functionality of JBoss Cache
 * jgroups - Tests which need to send data on a JGroups Channel
 * transaction - Tests which use a transaction manager
+* profiling - Tests used for manual profiling, not meant for automated tes=
t runs
 =

-It should be noted that every test should at least be in the functional gr=
oup, since this is the default test group that is executed by maven, and th=
e one that is required to prepare a release.
+It should be noted that every test (except those not intended to be run by=
 Hudson) should at least be in the functional
+group, since this is the default test group that is executed by maven, and=
 the one that is required to prepare a release.
 =

-Executing the default test run
-------------------------------
+2.2. Executing the default test run
+-----------------------------------
 The default run executes all tests in the functional group. To just run th=
e tests with txt and xml output the command is:
 =

-   mvn test
+   $ mvn test
 =

 Alternatively, you can execute the tests AND generate a report with:
 =

-   mvn surefire-report:report
+   $ mvn surefire-report:report
 =

-If you already have ran a test cycle, and you want to generate a report of=
f the current reports, then you use the report-only goal, ike so:
+If you already have ran a test cycle, and you want to generate a report of=
f the current reports, then you use the
+report-only goal, ike so:
 =

-   mvn surefire-report:report-only
+   $ mvn surefire-report:report-only
 =

-Executing different groups
---------------------------
+2.3. Executing different groups
+-------------------------------
 A group can be executed (using the default configuration) by simply using =
the groups property like so:
 =

-   mvn -Dgroups=3Djgroups test
+   $ mvn -Dgroups=3Djgroups test
 =

 Mutiple groups can also be executed, although if a test is in more than of=
 the selected groups, it is executed only once:
 =

-   mvn -Dgroups=3Djgroups,transaction test
+   $ mvn -Dgroups=3Djgroups,transaction test
 =

-Executing a single test
------------------------
-A single test can be executed using the test property. The value is the sh=
ort name (not the fully qualified package name) of the test.
+2.4. Executing a single test
+----------------------------
+A single test can be executed using the test property. The value is the sh=
ort name (not the fully qualified package name)
+of the test.
 =

-   mvn -Dtest=3DFqnTest test
+   $ mvn -Dtest=3DFqnTest test
 =

-Alternatively, if there is more than one test with a given classname in yo=
ur test suite, you could provide the path to the test.
+Alternatively, if there is more than one test with a given classname in yo=
ur test suite, you could provide the path to
+the test.
 =

-   mvn -Dtest=3Dorg/jboss/cache/multiplexer/SyncReplTxTest test
+   $ mvn -Dtest=3Dorg/jboss/cache/multiplexer/SyncReplTxTest test
 =

-Executing all tests in a given package
---------------------------------------
+2.5. Executing all tests in a given package
+--------------------------------------------
 This can be achieved by passing in the package name with a wildcard to the=
 test parameter.
 =

-   mvn -Dtest=3Dorg/jboss/cache/multiplexer/* test
+   $ mvn -Dtest=3Dorg/jboss/cache/multiplexer/* test
 =

-Skipping the test run
----------------------
-It is sometimes desirable to install the jboss cache package in your local=
 repository without performing a full test run. To do this, simply use the =
maven.test.skip.exec property:
+2.6. Skipping the test run
+--------------------------
+It is sometimes desirable to install the jboss cache package in your local=
 repository without performing a full test run.
+To do this, simply use the maven.test.skip.exec property:
 =

-mvn -Dmaven.test.skip.exec=3Dtrue install
+   $ mvn -Dmaven.test.skip.exec=3Dtrue install
 =

-Again, this is just a shortcut for local use. It SHOULD NEVER BE USED when=
 releasing. Also, make sure "exec" is included in the property, if not the =
tests will not be built, which will prevent a test jar being produced (POJO=
 Cache needs the Core Cache test jar).
+Again, this is just a shortcut for local use. It SHOULD NEVER BE USED when=
 releasing. Also, make sure "exec" is included
+in the property, if not the tests will not be built, which will prevent a =
test jar being produced (POJO Cache needs the
+Core Cache test jar).
 =

-Permutations
-------------
-We use the term permutation to describe a group execution against a partic=
ular config. This allows us to test a variety of environments and configura=
tions without rewriting the same basic test over and over again. For exampl=
e, the jgroups-tcp permutation executes the jgroups group using the TCP con=
fig. Each permutation requires a maven profile which defines the various op=
tions, environmental variables, etc. The command to run the jgroups-tcp per=
mutatin is:
+2.7. Permutations
+-----------------
+We use the term permutation to describe a group execution against a partic=
ular config. This allows us to test a variety
+of environments and configurations without rewriting the same basic test o=
ver and over again. For example, the jgroups-tcp
+permutation executes the jgroups group using the TCP config. Each permutat=
ion requires a maven profile which defines the
+various options, environmental variables, etc. The command to run the jgro=
ups-tcp permutatin is:
 =

-mvn -Pjgroups-tcp surefire-report:report
+   $ mvn -Pjgroups-tcp surefire-report:report
 =

-Each permutation uses its own report directory, and its own html output fi=
le name. This allows you to execute multiple permutations without wiping th=
e results from the previous run. Note that due to the way maven  operates, =
only one permutation can be executed per mvn command. So automating multipl=
e runs requires shell scripting, or some other execution framework to make =
multiple called to maven.
+Each permutation uses its own report directory, and its own html output fi=
le name. This allows you to execute multiple
+permutations without wiping the results from the previous run. Note that d=
ue to the way maven  operates, only one
+permutation can be executed per mvn command. So automating multiple runs r=
equires shell scripting, or some other execution
+framework to make multiple called to maven.
 =

-Integration with CruiseControl / Hudson
----------------------------------------
+2.8. Running permutations manually or in an IDE
+-----------------------------------------------
 =

+Sometimes you want to run a test using settings other than the defaults (s=
uch as UDP for "jgroups" group tests or the
+DummyTransactionManager for "transaction" group tests).  This can be achie=
ved by referring to the Maven POM file
+to figure out which system properties are passed in to the test when doing=
 something different.
+
+E.g., to run a "jgroups" group test in your IDE using TCP instead of the d=
efault UDP, set the following:
+
+   -Djgroups.stack=3Dtcp
+
+Or, to use JBoss JTA (Arjuna TM) instead of the DummyTransactionManager in=
 a "transaction" group test, set:
+
+   -Dorg.jboss.cache.test.tm=3Djboss-jta
+
+Please refer to the POM file for more properties and permutations.
+
+2.9. Integration with CruiseControl / Hudson
+--------------------------------------------
+
 CruiseControl should do the following:
 =

-* Run "mvn clean site" - will clean and run tests, and then prepare report=
s.  In addition to unit tests, this project is set up to run FindBugs, PMD,=
 jxr, and a bunch of other code analysis tools and provide a report in targ=
et/site/project-reports.html - which should be linked from the CruiseContro=
l summary page.
+* Run "mvn clean site" - will clean and run tests, and then prepare report=
s.  In addition to unit tests, this project is
+  set up to run FindBugs, PMD, jxr, and a bunch of other code analysis too=
ls and provide a report in
+  target/site/project-reports.html - which should be linked from the Cruis=
eControl summary page.
 =



--===============0992017820397597110==--

From jbosscache-commits at lists.jboss.org Wed Jan 23 20:08:22 2008
Content-Type: multipart/mixed; boundary="===============3042233859901031546=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r5208 - in pojo/trunk:
 src/test/java/org/jboss/cache/pojo and 7 other directories.
Date: Wed, 23 Jan 2008 20:08:22 -0500
Message-ID: <E1JHqZq-0005qL-Bp@committer01.frg.pub.inap.atl.jboss.com>

--===============3042233859901031546==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: jason.greene(a)jboss.com
Date: 2008-01-23 20:08:22 -0500 (Wed, 23 Jan 2008)
New Revision: 5208

Removed:
   pojo/trunk/src/test/java/org/jboss/cache/pojo/TestingUtil.java
Modified:
   pojo/trunk/pom.xml
   pojo/trunk/src/test/java/org/jboss/cache/pojo/LocalConcurrentTest.java
   pojo/trunk/src/test/java/org/jboss/cache/pojo/LocalTxTest.java
   pojo/trunk/src/test/java/org/jboss/cache/pojo/NewReplicatedTest.java
   pojo/trunk/src/test/java/org/jboss/cache/pojo/NewReplicatedTxTest.java
   pojo/trunk/src/test/java/org/jboss/cache/pojo/ReplicatedCircularGraphTes=
t.java
   pojo/trunk/src/test/java/org/jboss/cache/pojo/ReplicatedObjectGraphTest.=
java
   pojo/trunk/src/test/java/org/jboss/cache/pojo/ReplicatedTxTest.java
   pojo/trunk/src/test/java/org/jboss/cache/pojo/collection/ReplicatedSyncL=
istTest.java
   pojo/trunk/src/test/java/org/jboss/cache/pojo/jmx/NotificationTest.java
   pojo/trunk/src/test/java/org/jboss/cache/pojo/memory/ReplicatedTest.java
   pojo/trunk/src/test/java/org/jboss/cache/pojo/optimistic/AbstractOptimis=
ticTestCase.java
   pojo/trunk/src/test/java/org/jboss/cache/pojo/region/LocalConcurrentTest=
.java
   pojo/trunk/src/test/java/org/jboss/cache/pojo/region/LocalTest.java
   pojo/trunk/src/test/java/org/jboss/cache/pojo/rollback/ReplicatedTxTest.=
java
   pojo/trunk/src/test/java/org/jboss/cache/pojo/statetransfer/ReplicatedTe=
st.java
Log:
Merge from 2.1


Modified: pojo/trunk/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- pojo/trunk/pom.xml	2008-01-23 17:56:11 UTC (rev 5207)
+++ pojo/trunk/pom.xml	2008-01-24 01:08:22 UTC (rev 5208)
@@ -4,13 +4,14 @@
   xsi:schemaLocation=3D"http://maven.apache.org/POM/4.0.0 http://maven.apa=
che.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <properties>
-    <jbosscache-pojo-version>2.1.0-SNAPSHOT</jbosscache-pojo-version>
-    <jboss.aop.version>2.0.0.beta1</jboss.aop.version>
+    <jbosscache-pojo-version>2.2.0-SNAPSHOT</jbosscache-pojo-version>
+    <jbosscache-core-version>2.1.0-SNAPSHOT</jbosscache-core-version>
+    <jboss.aop.version>2.0.0.CR3</jboss.aop.version>
   </properties>
   <parent>
     <groupId>org.jboss.cache</groupId>
     <artifactId>jbosscache-common-parent</artifactId>
-    <version>1.1-SNAPSHOT</version>
+    <version>1.1</version>
   </parent>
   <groupId>org.jboss.cache</groupId>
   <artifactId>jbosscache-pojo</artifactId>
@@ -27,22 +28,15 @@
     <dependency>
       <groupId>org.jboss.cache</groupId>
       <artifactId>jbosscache-core</artifactId>
-      <version>2.1.0.BETA1</version>
+      <version>${jbosscache-core-version}</version>
     </dependency>
     <dependency>
       <groupId>org.jboss.cache</groupId>
       <artifactId>jbosscache-core</artifactId>
-      <version>2.1.0.BETA1</version>
+      <version>${jbosscache-core-version}</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
-    <!-- Hack AOP has broken deps -->
-    <dependency>
-      <groupId>org.jboss.microcontainer</groupId>
-      <artifactId>jboss-container</artifactId>
-      <version>2.0.0.Beta4</version>
-      <scope>runtime</scope>
-    </dependency>
   </dependencies>
   <build>
     <plugins>
@@ -104,11 +98,6 @@
         <!-- HACK: AOP project and plugin has broken deps -->
         <dependencies>    =

           <dependency>
-            <groupId>org.jboss.microcontainer</groupId>
-            <artifactId>jboss-container</artifactId>
-            <version>2.0.0.Beta4</version>
-          </dependency>
-          <dependency>
             <groupId>commons-logging</groupId>
             <artifactId>commons-logging</artifactId>
             <version>1.0.4</version>
@@ -116,9 +105,14 @@
           <dependency>
             <groupId>org.jboss.cache</groupId>
             <artifactId>jbosscache-core</artifactId>
-            <version>2.1.0-SNAPSHOT</version>
+            <version>${jbosscache-core-version}</version>
           </dependency>
-        </dependencies>    =

+          <dependency>
+            <groupId>org.jboss.aop</groupId>
+            <artifactId>jboss-aop</artifactId>
+            <version>${jboss.aop.version}</version>
+          </dependency>
+        </dependencies> =

         <executions>
           <execution>
             <id>aopc</id>
@@ -279,14 +273,13 @@
 =

   <!-- basic JBoss repository so that the common parent POM in jbosscache-=
support can be found -->
   <repositories>
-      <repository>
-         <id>repository.jboss.org</id>
-         <url>http://repository.jboss.org/maven2</url>
-      </repository>
-      <repository>
-         <id>snapshots.jboss.org</id>
-         <url>http://snapshots.jboss.org/maven2</url>
-      </repository>
+    <repository>
+      <id>snapshots.jboss.org</id>
+      <url>http://snapshots.jboss.org/maven2</url>
+    </repository>
+    <repository>
+      <id>repository.jboss.org</id>
+      <url>http://repository.jboss.org/maven2</url>
+    </repository>
   </repositories>
-
 </project>

Modified: pojo/trunk/src/test/java/org/jboss/cache/pojo/LocalConcurrentTest=
.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- pojo/trunk/src/test/java/org/jboss/cache/pojo/LocalConcurrentTest.java	=
2008-01-23 17:56:11 UTC (rev 5207)
+++ pojo/trunk/src/test/java/org/jboss/cache/pojo/LocalConcurrentTest.java	=
2008-01-24 01:08:22 UTC (rev 5208)
@@ -18,6 +18,7 @@
 =

 import org.jboss.cache.config.Configuration;
 import org.jboss.cache.lock.UpgradeException;
+import org.jboss.cache.misc.TestingUtil;
 import org.jboss.cache.pojo.test.Address;
 import org.jboss.cache.pojo.test.Person;
 import org.jboss.cache.transaction.DummyTransactionManager;

Modified: pojo/trunk/src/test/java/org/jboss/cache/pojo/LocalTxTest.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- pojo/trunk/src/test/java/org/jboss/cache/pojo/LocalTxTest.java	2008-01-=
23 17:56:11 UTC (rev 5207)
+++ pojo/trunk/src/test/java/org/jboss/cache/pojo/LocalTxTest.java	2008-01-=
24 01:08:22 UTC (rev 5208)
@@ -24,6 +24,7 @@
 =

 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.jboss.cache.misc.TestingUtil;
 import org.jboss.cache.pojo.test.Address;
 import org.jboss.cache.pojo.test.Person;
 import org.jboss.cache.transaction.DummyTransactionManager;

Modified: pojo/trunk/src/test/java/org/jboss/cache/pojo/NewReplicatedTest.j=
ava
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- pojo/trunk/src/test/java/org/jboss/cache/pojo/NewReplicatedTest.java	20=
08-01-23 17:56:11 UTC (rev 5207)
+++ pojo/trunk/src/test/java/org/jboss/cache/pojo/NewReplicatedTest.java	20=
08-01-24 01:08:22 UTC (rev 5208)
@@ -30,7 +30,7 @@
  * @author Ben Wang
  */
 =

-(a)Test(groups =3D {"functional"})
+(a)Test(groups =3D {"functional"}, enabled=3Dfalse)
 public class NewReplicatedTest =

 {
    Log log_ =3D LogFactory.getLog(NewReplicatedTest.class);
@@ -251,7 +251,7 @@
 =

       // restart cache1_
       cache1_.stop();
-      cache1_.getCache().removeNode(Fqn.fromString("/a"));
+      //cache1_.getCache().removeNode(Fqn.fromString("/a"));
       cache1_.start();
       // Start from scratch for initial state transfer
       Person remote =3D (Person) cache1_.find("/a");

Modified: pojo/trunk/src/test/java/org/jboss/cache/pojo/NewReplicatedTxTest=
.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- pojo/trunk/src/test/java/org/jboss/cache/pojo/NewReplicatedTxTest.java	=
2008-01-23 17:56:11 UTC (rev 5207)
+++ pojo/trunk/src/test/java/org/jboss/cache/pojo/NewReplicatedTxTest.java	=
2008-01-24 01:08:22 UTC (rev 5208)
@@ -26,6 +26,7 @@
 import org.apache.commons.logging.LogFactory;
 import org.jboss.cache.config.Configuration.CacheMode;
 import org.jboss.cache.factories.UnitTestCacheConfigurationFactory;
+import org.jboss.cache.misc.TestingUtil;
 import org.jboss.cache.pojo.test.Address;
 import org.jboss.cache.pojo.test.Person;
 import org.jboss.cache.transaction.DummyTransactionManager;
@@ -39,7 +40,7 @@
  * @author Ben Wang
  */
 =

-(a)Test(groups =3D {"functional"})
+(a)Test(groups =3D {"functional"}, enabled=3Dfalse)
 public class NewReplicatedTxTest =

 {
    Log log =3D LogFactory.getLog(NewReplicatedTxTest.class);

Modified: pojo/trunk/src/test/java/org/jboss/cache/pojo/ReplicatedCircularG=
raphTest.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- pojo/trunk/src/test/java/org/jboss/cache/pojo/ReplicatedCircularGraphTe=
st.java	2008-01-23 17:56:11 UTC (rev 5207)
+++ pojo/trunk/src/test/java/org/jboss/cache/pojo/ReplicatedCircularGraphTe=
st.java	2008-01-24 01:08:22 UTC (rev 5208)
@@ -19,6 +19,7 @@
 import org.jboss.cache.Fqn;
 import org.jboss.cache.config.Configuration.CacheMode;
 import org.jboss.cache.factories.UnitTestCacheConfigurationFactory;
+import org.jboss.cache.misc.TestingUtil;
 import org.jboss.cache.pojo.test.Link;
 import org.jboss.cache.pojo.test.NodeManager;
 import org.jboss.cache.pojo.test.Person;

Modified: pojo/trunk/src/test/java/org/jboss/cache/pojo/ReplicatedObjectGra=
phTest.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- pojo/trunk/src/test/java/org/jboss/cache/pojo/ReplicatedObjectGraphTest=
.java	2008-01-23 17:56:11 UTC (rev 5207)
+++ pojo/trunk/src/test/java/org/jboss/cache/pojo/ReplicatedObjectGraphTest=
.java	2008-01-24 01:08:22 UTC (rev 5208)
@@ -7,6 +7,7 @@
 import org.jboss.cache.Fqn;
 import org.jboss.cache.config.Configuration.CacheMode;
 import org.jboss.cache.factories.UnitTestCacheConfigurationFactory;
+import org.jboss.cache.misc.TestingUtil;
 import org.jboss.cache.pojo.test.Address;
 import org.jboss.cache.pojo.test.Person;
 import org.testng.annotations.AfterMethod;

Modified: pojo/trunk/src/test/java/org/jboss/cache/pojo/ReplicatedTxTest.ja=
va
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- pojo/trunk/src/test/java/org/jboss/cache/pojo/ReplicatedTxTest.java	200=
8-01-23 17:56:11 UTC (rev 5207)
+++ pojo/trunk/src/test/java/org/jboss/cache/pojo/ReplicatedTxTest.java	200=
8-01-24 01:08:22 UTC (rev 5208)
@@ -19,6 +19,7 @@
 import org.apache.commons.logging.LogFactory;
 import org.jboss.cache.config.Configuration.CacheMode;
 import org.jboss.cache.factories.UnitTestCacheConfigurationFactory;
+import org.jboss.cache.misc.TestingUtil;
 import org.jboss.cache.pojo.test.Person;
 import org.jboss.cache.transaction.DummyTransactionManager;
 import org.testng.annotations.AfterMethod;

Deleted: pojo/trunk/src/test/java/org/jboss/cache/pojo/TestingUtil.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- pojo/trunk/src/test/java/org/jboss/cache/pojo/TestingUtil.java	2008-01-=
23 17:56:11 UTC (rev 5207)
+++ pojo/trunk/src/test/java/org/jboss/cache/pojo/TestingUtil.java	2008-01-=
24 01:08:22 UTC (rev 5208)
@@ -1,139 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- *
- * Distributable under LGPL license.
- * See terms of license at gnu.org.
- */
-
-package org.jboss.cache.pojo;
-
-import org.jboss.cache.CacheImpl;
-import org.jgroups.Address;
-
-import java.util.List;
-
-/**
- * Utilities for unit testing JBossCache.
- *
- * @author <a href=3D"mailto://brian.stansberry(a)jboss.com">Brian Stansbe=
rry</a>
- * @version $Revision$
- */
-public class TestingUtil
-{
-
-   /**
-    * @param caches  caches which must all have consistent views
-    * @param timeout max number of ms to loop
-    * @throws RuntimeException if <code>timeout</code> ms have elapse with=
out
-    *                          all caches having the same number of member=
s.
-    */
-   public static void blockUntilViewsReceived(PojoCache[] caches, long tim=
eout)
-   {
-      long failTime =3D System.currentTimeMillis() + timeout;
-
-      while (System.currentTimeMillis() < failTime)
-      {
-         org.jboss.cache.pojo.TestingUtil.sleepThread(100);
-         if (org.jboss.cache.pojo.TestingUtil.areCacheViewsComplete(caches=
))
-            return;
-      }
-
-      throw new RuntimeException("timed out before caches had complete vie=
ws");
-   }
-
-   /**
-    */
-   public static void blockUntilViewReceived(PojoCache cache, int groupSiz=
e, long timeout)
-   {
-      long failTime =3D System.currentTimeMillis() + timeout;
-
-      CacheImpl<Object, Object> tcache =3D (CacheImpl<Object, Object>) cac=
he.getCache();
-      while (System.currentTimeMillis() < failTime)
-      {
-         org.jboss.cache.pojo.TestingUtil.sleepThread(100);
-         if (org.jboss.cache.pojo.TestingUtil.isCacheViewComplete(tcache, =
groupSize))
-            return;
-      }
-
-      throw new RuntimeException("timed out before caches had complete vie=
ws");
-   }
-
-   /**
-    * Checks each cache to see if the number of elements in the array
-    * returned by {@link org.jboss.cache.CacheImpl#getMembers()} matches t=
he size of
-    * the <code>caches</code> parameter.
-    *
-    * @param caches caches that should form a View
-    * @return <code>true</code> if all caches have
-    *         <code>caches.length</code> members; false otherwise
-    * @throws IllegalStateException if any of the caches have MORE view
-    *                               members than caches.length
-    */
-   public static boolean areCacheViewsComplete(PojoCache[] caches)
-   {
-      int memberCount =3D caches.length;
-
-      for (int i =3D 0; i < memberCount; i++)
-      {
-         CacheImpl<Object, Object> cache =3D (CacheImpl<Object, Object>) c=
aches[i].getCache();
-         return org.jboss.cache.pojo.TestingUtil.isCacheViewComplete(cache=
, memberCount);
-      }
-
-      return true;
-   }
-
-   /**
-    * FIXME Comment this
-    *
-    * @param cache
-    * @param memberCount
-    */
-   public static boolean isCacheViewComplete(CacheImpl<Object, Object> cac=
he, int memberCount)
-   {
-      List<Address> members =3D cache.getMembers();
-      if (members =3D=3D null || memberCount > members.size())
-      {
-         return false;
-      }
-      else if (memberCount < members.size())
-      {
-         // This is an exceptional condition
-         StringBuffer sb =3D new StringBuffer("Cache at address ");
-         sb.append(cache.getLocalAddress());
-         sb.append(" had ");
-         sb.append(members.size());
-         sb.append(" members; expecting ");
-         sb.append(memberCount);
-         sb.append(". Members were (");
-         for (int j =3D 0; j < members.size(); j++)
-         {
-            if (j > 0)
-               sb.append(", ");
-            sb.append(members.get(j));
-         }
-         sb.append(')');
-
-         throw new IllegalStateException(sb.toString());
-      }
-
-      return true;
-   }
-
-
-   /**
-    * Puts the current thread to sleep for the desired number of ms, suppr=
essing
-    * any exceptions.
-    *
-    * @param sleeptime number of ms to sleep
-    */
-   public static void sleepThread(long sleeptime)
-   {
-      try
-      {
-         Thread.sleep(sleeptime);
-      }
-      catch (InterruptedException ie)
-      {
-      }
-   }
-}

Modified: pojo/trunk/src/test/java/org/jboss/cache/pojo/collection/Replicat=
edSyncListTest.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- pojo/trunk/src/test/java/org/jboss/cache/pojo/collection/ReplicatedSync=
ListTest.java	2008-01-23 17:56:11 UTC (rev 5207)
+++ pojo/trunk/src/test/java/org/jboss/cache/pojo/collection/ReplicatedSync=
ListTest.java	2008-01-24 01:08:22 UTC (rev 5208)
@@ -29,7 +29,7 @@
  * @author Ben Wang
  */
 =

-(a)Test(groups =3D {"functional"})
+(a)Test(groups =3D {"functional"}, enabled=3Dfalse)
 public class ReplicatedSyncListTest =

 {
    Log log =3D LogFactory.getLog(ReplicatedSyncListTest.class);
@@ -48,7 +48,7 @@
    @AfterMethod(alwaysRun =3D true)
    protected void tearDown() throws Exception
    {
-      cache1.getCache().removeNode(Fqn.fromString("/"));
+      //cache1.getCache().removeNode(Fqn.fromString("/"));
       cache1.stop();
       cache2.stop();
    }

Modified: pojo/trunk/src/test/java/org/jboss/cache/pojo/jmx/NotificationTes=
t.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- pojo/trunk/src/test/java/org/jboss/cache/pojo/jmx/NotificationTest.java=
	2008-01-23 17:56:11 UTC (rev 5207)
+++ pojo/trunk/src/test/java/org/jboss/cache/pojo/jmx/NotificationTest.java=
	2008-01-24 01:08:22 UTC (rev 5208)
@@ -2,7 +2,7 @@
 =

 import javax.management.ObjectName;
 =

-import org.jboss.cache.CacheImpl;
+import org.jboss.cache.CacheSPI;
 import org.jboss.cache.config.Configuration;
 import org.jboss.cache.pojo.PojoCache;
 import org.jboss.cache.pojo.PojoCacheFactory;
@@ -26,7 +26,7 @@
    protected Object createCacheAndJmxWrapper() throws Exception
    {
       pojoCache =3D createCache(CLUSTER_NAME);
-      cache =3D (CacheImpl<Object, Object>) pojoCache.getCache();
+      cache =3D (CacheSPI<Object, Object>)pojoCache.getCache();
       return new PojoCacheJmxWrapper(pojoCache);
    }
 =


Modified: pojo/trunk/src/test/java/org/jboss/cache/pojo/memory/ReplicatedTe=
st.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- pojo/trunk/src/test/java/org/jboss/cache/pojo/memory/ReplicatedTest.jav=
a	2008-01-23 17:56:11 UTC (rev 5207)
+++ pojo/trunk/src/test/java/org/jboss/cache/pojo/memory/ReplicatedTest.jav=
a	2008-01-24 01:08:22 UTC (rev 5208)
@@ -19,9 +19,9 @@
 import org.jboss.cache.Fqn;
 import org.jboss.cache.config.Configuration.CacheMode;
 import org.jboss.cache.factories.UnitTestCacheConfigurationFactory;
+import org.jboss.cache.misc.TestingUtil;
 import org.jboss.cache.pojo.PojoCache;
 import org.jboss.cache.pojo.PojoCacheFactory;
-import org.jboss.cache.pojo.TestingUtil;
 import org.jboss.cache.pojo.test.Address;
 import org.jboss.cache.pojo.test.Person;
 import org.jboss.cache.pojo.test.SerializedAddress;

Modified: pojo/trunk/src/test/java/org/jboss/cache/pojo/optimistic/Abstract=
OptimisticTestCase.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- pojo/trunk/src/test/java/org/jboss/cache/pojo/optimistic/AbstractOptimi=
sticTestCase.java	2008-01-23 17:56:11 UTC (rev 5207)
+++ pojo/trunk/src/test/java/org/jboss/cache/pojo/optimistic/AbstractOptimi=
sticTestCase.java	2008-01-24 01:08:22 UTC (rev 5208)
@@ -370,7 +370,7 @@
          System.out.println("*** " + oa.length);
          System.arraycopy(oa, 0, na, 0, oa.length);
          na[oa.length] =3D new DefaultDataVersion();
-         newList.add(MethodCallFactory.create(MethodDeclarations.getVersio=
nedMethod(c.getMethodId()), na));
+         newList.add(MethodCallFactory.create(c.getMethodId(), na));
       }
       return newList;
    }

Modified: pojo/trunk/src/test/java/org/jboss/cache/pojo/region/LocalConcurr=
entTest.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- pojo/trunk/src/test/java/org/jboss/cache/pojo/region/LocalConcurrentTes=
t.java	2008-01-23 17:56:11 UTC (rev 5207)
+++ pojo/trunk/src/test/java/org/jboss/cache/pojo/region/LocalConcurrentTes=
t.java	2008-01-24 01:08:22 UTC (rev 5208)
@@ -17,9 +17,9 @@
 =

 import org.jboss.cache.Fqn;
 import org.jboss.cache.lock.UpgradeException;
+import org.jboss.cache.misc.TestingUtil;
 import org.jboss.cache.pojo.PojoCache;
 import org.jboss.cache.pojo.PojoCacheFactory;
-import org.jboss.cache.pojo.TestingUtil;
 import org.jboss.cache.pojo.test.Address;
 import org.jboss.cache.pojo.test.Person;
 import org.jboss.cache.transaction.DummyTransactionManager;

Modified: pojo/trunk/src/test/java/org/jboss/cache/pojo/region/LocalTest.ja=
va
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- pojo/trunk/src/test/java/org/jboss/cache/pojo/region/LocalTest.java	200=
8-01-23 17:56:11 UTC (rev 5207)
+++ pojo/trunk/src/test/java/org/jboss/cache/pojo/region/LocalTest.java	200=
8-01-24 01:08:22 UTC (rev 5208)
@@ -107,7 +107,7 @@
       Fqn<String> fqn =3D new Fqn<String>(Fqn.fromString(REGION), Internal=
Constant.JBOSS_INTERNAL);
       assertTrue("Internal region node should exist ",
               cache_.getCache().getRoot().hasChild(fqn));
-      System.out.println("Cache content: " +((org.jboss.cache.CacheImpl<Ob=
ject, Object>)cache_.getCache()).printDetails());
+      //System.out.println("Cache content: " +((org.jboss.cache.CacheImpl<=
Object, Object>)cache_.getCache()).printDetails());
    }
 =

    public void testModification() throws Exception
@@ -123,8 +123,8 @@
       createPerson("person/test3", "Joe", 32);
       cache_.detach("person/test3");
 =

-      String str =3D ((CacheImpl<Object, Object>) cache_.getCache()).print=
Details();
-      System.out.println("**** Details ***/n" + str);
+      //String str =3D ((CacheImpl<Object, Object>) cache_.getCache()).pri=
ntDetails();
+      //System.out.println("**** Details ***/n" + str);
 =

       Fqn<String> fqn =3D new Fqn<String>(Fqn.fromString(REGION), Internal=
Constant.JBOSS_INTERNAL);
       Node<Object, Object> n =3D cache_.getCache().getRoot().getChild(fqn);

Modified: pojo/trunk/src/test/java/org/jboss/cache/pojo/rollback/Replicated=
TxTest.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- pojo/trunk/src/test/java/org/jboss/cache/pojo/rollback/ReplicatedTxTest=
.java	2008-01-23 17:56:11 UTC (rev 5207)
+++ pojo/trunk/src/test/java/org/jboss/cache/pojo/rollback/ReplicatedTxTest=
.java	2008-01-24 01:08:22 UTC (rev 5208)
@@ -26,9 +26,9 @@
 import org.apache.commons.logging.LogFactory;
 import org.jboss.cache.config.Configuration.CacheMode;
 import org.jboss.cache.factories.UnitTestCacheConfigurationFactory;
+import org.jboss.cache.misc.TestingUtil;
 import org.jboss.cache.pojo.PojoCache;
 import org.jboss.cache.pojo.PojoCacheFactory;
-import org.jboss.cache.pojo.TestingUtil;
 import org.jboss.cache.pojo.test.Person;
 import org.jboss.cache.transaction.DummyTransactionManager;
 import org.testng.annotations.AfterMethod;

Modified: pojo/trunk/src/test/java/org/jboss/cache/pojo/statetransfer/Repli=
catedTest.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- pojo/trunk/src/test/java/org/jboss/cache/pojo/statetransfer/ReplicatedT=
est.java	2008-01-23 17:56:11 UTC (rev 5207)
+++ pojo/trunk/src/test/java/org/jboss/cache/pojo/statetransfer/ReplicatedT=
est.java	2008-01-24 01:08:22 UTC (rev 5208)
@@ -79,13 +79,13 @@
       cache =3D PojoCacheFactory.createCache(UnitTestCacheConfigurationFac=
tory.createConfiguration(CacheMode.REPL_SYNC), toStart);
       Person ben =3D createPerson("/person/test1", "Ben Wang", 40);
 =

-      System.out.println("\n*** I ***");
-      System.out.println(((CacheImpl<Object, Object>) cache.getCache()).pr=
intDetails());
+      //System.out.println("\n*** I ***");
+      //System.out.println(((CacheImpl<Object, Object>) cache.getCache()).=
printDetails());
       cache1 =3D PojoCacheFactory.createCache(UnitTestCacheConfigurationFa=
ctory.createConfiguration(CacheMode.REPL_SYNC), toStart);
       cache1.start();
 =

-      System.out.println("\n*** II ***");
-      System.out.println(((CacheImpl<Object, Object>) cache1.getCache()).p=
rintDetails());
+      //System.out.println("\n*** II ***");
+      //System.out.println(((CacheImpl<Object, Object>) cache1.getCache())=
.printDetails());
 =

       log.info("testSimple() ....");
       assertEquals("Ben Wang", ben.getName());


--===============3042233859901031546==--

From jbosscache-commits at lists.jboss.org Thu Jan 24 06:19:54 2008
Content-Type: multipart/mixed; boundary="===============6778528792795519951=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r5209 -
 benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-1.4.1/lib.
Date: Thu, 24 Jan 2008 06:19:54 -0500
Message-ID: <E1JI07e-0000W6-KB@committer01.frg.pub.inap.atl.jboss.com>

--===============6778528792795519951==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: manik.surtani(a)jboss.com
Date: 2008-01-24 06:19:54 -0500 (Thu, 24 Jan 2008)
New Revision: 5209

Modified:
   benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-1.4.1/lib/jboss=
-cache.jar
Log:
Updated JBC jar

Modified: benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-1.4.1/li=
b/jboss-cache.jar
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)


--===============6778528792795519951==--

From jbosscache-commits at lists.jboss.org Thu Jan 24 07:05:43 2008
Content-Type: multipart/mixed; boundary="===============1728646770451636675=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r5210 -
 benchmarks/benchmark-fwk/trunk/src/org/cachebench.
Date: Thu, 24 Jan 2008 07:05:43 -0500
Message-ID: <E1JI0pz-0001Ry-Mm@committer01.frg.pub.inap.atl.jboss.com>

--===============1728646770451636675==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: manik.surtani(a)jboss.com
Date: 2008-01-24 07:05:43 -0500 (Thu, 24 Jan 2008)
New Revision: 5210

Modified:
   benchmarks/benchmark-fwk/trunk/src/org/cachebench/CacheBenchmarkRunner.j=
ava
Log:
Updated logging

Modified: benchmarks/benchmark-fwk/trunk/src/org/cachebench/CacheBenchmarkR=
unner.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- benchmarks/benchmark-fwk/trunk/src/org/cachebench/CacheBenchmarkRunner.=
java	2008-01-24 11:19:54 UTC (rev 5209)
+++ benchmarks/benchmark-fwk/trunk/src/org/cachebench/CacheBenchmarkRunner.=
java	2008-01-24 12:05:43 UTC (rev 5210)
@@ -26,7 +26,7 @@
 {
 =

    private Configuration conf;
-   private Log logger =3D LogFactory.getLog("org.cachebench.CacheBenchmark=
Runner");
+   private Log logger =3D LogFactory.getLog(CacheBenchmarkRunner.class);
    private Log errorLogger =3D LogFactory.getLog("CacheException");
 =

    public static void main(String[] args)


--===============1728646770451636675==--

From jbosscache-commits at lists.jboss.org Thu Jan 24 07:06:18 2008
Content-Type: multipart/mixed; boundary="===============1949387324557192204=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r5211 - in
 benchmarks/benchmark-fwk/trunk/cache-products: jbosscache-1.4.1 and 3 other
 directories.
Date: Thu, 24 Jan 2008 07:06:18 -0500
Message-ID: <E1JI0qY-0001Tr-6F@committer01.frg.pub.inap.atl.jboss.com>

--===============1949387324557192204==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: manik.surtani(a)jboss.com
Date: 2008-01-24 07:06:18 -0500 (Thu, 24 Jan 2008)
New Revision: 5211

Added:
   benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-1.4.1/config.sh
Removed:
   benchmarks/benchmark-fwk/trunk/cache-products/terracotta-2.4.8/
Modified:
   benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.0.0/config.sh
   benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.1.0/config.sh
   benchmarks/benchmark-fwk/trunk/cache-products/terracotta-2.5.0/config.sh
Log:
Updated shell scripts, removed old TC 2.4.8 stuff

Copied: benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-1.4.1/conf=
ig.sh (from rev 5209, benchmarks/benchmark-fwk/trunk/cache-products/jbossca=
che-2.0.0/config.sh)
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-1.4.1/config.s=
h	                        (rev 0)
+++ benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-1.4.1/config.s=
h	2008-01-24 12:06:18 UTC (rev 5211)
@@ -0,0 +1,18 @@
+#!/bin/bash
+
+#see "$CACHE_ROOT/cache-products/cache.sh" for details
+
+THIS_DIR=3D"./cache-products/jbosscache-1.4.1"
+
+#setting up classpath
+for JAR in $THIS_DIR/lib/*
+do   =

+   CLASSPATH=3D$CLASSPATH:$JAR
+done
+CLASSPATH=3D$CLASSPATH:./classes/production/jbosscache-1.4.1
+CLASSPATH=3D$CLASSPATH:$THIS_DIR/conf
+#--classpath was set
+
+#additional JVM options
+JVM_OPTIONS=3D"$JVM_OPTIONS -Xmx1024m -Djava.net.preferIPv4Stack=3Dtrue -D=
cacheBenchFwk.cacheWrapperClassName=3Dorg.cachebench.cachewrappers.JBossCac=
heWrapper"
+

Modified: benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.0.0/co=
nfig.sh
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.0.0/config.s=
h	2008-01-24 12:05:43 UTC (rev 5210)
+++ benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.0.0/config.s=
h	2008-01-24 12:06:18 UTC (rev 5211)
@@ -14,5 +14,5 @@
 #--classpath was set
 =

 #additional JVM options
-JVM_OPTIONS=3D"$JVM_OPTIONS -Xmx1024m -Djava.net.preferIPv4Stack=3Dtrue"
+JVM_OPTIONS=3D"$JVM_OPTIONS -Xmx1024m -Djava.net.preferIPv4Stack=3Dtrue -D=
cacheBenchFwk.cacheWrapperClassName=3Dorg.cachebench.cachewrappers.JBossCac=
he200Wrapper"
 =


Modified: benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.1.0/co=
nfig.sh
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.1.0/config.s=
h	2008-01-24 12:05:43 UTC (rev 5210)
+++ benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.1.0/config.s=
h	2008-01-24 12:06:18 UTC (rev 5211)
@@ -15,5 +15,4 @@
 #--classpath was set
 =

 #additional JVM options
-JVM_OPTIONS=3D"$JVM_OPTIONS -Xmx1024m -Djava.net.preferIPv4Stack=3Dtrue"
-JVM_OPTIONS=3D"$JVM_OPTIONS -DcacheBenchFwk.cacheWrapperClassName=3Dorg.ca=
chebench.cachewrappers.JBossCache210Wrapper"
\ No newline at end of file
+JVM_OPTIONS=3D"$JVM_OPTIONS -Xmx1024m -Djava.net.preferIPv4Stack=3Dtrue" J=
VM_OPTIONS=3D"$JVM_OPTIONS -DcacheBenchFwk.cacheWrapperClassName=3Dorg.cach=
ebench.cachewrappers.JBossCache210Wrapper"
\ No newline at end of file

Modified: benchmarks/benchmark-fwk/trunk/cache-products/terracotta-2.5.0/co=
nfig.sh
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- benchmarks/benchmark-fwk/trunk/cache-products/terracotta-2.5.0/config.s=
h	2008-01-24 12:05:43 UTC (rev 5210)
+++ benchmarks/benchmark-fwk/trunk/cache-products/terracotta-2.5.0/config.s=
h	2008-01-24 12:06:18 UTC (rev 5211)
@@ -3,7 +3,7 @@
 #see "$CACHE_ROOT/cache-products/cache.sh" for details
 =

 THIS_DIR=3D./cache-products/terracotta-2.5.0
-TC_HOME=3D"/qa/home/mmarkus/java/terracotta-2.5.0"
+TC_HOME=3D"${HOME}/java/terracotta-2.5.0"
 =

 #addint terracotta wrapper class to classpath
 CLASSPATH=3D$CLASSPATH:./classes/production/terracotta-2.5.0


--===============1949387324557192204==--

From jbosscache-commits at lists.jboss.org Thu Jan 24 07:12:47 2008
Content-Type: multipart/mixed; boundary="===============0566131879670148066=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r5212 -
 benchmarks/benchmark-fwk/trunk.
Date: Thu, 24 Jan 2008 07:12:47 -0500
Message-ID: <E1JI0wp-0002Wd-8F@committer01.frg.pub.inap.atl.jboss.com>

--===============0566131879670148066==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: manik.surtani(a)jboss.com
Date: 2008-01-24 07:12:47 -0500 (Thu, 24 Jan 2008)
New Revision: 5212

Modified:
   benchmarks/benchmark-fwk/trunk/cluster.sh
Log:


Modified: benchmarks/benchmark-fwk/trunk/cluster.sh
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- benchmarks/benchmark-fwk/trunk/cluster.sh	2008-01-24 12:06:18 UTC (rev =
5211)
+++ benchmarks/benchmark-fwk/trunk/cluster.sh	2008-01-24 12:12:47 UTC (rev =
5212)
@@ -1,29 +1,54 @@
 #!/bin/bash
 =

-CACHE_DIST=3D${1}
-NUM_SERVERS=3D${2}
-COMMAND=3Dstart
+#####################################################
+# =

+# This script allows you to start multiple cache bench instances across a =
cluster
+#
+# Note that this requires BASH, as well as that all your instances have th=
e cache
+# bench framework installed in the same location.  Finally, it requires SS=
H keys
+# set up such that executing commands using =

+#
+#     $ ssh hostName "command" =

+# =

+# will work without prompting for passwords, or any user input.
+#
+#####################################################
 =

-SERVER_POSTFIX=3D"qa.atl.jboss.com"
-SERVERS=3D( cluster01 cluster02 cluster03 cluster04 cluster05 cluster06 cl=
uster07 cluster08 cluster09 cluster10 )
+## Some user-cnfigurable variables:
 =

-CACHE_BENCHMARK_HOME=3D`pwd`/code/cache-bench-fwk
+# Defaults to the currently logged in user
+SSH_USER=3D${USER}
+
+# Cache instance you wish to run - taken from the command line.
+CACHE_DIST=3D${2}
+
+# Number of servers to launch on - taken from the command line.
+NUM_SERVERS=3D${3}
+
+COMMAND=3D${1}
+
+# the DNS domain of your servers
+DOMAIN=3D"qa.atl.jboss.com"
+# the host names of available servers
+HOSTNAMES=3D( cluster01 cluster02 cluster03 cluster04 cluster05 cluster06 =
cluster07 cluster08 cluster09 cluster10 )
+
+CACHE_BENCHMARK_HOME=3D`pwd`
 echo "Using cache benchmark home: $CACHE_BENCHMARK_HOME"
 =

 case $COMMAND in
     start)
          for ((idx=3D0; idx < NUM_SERVERS ; idx++))
          do
-            server=3D"${SERVERS[idx]}"
-            echo "jboss: Startup CacheBenchmarkFramework@$server"
-            ssh $server.$SERVER_POSTFIX "cd ${CACHE_BENCHMARK_HOME} &&  ./=
runNode.sh &"
-            sleep 5
+            server=3D"${HOSTNAMES[idx]}"
+            echo Starting CacheBenchmarkFramework on host ${server}
+            ssh ${SSH_USER}@${server}.${DOMAIN} "cd ${CACHE_BENCHMARK_HOME=
} &&  ./runNode.sh &"
+            sleep 2
          done
         ;;
     stop)
       echo "stop not implemented yet"
       ;;
     *)
-        echo "Usage: $0 [start] CACHE_DIST NUM_SERVERS"
+        echo "Usage: $0 [start | stop] [cache distribution to test] [numbe=
r of servers to launch on]"
         ;;
 esac


--===============0566131879670148066==--

From jbosscache-commits at lists.jboss.org Thu Jan 24 08:10:35 2008
Content-Type: multipart/mixed; boundary="===============5635574841672115719=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r5213 - in
 benchmarks/benchmark-fwk/trunk: conf and 2 other directories.
Date: Thu, 24 Jan 2008 08:10:34 -0500
Message-ID: <E1JI1qk-0005wm-O2@committer01.frg.pub.inap.atl.jboss.com>

--===============5635574841672115719==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: manik.surtani(a)jboss.com
Date: 2008-01-24 08:10:34 -0500 (Thu, 24 Jan 2008)
New Revision: 5213

Added:
   benchmarks/benchmark-fwk/trunk/killNode.sh
Removed:
   benchmarks/benchmark-fwk/trunk/lib/smartfrog-3.12.014.jar
   benchmarks/benchmark-fwk/trunk/smartfrog/
Modified:
   benchmarks/benchmark-fwk/trunk/cluster.sh
   benchmarks/benchmark-fwk/trunk/conf/cachebench.xml
   benchmarks/benchmark-fwk/trunk/runNode.sh
   benchmarks/benchmark-fwk/trunk/src/org/cachebench/CacheBenchmarkRunner.j=
ava
Log:
Updated scripts, which now take in the config to launch.  Also created a ki=
llNode script.

Modified: benchmarks/benchmark-fwk/trunk/cluster.sh
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- benchmarks/benchmark-fwk/trunk/cluster.sh	2008-01-24 12:12:47 UTC (rev =
5212)
+++ benchmarks/benchmark-fwk/trunk/cluster.sh	2008-01-24 13:10:34 UTC (rev =
5213)
@@ -1,6 +1,6 @@
 #!/bin/bash
 =

-#####################################################
+##########################################################################=
########
 # =

 # This script allows you to start multiple cache bench instances across a =
cluster
 #
@@ -12,7 +12,7 @@
 # =

 # will work without prompting for passwords, or any user input.
 #
-#####################################################
+##########################################################################=
########
 =

 ## Some user-cnfigurable variables:
 =

@@ -22,8 +22,10 @@
 # Cache instance you wish to run - taken from the command line.
 CACHE_DIST=3D${2}
 =

+CFG_FILE=3D${3}
+
 # Number of servers to launch on - taken from the command line.
-NUM_SERVERS=3D${3}
+NUM_SERVERS=3D${4}
 =

 COMMAND=3D${1}
 =

@@ -41,14 +43,23 @@
          do
             server=3D"${HOSTNAMES[idx]}"
             echo Starting CacheBenchmarkFramework on host ${server}
-            ssh ${SSH_USER}@${server}.${DOMAIN} "cd ${CACHE_BENCHMARK_HOME=
} &&  ./runNode.sh &"
+            ssh ${SSH_USER}@${server}.${DOMAIN} "cd ${CACHE_BENCHMARK_HOME=
} &&  ./runNode.sh ${idx} ${CACHE_DIST} ${CFG_FILE} ${NUM_SERVERS}"
             sleep 2
          done
         ;;
     stop)
-      echo "stop not implemented yet"
+      for ((idx=3D0; idx < NUM_SERVERS ; idx++))
+         do
+            server=3D"${HOSTNAMES[idx]}"
+            echo Starting CacheBenchmarkFramework on host ${server}
+            ssh ${SSH_USER}@${server}.${DOMAIN} "cd ${CACHE_BENCHMARK_HOME=
} &&  ./killNode.sh"
+            sleep 2
+         done
       ;;
     *)
-        echo "Usage: $0 [start | stop] [cache distribution to test] [numbe=
r of servers to launch on]"
+        echo "Usage: ${0} [start | stop] [cache distribution to test] [nam=
e of configuration file to use] [number of servers to launch on]"
+        echo
+        echo "Example:"
+        echo "        ${0} start jbosscache-2.0.0 repl_async.xml 6
         ;;
 esac

Modified: benchmarks/benchmark-fwk/trunk/conf/cachebench.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- benchmarks/benchmark-fwk/trunk/conf/cachebench.xml	2008-01-24 12:12:47 =
UTC (rev 5212)
+++ benchmarks/benchmark-fwk/trunk/conf/cachebench.xml	2008-01-24 13:10:34 =
UTC (rev 5213)
@@ -8,7 +8,7 @@
 	emptyCacheBetweenTests - again, use if you're running out of mem.
 	numThreads - the number of executor threads to use to perform the require=
d number of operations.  =

 -->
-<cachebench sampleSize=3D"5500" gcBetweenTestsEnabled=3D"true" sleepBetwee=
nTests=3D"1000" emptyCacheBetweenTests=3D"true" numThreads=3D"10">
+<cachebench sampleSize=3D"10000" gcBetweenTestsEnabled=3D"true" sleepBetwe=
enTests=3D"1000" emptyCacheBetweenTests=3D"true" numThreads=3D"10">
 =

 =

    <!--
@@ -76,16 +76,9 @@
 		<test name=3D"Custom Types With Associations" testClass=3D"org.cachebenc=
h.tests.simpletests.AssociationsTest" weight=3D"2.0" />
 		-->
 =

-		<!-- arbitrary params may be passed into the cacheWrapper implementation=
, typically used to pass in config files for the cache product. -->
-      <!-- JBoss Cache 1.4.x and 2.x -->
-      <param name=3D"config" value=3D"jbc210-br_tcp_mping.xml" />       =

-      <!--<param name=3D"config" value=3D"pess-repl-async.xml" />-->
-
-      <!-- EHCache -->
-      <!--<param name=3D"config" value=3D"ehcache-repl-sync.xml" />-->
-
-      <!-- Terracotta -->
-      <!--<param name=3D"config" value=3D"tc-config-pojo.xml" />-->
+       <!-- WARNING - Configuration file name is now DEPRECATED and will b=
e ignored.  Please pass in your cache config
+                      file name that you wish to use with the -DcacheBench=
Fwk.cacheConfigFile JVM parameter.  The runNode.sh
+                      and cluster.sh scripts will also do this for you.  -=
->
    </testcase>
 =

 =


Added: benchmarks/benchmark-fwk/trunk/killNode.sh
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- benchmarks/benchmark-fwk/trunk/killNode.sh	                        (rev=
 0)
+++ benchmarks/benchmark-fwk/trunk/killNode.sh	2008-01-24 13:10:34 UTC (rev=
 5213)
@@ -0,0 +1,22 @@
+#!/bin/sh
+
+##########################################################################=
########
+#
+# This script allows you to kill benchmark runner instances started with r=
unNode.sh
+#
+# Note that runNode.sh will create a PID.pid file in the current directory=
, which
+# this script will use to get the process id of the process to kill.
+#
+##########################################################################=
########
+
+PIDFILE=3D"PID.pid"
+
+if [ -e ${PIDFILE} ]
+then
+   pid=3D`cat ${PIDFILE}`
+   echo "Killing process ${pid}"
+   kill -9 ${pid}
+   rm ${PIDFILE}   =

+fi
+
+exit 0
\ No newline at end of file

Deleted: benchmarks/benchmark-fwk/trunk/lib/smartfrog-3.12.014.jar
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)

Modified: benchmarks/benchmark-fwk/trunk/runNode.sh
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- benchmarks/benchmark-fwk/trunk/runNode.sh	2008-01-24 12:12:47 UTC (rev =
5212)
+++ benchmarks/benchmark-fwk/trunk/runNode.sh	2008-01-24 13:10:34 UTC (rev =
5213)
@@ -4,29 +4,41 @@
 # those would make an automatic conversion from unix CLASSPATH to win clas=
spath, needed when executing java -cp
 =

 preferIPv4Stack=3Dtrue
-export JVM_OPTIONS=3D" -DcurrentIndex=3D$1 -DclusterSize=3D$3 " =

 =

+CURRENT_INDEX=3D${1}
+CACHE_PRODUCT=3D${2}
+TEST_CFG=3D${3}
+CLUSTER_SIZE=3D${4}
+DEBUG=3D${5}
+PIDFILE=3D"PID.pid"
+if [ -e ${PIDFILE} ]
+then
+   # first test if the process is still running.  If not, clean up the PID=
 file.
+   pid=3D`cat ${PIDFILE}`
+   if ps -C ${pid} > /dev/null
+   then
+      echo "A stale process already exists on this host!  Run killNode.sh =
to kill it first."
+      exit 3
+   else
+      ## This is a stale PID file.  No such process is running.
+      rm ${PIDFILE} =

+   fi
+fi
+
 if [ -z $1 ]
 then
-   echo "Usage:"
+   echo Usage:
    echo =

-   echo "     ./runNode.sh <currentNodeIndex> <testConfig> <clusterSize>"
-   echo "param <currentNodeIndex> : the index of this node in the list of =
nodes in the cluster(0..<clusterSize>-1)"
-   echo "param <testConfig>       : must be one of the directories names u=
nder './cache-products'"
-   echo "param <clusterSize>      : total number of nodes that will run te=
sts. "
-   echo "Ex: './runNode.sh 0 jbosscache-2.0.0 3' will start the 1st node r=
unning an instance of jbc2.0.0 on a cluster made out of 3 nodes."
+   echo      ./runNode.sh [current node index] [cache product to test] [te=
st config file] [cluster size]
+   echo param [current node index]    : the index of this node in the list=
 of nodes in the cluster [0 .. <cluster size> - 1]
+   echo param [cache product to test] : must be one of the directories nam=
es under './cache-products'
+   echo param [test config file]      : configuration file to use with the=
 cache product.  Typically resides in './cache-products/XXX/conf/'
+   echo param [cluster size]          : total number of nodes that will ru=
n tests.
+   echo
+   echo Example: './runNode.sh 0 jbosscache-2.0.0 repl_async.xml 3' will s=
tart the 1st node running an instance of jbc2.0.0 on a cluster made out of =
3 nodes, using the repl_async configuration.
    exit 1
 fi
 =

-export SYS_PROPS=3D"-DcurrentIndex=3D$1 -Djava.net.preferIPv4Stack=3D$pref=
erIPv4Stack"
-
-#first kill all the exisiting processes as they might interfere with the n=
ew ones/ not sure this works on cygwin
-ps -fe | grep "Cache*BenchmarkRunner" | cut -c 10-20 | xargs -r kill
-#for PID in `ps -fe | grep "Cache*BenchmarkRunner" | cut -c 10-20`
-#do
-#   kill PID
-#done
-
 #libraries needed by the fwk, add them to the classpath
 for JAR in ./lib/*
 do
@@ -35,21 +47,29 @@
 =

 export CLASSPATH=3D$CLASSPATH:./conf:./classes/production/Framework
 =

-configFile=3D./cache-products/$2/config.sh
+configFile=3D./cache-products/${CACHE_PRODUCT}/config.sh
 =

 #first check whether the config file exists and load it
-if [ -f $configFile ]
+if [ -f ${configFile} ]
 then
-  . $configFile
-  echo "Calling $configFile exit code is $?"
+  . ${configFile}
+  echo Calling ${configFile} exit code is $?
 else
-  echo could not find config file $configFile, exit!
+  echo could not find config file ${configFile}, aborting!
   exit 2
 fi
 =

+JVM_OPTIONS=3D"${JVM_OPTIONS} -DcacheBenchFwk.cacheConfigFile=3D${TEST_CFG=
} -DcurrentIndex=3D${CURRENT_INDEX} -DclusterSize=3D${CLUSTER_SIZE} -Dcurre=
ntIndex=3D${CURRENT_INDEX} -Djava.net.preferIPv4Stack=3D${preferIPv4Stack}"
 TO_EXECUTE=3D"java $JVM_OPTIONS -cp $CLASSPATH org.cachebench.CacheBenchma=
rkRunner"
-echo executing:
-echo $TO_EXECUTE
-java $JVM_OPTIONS -cp $CLASSPATH org.cachebench.CacheBenchmarkRunner
+
+if [ "$DEBUG" =3D "debug" ]
+then
+   echo Executing:
+   echo ${TO_EXECUTE}
+   echo
+fi
+
+${TO_EXECUTE} &
+echo $!>${PIDFILE}
 echo "Return code from benchmark runner is $?"
 =


Modified: benchmarks/benchmark-fwk/trunk/src/org/cachebench/CacheBenchmarkR=
unner.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- benchmarks/benchmark-fwk/trunk/src/org/cachebench/CacheBenchmarkRunner.=
java	2008-01-24 12:12:47 UTC (rev 5212)
+++ benchmarks/benchmark-fwk/trunk/src/org/cachebench/CacheBenchmarkRunner.=
java	2008-01-24 13:10:34 UTC (rev 5213)
@@ -16,6 +16,7 @@
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
+import java.util.Map;
 =

 =

 /**
@@ -102,7 +103,12 @@
             cache =3D getCacheWrapperInstance(test);
             if (cache !=3D null)
             {
-               cache.init(test.getParams());
+               Map<String,String> params =3D test.getParams();
+               // now add the config file, if any is passed in:
+               String configSystemProperty =3D System.getProperty("cacheBe=
nchFwk.cacheConfigFile");
+               if (configSystemProperty !=3D null) params.put("config", co=
nfigSystemProperty);
+               logger.info("Initialising cache with params " + params);
+               cache.init(params);
                barrier("BEFORE_WARMUP");
                warmupCache(test, cache);
                barrier("AFTER_WARMUP");


--===============5635574841672115719==--

From jbosscache-commits at lists.jboss.org Thu Jan 24 08:11:46 2008
Content-Type: multipart/mixed; boundary="===============8823960669291455512=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r5214 -
 benchmarks/benchmark-fwk/trunk.
Date: Thu, 24 Jan 2008 08:11:46 -0500
Message-ID: <E1JI1ru-00060g-KO@committer01.frg.pub.inap.atl.jboss.com>

--===============8823960669291455512==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: manik.surtani(a)jboss.com
Date: 2008-01-24 08:11:46 -0500 (Thu, 24 Jan 2008)
New Revision: 5214

Added:
   benchmarks/benchmark-fwk/trunk/README.txt
Removed:
   benchmarks/benchmark-fwk/trunk/doc/
Log:
Added README.txt

Added: benchmarks/benchmark-fwk/trunk/README.txt
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- benchmarks/benchmark-fwk/trunk/README.txt	                        (rev =
0)
+++ benchmarks/benchmark-fwk/trunk/README.txt	2008-01-24 13:11:46 UTC (rev =
5214)
@@ -0,0 +1,6 @@
+README.txt
+
+All information on this framework, including usage, is maintained online:
+
+   http://wiki.jboss.org/wiki/Wiki.jsp?page=3DCacheBenchmarkFramework
+


--===============8823960669291455512==--

From jbosscache-commits at lists.jboss.org Thu Jan 24 08:13:05 2008
Content-Type: multipart/mixed; boundary="===============1023839398146555182=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r5215 -
 benchmarks/benchmark-fwk/trunk.
Date: Thu, 24 Jan 2008 08:13:04 -0500
Message-ID: <E1JI1tA-00062p-Tt@committer01.frg.pub.inap.atl.jboss.com>

--===============1023839398146555182==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: manik.surtani(a)jboss.com
Date: 2008-01-24 08:13:04 -0500 (Thu, 24 Jan 2008)
New Revision: 5215

Modified:
   benchmarks/benchmark-fwk/trunk/cluster.sh
Log:


Modified: benchmarks/benchmark-fwk/trunk/cluster.sh
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- benchmarks/benchmark-fwk/trunk/cluster.sh	2008-01-24 13:11:46 UTC (rev =
5214)
+++ benchmarks/benchmark-fwk/trunk/cluster.sh	2008-01-24 13:13:04 UTC (rev =
5215)
@@ -60,6 +60,6 @@
         echo "Usage: ${0} [start | stop] [cache distribution to test] [nam=
e of configuration file to use] [number of servers to launch on]"
         echo
         echo "Example:"
-        echo "        ${0} start jbosscache-2.0.0 repl_async.xml 6
+        echo "        ${0} start jbosscache-2.0.0 repl_async.xml 6"
         ;;
 esac


--===============1023839398146555182==--

From jbosscache-commits at lists.jboss.org Thu Jan 24 08:20:45 2008
Content-Type: multipart/mixed; boundary="===============1653386494705441897=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r5216 -
 benchmarks/benchmark-fwk/trunk.
Date: Thu, 24 Jan 2008 08:20:45 -0500
Message-ID: <E1JI20b-0007vp-7n@committer01.frg.pub.inap.atl.jboss.com>

--===============1653386494705441897==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: manik.surtani(a)jboss.com
Date: 2008-01-24 08:20:44 -0500 (Thu, 24 Jan 2008)
New Revision: 5216

Modified:
   benchmarks/benchmark-fwk/trunk/cluster.sh
Log:
Updated script

Modified: benchmarks/benchmark-fwk/trunk/cluster.sh
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- benchmarks/benchmark-fwk/trunk/cluster.sh	2008-01-24 13:13:04 UTC (rev =
5215)
+++ benchmarks/benchmark-fwk/trunk/cluster.sh	2008-01-24 13:20:44 UTC (rev =
5216)
@@ -48,11 +48,11 @@
          done
         ;;
     stop)
-      for ((idx=3D0; idx < NUM_SERVERS ; idx++))
+      for ((idx=3D0; idx < ${#HOSTNAMES[*]} ; idx++))
          do
             server=3D"${HOSTNAMES[idx]}"
             echo Starting CacheBenchmarkFramework on host ${server}
-            ssh ${SSH_USER}@${server}.${DOMAIN} "cd ${CACHE_BENCHMARK_HOME=
} &&  ./killNode.sh"
+            ssh ${SSH_USER}@${server}.${DOMAIN} "cd ${CACHE_BENCHMARK_HOME=
} &&  ./killNode.sh &"
             sleep 2
          done
       ;;


--===============1653386494705441897==--

From jbosscache-commits at lists.jboss.org Thu Jan 24 08:22:55 2008
Content-Type: multipart/mixed; boundary="===============3408954465813710308=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r5217 -
 benchmarks/benchmark-fwk/trunk.
Date: Thu, 24 Jan 2008 08:22:55 -0500
Message-ID: <E1JI22h-00081T-Jh@committer01.frg.pub.inap.atl.jboss.com>

--===============3408954465813710308==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: manik.surtani(a)jboss.com
Date: 2008-01-24 08:22:55 -0500 (Thu, 24 Jan 2008)
New Revision: 5217

Modified:
   benchmarks/benchmark-fwk/trunk/cluster.sh
Log:
Updated help docs

Modified: benchmarks/benchmark-fwk/trunk/cluster.sh
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- benchmarks/benchmark-fwk/trunk/cluster.sh	2008-01-24 13:20:44 UTC (rev =
5216)
+++ benchmarks/benchmark-fwk/trunk/cluster.sh	2008-01-24 13:22:55 UTC (rev =
5217)
@@ -61,5 +61,7 @@
         echo
         echo "Example:"
         echo "        ${0} start jbosscache-2.0.0 repl_async.xml 6"
+        echo "        ${0} stop"
+        echo "             Note that the stop command will stop all instan=
ces on all configured hosts"
         ;;
 esac


--===============3408954465813710308==--

From jbosscache-commits at lists.jboss.org Thu Jan 24 08:45:05 2008
Content-Type: multipart/mixed; boundary="===============2077148683305790313=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r5218 -
 benchmarks/benchmark-fwk/trunk/src/org/cachebench/smartfrog.
Date: Thu, 24 Jan 2008 08:44:27 -0500
Message-ID: <E1JI2NX-0003Vg-FH@committer01.frg.pub.inap.atl.jboss.com>

--===============2077148683305790313==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: manik.surtani(a)jboss.com
Date: 2008-01-24 08:44:27 -0500 (Thu, 24 Jan 2008)
New Revision: 5218

Modified:
   benchmarks/benchmark-fwk/trunk/src/org/cachebench/smartfrog/CacheBenchma=
rkPrim.java
Log:
removed sf

Modified: benchmarks/benchmark-fwk/trunk/src/org/cachebench/smartfrog/Cache=
BenchmarkPrim.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- benchmarks/benchmark-fwk/trunk/src/org/cachebench/smartfrog/CacheBenchm=
arkPrim.java	2008-01-24 13:22:55 UTC (rev 5217)
+++ benchmarks/benchmark-fwk/trunk/src/org/cachebench/smartfrog/CacheBenchm=
arkPrim.java	2008-01-24 13:44:27 UTC (rev 5218)
@@ -1,12 +1,12 @@
 package org.cachebench.smartfrog;
 =

-import org.smartfrog.sfcore.common.SmartFrogException;
-import org.smartfrog.sfcore.common.SmartFrogResolutionException;
-import org.smartfrog.sfcore.common.SmartFrogLivenessException;
-import org.smartfrog.sfcore.logging.LogSF;
-import org.smartfrog.sfcore.prim.Prim;
-import org.smartfrog.sfcore.prim.PrimImpl;
-import org.smartfrog.sfcore.prim.TerminationRecord;
+//import org.smartfrog.sfcore.common.SmartFrogException;
+//import org.smartfrog.sfcore.common.SmartFrogResolutionException;
+//import org.smartfrog.sfcore.common.SmartFrogLivenessException;
+//import org.smartfrog.sfcore.logging.LogSF;
+//import org.smartfrog.sfcore.prim.Prim;
+//import org.smartfrog.sfcore.prim.PrimImpl;
+//import org.smartfrog.sfcore.prim.TerminationRecord;
 =

 import java.io.*;
 import java.rmi.RemoteException;
@@ -14,178 +14,178 @@
 /**
  * @author Mircea.Markus(a)jboss.com
  */
-public class CacheBenchmarkPrim extends PrimImpl implements Prim
+public class CacheBenchmarkPrim// extends PrimImpl implements Prim
 {
-   private static LogSF log;
-
-   private int nodeIndex =3D -1;
-   private String cacheDistribution;
-   private File toRunIn;
-   private int clusterSize =3D -1;
-   private String scriptToExec;
-   private int minClusterSize;
-   private int maxClusterSize;
-
-   public CacheBenchmarkPrim() throws RemoteException
-   {
-   }
-
-   public void sfPing(Object o) throws SmartFrogLivenessException, RemoteE=
xception
-   {
-      super.sfPing(o);    //To change body of overridden methods use File =
| Settings | File Templates.
-   }
-
-   public synchronized void sfDeploy() throws SmartFrogException, RemoteEx=
ception
-   {
-      super.sfDeploy();
-      log =3D super.sfGetApplicationLog();
-      log.trace("deploy started");
-      //reading the attributes here
-      nodeIndex =3D (Integer) sfResolve("nodeIndex");
-      log.info("Received current index: " + nodeIndex);
-      cacheDistribution =3D (String) sfResolve("cacheDistribution");
-      log.info("Received cache distribution: " + cacheDistribution);
-      toRunIn =3D getFwkHomeDir();
-      log.info("Received homedir: " + toRunIn);
-      clusterSize =3D (Integer)sfResolve("clusterSize");
-      log.info("Received cluster size: " + clusterSize);
-      minClusterSize =3D (Integer) sfResolve("minClusterSize");
-      log.info("Received MIN cluster size: " + minClusterSize);
-      maxClusterSize =3D (Integer) sfResolve("maxClusterSize");
-      log.info("Received MAX cluster size: " + maxClusterSize);
-      scriptToExec =3D (String) sfResolve("scriptToExec");
-      log.info("Received stringToExec: " + scriptToExec);
-      log.trace("Deploy finished");
-   }
-
-   public synchronized void sfStart() throws SmartFrogException, RemoteExc=
eption
-   {
-      if ((nodeIndex + 1) < clusterSize)
-      {
-         log.info("Running in a separate thread, not last node in the comp=
ound" + getNodeDescription());
-         Thread thread =3D new Thread()
-         {
-            public void run()
-            {
-               runBenchmark();
-            }
-         };
-         thread.start();
-      }
-      //the last node should run in a sync manner so that the coumpound wo=
uld only end when the test ends
-      else
-      {
-         log.info("Running in the same thread as this is the last node in =
the compound " + getNodeDescription());
-         runBenchmark();
-      }
-   }
-
-   private void runBenchmark()
-   {
-      try
-      {
-         super.sfStart();
-         log.trace("Entered sfStart...");
-         if (clusterSize <=3D nodeIndex)
-         {
-            log.info("Not processing this node as compund is smaller than =
" + nodeIndex + getNodeDescription());
-            return;
-         }
-         if (clusterSize < minClusterSize || clusterSize > maxClusterSize)
-         {
-            log.info("Only clusters with size in range (" + minClusterSize=
 + ", " + maxClusterSize + ") are " +
-                  "processed, skiping this one" + getNodeDescription());
-            correctTerminationOfTestsIfNeeded();
-            return;
-         }
-         String command =3D scriptToExec + " " + nodeIndex + " " + cacheDi=
stribution + " " + clusterSize;
-         log.info("Executing command: " + command);
-         Process process =3D Runtime.getRuntime().exec(command, null, toRu=
nIn);
-         InputStreamReader reader =3D new InputStreamReader(process.getInp=
utStream());
-         BufferedReader bufferedReader =3D new LineNumberReader(reader);
-         String line;
-         while ((line =3D bufferedReader.readLine()) !=3D null)
-         {
-            log.info(scriptToExec + " >>> " + line);
-         }
-         bufferedReader.close();
-         int exitValue =3D process.waitFor();
-         if (exitValue !=3D 0 )
-         {
-             log.warn("Script exited with code: " + exitValue);
-         }
-
-         correctTerminationOfTestsIfNeeded();
-      } catch (SmartFrogException e)
-      {
-         log.error("Unexpected error:" + e.getMessage(), e);
-         terminate(e);
-      } catch (IOException e)
-      {
-         log.warn("Does the script have X rights?", e);
-         terminate(e);
-
-      } catch (InterruptedException e)
-      {
-         log.err("This is quite strange", e);
-         terminate(e);
-      }
-   }
-
-   /**
-    * The test will only be terminated if this is the last cluster compoun=
d running.
-    */
-   private void correctTerminationOfTestsIfNeeded()
-   {
-      if (this.clusterSize =3D=3D this.maxClusterSize)
-      {
-         log.info("Good news, terminating ALL the tests, terminator is " +=
 getNodeDescription());
-         TerminationRecord terminationRecord =3D new TerminationRecord(Ter=
minationRecord.NORMAL, "terminated the benchmark " +
-               getNodeDescription(), null);
-         sfTerminate(terminationRecord);
-         log.info("Test terminated successfully " + getNodeDescription());
-      }
-   }
-
-   private void terminate(Exception e)
-   {
-      TerminationRecord terminationRecord =3D new TerminationRecord(Termin=
ationRecord.ABNORMAL , "terminated the benchmark " +
-            getNodeDescription(),null, e);
-      sfTerminate(terminationRecord);
-
-   }
-
-   private File getFwkHomeDir()
-         throws SmartFrogResolutionException, RemoteException
-   {
-      File toRunIn;
-      String cacheBenchmarkHome =3D sfResolve("cacheBenchmarkHome") + "";
-      toRunIn =3D new File(cacheBenchmarkHome);
-      if (!toRunIn.isDirectory())
-      {
-         log.error("cacheBenchmarkHome is not specified correctly: " + cac=
heBenchmarkHome);
-      }
-      return toRunIn;
-   }
-
-   protected synchronized void sfTerminateWith(TerminationRecord terminati=
onRecord)
-   {
-      super.sfTerminateWith(terminationRecord);
-      log.info("sfTerminateWith called with value:" +  terminationRecord);
-   }
-
-   public String getNodeDescription()
-   {
-      return "( clusterSize:" + clusterSize + ", nodeIndex:" + this.nodeIn=
dex + " )";
-   }
-
-   /**
-    * Ugly HACK - seems like if the parent is pending in an sfRun, e.g. th=
en it would not send hart beat checks
-    * to the childrens so they would consider a issues.
-    * Might be that this is not a totally proper scenarion for using the f=
ramework, but it solves our needs.
-    */
-   protected void sfLivenessFailure(Object source, Object target, Throwabl=
e failure)
-   {
-      log.trace("Recieved liveness error, ignoring. Source:" + source + ",=
 target:" + target + ", failure: " + failure);
-   }
+//   private static LogSF log;
+//
+//   private int nodeIndex =3D -1;
+//   private String cacheDistribution;
+//   private File toRunIn;
+//   private int clusterSize =3D -1;
+//   private String scriptToExec;
+//   private int minClusterSize;
+//   private int maxClusterSize;
+//
+//   public CacheBenchmarkPrim() throws RemoteException
+//   {
+//   }
+//
+//   public void sfPing(Object o) throws SmartFrogLivenessException, Remot=
eException
+//   {
+//      super.sfPing(o);    //To change body of overridden methods use Fil=
e | Settings | File Templates.
+//   }
+//
+//   public synchronized void sfDeploy() throws SmartFrogException, Remote=
Exception
+//   {
+//      super.sfDeploy();
+//      log =3D super.sfGetApplicationLog();
+//      log.trace("deploy started");
+//      //reading the attributes here
+//      nodeIndex =3D (Integer) sfResolve("nodeIndex");
+//      log.info("Received current index: " + nodeIndex);
+//      cacheDistribution =3D (String) sfResolve("cacheDistribution");
+//      log.info("Received cache distribution: " + cacheDistribution);
+//      toRunIn =3D getFwkHomeDir();
+//      log.info("Received homedir: " + toRunIn);
+//      clusterSize =3D (Integer)sfResolve("clusterSize");
+//      log.info("Received cluster size: " + clusterSize);
+//      minClusterSize =3D (Integer) sfResolve("minClusterSize");
+//      log.info("Received MIN cluster size: " + minClusterSize);
+//      maxClusterSize =3D (Integer) sfResolve("maxClusterSize");
+//      log.info("Received MAX cluster size: " + maxClusterSize);
+//      scriptToExec =3D (String) sfResolve("scriptToExec");
+//      log.info("Received stringToExec: " + scriptToExec);
+//      log.trace("Deploy finished");
+//   }
+//
+//   public synchronized void sfStart() throws SmartFrogException, RemoteE=
xception
+//   {
+//      if ((nodeIndex + 1) < clusterSize)
+//      {
+//         log.info("Running in a separate thread, not last node in the co=
mpound" + getNodeDescription());
+//         Thread thread =3D new Thread()
+//         {
+//            public void run()
+//            {
+//               runBenchmark();
+//            }
+//         };
+//         thread.start();
+//      }
+//      //the last node should run in a sync manner so that the coumpound =
would only end when the test ends
+//      else
+//      {
+//         log.info("Running in the same thread as this is the last node i=
n the compound " + getNodeDescription());
+//         runBenchmark();
+//      }
+//   }
+//
+//   private void runBenchmark()
+//   {
+//      try
+//      {
+//         super.sfStart();
+//         log.trace("Entered sfStart...");
+//         if (clusterSize <=3D nodeIndex)
+//         {
+//            log.info("Not processing this node as compund is smaller tha=
n " + nodeIndex + getNodeDescription());
+//            return;
+//         }
+//         if (clusterSize < minClusterSize || clusterSize > maxClusterSiz=
e)
+//         {
+//            log.info("Only clusters with size in range (" + minClusterSi=
ze + ", " + maxClusterSize + ") are " +
+//                  "processed, skiping this one" + getNodeDescription());
+//            correctTerminationOfTestsIfNeeded();
+//            return;
+//         }
+//         String command =3D scriptToExec + " " + nodeIndex + " " + cache=
Distribution + " " + clusterSize;
+//         log.info("Executing command: " + command);
+//         Process process =3D Runtime.getRuntime().exec(command, null, to=
RunIn);
+//         InputStreamReader reader =3D new InputStreamReader(process.getI=
nputStream());
+//         BufferedReader bufferedReader =3D new LineNumberReader(reader);
+//         String line;
+//         while ((line =3D bufferedReader.readLine()) !=3D null)
+//         {
+//            log.info(scriptToExec + " >>> " + line);
+//         }
+//         bufferedReader.close();
+//         int exitValue =3D process.waitFor();
+//         if (exitValue !=3D 0 )
+//         {
+//             log.warn("Script exited with code: " + exitValue);
+//         }
+//
+//         correctTerminationOfTestsIfNeeded();
+//      } catch (SmartFrogException e)
+//      {
+//         log.error("Unexpected error:" + e.getMessage(), e);
+//         terminate(e);
+//      } catch (IOException e)
+//      {
+//         log.warn("Does the script have X rights?", e);
+//         terminate(e);
+//
+//      } catch (InterruptedException e)
+//      {
+//         log.err("This is quite strange", e);
+//         terminate(e);
+//      }
+//   }
+//
+//   /**
+//    * The test will only be terminated if this is the last cluster compo=
und running.
+//    */
+//   private void correctTerminationOfTestsIfNeeded()
+//   {
+//      if (this.clusterSize =3D=3D this.maxClusterSize)
+//      {
+//         log.info("Good news, terminating ALL the tests, terminator is "=
 + getNodeDescription());
+//         TerminationRecord terminationRecord =3D new TerminationRecord(T=
erminationRecord.NORMAL, "terminated the benchmark " +
+//               getNodeDescription(), null);
+//         sfTerminate(terminationRecord);
+//         log.info("Test terminated successfully " + getNodeDescription()=
);
+//      }
+//   }
+//
+//   private void terminate(Exception e)
+//   {
+//      TerminationRecord terminationRecord =3D new TerminationRecord(Term=
inationRecord.ABNORMAL , "terminated the benchmark " +
+//            getNodeDescription(),null, e);
+//      sfTerminate(terminationRecord);
+//
+//   }
+//
+//   private File getFwkHomeDir()
+//         throws SmartFrogResolutionException, RemoteException
+//   {
+//      File toRunIn;
+//      String cacheBenchmarkHome =3D sfResolve("cacheBenchmarkHome") + "";
+//      toRunIn =3D new File(cacheBenchmarkHome);
+//      if (!toRunIn.isDirectory())
+//      {
+//         log.error("cacheBenchmarkHome is not specified correctly: " + c=
acheBenchmarkHome);
+//      }
+//      return toRunIn;
+//   }
+//
+//   protected synchronized void sfTerminateWith(TerminationRecord termina=
tionRecord)
+//   {
+//      super.sfTerminateWith(terminationRecord);
+//      log.info("sfTerminateWith called with value:" +  terminationRecord=
);
+//   }
+//
+//   public String getNodeDescription()
+//   {
+//      return "( clusterSize:" + clusterSize + ", nodeIndex:" + this.node=
Index + " )";
+//   }
+//
+//   /**
+//    * Ugly HACK - seems like if the parent is pending in an sfRun, e.g. =
then it would not send hart beat checks
+//    * to the childrens so they would consider a issues.
+//    * Might be that this is not a totally proper scenarion for using the=
 framework, but it solves our needs.
+//    */
+//   protected void sfLivenessFailure(Object source, Object target, Throwa=
ble failure)
+//   {
+//      log.trace("Recieved liveness error, ignoring. Source:" + source + =
", target:" + target + ", failure: " + failure);
+//   }
 }


--===============2077148683305790313==--

From jbosscache-commits at lists.jboss.org Thu Jan 24 08:50:41 2008
Content-Type: multipart/mixed; boundary="===============7754993755481533931=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r5219 -
 benchmarks/benchmark-fwk/trunk.
Date: Thu, 24 Jan 2008 08:50:41 -0500
Message-ID: <E1JI2TZ-0005O1-HW@committer01.frg.pub.inap.atl.jboss.com>

--===============7754993755481533931==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: manik.surtani(a)jboss.com
Date: 2008-01-24 08:50:41 -0500 (Thu, 24 Jan 2008)
New Revision: 5219

Modified:
   benchmarks/benchmark-fwk/trunk/cluster.sh
   benchmarks/benchmark-fwk/trunk/runNode.sh
Log:
Added support for user JVM params

Modified: benchmarks/benchmark-fwk/trunk/cluster.sh
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- benchmarks/benchmark-fwk/trunk/cluster.sh	2008-01-24 13:44:27 UTC (rev =
5218)
+++ benchmarks/benchmark-fwk/trunk/cluster.sh	2008-01-24 13:50:41 UTC (rev =
5219)
@@ -27,6 +27,8 @@
 # Number of servers to launch on - taken from the command line.
 NUM_SERVERS=3D${4}
 =

+USER_JVM_PARAMS=3D${5}
+
 COMMAND=3D${1}
 =

 # the DNS domain of your servers
@@ -43,7 +45,7 @@
          do
             server=3D"${HOSTNAMES[idx]}"
             echo Starting CacheBenchmarkFramework on host ${server}
-            ssh ${SSH_USER}@${server}.${DOMAIN} "cd ${CACHE_BENCHMARK_HOME=
} &&  ./runNode.sh ${idx} ${CACHE_DIST} ${CFG_FILE} ${NUM_SERVERS}"
+            ssh ${SSH_USER}@${server}.${DOMAIN} "cd ${CACHE_BENCHMARK_HOME=
} &&  ./runNode.sh ${idx} ${CACHE_DIST} ${CFG_FILE} ${NUM_SERVERS} ${USER_J=
VM_PARAMS}"
             sleep 2
          done
         ;;
@@ -57,10 +59,10 @@
          done
       ;;
     *)
-        echo "Usage: ${0} [start | stop] [cache distribution to test] [nam=
e of configuration file to use] [number of servers to launch on]"
+        echo "Usage: ${0} [start | stop] [cache distribution to test] [nam=
e of configuration file to use] [number of servers to launch on] [optional =
JVM params]"
         echo
         echo "Example:"
-        echo "        ${0} start jbosscache-2.0.0 repl_async.xml 6"
+        echo "        ${0} start jbosscache-2.0.0 repl_async.xml 6 \"-Dbin=
d.address=3D1.2.3.4 -Dxyz=3Dabc\""
         echo "        ${0} stop"
         echo "             Note that the stop command will stop all instan=
ces on all configured hosts"
         ;;

Modified: benchmarks/benchmark-fwk/trunk/runNode.sh
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- benchmarks/benchmark-fwk/trunk/runNode.sh	2008-01-24 13:44:27 UTC (rev =
5218)
+++ benchmarks/benchmark-fwk/trunk/runNode.sh	2008-01-24 13:50:41 UTC (rev =
5219)
@@ -4,12 +4,12 @@
 # those would make an automatic conversion from unix CLASSPATH to win clas=
spath, needed when executing java -cp
 =

 preferIPv4Stack=3Dtrue
-
+DEBUG=3Dfalse
 CURRENT_INDEX=3D${1}
 CACHE_PRODUCT=3D${2}
 TEST_CFG=3D${3}
 CLUSTER_SIZE=3D${4}
-DEBUG=3D${5}
+USER_JVM_PARAMS=3D${5}
 PIDFILE=3D"PID.pid"
 if [ -e ${PIDFILE} ]
 then
@@ -29,11 +29,12 @@
 then
    echo Usage:
    echo =

-   echo      ./runNode.sh [current node index] [cache product to test] [te=
st config file] [cluster size]
+   echo      ./runNode.sh [current node index] [cache product to test] [te=
st config file] [cluster size] [JVM params (optional)]
    echo param [current node index]    : the index of this node in the list=
 of nodes in the cluster [0 .. <cluster size> - 1]
    echo param [cache product to test] : must be one of the directories nam=
es under './cache-products'
    echo param [test config file]      : configuration file to use with the=
 cache product.  Typically resides in './cache-products/XXX/conf/'
    echo param [cluster size]          : total number of nodes that will ru=
n tests.
+   echo param [JVM params]            : an optional extra set of parameter=
s to be passed to the JVM - e.g., "-Dbind.address=3D127.0.0.1 -Dxyz=3Dabc"
    echo
    echo Example: './runNode.sh 0 jbosscache-2.0.0 repl_async.xml 3' will s=
tart the 1st node running an instance of jbc2.0.0 on a cluster made out of =
3 nodes, using the repl_async configuration.
    exit 1
@@ -59,7 +60,7 @@
   exit 2
 fi
 =

-JVM_OPTIONS=3D"${JVM_OPTIONS} -DcacheBenchFwk.cacheConfigFile=3D${TEST_CFG=
} -DcurrentIndex=3D${CURRENT_INDEX} -DclusterSize=3D${CLUSTER_SIZE} -Dcurre=
ntIndex=3D${CURRENT_INDEX} -Djava.net.preferIPv4Stack=3D${preferIPv4Stack}"
+JVM_OPTIONS=3D"${JVM_OPTIONS} ${USER_JVM_PARAMS} -DcacheBenchFwk.cacheConf=
igFile=3D${TEST_CFG} -DcurrentIndex=3D${CURRENT_INDEX} -DclusterSize=3D${CL=
USTER_SIZE} -DcurrentIndex=3D${CURRENT_INDEX} -Djava.net.preferIPv4Stack=3D=
${preferIPv4Stack}"
 TO_EXECUTE=3D"java $JVM_OPTIONS -cp $CLASSPATH org.cachebench.CacheBenchma=
rkRunner"
 =

 if [ "$DEBUG" =3D "debug" ]


--===============7754993755481533931==--

From jbosscache-commits at lists.jboss.org Thu Jan 24 08:51:05 2008
Content-Type: multipart/mixed; boundary="===============6002517516839612340=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r5220 -
 benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-1.4.1/conf.
Date: Thu, 24 Jan 2008 08:51:04 -0500
Message-ID: <E1JI2Tw-0005PN-Rv@committer01.frg.pub.inap.atl.jboss.com>

--===============6002517516839612340==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: manik.surtani(a)jboss.com
Date: 2008-01-24 08:51:04 -0500 (Thu, 24 Jan 2008)
New Revision: 5220

Added:
   benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-1.4.1/conf/pess=
-repl-async-br.xml
Modified:
   benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-1.4.1/conf/pess=
-repl-async.xml
   benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-1.4.1/conf/pess=
-repl-sync.xml
Log:
Updated cfgs for 1.4.1 testing

Copied: benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-1.4.1/conf=
/pess-repl-async-br.xml (from rev 5215, benchmarks/benchmark-fwk/trunk/cach=
e-products/jbosscache-1.4.1/conf/pess-repl-async.xml)
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-1.4.1/conf/pes=
s-repl-async-br.xml	                        (rev 0)
+++ benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-1.4.1/conf/pes=
s-repl-async-br.xml	2008-01-24 13:51:04 UTC (rev 5220)
@@ -0,0 +1,72 @@
+<?xml version=3D"1.0" encoding=3D"UTF-8"?>
+
+<server>
+   <classpath codebase=3D"./lib" archives=3D"jboss-cache.jar, jgroups.jar"=
/>
+
+   <mbean code=3D"org.jboss.cache.TreeCache" name=3D"jboss.cache:service=
=3DTreeCache">
+
+      <depends>jboss:service=3DNaming</depends>
+      <depends>jboss:service=3DTransactionManager</depends>
+      <attribute name=3D"TransactionManagerLookupClass">org.jboss.cache.Du=
mmyTransactionManagerLookup</attribute>
+
+      <attribute name=3D"IsolationLevel">REPEATABLE_READ</attribute>
+      <attribute name=3D"CacheMode">REPL_ASYNC</attribute>
+      <attribute name=3D"UseReplQueue">false</attribute>
+      <attribute name=3D"ReplQueueInterval">0</attribute>
+      <attribute name=3D"ReplQueueMaxElements">0</attribute>
+      <attribute name=3D"ClusterName">TreeCache-Cluster</attribute>
+      <attribute name=3D"ClusterConfig">
+         <config>
+            <TCP recv_buf_size=3D"20000000" use_send_queues=3D"false"
+                 loopback=3D"false"
+                 discard_incompatible_packets=3D"true"
+                 max_bundle_size=3D"64000"
+                 max_bundle_timeout=3D"30"
+                 use_incoming_packet_handler=3D"true"
+                 enable_bundling=3D"true"
+                 enable_unicast_bundling=3D"true"
+                 enable_diagnostics=3D"true"
+                  />
+            <MPING mcast_addr=3D"232.1.2.3" timeout=3D"2000" num_initial_m=
embers=3D"2"/>
+            <MERGE2 max_interval=3D"30000" min_interval=3D"10000"/>
+            <FD_SOCK/>
+            <VERIFY_SUSPECT timeout=3D"1500"/>
+            <pbcast.NAKACK use_mcast_xmit=3D"false" gc_lag=3D"0"
+                           retransmit_timeout=3D"300,600,1200,2400,4800"
+                           discard_delivered_msgs=3D"true"/>
+            <pbcast.STABLE stability_delay=3D"1000" desired_avg_gossip=3D"=
50000"
+                           max_bytes=3D"400000"/>
+            <pbcast.GMS print_local_addr=3D"true" join_timeout=3D"5000"
+                        join_retry_timeout=3D"2000" shun=3D"false"
+                        view_bundling=3D"true" view_ack_collection_timeout=
=3D"5000"/>
+            <FC max_credits=3D"5000000"
+                min_threshold=3D"0.20"/>
+            <FRAG2 frag_size=3D"60000"/>
+            <pbcast.STATE_TRANSFER up_thread=3D"true" down_thread=3D"true"=
/>
+         </config>
+      </attribute>
+      <attribute name=3D"FetchInMemoryState">true</attribute>
+      <attribute name=3D"InitialStateRetrievalTimeout">15000</attribute>
+      <attribute name=3D"SyncReplTimeout">60000</attribute>
+      <attribute name=3D"LockAcquisitionTimeout">10000</attribute>
+      <attribute name=3D"EvictionPolicyClass"></attribute>
+      <attribute name=3D"UseRegionBasedMarshalling">false</attribute>
+
+      <attribute name=3D"BuddyReplicationConfig">
+         <config>
+            <buddyReplicationEnabled>true</buddyReplicationEnabled>
+            <buddyLocatorClass>org.jboss.cache.buddyreplication.NextMember=
BuddyLocator</buddyLocatorClass>
+            <buddyLocatorProperties>
+               numBuddies =3D 1
+               ignoreColocatedBuddies =3D true
+            </buddyLocatorProperties>
+            <buddyPoolName>myBuddyPoolReplicationGroup</buddyPoolName>
+            <buddyCommunicationTimeout>10000</buddyCommunicationTimeout>
+            <dataGravitationRemoveOnFind>true</dataGravitationRemoveOnFind>
+            <dataGravitationSearchBackupTrees>true</dataGravitationSearchB=
ackupTrees>
+            <autoDataGravitation>false</autoDataGravitation>
+         </config>
+      </attribute>
+   </mbean>
+
+</server>

Modified: benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-1.4.1/co=
nf/pess-repl-async.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-1.4.1/conf/pes=
s-repl-async.xml	2008-01-24 13:50:41 UTC (rev 5219)
+++ benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-1.4.1/conf/pes=
s-repl-async.xml	2008-01-24 13:51:04 UTC (rev 5220)
@@ -1,147 +1,49 @@
 <?xml version=3D"1.0" encoding=3D"UTF-8"?>
-
-<!-- =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D -->
-<!--                                                                      =
 -->
-<!--  Sample TreeCache Service Configuration                              =
 -->
-<!--                                                                      =
 -->
-<!-- =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D -->
-
 <server>
 =

-    <classpath codebase=3D"./lib" archives=3D"jboss-cache.jar, jgroups.jar=
"/>
+   <classpath codebase=3D"./lib" archives=3D"jboss-cache.jar, jgroups.jar"=
/>
+   <mbean code=3D"org.jboss.cache.TreeCache" name=3D"jboss.cache:service=
=3DTreeCache">
 =

-
-    <!-- =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D -->
-    <!-- Defines TreeCache configuration                                  =
    -->
-    <!-- =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D -->
-
-    <mbean code=3D"org.jboss.cache.TreeCache"
-        name=3D"jboss.cache:service=3DTreeCache">
-
-        <depends>jboss:service=3DNaming</depends>
-        <depends>jboss:service=3DTransactionManager</depends>
-
-        <!--
-        Configure the TransactionManager
-    -->
-        <attribute name=3D"TransactionManagerLookupClass">org.jboss.cache.=
DummyTransactionManagerLookup</attribute>
-
-        <!--
-            Isolation level : SERIALIZABLE
-                              REPEATABLE_READ (default)
-                              READ_COMMITTED
-                              READ_UNCOMMITTED
-                              NONE
-        -->
-        <attribute name=3D"IsolationLevel">REPEATABLE_READ</attribute>
-
-        <!--
-             Valid modes are LOCAL
-                             REPL_ASYNC
-                             REPL_SYNC
-                             INVALIDATION_ASYNC
-                             INVALIDATION_SYNC
-        -->
-        <attribute name=3D"CacheMode">REPL_ASYNC</attribute>
-
-        <!--
-        Just used for async repl: use a replication queue
-        -->
-        <attribute name=3D"UseReplQueue">false</attribute>
-
-        <!--
-            Replication interval for replication queue (in ms)
-        -->
-        <attribute name=3D"ReplQueueInterval">0</attribute>
-
-        <!--
-            Max number of elements which trigger replication
-        -->
-        <attribute name=3D"ReplQueueMaxElements">0</attribute>
-
-        <!-- Name of cluster. Needs to be the same for all clusters, in or=
der
-             to find each other
-        -->
-        <attribute name=3D"ClusterName">TreeCache-Cluster</attribute>
-
-        <!-- JGroups protocol stack properties. Can also be a URL,
-             e.g. file:/home/bela/default.xml
-           <attribute name=3D"ClusterProperties"></attribute>
-        -->
-
-        <attribute name=3D"ClusterConfig">
-            <config>
-                <!-- UDP: if you have a multihomed machine,
-                set the bind_addr attribute to the appropriate NIC IP addr=
ess, e.g bind_addr=3D"192.168.0.2"
-                -->
-                <!-- UDP: On Windows machines, because of the media sense =
feature
-                 being broken with multicast (even after disabling media s=
ense)
-                 set the loopback attribute to true -->
-                <UDP mcast_addr=3D"228.1.2.3" mcast_port=3D"48866"
-                    ip_ttl=3D"64" ip_mcast=3D"true" =

-                    mcast_send_buf_size=3D"150000" mcast_recv_buf_size=3D"=
80000"
-                    ucast_send_buf_size=3D"150000" ucast_recv_buf_size=3D"=
80000"
-                    loopback=3D"false"/>
-                <PING timeout=3D"2000" num_initial_members=3D"3"
-                    up_thread=3D"false" down_thread=3D"false"/>
-                <MERGE2 min_interval=3D"10000" max_interval=3D"20000"/>
-                <!--        <FD shun=3D"true" up_thread=3D"true" down_thre=
ad=3D"true" />-->
-                <FD_SOCK/>
-                <VERIFY_SUSPECT timeout=3D"1500"
-                    up_thread=3D"false" down_thread=3D"false"/>
-                <pbcast.NAKACK gc_lag=3D"50" retransmit_timeout=3D"600,120=
0,2400,4800"
-                    max_xmit_size=3D"8192" up_thread=3D"false" down_thread=
=3D"false"/>
-                <UNICAST timeout=3D"600,1200,2400" window_size=3D"100" min=
_threshold=3D"10"
-                    down_thread=3D"false"/>
-                <pbcast.STABLE desired_avg_gossip=3D"20000"
-                    up_thread=3D"false" down_thread=3D"false"/>
-                <FRAG frag_size=3D"8192"
-                    down_thread=3D"false" up_thread=3D"false"/>
-                <pbcast.GMS join_timeout=3D"5000" join_retry_timeout=3D"20=
00"
-                    shun=3D"true" print_local_addr=3D"true"/>
-                <pbcast.STATE_TRANSFER up_thread=3D"true" down_thread=3D"t=
rue"/>
-            </config>
-        </attribute>
-
-
-        <!--
-         Whether or not to fetch state on joining a cluster
-         NOTE this used to be called FetchStateOnStartup and has been rena=
med to be more descriptive.
-        -->
-        <attribute name=3D"FetchInMemoryState">false</attribute>
-
-        <!--
-            The max amount of time (in milliseconds) we wait until the
-            initial state (ie. the contents of the cache) are retrieved fr=
om
-            existing members in a clustered environment
-        -->
-        <attribute name=3D"InitialStateRetrievalTimeout">15000</attribute>
-
-        <!--
-            Number of milliseconds to wait until all responses for a
-            synchronous call have been received.
-        -->
-        <attribute name=3D"SyncReplTimeout">60000</attribute>
-
-        <!-- Max number of milliseconds to wait for a lock acquisition -->
-        <attribute name=3D"LockAcquisitionTimeout">10000</attribute>
-
-        <!-- Name of the eviction policy class. -->
-        <attribute name=3D"EvictionPolicyClass"></attribute>
-
-       <!--
-          Indicate whether to use region based marshalling or not. Set thi=
s to true if you are running under a scoped
-          class loader, e.g., inside an application server. Default is "fa=
lse".
-       -->
-        <attribute name=3D"UseRegionBasedMarshalling">false</attribute>
-    </mbean>
-
-
-   <!--  Uncomment to get a graphical view of the TreeCache MBean above -->
-   <!--   <mbean code=3D"org.jboss.cache.TreeCacheView" name=3D"jboss.cach=
e:service=3DTreeCacheView">-->
-   <!--      <depends>jboss.cache:service=3DTreeCache</depends>-->
-   <!--      <attribute name=3D"CacheService">jboss.cache:service=3DTreeCa=
che</attribute>-->
-   <!--   </mbean>-->
-
-
+      <depends>jboss:service=3DNaming</depends>
+      <depends>jboss:service=3DTransactionManager</depends>
+      <attribute name=3D"TransactionManagerLookupClass">org.jboss.cache.Du=
mmyTransactionManagerLookup</attribute>
+      <attribute name=3D"IsolationLevel">REPEATABLE_READ</attribute>
+      <attribute name=3D"CacheMode">REPL_ASYNC</attribute>
+      <attribute name=3D"UseReplQueue">false</attribute>
+      <attribute name=3D"ReplQueueInterval">0</attribute>
+      <attribute name=3D"ReplQueueMaxElements">0</attribute>
+      <attribute name=3D"ClusterName">TreeCache-Cluster</attribute>
+      <attribute name=3D"ClusterConfig">
+         <config>
+            <UDP mcast_addr=3D"232.1.2.3" mcast_port=3D"48866"
+                 ip_ttl=3D"64" ip_mcast=3D"true"
+                 mcast_send_buf_size=3D"150000" mcast_recv_buf_size=3D"800=
00"
+                 ucast_send_buf_size=3D"150000" ucast_recv_buf_size=3D"800=
00"
+                 loopback=3D"false"/>
+            <PING timeout=3D"2000" num_initial_members=3D"3"
+                  up_thread=3D"false" down_thread=3D"false"/>
+            <MERGE2 min_interval=3D"10000" max_interval=3D"20000"/>
+            <FD_SOCK/>
+            <VERIFY_SUSPECT timeout=3D"1500"
+                            up_thread=3D"false" down_thread=3D"false"/>
+            <pbcast.NAKACK gc_lag=3D"50" retransmit_timeout=3D"600,1200,24=
00,4800"
+                           max_xmit_size=3D"8192" up_thread=3D"false" down=
_thread=3D"false"/>
+            <UNICAST timeout=3D"600,1200,2400" window_size=3D"100" min_thr=
eshold=3D"10"
+                     down_thread=3D"false"/>
+            <pbcast.STABLE desired_avg_gossip=3D"20000"
+                           up_thread=3D"false" down_thread=3D"false"/>
+            <FRAG frag_size=3D"8192"
+                  down_thread=3D"false" up_thread=3D"false"/>
+            <pbcast.GMS join_timeout=3D"5000" join_retry_timeout=3D"2000"
+                        shun=3D"true" print_local_addr=3D"true"/>
+            <pbcast.STATE_TRANSFER up_thread=3D"true" down_thread=3D"true"=
/>
+         </config>
+      </attribute>
+      <attribute name=3D"FetchInMemoryState">false</attribute>
+      <attribute name=3D"InitialStateRetrievalTimeout">15000</attribute>
+      <attribute name=3D"SyncReplTimeout">60000</attribute>
+      <attribute name=3D"LockAcquisitionTimeout">10000</attribute>
+      <attribute name=3D"EvictionPolicyClass"></attribute>
+      <attribute name=3D"UseRegionBasedMarshalling">false</attribute>
+   </mbean>
 </server>

Modified: benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-1.4.1/co=
nf/pess-repl-sync.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-1.4.1/conf/pes=
s-repl-sync.xml	2008-01-24 13:50:41 UTC (rev 5219)
+++ benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-1.4.1/conf/pes=
s-repl-sync.xml	2008-01-24 13:51:04 UTC (rev 5220)
@@ -1,147 +1,49 @@
 <?xml version=3D"1.0" encoding=3D"UTF-8"?>
-
-<!-- =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D -->
-<!--                                                                      =
 -->
-<!--  Sample TreeCache Service Configuration                              =
 -->
-<!--                                                                      =
 -->
-<!-- =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D -->
-
 <server>
 =

-    <classpath codebase=3D"./lib" archives=3D"jboss-cache.jar, jgroups.jar=
"/>
+   <classpath codebase=3D"./lib" archives=3D"jboss-cache.jar, jgroups.jar"=
/>
+   <mbean code=3D"org.jboss.cache.TreeCache" name=3D"jboss.cache:service=
=3DTreeCache">
 =

-
-    <!-- =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D -->
-    <!-- Defines TreeCache configuration                                  =
    -->
-    <!-- =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D -->
-
-    <mbean code=3D"org.jboss.cache.TreeCache"
-        name=3D"jboss.cache:service=3DTreeCache">
-
-        <depends>jboss:service=3DNaming</depends>
-        <depends>jboss:service=3DTransactionManager</depends>
-
-        <!--
-        Configure the TransactionManager
-    -->
-        <attribute name=3D"TransactionManagerLookupClass">org.jboss.cache.=
DummyTransactionManagerLookup</attribute>
-
-        <!--
-            Isolation level : SERIALIZABLE
-                              REPEATABLE_READ (default)
-                              READ_COMMITTED
-                              READ_UNCOMMITTED
-                              NONE
-        -->
-        <attribute name=3D"IsolationLevel">REPEATABLE_READ</attribute>
-
-        <!--
-             Valid modes are LOCAL
-                             REPL_ASYNC
-                             REPL_SYNC
-                             INVALIDATION_ASYNC
-                             INVALIDATION_SYNC
-        -->
-        <attribute name=3D"CacheMode">REPL_SYNC</attribute>
-
-        <!--
-        Just used for async repl: use a replication queue
-        -->
-        <attribute name=3D"UseReplQueue">false</attribute>
-
-        <!--
-            Replication interval for replication queue (in ms)
-        -->
-        <attribute name=3D"ReplQueueInterval">0</attribute>
-
-        <!--
-            Max number of elements which trigger replication
-        -->
-        <attribute name=3D"ReplQueueMaxElements">0</attribute>
-
-        <!-- Name of cluster. Needs to be the same for all clusters, in or=
der
-             to find each other
-        -->
-        <attribute name=3D"ClusterName">TreeCache-Cluster</attribute>
-
-        <!-- JGroups protocol stack properties. Can also be a URL,
-             e.g. file:/home/bela/default.xml
-           <attribute name=3D"ClusterProperties"></attribute>
-        -->
-
-        <attribute name=3D"ClusterConfig">
-            <config>
-                <!-- UDP: if you have a multihomed machine,
-                set the bind_addr attribute to the appropriate NIC IP addr=
ess, e.g bind_addr=3D"192.168.0.2"
-                -->
-                <!-- UDP: On Windows machines, because of the media sense =
feature
-                 being broken with multicast (even after disabling media s=
ense)
-                 set the loopback attribute to true -->
-                <UDP mcast_addr=3D"228.1.2.3" mcast_port=3D"48866"
-                    ip_ttl=3D"64" ip_mcast=3D"true" =

-                    mcast_send_buf_size=3D"150000" mcast_recv_buf_size=3D"=
80000"
-                    ucast_send_buf_size=3D"150000" ucast_recv_buf_size=3D"=
80000"
-                    loopback=3D"false"/>
-                <PING timeout=3D"2000" num_initial_members=3D"3"
-                    up_thread=3D"false" down_thread=3D"false"/>
-                <MERGE2 min_interval=3D"10000" max_interval=3D"20000"/>
-                <!--        <FD shun=3D"true" up_thread=3D"true" down_thre=
ad=3D"true" />-->
-                <FD_SOCK/>
-                <VERIFY_SUSPECT timeout=3D"1500"
-                    up_thread=3D"false" down_thread=3D"false"/>
-                <pbcast.NAKACK gc_lag=3D"50" retransmit_timeout=3D"600,120=
0,2400,4800"
-                    max_xmit_size=3D"8192" up_thread=3D"false" down_thread=
=3D"false"/>
-                <UNICAST timeout=3D"600,1200,2400" window_size=3D"100" min=
_threshold=3D"10"
-                    down_thread=3D"false"/>
-                <pbcast.STABLE desired_avg_gossip=3D"20000"
-                    up_thread=3D"false" down_thread=3D"false"/>
-                <FRAG frag_size=3D"8192"
-                    down_thread=3D"false" up_thread=3D"false"/>
-                <pbcast.GMS join_timeout=3D"5000" join_retry_timeout=3D"20=
00"
-                    shun=3D"true" print_local_addr=3D"true"/>
-                <pbcast.STATE_TRANSFER up_thread=3D"true" down_thread=3D"t=
rue"/>
-            </config>
-        </attribute>
-
-
-        <!--
-         Whether or not to fetch state on joining a cluster
-         NOTE this used to be called FetchStateOnStartup and has been rena=
med to be more descriptive.
-        -->
-        <attribute name=3D"FetchInMemoryState">false</attribute>
-
-        <!--
-            The max amount of time (in milliseconds) we wait until the
-            initial state (ie. the contents of the cache) are retrieved fr=
om
-            existing members in a clustered environment
-        -->
-        <attribute name=3D"InitialStateRetrievalTimeout">15000</attribute>
-
-        <!--
-            Number of milliseconds to wait until all responses for a
-            synchronous call have been received.
-        -->
-        <attribute name=3D"SyncReplTimeout">60000</attribute>
-
-        <!-- Max number of milliseconds to wait for a lock acquisition -->
-        <attribute name=3D"LockAcquisitionTimeout">10000</attribute>
-
-        <!-- Name of the eviction policy class. -->
-        <attribute name=3D"EvictionPolicyClass"></attribute>
-
-       <!--
-          Indicate whether to use region based marshalling or not. Set thi=
s to true if you are running under a scoped
-          class loader, e.g., inside an application server. Default is "fa=
lse".
-       -->
-        <attribute name=3D"UseRegionBasedMarshalling">false</attribute>
-    </mbean>
-
-
-   <!--  Uncomment to get a graphical view of the TreeCache MBean above -->
-   <!--   <mbean code=3D"org.jboss.cache.TreeCacheView" name=3D"jboss.cach=
e:service=3DTreeCacheView">-->
-   <!--      <depends>jboss.cache:service=3DTreeCache</depends>-->
-   <!--      <attribute name=3D"CacheService">jboss.cache:service=3DTreeCa=
che</attribute>-->
-   <!--   </mbean>-->
-
-
+      <depends>jboss:service=3DNaming</depends>
+      <depends>jboss:service=3DTransactionManager</depends>
+      <attribute name=3D"TransactionManagerLookupClass">org.jboss.cache.Du=
mmyTransactionManagerLookup</attribute>
+      <attribute name=3D"IsolationLevel">REPEATABLE_READ</attribute>
+      <attribute name=3D"CacheMode">REPL_SYNC</attribute>
+      <attribute name=3D"UseReplQueue">false</attribute>
+      <attribute name=3D"ReplQueueInterval">0</attribute>
+      <attribute name=3D"ReplQueueMaxElements">0</attribute>
+      <attribute name=3D"ClusterName">TreeCache-Cluster</attribute>
+      <attribute name=3D"ClusterConfig">
+         <config>
+            <UDP mcast_addr=3D"232.1.2.3" mcast_port=3D"48866"
+                 ip_ttl=3D"64" ip_mcast=3D"true"
+                 mcast_send_buf_size=3D"150000" mcast_recv_buf_size=3D"800=
00"
+                 ucast_send_buf_size=3D"150000" ucast_recv_buf_size=3D"800=
00"
+                 loopback=3D"false"/>
+            <PING timeout=3D"2000" num_initial_members=3D"3"
+                  up_thread=3D"false" down_thread=3D"false"/>
+            <MERGE2 min_interval=3D"10000" max_interval=3D"20000"/>
+            <FD_SOCK/>
+            <VERIFY_SUSPECT timeout=3D"1500"
+                            up_thread=3D"false" down_thread=3D"false"/>
+            <pbcast.NAKACK gc_lag=3D"50" retransmit_timeout=3D"600,1200,24=
00,4800"
+                           max_xmit_size=3D"8192" up_thread=3D"false" down=
_thread=3D"false"/>
+            <UNICAST timeout=3D"600,1200,2400" window_size=3D"100" min_thr=
eshold=3D"10"
+                     down_thread=3D"false"/>
+            <pbcast.STABLE desired_avg_gossip=3D"20000"
+                           up_thread=3D"false" down_thread=3D"false"/>
+            <FRAG frag_size=3D"8192"
+                  down_thread=3D"false" up_thread=3D"false"/>
+            <pbcast.GMS join_timeout=3D"5000" join_retry_timeout=3D"2000"
+                        shun=3D"true" print_local_addr=3D"true"/>
+            <pbcast.STATE_TRANSFER up_thread=3D"true" down_thread=3D"true"=
/>
+         </config>
+      </attribute>
+      <attribute name=3D"FetchInMemoryState">false</attribute>
+      <attribute name=3D"InitialStateRetrievalTimeout">15000</attribute>
+      <attribute name=3D"SyncReplTimeout">60000</attribute>
+      <attribute name=3D"LockAcquisitionTimeout">10000</attribute>
+      <attribute name=3D"EvictionPolicyClass"></attribute>
+      <attribute name=3D"UseRegionBasedMarshalling">false</attribute>
+   </mbean>
 </server>


--===============6002517516839612340==--

From jbosscache-commits at lists.jboss.org Thu Jan 24 08:52:49 2008
Content-Type: multipart/mixed; boundary="===============0750546990768452551=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r5221 -
 benchmarks/benchmark-fwk/trunk.
Date: Thu, 24 Jan 2008 08:52:49 -0500
Message-ID: <E1JI2Vd-0005U8-0s@committer01.frg.pub.inap.atl.jboss.com>

--===============0750546990768452551==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: manik.surtani(a)jboss.com
Date: 2008-01-24 08:52:48 -0500 (Thu, 24 Jan 2008)
New Revision: 5221

Modified:
   benchmarks/benchmark-fwk/trunk/cluster.sh
Log:


Modified: benchmarks/benchmark-fwk/trunk/cluster.sh
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- benchmarks/benchmark-fwk/trunk/cluster.sh	2008-01-24 13:51:04 UTC (rev =
5220)
+++ benchmarks/benchmark-fwk/trunk/cluster.sh	2008-01-24 13:52:48 UTC (rev =
5221)
@@ -45,7 +45,7 @@
          do
             server=3D"${HOSTNAMES[idx]}"
             echo Starting CacheBenchmarkFramework on host ${server}
-            ssh ${SSH_USER}@${server}.${DOMAIN} "cd ${CACHE_BENCHMARK_HOME=
} &&  ./runNode.sh ${idx} ${CACHE_DIST} ${CFG_FILE} ${NUM_SERVERS} ${USER_J=
VM_PARAMS}"
+            ssh ${SSH_USER}@${server}.${DOMAIN} ". ./bash_profile && cd ${=
CACHE_BENCHMARK_HOME} &&  ./runNode.sh ${idx} ${CACHE_DIST} ${CFG_FILE} ${N=
UM_SERVERS} ${USER_JVM_PARAMS}"
             sleep 2
          done
         ;;
@@ -53,7 +53,7 @@
       for ((idx=3D0; idx < ${#HOSTNAMES[*]} ; idx++))
          do
             server=3D"${HOSTNAMES[idx]}"
-            echo Starting CacheBenchmarkFramework on host ${server}
+            echo Stopping CacheBenchmarkFramework on host ${server}
             ssh ${SSH_USER}@${server}.${DOMAIN} "cd ${CACHE_BENCHMARK_HOME=
} &&  ./killNode.sh &"
             sleep 2
          done


--===============0750546990768452551==--

From jbosscache-commits at lists.jboss.org Thu Jan 24 09:10:38 2008
Content-Type: multipart/mixed; boundary="===============6224117260046734107=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r5222 -
 benchmarks/benchmark-fwk/trunk.
Date: Thu, 24 Jan 2008 09:10:38 -0500
Message-ID: <E1JI2ms-00015N-KN@committer01.frg.pub.inap.atl.jboss.com>

--===============6224117260046734107==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: manik.surtani(a)jboss.com
Date: 2008-01-24 09:10:38 -0500 (Thu, 24 Jan 2008)
New Revision: 5222

Modified:
   benchmarks/benchmark-fwk/trunk/cluster.sh
Log:


Modified: benchmarks/benchmark-fwk/trunk/cluster.sh
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- benchmarks/benchmark-fwk/trunk/cluster.sh	2008-01-24 13:52:48 UTC (rev =
5221)
+++ benchmarks/benchmark-fwk/trunk/cluster.sh	2008-01-24 14:10:38 UTC (rev =
5222)
@@ -45,7 +45,7 @@
          do
             server=3D"${HOSTNAMES[idx]}"
             echo Starting CacheBenchmarkFramework on host ${server}
-            ssh ${SSH_USER}@${server}.${DOMAIN} ". ./bash_profile && cd ${=
CACHE_BENCHMARK_HOME} &&  ./runNode.sh ${idx} ${CACHE_DIST} ${CFG_FILE} ${N=
UM_SERVERS} ${USER_JVM_PARAMS}"
+            ssh ${SSH_USER}@${server}.${DOMAIN} ". .bash_profile && cd ${C=
ACHE_BENCHMARK_HOME} &&  ./runNode.sh ${idx} ${CACHE_DIST} ${CFG_FILE} ${NU=
M_SERVERS} ${USER_JVM_PARAMS}"
             sleep 2
          done
         ;;


--===============6224117260046734107==--

From jbosscache-commits at lists.jboss.org Thu Jan 24 09:11:22 2008
Content-Type: multipart/mixed; boundary="===============6404961077870297238=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r5223 -
 benchmarks/benchmark-fwk/trunk.
Date: Thu, 24 Jan 2008 09:11:22 -0500
Message-ID: <E1JI2na-00017r-Jv@committer01.frg.pub.inap.atl.jboss.com>

--===============6404961077870297238==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: manik.surtani(a)jboss.com
Date: 2008-01-24 09:11:22 -0500 (Thu, 24 Jan 2008)
New Revision: 5223

Modified:
   benchmarks/benchmark-fwk/trunk/runNode.sh
Log:


Modified: benchmarks/benchmark-fwk/trunk/runNode.sh
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- benchmarks/benchmark-fwk/trunk/runNode.sh	2008-01-24 14:10:38 UTC (rev =
5222)
+++ benchmarks/benchmark-fwk/trunk/runNode.sh	2008-01-24 14:11:22 UTC (rev =
5223)
@@ -29,7 +29,7 @@
 then
    echo Usage:
    echo =

-   echo      ./runNode.sh [current node index] [cache product to test] [te=
st config file] [cluster size] [JVM params (optional)]
+   echo      ./runNode.sh [current node index] [cache product to test] [te=
st config file] [cluster size] [JVM params - optional]
    echo param [current node index]    : the index of this node in the list=
 of nodes in the cluster [0 .. <cluster size> - 1]
    echo param [cache product to test] : must be one of the directories nam=
es under './cache-products'
    echo param [test config file]      : configuration file to use with the=
 cache product.  Typically resides in './cache-products/XXX/conf/'


--===============6404961077870297238==--

From jbosscache-commits at lists.jboss.org Thu Jan 24 09:17:55 2008
Content-Type: multipart/mixed; boundary="===============5761221850055001892=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r5224 -
 benchmarks/benchmark-fwk/trunk.
Date: Thu, 24 Jan 2008 09:17:55 -0500
Message-ID: <E1JI2tv-0002BX-6n@committer01.frg.pub.inap.atl.jboss.com>

--===============5761221850055001892==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: manik.surtani(a)jboss.com
Date: 2008-01-24 09:17:55 -0500 (Thu, 24 Jan 2008)
New Revision: 5224

Modified:
   benchmarks/benchmark-fwk/trunk/build.xml
Log:
Compile 1.4.1 as well

Modified: benchmarks/benchmark-fwk/trunk/build.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- benchmarks/benchmark-fwk/trunk/build.xml	2008-01-24 14:11:22 UTC (rev 5=
223)
+++ benchmarks/benchmark-fwk/trunk/build.xml	2008-01-24 14:17:55 UTC (rev 5=
224)
@@ -494,7 +494,7 @@
      <delete dir=3D"${module.framework.basedir}/classes"/>
   </target>
   =

-  <target name=3D"all" depends=3D"init, clean, compile.module.framework,co=
mpile.module.jbosscache200-plugin, compile.module.jbosscache210-plugin.prod=
uction, compile.module.terracotta-plugin" description=3D"build all"/>
+  <target name=3D"all" depends=3D"init, clean, compile.module.framework, c=
ompile.module.jbosscache140-plugin, compile.module.jbosscache200-plugin, co=
mpile.module.jbosscache210-plugin.production, compile.module.terracotta-plu=
gin" description=3D"build all"/>
 =

    <target name=3D"checkClusterAddresses" depends=3D"compile.module.framew=
ork.production"
            description=3D"Check whether the cluster config is a valid one">


--===============5761221850055001892==--

From jbosscache-commits at lists.jboss.org Thu Jan 24 09:31:25 2008
Content-Type: multipart/mixed; boundary="===============3461621756197620296=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r5225 -
 benchmarks/benchmark-fwk/trunk.
Date: Thu, 24 Jan 2008 09:31:25 -0500
Message-ID: <E1JI36z-00058J-C1@committer01.frg.pub.inap.atl.jboss.com>

--===============3461621756197620296==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: manik.surtani(a)jboss.com
Date: 2008-01-24 09:31:25 -0500 (Thu, 24 Jan 2008)
New Revision: 5225

Added:
   benchmarks/benchmark-fwk/trunk/bindAddress.sh
Modified:
   benchmarks/benchmark-fwk/trunk/cluster.sh
   benchmarks/benchmark-fwk/trunk/runNode.sh
Log:


Added: benchmarks/benchmark-fwk/trunk/bindAddress.sh
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- benchmarks/benchmark-fwk/trunk/bindAddress.sh	                        (=
rev 0)
+++ benchmarks/benchmark-fwk/trunk/bindAddress.sh	2008-01-24 14:31:25 UTC (=
rev 5225)
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+### Set your bind address for the tests to use. Could be an IP, host name =
or a reference to an environment variable.
+BIND_ADDRESS=3D${MYTESTIP_4}
+

Modified: benchmarks/benchmark-fwk/trunk/cluster.sh
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- benchmarks/benchmark-fwk/trunk/cluster.sh	2008-01-24 14:17:55 UTC (rev =
5224)
+++ benchmarks/benchmark-fwk/trunk/cluster.sh	2008-01-24 14:31:25 UTC (rev =
5225)
@@ -27,8 +27,6 @@
 # Number of servers to launch on - taken from the command line.
 NUM_SERVERS=3D${4}
 =

-USER_JVM_PARAMS=3D${5}
-
 COMMAND=3D${1}
 =

 # the DNS domain of your servers
@@ -45,7 +43,7 @@
          do
             server=3D"${HOSTNAMES[idx]}"
             echo Starting CacheBenchmarkFramework on host ${server}
-            ssh ${SSH_USER}@${server}.${DOMAIN} ". .bash_profile && cd ${C=
ACHE_BENCHMARK_HOME} &&  ./runNode.sh ${idx} ${CACHE_DIST} ${CFG_FILE} ${NU=
M_SERVERS} ${USER_JVM_PARAMS}"
+            ssh ${SSH_USER}@${server}.${DOMAIN} ". .bash_profile && cd ${C=
ACHE_BENCHMARK_HOME} &&  ./runNode.sh ${idx} ${CACHE_DIST} ${CFG_FILE} ${NU=
M_SERVERS}"
             sleep 2
          done
         ;;
@@ -55,14 +53,13 @@
             server=3D"${HOSTNAMES[idx]}"
             echo Stopping CacheBenchmarkFramework on host ${server}
             ssh ${SSH_USER}@${server}.${DOMAIN} "cd ${CACHE_BENCHMARK_HOME=
} &&  ./killNode.sh &"
-            sleep 2
          done
       ;;
     *)
-        echo "Usage: ${0} [start | stop] [cache distribution to test] [nam=
e of configuration file to use] [number of servers to launch on] [optional =
JVM params]"
+        echo "Usage: ${0} [start | stop] [cache distribution to test] [nam=
e of configuration file to use] [number of servers to launch on]"
         echo
         echo "Example:"
-        echo "        ${0} start jbosscache-2.0.0 repl_async.xml 6 \"-Dbin=
d.address=3D1.2.3.4 -Dxyz=3Dabc\""
+        echo "        ${0} start jbosscache-2.0.0 repl_async.xml 6"
         echo "        ${0} stop"
         echo "             Note that the stop command will stop all instan=
ces on all configured hosts"
         ;;

Modified: benchmarks/benchmark-fwk/trunk/runNode.sh
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- benchmarks/benchmark-fwk/trunk/runNode.sh	2008-01-24 14:17:55 UTC (rev =
5224)
+++ benchmarks/benchmark-fwk/trunk/runNode.sh	2008-01-24 14:31:25 UTC (rev =
5225)
@@ -4,12 +4,11 @@
 # those would make an automatic conversion from unix CLASSPATH to win clas=
spath, needed when executing java -cp
 =

 preferIPv4Stack=3Dtrue
-DEBUG=3Dfalse
+DEBUG=3Dtrue
 CURRENT_INDEX=3D${1}
 CACHE_PRODUCT=3D${2}
 TEST_CFG=3D${3}
 CLUSTER_SIZE=3D${4}
-USER_JVM_PARAMS=3D${5}
 PIDFILE=3D"PID.pid"
 if [ -e ${PIDFILE} ]
 then
@@ -29,12 +28,11 @@
 then
    echo Usage:
    echo =

-   echo      ./runNode.sh [current node index] [cache product to test] [te=
st config file] [cluster size] [JVM params - optional]
+   echo      ./runNode.sh [current node index] [cache product to test] [te=
st config file] [cluster size]
    echo param [current node index]    : the index of this node in the list=
 of nodes in the cluster [0 .. <cluster size> - 1]
    echo param [cache product to test] : must be one of the directories nam=
es under './cache-products'
    echo param [test config file]      : configuration file to use with the=
 cache product.  Typically resides in './cache-products/XXX/conf/'
    echo param [cluster size]          : total number of nodes that will ru=
n tests.
-   echo param [JVM params]            : an optional extra set of parameter=
s to be passed to the JVM - e.g., "-Dbind.address=3D127.0.0.1 -Dxyz=3Dabc"
    echo
    echo Example: './runNode.sh 0 jbosscache-2.0.0 repl_async.xml 3' will s=
tart the 1st node running an instance of jbc2.0.0 on a cluster made out of =
3 nodes, using the repl_async configuration.
    exit 1
@@ -60,7 +58,9 @@
   exit 2
 fi
 =

-JVM_OPTIONS=3D"${JVM_OPTIONS} ${USER_JVM_PARAMS} -DcacheBenchFwk.cacheConf=
igFile=3D${TEST_CFG} -DcurrentIndex=3D${CURRENT_INDEX} -DclusterSize=3D${CL=
USTER_SIZE} -DcurrentIndex=3D${CURRENT_INDEX} -Djava.net.preferIPv4Stack=3D=
${preferIPv4Stack}"
+. ./bindAddress.sh
+
+JVM_OPTIONS=3D"${JVM_OPTIONS} -Dbind.address=3D${BIND_ADDRESS} -DcacheBenc=
hFwk.cacheConfigFile=3D${TEST_CFG} -DcurrentIndex=3D${CURRENT_INDEX} -Dclus=
terSize=3D${CLUSTER_SIZE} -DcurrentIndex=3D${CURRENT_INDEX} -Djava.net.pref=
erIPv4Stack=3D${preferIPv4Stack}"
 TO_EXECUTE=3D"java $JVM_OPTIONS -cp $CLASSPATH org.cachebench.CacheBenchma=
rkRunner"
 =

 if [ "$DEBUG" =3D "debug" ]


--===============3461621756197620296==--

From jbosscache-commits at lists.jboss.org Thu Jan 24 09:35:24 2008
Content-Type: multipart/mixed; boundary="===============4732944960123598109=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r5226 -
 benchmarks/benchmark-fwk/trunk/src/org/cachebench/warmup.
Date: Thu, 24 Jan 2008 09:35:24 -0500
Message-ID: <E1JI3Aq-00063u-FM@committer01.frg.pub.inap.atl.jboss.com>

--===============4732944960123598109==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: manik.surtani(a)jboss.com
Date: 2008-01-24 09:35:24 -0500 (Thu, 24 Jan 2008)
New Revision: 5226

Modified:
   benchmarks/benchmark-fwk/trunk/src/org/cachebench/warmup/PutGetCacheWarm=
up.java
Log:
Better error handling

Modified: benchmarks/benchmark-fwk/trunk/src/org/cachebench/warmup/PutGetCa=
cheWarmup.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- benchmarks/benchmark-fwk/trunk/src/org/cachebench/warmup/PutGetCacheWar=
mup.java	2008-01-24 14:31:25 UTC (rev 5225)
+++ benchmarks/benchmark-fwk/trunk/src/org/cachebench/warmup/PutGetCacheWar=
mup.java	2008-01-24 14:35:24 UTC (rev 5226)
@@ -25,7 +25,7 @@
             wrapper.put(String.valueOf(opCount), String.valueOf(opCount));
          } catch (Exception e)
          {
-            log.warn("Exception on cache warmup:" + e.getMessage());
+            log.warn("Exception on cache warmup", e);
          }
       }
 =



--===============4732944960123598109==--

From jbosscache-commits at lists.jboss.org Thu Jan 24 09:51:40 2008
Content-Type: multipart/mixed; boundary="===============3634903670533691605=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r5227 -
 benchmarks/benchmark-fwk/trunk.
Date: Thu, 24 Jan 2008 09:51:40 -0500
Message-ID: <E1JI3Qa-0000ec-IG@committer01.frg.pub.inap.atl.jboss.com>

--===============3634903670533691605==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: manik.surtani(a)jboss.com
Date: 2008-01-24 09:51:40 -0500 (Thu, 24 Jan 2008)
New Revision: 5227

Modified:
   benchmarks/benchmark-fwk/trunk/cluster.sh
Log:


Modified: benchmarks/benchmark-fwk/trunk/cluster.sh
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- benchmarks/benchmark-fwk/trunk/cluster.sh	2008-01-24 14:35:24 UTC (rev =
5226)
+++ benchmarks/benchmark-fwk/trunk/cluster.sh	2008-01-24 14:51:40 UTC (rev =
5227)
@@ -43,7 +43,7 @@
          do
             server=3D"${HOSTNAMES[idx]}"
             echo Starting CacheBenchmarkFramework on host ${server}
-            ssh ${SSH_USER}@${server}.${DOMAIN} ". .bash_profile && cd ${C=
ACHE_BENCHMARK_HOME} &&  ./runNode.sh ${idx} ${CACHE_DIST} ${CFG_FILE} ${NU=
M_SERVERS}"
+            ssh ${SSH_USER}@${server}.${DOMAIN} ". .bash_profile && cd ${C=
ACHE_BENCHMARK_HOME} &&  ./runNode.sh ${idx} ${CACHE_DIST} ${CFG_FILE} ${NU=
M_SERVERS} &" &
             sleep 2
          done
         ;;


--===============3634903670533691605==--

From jbosscache-commits at lists.jboss.org Thu Jan 24 09:58:13 2008
Content-Type: multipart/mixed; boundary="===============5853043724849563444=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r5228 -
 benchmarks/benchmark-fwk/trunk.
Date: Thu, 24 Jan 2008 09:58:13 -0500
Message-ID: <E1JI3Wv-0001g6-Gh@committer01.frg.pub.inap.atl.jboss.com>

--===============5853043724849563444==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: manik.surtani(a)jboss.com
Date: 2008-01-24 09:58:13 -0500 (Thu, 24 Jan 2008)
New Revision: 5228

Modified:
   benchmarks/benchmark-fwk/trunk/killNode.sh
   benchmarks/benchmark-fwk/trunk/runNode.sh
Log:
PIDs now include hostname

Modified: benchmarks/benchmark-fwk/trunk/killNode.sh
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- benchmarks/benchmark-fwk/trunk/killNode.sh	2008-01-24 14:51:40 UTC (rev=
 5227)
+++ benchmarks/benchmark-fwk/trunk/killNode.sh	2008-01-24 14:58:13 UTC (rev=
 5228)
@@ -9,7 +9,7 @@
 #
 ##########################################################################=
########
 =

-PIDFILE=3D"PID.pid"
+PIDFILE=3DPID.`hostname -s`.pid
 =

 if [ -e ${PIDFILE} ]
 then

Modified: benchmarks/benchmark-fwk/trunk/runNode.sh
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- benchmarks/benchmark-fwk/trunk/runNode.sh	2008-01-24 14:51:40 UTC (rev =
5227)
+++ benchmarks/benchmark-fwk/trunk/runNode.sh	2008-01-24 14:58:13 UTC (rev =
5228)
@@ -9,7 +9,7 @@
 CACHE_PRODUCT=3D${2}
 TEST_CFG=3D${3}
 CLUSTER_SIZE=3D${4}
-PIDFILE=3D"PID.pid"
+PIDFILE=3DPID.`hostname -s`.pid
 if [ -e ${PIDFILE} ]
 then
    # first test if the process is still running.  If not, clean up the PID=
 file.


--===============5853043724849563444==--

From jbosscache-commits at lists.jboss.org Thu Jan 24 10:01:25 2008
Content-Type: multipart/mixed; boundary="===============3430085036740722303=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r5229 -
 benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.0.0/conf.
Date: Thu, 24 Jan 2008 10:01:25 -0500
Message-ID: <E1JI3a1-0002cD-Cw@committer01.frg.pub.inap.atl.jboss.com>

--===============3430085036740722303==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: manik.surtani(a)jboss.com
Date: 2008-01-24 10:01:25 -0500 (Thu, 24 Jan 2008)
New Revision: 5229

Modified:
   benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.0.0/conf/pess=
-repl-async-br.xml
   benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.0.0/conf/pess=
-repl-async.xml
Log:
Updated cfgs

Modified: benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.0.0/co=
nf/pess-repl-async-br.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.0.0/conf/pes=
s-repl-async-br.xml	2008-01-24 14:58:13 UTC (rev 5228)
+++ benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.0.0/conf/pes=
s-repl-async-br.xml	2008-01-24 15:01:25 UTC (rev 5229)
@@ -12,7 +12,7 @@
       <depends>jboss:service=3DTransactionManager</depends>
 =

       <attribute name=3D"TransactionManagerLookupClass">org.jboss.cache.tr=
ansaction.GenericTransactionManagerLookup</attribute>
-      <attribute name=3D"IsolationLevel">READ_COMMITTED</attribute>
+      <attribute name=3D"IsolationLevel">REPEATABLE_READ</attribute>
       <attribute name=3D"CacheMode">REPL_ASYNC</attribute>
       <attribute name=3D"UseReplQueue">false</attribute>
       <attribute name=3D"ReplQueueInterval">0</attribute>
@@ -20,65 +20,6 @@
       <attribute name=3D"ClusterName">JBossCache-Cluster</attribute>
       <attribute name=3D"ClusterConfig">
          <config>
-            <!--<UDP mcast_addr=3D"232.10.10.10"-->
-                 <!--mcast_port=3D"45599"-->
-                 <!--tos=3D"8"-->
-                 <!--ucast_recv_buf_size=3D"20000000"-->
-                 <!--ucast_send_buf_size=3D"640000"-->
-                 <!--mcast_recv_buf_size=3D"25000000"-->
-                 <!--mcast_send_buf_size=3D"640000"-->
-                 <!--loopback=3D"false"-->
-                 <!--discard_incompatible_packets=3D"true"-->
-                 <!--max_bundle_size=3D"64000"-->
-                 <!--max_bundle_timeout=3D"30"-->
-                 <!--use_incoming_packet_handler=3D"true"-->
-                 <!--use_outgoing_packet_handler=3D"false"-->
-                 <!--ip_ttl=3D"2"-->
-                 <!--down_thread=3D"false" up_thread=3D"false"-->
-                 <!--enable_bundling=3D"true"/>-->
-            <!--<PING timeout=3D"2000"-->
-                  <!--down_thread=3D"false" up_thread=3D"false" num_initia=
l_members=3D"3"/>-->
-
-            <!--<TCP-->
-                 <!--loopback=3D"false"-->
-                 <!--discard_incompatible_packets=3D"true"-->
-                 <!--max_bundle_size=3D"64000"-->
-                 <!--max_bundle_timeout=3D"30"-->
-                 <!--use_incoming_packet_handler=3D"true"-->
-                 <!--use_outgoing_packet_handler=3D"false"-->
-                 <!--bind_addr=3D"127.0.0.1"-->
-                 <!--start_port=3D"7800"-->
-                 <!--enable_bundling=3D"false"-->
-                 <!--tcp_nodelay=3D"true"-->
-                 <!--/>-->
-            <!--<MPING timeout=3D"2000" num_initial_members=3D"3" mcast_ad=
dr=3D"224.10.10.15" mcast_port=3D"44553"/>-->
-            <!--<MERGE2 max_interval=3D"100000"-->
-                    <!--down_thread=3D"false" up_thread=3D"false" min_inte=
rval=3D"20000"/>-->
-            <!--<FD_SOCK down_thread=3D"false" up_thread=3D"false"/>-->
-            <!--<FD timeout=3D"10000" max_tries=3D"5" down_thread=3D"false=
" up_thread=3D"false" shun=3D"true"/>-->
-            <!--<VERIFY_SUSPECT timeout=3D"1500" down_thread=3D"false" up_=
thread=3D"false"/>-->
-            <!--<pbcast.NAKACK max_xmit_size=3D"60000"-->
-                           <!--use_mcast_xmit=3D"false" gc_lag=3D"0"-->
-                           <!--retransmit_timeout=3D"300,600,1200,2400,480=
0"-->
-                           <!--down_thread=3D"false" up_thread=3D"false"-->
-                           <!--discard_delivered_msgs=3D"true"/>-->
-            <!--<UNICAST timeout=3D"300,600,1200,2400,3600"-->
-                     <!--down_thread=3D"false" up_thread=3D"false"/>-->
-            <!--<pbcast.STABLE stability_delay=3D"1000" desired_avg_gossip=
=3D"50000"-->
-                           <!--down_thread=3D"false" up_thread=3D"false"-->
-                           <!--max_bytes=3D"400000"/>-->
-            <!--<pbcast.GMS print_local_addr=3D"true" join_timeout=3D"3000=
" use_flush=3D"true" flush_timeout=3D"3000"-->
-                        <!--down_thread=3D"false" up_thread=3D"false"-->
-                        <!--join_retry_timeout=3D"2000" shun=3D"false"-->
-                        <!--view_bundling=3D"true"/>-->
-            <!--<FC max_credits=3D"2000000" down_thread=3D"false" up_threa=
d=3D"false"-->
-                <!--min_threshold=3D"0.20"/>-->
-            <!--<FRAG2 frag_size=3D"60000" down_thread=3D"false" up_thread=
=3D"false"/>-->
-            <!-- <pbcast.STREAMING_STATE_TRANSFER down_thread=3D"false" up=
_thread=3D"false"-->
-                                         <!--use_flush=3D"true" flush_time=
out=3D"3000" use_reading_thread=3D"true"/> -->
-            <!--<pbcast.STATE_TRANSFER down_thread=3D"false" up_thread=3D"=
false" use_flush=3D"true" flush_timeout=3D"3000"/>-->
-            <!--<pbcast.FLUSH down_thread=3D"false" up_thread=3D"false" ti=
meout=3D"8000" auto_flush_conf=3D"false"/>-->
-
               <TCP start_port=3D"7580"
          loopback=3D"false"
          discard_incompatible_packets=3D"true"
@@ -160,7 +101,7 @@
 =

             <buddyPoolName>myBuddyPoolReplicationGroup</buddyPoolName>
 =

-            <buddyCommunicationTimeout>2000</buddyCommunicationTimeout>
+            <buddyCommunicationTimeout>10000</buddyCommunicationTimeout>
 =

 =

             <autoDataGravitation>false</autoDataGravitation>

Modified: benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.0.0/co=
nf/pess-repl-async.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.0.0/conf/pes=
s-repl-async.xml	2008-01-24 14:58:13 UTC (rev 5228)
+++ benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.0.0/conf/pes=
s-repl-async.xml	2008-01-24 15:01:25 UTC (rev 5229)
@@ -12,7 +12,7 @@
       <depends>jboss:service=3DTransactionManager</depends>
 =

       <attribute name=3D"TransactionManagerLookupClass">org.jboss.cache.tr=
ansaction.GenericTransactionManagerLookup</attribute>
-      <attribute name=3D"IsolationLevel">READ_COMMITTED</attribute>
+      <attribute name=3D"IsolationLevel">REPEATABLE_READ</attribute>
       <attribute name=3D"CacheMode">REPL_ASYNC</attribute>
       <attribute name=3D"UseReplQueue">true</attribute>
       <attribute name=3D"ReplQueueInterval">0</attribute>
@@ -66,7 +66,7 @@
             <pbcast.FLUSH down_thread=3D"false" up_thread=3D"false" timeou=
t=3D"8000" auto_flush_conf=3D"false"/>
          </config>
       </attribute>
-      <attribute name=3D"FetchInMemoryState">true</attribute>
+      <attribute name=3D"FetchInMemoryState">false</attribute>
       <attribute name=3D"InitialStateRetrievalTimeout">15000</attribute>
       <attribute name=3D"SyncReplTimeout">60000</attribute>
       <attribute name=3D"LockAcquisitionTimeout">10000</attribute>


--===============3430085036740722303==--

From jbosscache-commits at lists.jboss.org Thu Jan 24 10:04:03 2008
Content-Type: multipart/mixed; boundary="===============0436688097904264128=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r5230 -
 benchmarks/benchmark-fwk/trunk/src/org/cachebench/tests.
Date: Thu, 24 Jan 2008 10:04:03 -0500
Message-ID: <E1JI3cZ-0002qL-MG@committer01.frg.pub.inap.atl.jboss.com>

--===============0436688097904264128==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: manik.surtani(a)jboss.com
Date: 2008-01-24 10:04:03 -0500 (Thu, 24 Jan 2008)
New Revision: 5230

Modified:
   benchmarks/benchmark-fwk/trunk/src/org/cachebench/tests/ReplicationOccur=
sTest.java
Log:
Updated messages

Modified: benchmarks/benchmark-fwk/trunk/src/org/cachebench/tests/Replicati=
onOccursTest.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- benchmarks/benchmark-fwk/trunk/src/org/cachebench/tests/ReplicationOccu=
rsTest.java	2008-01-24 15:01:25 UTC (rev 5229)
+++ benchmarks/benchmark-fwk/trunk/src/org/cachebench/tests/ReplicationOccu=
rsTest.java	2008-01-24 15:04:03 UTC (rev 5230)
@@ -70,8 +70,8 @@
          {
             return true;
          }
-         log.info("Replication test faild, " + (i+1) + " tries so far. Sle=
eping for  " + REPLICATION_TRY_SLEEP
-               + " millies then try again");
+         log.info("Replication test failed, " + (i+1) + " tries so far. Sl=
eeping for  " + REPLICATION_TRY_SLEEP
+               + " millis then try again");
          Thread.sleep(REPLICATION_TRY_SLEEP);
       }
       return false;
@@ -105,7 +105,7 @@
       {
          if (!"true".equals(value))
          {
-            log.info("Replication was not successull on the entire cluster=
!");
+            log.info("Replication was not successful on the entire cluster=
!");
             result.setTestPassed(false);
             return result;
          }


--===============0436688097904264128==--

From jbosscache-commits at lists.jboss.org Thu Jan 24 10:51:21 2008
Content-Type: multipart/mixed; boundary="===============6866655285937447849=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r5231 -
 benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.1.0/conf.
Date: Thu, 24 Jan 2008 10:51:21 -0500
Message-ID: <E1JI4ML-00049W-6c@committer01.frg.pub.inap.atl.jboss.com>

--===============6866655285937447849==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: manik.surtani(a)jboss.com
Date: 2008-01-24 10:51:20 -0500 (Thu, 24 Jan 2008)
New Revision: 5231

Added:
   benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.1.0/conf/pess=
-repl-async-br.xml
   benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.1.0/conf/pess=
-repl-async.xml
   benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.1.0/conf/pess=
-repl-sync.xml
Removed:
   benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.1.0/conf/jbc2=
10-br_tcp_mping.xml
Log:
Added cfg files for 2.1.0

Deleted: benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.1.0/con=
f/jbc210-br_tcp_mping.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.1.0/conf/jbc=
210-br_tcp_mping.xml	2008-01-24 15:04:03 UTC (rev 5230)
+++ benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.1.0/conf/jbc=
210-br_tcp_mping.xml	2008-01-24 15:51:20 UTC (rev 5231)
@@ -1,254 +0,0 @@
-<?xml version=3D"1.0" encoding=3D"UTF-8"?>
-
-<!-- =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D -->
-<!--                                                                      =
 -->
-<!--  Sample TreeCache Service Configuration                              =
 -->
-<!--                                                                      =
 -->
-<!-- =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D -->
-
-<server>
-
-   <!-- =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D -->
-   <!-- Defines TreeCache configuration                                   =
   -->
-   <!-- =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D -->
-
-   <mbean code=3D"org.jboss.cache.jmx.CacheJmxWrapper"
-          name=3D"jboss.cache:service=3DTreeCache">
-
-      <depends>jboss:service=3DNaming</depends>
-      <depends>jboss:service=3DTransactionManager</depends>
-
-      <!--
-          Configure the TransactionManager
-      -->
-      <attribute name=3D"TransactionManagerLookupClass">org.jboss.cache.tr=
ansaction.GenericTransactionManagerLookup
-      </attribute>
-
-      <!--
-          Isolation level : SERIALIZABLE
-                            REPEATABLE_READ (default)
-                            READ_COMMITTED
-                            READ_UNCOMMITTED
-                            NONE
-      -->
-      <attribute name=3D"IsolationLevel">REPEATABLE_READ</attribute>
-
-       <!--<attribute name=3D"NodeLockingScheme">OPTIMISTIC</attribute>-->
-
-      <!--
-           Valid modes are LOCAL
-                           REPL_ASYNC
-                           REPL_SYNC
-                           INVALIDATION_ASYNC
-                           INVALIDATION_SYNC
-      -->
-      <attribute name=3D"CacheMode">REPL_ASYNC</attribute>
-
-      <!--
-      Just used for async repl: use a replication queue
-      -->
-      <attribute name=3D"UseReplQueue">false</attribute>
-
-      <!--
-          Replication interval for replication queue (in ms)
-      -->
-      <attribute name=3D"ReplQueueInterval">0</attribute>
-
-      <!--
-          Max number of elements which trigger replication
-      -->
-      <attribute name=3D"ReplQueueMaxElements">0</attribute>
-
-      <!-- Name of cluster. Needs to be the same for all TreeCache nodes i=
n a
-           cluster in order to find each other.
-      -->
-      <attribute name=3D"ClusterName">JBossCache-Cluster</attribute>
-
-      <!--Uncomment next three statements to enable JGroups multiplexer.
-This configuration is dependent on the JGroups multiplexer being
-registered in an MBean server such as JBossAS.  -->
-      <!--
-      <depends>jgroups.mux:name=3DMultiplexer</depends>
-      <attribute name=3D"MultiplexerService">jgroups.mux:name=3DMultiplexe=
r</attribute>
-      <attribute name=3D"MultiplexerStack">fc-fast-minimalthreads</attribu=
te>
-      -->
-
-      <!-- JGroups protocol stack properties.
-         ClusterConfig isn't used if the multiplexer is enabled and succes=
sfully initialized.
-      -->
-      <attribute name=3D"ClusterConfig">
-         <config>
-             <!--<UDP mcast_addr=3D"232.10.10.10"
-                              mcast_port=3D"45588"
-                              tos=3D"8"
-                              ucast_recv_buf_size=3D"20000000"
-                              ucast_send_buf_size=3D"640000"
-                              mcast_recv_buf_size=3D"25000000"
-                              mcast_send_buf_size=3D"640000"
-                              loopback=3D"false"
-                              discard_incompatible_packets=3D"true"
-                              max_bundle_size=3D"64000"
-                              max_bundle_timeout=3D"30"
-                              use_incoming_packet_handler=3D"true"
-                              ip_ttl=3D"2"
-                              enable_bundling=3D"false"
-                              enable_unicast_bundling=3D"false"
-                              enable_diagnostics=3D"true"
-
-                              use_concurrent_stack=3D"true"
-
-                              thread_naming_pattern=3D"pl"
-
-                              thread_pool.enabled=3D"true"
-                              thread_pool.min_threads=3D"1"
-                              thread_pool.max_threads=3D"4"
-                              thread_pool.keep_alive_time=3D"30000"
-                              thread_pool.queue_enabled=3D"true"
-                              thread_pool.queue_max_size=3D"50000"
-                              thread_pool.rejection_policy=3D"discard"
-
-                              oob_thread_pool.enabled=3D"true"
-                              oob_thread_pool.min_threads=3D"2"
-                              oob_thread_pool.max_threads=3D"4"
-                              oob_thread_pool.keep_alive_time=3D"10000"
-                              oob_thread_pool.queue_enabled=3D"false"
-                              oob_thread_pool.queue_max_size=3D"10"
-                              oob_thread_pool.rejection_policy=3D"Run"/>-->
-
-            <TCP recv_buf_size=3D"20000000" use_send_queues=3D"false"
-                 loopback=3D"false"
-                 discard_incompatible_packets=3D"true"
-                 max_bundle_size=3D"64000"
-                 max_bundle_timeout=3D"30"
-                 use_incoming_packet_handler=3D"true"
-                 enable_bundling=3D"true"
-                 enable_unicast_bundling=3D"true"
-                 enable_diagnostics=3D"true"
-
-                 use_concurrent_stack=3D"true"
-
-                 thread_naming_pattern=3D"pl"
-
-                 thread_pool.enabled=3D"true"
-                 thread_pool.min_threads=3D"1"
-                 thread_pool.max_threads=3D"4"
-                 thread_pool.keep_alive_time=3D"30000"
-                 thread_pool.queue_enabled=3D"true"
-                 thread_pool.queue_max_size=3D"50000"
-                 thread_pool.rejection_policy=3D"discard"
-
-                 oob_thread_pool.enabled=3D"true"
-                 oob_thread_pool.min_threads=3D"2"
-                 oob_thread_pool.max_threads=3D"4"
-                 oob_thread_pool.keep_alive_time=3D"10000"
-                 oob_thread_pool.queue_enabled=3D"false"
-                 oob_thread_pool.queue_max_size=3D"10"
-                 oob_thread_pool.rejection_policy=3D"Run"/>
-
-            <!--<PING timeout=3D"2000" num_initial_members=3D"3"/>-->
-             <MPING mcast_addr=3D"232.1.2.3" timeout=3D"2000" num_initial_=
members=3D"3"/>
-            <MERGE2 max_interval=3D"30000" min_interval=3D"10000"/>
-            <FD_SOCK/>
-            <FD timeout=3D"10000" max_tries=3D"5" shun=3D"true"/>
-            <VERIFY_SUSPECT timeout=3D"1500"/>
-            <pbcast.NAKACK use_mcast_xmit=3D"false" gc_lag=3D"0"
-                           retransmit_timeout=3D"300,600,1200,2400,4800"
-                           discard_delivered_msgs=3D"true"/>
-            <!--<UNICAST timeout=3D"30,60,120,300,600,1200,2400,3600"/>-->
-            <pbcast.STABLE stability_delay=3D"1000" desired_avg_gossip=3D"=
50000"
-                           max_bytes=3D"400000"/>
-            <pbcast.GMS print_local_addr=3D"true" join_timeout=3D"5000"
-                        join_retry_timeout=3D"2000" shun=3D"false"
-                        view_bundling=3D"true" view_ack_collection_timeout=
=3D"5000"/>
-              <FC max_credits=3D"5000000"
-                    min_threshold=3D"0.20"/>
-            <FRAG2 frag_size=3D"60000"/>
-            <pbcast.STREAMING_STATE_TRANSFER use_reading_thread=3D"true"/>
-            <!-- <pbcast.STATE_TRANSFER/> -->
-            <pbcast.FLUSH timeout=3D"0"/>
-         </config>
-      </attribute>
-
-
-      <!--
-       Whether or not to fetch state on joining a cluster
-       NOTE this used to be called FetchStateOnStartup and has been rename=
d to be more descriptive.
-      -->
-      <attribute name=3D"FetchInMemoryState">true</attribute>
-
-      <!--
-          The max amount of time (in milliseconds) we wait until the
-          state (ie. the contents of the cache) are retrieved from
-          existing members in a clustered environment
-      -->
-      <attribute name=3D"StateRetrievalTimeout">15000</attribute>
-
-      <!--
-          Number of milliseconds to wait until all responses for a
-          synchronous call have been received.
-      -->
-      <attribute name=3D"SyncReplTimeout">15000</attribute>
-
-      <!-- Max number of milliseconds to wait for a lock acquisition -->
-      <attribute name=3D"LockAcquisitionTimeout">10000</attribute>
-
-      <!--
-         Indicate whether to use region based marshalling or not. Set this=
 to true if you are running under a scoped
-         class loader, e.g., inside an application server. Default is "fal=
se".
-      -->
-      <attribute name=3D"UseRegionBasedMarshalling">true</attribute>
-
-
-       <attribute name=3D"BuddyReplicationConfig">
-           <config>
-
-               <!-- Enables buddy replication. This is the ONLY mandatory =
configuration element here. -->
-               <buddyReplicationEnabled>true</buddyReplicationEnabled>
-
-               <!-- These are the default values anyway -->
-               <buddyLocatorClass>org.jboss.cache.buddyreplication.NextMem=
berBuddyLocator</buddyLocatorClass>
-
-               <!--  numBuddies is the number of backup nodes each node ma=
intains. ignoreColocatedBuddies means
-            that each node will *try* to select a buddy on a different phy=
sical host. If not able to do so though,
-            it will fall back to colocated nodes. -->
-               <buddyLocatorProperties>
-                   numBuddies =3D 1
-                   ignoreColocatedBuddies =3D true
-               </buddyLocatorProperties>
-
-               <!-- A way to specify a preferred replication group. If spe=
cified, we try and pick a buddy which shares
-           the same pool name (falling back to other buddies if not availa=
ble). This allows the sysdmin to
-           hint at backup buddies are picked, so for example, nodes may be=
 hinted topick buddies on a different
-           physical rack or power supply for added fault tolerance. -->
-               <buddyPoolName>myBuddyPoolReplicationGroup</buddyPoolName>
-
-               <!-- Communication timeout for inter-buddy group organisati=
on messages (such as assigning to and
-           removing from groups, defaults to 1000. -->
-               <buddyCommunicationTimeout>2000</buddyCommunicationTimeout>
-
-               <!-- Whether data is removed from old owners when gravitate=
d to a new owner. Defaults to true. -->
-               <dataGravitationRemoveOnFind>true</dataGravitationRemoveOnF=
ind>
-
-               <!-- Whether backup nodes can respond to data gravitation r=
equests, or only the data owner is
-           supposed to respond.  Defaults to true. -->
-               <dataGravitationSearchBackupTrees>true</dataGravitationSear=
chBackupTrees>
-
-               <!-- Whether all cache misses result in a data gravitation =
request. Defaults to false, requiring
-           callers to enable data gravitation on a per-invocation basis us=
ing the Options API. -->
-               <autoDataGravitation>false</autoDataGravitation>
-
-           </config>
-       </attribute>
-
-       =

-   </mbean>
-
-
-   <!--  Uncomment to get a graphical view of the TreeCache MBean above -->
-   <!--   <mbean code=3D"org.jboss.cache.TreeCacheView" name=3D"jboss.cach=
e:service=3DTreeCacheView">-->
-   <!--      <depends>jboss.cache:service=3DTreeCache</depends>-->
-   <!--      <attribute name=3D"CacheService">jboss.cache:service=3DTreeCa=
che</attribute>-->
-   <!--   </mbean>-->
-
-
-</server>

Copied: benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.1.0/conf=
/pess-repl-async-br.xml (from rev 5229, benchmarks/benchmark-fwk/trunk/cach=
e-products/jbosscache-2.0.0/conf/pess-repl-async-br.xml)
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.1.0/conf/pes=
s-repl-async-br.xml	                        (rev 0)
+++ benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.1.0/conf/pes=
s-repl-async-br.xml	2008-01-24 15:51:20 UTC (rev 5231)
@@ -0,0 +1,117 @@
+<?xml version=3D"1.0" encoding=3D"UTF-8"?>
+
+<server>
+
+   <classpath codebase=3D"./lib" archives=3D"jboss-cache.jar, jgroups.jar"=
/>
+
+
+   <mbean code=3D"org.jboss.cache.CacheImpl"
+          name=3D"jboss.cache:service=3DTreeCache">
+
+      <depends>jboss:service=3DNaming</depends>
+      <depends>jboss:service=3DTransactionManager</depends>
+
+      <attribute name=3D"TransactionManagerLookupClass">org.jboss.cache.tr=
ansaction.GenericTransactionManagerLookup</attribute>
+      <attribute name=3D"IsolationLevel">REPEATABLE_READ</attribute>
+      <attribute name=3D"CacheMode">REPL_ASYNC</attribute>
+      <attribute name=3D"UseReplQueue">false</attribute>
+      <attribute name=3D"ReplQueueInterval">0</attribute>
+      <attribute name=3D"ReplQueueMaxElements">0</attribute>
+      <attribute name=3D"ClusterName">JBossCache-Cluster</attribute>
+      <attribute name=3D"ClusterConfig">
+         <config>
+              <TCP start_port=3D"7580"
+         loopback=3D"false"
+         discard_incompatible_packets=3D"true"
+         max_bundle_size=3D"64000"
+         max_bundle_timeout=3D"30"
+         use_incoming_packet_handler=3D"true"
+         enable_bundling=3D"true"
+         enable_diagnostics=3D"true"
+         thread_naming_pattern=3D"cl"
+
+         use_concurrent_stack=3D"true"
+
+	 recv_buf_size=3D"20000000"
+	 send_buf_size=3D"20000000"
+
+         thread_pool.enabled=3D"true"
+         thread_pool.min_threads=3D"2"
+         thread_pool.max_threads=3D"4"
+         thread_pool.keep_alive_time=3D"5000"
+         thread_pool.queue_enabled=3D"true"
+         thread_pool.queue_max_size=3D"100000"
+         thread_pool.rejection_policy=3D"discard"
+
+         oob_thread_pool.enabled=3D"true"
+         oob_thread_pool.min_threads=3D"4"
+         oob_thread_pool.max_threads=3D"8"
+         oob_thread_pool.keep_alive_time=3D"5000"
+         oob_thread_pool.queue_enabled=3D"false"
+         oob_thread_pool.queue_max_size=3D"100"
+         oob_thread_pool.rejection_policy=3D"Run"/>
+
+    <MPING timeout=3D"2000" mcast_addr=3D"232.1.2.3"
+            num_initial_members=3D"3"/>
+    <MERGE2 max_interval=3D"30000"
+            min_interval=3D"10000"/>
+    <FD_SOCK/>
+    <FD timeout=3D"10000" max_tries=3D"5"   shun=3D"true"/>
+    <VERIFY_SUSPECT timeout=3D"1500"  />
+    <BARRIER />
+    <pbcast.NAKACK use_stats_for_retransmission=3D"false"
+                   exponential_backoff=3D"150"
+                   use_mcast_xmit=3D"false" gc_lag=3D"0"
+                   retransmit_timeout=3D"50,300,600,1200"
+                   discard_delivered_msgs=3D"true"/>
+    <pbcast.STABLE stability_delay=3D"1000" desired_avg_gossip=3D"50000"
+                   max_bytes=3D"1000000"/>
+    <VIEW_SYNC avg_send_interval=3D"60000"   />
+    <pbcast.GMS print_local_addr=3D"true" join_timeout=3D"3000"
+                shun=3D"false"
+                view_bundling=3D"true"/>
+    <FC max_credits=3D"10000000"
+                    min_threshold=3D"0.20"/>
+    <FRAG2 frag_size=3D"60000"  />
+    <pbcast.STATE_TRANSFER  />
+
+         </config>
+      </attribute>
+      <attribute name=3D"FetchInMemoryState">false</attribute>
+      <attribute name=3D"InitialStateRetrievalTimeout">15000</attribute>
+      <attribute name=3D"SyncReplTimeout">60000</attribute>
+      <attribute name=3D"LockAcquisitionTimeout">10000</attribute>
+      <attribute name=3D"EvictionPolicyConfig">
+      </attribute>
+
+      <attribute name=3D"CacheLoaderConfiguration">
+      </attribute>
+
+      <attribute name=3D"UseRegionBasedMarshalling">false</attribute>
+
+      <!-- Buddy Replication config -->
+      <attribute name=3D"BuddyReplicationConfig">
+         <config>
+            <buddyReplicationEnabled>true</buddyReplicationEnabled>
+            <buddyLocatorClass>org.jboss.cache.buddyreplication.NextMember=
BuddyLocator</buddyLocatorClass>
+            <buddyLocatorProperties>
+               numBuddies =3D 1
+               ignoreColocatedBuddies =3D true
+            </buddyLocatorProperties>
+
+            <buddyPoolName>myBuddyPoolReplicationGroup</buddyPoolName>
+
+            <buddyCommunicationTimeout>10000</buddyCommunicationTimeout>
+
+
+            <autoDataGravitation>false</autoDataGravitation>
+
+            <dataGravitationRemoveOnFind>true</dataGravitationRemoveOnFind>
+
+            <dataGravitationSearchBackupTrees>true</dataGravitationSearchB=
ackupTrees>
+
+         </config>
+      </attribute>
+
+   </mbean>
+</server>

Copied: benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.1.0/conf=
/pess-repl-async.xml (from rev 5229, benchmarks/benchmark-fwk/trunk/cache-p=
roducts/jbosscache-2.0.0/conf/pess-repl-async.xml)
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.1.0/conf/pes=
s-repl-async.xml	                        (rev 0)
+++ benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.1.0/conf/pes=
s-repl-async.xml	2008-01-24 15:51:20 UTC (rev 5231)
@@ -0,0 +1,81 @@
+<?xml version=3D"1.0" encoding=3D"UTF-8"?>
+
+<server>
+
+   <classpath codebase=3D"./lib" archives=3D"jboss-cache.jar, jgroups.jar"=
/>
+
+
+   <mbean code=3D"org.jboss.cache.CacheImpl"
+          name=3D"jboss.cache:service=3DTreeCache">
+
+      <depends>jboss:service=3DNaming</depends>
+      <depends>jboss:service=3DTransactionManager</depends>
+
+      <attribute name=3D"TransactionManagerLookupClass">org.jboss.cache.tr=
ansaction.GenericTransactionManagerLookup</attribute>
+      <attribute name=3D"IsolationLevel">REPEATABLE_READ</attribute>
+      <attribute name=3D"CacheMode">REPL_ASYNC</attribute>
+      <attribute name=3D"UseReplQueue">true</attribute>
+      <attribute name=3D"ReplQueueInterval">0</attribute>
+      <attribute name=3D"ReplQueueMaxElements">100</attribute>
+      <attribute name=3D"ClusterName">JBossCache-Cluster</attribute>
+      <attribute name=3D"ClusterConfig">
+         <config>
+            <UDP mcast_addr=3D"232.10.10.10"
+                 mcast_port=3D"45599"
+                 tos=3D"8"
+                 ucast_recv_buf_size=3D"20000000"
+                 ucast_send_buf_size=3D"640000"
+                 mcast_recv_buf_size=3D"25000000"
+                 mcast_send_buf_size=3D"640000"
+                 loopback=3D"false"
+                 discard_incompatible_packets=3D"true"
+                 max_bundle_size=3D"64000"
+                 max_bundle_timeout=3D"30"
+                 use_incoming_packet_handler=3D"true"
+                 use_outgoing_packet_handler=3D"false"
+                 ip_ttl=3D"2"
+                 down_thread=3D"false" up_thread=3D"false"
+                 enable_bundling=3D"false"/>
+            <PING timeout=3D"2000"
+                  down_thread=3D"false" up_thread=3D"false" num_initial_me=
mbers=3D"3"/>
+            <MERGE2 max_interval=3D"100000"
+                    down_thread=3D"false" up_thread=3D"false" min_interval=
=3D"20000"/>
+            <FD_SOCK down_thread=3D"false" up_thread=3D"false"/>
+            <FD timeout=3D"10000" max_tries=3D"5" down_thread=3D"false" up=
_thread=3D"false" shun=3D"true"/>
+            <VERIFY_SUSPECT timeout=3D"1500" down_thread=3D"false" up_thre=
ad=3D"false"/>
+            <pbcast.NAKACK max_xmit_size=3D"60000"
+                           use_mcast_xmit=3D"false" gc_lag=3D"0"
+                           retransmit_timeout=3D"300,600,1200,2400,4800"
+                           down_thread=3D"false" up_thread=3D"false"
+                           discard_delivered_msgs=3D"true"/>
+            <UNICAST timeout=3D"300,600,1200,2400,3600"
+                     down_thread=3D"false" up_thread=3D"false"/>
+            <pbcast.STABLE stability_delay=3D"1000" desired_avg_gossip=3D"=
50000"
+                           down_thread=3D"false" up_thread=3D"false"
+                           max_bytes=3D"400000"/>
+            <pbcast.GMS print_local_addr=3D"true" join_timeout=3D"3000" us=
e_flush=3D"true" flush_timeout=3D"3000"
+                        down_thread=3D"false" up_thread=3D"false"
+                        join_retry_timeout=3D"2000" shun=3D"false"
+                        view_bundling=3D"true"/>
+            <FC max_credits=3D"2000000" down_thread=3D"false" up_thread=3D=
"false"
+                min_threshold=3D"0.20"/>
+            <FRAG2 frag_size=3D"60000" down_thread=3D"false" up_thread=3D"=
false"/>
+            <!-- <pbcast.STREAMING_STATE_TRANSFER down_thread=3D"false" up=
_thread=3D"false"
+                                         use_flush=3D"true" flush_timeout=
=3D"3000" use_reading_thread=3D"true"/> -->
+            <pbcast.STATE_TRANSFER down_thread=3D"false" up_thread=3D"fals=
e" use_flush=3D"true" flush_timeout=3D"3000"/>
+            <pbcast.FLUSH down_thread=3D"false" up_thread=3D"false" timeou=
t=3D"8000" auto_flush_conf=3D"false"/>
+         </config>
+      </attribute>
+      <attribute name=3D"FetchInMemoryState">false</attribute>
+      <attribute name=3D"InitialStateRetrievalTimeout">15000</attribute>
+      <attribute name=3D"SyncReplTimeout">60000</attribute>
+      <attribute name=3D"LockAcquisitionTimeout">10000</attribute>
+      <attribute name=3D"EvictionPolicyConfig">
+      </attribute>
+
+      <attribute name=3D"CacheLoaderConfiguration">
+      </attribute>
+
+      <attribute name=3D"UseRegionBasedMarshalling">false</attribute>
+   </mbean>
+</server>

Copied: benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.1.0/conf=
/pess-repl-sync.xml (from rev 5227, benchmarks/benchmark-fwk/trunk/cache-pr=
oducts/jbosscache-2.0.0/conf/pess-repl-sync.xml)
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.1.0/conf/pes=
s-repl-sync.xml	                        (rev 0)
+++ benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.1.0/conf/pes=
s-repl-sync.xml	2008-01-24 15:51:20 UTC (rev 5231)
@@ -0,0 +1,82 @@
+<?xml version=3D"1.0" encoding=3D"UTF-8"?>
+
+<server>
+
+   <classpath codebase=3D"./lib" archives=3D"jboss-cache.jar, jgroups.jar"=
/>
+
+
+   <mbean code=3D"org.jboss.cache.CacheImpl"
+          name=3D"jboss.cache:service=3DTreeCache">
+
+      <depends>jboss:service=3DNaming</depends>
+      <depends>jboss:service=3DTransactionManager</depends>
+
+      <attribute name=3D"TransactionManagerLookupClass">org.jboss.cache.tr=
ansaction.GenericTransactionManagerLookup</attribute>
+      <attribute name=3D"IsolationLevel">REPEATABLE_READ</attribute>
+      <attribute name=3D"CacheMode">REPL_SYNC</attribute>
+      <attribute name=3D"UseReplQueue">false</attribute>
+      <attribute name=3D"ReplQueueInterval">0</attribute>
+      <attribute name=3D"ReplQueueMaxElements">0</attribute>
+      <attribute name=3D"ClusterName">JBossCache-Cluster</attribute>
+      <attribute name=3D"ClusterConfig">
+         <config>
+            <UDP mcast_addr=3D"224.10.10.10"
+                 mcast_port=3D"45599"
+                 tos=3D"8"
+                 ucast_recv_buf_size=3D"20000000"
+                 ucast_send_buf_size=3D"640000"
+                 mcast_recv_buf_size=3D"25000000"
+                 mcast_send_buf_size=3D"640000"
+                 loopback=3D"false"
+                 discard_incompatible_packets=3D"true"
+                 max_bundle_size=3D"64000"
+                 max_bundle_timeout=3D"30"
+                 use_incoming_packet_handler=3D"true"
+                 use_outgoing_packet_handler=3D"false"
+                 ip_ttl=3D"2"
+                 down_thread=3D"false" up_thread=3D"false"
+                 bind_addr=3D"127.0.0.1"
+                 enable_bundling=3D"false"/>
+            <PING timeout=3D"2000"
+                  down_thread=3D"false" up_thread=3D"false" num_initial_me=
mbers=3D"3"/>
+            <MERGE2 max_interval=3D"100000"
+                    down_thread=3D"false" up_thread=3D"false" min_interval=
=3D"20000"/>
+            <FD_SOCK down_thread=3D"false" up_thread=3D"false"/>
+            <FD timeout=3D"10000" max_tries=3D"5" down_thread=3D"false" up=
_thread=3D"false" shun=3D"true"/>
+            <VERIFY_SUSPECT timeout=3D"1500" down_thread=3D"false" up_thre=
ad=3D"false"/>
+            <pbcast.NAKACK max_xmit_size=3D"60000"
+                           use_mcast_xmit=3D"false" gc_lag=3D"0"
+                           retransmit_timeout=3D"300,600,1200,2400,4800"
+                           down_thread=3D"false" up_thread=3D"false"
+                           discard_delivered_msgs=3D"true"/>
+            <UNICAST timeout=3D"300,600,1200,2400,3600"
+                     down_thread=3D"false" up_thread=3D"false"/>
+            <pbcast.STABLE stability_delay=3D"1000" desired_avg_gossip=3D"=
50000"
+                           down_thread=3D"false" up_thread=3D"false"
+                           max_bytes=3D"400000"/>
+            <pbcast.GMS print_local_addr=3D"true" join_timeout=3D"3000" us=
e_flush=3D"true" flush_timeout=3D"3000"
+                        down_thread=3D"false" up_thread=3D"false"
+                        join_retry_timeout=3D"2000" shun=3D"false"
+                        view_bundling=3D"true"/>
+            <FC max_credits=3D"2000000" down_thread=3D"false" up_thread=3D=
"false"
+                min_threshold=3D"0.20"/>
+            <FRAG2 frag_size=3D"60000" down_thread=3D"false" up_thread=3D"=
false"/>
+            <!-- <pbcast.STREAMING_STATE_TRANSFER down_thread=3D"false" up=
_thread=3D"false"
+                                         use_flush=3D"true" flush_timeout=
=3D"3000" use_reading_thread=3D"true"/> -->
+            <pbcast.STATE_TRANSFER down_thread=3D"false" up_thread=3D"fals=
e" use_flush=3D"true" flush_timeout=3D"3000"/>
+            <pbcast.FLUSH down_thread=3D"false" up_thread=3D"false" timeou=
t=3D"8000" auto_flush_conf=3D"false"/>
+         </config>
+      </attribute>
+      <attribute name=3D"FetchInMemoryState">false</attribute>
+      <attribute name=3D"InitialStateRetrievalTimeout">15000</attribute>
+      <attribute name=3D"SyncReplTimeout">60000</attribute>
+      <attribute name=3D"LockAcquisitionTimeout">10000</attribute>
+      <attribute name=3D"EvictionPolicyConfig">
+      </attribute>
+
+      <attribute name=3D"CacheLoaderConfiguration">
+      </attribute>
+
+      <attribute name=3D"UseRegionBasedMarshalling">false</attribute>
+   </mbean>
+</server>


--===============6866655285937447849==--

From jbosscache-commits at lists.jboss.org Thu Jan 24 11:09:29 2008
Content-Type: multipart/mixed; boundary="===============4917008586215592587=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r5232 - in
 benchmarks/benchmark-fwk/trunk: conf and 1 other directory.
Date: Thu, 24 Jan 2008 11:09:29 -0500
Message-ID: <E1JI4dt-0007Rc-8x@committer01.frg.pub.inap.atl.jboss.com>

--===============4917008586215592587==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: manik.surtani(a)jboss.com
Date: 2008-01-24 11:09:29 -0500 (Thu, 24 Jan 2008)
New Revision: 5232

Added:
   benchmarks/benchmark-fwk/trunk/allJBossCacheTests.sh
Modified:
   benchmarks/benchmark-fwk/trunk/bindAddress.sh
   benchmarks/benchmark-fwk/trunk/conf/cachebench.xml
Log:


Added: benchmarks/benchmark-fwk/trunk/allJBossCacheTests.sh
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- benchmarks/benchmark-fwk/trunk/allJBossCacheTests.sh	                  =
      (rev 0)
+++ benchmarks/benchmark-fwk/trunk/allJBossCacheTests.sh	2008-01-24 16:09:2=
9 UTC (rev 5232)
@@ -0,0 +1,43 @@
+#!/bin/bash
+
+scaling=3D"2 4 6 8 10"
+configs=3D"pess-repl-async.xml pess-repl-sync.xml ress-repl-async-br.xml"
+products=3D"jbosscache-1.4.1 jbosscache-2.0.0 jbosscache-2.1.0"
+
+mkdir output
+
+for product in $products
+do
+	for config in $configs
+	do
+		for size in $scaling
+		do
+			./cluster.sh start $product $config $size
+			while [ ! -e performance-$size.csv ]
+			do
+				echo Waiting for report... =

+				sleep 30
+			done
+			sleep 10
+			mv performance-$size.csv output/$product-$config-$size.csv
+			./cluster.sh stop
+			sleep 10
+		done
+	done
+done
+
+echo Combining reports
+
+cd output
+if [ -e ../combined.csv ]
+then
+	rm ../combined.csv
+fi
+
+for i in *.csv
+do
+	echo $i >> ../combined.csv
+	cat $i >> ../combined.csv
+	echo >> ../combined.csv	=

+done
+


Property changes on: benchmarks/benchmark-fwk/trunk/allJBossCacheTests.sh
___________________________________________________________________
Name: svn:executable
   + *

Modified: benchmarks/benchmark-fwk/trunk/bindAddress.sh
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- benchmarks/benchmark-fwk/trunk/bindAddress.sh	2008-01-24 15:51:20 UTC (=
rev 5231)
+++ benchmarks/benchmark-fwk/trunk/bindAddress.sh	2008-01-24 16:09:29 UTC (=
rev 5232)
@@ -1,5 +1,5 @@
 #!/bin/sh
 =

 ### Set your bind address for the tests to use. Could be an IP, host name =
or a reference to an environment variable.
-BIND_ADDRESS=3D${MYTESTIP_4}
+BIND_ADDRESS=3D${MYTESTIP_1}
 =


Modified: benchmarks/benchmark-fwk/trunk/conf/cachebench.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- benchmarks/benchmark-fwk/trunk/conf/cachebench.xml	2008-01-24 15:51:20 =
UTC (rev 5231)
+++ benchmarks/benchmark-fwk/trunk/conf/cachebench.xml	2008-01-24 16:09:29 =
UTC (rev 5232)
@@ -28,6 +28,7 @@
       <member host=3D"cluster07" port=3D"17900"/> =

       <member host=3D"cluster08" port=3D"17900"/> =

       <member host=3D"cluster09" port=3D"17900"/> =

+      <member host=3D"cluster10" port=3D"17900"/>
    </cluster>
 =

    <!--
@@ -49,10 +50,12 @@
         validates that replication is enabled and works. If repl does not =
occur and the stopOnFailure is set to true then exists.
         Should be used to make sure that replication is enabled; see javad=
oc for more details
       -->
+	<!--
       <test name=3D"replicationOccurrsTest" testClass=3D"org.cachebench.te=
sts.ReplicationOccursTest">
          <param name=3D"partialReplication" value=3D"true"/>
       </test>
 =

+-->
       <!--
          * The "name" attrib is just used for display in the reports.
          * You can write your own custom testClass.


--===============4917008586215592587==--

From jbosscache-commits at lists.jboss.org Thu Jan 24 11:14:41 2008
Content-Type: multipart/mixed; boundary="===============7084265798098977408=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r5233 -
 benchmarks/benchmark-fwk/trunk.
Date: Thu, 24 Jan 2008 11:14:41 -0500
Message-ID: <E1JI4iv-0008T1-C1@committer01.frg.pub.inap.atl.jboss.com>

--===============7084265798098977408==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: manik.surtani(a)jboss.com
Date: 2008-01-24 11:14:41 -0500 (Thu, 24 Jan 2008)
New Revision: 5233

Modified:
   benchmarks/benchmark-fwk/trunk/allJBossCacheTests.sh
Log:


Modified: benchmarks/benchmark-fwk/trunk/allJBossCacheTests.sh
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- benchmarks/benchmark-fwk/trunk/allJBossCacheTests.sh	2008-01-24 16:09:2=
9 UTC (rev 5232)
+++ benchmarks/benchmark-fwk/trunk/allJBossCacheTests.sh	2008-01-24 16:14:4=
1 UTC (rev 5233)
@@ -2,7 +2,7 @@
 =

 scaling=3D"2 4 6 8 10"
 configs=3D"pess-repl-async.xml pess-repl-sync.xml ress-repl-async-br.xml"
-products=3D"jbosscache-1.4.1 jbosscache-2.0.0 jbosscache-2.1.0"
+products=3D"jbosscache-2.0.0 jbosscache-2.1.0"
 =

 mkdir output
 =



--===============7084265798098977408==--

From jbosscache-commits at lists.jboss.org Thu Jan 24 11:17:46 2008
Content-Type: multipart/mixed; boundary="===============7811796792185580305=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r5234 -
 benchmarks/benchmark-fwk/trunk/src/org/cachebench/reportgenerators.
Date: Thu, 24 Jan 2008 11:17:46 -0500
Message-ID: <E1JI4lu-0000zK-EC@committer01.frg.pub.inap.atl.jboss.com>

--===============7811796792185580305==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: manik.surtani(a)jboss.com
Date: 2008-01-24 11:17:46 -0500 (Thu, 24 Jan 2008)
New Revision: 5234

Modified:
   benchmarks/benchmark-fwk/trunk/src/org/cachebench/reportgenerators/CsvSe=
ssionSimlatorReportGenerator.java
Log:
Fixed typos

Modified: benchmarks/benchmark-fwk/trunk/src/org/cachebench/reportgenerator=
s/CsvSessionSimlatorReportGenerator.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- benchmarks/benchmark-fwk/trunk/src/org/cachebench/reportgenerators/CsvS=
essionSimlatorReportGenerator.java	2008-01-24 16:14:41 UTC (rev 5233)
+++ benchmarks/benchmark-fwk/trunk/src/org/cachebench/reportgenerators/CsvS=
essionSimlatorReportGenerator.java	2008-01-24 16:17:46 UTC (rev 5234)
@@ -57,7 +57,7 @@
    protected void writeHeaderLine(BufferedWriter writer) throws IOException
    {
       log.debug("Write the Report Header");
-      writer.write("TEST NAME, TEST DATE, REQ PER SEC, BYTES READ, BYTES W=
RITTEN, DURRATION, TOTOAL OPERATION COUNT, READ COUNT, WRITE COUNT" );
+      writer.write("TEST NAME, TEST DATE, REQ PER SEC, BYTES READ, BYTES W=
RITTEN, DURATION, TOTAL OPERATION COUNT, READ COUNT, WRITE COUNT" );
       writer.newLine();
       log.debug("Complted the Report Header");
 =



--===============7811796792185580305==--

From jbosscache-commits at lists.jboss.org Thu Jan 24 11:17:57 2008
Content-Type: multipart/mixed; boundary="===============5897254273242203456=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r5235 -
 benchmarks/benchmark-fwk/trunk.
Date: Thu, 24 Jan 2008 11:17:57 -0500
Message-ID: <E1JI4m5-0000za-7h@committer01.frg.pub.inap.atl.jboss.com>

--===============5897254273242203456==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: manik.surtani(a)jboss.com
Date: 2008-01-24 11:17:57 -0500 (Thu, 24 Jan 2008)
New Revision: 5235

Added:
   benchmarks/benchmark-fwk/trunk/TODO
Log:
Added a TODO


Added: benchmarks/benchmark-fwk/trunk/TODO
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- benchmarks/benchmark-fwk/trunk/TODO	                        (rev 0)
+++ benchmarks/benchmark-fwk/trunk/TODO	2008-01-24 16:17:57 UTC (rev 5235)
@@ -0,0 +1,3 @@
+1.  Proper naming and merging of reports, with the ability to run multiple=
 configurations (basically all that allJBossCacheTests.sh does, but in Java=
!)
+2.  JBoss Cache 1.4.1 breaks during warmup
+3.  ReplicationOccursTest doesn't always work - reports false errors.
\ No newline at end of file


--===============5897254273242203456==--

From jbosscache-commits at lists.jboss.org Fri Jan 25 06:43:32 2008
Content-Type: multipart/mixed; boundary="===============3690233941881620499=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r5236 -
 benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.0.0/conf.
Date: Fri, 25 Jan 2008 06:39:26 -0500
Message-ID: <E1JIMu6-00041y-92@committer01.frg.pub.inap.atl.jboss.com>

--===============3690233941881620499==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: manik.surtani(a)jboss.com
Date: 2008-01-25 06:39:26 -0500 (Fri, 25 Jan 2008)
New Revision: 5236

Modified:
   benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.0.0/conf/pess=
-repl-async-br.xml
Log:
updated

Modified: benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.0.0/co=
nf/pess-repl-async-br.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.0.0/conf/pes=
s-repl-async-br.xml	2008-01-24 16:17:57 UTC (rev 5235)
+++ benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.0.0/conf/pes=
s-repl-async-br.xml	2008-01-25 11:39:26 UTC (rev 5236)
@@ -59,9 +59,7 @@
     <FD timeout=3D"10000" max_tries=3D"5"   shun=3D"true"/>
     <VERIFY_SUSPECT timeout=3D"1500"  />
     <BARRIER />
-    <pbcast.NAKACK use_stats_for_retransmission=3D"false"
-                   exponential_backoff=3D"150"
-                   use_mcast_xmit=3D"false" gc_lag=3D"0"
+    <pbcast.NAKACK use_mcast_xmit=3D"false" gc_lag=3D"0"
                    retransmit_timeout=3D"50,300,600,1200"
                    discard_delivered_msgs=3D"true"/>
     <pbcast.STABLE stability_delay=3D"1000" desired_avg_gossip=3D"50000"


--===============3690233941881620499==--

From jbosscache-commits at lists.jboss.org Fri Jan 25 06:54:21 2008
Content-Type: multipart/mixed; boundary="===============6427174571365069451=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r5237 -
 benchmarks/benchmark-fwk/trunk.
Date: Fri, 25 Jan 2008 06:50:20 -0500
Message-ID: <E1JIN4e-0007cy-SD@committer01.frg.pub.inap.atl.jboss.com>

--===============6427174571365069451==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: manik.surtani(a)jboss.com
Date: 2008-01-25 06:50:20 -0500 (Fri, 25 Jan 2008)
New Revision: 5237

Modified:
   benchmarks/benchmark-fwk/trunk/TODO
Log:
updated

Modified: benchmarks/benchmark-fwk/trunk/TODO
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- benchmarks/benchmark-fwk/trunk/TODO	2008-01-25 11:39:26 UTC (rev 5236)
+++ benchmarks/benchmark-fwk/trunk/TODO	2008-01-25 11:50:20 UTC (rev 5237)
@@ -1,3 +1,3 @@
-1.  Proper naming and merging of reports, with the ability to run multiple=
 configurations (basically all that allJBossCacheTests.sh does, but in Java=
!)
-2.  JBoss Cache 1.4.1 breaks during warmup
-3.  ReplicationOccursTest doesn't always work - reports false errors.
\ No newline at end of file
+1.  JBoss Cache 1.4.1 breaks during warmup
+2.  ReplicationOccursTest doesn't always work - reports false errors.
+3.  Replace cluster.sh, runNode.sh, killNode.sh and cache-product/product-=
x.y.z/config.sh with Ant scripts to make them cross-platform.


--===============6427174571365069451==--

From jbosscache-commits at lists.jboss.org Fri Jan 25 07:47:37 2008
Content-Type: multipart/mixed; boundary="===============0317687481114345449=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r5238 - in core/trunk/src:
 test/java/org/jboss/cache/api and 15 other directories.
Date: Fri, 25 Jan 2008 07:47:36 -0500
Message-ID: <E1JINy4-0001x0-Ql@committer01.frg.pub.inap.atl.jboss.com>

--===============0317687481114345449==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: mircea.markus
Date: 2008-01-25 07:47:36 -0500 (Fri, 25 Jan 2008)
New Revision: 5238

Added:
   core/trunk/src/test-perf/resources/
   core/trunk/src/test-perf/resources/local-mru-eviction-service.xml
   core/trunk/src/test-perf/resources/local-service.xml
   core/trunk/src/test/resources/META-INF/conf-test/
   core/trunk/src/test/resources/META-INF/conf-test/local-lru-eviction-serv=
ice.xml
   core/trunk/src/test/resources/META-INF/conf-test/local-null-eviction-ser=
vice.xml
   core/trunk/src/test/resources/META-INF/conf-test/mixedPolicy-eviction-se=
rvice.xml
   core/trunk/src/test/resources/META-INF/conf-test/mux-service.xml
   core/trunk/src/test/resources/META-INF/conf-test/policyPerRegion-evictio=
n-service.xml
   core/trunk/src/test/resources/META-INF/conf-test/replSync-service.xml
Modified:
   core/trunk/src/test-perf/java/org/jboss/cache/ConcurrentEvictAndRemoveTe=
st.java
   core/trunk/src/test-perf/java/org/jboss/cache/LocalMapPerfTest.java
   core/trunk/src/test-perf/java/org/jboss/cache/LocalPerfTest.java
   core/trunk/src/test-scripts/resources/TcpCacheServer/startTcpCacheServer=
.sh
   core/trunk/src/test/java/org/jboss/cache/CacheFactoryTest.java
   core/trunk/src/test/java/org/jboss/cache/api/CacheAPITest.java
   core/trunk/src/test/java/org/jboss/cache/api/NodeAPITest.java
   core/trunk/src/test/java/org/jboss/cache/api/NodeMoveAPITest.java
   core/trunk/src/test/java/org/jboss/cache/buddyreplication/BuddyReplicati=
onConfigTest.java
   core/trunk/src/test/java/org/jboss/cache/config/ConfigurationTest.java
   core/trunk/src/test/java/org/jboss/cache/eviction/ConcurrentEvictionTest=
.java
   core/trunk/src/test/java/org/jboss/cache/eviction/ElementSizePolicyTest.=
java
   core/trunk/src/test/java/org/jboss/cache/eviction/EvictionConfigurationT=
est.java
   core/trunk/src/test/java/org/jboss/cache/eviction/FIFOPolicyTest.java
   core/trunk/src/test/java/org/jboss/cache/eviction/LFUPolicyTest.java
   core/trunk/src/test/java/org/jboss/cache/eviction/LRUPolicyTest.java
   core/trunk/src/test/java/org/jboss/cache/eviction/MRUPolicyTest.java
   core/trunk/src/test/java/org/jboss/cache/eviction/NullEvictionPolicyTest=
.java
   core/trunk/src/test/java/org/jboss/cache/eviction/OptimisticEvictionTest=
.java
   core/trunk/src/test/java/org/jboss/cache/eviction/ProgrammaticLRUPolicyT=
est.java
   core/trunk/src/test/java/org/jboss/cache/factories/UnitTestCacheConfigur=
ationFactory.java
   core/trunk/src/test/java/org/jboss/cache/invocationcontext/TransactionTe=
st.java
   core/trunk/src/test/java/org/jboss/cache/loader/TcpCacheLoaderTest.java
   core/trunk/src/test/java/org/jboss/cache/loader/TcpCacheServerTest.java
   core/trunk/src/test/java/org/jboss/cache/passivation/BasicPassivationTes=
t.java
   core/trunk/src/test/java/org/jboss/cache/passivation/ConcurrentPassivati=
onTest.java
   core/trunk/src/test/java/org/jboss/cache/passivation/LocalPassivationInt=
egrationTest.java
   core/trunk/src/test/java/org/jboss/cache/passivation/ReplicatedPassivati=
onIntegrationTest.java
   core/trunk/src/test/java/org/jboss/cache/transaction/ConcurrentBankTest.=
java
   core/trunk/src/test/java/org/jboss/cache/transaction/ConcurrentTransacti=
onalTest.java
   core/trunk/src/test/resources/log4j.xml
Log:
http://jira.jboss.com/jira/browse/JBCACHE-1269

Modified: core/trunk/src/test/java/org/jboss/cache/CacheFactoryTest.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/test/java/org/jboss/cache/CacheFactoryTest.java	2008-01-=
25 11:50:20 UTC (rev 5237)
+++ core/trunk/src/test/java/org/jboss/cache/CacheFactoryTest.java	2008-01-=
25 12:47:36 UTC (rev 5238)
@@ -25,7 +25,7 @@
 public class CacheFactoryTest
 {
    Configuration expected;
-   String configFile =3D "META-INF/replSync-service.xml";
+   String configFile =3D "META-INF/conf-test/replSync-service.xml";
    private CacheSPI cache;
 =

    @BeforeMethod(alwaysRun =3D true)

Modified: core/trunk/src/test/java/org/jboss/cache/api/CacheAPITest.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/test/java/org/jboss/cache/api/CacheAPITest.java	2008-01-=
25 11:50:20 UTC (rev 5237)
+++ core/trunk/src/test/java/org/jboss/cache/api/CacheAPITest.java	2008-01-=
25 12:47:36 UTC (rev 5238)
@@ -43,7 +43,7 @@
    {
       // start a single cache instance
       CacheFactory<String, String> cf =3D new DefaultCacheFactory();
-      cache =3D cf.createCache("META-INF/local-tx-service.xml", false);
+      cache =3D cf.createCache("/META-INF/news/local-cache-service.xml", f=
alse);
       cache.getConfiguration().setNodeLockingScheme(optimistic ? Configura=
tion.NodeLockingScheme.OPTIMISTIC : Configuration.NodeLockingScheme.PESSIMI=
STIC);
       cache.start();
       events.clear();

Modified: core/trunk/src/test/java/org/jboss/cache/api/NodeAPITest.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/test/java/org/jboss/cache/api/NodeAPITest.java	2008-01-2=
5 11:50:20 UTC (rev 5237)
+++ core/trunk/src/test/java/org/jboss/cache/api/NodeAPITest.java	2008-01-2=
5 12:47:36 UTC (rev 5238)
@@ -46,7 +46,7 @@
    public void setUp() throws Exception
    {
       // start a single cache instance
-      cache =3D (CacheSPI<Object, Object>) new DefaultCacheFactory().creat=
eCache("META-INF/local-tx-service.xml", false);
+      cache =3D (CacheSPI<Object, Object>) new DefaultCacheFactory().creat=
eCache("/META-INF/news/local-cache-service.xml", false);
       cache.getConfiguration().setNodeLockingScheme(optimistic ? Configura=
tion.NodeLockingScheme.OPTIMISTIC : Configuration.NodeLockingScheme.PESSIMI=
STIC);
       cache.start();
       rootNode =3D cache.getRoot();

Modified: core/trunk/src/test/java/org/jboss/cache/api/NodeMoveAPITest.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/test/java/org/jboss/cache/api/NodeMoveAPITest.java	2008-=
01-25 11:50:20 UTC (rev 5237)
+++ core/trunk/src/test/java/org/jboss/cache/api/NodeMoveAPITest.java	2008-=
01-25 12:47:36 UTC (rev 5238)
@@ -46,7 +46,7 @@
    public void setUp() throws Exception
    {
       // start a single cache instance
-      cache =3D (CacheSPI<Object, Object>) new DefaultCacheFactory().creat=
eCache("META-INF/local-tx-service.xml", false);
+      cache =3D (CacheSPI<Object, Object>) new DefaultCacheFactory().creat=
eCache("/META-INF/news/local-cache-service.xml", false);
       cache.getConfiguration().setNodeLockingScheme(optimistic ? Configura=
tion.NodeLockingScheme.OPTIMISTIC : Configuration.NodeLockingScheme.PESSIMI=
STIC);
       cache.start();
       rootNode =3D cache.getRoot();

Modified: core/trunk/src/test/java/org/jboss/cache/buddyreplication/BuddyRe=
plicationConfigTest.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/test/java/org/jboss/cache/buddyreplication/BuddyReplicat=
ionConfigTest.java	2008-01-25 11:50:20 UTC (rev 5237)
+++ core/trunk/src/test/java/org/jboss/cache/buddyreplication/BuddyReplicat=
ionConfigTest.java	2008-01-25 12:47:36 UTC (rev 5238)
@@ -75,7 +75,7 @@
 =

    public void testXmlConfig() throws Exception
    {
-      cache =3D (CacheSPI<Object, Object>) new DefaultCacheFactory().creat=
eCache(new XmlConfigurationParser().parseFile("META-INF/buddyreplication-se=
rvice.xml"), false);
+      cache =3D (CacheSPI<Object, Object>) new DefaultCacheFactory().creat=
eCache(new XmlConfigurationParser().parseFile("META-INF/buddy-replication-c=
ache-service.xml"), false);
       cache.create();
       cache.start();
       BuddyManager bm =3D cache.getBuddyManager();

Modified: core/trunk/src/test/java/org/jboss/cache/config/ConfigurationTest=
.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/test/java/org/jboss/cache/config/ConfigurationTest.java	=
2008-01-25 11:50:20 UTC (rev 5237)
+++ core/trunk/src/test/java/org/jboss/cache/config/ConfigurationTest.java	=
2008-01-25 12:47:36 UTC (rev 5238)
@@ -48,7 +48,7 @@
    public void testMultiplexerStack() throws Exception
    {
       XmlConfigurationParser parser =3D new XmlConfigurationParser();
-      Configuration conf =3D parser.parseFile("META-INF/mux-service.xml");
+      Configuration conf =3D parser.parseFile("META-INF/conf-test/mux-serv=
ice.xml");
 =

       // test that multiplexer settings have been read in properly.
       //assertEquals("MultiplexerService", "jgroups.mux:name=3DMultiplexer=
", conf.getMultiplexerService());

Modified: core/trunk/src/test/java/org/jboss/cache/eviction/ConcurrentEvict=
ionTest.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/test/java/org/jboss/cache/eviction/ConcurrentEvictionTes=
t.java	2008-01-25 11:50:20 UTC (rev 5237)
+++ core/trunk/src/test/java/org/jboss/cache/eviction/ConcurrentEvictionTes=
t.java	2008-01-25 12:47:36 UTC (rev 5238)
@@ -11,6 +11,8 @@
 import org.jboss.cache.CacheFactory;
 import org.jboss.cache.DefaultCacheFactory;
 import org.jboss.cache.Fqn;
+import org.jboss.cache.factories.UnitTestCacheConfigurationFactory;
+import org.jboss.cache.config.*;
 import org.jboss.cache.misc.TestingUtil;
 import static org.testng.AssertJUnit.assertNotNull;
 import static org.testng.AssertJUnit.fail;
@@ -19,6 +21,9 @@
 import org.testng.annotations.Test;
 =

 import java.util.Properties;
+import java.util.List;
+import java.util.ArrayList;
+import java.io.IOException;
 =

 /**
  * Tests cache behavior in the presence of concurrent passivation.
@@ -50,14 +55,45 @@
    {
       TestingUtil.recursiveFileRemove(tmpDir + cacheLoaderDir);
       CacheFactory<Integer, String> factory =3D new DefaultCacheFactory();
-      cache_ =3D factory.createCache("META-INF/local-eviction-cacheloader-=
service.xml", false);// read in generic local xml
-      cache_.getConfiguration().setTransactionManagerLookupClass("org.jbos=
s.cache.transaction.DummyTransactionManagerLookup");
+      Configuration conf =3D UnitTestCacheConfigurationFactory.createConfi=
guration(Configuration.CacheMode.LOCAL, true);
+      conf.setEvictionConfig(buildEvictionConfig());
+      conf.setCacheLoaderConfig(buildCacheLoaderConfig());
+      conf.setTransactionManagerLookupClass("org.jboss.cache.transaction.D=
ummyTransactionManagerLookup");
+      cache_ =3D factory.createCache(conf, true);// read in generic local =
xml
+   }
+
+   private CacheLoaderConfig buildCacheLoaderConfig()
+         throws IOException
+   {
+      CacheLoaderConfig cacheLoaderConfig =3D new CacheLoaderConfig();
+      cacheLoaderConfig.setPassivation(false);
+      cacheLoaderConfig.setPreload("/");
+      cacheLoaderConfig.setShared(false);
+      CacheLoaderConfig.IndividualCacheLoaderConfig iclc =3D new CacheLoad=
erConfig.IndividualCacheLoaderConfig();
+      iclc.setClassName("org.jboss.cache.loader.FileCacheLoader");
       Properties p =3D new Properties();
-      p.put("location", tmpDir + cacheLoaderDir);
-      cache_.getConfiguration().getCacheLoaderConfig().getFirstCacheLoader=
Config().setProperties(p);
-      cache_.start();
+      p.put("location", tmpDir + cacheLoaderDir);      =

+      iclc.setProperties(p);
+      iclc.setAsync(false);
+      iclc.setFetchPersistentState(true);
+      iclc.setIgnoreModifications(false);
+      cacheLoaderConfig.addIndividualCacheLoaderConfig(iclc);
+      return cacheLoaderConfig;
    }
 =

+   private EvictionConfig buildEvictionConfig()
+   {
+      EvictionConfig ec =3D new EvictionConfig("org.jboss.cache.eviction.L=
RUPolicy");
+      ec.setDefaultEvictionPolicyClass("org.jboss.cache.eviction.LRUPolicy=
");
+      ec.setWakeupIntervalSeconds(5);
+
+      EvictionRegionConfig erc =3D UnitTestCacheConfigurationFactory.build=
LruEvictionRegionConfig("_default_", 5000, 1000);      =

+      List<EvictionRegionConfig> erConfigs =3D new ArrayList<EvictionRegio=
nConfig>();
+      erConfigs.add(erc);
+      ec.setEvictionRegionConfigs(erConfigs);
+      return ec;
+   }
+
    @AfterMethod(alwaysRun =3D true)
    public void tearDown() throws Exception
    {

Modified: core/trunk/src/test/java/org/jboss/cache/eviction/ElementSizePoli=
cyTest.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/test/java/org/jboss/cache/eviction/ElementSizePolicyTest=
.java	2008-01-25 11:50:20 UTC (rev 5237)
+++ core/trunk/src/test/java/org/jboss/cache/eviction/ElementSizePolicyTest=
.java	2008-01-25 12:47:36 UTC (rev 5238)
@@ -11,12 +11,19 @@
 import org.jboss.cache.Fqn;
 import org.jboss.cache.Node;
 import org.jboss.cache.NodeSPI;
+import org.jboss.cache.config.Configuration;
+import org.jboss.cache.config.EvictionConfig;
+import org.jboss.cache.config.EvictionRegionConfig;
+import org.jboss.cache.factories.UnitTestCacheConfigurationFactory;
 import org.jboss.cache.lock.IsolationLevel;
 import static org.testng.AssertJUnit.*;
 import org.testng.annotations.AfterMethod;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 =

+import java.util.List;
+import java.util.ArrayList;
+
 /**
  * @author Daniel Huang
  * @version $Revison: $
@@ -48,12 +55,37 @@
 =

    void initCaches() throws Exception
    {
-      cache =3D (CacheSPI<Object, Object>) new DefaultCacheFactory().creat=
eCache("META-INF/local-elementsize-eviction-service.xml", false);// read in=
 generic local xml
+      Configuration conf =3D UnitTestCacheConfigurationFactory.createConfi=
guration(Configuration.CacheMode.LOCAL, true);
+      EvictionConfig evConfig =3D conf.getEvictionConfig();
+      evConfig.setDefaultEvictionPolicyClass("org.jboss.cache.eviction.Ele=
mentSizePolicy");
+      evConfig.setWakeupIntervalSeconds(3);
+      evConfig.setDefaultEventQueueSize(200000);
+
+      List<EvictionRegionConfig> regionConfigs =3D new ArrayList<EvictionR=
egionConfig>();
+      regionConfigs.add(createEvictionRegionConfig("_default_", 5000, 100)=
);
+      regionConfigs.add(createEvictionRegionConfig("/org/jboss/data", 10, =
20));
+      regionConfigs.add(createEvictionRegionConfig("/org/jboss/test/data",=
 -1, 5));
+      regionConfigs.add(createEvictionRegionConfig("/test/", 5000, 1));
+
+      evConfig.setEvictionRegionConfigs(regionConfigs);
+
+      cache =3D (CacheSPI<Object, Object>) new DefaultCacheFactory().creat=
eCache(conf, false);
       cache.getConfiguration().setTransactionManagerLookupClass("org.jboss=
.cache.transaction.DummyTransactionManagerLookup");
       cache.getConfiguration().setIsolationLevel(IsolationLevel.SERIALIZAB=
LE);
       cache.start();
    }
 =

+   private EvictionRegionConfig createEvictionRegionConfig(String regionNa=
me, int maxNodes, int maxElementsPerNode)
+   {
+      EvictionRegionConfig ercDefault =3D new EvictionRegionConfig();
+      ercDefault.setRegionName(regionName);
+      ElementSizeConfiguration esConfig =3D new ElementSizeConfiguration();
+      if (maxNodes >=3D 0) esConfig.setMaxNodes(maxNodes);
+      if (maxElementsPerNode >=3D 0) esConfig.setMaxElementsPerNode(maxEle=
mentsPerNode);
+      ercDefault.setEvictionPolicyConfig(esConfig);
+      return ercDefault;
+   }
+
    @AfterMethod(alwaysRun =3D true)
    public void tearDown() throws Exception
    {

Modified: core/trunk/src/test/java/org/jboss/cache/eviction/EvictionConfigu=
rationTest.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/test/java/org/jboss/cache/eviction/EvictionConfiguration=
Test.java	2008-01-25 11:50:20 UTC (rev 5237)
+++ core/trunk/src/test/java/org/jboss/cache/eviction/EvictionConfiguration=
Test.java	2008-01-25 12:47:36 UTC (rev 5238)
@@ -11,12 +11,16 @@
 import org.jboss.cache.Fqn;
 import org.jboss.cache.Region;
 import org.jboss.cache.RegionManager;
+import org.jboss.cache.factories.UnitTestCacheConfigurationFactory;
 import org.jboss.cache.config.EvictionPolicyConfig;
+import org.jboss.cache.config.Configuration;
 import org.jboss.cache.lock.IsolationLevel;
 import static org.testng.AssertJUnit.assertEquals;
 import static org.testng.AssertJUnit.assertTrue;
 import org.testng.annotations.Test;
 =

+import java.net.URL;
+
 /**
  * Unit test to test Eviction configuration types.
  *
@@ -31,7 +35,7 @@
 =

    public void testPolicyPerRegion() throws Exception
    {
-      this.setupCache("META-INF/policyPerRegion-eviction-service.xml");
+      this.setupCache("META-INF/conf-test/policyPerRegion-eviction-service=
.xml");
       assertEquals(5, cache.getConfiguration().getEvictionConfig().getWake=
upIntervalSeconds());
 =

       Region region =3D regionManager.getRegion("/org/jboss/data", true);
@@ -85,7 +89,7 @@
 =

    public void testMixedPolicies() throws Exception
    {
-      this.setupCache("META-INF/mixedPolicy-eviction-service.xml");
+      this.setupCache("META-INF/conf-test/mixedPolicy-eviction-service.xml=
");
       assertEquals(5, cache.getConfiguration().getEvictionConfig().getWake=
upIntervalSeconds());
 =

       Region region =3D regionManager.getRegion("/org/jboss/data", true);
@@ -130,7 +134,7 @@
 =

    public void testLegacyPolicyConfiguration() throws Exception
    {
-      this.setupCache("META-INF/local-lru-eviction-service.xml");
+      this.setupCache("META-INF/conf-test/local-lru-eviction-service.xml");
       assertEquals(5, cache.getConfiguration().getEvictionConfig().getWake=
upIntervalSeconds());
 =

       Region region =3D regionManager.getRegion("/org/jboss/data", false);
@@ -187,8 +191,8 @@
 =

    public void testTwoCacheInstanceConfiguration() throws Exception
    {
-      this.setupCache("META-INF/local-lru-eviction-service.xml");
-      this.setupCache("META-INF/local-lru-eviction-service.xml");
+      this.setupCache("META-INF/conf-test/local-lru-eviction-service.xml");
+      this.setupCache("META-INF/conf-test/local-lru-eviction-service.xml");
    }
 =

    public void testNoEviction() throws Exception

Modified: core/trunk/src/test/java/org/jboss/cache/eviction/FIFOPolicyTest.=
java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/test/java/org/jboss/cache/eviction/FIFOPolicyTest.java	2=
008-01-25 11:50:20 UTC (rev 5237)
+++ core/trunk/src/test/java/org/jboss/cache/eviction/FIFOPolicyTest.java	2=
008-01-25 12:47:36 UTC (rev 5238)
@@ -9,6 +9,10 @@
 import org.jboss.cache.CacheSPI;
 import org.jboss.cache.DefaultCacheFactory;
 import org.jboss.cache.Fqn;
+import org.jboss.cache.config.Configuration;
+import org.jboss.cache.config.EvictionConfig;
+import org.jboss.cache.config.EvictionRegionConfig;
+import org.jboss.cache.factories.UnitTestCacheConfigurationFactory;
 import org.jboss.cache.lock.IsolationLevel;
 import org.jboss.cache.misc.TestingUtil;
 import static org.testng.AssertJUnit.*;
@@ -16,6 +20,9 @@
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 =

+import java.util.List;
+import java.util.ArrayList;
+
 /**
  * Unit tests for FIFOPolicy.
  *
@@ -49,12 +56,32 @@
 =

    void initCaches() throws Exception
    {
-      cache =3D (CacheSPI<Object, Object>) new DefaultCacheFactory().creat=
eCache("META-INF/local-fifo-eviction-service.xml", false);// read in generi=
c local xml
-      cache.getConfiguration().setTransactionManagerLookupClass("org.jboss=
.cache.transaction.DummyTransactionManagerLookup");
-      cache.getConfiguration().setIsolationLevel(IsolationLevel.SERIALIZAB=
LE);
-      cache.start();
+      Configuration config =3D UnitTestCacheConfigurationFactory.createCon=
figuration(Configuration.CacheMode.LOCAL, true);
+      EvictionConfig evConfig =3D config.getEvictionConfig();
+      evConfig.setWakeupIntervalSeconds(3);
+      evConfig.setDefaultEventQueueSize(20000);
+      evConfig.setDefaultEvictionPolicyClass("org.jboss.cache.eviction.FIF=
OPolicy");
+      List<EvictionRegionConfig> erConfigs =3D new ArrayList<EvictionRegio=
nConfig>();
+      erConfigs.add(createEvictionRegionConfig("/_default_",5000));
+      erConfigs.add(createEvictionRegionConfig("/org/jboss/test/data",5));
+      evConfig.setEvictionRegionConfigs(erConfigs);
+      config.setTransactionManagerLookupClass("org.jboss.cache.transaction=
.DummyTransactionManagerLookup");
+      config.setIsolationLevel(IsolationLevel.SERIALIZABLE);
+      cache =3D (CacheSPI<Object, Object>) new DefaultCacheFactory().creat=
eCache(config, true);// read in generic local xml
    }
 =

+
+   private EvictionRegionConfig createEvictionRegionConfig(String regionNa=
me, int maxNodes)
+   {
+      EvictionRegionConfig ercDefault =3D new EvictionRegionConfig();
+      ercDefault.setRegionName(regionName);
+      FIFOConfiguration esConfig =3D new FIFOConfiguration();
+      if (maxNodes >=3D 0) esConfig.setMaxNodes(maxNodes);
+      ercDefault.setEvictionPolicyConfig(esConfig);
+      return ercDefault;
+   }
+
+
    @AfterMethod(alwaysRun =3D true)
    public void tearDown() throws Exception
    {

Modified: core/trunk/src/test/java/org/jboss/cache/eviction/LFUPolicyTest.j=
ava
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/test/java/org/jboss/cache/eviction/LFUPolicyTest.java	20=
08-01-25 11:50:20 UTC (rev 5237)
+++ core/trunk/src/test/java/org/jboss/cache/eviction/LFUPolicyTest.java	20=
08-01-25 12:47:36 UTC (rev 5238)
@@ -9,6 +9,10 @@
 import org.jboss.cache.CacheSPI;
 import org.jboss.cache.DefaultCacheFactory;
 import org.jboss.cache.Fqn;
+import org.jboss.cache.config.Configuration;
+import org.jboss.cache.config.EvictionConfig;
+import org.jboss.cache.config.EvictionRegionConfig;
+import org.jboss.cache.factories.UnitTestCacheConfigurationFactory;
 import org.jboss.cache.lock.IsolationLevel;
 import org.jboss.cache.misc.TestingUtil;
 import static org.testng.AssertJUnit.*;
@@ -16,6 +20,9 @@
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 =

+import java.util.List;
+import java.util.ArrayList;
+
 /**
  * Unit tests for LFU Policy.
  *
@@ -49,12 +56,32 @@
 =

    void initCaches() throws Exception
    {
-      cache =3D (CacheSPI<Object, Object>) new DefaultCacheFactory().creat=
eCache("META-INF/local-lfu-eviction-service.xml", false);
-      cache.getConfiguration().setTransactionManagerLookupClass("org.jboss=
.cache.transaction.DummyTransactionManagerLookup");
-      cache.getConfiguration().setIsolationLevel(IsolationLevel.SERIALIZAB=
LE);
-      cache.start();
+      Configuration config =3D UnitTestCacheConfigurationFactory.createCon=
figuration(Configuration.CacheMode.LOCAL, true);
+      EvictionConfig evConfig =3D config.getEvictionConfig();
+      evConfig.setWakeupIntervalSeconds(3);
+      evConfig.setDefaultEventQueueSize(200000);
+      List<EvictionRegionConfig> erConfigs =3D new ArrayList<EvictionRegio=
nConfig>();
+      erConfigs.add(createEvictionRegionConfig("/_default_",500,10));
+      erConfigs.add(createEvictionRegionConfig("/org/jboss/data",5000,4000=
));
+      erConfigs.add(createEvictionRegionConfig("/org/jboss/test/data",-1,5=
));
+      evConfig.setEvictionRegionConfigs(erConfigs);
+      config.setTransactionManagerLookupClass("org.jboss.cache.transaction=
.DummyTransactionManagerLookup");
+      config.setIsolationLevel(IsolationLevel.SERIALIZABLE);
+      cache =3D (CacheSPI<Object, Object>) new DefaultCacheFactory().creat=
eCache(config, true);
    }
 =

+   private EvictionRegionConfig createEvictionRegionConfig(String regionNa=
me, int maxNodes, int minNodes)
+   {
+      EvictionRegionConfig ercDefault =3D new EvictionRegionConfig();
+      ercDefault.setRegionName(regionName);
+      LFUConfiguration esConfig =3D new LFUConfiguration();
+      if (maxNodes >=3D 0) esConfig.setMaxNodes(maxNodes);
+      if (minNodes >=3D 0) esConfig.setMinNodes(minNodes);
+      ercDefault.setEvictionPolicyConfig(esConfig);
+      esConfig.setEvictionPolicyClassName();
+      return ercDefault;
+   }
+
    @AfterMethod(alwaysRun =3D true)
    public void tearDown() throws Exception
    {

Modified: core/trunk/src/test/java/org/jboss/cache/eviction/LRUPolicyTest.j=
ava
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/test/java/org/jboss/cache/eviction/LRUPolicyTest.java	20=
08-01-25 11:50:20 UTC (rev 5237)
+++ core/trunk/src/test/java/org/jboss/cache/eviction/LRUPolicyTest.java	20=
08-01-25 12:47:36 UTC (rev 5238)
@@ -4,6 +4,10 @@
 import org.jboss.cache.CacheSPI;
 import org.jboss.cache.DefaultCacheFactory;
 import org.jboss.cache.Fqn;
+import org.jboss.cache.config.Configuration;
+import org.jboss.cache.config.EvictionConfig;
+import org.jboss.cache.config.EvictionRegionConfig;
+import org.jboss.cache.factories.UnitTestCacheConfigurationFactory;
 import org.jboss.cache.lock.IsolationLevel;
 import org.jboss.cache.misc.TestingUtil;
 import static org.testng.AssertJUnit.*;
@@ -11,6 +15,9 @@
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 =

+import java.util.List;
+import java.util.ArrayList;
+
 /**
  * Unit tests for LRU Policy.
  *
@@ -45,12 +52,33 @@
 =

    public void initCaches() throws Exception
    {
-      cache_ =3D (CacheSPI<Object, Object>) new DefaultCacheFactory().crea=
teCache("META-INF/local-lru-eviction-service.xml", false);// read in generi=
c local xml
-      cache_.getConfiguration().setTransactionManagerLookupClass("org.jbos=
s.cache.transaction.DummyTransactionManagerLookup");
-      cache_.getConfiguration().setIsolationLevel(IsolationLevel.SERIALIZA=
BLE);
-      cache_.start();
+      Configuration conf =3D UnitTestCacheConfigurationFactory.createConfi=
guration(Configuration.CacheMode.LOCAL,true);
+      EvictionConfig evConfig =3D conf.getEvictionConfig();
+      evConfig.setWakeupIntervalSeconds(5);
+      List<EvictionRegionConfig> regionConfigs =3D new ArrayList<EvictionR=
egionConfig>();
+      regionConfigs.add(UnitTestCacheConfigurationFactory.buildLruEviction=
RegionConfig("/org/jboss/test/data", 5, 4));
+      regionConfigs.add(UnitTestCacheConfigurationFactory.buildLruEviction=
RegionConfig("/test", 10000, 4));
+      evConfig.setEvictionRegionConfigs(regionConfigs);
+      conf.setTransactionManagerLookupClass("org.jboss.cache.transaction.D=
ummyTransactionManagerLookup");
+      conf.setIsolationLevel(IsolationLevel.SERIALIZABLE);
+      cache_ =3D (CacheSPI) new DefaultCacheFactory().createCache(conf);
    }
 =

+
+   private EvictionRegionConfig buildEvictionRegionConfig(String regionNam=
e, int timeToLive, int maxNodes)
+   {
+      EvictionRegionConfig erc =3D new EvictionRegionConfig();
+      erc.setRegionName(regionName);
+      LRUConfiguration lruConfig =3D new LRUConfiguration();
+      lruConfig.setMaxNodes(5000);
+      lruConfig.setTimeToLiveSeconds(1000);
+      erc.setEvictionPolicyConfig(lruConfig);
+      List<EvictionRegionConfig> erConfigs =3D new ArrayList<EvictionRegio=
nConfig>();
+      erConfigs.add(erc);
+      return null;
+
+   }
+
    @AfterMethod(alwaysRun =3D true)
    public void tearDown() throws Exception
    {

Modified: core/trunk/src/test/java/org/jboss/cache/eviction/MRUPolicyTest.j=
ava
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/test/java/org/jboss/cache/eviction/MRUPolicyTest.java	20=
08-01-25 11:50:20 UTC (rev 5237)
+++ core/trunk/src/test/java/org/jboss/cache/eviction/MRUPolicyTest.java	20=
08-01-25 12:47:36 UTC (rev 5238)
@@ -8,6 +8,10 @@
 =

 import org.jboss.cache.CacheSPI;
 import org.jboss.cache.DefaultCacheFactory;
+import org.jboss.cache.factories.UnitTestCacheConfigurationFactory;
+import org.jboss.cache.config.Configuration;
+import org.jboss.cache.config.EvictionConfig;
+import org.jboss.cache.config.EvictionRegionConfig;
 import org.jboss.cache.lock.IsolationLevel;
 import org.jboss.cache.misc.TestingUtil;
 import static org.testng.AssertJUnit.*;
@@ -15,6 +19,9 @@
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 =

+import java.util.List;
+import java.util.ArrayList;
+
 /**
  * Unit tests for MRUPolicy.
  *
@@ -54,12 +61,31 @@
 =

    private void initCaches()
    {
-      cache =3D (CacheSPI<Object, Object>) new DefaultCacheFactory().creat=
eCache("META-INF/local-mru-eviction-service.xml", false);// read in generic=
 local xml
-      cache.getConfiguration().setTransactionManagerLookupClass("org.jboss=
.cache.transaction.DummyTransactionManagerLookup");
-      cache.getConfiguration().setIsolationLevel(IsolationLevel.SERIALIZAB=
LE);
-      cache.start();
+      Configuration config =3D UnitTestCacheConfigurationFactory.createCon=
figuration(Configuration.CacheMode.LOCAL, true);
+      EvictionConfig evConfig =3D config.getEvictionConfig();
+      evConfig.setWakeupIntervalSeconds(3);
+      evConfig.setDefaultEventQueueSize(200000);
+      evConfig.setDefaultEvictionPolicyClass("org.jboss.cache.eviction.MRU=
Policy");
+      List<EvictionRegionConfig> evictionRegionConfigs =3D new ArrayList<E=
victionRegionConfig>();
+      evictionRegionConfigs.add(buildEvictionRegionConfig("_default_",100)=
);
+      evictionRegionConfigs.add(buildEvictionRegionConfig("/org/jboss/test=
/data",6));
+      evConfig.setEvictionRegionConfigs(evictionRegionConfigs);
+
+      config.setTransactionManagerLookupClass("org.jboss.cache.transaction=
.DummyTransactionManagerLookup");
+      config.setIsolationLevel(IsolationLevel.SERIALIZABLE);
+      cache =3D (CacheSPI)new DefaultCacheFactory().createCache(config);
    }
 =

+   private EvictionRegionConfig buildEvictionRegionConfig(String regionNam=
e, int maxNodes)
+   {
+      EvictionRegionConfig erc =3D new EvictionRegionConfig();
+      erc.setRegionName(regionName);
+      MRUConfiguration mruConfiguration =3D new MRUConfiguration();
+      mruConfiguration.setMaxNodes(maxNodes);
+      erc.setEvictionPolicyConfig(mruConfiguration);
+      return erc;
+   }
+
    public void testEviction() throws Exception
    {
       cache.put("/org/jboss/test/data/a", "/org/jboss/test/data/a", "/org/=
jboss/test/data/a");

Modified: core/trunk/src/test/java/org/jboss/cache/eviction/NullEvictionPol=
icyTest.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/test/java/org/jboss/cache/eviction/NullEvictionPolicyTes=
t.java	2008-01-25 11:50:20 UTC (rev 5237)
+++ core/trunk/src/test/java/org/jboss/cache/eviction/NullEvictionPolicyTes=
t.java	2008-01-25 12:47:36 UTC (rev 5238)
@@ -4,13 +4,22 @@
 import org.jboss.cache.CacheSPI;
 import org.jboss.cache.DefaultCacheFactory;
 import org.jboss.cache.Fqn;
+import org.jboss.cache.factories.UnitTestCacheConfigurationFactory;
+import org.jboss.cache.config.Configuration;
+import org.jboss.cache.config.EvictionConfig;
+import org.jboss.cache.config.EvictionRegionConfig;
 import org.jboss.cache.lock.IsolationLevel;
 import org.jboss.cache.misc.TestingUtil;
 import static org.testng.AssertJUnit.*;
 import org.testng.annotations.AfterMethod;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 =

+import java.util.List;
+import java.util.ArrayList;
+
 /**
  * Unit tests for LRU Policy.
  *
@@ -39,6 +48,10 @@
       }      =

    }
 =

+
+
+
+
    /**
     * Builds a cache was null eviction by default and in "/test" region,
     * LRU in "/lru" region.  Does a mix of puts/reads/removes, wakes for
@@ -47,67 +60,53 @@
     */
    public void testEviction()
    {      =

-      cache_ =3D (CacheSPI<Object, Object>) new DefaultCacheFactory().crea=
teCache("META-INF/local-null-eviction-service.xml", false);// read in gener=
ic local xml
-      cache_.getConfiguration().setTransactionManagerLookupClass("org.jbos=
s.cache.transaction.DummyTransactionManagerLookup");
-      cache_.getConfiguration().setIsolationLevel(IsolationLevel.SERIALIZA=
BLE);
-      cache_.start();
-      =

+      Configuration config =3D UnitTestCacheConfigurationFactory.createCon=
figuration(Configuration.CacheMode.LOCAL, true);
+      EvictionConfig evConfig =3D config.getEvictionConfig();
+      evConfig.setWakeupIntervalSeconds(1);
+      evConfig.setDefaultEventQueueSize(200000);
+      evConfig.setDefaultEvictionPolicyClass("org.jboss.cache.eviction.Nul=
lEvictionPolicy");
+      List<EvictionRegionConfig> regionConfigs =3D new ArrayList<EvictionR=
egionConfig>();
+      regionConfigs.add(buildEvictionRegionConfig("/_default_"));
+      regionConfigs.add(buildEvictionRegionConfig("/test"));
+      regionConfigs.add(UnitTestCacheConfigurationFactory.buildLruEviction=
RegionConfig("/lru", 10000,1));
+      evConfig.setEvictionRegionConfigs(regionConfigs);
+      config.setTransactionManagerLookupClass("org.jboss.cache.transaction=
.DummyTransactionManagerLookup");
+      config.setIsolationLevel(IsolationLevel.SERIALIZABLE);
+      cache_ =3D (CacheSPI)new DefaultCacheFactory().createCache(config);
+
       String dfltRootStr =3D "/a/";
       String testRootStr =3D "/test/";
       String lruRootStr =3D "/lru/";
       =

       for (int i =3D 0; i < 20; i++)
       {                 =

-         if (i % 1 =3D=3D 0 || i % 3 =3D=3D 0)
-         {
             Fqn dflt =3D Fqn.fromString(dfltRootStr + i);
             Fqn test =3D Fqn.fromString(testRootStr + i);
             Fqn lru =3D Fqn.fromString(lruRootStr + i);
             cache_.put(dflt, "key", "value");
             cache_.put(test, "key", "value");
             cache_.put(lru, "key", "value");
-         }
-         else
-         {
-            Fqn dflt =3D Fqn.fromString(dfltRootStr + (i - 1));
-            Fqn test =3D Fqn.fromString(testRootStr + (i - 1));
-            Fqn lru =3D Fqn.fromString(lruRootStr + (i - 1));
-            if (i % 2 =3D=3D 0)
-            {
-               assertEquals("value", cache_.get(dflt, "key"));
-               assertEquals("value", cache_.get(test, "key"));
-               assertEquals("value", cache_.get(lru, "key"));
-            }
-            else
-            {
-               cache_.removeNode(dflt);
-               cache_.removeNode(test);
-               cache_.removeNode(lru);
-            }
-         }
       }
-      =

-      TestingUtil.sleepThread(2500);
-      =

+      TestingUtil.sleepThread(3500);
       for (int i =3D 0; i < 20; i++)
       {
          Fqn dflt =3D Fqn.fromString(dfltRootStr + i);
          Fqn test =3D Fqn.fromString(testRootStr + i);
          Fqn lru =3D Fqn.fromString(lruRootStr + i);
-         =

-         if (i % 1 =3D=3D 0)
-         {
+
             assertEquals("value", cache_.get(dflt, "key"));
             assertEquals("value", cache_.get(test, "key"));
             assertNull(cache_.get(lru, "key"));
-         }
-         else if (i % 3 =3D=3D 0)
-         {
-            assertNull(cache_.get(dflt, "key"));
-            assertNull(cache_.get(test, "key"));
-            assertNull(cache_.get(lru, "key"));
-         }
       }
    }
 =

+   private EvictionRegionConfig buildEvictionRegionConfig(String regionNam=
e)
+   {
+      EvictionRegionConfig evRegConfig =3D new EvictionRegionConfig();
+      evRegConfig.setRegionName(regionName);
+      NullEvictionPolicyConfig nullEvictionPolicyConfig =3D new NullEvicti=
onPolicyConfig();
+      evRegConfig.setEvictionPolicyConfig(nullEvictionPolicyConfig);
+      return evRegConfig;
+   }
+
 }

Modified: core/trunk/src/test/java/org/jboss/cache/eviction/OptimisticEvict=
ionTest.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/test/java/org/jboss/cache/eviction/OptimisticEvictionTes=
t.java	2008-01-25 11:50:20 UTC (rev 5237)
+++ core/trunk/src/test/java/org/jboss/cache/eviction/OptimisticEvictionTes=
t.java	2008-01-25 12:47:36 UTC (rev 5238)
@@ -3,6 +3,11 @@
 import org.jboss.cache.CacheSPI;
 import org.jboss.cache.DefaultCacheFactory;
 import org.jboss.cache.Fqn;
+import org.jboss.cache.xml.XmlHelper;
+import org.jboss.cache.factories.UnitTestCacheConfigurationFactory;
+import org.jboss.cache.factories.XmlConfigurationParser;
+import org.jboss.cache.config.Configuration;
+import org.jboss.cache.config.EvictionConfig;
 import org.jboss.cache.interceptors.EvictionInterceptor;
 import org.jboss.cache.misc.TestingUtil;
 import org.jboss.cache.transaction.DummyTransactionManagerLookup;
@@ -11,6 +16,7 @@
 import org.testng.annotations.AfterMethod;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
+import org.w3c.dom.Element;
 =

 import javax.transaction.TransactionManager;
 import java.util.Iterator;
@@ -41,9 +47,40 @@
    public void setUp() throws Exception
    {
       txManager =3D new DummyTransactionManagerLookup().getTransactionMana=
ger();
-      cache =3D (CacheSPI<Object, Object>) new DefaultCacheFactory().creat=
eCache("META-INF/optimistic-eviction.xml");
+      Configuration config =3D UnitTestCacheConfigurationFactory.createCon=
figuration(Configuration.CacheMode.LOCAL, true);
+      config.setNodeLockingOptimistic(true);
+      config.setEvictionConfig(buildEvictionConfig());
+      cache =3D (CacheSPI<Object, Object>) new DefaultCacheFactory().creat=
eCache(config);
    }
 =

+   private EvictionConfig buildEvictionConfig() throws Exception
+   {
+      String xml =3D " <attribute name=3D\"EvictionPolicyConfig\">\n" +
+            "         <config>\n" +
+            "            <attribute name=3D\"wakeUpIntervalSeconds\">1</at=
tribute>\n" +
+            "            <!-- Name of the DEFAULT eviction policy class.--=
>\n" +
+            "            <attribute name=3D\"policyClass\">org.jboss.cache=
.eviction.LRUPolicy</attribute>\n" +
+            "            <region name=3D\"/_default_\">\n" +
+            "               <attribute name=3D\"maxNodes\">10</attribute>\=
n" +
+            "               <attribute name=3D\"timeToLiveSeconds\">0</att=
ribute>\n" +
+            "               <attribute name=3D\"maxAgeSeconds\">0</attribu=
te>\n" +
+            "            </region>\n" +
+            "            <region name=3D\"/testingRegion\">\n" +
+            "               <attribute name=3D\"maxNodes\">10</attribute>\=
n" +
+            "               <attribute name=3D\"timeToLiveSeconds\">0</att=
ribute>\n" +
+            "               <attribute name=3D\"maxAgeSeconds\">0</attribu=
te>\n" +
+            "            </region>\n" +
+            "            <region name=3D\"/timeBased\">\n" +
+            "               <attribute name=3D\"maxNodes\">10</attribute>\=
n" +
+            "               <attribute name=3D\"timeToLiveSeconds\">1</att=
ribute>\n" +
+            "               <attribute name=3D\"maxAgeSeconds\">1</attribu=
te>\n" +
+            "            </region>\n" +
+            "         </config>\n" +
+            "      </attribute>";
+      Element element =3D XmlHelper.stringToElement(xml);
+      return XmlConfigurationParser.parseEvictionConfig(element);      =

+   }
+
    @AfterMethod(alwaysRun =3D true)
    public void tearDown() throws Exception
    {

Modified: core/trunk/src/test/java/org/jboss/cache/eviction/ProgrammaticLRU=
PolicyTest.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/test/java/org/jboss/cache/eviction/ProgrammaticLRUPolicy=
Test.java	2008-01-25 11:50:20 UTC (rev 5237)
+++ core/trunk/src/test/java/org/jboss/cache/eviction/ProgrammaticLRUPolicy=
Test.java	2008-01-25 12:47:36 UTC (rev 5238)
@@ -23,13 +23,12 @@
 package org.jboss.cache.eviction;
 =

 =

-import org.jboss.cache.CacheSPI;
-import org.jboss.cache.DefaultCacheFactory;
-import org.jboss.cache.Fqn;
-import org.jboss.cache.RegionManager;
+import org.jboss.cache.*;
 import org.jboss.cache.config.EvictionConfig;
 import org.jboss.cache.config.EvictionRegionConfig;
+import org.jboss.cache.config.Configuration;
 import org.jboss.cache.factories.XmlConfigurationParser;
+import org.jboss.cache.factories.UnitTestCacheConfigurationFactory;
 import org.jboss.cache.lock.IsolationLevel;
 import org.jboss.cache.misc.TestingUtil;
 import org.jboss.cache.xml.XmlHelper;
@@ -66,7 +65,10 @@
 =

    private void initCaches()
    {
-      cache_ =3D (CacheSPI<Object, Object>) new DefaultCacheFactory().crea=
teCache("META-INF/local-lru-eviction-service.xml", false);// read in generi=
c local xml
+      Configuration conf =3D UnitTestCacheConfigurationFactory.createConfi=
guration(Configuration.CacheMode.LOCAL, true);
+      CacheFactory<Object, Integer> instance =3D new DefaultCacheFactory();
+      cache_ =3D (CacheSPI)instance.createCache(conf, false);
+      conf.getEvictionConfig().setWakeupIntervalSeconds(5);
       cache_.getConfiguration().setTransactionManagerLookupClass("org.jbos=
s.cache.transaction.DummyTransactionManagerLookup");
       cache_.getConfiguration().setIsolationLevel(IsolationLevel.SERIALIZA=
BLE);
 =


Modified: core/trunk/src/test/java/org/jboss/cache/factories/UnitTestCacheC=
onfigurationFactory.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/test/java/org/jboss/cache/factories/UnitTestCacheConfigu=
rationFactory.java	2008-01-25 11:50:20 UTC (rev 5237)
+++ core/trunk/src/test/java/org/jboss/cache/factories/UnitTestCacheConfigu=
rationFactory.java	2008-01-25 12:47:36 UTC (rev 5238)
@@ -10,8 +10,10 @@
 import org.jboss.cache.config.Configuration;
 import org.jboss.cache.config.Configuration.CacheMode;
 import org.jboss.cache.config.ConfigurationException;
+import org.jboss.cache.config.EvictionRegionConfig;
 import org.jboss.cache.transaction.TransactionSetup;
 import org.jboss.cache.xml.XmlHelper;
+import org.jboss.cache.eviction.LRUConfiguration;
 import org.jgroups.conf.XmlConfigurator;
 import org.w3c.dom.Element;
 import org.w3c.dom.NodeList;
@@ -132,6 +134,18 @@
       return jgroupsConfigString.substring(0, jgroupsConfigString.indexOf(=
":")) + delay + jgroupsConfigString.substring(jgroupsConfigString.indexOf("=
:"));
    }
 =

+   public static EvictionRegionConfig buildLruEvictionRegionConfig(String =
regionNaame, int maxNodes, int timeToLive)
+   {
+      EvictionRegionConfig erc =3D new EvictionRegionConfig();
+      erc.setRegionName(regionNaame);
+      LRUConfiguration lruConfig =3D new LRUConfiguration();
+      lruConfig.setEvictionPolicyClass("org.jboss.cache.eviction.LRUPolicy=
");
+      if (maxNodes >=3D 0) lruConfig.setMaxNodes(maxNodes);
+      if  (timeToLive >=3D 0) lruConfig.setTimeToLiveSeconds(timeToLive);
+      erc.setEvictionPolicyConfig(lruConfig);
+      return erc;
+   }
+
    private static class UnitTestXmlConfigurationParser extends XmlConfigur=
ationParser
    {
 =


Modified: core/trunk/src/test/java/org/jboss/cache/invocationcontext/Transa=
ctionTest.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/test/java/org/jboss/cache/invocationcontext/TransactionT=
est.java	2008-01-25 11:50:20 UTC (rev 5237)
+++ core/trunk/src/test/java/org/jboss/cache/invocationcontext/TransactionT=
est.java	2008-01-25 12:47:36 UTC (rev 5238)
@@ -25,7 +25,7 @@
    @BeforeMethod(alwaysRun =3D true)
    public void setUp()
    {
-      cache =3D (CacheSPI<Object, Object>) new DefaultCacheFactory().creat=
eCache("META-INF/local-tx-service.xml");
+      cache =3D (CacheSPI<Object, Object>) new DefaultCacheFactory().creat=
eCache("/META-INF/news/local-cache-service.xml");
       tm =3D cache.getTransactionManager();
    }
 =


Modified: core/trunk/src/test/java/org/jboss/cache/loader/TcpCacheLoaderTes=
t.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/test/java/org/jboss/cache/loader/TcpCacheLoaderTest.java=
	2008-01-25 11:50:20 UTC (rev 5237)
+++ core/trunk/src/test/java/org/jboss/cache/loader/TcpCacheLoaderTest.java=
	2008-01-25 12:47:36 UTC (rev 5238)
@@ -1,6 +1,10 @@
 package org.jboss.cache.loader;
 =

 import org.jboss.cache.CacheException;
+import org.jboss.cache.DefaultCacheFactory;
+import org.jboss.cache.CacheSPI;
+import org.jboss.cache.config.Configuration;
+import org.jboss.cache.factories.UnitTestCacheConfigurationFactory;
 import org.jboss.cache.interceptors.OrderedSynchronizationHandler;
 import org.jboss.cache.loader.tcp.TcpCacheServer;
 import org.jboss.cache.misc.TestingUtil;
@@ -43,7 +47,9 @@
                cache_server =3D new TcpCacheServer();
                cache_server.setBindAddress("127.0.0.1");
                cache_server.setPort(12121);
-               cache_server.setConfig("META-INF/local-service.xml"); // mu=
st be in classpath
+               Configuration config =3D UnitTestCacheConfigurationFactory.=
createConfiguration(Configuration.CacheMode.LOCAL, true);
+               CacheSPI cache =3D (CacheSPI) new DefaultCacheFactory().cre=
ateCache(config);
+               cache_server.setCache(cache);
                cache_server.create();
                cache_server.start();
                START_COUNT++;
@@ -53,6 +59,7 @@
                ex.printStackTrace();
             }
          }
+
       };
       t.setDaemon(true);
       t.start();

Modified: core/trunk/src/test/java/org/jboss/cache/loader/TcpCacheServerTes=
t.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/test/java/org/jboss/cache/loader/TcpCacheServerTest.java=
	2008-01-25 11:50:20 UTC (rev 5237)
+++ core/trunk/src/test/java/org/jboss/cache/loader/TcpCacheServerTest.java=
	2008-01-25 12:47:36 UTC (rev 5238)
@@ -7,6 +7,7 @@
 import org.jboss.cache.config.CacheLoaderConfig;
 import org.jboss.cache.config.Configuration;
 import org.jboss.cache.factories.XmlConfigurationParser;
+import org.jboss.cache.factories.UnitTestCacheConfigurationFactory;
 import org.jboss.cache.jmx.CacheJmxWrapper;
 import org.jboss.cache.loader.tcp.TcpCacheServer;
 import org.jboss.cache.misc.TestingUtil;
@@ -27,8 +28,6 @@
 @Test(groups =3D {"functional"})
 public class TcpCacheServerTest
 {
-   private static final String CONFIG_FILE =3D "META-INF/local-service.xml=
";
-
    static TcpCacheServer cache_server =3D null;
 =

    private CacheSPI<Object, Object> cache;
@@ -134,7 +133,9 @@
    public void testInjectConfigFilePath() throws Exception
    {
       createTcpCacheServer();
-      cache_server.setConfig(CONFIG_FILE);
+      Configuration conf =3D UnitTestCacheConfigurationFactory.createConfi=
guration(Configuration.CacheMode.LOCAL, true);
+      CacheSPI cacheSPI =3D (CacheSPI) new DefaultCacheFactory().createCac=
he(conf);
+      cache_server.setCache(cacheSPI);
       startTcpCacheServer();
       createCacheAndLoader();
       cacheCheck();
@@ -144,9 +145,9 @@
    public void testInjectCache() throws Exception
    {
       createTcpCacheServer();
-      CacheSPI cache =3D (CacheSPI<Object, Object>) new DefaultCacheFactor=
y().createCache(CONFIG_FILE, false);
-      cache.start();
-      cache_server.setCache(cache);
+      Configuration conf =3D UnitTestCacheConfigurationFactory.createConfi=
guration(Configuration.CacheMode.LOCAL, true);
+      CacheSPI cacheSPI =3D (CacheSPI) new DefaultCacheFactory().createCac=
he(conf);
+      cache_server.setCache(cacheSPI);
       startTcpCacheServer();
       createCacheAndLoader();
       cacheCheck();
@@ -156,8 +157,9 @@
    public void testInjectCacheJmxWrapper() throws Exception
    {
       createTcpCacheServer();
-      CacheSPI<Object, Object> cache =3D (CacheSPI<Object, Object>) new De=
faultCacheFactory().createCache(CONFIG_FILE, false);
-      CacheJmxWrapper wrapper =3D new CacheJmxWrapper<Object, Object>(cach=
e);
+      Configuration conf =3D UnitTestCacheConfigurationFactory.createConfi=
guration(Configuration.CacheMode.LOCAL, true);
+      CacheSPI cacheSPI =3D (CacheSPI) new DefaultCacheFactory().createCac=
he(conf);
+      CacheJmxWrapper wrapper =3D new CacheJmxWrapper<Object, Object>(cach=
eSPI);
       wrapper.start();
       cache_server.setCacheJmxWrapper(wrapper);
       startTcpCacheServer();

Modified: core/trunk/src/test/java/org/jboss/cache/passivation/BasicPassiva=
tionTest.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/test/java/org/jboss/cache/passivation/BasicPassivationTe=
st.java	2008-01-25 11:50:20 UTC (rev 5237)
+++ core/trunk/src/test/java/org/jboss/cache/passivation/BasicPassivationTe=
st.java	2008-01-25 12:47:36 UTC (rev 5238)
@@ -59,7 +59,7 @@
    private void initCaches()
    {
       CacheFactory<String, String> instance =3D new DefaultCacheFactory();
-      cache =3D (CacheSPI) instance.createCache(new XmlConfigurationParser=
().parseFile("META-INF/local-passivation-service.xml"), false);
+      cache =3D (CacheSPI) instance.createCache(new XmlConfigurationParser=
().parseFile("META-INF/jdbCacheLoader-passivation-service.xml"), false);
       cache.getConfiguration().setTransactionManagerLookupClass("org.jboss=
.cache.transaction.DummyTransactionManagerLookup");
       Object listener =3D new TestCacheListener();
       cache.getConfiguration().getCacheLoaderConfig().getFirstCacheLoaderC=
onfig().setClassName(DummyInMemoryCacheLoader.class.getName());

Modified: core/trunk/src/test/java/org/jboss/cache/passivation/ConcurrentPa=
ssivationTest.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/test/java/org/jboss/cache/passivation/ConcurrentPassivat=
ionTest.java	2008-01-25 11:50:20 UTC (rev 5237)
+++ core/trunk/src/test/java/org/jboss/cache/passivation/ConcurrentPassivat=
ionTest.java	2008-01-25 12:47:36 UTC (rev 5238)
@@ -47,7 +47,7 @@
    private void initCaches()
    {
       CacheFactory<Integer, String> instance =3D new DefaultCacheFactory();
-      cache =3D (CacheSPI) instance.createCache(new XmlConfigurationParser=
().parseFile("META-INF/local-passivation-service.xml"), false);
+      cache =3D (CacheSPI) instance.createCache(new XmlConfigurationParser=
().parseFile("META-INF/jdbCacheLoader-passivation-service.xml"), false);
       cache.getConfiguration().setTransactionManagerLookupClass("org.jboss=
.cache.transaction.DummyTransactionManagerLookup");
       cache.getConfiguration().getCacheLoaderConfig().getFirstCacheLoaderC=
onfig().setClassName(DummyInMemoryCacheLoader.class.getName());
       cache.start();

Modified: core/trunk/src/test/java/org/jboss/cache/passivation/LocalPassiva=
tionIntegrationTest.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/test/java/org/jboss/cache/passivation/LocalPassivationIn=
tegrationTest.java	2008-01-25 11:50:20 UTC (rev 5237)
+++ core/trunk/src/test/java/org/jboss/cache/passivation/LocalPassivationIn=
tegrationTest.java	2008-01-25 12:47:36 UTC (rev 5238)
@@ -44,7 +44,7 @@
    public void setUp() throws Exception
    {
       CacheFactory<String, String> instance =3D new DefaultCacheFactory();
-      cache =3D (CacheSPI<String, String>) instance.createCache(new XmlCon=
figurationParser().parseFile("META-INF/local-passivation-service.xml"), fal=
se);
+      cache =3D (CacheSPI<String, String>) instance.createCache(new XmlCon=
figurationParser().parseFile("META-INF/jdbCacheLoader-passivation-service.x=
ml"), false);
       cache.getConfiguration().setTransactionManagerLookupClass(DummyTrans=
actionManagerLookup.class.getName());
       cache.getConfiguration().getCacheLoaderConfig().getFirstCacheLoaderC=
onfig().setClassName(DummyInMemoryCacheLoader.class.getName());
       cache.getConfiguration().setUseRegionBasedMarshalling(true);

Modified: core/trunk/src/test/java/org/jboss/cache/passivation/ReplicatedPa=
ssivationIntegrationTest.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/test/java/org/jboss/cache/passivation/ReplicatedPassivat=
ionIntegrationTest.java	2008-01-25 11:50:20 UTC (rev 5237)
+++ core/trunk/src/test/java/org/jboss/cache/passivation/ReplicatedPassivat=
ionIntegrationTest.java	2008-01-25 12:47:36 UTC (rev 5238)
@@ -29,8 +29,12 @@
 import org.jboss.cache.DefaultCacheFactory;
 import org.jboss.cache.Fqn;
 import org.jboss.cache.Node;
+import org.jboss.cache.xml.XmlHelper;
 import org.jboss.cache.config.Configuration;
+import org.jboss.cache.config.EvictionConfig;
+import org.jboss.cache.config.CacheLoaderConfig;
 import org.jboss.cache.factories.XmlConfigurationParser;
+import org.jboss.cache.factories.UnitTestCacheConfigurationFactory;
 import org.jboss.cache.loader.DummyInMemoryCacheLoader;
 import org.jboss.cache.misc.TestingUtil;
 import org.jboss.cache.notifications.annotation.CacheListener;
@@ -43,6 +47,7 @@
 import org.testng.annotations.AfterMethod;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
+import org.w3c.dom.Element;
 =

 /**
  * @author Ben Wang, Feb 11, 2004
@@ -86,12 +91,58 @@
 =

    Configuration getCfg() throws Exception
    {
-      Configuration cfg =3D new XmlConfigurationParser().parseFile("META-I=
NF/replSync-passivation-service.xml");// read in generic local xml
+      Configuration cfg =3D UnitTestCacheConfigurationFactory.createConfig=
uration(Configuration.CacheMode.REPL_SYNC);
+      cfg.setEvictionConfig(buildEvictionConfig());
+      cfg.setCacheLoaderConfig(buildCacheLoaderConfig());
       cfg.setTransactionManagerLookupClass("org.jboss.cache.transaction.Du=
mmyTransactionManagerLookup");
       cfg.getCacheLoaderConfig().getFirstCacheLoaderConfig().setClassName(=
DummyInMemoryCacheLoader.class.getName());
       return cfg;
    }
 =

+   private CacheLoaderConfig buildCacheLoaderConfig() throws Exception
+   {
+      String xml =3D " <attribute name=3D\"CacheLoaderConfiguration\">\n" +
+            "         <config>\n" +
+            "            <passivation>true</passivation>\n" +
+            "            <preload>/</preload>\n" +
+            "            <shared>false</shared>\n" +
+            "            <cacheloader>\n" +
+            "               <class>org.jboss.cache.loader.FileCacheLoader<=
/class>\n" +
+            "               <properties>\n" +
+            "               </properties>\n" +
+            "               <async>false</async>\n" +
+            "               <fetchPersistentState>true</fetchPersistentSta=
te>\n" +
+            "               <ignoreModifications>false</ignoreModification=
s>\n" +
+            "            </cacheloader>\n" +
+            "         </config>\n" +
+            "      </attribute>";
+      Element element =3D XmlHelper.stringToElement(xml);
+      return XmlConfigurationParser.parseCacheLoaderConfig(element);
+
+   }
+
+   private EvictionConfig buildEvictionConfig() throws Exception
+   {
+      String xml =3D "      <attribute name=3D\"EvictionPolicyConfig\">\n"=
 +
+            "         <config>\n" +
+            "            <attribute name=3D\"wakeUpIntervalSeconds\">5</at=
tribute>\n" +
+            "            <attribute name=3D\"eventQueueSize\">200000</attr=
ibute>\n" +
+            "            <attribute name=3D\"policyClass\">org.jboss.cache=
.eviction.LRUPolicy</attribute>\n" +
+            "            <region name=3D\"/_default_\">\n" +
+            "               <attribute name=3D\"maxNodes\">5000</attribute=
>\n" +
+            "               <attribute name=3D\"timeToLiveSeconds\">3</att=
ribute>\n" +
+            "            </region>\n" +
+            "            <region name=3D\"/org/jboss/test/data\">\n" +
+            "               <attribute name=3D\"maxNodes\">100</attribute>=
\n" +
+            "               <attribute name=3D\"timeToLiveSeconds\">3</att=
ribute>\n" +
+            "            </region>\n" +
+            "         </config>\n" +
+            "      </attribute>";
+      Element element =3D XmlHelper.stringToElement(xml);
+      return XmlConfigurationParser.parseEvictionConfig(element);
+
+   }
+
    @AfterMethod(alwaysRun =3D true)
    public void tearDown() throws Exception
    {

Modified: core/trunk/src/test/java/org/jboss/cache/transaction/ConcurrentBa=
nkTest.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/test/java/org/jboss/cache/transaction/ConcurrentBankTest=
.java	2008-01-25 11:50:20 UTC (rev 5237)
+++ core/trunk/src/test/java/org/jboss/cache/transaction/ConcurrentBankTest=
.java	2008-01-25 12:47:36 UTC (rev 5238)
@@ -7,6 +7,8 @@
 import org.jboss.cache.CacheSPI;
 import org.jboss.cache.DefaultCacheFactory;
 import org.jboss.cache.Fqn;
+import org.jboss.cache.config.Configuration;
+import org.jboss.cache.factories.UnitTestCacheConfigurationFactory;
 import org.jboss.cache.lock.IsolationLevel;
 import org.jboss.cache.lock.TimeoutException;
 import org.jboss.cache.misc.TestingUtil;
@@ -30,7 +32,7 @@
  * @author Ben Wang
  * @version $Revision$
  */
-(a)Test(groups =3D {"functional", "transaction"}, enabled =3D false)
+(a)Test(groups =3D {"functional", "transaction"}, enabled =3D true)
 public class ConcurrentBankTest
 {
    private CacheSPI<Object, Integer> cache;
@@ -50,14 +52,11 @@
    @BeforeMethod(alwaysRun =3D true)
    public void setUp() throws Exception
    {
+      Configuration conf =3D UnitTestCacheConfigurationFactory.createConfi=
guration(Configuration.CacheMode.LOCAL, true);
       CacheFactory<Object, Integer> instance =3D new DefaultCacheFactory();
-      cache =3D (CacheSPI<Object, Integer>) instance.createCache("META-INF=
/local-lru-eviction-service.xml", false);
-
-      // XML file above only sets REPEATABLE-READ
+      cache =3D (CacheSPI<Object, Integer>) instance.createCache(conf, fal=
se);
       cache.getConfiguration().setIsolationLevel(IsolationLevel.SERIALIZAB=
LE);
-
       cache.getConfiguration().setTransactionManagerLookupClass(Transactio=
nSetup.getManagerLookup());
-
       cache.create();
       cache.start();
    }

Modified: core/trunk/src/test/java/org/jboss/cache/transaction/ConcurrentTr=
ansactionalTest.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/test/java/org/jboss/cache/transaction/ConcurrentTransact=
ionalTest.java	2008-01-25 11:50:20 UTC (rev 5237)
+++ core/trunk/src/test/java/org/jboss/cache/transaction/ConcurrentTransact=
ionalTest.java	2008-01-25 12:47:36 UTC (rev 5238)
@@ -15,6 +15,7 @@
 import org.jboss.cache.Fqn;
 import org.jboss.cache.config.Configuration;
 import org.jboss.cache.factories.XmlConfigurationParser;
+import org.jboss.cache.factories.UnitTestCacheConfigurationFactory;
 import org.jboss.cache.lock.IsolationLevel;
 import static org.testng.AssertJUnit.assertEquals;
 import static org.testng.AssertJUnit.fail;
@@ -50,12 +51,11 @@
    private void createCache(IsolationLevel level)
    {
       CacheFactory<Integer, String> factory =3D new DefaultCacheFactory();
-      cache =3D (CacheSPI<Integer, String>) factory.createCache(new XmlCon=
figurationParser().parseFile("META-INF/local-service.xml"), false);
-
-      cache.getConfiguration().setCacheMode(Configuration.CacheMode.LOCAL);
-      cache.getConfiguration().setIsolationLevel(level);
-      cache.getConfiguration().setTransactionManagerLookupClass(Transactio=
nSetup.getManagerLookup());
-      cache.start();
+      Configuration conf =3D UnitTestCacheConfigurationFactory.createConfi=
guration(Configuration.CacheMode.LOCAL, true);
+      conf.setCacheMode(Configuration.CacheMode.LOCAL);
+      conf.setIsolationLevel(level);
+      conf.setTransactionManagerLookupClass(TransactionSetup.getManagerLoo=
kup());
+      cache =3D (CacheSPI) new DefaultCacheFactory().createCache(conf);
       cache.put("/a/b/c", null);
    }
 =


Added: core/trunk/src/test/resources/META-INF/conf-test/local-lru-eviction-=
service.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/test/resources/META-INF/conf-test/local-lru-eviction-ser=
vice.xml	                        (rev 0)
+++ core/trunk/src/test/resources/META-INF/conf-test/local-lru-eviction-ser=
vice.xml	2008-01-25 12:47:36 UTC (rev 5238)
@@ -0,0 +1,114 @@
+<?xml version=3D"1.0" encoding=3D"UTF-8"?>
+
+<!-- =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D -->
+<!--                                                                      =
 -->
+<!--  Sample JBoss Cache Service Configuration                            =
   -->
+<!--                                                                      =
 -->
+<!-- =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D -->
+
+<server>
+
+   <!-- =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D -->
+   <!-- Defines JBoss Cache configuration                                 =
     -->
+   <!-- =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D -->
+
+   <mbean code=3D"org.jboss.cache.jmx.CacheJmxWrapper"
+          name=3D"jboss.cache:service=3DCache">
+
+      <depends>jboss:service=3DNaming</depends>
+      <depends>jboss:service=3DTransactionManager</depends>
+
+      <!--
+          Configure the TransactionManager
+      -->
+      <attribute name=3D"TransactionManagerLookupClass">org.jboss.cache.tr=
ansaction.GenericTransactionManagerLookup
+      </attribute>
+
+
+      <!--
+          Node locking level : SERIALIZABLE
+                               REPEATABLE_READ (default)
+                               READ_COMMITTED
+                               READ_UNCOMMITTED
+                               NONE
+      -->
+      <attribute name=3D"IsolationLevel">REPEATABLE_READ</attribute>
+
+      <!--
+           Valid modes are LOCAL
+                           REPL_ASYNC
+                           REPL_SYNC
+                           INVALIDATION_ASYNC
+                           INVALIDATION_SYNC
+      -->
+      <attribute name=3D"CacheMode">LOCAL</attribute>
+
+      <!-- Name of cluster. Needs to be the same for all TreeCache nodes i=
n a
+           cluster in order to find each other.
+      -->
+      <attribute name=3D"ClusterName">JBossCache-Cluster</attribute>
+
+      <!--Uncomment next three statements to enable JGroups multiplexer.
+         This configuration is dependent on the JGroups multiplexer being
+         registered in an MBean server such as JBossAS.  -->
+      <!--
+      <depends>jgroups.mux:name=3DMultiplexer</depends>
+      <attribute name=3D"MultiplexerService">jgroups.mux:name=3DMultiplexe=
r</attribute>
+      <attribute name=3D"MultiplexerStack">fc-fast-minimalthreads</attribu=
te>
+      -->
+
+      <!-- JGroups protocol stack properties NOT NEEDED since CacheMode is=
 LOCAL -->
+
+
+      <!--
+          The max amount of time (in milliseconds) we wait until the
+          state (ie. the contents of the cache) are retrieved from
+          existing members in a clustered environment
+      -->
+      <attribute name=3D"StateRetrievalTimeout">20000</attribute>
+
+      <!--
+          Number of milliseconds to wait until all responses for a
+          synchronous call have been received.
+      -->
+      <attribute name=3D"SyncReplTimeout">20000</attribute>
+
+      <!-- Max number of milliseconds to wait for a lock acquisition -->
+      <attribute name=3D"LockAcquisitionTimeout">15000</attribute>
+
+      <!-- Specific eviction policy configurations. This is LRU -->
+      <attribute name=3D"EvictionPolicyConfig">
+         <config>
+            <attribute name=3D"wakeUpIntervalSeconds">5</attribute>
+            <!-- This defaults to 200000 if not specified -->
+            <attribute name=3D"eventQueueSize">200000</attribute>
+            <attribute name=3D"policyClass">org.jboss.cache.eviction.LRUPo=
licy</attribute>
+
+            <!-- Cache wide default -->
+            <region name=3D"/_default_">
+               <attribute name=3D"maxNodes">5000</attribute>
+               <attribute name=3D"timeToLiveSeconds">1000</attribute>
+            </region>
+            <region name=3D"/org/jboss/data">
+               <attribute name=3D"maxNodes">5000</attribute>
+               <attribute name=3D"timeToLiveSeconds">1000</attribute>
+            </region>
+            <region name=3D"/org/jboss/test/data">
+               <attribute name=3D"maxNodes">5</attribute>
+               <attribute name=3D"timeToLiveSeconds">4</attribute>
+            </region>
+            <region name=3D"/test">
+               <attribute name=3D"maxNodes">10000</attribute>
+               <attribute name=3D"timeToLiveSeconds">4</attribute>
+            </region>
+            <region name=3D"/maxAgeTest">
+               <attribute name=3D"maxNodes">10000</attribute>
+               <attribute name=3D"timeToLiveSeconds">8</attribute>
+               <attribute name=3D"maxAgeSeconds">10</attribute>
+            </region>
+         </config>
+      </attribute>
+   </mbean>
+
+
+</server>

Added: core/trunk/src/test/resources/META-INF/conf-test/local-null-eviction=
-service.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/test/resources/META-INF/conf-test/local-null-eviction-se=
rvice.xml	                        (rev 0)
+++ core/trunk/src/test/resources/META-INF/conf-test/local-null-eviction-se=
rvice.xml	2008-01-25 12:47:36 UTC (rev 5238)
@@ -0,0 +1,105 @@
+<?xml version=3D"1.0" encoding=3D"UTF-8"?>
+
+<!-- =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D -->
+<!--                                                                      =
 -->
+<!--  Sample JBoss Cache Service Configuration                            =
   -->
+<!--                                                                      =
 -->
+<!-- =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D -->
+
+<server>
+
+   <!-- =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D -->
+   <!-- Defines JBoss Cache configuration                                 =
     -->
+   <!-- =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D -->
+
+   <mbean code=3D"org.jboss.cache.jmx.CacheJmxWrapper"
+          name=3D"jboss.cache:service=3DCache">
+
+      <depends>jboss:service=3DNaming</depends>
+      <depends>jboss:service=3DTransactionManager</depends>
+
+      <!--
+          Configure the TransactionManager
+      -->
+      <attribute name=3D"TransactionManagerLookupClass">org.jboss.cache.tr=
ansaction.GenericTransactionManagerLookup
+      </attribute>
+
+
+      <!--
+          Node locking level : SERIALIZABLE
+                               REPEATABLE_READ (default)
+                               READ_COMMITTED
+                               READ_UNCOMMITTED
+                               NONE
+      -->
+      <attribute name=3D"IsolationLevel">REPEATABLE_READ</attribute>
+
+      <!--
+           Valid modes are LOCAL
+                           REPL_ASYNC
+                           REPL_SYNC
+                           INVALIDATION_ASYNC
+                           INVALIDATION_SYNC
+      -->
+      <attribute name=3D"CacheMode">LOCAL</attribute>
+
+      <!-- Name of cluster. Needs to be the same for all TreeCache nodes i=
n a
+           cluster in order to find each other.
+      -->
+      <attribute name=3D"ClusterName">JBossCache-Cluster</attribute>
+
+      <!--Uncomment next three statements to enable JGroups multiplexer.
+         This configuration is dependent on the JGroups multiplexer being
+         registered in an MBean server such as JBossAS.  -->
+      <!--
+      <depends>jgroups.mux:name=3DMultiplexer</depends>
+      <attribute name=3D"MultiplexerService">jgroups.mux:name=3DMultiplexe=
r</attribute>
+      <attribute name=3D"MultiplexerStack">fc-fast-minimalthreads</attribu=
te>
+      -->
+
+      <!-- JGroups protocol stack properties NOT NEEDED since CacheMode is=
 LOCAL -->
+
+
+      <!--
+          The max amount of time (in milliseconds) we wait until the
+          state (ie. the contents of the cache) are retrieved from
+          existing members in a clustered environment
+      -->
+      <attribute name=3D"StateRetrievalTimeout">20000</attribute>
+
+      <!--
+          Number of milliseconds to wait until all responses for a
+          synchronous call have been received.
+      -->
+      <attribute name=3D"SyncReplTimeout">20000</attribute>
+
+      <!-- Max number of milliseconds to wait for a lock acquisition -->
+      <attribute name=3D"LockAcquisitionTimeout">15000</attribute>
+
+      <!-- Specific eviction policy configurations. This is LRU -->
+      <attribute name=3D"EvictionPolicyConfig">
+         <config>
+            <attribute name=3D"wakeUpIntervalSeconds">1</attribute>
+            <!-- This defaults to 200000 if not specified -->
+            <attribute name=3D"eventQueueSize">200000</attribute>
+            <attribute name=3D"policyClass">org.jboss.cache.eviction.NullE=
victionPolicy</attribute>
+
+            <!-- Cache wide default -->
+            <region name=3D"/_default_">
+               <attribute name=3D"maxNodes">5000</attribute>
+               <attribute name=3D"timeToLiveSeconds">1</attribute>
+            </region>
+            <region name=3D"/test" policyClass=3D"org.jboss.cache.eviction=
.NullEvictionPolicy">
+               <attribute name=3D"maxNodes">10000</attribute>
+               <attribute name=3D"timeToLiveSeconds">1</attribute>
+            </region>
+            <region name=3D"/lru" policyClass=3D"org.jboss.cache.eviction.=
LRUPolicy">
+               <attribute name=3D"maxNodes">10000</attribute>
+               <attribute name=3D"timeToLiveSeconds">1</attribute>
+            </region>
+         </config>
+      </attribute>
+   </mbean>
+
+
+</server>

Added: core/trunk/src/test/resources/META-INF/conf-test/mixedPolicy-evictio=
n-service.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/test/resources/META-INF/conf-test/mixedPolicy-eviction-s=
ervice.xml	                        (rev 0)
+++ core/trunk/src/test/resources/META-INF/conf-test/mixedPolicy-eviction-s=
ervice.xml	2008-01-25 12:47:36 UTC (rev 5238)
@@ -0,0 +1,168 @@
+<?xml version=3D"1.0" encoding=3D"UTF-8"?>
+
+<!-- =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D -->
+<!--                                                                      =
 -->
+<!--  Sample TreeCache Service Configuration                              =
 -->
+<!--                                                                      =
 -->
+<!-- =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D -->
+
+<server>
+
+   <!-- =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D -->
+   <!-- Defines TreeCache configuration                                   =
   -->
+   <!-- =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D -->
+
+   <mbean code=3D"org.jboss.cache.jmx.CacheJmxWrapper"
+          name=3D"jboss.cache:service=3DTreeCache">
+
+      <depends>jboss:service=3DNaming</depends>
+      <depends>jboss:service=3DTransactionManager</depends>
+
+      <!--
+          Configure the TransactionManager
+      -->
+      <attribute name=3D"TransactionManagerLookupClass">org.jboss.cache.tr=
ansaction.GenericTransactionManagerLookup
+      </attribute>
+
+
+      <!--
+          Node locking level : SERIALIZABLE
+                               REPEATABLE_READ (default)
+                               READ_COMMITTED
+                               READ_UNCOMMITTED
+                               NONE
+      -->
+      <attribute name=3D"IsolationLevel">REPEATABLE_READ</attribute>
+
+      <!--
+           Valid modes are LOCAL
+                           REPL_ASYNC
+                           REPL_SYNC
+      -->
+      <attribute name=3D"CacheMode">LOCAL</attribute>
+
+      <!-- Name of cluster. Needs to be the same for all TreeCache nodes i=
n a
+           cluster in order to find each other.
+      -->
+      <attribute name=3D"ClusterName">JBossCache-Cluster</attribute>
+
+      <!--Uncomment next three statements to enable JGroups multiplexer.
+This configuration is dependent on the JGroups multiplexer being
+registered in an MBean server such as JBossAS.  -->
+      <!--
+      <depends>jgroups.mux:name=3DMultiplexer</depends>
+      <attribute name=3D"MultiplexerService">jgroups.mux:name=3DMultiplexe=
r</attribute>
+      <attribute name=3D"MultiplexerStack">fc-fast-minimalthreads</attribu=
te>
+      -->
+
+      <!-- JGroups protocol stack properties.
+         ClusterConfig isn't used if the multiplexer is enabled and succes=
sfully initialized.
+      -->
+      <attribute name=3D"ClusterConfig">
+         <config>
+            <UDP mcast_addr=3D"228.10.10.10"
+                 mcast_port=3D"45588"
+                 tos=3D"8"
+                 ucast_recv_buf_size=3D"20000000"
+                 ucast_send_buf_size=3D"640000"
+                 mcast_recv_buf_size=3D"25000000"
+                 mcast_send_buf_size=3D"640000"
+                 loopback=3D"false"
+                 discard_incompatible_packets=3D"true"
+                 max_bundle_size=3D"64000"
+                 max_bundle_timeout=3D"30"
+                 use_incoming_packet_handler=3D"true"
+                 ip_ttl=3D"2"
+                 enable_bundling=3D"false"
+                 enable_diagnostics=3D"true"
+
+                 use_concurrent_stack=3D"true"
+
+                 thread_naming_pattern=3D"pl"
+
+                 thread_pool.enabled=3D"true"
+                 thread_pool.min_threads=3D"1"
+                 thread_pool.max_threads=3D"25"
+                 thread_pool.keep_alive_time=3D"30000"
+                 thread_pool.queue_enabled=3D"true"
+                 thread_pool.queue_max_size=3D"10"
+                 thread_pool.rejection_policy=3D"Run"
+
+                 oob_thread_pool.enabled=3D"true"
+                 oob_thread_pool.min_threads=3D"1"
+                 oob_thread_pool.max_threads=3D"4"
+                 oob_thread_pool.keep_alive_time=3D"10000"
+                 oob_thread_pool.queue_enabled=3D"true"
+                 oob_thread_pool.queue_max_size=3D"10"
+                 oob_thread_pool.rejection_policy=3D"Run"/>
+
+            <PING timeout=3D"2000" num_initial_members=3D"3"/>
+            <MERGE2 max_interval=3D"30000" min_interval=3D"10000"/>
+            <FD_SOCK/>
+            <FD timeout=3D"10000" max_tries=3D"5" shun=3D"true"/>
+            <VERIFY_SUSPECT timeout=3D"1500"/>
+            <pbcast.NAKACK
+                    use_mcast_xmit=3D"false" gc_lag=3D"0"
+                    retransmit_timeout=3D"300,600,1200,2400,4800"
+                    discard_delivered_msgs=3D"true"/>
+            <UNICAST timeout=3D"300,600,1200,2400,3600"/>
+            <pbcast.STABLE stability_delay=3D"1000" desired_avg_gossip=3D"=
50000"
+                           max_bytes=3D"400000"/>
+            <pbcast.GMS print_local_addr=3D"true" join_timeout=3D"5000" sh=
un=3D"false"
+                        view_bundling=3D"true" view_ack_collection_timeout=
=3D"5000"/>
+            <FC max_credits=3D"20000000" min_threshold=3D"0.10"/>
+            <FRAG2 frag_size=3D"60000"/>
+            <pbcast.STREAMING_STATE_TRANSFER use_reading_thread=3D"true"/>
+            <!-- <pbcast.STATE_TRANSFER/> -->
+            <pbcast.FLUSH timeout=3D"0"/>
+         </config>
+      </attribute>
+
+
+      <!--
+          The max amount of time (in milliseconds) we wait until the
+          state (ie. the contents of the cache) are retrieved from
+          existing members in a clustered environment
+      -->
+      <attribute name=3D"StateRetrievalTimeout">20000</attribute>
+
+      <!--
+          Number of milliseconds to wait until all responses for a
+          synchronous call have been received.
+      -->
+      <attribute name=3D"SyncReplTimeout">20000</attribute>
+
+      <!-- Max number of milliseconds to wait for a lock acquisition -->
+      <attribute name=3D"LockAcquisitionTimeout">15000</attribute>
+
+
+      <!-- Specific eviction policy configurations. This is LRU -->
+      <attribute name=3D"EvictionPolicyConfig">
+         <config>
+            <attribute name=3D"wakeUpIntervalSeconds">5</attribute>
+            <!-- This defaults to 200000 if not specified -->
+            <attribute name=3D"eventQueueSize">200000</attribute>
+            <attribute name=3D"policyClass">org.jboss.cache.eviction.LRUPo=
licy</attribute>
+
+            <!-- Cache wide default -->
+            <region name=3D"/_default_">
+               <attribute name=3D"maxNodes">5000</attribute>
+               <attribute name=3D"timeToLiveSeconds">1000</attribute>
+            </region>
+            <region name=3D"/org/jboss/data" policyClass=3D"org.jboss.cach=
e.eviction.FIFOPolicy">
+               <attribute name=3D"maxNodes">5000</attribute>
+            </region>
+            <region name=3D"/test/" policyClass=3D"org.jboss.cache.evictio=
n.MRUPolicy">
+               <attribute name=3D"maxNodes">10000</attribute>
+            </region>
+            <region name=3D"/maxAgeTest/">
+               <attribute name=3D"maxNodes">10000</attribute>
+               <attribute name=3D"timeToLiveSeconds">8</attribute>
+               <attribute name=3D"maxAgeSeconds">10</attribute>
+            </region>
+         </config>
+      </attribute>
+   </mbean>
+
+
+</server>

Added: core/trunk/src/test/resources/META-INF/conf-test/mux-service.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/test/resources/META-INF/conf-test/mux-service.xml	      =
                  (rev 0)
+++ core/trunk/src/test/resources/META-INF/conf-test/mux-service.xml	2008-0=
1-25 12:47:36 UTC (rev 5238)
@@ -0,0 +1,75 @@
+<?xml version=3D"1.0" encoding=3D"UTF-8"?>
+
+<!-- =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D -->
+<!--                                                                      =
                                                                      -->
+<!--  Sample TreeCache Service Configuration using Multiplexer            =
                                -->
+<!--                                                                      =
                                                                      -->
+<!-- =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D -->
+
+<server>
+
+   <!-- =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D -->
+   <!-- Defines TreeCache configuration                                   =
   -->
+   <!-- =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D -->
+
+   <mbean code=3D"org.jboss.cache.jmx.CacheJmxWrapper"
+          name=3D"jboss.cache:service=3DtestTreeCache">
+
+      <depends>jboss:service=3DNaming</depends>
+      <depends>jboss:service=3DTransactionManager</depends>
+
+      <depends optional-attribute-name=3D"MultiplexerService"
+               proxy-type=3D"attribute">jgroups.mux:name=3DMultiplexer
+      </depends>
+      <attribute name=3D"MultiplexerStack">tcp</attribute>
+
+      <!--
+          Configure the TransactionManager
+      -->
+      <attribute name=3D"TransactionManagerLookupClass">org.jboss.cache.tr=
ansaction.GenericTransactionManagerLookup
+      </attribute>
+
+
+      <!--
+          Node locking level : SERIALIZABLE
+                               REPEATABLE_READ (default)
+                               READ_COMMITTED
+                               READ_UNCOMMITTED
+                               NONE
+      -->
+      <attribute name=3D"IsolationLevel">REPEATABLE_READ</attribute>
+
+      <!--
+           Valid modes are LOCAL
+                           REPL_ASYNC
+                           REPL_SYNC
+                           INVALIDATION_ASYNC
+                           INVALIDATION_SYNC
+      -->
+      <attribute name=3D"CacheMode">LOCAL</attribute>
+
+      <!-- Name of cluster. Needs to be the same for all nodes in a cluste=
rs, in order
+           to find each other.
+      -->
+      <attribute name=3D"ClusterName">JBossCache-Cluster</attribute>
+
+      <!--
+          The max amount of time (in milliseconds) we wait until the
+          state (ie. the contents of the cache) are retrieved from
+          existing members in a clustered environment
+      -->
+      <attribute name=3D"StateRetrievalTimeout">20000</attribute>
+
+      <!--
+          Number of milliseconds to wait until all responses for a
+          synchronous call have been received.
+      -->
+      <attribute name=3D"SyncReplTimeout">15000</attribute>
+
+      <!-- Max number of milliseconds to wait for a lock acquisition -->
+      <attribute name=3D"LockAcquisitionTimeout">10000</attribute>
+
+   </mbean>
+
+
+</server>

Added: core/trunk/src/test/resources/META-INF/conf-test/policyPerRegion-evi=
ction-service.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/test/resources/META-INF/conf-test/policyPerRegion-evicti=
on-service.xml	                        (rev 0)
+++ core/trunk/src/test/resources/META-INF/conf-test/policyPerRegion-evicti=
on-service.xml	2008-01-25 12:47:36 UTC (rev 5238)
@@ -0,0 +1,170 @@
+<?xml version=3D"1.0" encoding=3D"UTF-8"?>
+
+<!-- =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D -->
+<!--                                                                      =
 -->
+<!--  Sample TreeCache Service Configuration                              =
 -->
+<!--                                                                      =
 -->
+<!-- =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D -->
+
+<server>
+
+   <!-- =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D -->
+   <!-- Defines TreeCache configuration                                   =
   -->
+   <!-- =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D -->
+
+   <mbean code=3D"org.jboss.cache.jmx.CacheJmxWrapper"
+          name=3D"jboss.cache:service=3DTreeCache">
+
+      <depends>jboss:service=3DNaming</depends>
+      <depends>jboss:service=3DTransactionManager</depends>
+
+      <!--
+          Configure the TransactionManager
+      -->
+      <attribute name=3D"TransactionManagerLookupClass">org.jboss.cache.tr=
ansaction.GenericTransactionManagerLookup
+      </attribute>
+
+
+      <!--
+          Node locking level : SERIALIZABLE
+                               REPEATABLE_READ (default)
+                               READ_COMMITTED
+                               READ_UNCOMMITTED
+                               NONE
+      -->
+      <attribute name=3D"IsolationLevel">REPEATABLE_READ</attribute>
+
+      <!--
+           Valid modes are LOCAL
+                           REPL_ASYNC
+                           REPL_SYNC
+      -->
+      <attribute name=3D"CacheMode">LOCAL</attribute>
+
+      <!-- Name of cluster. Needs to be the same for all TreeCache nodes i=
n a
+           cluster in order to find each other.
+      -->
+      <attribute name=3D"ClusterName">JBossCache-Cluster</attribute>
+
+      <!--Uncomment next three statements to enable JGroups multiplexer.
+This configuration is dependent on the JGroups multiplexer being
+registered in an MBean server such as JBossAS.  -->
+      <!--
+      <depends>jgroups.mux:name=3DMultiplexer</depends>
+      <attribute name=3D"MultiplexerService">jgroups.mux:name=3DMultiplexe=
r</attribute>
+      <attribute name=3D"MultiplexerStack">fc-fast-minimalthreads</attribu=
te>
+      -->
+
+      <!-- JGroups protocol stack properties.
+         ClusterConfig isn't used if the multiplexer is enabled and succes=
sfully initialized.
+      -->
+      <attribute name=3D"ClusterConfig">
+         <config>
+            <UDP mcast_addr=3D"228.10.10.10"
+                 mcast_port=3D"45588"
+                 tos=3D"8"
+                 ucast_recv_buf_size=3D"20000000"
+                 ucast_send_buf_size=3D"640000"
+                 mcast_recv_buf_size=3D"25000000"
+                 mcast_send_buf_size=3D"640000"
+                 loopback=3D"false"
+                 discard_incompatible_packets=3D"true"
+                 max_bundle_size=3D"64000"
+                 max_bundle_timeout=3D"30"
+                 use_incoming_packet_handler=3D"true"
+                 ip_ttl=3D"2"
+                 enable_bundling=3D"false"
+                 enable_diagnostics=3D"true"
+
+                 use_concurrent_stack=3D"true"
+
+                 thread_naming_pattern=3D"pl"
+
+                 thread_pool.enabled=3D"true"
+                 thread_pool.min_threads=3D"1"
+                 thread_pool.max_threads=3D"25"
+                 thread_pool.keep_alive_time=3D"30000"
+                 thread_pool.queue_enabled=3D"true"
+                 thread_pool.queue_max_size=3D"10"
+                 thread_pool.rejection_policy=3D"Run"
+
+                 oob_thread_pool.enabled=3D"true"
+                 oob_thread_pool.min_threads=3D"1"
+                 oob_thread_pool.max_threads=3D"4"
+                 oob_thread_pool.keep_alive_time=3D"10000"
+                 oob_thread_pool.queue_enabled=3D"true"
+                 oob_thread_pool.queue_max_size=3D"10"
+                 oob_thread_pool.rejection_policy=3D"Run"/>
+
+            <PING timeout=3D"2000" num_initial_members=3D"3"/>
+            <MERGE2 max_interval=3D"30000" min_interval=3D"10000"/>
+            <FD_SOCK/>
+            <FD timeout=3D"10000" max_tries=3D"5" shun=3D"true"/>
+            <VERIFY_SUSPECT timeout=3D"1500"/>
+            <pbcast.NAKACK use_mcast_xmit=3D"false" gc_lag=3D"0"
+                           retransmit_timeout=3D"300,600,1200,2400,4800"
+                           discard_delivered_msgs=3D"true"/>
+            <UNICAST timeout=3D"300,600,1200,2400,3600"/>
+            <pbcast.STABLE stability_delay=3D"1000" desired_avg_gossip=3D"=
50000"
+                           max_bytes=3D"400000"/>
+            <pbcast.GMS print_local_addr=3D"true" join_timeout=3D"5000" sh=
un=3D"false"
+                        view_bundling=3D"true" view_ack_collection_timeout=
=3D"5000"/>
+            <FC max_credits=3D"20000000" min_threshold=3D"0.10"/>
+            <FRAG2 frag_size=3D"60000"/>
+            <pbcast.STREAMING_STATE_TRANSFER use_reading_thread=3D"true"/>
+            <!-- <pbcast.STATE_TRANSFER/> -->
+            <pbcast.FLUSH timeout=3D"0"/>
+         </config>
+      </attribute>
+
+
+      <!--
+          The max amount of time (in milliseconds) we wait until the
+          state (ie. the contents of the cache) are retrieved from
+          existing members in a clustered environment
+      -->
+      <attribute name=3D"StateRetrievalTimeout">20000</attribute>
+
+      <!--
+          Number of milliseconds to wait until all responses for a
+          synchronous call have been received.
+      -->
+      <attribute name=3D"SyncReplTimeout">20000</attribute>
+
+      <!-- Max number of milliseconds to wait for a lock acquisition -->
+      <attribute name=3D"LockAcquisitionTimeout">15000</attribute>
+
+
+      <!-- Specific eviction policy configurations. This is LRU -->
+      <attribute name=3D"EvictionPolicyConfig">
+         <config>
+            <attribute name=3D"wakeUpIntervalSeconds">5</attribute>
+            <!-- This defaults to 200000 if not specified -->
+            <attribute name=3D"eventQueueSize">200000</attribute>
+
+            <!-- Cache wide default -->
+            <region name=3D"/_default_" policyClass=3D"org.jboss.cache.evi=
ction.LRUPolicy">
+               <attribute name=3D"maxNodes">5000</attribute>
+               <attribute name=3D"timeToLiveSeconds">1000</attribute>
+            </region>
+            <region name=3D"/org/jboss/data" policyClass=3D"org.jboss.cach=
e.eviction.LFUPolicy">
+               <attribute name=3D"maxNodes">5000</attribute>
+               <attribute name=3D"minNodes">1000</attribute>
+            </region>
+            <region name=3D"/org/jboss/test/data" policyClass=3D"org.jboss=
.cache.eviction.FIFOPolicy">
+               <attribute name=3D"maxNodes">5</attribute>
+            </region>
+            <region name=3D"/test/" policyClass=3D"org.jboss.cache.evictio=
n.MRUPolicy">
+               <attribute name=3D"maxNodes">10000</attribute>
+            </region>
+            <region name=3D"/maxAgeTest/" policyClass=3D"org.jboss.cache.e=
viction.LRUPolicy">
+               <attribute name=3D"maxNodes">10000</attribute>
+               <attribute name=3D"timeToLiveSeconds">8</attribute>
+               <attribute name=3D"maxAgeSeconds">10</attribute>
+            </region>
+         </config>
+      </attribute>
+   </mbean>
+
+
+</server>

Added: core/trunk/src/test/resources/META-INF/conf-test/replSync-service.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/test/resources/META-INF/conf-test/replSync-service.xml	 =
                       (rev 0)
+++ core/trunk/src/test/resources/META-INF/conf-test/replSync-service.xml	2=
008-01-25 12:47:36 UTC (rev 5238)
@@ -0,0 +1,173 @@
+<?xml version=3D"1.0" encoding=3D"UTF-8"?>
+
+<!-- =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D -->
+<!--                                                                      =
 -->
+<!--  Sample TreeCache Service Configuration                              =
 -->
+<!--                                                                      =
 -->
+<!-- =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D -->
+
+<server>
+
+   <!-- =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D -->
+   <!-- Defines TreeCache configuration                                   =
   -->
+   <!-- =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D -->
+
+   <mbean code=3D"org.jboss.cache.jmx.CacheJmxWrapper"
+          name=3D"jboss.cache:service=3DTreeCache">
+
+      <depends>jboss:service=3DNaming</depends>
+      <depends>jboss:service=3DTransactionManager</depends>
+
+      <!--
+          Configure the TransactionManager
+      -->
+      <attribute name=3D"TransactionManagerLookupClass">org.jboss.cache.tr=
ansaction.GenericTransactionManagerLookup
+      </attribute>
+
+      <!--
+          Isolation level : SERIALIZABLE
+                            REPEATABLE_READ (default)
+                            READ_COMMITTED
+                            READ_UNCOMMITTED
+                            NONE
+      -->
+      <attribute name=3D"IsolationLevel">REPEATABLE_READ</attribute>
+
+      <!--
+           Valid modes are LOCAL
+                           REPL_ASYNC
+                           REPL_SYNC
+                           INVALIDATION_ASYNC
+                           INVALIDATION_SYNC
+      -->
+      <attribute name=3D"CacheMode">REPL_SYNC</attribute>
+
+      <!--
+      Just used for async repl: use a replication queue
+      -->
+      <attribute name=3D"UseReplQueue">false</attribute>
+
+      <!--
+          Replication interval for replication queue (in ms)
+      -->
+      <attribute name=3D"ReplQueueInterval">0</attribute>
+
+      <!--
+          Max number of elements which trigger replication
+      -->
+      <attribute name=3D"ReplQueueMaxElements">0</attribute>
+
+      <!-- Name of cluster. Needs to be the same for all TreeCache nodes i=
n a
+           cluster in order to find each other.
+      -->
+      <attribute name=3D"ClusterName">JBossCache-Cluster</attribute>
+
+      <!--Uncomment next three statements to enable JGroups multiplexer.
+This configuration is dependent on the JGroups multiplexer being
+registered in an MBean server such as JBossAS.  -->
+      <!--
+      <depends>jgroups.mux:name=3DMultiplexer</depends>
+      <attribute name=3D"MultiplexerService">jgroups.mux:name=3DMultiplexe=
r</attribute>
+      <attribute name=3D"MultiplexerStack">fc-fast-minimalthreads</attribu=
te>
+      -->
+
+      <!-- JGroups protocol stack properties.
+         ClusterConfig isn't used if the multiplexer is enabled and succes=
sfully initialized.
+      -->
+      <attribute name=3D"ClusterConfig">
+         <config>
+            <UDP mcast_addr=3D"228.10.10.10"
+                 mcast_port=3D"45588"
+                 tos=3D"8"
+                 ucast_recv_buf_size=3D"20000000"
+                 ucast_send_buf_size=3D"640000"
+                 mcast_recv_buf_size=3D"25000000"
+                 mcast_send_buf_size=3D"640000"
+                 loopback=3D"false"
+                 discard_incompatible_packets=3D"true"
+                 max_bundle_size=3D"64000"
+                 max_bundle_timeout=3D"30"
+                 use_incoming_packet_handler=3D"true"
+                 ip_ttl=3D"2"
+                 enable_bundling=3D"false"
+                 enable_diagnostics=3D"true"
+
+                 use_concurrent_stack=3D"true"
+
+                 thread_naming_pattern=3D"pl"
+
+                 thread_pool.enabled=3D"true"
+                 thread_pool.min_threads=3D"1"
+                 thread_pool.max_threads=3D"25"
+                 thread_pool.keep_alive_time=3D"30000"
+                 thread_pool.queue_enabled=3D"true"
+                 thread_pool.queue_max_size=3D"10"
+                 thread_pool.rejection_policy=3D"Run"
+
+                 oob_thread_pool.enabled=3D"true"
+                 oob_thread_pool.min_threads=3D"1"
+                 oob_thread_pool.max_threads=3D"4"
+                 oob_thread_pool.keep_alive_time=3D"10000"
+                 oob_thread_pool.queue_enabled=3D"true"
+                 oob_thread_pool.queue_max_size=3D"10"
+                 oob_thread_pool.rejection_policy=3D"Run"/>
+
+            <PING timeout=3D"2000" num_initial_members=3D"3"/>
+            <MERGE2 max_interval=3D"30000" min_interval=3D"10000"/>
+            <FD_SOCK/>
+            <FD timeout=3D"10000" max_tries=3D"5" shun=3D"true"/>
+            <VERIFY_SUSPECT timeout=3D"1500"/>
+            <pbcast.NAKACK use_mcast_xmit=3D"false" gc_lag=3D"0"
+                           retransmit_timeout=3D"300,600,1200,2400,4800"
+                           discard_delivered_msgs=3D"true"/>
+            <UNICAST timeout=3D"300,600,1200,2400,3600"/>
+            <pbcast.STABLE stability_delay=3D"1000" desired_avg_gossip=3D"=
50000"
+                           max_bytes=3D"400000"/>
+            <pbcast.GMS print_local_addr=3D"true" join_timeout=3D"5000" sh=
un=3D"false"
+                        view_bundling=3D"true" view_ack_collection_timeout=
=3D"5000"/>
+            <FRAG2 frag_size=3D"60000"/>
+            <pbcast.STREAMING_STATE_TRANSFER use_reading_thread=3D"true"/>
+            <!-- <pbcast.STATE_TRANSFER/> -->
+            <pbcast.FLUSH timeout=3D"0"/>
+         </config>
+      </attribute>
+
+
+      <!--
+       Whether or not to fetch state on joining a cluster
+       NOTE this used to be called FetchStateOnStartup and has been rename=
d to be more descriptive.
+      -->
+      <attribute name=3D"FetchInMemoryState">true</attribute>
+
+      <!--
+          The max amount of time (in milliseconds) we wait until the
+          state (ie. the contents of the cache) are retrieved from
+          existing members in a clustered environment
+      -->
+      <attribute name=3D"StateRetrievalTimeout">15000</attribute>
+
+      <!--
+          Number of milliseconds to wait until all responses for a
+          synchronous call have been received.
+      -->
+      <attribute name=3D"SyncReplTimeout">15000</attribute>
+
+      <!-- Max number of milliseconds to wait for a lock acquisition -->
+      <attribute name=3D"LockAcquisitionTimeout">10000</attribute>
+
+      <!--
+         Indicate whether to use region based marshalling or not. Set this=
 to true if you are running under a scoped
+         class loader, e.g., inside an application server. Default is "fal=
se".
+      -->
+      <attribute name=3D"UseRegionBasedMarshalling">true</attribute>
+   </mbean>
+
+
+   <!--  Uncomment to get a graphical view of the TreeCache MBean above -->
+   <!--   <mbean code=3D"org.jboss.cache.TreeCacheView" name=3D"jboss.cach=
e:service=3DTreeCacheView">-->
+   <!--      <depends>jboss.cache:service=3DTreeCache</depends>-->
+   <!--      <attribute name=3D"CacheService">jboss.cache:service=3DTreeCa=
che</attribute>-->
+   <!--   </mbean>-->
+
+
+</server>

Modified: core/trunk/src/test/resources/log4j.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/test/resources/log4j.xml	2008-01-25 11:50:20 UTC (rev 52=
37)
+++ core/trunk/src/test/resources/log4j.xml	2008-01-25 12:47:36 UTC (rev 52=
38)
@@ -23,7 +23,7 @@
    <!-- A time/date based rolling appender -->
    <appender name=3D"FILE" class=3D"org.apache.log4j.DailyRollingFileAppen=
der">
       <param name=3D"File" value=3D"output/jbosscache.log"/>
-      <param name=3D"Append" value=3D"true"/>
+      <param name=3D"Append" value=3D"false"/>
 =

       <!-- Rollover at midnight each day -->
       <param name=3D"DatePattern" value=3D"'.'yyyy-MM-dd"/>
@@ -31,7 +31,7 @@
       <!-- Rollover at the top of each hour
       <param name=3D"DatePattern" value=3D"'.'yyyy-MM-dd-HH"/>
       -->
-      <param name=3D"Threshold" value=3D"DEBUG"/>
+      <param name=3D"Threshold" value=3D"TRACE"/>
 =

       <layout class=3D"org.apache.log4j.PatternLayout">
          <!-- The default pattern: Date Priority [Category] Message\n -->
@@ -63,9 +63,21 @@
    <!-- =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D -->
 =

    <category name=3D"org.jboss.cache">
-      <priority value=3D"WARN"/>
+      <priority value=3D"ERROR"/>
    </category>
+   =

+   <!--<category name=3D"org.jboss.cache.interceptors.PessimisticLockInter=
ceptor">-->
+      <!--<priority value=3D"TRACE"/>-->
+   <!--</category>-->
 =

+   <!--<category name=3D"org.jboss.cache.interceptors.UnlockInterceptor">-=
->
+      <!--<priority value=3D"TRACE"/>-->
+   <!--</category>-->
+
+   <category name=3D"org.jboss.cache.eviction">
+      <priority value=3D"TRACE"/>
+   </category>
+
    <category name=3D"org.jboss.tm">
       <priority value=3D"WARN"/>
    </category>

Modified: core/trunk/src/test-perf/java/org/jboss/cache/ConcurrentEvictAndR=
emoveTest.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/test-perf/java/org/jboss/cache/ConcurrentEvictAndRemoveT=
est.java	2008-01-25 11:50:20 UTC (rev 5237)
+++ core/trunk/src/test-perf/java/org/jboss/cache/ConcurrentEvictAndRemoveT=
est.java	2008-01-25 12:47:36 UTC (rev 5238)
@@ -51,7 +51,7 @@
    public void setUp() throws Exception
    {
       super.setUp();
-      Configuration c =3D new XmlConfigurationParser().parseFile("META-INF=
/local-mru-eviction-service.xml");
+      Configuration c =3D new XmlConfigurationParser().parseFile("resource=
s/local-mru-eviction-service.xml");
       c.setTransactionManagerLookupClass("org.jboss.cache.transaction.Dumm=
yTransactionManagerLookup");
       cache =3D (CacheImpl) DefaultCacheFactory.getInstance().createCache(=
c);
    }

Modified: core/trunk/src/test-perf/java/org/jboss/cache/LocalMapPerfTest.ja=
va
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/test-perf/java/org/jboss/cache/LocalMapPerfTest.java	200=
8-01-25 11:50:20 UTC (rev 5237)
+++ core/trunk/src/test-perf/java/org/jboss/cache/LocalMapPerfTest.java	200=
8-01-25 12:47:36 UTC (rev 5238)
@@ -121,7 +121,7 @@
    void initCaches(Configuration.CacheMode caching_mode) throws Exception
    {
       cachingMode_ =3D caching_mode;
-      cache_ =3D (CacheImpl) DefaultCacheFactory.getInstance().createCache=
("META-INF/local-service.xml", false);
+      cache_ =3D (CacheImpl) DefaultCacheFactory.getInstance().createCache=
("resources/local-service.xml", false);
       cache_.getConfiguration().setTransactionManagerLookupClass("org.jbos=
s.cache.transaction.DummyTransactionManagerLookup");
       cache_.start();
    }

Modified: core/trunk/src/test-perf/java/org/jboss/cache/LocalPerfTest.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/test-perf/java/org/jboss/cache/LocalPerfTest.java	2008-0=
1-25 11:50:20 UTC (rev 5237)
+++ core/trunk/src/test-perf/java/org/jboss/cache/LocalPerfTest.java	2008-0=
1-25 12:47:36 UTC (rev 5238)
@@ -88,7 +88,7 @@
    void initCaches(Configuration.CacheMode caching_mode) throws Exception
    {
       cachingMode_ =3D caching_mode;
-      cache_ =3D (CacheImpl) DefaultCacheFactory.getInstance().createCache=
("META-INF/local-service.xml", false);
+      cache_ =3D (CacheImpl) DefaultCacheFactory.getInstance().createCache=
("resources/local-service.xml", false);
       cache_.getConfiguration().setTransactionManagerLookupClass("org.jbos=
s.cache.transaction.DummyTransactionManagerLookup");
       cache_.start();
    }

Added: core/trunk/src/test-perf/resources/local-mru-eviction-service.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/test-perf/resources/local-mru-eviction-service.xml	     =
                   (rev 0)
+++ core/trunk/src/test-perf/resources/local-mru-eviction-service.xml	2008-=
01-25 12:47:36 UTC (rev 5238)
@@ -0,0 +1,103 @@
+<?xml version=3D"1.0" encoding=3D"UTF-8"?>
+
+<!-- =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D -->
+<!--                                                                      =
 -->
+<!--  Sample TreeCache Service Configuration                              =
 -->
+<!--                                                                      =
 -->
+<!-- =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D -->
+
+<server>
+
+   <!-- =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D -->
+   <!-- Defines TreeCache configuration                                   =
   -->
+   <!-- =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D -->
+
+   <mbean code=3D"org.jboss.cache.jmx.CacheJmxWrapper"
+          name=3D"jboss.cache:service=3DTreeCache">
+
+      <depends>jboss:service=3DNaming</depends>
+      <depends>jboss:service=3DTransactionManager</depends>
+
+      <!--
+          Configure the TransactionManager
+      -->
+      <attribute name=3D"TransactionManagerLookupClass">org.jboss.cache.tr=
ansaction.GenericTransactionManagerLookup
+      </attribute>
+
+
+      <!--
+          Node locking level : SERIALIZABLE
+                               REPEATABLE_READ (default)
+                               READ_COMMITTED
+                               READ_UNCOMMITTED
+                               NONE
+      -->
+      <attribute name=3D"IsolationLevel">REPEATABLE_READ</attribute>
+
+      <!--
+           Valid modes are LOCAL
+                           REPL_ASYNC
+                           REPL_SYNC
+      -->
+      <attribute name=3D"CacheMode">LOCAL</attribute>
+
+      <!-- Name of cluster. Needs to be the same for all TreeCache nodes i=
n a
+           cluster in order to find each other.
+      -->
+      <attribute name=3D"ClusterName">JBossCache-Cluster</attribute>
+
+      <!--Uncomment next three statements to enable JGroups multiplexer.
+This configuration is dependent on the JGroups multiplexer being
+registered in an MBean server such as JBossAS.  -->
+      <!--
+      <depends>jgroups.mux:name=3DMultiplexer</depends>
+      <attribute name=3D"MultiplexerService">jgroups.mux:name=3DMultiplexe=
r</attribute>
+      <attribute name=3D"MultiplexerStack">fc-fast-minimalthreads</attribu=
te>
+      -->
+
+      <!-- JGroups protocol stack properties NOT NEEDED since CacheMode is=
 LOCAL -->
+
+
+      <!--
+          The max amount of time (in milliseconds) we wait until the
+          state (ie. the contents of the cache) are retrieved from
+          existing members in a clustered environment
+      -->
+      <attribute name=3D"StateRetrievalTimeout">20000</attribute>
+
+      <!--
+          Number of milliseconds to wait until all responses for a
+          synchronous call have been received.
+      -->
+      <attribute name=3D"SyncReplTimeout">20000</attribute>
+
+      <!-- Max number of milliseconds to wait for a lock acquisition -->
+      <attribute name=3D"LockAcquisitionTimeout">15000</attribute>
+
+
+      <!-- Specific eviction policy configurations. This is LRU -->
+      <attribute name=3D"EvictionPolicyConfig">
+         <config>
+            <attribute name=3D"wakeUpIntervalSeconds">3</attribute>
+            <!-- This defaults to 200000 if not specified -->
+            <attribute name=3D"eventQueueSize">200000</attribute>
+            <!-- Name of the DEFAULT eviction policy class. -->
+            <attribute name=3D"policyClass">org.jboss.cache.eviction.MRUPo=
licy</attribute>
+
+
+            <!-- Cache wide default -->
+            <region name=3D"/_default_">
+               <attribute name=3D"maxNodes">100</attribute>
+            </region>
+            <region name=3D"/org/jboss/data">
+               <attribute name=3D"maxNodes">250</attribute>
+            </region>
+            <region name=3D"/org/jboss/test/data">
+               <attribute name=3D"maxNodes">6</attribute>
+            </region>
+         </config>
+      </attribute>
+   </mbean>
+
+
+</server>

Added: core/trunk/src/test-perf/resources/local-service.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/test-perf/resources/local-service.xml	                  =
      (rev 0)
+++ core/trunk/src/test-perf/resources/local-service.xml	2008-01-25 12:47:3=
6 UTC (rev 5238)
@@ -0,0 +1,110 @@
+<?xml version=3D"1.0" encoding=3D"UTF-8"?>
+
+<!-- =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D -->
+<!--                                                                      =
 -->
+<!--  Sample TreeCache Service Configuration                              =
 -->
+<!--                                                                      =
 -->
+<!-- =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D -->
+
+<server>
+
+   <!-- =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D -->
+   <!-- Defines TreeCache configuration                                   =
   -->
+   <!-- =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D -->
+
+   <mbean code=3D"org.jboss.cache.jmx.CacheJmxWrapper"
+          name=3D"jboss.cache:service=3DTreeCache">
+
+      <depends>jboss:service=3DNaming</depends>
+      <depends>jboss:service=3DTransactionManager</depends>
+
+
+      <!-- Configure the TransactionManager -->
+      <attribute name=3D"TransactionManagerLookupClass">org.jboss.cache.tr=
ansaction.BatchModeTransactionManagerLookup
+      </attribute>
+
+
+      <!--
+          Node locking level : SERIALIZABLE
+                               REPEATABLE_READ (default)
+                               READ_COMMITTED
+                               READ_UNCOMMITTED
+                               NONE
+      -->
+      <attribute name=3D"IsolationLevel">REPEATABLE_READ</attribute>
+
+      <!--
+           Valid modes are LOCAL
+                           REPL_ASYNC
+                           REPL_SYNC
+                           INVALIDATION_ASYNC
+                           INVALIDATION_SYNC
+      -->
+      <attribute name=3D"CacheMode">LOCAL</attribute>
+
+      <!-- Name of cluster. Needs to be the same for all TreeCache nodes i=
n a
+           cluster in order to find each other.
+      -->
+      <attribute name=3D"ClusterName">JBossCache-Cluster</attribute>
+
+      <!--Uncomment next three statements to enable JGroups multiplexer.
+This configuration is dependent on the JGroups multiplexer being
+registered in an MBean server such as JBossAS.  -->
+      <!--
+      <depends>jgroups.mux:name=3DMultiplexer</depends>
+      <attribute name=3D"MultiplexerService">jgroups.mux:name=3DMultiplexe=
r</attribute>
+      <attribute name=3D"MultiplexerStack">fc-fast-minimalthreads</attribu=
te>
+      -->
+
+      <!-- JGroups protocol stack properties NOT NEEDED since CacheMode is=
 LOCAL -->
+
+
+      <!--
+          The max amount of time (in milliseconds) we wait until the
+          state (ie. the contents of the cache) are retrieved from
+          existing members in a clustered environment
+      -->
+      <attribute name=3D"StateRetrievalTimeout">20000</attribute>
+
+      <!--
+          Number of milliseconds to wait until all responses for a
+          synchronous call have been received.
+      -->
+      <attribute name=3D"SyncReplTimeout">20000</attribute>
+
+      <!-- Max number of milliseconds to wait for a lock acquisition -->
+      <attribute name=3D"LockAcquisitionTimeout">15000</attribute>
+
+      <!-- Specific eviction policy configurations. This is LRU -->
+      <attribute name=3D"EvictionPolicyConfig">
+         <config>
+            <attribute name=3D"wakeUpIntervalSeconds">5</attribute>
+            <!-- This defaults to 200000 if not specified -->
+            <attribute name=3D"eventQueueSize">200000</attribute>
+            <attribute name=3D"policyClass">org.jboss.cache.eviction.LRUPo=
licy</attribute>
+
+            <!-- Cache wide default -->
+            <region name=3D"/_default_">
+               <attribute name=3D"maxNodes">5000</attribute>
+               <attribute name=3D"timeToLiveSeconds">1000</attribute>
+            </region>
+            <region name=3D"/org/jboss/data">
+               <attribute name=3D"maxNodes">5000</attribute>
+               <attribute name=3D"timeToLiveSeconds">1000</attribute>
+            </region>
+            <region name=3D"/org/jboss/test/data">
+               <attribute name=3D"maxNodes">5</attribute>
+               <attribute name=3D"timeToLiveSeconds">4</attribute>
+            </region>
+         </config>
+      </attribute>
+
+      <!--
+         Indicate whether to use region based marshalling or not. Set this=
 to true if you are running under a scoped
+         class loader, e.g., inside an application server. Default is "fal=
se".
+      -->
+      <attribute name=3D"UseRegionBasedMarshalling">false</attribute>
+   </mbean>
+
+
+</server>

Modified: core/trunk/src/test-scripts/resources/TcpCacheServer/startTcpCach=
eServer.sh
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/test-scripts/resources/TcpCacheServer/startTcpCacheServe=
r.sh	2008-01-25 11:50:20 UTC (rev 5237)
+++ core/trunk/src/test-scripts/resources/TcpCacheServer/startTcpCacheServe=
r.sh	2008-01-25 12:47:36 UTC (rev 5238)
@@ -2,7 +2,7 @@
 =

 address=3D127.0.0.1
 port=3D7500
-config=3DMETA-INF/local-service.xml
+config=3Dresources/local-service.xml
 =

 echo Starting TCP Cache Server on port $port, address $address and cache c=
onfig $config
 =



--===============0317687481114345449==--

From jbosscache-commits at lists.jboss.org Fri Jan 25 07:50:25 2008
Content-Type: multipart/mixed; boundary="===============5732520914953941770=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r5239 -
 core/trunk/src/main/resources/META-INF.
Date: Fri, 25 Jan 2008 07:50:24 -0500
Message-ID: <E1JIO0m-0002qD-OM@committer01.frg.pub.inap.atl.jboss.com>

--===============5732520914953941770==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: mircea.markus
Date: 2008-01-25 07:50:24 -0500 (Fri, 25 Jan 2008)
New Revision: 5239

Added:
   core/trunk/src/main/resources/META-INF/buddy-replication-cache-service.x=
ml
   core/trunk/src/main/resources/META-INF/cacheloader-enabled-cache-service=
.xml
   core/trunk/src/main/resources/META-INF/eviction-enabled-cache-service.xml
   core/trunk/src/main/resources/META-INF/local-cache-service.xml
   core/trunk/src/main/resources/META-INF/multiplexer-enabled-cache-service=
.xml
   core/trunk/src/main/resources/META-INF/optimistically-locked-cache-servi=
ce.xml
   core/trunk/src/main/resources/META-INF/total-replication-cache-service.x=
ml
Removed:
   core/trunk/src/main/resources/META-INF/buddyreplication-service.xml
   core/trunk/src/main/resources/META-INF/cacheserver-service-jmx.xml
   core/trunk/src/main/resources/META-INF/cacheserver-service-tcp.xml
   core/trunk/src/main/resources/META-INF/clonable-config-service.xml
   core/trunk/src/main/resources/META-INF/hibernate-recommended-config.xml
   core/trunk/src/main/resources/META-INF/jdbcCacheLoader-service.xml
   core/trunk/src/main/resources/META-INF/local-elementsize-eviction-servic=
e.xml
   core/trunk/src/main/resources/META-INF/local-eviction-cacheloader-servic=
e.xml
   core/trunk/src/main/resources/META-INF/local-expiration-eviction-service=
.xml
   core/trunk/src/main/resources/META-INF/local-fifo-eviction-service.xml
   core/trunk/src/main/resources/META-INF/local-lfu-eviction-service.xml
   core/trunk/src/main/resources/META-INF/local-lru-eviction-service.xml
   core/trunk/src/main/resources/META-INF/local-mru-eviction-service.xml
   core/trunk/src/main/resources/META-INF/local-null-eviction-service.xml
   core/trunk/src/main/resources/META-INF/local-passivation-service.xml
   core/trunk/src/main/resources/META-INF/local-service.xml
   core/trunk/src/main/resources/META-INF/local-tx-service.xml
   core/trunk/src/main/resources/META-INF/mixedPolicy-eviction-service.xml
   core/trunk/src/main/resources/META-INF/mux-service.xml
   core/trunk/src/main/resources/META-INF/optimistic-eviction.xml
   core/trunk/src/main/resources/META-INF/pojocache-passivation-service.xml
   core/trunk/src/main/resources/META-INF/pojocache-passivation-service2.xml
   core/trunk/src/main/resources/META-INF/policyPerRegion-eviction-service.=
xml
   core/trunk/src/main/resources/META-INF/replAsync-service.xml
   core/trunk/src/main/resources/META-INF/replSync-passivation-service.xml
   core/trunk/src/main/resources/META-INF/replSync-service-test.xml
   core/trunk/src/main/resources/META-INF/replSync-service.xml
   core/trunk/src/main/resources/META-INF/tree-service.xml
Log:
http://jira.jboss.com/jira/browse/JBCACHE-1269

Added: core/trunk/src/main/resources/META-INF/buddy-replication-cache-servi=
ce.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/resources/META-INF/buddy-replication-cache-service.=
xml	                        (rev 0)
+++ core/trunk/src/main/resources/META-INF/buddy-replication-cache-service.=
xml	2008-01-25 12:50:24 UTC (rev 5239)
@@ -0,0 +1,179 @@
+<?xml version=3D"1.0" encoding=3D"UTF-8"?>
+
+<!-- =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D -->
+<!--                                                                      =
 -->
+<!--  Sample TreeCache Service Configuration                              =
 -->
+<!--                                                                      =
 -->
+<!-- =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D -->
+
+<server>
+
+   <classpath codebase=3D"./lib" archives=3D"jboss-cache.jar, jgroups.jar"=
/>
+
+
+   <!-- =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D -->
+   <!-- Defines TreeCache configuration                                   =
   -->
+   <!-- =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D -->
+
+   <mbean code=3D"org.jboss.cache.jmx.CacheJmxWrapper"
+          name=3D"jboss.cache:service=3DtestTreeCache">
+
+      <depends>jboss:service=3DNaming</depends>
+      <depends>jboss:service=3DTransactionManager</depends>
+
+      <!--
+          Configure the TransactionManager
+      -->
+      <attribute name=3D"TransactionManagerLookupClass">org.jboss.cache.tr=
ansaction.GenericTransactionManagerLookup
+      </attribute>
+
+
+      <!--
+          Node locking level : SERIALIZABLE
+                               REPEATABLE_READ (default)
+                               READ_COMMITTED
+                               READ_UNCOMMITTED
+                               NONE
+      -->
+      <attribute name=3D"IsolationLevel">REPEATABLE_READ</attribute>
+
+      <!--
+           Valid modes are LOCAL
+                           REPL_ASYNC
+                           REPL_SYNC
+                           INVALIDATION_ASYNC
+                           INVALIDATION_SYNC
+      -->
+      <attribute name=3D"CacheMode">REPL_SYNC</attribute>
+
+      <!-- Name of cluster. Needs to be the same for all TreeCache nodes i=
n a
+           cluster in order to find each other.
+      -->
+      <attribute name=3D"ClusterName">JBossCache-Cluster</attribute>
+
+      <!--Uncomment next three statements to enable JGroups multiplexer.
+This configuration is dependent on the JGroups multiplexer being
+registered in an MBean server such as JBossAS.  -->
+      <!--
+      <depends>jgroups.mux:name=3DMultiplexer</depends>
+      <attribute name=3D"MultiplexerService">jgroups.mux:name=3DMultiplexe=
r</attribute>
+      <attribute name=3D"MultiplexerStack">fc-fast-minimalthreads</attribu=
te>
+      -->
+
+      <!-- JGroups protocol stack properties.
+         ClusterConfig isn't used if the multiplexer is enabled and succes=
sfully initialized.
+      -->
+      <attribute name=3D"ClusterConfig">
+         <config>
+            <TCP recv_buf_size=3D"20000000" use_send_queues=3D"false"
+                 loopback=3D"false"
+                 discard_incompatible_packets=3D"true"
+                 max_bundle_size=3D"64000"
+                 max_bundle_timeout=3D"30"
+                 use_incoming_packet_handler=3D"true"
+                 enable_bundling=3D"true"
+                 enable_unicast_bundling=3D"true"
+                 enable_diagnostics=3D"true"
+
+                 use_concurrent_stack=3D"true"
+
+                 thread_naming_pattern=3D"pl"
+
+                 thread_pool.enabled=3D"true"
+                 thread_pool.min_threads=3D"1"
+                 thread_pool.max_threads=3D"4"
+                 thread_pool.keep_alive_time=3D"30000"
+                 thread_pool.queue_enabled=3D"true"
+                 thread_pool.queue_max_size=3D"50000"
+                 thread_pool.rejection_policy=3D"discard"
+
+                 oob_thread_pool.enabled=3D"true"
+                 oob_thread_pool.min_threads=3D"2"
+                 oob_thread_pool.max_threads=3D"4"
+                 oob_thread_pool.keep_alive_time=3D"10000"
+                 oob_thread_pool.queue_enabled=3D"false"
+                 oob_thread_pool.queue_max_size=3D"10"
+                 oob_thread_pool.rejection_policy=3D"Run"/>
+
+            <!--<PING timeout=3D"2000" num_initial_members=3D"3"/>-->
+             <MPING mcast_addr=3D"232.1.2.3" timeout=3D"2000" num_initial_=
members=3D"3"/>
+            <MERGE2 max_interval=3D"30000" min_interval=3D"10000"/>
+            <FD_SOCK/>
+            <FD timeout=3D"10000" max_tries=3D"5" shun=3D"true"/>
+            <VERIFY_SUSPECT timeout=3D"1500"/>
+            <pbcast.NAKACK use_mcast_xmit=3D"false" gc_lag=3D"0"
+                           retransmit_timeout=3D"300,600,1200,2400,4800"
+                           discard_delivered_msgs=3D"true"/>
+            <!--<UNICAST timeout=3D"30,60,120,300,600,1200,2400,3600"/>-->
+            <pbcast.STABLE stability_delay=3D"1000" desired_avg_gossip=3D"=
50000"
+                           max_bytes=3D"400000"/>
+            <pbcast.GMS print_local_addr=3D"true" join_timeout=3D"5000"
+                        join_retry_timeout=3D"2000" shun=3D"false"
+                        view_bundling=3D"true" view_ack_collection_timeout=
=3D"5000"/>
+              <FC max_credits=3D"5000000"
+                    min_threshold=3D"0.20"/>
+            <FRAG2 frag_size=3D"60000"/>
+            <pbcast.STREAMING_STATE_TRANSFER use_reading_thread=3D"true"/>
+            <!-- <pbcast.STATE_TRANSFER/> -->
+            <pbcast.FLUSH timeout=3D"0"/>
+         </config>
+      </attribute>
+
+
+
+      <!--
+          The max amount of time (in milliseconds) we wait until the
+          state (ie. the contents of the cache) are retrieved from
+          existing members in a clustered environment
+      -->
+      <attribute name=3D"StateRetrievalTimeout">20000</attribute>
+
+      <!--
+          Number of milliseconds to wait until all responses for a
+          synchronous call have been received.
+      -->
+      <attribute name=3D"SyncReplTimeout">15000</attribute>
+
+      <!-- Max number of milliseconds to wait for a lock acquisition -->
+      <attribute name=3D"LockAcquisitionTimeout">10000</attribute>
+
+
+      <!-- Buddy Replication config -->
+      <attribute name=3D"BuddyReplicationConfig">
+         <config>
+            <buddyReplicationEnabled>true</buddyReplicationEnabled>
+            <!-- these are the default values anyway -->
+            <buddyLocatorClass>org.jboss.cache.buddyreplication.NextMember=
BuddyLocator</buddyLocatorClass>
+            <!-- numBuddies is the number of backup nodes each node mainta=
ins.  ignoreColocatedBuddies means that
+     each node will *try* to select a buddy on a different physical host. =
 If not able to do so though,
+     it will fall back to colocated nodes. -->
+            <buddyLocatorProperties>
+               numBuddies =3D 1
+               ignoreColocatedBuddies =3D true
+            </buddyLocatorProperties>
+
+            <!-- A way to specify a preferred replication group.  If speci=
fied, we try and pick a buddy why shares
+    the same pool name (falling back to other buddies if not available).  =
This allows the sysdmin to hint at
+    backup buddies are picked, so for example, nodes may be hinted topick =
buddies on a different physical rack
+    or power supply for added fault tolerance.  -->
+            <buddyPoolName>myBuddyPoolReplicationGroup</buddyPoolName>
+            <!-- communication timeout for inter-buddy group organisation =
messages (such as assigning to and removing
+          from groups -->
+            <buddyCommunicationTimeout>2000</buddyCommunicationTimeout>
+
+            <!-- the following three elements, all relating to data gravit=
ation, default to false -->
+            <!-- Should data gravitation be attempted whenever there is a =
cache miss on finding a node?
+If false, data will only be gravitated if an Option is set enabling it -->
+            <autoDataGravitation>false</autoDataGravitation>
+            <!-- removes data on remote caches' trees and backup subtrees =
when gravitated to a new data owner -->
+            <dataGravitationRemoveOnFind>true</dataGravitationRemoveOnFind>
+            <!-- search backup subtrees as well for data when gravitating.=
  Results in backup nodes being able to
+        answer data gravitation requests. -->
+            <dataGravitationSearchBackupTrees>true</dataGravitationSearchB=
ackupTrees>
+
+         </config>
+      </attribute>
+   </mbean>
+
+
+</server>

Deleted: core/trunk/src/main/resources/META-INF/buddyreplication-service.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/resources/META-INF/buddyreplication-service.xml	200=
8-01-25 12:47:36 UTC (rev 5238)
+++ core/trunk/src/main/resources/META-INF/buddyreplication-service.xml	200=
8-01-25 12:50:24 UTC (rev 5239)
@@ -1,179 +0,0 @@
-<?xml version=3D"1.0" encoding=3D"UTF-8"?>
-
-<!-- =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D -->
-<!--                                                                      =
 -->
-<!--  Sample TreeCache Service Configuration                              =
 -->
-<!--                                                                      =
 -->
-<!-- =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D -->
-
-<server>
-
-   <classpath codebase=3D"./lib" archives=3D"jboss-cache.jar, jgroups.jar"=
/>
-
-
-   <!-- =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D -->
-   <!-- Defines TreeCache configuration                                   =
   -->
-   <!-- =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D -->
-
-   <mbean code=3D"org.jboss.cache.jmx.CacheJmxWrapper"
-          name=3D"jboss.cache:service=3DtestTreeCache">
-
-      <depends>jboss:service=3DNaming</depends>
-      <depends>jboss:service=3DTransactionManager</depends>
-
-      <!--
-          Configure the TransactionManager
-      -->
-      <attribute name=3D"TransactionManagerLookupClass">org.jboss.cache.tr=
ansaction.GenericTransactionManagerLookup
-      </attribute>
-
-
-      <!--
-          Node locking level : SERIALIZABLE
-                               REPEATABLE_READ (default)
-                               READ_COMMITTED
-                               READ_UNCOMMITTED
-                               NONE
-      -->
-      <attribute name=3D"IsolationLevel">REPEATABLE_READ</attribute>
-
-      <!--
-           Valid modes are LOCAL
-                           REPL_ASYNC
-                           REPL_SYNC
-                           INVALIDATION_ASYNC
-                           INVALIDATION_SYNC
-      -->
-      <attribute name=3D"CacheMode">REPL_SYNC</attribute>
-
-      <!-- Name of cluster. Needs to be the same for all TreeCache nodes i=
n a
-           cluster in order to find each other.
-      -->
-      <attribute name=3D"ClusterName">JBossCache-Cluster</attribute>
-
-      <!--Uncomment next three statements to enable JGroups multiplexer.
-This configuration is dependent on the JGroups multiplexer being
-registered in an MBean server such as JBossAS.  -->
-      <!--
-      <depends>jgroups.mux:name=3DMultiplexer</depends>
-      <attribute name=3D"MultiplexerService">jgroups.mux:name=3DMultiplexe=
r</attribute>
-      <attribute name=3D"MultiplexerStack">fc-fast-minimalthreads</attribu=
te>
-      -->
-
-      <!-- JGroups protocol stack properties.
-         ClusterConfig isn't used if the multiplexer is enabled and succes=
sfully initialized.
-      -->
-      <attribute name=3D"ClusterConfig">
-         <config>
-            <TCP recv_buf_size=3D"20000000" use_send_queues=3D"false"
-                 loopback=3D"false"
-                 discard_incompatible_packets=3D"true"
-                 max_bundle_size=3D"64000"
-                 max_bundle_timeout=3D"30"
-                 use_incoming_packet_handler=3D"true"
-                 enable_bundling=3D"true"
-                 enable_unicast_bundling=3D"true"
-                 enable_diagnostics=3D"true"
-
-                 use_concurrent_stack=3D"true"
-
-                 thread_naming_pattern=3D"pl"
-
-                 thread_pool.enabled=3D"true"
-                 thread_pool.min_threads=3D"1"
-                 thread_pool.max_threads=3D"4"
-                 thread_pool.keep_alive_time=3D"30000"
-                 thread_pool.queue_enabled=3D"true"
-                 thread_pool.queue_max_size=3D"50000"
-                 thread_pool.rejection_policy=3D"discard"
-
-                 oob_thread_pool.enabled=3D"true"
-                 oob_thread_pool.min_threads=3D"2"
-                 oob_thread_pool.max_threads=3D"4"
-                 oob_thread_pool.keep_alive_time=3D"10000"
-                 oob_thread_pool.queue_enabled=3D"false"
-                 oob_thread_pool.queue_max_size=3D"10"
-                 oob_thread_pool.rejection_policy=3D"Run"/>
-
-            <!--<PING timeout=3D"2000" num_initial_members=3D"3"/>-->
-             <MPING mcast_addr=3D"232.1.2.3" timeout=3D"2000" num_initial_=
members=3D"3"/>
-            <MERGE2 max_interval=3D"30000" min_interval=3D"10000"/>
-            <FD_SOCK/>
-            <FD timeout=3D"10000" max_tries=3D"5" shun=3D"true"/>
-            <VERIFY_SUSPECT timeout=3D"1500"/>
-            <pbcast.NAKACK use_mcast_xmit=3D"false" gc_lag=3D"0"
-                           retransmit_timeout=3D"300,600,1200,2400,4800"
-                           discard_delivered_msgs=3D"true"/>
-            <!--<UNICAST timeout=3D"30,60,120,300,600,1200,2400,3600"/>-->
-            <pbcast.STABLE stability_delay=3D"1000" desired_avg_gossip=3D"=
50000"
-                           max_bytes=3D"400000"/>
-            <pbcast.GMS print_local_addr=3D"true" join_timeout=3D"5000"
-                        join_retry_timeout=3D"2000" shun=3D"false"
-                        view_bundling=3D"true" view_ack_collection_timeout=
=3D"5000"/>
-              <FC max_credits=3D"5000000"
-                    min_threshold=3D"0.20"/>
-            <FRAG2 frag_size=3D"60000"/>
-            <pbcast.STREAMING_STATE_TRANSFER use_reading_thread=3D"true"/>
-            <!-- <pbcast.STATE_TRANSFER/> -->
-            <pbcast.FLUSH timeout=3D"0"/>
-         </config>
-      </attribute>
-
-
-
-      <!--
-          The max amount of time (in milliseconds) we wait until the
-          state (ie. the contents of the cache) are retrieved from
-          existing members in a clustered environment
-      -->
-      <attribute name=3D"StateRetrievalTimeout">20000</attribute>
-
-      <!--
-          Number of milliseconds to wait until all responses for a
-          synchronous call have been received.
-      -->
-      <attribute name=3D"SyncReplTimeout">15000</attribute>
-
-      <!-- Max number of milliseconds to wait for a lock acquisition -->
-      <attribute name=3D"LockAcquisitionTimeout">10000</attribute>
-
-
-      <!-- Buddy Replication config -->
-      <attribute name=3D"BuddyReplicationConfig">
-         <config>
-            <buddyReplicationEnabled>true</buddyReplicationEnabled>
-            <!-- these are the default values anyway -->
-            <buddyLocatorClass>org.jboss.cache.buddyreplication.NextMember=
BuddyLocator</buddyLocatorClass>
-            <!-- numBuddies is the number of backup nodes each node mainta=
ins.  ignoreColocatedBuddies means that
-     each node will *try* to select a buddy on a different physical host. =
 If not able to do so though,
-     it will fall back to colocated nodes. -->
-            <buddyLocatorProperties>
-               numBuddies =3D 1
-               ignoreColocatedBuddies =3D true
-            </buddyLocatorProperties>
-
-            <!-- A way to specify a preferred replication group.  If speci=
fied, we try and pick a buddy why shares
-    the same pool name (falling back to other buddies if not available).  =
This allows the sysdmin to hint at
-    backup buddies are picked, so for example, nodes may be hinted topick =
buddies on a different physical rack
-    or power supply for added fault tolerance.  -->
-            <buddyPoolName>myBuddyPoolReplicationGroup</buddyPoolName>
-            <!-- communication timeout for inter-buddy group organisation =
messages (such as assigning to and removing
-          from groups -->
-            <buddyCommunicationTimeout>2000</buddyCommunicationTimeout>
-
-            <!-- the following three elements, all relating to data gravit=
ation, default to false -->
-            <!-- Should data gravitation be attempted whenever there is a =
cache miss on finding a node?
-If false, data will only be gravitated if an Option is set enabling it -->
-            <autoDataGravitation>false</autoDataGravitation>
-            <!-- removes data on remote caches' trees and backup subtrees =
when gravitated to a new data owner -->
-            <dataGravitationRemoveOnFind>true</dataGravitationRemoveOnFind>
-            <!-- search backup subtrees as well for data when gravitating.=
  Results in backup nodes being able to
-        answer data gravitation requests. -->
-            <dataGravitationSearchBackupTrees>true</dataGravitationSearchB=
ackupTrees>
-
-         </config>
-      </attribute>
-   </mbean>
-
-
-</server>

Added: core/trunk/src/main/resources/META-INF/cacheloader-enabled-cache-ser=
vice.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/resources/META-INF/cacheloader-enabled-cache-servic=
e.xml	                        (rev 0)
+++ core/trunk/src/main/resources/META-INF/cacheloader-enabled-cache-servic=
e.xml	2008-01-25 12:50:24 UTC (rev 5239)
@@ -0,0 +1,118 @@
+<?xml version=3D"1.0" encoding=3D"UTF-8"?>
+
+<!-- =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D -->
+<!--                                                                      =
 -->
+<!--  Sample TreeCache Service Configuration                              =
 -->
+<!--                                                                      =
 -->
+<!-- =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D -->
+
+<server>
+
+   <!-- =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D -->
+   <!-- Defines TreeCache configuration                                   =
   -->
+   <!-- =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D -->
+
+   <mbean code=3D"org.jboss.cache.jmx.CacheJmxWrapper"
+          name=3D"jboss.cache:service=3DTreeCache">
+
+      <depends>jboss:service=3DNaming</depends>
+      <depends>jboss:service=3DTransactionManager</depends>
+
+      <!--
+          Configure the TransactionManager
+      -->
+      <attribute name=3D"TransactionManagerLookupClass">org.jboss.cache.tr=
ansaction.GenericTransactionManagerLookup
+      </attribute>
+
+
+      <!--
+          Node locking level : SERIALIZABLE
+                               REPEATABLE_READ (default)
+                               READ_COMMITTED
+                               READ_UNCOMMITTED
+                               NONE
+      -->
+      <attribute name=3D"IsolationLevel">REPEATABLE_READ</attribute>
+
+      <!--
+           Valid modes are LOCAL
+                           REPL_ASYNC
+                           REPL_SYNC
+      -->
+      <attribute name=3D"CacheMode">LOCAL</attribute>
+
+      <!-- Max number of milliseconds to wait for a lock acquisition -->
+      <attribute name=3D"LockAcquisitionTimeout">15000</attribute>
+
+      <!-- Specific eviction policy configurations. This is LRU -->
+      <attribute name=3D"EvictionPolicyConfig">
+         <config>
+            <attribute name=3D"wakeUpIntervalSeconds">5</attribute>
+            <!-- This defaults to 200000 if not specified -->
+            <attribute name=3D"eventQueueSize">200000</attribute>
+            <!-- Name of the DEFAULT eviction policy class. -->
+            <attribute name=3D"policyClass">org.jboss.cache.eviction.LRUPo=
licy</attribute>
+
+
+            <!-- Cache wide default -->
+            <region name=3D"/_default_">
+               <attribute name=3D"maxNodes">5000</attribute>
+               <attribute name=3D"timeToLiveSeconds">3</attribute>
+            </region>
+            <region name=3D"/org/jboss/test/data">
+               <attribute name=3D"maxNodes">100</attribute>
+               <attribute name=3D"timeToLiveSeconds">3</attribute>
+            </region>
+         </config>
+      </attribute>
+
+            <!-- Cache Passivation for Tree Cache
+      On pasivation, The objects are written to the backend store on evict=
ion if CacheLoaderPassivation
+      is true, otheriwse the objects are persisted.
+      On activation, the objects are restored in the memory cache and remo=
ved from the cache loader
+      if CacheLoaderPassivation is true, otherwise the objects are only lo=
aded from the cache loader -->
+      <attribute name=3D"CacheLoaderConfiguration">
+         <config>
+            <!-- if passivation is true, only the first cache loader is us=
ed; the rest are ignored -->
+            <passivation>false</passivation>
+            <preload>/</preload>
+            <shared>false</shared>
+
+            <!-- we can now have multiple cache loaders, which get chained=
 -->
+            <cacheloader>
+               <class>org.jboss.cache.loader.JDBCCacheLoader</class>
+               <!-- same as the old CacheLoaderConfig attribute -->
+               <properties>
+                  cache.jdbc.table.name=3Djbosscache
+                  cache.jdbc.table.create=3Dtrue
+                  cache.jdbc.table.drop=3Dtrue
+                  cache.jdbc.table.primarykey=3Djbosscache_pk
+                  cache.jdbc.fqn.column=3Dfqn
+                  cache.jdbc.fqn.type=3Dvarchar(255)
+                  cache.jdbc.node.column=3Dnode
+                  cache.jdbc.node.type=3Dblob
+                  cache.jdbc.parent.column=3Dparent
+                  cache.jdbc.driver=3Dcom.mysql.jdbc.Driver
+                  cache.jdbc.url=3Djdbc:mysql://localhost:3306/jbossdb
+                  cache.jdbc.user=3Droot
+                  cache.jdbc.password=3D
+                  cache.jdbc.sql-concat=3Dconcat(1,2)
+               </properties>
+               <!-- whether the cache loader writes are asynchronous -->
+               <async>false</async>
+               <!-- only one cache loader in the chain may set fetchPersis=
tentState to true.
+ An exception is thrown if more than one cache loader sets this to true. -=
->
+               <fetchPersistentState>true</fetchPersistentState>
+               <!-- determines whether this cache loader ignores writes - =
defaults to false. -->
+               <ignoreModifications>false</ignoreModifications>
+               <!-- if set to true, purges the contents of this cache load=
er when the cache starts up.
+           Defaults to false.  -->
+               <purgeOnStartup>false</purgeOnStartup>
+            </cacheloader>
+         </config>
+      </attribute>
+
+   </mbean>
+
+
+</server>

Deleted: core/trunk/src/main/resources/META-INF/cacheserver-service-jmx.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/resources/META-INF/cacheserver-service-jmx.xml	2008=
-01-25 12:47:36 UTC (rev 5238)
+++ core/trunk/src/main/resources/META-INF/cacheserver-service-jmx.xml	2008=
-01-25 12:50:24 UTC (rev 5239)
@@ -1,51 +0,0 @@
-<?xml version=3D"1.0" encoding=3D"UTF-8"?>
-
-<server>
-
-   <classpath codebase=3D"./lib" archives=3D"jboss-cache.jar"/>
-
-   <mbean code=3D"org.jboss.cache.jmx.CacheJmxWrapper"
-          name=3D"jboss.cache:service=3DTreeCache">
-
-      <depends>jboss:service=3DNaming</depends>
-      <depends>jboss:service=3DTransactionManager</depends>
-
-      <!-- Configure the TransactionManager -->
-      <attribute name=3D"TransactionManagerLookupClass">org.jboss.cache.tr=
ansaction.BatchModeTransactionManagerLookup
-      </attribute>
-
-
-      <!--
-          Node locking level : SERIALIZABLE
-                               REPEATABLE_READ (default)
-                               READ_COMMITTED
-                               READ_UNCOMMITTED
-                               NONE
-      -->
-      <attribute name=3D"IsolationLevel">REPEATABLE_READ</attribute>
-
-      <!--
-           Valid modes are LOCAL
-                           REPL_ASYNC
-                           REPL_SYNC
-                           INVALIDATION_ASYNC
-                           INVALIDATION_SYNC
-      -->
-      <attribute name=3D"CacheMode">LOCAL</attribute>
-
-      <!-- Name of cluster. Needs to be the same for all TreeCache nodes i=
n a
-           cluster in order to find each other.
-      -->
-      <attribute name=3D"ClusterName">JBossCache-Cluster</attribute>
-
-      <!-- JGroups protocol stack properties NOT NEEDED since CacheMode is=
 LOCAL -->
-
-      <!--
-         Indicate whether to use region based marshalling or not. Set this=
 to true if you are running under a scoped
-         class loader, e.g., inside an application server. Default is "fal=
se".
-      -->
-      <attribute name=3D"UseRegionBasedMarshalling">false</attribute>
-   </mbean>
-
-
-</server>

Deleted: core/trunk/src/main/resources/META-INF/cacheserver-service-tcp.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/resources/META-INF/cacheserver-service-tcp.xml	2008=
-01-25 12:47:36 UTC (rev 5238)
+++ core/trunk/src/main/resources/META-INF/cacheserver-service-tcp.xml	2008=
-01-25 12:50:24 UTC (rev 5239)
@@ -1,14 +0,0 @@
-<?xml version=3D"1.0" encoding=3D"UTF-8"?>
-
-<server>
-
-   <classpath codebase=3D"./lib" archives=3D"jboss-cache.jar"/>
-
-   <mbean code=3D"org.jboss.cache.loader.tcp.TcpCacheServer" name=3D"jboss=
.cache:service=3DTcpCacheServer">
-      <depends optional-attribute-name=3D"CacheJmxWrapper"
-               proxy-type=3D"attribute">jboss.cache:service=3DTreeCache</d=
epends>
-      <attribute name=3D"BindAddress">${jboss.bind.address:localhost}</att=
ribute>
-      <attribute name=3D"Port">7500</attribute>
-   </mbean>
-
-</server>

Deleted: core/trunk/src/main/resources/META-INF/clonable-config-service.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/resources/META-INF/clonable-config-service.xml	2008=
-01-25 12:47:36 UTC (rev 5238)
+++ core/trunk/src/main/resources/META-INF/clonable-config-service.xml	2008=
-01-25 12:50:24 UTC (rev 5239)
@@ -1,250 +0,0 @@
-<?xml version=3D"1.0" encoding=3D"UTF-8"?>
-
-<!-- =

-      Cache configuration file that attempts to utilize all known elements.
-      Intent here is not to create such a cache; rather it is to create
-      a Configuration and then see if that Configuration can be cloned.
-      Basically just for testing the clone() method of the various
-      configuration elements.
--->
-
-<server>
-
-   <mbean code=3D"org.jboss.cache.jmx.CacheJmxWrapper"
-          name=3D"jboss.cache:service=3DtestTreeCache">
-
-      <attribute name=3D"TransactionManagerLookupClass">org.jboss.cache.tr=
ansaction.GenericTransactionManagerLookup
-      </attribute>
-
-      <attribute name=3D"NodeLockingScheme">OPTIMISTIC</attribute>
-      <attribute name=3D"IsolationLevel">SERIALIZABLE</attribute>
-      <attribute name=3D"CacheMode">INVALIDATION_SYNC</attribute>
-      =

-      <attribute name=3D"ClusterName">CloneCluster</attribute>
-      =

-      <!-- Use both a stack name and a ClusterConfig so we can test both -=
->
-      <attribute name=3D"MultiplexerStack">udp</attribute>      =

-      <attribute name=3D"ClusterConfig">
-         <config>
-            <TCP recv_buf_size=3D"20000000" use_send_queues=3D"false"
-                 loopback=3D"false"
-                 discard_incompatible_packets=3D"true"
-                 max_bundle_size=3D"64000"
-                 max_bundle_timeout=3D"30"
-                 use_incoming_packet_handler=3D"true"
-                 enable_bundling=3D"true"
-                 enable_unicast_bundling=3D"true"
-                 enable_diagnostics=3D"true"
-                 use_concurrent_stack=3D"true"
-                 thread_naming_pattern=3D"pl"
-                 thread_pool.enabled=3D"true"
-                 thread_pool.min_threads=3D"1"
-                 thread_pool.max_threads=3D"4"
-                 thread_pool.keep_alive_time=3D"30000"
-                 thread_pool.queue_enabled=3D"true"
-                 thread_pool.queue_max_size=3D"50000"
-                 thread_pool.rejection_policy=3D"discard"
-                 oob_thread_pool.enabled=3D"true"
-                 oob_thread_pool.min_threads=3D"2"
-                 oob_thread_pool.max_threads=3D"4"
-                 oob_thread_pool.keep_alive_time=3D"10000"
-                 oob_thread_pool.queue_enabled=3D"false"
-                 oob_thread_pool.queue_max_size=3D"10"
-                 oob_thread_pool.rejection_policy=3D"Run"/>
-            <MPING mcast_addr=3D"232.1.2.3" timeout=3D"2000" num_initial_m=
embers=3D"3"/>
-            <MERGE2 max_interval=3D"30000" min_interval=3D"10000"/>
-            <FD_SOCK/>
-            <FD timeout=3D"10000" max_tries=3D"5" shun=3D"true"/>
-            <VERIFY_SUSPECT timeout=3D"1500"/>
-            <pbcast.NAKACK use_mcast_xmit=3D"false" gc_lag=3D"0"
-                           retransmit_timeout=3D"300,600,1200,2400,4800"
-                           discard_delivered_msgs=3D"true"/>
-            <pbcast.STABLE stability_delay=3D"1000" desired_avg_gossip=3D"=
50000"
-                           max_bytes=3D"400000"/>
-            <pbcast.GMS print_local_addr=3D"true" join_timeout=3D"5000"
-                        join_retry_timeout=3D"2000" shun=3D"false"
-                        view_bundling=3D"true" view_ack_collection_timeout=
=3D"5000"/>
-              <FC max_credits=3D"5000000"
-                    min_threshold=3D"0.20"/>
-            <FRAG2 frag_size=3D"60000"/>
-            <pbcast.STREAMING_STATE_TRANSFER use_reading_thread=3D"true"/>
-            <pbcast.FLUSH timeout=3D"0"/>
-         </config>
-      </attribute>
-
-      <attribute name=3D"FetchInMemoryState">false</attribute>
-      <attribute name=3D"StateRetrievalTimeout">3</attribute>
-      <attribute name=3D"SyncReplTimeout">2</attribute>
-      <attribute name=3D"LockAcquisitionTimeout">1</attribute>
-
-
-      <attribute name=3D"BuddyReplicationConfig">
-         <config>
-            <buddyReplicationEnabled>true</buddyReplicationEnabled>
-            <buddyLocatorClass>org.jboss.cache.buddyreplication.NextMember=
BuddyLocator</buddyLocatorClass>
-            <buddyLocatorProperties>
-               numBuddies =3D 11
-               ignoreColocatedBuddies =3D true
-            </buddyLocatorProperties>
-
-            <buddyPoolName>cloneGroup</buddyPoolName>
-            <buddyCommunicationTimeout>7</buddyCommunicationTimeout>
-
-            <autoDataGravitation>false</autoDataGravitation>
-            <dataGravitationRemoveOnFind>true</dataGravitationRemoveOnFind>
-            <dataGravitationSearchBackupTrees>true</dataGravitationSearchB=
ackupTrees>
-
-         </config>
-      </attribute>
-      =

-      <attribute name=3D"EvictionPolicyConfig">
-         <config>
-            <attribute name=3D"wakeUpIntervalSeconds">45</attribute>
-            <attribute name=3D"eventQueueSize">4</attribute>
-            <attribute name=3D"policyClass">org.jboss.cache.eviction.LRUPo=
licy</attribute>
-
-            <!-- Cache wide default -->
-            <region name=3D"/_default_">
-               <attribute name=3D"maxNodes">5000</attribute>
-               <attribute name=3D"timeToLiveSeconds">1000</attribute>
-               <attribute name=3D"maxAge">15000</attribute>
-            </region>
-            <region name=3D"/fifo" policyClass=3D"org.jboss.cache.eviction=
.FIFOPolicy">
-               <attribute name=3D"maxNodes">5000</attribute>
-            </region>
-            <region name=3D"/mru" policyClass=3D"org.jboss.cache.eviction.=
MRUPolicy">
-               <attribute name=3D"maxNodes">10000</attribute>
-            </region>
-            <region name=3D"/lfu" policyClass=3D"org.jboss.cache.eviction.=
LFUPolicy">
-               <attribute name=3D"maxNodes">5000</attribute>
-               <attribute name=3D"minNodes">4000</attribute>
-            </region>
-         </config>
-      </attribute>
-      =

-      <attribute name=3D"CacheLoaderConfig">
-         <config>
-            <!-- if passivation is true, only the first cache loader is us=
ed; the rest are ignored -->
-            <passivation>false</passivation>
-            <preload>/</preload>
-            <shared>true</shared>
-
-            <!-- we can now have multiple cache loaders, which get chained=
 -->
-            <cacheloader>
-               <class>org.jboss.cache.loader.FileCacheLoader</class>
-               <properties>
-                  location=3D/tmp/FileCacheLoader
-               </properties>
-               <async>false</async>
-               <!-- only one cache loader in the chain may set fetchPersis=
tentState to true.-->
-               <fetchPersistentState>true</fetchPersistentState>
-               <ignoreModifications>false</ignoreModifications>
-               <singletonStore>
-                  <enabled>false</enabled>
-                  <properties>
-                     pushStateWhenCoordinator=3Dtrue
-                     pushStateWhenCoordinatorTimeout=3D5000
-                  </properties>
-               </singletonStore>
-            </cacheloader>
-            =

-            <cacheloader>
-               <class>org.jboss.cache.loader.bdbje.BdbjeCacheLoader</class>
-               <properties>
-                  location=3D/tmp/BdbjeCacheLoader
-               </properties>
-               <async>false</async>
-               <!-- only one cache loader in the chain may set fetchPersis=
tentState to true.-->
-               <fetchPersistentState>false</fetchPersistentState>
-               <ignoreModifications>false</ignoreModifications>
-               <singletonStore>
-                  <enabled>false</enabled>
-                  <properties>
-                     pushStateWhenCoordinator=3Dtrue
-                     pushStateWhenCoordinatorTimeout=3D5000
-                  </properties>
-               </singletonStore>
-            </cacheloader>
-            =

-            <cacheloader>
-               <class>org.jboss.cache.loader.jdbm.JdbmCacheLoader</class>
-               <properties>
-                  location=3D/tmp/JdbmCacheLoader
-               </properties>
-               <async>false</async>
-               <!-- only one cache loader in the chain may set fetchPersis=
tentState to true.-->
-               <fetchPersistentState>false</fetchPersistentState>
-               <ignoreModifications>false</ignoreModifications>
-               <singletonStore>
-                  <enabled>false</enabled>
-                  <properties>
-                     pushStateWhenCoordinator=3Dtrue
-                     pushStateWhenCoordinatorTimeout=3D5000
-                  </properties>
-               </singletonStore>
-            </cacheloader>
-            =

-            <cacheloader>
-               <class>org.jboss.cache.loader.JDBCCacheLoader</class>
-               <properties>
-                  cache.jdbc.driver=3Dcom.foo.jdbc.Driver
-                  cache.jdbc.url=3Dfoo://driver
-                  cache.jdbc.user=3Dsa
-                  cache.jdbc.password=3Dsecret
-               </properties>
-               <async>false</async>
-               <!-- only one cache loader in the chain may set fetchPersis=
tentState to true.-->
-               <fetchPersistentState>false</fetchPersistentState>
-               <ignoreModifications>false</ignoreModifications>
-               <singletonStore>
-                  <enabled>false</enabled>
-                  <properties>
-                     pushStateWhenCoordinator=3Dtrue
-                     pushStateWhenCoordinatorTimeout=3D5000
-                  </properties>
-               </singletonStore>
-            </cacheloader>
-            =

-            <cacheloader>
-               <class>org.jboss.cache.loader.TcpDelegatingCacheLoader</cla=
ss>
-               <properties>
-                  host=3D127.0.0.1\nport=3D12121
-               </properties>
-               <async>false</async>
-               <!-- only one cache loader in the chain may set fetchPersis=
tentState to true.-->
-               <fetchPersistentState>false</fetchPersistentState>
-               <ignoreModifications>false</ignoreModifications>
-               <singletonStore>
-                  <enabled>false</enabled>
-                  <properties>
-                     pushStateWhenCoordinator=3Dtrue
-                     pushStateWhenCoordinatorTimeout=3D5000
-                  </properties>
-               </singletonStore>
-            </cacheloader>
-            =

-            <cacheloader>
-               <class>org.jboss.cache.loader.ClusteredCacheLoader</class>
-               <properties>
-                  timeout=3D500
-               </properties>
-               <async>false</async>
-               <!-- only one cache loader in the chain may set fetchPersis=
tentState to true.-->
-               <fetchPersistentState>false</fetchPersistentState>
-               <ignoreModifications>false</ignoreModifications>
-               <singletonStore>
-                  <enabled>false</enabled>
-                  <properties>
-                     pushStateWhenCoordinator=3Dtrue
-                     pushStateWhenCoordinatorTimeout=3D5000
-                  </properties>
-               </singletonStore>
-            </cacheloader>
-
-         </config>
-      </attribute>
-      =

-   </mbean>
-
-
-</server>

Added: core/trunk/src/main/resources/META-INF/eviction-enabled-cache-servic=
e.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/resources/META-INF/eviction-enabled-cache-service.x=
ml	                        (rev 0)
+++ core/trunk/src/main/resources/META-INF/eviction-enabled-cache-service.x=
ml	2008-01-25 12:50:24 UTC (rev 5239)
@@ -0,0 +1,233 @@
+<?xml version=3D"1.0" encoding=3D"UTF-8"?>
+
+<!-- =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D -->
+<!--                                                                      =
 -->
+<!--
+Sample JBoss Cache Service Configuration that hightlights various
+eviction configurations. By default LRUPolicy is enabled, by this can be
+changed by commenting it out and uncommenting another present
+eviction policy.
+-->
+<!--                                                                      =
 -->
+<!-- =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D -->
+
+<server>
+
+   <!-- =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D -->
+   <!-- Defines JBoss Cache configuration                                 =
     -->
+   <!-- =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D -->
+
+   <mbean code=3D"org.jboss.cache.jmx.CacheJmxWrapper"
+          name=3D"jboss.cache:service=3DCache">
+
+      <depends>jboss:service=3DNaming</depends>
+      <depends>jboss:service=3DTransactionManager</depends>
+
+      <!--
+          Configure the TransactionManager
+      -->
+      <attribute name=3D"TransactionManagerLookupClass">org.jboss.cache.tr=
ansaction.GenericTransactionManagerLookup
+      </attribute>
+
+
+      <!--
+          Node locking level : SERIALIZABLE
+                               REPEATABLE_READ (default)
+                               READ_COMMITTED
+                               READ_UNCOMMITTED
+                               NONE
+      -->
+      <attribute name=3D"IsolationLevel">REPEATABLE_READ</attribute>
+
+      <!--
+           Valid modes are LOCAL
+                           REPL_ASYNC
+                           REPL_SYNC
+                           INVALIDATION_ASYNC
+                           INVALIDATION_SYNC
+      -->
+      <attribute name=3D"CacheMode">LOCAL</attribute>
+
+      <!-- Max number of milliseconds to wait for a lock acquisition -->
+      <attribute name=3D"LockAcquisitionTimeout">15000</attribute>
+
+      <!-- Specific eviction policy configurations. This is LRU -->
+      <attribute name=3D"EvictionPolicyConfig">
+         <config>
+            <attribute name=3D"wakeUpIntervalSeconds">5</attribute>
+            <!-- This defaults to 200000 if not specified -->
+            <attribute name=3D"eventQueueSize">200000</attribute>
+            <attribute name=3D"policyClass">org.jboss.cache.eviction.LRUPo=
licy</attribute>
+
+            <!-- Cache wide default -->
+            <region name=3D"/_default_">
+               <attribute name=3D"maxNodes">5000</attribute>
+               <attribute name=3D"timeToLiveSeconds">1000</attribute>
+            </region>
+            <region name=3D"/org/jboss/data">
+               <attribute name=3D"maxNodes">5000</attribute>
+               <attribute name=3D"timeToLiveSeconds">1000</attribute>
+            </region>
+            <region name=3D"/org/jboss/test/data">
+               <attribute name=3D"maxNodes">5</attribute>
+               <attribute name=3D"timeToLiveSeconds">4</attribute>
+            </region>
+            <region name=3D"/test">
+               <attribute name=3D"maxNodes">10000</attribute>
+               <attribute name=3D"timeToLiveSeconds">4</attribute>
+            </region>
+            <region name=3D"/maxAgeTest">
+               <attribute name=3D"maxNodes">10000</attribute>
+               <attribute name=3D"timeToLiveSeconds">8</attribute>
+               <attribute name=3D"maxAgeSeconds">10</attribute>
+            </region>
+         </config>
+      </attribute>
+
+
+      <!--ElementSizePolicy eviction config-->
+      <!--<attribute name=3D"EvictionPolicyConfig">-->
+         <!--<config>-->
+            <!--<attribute name=3D"wakeUpIntervalSeconds">3</attribute>-->
+            <!-- This defaults to 200000 if not specified -->
+            <!--<attribute name=3D"eventQueueSize">200000</attribute>-->
+            <!-- Name of the DEFAULT eviction policy class. -->
+            <!--<attribute name=3D"policyClass">org.jboss.cache.eviction.E=
lementSizePolicy</attribute>-->
+
+            <!-- Cache wide default -->
+            <!--<region name=3D"/_default_">-->
+               <!--<attribute name=3D"maxNodes">5000</attribute>-->
+               <!--<attribute name=3D"maxElementsPerNode">100</attribute>-=
->
+            <!--</region>-->
+            <!--<region name=3D"/org/jboss/data">-->
+               <!--<attribute name=3D"maxNodes">10</attribute>-->
+               <!--<attribute name=3D"maxElementsPerNode">20</attribute>-->
+            <!--</region>-->
+            <!--<region name=3D"/org/jboss/test/data">-->
+               <!--<attribute name=3D"maxElementsPerNode">5</attribute>-->
+            <!--</region>-->
+            <!--<region name=3D"/test/">-->
+               <!--<attribute name=3D"maxNodes">5000</attribute>-->
+               <!--<attribute name=3D"maxElementsPerNode">1</attribute>-->
+            <!--</region>-->
+         <!--</config>-->
+      <!--</attribute>-->
+
+      <!-- ExpirationPolicy eviction policy configurations. -->
+      <!--<attribute name=3D"EvictionPolicyConfig">-->
+         <!--<config>-->
+            <!-- One second is a good default -->
+            <!--<attribute name=3D"wakeUpIntervalSeconds">1</attribute>-->
+            <!-- This defaults to 200000 if not specified -->
+            <!--<attribute name=3D"eventQueueSize">200000</attribute>-->
+            <!-- Name of the DEFAULT eviction policy class. -->
+            <!--<attribute name=3D"policyClass">org.jboss.cache.eviction.E=
xpirationPolicy</attribute>-->
+
+            <!-- Cache wide default -->
+            <!--<region name=3D"/_default_">-->
+            <!--</region>-->
+            <!--<region name=3D"/org/jboss/data">-->
+               <!-- Removes the soonest to expire nodes to reduce the regi=
on size to at most 250 nodes -->
+               <!--<attribute name=3D"maxNodes">250</attribute>-->
+            <!--</region>-->
+         <!--</config>-->
+      <!--</attribute>-->
+
+      <!-- Specific eviction policy configurations. This is FIFOPolicy -->
+      <!--<attribute name=3D"EvictionPolicyConfig">-->
+         <!--<config>-->
+            <!--<attribute name=3D"wakeUpIntervalSeconds">3</attribute>-->
+            <!-- This defaults to 200000 if not specified -->
+            <!--<attribute name=3D"eventQueueSize">200000</attribute>-->
+            <!-- Name of the DEFAULT eviction policy class. -->
+            <!--<attribute name=3D"policyClass">org.jboss.cache.eviction.F=
IFOPolicy</attribute>-->
+
+            <!-- Cache wide default -->
+            <!--<region name=3D"/_default_">-->
+               <!--<attribute name=3D"maxNodes">5000</attribute>-->
+            <!--</region>-->
+            <!--<region name=3D"/org/jboss/data">-->
+               <!--<attribute name=3D"maxNodes">5000</attribute>-->
+            <!--</region>-->
+            <!--<region name=3D"/org/jboss/test/data">-->
+               <!--<attribute name=3D"maxNodes">5</attribute>-->
+            <!--</region>-->
+            <!--<region name=3D"/test/">-->
+               <!--<attribute name=3D"maxNodes">10000</attribute>-->
+            <!--</region>-->
+         <!--</config>-->
+      <!--</attribute>-->
+
+      <!-- Specific eviction policy configurations. This is LFUPolicy -->
+      <!--<attribute name=3D"EvictionPolicyConfig">-->
+         <!--<config>-->
+            <!--<attribute name=3D"wakeUpIntervalSeconds">3</attribute>-->
+            <!-- This defaults to 200000 if not specified -->
+            <!--<attribute name=3D"eventQueueSize">200000</attribute>-->
+
+            <!-- Cache wide default -->
+            <!--<region name=3D"/_default_" policyClass=3D"org.jboss.cache=
.eviction.LFUPolicy">-->
+               <!--<attribute name=3D"maxNodes">5000</attribute>-->
+               <!--<attribute name=3D"minNodes">10</attribute>-->
+            <!--</region>-->
+            <!--<region name=3D"/org/jboss/data" policyClass=3D"org.jboss.=
cache.eviction.LFUPolicy">-->
+               <!--<attribute name=3D"maxNodes">5000</attribute>-->
+               <!--<attribute name=3D"minNodes">4000</attribute>-->
+            <!--</region>-->
+            <!--<region name=3D"/org/jboss/test/data" policyClass=3D"org.j=
boss.cache.eviction.LFUPolicy">-->
+               <!--<attribute name=3D"minNodes">5</attribute>-->
+            <!--</region>-->
+         <!--</config>-->
+      <!--</attribute>-->
+
+      <!-- Specific eviction policy configurations. This is MRUPolicy -->
+      <!--<attribute name=3D"EvictionPolicyConfig">-->
+         <!--<config>-->
+            <!--<attribute name=3D"wakeUpIntervalSeconds">3</attribute>-->
+            <!-- This defaults to 200000 if not specified -->
+            <!--<attribute name=3D"eventQueueSize">200000</attribute>-->
+            <!-- Name of the DEFAULT eviction policy class. -->
+            <!--<attribute name=3D"policyClass">org.jboss.cache.eviction.M=
RUPolicy</attribute>-->
+
+
+            <!-- Cache wide default -->
+            <!--<region name=3D"/_default_">-->
+               <!--<attribute name=3D"maxNodes">100</attribute>-->
+            <!--</region>-->
+            <!--<region name=3D"/org/jboss/data">-->
+               <!--<attribute name=3D"maxNodes">250</attribute>-->
+            <!--</region>-->
+            <!--<region name=3D"/org/jboss/test/data">-->
+               <!--<attribute name=3D"maxNodes">6</attribute>-->
+            <!--</region>-->
+         <!--</config>-->
+      <!--</attribute>-->
+
+      <!-- Specific eviction policy configurations. This is LRU -->
+      <!--<attribute name=3D"EvictionPolicyConfig">-->
+         <!--<config>-->
+            <!--<attribute name=3D"wakeUpIntervalSeconds">1</attribute>-->
+            <!-- This defaults to 200000 if not specified -->
+            <!--<attribute name=3D"eventQueueSize">200000</attribute>-->
+            <!--<attribute name=3D"policyClass">org.jboss.cache.eviction.N=
ullEvictionPolicy</attribute>-->
+
+            <!-- Cache wide default -->
+            <!--<region name=3D"/_default_">-->
+               <!--<attribute name=3D"maxNodes">5000</attribute>-->
+               <!--<attribute name=3D"timeToLiveSeconds">1</attribute>-->
+            <!--</region>-->
+            <!--<region name=3D"/test" policyClass=3D"org.jboss.cache.evic=
tion.NullEvictionPolicy">-->
+               <!--<attribute name=3D"maxNodes">10000</attribute>-->
+               <!--<attribute name=3D"timeToLiveSeconds">1</attribute>-->
+            <!--</region>-->
+            <!--<region name=3D"/lru" policyClass=3D"org.jboss.cache.evict=
ion.LRUPolicy">-->
+               <!--<attribute name=3D"maxNodes">10000</attribute>-->
+               <!--<attribute name=3D"timeToLiveSeconds">1</attribute>-->
+            <!--</region>-->
+         <!--</config>-->
+      <!--</attribute>-->      =

+
+   </mbean>
+
+
+</server>

Deleted: core/trunk/src/main/resources/META-INF/hibernate-recommended-confi=
g.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/resources/META-INF/hibernate-recommended-config.xml=
	2008-01-25 12:47:36 UTC (rev 5238)
+++ core/trunk/src/main/resources/META-INF/hibernate-recommended-config.xml=
	2008-01-25 12:50:24 UTC (rev 5239)
@@ -1,177 +0,0 @@
-<?xml version=3D"1.0" encoding=3D"UTF-8"?>
-
-<!-- =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D -->
-<!--                                                                      =
 -->
-<!--  Sample TreeCache Service Configuration                              =
 -->
-<!--  Recommended for use as Hibernate's 2nd Level Cache                  =
 -->
-<!--  For use with JBossCache >=3D 1.3.0 ONLY!!!                          =
   -->
-<!--                                                                      =
 -->
-<!-- =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D -->
-
-<server>
-
-   <!-- =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D -->
-   <!-- Defines TreeCache configuration                                   =
   -->
-   <!-- =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D -->
-
-   <mbean code=3D"org.jboss.cache.jmx.CacheJmxWrapper"
-          name=3D"jboss.cache:service=3DTreeCache">
-
-      <depends>jboss:service=3DNaming</depends>
-      <depends>jboss:service=3DTransactionManager</depends>
-
-      <!--
-          Configure the TransactionManager
-      -->
-      <attribute name=3D"TransactionManagerLookupClass">org.jboss.cache.tr=
ansaction.GenericTransactionManagerLookup
-      </attribute>
-
-
-      <!--
-          Node locking scheme:
-              OPTIMISTIC
-              PESSIMISTIC (default)
-      -->
-      <attribute name=3D"NodeLockingScheme">OPTIMISTIC</attribute>
-
-      <!--
-          Note that this attribute is IGNORED if your NodeLockingScheme ab=
ove is OPTIMISTIC.
-
-          Isolation level : SERIALIZABLE
-                            REPEATABLE_READ (default)
-                            READ_COMMITTED
-                            READ_UNCOMMITTED
-                            NONE
-      -->
-      <attribute name=3D"IsolationLevel">REPEATABLE_READ</attribute>
-
-      <!--
-           Valid modes are LOCAL
-                           REPL_ASYNC
-                           REPL_SYNC
-                           INVALIDATION_ASYNC
-                           INVALIDATION_SYNC
-      -->
-      <!-- This should ideally be set to INVALIDATION_ASYNC but due to JBC=
ACHE-806 this has to be REPL_ASYNC for now -->
-      <attribute name=3D"CacheMode">REPL_ASYNC</attribute>
-
-      <!--
-      Just used for async repl: use a replication queue
-      -->
-      <attribute name=3D"UseReplQueue">false</attribute>
-
-      <!--
-          Replication interval for replication queue (in ms)
-      -->
-      <attribute name=3D"ReplQueueInterval">0</attribute>
-
-      <!--
-          Max number of elements which trigger replication
-      -->
-      <attribute name=3D"ReplQueueMaxElements">0</attribute>
-
-      <!-- Name of cluster. Needs to be the same for all TreeCache nodes i=
n a
-           cluster in order to find each other.
-      -->
-      <attribute name=3D"ClusterName">JBossCache-Cluster</attribute>
-
-      <!--Uncomment next three statements to enable JGroups multiplexer.
-This configuration is dependent on the JGroups multiplexer being
-registered in an MBean server such as JBossAS.  -->
-      <!--
-      <depends>jgroups.mux:name=3DMultiplexer</depends>
-      <attribute name=3D"MultiplexerService">jgroups.mux:name=3DMultiplexe=
r</attribute>
-      <attribute name=3D"MultiplexerStack">fc-fast-minimalthreads</attribu=
te>
-      -->
-
-      <!-- JGroups protocol stack properties.
-         ClusterConfig isn't used if the multiplexer is enabled and succes=
sfully initialized.
-      -->
-
-      <attribute name=3D"ClusterConfig">
-         <config>
-            <TCP recv_buf_size=3D"20000000" use_send_queues=3D"false"
-                 loopback=3D"false"
-                 discard_incompatible_packets=3D"true"
-                 max_bundle_size=3D"64000"
-                 max_bundle_timeout=3D"30"
-                 use_incoming_packet_handler=3D"true"
-                 enable_bundling=3D"true"
-                 enable_unicast_bundling=3D"true"
-                 enable_diagnostics=3D"true"
-
-                 use_concurrent_stack=3D"true"
-
-                 thread_naming_pattern=3D"pl"
-
-                 thread_pool.enabled=3D"true"
-                 thread_pool.min_threads=3D"1"
-                 thread_pool.max_threads=3D"4"
-                 thread_pool.keep_alive_time=3D"30000"
-                 thread_pool.queue_enabled=3D"true"
-                 thread_pool.queue_max_size=3D"50000"
-                 thread_pool.rejection_policy=3D"discard"
-
-                 oob_thread_pool.enabled=3D"true"
-                 oob_thread_pool.min_threads=3D"2"
-                 oob_thread_pool.max_threads=3D"4"
-                 oob_thread_pool.keep_alive_time=3D"10000"
-                 oob_thread_pool.queue_enabled=3D"false"
-                 oob_thread_pool.queue_max_size=3D"10"
-                 oob_thread_pool.rejection_policy=3D"Run"/>
-
-            <!--<PING timeout=3D"2000" num_initial_members=3D"3"/>-->
-             <MPING mcast_addr=3D"232.1.2.3" timeout=3D"2000" num_initial_=
members=3D"3"/>
-            <MERGE2 max_interval=3D"30000" min_interval=3D"10000"/>
-            <FD_SOCK/>
-            <FD timeout=3D"10000" max_tries=3D"5" shun=3D"true"/>
-            <VERIFY_SUSPECT timeout=3D"1500"/>
-            <pbcast.NAKACK use_mcast_xmit=3D"false" gc_lag=3D"0"
-                           retransmit_timeout=3D"300,600,1200,2400,4800"
-                           discard_delivered_msgs=3D"true"/>
-            <!--<UNICAST timeout=3D"30,60,120,300,600,1200,2400,3600"/>-->
-            <pbcast.STABLE stability_delay=3D"1000" desired_avg_gossip=3D"=
50000"
-                           max_bytes=3D"400000"/>
-            <pbcast.GMS print_local_addr=3D"true" join_timeout=3D"5000"
-                        join_retry_timeout=3D"2000" shun=3D"false"
-                        view_bundling=3D"true" view_ack_collection_timeout=
=3D"5000"/>
-              <FC max_credits=3D"5000000"
-                    min_threshold=3D"0.20"/>
-            <FRAG2 frag_size=3D"60000"/>
-            <pbcast.STREAMING_STATE_TRANSFER use_reading_thread=3D"true"/>
-            <!-- <pbcast.STATE_TRANSFER/> -->
-            <pbcast.FLUSH timeout=3D"0"/>
-         </config>
-      </attribute>
-
-
-      <!--
-       Whether or not to fetch state on joining a cluster
-       NOTE this used to be called FetchStateOnStartup and has been rename=
d to be more descriptive.
-      -->
-      <attribute name=3D"FetchInMemoryState">false</attribute>
-
-      <!--
-          Number of milliseconds to wait until all responses for a
-          synchronous call have been received.
-      -->
-      <attribute name=3D"SyncReplTimeout">20000</attribute>
-
-      <!-- Max number of milliseconds to wait for a lock acquisition -->
-      <attribute name=3D"LockAcquisitionTimeout">15000</attribute>
-
-      <!--
-          The max amount of time (in milliseconds) we wait until the
-          state (ie. the contents of the cache) are retrieved from
-          existing members in a clustered environment
-      -->
-      <attribute name=3D"StateRetrievalTimeout">20000</attribute>
-
-      <!--
-         Indicate whether to use region based marshalling or not. Set this=
 to true if you are running under a scoped
-         class loader, e.g., inside an application server. Default is "fal=
se".
-      -->
-      <attribute name=3D"UseRegionBasedMarshalling">false</attribute>
-
-   </mbean>
-</server>

Deleted: core/trunk/src/main/resources/META-INF/jdbcCacheLoader-service.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/resources/META-INF/jdbcCacheLoader-service.xml	2008=
-01-25 12:47:36 UTC (rev 5238)
+++ core/trunk/src/main/resources/META-INF/jdbcCacheLoader-service.xml	2008=
-01-25 12:50:24 UTC (rev 5239)
@@ -1,210 +0,0 @@
-<?xml version=3D"1.0" encoding=3D"UTF-8"?>
-
-<!-- =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D -->
-<!--                                                                      =
 -->
-<!--  Sample TreeCache Service Configuration                              =
 -->
-<!--                                                                      =
 -->
-<!-- =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D -->
-
-<server>
-
-   <classpath codebase=3D"./lib" archives=3D"jboss-cache.jar, jgroups.jar"=
/>
-
-
-   <!-- =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D -->
-   <!-- Defines TreeCache configuration                                   =
   -->
-   <!-- =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D -->
-
-   <mbean code=3D"org.jboss.cache.jmx.CacheJmxWrapper"
-          name=3D"jboss.cache:service=3DTreeCache">
-
-      <depends>jboss:service=3DNaming</depends>
-      <depends>jboss:service=3DTransactionManager</depends>
-
-
-      <!--
-          Configure the TransactionManager
-      -->
-      <attribute name=3D"TransactionManagerLookupClass">org.jboss.cache.tr=
ansaction.GenericTransactionManagerLookup
-      </attribute>
-
-
-      <!--
-          DataNode locking level : SERIALIZABLE
-                               REPEATABLE_READ (default)
-                               READ_COMMITTED
-                               READ_UNCOMMITTED
-                               NONE
-      -->
-      <attribute name=3D"IsolationLevel">REPEATABLE_READ</attribute>
-
-      <!--
-           Valid modes are LOCAL
-                           REPL_ASYNC
-                           REPL_SYNC
-                           INVALIDATION_ASYNC
-                           INVALIDATION_SYNC
-      -->
-      <attribute name=3D"CacheMode">LOCAL</attribute>
-
-
-      <!--
-      Just used for async repl: use a replication queue
-      -->
-      <attribute name=3D"UseReplQueue">false</attribute>
-
-      <!--
-      Replication interval for replication queue (in ms)
-      -->
-      <attribute name=3D"ReplQueueInterval">60000</attribute>
-
-      <!--
-      Max number of elements which trigger replication
-      -->
-      <attribute name=3D"ReplQueueMaxElements">100</attribute>
-
-
-      <!-- Name of cluster. Needs to be the same for all clusters, in order
-           to find each other
-      -->
-      <attribute name=3D"ClusterName">JBossCache-Cluster</attribute>
-
-      <!-- JGroups protocol stack properties. Can also be a URL,
-           e.g. file:/home/bela/default.xml
-         <attribute name=3D"ClusterProperties"></attribute>
-      -->
-
-      <attribute name=3D"ClusterConfig">
-         <config>
-            <TCP recv_buf_size=3D"20000000" use_send_queues=3D"false"
-                 loopback=3D"false"
-                 discard_incompatible_packets=3D"true"
-                 max_bundle_size=3D"64000"
-                 max_bundle_timeout=3D"30"
-                 use_incoming_packet_handler=3D"true"
-                 enable_bundling=3D"true"
-                 enable_unicast_bundling=3D"true"
-                 enable_diagnostics=3D"true"
-
-                 use_concurrent_stack=3D"true"
-
-                 thread_naming_pattern=3D"pl"
-
-                 thread_pool.enabled=3D"true"
-                 thread_pool.min_threads=3D"1"
-                 thread_pool.max_threads=3D"4"
-                 thread_pool.keep_alive_time=3D"30000"
-                 thread_pool.queue_enabled=3D"true"
-                 thread_pool.queue_max_size=3D"50000"
-                 thread_pool.rejection_policy=3D"discard"
-
-                 oob_thread_pool.enabled=3D"true"
-                 oob_thread_pool.min_threads=3D"2"
-                 oob_thread_pool.max_threads=3D"4"
-                 oob_thread_pool.keep_alive_time=3D"10000"
-                 oob_thread_pool.queue_enabled=3D"false"
-                 oob_thread_pool.queue_max_size=3D"10"
-                 oob_thread_pool.rejection_policy=3D"Run"/>
-
-            <!--<PING timeout=3D"2000" num_initial_members=3D"3"/>-->
-             <MPING mcast_addr=3D"232.1.2.3" timeout=3D"2000" num_initial_=
members=3D"3"/>
-            <MERGE2 max_interval=3D"30000" min_interval=3D"10000"/>
-            <FD_SOCK/>
-            <FD timeout=3D"10000" max_tries=3D"5" shun=3D"true"/>
-            <VERIFY_SUSPECT timeout=3D"1500"/>
-            <pbcast.NAKACK use_mcast_xmit=3D"false" gc_lag=3D"0"
-                           retransmit_timeout=3D"300,600,1200,2400,4800"
-                           discard_delivered_msgs=3D"true"/>
-            <!--<UNICAST timeout=3D"30,60,120,300,600,1200,2400,3600"/>-->
-            <pbcast.STABLE stability_delay=3D"1000" desired_avg_gossip=3D"=
50000"
-                           max_bytes=3D"400000"/>
-            <pbcast.GMS print_local_addr=3D"true" join_timeout=3D"5000"
-                        join_retry_timeout=3D"2000" shun=3D"false"
-                        view_bundling=3D"true" view_ack_collection_timeout=
=3D"5000"/>
-              <FC max_credits=3D"5000000"
-                    min_threshold=3D"0.20"/>
-            <FRAG2 frag_size=3D"60000"/>
-            <pbcast.STREAMING_STATE_TRANSFER use_reading_thread=3D"true"/>
-            <!-- <pbcast.STATE_TRANSFER/> -->
-            <pbcast.FLUSH timeout=3D"0"/>
-         </config>
-      </attribute>
-
-
-
-      <!--
-          The max amount of time (in milliseconds) we wait until the
-          state (ie. the contents of the cache) are retrieved from
-          existing members in a clustered environment
-      -->
-      <attribute name=3D"StateRetrievalTimeout">15000</attribute>
-
-      <!--
-          Number of milliseconds to wait until all responses for a
-          synchronous call have been received.
-      -->
-      <attribute name=3D"SyncReplTimeout">15000</attribute>
-
-      <!-- Max number of milliseconds to wait for a lock acquisition -->
-      <attribute name=3D"LockAcquisitionTimeout">10000</attribute>
-
-
-      <!-- Cache Passivation for Tree Cache
-On pasivation, The objects are written to the backend store on eviction if=
 CacheLoaderPassivation
-is true, otheriwse the objects are persisted.
-On activation, the objects are restored in the memory cache and removed fr=
om the cache loader
-if CacheLoaderPassivation is true, otherwise the objects are only loaded f=
rom the cache loader -->
-
-      <attribute name=3D"CacheLoaderConfiguration">
-         <config>
-            <!-- if passivation is true, only the first cache loader is us=
ed; the rest are ignored -->
-            <passivation>false</passivation>
-            <preload>/</preload>
-            <shared>false</shared>
-
-            <!-- we can now have multiple cache loaders, which get chained=
 -->
-            <cacheloader>
-               <class>org.jboss.cache.loader.JDBCCacheLoader</class>
-               <!-- same as the old CacheLoaderConfig attribute -->
-               <properties>
-                  cache.jdbc.table.name=3Djbosscache
-                  cache.jdbc.table.create=3Dtrue
-                  cache.jdbc.table.drop=3Dtrue
-                  cache.jdbc.table.primarykey=3Djbosscache_pk
-                  cache.jdbc.fqn.column=3Dfqn
-                  cache.jdbc.fqn.type=3Dvarchar(255)
-                  cache.jdbc.node.column=3Dnode
-                  cache.jdbc.node.type=3Dblob
-                  cache.jdbc.parent.column=3Dparent
-                  cache.jdbc.driver=3Dcom.mysql.jdbc.Driver
-                  cache.jdbc.url=3Djdbc:mysql://localhost:3306/jbossdb
-                  cache.jdbc.user=3Droot
-                  cache.jdbc.password=3D
-                  cache.jdbc.sql-concat=3Dconcat(1,2)
-               </properties>
-               <!-- whether the cache loader writes are asynchronous -->
-               <async>false</async>
-               <!-- only one cache loader in the chain may set fetchPersis=
tentState to true.
- An exception is thrown if more than one cache loader sets this to true. -=
->
-               <fetchPersistentState>true</fetchPersistentState>
-               <!-- determines whether this cache loader ignores writes - =
defaults to false. -->
-               <ignoreModifications>false</ignoreModifications>
-               <!-- if set to true, purges the contents of this cache load=
er when the cache starts up.
-           Defaults to false.  -->
-               <purgeOnStartup>false</purgeOnStartup>
-            </cacheloader>
-
-         </config>
-      </attribute>
-
-   </mbean>
-
-
-   <!--  Uncomment to get a graphical view of the TreeCache MBean above -->
-   <!--   <mbean code=3D"org.jboss.cache.TreeCacheView" name=3D"jboss.cach=
e:service=3DTreeCacheView">-->
-   <!--      <depends>jboss.cache:service=3DTreeCache</depends>-->
-   <!--      <attribute name=3D"CacheService">jboss.cache:service=3DTreeCa=
che</attribute>-->
-   <!--   </mbean>-->
-
-
-</server>

Added: core/trunk/src/main/resources/META-INF/local-cache-service.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/resources/META-INF/local-cache-service.xml	        =
                (rev 0)
+++ core/trunk/src/main/resources/META-INF/local-cache-service.xml	2008-01-=
25 12:50:24 UTC (rev 5239)
@@ -0,0 +1,49 @@
+<?xml version=3D"1.0" encoding=3D"UTF-8"?>
+
+<!-- =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D -->
+<!--                                                                      =
 -->
+<!--  Sample TreeCache Service Configuration                              =
 -->
+<!--                                                                      =
 -->
+<!-- =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D -->
+
+<server>
+
+   <!-- =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D -->
+   <!-- Defines TreeCache configuration                                   =
   -->
+   <!-- =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D -->
+
+   <mbean code=3D"org.jboss.cache.jmx.CacheJmxWrapper"
+          name=3D"jboss.cache:service=3DTreeCache">
+
+      <depends>jboss:service=3DNaming</depends>
+      <depends>jboss:service=3DTransactionManager</depends>
+
+
+      <!-- Configure the TransactionManager -->
+      <attribute name=3D"TransactionManagerLookupClass">org.jboss.cache.tr=
ansaction.GenericTransactionManagerLookup
+      </attribute>
+
+
+      <!--
+          Node locking level : SERIALIZABLE
+                               REPEATABLE_READ (default)
+                               READ_COMMITTED
+                               READ_UNCOMMITTED
+                               NONE
+      -->
+      <attribute name=3D"IsolationLevel">REPEATABLE_READ</attribute>
+
+      <!--
+           Valid modes are LOCAL
+                           REPL_ASYNC
+                           REPL_SYNC
+                           INVALIDATION_ASYNC
+                           INVALIDATION_SYNC
+      -->
+      <attribute name=3D"CacheMode">LOCAL</attribute>
+
+      <!-- Max number of milliseconds to wait for a lock acquisition -->
+      <attribute name=3D"LockAcquisitionTimeout">15000</attribute>
+
+   </mbean>
+</server>

Deleted: core/trunk/src/main/resources/META-INF/local-elementsize-eviction-=
service.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/resources/META-INF/local-elementsize-eviction-servi=
ce.xml	2008-01-25 12:47:36 UTC (rev 5238)
+++ core/trunk/src/main/resources/META-INF/local-elementsize-eviction-servi=
ce.xml	2008-01-25 12:50:24 UTC (rev 5239)
@@ -1,78 +0,0 @@
-<?xml version=3D"1.0" encoding=3D"UTF-8"?>
-
-<!-- =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D -->
-<!--                                                                      =
 -->
-<!--  Sample TreeCache Service Configuration                              =
 -->
-<!--                                                                      =
 -->
-<!-- =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D -->
-
-<server>
-
-   <!-- =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D -->
-   <!-- Defines TreeCache configuration                                   =
   -->
-   <!-- =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D -->
-
-   <mbean code=3D"org.jboss.cache.jmx.CacheJmxWrapper"
-          name=3D"jboss.cache:service=3DTreeCache">
-
-      <depends>jboss:service=3DNaming</depends>
-      <depends>jboss:service=3DTransactionManager</depends>
-
-      <!--
-          Configure the TransactionManager
-      -->
-      <attribute name=3D"TransactionManagerLookupClass">org.jboss.cache.tr=
ansaction.GenericTransactionManagerLookup
-      </attribute>
-
-
-      <!--
-          Node locking level : SERIALIZABLE
-                               REPEATABLE_READ (default)
-                               READ_COMMITTED
-                               READ_UNCOMMITTED
-                               NONE
-      -->
-      <attribute name=3D"IsolationLevel">REPEATABLE_READ</attribute>
-
-      <!--
-           Valid modes are LOCAL
-                           REPL_ASYNC
-                           REPL_SYNC
-      -->
-      <attribute name=3D"CacheMode">LOCAL</attribute>
-
-      <!-- Max number of milliseconds to wait for a lock acquisition -->
-      <attribute name=3D"LockAcquisitionTimeout">15000</attribute>
-
-
-      <!-- Specific eviction policy configurations. This is LRU -->
-      <attribute name=3D"EvictionPolicyConfig">
-         <config>
-            <attribute name=3D"wakeUpIntervalSeconds">3</attribute>
-            <!-- This defaults to 200000 if not specified -->
-            <attribute name=3D"eventQueueSize">200000</attribute>
-            <!-- Name of the DEFAULT eviction policy class. -->
-            <attribute name=3D"policyClass">org.jboss.cache.eviction.Eleme=
ntSizePolicy</attribute>
-
-            <!-- Cache wide default -->
-            <region name=3D"/_default_">
-               <attribute name=3D"maxNodes">5000</attribute>
-               <attribute name=3D"maxElementsPerNode">100</attribute>
-            </region>
-            <region name=3D"/org/jboss/data">
-               <attribute name=3D"maxNodes">10</attribute>
-               <attribute name=3D"maxElementsPerNode">20</attribute>
-            </region>
-            <region name=3D"/org/jboss/test/data">
-               <attribute name=3D"maxElementsPerNode">5</attribute>
-            </region>
-            <region name=3D"/test/">
-               <attribute name=3D"maxNodes">5000</attribute>
-               <attribute name=3D"maxElementsPerNode">1</attribute>
-            </region>
-         </config>
-      </attribute>
-   </mbean>
-
-
-</server>

Deleted: core/trunk/src/main/resources/META-INF/local-eviction-cacheloader-=
service.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/resources/META-INF/local-eviction-cacheloader-servi=
ce.xml	2008-01-25 12:47:36 UTC (rev 5238)
+++ core/trunk/src/main/resources/META-INF/local-eviction-cacheloader-servi=
ce.xml	2008-01-25 12:50:24 UTC (rev 5239)
@@ -1,109 +0,0 @@
-<?xml version=3D"1.0" encoding=3D"UTF-8"?>
-
-<!-- =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D -->
-<!--                                                                      =
 -->
-<!--  Sample TreeCache Service Configuration                              =
 -->
-<!--                                                                      =
 -->
-<!-- =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D -->
-
-<server>
-
-   <!-- =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D -->
-   <!-- Defines TreeCache configuration                                   =
   -->
-   <!-- =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D -->
-
-   <mbean code=3D"org.jboss.cache.jmx.CacheJmxWrapper"
-          name=3D"jboss.cache:service=3DTreeCache">
-
-      <depends>jboss:service=3DNaming</depends>
-      <depends>jboss:service=3DTransactionManager</depends>
-
-      <!--
-          Configure the TransactionManager
-      -->
-      <attribute name=3D"TransactionManagerLookupClass">org.jboss.cache.tr=
ansaction.GenericTransactionManagerLookup
-      </attribute>
-
-
-      <!--
-          Node locking level : SERIALIZABLE
-                               REPEATABLE_READ (default)
-                               READ_COMMITTED
-                               READ_UNCOMMITTED
-                               NONE
-      -->
-      <attribute name=3D"IsolationLevel">REPEATABLE_READ</attribute>
-
-      <!--
-           Valid modes are LOCAL
-                           REPL_ASYNC
-                           REPL_SYNC
-      -->
-      <attribute name=3D"CacheMode">LOCAL</attribute>
-
-      <!-- Max number of milliseconds to wait for a lock acquisition -->
-      <attribute name=3D"LockAcquisitionTimeout">15000</attribute>
-
-
-      <!-- Specific eviction policy configurations. This is LRU -->
-      <attribute name=3D"EvictionPolicyConfig">
-         <config>
-            <attribute name=3D"wakeUpIntervalSeconds">5</attribute>
-            <!-- Name of the DEFAULT eviction policy class. -->
-            <attribute name=3D"policyClass">org.jboss.cache.eviction.LRUPo=
licy</attribute>
-
-            <!-- Cache wide default -->
-            <region name=3D"/_default_">
-               <attribute name=3D"maxNodes">5000</attribute>
-               <attribute name=3D"timeToLiveSeconds">1000</attribute>
-            </region>
-            <region name=3D"/org/jboss/data">
-               <attribute name=3D"maxNodes">5000</attribute>
-               <attribute name=3D"timeToLiveSeconds">1000</attribute>
-            </region>
-            <region name=3D"/org/jboss/test/data">
-               <attribute name=3D"maxNodes">5</attribute>
-               <attribute name=3D"timeToLiveSeconds">4</attribute>
-            </region>
-            <region name=3D"/test">
-               <attribute name=3D"maxNodes">10000</attribute>
-               <attribute name=3D"timeToLiveSeconds">4</attribute>
-            </region>
-            <region name=3D"/maxAgeTest">
-               <attribute name=3D"maxNodes">10000</attribute>
-               <attribute name=3D"timeToLiveSeconds">8</attribute>
-               <attribute name=3D"maxAgeSeconds">10</attribute>
-            </region>
-         </config>
-      </attribute>
-
-      <!-- New 1.3.x cache loader config block -->
-      <attribute name=3D"CacheLoaderConfig">
-         <config>
-            <!-- if passivation is true, only the first cache loader is us=
ed; the rest are ignored -->
-            <passivation>false</passivation>
-            <preload>/</preload>
-            <shared>false</shared>
-
-            <!-- we can now have multiple cache loaders, which get chained=
 -->
-            <cacheloader>
-               <class>org.jboss.cache.loader.FileCacheLoader</class>
-               <!-- same as the old CacheLoaderConfig attribute -->
-               <properties>
-                  location=3D/tmp/JBossCacheFileCacheLoader
-               </properties>
-               <!-- whether the cache loader writes are asynchronous -->
-               <async>false</async>
-               <!-- only one cache loader in the chain may set fetchPersis=
tentState to true.
- An exception is thrown if more than one cache loader sets this to true. -=
->
-               <fetchPersistentState>true</fetchPersistentState>
-               <!-- determines whether this cache loader ignores writes - =
defaults to false. -->
-               <ignoreModifications>false</ignoreModifications>
-            </cacheloader>
-
-         </config>
-      </attribute>
-   </mbean>
-
-
-</server>

Deleted: core/trunk/src/main/resources/META-INF/local-expiration-eviction-s=
ervice.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/resources/META-INF/local-expiration-eviction-servic=
e.xml	2008-01-25 12:47:36 UTC (rev 5238)
+++ core/trunk/src/main/resources/META-INF/local-expiration-eviction-servic=
e.xml	2008-01-25 12:50:24 UTC (rev 5239)
@@ -1,73 +0,0 @@
-<?xml version=3D"1.0" encoding=3D"UTF-8"?>
-
-<!-- =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D -->
-<!--                                                                      =
 -->
-<!--  Sample TreeCache Service Configuration                              =
 -->
-<!--                                                                      =
 -->
-<!-- =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D -->
-
-<server>
-
-   <!-- =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D -->
-   <!-- Defines TreeCache configuration                                   =
   -->
-   <!-- =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D -->
-
-   <mbean code=3D"org.jboss.cache.jmx.CacheJmxWrapper"
-          name=3D"jboss.cache:service=3DTreeCache">
-
-      <depends>jboss:service=3DNaming</depends>
-      <depends>jboss:service=3DTransactionManager</depends>
-
-      <!--
-          Configure the TransactionManager
-      -->
-      <attribute name=3D"TransactionManagerLookupClass">org.jboss.cache.tr=
ansaction.GenericTransactionManagerLookup
-      </attribute>
-
-
-      <!--
-          Node locking level : SERIALIZABLE
-                               REPEATABLE_READ (default)
-                               READ_COMMITTED
-                               READ_UNCOMMITTED
-                               NONE
-      -->
-      <attribute name=3D"IsolationLevel">REPEATABLE_READ</attribute>
-
-      <!--
-           Valid modes are LOCAL
-                           REPL_ASYNC
-                           REPL_SYNC
-      -->
-      <attribute name=3D"CacheMode">LOCAL</attribute>
-
-      <!-- Max number of milliseconds to wait for a lock acquisition -->
-      <attribute name=3D"LockAcquisitionTimeout">15000</attribute>
-
-      <!-- Specific eviction policy configurations. -->
-      <attribute name=3D"EvictionPolicyConfig">
-         <config>
-            <!-- One second is a good default -->
-            <attribute name=3D"wakeUpIntervalSeconds">1</attribute>
-            <!-- This defaults to 200000 if not specified -->
-            <attribute name=3D"eventQueueSize">200000</attribute>
-            <!-- Name of the DEFAULT eviction policy class. -->
-            <attribute name=3D"policyClass">org.jboss.cache.eviction.Expir=
ationPolicy</attribute>
-
-            <!-- Cache wide default -->
-            <region name=3D"/_default_">
-               <!-- This defaults to "expiration" if not specified -->
-               <!--
-               <attribute name=3D"expirationKeyName">expiration</attribute>
-               -->
-            </region>
-            <region name=3D"/org/jboss/data">
-               <!-- Removes the soonest to expire nodes to reduce the regi=
on size to at most 250 nodes -->
-               <attribute name=3D"maxNodes">250</attribute>
-            </region>
-         </config>
-      </attribute>
-   </mbean>
-
-
-</server>

Deleted: core/trunk/src/main/resources/META-INF/local-fifo-eviction-service=
.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/resources/META-INF/local-fifo-eviction-service.xml	=
2008-01-25 12:47:36 UTC (rev 5238)
+++ core/trunk/src/main/resources/META-INF/local-fifo-eviction-service.xml	=
2008-01-25 12:50:24 UTC (rev 5239)
@@ -1,74 +0,0 @@
-<?xml version=3D"1.0" encoding=3D"UTF-8"?>
-
-<!-- =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D -->
-<!--                                                                      =
 -->
-<!--  Sample TreeCache Service Configuration                              =
 -->
-<!--                                                                      =
 -->
-<!-- =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D -->
-
-<server>
-
-   <!-- =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D -->
-   <!-- Defines TreeCache configuration                                   =
   -->
-   <!-- =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D -->
-
-   <mbean code=3D"org.jboss.cache.jmx.CacheJmxWrapper"
-          name=3D"jboss.cache:service=3DTreeCache">
-
-      <depends>jboss:service=3DNaming</depends>
-      <depends>jboss:service=3DTransactionManager</depends>
-
-      <!--
-          Configure the TransactionManager
-      -->
-      <attribute name=3D"TransactionManagerLookupClass">org.jboss.cache.tr=
ansaction.GenericTransactionManagerLookup
-      </attribute>
-
-
-      <!--
-          Node locking level : SERIALIZABLE
-                               REPEATABLE_READ (default)
-                               READ_COMMITTED
-                               READ_UNCOMMITTED
-                               NONE
-      -->
-      <attribute name=3D"IsolationLevel">REPEATABLE_READ</attribute>
-
-      <!--
-           Valid modes are LOCAL
-                           REPL_ASYNC
-                           REPL_SYNC
-      -->
-      <attribute name=3D"CacheMode">LOCAL</attribute>
-
-      <!-- Max number of milliseconds to wait for a lock acquisition -->
-      <attribute name=3D"LockAcquisitionTimeout">15000</attribute>
-
-      <!-- Specific eviction policy configurations. This is LRU -->
-      <attribute name=3D"EvictionPolicyConfig">
-         <config>
-            <attribute name=3D"wakeUpIntervalSeconds">3</attribute>
-            <!-- This defaults to 200000 if not specified -->
-            <attribute name=3D"eventQueueSize">200000</attribute>
-            <!-- Name of the DEFAULT eviction policy class. -->
-            <attribute name=3D"policyClass">org.jboss.cache.eviction.FIFOP=
olicy</attribute>
-
-            <!-- Cache wide default -->
-            <region name=3D"/_default_">
-               <attribute name=3D"maxNodes">5000</attribute>
-            </region>
-            <region name=3D"/org/jboss/data">
-               <attribute name=3D"maxNodes">5000</attribute>
-            </region>
-            <region name=3D"/org/jboss/test/data">
-               <attribute name=3D"maxNodes">5</attribute>
-            </region>
-            <region name=3D"/test/">
-               <attribute name=3D"maxNodes">10000</attribute>
-            </region>
-         </config>
-      </attribute>
-   </mbean>
-
-
-</server>

Deleted: core/trunk/src/main/resources/META-INF/local-lfu-eviction-service.=
xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/resources/META-INF/local-lfu-eviction-service.xml	2=
008-01-25 12:47:36 UTC (rev 5238)
+++ core/trunk/src/main/resources/META-INF/local-lfu-eviction-service.xml	2=
008-01-25 12:50:24 UTC (rev 5239)
@@ -1,72 +0,0 @@
-<?xml version=3D"1.0" encoding=3D"UTF-8"?>
-
-<!-- =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D -->
-<!--                                                                      =
 -->
-<!--  Sample TreeCache Service Configuration                              =
 -->
-<!--                                                                      =
 -->
-<!-- =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D -->
-
-<server>
-
-   <!-- =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D -->
-   <!-- Defines TreeCache configuration                                   =
   -->
-   <!-- =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D -->
-
-   <mbean code=3D"org.jboss.cache.jmx.CacheJmxWrapper"
-          name=3D"jboss.cache:service=3DTreeCache">
-
-      <depends>jboss:service=3DNaming</depends>
-      <depends>jboss:service=3DTransactionManager</depends>
-
-      <!--
-          Configure the TransactionManager
-      -->
-      <attribute name=3D"TransactionManagerLookupClass">org.jboss.cache.tr=
ansaction.GenericTransactionManagerLookup
-      </attribute>
-
-
-      <!--
-          Node locking level : SERIALIZABLE
-                               REPEATABLE_READ (default)
-                               READ_COMMITTED
-                               READ_UNCOMMITTED
-                               NONE
-      -->
-      <attribute name=3D"IsolationLevel">REPEATABLE_READ</attribute>
-
-      <!--
-           Valid modes are LOCAL
-                           REPL_ASYNC
-                           REPL_SYNC
-      -->
-      <attribute name=3D"CacheMode">LOCAL</attribute>
-
-      <!-- Max number of milliseconds to wait for a lock acquisition -->
-      <attribute name=3D"LockAcquisitionTimeout">15000</attribute>
-
-
-      <!-- Specific eviction policy configurations. This is LRU -->
-      <attribute name=3D"EvictionPolicyConfig">
-         <config>
-            <attribute name=3D"wakeUpIntervalSeconds">3</attribute>
-            <!-- This defaults to 200000 if not specified -->
-            <attribute name=3D"eventQueueSize">200000</attribute>
-
-            <!-- Cache wide default -->
-            <region name=3D"/_default_" policyClass=3D"org.jboss.cache.evi=
ction.LFUPolicy">
-               <attribute name=3D"maxNodes">5000</attribute>
-               <attribute name=3D"minNodes">10</attribute>
-            </region>
-            <region name=3D"/org/jboss/data" policyClass=3D"org.jboss.cach=
e.eviction.LFUPolicy">
-               <attribute name=3D"maxNodes">5000</attribute>
-               <attribute name=3D"minNodes">4000</attribute>
-            </region>
-            <region name=3D"/org/jboss/test/data" policyClass=3D"org.jboss=
.cache.eviction.LFUPolicy">
-               <attribute name=3D"minNodes">5</attribute>
-            </region>
-         </config>
-      </attribute>
-   </mbean>
-
-
-</server>
\ No newline at end of file

Deleted: core/trunk/src/main/resources/META-INF/local-lru-eviction-service.=
xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/resources/META-INF/local-lru-eviction-service.xml	2=
008-01-25 12:47:36 UTC (rev 5238)
+++ core/trunk/src/main/resources/META-INF/local-lru-eviction-service.xml	2=
008-01-25 12:50:24 UTC (rev 5239)
@@ -1,84 +0,0 @@
-<?xml version=3D"1.0" encoding=3D"UTF-8"?>
-
-<!-- =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D -->
-<!--                                                                      =
 -->
-<!--  Sample JBoss Cache Service Configuration                            =
   -->
-<!--                                                                      =
 -->
-<!-- =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D -->
-
-<server>
-
-   <!-- =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D -->
-   <!-- Defines JBoss Cache configuration                                 =
     -->
-   <!-- =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D -->
-
-   <mbean code=3D"org.jboss.cache.jmx.CacheJmxWrapper"
-          name=3D"jboss.cache:service=3DCache">
-
-      <depends>jboss:service=3DNaming</depends>
-      <depends>jboss:service=3DTransactionManager</depends>
-
-      <!--
-          Configure the TransactionManager
-      -->
-      <attribute name=3D"TransactionManagerLookupClass">org.jboss.cache.tr=
ansaction.GenericTransactionManagerLookup
-      </attribute>
-
-
-      <!--
-          Node locking level : SERIALIZABLE
-                               REPEATABLE_READ (default)
-                               READ_COMMITTED
-                               READ_UNCOMMITTED
-                               NONE
-      -->
-      <attribute name=3D"IsolationLevel">REPEATABLE_READ</attribute>
-
-      <!--
-           Valid modes are LOCAL
-                           REPL_ASYNC
-                           REPL_SYNC
-                           INVALIDATION_ASYNC
-                           INVALIDATION_SYNC
-      -->
-      <attribute name=3D"CacheMode">LOCAL</attribute>
-
-      <!-- Max number of milliseconds to wait for a lock acquisition -->
-      <attribute name=3D"LockAcquisitionTimeout">15000</attribute>
-
-      <!-- Specific eviction policy configurations. This is LRU -->
-      <attribute name=3D"EvictionPolicyConfig">
-         <config>
-            <attribute name=3D"wakeUpIntervalSeconds">5</attribute>
-            <!-- This defaults to 200000 if not specified -->
-            <attribute name=3D"eventQueueSize">200000</attribute>
-            <attribute name=3D"policyClass">org.jboss.cache.eviction.LRUPo=
licy</attribute>
-
-            <!-- Cache wide default -->
-            <region name=3D"/_default_">
-               <attribute name=3D"maxNodes">5000</attribute>
-               <attribute name=3D"timeToLiveSeconds">1000</attribute>
-            </region>
-            <region name=3D"/org/jboss/data">
-               <attribute name=3D"maxNodes">5000</attribute>
-               <attribute name=3D"timeToLiveSeconds">1000</attribute>
-            </region>
-            <region name=3D"/org/jboss/test/data">
-               <attribute name=3D"maxNodes">5</attribute>
-               <attribute name=3D"timeToLiveSeconds">4</attribute>
-            </region>
-            <region name=3D"/test">
-               <attribute name=3D"maxNodes">10000</attribute>
-               <attribute name=3D"timeToLiveSeconds">4</attribute>
-            </region>
-            <region name=3D"/maxAgeTest">
-               <attribute name=3D"maxNodes">10000</attribute>
-               <attribute name=3D"timeToLiveSeconds">8</attribute>
-               <attribute name=3D"maxAgeSeconds">10</attribute>
-            </region>
-         </config>
-      </attribute>
-   </mbean>
-
-
-</server>

Deleted: core/trunk/src/main/resources/META-INF/local-mru-eviction-service.=
xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/resources/META-INF/local-mru-eviction-service.xml	2=
008-01-25 12:47:36 UTC (rev 5238)
+++ core/trunk/src/main/resources/META-INF/local-mru-eviction-service.xml	2=
008-01-25 12:50:24 UTC (rev 5239)
@@ -1,71 +0,0 @@
-<?xml version=3D"1.0" encoding=3D"UTF-8"?>
-
-<!-- =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D -->
-<!--                                                                      =
 -->
-<!--  Sample TreeCache Service Configuration                              =
 -->
-<!--                                                                      =
 -->
-<!-- =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D -->
-
-<server>
-
-   <!-- =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D -->
-   <!-- Defines TreeCache configuration                                   =
   -->
-   <!-- =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D -->
-
-   <mbean code=3D"org.jboss.cache.jmx.CacheJmxWrapper"
-          name=3D"jboss.cache:service=3DTreeCache">
-
-      <depends>jboss:service=3DNaming</depends>
-      <depends>jboss:service=3DTransactionManager</depends>
-
-      <!--
-          Configure the TransactionManager
-      -->
-      <attribute name=3D"TransactionManagerLookupClass">org.jboss.cache.tr=
ansaction.GenericTransactionManagerLookup
-      </attribute>
-
-      <!--
-          Node locking level : SERIALIZABLE
-                               REPEATABLE_READ (default)
-                               READ_COMMITTED
-                               READ_UNCOMMITTED
-                               NONE
-      -->
-      <attribute name=3D"IsolationLevel">REPEATABLE_READ</attribute>
-
-      <!--
-           Valid modes are LOCAL
-                           REPL_ASYNC
-                           REPL_SYNC
-      -->
-      <attribute name=3D"CacheMode">LOCAL</attribute>
-
-      <!-- Max number of milliseconds to wait for a lock acquisition -->
-      <attribute name=3D"LockAcquisitionTimeout">15000</attribute>
-
-      <!-- Specific eviction policy configurations. This is LRU -->
-      <attribute name=3D"EvictionPolicyConfig">
-         <config>
-            <attribute name=3D"wakeUpIntervalSeconds">3</attribute>
-            <!-- This defaults to 200000 if not specified -->
-            <attribute name=3D"eventQueueSize">200000</attribute>
-            <!-- Name of the DEFAULT eviction policy class. -->
-            <attribute name=3D"policyClass">org.jboss.cache.eviction.MRUPo=
licy</attribute>
-
-
-            <!-- Cache wide default -->
-            <region name=3D"/_default_">
-               <attribute name=3D"maxNodes">100</attribute>
-            </region>
-            <region name=3D"/org/jboss/data">
-               <attribute name=3D"maxNodes">250</attribute>
-            </region>
-            <region name=3D"/org/jboss/test/data">
-               <attribute name=3D"maxNodes">6</attribute>
-            </region>
-         </config>
-      </attribute>
-   </mbean>
-
-
-</server>

Deleted: core/trunk/src/main/resources/META-INF/local-null-eviction-service=
.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/resources/META-INF/local-null-eviction-service.xml	=
2008-01-25 12:47:36 UTC (rev 5238)
+++ core/trunk/src/main/resources/META-INF/local-null-eviction-service.xml	=
2008-01-25 12:50:24 UTC (rev 5239)
@@ -1,75 +0,0 @@
-<?xml version=3D"1.0" encoding=3D"UTF-8"?>
-
-<!-- =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D -->
-<!--                                                                      =
 -->
-<!--  Sample JBoss Cache Service Configuration                            =
   -->
-<!--                                                                      =
 -->
-<!-- =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D -->
-
-<server>
-
-   <!-- =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D -->
-   <!-- Defines JBoss Cache configuration                                 =
     -->
-   <!-- =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D -->
-
-   <mbean code=3D"org.jboss.cache.jmx.CacheJmxWrapper"
-          name=3D"jboss.cache:service=3DCache">
-
-      <depends>jboss:service=3DNaming</depends>
-      <depends>jboss:service=3DTransactionManager</depends>
-
-      <!--
-          Configure the TransactionManager
-      -->
-      <attribute name=3D"TransactionManagerLookupClass">org.jboss.cache.tr=
ansaction.GenericTransactionManagerLookup
-      </attribute>
-
-
-      <!--
-          Node locking level : SERIALIZABLE
-                               REPEATABLE_READ (default)
-                               READ_COMMITTED
-                               READ_UNCOMMITTED
-                               NONE
-      -->
-      <attribute name=3D"IsolationLevel">REPEATABLE_READ</attribute>
-
-      <!--
-           Valid modes are LOCAL
-                           REPL_ASYNC
-                           REPL_SYNC
-                           INVALIDATION_ASYNC
-                           INVALIDATION_SYNC
-      -->
-      <attribute name=3D"CacheMode">LOCAL</attribute>
-
-      <!-- Max number of milliseconds to wait for a lock acquisition -->
-      <attribute name=3D"LockAcquisitionTimeout">15000</attribute>
-
-      <!-- Specific eviction policy configurations. This is LRU -->
-      <attribute name=3D"EvictionPolicyConfig">
-         <config>
-            <attribute name=3D"wakeUpIntervalSeconds">1</attribute>
-            <!-- This defaults to 200000 if not specified -->
-            <attribute name=3D"eventQueueSize">200000</attribute>
-            <attribute name=3D"policyClass">org.jboss.cache.eviction.NullE=
victionPolicy</attribute>
-
-            <!-- Cache wide default -->
-            <region name=3D"/_default_">
-               <attribute name=3D"maxNodes">5000</attribute>
-               <attribute name=3D"timeToLiveSeconds">1</attribute>
-            </region>
-            <region name=3D"/test" policyClass=3D"org.jboss.cache.eviction=
.NullEvictionPolicy">
-               <attribute name=3D"maxNodes">10000</attribute>
-               <attribute name=3D"timeToLiveSeconds">1</attribute>
-            </region>
-            <region name=3D"/lru" policyClass=3D"org.jboss.cache.eviction.=
LRUPolicy">
-               <attribute name=3D"maxNodes">10000</attribute>
-               <attribute name=3D"timeToLiveSeconds">1</attribute>
-            </region>
-         </config>
-      </attribute>
-   </mbean>
-
-
-</server>

Deleted: core/trunk/src/main/resources/META-INF/local-passivation-service.x=
ml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/resources/META-INF/local-passivation-service.xml	20=
08-01-25 12:47:36 UTC (rev 5238)
+++ core/trunk/src/main/resources/META-INF/local-passivation-service.xml	20=
08-01-25 12:50:24 UTC (rev 5239)
@@ -1,101 +0,0 @@
-<?xml version=3D"1.0" encoding=3D"UTF-8"?>
-
-<!-- =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D -->
-<!--                                                                      =
 -->
-<!--  Sample TreeCache Service Configuration                              =
 -->
-<!--                                                                      =
 -->
-<!-- =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D -->
-
-<server>
-
-   <!-- =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D -->
-   <!-- Defines TreeCache configuration                                   =
   -->
-   <!-- =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D -->
-
-   <mbean code=3D"org.jboss.cache.jmx.CacheJmxWrapper"
-          name=3D"jboss.cache:service=3DTreeCache">
-
-      <depends>jboss:service=3DNaming</depends>
-      <depends>jboss:service=3DTransactionManager</depends>
-
-      <!--
-          Configure the TransactionManager
-      -->
-      <attribute name=3D"TransactionManagerLookupClass">org.jboss.cache.tr=
ansaction.GenericTransactionManagerLookup
-      </attribute>
-
-
-      <!--
-          Node locking level : SERIALIZABLE
-                               REPEATABLE_READ (default)
-                               READ_COMMITTED
-                               READ_UNCOMMITTED
-                               NONE
-      -->
-      <attribute name=3D"IsolationLevel">REPEATABLE_READ</attribute>
-
-      <!--
-           Valid modes are LOCAL
-                           REPL_ASYNC
-                           REPL_SYNC
-      -->
-      <attribute name=3D"CacheMode">LOCAL</attribute>
-
-      <!-- Max number of milliseconds to wait for a lock acquisition -->
-      <attribute name=3D"LockAcquisitionTimeout">15000</attribute>
-
-      <!-- Specific eviction policy configurations. This is LRU -->
-      <attribute name=3D"EvictionPolicyConfig">
-         <config>
-            <attribute name=3D"wakeUpIntervalSeconds">5</attribute>
-            <!-- This defaults to 200000 if not specified -->
-            <attribute name=3D"eventQueueSize">200000</attribute>
-            <!-- Name of the DEFAULT eviction policy class. -->
-            <attribute name=3D"policyClass">org.jboss.cache.eviction.LRUPo=
licy</attribute>
-
-
-            <!-- Cache wide default -->
-            <region name=3D"/_default_">
-               <attribute name=3D"maxNodes">5000</attribute>
-               <attribute name=3D"timeToLiveSeconds">3</attribute>
-            </region>
-            <region name=3D"/org/jboss/test/data">
-               <attribute name=3D"maxNodes">100</attribute>
-               <attribute name=3D"timeToLiveSeconds">3</attribute>
-            </region>
-         </config>
-      </attribute>
-
-      <!-- New 1.3.x cache loader config block -->
-      <attribute name=3D"CacheLoaderConfig">
-         <config>
-            <!-- if passivation is true, only the first cache loader is us=
ed; the rest are ignored -->
-            <passivation>true</passivation>
-            <preload>/</preload>
-            <shared>false</shared>
-
-            <!-- we can now have multiple cache loaders, which get chained=
 -->
-            <cacheloader>
-               <class>org.jboss.cache.loader.FileCacheLoader</class>
-               <!-- same as the old CacheLoaderConfig attribute
-                  location=3D/tmp this can be part of the properties.
-                  location=3D/tmp/JBossCacheFileCacheLoader
-               -->
-               <properties>
-               </properties>
-               <!-- whether the cache loader writes are asynchronous -->
-               <async>false</async>
-               <!-- only one cache loader in the chain may set fetchPersis=
tentState to true.
- An exception is thrown if more than one cache loader sets this to true. -=
->
-               <fetchPersistentState>true</fetchPersistentState>
-               <!-- determines whether this cache loader ignores writes - =
defaults to false. -->
-               <ignoreModifications>false</ignoreModifications>
-            </cacheloader>
-
-         </config>
-      </attribute>
-
-   </mbean>
-
-
-</server>

Deleted: core/trunk/src/main/resources/META-INF/local-service.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/resources/META-INF/local-service.xml	2008-01-25 12:=
47:36 UTC (rev 5238)
+++ core/trunk/src/main/resources/META-INF/local-service.xml	2008-01-25 12:=
50:24 UTC (rev 5239)
@@ -1,80 +0,0 @@
-<?xml version=3D"1.0" encoding=3D"UTF-8"?>
-
-<!-- =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D -->
-<!--                                                                      =
 -->
-<!--  Sample TreeCache Service Configuration                              =
 -->
-<!--                                                                      =
 -->
-<!-- =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D -->
-
-<server>
-
-   <!-- =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D -->
-   <!-- Defines TreeCache configuration                                   =
   -->
-   <!-- =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D -->
-
-   <mbean code=3D"org.jboss.cache.jmx.CacheJmxWrapper"
-          name=3D"jboss.cache:service=3DTreeCache">
-
-      <depends>jboss:service=3DNaming</depends>
-      <depends>jboss:service=3DTransactionManager</depends>
-
-
-      <!-- Configure the TransactionManager -->
-      <attribute name=3D"TransactionManagerLookupClass">org.jboss.cache.tr=
ansaction.BatchModeTransactionManagerLookup
-      </attribute>
-
-
-      <!--
-          Node locking level : SERIALIZABLE
-                               REPEATABLE_READ (default)
-                               READ_COMMITTED
-                               READ_UNCOMMITTED
-                               NONE
-      -->
-      <attribute name=3D"IsolationLevel">REPEATABLE_READ</attribute>
-
-      <!--
-           Valid modes are LOCAL
-                           REPL_ASYNC
-                           REPL_SYNC
-                           INVALIDATION_ASYNC
-                           INVALIDATION_SYNC
-      -->
-      <attribute name=3D"CacheMode">LOCAL</attribute>
-
-      <!-- Max number of milliseconds to wait for a lock acquisition -->
-      <attribute name=3D"LockAcquisitionTimeout">15000</attribute>
-
-      <!-- Specific eviction policy configurations. This is LRU -->
-      <attribute name=3D"EvictionPolicyConfig">
-         <config>
-            <attribute name=3D"wakeUpIntervalSeconds">5</attribute>
-            <!-- This defaults to 200000 if not specified -->
-            <attribute name=3D"eventQueueSize">200000</attribute>
-            <attribute name=3D"policyClass">org.jboss.cache.eviction.LRUPo=
licy</attribute>
-
-            <!-- Cache wide default -->
-            <region name=3D"/_default_">
-               <attribute name=3D"maxNodes">5000</attribute>
-               <attribute name=3D"timeToLiveSeconds">1000</attribute>
-            </region>
-            <region name=3D"/org/jboss/data">
-               <attribute name=3D"maxNodes">5000</attribute>
-               <attribute name=3D"timeToLiveSeconds">1000</attribute>
-            </region>
-            <region name=3D"/org/jboss/test/data">
-               <attribute name=3D"maxNodes">5</attribute>
-               <attribute name=3D"timeToLiveSeconds">4</attribute>
-            </region>
-         </config>
-      </attribute>
-
-      <!--
-         Indicate whether to use region based marshalling or not. Set this=
 to true if you are running under a scoped
-         class loader, e.g., inside an application server. Default is "fal=
se".
-      -->
-      <attribute name=3D"UseRegionBasedMarshalling">false</attribute>
-   </mbean>
-
-
-</server>

Deleted: core/trunk/src/main/resources/META-INF/local-tx-service.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/resources/META-INF/local-tx-service.xml	2008-01-25 =
12:47:36 UTC (rev 5238)
+++ core/trunk/src/main/resources/META-INF/local-tx-service.xml	2008-01-25 =
12:50:24 UTC (rev 5239)
@@ -1,81 +0,0 @@
-<?xml version=3D"1.0" encoding=3D"UTF-8"?>
-
-<!-- =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D -->
-<!--                                                                      =
 -->
-<!--  Sample TreeCache Service Configuration                              =
 -->
-<!--                                                                      =
 -->
-<!-- =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D -->
-
-<server>
-
-   <!-- =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D -->
-   <!-- Defines TreeCache configuration                                   =
   -->
-   <!-- =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D -->
-
-   <mbean code=3D"org.jboss.cache.jmx.CacheJmxWrapper"
-          name=3D"jboss.cache:service=3DTreeCache">
-
-      <depends>jboss:service=3DNaming</depends>
-      <depends>jboss:service=3DTransactionManager</depends>
-
-
-      <!-- Configure the TransactionManager -->
-      <attribute name=3D"TransactionManagerLookupClass">org.jboss.cache.tr=
ansaction.GenericTransactionManagerLookup
-      </attribute>
-
-
-      <!--
-          Node locking level : SERIALIZABLE
-                               REPEATABLE_READ (default)
-                               READ_COMMITTED
-                               READ_UNCOMMITTED
-                               NONE
-      -->
-      <attribute name=3D"IsolationLevel">REPEATABLE_READ</attribute>
-
-      <!--
-           Valid modes are LOCAL
-                           REPL_ASYNC
-                           REPL_SYNC
-                           INVALIDATION_ASYNC
-                           INVALIDATION_SYNC
-      -->
-      <attribute name=3D"CacheMode">LOCAL</attribute>
-
-      <!-- Max number of milliseconds to wait for a lock acquisition -->
-      <attribute name=3D"LockAcquisitionTimeout">15000</attribute>
-
-
-      <!-- Specific eviction policy configurations. This is LRU -->
-      <attribute name=3D"EvictionPolicyConfig">
-         <config>
-            <attribute name=3D"wakeUpIntervalSeconds">5</attribute>
-            <!-- This defaults to 200000 if not specified -->
-            <attribute name=3D"eventQueueSize">200000</attribute>
-            <attribute name=3D"policyClass">org.jboss.cache.eviction.LRUPo=
licy</attribute>
-
-            <!-- Cache wide default -->
-            <region name=3D"/_default_">
-               <attribute name=3D"maxNodes">5000</attribute>
-               <attribute name=3D"timeToLiveSeconds">1000</attribute>
-            </region>
-            <region name=3D"/org/jboss/data">
-               <attribute name=3D"maxNodes">5000</attribute>
-               <attribute name=3D"timeToLiveSeconds">1000</attribute>
-            </region>
-            <region name=3D"/org/jboss/test/data">
-               <attribute name=3D"maxNodes">5</attribute>
-               <attribute name=3D"timeToLiveSeconds">4</attribute>
-            </region>
-         </config>
-      </attribute>
-
-      <!--
-         Indicate whether to use region based marshalling or not. Set this=
 to true if you are running under a scoped
-         class loader, e.g., inside an application server. Default is "fal=
se".
-      -->
-      <attribute name=3D"UseRegionBasedMarshalling">false</attribute>
-   </mbean>
-
-
-</server>

Deleted: core/trunk/src/main/resources/META-INF/mixedPolicy-eviction-servic=
e.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/resources/META-INF/mixedPolicy-eviction-service.xml=
	2008-01-25 12:47:36 UTC (rev 5238)
+++ core/trunk/src/main/resources/META-INF/mixedPolicy-eviction-service.xml=
	2008-01-25 12:50:24 UTC (rev 5239)
@@ -1,74 +0,0 @@
-<?xml version=3D"1.0" encoding=3D"UTF-8"?>
-
-<!-- =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D -->
-<!--                                                                      =
 -->
-<!--  Sample TreeCache Service Configuration                              =
 -->
-<!--                                                                      =
 -->
-<!-- =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D -->
-
-<server>
-
-   <!-- =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D -->
-   <!-- Defines TreeCache configuration                                   =
   -->
-   <!-- =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D -->
-
-   <mbean code=3D"org.jboss.cache.jmx.CacheJmxWrapper"
-          name=3D"jboss.cache:service=3DTreeCache">
-
-      <depends>jboss:service=3DNaming</depends>
-      <depends>jboss:service=3DTransactionManager</depends>
-
-      <!--
-          Configure the TransactionManager
-      -->
-      <attribute name=3D"TransactionManagerLookupClass">org.jboss.cache.tr=
ansaction.GenericTransactionManagerLookup
-      </attribute>
-
-
-      <!--
-          Node locking level : SERIALIZABLE
-                               REPEATABLE_READ (default)
-                               READ_COMMITTED
-                               READ_UNCOMMITTED
-                               NONE
-      -->
-      <attribute name=3D"IsolationLevel">REPEATABLE_READ</attribute>
-
-      <!--
-           Valid modes are LOCAL
-                           REPL_ASYNC
-                           REPL_SYNC
-      -->
-      <attribute name=3D"CacheMode">LOCAL</attribute>
-
-
-      <!-- Specific eviction policy configurations. This is LRU -->
-      <attribute name=3D"EvictionPolicyConfig">
-         <config>
-            <attribute name=3D"wakeUpIntervalSeconds">5</attribute>
-            <!-- This defaults to 200000 if not specified -->
-            <attribute name=3D"eventQueueSize">200000</attribute>
-            <attribute name=3D"policyClass">org.jboss.cache.eviction.LRUPo=
licy</attribute>
-
-            <!-- Cache wide default -->
-            <region name=3D"/_default_">
-               <attribute name=3D"maxNodes">5000</attribute>
-               <attribute name=3D"timeToLiveSeconds">1000</attribute>
-            </region>
-            <region name=3D"/org/jboss/data" policyClass=3D"org.jboss.cach=
e.eviction.FIFOPolicy">
-               <attribute name=3D"maxNodes">5000</attribute>
-            </region>
-            <region name=3D"/test/" policyClass=3D"org.jboss.cache.evictio=
n.MRUPolicy">
-               <attribute name=3D"maxNodes">10000</attribute>
-            </region>
-            <region name=3D"/maxAgeTest/">
-               <attribute name=3D"maxNodes">10000</attribute>
-               <attribute name=3D"timeToLiveSeconds">8</attribute>
-               <attribute name=3D"maxAgeSeconds">10</attribute>
-            </region>
-         </config>
-      </attribute>
-   </mbean>
-
-
-</server>

Added: core/trunk/src/main/resources/META-INF/multiplexer-enabled-cache-ser=
vice.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/resources/META-INF/multiplexer-enabled-cache-servic=
e.xml	                        (rev 0)
+++ core/trunk/src/main/resources/META-INF/multiplexer-enabled-cache-servic=
e.xml	2008-01-25 12:50:24 UTC (rev 5239)
@@ -0,0 +1,173 @@
+<?xml version=3D"1.0" encoding=3D"UTF-8"?>
+
+<!-- =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D -->
+<!--                                                                      =
 -->
+<!--  Sample TreeCache Service Configuration                              =
 -->
+<!--                                                                      =
 -->
+<!-- =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D -->
+
+<server>
+
+   <classpath codebase=3D"./lib" archives=3D"jboss-cache.jar, jgroups.jar"=
/>
+
+
+   <!-- =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D -->
+   <!-- Defines TreeCache configuration                                   =
   -->
+   <!-- =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D -->
+
+   <mbean code=3D"org.jboss.cache.jmx.CacheJmxWrapper"
+          name=3D"jboss.cache:service=3DtestTreeCache">
+
+      <depends>jboss:service=3DNaming</depends>
+      <depends>jboss:service=3DTransactionManager</depends>
+
+      <!--
+          Configure the TransactionManager
+      -->
+      <attribute name=3D"TransactionManagerLookupClass">org.jboss.cache.tr=
ansaction.GenericTransactionManagerLookup
+      </attribute>
+
+
+      <!--
+          Node locking level : SERIALIZABLE
+                               REPEATABLE_READ (default)
+                               READ_COMMITTED
+                               READ_UNCOMMITTED
+                               NONE
+      -->
+      <attribute name=3D"IsolationLevel">REPEATABLE_READ</attribute>
+
+      <!--
+           Valid modes are LOCAL
+                           REPL_ASYNC
+                           REPL_SYNC
+                           INVALIDATION_ASYNC
+                           INVALIDATION_SYNC
+      -->
+      <attribute name=3D"CacheMode">REPL_SYNC</attribute>
+
+      <!-- Name of cluster. Needs to be the same for all TreeCache nodes i=
n a
+           cluster in order to find each other.
+      -->
+      <attribute name=3D"ClusterName">JBossCache-Cluster</attribute>
+
+      <depends>jgroups.mux:name=3DMultiplexer</depends>
+      <attribute name=3D"MultiplexerStack">fc-fast-minimalthreads</attribu=
te>
+
+      <!-- JGroups protocol stack properties.
+         ClusterConfig isn't used if the multiplexer is enabled and succes=
sfully initialized.
+      -->
+      <attribute name=3D"ClusterConfig">
+         <config>
+            <TCP recv_buf_size=3D"20000000" use_send_queues=3D"false"
+                 loopback=3D"false"
+                 discard_incompatible_packets=3D"true"
+                 max_bundle_size=3D"64000"
+                 max_bundle_timeout=3D"30"
+                 use_incoming_packet_handler=3D"true"
+                 enable_bundling=3D"true"
+                 enable_unicast_bundling=3D"true"
+                 enable_diagnostics=3D"true"
+
+                 use_concurrent_stack=3D"true"
+
+                 thread_naming_pattern=3D"pl"
+
+                 thread_pool.enabled=3D"true"
+                 thread_pool.min_threads=3D"1"
+                 thread_pool.max_threads=3D"4"
+                 thread_pool.keep_alive_time=3D"30000"
+                 thread_pool.queue_enabled=3D"true"
+                 thread_pool.queue_max_size=3D"50000"
+                 thread_pool.rejection_policy=3D"discard"
+
+                 oob_thread_pool.enabled=3D"true"
+                 oob_thread_pool.min_threads=3D"2"
+                 oob_thread_pool.max_threads=3D"4"
+                 oob_thread_pool.keep_alive_time=3D"10000"
+                 oob_thread_pool.queue_enabled=3D"false"
+                 oob_thread_pool.queue_max_size=3D"10"
+                 oob_thread_pool.rejection_policy=3D"Run"/>
+
+            <!--<PING timeout=3D"2000" num_initial_members=3D"3"/>-->
+             <MPING mcast_addr=3D"232.1.2.3" timeout=3D"2000" num_initial_=
members=3D"3"/>
+            <MERGE2 max_interval=3D"30000" min_interval=3D"10000"/>
+            <FD_SOCK/>
+            <FD timeout=3D"10000" max_tries=3D"5" shun=3D"true"/>
+            <VERIFY_SUSPECT timeout=3D"1500"/>
+            <pbcast.NAKACK use_mcast_xmit=3D"false" gc_lag=3D"0"
+                           retransmit_timeout=3D"300,600,1200,2400,4800"
+                           discard_delivered_msgs=3D"true"/>
+            <!--<UNICAST timeout=3D"30,60,120,300,600,1200,2400,3600"/>-->
+            <pbcast.STABLE stability_delay=3D"1000" desired_avg_gossip=3D"=
50000"
+                           max_bytes=3D"400000"/>
+            <pbcast.GMS print_local_addr=3D"true" join_timeout=3D"5000"
+                        join_retry_timeout=3D"2000" shun=3D"false"
+                        view_bundling=3D"true" view_ack_collection_timeout=
=3D"5000"/>
+              <FC max_credits=3D"5000000"
+                    min_threshold=3D"0.20"/>
+            <FRAG2 frag_size=3D"60000"/>
+            <pbcast.STREAMING_STATE_TRANSFER use_reading_thread=3D"true"/>
+            <!-- <pbcast.STATE_TRANSFER/> -->
+            <pbcast.FLUSH timeout=3D"0"/>
+         </config>
+      </attribute>
+
+
+
+      <!--
+          The max amount of time (in milliseconds) we wait until the
+          state (ie. the contents of the cache) are retrieved from
+          existing members in a clustered environment
+      -->
+      <attribute name=3D"StateRetrievalTimeout">20000</attribute>
+
+      <!--
+          Number of milliseconds to wait until all responses for a
+          synchronous call have been received.
+      -->
+      <attribute name=3D"SyncReplTimeout">15000</attribute>
+
+      <!-- Max number of milliseconds to wait for a lock acquisition -->
+      <attribute name=3D"LockAcquisitionTimeout">10000</attribute>
+
+
+      <!-- Buddy Replication config -->
+      <attribute name=3D"BuddyReplicationConfig">
+         <config>
+            <buddyReplicationEnabled>true</buddyReplicationEnabled>
+            <!-- these are the default values anyway -->
+            <buddyLocatorClass>org.jboss.cache.buddyreplication.NextMember=
BuddyLocator</buddyLocatorClass>
+            <!-- numBuddies is the number of backup nodes each node mainta=
ins.  ignoreColocatedBuddies means that
+     each node will *try* to select a buddy on a different physical host. =
 If not able to do so though,
+     it will fall back to colocated nodes. -->
+            <buddyLocatorProperties>
+               numBuddies =3D 1
+               ignoreColocatedBuddies =3D true
+            </buddyLocatorProperties>
+
+            <!-- A way to specify a preferred replication group.  If speci=
fied, we try and pick a buddy why shares
+    the same pool name (falling back to other buddies if not available).  =
This allows the sysdmin to hint at
+    backup buddies are picked, so for example, nodes may be hinted topick =
buddies on a different physical rack
+    or power supply for added fault tolerance.  -->
+            <buddyPoolName>myBuddyPoolReplicationGroup</buddyPoolName>
+            <!-- communication timeout for inter-buddy group organisation =
messages (such as assigning to and removing
+          from groups -->
+            <buddyCommunicationTimeout>2000</buddyCommunicationTimeout>
+
+            <!-- the following three elements, all relating to data gravit=
ation, default to false -->
+            <!-- Should data gravitation be attempted whenever there is a =
cache miss on finding a node?
+If false, data will only be gravitated if an Option is set enabling it -->
+            <autoDataGravitation>false</autoDataGravitation>
+            <!-- removes data on remote caches' trees and backup subtrees =
when gravitated to a new data owner -->
+            <dataGravitationRemoveOnFind>true</dataGravitationRemoveOnFind>
+            <!-- search backup subtrees as well for data when gravitating.=
  Results in backup nodes being able to
+        answer data gravitation requests. -->
+            <dataGravitationSearchBackupTrees>true</dataGravitationSearchB=
ackupTrees>
+
+         </config>
+      </attribute>
+   </mbean>
+
+
+</server>

Deleted: core/trunk/src/main/resources/META-INF/mux-service.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/resources/META-INF/mux-service.xml	2008-01-25 12:47=
:36 UTC (rev 5238)
+++ core/trunk/src/main/resources/META-INF/mux-service.xml	2008-01-25 12:50=
:24 UTC (rev 5239)
@@ -1,63 +0,0 @@
-<?xml version=3D"1.0" encoding=3D"UTF-8"?>
-
-<!-- =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D -->
-<!--                                                                      =
                                                                      -->
-<!--  Sample TreeCache Service Configuration using Multiplexer            =
                                -->
-<!--                                                                      =
                                                                      -->
-<!-- =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D -->
-
-<server>
-
-   <!-- =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D -->
-   <!-- Defines TreeCache configuration                                   =
   -->
-   <!-- =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D -->
-
-   <mbean code=3D"org.jboss.cache.jmx.CacheJmxWrapper"
-          name=3D"jboss.cache:service=3DtestTreeCache">
-
-      <depends>jboss:service=3DNaming</depends>
-      <depends>jboss:service=3DTransactionManager</depends>
-
-      <depends optional-attribute-name=3D"MultiplexerService"
-               proxy-type=3D"attribute">jgroups.mux:name=3DMultiplexer
-      </depends>
-      <attribute name=3D"MultiplexerStack">tcp</attribute>
-
-      <!--
-          Configure the TransactionManager
-      -->
-      <attribute name=3D"TransactionManagerLookupClass">org.jboss.cache.tr=
ansaction.GenericTransactionManagerLookup
-      </attribute>
-
-
-      <!--
-          Node locking level : SERIALIZABLE
-                               REPEATABLE_READ (default)
-                               READ_COMMITTED
-                               READ_UNCOMMITTED
-                               NONE
-      -->
-      <attribute name=3D"IsolationLevel">REPEATABLE_READ</attribute>
-
-      <!--
-           Valid modes are LOCAL
-                           REPL_ASYNC
-                           REPL_SYNC
-                           INVALIDATION_ASYNC
-                           INVALIDATION_SYNC
-      -->
-      <attribute name=3D"CacheMode">LOCAL</attribute>
-
-      <!--
-          Number of milliseconds to wait until all responses for a
-          synchronous call have been received.
-      -->
-      <attribute name=3D"SyncReplTimeout">15000</attribute>
-
-      <!-- Max number of milliseconds to wait for a lock acquisition -->
-      <attribute name=3D"LockAcquisitionTimeout">10000</attribute>
-
-   </mbean>
-
-
-</server>

Deleted: core/trunk/src/main/resources/META-INF/optimistic-eviction.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/resources/META-INF/optimistic-eviction.xml	2008-01-=
25 12:47:36 UTC (rev 5238)
+++ core/trunk/src/main/resources/META-INF/optimistic-eviction.xml	2008-01-=
25 12:50:24 UTC (rev 5239)
@@ -1,85 +0,0 @@
-<?xml version=3D"1.0" encoding=3D"UTF-8"?>
-
-<!-- =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D -->
-<!--                                                                      =
 -->
-<!--  Sample TreeCache Service Configuration                              =
 -->
-<!--                                                                      =
 -->
-<!-- =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D -->
-
-<server>
-
-   <!-- =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D -->
-   <!-- Defines TreeCache configuration                                   =
   -->
-   <!-- =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D -->
-
-   <mbean code=3D"org.jboss.cache.jmx.CacheJmxWrapper"
-          name=3D"jboss.cache:service=3DTreeCache">
-
-      <depends>jboss:service=3DNaming</depends>
-      <depends>jboss:service=3DTransactionManager</depends>
-
-      <!--
-          Configure the TransactionManager
-      -->
-      <attribute name=3D"TransactionManagerLookupClass">org.jboss.cache.tr=
ansaction.GenericTransactionManagerLookup
-      </attribute>
-
-      <attribute name=3D"FetchInMemoryState">false</attribute>
-
-      <!--  Whether each interceptor should have an mbean
-registered to capture and display its statistics.  -->
-      <attribute name=3D"UseInterceptorMbeans">true</attribute>
-
-      <!--
-          Node locking scheme:
-              OPTIMISTIC
-              PESSIMISTIC (default)
-      -->
-      <attribute name=3D"NodeLockingScheme">Optimistic</attribute>
-
-      <!--
-          Node locking level : SERIALIZABLE
-                               REPEATABLE_READ (default)
-                               READ_COMMITTED
-                               READ_UNCOMMITTED
-                               NONE
-      -->
-      <attribute name=3D"IsolationLevel">READ_COMMITTED</attribute>
-
-
-      <!--
-           Valid modes are LOCAL
-                           REPL_ASYNC
-                           REPL_SYNC
-      -->
-      <attribute name=3D"CacheMode">LOCAL</attribute>
-
-      <!-- Max number of milliseconds to wait for a lock acquisition -->
-      <attribute name=3D"LockAcquisitionTimeout">10000</attribute>
-
-      <attribute name=3D"EvictionPolicyConfig">
-         <config>
-            <attribute name=3D"wakeUpIntervalSeconds">1</attribute>
-            <!-- Name of the DEFAULT eviction policy class.-->
-            <attribute name=3D"policyClass">org.jboss.cache.eviction.LRUPo=
licy</attribute>
-
-            <region name=3D"/_default_">
-               <attribute name=3D"maxNodes">10</attribute>
-               <attribute name=3D"timeToLiveSeconds">0</attribute>
-               <attribute name=3D"maxAgeSeconds">0</attribute>
-            </region>
-            <region name=3D"/testingRegion">
-               <attribute name=3D"maxNodes">10</attribute>
-               <attribute name=3D"timeToLiveSeconds">0</attribute>
-               <attribute name=3D"maxAgeSeconds">0</attribute>
-            </region>
-            <region name=3D"/timeBased">
-               <attribute name=3D"maxNodes">10</attribute>
-               <attribute name=3D"timeToLiveSeconds">1</attribute>
-               <attribute name=3D"maxAgeSeconds">1</attribute>
-            </region>
-         </config>
-      </attribute>
-
-   </mbean>
-</server>

Added: core/trunk/src/main/resources/META-INF/optimistically-locked-cache-s=
ervice.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/resources/META-INF/optimistically-locked-cache-serv=
ice.xml	                        (rev 0)
+++ core/trunk/src/main/resources/META-INF/optimistically-locked-cache-serv=
ice.xml	2008-01-25 12:50:24 UTC (rev 5239)
@@ -0,0 +1,85 @@
+<?xml version=3D"1.0" encoding=3D"UTF-8"?>
+
+<!-- =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D -->
+<!--                                                                      =
 -->
+<!--  Sample TreeCache Service Configuration                              =
 -->
+<!--                                                                      =
 -->
+<!-- =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D -->
+
+<server>
+
+   <!-- =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D -->
+   <!-- Defines TreeCache configuration                                   =
   -->
+   <!-- =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D -->
+
+   <mbean code=3D"org.jboss.cache.jmx.CacheJmxWrapper"
+          name=3D"jboss.cache:service=3DTreeCache">
+
+      <depends>jboss:service=3DNaming</depends>
+      <depends>jboss:service=3DTransactionManager</depends>
+
+      <!--
+          Configure the TransactionManager
+      -->
+      <attribute name=3D"TransactionManagerLookupClass">org.jboss.cache.tr=
ansaction.GenericTransactionManagerLookup
+      </attribute>
+
+      <attribute name=3D"FetchInMemoryState">false</attribute>
+
+      <!--  Whether each interceptor should have an mbean
+registered to capture and display its statistics.  -->
+      <attribute name=3D"UseInterceptorMbeans">true</attribute>
+
+      <!--
+          Node locking scheme:
+              OPTIMISTIC
+              PESSIMISTIC (default)
+      -->
+      <attribute name=3D"NodeLockingScheme">Optimistic</attribute>
+
+      <!--
+          Node locking level : SERIALIZABLE
+                               REPEATABLE_READ (default)
+                               READ_COMMITTED
+                               READ_UNCOMMITTED
+                               NONE
+      -->
+      <attribute name=3D"IsolationLevel">READ_COMMITTED</attribute>
+
+
+      <!--
+           Valid modes are LOCAL
+                           REPL_ASYNC
+                           REPL_SYNC
+      -->
+      <attribute name=3D"CacheMode">LOCAL</attribute>
+
+      <!-- Max number of milliseconds to wait for a lock acquisition -->
+      <attribute name=3D"LockAcquisitionTimeout">10000</attribute>
+
+      <attribute name=3D"EvictionPolicyConfig">
+         <config>
+            <attribute name=3D"wakeUpIntervalSeconds">1</attribute>
+            <!-- Name of the DEFAULT eviction policy class.-->
+            <attribute name=3D"policyClass">org.jboss.cache.eviction.LRUPo=
licy</attribute>
+
+            <region name=3D"/_default_">
+               <attribute name=3D"maxNodes">10</attribute>
+               <attribute name=3D"timeToLiveSeconds">0</attribute>
+               <attribute name=3D"maxAgeSeconds">0</attribute>
+            </region>
+            <region name=3D"/testingRegion">
+               <attribute name=3D"maxNodes">10</attribute>
+               <attribute name=3D"timeToLiveSeconds">0</attribute>
+               <attribute name=3D"maxAgeSeconds">0</attribute>
+            </region>
+            <region name=3D"/timeBased">
+               <attribute name=3D"maxNodes">10</attribute>
+               <attribute name=3D"timeToLiveSeconds">1</attribute>
+               <attribute name=3D"maxAgeSeconds">1</attribute>
+            </region>
+         </config>
+      </attribute>
+
+   </mbean>
+</server>

Deleted: core/trunk/src/main/resources/META-INF/pojocache-passivation-servi=
ce.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/resources/META-INF/pojocache-passivation-service.xm=
l	2008-01-25 12:47:36 UTC (rev 5238)
+++ core/trunk/src/main/resources/META-INF/pojocache-passivation-service.xm=
l	2008-01-25 12:50:24 UTC (rev 5239)
@@ -1,190 +0,0 @@
-<?xml version=3D"1.0" encoding=3D"UTF-8"?>
-
-<!-- =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D -->
-<!--                                                                      =
 -->
-<!--  Sample TreeCache Service Configuration                              =
 -->
-<!--                                                                      =
 -->
-<!-- =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D -->
-
-<server>
-
-   <!-- =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D -->
-   <!-- Defines TreeCache configuration                                   =
   -->
-   <!-- =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D -->
-
-   <mbean code=3D"org.jboss.cache.pojo.jmx.PojoCacheJmxWrapper"
-          name=3D"jboss.cache:service=3DTreeCache">
-
-      <depends>jboss:service=3DNaming</depends>
-      <depends>jboss:service=3DTransactionManager</depends>
-
-      <!--
-          Configure the TransactionManager
-      -->
-      <attribute name=3D"TransactionManagerLookupClass">org.jboss.cache.tr=
ansaction.GenericTransactionManagerLookup
-      </attribute>
-
-
-      <!--
-          Node locking level : SERIALIZABLE
-                               REPEATABLE_READ (default)
-                               READ_COMMITTED
-                               READ_UNCOMMITTED
-                               NONE
-      -->
-      <attribute name=3D"IsolationLevel">REPEATABLE_READ</attribute>
-
-      <!--
-           Valid modes are LOCAL
-                           REPL_ASYNC
-                           REPL_SYNC
-      -->
-      <attribute name=3D"CacheMode">REPL_SYNC</attribute>
-
-      <!-- Name of cluster. Needs to be the same for all TreeCache nodes i=
n a
-           cluster in order to find each other.
-      -->
-      <attribute name=3D"ClusterName">JBossCache-Cluster</attribute>
-
-      <!--Uncomment next three statements to enable JGroups multiplexer.
-This configuration is dependent on the JGroups multiplexer being
-registered in an MBean server such as JBossAS.  -->
-      <!--
-      <depends>jgroups.mux:name=3DMultiplexer</depends>
-      <attribute name=3D"MultiplexerService">jgroups.mux:name=3DMultiplexe=
r</attribute>
-      <attribute name=3D"MultiplexerStack">fc-fast-minimalthreads</attribu=
te>
-      -->
-
-      <!-- JGroups protocol stack properties.
-         ClusterConfig isn't used if the multiplexer is enabled and succes=
sfully initialized.
-      -->
-<attribute name=3D"ClusterConfig">
-         <config>
-            <TCP recv_buf_size=3D"20000000" use_send_queues=3D"false"
-                 loopback=3D"false"
-                 discard_incompatible_packets=3D"true"
-                 max_bundle_size=3D"64000"
-                 max_bundle_timeout=3D"30"
-                 use_incoming_packet_handler=3D"true"
-                 enable_bundling=3D"true"
-                 enable_unicast_bundling=3D"true"
-                 enable_diagnostics=3D"true"
-
-                 use_concurrent_stack=3D"true"
-
-                 thread_naming_pattern=3D"pl"
-
-                 thread_pool.enabled=3D"true"
-                 thread_pool.min_threads=3D"1"
-                 thread_pool.max_threads=3D"4"
-                 thread_pool.keep_alive_time=3D"30000"
-                 thread_pool.queue_enabled=3D"true"
-                 thread_pool.queue_max_size=3D"50000"
-                 thread_pool.rejection_policy=3D"discard"
-
-                 oob_thread_pool.enabled=3D"true"
-                 oob_thread_pool.min_threads=3D"2"
-                 oob_thread_pool.max_threads=3D"4"
-                 oob_thread_pool.keep_alive_time=3D"10000"
-                 oob_thread_pool.queue_enabled=3D"false"
-                 oob_thread_pool.queue_max_size=3D"10"
-                 oob_thread_pool.rejection_policy=3D"Run"/>
-
-            <!--<PING timeout=3D"2000" num_initial_members=3D"3"/>-->
-             <MPING mcast_addr=3D"232.1.2.3" timeout=3D"2000" num_initial_=
members=3D"3"/>
-            <MERGE2 max_interval=3D"30000" min_interval=3D"10000"/>
-            <FD_SOCK/>
-            <FD timeout=3D"10000" max_tries=3D"5" shun=3D"true"/>
-            <VERIFY_SUSPECT timeout=3D"1500"/>
-            <pbcast.NAKACK use_mcast_xmit=3D"false" gc_lag=3D"0"
-                           retransmit_timeout=3D"300,600,1200,2400,4800"
-                           discard_delivered_msgs=3D"true"/>
-            <!--<UNICAST timeout=3D"30,60,120,300,600,1200,2400,3600"/>-->
-            <pbcast.STABLE stability_delay=3D"1000" desired_avg_gossip=3D"=
50000"
-                           max_bytes=3D"400000"/>
-            <pbcast.GMS print_local_addr=3D"true" join_timeout=3D"5000"
-                        join_retry_timeout=3D"2000" shun=3D"false"
-                        view_bundling=3D"true" view_ack_collection_timeout=
=3D"5000"/>
-              <FC max_credits=3D"5000000"
-                    min_threshold=3D"0.20"/>
-            <FRAG2 frag_size=3D"60000"/>
-            <pbcast.STREAMING_STATE_TRANSFER use_reading_thread=3D"true"/>
-            <!-- <pbcast.STATE_TRANSFER/> -->
-            <pbcast.FLUSH timeout=3D"0"/>
-         </config>
-      </attribute>
-
-      <!--
-          The max amount of time (in milliseconds) we wait until the
-          state (ie. the contents of the cache) are retrieved from
-          existing members in a clustered environment
-      -->
-      <attribute name=3D"StateRetrievalTimeout">20000</attribute>
-
-      <!--
-          Number of milliseconds to wait until all responses for a
-          synchronous call have been received.
-      -->
-      <attribute name=3D"SyncReplTimeout">20000</attribute>
-
-      <!-- Max number of milliseconds to wait for a lock acquisition -->
-      <attribute name=3D"LockAcquisitionTimeout">15000</attribute>
-
-
-      <!-- Specific eviction policy configurations. This is LRU -->
-      <!--
-      PojoCache passivation only allows configuration of global region. If=
 you need to
-      configure multiple regions, you can turn on the marshalling region s=
uch that
-      internal JBoss region is stored under the individual region.
-      -->
-      <attribute name=3D"EvictionPolicyConfig">
-         <config>
-            <attribute name=3D"wakeUpIntervalSeconds">3</attribute>
-            <!-- This defaults to 200000 if not specified -->
-            <attribute name=3D"eventQueueSize">200000</attribute>
-            <!-- Name of the DEFAULT eviction policy class. -->
-            <attribute name=3D"policyClass">org.jboss.cache.eviction.LRUPo=
licy</attribute>
-
-
-            <!-- Cache wide default -->
-            <region name=3D"/_default_">
-               <attribute name=3D"maxNodes">5000</attribute>
-               <attribute name=3D"timeToLiveSeconds">3</attribute>
-            </region>
-         </config>
-      </attribute>
-
-      <!-- Cache Loader configuration block -->
-      <attribute name=3D"CacheLoaderConfig">
-         <config>
-            <!-- if passivation is true, only the first cache loader is us=
ed; the rest are ignored -->
-            <passivation>true</passivation>
-            <preload>/</preload>
-            <shared>false</shared>
-
-            <!-- we can now have multiple cache loaders, which get chained=
 -->
-            <cacheloader>
-               <class>org.jboss.cache.loader.FileCacheLoader</class>
-               <!-- same as the old CacheLoaderConfig attribute
-                  location=3D/tmp this can be part of the properties.
-                  location=3D/tmp/JBossCacheFileCacheLoader
-               -->
-               <properties>
-                  location=3Dpojoloader
-               </properties>
-               <!-- whether the cache loader writes are asynchronous -->
-               <async>false</async>
-               <!-- only one cache loader in the chain may set fetchPersis=
tentState to true.
- An exception is thrown if more than one cache loader sets this to true. -=
->
-               <fetchPersistentState>true</fetchPersistentState>
-               <!-- determines whether this cache loader ignores writes - =
defaults to false. -->
-               <ignoreModifications>false</ignoreModifications>
-            </cacheloader>
-
-         </config>
-      </attribute>
-
-   </mbean>
-
-
-</server>

Deleted: core/trunk/src/main/resources/META-INF/pojocache-passivation-servi=
ce2.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/resources/META-INF/pojocache-passivation-service2.x=
ml	2008-01-25 12:47:36 UTC (rev 5238)
+++ core/trunk/src/main/resources/META-INF/pojocache-passivation-service2.x=
ml	2008-01-25 12:50:24 UTC (rev 5239)
@@ -1,190 +0,0 @@
-<?xml version=3D"1.0" encoding=3D"UTF-8"?>
-
-<!-- =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D -->
-<!--                                                                      =
 -->
-<!--  Sample TreeCache Service Configuration                              =
 -->
-<!--                                                                      =
 -->
-<!-- =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D -->
-
-<server>
-
-   <!-- =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D -->
-   <!-- Defines TreeCache configuration                                   =
   -->
-   <!-- =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D -->
-
-   <mbean code=3D"org.jboss.cache.pojo.jmx.PojoCacheJmxWrapper"
-          name=3D"jboss.cache:service=3DTreeCache">
-
-      <depends>jboss:service=3DNaming</depends>
-      <depends>jboss:service=3DTransactionManager</depends>
-
-      <!--
-          Configure the TransactionManager
-      -->
-      <attribute name=3D"TransactionManagerLookupClass">org.jboss.cache.tr=
ansaction.GenericTransactionManagerLookup
-      </attribute>
-
-
-      <!--
-          Node locking level : SERIALIZABLE
-                               REPEATABLE_READ (default)
-                               READ_COMMITTED
-                               READ_UNCOMMITTED
-                               NONE
-      -->
-      <attribute name=3D"IsolationLevel">REPEATABLE_READ</attribute>
-
-      <!--
-           Valid modes are LOCAL
-                           REPL_ASYNC
-                           REPL_SYNC
-      -->
-      <attribute name=3D"CacheMode">REPL_SYNC</attribute>
-
-      <!-- Name of cluster. Needs to be the same for all TreeCache nodes i=
n a
-           cluster in order to find each other.
-      -->
-      <attribute name=3D"ClusterName">JBossCache-Cluster</attribute>
-
-      <!--Uncomment next three statements to enable JGroups multiplexer.
-This configuration is dependent on the JGroups multiplexer being
-registered in an MBean server such as JBossAS.  -->
-      <!--
-      <depends>jgroups.mux:name=3DMultiplexer</depends>
-      <attribute name=3D"MultiplexerService">jgroups.mux:name=3DMultiplexe=
r</attribute>
-      <attribute name=3D"MultiplexerStack">fc-fast-minimalthreads</attribu=
te>
-      -->
-
-      <!-- JGroups protocol stack properties.
-         ClusterConfig isn't used if the multiplexer is enabled and succes=
sfully initialized.
-      -->
-      <attribute name=3D"ClusterConfig">
-         <config>
-            <TCP recv_buf_size=3D"20000000" use_send_queues=3D"false"
-                 loopback=3D"false"
-                 discard_incompatible_packets=3D"true"
-                 max_bundle_size=3D"64000"
-                 max_bundle_timeout=3D"30"
-                 use_incoming_packet_handler=3D"true"
-                 enable_bundling=3D"true"
-                 enable_unicast_bundling=3D"true"
-                 enable_diagnostics=3D"true"
-
-                 use_concurrent_stack=3D"true"
-
-                 thread_naming_pattern=3D"pl"
-
-                 thread_pool.enabled=3D"true"
-                 thread_pool.min_threads=3D"1"
-                 thread_pool.max_threads=3D"4"
-                 thread_pool.keep_alive_time=3D"30000"
-                 thread_pool.queue_enabled=3D"true"
-                 thread_pool.queue_max_size=3D"50000"
-                 thread_pool.rejection_policy=3D"discard"
-
-                 oob_thread_pool.enabled=3D"true"
-                 oob_thread_pool.min_threads=3D"2"
-                 oob_thread_pool.max_threads=3D"4"
-                 oob_thread_pool.keep_alive_time=3D"10000"
-                 oob_thread_pool.queue_enabled=3D"false"
-                 oob_thread_pool.queue_max_size=3D"10"
-                 oob_thread_pool.rejection_policy=3D"Run"/>
-
-            <!--<PING timeout=3D"2000" num_initial_members=3D"3"/>-->
-             <MPING mcast_addr=3D"232.1.2.3" timeout=3D"2000" num_initial_=
members=3D"3"/>
-            <MERGE2 max_interval=3D"30000" min_interval=3D"10000"/>
-            <FD_SOCK/>
-            <FD timeout=3D"10000" max_tries=3D"5" shun=3D"true"/>
-            <VERIFY_SUSPECT timeout=3D"1500"/>
-            <pbcast.NAKACK use_mcast_xmit=3D"false" gc_lag=3D"0"
-                           retransmit_timeout=3D"300,600,1200,2400,4800"
-                           discard_delivered_msgs=3D"true"/>
-            <!--<UNICAST timeout=3D"30,60,120,300,600,1200,2400,3600"/>-->
-            <pbcast.STABLE stability_delay=3D"1000" desired_avg_gossip=3D"=
50000"
-                           max_bytes=3D"400000"/>
-            <pbcast.GMS print_local_addr=3D"true" join_timeout=3D"5000"
-                        join_retry_timeout=3D"2000" shun=3D"false"
-                        view_bundling=3D"true" view_ack_collection_timeout=
=3D"5000"/>
-              <FC max_credits=3D"5000000"
-                    min_threshold=3D"0.20"/>
-            <FRAG2 frag_size=3D"60000"/>
-            <pbcast.STREAMING_STATE_TRANSFER use_reading_thread=3D"true"/>
-            <!-- <pbcast.STATE_TRANSFER/> -->
-            <pbcast.FLUSH timeout=3D"0"/>
-         </config>
-      </attribute>
-
-      <!--
-          The max amount of time (in milliseconds) we wait until the
-          state (ie. the contents of the cache) are retrieved from
-          existing members in a clustered environment
-      -->
-      <attribute name=3D"StateRetrievalTimeout">20000</attribute>
-
-      <!--
-          Number of milliseconds to wait until all responses for a
-          synchronous call have been received.
-      -->
-      <attribute name=3D"SyncReplTimeout">20000</attribute>
-
-      <!-- Max number of milliseconds to wait for a lock acquisition -->
-      <attribute name=3D"LockAcquisitionTimeout">15000</attribute>
-
-
-      <!-- Specific eviction policy configurations. This is LRU -->
-      <!--
-      PojoCache passivation only allows configuration of global region. If=
 you need to
-      configure multiple regions, you can turn on the marshalling region s=
uch that
-      internal JBoss region is stored under the individual region.
-      -->
-      <attribute name=3D"EvictionPolicyConfig">
-         <config>
-            <attribute name=3D"wakeUpIntervalSeconds">3</attribute>
-            <!-- This defaults to 200000 if not specified -->
-            <attribute name=3D"eventQueueSize">200000</attribute>
-            <!-- Name of the DEFAULT eviction policy class. -->
-            <attribute name=3D"policyClass">org.jboss.cache.eviction.LRUPo=
licy</attribute>
-
-
-            <!-- Cache wide default -->
-            <region name=3D"/_default_">
-               <attribute name=3D"maxNodes">5000</attribute>
-               <attribute name=3D"timeToLiveSeconds">3</attribute>
-            </region>
-         </config>
-      </attribute>
-
-      <!-- Cache Loader configuration block -->
-      <attribute name=3D"CacheLoaderConfig">
-         <config>
-            <!-- if passivation is true, only the first cache loader is us=
ed; the rest are ignored -->
-            <passivation>true</passivation>
-            <preload>/</preload>
-            <shared>false</shared>
-
-            <!-- we can now have multiple cache loaders, which get chained=
 -->
-            <cacheloader>
-               <class>org.jboss.cache.loader.FileCacheLoader</class>
-               <!-- same as the old CacheLoaderConfig attribute
-                  location=3D/tmp this can be part of the properties.
-                  location=3D/tmp/JBossCacheFileCacheLoader
-               -->
-               <properties>
-                  location=3Dpojoloader2
-               </properties>
-               <!-- whether the cache loader writes are asynchronous -->
-               <async>false</async>
-               <!-- only one cache loader in the chain may set fetchPersis=
tentState to true.
- An exception is thrown if more than one cache loader sets this to true. -=
->
-               <fetchPersistentState>true</fetchPersistentState>
-               <!-- determines whether this cache loader ignores writes - =
defaults to false. -->
-               <ignoreModifications>false</ignoreModifications>
-            </cacheloader>
-
-         </config>
-      </attribute>
-
-   </mbean>
-
-
-</server>

Deleted: core/trunk/src/main/resources/META-INF/policyPerRegion-eviction-se=
rvice.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/resources/META-INF/policyPerRegion-eviction-service=
.xml	2008-01-25 12:47:36 UTC (rev 5238)
+++ core/trunk/src/main/resources/META-INF/policyPerRegion-eviction-service=
.xml	2008-01-25 12:50:24 UTC (rev 5239)
@@ -1,162 +0,0 @@
-<?xml version=3D"1.0" encoding=3D"UTF-8"?>
-
-<!-- =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D -->
-<!--                                                                      =
 -->
-<!--  Sample TreeCache Service Configuration                              =
 -->
-<!--                                                                      =
 -->
-<!-- =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D -->
-
-<server>
-
-   <!-- =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D -->
-   <!-- Defines TreeCache configuration                                   =
   -->
-   <!-- =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D -->
-
-   <mbean code=3D"org.jboss.cache.jmx.CacheJmxWrapper"
-          name=3D"jboss.cache:service=3DTreeCache">
-
-      <depends>jboss:service=3DNaming</depends>
-      <depends>jboss:service=3DTransactionManager</depends>
-
-      <!--
-          Configure the TransactionManager
-      -->
-      <attribute name=3D"TransactionManagerLookupClass">org.jboss.cache.tr=
ansaction.GenericTransactionManagerLookup
-      </attribute>
-
-
-      <!--
-          Node locking level : SERIALIZABLE
-                               REPEATABLE_READ (default)
-                               READ_COMMITTED
-                               READ_UNCOMMITTED
-                               NONE
-      -->
-      <attribute name=3D"IsolationLevel">REPEATABLE_READ</attribute>
-
-      <!--
-           Valid modes are LOCAL
-                           REPL_ASYNC
-                           REPL_SYNC
-      -->
-      <attribute name=3D"CacheMode">LOCAL</attribute>
-
-      <!-- Name of cluster. Needs to be the same for all TreeCache nodes i=
n a
-           cluster in order to find each other.
-      -->
-      <attribute name=3D"ClusterName">JBossCache-Cluster</attribute>
-
-      <!--Uncomment next three statements to enable JGroups multiplexer.
-This configuration is dependent on the JGroups multiplexer being
-registered in an MBean server such as JBossAS.  -->
-      <!--
-      <depends>jgroups.mux:name=3DMultiplexer</depends>
-      <attribute name=3D"MultiplexerService">jgroups.mux:name=3DMultiplexe=
r</attribute>
-      <attribute name=3D"MultiplexerStack">fc-fast-minimalthreads</attribu=
te>
-      -->
-
-      <!-- JGroups protocol stack properties.
-         ClusterConfig isn't used if the multiplexer is enabled and succes=
sfully initialized.
-      -->
-      <attribute name=3D"ClusterConfig">
-         <config>
-            <TCP recv_buf_size=3D"20000000" use_send_queues=3D"false"
-                 loopback=3D"false"
-                 discard_incompatible_packets=3D"true"
-                 max_bundle_size=3D"64000"
-                 max_bundle_timeout=3D"30"
-                 use_incoming_packet_handler=3D"true"
-                 enable_bundling=3D"true"
-                 enable_unicast_bundling=3D"true"
-                 enable_diagnostics=3D"true"
-                 use_concurrent_stack=3D"true"
-                 thread_naming_pattern=3D"pl"
-                 thread_pool.enabled=3D"true"
-                 thread_pool.min_threads=3D"1"
-                 thread_pool.max_threads=3D"4"
-                 thread_pool.keep_alive_time=3D"30000"
-                 thread_pool.queue_enabled=3D"true"
-                 thread_pool.queue_max_size=3D"50000"
-                 thread_pool.rejection_policy=3D"discard"
-                 oob_thread_pool.enabled=3D"true"
-                 oob_thread_pool.min_threads=3D"2"
-                 oob_thread_pool.max_threads=3D"4"
-                 oob_thread_pool.keep_alive_time=3D"10000"
-                 oob_thread_pool.queue_enabled=3D"false"
-                 oob_thread_pool.queue_max_size=3D"10"
-                 oob_thread_pool.rejection_policy=3D"Run"/>
-            <!--<PING timeout=3D"2000" num_initial_members=3D"3"/>-->
-             <MPING mcast_addr=3D"232.1.2.3" timeout=3D"2000" num_initial_=
members=3D"3"/>
-            <MERGE2 max_interval=3D"30000" min_interval=3D"10000"/>
-            <FD_SOCK/>
-            <FD timeout=3D"10000" max_tries=3D"5" shun=3D"true"/>
-            <VERIFY_SUSPECT timeout=3D"1500"/>
-            <pbcast.NAKACK use_mcast_xmit=3D"false" gc_lag=3D"0"
-                           retransmit_timeout=3D"300,600,1200,2400,4800"
-                           discard_delivered_msgs=3D"true"/>
-            <!--<UNICAST timeout=3D"30,60,120,300,600,1200,2400,3600"/>-->
-            <pbcast.STABLE stability_delay=3D"1000" desired_avg_gossip=3D"=
50000"
-                           max_bytes=3D"400000"/>
-            <pbcast.GMS print_local_addr=3D"true" join_timeout=3D"5000"
-                        join_retry_timeout=3D"2000" shun=3D"false"
-                        view_bundling=3D"true" view_ack_collection_timeout=
=3D"5000"/>
-              <FC max_credits=3D"5000000"
-                    min_threshold=3D"0.20"/>
-            <FRAG2 frag_size=3D"60000"/>
-            <pbcast.STREAMING_STATE_TRANSFER use_reading_thread=3D"true"/>
-            <!-- <pbcast.STATE_TRANSFER/> -->
-            <pbcast.FLUSH timeout=3D"0"/>
-         </config>
-      </attribute>
-
-
-      <!--
-          The max amount of time (in milliseconds) we wait until the
-          state (ie. the contents of the cache) are retrieved from
-          existing members in a clustered environment
-      -->
-      <attribute name=3D"StateRetrievalTimeout">20000</attribute>
-
-      <!--
-          Number of milliseconds to wait until all responses for a
-          synchronous call have been received.
-      -->
-      <attribute name=3D"SyncReplTimeout">20000</attribute>
-
-      <!-- Max number of milliseconds to wait for a lock acquisition -->
-      <attribute name=3D"LockAcquisitionTimeout">15000</attribute>
-
-
-      <!-- Specific eviction policy configurations. This is LRU -->
-      <attribute name=3D"EvictionPolicyConfig">
-         <config>
-            <attribute name=3D"wakeUpIntervalSeconds">5</attribute>
-            <!-- This defaults to 200000 if not specified -->
-            <attribute name=3D"eventQueueSize">200000</attribute>
-
-            <!-- Cache wide default -->
-            <region name=3D"/_default_" policyClass=3D"org.jboss.cache.evi=
ction.LRUPolicy">
-               <attribute name=3D"maxNodes">5000</attribute>
-               <attribute name=3D"timeToLiveSeconds">1000</attribute>
-            </region>
-            <region name=3D"/org/jboss/data" policyClass=3D"org.jboss.cach=
e.eviction.LFUPolicy">
-               <attribute name=3D"maxNodes">5000</attribute>
-               <attribute name=3D"minNodes">1000</attribute>
-            </region>
-            <region name=3D"/org/jboss/test/data" policyClass=3D"org.jboss=
.cache.eviction.FIFOPolicy">
-               <attribute name=3D"maxNodes">5</attribute>
-            </region>
-            <region name=3D"/test/" policyClass=3D"org.jboss.cache.evictio=
n.MRUPolicy">
-               <attribute name=3D"maxNodes">10000</attribute>
-            </region>
-            <region name=3D"/maxAgeTest/" policyClass=3D"org.jboss.cache.e=
viction.LRUPolicy">
-               <attribute name=3D"maxNodes">10000</attribute>
-               <attribute name=3D"timeToLiveSeconds">8</attribute>
-               <attribute name=3D"maxAgeSeconds">10</attribute>
-            </region>
-         </config>
-      </attribute>
-   </mbean>
-
-
-</server>

Deleted: core/trunk/src/main/resources/META-INF/replAsync-service.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/resources/META-INF/replAsync-service.xml	2008-01-25=
 12:47:36 UTC (rev 5238)
+++ core/trunk/src/main/resources/META-INF/replAsync-service.xml	2008-01-25=
 12:50:24 UTC (rev 5239)
@@ -1,166 +0,0 @@
-<?xml version=3D"1.0" encoding=3D"UTF-8"?>
-
-<!-- =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D -->
-<!--                                                                      =
 -->
-<!--  Sample TreeCache Service Configuration                              =
 -->
-<!--                                                                      =
 -->
-<!-- =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D -->
-
-<server>
-
-   <!-- =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D -->
-   <!-- Defines TreeCache configuration                                   =
   -->
-   <!-- =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D -->
-
-   <mbean code=3D"org.jboss.cache.jmx.CacheJmxWrapper"
-          name=3D"jboss.cache:service=3DTreeCache">
-
-      <depends>jboss:service=3DNaming</depends>
-      <depends>jboss:service=3DTransactionManager</depends>
-
-      <!--
-          Configure the TransactionManager
-      -->
-      <attribute name=3D"TransactionManagerLookupClass">org.jboss.cache.tr=
ansaction.GenericTransactionManagerLookup
-      </attribute>
-
-      <!--
-          Isolation level : SERIALIZABLE
-                            REPEATABLE_READ (default)
-                            READ_COMMITTED
-                            READ_UNCOMMITTED
-                            NONE
-      -->
-      <attribute name=3D"IsolationLevel">REPEATABLE_READ</attribute>
-
-      <!--
-           Valid modes are LOCAL
-                           REPL_ASYNC
-                           REPL_SYNC
-                           INVALIDATION_ASYNC
-                           INVALIDATION_SYNC
-      -->
-      <attribute name=3D"CacheMode">REPL_ASYNC</attribute>
-
-      <!--
-      Just used for async repl: use a replication queue
-      -->
-      <attribute name=3D"UseReplQueue">false</attribute>
-
-      <!--
-          Replication interval for replication queue (in ms)
-      -->
-      <attribute name=3D"ReplQueueInterval">0</attribute>
-
-      <!--
-          Max number of elements which trigger replication
-      -->
-      <attribute name=3D"ReplQueueMaxElements">0</attribute>
-
-      <!-- Name of cluster. Needs to be the same for all TreeCache nodes i=
n a
-           cluster in order to find each other.
-      -->
-      <attribute name=3D"ClusterName">JBossCache-Cluster</attribute>
-
-      <!--Uncomment next three statements to enable JGroups multiplexer.
-This configuration is dependent on the JGroups multiplexer being
-registered in an MBean server such as JBossAS.  -->
-      <!--
-      <depends>jgroups.mux:name=3DMultiplexer</depends>
-      <attribute name=3D"MultiplexerService">jgroups.mux:name=3DMultiplexe=
r</attribute>
-      <attribute name=3D"MultiplexerStack">fc-fast-minimalthreads</attribu=
te>
-      -->
-
-      <!-- JGroups protocol stack properties.
-         ClusterConfig isn't used if the multiplexer is enabled and succes=
sfully initialized.
-      -->
-      <attribute name=3D"ClusterConfig">
-         <config>
-            <TCP recv_buf_size=3D"20000000" use_send_queues=3D"false"
-                 loopback=3D"false"
-                 discard_incompatible_packets=3D"true"
-                 max_bundle_size=3D"64000"
-                 max_bundle_timeout=3D"30"
-                 use_incoming_packet_handler=3D"true"
-                 enable_bundling=3D"true"
-                 enable_unicast_bundling=3D"true"
-                 enable_diagnostics=3D"true"
-                 use_concurrent_stack=3D"true"
-                 thread_naming_pattern=3D"pl"
-                 thread_pool.enabled=3D"true"
-                 thread_pool.min_threads=3D"1"
-                 thread_pool.max_threads=3D"4"
-                 thread_pool.keep_alive_time=3D"30000"
-                 thread_pool.queue_enabled=3D"true"
-                 thread_pool.queue_max_size=3D"50000"
-                 thread_pool.rejection_policy=3D"discard"
-                 oob_thread_pool.enabled=3D"true"
-                 oob_thread_pool.min_threads=3D"2"
-                 oob_thread_pool.max_threads=3D"4"
-                 oob_thread_pool.keep_alive_time=3D"10000"
-                 oob_thread_pool.queue_enabled=3D"false"
-                 oob_thread_pool.queue_max_size=3D"10"
-                 oob_thread_pool.rejection_policy=3D"Run"/>
-            <!--<PING timeout=3D"2000" num_initial_members=3D"3"/>-->
-             <MPING mcast_addr=3D"232.1.2.3" timeout=3D"2000" num_initial_=
members=3D"3"/>
-            <MERGE2 max_interval=3D"30000" min_interval=3D"10000"/>
-            <FD_SOCK/>
-            <FD timeout=3D"10000" max_tries=3D"5" shun=3D"true"/>
-            <VERIFY_SUSPECT timeout=3D"1500"/>
-            <pbcast.NAKACK use_mcast_xmit=3D"false" gc_lag=3D"0"
-                           retransmit_timeout=3D"300,600,1200,2400,4800"
-                           discard_delivered_msgs=3D"true"/>
-            <!--<UNICAST timeout=3D"30,60,120,300,600,1200,2400,3600"/>-->
-            <pbcast.STABLE stability_delay=3D"1000" desired_avg_gossip=3D"=
50000"
-                           max_bytes=3D"400000"/>
-            <pbcast.GMS print_local_addr=3D"true" join_timeout=3D"5000"
-                        join_retry_timeout=3D"2000" shun=3D"false"
-                        view_bundling=3D"true" view_ack_collection_timeout=
=3D"5000"/>
-              <FC max_credits=3D"5000000"
-                    min_threshold=3D"0.20"/>
-            <FRAG2 frag_size=3D"60000"/>
-            <pbcast.STREAMING_STATE_TRANSFER use_reading_thread=3D"true"/>
-            <!-- <pbcast.STATE_TRANSFER/> -->
-            <pbcast.FLUSH timeout=3D"0"/>
-         </config>
-      </attribute>
-
-      <!--
-       Whether or not to fetch state on joining a cluster
-       NOTE this used to be called FetchStateOnStartup and has been rename=
d to be more descriptive.
-      -->
-      <attribute name=3D"FetchInMemoryState">true</attribute>
-
-      <!--
-          The max amount of time (in milliseconds) we wait until the
-          state (ie. the contents of the cache) are retrieved from
-          existing members in a clustered environment
-      -->
-      <attribute name=3D"StateRetrievalTimeout">20000</attribute>
-
-      <!--
-          Number of milliseconds to wait until all responses for a
-          synchronous call have been received.
-      -->
-      <attribute name=3D"SyncReplTimeout">20000</attribute>
-
-      <!-- Max number of milliseconds to wait for a lock acquisition -->
-      <attribute name=3D"LockAcquisitionTimeout">15000</attribute>
-
-      <!--
-         Indicate whether to use region based marshalling or not. Set this=
 to true if you are running under a scoped
-         class loader, e.g., inside an application server. Default is "fal=
se".
-      -->
-      <attribute name=3D"UseRegionBasedMarshalling">false</attribute>
-
-   </mbean>
-
-
-   <!--  Uncomment to get a graphical view of the TreeCache MBean above -->
-   <!--   <mbean code=3D"org.jboss.cache.TreeCacheView" name=3D"jboss.cach=
e:service=3DTreeCacheView">-->
-   <!--      <depends>jboss.cache:service=3DTreeCache</depends>-->
-   <!--      <attribute name=3D"CacheService">jboss.cache:service=3DTreeCa=
che</attribute>-->
-   <!--   </mbean>-->
-
-
-</server>

Deleted: core/trunk/src/main/resources/META-INF/replSync-passivation-servic=
e.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/resources/META-INF/replSync-passivation-service.xml=
	2008-01-25 12:47:36 UTC (rev 5238)
+++ core/trunk/src/main/resources/META-INF/replSync-passivation-service.xml=
	2008-01-25 12:50:24 UTC (rev 5239)
@@ -1,182 +0,0 @@
-<?xml version=3D"1.0" encoding=3D"UTF-8"?>
-
-<!-- =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D -->
-<!--                                                                      =
 -->
-<!--  Sample TreeCache Service Configuration                              =
 -->
-<!--                                                                      =
 -->
-<!-- =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D -->
-
-<server>
-
-   <!-- =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D -->
-   <!-- Defines TreeCache configuration                                   =
   -->
-   <!-- =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D -->
-
-   <mbean code=3D"org.jboss.cache.jmx.CacheJmxWrapper"
-          name=3D"jboss.cache:service=3DTreeCache">
-
-      <depends>jboss:service=3DNaming</depends>
-      <depends>jboss:service=3DTransactionManager</depends>
-
-      <!--
-          Configure the TransactionManager
-      -->
-      <attribute name=3D"TransactionManagerLookupClass">org.jboss.cache.tr=
ansaction.GenericTransactionManagerLookup
-      </attribute>
-
-
-      <!--
-          Node locking level : SERIALIZABLE
-                               REPEATABLE_READ (default)
-                               READ_COMMITTED
-                               READ_UNCOMMITTED
-                               NONE
-      -->
-      <attribute name=3D"IsolationLevel">REPEATABLE_READ</attribute>
-
-      <!--
-           Valid modes are LOCAL
-                           REPL_ASYNC
-                           REPL_SYNC
-      -->
-      <attribute name=3D"CacheMode">REPL_SYNC</attribute>
-
-      <!-- Name of cluster. Needs to be the same for all TreeCache nodes i=
n a
-           cluster in order to find each other.
-      -->
-      <attribute name=3D"ClusterName">JBossCache-Cluster</attribute>
-
-      <!--Uncomment next three statements to enable JGroups multiplexer.
-This configuration is dependent on the JGroups multiplexer being
-registered in an MBean server such as JBossAS.  -->
-      <!--
-      <depends>jgroups.mux:name=3DMultiplexer</depends>
-      <attribute name=3D"MultiplexerService">jgroups.mux:name=3DMultiplexe=
r</attribute>
-      <attribute name=3D"MultiplexerStack">fc-fast-minimalthreads</attribu=
te>
-      -->
-
-      <!-- JGroups protocol stack properties.
-         ClusterConfig isn't used if the multiplexer is enabled and succes=
sfully initialized.
-      -->
-      <attribute name=3D"ClusterConfig">
-         <config>
-            <TCP recv_buf_size=3D"20000000" use_send_queues=3D"false"
-                 loopback=3D"false"
-                 discard_incompatible_packets=3D"true"
-                 max_bundle_size=3D"64000"
-                 max_bundle_timeout=3D"30"
-                 use_incoming_packet_handler=3D"true"
-                 enable_bundling=3D"true"
-                 enable_unicast_bundling=3D"true"
-                 enable_diagnostics=3D"true"
-                 use_concurrent_stack=3D"true"
-                 thread_naming_pattern=3D"pl"
-                 thread_pool.enabled=3D"true"
-                 thread_pool.min_threads=3D"1"
-                 thread_pool.max_threads=3D"4"
-                 thread_pool.keep_alive_time=3D"30000"
-                 thread_pool.queue_enabled=3D"true"
-                 thread_pool.queue_max_size=3D"50000"
-                 thread_pool.rejection_policy=3D"discard"
-                 oob_thread_pool.enabled=3D"true"
-                 oob_thread_pool.min_threads=3D"2"
-                 oob_thread_pool.max_threads=3D"4"
-                 oob_thread_pool.keep_alive_time=3D"10000"
-                 oob_thread_pool.queue_enabled=3D"false"
-                 oob_thread_pool.queue_max_size=3D"10"
-                 oob_thread_pool.rejection_policy=3D"Run"/>
-            <!--<PING timeout=3D"2000" num_initial_members=3D"3"/>-->
-             <MPING mcast_addr=3D"232.1.2.3" timeout=3D"2000" num_initial_=
members=3D"3"/>
-            <MERGE2 max_interval=3D"30000" min_interval=3D"10000"/>
-            <FD_SOCK/>
-            <FD timeout=3D"10000" max_tries=3D"5" shun=3D"true"/>
-            <VERIFY_SUSPECT timeout=3D"1500"/>
-            <pbcast.NAKACK use_mcast_xmit=3D"false" gc_lag=3D"0"
-                           retransmit_timeout=3D"300,600,1200,2400,4800"
-                           discard_delivered_msgs=3D"true"/>
-            <!--<UNICAST timeout=3D"30,60,120,300,600,1200,2400,3600"/>-->
-            <pbcast.STABLE stability_delay=3D"1000" desired_avg_gossip=3D"=
50000"
-                           max_bytes=3D"400000"/>
-            <pbcast.GMS print_local_addr=3D"true" join_timeout=3D"5000"
-                        join_retry_timeout=3D"2000" shun=3D"false"
-                        view_bundling=3D"true" view_ack_collection_timeout=
=3D"5000"/>
-              <FC max_credits=3D"5000000"
-                    min_threshold=3D"0.20"/>
-            <FRAG2 frag_size=3D"60000"/>
-            <pbcast.STREAMING_STATE_TRANSFER use_reading_thread=3D"true"/>
-            <!-- <pbcast.STATE_TRANSFER/> -->
-            <pbcast.FLUSH timeout=3D"0"/>
-         </config>
-      </attribute>
-
-
-      <!--
-          The max amount of time (in milliseconds) we wait until the
-          state (ie. the contents of the cache) are retrieved from
-          existing members in a clustered environment
-      -->
-      <attribute name=3D"StateRetrievalTimeout">20000</attribute>
-
-      <!--
-          Number of milliseconds to wait until all responses for a
-          synchronous call have been received.
-      -->
-      <attribute name=3D"SyncReplTimeout">20000</attribute>
-
-      <!-- Max number of milliseconds to wait for a lock acquisition -->
-      <attribute name=3D"LockAcquisitionTimeout">15000</attribute>
-
-      <!-- Specific eviction policy configurations. This is LRU -->
-      <attribute name=3D"EvictionPolicyConfig">
-         <config>
-            <attribute name=3D"wakeUpIntervalSeconds">5</attribute>
-            <!-- This defaults to 200000 if not specified -->
-            <attribute name=3D"eventQueueSize">200000</attribute>
-            <!-- Name of the DEFAULT eviction policy class. -->
-            <attribute name=3D"policyClass">org.jboss.cache.eviction.LRUPo=
licy</attribute>
-
-
-            <!-- Cache wide default -->
-            <region name=3D"/_default_">
-               <attribute name=3D"maxNodes">5000</attribute>
-               <attribute name=3D"timeToLiveSeconds">3</attribute>
-            </region>
-            <region name=3D"/org/jboss/test/data">
-               <attribute name=3D"maxNodes">100</attribute>
-               <attribute name=3D"timeToLiveSeconds">3</attribute>
-            </region>
-         </config>
-      </attribute>
-
-      <!-- New 1.3.x cache loader config block -->
-      <attribute name=3D"CacheLoaderConfiguration">
-         <config>
-            <!-- if passivation is true, only the first cache loader is us=
ed; the rest are ignored -->
-            <passivation>true</passivation>
-            <preload>/</preload>
-            <shared>false</shared>
-
-            <!-- we can now have multiple cache loaders, which get chained=
 -->
-            <cacheloader>
-               <class>org.jboss.cache.loader.FileCacheLoader</class>
-               <!-- same as the old CacheLoaderConfig attribute
-                  location=3D/tmp this can be part of the properties.
-               -->
-               <properties>
-               </properties>
-               <!-- whether the cache loader writes are asynchronous -->
-               <async>false</async>
-               <!-- only one cache loader in the chain may set fetchPersis=
tentState to true.
- An exception is thrown if more than one cache loader sets this to true. -=
->
-               <fetchPersistentState>true</fetchPersistentState>
-               <!-- determines whether this cache loader ignores writes - =
defaults to false. -->
-               <ignoreModifications>false</ignoreModifications>
-            </cacheloader>
-
-         </config>
-      </attribute>
-
-   </mbean>
-
-
-</server>

Deleted: core/trunk/src/main/resources/META-INF/replSync-service-test.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/resources/META-INF/replSync-service-test.xml	2008-0=
1-25 12:47:36 UTC (rev 5238)
+++ core/trunk/src/main/resources/META-INF/replSync-service-test.xml	2008-0=
1-25 12:50:24 UTC (rev 5239)
@@ -1,166 +0,0 @@
-<?xml version=3D"1.0" encoding=3D"UTF-8"?>
-
-<!-- =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D -->
-<!--                                                                      =
 -->
-<!--  Sample TreeCache Service Configuration                              =
 -->
-<!--                                                                      =
 -->
-<!-- =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D -->
-
-<server>
-
-   <!-- =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D -->
-   <!-- Defines TreeCache configuration                                   =
   -->
-   <!-- =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D -->
-
-   <mbean code=3D"org.jboss.cache.jmx.CacheJmxWrapper"
-          name=3D"jboss.cache:service=3DTreeCache">
-
-      <depends>jboss:service=3DNaming</depends>
-      <depends>jboss:service=3DTransactionManager</depends>
-
-      <!--
-          Configure the TransactionManager
-      -->
-      <attribute name=3D"TransactionManagerLookupClass">org.jboss.cache.tr=
ansaction.GenericTransactionManagerLookup
-      </attribute>
-
-      <!--
-          Isolation level : SERIALIZABLE
-                            REPEATABLE_READ (default)
-                            READ_COMMITTED
-                            READ_UNCOMMITTED
-                            NONE
-      -->
-      <attribute name=3D"IsolationLevel">REPEATABLE_READ</attribute>
-
-      <!--
-           Valid modes are LOCAL
-                           REPL_ASYNC
-                           REPL_SYNC
-                           INVALIDATION_ASYNC
-                           INVALIDATION_SYNC
-      -->
-      <attribute name=3D"CacheMode">REPL_SYNC</attribute>
-
-      <!--
-      Just used for async repl: use a replication queue
-      -->
-      <attribute name=3D"UseReplQueue">false</attribute>
-
-      <!--
-          Replication interval for replication queue (in ms)
-      -->
-      <attribute name=3D"ReplQueueInterval">0</attribute>
-
-      <!--
-          Max number of elements which trigger replication
-      -->
-      <attribute name=3D"ReplQueueMaxElements">0</attribute>
-
-      <!-- Name of cluster. Needs to be the same for all TreeCache nodes i=
n a
-           cluster in order to find each other.
-      -->
-      <attribute name=3D"ClusterName">JBossCache-Cluster</attribute>
-
-      <!--Uncomment next three statements to enable JGroups multiplexer.
-This configuration is dependent on the JGroups multiplexer being
-registered in an MBean server such as JBossAS.  -->
-      <!--
-      <depends>jgroups.mux:name=3DMultiplexer</depends>
-      <attribute name=3D"MultiplexerService">jgroups.mux:name=3DMultiplexe=
r</attribute>
-      <attribute name=3D"MultiplexerStack">fc-fast-minimalthreads</attribu=
te>
-      -->
-
-      <!-- JGroups protocol stack properties.
-         ClusterConfig isn't used if the multiplexer is enabled and succes=
sfully initialized.
-      -->
-      <attribute name=3D"ClusterConfig">
-         <config>
-            <TCP recv_buf_size=3D"20000000" use_send_queues=3D"false"
-                 loopback=3D"false"
-                 discard_incompatible_packets=3D"true"
-                 max_bundle_size=3D"64000"
-                 max_bundle_timeout=3D"30"
-                 use_incoming_packet_handler=3D"true"
-                 enable_bundling=3D"true"
-                 enable_unicast_bundling=3D"true"
-                 enable_diagnostics=3D"true"
-                 use_concurrent_stack=3D"true"
-                 thread_naming_pattern=3D"pl"
-                 thread_pool.enabled=3D"true"
-                 thread_pool.min_threads=3D"1"
-                 thread_pool.max_threads=3D"4"
-                 thread_pool.keep_alive_time=3D"30000"
-                 thread_pool.queue_enabled=3D"true"
-                 thread_pool.queue_max_size=3D"50000"
-                 thread_pool.rejection_policy=3D"discard"
-                 oob_thread_pool.enabled=3D"true"
-                 oob_thread_pool.min_threads=3D"2"
-                 oob_thread_pool.max_threads=3D"4"
-                 oob_thread_pool.keep_alive_time=3D"10000"
-                 oob_thread_pool.queue_enabled=3D"false"
-                 oob_thread_pool.queue_max_size=3D"10"
-                 oob_thread_pool.rejection_policy=3D"Run"/>
-            <!--<PING timeout=3D"2000" num_initial_members=3D"3"/>-->
-             <MPING mcast_addr=3D"232.1.2.3" timeout=3D"2000" num_initial_=
members=3D"3"/>
-            <MERGE2 max_interval=3D"30000" min_interval=3D"10000"/>
-            <FD_SOCK/>
-            <FD timeout=3D"10000" max_tries=3D"5" shun=3D"true"/>
-            <VERIFY_SUSPECT timeout=3D"1500"/>
-            <pbcast.NAKACK use_mcast_xmit=3D"false" gc_lag=3D"0"
-                           retransmit_timeout=3D"300,600,1200,2400,4800"
-                           discard_delivered_msgs=3D"true"/>
-            <!--<UNICAST timeout=3D"30,60,120,300,600,1200,2400,3600"/>-->
-            <pbcast.STABLE stability_delay=3D"1000" desired_avg_gossip=3D"=
50000"
-                           max_bytes=3D"400000"/>
-            <pbcast.GMS print_local_addr=3D"true" join_timeout=3D"5000"
-                        join_retry_timeout=3D"2000" shun=3D"false"
-                        view_bundling=3D"true" view_ack_collection_timeout=
=3D"5000"/>
-              <FC max_credits=3D"5000000"
-                    min_threshold=3D"0.20"/>
-            <FRAG2 frag_size=3D"60000"/>
-            <pbcast.STREAMING_STATE_TRANSFER use_reading_thread=3D"true"/>
-            <!-- <pbcast.STATE_TRANSFER/> -->
-            <pbcast.FLUSH timeout=3D"0"/>
-         </config>
-      </attribute>
-
-
-      <!--
-       Whether or not to fetch state on joining a cluster
-       NOTE this used to be called FetchStateOnStartup and has been rename=
d to be more descriptive.
-      -->
-      <attribute name=3D"FetchInMemoryState">true</attribute>
-
-      <!--
-          The max amount of time (in milliseconds) we wait until the
-          state (ie. the contents of the cache) are retrieved from
-          existing members in a clustered environment
-      -->
-      <attribute name=3D"StateRetrievalTimeout">15000</attribute>
-
-      <!--
-          Number of milliseconds to wait until all responses for a
-          synchronous call have been received.
-      -->
-      <attribute name=3D"SyncReplTimeout">15000</attribute>
-
-      <!-- Max number of milliseconds to wait for a lock acquisition -->
-      <attribute name=3D"LockAcquisitionTimeout">10000</attribute>
-
-      <!--
-         Indicate whether to use region based marshalling or not. Set this=
 to true if you are running under a scoped
-         class loader, e.g., inside an application server. Default is "fal=
se".
-      -->
-      <attribute name=3D"UseRegionBasedMarshalling">true</attribute>
-   </mbean>
-
-
-   <!--  Uncomment to get a graphical view of the TreeCache MBean above -->
-   <!--   <mbean code=3D"org.jboss.cache.TreeCacheView" name=3D"jboss.cach=
e:service=3DTreeCacheView">-->
-   <!--      <depends>jboss.cache:service=3DTreeCache</depends>-->
-   <!--      <attribute name=3D"CacheService">jboss.cache:service=3DTreeCa=
che</attribute>-->
-   <!--   </mbean>-->
-
-
-</server>

Deleted: core/trunk/src/main/resources/META-INF/replSync-service.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/resources/META-INF/replSync-service.xml	2008-01-25 =
12:47:36 UTC (rev 5238)
+++ core/trunk/src/main/resources/META-INF/replSync-service.xml	2008-01-25 =
12:50:24 UTC (rev 5239)
@@ -1,166 +0,0 @@
-<?xml version=3D"1.0" encoding=3D"UTF-8"?>
-
-<!-- =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D -->
-<!--                                                                      =
 -->
-<!--  Sample TreeCache Service Configuration                              =
 -->
-<!--                                                                      =
 -->
-<!-- =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D -->
-
-<server>
-
-   <!-- =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D -->
-   <!-- Defines TreeCache configuration                                   =
   -->
-   <!-- =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D -->
-
-   <mbean code=3D"org.jboss.cache.jmx.CacheJmxWrapper"
-          name=3D"jboss.cache:service=3DTreeCache">
-
-      <depends>jboss:service=3DNaming</depends>
-      <depends>jboss:service=3DTransactionManager</depends>
-
-      <!--
-          Configure the TransactionManager
-      -->
-      <attribute name=3D"TransactionManagerLookupClass">org.jboss.cache.tr=
ansaction.GenericTransactionManagerLookup
-      </attribute>
-
-      <!--
-          Isolation level : SERIALIZABLE
-                            REPEATABLE_READ (default)
-                            READ_COMMITTED
-                            READ_UNCOMMITTED
-                            NONE
-      -->
-      <attribute name=3D"IsolationLevel">REPEATABLE_READ</attribute>
-
-      <!--
-           Valid modes are LOCAL
-                           REPL_ASYNC
-                           REPL_SYNC
-                           INVALIDATION_ASYNC
-                           INVALIDATION_SYNC
-      -->
-      <attribute name=3D"CacheMode">REPL_SYNC</attribute>
-
-      <!--
-      Just used for async repl: use a replication queue
-      -->
-      <attribute name=3D"UseReplQueue">false</attribute>
-
-      <!--
-          Replication interval for replication queue (in ms)
-      -->
-      <attribute name=3D"ReplQueueInterval">0</attribute>
-
-      <!--
-          Max number of elements which trigger replication
-      -->
-      <attribute name=3D"ReplQueueMaxElements">0</attribute>
-
-      <!-- Name of cluster. Needs to be the same for all TreeCache nodes i=
n a
-           cluster in order to find each other.
-      -->
-      <attribute name=3D"ClusterName">JBossCache-Cluster</attribute>
-
-      <!--Uncomment next three statements to enable JGroups multiplexer.
-This configuration is dependent on the JGroups multiplexer being
-registered in an MBean server such as JBossAS.  -->
-      <!--
-      <depends>jgroups.mux:name=3DMultiplexer</depends>
-      <attribute name=3D"MultiplexerService">jgroups.mux:name=3DMultiplexe=
r</attribute>
-      <attribute name=3D"MultiplexerStack">fc-fast-minimalthreads</attribu=
te>
-      -->
-
-      <!-- JGroups protocol stack properties.
-         ClusterConfig isn't used if the multiplexer is enabled and succes=
sfully initialized.
-      -->
-      <attribute name=3D"ClusterConfig">
-         <config>
-            <TCP recv_buf_size=3D"20000000" use_send_queues=3D"false"
-                 loopback=3D"false"
-                 discard_incompatible_packets=3D"true"
-                 max_bundle_size=3D"64000"
-                 max_bundle_timeout=3D"30"
-                 use_incoming_packet_handler=3D"true"
-                 enable_bundling=3D"true"
-                 enable_unicast_bundling=3D"true"
-                 enable_diagnostics=3D"true"
-                 use_concurrent_stack=3D"true"
-                 thread_naming_pattern=3D"pl"
-                 thread_pool.enabled=3D"true"
-                 thread_pool.min_threads=3D"1"
-                 thread_pool.max_threads=3D"4"
-                 thread_pool.keep_alive_time=3D"30000"
-                 thread_pool.queue_enabled=3D"true"
-                 thread_pool.queue_max_size=3D"50000"
-                 thread_pool.rejection_policy=3D"discard"
-                 oob_thread_pool.enabled=3D"true"
-                 oob_thread_pool.min_threads=3D"2"
-                 oob_thread_pool.max_threads=3D"4"
-                 oob_thread_pool.keep_alive_time=3D"10000"
-                 oob_thread_pool.queue_enabled=3D"false"
-                 oob_thread_pool.queue_max_size=3D"10"
-                 oob_thread_pool.rejection_policy=3D"Run"/>
-            <!--<PING timeout=3D"2000" num_initial_members=3D"3"/>-->
-             <MPING mcast_addr=3D"232.1.2.3" timeout=3D"2000" num_initial_=
members=3D"3"/>
-            <MERGE2 max_interval=3D"30000" min_interval=3D"10000"/>
-            <FD_SOCK/>
-            <FD timeout=3D"10000" max_tries=3D"5" shun=3D"true"/>
-            <VERIFY_SUSPECT timeout=3D"1500"/>
-            <pbcast.NAKACK use_mcast_xmit=3D"false" gc_lag=3D"0"
-                           retransmit_timeout=3D"300,600,1200,2400,4800"
-                           discard_delivered_msgs=3D"true"/>
-            <!--<UNICAST timeout=3D"30,60,120,300,600,1200,2400,3600"/>-->
-            <pbcast.STABLE stability_delay=3D"1000" desired_avg_gossip=3D"=
50000"
-                           max_bytes=3D"400000"/>
-            <pbcast.GMS print_local_addr=3D"true" join_timeout=3D"5000"
-                        join_retry_timeout=3D"2000" shun=3D"false"
-                        view_bundling=3D"true" view_ack_collection_timeout=
=3D"5000"/>
-              <FC max_credits=3D"5000000"
-                    min_threshold=3D"0.20"/>
-            <FRAG2 frag_size=3D"60000"/>
-            <pbcast.STREAMING_STATE_TRANSFER use_reading_thread=3D"true"/>
-            <!-- <pbcast.STATE_TRANSFER/> -->
-            <pbcast.FLUSH timeout=3D"0"/>
-         </config>
-      </attribute>
-
-
-      <!--
-       Whether or not to fetch state on joining a cluster
-       NOTE this used to be called FetchStateOnStartup and has been rename=
d to be more descriptive.
-      -->
-      <attribute name=3D"FetchInMemoryState">true</attribute>
-
-      <!--
-          The max amount of time (in milliseconds) we wait until the
-          state (ie. the contents of the cache) are retrieved from
-          existing members in a clustered environment
-      -->
-      <attribute name=3D"StateRetrievalTimeout">15000</attribute>
-
-      <!--
-          Number of milliseconds to wait until all responses for a
-          synchronous call have been received.
-      -->
-      <attribute name=3D"SyncReplTimeout">15000</attribute>
-
-      <!-- Max number of milliseconds to wait for a lock acquisition -->
-      <attribute name=3D"LockAcquisitionTimeout">10000</attribute>
-
-      <!--
-         Indicate whether to use region based marshalling or not. Set this=
 to true if you are running under a scoped
-         class loader, e.g., inside an application server. Default is "fal=
se".
-      -->
-      <attribute name=3D"UseRegionBasedMarshalling">true</attribute>
-   </mbean>
-
-
-   <!--  Uncomment to get a graphical view of the TreeCache MBean above -->
-   <!--   <mbean code=3D"org.jboss.cache.TreeCacheView" name=3D"jboss.cach=
e:service=3DTreeCacheView">-->
-   <!--      <depends>jboss.cache:service=3DTreeCache</depends>-->
-   <!--      <attribute name=3D"CacheService">jboss.cache:service=3DTreeCa=
che</attribute>-->
-   <!--   </mbean>-->
-
-
-</server>

Added: core/trunk/src/main/resources/META-INF/total-replication-cache-servi=
ce.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/resources/META-INF/total-replication-cache-service.=
xml	                        (rev 0)
+++ core/trunk/src/main/resources/META-INF/total-replication-cache-service.=
xml	2008-01-25 12:50:24 UTC (rev 5239)
@@ -0,0 +1,144 @@
+<?xml version=3D"1.0" encoding=3D"UTF-8"?>
+
+<!-- =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D -->
+<!--                                                                      =
 -->
+<!--  Sample for total replication.                               -->
+<!--                                                                      =
 -->
+<!-- =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D -->
+
+<server>
+
+   <classpath codebase=3D"./lib" archives=3D"jboss-cache.jar, jgroups.jar"=
/>
+
+
+   <!-- =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D -->
+   <!-- Defines TreeCache configuration                                   =
   -->
+   <!-- =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D -->
+
+   <mbean code=3D"org.jboss.cache.jmx.CacheJmxWrapper"
+          name=3D"jboss.cache:service=3DtestTreeCache">
+
+      <depends>jboss:service=3DNaming</depends>
+      <depends>jboss:service=3DTransactionManager</depends>
+
+      <!--
+          Configure the TransactionManager
+      -->
+      <attribute name=3D"TransactionManagerLookupClass">org.jboss.cache.tr=
ansaction.GenericTransactionManagerLookup
+      </attribute>
+
+
+      <!--
+          Node locking level : SERIALIZABLE
+                               REPEATABLE_READ (default)
+                               READ_COMMITTED
+                               READ_UNCOMMITTED
+                               NONE
+      -->
+      <attribute name=3D"IsolationLevel">REPEATABLE_READ</attribute>
+
+      <!--
+           Valid modes are LOCAL
+                           REPL_ASYNC
+                           REPL_SYNC
+                           INVALIDATION_ASYNC
+                           INVALIDATION_SYNC
+      -->
+      <attribute name=3D"CacheMode">REPL_SYNC</attribute>
+
+      <!-- Name of cluster. Needs to be the same for all TreeCache nodes i=
n a
+           cluster in order to find each other.
+      -->
+      <attribute name=3D"ClusterName">JBossCache-Cluster</attribute>
+
+      <!--Uncomment next three statements to enable JGroups multiplexer.
+      This configuration is dependent on the JGroups multiplexer being
+      registered in an MBean server such as JBossAS.  -->
+      <!--
+      <depends>jgroups.mux:name=3DMultiplexer</depends>
+      <attribute name=3D"MultiplexerService">jgroups.mux:name=3DMultiplexe=
r</attribute>
+      <attribute name=3D"MultiplexerStack">fc-fast-minimalthreads</attribu=
te>
+      -->
+
+      <!-- JGroups protocol stack properties.
+         ClusterConfig isn't used if the multiplexer is enabled and succes=
sfully initialized.
+      -->
+      <attribute name=3D"ClusterConfig">
+         <config>
+            <UDP mcast_addr=3D"228.10.10.10"
+                 mcast_port=3D"45588"
+                 tos=3D"8"
+                 ucast_recv_buf_size=3D"20000000"
+                 ucast_send_buf_size=3D"640000"
+                 mcast_recv_buf_size=3D"25000000"
+                 mcast_send_buf_size=3D"640000"
+                 loopback=3D"false"
+                 discard_incompatible_packets=3D"true"
+                 max_bundle_size=3D"64000"
+                 max_bundle_timeout=3D"30"
+                 use_incoming_packet_handler=3D"true"
+                 ip_ttl=3D"2"
+                 enable_bundling=3D"false"
+                 enable_diagnostics=3D"true"
+
+                 use_concurrent_stack=3D"true"
+
+                 thread_naming_pattern=3D"pl"
+
+                 thread_pool.enabled=3D"true"
+                 thread_pool.min_threads=3D"1"
+                 thread_pool.max_threads=3D"25"
+                 thread_pool.keep_alive_time=3D"30000"
+                 thread_pool.queue_enabled=3D"true"
+                 thread_pool.queue_max_size=3D"10"
+                 thread_pool.rejection_policy=3D"Run"
+
+                 oob_thread_pool.enabled=3D"true"
+                 oob_thread_pool.min_threads=3D"1"
+                 oob_thread_pool.max_threads=3D"4"
+                 oob_thread_pool.keep_alive_time=3D"10000"
+                 oob_thread_pool.queue_enabled=3D"true"
+                 oob_thread_pool.queue_max_size=3D"10"
+                 oob_thread_pool.rejection_policy=3D"Run"/>
+
+            <PING timeout=3D"2000" num_initial_members=3D"3"/>
+            <MERGE2 max_interval=3D"30000" min_interval=3D"10000"/>
+            <FD_SOCK/>
+            <FD timeout=3D"10000" max_tries=3D"5" shun=3D"true"/>
+            <VERIFY_SUSPECT timeout=3D"1500"/>
+            <pbcast.NAKACK
+                    use_mcast_xmit=3D"false" gc_lag=3D"0"
+                    retransmit_timeout=3D"300,600,1200,2400,4800"
+                    discard_delivered_msgs=3D"true"/>
+            <UNICAST timeout=3D"300,600,1200,2400,3600"/>
+            <pbcast.STABLE stability_delay=3D"1000" desired_avg_gossip=3D"=
50000"
+                           max_bytes=3D"400000"/>
+            <pbcast.GMS print_local_addr=3D"true" join_timeout=3D"5000" sh=
un=3D"false"
+                        view_bundling=3D"true" view_ack_collection_timeout=
=3D"5000"/>
+            <FRAG2 frag_size=3D"60000"/>
+            <pbcast.STREAMING_STATE_TRANSFER use_reading_thread=3D"true"/>
+            <!-- <pbcast.STATE_TRANSFER/> -->
+            <pbcast.FLUSH timeout=3D"0"/>
+         </config>
+      </attribute>
+
+
+      <!--
+          The max amount of time (in milliseconds) we wait until the
+          state (ie. the contents of the cache) are retrieved from
+          existing members in a clustered environment
+      -->
+      <attribute name=3D"StateRetrievalTimeout">20000</attribute>
+
+      <!--
+          Number of milliseconds to wait until all responses for a
+          synchronous call have been received.
+      -->
+      <attribute name=3D"SyncReplTimeout">15000</attribute>
+
+      <!-- Max number of milliseconds to wait for a lock acquisition -->
+      <attribute name=3D"LockAcquisitionTimeout">10000</attribute>
+
+
+   </mbean>
+</server>

Deleted: core/trunk/src/main/resources/META-INF/tree-service.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/resources/META-INF/tree-service.xml	2008-01-25 12:4=
7:36 UTC (rev 5238)
+++ core/trunk/src/main/resources/META-INF/tree-service.xml	2008-01-25 12:5=
0:24 UTC (rev 5239)
@@ -1,162 +0,0 @@
-<?xml version=3D"1.0" encoding=3D"UTF-8"?>
-
-<!-- =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D -->
-<!--                                                                      =
 -->
-<!--  Sample TreeCache Service Configuration                              =
 -->
-<!--                                                                      =
 -->
-<!-- =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D -->
-
-<server>
-
-   <classpath codebase=3D"./lib" archives=3D"jboss-cache.jar, jgroups.jar"=
/>
-
-
-   <!-- =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D -->
-   <!-- Defines TreeCache configuration                                   =
   -->
-   <!-- =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D -->
-
-   <mbean code=3D"org.jboss.cache.jmx.CacheJmxWrapper"
-          name=3D"jboss.cache:service=3DTreeCache">
-
-      <depends>jboss:service=3DNaming</depends>
-      <depends>jboss:service=3DTransactionManager</depends>
-
-      <!--uncomment next three statements if using JGroups multiplexer in =
a cluster environment -->
-      <!--
-      <depends>jgroups.mux:name=3DMultiplexer</depends>
-      <attribute name=3D"MultiplexerService">jgroups.mux:name=3DMultiplexe=
r</attribute>
-      <attribute name=3D"MultiplexerStack">fc-fast-minimalthreads</attribu=
te>
-      -->
-
-      <!--
-          Configure the TransactionManager
-      -->
-      <attribute name=3D"TransactionManagerLookupClass">org.jboss.cache.tr=
ansaction.GenericTransactionManagerLookup
-      </attribute>
-
-
-      <!--
-          DataNode locking level : SERIALIZABLE
-                               REPEATABLE_READ (default)
-                               READ_COMMITTED
-                               READ_UNCOMMITTED
-                               NONE
-      -->
-      <attribute name=3D"IsolationLevel">REPEATABLE_READ</attribute>
-
-      <!--
-           Valid modes are LOCAL
-                           REPL_ASYNC
-                           REPL_SYNC
-                           INVALIDATION_ASYNC
-                           INVALIDATION_SYNC
-      -->
-      <attribute name=3D"CacheMode">LOCAL</attribute>
-
-      <!--
-      Specifies whether each interceptor should have an associated
-       mbean registered.  Interceptor mbeans are used to capture and displ=
ay
-       associated statistics.  Statistics can be disabled for individual
-      interceptors through their mbeans.
-      -->
-      <attribute name=3D"ExposeManagementStatistics">true</attribute>
-
-      <!--
-      Just used for async repl: use a replication queue
-      -->
-      <attribute name=3D"UseReplQueue">false</attribute>
-
-      <!--
-      Replication interval for replication queue (in ms)
-      -->
-      <attribute name=3D"ReplQueueInterval">60000</attribute>
-
-      <!--
-      Max number of elements which trigger replication
-      -->
-      <attribute name=3D"ReplQueueMaxElements">100</attribute>
-
-
-      <!-- Name of cluster. Needs to be the same for all clusters, in order
-           to find each other
-      -->
-      <attribute name=3D"ClusterName">JBossCache-Cluster</attribute>
-
-      <!-- JGroups protocol stack properties. Can also be a URL,
-           e.g. file:/home/bela/default.xml
-         <attribute name=3D"ClusterProperties"></attribute>
-      -->
-
-      <attribute name=3D"ClusterConfig">
-         <config>
-            <!-- UDP: if you have a multihomed machine,
-  set the bind_addr attribute to the appropriate NIC IP address -->
-            <!-- UDP: On Windows machines, because of the media sense feat=
ure
-      being broken with multicast (even after disabling media sense)
-      set the loopback attribute to true -->
-            <UDP mcast_addr=3D"230.8.8.8" mcast_port=3D"56677"
-                 ip_ttl=3D"32" ip_mcast=3D"true"
-                 mcast_send_buf_size=3D"80000" mcast_recv_buf_size=3D"1500=
00"
-                 ucast_send_buf_size=3D"80000" ucast_recv_buf_size=3D"1500=
00"
-                 loopback=3D"false"/>
-            <PING timeout=3D"2000" num_initial_members=3D"3"/>
-            <MERGE2 min_interval=3D"10000" max_interval=3D"20000"/>
-            <FD shun=3D"true"/>
-            <VERIFY_SUSPECT timeout=3D"1500"/>
-            <pbcast.NAKACK gc_lag=3D"50" retransmit_timeout=3D"600,1200,24=
00,4800"/>
-            <UNICAST timeout=3D"600,1200,2400" window_size=3D"100" min_thr=
eshold=3D"10"/>
-            <pbcast.STABLE desired_avg_gossip=3D"20000"/>
-            <FRAG frag_size=3D"8192"/>
-            <pbcast.GMS join_timeout=3D"5000"
-                        shun=3D"true" print_local_addr=3D"true"/>
-            <pbcast.STATE_TRANSFER/>
-         </config>
-      </attribute>
-
-
-      <!--
-          The max amount of time (in milliseconds) we wait until the
-          state (ie. the contents of the cache) are retrieved from
-          existing members in a clustered environment.
-      -->
-      <attribute name=3D"StateRetrievalTimeout">15000</attribute>
-
-      <!--
-          Number of milliseconds to wait until all responses for a
-          synchronous call have been received.
-      -->
-      <attribute name=3D"SyncReplTimeout">15000</attribute>
-
-      <!-- Max number of milliseconds to wait for a lock acquisition -->
-      <attribute name=3D"LockAcquisitionTimeout">10000</attribute>
-
-
-   </mbean>
-
-   <!-- Uncomment to bind TreeCache into JNDI as MyCache
-  <mbean code=3D"org.jboss.invocation.jrmp.server.JRMPProxyFactory"
-      name=3D"mydomain:service=3DproxyFactory,type=3Djrmp,target=3Dfactory=
">
-      <attribute name=3D"InvokerName">jboss:service=3Dinvoker,type=3Djrmp<=
/attribute>
-      <attribute name=3D"TargetName">jboss.cache:service=3DTreeCache</attr=
ibute>
-      <attribute name=3D"JndiName">MyCache</attribute>
-      <attribute name=3D"InvokeTargetMethod">true</attribute>
-      <attribute name=3D"ExportedInterface">org.jboss.cache.TreeCacheMBean=
</attribute>
-      <attribute name=3D"ClientInterceptors">
-         <iterceptors>
-            <interceptor>org.jboss.proxy.ClientMethodInterceptor</intercep=
tor>
-            <interceptor>org.jboss.proxy.SecurityInterceptor</interceptor>
-            <interceptor>org.jboss.invocation.InvokerInterceptor</intercep=
tor>
-         </iterceptors> </attribute>
-      <depends>jboss:service=3Dinvoker,type=3Djrmp</depends>
-      <depends>jboss.cache:service=3DTreeCache</depends>
-   </mbean>-->
-
-
-   <!--  Uncomment to get a graphical view of the TreeCache MBean above -->
-   <!--   <mbean code=3D"org.jboss.cache.TreeCacheView" name=3D"jboss.cach=
e:service=3DTreeCacheView">-->
-   <!--      <depends>jboss.cache:service=3DTreeCache</depends>-->
-   <!--      <attribute name=3D"CacheService">jboss.cache:service=3DTreeCa=
che</attribute>-->
-   <!--   </mbean>-->
-
-
-</server>


--===============5732520914953941770==--

From jbosscache-commits at lists.jboss.org Fri Jan 25 11:56:47 2008
Content-Type: multipart/mixed; boundary="===============7966538682356873750=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r5240 - in
 core/trunk/src/main/docbook: tutorial/en and 1 other directories.
Date: Fri, 25 Jan 2008 11:56:47 -0500
Message-ID: <E1JIRrD-0001UB-MY@committer01.frg.pub.inap.atl.jboss.com>

--===============7966538682356873750==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: manik.surtani(a)jboss.com
Date: 2008-01-25 11:56:47 -0500 (Fri, 25 Jan 2008)
New Revision: 5240

Modified:
   core/trunk/src/main/docbook/faq/en/master.xml
   core/trunk/src/main/docbook/tutorial/en/master.xml
   core/trunk/src/main/docbook/userguide/en/master.xml
Log:
Updated pubdates

Modified: core/trunk/src/main/docbook/faq/en/master.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/docbook/faq/en/master.xml	2008-01-25 12:50:24 UTC (=
rev 5239)
+++ core/trunk/src/main/docbook/faq/en/master.xml	2008-01-25 16:56:47 UTC (=
rev 5240)
@@ -7,7 +7,7 @@
       <title>Frequently Asked Questions about JBoss Cache</title>
       <!-- Release version and date -->
       <releaseinfo>Release 2.1.0 Alegrias</releaseinfo>
-      <pubdate>November 2007</pubdate>
+      <pubdate>March 2008</pubdate>
 =

       <author>
          <firstname>Manik</firstname>

Modified: core/trunk/src/main/docbook/tutorial/en/master.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/docbook/tutorial/en/master.xml	2008-01-25 12:50:24 =
UTC (rev 5239)
+++ core/trunk/src/main/docbook/tutorial/en/master.xml	2008-01-25 16:56:47 =
UTC (rev 5240)
@@ -4,7 +4,7 @@
       <title>JBoss Cache core Cache Tutorial</title>
       <!-- Release version and date -->
       <releaseinfo>Release 2.1.0 Alegrias</releaseinfo>
-      <pubdate>November 2007</pubdate>
+      <pubdate>March 2008</pubdate>
 =

       <author>
          <firstname>Manik</firstname>
@@ -24,7 +24,7 @@
       <para>
          For details of configuration, usage and APIs, please refer to the
          <ulink
-                 url=3D"http://labs.jboss.org/portal/jbosscache/docs/index=
.html">user manuals
+               url=3D"http://labs.jboss.org/portal/jbosscache/docs/index.h=
tml">user manuals
          </ulink>
          .
       </para>
@@ -53,7 +53,7 @@
 =

       <para>First download the JBoss Cache 2.x distribution from
          <ulink
-                 url=3D"http://labs.jboss.org/portal/jbosscache/download/i=
ndex.html">the download page
+               url=3D"http://labs.jboss.org/portal/jbosscache/download/ind=
ex.html">the download page
          </ulink>
          . You probably want the
          <literal>JBossCache-core-2.X.Y.zip</literal>
@@ -95,7 +95,9 @@
 =

       <para>The only script needed for this tutorial is the
          <literal>JBossCache/build.xml</literal>
-         ant script. You also need to have <ulink url=3D"http://ant.apache=
.org/">ant</ulink> installed for running the demo.
+         ant script. You also need to have
+         <ulink url=3D"http://ant.apache.org/">ant</ulink>
+         installed for running the demo.
       </para>
    </section>
 =

@@ -103,7 +105,9 @@
       <title>Running The Demo GUI</title>
 =

       <para>
-         The demo is run by calling the ant script with the <literal>run.d=
emo</literal> target. E.g.,
+         The demo is run by calling the ant script with the
+         <literal>run.demo</literal>
+         target. E.g.,
       </para>
 =

       <para>
@@ -252,7 +256,7 @@
             and
             <literal>Node</literal>
             <ulink
-                    url=3D"http://labs.jboss.org/portal/jbosscache/docs/in=
dex.html">API docs
+                  url=3D"http://labs.jboss.org/portal/jbosscache/docs/inde=
x.html">API docs
             </ulink>
             and try out the APIs in the BeanShell script.
          </para>

Modified: core/trunk/src/main/docbook/userguide/en/master.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/docbook/userguide/en/master.xml	2008-01-25 12:50:24=
 UTC (rev 5239)
+++ core/trunk/src/main/docbook/userguide/en/master.xml	2008-01-25 16:56:47=
 UTC (rev 5240)
@@ -22,7 +22,7 @@
 =

       <!-- Release version and date -->
       <releaseinfo>Release 2.1.0 Alegrias</releaseinfo>
-      <pubdate>November 2007</pubdate>
+      <pubdate>March 2008</pubdate>
 =

       <!-- Authors/contributors -->
       <author>


--===============7966538682356873750==--

From jboss-qa-internal at redhat.com Fri Jan 25 16:47:04 2008
Content-Type: multipart/mixed; boundary="===============6907664034744334631=="
MIME-Version: 1.0
From: jboss-qa-internal at redhat.com
To: jbosscache-commits at lists.jboss.org
Subject: =?utf-8?q?=5Bjbosscache-commits=5D_Build_failed_in_Hudson=3A_jboss-cache-?=
 =?utf-8?q?core-jdk1=2E6_=C2=BB_JBoss_Cache_-_Core_Edition_=23178?=
Date: Fri, 25 Jan 2008 16:46:08 -0500
Message-ID: <23687839.12071201297568544.JavaMail.hudson@dev45.qa.atl2.redhat.com>

--===============6907664034744334631==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

See https://hudson.jboss.org/hudson/job/jboss-cache-core-jdk1.6/org.jboss.c=
ache$jbosscache-core/178/changes

Changes:

[manik.surtani(a)jboss.com] Updated pubdates

[mircea.markus] http://jira.jboss.com/jira/browse/JBCACHE-1269

[mircea.markus] http://jira.jboss.com/jira/browse/JBCACHE-1269

------------------------------------------
[...truncated 75154 lines...]


-------------------------------------------------------
GMS: address is 127.0.0.1:41800
-------------------------------------------------------

-------------------------------------------------------
GMS: address is 127.0.0.1:41801
-------------------------------------------------------
cache1 (before commit):

/one	(write owner=3DGlobalTransaction:<127.0.0.1:41800>:25)
    /two	(write owner=3DGlobalTransaction:<127.0.0.1:41800>:25)
        /three	(write owner=3DGlobalTransaction:<127.0.0.1:41800>:25)

cache2 (before commit):


cache2 (before commit):


Transaction was rolled back, this is correct
cache1 (after rollback):


cache2 (after rollback):



-------------------------------------------------------
GMS: address is 127.0.0.1:41802
-------------------------------------------------------

-------------------------------------------------------
GMS: address is 127.0.0.1:41803
-------------------------------------------------------
TransactionTable for cache1 after cache1.put():
LocalTransactions: 1
GlobalTransactions: 1
tx_map:
org.jboss.cache.transaction.DummyTransaction(a)1c71508: GlobalTransaction:<=
127.0.0.1:41802>:27
txs:
GlobalTransaction:<127.0.0.1:41802>:27: TransactionEntry
modification_list: [MethodName: _put; MethodIdInteger: 3; Args: ( arg[0] =
=3D GlobalTransaction:<127.0.0.1:41802>:27 ...)]
undo_list: [MethodName: _remove; MethodIdInteger: 5; Args: ( arg[0] =3D Glo=
balTransaction:<127.0.0.1:41802>:27 ...), MethodName: _remove; MethodIdInte=
ger: 5; Args: ( arg[0] =3D GlobalTransaction:<127.0.0.1:41802>:27 ...), Met=
hodName: _remove; MethodIdInteger: 5; Args: ( arg[0] =3D GlobalTransaction:=
<127.0.0.1:41802>:27 ...), MethodName: _remove; MethodIdInteger: 6; Args: (=
 arg[0] =3D GlobalTransaction:<127.0.0.1:41802>:27 ...)]
locks: [read owners=3D[GlobalTransaction:<127.0.0.1:41802>:27], write owner=
=3DGlobalTransaction:<127.0.0.1:41802>:27, write owner=3DGlobalTransaction:=
<127.0.0.1:41802>:27, write owner=3DGlobalTransaction:<127.0.0.1:41802>:27]

TransactionTable for cache2 after cache2.put():
LocalTransactions: 1
GlobalTransactions: 1
tx_map:
org.jboss.cache.transaction.DummyTransaction(a)1c71508: GlobalTransaction:<=
127.0.0.1:41803>:28
txs:
GlobalTransaction:<127.0.0.1:41803>:28: TransactionEntry
modification_list: [MethodName: _put; MethodIdInteger: 3; Args: ( arg[0] =
=3D GlobalTransaction:<127.0.0.1:41803>:28 ...)]
undo_list: [MethodName: _remove; MethodIdInteger: 5; Args: ( arg[0] =3D Glo=
balTransaction:<127.0.0.1:41803>:28 ...), MethodName: _remove; MethodIdInte=
ger: 5; Args: ( arg[0] =3D GlobalTransaction:<127.0.0.1:41803>:28 ...), Met=
hodName: _remove; MethodIdInteger: 5; Args: ( arg[0] =3D GlobalTransaction:=
<127.0.0.1:41803>:28 ...), MethodName: _remove; MethodIdInteger: 6; Args: (=
 arg[0] =3D GlobalTransaction:<127.0.0.1:41803>:28 ...)]
locks: [read owners=3D[GlobalTransaction:<127.0.0.1:41803>:28], write owner=
=3DGlobalTransaction:<127.0.0.1:41803>:28, write owner=3DGlobalTransaction:=
<127.0.0.1:41803>:28, write owner=3DGlobalTransaction:<127.0.0.1:41803>:28]

cache1 before commit:

/one	(write owner=3DGlobalTransaction:<127.0.0.1:41802>:27)
    /two	(write owner=3DGlobalTransaction:<127.0.0.1:41802>:27)
        /three	(write owner=3DGlobalTransaction:<127.0.0.1:41802>:27)

cache2 before commit:

/one	(write owner=3DGlobalTransaction:<127.0.0.1:41803>:28)
    /two	(write owner=3DGlobalTransaction:<127.0.0.1:41803>:28)
        /three	(write owner=3DGlobalTransaction:<127.0.0.1:41803>:28)

Transaction was rolled back, this is correct
cache1 after commit:


cache2 after commit:



-------------------------------------------------------
GMS: address is 127.0.0.1:41804
-------------------------------------------------------

-------------------------------------------------------
GMS: address is 127.0.0.1:41805
-------------------------------------------------------
[Thread2] ** LOCK INFO cache1: =

/bela	(write owner=3DGlobalTransaction:<127.0.0.1:41804>:29)
    /ban	(write owner=3DGlobalTransaction:<127.0.0.1:41804>:29)

[Thread2] ** LOCK INFO cache2: =


[Thread1] ** LOCK INFO cache1: =

/bela
    /ban

[Thread2] ** LOCK INFO cache1: =

/bela	(read owners=3D[GlobalTransaction:<127.0.0.1:41804>:30])
    /ban	(write owner=3DGlobalTransaction:<127.0.0.1:41804>:30)

[Thread2] ** LOCK INFO cache2: =

/bela
    /ban

[Thread1] ** LOCK INFO cache2: =

/bela
    /ban

[Thread2] ** LOCK INFO cache1: =

/bela
    /ban

[Thread2] ** LOCK INFO cache2: =

/bela
    /ban

Tests run: 17, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 140.851 sec
Running org.jboss.cache.notifications.NotificationThreadTest (of functional)

-------------------------------------------------------
GMS: address is 127.0.0.1:41773
-------------------------------------------------------

-------------------------------------------------------
GMS: address is 127.0.0.1:41774
-------------------------------------------------------

-------------------------------------------------------
GMS: address is 127.0.0.1:41775
-------------------------------------------------------

-------------------------------------------------------
GMS: address is 127.0.0.1:41776
-------------------------------------------------------

-------------------------------------------------------
GMS: address is 127.0.0.1:41777
-------------------------------------------------------

-------------------------------------------------------
GMS: address is 127.0.0.1:41778
-------------------------------------------------------

-------------------------------------------------------
GMS: address is 127.0.0.1:41779
-------------------------------------------------------

-------------------------------------------------------
GMS: address is 127.0.0.1:41780
-------------------------------------------------------

-------------------------------------------------------
GMS: address is 127.0.0.1:41781
-------------------------------------------------------

-------------------------------------------------------
GMS: address is 127.0.0.1:41782
-------------------------------------------------------

-------------------------------------------------------
GMS: address is 127.0.0.1:41783
-------------------------------------------------------

-------------------------------------------------------
GMS: address is 127.0.0.1:41784
-------------------------------------------------------

-------------------------------------------------------
GMS: address is 127.0.0.1:41785
-------------------------------------------------------

-------------------------------------------------------
GMS: address is 127.0.0.1:41786
-------------------------------------------------------

-------------------------------------------------------
GMS: address is 127.0.0.1:41787
-------------------------------------------------------

-------------------------------------------------------
GMS: address is 127.0.0.1:41788
-------------------------------------------------------
Tests run: 8, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 47.021 sec

Results :

Failed tests: =


Tests run: 2623, Failures: 24, Errors: 0, Skipped: 160

[ERROR] There are test failures.
[HUDSON] Recording test results
[INFO] Preparing surefire-report:report-only
[INFO] [enforcer:enforce {execution: enforce-java}]
[INFO] Preparing findbugs:findbugs
[INFO] [enforcer:enforce {execution: enforce-java}]
[INFO] [resources:resources]
[INFO] Using default encoding to copy filtered resources.
[INFO] [compiler:compile]
[INFO] Nothing to compile - all classes are up to date
[INFO] [site:site]
[HUDSON] Archiving /home/hudson/hudson_workspace/workspace/jboss-cache-core=
-jdk1.6/./pom.xml
[INFO] --------------------------------------------------------------------=
----
[ERROR] FATAL ERROR
[INFO] --------------------------------------------------------------------=
----
[INFO] org/apache/maven/artifact/Artifact
[INFO] --------------------------------------------------------------------=
----
[INFO] Trace
java.lang.NoClassDefFoundError: org/apache/maven/artifact/Artifact
	at org.apache.maven.plugin.jxr.AbstractJxrReport.constructSourceDirs(Abstr=
actJxrReport.java:436)
	at org.apache.maven.plugin.jxr.AbstractJxrReport.canGenerateReport(Abstrac=
tJxrReport.java:454)
	at org.apache.maven.plugins.site.AbstractSiteRenderingMojo.filterReports(A=
bstractSiteRenderingMojo.java:421)
	at org.apache.maven.plugins.site.SiteMojo.execute(SiteMojo.java:77)
	at org.apache.maven.plugin.DefaultPluginManager.executeMojo(DefaultPluginM=
anager.java:443)
	at hudson.maven.agent.PluginManagerInterceptor.executeMojo(PluginManagerIn=
terceptor.java:132)
	at org.apache.maven.lifecycle.DefaultLifecycleExecutor.executeGoals(Defaul=
tLifecycleExecutor.java:539)
	at org.apache.maven.lifecycle.DefaultLifecycleExecutor.executeGoalWithLife=
cycle(DefaultLifecycleExecutor.java:480)
	at org.apache.maven.lifecycle.DefaultLifecycleExecutor.executeGoal(Default=
LifecycleExecutor.java:459)
	at org.apache.maven.lifecycle.DefaultLifecycleExecutor.executeGoalAndHandl=
eFailures(DefaultLifecycleExecutor.java:311)
	at org.apache.maven.lifecycle.DefaultLifecycleExecutor.executeTaskSegments=
(DefaultLifecycleExecutor.java:278)
	at org.apache.maven.lifecycle.DefaultLifecycleExecutor.execute(DefaultLife=
cycleExecutor.java:143)
	at org.apache.maven.lifecycle.LifecycleExecutorInterceptor.execute(Lifecyc=
leExecutorInterceptor.java:42)
	at org.apache.maven.DefaultMaven.doExecute(DefaultMaven.java:334)
	at org.apache.maven.DefaultMaven.execute(DefaultMaven.java:125)
	at org.apache.maven.cli.MavenCli.main(MavenCli.java:272)
	at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
	at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.ja=
va:39)
	at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccesso=
rImpl.java:25)
	at java.lang.reflect.Method.invoke(Method.java:597)
	at org.codehaus.classworlds.Launcher.launchEnhanced(Launcher.java:315)
	at org.codehaus.classworlds.Launcher.launch(Launcher.java:255)
	at hudson.maven.agent.Main.launch(Main.java:97)
	at hudson.maven.MavenBuilder.call(MavenBuilder.java:109)
	at hudson.maven.MavenBuilder.call(MavenBuilder.java:45)
	at hudson.remoting.UserRequest.perform(UserRequest.java:69)
	at hudson.remoting.UserRequest.perform(UserRequest.java:23)
	at hudson.remoting.Request$2.run(Request.java:200)
	at java.util.concurrent.Executors$RunnableAdapter.call(Executors.java:441)
	at java.util.concurrent.FutureTask$Sync.innerRun(FutureTask.java:303)
	at java.util.concurrent.FutureTask.run(FutureTask.java:138)
	at java.util.concurrent.ThreadPoolExecutor$Worker.runTask(ThreadPoolExecut=
or.java:885)
	at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.j=
ava:907)
	at java.lang.Thread.run(Thread.java:619)
[INFO] --------------------------------------------------------------------=
----
[INFO] Total time: 106 minutes 8 seconds
[INFO] Finished at: Fri Jan 25 16:46:46 EST 2008
[INFO] Final Memory: 35M/98M
[INFO] --------------------------------------------------------------------=
----
Sending e-mails to: dpospisi(a)redhat.com manik.surtani(a)jboss.com mircea.=
markus(a)jboss.com
Build was marked for publishing on https://hudson.jboss.org/hudson/
finished: FAILURE


--===============6907664034744334631==--

From jbosscache-commits at lists.jboss.org Mon Jan 28 05:17:12 2008
Content-Type: multipart/mixed; boundary="===============4278663202413967589=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r5241 -
 benchmarks/benchmark-fwk/trunk.
Date: Mon, 28 Jan 2008 05:17:12 -0500
Message-ID: <E1JJR3A-0004m7-Nn@committer01.frg.pub.inap.atl.jboss.com>

--===============4278663202413967589==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: manik.surtani(a)jboss.com
Date: 2008-01-28 05:17:12 -0500 (Mon, 28 Jan 2008)
New Revision: 5241

Modified:
   benchmarks/benchmark-fwk/trunk/runNode.sh
Log:


Modified: benchmarks/benchmark-fwk/trunk/runNode.sh
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- benchmarks/benchmark-fwk/trunk/runNode.sh	2008-01-25 16:56:47 UTC (rev =
5240)
+++ benchmarks/benchmark-fwk/trunk/runNode.sh	2008-01-28 10:17:12 UTC (rev =
5241)
@@ -9,7 +9,8 @@
 CACHE_PRODUCT=3D${2}
 TEST_CFG=3D${3}
 CLUSTER_SIZE=3D${4}
-PIDFILE=3DPID.`hostname -s`.pid
+hostname=3D`hostname -s`
+PIDFILE=3DPID.${hostname}.pid
 if [ -e ${PIDFILE} ]
 then
    # first test if the process is still running.  If not, clean up the PID=
 file.
@@ -70,7 +71,7 @@
    echo
 fi
 =

-${TO_EXECUTE} &
+${TO_EXECUTE} > STDIO_ERR.${hostname}.txt 2>&1 &
 echo $!>${PIDFILE}
 echo "Return code from benchmark runner is $?"
 =



--===============4278663202413967589==--

From jbosscache-commits at lists.jboss.org Mon Jan 28 06:32:35 2008
Content-Type: multipart/mixed; boundary="===============4116099359501025681=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r5242 - in
 benchmarks/benchmark-fwk/trunk/cache-products: jbosscache-2.1.0/conf and 1
 other directory.
Date: Mon, 28 Jan 2008 06:32:32 -0500
Message-ID: <E1JJSE4-00032q-5j@committer01.frg.pub.inap.atl.jboss.com>

--===============4116099359501025681==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: manik.surtani(a)jboss.com
Date: 2008-01-28 06:32:31 -0500 (Mon, 28 Jan 2008)
New Revision: 5242

Modified:
   benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.0.0/conf/pess=
-repl-async-br.xml
   benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.0.0/conf/pess=
-repl-async.xml
   benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.0.0/conf/pess=
-repl-sync-br.xml
   benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.0.0/conf/pess=
-repl-sync.xml
   benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.1.0/conf/pess=
-repl-async-br.xml
   benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.1.0/conf/pess=
-repl-async.xml
   benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.1.0/conf/pess=
-repl-sync.xml
Log:
Updated FD settings

Modified: benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.0.0/co=
nf/pess-repl-async-br.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.0.0/conf/pes=
s-repl-async-br.xml	2008-01-28 10:17:12 UTC (rev 5241)
+++ benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.0.0/conf/pes=
s-repl-async-br.xml	2008-01-28 11:32:31 UTC (rev 5242)
@@ -56,7 +56,7 @@
     <MERGE2 max_interval=3D"30000"
             min_interval=3D"10000"/>
     <FD_SOCK/>
-    <FD timeout=3D"10000" max_tries=3D"5"   shun=3D"true"/>
+    <FD timeout=3D"1000" max_tries=3D"2" shun=3D"true"/>
     <VERIFY_SUSPECT timeout=3D"1500"  />
     <BARRIER />
     <pbcast.NAKACK use_mcast_xmit=3D"false" gc_lag=3D"0"

Modified: benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.0.0/co=
nf/pess-repl-async.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.0.0/conf/pes=
s-repl-async.xml	2008-01-28 10:17:12 UTC (rev 5241)
+++ benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.0.0/conf/pes=
s-repl-async.xml	2008-01-28 11:32:31 UTC (rev 5242)
@@ -41,7 +41,7 @@
             <MERGE2 max_interval=3D"100000"
                     down_thread=3D"false" up_thread=3D"false" min_interval=
=3D"20000"/>
             <FD_SOCK down_thread=3D"false" up_thread=3D"false"/>
-            <FD timeout=3D"10000" max_tries=3D"5" down_thread=3D"false" up=
_thread=3D"false" shun=3D"true"/>
+            <FD timeout=3D"1000" max_tries=3D"2" shun=3D"true"/>
             <VERIFY_SUSPECT timeout=3D"1500" down_thread=3D"false" up_thre=
ad=3D"false"/>
             <pbcast.NAKACK max_xmit_size=3D"60000"
                            use_mcast_xmit=3D"false" gc_lag=3D"0"

Modified: benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.0.0/co=
nf/pess-repl-sync-br.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.0.0/conf/pes=
s-repl-sync-br.xml	2008-01-28 10:17:12 UTC (rev 5241)
+++ benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.0.0/conf/pes=
s-repl-sync-br.xml	2008-01-28 11:32:31 UTC (rev 5242)
@@ -59,7 +59,7 @@
             <PING timeout=3D"2000" num_initial_members=3D"3"/>
             <MERGE2 max_interval=3D"30000" min_interval=3D"10000"/>
             <FD_SOCK/>
-            <FD timeout=3D"10000" max_tries=3D"5" shun=3D"true"/>
+            <FD timeout=3D"1000" max_tries=3D"2" shun=3D"true"/>
             <VERIFY_SUSPECT timeout=3D"1500"/>
             <pbcast.NAKACK max_xmit_size=3D"60000"
                            use_mcast_xmit=3D"false" gc_lag=3D"0"

Modified: benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.0.0/co=
nf/pess-repl-sync.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.0.0/conf/pes=
s-repl-sync.xml	2008-01-28 10:17:12 UTC (rev 5241)
+++ benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.0.0/conf/pes=
s-repl-sync.xml	2008-01-28 11:32:31 UTC (rev 5242)
@@ -42,7 +42,7 @@
             <MERGE2 max_interval=3D"100000"
                     down_thread=3D"false" up_thread=3D"false" min_interval=
=3D"20000"/>
             <FD_SOCK down_thread=3D"false" up_thread=3D"false"/>
-            <FD timeout=3D"10000" max_tries=3D"5" down_thread=3D"false" up=
_thread=3D"false" shun=3D"true"/>
+            <FD timeout=3D"1000" max_tries=3D"2" shun=3D"true"/>
             <VERIFY_SUSPECT timeout=3D"1500" down_thread=3D"false" up_thre=
ad=3D"false"/>
             <pbcast.NAKACK max_xmit_size=3D"60000"
                            use_mcast_xmit=3D"false" gc_lag=3D"0"

Modified: benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.1.0/co=
nf/pess-repl-async-br.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.1.0/conf/pes=
s-repl-async-br.xml	2008-01-28 10:17:12 UTC (rev 5241)
+++ benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.1.0/conf/pes=
s-repl-async-br.xml	2008-01-28 11:32:31 UTC (rev 5242)
@@ -56,7 +56,7 @@
     <MERGE2 max_interval=3D"30000"
             min_interval=3D"10000"/>
     <FD_SOCK/>
-    <FD timeout=3D"10000" max_tries=3D"5"   shun=3D"true"/>
+    <FD timeout=3D"1000" max_tries=3D"2" shun=3D"true"/>
     <VERIFY_SUSPECT timeout=3D"1500"  />
     <BARRIER />
     <pbcast.NAKACK use_stats_for_retransmission=3D"false"

Modified: benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.1.0/co=
nf/pess-repl-async.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.1.0/conf/pes=
s-repl-async.xml	2008-01-28 10:17:12 UTC (rev 5241)
+++ benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.1.0/conf/pes=
s-repl-async.xml	2008-01-28 11:32:31 UTC (rev 5242)
@@ -41,7 +41,7 @@
             <MERGE2 max_interval=3D"100000"
                     down_thread=3D"false" up_thread=3D"false" min_interval=
=3D"20000"/>
             <FD_SOCK down_thread=3D"false" up_thread=3D"false"/>
-            <FD timeout=3D"10000" max_tries=3D"5" down_thread=3D"false" up=
_thread=3D"false" shun=3D"true"/>
+            <FD timeout=3D"1000" max_tries=3D"2" shun=3D"true"/>
             <VERIFY_SUSPECT timeout=3D"1500" down_thread=3D"false" up_thre=
ad=3D"false"/>
             <pbcast.NAKACK max_xmit_size=3D"60000"
                            use_mcast_xmit=3D"false" gc_lag=3D"0"

Modified: benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.1.0/co=
nf/pess-repl-sync.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.1.0/conf/pes=
s-repl-sync.xml	2008-01-28 10:17:12 UTC (rev 5241)
+++ benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.1.0/conf/pes=
s-repl-sync.xml	2008-01-28 11:32:31 UTC (rev 5242)
@@ -42,7 +42,7 @@
             <MERGE2 max_interval=3D"100000"
                     down_thread=3D"false" up_thread=3D"false" min_interval=
=3D"20000"/>
             <FD_SOCK down_thread=3D"false" up_thread=3D"false"/>
-            <FD timeout=3D"10000" max_tries=3D"5" down_thread=3D"false" up=
_thread=3D"false" shun=3D"true"/>
+            <FD timeout=3D"1000" max_tries=3D"2" shun=3D"true"/>
             <VERIFY_SUSPECT timeout=3D"1500" down_thread=3D"false" up_thre=
ad=3D"false"/>
             <pbcast.NAKACK max_xmit_size=3D"60000"
                            use_mcast_xmit=3D"false" gc_lag=3D"0"


--===============4116099359501025681==--

From jbosscache-commits at lists.jboss.org Mon Jan 28 06:37:22 2008
Content-Type: multipart/mixed; boundary="===============0552645460332451569=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r5243 -
 core/trunk/src/main/java/org/jboss/cache/interceptors.
Date: Mon, 28 Jan 2008 06:37:19 -0500
Message-ID: <E1JJSIh-0003A4-Cg@committer01.frg.pub.inap.atl.jboss.com>

--===============0552645460332451569==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: manik.surtani(a)jboss.com
Date: 2008-01-28 06:37:18 -0500 (Mon, 28 Jan 2008)
New Revision: 5243

Modified:
   core/trunk/src/main/java/org/jboss/cache/interceptors/TxInterceptor.java
Log:
JBCACHE-1275 - add more debug before setting tx to rollback only

Modified: core/trunk/src/main/java/org/jboss/cache/interceptors/TxIntercept=
or.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/java/org/jboss/cache/interceptors/TxInterceptor.jav=
a	2008-01-28 11:32:31 UTC (rev 5242)
+++ core/trunk/src/main/java/org/jboss/cache/interceptors/TxInterceptor.jav=
a	2008-01-28 11:37:18 UTC (rev 5243)
@@ -1368,6 +1368,7 @@
          }
          catch (Throwable t)
          {
+            if (log.isWarnEnabled()) log.warn("Caught exception, will now =
set transaction to roll back", t);
             try
             {
                tx.setRollbackOnly();


--===============0552645460332451569==--

From jbosscache-commits at lists.jboss.org Mon Jan 28 06:39:49 2008
Content-Type: multipart/mixed; boundary="===============6409738857272310925=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN:  r5244 - core/trunk.
Date: Mon, 28 Jan 2008 06:39:47 -0500
Message-ID: <E1JJSL5-00042N-41@committer01.frg.pub.inap.atl.jboss.com>

--===============6409738857272310925==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: manik.surtani(a)jboss.com
Date: 2008-01-28 06:39:46 -0500 (Mon, 28 Jan 2008)
New Revision: 5244

Modified:
   core/trunk/pom.xml
Log:
JBCACHE-1276 - made some pom dependencies optional, and added exclusions to=
 remove junk brought in by jboss-common-core

Modified: core/trunk/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/pom.xml	2008-01-28 11:37:18 UTC (rev 5243)
+++ core/trunk/pom.xml	2008-01-28 11:39:46 UTC (rev 5244)
@@ -23,42 +23,64 @@
          <artifactId>jgroups</artifactId>
          <version>2.6.1</version>
       </dependency>
+
       <dependency>
+         <groupId>org.jboss.javaee</groupId>
+         <artifactId>jboss-javaee</artifactId>
+         <version>5.0.0.Beta3</version>
+      </dependency>
+      <dependency>
+         <groupId>org.jboss</groupId>
+         <artifactId>jboss-common-core</artifactId>
+         <version>2.2.3.GA</version>
+         <exclusions>
+            <exclusion>
+               <groupId>apache-slide</groupId>
+               <artifactId>webdavlib</artifactId>
+            </exclusion>
+            <exclusion>
+               <groupId>apache-xerces</groupId>
+               <artifactId>xml-apis</artifactId>
+            </exclusion>
+            <exclusion>
+               <groupId>apache-httpclient</groupId>
+               <artifactId>commons-httpclient</artifactId>
+            </exclusion>
+         </exclusions>
+      </dependency>
+
+      <!-- optional dependencies -->
+      <dependency>
          <groupId>jdbm</groupId>
          <artifactId>jdbm</artifactId>
          <version>1.0</version>
+         <optional>true</optional>
       </dependency>
       <dependency>
          <groupId>c3p0</groupId>
          <artifactId>c3p0</artifactId>
          <version>0.9.1.1</version>
+         <optional>true</optional>
       </dependency>
       <dependency>
          <groupId>commons-logging</groupId>
          <artifactId>commons-logging</artifactId>
          <version>1.0.4</version>
+         <optional>true</optional>
       </dependency>
       <dependency>
          <groupId>sleepycat</groupId>
          <artifactId>je</artifactId>
          <version>1.7.0</version>
+         <optional>true</optional>
       </dependency>
       <dependency>
          <groupId>net.jcip</groupId>
          <artifactId>jcip-annotations</artifactId>
          <version>1.0</version>
+         <optional>true</optional>
       </dependency>
-      <dependency>
-         <groupId>org.jboss.javaee</groupId>
-         <artifactId>jboss-javaee</artifactId>
-         <version>5.0.0.Beta3</version>
-      </dependency>
 =

-      <dependency>
-         <groupId>org.jboss</groupId>
-         <artifactId>jboss-common-core</artifactId>
-         <version>2.2.1.GA</version>
-      </dependency>
       <!-- test dependencies -->
       <dependency>
          <groupId>org.easymock</groupId>


--===============6409738857272310925==--

From jbosscache-commits at lists.jboss.org Mon Jan 28 06:48:00 2008
Content-Type: multipart/mixed; boundary="===============6253957869532292764=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r5245 - in
 benchmarks/benchmark-fwk/trunk: conf and 1 other directory.
Date: Mon, 28 Jan 2008 06:47:59 -0500
Message-ID: <E1JJST1-00063F-3i@committer01.frg.pub.inap.atl.jboss.com>

--===============6253957869532292764==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: manik.surtani(a)jboss.com
Date: 2008-01-28 06:47:58 -0500 (Mon, 28 Jan 2008)
New Revision: 5245

Modified:
   benchmarks/benchmark-fwk/trunk/allJBossCacheTests.sh
   benchmarks/benchmark-fwk/trunk/bindAddress.sh
   benchmarks/benchmark-fwk/trunk/conf/log4j.xml
Log:


Modified: benchmarks/benchmark-fwk/trunk/allJBossCacheTests.sh
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- benchmarks/benchmark-fwk/trunk/allJBossCacheTests.sh	2008-01-28 11:39:4=
6 UTC (rev 5244)
+++ benchmarks/benchmark-fwk/trunk/allJBossCacheTests.sh	2008-01-28 11:47:5=
8 UTC (rev 5245)
@@ -1,7 +1,8 @@
 #!/bin/bash
 =

-scaling=3D"2 4 6 8 10"
-configs=3D"pess-repl-async.xml pess-repl-sync.xml ress-repl-async-br.xml"
+# scaling=3D"2 4 6 8 10"
+scaling=3D"2 4 6"
+configs=3D"pess-repl-async.xml pess-repl-sync.xml pess-repl-async-br.xml"
 products=3D"jbosscache-2.0.0 jbosscache-2.1.0"
 =

 mkdir output
@@ -18,9 +19,10 @@
 				echo Waiting for report... =

 				sleep 30
 			done
-			sleep 10
+			sleep 60
 			mv performance-$size.csv output/$product-$config-$size.csv
 			./cluster.sh stop
+			#/home/msurtani/bin/killAllJVMs.sh
 			sleep 10
 		done
 	done

Modified: benchmarks/benchmark-fwk/trunk/bindAddress.sh
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- benchmarks/benchmark-fwk/trunk/bindAddress.sh	2008-01-28 11:39:46 UTC (=
rev 5244)
+++ benchmarks/benchmark-fwk/trunk/bindAddress.sh	2008-01-28 11:47:58 UTC (=
rev 5245)
@@ -1,5 +1,5 @@
 #!/bin/sh
 =

 ### Set your bind address for the tests to use. Could be an IP, host name =
or a reference to an environment variable.
-BIND_ADDRESS=3D${MYTESTIP_1}
+BIND_ADDRESS=3D${MYTESTIP_2}
 =


Modified: benchmarks/benchmark-fwk/trunk/conf/log4j.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- benchmarks/benchmark-fwk/trunk/conf/log4j.xml	2008-01-28 11:39:46 UTC (=
rev 5244)
+++ benchmarks/benchmark-fwk/trunk/conf/log4j.xml	2008-01-28 11:47:58 UTC (=
rev 5245)
@@ -7,8 +7,8 @@
     <!-- The rolling file appender -->
     <appender name=3D"FILE" class=3D"org.apache.log4j.RollingFileAppender">
         <param name=3D"File" value=3D"cachebench.log"/>
-        <param name=3D"Append" value=3D"false"/>
-        <param name=3D"Threshold" value=3D"DEBUG"/>
+        <param name=3D"Append" value=3D"true"/>
+        <param name=3D"Threshold" value=3D"TRACE"/>
         <param name=3D"MaxFileSize" value=3D"10480KB"/>
         <param name=3D"MaxBackupIndex" value=3D"3"/>
         <layout class=3D"org.apache.log4j.PatternLayout">
@@ -43,9 +43,8 @@
     </category>
 =

     <category name=3D"org.cachebench" additivity=3D"false">
-        <priority value=3D"INFO"/>
+        <priority value=3D"TRACE"/>
         <appender-ref ref=3D"FILE"/>
-        <appender-ref ref=3D"CONSOLE"/>
     </category>
 =

     <category name=3D"net.sf.ehcache" additivity=3D"false">


--===============6253957869532292764==--

From jbosscache-commits at lists.jboss.org Mon Jan 28 10:00:27 2008
Content-Type: multipart/mixed; boundary="===============8110768172242770825=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r5246 - in
 core/trunk/src/main/java/org/jboss/cache: invocation and 1 other directory.
Date: Mon, 28 Jan 2008 10:00:27 -0500
Message-ID: <E1JJVTH-0003HI-8D@committer01.frg.pub.inap.atl.jboss.com>

--===============8110768172242770825==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: manik.surtani(a)jboss.com
Date: 2008-01-28 10:00:27 -0500 (Mon, 28 Jan 2008)
New Revision: 5246

Modified:
   core/trunk/src/main/java/org/jboss/cache/NodeSPI.java
   core/trunk/src/main/java/org/jboss/cache/UnversionedNode.java
   core/trunk/src/main/java/org/jboss/cache/invocation/NodeInvocationDelega=
te.java
Log:
Cleaned up unused methods in UnversionedNode

Modified: core/trunk/src/main/java/org/jboss/cache/NodeSPI.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/java/org/jboss/cache/NodeSPI.java	2008-01-28 11:47:=
58 UTC (rev 5245)
+++ core/trunk/src/main/java/org/jboss/cache/NodeSPI.java	2008-01-28 15:00:=
27 UTC (rev 5246)
@@ -162,7 +162,7 @@
     * @param sb     StringBuffer to print to
     * @param indent depth of this node in the tree.  Used to indent detail=
s by prepending spaces.
     */
-
+   @Deprecated
    void print(StringBuffer sb, int indent);
 =

    // versioning

Modified: core/trunk/src/main/java/org/jboss/cache/UnversionedNode.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/java/org/jboss/cache/UnversionedNode.java	2008-01-2=
8 11:47:58 UTC (rev 5245)
+++ core/trunk/src/main/java/org/jboss/cache/UnversionedNode.java	2008-01-2=
8 15:00:27 UTC (rev 5246)
@@ -31,15 +31,10 @@
  * @author Manik Surtani (<a href=3D"mailto:manik(a)jboss.org">manik(a)jbo=
ss.org</a>)
  * @since 2.0.0
  */
+(a)SuppressWarnings("unchecked")
 public class UnversionedNode<K, V> extends AbstractNode<K, V>
 {
-
    /**
-    * Default output indent for printing.
-    */
-   private static final int INDENT =3D 4;
-
-   /**
     * Debug log.
     */
    protected static Log log =3D LogFactory.getLog(UnversionedNode.class);
@@ -64,13 +59,13 @@
    /**
     * A reference of the CacheImpl instance.
     */
-   private transient CacheSPI<K, V> cache;
+   private transient CacheSPI cache;
    private transient CacheImpl cacheImpl;
 =

    /**
     * Map of general data keys to values.
     */
-   private final Map<K, V> data =3D new HashMap<K, V>();
+   private final Map data =3D new HashMap();
 =

    private boolean lockForChildInsertRemove;
 =

@@ -96,7 +91,7 @@
     *                {@link #data} field; <code>false</code> if param <cod=
e>data</code>'s contents should be copied into
     *                this object's {@link #data} field.
     */
-   protected UnversionedNode(Object child_name, Fqn fqn, Map<K, V> data, b=
oolean mapSafe, CacheSPI<K, V> cache)
+   protected UnversionedNode(Object child_name, Fqn fqn, Map data, boolean=
 mapSafe, CacheSPI cache)
    {
       init(child_name, fqn, cache);
       setInternalState(data);
@@ -122,7 +117,7 @@
    /**
     * Initializes with a name and FQN and cache.
     */
-   private void init(Object child_name, Fqn fqn, CacheSPI<K, V> cache)
+   private void init(Object child_name, Fqn fqn, CacheSPI cache)
    {
       if (cache =3D=3D null)
       {
@@ -140,7 +135,7 @@
    /**
     * Returns a parent by checking the TreeMap by name.
     */
-   public NodeSPI<K, V> getParent()
+   public NodeSPI getParent()
    {
       if (fqn.isRoot())
       {
@@ -174,7 +169,7 @@
       return children;
    }
 =

-   public CacheSPI<K, V> getCache()
+   public CacheSPI getCache()
    {
       return cache;
    }
@@ -195,13 +190,13 @@
          throw new NodeNotValidException("Node " + getFqn() + " is not val=
id.  Perhaps it has been moved or removed.");
    }
 =

-   public V get(K key)
+   public Object get(Object key)
    {
       assertValid();
       return cache.get(getFqn(), key);
    }
 =

-   public V getDirect(K key)
+   public Object getDirect(Object key)
    {
       return data.get(key);
    }
@@ -223,54 +218,45 @@
       return lock_;
    }
 =

-   public Map<K, V> getData()
+   public Map getDataDirect()
    {
-      // TODO: Fix this
-      throw new RuntimeException("Should never get here - use NodeIntercep=
torDelegate!");
-//      assertValid();
-//      if (cache =3D=3D null) return Collections.emptyMap();
-//      return cache.getData(getFqn());
-   }
-
-   public Map<K, V> getDataDirect()
-   {
       if (data =3D=3D null) return Collections.emptyMap();
       return Collections.unmodifiableMap(data);
    }
 =

-   public V put(K key, V value)
+   public Object put(Object key, Object value)
    {
       assertValid();
       return cache.put(getFqn(), key, value);
    }
 =

-   public V putDirect(K key, V value)
+   public Object putDirect(Object key, Object value)
    {
       return data.put(key, value);
    }
 =

-   public NodeSPI<K, V> getOrCreateChild(Object child_name, GlobalTransact=
ion gtx, boolean notify)
+   public NodeSPI getOrCreateChild(Object child_name, GlobalTransaction gt=
x, boolean notify)
    {
       return getOrCreateChild(child_name, gtx, true, notify);
    }
 =

-   private NodeSPI<K, V> getOrCreateChild(Object child_name, GlobalTransac=
tion gtx, boolean createIfNotExists, boolean notify)
+   private NodeSPI getOrCreateChild(Object child_name, GlobalTransaction g=
tx, boolean createIfNotExists, boolean notify)
    {
 =

-      NodeSPI<K, V> child;
+      NodeSPI child;
       if (child_name =3D=3D null)
       {
          throw new IllegalArgumentException("null child name");
       }
 =

-      child =3D (NodeSPI<K, V>) children().get(child_name);
+      child =3D (NodeSPI) children().get(child_name);
       InvocationContext ctx =3D cache.getInvocationContext();
       if (createIfNotExists && child =3D=3D null)
       {
          // construct the new child outside the synchronized block to avoid
          // spending any more time than necessary in the synchronized sect=
ion
          Fqn child_fqn =3D new Fqn(this.fqn, child_name);
-         NodeSPI<K, V> newChild =3D (NodeSPI<K, V>) cache.getConfiguration=
().getRuntimeConfig().getNodeFactory().createNode(child_name, delegate, nul=
l);
+         NodeSPI newChild =3D (NodeSPI) cache.getConfiguration().getRuntim=
eConfig().getNodeFactory().createNode(child_name, delegate, null);
          if (newChild =3D=3D null)
          {
             throw new IllegalStateException();
@@ -279,7 +265,7 @@
          {
             // check again to see if the child exists
             // after acquiring exclusive lock
-            child =3D (NodeSPI<K, V>) children().get(child_name);
+            child =3D (NodeSPI) children().get(child_name);
             if (child =3D=3D null)
             {
                if (notify) cache.getNotifier().notifyNodeCreated(child_fqn=
, true, ctx);
@@ -311,13 +297,13 @@
 =

    }
 =

-   public V remove(K key)
+   public Object remove(Object key)
    {
       assertValid();
       return cache.remove(getFqn(), key);
    }
 =

-   public V removeDirect(K key)
+   public Object removeDirect(Object key)
    {
       if (data =3D=3D null) return null;
       return data.remove(key);
@@ -434,16 +420,8 @@
       return sb.toString();
    }
 =

-   public Node<K, V> addChild(Fqn f)
+   public void addChildDirect(NodeSPI child)
    {
-      assertValid();
-      Fqn nf =3D new Fqn(getFqn(), f);
-      cache.put(nf, null);
-      return getChild(f);
-   }
-
-   public void addChildDirect(NodeSPI<K, V> child)
-   {
       if (child.getFqn().getParent().equals(getFqn()))
       {
          synchronized (this)
@@ -455,12 +433,12 @@
          throw new CacheException("Attempting to add a child [" + child.ge=
tFqn() + "] to [" + getFqn() + "].  Can only add direct children.");
    }
 =

-   public NodeSPI<K, V> addChildDirect(Fqn f)
+   public NodeSPI addChildDirect(Fqn f)
    {
       return addChildDirect(f, true);
    }
 =

-   public NodeSPI<K, V> addChildDirect(Fqn f, boolean notify)
+   public NodeSPI addChildDirect(Fqn f, boolean notify)
    {
       if (f.size() =3D=3D 1)
       {
@@ -474,31 +452,13 @@
 =

    }
 =

-   public void clearData()
-   {
-      // TODO: Fix this
-      throw new RuntimeException("Should never get here - use NodeIntercep=
torDelegate!");
-
-//      assertValid();
-//      cache.removeData(getFqn());
-   }
-
    public void clearDataDirect()
    {
       if (data !=3D null) data.clear();
    }
 =

-   public Node<K, V> getChild(Fqn fqn)
+   public NodeSPI getChildDirect(Fqn fqn)
    {
-      // TODO: Fix this
-      throw new RuntimeException("Should never get here - use NodeIntercep=
torDelegate!");
-//
-//      assertValid();
-//      return cache.get(new Fqn(getFqn(), fqn));
-   }
-
-   public NodeSPI<K, V> getChildDirect(Fqn fqn)
-   {
       if (fqn.size() =3D=3D 1)
       {
          return getChildDirect(fqn.getLastElement());
@@ -516,116 +476,20 @@
       }
    }
 =

-   public Set<Object> getChildrenNames()
-   {
-      // TODO: Fix this
-      throw new RuntimeException("Should never get here - use NodeIntercep=
torDelegate!");
-
-//      assertValid();
-//      return cache.getChildrenNames(getFqn());
-   }
-
    public Set<Object> getChildrenNamesDirect()
    {
       return children =3D=3D null ? Collections.emptySet() : new HashSet<O=
bject>(children.keySet());
    }
 =

-   public Set<K> getKeys()
+   public Set<Object> getKeysDirect()
    {
-      // TODO: Fix this
-      throw new RuntimeException("Should never get here - use NodeIntercep=
torDelegate!");
-
-//      assertValid();
-//      Set<K> keys =3D cache.getKeys(getFqn());
-//      return keys =3D=3D null ? Collections.<K>emptySet() : Collections.=
<K>unmodifiableSet(keys);
-   }
-
-   public Set<K> getKeysDirect()
-   {
       if (data =3D=3D null)
       {
          return Collections.emptySet();
       }
-      return Collections.unmodifiableSet(new HashSet<K>(data.keySet()));
+      return Collections.unmodifiableSet(new HashSet<Object>(data.keySet()=
));
    }
 =

-   public boolean hasChild(Fqn f)
-   {
-      assertValid();
-      return getChild(f) !=3D null;
-   }
-
-   public boolean hasChild(Object o)
-   {
-      assertValid();
-      return getChild(o) !=3D null;
-   }
-
-   public V putIfAbsent(K k, V v)
-   {
-      assertValid();
-      // make sure this is atomic.  Not hugely performant at the moment (s=
hould use the locking interceptors) but for now ...
-      synchronized (this)
-      {
-         if (!getKeys().contains(k))
-            return put(k, v);
-         else
-            return get(k);
-      }
-   }
-
-   public V replace(K key, V value)
-   {
-      assertValid();
-      // make sure this is atomic.  Not hugely performant at the moment (s=
hould use the locking interceptors) but for now ...
-      synchronized (this)
-      {
-         if (getKeys().contains(key))
-         {
-            return put(key, value);
-         }
-         else
-            return null;
-      }
-   }
-
-   public boolean replace(K key, V oldValue, V newValue)
-   {
-      assertValid();
-      // make sure this is atomic.  Not hugely performant at the moment (s=
hould use the locking interceptors) but for now ...
-      synchronized (this)
-      {
-         if (oldValue.equals(get(key)))
-         {
-            put(key, newValue);
-            return true;
-         }
-         else
-            return false;
-      }
-   }
-
-   public boolean removeChild(Fqn fqn)
-   {
-      assertValid();
-      return cache.removeNode(new Fqn(getFqn(), fqn));
-   }
-
-   public int dataSize()
-   {
-      // TODO: Fix this
-      throw new RuntimeException("Should never get here - use NodeIntercep=
torDelegate!");
-//
-//      assertValid();
-//      return cache.getKeys(getFqn()).size();
-   }
-
-   public boolean removeChild(Object childName)
-   {
-      assertValid();
-      return cache.removeNode(new Fqn(getFqn(), childName));
-   }
-
    public boolean removeChildDirect(Object childName)
    {
       return children !=3D null && children.remove(childName) !=3D null;
@@ -655,23 +519,14 @@
       this.children.putAll(children);
    }
 =

-   public void putAll(Map<K, V> data)
+   public void putAll(Map data)
    {
       assertValid();
       cache.put(fqn, data);
    }
 =

-   public void replaceAll(Map<K, V> data)
+   public void putAllDirect(Map data)
    {
-      // TODO: Fix this
-      throw new RuntimeException("Should never get here - use NodeIntercep=
torDelegate!");
-
-//      assertValid();
-//      cache.put(fqn, data, true);
-   }
-
-   public void putAllDirect(Map<K, V> data)
-   {
       if (data =3D=3D null) return;
       this.data.putAll(data);
    }
@@ -685,20 +540,6 @@
       children =3D null;
    }
 =

-   public void print(StringBuffer sb, int indent)
-   {
-      printIndent(sb, indent);
-      sb.append(Fqn.SEPARATOR).append(getName()).append(" ").append(getDat=
aDirect().size());
-      if (children !=3D null)
-      {
-         for (Node node : children.values())
-         {
-            sb.append("\n");
-            ((NodeSPI) node).print(sb, indent + INDENT);
-         }
-      }
-   }
-
    // versioning
 =

    public void setVersion(DataVersion version)
@@ -722,7 +563,7 @@
       }
    }
 =

-   public void addChild(Object child_name, Node<K, V> n)
+   public void addChild(Object child_name, Node n)
    {
       if (child_name !=3D null)
       {
@@ -768,45 +609,21 @@
       }
    }
 =

-   public Node<K, V> getChild(Object childName)
+   public NodeSPI getChildDirect(Object childName)
    {
-      // TODO: Fix this
-      throw new RuntimeException("Should never get here - use NodeIntercep=
torDelegate!");
-//
-//      return cache.get(new Fqn(getFqn(), childName));
-   }
-
-   public NodeSPI<K, V> getChildDirect(Object childName)
-   {
       if (childName =3D=3D null) return null;
-      return (NodeSPI<K, V>) (children =3D=3D null ? null : children.get(c=
hildName));
+      return (NodeSPI) (children =3D=3D null ? null : children.get(childNa=
me));
    }
 =

-   public Set<Node<K, V>> getChildren()
+   public Set<NodeSPI> getChildrenDirect()
    {
-      // TODO: Fix this
-      throw new RuntimeException("Should never get here - use NodeIntercep=
torDelegate!");
-
-//      assertValid();
-//      if (cache =3D=3D null) return Collections.emptySet();
-//      Set<Node<K, V>> children =3D new HashSet<Node<K, V>>();
-//      for (Object c : cache.getChildrenNames(getFqn()))
-//      {
-//         Node n =3D cache.get(new Fqn(getFqn(), c));
-//         if (n !=3D null) children.add(n);
-//      }
-//      return Collections.unmodifiableSet(children);
-   }
-
-   public Set<NodeSPI<K, V>> getChildrenDirect()
-   {
       // strip out deleted child nodes...
       if (children =3D=3D null || children.size() =3D=3D 0) return Collect=
ions.emptySet();
 =

-      Set<NodeSPI<K, V>> exclDeleted =3D new HashSet<NodeSPI<K, V>>();
-      for (Node<K, V> n : children.values())
+      Set<NodeSPI> exclDeleted =3D new HashSet<NodeSPI>();
+      for (Node n : children.values())
       {
-         NodeSPI<K, V> spi =3D (NodeSPI<K, V>) n;
+         NodeSPI spi =3D (NodeSPI) n;
          if (!spi.isDeleted()) exclDeleted.add(spi);
       }
       return Collections.unmodifiableSet(exclDeleted);
@@ -817,7 +634,7 @@
       return children !=3D null && children.size() !=3D 0;
    }
 =

-   public Set<NodeSPI<K, V>> getChildrenDirect(boolean includeMarkedForRem=
oval)
+   public Set<NodeSPI> getChildrenDirect(boolean includeMarkedForRemoval)
    {
       if (includeMarkedForRemoval)
       {
@@ -904,14 +721,12 @@
       this.lockForChildInsertRemove =3D lockForChildInsertRemove;
    }
 =

-   @SuppressWarnings("unchecked")
    public void setInternalState(Map state)
    {
       // don't bother doing anything here
       putAllDirect(state);
    }
 =

-   @SuppressWarnings("unchecked")
    public Map getInternalState(boolean onlyInternalState)
    {
       if (onlyInternalState)
@@ -925,7 +740,7 @@
    {
       if (recursive && children !=3D null)
       {
-         for (Node child : children.values())
+         for (Node<?, ?> child : children.values())
          {
             child.releaseObjectReferences(recursive);
          }

Modified: core/trunk/src/main/java/org/jboss/cache/invocation/NodeInvocatio=
nDelegate.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/java/org/jboss/cache/invocation/NodeInvocationDeleg=
ate.java	2008-01-28 11:47:58 UTC (rev 5245)
+++ core/trunk/src/main/java/org/jboss/cache/invocation/NodeInvocationDeleg=
ate.java	2008-01-28 15:00:27 UTC (rev 5246)
@@ -1,5 +1,6 @@
 package org.jboss.cache.invocation;
 =

+import org.jboss.cache.CacheException;
 import org.jboss.cache.CacheSPI;
 import org.jboss.cache.Fqn;
 import org.jboss.cache.Node;
@@ -118,7 +119,7 @@
 =

    public void print(StringBuffer sb, int indent)
    {
-      node.print(sb, indent);
+      throw new CacheException("This method is deprecated!");
    }
 =

    public void setVersion(DataVersion version)


--===============8110768172242770825==--

From jbosscache-commits at lists.jboss.org Mon Jan 28 12:02:27 2008
Content-Type: multipart/mixed; boundary="===============2250727128428556509=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r5247 - in
 benchmarks/benchmark-fwk/trunk: src/org/cachebench and 1 other directories.
Date: Mon, 28 Jan 2008 12:02:27 -0500
Message-ID: <E1JJXNL-0002Zz-E1@committer01.frg.pub.inap.atl.jboss.com>

--===============2250727128428556509==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: mircea.markus
Date: 2008-01-28 12:02:27 -0500 (Mon, 28 Jan 2008)
New Revision: 5247

Modified:
   benchmarks/benchmark-fwk/trunk/TODO
   benchmarks/benchmark-fwk/trunk/src/org/cachebench/CacheBenchmarkRunner.j=
ava
   benchmarks/benchmark-fwk/trunk/src/org/cachebench/cluster/ClusterBarrier=
.java
   benchmarks/benchmark-fwk/trunk/src/org/cachebench/cluster/TcpTransport.j=
ava
Log:
enhanced the barrier - if an node receives an barrier named differently it =
will exit. This means that stale processes are running within the cluster

Modified: benchmarks/benchmark-fwk/trunk/TODO
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- benchmarks/benchmark-fwk/trunk/TODO	2008-01-28 15:00:27 UTC (rev 5246)
+++ benchmarks/benchmark-fwk/trunk/TODO	2008-01-28 17:02:27 UTC (rev 5247)
@@ -1,3 +1,4 @@
 1.  JBoss Cache 1.4.1 breaks during warmup
 2.  ReplicationOccursTest doesn't always work - reports false errors.
+	- it relies on cache.getReplicatedData(); most likely that is the cause o=
f the problem, refere to javadoc
 3.  Replace cluster.sh, runNode.sh, killNode.sh and cache-product/product-=
x.y.z/config.sh with Ant scripts to make them cross-platform.

Modified: benchmarks/benchmark-fwk/trunk/src/org/cachebench/CacheBenchmarkR=
unner.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- benchmarks/benchmark-fwk/trunk/src/org/cachebench/CacheBenchmarkRunner.=
java	2008-01-28 15:00:27 UTC (rev 5246)
+++ benchmarks/benchmark-fwk/trunk/src/org/cachebench/CacheBenchmarkRunner.=
java	2008-01-28 17:02:27 UTC (rev 5247)
@@ -97,7 +97,7 @@
       List<TestResult> results =3D new ArrayList<TestResult>();
       for (TestCase test : conf.getTestCases())
       {
-         CacheWrapper cache;
+         CacheWrapper cache =3D null;
          try
          {
             cache =3D getCacheWrapperInstance(test);
@@ -123,6 +123,13 @@
          }
          catch (Exception e)
          {
+            try
+            {
+               shutdownCache(cache);
+            } catch (Exception e1)
+            {
+               //ignore
+            }
             logger.warn("Unable to Initialize or Setup the Cache - Not per=
forming any tests", e);
             errorLogger.error("Unable to Initialize or Setup the Cache: " =
+ test.getCacheWrapper(), e);
             errorLogger.error("Skipping this test");

Modified: benchmarks/benchmark-fwk/trunk/src/org/cachebench/cluster/Cluster=
Barrier.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- benchmarks/benchmark-fwk/trunk/src/org/cachebench/cluster/ClusterBarrie=
r.java	2008-01-28 15:00:27 UTC (rev 5246)
+++ benchmarks/benchmark-fwk/trunk/src/org/cachebench/cluster/ClusterBarrie=
r.java	2008-01-28 17:02:27 UTC (rev 5247)
@@ -19,11 +19,13 @@
 =

    private ClusterConfig config;
    public final Map<SocketAddress, Object> receivedMessages =3D new HashMa=
p<SocketAddress, Object>();
-   private Transport transport;
+   private TcpTransport transport;
    private Object message;
    private int numMembers;
    private boolean acknowledge;
    private static final String ACK =3D "_ACK";
+   private boolean failOnWrongMessaages;
+   private String errorMessage;
 =

 =

    /**
@@ -40,6 +42,7 @@
    public void setAcknowledge(boolean acknowledge)
    {
       this.acknowledge =3D acknowledge;
+      this.failOnWrongMessaages =3D acknowledge;
    }
 =

    /**
@@ -76,6 +79,14 @@
             receivedAllMessages =3D receivedMessages.size() >=3D numMember=
s;
             if (!receivedAllMessages)
             {
+               if (errorMessage !=3D null)
+               {
+                  //might be that I am the intruder, give other members a =
chance to fail aswell
+                  transport.send(null, message);
+                  transport.stop();
+                  Thread.sleep(2000);
+                  throw new IllegalStateException(errorMessage);
+               }
                receivedMessages.wait(2000);
             }
          }
@@ -91,19 +102,29 @@
 =

    public void receive(SocketAddress sender, Object payload) throws Except=
ion
    {
-      log.trace("Received '" + payload + "' from " + sender + " still expe=
cting " + getMissingMembersCount() + " member(s)");
+      log.trace("Received '" + payload + "' from " + formatName(sender) + =
" still expecting " + getMissingMembersCount() + " member(s)");
       if (payload =3D=3D null)
       {
          log.warn("payload is incorrect (sender=3D" + sender + "): " + pay=
load);
          return;
       }
-      if (acknowledge && !isAcknowledgeMessage(payload, message))
+      if (acknowledge && !isAcknowledgeMessage(payload))
       {
          log.trace("Sending ack, still expecting " + getMissingMembersCoun=
t() + " members.");
          transport.send(null, getAcknowledgeMessage(message));
          return;
       }
 =

+      if (failOnWrongMessaages && !message.equals(payload) && !getAcknowle=
dgeMessage(message).equals(payload))
+      {
+         errorMessage =3D "We recieved an message from a differenet barrie=
r. This normally means that there is an stale " +
+               "barrier running somewhere.The source of the message is '" =
+ sender + "', message is:'" + payload + "', " +
+               "and we were expecting '" + message + "'";
+         log.error(errorMessage);
+         this.receivedMessages.notifyAll();
+
+      }      =

+
       //we are here if either no ack or ack the message is an ack message
       synchronized (this.receivedMessages)
       {
@@ -113,10 +134,18 @@
             int expected =3D getMissingMembersCount();
             log.trace("Sender " + sender + " registered, still waiting for=
 " + expected + " member(s)");
             this.receivedMessages.notifyAll();
+         } else {
+            log.trace("Sender '" + formatName(sender) + "' is already regi=
stered in the list of known senders!");
          }
+         log.trace("Current list of senders is: " + receivedMessages.keySe=
t());
       }
    }
 =

+   private String formatName(SocketAddress sender)
+   {
+      return transport.isLocal(sender) ? "<local(" + sender + ")>" : Strin=
g.valueOf(sender);
+   }
+
    private int getMissingMembersCount()
    {
       return numMembers - receivedMessages.size();
@@ -138,13 +167,9 @@
       return message.toString() + ACK;
    }
 =

-   private boolean isAcknowledgeMessage(Object payload, Object message)
+   private boolean isAcknowledgeMessage(Object payload)
    {
-      boolean result;
-      String payloadStr =3D payload.toString();
-      result =3D payloadStr.equals(getAcknowledgeMessage(message));
-      log.trace("Is acknowledge? " + result);
-      return result;
+      return payload =3D=3D null ? false : (payload.toString().indexOf(ACK=
) >=3D 0);
    }
 =

    public void setConfig(ClusterConfig config)

Modified: benchmarks/benchmark-fwk/trunk/src/org/cachebench/cluster/TcpTran=
sport.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- benchmarks/benchmark-fwk/trunk/src/org/cachebench/cluster/TcpTransport.=
java	2008-01-28 15:00:27 UTC (rev 5246)
+++ benchmarks/benchmark-fwk/trunk/src/org/cachebench/cluster/TcpTransport.=
java	2008-01-28 17:02:27 UTC (rev 5247)
@@ -47,7 +47,6 @@
    public void create(ClusterConfig clusterConfig) throws Exception
    {
       this.config =3D clusterConfig;
-      String tmp;
       startPort =3D config.getPortForThisNode();
       String bindAddrStr =3D config.getBindAddress();
       if (bindAddrStr !=3D null)
@@ -121,7 +120,7 @@
          }
          catch (IOException ioEx)
          {
-            log.warn("An exception appeared whilst trying to create server=
 socket on port " + start_port1 + ", error:"
+            log.trace("An exception appeared whilst trying to create serve=
r socket on port " + start_port1 + ", error:"
                   + ioEx.getMessage());
          }
          break;
@@ -173,13 +172,10 @@
 =

    class ConnectionTable
    {
-      /**
-       * List<InetSocketAddress>
-       */
-      List myNodes;
+      List<InetSocketAddress> myNodes;
       final Connection[] connections;
 =

-      ConnectionTable(List nodes) throws Exception
+      ConnectionTable(List<InetSocketAddress> nodes) throws Exception
       {
          this.myNodes =3D nodes;
          connections =3D new Connection[nodes.size()];
@@ -190,9 +186,8 @@
       {
          int i =3D 0;
          log.trace("Nodes is " + myNodes);
-         for (Iterator it =3D myNodes.iterator(); it.hasNext();)
+         for (InetSocketAddress addr : myNodes)
          {
-            InetSocketAddress addr =3D (InetSocketAddress) it.next();
             if (connections[i] =3D=3D null)
             {
                try
@@ -204,10 +199,6 @@
                {
                   log.trace("-- failed to connect to " + addr);
                }
-               catch (Exception all_others)
-               {
-                  throw all_others;
-               }
             }
             i++;
          }
@@ -255,6 +246,19 @@
          }
          return sb.toString();
       }
+
+      public boolean isLocalConnection(SocketAddress socketAddress)
+      {
+         for (Connection conn : connections)
+         {
+            SocketAddress addr =3D conn.sock !=3D null ? conn.sock.getLoca=
lSocketAddress() : null;
+            if (addr !=3D null && addr.equals(socketAddress))
+            {
+               return true;
+            }
+         }
+         return false;
+      }
    }
 =

    class Connection
@@ -336,14 +340,9 @@
                if (receiver !=3D null)
                   receiver.receive(remote, message);
             }
-            catch (EOFException eof)
-            {
+            catch (Exception e) {
                break;
             }
-            catch (Exception ex)
-            {
-               break;
-            }
          }
          log.trace("-- receiver thread for " + remote + " terminated");
       }
@@ -352,11 +351,15 @@
       {
          try
          {
+            log.trace("Closing receiver thread for: " + sock);
             sock.close();
+            in.close();
             sock =3D null;
+            this.interrupt();
          }
          catch (Exception ex)
          {
+            log.warn("Exception while closing the thread", ex);
          }
       }
    }
@@ -386,4 +389,9 @@
       return retval;
    }
 =

+   public boolean isLocal(SocketAddress sa)
+   {
+      return connectionTable.isLocalConnection(sa);
+   }
+
 }


--===============2250727128428556509==--

From jbosscache-commits at lists.jboss.org Mon Jan 28 12:38:15 2008
Content-Type: multipart/mixed; boundary="===============3539705154689281317=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r5248 -
 benchmarks/benchmark-fwk/trunk.
Date: Mon, 28 Jan 2008 12:38:15 -0500
Message-ID: <E1JJXvz-00017w-AS@committer01.frg.pub.inap.atl.jboss.com>

--===============3539705154689281317==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: mircea.markus
Date: 2008-01-28 12:38:15 -0500 (Mon, 28 Jan 2008)
New Revision: 5248

Modified:
   benchmarks/benchmark-fwk/trunk/allJBossCacheTests.sh
Log:
cluster-stop is bad, as it might interfere with after report generation run=
ning barrier, and leave the cluster in an inconsistent state

Modified: benchmarks/benchmark-fwk/trunk/allJBossCacheTests.sh
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- benchmarks/benchmark-fwk/trunk/allJBossCacheTests.sh	2008-01-28 17:02:2=
7 UTC (rev 5247)
+++ benchmarks/benchmark-fwk/trunk/allJBossCacheTests.sh	2008-01-28 17:38:1=
5 UTC (rev 5248)
@@ -21,8 +21,6 @@
 			done
 			sleep 60
 			mv performance-$size.csv output/$product-$config-$size.csv
-			./cluster.sh stop
-			#/home/msurtani/bin/killAllJVMs.sh
 			sleep 10
 		done
 	done


--===============3539705154689281317==--

From jbosscache-commits at lists.jboss.org Mon Jan 28 17:40:45 2008
Content-Type: multipart/mixed; boundary="===============5945350496096489561=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r5249 - in core/trunk/src:
 test/java/org/jboss/cache/api and 1 other directories.
Date: Mon, 28 Jan 2008 17:40:44 -0500
Message-ID: <E1JJcei-0003ln-Tg@committer01.frg.pub.inap.atl.jboss.com>

--===============5945350496096489561==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: mircea.markus
Date: 2008-01-28 17:40:44 -0500 (Mon, 28 Jan 2008)
New Revision: 5249

Added:
   core/trunk/src/test/resources/META-INF/conf-test/local-tx-service.xml
Modified:
   core/trunk/src/main/java/org/jboss/cache/interceptors/PessimisticLockInt=
erceptor.java
   core/trunk/src/test/java/org/jboss/cache/api/CacheAPITest.java
Log:
fixed tests and added an an rolledback the mark node as deleted behavior, i=
n order to supress notifications for temporary created nodes

Modified: core/trunk/src/main/java/org/jboss/cache/interceptors/Pessimistic=
LockInterceptor.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/java/org/jboss/cache/interceptors/PessimisticLockIn=
terceptor.java	2008-01-28 17:38:15 UTC (rev 5248)
+++ core/trunk/src/main/java/org/jboss/cache/interceptors/PessimisticLockIn=
terceptor.java	2008-01-28 22:40:44 UTC (rev 5249)
@@ -118,7 +118,7 @@
       }
       else
       {
-         acquireLocksWithTimeout(ctx, fqn, NodeLock.LockType.WRITE, true, =
false, false, true, null);
+         acquireLocksWithTimeout(ctx, fqn, NodeLock.LockType.WRITE, true, =
false, false, true, null, false);
       }
       return nextInterceptor(ctx);
    }
@@ -130,7 +130,7 @@
 =

    protected Object handleLockMethod(InvocationContext ctx, Fqn fqn, NodeL=
ock.LockType lockType, boolean recursive) throws Throwable
    {
-      acquireLocksWithTimeout(ctx, fqn, lockType, false, false, false, fal=
se, null);
+      acquireLocksWithTimeout(ctx, fqn, lockType, false, false, false, fal=
se, null, false);
       if (recursive)
       {
          //acquireLocksOnChildren(cache.peek(fqn, false), lockType, ctx);
@@ -204,7 +204,7 @@
       if (trace) log.trace("Attempting to get WL on node to be moved [" + =
from + "]");
       if (from !=3D null && !(configuration.getIsolationLevel() =3D=3D Iso=
lationLevel.NONE))
       {
-         lock(ctx, from, NodeLock.LockType.WRITE, false, timeout, true, fa=
lse, null);
+         lock(ctx, from, NodeLock.LockType.WRITE, false, timeout, true, fa=
lse, null, false);
          if (ctx.getGlobalTransaction() !=3D null)
          {
             cache.getTransactionTable().get(ctx.getGlobalTransaction()).ad=
dRemovedNode(from);
@@ -215,7 +215,7 @@
       {
          //now for an RL for the new parent.
          if (trace) log.trace("Attempting to get RL on new parent [" + to =
+ "]");
-         lock(ctx, to, NodeLock.LockType.READ, false, timeout, false, fals=
e, null);
+         lock(ctx, to, NodeLock.LockType.READ, false, timeout, false, fals=
e, null, false);
          acquireLocksOnChildren(peekNode(ctx, to, false, true, false), Nod=
eLock.LockType.READ, ctx);
       }
       Object retValue =3D nextInterceptor(ctx);
@@ -234,7 +234,7 @@
       List<Fqn> createdNodes =3D new LinkedList<Fqn>();
       // we need to mark new nodes created as deleted since they are only =
created to form a path to the node being removed, to
       // create a lock.
-      boolean created =3D acquireLocksWithTimeout(ctx, fqn, NodeLock.LockT=
ype.WRITE, true, false, true, false, createdNodes);
+      boolean created =3D acquireLocksWithTimeout(ctx, fqn, NodeLock.LockT=
ype.WRITE, true, false, true, false, createdNodes, true);
       if (ctx.getGlobalTransaction() !=3D null)
       {
          TransactionEntry entry =3D tx_table.get(ctx.getGlobalTransaction(=
));
@@ -263,7 +263,7 @@
 =

    protected Object handlePutForExternalReadMethod(InvocationContext ctx, =
GlobalTransaction tx, Fqn fqn, Object key, Object value) throws Throwable
    {
-      acquireLocksWithTimeout(ctx, fqn, NodeLock.LockType.READ, true, true=
, false, true, null);
+      acquireLocksWithTimeout(ctx, fqn, NodeLock.LockType.READ, true, true=
, false, true, null, false);
       return nextInterceptor(ctx);
    }
 =

@@ -274,61 +274,61 @@
 =

    protected Object handleRemoveDataMethod(InvocationContext ctx, GlobalTr=
ansaction tx, Fqn fqn, boolean createUndoOps) throws Throwable
    {
-      acquireLocksWithTimeout(ctx, fqn, NodeLock.LockType.WRITE, false, fa=
lse, false, false, null);
+      acquireLocksWithTimeout(ctx, fqn, NodeLock.LockType.WRITE, false, fa=
lse, false, false, null, false);
       return nextInterceptor(ctx);
    }
 =

    protected Object handleAddChildMethod(InvocationContext ctx, GlobalTran=
saction tx, Fqn parentFqn, Object childName, Node cn, boolean createUndoOps=
) throws Throwable
    {
-      acquireLocksWithTimeout(ctx, parentFqn, NodeLock.LockType.READ, fals=
e, false, false, false, null);
+      acquireLocksWithTimeout(ctx, parentFqn, NodeLock.LockType.READ, fals=
e, false, false, false, null, false);
       return nextInterceptor(ctx);
    }
 =

    protected Object handleEvictMethod(InvocationContext ctx, Fqn fqn) thro=
ws Throwable
    {
-      acquireLocksWithTimeout(ctx, fqn, NodeLock.LockType.WRITE, false, tr=
ue, false, false, null);
+      acquireLocksWithTimeout(ctx, fqn, NodeLock.LockType.WRITE, false, tr=
ue, false, false, null, false);
       return nextInterceptor(ctx);
    }
 =

    protected Object handleGetKeyValueMethod(InvocationContext ctx, Fqn fqn=
, Object key, boolean sendNodeEvent) throws Throwable
    {
-      acquireLocksWithTimeout(ctx, fqn, NodeLock.LockType.READ, false, fal=
se, false, false, null);
+      acquireLocksWithTimeout(ctx, fqn, NodeLock.LockType.READ, false, fal=
se, false, false, null, false);
       return nextInterceptor(ctx);
    }
 =

    protected Object handleGetNodeMethod(InvocationContext ctx, Fqn fqn) th=
rows Throwable
    {
-      acquireLocksWithTimeout(ctx, fqn, NodeLock.LockType.READ, false, fal=
se, false, false, null);
+      acquireLocksWithTimeout(ctx, fqn, NodeLock.LockType.READ, false, fal=
se, false, false, null, false);
       return nextInterceptor(ctx);
    }
 =

    protected Object handleGetKeysMethod(InvocationContext ctx, Fqn fqn) th=
rows Throwable
    {
-      acquireLocksWithTimeout(ctx, fqn, NodeLock.LockType.READ, false, fal=
se, false, false, null);
+      acquireLocksWithTimeout(ctx, fqn, NodeLock.LockType.READ, false, fal=
se, false, false, null, false);
       return nextInterceptor(ctx);
    }
 =

    protected Object handleGetChildrenNamesMethod(InvocationContext ctx, Fq=
n fqn) throws Throwable
    {
-      acquireLocksWithTimeout(ctx, fqn, NodeLock.LockType.READ, false, fal=
se, false, false, null);
+      acquireLocksWithTimeout(ctx, fqn, NodeLock.LockType.READ, false, fal=
se, false, false, null, false);
       return nextInterceptor(ctx);
    }
 =

    protected Object handlePrintMethod(InvocationContext ctx, Fqn fqn) thro=
ws Throwable
    {
-      acquireLocksWithTimeout(ctx, fqn, NodeLock.LockType.READ, false, fal=
se, false, false, null);
+      acquireLocksWithTimeout(ctx, fqn, NodeLock.LockType.READ, false, fal=
se, false, false, null, false);
       return nextInterceptor(ctx);
    }
 =

    protected Object handleReleaseAllLocksMethod(InvocationContext ctx, Fqn=
 fqn) throws Throwable
    {
-      acquireLocksWithTimeout(ctx, fqn, NodeLock.LockType.READ, false, fal=
se, false, false, null);
+      acquireLocksWithTimeout(ctx, fqn, NodeLock.LockType.READ, false, fal=
se, false, false, null, false);
       return nextInterceptor(ctx);
    }
 =

    private boolean acquireLocksWithTimeout(InvocationContext ctx, Fqn fqn,=
 NodeLock.LockType lockType,
                                            boolean createIfNotExists, bool=
ean zeroLockTimeout,
-                                           boolean acquireLockOnParent, bo=
olean reverseRemoveCheck, List<Fqn> createdNodes)
+                                           boolean acquireLockOnParent, bo=
olean reverseRemoveCheck, List<Fqn> createdNodes, boolean markNewNodesAsDel=
eted)
          throws InterruptedException
    {
       if (fqn =3D=3D null || configuration.getIsolationLevel() =3D=3D Isol=
ationLevel.NONE) return false;
@@ -345,7 +345,7 @@
          {
             throw new TimeoutException("Unable to acquire lock on Fqn " + =
fqn + " after " + timeout + " millis");
          }
-         created =3D lock(ctx, fqn, lockType, createIfNotExists, timeout, =
acquireLockOnParent, reverseRemoveCheck, createdNodes);
+         created =3D lock(ctx, fqn, lockType, createIfNotExists, timeout, =
acquireLockOnParent, reverseRemoveCheck, createdNodes, markNewNodesAsDelete=
d);
          firstTry =3D false;
       }
       while (createIfNotExists && peekNode(ctx, fqn, false, true, false) =
=3D=3D null);// keep trying until we have the lock (fixes concurrent remove=
())
@@ -362,9 +362,10 @@
     *                              reach a node that does not exists
     * @param reverseRemoveCheck    see {@link #manageReverseRemove(org.jbo=
ss.cache.transaction.GlobalTransaction, org.jboss.cache.NodeSPI, boolean)}
     * @param createdNodes          a list to which any nodes created can r=
egister their Fqns so that calling code is aware of which nodes have been n=
ewly created.
+    * @param markNewNodesAsDeleted
     */
    private boolean lock(InvocationContext ctx, Fqn fqn, NodeLock.LockType =
lockType, boolean createIfNotExists, long timeout,
-                        boolean acquireWriteLockOnParent, boolean reverseR=
emoveCheck, List<Fqn> createdNodes)
+                        boolean acquireWriteLockOnParent, boolean reverseR=
emoveCheck, List<Fqn> createdNodes, boolean markNewNodesAsDeleted)
          throws TimeoutException, LockingException, InterruptedException
    {
       Thread currentThread =3D Thread.currentThread();
@@ -390,10 +391,11 @@
             if (createIfNotExists)
             {
                // if the new node is to be marked as deleted, do not notif=
y!
-               currentNode =3D parent.addChildDirect(new Fqn(childName), t=
rue);
+               currentNode =3D parent.addChildDirect(new Fqn(childName), !=
markNewNodesAsDeleted);
                created =3D true;
-               if (trace) log.trace("Child node was null, so created child=
 node " + childName + System.identityHashCode(currentNode));
+               if (trace) log.trace("Child node was null, so created child=
 node " + childName);
                if (createdNodes !=3D null) createdNodes.add(currentNode.ge=
tFqn());
+               if (markNewNodesAsDeleted) currentNode.markAsDeleted(true);
             }
             else
             {

Modified: core/trunk/src/test/java/org/jboss/cache/api/CacheAPITest.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/test/java/org/jboss/cache/api/CacheAPITest.java	2008-01-=
28 17:38:15 UTC (rev 5248)
+++ core/trunk/src/test/java/org/jboss/cache/api/CacheAPITest.java	2008-01-=
28 22:40:44 UTC (rev 5249)
@@ -43,7 +43,7 @@
    {
       // start a single cache instance
       CacheFactory<String, String> cf =3D new DefaultCacheFactory();
-      cache =3D cf.createCache("/META-INF/news/local-cache-service.xml", f=
alse);
+      cache =3D cf.createCache("META-INF/conf-test/local-tx-service.xml", =
false);
       cache.getConfiguration().setNodeLockingScheme(optimistic ? Configura=
tion.NodeLockingScheme.OPTIMISTIC : Configuration.NodeLockingScheme.PESSIMI=
STIC);
       cache.start();
       events.clear();

Added: core/trunk/src/test/resources/META-INF/conf-test/local-tx-service.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/test/resources/META-INF/conf-test/local-tx-service.xml	 =
                       (rev 0)
+++ core/trunk/src/test/resources/META-INF/conf-test/local-tx-service.xml	2=
008-01-28 22:40:44 UTC (rev 5249)
@@ -0,0 +1,107 @@
+<?xml version=3D"1.0" encoding=3D"UTF-8"?>
+
+<!-- =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D -->
+<!--                                                                      =
 -->
+<!--  Sample TreeCache Service Configuration                              =
 -->
+<!--                                                                      =
 -->
+<!-- =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D -->
+
+<server>
+
+   <!-- =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D -->
+   <!-- Defines TreeCache configuration                                   =
   -->
+   <!-- =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D -->
+
+   <mbean code=3D"org.jboss.cache.jmx.CacheJmxWrapper"
+          name=3D"jboss.cache:service=3DTreeCache">
+
+      <depends>jboss:service=3DNaming</depends>
+      <depends>jboss:service=3DTransactionManager</depends>
+
+
+      <!-- Configure the TransactionManager -->
+      <attribute name=3D"TransactionManagerLookupClass">org.jboss.cache.tr=
ansaction.GenericTransactionManagerLookup
+      </attribute>
+
+
+      <!--
+          Node locking level : SERIALIZABLE
+                               REPEATABLE_READ (default)
+                               READ_COMMITTED
+                               READ_UNCOMMITTED
+                               NONE
+      -->
+      <attribute name=3D"IsolationLevel">REPEATABLE_READ</attribute>
+
+      <!--
+           Valid modes are LOCAL
+                           REPL_ASYNC
+                           REPL_SYNC
+                           INVALIDATION_ASYNC
+                           INVALIDATION_SYNC
+      -->
+      <attribute name=3D"CacheMode">LOCAL</attribute>
+
+      <!-- Name of cluster. Needs to be the same for all clusters, in order
+           to find each other
+      -->
+      <attribute name=3D"ClusterName">JBossCache-Cluster</attribute>
+
+      <!-- JGroups protocol stack properties. Can also be a URL,
+           e.g. file:/home/bela/default.xml
+         <attribute name=3D"ClusterProperties"></attribute>
+      -->
+
+      <!-- JGroups protocol stack properties NOT NEEDED since CacheMode is=
 LOCAL -->
+
+
+      <!--
+          The max amount of time (in milliseconds) we wait until the
+          state (ie. the contents of the cache) are retrieved from
+          existing members in a clustered environment
+      -->
+      <attribute name=3D"StateRetrievalTimeout">20000</attribute>
+
+      <!--
+          Number of milliseconds to wait until all responses for a
+          synchronous call have been received.
+      -->
+      <attribute name=3D"SyncReplTimeout">20000</attribute>
+
+      <!-- Max number of milliseconds to wait for a lock acquisition -->
+      <attribute name=3D"LockAcquisitionTimeout">15000</attribute>
+
+
+      <!-- Specific eviction policy configurations. This is LRU -->
+      <attribute name=3D"EvictionPolicyConfig">
+         <config>
+            <attribute name=3D"wakeUpIntervalSeconds">5</attribute>
+            <!-- This defaults to 200000 if not specified -->
+            <attribute name=3D"eventQueueSize">200000</attribute>
+            <attribute name=3D"policyClass">org.jboss.cache.eviction.LRUPo=
licy</attribute>
+
+            <!-- Cache wide default -->
+            <region name=3D"/_default_">
+               <attribute name=3D"maxNodes">5000</attribute>
+               <attribute name=3D"timeToLiveSeconds">1000</attribute>
+            </region>
+            <region name=3D"/org/jboss/data">
+               <attribute name=3D"maxNodes">5000</attribute>
+               <attribute name=3D"timeToLiveSeconds">1000</attribute>
+            </region>
+            <region name=3D"/org/jboss/test/data">
+               <attribute name=3D"maxNodes">5</attribute>
+               <attribute name=3D"timeToLiveSeconds">4</attribute>
+            </region>
+         </config>
+      </attribute>
+
+      <!--
+         Indicate whether to use region based marshalling or not. Set this=
 to true if you are running under a scoped
+         class loader, e.g., inside an application server. Default is "fal=
se".
+      -->
+      <attribute name=3D"UseRegionBasedMarshalling">false</attribute>
+   </mbean>
+
+
+</server>


--===============5945350496096489561==--

From jbosscache-commits at lists.jboss.org Mon Jan 28 18:55:57 2008
Content-Type: multipart/mixed; boundary="===============4793328514101257986=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r5250 - in core/trunk/src:
 test/java/org/jboss/cache/api and 1 other directories.
Date: Mon, 28 Jan 2008 18:55:57 -0500
Message-ID: <E1JJdpV-00024e-7e@committer01.frg.pub.inap.atl.jboss.com>

--===============4793328514101257986==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: mircea.markus
Date: 2008-01-28 18:55:57 -0500 (Mon, 28 Jan 2008)
New Revision: 5250

Modified:
   core/trunk/src/main/java/org/jboss/cache/interceptors/PessimisticLockInt=
erceptor.java
   core/trunk/src/test/java/org/jboss/cache/api/NodeAPITest.java
   core/trunk/src/test/java/org/jboss/cache/lock/pessimistic/ConcurrentPutR=
emoveTest.java
Log:
fixed tests and added an an rolledback the mark node as deleted behavior, i=
n order to supress notifications for temporary created nodes

Modified: core/trunk/src/main/java/org/jboss/cache/interceptors/Pessimistic=
LockInterceptor.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/java/org/jboss/cache/interceptors/PessimisticLockIn=
terceptor.java	2008-01-28 22:40:44 UTC (rev 5249)
+++ core/trunk/src/main/java/org/jboss/cache/interceptors/PessimisticLockIn=
terceptor.java	2008-01-28 23:55:57 UTC (rev 5250)
@@ -231,7 +231,7 @@
    protected Object handleRemoveNodeMethod(InvocationContext ctx, GlobalTr=
ansaction tx, Fqn fqn, boolean createUndoOps) throws Throwable
    {
       // need to make a note of ALL nodes created here!!
-      List<Fqn> createdNodes =3D new LinkedList<Fqn>();
+      List<NodeSPI> createdNodes =3D new LinkedList<NodeSPI>();
       // we need to mark new nodes created as deleted since they are only =
created to form a path to the node being removed, to
       // create a lock.
       boolean created =3D acquireLocksWithTimeout(ctx, fqn, NodeLock.LockT=
ype.WRITE, true, false, true, false, createdNodes, true);
@@ -239,7 +239,11 @@
       {
          TransactionEntry entry =3D tx_table.get(ctx.getGlobalTransaction(=
));
          entry.addRemovedNode(fqn);
-         for (Fqn f : createdNodes) entry.addRemovedNode(f);
+         for (NodeSPI nodeSPI : createdNodes)
+         {
+            entry.addRemovedNode(nodeSPI.getFqn());
+            nodeSPI.markAsDeleted(true);
+         }
       }
       acquireLocksOnChildren(peekNode(ctx, fqn, false, false, false), Node=
Lock.LockType.WRITE, ctx);
       Object retVal =3D nextInterceptor(ctx);
@@ -248,7 +252,7 @@
       if (ctx.getGlobalTransaction() =3D=3D null)
       {
 =

-         for (Fqn f : createdNodes) cacheImpl.realRemove(f, true);
+         for (NodeSPI nodeSPI : createdNodes) cacheImpl.realRemove(nodeSPI=
.getFqn(), true);
          cacheImpl.realRemove(fqn, true);
 =

          NodeSPI n =3D peekNode(ctx, fqn, false, true, false);
@@ -328,7 +332,7 @@
 =

    private boolean acquireLocksWithTimeout(InvocationContext ctx, Fqn fqn,=
 NodeLock.LockType lockType,
                                            boolean createIfNotExists, bool=
ean zeroLockTimeout,
-                                           boolean acquireLockOnParent, bo=
olean reverseRemoveCheck, List<Fqn> createdNodes, boolean markNewNodesAsDel=
eted)
+                                           boolean acquireLockOnParent, bo=
olean reverseRemoveCheck, List<NodeSPI> createdNodes, boolean skipNotificat=
ion)
          throws InterruptedException
    {
       if (fqn =3D=3D null || configuration.getIsolationLevel() =3D=3D Isol=
ationLevel.NONE) return false;
@@ -345,7 +349,7 @@
          {
             throw new TimeoutException("Unable to acquire lock on Fqn " + =
fqn + " after " + timeout + " millis");
          }
-         created =3D lock(ctx, fqn, lockType, createIfNotExists, timeout, =
acquireLockOnParent, reverseRemoveCheck, createdNodes, markNewNodesAsDelete=
d);
+         created =3D lock(ctx, fqn, lockType, createIfNotExists, timeout, =
acquireLockOnParent, reverseRemoveCheck, createdNodes, skipNotification);
          firstTry =3D false;
       }
       while (createIfNotExists && peekNode(ctx, fqn, false, true, false) =
=3D=3D null);// keep trying until we have the lock (fixes concurrent remove=
())
@@ -362,10 +366,10 @@
     *                              reach a node that does not exists
     * @param reverseRemoveCheck    see {@link #manageReverseRemove(org.jbo=
ss.cache.transaction.GlobalTransaction, org.jboss.cache.NodeSPI, boolean)}
     * @param createdNodes          a list to which any nodes created can r=
egister their Fqns so that calling code is aware of which nodes have been n=
ewly created.
-    * @param markNewNodesAsDeleted
+    * @param skipNotification
     */
    private boolean lock(InvocationContext ctx, Fqn fqn, NodeLock.LockType =
lockType, boolean createIfNotExists, long timeout,
-                        boolean acquireWriteLockOnParent, boolean reverseR=
emoveCheck, List<Fqn> createdNodes, boolean markNewNodesAsDeleted)
+                        boolean acquireWriteLockOnParent, boolean reverseR=
emoveCheck, List<NodeSPI> createdNodes, boolean skipNotification)
          throws TimeoutException, LockingException, InterruptedException
    {
       Thread currentThread =3D Thread.currentThread();
@@ -391,11 +395,10 @@
             if (createIfNotExists)
             {
                // if the new node is to be marked as deleted, do not notif=
y!
-               currentNode =3D parent.addChildDirect(new Fqn(childName), !=
markNewNodesAsDeleted);
+               currentNode =3D parent.addChildDirect(new Fqn(childName), !=
skipNotification);
                created =3D true;
                if (trace) log.trace("Child node was null, so created child=
 node " + childName);
-               if (createdNodes !=3D null) createdNodes.add(currentNode.ge=
tFqn());
-               if (markNewNodesAsDeleted) currentNode.markAsDeleted(true);
+               if (createdNodes !=3D null) createdNodes.add(currentNode);
             }
             else
             {
@@ -429,7 +432,7 @@
             // check if the parent exists!!
             // look into invalidated nodes as well
             currentNode.getLock().releaseAll(owner);
-            if (peekNode(ctx, parent.getFqn(), true, true, true) =3D=3D nu=
ll)
+            if (parent =3D=3D null || peekNode(ctx, parent.getFqn(), true,=
 true, true) =3D=3D null)
             {
                // crap!
                if (trace) log.trace("Parent has been deleted again.  Go th=
rough the lock method all over again.");

Modified: core/trunk/src/test/java/org/jboss/cache/api/NodeAPITest.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/test/java/org/jboss/cache/api/NodeAPITest.java	2008-01-2=
8 22:40:44 UTC (rev 5249)
+++ core/trunk/src/test/java/org/jboss/cache/api/NodeAPITest.java	2008-01-2=
8 23:55:57 UTC (rev 5250)
@@ -46,7 +46,7 @@
    public void setUp() throws Exception
    {
       // start a single cache instance
-      cache =3D (CacheSPI<Object, Object>) new DefaultCacheFactory().creat=
eCache("/META-INF/news/local-cache-service.xml", false);
+      cache =3D (CacheSPI<Object, Object>) new DefaultCacheFactory().creat=
eCache("META-INF/conf-test/local-tx-service.xml", false);
       cache.getConfiguration().setNodeLockingScheme(optimistic ? Configura=
tion.NodeLockingScheme.OPTIMISTIC : Configuration.NodeLockingScheme.PESSIMI=
STIC);
       cache.start();
       rootNode =3D cache.getRoot();

Modified: core/trunk/src/test/java/org/jboss/cache/lock/pessimistic/Concurr=
entPutRemoveTest.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/test/java/org/jboss/cache/lock/pessimistic/ConcurrentPut=
RemoveTest.java	2008-01-28 22:40:44 UTC (rev 5249)
+++ core/trunk/src/test/java/org/jboss/cache/lock/pessimistic/ConcurrentPut=
RemoveTest.java	2008-01-28 23:55:57 UTC (rev 5250)
@@ -61,7 +61,7 @@
       }
    }
 =

-   @Test(invocationCount =3D 10, enabled =3D true)
+   @Test(invocationCount =3D 25, enabled =3D true)
    public void testLock() throws Exception
    {
       for (int x =3D 0; x < 2; x++)
@@ -118,6 +118,8 @@
          }
          catch (Exception e)
          {
+            log.error("*** error on a thread", e);
+//            System.exit(1);
             this.e =3D e;
          }
       }


--===============4793328514101257986==--

From jbosscache-commits at lists.jboss.org Mon Jan 28 19:15:28 2008
Content-Type: multipart/mixed; boundary="===============0570989261292150344=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r5251 - in core/trunk/src/test:
 java/org/jboss/cache/config and 3 other directories.
Date: Mon, 28 Jan 2008 19:15:28 -0500
Message-ID: <E1JJe8O-0006DG-Ga@committer01.frg.pub.inap.atl.jboss.com>

--===============0570989261292150344==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: mircea.markus
Date: 2008-01-28 19:15:28 -0500 (Mon, 28 Jan 2008)
New Revision: 5251

Added:
   core/trunk/src/test/resources/META-INF/conf-test/local-passivation-servi=
ce.xml
Modified:
   core/trunk/src/test/java/org/jboss/cache/api/NodeMoveAPITest.java
   core/trunk/src/test/java/org/jboss/cache/config/ConfigurationCloningTest=
.java
   core/trunk/src/test/java/org/jboss/cache/invocationcontext/TransactionTe=
st.java
   core/trunk/src/test/java/org/jboss/cache/passivation/BasicPassivationTes=
t.java
   core/trunk/src/test/java/org/jboss/cache/passivation/ConcurrentPassivati=
onTest.java
   core/trunk/src/test/java/org/jboss/cache/passivation/LocalPassivationInt=
egrationTest.java
Log:
fixed tests

Modified: core/trunk/src/test/java/org/jboss/cache/api/NodeMoveAPITest.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/test/java/org/jboss/cache/api/NodeMoveAPITest.java	2008-=
01-28 23:55:57 UTC (rev 5250)
+++ core/trunk/src/test/java/org/jboss/cache/api/NodeMoveAPITest.java	2008-=
01-29 00:15:28 UTC (rev 5251)
@@ -46,7 +46,7 @@
    public void setUp() throws Exception
    {
       // start a single cache instance
-      cache =3D (CacheSPI<Object, Object>) new DefaultCacheFactory().creat=
eCache("/META-INF/news/local-cache-service.xml", false);
+      cache =3D (CacheSPI<Object, Object>) new DefaultCacheFactory().creat=
eCache("META-INF/conf-test/local-tx-service.xml", false);
       cache.getConfiguration().setNodeLockingScheme(optimistic ? Configura=
tion.NodeLockingScheme.OPTIMISTIC : Configuration.NodeLockingScheme.PESSIMI=
STIC);
       cache.start();
       rootNode =3D cache.getRoot();

Modified: core/trunk/src/test/java/org/jboss/cache/config/ConfigurationClon=
ingTest.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/test/java/org/jboss/cache/config/ConfigurationCloningTes=
t.java	2008-01-28 23:55:57 UTC (rev 5250)
+++ core/trunk/src/test/java/org/jboss/cache/config/ConfigurationCloningTes=
t.java	2008-01-29 00:15:28 UTC (rev 5251)
@@ -36,7 +36,7 @@
 public class ConfigurationCloningTest
 {
    /** A file that includes every configuration element I could think of */
-   public static final String DEFAULT_CONFIGURATION_FILE =3D "META-INF/clo=
nable-config-service.xml";
+   public static final String DEFAULT_CONFIGURATION_FILE =3D "META-INF/con=
f-test/clonable-config-service.xml";
    =

    private static final Log log =3D LogFactory.getLog(ConfigurationCloning=
Test.class);
    =


Modified: core/trunk/src/test/java/org/jboss/cache/invocationcontext/Transa=
ctionTest.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/test/java/org/jboss/cache/invocationcontext/TransactionT=
est.java	2008-01-28 23:55:57 UTC (rev 5250)
+++ core/trunk/src/test/java/org/jboss/cache/invocationcontext/TransactionT=
est.java	2008-01-29 00:15:28 UTC (rev 5251)
@@ -25,7 +25,7 @@
    @BeforeMethod(alwaysRun =3D true)
    public void setUp()
    {
-      cache =3D (CacheSPI<Object, Object>) new DefaultCacheFactory().creat=
eCache("/META-INF/news/local-cache-service.xml");
+      cache =3D (CacheSPI<Object, Object>) new DefaultCacheFactory().creat=
eCache("META-INF/conf-test/local-tx-service.xml");
       tm =3D cache.getTransactionManager();
    }
 =


Modified: core/trunk/src/test/java/org/jboss/cache/passivation/BasicPassiva=
tionTest.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/test/java/org/jboss/cache/passivation/BasicPassivationTe=
st.java	2008-01-28 23:55:57 UTC (rev 5250)
+++ core/trunk/src/test/java/org/jboss/cache/passivation/BasicPassivationTe=
st.java	2008-01-29 00:15:28 UTC (rev 5251)
@@ -12,6 +12,7 @@
 import org.jboss.cache.DefaultCacheFactory;
 import org.jboss.cache.Fqn;
 import org.jboss.cache.factories.XmlConfigurationParser;
+import org.jboss.cache.factories.UnitTestCacheConfigurationFactory;
 import org.jboss.cache.loader.DummyInMemoryCacheLoader;
 import org.jboss.cache.misc.TestingUtil;
 import org.jboss.cache.notifications.annotation.CacheListener;
@@ -59,7 +60,7 @@
    private void initCaches()
    {
       CacheFactory<String, String> instance =3D new DefaultCacheFactory();
-      cache =3D (CacheSPI) instance.createCache(new XmlConfigurationParser=
().parseFile("META-INF/jdbCacheLoader-passivation-service.xml"), false);
+      cache =3D (CacheSPI) instance.createCache(new XmlConfigurationParser=
().parseFile("META-INF/conf-test/local-passivation-service.xml"), false);
       cache.getConfiguration().setTransactionManagerLookupClass("org.jboss=
.cache.transaction.DummyTransactionManagerLookup");
       Object listener =3D new TestCacheListener();
       cache.getConfiguration().getCacheLoaderConfig().getFirstCacheLoaderC=
onfig().setClassName(DummyInMemoryCacheLoader.class.getName());

Modified: core/trunk/src/test/java/org/jboss/cache/passivation/ConcurrentPa=
ssivationTest.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/test/java/org/jboss/cache/passivation/ConcurrentPassivat=
ionTest.java	2008-01-28 23:55:57 UTC (rev 5250)
+++ core/trunk/src/test/java/org/jboss/cache/passivation/ConcurrentPassivat=
ionTest.java	2008-01-29 00:15:28 UTC (rev 5251)
@@ -47,7 +47,7 @@
    private void initCaches()
    {
       CacheFactory<Integer, String> instance =3D new DefaultCacheFactory();
-      cache =3D (CacheSPI) instance.createCache(new XmlConfigurationParser=
().parseFile("META-INF/jdbCacheLoader-passivation-service.xml"), false);
+      cache =3D (CacheSPI) instance.createCache(new XmlConfigurationParser=
().parseFile("META-INF/conf-test/local-passivation-service.xml"), false);
       cache.getConfiguration().setTransactionManagerLookupClass("org.jboss=
.cache.transaction.DummyTransactionManagerLookup");
       cache.getConfiguration().getCacheLoaderConfig().getFirstCacheLoaderC=
onfig().setClassName(DummyInMemoryCacheLoader.class.getName());
       cache.start();

Modified: core/trunk/src/test/java/org/jboss/cache/passivation/LocalPassiva=
tionIntegrationTest.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/test/java/org/jboss/cache/passivation/LocalPassivationIn=
tegrationTest.java	2008-01-28 23:55:57 UTC (rev 5250)
+++ core/trunk/src/test/java/org/jboss/cache/passivation/LocalPassivationIn=
tegrationTest.java	2008-01-29 00:15:28 UTC (rev 5251)
@@ -44,7 +44,7 @@
    public void setUp() throws Exception
    {
       CacheFactory<String, String> instance =3D new DefaultCacheFactory();
-      cache =3D (CacheSPI<String, String>) instance.createCache(new XmlCon=
figurationParser().parseFile("META-INF/jdbCacheLoader-passivation-service.x=
ml"), false);
+      cache =3D (CacheSPI<String, String>) instance.createCache(new XmlCon=
figurationParser().parseFile("META-INF/conf-test/local-passivation-service.=
xml"), false);
       cache.getConfiguration().setTransactionManagerLookupClass(DummyTrans=
actionManagerLookup.class.getName());
       cache.getConfiguration().getCacheLoaderConfig().getFirstCacheLoaderC=
onfig().setClassName(DummyInMemoryCacheLoader.class.getName());
       cache.getConfiguration().setUseRegionBasedMarshalling(true);

Added: core/trunk/src/test/resources/META-INF/conf-test/local-passivation-s=
ervice.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/test/resources/META-INF/conf-test/local-passivation-serv=
ice.xml	                        (rev 0)
+++ core/trunk/src/test/resources/META-INF/conf-test/local-passivation-serv=
ice.xml	2008-01-29 00:15:28 UTC (rev 5251)
@@ -0,0 +1,133 @@
+<?xml version=3D"1.0" encoding=3D"UTF-8"?>
+
+<!-- =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D -->
+<!--                                                                      =
 -->
+<!--  Sample TreeCache Service Configuration                              =
 -->
+<!--                                                                      =
 -->
+<!-- =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D -->
+
+<server>
+
+   <!-- =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D -->
+   <!-- Defines TreeCache configuration                                   =
   -->
+   <!-- =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D -->
+
+   <mbean code=3D"org.jboss.cache.jmx.CacheJmxWrapper"
+          name=3D"jboss.cache:service=3DTreeCache">
+
+      <depends>jboss:service=3DNaming</depends>
+      <depends>jboss:service=3DTransactionManager</depends>
+
+      <!--
+          Configure the TransactionManager
+      -->
+      <attribute name=3D"TransactionManagerLookupClass">org.jboss.cache.tr=
ansaction.GenericTransactionManagerLookup
+      </attribute>
+
+
+      <!--
+          Node locking level : SERIALIZABLE
+                               REPEATABLE_READ (default)
+                               READ_COMMITTED
+                               READ_UNCOMMITTED
+                               NONE
+      -->
+      <attribute name=3D"IsolationLevel">REPEATABLE_READ</attribute>
+
+      <!--
+           Valid modes are LOCAL
+                           REPL_ASYNC
+                           REPL_SYNC
+      -->
+      <attribute name=3D"CacheMode">LOCAL</attribute>
+
+      <!-- Name of cluster. Needs to be the same for all TreeCache nodes i=
n a
+           cluster in order to find each other.
+      -->
+      <attribute name=3D"ClusterName">JBossCache-Cluster</attribute>
+
+      <!--Uncomment next three statements to enable JGroups multiplexer.
+This configuration is dependent on the JGroups multiplexer being
+registered in an MBean server such as JBossAS.  -->
+      <!--
+      <depends>jgroups.mux:name=3DMultiplexer</depends>
+      <attribute name=3D"MultiplexerService">jgroups.mux:name=3DMultiplexe=
r</attribute>
+      <attribute name=3D"MultiplexerStack">fc-fast-minimalthreads</attribu=
te>
+      -->
+
+
+      <!-- JGroups protocol stack properties NOT NEEDED since CacheMode is=
 LOCAL -->
+
+
+      <!--
+          The max amount of time (in milliseconds) we wait until the
+          state (ie. the contents of the cache) are retrieved from
+          existing members in a clustered environment
+      -->
+      <attribute name=3D"StateRetrievalTimeout">20000</attribute>
+
+      <!--
+          Number of milliseconds to wait until all responses for a
+          synchronous call have been received.
+      -->
+      <attribute name=3D"SyncReplTimeout">20000</attribute>
+
+      <!-- Max number of milliseconds to wait for a lock acquisition -->
+      <attribute name=3D"LockAcquisitionTimeout">15000</attribute>
+
+
+      <!-- Specific eviction policy configurations. This is LRU -->
+      <attribute name=3D"EvictionPolicyConfig">
+         <config>
+            <attribute name=3D"wakeUpIntervalSeconds">5</attribute>
+            <!-- This defaults to 200000 if not specified -->
+            <attribute name=3D"eventQueueSize">200000</attribute>
+            <!-- Name of the DEFAULT eviction policy class. -->
+            <attribute name=3D"policyClass">org.jboss.cache.eviction.LRUPo=
licy</attribute>
+
+
+            <!-- Cache wide default -->
+            <region name=3D"/_default_">
+               <attribute name=3D"maxNodes">5000</attribute>
+               <attribute name=3D"timeToLiveSeconds">3</attribute>
+            </region>
+            <region name=3D"/org/jboss/test/data">
+               <attribute name=3D"maxNodes">100</attribute>
+               <attribute name=3D"timeToLiveSeconds">3</attribute>
+            </region>
+         </config>
+      </attribute>
+
+      <!-- New 1.3.x cache loader config block -->
+      <attribute name=3D"CacheLoaderConfig">
+         <config>
+            <!-- if passivation is true, only the first cache loader is us=
ed; the rest are ignored -->
+            <passivation>true</passivation>
+            <preload>/</preload>
+            <shared>false</shared>
+
+            <!-- we can now have multiple cache loaders, which get chained=
 -->
+            <cacheloader>
+               <class>org.jboss.cache.loader.FileCacheLoader</class>
+               <!-- same as the old CacheLoaderConfig attribute
+                  location=3D/tmp this can be part of the properties.
+                  location=3D/tmp/JBossCacheFileCacheLoader
+               -->
+               <properties>
+               </properties>
+               <!-- whether the cache loader writes are asynchronous -->
+               <async>false</async>
+               <!-- only one cache loader in the chain may set fetchPersis=
tentState to true.
+ An exception is thrown if more than one cache loader sets this to true. -=
->
+               <fetchPersistentState>true</fetchPersistentState>
+               <!-- determines whether this cache loader ignores writes - =
defaults to false. -->
+               <ignoreModifications>false</ignoreModifications>
+            </cacheloader>
+
+         </config>
+      </attribute>
+
+   </mbean>
+
+
+</server>


--===============0570989261292150344==--

From jbosscache-commits at lists.jboss.org Mon Jan 28 19:22:15 2008
Content-Type: multipart/mixed; boundary="===============3833681492724661837=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r5252 -
 core/trunk/src/test/resources/META-INF/conf-test.
Date: Mon, 28 Jan 2008 19:22:14 -0500
Message-ID: <E1JJeEw-0007IU-IS@committer01.frg.pub.inap.atl.jboss.com>

--===============3833681492724661837==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: mircea.markus
Date: 2008-01-28 19:22:13 -0500 (Mon, 28 Jan 2008)
New Revision: 5252

Added:
   core/trunk/src/test/resources/META-INF/conf-test/clonable-config-service=
.xml
Log:
fixed tests

Added: core/trunk/src/test/resources/META-INF/conf-test/clonable-config-ser=
vice.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/test/resources/META-INF/conf-test/clonable-config-servic=
e.xml	                        (rev 0)
+++ core/trunk/src/test/resources/META-INF/conf-test/clonable-config-servic=
e.xml	2008-01-29 00:22:13 UTC (rev 5252)
@@ -0,0 +1,261 @@
+<?xml version=3D"1.0" encoding=3D"UTF-8"?>
+
+<!-- =

+      Cache configuration file that attempts to utilize all known elements.
+      Intent here is not to create such a cache; rather it is to create
+      a Configuration and then see if that Configuration can be cloned.
+      Basically just for testing the clone() method of the various
+      configuration elements.
+-->
+
+<server>
+
+   <mbean code=3D"org.jboss.cache.jmx.CacheJmxWrapper"
+          name=3D"jboss.cache:service=3DtestTreeCache">
+
+      <attribute name=3D"TransactionManagerLookupClass">org.jboss.cache.tr=
ansaction.GenericTransactionManagerLookup
+      </attribute>
+
+      <attribute name=3D"NodeLockingScheme">OPTIMISTIC</attribute>
+      <attribute name=3D"IsolationLevel">SERIALIZABLE</attribute>
+      <attribute name=3D"CacheMode">INVALIDATION_SYNC</attribute>
+      =

+      <attribute name=3D"ClusterName">CloneCluster</attribute>
+      =

+      <!-- Use both a stack name and a ClusterConfig so we can test both -=
->
+      <attribute name=3D"MultiplexerStack">udp</attribute>      =

+      <attribute name=3D"ClusterConfig">
+         <config>
+            <UDP mcast_addr=3D"228.10.10.10"
+                 mcast_port=3D"45588"
+                 tos=3D"8"
+                 ucast_recv_buf_size=3D"20000000"
+                 ucast_send_buf_size=3D"640000"
+                 mcast_recv_buf_size=3D"25000000"
+                 mcast_send_buf_size=3D"640000"
+                 loopback=3D"false"
+                 discard_incompatible_packets=3D"true"
+                 max_bundle_size=3D"64000"
+                 max_bundle_timeout=3D"30"
+                 use_incoming_packet_handler=3D"true"
+                 ip_ttl=3D"2"
+                 enable_bundling=3D"false"
+                 enable_diagnostics=3D"true"
+
+                 use_concurrent_stack=3D"true"
+
+                 thread_naming_pattern=3D"pl"
+
+                 thread_pool.enabled=3D"true"
+                 thread_pool.min_threads=3D"1"
+                 thread_pool.max_threads=3D"25"
+                 thread_pool.keep_alive_time=3D"30000"
+                 thread_pool.queue_enabled=3D"true"
+                 thread_pool.queue_max_size=3D"10"
+                 thread_pool.rejection_policy=3D"Run"
+
+                 oob_thread_pool.enabled=3D"true"
+                 oob_thread_pool.min_threads=3D"1"
+                 oob_thread_pool.max_threads=3D"4"
+                 oob_thread_pool.keep_alive_time=3D"10000"
+                 oob_thread_pool.queue_enabled=3D"true"
+                 oob_thread_pool.queue_max_size=3D"10"
+                 oob_thread_pool.rejection_policy=3D"Run"/>
+
+            <PING timeout=3D"2000" num_initial_members=3D"3"/>
+            <MERGE2 max_interval=3D"30000" min_interval=3D"10000"/>
+            <FD_SOCK/>
+            <FD timeout=3D"10000" max_tries=3D"5" shun=3D"true"/>
+            <VERIFY_SUSPECT timeout=3D"1500"/>
+            <pbcast.NAKACK
+                    use_mcast_xmit=3D"false" gc_lag=3D"0"
+                    retransmit_timeout=3D"300,600,1200,2400,4800"
+                    discard_delivered_msgs=3D"true"/>
+            <UNICAST timeout=3D"300,600,1200,2400,3600"/>
+            <pbcast.STABLE stability_delay=3D"1000" desired_avg_gossip=3D"=
50000"
+                           max_bytes=3D"400000"/>
+            <pbcast.GMS print_local_addr=3D"true" join_timeout=3D"5000" sh=
un=3D"false"
+                        view_bundling=3D"true" view_ack_collection_timeout=
=3D"5000"/>
+            <FRAG2 frag_size=3D"60000"/>
+            <pbcast.STREAMING_STATE_TRANSFER use_reading_thread=3D"true"/>
+            <!-- <pbcast.STATE_TRANSFER/> -->
+            <pbcast.FLUSH timeout=3D"0"/>
+         </config>
+      </attribute>
+
+      <attribute name=3D"FetchInMemoryState">false</attribute>
+      <attribute name=3D"StateRetrievalTimeout">3</attribute>
+      <attribute name=3D"SyncReplTimeout">2</attribute>
+      <attribute name=3D"LockAcquisitionTimeout">1</attribute>
+
+
+      <attribute name=3D"BuddyReplicationConfig">
+         <config>
+            <buddyReplicationEnabled>true</buddyReplicationEnabled>
+            <buddyLocatorClass>org.jboss.cache.buddyreplication.NextMember=
BuddyLocator</buddyLocatorClass>
+            <buddyLocatorProperties>
+               numBuddies =3D 11
+               ignoreColocatedBuddies =3D true
+            </buddyLocatorProperties>
+
+            <buddyPoolName>cloneGroup</buddyPoolName>
+            <buddyCommunicationTimeout>7</buddyCommunicationTimeout>
+
+            <autoDataGravitation>false</autoDataGravitation>
+            <dataGravitationRemoveOnFind>true</dataGravitationRemoveOnFind>
+            <dataGravitationSearchBackupTrees>true</dataGravitationSearchB=
ackupTrees>
+
+         </config>
+      </attribute>
+      =

+      <attribute name=3D"EvictionPolicyConfig">
+         <config>
+            <attribute name=3D"wakeUpIntervalSeconds">45</attribute>
+            <attribute name=3D"eventQueueSize">4</attribute>
+            <attribute name=3D"policyClass">org.jboss.cache.eviction.LRUPo=
licy</attribute>
+
+            <!-- Cache wide default -->
+            <region name=3D"/_default_">
+               <attribute name=3D"maxNodes">5000</attribute>
+               <attribute name=3D"timeToLiveSeconds">1000</attribute>
+               <attribute name=3D"maxAge">15000</attribute>
+            </region>
+            <region name=3D"/fifo" policyClass=3D"org.jboss.cache.eviction=
.FIFOPolicy">
+               <attribute name=3D"maxNodes">5000</attribute>
+            </region>
+            <region name=3D"/mru" policyClass=3D"org.jboss.cache.eviction.=
MRUPolicy">
+               <attribute name=3D"maxNodes">10000</attribute>
+            </region>
+            <region name=3D"/lfu" policyClass=3D"org.jboss.cache.eviction.=
LFUPolicy">
+               <attribute name=3D"maxNodes">5000</attribute>
+               <attribute name=3D"minNodes">4000</attribute>
+            </region>
+         </config>
+      </attribute>
+      =

+      <attribute name=3D"CacheLoaderConfig">
+         <config>
+            <!-- if passivation is true, only the first cache loader is us=
ed; the rest are ignored -->
+            <passivation>false</passivation>
+            <preload>/</preload>
+            <shared>true</shared>
+
+            <!-- we can now have multiple cache loaders, which get chained=
 -->
+            <cacheloader>
+               <class>org.jboss.cache.loader.FileCacheLoader</class>
+               <properties>
+                  location=3D/tmp/FileCacheLoader
+               </properties>
+               <async>false</async>
+               <!-- only one cache loader in the chain may set fetchPersis=
tentState to true.-->
+               <fetchPersistentState>true</fetchPersistentState>
+               <ignoreModifications>false</ignoreModifications>
+               <singletonStore>
+                  <enabled>false</enabled>
+                  <properties>
+                     pushStateWhenCoordinator=3Dtrue
+                     pushStateWhenCoordinatorTimeout=3D5000
+                  </properties>
+               </singletonStore>
+            </cacheloader>
+            =

+            <cacheloader>
+               <class>org.jboss.cache.loader.bdbje.BdbjeCacheLoader</class>
+               <properties>
+                  location=3D/tmp/BdbjeCacheLoader
+               </properties>
+               <async>false</async>
+               <!-- only one cache loader in the chain may set fetchPersis=
tentState to true.-->
+               <fetchPersistentState>false</fetchPersistentState>
+               <ignoreModifications>false</ignoreModifications>
+               <singletonStore>
+                  <enabled>false</enabled>
+                  <properties>
+                     pushStateWhenCoordinator=3Dtrue
+                     pushStateWhenCoordinatorTimeout=3D5000
+                  </properties>
+               </singletonStore>
+            </cacheloader>
+            =

+            <cacheloader>
+               <class>org.jboss.cache.loader.jdbm.JdbmCacheLoader</class>
+               <properties>
+                  location=3D/tmp/JdbmCacheLoader
+               </properties>
+               <async>false</async>
+               <!-- only one cache loader in the chain may set fetchPersis=
tentState to true.-->
+               <fetchPersistentState>false</fetchPersistentState>
+               <ignoreModifications>false</ignoreModifications>
+               <singletonStore>
+                  <enabled>false</enabled>
+                  <properties>
+                     pushStateWhenCoordinator=3Dtrue
+                     pushStateWhenCoordinatorTimeout=3D5000
+                  </properties>
+               </singletonStore>
+            </cacheloader>
+            =

+            <cacheloader>
+               <class>org.jboss.cache.loader.JDBCCacheLoader</class>
+               <properties>
+                  cache.jdbc.driver=3Dcom.foo.jdbc.Driver
+                  cache.jdbc.url=3Dfoo://driver
+                  cache.jdbc.user=3Dsa
+                  cache.jdbc.password=3Dsecret
+               </properties>
+               <async>false</async>
+               <!-- only one cache loader in the chain may set fetchPersis=
tentState to true.-->
+               <fetchPersistentState>false</fetchPersistentState>
+               <ignoreModifications>false</ignoreModifications>
+               <singletonStore>
+                  <enabled>false</enabled>
+                  <properties>
+                     pushStateWhenCoordinator=3Dtrue
+                     pushStateWhenCoordinatorTimeout=3D5000
+                  </properties>
+               </singletonStore>
+            </cacheloader>
+            =

+            <cacheloader>
+               <class>org.jboss.cache.loader.TcpDelegatingCacheLoader</cla=
ss>
+               <properties>
+                  host=3D127.0.0.1\nport=3D12121
+               </properties>
+               <async>false</async>
+               <!-- only one cache loader in the chain may set fetchPersis=
tentState to true.-->
+               <fetchPersistentState>false</fetchPersistentState>
+               <ignoreModifications>false</ignoreModifications>
+               <singletonStore>
+                  <enabled>false</enabled>
+                  <properties>
+                     pushStateWhenCoordinator=3Dtrue
+                     pushStateWhenCoordinatorTimeout=3D5000
+                  </properties>
+               </singletonStore>
+            </cacheloader>
+            =

+            <cacheloader>
+               <class>org.jboss.cache.loader.ClusteredCacheLoader</class>
+               <properties>
+                  timeout=3D500
+               </properties>
+               <async>false</async>
+               <!-- only one cache loader in the chain may set fetchPersis=
tentState to true.-->
+               <fetchPersistentState>false</fetchPersistentState>
+               <ignoreModifications>false</ignoreModifications>
+               <singletonStore>
+                  <enabled>false</enabled>
+                  <properties>
+                     pushStateWhenCoordinator=3Dtrue
+                     pushStateWhenCoordinatorTimeout=3D5000
+                  </properties>
+               </singletonStore>
+            </cacheloader>
+
+         </config>
+      </attribute>
+      =

+   </mbean>
+
+
+</server>


--===============3833681492724661837==--

From jbosscache-commits at lists.jboss.org Tue Jan 29 10:37:12 2008
Content-Type: multipart/mixed; boundary="===============8296962633150433273=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r5253 - support/trunk/common.
Date: Tue, 29 Jan 2008 10:33:11 -0500
Message-ID: <E1JJsSV-0007A9-UR@committer01.frg.pub.inap.atl.jboss.com>

--===============8296962633150433273==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: manik.surtani(a)jboss.com
Date: 2008-01-29 10:33:11 -0500 (Tue, 29 Jan 2008)
New Revision: 5253

Modified:
   support/trunk/common/pom.xml
Log:
Excludes xml and properties files from the jar

Modified: support/trunk/common/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- support/trunk/common/pom.xml	2008-01-29 00:22:13 UTC (rev 5252)
+++ support/trunk/common/pom.xml	2008-01-29 15:33:11 UTC (rev 5253)
@@ -1,215 +1,199 @@
-<project xmlns=3D"http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi=3D"http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation=3D"http://maven.apache.org/POM/4.0.0 http://maven.a=
pache.org/xsd/maven-4.0.0.xsd">
-
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>org.jboss.cache</groupId>
-        <artifactId>jbosscache-support</artifactId>
-        <version>1.1-SNAPSHOT</version>
-    </parent>
-
-    <groupId>org.jboss.cache</groupId>
-    <artifactId>jbosscache-common-parent</artifactId>
-    <packaging>pom</packaging>
-
-    <name>JBoss Cache Common Parent</name>
-    <description>The parent POM for all JBoss Cache modules.</description>
-    <url>http://labs.jboss.org/jbosscache</url>
-
-    <organization>
-        <name>JBoss, a division of Red Hat</name>
-        <url>http://labs.jboss.org</url>
-    </organization>
-
-    <licenses>
-        <license>
-            <name>GNU Lesser General Public License</name>
-            <url>http://www.gnu.org/copyleft/lesser.html</url>
-            <distribution>repo</distribution>
-        </license>
-    </licenses>
-
-    <scm>
-        <connection>scm:svn:http://anonsvn.jboss.org/repos/jbosscache/core=
/trunk/</connection>
-        <developerConnection>scm:svn:https://svn.jboss.org/repos/jbosscach=
e/core/trunk</developerConnection>
-        <url>http://viewvc.jboss.org/cgi-bin/viewvc.cgi/jbosscache/</url>
-    </scm>
-
-    <issueManagement>
-        <system>jira</system>
-        <url>http://jira.jboss.com/jira/browse/JBCACHE</url>
-    </issueManagement>
-
-    <ciManagement>
-        <system>cruisecontrol</system>
-        <url>http://cruisecontrol.jboss.com/cc/</url>
-        <notifiers>
-            <notifier>
-                <type>mail</type>
-                <address>jbosscache-dev(a)lists.jboss.org</address>
-            </notifier>
-        </notifiers>
-    </ciManagement>
-
-    <mailingLists>
-        <mailingList>
-            <name>JBoss Cache Announcements</name>
-            <post>jbosscache-announce(a)lists.jboss.org</post>
-            <subscribe>https://lists.jboss.org/mailman/listinfo/jbosscache=
-announce</subscribe>
-            <unsubscribe>https://lists.jboss.org/mailman/listinfo/jbosscac=
he-announce</unsubscribe>
-            <archive>http://lists.jboss.org/pipermail/jbosscache-dev/</arc=
hive>
-        </mailingList>
-        <mailingList>
-            <name>JBoss Cache Commit Notificatons</name>
-            <post>jbosscache-commits(a)lists.jboss.org</post>
-            <subscribe>https://lists.jboss.org/mailman/listinfo/jbosscache=
-commits</subscribe>
-            <unsubscribe>https://lists.jboss.org/mailman/listinfo/jbosscac=
he-commits</unsubscribe>
-            <archive>http://lists.jboss.org/pipermail/jbosscache-commits/<=
/archive>
-        </mailingList>
-        <mailingList>
-            <name>JBoss Cache Developers</name>
-            <post>jbosscache-dev(a)lists.jboss.org</post>
-            <subscribe>https://lists.jboss.org/mailman/listinfo/jbosscache=
-dev</subscribe>
-            <unsubscribe>https://lists.jboss.org/mailman/listinfo/jbosscac=
he-dev</unsubscribe>
-            <archive>http://lists.jboss.org/pipermail/jbosscache-dev/</arc=
hive>
-        </mailingList>
-        <mailingList>
-            <name>JBoss Cache Issue Notifications</name>
-            <post>jbosscache-issues(a)lists.jboss.org</post>
-            <subscribe>https://lists.jboss.org/mailman/listinfo/jbosscache=
-issues</subscribe>
-            <unsubscribe>https://lists.jboss.org/mailman/listinfo/jbosscac=
he-issues</unsubscribe>
-            <archive>http://lists.jboss.org/pipermail/jbosscache-issues/</=
archive>
-        </mailingList>
-    </mailingLists>
-
-    <build>
-        <plugins>
-            <!-- require at least JDK 1.5 to run the build -->
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-enforcer-plugin</artifactId>
-                <version>1.0-alpha-3</version>
-                <executions>
-                    <execution>
-                        <id>enforce-java</id>
-                        <goals>
-                            <goal>enforce</goal>
-                        </goals>
-                        <configuration>
-                            <rules>
-                                <requireJavaVersion>
-                                    <version>[1.5,)</version>
-                                </requireJavaVersion>
-                            </rules>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-
-            <!-- by default, compile to JDK 1.5 compatibility (individual =
modules and/or user can override) -->
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>2.0.2</version>
-                <configuration>
-                    <source>1.5</source>
-                    <target>1.5</target>
-                </configuration>
-            </plugin>
-
-            <!-- add specification/implementation details to the manifests=
 -->
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-jar-plugin</artifactId>
-                <configuration>
-                    <archive>
-                        <manifest>
-                            <addDefaultSpecificationEntries>true</addDefau=
ltSpecificationEntries>
-                            <addDefaultImplementationEntries>true</addDefa=
ultImplementationEntries>
+<?xml version=3D"1.0"?>
+<project xmlns=3D"http://maven.apache.org/POM/4.0.0" xmlns:xsi=3D"http://w=
ww.w3.org/2001/XMLSchema-instance" xsi:schemaLocation=3D"http://maven.apach=
e.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>org.jboss.cache</groupId>
+		<artifactId>jbosscache-support</artifactId>
+		<version>1.1-SNAPSHOT</version>
+	</parent>
+	<groupId>org.jboss.cache</groupId>
+	<artifactId>jbosscache-common-parent</artifactId>
+	<packaging>pom</packaging>
+	<name>JBoss Cache Common Parent</name>
+	<description>The parent POM for all JBoss Cache modules.</description>
+	<url>http://labs.jboss.org/jbosscache</url>
+	<organization>
+		<name>JBoss, a division of Red Hat</name>
+		<url>http://labs.jboss.org</url>
+	</organization>
+	<licenses>
+		<license>
+			<name>GNU Lesser General Public License</name>
+			<url>http://www.gnu.org/copyleft/lesser.html</url>
+			<distribution>repo</distribution>
+		</license>
+	</licenses>
+	<scm>
+		<connection>scm:svn:http://anonsvn.jboss.org/repos/jbosscache/core/trunk=
/</connection>
+		<developerConnection>scm:svn:https://svn.jboss.org/repos/jbosscache/core=
/trunk</developerConnection>
+		<url>http://viewvc.jboss.org/cgi-bin/viewvc.cgi/jbosscache/</url>
+	</scm>
+	<issueManagement>
+		<system>jira</system>
+		<url>http://jira.jboss.com/jira/browse/JBCACHE</url>
+	</issueManagement>
+	<ciManagement>
+		<system>cruisecontrol</system>
+		<url>http://cruisecontrol.jboss.com/cc/</url>
+		<notifiers>
+			<notifier>
+				<type>mail</type>
+				<address>jbosscache-dev(a)lists.jboss.org</address>
+			</notifier>
+		</notifiers>
+	</ciManagement>
+	<mailingLists>
+		<mailingList>
+			<name>JBoss Cache Announcements</name>
+			<post>jbosscache-announce(a)lists.jboss.org</post>
+			<subscribe>https://lists.jboss.org/mailman/listinfo/jbosscache-announce=
</subscribe>
+			<unsubscribe>https://lists.jboss.org/mailman/listinfo/jbosscache-announ=
ce</unsubscribe>
+			<archive>http://lists.jboss.org/pipermail/jbosscache-dev/</archive>
+		</mailingList>
+		<mailingList>
+			<name>JBoss Cache Commit Notificatons</name>
+			<post>jbosscache-commits(a)lists.jboss.org</post>
+			<subscribe>https://lists.jboss.org/mailman/listinfo/jbosscache-commits<=
/subscribe>
+			<unsubscribe>https://lists.jboss.org/mailman/listinfo/jbosscache-commit=
s</unsubscribe>
+			<archive>http://lists.jboss.org/pipermail/jbosscache-commits/</archive>
+		</mailingList>
+		<mailingList>
+			<name>JBoss Cache Developers</name>
+			<post>jbosscache-dev(a)lists.jboss.org</post>
+			<subscribe>https://lists.jboss.org/mailman/listinfo/jbosscache-dev</sub=
scribe>
+			<unsubscribe>https://lists.jboss.org/mailman/listinfo/jbosscache-dev</u=
nsubscribe>
+			<archive>http://lists.jboss.org/pipermail/jbosscache-dev/</archive>
+		</mailingList>
+		<mailingList>
+			<name>JBoss Cache Issue Notifications</name>
+			<post>jbosscache-issues(a)lists.jboss.org</post>
+			<subscribe>https://lists.jboss.org/mailman/listinfo/jbosscache-issues</=
subscribe>
+			<unsubscribe>https://lists.jboss.org/mailman/listinfo/jbosscache-issues=
</unsubscribe>
+			<archive>http://lists.jboss.org/pipermail/jbosscache-issues/</archive>
+		</mailingList>
+	</mailingLists>
+	<build>
+		<plugins>
+<!-- require at least JDK 1.5 to run the build -->
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-enforcer-plugin</artifactId>
+				<version>1.0-alpha-3</version>
+				<executions>
+					<execution>
+						<id>enforce-java</id>
+						<goals>
+							<goal>enforce</goal>
+						</goals>
+						<configuration>
+							<rules>
+								<requireJavaVersion>
+									<version>[1.5,)</version>
+								</requireJavaVersion>
+							</rules>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+<!-- by default, compile to JDK 1.5 compatibility (individual modules and/=
or user can override) -->
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<version>2.0.2</version>
+				<configuration>
+					<source>1.5</source>
+					<target>1.5</target>
+				</configuration>
+			</plugin>
+<!-- add specification/implementation details to the manifests -->
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-jar-plugin</artifactId>
+				<configuration>
+					<excludes>
+						<exclude>**/*.xml</exclude>
+						<exclude>**/*.properties</exclude>
+					</excludes>
+					<archive>
+						<manifest>
+							<addDefaultSpecificationEntries>true</addDefaultSpecificationEntrie=
s>
+							<addDefaultImplementationEntries>true</addDefaultImplementationEntr=
ies>
 							<mainClass>org.jboss.cache.Version</mainClass>
-                        </manifest>
-                    </archive>
-                </configuration>
-            </plugin>
-
+						</manifest>
+					</archive>
+				</configuration>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-surefire-plugin</artifactId>
+				<version>2.3</version>
+				<configuration>
+					<systemProperties>
+						<property>
+							<name>bind.address</name>
+							<value>127.0.0.1</value>
+						</property>
+						<property>
+							<name>jgroups.stack</name>
+							<value>udp</value>
+						</property>
+						<property>
+							<name>java.net.preferIPv4Stack</name>
+							<value>true</value>
+						</property>
+					</systemProperties>
+					<groups>functional</groups>
+					<forkMode>always</forkMode>
+<!-- increasing JVM heap size -->
+					<argLine>-Xmx1024M</argLine>
+<!-- Warning, this does not work right on 2.4-SNAPSHOT, (see SUREFIRE-349)=
 -->
+<!-- This seems to fail in some cases on 2.3 as well, disable for now -->
+					<redirectTestOutputToFile>false</redirectTestOutputToFile>
+				</configuration>
+			</plugin>
+<!-- javadocs : we want these run in the 'package' lifecycle phase-->
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-javadoc-plugin</artifactId>
+				<executions>
+					<execution>
+						<phase>package</phase>
+						<goals>
+							<goal>javadoc</goal>
+						</goals>
+						<configuration>
+							<aggregate>${jbosscache.reports.aggregate}</aggregate>
+							<links>
+								<link>http://java.sun.com/j2se/1.5.0/docs/api/</link>
+								<link>http://java.sun.com/javaee/5/docs/api/</link>
+							</links>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+<!-- Eclipse -->
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-eclipse-plugin</artifactId>
+				<configuration>
+					<buildOutputDirectory>${basedir}/eclipse-output</buildOutputDirectory>
+				</configuration>
+			</plugin>
+		</plugins>
+		<finalName>${artifactId}</finalName>
+	</build>
+	<reporting>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-surefire-report-plugin</artifactId>
+				<version>2.3</version>
+			</plugin>
+<!-- DISABLE - Maven doesn't build the classpath correctly =

             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <version>2.3</version>
-                <configuration>
-                  <systemProperties>
-                    <property>
-                      <name>bind.address</name>
-                      <value>127.0.0.1</value>
-                    </property>
-                    <property>
-                      <name>jgroups.stack</name>
-                      <value>udp</value>
-                    </property>
-                    <property>
-                      <name>java.net.preferIPv4Stack</name>
-                      <value>true</value>
-                    </property>
-                  </systemProperties>
-                  <groups>functional</groups>
-                  <forkMode>always</forkMode>
-                  <!-- increasing JVM heap size -->
-                  <argLine>-Xmx1024M</argLine>
-
-                  <!-- Warning, this does not work right on 2.4-SNAPSHOT, =
(see SUREFIRE-349) -->
-                  <!-- This seems to fail in some cases on 2.3 as well, di=
sable for now -->
-                  <redirectTestOutputToFile>false</redirectTestOutputToFil=
e>
-                </configuration>
-            </plugin>
-
-            <!-- javadocs : we want these run in the 'package' lifecycle p=
hase-->
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-javadoc-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>javadoc</goal>
-                        </goals>
-                        <configuration>
-                            <aggregate>${jbosscache.reports.aggregate}</ag=
gregate>
-                            <links>
-                                <link>http://java.sun.com/j2se/1.5.0/docs/=
api/</link>
-                                <link>http://java.sun.com/javaee/5/docs/ap=
i/</link>
-                            </links>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <!-- Eclipse -->
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-eclipse-plugin</artifactId>
                 <configuration>
-                    <buildOutputDirectory>${basedir}/eclipse-output</build=
OutputDirectory>
-                </configuration>
-            </plugin>
-        </plugins>
-
-        <finalName>${artifactId}</finalName>
-    </build>
-
-    <reporting>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-report-plugin</artifactId>
-                <version>2.3</version>
-            </plugin> =

-
-            <!-- DISABLE - Maven doesn't build the classpath correctly =

-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-javadoc-plugin</artifactId>
-                <configuration>
                     <aggregate>${jbosscache.reports.aggregate}</aggregate>
                     <links>
                         <link>http://java.sun.com/j2se/1.5.0/docs/api/</li=
nk>
@@ -218,200 +202,185 @@
                 </configuration>
             </plugin>
             -->
-
-            <!-- JXR - links from javadocs and junit reports to an html re=
presentation of the code -->
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-jxr-plugin</artifactId>
-                <configuration>
-                    <aggregate>${jbosscache.reports.aggregate}</aggregate>
-                </configuration>
-            </plugin>
-
-            <!-- PMD code analysis reports -->
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-pmd-plugin</artifactId>
-                <configuration>
-                    <aggregate>${jbosscache.reports.aggregate}</aggregate>
-                    <linkXref>true</linkXref>
-                    <minimumTokens>100</minimumTokens>
-                    <targetJdk>1.5</targetJdk>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>taglist-maven-plugin</artifactId>
-                <configuration>
-                    <aggregate>${jbosscache.reports.aggregate}</aggregate>
-                    <tags>
-                        <tag>@FIXME</tag>
-                        <tag>@fixme</tag>
-                        <tag>FIXME</tag>
-                        <tag>fixme</tag>
-                        <tag>@TODO</tag>
-                        <tag>@todo</tag>
-                        <tag>TODO</tag>
-                        <tag>todo</tag>
-                    </tags>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>javancss-maven-plugin</artifactId>
-            </plugin>
-            <!-- Findbugs report -->
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>findbugs-maven-plugin</artifactId>
-                <configuration>
-                    <onlyAnalyze>org.jboss.cache.*</onlyAnalyze>
-                </configuration>
-            </plugin>
-
-        </plugins>
-    </reporting>
-
-    <properties>
-        <!-- for now, at least, lets aggregate them -->
-        <jbosscache.reports.aggregate>true</jbosscache.reports.aggregate>
-    </properties>
-
-    <repositories>
-        <repository>
-            <id>repository.jboss.org</id>
-            <url>http://repository.jboss.org/maven2</url>
-        </repository>
-
-        <repository>
-            <id>snapshots.jboss.org</id>
-            <url>http://snapshots.jboss.org/maven2</url>
-        </repository>
-    </repositories>
-
-    <pluginRepositories>
-        <pluginRepository>
-            <id>Main Maven Repo</id>
-            <url>http://repo1.maven.org/maven2/</url>
-        </pluginRepository>
-
+<!-- JXR - links from javadocs and junit reports to an html representation=
 of the code -->
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-jxr-plugin</artifactId>
+				<configuration>
+					<aggregate>${jbosscache.reports.aggregate}</aggregate>
+				</configuration>
+			</plugin>
+<!-- PMD code analysis reports -->
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-pmd-plugin</artifactId>
+				<configuration>
+					<aggregate>${jbosscache.reports.aggregate}</aggregate>
+					<linkXref>true</linkXref>
+					<minimumTokens>100</minimumTokens>
+					<targetJdk>1.5</targetJdk>
+				</configuration>
+			</plugin>
+			<plugin>
+				<groupId>org.codehaus.mojo</groupId>
+				<artifactId>taglist-maven-plugin</artifactId>
+				<configuration>
+					<aggregate>${jbosscache.reports.aggregate}</aggregate>
+					<tags>
+						<tag>@FIXME</tag>
+						<tag>@fixme</tag>
+						<tag>FIXME</tag>
+						<tag>fixme</tag>
+						<tag>@TODO</tag>
+						<tag>@todo</tag>
+						<tag>TODO</tag>
+						<tag>todo</tag>
+					</tags>
+				</configuration>
+			</plugin>
+			<plugin>
+				<groupId>org.codehaus.mojo</groupId>
+				<artifactId>javancss-maven-plugin</artifactId>
+			</plugin>
+<!-- Findbugs report -->
+			<plugin>
+				<groupId>org.codehaus.mojo</groupId>
+				<artifactId>findbugs-maven-plugin</artifactId>
+				<configuration>
+					<onlyAnalyze>org.jboss.cache.*</onlyAnalyze>
+				</configuration>
+			</plugin>
+		</plugins>
+	</reporting>
+	<properties>
+<!-- for now, at least, lets aggregate them -->
+		<jbosscache.reports.aggregate>true</jbosscache.reports.aggregate>
+	</properties>
+	<repositories>
+		<repository>
+			<id>repository.jboss.org</id>
+			<url>http://repository.jboss.org/maven2</url>
+		</repository>
+		<repository>
+			<id>snapshots.jboss.org</id>
+			<url>http://snapshots.jboss.org/maven2</url>
+		</repository>
+	</repositories>
+	<pluginRepositories>
+		<pluginRepository>
+			<id>Main Maven Repo</id>
+			<url>http://repo1.maven.org/maven2/</url>
+		</pluginRepository>
 <!--  Avoid enabling this, it brings in unstable plugins =

         <pluginRepository>
             <id>apache.snapshots</id>
             <url>http://people.apache.org/repo/m2-snapshot-repository/</ur=
l>
         </pluginRepository>
 -->
-        <pluginRepository>
-            <id>repository.jboss.org</id>
-            <url>http://repository.jboss.org/maven2</url>
-        </pluginRepository>
-
-        <pluginRepository>
-            <id>snapshots.jboss.org</id>
-            <url>http://snapshots.jboss.org/maven2</url>
-        </pluginRepository>
-
-    </pluginRepositories>
-
-    <dependencies>
-        <!-- test dependencies to run the test suites -->
-        <dependency>
-            <groupId>org.testng</groupId>
-            <artifactId>testng</artifactId>
-            <version>5.1</version>
-            <scope>test</scope>
-            <classifier>jdk15</classifier>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.derby</groupId>
-            <artifactId>derby</artifactId>
-            <version>10.2.2.0</version>
-            <scope>test</scope>
-        </dependency>
-        =

-        <dependency>
-            <groupId>log4j</groupId>
-            <artifactId>log4j</artifactId>
-            <version>1.2.14</version>
-            <scope>test</scope>
-        </dependency>
-
-    </dependencies>
-    =

-    <!-- Profiles, used for test permutations -->
-    <profiles>
-      <profile>
-        <id>jgroups-tcp</id>
-        <build>
-          <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <version>2.3</version>
-                <configuration>
-                  <systemProperties>
-                    <property>
-                      <name>bind.address</name>
-                      <value>127.0.0.1</value>
-                    </property>
-                    <property>
-                      <name>jgroups.stack</name>
-                      <value>tcp</value>
-                    </property>
-                  </systemProperties>
-                  <groups>jgroups</groups>
-                  <reportsDirectory>${project.build.directory}/jgroups-tcp=
-reports</reportsDirectory>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-report-plugin</artifactId>
-                <version>2.3</version>
-                <configuration>
-                  <reportsDirectory>${project.build.directory}/jgroups-tcp=
-reports</reportsDirectory>
-                  <outputName>jgroups-tcp-report</outputName>
-                </configuration>
-            </plugin>
-          </plugins>
-        </build>
-      </profile>
-      <profile>
-        <id>transaction-jbossjta</id>
-        <build>
-          <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <configuration>
-                  <systemProperties>
-                    <property>
-                      <name>bind.address</name>
-                      <value>127.0.0.1</value>
-                    </property>
-                    <property>
-                      <name>jgroups.stack</name>
-                      <value>udp</value>
-                    </property>
-                    <property>
-                      <name>org.jboss.cache.test.tm</name>
-                      <value>jboss-jta</value>
-                    </property>
-                  </systemProperties>
-                  <groups>transaction</groups>
-                  <reportsDirectory>${project.build.directory}/transaction=
-jbossjta-reports</reportsDirectory>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-report-plugin</artifactId>
-                <configuration>
-                  <reportsDirectory>${project.build.directory}/transaction=
-jbossjta-reports</reportsDirectory>
-                  <outputName>transaction-jbossjta-report</outputName>
-                </configuration>
-            </plugin>
-          </plugins>
-        </build>
-      </profile>
-    </profiles>
+		<pluginRepository>
+			<id>repository.jboss.org</id>
+			<url>http://repository.jboss.org/maven2</url>
+		</pluginRepository>
+		<pluginRepository>
+			<id>snapshots.jboss.org</id>
+			<url>http://snapshots.jboss.org/maven2</url>
+		</pluginRepository>
+	</pluginRepositories>
+	<dependencies>
+<!-- test dependencies to run the test suites -->
+		<dependency>
+			<groupId>org.testng</groupId>
+			<artifactId>testng</artifactId>
+			<version>5.1</version>
+			<scope>test</scope>
+			<classifier>jdk15</classifier>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.derby</groupId>
+			<artifactId>derby</artifactId>
+			<version>10.2.2.0</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>log4j</groupId>
+			<artifactId>log4j</artifactId>
+			<version>1.2.14</version>
+			<scope>test</scope>
+		</dependency>
+	</dependencies>
+<!-- Profiles, used for test permutations -->
+	<profiles>
+		<profile>
+			<id>jgroups-tcp</id>
+			<build>
+				<plugins>
+					<plugin>
+						<groupId>org.apache.maven.plugins</groupId>
+						<artifactId>maven-surefire-plugin</artifactId>
+						<version>2.3</version>
+						<configuration>
+							<systemProperties>
+								<property>
+									<name>bind.address</name>
+									<value>127.0.0.1</value>
+								</property>
+								<property>
+									<name>jgroups.stack</name>
+									<value>tcp</value>
+								</property>
+							</systemProperties>
+							<groups>jgroups</groups>
+							<reportsDirectory>${project.build.directory}/jgroups-tcp-reports</r=
eportsDirectory>
+						</configuration>
+					</plugin>
+					<plugin>
+						<groupId>org.apache.maven.plugins</groupId>
+						<artifactId>maven-surefire-report-plugin</artifactId>
+						<version>2.3</version>
+						<configuration>
+							<reportsDirectory>${project.build.directory}/jgroups-tcp-reports</r=
eportsDirectory>
+							<outputName>jgroups-tcp-report</outputName>
+						</configuration>
+					</plugin>
+				</plugins>
+			</build>
+		</profile>
+		<profile>
+			<id>transaction-jbossjta</id>
+			<build>
+				<plugins>
+					<plugin>
+						<groupId>org.apache.maven.plugins</groupId>
+						<artifactId>maven-surefire-plugin</artifactId>
+						<configuration>
+							<systemProperties>
+								<property>
+									<name>bind.address</name>
+									<value>127.0.0.1</value>
+								</property>
+								<property>
+									<name>jgroups.stack</name>
+									<value>udp</value>
+								</property>
+								<property>
+									<name>org.jboss.cache.test.tm</name>
+									<value>jboss-jta</value>
+								</property>
+							</systemProperties>
+							<groups>transaction</groups>
+							<reportsDirectory>${project.build.directory}/transaction-jbossjta-r=
eports</reportsDirectory>
+						</configuration>
+					</plugin>
+					<plugin>
+						<groupId>org.apache.maven.plugins</groupId>
+						<artifactId>maven-surefire-report-plugin</artifactId>
+						<configuration>
+							<reportsDirectory>${project.build.directory}/transaction-jbossjta-r=
eports</reportsDirectory>
+							<outputName>transaction-jbossjta-report</outputName>
+						</configuration>
+					</plugin>
+				</plugins>
+			</build>
+		</profile>
+	</profiles>
 </project>


--===============8296962633150433273==--

From jbosscache-commits at lists.jboss.org Tue Jan 29 12:01:11 2008
Content-Type: multipart/mixed; boundary="===============4550853618351148135=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r5254 -
 benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.1.0/conf.
Date: Tue, 29 Jan 2008 12:01:11 -0500
Message-ID: <E1JJtpf-0008Pt-D3@committer01.frg.pub.inap.atl.jboss.com>

--===============4550853618351148135==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: mircea.markus
Date: 2008-01-29 12:01:11 -0500 (Tue, 29 Jan 2008)
New Revision: 5254

Modified:
   benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.1.0/conf/pess=
-repl-async.xml
Log:
cluster-stop is bad, as it might interfere with after report generation run=
ning barrier, and leave the cluster in an inconsistent state

Modified: benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.1.0/co=
nf/pess-repl-async.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.1.0/conf/pes=
s-repl-async.xml	2008-01-29 15:33:11 UTC (rev 5253)
+++ benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.1.0/conf/pes=
s-repl-async.xml	2008-01-29 17:01:11 UTC (rev 5254)
@@ -20,52 +20,121 @@
       <attribute name=3D"ClusterName">JBossCache-Cluster</attribute>
       <attribute name=3D"ClusterConfig">
          <config>
-            <UDP mcast_addr=3D"232.10.10.10"
-                 mcast_port=3D"45599"
-                 tos=3D"8"
-                 ucast_recv_buf_size=3D"20000000"
-                 ucast_send_buf_size=3D"640000"
-                 mcast_recv_buf_size=3D"25000000"
-                 mcast_send_buf_size=3D"640000"
+              <TCP start_port=3D"7580"
+         loopback=3D"false"
+         discard_incompatible_packets=3D"true"
+         max_bundle_size=3D"64000"
+         max_bundle_timeout=3D"30"
+         use_incoming_packet_handler=3D"true"
+         enable_bundling=3D"true"
+         enable_diagnostics=3D"true"
+         thread_naming_pattern=3D"cl"
+
+         use_concurrent_stack=3D"true"
+
+	 recv_buf_size=3D"20000000"
+	 send_buf_size=3D"20000000"
+
+         thread_pool.enabled=3D"true"
+         thread_pool.min_threads=3D"2"
+         thread_pool.max_threads=3D"4"
+         thread_pool.keep_alive_time=3D"5000"
+         thread_pool.queue_enabled=3D"true"
+         thread_pool.queue_max_size=3D"100000"
+         thread_pool.rejection_policy=3D"discard"
+
+         oob_thread_pool.enabled=3D"true"
+         oob_thread_pool.min_threads=3D"4"
+         oob_thread_pool.max_threads=3D"8"
+         oob_thread_pool.keep_alive_time=3D"5000"
+         oob_thread_pool.queue_enabled=3D"false"
+         oob_thread_pool.queue_max_size=3D"100"
+         oob_thread_pool.rejection_policy=3D"Run"/>
+
+    <MPING timeout=3D"2000" mcast_addr=3D"232.1.2.3"
+            num_initial_members=3D"3"/>
+    <MERGE2 max_interval=3D"30000"
+            min_interval=3D"10000"/>
+    <FD_SOCK/>
+    <FD timeout=3D"1000" max_tries=3D"2" shun=3D"true"/>
+    <VERIFY_SUSPECT timeout=3D"1500"  />
+    <BARRIER />
+    <pbcast.NAKACK use_stats_for_retransmission=3D"false"
+                   exponential_backoff=3D"150"
+                   use_mcast_xmit=3D"false" gc_lag=3D"0"
+                   retransmit_timeout=3D"50,300,600,1200"
+                   discard_delivered_msgs=3D"true"/>
+    <pbcast.STABLE stability_delay=3D"1000" desired_avg_gossip=3D"50000"
+                   max_bytes=3D"1000000"/>
+    <VIEW_SYNC avg_send_interval=3D"60000"   />
+    <pbcast.GMS print_local_addr=3D"true" join_timeout=3D"3000"
+                shun=3D"false"
+                view_bundling=3D"true"/>
+    <FC max_credits=3D"10000000"
+                    min_threshold=3D"0.20"/>
+    <FRAG2 frag_size=3D"60000"  />
+    <pbcast.STATE_TRANSFER  />
+
+         </config>
+
+
+         <attribute name=3D"ClusterConfig">
+         <config>
+            <TCP recv_buf_size=3D"20000000" use_send_queues=3D"false"
                  loopback=3D"false"
                  discard_incompatible_packets=3D"true"
                  max_bundle_size=3D"64000"
                  max_bundle_timeout=3D"30"
                  use_incoming_packet_handler=3D"true"
-                 use_outgoing_packet_handler=3D"false"
-                 ip_ttl=3D"2"
-                 down_thread=3D"false" up_thread=3D"false"
-                 enable_bundling=3D"false"/>
-            <PING timeout=3D"2000"
-                  down_thread=3D"false" up_thread=3D"false" num_initial_me=
mbers=3D"3"/>
-            <MERGE2 max_interval=3D"100000"
-                    down_thread=3D"false" up_thread=3D"false" min_interval=
=3D"20000"/>
-            <FD_SOCK down_thread=3D"false" up_thread=3D"false"/>
-            <FD timeout=3D"1000" max_tries=3D"2" shun=3D"true"/>
-            <VERIFY_SUSPECT timeout=3D"1500" down_thread=3D"false" up_thre=
ad=3D"false"/>
-            <pbcast.NAKACK max_xmit_size=3D"60000"
-                           use_mcast_xmit=3D"false" gc_lag=3D"0"
+                 enable_bundling=3D"true"
+                 enable_unicast_bundling=3D"true"
+                 enable_diagnostics=3D"true"
+
+                 use_concurrent_stack=3D"true"
+
+                 thread_naming_pattern=3D"pl"
+
+                 thread_pool.enabled=3D"true"
+                 thread_pool.min_threads=3D"1"
+                 thread_pool.max_threads=3D"4"
+                 thread_pool.keep_alive_time=3D"30000"
+                 thread_pool.queue_enabled=3D"true"
+                 thread_pool.queue_max_size=3D"50000"
+                 thread_pool.rejection_policy=3D"discard"
+
+                 oob_thread_pool.enabled=3D"true"
+                 oob_thread_pool.min_threads=3D"2"
+                 oob_thread_pool.max_threads=3D"4"
+                 oob_thread_pool.keep_alive_time=3D"10000"
+                 oob_thread_pool.queue_enabled=3D"false"
+                 oob_thread_pool.queue_max_size=3D"10"
+                 oob_thread_pool.rejection_policy=3D"Run"/>
+
+            <!--<PING timeout=3D"2000" num_initial_members=3D"3"/>-->
+             <MPING mcast_addr=3D"232.1.2.3" timeout=3D"2000" num_initial_=
members=3D"3"/>
+            <MERGE2 max_interval=3D"30000" min_interval=3D"10000"/>
+            <FD_SOCK/>
+            <FD timeout=3D"10000" max_tries=3D"5" shun=3D"true"/>
+            <VERIFY_SUSPECT timeout=3D"1500"/>
+            <pbcast.NAKACK use_mcast_xmit=3D"false" gc_lag=3D"0"
                            retransmit_timeout=3D"300,600,1200,2400,4800"
-                           down_thread=3D"false" up_thread=3D"false"
                            discard_delivered_msgs=3D"true"/>
-            <UNICAST timeout=3D"300,600,1200,2400,3600"
-                     down_thread=3D"false" up_thread=3D"false"/>
+            <!--<UNICAST timeout=3D"30,60,120,300,600,1200,2400,3600"/>-->
             <pbcast.STABLE stability_delay=3D"1000" desired_avg_gossip=3D"=
50000"
-                           down_thread=3D"false" up_thread=3D"false"
                            max_bytes=3D"400000"/>
-            <pbcast.GMS print_local_addr=3D"true" join_timeout=3D"3000" us=
e_flush=3D"true" flush_timeout=3D"3000"
-                        down_thread=3D"false" up_thread=3D"false"
+            <pbcast.GMS print_local_addr=3D"true" join_timeout=3D"5000"
                         join_retry_timeout=3D"2000" shun=3D"false"
-                        view_bundling=3D"true"/>
-            <FC max_credits=3D"2000000" down_thread=3D"false" up_thread=3D=
"false"
-                min_threshold=3D"0.20"/>
-            <FRAG2 frag_size=3D"60000" down_thread=3D"false" up_thread=3D"=
false"/>
-            <!-- <pbcast.STREAMING_STATE_TRANSFER down_thread=3D"false" up=
_thread=3D"false"
-                                         use_flush=3D"true" flush_timeout=
=3D"3000" use_reading_thread=3D"true"/> -->
-            <pbcast.STATE_TRANSFER down_thread=3D"false" up_thread=3D"fals=
e" use_flush=3D"true" flush_timeout=3D"3000"/>
-            <pbcast.FLUSH down_thread=3D"false" up_thread=3D"false" timeou=
t=3D"8000" auto_flush_conf=3D"false"/>
+                        view_bundling=3D"true" view_ack_collection_timeout=
=3D"5000"/>
+              <FC max_credits=3D"5000000"
+                    min_threshold=3D"0.20"/>
+            <FRAG2 frag_size=3D"60000"/>
+            <pbcast.STREAMING_STATE_TRANSFER use_reading_thread=3D"true"/>
+            <!-- <pbcast.STATE_TRANSFER/> -->
+            <pbcast.FLUSH timeout=3D"0"/>
          </config>
       </attribute>
+
+      </attribute>
       <attribute name=3D"FetchInMemoryState">false</attribute>
       <attribute name=3D"InitialStateRetrievalTimeout">15000</attribute>
       <attribute name=3D"SyncReplTimeout">60000</attribute>


--===============4550853618351148135==--

From jbosscache-commits at lists.jboss.org Tue Jan 29 13:06:11 2008
Content-Type: multipart/mixed; boundary="===============6801080865371815168=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r5255 -
 benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.1.0/conf.
Date: Tue, 29 Jan 2008 13:02:28 -0500
Message-ID: <E1JJumy-0003vx-Hp@committer01.frg.pub.inap.atl.jboss.com>

--===============6801080865371815168==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: mircea.markus
Date: 2008-01-29 13:02:28 -0500 (Tue, 29 Jan 2008)
New Revision: 5255

Modified:
   benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.1.0/conf/pess=
-repl-async.xml
Log:
rollback to previous version

Modified: benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.1.0/co=
nf/pess-repl-async.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.1.0/conf/pes=
s-repl-async.xml	2008-01-29 17:01:11 UTC (rev 5254)
+++ benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.1.0/conf/pes=
s-repl-async.xml	2008-01-29 18:02:28 UTC (rev 5255)
@@ -20,121 +20,52 @@
       <attribute name=3D"ClusterName">JBossCache-Cluster</attribute>
       <attribute name=3D"ClusterConfig">
          <config>
-              <TCP start_port=3D"7580"
-         loopback=3D"false"
-         discard_incompatible_packets=3D"true"
-         max_bundle_size=3D"64000"
-         max_bundle_timeout=3D"30"
-         use_incoming_packet_handler=3D"true"
-         enable_bundling=3D"true"
-         enable_diagnostics=3D"true"
-         thread_naming_pattern=3D"cl"
-
-         use_concurrent_stack=3D"true"
-
-	 recv_buf_size=3D"20000000"
-	 send_buf_size=3D"20000000"
-
-         thread_pool.enabled=3D"true"
-         thread_pool.min_threads=3D"2"
-         thread_pool.max_threads=3D"4"
-         thread_pool.keep_alive_time=3D"5000"
-         thread_pool.queue_enabled=3D"true"
-         thread_pool.queue_max_size=3D"100000"
-         thread_pool.rejection_policy=3D"discard"
-
-         oob_thread_pool.enabled=3D"true"
-         oob_thread_pool.min_threads=3D"4"
-         oob_thread_pool.max_threads=3D"8"
-         oob_thread_pool.keep_alive_time=3D"5000"
-         oob_thread_pool.queue_enabled=3D"false"
-         oob_thread_pool.queue_max_size=3D"100"
-         oob_thread_pool.rejection_policy=3D"Run"/>
-
-    <MPING timeout=3D"2000" mcast_addr=3D"232.1.2.3"
-            num_initial_members=3D"3"/>
-    <MERGE2 max_interval=3D"30000"
-            min_interval=3D"10000"/>
-    <FD_SOCK/>
-    <FD timeout=3D"1000" max_tries=3D"2" shun=3D"true"/>
-    <VERIFY_SUSPECT timeout=3D"1500"  />
-    <BARRIER />
-    <pbcast.NAKACK use_stats_for_retransmission=3D"false"
-                   exponential_backoff=3D"150"
-                   use_mcast_xmit=3D"false" gc_lag=3D"0"
-                   retransmit_timeout=3D"50,300,600,1200"
-                   discard_delivered_msgs=3D"true"/>
-    <pbcast.STABLE stability_delay=3D"1000" desired_avg_gossip=3D"50000"
-                   max_bytes=3D"1000000"/>
-    <VIEW_SYNC avg_send_interval=3D"60000"   />
-    <pbcast.GMS print_local_addr=3D"true" join_timeout=3D"3000"
-                shun=3D"false"
-                view_bundling=3D"true"/>
-    <FC max_credits=3D"10000000"
-                    min_threshold=3D"0.20"/>
-    <FRAG2 frag_size=3D"60000"  />
-    <pbcast.STATE_TRANSFER  />
-
-         </config>
-
-
-         <attribute name=3D"ClusterConfig">
-         <config>
-            <TCP recv_buf_size=3D"20000000" use_send_queues=3D"false"
+            <UDP mcast_addr=3D"232.10.10.10"
+                 mcast_port=3D"45599"
+                 tos=3D"8"
+                 ucast_recv_buf_size=3D"20000000"
+                 ucast_send_buf_size=3D"640000"
+                 mcast_recv_buf_size=3D"25000000"
+                 mcast_send_buf_size=3D"640000"
                  loopback=3D"false"
                  discard_incompatible_packets=3D"true"
                  max_bundle_size=3D"64000"
                  max_bundle_timeout=3D"30"
                  use_incoming_packet_handler=3D"true"
-                 enable_bundling=3D"true"
-                 enable_unicast_bundling=3D"true"
-                 enable_diagnostics=3D"true"
-
-                 use_concurrent_stack=3D"true"
-
-                 thread_naming_pattern=3D"pl"
-
-                 thread_pool.enabled=3D"true"
-                 thread_pool.min_threads=3D"1"
-                 thread_pool.max_threads=3D"4"
-                 thread_pool.keep_alive_time=3D"30000"
-                 thread_pool.queue_enabled=3D"true"
-                 thread_pool.queue_max_size=3D"50000"
-                 thread_pool.rejection_policy=3D"discard"
-
-                 oob_thread_pool.enabled=3D"true"
-                 oob_thread_pool.min_threads=3D"2"
-                 oob_thread_pool.max_threads=3D"4"
-                 oob_thread_pool.keep_alive_time=3D"10000"
-                 oob_thread_pool.queue_enabled=3D"false"
-                 oob_thread_pool.queue_max_size=3D"10"
-                 oob_thread_pool.rejection_policy=3D"Run"/>
-
-            <!--<PING timeout=3D"2000" num_initial_members=3D"3"/>-->
-             <MPING mcast_addr=3D"232.1.2.3" timeout=3D"2000" num_initial_=
members=3D"3"/>
-            <MERGE2 max_interval=3D"30000" min_interval=3D"10000"/>
-            <FD_SOCK/>
-            <FD timeout=3D"10000" max_tries=3D"5" shun=3D"true"/>
-            <VERIFY_SUSPECT timeout=3D"1500"/>
-            <pbcast.NAKACK use_mcast_xmit=3D"false" gc_lag=3D"0"
+                 use_outgoing_packet_handler=3D"false"
+                 ip_ttl=3D"2"
+                 down_thread=3D"false" up_thread=3D"false"
+                 enable_bundling=3D"false"/>
+            <PING timeout=3D"2000"
+                  down_thread=3D"false" up_thread=3D"false" num_initial_me=
mbers=3D"3"/>
+            <MERGE2 max_interval=3D"100000"
+                    down_thread=3D"false" up_thread=3D"false" min_interval=
=3D"20000"/>
+            <FD_SOCK down_thread=3D"false" up_thread=3D"false"/>
+            <FD timeout=3D"1000" max_tries=3D"2" shun=3D"true"/>
+            <VERIFY_SUSPECT timeout=3D"1500" down_thread=3D"false" up_thre=
ad=3D"false"/>
+            <pbcast.NAKACK max_xmit_size=3D"60000"
+                           use_mcast_xmit=3D"false" gc_lag=3D"0"
                            retransmit_timeout=3D"300,600,1200,2400,4800"
+                           down_thread=3D"false" up_thread=3D"false"
                            discard_delivered_msgs=3D"true"/>
-            <!--<UNICAST timeout=3D"30,60,120,300,600,1200,2400,3600"/>-->
+            <UNICAST timeout=3D"300,600,1200,2400,3600"
+                     down_thread=3D"false" up_thread=3D"false"/>
             <pbcast.STABLE stability_delay=3D"1000" desired_avg_gossip=3D"=
50000"
+                           down_thread=3D"false" up_thread=3D"false"
                            max_bytes=3D"400000"/>
-            <pbcast.GMS print_local_addr=3D"true" join_timeout=3D"5000"
+            <pbcast.GMS print_local_addr=3D"true" join_timeout=3D"3000" us=
e_flush=3D"true" flush_timeout=3D"3000"
+                        down_thread=3D"false" up_thread=3D"false"
                         join_retry_timeout=3D"2000" shun=3D"false"
-                        view_bundling=3D"true" view_ack_collection_timeout=
=3D"5000"/>
-              <FC max_credits=3D"5000000"
-                    min_threshold=3D"0.20"/>
-            <FRAG2 frag_size=3D"60000"/>
-            <pbcast.STREAMING_STATE_TRANSFER use_reading_thread=3D"true"/>
-            <!-- <pbcast.STATE_TRANSFER/> -->
-            <pbcast.FLUSH timeout=3D"0"/>
+                        view_bundling=3D"true"/>
+            <FC max_credits=3D"2000000" down_thread=3D"false" up_thread=3D=
"false"
+                min_threshold=3D"0.20"/>
+            <FRAG2 frag_size=3D"60000" down_thread=3D"false" up_thread=3D"=
false"/>
+            <!-- <pbcast.STREAMING_STATE_TRANSFER down_thread=3D"false" up=
_thread=3D"false"
+                                         use_flush=3D"true" flush_timeout=
=3D"3000" use_reading_thread=3D"true"/> -->
+            <pbcast.STATE_TRANSFER down_thread=3D"false" up_thread=3D"fals=
e" use_flush=3D"true" flush_timeout=3D"3000"/>
+            <pbcast.FLUSH down_thread=3D"false" up_thread=3D"false" timeou=
t=3D"8000" auto_flush_conf=3D"false"/>
          </config>
       </attribute>
-
-      </attribute>
       <attribute name=3D"FetchInMemoryState">false</attribute>
       <attribute name=3D"InitialStateRetrievalTimeout">15000</attribute>
       <attribute name=3D"SyncReplTimeout">60000</attribute>


--===============6801080865371815168==--

From jbosscache-commits at lists.jboss.org Tue Jan 29 13:36:02 2008
Content-Type: multipart/mixed; boundary="===============6318587818189023106=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r5256 - in core/trunk/src/test:
 resources/META-INF and 1 other directory.
Date: Tue, 29 Jan 2008 13:35:52 -0500
Message-ID: <E1JJvJI-0003Hp-1L@committer01.frg.pub.inap.atl.jboss.com>

--===============6318587818189023106==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: mircea.markus
Date: 2008-01-29 13:35:51 -0500 (Tue, 29 Jan 2008)
New Revision: 5256

Added:
   core/trunk/src/test/java/org/jboss/cache/AsyncReplicationQueusFailureTes=
t.java
   core/trunk/src/test/resources/META-INF/pess-repl-async-issue.xml
Log:


Added: core/trunk/src/test/java/org/jboss/cache/AsyncReplicationQueusFailur=
eTest.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/test/java/org/jboss/cache/AsyncReplicationQueusFailureTe=
st.java	                        (rev 0)
+++ core/trunk/src/test/java/org/jboss/cache/AsyncReplicationQueusFailureTe=
st.java	2008-01-29 18:35:51 UTC (rev 5256)
@@ -0,0 +1,38 @@
+package org.jboss.cache;
+
+import static org.testng.AssertJUnit.*;
+import org.testng.annotations.Test;
+
+/**
+ * Added test to replicate a behavior noticed on certain configs.
+ * N.B. This test is not in its final form, it just reproduced the issue a=
nd a more appropriate test should
+ * replace it after narrowing down the issues. The pess-repl-async-issue.x=
ml config file should be deleted aswell.
+ * - guess the issue is caused by using replication q
+ */
+(a)Test(groups =3D "functional") =

+public class AsyncReplicationQueusFailureTest
+{
+   private static final int COUNT =3D 10;
+   private static final String CONFIG_FILE =3D "META-INF/pess-repl-async-i=
ssue.xml";
+
+   public void testFailure() throws InterruptedException
+   {
+      Cache cache =3D DefaultCacheFactory.getInstance().createCache(CONFIG=
_FILE);
+      Cache cache2 =3D DefaultCacheFactory.getInstance().createCache(CONFI=
G_FILE);
+      for (int i =3D 0; i < COUNT; i++)//if we rise the count to 100k then=
 lots of class cast exception are triggered by JGroups threads
+      {
+         System.out.println("on put i =3D " + i);
+         cache.put("/a/b/c" + i,"key", "value");
+         assertNotNull(cache.get("/a/b/c" + i,"key"));
+      }
+      Thread.sleep(10000);
+      for (int i =3D 0; i < COUNT; i++)
+      {
+         System.out.println("on get i =3D " + i);
+         assertNotNull(cache2.get("/a/b/c" + i,"key"));         =

+      }
+
+      cache.stop();
+      cache2.stop();
+   }
+}

Added: core/trunk/src/test/resources/META-INF/pess-repl-async-issue.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/test/resources/META-INF/pess-repl-async-issue.xml	      =
                  (rev 0)
+++ core/trunk/src/test/resources/META-INF/pess-repl-async-issue.xml	2008-0=
1-29 18:35:51 UTC (rev 5256)
@@ -0,0 +1,81 @@
+<?xml version=3D"1.0" encoding=3D"UTF-8"?>
+
+<server>
+
+   <classpath codebase=3D"./lib" archives=3D"jboss-cache.jar, jgroups.jar"=
/>
+
+
+   <mbean code=3D"org.jboss.cache.CacheImpl"
+          name=3D"jboss.cache:service=3DTreeCache">
+
+      <depends>jboss:service=3DNaming</depends>
+      <depends>jboss:service=3DTransactionManager</depends>
+
+      <attribute name=3D"TransactionManagerLookupClass">org.jboss.cache.tr=
ansaction.GenericTransactionManagerLookup</attribute>
+      <attribute name=3D"IsolationLevel">REPEATABLE_READ</attribute>
+      <attribute name=3D"CacheMode">REPL_ASYNC</attribute>
+      <attribute name=3D"UseReplQueue">true</attribute>
+      <attribute name=3D"ReplQueueInterval">0</attribute>
+      <attribute name=3D"ReplQueueMaxElements">100</attribute>
+      <attribute name=3D"ClusterName">JBossCache-Cluster</attribute>
+      <attribute name=3D"ClusterConfig">
+         <config>
+            <UDP mcast_addr=3D"232.10.10.10"
+                 mcast_port=3D"45599"
+                 tos=3D"8"
+                 ucast_recv_buf_size=3D"20000000"
+                 ucast_send_buf_size=3D"640000"
+                 mcast_recv_buf_size=3D"25000000"
+                 mcast_send_buf_size=3D"640000"
+                 loopback=3D"false"
+                 discard_incompatible_packets=3D"true"
+                 max_bundle_size=3D"64000"
+                 max_bundle_timeout=3D"30"
+                 use_incoming_packet_handler=3D"true"
+                 use_outgoing_packet_handler=3D"false"
+                 ip_ttl=3D"2"
+                 down_thread=3D"false" up_thread=3D"false"
+                 enable_bundling=3D"false"/>
+            <PING timeout=3D"2000"
+                  down_thread=3D"false" up_thread=3D"false" num_initial_me=
mbers=3D"3"/>
+            <MERGE2 max_interval=3D"100000"
+                    down_thread=3D"false" up_thread=3D"false" min_interval=
=3D"20000"/>
+            <FD_SOCK down_thread=3D"false" up_thread=3D"false"/>
+            <FD timeout=3D"1000" max_tries=3D"2" shun=3D"true"/>
+            <VERIFY_SUSPECT timeout=3D"1500" down_thread=3D"false" up_thre=
ad=3D"false"/>
+            <pbcast.NAKACK max_xmit_size=3D"60000"
+                           use_mcast_xmit=3D"false" gc_lag=3D"0"
+                           retransmit_timeout=3D"300,600,1200,2400,4800"
+                           down_thread=3D"false" up_thread=3D"false"
+                           discard_delivered_msgs=3D"true"/>
+            <UNICAST timeout=3D"300,600,1200,2400,3600"
+                     down_thread=3D"false" up_thread=3D"false"/>
+            <pbcast.STABLE stability_delay=3D"1000" desired_avg_gossip=3D"=
50000"
+                           down_thread=3D"false" up_thread=3D"false"
+                           max_bytes=3D"400000"/>
+            <pbcast.GMS print_local_addr=3D"true" join_timeout=3D"3000" us=
e_flush=3D"true" flush_timeout=3D"3000"
+                        down_thread=3D"false" up_thread=3D"false"
+                        join_retry_timeout=3D"2000" shun=3D"false"
+                        view_bundling=3D"true"/>
+            <FC max_credits=3D"2000000" down_thread=3D"false" up_thread=3D=
"false"
+                min_threshold=3D"0.20"/>
+            <FRAG2 frag_size=3D"60000" down_thread=3D"false" up_thread=3D"=
false"/>
+            <!-- <pbcast.STREAMING_STATE_TRANSFER down_thread=3D"false" up=
_thread=3D"false"
+                                         use_flush=3D"true" flush_timeout=
=3D"3000" use_reading_thread=3D"true"/> -->
+            <pbcast.STATE_TRANSFER down_thread=3D"false" up_thread=3D"fals=
e" use_flush=3D"true" flush_timeout=3D"3000"/>
+            <pbcast.FLUSH down_thread=3D"false" up_thread=3D"false" timeou=
t=3D"8000" auto_flush_conf=3D"false"/>
+         </config>
+      </attribute>
+      <attribute name=3D"FetchInMemoryState">false</attribute>
+      <attribute name=3D"InitialStateRetrievalTimeout">15000</attribute>
+      <attribute name=3D"SyncReplTimeout">60000</attribute>
+      <attribute name=3D"LockAcquisitionTimeout">10000</attribute>
+      <attribute name=3D"EvictionPolicyConfig">
+      </attribute>
+
+      <attribute name=3D"CacheLoaderConfiguration">
+      </attribute>
+
+      <attribute name=3D"UseRegionBasedMarshalling">false</attribute>
+   </mbean>
+</server>


--===============6318587818189023106==--

From jbosscache-commits at lists.jboss.org Tue Jan 29 13:52:21 2008
Content-Type: multipart/mixed; boundary="===============7321385416048860133=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r5257 -
 benchmarks/benchmark-fwk/trunk/conf.
Date: Tue, 29 Jan 2008 13:52:21 -0500
Message-ID: <E1JJvZF-0006zf-Qp@committer01.frg.pub.inap.atl.jboss.com>

--===============7321385416048860133==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: mircea.markus
Date: 2008-01-29 13:52:21 -0500 (Tue, 29 Jan 2008)
New Revision: 5257

Modified:
   benchmarks/benchmark-fwk/trunk/conf/log4j.xml
Log:
by default logging to console rather than file

Modified: benchmarks/benchmark-fwk/trunk/conf/log4j.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- benchmarks/benchmark-fwk/trunk/conf/log4j.xml	2008-01-29 18:35:51 UTC (=
rev 5256)
+++ benchmarks/benchmark-fwk/trunk/conf/log4j.xml	2008-01-29 18:52:21 UTC (=
rev 5257)
@@ -45,6 +45,7 @@
     <category name=3D"org.cachebench" additivity=3D"false">
         <priority value=3D"TRACE"/>
         <appender-ref ref=3D"FILE"/>
+        <appender-ref ref=3D"CONSOLE"/>
     </category>
 =

     <category name=3D"net.sf.ehcache" additivity=3D"false">
@@ -76,7 +77,8 @@
     <!-- Here goes the root -->
     <root>
         <priority value =3D"INFO" />
-        <appender-ref ref=3D"FILE" />
+        <!--<appender-ref ref=3D"FILE" />-->
+        <appender-ref ref=3D"CONSOLE" />
     </root>
 =

 </log4j:configuration>


--===============7321385416048860133==--

From jbosscache-commits at lists.jboss.org Tue Jan 29 13:53:19 2008
Content-Type: multipart/mixed; boundary="===============3509003992417393373=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r5258 -
 benchmarks/benchmark-fwk/trunk/src/org/cachebench.
Date: Tue, 29 Jan 2008 13:53:19 -0500
Message-ID: <E1JJvaB-00070G-6n@committer01.frg.pub.inap.atl.jboss.com>

--===============3509003992417393373==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: mircea.markus
Date: 2008-01-29 13:53:19 -0500 (Tue, 29 Jan 2008)
New Revision: 5258

Modified:
   benchmarks/benchmark-fwk/trunk/src/org/cachebench/CacheBenchmarkRunner.j=
ava
Log:
the runner will also cactch Throwable, so that now it will log OOM exceptio=
ns if they appear

Modified: benchmarks/benchmark-fwk/trunk/src/org/cachebench/CacheBenchmarkR=
unner.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- benchmarks/benchmark-fwk/trunk/src/org/cachebench/CacheBenchmarkRunner.=
java	2008-01-29 18:52:21 UTC (rev 5257)
+++ benchmarks/benchmark-fwk/trunk/src/org/cachebench/CacheBenchmarkRunner.=
java	2008-01-29 18:53:19 UTC (rev 5258)
@@ -79,7 +79,7 @@
             }
             logger.info("Benchmarking Completed.  Hope you enjoyed using t=
his! \n");
          }
-         catch (Exception e)
+         catch (Throwable e)
          {
             logger.warn("Unable to parse configuration file " + confFile +=
 ". Application terminated", e);
             errorLogger.fatal("Unable to parse configuration file " + conf=
File, e);


--===============3509003992417393373==--

From jbosscache-commits at lists.jboss.org Wed Jan 30 10:42:36 2008
Content-Type: multipart/mixed; boundary="===============8366004266170422733=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r5259 - in core/trunk/src:
 test/java/org/jboss/cache/replicated and 1 other directories.
Date: Wed, 30 Jan 2008 10:38:36 -0500
Message-ID: <E1JKF1I-0007vI-OF@committer01.frg.pub.inap.atl.jboss.com>

--===============8366004266170422733==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: manik.surtani(a)jboss.com
Date: 2008-01-30 10:38:36 -0500 (Wed, 30 Jan 2008)
New Revision: 5259

Added:
   core/trunk/src/test/java/org/jboss/cache/replicated/ReplicationQueueTest=
.java
Removed:
   core/trunk/src/test/resources/META-INF/pess-repl-async-issue.xml
Modified:
   core/trunk/src/main/java/org/jboss/cache/invocation/RemoteCacheInvocatio=
nDelegate.java
Log:
JBCACHE-1280 - replication queue messages fail on remote node

Modified: core/trunk/src/main/java/org/jboss/cache/invocation/RemoteCacheIn=
vocationDelegate.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/java/org/jboss/cache/invocation/RemoteCacheInvocati=
onDelegate.java	2008-01-29 18:53:19 UTC (rev 5258)
+++ core/trunk/src/main/java/org/jboss/cache/invocation/RemoteCacheInvocati=
onDelegate.java	2008-01-30 15:38:36 UTC (rev 5259)
@@ -129,7 +129,7 @@
     */
    public void _replicate(List<MethodCall> methodCalls) throws Throwable
    {
-      for (MethodCall methodCall : methodCalls) _replicate(methodCall);
+      for (MethodCall methodCall : methodCalls) _replicate((MethodCall) me=
thodCall.getArgs()[0]);
    }
 =

    public void block()

Copied: core/trunk/src/test/java/org/jboss/cache/replicated/ReplicationQueu=
eTest.java (from rev 5258, core/trunk/src/test/java/org/jboss/cache/AsyncRe=
plicationQueusFailureTest.java)
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/test/java/org/jboss/cache/replicated/ReplicationQueueTes=
t.java	                        (rev 0)
+++ core/trunk/src/test/java/org/jboss/cache/replicated/ReplicationQueueTes=
t.java	2008-01-30 15:38:36 UTC (rev 5259)
@@ -0,0 +1,50 @@
+package org.jboss.cache.replicated;
+
+import org.jboss.cache.Cache;
+import org.jboss.cache.DefaultCacheFactory;
+import org.jboss.cache.config.Configuration;
+import org.jboss.cache.misc.TestingUtil;
+import static org.testng.AssertJUnit.assertNotNull;
+import org.testng.annotations.AfterMethod;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.Test;
+
+(a)Test(groups =3D "functional")
+public class ReplicationQueueTest
+{
+   private static final int COUNT =3D 10;
+   private static final String CONFIG_FILE =3D "META-INF/pess-repl-async-i=
ssue.xml";
+   Cache cache, cache2;
+
+   @BeforeMethod
+   public void setUp() throws CloneNotSupportedException
+   {
+      cache =3D new DefaultCacheFactory().createCache(false);
+      cache.getConfiguration().setCacheMode(Configuration.CacheMode.REPL_A=
SYNC);
+      cache.getConfiguration().setUseReplQueue(true);
+      cache.getConfiguration().setReplQueueMaxElements(COUNT);
+      cache.start();
+
+      cache2 =3D new DefaultCacheFactory().createCache(cache.getConfigurat=
ion().clone());
+
+      TestingUtil.blockUntilViewsReceived(60000, cache, cache2);
+   }
+
+   @AfterMethod
+   public void tearDown()
+   {
+      TestingUtil.killCaches(cache, cache2);
+   }
+
+   public void testFailure() throws InterruptedException
+   {
+      for (int i =3D 0; i < COUNT; i++)
+      {
+         System.out.println("on put i =3D " + i);
+         cache.put("/a/b/c" + i, "key", "value");
+         assertNotNull(cache.get("/a/b/c" + i, "key"));
+      }
+      Thread.sleep(2000);
+      for (int i =3D 0; i < COUNT; i++) assertNotNull("on get i =3D " + i,=
 cache2.get("/a/b/c" + i, "key"));
+   }
+}

Deleted: core/trunk/src/test/resources/META-INF/pess-repl-async-issue.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/test/resources/META-INF/pess-repl-async-issue.xml	2008-0=
1-29 18:53:19 UTC (rev 5258)
+++ core/trunk/src/test/resources/META-INF/pess-repl-async-issue.xml	2008-0=
1-30 15:38:36 UTC (rev 5259)
@@ -1,81 +0,0 @@
-<?xml version=3D"1.0" encoding=3D"UTF-8"?>
-
-<server>
-
-   <classpath codebase=3D"./lib" archives=3D"jboss-cache.jar, jgroups.jar"=
/>
-
-
-   <mbean code=3D"org.jboss.cache.CacheImpl"
-          name=3D"jboss.cache:service=3DTreeCache">
-
-      <depends>jboss:service=3DNaming</depends>
-      <depends>jboss:service=3DTransactionManager</depends>
-
-      <attribute name=3D"TransactionManagerLookupClass">org.jboss.cache.tr=
ansaction.GenericTransactionManagerLookup</attribute>
-      <attribute name=3D"IsolationLevel">REPEATABLE_READ</attribute>
-      <attribute name=3D"CacheMode">REPL_ASYNC</attribute>
-      <attribute name=3D"UseReplQueue">true</attribute>
-      <attribute name=3D"ReplQueueInterval">0</attribute>
-      <attribute name=3D"ReplQueueMaxElements">100</attribute>
-      <attribute name=3D"ClusterName">JBossCache-Cluster</attribute>
-      <attribute name=3D"ClusterConfig">
-         <config>
-            <UDP mcast_addr=3D"232.10.10.10"
-                 mcast_port=3D"45599"
-                 tos=3D"8"
-                 ucast_recv_buf_size=3D"20000000"
-                 ucast_send_buf_size=3D"640000"
-                 mcast_recv_buf_size=3D"25000000"
-                 mcast_send_buf_size=3D"640000"
-                 loopback=3D"false"
-                 discard_incompatible_packets=3D"true"
-                 max_bundle_size=3D"64000"
-                 max_bundle_timeout=3D"30"
-                 use_incoming_packet_handler=3D"true"
-                 use_outgoing_packet_handler=3D"false"
-                 ip_ttl=3D"2"
-                 down_thread=3D"false" up_thread=3D"false"
-                 enable_bundling=3D"false"/>
-            <PING timeout=3D"2000"
-                  down_thread=3D"false" up_thread=3D"false" num_initial_me=
mbers=3D"3"/>
-            <MERGE2 max_interval=3D"100000"
-                    down_thread=3D"false" up_thread=3D"false" min_interval=
=3D"20000"/>
-            <FD_SOCK down_thread=3D"false" up_thread=3D"false"/>
-            <FD timeout=3D"1000" max_tries=3D"2" shun=3D"true"/>
-            <VERIFY_SUSPECT timeout=3D"1500" down_thread=3D"false" up_thre=
ad=3D"false"/>
-            <pbcast.NAKACK max_xmit_size=3D"60000"
-                           use_mcast_xmit=3D"false" gc_lag=3D"0"
-                           retransmit_timeout=3D"300,600,1200,2400,4800"
-                           down_thread=3D"false" up_thread=3D"false"
-                           discard_delivered_msgs=3D"true"/>
-            <UNICAST timeout=3D"300,600,1200,2400,3600"
-                     down_thread=3D"false" up_thread=3D"false"/>
-            <pbcast.STABLE stability_delay=3D"1000" desired_avg_gossip=3D"=
50000"
-                           down_thread=3D"false" up_thread=3D"false"
-                           max_bytes=3D"400000"/>
-            <pbcast.GMS print_local_addr=3D"true" join_timeout=3D"3000" us=
e_flush=3D"true" flush_timeout=3D"3000"
-                        down_thread=3D"false" up_thread=3D"false"
-                        join_retry_timeout=3D"2000" shun=3D"false"
-                        view_bundling=3D"true"/>
-            <FC max_credits=3D"2000000" down_thread=3D"false" up_thread=3D=
"false"
-                min_threshold=3D"0.20"/>
-            <FRAG2 frag_size=3D"60000" down_thread=3D"false" up_thread=3D"=
false"/>
-            <!-- <pbcast.STREAMING_STATE_TRANSFER down_thread=3D"false" up=
_thread=3D"false"
-                                         use_flush=3D"true" flush_timeout=
=3D"3000" use_reading_thread=3D"true"/> -->
-            <pbcast.STATE_TRANSFER down_thread=3D"false" up_thread=3D"fals=
e" use_flush=3D"true" flush_timeout=3D"3000"/>
-            <pbcast.FLUSH down_thread=3D"false" up_thread=3D"false" timeou=
t=3D"8000" auto_flush_conf=3D"false"/>
-         </config>
-      </attribute>
-      <attribute name=3D"FetchInMemoryState">false</attribute>
-      <attribute name=3D"InitialStateRetrievalTimeout">15000</attribute>
-      <attribute name=3D"SyncReplTimeout">60000</attribute>
-      <attribute name=3D"LockAcquisitionTimeout">10000</attribute>
-      <attribute name=3D"EvictionPolicyConfig">
-      </attribute>
-
-      <attribute name=3D"CacheLoaderConfiguration">
-      </attribute>
-
-      <attribute name=3D"UseRegionBasedMarshalling">false</attribute>
-   </mbean>
-</server>


--===============8366004266170422733==--

From jbosscache-commits at lists.jboss.org Wed Jan 30 10:53:22 2008
Content-Type: multipart/mixed; boundary="===============5965934642768605122=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r5260 - in
 benchmarks/benchmark-fwk/trunk/cache-products: jbosscache-2.1.0/conf and 1
 other directories.
Date: Wed, 30 Jan 2008 10:49:22 -0500
Message-ID: <E1JKFBi-0001W6-Me@committer01.frg.pub.inap.atl.jboss.com>

--===============5965934642768605122==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: manik.surtani(a)jboss.com
Date: 2008-01-30 10:49:22 -0500 (Wed, 30 Jan 2008)
New Revision: 5260

Modified:
   benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.0.0/conf/pess=
-repl-async-br.xml
   benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.1.0/conf/pess=
-repl-async-br.xml
   benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.1.0/lib/jboss=
cache-core.jar
Log:
Updated alegrias snapshot

Modified: benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.0.0/co=
nf/pess-repl-async-br.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.0.0/conf/pes=
s-repl-async-br.xml	2008-01-30 15:38:36 UTC (rev 5259)
+++ benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.0.0/conf/pes=
s-repl-async-br.xml	2008-01-30 15:49:22 UTC (rev 5260)
@@ -14,9 +14,9 @@
       <attribute name=3D"TransactionManagerLookupClass">org.jboss.cache.tr=
ansaction.GenericTransactionManagerLookup</attribute>
       <attribute name=3D"IsolationLevel">REPEATABLE_READ</attribute>
       <attribute name=3D"CacheMode">REPL_ASYNC</attribute>
-      <attribute name=3D"UseReplQueue">false</attribute>
+      <attribute name=3D"UseReplQueue">true</attribute>
       <attribute name=3D"ReplQueueInterval">0</attribute>
-      <attribute name=3D"ReplQueueMaxElements">0</attribute>
+      <attribute name=3D"ReplQueueMaxElements">100</attribute>
       <attribute name=3D"ClusterName">JBossCache-Cluster</attribute>
       <attribute name=3D"ClusterConfig">
          <config>

Modified: benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.1.0/co=
nf/pess-repl-async-br.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.1.0/conf/pes=
s-repl-async-br.xml	2008-01-30 15:38:36 UTC (rev 5259)
+++ benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.1.0/conf/pes=
s-repl-async-br.xml	2008-01-30 15:49:22 UTC (rev 5260)
@@ -14,9 +14,9 @@
       <attribute name=3D"TransactionManagerLookupClass">org.jboss.cache.tr=
ansaction.GenericTransactionManagerLookup</attribute>
       <attribute name=3D"IsolationLevel">REPEATABLE_READ</attribute>
       <attribute name=3D"CacheMode">REPL_ASYNC</attribute>
-      <attribute name=3D"UseReplQueue">false</attribute>
+      <attribute name=3D"UseReplQueue">true</attribute>
       <attribute name=3D"ReplQueueInterval">0</attribute>
-      <attribute name=3D"ReplQueueMaxElements">0</attribute>
+      <attribute name=3D"ReplQueueMaxElements">100</attribute>
       <attribute name=3D"ClusterName">JBossCache-Cluster</attribute>
       <attribute name=3D"ClusterConfig">
          <config>

Modified: benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.1.0/li=
b/jbosscache-core.jar
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)


--===============5965934642768605122==--

From jbosscache-commits at lists.jboss.org Wed Jan 30 11:03:18 2008
Content-Type: multipart/mixed; boundary="===============4219966075746398296=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r5261 - in
 benchmarks/benchmark-fwk/trunk/cache-products: jbosscache-2.1.0/conf and 1
 other directory.
Date: Wed, 30 Jan 2008 10:59:18 -0500
Message-ID: <E1JKFLK-0003WH-3l@committer01.frg.pub.inap.atl.jboss.com>

--===============4219966075746398296==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: manik.surtani(a)jboss.com
Date: 2008-01-30 10:59:17 -0500 (Wed, 30 Jan 2008)
New Revision: 5261

Modified:
   benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.0.0/conf/pess=
-repl-async-br.xml
   benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.0.0/conf/pess=
-repl-async.xml
   benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.1.0/conf/pess=
-repl-async-br.xml
   benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.1.0/conf/pess=
-repl-async.xml
Log:
Updated cfgs not to use repl queue

Modified: benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.0.0/co=
nf/pess-repl-async-br.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.0.0/conf/pes=
s-repl-async-br.xml	2008-01-30 15:49:22 UTC (rev 5260)
+++ benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.0.0/conf/pes=
s-repl-async-br.xml	2008-01-30 15:59:17 UTC (rev 5261)
@@ -14,9 +14,9 @@
       <attribute name=3D"TransactionManagerLookupClass">org.jboss.cache.tr=
ansaction.GenericTransactionManagerLookup</attribute>
       <attribute name=3D"IsolationLevel">REPEATABLE_READ</attribute>
       <attribute name=3D"CacheMode">REPL_ASYNC</attribute>
-      <attribute name=3D"UseReplQueue">true</attribute>
+      <attribute name=3D"UseReplQueue">false</attribute>
       <attribute name=3D"ReplQueueInterval">0</attribute>
-      <attribute name=3D"ReplQueueMaxElements">100</attribute>
+      <attribute name=3D"ReplQueueMaxElements">0</attribute>
       <attribute name=3D"ClusterName">JBossCache-Cluster</attribute>
       <attribute name=3D"ClusterConfig">
          <config>

Modified: benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.0.0/co=
nf/pess-repl-async.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.0.0/conf/pes=
s-repl-async.xml	2008-01-30 15:49:22 UTC (rev 5260)
+++ benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.0.0/conf/pes=
s-repl-async.xml	2008-01-30 15:59:17 UTC (rev 5261)
@@ -14,9 +14,9 @@
       <attribute name=3D"TransactionManagerLookupClass">org.jboss.cache.tr=
ansaction.GenericTransactionManagerLookup</attribute>
       <attribute name=3D"IsolationLevel">REPEATABLE_READ</attribute>
       <attribute name=3D"CacheMode">REPL_ASYNC</attribute>
-      <attribute name=3D"UseReplQueue">true</attribute>
+      <attribute name=3D"UseReplQueue">false</attribute>
       <attribute name=3D"ReplQueueInterval">0</attribute>
-      <attribute name=3D"ReplQueueMaxElements">100</attribute>
+      <attribute name=3D"ReplQueueMaxElements">0</attribute>
       <attribute name=3D"ClusterName">JBossCache-Cluster</attribute>
       <attribute name=3D"ClusterConfig">
          <config>

Modified: benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.1.0/co=
nf/pess-repl-async-br.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.1.0/conf/pes=
s-repl-async-br.xml	2008-01-30 15:49:22 UTC (rev 5260)
+++ benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.1.0/conf/pes=
s-repl-async-br.xml	2008-01-30 15:59:17 UTC (rev 5261)
@@ -14,9 +14,9 @@
       <attribute name=3D"TransactionManagerLookupClass">org.jboss.cache.tr=
ansaction.GenericTransactionManagerLookup</attribute>
       <attribute name=3D"IsolationLevel">REPEATABLE_READ</attribute>
       <attribute name=3D"CacheMode">REPL_ASYNC</attribute>
-      <attribute name=3D"UseReplQueue">true</attribute>
+      <attribute name=3D"UseReplQueue">false</attribute>
       <attribute name=3D"ReplQueueInterval">0</attribute>
-      <attribute name=3D"ReplQueueMaxElements">100</attribute>
+      <attribute name=3D"ReplQueueMaxElements">0</attribute>
       <attribute name=3D"ClusterName">JBossCache-Cluster</attribute>
       <attribute name=3D"ClusterConfig">
          <config>

Modified: benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.1.0/co=
nf/pess-repl-async.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.1.0/conf/pes=
s-repl-async.xml	2008-01-30 15:49:22 UTC (rev 5260)
+++ benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.1.0/conf/pes=
s-repl-async.xml	2008-01-30 15:59:17 UTC (rev 5261)
@@ -14,9 +14,9 @@
       <attribute name=3D"TransactionManagerLookupClass">org.jboss.cache.tr=
ansaction.GenericTransactionManagerLookup</attribute>
       <attribute name=3D"IsolationLevel">REPEATABLE_READ</attribute>
       <attribute name=3D"CacheMode">REPL_ASYNC</attribute>
-      <attribute name=3D"UseReplQueue">true</attribute>
+      <attribute name=3D"UseReplQueue">false</attribute>
       <attribute name=3D"ReplQueueInterval">0</attribute>
-      <attribute name=3D"ReplQueueMaxElements">100</attribute>
+      <attribute name=3D"ReplQueueMaxElements">0</attribute>
       <attribute name=3D"ClusterName">JBossCache-Cluster</attribute>
       <attribute name=3D"ClusterConfig">
          <config>


--===============4219966075746398296==--

From jbosscache-commits at lists.jboss.org Wed Jan 30 11:25:16 2008
Content-Type: multipart/mixed; boundary="===============8404604433211550934=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r5262 -
 core/trunk/src/test/java/org/jboss/cache.
Date: Wed, 30 Jan 2008 11:21:16 -0500
Message-ID: <E1JKFga-0000CF-Bh@committer01.frg.pub.inap.atl.jboss.com>

--===============8404604433211550934==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: manik.surtani(a)jboss.com
Date: 2008-01-30 11:21:16 -0500 (Wed, 30 Jan 2008)
New Revision: 5262

Removed:
   core/trunk/src/test/java/org/jboss/cache/AsyncReplicationQueusFailureTes=
t.java
Log:
JBCACHE-1280 - replication queue messages fail on remote node

Deleted: core/trunk/src/test/java/org/jboss/cache/AsyncReplicationQueusFail=
ureTest.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/test/java/org/jboss/cache/AsyncReplicationQueusFailureTe=
st.java	2008-01-30 15:59:17 UTC (rev 5261)
+++ core/trunk/src/test/java/org/jboss/cache/AsyncReplicationQueusFailureTe=
st.java	2008-01-30 16:21:16 UTC (rev 5262)
@@ -1,38 +0,0 @@
-package org.jboss.cache;
-
-import static org.testng.AssertJUnit.*;
-import org.testng.annotations.Test;
-
-/**
- * Added test to replicate a behavior noticed on certain configs.
- * N.B. This test is not in its final form, it just reproduced the issue a=
nd a more appropriate test should
- * replace it after narrowing down the issues. The pess-repl-async-issue.x=
ml config file should be deleted aswell.
- * - guess the issue is caused by using replication q
- */
-(a)Test(groups =3D "functional") =

-public class AsyncReplicationQueusFailureTest
-{
-   private static final int COUNT =3D 10;
-   private static final String CONFIG_FILE =3D "META-INF/pess-repl-async-i=
ssue.xml";
-
-   public void testFailure() throws InterruptedException
-   {
-      Cache cache =3D DefaultCacheFactory.getInstance().createCache(CONFIG=
_FILE);
-      Cache cache2 =3D DefaultCacheFactory.getInstance().createCache(CONFI=
G_FILE);
-      for (int i =3D 0; i < COUNT; i++)//if we rise the count to 100k then=
 lots of class cast exception are triggered by JGroups threads
-      {
-         System.out.println("on put i =3D " + i);
-         cache.put("/a/b/c" + i,"key", "value");
-         assertNotNull(cache.get("/a/b/c" + i,"key"));
-      }
-      Thread.sleep(10000);
-      for (int i =3D 0; i < COUNT; i++)
-      {
-         System.out.println("on get i =3D " + i);
-         assertNotNull(cache2.get("/a/b/c" + i,"key"));         =

-      }
-
-      cache.stop();
-      cache2.stop();
-   }
-}


--===============8404604433211550934==--

From jbosscache-commits at lists.jboss.org Wed Jan 30 11:25:33 2008
Content-Type: multipart/mixed; boundary="===============3706448295002596847=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r5263 -
 core/trunk/src/main/java/org/jboss/cache/factories.
Date: Wed, 30 Jan 2008 11:21:33 -0500
Message-ID: <E1JKFgr-0000DN-DW@committer01.frg.pub.inap.atl.jboss.com>

--===============3706448295002596847==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: manik.surtani(a)jboss.com
Date: 2008-01-30 11:21:33 -0500 (Wed, 30 Jan 2008)
New Revision: 5263

Modified:
   core/trunk/src/main/java/org/jboss/cache/factories/ComponentRegistry.java
Log:
Added a null check

Modified: core/trunk/src/main/java/org/jboss/cache/factories/ComponentRegis=
try.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/java/org/jboss/cache/factories/ComponentRegistry.ja=
va	2008-01-30 16:21:16 UTC (rev 5262)
+++ core/trunk/src/main/java/org/jboss/cache/factories/ComponentRegistry.ja=
va	2008-01-30 16:21:33 UTC (rev 5263)
@@ -753,37 +753,42 @@
             deepRecursionDetector =3D true;
             for (Component d : dependentComponents)
             {
-               if (d.instance =3D=3D null)
+               if (d !=3D null)
                {
-                  // this is a "hollow" component that has not been constr=
ucted yet.  Another "constructed" version probably exists in the
-                  // componentLookup.  Make sure we replace this.
-                  Component c =3D componentLookup.get(d.name);
-                  if (increase)
+                  if (d.instance =3D=3D null)
                   {
-                     dependencies.remove(d);
-                     dependencies.add(c);
+                     // this is a "hollow" component that has not been con=
structed yet.  Another "constructed" version probably exists in the
+                     // componentLookup.  Make sure we replace this.
+                     Component c =3D componentLookup.get(d.name);
+                     if (increase)
+                     {
+                        dependencies.remove(d);
+                        dependencies.add(c);
+                     }
+                     else
+                     {
+                        dependencyFor.remove(d);
+                        dependencies.add(c);
+                     }
+                     d =3D c;
                   }
-                  else
-                  {
-                     dependencyFor.remove(d);
-                     dependencies.add(c);
-                  }
-                  d =3D c;
-               }
 =

-               if (isShallowCyclic(d))
-               {
-                  // don't process shallow cyclic deps here - shoud do tha=
t after we set our state.
-                  shallowCyclic.add(d);
-               }
-               else
-               {
-                  // of we are "moving up" - only do this if the component=
 is lower than what is needed.
-                  if ((increase && newState.isGreaterThan(d.state)) || (!i=
ncrease && newState.isLessThan(d.state)))
+                  if (d !=3D null)
                   {
-                     d.changeState(newState);
+                     if (isShallowCyclic(d))
+                     {
+                        // don't process shallow cyclic deps here - shoud =
do that after we set our state.
+                        shallowCyclic.add(d);
+                     }
+                     else
+                     {
+                        // of we are "moving up" - only do this if the com=
ponent is lower than what is needed.
+                        if ((increase && newState.isGreaterThan(d.state)) =
|| (!increase && newState.isLessThan(d.state)))
+                        {
+                           d.changeState(newState);
+                        }
+                     }
                   }
-
                }
             }
 =

@@ -826,7 +831,7 @@
        */
       private boolean isShallowCyclic(Component c)
       {
-         return (dependencies.contains(c) && c.dependencies.contains(this)=
);
+         return dependencies.contains(c) && c.dependencies.contains(this);
       }
 =

       /**


--===============3706448295002596847==--

From jbosscache-commits at lists.jboss.org Wed Jan 30 12:38:21 2008
Content-Type: multipart/mixed; boundary="===============8990877382934225623=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r5264 -
 benchmarks/benchmark-fwk/trunk.
Date: Wed, 30 Jan 2008 12:38:21 -0500
Message-ID: <E1JKGtB-0007AI-Mk@committer01.frg.pub.inap.atl.jboss.com>

--===============8990877382934225623==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: manik.surtani(a)jboss.com
Date: 2008-01-30 12:38:21 -0500 (Wed, 30 Jan 2008)
New Revision: 5264

Modified:
   benchmarks/benchmark-fwk/trunk/allJBossCacheTests.sh
Log:


Modified: benchmarks/benchmark-fwk/trunk/allJBossCacheTests.sh
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- benchmarks/benchmark-fwk/trunk/allJBossCacheTests.sh	2008-01-30 16:21:3=
3 UTC (rev 5263)
+++ benchmarks/benchmark-fwk/trunk/allJBossCacheTests.sh	2008-01-30 17:38:2=
1 UTC (rev 5264)
@@ -1,7 +1,7 @@
 #!/bin/bash
 =

-# scaling=3D"2 4 6 8 10"
-scaling=3D"2 4 6"
+scaling=3D"2 4 6 8 10"
+#scaling=3D"2 4 6"
 configs=3D"pess-repl-async.xml pess-repl-sync.xml pess-repl-async-br.xml"
 products=3D"jbosscache-2.0.0 jbosscache-2.1.0"
 =

@@ -17,7 +17,7 @@
 			while [ ! -e performance-$size.csv ]
 			do
 				echo Waiting for report... =

-				sleep 30
+				sleep 60
 			done
 			sleep 60
 			mv performance-$size.csv output/$product-$config-$size.csv


--===============8990877382934225623==--

From jbosscache-commits at lists.jboss.org Wed Jan 30 13:24:23 2008
Content-Type: multipart/mixed; boundary="===============6686790768949201446=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r5265 - in
 core/trunk/src/main/java/org/jboss/cache: interceptors and 2 other
 directories.
Date: Wed, 30 Jan 2008 13:24:23 -0500
Message-ID: <E1JKHbj-00080r-LT@committer01.frg.pub.inap.atl.jboss.com>

--===============6686790768949201446==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: mircea.markus
Date: 2008-01-30 13:24:23 -0500 (Wed, 30 Jan 2008)
New Revision: 5265

Modified:
   core/trunk/src/main/java/org/jboss/cache/CacheImpl.java
   core/trunk/src/main/java/org/jboss/cache/UnversionedNode.java
   core/trunk/src/main/java/org/jboss/cache/interceptors/PessimisticLockInt=
erceptor.java
   core/trunk/src/main/java/org/jboss/cache/invocation/CacheInvocationDeleg=
ate.java
   core/trunk/src/main/java/org/jboss/cache/marshall/MethodDeclarations.java
Log:
removal event is not triggered anymore when a phantom node is created

Modified: core/trunk/src/main/java/org/jboss/cache/CacheImpl.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/java/org/jboss/cache/CacheImpl.java	2008-01-30 17:3=
8:21 UTC (rev 5264)
+++ core/trunk/src/main/java/org/jboss/cache/CacheImpl.java	2008-01-30 18:2=
4:23 UTC (rev 5265)
@@ -633,13 +633,13 @@
             _remove(null, // no tx
                   tmp,
                   false, // no undo ops
-                  false, // no nodeEvent
+                  true, // no nodeEvent
                   true);// is an eviction
          }
       }
 =

       // Remove the root node of the subtree
-      _remove(null, subtree, false, false, true);
+      _remove(null, subtree, false, true, true);
 =

    }
 =

@@ -1210,13 +1210,13 @@
     * @param tx
     * @param fqn
     * @param create_undo_ops
-    * @param sendNodeEvent
+    * @param skipSendingNodeEvents
     * @param eviction
     * @param version
     * @return true if the node was removed, false if not found
     * @throws CacheException
     */
-   public boolean _remove(GlobalTransaction tx, Fqn fqn, boolean create_un=
do_ops, boolean sendNodeEvent, boolean eviction, DataVersion version)
+   public boolean _remove(GlobalTransaction tx, Fqn fqn, boolean create_un=
do_ops, boolean skipSendingNodeEvents, boolean eviction, DataVersion versio=
n)
          throws CacheException
    {
 =

@@ -1259,7 +1259,7 @@
          return false;
       }
 =

-      if (!isRollback)
+      if (!isRollback && !skipSendingNodeEvents)
       {
          if (eviction)
          {
@@ -1304,7 +1304,7 @@
          transactionTable.addUndoOperation(tx, undo_op);
       }
 =

-      if (!isRollback)
+      if (!isRollback && !skipSendingNodeEvents)
       {
          if (eviction)
          {
@@ -1559,7 +1559,7 @@
       }
       else
       {
-         _remove(null, fqn, false, false, true, version);
+         _remove(null, fqn, false, true, true, version);
          return true;
       }
    }
@@ -1669,7 +1669,7 @@
       if (gtx !=3D null && undoOps)
       {
          // 1. put undo-op in TX' undo-operations list (needed to rollback=
 TX)
-         transactionTable.addUndoOperation(gtx, MethodCallFactory.create(M=
ethodDeclarations.removeNodeMethodLocal_id, gtx, fqn, false));
+         transactionTable.addUndoOperation(gtx, MethodCallFactory.create(M=
ethodDeclarations.removeNodeMethodLocal_id, gtx, fqn, false, false));
       }
 =

       if (!isRollback) notifier.notifyNodeCreated(fqn, false, ctx);

Modified: core/trunk/src/main/java/org/jboss/cache/UnversionedNode.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/java/org/jboss/cache/UnversionedNode.java	2008-01-3=
0 17:38:21 UTC (rev 5264)
+++ core/trunk/src/main/java/org/jboss/cache/UnversionedNode.java	2008-01-3=
0 18:24:23 UTC (rev 5265)
@@ -274,7 +274,7 @@
                if (gtx !=3D null)
                {
                   MethodCall undo_op =3D MethodCallFactory.create(MethodDe=
clarations.removeNodeMethodLocal_id,
-                        gtx, child_fqn, false);
+                        gtx, child_fqn, false, false);
                   cacheImpl.addUndoOperation(gtx, undo_op);
                   // add the node name to the list maintained for the curr=
ent tx
                   // (needed for abort/rollback of transaction)

Modified: core/trunk/src/main/java/org/jboss/cache/interceptors/Pessimistic=
LockInterceptor.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/java/org/jboss/cache/interceptors/PessimisticLockIn=
terceptor.java	2008-01-30 17:38:21 UTC (rev 5264)
+++ core/trunk/src/main/java/org/jboss/cache/interceptors/PessimisticLockIn=
terceptor.java	2008-01-30 18:24:23 UTC (rev 5265)
@@ -246,8 +246,15 @@
          }
       }
       acquireLocksOnChildren(peekNode(ctx, fqn, false, false, false), Node=
Lock.LockType.WRITE, ctx);
+      if (!createdNodes.isEmpty())
+      {
+         if (trace) log.trace("There were new nodes created, skiping notif=
ication on delete");
+         Object[] args =3D ctx.getMethodCall().getArgs();
+         if (trace) log.trace("Changing 'skipNotification' for method '_re=
move' from " + args[args.length - 1] + " to true");
+         args[args.length - 1] =3D Boolean.TRUE;         =

+      }
+      =

       Object retVal =3D nextInterceptor(ctx);
-
       // and make sure we remove all nodes we've created for the sake of l=
ater removal.
       if (ctx.getGlobalTransaction() =3D=3D null)
       {

Modified: core/trunk/src/main/java/org/jboss/cache/invocation/CacheInvocati=
onDelegate.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/java/org/jboss/cache/invocation/CacheInvocationDele=
gate.java	2008-01-30 17:38:21 UTC (rev 5264)
+++ core/trunk/src/main/java/org/jboss/cache/invocation/CacheInvocationDele=
gate.java	2008-01-30 18:24:23 UTC (rev 5265)
@@ -422,7 +422,7 @@
       }
       else
       {
-         MethodCall m =3D MethodCallFactory.create(MethodDeclarations.remo=
veNodeMethodLocal_id, tx, fqn, true);
+         MethodCall m =3D MethodCallFactory.create(MethodDeclarations.remo=
veNodeMethodLocal_id, tx, fqn, true, false);
          Object retval =3D invoke(m);
          return retval !=3D null && (Boolean) retval;
       }

Modified: core/trunk/src/main/java/org/jboss/cache/marshall/MethodDeclarati=
ons.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/java/org/jboss/cache/marshall/MethodDeclarations.ja=
va	2008-01-30 17:38:21 UTC (rev 5264)
+++ core/trunk/src/main/java/org/jboss/cache/marshall/MethodDeclarations.ja=
va	2008-01-30 18:24:23 UTC (rev 5265)
@@ -245,7 +245,7 @@
          putDataEraseMethodLocal =3D CacheImpl.class.getDeclaredMethod("_p=
ut", GlobalTransaction.class, Fqn.class, Map.class, boolean.class, boolean.=
class);
          putKeyValMethodLocal =3D CacheImpl.class.getDeclaredMethod("_put"=
, GlobalTransaction.class, Fqn.class, Object.class, Object.class, boolean.c=
lass);
          putForExternalReadMethodLocal =3D CacheImpl.class.getDeclaredMeth=
od("_putForExternalRead", GlobalTransaction.class, Fqn.class, Object.class,=
 Object.class);
-         removeNodeMethodLocal =3D CacheImpl.class.getDeclaredMethod("_rem=
ove", GlobalTransaction.class, Fqn.class, boolean.class);
+         removeNodeMethodLocal =3D CacheImpl.class.getDeclaredMethod("_rem=
ove", GlobalTransaction.class, Fqn.class, boolean.class, boolean.class);
          removeKeyMethodLocal =3D CacheImpl.class.getDeclaredMethod("_remo=
ve", GlobalTransaction.class, Fqn.class, Object.class, boolean.class);
          removeDataMethodLocal =3D CacheImpl.class.getDeclaredMethod("_rem=
oveData", GlobalTransaction.class, Fqn.class, boolean.class);
          evictNodeMethodLocal =3D CacheImpl.class.getDeclaredMethod("_evic=
t", Fqn.class);


--===============6686790768949201446==--

From jbosscache-commits at lists.jboss.org Wed Jan 30 13:36:20 2008
Content-Type: multipart/mixed; boundary="===============5341177550354028898=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r5266 -
 benchmarks/benchmark-fwk/trunk/src/org/cachebench/reportgenerators.
Date: Wed, 30 Jan 2008 13:36:19 -0500
Message-ID: <E1JKHnH-0002Vv-PZ@committer01.frg.pub.inap.atl.jboss.com>

--===============5341177550354028898==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: mircea.markus
Date: 2008-01-30 13:36:19 -0500 (Wed, 30 Jan 2008)
New Revision: 5266

Modified:
   benchmarks/benchmark-fwk/trunk/src/org/cachebench/reportgenerators/Clust=
erReportGenerator.java
Log:
guarded the received list of results

Modified: benchmarks/benchmark-fwk/trunk/src/org/cachebench/reportgenerator=
s/ClusterReportGenerator.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- benchmarks/benchmark-fwk/trunk/src/org/cachebench/reportgenerators/Clus=
terReportGenerator.java	2008-01-30 18:24:23 UTC (rev 5265)
+++ benchmarks/benchmark-fwk/trunk/src/org/cachebench/reportgenerators/Clus=
terReportGenerator.java	2008-01-30 18:36:19 UTC (rev 5266)
@@ -66,7 +66,13 @@
       List<List<TestResult>> results =3D new ArrayList<List<TestResult>>();
       for (SocketAddress socketAddress : receivedMessages.keySet())
       {
-         List<TestResult> testResults =3D (List<TestResult>) receivedMessa=
ges.get(socketAddress);
+         Object obj =3D receivedMessages.get(socketAddress);
+         if (!(obj instanceof List))
+         {
+            log.error("Expected a List of results, but received '" + obj +=
 "'");
+            throw new IllegalStateException("Expected a List of results, b=
ut received '" + obj + "'");
+         }
+         List<TestResult> testResults =3D (List<TestResult>) obj;
          log.trace("From " + socketAddress + " received " + testResults);
          results.add(testResults);
       }


--===============5341177550354028898==--

From jbosscache-commits at lists.jboss.org Wed Jan 30 19:25:05 2008
Content-Type: multipart/mixed; boundary="===============7116812765527894035=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r5267 - in
 benchmarks/benchmark-fwk/trunk: conf and 2 other directories.
Date: Wed, 30 Jan 2008 19:25:05 -0500
Message-ID: <E1JKNEn-0006kd-KV@committer01.frg.pub.inap.atl.jboss.com>

--===============7116812765527894035==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: manik.surtani(a)jboss.com
Date: 2008-01-30 19:25:05 -0500 (Wed, 30 Jan 2008)
New Revision: 5267

Modified:
   benchmarks/benchmark-fwk/trunk/allJBossCacheTests.sh
   benchmarks/benchmark-fwk/trunk/conf/cachebench.xml
   benchmarks/benchmark-fwk/trunk/runNode.sh
   benchmarks/benchmark-fwk/trunk/src/org/cachebench/CacheBenchmarkRunner.j=
ava
   benchmarks/benchmark-fwk/trunk/src/org/cachebench/reportgenerators/Abstr=
actReportGenerator.java
   benchmarks/benchmark-fwk/trunk/src/org/cachebench/reportgenerators/Clust=
erReportGenerator.java
   benchmarks/benchmark-fwk/trunk/src/org/cachebench/reportgenerators/CsvBa=
seReportGenerator.java
Log:
Added proper naming of output files

Modified: benchmarks/benchmark-fwk/trunk/allJBossCacheTests.sh
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- benchmarks/benchmark-fwk/trunk/allJBossCacheTests.sh	2008-01-30 18:36:1=
9 UTC (rev 5266)
+++ benchmarks/benchmark-fwk/trunk/allJBossCacheTests.sh	2008-01-31 00:25:0=
5 UTC (rev 5267)
@@ -14,13 +14,16 @@
 		for size in $scaling
 		do
 			./cluster.sh start $product $config $size
-			while [ ! -e performance-$size.csv ]
+
+			outputFileName=3Ddata-$product-$config-$size.csv
+
+			while [ ! -e $outputFileName ]
 			do
 				echo Waiting for report... =

 				sleep 60
 			done
 			sleep 60
-			mv performance-$size.csv output/$product-$config-$size.csv
+			mv outputFileName output/
 			sleep 10
 		done
 	done

Modified: benchmarks/benchmark-fwk/trunk/conf/cachebench.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- benchmarks/benchmark-fwk/trunk/conf/cachebench.xml	2008-01-30 18:36:19 =
UTC (rev 5266)
+++ benchmarks/benchmark-fwk/trunk/conf/cachebench.xml	2008-01-31 00:25:05 =
UTC (rev 5267)
@@ -91,7 +91,7 @@
 		own report generators such as XML generators, graphic generators, etc
    -->
    <!-- The CSV report generated can be plugged in to a spreadsheet to gen=
erate graphs. If 'outputFile is set to
-   '-generic-' then the name would be generated as follows: 'performance-<=
nodeIndexInCluster>.csv' -->
+   '-generic-' then the name would be generated as follows: 'data-<cache-p=
roduct>-<configuration>-<cluster-size>.csv' -->
    <report outputFile=3D"-generic-" generator=3D"org.cachebench.reportgene=
rators.ClusterReportGenerator"/>
 =

 </cachebench>

Modified: benchmarks/benchmark-fwk/trunk/runNode.sh
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- benchmarks/benchmark-fwk/trunk/runNode.sh	2008-01-30 18:36:19 UTC (rev =
5266)
+++ benchmarks/benchmark-fwk/trunk/runNode.sh	2008-01-31 00:25:05 UTC (rev =
5267)
@@ -61,7 +61,7 @@
 =

 . ./bindAddress.sh
 =

-JVM_OPTIONS=3D"${JVM_OPTIONS} -Dbind.address=3D${BIND_ADDRESS} -DcacheBenc=
hFwk.cacheConfigFile=3D${TEST_CFG} -DcurrentIndex=3D${CURRENT_INDEX} -Dclus=
terSize=3D${CLUSTER_SIZE} -DcurrentIndex=3D${CURRENT_INDEX} -Djava.net.pref=
erIPv4Stack=3D${preferIPv4Stack}"
+JVM_OPTIONS=3D"${JVM_OPTIONS} -DcacheBenchFwk.cachePrioductName=3D${CACHE_=
PRODUCT} -Dbind.address=3D${BIND_ADDRESS} -DcacheBenchFwk.cacheConfigFile=
=3D${TEST_CFG} -DcurrentIndex=3D${CURRENT_INDEX} -DclusterSize=3D${CLUSTER_=
SIZE} -DcurrentIndex=3D${CURRENT_INDEX} -Djava.net.preferIPv4Stack=3D${pref=
erIPv4Stack}"
 TO_EXECUTE=3D"java $JVM_OPTIONS -cp $CLASSPATH org.cachebench.CacheBenchma=
rkRunner"
 =

 if [ "$DEBUG" =3D "debug" ]

Modified: benchmarks/benchmark-fwk/trunk/src/org/cachebench/CacheBenchmarkR=
unner.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- benchmarks/benchmark-fwk/trunk/src/org/cachebench/CacheBenchmarkRunner.=
java	2008-01-30 18:36:19 UTC (rev 5266)
+++ benchmarks/benchmark-fwk/trunk/src/org/cachebench/CacheBenchmarkRunner.=
java	2008-01-31 00:25:05 UTC (rev 5267)
@@ -17,6 +17,7 @@
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
+import java.util.HashMap;
 =

 =

 /**
@@ -30,6 +31,13 @@
    private Log logger =3D LogFactory.getLog(CacheBenchmarkRunner.class);
    private Log errorLogger =3D LogFactory.getLog("CacheException");
 =

+   // information about how we are called:
+
+   String cacheProductName;
+   String configuraton;
+   int clusterSize;
+   Map<String, String> systemParams =3D new HashMap<String, String>();
+
    public static void main(String[] args)
    {
       String conf =3D null;
@@ -47,6 +55,20 @@
       }
    }
 =

+   /**
+    * Initialise some params that may be passed in via JVM params
+    */
+   private void initJVMParams()
+   {
+      String configuraton =3D System.getProperty("cacheBenchFwk.cacheConfi=
gFile");
+      String cacheProductName =3D System.getProperty("cacheBenchFwk.cacheP=
rioductName");
+      String clusterSize =3D System.getProperty("clusterSize");
+
+      if (configuraton !=3D null) systemParams.put("config", configuraton);
+      if (cacheProductName !=3D null) systemParams.put("cacheProductName",=
 cacheProductName);
+      if (clusterSize !=3D null) systemParams.put("clusterSize", clusterSi=
ze);
+   }
+
    private CacheBenchmarkRunner()
    {
       this("cachebench.xml");
@@ -54,6 +76,7 @@
 =

    private CacheBenchmarkRunner(String s)
    {
+      initJVMParams();
       // first, try and find the configuration on the filesystem.
       URL confFile =3D ConfigBuilder.findConfigFile(s);
       if (confFile =3D=3D null)
@@ -105,8 +128,7 @@
             {
                Map<String,String> params =3D test.getParams();
                // now add the config file, if any is passed in:
-               String configSystemProperty =3D System.getProperty("cacheBe=
nchFwk.cacheConfigFile");
-               if (configSystemProperty !=3D null) params.put("config", co=
nfigSystemProperty);
+               params.putAll(systemParams);
                logger.info("Initialising cache with params " + params);
                cache.init(params);
                barrier("BEFORE_WARMUP");
@@ -250,7 +272,9 @@
             generator =3D getReportGenerator(report);
             if (generator !=3D null)
             {
-               generator.setConfigParams(report.getParams());
+               Map<String, String> params =3D report.getParams();
+               params.putAll(systemParams);
+               generator.setConfigParams(params);
                generator.setResults(results);
                generator.setClusterConfig(conf.getClusterConfig());
                generator.setOutputFile(report.getOutputFile());

Modified: benchmarks/benchmark-fwk/trunk/src/org/cachebench/reportgenerator=
s/AbstractReportGenerator.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- benchmarks/benchmark-fwk/trunk/src/org/cachebench/reportgenerators/Abst=
ractReportGenerator.java	2008-01-30 18:36:19 UTC (rev 5266)
+++ benchmarks/benchmark-fwk/trunk/src/org/cachebench/reportgenerators/Abst=
ractReportGenerator.java	2008-01-31 00:25:05 UTC (rev 5267)
@@ -7,6 +7,7 @@
 import java.io.File;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 =

 /**
  * Base implementation of {@link org.cachebench.reportgenerators.ReportGen=
erator}
@@ -17,7 +18,13 @@
    protected List<TestResult> results;
    protected Log log;
    protected ClusterConfig clusterConfig;
+   protected Map<String, String> params;
 =

+   public void setConfigParams(Map<String, String> params)
+   {
+      this.params =3D params;
+   }
+
    public void setOutputFile(String fileName)
    {
       this.output =3D new File(getFileName(fileName));
@@ -27,7 +34,7 @@
    {
       if (fileName.indexOf("-generic-") >=3D0 )
       {
-         return "performance-" + clusterConfig.getClusterSize() + ".csv";
+         return "data-" + params.get("cacheProductName") + "-" + params.ge=
t("config") + "-" + params.get("clusterSize") + ".csv";
       }
       log.info("Filename for report generation is: " + fileName);
       return fileName;

Modified: benchmarks/benchmark-fwk/trunk/src/org/cachebench/reportgenerator=
s/ClusterReportGenerator.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- benchmarks/benchmark-fwk/trunk/src/org/cachebench/reportgenerators/Clus=
terReportGenerator.java	2008-01-30 18:36:19 UTC (rev 5266)
+++ benchmarks/benchmark-fwk/trunk/src/org/cachebench/reportgenerators/Clus=
terReportGenerator.java	2008-01-31 00:25:05 UTC (rev 5267)
@@ -22,8 +22,10 @@
    private static Log log =3D LogFactory.getLog(ClusterReportGenerator.cla=
ss);
    private String reportGeneratorClassName;
 =

+   @Override
    public void setConfigParams(Map<String, String> configParams)
    {
+      super.setConfigParams(configParams);
       log.trace("Received config params: " + configParams);
       reportGeneratorClassName =3D configParams.get("generatorClassName");
    }

Modified: benchmarks/benchmark-fwk/trunk/src/org/cachebench/reportgenerator=
s/CsvBaseReportGenerator.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- benchmarks/benchmark-fwk/trunk/src/org/cachebench/reportgenerators/CsvB=
aseReportGenerator.java	2008-01-30 18:36:19 UTC (rev 5266)
+++ benchmarks/benchmark-fwk/trunk/src/org/cachebench/reportgenerators/CsvB=
aseReportGenerator.java	2008-01-31 00:25:05 UTC (rev 5267)
@@ -19,14 +19,8 @@
 {
    protected static Log log =3D LogFactory.getLog(CsvBaseReportGenerator.c=
lass); =

 =

-   protected Map<String,String> configParams;
    private ArrayList footNotes;
 =

-   public void setConfigParams(Map<String, String> configParams)
-   {
-      this.configParams =3D configParams;
-   }
-
    public void generate() throws Exception
    {
       try


--===============7116812765527894035==--

From jbosscache-commits at lists.jboss.org Wed Jan 30 20:18:57 2008
Content-Type: multipart/mixed; boundary="===============2871074970049890802=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r5268 - in
 benchmarks/benchmark-fwk/trunk: conf and 2 other directories.
Date: Wed, 30 Jan 2008 20:18:57 -0500
Message-ID: <E1JKO4v-0000EP-Df@committer01.frg.pub.inap.atl.jboss.com>

--===============2871074970049890802==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: manik.surtani(a)jboss.com
Date: 2008-01-30 20:18:57 -0500 (Wed, 30 Jan 2008)
New Revision: 5268

Added:
   benchmarks/benchmark-fwk/trunk/generateChart.sh
   benchmarks/benchmark-fwk/trunk/lib/jcommon.jar
   benchmarks/benchmark-fwk/trunk/lib/jfreechart.jar
   benchmarks/benchmark-fwk/trunk/src/org/cachebench/reportgenerators/Chart=
Generator.java
Modified:
   benchmarks/benchmark-fwk/trunk/allJBossCacheTests.sh
   benchmarks/benchmark-fwk/trunk/conf/cachebench.xml
   benchmarks/benchmark-fwk/trunk/src/org/cachebench/reportgenerators/Abstr=
actReportGenerator.java
Log:
Added chart generation


Modified: benchmarks/benchmark-fwk/trunk/allJBossCacheTests.sh
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- benchmarks/benchmark-fwk/trunk/allJBossCacheTests.sh	2008-01-31 00:25:0=
5 UTC (rev 5267)
+++ benchmarks/benchmark-fwk/trunk/allJBossCacheTests.sh	2008-01-31 01:18:5=
7 UTC (rev 5268)
@@ -15,7 +15,7 @@
 		do
 			./cluster.sh start $product $config $size
 =

-			outputFileName=3Ddata-$product-$config-$size.csv
+			outputFileName=3Ddata_$product_$config_$size.csv
 =

 			while [ ! -e $outputFileName ]
 			do
@@ -28,19 +28,3 @@
 		done
 	done
 done
-
-echo Combining reports
-
-cd output
-if [ -e ../combined.csv ]
-then
-	rm ../combined.csv
-fi
-
-for i in *.csv
-do
-	echo $i >> ../combined.csv
-	cat $i >> ../combined.csv
-	echo >> ../combined.csv	=

-done
-

Modified: benchmarks/benchmark-fwk/trunk/conf/cachebench.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- benchmarks/benchmark-fwk/trunk/conf/cachebench.xml	2008-01-31 00:25:05 =
UTC (rev 5267)
+++ benchmarks/benchmark-fwk/trunk/conf/cachebench.xml	2008-01-31 01:18:57 =
UTC (rev 5268)
@@ -8,7 +8,8 @@
 	emptyCacheBetweenTests - again, use if you're running out of mem.
 	numThreads - the number of executor threads to use to perform the require=
d number of operations.  =

 -->
-<cachebench sampleSize=3D"10000" gcBetweenTestsEnabled=3D"true" sleepBetwe=
enTests=3D"1000" emptyCacheBetweenTests=3D"true" numThreads=3D"10">
+<cachebench sampleSize=3D"10000" gcBetweenTestsEnabled=3D"true" sleepBetwe=
enTests=3D"1000" emptyCacheBetweenTests=3D"true"
+            numThreads=3D"10">
 =

 =

    <!--
@@ -21,13 +22,13 @@
    <cluster>
       <member host=3D"cluster01" port=3D"17900"/>
       <member host=3D"cluster02" port=3D"17900"/>
-      <member host=3D"cluster03" port=3D"17900"/> =

-      <member host=3D"cluster04" port=3D"17900"/> =

-      <member host=3D"cluster05" port=3D"17900"/> =

-      <member host=3D"cluster06" port=3D"17900"/> =

-      <member host=3D"cluster07" port=3D"17900"/> =

-      <member host=3D"cluster08" port=3D"17900"/> =

-      <member host=3D"cluster09" port=3D"17900"/> =

+      <member host=3D"cluster03" port=3D"17900"/>
+      <member host=3D"cluster04" port=3D"17900"/>
+      <member host=3D"cluster05" port=3D"17900"/>
+      <member host=3D"cluster06" port=3D"17900"/>
+      <member host=3D"cluster07" port=3D"17900"/>
+      <member host=3D"cluster08" port=3D"17900"/>
+      <member host=3D"cluster09" port=3D"17900"/>
       <member host=3D"cluster10" port=3D"17900"/>
    </cluster>
 =

@@ -37,7 +38,7 @@
                           testcase. By default set to true.
    -->
 =

-    <testcase name=3D"WebSessionReplicationTest" stopOnFailure=3D"true">
+   <testcase name=3D"WebSessionReplicationTest" stopOnFailure=3D"true">
 =

       <!-- org.cachebench.warmup.PutGetCacheWarmup warms up the cache by d=
oing operation on it; simulates a real-world environment.
       If no warmup is needed use org.cachebench.warmup.NoCacheWarmup
@@ -50,48 +51,48 @@
         validates that replication is enabled and works. If repl does not =
occur and the stopOnFailure is set to true then exists.
         Should be used to make sure that replication is enabled; see javad=
oc for more details
       -->
-	<!--
-      <test name=3D"replicationOccurrsTest" testClass=3D"org.cachebench.te=
sts.ReplicationOccursTest">
-         <param name=3D"partialReplication" value=3D"true"/>
-      </test>
+      <!--
+            <test name=3D"replicationOccurrsTest" testClass=3D"org.cachebe=
nch.tests.ReplicationOccursTest">
+               <param name=3D"partialReplication" value=3D"true"/>
+            </test>
 =

--->
+      -->
       <!--
          * The "name" attrib is just used for display in the reports.
          * You can write your own custom testClass.
          * weight is currently unused.
       -->
-       <!--<test name=3D"Strings" testClass=3D"org.cachebench.tests.simple=
tests.StringTest" weight=3D"2.0" />-->
-       =

-       <test name=3D"SessionSimulator" testClass=3D"org.cachebench.tests.S=
essionSimulatorTest" weight=3D"2.0" >
-          <param name=3D"numberOfRequest" value=3D"100000"/>
-          <param name=3D"numberOfAttributes" value=3D"100"/>
-          <param name=3D"writePercentage" value=3D"20"/>
-          <param name=3D"sizeOfAnAttribute" value=3D"1000"/>
-       </test>
+      <!--<test name=3D"Strings" testClass=3D"org.cachebench.tests.simplet=
ests.StringTest" weight=3D"2.0" />-->
 =

-       <!--
-      <test name=3D"Primitive Wrappers" testClass=3D"org.cachebench.tests.=
simpletests.PrimitiveTest" weight=3D"1.0" />
-		<test name=3D"Custom Class Types" testClass=3D"org.cachebench.tests.simp=
letests.CustomClassTest" weight=3D"1.0" />
-		<test name=3D"Custom Subclasses of Abstracts" testClass=3D"org.cachebenc=
h.tests.simpletests.SubclassTest" weight=3D"1.5" />
-		<test name=3D"Custom Types With Transients" testClass=3D"org.cachebench.=
tests.simpletests.TransientTest" weight=3D"1.0" />
-		<test name=3D"Custom Types With Statics" testClass=3D"org.cachebench.tes=
ts.simpletests.StaticsTest" weight=3D"1.5" />
-		<test name=3D"Custom Types With Associations" testClass=3D"org.cachebenc=
h.tests.simpletests.AssociationsTest" weight=3D"2.0" />
-		-->
+      <test name=3D"SessionSimulator" testClass=3D"org.cachebench.tests.Se=
ssionSimulatorTest" weight=3D"2.0">
+         <param name=3D"numberOfRequest" value=3D"100000"/>
+         <param name=3D"numberOfAttributes" value=3D"100"/>
+         <param name=3D"writePercentage" value=3D"20"/>
+         <param name=3D"sizeOfAnAttribute" value=3D"1000"/>
+      </test>
 =

-       <!-- WARNING - Configuration file name is now DEPRECATED and will b=
e ignored.  Please pass in your cache config
-                      file name that you wish to use with the -DcacheBench=
Fwk.cacheConfigFile JVM parameter.  The runNode.sh
-                      and cluster.sh scripts will also do this for you.  -=
->
+      <!--
+        <test name=3D"Primitive Wrappers" testClass=3D"org.cachebench.test=
s.simpletests.PrimitiveTest" weight=3D"1.0" />
+        <test name=3D"Custom Class Types" testClass=3D"org.cachebench.test=
s.simpletests.CustomClassTest" weight=3D"1.0" />
+        <test name=3D"Custom Subclasses of Abstracts" testClass=3D"org.cac=
hebench.tests.simpletests.SubclassTest" weight=3D"1.5" />
+        <test name=3D"Custom Types With Transients" testClass=3D"org.cache=
bench.tests.simpletests.TransientTest" weight=3D"1.0" />
+        <test name=3D"Custom Types With Statics" testClass=3D"org.cacheben=
ch.tests.simpletests.StaticsTest" weight=3D"1.5" />
+        <test name=3D"Custom Types With Associations" testClass=3D"org.cac=
hebench.tests.simpletests.AssociationsTest" weight=3D"2.0" />
+        -->
+
+      <!-- WARNING - Configuration file name is now DEPRECATED and will be=
 ignored.  Please pass in your cache config
+file name that you wish to use with the -DcacheBenchFwk.cacheConfigFile JV=
M parameter.  The runNode.sh
+and cluster.sh scripts will also do this for you.  -->
    </testcase>
 =

 =

-	<!--
-	   Available generators are: CSVReportGenerator and ClusterReportGenerato=
r.
-	   See javadocs for org.cachebench.reportgenerators.ReportGenerator for w=
riting your
-		own report generators such as XML generators, graphic generators, etc
+   <!--
+      Available generators are: CSVReportGenerator and ClusterReportGenera=
tor.
+      See javadocs for org.cachebench.reportgenerators.ReportGenerator for=
 writing your
+      own report generators such as XML generators, graphic generators, etc
    -->
    <!-- The CSV report generated can be plugged in to a spreadsheet to gen=
erate graphs. If 'outputFile is set to
-   '-generic-' then the name would be generated as follows: 'data-<cache-p=
roduct>-<configuration>-<cluster-size>.csv' -->
+   '-generic-' then the name would be generated as follows: 'data_<cache-p=
roduct>_<configuration>_<cluster-size>.csv' -->
    <report outputFile=3D"-generic-" generator=3D"org.cachebench.reportgene=
rators.ClusterReportGenerator"/>
 =

 </cachebench>

Added: benchmarks/benchmark-fwk/trunk/generateChart.sh
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- benchmarks/benchmark-fwk/trunk/generateChart.sh	                       =
 (rev 0)
+++ benchmarks/benchmark-fwk/trunk/generateChart.sh	2008-01-31 01:18:57 UTC=
 (rev 5268)
@@ -0,0 +1,10 @@
+#!/bin/bash
+
+CP=3D.
+
+for i in lib/*.java
+do
+   CP=3D$CP:$i
+done
+
+java -cp $CP org.cachebench.reportgenerators.ChartGenerator ${*}

Added: benchmarks/benchmark-fwk/trunk/lib/jcommon.jar
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)


Property changes on: benchmarks/benchmark-fwk/trunk/lib/jcommon.jar
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: benchmarks/benchmark-fwk/trunk/lib/jfreechart.jar
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)


Property changes on: benchmarks/benchmark-fwk/trunk/lib/jfreechart.jar
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: benchmarks/benchmark-fwk/trunk/src/org/cachebench/reportgenerator=
s/AbstractReportGenerator.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- benchmarks/benchmark-fwk/trunk/src/org/cachebench/reportgenerators/Abst=
ractReportGenerator.java	2008-01-31 00:25:05 UTC (rev 5267)
+++ benchmarks/benchmark-fwk/trunk/src/org/cachebench/reportgenerators/Abst=
ractReportGenerator.java	2008-01-31 01:18:57 UTC (rev 5268)
@@ -32,9 +32,9 @@
 =

    private String getFileName(String fileName)
    {
-      if (fileName.indexOf("-generic-") >=3D0 )
+      if (fileName.indexOf("-generic-") >=3D 0)
       {
-         return "data-" + params.get("cacheProductName") + "-" + params.ge=
t("config") + "-" + params.get("clusterSize") + ".csv";
+         return "data_" + params.get("cacheProductName") + "_" + params.ge=
t("config") + "_" + params.get("clusterSize") + ".csv";
       }
       log.info("Filename for report generation is: " + fileName);
       return fileName;

Added: benchmarks/benchmark-fwk/trunk/src/org/cachebench/reportgenerators/C=
hartGenerator.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- benchmarks/benchmark-fwk/trunk/src/org/cachebench/reportgenerators/Char=
tGenerator.java	                        (rev 0)
+++ benchmarks/benchmark-fwk/trunk/src/org/cachebench/reportgenerators/Char=
tGenerator.java	2008-01-31 01:18:57 UTC (rev 5268)
@@ -0,0 +1,147 @@
+package org.cachebench.reportgenerators;
+
+import org.apache.commons.math.stat.descriptive.DescriptiveStatistics;
+import org.jfree.chart.ChartFactory;
+import org.jfree.chart.ChartUtilities;
+import org.jfree.chart.JFreeChart;
+import org.jfree.chart.plot.PlotOrientation;
+import org.jfree.data.category.DefaultCategoryDataset;
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileReader;
+import java.io.FilenameFilter;
+import java.io.IOException;
+import java.util.Collections;
+import java.util.Date;
+import java.util.StringTokenizer;
+
+/**
+ * Manual chart generator.  Grabs CSVs generated by {@link org.cachebench.=
reportgenerators.ClusterReportGenerator} and spits out
+ * line graphs.
+ * <p/>
+ * This generator draws line graphs, using cluster size on the X axis (e.g=
., 2, 4, 6 nodes) and throughput (requests per second)
+ * on the Y axis.  It then plots points for the different cache products a=
nd configurations tested.
+ * <p/>
+ * For the time being, this is expected to be run manually on the command =
line, passing in relevant parameters.  Calling this with
+ * no params will generate some help.
+ * <p/>
+ * TODO: Make this a proper report generator plugin once we have proper re=
port consolidation that spans multiple runs for different cluster sizes and=
 cache products.
+ *
+ * @author Manik Surtani (<a href=3D"mailto:manik(a)jboss.org">manik(a)jbo=
ss.org</a>)
+ */
+public class ChartGenerator
+{
+   static String reportDirectory;
+   static boolean singleChart;
+   DefaultCategoryDataset dataset;
+
+
+   private static void help()
+   {
+      System.out.println("Usage:");
+      System.out.println("   ChartGenerator [-reportDir <directory contain=
ing CSV files>] [-singleChart <true | false> if true, generates a single ch=
art for all config files.]");
+   }
+
+   public static void main(String[] args) throws IOException
+   {
+      System.out.println("Welcome to the ChartGenerator.");
+      // the params we expect:
+      for (int i =3D 0; i < args.length; i++)
+      {
+         if (args[i].equals("-reportDir"))
+         {
+            reportDirectory =3D args[++i];
+            continue;
+         }
+
+         if (args[i].equals("-singleChart"))
+         {
+            singleChart =3D Boolean.valueOf(args[++i]);
+            continue;
+         }
+
+         help();
+         return;
+      }
+
+      new ChartGenerator().generateChart();
+   }
+
+   private void generateChart() throws IOException
+   {
+      readData();
+      JFreeChart chart =3D ChartFactory.createLineChart("CacheBenchFwk Rep=
ort", "Cluster size", "Throughput (reqs/sec)",
+            dataset, PlotOrientation.HORIZONTAL, true, false, false);
+
+      chart.setSubtitles(Collections.singletonList("" + new Date()));
+      ChartUtilities.saveChartAsPNG(new File("chart.png"), chart, 600, 800=
);
+   }
+
+   private void readData() throws IOException
+   {
+      File file =3D new File(reportDirectory);
+      if (!file.exists() || !file.isDirectory())
+         throw new IllegalArgumentException("Report directory " + reportDi=
rectory + " does not exist or is not a directory!");
+
+      File[] files =3D file.listFiles(new FilenameFilter()
+      {
+         public boolean accept(File dir, String name)
+         {
+            return name.toUpperCase().endsWith(".CSV");
+         }
+      });
+
+      dataset =3D new DefaultCategoryDataset();
+      for (File f : files)
+      {
+         readData(f);
+      }
+   }
+
+   private void readData(File f) throws IOException
+   {
+      // chop up the file name to get productAndConfiguration and clusterS=
ize.
+      Integer clusterSize =3D 0;
+      DescriptiveStatistics stats =3D DescriptiveStatistics.newInstance();
+      // file name is in the format data_<cache-product>_<cache-cfg.xml>_<=
cluster-size>.csv
+
+      StringTokenizer strtok =3D new StringTokenizer(f.getName(), "_");
+      strtok.nextToken(); // this is the "data-" bit
+      String productNameAndConfiguration =3D strtok.nextToken() + "(" + st=
rtok.nextToken();
+      // chop off the trailing ".xml"
+      if (productNameAndConfiguration.toUpperCase().endsWith(".XML"))
+         productNameAndConfiguration =3D productNameAndConfiguration.subst=
ring(0, productNameAndConfiguration.length() - 4);
+      productNameAndConfiguration +=3D ")";
+
+      // cluster size
+      String cS =3D strtok.nextToken();
+      if (cS.toUpperCase().endsWith(".CSV")) cS =3D cS.substring(0, cS.len=
gth() - 4);
+      clusterSize =3D Integer.parseInt(cS);
+
+      // now read the data.
+      String line =3D null;
+      BufferedReader br =3D new BufferedReader(new FileReader(f));
+      while ((line =3D br.readLine()) !=3D null)
+      {
+         double throughput =3D getThroughput(line);
+         if (throughput !=3D -1) stats.addValue(throughput);
+      }
+
+      dataset.addValue(stats.getMean(), productNameAndConfiguration, clust=
erSize);
+   }
+
+   private double getThroughput(String line)
+   {
+      // To be a valid line, the line should be comma delimited
+      StringTokenizer strTokenizer =3D new StringTokenizer(line, ",");
+      if (strTokenizer.countTokens() < 2) return -1;
+
+      // we want the 3rd element which is throughput
+      strTokenizer.nextToken();
+      strTokenizer.nextToken();
+      String candidate =3D strTokenizer.nextToken();
+      return Double.parseDouble(candidate);
+   }
+
+}


--===============2871074970049890802==--

From jbosscache-commits at lists.jboss.org Wed Jan 30 20:22:26 2008
Content-Type: multipart/mixed; boundary="===============4787767015100898499=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r5269 -
 benchmarks/benchmark-fwk/trunk.
Date: Wed, 30 Jan 2008 20:22:26 -0500
Message-ID: <E1JKO8I-0001Eb-Ib@committer01.frg.pub.inap.atl.jboss.com>

--===============4787767015100898499==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: manik.surtani(a)jboss.com
Date: 2008-01-30 20:22:26 -0500 (Wed, 30 Jan 2008)
New Revision: 5269

Modified:
   benchmarks/benchmark-fwk/trunk/build.xml
Log:
More flexible classpaths


Modified: benchmarks/benchmark-fwk/trunk/build.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- benchmarks/benchmark-fwk/trunk/build.xml	2008-01-31 01:18:57 UTC (rev 5=
268)
+++ benchmarks/benchmark-fwk/trunk/build.xml	2008-01-31 01:22:26 UTC (rev 5=
269)
@@ -1,501 +1,534 @@
 <?xml version=3D"1.0" encoding=3D"ISO-8859-1"?>
 <project name=3D"cachebenchfwk" default=3D"help">
-  =

-  =

-  <property file=3D"build.properties"/>
-  <!-- Uncomment the following property if no tests compilation is needed =
-->
-  <!-- =

+
+
+   <property file=3D"build.properties"/>
+   <!-- Uncomment the following property if no tests compilation is needed=
 -->
+   <!--
   <property name=3D"skip.tests" value=3D"true"/>
    -->
-  =

-  <!-- Compiler options -->
-  =

-  <property name=3D"compiler.debug" value=3D"on"/>
-  <property name=3D"compiler.generate.no.warnings" value=3D"off"/>
-  <property name=3D"compiler.args" value=3D""/>
-  <property name=3D"compiler.max.memory" value=3D"128m"/>
-  <patternset id=3D"ignored.files">
-    <exclude name=3D"**/CVS/**"/>
-    <exclude name=3D"**/SCCS/**"/>
-    <exclude name=3D"**/RCS/**"/>
-    <exclude name=3D"**/rcs/**"/>
-    <exclude name=3D"**/.DS_Store/**"/>
-    <exclude name=3D"**/.svn/**"/>
-    <exclude name=3D"**/.sbas/**"/>
-    <exclude name=3D"**/.IJI.*/**"/>
-  </patternset>
-  <patternset id=3D"compiler.resources">
-    <include name=3D"**/?*.properties"/>
-    <include name=3D"**/?*.xml"/>
-    <include name=3D"**/?*.gif"/>
-    <include name=3D"**/?*.png"/>
-    <include name=3D"**/?*.jpeg"/>
-    <include name=3D"**/?*.jpg"/>
-    <include name=3D"**/?*.html"/>
-    <include name=3D"**/?*.dtd"/>
-    <include name=3D"**/?*.tld"/>
-  </patternset>
-  =

-  <!-- Modules -->
-  =

-  =

-  <!-- Module Framework -->
-  =

-  <dirname property=3D"module.framework.basedir" file=3D"${ant.file}"/>
 =

-  <property environment=3D"env"/>
-  =

-  <property name=3D"compiler.args.framework" value=3D"${compiler.args}"/>
-  =

-  <property name=3D"framework.output.dir" value=3D"${module.framework.base=
dir}/classes/production/Framework"/>
-  <property name=3D"framework.testoutput.dir" value=3D"${module.framework.=
basedir}/classes/test/Framework"/>
-  =

-  <path id=3D"framework.module.bootclasspath">
-    <!-- Paths to be included in compilation bootclasspath -->
-  </path>
-  =

-  <path id=3D"framework.module.classpath">
-    <pathelement location=3D"${module.framework.basedir}/lib/commons-loggi=
ng.jar"/>
-    <pathelement location=3D"${module.framework.basedir}/lib/log4j.jar"/>
-    <pathelement location=3D"${module.framework.basedir}/lib/commons-diges=
ter.jar"/>
-    <pathelement location=3D"${module.framework.basedir}/lib/commons-beanu=
tils.jar"/>
-    <pathelement location=3D"${module.framework.basedir}/lib/commons-math-=
1.0.jar"/>
-    <pathelement location=3D"${module.framework.basedir}/lib/smartfrog-3.1=
2.014.jar"/>
-    <pathelement location=3D"${module.framework.basedir}/conf"/>
-  </path>
-  =

-  =

-  <patternset id=3D"excluded.from.module.framework">
-    <patternset refid=3D"ignored.files"/>
-  </patternset>
-  =

-  <patternset id=3D"excluded.from.compilation.framework">   =

-    <patternset refid=3D"excluded.from.module.framework"/>
-  </patternset>
-  =

-  <path id=3D"framework.module.sourcepath">
-    <dirset dir=3D"${module.framework.basedir}">
-      <include name=3D"src"/>
-    </dirset>
-  </path>
-  =

-  <target name=3D"help" description=3D"Dumps usage information">
-     <echo>
-This script has the purpose of building the CacheBenchFwk.
-See /docs/ for more details.
-        =

-Some useful targets:
+   <!-- Compiler options -->
 =

-   help      - this documentation
-   all       - builds the entire project, including plugins for all
-               cache products in /cache-products/.  Output classes
-               in /classes/.
-   runNode - runs the CacheBenchFwk. Depending on the number of nodes in t=
he cluster(configured in cachebenchmark.xml),
-             it will wait for all configured nodes to be launched before s=
tarting the tests
+   <property name=3D"compiler.debug" value=3D"on"/>
+   <property name=3D"compiler.generate.no.warnings" value=3D"off"/>
+   <property name=3D"compiler.args" value=3D""/>
+   <property name=3D"compiler.max.memory" value=3D"128m"/>
+   <patternset id=3D"ignored.files">
+      <exclude name=3D"**/CVS/**"/>
+      <exclude name=3D"**/SCCS/**"/>
+      <exclude name=3D"**/RCS/**"/>
+      <exclude name=3D"**/rcs/**"/>
+      <exclude name=3D"**/.DS_Store/**"/>
+      <exclude name=3D"**/.svn/**"/>
+      <exclude name=3D"**/.sbas/**"/>
+      <exclude name=3D"**/.IJI.*/**"/>
+   </patternset>
+   <patternset id=3D"compiler.resources">
+      <include name=3D"**/?*.properties"/>
+      <include name=3D"**/?*.xml"/>
+      <include name=3D"**/?*.gif"/>
+      <include name=3D"**/?*.png"/>
+      <include name=3D"**/?*.jpeg"/>
+      <include name=3D"**/?*.jpg"/>
+      <include name=3D"**/?*.html"/>
+      <include name=3D"**/?*.dtd"/>
+      <include name=3D"**/?*.tld"/>
+   </patternset>
 =

-Make sure you have looked at:
+   <!-- Modules -->
 =

-   1) 'build.properties' and have set JVM params (such as heap size,
-       etc.) as necessary.
-   2) '/conf/cachebench.xml' to configure the tests you want run, the
-        nodes in the cluster if the case and the output file for reports.
-   3) '/conf/log4j.xml' for logging settings (make sure these aren't
-       very verbose as it can skew tests).
-   4)  Provided one of the plugins as a system property.  This is
-       necessary since at the moment plugin libs may overlap and
-       cause problems, so are not loaded every time.  Specify which
-       plugin you plan to use in your test by using
 =

+   <!-- Module Framework -->
+
+   <dirname property=3D"module.framework.basedir" file=3D"${ant.file}"/>
+
+   <property environment=3D"env"/>
+
+   <property name=3D"compiler.args.framework" value=3D"${compiler.args}"/>
+
+   <property name=3D"framework.output.dir" value=3D"${module.framework.bas=
edir}/classes/production/Framework"/>
+   <property name=3D"framework.testoutput.dir" value=3D"${module.framework=
.basedir}/classes/test/Framework"/>
+
+   <path id=3D"framework.module.bootclasspath">
+      <!-- Paths to be included in compilation bootclasspath -->
+   </path>
+
+   <path id=3D"framework.module.classpath">
+      <dirset dir=3D"${module.framework.basedir}/lib" includes=3D"**/*.jar=
"/>
+      <pathelement location=3D"${module.framework.basedir}/conf"/>
+   </path>
+
+
+   <patternset id=3D"excluded.from.module.framework">
+      <patternset refid=3D"ignored.files"/>
+   </patternset>
+
+   <patternset id=3D"excluded.from.compilation.framework">
+      <patternset refid=3D"excluded.from.module.framework"/>
+   </patternset>
+
+   <path id=3D"framework.module.sourcepath">
+      <dirset dir=3D"${module.framework.basedir}">
+         <include name=3D"src"/>
+      </dirset>
+   </path>
+
+   <target name=3D"help" description=3D"Dumps usage information">
+      <echo>
+         This script has the purpose of building the CacheBenchFwk.
+         See /docs/ for more details.
+
+         Some useful targets:
+
+         help - this documentation
+         all - builds the entire project, including plugins for all
+         cache products in /cache-products/. Output classes
+         in /classes/.
+         runNode - runs the CacheBenchFwk. Depending on the number of node=
s in the cluster(configured in
+         cachebenchmark.xml),
+         it will wait for all configured nodes to be launched before start=
ing the tests
+
+         Make sure you have looked at:
+
+         1) 'build.properties' and have set JVM params (such as heap size,
+         etc.) as necessary.
+         2) '/conf/cachebench.xml' to configure the tests you want run, the
+         nodes in the cluster if the case and the output file for reports.
+         3) '/conf/log4j.xml' for logging settings (make sure these aren't
+         very verbose as it can skew tests).
+         4) Provided one of the plugins as a system property. This is
+         necessary since at the moment plugin libs may overlap and
+         cause problems, so are not loaded every time. Specify which
+         plugin you plan to use in your test by using
+
          -Dorg.cachebench.plugins.jbosscache1=3Dtrue -Dbind.address=3D${MY=
TESTIP_1}
          -Dorg.cachebench.plugins.jbosscache2=3Dtrue -Dbind.address=3D${MY=
TESTIP_1}
          -Dorg.cachebench.pluins.ehcache=3Dtrue -Dbind.address=3D${MYTESTI=
P_1}
          -Dorg.cachebench.plugins.coherence=3Dtrue -Dtangosol.coherence.lo=
calhost=3D${MYTESTIP_1}
-        // WORK IN PROGRESS
-        -Dorg.cachebench.plugins.terracotta=3Dtrue
-        when running ant.  Note that only one can be set at any time.
-   5)  Make sure you set up an correct NODE_INDEX environment property =

-       indicating the index of the node before starting it. E.g. if
-       we have 3 nodes  each process should have an environment
-       variable named NODE_INDEX, having values in the range 0-2,
-       each node having an distict value.
-       see cachebench.xml\cachebench\cluster for more details
+         // WORK IN PROGRESS
+         -Dorg.cachebench.plugins.terracotta=3Dtrue
+         when running ant. Note that only one can be set at any time.
+         5) Make sure you set up an correct NODE_INDEX environment property
+         indicating the index of the node before starting it. E.g. if
+         we have 3 nodes each process should have an environment
+         variable named NODE_INDEX, having values in the range 0-2,
+         each node having an distict value.
+         see cachebench.xml\cachebench\cluster for more details
 =

-   NB: NEEDS Ant >=3D 1.7.0        =

-     </echo>
-  </target>
+         NB: NEEDS Ant >=3D 1.7.0
+      </echo>
+   </target>
 =

 =

-  <target name=3D"compile.module.framework" depends=3D"compile.module.fram=
ework.production,compile.module.framework.tests" description=3D"Compile mod=
ule Framework"/>
-  =

-  <target name=3D"compile.module.framework.production" description=3D"Comp=
ile module Framework; production classes">
-    <mkdir dir=3D"${framework.output.dir}"/>
-    <javac destdir=3D"${framework.output.dir}" debug=3D"${compiler.debug}"=
 nowarn=3D"${compiler.generate.no.warnings}" memorymaximumsize=3D"${compile=
r.max.memory}" fork=3D"true">
-      <compilerarg line=3D"${compiler.args.framework}"/>
-      <bootclasspath refid=3D"framework.module.bootclasspath"/>
-      <classpath refid=3D"framework.module.classpath"/>
-      <src refid=3D"framework.module.sourcepath"/>
-      <patternset refid=3D"excluded.from.compilation.framework"/>
-    </javac>
-    =

-    <copy todir=3D"${framework.output.dir}">
-      <fileset dir=3D"${module.framework.basedir}/src">
-        <patternset refid=3D"compiler.resources"/>
-        <type type=3D"file"/>
-      </fileset>
-    </copy>
-  </target>
-  =

-  <target name=3D"compile.module.framework.tests" depends=3D"compile.modul=
e.framework.production" description=3D"compile module Framework; test class=
es" unless=3D"skip.tests"/>
-  =

+   <target name=3D"compile.module.framework" depends=3D"compile.module.fra=
mework.production,compile.module.framework.tests"
+           description=3D"Compile module Framework"/>
 =

-  <!-- Module ehcache-1.2.4 -->
-  =

-  <dirname property=3D"module.ehcache124-plugin.basedir" file=3D"${ant.fil=
e}"/>
-  =

-  =

-  =

-  <property name=3D"compiler.args.ehcache124-plugin" value=3D"${compiler.a=
rgs}"/>
-  =

-  <property name=3D"ehcache124-plugin.output.dir" value=3D"${module.ehcach=
e124-plugin.basedir}/classes/production/ehcache-1.2.4"/>
-  <property name=3D"ehcache124-plugin.testoutput.dir" value=3D"${module.eh=
cache124-plugin.basedir}/classes/test/ehcache-1.2.4"/>
-  =

-  <path id=3D"ehcache124-plugin.module.bootclasspath">
-    <!-- Paths to be included in compilation bootclasspath -->
-  </path>
-  =

-  <path id=3D"ehcache124-plugin.module.classpath">
-     <fileset dir=3D"${module.ehcache124-plugin.basedir}/cache-products/eh=
cache-1.2.4/lib" includes=3D"*.jar" />
-     <pathelement location=3D"${module.ehcache124-plugin.basedir}/cache-pr=
oducts/ehcache-1.2.4/conf"/>
-     <pathelement location=3D"${framework.output.dir}"/>
-     <pathelement location=3D"${framework.testoutput.dir}"/>
-     <pathelement location=3D"${ehcache124-plugin.output.dir}" />
-  </path>
-  =

-  =

-  <patternset id=3D"excluded.from.module.ehcache124-plugin">
-    <patternset refid=3D"ignored.files"/>
-  </patternset>
-  =

-  <patternset id=3D"excluded.from.compilation.ehcache124-plugin">
-    <patternset refid=3D"excluded.from.module.ehcache124-plugin"/>
-  </patternset>
-  =

-  <path id=3D"ehcache124-plugin.module.sourcepath">
-    <dirset dir=3D"${module.ehcache124-plugin.basedir}/cache-products/ehca=
che-1.2.4">
-      <include name=3D"src"/>
-    </dirset>
-  </path>
-  =

-  =

-  <target name=3D"compile.module.ehcache124-plugin" depends=3D"compile.mod=
ule.ehcache124-plugin.production,compile.module.ehcache124-plugin.tests" de=
scription=3D"Compile module ehcache-1.2.4"/>
-  =

-  <target name=3D"compile.module.ehcache124-plugin.production" depends=3D"=
compile.module.framework" description=3D"Compile module ehcache-1.2.4; prod=
uction classes">
-    <mkdir dir=3D"${ehcache124-plugin.output.dir}"/>
-    <javac destdir=3D"${ehcache124-plugin.output.dir}" debug=3D"${compiler=
.debug}" nowarn=3D"${compiler.generate.no.warnings}" memorymaximumsize=3D"$=
{compiler.max.memory}" fork=3D"true">
-      <compilerarg line=3D"${compiler.args.ehcache124-plugin}"/>
-      <bootclasspath refid=3D"ehcache124-plugin.module.bootclasspath"/>
-      <classpath refid=3D"ehcache124-plugin.module.classpath"/>
-      <src refid=3D"ehcache124-plugin.module.sourcepath"/>
-      <patternset refid=3D"excluded.from.compilation.ehcache124-plugin"/>
-    </javac>
-    =

-    <copy todir=3D"${ehcache124-plugin.output.dir}">
-      <fileset dir=3D"${module.ehcache124-plugin.basedir}/cache-products/e=
hcache-1.2.4/src">
-        <patternset refid=3D"compiler.resources"/>
-        <type type=3D"file"/>
-      </fileset>
-    </copy>
-  </target>
-  =

-  <target name=3D"compile.module.ehcache124-plugin.tests" depends=3D"compi=
le.module.ehcache124-plugin.production" description=3D"compile module ehcac=
he-1.2.4; test classes" unless=3D"skip.tests"/>
-  =

+   <target name=3D"compile.module.framework.production" description=3D"Com=
pile module Framework; production classes">
+      <mkdir dir=3D"${framework.output.dir}"/>
+      <javac destdir=3D"${framework.output.dir}" debug=3D"${compiler.debug=
}" nowarn=3D"${compiler.generate.no.warnings}"
+             memorymaximumsize=3D"${compiler.max.memory}" fork=3D"true">
+         <compilerarg line=3D"${compiler.args.framework}"/>
+         <bootclasspath refid=3D"framework.module.bootclasspath"/>
+         <classpath refid=3D"framework.module.classpath"/>
+         <src refid=3D"framework.module.sourcepath"/>
+         <patternset refid=3D"excluded.from.compilation.framework"/>
+      </javac>
 =

+      <copy todir=3D"${framework.output.dir}">
+         <fileset dir=3D"${module.framework.basedir}/src">
+            <patternset refid=3D"compiler.resources"/>
+            <type type=3D"file"/>
+         </fileset>
+      </copy>
+   </target>
 =

+   <target name=3D"compile.module.framework.tests" depends=3D"compile.modu=
le.framework.production"
+           description=3D"compile module Framework; test classes" unless=
=3D"skip.tests"/>
+
+
+   <!-- Module ehcache-1.2.4 -->
+
+   <dirname property=3D"module.ehcache124-plugin.basedir" file=3D"${ant.fi=
le}"/>
+
+
+   <property name=3D"compiler.args.ehcache124-plugin" value=3D"${compiler.=
args}"/>
+
+   <property name=3D"ehcache124-plugin.output.dir"
+             value=3D"${module.ehcache124-plugin.basedir}/classes/producti=
on/ehcache-1.2.4"/>
+   <property name=3D"ehcache124-plugin.testoutput.dir"
+             value=3D"${module.ehcache124-plugin.basedir}/classes/test/ehc=
ache-1.2.4"/>
+
+   <path id=3D"ehcache124-plugin.module.bootclasspath">
+      <!-- Paths to be included in compilation bootclasspath -->
+   </path>
+
+   <path id=3D"ehcache124-plugin.module.classpath">
+      <fileset dir=3D"${module.ehcache124-plugin.basedir}/cache-products/e=
hcache-1.2.4/lib" includes=3D"*.jar"/>
+      <pathelement location=3D"${module.ehcache124-plugin.basedir}/cache-p=
roducts/ehcache-1.2.4/conf"/>
+      <pathelement location=3D"${framework.output.dir}"/>
+      <pathelement location=3D"${framework.testoutput.dir}"/>
+      <pathelement location=3D"${ehcache124-plugin.output.dir}"/>
+   </path>
+
+
+   <patternset id=3D"excluded.from.module.ehcache124-plugin">
+      <patternset refid=3D"ignored.files"/>
+   </patternset>
+
+   <patternset id=3D"excluded.from.compilation.ehcache124-plugin">
+      <patternset refid=3D"excluded.from.module.ehcache124-plugin"/>
+   </patternset>
+
+   <path id=3D"ehcache124-plugin.module.sourcepath">
+      <dirset dir=3D"${module.ehcache124-plugin.basedir}/cache-products/eh=
cache-1.2.4">
+         <include name=3D"src"/>
+      </dirset>
+   </path>
+
+
+   <target name=3D"compile.module.ehcache124-plugin"
+           depends=3D"compile.module.ehcache124-plugin.production,compile.=
module.ehcache124-plugin.tests"
+           description=3D"Compile module ehcache-1.2.4"/>
+
+   <target name=3D"compile.module.ehcache124-plugin.production" depends=3D=
"compile.module.framework"
+           description=3D"Compile module ehcache-1.2.4; production classes=
">
+      <mkdir dir=3D"${ehcache124-plugin.output.dir}"/>
+      <javac destdir=3D"${ehcache124-plugin.output.dir}" debug=3D"${compil=
er.debug}"
+             nowarn=3D"${compiler.generate.no.warnings}" memorymaximumsize=
=3D"${compiler.max.memory}" fork=3D"true">
+         <compilerarg line=3D"${compiler.args.ehcache124-plugin}"/>
+         <bootclasspath refid=3D"ehcache124-plugin.module.bootclasspath"/>
+         <classpath refid=3D"ehcache124-plugin.module.classpath"/>
+         <src refid=3D"ehcache124-plugin.module.sourcepath"/>
+         <patternset refid=3D"excluded.from.compilation.ehcache124-plugin"=
/>
+      </javac>
+
+      <copy todir=3D"${ehcache124-plugin.output.dir}">
+         <fileset dir=3D"${module.ehcache124-plugin.basedir}/cache-product=
s/ehcache-1.2.4/src">
+            <patternset refid=3D"compiler.resources"/>
+            <type type=3D"file"/>
+         </fileset>
+      </copy>
+   </target>
+
+   <target name=3D"compile.module.ehcache124-plugin.tests" depends=3D"comp=
ile.module.ehcache124-plugin.production"
+           description=3D"compile module ehcache-1.2.4; test classes" unle=
ss=3D"skip.tests"/>
+
+
    <!-- Module coherence-3.2.2 -->
 =

-  <dirname property=3D"module.coherence322-plugin.basedir" file=3D"${ant.f=
ile}"/>
+   <dirname property=3D"module.coherence322-plugin.basedir" file=3D"${ant.=
file}"/>
 =

 =

+   <property name=3D"compiler.args.coherence322-plugin" value=3D"${compile=
r.args}"/>
 =

-  <property name=3D"compiler.args.coherence322-plugin" value=3D"${compiler=
.args}"/>
+   <property name=3D"coherence322-plugin.output.dir"
+             value=3D"${module.coherence322-plugin.basedir}/classes/produc=
tion/coherence-3.2.2"/>
+   <property name=3D"coherence322-plugin.testoutput.dir"
+             value=3D"${module.coherence322-plugin.basedir}/classes/test/c=
oherence-3.2.2"/>
 =

-  <property name=3D"coherence322-plugin.output.dir" value=3D"${module.cohe=
rence322-plugin.basedir}/classes/production/coherence-3.2.2"/>
-  <property name=3D"coherence322-plugin.testoutput.dir" value=3D"${module.=
coherence322-plugin.basedir}/classes/test/coherence-3.2.2"/>
+   <path id=3D"coherence322-plugin.module.bootclasspath">
+      <!-- Paths to be included in compilation bootclasspath -->
+   </path>
 =

-  <path id=3D"coherence322-plugin.module.bootclasspath">
-    <!-- Paths to be included in compilation bootclasspath -->
-  </path>
+   <path id=3D"coherence322-plugin.module.classpath">
+      <fileset dir=3D"${module.coherence322-plugin.basedir}/cache-products=
/coherence-3.2.2/lib" includes=3D"*.jar"/>
+      <pathelement location=3D"${module.coherence322-plugin.basedir}/cache=
-products/coherence-3.2.2/conf"/>
+      <pathelement location=3D"${framework.output.dir}"/>
+      <pathelement location=3D"${framework.testoutput.dir}"/>
+      <pathelement location=3D"${coherence322-plugin.output.dir}"/>
+   </path>
 =

-  <path id=3D"coherence322-plugin.module.classpath">
-     <fileset dir=3D"${module.coherence322-plugin.basedir}/cache-products/=
coherence-3.2.2/lib" includes=3D"*.jar" />
-     <pathelement location=3D"${module.coherence322-plugin.basedir}/cache-=
products/coherence-3.2.2/conf"/>
-     <pathelement location=3D"${framework.output.dir}"/>
-     <pathelement location=3D"${framework.testoutput.dir}"/>
-     <pathelement location=3D"${coherence322-plugin.output.dir}" />
-  </path>
 =

+   <patternset id=3D"excluded.from.module.coherence322-plugin">
+      <patternset refid=3D"ignored.files"/>
+   </patternset>
 =

-  <patternset id=3D"excluded.from.module.coherence322-plugin">
-    <patternset refid=3D"ignored.files"/>
-  </patternset>
+   <patternset id=3D"excluded.from.compilation.coherence322-plugin">
+      <patternset refid=3D"excluded.from.module.coherence322-plugin"/>
+   </patternset>
 =

-  <patternset id=3D"excluded.from.compilation.coherence322-plugin">
-    <patternset refid=3D"excluded.from.module.coherence322-plugin"/>
-  </patternset>
+   <path id=3D"coherence322-plugin.module.sourcepath">
+      <dirset dir=3D"${module.ehcache124-plugin.basedir}/cache-products/co=
herence-3.2.2">
+         <include name=3D"src"/>
+      </dirset>
+   </path>
 =

-  <path id=3D"coherence322-plugin.module.sourcepath">
-    <dirset dir=3D"${module.ehcache124-plugin.basedir}/cache-products/cohe=
rence-3.2.2">
-      <include name=3D"src"/>
-    </dirset>
-  </path>
 =

+   <target name=3D"compile.module.coherence322-plugin"
+           depends=3D"compile.module.coherence322-plugin.production, compi=
le.module.coherence322-plugin.tests"
+           description=3D"Compile module coherence322"/>
 =

-  <target name=3D"compile.module.coherence322-plugin" depends=3D"compile.m=
odule.coherence322-plugin.production, compile.module.coherence322-plugin.te=
sts" description=3D"Compile module coherence322"/>
+   <target name=3D"compile.module.coherence322-plugin.production" depends=
=3D"compile.module.framework"
+           description=3D"Compile module coherence322; production classes">
+      <mkdir dir=3D"${coherence322-plugin.output.dir}"/>
+      <javac destdir=3D"${coherence322-plugin.output.dir}" debug=3D"${comp=
iler.debug}"
+             nowarn=3D"${compiler.generate.no.warnings}" memorymaximumsize=
=3D"${compiler.max.memory}" fork=3D"true">
+         <compilerarg line=3D"${compiler.args.coherence322-plugin}"/>
+         <bootclasspath refid=3D"coherence322-plugin.module.bootclasspath"=
/>
+         <classpath refid=3D"coherence322-plugin.module.classpath"/>
+         <src refid=3D"coherence322-plugin.module.sourcepath"/>
+         <patternset refid=3D"excluded.from.compilation.coherence322-plugi=
n"/>
+      </javac>
 =

-  <target name=3D"compile.module.coherence322-plugin.production" depends=
=3D"compile.module.framework" description=3D"Compile module coherence322; p=
roduction classes">
-    <mkdir dir=3D"${coherence322-plugin.output.dir}"/>
-    <javac destdir=3D"${coherence322-plugin.output.dir}" debug=3D"${compil=
er.debug}" nowarn=3D"${compiler.generate.no.warnings}" memorymaximumsize=3D=
"${compiler.max.memory}" fork=3D"true">
-      <compilerarg line=3D"${compiler.args.coherence322-plugin}"/>
-      <bootclasspath refid=3D"coherence322-plugin.module.bootclasspath"/>
-      <classpath refid=3D"coherence322-plugin.module.classpath"/>
-      <src refid=3D"coherence322-plugin.module.sourcepath"/>
-      <patternset refid=3D"excluded.from.compilation.coherence322-plugin"/>
-    </javac>
+      <copy todir=3D"${coherence322-plugin.output.dir}">
+         <fileset dir=3D"${module.coherence322-plugin.basedir}/cache-produ=
cts/coherence-3.2.2/src">
+            <patternset refid=3D"compiler.resources"/>
+            <type type=3D"file"/>
+         </fileset>
+      </copy>
+   </target>
 =

-    <copy todir=3D"${coherence322-plugin.output.dir}">
-      <fileset dir=3D"${module.coherence322-plugin.basedir}/cache-products=
/coherence-3.2.2/src">
-        <patternset refid=3D"compiler.resources"/>
-        <type type=3D"file"/>
-      </fileset>
-    </copy>
-  </target>
+   <target name=3D"compile.module.coherence322-plugin.tests" depends=3D"co=
mpile.module.coherence322-plugin.production"
+           description=3D"compile module coherence322; test classes" unles=
s=3D"skip.tests"/>
 =

-  <target name=3D"compile.module.coherence322-plugin.tests" depends=3D"com=
pile.module.coherence322-plugin.production" description=3D"compile module c=
oherence322; test classes" unless=3D"skip.tests"/>
+   <target name=3D"clean.module.coherence322-plugin" description=3D"cleanu=
p module">
+      <delete dir=3D"${coherence322-plugin.output.dir}"/>
+      <delete dir=3D"${coherence322-plugin.testoutput.dir}"/>
+   </target>
 =

-  <target name=3D"clean.module.coherence322-plugin" description=3D"cleanup=
 module">
-    <delete dir=3D"${coherence322-plugin.output.dir}"/>
-    <delete dir=3D"${coherence322-plugin.testoutput.dir}"/>
-  </target>
+   <!-- Module terracotta-2.5.0 -->
 =

-     <!-- Module terracotta-2.5.0 -->
+   <dirname property=3D"module.terracotta-plugin.basedir" file=3D"${ant.fi=
le}"/>
 =

-  <dirname property=3D"module.terracotta-plugin.basedir" file=3D"${ant.fil=
e}"/>
 =

+   <property name=3D"compiler.args.terracotta-plugin" value=3D"${compiler.=
args}"/>
 =

+   <property name=3D"terracotta-plugin.output.dir"
+             value=3D"${module.terracotta-plugin.basedir}/classes/producti=
on/terracotta-2.5.0"/>
+   <property name=3D"terracotta-plugin.testoutput.dir"
+             value=3D"${module.terracotta-plugin.basedir}/classes/test/ter=
racotta-2.5.0"/>
 =

-  <property name=3D"compiler.args.terracotta-plugin" value=3D"${compiler.a=
rgs}"/>
+   <path id=3D"terracotta-plugin.module.bootclasspath">
+      <!-- Paths to be included in compilation bootclasspath -->
+   </path>
 =

-  <property name=3D"terracotta-plugin.output.dir" value=3D"${module.terrac=
otta-plugin.basedir}/classes/production/terracotta-2.5.0"/>
-  <property name=3D"terracotta-plugin.testoutput.dir" value=3D"${module.te=
rracotta-plugin.basedir}/classes/test/terracotta-2.5.0"/>
+   <path id=3D"terracotta-plugin.module.classpath">
+      <pathelement location=3D"${module.terracotta-plugin.basedir}/cache-p=
roducts/terracotta-2.5.0/conf"/>
+      <pathelement location=3D"${framework.output.dir}"/>
+      <pathelement location=3D"${framework.testoutput.dir}"/>
+      <pathelement location=3D"${terracotta-plugin.output.dir}"/>
+   </path>
 =

-  <path id=3D"terracotta-plugin.module.bootclasspath">
-    <!-- Paths to be included in compilation bootclasspath -->
-  </path>
 =

-  <path id=3D"terracotta-plugin.module.classpath">
-    <pathelement location=3D"${module.terracotta-plugin.basedir}/cache-pro=
ducts/terracotta-2.5.0/conf"/>
-    <pathelement location=3D"${framework.output.dir}"/>
-    <pathelement location=3D"${framework.testoutput.dir}"/>
-    <pathelement location=3D"${terracotta-plugin.output.dir}" />
-  </path>
+   <patternset id=3D"excluded.from.module.terracotta-plugin">
+      <patternset refid=3D"ignored.files"/>
+   </patternset>
 =

+   <patternset id=3D"excluded.from.compilation.terracotta-plugin">
+      <patternset refid=3D"excluded.from.module.terracotta-plugin"/>
+   </patternset>
 =

-  <patternset id=3D"excluded.from.module.terracotta-plugin">
-    <patternset refid=3D"ignored.files"/>
-  </patternset>
+   <path id=3D"terracotta-plugin.module.sourcepath">
+      <dirset dir=3D"${module.terracotta-plugin.basedir}/cache-products/te=
rracotta-2.5.0">
+         <include name=3D"src"/>
+      </dirset>
+   </path>
 =

-  <patternset id=3D"excluded.from.compilation.terracotta-plugin">
-    <patternset refid=3D"excluded.from.module.terracotta-plugin"/>
-  </patternset>
 =

-  <path id=3D"terracotta-plugin.module.sourcepath">
-    <dirset dir=3D"${module.terracotta-plugin.basedir}/cache-products/terr=
acotta-2.5.0">
-      <include name=3D"src"/>
-    </dirset>
-  </path>
+   <target name=3D"compile.module.terracotta-plugin"
+           depends=3D"compile.module.terracotta-plugin.production,compile.=
module.terracotta-plugin.tests"
+           description=3D"Compile module terracotta-2.5.0"/>
 =

+   <target name=3D"compile.module.terracotta-plugin.production" depends=3D=
"compile.module.framework"
+           description=3D"Compile module terracotta-2.5.0; production clas=
ses">
+      <mkdir dir=3D"${terracotta-plugin.output.dir}"/>
+      <javac destdir=3D"${terracotta-plugin.output.dir}" debug=3D"${compil=
er.debug}"
+             nowarn=3D"${compiler.generate.no.warnings}" memorymaximumsize=
=3D"${compiler.max.memory}" fork=3D"true">
+         <compilerarg line=3D"${compiler.args.terracotta-plugin}"/>
+         <bootclasspath refid=3D"terracotta-plugin.module.bootclasspath"/>
+         <classpath refid=3D"terracotta-plugin.module.classpath"/>
+         <src refid=3D"terracotta-plugin.module.sourcepath"/>
+         <patternset refid=3D"excluded.from.compilation.terracotta-plugin"=
/>
+      </javac>
 =

-  <target name=3D"compile.module.terracotta-plugin" depends=3D"compile.mod=
ule.terracotta-plugin.production,compile.module.terracotta-plugin.tests" de=
scription=3D"Compile module terracotta-2.5.0"/>
+      <copy todir=3D"${terracotta-plugin.output.dir}">
+         <fileset dir=3D"${module.terracotta-plugin.basedir}/cache-product=
s/terracotta-2.5.0/src">
+            <patternset refid=3D"compiler.resources"/>
+            <type type=3D"file"/>
+         </fileset>
+      </copy>
+   </target>
 =

-  <target name=3D"compile.module.terracotta-plugin.production" depends=3D"=
compile.module.framework" description=3D"Compile module terracotta-2.5.0; p=
roduction classes">
-    <mkdir dir=3D"${terracotta-plugin.output.dir}"/>
-    <javac destdir=3D"${terracotta-plugin.output.dir}" debug=3D"${compiler=
.debug}" nowarn=3D"${compiler.generate.no.warnings}" memorymaximumsize=3D"$=
{compiler.max.memory}" fork=3D"true">
-      <compilerarg line=3D"${compiler.args.terracotta-plugin}"/>
-      <bootclasspath refid=3D"terracotta-plugin.module.bootclasspath"/>
-      <classpath refid=3D"terracotta-plugin.module.classpath"/>
-      <src refid=3D"terracotta-plugin.module.sourcepath"/>
-      <patternset refid=3D"excluded.from.compilation.terracotta-plugin"/>
-    </javac>
+   <target name=3D"compile.module.terracotta-plugin.tests" depends=3D"comp=
ile.module.terracotta-plugin.production"
+           description=3D"compile module terracotta-2.5.0; test classes" u=
nless=3D"skip.tests"/>
 =

-    <copy todir=3D"${terracotta-plugin.output.dir}">
-      <fileset dir=3D"${module.terracotta-plugin.basedir}/cache-products/t=
erracotta-2.5.0/src">
-        <patternset refid=3D"compiler.resources"/>
-        <type type=3D"file"/>
-      </fileset>
-    </copy>
-  </target>
+   <target name=3D"clean.module.terracotta-plugin" description=3D"cleanup =
module">
+      <delete dir=3D"${terracotta-plugin.output.dir}"/>
+      <delete dir=3D"${terracotta-plugin.testoutput.dir}"/>
+   </target>
 =

-  <target name=3D"compile.module.terracotta-plugin.tests" depends=3D"compi=
le.module.terracotta-plugin.production" description=3D"compile module terra=
cotta-2.5.0; test classes" unless=3D"skip.tests"/>
 =

-  <target name=3D"clean.module.terracotta-plugin" description=3D"cleanup m=
odule">
-    <delete dir=3D"${terracotta-plugin.output.dir}"/>
-    <delete dir=3D"${terracotta-plugin.testoutput.dir}"/>
-  </target>
+   <!-- Module jbosscache-1.4.1 -->
 =

+   <dirname property=3D"module.jbosscache140-plugin.basedir" file=3D"${ant=
.file}"/>
 =

-  <!-- Module jbosscache-1.4.1 -->
-  =

-  <dirname property=3D"module.jbosscache140-plugin.basedir" file=3D"${ant.=
file}"/>
-  =

-  =

-  =

-  <property name=3D"compiler.args.jbosscache140-plugin" value=3D"${compile=
r.args}"/>
-  =

-  <property name=3D"jbosscache140-plugin.output.dir" value=3D"${module.jbo=
sscache140-plugin.basedir}/classes/production/jbosscache-1.4.1"/>
-  <property name=3D"jbosscache140-plugin.testoutput.dir" value=3D"${module=
.jbosscache140-plugin.basedir}/classes/test/jbosscache-1.4.1"/>
-  =

-  <path id=3D"jbosscache140-plugin.module.bootclasspath">
-    <!-- Paths to be included in compilation bootclasspath -->
-  </path>
-  =

-  <path id=3D"jbosscache140-plugin.module.classpath">
-    <fileset dir=3D"${module.jbosscache140-plugin.basedir}/cache-products/=
jbosscache-1.4.1/lib" includes=3D"**/*.jar" />
-    <pathelement location=3D"${framework.output.dir}"/>
-    <pathelement location=3D"${framework.testoutput.dir}"/>
-    <pathelement location=3D"${jbosscache140-plugin.output.dir}" />
-    <pathelement location=3D"${module.jbosscache140-plugin.basedir}/cache-=
products/jbosscache-1.4.1/conf" />
-  </path>
-  =

-  =

-  <patternset id=3D"excluded.from.module.jbosscache140-plugin">
-    <patternset refid=3D"ignored.files"/>
-  </patternset>
-  =

-  <patternset id=3D"excluded.from.compilation.jbosscache140-plugin">
-    <patternset refid=3D"excluded.from.module.jbosscache140-plugin"/>
-  </patternset>
-  =

-  <path id=3D"jbosscache140-plugin.module.sourcepath">
-    <dirset dir=3D"${module.jbosscache140-plugin.basedir}/cache-products/j=
bosscache-1.4.1">
-      <include name=3D"src"/>
-    </dirset>
-  </path>
-  =

-  =

-  <target name=3D"compile.module.jbosscache140-plugin" depends=3D"compile.=
module.jbosscache140-plugin.production,compile.module.jbosscache140-plugin.=
tests" description=3D"Compile module jbosscache-1.4.1"/>
-  =

-  <target name=3D"compile.module.jbosscache140-plugin.production" depends=
=3D"compile.module.framework" description=3D"Compile module jbosscache-1.4.=
1; production classes">
-    <mkdir dir=3D"${jbosscache140-plugin.output.dir}"/>
-    <javac destdir=3D"${jbosscache140-plugin.output.dir}" debug=3D"${compi=
ler.debug}" nowarn=3D"${compiler.generate.no.warnings}" memorymaximumsize=
=3D"${compiler.max.memory}" fork=3D"true">
-      <compilerarg line=3D"${compiler.args.jbosscache140-plugin}"/>
-      <bootclasspath refid=3D"jbosscache140-plugin.module.bootclasspath"/>
-      <classpath refid=3D"jbosscache140-plugin.module.classpath"/>
-      <src refid=3D"jbosscache140-plugin.module.sourcepath"/>
-      <patternset refid=3D"excluded.from.compilation.jbosscache140-plugin"=
/>
-    </javac>
-    =

-    <copy todir=3D"${jbosscache140-plugin.output.dir}">
-      <fileset dir=3D"${module.jbosscache140-plugin.basedir}/cache-product=
s/jbosscache-1.4.1/src">
-        <patternset refid=3D"compiler.resources"/>
-        <type type=3D"file"/>
-      </fileset>
-    </copy>
-  </target>
-  =

-  <target name=3D"compile.module.jbosscache140-plugin.tests" depends=3D"co=
mpile.module.jbosscache140-plugin.production" description=3D"compile module=
 jbosscache-1.4.1; test classes" unless=3D"skip.tests"/>
-  =

-  <!-- Module jbosscache-2.0.0 -->
-  =

-  <dirname property=3D"module.jbosscache200-plugin.basedir" file=3D"${ant.=
file}"/>
-  <dirname property=3D"module.jbosscache210-plugin.basedir" file=3D"${ant.=
file}"/>
 =

-  =

-  =

-  <property name=3D"compiler.args.jbosscache200-plugin" value=3D"${compile=
r.args}"/>
-  =

-  <property name=3D"jbosscache200-plugin.output.dir" value=3D"${module.jbo=
sscache200-plugin.basedir}/classes/production/jbosscache-2.0.0"/>
-  <property name=3D"jbosscache210-plugin.output.dir" value=3D"${module.jbo=
sscache210-plugin.basedir}/classes/production/jbosscache-2.1.0"/>
-  <property name=3D"jbosscache200-plugin.testoutput.dir" value=3D"${module=
.jbosscache200-plugin.basedir}/classes/test/jbosscache-2.0.0"/>
-  =

-  <path id=3D"jbosscache200-plugin.module.bootclasspath">
-    <!-- Paths to be included in compilation bootclasspath -->
-  </path>
-  =

-  <path id=3D"jbosscache200-plugin.module.classpath">
-    <fileset dir=3D"${module.jbosscache200-plugin.basedir}/cache-products/=
jbosscache-2.0.0/lib" includes=3D"*.jar" />
-    <pathelement location=3D"${module.jbosscache200-plugin.basedir}/cache-=
products/jbosscache-2.0.0/conf"/>
-    <pathelement location=3D"${module.framework.basedir}/lib/commons-loggi=
ng.jar"/>
-    <pathelement location=3D"${framework.output.dir}"/>
-    <pathelement location=3D"${framework.testoutput.dir}"/>
-    <pathelement location=3D"${jbosscache200-plugin.output.dir}" />
-  </path>
+   <property name=3D"compiler.args.jbosscache140-plugin" value=3D"${compil=
er.args}"/>
 =

-  <path id=3D"jbosscache210-plugin.module.classpath">
-    <fileset dir=3D"${module.jbosscache210-plugin.basedir}/cache-products/=
jbosscache-2.1.0/lib" includes=3D"*.jar" />
-    <pathelement location=3D"${module.framework.basedir}/lib/commons-loggi=
ng.jar"/>
-    <pathelement location=3D"${framework.output.dir}"/>
-    <pathelement location=3D"${framework.testoutput.dir}"/>
-    <pathelement location=3D"${jbosscache210-plugin.output.dir}" />
-  </path>
-  =

-  =

-  <patternset id=3D"excluded.from.module.jbosscache200-plugin">
-    <patternset refid=3D"ignored.files"/>
-  </patternset>
-  =

-  <patternset id=3D"excluded.from.compilation.jbosscache200-plugin">
-    <patternset refid=3D"excluded.from.module.jbosscache200-plugin"/>
-  </patternset>
-  =

-  <path id=3D"jbosscache200-plugin.module.sourcepath">
-    <dirset dir=3D"${module.jbosscache200-plugin.basedir}/cache-products/j=
bosscache-2.0.0">
-      <include name=3D"src"/>
-    </dirset>
-  </path>
-  =

-  =

-  <target name=3D"compile.module.jbosscache200-plugin" depends=3D"compile.=
module.jbosscache200-plugin.production,compile.module.jbosscache200-plugin.=
tests" description=3D"Compile module jbosscache-2.0.0"/>
+   <property name=3D"jbosscache140-plugin.output.dir"
+             value=3D"${module.jbosscache140-plugin.basedir}/classes/produ=
ction/jbosscache-1.4.1"/>
+   <property name=3D"jbosscache140-plugin.testoutput.dir"
+             value=3D"${module.jbosscache140-plugin.basedir}/classes/test/=
jbosscache-1.4.1"/>
 =

-  <target name=3D"compile.module.jbosscache200-plugin.production" depends=
=3D"compile.module.framework" description=3D"Compile module jbosscache-2.0.=
0; production classes">
-    <mkdir dir=3D"${jbosscache200-plugin.output.dir}"/>
-    <javac destdir=3D"${jbosscache200-plugin.output.dir}" debug=3D"${compi=
ler.debug}" nowarn=3D"${compiler.generate.no.warnings}" memorymaximumsize=
=3D"${compiler.max.memory}" fork=3D"true">
-      <compilerarg line=3D"${compiler.args}"/>
-      <bootclasspath refid=3D"jbosscache200-plugin.module.bootclasspath"/>
-      <classpath refid=3D"jbosscache200-plugin.module.classpath"/>
-      <src refid=3D"jbosscache200-plugin.module.sourcepath"/>
-      <patternset refid=3D"excluded.from.compilation.jbosscache200-plugin"=
/>
-    </javac>
-    =

-    <copy todir=3D"${jbosscache200-plugin.output.dir}">
-      <fileset dir=3D"${module.jbosscache200-plugin.basedir}/cache-product=
s/jbosscache-2.0.0/src">
-        <patternset refid=3D"compiler.resources"/>
-        <type type=3D"file"/>
-      </fileset>
-    </copy>
-  </target>
+   <path id=3D"jbosscache140-plugin.module.bootclasspath">
+      <!-- Paths to be included in compilation bootclasspath -->
+   </path>
 =

-  <target name=3D"compile.module.jbosscache210-plugin.production" depends=
=3D"compile.module.framework" description=3D"Compile module jbosscache-2.1.=
0cr2; production classes">
-    <mkdir dir=3D"${jbosscache210-plugin.output.dir}"/>
-    <javac destdir=3D"${jbosscache210-plugin.output.dir}" debug=3D"${compi=
ler.debug}" nowarn=3D"${compiler.generate.no.warnings}" memorymaximumsize=
=3D"${compiler.max.memory}" fork=3D"true">
-      <compilerarg line=3D"${compiler.args}"/>
-      <classpath refid=3D"jbosscache210-plugin.module.classpath"/>
-      <src path=3D"${module.jbosscache210-plugin.basedir}/cache-products/j=
bosscache-2.1.0"/>
-    </javac>
-  </target>
+   <path id=3D"jbosscache140-plugin.module.classpath">
+      <fileset dir=3D"${module.jbosscache140-plugin.basedir}/cache-product=
s/jbosscache-1.4.1/lib" includes=3D"**/*.jar"/>
+      <pathelement location=3D"${framework.output.dir}"/>
+      <pathelement location=3D"${framework.testoutput.dir}"/>
+      <pathelement location=3D"${jbosscache140-plugin.output.dir}"/>
+      <pathelement location=3D"${module.jbosscache140-plugin.basedir}/cach=
e-products/jbosscache-1.4.1/conf"/>
+   </path>
 =

-  <target name=3D"compile.module.jbosscache200-plugin.tests" depends=3D"co=
mpile.module.jbosscache200-plugin.production" description=3D"compile module=
 jbosscache-2.0.0; test classes" unless=3D"skip.tests"/>
-  =

 =

-  <target name=3D"init" description=3D"Build initialization">
-    <!-- Perform any build initialization in this target -->
-  </target>
-  =

-  <target name=3D"clean" description=3D"cleanup all">
-     <delete dir=3D"${module.framework.basedir}/classes"/>
-  </target>
-  =

-  <target name=3D"all" depends=3D"init, clean, compile.module.framework, c=
ompile.module.jbosscache140-plugin, compile.module.jbosscache200-plugin, co=
mpile.module.jbosscache210-plugin.production, compile.module.terracotta-plu=
gin" description=3D"build all"/>
+   <patternset id=3D"excluded.from.module.jbosscache140-plugin">
+      <patternset refid=3D"ignored.files"/>
+   </patternset>
 =

+   <patternset id=3D"excluded.from.compilation.jbosscache140-plugin">
+      <patternset refid=3D"excluded.from.module.jbosscache140-plugin"/>
+   </patternset>
+
+   <path id=3D"jbosscache140-plugin.module.sourcepath">
+      <dirset dir=3D"${module.jbosscache140-plugin.basedir}/cache-products=
/jbosscache-1.4.1">
+         <include name=3D"src"/>
+      </dirset>
+   </path>
+
+
+   <target name=3D"compile.module.jbosscache140-plugin"
+           depends=3D"compile.module.jbosscache140-plugin.production,compi=
le.module.jbosscache140-plugin.tests"
+           description=3D"Compile module jbosscache-1.4.1"/>
+
+   <target name=3D"compile.module.jbosscache140-plugin.production" depends=
=3D"compile.module.framework"
+           description=3D"Compile module jbosscache-1.4.1; production clas=
ses">
+      <mkdir dir=3D"${jbosscache140-plugin.output.dir}"/>
+      <javac destdir=3D"${jbosscache140-plugin.output.dir}" debug=3D"${com=
piler.debug}"
+             nowarn=3D"${compiler.generate.no.warnings}" memorymaximumsize=
=3D"${compiler.max.memory}" fork=3D"true">
+         <compilerarg line=3D"${compiler.args.jbosscache140-plugin}"/>
+         <bootclasspath refid=3D"jbosscache140-plugin.module.bootclasspath=
"/>
+         <classpath refid=3D"jbosscache140-plugin.module.classpath"/>
+         <src refid=3D"jbosscache140-plugin.module.sourcepath"/>
+         <patternset refid=3D"excluded.from.compilation.jbosscache140-plug=
in"/>
+      </javac>
+
+      <copy todir=3D"${jbosscache140-plugin.output.dir}">
+         <fileset dir=3D"${module.jbosscache140-plugin.basedir}/cache-prod=
ucts/jbosscache-1.4.1/src">
+            <patternset refid=3D"compiler.resources"/>
+            <type type=3D"file"/>
+         </fileset>
+      </copy>
+   </target>
+
+   <target name=3D"compile.module.jbosscache140-plugin.tests" depends=3D"c=
ompile.module.jbosscache140-plugin.production"
+           description=3D"compile module jbosscache-1.4.1; test classes" u=
nless=3D"skip.tests"/>
+
+   <!-- Module jbosscache-2.0.0 -->
+
+   <dirname property=3D"module.jbosscache200-plugin.basedir" file=3D"${ant=
.file}"/>
+   <dirname property=3D"module.jbosscache210-plugin.basedir" file=3D"${ant=
.file}"/>
+
+
+   <property name=3D"compiler.args.jbosscache200-plugin" value=3D"${compil=
er.args}"/>
+
+   <property name=3D"jbosscache200-plugin.output.dir"
+             value=3D"${module.jbosscache200-plugin.basedir}/classes/produ=
ction/jbosscache-2.0.0"/>
+   <property name=3D"jbosscache210-plugin.output.dir"
+             value=3D"${module.jbosscache210-plugin.basedir}/classes/produ=
ction/jbosscache-2.1.0"/>
+   <property name=3D"jbosscache200-plugin.testoutput.dir"
+             value=3D"${module.jbosscache200-plugin.basedir}/classes/test/=
jbosscache-2.0.0"/>
+
+   <path id=3D"jbosscache200-plugin.module.bootclasspath">
+      <!-- Paths to be included in compilation bootclasspath -->
+   </path>
+
+   <path id=3D"jbosscache200-plugin.module.classpath">
+      <fileset dir=3D"${module.jbosscache200-plugin.basedir}/cache-product=
s/jbosscache-2.0.0/lib" includes=3D"*.jar"/>
+      <pathelement location=3D"${module.jbosscache200-plugin.basedir}/cach=
e-products/jbosscache-2.0.0/conf"/>
+      <pathelement location=3D"${module.framework.basedir}/lib/commons-log=
ging.jar"/>
+      <pathelement location=3D"${framework.output.dir}"/>
+      <pathelement location=3D"${framework.testoutput.dir}"/>
+      <pathelement location=3D"${jbosscache200-plugin.output.dir}"/>
+   </path>
+
+   <path id=3D"jbosscache210-plugin.module.classpath">
+      <fileset dir=3D"${module.jbosscache210-plugin.basedir}/cache-product=
s/jbosscache-2.1.0/lib" includes=3D"*.jar"/>
+      <pathelement location=3D"${module.framework.basedir}/lib/commons-log=
ging.jar"/>
+      <pathelement location=3D"${framework.output.dir}"/>
+      <pathelement location=3D"${framework.testoutput.dir}"/>
+      <pathelement location=3D"${jbosscache210-plugin.output.dir}"/>
+   </path>
+
+
+   <patternset id=3D"excluded.from.module.jbosscache200-plugin">
+      <patternset refid=3D"ignored.files"/>
+   </patternset>
+
+   <patternset id=3D"excluded.from.compilation.jbosscache200-plugin">
+      <patternset refid=3D"excluded.from.module.jbosscache200-plugin"/>
+   </patternset>
+
+   <path id=3D"jbosscache200-plugin.module.sourcepath">
+      <dirset dir=3D"${module.jbosscache200-plugin.basedir}/cache-products=
/jbosscache-2.0.0">
+         <include name=3D"src"/>
+      </dirset>
+   </path>
+
+
+   <target name=3D"compile.module.jbosscache200-plugin"
+           depends=3D"compile.module.jbosscache200-plugin.production,compi=
le.module.jbosscache200-plugin.tests"
+           description=3D"Compile module jbosscache-2.0.0"/>
+
+   <target name=3D"compile.module.jbosscache200-plugin.production" depends=
=3D"compile.module.framework"
+           description=3D"Compile module jbosscache-2.0.0; production clas=
ses">
+      <mkdir dir=3D"${jbosscache200-plugin.output.dir}"/>
+      <javac destdir=3D"${jbosscache200-plugin.output.dir}" debug=3D"${com=
piler.debug}"
+             nowarn=3D"${compiler.generate.no.warnings}" memorymaximumsize=
=3D"${compiler.max.memory}" fork=3D"true">
+         <compilerarg line=3D"${compiler.args}"/>
+         <bootclasspath refid=3D"jbosscache200-plugin.module.bootclasspath=
"/>
+         <classpath refid=3D"jbosscache200-plugin.module.classpath"/>
+         <src refid=3D"jbosscache200-plugin.module.sourcepath"/>
+         <patternset refid=3D"excluded.from.compilation.jbosscache200-plug=
in"/>
+      </javac>
+
+      <copy todir=3D"${jbosscache200-plugin.output.dir}">
+         <fileset dir=3D"${module.jbosscache200-plugin.basedir}/cache-prod=
ucts/jbosscache-2.0.0/src">
+            <patternset refid=3D"compiler.resources"/>
+            <type type=3D"file"/>
+         </fileset>
+      </copy>
+   </target>
+
+   <target name=3D"compile.module.jbosscache210-plugin.production" depends=
=3D"compile.module.framework"
+           description=3D"Compile module jbosscache-2.1.0cr2; production c=
lasses">
+      <mkdir dir=3D"${jbosscache210-plugin.output.dir}"/>
+      <javac destdir=3D"${jbosscache210-plugin.output.dir}" debug=3D"${com=
piler.debug}"
+             nowarn=3D"${compiler.generate.no.warnings}" memorymaximumsize=
=3D"${compiler.max.memory}" fork=3D"true">
+         <compilerarg line=3D"${compiler.args}"/>
+         <classpath refid=3D"jbosscache210-plugin.module.classpath"/>
+         <src path=3D"${module.jbosscache210-plugin.basedir}/cache-product=
s/jbosscache-2.1.0"/>
+      </javac>
+   </target>
+
+   <target name=3D"compile.module.jbosscache200-plugin.tests" depends=3D"c=
ompile.module.jbosscache200-plugin.production"
+           description=3D"compile module jbosscache-2.0.0; test classes" u=
nless=3D"skip.tests"/>
+
+
+   <target name=3D"init" description=3D"Build initialization">
+      <!-- Perform any build initialization in this target -->
+   </target>
+
+   <target name=3D"clean" description=3D"cleanup all">
+      <delete dir=3D"${module.framework.basedir}/classes"/>
+   </target>
+
+   <target name=3D"all"
+           depends=3D"init, clean, compile.module.framework, compile.modul=
e.jbosscache140-plugin, compile.module.jbosscache200-plugin, compile.module=
.jbosscache210-plugin.production, compile.module.terracotta-plugin"
+           description=3D"build all"/>
+
    <target name=3D"checkClusterAddresses" depends=3D"compile.module.framew=
ork.production"
            description=3D"Check whether the cluster config is a valid one">
       <java classname=3D"org.cachebench.ClusterConfigurationCheck" clonevm=
=3D"true" fork=3D"true">
@@ -508,7 +541,8 @@
    </target>
 =

    <target name=3D"deploy.sf" depends=3D"compile.module.framework" descrip=
tion=3D"builds the smartfrog jar and deploys it">
-      <rmic classname=3D"org.cachebench.smartfrog.CacheBenchmarkPrim" base=
=3D"${framework.output.dir}" verify=3D"true" debug=3D"true">
+      <rmic classname=3D"org.cachebench.smartfrog.CacheBenchmarkPrim" base=
=3D"${framework.output.dir}" verify=3D"true"
+            debug=3D"true">
          <classpath refid=3D"framework.module.classpath"/>
       </rmic>
       <delete dir=3D"${basedir}/smartfrog/sfClasses"/>


--===============4787767015100898499==--

From jbosscache-commits at lists.jboss.org Wed Jan 30 20:24:21 2008
Content-Type: multipart/mixed; boundary="===============8924590782236199073=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r5270 -
 benchmarks/benchmark-fwk/trunk.
Date: Wed, 30 Jan 2008 20:24:21 -0500
Message-ID: <E1JKOA9-0001Fq-Jb@committer01.frg.pub.inap.atl.jboss.com>

--===============8924590782236199073==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: manik.surtani(a)jboss.com
Date: 2008-01-30 20:24:21 -0500 (Wed, 30 Jan 2008)
New Revision: 5270

Modified:
   benchmarks/benchmark-fwk/trunk/build.xml
Log:
More flexible classpaths


Modified: benchmarks/benchmark-fwk/trunk/build.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- benchmarks/benchmark-fwk/trunk/build.xml	2008-01-31 01:22:26 UTC (rev 5=
269)
+++ benchmarks/benchmark-fwk/trunk/build.xml	2008-01-31 01:24:21 UTC (rev 5=
270)
@@ -55,7 +55,7 @@
    </path>
 =

    <path id=3D"framework.module.classpath">
-      <dirset dir=3D"${module.framework.basedir}/lib" includes=3D"**/*.jar=
"/>
+      <fileset dir=3D"${module.framework.basedir}/lib" includes=3D"**/*.ja=
r"/>
       <pathelement location=3D"${module.framework.basedir}/conf"/>
    </path>
 =



--===============8924590782236199073==--

From jbosscache-commits at lists.jboss.org Wed Jan 30 20:28:41 2008
Content-Type: multipart/mixed; boundary="===============1974503199595542703=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r5271 -
 benchmarks/benchmark-fwk/trunk/src/org/cachebench/reportgenerators.
Date: Wed, 30 Jan 2008 20:28:41 -0500
Message-ID: <E1JKOEL-0002FE-47@committer01.frg.pub.inap.atl.jboss.com>

--===============1974503199595542703==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: manik.surtani(a)jboss.com
Date: 2008-01-30 20:28:40 -0500 (Wed, 30 Jan 2008)
New Revision: 5271

Modified:
   benchmarks/benchmark-fwk/trunk/src/org/cachebench/reportgenerators/Chart=
Generator.java
Log:
User friendly error msgs

Modified: benchmarks/benchmark-fwk/trunk/src/org/cachebench/reportgenerator=
s/ChartGenerator.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- benchmarks/benchmark-fwk/trunk/src/org/cachebench/reportgenerators/Char=
tGenerator.java	2008-01-31 01:24:21 UTC (rev 5270)
+++ benchmarks/benchmark-fwk/trunk/src/org/cachebench/reportgenerators/Char=
tGenerator.java	2008-01-31 01:28:40 UTC (rev 5271)
@@ -33,7 +33,7 @@
 public class ChartGenerator
 {
    static String reportDirectory;
-   static boolean singleChart;
+   static boolean singleChart =3D true;
    DefaultCategoryDataset dataset;
 =

 =

@@ -65,6 +65,12 @@
          return;
       }
 =

+      if (reportDirectory =3D=3D null)
+      {
+         help();
+         return;
+      }
+      if (!singleChart) throw new RuntimeException("Multiple charts not ye=
t implemented");
       new ChartGenerator().generateChart();
    }
 =



--===============1974503199595542703==--

From jbosscache-commits at lists.jboss.org Wed Jan 30 20:31:24 2008
Content-Type: multipart/mixed; boundary="===============2698419140270738758=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r5272 -
 benchmarks/benchmark-fwk/trunk.
Date: Wed, 30 Jan 2008 20:31:23 -0500
Message-ID: <E1JKOGx-0003Cb-UD@committer01.frg.pub.inap.atl.jboss.com>

--===============2698419140270738758==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: manik.surtani(a)jboss.com
Date: 2008-01-30 20:31:23 -0500 (Wed, 30 Jan 2008)
New Revision: 5272

Modified:
   benchmarks/benchmark-fwk/trunk/allJBossCacheTests.sh
   benchmarks/benchmark-fwk/trunk/generateChart.sh
Log:


Modified: benchmarks/benchmark-fwk/trunk/allJBossCacheTests.sh
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- benchmarks/benchmark-fwk/trunk/allJBossCacheTests.sh	2008-01-31 01:28:4=
0 UTC (rev 5271)
+++ benchmarks/benchmark-fwk/trunk/allJBossCacheTests.sh	2008-01-31 01:31:2=
3 UTC (rev 5272)
@@ -1,8 +1,8 @@
 #!/bin/bash
 =

-scaling=3D"2 4 6 8 10"
-#scaling=3D"2 4 6"
-configs=3D"pess-repl-async.xml pess-repl-sync.xml pess-repl-async-br.xml"
+#scaling=3D"2 4 6 8 10"
+scaling=3D"2 4"
+configs=3D"pess-repl-async.xml pess-repl-sync.xml" # pess-repl-async-br.xm=
l"
 products=3D"jbosscache-2.0.0 jbosscache-2.1.0"
 =

 mkdir output
@@ -15,15 +15,15 @@
 		do
 			./cluster.sh start $product $config $size
 =

-			outputFileName=3Ddata_$product_$config_$size.csv
+			outputFileName=3Ddata_${product}_${config}_${size}.csv
 =

 			while [ ! -e $outputFileName ]
 			do
-				echo Waiting for report... =

-				sleep 60
+				echo Waiting for report [ $outputFileName ]
+				sleep 10
 			done
 			sleep 60
-			mv outputFileName output/
+			mv $outputFileName output/
 			sleep 10
 		done
 	done

Modified: benchmarks/benchmark-fwk/trunk/generateChart.sh
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- benchmarks/benchmark-fwk/trunk/generateChart.sh	2008-01-31 01:28:40 UTC=
 (rev 5271)
+++ benchmarks/benchmark-fwk/trunk/generateChart.sh	2008-01-31 01:31:23 UTC=
 (rev 5272)
@@ -1,8 +1,8 @@
 #!/bin/bash
 =

-CP=3D.
+CP=3D.:classes/production/Framework
 =

-for i in lib/*.java
+for i in lib/*.jar
 do
    CP=3D$CP:$i
 done


--===============2698419140270738758==--

From jbosscache-commits at lists.jboss.org Wed Jan 30 20:37:15 2008
Content-Type: multipart/mixed; boundary="===============1437289558073060802=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r5273 -
 benchmarks/benchmark-fwk/trunk/src/org/cachebench/reportgenerators.
Date: Wed, 30 Jan 2008 20:37:15 -0500
Message-ID: <E1JKOMd-0004Es-1g@committer01.frg.pub.inap.atl.jboss.com>

--===============1437289558073060802==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: manik.surtani(a)jboss.com
Date: 2008-01-30 20:37:14 -0500 (Wed, 30 Jan 2008)
New Revision: 5273

Modified:
   benchmarks/benchmark-fwk/trunk/src/org/cachebench/reportgenerators/Chart=
Generator.java
Log:
Deal with header rows in csv output

Modified: benchmarks/benchmark-fwk/trunk/src/org/cachebench/reportgenerator=
s/ChartGenerator.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- benchmarks/benchmark-fwk/trunk/src/org/cachebench/reportgenerators/Char=
tGenerator.java	2008-01-31 01:31:23 UTC (rev 5272)
+++ benchmarks/benchmark-fwk/trunk/src/org/cachebench/reportgenerators/Char=
tGenerator.java	2008-01-31 01:37:14 UTC (rev 5273)
@@ -147,7 +147,14 @@
       strTokenizer.nextToken();
       strTokenizer.nextToken();
       String candidate =3D strTokenizer.nextToken();
-      return Double.parseDouble(candidate);
+      try
+      {
+         return Double.parseDouble(candidate);
+      }
+      catch (NumberFormatException nfe)
+      {
+         return -1;
+      }
    }
 =

 }


--===============1437289558073060802==--

From jbosscache-commits at lists.jboss.org Wed Jan 30 20:39:17 2008
Content-Type: multipart/mixed; boundary="===============4048046293371957296=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r5274 -
 benchmarks/benchmark-fwk/trunk.
Date: Wed, 30 Jan 2008 20:39:17 -0500
Message-ID: <E1JKOOb-0004GR-5F@committer01.frg.pub.inap.atl.jboss.com>

--===============4048046293371957296==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: manik.surtani(a)jboss.com
Date: 2008-01-30 20:39:17 -0500 (Wed, 30 Jan 2008)
New Revision: 5274

Modified:
   benchmarks/benchmark-fwk/trunk/allJBossCacheTests.sh
Log:


Modified: benchmarks/benchmark-fwk/trunk/allJBossCacheTests.sh
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- benchmarks/benchmark-fwk/trunk/allJBossCacheTests.sh	2008-01-31 01:37:1=
4 UTC (rev 5273)
+++ benchmarks/benchmark-fwk/trunk/allJBossCacheTests.sh	2008-01-31 01:39:1=
7 UTC (rev 5274)
@@ -16,15 +16,13 @@
 			./cluster.sh start $product $config $size
 =

 			outputFileName=3Ddata_${product}_${config}_${size}.csv
-
 			while [ ! -e $outputFileName ]
 			do
-				echo Waiting for report [ $outputFileName ]
-				sleep 10
+				echo "Waiting for report [ $outputFileName ]"
+				sleep 5
 			done
 			sleep 60
 			mv $outputFileName output/
-			sleep 10
 		done
 	done
 done


--===============4048046293371957296==--

From jbosscache-commits at lists.jboss.org Wed Jan 30 20:57:27 2008
Content-Type: multipart/mixed; boundary="===============6536820380140983381=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r5275 - in
 benchmarks/benchmark-fwk/trunk: src/org/cachebench/reportgenerators and 1
 other directory.
Date: Wed, 30 Jan 2008 20:53:26 -0500
Message-ID: <E1JKOcI-0007Hu-Ur@committer01.frg.pub.inap.atl.jboss.com>

--===============6536820380140983381==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: manik.surtani(a)jboss.com
Date: 2008-01-30 20:53:26 -0500 (Wed, 30 Jan 2008)
New Revision: 5275

Modified:
   benchmarks/benchmark-fwk/trunk/allJBossCacheTests.sh
   benchmarks/benchmark-fwk/trunk/src/org/cachebench/reportgenerators/Chart=
Generator.java
Log:
User friendly output

Modified: benchmarks/benchmark-fwk/trunk/allJBossCacheTests.sh
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- benchmarks/benchmark-fwk/trunk/allJBossCacheTests.sh	2008-01-31 01:39:1=
7 UTC (rev 5274)
+++ benchmarks/benchmark-fwk/trunk/allJBossCacheTests.sh	2008-01-31 01:53:2=
6 UTC (rev 5275)
@@ -1,8 +1,9 @@
 #!/bin/bash
 =

+scaling=3D"2 4 6 8"
 #scaling=3D"2 4 6 8 10"
-scaling=3D"2 4"
-configs=3D"pess-repl-async.xml pess-repl-sync.xml" # pess-repl-async-br.xm=
l"
+#scaling=3D"2 4"
+configs=3D"pess-repl-async.xml pess-repl-sync.xml pess-repl-async-br.xml"
 products=3D"jbosscache-2.0.0 jbosscache-2.1.0"
 =

 mkdir output
@@ -26,3 +27,8 @@
 		done
 	done
 done
+
+
+echo Generating charts ... =

+
+./generateChart -reportDir output

Modified: benchmarks/benchmark-fwk/trunk/src/org/cachebench/reportgenerator=
s/ChartGenerator.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- benchmarks/benchmark-fwk/trunk/src/org/cachebench/reportgenerators/Char=
tGenerator.java	2008-01-31 01:39:17 UTC (rev 5274)
+++ benchmarks/benchmark-fwk/trunk/src/org/cachebench/reportgenerators/Char=
tGenerator.java	2008-01-31 01:53:26 UTC (rev 5275)
@@ -5,6 +5,7 @@
 import org.jfree.chart.ChartUtilities;
 import org.jfree.chart.JFreeChart;
 import org.jfree.chart.plot.PlotOrientation;
+import org.jfree.chart.title.DateTitle;
 import org.jfree.data.category.DefaultCategoryDataset;
 =

 import java.io.BufferedReader;
@@ -12,8 +13,6 @@
 import java.io.FileReader;
 import java.io.FilenameFilter;
 import java.io.IOException;
-import java.util.Collections;
-import java.util.Date;
 import java.util.StringTokenizer;
 =

 /**
@@ -35,6 +34,7 @@
    static String reportDirectory;
    static boolean singleChart =3D true;
    DefaultCategoryDataset dataset;
+   static String chartName =3D "chart.png";
 =

 =

    private static void help()
@@ -45,6 +45,7 @@
 =

    public static void main(String[] args) throws IOException
    {
+      long startTime =3D System.currentTimeMillis();
       System.out.println("Welcome to the ChartGenerator.");
       // the params we expect:
       for (int i =3D 0; i < args.length; i++)
@@ -72,16 +73,25 @@
       }
       if (!singleChart) throw new RuntimeException("Multiple charts not ye=
t implemented");
       new ChartGenerator().generateChart();
+
+      System.out.println("Finished in " + ((System.currentTimeMillis() - s=
tartTime) / 1000) + " seconds! Chart saved as " + chartName);
    }
 =

    private void generateChart() throws IOException
    {
       readData();
       JFreeChart chart =3D ChartFactory.createLineChart("CacheBenchFwk Rep=
ort", "Cluster size", "Throughput (reqs/sec)",
-            dataset, PlotOrientation.HORIZONTAL, true, false, false);
+            dataset, PlotOrientation.VERTICAL, true, false, false);
+      chart.addSubtitle(new DateTitle());
 =

-      chart.setSubtitles(Collections.singletonList("" + new Date()));
-      ChartUtilities.saveChartAsPNG(new File("chart.png"), chart, 600, 800=
);
+      File chartFile =3D new File(chartName);
+      if (chartFile.exists())
+      {
+         chartFile.renameTo(new File(chartName + "." + System.currentTimeM=
illis()));
+         chartFile =3D new File(chartName);
+      }
+
+      ChartUtilities.saveChartAsPNG(chartFile, chart, 600, 800);
    }
 =

    private void readData() throws IOException


--===============6536820380140983381==--

From jbosscache-commits at lists.jboss.org Wed Jan 30 21:25:21 2008
Content-Type: multipart/mixed; boundary="===============6930364040651037368=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r5276 -
 benchmarks/benchmark-fwk/trunk/src/org/cachebench/reportgenerators.
Date: Wed, 30 Jan 2008 21:21:20 -0500
Message-ID: <E1JKP3I-00052N-RE@committer01.frg.pub.inap.atl.jboss.com>

--===============6930364040651037368==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: manik.surtani(a)jboss.com
Date: 2008-01-30 21:21:20 -0500 (Wed, 30 Jan 2008)
New Revision: 5276

Modified:
   benchmarks/benchmark-fwk/trunk/src/org/cachebench/reportgenerators/Chart=
Generator.java
Log:
better graphs

Modified: benchmarks/benchmark-fwk/trunk/src/org/cachebench/reportgenerator=
s/ChartGenerator.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- benchmarks/benchmark-fwk/trunk/src/org/cachebench/reportgenerators/Char=
tGenerator.java	2008-01-31 01:53:26 UTC (rev 5275)
+++ benchmarks/benchmark-fwk/trunk/src/org/cachebench/reportgenerators/Char=
tGenerator.java	2008-01-31 02:21:20 UTC (rev 5276)
@@ -5,14 +5,17 @@
 import org.jfree.chart.ChartUtilities;
 import org.jfree.chart.JFreeChart;
 import org.jfree.chart.plot.PlotOrientation;
-import org.jfree.chart.title.DateTitle;
+import org.jfree.chart.title.TextTitle;
+import org.jfree.data.category.CategoryDataset;
 import org.jfree.data.category.DefaultCategoryDataset;
 =

+import java.awt.*;
 import java.io.BufferedReader;
 import java.io.File;
 import java.io.FileReader;
 import java.io.FilenameFilter;
 import java.io.IOException;
+import java.util.Date;
 import java.util.StringTokenizer;
 =

 /**
@@ -33,8 +36,8 @@
 {
    static String reportDirectory;
    static boolean singleChart =3D true;
-   DefaultCategoryDataset dataset;
-   static String chartName =3D "chart.png";
+   DefaultCategoryDataset averageThroughput, totalThroughput;
+   static String chartNameAverage =3D "chart-averageThroughput.png", chart=
NameTotal =3D "chart-totalThroughput.png";
 =

 =

    private static void help()
@@ -74,26 +77,43 @@
       if (!singleChart) throw new RuntimeException("Multiple charts not ye=
t implemented");
       new ChartGenerator().generateChart();
 =

-      System.out.println("Finished in " + ((System.currentTimeMillis() - s=
tartTime) / 1000) + " seconds! Chart saved as " + chartName);
+      System.out.println("Finished in " + ((System.currentTimeMillis() - s=
tartTime) / 1000) + " seconds! Charts saved as " + chartNameAverage + " and=
 " + chartNameTotal);
    }
 =

    private void generateChart() throws IOException
    {
       readData();
-      JFreeChart chart =3D ChartFactory.createLineChart("CacheBenchFwk Rep=
ort", "Cluster size", "Throughput (reqs/sec)",
-            dataset, PlotOrientation.VERTICAL, true, false, false);
-      chart.addSubtitle(new DateTitle());
 =

-      File chartFile =3D new File(chartName);
+      File chartFile =3D new File(chartNameAverage);
       if (chartFile.exists())
       {
-         chartFile.renameTo(new File(chartName + "." + System.currentTimeM=
illis()));
-         chartFile =3D new File(chartName);
+         chartFile.renameTo(new File(chartNameAverage + "." + System.curre=
ntTimeMillis()));
+         chartFile =3D new File(chartNameAverage);
       }
 =

-      ChartUtilities.saveChartAsPNG(chartFile, chart, 600, 800);
+      ChartUtilities.saveChartAsPNG(chartFile, createChart(averageThroughp=
ut, "Report: Average throughput per cache instance", "Throughput per cache =
instance (reqs/sec)"), 1024, 768);
+
+      chartFile =3D new File(chartNameTotal);
+      if (chartFile.exists())
+      {
+         chartFile.renameTo(new File(chartNameTotal + "." + System.current=
TimeMillis()));
+         chartFile =3D new File(chartNameTotal);
+      }
+
+      ChartUtilities.saveChartAsPNG(chartFile, createChart(totalThroughput=
, "Report: Total throughput for cluster", "Overall throughput (reqs/sec)"),=
 1024, 768);
    }
 =

+   private JFreeChart createChart(CategoryDataset data, String title, Stri=
ng yLabel)
+   {
+      JFreeChart chart =3D ChartFactory.createLineChart(title, "Cluster si=
ze (number of cache instances)", yLabel, data, PlotOrientation.VERTICAL, tr=
ue, false, false);
+      chart.addSubtitle(new TextTitle("Generated on " + new Date() + " by =
The CacheBenchFwk"));
+      chart.setBorderVisible(true);
+      chart.setAntiAlias(true);
+      chart.setTextAntiAlias(true);
+      chart.setBackgroundPaint(new Color(0x61, 0x9e, 0xa1));
+      return chart;
+   }
+
    private void readData() throws IOException
    {
       File file =3D new File(reportDirectory);
@@ -108,7 +128,8 @@
          }
       });
 =

-      dataset =3D new DefaultCategoryDataset();
+      averageThroughput =3D new DefaultCategoryDataset();
+      totalThroughput =3D new DefaultCategoryDataset();
       for (File f : files)
       {
          readData(f);
@@ -144,7 +165,8 @@
          if (throughput !=3D -1) stats.addValue(throughput);
       }
 =

-      dataset.addValue(stats.getMean(), productNameAndConfiguration, clust=
erSize);
+      averageThroughput.addValue(stats.getMean(), productNameAndConfigurat=
ion, clusterSize);
+      totalThroughput.addValue(stats.getSum(), productNameAndConfiguration=
, clusterSize);
    }
 =

    private double getThroughput(String line)


--===============6930364040651037368==--

From jbosscache-commits at lists.jboss.org Wed Jan 30 21:33:46 2008
Content-Type: multipart/mixed; boundary="===============5974265288938218252=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r5277 -
 benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.0.0/conf.
Date: Wed, 30 Jan 2008 21:29:46 -0500
Message-ID: <E1JKPBS-0006KG-H6@committer01.frg.pub.inap.atl.jboss.com>

--===============5974265288938218252==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: manik.surtani(a)jboss.com
Date: 2008-01-30 21:29:46 -0500 (Wed, 30 Jan 2008)
New Revision: 5277

Removed:
   benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.0.0/conf/opt-=
repl-async.xml
   benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.0.0/conf/opt-=
repl-sync.xml
   benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.0.0/conf/pess=
-repl-sync-br.xml
Log:
removed noise

Deleted: benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.0.0/con=
f/opt-repl-async.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.0.0/conf/opt=
-repl-async.xml	2008-01-31 02:21:20 UTC (rev 5276)
+++ benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.0.0/conf/opt=
-repl-async.xml	2008-01-31 02:29:46 UTC (rev 5277)
@@ -1,81 +0,0 @@
-<?xml version=3D"1.0" encoding=3D"UTF-8"?>
-
-<server>
-
-   <classpath codebase=3D"./lib" archives=3D"jboss-cache.jar, jgroups.jar"=
/>
-
-
-   <mbean code=3D"org.jboss.cache.CacheImpl"
-          name=3D"jboss.cache:service=3DTreeCache">
-
-      <depends>jboss:service=3DNaming</depends>
-      <depends>jboss:service=3DTransactionManager</depends>
-
-      <attribute name=3D"TransactionManagerLookupClass">org.jboss.cache.tr=
ansaction.GenericTransactionManagerLookup</attribute>
-      <attribute name=3D"NodeLockingScheme">OPTIMISTIC</attribute>
-      <attribute name=3D"CacheMode">REPL_ASYNC</attribute>
-      <attribute name=3D"UseReplQueue">false</attribute>
-      <attribute name=3D"ReplQueueInterval">0</attribute>
-      <attribute name=3D"ReplQueueMaxElements">0</attribute>
-      <attribute name=3D"ClusterName">JBossCache-Cluster</attribute>
-      <attribute name=3D"ClusterConfig">
-         <config>
-            <UDP mcast_addr=3D"229.10.10.10"
-                 mcast_port=3D"45599"
-                 tos=3D"8"
-                 ucast_recv_buf_size=3D"20000000"
-                 ucast_send_buf_size=3D"640000"
-                 mcast_recv_buf_size=3D"25000000"
-                 mcast_send_buf_size=3D"640000"
-                 loopback=3D"false"
-                 discard_incompatible_packets=3D"true"
-                 max_bundle_size=3D"64000"
-                 max_bundle_timeout=3D"30"
-                 use_incoming_packet_handler=3D"true"
-                 use_outgoing_packet_handler=3D"false"
-                 ip_ttl=3D"2"
-                 down_thread=3D"false" up_thread=3D"false"
-                 enable_bundling=3D"false"/>
-            <PING timeout=3D"2000"
-                  down_thread=3D"false" up_thread=3D"false" num_initial_me=
mbers=3D"3"/>
-            <MERGE2 max_interval=3D"100000"
-                    down_thread=3D"false" up_thread=3D"false" min_interval=
=3D"20000"/>
-            <FD_SOCK down_thread=3D"false" up_thread=3D"false"/>
-            <FD timeout=3D"10000" max_tries=3D"5" down_thread=3D"false" up=
_thread=3D"false" shun=3D"true"/>
-            <VERIFY_SUSPECT timeout=3D"1500" down_thread=3D"false" up_thre=
ad=3D"false"/>
-            <pbcast.NAKACK max_xmit_size=3D"60000"
-                           use_mcast_xmit=3D"false" gc_lag=3D"0"
-                           retransmit_timeout=3D"300,600,1200,2400,4800"
-                           down_thread=3D"false" up_thread=3D"false"
-                           discard_delivered_msgs=3D"true"/>
-            <UNICAST timeout=3D"300,600,1200,2400,3600"
-                     down_thread=3D"false" up_thread=3D"false"/>
-            <pbcast.STABLE stability_delay=3D"1000" desired_avg_gossip=3D"=
50000"
-                           down_thread=3D"false" up_thread=3D"false"
-                           max_bytes=3D"400000"/>
-            <pbcast.GMS print_local_addr=3D"true" join_timeout=3D"3000" us=
e_flush=3D"true" flush_timeout=3D"3000"
-                        down_thread=3D"false" up_thread=3D"false"
-                        join_retry_timeout=3D"2000" shun=3D"false"
-                        view_bundling=3D"true"/>
-            <FC max_credits=3D"2000000" down_thread=3D"false" up_thread=3D=
"false"
-                min_threshold=3D"0.20"/>
-            <FRAG2 frag_size=3D"60000" down_thread=3D"false" up_thread=3D"=
false"/>
-            <!-- <pbcast.STREAMING_STATE_TRANSFER down_thread=3D"false" up=
_thread=3D"false"
-                                         use_flush=3D"true" flush_timeout=
=3D"3000" use_reading_thread=3D"true"/> -->
-            <pbcast.STATE_TRANSFER down_thread=3D"false" up_thread=3D"fals=
e" use_flush=3D"true" flush_timeout=3D"3000"/>
-            <pbcast.FLUSH down_thread=3D"false" up_thread=3D"false" timeou=
t=3D"8000" auto_flush_conf=3D"false"/>
-         </config>
-      </attribute>
-      <attribute name=3D"FetchInMemoryState">true</attribute>
-      <attribute name=3D"InitialStateRetrievalTimeout">15000</attribute>
-      <attribute name=3D"SyncReplTimeout">60000</attribute>
-      <attribute name=3D"LockAcquisitionTimeout">10000</attribute>
-      <attribute name=3D"EvictionPolicyConfig">
-      </attribute>
-    =

-      <attribute name=3D"CacheLoaderConfiguration">
-      </attribute>
-
-      <attribute name=3D"UseRegionBasedMarshalling">false</attribute>
-   </mbean>
-</server>

Deleted: benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.0.0/con=
f/opt-repl-sync.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.0.0/conf/opt=
-repl-sync.xml	2008-01-31 02:21:20 UTC (rev 5276)
+++ benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.0.0/conf/opt=
-repl-sync.xml	2008-01-31 02:29:46 UTC (rev 5277)
@@ -1,81 +0,0 @@
-<?xml version=3D"1.0" encoding=3D"UTF-8"?>
-
-<server>
-
-   <classpath codebase=3D"./lib" archives=3D"jboss-cache.jar, jgroups.jar"=
/>
-
-
-   <mbean code=3D"org.jboss.cache.CacheImpl"
-          name=3D"jboss.cache:service=3DTreeCache">
-
-      <depends>jboss:service=3DNaming</depends>
-      <depends>jboss:service=3DTransactionManager</depends>
-
-      <attribute name=3D"TransactionManagerLookupClass">org.jboss.cache.tr=
ansaction.GenericTransactionManagerLookup</attribute>
-      <attribute name=3D"NodeLockingScheme">PESSIMISTIC</attribute>
-      <attribute name=3D"CacheMode">REPL_SYNC</attribute>
-      <attribute name=3D"UseReplQueue">false</attribute>
-      <attribute name=3D"ReplQueueInterval">0</attribute>
-      <attribute name=3D"ReplQueueMaxElements">0</attribute>
-      <attribute name=3D"ClusterName">JBossCache-Cluster</attribute>
-      <attribute name=3D"ClusterConfig">
-         <config>
-            <UDP mcast_addr=3D"229.10.10.10"
-                 mcast_port=3D"45599"
-                 tos=3D"8"
-                 ucast_recv_buf_size=3D"20000000"
-                 ucast_send_buf_size=3D"640000"
-                 mcast_recv_buf_size=3D"25000000"
-                 mcast_send_buf_size=3D"640000"
-                 loopback=3D"false"
-                 discard_incompatible_packets=3D"true"
-                 max_bundle_size=3D"64000"
-                 max_bundle_timeout=3D"30"
-                 use_incoming_packet_handler=3D"true"
-                 use_outgoing_packet_handler=3D"false"
-                 ip_ttl=3D"2"
-                 down_thread=3D"false" up_thread=3D"false"
-                 enable_bundling=3D"false"/>
-            <PING timeout=3D"2000"
-                  down_thread=3D"false" up_thread=3D"false" num_initial_me=
mbers=3D"3"/>
-            <MERGE2 max_interval=3D"100000"
-                    down_thread=3D"false" up_thread=3D"false" min_interval=
=3D"20000"/>
-            <FD_SOCK down_thread=3D"false" up_thread=3D"false"/>
-            <FD timeout=3D"10000" max_tries=3D"5" down_thread=3D"false" up=
_thread=3D"false" shun=3D"true"/>
-            <VERIFY_SUSPECT timeout=3D"1500" down_thread=3D"false" up_thre=
ad=3D"false"/>
-            <pbcast.NAKACK max_xmit_size=3D"60000"
-                           use_mcast_xmit=3D"false" gc_lag=3D"0"
-                           retransmit_timeout=3D"300,600,1200,2400,4800"
-                           down_thread=3D"false" up_thread=3D"false"
-                           discard_delivered_msgs=3D"true"/>
-            <UNICAST timeout=3D"300,600,1200,2400,3600"
-                     down_thread=3D"false" up_thread=3D"false"/>
-            <pbcast.STABLE stability_delay=3D"1000" desired_avg_gossip=3D"=
50000"
-                           down_thread=3D"false" up_thread=3D"false"
-                           max_bytes=3D"400000"/>
-            <pbcast.GMS print_local_addr=3D"true" join_timeout=3D"3000" us=
e_flush=3D"true" flush_timeout=3D"3000"
-                        down_thread=3D"false" up_thread=3D"false"
-                        join_retry_timeout=3D"2000" shun=3D"false"
-                        view_bundling=3D"true"/>
-            <FC max_credits=3D"2000000" down_thread=3D"false" up_thread=3D=
"false"
-                min_threshold=3D"0.20"/>
-            <FRAG2 frag_size=3D"60000" down_thread=3D"false" up_thread=3D"=
false"/>
-            <!-- <pbcast.STREAMING_STATE_TRANSFER down_thread=3D"false" up=
_thread=3D"false"
-                                         use_flush=3D"true" flush_timeout=
=3D"3000" use_reading_thread=3D"true"/> -->
-            <pbcast.STATE_TRANSFER down_thread=3D"false" up_thread=3D"fals=
e" use_flush=3D"true" flush_timeout=3D"3000"/>
-            <pbcast.FLUSH down_thread=3D"false" up_thread=3D"false" timeou=
t=3D"8000" auto_flush_conf=3D"false"/>
-         </config>
-      </attribute>
-      <attribute name=3D"FetchInMemoryState">true</attribute>
-      <attribute name=3D"InitialStateRetrievalTimeout">15000</attribute>
-      <attribute name=3D"SyncReplTimeout">60000</attribute>
-      <attribute name=3D"LockAcquisitionTimeout">10000</attribute>
-      <attribute name=3D"EvictionPolicyConfig">
-      </attribute>    =

-
-      <attribute name=3D"CacheLoaderConfiguration">
-      </attribute>
-
-      <attribute name=3D"UseRegionBasedMarshalling">false</attribute>
-   </mbean>
-</server>

Deleted: benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.0.0/con=
f/pess-repl-sync-br.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.0.0/conf/pes=
s-repl-sync-br.xml	2008-01-31 02:21:20 UTC (rev 5276)
+++ benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.0.0/conf/pes=
s-repl-sync-br.xml	2008-01-31 02:29:46 UTC (rev 5277)
@@ -1,117 +0,0 @@
-<?xml version=3D"1.0" encoding=3D"UTF-8"?>
-
-<server>
-
-   <classpath codebase=3D"./lib" archives=3D"jboss-cache.jar, jgroups.jar"=
/>
-
-
-   <mbean code=3D"org.jboss.cache.CacheImpl"
-          name=3D"jboss.cache:service=3DTreeCache">
-
-      <depends>jboss:service=3DNaming</depends>
-      <depends>jboss:service=3DTransactionManager</depends>
-
-      <attribute name=3D"TransactionManagerLookupClass">org.jboss.cache.tr=
ansaction.GenericTransactionManagerLookup</attribute>
-      <attribute name=3D"IsolationLevel">READ_COMMITTED</attribute>
-      <attribute name=3D"CacheMode">REPL_SYNC</attribute>
-      <attribute name=3D"UseReplQueue">false</attribute>
-      <attribute name=3D"ReplQueueInterval">0</attribute>
-      <attribute name=3D"ReplQueueMaxElements">0</attribute>
-      <attribute name=3D"ClusterName">JBossCache-Cluster</attribute>
-      <attribute name=3D"ClusterConfig">
-         <config>
-            <UDP mcast_addr=3D"228.10.10.10"
-                 mcast_port=3D"45588"
-                 tos=3D"8"
-                 ucast_recv_buf_size=3D"20000000"
-                 ucast_send_buf_size=3D"640000"
-                 mcast_recv_buf_size=3D"25000000"
-                 mcast_send_buf_size=3D"640000"
-                 loopback=3D"false"
-                 discard_incompatible_packets=3D"true"
-                 max_bundle_size=3D"64000"
-                 max_bundle_timeout=3D"30"
-                 use_incoming_packet_handler=3D"true"
-                 ip_ttl=3D"2"
-                 enable_bundling=3D"false"
-                 enable_diagnostics=3D"true"
-
-                 use_concurrent_stack=3D"true"
-
-                 thread_naming_pattern=3D"pl"
-
-                 thread_pool.enabled=3D"true"
-                 thread_pool.min_threads=3D"1"
-                 thread_pool.max_threads=3D"25"
-                 thread_pool.keep_alive_time=3D"30000"
-                 thread_pool.queue_enabled=3D"true"
-                 thread_pool.queue_max_size=3D"10"
-                 thread_pool.rejection_policy=3D"Run"
-
-                 oob_thread_pool.enabled=3D"true"
-                 oob_thread_pool.min_threads=3D"1"
-                 oob_thread_pool.max_threads=3D"4"
-                 oob_thread_pool.keep_alive_time=3D"10000"
-                 oob_thread_pool.queue_enabled=3D"true"
-                 oob_thread_pool.queue_max_size=3D"10"
-                 oob_thread_pool.rejection_policy=3D"Run"/>
-
-            <PING timeout=3D"2000" num_initial_members=3D"3"/>
-            <MERGE2 max_interval=3D"30000" min_interval=3D"10000"/>
-            <FD_SOCK/>
-            <FD timeout=3D"1000" max_tries=3D"2" shun=3D"true"/>
-            <VERIFY_SUSPECT timeout=3D"1500"/>
-            <pbcast.NAKACK max_xmit_size=3D"60000"
-                           use_mcast_xmit=3D"false" gc_lag=3D"0"
-                           retransmit_timeout=3D"300,600,1200,2400,4800"
-                           discard_delivered_msgs=3D"true"/>
-            <UNICAST timeout=3D"300,600,1200,2400,3600"/>
-            <pbcast.STABLE stability_delay=3D"1000" desired_avg_gossip=3D"=
50000"
-                           max_bytes=3D"400000"/>
-            <pbcast.GMS print_local_addr=3D"true" join_timeout=3D"5000"
-                        join_retry_timeout=3D"2000" shun=3D"false"
-                        view_bundling=3D"true" view_ack_collection_timeout=
=3D"5000"/>
-            <FRAG2 frag_size=3D"60000"/>
-            <pbcast.STREAMING_STATE_TRANSFER use_reading_thread=3D"true"/>
-            <!-- <pbcast.STATE_TRANSFER/> -->
-            <pbcast.FLUSH timeout=3D"0"/>
-         </config>
-      </attribute>
-      <attribute name=3D"FetchInMemoryState">true</attribute>
-      <attribute name=3D"InitialStateRetrievalTimeout">15000</attribute>
-      <attribute name=3D"SyncReplTimeout">60000</attribute>
-      <attribute name=3D"LockAcquisitionTimeout">10000</attribute>
-      <attribute name=3D"EvictionPolicyConfig">
-      </attribute>
-
-      <attribute name=3D"CacheLoaderConfiguration">
-      </attribute>
-
-      <attribute name=3D"UseRegionBasedMarshalling">false</attribute>
-
-      <!-- Buddy Replication config -->
-      <attribute name=3D"BuddyReplicationConfig">
-         <config>
-            <buddyReplicationEnabled>true</buddyReplicationEnabled>
-            <buddyLocatorClass>org.jboss.cache.buddyreplication.NextMember=
BuddyLocator</buddyLocatorClass>
-            <buddyLocatorProperties>
-               numBuddies =3D 1
-               ignoreColocatedBuddies =3D true
-            </buddyLocatorProperties>
-
-            <buddyPoolName>myBuddyPoolReplicationGroup</buddyPoolName>
-
-            <buddyCommunicationTimeout>2000</buddyCommunicationTimeout>
-
-
-            <autoDataGravitation>false</autoDataGravitation>
-
-            <dataGravitationRemoveOnFind>true</dataGravitationRemoveOnFind>
-
-            <dataGravitationSearchBackupTrees>true</dataGravitationSearchB=
ackupTrees>
-
-         </config>
-      </attribute>
-
-   </mbean>
-</server>


--===============5974265288938218252==--

From jbosscache-commits at lists.jboss.org Wed Jan 30 21:40:51 2008
Content-Type: multipart/mixed; boundary="===============1361986718759694494=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r5278 - in
 benchmarks/benchmark-fwk/trunk/cache-products: jbosscache-2.1.0/conf and 1
 other directory.
Date: Wed, 30 Jan 2008 21:36:50 -0500
Message-ID: <E1JKPII-0008By-VQ@committer01.frg.pub.inap.atl.jboss.com>

--===============1361986718759694494==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: manik.surtani(a)jboss.com
Date: 2008-01-30 21:36:50 -0500 (Wed, 30 Jan 2008)
New Revision: 5278

Modified:
   benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.0.0/conf/pess=
-repl-async-br.xml
   benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.0.0/conf/pess=
-repl-async.xml
   benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.0.0/conf/pess=
-repl-sync.xml
   benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.1.0/conf/pess=
-repl-async-br.xml
   benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.1.0/conf/pess=
-repl-async.xml
   benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.1.0/conf/pess=
-repl-sync.xml
Log:
Updated cfgs

Modified: benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.0.0/co=
nf/pess-repl-async-br.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.0.0/conf/pes=
s-repl-async-br.xml	2008-01-31 02:29:46 UTC (rev 5277)
+++ benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.0.0/conf/pes=
s-repl-async-br.xml	2008-01-31 02:36:50 UTC (rev 5278)
@@ -11,7 +11,8 @@
       <depends>jboss:service=3DNaming</depends>
       <depends>jboss:service=3DTransactionManager</depends>
 =

-      <attribute name=3D"TransactionManagerLookupClass">org.jboss.cache.tr=
ansaction.GenericTransactionManagerLookup</attribute>
+      <attribute name=3D"TransactionManagerLookupClass">org.jboss.cache.tr=
ansaction.GenericTransactionManagerLookup
+      </attribute>
       <attribute name=3D"IsolationLevel">REPEATABLE_READ</attribute>
       <attribute name=3D"CacheMode">REPL_ASYNC</attribute>
       <attribute name=3D"UseReplQueue">false</attribute>
@@ -20,59 +21,58 @@
       <attribute name=3D"ClusterName">JBossCache-Cluster</attribute>
       <attribute name=3D"ClusterConfig">
          <config>
-              <TCP start_port=3D"7580"
-         loopback=3D"false"
-         discard_incompatible_packets=3D"true"
-         max_bundle_size=3D"64000"
-         max_bundle_timeout=3D"30"
-         use_incoming_packet_handler=3D"true"
-         enable_bundling=3D"true"
-         enable_diagnostics=3D"true"
-         thread_naming_pattern=3D"cl"
+            <TCP start_port=3D"7580"
+                 loopback=3D"false"
+                 discard_incompatible_packets=3D"true"
+                 max_bundle_size=3D"64000"
+                 max_bundle_timeout=3D"30"
+                 use_incoming_packet_handler=3D"true"
+                 enable_bundling=3D"true"
+                 enable_diagnostics=3D"true"
+                 thread_naming_pattern=3D"cl"
+                 use_concurrent_stack=3D"true"
 =

-         use_concurrent_stack=3D"true"
+                 recv_buf_size=3D"20000000"
+                 send_buf_size=3D"20000000"
 =

-	 recv_buf_size=3D"20000000"
-	 send_buf_size=3D"20000000"
+                 thread_pool.enabled=3D"true"
+                 thread_pool.min_threads=3D"2"
+                 thread_pool.max_threads=3D"4"
+                 thread_pool.keep_alive_time=3D"5000"
+                 thread_pool.queue_enabled=3D"true"
+                 thread_pool.queue_max_size=3D"100000"
+                 thread_pool.rejection_policy=3D"discard"
 =

-         thread_pool.enabled=3D"true"
-         thread_pool.min_threads=3D"2"
-         thread_pool.max_threads=3D"4"
-         thread_pool.keep_alive_time=3D"5000"
-         thread_pool.queue_enabled=3D"true"
-         thread_pool.queue_max_size=3D"100000"
-         thread_pool.rejection_policy=3D"discard"
+                 oob_thread_pool.enabled=3D"true"
+                 oob_thread_pool.min_threads=3D"4"
+                 oob_thread_pool.max_threads=3D"8"
+                 oob_thread_pool.keep_alive_time=3D"5000"
+                 oob_thread_pool.queue_enabled=3D"false"
+                 oob_thread_pool.queue_max_size=3D"100"
+                 oob_thread_pool.rejection_policy=3D"Run"/>
 =

-         oob_thread_pool.enabled=3D"true"
-         oob_thread_pool.min_threads=3D"4"
-         oob_thread_pool.max_threads=3D"8"
-         oob_thread_pool.keep_alive_time=3D"5000"
-         oob_thread_pool.queue_enabled=3D"false"
-         oob_thread_pool.queue_max_size=3D"100"
-         oob_thread_pool.rejection_policy=3D"Run"/>
+            <MPING timeout=3D"2000" mcast_addr=3D"232.1.2.3"
+                   num_initial_members=3D"2"/>
+            <MERGE2 max_interval=3D"30000"
+                    min_interval=3D"10000"/>
+            <FD_SOCK/>
+            <FD timeout=3D"1000" max_tries=3D"2" shun=3D"true"/>
+            <VERIFY_SUSPECT timeout=3D"1500"/>
+            <BARRIER/>
+            <pbcast.NAKACK use_mcast_xmit=3D"false" gc_lag=3D"0"
+                           retransmit_timeout=3D"50,300,600,1200"
+                           discard_delivered_msgs=3D"true"/>
+            <pbcast.STABLE stability_delay=3D"1000" desired_avg_gossip=3D"=
50000"
+                           max_bytes=3D"1000000"/>
+            <VIEW_SYNC avg_send_interval=3D"60000"/>
+            <pbcast.GMS print_local_addr=3D"true" join_timeout=3D"3000"
+                        shun=3D"false"
+                        view_bundling=3D"true"/>
+            <FC max_credits=3D"10000000"
+                min_threshold=3D"0.20"/>
+            <FRAG2 frag_size=3D"60000"/>
+            <pbcast.STATE_TRANSFER/>
 =

-    <MPING timeout=3D"2000" mcast_addr=3D"232.1.2.3"
-            num_initial_members=3D"3"/>
-    <MERGE2 max_interval=3D"30000"
-            min_interval=3D"10000"/>
-    <FD_SOCK/>
-    <FD timeout=3D"1000" max_tries=3D"2" shun=3D"true"/>
-    <VERIFY_SUSPECT timeout=3D"1500"  />
-    <BARRIER />
-    <pbcast.NAKACK use_mcast_xmit=3D"false" gc_lag=3D"0"
-                   retransmit_timeout=3D"50,300,600,1200"
-                   discard_delivered_msgs=3D"true"/>
-    <pbcast.STABLE stability_delay=3D"1000" desired_avg_gossip=3D"50000"
-                   max_bytes=3D"1000000"/>
-    <VIEW_SYNC avg_send_interval=3D"60000"   />
-    <pbcast.GMS print_local_addr=3D"true" join_timeout=3D"3000"
-                shun=3D"false"
-                view_bundling=3D"true"/>
-    <FC max_credits=3D"10000000"
-                    min_threshold=3D"0.20"/>
-    <FRAG2 frag_size=3D"60000"  />
-    <pbcast.STATE_TRANSFER  />
-
          </config>
       </attribute>
       <attribute name=3D"FetchInMemoryState">true</attribute>

Modified: benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.0.0/co=
nf/pess-repl-async.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.0.0/conf/pes=
s-repl-async.xml	2008-01-31 02:29:46 UTC (rev 5277)
+++ benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.0.0/conf/pes=
s-repl-async.xml	2008-01-31 02:36:50 UTC (rev 5278)
@@ -11,7 +11,8 @@
       <depends>jboss:service=3DNaming</depends>
       <depends>jboss:service=3DTransactionManager</depends>
 =

-      <attribute name=3D"TransactionManagerLookupClass">org.jboss.cache.tr=
ansaction.GenericTransactionManagerLookup</attribute>
+      <attribute name=3D"TransactionManagerLookupClass">org.jboss.cache.tr=
ansaction.GenericTransactionManagerLookup
+      </attribute>
       <attribute name=3D"IsolationLevel">REPEATABLE_READ</attribute>
       <attribute name=3D"CacheMode">REPL_ASYNC</attribute>
       <attribute name=3D"UseReplQueue">false</attribute>
@@ -33,37 +34,27 @@
                  max_bundle_timeout=3D"30"
                  use_incoming_packet_handler=3D"true"
                  use_outgoing_packet_handler=3D"false"
-                 ip_ttl=3D"2"
-                 down_thread=3D"false" up_thread=3D"false"
+                 ip_ttl=3D"1"
                  enable_bundling=3D"false"/>
-            <PING timeout=3D"2000"
-                  down_thread=3D"false" up_thread=3D"false" num_initial_me=
mbers=3D"3"/>
-            <MERGE2 max_interval=3D"100000"
-                    down_thread=3D"false" up_thread=3D"false" min_interval=
=3D"20000"/>
-            <FD_SOCK down_thread=3D"false" up_thread=3D"false"/>
+            <PING timeout=3D"2000" num_initial_members=3D"2"/>
+            <MERGE2 max_interval=3D"100000" min_interval=3D"20000"/>
+            <FD_SOCK/>
             <FD timeout=3D"1000" max_tries=3D"2" shun=3D"true"/>
-            <VERIFY_SUSPECT timeout=3D"1500" down_thread=3D"false" up_thre=
ad=3D"false"/>
+            <VERIFY_SUSPECT timeout=3D"1500"/>
             <pbcast.NAKACK max_xmit_size=3D"60000"
                            use_mcast_xmit=3D"false" gc_lag=3D"0"
                            retransmit_timeout=3D"300,600,1200,2400,4800"
-                           down_thread=3D"false" up_thread=3D"false"
                            discard_delivered_msgs=3D"true"/>
-            <UNICAST timeout=3D"300,600,1200,2400,3600"
-                     down_thread=3D"false" up_thread=3D"false"/>
+            <UNICAST timeout=3D"300,600,1200,2400,3600"/>
             <pbcast.STABLE stability_delay=3D"1000" desired_avg_gossip=3D"=
50000"
-                           down_thread=3D"false" up_thread=3D"false"
                            max_bytes=3D"400000"/>
             <pbcast.GMS print_local_addr=3D"true" join_timeout=3D"3000" us=
e_flush=3D"true" flush_timeout=3D"3000"
-                        down_thread=3D"false" up_thread=3D"false"
-                        join_retry_timeout=3D"2000" shun=3D"false"
-                        view_bundling=3D"true"/>
-            <FC max_credits=3D"2000000" down_thread=3D"false" up_thread=3D=
"false"
+                        join_retry_timeout=3D"2000" shun=3D"false" view_bu=
ndling=3D"true"/>
+            <FC max_credits=3D"10000000"
                 min_threshold=3D"0.20"/>
             <FRAG2 frag_size=3D"60000" down_thread=3D"false" up_thread=3D"=
false"/>
-            <!-- <pbcast.STREAMING_STATE_TRANSFER down_thread=3D"false" up=
_thread=3D"false"
-                                         use_flush=3D"true" flush_timeout=
=3D"3000" use_reading_thread=3D"true"/> -->
-            <pbcast.STATE_TRANSFER down_thread=3D"false" up_thread=3D"fals=
e" use_flush=3D"true" flush_timeout=3D"3000"/>
-            <pbcast.FLUSH down_thread=3D"false" up_thread=3D"false" timeou=
t=3D"8000" auto_flush_conf=3D"false"/>
+            <pbcast.STATE_TRANSFER/>
+            <pbcast.FLUSH timeout=3D"8000" auto_flush_conf=3D"false"/>
          </config>
       </attribute>
       <attribute name=3D"FetchInMemoryState">false</attribute>

Modified: benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.0.0/co=
nf/pess-repl-sync.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.0.0/conf/pes=
s-repl-sync.xml	2008-01-31 02:29:46 UTC (rev 5277)
+++ benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.0.0/conf/pes=
s-repl-sync.xml	2008-01-31 02:36:50 UTC (rev 5278)
@@ -11,7 +11,8 @@
       <depends>jboss:service=3DNaming</depends>
       <depends>jboss:service=3DTransactionManager</depends>
 =

-      <attribute name=3D"TransactionManagerLookupClass">org.jboss.cache.tr=
ansaction.GenericTransactionManagerLookup</attribute>
+      <attribute name=3D"TransactionManagerLookupClass">org.jboss.cache.tr=
ansaction.GenericTransactionManagerLookup
+      </attribute>
       <attribute name=3D"IsolationLevel">REPEATABLE_READ</attribute>
       <attribute name=3D"CacheMode">REPL_SYNC</attribute>
       <attribute name=3D"UseReplQueue">false</attribute>
@@ -20,7 +21,7 @@
       <attribute name=3D"ClusterName">JBossCache-Cluster</attribute>
       <attribute name=3D"ClusterConfig">
          <config>
-            <UDP mcast_addr=3D"224.10.10.10"
+            <UDP mcast_addr=3D"232.10.10.10"
                  mcast_port=3D"45599"
                  tos=3D"8"
                  ucast_recv_buf_size=3D"20000000"
@@ -33,38 +34,29 @@
                  max_bundle_timeout=3D"30"
                  use_incoming_packet_handler=3D"true"
                  use_outgoing_packet_handler=3D"false"
-                 ip_ttl=3D"2"
-                 down_thread=3D"false" up_thread=3D"false"
+                 ip_ttl=3D"1"
                  bind_addr=3D"127.0.0.1"
                  enable_bundling=3D"false"/>
-            <PING timeout=3D"2000"
-                  down_thread=3D"false" up_thread=3D"false" num_initial_me=
mbers=3D"3"/>
-            <MERGE2 max_interval=3D"100000"
-                    down_thread=3D"false" up_thread=3D"false" min_interval=
=3D"20000"/>
-            <FD_SOCK down_thread=3D"false" up_thread=3D"false"/>
+            <PING timeout=3D"2000" num_initial_members=3D"2"/>
+            <MERGE2 max_interval=3D"100000" min_interval=3D"20000"/>
+            <FD_SOCK/>
             <FD timeout=3D"1000" max_tries=3D"2" shun=3D"true"/>
-            <VERIFY_SUSPECT timeout=3D"1500" down_thread=3D"false" up_thre=
ad=3D"false"/>
+            <VERIFY_SUSPECT timeout=3D"1500"/>
             <pbcast.NAKACK max_xmit_size=3D"60000"
                            use_mcast_xmit=3D"false" gc_lag=3D"0"
                            retransmit_timeout=3D"300,600,1200,2400,4800"
-                           down_thread=3D"false" up_thread=3D"false"
                            discard_delivered_msgs=3D"true"/>
-            <UNICAST timeout=3D"300,600,1200,2400,3600"
-                     down_thread=3D"false" up_thread=3D"false"/>
+            <UNICAST timeout=3D"300,600,1200,2400,3600"/>
             <pbcast.STABLE stability_delay=3D"1000" desired_avg_gossip=3D"=
50000"
-                           down_thread=3D"false" up_thread=3D"false"
                            max_bytes=3D"400000"/>
             <pbcast.GMS print_local_addr=3D"true" join_timeout=3D"3000" us=
e_flush=3D"true" flush_timeout=3D"3000"
-                        down_thread=3D"false" up_thread=3D"false"
                         join_retry_timeout=3D"2000" shun=3D"false"
                         view_bundling=3D"true"/>
-            <FC max_credits=3D"2000000" down_thread=3D"false" up_thread=3D=
"false"
+            <FC max_credits=3D"10000000"
                 min_threshold=3D"0.20"/>
-            <FRAG2 frag_size=3D"60000" down_thread=3D"false" up_thread=3D"=
false"/>
-            <!-- <pbcast.STREAMING_STATE_TRANSFER down_thread=3D"false" up=
_thread=3D"false"
-                                         use_flush=3D"true" flush_timeout=
=3D"3000" use_reading_thread=3D"true"/> -->
-            <pbcast.STATE_TRANSFER down_thread=3D"false" up_thread=3D"fals=
e" use_flush=3D"true" flush_timeout=3D"3000"/>
-            <pbcast.FLUSH down_thread=3D"false" up_thread=3D"false" timeou=
t=3D"8000" auto_flush_conf=3D"false"/>
+            <FRAG2 frag_size=3D"60000"/>
+            <pbcast.STATE_TRANSFER/>
+            <pbcast.FLUSH timeout=3D"8000" auto_flush_conf=3D"false"/>
          </config>
       </attribute>
       <attribute name=3D"FetchInMemoryState">false</attribute>

Modified: benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.1.0/co=
nf/pess-repl-async-br.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.1.0/conf/pes=
s-repl-async-br.xml	2008-01-31 02:29:46 UTC (rev 5277)
+++ benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.1.0/conf/pes=
s-repl-async-br.xml	2008-01-31 02:36:50 UTC (rev 5278)
@@ -11,7 +11,8 @@
       <depends>jboss:service=3DNaming</depends>
       <depends>jboss:service=3DTransactionManager</depends>
 =

-      <attribute name=3D"TransactionManagerLookupClass">org.jboss.cache.tr=
ansaction.GenericTransactionManagerLookup</attribute>
+      <attribute name=3D"TransactionManagerLookupClass">org.jboss.cache.tr=
ansaction.GenericTransactionManagerLookup
+      </attribute>
       <attribute name=3D"IsolationLevel">REPEATABLE_READ</attribute>
       <attribute name=3D"CacheMode">REPL_ASYNC</attribute>
       <attribute name=3D"UseReplQueue">false</attribute>
@@ -20,61 +21,58 @@
       <attribute name=3D"ClusterName">JBossCache-Cluster</attribute>
       <attribute name=3D"ClusterConfig">
          <config>
-              <TCP start_port=3D"7580"
-         loopback=3D"false"
-         discard_incompatible_packets=3D"true"
-         max_bundle_size=3D"64000"
-         max_bundle_timeout=3D"30"
-         use_incoming_packet_handler=3D"true"
-         enable_bundling=3D"true"
-         enable_diagnostics=3D"true"
-         thread_naming_pattern=3D"cl"
+            <TCP start_port=3D"7580"
+                 loopback=3D"false"
+                 discard_incompatible_packets=3D"true"
+                 max_bundle_size=3D"64000"
+                 max_bundle_timeout=3D"30"
+                 use_incoming_packet_handler=3D"true"
+                 enable_bundling=3D"true"
+                 enable_diagnostics=3D"true"
+                 thread_naming_pattern=3D"cl"
+                 use_concurrent_stack=3D"true"
 =

-         use_concurrent_stack=3D"true"
+                 recv_buf_size=3D"20000000"
+                 send_buf_size=3D"20000000"
 =

-	 recv_buf_size=3D"20000000"
-	 send_buf_size=3D"20000000"
+                 thread_pool.enabled=3D"true"
+                 thread_pool.min_threads=3D"2"
+                 thread_pool.max_threads=3D"4"
+                 thread_pool.keep_alive_time=3D"5000"
+                 thread_pool.queue_enabled=3D"true"
+                 thread_pool.queue_max_size=3D"100000"
+                 thread_pool.rejection_policy=3D"discard"
 =

-         thread_pool.enabled=3D"true"
-         thread_pool.min_threads=3D"2"
-         thread_pool.max_threads=3D"4"
-         thread_pool.keep_alive_time=3D"5000"
-         thread_pool.queue_enabled=3D"true"
-         thread_pool.queue_max_size=3D"100000"
-         thread_pool.rejection_policy=3D"discard"
+                 oob_thread_pool.enabled=3D"true"
+                 oob_thread_pool.min_threads=3D"4"
+                 oob_thread_pool.max_threads=3D"8"
+                 oob_thread_pool.keep_alive_time=3D"5000"
+                 oob_thread_pool.queue_enabled=3D"false"
+                 oob_thread_pool.queue_max_size=3D"100"
+                 oob_thread_pool.rejection_policy=3D"Run"/>
 =

-         oob_thread_pool.enabled=3D"true"
-         oob_thread_pool.min_threads=3D"4"
-         oob_thread_pool.max_threads=3D"8"
-         oob_thread_pool.keep_alive_time=3D"5000"
-         oob_thread_pool.queue_enabled=3D"false"
-         oob_thread_pool.queue_max_size=3D"100"
-         oob_thread_pool.rejection_policy=3D"Run"/>
+            <MPING timeout=3D"2000" mcast_addr=3D"232.1.2.3"
+                   num_initial_members=3D"2"/>
+            <MERGE2 max_interval=3D"30000"
+                    min_interval=3D"10000"/>
+            <FD_SOCK/>
+            <FD timeout=3D"1000" max_tries=3D"2" shun=3D"true"/>
+            <VERIFY_SUSPECT timeout=3D"1500"/>
+            <BARRIER/>
+            <pbcast.NAKACK use_mcast_xmit=3D"false" gc_lag=3D"0"
+                           retransmit_timeout=3D"50,300,600,1200"
+                           discard_delivered_msgs=3D"true"/>
+            <pbcast.STABLE stability_delay=3D"1000" desired_avg_gossip=3D"=
50000"
+                           max_bytes=3D"1000000"/>
+            <VIEW_SYNC avg_send_interval=3D"60000"/>
+            <pbcast.GMS print_local_addr=3D"true" join_timeout=3D"3000"
+                        shun=3D"false"
+                        view_bundling=3D"true"/>
+            <FC max_credits=3D"10000000"
+                min_threshold=3D"0.20"/>
+            <FRAG2 frag_size=3D"60000"/>
+            <pbcast.STATE_TRANSFER/>
 =

-    <MPING timeout=3D"2000" mcast_addr=3D"232.1.2.3"
-            num_initial_members=3D"3"/>
-    <MERGE2 max_interval=3D"30000"
-            min_interval=3D"10000"/>
-    <FD_SOCK/>
-    <FD timeout=3D"1000" max_tries=3D"2" shun=3D"true"/>
-    <VERIFY_SUSPECT timeout=3D"1500"  />
-    <BARRIER />
-    <pbcast.NAKACK use_stats_for_retransmission=3D"false"
-                   exponential_backoff=3D"150"
-                   use_mcast_xmit=3D"false" gc_lag=3D"0"
-                   retransmit_timeout=3D"50,300,600,1200"
-                   discard_delivered_msgs=3D"true"/>
-    <pbcast.STABLE stability_delay=3D"1000" desired_avg_gossip=3D"50000"
-                   max_bytes=3D"1000000"/>
-    <VIEW_SYNC avg_send_interval=3D"60000"   />
-    <pbcast.GMS print_local_addr=3D"true" join_timeout=3D"3000"
-                shun=3D"false"
-                view_bundling=3D"true"/>
-    <FC max_credits=3D"10000000"
-                    min_threshold=3D"0.20"/>
-    <FRAG2 frag_size=3D"60000"  />
-    <pbcast.STATE_TRANSFER  />
-
          </config>
       </attribute>
       <attribute name=3D"FetchInMemoryState">false</attribute>

Modified: benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.1.0/co=
nf/pess-repl-async.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.1.0/conf/pes=
s-repl-async.xml	2008-01-31 02:29:46 UTC (rev 5277)
+++ benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.1.0/conf/pes=
s-repl-async.xml	2008-01-31 02:36:50 UTC (rev 5278)
@@ -11,7 +11,8 @@
       <depends>jboss:service=3DNaming</depends>
       <depends>jboss:service=3DTransactionManager</depends>
 =

-      <attribute name=3D"TransactionManagerLookupClass">org.jboss.cache.tr=
ansaction.GenericTransactionManagerLookup</attribute>
+      <attribute name=3D"TransactionManagerLookupClass">org.jboss.cache.tr=
ansaction.GenericTransactionManagerLookup
+      </attribute>
       <attribute name=3D"IsolationLevel">REPEATABLE_READ</attribute>
       <attribute name=3D"CacheMode">REPL_ASYNC</attribute>
       <attribute name=3D"UseReplQueue">false</attribute>
@@ -33,37 +34,27 @@
                  max_bundle_timeout=3D"30"
                  use_incoming_packet_handler=3D"true"
                  use_outgoing_packet_handler=3D"false"
-                 ip_ttl=3D"2"
-                 down_thread=3D"false" up_thread=3D"false"
+                 ip_ttl=3D"1"
                  enable_bundling=3D"false"/>
-            <PING timeout=3D"2000"
-                  down_thread=3D"false" up_thread=3D"false" num_initial_me=
mbers=3D"3"/>
-            <MERGE2 max_interval=3D"100000"
-                    down_thread=3D"false" up_thread=3D"false" min_interval=
=3D"20000"/>
-            <FD_SOCK down_thread=3D"false" up_thread=3D"false"/>
+            <PING timeout=3D"2000" num_initial_members=3D"2"/>
+            <MERGE2 max_interval=3D"100000" min_interval=3D"20000"/>
+            <FD_SOCK/>
             <FD timeout=3D"1000" max_tries=3D"2" shun=3D"true"/>
-            <VERIFY_SUSPECT timeout=3D"1500" down_thread=3D"false" up_thre=
ad=3D"false"/>
+            <VERIFY_SUSPECT timeout=3D"1500"/>
             <pbcast.NAKACK max_xmit_size=3D"60000"
                            use_mcast_xmit=3D"false" gc_lag=3D"0"
                            retransmit_timeout=3D"300,600,1200,2400,4800"
-                           down_thread=3D"false" up_thread=3D"false"
                            discard_delivered_msgs=3D"true"/>
-            <UNICAST timeout=3D"300,600,1200,2400,3600"
-                     down_thread=3D"false" up_thread=3D"false"/>
+            <UNICAST timeout=3D"300,600,1200,2400,3600"/>
             <pbcast.STABLE stability_delay=3D"1000" desired_avg_gossip=3D"=
50000"
-                           down_thread=3D"false" up_thread=3D"false"
                            max_bytes=3D"400000"/>
             <pbcast.GMS print_local_addr=3D"true" join_timeout=3D"3000" us=
e_flush=3D"true" flush_timeout=3D"3000"
-                        down_thread=3D"false" up_thread=3D"false"
-                        join_retry_timeout=3D"2000" shun=3D"false"
-                        view_bundling=3D"true"/>
-            <FC max_credits=3D"2000000" down_thread=3D"false" up_thread=3D=
"false"
+                        join_retry_timeout=3D"2000" shun=3D"false" view_bu=
ndling=3D"true"/>
+            <FC max_credits=3D"10000000"
                 min_threshold=3D"0.20"/>
             <FRAG2 frag_size=3D"60000" down_thread=3D"false" up_thread=3D"=
false"/>
-            <!-- <pbcast.STREAMING_STATE_TRANSFER down_thread=3D"false" up=
_thread=3D"false"
-                                         use_flush=3D"true" flush_timeout=
=3D"3000" use_reading_thread=3D"true"/> -->
-            <pbcast.STATE_TRANSFER down_thread=3D"false" up_thread=3D"fals=
e" use_flush=3D"true" flush_timeout=3D"3000"/>
-            <pbcast.FLUSH down_thread=3D"false" up_thread=3D"false" timeou=
t=3D"8000" auto_flush_conf=3D"false"/>
+            <pbcast.STATE_TRANSFER/>
+            <pbcast.FLUSH timeout=3D"8000" auto_flush_conf=3D"false"/>
          </config>
       </attribute>
       <attribute name=3D"FetchInMemoryState">false</attribute>

Modified: benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.1.0/co=
nf/pess-repl-sync.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.1.0/conf/pes=
s-repl-sync.xml	2008-01-31 02:29:46 UTC (rev 5277)
+++ benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.1.0/conf/pes=
s-repl-sync.xml	2008-01-31 02:36:50 UTC (rev 5278)
@@ -11,7 +11,8 @@
       <depends>jboss:service=3DNaming</depends>
       <depends>jboss:service=3DTransactionManager</depends>
 =

-      <attribute name=3D"TransactionManagerLookupClass">org.jboss.cache.tr=
ansaction.GenericTransactionManagerLookup</attribute>
+      <attribute name=3D"TransactionManagerLookupClass">org.jboss.cache.tr=
ansaction.GenericTransactionManagerLookup
+      </attribute>
       <attribute name=3D"IsolationLevel">REPEATABLE_READ</attribute>
       <attribute name=3D"CacheMode">REPL_SYNC</attribute>
       <attribute name=3D"UseReplQueue">false</attribute>
@@ -20,7 +21,7 @@
       <attribute name=3D"ClusterName">JBossCache-Cluster</attribute>
       <attribute name=3D"ClusterConfig">
          <config>
-            <UDP mcast_addr=3D"224.10.10.10"
+            <UDP mcast_addr=3D"232.10.10.10"
                  mcast_port=3D"45599"
                  tos=3D"8"
                  ucast_recv_buf_size=3D"20000000"
@@ -33,38 +34,29 @@
                  max_bundle_timeout=3D"30"
                  use_incoming_packet_handler=3D"true"
                  use_outgoing_packet_handler=3D"false"
-                 ip_ttl=3D"2"
-                 down_thread=3D"false" up_thread=3D"false"
+                 ip_ttl=3D"1"
                  bind_addr=3D"127.0.0.1"
                  enable_bundling=3D"false"/>
-            <PING timeout=3D"2000"
-                  down_thread=3D"false" up_thread=3D"false" num_initial_me=
mbers=3D"3"/>
-            <MERGE2 max_interval=3D"100000"
-                    down_thread=3D"false" up_thread=3D"false" min_interval=
=3D"20000"/>
-            <FD_SOCK down_thread=3D"false" up_thread=3D"false"/>
+            <PING timeout=3D"2000" num_initial_members=3D"2"/>
+            <MERGE2 max_interval=3D"100000" min_interval=3D"20000"/>
+            <FD_SOCK/>
             <FD timeout=3D"1000" max_tries=3D"2" shun=3D"true"/>
-            <VERIFY_SUSPECT timeout=3D"1500" down_thread=3D"false" up_thre=
ad=3D"false"/>
+            <VERIFY_SUSPECT timeout=3D"1500"/>
             <pbcast.NAKACK max_xmit_size=3D"60000"
                            use_mcast_xmit=3D"false" gc_lag=3D"0"
                            retransmit_timeout=3D"300,600,1200,2400,4800"
-                           down_thread=3D"false" up_thread=3D"false"
                            discard_delivered_msgs=3D"true"/>
-            <UNICAST timeout=3D"300,600,1200,2400,3600"
-                     down_thread=3D"false" up_thread=3D"false"/>
+            <UNICAST timeout=3D"300,600,1200,2400,3600"/>
             <pbcast.STABLE stability_delay=3D"1000" desired_avg_gossip=3D"=
50000"
-                           down_thread=3D"false" up_thread=3D"false"
                            max_bytes=3D"400000"/>
             <pbcast.GMS print_local_addr=3D"true" join_timeout=3D"3000" us=
e_flush=3D"true" flush_timeout=3D"3000"
-                        down_thread=3D"false" up_thread=3D"false"
                         join_retry_timeout=3D"2000" shun=3D"false"
                         view_bundling=3D"true"/>
-            <FC max_credits=3D"2000000" down_thread=3D"false" up_thread=3D=
"false"
+            <FC max_credits=3D"10000000"
                 min_threshold=3D"0.20"/>
-            <FRAG2 frag_size=3D"60000" down_thread=3D"false" up_thread=3D"=
false"/>
-            <!-- <pbcast.STREAMING_STATE_TRANSFER down_thread=3D"false" up=
_thread=3D"false"
-                                         use_flush=3D"true" flush_timeout=
=3D"3000" use_reading_thread=3D"true"/> -->
-            <pbcast.STATE_TRANSFER down_thread=3D"false" up_thread=3D"fals=
e" use_flush=3D"true" flush_timeout=3D"3000"/>
-            <pbcast.FLUSH down_thread=3D"false" up_thread=3D"false" timeou=
t=3D"8000" auto_flush_conf=3D"false"/>
+            <FRAG2 frag_size=3D"60000"/>
+            <pbcast.STATE_TRANSFER/>
+            <pbcast.FLUSH timeout=3D"8000" auto_flush_conf=3D"false"/>
          </config>
       </attribute>
       <attribute name=3D"FetchInMemoryState">false</attribute>


--===============1361986718759694494==--

From jbosscache-commits at lists.jboss.org Wed Jan 30 21:47:28 2008
Content-Type: multipart/mixed; boundary="===============8532491966934038630=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r5279 - in
 benchmarks/benchmark-fwk/trunk/cache-products: jbosscache-2.1.0/conf and 1
 other directory.
Date: Wed, 30 Jan 2008 21:47:28 -0500
Message-ID: <E1JKPSa-0001mK-IP@committer01.frg.pub.inap.atl.jboss.com>

--===============8532491966934038630==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: manik.surtani(a)jboss.com
Date: 2008-01-30 21:47:28 -0500 (Wed, 30 Jan 2008)
New Revision: 5279

Modified:
   benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.0.0/conf/pess=
-repl-async-br.xml
   benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.0.0/conf/pess=
-repl-async.xml
   benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.0.0/conf/pess=
-repl-sync.xml
   benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.1.0/conf/pess=
-repl-async-br.xml
   benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.1.0/conf/pess=
-repl-async.xml
   benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.1.0/conf/pess=
-repl-sync.xml
Log:
Updated cfgs

Modified: benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.0.0/co=
nf/pess-repl-async-br.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.0.0/conf/pes=
s-repl-async-br.xml	2008-01-31 02:36:50 UTC (rev 5278)
+++ benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.0.0/conf/pes=
s-repl-async-br.xml	2008-01-31 02:47:28 UTC (rev 5279)
@@ -44,8 +44,8 @@
                  thread_pool.rejection_policy=3D"discard"
 =

                  oob_thread_pool.enabled=3D"true"
-                 oob_thread_pool.min_threads=3D"4"
-                 oob_thread_pool.max_threads=3D"8"
+                 oob_thread_pool.min_threads=3D"1"
+                 oob_thread_pool.max_threads=3D"4"
                  oob_thread_pool.keep_alive_time=3D"5000"
                  oob_thread_pool.queue_enabled=3D"false"
                  oob_thread_pool.queue_max_size=3D"100"
@@ -56,7 +56,7 @@
             <MERGE2 max_interval=3D"30000"
                     min_interval=3D"10000"/>
             <FD_SOCK/>
-            <FD timeout=3D"1000" max_tries=3D"2" shun=3D"true"/>
+            <FD timeout=3D"10000" max_tries=3D"5" shun=3D"true"/>
             <VERIFY_SUSPECT timeout=3D"1500"/>
             <BARRIER/>
             <pbcast.NAKACK use_mcast_xmit=3D"false" gc_lag=3D"0"

Modified: benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.0.0/co=
nf/pess-repl-async.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.0.0/conf/pes=
s-repl-async.xml	2008-01-31 02:36:50 UTC (rev 5278)
+++ benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.0.0/conf/pes=
s-repl-async.xml	2008-01-31 02:47:28 UTC (rev 5279)
@@ -33,13 +33,12 @@
                  max_bundle_size=3D"64000"
                  max_bundle_timeout=3D"30"
                  use_incoming_packet_handler=3D"true"
-                 use_outgoing_packet_handler=3D"false"
                  ip_ttl=3D"1"
                  enable_bundling=3D"false"/>
             <PING timeout=3D"2000" num_initial_members=3D"2"/>
             <MERGE2 max_interval=3D"100000" min_interval=3D"20000"/>
             <FD_SOCK/>
-            <FD timeout=3D"1000" max_tries=3D"2" shun=3D"true"/>
+            <FD timeout=3D"10000" max_tries=3D"5" shun=3D"true"/>
             <VERIFY_SUSPECT timeout=3D"1500"/>
             <pbcast.NAKACK max_xmit_size=3D"60000"
                            use_mcast_xmit=3D"false" gc_lag=3D"0"
@@ -48,13 +47,13 @@
             <UNICAST timeout=3D"300,600,1200,2400,3600"/>
             <pbcast.STABLE stability_delay=3D"1000" desired_avg_gossip=3D"=
50000"
                            max_bytes=3D"400000"/>
-            <pbcast.GMS print_local_addr=3D"true" join_timeout=3D"3000" us=
e_flush=3D"true" flush_timeout=3D"3000"
+            <pbcast.GMS print_local_addr=3D"true" join_timeout=3D"3000"
                         join_retry_timeout=3D"2000" shun=3D"false" view_bu=
ndling=3D"true"/>
             <FC max_credits=3D"10000000"
                 min_threshold=3D"0.20"/>
-            <FRAG2 frag_size=3D"60000" down_thread=3D"false" up_thread=3D"=
false"/>
+            <FRAG2 frag_size=3D"60000"/>
             <pbcast.STATE_TRANSFER/>
-            <pbcast.FLUSH timeout=3D"8000" auto_flush_conf=3D"false"/>
+            <pbcast.FLUSH timeout=3D"8000"/>
          </config>
       </attribute>
       <attribute name=3D"FetchInMemoryState">false</attribute>

Modified: benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.0.0/co=
nf/pess-repl-sync.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.0.0/conf/pes=
s-repl-sync.xml	2008-01-31 02:36:50 UTC (rev 5278)
+++ benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.0.0/conf/pes=
s-repl-sync.xml	2008-01-31 02:47:28 UTC (rev 5279)
@@ -33,14 +33,12 @@
                  max_bundle_size=3D"64000"
                  max_bundle_timeout=3D"30"
                  use_incoming_packet_handler=3D"true"
-                 use_outgoing_packet_handler=3D"false"
                  ip_ttl=3D"1"
-                 bind_addr=3D"127.0.0.1"
                  enable_bundling=3D"false"/>
             <PING timeout=3D"2000" num_initial_members=3D"2"/>
             <MERGE2 max_interval=3D"100000" min_interval=3D"20000"/>
             <FD_SOCK/>
-            <FD timeout=3D"1000" max_tries=3D"2" shun=3D"true"/>
+            <FD timeout=3D"10000" max_tries=3D"5" shun=3D"true"/>
             <VERIFY_SUSPECT timeout=3D"1500"/>
             <pbcast.NAKACK max_xmit_size=3D"60000"
                            use_mcast_xmit=3D"false" gc_lag=3D"0"
@@ -49,14 +47,14 @@
             <UNICAST timeout=3D"300,600,1200,2400,3600"/>
             <pbcast.STABLE stability_delay=3D"1000" desired_avg_gossip=3D"=
50000"
                            max_bytes=3D"400000"/>
-            <pbcast.GMS print_local_addr=3D"true" join_timeout=3D"3000" us=
e_flush=3D"true" flush_timeout=3D"3000"
+            <pbcast.GMS print_local_addr=3D"true" join_timeout=3D"3000"
                         join_retry_timeout=3D"2000" shun=3D"false"
                         view_bundling=3D"true"/>
             <FC max_credits=3D"10000000"
                 min_threshold=3D"0.20"/>
             <FRAG2 frag_size=3D"60000"/>
             <pbcast.STATE_TRANSFER/>
-            <pbcast.FLUSH timeout=3D"8000" auto_flush_conf=3D"false"/>
+            <pbcast.FLUSH timeout=3D"8000"/>
          </config>
       </attribute>
       <attribute name=3D"FetchInMemoryState">false</attribute>

Modified: benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.1.0/co=
nf/pess-repl-async-br.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.1.0/conf/pes=
s-repl-async-br.xml	2008-01-31 02:36:50 UTC (rev 5278)
+++ benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.1.0/conf/pes=
s-repl-async-br.xml	2008-01-31 02:47:28 UTC (rev 5279)
@@ -44,8 +44,8 @@
                  thread_pool.rejection_policy=3D"discard"
 =

                  oob_thread_pool.enabled=3D"true"
-                 oob_thread_pool.min_threads=3D"4"
-                 oob_thread_pool.max_threads=3D"8"
+                 oob_thread_pool.min_threads=3D"1"
+                 oob_thread_pool.max_threads=3D"4"
                  oob_thread_pool.keep_alive_time=3D"5000"
                  oob_thread_pool.queue_enabled=3D"false"
                  oob_thread_pool.queue_max_size=3D"100"
@@ -56,7 +56,7 @@
             <MERGE2 max_interval=3D"30000"
                     min_interval=3D"10000"/>
             <FD_SOCK/>
-            <FD timeout=3D"1000" max_tries=3D"2" shun=3D"true"/>
+            <FD timeout=3D"10000" max_tries=3D"5" shun=3D"true"/>
             <VERIFY_SUSPECT timeout=3D"1500"/>
             <BARRIER/>
             <pbcast.NAKACK use_mcast_xmit=3D"false" gc_lag=3D"0"

Modified: benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.1.0/co=
nf/pess-repl-async.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.1.0/conf/pes=
s-repl-async.xml	2008-01-31 02:36:50 UTC (rev 5278)
+++ benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.1.0/conf/pes=
s-repl-async.xml	2008-01-31 02:47:28 UTC (rev 5279)
@@ -33,13 +33,12 @@
                  max_bundle_size=3D"64000"
                  max_bundle_timeout=3D"30"
                  use_incoming_packet_handler=3D"true"
-                 use_outgoing_packet_handler=3D"false"
                  ip_ttl=3D"1"
                  enable_bundling=3D"false"/>
             <PING timeout=3D"2000" num_initial_members=3D"2"/>
             <MERGE2 max_interval=3D"100000" min_interval=3D"20000"/>
             <FD_SOCK/>
-            <FD timeout=3D"1000" max_tries=3D"2" shun=3D"true"/>
+            <FD timeout=3D"10000" max_tries=3D"5" shun=3D"true"/>
             <VERIFY_SUSPECT timeout=3D"1500"/>
             <pbcast.NAKACK max_xmit_size=3D"60000"
                            use_mcast_xmit=3D"false" gc_lag=3D"0"
@@ -48,13 +47,13 @@
             <UNICAST timeout=3D"300,600,1200,2400,3600"/>
             <pbcast.STABLE stability_delay=3D"1000" desired_avg_gossip=3D"=
50000"
                            max_bytes=3D"400000"/>
-            <pbcast.GMS print_local_addr=3D"true" join_timeout=3D"3000" us=
e_flush=3D"true" flush_timeout=3D"3000"
+            <pbcast.GMS print_local_addr=3D"true" join_timeout=3D"3000"
                         join_retry_timeout=3D"2000" shun=3D"false" view_bu=
ndling=3D"true"/>
             <FC max_credits=3D"10000000"
                 min_threshold=3D"0.20"/>
-            <FRAG2 frag_size=3D"60000" down_thread=3D"false" up_thread=3D"=
false"/>
+            <FRAG2 frag_size=3D"60000"/>
             <pbcast.STATE_TRANSFER/>
-            <pbcast.FLUSH timeout=3D"8000" auto_flush_conf=3D"false"/>
+            <pbcast.FLUSH timeout=3D"8000"/>
          </config>
       </attribute>
       <attribute name=3D"FetchInMemoryState">false</attribute>

Modified: benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.1.0/co=
nf/pess-repl-sync.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.1.0/conf/pes=
s-repl-sync.xml	2008-01-31 02:36:50 UTC (rev 5278)
+++ benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.1.0/conf/pes=
s-repl-sync.xml	2008-01-31 02:47:28 UTC (rev 5279)
@@ -33,14 +33,12 @@
                  max_bundle_size=3D"64000"
                  max_bundle_timeout=3D"30"
                  use_incoming_packet_handler=3D"true"
-                 use_outgoing_packet_handler=3D"false"
                  ip_ttl=3D"1"
-                 bind_addr=3D"127.0.0.1"
                  enable_bundling=3D"false"/>
             <PING timeout=3D"2000" num_initial_members=3D"2"/>
             <MERGE2 max_interval=3D"100000" min_interval=3D"20000"/>
             <FD_SOCK/>
-            <FD timeout=3D"1000" max_tries=3D"2" shun=3D"true"/>
+            <FD timeout=3D"10000" max_tries=3D"5" shun=3D"true"/>
             <VERIFY_SUSPECT timeout=3D"1500"/>
             <pbcast.NAKACK max_xmit_size=3D"60000"
                            use_mcast_xmit=3D"false" gc_lag=3D"0"
@@ -49,14 +47,14 @@
             <UNICAST timeout=3D"300,600,1200,2400,3600"/>
             <pbcast.STABLE stability_delay=3D"1000" desired_avg_gossip=3D"=
50000"
                            max_bytes=3D"400000"/>
-            <pbcast.GMS print_local_addr=3D"true" join_timeout=3D"3000" us=
e_flush=3D"true" flush_timeout=3D"3000"
+            <pbcast.GMS print_local_addr=3D"true" join_timeout=3D"3000"
                         join_retry_timeout=3D"2000" shun=3D"false"
                         view_bundling=3D"true"/>
             <FC max_credits=3D"10000000"
                 min_threshold=3D"0.20"/>
             <FRAG2 frag_size=3D"60000"/>
             <pbcast.STATE_TRANSFER/>
-            <pbcast.FLUSH timeout=3D"8000" auto_flush_conf=3D"false"/>
+            <pbcast.FLUSH timeout=3D"8000"/>
          </config>
       </attribute>
       <attribute name=3D"FetchInMemoryState">false</attribute>


--===============8532491966934038630==--

From jbosscache-commits at lists.jboss.org Thu Jan 31 06:32:43 2008
Content-Type: multipart/mixed; boundary="===============4093383415470784364=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r5280 -
 core/trunk/src/main/java/org/jboss/cache/notifications.
Date: Thu, 31 Jan 2008 06:32:40 -0500
Message-ID: <E1JKXeq-0005r0-Cj@committer01.frg.pub.inap.atl.jboss.com>

--===============4093383415470784364==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: manik.surtani(a)jboss.com
Date: 2008-01-31 06:32:39 -0500 (Thu, 31 Jan 2008)
New Revision: 5280

Modified:
   core/trunk/src/main/java/org/jboss/cache/notifications/Notifier.java
Log:
Added a null check

Modified: core/trunk/src/main/java/org/jboss/cache/notifications/Notifier.j=
ava
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/java/org/jboss/cache/notifications/Notifier.java	20=
08-01-31 02:47:28 UTC (rev 5279)
+++ core/trunk/src/main/java/org/jboss/cache/notifications/Notifier.java	20=
08-01-31 11:32:39 UTC (rev 5280)
@@ -159,6 +159,8 @@
 =

    private void removeListenerInvocation(Class annotation, Object listener)
    {
+      if (listener =3D=3D null) return;
+
       List<ListenerInvocation> l =3D listenerInvocations.get(annotation);
       Set<Object> markedForRemoval =3D new HashSet<Object>();
       if (l !=3D null)


--===============4093383415470784364==--

From jbosscache-commits at lists.jboss.org Thu Jan 31 06:52:54 2008
Content-Type: multipart/mixed; boundary="===============5120313247923085356=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r5281 -
 benchmarks/benchmark-fwk/trunk/src/org/cachebench/reportgenerators.
Date: Thu, 31 Jan 2008 06:52:54 -0500
Message-ID: <E1JKXyQ-0001Rm-7J@committer01.frg.pub.inap.atl.jboss.com>

--===============5120313247923085356==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: manik.surtani(a)jboss.com
Date: 2008-01-31 06:52:54 -0500 (Thu, 31 Jan 2008)
New Revision: 5281

Modified:
   benchmarks/benchmark-fwk/trunk/src/org/cachebench/reportgenerators/Chart=
Generator.java
Log:
sorting of keys

Modified: benchmarks/benchmark-fwk/trunk/src/org/cachebench/reportgenerator=
s/ChartGenerator.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- benchmarks/benchmark-fwk/trunk/src/org/cachebench/reportgenerators/Char=
tGenerator.java	2008-01-31 11:32:39 UTC (rev 5280)
+++ benchmarks/benchmark-fwk/trunk/src/org/cachebench/reportgenerators/Char=
tGenerator.java	2008-01-31 11:52:54 UTC (rev 5281)
@@ -16,7 +16,10 @@
 import java.io.FilenameFilter;
 import java.io.IOException;
 import java.util.Date;
+import java.util.Map;
+import java.util.SortedMap;
 import java.util.StringTokenizer;
+import java.util.TreeMap;
 =

 /**
  * Manual chart generator.  Grabs CSVs generated by {@link org.cachebench.=
reportgenerators.ClusterReportGenerator} and spits out
@@ -134,8 +137,44 @@
       {
          readData(f);
       }
+
+      sort(averageThroughput);
+      sort(totalThroughput);
    }
 =

+   /**
+    * Crappy that the JFReechart data set doesn't order columns and rows b=
y default or even as an option.  Need to do this manually.
+    *
+    * @param data
+    */
+   private void sort(DefaultCategoryDataset data)
+   {
+      SortedMap<Comparable, SortedMap<Comparable, Number>> raw =3D new Tre=
eMap<Comparable, SortedMap<Comparable, Number>>();
+      for (int i =3D 0; i < data.getRowCount(); i++)
+      {
+         Comparable row =3D data.getRowKey(i);
+         SortedMap<Comparable, Number> rowData =3D new TreeMap<Comparable,=
 Number>();
+         for (int j =3D 0; j < data.getColumnCount(); j++)
+         {
+            Comparable column =3D data.getColumnKey(j);
+            Number value =3D data.getValue(i, j);
+            rowData.put(column, value);
+         }
+         raw.put(row, rowData);
+      }
+
+      data.clear();
+      for (Comparable row : raw.keySet())
+      {
+         Map<Comparable, Number> rowData =3D raw.get(row);
+         for (Comparable column : rowData.keySet())
+         {
+            data.addValue(rowData.get(column), row, column);
+         }
+      }
+   }
+
+
    private void readData(File f) throws IOException
    {
       // chop up the file name to get productAndConfiguration and clusterS=
ize.


--===============5120313247923085356==--

From jbosscache-commits at lists.jboss.org Thu Jan 31 11:36:52 2008
Content-Type: multipart/mixed; boundary="===============8358320347574041814=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r5282 - in
 core/trunk/src/main/docbook: images and 2 other directories.
Date: Thu, 31 Jan 2008 11:36:51 -0500
Message-ID: <E1JKcPD-0000Zc-RR@committer01.frg.pub.inap.atl.jboss.com>

--===============8358320347574041814==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: manik.surtani(a)jboss.com
Date: 2008-01-31 11:36:51 -0500 (Thu, 31 Jan 2008)
New Revision: 5282

Added:
   core/trunk/src/main/docbook/images/ClusteredCacheLoader.doc
   core/trunk/src/main/docbook/images/ClusteredCacheLoader.png
   core/trunk/src/main/docbook/images/logo.gif
Modified:
   core/trunk/src/main/docbook/faq/en/master.xml
   core/trunk/src/main/docbook/tutorial/en/master.xml
   core/trunk/src/main/docbook/userguide/en/master.xml
Log:
Updated

Modified: core/trunk/src/main/docbook/faq/en/master.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/docbook/faq/en/master.xml	2008-01-31 11:52:54 UTC (=
rev 5281)
+++ core/trunk/src/main/docbook/faq/en/master.xml	2008-01-31 16:36:51 UTC (=
rev 5282)
@@ -53,6 +53,15 @@
             document pertaining to PojoCache specifics.
          </para>
       </abstract>
+
+      <!-- copyright info -->
+      <copyright>
+         <year>2005</year>
+         <year>2006</year>
+         <year>2007</year>
+         <year>2008</year>
+         <holder>JBoss, a division of Red Hat Inc.</holder>
+      </copyright>
    </bookinfo>
 =

 =

@@ -336,47 +345,48 @@
                   JBoss MBean. Here is a code snippet:
                </para>
 =

-               <programlisting>
-                  import org.jboss.mx.util.MBeanServerLocator;
-                  import org.jboss.mx.util.MBeanProxyExt;
-                  import org.jboss.cache.TreeCacheMBean;
-                  import javax.management.MBeanServer;
-                  ...
+               <programlisting><![CDATA[
 =

-                  MBeanServer server;
-                  TreeCacheMBean cache;
+import org.jboss.mx.util.MBeanServerLocator;
+import org.jboss.mx.util.MBeanProxyExt;
+import org.jboss.cache.TreeCacheMBean;
+import javax.management.MBeanServer;
+...
 =

-                  public init() throws Exception
-                  {
-                  try
-                  {
-                  server =3D MBeanServerLocator.locateJBoss();
-                  cache =3D (TreeCacheMBean) MBeanProxyExt.create(TreeCach=
eMBean.class, "jboss.cache:service=3DTreeCache",
-                  server);
-                  }
-                  catch (Exception ex)
-                  {
-                  // handle exception
-                  }
-                  }
+MBeanServer server;
+TreeCacheMBean cache;
 =

-                  public void myBusinessMethod()
-                  {
-                  Object value =3D cache.get("/my/node", "myKey");
+public init() throws Exception
+{
+   try
+   {
+      server =3D MBeanServerLocator.locateJBoss();
+      cache =3D (TreeCacheMBean) MBeanProxyExt.create(TreeCacheMBean.class,
+                  "jboss.cache:service=3DTreeCache", server);
+   }
+   catch (Exception ex)
+   {
+      // handle exception
+   }
+}
 =

-                  HashMap stuff =3D new HashMap();
-                  stuff.put("key1", "value1");
-                  stuff.put("key2", "value2");
-                  stuff.put("key3", "value3");
+public void myBusinessMethod()
+{
+   Object value =3D cache.get("/my/node", "myKey");
 =

-                  cache.put("/my/new/node", stuff);
+   HashMap stuff =3D new HashMap();
+   stuff.put("key1", "value1");
+   stuff.put("key2", "value2");
+   stuff.put("key3", "value3");
 =

-                  cache.remove("/my/node");
+   cache.put("/my/new/node", stuff);
 =

-                  ...
-                  }
+   cache.remove("/my/node");
 =

-               </programlisting>
+   ...
+}
+
+               ]]></programlisting>
             </answer>
          </qandaentry>
 =


Added: core/trunk/src/main/docbook/images/ClusteredCacheLoader.doc
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)


Property changes on: core/trunk/src/main/docbook/images/ClusteredCacheLoade=
r.doc
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: core/trunk/src/main/docbook/images/ClusteredCacheLoader.png
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)


Property changes on: core/trunk/src/main/docbook/images/ClusteredCacheLoade=
r.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: core/trunk/src/main/docbook/images/logo.gif
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)


Property changes on: core/trunk/src/main/docbook/images/logo.gif
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: core/trunk/src/main/docbook/tutorial/en/master.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/docbook/tutorial/en/master.xml	2008-01-31 11:52:54 =
UTC (rev 5281)
+++ core/trunk/src/main/docbook/tutorial/en/master.xml	2008-01-31 16:36:51 =
UTC (rev 5282)
@@ -1,7 +1,7 @@
 <?xml version=3D"1.0" encoding=3D"UTF-8"?>
 <article lang=3D"en">
    <articleinfo>
-      <title>JBoss Cache core Cache Tutorial</title>
+      <title>JBoss Cache Core Edition Tutorial</title>
       <!-- Release version and date -->
       <releaseinfo>Release 2.1.0 Alegrias</releaseinfo>
       <pubdate>March 2008</pubdate>
@@ -11,6 +11,16 @@
          <surname>Surtani</surname>
          <email>manik(a)jboss.org</email>
       </author>
+
+      <!-- copyright info -->
+      <copyright>
+         <year>2005</year>
+         <year>2006</year>
+         <year>2007</year>
+         <year>2008</year>
+         <holder>JBoss, a division of Red Hat Inc.</holder>
+      </copyright>
+
    </articleinfo>
 =

    <section>

Modified: core/trunk/src/main/docbook/userguide/en/master.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/main/docbook/userguide/en/master.xml	2008-01-31 11:52:54=
 UTC (rev 5281)
+++ core/trunk/src/main/docbook/userguide/en/master.xml	2008-01-31 16:36:51=
 UTC (rev 5282)
@@ -74,6 +74,7 @@
          <year>2005</year>
          <year>2006</year>
          <year>2007</year>
+         <year>2008</year>
          <holder>JBoss, a division of Red Hat Inc.</holder>
       </copyright>
 =



--===============8358320347574041814==--

From jbosscache-commits at lists.jboss.org Thu Jan 31 13:50:04 2008
Content-Type: multipart/mixed; boundary="===============0902623475848027981=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN:  r5283 - core/tags.
Date: Thu, 31 Jan 2008 13:50:03 -0500
Message-ID: <E1JKeU7-0002G7-L1@committer01.frg.pub.inap.atl.jboss.com>

--===============0902623475848027981==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: manik.surtani(a)jboss.com
Date: 2008-01-31 13:50:02 -0500 (Thu, 31 Jan 2008)
New Revision: 5283

Added:
   core/tags/2.1.0.CR2B/
Log:


Copied: core/tags/2.1.0.CR2B (from rev 5282, core/tags/2.1.0.CR2)


--===============0902623475848027981==--

From jbosscache-commits at lists.jboss.org Thu Jan 31 13:56:12 2008
Content-Type: multipart/mixed; boundary="===============6735435953377440701=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r5284 -
 core/tags/2.1.0.CR2B/src/main/java/org/jboss/cache/notifications.
Date: Thu, 31 Jan 2008 13:56:11 -0500
Message-ID: <E1JKea3-0003mb-LV@committer01.frg.pub.inap.atl.jboss.com>

--===============6735435953377440701==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: manik.surtani(a)jboss.com
Date: 2008-01-31 13:56:11 -0500 (Thu, 31 Jan 2008)
New Revision: 5284

Modified:
   core/tags/2.1.0.CR2B/src/main/java/org/jboss/cache/notifications/Notifie=
r.java
Log:


Modified: core/tags/2.1.0.CR2B/src/main/java/org/jboss/cache/notifications/=
Notifier.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/tags/2.1.0.CR2B/src/main/java/org/jboss/cache/notifications/Notifi=
er.java	2008-01-31 18:50:02 UTC (rev 5283)
+++ core/tags/2.1.0.CR2B/src/main/java/org/jboss/cache/notifications/Notifi=
er.java	2008-01-31 18:56:11 UTC (rev 5284)
@@ -232,14 +232,13 @@
     */
    public void notifyNodeModified(Fqn fqn, boolean pre, NodeModifiedEvent.=
ModificationType modificationType, Map data, InvocationContext ctx)
    {
-      boolean originLocal =3D ctx.isOriginLocal();
-      Map dataCopy =3D copy(data);
-      Transaction tx =3D ctx.getTransaction();
-
       List<ListenerInvocation> listeners =3D listenerInvocations.get(NodeM=
odified.class);
 =

       if (listeners !=3D null && listeners.size() > 0)
       {
+         boolean originLocal =3D ctx.isOriginLocal();
+         Map dataCopy =3D copy(data);
+         Transaction tx =3D ctx.getTransaction();
          InvocationContext backup =3D resetInvocationContext(ctx);
          EventImpl e =3D new EventImpl();
          e.setCache(cache);
@@ -265,14 +264,14 @@
     */
    public void notifyNodeRemoved(Fqn fqn, boolean pre, Map data, Invocatio=
nContext ctx)
    {
-      boolean originLocal =3D ctx.isOriginLocal();
-      Map dataCopy =3D copy(data);
-      Transaction tx =3D ctx.getTransaction();
-
       List<ListenerInvocation> listeners =3D listenerInvocations.get(NodeR=
emoved.class);
 =

       if (listeners !=3D null && listeners.size() > 0)
       {
+         boolean originLocal =3D ctx.isOriginLocal();
+         Map dataCopy =3D copy(data);
+         Transaction tx =3D ctx.getTransaction();
+
          InvocationContext backup =3D resetInvocationContext(ctx);
          EventImpl e =3D new EventImpl();
          e.setCache(cache);
@@ -296,12 +295,11 @@
     */
    public void notifyNodeVisited(Fqn fqn, boolean pre, InvocationContext c=
tx)
    {
-      Transaction tx =3D ctx.getTransaction();
-
       List<ListenerInvocation> listeners =3D listenerInvocations.get(NodeV=
isited.class);
 =

       if (listeners !=3D null && listeners.size() > 0)
       {
+         Transaction tx =3D ctx.getTransaction();
          InvocationContext backup =3D resetInvocationContext(ctx);
          EventImpl e =3D new EventImpl();
          e.setCache(cache);
@@ -316,13 +314,12 @@
 =

    public void notifyNodeMoved(Fqn originalFqn, Fqn newFqn, boolean pre, I=
nvocationContext ctx)
    {
-      boolean originLocal =3D ctx.isOriginLocal();
-      Transaction tx =3D ctx.getTransaction();
-
       List<ListenerInvocation> listeners =3D listenerInvocations.get(NodeM=
oved.class);
 =

       if (listeners !=3D null && listeners.size() > 0)
       {
+         boolean originLocal =3D ctx.isOriginLocal();
+         Transaction tx =3D ctx.getTransaction();
          InvocationContext backup =3D resetInvocationContext(ctx);
          EventImpl e =3D new EventImpl();
          e.setCache(cache);
@@ -347,13 +344,12 @@
     */
    public void notifyNodeEvicted(final Fqn fqn, final boolean pre, Invocat=
ionContext ctx)
    {
-      final boolean originLocal =3D ctx.isOriginLocal();
-      Transaction tx =3D ctx.getTransaction();
-
       List<ListenerInvocation> listeners =3D listenerInvocations.get(NodeE=
victed.class);
 =

       if (listeners !=3D null && listeners.size() > 0)
       {
+         final boolean originLocal =3D ctx.isOriginLocal();
+         Transaction tx =3D ctx.getTransaction();
          InvocationContext backup =3D resetInvocationContext(ctx);
          EventImpl e =3D new EventImpl();
          e.setCache(cache);
@@ -377,14 +373,13 @@
     */
    public void notifyNodeLoaded(Fqn fqn, boolean pre, Map data, Invocation=
Context ctx)
    {
-      boolean originLocal =3D ctx.isOriginLocal();
-      Map dataCopy =3D copy(data);
-      Transaction tx =3D ctx.getTransaction();
-
       List<ListenerInvocation> listeners =3D listenerInvocations.get(NodeL=
oaded.class);
 =

       if (listeners !=3D null && listeners.size() > 0)
       {
+         boolean originLocal =3D ctx.isOriginLocal();
+         Map dataCopy =3D copy(data);
+         Transaction tx =3D ctx.getTransaction();
          InvocationContext backup =3D resetInvocationContext(ctx);
          EventImpl e =3D new EventImpl();
          e.setCache(cache);
@@ -409,14 +404,13 @@
     */
    public void notifyNodeActivated(Fqn fqn, boolean pre, Map data, Invocat=
ionContext ctx)
    {
-      boolean originLocal =3D ctx.isOriginLocal();
-      Map dataCopy =3D copy(data);
-      Transaction tx =3D ctx.getTransaction();
-
       List<ListenerInvocation> listeners =3D listenerInvocations.get(NodeA=
ctivated.class);
 =

       if (listeners !=3D null && listeners.size() > 0)
       {
+         boolean originLocal =3D ctx.isOriginLocal();
+         Map dataCopy =3D copy(data);
+         Transaction tx =3D ctx.getTransaction();
          InvocationContext backup =3D resetInvocationContext(ctx);
          EventImpl e =3D new EventImpl();
          e.setCache(cache);
@@ -441,13 +435,12 @@
     */
    public void notifyNodePassivated(Fqn fqn, boolean pre, Map data, Invoca=
tionContext ctx)
    {
-      Map dataCopy =3D copy(data);
-      Transaction tx =3D ctx.getTransaction();
-
       List<ListenerInvocation> listeners =3D listenerInvocations.get(NodeP=
assivated.class);
 =

       if (listeners !=3D null && listeners.size() > 0)
       {
+         Map dataCopy =3D copy(data);
+         Transaction tx =3D ctx.getTransaction();
          InvocationContext backup =3D resetInvocationContext(ctx);
          EventImpl e =3D new EventImpl();
          e.setCache(cache);
@@ -534,12 +527,11 @@
     */
    public void notifyTransactionCompleted(Transaction transaction, boolean=
 successful, InvocationContext ctx)
    {
-      Transaction tx =3D ctx.getTransaction();
-      boolean isOriginLocal =3D ctx.isOriginLocal();
       List<ListenerInvocation> listeners =3D listenerInvocations.get(Trans=
actionCompleted.class);
-
       if (listeners !=3D null && listeners.size() > 0)
       {
+         Transaction tx =3D ctx.getTransaction();
+         boolean isOriginLocal =3D ctx.isOriginLocal();
          InvocationContext backup =3D resetInvocationContext(ctx);
          EventImpl e =3D new EventImpl();
          e.setCache(cache);
@@ -559,12 +551,13 @@
     */
    public void notifyTransactionRegistered(Transaction transaction, Invoca=
tionContext ctx)
    {
-      Transaction tx =3D ctx.getTransaction();
-      boolean isOriginLocal =3D ctx.isOriginLocal();
       List<ListenerInvocation> listeners =3D listenerInvocations.get(Trans=
actionRegistered.class);
 =

       if (listeners !=3D null && listeners.size() > 0)
       {
+         Transaction tx =3D ctx.getTransaction();
+         boolean isOriginLocal =3D ctx.isOriginLocal();
+         =

          InvocationContext backup =3D resetInvocationContext(ctx);
          EventImpl e =3D new EventImpl();
          e.setCache(cache);


--===============6735435953377440701==--