Adapt refactoring (remove APIs from argeo.util)

git-svn-id: https://svn.argeo.org/slc/trunk@9167 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc

diff --git a/org.argeo.slc.client.rap/META-INF/spring/osgi.xml b/org.argeo.slc.client.rap/META-INF/spring/osgi.xml
index 557350b8e4a7f3d6ec6705d55b57bb34fe8aa94f..96cd21505a56fc0fc695b3e7d40e5a37649d202c 100644 (file)
--- a/org.argeo.slc.client.rap/META-INF/spring/osgi.xml
+++ b/org.argeo.slc.client.rap/META-INF/spring/osgi.xml
@@ -14,6 +14,6 @@
                filter="(argeo.jcr.repository.alias=node)" />\r
 \r
        <reference id="repositoryFactory" interface="javax.jcr.RepositoryFactory" />\r
-       <reference id="keyring" interface="org.argeo.util.security.CryptoKeyring" />\r
+       <reference id="keyring" interface="org.argeo.node.security.CryptoKeyring" />\r
 \r
 </beans:beans>
\ No newline at end of file

diff --git a/org.argeo.slc.client.rap/src/org/argeo/slc/client/rap/OpenJcrFileService.java b/org.argeo.slc.client.rap/src/org/argeo/slc/client/rap/OpenJcrFileService.java
index dda158a5e76ac77d3cef321d0ec32251a725f8d4..1a1f1dccaf176b1970a14e749c6725a05e222d30 100644 (file)
--- a/org.argeo.slc.client.rap/src/org/argeo/slc/client/rap/OpenJcrFileService.java
+++ b/org.argeo.slc.client.rap/src/org/argeo/slc/client/rap/OpenJcrFileService.java
@@ -9,13 +9,12 @@ import javax.jcr.RepositoryException;
 import javax.jcr.Session;
 import javax.jcr.nodetype.NodeType;
 import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 
 import org.apache.commons.io.IOUtils;
 import org.argeo.jcr.JcrUtils;
 import org.argeo.slc.SlcException;
