Use prefixes for system nodes

git-svn-id: https://svn.argeo.org/commons/trunk@5039 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc

diff --git a/server/runtime/org.argeo.server.jackrabbit/src/main/java/org/argeo/jackrabbit/JackrabbitContainer.java b/server/runtime/org.argeo.server.jackrabbit/src/main/java/org/argeo/jackrabbit/JackrabbitContainer.java
index 9f3fdf1867cafe4442e890abeb3adb2fe2f5ab6f..d5e6bb9dd3ee3ad353d911e69eb683375c653d1d 100644 (file)
--- a/server/runtime/org.argeo.server.jackrabbit/src/main/java/org/argeo/jackrabbit/JackrabbitContainer.java
+++ b/server/runtime/org.argeo.server.jackrabbit/src/main/java/org/argeo/jackrabbit/JackrabbitContainer.java
@@ -190,6 +190,8 @@ public class JackrabbitContainer extends JackrabbitWrapper {
                                }
 
                                // check existing data model nodes
+                               new NamespaceHelper(session).registerNamespace(
+                                               ArgeoNames.ARGEO, ArgeoNames.ARGEO_NAMESPACE);
                                if (!session
                                                .itemExists(ArgeoJcrConstants.DATA_MODELS_BASE_PATH))
                                        JcrUtils.mkdirs(session,

diff --git a/server/runtime/org.argeo.server.jcr/src/main/java/org/argeo/jcr/ArgeoJcrConstants.java b/server/runtime/org.argeo.server.jcr/src/main/java/org/argeo/jcr/ArgeoJcrConstants.java
index 366a1ef6339d714b12a33db18dc71db20f187c15..cc2de8a7687b50e3ef80405bc28008daad157929 100644 (file)
--- a/server/runtime/org.argeo.server.jcr/src/main/java/org/argeo/jcr/ArgeoJcrConstants.java
+++ b/server/runtime/org.argeo.server.jcr/src/main/java/org/argeo/jcr/ArgeoJcrConstants.java
@@ -2,11 +2,11 @@ package org.argeo.jcr;
 
 /** JCR related constants */
 public interface ArgeoJcrConstants {
-       public final static String ARGEO_BASE_PATH = "/argeo";
+       public final static String ARGEO_BASE_PATH = "/argeo:system";
        public final static String DATA_MODELS_BASE_PATH = ARGEO_BASE_PATH
-                       + "/dataModels";
+                       + "/argeo:dataModels";
        /** The home base path. Not yet configurable */
-       public final static String DEFAULT_HOME_BASE_PATH = "/home";
+       public final static String DEFAULT_HOME_BASE_PATH = "/argeo:home";
 
        // parameters (typically for call to a RepositoryFactory)
        public final static String JCR_REPOSITORY_ALIAS = "argeo.jcr.repository.alias";

diff --git a/server/runtime/org.argeo.server.jcr/src/main/java/org/argeo/jcr/ArgeoNames.java b/server/runtime/org.argeo.server.jcr/src/main/java/org/argeo/jcr/ArgeoNames.java
index 9f19fef857460ae68edb652c10f2ca0f7e960f94..ca19072b7c8e1c43b5051274c9d0e6a28d0376e3 100644 (file)
--- a/server/runtime/org.argeo.server.jcr/src/main/java/org/argeo/jcr/ArgeoNames.java
+++ b/server/runtime/org.argeo.server.jcr/src/main/java/org/argeo/jcr/ArgeoNames.java
@@ -3,7 +3,7 @@ package org.argeo.jcr;
 /** JCR names in the http://www.argeo.org/argeo namespace */
 public interface ArgeoNames {
        public final static String ARGEO_NAMESPACE = "http://www.argeo.org/ns/argeo";
-       public final static String ARGEO_ = "argeo:";
+       public final static String ARGEO = "argeo";
 
        public final static String ARGEO_URI = "argeo:uri";
        public final static String ARGEO_USER_ID = "argeo:userID";