Return-Path: X-Original-To: apmail-jackrabbit-commits-archive@www.apache.org Delivered-To: apmail-jackrabbit-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 5D9A49EAF for ; Tue, 29 May 2012 15:37:11 +0000 (UTC) Received: (qmail 73381 invoked by uid 500); 29 May 2012 15:37:11 -0000 Delivered-To: apmail-jackrabbit-commits-archive@jackrabbit.apache.org Received: (qmail 73336 invoked by uid 500); 29 May 2012 15:37:11 -0000 Mailing-List: contact commits-help@jackrabbit.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@jackrabbit.apache.org Delivered-To: mailing list commits@jackrabbit.apache.org Received: (qmail 73329 invoked by uid 99); 29 May 2012 15:37:11 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 29 May 2012 15:37:11 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 29 May 2012 15:36:46 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 126812388B6C; Tue, 29 May 2012 15:36:20 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1343782 [1/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 -0000 To: commits@jackrabbit.apache.org From: ard@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120529153620.126812388B6C@eris.apache.org> Author: ard Date: Tue May 29 15:36:07 2012 New Revision: 1343782 URL: http://svn.apache.org/viewvc?rev=1343782&view=rev Log: OCM-55 replace all commons logging code by slf4j code Modified: jackrabbit/commons/ocm/trunk/src/main/java/org/apache/jackrabbit/ocm/manager/atomictypeconverter/impl/BinaryTypeConverterImpl.java jackrabbit/commons/ocm/trunk/src/main/java/org/apache/jackrabbit/ocm/manager/atomictypeconverter/impl/ByteArrayTypeConverterImpl.java jackrabbit/commons/ocm/trunk/src/main/java/org/apache/jackrabbit/ocm/manager/beanconverter/impl/DefaultBeanConverterImpl.java jackrabbit/commons/ocm/trunk/src/main/java/org/apache/jackrabbit/ocm/manager/beanconverter/impl/ParentBeanConverterImpl.java jackrabbit/commons/ocm/trunk/src/main/java/org/apache/jackrabbit/ocm/manager/beanconverter/impl/ReferenceBeanConverterImpl.java jackrabbit/commons/ocm/trunk/src/main/java/org/apache/jackrabbit/ocm/manager/collectionconverter/impl/BeanReferenceCollectionConverterImpl.java jackrabbit/commons/ocm/trunk/src/main/java/org/apache/jackrabbit/ocm/manager/collectionconverter/impl/BeanReferenceMapConverterImpl.java jackrabbit/commons/ocm/trunk/src/main/java/org/apache/jackrabbit/ocm/manager/collectionconverter/impl/DefaultCollectionConverterImpl.java jackrabbit/commons/ocm/trunk/src/main/java/org/apache/jackrabbit/ocm/manager/collectionconverter/impl/EnumCollectionConverterImpl.java jackrabbit/commons/ocm/trunk/src/main/java/org/apache/jackrabbit/ocm/manager/collectionconverter/impl/ManageableMapImpl.java jackrabbit/commons/ocm/trunk/src/main/java/org/apache/jackrabbit/ocm/manager/collectionconverter/impl/MultiValueCollectionConverterImpl.java jackrabbit/commons/ocm/trunk/src/main/java/org/apache/jackrabbit/ocm/manager/collectionconverter/impl/NTCollectionConverterImpl.java jackrabbit/commons/ocm/trunk/src/main/java/org/apache/jackrabbit/ocm/manager/collectionconverter/impl/ReferenceCollectionConverterImpl.java jackrabbit/commons/ocm/trunk/src/main/java/org/apache/jackrabbit/ocm/manager/collectionconverter/impl/ResidualNodesCollectionConverterImpl.java jackrabbit/commons/ocm/trunk/src/main/java/org/apache/jackrabbit/ocm/manager/collectionconverter/impl/ResidualPropertiesCollectionConverterImpl.java jackrabbit/commons/ocm/trunk/src/main/java/org/apache/jackrabbit/ocm/manager/impl/CustomNodeTypeCreatorImpl.java jackrabbit/commons/ocm/trunk/src/main/java/org/apache/jackrabbit/ocm/manager/impl/ObjectContentManagerImpl.java jackrabbit/commons/ocm/trunk/src/main/java/org/apache/jackrabbit/ocm/manager/impl/ObjectIterator.java jackrabbit/commons/ocm/trunk/src/main/java/org/apache/jackrabbit/ocm/manager/objectconverter/impl/AbstractLazyLoader.java jackrabbit/commons/ocm/trunk/src/main/java/org/apache/jackrabbit/ocm/manager/objectconverter/impl/ObjectConverterImpl.java jackrabbit/commons/ocm/trunk/src/main/java/org/apache/jackrabbit/ocm/manager/objectconverter/impl/ProxyManagerImpl.java jackrabbit/commons/ocm/trunk/src/main/java/org/apache/jackrabbit/ocm/manager/objectconverter/impl/SimpleFieldsHelper.java jackrabbit/commons/ocm/trunk/src/main/java/org/apache/jackrabbit/ocm/mapper/impl/AbstractMapperImpl.java jackrabbit/commons/ocm/trunk/src/main/java/org/apache/jackrabbit/ocm/mapper/impl/annotation/AnnotationDescriptorReader.java jackrabbit/commons/ocm/trunk/src/main/java/org/apache/jackrabbit/ocm/mapper/model/ClassDescriptor.java jackrabbit/commons/ocm/trunk/src/main/java/org/apache/jackrabbit/ocm/mapper/model/MappingDescriptor.java jackrabbit/commons/ocm/trunk/src/main/java/org/apache/jackrabbit/ocm/nodemanagement/impl/RepositoryUtil.java jackrabbit/commons/ocm/trunk/src/main/java/org/apache/jackrabbit/ocm/nodemanagement/impl/jackrabbit/NamespaceHelper.java jackrabbit/commons/ocm/trunk/src/main/java/org/apache/jackrabbit/ocm/nodemanagement/impl/jackrabbit/NodeTypeManagerImpl.java jackrabbit/commons/ocm/trunk/src/main/java/org/apache/jackrabbit/ocm/nodemanagement/impl/jeceira/NodeTypeManagerImpl.java jackrabbit/commons/ocm/trunk/src/main/java/org/apache/jackrabbit/ocm/query/impl/FilterImpl.java jackrabbit/commons/ocm/trunk/src/main/java/org/apache/jackrabbit/ocm/query/impl/QueryImpl.java jackrabbit/commons/ocm/trunk/src/main/java/org/apache/jackrabbit/ocm/query/impl/QueryManagerImpl.java jackrabbit/commons/ocm/trunk/src/main/java/org/apache/jackrabbit/ocm/reflection/ReflectionUtils.java jackrabbit/commons/ocm/trunk/src/main/java/org/apache/jackrabbit/ocm/repository/NodeUtil.java jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/AbstractTestBase.java jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/AnnotationTestBase.java jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/atomic/AnnotationAtomicTest.java jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/atomic/AnnotationDefaultValueTest.java jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/atomic/AnnotationNullAtomicTest.java jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/atomic/DigesterAtomicTest.java jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/atomic/DigesterDefaultValueTest.java jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/atomic/DigesterNullAtomicTest.java jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/auto/AnnotationAutoTest.java jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/auto/DigesterAutoTest.java jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/basic/AnnotationAvoidRecursiveLoopTest.java jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/basic/AnnotationCopyMoveTest.java jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/basic/AnnotationRemoveTest.java jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/basic/AnnotationSameNameSiblingTest.java jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/basic/AnnotationSimpleTest.java jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/basic/DigesterAvoidRecursiveLoopTest.java jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/basic/DigesterCopyMoveTest.java jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/basic/DigesterRemoveTest.java jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/basic/DigesterSameNameSiblingTest.java jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/basic/DigesterSimpleTest.java jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/beanconverter/FakeBeanConverter.java jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/collectionconverter/AnnotationArrayListTest.java jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/collectionconverter/AnnotationDefaultCollectionConverterImplTest.java jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/collectionconverter/AnnotationHashMapTest.java jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/collectionconverter/AnnotationMultiValueCollectionConverterImplTest.java jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/collectionconverter/AnnotationMultiValueWithObjectCollectionConverterImplTest.java jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/collectionconverter/AnnotationNTCollectionConverterImplTest.java jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/collectionconverter/AnnotationPersonListTest.java jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/collectionconverter/AnnotationResidualNodesCollectionConverterImplTest.java jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/collectionconverter/AnnotationResidualPropertiesCollectionConverterImplTest.java jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/collectionconverter/BeanReferenceMapConverterImplTest.java jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/collectionconverter/DigesterArrayListTest.java jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/collectionconverter/DigesterDefaultCollectionConverterImplTest.java jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/collectionconverter/DigesterHashMapTest.java jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/collectionconverter/DigesterMultiValueCollectionConverterImplTest.java jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/collectionconverter/DigesterMultiValueWithObjectCollectionConverterImplTest.java jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/collectionconverter/DigesterNTCollectionConverterImplTest.java jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/collectionconverter/DigesterPersonListTest.java jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/collectionconverter/DigesterResidualNodesCollectionConverterImplTest.java jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/collectionconverter/DigesterResidualPropertiesCollectionConverterImplTest.java jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/collectionconverter/MapReferenceValueEncoderTest.java jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/enumeration/AnnotationSimpleEnumerationTest.java jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/enumeration/DigesterSimpleEnumerationTest.java jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/enumeration/SimpleEnumerationTestBase.java jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/inheritance/AnnotationInheritanceConcreteClassTest.java jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/inheritance/AnnotationInheritanceHierarchyTest.java jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/inheritance/DigesterInheritanceConcreteClassTest.java jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/inheritance/DigesterInheritanceHierarchyTest.java jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/interfaces/AnnotationConcreteClassTest.java jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/interfaces/AnnotationInterfaceHierarchyTest.java jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/interfaces/DigesterConcreteClassTest.java jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/interfaces/DigesterInterfaceHierarchyTest.java jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/interfaces/ListOfInterfaceTest.java jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/jcrnodetype/AnnotationJcrNodeTypeTest.java jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/jcrnodetype/AnnotationJcrPropertyTest.java jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/jcrnodetype/DigesterJcrNodeTypeTest.java jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/jcrnodetype/DigesterJcrPropertyTest.java jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/lock/AnnotationLockTest.java jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/lock/DigesterLockTest.java jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/proxy/AnnotationProxyTest.java jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/proxy/DigesterProxyTest.java jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/query/AnnotationAtomicQueryTest.java jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/query/AnnotationIteratorQueryTest.java jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/query/AnnotationMultiValueQueryTest.java jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/query/AnnotationScopeQueryTest.java jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/query/AnnotationSimpleQueryTest.java jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/query/DigesterAtomicQueryTest.java jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/query/DigesterIteratorQueryTest.java jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/query/DigesterMultiValueQueryTest.java jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/query/DigesterScopeQueryTest.java jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/query/DigesterSimpleQueryTest.java jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/simplemapping/AnnotationSimpleTest.java jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/uuid/AnnotationUuidTest.java jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/uuid/DigesterUuidTest.java jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/version/AnnotationBasicVersionningTest.java jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/version/DigesterBasicVersionningTest.java jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/nodemanagement/TestBase.java jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/nodemanagement/impl/jackrabbit/NodeTypeManagerImplTest.java jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/querymanager/AnnotationQueryManagerTest.java jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/querymanager/DigesterQueryManagerTest.java jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/repository/NodeUtilTest.java jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/repository/RelfectionUtilTest.java jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/repository/RepositoryUtil.java jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/repository/RepositoryUtilTest.java jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/testmodel/A.java jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/testmodel/Folder.java jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/testmodel/Page.java jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/testmodel/Resource.java jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/testmodel/UnmappedInterface.java jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/testmodel/auto/impl/DocumentImpl.java jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/testmodel/auto/impl/DocumentStream.java jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/testmodel/crossreference/A.java jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/testmodel/inheritance/impl/DocumentImpl.java jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/testmodel/inheritance/impl/DocumentStream.java jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/testmodel/unstructured/UnstructuredPage.java jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/testmodel/version/PressRelease.java Modified: jackrabbit/commons/ocm/trunk/src/main/java/org/apache/jackrabbit/ocm/manager/atomictypeconverter/impl/BinaryTypeConverterImpl.java URL: http://svn.apache.org/viewvc/jackrabbit/commons/ocm/trunk/src/main/java/org/apache/jackrabbit/ocm/manager/atomictypeconverter/impl/BinaryTypeConverterImpl.java?rev=1343782&r1=1343781&r2=1343782&view=diff ============================================================================== --- jackrabbit/commons/ocm/trunk/src/main/java/org/apache/jackrabbit/ocm/manager/atomictypeconverter/impl/BinaryTypeConverterImpl.java (original) +++ jackrabbit/commons/ocm/trunk/src/main/java/org/apache/jackrabbit/ocm/manager/atomictypeconverter/impl/BinaryTypeConverterImpl.java Tue May 29 15:36:07 2012 @@ -18,8 +18,8 @@ package org.apache.jackrabbit.ocm.manager.atomictypeconverter.impl; import java.io.InputStream; -import javax.jcr.Binary; +import javax.jcr.Binary; import javax.jcr.RepositoryException; import javax.jcr.Value; import javax.jcr.ValueFactory; Modified: jackrabbit/commons/ocm/trunk/src/main/java/org/apache/jackrabbit/ocm/manager/atomictypeconverter/impl/ByteArrayTypeConverterImpl.java URL: http://svn.apache.org/viewvc/jackrabbit/commons/ocm/trunk/src/main/java/org/apache/jackrabbit/ocm/manager/atomictypeconverter/impl/ByteArrayTypeConverterImpl.java?rev=1343782&r1=1343781&r2=1343782&view=diff ============================================================================== --- jackrabbit/commons/ocm/trunk/src/main/java/org/apache/jackrabbit/ocm/manager/atomictypeconverter/impl/ByteArrayTypeConverterImpl.java (original) +++ jackrabbit/commons/ocm/trunk/src/main/java/org/apache/jackrabbit/ocm/manager/atomictypeconverter/impl/ByteArrayTypeConverterImpl.java Tue May 29 15:36:07 2012 @@ -22,7 +22,6 @@ import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.InputStream; -import javax.jcr.RepositoryException; import javax.jcr.Value; import javax.jcr.ValueFactory; Modified: jackrabbit/commons/ocm/trunk/src/main/java/org/apache/jackrabbit/ocm/manager/beanconverter/impl/DefaultBeanConverterImpl.java URL: http://svn.apache.org/viewvc/jackrabbit/commons/ocm/trunk/src/main/java/org/apache/jackrabbit/ocm/manager/beanconverter/impl/DefaultBeanConverterImpl.java?rev=1343782&r1=1343781&r2=1343782&view=diff ============================================================================== --- jackrabbit/commons/ocm/trunk/src/main/java/org/apache/jackrabbit/ocm/manager/beanconverter/impl/DefaultBeanConverterImpl.java (original) +++ jackrabbit/commons/ocm/trunk/src/main/java/org/apache/jackrabbit/ocm/manager/beanconverter/impl/DefaultBeanConverterImpl.java Tue May 29 15:36:07 2012 @@ -19,8 +19,6 @@ package org.apache.jackrabbit.ocm.manage import javax.jcr.Node; import javax.jcr.Session; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.apache.jackrabbit.ocm.exception.JcrMappingException; import org.apache.jackrabbit.ocm.exception.ObjectContentManagerException; import org.apache.jackrabbit.ocm.exception.RepositoryException; @@ -30,6 +28,9 @@ import org.apache.jackrabbit.ocm.manager import org.apache.jackrabbit.ocm.mapper.Mapper; import org.apache.jackrabbit.ocm.mapper.model.BeanDescriptor; import org.apache.jackrabbit.ocm.mapper.model.ClassDescriptor; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + /** * * Default Bean Converter @@ -40,8 +41,8 @@ import org.apache.jackrabbit.ocm.mapper. */ public class DefaultBeanConverterImpl extends AbstractBeanConverterImpl implements BeanConverter { - private final static Log log = LogFactory.getLog(DefaultBeanConverterImpl.class); - + private final static Logger log = LoggerFactory.getLogger(DefaultBeanConverterImpl.class); + public DefaultBeanConverterImpl(Mapper mapper, ObjectConverter objectConverter, AtomicTypeConverterProvider atomicTypeConverterProvider) { super(mapper, objectConverter, atomicTypeConverterProvider); Modified: jackrabbit/commons/ocm/trunk/src/main/java/org/apache/jackrabbit/ocm/manager/beanconverter/impl/ParentBeanConverterImpl.java URL: http://svn.apache.org/viewvc/jackrabbit/commons/ocm/trunk/src/main/java/org/apache/jackrabbit/ocm/manager/beanconverter/impl/ParentBeanConverterImpl.java?rev=1343782&r1=1343781&r2=1343782&view=diff ============================================================================== --- jackrabbit/commons/ocm/trunk/src/main/java/org/apache/jackrabbit/ocm/manager/beanconverter/impl/ParentBeanConverterImpl.java (original) +++ jackrabbit/commons/ocm/trunk/src/main/java/org/apache/jackrabbit/ocm/manager/beanconverter/impl/ParentBeanConverterImpl.java Tue May 29 15:36:07 2012 @@ -19,8 +19,6 @@ package org.apache.jackrabbit.ocm.manage import javax.jcr.Node; import javax.jcr.Session; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.apache.jackrabbit.ocm.exception.JcrMappingException; import org.apache.jackrabbit.ocm.exception.ObjectContentManagerException; import org.apache.jackrabbit.ocm.exception.RepositoryException; @@ -30,6 +28,9 @@ import org.apache.jackrabbit.ocm.manager import org.apache.jackrabbit.ocm.mapper.Mapper; import org.apache.jackrabbit.ocm.mapper.model.BeanDescriptor; import org.apache.jackrabbit.ocm.mapper.model.ClassDescriptor; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + /** * * Bean converter used to access to the parent object. @@ -41,7 +42,7 @@ import org.apache.jackrabbit.ocm.mapper. */ public class ParentBeanConverterImpl extends AbstractBeanConverterImpl implements BeanConverter { - private final static Log log = LogFactory.getLog(ParentBeanConverterImpl.class); + private final static Logger log = LoggerFactory.getLogger(ParentBeanConverterImpl.class); public ParentBeanConverterImpl(Mapper mapper, ObjectConverter objectConverter, AtomicTypeConverterProvider atomicTypeConverterProvider) { Modified: jackrabbit/commons/ocm/trunk/src/main/java/org/apache/jackrabbit/ocm/manager/beanconverter/impl/ReferenceBeanConverterImpl.java URL: http://svn.apache.org/viewvc/jackrabbit/commons/ocm/trunk/src/main/java/org/apache/jackrabbit/ocm/manager/beanconverter/impl/ReferenceBeanConverterImpl.java?rev=1343782&r1=1343781&r2=1343782&view=diff ============================================================================== --- jackrabbit/commons/ocm/trunk/src/main/java/org/apache/jackrabbit/ocm/manager/beanconverter/impl/ReferenceBeanConverterImpl.java (original) +++ jackrabbit/commons/ocm/trunk/src/main/java/org/apache/jackrabbit/ocm/manager/beanconverter/impl/ReferenceBeanConverterImpl.java Tue May 29 15:36:07 2012 @@ -21,8 +21,6 @@ import javax.jcr.PropertyType; import javax.jcr.Session; import javax.jcr.Value; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.apache.jackrabbit.ocm.exception.JcrMappingException; import org.apache.jackrabbit.ocm.exception.ObjectContentManagerException; import org.apache.jackrabbit.ocm.exception.RepositoryException; @@ -34,6 +32,9 @@ import org.apache.jackrabbit.ocm.mapper. import org.apache.jackrabbit.ocm.mapper.model.ClassDescriptor; import org.apache.jackrabbit.ocm.mapper.model.FieldDescriptor; import org.apache.jackrabbit.ocm.reflection.ReflectionUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + /** * * Map a bean attribute into a reference jcr property. It is not possible to update direclty the referenced bean. @@ -45,7 +46,7 @@ import org.apache.jackrabbit.ocm.reflect */ public class ReferenceBeanConverterImpl extends AbstractBeanConverterImpl implements BeanConverter { - private final static Log log = LogFactory.getLog(ReferenceBeanConverterImpl.class); + private final static Logger log = LoggerFactory.getLogger(ReferenceBeanConverterImpl.class); public ReferenceBeanConverterImpl(Mapper mapper, ObjectConverter objectConverter, AtomicTypeConverterProvider atomicTypeConverterProvider) { Modified: jackrabbit/commons/ocm/trunk/src/main/java/org/apache/jackrabbit/ocm/manager/collectionconverter/impl/BeanReferenceCollectionConverterImpl.java URL: http://svn.apache.org/viewvc/jackrabbit/commons/ocm/trunk/src/main/java/org/apache/jackrabbit/ocm/manager/collectionconverter/impl/BeanReferenceCollectionConverterImpl.java?rev=1343782&r1=1343781&r2=1343782&view=diff ============================================================================== --- jackrabbit/commons/ocm/trunk/src/main/java/org/apache/jackrabbit/ocm/manager/collectionconverter/impl/BeanReferenceCollectionConverterImpl.java (original) +++ jackrabbit/commons/ocm/trunk/src/main/java/org/apache/jackrabbit/ocm/manager/collectionconverter/impl/BeanReferenceCollectionConverterImpl.java Tue May 29 15:36:07 2012 @@ -36,8 +36,8 @@ import javax.jcr.version.VersionExceptio import org.apache.jackrabbit.ocm.exception.JcrMappingException; import org.apache.jackrabbit.ocm.exception.ObjectContentManagerException; import org.apache.jackrabbit.ocm.manager.collectionconverter.ManageableCollection; -import org.apache.jackrabbit.ocm.manager.collectionconverter.ManageableObjectsUtil; import org.apache.jackrabbit.ocm.manager.collectionconverter.ManageableObjects; +import org.apache.jackrabbit.ocm.manager.collectionconverter.ManageableObjectsUtil; import org.apache.jackrabbit.ocm.manager.objectconverter.ObjectConverter; import org.apache.jackrabbit.ocm.mapper.Mapper; import org.apache.jackrabbit.ocm.mapper.model.ClassDescriptor; Modified: jackrabbit/commons/ocm/trunk/src/main/java/org/apache/jackrabbit/ocm/manager/collectionconverter/impl/BeanReferenceMapConverterImpl.java URL: http://svn.apache.org/viewvc/jackrabbit/commons/ocm/trunk/src/main/java/org/apache/jackrabbit/ocm/manager/collectionconverter/impl/BeanReferenceMapConverterImpl.java?rev=1343782&r1=1343781&r2=1343782&view=diff ============================================================================== --- jackrabbit/commons/ocm/trunk/src/main/java/org/apache/jackrabbit/ocm/manager/collectionconverter/impl/BeanReferenceMapConverterImpl.java (original) +++ jackrabbit/commons/ocm/trunk/src/main/java/org/apache/jackrabbit/ocm/manager/collectionconverter/impl/BeanReferenceMapConverterImpl.java Tue May 29 15:36:07 2012 @@ -18,6 +18,21 @@ package org.apache.jackrabbit.ocm.manager.collectionconverter.impl; +import java.util.Iterator; +import java.util.Map; + +import javax.jcr.Node; +import javax.jcr.Property; +import javax.jcr.PropertyType; +import javax.jcr.RepositoryException; +import javax.jcr.Session; +import javax.jcr.UnsupportedRepositoryOperationException; +import javax.jcr.Value; +import javax.jcr.ValueFactory; +import javax.jcr.lock.LockException; +import javax.jcr.nodetype.ConstraintViolationException; +import javax.jcr.version.VersionException; + import org.apache.jackrabbit.ocm.exception.JcrMappingException; import org.apache.jackrabbit.ocm.exception.ObjectContentManagerException; import org.apache.jackrabbit.ocm.manager.collectionconverter.ManageableMap; @@ -30,13 +45,6 @@ import org.apache.jackrabbit.ocm.mapper. import org.apache.jackrabbit.ocm.mapper.model.FieldDescriptor; import org.apache.jackrabbit.ocm.reflection.ReflectionUtils; -import javax.jcr.*; -import javax.jcr.lock.LockException; -import javax.jcr.nodetype.ConstraintViolationException; -import javax.jcr.version.VersionException; -import java.util.Iterator; -import java.util.Map; - /** * Map converter used to map reference/uuid property by key into a java.util.Map. *

Modified: jackrabbit/commons/ocm/trunk/src/main/java/org/apache/jackrabbit/ocm/manager/collectionconverter/impl/DefaultCollectionConverterImpl.java URL: http://svn.apache.org/viewvc/jackrabbit/commons/ocm/trunk/src/main/java/org/apache/jackrabbit/ocm/manager/collectionconverter/impl/DefaultCollectionConverterImpl.java?rev=1343782&r1=1343781&r2=1343782&view=diff ============================================================================== --- jackrabbit/commons/ocm/trunk/src/main/java/org/apache/jackrabbit/ocm/manager/collectionconverter/impl/DefaultCollectionConverterImpl.java (original) +++ jackrabbit/commons/ocm/trunk/src/main/java/org/apache/jackrabbit/ocm/manager/collectionconverter/impl/DefaultCollectionConverterImpl.java Tue May 29 15:36:07 2012 @@ -32,15 +32,14 @@ import javax.jcr.RepositoryException; import javax.jcr.Session; import javax.jcr.lock.LockException; import javax.jcr.nodetype.ConstraintViolationException; -import javax.jcr.nodetype.NodeType; import javax.jcr.version.VersionException; import org.apache.commons.lang.StringUtils; import org.apache.jackrabbit.ocm.exception.JcrMappingException; import org.apache.jackrabbit.ocm.manager.collectionconverter.ManageableCollection; -import org.apache.jackrabbit.ocm.manager.collectionconverter.ManageableObjectsUtil; import org.apache.jackrabbit.ocm.manager.collectionconverter.ManageableMap; import org.apache.jackrabbit.ocm.manager.collectionconverter.ManageableObjects; +import org.apache.jackrabbit.ocm.manager.collectionconverter.ManageableObjectsUtil; import org.apache.jackrabbit.ocm.manager.objectconverter.ObjectConverter; import org.apache.jackrabbit.ocm.mapper.Mapper; import org.apache.jackrabbit.ocm.mapper.model.ClassDescriptor; Modified: jackrabbit/commons/ocm/trunk/src/main/java/org/apache/jackrabbit/ocm/manager/collectionconverter/impl/EnumCollectionConverterImpl.java URL: http://svn.apache.org/viewvc/jackrabbit/commons/ocm/trunk/src/main/java/org/apache/jackrabbit/ocm/manager/collectionconverter/impl/EnumCollectionConverterImpl.java?rev=1343782&r1=1343781&r2=1343782&view=diff ============================================================================== --- jackrabbit/commons/ocm/trunk/src/main/java/org/apache/jackrabbit/ocm/manager/collectionconverter/impl/EnumCollectionConverterImpl.java (original) +++ jackrabbit/commons/ocm/trunk/src/main/java/org/apache/jackrabbit/ocm/manager/collectionconverter/impl/EnumCollectionConverterImpl.java Tue May 29 15:36:07 2012 @@ -29,18 +29,14 @@ import javax.jcr.Value; import javax.jcr.ValueFactory; import javax.jcr.ValueFormatException; -import org.apache.jackrabbit.ocm.exception.JcrMappingException; import org.apache.jackrabbit.ocm.exception.ObjectContentManagerException; -import org.apache.jackrabbit.ocm.manager.atomictypeconverter.AtomicTypeConverter; -import org.apache.jackrabbit.ocm.manager.atomictypeconverter.impl.UndefinedTypeConverterImpl; import org.apache.jackrabbit.ocm.manager.collectionconverter.ManageableCollection; -import org.apache.jackrabbit.ocm.manager.collectionconverter.ManageableObjectsUtil; import org.apache.jackrabbit.ocm.manager.collectionconverter.ManageableObjects; +import org.apache.jackrabbit.ocm.manager.collectionconverter.ManageableObjectsUtil; import org.apache.jackrabbit.ocm.manager.enumconverter.EnumTypeConverter; import org.apache.jackrabbit.ocm.manager.objectconverter.ObjectConverter; import org.apache.jackrabbit.ocm.mapper.Mapper; import org.apache.jackrabbit.ocm.mapper.model.CollectionDescriptor; -import org.apache.jackrabbit.ocm.reflection.ReflectionUtils; /** * Collection Mapping/convertion implementation used for enum collections Modified: jackrabbit/commons/ocm/trunk/src/main/java/org/apache/jackrabbit/ocm/manager/collectionconverter/impl/ManageableMapImpl.java URL: http://svn.apache.org/viewvc/jackrabbit/commons/ocm/trunk/src/main/java/org/apache/jackrabbit/ocm/manager/collectionconverter/impl/ManageableMapImpl.java?rev=1343782&r1=1343781&r2=1343782&view=diff ============================================================================== --- jackrabbit/commons/ocm/trunk/src/main/java/org/apache/jackrabbit/ocm/manager/collectionconverter/impl/ManageableMapImpl.java (original) +++ jackrabbit/commons/ocm/trunk/src/main/java/org/apache/jackrabbit/ocm/manager/collectionconverter/impl/ManageableMapImpl.java Tue May 29 15:36:07 2012 @@ -16,7 +16,6 @@ */ package org.apache.jackrabbit.ocm.manager.collectionconverter.impl; -import java.util.Collection; import java.util.Iterator; import java.util.Map; Modified: jackrabbit/commons/ocm/trunk/src/main/java/org/apache/jackrabbit/ocm/manager/collectionconverter/impl/MultiValueCollectionConverterImpl.java URL: http://svn.apache.org/viewvc/jackrabbit/commons/ocm/trunk/src/main/java/org/apache/jackrabbit/ocm/manager/collectionconverter/impl/MultiValueCollectionConverterImpl.java?rev=1343782&r1=1343781&r2=1343782&view=diff ============================================================================== --- jackrabbit/commons/ocm/trunk/src/main/java/org/apache/jackrabbit/ocm/manager/collectionconverter/impl/MultiValueCollectionConverterImpl.java (original) +++ jackrabbit/commons/ocm/trunk/src/main/java/org/apache/jackrabbit/ocm/manager/collectionconverter/impl/MultiValueCollectionConverterImpl.java Tue May 29 15:36:07 2012 @@ -34,8 +34,8 @@ import org.apache.jackrabbit.ocm.excepti import org.apache.jackrabbit.ocm.manager.atomictypeconverter.AtomicTypeConverter; import org.apache.jackrabbit.ocm.manager.atomictypeconverter.impl.UndefinedTypeConverterImpl; import org.apache.jackrabbit.ocm.manager.collectionconverter.ManageableCollection; -import org.apache.jackrabbit.ocm.manager.collectionconverter.ManageableObjectsUtil; import org.apache.jackrabbit.ocm.manager.collectionconverter.ManageableObjects; +import org.apache.jackrabbit.ocm.manager.collectionconverter.ManageableObjectsUtil; import org.apache.jackrabbit.ocm.manager.objectconverter.ObjectConverter; import org.apache.jackrabbit.ocm.mapper.Mapper; import org.apache.jackrabbit.ocm.mapper.model.CollectionDescriptor; Modified: jackrabbit/commons/ocm/trunk/src/main/java/org/apache/jackrabbit/ocm/manager/collectionconverter/impl/NTCollectionConverterImpl.java URL: http://svn.apache.org/viewvc/jackrabbit/commons/ocm/trunk/src/main/java/org/apache/jackrabbit/ocm/manager/collectionconverter/impl/NTCollectionConverterImpl.java?rev=1343782&r1=1343781&r2=1343782&view=diff ============================================================================== --- jackrabbit/commons/ocm/trunk/src/main/java/org/apache/jackrabbit/ocm/manager/collectionconverter/impl/NTCollectionConverterImpl.java (original) +++ jackrabbit/commons/ocm/trunk/src/main/java/org/apache/jackrabbit/ocm/manager/collectionconverter/impl/NTCollectionConverterImpl.java Tue May 29 15:36:07 2012 @@ -36,18 +36,18 @@ import javax.jcr.query.Query; import javax.jcr.query.QueryResult; import javax.jcr.version.VersionException; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.apache.jackrabbit.ocm.exception.JcrMappingException; import org.apache.jackrabbit.ocm.manager.collectionconverter.ManageableCollection; -import org.apache.jackrabbit.ocm.manager.collectionconverter.ManageableObjectsUtil; import org.apache.jackrabbit.ocm.manager.collectionconverter.ManageableMap; import org.apache.jackrabbit.ocm.manager.collectionconverter.ManageableObjects; +import org.apache.jackrabbit.ocm.manager.collectionconverter.ManageableObjectsUtil; import org.apache.jackrabbit.ocm.manager.objectconverter.ObjectConverter; import org.apache.jackrabbit.ocm.mapper.Mapper; import org.apache.jackrabbit.ocm.mapper.model.ClassDescriptor; import org.apache.jackrabbit.ocm.mapper.model.CollectionDescriptor; import org.apache.jackrabbit.ocm.reflection.ReflectionUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Collection Mapping/convertion based on node type. @@ -88,7 +88,7 @@ import org.apache.jackrabbit.ocm.reflect */ public class NTCollectionConverterImpl extends AbstractCollectionConverterImpl { - private final static Log log = LogFactory.getLog(NTCollectionConverterImpl.class); + private final static Logger log = LoggerFactory.getLogger(NTCollectionConverterImpl.class); protected static final String COLLECTION_ELEMENT_NAME = "collection-element"; @@ -105,9 +105,7 @@ public class NTCollectionConverterImpl e super(atomicTypeConverters, objectConverter, mapper); } - /** - * @see AbstractCollectionConverterImpl#doInsertCollection(Session, Node, CollectionDescriptor, ManageableCollection) - */ + protected void doInsertCollection(Session session, Node parentNode, CollectionDescriptor collectionDescriptor, @@ -139,10 +137,6 @@ public class NTCollectionConverterImpl e } } - /** - * - * @see org.apache.jackrabbit.ocm.manager.collectionconverter.CollectionConverter#updateCollection(javax.jcr.Session, javax.jcr.Node, org.apache.jackrabbit.ocm.mapper.model.CollectionDescriptor, org.apache.jackrabbit.ocm.manager.collectionconverter.ManageableCollection) - */ protected void doUpdateCollection(Session session, Node parentNode, CollectionDescriptor collectionDescriptor, @@ -314,6 +308,7 @@ public class NTCollectionConverterImpl e } + @SuppressWarnings("deprecation") Query jcrQuery = session.getWorkspace().getQueryManager().createQuery(jcrExpression, javax.jcr.query.Query.SQL); QueryResult queryResult = jcrQuery.execute(); return queryResult; Modified: jackrabbit/commons/ocm/trunk/src/main/java/org/apache/jackrabbit/ocm/manager/collectionconverter/impl/ReferenceCollectionConverterImpl.java URL: http://svn.apache.org/viewvc/jackrabbit/commons/ocm/trunk/src/main/java/org/apache/jackrabbit/ocm/manager/collectionconverter/impl/ReferenceCollectionConverterImpl.java?rev=1343782&r1=1343781&r2=1343782&view=diff ============================================================================== --- jackrabbit/commons/ocm/trunk/src/main/java/org/apache/jackrabbit/ocm/manager/collectionconverter/impl/ReferenceCollectionConverterImpl.java (original) +++ jackrabbit/commons/ocm/trunk/src/main/java/org/apache/jackrabbit/ocm/manager/collectionconverter/impl/ReferenceCollectionConverterImpl.java Tue May 29 15:36:07 2012 @@ -36,8 +36,8 @@ import javax.jcr.version.VersionExceptio import org.apache.jackrabbit.ocm.exception.ObjectContentManagerException; import org.apache.jackrabbit.ocm.manager.collectionconverter.ManageableCollection; -import org.apache.jackrabbit.ocm.manager.collectionconverter.ManageableObjectsUtil; import org.apache.jackrabbit.ocm.manager.collectionconverter.ManageableObjects; +import org.apache.jackrabbit.ocm.manager.collectionconverter.ManageableObjectsUtil; import org.apache.jackrabbit.ocm.manager.objectconverter.ObjectConverter; import org.apache.jackrabbit.ocm.mapper.Mapper; import org.apache.jackrabbit.ocm.mapper.model.CollectionDescriptor; Modified: jackrabbit/commons/ocm/trunk/src/main/java/org/apache/jackrabbit/ocm/manager/collectionconverter/impl/ResidualNodesCollectionConverterImpl.java URL: http://svn.apache.org/viewvc/jackrabbit/commons/ocm/trunk/src/main/java/org/apache/jackrabbit/ocm/manager/collectionconverter/impl/ResidualNodesCollectionConverterImpl.java?rev=1343782&r1=1343781&r2=1343782&view=diff ============================================================================== --- jackrabbit/commons/ocm/trunk/src/main/java/org/apache/jackrabbit/ocm/manager/collectionconverter/impl/ResidualNodesCollectionConverterImpl.java (original) +++ jackrabbit/commons/ocm/trunk/src/main/java/org/apache/jackrabbit/ocm/manager/collectionconverter/impl/ResidualNodesCollectionConverterImpl.java Tue May 29 15:36:07 2012 @@ -31,9 +31,9 @@ import javax.jcr.ValueFormatException; import org.apache.jackrabbit.ocm.exception.ObjectContentManagerException; import org.apache.jackrabbit.ocm.manager.collectionconverter.ManageableCollection; -import org.apache.jackrabbit.ocm.manager.collectionconverter.ManageableObjectsUtil; import org.apache.jackrabbit.ocm.manager.collectionconverter.ManageableMap; import org.apache.jackrabbit.ocm.manager.collectionconverter.ManageableObjects; +import org.apache.jackrabbit.ocm.manager.collectionconverter.ManageableObjectsUtil; import org.apache.jackrabbit.ocm.manager.objectconverter.ObjectConverter; import org.apache.jackrabbit.ocm.mapper.Mapper; import org.apache.jackrabbit.ocm.mapper.model.CollectionDescriptor; Modified: jackrabbit/commons/ocm/trunk/src/main/java/org/apache/jackrabbit/ocm/manager/collectionconverter/impl/ResidualPropertiesCollectionConverterImpl.java URL: http://svn.apache.org/viewvc/jackrabbit/commons/ocm/trunk/src/main/java/org/apache/jackrabbit/ocm/manager/collectionconverter/impl/ResidualPropertiesCollectionConverterImpl.java?rev=1343782&r1=1343781&r2=1343782&view=diff ============================================================================== --- jackrabbit/commons/ocm/trunk/src/main/java/org/apache/jackrabbit/ocm/manager/collectionconverter/impl/ResidualPropertiesCollectionConverterImpl.java (original) +++ jackrabbit/commons/ocm/trunk/src/main/java/org/apache/jackrabbit/ocm/manager/collectionconverter/impl/ResidualPropertiesCollectionConverterImpl.java Tue May 29 15:36:07 2012 @@ -33,9 +33,9 @@ import javax.jcr.ValueFormatException; import org.apache.jackrabbit.ocm.exception.ObjectContentManagerException; import org.apache.jackrabbit.ocm.manager.atomictypeconverter.AtomicTypeConverter; import org.apache.jackrabbit.ocm.manager.collectionconverter.ManageableCollection; -import org.apache.jackrabbit.ocm.manager.collectionconverter.ManageableObjectsUtil; import org.apache.jackrabbit.ocm.manager.collectionconverter.ManageableMap; import org.apache.jackrabbit.ocm.manager.collectionconverter.ManageableObjects; +import org.apache.jackrabbit.ocm.manager.collectionconverter.ManageableObjectsUtil; import org.apache.jackrabbit.ocm.manager.objectconverter.ObjectConverter; import org.apache.jackrabbit.ocm.mapper.Mapper; import org.apache.jackrabbit.ocm.mapper.model.CollectionDescriptor; Modified: jackrabbit/commons/ocm/trunk/src/main/java/org/apache/jackrabbit/ocm/manager/impl/CustomNodeTypeCreatorImpl.java URL: http://svn.apache.org/viewvc/jackrabbit/commons/ocm/trunk/src/main/java/org/apache/jackrabbit/ocm/manager/impl/CustomNodeTypeCreatorImpl.java?rev=1343782&r1=1343781&r2=1343782&view=diff ============================================================================== --- jackrabbit/commons/ocm/trunk/src/main/java/org/apache/jackrabbit/ocm/manager/impl/CustomNodeTypeCreatorImpl.java (original) +++ jackrabbit/commons/ocm/trunk/src/main/java/org/apache/jackrabbit/ocm/manager/impl/CustomNodeTypeCreatorImpl.java Tue May 29 15:36:07 2012 @@ -16,11 +16,11 @@ */ package org.apache.jackrabbit.ocm.manager.impl; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.apache.jackrabbit.ocm.exception.CustomNodeTypeCreationException; import org.apache.jackrabbit.ocm.manager.CustomNodeTypeCreator; import org.apache.jackrabbit.ocm.manager.ObjectContentManager; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** Default implementation of the jackrabbit custom node creator. * @@ -31,7 +31,7 @@ public class CustomNodeTypeCreatorImpl i /** Logger. */ - private final static Log log = LogFactory.getLog(CustomNodeTypeCreatorImpl.class); + private final static Logger log = LoggerFactory.getLogger(CustomNodeTypeCreatorImpl.class); /** Session to the jcr repository. */ Modified: jackrabbit/commons/ocm/trunk/src/main/java/org/apache/jackrabbit/ocm/manager/impl/ObjectContentManagerImpl.java URL: http://svn.apache.org/viewvc/jackrabbit/commons/ocm/trunk/src/main/java/org/apache/jackrabbit/ocm/manager/impl/ObjectContentManagerImpl.java?rev=1343782&r1=1343781&r2=1343782&view=diff ============================================================================== --- jackrabbit/commons/ocm/trunk/src/main/java/org/apache/jackrabbit/ocm/manager/impl/ObjectContentManagerImpl.java (original) +++ jackrabbit/commons/ocm/trunk/src/main/java/org/apache/jackrabbit/ocm/manager/impl/ObjectContentManagerImpl.java Tue May 29 15:36:07 2012 @@ -25,7 +25,6 @@ import java.util.Map; import javax.jcr.InvalidItemStateException; import javax.jcr.Item; -import javax.jcr.ItemNotFoundException; import javax.jcr.Node; import javax.jcr.NodeIterator; import javax.jcr.PathNotFoundException; @@ -41,8 +40,6 @@ import javax.jcr.query.QueryResult; import javax.jcr.version.VersionHistory; import javax.jcr.version.VersionManager; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.apache.jackrabbit.ocm.exception.IllegalUnlockException; import org.apache.jackrabbit.ocm.exception.IncorrectPersistentClassException; import org.apache.jackrabbit.ocm.exception.JcrMappingException; @@ -67,6 +64,8 @@ import org.apache.jackrabbit.ocm.query.i import org.apache.jackrabbit.ocm.repository.NodeUtil; import org.apache.jackrabbit.ocm.version.Version; import org.apache.jackrabbit.ocm.version.VersionIterator; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * @@ -81,7 +80,7 @@ import org.apache.jackrabbit.ocm.version */ public class ObjectContentManagerImpl implements ObjectContentManager { - private final static Log log = LogFactory.getLog(ObjectContentManagerImpl.class); + private final static Logger log = LoggerFactory.getLogger(ObjectContentManagerImpl.class); protected Session session; @@ -421,6 +420,7 @@ public class ObjectContentManagerImpl im this.remove(objectConverter.getPath(session, object)); } + public void remove(Query query) { try { String jcrExpression = this.queryManager.buildJCRExpression(query); @@ -428,6 +428,7 @@ public class ObjectContentManagerImpl im // Since only nodes are sufficient for us to remove, // getObjects(query, language) method is not called here. + @SuppressWarnings("deprecation") NodeIterator nodeIterator = getNodeIterator(jcrExpression, javax.jcr.query.Query.XPATH); List nodes = new ArrayList(); @@ -487,6 +488,7 @@ public class ObjectContentManagerImpl im public Object getObject(Query query) { String jcrExpression = this.queryManager.buildJCRExpression(query); + @SuppressWarnings("deprecation") Collection result = getObjects(jcrExpression, javax.jcr.query.Query.XPATH); if (result.size() > 1) { @@ -496,7 +498,7 @@ public class ObjectContentManagerImpl im return result.isEmpty() ? null : result.iterator().next(); } - + @SuppressWarnings("deprecation") public Collection getObjects(Query query) { String jcrExpression = this.queryManager.buildJCRExpression(query); return getObjects(jcrExpression, javax.jcr.query.Query.XPATH); @@ -543,6 +545,7 @@ public class ObjectContentManagerImpl im public Iterator getObjectIterator(Query query) { String jcrExpression = this.queryManager.buildJCRExpression(query); log.debug("Get Object with expression : " + jcrExpression); + @SuppressWarnings("deprecation") NodeIterator nodeIterator = getNodeIterator(jcrExpression, javax.jcr.query.Query.XPATH); return new ObjectIterator(nodeIterator, this.objectConverter, this.session); Modified: jackrabbit/commons/ocm/trunk/src/main/java/org/apache/jackrabbit/ocm/manager/impl/ObjectIterator.java URL: http://svn.apache.org/viewvc/jackrabbit/commons/ocm/trunk/src/main/java/org/apache/jackrabbit/ocm/manager/impl/ObjectIterator.java?rev=1343782&r1=1343781&r2=1343782&view=diff ============================================================================== --- jackrabbit/commons/ocm/trunk/src/main/java/org/apache/jackrabbit/ocm/manager/impl/ObjectIterator.java (original) +++ jackrabbit/commons/ocm/trunk/src/main/java/org/apache/jackrabbit/ocm/manager/impl/ObjectIterator.java Tue May 29 15:36:07 2012 @@ -17,17 +17,12 @@ package org.apache.jackrabbit.ocm.manager.impl; -import java.util.NoSuchElementException; - import javax.jcr.Node; import javax.jcr.NodeIterator; import javax.jcr.RangeIterator; import javax.jcr.RepositoryException; import javax.jcr.Session; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.apache.jackrabbit.ocm.exception.ObjectContentManagerException; import org.apache.jackrabbit.ocm.manager.objectconverter.ObjectConverter; Modified: jackrabbit/commons/ocm/trunk/src/main/java/org/apache/jackrabbit/ocm/manager/objectconverter/impl/AbstractLazyLoader.java URL: http://svn.apache.org/viewvc/jackrabbit/commons/ocm/trunk/src/main/java/org/apache/jackrabbit/ocm/manager/objectconverter/impl/AbstractLazyLoader.java?rev=1343782&r1=1343781&r2=1343782&view=diff ============================================================================== --- jackrabbit/commons/ocm/trunk/src/main/java/org/apache/jackrabbit/ocm/manager/objectconverter/impl/AbstractLazyLoader.java (original) +++ jackrabbit/commons/ocm/trunk/src/main/java/org/apache/jackrabbit/ocm/manager/objectconverter/impl/AbstractLazyLoader.java Tue May 29 15:36:07 2012 @@ -20,10 +20,10 @@ import java.io.Serializable; import java.lang.reflect.Method; import java.lang.reflect.Modifier; -import net.sf.cglib.proxy.InvocationHandler; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import net.sf.cglib.proxy.InvocationHandler; /** * Parent Class of the OCM Lazy Loaders @@ -35,7 +35,7 @@ public abstract class AbstractLazyLoader /** * The logger */ - private final static Log log = LogFactory.getLog(AbstractLazyLoader.class); + private final static Logger log = LoggerFactory.getLogger(AbstractLazyLoader.class); /** * The proxified instance Modified: jackrabbit/commons/ocm/trunk/src/main/java/org/apache/jackrabbit/ocm/manager/objectconverter/impl/ObjectConverterImpl.java URL: http://svn.apache.org/viewvc/jackrabbit/commons/ocm/trunk/src/main/java/org/apache/jackrabbit/ocm/manager/objectconverter/impl/ObjectConverterImpl.java?rev=1343782&r1=1343781&r2=1343782&view=diff ============================================================================== --- jackrabbit/commons/ocm/trunk/src/main/java/org/apache/jackrabbit/ocm/manager/objectconverter/impl/ObjectConverterImpl.java (original) +++ jackrabbit/commons/ocm/trunk/src/main/java/org/apache/jackrabbit/ocm/manager/objectconverter/impl/ObjectConverterImpl.java Tue May 29 15:36:07 2012 @@ -33,8 +33,6 @@ import javax.jcr.nodetype.NodeType; import javax.jcr.nodetype.NodeTypeManager; import javax.jcr.version.VersionException; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.apache.jackrabbit.ocm.exception.IncorrectPersistentClassException; import org.apache.jackrabbit.ocm.exception.JcrMappingException; import org.apache.jackrabbit.ocm.exception.ObjectContentManagerException; @@ -59,6 +57,8 @@ import org.apache.jackrabbit.ocm.mapper. import org.apache.jackrabbit.ocm.mapper.model.FieldDescriptor; import org.apache.jackrabbit.ocm.reflection.ReflectionUtils; import org.apache.jackrabbit.ocm.repository.NodeUtil; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Default implementation for {@link ObjectConverterImpl} @@ -71,7 +71,7 @@ public class ObjectConverterImpl impleme private static final String DEFAULT_BEAN_CONVERTER = "org.apache.jackrabbit.ocm.manager.beanconverter.impl.DefaultBeanConverterImpl"; - private final static Log log = LogFactory.getLog(ObjectConverterImpl.class); + private final static Logger log = LoggerFactory.getLogger(ObjectConverterImpl.class); private Mapper mapper; Modified: jackrabbit/commons/ocm/trunk/src/main/java/org/apache/jackrabbit/ocm/manager/objectconverter/impl/ProxyManagerImpl.java URL: http://svn.apache.org/viewvc/jackrabbit/commons/ocm/trunk/src/main/java/org/apache/jackrabbit/ocm/manager/objectconverter/impl/ProxyManagerImpl.java?rev=1343782&r1=1343781&r2=1343782&view=diff ============================================================================== --- jackrabbit/commons/ocm/trunk/src/main/java/org/apache/jackrabbit/ocm/manager/objectconverter/impl/ProxyManagerImpl.java (original) +++ jackrabbit/commons/ocm/trunk/src/main/java/org/apache/jackrabbit/ocm/manager/objectconverter/impl/ProxyManagerImpl.java Tue May 29 15:36:07 2012 @@ -21,9 +21,6 @@ import javax.jcr.Node; import javax.jcr.RepositoryException; import javax.jcr.Session; -import net.sf.cglib.proxy.Callback; -import net.sf.cglib.proxy.Enhancer; - import org.apache.commons.lang.ArrayUtils; import org.apache.jackrabbit.ocm.manager.beanconverter.BeanConverter; import org.apache.jackrabbit.ocm.manager.collectionconverter.CollectionConverter; @@ -32,6 +29,9 @@ import org.apache.jackrabbit.ocm.mapper. import org.apache.jackrabbit.ocm.mapper.model.ClassDescriptor; import org.apache.jackrabbit.ocm.mapper.model.CollectionDescriptor; +import net.sf.cglib.proxy.Callback; +import net.sf.cglib.proxy.Enhancer; + public class ProxyManagerImpl implements ProxyManager { /** Modified: jackrabbit/commons/ocm/trunk/src/main/java/org/apache/jackrabbit/ocm/manager/objectconverter/impl/SimpleFieldsHelper.java URL: http://svn.apache.org/viewvc/jackrabbit/commons/ocm/trunk/src/main/java/org/apache/jackrabbit/ocm/manager/objectconverter/impl/SimpleFieldsHelper.java?rev=1343782&r1=1343781&r2=1343782&view=diff ============================================================================== --- jackrabbit/commons/ocm/trunk/src/main/java/org/apache/jackrabbit/ocm/manager/objectconverter/impl/SimpleFieldsHelper.java (original) +++ jackrabbit/commons/ocm/trunk/src/main/java/org/apache/jackrabbit/ocm/manager/objectconverter/impl/SimpleFieldsHelper.java Tue May 29 15:36:07 2012 @@ -31,8 +31,6 @@ import javax.jcr.nodetype.NodeType; import javax.jcr.nodetype.PropertyDefinition; import javax.jcr.version.VersionException; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.apache.jackrabbit.ocm.exception.ObjectContentManagerException; import org.apache.jackrabbit.ocm.manager.ManagerConstant; import org.apache.jackrabbit.ocm.manager.atomictypeconverter.AtomicTypeConverter; @@ -41,6 +39,8 @@ import org.apache.jackrabbit.ocm.manager import org.apache.jackrabbit.ocm.mapper.model.ClassDescriptor; import org.apache.jackrabbit.ocm.mapper.model.FieldDescriptor; import org.apache.jackrabbit.ocm.reflection.ReflectionUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Helper class used to map simple fields. @@ -51,7 +51,7 @@ import org.apache.jackrabbit.ocm.reflect public class SimpleFieldsHelper { - private final static Log log = LogFactory.getLog(SimpleFieldsHelper.class); + private final static Logger log = LoggerFactory.getLogger(SimpleFieldsHelper.class); private static final AtomicTypeConverter NULL_CONVERTER = new NullTypeConverterImpl(); Modified: jackrabbit/commons/ocm/trunk/src/main/java/org/apache/jackrabbit/ocm/mapper/impl/AbstractMapperImpl.java URL: http://svn.apache.org/viewvc/jackrabbit/commons/ocm/trunk/src/main/java/org/apache/jackrabbit/ocm/mapper/impl/AbstractMapperImpl.java?rev=1343782&r1=1343781&r2=1343782&view=diff ============================================================================== --- jackrabbit/commons/ocm/trunk/src/main/java/org/apache/jackrabbit/ocm/mapper/impl/AbstractMapperImpl.java (original) +++ jackrabbit/commons/ocm/trunk/src/main/java/org/apache/jackrabbit/ocm/mapper/impl/AbstractMapperImpl.java Tue May 29 15:36:07 2012 @@ -17,7 +17,6 @@ package org.apache.jackrabbit.ocm.mapper.impl; - import java.util.ArrayList; import java.util.Collection; import java.util.HashSet; @@ -26,17 +25,15 @@ import java.util.List; import java.util.Map; import java.util.Set; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.apache.jackrabbit.ocm.exception.IncorrectPersistentClassException; import org.apache.jackrabbit.ocm.exception.InitMapperException; import org.apache.jackrabbit.ocm.exception.JcrMappingException; -import org.apache.jackrabbit.ocm.manager.atomictypeconverter.impl.AtomicTypeConverterProviderImpl; import org.apache.jackrabbit.ocm.mapper.DescriptorReader; import org.apache.jackrabbit.ocm.mapper.Mapper; import org.apache.jackrabbit.ocm.mapper.model.ClassDescriptor; -import org.apache.jackrabbit.ocm.mapper.model.ImplementDescriptor; import org.apache.jackrabbit.ocm.mapper.model.MappingDescriptor; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * @@ -49,7 +46,7 @@ import org.apache.jackrabbit.ocm.mapper. * of a collectiondescriptor exists. For performance reasone, we can defined some optional validations. */ public abstract class AbstractMapperImpl implements Mapper { - protected static final Log log = LogFactory.getLog(AbstractMapperImpl.class); + protected static final Logger log = LoggerFactory.getLogger(AbstractMapperImpl.class); protected DescriptorReader descriptorReader; protected MappingDescriptor mappingDescriptor; Modified: jackrabbit/commons/ocm/trunk/src/main/java/org/apache/jackrabbit/ocm/mapper/impl/annotation/AnnotationDescriptorReader.java URL: http://svn.apache.org/viewvc/jackrabbit/commons/ocm/trunk/src/main/java/org/apache/jackrabbit/ocm/mapper/impl/annotation/AnnotationDescriptorReader.java?rev=1343782&r1=1343781&r2=1343782&view=diff ============================================================================== --- jackrabbit/commons/ocm/trunk/src/main/java/org/apache/jackrabbit/ocm/mapper/impl/annotation/AnnotationDescriptorReader.java (original) +++ jackrabbit/commons/ocm/trunk/src/main/java/org/apache/jackrabbit/ocm/mapper/impl/annotation/AnnotationDescriptorReader.java Tue May 29 15:36:07 2012 @@ -17,16 +17,12 @@ package org.apache.jackrabbit.ocm.mapper.impl.annotation; import java.beans.BeanInfo; -import java.beans.IntrospectionException; import java.beans.Introspector; import java.beans.PropertyDescriptor; import java.lang.reflect.ParameterizedType; import java.lang.reflect.Type; -import java.lang.reflect.TypeVariable; import java.util.List; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.apache.jackrabbit.ocm.exception.InitMapperException; import org.apache.jackrabbit.ocm.mapper.DescriptorReader; import org.apache.jackrabbit.ocm.mapper.model.BeanDescriptor; @@ -36,6 +32,8 @@ import org.apache.jackrabbit.ocm.mapper. import org.apache.jackrabbit.ocm.mapper.model.ImplementDescriptor; import org.apache.jackrabbit.ocm.mapper.model.MappingDescriptor; import org.apache.jackrabbit.ocm.reflection.ReflectionUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Helper class that reads the xml mapping file and load all class descriptors into memory (object graph) @@ -46,7 +44,7 @@ import org.apache.jackrabbit.ocm.reflect */ public class AnnotationDescriptorReader implements DescriptorReader { - private static final Log log = LogFactory.getLog(AnnotationDescriptorReader.class); + private static final Logger log = LoggerFactory.getLogger(AnnotationDescriptorReader.class); List annotatedClassNames; public AnnotationDescriptorReader(List annotatedClassNames) Modified: jackrabbit/commons/ocm/trunk/src/main/java/org/apache/jackrabbit/ocm/mapper/model/ClassDescriptor.java URL: http://svn.apache.org/viewvc/jackrabbit/commons/ocm/trunk/src/main/java/org/apache/jackrabbit/ocm/mapper/model/ClassDescriptor.java?rev=1343782&r1=1343781&r2=1343782&view=diff ============================================================================== --- jackrabbit/commons/ocm/trunk/src/main/java/org/apache/jackrabbit/ocm/mapper/model/ClassDescriptor.java (original) +++ jackrabbit/commons/ocm/trunk/src/main/java/org/apache/jackrabbit/ocm/mapper/model/ClassDescriptor.java Tue May 29 15:36:07 2012 @@ -17,19 +17,17 @@ package org.apache.jackrabbit.ocm.mapper.model; -import java.util.ArrayList; import java.util.Collection; import java.util.HashMap; import java.util.HashSet; import java.util.Iterator; -import java.util.List; import java.util.Map; import java.util.Set; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.apache.jackrabbit.ocm.exception.JcrMappingException; import org.apache.jackrabbit.ocm.reflection.ReflectionUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * @@ -40,7 +38,7 @@ import org.apache.jackrabbit.ocm.reflect */ public class ClassDescriptor { - private static final Log log = LogFactory.getLog(ClassDescriptor.class); + private static final Logger log = LoggerFactory.getLogger(ClassDescriptor.class); private static final String NODETYPE_PER_HIERARCHY = "nodetypeperhierarchy"; private static final String NODETYPE_PER_CONCRETECLASS = "nodetypeperconcreteclass"; Modified: jackrabbit/commons/ocm/trunk/src/main/java/org/apache/jackrabbit/ocm/mapper/model/MappingDescriptor.java URL: http://svn.apache.org/viewvc/jackrabbit/commons/ocm/trunk/src/main/java/org/apache/jackrabbit/ocm/mapper/model/MappingDescriptor.java?rev=1343782&r1=1343781&r2=1343782&view=diff ============================================================================== --- jackrabbit/commons/ocm/trunk/src/main/java/org/apache/jackrabbit/ocm/mapper/model/MappingDescriptor.java (original) +++ jackrabbit/commons/ocm/trunk/src/main/java/org/apache/jackrabbit/ocm/mapper/model/MappingDescriptor.java Tue May 29 15:36:07 2012 @@ -21,10 +21,10 @@ import java.util.Collection; import java.util.HashMap; import java.util.Map; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.apache.jackrabbit.ocm.manager.ManagerConstant; import org.apache.jackrabbit.ocm.mapper.Mapper; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** @@ -34,8 +34,8 @@ import org.apache.jackrabbit.ocm.mapper. * @version $Id: Exp $ */ public class MappingDescriptor { - - private static final Log log = LogFactory.getLog(MappingDescriptor.class); + + private static Logger log = LoggerFactory.getLogger(MappingDescriptor.class); private HashMap classDescriptorsByClassName = new HashMap(); private HashMap classDescriptorsByNodeType = new HashMap(); Modified: jackrabbit/commons/ocm/trunk/src/main/java/org/apache/jackrabbit/ocm/nodemanagement/impl/RepositoryUtil.java URL: http://svn.apache.org/viewvc/jackrabbit/commons/ocm/trunk/src/main/java/org/apache/jackrabbit/ocm/nodemanagement/impl/RepositoryUtil.java?rev=1343782&r1=1343781&r2=1343782&view=diff ============================================================================== --- jackrabbit/commons/ocm/trunk/src/main/java/org/apache/jackrabbit/ocm/nodemanagement/impl/RepositoryUtil.java (original) +++ jackrabbit/commons/ocm/trunk/src/main/java/org/apache/jackrabbit/ocm/nodemanagement/impl/RepositoryUtil.java Tue May 29 15:36:07 2012 @@ -24,14 +24,12 @@ import javax.jcr.SimpleCredentials; import javax.naming.Context; import javax.naming.InitialContext; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.apache.jackrabbit.core.jndi.RegistryHelper; import org.apache.jackrabbit.ocm.exception.RepositoryException; import org.apache.jackrabbit.util.ISO9075; import org.apache.jackrabbit.util.Text; - - +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** @@ -53,7 +51,7 @@ public class RepositoryUtil /** Item path separator */ public static final String PATH_SEPARATOR = "/"; - private final static Log log = LogFactory.getLog(RepositoryUtil.class); + private final static Logger log = LoggerFactory.getLogger(RepositoryUtil.class); /** * Register a new repository Modified: jackrabbit/commons/ocm/trunk/src/main/java/org/apache/jackrabbit/ocm/nodemanagement/impl/jackrabbit/NamespaceHelper.java URL: http://svn.apache.org/viewvc/jackrabbit/commons/ocm/trunk/src/main/java/org/apache/jackrabbit/ocm/nodemanagement/impl/jackrabbit/NamespaceHelper.java?rev=1343782&r1=1343781&r2=1343782&view=diff ============================================================================== --- jackrabbit/commons/ocm/trunk/src/main/java/org/apache/jackrabbit/ocm/nodemanagement/impl/jackrabbit/NamespaceHelper.java (original) +++ jackrabbit/commons/ocm/trunk/src/main/java/org/apache/jackrabbit/ocm/nodemanagement/impl/jackrabbit/NamespaceHelper.java Tue May 29 15:36:07 2012 @@ -18,7 +18,6 @@ package org.apache.jackrabbit.ocm.nodema import javax.jcr.NamespaceRegistry; - import org.apache.jackrabbit.ocm.nodemanagement.impl.BaseNamespaceHelper; import org.apache.jackrabbit.spi.Name; import org.apache.jackrabbit.spi.commons.name.NameFactoryImpl; Modified: jackrabbit/commons/ocm/trunk/src/main/java/org/apache/jackrabbit/ocm/nodemanagement/impl/jackrabbit/NodeTypeManagerImpl.java URL: http://svn.apache.org/viewvc/jackrabbit/commons/ocm/trunk/src/main/java/org/apache/jackrabbit/ocm/nodemanagement/impl/jackrabbit/NodeTypeManagerImpl.java?rev=1343782&r1=1343781&r2=1343782&view=diff ============================================================================== --- jackrabbit/commons/ocm/trunk/src/main/java/org/apache/jackrabbit/ocm/nodemanagement/impl/jackrabbit/NodeTypeManagerImpl.java (original) +++ jackrabbit/commons/ocm/trunk/src/main/java/org/apache/jackrabbit/ocm/nodemanagement/impl/jackrabbit/NodeTypeManagerImpl.java Tue May 29 15:36:07 2012 @@ -30,8 +30,6 @@ import javax.jcr.nodetype.NodeTypeDefini import javax.jcr.nodetype.PropertyDefinition; import javax.jcr.version.OnParentVersionAction; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.apache.jackrabbit.core.nodetype.InvalidNodeTypeDefException; import org.apache.jackrabbit.core.nodetype.NodeTypeRegistry; import org.apache.jackrabbit.core.nodetype.xml.NodeTypeReader; @@ -56,6 +54,8 @@ import org.apache.jackrabbit.spi.QValueC import org.apache.jackrabbit.spi.commons.nodetype.QNodeDefinitionBuilder; import org.apache.jackrabbit.spi.commons.nodetype.QNodeTypeDefinitionBuilder; import org.apache.jackrabbit.spi.commons.nodetype.QPropertyDefinitionBuilder; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** This is the NodeTypeManager implementation for Apache Jackrabbit. * @@ -66,7 +66,7 @@ public class NodeTypeManagerImpl impleme /** * Logging. */ - private static Log log = LogFactory.getLog(NodeTypeManagerImpl.class); + private static Logger log = LoggerFactory.getLogger(NodeTypeManagerImpl.class); private static final boolean debug = false; /** Namespace helper class for Jackrabbit. Modified: jackrabbit/commons/ocm/trunk/src/main/java/org/apache/jackrabbit/ocm/nodemanagement/impl/jeceira/NodeTypeManagerImpl.java URL: http://svn.apache.org/viewvc/jackrabbit/commons/ocm/trunk/src/main/java/org/apache/jackrabbit/ocm/nodemanagement/impl/jeceira/NodeTypeManagerImpl.java?rev=1343782&r1=1343781&r2=1343782&view=diff ============================================================================== --- jackrabbit/commons/ocm/trunk/src/main/java/org/apache/jackrabbit/ocm/nodemanagement/impl/jeceira/NodeTypeManagerImpl.java (original) +++ jackrabbit/commons/ocm/trunk/src/main/java/org/apache/jackrabbit/ocm/nodemanagement/impl/jeceira/NodeTypeManagerImpl.java Tue May 29 15:36:07 2012 @@ -21,9 +21,6 @@ import java.util.List; import javax.jcr.Session; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - import org.apache.jackrabbit.ocm.mapper.model.ClassDescriptor; import org.apache.jackrabbit.ocm.mapper.model.MappingDescriptor; import org.apache.jackrabbit.ocm.nodemanagement.NodeTypeManager; @@ -31,6 +28,8 @@ import org.apache.jackrabbit.ocm.nodeman import org.apache.jackrabbit.ocm.nodemanagement.exception.NodeTypeCreationException; import org.apache.jackrabbit.ocm.nodemanagement.exception.NodeTypeRemovalException; import org.apache.jackrabbit.ocm.nodemanagement.exception.OperationNotSupportedException; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** This is the NodeTypeManager implementation for Jeceira. * @@ -41,7 +40,7 @@ public class NodeTypeManagerImpl impleme /** * Logging. */ - private static Log log = LogFactory.getLog(NodeTypeManagerImpl.class); + private static Logger log = LoggerFactory.getLogger(NodeTypeManagerImpl.class); /** Creates a new instance of NodeTypeManagerImpl. */ public NodeTypeManagerImpl() Modified: jackrabbit/commons/ocm/trunk/src/main/java/org/apache/jackrabbit/ocm/query/impl/FilterImpl.java URL: http://svn.apache.org/viewvc/jackrabbit/commons/ocm/trunk/src/main/java/org/apache/jackrabbit/ocm/query/impl/FilterImpl.java?rev=1343782&r1=1343781&r2=1343782&view=diff ============================================================================== --- jackrabbit/commons/ocm/trunk/src/main/java/org/apache/jackrabbit/ocm/query/impl/FilterImpl.java (original) +++ jackrabbit/commons/ocm/trunk/src/main/java/org/apache/jackrabbit/ocm/query/impl/FilterImpl.java Tue May 29 15:36:07 2012 @@ -18,18 +18,17 @@ package org.apache.jackrabbit.ocm.query.impl; - import java.util.Map; import javax.jcr.ValueFactory; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.apache.jackrabbit.ocm.manager.atomictypeconverter.AtomicTypeConverter; import org.apache.jackrabbit.ocm.mapper.model.ClassDescriptor; import org.apache.jackrabbit.ocm.mapper.model.FieldDescriptor; import org.apache.jackrabbit.ocm.query.Filter; import org.apache.jackrabbit.ocm.reflection.ReflectionUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * {@link org.apache.jackrabbit.ocm.query.Filter} @@ -38,7 +37,7 @@ import org.apache.jackrabbit.ocm.reflect * @author Alex Popescu */ public class FilterImpl implements Filter { - private final static Log log = LogFactory.getLog(FilterImpl.class); + private final static Logger log = LoggerFactory.getLogger(FilterImpl.class); private Class claszz; private String scope = ""; Modified: jackrabbit/commons/ocm/trunk/src/main/java/org/apache/jackrabbit/ocm/query/impl/QueryImpl.java URL: http://svn.apache.org/viewvc/jackrabbit/commons/ocm/trunk/src/main/java/org/apache/jackrabbit/ocm/query/impl/QueryImpl.java?rev=1343782&r1=1343781&r2=1343782&view=diff ============================================================================== --- jackrabbit/commons/ocm/trunk/src/main/java/org/apache/jackrabbit/ocm/query/impl/QueryImpl.java (original) +++ jackrabbit/commons/ocm/trunk/src/main/java/org/apache/jackrabbit/ocm/query/impl/QueryImpl.java Tue May 29 15:36:07 2012 @@ -17,9 +17,6 @@ package org.apache.jackrabbit.ocm.query.impl; -import java.util.ArrayList; -import java.util.Iterator; - import org.apache.jackrabbit.ocm.mapper.Mapper; import org.apache.jackrabbit.ocm.mapper.model.ClassDescriptor; import org.apache.jackrabbit.ocm.query.Filter; Modified: jackrabbit/commons/ocm/trunk/src/main/java/org/apache/jackrabbit/ocm/query/impl/QueryManagerImpl.java URL: http://svn.apache.org/viewvc/jackrabbit/commons/ocm/trunk/src/main/java/org/apache/jackrabbit/ocm/query/impl/QueryManagerImpl.java?rev=1343782&r1=1343781&r2=1343782&view=diff ============================================================================== --- jackrabbit/commons/ocm/trunk/src/main/java/org/apache/jackrabbit/ocm/query/impl/QueryManagerImpl.java (original) +++ jackrabbit/commons/ocm/trunk/src/main/java/org/apache/jackrabbit/ocm/query/impl/QueryManagerImpl.java Tue May 29 15:36:07 2012 @@ -22,8 +22,6 @@ import java.util.Map; import javax.jcr.ValueFactory; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.apache.jackrabbit.ocm.manager.ManagerConstant; import org.apache.jackrabbit.ocm.manager.impl.ObjectContentManagerImpl; import org.apache.jackrabbit.ocm.mapper.Mapper; @@ -31,10 +29,12 @@ import org.apache.jackrabbit.ocm.mapper. import org.apache.jackrabbit.ocm.query.Filter; import org.apache.jackrabbit.ocm.query.Query; import org.apache.jackrabbit.ocm.query.QueryManager; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class QueryManagerImpl implements QueryManager { - private final static Log log = LogFactory.getLog(ObjectContentManagerImpl.class); + private final static Logger log = LoggerFactory.getLogger(ObjectContentManagerImpl.class); private Mapper mapper; private Map atomicTypeConverters; Modified: jackrabbit/commons/ocm/trunk/src/main/java/org/apache/jackrabbit/ocm/reflection/ReflectionUtils.java URL: http://svn.apache.org/viewvc/jackrabbit/commons/ocm/trunk/src/main/java/org/apache/jackrabbit/ocm/reflection/ReflectionUtils.java?rev=1343782&r1=1343781&r2=1343782&view=diff ============================================================================== --- jackrabbit/commons/ocm/trunk/src/main/java/org/apache/jackrabbit/ocm/reflection/ReflectionUtils.java (original) +++ jackrabbit/commons/ocm/trunk/src/main/java/org/apache/jackrabbit/ocm/reflection/ReflectionUtils.java Tue May 29 15:36:07 2012 @@ -28,12 +28,12 @@ import java.util.Set; import java.util.SortedMap; import java.util.TreeMap; -import net.sf.cglib.proxy.Enhancer; - import org.apache.commons.beanutils.ConstructorUtils; import org.apache.commons.beanutils.PropertyUtils; import org.apache.jackrabbit.ocm.exception.JcrMappingException; +import net.sf.cglib.proxy.Enhancer; + /** * Utility class for handling reflection using BeanUtils. Modified: jackrabbit/commons/ocm/trunk/src/main/java/org/apache/jackrabbit/ocm/repository/NodeUtil.java URL: http://svn.apache.org/viewvc/jackrabbit/commons/ocm/trunk/src/main/java/org/apache/jackrabbit/ocm/repository/NodeUtil.java?rev=1343782&r1=1343781&r2=1343782&view=diff ============================================================================== --- jackrabbit/commons/ocm/trunk/src/main/java/org/apache/jackrabbit/ocm/repository/NodeUtil.java (original) +++ jackrabbit/commons/ocm/trunk/src/main/java/org/apache/jackrabbit/ocm/repository/NodeUtil.java Tue May 29 15:36:07 2012 @@ -16,10 +16,10 @@ */ package org.apache.jackrabbit.ocm.repository; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.apache.jackrabbit.ocm.exception.JcrMappingException; import org.apache.jackrabbit.ocm.exception.ObjectContentManagerException; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Utility class for managing JCR nodes. @@ -35,7 +35,7 @@ public class NodeUtil /** Item path separator */ public static final String PATH_SEPARATOR = "/"; - private final static Log log = LogFactory.getLog(NodeUtil.class); + private final static Logger log = LoggerFactory.getLogger(NodeUtil.class); /** Modified: jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/AbstractTestBase.java URL: http://svn.apache.org/viewvc/jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/AbstractTestBase.java?rev=1343782&r1=1343781&r2=1343782&view=diff ============================================================================== --- jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/AbstractTestBase.java (original) +++ jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/AbstractTestBase.java Tue May 29 15:36:07 2012 @@ -28,29 +28,25 @@ import java.util.Iterator; import javax.jcr.ImportUUIDBehavior; import javax.jcr.Node; import javax.jcr.NodeIterator; -import javax.jcr.Repository; import javax.jcr.Session; import javax.jcr.UnsupportedRepositoryOperationException; import javax.jcr.Workspace; import javax.jcr.nodetype.NoSuchNodeTypeException; -import javax.jcr.nodetype.NodeTypeDefinition; import javax.jcr.nodetype.NodeTypeManager; - import junit.framework.TestCase; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.apache.jackrabbit.core.nodetype.InvalidNodeTypeDefException; import org.apache.jackrabbit.core.nodetype.NodeTypeManagerImpl; import org.apache.jackrabbit.core.nodetype.NodeTypeRegistry; import org.apache.jackrabbit.core.nodetype.xml.NodeTypeReader; import org.apache.jackrabbit.ocm.manager.ObjectContentManager; -import org.apache.jackrabbit.ocm.manager.impl.ObjectContentManagerImpl; import org.apache.jackrabbit.ocm.mapper.Mapper; import org.apache.jackrabbit.ocm.query.QueryManager; import org.apache.jackrabbit.ocm.reflection.ReflectionUtils; import org.apache.jackrabbit.ocm.repository.RepositoryUtil; import org.apache.jackrabbit.spi.QNodeTypeDefinition; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.xml.sax.ContentHandler; /** @@ -63,8 +59,7 @@ import org.xml.sax.ContentHandler; */ public abstract class AbstractTestBase extends TestCase { - - protected final static Log log = LogFactory.getLog(AbstractTestBase.class); + protected final static Logger log = LoggerFactory.getLogger(AbstractTestBase.class); protected Session session; Modified: jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/AnnotationTestBase.java URL: http://svn.apache.org/viewvc/jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/AnnotationTestBase.java?rev=1343782&r1=1343781&r2=1343782&view=diff ============================================================================== --- jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/AnnotationTestBase.java (original) +++ jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/AnnotationTestBase.java Tue May 29 15:36:07 2012 @@ -44,12 +44,12 @@ import org.apache.jackrabbit.ocm.testmod import org.apache.jackrabbit.ocm.testmodel.Paragraph; import org.apache.jackrabbit.ocm.testmodel.PropertyTest; import org.apache.jackrabbit.ocm.testmodel.Residual; +import org.apache.jackrabbit.ocm.testmodel.Residual.ResidualNodes; +import org.apache.jackrabbit.ocm.testmodel.Residual.ResidualProperties; import org.apache.jackrabbit.ocm.testmodel.Resource; import org.apache.jackrabbit.ocm.testmodel.SimpleAnnotedAbstractClass; import org.apache.jackrabbit.ocm.testmodel.SimpleAnnotedClass; import org.apache.jackrabbit.ocm.testmodel.SimpleInterface; -import org.apache.jackrabbit.ocm.testmodel.Residual.ResidualNodes; -import org.apache.jackrabbit.ocm.testmodel.Residual.ResidualProperties; import org.apache.jackrabbit.ocm.testmodel.collection.Element; import org.apache.jackrabbit.ocm.testmodel.collection.Main; import org.apache.jackrabbit.ocm.testmodel.collection.Person; Modified: jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/atomic/AnnotationAtomicTest.java URL: http://svn.apache.org/viewvc/jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/atomic/AnnotationAtomicTest.java?rev=1343782&r1=1343781&r2=1343782&view=diff ============================================================================== --- jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/atomic/AnnotationAtomicTest.java (original) +++ jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/atomic/AnnotationAtomicTest.java Tue May 29 15:36:07 2012 @@ -24,11 +24,11 @@ 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.testmodel.Atomic; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Test atomic persistence fields @@ -37,7 +37,7 @@ import org.apache.jackrabbit.ocm.testmod */ public class AnnotationAtomicTest extends AnnotationTestBase { - private final static Log log = LogFactory.getLog(AnnotationAtomicTest.class); + private final static Logger log = LoggerFactory.getLogger(AnnotationAtomicTest.class); /** *

Defines the test case name for junit.

Modified: jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/atomic/AnnotationDefaultValueTest.java URL: http://svn.apache.org/viewvc/jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/atomic/AnnotationDefaultValueTest.java?rev=1343782&r1=1343781&r2=1343782&view=diff ============================================================================== --- jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/atomic/AnnotationDefaultValueTest.java (original) +++ jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/atomic/AnnotationDefaultValueTest.java Tue May 29 15:36:07 2012 @@ -20,18 +20,18 @@ import javax.jcr.Node; 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.Default; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Test Default value assignement */ public class AnnotationDefaultValueTest extends AnnotationTestBase { - private final static Log log = LogFactory.getLog(AnnotationDefaultValueTest.class); + private final static Logger log = LoggerFactory.getLogger(AnnotationDefaultValueTest.class); /** *

Defines the test case name for junit.

Modified: jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/atomic/AnnotationNullAtomicTest.java URL: http://svn.apache.org/viewvc/jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/atomic/AnnotationNullAtomicTest.java?rev=1343782&r1=1343781&r2=1343782&view=diff ============================================================================== --- jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/atomic/AnnotationNullAtomicTest.java (original) +++ jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/atomic/AnnotationNullAtomicTest.java Tue May 29 15:36:07 2012 @@ -23,11 +23,11 @@ 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.testmodel.Atomic; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Test Atomic perisstence fields @@ -36,7 +36,7 @@ import org.apache.jackrabbit.ocm.testmod */ public class AnnotationNullAtomicTest extends AnnotationTestBase { - private final static Log log = LogFactory.getLog(AnnotationNullAtomicTest.class); + private final static Logger log = LoggerFactory.getLogger(AnnotationNullAtomicTest.class); /** *

Defines the test case name for junit.

Modified: jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/atomic/DigesterAtomicTest.java URL: http://svn.apache.org/viewvc/jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/atomic/DigesterAtomicTest.java?rev=1343782&r1=1343781&r2=1343782&view=diff ============================================================================== --- jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/atomic/DigesterAtomicTest.java (original) +++ jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/atomic/DigesterAtomicTest.java Tue May 29 15:36:07 2012 @@ -24,11 +24,11 @@ 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.testmodel.Atomic; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Test atomic persistence fields @@ -37,7 +37,7 @@ import org.apache.jackrabbit.ocm.testmod */ public class DigesterAtomicTest extends DigesterTestBase { - private final static Log log = LogFactory.getLog(DigesterAtomicTest.class); + private final static Logger log = LoggerFactory.getLogger(DigesterAtomicTest.class); /** *

Defines the test case name for junit.

Modified: jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/atomic/DigesterDefaultValueTest.java URL: http://svn.apache.org/viewvc/jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/atomic/DigesterDefaultValueTest.java?rev=1343782&r1=1343781&r2=1343782&view=diff ============================================================================== --- jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/atomic/DigesterDefaultValueTest.java (original) +++ jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/atomic/DigesterDefaultValueTest.java Tue May 29 15:36:07 2012 @@ -20,18 +20,18 @@ import javax.jcr.Node; 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.Default; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Test Default value assignement */ public class DigesterDefaultValueTest extends DigesterTestBase { - private final static Log log = LogFactory.getLog(DigesterDefaultValueTest.class); + private final static Logger log = LoggerFactory.getLogger(DigesterDefaultValueTest.class); /** *

Defines the test case name for junit.

Modified: jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/atomic/DigesterNullAtomicTest.java URL: http://svn.apache.org/viewvc/jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/atomic/DigesterNullAtomicTest.java?rev=1343782&r1=1343781&r2=1343782&view=diff ============================================================================== --- jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/atomic/DigesterNullAtomicTest.java (original) +++ jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/atomic/DigesterNullAtomicTest.java Tue May 29 15:36:07 2012 @@ -23,11 +23,11 @@ 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.testmodel.Atomic; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Test Atomic perisstence fields @@ -36,7 +36,7 @@ import org.apache.jackrabbit.ocm.testmod */ public class DigesterNullAtomicTest extends DigesterTestBase { - private final static Log log = LogFactory.getLog(DigesterNullAtomicTest.class); + private final static Logger log = LoggerFactory.getLogger(DigesterNullAtomicTest.class); /** *

Defines the test case name for junit.

Modified: jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/auto/AnnotationAutoTest.java URL: http://svn.apache.org/viewvc/jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/auto/AnnotationAutoTest.java?rev=1343782&r1=1343781&r2=1343782&view=diff ============================================================================== --- jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/auto/AnnotationAutoTest.java (original) +++ jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/auto/AnnotationAutoTest.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.AnnotationTestBase; import org.apache.jackrabbit.ocm.manager.ObjectContentManager; import org.apache.jackrabbit.ocm.manager.impl.ObjectContentManagerImpl; @@ -41,6 +39,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 @@ -48,7 +48,7 @@ import org.apache.jackrabbit.ocm.testmod * @author Christophe Lombart */ public class AnnotationAutoTest extends AnnotationTestBase { - private final static Log log = LogFactory.getLog(AnnotationAutoTest.class); + private final static Logger log = LoggerFactory.getLogger(AnnotationAutoTest.class); /** *

Defines the test case name for junit.