Return-Path: Delivered-To: apmail-jackrabbit-commits-archive@www.apache.org Received: (qmail 72668 invoked from network); 18 Jun 2007 21:47:30 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 18 Jun 2007 21:47:30 -0000 Received: (qmail 76943 invoked by uid 500); 18 Jun 2007 21:47:26 -0000 Delivered-To: apmail-jackrabbit-commits-archive@jackrabbit.apache.org Received: (qmail 76906 invoked by uid 500); 18 Jun 2007 21:47:25 -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 76700 invoked by uid 99); 18 Jun 2007 21:47:24 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 18 Jun 2007 14:47:24 -0700 X-ASF-Spam-Status: No, hits=-99.5 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 18 Jun 2007 14:47:14 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 99C5B1A981A; Mon, 18 Jun 2007 14:46:54 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r548496 [1/5] - in /jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src: dtd/ main/java/org/apache/jackrabbit/ocm/exception/ main/java/org/apache/jackrabbit/ocm/manager/ main/java/org/apache/jackrabbit/ocm/manager/beanconverter/... Date: Mon, 18 Jun 2007 21:46:48 -0000 To: commits@jackrabbit.apache.org From: clombart@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20070618214654.99C5B1A981A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: clombart Date: Mon Jun 18 14:46:42 2007 New Revision: 548496 URL: http://svn.apache.org/viewvc?view=rev&rev=548496 Log: Last commit for issue JCR-930 (rename the PersistenceManager into ObjectContentManager). It compiles, the unit tests are running. Tommorow, I will make the latest code review before closing the issue Added: jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/exception/ObjectContentManagerException.java - copied, changed from r548484, jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/exception/PersistenceException.java jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/manager/impl/ObjectContentManagerImpl.java - copied, changed from r548484, jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/manager/impl/PersistenceManagerImpl.java jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/manager/impl/ObjectContentManagerUtil.java - copied, changed from r548484, jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/manager/impl/PersistenceUtil.java jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/auto/ObjectContentManagerAutoTest.java - copied, changed from r548484, jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/auto/PersistenceManagerAutoTest.java jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/basic/ObjectContentManagerAvoidRecursiveLoopTest.java - copied, changed from r548484, jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/basic/PersistenceManagerAvoidRecursiveLoopTest.java jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/basic/ObjectContentManagerCopyMoveTest.java - copied, changed from r548484, jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/basic/PersistenceManagerCopyMoveTest.java jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/basic/ObjectContentManagerRemoveTest.java - copied, changed from r548484, jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/basic/PersistenceManagerRemoveTest.java jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/basic/ObjectContentManagerSameNameSiblingTest.java - copied, changed from r548484, jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/basic/PersistenceManagerSameNameSiblingTest.java jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/basic/ObjectContentManagerTest.java - copied, changed from r548484, jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/basic/PersistenceManagerTest.java jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/inheritance/ObjectContentManagerInheritanceConcreteClassTest.java - copied, changed from r548484, jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/inheritance/PersistenceManagerInheritanceConcreteClassTest.java jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/inheritance/ObjectContentManagerInheritanceHierarchyTest.java - copied, changed from r548484, jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/inheritance/PersistenceManagerInheritanceHierarchyTest.java jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/interfaces/ObjectContentManagerInterfaceConcreteClassTest.java - copied, changed from r548484, jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/interfaces/PersistenceManagerInterfaceConcreteClassTest.java jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/interfaces/ObjectContentManagerInterfaceHierarchyTest.java - copied, changed from r548484, jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/interfaces/PersistenceManagerInterfaceHierarchyTest.java jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/jcrnodetype/ObjectContentManagerJcrNodeTypeTest.java - copied, changed from r548484, jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/jcrnodetype/PersistenceManagerJcrNodeTypeTest.java jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/jcrnodetype/ObjectContentManagerJcrPropertyTest.java - copied, changed from r548484, jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/jcrnodetype/PersistenceManagerJcrPropertyTest.java jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/lock/ObjectContentManagerLockTest.java - copied, changed from r548484, jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/lock/PersistenceManagerLockTest.java jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/query/ObjectContentManagerAtomicQueryTest.java - copied, changed from r548484, jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/query/PersistenceManagerAtomicQueryTest.java jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/query/ObjectContentManagerIteratorQueryTest.java - copied, changed from r548484, jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/query/PersistenceManagerIteratorQueryTest.java jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/query/ObjectContentManagerMultiValueQueryTest.java - copied, changed from r548484, jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/query/PersistenceManagerMultiValueQueryTest.java jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/query/ObjectContentManagerScopeQueryTest.java - copied, changed from r548484, jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/query/PersistenceManagerScopeQueryTest.java jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/query/ObjectContentManagerSimpleQueryTest.java - copied, changed from r548484, jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/query/PersistenceManagerSimpleQueryTest.java jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/uuid/ObjectContentManagerUuidTest.java - copied, changed from r548484, jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/uuid/PersistenceManagerUuidTest.java jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/version/ObjectContentManagerBasicVersionningTest.java - copied, changed from r548484, jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/version/PersistenceManagerBasicVersionningTest.java Removed: jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/exception/PersistenceException.java jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/manager/impl/PersistenceManagerImpl.java jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/manager/impl/PersistenceUtil.java jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/auto/PersistenceManagerAutoTest.java jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/basic/PersistenceManagerAvoidRecursiveLoopTest.java jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/basic/PersistenceManagerCopyMoveTest.java jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/basic/PersistenceManagerRemoveTest.java jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/basic/PersistenceManagerSameNameSiblingTest.java jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/basic/PersistenceManagerTest.java jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/inheritance/PersistenceManagerInheritanceConcreteClassTest.java jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/inheritance/PersistenceManagerInheritanceHierarchyTest.java jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/interfaces/PersistenceManagerInterfaceConcreteClassTest.java jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/interfaces/PersistenceManagerInterfaceHierarchyTest.java jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/jcrnodetype/PersistenceManagerJcrNodeTypeTest.java jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/jcrnodetype/PersistenceManagerJcrPropertyTest.java jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/lock/PersistenceManagerLockTest.java jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/query/PersistenceManagerAtomicQueryTest.java jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/query/PersistenceManagerIteratorQueryTest.java jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/query/PersistenceManagerMultiValueQueryTest.java jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/query/PersistenceManagerScopeQueryTest.java jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/query/PersistenceManagerSimpleQueryTest.java jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/uuid/PersistenceManagerUuidTest.java jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/version/PersistenceManagerBasicVersionningTest.java Modified: jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/dtd/jackrabbit-ocm.dtd jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/exception/IncorrectPersistentClassException.java jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/exception/LockingException.java jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/manager/CustomNodeTypeCreator.java jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/manager/ManagerConstant.java jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/manager/ObjectContentManager.java jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/manager/beanconverter/BeanConverter.java jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/manager/beanconverter/impl/AbstractBeanConverterImpl.java jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/manager/beanconverter/impl/DefaultBeanConverterImpl.java jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/manager/beanconverter/impl/InlineBeanConverterImpl.java jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/manager/beanconverter/impl/ParentBeanConverterImpl.java jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/manager/beanconverter/impl/ReferenceBeanConverterImpl.java jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/manager/collectionconverter/CollectionConverter.java jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/manager/collectionconverter/impl/AbstractCollectionConverterImpl.java jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/manager/collectionconverter/impl/BeanReferenceCollectionConverterImpl.java jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/manager/collectionconverter/impl/MultiValueCollectionConverterImpl.java jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/manager/collectionconverter/impl/ReferenceCollectionConverterImpl.java jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/manager/collectionconverter/impl/ResidualNodesCollectionConverterImpl.java jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/manager/collectionconverter/impl/ResidualPropertiesCollectionConverterImpl.java jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/manager/impl/CustomNodeTypeCreatorImpl.java jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/manager/objectconverter/ObjectConverter.java jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/manager/objectconverter/impl/ObjectConverterImpl.java jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/manager/objectconverter/impl/SimpleFieldsHelper.java jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/repository/RepositoryUtil.java jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/TestBase.java jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/atomic/AllTests.java jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/atomic/AtomicTest.java jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/atomic/NullAtomicTest.java jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/auto/AllTests.java jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/basic/AllTests.java jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/beanconverter/AllTests.java jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/beanconverter/BeanDescriptorTest.java jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/beanconverter/FakeBeanConverter.java jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/collectionconverter/AllTests.java jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/collectionconverter/ArrayListTest.java jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/collectionconverter/DefaultCollectionConverterImplTest.java jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/collectionconverter/HashMapTest.java jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/collectionconverter/MultiValueCollectionConverterImplTest.java jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/collectionconverter/NTCollectionConverterImplTest.java jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/collectionconverter/ResidualNodesCollectionConverterImplTest.java jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/collectionconverter/ResidualPropertiesCollectionConverterImplTest.java jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/inheritance/AllTests.java jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/interfaces/AllTests.java jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/jcrnodetype/AllTests.java jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/lock/AllTests.java jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/proxy/AllTests.java jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/proxy/ProxyTest.java jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/query/AllTests.java jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/uuid/AllTests.java jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/manager/version/AllTests.java jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/test-config/jcrmapping-atomic.xml jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/test-config/jcrmapping-auto.xml jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/test-config/jcrmapping-avoidrecursiveloop.xml jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/test-config/jcrmapping-beandescriptor.xml jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/test-config/jcrmapping-inheritance.xml jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/test-config/jcrmapping-jcrnodetypes.xml jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/test-config/jcrmapping-sibling.xml jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/test-config/jcrmapping-testdigester.xml jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/test-config/jcrmapping-uuid.xml jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/test-config/jcrmapping.xml Modified: jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/dtd/jackrabbit-ocm.dtd URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/dtd/jackrabbit-ocm.dtd?view=diff&rev=548496&r1=548495&r2=548496 ============================================================================== --- jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/dtd/jackrabbit-ocm.dtd (original) +++ jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/dtd/jackrabbit-ocm.dtd Mon Jun 18 14:46:42 2007 @@ -136,7 +136,7 @@ * elementClassName : contains a fully qualified class name. This class is the Object type of the persistent collection elements. * collectionClassName : contains a fully qualified class name. This class must be the Java type of the Collection attribute. This attribute must only specified if the attribute type is not a java.util.Collection (or subclass). - The declared class must implement ManageableCollection to let the persistence engine handles this type of collection. + The declared class must implement ManageableCollection to let the ocm engine handles this type of collection. * collectionConverter : The class name converter. This is the collection mapping strategy to used. If this attribute is not specify, the default collection mapping strategy is used (DefaultCollectionConverterImpl) * jcrNodeType: defines the child node type, optional Modified: jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/exception/IncorrectPersistentClassException.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/exception/IncorrectPersistentClassException.java?view=diff&rev=548496&r1=548495&r2=548496 ============================================================================== --- jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/exception/IncorrectPersistentClassException.java (original) +++ jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/exception/IncorrectPersistentClassException.java Mon Jun 18 14:46:42 2007 @@ -19,7 +19,7 @@ /** - * Occurs when the persistence manager try to manage an object which is not based on a persistent class. + * Occurs when the ocm try to manage an object which is not based on a persistent class. * * @author Christophe Lombart */ Modified: jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/exception/LockingException.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/exception/LockingException.java?view=diff&rev=548496&r1=548495&r2=548496 ============================================================================== --- jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/exception/LockingException.java (original) +++ jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/exception/LockingException.java Mon Jun 18 14:46:42 2007 @@ -21,5 +21,5 @@ * * @author markoc */ -abstract public class LockingException extends PersistenceException { +abstract public class LockingException extends ObjectContentManagerException { } Copied: jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/exception/ObjectContentManagerException.java (from r548484, jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/exception/PersistenceException.java) URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/exception/ObjectContentManagerException.java?view=diff&rev=548496&p1=jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/exception/PersistenceException.java&r1=548484&p2=jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/exception/ObjectContentManagerException.java&r2=548496 ============================================================================== --- jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/exception/PersistenceException.java (original) +++ jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/exception/ObjectContentManagerException.java Mon Jun 18 14:46:42 2007 @@ -23,14 +23,14 @@ * @author Christophe Lombart * @author Alexandru Popescu */ -public class PersistenceException extends NestableRuntimeException { +public class ObjectContentManagerException extends NestableRuntimeException { /** Use serialVersionUID for interoperability. */ private final static long serialVersionUID = -643089296035094427L; /** * Not intended for usage. */ - protected PersistenceException() { + protected ObjectContentManagerException() { } /** @@ -38,7 +38,7 @@ * * @param message the message associated to the exception */ - public PersistenceException(String message) { + public ObjectContentManagerException(String message) { super(message); } @@ -47,7 +47,7 @@ * * @param nested the associated throwable object */ - public PersistenceException(Throwable nested) { + public ObjectContentManagerException(Throwable nested) { super(nested); } @@ -57,7 +57,7 @@ * @param message the message associated to the exception * @param nested the associated throwable object */ - public PersistenceException(String message, Throwable nested) { + public ObjectContentManagerException(String message, Throwable nested) { super(message, nested); } } Modified: jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/manager/CustomNodeTypeCreator.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/manager/CustomNodeTypeCreator.java?view=diff&rev=548496&r1=548495&r2=548496 ============================================================================== --- jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/manager/CustomNodeTypeCreator.java (original) +++ jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/manager/CustomNodeTypeCreator.java Mon Jun 18 14:46:42 2007 @@ -17,7 +17,7 @@ package org.apache.jackrabbit.ocm.manager; import org.apache.jackrabbit.ocm.exception.CustomNodeTypeCreationException; -import org.apache.jackrabbit.ocm.manager.impl.PersistenceManagerImpl; +import org.apache.jackrabbit.ocm.manager.impl.ObjectContentManagerImpl; /** Interface for custom node type creator implementations. * @@ -44,5 +44,5 @@ /** Jcr session to be injected into implementation. * @param jcrSession JcrSession */ - void setJcrSession(PersistenceManagerImpl jcrSession); + void setJcrSession(ObjectContentManagerImpl jcrSession); } Modified: jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/manager/ManagerConstant.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/manager/ManagerConstant.java?view=diff&rev=548496&r1=548495&r2=548496 ============================================================================== --- jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/manager/ManagerConstant.java (original) +++ jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/manager/ManagerConstant.java Mon Jun 18 14:46:42 2007 @@ -20,7 +20,7 @@ /** * - * General Persistence Constants use in several classes + * General Object Content Manager Constants use in several classes * * @author Lombart Christophe * Modified: jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/manager/ObjectContentManager.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/manager/ObjectContentManager.java?view=diff&rev=548496&r1=548495&r2=548496 ============================================================================== --- jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/manager/ObjectContentManager.java (original) +++ jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/manager/ObjectContentManager.java Mon Jun 18 14:46:42 2007 @@ -25,14 +25,14 @@ import org.apache.jackrabbit.ocm.exception.IllegalUnlockException; import org.apache.jackrabbit.ocm.exception.LockedException; import org.apache.jackrabbit.ocm.lock.Lock; -import org.apache.jackrabbit.ocm.exception.PersistenceException; +import org.apache.jackrabbit.ocm.exception.ObjectContentManagerException; import org.apache.jackrabbit.ocm.query.Query; import org.apache.jackrabbit.ocm.query.QueryManager; import org.apache.jackrabbit.ocm.version.Version; import org.apache.jackrabbit.ocm.version.VersionIterator; /** - * The persistence manager encapsulates a JCR session. + * The object content manager encapsulates a JCR session. * This is the main component used to manage objects into the JCR repository. * * @author Sandro Boehme @@ -46,13 +46,13 @@ * Check if an object exists * @param path the object path * @return true if the item exists - * @throws PersistenceException when it is not possible to check if the item exist + * @throws ObjectContentManagerException when it is not possible to check if the item exist */ - public boolean objectExists(String path) throws PersistenceException; + public boolean objectExists(String path) throws ObjectContentManagerException; /** - * Can this persistence manager insert, update, delete, ... that type? + * Can this object content manager insert, update, delete, ... that type? * * @param clazz class for question * @return true if the class is persistence @@ -64,35 +64,35 @@ * Insert an object into the JCR repository * * @param object the object to add - * @throws PersistenceException when it is not possible to insert the object + * @throws ObjectContentManagerException when it is not possible to insert the object */ - public void insert(Object object) throws PersistenceException; + public void insert(Object object) throws ObjectContentManagerException; /** * Update an object * * @param object the object to update - * @throws PersistenceException when it is not possible to update the object + * @throws ObjectContentManagerException when it is not possible to update the object */ - public void update(Object object) throws PersistenceException; + public void update(Object object) throws ObjectContentManagerException; /** * Get an object from the JCR repository * @param path the object path * @return the object found or null * - * @throws PersistenceException when it is not possible to retrieve the object + * @throws ObjectContentManagerException when it is not possible to retrieve the object */ - public Object getObject( String path) throws PersistenceException; + public Object getObject( String path) throws ObjectContentManagerException; /** * Get an object from the JCR repository * @param the object uuid * @return the object found or null * - * @throws PersistenceException when it is not possible to retrieve the object + * @throws ObjectContentManagerException when it is not possible to retrieve the object */ - public Object getObjectByUuid( String uuid) throws PersistenceException; + public Object getObjectByUuid( String uuid) throws ObjectContentManagerException; /** * Get an object from the JCR repository @@ -100,9 +100,9 @@ * @param versionNumber The desired object version number * @return the object found or null * - * @throws PersistenceException when it is not possible to retrieve the object + * @throws ObjectContentManagerException when it is not possible to retrieve the object */ - public Object getObject(String path, String versionNumber) throws PersistenceException; + public Object getObject(String path, String versionNumber) throws ObjectContentManagerException; /** * Get an object from the JCR repository @@ -110,9 +110,9 @@ * @param path the object path * @return the object found or null * - * @throws PersistenceException when it is not possible to retrieve the object + * @throws ObjectContentManagerException when it is not possible to retrieve the object */ - public Object getObject(Class objectClass, String path) throws PersistenceException; + public Object getObject(Class objectClass, String path) throws ObjectContentManagerException; /** * Get an object from the JCR repository @@ -121,9 +121,9 @@ * @param versionNumber The desired object version number * @return the object found or null * - * @throws PersistenceException when it is not possible to retrieve the object + * @throws ObjectContentManagerException when it is not possible to retrieve the object */ - public Object getObject(Class objectClass, String path, String versionNumber) throws PersistenceException; + public Object getObject(Class objectClass, String path, String versionNumber) throws ObjectContentManagerException; /** @@ -146,47 +146,47 @@ /** * Remove an object from a JCR repository * @param path the object path - * @throws PersistenceException when it is not possible to remove the object + * @throws ObjectContentManagerException when it is not possible to remove the object * */ - public void remove(String path) throws PersistenceException; + public void remove(String path) throws ObjectContentManagerException; /** * Remove an object from a JCR repository * @param object the object to remove - * @throws PersistenceException when it is not possible to remove the object + * @throws ObjectContentManagerException when it is not possible to remove the object * */ - public void remove(Object object) throws PersistenceException; + public void remove(Object object) throws ObjectContentManagerException; /** * Remove all objects matching to a query * @param query The query used to find the objects to remove - * @throws PersistenceException when it is not possible to remove all objects + * @throws ObjectContentManagerException when it is not possible to remove all objects * */ - public void remove(Query query) throws PersistenceException; + public void remove(Query query) throws ObjectContentManagerException; /** * Retrieve an object matching to a query * @param query The Query object used to seach the object * @return The object found or null - * @throws PersistenceException when it is not possible to retrieve the object + * @throws ObjectContentManagerException when it is not possible to retrieve the object * */ - public Object getObject(Query query) throws PersistenceException; + public Object getObject(Query query) throws ObjectContentManagerException; /** * Retrieve some objects matching to a query * @param query The query used to seach the objects * @return a collection of objects found - * @throws PersistenceException when it is not possible to retrieve the objects + * @throws ObjectContentManagerException when it is not possible to retrieve the objects * */ - public Collection getObjects(Query query) throws PersistenceException; + public Collection getObjects(Query query) throws ObjectContentManagerException; /** @@ -194,9 +194,9 @@ * * @param query The query used to seach the objects * @return an iterator of objects found - * @throws PersistenceException when it is not possible to retrieve the objects + * @throws ObjectContentManagerException when it is not possible to retrieve the objects */ - public Iterator getObjectIterator (Query query) throws PersistenceException; + public Iterator getObjectIterator (Query query) throws ObjectContentManagerException; /** @@ -287,17 +287,17 @@ /** - * Save all modifications made by the persistence manager + * Save all modifications made by the object content manager * - * @throws PersistenceException when it is not possible to save all pending operation into the JCR repo + * @throws ObjectContentManagerException when it is not possible to save all pending operation into the JCR repo */ - public void save() throws PersistenceException; + public void save() throws ObjectContentManagerException; /** * Close the session - * @throws PersistenceException when it is not possible to logout + * @throws ObjectContentManagerException when it is not possible to logout */ - public void logout() throws PersistenceException; + public void logout() throws ObjectContentManagerException; /** * Lock object saved on {@param path }. @@ -355,9 +355,9 @@ * @param srcPath path of the object to move * @param destPath destination path * - * @throws PersistenceException + * @throws ObjectContentManagerException */ - public void move(String srcPath, String destPath) throws PersistenceException; + public void move(String srcPath, String destPath) throws ObjectContentManagerException; /** * Copy an object @@ -365,9 +365,9 @@ * @param srcPath path of the object to copy * @param destPath destination path * - * @throws PersistenceException + * @throws ObjectContentManagerException */ - public void copy(String srcPath, String destPath) throws PersistenceException; + public void copy(String srcPath, String destPath) throws ObjectContentManagerException; /** * This method returns the JCR session. The JCR session could be used to make some JCR specific calls. Modified: jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/manager/beanconverter/BeanConverter.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/manager/beanconverter/BeanConverter.java?view=diff&rev=548496&r1=548495&r2=548496 ============================================================================== --- jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/manager/beanconverter/BeanConverter.java (original) +++ jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/manager/beanconverter/BeanConverter.java Mon Jun 18 14:46:42 2007 @@ -21,7 +21,7 @@ import javax.jcr.Session; import org.apache.jackrabbit.ocm.exception.JcrMappingException; -import org.apache.jackrabbit.ocm.exception.PersistenceException; +import org.apache.jackrabbit.ocm.exception.ObjectContentManagerException; import org.apache.jackrabbit.ocm.exception.RepositoryException; import org.apache.jackrabbit.ocm.manager.beanconverter.impl.ParentBeanConverterImpl; import org.apache.jackrabbit.ocm.mapper.model.BeanDescriptor; @@ -46,15 +46,15 @@ * @param parentClassDescriptor The Class Descriptor associated to the parent object * @param parent the object which will contain the bean to convert * - * @throws PersistenceException thrown in case the insert fails; marks a failure due to logic of + * @throws ObjectContentManagerException thrown in case the insert fails; marks a failure due to logic of * the insert (parent node cannot be accessed, the insert fails, etc.) * @throws RepositoryException thrown in case the underlying repository has thrown a * javax.jcr.RepositoryException that is not possible to be handled or - * wrapped in PersistenceException; marks a repository failure + * wrapped in ObjectContentManagerException; marks a repository failure * @throws JcrMappingException throws in case the mapping of the bean is not correct */ void insert(Session session, Node parentNode, BeanDescriptor beanDescriptor, ClassDescriptor beanClassDescriptor, Object bean, ClassDescriptor parentClassDescriptor, Object parent) - throws PersistenceException, RepositoryException, JcrMappingException; + throws ObjectContentManagerException, RepositoryException, JcrMappingException; /** * Update repository from bean values. @@ -67,15 +67,15 @@ * @param parentClassDescriptor The Class Descriptor associated to the parent object * @param parent the object which will contain the bean to convert * - * @throws PersistenceException thrown in case the update fails; marks a failure due to logic + * @throws ObjectContentManagerException thrown in case the update fails; marks a failure due to logic * of update (parent node cannot be accessed, the update fails, etc.) * @throws RepositoryException thrown in case the underlying repository has thrown a * javax.jcr.RepositoryException that is not possible to be handled or - * wrapped in PersistenceException; marks a repository failure + * wrapped in ObjectContentManagerException; marks a repository failure * @throws JcrMappingException throws in case the mapping of the bean is not correct */ void update(Session session, Node parentNode, BeanDescriptor beanDescriptor, ClassDescriptor beanClassDescriptor, Object bean, ClassDescriptor parentClassDescriptor, Object parent) - throws PersistenceException, RepositoryException, JcrMappingException; + throws ObjectContentManagerException, RepositoryException, JcrMappingException; /** * Retrieve a bean from the repository. @@ -87,15 +87,15 @@ * @param beanClass The bean Class * @param parent The parent which contain the bean to retrieve * - * @throws PersistenceException thrown in case the bean cannot be retrieved or initialized; + * @throws ObjectContentManagerException thrown in case the bean cannot be retrieved or initialized; * marks a failure due to logic of retrieval * @throws RepositoryException thrown in case the underlying repository has thrown a * javax.jcr.RepositoryException that is not possible to be handled or - * wrapped in PersistenceException; marks a repository failure + * wrapped in ObjectContentManagerException; marks a repository failure * @throws JcrMappingException throws in case the mapping of the bean is not correct */ Object getObject(Session session, Node parentNode, BeanDescriptor beanDescriptor, ClassDescriptor beanClassDescriptor, Class beanClass, Object parent) - throws PersistenceException, RepositoryException, JcrMappingException; + throws ObjectContentManagerException, RepositoryException, JcrMappingException; /** @@ -109,15 +109,15 @@ * @param parentClassDescriptor The Class Descriptor associated to the parent object * @param parent the object which contains the bean to convert * - * @throws PersistenceException thrown in case the bean cannot be removed; + * @throws ObjectContentManagerException thrown in case the bean cannot be removed; * marks a failure due to logic of removal * @throws RepositoryException thrown in case the underlying repository has thrown a * javax.jcr.RepositoryException that is not possible to be handled or - * wrapped in PersistenceException; marks a repository failure + * wrapped in ObjectContentManagerException; marks a repository failure * @throws JcrMappingException throws in case the mapping of the bean is not correct */ void remove(Session session, Node parentNode, BeanDescriptor beanDescriptor, ClassDescriptor beanClassDescriptor, Object bean, ClassDescriptor parentClassDescriptor, Object parent) - throws PersistenceException, RepositoryException, JcrMappingException; + throws ObjectContentManagerException, RepositoryException, JcrMappingException; /** * Get the bean path. @@ -133,11 +133,11 @@ * * @throws RepositoryException thrown in case the underlying repository has thrown a * javax.jcr.RepositoryException that is not possible to be handled or - * wrapped in PersistenceException; marks a repository failure + * wrapped in ObjectContentManagerException; marks a repository failure * */ String getPath(Session session, BeanDescriptor beanDescriptor, Node parentNode) - throws PersistenceException; + throws ObjectContentManagerException; } Modified: jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/manager/beanconverter/impl/AbstractBeanConverterImpl.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/manager/beanconverter/impl/AbstractBeanConverterImpl.java?view=diff&rev=548496&r1=548495&r2=548496 ============================================================================== --- jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/manager/beanconverter/impl/AbstractBeanConverterImpl.java (original) +++ jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/manager/beanconverter/impl/AbstractBeanConverterImpl.java Mon Jun 18 14:46:42 2007 @@ -20,11 +20,11 @@ import javax.jcr.Session; import org.apache.jackrabbit.ocm.exception.JcrMappingException; -import org.apache.jackrabbit.ocm.exception.PersistenceException; +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.impl.PersistenceUtil; +import org.apache.jackrabbit.ocm.manager.impl.ObjectContentManagerUtil; import org.apache.jackrabbit.ocm.manager.objectconverter.ObjectConverter; import org.apache.jackrabbit.ocm.mapper.Mapper; import org.apache.jackrabbit.ocm.mapper.model.BeanDescriptor; @@ -55,20 +55,20 @@ * */ public String getPath(Session session, BeanDescriptor beanDescriptor, Node parentNode) - throws PersistenceException + throws ObjectContentManagerException { - return PersistenceUtil.getPath(session, beanDescriptor, parentNode); + return ObjectContentManagerUtil.getPath(session, beanDescriptor, parentNode); } public abstract void insert(Session session, Node parentNode, BeanDescriptor beanDescriptor, ClassDescriptor beanClassDescriptor, Object object, ClassDescriptor parentClassDescriptor, Object parent) - throws PersistenceException, RepositoryException, JcrMappingException; + throws ObjectContentManagerException, RepositoryException, JcrMappingException; public abstract void update(Session session, Node parentNode, BeanDescriptor beanDescriptor, ClassDescriptor beanClassDescriptor, Object object, ClassDescriptor parentClassDescriptor, Object parent) - throws PersistenceException, RepositoryException, JcrMappingException; + throws ObjectContentManagerException, RepositoryException, JcrMappingException; public abstract Object getObject(Session session, Node parentNode, BeanDescriptor beanDescriptor, ClassDescriptor beanClassDescriptor, Class beanClass, Object parent) - throws PersistenceException, RepositoryException,JcrMappingException ; + throws ObjectContentManagerException, RepositoryException,JcrMappingException ; public abstract void remove(Session session, Node parentNode, BeanDescriptor beanDescriptor, ClassDescriptor beanClassDescriptor, Object object, ClassDescriptor parentClassDescriptor, Object parent) - throws PersistenceException, RepositoryException, JcrMappingException ; + throws ObjectContentManagerException, RepositoryException, JcrMappingException ; } Modified: jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/manager/beanconverter/impl/DefaultBeanConverterImpl.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/manager/beanconverter/impl/DefaultBeanConverterImpl.java?view=diff&rev=548496&r1=548495&r2=548496 ============================================================================== --- jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/manager/beanconverter/impl/DefaultBeanConverterImpl.java (original) +++ jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/manager/beanconverter/impl/DefaultBeanConverterImpl.java Mon Jun 18 14:46:42 2007 @@ -26,7 +26,7 @@ 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.PersistenceException; +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; @@ -52,13 +52,13 @@ } public void insert(Session session, Node parentNode, BeanDescriptor beanDescriptor, ClassDescriptor beanClassDescriptor, Object object, ClassDescriptor parentClassDescriptor, Object parent) - throws PersistenceException, RepositoryException, JcrMappingException + throws ObjectContentManagerException, RepositoryException, JcrMappingException { objectConverter.insert(session, parentNode, beanDescriptor.getJcrName(), object); } public void update(Session session, Node parentNode, BeanDescriptor beanDescriptor, ClassDescriptor beanClassDescriptor, Object object, ClassDescriptor parentClassDescriptor, Object parent) - throws PersistenceException, RepositoryException, JcrMappingException + throws ObjectContentManagerException, RepositoryException, JcrMappingException { try { @@ -79,14 +79,14 @@ } public Object getObject(Session session, Node parentNode, BeanDescriptor beanDescriptor, ClassDescriptor beanClassDescriptor, Class beanClass, Object parent) - throws PersistenceException, RepositoryException,JcrMappingException + throws ObjectContentManagerException, RepositoryException,JcrMappingException { return objectConverter.getObject(session, beanClass, this.getPath(session, beanDescriptor, parentNode)); } public void remove(Session session, Node parentNode, BeanDescriptor beanDescriptor, ClassDescriptor beanClassDescriptor, Object object, ClassDescriptor parentClassDescriptor, Object parent) - throws PersistenceException, RepositoryException, JcrMappingException + throws ObjectContentManagerException, RepositoryException, JcrMappingException { try { if (parentNode.hasNode(beanDescriptor.getJcrName())) Modified: jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/manager/beanconverter/impl/InlineBeanConverterImpl.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/manager/beanconverter/impl/InlineBeanConverterImpl.java?view=diff&rev=548496&r1=548495&r2=548496 ============================================================================== --- jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/manager/beanconverter/impl/InlineBeanConverterImpl.java (original) +++ jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/manager/beanconverter/impl/InlineBeanConverterImpl.java Mon Jun 18 14:46:42 2007 @@ -20,7 +20,7 @@ import javax.jcr.Session; import org.apache.jackrabbit.ocm.exception.JcrMappingException; -import org.apache.jackrabbit.ocm.exception.PersistenceException; +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; @@ -48,25 +48,25 @@ } public void insert(Session session, Node parentNode, BeanDescriptor beanDescriptor, ClassDescriptor beanClassDescriptor, Object object, ClassDescriptor parentClassDescriptor, Object parent) - throws PersistenceException, RepositoryException, JcrMappingException { + throws ObjectContentManagerException, RepositoryException, JcrMappingException { simpleFieldsHelper.storeSimpleFields(session, object, beanClassDescriptor, parentNode); } public void update(Session session, Node parentNode, BeanDescriptor beanDescriptor, ClassDescriptor beanClassDescriptor, Object object, ClassDescriptor parentClassDescriptor, Object parent) - throws PersistenceException, RepositoryException, JcrMappingException { + throws ObjectContentManagerException, RepositoryException, JcrMappingException { simpleFieldsHelper.storeSimpleFields(session, object, beanClassDescriptor, parentNode); } public Object getObject(Session session, Node parentNode, BeanDescriptor beanDescriptor, ClassDescriptor beanClassDescriptor, Class beanClass, Object bean) - throws PersistenceException, RepositoryException,JcrMappingException { + throws ObjectContentManagerException, RepositoryException,JcrMappingException { return simpleFieldsHelper.retrieveSimpleFields(session, beanClassDescriptor, parentNode, bean); } public void remove(Session session, Node parentNode, BeanDescriptor beanDescriptor, ClassDescriptor beanClassDescriptor, Object object, ClassDescriptor parentClassDescriptor, Object parent) - throws PersistenceException, RepositoryException, JcrMappingException { + throws ObjectContentManagerException, RepositoryException, JcrMappingException { simpleFieldsHelper.storeSimpleFields(session, object, beanClassDescriptor, parentNode); } Modified: jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/manager/beanconverter/impl/ParentBeanConverterImpl.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/manager/beanconverter/impl/ParentBeanConverterImpl.java?view=diff&rev=548496&r1=548495&r2=548496 ============================================================================== --- jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/manager/beanconverter/impl/ParentBeanConverterImpl.java (original) +++ jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/manager/beanconverter/impl/ParentBeanConverterImpl.java Mon Jun 18 14:46:42 2007 @@ -22,7 +22,7 @@ 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.PersistenceException; +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; @@ -49,15 +49,15 @@ } public void insert(Session session, Node parentNode, BeanDescriptor beanDescriptor, ClassDescriptor beanClassDescriptor, Object object, ClassDescriptor parentClassDescriptor, Object parent) - throws PersistenceException, RepositoryException, JcrMappingException { + throws ObjectContentManagerException, RepositoryException, JcrMappingException { } public void update(Session session, Node parentNode, BeanDescriptor beanDescriptor, ClassDescriptor beanClassDescriptor, Object object, ClassDescriptor parentClassDescriptor, Object parent) - throws PersistenceException, RepositoryException, JcrMappingException { + throws ObjectContentManagerException, RepositoryException, JcrMappingException { } public Object getObject(Session session, Node parentNode, BeanDescriptor beanDescriptor, ClassDescriptor beanClassDescriptor, Class beanClass, Object parent) - throws PersistenceException, RepositoryException,JcrMappingException { + throws ObjectContentManagerException, RepositoryException,JcrMappingException { try { Node grandParentNode = parentNode.getParent(); @@ -76,7 +76,7 @@ } public void remove(Session session, Node parentNode, BeanDescriptor beanDescriptor, ClassDescriptor beanClassDescriptor, Object object, ClassDescriptor parentClassDescriptor, Object parent) - throws PersistenceException, RepositoryException, JcrMappingException { + throws ObjectContentManagerException, RepositoryException, JcrMappingException { } @@ -86,7 +86,7 @@ * */ public String getPath(Session session, BeanDescriptor beanDescriptor, Node parentNode) - throws PersistenceException + throws ObjectContentManagerException { try { Modified: jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/manager/beanconverter/impl/ReferenceBeanConverterImpl.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/manager/beanconverter/impl/ReferenceBeanConverterImpl.java?view=diff&rev=548496&r1=548495&r2=548496 ============================================================================== --- jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/manager/beanconverter/impl/ReferenceBeanConverterImpl.java (original) +++ jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/manager/beanconverter/impl/ReferenceBeanConverterImpl.java Mon Jun 18 14:46:42 2007 @@ -27,7 +27,7 @@ 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.PersistenceException; +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; @@ -56,20 +56,20 @@ } public void insert(Session session, Node parentNode, BeanDescriptor beanDescriptor, ClassDescriptor beanClassDescriptor, Object object, ClassDescriptor parentClassDescriptor, Object parent) - throws PersistenceException, RepositoryException, JcrMappingException + throws ObjectContentManagerException, RepositoryException, JcrMappingException { updateReferenceProperty(parentNode, beanDescriptor, beanClassDescriptor, object); } public void update(Session session, Node parentNode, BeanDescriptor beanDescriptor, ClassDescriptor beanClassDescriptor, Object object, ClassDescriptor parentClassDescriptor, Object parent) - throws PersistenceException, RepositoryException, JcrMappingException + throws ObjectContentManagerException, RepositoryException, JcrMappingException { updateReferenceProperty(parentNode, beanDescriptor, beanClassDescriptor, object); } public Object getObject(Session session, Node parentNode, BeanDescriptor beanDescriptor, ClassDescriptor beanClassDescriptor, Class beanClass, Object parent) - throws PersistenceException, RepositoryException,JcrMappingException + throws ObjectContentManagerException, RepositoryException,JcrMappingException { try { String uuid = parentNode.getProperty(beanDescriptor.getJcrName()).getString(); @@ -84,7 +84,7 @@ } public void remove(Session session, Node parentNode, BeanDescriptor beanDescriptor, ClassDescriptor beanClassDescriptor, Object object, ClassDescriptor parentClassDescriptor, Object parent) - throws PersistenceException, RepositoryException, JcrMappingException + throws ObjectContentManagerException, RepositoryException, JcrMappingException { updateReferenceProperty(parentNode, beanDescriptor, beanClassDescriptor, null); } @@ -105,7 +105,7 @@ String uuid = (String) ReflectionUtils.getNestedProperty(object, fieldDescriptor.getFieldName()); parentNode.setProperty(beanDescriptor.getJcrName(), uuid, PropertyType.REFERENCE); } catch (Exception e) { - throw new PersistenceException("Impossible to insert the bean attribute into the repository", e); + throw new ObjectContentManagerException("Impossible to insert the bean attribute into the repository", e); } } Modified: jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/manager/collectionconverter/CollectionConverter.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/manager/collectionconverter/CollectionConverter.java?view=diff&rev=548496&r1=548495&r2=548496 ============================================================================== --- jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/manager/collectionconverter/CollectionConverter.java (original) +++ jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/manager/collectionconverter/CollectionConverter.java Mon Jun 18 14:46:42 2007 @@ -19,7 +19,7 @@ import javax.jcr.Node; import javax.jcr.Session; -import org.apache.jackrabbit.ocm.exception.PersistenceException; +import org.apache.jackrabbit.ocm.exception.ObjectContentManagerException; import org.apache.jackrabbit.ocm.mapper.model.CollectionDescriptor; /** @@ -38,11 +38,11 @@ * @param collectionDescriptor The collection descriptor * @param collection the collection to insert * - * @throws PersistenceException when it is not possible to insert the collection + * @throws ObjectContentManagerException when it is not possible to insert the collection * */ public void insertCollection(Session session, Node parentNode, - CollectionDescriptor collectionDescriptor, ManageableCollection collection) throws PersistenceException; + CollectionDescriptor collectionDescriptor, ManageableCollection collection) throws ObjectContentManagerException; /** * Update collection elements already present in the JCR repository @@ -51,10 +51,10 @@ * @param collectionDescriptor The collection descriptor * @param collection the collection to update * - * @throws PersistenceException when it is not possible to update the collection + * @throws ObjectContentManagerException when it is not possible to update the collection */ public void updateCollection(Session session, Node parentNode, - CollectionDescriptor collectionDescriptor, ManageableCollection collection) throws PersistenceException; + CollectionDescriptor collectionDescriptor, ManageableCollection collection) throws ObjectContentManagerException; /** * Get a {@link ManageableCollection} from the JCR repository @@ -64,10 +64,10 @@ * @param collectionFieldClass The collection class to used (ArrayList, Vector, ..) * @return The collection populates with all elements found in the JCR repository * - * @throws PersistenceException when it is not possible to retrieve the collection + * @throws ObjectContentManagerException when it is not possible to retrieve the collection */ public ManageableCollection getCollection(Session session, Node parentNode, - CollectionDescriptor collectionDescriptor, Class collectionFieldClass) throws PersistenceException; + CollectionDescriptor collectionDescriptor, Class collectionFieldClass) throws ObjectContentManagerException; /** @@ -81,8 +81,8 @@ * @return true if the collection contains elements. * * - * @throws PersistenceException when it is not possible to retrieve the collection + * @throws ObjectContentManagerException when it is not possible to retrieve the collection */ public boolean isNull(Session session, Node parentNode, - CollectionDescriptor collectionDescriptor, Class collectionFieldClass) throws PersistenceException; + CollectionDescriptor collectionDescriptor, Class collectionFieldClass) throws ObjectContentManagerException; } Modified: jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/manager/collectionconverter/impl/AbstractCollectionConverterImpl.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/manager/collectionconverter/impl/AbstractCollectionConverterImpl.java?view=diff&rev=548496&r1=548495&r2=548496 ============================================================================== --- jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/manager/collectionconverter/impl/AbstractCollectionConverterImpl.java (original) +++ jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/manager/collectionconverter/impl/AbstractCollectionConverterImpl.java Mon Jun 18 14:46:42 2007 @@ -28,7 +28,7 @@ import javax.jcr.version.VersionException; import org.apache.jackrabbit.ocm.exception.JcrMappingException; -import org.apache.jackrabbit.ocm.exception.PersistenceException; +import org.apache.jackrabbit.ocm.exception.ObjectContentManagerException; import org.apache.jackrabbit.ocm.manager.collectionconverter.CollectionConverter; import org.apache.jackrabbit.ocm.manager.collectionconverter.ManageableCollection; import org.apache.jackrabbit.ocm.manager.objectconverter.ObjectConverter; @@ -79,19 +79,19 @@ try { doInsertCollection(session, parentNode, collectionDescriptor, collection); } catch (ItemExistsException iee) { - throw new PersistenceException("Cannot insert collection field : " + collectionDescriptor.getFieldName() + throw new ObjectContentManagerException("Cannot insert collection field : " + collectionDescriptor.getFieldName() + " of class " + collectionDescriptor.getClassDescriptor().getClassName() + ". An item already exists.", iee); } catch (PathNotFoundException pnfe) { - throw new PersistenceException("Cannot insert collection field : " + collectionDescriptor.getFieldName() + throw new ObjectContentManagerException("Cannot insert collection field : " + collectionDescriptor.getFieldName() + " of class " + collectionDescriptor.getClassDescriptor().getClassName(), pnfe); } catch (VersionException ve) { - throw new PersistenceException("Cannot insert collection field : " + collectionDescriptor.getFieldName() + throw new ObjectContentManagerException("Cannot insert collection field : " + collectionDescriptor.getFieldName() + " of class " + collectionDescriptor.getClassDescriptor().getClassName(), ve); } catch (ConstraintViolationException cve) { - throw new PersistenceException("Cannot insert collection field : " + collectionDescriptor.getFieldName() + throw new ObjectContentManagerException("Cannot insert collection field : " + collectionDescriptor.getFieldName() + " of class " + collectionDescriptor.getClassDescriptor().getClassName() + ". Constraint violation.", cve); } catch (LockException le) { - throw new PersistenceException("Cannot insert collection field : " + collectionDescriptor.getFieldName() + throw new ObjectContentManagerException("Cannot insert collection field : " + collectionDescriptor.getFieldName() + " of class " + collectionDescriptor.getClassDescriptor().getClassName() + " on locked parent.", le); } catch (RepositoryException re) { throw new org.apache.jackrabbit.ocm.exception.RepositoryException("Cannot insert collection field : " @@ -110,13 +110,13 @@ doUpdateCollection(session, parentNode, collectionDescriptor, collection); } catch (VersionException ve) { - throw new PersistenceException("Cannot insert collection field : " + collectionDescriptor.getFieldName() + throw new ObjectContentManagerException("Cannot insert collection field : " + collectionDescriptor.getFieldName() + " of class " + collectionDescriptor.getClassDescriptor().getClassName(), ve); } catch (LockException le) { - throw new PersistenceException("Cannot insert collection field : " + collectionDescriptor.getFieldName() + throw new ObjectContentManagerException("Cannot insert collection field : " + collectionDescriptor.getFieldName() + " of class " + collectionDescriptor.getClassDescriptor().getClassName() + " on locked node", le); } catch (ConstraintViolationException cve) { - throw new PersistenceException("Cannot insert collection field : " + collectionDescriptor.getFieldName() + throw new ObjectContentManagerException("Cannot insert collection field : " + collectionDescriptor.getFieldName() + " of class " + collectionDescriptor.getClassDescriptor().getClassName() + " Constraint violation.", cve); } catch (RepositoryException re) { throw new org.apache.jackrabbit.ocm.exception.RepositoryException("Cannot insert collection field : " Modified: jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/manager/collectionconverter/impl/BeanReferenceCollectionConverterImpl.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/manager/collectionconverter/impl/BeanReferenceCollectionConverterImpl.java?view=diff&rev=548496&r1=548495&r2=548496 ============================================================================== --- jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/manager/collectionconverter/impl/BeanReferenceCollectionConverterImpl.java (original) +++ jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/manager/collectionconverter/impl/BeanReferenceCollectionConverterImpl.java Mon Jun 18 14:46:42 2007 @@ -35,7 +35,7 @@ import javax.jcr.version.VersionException; import org.apache.jackrabbit.ocm.exception.JcrMappingException; -import org.apache.jackrabbit.ocm.exception.PersistenceException; +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.ManageableCollectionUtil; @@ -131,7 +131,7 @@ return collection; } catch(Exception e) { - throw new PersistenceException("Cannot get the collection field : " + throw new ObjectContentManagerException("Cannot get the collection field : " + collectionDescriptor.getFieldName() + "for class " + collectionDescriptor.getClassDescriptor().getClassName(), e); } @@ -177,7 +177,7 @@ parentNode.setProperty(jcrName, values); } catch(Exception e) { - throw new PersistenceException("Cannot insert collection field : " + throw new ObjectContentManagerException("Cannot insert collection field : " + collectionDescriptor.getFieldName() + " of class " + collectionDescriptor.getClassDescriptor().getClassName(), e); Modified: jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/manager/collectionconverter/impl/MultiValueCollectionConverterImpl.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/manager/collectionconverter/impl/MultiValueCollectionConverterImpl.java?view=diff&rev=548496&r1=548495&r2=548496 ============================================================================== --- jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/manager/collectionconverter/impl/MultiValueCollectionConverterImpl.java (original) +++ jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/manager/collectionconverter/impl/MultiValueCollectionConverterImpl.java Mon Jun 18 14:46:42 2007 @@ -29,7 +29,7 @@ import javax.jcr.ValueFactory; import javax.jcr.ValueFormatException; -import org.apache.jackrabbit.ocm.exception.PersistenceException; +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.ManageableCollectionUtil; @@ -88,7 +88,7 @@ parentNode.setProperty(jcrName, values); } catch(ValueFormatException vfe) { - throw new PersistenceException("Cannot insert collection field : " + throw new ObjectContentManagerException("Cannot insert collection field : " + collectionDescriptor.getFieldName() + " of class " + collectionDescriptor.getClassDescriptor().getClassName(), vfe); @@ -156,7 +156,7 @@ return collection; } catch(ValueFormatException vfe) { - throw new PersistenceException("Cannot get the collection field : " + throw new ObjectContentManagerException("Cannot get the collection field : " + collectionDescriptor.getFieldName() + "for class " + collectionDescriptor.getClassDescriptor().getClassName(), vfe); Modified: jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/manager/collectionconverter/impl/ReferenceCollectionConverterImpl.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/manager/collectionconverter/impl/ReferenceCollectionConverterImpl.java?view=diff&rev=548496&r1=548495&r2=548496 ============================================================================== --- jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/manager/collectionconverter/impl/ReferenceCollectionConverterImpl.java (original) +++ jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/manager/collectionconverter/impl/ReferenceCollectionConverterImpl.java Mon Jun 18 14:46:42 2007 @@ -34,7 +34,7 @@ import javax.jcr.nodetype.ConstraintViolationException; import javax.jcr.version.VersionException; -import org.apache.jackrabbit.ocm.exception.PersistenceException; +import org.apache.jackrabbit.ocm.exception.ObjectContentManagerException; import org.apache.jackrabbit.ocm.manager.collectionconverter.ManageableCollection; import org.apache.jackrabbit.ocm.manager.collectionconverter.ManageableCollectionUtil; import org.apache.jackrabbit.ocm.manager.objectconverter.ObjectConverter; @@ -119,7 +119,7 @@ return collection; } catch(ValueFormatException vfe) { - throw new PersistenceException("Cannot get the collection field : " + throw new ObjectContentManagerException("Cannot get the collection field : " + collectionDescriptor.getFieldName() + "for class " + collectionDescriptor.getClassDescriptor().getClassName(), vfe); @@ -160,7 +160,7 @@ parentNode.setProperty(jcrName, values); } catch(ValueFormatException vfe) { - throw new PersistenceException("Cannot insert collection field : " + throw new ObjectContentManagerException("Cannot insert collection field : " + collectionDescriptor.getFieldName() + " of class " + collectionDescriptor.getClassDescriptor().getClassName(), vfe); Modified: jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/manager/collectionconverter/impl/ResidualNodesCollectionConverterImpl.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/manager/collectionconverter/impl/ResidualNodesCollectionConverterImpl.java?view=diff&rev=548496&r1=548495&r2=548496 ============================================================================== --- jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/manager/collectionconverter/impl/ResidualNodesCollectionConverterImpl.java (original) +++ jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/manager/collectionconverter/impl/ResidualNodesCollectionConverterImpl.java Mon Jun 18 14:46:42 2007 @@ -29,7 +29,7 @@ import javax.jcr.Session; import javax.jcr.ValueFormatException; -import org.apache.jackrabbit.ocm.exception.PersistenceException; +import org.apache.jackrabbit.ocm.exception.ObjectContentManagerException; import org.apache.jackrabbit.ocm.manager.collectionconverter.ManageableCollection; import org.apache.jackrabbit.ocm.manager.collectionconverter.ManageableCollectionUtil; import org.apache.jackrabbit.ocm.manager.collectionconverter.impl.AbstractCollectionConverterImpl; @@ -66,7 +66,7 @@ */ protected void doInsertCollection(Session session, Node parentNode, CollectionDescriptor collectionDescriptor, - ManageableCollection collection) /* throws PersistenceException */ { + ManageableCollection collection) { if (!(collection instanceof Map)) { return; @@ -163,7 +163,7 @@ return collection; } catch (ValueFormatException vfe) { - throw new PersistenceException("Cannot get the collection field : " + throw new ObjectContentManagerException("Cannot get the collection field : " + collectionDescriptor.getFieldName() + "for class " + collectionDescriptor.getClassDescriptor().getClassName(), vfe); } Modified: jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/manager/collectionconverter/impl/ResidualPropertiesCollectionConverterImpl.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/manager/collectionconverter/impl/ResidualPropertiesCollectionConverterImpl.java?view=diff&rev=548496&r1=548495&r2=548496 ============================================================================== --- jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/manager/collectionconverter/impl/ResidualPropertiesCollectionConverterImpl.java (original) +++ jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/manager/collectionconverter/impl/ResidualPropertiesCollectionConverterImpl.java Mon Jun 18 14:46:42 2007 @@ -30,7 +30,7 @@ import javax.jcr.ValueFactory; import javax.jcr.ValueFormatException; -import org.apache.jackrabbit.ocm.exception.PersistenceException; +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.ManageableCollectionUtil; @@ -132,7 +132,7 @@ return collection; } catch (ValueFormatException vfe) { - throw new PersistenceException("Cannot get the collection field : " + throw new ObjectContentManagerException("Cannot get the collection field : " + collectionDescriptor.getFieldName() + "for class " + collectionDescriptor.getClassDescriptor().getClassName(), vfe); } @@ -205,7 +205,7 @@ } } } catch (ValueFormatException vfe) { - throw new PersistenceException("Cannot insert collection field : " + throw new ObjectContentManagerException("Cannot insert collection field : " + collectionDescriptor.getFieldName() + " of class " + collectionDescriptor.getClassDescriptor().getClassName(), vfe); } @@ -213,7 +213,7 @@ /** * Returns the AtomicTypeConverter for the element class of the described - * collection. If no such converter can be found a PersistenceException + * collection. If no such converter can be found a ObjectContentManagerException * is thrown. * * @param collectionDescriptor The descriptor of the collection for whose @@ -221,7 +221,7 @@ * * @return The AtomicTypeConverter for the elements of the collection * - * @throws PersistenceException if no such type converter is registered + * @throws ObjectContentManagerException if no such type converter is registered */ private AtomicTypeConverter getAtomicTypeConverter(CollectionDescriptor collectionDescriptor) { String elementClassName = collectionDescriptor.getElementClassName(); @@ -231,7 +231,7 @@ return atc; } - throw new PersistenceException( + throw new ObjectContentManagerException( "Cannot get AtomicTypeConverter for element class " + elementClassName + " of class " + collectionDescriptor.getClassDescriptor().getClassName()); Modified: jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/manager/impl/CustomNodeTypeCreatorImpl.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/manager/impl/CustomNodeTypeCreatorImpl.java?view=diff&rev=548496&r1=548495&r2=548496 ============================================================================== --- jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/manager/impl/CustomNodeTypeCreatorImpl.java (original) +++ jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/manager/impl/CustomNodeTypeCreatorImpl.java Mon Jun 18 14:46:42 2007 @@ -36,7 +36,7 @@ /** Session to the jcr repository. */ - private PersistenceManagerImpl jcrSession; + private ObjectContentManagerImpl jcrSession; /** Creates a new instance of CustomNodeTypeCreatorImpl. */ public CustomNodeTypeCreatorImpl() @@ -46,7 +46,7 @@ /** Creates a new instance of CustomNodeTypeCreatorImpl with a jcr session. * @param jcrSession JcrSession */ - public CustomNodeTypeCreatorImpl(PersistenceManagerImpl jcrSession) + public CustomNodeTypeCreatorImpl(ObjectContentManagerImpl jcrSession) { this.jcrSession = jcrSession; } @@ -82,7 +82,7 @@ * * @param jcrSession JcrSession */ - public void setJcrSession(PersistenceManagerImpl jcrSession) + public void setJcrSession(ObjectContentManagerImpl jcrSession) { this.jcrSession = jcrSession; }