svn commit: r1356367 - in /sling/trunk/bundles/engine/src/main/java/org/apache/sling/engine/impl: SlingSettingsServiceImpl.java debug/RequestProgressTrackerLogFilter.java

[cz...@apache.org]

Author: cziegeler
Date: Mon Jul  2 17:31:09 2012
New Revision: 1356367

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

Modified:
    sling/trunk/bundles/engine/src/main/java/org/apache/sling/engine/impl/SlingSettingsServiceImpl.java
    sling/trunk/bundles/engine/src/main/java/org/apache/sling/engine/impl/debug/RequestProgressTrackerLogFilter.java

Modified: sling/trunk/bundles/engine/src/main/java/org/apache/sling/engine/impl/SlingSettingsServiceImpl.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/engine/src/main/java/org/apache/sling/engine/impl/SlingSettingsServiceImpl.java?rev=1356367&r1=1356366&r2=1356367&view=diff
==============================================================================
--- sling/trunk/bundles/engine/src/main/java/org/apache/sling/engine/impl/SlingSettingsServiceImpl.java (original)
+++ sling/trunk/bundles/engine/src/main/java/org/apache/sling/engine/impl/SlingSettingsServiceImpl.java Mon Jul  2 17:31:09 2012
@@ -18,21 +18,24 @@
  */
 package org.apache.sling.engine.impl;
 
+import org.apache.felix.scr.annotations.Component;
+import org.apache.felix.scr.annotations.Reference;
+import org.apache.felix.scr.annotations.Service;
 import org.apache.sling.engine.SlingSettingsService;
 
 /**
  * The implementation of the settings service has moved to the
  * settings module. This is just a wrapper for compatibility.
- * @scr.component metatype=false
- * @scr.service
  *
  * @deprecated
  */
+@Component
+@Service
 @Deprecated
 public class SlingSettingsServiceImpl
     implements SlingSettingsService {
 
-    /** @scr.reference */
+    @Reference
     private org.apache.sling.settings.SlingSettingsService settingsService;
 
     /**

Modified: sling/trunk/bundles/engine/src/main/java/org/apache/sling/engine/impl/debug/RequestProgressTrackerLogFilter.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/engine/src/main/java/org/apache/sling/engine/impl/debug/RequestProgressTrackerLogFilter.java?rev=1356367&r1=1356366&r2=1356367&view=diff
==============================================================================
--- sling/trunk/bundles/engine/src/main/java/org/apache/sling/engine/impl/debug/RequestProgressTrackerLogFilter.java (original)
+++ sling/trunk/bundles/engine/src/main/java/org/apache/sling/engine/impl/debug/RequestProgressTrackerLogFilter.java Mon Jul  2 17:31:09 2012
@@ -28,6 +28,10 @@ import javax.servlet.ServletException;
 import javax.servlet.ServletRequest;
 import javax.servlet.ServletResponse;
 
+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.Service;
 import org.apache.sling.api.SlingHttpServletRequest;
 import org.apache.sling.api.request.RequestProgressTracker;
 import org.slf4j.Logger;
@@ -36,14 +40,15 @@ import org.slf4j.LoggerFactory;
 /**
  * Filter that dumps the output of the RequestProgressTracker to the log after
  * processing the request.
- * 
- * @scr.component immediate="true" metatype="no"
- * @scr.property name="service.description" value="RequestProgressTracker dump
- *               filter"
- * @scr.property name="service.vendor" value="The Apache Software Foundation"
- * @scr.property name="filter.scope" value="request" private="true"
- * @scr.service
+ *
  */
+@Component
+@Service
+@Properties({
+    @Property(name="service.description", value="RequestProgressTracker dump filter"),
+    @Property(name="service.vendor", value="The Apache Software Foundation"),
+    @Property(name="filter.scope", value="request", propertyPrivate=true)
+})
 public class RequestProgressTrackerLogFilter implements Filter {
 
     private static final Logger log = LoggerFactory.getLogger(RequestProgressTrackerLogFilter.class);