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%2FCopyWorkspace.java;h=e1398b7700901ecd842fa1d7af1fe0e42eb71b70;hb=524221f25edad4b09aac22555450164e587b304a;hp=72b5a75035045945845ae62190976de00954ef65;hpb=0d236262a853a1286b317c30d64d4692bc21c7a4;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/CopyWorkspace.java b/plugins/org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/commands/CopyWorkspace.java index 72b5a7503..e1398b770 100644 --- a/plugins/org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/commands/CopyWorkspace.java +++ b/plugins/org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/commands/CopyWorkspace.java @@ -23,16 +23,30 @@ 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.ArgeoMonitor; +import org.argeo.eclipse.ui.EclipseArgeoMonitor; 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.PrivilegedJob; 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.core.runtime.IProgressMonitor; +import org.eclipse.core.runtime.IStatus; +import org.eclipse.core.runtime.Status; +import org.eclipse.core.runtime.jobs.Job; +import org.eclipse.jface.dialogs.ErrorDialog; import org.eclipse.jface.dialogs.InputDialog; +import org.eclipse.jface.resource.ImageDescriptor; +import org.eclipse.jface.window.Window; +import org.eclipse.swt.widgets.Display; import org.eclipse.ui.handlers.HandlerUtil; /** @@ -40,65 +54,179 @@ import org.eclipse.ui.handlers.HandlerUtil; */ public class CopyWorkspace extends AbstractHandler { - // private static final Log log = LogFactory.getLog(CopyWorkspace.class); + private static final Log log = LogFactory.getLog(CopyWorkspace.class); + public final static String ID = DistPlugin.ID + ".copyWorkspace"; - public final static String DEFAULT_LABEL = "Duplicate"; + public final static String DEFAULT_LABEL = "Duplicate..."; public final static String PARAM_SOURCE_WORKSPACE_NAME = "srcWkspName"; public final static String PARAM_TARGET_REPO_PATH = "targetRepoPath"; - public final static String DEFAULT_ICON_PATH = "icons/addItem.gif"; + public final static ImageDescriptor DEFAULT_ICON = DistPlugin + .getImageDescriptor("icons/addItem.gif"); // DEPENDENCY INJECTION private RepositoryFactory repositoryFactory; private Keyring keyring; private Repository nodeRepository; - private String slcRole = "ROLE_SLC"; - public Object execute(ExecutionEvent event) throws ExecutionException { String targetRepoPath = event.getParameter(PARAM_TARGET_REPO_PATH); String wkspName = event.getParameter(PARAM_SOURCE_WORKSPACE_NAME); - Session nodeSession = null; - Session srcSession = null; - Session newSession = null; - try { - nodeSession = nodeRepository.login(); - Node repoNode = nodeSession.getNode(targetRepoPath); - Repository repository = RepoUtils.getRepository(repositoryFactory, - keyring, repoNode); - Credentials credentials = RepoUtils.getRepositoryCredentials( - keyring, repoNode); - - InputDialog inputDialog = new InputDialog(HandlerUtil - .getActiveWorkbenchWindow(event).getShell(), - "New copy of workspace " + wkspName, - "Choose a name for the workspace to create", "", null); - inputDialog.open(); + InputDialog inputDialog = new InputDialog(HandlerUtil + .getActiveWorkbenchWindow(event).getShell(), + "New copy of workspace " + wkspName, + "Choose a name for the workspace to create", "", null); + int result = inputDialog.open(); + if (result == Window.OK) { String newWorkspaceName = inputDialog.getValue(); - srcSession = repository.login(credentials, wkspName); - - // Create the workspace - srcSession.getWorkspace().createWorkspace(newWorkspaceName); - Node srcRootNode = srcSession.getRootNode(); - // log in the newly created workspace - newSession = repository.login(credentials, newWorkspaceName); - Node newRootNode = newSession.getRootNode(); - RepoUtils.copy(srcRootNode, newRootNode); - newSession.save(); - JcrUtils.addPrivilege(newSession, "/", slcRole, Privilege.JCR_ALL); - CommandHelpers.callCommand(RefreshDistributionsView.ID); - } catch (RepositoryException re) { - throw new ArgeoException( - "Unexpected error while creating the new workspace.", re); - } finally { - JcrUtils.logoutQuietly(newSession); - JcrUtils.logoutQuietly(srcSession); - JcrUtils.logoutQuietly(nodeSession); + + if (newWorkspaceName == null || newWorkspaceName.trim().equals("") + || newWorkspaceName.trim().equals(wkspName.trim())) { + ErrorDialog + .openError(HandlerUtil.getActiveShell(event), + "Non valid workspace name", newWorkspaceName + + " is not a valid workspace name.", + new Status(IStatus.ERROR, "not valid", 0, + "Error", null)); + return null; + } + Job copyWkspJob = new CopyWkspJob(repositoryFactory, keyring, + nodeRepository, targetRepoPath, wkspName, newWorkspaceName, + HandlerUtil.getActiveWorkbenchWindow(event).getShell() + .getDisplay()); + copyWkspJob.setUser(true); + copyWkspJob.schedule(); } + + // Session nodeSession = null; + // Session srcSession = null; + // Session newSession = null; + // try { + // nodeSession = nodeRepository.login(); + // Node repoNode = nodeSession.getNode(targetRepoPath); + // Repository repository = RepoUtils.getRepository(repositoryFactory, + // keyring, repoNode); + // Credentials credentials = RepoUtils.getRepositoryCredentials( + // keyring, repoNode); + // + // InputDialog inputDialog = new InputDialog(HandlerUtil + // .getActiveWorkbenchWindow(event).getShell(), + // "New copy of workspace " + wkspName, + // "Choose a name for the workspace to create", "", null); + // int result = inputDialog.open(); + // if (result == Window.OK) { + // String newWorkspaceName = inputDialog.getValue(); + // srcSession = repository.login(credentials, wkspName); + // + // // Create the workspace + // srcSession.getWorkspace().createWorkspace(newWorkspaceName); + // Node srcRootNode = srcSession.getRootNode(); + // // log in the newly created workspace + // newSession = repository.login(credentials, newWorkspaceName); + // Node newRootNode = newSession.getRootNode(); + // RepoUtils.copy(srcRootNode, newRootNode); + // newSession.save(); + // JcrUtils.addPrivilege(newSession, "/", SlcConstants.ROLE_SLC, + // Privilege.JCR_ALL); + // CommandHelpers.callCommand(RefreshDistributionsView.ID); + // } + // } catch (RepositoryException re) { + // throw new ArgeoException( + // "Unexpected error while creating the new workspace.", re); + // } finally { + // JcrUtils.logoutQuietly(newSession); + // JcrUtils.logoutQuietly(srcSession); + // JcrUtils.logoutQuietly(nodeSession); + // } return null; } + private static class CopyWkspJob extends PrivilegedJob { + + private RepositoryFactory repositoryFactory; + private Keyring keyring; + private Repository localRepository; + private String targetRepoPath; + private String srcWkspName; + private String targetWkspName; + private Display display; + + public CopyWkspJob(RepositoryFactory repositoryFactory, + Keyring keyring, Repository localRepository, + String targetRepoPath, String srcWkspName, + String targetWkspName, Display display) { + super("Duplicate workspace"); + this.repositoryFactory = repositoryFactory; + this.keyring = keyring; + this.localRepository = localRepository; + this.targetRepoPath = targetRepoPath; + this.srcWkspName = srcWkspName; + this.targetWkspName = targetWkspName; + this.display = display; + } + + @Override + protected IStatus doRun(IProgressMonitor progressMonitor) { + long begin = System.currentTimeMillis(); + + ArgeoMonitor monitor = new EclipseArgeoMonitor(progressMonitor); + monitor.beginTask("Copy workspace", -1); + monitor.subTask("Copying nodes"); + + Session nodeSession = null; + Session srcSession = null; + Session newSession = null; + try { + nodeSession = localRepository.login(); + Node repoNode = nodeSession.getNode(targetRepoPath); + Repository repository = RepoUtils.getRepository( + repositoryFactory, keyring, repoNode); + Credentials credentials = RepoUtils.getRepositoryCredentials( + keyring, repoNode); + + srcSession = repository.login(credentials, srcWkspName); + + // Create the workspace + srcSession.getWorkspace().createWorkspace(targetWkspName); + Node srcRootNode = srcSession.getRootNode(); + // log in the newly created workspace + newSession = repository.login(credentials, targetWkspName); + Node newRootNode = newSession.getRootNode(); + RepoUtils.copy(srcRootNode, newRootNode); + newSession.save(); + JcrUtils.addPrivilege(newSession, "/", SlcConstants.ROLE_SLC, + Privilege.JCR_ALL); + + display.asyncExec(new Runnable() { + public void run() { + CommandHelpers.callCommand(RefreshDistributionsView.ID); + } + }); + monitor.worked(1); + + } catch (RepositoryException re) { + throw new ArgeoException( + "Unexpected error while creating the new workspace.", + re); + } finally { + JcrUtils.logoutQuietly(newSession); + JcrUtils.logoutQuietly(srcSession); + JcrUtils.logoutQuietly(nodeSession); + } + + monitor.done(); + long duration = (System.currentTimeMillis() - begin) / 1000;// in + // s + if (log.isDebugEnabled()) + log.debug("Created workspace " + targetWkspName + " in " + + (duration / 60) + "min " + (duration % 60) + "s"); + return Status.OK_STATUS; + } + + + } + /* DEPENDENCY INJECTION */ public void setNodeRepository(Repository nodeRepository) { this.nodeRepository = nodeRepository;