Return-Path: Delivered-To: apmail-jackrabbit-commits-archive@www.apache.org Received: (qmail 67875 invoked from network); 7 May 2007 19:23:52 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 7 May 2007 19:23:52 -0000 Received: (qmail 91412 invoked by uid 500); 7 May 2007 19:23:58 -0000 Delivered-To: apmail-jackrabbit-commits-archive@jackrabbit.apache.org Received: (qmail 91327 invoked by uid 500); 7 May 2007 19:23:58 -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 91318 invoked by uid 99); 7 May 2007 19:23:58 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 07 May 2007 12:23:58 -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, 07 May 2007 12:23:50 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 42F681A9838; Mon, 7 May 2007 12:23:30 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r535958 - in /jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping: ./ src/docbook/ src/java/ src/main/ src/main/java/ src/test-config/ src/test-data/ src/test/java/ src/test/java/org/ src/test/java/org/apache/portals/graffito/jcr/ s... Date: Mon, 07 May 2007 19:23:29 -0000 To: commits@jackrabbit.apache.org From: clombart@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20070507192330.42F681A9838@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: clombart Date: Mon May 7 12:23:28 2007 New Revision: 535958 URL: http://svn.apache.org/viewvc?view=rev&rev=535958 Log: Upgrade to Maven 2 (see issue JCR-865) Added: jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/pom.xml jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/ jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/ - copied from r534987, jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/java/ jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/ jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/ - copied from r534987, jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/org/ jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/test-config/ - copied from r534987, jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test-config/ jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/test-data/ - copied from r534987, jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test-data/ Removed: jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/CHANGES jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/locator.ent jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/locator.path jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/maven.xml jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/project.properties jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/project.xml jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/docbook/ jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/java/ jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test-config/ jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test-data/ jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/org/ Modified: jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/portals/graffito/jcr/RepositoryLifecycleTestSetup.java jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/portals/graffito/jcr/TestBase.java jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/portals/graffito/jcr/mapper/DigesterMapperImplTest.java jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/portals/graffito/jcr/persistence/auto/PersistenceManagerAutoTest.java jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/portals/graffito/jcr/persistence/basic/PersistenceManagerAvoidRecursiveLoopTest.java jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/portals/graffito/jcr/persistence/basic/PersistenceManagerSameNameSiblingTest.java jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/portals/graffito/jcr/repository/RepositoryUtilTest.java Added: jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/pom.xml URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/pom.xml?view=auto&rev=535958 ============================================================================== --- jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/pom.xml (added) +++ jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/pom.xml Mon May 7 12:23:28 2007 @@ -0,0 +1,174 @@ + + + + + + 4.0.0 + + + + + jackrabbit-ocm + org.apache.jackrabbit + 1.0-SNAPSHOT + jar + Jackrabbit Object Content Maping + This Jackrabbit subproject is an object/JCR persistence and query service. This tools lets you to persist java objects into a JCR compliant repository - including association, inheritance, polymorphism, composition, and the Java collections framework. Furthermore, this jcr-mapping allows you to express queries in Java-based Criteria, as well as in JCR query language. It offers also features like version support and object locking. + 2007 + + + + + + + javax.jcr + jcr + 1.0 + + + + org.apache.jackrabbit + jackrabbit-api + 1.4-SNAPSHOT + + + org.apache.jackrabbit + jackrabbit-core + 1.4-SNAPSHOT + + + org.apache.jackrabbit + jackrabbit-jcr-commons + 1.4-SNAPSHOT + + + org.apache.lucene + lucene-core + 2.0.0 + + + commons-collections + commons-collections + 3.1 + + + commons-beanutils + commons-beanutils + 1.7.0 + + + commons-digester + commons-digester + 1.7 + + + commons-logging + commons-logging + 1.0.2 + + + commons-lang + commons-lang + 2.1 + + + log4j + log4j + 1.2.8 + + + cglib + cglib-full + 2.0.2 + + + org.slf4j + slf4j-log4j12 + 1.0 + + + + + + geronimo-spec + geronimo-spec-jta + 1.0-M1 + test + + + xerces + xercesImpl + 2.6.2 + test + + + xerces + xmlParserAPIs + 2.0.2 + test + + + org.apache.derby + derby + 10.1.1.0 + test + + + + junit + junit + 3.8.1 + test + + + + + + + + + Modified: jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/portals/graffito/jcr/RepositoryLifecycleTestSetup.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/portals/graffito/jcr/RepositoryLifecycleTestSetup.java?view=diff&rev=535958&r1=534987&r2=535958 ============================================================================== --- jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/portals/graffito/jcr/RepositoryLifecycleTestSetup.java (original) +++ jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/portals/graffito/jcr/RepositoryLifecycleTestSetup.java Mon May 7 12:23:28 2007 @@ -37,7 +37,7 @@ super.setUp(); System.out.println("registering repository ... "); RepositoryUtil.registerRepository("repositoryTest", - "./src/test-config/repository-derby.xml", "./target/repository"); + "./src/test/test-config/repository-derby.xml", "./target/repository"); } /** Modified: jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/portals/graffito/jcr/TestBase.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/portals/graffito/jcr/TestBase.java?view=diff&rev=535958&r1=534987&r2=535958 ============================================================================== --- jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/portals/graffito/jcr/TestBase.java (original) +++ jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/portals/graffito/jcr/TestBase.java Mon May 7 12:23:28 2007 @@ -167,7 +167,7 @@ protected void registerNodeTypes(Session session) throws InvalidNodeTypeDefException, javax.jcr.RepositoryException, IOException { InputStream xml = new FileInputStream( - "./src/test-config/nodetypes/custom_nodetypes.xml"); + "./src/test/test-config/nodetypes/custom_nodetypes.xml"); // HINT: throws InvalidNodeTypeDefException, IOException NodeTypeDef[] types = NodeTypeReader.read(xml); @@ -193,13 +193,13 @@ protected void initPersistenceManager() throws UnsupportedRepositoryOperationException, javax.jcr.RepositoryException { Repository repository = RepositoryUtil.getRepository("repositoryTest"); - String[] files = { "./src/test-config/jcrmapping.xml", - "./src/test-config/jcrmapping-proxy.xml", - "./src/test-config/jcrmapping-atomic.xml", - "./src/test-config/jcrmapping-beandescriptor.xml", - "./src/test-config/jcrmapping-inheritance.xml", - "./src/test-config/jcrmapping-jcrnodetypes.xml", - "./src/test-config/jcrmapping-uuid.xml"}; + String[] files = { "./src/test/test-config/jcrmapping.xml", + "./src/test/test-config/jcrmapping-proxy.xml", + "./src/test/test-config/jcrmapping-atomic.xml", + "./src/test/test-config/jcrmapping-beandescriptor.xml", + "./src/test/test-config/jcrmapping-inheritance.xml", + "./src/test/test-config/jcrmapping-jcrnodetypes.xml", + "./src/test/test-config/jcrmapping-uuid.xml"}; session = RepositoryUtil.login(repository, "superuser", "superuser"); persistenceManager = new PersistenceManagerImpl(session, files); Modified: jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/portals/graffito/jcr/mapper/DigesterMapperImplTest.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/portals/graffito/jcr/mapper/DigesterMapperImplTest.java?view=diff&rev=535958&r1=534987&r2=535958 ============================================================================== --- jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/portals/graffito/jcr/mapper/DigesterMapperImplTest.java (original) +++ jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/portals/graffito/jcr/mapper/DigesterMapperImplTest.java Mon May 7 12:23:28 2007 @@ -70,7 +70,7 @@ try { Mapper mapper = new DigesterMapperImpl( - "./src/test-config/jcrmapping-testdigester.xml"); + "./src/test/test-config/jcrmapping-testdigester.xml"); assertNotNull("Mapper is null", mapper); @@ -107,7 +107,7 @@ try { Mapper mapper = new DigesterMapperImpl( - "./src/test-config/jcrmapping-testdigester.xml"); + "./src/test/test-config/jcrmapping-testdigester.xml"); assertNotNull("Mapper is null", mapper); @@ -128,7 +128,7 @@ public void testDiscriminatorSetting() { try { - Mapper mapper = new DigesterMapperImpl("./src/test-config/jcrmapping-testdigester.xml"); + Mapper mapper = new DigesterMapperImpl("./src/test/test-config/jcrmapping-testdigester.xml"); assertNotNull("Mapper is null", mapper); @@ -149,8 +149,8 @@ public void testMapperOptionalProperties() { try { - String[] files = { "./src/test-config/jcrmapping.xml", - "./src/test-config/jcrmapping-jcrnodetypes.xml"}; + String[] files = { "./src/test/test-config/jcrmapping.xml", + "./src/test/test-config/jcrmapping-jcrnodetypes.xml"}; Mapper mapper = new DigesterMapperImpl(files); @@ -234,10 +234,10 @@ */ public void testMapperNtHierarchy() { try { - String[] files = { "./src/test-config/jcrmapping.xml", - "./src/test-config/jcrmapping-atomic.xml", - "./src/test-config/jcrmapping-beandescriptor.xml", - "./src/test-config/jcrmapping-inheritance.xml" }; + String[] files = { "./src/test/test-config/jcrmapping.xml", + "./src/test/test-config/jcrmapping-atomic.xml", + "./src/test/test-config/jcrmapping-beandescriptor.xml", + "./src/test/test-config/jcrmapping-inheritance.xml" }; Mapper mapper = new DigesterMapperImpl(files); @@ -330,11 +330,11 @@ */ public void testMapperNtConcreteClass() { try { - String[] files = { "./src/test-config/jcrmapping.xml", - "./src/test-config/jcrmapping-atomic.xml", - "./src/test-config/jcrmapping-beandescriptor.xml", - "./src/test-config/jcrmapping-inheritance.xml" }; - // String[] files = { "./src/test-config/jcrmapping-inheritance.xml"}; + String[] files = { "./src/test/test-config/jcrmapping.xml", + "./src/test/test-config/jcrmapping-atomic.xml", + "./src/test/test-config/jcrmapping-beandescriptor.xml", + "./src/test/test-config/jcrmapping-inheritance.xml" }; + // String[] files = { "./src/test/test-config/jcrmapping-inheritance.xml"}; Mapper mapper = new DigesterMapperImpl(files); @@ -396,7 +396,7 @@ */ public void testInterfaceWithDiscriminator() { try { - String[] files = {"./src/test-config/jcrmapping-inheritance.xml"}; + String[] files = {"./src/test/test-config/jcrmapping-inheritance.xml"}; Mapper mapper = new DigesterMapperImpl(files); assertNotNull("Mapper is null", mapper); @@ -436,7 +436,7 @@ public void testInterfaceWithoutDiscriminator() { try { - String[] files = {"./src/test-config/jcrmapping-inheritance.xml"}; + String[] files = {"./src/test/test-config/jcrmapping-inheritance.xml"}; Mapper mapper = new DigesterMapperImpl(files); assertNotNull("Mapper is null", mapper); @@ -487,7 +487,7 @@ */ public void testProxy() { try { - String[] files = { "./src/test-config/jcrmapping-proxy.xml" }; + String[] files = { "./src/test/test-config/jcrmapping-proxy.xml" }; Mapper mapper = new DigesterMapperImpl(files); assertNotNull("Mapper is null", mapper); Modified: jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/portals/graffito/jcr/persistence/auto/PersistenceManagerAutoTest.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/portals/graffito/jcr/persistence/auto/PersistenceManagerAutoTest.java?view=diff&rev=535958&r1=534987&r2=535958 ============================================================================== --- jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/portals/graffito/jcr/persistence/auto/PersistenceManagerAutoTest.java (original) +++ jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/portals/graffito/jcr/persistence/auto/PersistenceManagerAutoTest.java Mon May 7 12:23:28 2007 @@ -147,7 +147,7 @@ protected void initPersistenceManager() throws UnsupportedRepositoryOperationException, javax.jcr.RepositoryException { Repository repository = RepositoryUtil.getRepository("repositoryTest"); - String[] files = { "./src/test-config/jcrmapping-auto.xml"}; + String[] files = { "./src/test/test-config/jcrmapping-auto.xml"}; session = RepositoryUtil.login(repository, "superuser", "superuser"); persistenceManager = new PersistenceManagerImpl(session, files); Modified: jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/portals/graffito/jcr/persistence/basic/PersistenceManagerAvoidRecursiveLoopTest.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/portals/graffito/jcr/persistence/basic/PersistenceManagerAvoidRecursiveLoopTest.java?view=diff&rev=535958&r1=534987&r2=535958 ============================================================================== --- jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/portals/graffito/jcr/persistence/basic/PersistenceManagerAvoidRecursiveLoopTest.java (original) +++ jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/portals/graffito/jcr/persistence/basic/PersistenceManagerAvoidRecursiveLoopTest.java Mon May 7 12:23:28 2007 @@ -139,7 +139,7 @@ protected void initPersistenceManager() throws UnsupportedRepositoryOperationException, javax.jcr.RepositoryException { Repository repository = RepositoryUtil.getRepository("repositoryTest"); - String[] files = { "./src/test-config/jcrmapping-avoidrecursiveloop.xml" }; + String[] files = { "./src/test/test-config/jcrmapping-avoidrecursiveloop.xml" }; session = RepositoryUtil.login(repository, "superuser", "superuser"); persistenceManager = new PersistenceManagerImpl(session, files); Modified: jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/portals/graffito/jcr/persistence/basic/PersistenceManagerSameNameSiblingTest.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/portals/graffito/jcr/persistence/basic/PersistenceManagerSameNameSiblingTest.java?view=diff&rev=535958&r1=534987&r2=535958 ============================================================================== --- jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/portals/graffito/jcr/persistence/basic/PersistenceManagerSameNameSiblingTest.java (original) +++ jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/portals/graffito/jcr/persistence/basic/PersistenceManagerSameNameSiblingTest.java Mon May 7 12:23:28 2007 @@ -226,7 +226,7 @@ protected void initPersistenceManager() throws UnsupportedRepositoryOperationException, javax.jcr.RepositoryException { Repository repository = RepositoryUtil.getRepository("repositoryTest"); - String[] files = { "./src/test-config/jcrmapping-sibling.xml" }; + String[] files = { "./src/test/test-config/jcrmapping-sibling.xml" }; session = RepositoryUtil.login(repository, "superuser", "superuser"); Modified: jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/portals/graffito/jcr/repository/RepositoryUtilTest.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/portals/graffito/jcr/repository/RepositoryUtilTest.java?view=diff&rev=535958&r1=534987&r2=535958 ============================================================================== --- jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/portals/graffito/jcr/repository/RepositoryUtilTest.java (original) +++ jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/portals/graffito/jcr/repository/RepositoryUtilTest.java Mon May 7 12:23:28 2007 @@ -73,7 +73,7 @@ return new TestSetup(suite) { protected void setUp() throws Exception { super.setUp(); - RepositoryUtil.registerRepository("repositoryTest", "src/test-config/repository-xml.xml", "target/repository"); + RepositoryUtil.registerRepository("repositoryTest", "./src/test/test-config/repository-xml.xml", "target/repository"); } protected void tearDown() throws Exception {