-import org.eclipse.rap.rwt.RWT;
 //import org.eclipse.rap.rwt.service.IServiceHandler;
 
 /**

diff --git a/org.argeo.slc.client.rap/src/org/argeo/slc/client/ui/specific/OpenJcrFile.java b/org.argeo.slc.client.rap/src/org/argeo/slc/client/ui/specific/OpenJcrFile.java
index 78cebc972fdc4c21722ed2049ebe8e821a5e5b73..79450b0425f226bdd5a193b6a638cbcf7ce1de23 100644 (file)
--- a/org.argeo.slc.client.rap/src/org/argeo/slc/client/ui/specific/OpenJcrFile.java
+++ b/org.argeo.slc.client.rap/src/org/argeo/slc/client/ui/specific/OpenJcrFile.java
@@ -23,7 +23,6 @@ import javax.jcr.Session;
 
 import org.argeo.slc.SlcException;
 import org.argeo.slc.client.rap.OpenJcrFileService;
-import org.argeo.slc.client.rap.SlcRapPlugin;
 import org.argeo.slc.repo.RepoService;
 import org.eclipse.core.commands.AbstractHandler;
 import org.eclipse.core.commands.ExecutionEvent;

diff --git a/org.argeo.slc.client.ui.dist/META-INF/spring/osgi.xml b/org.argeo.slc.client.ui.dist/META-INF/spring/osgi.xml
index bacb25cd97ad903752d8bad181bef1bd58fc3e06..dec9c603c4cff6c0be53ab2fbf203e7fe8fef016 100644 (file)
--- a/org.argeo.slc.client.ui.dist/META-INF/spring/osgi.xml
+++ b/org.argeo.slc.client.ui.dist/META-INF/spring/osgi.xml
@@ -12,7 +12,7 @@
                filter="(argeo.jcr.repository.alias=java)" />\r
 \r
        <reference id="repositoryFactory" interface="javax.jcr.RepositoryFactory" />\r
-       <reference id="keyring" interface="org.argeo.util.security.CryptoKeyring" />\r
+       <reference id="keyring" interface="org.argeo.node.security.CryptoKeyring" />\r
 \r
        <reference id="nodeRepository" interface="javax.jcr.Repository"\r
                filter="(argeo.jcr.repository.alias=home)" />\r

diff --git a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/CopyLocalJavaWorkspace.java b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/CopyLocalJavaWorkspace.java
index 7ad91f3ed8cc7b8eed7bc81f024642079ee57e16..285d37a08593367af980f94a095f1511e1f52c5b 100644 (file)
--- a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/CopyLocalJavaWorkspace.java
+++ b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/CopyLocalJavaWorkspace.java
@@ -23,13 +23,13 @@ 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.eclipse.ui.EclipseJcrMonitor;
+import org.argeo.jcr.JcrMonitor;
 import org.argeo.jcr.JcrUtils;
+import org.argeo.security.ui.PrivilegedJob;
 import org.argeo.slc.SlcConstants;
+import org.argeo.slc.SlcException;
 import org.argeo.slc.client.ui.dist.DistPlugin;
-import org.argeo.security.ui.PrivilegedJob;
 import org.argeo.slc.client.ui.dist.utils.CommandHelpers;
 import org.argeo.slc.repo.JavaRepoManager;
 import org.argeo.slc.repo.RepoUtils;
@@ -120,7 +120,7 @@ public class CopyLocalJavaWorkspace extends AbstractHandler {
                protected IStatus doRun(IProgressMonitor progressMonitor) {
                        long begin = System.currentTimeMillis();
 
-                       ArgeoMonitor monitor = new EclipseArgeoMonitor(progressMonitor);
+                       JcrMonitor monitor = new EclipseJcrMonitor(progressMonitor);
                        monitor.beginTask("Copy workspace", -1);
                        monitor.subTask("Copying nodes");
 
@@ -150,7 +150,7 @@ public class CopyLocalJavaWorkspace extends AbstractHandler {
                                });
 
                        } catch (RepositoryException re) {
-                               throw new ArgeoException(
+                               throw new SlcException(
                                                "Unexpected error while creating the new workspace.",
                                                re);
                        } finally {

diff --git a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/CopyWorkspace.java b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/CopyWorkspace.java
index 3805e0daac634943de89226cfc4c45a097df4d6e..fe250682ee3a886a7734511dc275dc3716c7db56 100644 (file)
--- a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/CopyWorkspace.java
+++ b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/CopyWorkspace.java
@@ -25,16 +25,16 @@ 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.eclipse.ui.EclipseJcrMonitor;
+import org.argeo.jcr.JcrMonitor;
 import org.argeo.jcr.JcrUtils;
+import org.argeo.node.security.Keyring;
 import org.argeo.security.ui.PrivilegedJob;
 import org.argeo.slc.SlcConstants;
+import org.argeo.slc.SlcException;
 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;
@@ -127,7 +127,7 @@ public class CopyWorkspace extends AbstractHandler {
                protected IStatus doRun(IProgressMonitor progressMonitor) {
                        long begin = System.currentTimeMillis();
 
-                       ArgeoMonitor monitor = new EclipseArgeoMonitor(progressMonitor);
+                       JcrMonitor monitor = new EclipseJcrMonitor(progressMonitor);
                        monitor.beginTask("Copy workspace", -1);
                        monitor.subTask("Copying nodes");
 
@@ -163,7 +163,7 @@ public class CopyWorkspace extends AbstractHandler {
                                monitor.worked(1);
 
                        } catch (RepositoryException re) {
-                               throw new ArgeoException(
+                               throw new SlcException(
                                                "Unexpected error while creating the new workspace.",
                                                re);
                        } finally {

diff --git a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/CreateWorkspace.java b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/CreateWorkspace.java
index b4a8d98b5236836232e9e0f6ce408bb83d3dc05b..2b27f96dab9a859604dc9a5b3021bf8675443cf0 100644 (file)
--- a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/CreateWorkspace.java
+++ b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/CreateWorkspace.java
@@ -27,11 +27,11 @@ import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.argeo.eclipse.ui.dialogs.ErrorFeedback;
 import org.argeo.jcr.JcrUtils;
+import org.argeo.node.security.Keyring;
 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;

diff --git a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/DeleteArtifacts.java b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/DeleteArtifacts.java
index 58d11b5d564d265b24ce93ce2031239308f036d8..61a7c9b7fe31a81d6d8dc37533d407cc7e7b8296 100644 (file)
--- a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/DeleteArtifacts.java
+++ b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/DeleteArtifacts.java
@@ -20,7 +20,7 @@ import java.util.Iterator;
 import javax.jcr.Node;
 import javax.jcr.RepositoryException;
 
-import org.argeo.ArgeoException;
+import org.argeo.slc.SlcException;
 import org.argeo.slc.client.ui.dist.DistPlugin;
 import org.argeo.slc.jcr.SlcTypes;
 import org.eclipse.core.commands.AbstractHandler;
@@ -79,7 +79,7 @@ public class DeleteArtifacts extends AbstractHandler {
                        }
                        // CommandHelpers.callCommand(RefreshDistributionOverviewPage.ID);
                } catch (RepositoryException re) {
-                       throw new ArgeoException(
+                       throw new SlcException(
                                        "Unexpected error while deleting artifacts.", re);
                }
                return null;

diff --git a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/DeleteWorkspace.java b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/DeleteWorkspace.java
index cffa453cdf67886952f10ad4248e6d2114388b41..1369aeb3b554216177969c5098cac8ce9bcaeade 100644 (file)
--- a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/DeleteWorkspace.java
+++ b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/DeleteWorkspace.java
@@ -25,11 +25,11 @@ import javax.jcr.Session;
 import javax.jcr.nodetype.NodeType;
 
 import org.argeo.jcr.JcrUtils;
+import org.argeo.node.security.Keyring;
 import org.argeo.slc.SlcException;
 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;

diff --git a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/Fetch.java b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/Fetch.java
index c42fa7a29fa8485c22317852e7a04ec128eed01b..a54423634e830d04f57aa37cac4c12a69e95aca7 100644 (file)
--- a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/Fetch.java
+++ b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/Fetch.java
@@ -7,11 +7,11 @@ import javax.jcr.RepositoryFactory;
 import javax.jcr.Session;
 
 import org.argeo.jcr.JcrUtils;
+import org.argeo.node.security.Keyring;
 import org.argeo.slc.SlcException;
 import org.argeo.slc.client.ui.dist.DistPlugin;
 import org.argeo.slc.client.ui.dist.utils.CommandHelpers;
 import org.argeo.slc.client.ui.dist.wizards.FetchWizard;
-import org.argeo.util.security.Keyring;
 import org.eclipse.core.commands.AbstractHandler;
 import org.eclipse.core.commands.ExecutionEvent;
 import org.eclipse.core.commands.ExecutionException;

diff --git a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/ManageWorkspaceAuth.java b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/ManageWorkspaceAuth.java
index b7910ca887070d1eb9cc95653c6239d604559974..9e499b53fc0e2586f7b7cb38267cad947f9b89dd 100644 (file)
--- a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/ManageWorkspaceAuth.java
+++ b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/ManageWorkspaceAuth.java
@@ -19,8 +19,8 @@ import javax.jcr.Repository;
 import javax.jcr.RepositoryException;
 import javax.jcr.Session;
 
-import org.argeo.ArgeoException;
 import org.argeo.jcr.JcrUtils;
+import org.argeo.slc.SlcException;
 import org.argeo.slc.client.ui.dist.DistPlugin;
 import org.argeo.slc.client.ui.dist.wizards.ChangeRightsWizard;
 import org.eclipse.core.commands.AbstractHandler;
@@ -57,7 +57,7 @@ public class ManageWorkspaceAuth extends AbstractHandler {
                        dialog.open();
                        return null;
                } catch (RepositoryException re) {
-                       throw new ArgeoException("Cannot log in the repository "
+                       throw new SlcException("Cannot log in the repository "
                                        + repository + " in workspace " + workspaceName, re);
                } finally {
                        JcrUtils.logoutQuietly(session);

diff --git a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/MergeWorkspaces.java b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/MergeWorkspaces.java
index e3190072648437086e0e3a1e53288abc00283ecb..965e5348f1f9a1e5c2a88edf3d57b303c80bab5f 100644 (file)
--- a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/MergeWorkspaces.java
+++ b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/MergeWorkspaces.java
@@ -27,13 +27,13 @@ import javax.jcr.query.QueryResult;
 
 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.SlcException;
 import org.argeo.slc.client.ui.dist.DistPlugin;
 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;
@@ -150,7 +150,7 @@ public class MergeWorkspaces extends AbstractHandler {
                                if (log.isDebugEnabled())
                                        log.debug("Will copy " + expectedCount + " files...");
 
-                               ArgeoMonitor monitor = new EclipseArgeoMonitor(eclipseMonitor);
+                               JcrMonitor monitor = new EclipseJcrMonitor(eclipseMonitor);
                                eclipseMonitor
                                                .beginTask("Copy files", expectedCount.intValue());
 

diff --git a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/NormalizeDistribution.java b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/NormalizeDistribution.java
index d42fd7adc2a9d257309fe7d7fdfec722b4f55a7f..c55efb65d109e9a71ec921237f3ba93a3e47e951 100644 (file)
--- a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/NormalizeDistribution.java
+++ b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/NormalizeDistribution.java
@@ -31,9 +31,10 @@ import javax.jcr.util.TraversingItemVisitor;
 
 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;
@@ -46,7 +47,6 @@ 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.aether.artifact.Artifact;
 import org.eclipse.aether.artifact.DefaultArtifact;
 import org.eclipse.core.commands.AbstractHandler;
@@ -207,7 +207,7 @@ public class NormalizeDistribution extends AbstractHandler implements SlcNames {
                protected IStatus run(IProgressMonitor progressMonitor) {
 
                        try {
-                               ArgeoMonitor monitor = new EclipseArgeoMonitor(progressMonitor);
+                               JcrMonitor monitor = new EclipseJcrMonitor(progressMonitor);
                                // normalize artifacts
                                Query countQuery = session
                                                .getWorkspace()
@@ -250,9 +250,9 @@ public class NormalizeDistribution extends AbstractHandler implements SlcNames {
        }
 
        private class NormalizingTraverser extends TraversingItemVisitor {
-               ArgeoMonitor monitor;
+               JcrMonitor monitor;
 
-               public NormalizingTraverser(ArgeoMonitor monitor) {
+               public NormalizingTraverser(JcrMonitor monitor) {
                        super();
                        this.monitor = monitor;
                }

diff --git a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/NormalizeWorkspace.java b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/NormalizeWorkspace.java
index d2628f7fe394d09d274d1ff4ca2a5b174877b981..db87371eabe4547d5c4157600158bf8268b94f4f 100644 (file)
--- a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/NormalizeWorkspace.java
+++ b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/NormalizeWorkspace.java
@@ -29,9 +29,10 @@ import javax.jcr.util.TraversingItemVisitor;
 
 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.SlcException;
 import org.argeo.slc.client.ui.dist.DistPlugin;
 import org.argeo.slc.jcr.SlcNames;
@@ -41,7 +42,6 @@ import org.argeo.slc.repo.ModularDistributionIndexer;
 import org.argeo.slc.repo.PdeSourcesIndexer;
 import org.argeo.slc.repo.RepoConstants;
 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;
@@ -130,7 +130,7 @@ public class NormalizeWorkspace extends AbstractHandler implements SlcNames {
                @Override
                protected IStatus run(IProgressMonitor progressMonitor) {
                        try {
-                               ArgeoMonitor monitor = new EclipseArgeoMonitor(progressMonitor);
+                               JcrMonitor monitor = new EclipseJcrMonitor(progressMonitor);
                                // Normalize artifacts
                                Query countQuery = session
                                                .getWorkspace()
@@ -162,9 +162,9 @@ public class NormalizeWorkspace extends AbstractHandler implements SlcNames {
        }
 
        private class NormalizingTraverser extends TraversingItemVisitor {
-               ArgeoMonitor monitor;
+               JcrMonitor monitor;
 
-               public NormalizingTraverser(ArgeoMonitor monitor) {
+               public NormalizingTraverser(JcrMonitor monitor) {
                        super();
                        this.monitor = monitor;
                }

diff --git a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/PublishWorkspace.java b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/PublishWorkspace.java
index 8eb371c34141000982e6c2f867ea933b60d8302e..51f7fd64f7ffe8db1c02ac32fd43301766f723c0 100644 (file)
--- a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/PublishWorkspace.java
+++ b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/PublishWorkspace.java
@@ -23,12 +23,12 @@ import javax.jcr.RepositoryFactory;
 import javax.jcr.Session;
 import javax.jcr.security.Privilege;
 
-import org.argeo.ArgeoException;
 import org.argeo.jcr.JcrUtils;
+import org.argeo.node.security.Keyring;
 import org.argeo.slc.SlcConstants;
+import org.argeo.slc.SlcException;
 import org.argeo.slc.client.ui.dist.DistPlugin;
 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;
@@ -84,7 +84,7 @@ public class PublishWorkspace extends AbstractHandler {
                                // CommandHelpers.callCommand(RefreshDistributionsView.ID);
                        }
                } catch (RepositoryException re) {
-                       throw new ArgeoException(
+                       throw new SlcException(
                                        "Unexpected error while publishing workspace "
                                                        + workspaceName, re);
                } finally {

diff --git a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/RegisterRepository.java b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/RegisterRepository.java
index b141e659aba66389bb89502c084dfe5c10758e72..fc9124d50089e2a561cc3c92099cff85ae58a5f0 100644 (file)
--- a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/RegisterRepository.java
+++ b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/RegisterRepository.java
@@ -19,11 +19,11 @@ import javax.jcr.Repository;
 import javax.jcr.RepositoryFactory;
 
 import org.argeo.node.ArgeoNames;
+import org.argeo.node.security.Keyring;
 import org.argeo.slc.client.ui.dist.DistPlugin;
 import org.argeo.slc.client.ui.dist.utils.CommandHelpers;
 import org.argeo.slc.client.ui.dist.wizards.RegisterRepoWizard;
 import org.argeo.slc.jcr.SlcNames;
-import org.argeo.util.security.Keyring;
 import org.eclipse.core.commands.AbstractHandler;
 import org.eclipse.core.commands.ExecutionEvent;
 import org.eclipse.core.commands.ExecutionException;

diff --git a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/RunInOsgi.java b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/RunInOsgi.java
index 66e4414d4292c0ef3e097da2efed49ddd42344b0..21cb95ca094afae6257ea8e683f036501e58fc64 100644 (file)
--- a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/RunInOsgi.java
+++ b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/RunInOsgi.java
@@ -39,6 +39,7 @@ import org.argeo.slc.core.execution.tasks.JvmProcess;
 import org.argeo.slc.jcr.SlcNames;
 import org.argeo.slc.repo.RepoUtils;
 import org.argeo.slc.repo.maven.MavenConventionsUtils;
+import org.eclipse.aether.artifact.Artifact;
 import org.eclipse.core.commands.AbstractHandler;
 import org.eclipse.core.commands.ExecutionEvent;
 import org.eclipse.core.commands.ExecutionException;
@@ -47,7 +48,6 @@ import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
 import org.eclipse.core.runtime.jobs.Job;
 import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.aether.artifact.Artifact;
 
 /** <b>UNDER DEVELOPMENT</b>. Download and prepare an OSGi runtime */
 public class RunInOsgi extends AbstractHandler implements SlcNames {

diff --git a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/controllers/ArtifactLabelProvider.java b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/controllers/ArtifactLabelProvider.java
index 7e3a1db1c40d41c9976523bf409ef54f42b1459b..728407f66334b6e82e90cd84d05bfc0e7d83ecc7 100644 (file)
--- a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/controllers/ArtifactLabelProvider.java
+++ b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/controllers/ArtifactLabelProvider.java
@@ -22,8 +22,8 @@ import javax.jcr.Node;
 import javax.jcr.Property;
 import javax.jcr.RepositoryException;
 
-import org.argeo.ArgeoException;
 import org.argeo.jcr.JcrUtils;
+import org.argeo.slc.SlcException;
 import org.argeo.slc.client.ui.dist.DistConstants;
 import org.argeo.slc.client.ui.dist.DistImages;
 import org.argeo.slc.jcr.SlcTypes;
@@ -103,7 +103,7 @@ public class ArtifactLabelProvider extends ColumnLabelProvider implements
                                }
                        }
                } catch (RepositoryException re) {
-                       throw new ArgeoException(
+                       throw new SlcException(
                                        "Unexepected error while getting property values", re);
                }
                return null;

diff --git a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/controllers/ArtifactsTreeContentProvider.java b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/controllers/ArtifactsTreeContentProvider.java
index 9591ac0c2e88ea6a7fb7e54ecd91128d48e44190..ac3459e95d4140e2723ac40162b2b612bf699cb0 100644 (file)
--- a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/controllers/ArtifactsTreeContentProvider.java
+++ b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/controllers/ArtifactsTreeContentProvider.java
@@ -23,8 +23,8 @@ import javax.jcr.Node;
 import javax.jcr.NodeIterator;
 import javax.jcr.RepositoryException;
 
-import org.argeo.ArgeoException;
 import org.argeo.eclipse.ui.jcr.utils.JcrItemsComparator;
+import org.argeo.slc.SlcException;
 import org.argeo.slc.jcr.SlcTypes;
 import org.eclipse.jface.viewers.ITreeContentProvider;
 import org.eclipse.jface.viewers.Viewer;
@@ -66,7 +66,7 @@ public class ArtifactsTreeContentProvider implements ITreeContentProvider,
 
                        }
                } catch (RepositoryException e) {
-                       throw new ArgeoException(
+                       throw new SlcException(
                                        "Unexpected exception while listing node properties", e);
                }
                return elements;
@@ -83,7 +83,7 @@ public class ArtifactsTreeContentProvider implements ITreeContentProvider,
                                        return true;
                        }
                } catch (RepositoryException e) {
-                       throw new ArgeoException(
+                       throw new SlcException(
                                        "Unexpected exception while checking if property is multiple",
                                        e);
                }

diff --git a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/controllers/DistSessionFactory.java b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/controllers/DistSessionFactory.java
index 0587cd72822edc58cf686119c78b69fc734e0a70..38203d8ba603c005e39570946f271107a44d1863 100644 (file)
--- a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/controllers/DistSessionFactory.java
+++ b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/controllers/DistSessionFactory.java
@@ -9,9 +9,9 @@ import javax.jcr.RepositoryFactory;
 import javax.jcr.Session;
 
 import org.argeo.jcr.JcrUtils;
+import org.argeo.node.security.Keyring;
 import org.argeo.slc.SlcException;
 import org.argeo.slc.repo.RepoUtils;
-import org.argeo.util.security.Keyring;
 
 /**
  * Provide shortcuts to retrieve sessions, repositories and workspaces that are

diff --git a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/controllers/DistTreeContentProvider.java b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/controllers/DistTreeContentProvider.java
index e83ca22da22aad9be03294b6cdd159a58d78bfb7..1dd3228644f9b52642967a0cc2fd0a0e2431138a 100644 (file)
--- a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/controllers/DistTreeContentProvider.java
+++ b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/controllers/DistTreeContentProvider.java
@@ -17,10 +17,10 @@ import org.argeo.jcr.JcrUtils;
 import org.argeo.node.ArgeoNames;
 import org.argeo.node.ArgeoTypes;
 import org.argeo.node.NodeUtils;
+import org.argeo.node.security.Keyring;
 import org.argeo.slc.SlcException;
 import org.argeo.slc.client.ui.dist.model.RepoElem;
 import org.argeo.slc.repo.RepoConstants;
-import org.argeo.util.security.Keyring;
 import org.eclipse.jface.viewers.ITreeContentProvider;
 import org.eclipse.jface.viewers.Viewer;
 

diff --git a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/editors/ArtifactVersionEditor.java b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/editors/ArtifactVersionEditor.java
index 5612fa97fc890e79346167d0b593c93d569234fb..1db3661267a0cda2d33c9503ffb1a7caa0b22f2a 100644 (file)
--- a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/editors/ArtifactVersionEditor.java
+++ b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/editors/ArtifactVersionEditor.java
@@ -19,7 +19,6 @@ import javax.jcr.Node;
 import javax.jcr.RepositoryException;
 import javax.jcr.Session;
 
-import org.argeo.ArgeoException;
 import org.argeo.jcr.JcrUtils;
 import org.argeo.slc.SlcException;
 import org.argeo.slc.client.ui.dist.DistPlugin;
@@ -93,7 +92,7 @@ public class ArtifactVersionEditor extends FormEditor implements SlcNames {
                        addPage(new BundleDependencyPage(this, "Dependencies ", artifact));
                        addPage(new BundleRawPage(this, "Raw Meta-Data ", artifact));
                } catch (PartInitException e) {
-                       throw new ArgeoException("Cannot add distribution editor pages", e);
+                       throw new SlcException("Cannot add distribution editor pages", e);
                }
 
        }

diff --git a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/editors/BundleDetailPage.java b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/editors/BundleDetailPage.java
index 512e67e55151a94f3d47e2cbd049ee5b297425f4..c73e16eb3d85860ab5564e2dd25a65fb12412b2a 100644 (file)
--- a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/editors/BundleDetailPage.java
+++ b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/editors/BundleDetailPage.java
@@ -22,7 +22,6 @@ import javax.jcr.RepositoryException;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.argeo.ArgeoException;
 import org.argeo.slc.SlcException;
 import org.argeo.slc.build.License;
 import org.argeo.slc.client.ui.dist.DistConstants;
@@ -514,7 +513,7 @@ public class BundleDetailPage extends FormPage implements SlcNames {
                        sb.append("</dependency>");
                        return sb.toString();
                } catch (RepositoryException re) {
-                       throw new ArgeoException(
+                       throw new SlcException(
                                        "unexpected error while generating maven snippet");
                }
        }

diff --git a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/editors/BundleRawPage.java b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/editors/BundleRawPage.java
index 2853912db801053bac53998adf85d794f8f7987d..5001886f364983742a3d8f9372deea3241e8a2fb 100644 (file)
--- a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/editors/BundleRawPage.java
+++ b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/editors/BundleRawPage.java
@@ -26,7 +26,7 @@ import javax.jcr.RepositoryException;
 import javax.jcr.Value;
 import javax.jcr.nodetype.NodeType;
 
-import org.argeo.ArgeoException;
+import org.argeo.slc.SlcException;
 import org.argeo.slc.client.ui.dist.DistImages;
 import org.argeo.slc.client.ui.dist.utils.DistUiHelpers;
 import org.argeo.slc.jcr.SlcNames;
@@ -197,7 +197,7 @@ public class BundleRawPage extends FormPage implements SlcNames, SlcTypes {
                                        }
                                }
                        } catch (RepositoryException e) {
-                               throw new ArgeoException(
+                               throw new SlcException(
                                                "unexpected error while getting artifact information",
                                                e);
                        }
@@ -245,7 +245,7 @@ public class BundleRawPage extends FormPage implements SlcNames, SlcTypes {
                                }
 
                        } catch (RepositoryException e) {
-                               throw new ArgeoException(
+                               throw new SlcException(
                                                "Unexpected exception while listing node properties", e);
                        }
                        return elements.toArray();
@@ -305,7 +305,7 @@ public class BundleRawPage extends FormPage implements SlcNames, SlcTypes {
                                        return elements.toArray();
                                }
                        } catch (RepositoryException e) {
-                               throw new ArgeoException(
+                               throw new SlcException(
                                                "Unexpected error getting multiple values property.", e);
                        }
                        return result;
@@ -324,7 +324,7 @@ public class BundleRawPage extends FormPage implements SlcNames, SlcTypes {
                                        return true;
                                }
                        } catch (RepositoryException e) {
-                               throw new ArgeoException(
+                               throw new SlcException(
                                                "Unexpected exception while checking if property is multiple",
                                                e);
                        }

diff --git a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/editors/DistWkspSearchPage.java b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/editors/DistWkspSearchPage.java
index 4270e93f044ae04c89467efaa93db3bebc69b5e0..e7dbb73600b6eb85097a36dae1f084aa5f9b807d 100644 (file)
--- a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/editors/DistWkspSearchPage.java
+++ b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/editors/DistWkspSearchPage.java
@@ -37,14 +37,14 @@ import javax.jcr.query.qom.QueryObjectModelFactory;
 import javax.jcr.query.qom.Selector;
 import javax.jcr.query.qom.StaticOperand;
 
-import org.argeo.ArgeoMonitor;
-import org.argeo.eclipse.ui.EclipseArgeoMonitor;
+import org.argeo.eclipse.ui.EclipseJcrMonitor;
 import org.argeo.eclipse.ui.workbench.CommandUtils;
+import org.argeo.jcr.JcrMonitor;
 import org.argeo.jcr.JcrUtils;
+import org.argeo.security.ui.PrivilegedJob;
 import org.argeo.slc.SlcException;
 import org.argeo.slc.client.ui.dist.DistConstants;
 import org.argeo.slc.client.ui.dist.DistPlugin;
-import org.argeo.security.ui.PrivilegedJob;
 import org.argeo.slc.client.ui.dist.commands.DeleteArtifacts;
 import org.argeo.slc.client.ui.dist.commands.OpenModuleEditor;
 import org.argeo.slc.client.ui.dist.utils.DistNodeViewerComparator;
@@ -135,7 +135,7 @@ public class DistWkspSearchPage extends FormPage implements SlcNames {
                @Override
                protected IStatus doRun(IProgressMonitor progressMonitor) {
                        try {
-                               ArgeoMonitor monitor = new EclipseArgeoMonitor(progressMonitor);
+                               JcrMonitor monitor = new EclipseJcrMonitor(progressMonitor);
                                monitor.beginTask("Getting bundle list", -1);
                                final List<Node> result = JcrUtils
                                                .nodeIteratorToList(listBundleArtifacts(session, filter));

diff --git a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/editors/DistWorkspaceEditor.java b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/editors/DistWorkspaceEditor.java
index de233bcf092756d761d2ec263eca19981f7c30e4..06e892f028b42050d1b6d17ec1bab268b3afb85e 100644 (file)
--- a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/editors/DistWorkspaceEditor.java
+++ b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/editors/DistWorkspaceEditor.java
@@ -21,12 +21,12 @@ import javax.jcr.RepositoryException;
 import javax.jcr.RepositoryFactory;
 import javax.jcr.Session;
 
-import org.argeo.ArgeoException;
 import org.argeo.jcr.JcrUtils;
+import org.argeo.node.security.Keyring;
+import org.argeo.slc.SlcException;
 import org.argeo.slc.client.ui.dist.DistPlugin;
 import org.argeo.slc.jcr.SlcNames;
 import org.argeo.slc.repo.RepoUtils;
-import org.argeo.util.security.Keyring;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.ui.IEditorInput;
 import org.eclipse.ui.IEditorSite;
@@ -83,7 +83,7 @@ public class DistWorkspaceEditor extends FormEditor implements SlcNames {
                        addPage(new WkspCategoryBaseListPage(this, "Groups ",
                                        businessSession));
                } catch (PartInitException e) {
-                       throw new ArgeoException("Cannot add distribution editor pages", e);
+                       throw new SlcException("Cannot add distribution editor pages", e);
                }
        }
 

diff --git a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/editors/ModularDistVersionDetailPage.java b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/editors/ModularDistVersionDetailPage.java
index 1c29abc4a6042061aea607f1955d9ad4127e1b30..396950498d1b10cbd257f1c51a10850768fe4356 100644 (file)
--- a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/editors/ModularDistVersionDetailPage.java
+++ b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/editors/ModularDistVersionDetailPage.java
@@ -18,7 +18,6 @@ package org.argeo.slc.client.ui.dist.editors;
 import javax.jcr.Node;
 import javax.jcr.RepositoryException;
 
-import org.argeo.ArgeoException;
 import org.argeo.slc.SlcException;
 import org.argeo.slc.jcr.SlcNames;
 import org.eclipse.swt.SWT;
@@ -125,7 +124,7 @@ public class ModularDistVersionDetailPage extends FormPage implements SlcNames {
                        sb.append("</dependency>");
                        return sb.toString();
                } catch (RepositoryException re) {
-                       throw new ArgeoException(
+                       throw new SlcException(
                                        "unexpected error while generating maven snippet");
                }
        }

diff --git a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/editors/ModularDistVersionOverviewPage.java b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/editors/ModularDistVersionOverviewPage.java
index 2329bd49edec10ad67ebb2cb78c784d62259dead..a1545bf0cc20213f5cf430b564168478887dc751 100644 (file)
--- a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/editors/ModularDistVersionOverviewPage.java
+++ b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/editors/ModularDistVersionOverviewPage.java
@@ -44,8 +44,8 @@ import org.argeo.slc.SlcException;
 import org.argeo.slc.client.ui.dist.DistConstants;
 import org.argeo.slc.client.ui.dist.DistImages;
 import org.argeo.slc.client.ui.dist.commands.OpenModuleEditor;
-import org.argeo.slc.client.ui.dist.utils.HyperlinkAdapter;
 import org.argeo.slc.client.ui.dist.utils.DistNodeViewerComparator;
+import org.argeo.slc.client.ui.dist.utils.HyperlinkAdapter;
 //import org.argeo.slc.client.ui.specific.OpenJcrFile;
 //import org.argeo.slc.client.ui.specific.OpenJcrFileCmdId;
 import org.argeo.slc.jcr.SlcNames;

diff --git a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/model/ModularDistVersionBaseElem.java b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/model/ModularDistVersionBaseElem.java
index af42d874467a060c5b57c029874f8cf03e16dc06..1040e2c4e424d0753a187e612555bf647b235481 100644 (file)
--- a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/model/ModularDistVersionBaseElem.java
+++ b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/model/ModularDistVersionBaseElem.java
@@ -10,7 +10,6 @@ import javax.jcr.query.qom.QueryObjectModel;
 import javax.jcr.query.qom.QueryObjectModelFactory;
 import javax.jcr.query.qom.Selector;
 
-import org.argeo.ArgeoException;
 import org.argeo.slc.SlcException;
 import org.argeo.slc.jcr.SlcNames;
 import org.argeo.slc.jcr.SlcTypes;
@@ -85,7 +84,7 @@ public class ModularDistVersionBaseElem extends DistParentElem {
                                }
                                return super.getChildren();
                        } catch (RepositoryException re) {
-                               throw new ArgeoException("Unable to retrieve children for "
+                               throw new SlcException("Unable to retrieve children for "
                                                + modularDistVersionBase, re);
                        }
                }

diff --git a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/model/RepoElem.java b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/model/RepoElem.java
index ed659457f3d4c156f1420409c9f9bfbe155c1522..85ae4c2663875718e8cfaadaae0ece4d67920f90 100644 (file)
--- a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/model/RepoElem.java
+++ b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/model/RepoElem.java
@@ -12,10 +12,10 @@ import javax.jcr.Session;
 import org.argeo.jcr.JcrUtils;
 import org.argeo.node.ArgeoNames;
 import org.argeo.node.NodeUtils;
+import org.argeo.node.security.Keyring;
 import org.argeo.slc.SlcException;
 import org.argeo.slc.repo.RepoConstants;
 import org.argeo.slc.repo.RepoUtils;
-import org.argeo.util.security.Keyring;
 
 /**
  * Abstract a repository. It might be persisted by a node in the current user

diff --git a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/model/WkspGroupElem.java b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/model/WkspGroupElem.java
index 66434d71a81a378b2c8236dfeffbe5442917d049..0c10777ead4319e6e0d35c09d8a866d50b7ccb0d 100644 (file)
--- a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/model/WkspGroupElem.java
+++ b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/model/WkspGroupElem.java
@@ -3,8 +3,8 @@ package org.argeo.slc.client.ui.dist.model;
 import javax.jcr.RepositoryException;
 import javax.jcr.Session;
 
-import org.argeo.ArgeoException;
 import org.argeo.jcr.JcrUtils;
+import org.argeo.slc.SlcException;
 
 /**
  * Abstract set of similar workspaces, that is a bunch of workspaces with same
@@ -30,7 +30,7 @@ public class WkspGroupElem extends DistParentElem {
                                                        wkpName));
                        }
                } catch (RepositoryException e) {
-                       throw new ArgeoException("Cannot retrieve workspace names", e);
+                       throw new SlcException("Cannot retrieve workspace names", e);
                }
        }
 

diff --git a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/model/WorkspaceElem.java b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/model/WorkspaceElem.java
index 3be73b5e568fc6ee9f78d87c75e8e7c1dee630a5..40409dc8477966855f18fcca6d70b035b5340651 100644 (file)
--- a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/model/WorkspaceElem.java
+++ b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/model/WorkspaceElem.java
@@ -10,8 +10,8 @@ import javax.jcr.query.qom.QueryObjectModel;
 import javax.jcr.query.qom.QueryObjectModelFactory;
 import javax.jcr.query.qom.Selector;
 
-import org.argeo.ArgeoException;
 import org.argeo.jcr.JcrUtils;
+import org.argeo.slc.SlcException;
 import org.argeo.slc.jcr.SlcNames;
 import org.argeo.slc.jcr.SlcTypes;
 
@@ -60,7 +60,7 @@ public class WorkspaceElem extends DistParentElem {
                        else
                                return true;
                } catch (RepositoryException re) {
-                       throw new ArgeoException(
+                       throw new SlcException(
                                        "Unexpected error while checking children node existence",
                                        re);
                }
@@ -140,7 +140,7 @@ public class WorkspaceElem extends DistParentElem {
                                }
                                return super.getChildren();
                        } catch (RepositoryException e) {
-                               throw new ArgeoException(
+                               throw new SlcException(
                                                "Cannot initialize WorkspaceNode UI object."
                                                                + getName(), e);
                        }

diff --git a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/utils/ArtifactsTableConfigurer.java b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/utils/ArtifactsTableConfigurer.java
index d6f60c64049db0daee870ce783435b6cb377ff73..a8a321cf4458056150e84eb242449ee890b24202 100644 (file)
--- a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/utils/ArtifactsTableConfigurer.java
+++ b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/utils/ArtifactsTableConfigurer.java
@@ -25,8 +25,8 @@ import javax.jcr.RepositoryException;
 import javax.jcr.Value;
 import javax.jcr.query.Row;
 
-import org.argeo.ArgeoException;
 import org.argeo.eclipse.ui.GenericTableComparator;
+import org.argeo.slc.SlcException;
 import org.argeo.slc.client.ui.dist.DistConstants;
 import org.argeo.slc.jcr.SlcNames;
 import org.argeo.slc.jcr.SlcTypes;
@@ -165,7 +165,7 @@ public class ArtifactsTableConfigurer implements SlcNames, SlcTypes,
                                        try {
                                                return row.getValue(columnName).getString();
                                        } catch (RepositoryException e) {
-                                               throw new ArgeoException("Cannot display row " + row, e);
+                                               throw new SlcException("Cannot display row " + row, e);
                                        }
                                }
 
@@ -200,13 +200,13 @@ public class ArtifactsTableConfigurer implements SlcNames, SlcTypes,
                                        else if (v1.getType() == PropertyType.DATE)
                                                rc = v1.getDate().compareTo(v2.getDate());
                                        else
-                                               throw new ArgeoException("comparator for object type "
+                                               throw new SlcException("comparator for object type "
                                                                + v1.getType() + " is not yet implemented");
                                } catch (Exception e) {
-                                       throw new ArgeoException("rows cannot be compared ", e);
+                                       throw new SlcException("rows cannot be compared ", e);
                                }
                        } else
-                               throw new ArgeoException("Unsupported row type");
+                               throw new SlcException("Unsupported row type");
                        // If descending order, flip the direction
                        if (direction == DESCENDING) {
                                rc = -rc;

diff --git a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/utils/CommandHelpers.java b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/utils/CommandHelpers.java
index ad2cfdb58bbf6deb67e9efc01327ac421dfae37a..fcc0f5e9f554288e98e75c89ad4beae44f3bae33 100644 (file)
--- a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/utils/CommandHelpers.java
+++ b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/utils/CommandHelpers.java
@@ -19,7 +19,7 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.argeo.ArgeoException;
+import org.argeo.slc.SlcException;
 import org.argeo.slc.client.ui.dist.DistPlugin;
 import org.eclipse.core.commands.Command;
 import org.eclipse.core.commands.Parameterization;
@@ -151,7 +151,7 @@ public class CommandHelpers {
                        // execute the command
                        handlerService.executeCommand(pc, null);
                } catch (Exception e) {
-                       throw new ArgeoException(
+                       throw new SlcException(
                                        "Unexepected exception while opening node editor", e);
                }
        }

diff --git a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/utils/DistNodeViewerComparator.java b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/utils/DistNodeViewerComparator.java
index de22ac30249ae18e3714631e03a2905c2eeaa10c..2f0e3a03b023228fd007514a68bd973be61c0cfb 100644 (file)
--- a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/utils/DistNodeViewerComparator.java
+++ b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/utils/DistNodeViewerComparator.java
@@ -27,8 +27,8 @@ import javax.jcr.ValueFormatException;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.argeo.ArgeoException;
 import org.argeo.eclipse.ui.GenericTableComparator;
+import org.argeo.slc.SlcException;
 import org.eclipse.jface.viewers.Viewer;
 
 /** Add ability to order by name version and version */
@@ -149,7 +149,7 @@ public class DistNodeViewerComparator extends GenericTableComparator {
                                rc = bd1.compareTo(bd2);
                                break;
                        default:
-                               throw new ArgeoException(
+                               throw new SlcException(
                                                "Unimplemented comparaison for PropertyType "
                                                                + propertyType);
                        }
@@ -160,7 +160,7 @@ public class DistNodeViewerComparator extends GenericTableComparator {
                        }
 
                } catch (RepositoryException re) {
-                       throw new ArgeoException("Unexpected error "
+                       throw new SlcException("Unexpected error "
                                        + "while comparing nodes", re);
                }
                return rc;

diff --git a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/utils/DistUiHelpers.java b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/utils/DistUiHelpers.java
index 4291c713eee25e1a2a736f7b5f7f4d397f7fe081..2820d929453819a9f9bbc0af9a081ceb4536f337 100644 (file)
--- a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/utils/DistUiHelpers.java
+++ b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/utils/DistUiHelpers.java
@@ -25,7 +25,7 @@ import javax.jcr.Value;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.argeo.ArgeoException;
+import org.argeo.slc.SlcException;
 import org.argeo.slc.client.ui.dist.DistConstants;
 import org.argeo.slc.jcr.SlcNames;
 import org.argeo.slc.jcr.SlcTypes;
@@ -130,7 +130,7 @@ public class DistUiHelpers implements DistConstants, SlcTypes, SlcNames {
                                strValue = value.getString();
                        return strValue;
                } catch (RepositoryException e) {
-                       throw new ArgeoException("unexpected error while formatting value",
+                       throw new SlcException("unexpected error while formatting value",
                                        e);
                }
        }

diff --git a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/views/AbstractQueryArtifactsView.java b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/views/AbstractQueryArtifactsView.java
index 65879a6721e1f8067f3e849986225f95b43d9e43..ceff72d106783a8af61c6db7ab77f033f265012f 100644 (file)
--- a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/views/AbstractQueryArtifactsView.java
+++ b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/views/AbstractQueryArtifactsView.java
@@ -30,8 +30,8 @@ import javax.jcr.query.RowIterator;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.argeo.ArgeoException;
 import org.argeo.eclipse.ui.GenericTableComparator;
+import org.argeo.slc.SlcException;
 import org.argeo.slc.client.ui.dist.utils.ArtifactsTableConfigurer;
 import org.argeo.slc.jcr.SlcTypes;
 import org.eclipse.core.runtime.IStatus;
@@ -157,7 +157,7 @@ public abstract class AbstractQueryArtifactsView extends ViewPart implements
                                }
                                viewer.setInput(rows);
                        } catch (RepositoryException e) {
-                               throw new ArgeoException("Cannot read query result", e);
+                               throw new SlcException("Cannot read query result", e);
                        }
 
                } catch (RepositoryException e) {

diff --git a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/views/ArtifactsBrowser.java b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/views/ArtifactsBrowser.java
index 9ae713e852ce118302f267b6c53ce4f3207213ad..6f61714364b16bd328d5e8c9f320fbf60ea2cf57 100644 (file)
--- a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/views/ArtifactsBrowser.java
+++ b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/views/ArtifactsBrowser.java
@@ -23,8 +23,8 @@ import javax.jcr.Property;
 import javax.jcr.RepositoryException;
 import javax.jcr.Session;
 
-import org.argeo.ArgeoException;
 import org.argeo.jcr.JcrUtils;
+import org.argeo.slc.SlcException;
 import org.argeo.slc.client.ui.dist.DistConstants;
 import org.argeo.slc.client.ui.dist.DistImages;
 import org.argeo.slc.client.ui.dist.DistPlugin;
@@ -98,7 +98,7 @@ public class ArtifactsBrowser extends ViewPart implements DistConstants,
                                rootNode = jcrSession.getNode(DEFAULT_ARTIFACTS_BASE_PATH);
                                artifactTreeViewer.setInput(rootNode);
                        } catch (RepositoryException e) {
-                               throw new ArgeoException("Cannot load base artifact nodes", e);
+                               throw new SlcException("Cannot load base artifact nodes", e);
                        }
                }
        }
