Author: mreutegg
Date: Tue Nov 28 12:31:21 2017
New Revision: 1816539
URL: http://svn.apache.org/viewvc?rev=1816539&view=rev
Log:
OAK-6942: Add package export versions for core-spi
Add provider type annotation to interfaces where appropriate
Modified:
jackrabbit/oak/trunk/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/namepath/NameMapper.java
jackrabbit/oak/trunk/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/namepath/NamePathMapper.java
jackrabbit/oak/trunk/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/namepath/PathMapper.java
jackrabbit/oak/trunk/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/spi/nodetype/DefinitionProvider.java
jackrabbit/oak/trunk/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/spi/nodetype/EffectiveNodeType.java
jackrabbit/oak/trunk/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/spi/nodetype/EffectiveNodeTypeProvider.java
jackrabbit/oak/trunk/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/spi/whiteboard/Tracker.java
jackrabbit/oak/trunk/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/spi/whiteboard/Whiteboard.java
Modified:
jackrabbit/oak/trunk/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/namepath/NameMapper.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/namepath/NameMapper.java?rev=1816539&r1=1816538&r2=1816539&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/namepath/NameMapper.java
(original)
+++
jackrabbit/oak/trunk/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/namepath/NameMapper.java
Tue Nov 28 12:31:21 2017
@@ -22,9 +22,12 @@ import javax.annotation.CheckForNull;
import javax.annotation.Nonnull;
import javax.jcr.RepositoryException;
+import org.osgi.annotation.versioning.ProviderType;
+
/**
* TODO document
*/
+@ProviderType
public interface NameMapper {
/**
Modified:
jackrabbit/oak/trunk/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/namepath/NamePathMapper.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/namepath/NamePathMapper.java?rev=1816539&r1=1816538&r2=1816539&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/namepath/NamePathMapper.java
(original)
+++
jackrabbit/oak/trunk/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/namepath/NamePathMapper.java
Tue Nov 28 12:31:21 2017
@@ -22,10 +22,13 @@ import java.util.Map;
import javax.annotation.Nonnull;
import javax.jcr.RepositoryException;
+import org.osgi.annotation.versioning.ProviderType;
+
/**
* The {@code NamePathMapper} interface combines {@code NameMapper} and
* {@code PathMapper}.
*/
+@ProviderType
public interface NamePathMapper extends NameMapper, PathMapper {
NamePathMapper DEFAULT = new Default();
Modified:
jackrabbit/oak/trunk/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/namepath/PathMapper.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/namepath/PathMapper.java?rev=1816539&r1=1816538&r2=1816539&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/namepath/PathMapper.java
(original)
+++
jackrabbit/oak/trunk/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/namepath/PathMapper.java
Tue Nov 28 12:31:21 2017
@@ -19,6 +19,8 @@ package org.apache.jackrabbit.oak.namepa
import javax.annotation.CheckForNull;
import javax.annotation.Nonnull;
+import org.osgi.annotation.versioning.ProviderType;
+
/**
* {@code PathMapper} instances provide methods for mapping paths from their
JCR
* string representation to their Oak representation and vice versa.
@@ -27,6 +29,7 @@ import javax.annotation.Nonnull;
* names of the respective items in the {@link
org.apache.jackrabbit.oak.api.Tree}
* separated by forward slashes.
*/
+@ProviderType
public interface PathMapper {
/**
Modified:
jackrabbit/oak/trunk/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/spi/nodetype/DefinitionProvider.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/spi/nodetype/DefinitionProvider.java?rev=1816539&r1=1816538&r2=1816539&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/spi/nodetype/DefinitionProvider.java
(original)
+++
jackrabbit/oak/trunk/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/spi/nodetype/DefinitionProvider.java
Tue Nov 28 12:31:21 2017
@@ -24,10 +24,12 @@ import javax.jcr.nodetype.PropertyDefini
import org.apache.jackrabbit.oak.api.PropertyState;
import org.apache.jackrabbit.oak.api.Tree;
+import org.osgi.annotation.versioning.ProviderType;
/**
* DefinitionProvider... TODO
*/
+@ProviderType
public interface DefinitionProvider {
@Nonnull
Modified:
jackrabbit/oak/trunk/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/spi/nodetype/EffectiveNodeType.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/spi/nodetype/EffectiveNodeType.java?rev=1816539&r1=1816538&r2=1816539&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/spi/nodetype/EffectiveNodeType.java
(original)
+++
jackrabbit/oak/trunk/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/spi/nodetype/EffectiveNodeType.java
Tue Nov 28 12:31:21 2017
@@ -25,7 +25,9 @@ import javax.jcr.nodetype.PropertyDefini
import org.apache.jackrabbit.oak.api.PropertyState;
import org.apache.jackrabbit.oak.api.Tree;
+import org.osgi.annotation.versioning.ProviderType;
+@ProviderType
public interface EffectiveNodeType {
boolean includesNodeType(String nodeTypeName);
Modified:
jackrabbit/oak/trunk/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/spi/nodetype/EffectiveNodeTypeProvider.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/spi/nodetype/EffectiveNodeTypeProvider.java?rev=1816539&r1=1816538&r2=1816539&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/spi/nodetype/EffectiveNodeTypeProvider.java
(original)
+++
jackrabbit/oak/trunk/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/spi/nodetype/EffectiveNodeTypeProvider.java
Tue Nov 28 12:31:21 2017
@@ -23,10 +23,12 @@ import javax.jcr.RepositoryException;
import javax.jcr.nodetype.NoSuchNodeTypeException;
import org.apache.jackrabbit.oak.api.Tree;
+import org.osgi.annotation.versioning.ProviderType;
/**
* EffectiveNodeTypeProvider... TODO
*/
+@ProviderType
public interface EffectiveNodeTypeProvider {
/**
Modified:
jackrabbit/oak/trunk/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/spi/whiteboard/Tracker.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/spi/whiteboard/Tracker.java?rev=1816539&r1=1816538&r2=1816539&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/spi/whiteboard/Tracker.java
(original)
+++
jackrabbit/oak/trunk/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/spi/whiteboard/Tracker.java
Tue Nov 28 12:31:21 2017
@@ -18,9 +18,12 @@ package org.apache.jackrabbit.oak.spi.wh
import java.util.List;
+import org.osgi.annotation.versioning.ProviderType;
+
/**
* Tracker for whiteboard services.
*/
+@ProviderType
public interface Tracker<T> {
/**
Modified:
jackrabbit/oak/trunk/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/spi/whiteboard/Whiteboard.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/spi/whiteboard/Whiteboard.java?rev=1816539&r1=1816538&r2=1816539&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/spi/whiteboard/Whiteboard.java
(original)
+++
jackrabbit/oak/trunk/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/spi/whiteboard/Whiteboard.java
Tue Nov 28 12:31:21 2017
@@ -18,6 +18,9 @@ package org.apache.jackrabbit.oak.spi.wh
import java.util.Map;
+import org.osgi.annotation.versioning.ProviderType;
+
+@ProviderType
public interface Whiteboard {
/**