Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 26760200BF4 for ; Fri, 6 Jan 2017 18:19:30 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 24D6B160B37; Fri, 6 Jan 2017 17:19:30 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 01CC9160B48 for ; Fri, 6 Jan 2017 18:19:27 +0100 (CET) Received: (qmail 51588 invoked by uid 500); 6 Jan 2017 17:19:26 -0000 Mailing-List: contact commits-help@jackrabbit.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@jackrabbit.apache.org Delivered-To: mailing list commits@jackrabbit.apache.org Received: (qmail 51367 invoked by uid 99); 6 Jan 2017 17:19:26 -0000 Received: from Unknown (HELO svn01-us-west.apache.org) (209.188.14.144) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 06 Jan 2017 17:19:26 +0000 Received: from svn01-us-west.apache.org (localhost [127.0.0.1]) by svn01-us-west.apache.org (ASF Mail Server at svn01-us-west.apache.org) with ESMTP id 9BF693A03A7 for ; Fri, 6 Jan 2017 17:19:25 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1777658 [1/2] - in /jackrabbit/branches/2.10: ./ jackrabbit-api/src/main/java/org/apache/jackrabbit/api/security/user/ jackrabbit-core/src/main/java/org/apache/jackrabbit/core/config/ jackrabbit-core/src/main/java/org/apache/jackrabbit/cor... Date: Fri, 06 Jan 2017 17:19:25 -0000 To: commits@jackrabbit.apache.org From: reschke@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20170106171925.9BF693A03A7@svn01-us-west.apache.org> archived-at: Fri, 06 Jan 2017 17:19:30 -0000 Author: reschke Date: Fri Jan 6 17:19:24 2017 New Revision: 1777658 URL: http://svn.apache.org/viewvc?rev=1777658&view=rev Log: JCR-4090: fix javadoc problems - part4 (ported to 2.10) Modified: jackrabbit/branches/2.10/ (props changed) jackrabbit/branches/2.10/jackrabbit-api/src/main/java/org/apache/jackrabbit/api/security/user/Group.java jackrabbit/branches/2.10/jackrabbit-api/src/main/java/org/apache/jackrabbit/api/security/user/Query.java jackrabbit/branches/2.10/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/config/BeanConfig.java jackrabbit/branches/2.10/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/config/RepositoryConfigurationParser.java jackrabbit/branches/2.10/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/config/SearchConfig.java jackrabbit/branches/2.10/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/fs/db/DatabaseFileSystem.java jackrabbit/branches/2.10/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/id/NodeId.java jackrabbit/branches/2.10/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/journal/DatabaseJournal.java jackrabbit/branches/2.10/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/journal/FileRecordLog.java jackrabbit/branches/2.10/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/journal/JNDIDatabaseJournal.java jackrabbit/branches/2.10/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/journal/Record.java jackrabbit/branches/2.10/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/AbstractBundlePersistenceManager.java jackrabbit/branches/2.10/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/db/OraclePersistenceManager.java jackrabbit/branches/2.10/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/db/SimpleDbPersistenceManager.java jackrabbit/branches/2.10/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/pool/BundleDbPersistenceManager.java jackrabbit/branches/2.10/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/pool/DerbyPersistenceManager.java jackrabbit/branches/2.10/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/pool/OraclePersistenceManager.java jackrabbit/branches/2.10/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/QueryHandler.java jackrabbit/branches/2.10/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/JackrabbitAnalyzer.java jackrabbit/branches/2.10/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/JackrabbitQuery.java jackrabbit/branches/2.10/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/RangeQuery.java jackrabbit/branches/2.10/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/SearchIndex.java jackrabbit/branches/2.10/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/AnonymousPrincipal.java jackrabbit/branches/2.10/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/SimpleJBossAccessManager.java jackrabbit/branches/2.10/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/value/InternalValue.java jackrabbit/branches/2.10/jackrabbit-data/src/main/java/org/apache/jackrabbit/core/data/AsyncUploadCache.java jackrabbit/branches/2.10/jackrabbit-data/src/main/java/org/apache/jackrabbit/core/data/AsyncUploadCacheResult.java jackrabbit/branches/2.10/jackrabbit-data/src/main/java/org/apache/jackrabbit/core/data/MultiDataStoreAware.java jackrabbit/branches/2.10/jackrabbit-data/src/main/java/org/apache/jackrabbit/core/data/db/DbDataStore.java jackrabbit/branches/2.10/jackrabbit-data/src/main/java/org/apache/jackrabbit/core/util/db/ConnectionHelper.java jackrabbit/branches/2.10/jackrabbit-data/src/main/java/org/apache/jackrabbit/core/util/db/Oracle10R1ConnectionHelper.java jackrabbit/branches/2.10/jackrabbit-data/src/main/java/org/apache/jackrabbit/core/util/db/StreamWrapper.java jackrabbit/branches/2.10/jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/commons/AbstractSession.java jackrabbit/branches/2.10/jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/commons/JcrUtils.java jackrabbit/branches/2.10/jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/commons/flat/TreeTraverser.java jackrabbit/branches/2.10/jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/commons/iterator/NodeIterable.java jackrabbit/branches/2.10/jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/commons/iterator/PropertyIterable.java jackrabbit/branches/2.10/jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/commons/iterator/RowIterable.java jackrabbit/branches/2.10/jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/commons/jackrabbit/authorization/AccessControlUtils.java jackrabbit/branches/2.10/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/client/ClientItem.java jackrabbit/branches/2.10/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/client/ClientObject.java jackrabbit/branches/2.10/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/client/LocalAdapterFactory.java jackrabbit/branches/2.10/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/client/iterator/ClientIterator.java jackrabbit/branches/2.10/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/client/principal/ClientGroup.java jackrabbit/branches/2.10/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/iterator/ArrayEventIterator.java jackrabbit/branches/2.10/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/iterator/ArrayEventListenerIterator.java jackrabbit/branches/2.10/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/remote/RemoteEventCollection.java jackrabbit/branches/2.10/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/remote/RemoteNodeType.java jackrabbit/branches/2.10/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/remote/RemoteQuery.java jackrabbit/branches/2.10/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/remote/RemoteQueryManager.java jackrabbit/branches/2.10/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/repository/JNDIRemoteRepository.java jackrabbit/branches/2.10/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/repository/RMIRemoteRepository.java jackrabbit/branches/2.10/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/repository/URLRemoteRepository.java jackrabbit/branches/2.10/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/server/iterator/ServerIterator.java jackrabbit/branches/2.10/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/value/SerialValueFactory.java jackrabbit/branches/2.10/jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/webdav/jcr/JcrValueType.java jackrabbit/branches/2.10/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/query/AbstractQueryTest.java jackrabbit/branches/2.10/jackrabbit-jcr2dav/src/main/java/org/apache/jackrabbit/jcr2dav/Jcr2davRepositoryFactory.java jackrabbit/branches/2.10/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/StaleProperty.java jackrabbit/branches/2.10/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/nodetype/NodeTypeRegistryImpl.java jackrabbit/branches/2.10/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/AbstractReadableRepositoryService.java jackrabbit/branches/2.10/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/batch/Operations.java jackrabbit/branches/2.10/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/logging/SpiLoggerFactory.java jackrabbit/branches/2.10/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/name/CurrentPath.java jackrabbit/branches/2.10/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/name/ParentPath.java jackrabbit/branches/2.10/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/qom/JoinImpl.java jackrabbit/branches/2.10/jackrabbit-spi/src/main/java/org/apache/jackrabbit/spi/ItemId.java jackrabbit/branches/2.10/jackrabbit-spi/src/main/java/org/apache/jackrabbit/spi/ItemInfoCache.java jackrabbit/branches/2.10/jackrabbit-spi/src/main/java/org/apache/jackrabbit/spi/NodeInfo.java jackrabbit/branches/2.10/jackrabbit-spi2dav/src/main/java/org/apache/jackrabbit/spi2dav/RepositoryServiceImpl.java jackrabbit/branches/2.10/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/property/DavProperty.java Propchange: jackrabbit/branches/2.10/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Jan 6 17:19:24 2017 @@ -1,4 +1,4 @@ -/jackrabbit/branches/2.12:1776442,1776451,1776500 +/jackrabbit/branches/2.12:1776442,1776451,1776500,1776524 /jackrabbit/branches/JCR-2272:1173165-1176545 /jackrabbit/sandbox/JCR-2415-lucene-3.0:1060860-1064038 -/jackrabbit/trunk:1709811,1717599,1729382,1732436,1740814-1740815,1751279,1752165,1753226,1758600,1759607,1759782,1759865,1761679,1761909,1762422,1763558,1766398,1771078,1771741,1771939,1771999,1772049,1772444,1772457,1772530,1772544,1773579,1773591,1773745,1774443,1775123,1775132,1775315,1775384,1775414,1775419,1775437,1775444,1775463,1775472-1775473,1775481,1775485,1775496,1775509,1775514,1775613,1775617,1775621,1775624,1775629,1775631-1775632,1775657 +/jackrabbit/trunk:1709811,1717599,1729382,1732436,1740814-1740815,1751279,1752165,1753226,1758600,1759607,1759782,1759865,1761679,1761909,1762422,1763558,1766398,1771078,1771741,1771939,1771999,1772049,1772444,1772457,1772530,1772544,1773579,1773591,1773745,1774443,1775123,1775132,1775315,1775384,1775414,1775419,1775437,1775444,1775463,1775472-1775473,1775481,1775485,1775496,1775509,1775514,1775613,1775617,1775621,1775624,1775629,1775631-1775632,1775634-1775635,1775637,1775657,1776410,1776414,1776416-1776417,1776421 Modified: jackrabbit/branches/2.10/jackrabbit-api/src/main/java/org/apache/jackrabbit/api/security/user/Group.java URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.10/jackrabbit-api/src/main/java/org/apache/jackrabbit/api/security/user/Group.java?rev=1777658&r1=1777657&r2=1777658&view=diff ============================================================================== --- jackrabbit/branches/2.10/jackrabbit-api/src/main/java/org/apache/jackrabbit/api/security/user/Group.java (original) +++ jackrabbit/branches/2.10/jackrabbit-api/src/main/java/org/apache/jackrabbit/api/security/user/Group.java Fri Jan 6 17:19:24 2017 @@ -17,6 +17,8 @@ package org.apache.jackrabbit.api.security.user; import javax.jcr.RepositoryException; +import javax.jcr.Session; + import java.util.Iterator; /** Modified: jackrabbit/branches/2.10/jackrabbit-api/src/main/java/org/apache/jackrabbit/api/security/user/Query.java URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.10/jackrabbit-api/src/main/java/org/apache/jackrabbit/api/security/user/Query.java?rev=1777658&r1=1777657&r2=1777658&view=diff ============================================================================== --- jackrabbit/branches/2.10/jackrabbit-api/src/main/java/org/apache/jackrabbit/api/security/user/Query.java (original) +++ jackrabbit/branches/2.10/jackrabbit-api/src/main/java/org/apache/jackrabbit/api/security/user/Query.java Fri Jan 6 17:19:24 2017 @@ -26,8 +26,8 @@ package org.apache.jackrabbit.api.securi * the name. * *
- *  Iterator result = userMgr.findAuthorizables(new Query() {
- *      public  void build(QueryBuilder builder) {
+ *  Iterator<Authorizable> result = userMgr.findAuthorizables(new Query() {
+ *      public <T> void build(QueryBuilder<T> builder) {
  *          builder.setCondition(builder.
  *              and(builder.
  *                  property("@name", RelationOp.EQ, valueFactory.createValue("Bob")), builder.

Modified: jackrabbit/branches/2.10/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/config/BeanConfig.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.10/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/config/BeanConfig.java?rev=1777658&r1=1777657&r2=1777658&view=diff
==============================================================================
--- jackrabbit/branches/2.10/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/config/BeanConfig.java (original)
+++ jackrabbit/branches/2.10/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/config/BeanConfig.java Fri Jan  6 17:19:24 2017
@@ -146,7 +146,7 @@ public class BeanConfig {
 
     /**
      * @param connectionFactory the {@link ConnectionFactory} to inject (if possible) in the
-     *            {@link #newInstance()} method
+     *            {@link #newInstance(Class)} method
      */
     public void setConnectionFactory(ConnectionFactory connectionFactory) {
         this.connectionFactory = connectionFactory;
@@ -286,9 +286,8 @@ public class BeanConfig {
 
     /**
      * Returns the current ClassLoader used to instantiate objects
-     * in the {@link #newInstance()} method.
+     * in the {@link #newInstance(Class)} method.
      *
-     * @see #newInstance()
      * @see #setClassLoader(ClassLoader)
      * @see #getDefaultClassLoader()
      * @see #setDefaultClassLoader(ClassLoader)
@@ -299,13 +298,12 @@ public class BeanConfig {
 
     /**
      * Sets the ClassLoader used to instantiate objects in the
-     * {@link #newInstance()} method.
+     * {@link #newInstance(Class)} method.
      *
      * @param classLoader The class loader to set on this instance. If this is
      *      null the system class loader will be used, which may
      *      lead to unexpected class loading failures.
      *
-     * @see #newInstance()
      * @see #getClassLoader()
      * @see #getDefaultClassLoader()
      * @see #setDefaultClassLoader(ClassLoader)
@@ -317,9 +315,8 @@ public class BeanConfig {
     /**
      * Returns the current ClassLoader used for new instances of
      * this class as the loader used to instantiate objects in the
-     * {@link #newInstance()} method.
+     * {@link #newInstance(Class)} method.
      *
-     * @see #newInstance()
      * @see #getClassLoader()
      * @see #setClassLoader(ClassLoader)
      * @see #setDefaultClassLoader(ClassLoader)
@@ -330,13 +327,12 @@ public class BeanConfig {
 
     /**
      * Sets the ClassLoader used for new instances of this class as
-     * the loader to instantiate objects in the {@link #newInstance()} method.
+     * the loader to instantiate objects in the {@link #newInstance(Class)} method.
      *
      * @param classLoader The class loader to set as the default class loader.
      *      If this is null the system class loader will be used,
      *      which may lead to unexpected class loading failures.
      *
-     * @see #newInstance()
      * @see #getClassLoader()
      * @see #setClassLoader(ClassLoader)
      * @see #getDefaultClassLoader()

Modified: jackrabbit/branches/2.10/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/config/RepositoryConfigurationParser.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.10/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/config/RepositoryConfigurationParser.java?rev=1777658&r1=1777657&r2=1777658&view=diff
==============================================================================
--- jackrabbit/branches/2.10/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/config/RepositoryConfigurationParser.java (original)
+++ jackrabbit/branches/2.10/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/config/RepositoryConfigurationParser.java Fri Jan  6 17:19:24 2017
@@ -528,7 +528,7 @@ public class RepositoryConfigurationPars
      * PersistenceManager, and SearchIndex) are
      * {@link #parseBeanConfig(Element,String) bean configuration} elements.
      * In addition to bean configuration, the
-     * {@link #parseSearchConfig(Element) search element} also contains
+     * search element also contains
      * configuration for the search file system.
      * 

* In addition to the configured information, the returned workspace Modified: jackrabbit/branches/2.10/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/config/SearchConfig.java URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.10/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/config/SearchConfig.java?rev=1777658&r1=1777657&r2=1777658&view=diff ============================================================================== --- jackrabbit/branches/2.10/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/config/SearchConfig.java (original) +++ jackrabbit/branches/2.10/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/config/SearchConfig.java Fri Jan 6 17:19:24 2017 @@ -30,8 +30,6 @@ import org.apache.jackrabbit.core.fs.Fil * In addition to generic bean configuration information, this * class also contains an optional file system configuration * used by the search index. - * - * @see WorkspaceConfig#getSearchConfig() */ public class SearchConfig extends BeanConfig implements FileSystemFactory { Modified: jackrabbit/branches/2.10/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/fs/db/DatabaseFileSystem.java URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.10/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/fs/db/DatabaseFileSystem.java?rev=1777658&r1=1777657&r2=1777658&view=diff ============================================================================== --- jackrabbit/branches/2.10/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/fs/db/DatabaseFileSystem.java (original) +++ jackrabbit/branches/2.10/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/fs/db/DatabaseFileSystem.java Fri Jan 6 17:19:24 2017 @@ -19,7 +19,6 @@ package org.apache.jackrabbit.core.fs.db import org.apache.jackrabbit.core.fs.FileSystem; import org.apache.jackrabbit.core.fs.FileSystemException; import org.apache.jackrabbit.core.fs.FileSystemPathUtil; -import org.apache.jackrabbit.core.persistence.PMContext; import org.apache.jackrabbit.core.util.db.CheckSchemaOperation; import org.apache.jackrabbit.core.util.db.ConnectionHelper; import org.apache.jackrabbit.core.util.db.DbUtility; @@ -45,9 +44,9 @@ import java.util.ArrayList; /** * Base class for database file systems. This class contains common * functionality for database file system subclasses that normally differ only - * in the way the database connection is acquired. Subclasses should override + * in the way the database connection is acquired. *

* See the {@link DbFileSystem} for a detailed description of the available * configuration options and database behaviour. @@ -215,7 +214,7 @@ public abstract class DatabaseFileSystem protected abstract DataSource getDataSource() throws Exception; /** - * This method is called from the {@link #init(PMContext)} method of this class and returns a + * This method is called from the {@link #init()} method of this class and returns a * {@link ConnectionHelper} instance which is assigned to the {@code conHelper} field. Subclasses may * override it to return a specialized connection helper. * @@ -228,7 +227,7 @@ public abstract class DatabaseFileSystem } /** - * This method is called from {@link #init(PMContext)} after the + * This method is called from {@link #init()} after the * {@link #createConnectionHelper(DataSource)} method, and returns a default {@link CheckSchemaOperation}. * Subclasses can overrride this implementation to get a customized implementation. * Modified: jackrabbit/branches/2.10/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/id/NodeId.java URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.10/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/id/NodeId.java?rev=1777658&r1=1777657&r2=1777658&view=diff ============================================================================== --- jackrabbit/branches/2.10/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/id/NodeId.java (original) +++ jackrabbit/branches/2.10/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/id/NodeId.java Fri Jan 6 17:19:24 2017 @@ -118,7 +118,6 @@ public class NodeId implements ItemId, C /** * Creates a node identifier from the given UUID string. * - * @see #fromString(String) * @param uuidString UUID string * @throws IllegalArgumentException if the UUID string is invalid */ Modified: jackrabbit/branches/2.10/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/journal/DatabaseJournal.java URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.10/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/journal/DatabaseJournal.java?rev=1777658&r1=1777657&r2=1777658&view=diff ============================================================================== --- jackrabbit/branches/2.10/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/journal/DatabaseJournal.java (original) +++ jackrabbit/branches/2.10/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/journal/DatabaseJournal.java Fri Jan 6 17:19:24 2017 @@ -304,7 +304,7 @@ public class DatabaseJournal extends Abs /** * This method is called from {@link #init(String, NamespaceResolver)} after the * {@link #createConnectionHelper(DataSource)} method, and returns a default {@link CheckSchemaOperation}. - * Subclasses can overrride this implementation to get a customized implementation. + * Subclasses can override this implementation to get a customized implementation. * * @return a new {@link CheckSchemaOperation} instance */ @@ -321,7 +321,6 @@ public class DatabaseJournal extends Abs * database type. Should be overridden by subclasses that use a different way to * create a connection and therefore require other arguments. * - * @see #getConnection() * @throws JournalException if initialization fails */ protected void init() throws JournalException { Modified: jackrabbit/branches/2.10/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/journal/FileRecordLog.java URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.10/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/journal/FileRecordLog.java?rev=1777658&r1=1777657&r2=1777658&view=diff ============================================================================== --- jackrabbit/branches/2.10/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/journal/FileRecordLog.java (original) +++ jackrabbit/branches/2.10/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/journal/FileRecordLog.java Fri Jan 6 17:19:24 2017 @@ -39,7 +39,7 @@ import java.io.ByteArrayOutputStream; * log contains a header with the following physical layout: * *

- * + *
* * * Modified: jackrabbit/branches/2.10/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/journal/JNDIDatabaseJournal.java URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.10/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/journal/JNDIDatabaseJournal.java?rev=1777658&r1=1777657&r2=1777658&view=diff ============================================================================== --- jackrabbit/branches/2.10/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/journal/JNDIDatabaseJournal.java (original) +++ jackrabbit/branches/2.10/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/journal/JNDIDatabaseJournal.java Fri Jan 6 17:19:24 2017 @@ -73,7 +73,7 @@ public class JNDIDatabaseJournal extends * * @return new database connection * @throws SQLException if a database access error occurs - * @see DatabaseJournal#getConnection() + * @see DataSource#getConnection() */ protected Connection getConnection() throws SQLException { try { Modified: jackrabbit/branches/2.10/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/journal/Record.java URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.10/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/journal/Record.java?rev=1777658&r1=1777657&r2=1777658&view=diff ============================================================================== --- jackrabbit/branches/2.10/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/journal/Record.java (original) +++ jackrabbit/branches/2.10/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/journal/Record.java Fri Jan 6 17:19:24 2017 @@ -277,7 +277,7 @@ public interface Record { * Update the changes made to an appended record. This will also update * this record's revision. * - * @returns The update size in bytes. + * @return The update size in bytes. * @throws JournalException if this record has not been appended, * or if another error occurs */ Modified: jackrabbit/branches/2.10/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/AbstractBundlePersistenceManager.java URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.10/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/AbstractBundlePersistenceManager.java?rev=1777658&r1=1777657&r2=1777658&view=diff ============================================================================== --- jackrabbit/branches/2.10/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/AbstractBundlePersistenceManager.java (original) +++ jackrabbit/branches/2.10/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/AbstractBundlePersistenceManager.java Fri Jan 6 17:19:24 2017 @@ -85,7 +85,7 @@ import org.slf4j.LoggerFactory; *

* In order to increase performance, there are two caches being maintained. One is the * bundle cache that caches already loaded bundles. The other is the - * {@link LRUNodeIdCache} that caches non-existent bundles. This is useful + * {@code LRUNodeIdCache} that caches non-existent bundles. This is useful * because a lot of {@link #exists(NodeId)} calls are issued that would result * in a useless persistence lookup if the desired bundle does not exist. *

Modified: jackrabbit/branches/2.10/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/db/OraclePersistenceManager.java URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.10/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/db/OraclePersistenceManager.java?rev=1777658&r1=1777657&r2=1777658&view=diff ============================================================================== --- jackrabbit/branches/2.10/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/db/OraclePersistenceManager.java (original) +++ jackrabbit/branches/2.10/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/db/OraclePersistenceManager.java Fri Jan 6 17:19:24 2017 @@ -144,9 +144,6 @@ public class OraclePersistenceManager ex * Retrieve the oracle.sql.BLOB class via reflection, and * initialize the values for the DURATION_SESSION and * MODE_READWRITE constants defined there. - * @see oracle.sql.BLOB#DURATION_SESSION - * @see oracle.sql.BLOB#MODE_READWRITE - * @noinspection JavadocReference */ public void init(PMContext context) throws Exception { super.init(context); Modified: jackrabbit/branches/2.10/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/db/SimpleDbPersistenceManager.java URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.10/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/db/SimpleDbPersistenceManager.java?rev=1777658&r1=1777657&r2=1777658&view=diff ============================================================================== --- jackrabbit/branches/2.10/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/db/SimpleDbPersistenceManager.java (original) +++ jackrabbit/branches/2.10/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/db/SimpleDbPersistenceManager.java Fri Jan 6 17:19:24 2017 @@ -16,10 +16,12 @@ */ package org.apache.jackrabbit.core.persistence.db; +import org.apache.jackrabbit.core.persistence.util.Serializer; import org.apache.jackrabbit.core.util.db.ConnectionFactory; import org.apache.jackrabbit.core.util.db.DatabaseAware; import java.sql.Connection; +import java.sql.DriverManager; import java.sql.SQLException; import javax.jcr.RepositoryException; Modified: jackrabbit/branches/2.10/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/pool/BundleDbPersistenceManager.java URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.10/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/pool/BundleDbPersistenceManager.java?rev=1777658&r1=1777657&r2=1777658&view=diff ============================================================================== --- jackrabbit/branches/2.10/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/pool/BundleDbPersistenceManager.java (original) +++ jackrabbit/branches/2.10/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/pool/BundleDbPersistenceManager.java Fri Jan 6 17:19:24 2017 @@ -80,7 +80,7 @@ import org.slf4j.LoggerFactory; *

  • <param name="{@link #setSchemaObjectPrefix(String) schemaObjectPrefix}" value=""/> *
  • <param name="{@link #setErrorHandling(String) errorHandling}" value=""/> *
  • <param name="{@link #setBlockOnConnectionLoss(String) blockOnConnectionLoss}" value="false"/> - *
  • <param name="{@link #setSchemaCheckEnabled(String) schemaCheckEnabled}" value="true"/> + *
  • <param name="{@link #setSchemaCheckEnabled(boolean) schemaCheckEnabled}" value="true"/> * */ public class BundleDbPersistenceManager Modified: jackrabbit/branches/2.10/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/pool/DerbyPersistenceManager.java URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.10/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/pool/DerbyPersistenceManager.java?rev=1777658&r1=1777657&r2=1777658&view=diff ============================================================================== --- jackrabbit/branches/2.10/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/pool/DerbyPersistenceManager.java (original) +++ jackrabbit/branches/2.10/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/pool/DerbyPersistenceManager.java Fri Jan 6 17:19:24 2017 @@ -17,10 +17,10 @@ package org.apache.jackrabbit.core.persistence.pool; import org.apache.jackrabbit.core.persistence.PMContext; +import org.apache.jackrabbit.core.persistence.db.DatabasePersistenceManager; import org.apache.jackrabbit.core.util.db.ConnectionHelper; import org.apache.jackrabbit.core.util.db.DerbyConnectionHelper; -import java.sql.Connection; import java.sql.SQLException; import javax.sql.DataSource; @@ -286,7 +286,6 @@ public class DerbyPersistenceManager ext * database. * * @throws SQLException if an error occurs - * @see DatabasePersistenceManager#closeConnection(Connection) */ public void close() throws Exception { super.close(); Modified: jackrabbit/branches/2.10/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/pool/OraclePersistenceManager.java URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.10/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/pool/OraclePersistenceManager.java?rev=1777658&r1=1777657&r2=1777658&view=diff ============================================================================== --- jackrabbit/branches/2.10/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/pool/OraclePersistenceManager.java (original) +++ jackrabbit/branches/2.10/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/pool/OraclePersistenceManager.java Fri Jan 6 17:19:24 2017 @@ -30,7 +30,7 @@ import org.apache.jackrabbit.core.util.d *

    * Configuration:
    *

      - *
    • <param name="{@link #setExternalBLOBs(String)} externalBLOBs}" value="false"/> + *
    • <param name="{@link #setExternalBLOBs(boolean)} externalBLOBs}" value="false"/> *
    • <param name="{@link #setBundleCacheSize(String) bundleCacheSize}" value="8"/> *
    • <param name="{@link #setConsistencyCheck(String) consistencyCheck}" value="false"/> *
    • <param name="{@link #setMinBlobSize(String) minBlobSize}" value="16384"/> Modified: jackrabbit/branches/2.10/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/QueryHandler.java URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.10/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/QueryHandler.java?rev=1777658&r1=1777657&r2=1777658&view=diff ============================================================================== --- jackrabbit/branches/2.10/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/QueryHandler.java (original) +++ jackrabbit/branches/2.10/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/QueryHandler.java Fri Jan 6 17:19:24 2017 @@ -51,7 +51,7 @@ public interface QueryHandler { /** * Returns the query handler context that passed in {@link - * #init(QueryHandlerContext)}. + * #init(FileSystem, QueryHandlerContext)}. * * @return the query handler context. */ Modified: jackrabbit/branches/2.10/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/JackrabbitAnalyzer.java URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.10/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/JackrabbitAnalyzer.java?rev=1777658&r1=1777657&r2=1777658&view=diff ============================================================================== --- jackrabbit/branches/2.10/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/JackrabbitAnalyzer.java (original) +++ jackrabbit/branches/2.10/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/JackrabbitAnalyzer.java Fri Jan 6 17:19:24 2017 @@ -31,7 +31,7 @@ import org.slf4j.LoggerFactory; /** * This is the global jackrabbit lucene analyzer. By default, all * properties are indexed with the StandardAnalyzer(new String[]{}), - * unless in the configuration a global analyzer is defined. + * unless in the <SearchIndex> configuration a global analyzer is defined. * * In the indexing configuration, properties can be configured to be * indexed with a specific analyzer. If configured, this analyzer is used to Modified: jackrabbit/branches/2.10/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/JackrabbitQuery.java URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.10/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/JackrabbitQuery.java?rev=1777658&r1=1777657&r2=1777658&view=diff ============================================================================== --- jackrabbit/branches/2.10/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/JackrabbitQuery.java (original) +++ jackrabbit/branches/2.10/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/JackrabbitQuery.java Fri Jan 6 17:19:24 2017 @@ -17,7 +17,6 @@ package org.apache.jackrabbit.core.query.lucene; import org.apache.lucene.search.Sort; -import org.apache.lucene.search.Query; import org.apache.jackrabbit.core.SessionImpl; import java.io.IOException; @@ -35,7 +34,7 @@ public interface JackrabbitQuery { * this query should be executed using the regular Lucene API. *

      * Important note: an implementation must not call - * {@link JackrabbitIndexSearcher#execute(Query, Sort, long)} + * {@link JackrabbitIndexSearcher#execute(Query, Sort, long, org.apache.jackrabbit.spi.Name)} * with this query instance as a parameter, otherwise a stack overflow will * occur. * Modified: jackrabbit/branches/2.10/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/RangeQuery.java URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.10/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/RangeQuery.java?rev=1777658&r1=1777657&r2=1777658&view=diff ============================================================================== --- jackrabbit/branches/2.10/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/RangeQuery.java (original) +++ jackrabbit/branches/2.10/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/RangeQuery.java Fri Jan 6 17:19:24 2017 @@ -41,7 +41,7 @@ import java.util.Map; import java.util.Set; /** - * Implements a variant of the lucene class {@link org.apache.lucene.search.RangeQuery}. + * Implements a variant of the lucene class {@code org.apache.lucene.search.RangeQuery}. * This class does not rewrite to basic {@link org.apache.lucene.search.TermQuery} * but will calculate the matching documents itself. That way a * TooManyClauses can be avoided. Modified: jackrabbit/branches/2.10/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/SearchIndex.java URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.10/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/SearchIndex.java?rev=1777658&r1=1777657&r2=1777658&view=diff ============================================================================== --- jackrabbit/branches/2.10/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/SearchIndex.java (original) +++ jackrabbit/branches/2.10/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/SearchIndex.java Fri Jan 6 17:19:24 2017 @@ -2091,7 +2091,7 @@ public class SearchIndex extends Abstrac * Sets the list of text extractors (and text filters) to use for * extracting text content from binary properties. The list must be * comma (or whitespace) separated, and contain fully qualified class - * names of the {@link TextExtractor} (and {@link org.apache.jackrabbit.core.query.TextFilter}) classes + * names of the {@code TextExtractor} (and {@code org.apache.jackrabbit.core.query.TextFilter}) classes * to be used. The configured classes must all have a public default * constructor. * Modified: jackrabbit/branches/2.10/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/AnonymousPrincipal.java URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.10/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/AnonymousPrincipal.java?rev=1777658&r1=1777657&r2=1777658&view=diff ============================================================================== --- jackrabbit/branches/2.10/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/AnonymousPrincipal.java (original) +++ jackrabbit/branches/2.10/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/AnonymousPrincipal.java Fri Jan 6 17:19:24 2017 @@ -56,7 +56,7 @@ public final class AnonymousPrincipal im //----------------------------------------------------------< Principal >--- /** - * @returns Always returns "anonymous" + * @return Always returns "anonymous" * @see Principal#getName() */ public String getName() { Modified: jackrabbit/branches/2.10/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/SimpleJBossAccessManager.java URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.10/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/SimpleJBossAccessManager.java?rev=1777658&r1=1777657&r2=1777658&view=diff ============================================================================== --- jackrabbit/branches/2.10/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/SimpleJBossAccessManager.java (original) +++ jackrabbit/branches/2.10/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/SimpleJBossAccessManager.java Fri Jan 6 17:19:24 2017 @@ -41,7 +41,6 @@ import java.util.Properties; * Jackrabbit permissions. * * @author dhartford - * @date 2006-11-27 * @see http://wiki.apache.org/jackrabbit/SimpleJbossAccessManager */ public class SimpleJBossAccessManager implements AccessManager { Modified: jackrabbit/branches/2.10/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/value/InternalValue.java URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.10/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/value/InternalValue.java?rev=1777658&r1=1777657&r2=1777658&view=diff ============================================================================== --- jackrabbit/branches/2.10/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/value/InternalValue.java (original) +++ jackrabbit/branches/2.10/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/value/InternalValue.java Fri Jan 6 17:19:24 2017 @@ -54,7 +54,7 @@ import org.apache.jackrabbit.util.ISO860 * InternalValue represents the internal format of a property value. *

      * The following table specifies the internal format for every property type: - *

  • Byte 1Byte 2
    + *
    * * * Modified: jackrabbit/branches/2.10/jackrabbit-data/src/main/java/org/apache/jackrabbit/core/data/AsyncUploadCache.java URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.10/jackrabbit-data/src/main/java/org/apache/jackrabbit/core/data/AsyncUploadCache.java?rev=1777658&r1=1777657&r2=1777658&view=diff ============================================================================== --- jackrabbit/branches/2.10/jackrabbit-data/src/main/java/org/apache/jackrabbit/core/data/AsyncUploadCache.java (original) +++ jackrabbit/branches/2.10/jackrabbit-data/src/main/java/org/apache/jackrabbit/core/data/AsyncUploadCache.java Fri Jan 6 17:19:24 2017 @@ -39,13 +39,13 @@ import org.slf4j.LoggerFactory; /** * This class holds all in progress uploads. This class contains two data - * structures, one is {@link #asyncUploadMap} which is {@link Map} + * structures, one is {@link #asyncUploadMap} which is {@link Map} * of file path vs lastModified of upload. The second {@link #toBeDeleted} is - * {@link Set} of upload which is marked for delete, while it is already + * {@link Set} of upload which is marked for delete, while it is already * in progress. Before starting an asynchronous upload, it requires to invoke * {@link #add(String)} to add entry to {@link #asyncUploadMap}. After * asynchronous upload completes, it requires to invoke - * {@link #remove(String, AsyncUploadCacheResult)} to remove entry from + * {@link #remove(String)} to remove entry from * {@link #asyncUploadMap} Any modification to this class are immediately * persisted to local file system. {@link #asyncUploadMap} is persisted to / * {@link homeDir}/ {@link #PENDIND_UPLOAD_FILE}. {@link #toBeDeleted} is Modified: jackrabbit/branches/2.10/jackrabbit-data/src/main/java/org/apache/jackrabbit/core/data/AsyncUploadCacheResult.java URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.10/jackrabbit-data/src/main/java/org/apache/jackrabbit/core/data/AsyncUploadCacheResult.java?rev=1777658&r1=1777657&r2=1777658&view=diff ============================================================================== --- jackrabbit/branches/2.10/jackrabbit-data/src/main/java/org/apache/jackrabbit/core/data/AsyncUploadCacheResult.java (original) +++ jackrabbit/branches/2.10/jackrabbit-data/src/main/java/org/apache/jackrabbit/core/data/AsyncUploadCacheResult.java Fri Jan 6 17:19:24 2017 @@ -49,7 +49,7 @@ public class AsyncUploadCacheResult { } /** - * Flag to indicate that record to be deleted from {@link Datastore}. + * Flag to indicate that record to be deleted from {@link DataStore}. */ public boolean doRequiresDelete() { return requiresDelete; Modified: jackrabbit/branches/2.10/jackrabbit-data/src/main/java/org/apache/jackrabbit/core/data/MultiDataStoreAware.java URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.10/jackrabbit-data/src/main/java/org/apache/jackrabbit/core/data/MultiDataStoreAware.java?rev=1777658&r1=1777657&r2=1777658&view=diff ============================================================================== --- jackrabbit/branches/2.10/jackrabbit-data/src/main/java/org/apache/jackrabbit/core/data/MultiDataStoreAware.java (original) +++ jackrabbit/branches/2.10/jackrabbit-data/src/main/java/org/apache/jackrabbit/core/data/MultiDataStoreAware.java Fri Jan 6 17:19:24 2017 @@ -16,6 +16,8 @@ */ package org.apache.jackrabbit.core.data; +import org.apache.jackrabbit.core.data.MultiDataStore.MoveDataTask; + /** * To use a DataStore within a MultiDataStore it must implement this * MultiDataStoreAware Interface. It extends a DataStore to delete a single Modified: jackrabbit/branches/2.10/jackrabbit-data/src/main/java/org/apache/jackrabbit/core/data/db/DbDataStore.java URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.10/jackrabbit-data/src/main/java/org/apache/jackrabbit/core/data/db/DbDataStore.java?rev=1777658&r1=1777657&r2=1777658&view=diff ============================================================================== --- jackrabbit/branches/2.10/jackrabbit-data/src/main/java/org/apache/jackrabbit/core/data/db/DbDataStore.java (original) +++ jackrabbit/branches/2.10/jackrabbit-data/src/main/java/org/apache/jackrabbit/core/data/db/DbDataStore.java Fri Jan 6 17:19:24 2017 @@ -74,7 +74,7 @@ import javax.sql.DataSource; * <param name="{@link #setCopyWhenReading(boolean) copyWhenReading}" value="true"/> * <param name="{@link #setTablePrefix(String) tablePrefix}" value=""/> * <param name="{@link #setSchemaObjectPrefix(String) schemaObjectPrefix}" value=""/> - * <param name="{@link #setSchemaCheckEnabled(String) schemaCheckEnabled}" value="true"/> + * <param name="{@link #setSchemaCheckEnabled(boolean) schemaCheckEnabled}" value="true"/> * </DataStore> * *

    Modified: jackrabbit/branches/2.10/jackrabbit-data/src/main/java/org/apache/jackrabbit/core/util/db/ConnectionHelper.java URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.10/jackrabbit-data/src/main/java/org/apache/jackrabbit/core/util/db/ConnectionHelper.java?rev=1777658&r1=1777657&r2=1777658&view=diff ============================================================================== --- jackrabbit/branches/2.10/jackrabbit-data/src/main/java/org/apache/jackrabbit/core/util/db/ConnectionHelper.java (original) +++ jackrabbit/branches/2.10/jackrabbit-data/src/main/java/org/apache/jackrabbit/core/util/db/ConnectionHelper.java Fri Jan 6 17:19:24 2017 @@ -59,7 +59,7 @@ import org.slf4j.LoggerFactory; *

    * * Implementation note: The {@code Connection} that is retrieved from the {@code DataSource} - * in {@link #getConnection()} may be broken. This is so because if an internal {@code DataSource} is used, + * in {@link #getConnection(boolean)} may be broken. This is so because if an internal {@code DataSource} is used, * then this is a commons-dbcp {@code DataSource} with a testWhileIdle validation strategy (see * the {@code ConnectionFactory} class). Furthermore, if it is a {@code DataSource} obtained through JNDI then we * can make no assumptions about the validation strategy. This means that our retry logic must either assume that @@ -424,9 +424,9 @@ public class ConnectionHelper { } } - /** + /** * Gets a connection based on the {@code batchMode} state of this helper. The connection should be closed - * by a call to {@link #closeResources(Connection, Statement, ResultSet)} which also takes the {@code + * by a call to {@link #closeResources(Connection, Statement, ResultSet, boolean)} which also takes the {@code * batchMode} state into account. * * @param inBatchMode indicates if we are in a batchMode @@ -479,7 +479,7 @@ public class ConnectionHelper { /** * Closes the given resources given the {@code batchMode} state. * - * @param con the {@code Connection} obtained through the {@link #getConnection()} method + * @param con the {@code Connection} obtained through the {@link #getConnection(boolean)} method * @param stmt a {@code Statement} * @param rs a {@code ResultSet} * @param inBatchMode indicates if we are in a batchMode Modified: jackrabbit/branches/2.10/jackrabbit-data/src/main/java/org/apache/jackrabbit/core/util/db/Oracle10R1ConnectionHelper.java URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.10/jackrabbit-data/src/main/java/org/apache/jackrabbit/core/util/db/Oracle10R1ConnectionHelper.java?rev=1777658&r1=1777657&r2=1777658&view=diff ============================================================================== --- jackrabbit/branches/2.10/jackrabbit-data/src/main/java/org/apache/jackrabbit/core/util/db/Oracle10R1ConnectionHelper.java (original) +++ jackrabbit/branches/2.10/jackrabbit-data/src/main/java/org/apache/jackrabbit/core/util/db/Oracle10R1ConnectionHelper.java Fri Jan 6 17:19:24 2017 @@ -60,9 +60,6 @@ public final class Oracle10R1ConnectionH /** * Retrieve the oracle.sql.BLOB class via reflection, and initialize the values for the * DURATION_SESSION and MODE_READWRITE constants defined there. - * - * @see oracle.sql.BLOB#DURATION_SESSION - * @see oracle.sql.BLOB#MODE_READWRITE */ @Override public void init() throws Exception { Modified: jackrabbit/branches/2.10/jackrabbit-data/src/main/java/org/apache/jackrabbit/core/util/db/StreamWrapper.java URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.10/jackrabbit-data/src/main/java/org/apache/jackrabbit/core/util/db/StreamWrapper.java?rev=1777658&r1=1777657&r2=1777658&view=diff ============================================================================== --- jackrabbit/branches/2.10/jackrabbit-data/src/main/java/org/apache/jackrabbit/core/util/db/StreamWrapper.java (original) +++ jackrabbit/branches/2.10/jackrabbit-data/src/main/java/org/apache/jackrabbit/core/util/db/StreamWrapper.java Fri Jan 6 17:19:24 2017 @@ -22,6 +22,7 @@ import java.io.InputStream; import java.sql.SQLException; import org.apache.commons.io.input.CloseShieldInputStream; +import org.apache.jackrabbit.core.util.db.ConnectionHelper.RetryManager; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -45,11 +46,11 @@ public class StreamWrapper { this.stream = new MarkDetectingInputStream(in); this.size = size; } - + public InputStream getStream() { return new CloseShieldInputStream(stream); } - + public long getSize() { return size; } @@ -64,7 +65,7 @@ public class StreamWrapper { /** * Resets the internal InputStream that it could be re-read.
    - * Is used from {@link RetryManager} if a {@link SQLException} has occurred.
    + * Is used from {@link ConnectionHelper.RetryManager} if a {@link SQLException} has occurred.
    * It relies on the assumption that the InputStream was not marked anywhere * during reading. * Modified: jackrabbit/branches/2.10/jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/commons/AbstractSession.java URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.10/jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/commons/AbstractSession.java?rev=1777658&r1=1777657&r2=1777658&view=diff ============================================================================== --- jackrabbit/branches/2.10/jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/commons/AbstractSession.java (original) +++ jackrabbit/branches/2.10/jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/commons/AbstractSession.java Fri Jan 6 17:19:24 2017 @@ -375,7 +375,7 @@ public abstract class AbstractSession im * The default implementation: *

      *
    • Returns the root node if the given path is "/" - *
    • Delegates to {@link Node#getNodeByIdentifier(String)} for identifier + *
    • Delegates to {@link Session#getNodeByIdentifier(String)} for identifier * paths *
    • Throws a {@link PathNotFoundException} if the given path does not * start with a slash. Modified: jackrabbit/branches/2.10/jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/commons/JcrUtils.java URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.10/jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/commons/JcrUtils.java?rev=1777658&r1=1777657&r2=1777658&view=diff ============================================================================== --- jackrabbit/branches/2.10/jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/commons/JcrUtils.java (original) +++ jackrabbit/branches/2.10/jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/commons/JcrUtils.java Fri Jan 6 17:19:24 2017 @@ -264,7 +264,7 @@ public class JcrUtils { } /** - * Returns an {@link Iterable} over the shared set of the given node. + * Returns an {@link Iterable} over the shared set of the given node. *

      * The first iterator is acquired directly during this method call to * allow a possible {@link RepositoryException} to be thrown as-is. @@ -298,7 +298,7 @@ public class JcrUtils { } /** - * Returns an {@link Iterable} over the children of the given node. + * Returns an {@link Iterable} over the children of the given node. *

      * The first iterator is acquired directly during this method call to * allow a possible {@link RepositoryException} to be thrown as-is. @@ -332,7 +332,7 @@ public class JcrUtils { } /** - * Returns an {@link Iterable} over those children of the given node + * Returns an {@link Iterable} over those children of the given node * that match the given name pattern. *

      * The first iterator is acquired directly during this method call to @@ -369,7 +369,7 @@ public class JcrUtils { } /** - * Returns an {@link Iterable} over those children of the given node + * Returns an {@link Iterable} over those children of the given node * that match the given name patterns. *

      * The first iterator is acquired directly during this method call to @@ -406,7 +406,7 @@ public class JcrUtils { } /** - * Returns an {@link Iterable} over the properties of the given node. + * Returns an {@link Iterable} over the properties of the given node. *

      * The first iterator is acquired directly during this method call to * allow a possible {@link RepositoryException} to be thrown as-is. @@ -441,7 +441,7 @@ public class JcrUtils { } /** - * Returns an {@link Iterable} over those properties of the + * Returns an {@link Iterable} over those properties of the * given node that match the given name pattern. *

      * The first iterator is acquired directly during this method call to @@ -478,7 +478,7 @@ public class JcrUtils { } /** - * Returns an {@link Iterable} over those properties of the + * Returns an {@link Iterable} over those properties of the * given node that match the given name patterns. *

      * The first iterator is acquired directly during this method call to @@ -515,7 +515,7 @@ public class JcrUtils { } /** - * Returns an {@link Iterable} over references to the given node. + * Returns an {@link Iterable} over references to the given node. *

      * The first iterator is acquired directly during this method call to * allow a possible {@link RepositoryException} to be thrown as-is. @@ -550,7 +550,7 @@ public class JcrUtils { } /** - * Returns an {@link Iterable} over those references to the + * Returns an {@link Iterable} over those references to the * given node that have the given name. *

      * The first iterator is acquired directly during this method call to @@ -587,7 +587,7 @@ public class JcrUtils { } /** - * Returns an {@link Iterable} over weak references to the given node. + * Returns an {@link Iterable} over weak references to the given node. *

      * The first iterator is acquired directly during this method call to * allow a possible {@link RepositoryException} to be thrown as-is. @@ -622,7 +622,7 @@ public class JcrUtils { } /** - * Returns an {@link Iterable} over those weak references to the + * Returns an {@link Iterable} over those weak references to the * given node that have the given name. *

      * The first iterator is acquired directly during this method call to @@ -659,7 +659,7 @@ public class JcrUtils { } /** - * Returns an {@link Iterable} over nodes in the given query result. + * Returns an {@link Iterable} over nodes in the given query result. *

      * The first iterator is acquired directly during this method call to * allow a possible {@link RepositoryException} to be thrown as-is. @@ -694,7 +694,7 @@ public class JcrUtils { } /** - * Returns an {@link Iterable} over nodes in the given query result. + * Returns an {@link Iterable} over nodes in the given query result. *

      * The first iterator is acquired directly during this method call to * allow a possible {@link RepositoryException} to be thrown as-is. Modified: jackrabbit/branches/2.10/jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/commons/flat/TreeTraverser.java URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.10/jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/commons/flat/TreeTraverser.java?rev=1777658&r1=1777657&r2=1777658&view=diff ============================================================================== --- jackrabbit/branches/2.10/jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/commons/flat/TreeTraverser.java (original) +++ jackrabbit/branches/2.10/jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/commons/flat/TreeTraverser.java Fri Jan 6 17:19:24 2017 @@ -47,8 +47,8 @@ import java.util.Iterator; * *

      * Whether a specific node is included is determined by an - * {@link #InclusionPolicy}. Error occurring while traversing are delegated to - * an {@link #ErrorHandler}. + * {@link #inclusionPolicy}. Error occurring while traversing are delegated to + * an {@link #errorHandler}. *

      */ public final class TreeTraverser implements Iterable { Modified: jackrabbit/branches/2.10/jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/commons/iterator/NodeIterable.java URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.10/jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/commons/iterator/NodeIterable.java?rev=1777658&r1=1777657&r2=1777658&view=diff ============================================================================== --- jackrabbit/branches/2.10/jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/commons/iterator/NodeIterable.java (original) +++ jackrabbit/branches/2.10/jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/commons/iterator/NodeIterable.java Fri Jan 6 17:19:24 2017 @@ -25,7 +25,7 @@ import org.apache.jackrabbit.commons.Jcr /** * Adapter class that adapts a {@link NodeIterator} instance to an - * {@link Iterable} instance that always returns the same underlying + * {@link Iterable} instance that always returns the same underlying * iterator. * * @since Apache Jackrabbit 2.0 Modified: jackrabbit/branches/2.10/jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/commons/iterator/PropertyIterable.java URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.10/jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/commons/iterator/PropertyIterable.java?rev=1777658&r1=1777657&r2=1777658&view=diff ============================================================================== --- jackrabbit/branches/2.10/jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/commons/iterator/PropertyIterable.java (original) +++ jackrabbit/branches/2.10/jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/commons/iterator/PropertyIterable.java Fri Jan 6 17:19:24 2017 @@ -25,7 +25,7 @@ import org.apache.jackrabbit.commons.Jcr /** * Adapter class that adapts a {@link PropertyIterator} instance to an - * {@link Iterable} instance that always returns the same underlying + * {@link Iterable} instance that always returns the same underlying * iterator. * * @since Apache Jackrabbit 2.0 Modified: jackrabbit/branches/2.10/jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/commons/iterator/RowIterable.java URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.10/jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/commons/iterator/RowIterable.java?rev=1777658&r1=1777657&r2=1777658&view=diff ============================================================================== --- jackrabbit/branches/2.10/jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/commons/iterator/RowIterable.java (original) +++ jackrabbit/branches/2.10/jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/commons/iterator/RowIterable.java Fri Jan 6 17:19:24 2017 @@ -25,7 +25,7 @@ import org.apache.jackrabbit.commons.Jcr /** * Adapter class that adapts a {@link RowIterator} instance to an - * {@link Iterable} instance that always returns the same underlying + * {@link Iterable} instance that always returns the same underlying * iterator. * * @since Apache Jackrabbit 2.0 Modified: jackrabbit/branches/2.10/jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/commons/jackrabbit/authorization/AccessControlUtils.java URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.10/jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/commons/jackrabbit/authorization/AccessControlUtils.java?rev=1777658&r1=1777657&r2=1777658&view=diff ============================================================================== --- jackrabbit/branches/2.10/jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/commons/jackrabbit/authorization/AccessControlUtils.java (original) +++ jackrabbit/branches/2.10/jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/commons/jackrabbit/authorization/AccessControlUtils.java Fri Jan 6 17:19:24 2017 @@ -33,6 +33,7 @@ import javax.jcr.security.Privilege; import org.apache.jackrabbit.api.JackrabbitSession; import org.apache.jackrabbit.api.security.JackrabbitAccessControlList; +import org.apache.jackrabbit.api.security.principal.PrincipalManager; /** * This class provides common access control related utilities. @@ -146,7 +147,7 @@ public class AccessControlUtils { /** * A utility method to add a new access control entry.
      - * Please note, that calling {@link javax.jcr.Session#save()()} is required + * Please note, that calling {@link javax.jcr.Session#save()} is required * in order to persist the changes. * * @param session The editing session. @@ -166,7 +167,7 @@ public class AccessControlUtils { /** * A utility method to add a new access control entry. Please note, that - * a call to {@link javax.jcr.Session#save()()} is required in order + * a call to {@link javax.jcr.Session#save()} is required in order * to persist the changes. * * @param session The editing session @@ -194,7 +195,7 @@ public class AccessControlUtils { /** * Utility to grant jcr:all privilege to the everyone group principal. - * Please note, that {@link javax.jcr.Session#save()()} is required in order + * Please note, that {@link javax.jcr.Session#save()} is required in order * to persist the changes. * * @param session The editing session. @@ -211,7 +212,7 @@ public class AccessControlUtils { /** * Utility to deny jcr:all privilege to the everyone group principal. - * Please note, that {@link javax.jcr.Session#save()()} is required in order + * Please note, that {@link javax.jcr.Session#save()} is required in order * to persist the changes. * * @param session The editing session. Modified: jackrabbit/branches/2.10/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/client/ClientItem.java URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.10/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/client/ClientItem.java?rev=1777658&r1=1777657&r2=1777658&view=diff ============================================================================== --- jackrabbit/branches/2.10/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/client/ClientItem.java (original) +++ jackrabbit/branches/2.10/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/client/ClientItem.java Fri Jan 6 17:19:24 2017 @@ -21,6 +21,7 @@ import java.rmi.RemoteException; import javax.jcr.Item; import javax.jcr.ItemVisitor; import javax.jcr.Node; +import javax.jcr.Property; import javax.jcr.RepositoryException; import javax.jcr.Session; Modified: jackrabbit/branches/2.10/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/client/ClientObject.java URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.10/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/client/ClientObject.java?rev=1777658&r1=1777657&r2=1777658&view=diff ============================================================================== --- jackrabbit/branches/2.10/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/client/ClientObject.java (original) +++ jackrabbit/branches/2.10/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/client/ClientObject.java Fri Jan 6 17:19:24 2017 @@ -87,7 +87,7 @@ public class ClientObject { * This method introspects the remote reference to determine * whether to instantiate a {@link Node Node}, * a {@link javax.jcr.version.VersionHistory VersionHistory}, or a - * {@link Version Version} adapter using + * {@link javax.jcr.version.Version Version} adapter using * the local adapter factory. * * @param session current session Modified: jackrabbit/branches/2.10/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/client/LocalAdapterFactory.java URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.10/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/client/LocalAdapterFactory.java?rev=1777658&r1=1777657&r2=1777658&view=diff ============================================================================== --- jackrabbit/branches/2.10/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/client/LocalAdapterFactory.java (original) +++ jackrabbit/branches/2.10/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/client/LocalAdapterFactory.java Fri Jan 6 17:19:24 2017 @@ -75,6 +75,7 @@ import org.apache.jackrabbit.rmi.remote. import org.apache.jackrabbit.rmi.remote.RemoteVersionHistory; import org.apache.jackrabbit.rmi.remote.RemoteVersionManager; import org.apache.jackrabbit.rmi.remote.RemoteWorkspace; +import org.apache.jackrabbit.rmi.remote.principal.RemoteGroup; import org.apache.jackrabbit.rmi.remote.principal.RemotePrincipal; import org.apache.jackrabbit.rmi.remote.security.RemoteAccessControlEntry; import org.apache.jackrabbit.rmi.remote.security.RemoteAccessControlManager; @@ -401,9 +402,8 @@ public interface LocalAdapterFactory { /** * Factory method for creating a local adapter for a remote principal. *

      - * If remote is a - * {@link org.apache.jackrabbit.rmi.remote.security.RemoteGroup} the - * prinicipal returned implements the java.security.acl.Group + * If remote is a {@link RemoteGroup} the + * principal returned implements the java.security.acl.Group * interface. * * @param remote principal @@ -416,7 +416,7 @@ public interface LocalAdapterFactory { * iterator. *

      * Each entry in the remote iterator which is a - * {@link org.apache.jackrabbit.rmi.remote.security.RemoteGroup} will be + * {@link RemoteGroup} will be * provided as a principal implementing the * java.security.acl.Group interface. * Modified: jackrabbit/branches/2.10/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/client/iterator/ClientIterator.java URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.10/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/client/iterator/ClientIterator.java?rev=1777658&r1=1777657&r2=1777658&view=diff ============================================================================== --- jackrabbit/branches/2.10/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/client/iterator/ClientIterator.java (original) +++ jackrabbit/branches/2.10/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/client/iterator/ClientIterator.java Fri Jan 6 17:19:24 2017 @@ -166,7 +166,6 @@ public abstract class ClientIterator ext * @return true if there are more elements, * false otherwise * @throws RemoteRuntimeException on RMI errors - * @see Iterator#hasNext() */ public boolean hasNext() throws RemoteRuntimeException { try { @@ -196,7 +195,6 @@ public abstract class ClientIterator ext * @return next element * @throws NoSuchElementException if there are no more elements * @throws RemoteRuntimeException on RMI errors - * @see Iterator#next() */ public Object next() throws NoSuchElementException, RemoteRuntimeException { try { @@ -215,10 +213,8 @@ public abstract class ClientIterator ext * Not supported. * * @throws UnsupportedOperationException always thrown - * @see Iterator#remove() */ public void remove() throws UnsupportedOperationException { throw new UnsupportedOperationException(); } - } Modified: jackrabbit/branches/2.10/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/client/principal/ClientGroup.java URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.10/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/client/principal/ClientGroup.java?rev=1777658&r1=1777657&r2=1777658&view=diff ============================================================================== --- jackrabbit/branches/2.10/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/client/principal/ClientGroup.java (original) +++ jackrabbit/branches/2.10/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/client/principal/ClientGroup.java Fri Jan 6 17:19:24 2017 @@ -49,18 +49,13 @@ public class ClientGroup extends ClientP } /** - * @throws UnsupportedRepositoryOperationException This method is not - * implemented yet + * @return false - this method is not implemented yet */ public boolean addMember(Principal user) { // no support for adding member here return false; } - /** - * @throws UnsupportedRepositoryOperationException This method is not - * implemented yet - */ public boolean isMember(Principal member) { try { return ((RemoteGroup) getRemotePrincipal()).isMember(member.getName()); @@ -69,7 +64,6 @@ public class ClientGroup extends ClientP } } - /** {@inheritDoc} */ public Enumeration members() { try { final RemoteIterator remote = ((RemoteGroup) getRemotePrincipal()).members(); @@ -89,8 +83,7 @@ public class ClientGroup extends ClientP } /** - * @throws UnsupportedRepositoryOperationException This method is not - * implemented yet + * @return false - this method is not implemented yet */ public boolean removeMember(Principal user) { // no support for removing member here Modified: jackrabbit/branches/2.10/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/iterator/ArrayEventIterator.java URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.10/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/iterator/ArrayEventIterator.java?rev=1777658&r1=1777657&r2=1777658&view=diff ============================================================================== --- jackrabbit/branches/2.10/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/iterator/ArrayEventIterator.java (original) +++ jackrabbit/branches/2.10/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/iterator/ArrayEventIterator.java Fri Jan 6 17:19:24 2017 @@ -21,7 +21,7 @@ import javax.jcr.observation.EventIterat /** * Array implementation of the JCR - * {@link javax.jcr.EventIterator EventIterator} interface. + * {@link javax.jcr.observation.EventIterator EventIterator} interface. * This class is used by the JCR-RMI client adapters to convert * node arrays to iterators. */ Modified: jackrabbit/branches/2.10/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/iterator/ArrayEventListenerIterator.java URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.10/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/iterator/ArrayEventListenerIterator.java?rev=1777658&r1=1777657&r2=1777658&view=diff ============================================================================== --- jackrabbit/branches/2.10/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/iterator/ArrayEventListenerIterator.java (original) +++ jackrabbit/branches/2.10/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/iterator/ArrayEventListenerIterator.java Fri Jan 6 17:19:24 2017 @@ -21,7 +21,7 @@ import javax.jcr.observation.EventListen /** * Array implementation of the JCR - * {@link javax.jcr.EventListenerIterator EventListenerIterator} interface. + * {@link javax.jcr.observation.EventListenerIterator EventListenerIterator} interface. * This class is used by the JCR-RMI client adapters to convert * listener arrays to iterators. */ Modified: jackrabbit/branches/2.10/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/remote/RemoteEventCollection.java URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.10/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/remote/RemoteEventCollection.java?rev=1777658&r1=1777657&r2=1777658&view=diff ============================================================================== --- jackrabbit/branches/2.10/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/remote/RemoteEventCollection.java (original) +++ jackrabbit/branches/2.10/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/remote/RemoteEventCollection.java Fri Jan 6 17:19:24 2017 @@ -56,7 +56,7 @@ public interface RemoteEventCollection e public static interface RemoteEvent extends Remote { /** * Remote version of the - * {@link javax.jcr.Event#getType() Event.getType()} method. + * {@link javax.jcr.observation.Event#getType() Event.getType()} method. * * @return the type of this event. * @throws RemoteException on RMI errors @@ -65,7 +65,7 @@ public interface RemoteEventCollection e /** * Remote version of the - * {@link javax.jcr.Event#getPath() Event.getPath()} method. + * {@link javax.jcr.observation.Event#getPath() Event.getPath()} method. * * @return the absolute path associated with this event or * null. @@ -76,54 +76,52 @@ public interface RemoteEventCollection e /** * Remote version of the - * {@link javax.jcr.Event#getUserID() Event.getUserID()} method. + * {@link javax.jcr.observation.Event#getUserID() Event.getUserID()} method. * * @return the user ID. * @throws RemoteException on RMI errors */ String getUserID() throws RemoteException; - + /** * Remote version of the - * {@link javax.jcr.Event#getIdentifier() Event.getIdentifier()} method. + * {@link javax.jcr.observation.Event#getIdentifier() Event.getIdentifier()} method. * * @return the identifier associated with this event or null. * @throws RepositoryException on repository errors * @throws RemoteException on RMI errors */ String getIdentifier() throws RepositoryException, RemoteException; - + /** * Remote version of the - * {@link javax.jcr.Event#getInfo() Event.getInfo()} method. + * {@link javax.jcr.observation.Event#getInfo() Event.getInfo()} method. * * @return A Map containing parameter information for instances - * of a NODE_MOVED event. + * of a NODE_MOVED event. * @throws RepositoryException on repository errors * @throws RemoteException on RMI errors */ Map getInfo() throws RepositoryException, RemoteException; - + /** * Remote version of the - * {@link javax.jcr.Event#getUserData() Event.getUserData()} method. + * {@link javax.jcr.observation.Event#getUserData() Event.getUserData()} method. * * @return The user data string. * @throws RepositoryException on repository errors * @throws RemoteException on RMI errors */ String getUserData() throws RepositoryException, RemoteException; - + /** * Remote version of the - * {@link javax.jcr.Event#getDate() Event.getDate()} method. + * {@link javax.jcr.observation.Event#getDate() Event.getDate()} method. * * @return the date when the change was persisted that caused this event. * @throws RepositoryException on repository errors * @throws RemoteException on RMI errors */ long getDate() throws RepositoryException, RemoteException; - } - } Modified: jackrabbit/branches/2.10/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/remote/RemoteNodeType.java URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.10/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/remote/RemoteNodeType.java?rev=1777658&r1=1777657&r2=1777658&view=diff ============================================================================== --- jackrabbit/branches/2.10/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/remote/RemoteNodeType.java (original) +++ jackrabbit/branches/2.10/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/remote/RemoteNodeType.java Fri Jan 6 17:19:24 2017 @@ -116,7 +116,7 @@ public interface RemoteNodeType extends /** * Remote version of the - * {@link javax.jcr.nodetype.NodeType#getPropertyDefs() NodeType.getPropertyDefs()} + * {@link javax.jcr.nodetype.NodeType#getPropertyDefinitions() NodeType.getPropertyDefinitions()} * method. * * @return property definitions @@ -126,7 +126,7 @@ public interface RemoteNodeType extends /** * Remote version of the - * {@link javax.jcr.nodetype.NodeType#getDeclaredPropertyDefs() NodeType.getDeclaredPropertyDefs()} + * {@link javax.jcr.nodetype.NodeType#getDeclaredPropertyDefinitions() NodeType.getDeclaredPropertyDefinitions()} * method. * * @return declared property definitions @@ -136,7 +136,7 @@ public interface RemoteNodeType extends /** * Remote version of the - * {@link javax.jcr.nodetype.NodeType#getChildNodeDefs() NodeType.getChildNodeDefs()} + * {@link javax.jcr.nodetype.NodeType#getChildNodeDefinitions() NodeType.getChildNodeDefinitions()} * method. * * @return child node definitions @@ -146,7 +146,7 @@ public interface RemoteNodeType extends /** * Remote version of the - * {@link javax.jcr.nodetype.NodeType#getDeclaredChildNodeDefs() NodeType.getDeclaredChildNodeDefs()} + * {@link javax.jcr.nodetype.NodeType#getDeclaredChildNodeDefinitions() NodeType.getDeclaredChildNodeDefinitions()} * method. * * @return declared child node definitions @@ -229,7 +229,7 @@ public interface RemoteNodeType extends /** * Remote version of the - * {@link javax.jcr.nodetype.NodeType#canRemoveNode() NodeType.canRemoveNode()} + * {@link javax.jcr.nodetype.NodeType#canRemoveNode(String) NodeType.canRemoveNode()} * method. * * @return boolean @@ -239,7 +239,7 @@ public interface RemoteNodeType extends /** * Remote version of the - * {@link javax.jcr.nodetype.NodeType#canRemoveProperty() NodeType.canRemoveProperty()} + * {@link javax.jcr.nodetype.NodeType#canRemoveProperty(String) NodeType.canRemoveProperty()} * method. * * @return boolean Modified: jackrabbit/branches/2.10/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/remote/RemoteQuery.java URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.10/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/remote/RemoteQuery.java?rev=1777658&r1=1777657&r2=1777658&view=diff ============================================================================== --- jackrabbit/branches/2.10/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/remote/RemoteQuery.java (original) +++ jackrabbit/branches/2.10/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/remote/RemoteQuery.java Fri Jan 6 17:19:24 2017 @@ -46,21 +46,21 @@ public interface RemoteQuery extends Rem RemoteQueryResult execute() throws RepositoryException, RemoteException; /** - * @see javax.jcr.query.Query#setLimit() + * @see javax.jcr.query.Query#setLimit(long) * * @param limit a long * @throws RemoteException on RMI errors */ void setLimit(long limit) throws RemoteException; - + /** - * @see javax.jcr.query.Query#setOffset() + * @see javax.jcr.query.Query#setOffset(long) * * @param offset a long * @throws RemoteException on RMI errors */ void setOffset(long offset) throws RemoteException; - + /** * @see javax.jcr.query.Query#getStatement() * @@ -105,7 +105,7 @@ public interface RemoteQuery extends Rem * @throws RemoteException on RMI errors */ void bindValue(String varName, Value value) throws RepositoryException, RemoteException; - + /** * @see javax.jcr.query.Query#getBindVariableNames() * Modified: jackrabbit/branches/2.10/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/remote/RemoteQueryManager.java URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.10/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/remote/RemoteQueryManager.java?rev=1777658&r1=1777657&r2=1777658&view=diff ============================================================================== --- jackrabbit/branches/2.10/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/remote/RemoteQueryManager.java (original) +++ jackrabbit/branches/2.10/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/remote/RemoteQueryManager.java Fri Jan 6 17:19:24 2017 @@ -20,6 +20,7 @@ import java.rmi.Remote; import java.rmi.RemoteException; import javax.jcr.RepositoryException; +import javax.jcr.query.Query; /** * Remote version of the JCR {@link javax.jcr.query.QueryManager QueryManager} interface. @@ -59,9 +60,9 @@ public interface RemoteQueryManager exte throws RepositoryException, RemoteException; /** - * @see javax.jcr.query.QueryManager#getSupportedQueryLanguages - * * See {@link Query}. + * + * @see javax.jcr.query.QueryManager#getSupportedQueryLanguages * @return An string array. * @throws RepositoryException on repository errors * @throws RemoteException on RMI errors Modified: jackrabbit/branches/2.10/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/repository/JNDIRemoteRepository.java URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.10/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/repository/JNDIRemoteRepository.java?rev=1777658&r1=1777657&r2=1777658&view=diff ============================================================================== --- jackrabbit/branches/2.10/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/repository/JNDIRemoteRepository.java (original) +++ jackrabbit/branches/2.10/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/repository/JNDIRemoteRepository.java Fri Jan 6 17:19:24 2017 @@ -48,7 +48,7 @@ public class JNDIRemoteRepository extend /** * Creates a proxy for the remote repository in JNDI. - * Uses {@link JackrabbitClientAdapterFactory} as the default + * Uses {@link ClientAdapterFactory} as the default * local adapter factory. * * @param context JNDI context @@ -60,7 +60,7 @@ public class JNDIRemoteRepository extend /** * Creates a proxy for the remote repository in JNDI. - * Uses {@link JackrabbitClientAdapterFactory} as the default + * Uses {@link ClientAdapterFactory} as the default * local adapter factory. * * @param location JNDI location in default context Modified: jackrabbit/branches/2.10/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/repository/RMIRemoteRepository.java URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.10/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/repository/RMIRemoteRepository.java?rev=1777658&r1=1777657&r2=1777658&view=diff ============================================================================== --- jackrabbit/branches/2.10/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/repository/RMIRemoteRepository.java (original) +++ jackrabbit/branches/2.10/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/repository/RMIRemoteRepository.java Fri Jan 6 17:19:24 2017 @@ -42,7 +42,7 @@ public class RMIRemoteRepository extends /** * Creates a proxy for the remote repository in the given RMI URL. - * Uses {@link JackrabbitClientAdapterFactory} as the default + * Uses {@link ClientAdapterFactory} as the default * local adapter factory. * * @param url URL of the remote repository Modified: jackrabbit/branches/2.10/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/repository/URLRemoteRepository.java URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.10/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/repository/URLRemoteRepository.java?rev=1777658&r1=1777657&r2=1777658&view=diff ============================================================================== --- jackrabbit/branches/2.10/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/repository/URLRemoteRepository.java (original) +++ jackrabbit/branches/2.10/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/repository/URLRemoteRepository.java Fri Jan 6 17:19:24 2017 @@ -45,7 +45,7 @@ public class URLRemoteRepository extends /** * Creates a proxy for the remote repository at the given URL. - * Uses {@link JackrabbitClientAdapterFactory} as the default + * Uses {@link ClientAdapterFactory} as the default * local adapter factory. * * @param url URL of the remote repository @@ -56,7 +56,7 @@ public class URLRemoteRepository extends /** * Creates a proxy for the remote repository at the given URL. - * Uses {@link JackrabbitClientAdapterFactory} as the default + * Uses {@link ClientAdapterFactory} as the default * local adapter factory. * * @param url URL of the remote repository

    PropertyTypeInternal Format
    STRINGString
    LONGLong