Return-Path: X-Original-To: apmail-sling-commits-archive@www.apache.org Delivered-To: apmail-sling-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id A5CBFDE7B for ; Wed, 4 Jul 2012 07:54:37 +0000 (UTC) Received: (qmail 53339 invoked by uid 500); 4 Jul 2012 07:54:37 -0000 Delivered-To: apmail-sling-commits-archive@sling.apache.org Received: (qmail 52795 invoked by uid 500); 4 Jul 2012 07:54:36 -0000 Mailing-List: contact commits-help@sling.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@sling.apache.org Delivered-To: mailing list commits@sling.apache.org Received: (qmail 52229 invoked by uid 99); 4 Jul 2012 07:54:35 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 04 Jul 2012 07:54:35 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 04 Jul 2012 07:54:34 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 7FB6F23889BB; Wed, 4 Jul 2012 07:54:14 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1357139 - in /sling/trunk/contrib/jcr/jackrabbit-client: pom.xml src/main/java/org/apache/sling/jcr/jackrabbit/client/SlingClientRepository.java Date: Wed, 04 Jul 2012 07:54:14 -0000 To: commits@sling.apache.org From: cziegeler@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120704075414.7FB6F23889BB@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: cziegeler Date: Wed Jul 4 07:54:13 2012 New Revision: 1357139 URL: http://svn.apache.org/viewvc?rev=1357139&view=rev Log: SLING-2363 : Replace JavaDoc SCR annotations with Java SCR annotations Modified: sling/trunk/contrib/jcr/jackrabbit-client/pom.xml sling/trunk/contrib/jcr/jackrabbit-client/src/main/java/org/apache/sling/jcr/jackrabbit/client/SlingClientRepository.java Modified: sling/trunk/contrib/jcr/jackrabbit-client/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/contrib/jcr/jackrabbit-client/pom.xml?rev=1357139&r1=1357138&r2=1357139&view=diff ============================================================================== --- sling/trunk/contrib/jcr/jackrabbit-client/pom.xml (original) +++ sling/trunk/contrib/jcr/jackrabbit-client/pom.xml Wed Jul 4 07:54:13 2012 @@ -115,5 +115,9 @@ org.osgi org.osgi.compendium + + org.apache.felix + org.apache.felix.scr.annotations + Modified: sling/trunk/contrib/jcr/jackrabbit-client/src/main/java/org/apache/sling/jcr/jackrabbit/client/SlingClientRepository.java URL: http://svn.apache.org/viewvc/sling/trunk/contrib/jcr/jackrabbit-client/src/main/java/org/apache/sling/jcr/jackrabbit/client/SlingClientRepository.java?rev=1357139&r1=1357138&r2=1357139&view=diff ============================================================================== --- sling/trunk/contrib/jcr/jackrabbit-client/src/main/java/org/apache/sling/jcr/jackrabbit/client/SlingClientRepository.java (original) +++ sling/trunk/contrib/jcr/jackrabbit-client/src/main/java/org/apache/sling/jcr/jackrabbit/client/SlingClientRepository.java Wed Jul 4 07:54:13 2012 @@ -24,6 +24,10 @@ import java.util.Hashtable; import javax.jcr.Repository; +import org.apache.felix.scr.annotations.Component; +import org.apache.felix.scr.annotations.ConfigurationPolicy; +import org.apache.felix.scr.annotations.Properties; +import org.apache.felix.scr.annotations.Property; import org.apache.sling.jcr.api.SlingRepository; import org.apache.sling.jcr.base.AbstractSlingRepository; import org.osgi.service.log.LogService; @@ -31,24 +35,19 @@ import org.osgi.service.log.LogService; /** * The SlingClientRepository TODO * - * @scr.component label="%repository.name" description="%repository.description" - * name="org.apache.sling.jcr.jackrabbit.client.SlingClientRepository" - * configurationFactory="true" policy="require" - * - * @scr.property name="service.vendor" value="The Apache Software Foundation" - * @scr.property name="service.description" - * value="Factory for non-embedded JCR Repository Instances" - * - * @scr.property name="java.naming.factory.initial" - * value="org.apache.jackrabbit.core.jndi.provider.DummyInitialContextFactory" - * @scr.property name="java.naming.provider.url" value="http://sling.apache.org" */ +@Component(name="org.apache.sling.jcr.jackrabbit.client.SlingClientRepository", metatype=true, + description="%repository.description", label="%repository.name", configurationFactory=true, + policy=ConfigurationPolicy.REQUIRE) +@Properties({ + @Property(name="service.description", value="Factory for non-embedded JCR Repository Instances"), + @Property(name="java.naming.factory.initial", value="org.apache.jackrabbit.core.jndi.provider.DummyInitialContextFactory"), + @Property(name="java.naming.provider.url", value="http://sling.apache.org") +}) public class SlingClientRepository extends AbstractSlingRepository implements Repository, SlingRepository { - /** - * @scr.property value="jackrabbit" - */ + @Property(value="jackrabbit") public static final String REPOSITORY_NAME = "name"; //---------- Repository Publication ---------------------------------------