clerezza git commit: CLEREZZA-984: fixing classes using old scr annotations

[re...@apache.org]

Repository: clerezza
Updated Branches:
  refs/heads/rdf-commons 36b8bdf4f -> 878dd9b3a


CLEREZZA-984: fixing classes using old scr annotations

Project: http://git-wip-us.apache.org/repos/asf/clerezza/repo
Commit: http://git-wip-us.apache.org/repos/asf/clerezza/commit/878dd9b3
Tree: http://git-wip-us.apache.org/repos/asf/clerezza/tree/878dd9b3
Diff: http://git-wip-us.apache.org/repos/asf/clerezza/diff/878dd9b3

Branch: refs/heads/rdf-commons
Commit: 878dd9b3a9dc0d3ef58695639d98285a50ccd7a7
Parents: 36b8bdf
Author: Reto Gmuer <re...@apache.org>
Authored: Mon Apr 13 18:11:14 2015 +0000
Committer: Reto Gmuer <re...@apache.org>
Committed: Mon Apr 13 18:11:14 2015 +0000

----------------------------------------------------------------------
 .../clerezza/platform/content/InfoDiscobitWriter.java       | 9 ++++++---
 .../clerezza/platform/content/TitledContentRenderlet.java   | 7 +++++--
 2 files changed, 11 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/clerezza/blob/878dd9b3/platform/content/src/main/java/org/apache/clerezza/platform/content/InfoDiscobitWriter.java
----------------------------------------------------------------------
diff --git a/platform/content/src/main/java/org/apache/clerezza/platform/content/InfoDiscobitWriter.java b/platform/content/src/main/java/org/apache/clerezza/platform/content/InfoDiscobitWriter.java
index e3a2aa4..1c99a02 100644
--- a/platform/content/src/main/java/org/apache/clerezza/platform/content/InfoDiscobitWriter.java
+++ b/platform/content/src/main/java/org/apache/clerezza/platform/content/InfoDiscobitWriter.java
@@ -29,16 +29,19 @@ import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.MultivaluedMap;
 import javax.ws.rs.ext.MessageBodyWriter;
 import javax.ws.rs.ext.Provider;
+import org.apache.felix.scr.annotations.Component;
+import org.apache.felix.scr.annotations.Property;
+import org.apache.felix.scr.annotations.Service;
 
 
 /**
  * 
- * @scr.component
- * @scr.service interface="java.lang.Object"
- * @scr.property name="javax.ws.rs" type="Boolean" value="true"
  *
  * @author reto
  */
+@Component
+@Service(Object.class)
+@Property(name = "javax.ws.rs", boolValue = true)
 @Provider
 @Produces("*/*")
 public class InfoDiscobitWriter implements MessageBodyWriter<InfoDiscobit> {

http://git-wip-us.apache.org/repos/asf/clerezza/blob/878dd9b3/platform/content/src/main/java/org/apache/clerezza/platform/content/TitledContentRenderlet.java
----------------------------------------------------------------------
diff --git a/platform/content/src/main/java/org/apache/clerezza/platform/content/TitledContentRenderlet.java b/platform/content/src/main/java/org/apache/clerezza/platform/content/TitledContentRenderlet.java
index 02d36a0..aa1fab0 100644
--- a/platform/content/src/main/java/org/apache/clerezza/platform/content/TitledContentRenderlet.java
+++ b/platform/content/src/main/java/org/apache/clerezza/platform/content/TitledContentRenderlet.java
@@ -37,6 +37,9 @@ import org.apache.clerezza.commons.rdf.RDFTerm;
 import org.apache.clerezza.commons.rdf.IRI;
 import org.apache.clerezza.rdf.ontologies.DISCOBITS;
 import org.apache.clerezza.rdf.utils.GraphNode;
+import org.apache.felix.scr.annotations.Component;
+import org.apache.felix.scr.annotations.Property;
+import org.apache.felix.scr.annotations.Service;
 
 /**
  * A renderlet for rendering TitledContent. The contained elements are rendered
@@ -47,9 +50,9 @@ import org.apache.clerezza.rdf.utils.GraphNode;
  *
  * @author rbn, mir
  *
- * @scr.component
- * @scr.service interface="org.apache.clerezza.platform.typerendering.Renderlet"
  */
+@Component
+@Service(Renderlet.class)
 public class TitledContentRenderlet implements Renderlet {
 
     private static ThreadLocal<Integer> headingLevel  = new ThreadLocal<Integer>() {