X-Git-Url: https://git.argeo.org/?p=gpl%2Fargeo-suite.git;a=blobdiff_plain;f=org.argeo.suite.core%2Fsrc%2Forg%2Fargeo%2Fsuite%2Fcore%2FDefaultSuiteMaintenanceService.java;h=1c9feb210cdbb663df17301c6e3264211c3cb112;hp=d0a04684a61ba29e81a3de411aa73d2322279a35;hb=5bbce644be337f1ad9916c23dba141ad1f38b3ba;hpb=be7cb3f18ce76bde064cbbc2a38de6386f3498d2

diff --git a/org.argeo.suite.core/src/org/argeo/suite/core/DefaultSuiteMaintenanceService.java b/org.argeo.suite.core/src/org/argeo/suite/core/DefaultSuiteMaintenanceService.java
index d0a0468..1c9feb2 100644
--- a/org.argeo.suite.core/src/org/argeo/suite/core/DefaultSuiteMaintenanceService.java
+++ b/org.argeo.suite.core/src/org/argeo/suite/core/DefaultSuiteMaintenanceService.java
@@ -11,13 +11,14 @@ import javax.jcr.security.Privilege;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.argeo.connect.AppMaintenanceService;
+import org.argeo.connect.SystemMaintenanceService;
 import org.argeo.jcr.JcrUtils;
 import org.argeo.node.NodeConstants;
 import org.argeo.suite.ArgeoSuiteRole;
 import org.argeo.suite.SuiteException;
 
 /** Make the DJay-ing to provide a full running Suite platform */
-public class DefaultSuiteMaintenanceService implements AppMaintenanceService {
+public class DefaultSuiteMaintenanceService implements SystemMaintenanceService {
 	private final static Log log = LogFactory.getLog(DefaultSuiteMaintenanceService.class);
 
 	/* DEPENDENCY INJECTION */
@@ -39,9 +40,8 @@ public class DefaultSuiteMaintenanceService implements AppMaintenanceService {
 		}
 	}
 
-	// TODO Hard-coded model initialisation
 	// To be cleaned once first init and config mechanisms have been implemented
-	private final static String publicPath = "/public";
+	// private final static String publicPath = "/public";
 	// FIXME Users must have read access on the jcr:system/jcr:versionStorage
 	// node under JackRabbit to be able to manage versions
 	private final static String jackRabbitVersionSystemPath = "/jcr:system";
@@ -50,7 +50,7 @@ public class DefaultSuiteMaintenanceService implements AppMaintenanceService {
 	public boolean prepareJcrTree(Session session) {
 		boolean hasCHanged = false;
 		try {
-			JcrUtils.mkdirs(session, publicPath, NodeType.NT_UNSTRUCTURED);
+			// JcrUtils.mkdirs(session, publicPath, NodeType.NT_UNSTRUCTURED);
 			if (session.hasPendingChanges()) {
 				session.save();
 				hasCHanged = true;
@@ -75,9 +75,9 @@ public class DefaultSuiteMaintenanceService implements AppMaintenanceService {
 					Privilege.JCR_READ);
 			// Default configuration of the workspace
 			JcrUtils.addPrivilege(session, "/", NodeConstants.ROLE_ADMIN, Privilege.JCR_ALL);
-			JcrUtils.addPrivilege(session, publicPath, NodeConstants.ROLE_USER, Privilege.JCR_READ);
-			JcrUtils.addPrivilege(session, publicPath, "anonymous", Privilege.JCR_READ);
-			JcrUtils.addPrivilege(session, publicPath, NodeConstants.ROLE_ANONYMOUS, Privilege.JCR_READ);
+			// JcrUtils.addPrivilege(session, publicPath, NodeConstants.ROLE_USER, Privilege.JCR_READ);
+			// JcrUtils.addPrivilege(session, publicPath, "anonymous", Privilege.JCR_READ);
+			// JcrUtils.addPrivilege(session, publicPath, NodeConstants.ROLE_ANONYMOUS, Privilege.JCR_READ);
 
 			session.save();
 		} catch (RepositoryException e) {