incubator-sling-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cziege...@apache.org
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 GMT
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 @@
             <groupId>org.osgi</groupId>
             <artifactId>org.osgi.compendium</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.apache.felix</groupId>
+            <artifactId>org.apache.felix.scr.annotations</artifactId>
+        </dependency>
     </dependencies>
 </project>

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 <code>SlingClientRepository</code> 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 ---------------------------------------



Mime
View raw message