Switch to scr annotations - no functional changes.
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1143319 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/pom.xml b/pom.xml
index db3151d..684b146 100644
--- a/pom.xml
+++ b/pom.xml
@@ -85,6 +85,10 @@
<dependencies>
<dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.scr.annotations</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.jcr.api</artifactId>
<version>2.1.0</version>
diff --git a/src/main/java/org/apache/sling/jcr/base/AbstractSlingRepository.java b/src/main/java/org/apache/sling/jcr/base/AbstractSlingRepository.java
index 917757c..f1c16b0 100644
--- a/src/main/java/org/apache/sling/jcr/base/AbstractSlingRepository.java
+++ b/src/main/java/org/apache/sling/jcr/base/AbstractSlingRepository.java
@@ -30,6 +30,9 @@
import javax.jcr.Value;
import javax.jcr.Workspace;
+import org.apache.felix.scr.annotations.Component;
+import org.apache.felix.scr.annotations.Property;
+import org.apache.felix.scr.annotations.Reference;
import org.apache.sling.jcr.api.NamespaceMapper;
import org.apache.sling.jcr.api.SlingRepository;
import org.apache.sling.jcr.base.internal.loader.Loader;
@@ -48,32 +51,11 @@
* interface may wish to extend this class to benefit from a default
* implementation.
*
- * @scr.component metatype="no"
*/
+@Component(componentAbstract=true)
public abstract class AbstractSlingRepository implements SlingRepository,
Runnable {
- /** @scr.property value="" */
- public static final String PROPERTY_DEFAULT_WORKSPACE = "defaultWorkspace";
-
- /** @scr.property valueRef="DEFAULT_ANONYMOUS_USER" */
- public static final String PROPERTY_ANONYMOUS_USER = "anonymous.name";
-
- /** @scr.property valueRef="DEFAULT_ANONYMOUS_PASS" */
- public static final String PROPERTY_ANONYMOUS_PASS = "anonymous.password";
-
- /** @scr.property valueRef="DEFAULT_ADMIN_USER" */
- public static final String PROPERTY_ADMIN_USER = "admin.name";
-
- /** @scr.property valueRef="DEFAULT_ADMIN_PASS" */
- public static final String PROPERTY_ADMIN_PASS = "admin.password";
-
- /** @scr.property valueRef="DEFAULT_POLL_ACTIVE" */
- public static final String PROPERTY_POLL_ACTIVE = "poll.active";
-
- /** @scr.property valueRef="DEFAULT_POLL_INACTIVE" */
- public static final String PROPERTY_POLL_INACTIVE = "poll.inactive";
-
public static final String DEFAULT_ANONYMOUS_USER = "anonymous";
public static final String DEFAULT_ANONYMOUS_PASS = "anonymous";
@@ -82,6 +64,21 @@
public static final String DEFAULT_ADMIN_PASS = "admin";
+ @Property
+ public static final String PROPERTY_DEFAULT_WORKSPACE = "defaultWorkspace";
+
+ @Property(value=DEFAULT_ANONYMOUS_USER)
+ public static final String PROPERTY_ANONYMOUS_USER = "anonymous.name";
+
+ @Property(value=DEFAULT_ANONYMOUS_PASS)
+ public static final String PROPERTY_ANONYMOUS_PASS = "anonymous.password";
+
+ @Property(value=DEFAULT_ADMIN_USER)
+ public static final String PROPERTY_ADMIN_USER = "admin.name";
+
+ @Property(value=DEFAULT_ADMIN_PASS)
+ public static final String PROPERTY_ADMIN_PASS = "admin.password";
+
/**
* The default value for the number of seconds to wait between two
* consecutive checks while the repository is active (value is 10).
@@ -94,10 +91,16 @@
*/
public static final int DEFAULT_POLL_INACTIVE = 10;
+ @Property(intValue=DEFAULT_POLL_ACTIVE)
+ public static final String PROPERTY_POLL_ACTIVE = "poll.active";
+
+ @Property(intValue=DEFAULT_POLL_INACTIVE)
+ public static final String PROPERTY_POLL_INACTIVE = "poll.inactive";
+
/** The minimum number of seconds allowed for any of the two poll times */
public static final int MIN_POLL = 2;
- /** @scr.reference bind="bindLog" unbind="unbindLog" */
+ @Reference
private LogService log;
private ComponentContext componentContext;
