svn commit: r1356377 - in /sling/trunk/bundles/jcr/ocm: pom.xml src/main/java/org/apache/sling/jcr/ocm/impl/ObjectContentManagerFactoryImpl.java

[cz...@apache.org]

Author: cziegeler
Date: Mon Jul  2 17:48:45 2012
New Revision: 1356377

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

Modified:
    sling/trunk/bundles/jcr/ocm/pom.xml
    sling/trunk/bundles/jcr/ocm/src/main/java/org/apache/sling/jcr/ocm/impl/ObjectContentManagerFactoryImpl.java

Modified: sling/trunk/bundles/jcr/ocm/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/ocm/pom.xml?rev=1356377&r1=1356376&r2=1356377&view=diff
==============================================================================
--- sling/trunk/bundles/jcr/ocm/pom.xml (original)
+++ sling/trunk/bundles/jcr/ocm/pom.xml Mon Jul  2 17:48:45 2012
@@ -230,5 +230,10 @@
             <version>1.5.0</version>
             <scope>test</scope>
         </dependency>
+        
+        <dependency>
+            <groupId>org.apache.felix</groupId>
+            <artifactId>org.apache.felix.scr.annotations</artifactId>
+        </dependency>
     </dependencies>
 </project>

Modified: sling/trunk/bundles/jcr/ocm/src/main/java/org/apache/sling/jcr/ocm/impl/ObjectContentManagerFactoryImpl.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/ocm/src/main/java/org/apache/sling/jcr/ocm/impl/ObjectContentManagerFactoryImpl.java?rev=1356377&r1=1356376&r2=1356377&view=diff
==============================================================================
--- sling/trunk/bundles/jcr/ocm/src/main/java/org/apache/sling/jcr/ocm/impl/ObjectContentManagerFactoryImpl.java (original)
+++ sling/trunk/bundles/jcr/ocm/src/main/java/org/apache/sling/jcr/ocm/impl/ObjectContentManagerFactoryImpl.java Mon Jul  2 17:48:45 2012
@@ -37,6 +37,13 @@ import javax.jcr.RepositoryException;
 import javax.jcr.Session;
 import javax.jcr.ValueFactory;
 
+import org.apache.felix.scr.annotations.Component;
+import org.apache.felix.scr.annotations.Properties;
+import org.apache.felix.scr.annotations.Property;
+import org.apache.felix.scr.annotations.Reference;
+import org.apache.felix.scr.annotations.ReferenceCardinality;
+import org.apache.felix.scr.annotations.ReferencePolicy;
+import org.apache.felix.scr.annotations.Service;
 import org.apache.jackrabbit.ocm.manager.ObjectContentManager;
 import org.apache.jackrabbit.ocm.manager.atomictypeconverter.AtomicTypeConverterProvider;
 import org.apache.jackrabbit.ocm.manager.cache.ObjectCache;
@@ -65,18 +72,19 @@ import org.xmlpull.v1.XmlPullParserExcep
 /**
  * The <code>ObjectContentManagerFactory</code> TODO
  *
- * @scr.component metatype="no" immediate="true"
- * @scr.service interface="org.apache.sling.jcr.ocm.ObjectContentManagerFactory"
- * @scr.property name="service.description"
- *               value="Sling Object Content Manager Factory"
- * @scr.property name="service.vendor" value="The Apache Software Foundation"
  */
+@Component
+@Service(value=ObjectContentManagerFactory.class)
+@Properties({
+    @Property(name="service.description", value="Sling Object Content Manager Factory"),
+    @Property(name="service.vendor", value="The Apache Software Foundation")
+})
 public class ObjectContentManagerFactoryImpl implements ObjectContentManagerFactory, SynchronousBundleListener {
 
     /** default log */
     private static final Logger log = LoggerFactory.getLogger(ObjectContentManagerFactoryImpl.class);
 
-    /** scr.reference cardinality="0..1" policy="dynamic" */
+    @Reference(cardinality=ReferenceCardinality.OPTIONAL_UNARY, policy=ReferencePolicy.DYNAMIC)
     private EventAdmin eventAdmin;
 
     /**