Start factoring OSGi accesses.

[lgpl/argeo-commons.git] / org.argeo.cms / src / org / argeo / cms / internal / kernel / NodeRepositoryFactory.java

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 f83eb9476f6005c725d95817782d4b8ac9911681..efbb724ff9174a751bad9ae639809e14b44fc443 100644 (file)
--- 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,14 +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.api.NodeConstants;
 import org.argeo.cms.internal.jcr.RepoConf;
-import org.argeo.jcr.ArgeoJcrException;
-import org.argeo.node.NodeConstants;
 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
@@ -43,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<ServiceReference<Repository>> srs = bundleContext.getServiceReferences(Repository.class,
-                                       "(" + NodeConstants.CN + "=" + 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<ServiceReference<Repository>> 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;
                }
        }
 
@@ -101,7 +90,7 @@ class NodeRepositoryFactory implements RepositoryFactory {
                                // JCR repository factory");
                                repository = getRepositoryByAlias(getAliasFromURI(uri));
                        } else
-                               throw new ArgeoJcrException("Unrecognized URI format " + uri);
+                               throw new IllegalArgumentException("Unrecognized URI format " + uri);
 
                }
 
@@ -114,10 +103,10 @@ class NodeRepositoryFactory implements RepositoryFactory {
                        // 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;
        }
@@ -129,7 +118,7 @@ class NodeRepositoryFactory implements RepositoryFactory {
                        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;
        }
@@ -189,7 +178,7 @@ 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);
                }
        }
 
@@ -200,9 +189,4 @@ class NodeRepositoryFactory implements RepositoryFactory {
        protected void postInitialization(Repository repository, Map parameters) {
 
        }
-
-       public void setFileRepositoryConfiguration(Resource fileRepositoryConfiguration) {
-               // this.fileRepositoryConfiguration = fileRepositoryConfiguration;
-       }
-
 }