@@ -245,7 +245,7 @@ public class ArtifactsBrowser extends ViewPart implements DistConstants,
                                        }
                                }
                        } catch (RepositoryException re) {
-                               throw new ArgeoException(
+                               throw new SlcException(
                                                "Unexepected error while getting property values", re);
                        }
                        return null;
@@ -264,7 +264,7 @@ public class ArtifactsBrowser extends ViewPart implements DistConstants,
                // strValue = value.getString();
                // return strValue;
                // } catch (RepositoryException e) {
-               // throw new ArgeoException(
+               // throw new SlcException(
                // "unexpected error while formatting value", e);
                // }
                // }

diff --git a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/views/QueryArtifactsForm.java b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/views/QueryArtifactsForm.java
index a698e1a616f027263a3c15087cf41c59aa867ebc..1db52456d25fbd8818614b29575826ef14d7bc4b 100644 (file)
--- a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/views/QueryArtifactsForm.java
+++ b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/views/QueryArtifactsForm.java
@@ -15,7 +15,7 @@
  */
 package org.argeo.slc.client.ui.dist.views;
 
-import org.argeo.ArgeoException;
+import org.argeo.slc.SlcException;
 import org.argeo.slc.client.ui.dist.DistPlugin;
 import org.argeo.slc.jcr.SlcNames;
 import org.eclipse.swt.SWT;
@@ -159,7 +159,7 @@ public class QueryArtifactsForm extends AbstractQueryArtifactsView implements
 
                        return sb.toString();
                } catch (Exception e) {
-                       throw new ArgeoException(
+                       throw new SlcException(
                                        "Cannot generate where statement to get artifacts", e);
                }
        }

