[exo-jcr-commits] exo-jcr SVN: r4029 - in kernel/trunk: exo.kernel.commons/src/main/java/org/exoplatform/services/log/impl and 3 other directories.
do-not-reply at jboss.org
do-not-reply at jboss.org
Tue Mar 1 10:04:56 EST 2011
Author: tolusha
Date: 2011-03-01 10:04:55 -0500 (Tue, 01 Mar 2011)
New Revision: 4029
Modified:
kernel/trunk/exo.kernel.commons/src/main/java/org/exoplatform/services/log/impl/LocationAwareSLF4JExoLog.java
kernel/trunk/exo.kernel.component.common/pom.xml
kernel/trunk/exo.kernel.component.common/src/main/java/org/exoplatform/services/scheduler/impl/JobSchedulerServiceImpl.java
kernel/trunk/exo.kernel.component.ext.cache.impl.infinispan.v4/src/test/java/org/exoplatform/services/cache/impl/infinispan/TestAbstractExoCache.java
kernel/trunk/pom.xml
Log:
EXOJCR-1159: update libraries
Modified: kernel/trunk/exo.kernel.commons/src/main/java/org/exoplatform/services/log/impl/LocationAwareSLF4JExoLog.java
===================================================================
--- kernel/trunk/exo.kernel.commons/src/main/java/org/exoplatform/services/log/impl/LocationAwareSLF4JExoLog.java 2011-03-01 14:58:23 UTC (rev 4028)
+++ kernel/trunk/exo.kernel.commons/src/main/java/org/exoplatform/services/log/impl/LocationAwareSLF4JExoLog.java 2011-03-01 15:04:55 UTC (rev 4029)
@@ -84,61 +84,61 @@
public void trace(Object o)
{
- logger.log(null, FQCN, LocationAwareLogger.TRACE_INT, String.valueOf(o), null);
+ logger.log(null, FQCN, LocationAwareLogger.TRACE_INT, String.valueOf(o), null, null);
}
public void trace(Object o, Throwable throwable)
{
- logger.log(null, FQCN, LocationAwareLogger.TRACE_INT, String.valueOf(o), throwable);
+ logger.log(null, FQCN, LocationAwareLogger.TRACE_INT, String.valueOf(o), null, throwable);
}
public void debug(Object o)
{
- logger.log(null, FQCN, LocationAwareLogger.DEBUG_INT, String.valueOf(o), null);
+ logger.log(null, FQCN, LocationAwareLogger.DEBUG_INT, String.valueOf(o), null, null);
}
public void debug(Object o, Throwable throwable)
{
- logger.log(null, FQCN, LocationAwareLogger.DEBUG_INT, String.valueOf(o), throwable);
+ logger.log(null, FQCN, LocationAwareLogger.DEBUG_INT, String.valueOf(o), null, throwable);
}
public void info(Object o)
{
- logger.log(null, FQCN, LocationAwareLogger.INFO_INT, String.valueOf(o), null);
+ logger.log(null, FQCN, LocationAwareLogger.INFO_INT, String.valueOf(o), null, null);
}
public void info(Object o, Throwable throwable)
{
- logger.log(null, FQCN, LocationAwareLogger.INFO_INT, String.valueOf(o), throwable);
+ logger.log(null, FQCN, LocationAwareLogger.INFO_INT, String.valueOf(o), null, throwable);
}
public void warn(Object o)
{
- logger.log(null, FQCN, LocationAwareLogger.WARN_INT, String.valueOf(o), null);
+ logger.log(null, FQCN, LocationAwareLogger.WARN_INT, String.valueOf(o), null, null);
}
public void warn(Object o, Throwable throwable)
{
- logger.log(null, FQCN, LocationAwareLogger.WARN_INT, String.valueOf(o), throwable);
+ logger.log(null, FQCN, LocationAwareLogger.WARN_INT, String.valueOf(o), null, throwable);
}
public void error(Object o)
{
- logger.log(null, FQCN, LocationAwareLogger.ERROR_INT, String.valueOf(o), null);
+ logger.log(null, FQCN, LocationAwareLogger.ERROR_INT, String.valueOf(o), null, null);
}
public void error(Object o, Throwable throwable)
{
- logger.log(null, FQCN, LocationAwareLogger.ERROR_INT, String.valueOf(o), throwable);
+ logger.log(null, FQCN, LocationAwareLogger.ERROR_INT, String.valueOf(o), null, throwable);
}
public void fatal(Object o)
{
- logger.log(null, FQCN, LocationAwareLogger.ERROR_INT, String.valueOf(o), null);
+ logger.log(null, FQCN, LocationAwareLogger.ERROR_INT, String.valueOf(o), null, null);
}
public void fatal(Object o, Throwable throwable)
{
- logger.log(null, FQCN, LocationAwareLogger.ERROR_INT, String.valueOf(o), throwable);
+ logger.log(null, FQCN, LocationAwareLogger.ERROR_INT, String.valueOf(o), null, throwable);
}
}
Modified: kernel/trunk/exo.kernel.component.common/pom.xml
===================================================================
--- kernel/trunk/exo.kernel.component.common/pom.xml 2011-03-01 14:58:23 UTC (rev 4028)
+++ kernel/trunk/exo.kernel.component.common/pom.xml 2011-03-01 15:04:55 UTC (rev 4029)
@@ -63,8 +63,8 @@
<artifactId>xpp3</artifactId>
</dependency>
<dependency>
- <groupId>jotm</groupId>
- <artifactId>jotm</artifactId>
+ <groupId>org.ow2.jotm</groupId>
+ <artifactId>jotm-core</artifactId>
<exclusions>
<exclusion>
<groupId>javax.resource</groupId>
@@ -82,7 +82,7 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>quartz</groupId>
+ <groupId>org.quartz-scheduler</groupId>
<artifactId>quartz</artifactId>
</dependency>
<dependency>
Modified: kernel/trunk/exo.kernel.component.common/src/main/java/org/exoplatform/services/scheduler/impl/JobSchedulerServiceImpl.java
===================================================================
--- kernel/trunk/exo.kernel.component.common/src/main/java/org/exoplatform/services/scheduler/impl/JobSchedulerServiceImpl.java 2011-03-01 14:58:23 UTC (rev 4028)
+++ kernel/trunk/exo.kernel.component.common/src/main/java/org/exoplatform/services/scheduler/impl/JobSchedulerServiceImpl.java 2011-03-01 15:04:55 UTC (rev 4029)
@@ -262,8 +262,7 @@
public boolean removeGlobalJobListener(String name) throws Exception
{
- JobListener jlistener = getGlobalJobListener(name);
- return scheduler_.removeGlobalJobListener(jlistener);
+ return scheduler_.removeGlobalJobListener(name);
}
public void addJobListener(ComponentPlugin plugin) throws Exception
@@ -322,8 +321,7 @@
public boolean removeGlobaTriggerListener(String name) throws Exception
{
- TriggerListener tlistener = getGlobalTriggerListener(name);
- return scheduler_.removeGlobalTriggerListener(tlistener);
+ return scheduler_.removeGlobalTriggerListener(name);
}
public void addTriggerListener(ComponentPlugin plugin) throws Exception
Modified: kernel/trunk/exo.kernel.component.ext.cache.impl.infinispan.v4/src/test/java/org/exoplatform/services/cache/impl/infinispan/TestAbstractExoCache.java
===================================================================
--- kernel/trunk/exo.kernel.component.ext.cache.impl.infinispan.v4/src/test/java/org/exoplatform/services/cache/impl/infinispan/TestAbstractExoCache.java 2011-03-01 14:58:23 UTC (rev 4028)
+++ kernel/trunk/exo.kernel.component.ext.cache.impl.infinispan.v4/src/test/java/org/exoplatform/services/cache/impl/infinispan/TestAbstractExoCache.java 2011-03-01 15:04:55 UTC (rev 4029)
@@ -39,8 +39,8 @@
import java.util.LinkedHashSet;
import java.util.List;
import java.util.Map;
+import java.util.Map.Entry;
import java.util.Set;
-import java.util.Map.Entry;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.atomic.AtomicInteger;
@@ -67,11 +67,6 @@
this.cache = (AbstractExoCache<Serializable, Object>)service.getCacheInstance("myCache");
}
- protected void tearDown() throws Exception
- {
- cache.clearCache();
- }
-
public void testPut() throws Exception
{
cache.put(new MyKey("a"), "a");
@@ -82,6 +77,8 @@
assertEquals(3, cache.getCacheSize());
cache.put(new MyKey("d"), "c");
assertEquals(4, cache.getCacheSize());
+
+ cache.clearCache();
}
public void testClearCache() throws Exception
@@ -92,6 +89,8 @@
assertTrue(cache.getCacheSize() > 0);
cache.clearCache();
assertTrue(cache.getCacheSize() == 0);
+
+ cache.clearCache();
}
public void testGet() throws Exception
@@ -103,6 +102,8 @@
cache.remove(new MyKey("a"));
assertEquals(null, cache.get(new MyKey("a")));
assertEquals(null, cache.get(new MyKey("x")));
+
+ cache.clearCache();
}
public void testRemove() throws Exception
@@ -117,6 +118,8 @@
assertEquals(1, cache.getCacheSize());
assertEquals(null, cache.remove(new MyKey("x")));
assertEquals(1, cache.getCacheSize());
+
+ cache.clearCache();
}
public void testPutMap() throws Exception
@@ -159,6 +162,8 @@
values.put(new MyKey("d"), "d");
cache.putMap(values);
assertEquals(2, cache.getCacheSize());
+
+ cache.clearCache();
}
public void testGetCachedObjects() throws Exception
@@ -173,6 +178,8 @@
assertTrue(values.contains("a"));
assertTrue(values.contains("b"));
assertTrue(values.contains("c"));
+
+ cache.clearCache();
}
public void testRemoveCachedObjects() throws Exception
@@ -188,6 +195,8 @@
assertTrue(values.contains("b"));
assertTrue(values.contains("c"));
assertEquals(0, cache.getCacheSize());
+
+ cache.clearCache();
}
public void testSelect() throws Exception
@@ -214,6 +223,8 @@
};
cache.select(selector);
assertEquals(3, count.intValue());
+
+ cache.clearCache();
}
public void testGetHitsNMisses() throws Exception
@@ -227,6 +238,8 @@
cache.get(new MyKey("z"));
assertEquals(1, cache.getCacheHit() - hits);
assertEquals(2, cache.getCacheMiss() - misses);
+
+ cache.clearCache();
}
private ExoCacheFactory getExoCacheFactoryInstance() throws ExoCacheInitException
@@ -424,6 +437,8 @@
throw errors.get(0);
}
System.out.println("Total Time = " + (System.currentTimeMillis() - time));
+
+ cache.clearCache();
}
public static class MyCacheListener implements CacheListener<Serializable, Object>
Modified: kernel/trunk/pom.xml
===================================================================
--- kernel/trunk/pom.xml 2011-03-01 14:58:23 UTC (rev 4028)
+++ kernel/trunk/pom.xml 2011-03-01 15:04:55 UTC (rev 4029)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.exoplatform</groupId>
<artifactId>foundation-parent</artifactId>
- <version>7</version>
+ <version>8-SNAPSHOT</version>
</parent>
<groupId>org.exoplatform.kernel</groupId>
@@ -97,22 +97,22 @@
<dependency>
<groupId>xpp3</groupId>
<artifactId>xpp3</artifactId>
- <version>1.1.3.4.O</version>
+ <version>1.1.4c</version>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
- <version>1.1</version>
+ <version>1.1.1</version>
</dependency>
<dependency>
<groupId>commons-beanutils</groupId>
<artifactId>commons-beanutils</artifactId>
- <version>1.8.0</version>
+ <version>1.8.3</version>
</dependency>
<dependency>
<groupId>commons-chain</groupId>
<artifactId>commons-chain</artifactId>
- <version>1.0</version>
+ <version>1.2</version>
</dependency>
<dependency>
<groupId>commons-digester</groupId>
@@ -122,19 +122,19 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
- <version>1.5.8</version>
+ <version>1.6.1</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
- <version>1.5.8</version>
+ <version>1.6.1</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
- <version>1.2.14</version>
+ <version>1.2.16</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -143,19 +143,19 @@
<version>1.0.b2</version>
</dependency>
<dependency>
- <groupId>quartz</groupId>
+ <groupId>org.quartz-scheduler</groupId>
<artifactId>quartz</artifactId>
- <version>1.5.2</version>
+ <version>1.8.4</version>
</dependency>
<dependency>
<groupId>javax.mail</groupId>
<artifactId>mail</artifactId>
- <version>1.4.2</version>
+ <version>1.4.4</version>
</dependency>
<dependency>
<groupId>javax.activation</groupId>
<artifactId>activation</artifactId>
- <version>1.1</version>
+ <version>1.1.1</version>
</dependency>
<dependency>
<groupId>javax.resource</groupId>
@@ -165,7 +165,7 @@
<dependency>
<groupId>javax.transaction</groupId>
<artifactId>jta</artifactId>
- <version>1.0.1B</version>
+ <version>1.1</version>
</dependency>
<dependency>
<groupId>picocontainer</groupId>
@@ -181,7 +181,7 @@
<dependency>
<groupId>org.jgroups</groupId>
<artifactId>jgroups</artifactId>
- <version>2.10.0.GA</version>
+ <version>2.11.1.Final</version>
</dependency>
<dependency>
<groupId>org.jboss.cache</groupId>
@@ -191,7 +191,7 @@
<dependency>
<groupId>org.infinispan</groupId>
<artifactId>infinispan-core</artifactId>
- <version>4.1.0.FINAL</version>
+ <version>4.2.0.FINAL</version>
</dependency>
<dependency>
<groupId>org.jibx</groupId>
@@ -209,9 +209,9 @@
<version>${version.jibx.plugin}</version>
</dependency>
<dependency>
- <groupId>jotm</groupId>
- <artifactId>jotm</artifactId>
- <version>2.0.10</version>
+ <groupId>org.ow2.jotm</groupId>
+ <artifactId>jotm-core</artifactId>
+ <version>2.1.9</version>
</dependency>
</dependencies>
</dependencyManagement>
More information about the exo-jcr-commits
mailing list