Author: stillalex
Date: Fri Sep 22 16:25:51 2017
New Revision: 1809325
URL: http://svn.apache.org/viewvc?rev=1809325&view=rev
Log:
OAK-6708 Move plugins.value.jcr package to oak-store-spi
Added:
jackrabbit/oak/trunk/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/value/jcr/
- copied from r1809324,
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/value/jcr/
jackrabbit/oak/trunk/oak-store-spi/src/test/java/org/apache/jackrabbit/oak/plugins/value/jcr/
- copied from r1809324,
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/value/jcr/
Removed:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/value/
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/value/
Modified:
jackrabbit/oak/trunk/oak-core/pom.xml
jackrabbit/oak/trunk/oak-store-spi/pom.xml
jackrabbit/oak/trunk/oak-store-spi/src/test/java/org/apache/jackrabbit/oak/plugins/value/jcr/PropertyStatesTest.java
Modified: jackrabbit/oak/trunk/oak-core/pom.xml
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/pom.xml?rev=1809325&r1=1809324&r2=1809325&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/pom.xml (original)
+++ jackrabbit/oak/trunk/oak-core/pom.xml Fri Sep 22 16:25:51 2017
@@ -72,7 +72,6 @@
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.jcr,
org.apache.jackrabbit.oak.plugins.version,
org.apache.jackrabbit.oak.spi.security,
org.apache.jackrabbit.oak.spi.security.authentication,
Modified: jackrabbit/oak/trunk/oak-store-spi/pom.xml
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-store-spi/pom.xml?rev=1809325&r1=1809324&r2=1809325&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-store-spi/pom.xml (original)
+++ jackrabbit/oak/trunk/oak-store-spi/pom.xml Fri Sep 22 16:25:51 2017
@@ -42,7 +42,8 @@
org.apache.jackrabbit.oak.spi.lifecycle,
org.apache.jackrabbit.oak.spi.state,
org.apache.jackrabbit.oak.plugins.memory,
- org.apache.jackrabbit.oak.plugins.value
+ org.apache.jackrabbit.oak.plugins.value,
+ org.apache.jackrabbit.oak.plugins.value.jcr
</Export-Package>
</instructions>
</configuration>
Modified:
jackrabbit/oak/trunk/oak-store-spi/src/test/java/org/apache/jackrabbit/oak/plugins/value/jcr/PropertyStatesTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-store-spi/src/test/java/org/apache/jackrabbit/oak/plugins/value/jcr/PropertyStatesTest.java?rev=1809325&r1=1809324&r2=1809325&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-store-spi/src/test/java/org/apache/jackrabbit/oak/plugins/value/jcr/PropertyStatesTest.java
(original)
+++
jackrabbit/oak/trunk/oak-store-spi/src/test/java/org/apache/jackrabbit/oak/plugins/value/jcr/PropertyStatesTest.java
Fri Sep 22 16:25:51 2017
@@ -20,28 +20,24 @@
package org.apache.jackrabbit.oak.plugins.value.jcr;
import java.util.Calendar;
-
import javax.jcr.PropertyType;
import javax.jcr.RepositoryException;
import javax.jcr.Value;
import org.apache.jackrabbit.oak.api.PropertyState;
import org.apache.jackrabbit.oak.api.Type;
-import org.apache.jackrabbit.oak.namepath.impl.LocalNameMapper;
-import org.apache.jackrabbit.oak.namepath.impl.NamePathMapperImpl;
+import org.apache.jackrabbit.oak.namepath.NamePathMapper;
import org.apache.jackrabbit.oak.plugins.memory.PropertyStates;
import org.apache.jackrabbit.util.ISO8601;
import org.junit.Test;
+import org.mockito.Mockito;
import static java.util.Collections.singletonMap;
import static org.junit.Assert.assertEquals;
public class PropertyStatesTest {
- private final NamePathMapperImpl namePathMapper =
- new NamePathMapperImpl(new LocalNameMapper(
- singletonMap("oak-prefix", "http://jackrabbit.apache.org";),
- singletonMap("jcr-prefix",
"http://jackrabbit.apache.org";)));
+ private final NamePathMapper namePathMapper =
Mockito.mock(NamePathMapper.class);
@Test
public void namePropertyFromNameValue() throws RepositoryException {
