Author: mduerig Date: Fri Mar 23 18:40:58 2012 New Revision: 1304554 URL: http://svn.apache.org/viewvc?rev=1304554&view=rev Log: OAK-33: Values in oak-core move ScalarImpl to oak package Added: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/ScalarImpl.java - copied, changed from r1304547, jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/ScalarImpl.java Removed: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/ScalarImpl.java Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/kernel/KernelNodeState.java jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/NodeImpl.java jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/state/ChangeLog.java jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/state/ChangeTree.java jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/state/TransientNodeState.java jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/util/ValueConverter.java Copied: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/ScalarImpl.java (from r1304547, jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/ScalarImpl.java) URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/ScalarImpl.java?p2=jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/ScalarImpl.java&p1=jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/ScalarImpl.java&r1=1304547&r2=1304554&rev=1304554&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/ScalarImpl.java (original) +++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/ScalarImpl.java Fri Mar 23 18:40:58 2012 @@ -1,4 +1,4 @@ -package org.apache.jackrabbit; +package org.apache.jackrabbit.oak; import org.apache.jackrabbit.oak.api.Scalar; Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/kernel/KernelNodeState.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/kernel/KernelNodeState.java?rev=1304554&r1=1304553&r2=1304554&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/kernel/KernelNodeState.java (original) +++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/kernel/KernelNodeState.java Fri Mar 23 18:40:58 2012 @@ -18,7 +18,7 @@ */ package org.apache.jackrabbit.oak.kernel; -import org.apache.jackrabbit.ScalarImpl; +import org.apache.jackrabbit.oak.ScalarImpl; import org.apache.jackrabbit.mk.api.MicroKernel; import org.apache.jackrabbit.mk.api.MicroKernelException; import org.apache.jackrabbit.mk.json.JsopReader; Modified: jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/NodeImpl.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/NodeImpl.java?rev=1304554&r1=1304553&r2=1304554&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/NodeImpl.java (original) +++ jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/NodeImpl.java Fri Mar 23 18:40:58 2012 @@ -17,7 +17,7 @@ package org.apache.jackrabbit.oak.jcr; import org.apache.jackrabbit.JcrConstants; -import org.apache.jackrabbit.ScalarImpl; +import org.apache.jackrabbit.oak.ScalarImpl; import org.apache.jackrabbit.commons.iterator.NodeIteratorAdapter; import org.apache.jackrabbit.commons.iterator.PropertyIteratorAdapter; import org.apache.jackrabbit.mk.model.PropertyState; Modified: jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/state/ChangeLog.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/state/ChangeLog.java?rev=1304554&r1=1304553&r2=1304554&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/state/ChangeLog.java (original) +++ jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/state/ChangeLog.java Fri Mar 23 18:40:58 2012 @@ -19,7 +19,7 @@ package org.apache.jackrabbit.oak.jcr.state; -import org.apache.jackrabbit.ScalarImpl; +import org.apache.jackrabbit.oak.ScalarImpl; import org.apache.jackrabbit.mk.model.PropertyState; import org.apache.jackrabbit.oak.jcr.util.Path; import org.apache.jackrabbit.oak.kernel.KernelPropertyState; Modified: jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/state/ChangeTree.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/state/ChangeTree.java?rev=1304554&r1=1304553&r2=1304554&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/state/ChangeTree.java (original) +++ jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/state/ChangeTree.java Fri Mar 23 18:40:58 2012 @@ -21,7 +21,7 @@ package org.apache.jackrabbit.oak.jcr.st import org.apache.commons.collections.map.AbstractReferenceMap; import org.apache.commons.collections.map.ReferenceMap; -import org.apache.jackrabbit.ScalarImpl; +import org.apache.jackrabbit.oak.ScalarImpl; import org.apache.jackrabbit.mk.model.PropertyState; import org.apache.jackrabbit.oak.jcr.util.Iterators; import org.apache.jackrabbit.oak.jcr.util.Path; Modified: jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/state/TransientNodeState.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/state/TransientNodeState.java?rev=1304554&r1=1304553&r2=1304554&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/state/TransientNodeState.java (original) +++ jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/state/TransientNodeState.java Fri Mar 23 18:40:58 2012 @@ -19,7 +19,7 @@ package org.apache.jackrabbit.oak.jcr.state; -import org.apache.jackrabbit.ScalarImpl; +import org.apache.jackrabbit.oak.ScalarImpl; import org.apache.jackrabbit.mk.model.ChildNodeEntry; import org.apache.jackrabbit.mk.model.NodeState; import org.apache.jackrabbit.mk.model.PropertyState; Modified: jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/util/ValueConverter.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/util/ValueConverter.java?rev=1304554&r1=1304553&r2=1304554&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/util/ValueConverter.java (original) +++ jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/util/ValueConverter.java Fri Mar 23 18:40:58 2012 @@ -19,7 +19,7 @@ package org.apache.jackrabbit.oak.jcr.util; -import org.apache.jackrabbit.ScalarImpl; +import org.apache.jackrabbit.oak.ScalarImpl; import org.apache.jackrabbit.oak.api.Scalar; import javax.jcr.PropertyType;