JBoss Cache SVN: r7500 - core/trunk/src/test/java/org/jboss/cache/transaction/pessimistic.
by jbosscache-commits＠lists.jboss.org
Author: mircea.markus
Date: 2009-01-18 12:16:23 -0500 (Sun, 18 Jan 2009)
New Revision: 7500
Modified:
core/trunk/src/test/java/org/jboss/cache/transaction/pessimistic/AsyncRollbackTxTest.java
Log:
updated test
Modified: core/trunk/src/test/java/org/jboss/cache/transaction/pessimistic/AsyncRollbackTxTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/transaction/pessimistic/AsyncRollbackTxTest.java 2009-01-18 17:09:45 UTC (rev 7499)
+++ core/trunk/src/test/java/org/jboss/cache/transaction/pessimistic/AsyncRollbackTxTest.java 2009-01-18 17:16:23 UTC (rev 7500)
@@ -95,7 +95,7 @@
assertNull(cache.peek(fqn, true));
}
- private void doTest(boolean commit, boolean writeLock) throws Exception
+ private void doTest(boolean commit, boolean writeLock) throws Throwable
{
assertEquals(0, cache.getNumberOfLocksHeld());
cache.put(fqn, "k", "v");//Executed in Not transactional context
@@ -111,22 +111,23 @@
assertEquals("v", cache.get(fqn, "k"));
}
- public void testRollbackCreationInDifferentTxReadLock() throws Exception
+ public void testRollbackCreationInDifferentTxReadLock() throws Throwable
{
doTest(false, false);
}
- public void testCommitCreationInDifferentTxReadLock() throws Exception
+ public void testCommitCreationInDifferentTxReadLock() throws Throwable
{
doTest(true, false);
}
- public void testRollbackCreationInDifferentTxWriteLock() throws Exception
+ public void testRollbackCreationInDifferentTxWriteLock() throws Throwable
{
doTest(false, true);
}
- public void testCommitCreationInDifferentTxWriteLock() throws Exception
+ @Test (invocationCount = 1000)
+ public void testCommitCreationInDifferentTxWriteLock() throws Throwable
{
doTest(true, true);
}
@@ -154,7 +155,7 @@
assertEquals(0, cache.getNumberOfLocksHeld());
}
- public void testTxTimeoutAndPutGetAfter() throws Exception
+ public void testTxTimeoutAndPutGetAfter() throws Throwable
{
assertEquals(0, cache.getNumberOfLocksHeld());
tm.begin();
@@ -187,7 +188,7 @@
private class SeparateThread extends Thread
{
- Exception e = null;
+ Throwable e = null;
boolean commit, writeLock;
public SeparateThread(boolean commit, boolean writeLock)
@@ -196,7 +197,7 @@
this.writeLock = writeLock;
}
- public Exception getException()
+ public Throwable getException()
{
return e;
}
@@ -230,7 +231,7 @@
assertEquals(0, cache.getNumberOfLocksHeld());
}
- catch (Exception e)
+ catch (Throwable e)
{
this.e = e;
}
17 years, 2 months
- 1
- 0
JBoss Cache SVN: r7499 - core/trunk/src/test/java/org/jboss/cache/buddyreplication.
by jbosscache-commits＠lists.jboss.org
Author: mircea.markus
Date: 2009-01-18 12:09:45 -0500 (Sun, 18 Jan 2009)
New Revision: 7499
Modified:
core/trunk/src/test/java/org/jboss/cache/buddyreplication/BuddyReplicationTestsBase.java
core/trunk/src/test/java/org/jboss/cache/buddyreplication/BuddyReplicationWithCacheLoaderTest.java
Log:
more strict eviction controll
Modified: core/trunk/src/test/java/org/jboss/cache/buddyreplication/BuddyReplicationTestsBase.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/buddyreplication/BuddyReplicationTestsBase.java 2009-01-18 16:31:42 UTC (rev 7498)
+++ core/trunk/src/test/java/org/jboss/cache/buddyreplication/BuddyReplicationTestsBase.java 2009-01-18 17:09:45 UTC (rev 7499)
@@ -97,7 +97,7 @@
}
if (stop)
{
- c.stop();
+ TestingUtil.killCaches(c);
}
else
{
@@ -228,7 +228,7 @@
// allow some time for the cachePool to start up and discover each other
TestingUtil.blockUntilViewsReceived(caches.toArray(new Cache[0]), VIEW_BLOCK_TIMEOUT);
- TestingUtil.sleepThread(getSleepTimeout());
+ waitForSingleBuddy(caches);
return caches;
}
Modified: core/trunk/src/test/java/org/jboss/cache/buddyreplication/BuddyReplicationWithCacheLoaderTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/buddyreplication/BuddyReplicationWithCacheLoaderTest.java 2009-01-18 16:31:42 UTC (rev 7498)
+++ core/trunk/src/test/java/org/jboss/cache/buddyreplication/BuddyReplicationWithCacheLoaderTest.java 2009-01-18 17:09:45 UTC (rev 7499)
@@ -12,13 +12,9 @@
import org.jboss.cache.UnitTestCacheFactory;
import org.jboss.cache.commands.remote.DataGravitationCleanupCommand;
import org.jboss.cache.config.Configuration;
-import org.jboss.cache.config.EvictionConfig;
-import org.jboss.cache.config.EvictionRegionConfig;
-import org.jboss.cache.eviction.LRUAlgorithmConfig;
import org.jboss.cache.loader.CacheLoader;
import org.jboss.cache.util.TestingUtil;
import static org.jboss.cache.util.TestingUtil.dumpCacheContents;
-import org.jboss.cache.util.internals.EvictionController;
import org.jboss.cache.util.internals.replicationlisteners.ReplicationListener;
import static org.testng.AssertJUnit.assertEquals;
import static org.testng.AssertJUnit.assertTrue;
@@ -26,7 +22,6 @@
import java.util.ArrayList;
import java.util.List;
-import java.util.Map;
/**
* Tests use of the data gravitator alongside other cache loaders as well as data gravitator options such as removeOnFind.
@@ -250,7 +245,6 @@
{
CacheSPI<Object, Object> cache1 = createCacheWithCacheLoader(true, true, passivation, true, false);
Configuration cfg1 = cache1.getConfiguration();
- configureEviction(cfg1);
Configuration cfg0 = cfg1.clone();
CacheSPI<Object, Object> cache0 = (CacheSPI<Object, Object>) new UnitTestCacheFactory<Object, Object>().createCache(cfg0, false, getClass());
@@ -275,8 +269,8 @@
assert cache1.exists(backupFoo) : "Buddy should have data";
// Sleep long enough for eviction to run twice plus a bit
- new EvictionController(cache0).startEviction();
- new EvictionController(cache1).startEviction();
+ cache0.evict(foo);
+ cache1.evict(backupFoo);
// test that the data we're looking for has been evicted in both the data owner and the buddy.
assert !cache0.exists(foo) : "Data should have evicted in data owner";
@@ -300,7 +294,6 @@
{
CacheSPI<Object, Object> cache0 = createCacheWithCacheLoader(true, true, passivation, true, false);
Configuration cfg0 = cache0.getConfiguration();
- configureEviction(cfg0);
Configuration cfg1 = cfg0.clone();
CacheSPI<Object, Object> cache1 = (CacheSPI<Object, Object>) new UnitTestCacheFactory<Object, Object>().createCache(cfg1, false, getClass());
Configuration cfg2 = cfg0.clone();
@@ -331,9 +324,8 @@
assert cache0.exists(foo) : "Data should exist in data owner";
assert cache1.exists(backupFoo) : "Buddy should have data";
- // Kick eviction off!
- new EvictionController(cache0).startEviction();
- new EvictionController(cache1).startEviction();
+ cache0.evict(foo);
+ cache1.evict(backupFoo);
// test that the data we're looking for has been evicted in both the data owner and the buddy.
assert !cache0.exists(foo) : "Data should have evicted in data owner";
@@ -346,19 +338,4 @@
// doing a get on cache2 will guarantee a remote data gravitation.
assertEquals("Passivated value available from buddy", "value", cache2.get(foo, "key"));
}
-
- private void configureEviction(Configuration cfg)
- {
- EvictionConfig ec = new EvictionConfig();
- ec.setWakeupInterval(5000);
- EvictionRegionConfig erc = new EvictionRegionConfig();
- erc.setRegionFqn(Fqn.ROOT);
- LRUAlgorithmConfig lruAlgorithmConfig = new LRUAlgorithmConfig();
- lruAlgorithmConfig.setMaxAge(0);
- lruAlgorithmConfig.setTimeToLive(0);
- lruAlgorithmConfig.setMaxNodes(1);
- erc.setEvictionAlgorithmConfig(lruAlgorithmConfig);
- ec.setDefaultEvictionRegionConfig(erc);
- cfg.setEvictionConfig(ec);
- }
}
17 years, 2 months
- 1
- 0
Hudson build became unstable: jboss-cache-core-trunk-jdk1.5 » JBoss Cache - Core Edition #736
by jboss-qa-internal＠redhat.com
See http://hudson.qa.jboss.com/hudson/job/jboss-cache-core-trunk-jdk1.5/org.j...
17 years, 2 months
- 1
- 5
JBoss Cache SVN: r7498 - core/trunk/src/test/java/org/jboss/cache/buddyreplication.
by jbosscache-commits＠lists.jboss.org
Author: mircea.markus
Date: 2009-01-18 11:31:42 -0500 (Sun, 18 Jan 2009)
New Revision: 7498
Modified:
core/trunk/src/test/java/org/jboss/cache/buddyreplication/EvictionOfBuddyBackupsTest.java
Log:
more strict eviction controll
Modified: core/trunk/src/test/java/org/jboss/cache/buddyreplication/EvictionOfBuddyBackupsTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/buddyreplication/EvictionOfBuddyBackupsTest.java 2009-01-18 16:14:57 UTC (rev 7497)
+++ core/trunk/src/test/java/org/jboss/cache/buddyreplication/EvictionOfBuddyBackupsTest.java 2009-01-18 16:31:42 UTC (rev 7498)
@@ -8,6 +8,7 @@
import org.jboss.cache.eviction.LRUAlgorithmConfig;
import org.jboss.cache.eviction.NullEvictionAlgorithmConfig;
import org.jboss.cache.util.TestingUtil;
+import org.jboss.cache.util.internals.EvictionController;
import org.testng.annotations.AfterMethod;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
@@ -22,15 +23,19 @@
{
private CacheSPI cache1, cache2;
private Fqn fqn = Fqn.fromString("/a/b/c");
+ private EvictionController ec1;
+ private EvictionController ec2;
- @BeforeMethod
+ @BeforeMethod
public void setUp() throws Exception
{
cache1 = createCache(1, null, true, false);
cache1.getConfiguration().setEvictionConfig(getEvictionConfig());
cache1.start();
+ ec1 = new EvictionController(cache1);
- cache2 = (CacheSPI) new UnitTestCacheFactory<Object, Object>().createCache(cache1.getConfiguration().clone(), getClass());
+ cache2 = (CacheSPI) new UnitTestCacheFactory<Object, Object>().createCache(cache1.getConfiguration().clone(), getClass());
+ ec2 = new EvictionController(cache2);
TestingUtil.blockUntilViewsReceived(60000, cache1, cache2);
}
@@ -50,7 +55,7 @@
EvictionConfig c = new EvictionConfig();
EvictionRegionConfig defaultRegion = new EvictionRegionConfig(Fqn.ROOT, new NullEvictionAlgorithmConfig());
c.setDefaultEvictionRegionConfig(defaultRegion);
- c.setWakeupInterval(1000);
+ c.setWakeupInterval(0);
LRUAlgorithmConfig lru = new LRUAlgorithmConfig(1000, 1000);
EvictionRegionConfig subregion = new EvictionRegionConfig(fqn, lru);
@@ -66,7 +71,9 @@
assert cache2.peek(fqnTransformer.getBackupFqn(cache1.getLocalAddress(), fqn), false, false) != null : "Node should exist on backup";
// now wait for eviction to kick in - for up to 2 secs
- TestingUtil.sleepThread(2000);
+ TestingUtil.sleepThread(1100);
+ ec1.startEviction();
+ ec2.startEviction();
assert cache1.peek(fqn, false, false) == null : "Node should have evicted";
assert cache2.peek(fqnTransformer.getBackupFqn(cache1.getLocalAddress(), fqn), false, false) == null : "Node should have evicted on backup";
17 years, 2 months
- 1
- 0
JBoss Cache SVN: r7497 - core/trunk/src/test/java/org/jboss/cache/eviction.
by jbosscache-commits＠lists.jboss.org
Author: mircea.markus
Date: 2009-01-18 11:14:57 -0500 (Sun, 18 Jan 2009)
New Revision: 7497
Modified:
core/trunk/src/test/java/org/jboss/cache/eviction/ExpirationPolicyTest.java
Log:
this depends havily on time, use success rate as this might fail every now and then
Modified: core/trunk/src/test/java/org/jboss/cache/eviction/ExpirationPolicyTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/eviction/ExpirationPolicyTest.java 2009-01-18 15:59:49 UTC (rev 7496)
+++ core/trunk/src/test/java/org/jboss/cache/eviction/ExpirationPolicyTest.java 2009-01-18 16:14:57 UTC (rev 7497)
@@ -68,6 +68,8 @@
cache = null;
}
+
+ @Test (invocationCount = 3, successPercentage = 60)
public void testUpdateToFuture() throws Exception
{
future = System.currentTimeMillis() + 2500;
@@ -94,7 +96,6 @@
}
}
- @Test
public void testEviction() throws Exception
{
cache.put(fqn1, ExpirationAlgorithmConfig.EXPIRATION_KEY, future);
17 years, 2 months
- 1
- 0
Hudson build became unstable: jboss-cache-core-trunk-jdk1.6 » JBoss Cache - Core Edition #595
by jboss-qa-internal＠redhat.com
See http://hudson.qa.jboss.com/hudson/job/jboss-cache-core-trunk-jdk1.6/org.j...
17 years, 2 months
- 1
- 7
JBoss Cache SVN: r7496 - core/trunk/src/test/java/org/jboss/cache/passivation.
by jbosscache-commits＠lists.jboss.org
Author: mircea.markus
Date: 2009-01-18 10:59:49 -0500 (Sun, 18 Jan 2009)
New Revision: 7496
Modified:
core/trunk/src/test/java/org/jboss/cache/passivation/BasicPassivationTest.java
Log:
more strict eviction controll
Modified: core/trunk/src/test/java/org/jboss/cache/passivation/BasicPassivationTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/passivation/BasicPassivationTest.java 2009-01-18 15:31:27 UTC (rev 7495)
+++ core/trunk/src/test/java/org/jboss/cache/passivation/BasicPassivationTest.java 2009-01-18 15:59:49 UTC (rev 7496)
@@ -18,6 +18,7 @@
import org.jboss.cache.notifications.event.Event;
import org.jboss.cache.notifications.event.NodeEvent;
import org.jboss.cache.util.TestingUtil;
+import org.jboss.cache.util.internals.EvictionController;
import static org.testng.AssertJUnit.*;
import org.testng.annotations.AfterMethod;
import org.testng.annotations.BeforeMethod;
@@ -27,11 +28,10 @@
* @author Ben Wang
* @version $Revision$
*/
-@Test(groups = {"functional"}, sequential = true, testName = "passivation.BasicPassivationTest")
+@Test(groups = {"functional"}, testName = "passivation.BasicPassivationTest")
public class BasicPassivationTest
{
CacheSPI cache;
- long wakeupIntervalMillis = 0;
final String ROOT_STR = "/test";
Throwable t1_ex, t2_ex;
final long DURATION = 10000;
@@ -39,33 +39,25 @@
final String FQNSTR = "/org/jboss/3";
int activationCount = 0;
int passivationCount = 0;
+ private EvictionController ec;
- @BeforeMethod(alwaysRun = true)
+ @BeforeMethod(alwaysRun = true)
public void setUp() throws Exception
{
- initCaches();
- wakeupIntervalMillis = cache.getConfiguration().getEvictionConfig().getWakeupInterval();
- if (wakeupIntervalMillis < 0)
- {
- fail("testEviction(): eviction thread wake up interval is illegal " + wakeupIntervalMillis);
- }
-
- t1_ex = t2_ex = null;
+ UnitTestCacheFactory<String, String> instance = new UnitTestCacheFactory<String, String>();
+ cache = (CacheSPI) instance.createCache(new XmlConfigurationParser().parseFile("configs/local-passivation.xml"), false, getClass());
+ cache.getConfiguration().getEvictionConfig().setWakeupInterval(0);
+ cache.getConfiguration().setTransactionManagerLookupClass("org.jboss.cache.transaction.DummyTransactionManagerLookup");
+ Object listener = new TestCacheListener();
+ cache.getConfiguration().getCacheLoaderConfig().getFirstCacheLoaderConfig().setClassName(DummyInMemoryCacheLoader.class.getName());
+ cache.start();
+ ec = new EvictionController(cache);
+ cache.getNotifier().addCacheListener(listener);
+ t1_ex = t2_ex = null;
isTrue = true;
}
- private void initCaches()
- {
- UnitTestCacheFactory<String, String> instance = new UnitTestCacheFactory<String, String>();
- cache = (CacheSPI) instance.createCache(new XmlConfigurationParser().parseFile("configs/local-passivation.xml"), false, getClass());
- cache.getConfiguration().setTransactionManagerLookupClass("org.jboss.cache.transaction.DummyTransactionManagerLookup");
- Object listener = new TestCacheListener();
- cache.getConfiguration().getCacheLoaderConfig().getFirstCacheLoaderConfig().setClassName(DummyInMemoryCacheLoader.class.getName());
- cache.start();
- cache.getNotifier().addCacheListener(listener);
- }
-
- @AfterMethod(alwaysRun = true)
+ @AfterMethod(alwaysRun = true)
public void tearDown() throws Exception
{
TestingUtil.killCaches(cache);
@@ -79,7 +71,8 @@
cache.put(FQNSTR, FQNSTR, FQNSTR);
- TestingUtil.sleepThread(2100);
+ TestingUtil.sleepThread(1100);
+ ec.startEviction();
assert !(cache.exists(FQNSTR) && cache.getNode(FQNSTR).getKeys().contains(FQNSTR)) : "Should have been evicted!!";
Object val = cache.get(FQNSTR, FQNSTR);
17 years, 2 months
- 1
- 0
JBoss Cache SVN: r7495 - core/trunk/src/test/java/org/jboss/cache/buddyreplication.
by jbosscache-commits＠lists.jboss.org
Author: mircea.markus
Date: 2009-01-18 10:31:27 -0500 (Sun, 18 Jan 2009)
New Revision: 7495
Modified:
core/trunk/src/test/java/org/jboss/cache/buddyreplication/BuddyPoolBroadcastTest.java
Log:
removed test as it was doing wrong assumptions
Modified: core/trunk/src/test/java/org/jboss/cache/buddyreplication/BuddyPoolBroadcastTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/buddyreplication/BuddyPoolBroadcastTest.java 2009-01-16 17:23:19 UTC (rev 7494)
+++ core/trunk/src/test/java/org/jboss/cache/buddyreplication/BuddyPoolBroadcastTest.java 2009-01-18 15:31:27 UTC (rev 7495)
@@ -9,7 +9,6 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.jboss.cache.CacheSPI;
-import org.jboss.cache.util.TestingUtil;
import static org.testng.AssertJUnit.assertEquals;
import org.testng.annotations.AfterMethod;
import org.testng.annotations.Test;
@@ -18,6 +17,7 @@
import java.util.List;
import java.util.Map;
import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
/**
* Tests basic group membership semantics
@@ -38,7 +38,6 @@
public void test2CachesWithPoolNames() throws Exception
{
- log.error("Running test2CachesWithPoolNames");
List<CacheSPI<Object, Object>> caches = createCaches(2, true);
cachesTL.set(caches);
@@ -48,87 +47,4 @@
assertEquals("A", groupMap.get(caches.get(0).getLocalAddress()));
assertEquals("B", groupMap.get(caches.get(1).getLocalAddress()));
}
-
- public void testConcurrency() throws Exception
- {
- int numCaches = 4;
- List<CacheSPI<Object, Object>> caches = new ArrayList<CacheSPI<Object, Object>>(4);
- cachesTL.set(caches);
- CountDownLatch latch = new CountDownLatch(1);
- CacheStarter[] starters = new CacheStarter[numCaches];
-
- for (int i = 0; i < numCaches; i++)
- {
- caches.add(createCache(1, new String(new char[]{(char) ('A' + i)}), false, false));
- starters[i] = new CacheStarter("CacheStarter-" + i, latch, caches.get(i));
- starters[i].start();
- }
-
- // now have the lot start simultaneously
- latch.countDown();
-
- // allow a generous sleep time
- TestingUtil.blockUntilViewsReceived(caches.toArray(new CacheSPI[0]), 60000);
-
-
- long timeout = System.currentTimeMillis() + 5000 * numCaches;
- while (System.currentTimeMillis() < timeout)
- {
- boolean allPoolNameBroadcasted = true;
- for (int i = 0; i < numCaches; i++)
- {
- boolean receivedFromAll = caches.get(i).getBuddyManager().buddyPool.size() == numCaches;
- allPoolNameBroadcasted &= receivedFromAll;
- }
- if (allPoolNameBroadcasted)
- {
- break;
- }
- if (System.currentTimeMillis() >= timeout)
- {
- log.error("********* pool membership was not brodcasted in " + (timeout - System.currentTimeMillis()) + " millis!");
-
- assert false : "pool membership was not brodcasted in " + timeout + " millis!";
- }
- Thread.sleep(50);
- }
-
- //and now look at the state of things.
- Map map = caches.get(0).getBuddyManager().buddyPool;
- for (int i = 0; i < numCaches; i++)
- {
- if (caches.get(i) != null)
- assertEquals("Failed on cache " + i + "(" + caches.get(i).getLocalAddress() + ")", new String(new char[]{(char) ('A' + i)}), map.get(caches.get(i).getLocalAddress()));
- }
-
- checkConsistentPoolState(caches);
- }
-
- public class CacheStarter extends Thread
- {
- private CountDownLatch latch;
- private CacheSPI cache;
-
- public CacheStarter(String name, CountDownLatch latch, CacheSPI cache)
- {
- super(name);
- this.latch = latch;
- this.cache = cache;
- }
-
- public void run()
- {
- try
- {
- latch.await();
- cache.start();
- }
- catch (Exception e)
- {
- e.printStackTrace();
- log.error(e);
- }
- }
- }
-
}
17 years, 2 months
- 1
- 0
JBoss Cache SVN: r7494 - in core/branches/flat/src: test/java/org/horizon and 1 other directories.
by jbosscache-commits＠lists.jboss.org
Author: manik.surtani(a)jboss.com
Date: 2009-01-16 12:23:19 -0500 (Fri, 16 Jan 2009)
New Revision: 7494
Added:
core/branches/flat/src/test/java/org/horizon/util/
core/branches/flat/src/test/java/org/horizon/util/UnitTestTestNGListener.java
Removed:
core/branches/flat/src/main/java/org/horizon/util/UnitTestTestNGListener.java
Log:
Moved test helper class to test src root
Deleted: core/branches/flat/src/main/java/org/horizon/util/UnitTestTestNGListener.java
===================================================================
--- core/branches/flat/src/main/java/org/horizon/util/UnitTestTestNGListener.java 2009-01-16 17:13:29 UTC (rev 7493)
+++ core/branches/flat/src/main/java/org/horizon/util/UnitTestTestNGListener.java 2009-01-16 17:23:19 UTC (rev 7494)
@@ -1,93 +0,0 @@
-/*
- * To change this template, choose Tools | Templates
- * and open the template in the editor.
- */
-
-package org.horizon.util;
-
-import org.testng.IClass;
-import org.testng.ITestContext;
-import org.testng.ITestListener;
-import org.testng.ITestResult;
-
-/**
- * @author dpospisi
- * @since 1.0
- */
-public class UnitTestTestNGListener implements ITestListener {
-
- /**
- * Holds test classes actually running in all threads.
- */
- private ThreadLocal<IClass> threadTestClass = new ThreadLocal<IClass>();
-
- private int failed = 0;
- private int succeded = 0;
- private int skipped = 0;
-
- public void onTestStart(ITestResult res) {
- System.out.println(getThreadId() + " Starting test " + getTestDesc(res));
-
- /*
- IClass testClass = threadTestClass.get();
- if ((testClass != null) && (! res.getTestClass().equals(testClass))) {
-
- System.out.println(getThreadId() + " New test class" + res.getTestClass() + ", was " + testClass);
-
- // the thread has started testing a new test class
-
- // clean all possibly running caches created in current thread
- boolean cleaned = new UnitTestCacheFactory().cleanUp();
- if (cleaned) {
- // previous test left a cache
- System.out.println(getThreadId() +" WARNING !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!");
- System.out.println(getThreadId() +" A test method in " + testClass.getName() + " did not clean all cache instances properly.");
- System.out.println(getThreadId() +" Use UnitTestCacheFactory.cleanUp() or TestngUtil.killCaches(...) ");
- System.out.println(getThreadId() +" WARNING !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!");
- }
- }
- */
-
- threadTestClass.set(res.getTestClass());
- }
-
- synchronized public void onTestSuccess(ITestResult arg0) {
- System.out.println(getThreadId() + " Test " + getTestDesc(arg0) + " succeded.");
- succeded++;
- printStatus();
- }
-
- synchronized public void onTestFailure(ITestResult arg0) {
- System.out.println(getThreadId() + " Test " + getTestDesc(arg0) + " failed.");
- failed++;
- printStatus();
- }
-
- synchronized public void onTestSkipped(ITestResult arg0) {
- System.out.println(getThreadId() + " Test " + getTestDesc(arg0) + " skipped.");
- skipped++;
- printStatus();
- }
-
- public void onTestFailedButWithinSuccessPercentage(ITestResult arg0) {
- }
-
- public void onStart(ITestContext arg0) {
- }
-
- public void onFinish(ITestContext arg0) {
- }
-
- private String getThreadId() {
- return "[" + Thread.currentThread().getName() + "]";
- }
-
- private String getTestDesc(ITestResult res) {
- return res.getMethod().getMethodName() + "(" + res.getTestClass().getName() + ")";
- }
-
- private void printStatus() {
- System.out.println("Testsuite execution progress: tests succeded " + succeded + ", failed " + failed + ", skipped " + skipped + ".");
- }
-
-}
Copied: core/branches/flat/src/test/java/org/horizon/util/UnitTestTestNGListener.java (from rev 7491, core/branches/flat/src/main/java/org/horizon/util/UnitTestTestNGListener.java)
===================================================================
--- core/branches/flat/src/test/java/org/horizon/util/UnitTestTestNGListener.java (rev 0)
+++ core/branches/flat/src/test/java/org/horizon/util/UnitTestTestNGListener.java 2009-01-16 17:23:19 UTC (rev 7494)
@@ -0,0 +1,93 @@
+/*
+ * To change this template, choose Tools | Templates
+ * and open the template in the editor.
+ */
+
+package org.horizon.util;
+
+import org.testng.IClass;
+import org.testng.ITestContext;
+import org.testng.ITestListener;
+import org.testng.ITestResult;
+
+/**
+ * @author dpospisi
+ * @since 1.0
+ */
+public class UnitTestTestNGListener implements ITestListener {
+
+ /**
+ * Holds test classes actually running in all threads.
+ */
+ private ThreadLocal<IClass> threadTestClass = new ThreadLocal<IClass>();
+
+ private int failed = 0;
+ private int succeded = 0;
+ private int skipped = 0;
+
+ public void onTestStart(ITestResult res) {
+ System.out.println(getThreadId() + " Starting test " + getTestDesc(res));
+
+ /*
+ IClass testClass = threadTestClass.get();
+ if ((testClass != null) && (! res.getTestClass().equals(testClass))) {
+
+ System.out.println(getThreadId() + " New test class" + res.getTestClass() + ", was " + testClass);
+
+ // the thread has started testing a new test class
+
+ // clean all possibly running caches created in current thread
+ boolean cleaned = new UnitTestCacheFactory().cleanUp();
+ if (cleaned) {
+ // previous test left a cache
+ System.out.println(getThreadId() +" WARNING !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!");
+ System.out.println(getThreadId() +" A test method in " + testClass.getName() + " did not clean all cache instances properly.");
+ System.out.println(getThreadId() +" Use UnitTestCacheFactory.cleanUp() or TestngUtil.killCaches(...) ");
+ System.out.println(getThreadId() +" WARNING !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!");
+ }
+ }
+ */
+
+ threadTestClass.set(res.getTestClass());
+ }
+
+ synchronized public void onTestSuccess(ITestResult arg0) {
+ System.out.println(getThreadId() + " Test " + getTestDesc(arg0) + " succeded.");
+ succeded++;
+ printStatus();
+ }
+
+ synchronized public void onTestFailure(ITestResult arg0) {
+ System.out.println(getThreadId() + " Test " + getTestDesc(arg0) + " failed.");
+ failed++;
+ printStatus();
+ }
+
+ synchronized public void onTestSkipped(ITestResult arg0) {
+ System.out.println(getThreadId() + " Test " + getTestDesc(arg0) + " skipped.");
+ skipped++;
+ printStatus();
+ }
+
+ public void onTestFailedButWithinSuccessPercentage(ITestResult arg0) {
+ }
+
+ public void onStart(ITestContext arg0) {
+ }
+
+ public void onFinish(ITestContext arg0) {
+ }
+
+ private String getThreadId() {
+ return "[" + Thread.currentThread().getName() + "]";
+ }
+
+ private String getTestDesc(ITestResult res) {
+ return res.getMethod().getMethodName() + "(" + res.getTestClass().getName() + ")";
+ }
+
+ private void printStatus() {
+ System.out.println("Testsuite execution progress: tests succeded " + succeded + ", failed " + failed + ", skipped " + skipped + ".");
+ }
+
+}
Property changes on: core/branches/flat/src/test/java/org/horizon/util/UnitTestTestNGListener.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
17 years, 2 months
- 1
- 0
JBoss Cache SVN: r7493 - in core/branches/flat: src/main/java/org/horizon and 34 other directories.
by jbosscache-commits＠lists.jboss.org
Author: manik.surtani(a)jboss.com
Date: 2009-01-16 12:13:29 -0500 (Fri, 16 Jan 2009)
New Revision: 7493
Added:
core/branches/flat/src/main/java/org/horizon/logging/
core/branches/flat/src/main/java/org/horizon/logging/AbstractLogImpl.java
core/branches/flat/src/main/java/org/horizon/logging/JDKLogImpl.java
core/branches/flat/src/main/java/org/horizon/logging/Log.java
core/branches/flat/src/main/java/org/horizon/logging/Log4JLogImpl.java
core/branches/flat/src/main/java/org/horizon/logging/LogFactory.java
Modified:
core/branches/flat/pom.xml
core/branches/flat/src/main/java/org/horizon/CacheDelegate.java
core/branches/flat/src/main/java/org/horizon/CacheStatus.java
core/branches/flat/src/main/java/org/horizon/atomic/AtomicHashMapDelta.java
core/branches/flat/src/main/java/org/horizon/cluster/ReplicationQueue.java
core/branches/flat/src/main/java/org/horizon/commands/read/GetKeyValueCommand.java
core/branches/flat/src/main/java/org/horizon/commands/remote/ClusteredGetCommand.java
core/branches/flat/src/main/java/org/horizon/commands/remote/ReplicateCommand.java
core/branches/flat/src/main/java/org/horizon/commands/write/InvalidateCommand.java
core/branches/flat/src/main/java/org/horizon/config/ConfigurationComponent.java
core/branches/flat/src/main/java/org/horizon/config/EvictionCacheConfig.java
core/branches/flat/src/main/java/org/horizon/config/parsing/CacheConfigsXmlParser.java
core/branches/flat/src/main/java/org/horizon/config/parsing/RootElementBuilder.java
core/branches/flat/src/main/java/org/horizon/config/parsing/XmlConfigHelper.java
core/branches/flat/src/main/java/org/horizon/container/ReadCommittedEntry.java
core/branches/flat/src/main/java/org/horizon/container/RepeatableReadEntry.java
core/branches/flat/src/main/java/org/horizon/context/InvocationContextImpl.java
core/branches/flat/src/main/java/org/horizon/eviction/DefaultEvictionAction.java
core/branches/flat/src/main/java/org/horizon/eviction/EvictionCacheManagerImpl.java
core/branches/flat/src/main/java/org/horizon/eviction/EvictionManagerImpl.java
core/branches/flat/src/main/java/org/horizon/eviction/EvictionTimerTask.java
core/branches/flat/src/main/java/org/horizon/eviction/RemoveOnEvictActionPolicy.java
core/branches/flat/src/main/java/org/horizon/eviction/algorithms/BaseEvictionAlgorithm.java
core/branches/flat/src/main/java/org/horizon/eviction/algorithms/BaseSortedEvictionAlgorithm.java
core/branches/flat/src/main/java/org/horizon/eviction/algorithms/ExpirationAlgorithm.java
core/branches/flat/src/main/java/org/horizon/eviction/algorithms/fifo/FIFOAlgorithm.java
core/branches/flat/src/main/java/org/horizon/eviction/algorithms/lfu/LFUAlgorithm.java
core/branches/flat/src/main/java/org/horizon/eviction/algorithms/lru/LRUAlgorithm.java
core/branches/flat/src/main/java/org/horizon/factories/AbstractComponentRegistry.java
core/branches/flat/src/main/java/org/horizon/factories/ComponentFactory.java
core/branches/flat/src/main/java/org/horizon/factories/EntryFactoryImpl.java
core/branches/flat/src/main/java/org/horizon/interceptors/CacheStoreInterceptor.java
core/branches/flat/src/main/java/org/horizon/interceptors/InterceptorChain.java
core/branches/flat/src/main/java/org/horizon/interceptors/base/CommandInterceptor.java
core/branches/flat/src/main/java/org/horizon/jmx/JmxRegistrationManager.java
core/branches/flat/src/main/java/org/horizon/jmx/PlatformMBeanServerRegistration.java
core/branches/flat/src/main/java/org/horizon/jmx/ResourceDMBean.java
core/branches/flat/src/main/java/org/horizon/loader/AbstractCacheLoader.java
core/branches/flat/src/main/java/org/horizon/loader/AsyncCacheLoader.java
core/branches/flat/src/main/java/org/horizon/loader/CacheLoaderManager.java
core/branches/flat/src/main/java/org/horizon/loader/ClusteredCacheLoader.java
core/branches/flat/src/main/java/org/horizon/loader/FileCacheLoader.java
core/branches/flat/src/main/java/org/horizon/loader/ReadOnlyDelegatingCacheLoader.java
core/branches/flat/src/main/java/org/horizon/loader/SingletonStoreCacheLoader.java
core/branches/flat/src/main/java/org/horizon/lock/StripedLockManager.java
core/branches/flat/src/main/java/org/horizon/marshall/CacheMarshallerStarobrno.java
core/branches/flat/src/main/java/org/horizon/marshall/VersionAwareMarshaller.java
core/branches/flat/src/main/java/org/horizon/notifications/NotifierImpl.java
core/branches/flat/src/main/java/org/horizon/remoting/ChannelMessageListener.java
core/branches/flat/src/main/java/org/horizon/remoting/RPCManagerImpl.java
core/branches/flat/src/main/java/org/horizon/statetransfer/DefaultStateTransferManager.java
core/branches/flat/src/main/java/org/horizon/transaction/BatchModeTransactionManager.java
core/branches/flat/src/main/java/org/horizon/transaction/DummyBaseTransactionManager.java
core/branches/flat/src/main/java/org/horizon/transaction/DummyTransaction.java
core/branches/flat/src/main/java/org/horizon/transaction/DummyTransactionManager.java
core/branches/flat/src/main/java/org/horizon/transaction/DummyUserTransaction.java
core/branches/flat/src/main/java/org/horizon/transaction/GenericTransactionManagerLookup.java
core/branches/flat/src/main/java/org/horizon/transaction/TransactionTable.java
core/branches/flat/src/main/java/org/horizon/tree/TreeCacheImpl.java
core/branches/flat/src/main/java/org/horizon/util/FileLookup.java
core/branches/flat/src/main/java/org/horizon/util/ReflectionUtil.java
core/branches/flat/src/main/java/org/horizon/util/TypedProperties.java
core/branches/flat/src/main/java/org/horizon/util/internals/ReplicationListener.java
core/branches/flat/src/test/java/org/horizon/BasicTest.java
core/branches/flat/src/test/java/org/horizon/UnitTestCacheFactory.java
core/branches/flat/src/test/java/org/horizon/api/mvcc/LockTestBase.java
core/branches/flat/src/test/java/org/horizon/api/tree/NodeMoveAPITest.java
core/branches/flat/src/test/java/org/horizon/profiling/ProfileTest.java
core/branches/flat/src/test/java/org/horizon/profiling/TreeProfileTest.java
core/branches/flat/src/test/java/org/horizon/replication/SyncCacheListenerTest.java
Log:
Removed dependencies on commons logging and used custom log layer to switch between Log4J (optional) and JDK logging. Also added SEAM style parameterization of log messages.
Modified: core/branches/flat/pom.xml
===================================================================
--- core/branches/flat/pom.xml 2009-01-16 15:47:54 UTC (rev 7492)
+++ core/branches/flat/pom.xml 2009-01-16 17:13:29 UTC (rev 7493)
@@ -38,12 +38,6 @@
</dependency>
<dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <version>1.1.1</version>
- </dependency>
-
- <dependency>
<groupId>org.jboss</groupId>
<artifactId>jboss-common-core</artifactId>
<version>2.2.8.GA</version>
@@ -56,24 +50,28 @@
<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>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>net.noderunner</groupId>
<artifactId>amazon-s3</artifactId>
@@ -81,6 +79,13 @@
<optional>true</optional>
</dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>1.2.14</version>
+ <optional>true</optional>
+ </dependency>
+
<!-- test dependencies -->
<dependency>
<groupId>org.easymock</groupId>
@@ -88,24 +93,28 @@
<version>2.4</version>
<scope>test</scope>
</dependency>
+
<dependency>
<groupId>jboss.jbossts</groupId>
<artifactId>jbossjta</artifactId>
<version>4.3.0.GA</version>
<scope>test</scope>
</dependency>
+
<dependency>
<groupId>beanshell</groupId>
<artifactId>bsh</artifactId>
<version>2.0b4</version>
<scope>test</scope>
</dependency>
+
<dependency>
<groupId>net.noderunner</groupId>
<artifactId>http</artifactId>
<version>1.0</version>
<scope>test</scope>
</dependency>
+
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
Modified: core/branches/flat/src/main/java/org/horizon/CacheDelegate.java
===================================================================
--- core/branches/flat/src/main/java/org/horizon/CacheDelegate.java 2009-01-16 15:47:54 UTC (rev 7492)
+++ core/branches/flat/src/main/java/org/horizon/CacheDelegate.java 2009-01-16 17:13:29 UTC (rev 7493)
@@ -21,8 +21,6 @@
*/
package org.horizon;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.horizon.atomic.AtomicHashMap;
import org.horizon.atomic.AtomicMap;
import org.horizon.atomic.AtomicMapCache;
@@ -48,6 +46,8 @@
import org.horizon.invocation.InvocationContextContainer;
import org.horizon.loader.CacheLoaderManager;
import org.horizon.lock.LockManager;
+import org.horizon.logging.Log;
+import org.horizon.logging.LogFactory;
import org.horizon.marshall.Marshaller;
import org.horizon.notifications.Notifier;
import org.horizon.remoting.RPCManager;
Modified: core/branches/flat/src/main/java/org/horizon/CacheStatus.java
===================================================================
--- core/branches/flat/src/main/java/org/horizon/CacheStatus.java 2009-01-16 15:47:54 UTC (rev 7492)
+++ core/branches/flat/src/main/java/org/horizon/CacheStatus.java 2009-01-16 17:13:29 UTC (rev 7493)
@@ -21,8 +21,8 @@
*/
package org.horizon;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.horizon.logging.Log;
+import org.horizon.logging.LogFactory;
/**
* Various states that an object that has a four stage lifecycle (i.e. <code>create()</code>, <code>start()</code>,
Modified: core/branches/flat/src/main/java/org/horizon/atomic/AtomicHashMapDelta.java
===================================================================
--- core/branches/flat/src/main/java/org/horizon/atomic/AtomicHashMapDelta.java 2009-01-16 15:47:54 UTC (rev 7492)
+++ core/branches/flat/src/main/java/org/horizon/atomic/AtomicHashMapDelta.java 2009-01-16 17:13:29 UTC (rev 7493)
@@ -21,8 +21,8 @@
*/
package org.horizon.atomic;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.horizon.logging.Log;
+import org.horizon.logging.LogFactory;
import java.io.IOException;
import java.io.ObjectInput;
Modified: core/branches/flat/src/main/java/org/horizon/cluster/ReplicationQueue.java
===================================================================
--- core/branches/flat/src/main/java/org/horizon/cluster/ReplicationQueue.java 2009-01-16 15:47:54 UTC (rev 7492)
+++ core/branches/flat/src/main/java/org/horizon/cluster/ReplicationQueue.java 2009-01-16 17:13:29 UTC (rev 7493)
@@ -21,8 +21,6 @@
*/
package org.horizon.cluster;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.horizon.commands.CommandsFactory;
import org.horizon.commands.ReplicableCommand;
import org.horizon.commands.remote.ReplicateCommand;
@@ -30,6 +28,8 @@
import org.horizon.factories.annotations.Inject;
import org.horizon.factories.annotations.Start;
import org.horizon.factories.annotations.Stop;
+import org.horizon.logging.Log;
+import org.horizon.logging.LogFactory;
import org.horizon.remoting.RPCManager;
import java.util.ArrayList;
Modified: core/branches/flat/src/main/java/org/horizon/commands/read/GetKeyValueCommand.java
===================================================================
--- core/branches/flat/src/main/java/org/horizon/commands/read/GetKeyValueCommand.java 2009-01-16 15:47:54 UTC (rev 7492)
+++ core/branches/flat/src/main/java/org/horizon/commands/read/GetKeyValueCommand.java 2009-01-16 17:13:29 UTC (rev 7493)
@@ -21,11 +21,11 @@
*/
package org.horizon.commands.read;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.horizon.commands.Visitor;
import org.horizon.container.MVCCEntry;
import org.horizon.context.InvocationContext;
+import org.horizon.logging.Log;
+import org.horizon.logging.LogFactory;
import org.horizon.notifications.Notifier;
/**
Modified: core/branches/flat/src/main/java/org/horizon/commands/remote/ClusteredGetCommand.java
===================================================================
--- core/branches/flat/src/main/java/org/horizon/commands/remote/ClusteredGetCommand.java 2009-01-16 15:47:54 UTC (rev 7492)
+++ core/branches/flat/src/main/java/org/horizon/commands/remote/ClusteredGetCommand.java 2009-01-16 17:13:29 UTC (rev 7493)
@@ -21,13 +21,13 @@
*/
package org.horizon.commands.remote;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.horizon.commands.DataCommand;
import org.horizon.commands.ReplicableCommand;
import org.horizon.container.DataContainer;
import org.horizon.context.InvocationContext;
import org.horizon.interceptors.InterceptorChain;
+import org.horizon.logging.Log;
+import org.horizon.logging.LogFactory;
import java.util.ArrayList;
import java.util.List;
Modified: core/branches/flat/src/main/java/org/horizon/commands/remote/ReplicateCommand.java
===================================================================
--- core/branches/flat/src/main/java/org/horizon/commands/remote/ReplicateCommand.java 2009-01-16 15:47:54 UTC (rev 7492)
+++ core/branches/flat/src/main/java/org/horizon/commands/remote/ReplicateCommand.java 2009-01-16 17:13:29 UTC (rev 7493)
@@ -21,12 +21,12 @@
*/
package org.horizon.commands.remote;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.horizon.commands.ReplicableCommand;
import org.horizon.commands.VisitableCommand;
import org.horizon.context.InvocationContext;
import org.horizon.interceptors.InterceptorChain;
+import org.horizon.logging.Log;
+import org.horizon.logging.LogFactory;
import java.util.ArrayList;
import java.util.List;
Modified: core/branches/flat/src/main/java/org/horizon/commands/write/InvalidateCommand.java
===================================================================
--- core/branches/flat/src/main/java/org/horizon/commands/write/InvalidateCommand.java 2009-01-16 15:47:54 UTC (rev 7492)
+++ core/branches/flat/src/main/java/org/horizon/commands/write/InvalidateCommand.java 2009-01-16 17:13:29 UTC (rev 7493)
@@ -21,13 +21,13 @@
*/
package org.horizon.commands.write;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.horizon.CacheSPI;
import org.horizon.commands.Visitor;
import org.horizon.commands.read.AbstractDataCommand;
import org.horizon.container.DataContainer;
import org.horizon.context.InvocationContext;
+import org.horizon.logging.Log;
+import org.horizon.logging.LogFactory;
import org.horizon.notifications.Notifier;
import org.horizon.tree.Fqn;
Modified: core/branches/flat/src/main/java/org/horizon/config/ConfigurationComponent.java
===================================================================
--- core/branches/flat/src/main/java/org/horizon/config/ConfigurationComponent.java 2009-01-16 15:47:54 UTC (rev 7492)
+++ core/branches/flat/src/main/java/org/horizon/config/ConfigurationComponent.java 2009-01-16 17:13:29 UTC (rev 7493)
@@ -21,8 +21,6 @@
*/
package org.horizon.config;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.horizon.CacheSPI;
import org.horizon.CacheStatus;
import org.horizon.factories.ComponentRegistry;
@@ -30,6 +28,8 @@
import org.horizon.factories.annotations.Start;
import org.horizon.factories.scopes.Scope;
import org.horizon.factories.scopes.Scopes;
+import org.horizon.logging.Log;
+import org.horizon.logging.LogFactory;
import java.util.Collection;
import java.util.Collections;
Modified: core/branches/flat/src/main/java/org/horizon/config/EvictionCacheConfig.java
===================================================================
--- core/branches/flat/src/main/java/org/horizon/config/EvictionCacheConfig.java 2009-01-16 15:47:54 UTC (rev 7492)
+++ core/branches/flat/src/main/java/org/horizon/config/EvictionCacheConfig.java 2009-01-16 17:13:29 UTC (rev 7493)
@@ -21,7 +21,7 @@
*/
package org.horizon.config;
-import org.apache.commons.logging.LogFactory;
+import org.horizon.logging.LogFactory;
public class EvictionCacheConfig extends ConfigurationComponent {
/**
Modified: core/branches/flat/src/main/java/org/horizon/config/parsing/CacheConfigsXmlParser.java
===================================================================
--- core/branches/flat/src/main/java/org/horizon/config/parsing/CacheConfigsXmlParser.java 2009-01-16 15:47:54 UTC (rev 7492)
+++ core/branches/flat/src/main/java/org/horizon/config/parsing/CacheConfigsXmlParser.java 2009-01-16 17:13:29 UTC (rev 7493)
@@ -21,10 +21,10 @@
*/
package org.horizon.config.parsing;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.horizon.config.Configuration;
import org.horizon.config.ConfigurationException;
+import org.horizon.logging.Log;
+import org.horizon.logging.LogFactory;
import org.horizon.util.FileLookup;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
Modified: core/branches/flat/src/main/java/org/horizon/config/parsing/RootElementBuilder.java
===================================================================
--- core/branches/flat/src/main/java/org/horizon/config/parsing/RootElementBuilder.java 2009-01-16 15:47:54 UTC (rev 7492)
+++ core/branches/flat/src/main/java/org/horizon/config/parsing/RootElementBuilder.java 2009-01-16 17:13:29 UTC (rev 7493)
@@ -21,9 +21,9 @@
*/
package org.horizon.config.parsing;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.horizon.config.ConfigurationException;
+import org.horizon.logging.Log;
+import org.horizon.logging.LogFactory;
import org.jboss.util.xml.JBossEntityResolver;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
Modified: core/branches/flat/src/main/java/org/horizon/config/parsing/XmlConfigHelper.java
===================================================================
--- core/branches/flat/src/main/java/org/horizon/config/parsing/XmlConfigHelper.java 2009-01-16 15:47:54 UTC (rev 7492)
+++ core/branches/flat/src/main/java/org/horizon/config/parsing/XmlConfigHelper.java 2009-01-16 17:13:29 UTC (rev 7493)
@@ -21,9 +21,9 @@
*/
package org.horizon.config.parsing;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.horizon.config.ConfigurationException;
+import org.horizon.logging.Log;
+import org.horizon.logging.LogFactory;
import org.horizon.util.BeanUtils;
import org.jboss.util.StringPropertyReplacer;
import org.w3c.dom.Document;
@@ -186,7 +186,7 @@
}
}
- if (log.isDebugEnabled()) log.debug("getSubElement(): Does not exist for " + subElementName);
+ if (log.isDebugEnabled()) log.debug("getSubElement(): Does not exist for {0}", subElementName);
return null;
}
@@ -512,7 +512,7 @@
Map<String, String> stringAttribs = new HashMap<String, String>();
Map<String, Element> xmlAttribs = new HashMap<String, Element>();
NodeList list = source.getElementsByTagName(ATTR);
- if (log.isDebugEnabled()) log.debug("Attribute size: " + list.getLength());
+ if (log.isDebugEnabled()) log.debug("Attribute size: {0}", list.getLength());
// loop through attributes
for (int loop = 0; loop < list.getLength(); loop++) {
Modified: core/branches/flat/src/main/java/org/horizon/container/ReadCommittedEntry.java
===================================================================
--- core/branches/flat/src/main/java/org/horizon/container/ReadCommittedEntry.java 2009-01-16 15:47:54 UTC (rev 7492)
+++ core/branches/flat/src/main/java/org/horizon/container/ReadCommittedEntry.java 2009-01-16 17:13:29 UTC (rev 7493)
@@ -21,10 +21,10 @@
*/
package org.horizon.container;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import static org.horizon.container.ReadCommittedEntry.Flags.*;
import org.horizon.context.InvocationContext;
+import org.horizon.logging.Log;
+import org.horizon.logging.LogFactory;
/**
* A node delegate that encapsulates read committed semantics when writes are initiated, committed or rolled back.
Modified: core/branches/flat/src/main/java/org/horizon/container/RepeatableReadEntry.java
===================================================================
--- core/branches/flat/src/main/java/org/horizon/container/RepeatableReadEntry.java 2009-01-16 15:47:54 UTC (rev 7492)
+++ core/branches/flat/src/main/java/org/horizon/container/RepeatableReadEntry.java 2009-01-16 17:13:29 UTC (rev 7493)
@@ -21,10 +21,10 @@
*/
package org.horizon.container;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.horizon.CacheException;
import static org.horizon.container.ReadCommittedEntry.Flags.CHANGED;
+import org.horizon.logging.Log;
+import org.horizon.logging.LogFactory;
/**
* A node delegate that encapsulates repeatable read semantics when writes are initiated, committed or rolled back.
Modified: core/branches/flat/src/main/java/org/horizon/context/InvocationContextImpl.java
===================================================================
--- core/branches/flat/src/main/java/org/horizon/context/InvocationContextImpl.java 2009-01-16 15:47:54 UTC (rev 7492)
+++ core/branches/flat/src/main/java/org/horizon/context/InvocationContextImpl.java 2009-01-16 17:13:29 UTC (rev 7493)
@@ -21,10 +21,10 @@
*/
package org.horizon.context;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.horizon.config.Option;
import org.horizon.container.MVCCEntry;
+import org.horizon.logging.Log;
+import org.horizon.logging.LogFactory;
import org.horizon.transaction.GlobalTransaction;
import org.horizon.transaction.TransactionTable;
import org.horizon.util.FastCopyHashMap;
Modified: core/branches/flat/src/main/java/org/horizon/eviction/DefaultEvictionAction.java
===================================================================
--- core/branches/flat/src/main/java/org/horizon/eviction/DefaultEvictionAction.java 2009-01-16 15:47:54 UTC (rev 7492)
+++ core/branches/flat/src/main/java/org/horizon/eviction/DefaultEvictionAction.java 2009-01-16 17:13:29 UTC (rev 7493)
@@ -21,9 +21,9 @@
*/
package org.horizon.eviction;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.horizon.Cache;
+import org.horizon.logging.Log;
+import org.horizon.logging.LogFactory;
/**
* Default eviction action policy that calls {@link Cache#evict(Object)} to evict a node.
@@ -41,15 +41,15 @@
}
public boolean evict(K key) {
- if (trace) log.trace("Attempting to evict cache node with key of " + key);
+ if (trace) log.trace("Attempting to evict cache node with key of {0}", key);
try {
cache.evict(key);
- log.trace("Eviction of cache node with key of " + key + " successful");
+ log.trace("Eviction of cache node with key of {0} successful", key);
return true;
}
catch (Exception e) {
- if (log.isDebugEnabled()) log.debug("Unable to evict " + key, e);
+ if (log.isDebugEnabled()) log.debug("Unable to evict {0}", e, key);
return false;
}
}
Modified: core/branches/flat/src/main/java/org/horizon/eviction/EvictionCacheManagerImpl.java
===================================================================
--- core/branches/flat/src/main/java/org/horizon/eviction/EvictionCacheManagerImpl.java 2009-01-16 15:47:54 UTC (rev 7492)
+++ core/branches/flat/src/main/java/org/horizon/eviction/EvictionCacheManagerImpl.java 2009-01-16 17:13:29 UTC (rev 7493)
@@ -1,10 +1,10 @@
package org.horizon.eviction;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.horizon.CacheSPI;
import org.horizon.config.EvictionAlgorithmConfig;
import org.horizon.config.EvictionCacheConfig;
+import org.horizon.logging.Log;
+import org.horizon.logging.LogFactory;
import org.horizon.util.Util;
import java.util.concurrent.BlockingQueue;
Modified: core/branches/flat/src/main/java/org/horizon/eviction/EvictionManagerImpl.java
===================================================================
--- core/branches/flat/src/main/java/org/horizon/eviction/EvictionManagerImpl.java 2009-01-16 15:47:54 UTC (rev 7492)
+++ core/branches/flat/src/main/java/org/horizon/eviction/EvictionManagerImpl.java 2009-01-16 17:13:29 UTC (rev 7493)
@@ -1,9 +1,9 @@
package org.horizon.eviction;
import net.jcip.annotations.ThreadSafe;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.horizon.EvictionManager;
+import org.horizon.logging.Log;
+import org.horizon.logging.LogFactory;
import java.util.HashMap;
import java.util.Map;
Modified: core/branches/flat/src/main/java/org/horizon/eviction/EvictionTimerTask.java
===================================================================
--- core/branches/flat/src/main/java/org/horizon/eviction/EvictionTimerTask.java 2009-01-16 15:47:54 UTC (rev 7492)
+++ core/branches/flat/src/main/java/org/horizon/eviction/EvictionTimerTask.java 2009-01-16 17:13:29 UTC (rev 7493)
@@ -21,9 +21,9 @@
*/
package org.horizon.eviction;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.horizon.EvictionManager;
+import org.horizon.logging.Log;
+import org.horizon.logging.LogFactory;
import java.util.concurrent.Executors;
import java.util.concurrent.ScheduledExecutorService;
Modified: core/branches/flat/src/main/java/org/horizon/eviction/RemoveOnEvictActionPolicy.java
===================================================================
--- core/branches/flat/src/main/java/org/horizon/eviction/RemoveOnEvictActionPolicy.java 2009-01-16 15:47:54 UTC (rev 7492)
+++ core/branches/flat/src/main/java/org/horizon/eviction/RemoveOnEvictActionPolicy.java 2009-01-16 17:13:29 UTC (rev 7493)
@@ -21,9 +21,9 @@
*/
package org.horizon.eviction;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.horizon.Cache;
+import org.horizon.logging.Log;
+import org.horizon.logging.LogFactory;
/**
* An eviction action policy that calls {@link Cache#remove(Object)} to evict an entry.
Modified: core/branches/flat/src/main/java/org/horizon/eviction/algorithms/BaseEvictionAlgorithm.java
===================================================================
--- core/branches/flat/src/main/java/org/horizon/eviction/algorithms/BaseEvictionAlgorithm.java 2009-01-16 15:47:54 UTC (rev 7492)
+++ core/branches/flat/src/main/java/org/horizon/eviction/algorithms/BaseEvictionAlgorithm.java 2009-01-16 17:13:29 UTC (rev 7493)
@@ -21,8 +21,6 @@
*/
package org.horizon.eviction.algorithms;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.horizon.CacheSPI;
import org.horizon.config.EvictionAlgorithmConfig;
import org.horizon.eviction.EvictionAction;
@@ -32,6 +30,8 @@
import org.horizon.eviction.EvictionException;
import org.horizon.eviction.EvictionQueue;
import org.horizon.eviction.KeyEntry;
+import org.horizon.logging.Log;
+import org.horizon.logging.LogFactory;
import java.util.concurrent.BlockingQueue;
import java.util.concurrent.LinkedBlockingQueue;
Modified: core/branches/flat/src/main/java/org/horizon/eviction/algorithms/BaseSortedEvictionAlgorithm.java
===================================================================
--- core/branches/flat/src/main/java/org/horizon/eviction/algorithms/BaseSortedEvictionAlgorithm.java 2009-01-16 15:47:54 UTC (rev 7492)
+++ core/branches/flat/src/main/java/org/horizon/eviction/algorithms/BaseSortedEvictionAlgorithm.java 2009-01-16 17:13:29 UTC (rev 7493)
@@ -21,10 +21,10 @@
*/
package org.horizon.eviction.algorithms;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.horizon.eviction.EvictionEvent;
import org.horizon.eviction.EvictionException;
+import org.horizon.logging.Log;
+import org.horizon.logging.LogFactory;
import java.util.concurrent.BlockingQueue;
Modified: core/branches/flat/src/main/java/org/horizon/eviction/algorithms/ExpirationAlgorithm.java
===================================================================
--- core/branches/flat/src/main/java/org/horizon/eviction/algorithms/ExpirationAlgorithm.java 2009-01-16 15:47:54 UTC (rev 7492)
+++ core/branches/flat/src/main/java/org/horizon/eviction/algorithms/ExpirationAlgorithm.java 2009-01-16 17:13:29 UTC (rev 7493)
@@ -21,8 +21,6 @@
*/
package org.horizon.eviction.algorithms;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.horizon.config.EvictionAlgorithmConfig;
import org.horizon.eviction.EvictionEvent;
import org.horizon.eviction.EvictionEvent.Type;
@@ -30,6 +28,8 @@
import org.horizon.eviction.EvictionQueue;
import org.horizon.eviction.ExpirationAlgorithmConfig;
import org.horizon.eviction.KeyEntry;
+import org.horizon.logging.Log;
+import org.horizon.logging.LogFactory;
import java.util.Iterator;
import java.util.SortedSet;
Modified: core/branches/flat/src/main/java/org/horizon/eviction/algorithms/fifo/FIFOAlgorithm.java
===================================================================
--- core/branches/flat/src/main/java/org/horizon/eviction/algorithms/fifo/FIFOAlgorithm.java 2009-01-16 15:47:54 UTC (rev 7492)
+++ core/branches/flat/src/main/java/org/horizon/eviction/algorithms/fifo/FIFOAlgorithm.java 2009-01-16 17:13:29 UTC (rev 7493)
@@ -21,13 +21,13 @@
*/
package org.horizon.eviction.algorithms.fifo;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.horizon.config.EvictionAlgorithmConfig;
import org.horizon.eviction.EvictionException;
import org.horizon.eviction.EvictionQueue;
import org.horizon.eviction.KeyEntry;
import org.horizon.eviction.algorithms.BaseEvictionAlgorithm;
+import org.horizon.logging.Log;
+import org.horizon.logging.LogFactory;
/**
* First-in-first-out algorithm used to evict nodes.
Modified: core/branches/flat/src/main/java/org/horizon/eviction/algorithms/lfu/LFUAlgorithm.java
===================================================================
--- core/branches/flat/src/main/java/org/horizon/eviction/algorithms/lfu/LFUAlgorithm.java 2009-01-16 15:47:54 UTC (rev 7492)
+++ core/branches/flat/src/main/java/org/horizon/eviction/algorithms/lfu/LFUAlgorithm.java 2009-01-16 17:13:29 UTC (rev 7493)
@@ -21,13 +21,13 @@
*/
package org.horizon.eviction.algorithms.lfu;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.horizon.config.EvictionAlgorithmConfig;
import org.horizon.eviction.EvictionException;
import org.horizon.eviction.EvictionQueue;
import org.horizon.eviction.KeyEntry;
import org.horizon.eviction.algorithms.BaseSortedEvictionAlgorithm;
+import org.horizon.logging.Log;
+import org.horizon.logging.LogFactory;
/**
* Least Frequently Used algorithm for cache eviction. Note that this algorithm is not thread-safe.
Modified: core/branches/flat/src/main/java/org/horizon/eviction/algorithms/lru/LRUAlgorithm.java
===================================================================
--- core/branches/flat/src/main/java/org/horizon/eviction/algorithms/lru/LRUAlgorithm.java 2009-01-16 15:47:54 UTC (rev 7492)
+++ core/branches/flat/src/main/java/org/horizon/eviction/algorithms/lru/LRUAlgorithm.java 2009-01-16 17:13:29 UTC (rev 7493)
@@ -21,13 +21,13 @@
*/
package org.horizon.eviction.algorithms.lru;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.horizon.config.EvictionAlgorithmConfig;
import org.horizon.eviction.EvictionException;
import org.horizon.eviction.EvictionQueue;
import org.horizon.eviction.KeyEntry;
import org.horizon.eviction.algorithms.BaseEvictionAlgorithm;
+import org.horizon.logging.Log;
+import org.horizon.logging.LogFactory;
import java.util.Iterator;
Modified: core/branches/flat/src/main/java/org/horizon/factories/AbstractComponentRegistry.java
===================================================================
--- core/branches/flat/src/main/java/org/horizon/factories/AbstractComponentRegistry.java 2009-01-16 15:47:54 UTC (rev 7492)
+++ core/branches/flat/src/main/java/org/horizon/factories/AbstractComponentRegistry.java 2009-01-16 17:13:29 UTC (rev 7493)
@@ -21,8 +21,6 @@
*/
package org.horizon.factories;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.horizon.CacheException;
import org.horizon.CacheStatus;
import org.horizon.Version;
@@ -38,6 +36,8 @@
import org.horizon.factories.scopes.Scope;
import org.horizon.factories.scopes.Scopes;
import org.horizon.lifecycle.Lifecycle;
+import org.horizon.logging.Log;
+import org.horizon.logging.LogFactory;
import org.horizon.util.BeanUtils;
import org.horizon.util.ReflectionUtil;
Modified: core/branches/flat/src/main/java/org/horizon/factories/ComponentFactory.java
===================================================================
--- core/branches/flat/src/main/java/org/horizon/factories/ComponentFactory.java 2009-01-16 15:47:54 UTC (rev 7492)
+++ core/branches/flat/src/main/java/org/horizon/factories/ComponentFactory.java 2009-01-16 17:13:29 UTC (rev 7493)
@@ -21,13 +21,13 @@
*/
package org.horizon.factories;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.horizon.config.Configuration;
import org.horizon.config.ConfigurationException;
import org.horizon.factories.annotations.Inject;
import org.horizon.factories.scopes.Scope;
import org.horizon.factories.scopes.Scopes;
+import org.horizon.logging.Log;
+import org.horizon.logging.LogFactory;
/**
* Factory that creates components used internally within JBoss Cache, and also wires dependencies into the components.
Modified: core/branches/flat/src/main/java/org/horizon/factories/EntryFactoryImpl.java
===================================================================
--- core/branches/flat/src/main/java/org/horizon/factories/EntryFactoryImpl.java 2009-01-16 15:47:54 UTC (rev 7492)
+++ core/branches/flat/src/main/java/org/horizon/factories/EntryFactoryImpl.java 2009-01-16 17:13:29 UTC (rev 7493)
@@ -21,8 +21,6 @@
*/
package org.horizon.factories;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.horizon.config.Configuration;
import org.horizon.container.DataContainer;
import org.horizon.container.MVCCEntry;
@@ -35,6 +33,8 @@
import org.horizon.lock.IsolationLevel;
import org.horizon.lock.LockManager;
import org.horizon.lock.TimeoutException;
+import org.horizon.logging.Log;
+import org.horizon.logging.LogFactory;
import org.horizon.notifications.Notifier;
/**
Modified: core/branches/flat/src/main/java/org/horizon/interceptors/CacheStoreInterceptor.java
===================================================================
--- core/branches/flat/src/main/java/org/horizon/interceptors/CacheStoreInterceptor.java 2009-01-16 15:47:54 UTC (rev 7492)
+++ core/branches/flat/src/main/java/org/horizon/interceptors/CacheStoreInterceptor.java 2009-01-16 17:13:29 UTC (rev 7493)
@@ -21,7 +21,6 @@
*/
package org.horizon.interceptors;
-import org.apache.commons.logging.LogFactory;
import org.horizon.commands.AbstractVisitor;
import org.horizon.commands.VisitableCommand;
import org.horizon.commands.tx.CommitCommand;
@@ -43,6 +42,7 @@
import org.horizon.loader.CacheLoaderManager;
import org.horizon.loader.Modification;
import org.horizon.loader.Modification.ModificationType;
+import org.horizon.logging.LogFactory;
import org.horizon.transaction.GlobalTransaction;
import javax.transaction.SystemException;
Modified: core/branches/flat/src/main/java/org/horizon/interceptors/InterceptorChain.java
===================================================================
--- core/branches/flat/src/main/java/org/horizon/interceptors/InterceptorChain.java 2009-01-16 15:47:54 UTC (rev 7492)
+++ core/branches/flat/src/main/java/org/horizon/interceptors/InterceptorChain.java 2009-01-16 17:13:29 UTC (rev 7493)
@@ -21,8 +21,6 @@
*/
package org.horizon.interceptors;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.horizon.CacheException;
import org.horizon.commands.VisitableCommand;
import org.horizon.context.InvocationContext;
@@ -32,6 +30,8 @@
import org.horizon.factories.scopes.Scopes;
import org.horizon.interceptors.base.CommandInterceptor;
import org.horizon.invocation.InvocationContextContainer;
+import org.horizon.logging.Log;
+import org.horizon.logging.LogFactory;
import java.util.ArrayList;
import java.util.Collections;
Modified: core/branches/flat/src/main/java/org/horizon/interceptors/base/CommandInterceptor.java
===================================================================
--- core/branches/flat/src/main/java/org/horizon/interceptors/base/CommandInterceptor.java 2009-01-16 15:47:54 UTC (rev 7492)
+++ core/branches/flat/src/main/java/org/horizon/interceptors/base/CommandInterceptor.java 2009-01-16 17:13:29 UTC (rev 7493)
@@ -21,8 +21,6 @@
*/
package org.horizon.interceptors.base;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.horizon.commands.AbstractVisitor;
import org.horizon.commands.VisitableCommand;
import org.horizon.config.Configuration;
@@ -30,6 +28,8 @@
import org.horizon.factories.annotations.Inject;
import org.horizon.factories.scopes.Scope;
import org.horizon.factories.scopes.Scopes;
+import org.horizon.logging.Log;
+import org.horizon.logging.LogFactory;
/**
* This is the base class for all interceptors to extend, and implements the {@link org.horizon.commands.Visitor}
Modified: core/branches/flat/src/main/java/org/horizon/jmx/JmxRegistrationManager.java
===================================================================
--- core/branches/flat/src/main/java/org/horizon/jmx/JmxRegistrationManager.java 2009-01-16 15:47:54 UTC (rev 7492)
+++ core/branches/flat/src/main/java/org/horizon/jmx/JmxRegistrationManager.java 2009-01-16 17:13:29 UTC (rev 7493)
@@ -21,13 +21,13 @@
*/
package org.horizon.jmx;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.horizon.Cache;
import org.horizon.CacheException;
import org.horizon.CacheSPI;
import org.horizon.config.Configuration;
import org.horizon.factories.ComponentRegistry;
+import org.horizon.logging.Log;
+import org.horizon.logging.LogFactory;
import javax.management.MBeanServer;
import javax.management.MalformedObjectNameException;
Modified: core/branches/flat/src/main/java/org/horizon/jmx/PlatformMBeanServerRegistration.java
===================================================================
--- core/branches/flat/src/main/java/org/horizon/jmx/PlatformMBeanServerRegistration.java 2009-01-16 15:47:54 UTC (rev 7492)
+++ core/branches/flat/src/main/java/org/horizon/jmx/PlatformMBeanServerRegistration.java 2009-01-16 17:13:29 UTC (rev 7493)
@@ -21,14 +21,14 @@
*/
package org.horizon.jmx;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.horizon.CacheSPI;
import org.horizon.config.Configuration;
import org.horizon.factories.annotations.Inject;
import org.horizon.factories.annotations.NonVolatile;
import org.horizon.factories.annotations.Start;
import org.horizon.factories.annotations.Stop;
+import org.horizon.logging.Log;
+import org.horizon.logging.LogFactory;
/**
* If {@link Configuration#getExposeManagementStatistics()} is true, then class will register all the MBeans from the
Modified: core/branches/flat/src/main/java/org/horizon/jmx/ResourceDMBean.java
===================================================================
--- core/branches/flat/src/main/java/org/horizon/jmx/ResourceDMBean.java 2009-01-16 15:47:54 UTC (rev 7492)
+++ core/branches/flat/src/main/java/org/horizon/jmx/ResourceDMBean.java 2009-01-16 17:13:29 UTC (rev 7493)
@@ -21,11 +21,11 @@
*/
package org.horizon.jmx;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.horizon.jmx.annotations.MBean;
import org.horizon.jmx.annotations.ManagedAttribute;
import org.horizon.jmx.annotations.ManagedOperation;
+import org.horizon.logging.Log;
+import org.horizon.logging.LogFactory;
import javax.management.Attribute;
import javax.management.AttributeList;
Modified: core/branches/flat/src/main/java/org/horizon/loader/AbstractCacheLoader.java
===================================================================
--- core/branches/flat/src/main/java/org/horizon/loader/AbstractCacheLoader.java 2009-01-16 15:47:54 UTC (rev 7492)
+++ core/branches/flat/src/main/java/org/horizon/loader/AbstractCacheLoader.java 2009-01-16 17:13:29 UTC (rev 7493)
@@ -21,10 +21,10 @@
*/
package org.horizon.loader;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.horizon.CacheException;
import org.horizon.CacheSPI;
+import org.horizon.logging.Log;
+import org.horizon.logging.LogFactory;
import org.horizon.marshall.EntryData;
import org.horizon.marshall.EntryDataExceptionMarker;
import org.horizon.marshall.EntryDataMarker;
Modified: core/branches/flat/src/main/java/org/horizon/loader/AsyncCacheLoader.java
===================================================================
--- core/branches/flat/src/main/java/org/horizon/loader/AsyncCacheLoader.java 2009-01-16 15:47:54 UTC (rev 7492)
+++ core/branches/flat/src/main/java/org/horizon/loader/AsyncCacheLoader.java 2009-01-16 17:13:29 UTC (rev 7493)
@@ -21,10 +21,10 @@
*/
package org.horizon.loader;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.horizon.CacheException;
import org.horizon.config.CacheLoaderConfig.IndividualCacheLoaderConfig;
+import org.horizon.logging.Log;
+import org.horizon.logging.LogFactory;
import java.util.ArrayList;
import java.util.List;
Modified: core/branches/flat/src/main/java/org/horizon/loader/CacheLoaderManager.java
===================================================================
--- core/branches/flat/src/main/java/org/horizon/loader/CacheLoaderManager.java 2009-01-16 15:47:54 UTC (rev 7492)
+++ core/branches/flat/src/main/java/org/horizon/loader/CacheLoaderManager.java 2009-01-16 17:13:29 UTC (rev 7493)
@@ -21,8 +21,6 @@
*/
package org.horizon.loader;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.horizon.CacheException;
import org.horizon.CacheSPI;
import org.horizon.config.CacheLoaderConfig;
@@ -34,6 +32,8 @@
import org.horizon.factories.annotations.Inject;
import org.horizon.factories.annotations.Start;
import org.horizon.factories.annotations.Stop;
+import org.horizon.logging.Log;
+import org.horizon.logging.LogFactory;
import org.horizon.util.ReflectionUtil;
import java.util.ArrayList;
Modified: core/branches/flat/src/main/java/org/horizon/loader/ClusteredCacheLoader.java
===================================================================
--- core/branches/flat/src/main/java/org/horizon/loader/ClusteredCacheLoader.java 2009-01-16 15:47:54 UTC (rev 7492)
+++ core/branches/flat/src/main/java/org/horizon/loader/ClusteredCacheLoader.java 2009-01-16 17:13:29 UTC (rev 7493)
@@ -22,14 +22,14 @@
package org.horizon.loader;
import net.jcip.annotations.ThreadSafe;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.horizon.CacheStatus;
import org.horizon.commands.CommandsFactory;
import org.horizon.commands.DataCommand;
import org.horizon.config.CacheLoaderConfig.IndividualCacheLoaderConfig;
import org.horizon.factories.annotations.Inject;
import org.horizon.lock.StripedLock;
+import org.horizon.logging.Log;
+import org.horizon.logging.LogFactory;
import org.horizon.tree.Fqn;
import org.jgroups.Address;
import org.jgroups.blocks.RspFilter;
Modified: core/branches/flat/src/main/java/org/horizon/loader/FileCacheLoader.java
===================================================================
--- core/branches/flat/src/main/java/org/horizon/loader/FileCacheLoader.java 2009-01-16 15:47:54 UTC (rev 7492)
+++ core/branches/flat/src/main/java/org/horizon/loader/FileCacheLoader.java 2009-01-16 17:13:29 UTC (rev 7493)
@@ -22,11 +22,11 @@
package org.horizon.loader;
import net.jcip.annotations.ThreadSafe;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.horizon.CacheException;
import org.horizon.config.CacheLoaderConfig.IndividualCacheLoaderConfig;
import org.horizon.lock.StripedLock;
+import org.horizon.logging.Log;
+import org.horizon.logging.LogFactory;
import org.horizon.marshall.EntryData;
import org.jboss.util.stream.MarshalledValueInputStream;
Modified: core/branches/flat/src/main/java/org/horizon/loader/ReadOnlyDelegatingCacheLoader.java
===================================================================
--- core/branches/flat/src/main/java/org/horizon/loader/ReadOnlyDelegatingCacheLoader.java 2009-01-16 15:47:54 UTC (rev 7492)
+++ core/branches/flat/src/main/java/org/horizon/loader/ReadOnlyDelegatingCacheLoader.java 2009-01-16 17:13:29 UTC (rev 7493)
@@ -21,8 +21,8 @@
*/
package org.horizon.loader;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.horizon.logging.Log;
+import org.horizon.logging.LogFactory;
import java.io.ObjectInputStream;
import java.util.List;
Modified: core/branches/flat/src/main/java/org/horizon/loader/SingletonStoreCacheLoader.java
===================================================================
--- core/branches/flat/src/main/java/org/horizon/loader/SingletonStoreCacheLoader.java 2009-01-16 15:47:54 UTC (rev 7492)
+++ core/branches/flat/src/main/java/org/horizon/loader/SingletonStoreCacheLoader.java 2009-01-16 17:13:29 UTC (rev 7493)
@@ -21,10 +21,10 @@
*/
package org.horizon.loader;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.horizon.config.CacheLoaderConfig;
import org.horizon.config.CacheLoaderConfig.IndividualCacheLoaderConfig.SingletonStoreConfig;
+import org.horizon.logging.Log;
+import org.horizon.logging.LogFactory;
import org.horizon.notifications.annotation.CacheListener;
import org.horizon.notifications.annotation.CacheStarted;
import org.horizon.notifications.annotation.CacheStopped;
Modified: core/branches/flat/src/main/java/org/horizon/lock/StripedLockManager.java
===================================================================
--- core/branches/flat/src/main/java/org/horizon/lock/StripedLockManager.java 2009-01-16 15:47:54 UTC (rev 7492)
+++ core/branches/flat/src/main/java/org/horizon/lock/StripedLockManager.java 2009-01-16 17:13:29 UTC (rev 7493)
@@ -21,13 +21,13 @@
*/
package org.horizon.lock;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.horizon.config.Configuration;
import org.horizon.context.InvocationContext;
import org.horizon.factories.annotations.Inject;
import org.horizon.factories.annotations.Start;
import org.horizon.invocation.InvocationContextContainer;
+import org.horizon.logging.Log;
+import org.horizon.logging.LogFactory;
import org.horizon.util.concurrent.locks.LockContainer;
import org.horizon.util.concurrent.locks.OwnableReentrantLock;
import org.horizon.util.concurrent.locks.OwnableReentrantLockContainer;
Added: core/branches/flat/src/main/java/org/horizon/logging/AbstractLogImpl.java
===================================================================
--- core/branches/flat/src/main/java/org/horizon/logging/AbstractLogImpl.java (rev 0)
+++ core/branches/flat/src/main/java/org/horizon/logging/AbstractLogImpl.java 2009-01-16 17:13:29 UTC (rev 7493)
@@ -0,0 +1,70 @@
+package org.horizon.logging;
+
+/**
+ * Abstract log implementation that handles message interpolation
+ *
+ * @author Manik Surtani
+ */
+public abstract class AbstractLogImpl implements Log {
+ public void trace(Object message, Object... params) {
+ if (isTraceEnabled()) trace(substitute(message, params));
+ }
+
+ public void debug(Object message, Object... params) {
+ if (isDebugEnabled()) debug(substitute(message, params));
+ }
+
+ public void info(Object message, Object... params) {
+ if (isInfoEnabled()) info(substitute(message, params));
+ }
+
+ public void warn(Object message, Object... params) {
+ if (isWarnEnabled()) warn(substitute(message, params));
+ }
+
+ public void error(Object message, Object... params) {
+ if (isErrorEnabled()) error(substitute(message, params));
+ }
+
+ public void fatal(Object message, Object... params) {
+ if (isFatalEnabled()) fatal(substitute(message, params));
+ }
+
+ public void trace(Object message, Throwable t, Object... params) {
+ if (isTraceEnabled()) trace(substitute(message, params), t);
+ }
+
+ public void debug(Object message, Throwable t, Object... params) {
+ if (isDebugEnabled()) debug(substitute(message, params), t);
+ }
+
+ public void info(Object message, Throwable t, Object... params) {
+ if (isInfoEnabled()) info(substitute(message, params), t);
+ }
+
+ public void warn(Object message, Throwable t, Object... params) {
+ if (isWarnEnabled()) warn(substitute(message, params), t);
+ }
+
+ public void error(Object message, Throwable t, Object... params) {
+ if (isErrorEnabled()) error(substitute(message, params), t);
+ }
+
+ public void fatal(Object message, Throwable t, Object... params) {
+ if (isFatalEnabled()) fatal(substitute(message, params), t);
+ }
+
+ private Object substitute(Object message, Object... params) {
+ if (params.length == 0) return message;
+
+ StringBuilder value = new StringBuilder(String.valueOf(message));
+ for (int i = 0; i < params.length; i++) {
+ String placeholder = "{" + i + "}";
+ int phIndex;
+ if ((phIndex = value.indexOf(placeholder)) > -1) {
+ value = value.replace(phIndex, phIndex + placeholder.length(), String.valueOf(params[i]));
+ }
+ }
+ return value.toString();
+ }
+}
Added: core/branches/flat/src/main/java/org/horizon/logging/JDKLogImpl.java
===================================================================
--- core/branches/flat/src/main/java/org/horizon/logging/JDKLogImpl.java (rev 0)
+++ core/branches/flat/src/main/java/org/horizon/logging/JDKLogImpl.java 2009-01-16 17:13:29 UTC (rev 7493)
@@ -0,0 +1,111 @@
+package org.horizon.logging;
+
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+/**
+ * Logger that delivers messages to a JDK logger
+ *
+ * @author Manik Surtani
+ * @since 1.0
+ */
+public class JDKLogImpl extends AbstractLogImpl {
+
+ private final Logger logger;
+
+ public JDKLogImpl(String category) {
+ logger = Logger.getLogger(category);
+ }
+
+ private void log(Level level, Object object, Throwable ex) {
+ if (logger.isLoggable(level)) {
+ Throwable dummyException = new Throwable();
+ StackTraceElement locations[] = dummyException.getStackTrace();
+ String className = "unknown";
+ String methodName = "unknown";
+ int depth = 2;
+ if (locations != null && locations.length > depth) {
+ StackTraceElement caller = locations[depth];
+ className = caller.getClassName();
+ methodName = caller.getMethodName();
+ }
+ if (ex == null) {
+ logger.logp(level, className, methodName, String.valueOf(object));
+ } else {
+ logger.logp(level, className, methodName, String.valueOf(object), ex);
+ }
+ }
+ }
+
+ public void trace(Object message) {
+ log(Level.FINER, message, null);
+ }
+
+ public void debug(Object message) {
+ log(Level.FINE, message, null);
+ }
+
+ public void info(Object message) {
+ log(Level.INFO, message, null);
+ }
+
+ public void warn(Object message) {
+ log(Level.WARNING, message, null);
+ }
+
+ public void error(Object message) {
+ log(Level.SEVERE, message, null);
+ }
+
+ public void fatal(Object message) {
+ log(Level.SEVERE, message, null);
+ }
+
+ public void trace(Object message, Throwable t) {
+ log(Level.FINER, message, t);
+ }
+
+ public void debug(Object message, Throwable t) {
+ log(Level.FINE, message, t);
+ }
+
+ public void info(Object message, Throwable t) {
+ log(Level.INFO, message, t);
+ }
+
+ public void warn(Object message, Throwable t) {
+ log(Level.WARNING, message, t);
+ }
+
+ public void error(Object message, Throwable t) {
+ log(Level.SEVERE, message, t);
+ }
+
+ public void fatal(Object message, Throwable t) {
+ log(Level.SEVERE, message, t);
+ }
+
+ public boolean isTraceEnabled() {
+ return logger.isLoggable(Level.FINER);
+ }
+
+ public boolean isDebugEnabled() {
+ return logger.isLoggable(Level.FINE);
+ }
+
+ public boolean isInfoEnabled() {
+ return logger.isLoggable(Level.INFO);
+ }
+
+ public boolean isWarnEnabled() {
+ return logger.isLoggable(Level.WARNING);
+ }
+
+ public boolean isErrorEnabled() {
+ return logger.isLoggable(Level.SEVERE);
+ }
+
+ public boolean isFatalEnabled() {
+ return logger.isLoggable(Level.SEVERE);
+ }
+}
Added: core/branches/flat/src/main/java/org/horizon/logging/Log.java
===================================================================
--- core/branches/flat/src/main/java/org/horizon/logging/Log.java (rev 0)
+++ core/branches/flat/src/main/java/org/horizon/logging/Log.java 2009-01-16 17:13:29 UTC (rev 7493)
@@ -0,0 +1,99 @@
+package org.horizon.logging;
+
+/**
+ * Horizon's log abstraction layer.
+ * <p/>
+ * Usage is very similar to Apache's Commons Logging, except that there are no additional dependencies beyond a JDK.
+ * <p/>
+ * <code> Log log = LogFactory.getLog( getClass() ); </code> The above will get you an instance of <tt>Log</tt>, which
+ * can be used to generate log messages either to Log4J (if the libraries are present) or (if not) the built-in JDK
+ * logger.
+ * <p/>
+ * In addition to the 6 log levels available, this framework also supports parameter interpolation, inspired by <a
+ * href="http://www.seamframework.org">SEAM</a>'s similar approach. What this means is, that the following block:
+ * <code> if (log.isTraceEnabled()) { log.trace("This is a message " + message + " and some other value is " + value); }
+ * </code>
+ * <p/>
+ * ... could be replaced with ...
+ * <p/>
+ * <code> log.trace("This is a message {0} and some other value is {1}", message, value); </code>
+ * <p/>
+ * with no performance penalty for when trace is not enabled. This greatly enhances code readability.
+ * <p/>
+ * However, if <tt>message</tt> or <tt>value</tt> need to be calculated especially for the log message, then the
+ * <tt>isTraceEnabled()</tt> paradigm should still be used.
+ * <p/>
+ * If you are passing a <tt>Throwable</tt>, note that this should be passed in <i>before</i> the vararg parameter list.
+ * <p/>
+ *
+ * @author Manik Surtani
+ * @since 1.0
+ */
+public interface Log {
+
+ // methods that support parameter substitution
+
+ void trace(Object message, Object... params);
+
+ void debug(Object message, Object... params);
+
+ void info(Object message, Object... params);
+
+ void warn(Object message, Object... params);
+
+ void error(Object message, Object... params);
+
+ void fatal(Object message, Object... params);
+
+ void trace(Object message, Throwable t, Object... params);
+
+ void debug(Object message, Throwable t, Object... params);
+
+ void info(Object message, Throwable t, Object... params);
+
+ void warn(Object message, Throwable t, Object... params);
+
+ void error(Object message, Throwable t, Object... params);
+
+ void fatal(Object message, Throwable t, Object... params);
+
+ // methods that do not support parameter substitution
+
+ void trace(Object message);
+
+ void debug(Object message);
+
+ void info(Object message);
+
+ void warn(Object message);
+
+ void error(Object message);
+
+ void fatal(Object message);
+
+ void trace(Object message, Throwable t);
+
+ void debug(Object message, Throwable t);
+
+ void info(Object message, Throwable t);
+
+ void warn(Object message, Throwable t);
+
+ void error(Object message, Throwable t);
+
+ void fatal(Object message, Throwable t);
+
+ // methods to test log levels
+
+ boolean isTraceEnabled();
+
+ boolean isDebugEnabled();
+
+ boolean isInfoEnabled();
+
+ boolean isWarnEnabled();
+
+ boolean isErrorEnabled();
+
+ boolean isFatalEnabled();
+}
Added: core/branches/flat/src/main/java/org/horizon/logging/Log4JLogImpl.java
===================================================================
--- core/branches/flat/src/main/java/org/horizon/logging/Log4JLogImpl.java (rev 0)
+++ core/branches/flat/src/main/java/org/horizon/logging/Log4JLogImpl.java 2009-01-16 17:13:29 UTC (rev 7493)
@@ -0,0 +1,104 @@
+package org.horizon.logging;
+
+import org.apache.log4j.Level;
+import org.apache.log4j.Logger;
+
+/**
+ * Logger that delivers messages to a Log4J logger
+ *
+ * @author Manik Surtani
+ * @since 1.0
+ */
+public class Log4JLogImpl extends AbstractLogImpl {
+
+ private final Logger logger;
+
+ private static final Level TRACE;
+
+ static {
+ Object trace;
+ try {
+ trace = Level.class.getDeclaredField("TRACE").get(null);
+ }
+ catch (Exception e) {
+ trace = Level.DEBUG;
+ }
+ TRACE = (Level) trace;
+ }
+
+ public Log4JLogImpl(String category) {
+ logger = Logger.getLogger(category);
+ }
+
+ public void trace(Object message) {
+ logger.log(Log4JLogImpl.class.getName(), TRACE, message, null);
+ }
+
+ public void debug(Object message) {
+ logger.log(Log4JLogImpl.class.getName(), Level.DEBUG, message, null);
+ }
+
+ public void info(Object message) {
+ logger.log(Log4JLogImpl.class.getName(), Level.INFO, message, null);
+ }
+
+ public void warn(Object message) {
+ logger.log(Log4JLogImpl.class.getName(), Level.WARN, message, null);
+ }
+
+ public void error(Object message) {
+ logger.log(Log4JLogImpl.class.getName(), Level.ERROR, message, null);
+ }
+
+ public void fatal(Object message) {
+ logger.log(Log4JLogImpl.class.getName(), Level.FATAL, message, null);
+ }
+
+ public void trace(Object message, Throwable t) {
+ logger.log(Log4JLogImpl.class.getName(), TRACE, message, t);
+ }
+
+ public void debug(Object message, Throwable t) {
+ logger.log(Log4JLogImpl.class.getName(), Level.DEBUG, message, t);
+ }
+
+ public void info(Object message, Throwable t) {
+ logger.log(Log4JLogImpl.class.getName(), Level.INFO, message, t);
+ }
+
+ public void warn(Object message, Throwable t) {
+ logger.log(Log4JLogImpl.class.getName(), Level.WARN, message, t);
+ }
+
+ public void error(Object message, Throwable t) {
+ logger.log(Log4JLogImpl.class.getName(), Level.ERROR, message, t);
+ }
+
+ public void fatal(Object message, Throwable t) {
+ logger.log(Log4JLogImpl.class.getName(), Level.FATAL, message, t);
+ }
+
+ public boolean isTraceEnabled() {
+ return logger.isEnabledFor(TRACE);
+ }
+
+ public boolean isDebugEnabled() {
+ return logger.isEnabledFor(Level.DEBUG);
+ }
+
+ public boolean isInfoEnabled() {
+ return logger.isEnabledFor(Level.INFO);
+ }
+
+ public boolean isWarnEnabled() {
+ return logger.isEnabledFor(Level.WARN);
+ }
+
+ public boolean isErrorEnabled() {
+ return logger.isEnabledFor(Level.ERROR);
+ }
+
+ public boolean isFatalEnabled() {
+ return logger.isEnabledFor(Level.FATAL);
+ }
+}
Added: core/branches/flat/src/main/java/org/horizon/logging/LogFactory.java
===================================================================
--- core/branches/flat/src/main/java/org/horizon/logging/LogFactory.java (rev 0)
+++ core/branches/flat/src/main/java/org/horizon/logging/LogFactory.java 2009-01-16 17:13:29 UTC (rev 7493)
@@ -0,0 +1,36 @@
+package org.horizon.logging;
+
+/**
+ * Factory that creates {@link Log} instances.
+ *
+ * @author Manik Surtani
+ * @since 1.0
+ */
+public class LogFactory {
+
+ private static final boolean IS_LOG4J_AVAILABLE;
+
+ static {
+ boolean available;
+ try {
+ Class.forName("org.apache.log4j.Logger");
+ available = true;
+ }
+ catch (ClassNotFoundException cnfe) {
+ available = false;
+ }
+ IS_LOG4J_AVAILABLE = available;
+ }
+
+ public static Log getLog(Class clazz) {
+ return getLog(clazz.getName());
+ }
+
+ public static Log getLog(String category) {
+ if (IS_LOG4J_AVAILABLE) {
+ return new Log4JLogImpl(category);
+ } else {
+ return new JDKLogImpl(category);
+ }
+ }
+}
Modified: core/branches/flat/src/main/java/org/horizon/marshall/CacheMarshallerStarobrno.java
===================================================================
--- core/branches/flat/src/main/java/org/horizon/marshall/CacheMarshallerStarobrno.java 2009-01-16 15:47:54 UTC (rev 7492)
+++ core/branches/flat/src/main/java/org/horizon/marshall/CacheMarshallerStarobrno.java 2009-01-16 17:13:29 UTC (rev 7493)
@@ -21,8 +21,6 @@
*/
package org.horizon.marshall;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.horizon.CacheException;
import org.horizon.atomic.DeltaAware;
import org.horizon.commands.CommandsFactory;
@@ -30,6 +28,8 @@
import org.horizon.config.Configuration;
import org.horizon.io.ByteBuffer;
import org.horizon.io.ExposedByteArrayOutputStream;
+import org.horizon.logging.Log;
+import org.horizon.logging.LogFactory;
import org.horizon.transaction.GlobalTransaction;
import org.horizon.util.FastCopyHashMap;
import org.horizon.util.Immutables;
Modified: core/branches/flat/src/main/java/org/horizon/marshall/VersionAwareMarshaller.java
===================================================================
--- core/branches/flat/src/main/java/org/horizon/marshall/VersionAwareMarshaller.java 2009-01-16 15:47:54 UTC (rev 7492)
+++ core/branches/flat/src/main/java/org/horizon/marshall/VersionAwareMarshaller.java 2009-01-16 17:13:29 UTC (rev 7493)
@@ -21,13 +21,13 @@
*/
package org.horizon.marshall;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.horizon.commands.CommandsFactory;
import org.horizon.config.Configuration;
import org.horizon.factories.annotations.Inject;
import org.horizon.io.ByteBuffer;
import org.horizon.io.ExposedByteArrayOutputStream;
+import org.horizon.logging.Log;
+import org.horizon.logging.LogFactory;
import org.jboss.util.stream.MarshalledValueInputStream;
import java.io.ByteArrayInputStream;
Modified: core/branches/flat/src/main/java/org/horizon/notifications/NotifierImpl.java
===================================================================
--- core/branches/flat/src/main/java/org/horizon/notifications/NotifierImpl.java 2009-01-16 15:47:54 UTC (rev 7492)
+++ core/branches/flat/src/main/java/org/horizon/notifications/NotifierImpl.java 2009-01-16 17:13:29 UTC (rev 7493)
@@ -21,8 +21,6 @@
*/
package org.horizon.notifications;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.horizon.Cache;
import org.horizon.CacheException;
import org.horizon.CacheSPI;
@@ -35,6 +33,8 @@
import org.horizon.factories.annotations.Stop;
import org.horizon.factories.scopes.Scope;
import org.horizon.factories.scopes.Scopes;
+import org.horizon.logging.Log;
+import org.horizon.logging.LogFactory;
import org.horizon.notifications.annotation.*;
import org.horizon.notifications.event.*;
import static org.horizon.notifications.event.Event.Type.*;
Modified: core/branches/flat/src/main/java/org/horizon/remoting/ChannelMessageListener.java
===================================================================
--- core/branches/flat/src/main/java/org/horizon/remoting/ChannelMessageListener.java 2009-01-16 15:47:54 UTC (rev 7492)
+++ core/branches/flat/src/main/java/org/horizon/remoting/ChannelMessageListener.java 2009-01-16 17:13:29 UTC (rev 7493)
@@ -21,13 +21,13 @@
*/
package org.horizon.remoting;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.horizon.CacheException;
import org.horizon.config.Configuration;
import org.horizon.factories.annotations.Inject;
import org.horizon.factories.annotations.NonVolatile;
import org.horizon.io.ExposedByteArrayOutputStream;
+import org.horizon.logging.Log;
+import org.horizon.logging.LogFactory;
import org.horizon.statetransfer.DefaultStateTransferManager;
import org.horizon.statetransfer.StateTransferManager;
import org.horizon.tree.Fqn;
Modified: core/branches/flat/src/main/java/org/horizon/remoting/RPCManagerImpl.java
===================================================================
--- core/branches/flat/src/main/java/org/horizon/remoting/RPCManagerImpl.java 2009-01-16 15:47:54 UTC (rev 7492)
+++ core/branches/flat/src/main/java/org/horizon/remoting/RPCManagerImpl.java 2009-01-16 17:13:29 UTC (rev 7493)
@@ -21,8 +21,6 @@
*/
package org.horizon.remoting;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.horizon.CacheException;
import org.horizon.CacheSPI;
import org.horizon.annotations.MBean;
@@ -40,6 +38,8 @@
import org.horizon.invocation.InvocationContextContainer;
import org.horizon.lock.LockManager;
import org.horizon.lock.TimeoutException;
+import org.horizon.logging.Log;
+import org.horizon.logging.LogFactory;
import org.horizon.marshall.CommandAwareRpcDispatcher;
import org.horizon.marshall.Marshaller;
import org.horizon.notifications.Notifier;
Modified: core/branches/flat/src/main/java/org/horizon/statetransfer/DefaultStateTransferManager.java
===================================================================
--- core/branches/flat/src/main/java/org/horizon/statetransfer/DefaultStateTransferManager.java 2009-01-16 15:47:54 UTC (rev 7492)
+++ core/branches/flat/src/main/java/org/horizon/statetransfer/DefaultStateTransferManager.java 2009-01-16 17:13:29 UTC (rev 7493)
@@ -21,13 +21,13 @@
*/
package org.horizon.statetransfer;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.horizon.CacheSPI;
import org.horizon.config.Configuration;
import org.horizon.factories.annotations.Inject;
import org.horizon.factories.annotations.Start;
import org.horizon.loader.CacheLoaderManager;
+import org.horizon.logging.Log;
+import org.horizon.logging.LogFactory;
import org.horizon.marshall.Marshaller;
import org.horizon.marshall.NodeData;
import org.horizon.marshall.NodeDataMarker;
Modified: core/branches/flat/src/main/java/org/horizon/transaction/BatchModeTransactionManager.java
===================================================================
--- core/branches/flat/src/main/java/org/horizon/transaction/BatchModeTransactionManager.java 2009-01-16 15:47:54 UTC (rev 7492)
+++ core/branches/flat/src/main/java/org/horizon/transaction/BatchModeTransactionManager.java 2009-01-16 17:13:29 UTC (rev 7493)
@@ -21,8 +21,8 @@
*/
package org.horizon.transaction;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.horizon.logging.Log;
+import org.horizon.logging.LogFactory;
/**
* Not really a transaction manager in the truest sense of the word. Only used to batch up operations. Proper
Modified: core/branches/flat/src/main/java/org/horizon/transaction/DummyBaseTransactionManager.java
===================================================================
--- core/branches/flat/src/main/java/org/horizon/transaction/DummyBaseTransactionManager.java 2009-01-16 15:47:54 UTC (rev 7492)
+++ core/branches/flat/src/main/java/org/horizon/transaction/DummyBaseTransactionManager.java 2009-01-16 17:13:29 UTC (rev 7493)
@@ -21,8 +21,8 @@
*/
package org.horizon.transaction;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.horizon.logging.Log;
+import org.horizon.logging.LogFactory;
import javax.transaction.HeuristicMixedException;
import javax.transaction.HeuristicRollbackException;
Modified: core/branches/flat/src/main/java/org/horizon/transaction/DummyTransaction.java
===================================================================
--- core/branches/flat/src/main/java/org/horizon/transaction/DummyTransaction.java 2009-01-16 15:47:54 UTC (rev 7492)
+++ core/branches/flat/src/main/java/org/horizon/transaction/DummyTransaction.java 2009-01-16 17:13:29 UTC (rev 7493)
@@ -21,8 +21,8 @@
*/
package org.horizon.transaction;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.horizon.logging.Log;
+import org.horizon.logging.LogFactory;
import javax.transaction.HeuristicMixedException;
import javax.transaction.HeuristicRollbackException;
Modified: core/branches/flat/src/main/java/org/horizon/transaction/DummyTransactionManager.java
===================================================================
--- core/branches/flat/src/main/java/org/horizon/transaction/DummyTransactionManager.java 2009-01-16 15:47:54 UTC (rev 7492)
+++ core/branches/flat/src/main/java/org/horizon/transaction/DummyTransactionManager.java 2009-01-16 17:13:29 UTC (rev 7493)
@@ -21,8 +21,8 @@
*/
package org.horizon.transaction;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.horizon.logging.Log;
+import org.horizon.logging.LogFactory;
import javax.naming.Context;
import javax.naming.InitialContext;
Modified: core/branches/flat/src/main/java/org/horizon/transaction/DummyUserTransaction.java
===================================================================
--- core/branches/flat/src/main/java/org/horizon/transaction/DummyUserTransaction.java 2009-01-16 15:47:54 UTC (rev 7492)
+++ core/branches/flat/src/main/java/org/horizon/transaction/DummyUserTransaction.java 2009-01-16 17:13:29 UTC (rev 7493)
@@ -21,8 +21,8 @@
*/
package org.horizon.transaction;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.horizon.logging.Log;
+import org.horizon.logging.LogFactory;
import javax.transaction.HeuristicMixedException;
import javax.transaction.HeuristicRollbackException;
Modified: core/branches/flat/src/main/java/org/horizon/transaction/GenericTransactionManagerLookup.java
===================================================================
--- core/branches/flat/src/main/java/org/horizon/transaction/GenericTransactionManagerLookup.java 2009-01-16 15:47:54 UTC (rev 7492)
+++ core/branches/flat/src/main/java/org/horizon/transaction/GenericTransactionManagerLookup.java 2009-01-16 17:13:29 UTC (rev 7493)
@@ -21,8 +21,8 @@
*/
package org.horizon.transaction;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.horizon.logging.Log;
+import org.horizon.logging.LogFactory;
import javax.naming.InitialContext;
import javax.naming.NamingException;
Modified: core/branches/flat/src/main/java/org/horizon/transaction/TransactionTable.java
===================================================================
--- core/branches/flat/src/main/java/org/horizon/transaction/TransactionTable.java 2009-01-16 15:47:54 UTC (rev 7492)
+++ core/branches/flat/src/main/java/org/horizon/transaction/TransactionTable.java 2009-01-16 17:13:29 UTC (rev 7493)
@@ -21,14 +21,14 @@
*/
package org.horizon.transaction;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.horizon.CacheException;
import org.horizon.context.InvocationContext;
import org.horizon.context.TransactionContext;
import org.horizon.factories.annotations.Inject;
import org.horizon.factories.annotations.NonVolatile;
import org.horizon.factories.context.ContextFactory;
+import org.horizon.logging.Log;
+import org.horizon.logging.LogFactory;
import org.horizon.remoting.RPCManager;
import org.jgroups.Address;
Modified: core/branches/flat/src/main/java/org/horizon/tree/TreeCacheImpl.java
===================================================================
--- core/branches/flat/src/main/java/org/horizon/tree/TreeCacheImpl.java 2009-01-16 15:47:54 UTC (rev 7492)
+++ core/branches/flat/src/main/java/org/horizon/tree/TreeCacheImpl.java 2009-01-16 17:13:29 UTC (rev 7493)
@@ -21,8 +21,6 @@
*/
package org.horizon.tree;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.horizon.Cache;
import org.horizon.CacheException;
import org.horizon.CacheStatus;
@@ -30,6 +28,8 @@
import org.horizon.config.Configuration;
import org.horizon.context.InvocationContext;
import org.horizon.interceptors.base.CommandInterceptor;
+import org.horizon.logging.Log;
+import org.horizon.logging.LogFactory;
import org.jgroups.Address;
import java.util.List;
Modified: core/branches/flat/src/main/java/org/horizon/util/FileLookup.java
===================================================================
--- core/branches/flat/src/main/java/org/horizon/util/FileLookup.java 2009-01-16 15:47:54 UTC (rev 7492)
+++ core/branches/flat/src/main/java/org/horizon/util/FileLookup.java 2009-01-16 17:13:29 UTC (rev 7493)
@@ -21,8 +21,8 @@
*/
package org.horizon.util;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.horizon.logging.Log;
+import org.horizon.logging.LogFactory;
import java.io.File;
import java.io.FileInputStream;
Modified: core/branches/flat/src/main/java/org/horizon/util/ReflectionUtil.java
===================================================================
--- core/branches/flat/src/main/java/org/horizon/util/ReflectionUtil.java 2009-01-16 15:47:54 UTC (rev 7492)
+++ core/branches/flat/src/main/java/org/horizon/util/ReflectionUtil.java 2009-01-16 17:13:29 UTC (rev 7493)
@@ -21,9 +21,9 @@
*/
package org.horizon.util;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.horizon.CacheException;
+import org.horizon.logging.Log;
+import org.horizon.logging.LogFactory;
import java.lang.annotation.Annotation;
import java.lang.reflect.Field;
Modified: core/branches/flat/src/main/java/org/horizon/util/TypedProperties.java
===================================================================
--- core/branches/flat/src/main/java/org/horizon/util/TypedProperties.java 2009-01-16 15:47:54 UTC (rev 7492)
+++ core/branches/flat/src/main/java/org/horizon/util/TypedProperties.java 2009-01-16 17:13:29 UTC (rev 7493)
@@ -1,7 +1,7 @@
package org.horizon.util;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.horizon.logging.Log;
+import org.horizon.logging.LogFactory;
import java.util.Properties;
Modified: core/branches/flat/src/main/java/org/horizon/util/internals/ReplicationListener.java
===================================================================
--- core/branches/flat/src/main/java/org/horizon/util/internals/ReplicationListener.java 2009-01-16 15:47:54 UTC (rev 7492)
+++ core/branches/flat/src/main/java/org/horizon/util/internals/ReplicationListener.java 2009-01-16 17:13:29 UTC (rev 7493)
@@ -1,7 +1,5 @@
package org.horizon.util.internals;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.horizon.Cache;
import org.horizon.commands.ReplicableCommand;
import org.horizon.commands.remote.ReplicateCommand;
@@ -11,6 +9,8 @@
import org.horizon.context.InvocationContext;
import org.horizon.factories.ComponentRegistry;
import org.horizon.io.ByteBuffer;
+import org.horizon.logging.Log;
+import org.horizon.logging.LogFactory;
import org.horizon.marshall.CacheMarshallerStarobrno;
import org.horizon.marshall.CommandAwareRpcDispatcher;
import org.horizon.marshall.Marshaller;
Modified: core/branches/flat/src/test/java/org/horizon/BasicTest.java
===================================================================
--- core/branches/flat/src/test/java/org/horizon/BasicTest.java 2009-01-16 15:47:54 UTC (rev 7492)
+++ core/branches/flat/src/test/java/org/horizon/BasicTest.java 2009-01-16 17:13:29 UTC (rev 7493)
@@ -21,9 +21,9 @@
*/
package org.horizon;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.horizon.config.Configuration;
+import org.horizon.logging.Log;
+import org.horizon.logging.LogFactory;
import org.horizon.manager.CacheManager;
import org.horizon.manager.NamedCacheNotFoundException;
import org.horizon.util.TestingUtil;
Modified: core/branches/flat/src/test/java/org/horizon/UnitTestCacheFactory.java
===================================================================
--- core/branches/flat/src/test/java/org/horizon/UnitTestCacheFactory.java 2009-01-16 15:47:54 UTC (rev 7492)
+++ core/branches/flat/src/test/java/org/horizon/UnitTestCacheFactory.java 2009-01-16 17:13:29 UTC (rev 7493)
@@ -6,11 +6,11 @@
*/
package org.horizon;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.horizon.config.Configuration;
import org.horizon.config.ConfigurationException;
import org.horizon.config.parsing.XmlConfigurationParserJBC3;
+import org.horizon.logging.Log;
+import org.horizon.logging.LogFactory;
import org.horizon.manager.CacheManager;
import org.horizon.util.TestingUtil;
import org.jgroups.conf.XmlConfigurator;
Modified: core/branches/flat/src/test/java/org/horizon/api/mvcc/LockTestBase.java
===================================================================
--- core/branches/flat/src/test/java/org/horizon/api/mvcc/LockTestBase.java 2009-01-16 15:47:54 UTC (rev 7492)
+++ core/branches/flat/src/test/java/org/horizon/api/mvcc/LockTestBase.java 2009-01-16 17:13:29 UTC (rev 7493)
@@ -1,7 +1,5 @@
package org.horizon.api.mvcc;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.horizon.Cache;
import org.horizon.UnitTestCacheFactory;
import org.horizon.config.Configuration;
@@ -9,6 +7,8 @@
import org.horizon.lock.IsolationLevel;
import org.horizon.lock.LockManager;
import org.horizon.lock.TimeoutException;
+import org.horizon.logging.Log;
+import org.horizon.logging.LogFactory;
import org.horizon.transaction.DummyTransactionManagerLookup;
import org.horizon.util.TestingUtil;
import org.testng.annotations.AfterMethod;
Modified: core/branches/flat/src/test/java/org/horizon/api/tree/NodeMoveAPITest.java
===================================================================
--- core/branches/flat/src/test/java/org/horizon/api/tree/NodeMoveAPITest.java 2009-01-16 15:47:54 UTC (rev 7492)
+++ core/branches/flat/src/test/java/org/horizon/api/tree/NodeMoveAPITest.java 2009-01-16 17:13:29 UTC (rev 7493)
@@ -1,7 +1,5 @@
package org.horizon.api.tree;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.horizon.Cache;
import org.horizon.CacheSPI;
import org.horizon.UnitTestCacheFactory;
@@ -13,6 +11,8 @@
import org.horizon.factories.ComponentRegistry;
import org.horizon.invocation.InvocationContextContainer;
import org.horizon.lock.LockManager;
+import org.horizon.logging.Log;
+import org.horizon.logging.LogFactory;
import org.horizon.tree.Fqn;
import org.horizon.tree.Node;
import org.horizon.tree.NodeNotExistsException;
Modified: core/branches/flat/src/test/java/org/horizon/profiling/ProfileTest.java
===================================================================
--- core/branches/flat/src/test/java/org/horizon/profiling/ProfileTest.java 2009-01-16 15:47:54 UTC (rev 7492)
+++ core/branches/flat/src/test/java/org/horizon/profiling/ProfileTest.java 2009-01-16 17:13:29 UTC (rev 7493)
@@ -1,10 +1,10 @@
package org.horizon.profiling;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.horizon.Cache;
import org.horizon.config.Configuration;
import org.horizon.lock.IsolationLevel;
+import org.horizon.logging.Log;
+import org.horizon.logging.LogFactory;
import org.horizon.profiling.testinternals.Generator;
import org.horizon.profiling.testinternals.TaskRunner;
import org.horizon.util.TestingUtil;
Modified: core/branches/flat/src/test/java/org/horizon/profiling/TreeProfileTest.java
===================================================================
--- core/branches/flat/src/test/java/org/horizon/profiling/TreeProfileTest.java 2009-01-16 15:47:54 UTC (rev 7492)
+++ core/branches/flat/src/test/java/org/horizon/profiling/TreeProfileTest.java 2009-01-16 17:13:29 UTC (rev 7493)
@@ -1,11 +1,11 @@
package org.horizon.profiling;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.horizon.Cache;
import org.horizon.UnitTestCacheFactory;
import org.horizon.config.Configuration;
import org.horizon.lock.IsolationLevel;
+import org.horizon.logging.Log;
+import org.horizon.logging.LogFactory;
import org.horizon.profiling.testinternals.Generator;
import org.horizon.profiling.testinternals.TaskRunner;
import org.horizon.transaction.DummyTransactionManager;
Modified: core/branches/flat/src/test/java/org/horizon/replication/SyncCacheListenerTest.java
===================================================================
--- core/branches/flat/src/test/java/org/horizon/replication/SyncCacheListenerTest.java 2009-01-16 15:47:54 UTC (rev 7492)
+++ core/branches/flat/src/test/java/org/horizon/replication/SyncCacheListenerTest.java 2009-01-16 17:13:29 UTC (rev 7493)
@@ -7,13 +7,13 @@
*/
package org.horizon.replication;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.horizon.CacheException;
import org.horizon.CacheSPI;
import org.horizon.UnitTestCacheManager;
import org.horizon.config.Configuration;
import org.horizon.lock.IsolationLevel;
+import org.horizon.logging.Log;
+import org.horizon.logging.LogFactory;
import org.horizon.notifications.annotation.CacheEntryModified;
import org.horizon.notifications.annotation.CacheEntryRemoved;
import org.horizon.notifications.annotation.CacheListener;
17 years, 2 months
- 1
- 0