From b1dbb754c88b8609246b865a25bc946213370662 Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Fri, 9 Sep 2016 09:18:34 +0000 Subject: [PATCH] Remove unused classes git-svn-id: https://svn.argeo.org/commons/trunk@9107 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc --- .../internal/kernel/RepositoryService.java | 152 ------------------ .../internal/UserDirectoryFactory.java | 45 ------ 2 files changed, 197 deletions(-) delete mode 100644 org.argeo.cms/src/org/argeo/cms/internal/kernel/RepositoryService.java delete mode 100644 org.argeo.security.core/src/org/argeo/osgi/useradmin/internal/UserDirectoryFactory.java diff --git a/org.argeo.cms/src/org/argeo/cms/internal/kernel/RepositoryService.java b/org.argeo.cms/src/org/argeo/cms/internal/kernel/RepositoryService.java deleted file mode 100644 index 8525174e2..000000000 --- a/org.argeo.cms/src/org/argeo/cms/internal/kernel/RepositoryService.java +++ /dev/null @@ -1,152 +0,0 @@ -package org.argeo.cms.internal.kernel; - -import java.util.Dictionary; -import java.util.Hashtable; -import java.util.List; -import java.util.Locale; - -import org.apache.jackrabbit.core.RepositoryContext; -import org.argeo.ArgeoException; -import org.argeo.jcr.ArgeoJcrConstants; -import org.argeo.node.RepoConf; -import org.osgi.framework.BundleContext; -import org.osgi.framework.FrameworkUtil; -import org.osgi.framework.ServiceRegistration; -import org.osgi.service.cm.ConfigurationException; -import org.osgi.service.cm.ManagedService; -import org.osgi.service.metatype.MetaTypeProvider; -import org.osgi.service.metatype.ObjectClassDefinition; - -public class RepositoryService implements ManagedService, MetaTypeProvider { - private BundleContext bc = FrameworkUtil.getBundle(getClass()).getBundleContext(); - // private RepositoryContext repositoryContext = null; - private ServiceRegistration repositoryContextReg; - - @Override - public void updated(Dictionary properties) throws ConfigurationException { - if (properties == null) - return; - - if (repositoryContextReg != null) { - shutdown(); - } - -// for (String key : LangUtils.keys(properties)) { -// Object value = properties.get(key); -// System.out.println(key + " : " + value.getClass().getName()); -// } - - try { - RepositoryBuilder repositoryBuilder = new RepositoryBuilder(); - RepositoryContext repositoryContext = repositoryBuilder.createRepositoryContext(properties); - Dictionary props = new Hashtable<>(); - props.put(ArgeoJcrConstants.JCR_REPOSITORY_URI, properties.get(RepoConf.labeledUri.name())); - Object cn = properties.get(ArgeoJcrConstants.JCR_REPOSITORY_ALIAS); - if (cn != null) { - props.put(ArgeoJcrConstants.JCR_REPOSITORY_ALIAS, cn); - } - repositoryContextReg = bc.registerService(RepositoryContext.class, repositoryContext, props); - } catch (Exception e) { - throw new ArgeoException("Cannot create Jackrabbit repository", e); - } - - } - - public void shutdown() { - if (repositoryContextReg == null) - return; - RepositoryContext repositoryContext = bc.getService(repositoryContextReg.getReference()); - repositoryContext.getRepository().shutdown(); - repositoryContextReg.unregister(); - repositoryContextReg = null; - } - - /* - * METATYPE - */ - @Override - public ObjectClassDefinition getObjectClassDefinition(String id, String locale) { - return new RepoConf.OCD(locale); - // return new EnumOCD<>(RepoConf.class); - // return new JcrRepositoryOCD(locale); - } - - @Override - public String[] getLocales() { - // TODO optimize? - List locales = Activator.getNodeState().getLocales(); - String[] res = new String[locales.size()]; - for (int i = 0; i < locales.size(); i++) - res[i] = locales.get(i).toString(); - return res; - } - - /* - * JACKRABBIT REPOSITORY - */ - - // private RepositoryImpl repo() { - // return repositoryContext.getRepository(); - // } - // - // @Override - // public String[] getDescriptorKeys() { - // return repo().getDescriptorKeys(); - // } - // - // @Override - // public boolean isStandardDescriptor(String key) { - // return repo().isStandardDescriptor(key); - // } - // - // @Override - // public boolean isSingleValueDescriptor(String key) { - // return repo().isSingleValueDescriptor(key); - // } - // - // @Override - // public Value getDescriptorValue(String key) { - // return repo().getDescriptorValue(key); - // } - // - // @Override - // public Value[] getDescriptorValues(String key) { - // return repo().getDescriptorValues(key); - // } - // - // @Override - // public String getDescriptor(String key) { - // return repo().getDescriptor(key); - // } - // - // @Override - // public Session login(Credentials credentials, String workspaceName) - // throws LoginException, NoSuchWorkspaceException, RepositoryException { - // return repo().login(); - // } - // - // @Override - // public Session login(Credentials credentials) throws LoginException, - // RepositoryException { - // return repo().login(credentials); - // } - // - // @Override - // public Session login(String workspaceName) throws LoginException, - // NoSuchWorkspaceException, RepositoryException { - // return repo().login(workspaceName); - // } - // - // @Override - // public Session login() throws LoginException, RepositoryException { - // return repo().login(); - // } - // - // @Override - // public Session login(Credentials credentials, String workspaceName, - // Map attributes) - // throws LoginException, NoSuchWorkspaceException, RepositoryException { - // return repo().login(credentials, workspaceName, attributes); - // } - -} diff --git a/org.argeo.security.core/src/org/argeo/osgi/useradmin/internal/UserDirectoryFactory.java b/org.argeo.security.core/src/org/argeo/osgi/useradmin/internal/UserDirectoryFactory.java deleted file mode 100644 index 2182028d9..000000000 --- a/org.argeo.security.core/src/org/argeo/osgi/useradmin/internal/UserDirectoryFactory.java +++ /dev/null @@ -1,45 +0,0 @@ -package org.argeo.osgi.useradmin.internal; - -import java.util.Dictionary; -import java.util.HashMap; -import java.util.Hashtable; -import java.util.Map; - -import org.argeo.osgi.useradmin.LdapUserAdmin; -import org.argeo.osgi.useradmin.LdifUserAdmin; -import org.argeo.osgi.useradmin.UserAdminConf; -import org.argeo.osgi.useradmin.UserDirectory; -import org.osgi.framework.BundleContext; -import org.osgi.framework.Constants; -import org.osgi.framework.FrameworkUtil; -import org.osgi.service.cm.ConfigurationException; -import org.osgi.service.cm.ManagedServiceFactory; - -public class UserDirectoryFactory implements ManagedServiceFactory { - private final BundleContext bc = FrameworkUtil.getBundle(UserDirectoryFactory.class).getBundleContext(); - - private Map userDirectories = new HashMap<>(); - - @Override - public String getName() { - return "User Directories Factory"; - } - - @Override - public void updated(String pid, Dictionary properties) throws ConfigurationException { - String uri = (String) properties.get(UserAdminConf.uri.name()); - UserDirectory userDirectory = uri.startsWith("ldap:") ? new LdapUserAdmin(properties) - : new LdifUserAdmin(properties); - Dictionary regProps = new Hashtable<>(); - regProps.put(Constants.SERVICE_PID, pid); - regProps.put(UserAdminConf.uri.name(), uri); - bc.registerService(UserDirectory.class, userDirectory, regProps); - userDirectories.put(pid, userDirectory); - } - - @Override - public void deleted(String pid) { - userDirectories.remove(pid); - } - -} -- 2.30.2