Return-Path: Delivered-To: apmail-jackrabbit-commits-archive@www.apache.org Received: (qmail 66202 invoked from network); 11 Feb 2009 13:21:08 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 11 Feb 2009 13:21:08 -0000 Received: (qmail 80041 invoked by uid 500); 11 Feb 2009 13:21:08 -0000 Delivered-To: apmail-jackrabbit-commits-archive@jackrabbit.apache.org Received: (qmail 80000 invoked by uid 500); 11 Feb 2009 13:21:08 -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 79991 invoked by uid 99); 11 Feb 2009 13:21:08 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 11 Feb 2009 05:21:08 -0800 X-ASF-Spam-Status: No, hits=-2000.0 required=10.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; Wed, 11 Feb 2009 13:21:07 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id D3DFA23888F4; Wed, 11 Feb 2009 13:20:46 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r743331 - in /jackrabbit/branches/1.5: ./ jackrabbit-ocm/ jackrabbit-ocm/src/main/java/org/apache/jackrabbit/ocm/mapper/impl/annotation/ jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/ jackrabbit-ocm/src/test/java/org/apache/jackrab... Date: Wed, 11 Feb 2009 13:20:46 -0000 To: commits@jackrabbit.apache.org From: jukka@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090211132046.D3DFA23888F4@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: jukka Date: Wed Feb 11 13:20:45 2009 New Revision: 743331 URL: http://svn.apache.org/viewvc?rev=743331&view=rev Log: 1.5: Merged revision 735401 (JCR-1889) Added: jackrabbit/branches/1.5/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/manager/interfaces/ListOfInterfaceTest.java - copied unchanged from r735401, jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/manager/interfaces/ListOfInterfaceTest.java jackrabbit/branches/1.5/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/testmodel/interfaces/EntityA.java - copied unchanged from r735401, jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/testmodel/interfaces/EntityA.java jackrabbit/branches/1.5/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/testmodel/interfaces/EntityB.java - copied unchanged from r735401, jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/testmodel/interfaces/EntityB.java jackrabbit/branches/1.5/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/testmodel/interfaces/MyInterface.java - copied unchanged from r735401, jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/testmodel/interfaces/MyInterface.java Modified: jackrabbit/branches/1.5/ (props changed) jackrabbit/branches/1.5/jackrabbit-ocm/pom.xml jackrabbit/branches/1.5/jackrabbit-ocm/src/main/java/org/apache/jackrabbit/ocm/mapper/impl/annotation/AnnotationDescriptorReader.java jackrabbit/branches/1.5/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/AnnotationTestBase.java Propchange: jackrabbit/branches/1.5/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Feb 11 13:20:45 2009 @@ -1,2 +1,2 @@ /jackrabbit/branches/1.3:631261 -/jackrabbit/trunk:703899-704158,704165,704167,704324,704358,704361,704864,704933,704939,705010,705033,705243,705496,705522,705579,705925,705932,705934,705937-705938,705961,706242,706273,706285-706286,706562,706606,706649,706655,706660,706697,706918,707303-707304,707307,707310,707630,708206,708598,708609,708613,708619,708634,708840,708863,708909,708929,708943,709115,709142,709207,709211,710047,711238,711566-711567,711595,711841-711843,712984-712985,713037,713059,713065,713072,713076,713162,713214,713956,713958,713964,713971,713975,714034,718218,718249-718250,718371,718376,718566,718632,718981,719225,719282,719575-719577,719579,719585-719586,719588,719592,720455,720484,720492,720524,720533,720540,720673,720679,720687,720784,720940,720969,721186,721191,721194,721235,721387-721389,721470,721495,722068-722069,722463,722465,722467,722470,722825,723281,723346,723728,723784,724300,724387,725292,727376,727388,727390,727395,727397,727402,727492,727701,728022,731896,731934,731941,73234 7,732678,732686,732689,732693,732703,732715-732716,732719,732728,732730,732734-732738,732740,732742-732743,732745,732867,732883,733057-733059,733061,733080,734092,734366,734375,734400,734709 +/jackrabbit/trunk:703899-704158,704165,704167,704324,704358,704361,704864,704933,704939,705010,705033,705243,705496,705522,705579,705925,705932,705934,705937-705938,705961,706242,706273,706285-706286,706562,706606,706649,706655,706660,706697,706918,707303-707304,707307,707310,707630,708206,708598,708609,708613,708619,708634,708840,708863,708909,708929,708943,709115,709142,709207,709211,710047,711238,711566-711567,711595,711841-711843,712984-712985,713037,713059,713065,713072,713076,713162,713214,713956,713958,713964,713971,713975,714034,718218,718249-718250,718371,718376,718566,718632,718981,719225,719282,719575-719577,719579,719585-719586,719588,719592,720455,720484,720492,720524,720533,720540,720673,720679,720687,720784,720940,720969,721186,721191,721194,721235,721387-721389,721470,721495,722068-722069,722463,722465,722467,722470,722825,723281,723346,723728,723784,724300,724387,725292,727376,727388,727390,727395,727397,727402,727492,727701,728022,731896,731934,731941,73234 7,732678,732686,732689,732693,732703,732715-732716,732719,732728,732730,732734-732738,732740,732742-732743,732745,732867,732883,733057-733059,733061,733080,734092,734366,734375,734400,734709,735401 Modified: jackrabbit/branches/1.5/jackrabbit-ocm/pom.xml URL: http://svn.apache.org/viewvc/jackrabbit/branches/1.5/jackrabbit-ocm/pom.xml?rev=743331&r1=743330&r2=743331&view=diff ============================================================================== --- jackrabbit/branches/1.5/jackrabbit-ocm/pom.xml (original) +++ jackrabbit/branches/1.5/jackrabbit-ocm/pom.xml Wed Feb 11 13:20:45 2009 @@ -33,6 +33,7 @@ ../jackrabbit-parent/pom.xml jackrabbit-ocm + 1.5.3-SNAPSHOT Jackrabbit Object Content Mapping This Jackrabbit subproject is an object/JCR persistence and Modified: jackrabbit/branches/1.5/jackrabbit-ocm/src/main/java/org/apache/jackrabbit/ocm/mapper/impl/annotation/AnnotationDescriptorReader.java URL: http://svn.apache.org/viewvc/jackrabbit/branches/1.5/jackrabbit-ocm/src/main/java/org/apache/jackrabbit/ocm/mapper/impl/annotation/AnnotationDescriptorReader.java?rev=743331&r1=743330&r2=743331&view=diff ============================================================================== --- jackrabbit/branches/1.5/jackrabbit-ocm/src/main/java/org/apache/jackrabbit/ocm/mapper/impl/annotation/AnnotationDescriptorReader.java (original) +++ jackrabbit/branches/1.5/jackrabbit-ocm/src/main/java/org/apache/jackrabbit/ocm/mapper/impl/annotation/AnnotationDescriptorReader.java Wed Feb 11 13:20:45 2009 @@ -291,13 +291,13 @@ // If only one type argument, the object is certainly a collection if (paramType.length == 1) { - collectionDescriptor.setElementClassName(paramType[0].toString().replace("class ", "")); + collectionDescriptor.setElementClassName(paramType[0].toString().replace("class ", "").replace("interface ", "")); } // either, it is certainly a map else { - collectionDescriptor.setElementClassName(paramType[1].toString().replace("class ", "")); + collectionDescriptor.setElementClassName(paramType[1].toString().replace("class ", "").replace("interface ", "")); } } Modified: jackrabbit/branches/1.5/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/AnnotationTestBase.java URL: http://svn.apache.org/viewvc/jackrabbit/branches/1.5/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/AnnotationTestBase.java?rev=743331&r1=743330&r2=743331&view=diff ============================================================================== --- jackrabbit/branches/1.5/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/AnnotationTestBase.java (original) +++ jackrabbit/branches/1.5/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/AnnotationTestBase.java Wed Feb 11 13:20:45 2009 @@ -67,8 +67,11 @@ import org.apache.jackrabbit.ocm.testmodel.interfaces.CmsObject; import org.apache.jackrabbit.ocm.testmodel.interfaces.Content; import org.apache.jackrabbit.ocm.testmodel.interfaces.Document; +import org.apache.jackrabbit.ocm.testmodel.interfaces.EntityA; +import org.apache.jackrabbit.ocm.testmodel.interfaces.EntityB; import org.apache.jackrabbit.ocm.testmodel.interfaces.Folder; import org.apache.jackrabbit.ocm.testmodel.interfaces.Interface; +import org.apache.jackrabbit.ocm.testmodel.interfaces.MyInterface; import org.apache.jackrabbit.ocm.testmodel.version.Author; import org.apache.jackrabbit.ocm.testmodel.version.PressRelease; @@ -173,6 +176,10 @@ classes.add(SimpleInterface.class); classes.add(Person.class); + classes.add(EntityA.class); + classes.add(EntityB.class); + classes.add(MyInterface.class); + Mapper mapper = new AnnotationMapperImpl(classes); ocm = new ObjectContentManagerImpl(session, mapper);