73 files changed:
filter="(argeo.jcr.repository.alias=node)" />\r
\r
<reference id="repositoryFactory" interface="javax.jcr.RepositoryFactory" />\r
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
\r
</beans:beans>
\ No newline at end of file
import javax.jcr.Session;
import javax.jcr.nodetype.NodeType;
import javax.servlet.ServletException;
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.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
import org.apache.commons.io.IOUtils;
import org.argeo.jcr.JcrUtils;
import org.argeo.slc.SlcException;
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;
/**
//import org.eclipse.rap.rwt.service.IServiceHandler;
/**
import org.argeo.slc.SlcException;
import org.argeo.slc.client.rap.OpenJcrFileService;
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;
import org.argeo.slc.repo.RepoService;
import org.eclipse.core.commands.AbstractHandler;
import org.eclipse.core.commands.ExecutionEvent;
filter="(argeo.jcr.repository.alias=java)" />\r
\r
<reference id="repositoryFactory" interface="javax.jcr.RepositoryFactory" />\r
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
\r
<reference id="nodeRepository" interface="javax.jcr.Repository"\r
filter="(argeo.jcr.repository.alias=home)" />\r
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
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.jcr.JcrUtils;
+import org.argeo.security.ui.PrivilegedJob;
import org.argeo.slc.SlcConstants;
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.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;
import org.argeo.slc.client.ui.dist.utils.CommandHelpers;
import org.argeo.slc.repo.JavaRepoManager;
import org.argeo.slc.repo.RepoUtils;
protected IStatus doRun(IProgressMonitor progressMonitor) {
long begin = System.currentTimeMillis();
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");
monitor.beginTask("Copy workspace", -1);
monitor.subTask("Copying nodes");
});
} catch (RepositoryException re) {
});
} catch (RepositoryException re) {
- throw new ArgeoException(
+ throw new SlcException(
"Unexpected error while creating the new workspace.",
re);
} finally {
"Unexpected error while creating the new workspace.",
re);
} finally {
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
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.jcr.JcrUtils;
+import org.argeo.node.security.Keyring;
import org.argeo.security.ui.PrivilegedJob;
import org.argeo.slc.SlcConstants;
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.slc.client.ui.dist.DistPlugin;
import org.argeo.slc.client.ui.dist.utils.CommandHelpers;
import org.argeo.slc.repo.RepoUtils;
-import org.argeo.util.security.Keyring;
import org.eclipse.core.commands.AbstractHandler;
import org.eclipse.core.commands.ExecutionEvent;
import org.eclipse.core.commands.ExecutionException;
import org.eclipse.core.commands.AbstractHandler;
import org.eclipse.core.commands.ExecutionEvent;
import org.eclipse.core.commands.ExecutionException;
protected IStatus doRun(IProgressMonitor progressMonitor) {
long begin = System.currentTimeMillis();
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");
monitor.beginTask("Copy workspace", -1);
monitor.subTask("Copying nodes");
monitor.worked(1);
} catch (RepositoryException re) {
monitor.worked(1);
} catch (RepositoryException re) {
- throw new ArgeoException(
+ throw new SlcException(
"Unexpected error while creating the new workspace.",
re);
} finally {
"Unexpected error while creating the new workspace.",
re);
} finally {
import org.apache.commons.logging.LogFactory;
import org.argeo.eclipse.ui.dialogs.ErrorFeedback;
import org.argeo.jcr.JcrUtils;
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.slc.SlcConstants;
import org.argeo.slc.client.ui.dist.DistPlugin;
import org.argeo.slc.client.ui.dist.utils.CommandHelpers;
import org.argeo.slc.repo.RepoUtils;
-import org.argeo.util.security.Keyring;
import org.eclipse.core.commands.AbstractHandler;
import org.eclipse.core.commands.ExecutionEvent;
import org.eclipse.core.commands.ExecutionException;
import org.eclipse.core.commands.AbstractHandler;
import org.eclipse.core.commands.ExecutionEvent;
import org.eclipse.core.commands.ExecutionException;
import javax.jcr.Node;
import javax.jcr.RepositoryException;
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;
import org.argeo.slc.client.ui.dist.DistPlugin;
import org.argeo.slc.jcr.SlcTypes;
import org.eclipse.core.commands.AbstractHandler;
}
// CommandHelpers.callCommand(RefreshDistributionOverviewPage.ID);
} catch (RepositoryException re) {
}
// CommandHelpers.callCommand(RefreshDistributionOverviewPage.ID);
} catch (RepositoryException re) {
- throw new ArgeoException(
+ throw new SlcException(
"Unexpected error while deleting artifacts.", re);
}
return null;
"Unexpected error while deleting artifacts.", re);
}
return null;
import javax.jcr.nodetype.NodeType;
import org.argeo.jcr.JcrUtils;
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.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;
import org.eclipse.core.commands.AbstractHandler;
import org.eclipse.core.commands.ExecutionEvent;
import org.eclipse.core.commands.ExecutionException;
import javax.jcr.Session;
import org.argeo.jcr.JcrUtils;
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.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;
import org.eclipse.core.commands.AbstractHandler;
import org.eclipse.core.commands.ExecutionEvent;
import org.eclipse.core.commands.ExecutionException;
import javax.jcr.RepositoryException;
import javax.jcr.Session;
import javax.jcr.RepositoryException;
import javax.jcr.Session;
-import org.argeo.ArgeoException;
import org.argeo.jcr.JcrUtils;
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;
import org.argeo.slc.client.ui.dist.DistPlugin;
import org.argeo.slc.client.ui.dist.wizards.ChangeRightsWizard;
import org.eclipse.core.commands.AbstractHandler;
dialog.open();
return null;
} catch (RepositoryException re) {
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);
+ repository + " in workspace " + workspaceName, re);
} finally {
JcrUtils.logoutQuietly(session);
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
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.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.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;
import org.eclipse.core.commands.AbstractHandler;
import org.eclipse.core.commands.ExecutionEvent;
import org.eclipse.core.commands.ExecutionException;
if (log.isDebugEnabled())
log.debug("Will copy " + expectedCount + " files...");
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());
eclipseMonitor
.beginTask("Copy files", expectedCount.intValue());
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
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.jcr.JcrUtils;
+import org.argeo.node.security.Keyring;
import org.argeo.slc.NameVersion;
import org.argeo.slc.SlcException;
import org.argeo.slc.aether.AetherUtils;
import org.argeo.slc.NameVersion;
import org.argeo.slc.SlcException;
import org.argeo.slc.aether.AetherUtils;
import org.argeo.slc.repo.RepoUtils;
import org.argeo.slc.repo.maven.MavenConventionsUtils;
import org.argeo.slc.repo.osgi.NormalizeGroup;
import org.argeo.slc.repo.RepoUtils;
import org.argeo.slc.repo.maven.MavenConventionsUtils;
import org.argeo.slc.repo.osgi.NormalizeGroup;
-import org.argeo.util.security.Keyring;
import org.eclipse.aether.artifact.Artifact;
import org.eclipse.aether.artifact.DefaultArtifact;
import org.eclipse.core.commands.AbstractHandler;
import org.eclipse.aether.artifact.Artifact;
import org.eclipse.aether.artifact.DefaultArtifact;
import org.eclipse.core.commands.AbstractHandler;
protected IStatus run(IProgressMonitor progressMonitor) {
try {
protected IStatus run(IProgressMonitor progressMonitor) {
try {
- ArgeoMonitor monitor = new EclipseArgeoMonitor(progressMonitor);
+ JcrMonitor monitor = new EclipseJcrMonitor(progressMonitor);
// normalize artifacts
Query countQuery = session
.getWorkspace()
// normalize artifacts
Query countQuery = session
.getWorkspace()
}
private class NormalizingTraverser extends TraversingItemVisitor {
}
private class NormalizingTraverser extends TraversingItemVisitor {
- public NormalizingTraverser(ArgeoMonitor monitor) {
+ public NormalizingTraverser(JcrMonitor monitor) {
super();
this.monitor = monitor;
}
super();
this.monitor = monitor;
}
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
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.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.SlcException;
import org.argeo.slc.client.ui.dist.DistPlugin;
import org.argeo.slc.jcr.SlcNames;
import org.argeo.slc.repo.PdeSourcesIndexer;
import org.argeo.slc.repo.RepoConstants;
import org.argeo.slc.repo.RepoUtils;
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;
import org.eclipse.core.commands.AbstractHandler;
import org.eclipse.core.commands.ExecutionEvent;
import org.eclipse.core.commands.ExecutionException;
@Override
protected IStatus run(IProgressMonitor progressMonitor) {
try {
@Override
protected IStatus run(IProgressMonitor progressMonitor) {
try {
- ArgeoMonitor monitor = new EclipseArgeoMonitor(progressMonitor);
+ JcrMonitor monitor = new EclipseJcrMonitor(progressMonitor);
// Normalize artifacts
Query countQuery = session
.getWorkspace()
// Normalize artifacts
Query countQuery = session
.getWorkspace()
}
private class NormalizingTraverser extends TraversingItemVisitor {
}
private class NormalizingTraverser extends TraversingItemVisitor {
- public NormalizingTraverser(ArgeoMonitor monitor) {
+ public NormalizingTraverser(JcrMonitor monitor) {
super();
this.monitor = monitor;
}
super();
this.monitor = monitor;
}
import javax.jcr.Session;
import javax.jcr.security.Privilege;
import javax.jcr.Session;
import javax.jcr.security.Privilege;
-import org.argeo.ArgeoException;
import org.argeo.jcr.JcrUtils;
import org.argeo.jcr.JcrUtils;
+import org.argeo.node.security.Keyring;
import org.argeo.slc.SlcConstants;
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.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;
import org.eclipse.core.commands.AbstractHandler;
import org.eclipse.core.commands.ExecutionEvent;
import org.eclipse.core.commands.ExecutionException;
// CommandHelpers.callCommand(RefreshDistributionsView.ID);
}
} catch (RepositoryException re) {
// CommandHelpers.callCommand(RefreshDistributionsView.ID);
}
} catch (RepositoryException re) {
- throw new ArgeoException(
+ throw new SlcException(
"Unexpected error while publishing workspace "
+ workspaceName, re);
} finally {
"Unexpected error while publishing workspace "
+ workspaceName, re);
} finally {
import javax.jcr.RepositoryFactory;
import org.argeo.node.ArgeoNames;
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.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;
import org.eclipse.core.commands.AbstractHandler;
import org.eclipse.core.commands.ExecutionEvent;
import org.eclipse.core.commands.ExecutionException;
import org.argeo.slc.jcr.SlcNames;
import org.argeo.slc.repo.RepoUtils;
import org.argeo.slc.repo.maven.MavenConventionsUtils;
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;
import org.eclipse.core.commands.AbstractHandler;
import org.eclipse.core.commands.ExecutionEvent;
import org.eclipse.core.commands.ExecutionException;
import org.eclipse.core.runtime.Status;
import org.eclipse.core.runtime.jobs.Job;
import org.eclipse.jface.resource.ImageDescriptor;
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 {
/** <b>UNDER DEVELOPMENT</b>. Download and prepare an OSGi runtime */
public class RunInOsgi extends AbstractHandler implements SlcNames {
import javax.jcr.Property;
import javax.jcr.RepositoryException;
import javax.jcr.Property;
import javax.jcr.RepositoryException;
-import org.argeo.ArgeoException;
import org.argeo.jcr.JcrUtils;
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;
import org.argeo.slc.client.ui.dist.DistConstants;
import org.argeo.slc.client.ui.dist.DistImages;
import org.argeo.slc.jcr.SlcTypes;
}
}
} catch (RepositoryException re) {
}
}
} catch (RepositoryException re) {
- throw new ArgeoException(
+ throw new SlcException(
"Unexepected error while getting property values", re);
}
return null;
"Unexepected error while getting property values", re);
}
return null;
import javax.jcr.NodeIterator;
import javax.jcr.RepositoryException;
import javax.jcr.NodeIterator;
import javax.jcr.RepositoryException;
-import org.argeo.ArgeoException;
import org.argeo.eclipse.ui.jcr.utils.JcrItemsComparator;
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;
import org.argeo.slc.jcr.SlcTypes;
import org.eclipse.jface.viewers.ITreeContentProvider;
import org.eclipse.jface.viewers.Viewer;
}
} catch (RepositoryException e) {
}
} catch (RepositoryException e) {
- throw new ArgeoException(
+ throw new SlcException(
"Unexpected exception while listing node properties", e);
}
return elements;
"Unexpected exception while listing node properties", e);
}
return elements;
return true;
}
} catch (RepositoryException e) {
return true;
}
} catch (RepositoryException e) {
- throw new ArgeoException(
+ throw new SlcException(
"Unexpected exception while checking if property is multiple",
e);
}
"Unexpected exception while checking if property is multiple",
e);
}
import javax.jcr.Session;
import org.argeo.jcr.JcrUtils;
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.slc.SlcException;
import org.argeo.slc.repo.RepoUtils;
-import org.argeo.util.security.Keyring;
/**
* Provide shortcuts to retrieve sessions, repositories and workspaces that are
/**
* Provide shortcuts to retrieve sessions, repositories and workspaces that are
import org.argeo.node.ArgeoNames;
import org.argeo.node.ArgeoTypes;
import org.argeo.node.NodeUtils;
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.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;
import org.eclipse.jface.viewers.ITreeContentProvider;
import org.eclipse.jface.viewers.Viewer;
import javax.jcr.RepositoryException;
import javax.jcr.Session;
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.jcr.JcrUtils;
import org.argeo.slc.SlcException;
import org.argeo.slc.client.ui.dist.DistPlugin;
addPage(new BundleDependencyPage(this, "Dependencies ", artifact));
addPage(new BundleRawPage(this, "Raw Meta-Data ", artifact));
} catch (PartInitException e) {
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);
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
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;
import org.argeo.slc.SlcException;
import org.argeo.slc.build.License;
import org.argeo.slc.client.ui.dist.DistConstants;
sb.append("</dependency>");
return sb.toString();
} catch (RepositoryException re) {
sb.append("</dependency>");
return sb.toString();
} catch (RepositoryException re) {
- throw new ArgeoException(
+ throw new SlcException(
"unexpected error while generating maven snippet");
}
}
"unexpected error while generating maven snippet");
}
}
import javax.jcr.Value;
import javax.jcr.nodetype.NodeType;
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;
import org.argeo.slc.client.ui.dist.DistImages;
import org.argeo.slc.client.ui.dist.utils.DistUiHelpers;
import org.argeo.slc.jcr.SlcNames;
}
}
} catch (RepositoryException e) {
}
}
} catch (RepositoryException e) {
- throw new ArgeoException(
+ throw new SlcException(
"unexpected error while getting artifact information",
e);
}
"unexpected error while getting artifact information",
e);
}
}
} catch (RepositoryException e) {
}
} catch (RepositoryException e) {
- throw new ArgeoException(
+ throw new SlcException(
"Unexpected exception while listing node properties", e);
}
return elements.toArray();
"Unexpected exception while listing node properties", e);
}
return elements.toArray();
return elements.toArray();
}
} catch (RepositoryException e) {
return elements.toArray();
}
} catch (RepositoryException e) {
- throw new ArgeoException(
+ throw new SlcException(
"Unexpected error getting multiple values property.", e);
}
return result;
"Unexpected error getting multiple values property.", e);
}
return result;
return true;
}
} catch (RepositoryException e) {
return true;
}
} catch (RepositoryException e) {
- throw new ArgeoException(
+ throw new SlcException(
"Unexpected exception while checking if property is multiple",
e);
}
"Unexpected exception while checking if property is multiple",
e);
}
import javax.jcr.query.qom.Selector;
import javax.jcr.query.qom.StaticOperand;
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.eclipse.ui.workbench.CommandUtils;
+import org.argeo.jcr.JcrMonitor;
import org.argeo.jcr.JcrUtils;
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.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;
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;
@Override
protected IStatus doRun(IProgressMonitor progressMonitor) {
try {
@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));
monitor.beginTask("Getting bundle list", -1);
final List<Node> result = JcrUtils
.nodeIteratorToList(listBundleArtifacts(session, filter));
import javax.jcr.RepositoryFactory;
import javax.jcr.Session;
import javax.jcr.RepositoryFactory;
import javax.jcr.Session;
-import org.argeo.ArgeoException;
import org.argeo.jcr.JcrUtils;
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.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;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.ui.IEditorInput;
import org.eclipse.ui.IEditorSite;
addPage(new WkspCategoryBaseListPage(this, "Groups ",
businessSession));
} catch (PartInitException e) {
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);
import javax.jcr.Node;
import javax.jcr.RepositoryException;
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;
import org.argeo.slc.SlcException;
import org.argeo.slc.jcr.SlcNames;
import org.eclipse.swt.SWT;
sb.append("</dependency>");
return sb.toString();
} catch (RepositoryException re) {
sb.append("</dependency>");
return sb.toString();
} catch (RepositoryException re) {
- throw new ArgeoException(
+ throw new SlcException(
"unexpected error while generating maven snippet");
}
}
"unexpected error while generating maven snippet");
}
}
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.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.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;
//import org.argeo.slc.client.ui.specific.OpenJcrFile;
//import org.argeo.slc.client.ui.specific.OpenJcrFileCmdId;
import org.argeo.slc.jcr.SlcNames;
import javax.jcr.query.qom.QueryObjectModelFactory;
import javax.jcr.query.qom.Selector;
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;
import org.argeo.slc.SlcException;
import org.argeo.slc.jcr.SlcNames;
import org.argeo.slc.jcr.SlcTypes;
}
return super.getChildren();
} catch (RepositoryException re) {
}
return super.getChildren();
} catch (RepositoryException re) {
- throw new ArgeoException("Unable to retrieve children for "
+ throw new SlcException("Unable to retrieve children for "
+ modularDistVersionBase, re);
}
}
+ modularDistVersionBase, re);
}
}
import org.argeo.jcr.JcrUtils;
import org.argeo.node.ArgeoNames;
import org.argeo.node.NodeUtils;
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.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
/**
* Abstract a repository. It might be persisted by a node in the current user
import javax.jcr.RepositoryException;
import javax.jcr.Session;
import javax.jcr.RepositoryException;
import javax.jcr.Session;
-import org.argeo.ArgeoException;
import org.argeo.jcr.JcrUtils;
import org.argeo.jcr.JcrUtils;
+import org.argeo.slc.SlcException;
/**
* Abstract set of similar workspaces, that is a bunch of workspaces with same
/**
* Abstract set of similar workspaces, that is a bunch of workspaces with same
wkpName));
}
} catch (RepositoryException e) {
wkpName));
}
} catch (RepositoryException e) {
- throw new ArgeoException("Cannot retrieve workspace names", e);
+ throw new SlcException("Cannot retrieve workspace names", e);
import javax.jcr.query.qom.QueryObjectModelFactory;
import javax.jcr.query.qom.Selector;
import javax.jcr.query.qom.QueryObjectModelFactory;
import javax.jcr.query.qom.Selector;
-import org.argeo.ArgeoException;
import org.argeo.jcr.JcrUtils;
import org.argeo.jcr.JcrUtils;
+import org.argeo.slc.SlcException;
import org.argeo.slc.jcr.SlcNames;
import org.argeo.slc.jcr.SlcTypes;
import org.argeo.slc.jcr.SlcNames;
import org.argeo.slc.jcr.SlcTypes;
else
return true;
} catch (RepositoryException re) {
else
return true;
} catch (RepositoryException re) {
- throw new ArgeoException(
+ throw new SlcException(
"Unexpected error while checking children node existence",
re);
}
"Unexpected error while checking children node existence",
re);
}
}
return super.getChildren();
} catch (RepositoryException e) {
}
return super.getChildren();
} catch (RepositoryException e) {
- throw new ArgeoException(
+ throw new SlcException(
"Cannot initialize WorkspaceNode UI object."
+ getName(), e);
}
"Cannot initialize WorkspaceNode UI object."
+ getName(), e);
}
import javax.jcr.Value;
import javax.jcr.query.Row;
import javax.jcr.Value;
import javax.jcr.query.Row;
-import org.argeo.ArgeoException;
import org.argeo.eclipse.ui.GenericTableComparator;
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;
import org.argeo.slc.client.ui.dist.DistConstants;
import org.argeo.slc.jcr.SlcNames;
import org.argeo.slc.jcr.SlcTypes;
try {
return row.getValue(columnName).getString();
} catch (RepositoryException e) {
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);
else if (v1.getType() == PropertyType.DATE)
rc = v1.getDate().compareTo(v2.getDate());
else
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) {
+ 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);
- throw new ArgeoException("Unsupported row type");
+ throw new SlcException("Unsupported row type");
// If descending order, flip the direction
if (direction == DESCENDING) {
rc = -rc;
// If descending order, flip the direction
if (direction == DESCENDING) {
rc = -rc;
import java.util.HashMap;
import java.util.Map;
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;
import org.argeo.slc.client.ui.dist.DistPlugin;
import org.eclipse.core.commands.Command;
import org.eclipse.core.commands.Parameterization;
// execute the command
handlerService.executeCommand(pc, null);
} catch (Exception e) {
// execute the command
handlerService.executeCommand(pc, null);
} catch (Exception e) {
- throw new ArgeoException(
+ throw new SlcException(
"Unexepected exception while opening node editor", e);
}
}
"Unexepected exception while opening node editor", e);
}
}
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
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.eclipse.ui.GenericTableComparator;
+import org.argeo.slc.SlcException;
import org.eclipse.jface.viewers.Viewer;
/** Add ability to order by name version and version */
import org.eclipse.jface.viewers.Viewer;
/** Add ability to order by name version and version */
rc = bd1.compareTo(bd2);
break;
default:
rc = bd1.compareTo(bd2);
break;
default:
- throw new ArgeoException(
+ throw new SlcException(
"Unimplemented comparaison for PropertyType "
+ propertyType);
}
"Unimplemented comparaison for PropertyType "
+ propertyType);
}
}
} catch (RepositoryException re) {
}
} catch (RepositoryException re) {
- throw new ArgeoException("Unexpected error "
+ throw new SlcException("Unexpected error "
+ "while comparing nodes", re);
}
return rc;
+ "while comparing nodes", re);
}
return rc;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
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;
import org.argeo.slc.client.ui.dist.DistConstants;
import org.argeo.slc.jcr.SlcNames;
import org.argeo.slc.jcr.SlcTypes;
strValue = value.getString();
return strValue;
} catch (RepositoryException e) {
strValue = value.getString();
return strValue;
} catch (RepositoryException e) {
- throw new ArgeoException("unexpected error while formatting value",
+ throw new SlcException("unexpected error while formatting value",
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
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.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;
import org.argeo.slc.client.ui.dist.utils.ArtifactsTableConfigurer;
import org.argeo.slc.jcr.SlcTypes;
import org.eclipse.core.runtime.IStatus;
}
viewer.setInput(rows);
} catch (RepositoryException e) {
}
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) {
}
} catch (RepositoryException e) {
import javax.jcr.RepositoryException;
import javax.jcr.Session;
import javax.jcr.RepositoryException;
import javax.jcr.Session;
-import org.argeo.ArgeoException;
import org.argeo.jcr.JcrUtils;
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;
import org.argeo.slc.client.ui.dist.DistConstants;
import org.argeo.slc.client.ui.dist.DistImages;
import org.argeo.slc.client.ui.dist.DistPlugin;
rootNode = jcrSession.getNode(DEFAULT_ARTIFACTS_BASE_PATH);
artifactTreeViewer.setInput(rootNode);
} catch (RepositoryException e) {
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);
}
}
} catch (RepositoryException re) {
}
}
} catch (RepositoryException re) {
- throw new ArgeoException(
+ throw new SlcException(
"Unexepected error while getting property values", re);
}
return null;
"Unexepected error while getting property values", re);
}
return null;
// strValue = value.getString();
// return strValue;
// } catch (RepositoryException e) {
// strValue = value.getString();
// return strValue;
// } catch (RepositoryException e) {
- // throw new ArgeoException(
+ // throw new SlcException(
// "unexpected error while formatting value", e);
// }
// }
// "unexpected error while formatting value", e);
// }
// }
*/
package org.argeo.slc.client.ui.dist.views;
*/
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;
import org.argeo.slc.client.ui.dist.DistPlugin;
import org.argeo.slc.jcr.SlcNames;
import org.eclipse.swt.SWT;
return sb.toString();
} catch (Exception e) {
return sb.toString();
} catch (Exception e) {
- throw new ArgeoException(
+ throw new SlcException(
"Cannot generate where statement to get artifacts", e);
}
}
"Cannot generate where statement to get artifacts", e);
}
}
*/
package org.argeo.slc.client.ui.dist.views;
*/
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;
import org.argeo.slc.client.ui.dist.DistPlugin;
import org.argeo.slc.jcr.SlcNames;
import org.argeo.slc.jcr.SlcTypes;
}
return sb.toString();
} catch (Exception e) {
}
return sb.toString();
} catch (Exception e) {
- throw new ArgeoException(
+ throw new SlcException(
"Cannot generate where statement to get artifacts", e);
}
}
"Cannot generate where statement to get artifacts", e);
}
}
import javax.jcr.RepositoryException;
import javax.jcr.Session;
import javax.jcr.RepositoryException;
import javax.jcr.Session;
-import org.argeo.ArgeoException;
import org.argeo.jcr.JcrUtils;
import org.argeo.jcr.JcrUtils;
+import org.argeo.slc.SlcException;
import org.eclipse.jface.wizard.Wizard;
/**
import org.eclipse.jface.wizard.Wizard;
/**
page = new ChooseRightsPage();
addPage(page);
} catch (Exception e) {
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);
JcrUtils.addPrivilege(currentSession, "/", page.getGroupName(),
page.getAuthTypeStr());
} catch (RepositoryException re) {
JcrUtils.addPrivilege(currentSession, "/", page.getGroupName(),
page.getAuthTypeStr());
} catch (RepositoryException re) {
- throw new ArgeoException(
+ throw new SlcException(
"Unexpected error while setting privileges", re);
}
return true;
"Unexpected error while setting privileges", re);
}
return true;
import javax.jcr.RepositoryFactory;
import javax.jcr.Session;
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.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;
import org.argeo.security.ui.PrivilegedJob;
import org.argeo.slc.SlcException;
import org.argeo.slc.client.ui.dist.DistPlugin;
import org.argeo.slc.repo.RepoConstants;
import org.argeo.slc.repo.RepoSync;
import org.argeo.slc.repo.RepoUtils;
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;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Status;
@Override
protected IStatus doRun(IProgressMonitor progressMonitor) {
try {
@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) {
repoSync.setMonitor(monitor);
repoSync.run();
} catch (Exception e) {
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
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.jcr.JcrUtils;
+import org.argeo.security.ui.PrivilegedJob;
import org.argeo.slc.SlcException;
import org.argeo.slc.client.ui.dist.DistPlugin;
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.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;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Status;
import org.eclipse.swt.widgets.Label;
import org.eclipse.swt.widgets.Table;
import org.eclipse.swt.widgets.Text;
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
/**
* Define parameters to asynchronously generate binaries, sources and sdk pom
protected IStatus doRun(IProgressMonitor progressMonitor) {
Session session = null;
try {
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);
session = repoService.getRemoteSession(repoNodePath, null,
wkspName);
Node groupBaseNode = session.getNode(groupNodePath);
import org.argeo.node.ArgeoNames;
import org.argeo.node.ArgeoTypes;
import org.argeo.node.NodeUtils;
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.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;
import org.eclipse.jface.dialogs.MessageDialog;
import org.eclipse.jface.resource.JFaceResources;
import org.eclipse.jface.wizard.Wizard;
import javax.jcr.query.Query;
import javax.jcr.query.QueryManager;
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;
import org.argeo.eclipse.ui.jcr.AsyncUiEventListener;
import org.argeo.jcr.JcrUtils;
import org.argeo.slc.SlcException;
addInitialFlows();
} catch (RepositoryException e) {
addInitialFlows();
} catch (RepositoryException e) {
- throw new ArgeoException("Cannot create form content", e);
+ throw new SlcException("Cannot create form content", e);
try {
node.remove();
} catch (RepositoryException e) {
try {
node.remove();
} catch (RepositoryException e) {
- throw new ArgeoException("Cannot remove " + node, e);
+ throw new SlcException("Cannot remove " + node, e);
}
}
flowsViewer.refresh();
}
}
flowsViewer.refresh();
flowsViewer.refresh();
formPart.markDirty();
} catch (RepositoryException e) {
flowsViewer.refresh();
formPart.markDirty();
} catch (RepositoryException e) {
- throw new ArgeoException("Cannot remove flows from " + processNode,
+ throw new SlcException("Cannot remove flows from " + processNode,
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
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;
import org.argeo.eclipse.ui.jcr.AsyncUiEventListener;
import org.argeo.eclipse.ui.jcr.DefaultNodeLabelProvider;
import org.argeo.eclipse.ui.jcr.NodeElementComparer;
}
}
} catch (RepositoryException e) {
}
}
} catch (RepositoryException e) {
- throw new ArgeoException("Cannot compare " + o1 + " and " + o2, e);
+ throw new SlcException("Cannot compare " + o1 + " and " + o2, e);
import javax.jcr.observation.EventListener;\r
import javax.jcr.observation.ObservationManager;\r
\r
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
import org.argeo.eclipse.ui.jcr.AsyncUiEventListener;\r
import org.argeo.eclipse.ui.workbench.CommandUtils;\r
import org.argeo.jcr.JcrUtils;\r
value = "Error";\r
return value;\r
} catch (RepositoryException e) {\r
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
"Unexpected exception in label provider", e);\r
}\r
}\r
}\r
return value;\r
} catch (RepositoryException e) {\r
}\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
"Unexpected exception in label provider", e);\r
}\r
}\r
"All results");\r
return roots;\r
} catch (RepositoryException re) {\r
"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
"Unexpected error while initializing ResultTree.", re);\r
}\r
}\r
return new Object[] {};\r
\r
} catch (RepositoryException e) {\r
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
+ inputElement, e);\r
}\r
}\r
import java.io.IOException;
import org.argeo.slc.SlcException;
import java.io.IOException;
import org.argeo.slc.SlcException;
-import org.argeo.util.security.DigestUtils;
import org.springframework.core.io.Resource;
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();
/** 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 {
} 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);
} catch (IOException e1) {
throw new SlcException("Cannot digest " + resource
+ " with algorithm " + algorithm, e);
\r
import org.apache.commons.logging.Log;\r
import org.apache.commons.logging.LogFactory;\r
\r
import org.apache.commons.logging.Log;\r
import org.apache.commons.logging.LogFactory;\r
import org.argeo.slc.SlcException;\r
import org.argeo.slc.test.TestResult;\r
import org.argeo.slc.test.TestResultPart;\r
import org.argeo.slc.SlcException;\r
import org.argeo.slc.test.TestResult;\r
import org.argeo.slc.test.TestResultPart;\r
import java.util.Map;\r
import java.util.TreeMap;\r
\r
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.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
\r
public class SimpleContextAware implements ContextAware, InitializingBean {\r
private ParentContextAware parentContext;\r
import javax.jcr.RepositoryException;
import javax.jcr.Session;
import javax.jcr.RepositoryException;
import javax.jcr.Session;
-import org.argeo.ArgeoException;
import org.argeo.jcr.JcrUtils;
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;
import org.argeo.slc.core.execution.ProcessThread;
import org.argeo.slc.execution.ExecutionModulesManager;
import org.argeo.slc.execution.ExecutionProcess;
}
}
} catch (RepositoryException e) {
}
}
} catch (RepositoryException e) {
- throw new ArgeoException("Cannot process "
+ throw new SlcException("Cannot process "
+ getJcrExecutionProcess().getNodePath(), e);
} finally {
JcrUtils.logoutQuietly(session);
+ getJcrExecutionProcess().getNodePath(), e);
} finally {
JcrUtils.logoutQuietly(session);
import org.apache.commons.logging.LogFactory;
import org.argeo.slc.SlcException;
import org.argeo.slc.core.execution.FileExecutionResources;
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.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
/** Write access to resources in an OSGi context */
public class OsgiExecutionResources extends FileExecutionResources implements
import org.argeo.slc.deploy.DeploymentData;
import org.argeo.slc.deploy.DynamicRuntime;
import org.argeo.slc.deploy.TargetData;
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.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> {
public class OsgiRuntime implements BundleContextAware, ResourceLoaderAware,
DynamicRuntime<OsgiBundle> {
import org.argeo.slc.UnsupportedException;
import org.argeo.slc.build.Distribution;
import org.argeo.slc.build.ModularDistribution;
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.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 {
public abstract class AbstractOsgiModularDistribution implements
ModularDistribution, BundleContextAware, InitializingBean {
import org.argeo.slc.build.Distribution;
import org.argeo.slc.core.build.VersionedResourceDistribution;
import org.argeo.slc.osgi.OsgiBundle;
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.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 {
public class OsgiRuntimeModularDistribution extends
AbstractOsgiModularDistribution implements ResourceLoaderAware {
package org.argeo.slc.osgi.deploy;
import org.argeo.slc.core.deploy.DefaultResourceSet;
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.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
/**
* Retrieves ressources from an OSGi bundle either the active one or another one
import org.argeo.slc.aether.AetherUtils;
import org.argeo.slc.jcr.SlcNames;
import org.argeo.slc.jcr.SlcTypes;
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.eclipse.aether.artifact.Artifact;
+import org.osgi.framework.Constants;
/**
* Add {@link Artifact} properties to a {@link Node}. Does nothing if the node
/**
* Add {@link Artifact} properties to a {@link Node}. Does nothing if the node
import org.argeo.slc.CategorizedNameVersion;
import org.argeo.slc.NameVersion;
import org.argeo.slc.SlcException;
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.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
/**
* Creates a jar bundle from an ArgeoOsgiDistribution. This jar is then
import org.argeo.slc.build.Distribution;
import org.argeo.slc.jcr.SlcNames;
import org.argeo.slc.jcr.SlcTypes;
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.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
/**
* Create or update JCR meta-data for an SLC Modular Distribution
import org.apache.commons.io.IOUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
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;
import org.argeo.jcr.JcrUtils;
import org.argeo.node.NodeUtils;
import org.argeo.slc.SlcException;
private RepositoryFactory repositoryFactory;
private RepositoryFactory repositoryFactory;
- private ArgeoMonitor monitor;
+ private JcrMonitor monitor;
private Map<String, String> workspaceMap;
// TODO fix monitor
private Map<String, String> workspaceMap;
// TODO fix monitor
this.workspaceMap = null;
}
this.workspaceMap = null;
}
- public void setMonitor(ArgeoMonitor monitor) {
+ public void setMonitor(JcrMonitor monitor) {
this.monitor = monitor;
}
this.monitor = monitor;
}
import org.apache.commons.io.IOUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
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.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;
import org.argeo.slc.DefaultNameVersion;
import org.argeo.slc.NameVersion;
import org.argeo.slc.SlcException;
import org.argeo.slc.jcr.SlcNames;
import org.argeo.slc.jcr.SlcTypes;
import org.argeo.slc.repo.maven.MavenConventionsUtils;
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;
import org.eclipse.aether.artifact.Artifact;
import org.eclipse.aether.artifact.DefaultArtifact;
import org.osgi.framework.Constants;
copy(fromNode, toNode, null);
}
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)
try {
String fromPath = fromNode.getPath();
if (monitor != null)
import javax.jcr.RepositoryFactory;
import javax.jcr.Session;
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.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
/**
* Work in Progress - enhance this. First implementation of a service that
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
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;
import org.argeo.jcr.JcrUtils;
import org.argeo.slc.SlcException;
import org.argeo.slc.aether.ArtifactIdComparator;
import org.argeo.slc.repo.ArtifactIndexer;
import org.argeo.slc.repo.RepoConstants;
import org.argeo.slc.repo.RepoUtils;
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.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
/**
* Generates binaries-, sources- and sdk-version.pom artifacts for a given
* indexed.
*/
public static void processGroupNode(Node groupNode, String version,
* 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)
// TODO set artifactsBase based on group node
GenerateBinaries gb = new GenerateBinaries();
String groupId = groupNode.getProperty(SlcNames.SLC_GROUP_BASE_ID)
/** Only builds local indexes. Does not change anything in the local Session */
public static GenerateBinaries preProcessGroupNode(Node groupNode,
/** 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)
// TODO set artifactsBase based on group node
GenerateBinaries gb = new GenerateBinaries();
String groupId = groupNode.getProperty(SlcNames.SLC_GROUP_BASE_ID)
* methods build the binaries {@code Set<Artifact>} and other indexes. It
* does not impact the
*/
* 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);
throws RepositoryException {
if (monitor != null)
monitor.subTask("Pre processing group " + groupId);
}
/** Does the real job : writes JCR META-DATA and generates binaries */
}
/** 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);
throws RepositoryException {
if (monitor != null)
monitor.subTask("Processing group " + groupId);
import org.argeo.slc.repo.RepoConstants;
import org.argeo.slc.repo.RepoUtils;
import org.eclipse.aether.artifact.Artifact;
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.artifact.DefaultArtifact;
+import org.eclipse.aether.graph.DependencyNode;
/**
* Import all the dependencies listed in a POM and their dependency graphs to a
/**
* Import all the dependencies listed in a POM and their dependency graphs to a
import org.argeo.slc.repo.JarFileIndexer;
import org.argeo.slc.repo.RepoUtils;
import org.argeo.slc.repo.osgi.OsgiProfile;
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.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.
/**
* Migrate the distribution from 1.2 to 1.4 by cleaning naming and dependencies.
import org.argeo.slc.SlcException;
import org.argeo.slc.build.Distribution;
import org.argeo.slc.build.License;
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.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;
import org.springframework.beans.factory.BeanNameAware;
import aQute.lib.osgi.Builder;
import javax.jcr.Node;
import javax.jcr.Property;
import javax.jcr.Node;
import javax.jcr.Property;
-import javax.jcr.RepositoryException;
import javax.jcr.Session;
import org.apache.commons.io.IOUtils;
import javax.jcr.Session;
import org.apache.commons.io.IOUtils;
import org.apache.commons.io.FilenameUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
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;
import org.argeo.jcr.JcrUtils;
import org.argeo.slc.SlcException;
import org.argeo.slc.aether.ArtifactIdComparator;
import org.argeo.slc.repo.RepoConstants;
import org.argeo.slc.repo.RepoUtils;
import org.argeo.slc.repo.maven.MavenConventionsUtils;
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.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
/**
* Make sure that all JCR metadata and Maven metadata are consistent for this
}
public static void processGroupNode(Node groupNode, String version,
}
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();
throws RepositoryException {
// TODO set artifactsBase based on group node
NormalizeGroup ng = new NormalizeGroup();
ng.processGroupNode(groupNode, monitor);
}
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);
throws RepositoryException {
if (monitor != null)
monitor.subTask("Group " + groupId);
import org.apache.commons.logging.LogFactory;
import org.argeo.jcr.JcrUtils;
import org.argeo.slc.CategorizedNameVersion;
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;
import org.argeo.slc.NameVersion;
import org.argeo.slc.SlcException;
import org.argeo.slc.repo.ArgeoOsgiDistribution;
*/
package org.argeo.slc.aether;
*/
package org.argeo.slc.aether;
+import junit.framework.TestCase;
+
import org.eclipse.aether.artifact.Artifact;
import org.eclipse.aether.artifact.DefaultArtifact;
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",
public class AetherUtilsTest extends TestCase {
public void testConvertPathToArtifact() throws Exception {
checkPathConversion("my.group.id:my-artifactId:pom:1.2.3",
import org.apache.commons.logging.LogFactory;
import org.argeo.slc.SlcException;
import org.eclipse.aether.artifact.Artifact;
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.artifact.DefaultArtifact;
+import org.eclipse.aether.graph.DependencyNode;
/** Utilities related to Aether */
public class AetherUtils {
/** Utilities related to Aether */
public class AetherUtils {
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
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.osgi.boot.OsgiBoot;
+import org.argeo.slc.SlcException;
import org.eclipse.core.runtime.adaptor.EclipseStarter;
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.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 {
@SuppressWarnings("restriction")
public abstract class AbstractOsgiRuntimeTestCase extends TestCase {
*/\r
package org.argeo.slc.unit;\r
\r
*/\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 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
public abstract class UnitUtils {\r
public static void assertDateSec(Date expected, Date reached) {\r
if (expected == null) {\r