Work on modular distributions - change lazy init policies, add observer on the catego...

[gpl/argeo-slc.git] / plugins / org.argeo.slc.client.ui.dist / src / main / java / org / argeo / slc / client / ui / dist / commands / NormalizeDistribution.java

diff --git a/plugins/org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/commands/NormalizeDistribution.java b/plugins/org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/commands/NormalizeDistribution.java
index 433d7b67f29b0d876e22cb917fe3378c08f1a8fc..a01cd7e51f2e8f804cfe2b20e1f18f0a3a348aa5 100644 (file)
--- a/plugins/org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/commands/NormalizeDistribution.java
+++ b/plugins/org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/commands/NormalizeDistribution.java
@@ -16,11 +16,13 @@
 package org.argeo.slc.client.ui.dist.commands;
 
 import javax.jcr.Binary;
+import javax.jcr.Credentials;
 import javax.jcr.Node;
 import javax.jcr.NodeIterator;
 import javax.jcr.Property;
 import javax.jcr.Repository;
 import javax.jcr.RepositoryException;
+import javax.jcr.RepositoryFactory;
 import javax.jcr.Session;
 import javax.jcr.nodetype.NodeType;
 import javax.jcr.query.Query;
@@ -40,9 +42,11 @@ import org.argeo.slc.jcr.SlcNames;
 import org.argeo.slc.jcr.SlcTypes;
 import org.argeo.slc.repo.ArtifactIndexer;
 import org.argeo.slc.repo.JarFileIndexer;
+import org.argeo.slc.repo.RepoConstants;
 import org.argeo.slc.repo.RepoUtils;
 import org.argeo.slc.repo.maven.MavenConventionsUtils;
 import org.argeo.slc.repo.osgi.NormalizeGroup;
+import org.argeo.util.security.Keyring;
 import org.eclipse.core.commands.AbstractHandler;
 import org.eclipse.core.commands.ExecutionEvent;
 import org.eclipse.core.commands.ExecutionException;
@@ -53,6 +57,7 @@ import org.eclipse.core.runtime.jobs.Job;
 import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.dialogs.IMessageProvider;
 import org.eclipse.jface.dialogs.TitleAreaDialog;
+import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.graphics.Point;
 import org.eclipse.swt.layout.GridData;
@@ -67,41 +72,62 @@ import org.eclipse.ui.handlers.HandlerUtil;
 import org.sonatype.aether.artifact.Artifact;
 import org.sonatype.aether.util.artifact.DefaultArtifact;
 
-/** Make sure than Maven and OSGi metadata are consistent */
+/** Legacy - Make sure than Maven and OSGi metadata are consistent */
 public class NormalizeDistribution extends AbstractHandler implements SlcNames {
-       public final static String ID = DistPlugin.ID + ".normalizeDistribution";
-       public final static String PARAM_WORKSPACE = "workspace";
-       public final static String DEFAULT_LABEL = "Normalize...";
-       public final static String DEFAULT_ICON_PATH = "icons/normalize.gif";
-
        private final static Log log = LogFactory
                        .getLog(NormalizeDistribution.class);
 
-       private Repository repository;
-       private String artifactBasePath = "/";
+       public final static String ID = DistPlugin.ID + ".normalizeDistribution";
+       public final static String DEFAULT_LABEL = "Legacy Normalization...";
+       public final static ImageDescriptor DEFAULT_ICON = DistPlugin
+                       .getImageDescriptor("icons/normalize.gif");
+
+       public final static String PARAM_WORKSPACE_NAME = "workspaceName";
+       public final static String PARAM_TARGET_REPO_PATH = "targetRepoPath";
+
+       private String artifactBasePath = RepoConstants.DEFAULT_ARTIFACTS_BASE_PATH;
 
        private ArtifactIndexer artifactIndexer = new ArtifactIndexer();
        private JarFileIndexer jarFileIndexer = new JarFileIndexer();
 
+       // DEPENDENCY INJECTION
+       private RepositoryFactory repositoryFactory;
+       private Keyring keyring;
+       private Repository nodeRepository;
+
        public Object execute(ExecutionEvent event) throws ExecutionException {
-               String workspace = event.getParameter(PARAM_WORKSPACE);
-               NormalizationDialog dialog = new NormalizationDialog(
-                               HandlerUtil.getActiveShell(event));
-               if (dialog.open() != Dialog.OK)
-                       return null;
 
-               String version = dialog.getVersion();
-               Boolean overridePoms = dialog.getOverridePoms();
+               String targetRepoPath = event.getParameter(PARAM_TARGET_REPO_PATH);
+               String wkspName = event.getParameter(PARAM_WORKSPACE_NAME);
 
+               Session nodeSession = null;
                NormalizeJob job;
                try {
-                       job = new NormalizeJob(repository.login(workspace), version,
-                                       overridePoms);
+
+                       NormalizationDialog dialog = new NormalizationDialog(
+                                       HandlerUtil.getActiveShell(event));
+                       if (dialog.open() != Dialog.OK)
+                               return null;
+
+                       nodeSession = nodeRepository.login();
+                       Node repoNode = nodeSession.getNode(targetRepoPath);
+                       Repository repository = RepoUtils.getRepository(repositoryFactory,
+                                       keyring, repoNode);
+                       Credentials credentials = RepoUtils.getRepositoryCredentials(
+                                       keyring, repoNode);
+
+                       String version = dialog.getVersion();
+                       Boolean overridePoms = dialog.getOverridePoms();
+
+                       job = new NormalizeJob(repository.login(credentials, wkspName),
+                                       version, overridePoms);
+                       job.setUser(true);
+                       job.schedule();
                } catch (RepositoryException e) {
-                       throw new SlcException("Cannot normalize " + workspace, e);
+                       throw new SlcException("Cannot normalize " + wkspName, e);
+               } finally {
+                       JcrUtils.logoutQuietly(nodeSession);
                }
-               job.setUser(true);
-               job.schedule();
                return null;
        }
 
@@ -163,10 +189,6 @@ public class NormalizeDistribution extends AbstractHandler implements SlcNames {
 
        }
 
-       public void setRepository(Repository repository) {
-               this.repository = repository;
-       }
-
        private class NormalizeJob extends Job {
                private Session session;
                private String version;
@@ -348,4 +370,17 @@ public class NormalizeDistribution extends AbstractHandler implements SlcNames {
                }
 
        }
-}
+
+       /* DEPENDENCY INJECTION */
+       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