From 85688af22a77f82e7762e11e6eb38c6367eddb6c Mon Sep 17 00:00:00 2001 From: Bruno Sinou Date: Thu, 15 Sep 2016 17:50:32 +0000 Subject: [PATCH] Move APIs, clean base bundles git-svn-id: https://svn.argeo.org/commons/trunk@9168 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc --- dep/org.argeo.dep.cms.platform/pom.xml | 5 ++ org.argeo.cms.ui/bnd.bnd | 2 - org.argeo.cms/bnd.bnd | 2 + .../cms/internal/kernel/DeployConfig.java | 6 +- .../cms/internal/kernel/NodeDeployConfig.java | 6 +- .../org/argeo/cms/internal/kernel/jaas.cfg | 2 +- .../cms/spring}/AbstractSystemExecution.java | 4 +- ...catedApplicationContextInitialization.java | 2 +- .../cms/spring}/SimpleRoleRegistration.java | 2 +- .../cms/spring/osgi}/OsgiModuleLabel.java | 2 +- .../argeo/eclipse/ui/EclipseArgeoMonitor.java | 28 -------- .../argeo/osgi/useradmin/LdifParserTest.java | 2 +- .../naming/AttributesDictionary.java | 2 +- .../argeo/{util => }/naming/LdifParser.java | 2 +- .../argeo/{util => }/naming/LdifWriter.java | 2 +- .../argeo/osgi/useradmin/LdifUserAdmin.java | 4 +- .../servlet/OpenInViewSessionProvider.java | 70 ------------------- .../jackrabbit/servlet/RemotingServlet.java | 52 -------------- .../jackrabbit/servlet/WebdavServlet.java | 63 ----------------- .../jcr/{security => }/JcrAuthorizations.java | 6 +- 20 files changed, 26 insertions(+), 238 deletions(-) rename {org.argeo.cms.ui/src/org/argeo/security/core => org.argeo.cms/src/org/argeo/cms/spring}/AbstractSystemExecution.java (96%) rename {org.argeo.cms.ui/src/org/argeo/security/core => org.argeo.cms/src/org/argeo/cms/spring}/AuthenticatedApplicationContextInitialization.java (98%) rename {org.argeo.cms.ui/src/org/argeo/security/core => org.argeo.cms/src/org/argeo/cms/spring}/SimpleRoleRegistration.java (98%) rename {org.argeo.cms.ui/src/org/argeo/security/core => org.argeo.cms/src/org/argeo/cms/spring/osgi}/OsgiModuleLabel.java (96%) delete mode 100644 org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/EclipseArgeoMonitor.java rename org.argeo.enterprise/src/org/argeo/{util => }/naming/AttributesDictionary.java (99%) rename org.argeo.enterprise/src/org/argeo/{util => }/naming/LdifParser.java (99%) rename org.argeo.enterprise/src/org/argeo/{util => }/naming/LdifWriter.java (98%) delete mode 100644 org.argeo.jcr/src/org/argeo/jackrabbit/servlet/OpenInViewSessionProvider.java delete mode 100644 org.argeo.jcr/src/org/argeo/jackrabbit/servlet/RemotingServlet.java delete mode 100644 org.argeo.jcr/src/org/argeo/jackrabbit/servlet/WebdavServlet.java rename org.argeo.jcr/src/org/argeo/jcr/{security => }/JcrAuthorizations.java (97%) diff --git a/dep/org.argeo.dep.cms.platform/pom.xml b/dep/org.argeo.dep.cms.platform/pom.xml index 120e68642..43b34a84a 100644 --- a/dep/org.argeo.dep.cms.platform/pom.xml +++ b/dep/org.argeo.dep.cms.platform/pom.xml @@ -32,6 +32,11 @@ org.argeo.cms.ui.workbench 2.1.46-SNAPSHOT + + org.argeo.commons + org.argeo.cms.ui.workbench.rap + 2.1.46-SNAPSHOT + diff --git a/org.argeo.cms.ui/bnd.bnd b/org.argeo.cms.ui/bnd.bnd index e472a2c52..facde000f 100644 --- a/org.argeo.cms.ui/bnd.bnd +++ b/org.argeo.cms.ui/bnd.bnd @@ -6,6 +6,4 @@ org.eclipse.jface.window,\ org.eclipse.core.commands,\ javax.jcr.security,\ org.argeo.eclipse.ui.dialogs,\ -org.springframework.context,\ -org.springframework.core.io,\ * \ No newline at end of file diff --git a/org.argeo.cms/bnd.bnd b/org.argeo.cms/bnd.bnd index 822bdd059..b638bb21b 100644 --- a/org.argeo.cms/bnd.bnd +++ b/org.argeo.cms/bnd.bnd @@ -6,5 +6,7 @@ org.postgresql;resolution:=optional,\ org.apache.jackrabbit.webdav.server,\ org.apache.jackrabbit.webdav.jcr,\ org.eclipse.equinox.http.jetty,\ +org.springframework.context,\ +org.springframework.core.io,\ * Provide-Capability: cms.datamodel;name=cms;cnd=/org/argeo/cms/cms.cnd;abstract=true \ No newline at end of file diff --git a/org.argeo.cms/src/org/argeo/cms/internal/kernel/DeployConfig.java b/org.argeo.cms/src/org/argeo/cms/internal/kernel/DeployConfig.java index 9908e9772..a9b30681b 100644 --- a/org.argeo.cms/src/org/argeo/cms/internal/kernel/DeployConfig.java +++ b/org.argeo.cms/src/org/argeo/cms/internal/kernel/DeployConfig.java @@ -19,10 +19,10 @@ import javax.naming.ldap.Rdn; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.argeo.cms.CmsException; +import org.argeo.naming.AttributesDictionary; +import org.argeo.naming.LdifParser; +import org.argeo.naming.LdifWriter; import org.argeo.node.NodeConstants; -import org.argeo.util.naming.AttributesDictionary; -import org.argeo.util.naming.LdifParser; -import org.argeo.util.naming.LdifWriter; import org.osgi.framework.BundleContext; import org.osgi.framework.FrameworkUtil; import org.osgi.service.cm.Configuration; diff --git a/org.argeo.cms/src/org/argeo/cms/internal/kernel/NodeDeployConfig.java b/org.argeo.cms/src/org/argeo/cms/internal/kernel/NodeDeployConfig.java index 85906b092..3cfb8db91 100644 --- a/org.argeo.cms/src/org/argeo/cms/internal/kernel/NodeDeployConfig.java +++ b/org.argeo.cms/src/org/argeo/cms/internal/kernel/NodeDeployConfig.java @@ -18,11 +18,11 @@ import javax.naming.directory.Attributes; import javax.naming.ldap.LdapName; import org.argeo.cms.CmsException; +import org.argeo.naming.AttributesDictionary; +import org.argeo.naming.LdifParser; +import org.argeo.naming.LdifWriter; import org.argeo.node.NodeConstants; import org.argeo.node.RepoConf; -import org.argeo.util.naming.AttributesDictionary; -import org.argeo.util.naming.LdifParser; -import org.argeo.util.naming.LdifWriter; class NodeDeployConfig { private final String BASE = "ou=deploy,ou=node"; diff --git a/org.argeo.cms/src/org/argeo/cms/internal/kernel/jaas.cfg b/org.argeo.cms/src/org/argeo/cms/internal/kernel/jaas.cfg index 88b2cd8e4..269c9112b 100644 --- a/org.argeo.cms/src/org/argeo/cms/internal/kernel/jaas.cfg +++ b/org.argeo.cms/src/org/argeo/cms/internal/kernel/jaas.cfg @@ -28,7 +28,7 @@ HARDENED_KERNEL { }; KEYRING { - org.argeo.util.security.KeyringLoginModule required; + org.argeo.cms.auth.KeyringLoginModule required; }; SINGLE_USER { diff --git a/org.argeo.cms.ui/src/org/argeo/security/core/AbstractSystemExecution.java b/org.argeo.cms/src/org/argeo/cms/spring/AbstractSystemExecution.java similarity index 96% rename from org.argeo.cms.ui/src/org/argeo/security/core/AbstractSystemExecution.java rename to org.argeo.cms/src/org/argeo/cms/spring/AbstractSystemExecution.java index 9c3e5cd83..a7297ef36 100644 --- a/org.argeo.cms.ui/src/org/argeo/security/core/AbstractSystemExecution.java +++ b/org.argeo.cms/src/org/argeo/cms/spring/AbstractSystemExecution.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.argeo.security.core; +package org.argeo.cms.spring; import javax.security.auth.Subject; import javax.security.auth.login.LoginContext; @@ -24,7 +24,7 @@ import org.apache.commons.logging.LogFactory; import org.argeo.cms.CmsException; /** Provides base method for executing code with system authorization. */ -public abstract class AbstractSystemExecution { +abstract class AbstractSystemExecution { private final static Log log = LogFactory.getLog(AbstractSystemExecution.class); private final Subject subject = new Subject(); diff --git a/org.argeo.cms.ui/src/org/argeo/security/core/AuthenticatedApplicationContextInitialization.java b/org.argeo.cms/src/org/argeo/cms/spring/AuthenticatedApplicationContextInitialization.java similarity index 98% rename from org.argeo.cms.ui/src/org/argeo/security/core/AuthenticatedApplicationContextInitialization.java rename to org.argeo.cms/src/org/argeo/cms/spring/AuthenticatedApplicationContextInitialization.java index aa3827c92..e1af58274 100644 --- a/org.argeo.cms.ui/src/org/argeo/security/core/AuthenticatedApplicationContextInitialization.java +++ b/org.argeo.cms/src/org/argeo/cms/spring/AuthenticatedApplicationContextInitialization.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.argeo.security.core; +package org.argeo.cms.spring; import java.security.AccessController; import java.security.PrivilegedAction; diff --git a/org.argeo.cms.ui/src/org/argeo/security/core/SimpleRoleRegistration.java b/org.argeo.cms/src/org/argeo/cms/spring/SimpleRoleRegistration.java similarity index 98% rename from org.argeo.cms.ui/src/org/argeo/security/core/SimpleRoleRegistration.java rename to org.argeo.cms/src/org/argeo/cms/spring/SimpleRoleRegistration.java index 58f6686ac..255ce111c 100644 --- a/org.argeo.cms.ui/src/org/argeo/security/core/SimpleRoleRegistration.java +++ b/org.argeo.cms/src/org/argeo/cms/spring/SimpleRoleRegistration.java @@ -1,4 +1,4 @@ -package org.argeo.security.core; +package org.argeo.cms.spring; import java.util.ArrayList; import java.util.List; diff --git a/org.argeo.cms.ui/src/org/argeo/security/core/OsgiModuleLabel.java b/org.argeo.cms/src/org/argeo/cms/spring/osgi/OsgiModuleLabel.java similarity index 96% rename from org.argeo.cms.ui/src/org/argeo/security/core/OsgiModuleLabel.java rename to org.argeo.cms/src/org/argeo/cms/spring/osgi/OsgiModuleLabel.java index 45c9e16b0..f085d6a23 100644 --- a/org.argeo.cms.ui/src/org/argeo/security/core/OsgiModuleLabel.java +++ b/org.argeo.cms/src/org/argeo/cms/spring/osgi/OsgiModuleLabel.java @@ -1,4 +1,4 @@ -package org.argeo.security.core; +package org.argeo.cms.spring.osgi; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/EclipseArgeoMonitor.java b/org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/EclipseArgeoMonitor.java deleted file mode 100644 index 46c19b564..000000000 --- a/org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/EclipseArgeoMonitor.java +++ /dev/null @@ -1,28 +0,0 @@ -/* - * 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.eclipse.ui; - -import org.eclipse.core.runtime.IProgressMonitor; - -/** - * @deprecated use {@link EclipseJcrMonitor} instead - */ -@Deprecated -public class EclipseArgeoMonitor extends EclipseJcrMonitor { - public EclipseArgeoMonitor(IProgressMonitor progressMonitor) { - super(progressMonitor); - } -} diff --git a/org.argeo.enterprise/ext/test/org/argeo/osgi/useradmin/LdifParserTest.java b/org.argeo.enterprise/ext/test/org/argeo/osgi/useradmin/LdifParserTest.java index e7c94609f..b732a98ac 100644 --- a/org.argeo.enterprise/ext/test/org/argeo/osgi/useradmin/LdifParserTest.java +++ b/org.argeo.enterprise/ext/test/org/argeo/osgi/useradmin/LdifParserTest.java @@ -12,7 +12,7 @@ import javax.naming.ldap.LdapName; import junit.framework.TestCase; -import org.argeo.util.naming.LdifParser; +import org.argeo.naming.LdifParser; public class LdifParserTest extends TestCase implements BasicTestConstants { public void testBasicLdif() throws Exception { diff --git a/org.argeo.enterprise/src/org/argeo/util/naming/AttributesDictionary.java b/org.argeo.enterprise/src/org/argeo/naming/AttributesDictionary.java similarity index 99% rename from org.argeo.enterprise/src/org/argeo/util/naming/AttributesDictionary.java rename to org.argeo.enterprise/src/org/argeo/naming/AttributesDictionary.java index c211e8e8a..fe59c1002 100644 --- a/org.argeo.enterprise/src/org/argeo/util/naming/AttributesDictionary.java +++ b/org.argeo.enterprise/src/org/argeo/naming/AttributesDictionary.java @@ -1,4 +1,4 @@ -package org.argeo.util.naming; +package org.argeo.naming; import java.util.Dictionary; import java.util.Enumeration; diff --git a/org.argeo.enterprise/src/org/argeo/util/naming/LdifParser.java b/org.argeo.enterprise/src/org/argeo/naming/LdifParser.java similarity index 99% rename from org.argeo.enterprise/src/org/argeo/util/naming/LdifParser.java rename to org.argeo.enterprise/src/org/argeo/naming/LdifParser.java index ec73e8acc..e47d8133e 100644 --- a/org.argeo.enterprise/src/org/argeo/util/naming/LdifParser.java +++ b/org.argeo.enterprise/src/org/argeo/naming/LdifParser.java @@ -1,4 +1,4 @@ -package org.argeo.util.naming; +package org.argeo.naming; import static org.argeo.osgi.useradmin.LdifName.dn; diff --git a/org.argeo.enterprise/src/org/argeo/util/naming/LdifWriter.java b/org.argeo.enterprise/src/org/argeo/naming/LdifWriter.java similarity index 98% rename from org.argeo.enterprise/src/org/argeo/util/naming/LdifWriter.java rename to org.argeo.enterprise/src/org/argeo/naming/LdifWriter.java index 37d90b4e4..6bd4809db 100644 --- a/org.argeo.enterprise/src/org/argeo/util/naming/LdifWriter.java +++ b/org.argeo.enterprise/src/org/argeo/naming/LdifWriter.java @@ -1,4 +1,4 @@ -package org.argeo.util.naming; +package org.argeo.naming; import static org.argeo.osgi.useradmin.LdifName.dn; diff --git a/org.argeo.enterprise/src/org/argeo/osgi/useradmin/LdifUserAdmin.java b/org.argeo.enterprise/src/org/argeo/osgi/useradmin/LdifUserAdmin.java index 521ae8bb6..86ef808d4 100644 --- a/org.argeo.enterprise/src/org/argeo/osgi/useradmin/LdifUserAdmin.java +++ b/org.argeo.enterprise/src/org/argeo/osgi/useradmin/LdifUserAdmin.java @@ -22,8 +22,8 @@ import javax.naming.directory.Attributes; import javax.naming.ldap.LdapName; import javax.transaction.TransactionManager; -import org.argeo.util.naming.LdifParser; -import org.argeo.util.naming.LdifWriter; +import org.argeo.naming.LdifParser; +import org.argeo.naming.LdifWriter; import org.osgi.framework.Filter; import org.osgi.service.useradmin.Role; diff --git a/org.argeo.jcr/src/org/argeo/jackrabbit/servlet/OpenInViewSessionProvider.java b/org.argeo.jcr/src/org/argeo/jackrabbit/servlet/OpenInViewSessionProvider.java deleted file mode 100644 index 52a9883ee..000000000 --- a/org.argeo.jcr/src/org/argeo/jackrabbit/servlet/OpenInViewSessionProvider.java +++ /dev/null @@ -1,70 +0,0 @@ -/* - * 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.jackrabbit.servlet; - -import java.io.Serializable; - -import javax.jcr.LoginException; -import javax.jcr.Repository; -import javax.jcr.RepositoryException; -import javax.jcr.Session; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.apache.jackrabbit.server.SessionProvider; -import org.argeo.jcr.JcrUtils; - -/** - * Implements an open session in view patter: a new JCR session is created for - * each request - */ -@Deprecated -public class OpenInViewSessionProvider implements SessionProvider, Serializable { - private static final long serialVersionUID = 2270957712453841368L; - - private final static Log log = LogFactory - .getLog(OpenInViewSessionProvider.class); - - public Session getSession(HttpServletRequest request, Repository rep, - String workspace) throws LoginException, ServletException, - RepositoryException { - return login(request, rep, workspace); - } - - protected Session login(HttpServletRequest request, Repository repository, - String workspace) throws RepositoryException { - if (log.isTraceEnabled()) - log.trace("Login to workspace " - + (workspace == null ? "" : workspace) - + " in web session " + request.getSession().getId()); - return repository.login(workspace); - } - - public void releaseSession(Session session) { - JcrUtils.logoutQuietly(session); - if (log.isTraceEnabled()) - log.trace("Logged out remote JCR session " + session); - } - - public void init() { - } - - public void destroy() { - } - -} diff --git a/org.argeo.jcr/src/org/argeo/jackrabbit/servlet/RemotingServlet.java b/org.argeo.jcr/src/org/argeo/jackrabbit/servlet/RemotingServlet.java deleted file mode 100644 index 3fdb5d2e1..000000000 --- a/org.argeo.jcr/src/org/argeo/jackrabbit/servlet/RemotingServlet.java +++ /dev/null @@ -1,52 +0,0 @@ -/* - * 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.jackrabbit.servlet; - -import javax.jcr.Repository; - -import org.apache.jackrabbit.server.SessionProvider; -import org.apache.jackrabbit.server.remoting.davex.JcrRemotingServlet; - -/** Provides remote access to a JCR repository */ -@Deprecated -public class RemotingServlet extends JcrRemotingServlet { - public final static String INIT_PARAM_RESOURCE_PATH_PREFIX = JcrRemotingServlet.INIT_PARAM_RESOURCE_PATH_PREFIX; - public final static String INIT_PARAM_HOME = JcrRemotingServlet.INIT_PARAM_HOME; - public final static String INIT_PARAM_TMP_DIRECTORY = JcrRemotingServlet.INIT_PARAM_TMP_DIRECTORY; - public final static String INIT_PARAM_PROTECTED_HANDLERS_CONFIG = JcrRemotingServlet.INIT_PARAM_PROTECTED_HANDLERS_CONFIG; - - private static final long serialVersionUID = 3131835511468341309L; - - private final Repository repository; - private final SessionProvider sessionProvider; - - public RemotingServlet(Repository repository, - SessionProvider sessionProvider) { - this.repository = repository; - this.sessionProvider = sessionProvider; - } - - @Override - protected Repository getRepository() { - return repository; - } - - @Override - protected SessionProvider getSessionProvider() { - return sessionProvider; - } - -} diff --git a/org.argeo.jcr/src/org/argeo/jackrabbit/servlet/WebdavServlet.java b/org.argeo.jcr/src/org/argeo/jackrabbit/servlet/WebdavServlet.java deleted file mode 100644 index e3176b742..000000000 --- a/org.argeo.jcr/src/org/argeo/jackrabbit/servlet/WebdavServlet.java +++ /dev/null @@ -1,63 +0,0 @@ -/* - * 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.jackrabbit.servlet; - -import java.io.IOException; - -import javax.jcr.Repository; -import javax.servlet.ServletException; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.apache.jackrabbit.server.SessionProvider; -import org.apache.jackrabbit.webdav.DavException; -import org.apache.jackrabbit.webdav.DavResource; -import org.apache.jackrabbit.webdav.WebdavRequest; -import org.apache.jackrabbit.webdav.WebdavResponse; -import org.apache.jackrabbit.webdav.simple.SimpleWebdavServlet; - -/** WebDav servlet whose repository is injected */ -@Deprecated -public class WebdavServlet extends SimpleWebdavServlet { - public final static String INIT_PARAM_RESOURCE_CONFIG = SimpleWebdavServlet.INIT_PARAM_RESOURCE_CONFIG; - public final static String INIT_PARAM_RESOURCE_PATH_PREFIX = SimpleWebdavServlet.INIT_PARAM_RESOURCE_PATH_PREFIX; - - private static final long serialVersionUID = -369787931175177080L; - - private final static Log log = LogFactory.getLog(WebdavServlet.class); - - private final Repository repository; - - public WebdavServlet(Repository repository, SessionProvider sessionProvider) { - this.repository = repository; - setSessionProvider(sessionProvider); - } - - public Repository getRepository() { - return repository; - } - - @Override - protected boolean execute(WebdavRequest request, WebdavResponse response, - int method, DavResource resource) throws ServletException, - IOException, DavException { - if (log.isTraceEnabled()) - log.trace(request.getMethod() + "\t" + request.getPathInfo()); - boolean res = super.execute(request, response, method, resource); - return res; - } - -} diff --git a/org.argeo.jcr/src/org/argeo/jcr/security/JcrAuthorizations.java b/org.argeo.jcr/src/org/argeo/jcr/JcrAuthorizations.java similarity index 97% rename from org.argeo.jcr/src/org/argeo/jcr/security/JcrAuthorizations.java rename to org.argeo.jcr/src/org/argeo/jcr/JcrAuthorizations.java index 3e8e3a2ff..22592fa17 100644 --- a/org.argeo.jcr/src/org/argeo/jcr/security/JcrAuthorizations.java +++ b/org.argeo.jcr/src/org/argeo/jcr/JcrAuthorizations.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.argeo.jcr.security; +package org.argeo.jcr; import java.security.Principal; import java.util.ArrayList; @@ -27,10 +27,6 @@ import javax.jcr.Session; import javax.jcr.security.AccessControlManager; import javax.jcr.security.Privilege; -import org.argeo.jcr.ArgeoJcrException; -import org.argeo.jcr.JcrUtils; -import org.argeo.jcr.SimplePrincipal; - /** Apply authorizations to a JCR repository. */ public class JcrAuthorizations implements Runnable { // private final static Log log = -- 2.30.2