Author: tripod
Date: Tue Mar 25 19:38:16 2014
New Revision: 1581481
URL: http://svn.apache.org/r1581481
Log:
@trivial fix javadoc generation warnings
Modified:
jackrabbit/oak/trunk/oak-blob/src/main/java/org/apache/jackrabbit/oak/spi/blob/GarbageCollectableBlobStore.java
jackrabbit/oak/trunk/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/json/JsopWriter.java
jackrabbit/oak/trunk/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/sort/ExternalSort.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/api/Blob.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/api/Root.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/kernel/KernelNodeStore.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/namepath/JcrNameParser.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/blob/cloud/CloudBlobStore.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/commit/AnnotatingConflictHandler.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/commit/DefaultConflictHandler.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoBlobStore.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/diffindex/BaseDiffCollector.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/property/OrderedIndex.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/property/OrderedPropertyIndexLookup.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/property/strategy/OrderedContentMirrorStoreStrategy.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/memory/AbstractBlob.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/EffectiveNodeType.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/EffectiveNodeTypeProvider.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/SegmentTracker.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/version/VersionSelector.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/CompiledPermissions.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/lifecycle/CompositeInitializer.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/lifecycle/WorkspaceInitializer.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/security/Context.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/security/principal/PrincipalConfiguration.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/security/privilege/PrivilegeBitsProvider.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/state/NodeBuilder.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/state/NodeStoreBranch.java
jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/session/operation/SessionOperation.java
jackrabbit/oak/trunk/oak-mk/src/main/java/org/apache/jackrabbit/mk/model/ChildNodeEntries.java
jackrabbit/oak/trunk/oak-mk/src/main/java/org/apache/jackrabbit/mk/persistence/GCPersistence.java
jackrabbit/oak/trunk/oak-pojosr/src/main/java/org/apache/jackrabbit/oak/run/osgi/OakOSGiRepositoryFactory.java
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/benchmark/CreateManyChildNodesTest.java
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/benchmark/TransientManyChildNodesTest.java
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/benchmark/UpdateManyChildNodesTest.java
Modified:
jackrabbit/oak/trunk/oak-blob/src/main/java/org/apache/jackrabbit/oak/spi/blob/GarbageCollectableBlobStore.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-blob/src/main/java/org/apache/jackrabbit/oak/spi/blob/GarbageCollectableBlobStore.java?rev=1581481&r1=1581480&r2=1581481&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-blob/src/main/java/org/apache/jackrabbit/oak/spi/blob/GarbageCollectableBlobStore.java
(original)
+++
jackrabbit/oak/trunk/oak-blob/src/main/java/org/apache/jackrabbit/oak/spi/blob/GarbageCollectableBlobStore.java
Tue Mar 25 19:38:16 2014
@@ -38,7 +38,7 @@ public interface GarbageCollectableBlobS
* afterwards. A file based blob stores might simply rename the file, so
* that no additional writes are necessary.
*
- * @param tempFilePath the temporary file
+ * @param tempFileName the temporary file name
* @return the blob id
*/
String writeBlob(String tempFileName) throws IOException;
Modified:
jackrabbit/oak/trunk/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/json/JsopWriter.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/json/JsopWriter.java?rev=1581481&r1=1581480&r2=1581481&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/json/JsopWriter.java
(original)
+++
jackrabbit/oak/trunk/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/json/JsopWriter.java
Tue Mar 25 19:38:16 2014
@@ -42,7 +42,7 @@ public interface JsopWriter {
* Append the key (in quotes) plus a colon. A comma is appended first if
* needed.
*
- * @param name the key
+ * @param key the key
* @return this
*/
JsopWriter key(String key);
@@ -58,7 +58,7 @@ public interface JsopWriter {
/**
* Append an already encoded value. A comma is appended first if needed.
*
- * @param value the value
+ * @param raw the value
* @return this
*/
JsopWriter encodedValue(String raw);
@@ -86,9 +86,9 @@ public interface JsopWriter {
JsopWriter tag(char tag);
/**
- * Append all entries of the given buffer.
+ * Append all entries of the given writer.
*
- * @param buffer the buffer
+ * @param diff the writer
* @return this
*/
JsopWriter append(JsopWriter diff);
@@ -96,7 +96,7 @@ public interface JsopWriter {
/**
* Append a number. A comma is appended first if needed.
*
- * @param value the value
+ * @param x the value
* @return this
*/
JsopWriter value(long x);
@@ -105,7 +105,7 @@ public interface JsopWriter {
* Append the boolean value 'true' or 'false'. A comma is appended first if
* needed.
*
- * @param value the value
+ * @param b the value
* @return this
*/
JsopWriter value(boolean b);
Modified:
jackrabbit/oak/trunk/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/sort/ExternalSort.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/sort/ExternalSort.java?rev=1581481&r1=1581480&r2=1581481&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/sort/ExternalSort.java
(original)
+++
jackrabbit/oak/trunk/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/sort/ExternalSort.java
Tue Mar 25 19:38:16 2014
@@ -39,9 +39,9 @@ import java.util.zip.GZIPInputStream;
import java.util.zip.GZIPOutputStream;
/**
* Source copied from a publicly available library.
- * @see <a
- *
href="https://code.google.com/p/externalsortinginjava/";>https://code.google.com/p/externalsortinginjava</a>
- *
+ * @see <a
href="https://code.google.com/p/externalsortinginjava/";>https://code.google.com/p/externalsortinginjava</a>
+ *
+ * <pre>
* Goal: offer a generic external-memory sorting program in Java.
*
* It must be : - hackable (easy to adapt) - scalable to large files -
sensibly efficient.
@@ -63,6 +63,7 @@ import java.util.zip.GZIPOutputStream;
* Grant, Daniel Haran, Daniel Lemire, Sugumaran Harikrishnan, Jerry Yang,
First published:
* April 2010 originally posted at
* http://lemire.me/blog/archives/2010/04/01/external-memory-sorting-in-java/
+ * </pre>
*/
public class ExternalSort {
@@ -178,7 +179,7 @@ public class ExternalSort {
* Pass <code>true</code> if duplicate lines should be
discarded.
* @param numHeader
* number of lines to preclude before sorting starts
- * @parame usegzip use gzip compression for the temporary files
+ * @param usegzip use gzip compression for the temporary files
* @return a list of temporary flat files
*/
public static List<File> sortInBatch(File file, Comparator<String> cmp,
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/api/Blob.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/api/Blob.java?rev=1581481&r1=1581480&r2=1581481&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/api/Blob.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/api/Blob.java
Tue Mar 25 19:38:16 2014
@@ -33,7 +33,7 @@ import javax.annotation.Nonnull;
* <p>
* Due to their nature blobs should not be used as keys in hash tables.
* To highlight that and to ensure semantic correctness of the equality
- * contract across different blob implementations, the {@link #hashCode()}
+ * contract across different blob implementations, the {@link
Object#hashCode()}
* method of all blob instances should return zero.
*/
public interface Blob {
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/api/Root.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/api/Root.java?rev=1581481&r1=1581480&r2=1581481&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/api/Root.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/api/Root.java
Tue Mar 25 19:38:16 2014
@@ -119,7 +119,7 @@ public interface Root {
/**
* Atomically persists all changes made to the tree attached to this root.
* Calling this method is equivalent to calling the
- * {@link #commit(Map<String, Object> info)} method with an empty info map.
+ * {@link #commit(Map info)} method with an empty info map.
*
* @throws CommitFailedException if the commit failed
*/
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/kernel/KernelNodeStore.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/kernel/KernelNodeStore.java?rev=1581481&r1=1581480&r2=1581481&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/kernel/KernelNodeStore.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/kernel/KernelNodeStore.java
Tue Mar 25 19:38:16 2014
@@ -169,7 +169,6 @@ public class KernelNodeStore implements
* is a {@link KernelNodeBuilder} instance. Otherwise Otherwise it throws
an
* {@code IllegalArgumentException}.
* @param builder the builder to rebase
- * @return
*/
@Override
public NodeState rebase(@Nonnull NodeBuilder builder) {
@@ -182,7 +181,6 @@ public class KernelNodeStore implements
* is a {@link KernelNodeBuilder} instance. Otherwise it throws an
* {@code IllegalArgumentException}.
* @param builder the builder to rebase
- * @return
*/
@Override
public NodeState reset(@Nonnull NodeBuilder builder) {
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/namepath/JcrNameParser.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/namepath/JcrNameParser.java?rev=1581481&r1=1581480&r2=1581481&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/namepath/JcrNameParser.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/namepath/JcrNameParser.java
Tue Mar 25 19:38:16 2014
@@ -24,7 +24,7 @@ import org.apache.jackrabbit.util.XMLCha
* Parses and validates JCR names. Upon successful completion of
* {@link #parse(String, Listener, int)}
* the specified listener is informed about the (resulting) JCR name.
- * In case of failure {@link Listener#error(String)} is called indicating
+ * In case of failure {@link JcrNameParser.Listener#error(String)} is called
indicating
* the reason.
*/
public final class JcrNameParser {
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/blob/cloud/CloudBlobStore.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/blob/cloud/CloudBlobStore.java?rev=1581481&r1=1581480&r2=1581481&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/blob/cloud/CloudBlobStore.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/blob/cloud/CloudBlobStore.java
Tue Mar 25 19:38:16 2014
@@ -41,9 +41,9 @@ import static org.jclouds.blobstore.opti
import static org.jclouds.blobstore.options.PutOptions.Builder.multipart;
/**
- * Implementation of the {@link BlobStore} to store blobs in a cloud blob
store.
+ * Implementation of the {@link org.apache.jackrabbit.oak.spi.blob.BlobStore}
to store blobs in a cloud blob store.
* <p>
- * Extends {@link AbstractBlobStore} and breaks the the binary to chunks for
easier management.
+ * Extends {@link org.apache.jackrabbit.oak.spi.blob.AbstractBlobStore} and
breaks the the binary to chunks for easier management.
*/
public class CloudBlobStore extends CachingBlobStore {
/**
@@ -97,16 +97,7 @@ public class CloudBlobStore extends Cach
/**
* Instantiates a connection to the cloud blob store.
- *
- * @param cloudProvider
- * the cloud provider
- * @param accessKey
- * the access key
- * @param secretKey
- * the secret key
- * @param cloudContainer
- * the bucket
- * @throws Exception
+ * @throws Exception if an error occurs
*/
public void init() throws Exception {
try {
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/commit/AnnotatingConflictHandler.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/commit/AnnotatingConflictHandler.java?rev=1581481&r1=1581480&r2=1581481&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/commit/AnnotatingConflictHandler.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/commit/AnnotatingConflictHandler.java
Tue Mar 25 19:38:16 2014
@@ -43,8 +43,8 @@ import static org.apache.jackrabbit.oak.
/**
* This {@link ConflictHandler} implementation resolves conflicts to
- * {@link Resolution#THEIRS} and in addition marks nodes where a conflict
- * occurred with the mixin {@code rep:MergeConflict}:
+ * {@link
org.apache.jackrabbit.oak.spi.commit.ConflictHandler.Resolution#THEIRS} and in
addition marks nodes where a
+ * conflict occurred with the mixin {@code rep:MergeConflict}:
*
* <pre>
* [rep:MergeConflict]
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/commit/DefaultConflictHandler.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/commit/DefaultConflictHandler.java?rev=1581481&r1=1581480&r2=1581481&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/commit/DefaultConflictHandler.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/commit/DefaultConflictHandler.java
Tue Mar 25 19:38:16 2014
@@ -31,12 +31,12 @@ import org.apache.jackrabbit.oak.spi.sta
public class DefaultConflictHandler implements ConflictHandler {
/**
- * A {@code ConflictHandler} which always return {@link Resolution#OURS}.
+ * A {@code ConflictHandler} which always return {@link
org.apache.jackrabbit.oak.spi.commit.ConflictHandler.Resolution#OURS}.
*/
public static final ConflictHandler OURS = new
DefaultConflictHandler(Resolution.OURS);
/**
- * A {@code ConflictHandler} which always return {@link Resolution#THEIRS}.
+ * A {@code ConflictHandler} which always return {@link
org.apache.jackrabbit.oak.spi.commit.ConflictHandler.Resolution#THEIRS}.
*/
public static final ConflictHandler THEIRS = new
DefaultConflictHandler(Resolution.THEIRS);
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoBlobStore.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoBlobStore.java?rev=1581481&r1=1581480&r2=1581481&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoBlobStore.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoBlobStore.java
Tue Mar 25 19:38:16 2014
@@ -39,7 +39,7 @@ import com.mongodb.WriteResult;
/**
* Implementation of blob store for the MongoDB extending from
- * {@link AbstractBlobStore}. It saves blobs into a separate collection in
+ * {@link org.apache.jackrabbit.oak.spi.blob.AbstractBlobStore}. It saves
blobs into a separate collection in
* MongoDB (not using GridFS) and it supports basic garbage collection.
*
* FIXME: -Do we need to create commands for retry etc.? -Not sure if this is
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/diffindex/BaseDiffCollector.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/diffindex/BaseDiffCollector.java?rev=1581481&r1=1581480&r2=1581481&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/diffindex/BaseDiffCollector.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/diffindex/BaseDiffCollector.java
Tue Mar 25 19:38:16 2014
@@ -36,12 +36,8 @@ public abstract class BaseDiffCollector
protected boolean init = false;
/**
- * @param before
- * initial state
- * @param after
- * after state
- * @param filter
- * filter that verifies of a NodeState qualifies or not
+ * @param before initial state
+ * @param after after state
*/
public BaseDiffCollector(NodeState before, NodeState after) {
this.before = before;
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/property/OrderedIndex.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/property/OrderedIndex.java?rev=1581481&r1=1581480&r2=1581481&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/property/OrderedIndex.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/property/OrderedIndex.java
Tue Mar 25 19:38:16 2014
@@ -55,7 +55,7 @@ public interface OrderedIndex {
* no-match
*
* @param direction the direction of the sorting: ascending or
descending
- * @return
+ * @return the direction
*/
@Nullable
@CheckForNull
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/property/OrderedPropertyIndexLookup.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/property/OrderedPropertyIndexLookup.java?rev=1581481&r1=1581480&r2=1581481&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/property/OrderedPropertyIndexLookup.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/property/OrderedPropertyIndexLookup.java
Tue Mar 25 19:38:16 2014
@@ -89,7 +89,7 @@ public class OrderedPropertyIndexLookup
* @param filter
* @param propertyName
* @param pr
- * @return the resultset
+ * @return the result set
*/
public Iterable<String> query(Filter filter, String propertyName,
PropertyRestriction pr) {
NodeState indexMeta = getIndexNode(root, propertyName, filter);
@@ -107,7 +107,7 @@ public class OrderedPropertyIndexLookup
* @param value
* @param filter
* @param pr
- * @return
+ * @return the estimated count
*/
public long getEstimatedEntryCount(String propertyName, PropertyValue
value, Filter filter,
PropertyRestriction pr) {
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/property/strategy/OrderedContentMirrorStoreStrategy.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/property/strategy/OrderedContentMirrorStoreStrategy.java?rev=1581481&r1=1581480&r2=1581481&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/property/strategy/OrderedContentMirrorStoreStrategy.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/property/strategy/OrderedContentMirrorStoreStrategy.java
Tue Mar 25 19:38:16 2014
@@ -213,7 +213,7 @@ public class OrderedContentMirrorStoreSt
* retrieve an Iterable for going through the index in the right order
without the :start node
*
* @param index the root of the index (:index)
- * @return
+ * @return the iterable
*/
@Override
@Nonnull
@@ -251,7 +251,7 @@ public class OrderedContentMirrorStoreSt
* @param indexName
* @param indexMeta
* @param pr
- * @return
+ * @return the iterable
*/
public Iterable<String> query(final Filter filter, final String indexName,
final NodeState indexMeta, final
PropertyRestriction pr) {
@@ -267,7 +267,7 @@ public class OrderedContentMirrorStoreSt
* @param indexMeta
* @param indexStorageNodeName
* @param pr
- * @return
+ * @return the iterable
*/
public Iterable<String> query(final Filter filter, final String indexName,
final NodeState indexMeta, final String
indexStorageNodeName,
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/memory/AbstractBlob.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/memory/AbstractBlob.java?rev=1581481&r1=1581480&r2=1581481&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/memory/AbstractBlob.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/memory/AbstractBlob.java
Tue Mar 25 19:38:16 2014
@@ -104,7 +104,7 @@ public abstract class AbstractBlob imple
/**
* This hash code implementation returns the hash code of the underlying
stream
- * @return
+ * @return a byte array of the hash
*/
protected byte[] sha256() {
return getSha256().asBytes();
@@ -123,7 +123,6 @@ public abstract class AbstractBlob imple
* To {@code Blob} instances are considered equal iff they have the
* same SHA-256 hash code are equal.
* @param other
- * @return
*/
@Override
public boolean equals(Object other) {
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/EffectiveNodeType.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/EffectiveNodeType.java?rev=1581481&r1=1581480&r2=1581481&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/EffectiveNodeType.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/EffectiveNodeType.java
Tue Mar 25 19:38:16 2014
@@ -366,7 +366,7 @@ public class EffectiveNodeType {
*
* @param childName The internal oak name of the target node.
* @param childEffective
- * @return
+ * @return the node definition
* @throws ConstraintViolationException
*/
public NodeDefinition getNodeDefinition(
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/EffectiveNodeTypeProvider.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/EffectiveNodeTypeProvider.java?rev=1581481&r1=1581480&r2=1581481&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/EffectiveNodeTypeProvider.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/EffectiveNodeTypeProvider.java
Tue Mar 25 19:38:16 2014
@@ -54,23 +54,25 @@ public interface EffectiveNodeTypeProvid
/**
* Calculates and returns the effective node types of the given node.
+ * Also see <a href="http://www.jcp.org/en/jsr/detail?id=283";>JCR 2.0
Specification, Section 3.7.6.5</a>
+ * for the definition of the effective node type.
*
* @param targetNode the node for which the types should be calculated.
* @return all types of the given node
* @throws RepositoryException if the type information can not be accessed
- * @see <a href="http://www.jcp.org/en/jsr/detail?id=283";>JCR 2.0
Specification,
- * Section 3.7.6.5</a> for the definition of the effective node type.
+ * @see <a href="http://www.jcp.org/en/jsr/detail?id=283";>JCR 2.0
Specification, Section 3.7.6.5</a>
*/
EffectiveNodeType getEffectiveNodeType(Node targetNode) throws
RepositoryException;
/**
* Calculates and returns the effective node types of the given tree.
+ * Also see <a href="http://www.jcp.org/en/jsr/detail?id=283";>JCR 2.0
Specification, Section 3.7.6.5</a>
+ * for the definition of the effective node type.
*
- * @param tree
+ * @param tree the tree
* @return all node types of the given tree
* @throws RepositoryException if the type information can not be accessed,
- * @see <a href="http://www.jcp.org/en/jsr/detail?id=283";>JCR 2.0
Specification,
- * Section 3.7.6.5</a> for the definition of the effective node type.
+ * @see <a href="http://www.jcp.org/en/jsr/detail?id=283";>JCR 2.0
Specification, Section 3.7.6.5</a>
*/
EffectiveNodeType getEffectiveNodeType(Tree tree) throws
RepositoryException;
}
\ No newline at end of file
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/SegmentTracker.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/SegmentTracker.java?rev=1581481&r1=1581480&r2=1581481&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/SegmentTracker.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/SegmentTracker.java
Tue Mar 25 19:38:16 2014
@@ -168,7 +168,7 @@ public class SegmentTracker {
*
* @param msb
* @param lsb
- * @return
+ * @return the segment id
*/
public SegmentId getSegmentId(long msb, long lsb) {
int index = ((int) msb) & (tables.length - 1);
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/version/VersionSelector.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/version/VersionSelector.java?rev=1581481&r1=1581480&r2=1581481&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/version/VersionSelector.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/version/VersionSelector.java
Tue Mar 25 19:38:16 2014
@@ -40,14 +40,9 @@ import org.apache.jackrabbit.oak.spi.sta
* the parent version. This selector selects the latest version that is equal
* or older than the given date. if no such version exists, the initial one
* is restored.<br/>
- * The {@code Node.restoreByLabel()} uses the
- * {@link LabelVersionSelector} which is initialized with the label of the
- * version to be restored. This selector selects the version with the same
- * label. if no such version exists, the initial one is restored.
* <p/>
*
* @see DateVersionSelector
- * @see LabelVersionSelector
* @see javax.jcr.version.VersionManager#restore
*/
public interface VersionSelector {
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/CompiledPermissions.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/CompiledPermissions.java?rev=1581481&r1=1581480&r2=1581481&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/CompiledPermissions.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/CompiledPermissions.java
Tue Mar 25 19:38:16 2014
@@ -43,7 +43,7 @@ public interface CompiledPermissions {
* @param parent
* @param property
* @param permissions
- * @return
+ * @return {@code true} if granted.
*/
boolean isGranted(@Nonnull ImmutableTree parent, @Nullable PropertyState
property, long permissions);
@@ -51,7 +51,7 @@ public interface CompiledPermissions {
*
* @param path Path of an OAK tree
* @param permissions
- * @return
+ * @return {@code true} if granted.
*/
boolean isGranted(@Nonnull String path, long permissions);
@@ -59,7 +59,7 @@ public interface CompiledPermissions {
*
*
* @param tree
- * @return
+ * @return the set of privileges
*/
@Nonnull
Set<String> getPrivileges(@Nullable ImmutableTree tree);
@@ -69,7 +69,7 @@ public interface CompiledPermissions {
*
* @param tree
* @param privilegeNames
- * @return
+ * @return {@code true} if the tree has privileges
*/
boolean hasPrivileges(@Nullable ImmutableTree tree, @Nonnull String...
privilegeNames);
}
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/lifecycle/CompositeInitializer.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/lifecycle/CompositeInitializer.java?rev=1581481&r1=1581480&r2=1581481&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/lifecycle/CompositeInitializer.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/lifecycle/CompositeInitializer.java
Tue Mar 25 19:38:16 2014
@@ -28,7 +28,7 @@ import org.apache.jackrabbit.oak.spi.sta
/**
* Composite repository initializer that delegates the
- * {@link #initialize(NodeState)} call in sequence to all the
+ * {@link #initialize(NodeBuilder)} call in sequence to all the
* component initializers.
*/
public class CompositeInitializer implements RepositoryInitializer {
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/lifecycle/WorkspaceInitializer.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/lifecycle/WorkspaceInitializer.java?rev=1581481&r1=1581480&r2=1581481&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/lifecycle/WorkspaceInitializer.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/lifecycle/WorkspaceInitializer.java
Tue Mar 25 19:38:16 2014
@@ -45,7 +45,6 @@ public interface WorkspaceInitializer {
* @param workspaceName The name of the workspace that is being
initialized.
* @param indexProvider The query index provider used within this
workspace.
* @param commitHook The commit hook(s) defined for this workspace.
- * @return The modified workspace root state.
*/
void initialize(NodeBuilder builder,
String workspaceName,
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/security/Context.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/security/Context.java?rev=1581481&r1=1581480&r2=1581481&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/security/Context.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/security/Context.java
Tue Mar 25 19:38:16 2014
@@ -68,7 +68,7 @@ public interface Context {
* Reveals if the specified {@code TreeLocation} is defined by the security
* module that exposes this {@link Context} instance.
*
- * @param tree The tree location to be tested.
+ * @param location The tree location to be tested.
* @return {@code true} if the specified tree location is related to or
* defined by the security module.
*/
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/security/principal/PrincipalConfiguration.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/security/principal/PrincipalConfiguration.java?rev=1581481&r1=1581480&r2=1581481&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/security/principal/PrincipalConfiguration.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/security/principal/PrincipalConfiguration.java
Tue Mar 25 19:38:16 2014
@@ -38,7 +38,7 @@ public interface PrincipalConfiguration
* @param root The target root.
* @param namePathMapper The {@code NamePathMapper} to be used.
* @return An instance of {@link PrincipalManager}.
- * @see {@link
org.apache.jackrabbit.api.JackrabbitSession#getPrincipalManager()}
+ * @see org.apache.jackrabbit.api.JackrabbitSession#getPrincipalManager()
*/
@Nonnull
PrincipalManager getPrincipalManager(Root root, NamePathMapper
namePathMapper);
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/security/privilege/PrivilegeBitsProvider.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/security/privilege/PrivilegeBitsProvider.java?rev=1581481&r1=1581480&r2=1581481&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/security/privilege/PrivilegeBitsProvider.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/security/privilege/PrivilegeBitsProvider.java
Tue Mar 25 19:38:16 2014
@@ -64,8 +64,9 @@ public final class PrivilegeBitsProvider
}
/**
- * @param privilegeNames
- * @return
+ * Returns the bits for the given privilege names
+ * @param privilegeNames the names
+ * @return the privilege bits
*/
@Nonnull
public PrivilegeBits getBits(@Nonnull String... privilegeNames) {
@@ -77,8 +78,9 @@ public final class PrivilegeBitsProvider
}
/**
- * @param privilegeNames
- * @return
+ * Returns the bits for the given privilege names
+ * @param privilegeNames the names
+ * @return the privilege bits
*/
@Nonnull
public PrivilegeBits getBits(@Nonnull Iterable<String> privilegeNames) {
@@ -103,10 +105,11 @@ public final class PrivilegeBitsProvider
}
/**
+ * Returns the bits for the given privileges
*
- * @param privileges
- * @param nameMapper
- * @return
+ * @param privileges the privileges
+ * @param nameMapper the name mapper
+ * @return the privilege bits
*/
@Nonnull
public PrivilegeBits getBits(@Nonnull Privilege[] privileges, final
@Nonnull NameMapper nameMapper) {
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/state/NodeBuilder.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/state/NodeBuilder.java?rev=1581481&r1=1581480&r2=1581481&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/state/NodeBuilder.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/state/NodeBuilder.java
Tue Mar 25 19:38:16 2014
@@ -183,7 +183,7 @@ public interface NodeBuilder {
* had been made after each update. Repeated calls to this method with
* the same name will return the same child builder instance until an
* explicit {@link #setChildNode(String, NodeState)} or
- * {@link #remove())} call is made, at which point the link
+ * {@link #remove()} call is made, at which point the link
* between this builder and a previously returned child builder for
* that child node name will get broken.
*
@@ -391,12 +391,8 @@ public interface NodeBuilder {
* @param name The name of this property
* @param value The value of this property
* @param <T> The type of this property. Must be one of {@code String,
Blob, byte[], Long, Integer, Double, Boolean, BigDecimal}
- * @throws IllegalArgumentException if {@code T} is not one of the above
types.
- *
- * @param name name of the property
+ * @throws IllegalArgumentException if {@code T} is not one of the above
types, or if the property name is empty or contains the forward slash character
* @return this builder
- * @throws IllegalArgumentException if the property name is empty
- * or contains the forward slash character
*/
@Nonnull
<T> NodeBuilder setProperty(String name, @Nonnull T value)
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/state/NodeStoreBranch.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/state/NodeStoreBranch.java?rev=1581481&r1=1581480&r2=1581481&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/state/NodeStoreBranch.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/state/NodeStoreBranch.java
Tue Mar 25 19:38:16 2014
@@ -17,7 +17,6 @@
package org.apache.jackrabbit.oak.spi.state;
import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
import org.apache.jackrabbit.oak.api.CommitFailedException;
import org.apache.jackrabbit.oak.spi.commit.CommitHook;
@@ -44,8 +43,7 @@ public interface NodeStoreBranch {
* Returns the head state of this branch.
* The head state is the state resulting from the
* base state by applying all subsequent modifications to this branch
- * by {@link #setRoot(NodeState)}, {@link #move(String, String)},
- * and {@link #copy(String, String)}.
+ * by {@link #setRoot(NodeState)}.
*
* @return root node state
* @throws IllegalStateException if the branch is already merged
Modified:
jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/session/operation/SessionOperation.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/session/operation/SessionOperation.java?rev=1581481&r1=1581480&r2=1581481&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/session/operation/SessionOperation.java
(original)
+++
jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/session/operation/SessionOperation.java
Tue Mar 25 19:38:16 2014
@@ -39,7 +39,6 @@ public abstract class SessionOperation<T
/**
* Returns {@code true} if this operation updates the the transient
- * @return
*/
public boolean isUpdate() {
return update;
@@ -47,7 +46,6 @@ public abstract class SessionOperation<T
/**
* Return {@code true} if this operation refreshed the transient space
- * @return
*/
public boolean isRefresh() {
return false;
Modified:
jackrabbit/oak/trunk/oak-mk/src/main/java/org/apache/jackrabbit/mk/model/ChildNodeEntries.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-mk/src/main/java/org/apache/jackrabbit/mk/model/ChildNodeEntries.java?rev=1581481&r1=1581480&r2=1581481&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-mk/src/main/java/org/apache/jackrabbit/mk/model/ChildNodeEntries.java
(original)
+++
jackrabbit/oak/trunk/oak-mk/src/main/java/org/apache/jackrabbit/mk/model/ChildNodeEntries.java
Tue Mar 25 19:38:16 2014
@@ -57,7 +57,6 @@ public interface ChildNodeEntries extend
* {@code this}.
*
* @param other
- * @return
*/
Iterator<ChildNodeEntry> getAdded(final ChildNodeEntries other);
@@ -66,7 +65,6 @@ public interface ChildNodeEntries extend
* {@code other}.
*
* @param other
- * @return
*/
Iterator<ChildNodeEntry> getRemoved(final ChildNodeEntries other);
@@ -75,7 +73,6 @@ public interface ChildNodeEntries extend
* {@code other} but with different {@code id}s.
*
* @param other
- * @return
*/
Iterator<ChildNodeEntry> getModified(final ChildNodeEntries other);
Modified:
jackrabbit/oak/trunk/oak-mk/src/main/java/org/apache/jackrabbit/mk/persistence/GCPersistence.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-mk/src/main/java/org/apache/jackrabbit/mk/persistence/GCPersistence.java?rev=1581481&r1=1581480&r2=1581481&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-mk/src/main/java/org/apache/jackrabbit/mk/persistence/GCPersistence.java
(original)
+++
jackrabbit/oak/trunk/oak-mk/src/main/java/org/apache/jackrabbit/mk/persistence/GCPersistence.java
Tue Mar 25 19:38:16 2014
@@ -49,12 +49,9 @@ public interface GCPersistence extends P
* Replace a commit. Introduced to replace dangling parent commits where
* a parent commit might be collected.
*
- * @param id
- * commit id
- * @param
- * @return {@code true} if the commit was not marked before;
- * {@code false} otherwise
- *
+ * @param id commit id
+ * @param commit the commit
+ *
* @throws Exception if an error occurs
*/
void replaceCommit(Id id, Commit commit) throws Exception;
Modified:
jackrabbit/oak/trunk/oak-pojosr/src/main/java/org/apache/jackrabbit/oak/run/osgi/OakOSGiRepositoryFactory.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-pojosr/src/main/java/org/apache/jackrabbit/oak/run/osgi/OakOSGiRepositoryFactory.java?rev=1581481&r1=1581480&r2=1581481&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-pojosr/src/main/java/org/apache/jackrabbit/oak/run/osgi/OakOSGiRepositoryFactory.java
(original)
+++
jackrabbit/oak/trunk/oak-pojosr/src/main/java/org/apache/jackrabbit/oak/run/osgi/OakOSGiRepositoryFactory.java
Tue Mar 25 19:38:16 2014
@@ -148,7 +148,7 @@ public class OakOSGiRepositoryFactory im
/**
* @param descriptors
- * @return
+ * @return the bundle descriptors
*/
protected List<BundleDescriptor> processDescriptors(List<BundleDescriptor>
descriptors) {
//If required sort the bundle descriptors such that configuration
admin and file install bundle
Modified:
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/benchmark/CreateManyChildNodesTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/benchmark/CreateManyChildNodesTest.java?rev=1581481&r1=1581480&r2=1581481&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/benchmark/CreateManyChildNodesTest.java
(original)
+++
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/benchmark/CreateManyChildNodesTest.java
Tue Mar 25 19:38:16 2014
@@ -28,7 +28,7 @@ public class CreateManyChildNodesTest ex
protected static final String ROOT_NODE_NAME = "test" + TEST_ID;
- private static final int CHILD_COUNT = 10 * 1000;
+ protected static final int CHILD_COUNT = 10 * 1000;
private Session session;
Modified:
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/benchmark/TransientManyChildNodesTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/benchmark/TransientManyChildNodesTest.java?rev=1581481&r1=1581480&r2=1581481&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/benchmark/TransientManyChildNodesTest.java
(original)
+++
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/benchmark/TransientManyChildNodesTest.java
Tue Mar 25 19:38:16 2014
@@ -28,10 +28,10 @@ import javax.jcr.Session;
public class TransientManyChildNodesTest extends AbstractTest {
protected static final String ROOT_NODE_NAME = "test" + TEST_ID;
-
- private static final int CHILD_COUNT = 10 * 1000;
- private static final int ITERATIONS = 10;
+ protected static final int CHILD_COUNT = 10 * 1000;
+
+ protected static final int ITERATIONS = 10;
private Session session;
Modified:
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/benchmark/UpdateManyChildNodesTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/benchmark/UpdateManyChildNodesTest.java?rev=1581481&r1=1581480&r2=1581481&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/benchmark/UpdateManyChildNodesTest.java
(original)
+++
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/benchmark/UpdateManyChildNodesTest.java
Tue Mar 25 19:38:16 2014
@@ -28,7 +28,7 @@ public class UpdateManyChildNodesTest ex
protected static final String ROOT_NODE_NAME = "update" + TEST_ID;
- private static final int CHILD_COUNT = 10 * 1000;
+ protected static final int CHILD_COUNT = 10 * 1000;
private Session session;
private Node node;
