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 2016/11/09 09:00:40 UTC
svn commit: r1768880 - in /sling/trunk/bundles/jcr/base: ./
src/main/java/org/apache/sling/jcr/base/
src/main/java/org/apache/sling/jcr/base/util/
Author: cziegeler
Date: Wed Nov 9 09:00:39 2016
New Revision: 1768880
URL: http://svn.apache.org/viewvc?rev=1768880&view=rev
Log:
Update to parent pom 29
Modified:
sling/trunk/bundles/jcr/base/pom.xml
sling/trunk/bundles/jcr/base/src/main/java/org/apache/sling/jcr/base/AbstractSlingRepository2.java
sling/trunk/bundles/jcr/base/src/main/java/org/apache/sling/jcr/base/AbstractSlingRepositoryManager.java
sling/trunk/bundles/jcr/base/src/main/java/org/apache/sling/jcr/base/LoginAdminWhitelist.java
sling/trunk/bundles/jcr/base/src/main/java/org/apache/sling/jcr/base/package-info.java
sling/trunk/bundles/jcr/base/src/main/java/org/apache/sling/jcr/base/util/package-info.java
Modified: sling/trunk/bundles/jcr/base/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/base/pom.xml?rev=1768880&r1=1768879&r2=1768880&view=diff
==============================================================================
--- sling/trunk/bundles/jcr/base/pom.xml (original)
+++ sling/trunk/bundles/jcr/base/pom.xml Wed Nov 9 09:00:39 2016
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling</artifactId>
- <version>26</version>
+ <version>29</version>
<relativePath />
</parent>
@@ -60,10 +60,6 @@
</instructions>
</configuration>
</plugin>
- </plugins>
- </build>
- <reporting>
- <plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
@@ -74,7 +70,7 @@
</configuration>
</plugin>
</plugins>
- </reporting>
+ </build>
<dependencies>
<dependency>
@@ -92,7 +88,6 @@
<dependency>
<groupId>javax.jcr</groupId>
<artifactId>jcr</artifactId>
- <version>2.0</version>
</dependency>
<dependency>
<groupId>org.apache.jackrabbit</groupId>
@@ -123,21 +118,7 @@
<!-- OSGi Libraries -->
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.compendium</artifactId>
- <version>4.2.0</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.scr.annotations</artifactId>
- </dependency>
- <dependency>
- <groupId>biz.aQute</groupId>
- <artifactId>bndlib</artifactId>
+ <artifactId>osgi.core</artifactId>
</dependency>
<dependency>
Modified: sling/trunk/bundles/jcr/base/src/main/java/org/apache/sling/jcr/base/AbstractSlingRepository2.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/base/src/main/java/org/apache/sling/jcr/base/AbstractSlingRepository2.java?rev=1768880&r1=1768879&r2=1768880&view=diff
==============================================================================
--- sling/trunk/bundles/jcr/base/src/main/java/org/apache/sling/jcr/base/AbstractSlingRepository2.java (original)
+++ sling/trunk/bundles/jcr/base/src/main/java/org/apache/sling/jcr/base/AbstractSlingRepository2.java Wed Nov 9 09:00:39 2016
@@ -30,12 +30,11 @@ import javax.jcr.Value;
import org.apache.sling.jcr.api.SlingRepository;
import org.apache.sling.serviceusermapping.ServiceUserMapper;
+import org.osgi.annotation.versioning.ProviderType;
import org.osgi.framework.Bundle;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import aQute.bnd.annotation.ProviderType;
-
/**
* The <code>AbstractSlingRepository2</code> is an abstract implementation of
* the {@link SlingRepository} version 2.3 interface (phasing
@@ -73,7 +72,7 @@ public abstract class AbstractSlingRepos
/** The bundle using this repository instance. */
private final Bundle usingBundle;
-
+
/**
* Sets up this abstract SlingRepository implementation.
*
Modified: sling/trunk/bundles/jcr/base/src/main/java/org/apache/sling/jcr/base/AbstractSlingRepositoryManager.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/base/src/main/java/org/apache/sling/jcr/base/AbstractSlingRepositoryManager.java?rev=1768880&r1=1768879&r2=1768880&view=diff
==============================================================================
--- sling/trunk/bundles/jcr/base/src/main/java/org/apache/sling/jcr/base/AbstractSlingRepositoryManager.java (original)
+++ sling/trunk/bundles/jcr/base/src/main/java/org/apache/sling/jcr/base/AbstractSlingRepositoryManager.java Wed Nov 9 09:00:39 2016
@@ -27,6 +27,7 @@ import org.apache.sling.jcr.api.SlingRep
import org.apache.sling.jcr.api.SlingRepositoryInitializer;
import org.apache.sling.jcr.base.internal.loader.Loader;
import org.apache.sling.serviceusermapping.ServiceUserMapper;
+import org.osgi.annotation.versioning.ProviderType;
import org.osgi.framework.Bundle;
import org.osgi.framework.BundleContext;
import org.osgi.framework.ServiceFactory;
@@ -36,8 +37,6 @@ import org.osgi.util.tracker.ServiceTrac
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import aQute.bnd.annotation.ProviderType;
-
/**
* The <code>AbstractSlingRepositoryManager</code> is the basis for controlling
* the JCR repository instances used by Sling. As a manager it starts and stops
@@ -57,7 +56,7 @@ import aQute.bnd.annotation.ProviderType
* <li>{@link #create(Bundle)}</li>
* <li>{@link #registerService()}</li>
* </ol>
- * Earlier versions of this class had an additional <code>setup</code> method,
+ * Earlier versions of this class had an additional <code>setup</code> method,
* whatever code was there can be moved to the <core>create</code> method.
* <p>
* To stop the repository instance, the implementation calls the {@link #stop()}
@@ -140,7 +139,7 @@ public abstract class AbstractSlingRepos
* @see AbstractSlingRepository2#loginService(String, String)
*/
protected abstract ServiceUserMapper getServiceUserMapper();
-
+
/** Returns the {@code LoginAdminWhitelist} service used to decide whether
* to allow bundles to use the {@code loginAdministrative} method.
* @return the non-null {@code LoginAdminWhitelist} service
Modified: sling/trunk/bundles/jcr/base/src/main/java/org/apache/sling/jcr/base/LoginAdminWhitelist.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/base/src/main/java/org/apache/sling/jcr/base/LoginAdminWhitelist.java?rev=1768880&r1=1768879&r2=1768880&view=diff
==============================================================================
--- sling/trunk/bundles/jcr/base/src/main/java/org/apache/sling/jcr/base/LoginAdminWhitelist.java (original)
+++ sling/trunk/bundles/jcr/base/src/main/java/org/apache/sling/jcr/base/LoginAdminWhitelist.java Wed Nov 9 09:00:39 2016
@@ -19,15 +19,15 @@
package org.apache.sling.jcr.base;
import org.apache.sling.jcr.api.SlingRepository;
+import org.osgi.annotation.versioning.ProviderType;
import org.osgi.framework.Bundle;
-import aQute.bnd.annotation.ProviderType;
-
/**
- * Whitelist that defines which bundles can use the
+ * Whitelist that defines which bundles can use the
* {@link SlingRepository#loginAdministrative} method.
*/
@ProviderType
public interface LoginAdminWhitelist {
+
boolean allowLoginAdministrative(Bundle b);
}
Modified: sling/trunk/bundles/jcr/base/src/main/java/org/apache/sling/jcr/base/package-info.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/base/src/main/java/org/apache/sling/jcr/base/package-info.java?rev=1768880&r1=1768879&r2=1768880&view=diff
==============================================================================
--- sling/trunk/bundles/jcr/base/src/main/java/org/apache/sling/jcr/base/package-info.java (original)
+++ sling/trunk/bundles/jcr/base/src/main/java/org/apache/sling/jcr/base/package-info.java Wed Nov 9 09:00:39 2016
@@ -25,8 +25,7 @@
* {@link org.apache.sling.jcr.base.AbstractSlingRepository2} being the
* basis for the repository service instance handed to using bundles.
*/
-@Version("3.1.0")
+@org.osgi.annotation.versioning.Version("3.1.0")
package org.apache.sling.jcr.base;
-import aQute.bnd.annotation.Version;
Modified: sling/trunk/bundles/jcr/base/src/main/java/org/apache/sling/jcr/base/util/package-info.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/base/src/main/java/org/apache/sling/jcr/base/util/package-info.java?rev=1768880&r1=1768879&r2=1768880&view=diff
==============================================================================
--- sling/trunk/bundles/jcr/base/src/main/java/org/apache/sling/jcr/base/util/package-info.java (original)
+++ sling/trunk/bundles/jcr/base/src/main/java/org/apache/sling/jcr/base/util/package-info.java Wed Nov 9 09:00:39 2016
@@ -20,5 +20,5 @@
@Version("2.1")
package org.apache.sling.jcr.base.util;
-import aQute.bnd.annotation.Version;
+import org.osgi.annotation.versioning.Version;