Adapt to changes in third parties distribution

diff --git a/jcr/org.argeo.cms.jcr/bnd.bnd b/jcr/org.argeo.cms.jcr/bnd.bnd
index d6f7b2d12b28bef6739f88e921a5753b039f7f9e..3911ec9feb54d2f79ff058bc772a3297beaca950 100644 (file)
--- 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 3ddcf97c643251df556b597a2e64c696098a8f87..55784db080fe5349dc525dbe3893eaf6c38f703d 100644 (file)
--- 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 0f9db87726d92adf2b8fb4eb1244047ddb57a37d..7d86af2173996111e15d23bc3731bfe77faa225d 100644 (file)
--- 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 4b240f0607c835e518772f303df5db45782f993a..2af0835ea222888582e91b84ea0bd3ba27d999aa 100644 (file)
--- 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 e08f4d6c7202a7b965c40f43822d1191e11a6dc9..3a122f1426f974af380ad066966af2a57f77edf2 100644 (file)
--- 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(