diff --git a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/views/QueryBundlesForm.java b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/views/QueryBundlesForm.java
index 6494c0752a63312b8c8548ce4f3cd9394ba2b199..ee5fbdb64bfb9451b822b4273284f07b3499704f 100644 (file)
--- a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/views/QueryBundlesForm.java
+++ b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/views/QueryBundlesForm.java
@@ -15,7 +15,7 @@
  */
 package org.argeo.slc.client.ui.dist.views;
 
-import org.argeo.ArgeoException;
+import org.argeo.slc.SlcException;
 import org.argeo.slc.client.ui.dist.DistPlugin;
 import org.argeo.slc.jcr.SlcNames;
 import org.argeo.slc.jcr.SlcTypes;
@@ -177,7 +177,7 @@ public class QueryBundlesForm extends AbstractQueryArtifactsView implements
                        }
                        return sb.toString();
                } catch (Exception e) {
-                       throw new ArgeoException(
+                       throw new SlcException(
                                        "Cannot generate where statement to get artifacts", e);
                }
        }

diff --git a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/wizards/ChangeRightsWizard.java b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/wizards/ChangeRightsWizard.java
index 99dd8e1438908bab779c41d2225ade963d0e76af..a3e70b9c3483192f8fb0b3306de85252d0aa5e2f 100644 (file)
--- a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/wizards/ChangeRightsWizard.java
+++ b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/wizards/ChangeRightsWizard.java
@@ -18,8 +18,8 @@ package org.argeo.slc.client.ui.dist.wizards;
 import javax.jcr.RepositoryException;
 import javax.jcr.Session;
 
