jackrabbit-commits mailing list archives

Site index · List index

Message view	« Date » · « Thread »
Top	« Date » · « Thread »
From	a..@apache.org
Subject	svn commit: r1343782 [2/3] - in /jackrabbit/commons/ocm/trunk/src: main/java/org/apache/jackrabbit/ocm/manager/atomictypeconverter/impl/ main/java/org/apache/jackrabbit/ocm/manager/beanconverter/impl/ main/java/org/apache/jackrabbit/ocm/manager/collect...
Date	Tue, 29 May 2012 15:36:12 GMT
Modified: jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/auto/DigesterAutoTest.java URL: http://svn.apache.org/viewvc/jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/auto/DigesterAutoTest.java?rev=1343782&r1=1343781&r2=1343782&view=diff ============================================================================== --- jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/auto/DigesterAutoTest.java (original) +++ jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/auto/DigesterAutoTest.java Tue May 29 15:36:07 2012 @@ -24,8 +24,6 @@ import javax.jcr.UnsupportedRepositoryOp import junit.framework.Test; import junit.framework.TestSuite; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.apache.jackrabbit.ocm.DigesterTestBase; import org.apache.jackrabbit.ocm.manager.ObjectContentManager; import org.apache.jackrabbit.ocm.manager.impl.ObjectContentManagerImpl; @@ -35,6 +33,8 @@ import org.apache.jackrabbit.ocm.testmod import org.apache.jackrabbit.ocm.testmodel.auto.impl.DocumentImpl; import org.apache.jackrabbit.ocm.testmodel.auto.impl.DocumentStream; import org.apache.jackrabbit.ocm.testmodel.auto.impl.FolderImpl; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Test autoupdate setting @@ -42,7 +42,7 @@ import org.apache.jackrabbit.ocm.testmod * @author <a href="mailto:christophe.lombart@gmail.com">Christophe Lombart</a> / public class DigesterAutoTest extends DigesterTestBase { - private final static Log log = LogFactory.getLog(DigesterAutoTest.class); + private final static Logger log = LoggerFactory.getLogger(DigesterAutoTest.class); /* * <p>Defines the test case name for junit.</p> Modified: jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/basic/AnnotationAvoidRecursiveLoopTest.java URL: http://svn.apache.org/viewvc/jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/basic/AnnotationAvoidRecursiveLoopTest.java?rev=1343782&r1=1343781&r2=1343782&view=diff ============================================================================== --- jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/basic/AnnotationAvoidRecursiveLoopTest.java (original) +++ jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/basic/AnnotationAvoidRecursiveLoopTest.java Tue May 29 15:36:07 2012 @@ -25,8 +25,6 @@ import javax.jcr.UnsupportedRepositoryOp import junit.framework.Test; import junit.framework.TestSuite; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.apache.jackrabbit.ocm.AnnotationTestBase; import org.apache.jackrabbit.ocm.manager.ObjectContentManager; import org.apache.jackrabbit.ocm.manager.impl.ObjectContentManagerImpl; @@ -35,6 +33,8 @@ import org.apache.jackrabbit.ocm.mapper. import org.apache.jackrabbit.ocm.repository.RepositoryUtil; import org.apache.jackrabbit.ocm.testmodel.crossreference.A; import org.apache.jackrabbit.ocm.testmodel.crossreference.B; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** @@ -46,7 +46,7 @@ import org.apache.jackrabbit.ocm.testmod / public class AnnotationAvoidRecursiveLoopTest extends AnnotationTestBase { - private final static Log log = LogFactory.getLog(AnnotationAvoidRecursiveLoopTest.class); + private final static Logger log = LoggerFactory.getLogger(AnnotationAvoidRecursiveLoopTest.class); /* * <p>Defines the test case name for junit.</p> Modified: jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/basic/AnnotationCopyMoveTest.java URL: http://svn.apache.org/viewvc/jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/basic/AnnotationCopyMoveTest.java?rev=1343782&r1=1343781&r2=1343782&view=diff ============================================================================== --- jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/basic/AnnotationCopyMoveTest.java (original) +++ jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/basic/AnnotationCopyMoveTest.java Tue May 29 15:36:07 2012 @@ -22,14 +22,14 @@ import java.util.Collection; import junit.framework.Test; import junit.framework.TestSuite; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.apache.jackrabbit.ocm.AnnotationTestBase; import org.apache.jackrabbit.ocm.exception.ObjectContentManagerException; import org.apache.jackrabbit.ocm.testmodel.A; import org.apache.jackrabbit.ocm.testmodel.Atomic; import org.apache.jackrabbit.ocm.testmodel.B; import org.apache.jackrabbit.ocm.testmodel.C; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** @@ -39,7 +39,7 @@ import org.apache.jackrabbit.ocm.testmod / public class AnnotationCopyMoveTest extends AnnotationTestBase { - private final static Log log = LogFactory.getLog(AnnotationCopyMoveTest.class); + private final static Logger log = LoggerFactory.getLogger(AnnotationCopyMoveTest.class); /* * <p>Defines the test case name for junit.</p> Modified: jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/basic/AnnotationRemoveTest.java URL: http://svn.apache.org/viewvc/jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/basic/AnnotationRemoveTest.java?rev=1343782&r1=1343781&r2=1343782&view=diff ============================================================================== --- jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/basic/AnnotationRemoveTest.java (original) +++ jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/basic/AnnotationRemoveTest.java Tue May 29 15:36:07 2012 @@ -25,14 +25,14 @@ import java.util.Date; import junit.framework.Test; import junit.framework.TestSuite; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.apache.jackrabbit.ocm.AnnotationTestBase; import org.apache.jackrabbit.ocm.manager.ObjectContentManager; import org.apache.jackrabbit.ocm.query.Filter; import org.apache.jackrabbit.ocm.query.Query; import org.apache.jackrabbit.ocm.query.QueryManager; import org.apache.jackrabbit.ocm.testmodel.Atomic; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** @@ -42,7 +42,7 @@ import org.apache.jackrabbit.ocm.testmod / public class AnnotationRemoveTest extends AnnotationTestBase { - private final static Log log = LogFactory.getLog(AnnotationRemoveTest.class); + private final static Logger log = LoggerFactory.getLogger(AnnotationRemoveTest.class); private Date date = new Date(); /* * <p>Defines the test case name for junit.</p> Modified: jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/basic/AnnotationSameNameSiblingTest.java URL: http://svn.apache.org/viewvc/jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/basic/AnnotationSameNameSiblingTest.java?rev=1343782&r1=1343781&r2=1343782&view=diff ============================================================================== --- jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/basic/AnnotationSameNameSiblingTest.java (original) +++ jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/basic/AnnotationSameNameSiblingTest.java Tue May 29 15:36:07 2012 @@ -27,8 +27,6 @@ import javax.jcr.UnsupportedRepositoryOp import junit.framework.Test; import junit.framework.TestSuite; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.apache.jackrabbit.ocm.AnnotationTestBase; import org.apache.jackrabbit.ocm.manager.ObjectContentManager; import org.apache.jackrabbit.ocm.manager.impl.ObjectContentManagerImpl; @@ -39,6 +37,8 @@ import org.apache.jackrabbit.ocm.reposit import org.apache.jackrabbit.ocm.testmodel.Atomic; import org.apache.jackrabbit.ocm.testmodel.Page; import org.apache.jackrabbit.ocm.testmodel.Paragraph; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Test Query on atomic fields @@ -47,7 +47,7 @@ import org.apache.jackrabbit.ocm.testmod / public class AnnotationSameNameSiblingTest extends AnnotationTestBase { - private final static Log log = LogFactory.getLog(AnnotationSameNameSiblingTest.class); + private final static Logger log = LoggerFactory.getLogger(AnnotationSameNameSiblingTest.class); private Date date = new Date(); /* Modified: jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/basic/AnnotationSimpleTest.java URL: http://svn.apache.org/viewvc/jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/basic/AnnotationSimpleTest.java?rev=1343782&r1=1343781&r2=1343782&view=diff ============================================================================== --- jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/basic/AnnotationSimpleTest.java (original) +++ jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/basic/AnnotationSimpleTest.java Tue May 29 15:36:07 2012 @@ -22,14 +22,14 @@ import java.util.Collection; import junit.framework.Test; import junit.framework.TestSuite; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.apache.jackrabbit.ocm.AnnotationTestBase; import org.apache.jackrabbit.ocm.manager.ObjectContentManager; import org.apache.jackrabbit.ocm.testmodel.A; import org.apache.jackrabbit.ocm.testmodel.B; import org.apache.jackrabbit.ocm.testmodel.C; import org.apache.jackrabbit.ocm.testmodel.Discriminator; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Test JcrSession @@ -38,7 +38,7 @@ import org.apache.jackrabbit.ocm.testmod / public class AnnotationSimpleTest extends AnnotationTestBase { - private final static Log log = LogFactory.getLog(AnnotationSimpleTest.class); + private final static Logger log = LoggerFactory.getLogger(AnnotationSimpleTest.class); /* * <p>Defines the test case name for junit.</p> Modified: jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/basic/DigesterAvoidRecursiveLoopTest.java URL: http://svn.apache.org/viewvc/jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/basic/DigesterAvoidRecursiveLoopTest.java?rev=1343782&r1=1343781&r2=1343782&view=diff ============================================================================== --- jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/basic/DigesterAvoidRecursiveLoopTest.java (original) +++ jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/basic/DigesterAvoidRecursiveLoopTest.java Tue May 29 15:36:07 2012 @@ -23,14 +23,14 @@ import javax.jcr.UnsupportedRepositoryOp import junit.framework.Test; import junit.framework.TestSuite; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.apache.jackrabbit.ocm.DigesterTestBase; import org.apache.jackrabbit.ocm.manager.ObjectContentManager; import org.apache.jackrabbit.ocm.manager.impl.ObjectContentManagerImpl; import org.apache.jackrabbit.ocm.repository.RepositoryUtil; import org.apache.jackrabbit.ocm.testmodel.crossreference.A; import org.apache.jackrabbit.ocm.testmodel.crossreference.B; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** @@ -42,7 +42,7 @@ import org.apache.jackrabbit.ocm.testmod / public class DigesterAvoidRecursiveLoopTest extends DigesterTestBase { - private final static Log log = LogFactory.getLog(DigesterAvoidRecursiveLoopTest.class); + private final static Logger log = LoggerFactory.getLogger(DigesterAvoidRecursiveLoopTest.class); /* * <p>Defines the test case name for junit.</p> Modified: jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/basic/DigesterCopyMoveTest.java URL: http://svn.apache.org/viewvc/jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/basic/DigesterCopyMoveTest.java?rev=1343782&r1=1343781&r2=1343782&view=diff ============================================================================== --- jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/basic/DigesterCopyMoveTest.java (original) +++ jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/basic/DigesterCopyMoveTest.java Tue May 29 15:36:07 2012 @@ -19,21 +19,17 @@ package org.apache.jackrabbit.ocm.manage import java.util.ArrayList; import java.util.Collection; -import javax.jcr.Node; -import javax.jcr.NodeIterator; -import javax.jcr.RepositoryException; import junit.framework.Test; import junit.framework.TestSuite; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.apache.jackrabbit.ocm.DigesterTestBase; import org.apache.jackrabbit.ocm.exception.ObjectContentManagerException; -import org.apache.jackrabbit.ocm.repository.RepositoryUtil; import org.apache.jackrabbit.ocm.testmodel.A; import org.apache.jackrabbit.ocm.testmodel.Atomic; import org.apache.jackrabbit.ocm.testmodel.B; import org.apache.jackrabbit.ocm.testmodel.C; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** @@ -43,7 +39,7 @@ import org.apache.jackrabbit.ocm.testmod / public class DigesterCopyMoveTest extends DigesterTestBase { - private final static Log log = LogFactory.getLog(DigesterCopyMoveTest.class); + private final static Logger log = LoggerFactory.getLogger(DigesterCopyMoveTest.class); /* * <p>Defines the test case name for junit.</p> Modified: jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/basic/DigesterRemoveTest.java URL: http://svn.apache.org/viewvc/jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/basic/DigesterRemoveTest.java?rev=1343782&r1=1343781&r2=1343782&view=diff ============================================================================== --- jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/basic/DigesterRemoveTest.java (original) +++ jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/basic/DigesterRemoveTest.java Tue May 29 15:36:07 2012 @@ -25,14 +25,14 @@ import java.util.Date; import junit.framework.Test; import junit.framework.TestSuite; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.apache.jackrabbit.ocm.DigesterTestBase; import org.apache.jackrabbit.ocm.manager.ObjectContentManager; import org.apache.jackrabbit.ocm.query.Filter; import org.apache.jackrabbit.ocm.query.Query; import org.apache.jackrabbit.ocm.query.QueryManager; import org.apache.jackrabbit.ocm.testmodel.Atomic; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** @@ -42,7 +42,7 @@ import org.apache.jackrabbit.ocm.testmod / public class DigesterRemoveTest extends DigesterTestBase { - private final static Log log = LogFactory.getLog(DigesterRemoveTest.class); + private final static Logger log = LoggerFactory.getLogger(DigesterRemoveTest.class); private Date date = new Date(); /* * <p>Defines the test case name for junit.</p> Modified: jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/basic/DigesterSameNameSiblingTest.java URL: http://svn.apache.org/viewvc/jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/basic/DigesterSameNameSiblingTest.java?rev=1343782&r1=1343781&r2=1343782&view=diff ============================================================================== --- jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/basic/DigesterSameNameSiblingTest.java (original) +++ jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/basic/DigesterSameNameSiblingTest.java Tue May 29 15:36:07 2012 @@ -27,8 +27,6 @@ import javax.jcr.UnsupportedRepositoryOp import junit.framework.Test; import junit.framework.TestSuite; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.apache.jackrabbit.ocm.DigesterTestBase; import org.apache.jackrabbit.ocm.manager.ObjectContentManager; import org.apache.jackrabbit.ocm.manager.impl.ObjectContentManagerImpl; @@ -39,6 +37,8 @@ import org.apache.jackrabbit.ocm.reposit import org.apache.jackrabbit.ocm.testmodel.Atomic; import org.apache.jackrabbit.ocm.testmodel.Page; import org.apache.jackrabbit.ocm.testmodel.Paragraph; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Test Query on atomic fields @@ -47,7 +47,7 @@ import org.apache.jackrabbit.ocm.testmod / public class DigesterSameNameSiblingTest extends DigesterTestBase { - private final static Log log = LogFactory.getLog(DigesterSameNameSiblingTest.class); + private final static Logger log = LoggerFactory.getLogger(DigesterSameNameSiblingTest.class); private Date date = new Date(); /* Modified: jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/basic/DigesterSimpleTest.java URL: http://svn.apache.org/viewvc/jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/basic/DigesterSimpleTest.java?rev=1343782&r1=1343781&r2=1343782&view=diff ============================================================================== --- jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/basic/DigesterSimpleTest.java (original) +++ jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/basic/DigesterSimpleTest.java Tue May 29 15:36:07 2012 @@ -22,14 +22,14 @@ import java.util.Collection; import junit.framework.Test; import junit.framework.TestSuite; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.apache.jackrabbit.ocm.DigesterTestBase; import org.apache.jackrabbit.ocm.manager.ObjectContentManager; import org.apache.jackrabbit.ocm.testmodel.A; import org.apache.jackrabbit.ocm.testmodel.B; import org.apache.jackrabbit.ocm.testmodel.C; import org.apache.jackrabbit.ocm.testmodel.Discriminator; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Test JcrSession @@ -38,7 +38,7 @@ import org.apache.jackrabbit.ocm.testmod / public class DigesterSimpleTest extends DigesterTestBase { - private final static Log log = LogFactory.getLog(DigesterSimpleTest.class); + private final static Logger log = LoggerFactory.getLogger(DigesterSimpleTest.class); /* * <p>Defines the test case name for junit.</p> Modified: jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/beanconverter/FakeBeanConverter.java URL: http://svn.apache.org/viewvc/jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/beanconverter/FakeBeanConverter.java?rev=1343782&r1=1343781&r2=1343782&view=diff ============================================================================== --- jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/beanconverter/FakeBeanConverter.java (original) +++ jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/beanconverter/FakeBeanConverter.java Tue May 29 15:36:07 2012 @@ -25,9 +25,7 @@ import javax.jcr.Session; import org.apache.jackrabbit.ocm.exception.JcrMappingException; import org.apache.jackrabbit.ocm.exception.ObjectContentManagerException; import org.apache.jackrabbit.ocm.exception.RepositoryException; - import org.apache.jackrabbit.ocm.manager.atomictypeconverter.AtomicTypeConverterProvider; -import org.apache.jackrabbit.ocm.manager.beanconverter.BeanConverter; import org.apache.jackrabbit.ocm.manager.beanconverter.impl.AbstractBeanConverterImpl; import org.apache.jackrabbit.ocm.manager.objectconverter.ObjectConverter; import org.apache.jackrabbit.ocm.mapper.Mapper; @@ -37,40 +35,32 @@ import org.apache.jackrabbit.ocm.testmod public class FakeBeanConverter extends AbstractBeanConverterImpl implements BeanConverter { - private static List log = new ArrayList(); + private static List log = new ArrayList(); public FakeBeanConverter(Mapper mapper, ObjectConverter objectConverter, AtomicTypeConverterProvider atomicTypeConverterProvider) { - super(mapper, objectConverter, atomicTypeConverterProvider); - - - } + super(mapper, objectConverter, atomicTypeConverterProvider); + + + } - public static void cleanUpLog() - { - log.clear(); + public static void cleanUpLog() { + log.clear(); } - public static List getLog() { + public static List getLog() { return log; } - /** - * @see org.apache.jackrabbit.ocm.manager.beanconverter.BeanConverter#insert(javax.jcr.Session, javax.jcr.Node, org.apache.jackrabbit.ocm.mapper.Mapper, java.lang.String, java.lang.Object) - / - public void insert(Session session, Node parentNode, BeanDescriptor beanDescriptor, ClassDescriptor beanClassDescriptor, Object object, ClassDescriptor parentClassDescriptor, Object parent) - throws ObjectContentManagerException, RepositoryException, JcrMappingException { + public void insert(Session session, Node parentNode, BeanDescriptor beanDescriptor, ClassDescriptor beanClassDescriptor, Object object, ClassDescriptor parentClassDescriptor, Object parent) + throws ObjectContentManagerException, RepositoryException, JcrMappingException { try { log.add("insert at path " + parentNode.getPath()); - } - catch(javax.jcr.RepositoryException re) { + } catch (javax.jcr.RepositoryException re) { throw new ObjectContentManagerException(re); } } - /* - * @see org.apache.jackrabbit.ocm.manager.beanconverter.BeanConverter#update(javax.jcr.Session, javax.jcr.Node, org.apache.jackrabbit.ocm.mapper.Mapper, java.lang.String, java.lang.Object) - / public void update(Session session, Node parentNode, BeanDescriptor beanDescriptor, ClassDescriptor beanClassDescriptor, Object object, ClassDescriptor parentClassDescriptor, Object parent) throws ObjectContentManagerException, RepositoryException, JcrMappingException { try { @@ -79,17 +69,14 @@ public class FakeBeanConverter extends A catch(javax.jcr.RepositoryException re) { throw new ObjectContentManagerException(re); } + } - /* - * @see org.apache.jackrabbit.ocm.manager.beanconverter.BeanConverter#getObject(javax.jcr.Session, javax.jcr.Node, org.apache.jackrabbit.ocm.mapper.Mapper, java.lang.String, java.lang.Class) - / public Object getObject(Session session, Node parentNode, BeanDescriptor beanDescriptor, ClassDescriptor beanClassDescriptor, Class beanClass, Object parent) - throws ObjectContentManagerException, RepositoryException,JcrMappingException { + throws ObjectContentManagerException, RepositoryException, JcrMappingException { try { log.add("get from path " + parentNode.getPath()); - } - catch(javax.jcr.RepositoryException re) { + } catch (javax.jcr.RepositoryException re) { throw new ObjectContentManagerException(re); } // The B object is not important for the unit test. @@ -97,16 +84,12 @@ public class FakeBeanConverter extends A return new B(); } - /* - * @see org.apache.jackrabbit.ocm.manager.beanconverter.BeanConverter#remove(javax.jcr.Session, javax.jcr.Node, org.apache.jackrabbit.ocm.mapper.Mapper, java.lang.String) - / - public void remove(Session session, Node parentNode, BeanDescriptor beanDescriptor, ClassDescriptor beanClassDescriptor, Object object, ClassDescriptor parentClassDescriptor, Object parent) - throws ObjectContentManagerException, RepositoryException, JcrMappingException { + public void remove(Session session, Node parentNode, BeanDescriptor beanDescriptor, ClassDescriptor beanClassDescriptor, Object object, ClassDescriptor parentClassDescriptor, Object parent) + throws ObjectContentManagerException, RepositoryException, JcrMappingException { try { log.add("remove from path " + parentNode.getPath()); - } - catch(javax.jcr.RepositoryException re) { + } catch (javax.jcr.RepositoryException re) { throw new ObjectContentManagerException(re); } } Modified: jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/collectionconverter/AnnotationArrayListTest.java URL: http://svn.apache.org/viewvc/jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/collectionconverter/AnnotationArrayListTest.java?rev=1343782&r1=1343781&r2=1343782&view=diff ============================================================================== --- jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/collectionconverter/AnnotationArrayListTest.java (original) +++ jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/collectionconverter/AnnotationArrayListTest.java Tue May 29 15:36:07 2012 @@ -23,21 +23,21 @@ import java.util.List; import junit.framework.Test; import junit.framework.TestSuite; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.apache.jackrabbit.ocm.AnnotationTestBase; import org.apache.jackrabbit.ocm.manager.ObjectContentManager; import org.apache.jackrabbit.ocm.testmodel.collection.ArrayListElement; import org.apache.jackrabbit.ocm.testmodel.collection.CustomList; import org.apache.jackrabbit.ocm.testmodel.collection.Element; import org.apache.jackrabbit.ocm.testmodel.collection.Main; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /* * @author <a href="mailto:christophe.lombart@gmail.com">Christophe Lombart</a> / public class AnnotationArrayListTest extends AnnotationTestBase { - private final static Log log = LogFactory.getLog(AnnotationArrayListTest.class); + private final static Logger log = LoggerFactory.getLogger(AnnotationArrayListTest.class); /* * <p>Defines the test case name for junit.</p> Modified: jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/collectionconverter/AnnotationDefaultCollectionConverterImplTest.java URL: http://svn.apache.org/viewvc/jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/collectionconverter/AnnotationDefaultCollectionConverterImplTest.java?rev=1343782&r1=1343781&r2=1343782&view=diff ============================================================================== --- jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/collectionconverter/AnnotationDefaultCollectionConverterImplTest.java (original) +++ jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/collectionconverter/AnnotationDefaultCollectionConverterImplTest.java Tue May 29 15:36:07 2012 @@ -22,12 +22,12 @@ import java.util.Collection; import junit.framework.Test; import junit.framework.TestSuite; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.apache.jackrabbit.ocm.AnnotationTestBase; import org.apache.jackrabbit.ocm.manager.ObjectContentManager; import org.apache.jackrabbit.ocm.testmodel.A; import org.apache.jackrabbit.ocm.testmodel.C; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Test DefaultCollectionConverterImpl @@ -36,7 +36,7 @@ import org.apache.jackrabbit.ocm.testmod / public class AnnotationDefaultCollectionConverterImplTest extends AnnotationTestBase { - private final static Log log = LogFactory.getLog(AnnotationDefaultCollectionConverterImplTest.class); + private final static Logger log = LoggerFactory.getLogger(AnnotationDefaultCollectionConverterImplTest.class); /* * <p>Defines the test case name for junit.</p> Modified: jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/collectionconverter/AnnotationHashMapTest.java URL: http://svn.apache.org/viewvc/jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/collectionconverter/AnnotationHashMapTest.java?rev=1343782&r1=1343781&r2=1343782&view=diff ============================================================================== --- jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/collectionconverter/AnnotationHashMapTest.java (original) +++ jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/collectionconverter/AnnotationHashMapTest.java Tue May 29 15:36:07 2012 @@ -22,13 +22,13 @@ import java.util.Map; import junit.framework.Test; import junit.framework.TestSuite; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.apache.jackrabbit.ocm.AnnotationTestBase; import org.apache.jackrabbit.ocm.manager.ObjectContentManager; import org.apache.jackrabbit.ocm.testmodel.collection.Element; import org.apache.jackrabbit.ocm.testmodel.collection.HashMapElement; import org.apache.jackrabbit.ocm.testmodel.collection.Main; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Test NTCollectionConverterImpl @@ -37,7 +37,7 @@ import org.apache.jackrabbit.ocm.testmod / public class AnnotationHashMapTest extends AnnotationTestBase { - private final static Log log = LogFactory.getLog(AnnotationHashMapTest.class); + private final static Logger log = LoggerFactory.getLogger(AnnotationHashMapTest.class); /* * <p>Defines the test case name for junit.</p> Modified: jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/collectionconverter/AnnotationMultiValueCollectionConverterImplTest.java URL: http://svn.apache.org/viewvc/jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/collectionconverter/AnnotationMultiValueCollectionConverterImplTest.java?rev=1343782&r1=1343781&r2=1343782&view=diff ============================================================================== --- jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/collectionconverter/AnnotationMultiValueCollectionConverterImplTest.java (original) +++ jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/collectionconverter/AnnotationMultiValueCollectionConverterImplTest.java Tue May 29 15:36:07 2012 @@ -21,11 +21,11 @@ import java.util.ArrayList; import junit.framework.Test; import junit.framework.TestSuite; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.apache.jackrabbit.ocm.AnnotationTestBase; import org.apache.jackrabbit.ocm.manager.ObjectContentManager; import org.apache.jackrabbit.ocm.testmodel.MultiValue; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Test NTCollectionConverterImpl @@ -34,7 +34,7 @@ import org.apache.jackrabbit.ocm.testmod / public class AnnotationMultiValueCollectionConverterImplTest extends AnnotationTestBase { - private final static Log log = LogFactory.getLog(AnnotationMultiValueCollectionConverterImplTest.class); + private final static Logger log = LoggerFactory.getLogger(AnnotationMultiValueCollectionConverterImplTest.class); /* * <p>Defines the test case name for junit.</p> Modified: jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/collectionconverter/AnnotationMultiValueWithObjectCollectionConverterImplTest.java URL: http://svn.apache.org/viewvc/jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/collectionconverter/AnnotationMultiValueWithObjectCollectionConverterImplTest.java?rev=1343782&r1=1343781&r2=1343782&view=diff ============================================================================== --- jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/collectionconverter/AnnotationMultiValueWithObjectCollectionConverterImplTest.java (original) +++ jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/collectionconverter/AnnotationMultiValueWithObjectCollectionConverterImplTest.java Tue May 29 15:36:07 2012 @@ -22,8 +22,6 @@ import java.util.Iterator; import junit.framework.Test; import junit.framework.TestSuite; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.apache.jackrabbit.ocm.AnnotationTestBase; import org.apache.jackrabbit.ocm.manager.ObjectContentManager; import org.apache.jackrabbit.ocm.testmodel.MultiValueWithObjectCollection; @@ -35,8 +33,6 @@ import org.apache.jackrabbit.ocm.testmod / public class AnnotationMultiValueWithObjectCollectionConverterImplTest extends AnnotationTestBase { - private final static Log log = LogFactory - .getLog(AnnotationMultiValueWithObjectCollectionConverterImplTest.class); /* * <p>Defines the test case name for junit.</p> Modified: jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/collectionconverter/AnnotationNTCollectionConverterImplTest.java URL: http://svn.apache.org/viewvc/jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/collectionconverter/AnnotationNTCollectionConverterImplTest.java?rev=1343782&r1=1343781&r2=1343782&view=diff ============================================================================== --- jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/collectionconverter/AnnotationNTCollectionConverterImplTest.java (original) +++ jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/collectionconverter/AnnotationNTCollectionConverterImplTest.java Tue May 29 15:36:07 2012 @@ -23,12 +23,12 @@ import java.util.Iterator; import junit.framework.Test; import junit.framework.TestSuite; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.apache.jackrabbit.ocm.AnnotationTestBase; import org.apache.jackrabbit.ocm.manager.ObjectContentManager; import org.apache.jackrabbit.ocm.testmodel.Page; import org.apache.jackrabbit.ocm.testmodel.Paragraph; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Test NTCollectionConverterImpl @@ -37,7 +37,7 @@ import org.apache.jackrabbit.ocm.testmod / public class AnnotationNTCollectionConverterImplTest extends AnnotationTestBase { - private final static Log log = LogFactory.getLog(AnnotationNTCollectionConverterImplTest.class); + private final static Logger log = LoggerFactory.getLogger(AnnotationNTCollectionConverterImplTest.class); /* * <p>Defines the test case name for junit.</p> Modified: jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/collectionconverter/AnnotationPersonListTest.java URL: http://svn.apache.org/viewvc/jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/collectionconverter/AnnotationPersonListTest.java?rev=1343782&r1=1343781&r2=1343782&view=diff ============================================================================== --- jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/collectionconverter/AnnotationPersonListTest.java (original) +++ jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/collectionconverter/AnnotationPersonListTest.java Tue May 29 15:36:07 2012 @@ -22,18 +22,18 @@ import java.util.List; import junit.framework.Test; import junit.framework.TestSuite; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.apache.jackrabbit.ocm.AnnotationTestBase; import org.apache.jackrabbit.ocm.manager.ObjectContentManager; import org.apache.jackrabbit.ocm.testmodel.collection.Person; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * @author <a href="mailto:boni.g@bioimagene.com">Boni Gopalan</a> / public class AnnotationPersonListTest extends AnnotationTestBase { - private final static Log log = LogFactory.getLog(AnnotationPersonListTest.class); + private final static Logger log = LoggerFactory.getLogger(AnnotationPersonListTest.class); /* * <p>Defines the test case name for junit.</p> Modified: jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/collectionconverter/AnnotationResidualNodesCollectionConverterImplTest.java URL: http://svn.apache.org/viewvc/jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/collectionconverter/AnnotationResidualNodesCollectionConverterImplTest.java?rev=1343782&r1=1343781&r2=1343782&view=diff ============================================================================== --- jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/collectionconverter/AnnotationResidualNodesCollectionConverterImplTest.java (original) +++ jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/collectionconverter/AnnotationResidualNodesCollectionConverterImplTest.java Tue May 29 15:36:07 2012 @@ -21,12 +21,12 @@ import java.util.HashMap; import junit.framework.Test; import junit.framework.TestSuite; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.apache.jackrabbit.ocm.AnnotationTestBase; import org.apache.jackrabbit.ocm.manager.ObjectContentManager; import org.apache.jackrabbit.ocm.testmodel.Paragraph; import org.apache.jackrabbit.ocm.testmodel.Residual; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Test ResidualNodesCollectionConverterImpl @@ -36,7 +36,7 @@ import org.apache.jackrabbit.ocm.testmod / public class AnnotationResidualNodesCollectionConverterImplTest extends AnnotationTestBase { - private final static Log log = LogFactory.getLog(AnnotationResidualNodesCollectionConverterImplTest.class); + private final static Logger log = LoggerFactory.getLogger(AnnotationResidualNodesCollectionConverterImplTest.class); /* * <p>Defines the test case name for junit.</p> Modified: jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/collectionconverter/AnnotationResidualPropertiesCollectionConverterImplTest.java URL: http://svn.apache.org/viewvc/jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/collectionconverter/AnnotationResidualPropertiesCollectionConverterImplTest.java?rev=1343782&r1=1343781&r2=1343782&view=diff ============================================================================== --- jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/collectionconverter/AnnotationResidualPropertiesCollectionConverterImplTest.java (original) +++ jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/collectionconverter/AnnotationResidualPropertiesCollectionConverterImplTest.java Tue May 29 15:36:07 2012 @@ -23,11 +23,11 @@ import java.util.List; import junit.framework.Test; import junit.framework.TestSuite; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.apache.jackrabbit.ocm.AnnotationTestBase; import org.apache.jackrabbit.ocm.manager.ObjectContentManager; import org.apache.jackrabbit.ocm.testmodel.Residual; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Test ResidualPropertiesCollectionConverterImpl @@ -37,7 +37,7 @@ import org.apache.jackrabbit.ocm.testmod / public class AnnotationResidualPropertiesCollectionConverterImplTest extends AnnotationTestBase { - private final static Log log = LogFactory.getLog(AnnotationResidualPropertiesCollectionConverterImplTest.class); + private final static Logger log = LoggerFactory.getLogger(AnnotationResidualPropertiesCollectionConverterImplTest.class); /* * <p>Defines the test case name for junit.</p> Modified: jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/collectionconverter/BeanReferenceMapConverterImplTest.java URL: http://svn.apache.org/viewvc/jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/collectionconverter/BeanReferenceMapConverterImplTest.java?rev=1343782&r1=1343781&r2=1343782&view=diff ============================================================================== --- jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/collectionconverter/BeanReferenceMapConverterImplTest.java (original) +++ jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/collectionconverter/BeanReferenceMapConverterImplTest.java Tue May 29 15:36:07 2012 @@ -20,12 +20,12 @@ import javax.jcr.RepositoryException; import junit.framework.Test; import junit.framework.TestSuite; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.apache.jackrabbit.ocm.AnnotationTestBase; import org.apache.jackrabbit.ocm.manager.ObjectContentManager; import org.apache.jackrabbit.ocm.testmodel.collection.Main; import org.apache.jackrabbit.ocm.testmodel.uuid.A; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** @@ -41,7 +41,7 @@ import org.apache.jackrabbit.ocm.testmod * / public class BeanReferenceMapConverterImplTest extends AnnotationTestBase { - private final static Log log = LogFactory.getLog(BeanReferenceMapConverterImplTest.class); + private final static Logger log = LoggerFactory.getLogger(BeanReferenceMapConverterImplTest.class); /* * <p>Defines the test case name for junit.</p> Modified: jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/collectionconverter/DigesterArrayListTest.java URL: http://svn.apache.org/viewvc/jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/collectionconverter/DigesterArrayListTest.java?rev=1343782&r1=1343781&r2=1343782&view=diff ============================================================================== --- jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/collectionconverter/DigesterArrayListTest.java (original) +++ jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/collectionconverter/DigesterArrayListTest.java Tue May 29 15:36:07 2012 @@ -23,20 +23,20 @@ import java.util.List; import junit.framework.Test; import junit.framework.TestSuite; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.apache.jackrabbit.ocm.DigesterTestBase; import org.apache.jackrabbit.ocm.manager.ObjectContentManager; import org.apache.jackrabbit.ocm.testmodel.collection.ArrayListElement; import org.apache.jackrabbit.ocm.testmodel.collection.Element; import org.apache.jackrabbit.ocm.testmodel.collection.Main; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * @author <a href="mailto:christophe.lombart@gmail.com">Christophe Lombart</a> / public class DigesterArrayListTest extends DigesterTestBase { - private final static Log log = LogFactory.getLog(DigesterArrayListTest.class); + private final static Logger log = LoggerFactory.getLogger(DigesterArrayListTest.class); /* * <p>Defines the test case name for junit.</p> Modified: jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/collectionconverter/DigesterDefaultCollectionConverterImplTest.java URL: http://svn.apache.org/viewvc/jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/collectionconverter/DigesterDefaultCollectionConverterImplTest.java?rev=1343782&r1=1343781&r2=1343782&view=diff ============================================================================== --- jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/collectionconverter/DigesterDefaultCollectionConverterImplTest.java (original) +++ jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/collectionconverter/DigesterDefaultCollectionConverterImplTest.java Tue May 29 15:36:07 2012 @@ -22,12 +22,12 @@ import java.util.Collection; import junit.framework.Test; import junit.framework.TestSuite; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.apache.jackrabbit.ocm.DigesterTestBase; import org.apache.jackrabbit.ocm.manager.ObjectContentManager; import org.apache.jackrabbit.ocm.testmodel.A; import org.apache.jackrabbit.ocm.testmodel.C; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Test DefaultCollectionConverterImpl @@ -36,7 +36,7 @@ import org.apache.jackrabbit.ocm.testmod / public class DigesterDefaultCollectionConverterImplTest extends DigesterTestBase { - private final static Log log = LogFactory.getLog(DigesterDefaultCollectionConverterImplTest.class); + private final static Logger log = LoggerFactory.getLogger(DigesterDefaultCollectionConverterImplTest.class); /* * <p>Defines the test case name for junit.</p> Modified: jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/collectionconverter/DigesterHashMapTest.java URL: http://svn.apache.org/viewvc/jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/collectionconverter/DigesterHashMapTest.java?rev=1343782&r1=1343781&r2=1343782&view=diff ============================================================================== --- jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/collectionconverter/DigesterHashMapTest.java (original) +++ jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/collectionconverter/DigesterHashMapTest.java Tue May 29 15:36:07 2012 @@ -21,13 +21,13 @@ import java.util.Map; import junit.framework.Test; import junit.framework.TestSuite; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.apache.jackrabbit.ocm.DigesterTestBase; import org.apache.jackrabbit.ocm.manager.ObjectContentManager; import org.apache.jackrabbit.ocm.testmodel.collection.Element; import org.apache.jackrabbit.ocm.testmodel.collection.HashMapElement; import org.apache.jackrabbit.ocm.testmodel.collection.Main; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Test NTCollectionConverterImpl @@ -36,7 +36,7 @@ import org.apache.jackrabbit.ocm.testmod / public class DigesterHashMapTest extends DigesterTestBase { - private final static Log log = LogFactory.getLog(DigesterHashMapTest.class); + private final static Logger log = LoggerFactory.getLogger(DigesterHashMapTest.class); /* * <p>Defines the test case name for junit.</p> Modified: jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/collectionconverter/DigesterMultiValueCollectionConverterImplTest.java URL: http://svn.apache.org/viewvc/jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/collectionconverter/DigesterMultiValueCollectionConverterImplTest.java?rev=1343782&r1=1343781&r2=1343782&view=diff ============================================================================== --- jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/collectionconverter/DigesterMultiValueCollectionConverterImplTest.java (original) +++ jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/collectionconverter/DigesterMultiValueCollectionConverterImplTest.java Tue May 29 15:36:07 2012 @@ -21,11 +21,11 @@ import java.util.ArrayList; import junit.framework.Test; import junit.framework.TestSuite; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.apache.jackrabbit.ocm.DigesterTestBase; import org.apache.jackrabbit.ocm.manager.ObjectContentManager; import org.apache.jackrabbit.ocm.testmodel.MultiValue; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Test NTCollectionConverterImpl @@ -34,7 +34,7 @@ import org.apache.jackrabbit.ocm.testmod / public class DigesterMultiValueCollectionConverterImplTest extends DigesterTestBase { - private final static Log log = LogFactory.getLog(DigesterMultiValueCollectionConverterImplTest.class); + private final static Logger log = LoggerFactory.getLogger(DigesterMultiValueCollectionConverterImplTest.class); /* * <p>Defines the test case name for junit.</p> Modified: jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/collectionconverter/DigesterMultiValueWithObjectCollectionConverterImplTest.java URL: http://svn.apache.org/viewvc/jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/collectionconverter/DigesterMultiValueWithObjectCollectionConverterImplTest.java?rev=1343782&r1=1343781&r2=1343782&view=diff ============================================================================== --- jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/collectionconverter/DigesterMultiValueWithObjectCollectionConverterImplTest.java (original) +++ jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/collectionconverter/DigesterMultiValueWithObjectCollectionConverterImplTest.java Tue May 29 15:36:07 2012 @@ -22,11 +22,11 @@ import java.util.Iterator; import junit.framework.Test; import junit.framework.TestSuite; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.apache.jackrabbit.ocm.DigesterTestBase; import org.apache.jackrabbit.ocm.manager.ObjectContentManager; import org.apache.jackrabbit.ocm.testmodel.MultiValueWithObjectCollection; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Test NTCollectionConverterImpl @@ -35,7 +35,7 @@ import org.apache.jackrabbit.ocm.testmod / public class DigesterMultiValueWithObjectCollectionConverterImplTest extends DigesterTestBase { - private final static Log log = LogFactory.getLog(DigesterMultiValueWithObjectCollectionConverterImplTest.class); + private final static Logger log = LoggerFactory.getLogger(DigesterMultiValueWithObjectCollectionConverterImplTest.class); /* * <p>Defines the test case name for junit.</p> Modified: jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/collectionconverter/DigesterNTCollectionConverterImplTest.java URL: http://svn.apache.org/viewvc/jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/collectionconverter/DigesterNTCollectionConverterImplTest.java?rev=1343782&r1=1343781&r2=1343782&view=diff ============================================================================== --- jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/collectionconverter/DigesterNTCollectionConverterImplTest.java (original) +++ jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/collectionconverter/DigesterNTCollectionConverterImplTest.java Tue May 29 15:36:07 2012 @@ -23,12 +23,12 @@ import java.util.Iterator; import junit.framework.Test; import junit.framework.TestSuite; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.apache.jackrabbit.ocm.DigesterTestBase; import org.apache.jackrabbit.ocm.manager.ObjectContentManager; import org.apache.jackrabbit.ocm.testmodel.Page; import org.apache.jackrabbit.ocm.testmodel.Paragraph; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Test NTCollectionConverterImpl @@ -37,7 +37,7 @@ import org.apache.jackrabbit.ocm.testmod / public class DigesterNTCollectionConverterImplTest extends DigesterTestBase { - private final static Log log = LogFactory.getLog(DigesterNTCollectionConverterImplTest.class); + private final static Logger log = LoggerFactory.getLogger(DigesterNTCollectionConverterImplTest.class); /* * <p>Defines the test case name for junit.</p> Modified: jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/collectionconverter/DigesterPersonListTest.java URL: http://svn.apache.org/viewvc/jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/collectionconverter/DigesterPersonListTest.java?rev=1343782&r1=1343781&r2=1343782&view=diff ============================================================================== --- jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/collectionconverter/DigesterPersonListTest.java (original) +++ jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/collectionconverter/DigesterPersonListTest.java Tue May 29 15:36:07 2012 @@ -22,18 +22,18 @@ import java.util.List; import junit.framework.Test; import junit.framework.TestSuite; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.apache.jackrabbit.ocm.DigesterTestBase; import org.apache.jackrabbit.ocm.manager.ObjectContentManager; import org.apache.jackrabbit.ocm.testmodel.collection.Person; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * @author <a href="mailto:boni.g@bioimagene.com">Boni Gopalan</a> / public class DigesterPersonListTest extends DigesterTestBase { - private final static Log log = LogFactory.getLog(DigesterPersonListTest.class); + private final static Logger log = LoggerFactory.getLogger(DigesterPersonListTest.class); /* * <p>Defines the test case name for junit.</p> Modified: jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/collectionconverter/DigesterResidualNodesCollectionConverterImplTest.java URL: http://svn.apache.org/viewvc/jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/collectionconverter/DigesterResidualNodesCollectionConverterImplTest.java?rev=1343782&r1=1343781&r2=1343782&view=diff ============================================================================== --- jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/collectionconverter/DigesterResidualNodesCollectionConverterImplTest.java (original) +++ jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/collectionconverter/DigesterResidualNodesCollectionConverterImplTest.java Tue May 29 15:36:07 2012 @@ -21,12 +21,12 @@ import java.util.HashMap; import junit.framework.Test; import junit.framework.TestSuite; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.apache.jackrabbit.ocm.DigesterTestBase; import org.apache.jackrabbit.ocm.manager.ObjectContentManager; import org.apache.jackrabbit.ocm.testmodel.Paragraph; import org.apache.jackrabbit.ocm.testmodel.Residual; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Test ResidualNodesCollectionConverterImpl @@ -36,7 +36,7 @@ import org.apache.jackrabbit.ocm.testmod / public class DigesterResidualNodesCollectionConverterImplTest extends DigesterTestBase { - private final static Log log = LogFactory.getLog(DigesterResidualNodesCollectionConverterImplTest.class); + private final static Logger log = LoggerFactory.getLogger(DigesterResidualNodesCollectionConverterImplTest.class); /* * <p>Defines the test case name for junit.</p> Modified: jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/collectionconverter/DigesterResidualPropertiesCollectionConverterImplTest.java URL: http://svn.apache.org/viewvc/jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/collectionconverter/DigesterResidualPropertiesCollectionConverterImplTest.java?rev=1343782&r1=1343781&r2=1343782&view=diff ============================================================================== --- jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/collectionconverter/DigesterResidualPropertiesCollectionConverterImplTest.java (original) +++ jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/collectionconverter/DigesterResidualPropertiesCollectionConverterImplTest.java Tue May 29 15:36:07 2012 @@ -23,11 +23,11 @@ import java.util.List; import junit.framework.Test; import junit.framework.TestSuite; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.apache.jackrabbit.ocm.DigesterTestBase; import org.apache.jackrabbit.ocm.manager.ObjectContentManager; import org.apache.jackrabbit.ocm.testmodel.Residual; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Test ResidualPropertiesCollectionConverterImpl @@ -37,7 +37,7 @@ import org.apache.jackrabbit.ocm.testmod / public class DigesterResidualPropertiesCollectionConverterImplTest extends DigesterTestBase { - private final static Log log = LogFactory.getLog(DigesterResidualPropertiesCollectionConverterImplTest.class); + private final static Logger log = LoggerFactory.getLogger(DigesterResidualPropertiesCollectionConverterImplTest.class); /* * <p>Defines the test case name for junit.</p> Modified: jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/collectionconverter/MapReferenceValueEncoderTest.java URL: http://svn.apache.org/viewvc/jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/collectionconverter/MapReferenceValueEncoderTest.java?rev=1343782&r1=1343781&r2=1343782&view=diff ============================================================================== --- jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/collectionconverter/MapReferenceValueEncoderTest.java (original) +++ jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/collectionconverter/MapReferenceValueEncoderTest.java Tue May 29 15:36:07 2012 @@ -17,10 +17,10 @@ package org.apache.jackrabbit.ocm.manager.collectionconverter; -import org.apache.jackrabbit.ocm.manager.collectionconverter.impl.MapReferenceValueEncoder; -import static junit.framework.Assert.assertEquals;import static junit.framework.Assert.assertTrue; import junit.framework.TestCase; +import org.apache.jackrabbit.ocm.manager.collectionconverter.impl.MapReferenceValueEncoder; + /** * TODO: JAVADOC * <p/> Modified: jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/enumeration/AnnotationSimpleEnumerationTest.java URL: http://svn.apache.org/viewvc/jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/enumeration/AnnotationSimpleEnumerationTest.java?rev=1343782&r1=1343781&r2=1343782&view=diff ============================================================================== --- jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/enumeration/AnnotationSimpleEnumerationTest.java (original) +++ jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/enumeration/AnnotationSimpleEnumerationTest.java Tue May 29 15:36:07 2012 @@ -19,8 +19,6 @@ package org.apache.jackrabbit.ocm.manage import junit.framework.Test; import junit.framework.TestSuite; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.apache.jackrabbit.ocm.AnnotationTestBase; /** @@ -30,8 +28,6 @@ import org.apache.jackrabbit.ocm.Annotat / public class AnnotationSimpleEnumerationTest extends AnnotationTestBase { - private final static Log logger = LogFactory.getLog(AnnotationSimpleEnumerationTest.class); - /* * <p>Defines the test case name for junit.</p> * @param testName The test case name. Modified: jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/enumeration/DigesterSimpleEnumerationTest.java URL: http://svn.apache.org/viewvc/jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/enumeration/DigesterSimpleEnumerationTest.java?rev=1343782&r1=1343781&r2=1343782&view=diff ============================================================================== --- jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/enumeration/DigesterSimpleEnumerationTest.java (original) +++ jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/enumeration/DigesterSimpleEnumerationTest.java Tue May 29 15:36:07 2012 @@ -19,9 +19,9 @@ package org.apache.jackrabbit.ocm.manage import junit.framework.Test; import junit.framework.TestSuite; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.apache.jackrabbit.ocm.DigesterTestBase; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Test Persisting and retrieving Enum values. @@ -30,7 +30,7 @@ import org.apache.jackrabbit.ocm.Digeste / public class DigesterSimpleEnumerationTest extends DigesterTestBase { - private final static Log log = LogFactory.getLog(DigesterSimpleEnumerationTest.class); + private final static Logger log = LoggerFactory.getLogger(DigesterSimpleEnumerationTest.class); /* * <p>Defines the test case name for junit.</p> Modified: jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/enumeration/SimpleEnumerationTestBase.java URL: http://svn.apache.org/viewvc/jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/enumeration/SimpleEnumerationTestBase.java?rev=1343782&r1=1343781&r2=1343782&view=diff ============================================================================== --- jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/enumeration/SimpleEnumerationTestBase.java (original) +++ jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/enumeration/SimpleEnumerationTestBase.java Tue May 29 15:36:07 2012 @@ -19,13 +19,11 @@ package org.apache.jackrabbit.ocm.manage import java.util.ArrayList; import java.util.List; -import junit.framework.TestCase; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.apache.jackrabbit.ocm.manager.ObjectContentManager; import org.apache.jackrabbit.ocm.testmodel.enumeration.Odyssey; import org.apache.jackrabbit.ocm.testmodel.enumeration.Planet; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import static junit.framework.Assert.assertTrue; import static junit.framework.Assert.fail; @@ -37,7 +35,7 @@ import static junit.framework.Assert.fai / public class SimpleEnumerationTestBase { - private final static Log logger = LogFactory.getLog(SimpleEnumerationTestBase.class); + private final static Logger log = LoggerFactory.getLogger(SimpleEnumerationTestBase.class); ObjectContentManager ocm; public SimpleEnumerationTestBase(ObjectContentManager ocm){ this.ocm = ocm; @@ -64,7 +62,7 @@ public class SimpleEnumerationTestBase List<Planet> fbStops = fbOdessey.getStops(); for (Planet aStop : stops){ assertContains("Fetched back list did not contain :" + aStop.toString(), aStop, fbStops); - logger.info("Contains Enum : " + aStop.toString()); + log.info("Contains Enum : " + aStop.toString()); } } catch (Exception e) Modified: jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/inheritance/AnnotationInheritanceConcreteClassTest.java URL: http://svn.apache.org/viewvc/jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/inheritance/AnnotationInheritanceConcreteClassTest.java?rev=1343782&r1=1343781&r2=1343782&view=diff ============================================================================== --- jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/inheritance/AnnotationInheritanceConcreteClassTest.java (original) +++ jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/inheritance/AnnotationInheritanceConcreteClassTest.java Tue May 29 15:36:07 2012 @@ -21,8 +21,6 @@ import java.util.Collection; import junit.framework.Test; import junit.framework.TestSuite; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.apache.jackrabbit.ocm.AnnotationTestBase; import org.apache.jackrabbit.ocm.exception.JcrMappingException; import org.apache.jackrabbit.ocm.manager.ObjectContentManager; @@ -38,6 +36,8 @@ import org.apache.jackrabbit.ocm.testmod import org.apache.jackrabbit.ocm.testmodel.inheritance.impl.FolderImpl; import org.apache.jackrabbit.ocm.testmodel.interfaces.CmsObject; import org.apache.jackrabbit.ocm.testmodel.interfaces.Folder; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /* * Test inheritance with node type per concrete class (without discreminator field) @@ -45,7 +45,7 @@ import org.apache.jackrabbit.ocm.testmod * @author <a href="mailto:christophe.lombart@gmail.com">Christophe Lombart</a> / public class AnnotationInheritanceConcreteClassTest extends AnnotationTestBase { - private final static Log log = LogFactory.getLog(AnnotationInheritanceConcreteClassTest.class); + private final static Logger log = LoggerFactory.getLogger(AnnotationInheritanceConcreteClassTest.class); /* * <p>Defines the test case name for junit.</p> Modified: jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/inheritance/AnnotationInheritanceHierarchyTest.java URL: http://svn.apache.org/viewvc/jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/inheritance/AnnotationInheritanceHierarchyTest.java?rev=1343782&r1=1343781&r2=1343782&view=diff ============================================================================== --- jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/inheritance/AnnotationInheritanceHierarchyTest.java (original) +++ jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/inheritance/AnnotationInheritanceHierarchyTest.java Tue May 29 15:36:07 2012 @@ -21,8 +21,6 @@ import java.util.Collection; import junit.framework.Test; import junit.framework.TestSuite; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.apache.jackrabbit.ocm.AnnotationTestBase; import org.apache.jackrabbit.ocm.manager.ObjectContentManager; import org.apache.jackrabbit.ocm.query.Filter; @@ -33,6 +31,8 @@ import org.apache.jackrabbit.ocm.testmod import org.apache.jackrabbit.ocm.testmodel.inheritance.AnotherDescendant; import org.apache.jackrabbit.ocm.testmodel.inheritance.Descendant; import org.apache.jackrabbit.ocm.testmodel.inheritance.SubDescendant; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Test inheritance with node type per hierarchy stategy (with discreminator field) @@ -40,7 +40,7 @@ import org.apache.jackrabbit.ocm.testmod * @author <a href="mailto:christophe.lombart@gmail.com">Christophe Lombart</a> / public class AnnotationInheritanceHierarchyTest extends AnnotationTestBase { - private final static Log log = LogFactory.getLog(AnnotationInheritanceHierarchyTest.class); + private final static Logger log = LoggerFactory.getLogger(AnnotationInheritanceHierarchyTest.class); /* * <p>Defines the test case name for junit.</p> Modified: jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/inheritance/DigesterInheritanceConcreteClassTest.java URL: http://svn.apache.org/viewvc/jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/inheritance/DigesterInheritanceConcreteClassTest.java?rev=1343782&r1=1343781&r2=1343782&view=diff ============================================================================== --- jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/inheritance/DigesterInheritanceConcreteClassTest.java (original) +++ jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/inheritance/DigesterInheritanceConcreteClassTest.java Tue May 29 15:36:07 2012 @@ -21,8 +21,6 @@ import java.util.Collection; import junit.framework.Test; import junit.framework.TestSuite; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.apache.jackrabbit.ocm.DigesterTestBase; import org.apache.jackrabbit.ocm.exception.JcrMappingException; import org.apache.jackrabbit.ocm.manager.ObjectContentManager; @@ -38,6 +36,8 @@ import org.apache.jackrabbit.ocm.testmod import org.apache.jackrabbit.ocm.testmodel.inheritance.impl.FolderImpl; import org.apache.jackrabbit.ocm.testmodel.interfaces.CmsObject; import org.apache.jackrabbit.ocm.testmodel.interfaces.Folder; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Test inheritance with node type per concrete class (without discreminator field) @@ -45,7 +45,7 @@ import org.apache.jackrabbit.ocm.testmod * @author <a href="mailto:christophe.lombart@gmail.com">Christophe Lombart</a> / public class DigesterInheritanceConcreteClassTest extends DigesterTestBase { - private final static Log log = LogFactory.getLog(DigesterInheritanceConcreteClassTest.class); + private final static Logger log = LoggerFactory.getLogger(DigesterInheritanceConcreteClassTest.class); /* * <p>Defines the test case name for junit.</p> Modified: jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/inheritance/DigesterInheritanceHierarchyTest.java URL: http://svn.apache.org/viewvc/jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/inheritance/DigesterInheritanceHierarchyTest.java?rev=1343782&r1=1343781&r2=1343782&view=diff ============================================================================== --- jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/inheritance/DigesterInheritanceHierarchyTest.java (original) +++ jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/inheritance/DigesterInheritanceHierarchyTest.java Tue May 29 15:36:07 2012 @@ -21,8 +21,6 @@ import java.util.Collection; import junit.framework.Test; import junit.framework.TestSuite; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.apache.jackrabbit.ocm.DigesterTestBase; import org.apache.jackrabbit.ocm.manager.ObjectContentManager; import org.apache.jackrabbit.ocm.query.Filter; @@ -33,6 +31,8 @@ import org.apache.jackrabbit.ocm.testmod import org.apache.jackrabbit.ocm.testmodel.inheritance.AnotherDescendant; import org.apache.jackrabbit.ocm.testmodel.inheritance.Descendant; import org.apache.jackrabbit.ocm.testmodel.inheritance.SubDescendant; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Test inheritance with node type per hierarchy stategy (with discreminator field) @@ -40,7 +40,7 @@ import org.apache.jackrabbit.ocm.testmod * @author <a href="mailto:christophe.lombart@gmail.com">Christophe Lombart</a> / public class DigesterInheritanceHierarchyTest extends DigesterTestBase { - private final static Log log = LogFactory.getLog(DigesterInheritanceHierarchyTest.class); + private final static Logger log = LoggerFactory.getLogger(DigesterInheritanceHierarchyTest.class); /* * <p>Defines the test case name for junit.</p> Modified: jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/interfaces/AnnotationConcreteClassTest.java URL: http://svn.apache.org/viewvc/jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/interfaces/AnnotationConcreteClassTest.java?rev=1343782&r1=1343781&r2=1343782&view=diff ============================================================================== --- jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/interfaces/AnnotationConcreteClassTest.java (original) +++ jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/interfaces/AnnotationConcreteClassTest.java Tue May 29 15:36:07 2012 @@ -21,8 +21,6 @@ import java.util.Collection; import junit.framework.Test; import junit.framework.TestSuite; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.apache.jackrabbit.ocm.AnnotationTestBase; import org.apache.jackrabbit.ocm.manager.ObjectContentManager; import org.apache.jackrabbit.ocm.query.Filter; @@ -36,6 +34,8 @@ import org.apache.jackrabbit.ocm.testmod import org.apache.jackrabbit.ocm.testmodel.interfaces.Content; import org.apache.jackrabbit.ocm.testmodel.interfaces.Document; import org.apache.jackrabbit.ocm.testmodel.interfaces.Folder; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Test interface (with discreminator field) @@ -44,7 +44,7 @@ import org.apache.jackrabbit.ocm.testmod / public class AnnotationConcreteClassTest extends AnnotationTestBase { - private final static Log log = LogFactory.getLog(AnnotationConcreteClassTest.class); + private final static Logger log = LoggerFactory.getLogger(AnnotationConcreteClassTest.class); /* * <p>Defines the test case name for junit.</p> Modified: jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/interfaces/AnnotationInterfaceHierarchyTest.java URL: http://svn.apache.org/viewvc/jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/interfaces/AnnotationInterfaceHierarchyTest.java?rev=1343782&r1=1343781&r2=1343782&view=diff ============================================================================== --- jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/interfaces/AnnotationInterfaceHierarchyTest.java (original) +++ jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/interfaces/AnnotationInterfaceHierarchyTest.java Tue May 29 15:36:07 2012 @@ -21,8 +21,6 @@ import java.util.Collection; import junit.framework.Test; import junit.framework.TestSuite; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.apache.jackrabbit.ocm.AnnotationTestBase; import org.apache.jackrabbit.ocm.manager.ObjectContentManager; import org.apache.jackrabbit.ocm.query.Filter; @@ -34,6 +32,8 @@ import org.apache.jackrabbit.ocm.testmod import org.apache.jackrabbit.ocm.testmodel.inheritance.SubDescendant; import org.apache.jackrabbit.ocm.testmodel.interfaces.AnotherInterface; import org.apache.jackrabbit.ocm.testmodel.interfaces.Interface; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Test interface (with discreminator field) @@ -41,7 +41,7 @@ import org.apache.jackrabbit.ocm.testmod * @author <a href="mailto:christophe.lombart@gmail.com">Christophe Lombart</a> / public class AnnotationInterfaceHierarchyTest extends AnnotationTestBase { - private final static Log log = LogFactory.getLog(AnnotationInterfaceHierarchyTest.class); + private final static Logger log = LoggerFactory.getLogger(AnnotationInterfaceHierarchyTest.class); /* * <p>Defines the test case name for junit.</p> Modified: jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/interfaces/DigesterConcreteClassTest.java URL: http://svn.apache.org/viewvc/jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/interfaces/DigesterConcreteClassTest.java?rev=1343782&r1=1343781&r2=1343782&view=diff ============================================================================== --- jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/interfaces/DigesterConcreteClassTest.java (original) +++ jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/interfaces/DigesterConcreteClassTest.java Tue May 29 15:36:07 2012 @@ -21,8 +21,6 @@ import java.util.Collection; import junit.framework.Test; import junit.framework.TestSuite; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.apache.jackrabbit.ocm.DigesterTestBase; import org.apache.jackrabbit.ocm.manager.ObjectContentManager; import org.apache.jackrabbit.ocm.query.Filter; @@ -36,6 +34,8 @@ import org.apache.jackrabbit.ocm.testmod import org.apache.jackrabbit.ocm.testmodel.interfaces.Content; import org.apache.jackrabbit.ocm.testmodel.interfaces.Document; import org.apache.jackrabbit.ocm.testmodel.interfaces.Folder; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Test interface (with discreminator field) @@ -43,7 +43,7 @@ import org.apache.jackrabbit.ocm.testmod * @author <a href="mailto:christophe.lombart@gmail.com">Christophe Lombart</a> / public class DigesterConcreteClassTest extends DigesterTestBase { - private final static Log log = LogFactory.getLog(DigesterConcreteClassTest.class); + private final static Logger log = LoggerFactory.getLogger(DigesterConcreteClassTest.class); /* * <p>Defines the test case name for junit.</p> Modified: jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/interfaces/DigesterInterfaceHierarchyTest.java URL: http://svn.apache.org/viewvc/jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/interfaces/DigesterInterfaceHierarchyTest.java?rev=1343782&r1=1343781&r2=1343782&view=diff ============================================================================== --- jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/interfaces/DigesterInterfaceHierarchyTest.java (original) +++ jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/interfaces/DigesterInterfaceHierarchyTest.java Tue May 29 15:36:07 2012 @@ -21,8 +21,6 @@ import java.util.Collection; import junit.framework.Test; import junit.framework.TestSuite; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.apache.jackrabbit.ocm.DigesterTestBase; import org.apache.jackrabbit.ocm.manager.ObjectContentManager; import org.apache.jackrabbit.ocm.query.Filter; @@ -34,6 +32,8 @@ import org.apache.jackrabbit.ocm.testmod import org.apache.jackrabbit.ocm.testmodel.inheritance.SubDescendant; import org.apache.jackrabbit.ocm.testmodel.interfaces.AnotherInterface; import org.apache.jackrabbit.ocm.testmodel.interfaces.Interface; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Test interface (with discreminator field) @@ -41,7 +41,7 @@ import org.apache.jackrabbit.ocm.testmod * @author <a href="mailto:christophe.lombart@gmail.com">Christophe Lombart</a> / public class DigesterInterfaceHierarchyTest extends DigesterTestBase { - private final static Log log = LogFactory.getLog(DigesterInterfaceHierarchyTest.class); + private final static Logger log = LoggerFactory.getLogger(DigesterInterfaceHierarchyTest.class); /* * <p>Defines the test case name for junit.</p> Modified: jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/interfaces/ListOfInterfaceTest.java URL: http://svn.apache.org/viewvc/jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/interfaces/ListOfInterfaceTest.java?rev=1343782&r1=1343781&r2=1343782&view=diff ============================================================================== --- jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/interfaces/ListOfInterfaceTest.java (original) +++ jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/interfaces/ListOfInterfaceTest.java Tue May 29 15:36:07 2012 @@ -22,18 +22,18 @@ import java.util.List; import junit.framework.Test; import junit.framework.TestSuite; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.apache.jackrabbit.ocm.AnnotationTestBase; import org.apache.jackrabbit.ocm.manager.ObjectContentManager; import org.apache.jackrabbit.ocm.testmodel.interfaces.EntityA; import org.apache.jackrabbit.ocm.testmodel.interfaces.EntityB; import org.apache.jackrabbit.ocm.testmodel.interfaces.MyInterface; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class ListOfInterfaceTest extends AnnotationTestBase { - private final static Log log = LogFactory.getLog(ListOfInterfaceTest.class); + private final static Logger log = LoggerFactory.getLogger(ListOfInterfaceTest.class); /** * <p>Defines the test case name for junit.</p> Modified: jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/jcrnodetype/AnnotationJcrNodeTypeTest.java URL: http://svn.apache.org/viewvc/jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/jcrnodetype/AnnotationJcrNodeTypeTest.java?rev=1343782&r1=1343781&r2=1343782&view=diff ============================================================================== --- jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/jcrnodetype/AnnotationJcrNodeTypeTest.java (original) +++ jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/jcrnodetype/AnnotationJcrNodeTypeTest.java Tue May 29 15:36:07 2012 @@ -22,13 +22,13 @@ import java.util.Calendar; import junit.framework.Test; import junit.framework.TestSuite; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.apache.jackrabbit.ocm.AnnotationTestBase; import org.apache.jackrabbit.ocm.manager.ObjectContentManager; import org.apache.jackrabbit.ocm.testmodel.File; import org.apache.jackrabbit.ocm.testmodel.Folder; import org.apache.jackrabbit.ocm.testmodel.Resource; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Test inheritance with node type per concrete class (without discreminator field) @@ -36,7 +36,7 @@ import org.apache.jackrabbit.ocm.testmod * @author <a href="mailto:christophe.lombart@gmail.com">Christophe Lombart</a> / public class AnnotationJcrNodeTypeTest extends AnnotationTestBase { - private final static Log log = LogFactory.getLog(AnnotationJcrNodeTypeTest.class); + private final static Logger log = LoggerFactory.getLogger(AnnotationJcrNodeTypeTest.class); /* * <p>Defines the test case name for junit.</p> Modified: jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/jcrnodetype/AnnotationJcrPropertyTest.java URL: http://svn.apache.org/viewvc/jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/jcrnodetype/AnnotationJcrPropertyTest.java?rev=1343782&r1=1343781&r2=1343782&view=diff ============================================================================== --- jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/jcrnodetype/AnnotationJcrPropertyTest.java (original) +++ jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/jcrnodetype/AnnotationJcrPropertyTest.java Tue May 29 15:36:07 2012 @@ -19,11 +19,11 @@ package org.apache.jackrabbit.ocm.manage import junit.framework.Test; import junit.framework.TestSuite; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.apache.jackrabbit.ocm.AnnotationTestBase; import org.apache.jackrabbit.ocm.manager.ObjectContentManager; import org.apache.jackrabbit.ocm.testmodel.PropertyTest; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Test inheritance with node type per concrete class (without discreminator field) @@ -32,7 +32,7 @@ import org.apache.jackrabbit.ocm.testmod / public class AnnotationJcrPropertyTest extends AnnotationTestBase { - private final static Log log = LogFactory.getLog(AnnotationJcrPropertyTest.class); + private final static Logger log = LoggerFactory.getLogger(AnnotationJcrPropertyTest.class); /* * <p>Defines the test case name for junit.</p> Modified: jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/jcrnodetype/DigesterJcrNodeTypeTest.java URL: http://svn.apache.org/viewvc/jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/jcrnodetype/DigesterJcrNodeTypeTest.java?rev=1343782&r1=1343781&r2=1343782&view=diff ============================================================================== --- jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/jcrnodetype/DigesterJcrNodeTypeTest.java (original) +++ jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/jcrnodetype/DigesterJcrNodeTypeTest.java Tue May 29 15:36:07 2012 @@ -22,13 +22,13 @@ import java.util.Calendar; import junit.framework.Test; import junit.framework.TestSuite; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.apache.jackrabbit.ocm.DigesterTestBase; import org.apache.jackrabbit.ocm.manager.ObjectContentManager; import org.apache.jackrabbit.ocm.testmodel.File; import org.apache.jackrabbit.ocm.testmodel.Folder; import org.apache.jackrabbit.ocm.testmodel.Resource; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Test inheritance with node type per concrete class (without discreminator field) @@ -36,7 +36,7 @@ import org.apache.jackrabbit.ocm.testmod * @author <a href="mailto:christophe.lombart@gmail.com">Christophe Lombart</a> / public class DigesterJcrNodeTypeTest extends DigesterTestBase { - private final static Log log = LogFactory.getLog(DigesterJcrNodeTypeTest.class); + private final static Logger log = LoggerFactory.getLogger(DigesterJcrNodeTypeTest.class); /* * <p>Defines the test case name for junit.</p> Modified: jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/jcrnodetype/DigesterJcrPropertyTest.java URL: http://svn.apache.org/viewvc/jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/jcrnodetype/DigesterJcrPropertyTest.java?rev=1343782&r1=1343781&r2=1343782&view=diff ============================================================================== --- jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/jcrnodetype/DigesterJcrPropertyTest.java (original) +++ jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/jcrnodetype/DigesterJcrPropertyTest.java Tue May 29 15:36:07 2012 @@ -19,11 +19,11 @@ package org.apache.jackrabbit.ocm.manage import junit.framework.Test; import junit.framework.TestSuite; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.apache.jackrabbit.ocm.DigesterTestBase; import org.apache.jackrabbit.ocm.manager.ObjectContentManager; import org.apache.jackrabbit.ocm.testmodel.PropertyTest; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Test inheritance with node type per concrete class (without discreminator field) @@ -31,7 +31,7 @@ import org.apache.jackrabbit.ocm.testmod * @author <a href="mailto:christophe.lombart@gmail.com">Christophe Lombart</a> / public class DigesterJcrPropertyTest extends DigesterTestBase { - private final static Log log = LogFactory.getLog(DigesterJcrPropertyTest.class); + private final static Logger log = LoggerFactory.getLogger(DigesterJcrPropertyTest.class); /* * <p>Defines the test case name for junit.</p> Modified: jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/lock/AnnotationLockTest.java URL: http://svn.apache.org/viewvc/jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/lock/AnnotationLockTest.java?rev=1343782&r1=1343781&r2=1343782&view=diff ============================================================================== --- jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/lock/AnnotationLockTest.java (original) +++ jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/lock/AnnotationLockTest.java Tue May 29 15:36:07 2012 @@ -22,8 +22,6 @@ import java.util.Collection; import junit.framework.Test; import junit.framework.TestSuite; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.apache.jackrabbit.ocm.AnnotationTestBase; import org.apache.jackrabbit.ocm.lock.Lock; import org.apache.jackrabbit.ocm.manager.ObjectContentManager; @@ -31,6 +29,8 @@ import org.apache.jackrabbit.ocm.testmod import org.apache.jackrabbit.ocm.testmodel.B; import org.apache.jackrabbit.ocm.testmodel.C; import org.apache.jackrabbit.ocm.testmodel.Lockable; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Test object content Manager lock feature @@ -39,7 +39,7 @@ import org.apache.jackrabbit.ocm.testmod / public class AnnotationLockTest extends AnnotationTestBase { - private final static Log log = LogFactory.getLog(AnnotationLockTest.class); + private final static Logger log = LoggerFactory.getLogger(AnnotationLockTest.class); /* * <p>Defines the test case name for junit.</p>
Mime	Unnamed text/plain (inline, 7-Bit, 88866 bytes)
	View raw message