Propchange: jackrabbit/oak/trunk/oak-api/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Tue Apr 18 13:00:50 2017 @@ -0,0 +1,5 @@ +target +.* +*.iml +*.ipr +*.iws
Added: jackrabbit/oak/trunk/oak-api/pom.xml URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-api/pom.xml?rev=1791779&view=auto ============================================================================== --- jackrabbit/oak/trunk/oak-api/pom.xml (added) +++ jackrabbit/oak/trunk/oak-api/pom.xml Tue Apr 18 13:00:50 2017 @@ -0,0 +1,92 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/4.0.0"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> + <parent> + <artifactId>jackrabbit-oak</artifactId> + <groupId>org.apache.jackrabbit</groupId> + <version>1.8-SNAPSHOT</version> + </parent> + <modelVersion>4.0.0</modelVersion> + + <artifactId>oak-api</artifactId> + <packaging>bundle</packaging> + + <name>Oak Api</name> + + <build> + <plugins> + <plugin> + <groupId>org.apache.felix</groupId> + <artifactId>maven-bundle-plugin</artifactId> + </plugin> + <plugin> + <groupId>org.apache.felix</groupId> + <artifactId>maven-scr-plugin</artifactId> + </plugin> + <plugin> + <artifactId>maven-failsafe-plugin</artifactId> + <configuration> + <systemPropertyVariables> + <java.util.logging.config.file> + src/test/resources/logging.properties + </java.util.logging.config.file> + </systemPropertyVariables> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.rat</groupId> + <artifactId>apache-rat-plugin</artifactId> + <configuration> + <excludes> + <exclude>**/test.json</exclude> + </excludes> + </configuration> + </plugin> + </plugins> + </build> + + <dependencies> + <!-- Optional OSGi dependencies, used only when running within OSGi --> + <dependency> + <groupId>org.osgi</groupId> + <artifactId>org.osgi.core</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.osgi</groupId> + <artifactId>org.osgi.compendium</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>biz.aQute.bnd</groupId> + <artifactId>bndlib</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.apache.felix</groupId> + <artifactId>org.apache.felix.scr.annotations</artifactId> + <scope>provided</scope> + </dependency> + + <!-- JCR and Jackrabbit dependencies --> + <dependency> + <groupId>javax.jcr</groupId> + <artifactId>jcr</artifactId> + <version>2.0</version> + </dependency> + + <!-- Findbugs annotations --> + <dependency> + <groupId>com.google.code.findbugs</groupId> + <artifactId>jsr305</artifactId> + </dependency> + + <!-- Test Dependencies --> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <scope>test</scope> + </dependency> + </dependencies> +</project> \ No newline at end of file Propchange: jackrabbit/oak/trunk/oak-api/pom.xml ------------------------------------------------------------------------------ svn:eol-style = native Copied: jackrabbit/oak/trunk/oak-api/src/main/java/org/apache/jackrabbit/oak/api/jmx/Description.java (from r1791745, jackrabbit/oak/trunk/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/jmx/Description.java) URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-api/src/main/java/org/apache/jackrabbit/oak/api/jmx/Description.java?p2=jackrabbit/oak/trunk/oak-api/src/main/java/org/apache/jackrabbit/oak/api/jmx/Description.java&p1=jackrabbit/oak/trunk/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/jmx/Description.java&r1=1791745&r2=1791779&rev=1791779&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/jmx/Description.java (original) +++ jackrabbit/oak/trunk/oak-api/src/main/java/org/apache/jackrabbit/oak/api/jmx/Description.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.commons.jmx; +package org.apache.jackrabbit.oak.api.jmx; import java.lang.annotation.Documented; import java.lang.annotation.ElementType; Copied: jackrabbit/oak/trunk/oak-api/src/main/java/org/apache/jackrabbit/oak/api/jmx/Impact.java (from r1791745, jackrabbit/oak/trunk/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/jmx/Impact.java) URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-api/src/main/java/org/apache/jackrabbit/oak/api/jmx/Impact.java?p2=jackrabbit/oak/trunk/oak-api/src/main/java/org/apache/jackrabbit/oak/api/jmx/Impact.java&p1=jackrabbit/oak/trunk/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/jmx/Impact.java&r1=1791745&r2=1791779&rev=1791779&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/jmx/Impact.java (original) +++ jackrabbit/oak/trunk/oak-api/src/main/java/org/apache/jackrabbit/oak/api/jmx/Impact.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.commons.jmx; +package org.apache.jackrabbit.oak.api.jmx; import java.lang.annotation.Documented; import java.lang.annotation.ElementType; Copied: jackrabbit/oak/trunk/oak-api/src/main/java/org/apache/jackrabbit/oak/api/jmx/ImpactOption.java (from r1791745, jackrabbit/oak/trunk/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/jmx/ImpactOption.java) URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-api/src/main/java/org/apache/jackrabbit/oak/api/jmx/ImpactOption.java?p2=jackrabbit/oak/trunk/oak-api/src/main/java/org/apache/jackrabbit/oak/api/jmx/ImpactOption.java&p1=jackrabbit/oak/trunk/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/jmx/ImpactOption.java&r1=1791745&r2=1791779&rev=1791779&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/jmx/ImpactOption.java (original) +++ jackrabbit/oak/trunk/oak-api/src/main/java/org/apache/jackrabbit/oak/api/jmx/ImpactOption.java Tue Apr 18 13:00:50 2017 @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.jackrabbit.oak.commons.jmx; +package org.apache.jackrabbit.oak.api.jmx; import javax.management.MBeanOperationInfo; Copied: jackrabbit/oak/trunk/oak-api/src/main/java/org/apache/jackrabbit/oak/api/jmx/IndexStatsMBean.java (from r1791745, jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/api/jmx/IndexStatsMBean.java) URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-api/src/main/java/org/apache/jackrabbit/oak/api/jmx/IndexStatsMBean.java?p2=jackrabbit/oak/trunk/oak-api/src/main/java/org/apache/jackrabbit/oak/api/jmx/IndexStatsMBean.java&p1=jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/api/jmx/IndexStatsMBean.java&r1=1791745&r2=1791779&rev=1791779&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/api/jmx/IndexStatsMBean.java (original) +++ jackrabbit/oak/trunk/oak-api/src/main/java/org/apache/jackrabbit/oak/api/jmx/IndexStatsMBean.java Tue Apr 18 13:00:50 2017 @@ -21,8 +21,6 @@ import javax.management.openmbean.Compos import javax.management.openmbean.TabularData; import aQute.bnd.annotation.ProviderType; -import org.apache.jackrabbit.oak.commons.jmx.Description; -import org.apache.jackrabbit.oak.commons.jmx.Name; @ProviderType public interface IndexStatsMBean { Copied: jackrabbit/oak/trunk/oak-api/src/main/java/org/apache/jackrabbit/oak/api/jmx/Name.java (from r1791745, jackrabbit/oak/trunk/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/jmx/Name.java) URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-api/src/main/java/org/apache/jackrabbit/oak/api/jmx/Name.java?p2=jackrabbit/oak/trunk/oak-api/src/main/java/org/apache/jackrabbit/oak/api/jmx/Name.java&p1=jackrabbit/oak/trunk/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/jmx/Name.java&r1=1791745&r2=1791779&rev=1791779&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/jmx/Name.java (original) +++ jackrabbit/oak/trunk/oak-api/src/main/java/org/apache/jackrabbit/oak/api/jmx/Name.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.commons.jmx; +package org.apache.jackrabbit.oak.api.jmx; import java.lang.annotation.Documented; import java.lang.annotation.ElementType; Copied: jackrabbit/oak/trunk/oak-api/src/main/java/org/apache/jackrabbit/oak/api/jmx/QueryEngineSettingsMBean.java (from r1791745, jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/api/jmx/QueryEngineSettingsMBean.java) URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-api/src/main/java/org/apache/jackrabbit/oak/api/jmx/QueryEngineSettingsMBean.java?p2=jackrabbit/oak/trunk/oak-api/src/main/java/org/apache/jackrabbit/oak/api/jmx/QueryEngineSettingsMBean.java&p1=jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/api/jmx/QueryEngineSettingsMBean.java&r1=1791745&r2=1791779&rev=1791779&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/api/jmx/QueryEngineSettingsMBean.java (original) +++ jackrabbit/oak/trunk/oak-api/src/main/java/org/apache/jackrabbit/oak/api/jmx/QueryEngineSettingsMBean.java Tue Apr 18 13:00:50 2017 @@ -16,8 +16,6 @@ */ package org.apache.jackrabbit.oak.api.jmx; -import org.apache.jackrabbit.oak.commons.jmx.Description; - import aQute.bnd.annotation.ProviderType; @ProviderType Copied: jackrabbit/oak/trunk/oak-api/src/main/java/org/apache/jackrabbit/oak/api/jmx/RepositoryManagementMBean.java (from r1791745, jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/api/jmx/RepositoryManagementMBean.java) URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-api/src/main/java/org/apache/jackrabbit/oak/api/jmx/RepositoryManagementMBean.java?p2=jackrabbit/oak/trunk/oak-api/src/main/java/org/apache/jackrabbit/oak/api/jmx/RepositoryManagementMBean.java&p1=jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/api/jmx/RepositoryManagementMBean.java&r1=1791745&r2=1791779&rev=1791779&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/api/jmx/RepositoryManagementMBean.java (original) +++ jackrabbit/oak/trunk/oak-api/src/main/java/org/apache/jackrabbit/oak/api/jmx/RepositoryManagementMBean.java Tue Apr 18 13:00:50 2017 @@ -25,8 +25,6 @@ import javax.management.openmbean.Compos import javax.management.openmbean.TabularData; import aQute.bnd.annotation.ProviderType; -import org.apache.jackrabbit.oak.commons.jmx.Description; -import org.apache.jackrabbit.oak.commons.jmx.Name; /** * This interface exposes repository management operations and the status Modified: jackrabbit/oak/trunk/oak-auth-external/pom.xml URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-auth-external/pom.xml?rev=1791779&r1=1791778&r2=1791779&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-auth-external/pom.xml (original) +++ jackrabbit/oak/trunk/oak-auth-external/pom.xml Tue Apr 18 13:00:50 2017 @@ -77,7 +77,6 @@ <artifactId>org.apache.felix.jaas</artifactId> <scope>provided</scope> </dependency> - <dependency> <groupId>biz.aQute.bnd</groupId> <artifactId>bndlib</artifactId> @@ -89,32 +88,44 @@ <scope>provided</scope> </dependency> + <!-- Jackrabbit dependencies --> <dependency> <groupId>org.apache.jackrabbit</groupId> - <artifactId>oak-core</artifactId> - <version>${project.version}</version> + <artifactId>jackrabbit-api</artifactId> + <version>${jackrabbit.version}</version> </dependency> <dependency> - <groupId>org.apache.jackrabbit</groupId> - <artifactId>oak-commons</artifactId> - <version>${project.version}</version> + <groupId>org.apache.jackrabbit</groupId> + <artifactId>jackrabbit-jcr-commons</artifactId> + <version>${jackrabbit.version}</version> </dependency> + <!-- Dependencies to other Oak components --> <dependency> - <groupId>com.google.guava</groupId> - <artifactId>guava</artifactId> + <groupId>org.apache.jackrabbit</groupId> + <artifactId>oak-api</artifactId> + <version>${project.version}</version> </dependency> - - <!-- Jackrabbit dependencies --> <dependency> <groupId>org.apache.jackrabbit</groupId> - <artifactId>jackrabbit-api</artifactId> - <version>${jackrabbit.version}</version> + <artifactId>oak-store-spi</artifactId> + <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.jackrabbit</groupId> - <artifactId>jackrabbit-jcr-commons</artifactId> - <version>${jackrabbit.version}</version> + <artifactId>oak-commons</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.jackrabbit</groupId> + <artifactId>oak-core</artifactId> + <version>${project.version}</version> + </dependency> + + <!-- General utility libraries --> + <dependency> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> </dependency> <!-- Logging --> Modified: jackrabbit/oak/trunk/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/ExternalLoginModule.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/ExternalLoginModule.java?rev=1791779&r1=1791778&r2=1791779&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/ExternalLoginModule.java (original) +++ jackrabbit/oak/trunk/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/ExternalLoginModule.java Tue Apr 18 13:00:50 2017 @@ -35,7 +35,7 @@ import org.apache.jackrabbit.oak.api.Com import org.apache.jackrabbit.oak.api.Root; import org.apache.jackrabbit.oak.commons.DebugTimer; 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.ConfigurationParameters; import org.apache.jackrabbit.oak.spi.security.authentication.AbstractLoginModule; import org.apache.jackrabbit.oak.spi.security.authentication.AuthInfoImpl; Modified: jackrabbit/oak/trunk/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/jmx/Delegatee.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/jmx/Delegatee.java?rev=1791779&r1=1791778&r2=1791779&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/jmx/Delegatee.java (original) +++ jackrabbit/oak/trunk/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/jmx/Delegatee.java Tue Apr 18 13:00:50 2017 @@ -40,7 +40,7 @@ import org.apache.jackrabbit.oak.api.Con import org.apache.jackrabbit.oak.api.ContentSession; import org.apache.jackrabbit.oak.api.Root; 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.SecurityProvider; import org.apache.jackrabbit.oak.spi.security.authentication.SystemSubject; import org.apache.jackrabbit.oak.spi.security.authentication.external.ExternalIdentity; Modified: jackrabbit/oak/trunk/oak-auth-ldap/pom.xml URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-auth-ldap/pom.xml?rev=1791779&r1=1791778&r2=1791779&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-auth-ldap/pom.xml (original) +++ jackrabbit/oak/trunk/oak-auth-ldap/pom.xml Tue Apr 18 13:00:50 2017 @@ -137,7 +137,6 @@ <version>2.7.7</version> <scope>provided</scope> </dependency> - <dependency> <groupId>biz.aQute.bnd</groupId> <artifactId>bndlib</artifactId> @@ -149,6 +148,19 @@ <scope>provided</scope> </dependency> + <!-- JCR and Jackrabbit dependencies --> + <dependency> + <groupId>javax.jcr</groupId> + <artifactId>jcr</artifactId> + <version>2.0</version> + </dependency> + + <!-- Dependencies to other Oak components --> + <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> @@ -165,18 +177,12 @@ <version>${project.version}</version> </dependency> + <!-- General utility libraries --> <dependency> <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> </dependency> - <!-- JCR and Jackrabbit dependencies --> - <dependency> - <groupId>javax.jcr</groupId> - <artifactId>jcr</artifactId> - <version>2.0</version> - </dependency> - <!-- Logging --> <dependency> <groupId>org.slf4j</groupId> Modified: jackrabbit/oak/trunk/oak-auth-ldap/src/test/java/org/apache/jackrabbit/oak/security/authentication/ldap/LdapLoginTestBase.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-auth-ldap/src/test/java/org/apache/jackrabbit/oak/security/authentication/ldap/LdapLoginTestBase.java?rev=1791779&r1=1791778&r2=1791779&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-auth-ldap/src/test/java/org/apache/jackrabbit/oak/security/authentication/ldap/LdapLoginTestBase.java (original) +++ jackrabbit/oak/trunk/oak-auth-ldap/src/test/java/org/apache/jackrabbit/oak/security/authentication/ldap/LdapLoginTestBase.java Tue Apr 18 13:00:50 2017 @@ -31,7 +31,7 @@ import org.apache.jackrabbit.oak.api.Aut import org.apache.jackrabbit.oak.api.ContentSession; import org.apache.jackrabbit.oak.api.Tree; 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.security.authentication.ldap.impl.LdapIdentityProvider; import org.apache.jackrabbit.oak.security.authentication.ldap.impl.LdapProviderConfig; import org.apache.jackrabbit.oak.spi.security.authentication.external.ExternalIdentityProvider; Modified: jackrabbit/oak/trunk/oak-authorization-cug/pom.xml URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-authorization-cug/pom.xml?rev=1791779&r1=1791778&r2=1791779&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-authorization-cug/pom.xml (original) +++ jackrabbit/oak/trunk/oak-authorization-cug/pom.xml Tue Apr 18 13:00:50 2017 @@ -58,6 +58,16 @@ <dependencies> <dependency> <groupId>org.apache.jackrabbit</groupId> + <artifactId>oak-api</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> Modified: jackrabbit/oak/trunk/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/VersionTest.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/VersionTest.java?rev=1791779&r1=1791778&r2=1791779&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/VersionTest.java (original) +++ jackrabbit/oak/trunk/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/VersionTest.java Tue Apr 18 13:00:50 2017 @@ -39,7 +39,6 @@ import org.apache.jackrabbit.oak.plugins import org.apache.jackrabbit.oak.spi.security.authorization.permission.Permissions; import org.apache.jackrabbit.oak.spi.security.authorization.permission.TreePermission; import org.apache.jackrabbit.oak.spi.security.principal.EveryonePrincipal; -import org.apache.jackrabbit.oak.util.NodeUtil; import org.apache.jackrabbit.oak.util.TreeUtil; import org.junit.Before; import org.junit.Test; Modified: jackrabbit/oak/trunk/oak-benchmarks/pom.xml URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-benchmarks/pom.xml?rev=1791779&r1=1791778&r2=1791779&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-benchmarks/pom.xml (original) +++ jackrabbit/oak/trunk/oak-benchmarks/pom.xml Tue Apr 18 13:00:50 2017 @@ -78,6 +78,21 @@ <dependencies> <dependency> <groupId>org.apache.jackrabbit</groupId> + <artifactId>oak-api</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-spi</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.jackrabbit</groupId> <artifactId>oak-commons</artifactId> <version>${project.version}</version> </dependency> @@ -202,11 +217,6 @@ <artifactId>mongo-java-driver</artifactId> </dependency> <dependency> - <groupId>com.h2database</groupId> - <artifactId>h2-mvstore</artifactId> - <version>${h2.version}</version> - </dependency> - <dependency> <groupId>net.sf.jopt-simple</groupId> <artifactId>jopt-simple</artifactId> <version>4.6</version> Modified: jackrabbit/oak/trunk/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/BundlingNodeTest.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/BundlingNodeTest.java?rev=1791779&r1=1791778&r2=1791779&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/BundlingNodeTest.java (original) +++ jackrabbit/oak/trunk/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/BundlingNodeTest.java Tue Apr 18 13:00:50 2017 @@ -45,7 +45,6 @@ import javax.jcr.nodetype.NodeType; import com.google.common.base.Joiner; import com.google.common.collect.EvictingQueue; -import org.apache.commons.collections.buffer.CircularFifoBuffer; import org.apache.jackrabbit.JcrConstants; import org.apache.jackrabbit.commons.cnd.CndImporter; import org.apache.jackrabbit.commons.cnd.ParseException; Modified: jackrabbit/oak/trunk/oak-blob-cloud-azure/pom.xml URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-blob-cloud-azure/pom.xml?rev=1791779&r1=1791778&r2=1791779&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-blob-cloud-azure/pom.xml (original) +++ jackrabbit/oak/trunk/oak-blob-cloud-azure/pom.xml Tue Apr 18 13:00:50 2017 @@ -112,7 +112,7 @@ </dependency> <dependency> <groupId>org.apache.jackrabbit</groupId> - <artifactId>oak-core</artifactId> + <artifactId>oak-blob-plugins</artifactId> <version>${project.version}</version> </dependency> @@ -140,6 +140,19 @@ <groupId>org.apache.jackrabbit</groupId> <artifactId>oak-core</artifactId> <version>${project.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.jackrabbit</groupId> + <artifactId>oak-core</artifactId> + <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> Modified: jackrabbit/oak/trunk/oak-blob-cloud/pom.xml URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-blob-cloud/pom.xml?rev=1791779&r1=1791778&r2=1791779&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-blob-cloud/pom.xml (original) +++ jackrabbit/oak/trunk/oak-blob-cloud/pom.xml Tue Apr 18 13:00:50 2017 @@ -95,10 +95,19 @@ <!-- Dependencies to other Oak components --> <dependency> <groupId>org.apache.jackrabbit</groupId> + <artifactId>oak-api</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.jackrabbit</groupId> <artifactId>oak-commons</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-blob</artifactId> @@ -106,7 +115,12 @@ </dependency> <dependency> <groupId>org.apache.jackrabbit</groupId> - <artifactId>oak-core</artifactId> + <artifactId>oak-blob-plugins</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.jackrabbit</groupId> + <artifactId>oak-store-spi</artifactId> <version>${project.version}</version> </dependency> <!-- Amazon AWS dependency --> @@ -135,7 +149,7 @@ </dependency> <dependency> <groupId>org.apache.jackrabbit</groupId> - <artifactId>oak-core</artifactId> + <artifactId>oak-blob-plugins</artifactId> <version>${project.version}</version> <classifier>tests</classifier> <scope>test</scope> Propchange: jackrabbit/oak/trunk/oak-blob-plugins/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Tue Apr 18 13:00:50 2017 @@ -0,0 +1,5 @@ +target +.* +*.iml +*.ipr +*.iws Added: jackrabbit/oak/trunk/oak-blob-plugins/pom.xml URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-blob-plugins/pom.xml?rev=1791779&view=auto ============================================================================== --- jackrabbit/oak/trunk/oak-blob-plugins/pom.xml (added) +++ jackrabbit/oak/trunk/oak-blob-plugins/pom.xml Tue Apr 18 13:00:50 2017 @@ -0,0 +1,175 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/4.0.0"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> + <parent> + <artifactId>jackrabbit-oak</artifactId> + <groupId>org.apache.jackrabbit</groupId> + <version>1.8-SNAPSHOT</version> + </parent> + <modelVersion>4.0.0</modelVersion> + + <artifactId>oak-blob-plugins</artifactId> + <name>Oak Blob Plugins</name> + <packaging>bundle</packaging> + + <build> + <plugins> + <plugin> + <groupId>org.apache.felix</groupId> + <artifactId>maven-scr-plugin</artifactId> + </plugin> + <plugin> + <groupId>org.apache.felix</groupId> + <artifactId>maven-bundle-plugin</artifactId> + </plugin> + </plugins> + </build> + + <dependencies> + <!-- Optional OSGi dependencies, used only when running within OSGi --> + <dependency> + <groupId>org.osgi</groupId> + <artifactId>org.osgi.core</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.osgi</groupId> + <artifactId>org.osgi.compendium</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>biz.aQute.bnd</groupId> + <artifactId>bndlib</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.apache.felix</groupId> + <artifactId>org.apache.felix.scr.annotations</artifactId> + <scope>provided</scope> + </dependency> + + <!-- JCR and Jackrabbit dependencies --> + <dependency> + <groupId>javax.jcr</groupId> + <artifactId>jcr</artifactId> + <version>2.0</version> + </dependency> + <dependency> + <groupId>org.apache.jackrabbit</groupId> + <artifactId>jackrabbit-api</artifactId> + <version>${jackrabbit.version}</version> + </dependency> + <dependency> + <groupId>org.apache.jackrabbit</groupId> + <artifactId>jackrabbit-jcr-commons</artifactId> + <version>${jackrabbit.version}</version> + </dependency> + <dependency> + <groupId>org.apache.jackrabbit</groupId> + <artifactId>jackrabbit-data</artifactId> + <version>${jackrabbit.version}</version> + </dependency> + + <!-- Dependencies to other Oak components --> + <dependency> + <groupId>org.apache.jackrabbit</groupId> + <artifactId>oak-api</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.jackrabbit</groupId> + <artifactId>oak-commons</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-blob</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.jackrabbit</groupId> + <artifactId>oak-store-spi</artifactId> + <version>${project.version}</version> + </dependency> + + <!-- Optional dependency for jclouds s3 to enable s3 cloud store --> + <dependency> + <groupId>org.apache.jclouds.provider</groupId> + <artifactId>aws-s3</artifactId> + <optional>true</optional> + </dependency> + + <!-- General utility libraries --> + <dependency> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> + </dependency> + <dependency> + <groupId>commons-io</groupId> + <artifactId>commons-io</artifactId> + </dependency> + <dependency> + <groupId>commons-codec</groupId> + <artifactId>commons-codec</artifactId> + <version>1.5</version> + </dependency> + + <!-- Logging --> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + </dependency> + + <!-- Findbugs annotations --> + <dependency> + <groupId>com.google.code.findbugs</groupId> + <artifactId>jsr305</artifactId> + </dependency> + + <!-- Test Dependencies --> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.jackrabbit</groupId> + <artifactId>jackrabbit-data</artifactId> + <version>${jackrabbit.version}</version> + <classifier>tests</classifier> + <scope>test</scope> + <optional>true</optional> + </dependency> + <dependency> + <groupId>org.hamcrest</groupId> + <artifactId>hamcrest-core</artifactId> + <version>1.3</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.mockito</groupId> + <artifactId>mockito-core</artifactId> + <version>1.10.19</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.jackrabbit</groupId> + <artifactId>oak-blob</artifactId> + <version>${project.version}</version> + <classifier>tests</classifier> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.sling</groupId> + <artifactId>org.apache.sling.testing.osgi-mock</artifactId> + <scope>test</scope> + </dependency> + </dependencies> + +</project> \ No newline at end of file Propchange: jackrabbit/oak/trunk/oak-blob-plugins/pom.xml ------------------------------------------------------------------------------ svn:eol-style = native Copied: jackrabbit/oak/trunk/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/BlobGC.java (from r1791745, jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/blob/BlobGC.java) URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/BlobGC.java?p2=jackrabbit/oak/trunk/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/BlobGC.java&p1=jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/blob/BlobGC.java&r1=1791745&r2=1791779&rev=1791779&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/blob/BlobGC.java (original) +++ jackrabbit/oak/trunk/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/BlobGC.java Tue Apr 18 13:00:50 2017 @@ -22,9 +22,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.commons.IOUtils.humanReadableByteCount; -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.Date; import java.util.List; @@ -43,7 +43,7 @@ import javax.management.openmbean.Tabula import javax.management.openmbean.TabularType; import org.apache.jackrabbit.oak.commons.jmx.AnnotatedStandardMBean; -import org.apache.jackrabbit.oak.management.ManagementOperation; +import org.apache.jackrabbit.oak.commons.jmx.ManagementOperation; import org.slf4j.Logger; import org.slf4j.LoggerFactory; Copied: jackrabbit/oak/trunk/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/BlobGCMBean.java (from r1791745, jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/blob/BlobGCMBean.java) URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/BlobGCMBean.java?p2=jackrabbit/oak/trunk/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/BlobGCMBean.java&p1=jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/blob/BlobGCMBean.java&r1=1791745&r2=1791779&rev=1791779&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/blob/BlobGCMBean.java (original) +++ jackrabbit/oak/trunk/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/BlobGCMBean.java Tue Apr 18 13:00:50 2017 @@ -19,8 +19,8 @@ package org.apache.jackrabbit.oak.plugins.blob; -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; import javax.annotation.Nonnull; import javax.management.openmbean.CompositeData; Copied: jackrabbit/oak/trunk/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/benchmark/PerfLogger.java (from r1791745, jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/util/PerfLogger.java) URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/benchmark/PerfLogger.java?p2=jackrabbit/oak/trunk/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/benchmark/PerfLogger.java&p1=jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/util/PerfLogger.java&r1=1791745&r2=1791779&rev=1791779&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/util/PerfLogger.java (original) +++ jackrabbit/oak/trunk/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/benchmark/PerfLogger.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.util; +package org.apache.jackrabbit.oak.commons.benchmark; import java.util.concurrent.TimeUnit; Copied: jackrabbit/oak/trunk/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/hash/SipHash.java (from r1791745, jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/util/SipHash.java) URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/hash/SipHash.java?p2=jackrabbit/oak/trunk/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/hash/SipHash.java&p1=jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/util/SipHash.java&r1=1791745&r2=1791779&rev=1791779&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/util/SipHash.java (original) +++ jackrabbit/oak/trunk/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/hash/SipHash.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.util; +package org.apache.jackrabbit.oak.commons.hash; /** * An implementation of the SipHash-2-2 function, to prevent hash flooding. Propchange: jackrabbit/oak/trunk/oak-core-spi/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Tue Apr 18 13:00:50 2017 @@ -0,0 +1,5 @@ +target +.* +*.iml +*.ipr +*.iws Added: jackrabbit/oak/trunk/oak-core-spi/pom.xml URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core-spi/pom.xml?rev=1791779&view=auto ============================================================================== --- jackrabbit/oak/trunk/oak-core-spi/pom.xml (added) +++ jackrabbit/oak/trunk/oak-core-spi/pom.xml Tue Apr 18 13:00:50 2017 @@ -0,0 +1,142 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/4.0.0"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> + <parent> + <artifactId>jackrabbit-oak</artifactId> + <groupId>org.apache.jackrabbit</groupId> + <version>1.8-SNAPSHOT</version> + </parent> + <modelVersion>4.0.0</modelVersion> + + <artifactId>oak-core-spi</artifactId> + <name>Oak Core SPI</name> + <packaging>bundle</packaging> + + <build> + <plugins> + <plugin> + <groupId>org.apache.felix</groupId> + <artifactId>maven-bundle-plugin</artifactId> + <configuration> + <instructions> + <Export-Package> + org.apache.jackrabbit.oak.cache, + org.apache.jackrabbit.oak.commons.jmx, + org.apache.jackrabbit.oak.osgi, + org.apache.jackrabbit.oak.spi.descriptors, + org.apache.jackrabbit.oak.spi.gc, + org.apache.jackrabbit.oak.spi.mount, + org.apache.jackrabbit.oak.spi.whiteboard, + org.apache.jackrabbit.oak.stats + </Export-Package> + </instructions> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.rat</groupId> + <artifactId>apache-rat-plugin</artifactId> + <configuration> + <excludes> + <exclude>**/test-file-1.csv</exclude> + <exclude>**/test-file-1.txt</exclude> + <exclude>**/test-file-2.txt</exclude> + <exclude>**/test-file-2.csv</exclude> + </excludes> + </configuration> + </plugin> + </plugins> + </build> + + <dependencies> + <!-- Optional OSGi dependencies, used only when running within OSGi --> + <dependency> + <groupId>org.osgi</groupId> + <artifactId>org.osgi.core</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.osgi</groupId> + <artifactId>org.osgi.compendium</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>biz.aQute.bnd</groupId> + <artifactId>bndlib</artifactId> + <scope>provided</scope> + </dependency> + + <!-- JCR and Jackrabbit dependencies --> + <dependency> + <groupId>javax.jcr</groupId> + <artifactId>jcr</artifactId> + <version>2.0</version> + </dependency> + <dependency> + <groupId>org.apache.jackrabbit</groupId> + <artifactId>jackrabbit-jcr-commons</artifactId> + <version>${jackrabbit.version}</version> + </dependency> + <dependency> + <groupId>org.apache.jackrabbit</groupId> + <artifactId>jackrabbit-api</artifactId> + <version>${jackrabbit.version}</version> + </dependency> + + <!-- Other Oak module --> + <dependency> + <groupId>org.apache.jackrabbit</groupId> + <artifactId>oak-api</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.jackrabbit</groupId> + <artifactId>oak-commons</artifactId> + <version>${project.version}</version> + </dependency> + + <!-- General utility libraries --> + <dependency> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> + </dependency> + + <!-- Logging --> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + </dependency> + + <!-- Findbugs annotations --> + <dependency> + <groupId>com.google.code.findbugs</groupId> + <artifactId>jsr305</artifactId> + </dependency> + + <!-- Test dependencies --> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>ch.qos.logback</groupId> + <artifactId>logback-classic</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.mockito</groupId> + <artifactId>mockito-core</artifactId> + <version>1.10.19</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.jackrabbit</groupId> + <artifactId>oak-commons</artifactId> + <version>${project.version}</version> + <classifier>tests</classifier> + <scope>test</scope> + </dependency> + </dependencies> + +</project> \ No newline at end of file Propchange: jackrabbit/oak/trunk/oak-core-spi/pom.xml ------------------------------------------------------------------------------ svn:eol-style = native Copied: jackrabbit/oak/trunk/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/AbstractCacheStats.java (from r1791745, jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/cache/AbstractCacheStats.java) URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/AbstractCacheStats.java?p2=jackrabbit/oak/trunk/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/AbstractCacheStats.java&p1=jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/cache/AbstractCacheStats.java&r1=1791745&r2=1791779&rev=1791779&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/cache/AbstractCacheStats.java (original) +++ jackrabbit/oak/trunk/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/AbstractCacheStats.java Tue Apr 18 13:00:50 2017 @@ -154,7 +154,7 @@ public abstract class AbstractCacheStats .toString(); } - static String timeInWords(long nanos) { + public static String timeInWords(long nanos) { long millis = TimeUnit.NANOSECONDS.toMillis(nanos); return String.format("%d min, %d sec", TimeUnit.MILLISECONDS.toMinutes(millis), Copied: jackrabbit/oak/trunk/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/commons/jmx/AbstractCheckpointMBean.java (from r1791745, jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/util/AbstractCheckpointMBean.java) URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/commons/jmx/AbstractCheckpointMBean.java?p2=jackrabbit/oak/trunk/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/commons/jmx/AbstractCheckpointMBean.java&p1=jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/util/AbstractCheckpointMBean.java&r1=1791745&r2=1791779&rev=1791779&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/util/AbstractCheckpointMBean.java (original) +++ jackrabbit/oak/trunk/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/commons/jmx/AbstractCheckpointMBean.java Tue Apr 18 13:00:50 2017 @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.jackrabbit.oak.util; +package org.apache.jackrabbit.oak.commons.jmx; import static javax.management.openmbean.SimpleType.STRING; Copied: jackrabbit/oak/trunk/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/commons/jmx/AnnotatedStandardMBean.java (from r1791745, jackrabbit/oak/trunk/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/jmx/AnnotatedStandardMBean.java) URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/commons/jmx/AnnotatedStandardMBean.java?p2=jackrabbit/oak/trunk/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/commons/jmx/AnnotatedStandardMBean.java&p1=jackrabbit/oak/trunk/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/jmx/AnnotatedStandardMBean.java&r1=1791745&r2=1791779&rev=1791779&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/jmx/AnnotatedStandardMBean.java (original) +++ jackrabbit/oak/trunk/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/commons/jmx/AnnotatedStandardMBean.java Tue Apr 18 13:00:50 2017 @@ -25,6 +25,11 @@ import javax.management.MBeanOperationIn import javax.management.MBeanParameterInfo; import javax.management.StandardMBean; +import org.apache.jackrabbit.oak.api.jmx.Description; +import org.apache.jackrabbit.oak.api.jmx.Impact; +import org.apache.jackrabbit.oak.api.jmx.ImpactOption; +import org.apache.jackrabbit.oak.api.jmx.Name; + /** * The extension of {@link javax.management.StandardMBean} that will automatically provide JMX * metadata through annotations. Copied: jackrabbit/oak/trunk/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/commons/jmx/ManagementOperation.java (from r1791745, jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/management/ManagementOperation.java) URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/commons/jmx/ManagementOperation.java?p2=jackrabbit/oak/trunk/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/commons/jmx/ManagementOperation.java&p1=jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/management/ManagementOperation.java&r1=1791745&r2=1791779&rev=1791779&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/management/ManagementOperation.java (original) +++ jackrabbit/oak/trunk/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/commons/jmx/ManagementOperation.java Tue Apr 18 13:00:50 2017 @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.jackrabbit.oak.management; +package org.apache.jackrabbit.oak.commons.jmx; import static com.google.common.base.Objects.toStringHelper; import static com.google.common.base.Preconditions.checkNotNull; @@ -38,10 +38,10 @@ import static org.apache.jackrabbit.oak. import static org.apache.jackrabbit.oak.api.jmx.RepositoryManagementMBean.StatusCode.RUNNING; import static org.apache.jackrabbit.oak.api.jmx.RepositoryManagementMBean.StatusCode.SUCCEEDED; import static org.apache.jackrabbit.oak.api.jmx.RepositoryManagementMBean.StatusCode.UNAVAILABLE; -import static org.apache.jackrabbit.oak.management.ManagementOperation.Status.failed; -import static org.apache.jackrabbit.oak.management.ManagementOperation.Status.none; -import static org.apache.jackrabbit.oak.management.ManagementOperation.Status.running; -import static org.apache.jackrabbit.oak.management.ManagementOperation.Status.succeeded; +import static org.apache.jackrabbit.oak.commons.jmx.ManagementOperation.Status.failed; +import static org.apache.jackrabbit.oak.commons.jmx.ManagementOperation.Status.none; +import static org.apache.jackrabbit.oak.commons.jmx.ManagementOperation.Status.running; +import static org.apache.jackrabbit.oak.commons.jmx.ManagementOperation.Status.succeeded; import java.util.concurrent.Callable; import java.util.concurrent.ExecutionException; Copied: jackrabbit/oak/trunk/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/spi/descriptors/AggregatingDescriptors.java (from r1791745, jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/util/AggregatingDescriptors.java) URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/spi/descriptors/AggregatingDescriptors.java?p2=jackrabbit/oak/trunk/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/spi/descriptors/AggregatingDescriptors.java&p1=jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/util/AggregatingDescriptors.java&r1=1791745&r2=1791779&rev=1791779&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/util/AggregatingDescriptors.java (original) +++ jackrabbit/oak/trunk/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/spi/descriptors/AggregatingDescriptors.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.util; +package org.apache.jackrabbit.oak.spi.descriptors; import java.util.Collections; import java.util.HashSet; Copied: jackrabbit/oak/trunk/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/spi/descriptors/GenericDescriptors.java (from r1791745, jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/util/GenericDescriptors.java) URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/spi/descriptors/GenericDescriptors.java?p2=jackrabbit/oak/trunk/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/spi/descriptors/GenericDescriptors.java&p1=jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/util/GenericDescriptors.java&r1=1791745&r2=1791779&rev=1791779&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/util/GenericDescriptors.java (original) +++ jackrabbit/oak/trunk/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/spi/descriptors/GenericDescriptors.java Tue Apr 18 13:00:50 2017 @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.jackrabbit.oak.util; +package org.apache.jackrabbit.oak.spi.descriptors; import java.util.Collections; import java.util.HashSet; Copied: jackrabbit/oak/trunk/oak-core-spi/src/test/java/org/apache/jackrabbit/oak/commons/jmx/AnnotatedStandardMBeanTest.java (from r1791745, jackrabbit/oak/trunk/oak-commons/src/test/java/org/apache/jackrabbit/oak/commons/jmx/AnnotatedStandardMBeanTest.java) URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core-spi/src/test/java/org/apache/jackrabbit/oak/commons/jmx/AnnotatedStandardMBeanTest.java?p2=jackrabbit/oak/trunk/oak-core-spi/src/test/java/org/apache/jackrabbit/oak/commons/jmx/AnnotatedStandardMBeanTest.java&p1=jackrabbit/oak/trunk/oak-commons/src/test/java/org/apache/jackrabbit/oak/commons/jmx/AnnotatedStandardMBeanTest.java&r1=1791745&r2=1791779&rev=1791779&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-commons/src/test/java/org/apache/jackrabbit/oak/commons/jmx/AnnotatedStandardMBeanTest.java (original) +++ jackrabbit/oak/trunk/oak-core-spi/src/test/java/org/apache/jackrabbit/oak/commons/jmx/AnnotatedStandardMBeanTest.java Tue Apr 18 13:00:50 2017 @@ -27,6 +27,10 @@ import javax.management.MBeanParameterIn import javax.management.MBeanServer; import javax.management.ObjectName; +import org.apache.jackrabbit.oak.api.jmx.Description; +import org.apache.jackrabbit.oak.api.jmx.Impact; +import org.apache.jackrabbit.oak.api.jmx.ImpactOption; +import org.apache.jackrabbit.oak.api.jmx.Name; import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; Copied: jackrabbit/oak/trunk/oak-core-spi/src/test/java/org/apache/jackrabbit/oak/commons/jmx/ManagementOperationTest.java (from r1791745, jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/management/ManagementOperationTest.java) URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core-spi/src/test/java/org/apache/jackrabbit/oak/commons/jmx/ManagementOperationTest.java?p2=jackrabbit/oak/trunk/oak-core-spi/src/test/java/org/apache/jackrabbit/oak/commons/jmx/ManagementOperationTest.java&p1=jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/management/ManagementOperationTest.java&r1=1791745&r2=1791779&rev=1791779&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/management/ManagementOperationTest.java (original) +++ jackrabbit/oak/trunk/oak-core-spi/src/test/java/org/apache/jackrabbit/oak/commons/jmx/ManagementOperationTest.java Tue Apr 18 13:00:50 2017 @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.jackrabbit.oak.management; +package org.apache.jackrabbit.oak.commons.jmx; import static com.google.common.util.concurrent.MoreExecutors.listeningDecorator; import static com.google.common.util.concurrent.MoreExecutors.sameThreadExecutor; @@ -28,7 +28,7 @@ import static java.util.concurrent.TimeU import static org.apache.jackrabbit.oak.api.jmx.RepositoryManagementMBean.StatusCode.FAILED; import static org.apache.jackrabbit.oak.api.jmx.RepositoryManagementMBean.StatusCode.RUNNING; import static org.apache.jackrabbit.oak.api.jmx.RepositoryManagementMBean.StatusCode.SUCCEEDED; -import static org.apache.jackrabbit.oak.management.ManagementOperation.newManagementOperation; +import static org.apache.jackrabbit.oak.commons.jmx.ManagementOperation.newManagementOperation; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; @@ -41,7 +41,8 @@ import java.util.concurrent.TimeoutExcep import javax.management.openmbean.CompositeData; import com.google.common.util.concurrent.ListeningExecutorService; -import org.apache.jackrabbit.oak.management.ManagementOperation.Status; +import org.apache.jackrabbit.oak.commons.jmx.ManagementOperation; +import org.apache.jackrabbit.oak.commons.jmx.ManagementOperation.Status; import org.junit.After; import org.junit.Before; import org.junit.Test; Copied: jackrabbit/oak/trunk/oak-core-spi/src/test/java/org/apache/jackrabbit/oak/spi/descriptors/AggregatingDescriptorsTest.java (from r1791745, jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/util/AggregatingDescriptorsTest.java) URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core-spi/src/test/java/org/apache/jackrabbit/oak/spi/descriptors/AggregatingDescriptorsTest.java?p2=jackrabbit/oak/trunk/oak-core-spi/src/test/java/org/apache/jackrabbit/oak/spi/descriptors/AggregatingDescriptorsTest.java&p1=jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/util/AggregatingDescriptorsTest.java&r1=1791745&r2=1791779&rev=1791779&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/util/AggregatingDescriptorsTest.java (original) +++ jackrabbit/oak/trunk/oak-core-spi/src/test/java/org/apache/jackrabbit/oak/spi/descriptors/AggregatingDescriptorsTest.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.util; +package org.apache.jackrabbit.oak.spi.descriptors; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; Modified: jackrabbit/oak/trunk/oak-core/pom.xml URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/pom.xml?rev=1791779&r1=1791778&r2=1791779&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/pom.xml (original) +++ jackrabbit/oak/trunk/oak-core/pom.xml Tue Apr 18 13:00:50 2017 @@ -44,18 +44,10 @@ </Import-Package> <Export-Package> org.apache.jackrabbit.oak, - org.apache.jackrabbit.oak.api, - org.apache.jackrabbit.oak.api.jmx, - org.apache.jackrabbit.oak.cache, - org.apache.jackrabbit.oak.stats, - org.apache.jackrabbit.oak.json, org.apache.jackrabbit.oak.management, org.apache.jackrabbit.oak.util, org.apache.jackrabbit.oak.namepath, - org.apache.jackrabbit.oak.osgi, org.apache.jackrabbit.oak.plugins.atomic, - org.apache.jackrabbit.oak.plugins.blob, - org.apache.jackrabbit.oak.plugins.blob.datastore, org.apache.jackrabbit.oak.plugins.commit, org.apache.jackrabbit.oak.plugins.document.spi, org.apache.jackrabbit.oak.plugins.identifier, @@ -69,19 +61,14 @@ org.apache.jackrabbit.oak.plugins.index.reference, org.apache.jackrabbit.oak.plugins.itemsave, org.apache.jackrabbit.oak.plugins.lock, - org.apache.jackrabbit.oak.plugins.memory, org.apache.jackrabbit.oak.plugins.name, org.apache.jackrabbit.oak.plugins.nodetype, org.apache.jackrabbit.oak.plugins.nodetype.write, org.apache.jackrabbit.oak.plugins.observation, org.apache.jackrabbit.oak.plugins.observation.filter, org.apache.jackrabbit.oak.plugins.tree, - org.apache.jackrabbit.oak.plugins.value, + org.apache.jackrabbit.oak.plugins.value.jcr, org.apache.jackrabbit.oak.plugins.version, - org.apache.jackrabbit.oak.spi.commit, - org.apache.jackrabbit.oak.spi.gc, - org.apache.jackrabbit.oak.spi.lifecycle, - org.apache.jackrabbit.oak.spi.mount, org.apache.jackrabbit.oak.spi.query, org.apache.jackrabbit.oak.spi.security, org.apache.jackrabbit.oak.spi.security.authentication, @@ -97,10 +84,7 @@ org.apache.jackrabbit.oak.spi.security.user, org.apache.jackrabbit.oak.spi.security.user.action, org.apache.jackrabbit.oak.spi.security.user.util, - org.apache.jackrabbit.oak.spi.state, - org.apache.jackrabbit.oak.spi.whiteboard, org.apache.jackrabbit.oak.spi.xml, - org.apache.jackrabbit.oak.stats, org.apache.jackrabbit.oak.query, org.apache.jackrabbit.oak.query.fulltext, org.apache.jackrabbit.oak.query.facet, @@ -170,6 +154,16 @@ <!-- Dependencies to other Oak components --> <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-commons</artifactId> <version>${project.version}</version> </dependency> @@ -185,6 +179,16 @@ <artifactId>oak-blob</artifactId> <version>${project.version}</version> </dependency> + <dependency> + <groupId>org.apache.jackrabbit</groupId> + <artifactId>oak-blob-plugins</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.jackrabbit</groupId> + <artifactId>oak-store-spi</artifactId> + <version>${project.version}</version> + </dependency> <!-- General utility libraries --> <dependency> <groupId>com.google.guava</groupId> @@ -205,12 +209,6 @@ <version>3.1.0</version> <optional>true</optional> </dependency> - <dependency> - <groupId>org.apache.jackrabbit</groupId> - <artifactId>jackrabbit-aws-ext</artifactId> - <version>${jackrabbit.version}</version> - <optional>true</optional> - </dependency> <!-- Optional dependencies for different persistence backends --> <dependency> @@ -324,6 +322,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>commons-lang</groupId> Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/Oak.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/Oak.java?rev=1791779&r1=1791778&r2=1791779&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/Oak.java (original) +++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/Oak.java Tue Apr 18 13:00:50 2017 @@ -108,7 +108,7 @@ import org.apache.jackrabbit.oak.spi.whi import org.apache.jackrabbit.oak.spi.whiteboard.Whiteboard; import org.apache.jackrabbit.oak.spi.whiteboard.WhiteboardAware; import org.apache.jackrabbit.oak.spi.whiteboard.WhiteboardUtils; -import org.apache.jackrabbit.oak.util.AggregatingDescriptors; +import org.apache.jackrabbit.oak.spi.descriptors.AggregatingDescriptors; import org.slf4j.Logger; import org.slf4j.LoggerFactory; Copied: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/OakVersion.java (from r1791745, jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/util/OakVersion.java) URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/OakVersion.java?p2=jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/OakVersion.java&p1=jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/util/OakVersion.java&r1=1791745&r2=1791779&rev=1791779&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/util/OakVersion.java (original) +++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/OakVersion.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.util; +package org.apache.jackrabbit.oak; import java.io.IOException; import java.io.InputStream; Copied: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/cache/impl/ConsolidatedCacheStats.java (from r1791745, jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/cache/ConsolidatedCacheStats.java) URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/cache/impl/ConsolidatedCacheStats.java?p2=jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/cache/impl/ConsolidatedCacheStats.java&p1=jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/cache/ConsolidatedCacheStats.java&r1=1791745&r2=1791779&rev=1791779&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/cache/ConsolidatedCacheStats.java (original) +++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/cache/impl/ConsolidatedCacheStats.java Tue Apr 18 13:00:50 2017 @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.jackrabbit.oak.cache; +package org.apache.jackrabbit.oak.cache.impl; import java.math.BigDecimal; import java.math.MathContext; Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core/ContentRepositoryImpl.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core/ContentRepositoryImpl.java?rev=1791779&r1=1791778&r2=1791779&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core/ContentRepositoryImpl.java (original) +++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core/ContentRepositoryImpl.java Tue Apr 18 13:00:50 2017 @@ -100,8 +100,8 @@ import org.apache.jackrabbit.oak.spi.sec import org.apache.jackrabbit.oak.spi.security.privilege.PrivilegeConfiguration; import org.apache.jackrabbit.oak.spi.security.user.UserConfiguration; import org.apache.jackrabbit.oak.spi.state.NodeStore; -import org.apache.jackrabbit.oak.util.GenericDescriptors; -import org.apache.jackrabbit.oak.util.OakVersion; +import org.apache.jackrabbit.oak.spi.descriptors.GenericDescriptors; +import org.apache.jackrabbit.oak.OakVersion; /** * {@code NodeStore}-based implementation of Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/management/RepositoryManager.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/management/RepositoryManager.java?rev=1791779&r1=1791778&r2=1791779&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/management/RepositoryManager.java (original) +++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/management/RepositoryManager.java Tue Apr 18 13:00:50 2017 @@ -21,12 +21,12 @@ package org.apache.jackrabbit.oak.manage import static com.google.common.base.Preconditions.checkNotNull; import static com.google.common.collect.Lists.newArrayList; -import static org.apache.jackrabbit.oak.management.ManagementOperation.Status; -import static org.apache.jackrabbit.oak.management.ManagementOperation.Status.failed; -import static org.apache.jackrabbit.oak.management.ManagementOperation.Status.fromCompositeData; -import static org.apache.jackrabbit.oak.management.ManagementOperation.Status.succeeded; -import static org.apache.jackrabbit.oak.management.ManagementOperation.Status.toTabularData; -import static org.apache.jackrabbit.oak.management.ManagementOperation.Status.unavailable; +import static org.apache.jackrabbit.oak.commons.jmx.ManagementOperation.Status; +import static org.apache.jackrabbit.oak.commons.jmx.ManagementOperation.Status.failed; +import static org.apache.jackrabbit.oak.commons.jmx.ManagementOperation.Status.fromCompositeData; +import static org.apache.jackrabbit.oak.commons.jmx.ManagementOperation.Status.succeeded; +import static org.apache.jackrabbit.oak.commons.jmx.ManagementOperation.Status.toTabularData; +import static org.apache.jackrabbit.oak.commons.jmx.ManagementOperation.Status.unavailable; import java.util.List; Copied: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/blob/index/DataStoreTextProviderService.java (from r1791745, jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/blob/datastore/DataStoreTextProviderService.java) URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/blob/index/DataStoreTextProviderService.java?p2=jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/blob/index/DataStoreTextProviderService.java&p1=jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/blob/datastore/DataStoreTextProviderService.java&r1=1791745&r2=1791779&rev=1791779&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/blob/datastore/DataStoreTextProviderService.java (original) +++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/blob/index/DataStoreTextProviderService.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.File; import java.io.IOException; @@ -38,6 +38,7 @@ import static com.google.common.base.Pre @Component( policy = ConfigurationPolicy.REQUIRE, + name = "org.apache.jackrabbit.oak.plugins.blob.datastore.DataStoreTextProviderService", metatype = true, label = "Apache Jackrabbit Oak DataStore PreExtractedTextProvider", description = "Configures a PreExtractedTextProvider based on extracted text stored on FileSystem" Copied: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/blob/index/DataStoreTextWriter.java (from r1791745, jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/blob/datastore/DataStoreTextWriter.java) URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/blob/index/DataStoreTextWriter.java?p2=jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/blob/index/DataStoreTextWriter.java&p1=jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/blob/datastore/DataStoreTextWriter.java&r1=1791745&r2=1791779&rev=1791779&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/blob/datastore/DataStoreTextWriter.java (original) +++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/blob/index/DataStoreTextWriter.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.BufferedWriter; import java.io.Closeable; @@ -34,6 +34,8 @@ import com.google.common.collect.Sets; import com.google.common.io.Files; import org.apache.commons.io.FileUtils; import org.apache.jackrabbit.oak.api.Blob; +import org.apache.jackrabbit.oak.plugins.blob.datastore.DataStoreBlobStore; +import org.apache.jackrabbit.oak.plugins.blob.datastore.TextWriter; 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.index.fulltext.PreExtractedTextProvider; @@ -189,7 +191,7 @@ public class DataStoreTextWriter impleme private String stripLength(String blobId) { if (dataStoreBlobId) { - return DataStoreBlobStore.BlobId.of(blobId).blobId; + return DataStoreBlobStore.BlobId.of(blobId).getBlobId(); } return blobId; } Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/blob/migration/BlobMigration.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/blob/migration/BlobMigration.java?rev=1791779&r1=1791778&r2=1791779&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/blob/migration/BlobMigration.java (original) +++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/blob/migration/BlobMigration.java Tue Apr 18 13:00:50 2017 @@ -20,9 +20,9 @@ package org.apache.jackrabbit.oak.plugins.blob.migration; import static java.lang.System.nanoTime; -import static org.apache.jackrabbit.oak.management.ManagementOperation.done; -import static org.apache.jackrabbit.oak.management.ManagementOperation.newManagementOperation; -import static org.apache.jackrabbit.oak.management.ManagementOperation.Status.formatTime; +import static org.apache.jackrabbit.oak.commons.jmx.ManagementOperation.done; +import static org.apache.jackrabbit.oak.commons.jmx.ManagementOperation.newManagementOperation; +import static org.apache.jackrabbit.oak.commons.jmx.ManagementOperation.Status.formatTime; import static org.apache.jackrabbit.oak.spi.whiteboard.WhiteboardUtils.registerMBean; import java.util.HashMap; @@ -45,7 +45,7 @@ import org.apache.felix.scr.annotations. import org.apache.felix.scr.annotations.Reference; import org.apache.jackrabbit.oak.api.jmx.RepositoryManagementMBean.StatusCode; import org.apache.jackrabbit.oak.commons.jmx.AnnotatedStandardMBean; -import org.apache.jackrabbit.oak.management.ManagementOperation; +import org.apache.jackrabbit.oak.commons.jmx.ManagementOperation; import org.apache.jackrabbit.oak.osgi.OsgiWhiteboard; import org.apache.jackrabbit.oak.spi.blob.BlobStore; import org.apache.jackrabbit.oak.spi.blob.split.SplitBlobStore; Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/blob/migration/BlobMigrationMBean.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/blob/migration/BlobMigrationMBean.java?rev=1791779&r1=1791778&r2=1791779&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/blob/migration/BlobMigrationMBean.java (original) +++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/blob/migration/BlobMigrationMBean.java Tue Apr 18 13:00:50 2017 @@ -23,8 +23,8 @@ import javax.annotation.Nonnull; import javax.management.openmbean.CompositeData; import javax.management.openmbean.OpenDataException; -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 BlobMigrationMBean { Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/AbstractDocumentNodeState.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/AbstractDocumentNodeState.java?rev=1791779&r1=1791778&r2=1791779&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/AbstractDocumentNodeState.java (original) +++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/AbstractDocumentNodeState.java Tue Apr 18 13:00:50 2017 @@ -27,7 +27,7 @@ import org.apache.jackrabbit.oak.spi.sta import org.apache.jackrabbit.oak.spi.state.EqualsDiff; 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; import static org.apache.jackrabbit.oak.plugins.memory.EmptyNodeState.EMPTY_NODE; Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/ClusterNodeInfo.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/ClusterNodeInfo.java?rev=1791779&r1=1791778&r2=1791779&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/ClusterNodeInfo.java (original) +++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/ClusterNodeInfo.java Tue Apr 18 13:00:50 2017 @@ -35,7 +35,7 @@ import com.google.common.base.Stopwatch; import org.apache.jackrabbit.oak.commons.StringUtils; import org.apache.jackrabbit.oak.stats.Clock; -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/DocumentCheckpointMBean.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentCheckpointMBean.java?rev=1791779&r1=1791778&r2=1791779&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentCheckpointMBean.java (original) +++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentCheckpointMBean.java Tue Apr 18 13:00:50 2017 @@ -19,7 +19,6 @@ package org.apache.jackrabbit.oak.plugins.document; -import java.util.Collections; import java.util.Date; import java.util.Map; import java.util.Map.Entry; @@ -27,7 +26,7 @@ import java.util.Map.Entry; import javax.management.openmbean.OpenDataException; import javax.management.openmbean.TabularDataSupport; -import org.apache.jackrabbit.oak.util.AbstractCheckpointMBean; +import org.apache.jackrabbit.oak.commons.jmx.AbstractCheckpointMBean; import static org.apache.jackrabbit.oak.plugins.document.Checkpoints.Info; Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentDiscoveryLiteService.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentDiscoveryLiteService.java?rev=1791779&r1=1791778&r2=1791779&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentDiscoveryLiteService.java (original) +++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentDiscoveryLiteService.java Tue Apr 18 13:00:50 2017 @@ -40,7 +40,7 @@ import org.apache.felix.scr.annotations. import org.apache.jackrabbit.commons.SimpleValueFactory; import org.apache.jackrabbit.oak.api.Descriptors; import org.apache.jackrabbit.oak.osgi.OsgiWhiteboard; -import org.apache.jackrabbit.oak.plugins.identifier.ClusterRepositoryInfo; +import org.apache.jackrabbit.oak.spi.cluster.ClusterRepositoryInfo; import org.apache.jackrabbit.oak.spi.commit.CommitInfo; import org.apache.jackrabbit.oak.spi.commit.Observer; import org.apache.jackrabbit.oak.spi.state.NodeState; Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java?rev=1791779&r1=1791778&r2=1791779&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java (original) +++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java Tue Apr 18 13:00:50 2017 @@ -128,8 +128,8 @@ import org.apache.jackrabbit.oak.spi.sta import org.apache.jackrabbit.oak.spi.state.NodeStore; import org.apache.jackrabbit.oak.stats.Clock; import org.apache.jackrabbit.oak.stats.StatisticsProvider; -import org.apache.jackrabbit.oak.util.OakVersion; -import org.apache.jackrabbit.oak.util.PerfLogger; +import org.apache.jackrabbit.oak.OakVersion; +import org.apache.jackrabbit.oak.commons.benchmark.PerfLogger; import org.apache.jackrabbit.stats.TimeSeriesStatsUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreBranch.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreBranch.java?rev=1791779&r1=1791778&r2=1791779&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreBranch.java (original) +++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreBranch.java Tue Apr 18 13:00:50 2017 @@ -48,7 +48,7 @@ import org.apache.jackrabbit.oak.spi.sta import org.apache.jackrabbit.oak.spi.state.NodeBuilder; import org.apache.jackrabbit.oak.spi.state.NodeState; import org.apache.jackrabbit.oak.spi.state.NodeStoreBranch; -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/DocumentNodeStoreMBean.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreMBean.java?rev=1791779&r1=1791778&r2=1791779&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreMBean.java (original) +++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreMBean.java Tue Apr 18 13:00:50 2017 @@ -21,8 +21,8 @@ package org.apache.jackrabbit.oak.plugin import javax.management.openmbean.CompositeData; -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; @SuppressWarnings("UnusedDeclaration") public interface DocumentNodeStoreMBean { Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreService.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreService.java?rev=1791779&r1=1791778&r2=1791779&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreService.java (original) +++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreService.java Tue Apr 18 13:00:50 2017 @@ -67,7 +67,7 @@ import org.apache.jackrabbit.oak.api.jmx import org.apache.jackrabbit.oak.api.jmx.PersistentCacheStatsMBean; import org.apache.jackrabbit.oak.cache.CacheStats; 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.osgi.OsgiWhiteboard; import org.apache.jackrabbit.oak.plugins.blob.BlobGC; import org.apache.jackrabbit.oak.plugins.blob.BlobGCMBean; @@ -80,7 +80,7 @@ import org.apache.jackrabbit.oak.plugins import org.apache.jackrabbit.oak.plugins.document.persistentCache.CacheType; import org.apache.jackrabbit.oak.plugins.document.persistentCache.PersistentCacheStats; import org.apache.jackrabbit.oak.plugins.document.util.MongoConnection; -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.BlobStoreWrapper; import org.apache.jackrabbit.oak.spi.blob.GarbageCollectableBlobStore; @@ -96,7 +96,7 @@ import org.apache.jackrabbit.oak.spi.whi import org.apache.jackrabbit.oak.spi.whiteboard.WhiteboardExecutor; import org.apache.jackrabbit.oak.spi.whiteboard.WhiteboardUtils; import org.apache.jackrabbit.oak.stats.StatisticsProvider; -import org.apache.jackrabbit.oak.util.GenericDescriptors; +import org.apache.jackrabbit.oak.spi.descriptors.GenericDescriptors; import org.osgi.framework.Bundle; import org.osgi.framework.BundleException; import org.osgi.framework.Constants;
