You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by to...@apache.org on 2016/12/19 09:51:17 UTC
svn commit: r1775035 - in
/jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade:
./ blob/ cli/parser/ nodestate/ security/
Author: tomekr
Date: Mon Dec 19 09:51:17 2016
New Revision: 1775035
URL: http://svn.apache.org/viewvc?rev=1775035&view=rev
Log:
@trivial updated javadoc syntax in oak-upgrade
Modified:
jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/RepositorySidegrade.java
jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/blob/LengthCachingDataStore.java
jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/parser/DatastoreArguments.java
jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/nodestate/FilteringNodeState.java
jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/nodestate/NodeStateCopier.java
jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/security/AuthorizableFolderEditor.java
Modified: jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/RepositorySidegrade.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/RepositorySidegrade.java?rev=1775035&r1=1775034&r2=1775035&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/RepositorySidegrade.java (original)
+++ jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/RepositorySidegrade.java Mon Dec 19 09:51:17 2016
@@ -234,7 +234,9 @@ public class RepositorySidegrade {
}
/**
- * Same as {@link #copy(RepositoryInitializer)}, but with no custom initializer.
+ * Same as {@link #copy(RepositoryInitializer)}, but with no custom initializer.
+ *
+ * @throws RepositoryException if the copy operation fails
*/
public void copy() throws RepositoryException {
copy(null);
Modified: jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/blob/LengthCachingDataStore.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/blob/LengthCachingDataStore.java?rev=1775035&r1=1775034&r2=1775035&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/blob/LengthCachingDataStore.java (original)
+++ jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/blob/LengthCachingDataStore.java Mon Dec 19 09:51:17 2016
@@ -71,7 +71,6 @@ import static com.google.common.base.Pre
* }</pre>
* <p>
* The Configuration:
- * <p>
* <pre>{@code
* <DataStore class="org.apache.jackrabbit.oak.upgrade.blob.LengthCachingDataStore">
* <param name="mappingFilePath" value="/path/to/mapping/file" />
Modified: jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/parser/DatastoreArguments.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/parser/DatastoreArguments.java?rev=1775035&r1=1775034&r2=1775035&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/parser/DatastoreArguments.java (original)
+++ jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/parser/DatastoreArguments.java Mon Dec 19 09:51:17 2016
@@ -52,7 +52,7 @@ import static org.apache.jackrabbit.oak.
| + | * | - | + | as in src | copy to embedded
| + | * | + | * | as in src | copy to defined blobstore
- ¹ - (x) not supported for SegmentMK -> MongoMK migration
+ ¹ - (x) not supported for SegmentMK -> MongoMK migration
For upgrade:
Modified: jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/nodestate/FilteringNodeState.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/nodestate/FilteringNodeState.java?rev=1775035&r1=1775034&r2=1775035&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/nodestate/FilteringNodeState.java (original)
+++ jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/nodestate/FilteringNodeState.java Mon Dec 19 09:51:17 2016
@@ -76,7 +76,6 @@ public class FilteringNodeState extends
* @param includePaths A Set of paths that should be visible. Defaults to ["/"] if {@code null}.
* @param excludePaths A Set of paths that should be hidden. Empty if {@code null}.
* @return The decorated node-state if required, the original node-state if decoration is unnecessary.
- * @param excludePaths
*/
@Nonnull
public static NodeState wrap(
Modified: jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/nodestate/NodeStateCopier.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/nodestate/NodeStateCopier.java?rev=1775035&r1=1775034&r2=1775035&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/nodestate/NodeStateCopier.java (original)
+++ jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/nodestate/NodeStateCopier.java Mon Dec 19 09:51:17 2016
@@ -101,7 +101,8 @@ public class NodeStateCopier {
*
* @param source NodeStore to copy from.
* @param target NodeStore to copy to.
- * @throws CommitFailedException
+ * @return true if the target has been modified
+ * @throws CommitFailedException if the operation fails
* @see org.apache.jackrabbit.oak.upgrade.nodestate.NodeStateCopier.Builder#copy(NodeStore, NodeStore)
*/
public static boolean copyNodeStore(@Nonnull final NodeStore source, @Nonnull final NodeStore target)
@@ -409,7 +410,7 @@ public class NodeStateCopier {
* @param target NodeStore to copy to
* @return true if there were any changes, false if source and target represent
* the same content
- * @throws CommitFailedException
+ * @throws CommitFailedException if the copy operation fails
*/
public boolean copy(@Nonnull final NodeStore source, @Nonnull final NodeStore target)
throws CommitFailedException {
Modified: jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/security/AuthorizableFolderEditor.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/security/AuthorizableFolderEditor.java?rev=1775035&r1=1775034&r2=1775035&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/security/AuthorizableFolderEditor.java (original)
+++ jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/security/AuthorizableFolderEditor.java Mon Dec 19 09:51:17 2016
@@ -36,7 +36,7 @@ import static org.apache.jackrabbit.oak.
* There are occasions where in old JR2 repositories not all ancestors on
* the users path are of type {@code rep:AuthorizableFolder}, thus leading
* to exceptions after repository upgrade.
- * <br/>
+ * <br>
* In order to avoid such situations, this hook verifies that all nodes on
* the users and groups paths are of type {@code rep:AuthorizableFolder} and
* fixes the node-type if it is incorrect.