X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=plugins%2Forg.argeo.slc.client.ui.dist%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fslc%2Fclient%2Fui%2Fdist%2Fcommands%2FCreateWorkspace.java;h=681e0fed79dd586dd9075d99108ab4e5b34556ca;hb=460cb0f2be7a8fa92ee6f22564b42a25aac5de4b;hp=3e197b07031e17df888e317d3bb10a4ba3bf244e;hpb=58e0e18d64a2080680a9f8397b0dfa2894519910;p=gpl%2Fargeo-slc.git

diff --git a/plugins/org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/commands/CreateWorkspace.java b/plugins/org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/commands/CreateWorkspace.java
index 3e197b070..681e0fed7 100644
--- a/plugins/org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/commands/CreateWorkspace.java
+++ b/plugins/org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/commands/CreateWorkspace.java
@@ -15,62 +15,135 @@
  */
 package org.argeo.slc.client.ui.dist.commands;
 
+import javax.jcr.Credentials;
+import javax.jcr.Node;
 import javax.jcr.Repository;
 import javax.jcr.RepositoryException;
+import javax.jcr.RepositoryFactory;
 import javax.jcr.Session;
+import javax.jcr.security.Privilege;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.argeo.ArgeoException;
+import org.argeo.eclipse.ui.ErrorFeedback;
+import org.argeo.jcr.JcrUtils;
+import org.argeo.slc.SlcConstants;
 import org.argeo.slc.client.ui.dist.DistPlugin;
 import org.argeo.slc.client.ui.dist.utils.CommandHelpers;
+import org.argeo.slc.repo.RepoUtils;
+import org.argeo.util.security.Keyring;
 import org.eclipse.core.commands.AbstractHandler;
 import org.eclipse.core.commands.ExecutionEvent;
 import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.dialogs.InputDialog;
-import org.eclipse.ui.IWorkbenchWindow;
+import org.eclipse.jface.resource.ImageDescriptor;
+import org.eclipse.ui.handlers.HandlerUtil;
 
 /**
  * Create a new empty workspace in the current repository.
  */
-
 public class CreateWorkspace extends AbstractHandler {
 	private static final Log log = LogFactory.getLog(CreateWorkspace.class);
+
+	// Exposes commands meta-info
 	public final static String ID = DistPlugin.ID + ".createWorkspace";
-	public final static String DEFAULT_LABEL = "Create new workspace";
-	public final static String DEFAULT_ICON_PATH = "icons/addItem.gif";
+	public final static String DEFAULT_LABEL = "Create workspace...";
+	public final static ImageDescriptor DEFAULT_ICON = DistPlugin
+			.getImageDescriptor("icons/addItem.gif");
 
-	/* DEPENDENCY INJECTION */
-	private Repository repository;
+	// Parameters
+	public final static String PARAM_TARGET_REPO_PATH = "targetRepoPath";
+	public final static String PARAM_WORKSPACE_PREFIX = "workspacePrefix";
+
+	// DEPENDENCY INJECTION
+	private RepositoryFactory repositoryFactory;
+	private Keyring keyring;
+	private Repository nodeRepository;
 
 	public Object execute(ExecutionEvent event) throws ExecutionException {
-		IWorkbenchWindow iww = DistPlugin.getDefault().getWorkbench()
-				.getActiveWorkbenchWindow();
-		// TODO : add an input validator
-		InputDialog inputDialog = new InputDialog(iww.getShell(),
-				"New workspace", "Choose a name for the workspace to create",
-				"", null);
-		inputDialog.open();
-		String workspaceName = inputDialog.getValue();
+
+		String targetRepoPath = event.getParameter(PARAM_TARGET_REPO_PATH);
+		String prefix = event.getParameter(PARAM_WORKSPACE_PREFIX);
+
+		Session nodeSession = null;
 		Session session = null;
 		try {
-			session = repository.login();
+			nodeSession = nodeRepository.login();
+			Node repoNode = nodeSession.getNode(targetRepoPath);
+			Repository repository = RepoUtils.getRepository(repositoryFactory,
+					keyring, repoNode);
+			Credentials credentials = RepoUtils.getRepositoryCredentials(
+					keyring, repoNode);
+
+			// TODO : add an input validator
+			InputDialog inputDialog = new InputDialog(HandlerUtil
+					.getActiveWorkbenchWindow(event).getShell(),
+					"Workspace name?",
+					"Choose a name for the workspace to create",
+					prefix == null ? "" : prefix + "_", null);
+			int result = inputDialog.open();
+
+			String enteredName = inputDialog.getValue();
+
+			final String legalChars = "ABCDEFGHIJKLMNOPQRSTUVWXZY0123456789_";
+			char[] arr = enteredName.toUpperCase().toCharArray();
+			int count = 0;
+			for (int i = 0; i < arr.length; i++) {
+				if (legalChars.indexOf(arr[i]) == -1)
+					count = count + 7;
+				else
+					count++;
+			}
+
+			if (log.isDebugEnabled())
+				log.debug("Count " + count);
+
+			if (count > 60) {
+				ErrorFeedback.show("Workspace name '" + enteredName
+						+ "' is too long or contains"
+						+ " too many special characters such as '.' or '-'.");
+				return null;
+			}
+
+			String workspaceName = enteredName;
+
+			// Canceled by user
+			if (result == Dialog.CANCEL || workspaceName == null
+					|| "".equals(workspaceName.trim()))
+				return null;
+
+			session = repository.login(credentials);
 			session.getWorkspace().createWorkspace(workspaceName);
+			JcrUtils.logoutQuietly(session);
+			// init new workspace
+			session = repository.login(credentials, workspaceName);
+			JcrUtils.addPrivilege(session, "/", SlcConstants.ROLE_SLC,
+					Privilege.JCR_ALL);
 			CommandHelpers.callCommand(RefreshDistributionsView.ID);
+			if (log.isTraceEnabled())
+				log.trace("WORKSPACE " + workspaceName + " CREATED");
+
 		} catch (RepositoryException re) {
-			throw new ArgeoException(
+			ErrorFeedback.show(
 					"Unexpected error while creating the new workspace.", re);
 		} finally {
-			if (session != null)
-				session.logout();
+			JcrUtils.logoutQuietly(session);
+			JcrUtils.logoutQuietly(nodeSession);
 		}
-		if (log.isTraceEnabled())
-			log.debug("WORKSPACE " + workspaceName + " CREATED");
 		return null;
 	}
 
 	/* DEPENDENCY INJECTION */
-	public void setRepository(Repository repository) {
-		this.repository = repository;
+	public void setNodeRepository(Repository nodeRepository) {
+		this.nodeRepository = nodeRepository;
+	}
+
+	public void setRepositoryFactory(RepositoryFactory repositoryFactory) {
+		this.repositoryFactory = repositoryFactory;
+	}
+
+	public void setKeyring(Keyring keyring) {
+		this.keyring = keyring;
 	}
 }
\ No newline at end of file