Clarify naming.

diff --git a/org.argeo.api/src/org/argeo/api/NodeConstants.java b/org.argeo.api/src/org/argeo/api/NodeConstants.java
index d2dfb83fdcf8905a27174bbb19c199039e116f77..f561591685b4cfe0f3fe9c6ffd73bbd6d6d05f5e 100644 (file)
--- a/org.argeo.api/src/org/argeo/api/NodeConstants.java
+++ b/org.argeo.api/src/org/argeo/api/NodeConstants.java
@@ -23,11 +23,16 @@ public interface NodeConstants {
         * COMMON NAMES
         */
        String NODE = "node";
-       String EGO = "ego";
-       String HOME = "home";
-       String SRV = "srv";
-       String GUESTS = "guests";
-       String PUBLIC = "public";
+
+       /*
+        * JCR CONVENTIONS
+        */
+       String NODE_REPOSITORY = NODE;
+       String EGO_REPOSITORY = "ego";
+       String HOME_WORKSPACE = "home";
+       String SRV_WORKSPACE = "srv";
+       String GUESTS_WORKSPACE = "guests";
+       String PUBLIC_WORKSPACE = "public";
 
        /*
         * BASE DNs

diff --git a/org.argeo.api/src/org/argeo/api/NodeUtils.java b/org.argeo.api/src/org/argeo/api/NodeUtils.java
index f64cbe6f71ed14e2e9520e86675b9f1af9b8d204..e156e1f172646f683aa11ebc5957dbd3737b6cca 100644 (file)
--- a/org.argeo.api/src/org/argeo/api/NodeUtils.java
+++ b/org.argeo.api/src/org/argeo/api/NodeUtils.java
@@ -128,7 +128,7 @@ public class NodeUtils {
 
        private static void checkUserWorkspace(Session session, String username) {
                String workspaceName = session.getWorkspace().getName();
-               if (!NodeConstants.HOME.equals(workspaceName))
+               if (!NodeConstants.HOME_WORKSPACE.equals(workspaceName))
                        throw new IllegalArgumentException(workspaceName + " is not the home workspace for user " + username);
        }
 
@@ -182,7 +182,7 @@ public class NodeUtils {
 
        private static void checkGroupWorkspace(Session session, String groupname) {
                String workspaceName = session.getWorkspace().getName();
-               if (!NodeConstants.SRV.equals(workspaceName))
+               if (!NodeConstants.SRV_WORKSPACE.equals(workspaceName))
                        throw new IllegalArgumentException(workspaceName + " is not the group workspace for group " + groupname);
        }
 

diff --git a/org.argeo.cms.e4/src/org/argeo/cms/e4/jcr/JcrBrowserView.java b/org.argeo.cms.e4/src/org/argeo/cms/e4/jcr/JcrBrowserView.java
index 89a1bf5d1cb42ace23746e8c63de3956a7846bf7..de603a4480138e9d2e57639945108c6869b7183d 100644 (file)
--- a/org.argeo.cms.e4/src/org/argeo/cms/e4/jcr/JcrBrowserView.java
+++ b/org.argeo.cms.e4/src/org/argeo/cms/e4/jcr/JcrBrowserView.java
@@ -115,7 +115,7 @@ public class JcrBrowserView {
                top.setLayout(CmsUiUtils.noSpaceGridLayout());
 
                try {
-                       this.userSession = this.nodeRepository.login(NodeConstants.HOME);
+                       this.userSession = this.nodeRepository.login(NodeConstants.HOME_WORKSPACE);
                } catch (RepositoryException e) {
                        throw new CmsException("Cannot open user session", e);
                }

diff --git a/org.argeo.cms.e4/src/org/argeo/cms/e4/users/GroupEditor.java b/org.argeo.cms.e4/src/org/argeo/cms/e4/users/GroupEditor.java
index 12cc5399972e7dfd76a49d188e45aa7e1b8aec8d..a4d8317b2f4d6d4b669df2a2c363406101f38937 100644 (file)
--- a/org.argeo.cms.e4/src/org/argeo/cms/e4/users/GroupEditor.java
+++ b/org.argeo.cms.e4/src/org/argeo/cms/e4/users/GroupEditor.java
@@ -134,7 +134,7 @@ public class GroupEditor extends AbstractRoleEditor {
        @Override
        protected void createUi(Composite parent) {
                try {
-                       groupsSession = repository.login(NodeConstants.SRV);
+                       groupsSession = repository.login(NodeConstants.SRV_WORKSPACE);
                } catch (RepositoryException e) {
                        throw new CmsException("Cannot retrieve session", e);
                }

diff --git a/org.argeo.cms.ui/src/org/argeo/cms/ui/jcr/NodeContentProvider.java b/org.argeo.cms.ui/src/org/argeo/cms/ui/jcr/NodeContentProvider.java
index 0a662e216026ed82382e0ed28d8036be91c4e25b..5416564efe89ef70d9404806c0563d9959af987a 100644 (file)
--- a/org.argeo.cms.ui/src/org/argeo/cms/ui/jcr/NodeContentProvider.java
+++ b/org.argeo.cms.ui/src/org/argeo/cms/ui/jcr/NodeContentProvider.java
@@ -77,7 +77,7 @@ public class NodeContentProvider implements ITreeContentProvider {
                                if (homeNode != null)
                                        homeNode.dispose();
                                homeNode = new SingleJcrNodeElem(null, userHome,
-                                               userSession.getUserID(), NodeConstants.NODE);
+                                               userSession.getUserID(), NodeConstants.EGO_REPOSITORY);
                        }
                }
                if (repositoryRegister != null) {

diff --git a/org.argeo.cms.ui/src/org/argeo/cms/ui/util/CmsUiUtils.java b/org.argeo.cms.ui/src/org/argeo/cms/ui/util/CmsUiUtils.java
index 316e7859f92d796104e2b58665254cf370e870fe..39df49ebfba4f60689fc59eda53eaf95aedfe317 100644 (file)
--- a/org.argeo.cms.ui/src/org/argeo/cms/ui/util/CmsUiUtils.java
+++ b/org.argeo.cms.ui/src/org/argeo/cms/ui/util/CmsUiUtils.java
@@ -72,7 +72,7 @@ public class CmsUiUtils implements CmsConstants {
 
        /** A path in the node repository */
        public static String getDataPath(Node node) throws RepositoryException {
-               return getDataPath(NodeConstants.NODE, node);
+               return getDataPath(NodeConstants.EGO_REPOSITORY, node);
        }
 
        public static String getDataPath(String cn, Node node) throws RepositoryException {

diff --git a/org.argeo.cms/src/org/argeo/cms/internal/http/LinkServlet.java b/org.argeo.cms/src/org/argeo/cms/internal/http/LinkServlet.java
index f81f26f7a2e2d22fbd298b6ddfdaea06bcdb3a1a..574b09a8f867d24873a6a96457d41b5d28537876 100644 (file)
--- a/org.argeo.cms/src/org/argeo/cms/internal/http/LinkServlet.java
+++ b/org.argeo.cms/src/org/argeo/cms/internal/http/LinkServlet.java
@@ -88,7 +88,7 @@ public class LinkServlet extends HttpServlet {
                                @Override
                                public Session run() throws Exception {
                                        Collection<ServiceReference<Repository>> srs = bc.getServiceReferences(Repository.class,
-                                                       "(" + NodeConstants.CN + "=" + NodeConstants.NODE + ")");
+                                                       "(" + NodeConstants.CN + "=" + NodeConstants.EGO_REPOSITORY + ")");
                                        Repository repository = bc.getService(srs.iterator().next());
                                        return repository.login();
                                }
@@ -196,7 +196,7 @@ public class LinkServlet extends HttpServlet {
        private String getDataUrl(Node node, HttpServletRequest request) throws RepositoryException {
                try {
                        StringBuilder buf = getServerBaseUrl(request);
-                       buf.append(NodeUtils.getDataPath(NodeConstants.NODE, node));
+                       buf.append(NodeUtils.getDataPath(NodeConstants.EGO_REPOSITORY, node));
                        return new URL(buf.toString()).toString();
                } catch (MalformedURLException e) {
                        throw new CmsException("Cannot build data URL for " + node, e);

diff --git a/org.argeo.cms/src/org/argeo/cms/internal/kernel/CmsDeployment.java b/org.argeo.cms/src/org/argeo/cms/internal/kernel/CmsDeployment.java
index b81a81b3b770901a14448f2c8740809981e627b1..34b4dd927aaeeb4deb29128b74d6e06239b05139 100644 (file)
--- a/org.argeo.cms/src/org/argeo/cms/internal/kernel/CmsDeployment.java
+++ b/org.argeo.cms/src/org/argeo/cms/internal/kernel/CmsDeployment.java
@@ -267,7 +267,7 @@ public class CmsDeployment implements NodeDeployment {
                }
 
                // home
-               prepareDataModel(NodeConstants.NODE, deployedNodeRepository);
+               prepareDataModel(NodeConstants.NODE_REPOSITORY, deployedNodeRepository);
        }
 
        private void prepareHomeRepository(RepositoryImpl deployedRepository) {
@@ -285,7 +285,7 @@ public class CmsDeployment implements NodeDeployment {
 
                // Publish home with the highest service ranking
                Hashtable<String, Object> regProps = new Hashtable<>();
-               regProps.put(NodeConstants.CN, NodeConstants.EGO);
+               regProps.put(NodeConstants.CN, NodeConstants.EGO_REPOSITORY);
                regProps.put(Constants.SERVICE_RANKING, Integer.MAX_VALUE);
                Repository egoRepository = new EgoRepository(deployedRepository, false);
                bc.registerService(Repository.class, egoRepository, regProps);
@@ -317,7 +317,7 @@ public class CmsDeployment implements NodeDeployment {
                                BundleWiring wiring = bundle.adapt(BundleWiring.class);
                                if (wiring == null)
                                        continue bundles;
-                               if (NodeConstants.NODE.equals(cn))// process all data models
+                               if (NodeConstants.NODE_REPOSITORY.equals(cn))// process all data models
                                        processWiring(cn, adminSession, wiring, processed, false);
                                else {
                                        List<BundleCapability> capabilities = wiring.getCapabilities(CMS_DATA_MODEL_NAMESPACE);
@@ -395,7 +395,7 @@ public class CmsDeployment implements NodeDeployment {
                boolean publishLocalRepo;
                if (isStandalone && name.equals(cn))// includes the node itself
                        publishLocalRepo = true;
-               else if (!isStandalone && cn.equals(NodeConstants.NODE))
+               else if (!isStandalone && cn.equals(NodeConstants.NODE_REPOSITORY))
                        publishLocalRepo = true;
                else
                        publishLocalRepo = false;
@@ -441,7 +441,7 @@ public class CmsDeployment implements NodeDeployment {
                        RepositoryContext repoContext = bc.getService(reference);
                        String cn = (String) reference.getProperty(NodeConstants.CN);
                        if (cn != null) {
-                               if (cn.equals(NodeConstants.NODE)) {
+                               if (cn.equals(NodeConstants.NODE_REPOSITORY)) {
                                        prepareNodeRepository(repoContext.getRepository());
                                        // TODO separate home repository
                                        prepareHomeRepository(repoContext.getRepository());

diff --git a/org.argeo.cms/src/org/argeo/cms/internal/kernel/CmsFsProvider.java b/org.argeo.cms/src/org/argeo/cms/internal/kernel/CmsFsProvider.java
index dea21a2e7d2d76c6e076b2f785f19859d81001f5..99c219b51040b24652e8c16bccf74b4ad4b6c5d2 100644 (file)
--- a/org.argeo.cms/src/org/argeo/cms/internal/kernel/CmsFsProvider.java
+++ b/org.argeo.cms/src/org/argeo/cms/internal/kernel/CmsFsProvider.java
@@ -58,7 +58,7 @@ public class CmsFsProvider extends AbstractJackrabbitFsProvider {
                                return fileSystem;
                        } else {
                                Repository repository = bc.getService(
-                                               bc.getServiceReferences(Repository.class, "(cn=" + NodeConstants.EGO + ")").iterator().next());
+                                               bc.getServiceReferences(Repository.class, "(cn=" + NodeConstants.EGO_REPOSITORY + ")").iterator().next());
 //                             Session session = repository.login();
                                CmsFileSystem fileSystem = new CmsFileSystem(this, repository);
                                fileSystems.put(username, fileSystem);
@@ -94,7 +94,7 @@ public class CmsFsProvider extends AbstractJackrabbitFsProvider {
 
        public Node getUserHome(Repository repository) {
                try {
-                       Session session = repository.login(NodeConstants.HOME);
+                       Session session = repository.login(NodeConstants.HOME_WORKSPACE);
                        return NodeUtils.getUserHome(session);
                } catch (RepositoryException e) {
                        throw new IllegalStateException("Cannot get user home", e);

diff --git a/org.argeo.cms/src/org/argeo/cms/internal/kernel/CmsInstance.java b/org.argeo.cms/src/org/argeo/cms/internal/kernel/CmsInstance.java
index 1af4095ce268de20a41c3b1feafa96306f330805..311ebadc9849a675c38b7a9d25ced3aea8730cd1 100644 (file)
--- a/org.argeo.cms/src/org/argeo/cms/internal/kernel/CmsInstance.java
+++ b/org.argeo.cms/src/org/argeo/cms/internal/kernel/CmsInstance.java
@@ -29,7 +29,7 @@ public class CmsInstance implements NodeInstance {
                        @Override
                        public Repository addingService(ServiceReference<Repository> reference) {
                                Object cn = reference.getProperty(NodeConstants.CN);
-                               if (cn != null && cn.equals(NodeConstants.EGO)) {
+                               if (cn != null && cn.equals(NodeConstants.EGO_REPOSITORY)) {
                                        egoRepository = (EgoRepository) bc.getService(reference);
                                        if (log.isTraceEnabled())
                                                log.trace("Home repository is available");

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 9d2925948ceef806191c82f9aa508697ad755da3..450b9dba42d1dcfb8ca1d3f21332c166b45ecb9a 100644 (file)
--- a/org.argeo.cms/src/org/argeo/cms/internal/kernel/DeployConfig.java
+++ b/org.argeo.cms/src/org/argeo/cms/internal/kernel/DeployConfig.java
@@ -88,7 +88,7 @@ class DeployConfig implements ConfigurationListener {
 
                // additional repositories
                dataModels: for (DataModels.DataModel dataModel : dataModels.getNonAbstractDataModels()) {
-                       if (NodeConstants.NODE.equals(dataModel.getName()))
+                       if (NodeConstants.NODE_REPOSITORY.equals(dataModel.getName()))
                                continue dataModels;
                        Dictionary<String, Object> config = InitUtils.getRepositoryConfig(dataModel.getName(),
                                        getProps(NodeConstants.NODE_REPOS_FACTORY_PID, dataModel.getName()));

diff --git a/org.argeo.cms/src/org/argeo/cms/internal/kernel/EgoRepository.java b/org.argeo.cms/src/org/argeo/cms/internal/kernel/EgoRepository.java
index 375175bb1b8475ce225ff34dc0bef80e7406e2c6..e23f8d1ac4e970376eacad5c5306cbc2afb0be1a 100644 (file)
--- a/org.argeo.cms/src/org/argeo/cms/internal/kernel/EgoRepository.java
+++ b/org.argeo.cms/src/org/argeo/cms/internal/kernel/EgoRepository.java
@@ -37,15 +37,15 @@ class EgoRepository extends JcrRepositoryWrapper implements KernelConstants {
 
        private SimpleDateFormat usersDatePath = new SimpleDateFormat("YYYY/MM");
 
-       private String defaultHomeWorkspace = NodeConstants.HOME;
-       private String defaultGroupsWorkspace = NodeConstants.SRV;
-//     private String defaultGuestsWorkspace = NodeConstants.GUESTS;
+       private String defaultHomeWorkspace = NodeConstants.HOME_WORKSPACE;
+       private String defaultGroupsWorkspace = NodeConstants.SRV_WORKSPACE;
+//     private String defaultGuestsWorkspace = NodeConstants.GUESTS_WORKSPACE;
        private final boolean remote;
 
        public EgoRepository(Repository repository, boolean remote) {
                super(repository);
                this.remote = remote;
-               putDescriptor(NodeConstants.CN, NodeConstants.EGO);
+               putDescriptor(NodeConstants.CN, NodeConstants.EGO_REPOSITORY);
                if (!remote) {
                        LoginContext lc;
                        try {

diff --git a/org.argeo.cms/src/org/argeo/cms/internal/kernel/InitUtils.java b/org.argeo.cms/src/org/argeo/cms/internal/kernel/InitUtils.java
index 390131aa76b19e5ad9d37258028fb907a1d11ae5..5e18ee6764da150afdc285e591168dec9f09eb3a 100644 (file)
--- a/org.argeo.cms/src/org/argeo/cms/internal/kernel/InitUtils.java
+++ b/org.argeo.cms/src/org/argeo/cms/internal/kernel/InitUtils.java
@@ -42,12 +42,12 @@ class InitUtils {
                        if (value != null)
                                props.put(repoConf.name(), value);
                }
-               props.put(NodeConstants.CN, NodeConstants.NODE);
+               props.put(NodeConstants.CN, NodeConstants.NODE_REPOSITORY);
                return props;
        }
 
        static Dictionary<String, Object> getRepositoryConfig(String dataModelName, Dictionary<String, Object> provided) {
-               if (dataModelName.equals(NodeConstants.NODE) || dataModelName.equals(NodeConstants.EGO))
+               if (dataModelName.equals(NodeConstants.NODE_REPOSITORY) || dataModelName.equals(NodeConstants.EGO_REPOSITORY))
                        throw new IllegalArgumentException("Data model '" + dataModelName + "' is reserved.");
                Dictionary<String, Object> props = provided != null ? provided : new Hashtable<String, Object>();
                for (RepoConf repoConf : RepoConf.values()) {

diff --git a/org.argeo.cms/src/org/argeo/cms/internal/kernel/JackrabbitLocalRepository.java b/org.argeo.cms/src/org/argeo/cms/internal/kernel/JackrabbitLocalRepository.java
index 35575de1da27526725e89bce78fc62868836f03b..61cf11dfd432d4e7f00c9df0940a0ef63f951a82 100644 (file)
--- a/org.argeo.cms/src/org/argeo/cms/internal/kernel/JackrabbitLocalRepository.java
+++ b/org.argeo.cms/src/org/argeo/cms/internal/kernel/JackrabbitLocalRepository.java
@@ -45,7 +45,7 @@ class JackrabbitLocalRepository extends LocalRepository {
        private void addMonitor(String realWorkspaceName) {
                if (realWorkspaceName.equals(SECURITY_WORKSPACE))
                        return;
-               if (!NodeConstants.NODE.equals(getCn()))
+               if (!NodeConstants.NODE_REPOSITORY.equals(getCn()))
                        return;
 
                if (!workspaceMonitors.containsKey(realWorkspaceName)) {

diff --git a/org.argeo.cms/src/org/argeo/cms/internal/kernel/NodeHttp.java b/org.argeo.cms/src/org/argeo/cms/internal/kernel/NodeHttp.java
index ea764c3fb2e400fa08d62c13cc11453a55a65796..c391155d7ceb1bddbc8d41fe01acd697e162f823 100644 (file)
--- a/org.argeo.cms/src/org/argeo/cms/internal/kernel/NodeHttp.java
+++ b/org.argeo.cms/src/org/argeo/cms/internal/kernel/NodeHttp.java
@@ -66,7 +66,7 @@ public class NodeHttp implements KernelConstants {
                try {
                        registerWebdavServlet(httpService, alias, repository);
                        registerRemotingServlet(httpService, alias, repository);
-                       if (NodeConstants.EGO.equals(alias))
+                       if (NodeConstants.EGO_REPOSITORY.equals(alias))
                                registerFilesServlet(httpService, alias, repository);
                        if (log.isTraceEnabled())
                                log.trace("Registered servlets for repository '" + alias + "'");
@@ -81,7 +81,7 @@ public class NodeHttp implements KernelConstants {
                try {
                        httpService.unregister(webdavPath(alias));
                        httpService.unregister(remotingPath(alias));
-                       if (NodeConstants.EGO.equals(alias))
+                       if (NodeConstants.EGO_REPOSITORY.equals(alias))
                                httpService.unregister(filesPath(alias));
                        if (log.isTraceEnabled())
                                log.trace("Unregistered servlets for repository '" + alias + "'");

diff --git a/org.argeo.cms/src/org/argeo/cms/internal/kernel/RepositoryServiceFactory.java b/org.argeo.cms/src/org/argeo/cms/internal/kernel/RepositoryServiceFactory.java
index a06b12bbd1852491de6a6f0f90a43167eabc645b..5189512e48b239bc5dfa820d4b054f345e22ca6e 100644 (file)
--- a/org.argeo.cms/src/org/argeo/cms/internal/kernel/RepositoryServiceFactory.java
+++ b/org.argeo.cms/src/org/argeo/cms/internal/kernel/RepositoryServiceFactory.java
@@ -90,8 +90,8 @@ class RepositoryServiceFactory implements ManagedServiceFactory {
                                        bc.registerService(Repository.class, repository, props);
 
                                        // home
-                                       if (cn.equals(NodeConstants.NODE)) {
-                                               Dictionary<String, Object> homeProps = LangUtils.dico(NodeConstants.CN, NodeConstants.EGO);
+                                       if (cn.equals(NodeConstants.NODE_REPOSITORY)) {
+                                               Dictionary<String, Object> homeProps = LangUtils.dico(NodeConstants.CN, NodeConstants.EGO_REPOSITORY);
                                                EgoRepository homeRepository = new EgoRepository(repository, true);
                                                bc.registerService(Repository.class, homeRepository, homeProps);
                                        }

diff --git a/org.argeo.cms/src/org/argeo/cms/security/JcrKeyring.java b/org.argeo.cms/src/org/argeo/cms/security/JcrKeyring.java
index 45b7c4beb65ffb1b16b1110a04ecc53bfcf96c81..9ba607587e31211f53950c2186faa1c66c59cf57 100644 (file)
--- a/org.argeo.cms/src/org/argeo/cms/security/JcrKeyring.java
+++ b/org.argeo.cms/src/org/argeo/cms/security/JcrKeyring.java
@@ -109,7 +109,7 @@ public class JcrKeyring extends AbstractKeyring implements ArgeoNames {
 
        private Session login() {
                try {
-                       return repository.login(NodeConstants.HOME);
+                       return repository.login(NodeConstants.HOME_WORKSPACE);
                } catch (RepositoryException e) {
                        throw new CmsException("Cannot login key ring session", e);
                }