incubator-sling-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cziege...@apache.org
Subject svn commit: r1357141 - in /sling/trunk/contrib/jcr/prefs: pom.xml src/main/java/org/apache/sling/jcr/prefs/impl/JcrBackingStore.java
Date Wed, 04 Jul 2012 07:56:20 GMT
Author: cziegeler
Date: Wed Jul  4 07:56:19 2012
New Revision: 1357141

URL: http://svn.apache.org/viewvc?rev=1357141&view=rev
Log:
SLING-2363 : Replace JavaDoc SCR annotations with Java SCR annotations

Modified:
    sling/trunk/contrib/jcr/prefs/pom.xml
    sling/trunk/contrib/jcr/prefs/src/main/java/org/apache/sling/jcr/prefs/impl/JcrBackingStore.java

Modified: sling/trunk/contrib/jcr/prefs/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/jcr/prefs/pom.xml?rev=1357141&r1=1357140&r2=1357141&view=diff
==============================================================================
--- sling/trunk/contrib/jcr/prefs/pom.xml (original)
+++ sling/trunk/contrib/jcr/prefs/pom.xml Wed Jul  4 07:56:19 2012
@@ -92,5 +92,9 @@
             <groupId>javax.jcr</groupId>
             <artifactId>jcr</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.apache.felix</groupId>
+            <artifactId>org.apache.felix.scr.annotations</artifactId>
+        </dependency>
     </dependencies>
 </project>

Modified: sling/trunk/contrib/jcr/prefs/src/main/java/org/apache/sling/jcr/prefs/impl/JcrBackingStore.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/jcr/prefs/src/main/java/org/apache/sling/jcr/prefs/impl/JcrBackingStore.java?rev=1357141&r1=1357140&r2=1357141&view=diff
==============================================================================
--- sling/trunk/contrib/jcr/prefs/src/main/java/org/apache/sling/jcr/prefs/impl/JcrBackingStore.java
(original)
+++ sling/trunk/contrib/jcr/prefs/src/main/java/org/apache/sling/jcr/prefs/impl/JcrBackingStore.java
Wed Jul  4 07:56:19 2012
@@ -35,18 +35,21 @@ import org.apache.felix.prefs.BackingSto
 import org.apache.felix.prefs.BackingStoreManager;
 import org.apache.felix.prefs.PreferencesDescription;
 import org.apache.felix.prefs.PreferencesImpl;
+import org.apache.felix.scr.annotations.Component;
+import org.apache.felix.scr.annotations.Properties;
+import org.apache.felix.scr.annotations.Reference;
+import org.apache.felix.scr.annotations.Service;
 import org.apache.sling.jcr.api.SlingRepository;
 import org.osgi.service.component.ComponentContext;
 import org.osgi.service.prefs.BackingStoreException;
 
-/**
- * @scr.component metatype="false"
- * @scr.service interface="org.apache.felix.prefs.BackingStore"
- *
- * @scr.property name="sling.preferences.jcr.path" value="/preferences";
- * @scr.property name="sling.preferences.jcr.namespace" value="http://osgi.org/service/prefs/Preferences/1.1";
- * @scr.property name="sling.preferences.jcr.prefix" value="osgipref";
- */
+@Component
+@Service(value=BackingStore.class)
+@Properties({
+    @org.apache.felix.scr.annotations.Property(name="sling.preferences.jcr.path", value="/preferences"),
+    @org.apache.felix.scr.annotations.Property(name="sling.preferences.jcr.namespace",value="http://osgi.org/service/prefs/Preferences/1.1"),
+    @org.apache.felix.scr.annotations.Property(name="sling.preferences.jcr.prefix", value="osgipref")
+})
 public class JcrBackingStore implements BackingStore {
 
     protected static final String NS_URI = "http://osgi.org/service/prefs/Preferences/1.1";
@@ -55,7 +58,7 @@ public class JcrBackingStore implements 
     protected static final String NAMESPACE_PROPERTY = "sling.preferences.jcr.namespace";
     protected static final String NAMESPACE_PREFIX_PROPERTY = "sling.preferences.jcr.prefix";
 
-    /** @scr.reference */
+    @Reference
     protected SlingRepository repository;
 
     protected boolean initialized = false;



Mime
View raw message