svn commit: r1357127 - in /sling/trunk/contrib/commons: fsclassloader/ fsclassloader/src/main/java/org/apache/sling/commons/fsclassloader/impl/ html/ html/src/main/java/org/apache/sling/commons/html/impl/

[cz...@apache.org]

Author: cziegeler
Date: Wed Jul  4 07:40:20 2012
New Revision: 1357127

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

Modified:
    sling/trunk/contrib/commons/fsclassloader/pom.xml
    sling/trunk/contrib/commons/fsclassloader/src/main/java/org/apache/sling/commons/fsclassloader/impl/FSClassLoaderProvider.java
    sling/trunk/contrib/commons/html/pom.xml
    sling/trunk/contrib/commons/html/src/main/java/org/apache/sling/commons/html/impl/HtmlParserImpl.java

Modified: sling/trunk/contrib/commons/fsclassloader/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/commons/fsclassloader/pom.xml?rev=1357127&r1=1357126&r2=1357127&view=diff
==============================================================================
--- sling/trunk/contrib/commons/fsclassloader/pom.xml (original)
+++ sling/trunk/contrib/commons/fsclassloader/pom.xml Wed Jul  4 07:40:20 2012
@@ -91,5 +91,9 @@
             <version>1.2.0</version>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>org.apache.felix</groupId>
+            <artifactId>org.apache.felix.scr.annotations</artifactId>
+        </dependency>
     </dependencies>
 </project>

Modified: sling/trunk/contrib/commons/fsclassloader/src/main/java/org/apache/sling/commons/fsclassloader/impl/FSClassLoaderProvider.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/commons/fsclassloader/src/main/java/org/apache/sling/commons/fsclassloader/impl/FSClassLoaderProvider.java?rev=1357127&r1=1357126&r2=1357127&view=diff
==============================================================================
--- sling/trunk/contrib/commons/fsclassloader/src/main/java/org/apache/sling/commons/fsclassloader/impl/FSClassLoaderProvider.java (original)
+++ sling/trunk/contrib/commons/fsclassloader/src/main/java/org/apache/sling/commons/fsclassloader/impl/FSClassLoaderProvider.java Wed Jul  4 07:40:20 2012
@@ -30,6 +30,9 @@ import java.net.URL;
 import java.util.ArrayList;
 import java.util.List;
 
+import org.apache.felix.scr.annotations.Component;
+import org.apache.felix.scr.annotations.Property;
+import org.apache.felix.scr.annotations.Service;
 import org.apache.sling.commons.classloader.ClassLoaderWriter;
 import org.apache.sling.commons.classloader.DynamicClassLoaderProvider;
 import org.osgi.service.component.ComponentContext;
@@ -38,10 +41,10 @@ import org.osgi.service.component.Compon
  * The <code>FSClassLoaderProvider</code> is a dynamic class loader privder
  * which uses the file system to store and read class files from.
  *
- * @scr.component metatype="false"
- * @scr.property name="service.vendor" value="The Apache Software Foundation"
- * @scr.property name="service.description" value="Provides FileSystem ClassLoaders"
  */
+@Component
+@Service
+@Property( name="service.vendor", value="The Apache Software Foundation")
 public class FSClassLoaderProvider
     implements DynamicClassLoaderProvider, ClassLoaderWriter {
 

Modified: sling/trunk/contrib/commons/html/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/commons/html/pom.xml?rev=1357127&r1=1357126&r2=1357127&view=diff
==============================================================================
--- sling/trunk/contrib/commons/html/pom.xml (original)
+++ sling/trunk/contrib/commons/html/pom.xml Wed Jul  4 07:40:20 2012
@@ -87,5 +87,9 @@
             <artifactId>tagsoup</artifactId>
             <version>1.2</version>
         </dependency>
+        <dependency>
+            <groupId>org.apache.felix</groupId>
+            <artifactId>org.apache.felix.scr.annotations</artifactId>
+        </dependency>
     </dependencies>
 </project>

Modified: sling/trunk/contrib/commons/html/src/main/java/org/apache/sling/commons/html/impl/HtmlParserImpl.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/commons/html/src/main/java/org/apache/sling/commons/html/impl/HtmlParserImpl.java?rev=1357127&r1=1357126&r2=1357127&view=diff
==============================================================================
--- sling/trunk/contrib/commons/html/src/main/java/org/apache/sling/commons/html/impl/HtmlParserImpl.java (original)
+++ sling/trunk/contrib/commons/html/src/main/java/org/apache/sling/commons/html/impl/HtmlParserImpl.java Wed Jul  4 07:40:20 2012
@@ -21,6 +21,8 @@ package org.apache.sling.commons.html.im
 import java.io.IOException;
 import java.io.InputStream;
 
+import org.apache.felix.scr.annotations.Component;
+import org.apache.felix.scr.annotations.Service;
 import org.apache.sling.commons.html.HtmlParser;
 import org.ccil.cowan.tagsoup.Parser;
 import org.w3c.dom.Document;
@@ -29,11 +31,8 @@ import org.xml.sax.InputSource;
 import org.xml.sax.SAXException;
 import org.xml.sax.ext.LexicalHandler;
 
-/**
- * @scr.component metatype="false"
- * @scr.service interface="HtmlParser"
- *
- */
+@Component
+@Service(value=HtmlParser.class)
 public class HtmlParserImpl implements HtmlParser {
 
     /**