svn commit: r1747246 [2/2] - in /jackrabbit/oak/trunk: oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/basic/ oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/...

[fr...@apache.org]

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=1747246&r1=1747245&r2=1747246&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 Tue Jun  7 14:45:31 2016
@@ -57,27 +57,27 @@ import static com.google.common.base.Pre
 /**
  * A DelegatingDataStore can avoid performing expensive file system access by making
  * use of pre computed data related to files in DataStore.
- * <p/>
- * <p>During repository migration actual blob content is not accessed and instead
+ * <p>
+ * During repository migration actual blob content is not accessed and instead
  * only the blob length and blob references are accessed. DelegatingDataStore can be
  * configured with a mapping file which would be used to determine the length of given
- * blob reference.</p>
- * <p/>
+ * blob reference.
+ * <p>
  * Mapping file format
- * <pre><![CDATA[
+ * <pre>{@code
  *     #< length >| < identifier >
  *     4432|dd10bca036f3134352c63e534d4568a3d2ac2fdc
  *     32167|dd10bca036f3134567c63e534d4568a3d2ac2fdc
- * ]]></pre>
- * <p/>
+ * }</pre>
+ * <p>
  * The Configuration:
- * <p/>
- * <pre><![CDATA[
+ * <p>
+ * <pre>{@code
  *  <DataStore class="org.apache.jackrabbit.oak.upgrade.blob.LengthCachingDataStore">
  *      <param name="mappingFilePath" value="/path/to/mapping/file" />
  *      <param name="delegateClass" value="org.apache.jackrabbit.core.data.FileDataStore" />
  *  </DataStore>
- * ]]></pre>
+ * }</pre>
  */
 public class LengthCachingDataStore extends AbstractDataStore {
     private static final Logger log = LoggerFactory.getLogger(LengthCachingDataStore.class);

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=1747246&r1=1747245&r2=1747246&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 Tue Jun  7 14:45:31 2016
@@ -73,8 +73,8 @@ public class FilteringNodeState extends
      *
      * @param path The path where the node-state should be assumed to be located.
      * @param delegate The node-state to decorate.
-     * @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).
+     * @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
      */

Modified: jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/nodestate/report/ReportingNodeState.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/nodestate/report/ReportingNodeState.java?rev=1747246&r1=1747245&r2=1747246&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/nodestate/report/ReportingNodeState.java (original)
+++ jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/nodestate/report/ReportingNodeState.java Tue Jun  7 14:45:31 2016
@@ -44,7 +44,9 @@ import javax.annotation.Nullable;
  * reported. Therefore if exactly counting unique accesses is a
  * requirement, the reporter needs to take care of de-duplication.
  *
- * @see Reporter, PeriodicReporter, LoggingReporter
+ * @see Reporter
+ * @see PeriodicReporter
+ * @see LoggingReporter
  */
 public class ReportingNodeState extends AbstractDecoratedNodeState {