From ed10a32df82e615b5eb00ebc10d505db5e073982 Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Fri, 11 Feb 2022 09:36:20 +0100 Subject: [PATCH] Adapt to changes in third parties distribution --- jcr/org.argeo.cms.jcr/bnd.bnd | 2 +- jcr/org.argeo.cms.jcr/build.properties | 5 ++- .../client/ClientDavexRepositoryService.java | 33 ++++++++++++------- .../ClientDavexRepositoryServiceFactory.java | 14 ++++---- .../jackrabbit/client/JackrabbitClient.java | 24 +++++++------- 5 files changed, 46 insertions(+), 32 deletions(-) diff --git a/jcr/org.argeo.cms.jcr/bnd.bnd b/jcr/org.argeo.cms.jcr/bnd.bnd index d6f7b2d12..3911ec9fe 100644 --- a/jcr/org.argeo.cms.jcr/bnd.bnd +++ b/jcr/org.argeo.cms.jcr/bnd.bnd @@ -9,7 +9,7 @@ osgi.service;objectClass="javax.jcr.Repository" Import-Package:\ org.argeo.cms.servlet,\ javax.jcr.security,\ -org.h2;resolution:=optional,\ +org.h2;resolution:=optional;version="[1,3)",\ org.postgresql;version="[42,43)";resolution:=optional,\ org.apache.commons.httpclient.cookie;resolution:=optional,\ org.osgi.framework.namespace;version=0.0.0,\ diff --git a/jcr/org.argeo.cms.jcr/build.properties b/jcr/org.argeo.cms.jcr/build.properties index 3ddcf97c6..55784db08 100644 --- a/jcr/org.argeo.cms.jcr/build.properties +++ b/jcr/org.argeo.cms.jcr/build.properties @@ -19,10 +19,9 @@ additional.bundles = org.apache.jackrabbit.core,\ org.apache.lucene,\ org.apache.tika.core,\ org.apache.commons.dbcp,\ - org.apache.commons.pool,\ - com.google.guava,\ org.apache.jackrabbit.jcr2spi,\ org.apache.jackrabbit.spi2dav,\ org.apache.httpcomponents.httpclient,\ org.apache.httpcomponents.httpcore,\ - org.apache.tika.parsers + org.apache.tika.parsers,\ + org.h2 diff --git a/jcr/org.argeo.cms.jcr/src/org/argeo/jackrabbit/client/ClientDavexRepositoryService.java b/jcr/org.argeo.cms.jcr/src/org/argeo/jackrabbit/client/ClientDavexRepositoryService.java index 0f9db8772..7d86af217 100644 --- a/jcr/org.argeo.cms.jcr/src/org/argeo/jackrabbit/client/ClientDavexRepositoryService.java +++ b/jcr/org.argeo.cms.jcr/src/org/argeo/jackrabbit/client/ClientDavexRepositoryService.java @@ -18,17 +18,28 @@ public class ClientDavexRepositoryService extends RepositoryServiceImpl { throws RepositoryException { super(jcrServerURI, batchReadConfig); } - - public ClientDavexRepositoryService(String jcrServerURI, String defaultWorkspaceName, - BatchReadConfig batchReadConfig, int itemInfoCacheSize, int maximumHttpConnections) - throws RepositoryException { - super(jcrServerURI, defaultWorkspaceName, batchReadConfig, itemInfoCacheSize, maximumHttpConnections); - } - - public ClientDavexRepositoryService(String jcrServerURI, String defaultWorkspaceName, - BatchReadConfig batchReadConfig, int itemInfoCacheSize) throws RepositoryException { - super(jcrServerURI, defaultWorkspaceName, batchReadConfig, itemInfoCacheSize); - } + + + +// public ClientDavexRepositoryService(String jcrServerURI, String defaultWorkspaceName, +// BatchReadConfig batchReadConfig, int itemInfoCacheSize, ConnectionOptions connectionOptions) +// throws RepositoryException { +// super(jcrServerURI, defaultWorkspaceName, batchReadConfig, itemInfoCacheSize, connectionOptions); +// // TODO Auto-generated constructor stub +// } + + + +// public ClientDavexRepositoryService(String jcrServerURI, String defaultWorkspaceName, +// BatchReadConfig batchReadConfig, int itemInfoCacheSize, int maximumHttpConnections) +// throws RepositoryException { +// super(jcrServerURI, defaultWorkspaceName, batchReadConfig, itemInfoCacheSize, maximumHttpConnections); +// } +// +// public ClientDavexRepositoryService(String jcrServerURI, String defaultWorkspaceName, +// BatchReadConfig batchReadConfig, int itemInfoCacheSize) throws RepositoryException { +// super(jcrServerURI, defaultWorkspaceName, batchReadConfig, itemInfoCacheSize); +// } @Override protected HttpContext getContext(SessionInfo sessionInfo) throws RepositoryException { diff --git a/jcr/org.argeo.cms.jcr/src/org/argeo/jackrabbit/client/ClientDavexRepositoryServiceFactory.java b/jcr/org.argeo.cms.jcr/src/org/argeo/jackrabbit/client/ClientDavexRepositoryServiceFactory.java index 4b240f060..2af0835ea 100644 --- a/jcr/org.argeo.cms.jcr/src/org/argeo/jackrabbit/client/ClientDavexRepositoryServiceFactory.java +++ b/jcr/org.argeo.cms.jcr/src/org/argeo/jackrabbit/client/ClientDavexRepositoryServiceFactory.java @@ -71,12 +71,14 @@ public class ClientDavexRepositoryServiceFactory extends Spi2davexRepositoryServ } } - if (maximumHttpConnections > 0) { - return new ClientDavexRepositoryService(uri, workspaceNameDefault, brc, itemInfoCacheSize, - maximumHttpConnections); - } else { - return new ClientDavexRepositoryService(uri, workspaceNameDefault, brc, itemInfoCacheSize); - } + // FIXME adapt to changes in Jackrabbit +// if (maximumHttpConnections > 0) { +// return new ClientDavexRepositoryService(uri, workspaceNameDefault, brc, itemInfoCacheSize, +// maximumHttpConnections); +// } else { +// return new ClientDavexRepositoryService(uri, workspaceNameDefault, brc, itemInfoCacheSize); +// } + return null; } } diff --git a/jcr/org.argeo.cms.jcr/src/org/argeo/jackrabbit/client/JackrabbitClient.java b/jcr/org.argeo.cms.jcr/src/org/argeo/jackrabbit/client/JackrabbitClient.java index e08f4d6c7..3a122f142 100644 --- a/jcr/org.argeo.cms.jcr/src/org/argeo/jackrabbit/client/JackrabbitClient.java +++ b/jcr/org.argeo.cms.jcr/src/org/argeo/jackrabbit/client/JackrabbitClient.java @@ -64,17 +64,19 @@ public class JackrabbitClient { Object uri = parameters.get(JACKRABBIT_DAVEX_URI); Object defaultWorkspace = parameters.get(JACKRABBIT_REMOTE_DEFAULT_WORKSPACE); BatchReadConfig brc = null; - return new RepositoryServiceImpl(uri.toString(), defaultWorkspace.toString(), brc, - ItemInfoCacheImpl.DEFAULT_CACHE_SIZE) { - - @Override - protected HttpContext getContext(SessionInfo sessionInfo) throws RepositoryException { - HttpClientContext result = HttpClientContext.create(); - result.setAuthCache(new NonSerialBasicAuthCache()); - return result; - } - - }; + // FIXME adapt to change in Jackrabbit +// return new RepositoryServiceImpl(uri.toString(), defaultWorkspace.toString(), brc, +// ItemInfoCacheImpl.DEFAULT_CACHE_SIZE) { +// +// @Override +// protected HttpContext getContext(SessionInfo sessionInfo) throws RepositoryException { +// HttpClientContext result = HttpClientContext.create(); +// result.setAuthCache(new NonSerialBasicAuthCache()); +// return result; +// } +// +// }; + return null; } }; return RepositoryImpl.create( -- 2.30.2