From commits-return-10661-apmail-jackrabbit-commits-archive=jackrabbit.apache.org@jackrabbit.apache.org Thu Dec 09 17:31:51 2010 Return-Path: Delivered-To: apmail-jackrabbit-commits-archive@www.apache.org Received: (qmail 87529 invoked from network); 9 Dec 2010 17:31:51 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 9 Dec 2010 17:31:51 -0000 Received: (qmail 4809 invoked by uid 500); 9 Dec 2010 17:31:51 -0000 Delivered-To: apmail-jackrabbit-commits-archive@jackrabbit.apache.org Received: (qmail 4708 invoked by uid 500); 9 Dec 2010 17:31:50 -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 4701 invoked by uid 99); 9 Dec 2010 17:31:50 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 09 Dec 2010 17:31:50 +0000 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; Thu, 09 Dec 2010 17:31:50 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 0C6B023888D2; Thu, 9 Dec 2010 17:31:30 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1044046 - in /jackrabbit/sandbox/osgi: jackrabbit-bundle-it/src/test/java/org/apache/jackrabbit/test/osgi/BundleTest.java jackrabbit-bundle/src/main/java/org/apache/jackrabbit/bundle/Activator.java Date: Thu, 09 Dec 2010 17:31:29 -0000 To: commits@jackrabbit.apache.org From: jukka@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20101209173130.0C6B023888D2@eris.apache.org> Author: jukka Date: Thu Dec 9 17:31:29 2010 New Revision: 1044046 URL: http://svn.apache.org/viewvc?rev=1044046&view=rev Log: JCR-2608: Making Jackrabbit content repo usable from OSGi (Equinox) Add service properties for the repository service. Assertions in the bundle test case. Modified: jackrabbit/sandbox/osgi/jackrabbit-bundle-it/src/test/java/org/apache/jackrabbit/test/osgi/BundleTest.java jackrabbit/sandbox/osgi/jackrabbit-bundle/src/main/java/org/apache/jackrabbit/bundle/Activator.java Modified: jackrabbit/sandbox/osgi/jackrabbit-bundle-it/src/test/java/org/apache/jackrabbit/test/osgi/BundleTest.java URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/osgi/jackrabbit-bundle-it/src/test/java/org/apache/jackrabbit/test/osgi/BundleTest.java?rev=1044046&r1=1044045&r2=1044046&view=diff ============================================================================== --- jackrabbit/sandbox/osgi/jackrabbit-bundle-it/src/test/java/org/apache/jackrabbit/test/osgi/BundleTest.java (original) +++ jackrabbit/sandbox/osgi/jackrabbit-bundle-it/src/test/java/org/apache/jackrabbit/test/osgi/BundleTest.java Thu Dec 9 17:31:29 2010 @@ -18,11 +18,12 @@ package org.apache.jackrabbit.test.osgi; import javax.jcr.Repository; +import junit.framework.Assert; + import org.apache.jackrabbit.commons.JcrUtils; import org.junit.Test; import org.junit.runner.RunWith; import org.ops4j.pax.exam.junit.MavenConfiguredJUnit4TestRunner; -import org.osgi.framework.Bundle; import org.osgi.framework.BundleContext; import org.osgi.framework.ServiceReference; @@ -31,13 +32,18 @@ public class BundleTest { @Test public void testJackrabbitBundle(BundleContext context) throws Exception { - for (Bundle bundle : context.getBundles()) { - System.out.println("Bundle: " + bundle.getSymbolicName() + " " + bundle.getState()); - } - for (ServiceReference reference : context.getServiceReferences(Repository.class.getName(), null)) { - System.out.println("Service: " + reference); - } - System.out.println("Repository: " + JcrUtils.getRepository()); + ServiceReference reference = + context.getServiceReference(Repository.class.getName()); + Assert.assertNotNull(reference); + Assert.assertEquals( + "Jackrabbit", + reference.getProperty(Repository.REP_NAME_DESC)); + + Repository repository = JcrUtils.getRepository(); + Assert.assertNotNull(repository); + Assert.assertEquals( + "Jackrabbit", + repository.getDescriptor(Repository.REP_NAME_DESC)); } } Modified: jackrabbit/sandbox/osgi/jackrabbit-bundle/src/main/java/org/apache/jackrabbit/bundle/Activator.java URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/osgi/jackrabbit-bundle/src/main/java/org/apache/jackrabbit/bundle/Activator.java?rev=1044046&r1=1044045&r2=1044046&view=diff ============================================================================== --- jackrabbit/sandbox/osgi/jackrabbit-bundle/src/main/java/org/apache/jackrabbit/bundle/Activator.java (original) +++ jackrabbit/sandbox/osgi/jackrabbit-bundle/src/main/java/org/apache/jackrabbit/bundle/Activator.java Thu Dec 9 17:31:29 2010 @@ -35,20 +35,25 @@ public class Activator implements Bundle private volatile ServiceRegistration registration; public void start(BundleContext context) throws Exception { - System.out.println("Starting repository"); repository = RepositoryImpl.create( RepositoryConfig.install(new File("jackrabbit"))); RepositoryFactoryImpl.setDefaultRepository(repository); + + Hashtable properties = new Hashtable(); + for (String key : repository.getDescriptorKeys()) { + String descriptor = repository.getDescriptor(key); + if (descriptor != null) { + properties.put(key, descriptor); + } + } registration = context.registerService( - Repository.class.getName(), - repository, - new Hashtable()); + Repository.class.getName(), repository, properties); } public void stop(BundleContext context) throws Exception { - System.out.println("Stopping repository"); - RepositoryFactoryImpl.setDefaultRepository(null); registration.unregister(); + + RepositoryFactoryImpl.setDefaultRepository(null); repository.shutdown(); }