Author: cziegeler
Date: Tue Apr 28 07:45:33 2015
New Revision: 1676424
URL: http://svn.apache.org/r1676424
Log:
Do not use scr inheritance
Modified:
sling/trunk/contrib/jcr/jackrabbit-client/pom.xml
sling/trunk/contrib/jcr/jackrabbit-client/src/main/java/org/apache/sling/jcr/jackrabbit/client/SlingClientRepository.java
Modified: sling/trunk/contrib/jcr/jackrabbit-client/pom.xml
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/jcr/jackrabbit-client/pom.xml?rev=1676424&r1=1676423&r2=1676424&view=diff
==============================================================================
--- sling/trunk/contrib/jcr/jackrabbit-client/pom.xml (original)
+++ sling/trunk/contrib/jcr/jackrabbit-client/pom.xml Tue Apr 28 07:45:33 2015
@@ -88,7 +88,7 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.jcr.api</artifactId>
- <version>2.0.6</version>
+ <version>2.2.0</version>
</dependency>
<dependency>
<groupId>javax.jcr</groupId>
@@ -98,14 +98,20 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.jcr.base</artifactId>
- <version>2.0.2-incubator</version>
+ <version>2.2.2</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>
-
+ <dependency>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>org.apache.sling.serviceusermapper</artifactId>
+ <version>1.0.0</version>
+ <scope>provided</scope>
+ </dependency>
+
<!-- OSGi Libraries -->
<dependency>
<groupId>org.osgi</groupId>
@@ -115,9 +121,5 @@
<groupId>org.osgi</groupId>
<artifactId>org.osgi.compendium</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.scr.annotations</artifactId>
- </dependency>
</dependencies>
</project>
Modified:
sling/trunk/contrib/jcr/jackrabbit-client/src/main/java/org/apache/sling/jcr/jackrabbit/client/SlingClientRepository.java
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/jcr/jackrabbit-client/src/main/java/org/apache/sling/jcr/jackrabbit/client/SlingClientRepository.java?rev=1676424&r1=1676423&r2=1676424&view=diff
==============================================================================
---
sling/trunk/contrib/jcr/jackrabbit-client/src/main/java/org/apache/sling/jcr/jackrabbit/client/SlingClientRepository.java
(original)
+++
sling/trunk/contrib/jcr/jackrabbit-client/src/main/java/org/apache/sling/jcr/jackrabbit/client/SlingClientRepository.java
Tue Apr 28 07:45:33 2015
@@ -28,8 +28,13 @@ import org.apache.felix.scr.annotations.
import org.apache.felix.scr.annotations.ConfigurationPolicy;
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.References;
import org.apache.sling.jcr.api.SlingRepository;
import org.apache.sling.jcr.base.AbstractSlingRepository;
+import org.apache.sling.serviceusermapping.ServiceUserMapper;
import org.osgi.service.log.LogService;
/**
@@ -38,11 +43,24 @@ import org.osgi.service.log.LogService;
*/
@Component(name="org.apache.sling.jcr.jackrabbit.client.SlingClientRepository",
metatype=true,
description="%repository.description", label="%repository.name",
configurationFactory=true,
- policy=ConfigurationPolicy.REQUIRE)
+ policy=ConfigurationPolicy.REQUIRE,
+ inherit=false)
@Properties({
@Property(name="service.description", value="Factory for non-embedded JCR
Repository Instances"),
@Property(name="java.naming.factory.initial",
value="org.apache.jackrabbit.core.jndi.provider.DummyInitialContextFactory"),
- @Property(name="java.naming.provider.url", value="http://sling.apache.org";)
+ @Property(name="java.naming.provider.url",
value="http://sling.apache.org";),
+ @Property(name=AbstractSlingRepository.PROPERTY_DEFAULT_WORKSPACE),
+ @Property(name=AbstractSlingRepository.PROPERTY_ANONYMOUS_USER,
value=AbstractSlingRepository.DEFAULT_ANONYMOUS_USER),
+ @Property(name=AbstractSlingRepository.PROPERTY_ANONYMOUS_PASS,
value=AbstractSlingRepository.DEFAULT_ANONYMOUS_PASS),
+ @Property(name=AbstractSlingRepository.PROPERTY_ADMIN_USER,
value=AbstractSlingRepository.DEFAULT_ADMIN_USER),
+ @Property(name=AbstractSlingRepository.PROPERTY_ADMIN_PASS,
value=AbstractSlingRepository.DEFAULT_ADMIN_PASS),
+ @Property(name=AbstractSlingRepository.PROPERTY_LOGIN_ADMIN_ENABLED,
boolValue = AbstractSlingRepository.DEFAULT_LOGIN_ADMIN_ENABLED),
+ @Property(name=AbstractSlingRepository.PROPERTY_POLL_ACTIVE,
intValue=AbstractSlingRepository.DEFAULT_POLL_ACTIVE),
+ @Property(name=AbstractSlingRepository.PROPERTY_POLL_INACTIVE,
intValue=AbstractSlingRepository.DEFAULT_POLL_INACTIVE)
+})
+@References({
+ @Reference(name="log", referenceInterface=LogService.class,
policy=ReferencePolicy.DYNAMIC,
cardinality=ReferenceCardinality.MANDATORY_UNARY),
+ @Reference(name="serviceUserMapper",
referenceInterface=ServiceUserMapper.class, policy=ReferencePolicy.DYNAMIC,
cardinality=ReferenceCardinality.MANDATORY_UNARY)
})
public class SlingClientRepository extends AbstractSlingRepository
implements Repository, SlingRepository {
