You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by an...@apache.org on 2018/11/15 15:34:40 UTC
svn commit: r1846665 -
/jackrabbit/trunk/jackrabbit-spi2dav/src/main/java/org/apache/jackrabbit/spi2davex/Spi2davexRepositoryServiceFactory.java
Author: angela
Date: Thu Nov 15 15:34:40 2018
New Revision: 1846665
URL: http://svn.apache.org/viewvc?rev=1846665&view=rev
Log:
JCR-4120 : Spi2DavexRepositoryServiceImpl always hardcodes the default workspace name to 'default'
Modified:
jackrabbit/trunk/jackrabbit-spi2dav/src/main/java/org/apache/jackrabbit/spi2davex/Spi2davexRepositoryServiceFactory.java
Modified: jackrabbit/trunk/jackrabbit-spi2dav/src/main/java/org/apache/jackrabbit/spi2davex/Spi2davexRepositoryServiceFactory.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-spi2dav/src/main/java/org/apache/jackrabbit/spi2davex/Spi2davexRepositoryServiceFactory.java?rev=1846665&r1=1846664&r2=1846665&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-spi2dav/src/main/java/org/apache/jackrabbit/spi2davex/Spi2davexRepositoryServiceFactory.java (original)
+++ jackrabbit/trunk/jackrabbit-spi2dav/src/main/java/org/apache/jackrabbit/spi2davex/Spi2davexRepositoryServiceFactory.java Thu Nov 15 15:34:40 2018
@@ -64,11 +64,15 @@ public class Spi2davexRepositoryServiceF
*/
public static final String PARAM_MAX_CONNECTIONS = "org.apache.jackrabbit.spi2davex.MaxConnections";
-
+ /**
+ * For connecting to JCR servers older than version 1.5, the default workspace needs to be passed
+ * (if not explicitly given in each {@link Repository#login()} call)
+ *
+ * @see <a href="https://issues.apache.org/jira/browse/JCR-4120">JCR-4120</a>
+ * @see <a href="https://issues.apache.org/jira/browse/JCR-1842">JCR-1842</a>
+ */
public static final String PARAM_WORKSPACE_NAME_DEFAULT = "org.apache.jackrabbit.spi2davex.WorkspaceNameDefault";
- public static final String DEFAULT_WORKSPACE_NAME_DEFAULT = "default";
-
public RepositoryService createRepositoryService(Map<?, ?> parameters) throws RepositoryException {
// retrieve the repository uri
String uri;
@@ -87,7 +91,9 @@ public class Spi2davexRepositoryServiceF
int itemInfoCacheSize = ItemInfoCacheImpl.DEFAULT_CACHE_SIZE;
int maximumHttpConnections = 0;
- String workspaceNameDefault = DEFAULT_WORKSPACE_NAME_DEFAULT;
+ // since JCR-4120 the default workspace name is no longer set to 'default'
+ // note: if running with JCR Server < 1.5 a default workspace name must therefore be configured
+ String workspaceNameDefault = null;
if (parameters != null) {
// batchRead config