svn commit: r1880094 - in /jackrabbit/trunk/jackrabbit-spi2dav/src/main/java/org/apache/jackrabbit: spi2dav/RepositoryServiceImpl.java spi2davex/RepositoryServiceImpl.java

[re...@apache.org]

Author: reschke
Date: Tue Jul 21 06:29:50 2020
New Revision: 1880094

URL: http://svn.apache.org/viewvc?rev=1880094&view=rev
Log:
JCR-4536: spi2dav: allow disabling cert and host name checks for TLS connections (fix Javadoc)

Modified:
    jackrabbit/trunk/jackrabbit-spi2dav/src/main/java/org/apache/jackrabbit/spi2dav/RepositoryServiceImpl.java
    jackrabbit/trunk/jackrabbit-spi2dav/src/main/java/org/apache/jackrabbit/spi2davex/RepositoryServiceImpl.java

Modified: jackrabbit/trunk/jackrabbit-spi2dav/src/main/java/org/apache/jackrabbit/spi2dav/RepositoryServiceImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-spi2dav/src/main/java/org/apache/jackrabbit/spi2dav/RepositoryServiceImpl.java?rev=1880094&r1=1880093&r2=1880094&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-spi2dav/src/main/java/org/apache/jackrabbit/spi2dav/RepositoryServiceImpl.java (original)
+++ jackrabbit/trunk/jackrabbit-spi2dav/src/main/java/org/apache/jackrabbit/spi2dav/RepositoryServiceImpl.java Tue Jul 21 06:29:50 2020
@@ -276,10 +276,10 @@ public class RepositoryServiceImpl imple
     private Set<String> remoteDavComplianceClasses = null;
 
     /**
-     * Same as {@link #RepositoryServiceImpl(String, IdFactory, NameFactory, PathFactory, QValueFactory, int, int, ConnectionOptions)}
+     * Same as {@link #RepositoryServiceImpl(String, IdFactory, NameFactory, PathFactory, QValueFactory, int, ConnectionOptions)}
      * using {@link ItemInfoCacheImpl#DEFAULT_CACHE_SIZE} as size for the item
      * cache and {@link #MAX_CONNECTIONS_DEFAULT} for the maximum number of
-     * connections on the client and {@link ConnectionOptions.DEFAULT}.
+     * connections on the client and {@link ConnectionOptions#DEFAULT}.
      *
      * @param uri The server uri.
      * @param idFactory The id factory.
@@ -295,9 +295,9 @@ public class RepositoryServiceImpl imple
     }
 
     /**
-     * Same as {@link #RepositoryServiceImpl(String, IdFactory, NameFactory, PathFactory, QValueFactory, int, int, boolean)}
+     * Same as {@link #RepositoryServiceImpl(String, IdFactory, NameFactory, PathFactory, QValueFactory, int, ConnectionOptions)}
      * using {@link #MAX_CONNECTIONS_DEFAULT} for the maximum number of
-     * connections on the client and {@link ConnectionOptions.DEFAULT}..
+     * connections on the client and {@link ConnectionOptions#DEFAULT}.
      *
      * @param uri The server uri.
      * @param idFactory The id factory.
@@ -322,9 +322,6 @@ public class RepositoryServiceImpl imple
      * @param pathFactory The path factory.
      * @param qValueFactory The value factory.
      * @param itemInfoCacheSize The size of the item info cache.
-     * @param maximumHttpConnections A int &gt;0 defining the maximum number of
-     * connections per host to be configured on
-     * {@link PoolingHttpClientConnectionManager#setMaxTotal(int)}.
      * @param connectionOptions The advanced connection options.
      * @throws RepositoryException If an error occurs.
      */

Modified: jackrabbit/trunk/jackrabbit-spi2dav/src/main/java/org/apache/jackrabbit/spi2davex/RepositoryServiceImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-spi2dav/src/main/java/org/apache/jackrabbit/spi2davex/RepositoryServiceImpl.java?rev=1880094&r1=1880093&r2=1880094&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-spi2dav/src/main/java/org/apache/jackrabbit/spi2davex/RepositoryServiceImpl.java (original)
+++ jackrabbit/trunk/jackrabbit-spi2dav/src/main/java/org/apache/jackrabbit/spi2davex/RepositoryServiceImpl.java Tue Jul 21 06:29:50 2020
@@ -150,10 +150,10 @@ public class RepositoryServiceImpl exten
     private final Map<SessionInfo, QValueFactoryImpl> qvFactories = new HashMap<SessionInfo, QValueFactoryImpl>();
 
     /**
-     * Same as {@link #RepositoryServiceImpl(String, String, BatchReadConfig, int, int)}
+     * Same as {@link #RepositoryServiceImpl(String, String, BatchReadConfig, int, ConnectionOptions)}
      * using <code>null</code> workspace name, {@link ItemInfoCacheImpl#DEFAULT_CACHE_SIZE}
      * as size for the item cache, {@link #MAX_CONNECTIONS_DEFAULT} for the
-     * maximum number of connections on the client and {@link ConnectionOptions.DEFAULT}.
+     * maximum number of connections on the client and {@link ConnectionOptions#DEFAULT}.
      *
      * @param jcrServerURI The server uri.
      * @param batchReadConfig The batch read configuration.
@@ -171,10 +171,7 @@ public class RepositoryServiceImpl exten
      * @param defaultWorkspaceName The default workspace name.
      * @param batchReadConfig The batch read configuration.
      * @param itemInfoCacheSize The size of the item info cache.
-     * @param maximumHttpConnections maximumHttpConnections A int &gt;0 defining
-     * the maximum number of connections per host to be configured on
-     * {@link org.apache.http.impl.conn.PoolingHttpClientConnectionManager#setDefaultMaxPerRoute(int)}.
-     * @param ConnectionOptions advanced connection options.
+     * @param connectionOptions advanced connection options.
      * @throws RepositoryException If an exception occurs.
      */
     public RepositoryServiceImpl(String jcrServerURI, String defaultWorkspaceName,