X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2Finternal%2Fkernel%2FNodeRepositoryFactory.java;h=efbb724ff9174a751bad9ae639809e14b44fc443;hb=3c7803ca05e2b0276d635e64046d924d3f1884c9;hp=b59b5e29c29ef23f8307b8b95e2719ff08717ee5;hpb=8500cae34c6596f6f3532db4431170d4a636f78c;p=lgpl%2Fargeo-commons.git diff --git a/org.argeo.cms/src/org/argeo/cms/internal/kernel/NodeRepositoryFactory.java b/org.argeo.cms/src/org/argeo/cms/internal/kernel/NodeRepositoryFactory.java index b59b5e29c..efbb724ff 100644 --- a/org.argeo.cms/src/org/argeo/cms/internal/kernel/NodeRepositoryFactory.java +++ b/org.argeo.cms/src/org/argeo/cms/internal/kernel/NodeRepositoryFactory.java @@ -1,18 +1,3 @@ -/* - * Copyright (C) 2007-2012 Argeo GmbH - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ package org.argeo.cms.internal.kernel; import java.net.URI; @@ -28,13 +13,12 @@ import javax.jcr.RepositoryFactory; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.jackrabbit.jcr2dav.Jcr2davRepositoryFactory; -import org.argeo.jcr.ArgeoJcrException; -import org.argeo.node.NodeConstants; +import org.argeo.api.NodeConstants; +import org.argeo.cms.internal.jcr.RepoConf; import org.osgi.framework.BundleContext; import org.osgi.framework.FrameworkUtil; import org.osgi.framework.InvalidSyntaxException; import org.osgi.framework.ServiceReference; -import org.springframework.core.io.Resource; /** * OSGi-aware Jackrabbit repository factory which can retrieve/publish @@ -42,23 +26,29 @@ import org.springframework.core.io.Resource; */ class NodeRepositoryFactory implements RepositoryFactory { private final Log log = LogFactory.getLog(getClass()); - private final BundleContext bundleContext = FrameworkUtil.getBundle(getClass()).getBundleContext(); +// private final BundleContext bundleContext = FrameworkUtil.getBundle(getClass()).getBundleContext(); // private Resource fileRepositoryConfiguration = new ClassPathResource( // "/org/argeo/cms/internal/kernel/repository-localfs.xml"); protected Repository getRepositoryByAlias(String alias) { - try { - Collection> srs = bundleContext.getServiceReferences(Repository.class, - "(" + NodeConstants.JCR_REPOSITORY_ALIAS + "=" + alias + ")"); - if (srs.size() == 0) - throw new ArgeoJcrException("No repository with alias " + alias + " found in OSGi registry"); - else if (srs.size() > 1) - throw new ArgeoJcrException( - srs.size() + " repositories with alias " + alias + " found in OSGi registry"); - return bundleContext.getService(srs.iterator().next()); - } catch (InvalidSyntaxException e) { - throw new ArgeoJcrException("Cannot find repository with alias " + alias, e); + BundleContext bundleContext = Activator.getBundleContext(); + if (bundleContext != null) { + try { + Collection> srs = bundleContext.getServiceReferences(Repository.class, + "(" + NodeConstants.CN + "=" + alias + ")"); + if (srs.size() == 0) + throw new IllegalArgumentException("No repository with alias " + alias + " found in OSGi registry"); + else if (srs.size() > 1) + throw new IllegalArgumentException( + srs.size() + " repositories with alias " + alias + " found in OSGi registry"); + return bundleContext.getService(srs.iterator().next()); + } catch (InvalidSyntaxException e) { + throw new IllegalArgumentException("Cannot find repository with alias " + alias, e); + } + } else { + // TODO ability to filter static services + return null; } } @@ -84,48 +74,51 @@ class NodeRepositoryFactory implements RepositoryFactory { // check if remote Repository repository; String uri = null; - if (parameters.containsKey(NodeConstants.JCR_REPOSITORY_URI)) - uri = parameters.get(NodeConstants.JCR_REPOSITORY_URI).toString(); + if (parameters.containsKey(RepoConf.labeledUri.name())) + uri = parameters.get(NodeConstants.LABELED_URI).toString(); else if (parameters.containsKey(KernelConstants.JACKRABBIT_REPOSITORY_URI)) uri = parameters.get(KernelConstants.JACKRABBIT_REPOSITORY_URI).toString(); if (uri != null) { - if (uri.startsWith("http"))// http, https - repository = createRemoteRepository(uri); - else if (uri.startsWith("file"))// http, https + if (uri.startsWith("http")) {// http, https + Object defaultWorkspace = parameters.get(RepoConf.defaultWorkspace.name()); + repository = createRemoteRepository(uri, defaultWorkspace != null ? defaultWorkspace.toString() : null); + } else if (uri.startsWith("file"))// http, https repository = createFileRepository(uri, parameters); else if (uri.startsWith("vm")) { // log.warn("URI " + uri + " should have been managed by generic // JCR repository factory"); repository = getRepositoryByAlias(getAliasFromURI(uri)); } else - throw new ArgeoJcrException("Unrecognized URI format " + uri); + throw new IllegalArgumentException("Unrecognized URI format " + uri); } - else if (parameters.containsKey(NodeConstants.JCR_REPOSITORY_ALIAS)) { + else if (parameters.containsKey(NodeConstants.CN)) { // Properties properties = new Properties(); // properties.putAll(parameters); - String alias = parameters.get(NodeConstants.JCR_REPOSITORY_ALIAS).toString(); + String alias = parameters.get(NodeConstants.CN).toString(); // publish(alias, repository, properties); // log.info("Registered JCR repository under alias '" + alias + "' // with properties " + properties); repository = getRepositoryByAlias(alias); } else - throw new ArgeoJcrException("Not enough information in " + parameters); + throw new IllegalArgumentException("Not enough information in " + parameters); if (repository == null) - throw new ArgeoJcrException("Repository not found " + parameters); + throw new IllegalArgumentException("Repository not found " + parameters); return repository; } - protected Repository createRemoteRepository(String uri) throws RepositoryException { + protected Repository createRemoteRepository(String uri, String defaultWorkspace) throws RepositoryException { Map params = new HashMap(); params.put(KernelConstants.JACKRABBIT_REPOSITORY_URI, uri); + if (defaultWorkspace != null) + params.put(KernelConstants.JACKRABBIT_REMOTE_DEFAULT_WORKSPACE, defaultWorkspace); Repository repository = new Jcr2davRepositoryFactory().getRepository(params); if (repository == null) - throw new ArgeoJcrException("Remote Davex repository " + uri + " not found"); + throw new IllegalArgumentException("Remote Davex repository " + uri + " not found"); log.info("Initialized remote Jackrabbit repository from uri " + uri); return repository; } @@ -185,21 +178,15 @@ class NodeRepositoryFactory implements RepositoryFactory { alias = alias.substring(0, alias.length() - 1); return alias; } catch (URISyntaxException e) { - throw new ArgeoJcrException("Cannot interpret URI " + uri, e); + throw new IllegalArgumentException("Cannot interpret URI " + uri, e); } } /** - * Called after the repository has been initialised. Does nothing by - * default. + * Called after the repository has been initialised. Does nothing by default. */ @SuppressWarnings("rawtypes") protected void postInitialization(Repository repository, Map parameters) { } - - public void setFileRepositoryConfiguration(Resource fileRepositoryConfiguration) { -// this.fileRepositoryConfiguration = fileRepositoryConfiguration; - } - }