X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2Finternal%2Fkernel%2FEgoRepository.java;h=c866eaaa2fe0168e44ebca8d95984fba7b455648;hb=d169026cb1939009fd90ac46a11f480cb3d803c0;hp=9c5e5f5f78587bd9954ebfd5eeb5968fc4d66712;hpb=2afabd9e7b225f80b341063e25188314394c9aef;p=lgpl%2Fargeo-commons.git

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 9c5e5f5f7..c866eaaa2 100644
--- a/org.argeo.cms/src/org/argeo/cms/internal/kernel/EgoRepository.java
+++ b/org.argeo.cms/src/org/argeo/cms/internal/kernel/EgoRepository.java
@@ -17,11 +17,12 @@ import javax.naming.ldap.LdapName;
 import javax.security.auth.Subject;
 import javax.security.auth.login.LoginContext;
 
+import org.argeo.api.NodeConstants;
+import org.argeo.api.NodeUtils;
 import org.argeo.cms.CmsException;
+import org.argeo.jcr.JcrException;
 import org.argeo.jcr.JcrRepositoryWrapper;
 import org.argeo.jcr.JcrUtils;
-import org.argeo.node.NodeConstants;
-import org.argeo.node.NodeUtils;
 
 /**
  * Make sure each user has a home directory available.
@@ -37,22 +38,22 @@ 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 {
 				lc = new LoginContext(NodeConstants.LOGIN_CONTEXT_DATA_ADMIN);
 				lc.login();
 			} catch (javax.security.auth.login.LoginException e1) {
-				throw new CmsException("Cannot login as systrem", e1);
+				throw new IllegalStateException("Cannot login as system", e1);
 			}
 			Subject.doAs(lc.getSubject(), new PrivilegedAction<Void>() {
 
@@ -75,7 +76,7 @@ class EgoRepository extends JcrRepositoryWrapper implements KernelConstants {
 
 //			initJcr(adminSession);
 		} catch (RepositoryException e) {
-			throw new CmsException("Cannot init JCR home", e);
+			throw new JcrException("Cannot init JCR home", e);
 		} finally {
 			JcrUtils.logoutQuietly(adminSession);
 		}
@@ -185,7 +186,7 @@ class EgoRepository extends JcrRepositoryWrapper implements KernelConstants {
 				adminSession.save();
 		} catch (RepositoryException e) {
 			JcrUtils.discardQuietly(adminSession);
-			throw new CmsException("Cannot sync node security model for " + username, e);
+			throw new JcrException("Cannot sync node security model for " + username, e);
 		}
 	}