-import org.argeo.ArgeoException;
 import org.argeo.jcr.JcrUtils;
+import org.argeo.slc.SlcException;
 import org.eclipse.jface.wizard.Wizard;
 
 /**
@@ -44,7 +44,7 @@ public class ChangeRightsWizard extends Wizard {
                        page = new ChooseRightsPage();
                        addPage(page);
                } catch (Exception e) {
-                       throw new ArgeoException("Cannot add page to wizard ", e);
+                       throw new SlcException("Cannot add page to wizard ", e);
                }
        }
 
@@ -56,7 +56,7 @@ public class ChangeRightsWizard extends Wizard {
                        JcrUtils.addPrivilege(currentSession, "/", page.getGroupName(),
                                        page.getAuthTypeStr());
                } catch (RepositoryException re) {
-                       throw new ArgeoException(
+                       throw new SlcException(
                                        "Unexpected error while setting privileges", re);
                }
                return true;

diff --git a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/wizards/FetchWizard.java b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/wizards/FetchWizard.java
index a4e9dda1891bf8d5ca44c9e9cf2616411ce8b927..4e29e48e4b22087c9ec03e73e99e2ee209a09b8e 100644 (file)
--- a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/wizards/FetchWizard.java
+++ b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/wizards/FetchWizard.java
@@ -28,12 +28,13 @@ import javax.jcr.RepositoryException;
 import javax.jcr.RepositoryFactory;
 import javax.jcr.Session;
 
-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.ArgeoNames;
 import org.argeo.node.ArgeoTypes;
 import org.argeo.node.NodeUtils;
+import org.argeo.node.security.Keyring;
 import org.argeo.security.ui.PrivilegedJob;
 import org.argeo.slc.SlcException;
 import org.argeo.slc.client.ui.dist.DistPlugin;
@@ -41,7 +42,6 @@ import org.argeo.slc.client.ui.dist.utils.ViewerUtils;
 import org.argeo.slc.repo.RepoConstants;
 import org.argeo.slc.repo.RepoSync;
 import org.argeo.slc.repo.RepoUtils;
-import org.argeo.util.security.Keyring;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
@@ -529,7 +529,7 @@ public class FetchWizard extends Wizard {
                @Override
                protected IStatus doRun(IProgressMonitor progressMonitor) {
                        try {
-                               ArgeoMonitor monitor = new EclipseArgeoMonitor(progressMonitor);
+                               JcrMonitor monitor = new EclipseJcrMonitor(progressMonitor);
                                repoSync.setMonitor(monitor);
                                repoSync.run();
                        } catch (Exception e) {

diff --git a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/wizards/GenerateBinariesWizard.java b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/wizards/GenerateBinariesWizard.java
index 24d13282aef3b2e9bc27306a2c0c0c43fa6efbba..1f77e825c025cde088464799b8a95b39a972f741 100644 (file)
--- a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/wizards/GenerateBinariesWizard.java
+++ b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/wizards/GenerateBinariesWizard.java
@@ -25,18 +25,19 @@ import javax.jcr.Session;
 
 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.security.ui.PrivilegedJob;
 import org.argeo.slc.SlcException;
 import org.argeo.slc.client.ui.dist.DistPlugin;
-import org.argeo.security.ui.PrivilegedJob;
 import org.argeo.slc.client.ui.dist.utils.ViewerUtils;
 import org.argeo.slc.jcr.SlcTypes;
 import org.argeo.slc.repo.RepoConstants;
 import org.argeo.slc.repo.RepoService;
 import org.argeo.slc.repo.RepoUtils;
 import org.argeo.slc.repo.maven.GenerateBinaries;
+import org.eclipse.aether.artifact.Artifact;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
@@ -59,7 +60,6 @@ import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.Table;
 import org.eclipse.swt.widgets.Text;
-import org.eclipse.aether.artifact.Artifact;
 
 /**
  * Define parameters to asynchronously generate binaries, sources and sdk pom
@@ -310,7 +310,7 @@ public class GenerateBinariesWizard extends Wizard {
                protected IStatus doRun(IProgressMonitor progressMonitor) {
                        Session session = null;
                        try {
-                               ArgeoMonitor monitor = new EclipseArgeoMonitor(progressMonitor);
+                               JcrMonitor monitor = new EclipseJcrMonitor(progressMonitor);
                                session = repoService.getRemoteSession(repoNodePath, null,
                                                wkspName);
                                Node groupBaseNode = session.getNode(groupNodePath);

diff --git a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/wizards/RegisterRepoWizard.java b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/wizards/RegisterRepoWizard.java
index ac6c473a53a43de79d64f87490f2fd1a86102029..a59fd8d5b001883b5f676fbbaec4fccc45c3c0bf 100644 (file)
--- a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/wizards/RegisterRepoWizard.java
+++ b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/wizards/RegisterRepoWizard.java
@@ -31,9 +31,9 @@ import org.argeo.jcr.JcrUtils;
 import org.argeo.node.ArgeoNames;
 import org.argeo.node.ArgeoTypes;
 import org.argeo.node.NodeUtils;
+import org.argeo.node.security.Keyring;
 import org.argeo.slc.SlcException;
 import org.argeo.slc.repo.RepoConstants;
-import org.argeo.util.security.Keyring;
 import org.eclipse.jface.dialogs.MessageDialog;
 import org.eclipse.jface.resource.JFaceResources;
 import org.eclipse.jface.wizard.Wizard;

diff --git a/org.argeo.slc.client.ui/src/org/argeo/slc/client/ui/editors/ProcessBuilderPage.java b/org.argeo.slc.client.ui/src/org/argeo/slc/client/ui/editors/ProcessBuilderPage.java
index 07817cc2a623e7e5e1fb3019c86ad4dc43c724c7..a38a87f5c07ddc25e1d1b0ba8a23485ee29b7fff 100644 (file)
--- a/org.argeo.slc.client.ui/src/org/argeo/slc/client/ui/editors/ProcessBuilderPage.java
+++ b/org.argeo.slc.client.ui/src/org/argeo/slc/client/ui/editors/ProcessBuilderPage.java
@@ -32,7 +32,6 @@ import javax.jcr.observation.ObservationManager;
 import javax.jcr.query.Query;
 import javax.jcr.query.QueryManager;
 
-import org.argeo.ArgeoException;
 import org.argeo.eclipse.ui.jcr.AsyncUiEventListener;
 import org.argeo.jcr.JcrUtils;
 import org.argeo.slc.SlcException;
@@ -151,7 +150,7 @@ public class ProcessBuilderPage extends FormPage implements SlcNames {
                        addInitialFlows();
 
                } catch (RepositoryException e) {
-                       throw new ArgeoException("Cannot create form content", e);
+                       throw new SlcException("Cannot create form content", e);
                }
        }
 
@@ -415,7 +414,7 @@ public class ProcessBuilderPage extends FormPage implements SlcNames {
                                try {
                                        node.remove();
                                } catch (RepositoryException e) {
-                                       throw new ArgeoException("Cannot remove " + node, e);
+                                       throw new SlcException("Cannot remove " + node, e);
                                }
                        }
                        flowsViewer.refresh();
@@ -432,7 +431,7 @@ public class ProcessBuilderPage extends FormPage implements SlcNames {
                        flowsViewer.refresh();
                        formPart.markDirty();
                } catch (RepositoryException e) {
-                       throw new ArgeoException("Cannot remove flows from " + processNode,
+                       throw new SlcException("Cannot remove flows from " + processNode,
                                        e);
                }
        }

diff --git a/org.argeo.slc.client.ui/src/org/argeo/slc/client/ui/views/JcrExecutionModulesView.java b/org.argeo.slc.client.ui/src/org/argeo/slc/client/ui/views/JcrExecutionModulesView.java
index 4340f93f2f83807aeba8fbdc18fee2421c80ea11..697433fe775a6dbf8df4a6de71997dbcd5abf3a4 100644 (file)
--- a/org.argeo.slc.client.ui/src/org/argeo/slc/client/ui/views/JcrExecutionModulesView.java
+++ b/org.argeo.slc.client.ui/src/org/argeo/slc/client/ui/views/JcrExecutionModulesView.java
@@ -36,7 +36,6 @@ import javax.jcr.query.QueryManager;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.argeo.ArgeoException;
 import org.argeo.eclipse.ui.jcr.AsyncUiEventListener;
 import org.argeo.eclipse.ui.jcr.DefaultNodeLabelProvider;
 import org.argeo.eclipse.ui.jcr.NodeElementComparer;
@@ -202,7 +201,7 @@ public class JcrExecutionModulesView extends ViewPart implements SlcTypes, SlcNa
                                        }
                                }
                        } catch (RepositoryException e) {
-                               throw new ArgeoException("Cannot compare " + o1 + " and " + o2, e);
+                               throw new SlcException("Cannot compare " + o1 + " and " + o2, e);
                        }
                        return 0;
                }

diff --git a/org.argeo.slc.client.ui/src/org/argeo/slc/client/ui/views/JcrResultTreeView.java b/org.argeo.slc.client.ui/src/org/argeo/slc/client/ui/views/JcrResultTreeView.java
index 1b1f85d403e0ade57de97376a924e89ba6decb95..b38d96af637dba4e2bc6508cac1aa2a12f8437d2 100644 (file)
--- a/org.argeo.slc.client.ui/src/org/argeo/slc/client/ui/views/JcrResultTreeView.java
+++ b/org.argeo.slc.client.ui/src/org/argeo/slc/client/ui/views/JcrResultTreeView.java
@@ -33,7 +33,6 @@ import javax.jcr.observation.Event;
 import javax.jcr.observation.EventListener;\r
 import javax.jcr.observation.ObservationManager;\r
 \r
-import org.argeo.ArgeoException;\r
 import org.argeo.eclipse.ui.jcr.AsyncUiEventListener;\r
 import org.argeo.eclipse.ui.workbench.CommandUtils;\r
 import org.argeo.jcr.JcrUtils;\r
@@ -281,7 +280,7 @@ public class JcrResultTreeView extends ViewPart {
                                                value = "Error";\r
                                        return value;\r
                                } catch (RepositoryException e) {\r
-                                       throw new ArgeoException(\r
+                                       throw new SlcException(\r
                                                        "Unexpected exception in label provider", e);\r
                                }\r
                        }\r
@@ -316,7 +315,7 @@ public class JcrResultTreeView extends ViewPart {
                                        }\r
                                        return value;\r
                                } catch (RepositoryException e) {\r
-                                       throw new ArgeoException(\r
+                                       throw new SlcException(\r
                                                        "Unexpected exception in label provider", e);\r
                                }\r
                        }\r
@@ -475,7 +474,7 @@ public class JcrResultTreeView extends ViewPart {
                                        "All results");\r
                        return roots;\r
                } catch (RepositoryException re) {\r
-                       throw new ArgeoException(\r
+                       throw new SlcException(\r
                                        "Unexpected error while initializing ResultTree.", re);\r
                }\r
        }\r
@@ -903,7 +902,7 @@ public class JcrResultTreeView extends ViewPart {
                                return new Object[] {};\r
 \r
                        } catch (RepositoryException e) {\r
-                               throw new ArgeoException("Cannot get element for "\r
+                               throw new SlcException("Cannot get element for "\r
                                                + inputElement, e);\r
                        }\r
                }\r

diff --git a/org.argeo.slc.core/src/org/argeo/slc/core/deploy/DigestCheck.java b/org.argeo.slc.core/src/org/argeo/slc/core/deploy/DigestCheck.java
index 5df54232c9b41ed8a754c49537f63b1921e8c18b..be8355fe36d1815fe363868086bfab09b15ab32d 100644 (file)
--- a/org.argeo.slc.core/src/org/argeo/slc/core/deploy/DigestCheck.java
+++ b/org.argeo.slc.core/src/org/argeo/slc/core/deploy/DigestCheck.java
@@ -19,18 +19,19 @@ import java.io.File;
 import java.io.IOException;
 
 import org.argeo.slc.SlcException;
-import org.argeo.util.security.DigestUtils;
 import org.springframework.core.io.Resource;
+import org.springframework.util.DigestUtils;
 
 /** Add Spring capabilities to {@link DigestUtils} */
 public class DigestCheck extends DigestUtils {
        public static String digest(String algorithm, Resource resource) {
                try {
                        File file = resource.getFile();
-                       return digest(algorithm, file);
+                       return org.argeo.util.DigestUtils.digest(algorithm, file);
                } catch (IOException e) {
                        try {
-                               return digest(algorithm, resource.getInputStream());
+                               return org.argeo.util.DigestUtils.digest(algorithm,
+                                               resource.getInputStream());
                        } catch (IOException e1) {
                                throw new SlcException("Cannot digest " + resource
                                                + " with algorithm " + algorithm, e);

diff --git a/org.argeo.slc.core/src/org/argeo/slc/core/test/SimpleTestResult.java b/org.argeo.slc.core/src/org/argeo/slc/core/test/SimpleTestResult.java
index 5fca5a9d739ed69ab0cd0a32dfa046c1fb3551c9..93306a5b4c48f8b6751ee8f1206be550235e84af 100644 (file)
--- a/org.argeo.slc.core/src/org/argeo/slc/core/test/SimpleTestResult.java
+++ b/org.argeo.slc.core/src/org/argeo/slc/core/test/SimpleTestResult.java
@@ -24,7 +24,6 @@ import java.util.Vector;
 \r
 import org.apache.commons.logging.Log;\r
 import org.apache.commons.logging.LogFactory;\r
-\r
 import org.argeo.slc.SlcException;\r
 import org.argeo.slc.test.TestResult;\r
 import org.argeo.slc.test.TestResultPart;\r

diff --git a/org.argeo.slc.core/src/org/argeo/slc/core/test/context/SimpleContextAware.java b/org.argeo.slc.core/src/org/argeo/slc/core/test/context/SimpleContextAware.java
index 8ed38720ccb961d327d552a4841d52f0791e090f..f10be56598305db295ade24a0b16fb9725f8b75a 100644 (file)
--- a/org.argeo.slc.core/src/org/argeo/slc/core/test/context/SimpleContextAware.java
+++ b/org.argeo.slc.core/src/org/argeo/slc/core/test/context/SimpleContextAware.java
@@ -18,11 +18,10 @@ package org.argeo.slc.core.test.context;
 import java.util.Map;\r
 import java.util.TreeMap;\r
 \r
-import org.springframework.beans.factory.InitializingBean;\r
-\r
 import org.argeo.slc.SlcException;\r
 import org.argeo.slc.test.context.ContextAware;\r
 import org.argeo.slc.test.context.ParentContextAware;\r
+import org.springframework.beans.factory.InitializingBean;\r
 \r
 public class SimpleContextAware implements ContextAware, InitializingBean {\r
        private ParentContextAware parentContext;\r

diff --git a/org.argeo.slc.core/src/org/argeo/slc/jcr/execution/JcrProcessThread.java b/org.argeo.slc.core/src/org/argeo/slc/jcr/execution/JcrProcessThread.java
index 8755829e7bba6e213b896c1d142ca82d65c22c45..9daeb4033cb0ca39fb9dfa91ce1099d862126434 100644 (file)
--- a/org.argeo.slc.core/src/org/argeo/slc/jcr/execution/JcrProcessThread.java
+++ b/org.argeo.slc.core/src/org/argeo/slc/jcr/execution/JcrProcessThread.java
@@ -22,8 +22,8 @@ import javax.jcr.Node;
 import javax.jcr.RepositoryException;
 import javax.jcr.Session;
 
-import org.argeo.ArgeoException;
 import org.argeo.jcr.JcrUtils;
+import org.argeo.slc.SlcException;
 import org.argeo.slc.core.execution.ProcessThread;
 import org.argeo.slc.execution.ExecutionModulesManager;
 import org.argeo.slc.execution.ExecutionProcess;
@@ -74,7 +74,7 @@ public class JcrProcessThread extends ProcessThread implements SlcNames {
                                        }
                                }
                        } catch (RepositoryException e) {
-                               throw new ArgeoException("Cannot process "
+                               throw new SlcException("Cannot process "
                                                + getJcrExecutionProcess().getNodePath(), e);
                        } finally {
                                JcrUtils.logoutQuietly(session);

diff --git a/org.argeo.slc.core/src/org/argeo/slc/osgi/OsgiExecutionResources.java b/org.argeo.slc.core/src/org/argeo/slc/osgi/OsgiExecutionResources.java
index 57f33cfc683927331597f8a63614d7749ffb30f8..306ad07a83be3c97b894fb71a57f040f7452393c 100644 (file)
--- a/org.argeo.slc.core/src/org/argeo/slc/osgi/OsgiExecutionResources.java
+++ b/org.argeo.slc.core/src/org/argeo/slc/osgi/OsgiExecutionResources.java
@@ -22,10 +22,10 @@ import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.argeo.slc.SlcException;
 import org.argeo.slc.core.execution.FileExecutionResources;
-import org.osgi.framework.BundleContext;
-import org.springframework.core.io.Resource;
 import org.eclipse.gemini.blueprint.context.BundleContextAware;
 import org.eclipse.gemini.blueprint.io.OsgiBundleResource;
+import org.osgi.framework.BundleContext;
+import org.springframework.core.io.Resource;
 
 /** Write access to resources in an OSGi context */
 public class OsgiExecutionResources extends FileExecutionResources implements

diff --git a/org.argeo.slc.core/src/org/argeo/slc/osgi/OsgiRuntime.java b/org.argeo.slc.core/src/org/argeo/slc/osgi/OsgiRuntime.java
index 2414649cdd4cc110abfa0af5ef3cc3049fd1bf1b..8286eccd5b97964bd0e702162ff865b9d8a84238 100644 (file)
--- a/org.argeo.slc.core/src/org/argeo/slc/osgi/OsgiRuntime.java
+++ b/org.argeo.slc.core/src/org/argeo/slc/osgi/OsgiRuntime.java
@@ -28,13 +28,13 @@ import org.argeo.slc.core.build.VersionedResourceDistribution;
 import org.argeo.slc.deploy.DeploymentData;
 import org.argeo.slc.deploy.DynamicRuntime;
 import org.argeo.slc.deploy.TargetData;
+import org.eclipse.gemini.blueprint.context.BundleContextAware;
 import org.osgi.framework.Bundle;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.BundleException;
 import org.springframework.context.ResourceLoaderAware;
 import org.springframework.core.io.Resource;
 import org.springframework.core.io.ResourceLoader;
-import org.eclipse.gemini.blueprint.context.BundleContextAware;
 
 public class OsgiRuntime implements BundleContextAware, ResourceLoaderAware,
                DynamicRuntime<OsgiBundle> {

diff --git a/org.argeo.slc.core/src/org/argeo/slc/osgi/build/AbstractOsgiModularDistribution.java b/org.argeo.slc.core/src/org/argeo/slc/osgi/build/AbstractOsgiModularDistribution.java
index a38adadccf2b073ce1ab210aacec78e660035790..c76659f09de71ccaed285077ccb43f843050948e 100644 (file)
--- a/org.argeo.slc.core/src/org/argeo/slc/osgi/build/AbstractOsgiModularDistribution.java
+++ b/org.argeo.slc.core/src/org/argeo/slc/osgi/build/AbstractOsgiModularDistribution.java
@@ -31,10 +31,10 @@ import org.argeo.slc.SlcException;
 import org.argeo.slc.UnsupportedException;
 import org.argeo.slc.build.Distribution;
 import org.argeo.slc.build.ModularDistribution;
+import org.eclipse.gemini.blueprint.context.BundleContextAware;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.Constants;
 import org.springframework.beans.factory.InitializingBean;
-import org.eclipse.gemini.blueprint.context.BundleContextAware;
 
 public abstract class AbstractOsgiModularDistribution implements
                ModularDistribution, BundleContextAware, InitializingBean {

diff --git a/org.argeo.slc.core/src/org/argeo/slc/osgi/build/OsgiRuntimeModularDistribution.java b/org.argeo.slc.core/src/org/argeo/slc/osgi/build/OsgiRuntimeModularDistribution.java
index 434ef0e090956e723692f55b2afc873150fbd313..5523e6efecdf85a1d32a098d48f571fd4b1f166f 100644 (file)
--- a/org.argeo.slc.core/src/org/argeo/slc/osgi/build/OsgiRuntimeModularDistribution.java
+++ b/org.argeo.slc.core/src/org/argeo/slc/osgi/build/OsgiRuntimeModularDistribution.java
@@ -24,11 +24,11 @@ import org.argeo.slc.NameVersion;
 import org.argeo.slc.build.Distribution;
 import org.argeo.slc.core.build.VersionedResourceDistribution;
 import org.argeo.slc.osgi.OsgiBundle;
+import org.eclipse.gemini.blueprint.util.OsgiBundleUtils;
 import org.osgi.framework.Bundle;
 import org.springframework.context.ResourceLoaderAware;
 import org.springframework.core.io.Resource;
 import org.springframework.core.io.ResourceLoader;
-import org.eclipse.gemini.blueprint.util.OsgiBundleUtils;
 
 public class OsgiRuntimeModularDistribution extends
                AbstractOsgiModularDistribution implements ResourceLoaderAware {

diff --git a/org.argeo.slc.core/src/org/argeo/slc/osgi/deploy/OsgiResourceSet.java b/org.argeo.slc.core/src/org/argeo/slc/osgi/deploy/OsgiResourceSet.java
index d95137e23f674f01ecb6140a091c0973fa17b441..2414788c8a2c379d163c551902d8416c8091e875 100644 (file)
--- a/org.argeo.slc.core/src/org/argeo/slc/osgi/deploy/OsgiResourceSet.java
+++ b/org.argeo.slc.core/src/org/argeo/slc/osgi/deploy/OsgiResourceSet.java
@@ -16,13 +16,13 @@
 package org.argeo.slc.osgi.deploy;
 
 import org.argeo.slc.core.deploy.DefaultResourceSet;
-import org.osgi.framework.Bundle;
-import org.osgi.framework.BundleContext;
-import org.springframework.core.io.ResourceLoader;
 import org.eclipse.gemini.blueprint.context.BundleContextAware;
 import org.eclipse.gemini.blueprint.io.OsgiBundleResourceLoader;
 import org.eclipse.gemini.blueprint.io.OsgiBundleResourcePatternResolver;
 import org.eclipse.gemini.blueprint.util.OsgiBundleUtils;
+import org.osgi.framework.Bundle;
+import org.osgi.framework.BundleContext;
+import org.springframework.core.io.ResourceLoader;
 
 /**
  * Retrieves ressources from an OSGi bundle either the active one or another one

diff --git a/org.argeo.slc.repo/src/org/argeo/slc/repo/ArtifactIndexer.java b/org.argeo.slc.repo/src/org/argeo/slc/repo/ArtifactIndexer.java
index 377b35a7534bc05ff2399d3c68144e46a2092e3c..be4075119572e1c69462f3e78919ebf1b82a7ca4 100644 (file)
--- a/org.argeo.slc.repo/src/org/argeo/slc/repo/ArtifactIndexer.java
+++ b/org.argeo.slc.repo/src/org/argeo/slc/repo/ArtifactIndexer.java
@@ -27,8 +27,8 @@ import org.argeo.slc.SlcException;
 import org.argeo.slc.aether.AetherUtils;
 import org.argeo.slc.jcr.SlcNames;
 import org.argeo.slc.jcr.SlcTypes;
-import org.osgi.framework.Constants;
 import org.eclipse.aether.artifact.Artifact;
+import org.osgi.framework.Constants;
 
 /**
  * Add {@link Artifact} properties to a {@link Node}. Does nothing if the node

diff --git a/org.argeo.slc.repo/src/org/argeo/slc/repo/ModularDistributionFactory.java b/org.argeo.slc.repo/src/org/argeo/slc/repo/ModularDistributionFactory.java
index af96f232d10198084a4bb926d023175dbf7969b8..efd64aec5be6e0a8f5c01cecc3b4b94d150871dc 100644 (file)
--- a/org.argeo.slc.repo/src/org/argeo/slc/repo/ModularDistributionFactory.java
+++ b/org.argeo.slc.repo/src/org/argeo/slc/repo/ModularDistributionFactory.java
@@ -22,9 +22,9 @@ import org.argeo.jcr.JcrUtils;
 import org.argeo.slc.CategorizedNameVersion;
 import org.argeo.slc.NameVersion;
 import org.argeo.slc.SlcException;
-import org.osgi.framework.Constants;
 import org.eclipse.aether.artifact.Artifact;
 import org.eclipse.aether.artifact.DefaultArtifact;
+import org.osgi.framework.Constants;
 
 /**
  * Creates a jar bundle from an ArgeoOsgiDistribution. This jar is then

diff --git a/org.argeo.slc.repo/src/org/argeo/slc/repo/ModularDistributionIndexer.java b/org.argeo.slc.repo/src/org/argeo/slc/repo/ModularDistributionIndexer.java
index 7b445345b1745d42f9ce65db7bbce6b6434e018a..0b2ecfb775700d97f221273715ba0b69069f60d7 100644 (file)
--- a/org.argeo.slc.repo/src/org/argeo/slc/repo/ModularDistributionIndexer.java
+++ b/org.argeo.slc.repo/src/org/argeo/slc/repo/ModularDistributionIndexer.java
@@ -28,9 +28,9 @@ import org.argeo.slc.aether.AetherUtils;
 import org.argeo.slc.build.Distribution;
 import org.argeo.slc.jcr.SlcNames;
 import org.argeo.slc.jcr.SlcTypes;
-import org.osgi.framework.Constants;
 import org.eclipse.aether.artifact.Artifact;
 import org.eclipse.aether.artifact.DefaultArtifact;
+import org.osgi.framework.Constants;
 
 /**
  * Create or update JCR meta-data for an SLC Modular Distribution

diff --git a/org.argeo.slc.repo/src/org/argeo/slc/repo/RepoSync.java b/org.argeo.slc.repo/src/org/argeo/slc/repo/RepoSync.java
index 0bdf6740f732b68500306473196f44fc5752733c..b3acaf4fdb97942f23940fc2b19d5ac696f0b496 100644 (file)
--- a/org.argeo.slc.repo/src/org/argeo/slc/repo/RepoSync.java
+++ b/org.argeo.slc.repo/src/org/argeo/slc/repo/RepoSync.java
@@ -44,7 +44,7 @@ import javax.jcr.query.QueryResult;
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.argeo.ArgeoMonitor;
+import org.argeo.jcr.JcrMonitor;
 import org.argeo.jcr.JcrUtils;
 import org.argeo.node.NodeUtils;
 import org.argeo.slc.SlcException;
@@ -84,7 +84,7 @@ public class RepoSync implements Runnable {
 
        private RepositoryFactory repositoryFactory;
 
-       private ArgeoMonitor monitor;
+       private JcrMonitor monitor;
        private Map<String, String> workspaceMap;
 
        // TODO fix monitor
@@ -578,7 +578,7 @@ public class RepoSync implements Runnable {
                        this.workspaceMap = null;
        }
 
-       public void setMonitor(ArgeoMonitor monitor) {
+       public void setMonitor(JcrMonitor monitor) {
                this.monitor = monitor;
        }
 

diff --git a/org.argeo.slc.repo/src/org/argeo/slc/repo/RepoUtils.java b/org.argeo.slc.repo/src/org/argeo/slc/repo/RepoUtils.java
index 3ac2f0b0b2e03ac7586e8ebafa66de597b55a0e3..e09f80cbaa53bee27bddb47a40e6359e1d642ce4 100644 (file)
--- a/org.argeo.slc.repo/src/org/argeo/slc/repo/RepoUtils.java
+++ b/org.argeo.slc.repo/src/org/argeo/slc/repo/RepoUtils.java
@@ -51,11 +51,12 @@ import org.apache.commons.io.FilenameUtils;
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.argeo.ArgeoMonitor;
+import org.argeo.jcr.JcrMonitor;
 import org.argeo.jcr.JcrUtils;
 import org.argeo.node.ArgeoNames;
 import org.argeo.node.ArgeoTypes;
 import org.argeo.node.NodeUtils;
+import org.argeo.node.security.Keyring;
 import org.argeo.slc.DefaultNameVersion;
 import org.argeo.slc.NameVersion;
 import org.argeo.slc.SlcException;
@@ -63,7 +64,6 @@ import org.argeo.slc.aether.ArtifactIdComparator;
 import org.argeo.slc.jcr.SlcNames;
 import org.argeo.slc.jcr.SlcTypes;
 import org.argeo.slc.repo.maven.MavenConventionsUtils;
-import org.argeo.util.security.Keyring;
 import org.eclipse.aether.artifact.Artifact;
 import org.eclipse.aether.artifact.DefaultArtifact;
 import org.osgi.framework.Constants;
@@ -552,7 +552,7 @@ public class RepoUtils implements ArgeoNames, SlcNames {
                copy(fromNode, toNode, null);
        }
 
-       public static void copy(Node fromNode, Node toNode, ArgeoMonitor monitor) {
+       public static void copy(Node fromNode, Node toNode, JcrMonitor monitor) {
                try {
                        String fromPath = fromNode.getPath();
                        if (monitor != null)

diff --git a/org.argeo.slc.repo/src/org/argeo/slc/repo/core/RepoServiceImpl.java b/org.argeo.slc.repo/src/org/argeo/slc/repo/core/RepoServiceImpl.java
index 45ea83ab788a8211ea7b2b749f9b8066b77fbd05..f3be316935dfc7cea470c6f3eb79055befec7528 100644 (file)
--- a/org.argeo.slc.repo/src/org/argeo/slc/repo/core/RepoServiceImpl.java
+++ b/org.argeo.slc.repo/src/org/argeo/slc/repo/core/RepoServiceImpl.java
@@ -4,9 +4,9 @@ import javax.jcr.Repository;
 import javax.jcr.RepositoryFactory;
 import javax.jcr.Session;
 
+import org.argeo.node.security.Keyring;
 import org.argeo.slc.repo.RepoService;
 import org.argeo.slc.repo.RepoUtils;
-import org.argeo.util.security.Keyring;
 
 /**
  * Work in Progress - enhance this. First implementation of a service that

diff --git a/org.argeo.slc.repo/src/org/argeo/slc/repo/maven/GenerateBinaries.java b/org.argeo.slc.repo/src/org/argeo/slc/repo/maven/GenerateBinaries.java
index a745bb22e25e8ddd26c38dda870b4b08b96df541..bfba8d01c6fb3d778fe28de38dc30028051255cd 100644 (file)
--- a/org.argeo.slc.repo/src/org/argeo/slc/repo/maven/GenerateBinaries.java
+++ b/org.argeo.slc.repo/src/org/argeo/slc/repo/maven/GenerateBinaries.java
@@ -30,7 +30,7 @@ import javax.jcr.Session;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.argeo.ArgeoMonitor;
+import org.argeo.jcr.JcrMonitor;
 import org.argeo.jcr.JcrUtils;
 import org.argeo.slc.SlcException;
 import org.argeo.slc.aether.ArtifactIdComparator;
@@ -39,9 +39,9 @@ import org.argeo.slc.jcr.SlcTypes;
 import org.argeo.slc.repo.ArtifactIndexer;
 import org.argeo.slc.repo.RepoConstants;
 import org.argeo.slc.repo.RepoUtils;
-import org.osgi.framework.Version;
 import org.eclipse.aether.artifact.Artifact;
 import org.eclipse.aether.artifact.DefaultArtifact;
+import org.osgi.framework.Version;
 
 /**
  * Generates binaries-, sources- and sdk-version.pom artifacts for a given
@@ -101,7 +101,7 @@ public class GenerateBinaries implements Runnable, SlcNames {
         * indexed.
         */
        public static void processGroupNode(Node groupNode, String version,
-                       ArgeoMonitor monitor) throws RepositoryException {
+                       JcrMonitor monitor) throws RepositoryException {
                // TODO set artifactsBase based on group node
                GenerateBinaries gb = new GenerateBinaries();
                String groupId = groupNode.getProperty(SlcNames.SLC_GROUP_BASE_ID)
@@ -115,7 +115,7 @@ public class GenerateBinaries implements Runnable, SlcNames {
 
        /** Only builds local indexes. Does not change anything in the local Session */
        public static GenerateBinaries preProcessGroupNode(Node groupNode,
-                       ArgeoMonitor monitor) throws RepositoryException {
+                       JcrMonitor monitor) throws RepositoryException {
                // TODO set artifactsBase based on group node
                GenerateBinaries gb = new GenerateBinaries();
                String groupId = groupNode.getProperty(SlcNames.SLC_GROUP_BASE_ID)
@@ -148,7 +148,7 @@ public class GenerateBinaries implements Runnable, SlcNames {
         * methods build the binaries {@code Set<Artifact>} and other indexes. It
         * does not impact the
         */
-       protected void internalPreProcessing(Node groupNode, ArgeoMonitor monitor)
+       protected void internalPreProcessing(Node groupNode, JcrMonitor monitor)
                        throws RepositoryException {
                if (monitor != null)
                        monitor.subTask("Pre processing group " + groupId);
@@ -187,7 +187,7 @@ public class GenerateBinaries implements Runnable, SlcNames {
        }
 
        /** Does the real job : writes JCR META-DATA and generates binaries */
-       protected void internalProcessing(Node groupNode, ArgeoMonitor monitor)
+       protected void internalProcessing(Node groupNode, JcrMonitor monitor)
                        throws RepositoryException {
                if (monitor != null)
                        monitor.subTask("Processing group " + groupId);

diff --git a/org.argeo.slc.repo/src/org/argeo/slc/repo/maven/ImportMavenDependencies.java b/org.argeo.slc.repo/src/org/argeo/slc/repo/maven/ImportMavenDependencies.java
index c2b4203747f537116689a185719f640a43b7c99d..009d1f9ed7f3043f505294f0d20bffa1516bd378 100644 (file)
--- a/org.argeo.slc.repo/src/org/argeo/slc/repo/maven/ImportMavenDependencies.java
+++ b/org.argeo.slc.repo/src/org/argeo/slc/repo/maven/ImportMavenDependencies.java
@@ -42,8 +42,8 @@ import org.argeo.slc.repo.JarFileIndexer;
 import org.argeo.slc.repo.RepoConstants;
 import org.argeo.slc.repo.RepoUtils;
 import org.eclipse.aether.artifact.Artifact;
-import org.eclipse.aether.graph.DependencyNode;
 import org.eclipse.aether.artifact.DefaultArtifact;
+import org.eclipse.aether.graph.DependencyNode;
 
 /**
  * Import all the dependencies listed in a POM and their dependency graphs to a

diff --git a/org.argeo.slc.repo/src/org/argeo/slc/repo/maven/Migration_01_03.java b/org.argeo.slc.repo/src/org/argeo/slc/repo/maven/Migration_01_03.java
index 7eb2e523ec982acdff19280b243463a6ea6acc2e..1be5a808614294f14163fa9b5074d8fee4fd8ced 100644 (file)
--- a/org.argeo.slc.repo/src/org/argeo/slc/repo/maven/Migration_01_03.java
+++ b/org.argeo.slc.repo/src/org/argeo/slc/repo/maven/Migration_01_03.java
@@ -49,9 +49,9 @@ import org.argeo.slc.repo.ArtifactIndexer;
 import org.argeo.slc.repo.JarFileIndexer;
 import org.argeo.slc.repo.RepoUtils;
 import org.argeo.slc.repo.osgi.OsgiProfile;
-import org.osgi.framework.Constants;
 import org.eclipse.aether.artifact.Artifact;
 import org.eclipse.aether.artifact.DefaultArtifact;
+import org.osgi.framework.Constants;
 
 /**
  * Migrate the distribution from 1.2 to 1.4 by cleaning naming and dependencies.

diff --git a/org.argeo.slc.repo/src/org/argeo/slc/repo/osgi/BndWrapper.java b/org.argeo.slc.repo/src/org/argeo/slc/repo/osgi/BndWrapper.java
index 3f4dbea673ad92fdfa0d9dff0bc67a6ad92cef5c..17bdbe11772ab1a71a40d82d8e533b3a36175bee 100644 (file)
--- a/org.argeo.slc.repo/src/org/argeo/slc/repo/osgi/BndWrapper.java
+++ b/org.argeo.slc.repo/src/org/argeo/slc/repo/osgi/BndWrapper.java
@@ -13,9 +13,9 @@ import org.argeo.slc.CategorizedNameVersion;
 import org.argeo.slc.SlcException;
 import org.argeo.slc.build.Distribution;
 import org.argeo.slc.build.License;
-import org.osgi.framework.Version;
 import org.eclipse.aether.artifact.Artifact;
 import org.eclipse.aether.artifact.DefaultArtifact;
+import org.osgi.framework.Version;
 import org.springframework.beans.factory.BeanNameAware;
 
 import aQute.lib.osgi.Builder;

diff --git a/org.argeo.slc.repo/src/org/argeo/slc/repo/osgi/MavenWrapper.java b/org.argeo.slc.repo/src/org/argeo/slc/repo/osgi/MavenWrapper.java
index a00a2bd4f7d9920c2c8e66723e7a946314d5da74..a5b6ec9341501e08650a405a92dfc97853baf91e 100644 (file)
--- a/org.argeo.slc.repo/src/org/argeo/slc/repo/osgi/MavenWrapper.java
+++ b/org.argeo.slc.repo/src/org/argeo/slc/repo/osgi/MavenWrapper.java
@@ -5,7 +5,6 @@ import java.io.InputStream;
 
 import javax.jcr.Node;
 import javax.jcr.Property;
-import javax.jcr.RepositoryException;
 import javax.jcr.Session;
 
 import org.apache.commons.io.IOUtils;

diff --git a/org.argeo.slc.repo/src/org/argeo/slc/repo/osgi/NormalizeGroup.java b/org.argeo.slc.repo/src/org/argeo/slc/repo/osgi/NormalizeGroup.java
index ef61bf11c57f3701ac32e25068c4424f293c2ff1..c7a3bcd533714360ce2b7e6cd583476ec562cb45 100644 (file)
--- a/org.argeo.slc.repo/src/org/argeo/slc/repo/osgi/NormalizeGroup.java
+++ b/org.argeo.slc.repo/src/org/argeo/slc/repo/osgi/NormalizeGroup.java
@@ -32,7 +32,7 @@ import javax.jcr.Session;
 import org.apache.commons.io.FilenameUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.argeo.ArgeoMonitor;
+import org.argeo.jcr.JcrMonitor;
 import org.argeo.jcr.JcrUtils;
 import org.argeo.slc.SlcException;
 import org.argeo.slc.aether.ArtifactIdComparator;
@@ -42,10 +42,10 @@ import org.argeo.slc.repo.ArtifactIndexer;
 import org.argeo.slc.repo.RepoConstants;
 import org.argeo.slc.repo.RepoUtils;
 import org.argeo.slc.repo.maven.MavenConventionsUtils;
-import org.osgi.framework.Constants;
-import org.osgi.framework.Version;
 import org.eclipse.aether.artifact.Artifact;
 import org.eclipse.aether.artifact.DefaultArtifact;
+import org.osgi.framework.Constants;
+import org.osgi.framework.Version;
 
 /**
  * Make sure that all JCR metadata and Maven metadata are consistent for this
@@ -100,7 +100,7 @@ public class NormalizeGroup implements Runnable, SlcNames {
        }
 
        public static void processGroupNode(Node groupNode, String version,
-                       Boolean overridePoms, ArgeoMonitor monitor)
+                       Boolean overridePoms, JcrMonitor monitor)
                        throws RepositoryException {
                // TODO set artifactsBase based on group node
                NormalizeGroup ng = new NormalizeGroup();
@@ -112,7 +112,7 @@ public class NormalizeGroup implements Runnable, SlcNames {
                ng.processGroupNode(groupNode, monitor);
        }
 
-       protected void processGroupNode(Node groupNode, ArgeoMonitor monitor)
+       protected void processGroupNode(Node groupNode, JcrMonitor monitor)
                        throws RepositoryException {
                if (monitor != null)
                        monitor.subTask("Group " + groupId);

diff --git a/org.argeo.slc.repo/src/org/argeo/slc/repo/osgi/ProcessDistribution.java b/org.argeo.slc.repo/src/org/argeo/slc/repo/osgi/ProcessDistribution.java
index 74c54252827a4d3c9330ba14c2d68fd017ca5981..7f59990379b9283ab0983837773d31e418e80bd3 100644 (file)
--- a/org.argeo.slc.repo/src/org/argeo/slc/repo/osgi/ProcessDistribution.java
+++ b/org.argeo.slc.repo/src/org/argeo/slc/repo/osgi/ProcessDistribution.java
@@ -9,7 +9,6 @@ import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.argeo.jcr.JcrUtils;
 import org.argeo.slc.CategorizedNameVersion;
-import org.argeo.slc.DefaultNameVersion;
 import org.argeo.slc.NameVersion;
 import org.argeo.slc.SlcException;
 import org.argeo.slc.repo.ArgeoOsgiDistribution;

diff --git a/org.argeo.slc.support/ext/test/org/argeo/slc/aether/AetherUtilsTest.java b/org.argeo.slc.support/ext/test/org/argeo/slc/aether/AetherUtilsTest.java
index ba22397bde7542c78b54365ee17e0a4e0262e9d3..6f1370187fd6f90646e61c02beef88e41e6c08b1 100644 (file)
--- a/org.argeo.slc.support/ext/test/org/argeo/slc/aether/AetherUtilsTest.java
+++ b/org.argeo.slc.support/ext/test/org/argeo/slc/aether/AetherUtilsTest.java
@@ -15,11 +15,11 @@
  */
 package org.argeo.slc.aether;
 
+import junit.framework.TestCase;
+
 import org.eclipse.aether.artifact.Artifact;
 import org.eclipse.aether.artifact.DefaultArtifact;
 
-import junit.framework.TestCase;
-
 public class AetherUtilsTest extends TestCase {
        public void testConvertPathToArtifact() throws Exception {
                checkPathConversion("my.group.id:my-artifactId:pom:1.2.3",

diff --git a/org.argeo.slc.support/src/org/argeo/slc/aether/AetherUtils.java b/org.argeo.slc.support/src/org/argeo/slc/aether/AetherUtils.java
index 8da332b5738d2e0439bb1427b5bf59c71fc204b2..873ddcbfd75a1b5e6a9b516547fdeb4434bae198 100644 (file)
--- a/org.argeo.slc.support/src/org/argeo/slc/aether/AetherUtils.java
+++ b/org.argeo.slc.support/src/org/argeo/slc/aether/AetherUtils.java
@@ -22,8 +22,8 @@ import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.argeo.slc.SlcException;
 import org.eclipse.aether.artifact.Artifact;
-import org.eclipse.aether.graph.DependencyNode;
 import org.eclipse.aether.artifact.DefaultArtifact;
+import org.eclipse.aether.graph.DependencyNode;
 
 /** Utilities related to Aether */
 public class AetherUtils {

diff --git a/org.argeo.slc.unit/src/org/argeo/slc/equinox/unit/AbstractOsgiRuntimeTestCase.java b/org.argeo.slc.unit/src/org/argeo/slc/equinox/unit/AbstractOsgiRuntimeTestCase.java
index b5bd8aa6226740d073fdd17d8335886668205542..2bcf96029c566d9c21dea0d001deed6d6a925ccd 100644 (file)
--- a/org.argeo.slc.unit/src/org/argeo/slc/equinox/unit/AbstractOsgiRuntimeTestCase.java
+++ b/org.argeo.slc.unit/src/org/argeo/slc/equinox/unit/AbstractOsgiRuntimeTestCase.java
@@ -24,15 +24,15 @@ import junit.framework.TestCase;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.argeo.slc.SlcException;
 import org.argeo.osgi.boot.OsgiBoot;
+import org.argeo.slc.SlcException;
 import org.eclipse.core.runtime.adaptor.EclipseStarter;
+import org.eclipse.gemini.blueprint.util.OsgiStringUtils;
 import org.osgi.framework.Bundle;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.InvalidSyntaxException;
 import org.osgi.framework.ServiceReference;
 import org.springframework.context.ApplicationContext;
-import org.eclipse.gemini.blueprint.util.OsgiStringUtils;
 
 @SuppressWarnings("restriction")
 public abstract class AbstractOsgiRuntimeTestCase extends TestCase {

diff --git a/org.argeo.slc.unit/src/org/argeo/slc/unit/UnitUtils.java b/org.argeo.slc.unit/src/org/argeo/slc/unit/UnitUtils.java
index 765ec70d8c3bfd715c09445efd794c3640593024..75cc578e5b46f7dfde2be2cff378bd11b11ba354 100644 (file)
--- a/org.argeo.slc.unit/src/org/argeo/slc/unit/UnitUtils.java
+++ b/org.argeo.slc.unit/src/org/argeo/slc/unit/UnitUtils.java
@@ -15,14 +15,14 @@
  */\r
 package org.argeo.slc.unit;\r
 \r
+import static junit.framework.Assert.assertEquals;\r
+import static junit.framework.Assert.assertNotNull;\r
+import static junit.framework.Assert.assertNull;\r
+\r
 import java.util.Calendar;\r
 import java.util.Date;\r
 import java.util.GregorianCalendar;\r
 \r
-import static junit.framework.Assert.assertEquals;\r
-import static junit.framework.Assert.assertNull;\r
-import static junit.framework.Assert.assertNotNull;\r
-\r
 public abstract class UnitUtils {\r
        public static void assertDateSec(Date expected, Date reached) {\r
                if (expected == null) {\r