import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.argeo.ArgeoMonitor;
-import org.argeo.eclipse.ui.EclipseArgeoMonitor;
+import org.argeo.eclipse.ui.EclipseJcrMonitor;
+import org.argeo.jcr.JcrMonitor;
import org.argeo.jcr.JcrUtils;
+import org.argeo.node.security.Keyring;
import org.argeo.slc.NameVersion;
import org.argeo.slc.SlcException;
import org.argeo.slc.aether.AetherUtils;
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.aether.artifact.Artifact;
+import org.eclipse.aether.artifact.DefaultArtifact;
import org.eclipse.core.commands.AbstractHandler;
import org.eclipse.core.commands.ExecutionEvent;
import org.eclipse.core.commands.ExecutionException;
import org.eclipse.swt.widgets.Shell;
import org.eclipse.swt.widgets.Text;
import org.eclipse.ui.handlers.HandlerUtil;
-import org.eclipse.aether.artifact.Artifact;
-import org.eclipse.aether.artifact.DefaultArtifact;
/** Legacy - Make sure than Maven and OSGi metadata are consistent */
public class NormalizeDistribution extends AbstractHandler implements SlcNames {
private final static Log log = LogFactory
.getLog(NormalizeDistribution.class);
- public final static String ID = DistPlugin.ID + ".normalizeDistribution";
+ public final static String ID = DistPlugin.PLUGIN_ID
+ + ".normalizeDistribution";
public final static String DEFAULT_LABEL = "Legacy Normalization...";
public final static ImageDescriptor DEFAULT_ICON = DistPlugin
.getImageDescriptor("icons/normalize.gif");
protected IStatus run(IProgressMonitor progressMonitor) {
try {
- ArgeoMonitor monitor = new EclipseArgeoMonitor(progressMonitor);
+ JcrMonitor monitor = new EclipseJcrMonitor(progressMonitor);
// normalize artifacts
Query countQuery = session
.getWorkspace()
overridePoms, monitor);
}
} catch (Exception e) {
- return new Status(IStatus.ERROR, DistPlugin.ID,
+ return new Status(IStatus.ERROR, DistPlugin.PLUGIN_ID,
"Cannot normalize distribution "
+ session.getWorkspace().getName(), e);
} finally {
}
private class NormalizingTraverser extends TraversingItemVisitor {
- ArgeoMonitor monitor;
+ JcrMonitor monitor;
- public NormalizingTraverser(ArgeoMonitor monitor) {
+ public NormalizingTraverser(JcrMonitor monitor) {
super();
this.monitor = monitor;
}
}
public class NormalizationDialog extends TitleAreaDialog {
+ private static final long serialVersionUID = -3103886455862638580L;
+
private Text versionT;
private String version;
private Button overridePomsC;