Move various CMS extensions to Argeo SLC.

[lgpl/argeo-commons.git] / org.argeo.jcr / src / org / argeo / jackrabbit / fs / DavexFsProvider.java

diff --git a/org.argeo.jcr/src/org/argeo/jackrabbit/fs/DavexFsProvider.java b/org.argeo.jcr/src/org/argeo/jackrabbit/fs/DavexFsProvider.java
index 5a0834d3062ec5500d37ee0d1702919db1294c91..57d348be466ca4debfb845b78ddd273fa89fcb93 100644 (file)
--- a/org.argeo.jcr/src/org/argeo/jackrabbit/fs/DavexFsProvider.java
+++ b/org.argeo.jcr/src/org/argeo/jackrabbit/fs/DavexFsProvider.java
@@ -16,7 +16,6 @@ import javax.jcr.RepositoryFactory;
 import javax.jcr.Session;
 
 import org.argeo.jackrabbit.client.ClientDavexRepositoryFactory;
-import org.argeo.jcr.ArgeoJcrException;
 import org.argeo.jcr.fs.JcrFileSystem;
 import org.argeo.jcr.fs.JcrFsException;
 
@@ -38,7 +37,7 @@ public class DavexFsProvider extends AbstractJackrabbitFsProvider {
        @Override
        public FileSystem newFileSystem(URI uri, Map<String, ?> env) throws IOException {
                if (uri.getHost() == null)
-                       throw new ArgeoJcrException("An host should be provided");
+                       throw new IllegalArgumentException("An host should be provided");
                try {
                        URI repoUri = new URI("http", uri.getUserInfo(), uri.getHost(), uri.getPort(), uri.getPath(), null, null);
                        String repoKey = repoUri.toString();
@@ -46,8 +45,8 @@ public class DavexFsProvider extends AbstractJackrabbitFsProvider {
                                throw new FileSystemAlreadyExistsException("CMS file system already exists for " + repoKey);
                        RepositoryFactory repositoryFactory = new ClientDavexRepositoryFactory();
                        return tryGetRepo(repositoryFactory, repoUri, "home");
-               } catch (Exception e) {
-                       throw new ArgeoJcrException("Cannot open file system " + uri, e);
+               } catch (URISyntaxException e) {
+                       throw new IllegalArgumentException("Cannot open file system " + uri, e);
                }
        }
 
@@ -55,7 +54,8 @@ public class DavexFsProvider extends AbstractJackrabbitFsProvider {
                        throws IOException {
                Map<String, String> params = new HashMap<String, String>();
                params.put(ClientDavexRepositoryFactory.JACKRABBIT_DAVEX_URI, repoUri.toString());
-               params.put(ClientDavexRepositoryFactory.JACKRABBIT_REMOTE_DEFAULT_WORKSPACE, "main");
+               // FIXME make it configurable
+               params.put(ClientDavexRepositoryFactory.JACKRABBIT_REMOTE_DEFAULT_WORKSPACE, "sys");
                Repository repository = null;
                Session session = null;
                try {
@@ -78,7 +78,7 @@ public class DavexFsProvider extends AbstractJackrabbitFsProvider {
                        try {
                                nextUri = new URI(nextRepoUriStr);
                        } catch (URISyntaxException e) {
-                               throw new ArgeoJcrException("Badly formatted URI", e);
+                               throw new IllegalArgumentException("Badly formatted URI", e);
                        }
                        return tryGetRepo(repositoryFactory, nextUri, nextWorkspace);
                } else {