Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentPropertyState.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentPropertyState.java?rev=1791779&r1=1791778&r2=1791779&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentPropertyState.java (original) +++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentPropertyState.java Tue Apr 18 13:00:50 2017 @@ -27,7 +27,6 @@ import javax.jcr.PropertyType; import com.google.common.collect.Lists; import org.apache.jackrabbit.oak.api.PropertyState; import org.apache.jackrabbit.oak.api.Type; -import org.apache.jackrabbit.oak.cache.StringCache; import org.apache.jackrabbit.oak.commons.json.JsopReader; import org.apache.jackrabbit.oak.commons.json.JsopTokenizer; import org.apache.jackrabbit.oak.json.TypeCodes;
Copied: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/StringCache.java (from r1791745, jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/cache/StringCache.java) URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/StringCache.java?p2=jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/StringCache.java&p1=jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/cache/StringCache.java&r1=1791745&r2=1791779&rev=1791779&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/cache/StringCache.java (original) +++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/StringCache.java Tue Apr 18 13:00:50 2017 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.jackrabbit.oak.cache; +package org.apache.jackrabbit.oak.plugins.document; import java.util.Map; Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoDocumentStore.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoDocumentStore.java?rev=1791779&r1=1791778&r2=1791779&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoDocumentStore.java (original) +++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoDocumentStore.java Tue Apr 18 13:00:50 2017 @@ -78,7 +78,7 @@ import org.apache.jackrabbit.oak.plugins import org.apache.jackrabbit.oak.plugins.document.locks.StripedNodeDocumentLocks; import org.apache.jackrabbit.oak.plugins.document.util.Utils; import org.apache.jackrabbit.oak.stats.Clock; -import org.apache.jackrabbit.oak.util.PerfLogger; +import org.apache.jackrabbit.oak.commons.benchmark.PerfLogger; import org.slf4j.Logger; import org.slf4j.LoggerFactory; Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBBlobStore.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBBlobStore.java?rev=1791779&r1=1791778&r2=1791779&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBBlobStore.java (original) +++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBBlobStore.java Tue Apr 18 13:00:50 2017 @@ -45,7 +45,7 @@ import org.apache.jackrabbit.oak.plugins import org.apache.jackrabbit.oak.plugins.document.DocumentStoreException; import org.apache.jackrabbit.oak.plugins.document.rdb.RDBJDBCTools.PreparedStatementComponent; import org.apache.jackrabbit.oak.spi.blob.AbstractBlobStore; -import org.apache.jackrabbit.oak.util.OakVersion; +import org.apache.jackrabbit.oak.OakVersion; import org.slf4j.Logger; import org.slf4j.LoggerFactory; Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStore.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStore.java?rev=1791779&r1=1791778&r2=1791779&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStore.java (original) +++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStore.java Tue Apr 18 13:00:50 2017 @@ -83,7 +83,7 @@ import org.apache.jackrabbit.oak.plugins import org.apache.jackrabbit.oak.plugins.document.locks.StripedNodeDocumentLocks; import org.apache.jackrabbit.oak.plugins.document.mongo.MongoDocumentStore; import org.apache.jackrabbit.oak.plugins.document.util.CloseableIterator; -import org.apache.jackrabbit.oak.util.OakVersion; +import org.apache.jackrabbit.oak.OakVersion; import org.slf4j.Logger; import org.slf4j.LoggerFactory; Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBExport.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBExport.java?rev=1791779&r1=1791778&r2=1791779&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBExport.java (original) +++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBExport.java Tue Apr 18 13:00:50 2017 @@ -52,7 +52,7 @@ import org.apache.jackrabbit.oak.plugins import org.apache.jackrabbit.oak.plugins.document.DocumentStoreException; import org.apache.jackrabbit.oak.plugins.document.NodeDocument; import org.apache.jackrabbit.oak.plugins.document.memory.MemoryDocumentStore; -import org.apache.jackrabbit.oak.util.OakVersion; +import org.apache.jackrabbit.oak.OakVersion; /** * Utility for dumping contents from {@link RDBDocumentStore}'s tables. Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/AsyncIndexerService.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/AsyncIndexerService.java?rev=1791779&r1=1791778&r2=1791779&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/AsyncIndexerService.java (original) +++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/AsyncIndexerService.java Tue Apr 18 13:00:50 2017 @@ -48,7 +48,6 @@ import org.apache.jackrabbit.oak.spi.whi import org.apache.jackrabbit.oak.spi.whiteboard.Registration; import org.apache.jackrabbit.oak.spi.whiteboard.Whiteboard; import org.apache.jackrabbit.oak.spi.whiteboard.WhiteboardExecutor; -import org.apache.jackrabbit.oak.spi.whiteboard.WhiteboardIndexEditorProvider; import org.apache.jackrabbit.oak.stats.StatisticsProvider; import org.osgi.framework.BundleContext; import org.slf4j.Logger; Copied: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/WhiteboardIndexEditorProvider.java (from r1791745, jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/whiteboard/WhiteboardIndexEditorProvider.java) URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/WhiteboardIndexEditorProvider.java?p2=jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/WhiteboardIndexEditorProvider.java&p1=jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/whiteboard/WhiteboardIndexEditorProvider.java&r1=1791745&r2=1791779&rev=1791779&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/whiteboard/WhiteboardIndexEditorProvider.java (original) +++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/WhiteboardIndexEditorProvider.java Tue Apr 18 13:00:50 2017 @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.jackrabbit.oak.spi.whiteboard; +package org.apache.jackrabbit.oak.plugins.index; import javax.annotation.Nonnull; @@ -27,6 +27,7 @@ import org.apache.jackrabbit.oak.plugins import org.apache.jackrabbit.oak.spi.commit.Editor; import org.apache.jackrabbit.oak.spi.state.NodeBuilder; import org.apache.jackrabbit.oak.spi.state.NodeState; +import org.apache.jackrabbit.oak.spi.whiteboard.AbstractServiceTracker; /** * Dynamic {@link IndexEditorProvider} based on the available Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/counter/NodeCounterEditor.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/counter/NodeCounterEditor.java?rev=1791779&r1=1791778&r2=1791779&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/counter/NodeCounterEditor.java (original) +++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/counter/NodeCounterEditor.java Tue Apr 18 13:00:50 2017 @@ -29,7 +29,7 @@ import org.apache.jackrabbit.oak.spi.com import org.apache.jackrabbit.oak.spi.state.NodeBuilder; import org.apache.jackrabbit.oak.spi.state.NodeState; import org.apache.jackrabbit.oak.util.ApproximateCounter; -import org.apache.jackrabbit.oak.util.SipHash; +import org.apache.jackrabbit.oak.commons.hash.SipHash; /** * An approximate descendant node counter mechanism. Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/counter/jmx/NodeCounterMBean.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/counter/jmx/NodeCounterMBean.java?rev=1791779&r1=1791778&r2=1791779&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/counter/jmx/NodeCounterMBean.java (original) +++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/counter/jmx/NodeCounterMBean.java Tue Apr 18 13:00:50 2017 @@ -18,8 +18,8 @@ */ package org.apache.jackrabbit.oak.plugins.index.counter.jmx; -import org.apache.jackrabbit.oak.commons.jmx.Description; -import org.apache.jackrabbit.oak.commons.jmx.Name; +import org.apache.jackrabbit.oak.api.jmx.Description; +import org.apache.jackrabbit.oak.api.jmx.Name; /** * An MBean that provides an approximate node count for a given path. Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/property/jmx/PropertyIndexAsyncReindex.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/property/jmx/PropertyIndexAsyncReindex.java?rev=1791779&r1=1791778&r2=1791779&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/property/jmx/PropertyIndexAsyncReindex.java (original) +++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/property/jmx/PropertyIndexAsyncReindex.java Tue Apr 18 13:00:50 2017 @@ -19,9 +19,9 @@ package org.apache.jackrabbit.oak.plugin import static com.google.common.base.Preconditions.checkNotNull; import static java.lang.System.nanoTime; -import static org.apache.jackrabbit.oak.management.ManagementOperation.Status.formatTime; -import static org.apache.jackrabbit.oak.management.ManagementOperation.done; -import static org.apache.jackrabbit.oak.management.ManagementOperation.newManagementOperation; +import static org.apache.jackrabbit.oak.commons.jmx.ManagementOperation.Status.formatTime; +import static org.apache.jackrabbit.oak.commons.jmx.ManagementOperation.done; +import static org.apache.jackrabbit.oak.commons.jmx.ManagementOperation.newManagementOperation; import java.util.concurrent.Callable; import java.util.concurrent.Executor; @@ -29,7 +29,7 @@ import java.util.concurrent.Executor; import javax.annotation.Nonnull; import javax.management.openmbean.CompositeData; -import org.apache.jackrabbit.oak.management.ManagementOperation; +import org.apache.jackrabbit.oak.commons.jmx.ManagementOperation; import org.apache.jackrabbit.oak.plugins.index.AsyncIndexUpdate; /** Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/property/jmx/PropertyIndexStatsMBean.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/property/jmx/PropertyIndexStatsMBean.java?rev=1791779&r1=1791778&r2=1791779&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/property/jmx/PropertyIndexStatsMBean.java (original) +++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/property/jmx/PropertyIndexStatsMBean.java Tue Apr 18 13:00:50 2017 @@ -23,8 +23,8 @@ import javax.management.openmbean.Compos import javax.management.openmbean.OpenDataException; import javax.management.openmbean.TabularData; -import org.apache.jackrabbit.oak.commons.jmx.Description; -import org.apache.jackrabbit.oak.commons.jmx.Name; +import org.apache.jackrabbit.oak.api.jmx.Description; +import org.apache.jackrabbit.oak.api.jmx.Name; public interface PropertyIndexStatsMBean { String TYPE = "PropertyIndexStats"; Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/multiplex/MultiplexingNodeStoreService.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/multiplex/MultiplexingNodeStoreService.java?rev=1791779&r1=1791778&r2=1791779&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/multiplex/MultiplexingNodeStoreService.java (original) +++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/multiplex/MultiplexingNodeStoreService.java Tue Apr 18 13:00:50 2017 @@ -26,7 +26,7 @@ import org.apache.felix.scr.annotations. import org.apache.felix.scr.annotations.ReferenceCardinality; import org.apache.felix.scr.annotations.ReferencePolicy; import org.apache.jackrabbit.oak.commons.PropertiesUtil; -import org.apache.jackrabbit.oak.osgi.ObserverTracker; +import org.apache.jackrabbit.oak.spi.commit.ObserverTracker; import org.apache.jackrabbit.oak.spi.mount.Mount; import org.apache.jackrabbit.oak.spi.mount.MountInfoProvider; import org.apache.jackrabbit.oak.spi.state.NodeStore; Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/EffectiveNodeType.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/EffectiveNodeType.java?rev=1791779&r1=1791778&r2=1791779&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/EffectiveNodeType.java (original) +++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/EffectiveNodeType.java Tue Apr 18 13:00:50 2017 @@ -37,7 +37,7 @@ import javax.jcr.nodetype.PropertyDefini import org.apache.jackrabbit.oak.api.PropertyState; import org.apache.jackrabbit.oak.api.Tree; -import org.apache.jackrabbit.oak.plugins.value.ValueFactoryImpl; +import org.apache.jackrabbit.oak.plugins.value.jcr.ValueFactoryImpl; import org.slf4j.Logger; import org.slf4j.LoggerFactory; Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/PropertyDefinitionImpl.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/PropertyDefinitionImpl.java?rev=1791779&r1=1791778&r2=1791779&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/PropertyDefinitionImpl.java (original) +++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/PropertyDefinitionImpl.java Tue Apr 18 13:00:50 2017 @@ -30,7 +30,7 @@ import org.apache.jackrabbit.oak.api.Pro import org.apache.jackrabbit.oak.api.Tree; import org.apache.jackrabbit.oak.api.Type; import org.apache.jackrabbit.oak.namepath.NamePathMapper; -import org.apache.jackrabbit.oak.plugins.value.ValueFactoryImpl; +import org.apache.jackrabbit.oak.plugins.value.jcr.ValueFactoryImpl; /** * <pre> Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/TypeEditor.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/TypeEditor.java?rev=1791779&r1=1791778&r2=1791779&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/TypeEditor.java (original) +++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/TypeEditor.java Tue Apr 18 13:00:50 2017 @@ -53,7 +53,7 @@ import org.apache.jackrabbit.oak.api.Com import org.apache.jackrabbit.oak.api.PropertyState; import org.apache.jackrabbit.oak.api.Type; import org.apache.jackrabbit.oak.namepath.NamePathMapper; -import org.apache.jackrabbit.oak.plugins.value.ValueFactoryImpl; +import org.apache.jackrabbit.oak.plugins.value.jcr.ValueFactoryImpl; import org.apache.jackrabbit.oak.spi.commit.DefaultEditor; import org.apache.jackrabbit.oak.spi.commit.Editor; import org.apache.jackrabbit.oak.spi.state.NodeBuilder; Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/write/NodeTypeRegistry.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/write/NodeTypeRegistry.java?rev=1791779&r1=1791778&r2=1791779&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/write/NodeTypeRegistry.java (original) +++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/write/NodeTypeRegistry.java Tue Apr 18 13:00:50 2017 @@ -33,7 +33,7 @@ import org.apache.jackrabbit.oak.api.Tre import org.apache.jackrabbit.oak.namepath.GlobalNameMapper; import org.apache.jackrabbit.oak.namepath.NamePathMapperImpl; import org.apache.jackrabbit.oak.plugins.name.ReadWriteNamespaceRegistry; -import org.apache.jackrabbit.oak.plugins.value.ValueFactoryImpl; +import org.apache.jackrabbit.oak.plugins.value.jcr.ValueFactoryImpl; import static org.apache.jackrabbit.oak.plugins.nodetype.NodeTypeConstants.NODE_TYPES_PATH; Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/EventGenerator.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/EventGenerator.java?rev=1791779&r1=1791778&r2=1791779&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/EventGenerator.java (original) +++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/EventGenerator.java Tue Apr 18 13:00:50 2017 @@ -36,7 +36,7 @@ import javax.annotation.Nonnull; import org.apache.jackrabbit.oak.api.PropertyState; import org.apache.jackrabbit.oak.spi.state.NodeState; import org.apache.jackrabbit.oak.spi.state.NodeStateDiff; -import org.apache.jackrabbit.oak.util.PerfLogger; +import org.apache.jackrabbit.oak.commons.benchmark.PerfLogger; import org.slf4j.LoggerFactory; /** Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/NodeObserver.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/NodeObserver.java?rev=1791779&r1=1791778&r2=1791779&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/NodeObserver.java (original) +++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/NodeObserver.java Tue Apr 18 13:00:50 2017 @@ -26,7 +26,6 @@ import java.util.Map; import java.util.Set; import javax.annotation.Nonnull; -import javax.annotation.Nullable; import com.google.common.collect.Maps; import com.google.common.collect.Sets; @@ -40,7 +39,7 @@ import org.apache.jackrabbit.oak.plugins import org.apache.jackrabbit.oak.spi.commit.CommitInfo; import org.apache.jackrabbit.oak.spi.commit.Observer; import org.apache.jackrabbit.oak.spi.state.NodeState; -import org.apache.jackrabbit.oak.util.PerfLogger; +import org.apache.jackrabbit.oak.commons.benchmark.PerfLogger; import org.slf4j.Logger; import org.slf4j.LoggerFactory; Copied: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/value/jcr/BinaryImpl.java (from r1791745, jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/value/BinaryImpl.java) URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/value/jcr/BinaryImpl.java?p2=jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/value/jcr/BinaryImpl.java&p1=jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/value/BinaryImpl.java&r1=1791745&r2=1791779&rev=1791779&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/value/BinaryImpl.java (original) +++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/value/jcr/BinaryImpl.java Tue Apr 18 13:00:50 2017 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.jackrabbit.oak.plugins.value; +package org.apache.jackrabbit.oak.plugins.value.jcr; import static com.google.common.base.Objects.toStringHelper; Copied: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/value/jcr/ValueFactoryImpl.java (from r1791745, jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/value/ValueFactoryImpl.java) URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/value/jcr/ValueFactoryImpl.java?p2=jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/value/jcr/ValueFactoryImpl.java&p1=jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/value/ValueFactoryImpl.java&r1=1791745&r2=1791779&rev=1791779&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/value/ValueFactoryImpl.java (original) +++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/value/jcr/ValueFactoryImpl.java Tue Apr 18 13:00:50 2017 @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.jackrabbit.oak.plugins.value; +package org.apache.jackrabbit.oak.plugins.value.jcr; import static com.google.common.base.Preconditions.checkNotNull; -import static org.apache.jackrabbit.oak.plugins.value.ValueImpl.newValue; +import static org.apache.jackrabbit.oak.plugins.value.jcr.ValueImpl.newValue; import java.io.IOException; import java.io.InputStream; @@ -55,8 +55,10 @@ import org.apache.jackrabbit.oak.plugins import org.apache.jackrabbit.oak.plugins.memory.LongPropertyState; import org.apache.jackrabbit.oak.plugins.memory.PropertyStates; import org.apache.jackrabbit.oak.plugins.memory.StringPropertyState; +import org.apache.jackrabbit.oak.plugins.value.Conversions; +import org.apache.jackrabbit.oak.plugins.value.ErrorValue; import org.apache.jackrabbit.oak.spi.query.PropertyValues; -import org.apache.jackrabbit.oak.util.PerfLogger; +import org.apache.jackrabbit.oak.commons.benchmark.PerfLogger; import org.apache.jackrabbit.util.ISO8601; import org.slf4j.LoggerFactory; Copied: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/value/jcr/ValueImpl.java (from r1791745, jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/value/ValueImpl.java) URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/value/jcr/ValueImpl.java?p2=jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/value/jcr/ValueImpl.java&p1=jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/value/ValueImpl.java&r1=1791745&r2=1791779&rev=1791779&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/value/ValueImpl.java (original) +++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/value/jcr/ValueImpl.java Tue Apr 18 13:00:50 2017 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.jackrabbit.oak.plugins.value; +package org.apache.jackrabbit.oak.plugins.value.jcr; import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkNotNull; @@ -38,23 +38,18 @@ import org.apache.jackrabbit.oak.api.Ill import org.apache.jackrabbit.oak.api.PropertyState; import org.apache.jackrabbit.oak.api.Type; import org.apache.jackrabbit.oak.namepath.NamePathMapper; +import org.apache.jackrabbit.oak.plugins.value.Conversions; +import org.apache.jackrabbit.oak.plugins.value.ErrorValue; +import org.apache.jackrabbit.oak.plugins.value.OakValue; import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** * Implementation of {@link Value} based on {@code PropertyState}. */ -public class ValueImpl implements JackrabbitValue { +public class ValueImpl implements JackrabbitValue, OakValue { private static final Logger LOG = LoggerFactory.getLogger(ValueImpl.class); - public static Blob getBlob(Value value) throws RepositoryException { - if (value instanceof ValueImpl) { - return ((ValueImpl) value).getBlob(); - } else { - return new BinaryBasedBlob(value.getBinary()); - } - } - private final PropertyState propertyState; private final Type<?> type; private final int index; @@ -131,7 +126,9 @@ public class ValueImpl implements Jackra } } - Blob getBlob() throws RepositoryException { + //-----------------------------------------------------------< OakValue >--- + + public Blob getBlob() throws RepositoryException { return getValue(Type.BINARY, index); } Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/AuthorizablePropertiesImpl.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/AuthorizablePropertiesImpl.java?rev=1791779&r1=1791778&r2=1791779&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/AuthorizablePropertiesImpl.java (original) +++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/AuthorizablePropertiesImpl.java Tue Apr 18 13:00:50 2017 @@ -29,7 +29,6 @@ import javax.jcr.Value; import javax.jcr.nodetype.ConstraintViolationException; import javax.jcr.nodetype.PropertyDefinition; -import com.google.common.collect.Iterators; import org.apache.jackrabbit.JcrConstants; import org.apache.jackrabbit.oak.api.PropertyState; import org.apache.jackrabbit.oak.api.Tree; @@ -38,7 +37,7 @@ import org.apache.jackrabbit.oak.commons import org.apache.jackrabbit.oak.namepath.NamePathMapper; import org.apache.jackrabbit.oak.plugins.memory.PropertyStates; import org.apache.jackrabbit.oak.plugins.nodetype.ReadOnlyNodeTypeManager; -import org.apache.jackrabbit.oak.plugins.value.ValueFactoryImpl; +import org.apache.jackrabbit.oak.plugins.value.jcr.ValueFactoryImpl; import org.apache.jackrabbit.oak.spi.security.user.UserConstants; import org.apache.jackrabbit.oak.util.NodeUtil; import org.apache.jackrabbit.util.Text; Copied: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/query/WhiteboardIndexProvider.java (from r1791745, jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/whiteboard/WhiteboardIndexProvider.java) URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/query/WhiteboardIndexProvider.java?p2=jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/query/WhiteboardIndexProvider.java&p1=jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/whiteboard/WhiteboardIndexProvider.java&r1=1791745&r2=1791779&rev=1791779&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/whiteboard/WhiteboardIndexProvider.java (original) +++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/query/WhiteboardIndexProvider.java Tue Apr 18 13:00:50 2017 @@ -16,16 +16,14 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.jackrabbit.oak.spi.whiteboard; +package org.apache.jackrabbit.oak.spi.query; import java.util.List; import javax.annotation.Nonnull; -import org.apache.jackrabbit.oak.spi.query.CompositeQueryIndexProvider; -import org.apache.jackrabbit.oak.spi.query.QueryIndex; -import org.apache.jackrabbit.oak.spi.query.QueryIndexProvider; import org.apache.jackrabbit.oak.spi.state.NodeState; +import org.apache.jackrabbit.oak.spi.whiteboard.AbstractServiceTracker; /** * Dynamic {@link QueryIndexProvider} based on the available Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/accesscontrol/ACE.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/accesscontrol/ACE.java?rev=1791779&r1=1791778&r2=1791779&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/accesscontrol/ACE.java (original) +++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/accesscontrol/ACE.java Tue Apr 18 13:00:50 2017 @@ -33,7 +33,7 @@ import com.google.common.collect.Collect import com.google.common.collect.ImmutableSet; import org.apache.jackrabbit.api.security.JackrabbitAccessControlEntry; import org.apache.jackrabbit.oak.namepath.NamePathMapper; -import org.apache.jackrabbit.oak.plugins.value.ValueFactoryImpl; +import org.apache.jackrabbit.oak.plugins.value.jcr.ValueFactoryImpl; import org.apache.jackrabbit.oak.spi.security.authorization.restriction.Restriction; import org.apache.jackrabbit.oak.spi.security.privilege.PrivilegeBits; Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/AbstractSecurityTest.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/AbstractSecurityTest.java?rev=1791779&r1=1791778&r2=1791779&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/AbstractSecurityTest.java (original) +++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/AbstractSecurityTest.java Tue Apr 18 13:00:50 2017 @@ -52,7 +52,7 @@ import org.apache.jackrabbit.oak.plugins import org.apache.jackrabbit.oak.plugins.name.NamespaceEditorProvider; import org.apache.jackrabbit.oak.plugins.nodetype.TypeEditorProvider; import org.apache.jackrabbit.oak.plugins.nodetype.write.InitialContent; -import org.apache.jackrabbit.oak.plugins.value.ValueFactoryImpl; +import org.apache.jackrabbit.oak.plugins.value.jcr.ValueFactoryImpl; import org.apache.jackrabbit.oak.plugins.version.VersionHook; import org.apache.jackrabbit.oak.query.QueryEngineSettings; import org.apache.jackrabbit.oak.security.SecurityProviderImpl; Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/OakTest.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/OakTest.java?rev=1791779&r1=1791778&r2=1791779&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/OakTest.java (original) +++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/OakTest.java Tue Apr 18 13:00:50 2017 @@ -49,7 +49,7 @@ import org.apache.jackrabbit.oak.spi.sta import org.apache.jackrabbit.oak.spi.whiteboard.DefaultWhiteboard; import org.apache.jackrabbit.oak.spi.whiteboard.Registration; import org.apache.jackrabbit.oak.spi.whiteboard.Whiteboard; -import org.apache.jackrabbit.oak.spi.whiteboard.WhiteboardIndexEditorProvider; +import org.apache.jackrabbit.oak.plugins.index.WhiteboardIndexEditorProvider; import org.apache.jackrabbit.oak.spi.whiteboard.WhiteboardUtils; import org.junit.Test; Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/blob/ClusterRepositoryInfoTest.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/blob/ClusterRepositoryInfoTest.java?rev=1791779&r1=1791778&r2=1791779&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/blob/ClusterRepositoryInfoTest.java (original) +++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/blob/ClusterRepositoryInfoTest.java Tue Apr 18 13:00:50 2017 @@ -27,7 +27,7 @@ import org.apache.jackrabbit.oak.plugins import org.apache.jackrabbit.oak.plugins.document.DocumentMKBuilderProvider; import org.apache.jackrabbit.oak.plugins.document.DocumentNodeStore; import org.apache.jackrabbit.oak.plugins.document.memory.MemoryDocumentStore; -import org.apache.jackrabbit.oak.plugins.identifier.ClusterRepositoryInfo; +import org.apache.jackrabbit.oak.spi.cluster.ClusterRepositoryInfo; import org.apache.jackrabbit.oak.spi.blob.BlobStore; import org.apache.jackrabbit.oak.spi.commit.CommitInfo; import org.apache.jackrabbit.oak.spi.commit.EmptyHook; Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/blob/DocumentBlobTrackerRegistrationTest.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/blob/DocumentBlobTrackerRegistrationTest.java?rev=1791779&r1=1791778&r2=1791779&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/blob/DocumentBlobTrackerRegistrationTest.java (original) +++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/blob/DocumentBlobTrackerRegistrationTest.java Tue Apr 18 13:00:50 2017 @@ -23,9 +23,7 @@ import java.util.Map; import org.apache.jackrabbit.oak.plugins.document.DocumentNodeStoreService; import org.apache.jackrabbit.oak.plugins.document.MongoUtils; -import org.apache.jackrabbit.oak.stats.StatisticsProvider; import org.junit.After; -import org.junit.Before; import org.junit.BeforeClass; import static com.google.common.collect.Maps.newHashMap; Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/blob/datastore/DataStoreTrackerGCTest.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/blob/datastore/DataStoreTrackerGCTest.java?rev=1791779&r1=1791778&r2=1791779&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/blob/datastore/DataStoreTrackerGCTest.java (original) +++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/blob/datastore/DataStoreTrackerGCTest.java Tue Apr 18 13:00:50 2017 @@ -42,7 +42,7 @@ import org.apache.jackrabbit.oak.plugins import org.apache.jackrabbit.oak.plugins.document.TestUtils; import org.apache.jackrabbit.oak.plugins.document.VersionGarbageCollector; import org.apache.jackrabbit.oak.plugins.document.memory.MemoryDocumentStore; -import org.apache.jackrabbit.oak.plugins.identifier.ClusterRepositoryInfo; +import org.apache.jackrabbit.oak.spi.cluster.ClusterRepositoryInfo; import org.apache.jackrabbit.oak.spi.blob.BlobStore; import org.apache.jackrabbit.oak.spi.blob.GarbageCollectableBlobStore; import org.apache.jackrabbit.oak.spi.commit.CommitInfo; @@ -50,7 +50,6 @@ import org.apache.jackrabbit.oak.spi.com import org.apache.jackrabbit.oak.spi.state.NodeBuilder; import org.apache.jackrabbit.oak.spi.state.NodeStore; import org.apache.jackrabbit.oak.stats.Clock; -import org.junit.After; import org.junit.AfterClass; import org.junit.Before; import org.junit.BeforeClass; Copied: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/blob/index/DataStoreTextWriterTest.java (from r1791745, jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/blob/datastore/DataStoreTextWriterTest.java) URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/blob/index/DataStoreTextWriterTest.java?p2=jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/blob/index/DataStoreTextWriterTest.java&p1=jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/blob/datastore/DataStoreTextWriterTest.java&r1=1791745&r2=1791779&rev=1791779&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/blob/datastore/DataStoreTextWriterTest.java (original) +++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/blob/index/DataStoreTextWriterTest.java Tue Apr 18 13:00:50 2017 @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.jackrabbit.oak.plugins.blob.datastore; +package org.apache.jackrabbit.oak.plugins.blob.index; import java.io.ByteArrayInputStream; import java.io.File; @@ -25,8 +25,9 @@ import java.io.File; import org.apache.commons.io.IOUtils; import org.apache.jackrabbit.core.data.DataRecord; import org.apache.jackrabbit.core.data.FileDataStore; -import org.apache.jackrabbit.oak.plugins.blob.datastore.DataStoreTextWriter; +import org.apache.jackrabbit.oak.plugins.blob.datastore.DataStoreUtils; import org.apache.jackrabbit.oak.plugins.blob.datastore.TextWriter; +import org.apache.jackrabbit.oak.plugins.blob.index.DataStoreTextWriter; import org.apache.jackrabbit.oak.plugins.index.fulltext.ExtractedText; import org.apache.jackrabbit.oak.plugins.index.fulltext.ExtractedText.ExtractionResult; import org.apache.jackrabbit.oak.plugins.memory.ArrayBasedBlob; Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/MongoBlobGCTest.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/MongoBlobGCTest.java?rev=1791779&r1=1791778&r2=1791779&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/MongoBlobGCTest.java (original) +++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/MongoBlobGCTest.java Tue Apr 18 13:00:50 2017 @@ -56,7 +56,7 @@ import org.apache.jackrabbit.oak.plugins import org.apache.jackrabbit.oak.plugins.blob.datastore.SharedDataStoreUtils; import org.apache.jackrabbit.oak.plugins.document.VersionGarbageCollector.VersionGCStats; import org.apache.jackrabbit.oak.plugins.document.mongo.MongoBlobReferenceIterator; -import org.apache.jackrabbit.oak.plugins.identifier.ClusterRepositoryInfo; +import org.apache.jackrabbit.oak.spi.cluster.ClusterRepositoryInfo; import org.apache.jackrabbit.oak.spi.blob.GarbageCollectableBlobStore; import org.apache.jackrabbit.oak.spi.commit.CommitInfo; import org.apache.jackrabbit.oak.spi.commit.EmptyHook; Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/SharedBlobStoreGCTest.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/SharedBlobStoreGCTest.java?rev=1791779&r1=1791778&r2=1791779&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/SharedBlobStoreGCTest.java (original) +++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/SharedBlobStoreGCTest.java Tue Apr 18 13:00:50 2017 @@ -49,7 +49,7 @@ import org.apache.jackrabbit.oak.plugins import org.apache.jackrabbit.oak.plugins.document.VersionGarbageCollector.VersionGCStats; import org.apache.jackrabbit.oak.plugins.blob.datastore.DataStoreUtils; import org.apache.jackrabbit.oak.plugins.document.memory.MemoryDocumentStore; -import org.apache.jackrabbit.oak.plugins.identifier.ClusterRepositoryInfo; +import org.apache.jackrabbit.oak.spi.cluster.ClusterRepositoryInfo; import org.apache.jackrabbit.oak.spi.blob.BlobStore; import org.apache.jackrabbit.oak.spi.blob.GarbageCollectableBlobStore; import org.apache.jackrabbit.oak.spi.commit.CommitInfo; Copied: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/value/jcr/PropertyStatesTest.java (from r1791745, jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/memory/PropertyStatesTest.java) URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/value/jcr/PropertyStatesTest.java?p2=jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/value/jcr/PropertyStatesTest.java&p1=jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/memory/PropertyStatesTest.java&r1=1791745&r2=1791779&rev=1791779&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/memory/PropertyStatesTest.java (original) +++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/value/jcr/PropertyStatesTest.java Tue Apr 18 13:00:50 2017 @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.jackrabbit.oak.plugins.memory; +package org.apache.jackrabbit.oak.plugins.value.jcr; import java.util.Calendar; @@ -29,7 +29,7 @@ import org.apache.jackrabbit.oak.api.Pro import org.apache.jackrabbit.oak.api.Type; import org.apache.jackrabbit.oak.namepath.LocalNameMapper; import org.apache.jackrabbit.oak.namepath.NamePathMapperImpl; -import org.apache.jackrabbit.oak.plugins.value.ValueFactoryImpl; +import org.apache.jackrabbit.oak.plugins.memory.PropertyStates; import org.apache.jackrabbit.util.ISO8601; import org.junit.Test; Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/accesscontrol/AccessControlManagerImplTest.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/accesscontrol/AccessControlManagerImplTest.java?rev=1791779&r1=1791778&r2=1791779&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/accesscontrol/AccessControlManagerImplTest.java (original) +++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/accesscontrol/AccessControlManagerImplTest.java Tue Apr 18 13:00:50 2017 @@ -64,7 +64,7 @@ import org.apache.jackrabbit.oak.namepat import org.apache.jackrabbit.oak.namepath.NamePathMapperImpl; import org.apache.jackrabbit.oak.plugins.name.ReadWriteNamespaceRegistry; import org.apache.jackrabbit.oak.plugins.nodetype.NodeTypeConstants; -import org.apache.jackrabbit.oak.plugins.value.ValueFactoryImpl; +import org.apache.jackrabbit.oak.plugins.value.jcr.ValueFactoryImpl; import org.apache.jackrabbit.oak.spi.security.authorization.accesscontrol.ACE; import org.apache.jackrabbit.oak.spi.security.authorization.accesscontrol.AbstractAccessControlManagerTest; import org.apache.jackrabbit.oak.spi.security.authorization.accesscontrol.AccessControlConstants; Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/restriction/ItemNameRestrictionTest.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/restriction/ItemNameRestrictionTest.java?rev=1791779&r1=1791778&r2=1791779&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/restriction/ItemNameRestrictionTest.java (original) +++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/restriction/ItemNameRestrictionTest.java Tue Apr 18 13:00:50 2017 @@ -41,7 +41,7 @@ import org.apache.jackrabbit.oak.api.Tre import org.apache.jackrabbit.oak.commons.PathUtils; import org.apache.jackrabbit.oak.namepath.NamePathMapper; import org.apache.jackrabbit.oak.plugins.nodetype.NodeTypeConstants; -import org.apache.jackrabbit.oak.plugins.value.ValueFactoryImpl; +import org.apache.jackrabbit.oak.plugins.value.jcr.ValueFactoryImpl; import org.apache.jackrabbit.oak.spi.security.authorization.accesscontrol.AccessControlConstants; import org.apache.jackrabbit.oak.spi.security.privilege.PrivilegeConstants; import org.apache.jackrabbit.oak.spi.security.user.UserConstants; Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/query/UserQueryManagerTest.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/query/UserQueryManagerTest.java?rev=1791779&r1=1791778&r2=1791779&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/query/UserQueryManagerTest.java (original) +++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/query/UserQueryManagerTest.java Tue Apr 18 13:00:50 2017 @@ -23,7 +23,7 @@ import javax.jcr.ValueFactory; import org.apache.jackrabbit.api.security.user.Authorizable; import org.apache.jackrabbit.api.security.user.User; import org.apache.jackrabbit.oak.AbstractSecurityTest; -import org.apache.jackrabbit.oak.plugins.value.ValueFactoryImpl; +import org.apache.jackrabbit.oak.plugins.value.jcr.ValueFactoryImpl; import org.apache.jackrabbit.oak.security.user.UserManagerImpl; import org.apache.jackrabbit.oak.spi.security.user.AuthorizableType; import org.junit.Before; Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/accesscontrol/ACETest.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/accesscontrol/ACETest.java?rev=1791779&r1=1791778&r2=1791779&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/accesscontrol/ACETest.java (original) +++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/accesscontrol/ACETest.java Tue Apr 18 13:00:50 2017 @@ -38,7 +38,7 @@ import com.google.common.collect.Immutab import com.google.common.collect.Lists; import org.apache.jackrabbit.api.security.JackrabbitAccessControlEntry; import org.apache.jackrabbit.commons.jackrabbit.authorization.AccessControlUtils; -import org.apache.jackrabbit.oak.plugins.value.ValueFactoryImpl; +import org.apache.jackrabbit.oak.plugins.value.jcr.ValueFactoryImpl; import org.apache.jackrabbit.oak.spi.security.authorization.restriction.Restriction; import org.apache.jackrabbit.oak.spi.security.privilege.PrivilegeBits; import org.apache.jackrabbit.oak.spi.security.privilege.PrivilegeConstants; Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/restriction/AbstractRestrictionProviderTest.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/restriction/AbstractRestrictionProviderTest.java?rev=1791779&r1=1791778&r2=1791779&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/restriction/AbstractRestrictionProviderTest.java (original) +++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/restriction/AbstractRestrictionProviderTest.java Tue Apr 18 13:00:50 2017 @@ -32,7 +32,7 @@ import org.apache.jackrabbit.oak.api.Pro import org.apache.jackrabbit.oak.api.Tree; import org.apache.jackrabbit.oak.api.Type; import org.apache.jackrabbit.oak.plugins.memory.PropertyStates; -import org.apache.jackrabbit.oak.plugins.value.ValueFactoryImpl; +import org.apache.jackrabbit.oak.plugins.value.jcr.ValueFactoryImpl; import org.apache.jackrabbit.oak.spi.security.authorization.accesscontrol.AccessControlConstants; import org.apache.jackrabbit.oak.util.NodeUtil; import org.junit.After; Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/util/PerfLoggerIT.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/util/PerfLoggerIT.java?rev=1791779&r1=1791778&r2=1791779&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/util/PerfLoggerIT.java (original) +++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/util/PerfLoggerIT.java Tue Apr 18 13:00:50 2017 @@ -1,156 +1,157 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.jackrabbit.oak.util; - -import org.junit.Before; -import org.junit.Test; -import org.mockito.Mock; -import org.mockito.MockitoAnnotations; -import org.slf4j.Logger; - -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyString; -import static org.mockito.Mockito.times; -import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.verifyNoMoreInteractions; -import static org.mockito.Mockito.when; - -/** - * Timing tests for {@link PerfLogger} using {@code Thread.sleep} because - * virtual clock requires currentTimeMillis (OAK-3877) - */ -public class PerfLoggerIT { - @Mock - Logger logger; - - private PerfLogger perfLogger; - - @Before - public void setup() { - MockitoAnnotations.initMocks(this); - when(logger.isTraceEnabled()).thenReturn(false); - when(logger.isDebugEnabled()).thenReturn(false); - when(logger.isInfoEnabled()).thenReturn(false); - - perfLogger = new PerfLogger(logger); - } - - //test for logger set at DEBUG - @Test - public void logAtDebugTimeoutNotHit() { - setupDebugLogger(); - - long start = perfLogger.start(); - perfLogger.end(start, 100, "message", "argument"); - - verifyTraceInteractions(1, false, false); - verifyDebugInteractions(2, false); - verifyNoMoreInteractions(logger); - } - - @Test - public void logAtDebugTimeoutHit() throws InterruptedException { - setupDebugLogger(); - - long start = perfLogger.start(); - Thread.sleep(100); - perfLogger.end(start, 20, "message", "argument"); - - verifyTraceInteractions(1, false, false); - verifyDebugInteractions(3, true); - verifyNoMoreInteractions(logger); - } - //end DEBUG tests - - - //test for logger set at INFO - @Test - public void logAtInfoDebugTimeoutHit() throws InterruptedException { - setupInfoLogger(); - - long start = perfLogger.start(); - Thread.sleep(100); - perfLogger.end(start, 20, "message", "argument"); - - verifyDebugInteractions(1, false); - verifyNoMoreInteractions(logger); - } - - @Test - public void logAtInfoInfoTimeoutNotHit() throws InterruptedException { - setupInfoLogger(); - - long start = perfLogger.startForInfoLog(); - Thread.sleep(100); - perfLogger.end(start, 20, 500, "message", "argument"); - - verifyTraceInteractions(1, false, false); - verifyDebugInteractions(1, false); - verifyInfoInteractions(2, false); - verifyNoMoreInteractions(logger); - } - - @Test - public void logAtInfoInfoTimeoutHit() throws InterruptedException { - setupInfoLogger(); - - long start = perfLogger.startForInfoLog(); - Thread.sleep(100); - perfLogger.end(start, 20, 50, "message", "argument"); - - verifyTraceInteractions(1, false, false); - verifyDebugInteractions(1, false); - verifyInfoInteractions(2, true); - verifyNoMoreInteractions(logger); - } - //end INFO tests - - private void setupDebugLogger() { - when(logger.isDebugEnabled()).thenReturn(true); - setupInfoLogger(); - } - private void setupInfoLogger() { - when(logger.isInfoEnabled()).thenReturn(true); - } - - private void verifyTraceInteractions(int enabled, boolean shouldLogStart, boolean shouldLogEnd) { - verify(logger, times(enabled)).isTraceEnabled(); - - if (shouldLogStart) { - verify(logger, times(1)).trace(anyString()); - } - if (shouldLogEnd) { - verify(logger, times(1)).trace(anyString(), any(Object[].class)); - } - } - - private void verifyDebugInteractions(int enabled, boolean shouldLog) { - verify(logger, times(enabled)).isDebugEnabled(); - - if (shouldLog) { - verify(logger, times(1)).debug(anyString(), any(Object[].class)); - } - } - - private void verifyInfoInteractions(int enabled, boolean shouldLog) { - verify(logger, times(enabled)).isInfoEnabled(); - - if (shouldLog) { - verify(logger, times(1)).info(anyString(), any(Object[].class)); - } - } -} +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.jackrabbit.oak.util; + +import org.apache.jackrabbit.oak.commons.benchmark.PerfLogger; +import org.junit.Before; +import org.junit.Test; +import org.mockito.Mock; +import org.mockito.MockitoAnnotations; +import org.slf4j.Logger; + +import static org.mockito.Matchers.any; +import static org.mockito.Matchers.anyString; +import static org.mockito.Mockito.times; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.verifyNoMoreInteractions; +import static org.mockito.Mockito.when; + +/** + * Timing tests for {@link PerfLogger} using {@code Thread.sleep} because + * virtual clock requires currentTimeMillis (OAK-3877) + */ +public class PerfLoggerIT { + @Mock + Logger logger; + + private PerfLogger perfLogger; + + @Before + public void setup() { + MockitoAnnotations.initMocks(this); + when(logger.isTraceEnabled()).thenReturn(false); + when(logger.isDebugEnabled()).thenReturn(false); + when(logger.isInfoEnabled()).thenReturn(false); + + perfLogger = new PerfLogger(logger); + } + + //test for logger set at DEBUG + @Test + public void logAtDebugTimeoutNotHit() { + setupDebugLogger(); + + long start = perfLogger.start(); + perfLogger.end(start, 100, "message", "argument"); + + verifyTraceInteractions(1, false, false); + verifyDebugInteractions(2, false); + verifyNoMoreInteractions(logger); + } + + @Test + public void logAtDebugTimeoutHit() throws InterruptedException { + setupDebugLogger(); + + long start = perfLogger.start(); + Thread.sleep(100); + perfLogger.end(start, 20, "message", "argument"); + + verifyTraceInteractions(1, false, false); + verifyDebugInteractions(3, true); + verifyNoMoreInteractions(logger); + } + //end DEBUG tests + + + //test for logger set at INFO + @Test + public void logAtInfoDebugTimeoutHit() throws InterruptedException { + setupInfoLogger(); + + long start = perfLogger.start(); + Thread.sleep(100); + perfLogger.end(start, 20, "message", "argument"); + + verifyDebugInteractions(1, false); + verifyNoMoreInteractions(logger); + } + + @Test + public void logAtInfoInfoTimeoutNotHit() throws InterruptedException { + setupInfoLogger(); + + long start = perfLogger.startForInfoLog(); + Thread.sleep(100); + perfLogger.end(start, 20, 500, "message", "argument"); + + verifyTraceInteractions(1, false, false); + verifyDebugInteractions(1, false); + verifyInfoInteractions(2, false); + verifyNoMoreInteractions(logger); + } + + @Test + public void logAtInfoInfoTimeoutHit() throws InterruptedException { + setupInfoLogger(); + + long start = perfLogger.startForInfoLog(); + Thread.sleep(100); + perfLogger.end(start, 20, 50, "message", "argument"); + + verifyTraceInteractions(1, false, false); + verifyDebugInteractions(1, false); + verifyInfoInteractions(2, true); + verifyNoMoreInteractions(logger); + } + //end INFO tests + + private void setupDebugLogger() { + when(logger.isDebugEnabled()).thenReturn(true); + setupInfoLogger(); + } + private void setupInfoLogger() { + when(logger.isInfoEnabled()).thenReturn(true); + } + + private void verifyTraceInteractions(int enabled, boolean shouldLogStart, boolean shouldLogEnd) { + verify(logger, times(enabled)).isTraceEnabled(); + + if (shouldLogStart) { + verify(logger, times(1)).trace(anyString()); + } + if (shouldLogEnd) { + verify(logger, times(1)).trace(anyString(), any(Object[].class)); + } + } + + private void verifyDebugInteractions(int enabled, boolean shouldLog) { + verify(logger, times(enabled)).isDebugEnabled(); + + if (shouldLog) { + verify(logger, times(1)).debug(anyString(), any(Object[].class)); + } + } + + private void verifyInfoInteractions(int enabled, boolean shouldLog) { + verify(logger, times(enabled)).isInfoEnabled(); + + if (shouldLog) { + verify(logger, times(1)).info(anyString(), any(Object[].class)); + } + } +} Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/util/PerfLoggerTest.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/util/PerfLoggerTest.java?rev=1791779&r1=1791778&r2=1791779&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/util/PerfLoggerTest.java (original) +++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/util/PerfLoggerTest.java Tue Apr 18 13:00:50 2017 @@ -16,6 +16,7 @@ */ package org.apache.jackrabbit.oak.util; +import org.apache.jackrabbit.oak.commons.benchmark.PerfLogger; import org.junit.Before; import org.junit.Test; import org.mockito.Mock; Modified: jackrabbit/oak/trunk/oak-exercise/pom.xml URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-exercise/pom.xml?rev=1791779&r1=1791778&r2=1791779&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-exercise/pom.xml (original) +++ jackrabbit/oak/trunk/oak-exercise/pom.xml Tue Apr 18 13:00:50 2017 @@ -94,6 +94,11 @@ </dependency> <dependency> <groupId>org.apache.jackrabbit</groupId> + <artifactId>oak-api</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.jackrabbit</groupId> <artifactId>oak-core</artifactId> <version>${project.version}</version> </dependency> Modified: jackrabbit/oak/trunk/oak-exercise/src/test/java/org/apache/jackrabbit/oak/security/authentication/L4_UserIDTest.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-exercise/src/test/java/org/apache/jackrabbit/oak/security/authentication/L4_UserIDTest.java?rev=1791779&r1=1791778&r2=1791779&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-exercise/src/test/java/org/apache/jackrabbit/oak/security/authentication/L4_UserIDTest.java (original) +++ jackrabbit/oak/trunk/oak-exercise/src/test/java/org/apache/jackrabbit/oak/security/authentication/L4_UserIDTest.java Tue Apr 18 13:00:50 2017 @@ -26,7 +26,6 @@ import javax.security.auth.login.AppConf import javax.security.auth.login.Configuration; import javax.security.auth.login.LoginException; -import org.apache.jackrabbit.oak.security.authentication.UserIDTestLoginModule; import org.apache.jackrabbit.test.AbstractJCRTest; /** Modified: jackrabbit/oak/trunk/oak-it-osgi/pom.xml URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-it-osgi/pom.xml?rev=1791779&r1=1791778&r2=1791779&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-it-osgi/pom.xml (original) +++ jackrabbit/oak/trunk/oak-it-osgi/pom.xml Tue Apr 18 13:00:50 2017 @@ -77,6 +77,18 @@ </dependency> <dependency> <groupId>org.apache.jackrabbit</groupId> + <artifactId>oak-core-spi</artifactId> + <version>${project.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.jackrabbit</groupId> + <artifactId>oak-store-spi</artifactId> + <version>${project.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.jackrabbit</groupId> <artifactId>oak-core</artifactId> <version>${project.version}</version> <scope>test</scope> Modified: jackrabbit/oak/trunk/oak-it-osgi/test-bundles.xml URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-it-osgi/test-bundles.xml?rev=1791779&r1=1791778&r2=1791779&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-it-osgi/test-bundles.xml (original) +++ jackrabbit/oak/trunk/oak-it-osgi/test-bundles.xml Tue Apr 18 13:00:50 2017 @@ -35,6 +35,7 @@ <include>org.apache.jackrabbit:jackrabbit-api</include> <include>org.apache.jackrabbit:jackrabbit-jcr-commons</include> <include>org.apache.jackrabbit:jackrabbit-data</include> + <include>org.apache.jackrabbit:oak-api</include> <include>org.apache.jackrabbit:oak-commons</include> <include>org.apache.jackrabbit:oak-core</include> <include>org.apache.jackrabbit:oak-segment-tar</include> @@ -42,6 +43,9 @@ <include>org.apache.jackrabbit:oak-lucene</include> <include>org.apache.tika:tika-core</include> <include>org.apache.jackrabbit:oak-blob</include> + <include>org.apache.jackrabbit:oak-core-spi</include> + <include>org.apache.jackrabbit:oak-store-spi</include> + <include>org.apache.jackrabbit:oak-blob-plugins</include> </includes> </dependencySet> </dependencySets> Modified: jackrabbit/oak/trunk/oak-it/pom.xml URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-it/pom.xml?rev=1791779&r1=1791778&r2=1791779&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-it/pom.xml (original) +++ jackrabbit/oak/trunk/oak-it/pom.xml Tue Apr 18 13:00:50 2017 @@ -58,6 +58,13 @@ </dependency> <dependency> <groupId>org.apache.jackrabbit</groupId> + <artifactId>oak-blob-plugins</artifactId> + <version>${project.version}</version> + <classifier>tests</classifier> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.jackrabbit</groupId> <artifactId>oak-blob-cloud</artifactId> <version>${project.version}</version> <scope>test</scope> Modified: jackrabbit/oak/trunk/oak-it/src/test/java/org/apache/jackrabbit/oak/spi/commit/CommitContextTest.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-it/src/test/java/org/apache/jackrabbit/oak/spi/commit/CommitContextTest.java?rev=1791779&r1=1791778&r2=1791779&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-it/src/test/java/org/apache/jackrabbit/oak/spi/commit/CommitContextTest.java (original) +++ jackrabbit/oak/trunk/oak-it/src/test/java/org/apache/jackrabbit/oak/spi/commit/CommitContextTest.java Tue Apr 18 13:00:50 2017 @@ -24,7 +24,6 @@ import java.io.IOException; import java.util.concurrent.atomic.AtomicInteger; import javax.annotation.Nonnull; -import javax.annotation.Nullable; import javax.jcr.NoSuchWorkspaceException; import javax.security.auth.login.LoginException; Modified: jackrabbit/oak/trunk/oak-it/src/test/java/org/apache/jackrabbit/oak/spi/state/CheckpointTest.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-it/src/test/java/org/apache/jackrabbit/oak/spi/state/CheckpointTest.java?rev=1791779&r1=1791778&r2=1791779&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-it/src/test/java/org/apache/jackrabbit/oak/spi/state/CheckpointTest.java (original) +++ jackrabbit/oak/trunk/oak-it/src/test/java/org/apache/jackrabbit/oak/spi/state/CheckpointTest.java Tue Apr 18 13:00:50 2017 @@ -22,7 +22,6 @@ package org.apache.jackrabbit.oak.spi.st import java.util.concurrent.atomic.AtomicInteger; import javax.annotation.Nonnull; -import javax.annotation.Nullable; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -40,7 +39,6 @@ import org.apache.jackrabbit.oak.spi.com import org.apache.jackrabbit.oak.spi.commit.Observer; import org.junit.After; import org.junit.Before; -import org.junit.Ignore; import org.junit.Test; public class CheckpointTest extends OakBaseTest { Modified: jackrabbit/oak/trunk/oak-jcr/pom.xml URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/pom.xml?rev=1791779&r1=1791778&r2=1791779&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-jcr/pom.xml (original) +++ jackrabbit/oak/trunk/oak-jcr/pom.xml Tue Apr 18 13:00:50 2017 @@ -211,6 +211,21 @@ <dependency> <groupId>org.apache.jackrabbit</groupId> + <artifactId>oak-api</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.jackrabbit</groupId> + <artifactId>oak-core-spi</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.jackrabbit</groupId> + <artifactId>oak-store-spi</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.jackrabbit</groupId> <artifactId>oak-core</artifactId> <version>${project.version}</version> </dependency> @@ -281,6 +296,12 @@ <!-- Test dependencies --> <dependency> + <groupId>org.apache.jackrabbit</groupId> + <artifactId>oak-blob-plugins</artifactId> + <version>${project.version}</version> + <scope>test</scope> + </dependency> + <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> <scope>test</scope> Modified: jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/observation/ChangeProcessor.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/observation/ChangeProcessor.java?rev=1791779&r1=1791778&r2=1791779&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/observation/ChangeProcessor.java (original) +++ jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/observation/ChangeProcessor.java Tue Apr 18 13:00:50 2017 @@ -67,7 +67,7 @@ import org.apache.jackrabbit.oak.stats.C import org.apache.jackrabbit.oak.stats.MeterStats; import org.apache.jackrabbit.oak.stats.StatisticManager; import org.apache.jackrabbit.oak.stats.TimerStats; -import org.apache.jackrabbit.oak.util.PerfLogger; +import org.apache.jackrabbit.oak.commons.benchmark.PerfLogger; import org.apache.jackrabbit.stats.TimeSeriesMax; import org.slf4j.Logger; import org.slf4j.LoggerFactory; Modified: jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/observation/EventFactory.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/observation/EventFactory.java?rev=1791779&r1=1791778&r2=1791779&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/observation/EventFactory.java (original) +++ jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/observation/EventFactory.java Tue Apr 18 13:00:50 2017 @@ -37,7 +37,7 @@ import org.apache.jackrabbit.api.observa import org.apache.jackrabbit.oak.api.PropertyState; import org.apache.jackrabbit.oak.commons.PathUtils; import org.apache.jackrabbit.oak.namepath.NamePathMapper; -import org.apache.jackrabbit.oak.plugins.value.ValueFactoryImpl; +import org.apache.jackrabbit.oak.plugins.value.jcr.ValueFactoryImpl; import org.apache.jackrabbit.oak.spi.commit.CommitInfo; /** Modified: jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/observation/OakEventFilterImpl.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/observation/OakEventFilterImpl.java?rev=1791779&r1=1791778&r2=1791779&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/observation/OakEventFilterImpl.java (original) +++ jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/observation/OakEventFilterImpl.java Tue Apr 18 13:00:50 2017 @@ -50,7 +50,6 @@ import org.apache.jackrabbit.oak.plugins import org.apache.jackrabbit.oak.plugins.observation.filter.PermissionProviderFactory; import org.apache.jackrabbit.oak.spi.state.ChildNodeEntry; import org.apache.jackrabbit.oak.spi.state.NodeState; -import org.slf4j.LoggerFactory; /** * Implements OakEventFilter which is an extension to the JackrabbitEventFilter Modified: jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/osgi/RepositoryManager.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/osgi/RepositoryManager.java?rev=1791779&r1=1791778&r2=1791779&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/osgi/RepositoryManager.java (original) +++ jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/osgi/RepositoryManager.java Tue Apr 18 13:00:50 2017 @@ -45,9 +45,9 @@ import org.apache.jackrabbit.oak.spi.sec import org.apache.jackrabbit.oak.spi.state.NodeStore; import org.apache.jackrabbit.oak.spi.whiteboard.Tracker; import org.apache.jackrabbit.oak.spi.whiteboard.Whiteboard; -import org.apache.jackrabbit.oak.spi.whiteboard.WhiteboardEditorProvider; -import org.apache.jackrabbit.oak.spi.whiteboard.WhiteboardIndexEditorProvider; -import org.apache.jackrabbit.oak.spi.whiteboard.WhiteboardIndexProvider; +import org.apache.jackrabbit.oak.spi.commit.WhiteboardEditorProvider; +import org.apache.jackrabbit.oak.plugins.index.WhiteboardIndexEditorProvider; +import org.apache.jackrabbit.oak.spi.query.WhiteboardIndexProvider; import org.apache.jackrabbit.oak.stats.StatisticsProvider; import org.osgi.framework.BundleContext; import org.osgi.framework.ServiceRegistration; Modified: jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/query/QueryResultImpl.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/query/QueryResultImpl.java?rev=1791779&r1=1791778&r2=1791779&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/query/QueryResultImpl.java (original) +++ jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/query/QueryResultImpl.java Tue Apr 18 13:00:50 2017 @@ -40,7 +40,7 @@ import org.apache.jackrabbit.oak.jcr.ses import org.apache.jackrabbit.oak.jcr.session.SessionContext; import org.apache.jackrabbit.oak.jcr.delegate.NodeDelegate; import org.apache.jackrabbit.oak.jcr.delegate.SessionDelegate; -import org.apache.jackrabbit.oak.plugins.value.ValueFactoryImpl; +import org.apache.jackrabbit.oak.plugins.value.jcr.ValueFactoryImpl; import org.slf4j.Logger; import org.slf4j.LoggerFactory; Modified: jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/repository/JcrDescriptorsImpl.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/repository/JcrDescriptorsImpl.java?rev=1791779&r1=1791778&r2=1791779&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/repository/JcrDescriptorsImpl.java (original) +++ jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/repository/JcrDescriptorsImpl.java Tue Apr 18 13:00:50 2017 @@ -20,14 +20,14 @@ import javax.jcr.Value; import javax.jcr.ValueFactory; import org.apache.jackrabbit.oak.api.Descriptors; -import org.apache.jackrabbit.oak.util.GenericDescriptors; +import org.apache.jackrabbit.oak.spi.descriptors.GenericDescriptors; import static javax.jcr.Repository.OPTION_LOCKING_SUPPORTED; import static javax.jcr.Repository.OPTION_XML_EXPORT_SUPPORTED; import static javax.jcr.Repository.OPTION_XML_IMPORT_SUPPORTED; /** - * The {@code JcrDescriptorsImpl} extend the {@link org.apache.jackrabbit.oak.util.GenericDescriptors} by automatically marking some of the JCR + * The {@code JcrDescriptorsImpl} extend the {@link GenericDescriptors} by automatically marking some of the JCR * features as supported. */ public class JcrDescriptorsImpl extends GenericDescriptors { Modified: jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/repository/RepositoryImpl.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/repository/RepositoryImpl.java?rev=1791779&r1=1791778&r2=1791779&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/repository/RepositoryImpl.java (original) +++ jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/repository/RepositoryImpl.java Tue Apr 18 13:00:50 2017 @@ -66,7 +66,7 @@ import org.apache.jackrabbit.oak.spi.whi import org.apache.jackrabbit.oak.spi.whiteboard.Whiteboard; import org.apache.jackrabbit.oak.stats.Clock; import org.apache.jackrabbit.oak.stats.StatisticManager; -import org.apache.jackrabbit.oak.util.GenericDescriptors; +import org.apache.jackrabbit.oak.spi.descriptors.GenericDescriptors; import org.slf4j.Logger; import org.slf4j.LoggerFactory; Modified: jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/session/PropertyImpl.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/session/PropertyImpl.java?rev=1791779&r1=1791778&r2=1791779&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/session/PropertyImpl.java (original) +++ jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/session/PropertyImpl.java Tue Apr 18 13:00:50 2017 @@ -45,7 +45,7 @@ import org.apache.jackrabbit.oak.api.Typ import org.apache.jackrabbit.oak.jcr.delegate.NodeDelegate; import org.apache.jackrabbit.oak.jcr.delegate.PropertyDelegate; import org.apache.jackrabbit.oak.jcr.session.operation.PropertyOperation; -import org.apache.jackrabbit.oak.plugins.value.ValueFactoryImpl; +import org.apache.jackrabbit.oak.plugins.value.jcr.ValueFactoryImpl; import org.apache.jackrabbit.value.ValueHelper; import org.slf4j.Logger; import org.slf4j.LoggerFactory; Modified: jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/session/SessionContext.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/session/SessionContext.java?rev=1791779&r1=1791778&r2=1791779&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/session/SessionContext.java (original) +++ jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/session/SessionContext.java Tue Apr 18 13:00:50 2017 @@ -55,7 +55,7 @@ import org.apache.jackrabbit.oak.namepat import org.apache.jackrabbit.oak.namepath.NamePathMapperImpl; import org.apache.jackrabbit.oak.plugins.nodetype.ReadOnlyNodeTypeManager; import org.apache.jackrabbit.oak.plugins.observation.CommitRateLimiter; -import org.apache.jackrabbit.oak.plugins.value.ValueFactoryImpl; +import org.apache.jackrabbit.oak.plugins.value.jcr.ValueFactoryImpl; import org.apache.jackrabbit.oak.spi.security.SecurityConfiguration; import org.apache.jackrabbit.oak.spi.security.SecurityProvider; import org.apache.jackrabbit.oak.spi.security.authorization.AuthorizationConfiguration; Modified: jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/version/VersionImpl.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/version/VersionImpl.java?rev=1791779&r1=1791778&r2=1791779&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/version/VersionImpl.java (original) +++ jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/version/VersionImpl.java Tue Apr 18 13:00:50 2017 @@ -41,7 +41,7 @@ import org.apache.jackrabbit.oak.jcr.del import org.apache.jackrabbit.oak.jcr.delegate.VersionHistoryDelegate; import org.apache.jackrabbit.oak.jcr.delegate.VersionManagerDelegate; import org.apache.jackrabbit.oak.jcr.session.operation.SessionOperation; -import org.apache.jackrabbit.oak.plugins.value.ValueFactoryImpl; +import org.apache.jackrabbit.oak.plugins.value.jcr.ValueFactoryImpl; import org.apache.jackrabbit.oak.plugins.version.VersionConstants; public class VersionImpl extends NodeImpl<VersionDelegate> implements Version { Modified: jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/AtomicCounterClusterIT.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/AtomicCounterClusterIT.java?rev=1791779&r1=1791778&r2=1791779&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/AtomicCounterClusterIT.java (original) +++ jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/AtomicCounterClusterIT.java Tue Apr 18 13:00:50 2017 @@ -48,7 +48,7 @@ import org.apache.jackrabbit.oak.commons import org.apache.jackrabbit.oak.commons.concurrent.ExecutorCloser; import org.apache.jackrabbit.oak.plugins.atomic.AtomicCounterEditor; import org.apache.jackrabbit.oak.spi.state.NodeStore; -import org.apache.jackrabbit.oak.util.PerfLogger; +import org.apache.jackrabbit.oak.commons.benchmark.PerfLogger; import org.junit.BeforeClass; import org.junit.Test; import org.slf4j.Logger; Modified: jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/observation/ObservationTest.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/observation/ObservationTest.java?rev=1791779&r1=1791778&r2=1791779&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/observation/ObservationTest.java (original) +++ jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/observation/ObservationTest.java Tue Apr 18 13:00:50 2017 @@ -66,13 +66,11 @@ import javax.jcr.ReferentialIntegrityExc import javax.jcr.RepositoryException; import javax.jcr.Session; import javax.jcr.Value; -import javax.jcr.ValueFormatException; import javax.jcr.lock.LockException; import javax.jcr.nodetype.ConstraintViolationException; import javax.jcr.nodetype.NoSuchNodeTypeException; import javax.jcr.nodetype.NodeDefinition; import javax.jcr.nodetype.NodeDefinitionTemplate; -import javax.jcr.nodetype.NodeTypeDefinition; import javax.jcr.nodetype.NodeTypeManager; import javax.jcr.nodetype.NodeTypeTemplate; import javax.jcr.observation.Event; Modified: jackrabbit/oak/trunk/oak-lucene/pom.xml URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/pom.xml?rev=1791779&r1=1791778&r2=1791779&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-lucene/pom.xml (original) +++ jackrabbit/oak/trunk/oak-lucene/pom.xml Tue Apr 18 13:00:50 2017 @@ -126,7 +126,7 @@ <Embed-Dependency> lucene-*;inline=true, <!-- TODO FIXME OAK-3598 --> - oak-core;inline="org/apache/jackrabbit/oak/cache/AbstractCacheStats.class|org/apache/jackrabbit/oak/cache/CacheStats.class" + oak-core-spi;inline="org/apache/jackrabbit/oak/cache/AbstractCacheStats.class|org/apache/jackrabbit/oak/cache/CacheStats.class" <!-- TODO FIXME OAK-3598 --> </Embed-Dependency> </instructions> @@ -174,6 +174,21 @@ <dependency> <groupId>org.apache.jackrabbit</groupId> + <artifactId>oak-api</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.jackrabbit</groupId> + <artifactId>oak-core-spi</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.jackrabbit</groupId> + <artifactId>oak-store-spi</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.jackrabbit</groupId> <artifactId>oak-core</artifactId> <version>${project.version}</version> </dependency> @@ -269,6 +284,13 @@ <version>${project.version}</version> <classifier>tests</classifier> <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.jackrabbit</groupId> + <artifactId>oak-blob-plugins</artifactId> + <version>${project.version}</version> + <classifier>tests</classifier> + <scope>test</scope> </dependency> <dependency> <groupId>org.apache.jackrabbit</groupId>
