From 384d7bec2392635c6625cdbf9f94a4cf0b357d38 Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Sat, 28 Feb 2015 21:55:45 +0000 Subject: [PATCH] Clean up code git-svn-id: https://svn.argeo.org/commons/trunk@7995 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc --- .../internal/auth/AbstractLoginModule.java | 1 + .../cms/internal/kernel/JackrabbitNode.java | 10 +--------- .../kernel/jackrabbit-node.properties | 19 ------------------- 3 files changed, 2 insertions(+), 28 deletions(-) delete mode 100644 org.argeo.cms/src/org/argeo/cms/internal/kernel/jackrabbit-node.properties diff --git a/org.argeo.cms/src/org/argeo/cms/internal/auth/AbstractLoginModule.java b/org.argeo.cms/src/org/argeo/cms/internal/auth/AbstractLoginModule.java index f464ebad9..ede37933d 100644 --- a/org.argeo.cms/src/org/argeo/cms/internal/auth/AbstractLoginModule.java +++ b/org.argeo.cms/src/org/argeo/cms/internal/auth/AbstractLoginModule.java @@ -47,6 +47,7 @@ public abstract class AbstractLoginModule implements LoginModule { */ private final static String SPRING_SECURITY_CONTEXT_KEY = "SPRING_SECURITY_CONTEXT"; + @SuppressWarnings("unused") private final static Log log = LogFactory.getLog(AbstractLoginModule.class); private CallbackHandler callbackHandler; private Subject subject; diff --git a/org.argeo.cms/src/org/argeo/cms/internal/kernel/JackrabbitNode.java b/org.argeo.cms/src/org/argeo/cms/internal/kernel/JackrabbitNode.java index 50c78edaa..8ef16c44f 100644 --- a/org.argeo.cms/src/org/argeo/cms/internal/kernel/JackrabbitNode.java +++ b/org.argeo.cms/src/org/argeo/cms/internal/kernel/JackrabbitNode.java @@ -70,11 +70,6 @@ class JackrabbitNode extends JackrabbitWrapper implements KernelConstants, return repositoryContext.getRepositoryStatistics(); } - // Dictionary getDefaults() { - // return KernelUtils.asDictionary(getClass().getClassLoader(), - // "/org/argeo/cms/internal/kernel/jackrabbit-node.properties"); - // } - private RepositoryConfig getConfiguration(JackrabbitNodeType type, Hashtable vars) throws RepositoryException { ClassLoader cl = getClass().getClassLoader(); @@ -123,7 +118,7 @@ class JackrabbitNode extends JackrabbitWrapper implements KernelConstants, // common setProp(defaults, REPO_DEFAULT_WORKSPACE, "main"); setProp(defaults, REPO_MAX_POOL_SIZE, "10"); - // Jackrabbit default: + // Jackrabbit defaults setProp(defaults, REPO_BUNDLE_CACHE_MB, "8"); // See http://wiki.apache.org/jackrabbit/Search setProp(defaults, REPO_EXTRACTOR_POOL_SIZE, "0"); @@ -189,14 +184,11 @@ class JackrabbitNode extends JackrabbitWrapper implements KernelConstants, RepositoryConfig repositoryConfig) throws RepositoryException { File homeDirectory = null; long begin = System.currentTimeMillis(); - // RepositoryImpl repository; // // Actual repository creation // RepositoryContext repositoryContext = RepositoryContext .create(repositoryConfig); - // repository = repositoryContext.getRepository(); - // repository = RepositoryImpl.create(repositoryConfig); double duration = ((double) (System.currentTimeMillis() - begin)) / 1000; if (log.isTraceEnabled()) diff --git a/org.argeo.cms/src/org/argeo/cms/internal/kernel/jackrabbit-node.properties b/org.argeo.cms/src/org/argeo/cms/internal/kernel/jackrabbit-node.properties deleted file mode 100644 index 889729704..000000000 --- a/org.argeo.cms/src/org/argeo/cms/internal/kernel/jackrabbit-node.properties +++ /dev/null @@ -1,19 +0,0 @@ -### OLD APPROACH, NOT USED -### HERE FOR REFERENCE, WILL BE REMOVED - -# Workspace used by the node session -argeo.node.repo.defaultWorkspace=main -#argeo.node.repo.securityWorkspace=security -argeo.node.repo.forceCndImport=true - -# Repository base directory -argeo.node.repo.home=node - -## H2 Embedded (DEFAULT) -argeo.node.repo.configuration=osgibundle:repository-h2.xml -argeo.node.repo.dburl=jdbc:h2:${osgi.instance.area}/node/h2/repository -argeo.node.repo.dbuser=sa -argeo.node.repo.dbpassword= - -# ADVANCED -argeo.node.repo.maxPoolSize=10 \ No newline at end of file -- 2.30.2