From e687e711998015552b9caa1eeb36033f673e853b Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Fri, 10 Feb 2012 18:41:46 +0000 Subject: [PATCH] Use prefixes for system nodes git-svn-id: https://svn.argeo.org/commons/trunk@5039 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc --- .../main/java/org/argeo/jackrabbit/JackrabbitContainer.java | 2 ++ .../src/main/java/org/argeo/jcr/ArgeoJcrConstants.java | 6 +++--- .../src/main/java/org/argeo/jcr/ArgeoNames.java | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) 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 9f3fdf186..d5e6bb9dd 100644 --- 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 366a1ef63..cc2de8a76 100644 --- 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 9f19fef85..ca19072b7 100644 --- 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"; -- 2.30.2