You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by cz...@apache.org on 2012/07/02 20:00:42 UTC
svn commit: r1356382 - in /sling/trunk/bundles/jcr/jackrabbit-server: ./
src/main/java/org/apache/sling/jcr/jackrabbit/server/impl/
src/main/java/org/apache/sling/jcr/jackrabbit/server/impl/security/
Author: cziegeler
Date: Mon Jul 2 18:00:41 2012
New Revision: 1356382
URL: http://svn.apache.org/viewvc?rev=1356382&view=rev
Log:
SLING-2363 Replace JavaDoc SCR annotations with Java SCR annotations
Modified:
sling/trunk/bundles/jcr/jackrabbit-server/pom.xml
sling/trunk/bundles/jcr/jackrabbit-server/src/main/java/org/apache/sling/jcr/jackrabbit/server/impl/SlingServerRepository.java
sling/trunk/bundles/jcr/jackrabbit-server/src/main/java/org/apache/sling/jcr/jackrabbit/server/impl/TestContentLoaderImpl.java
sling/trunk/bundles/jcr/jackrabbit-server/src/main/java/org/apache/sling/jcr/jackrabbit/server/impl/security/PluggableDefaultAccessManager.java
Modified: sling/trunk/bundles/jcr/jackrabbit-server/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/jackrabbit-server/pom.xml?rev=1356382&r1=1356381&r2=1356382&view=diff
==============================================================================
--- sling/trunk/bundles/jcr/jackrabbit-server/pom.xml (original)
+++ sling/trunk/bundles/jcr/jackrabbit-server/pom.xml Mon Jul 2 18:00:41 2012
@@ -228,6 +228,10 @@
<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/bundles/jcr/jackrabbit-server/src/main/java/org/apache/sling/jcr/jackrabbit/server/impl/SlingServerRepository.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/jackrabbit-server/src/main/java/org/apache/sling/jcr/jackrabbit/server/impl/SlingServerRepository.java?rev=1356382&r1=1356381&r2=1356382&view=diff
==============================================================================
--- sling/trunk/bundles/jcr/jackrabbit-server/src/main/java/org/apache/sling/jcr/jackrabbit/server/impl/SlingServerRepository.java (original)
+++ sling/trunk/bundles/jcr/jackrabbit-server/src/main/java/org/apache/sling/jcr/jackrabbit/server/impl/SlingServerRepository.java Mon Jul 2 18:00:41 2012
@@ -31,6 +31,10 @@ import javax.jcr.Credentials;
import javax.jcr.Repository;
import javax.jcr.RepositoryException;
+import org.apache.felix.scr.annotations.Component;
+import org.apache.felix.scr.annotations.ConfigurationPolicy;
+import org.apache.felix.scr.annotations.Properties;
+import org.apache.felix.scr.annotations.Property;
import org.apache.jackrabbit.api.management.DataStoreGarbageCollector;
import org.apache.jackrabbit.api.management.RepositoryManager;
import org.apache.jackrabbit.core.RepositoryImpl;
@@ -47,14 +51,14 @@ import org.osgi.service.log.LogService;
/**
* The <code>SlingServerRepository</code> TODO
*
- * @scr.component label="%repository.name" description="%repository.description"
- * name="org.apache.sling.jcr.jackrabbit.server.SlingServerRepository"
- * configurationFactory="true" policy="require"
- *
- * @scr.property name="service.vendor" value="The Apache Software Foundation"
- * @scr.property name="service.description"
- * value="Factory for embedded Jackrabbit Repository Instances"
*/
+@Component(label="%repository.name", description="%repository.description", metatype=true,
+ name="org.apache.sling.jcr.jackrabbit.server.SlingServerRepository", configurationFactory=true,
+ policy=ConfigurationPolicy.REQUIRE)
+@Properties({
+ @Property(name="service.vendor", value="The Apache Software Foundation"),
+ @Property(name="service.description", value="Factory for embedded Jackrabbit Repository Instances")
+})
public class SlingServerRepository extends AbstractSlingRepository
implements Repository, SlingRepository, RepositoryManager {
@@ -68,8 +72,8 @@ public class SlingServerRepository exten
* <p>
* This parameter is mandatory for this activator to start the repository.
*
- * @scr.property value=""
*/
+ @Property(value="")
public static final String REPOSITORY_CONFIG_URL = "config";
/**
@@ -79,13 +83,11 @@ public class SlingServerRepository exten
* <p>
* This parameter is mandatory for this activator to start the repository.
*
- * @scr.property value=""
*/
+ @Property(value="")
public static final String REPOSITORY_HOME_DIR = "home";
- /**
- * @scr.property value=""
- */
+ @Property(value="")
public static final String REPOSITORY_REGISTRATION_NAME = "name";
//---------- Repository Management ----------------------------------------
Modified: sling/trunk/bundles/jcr/jackrabbit-server/src/main/java/org/apache/sling/jcr/jackrabbit/server/impl/TestContentLoaderImpl.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/jackrabbit-server/src/main/java/org/apache/sling/jcr/jackrabbit/server/impl/TestContentLoaderImpl.java?rev=1356382&r1=1356381&r2=1356382&view=diff
==============================================================================
--- sling/trunk/bundles/jcr/jackrabbit-server/src/main/java/org/apache/sling/jcr/jackrabbit/server/impl/TestContentLoaderImpl.java (original)
+++ sling/trunk/bundles/jcr/jackrabbit-server/src/main/java/org/apache/sling/jcr/jackrabbit/server/impl/TestContentLoaderImpl.java Mon Jul 2 18:00:41 2012
@@ -21,6 +21,11 @@ import java.io.IOException;
import javax.jcr.RepositoryException;
import javax.jcr.Session;
+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.Reference;
+import org.apache.felix.scr.annotations.Service;
import org.apache.sling.jcr.api.SlingRepository;
import org.apache.sling.jcr.jackrabbit.server.TestContentLoader;
@@ -30,16 +35,16 @@ import org.apache.sling.jcr.jackrabbit.s
* JackrabbitRepositoryStub class. Once that class is refactored, we can remove
* almost all of this code.
*
- * @scr.component metatype="no"
- * @scr.service
- *
- * @scr.property name="service.description" value="Test Content Loader"
- * @scr.property name="service.vendor" value="The Apache Software Foundation"
- *
*/
+@Component
+@Service
+@Properties({
+ @Property(name="service.description", value="Test Content Loader"),
+ @Property(name="service.vendor", value="The Apache Software Foundation")
+})
public class TestContentLoaderImpl implements TestContentLoader {
- /** @scr.reference */
+ @Reference
private SlingRepository repository;
private String encoding = "UTF-8";
Modified: sling/trunk/bundles/jcr/jackrabbit-server/src/main/java/org/apache/sling/jcr/jackrabbit/server/impl/security/PluggableDefaultAccessManager.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/jackrabbit-server/src/main/java/org/apache/sling/jcr/jackrabbit/server/impl/security/PluggableDefaultAccessManager.java?rev=1356382&r1=1356381&r2=1356382&view=diff
==============================================================================
--- sling/trunk/bundles/jcr/jackrabbit-server/src/main/java/org/apache/sling/jcr/jackrabbit/server/impl/security/PluggableDefaultAccessManager.java (original)
+++ sling/trunk/bundles/jcr/jackrabbit-server/src/main/java/org/apache/sling/jcr/jackrabbit/server/impl/security/PluggableDefaultAccessManager.java Mon Jul 2 18:00:41 2012
@@ -56,7 +56,6 @@ import org.slf4j.LoggerFactory;
*/
public class PluggableDefaultAccessManager extends DefaultAccessManager {
- /** @scr.reference */
private AccessManagerPlugin accessManagerPlugin;
private NamePathResolver namePathResolver;
private static final Logger log = LoggerFactory.getLogger(PluggableDefaultAccessManager.class);
@@ -137,7 +136,7 @@ public class PluggableDefaultAccessManag
public boolean canRead(Path itemPath, ItemId itemId) throws RepositoryException {
if (this.sanityCheck()) {
- String resolvedPath = null;
+ String resolvedPath = null;
if (itemPath != null) {
resolvedPath = namePathResolver.getJCRPath(itemPath);
} else if (itemId != null) {