import javax.jcr.RepositoryException;
import javax.jcr.Session;
-import org.argeo.jcr.ArgeoNames;
import org.argeo.jcr.JcrUtils;
+import org.argeo.node.ArgeoNames;
import org.argeo.slc.SlcException;
import org.argeo.slc.client.ui.dist.DistPlugin;
import org.argeo.slc.client.ui.dist.editors.DistWkspEditorInput;
import javax.jcr.Repository;
import javax.jcr.RepositoryFactory;
-import org.argeo.jcr.ArgeoNames;
+import org.argeo.node.ArgeoNames;
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 javax.jcr.Session;
import org.argeo.eclipse.ui.workbench.CommandUtils;
-import org.argeo.jcr.ArgeoTypes;
import org.argeo.jcr.JcrUtils;
+import org.argeo.node.ArgeoTypes;
import org.argeo.slc.SlcException;
import org.argeo.slc.client.ui.dist.DistPlugin;
import org.eclipse.core.commands.AbstractHandler;
import javax.jcr.nodetype.NodeType;
import org.argeo.eclipse.ui.TreeParent;
-import org.argeo.jcr.ArgeoJcrUtils;
-import org.argeo.jcr.ArgeoNames;
-import org.argeo.jcr.ArgeoTypes;
import org.argeo.jcr.JcrUtils;
-import org.argeo.jcr.UserJcrUtils;
+import org.argeo.node.ArgeoNames;
+import org.argeo.node.ArgeoTypes;
+import org.argeo.node.NodeUtils;
import org.argeo.slc.SlcException;
import org.argeo.slc.client.ui.dist.model.RepoElem;
import org.argeo.slc.repo.RepoConstants;
dispose();
nodeSession = nodeRepository.login();
- String reposPath = UserJcrUtils.getUserHome(nodeSession).getPath()
+ String reposPath = NodeUtils.getUserHome(nodeSession).getPath()
+ RepoConstants.REPOSITORIES_BASE_PATH;
if (!nodeSession.itemExists(reposPath))
private void initializeModel(Session nodeSession) {
try {
- Node homeNode = UserJcrUtils.getUserHome(nodeSession);
+ Node homeNode = NodeUtils.getUserHome(nodeSession);
if (homeNode == null) // anonymous
throw new SlcException("User must be authenticated.");
// register default local java repository
String alias = RepoConstants.DEFAULT_JAVA_REPOSITORY_ALIAS;
- Repository javaRepository = ArgeoJcrUtils.getRepositoryByAlias(
+ Repository javaRepository = NodeUtils.getRepositoryByAlias(
repositoryFactory, alias);
if (javaRepository != null) {
if (!repos.hasNode(alias)) {
import javax.jcr.RepositoryFactory;
import javax.jcr.Session;
-import org.argeo.jcr.ArgeoJcrUtils;
-import org.argeo.jcr.ArgeoNames;
import org.argeo.jcr.JcrUtils;
+import org.argeo.node.ArgeoNames;
+import org.argeo.node.NodeUtils;
import org.argeo.slc.SlcException;
import org.argeo.slc.repo.RepoConstants;
import org.argeo.slc.repo.RepoUtils;
if (repository == null)
if (repoNode == null)
// Anonymous
- repository = ArgeoJcrUtils.getRepositoryByUri(repositoryFactory, uri);
+ repository = NodeUtils.getRepositoryByUri(repositoryFactory, uri);
else {
repository = RepoUtils.getRepository(repositoryFactory, keyring, repoNode);
credentials = RepoUtils.getRepositoryCredentials(keyring, repoNode);
*/
package org.argeo.slc.client.ui.dist.views;
-import org.argeo.jcr.ArgeoNames;
+import org.argeo.node.ArgeoNames;
import org.argeo.slc.client.ui.dist.DistConstants;
import org.argeo.slc.client.ui.dist.DistPlugin;
import org.argeo.slc.client.ui.dist.controllers.DistTreeComparator;
import org.argeo.eclipse.ui.TreeParent;
import org.argeo.eclipse.ui.workbench.CommandUtils;
-import org.argeo.jcr.ArgeoNames;
+import org.argeo.node.ArgeoNames;
import org.argeo.slc.SlcException;
import org.argeo.slc.client.ui.dist.DistPlugin;
import org.argeo.slc.client.ui.dist.commands.CopyLocalJavaWorkspace;
import org.argeo.ArgeoMonitor;
import org.argeo.eclipse.ui.EclipseArgeoMonitor;
-import org.argeo.jcr.ArgeoNames;
-import org.argeo.jcr.ArgeoTypes;
import org.argeo.jcr.JcrUtils;
-import org.argeo.jcr.UserJcrUtils;
+import org.argeo.node.ArgeoNames;
+import org.argeo.node.ArgeoTypes;
+import org.argeo.node.NodeUtils;
import org.argeo.security.ui.PrivilegedJob;
import org.argeo.slc.SlcException;
import org.argeo.slc.client.ui.dist.DistPlugin;
// populate available source repo list
private Map<String, Node> getSourceRepoUris() {
try {
- Node repoList = currSession.getNode(UserJcrUtils.getUserHome(
+ Node repoList = currSession.getNode(NodeUtils.getUserHome(
currSession).getPath()
+ RepoConstants.REPOSITORIES_BASE_PATH);
package org.argeo.slc.client.ui.dist.wizards;
import java.net.URI;
-import java.util.Hashtable;
import javax.jcr.Node;
import javax.jcr.NodeIterator;
import javax.jcr.nodetype.NodeType;
import org.argeo.eclipse.ui.dialogs.ErrorFeedback;
-import org.argeo.jcr.ArgeoJcrConstants;
-import org.argeo.jcr.ArgeoJcrUtils;
-import org.argeo.jcr.ArgeoNames;
-import org.argeo.jcr.ArgeoTypes;
import org.argeo.jcr.JcrUtils;
-import org.argeo.jcr.UserJcrUtils;
+import org.argeo.node.ArgeoNames;
+import org.argeo.node.ArgeoTypes;
+import org.argeo.node.NodeUtils;
import org.argeo.slc.SlcException;
import org.argeo.slc.repo.RepoConstants;
import org.argeo.util.security.Keyring;
Session nodeSession = null;
try {
nodeSession = nodeRepository.login();
- String reposPath = UserJcrUtils.getUserHome(nodeSession).getPath() + RepoConstants.REPOSITORIES_BASE_PATH;
+ String reposPath = NodeUtils.getUserHome(nodeSession).getPath() + RepoConstants.REPOSITORIES_BASE_PATH;
Node repos = nodeSession.getNode(reposPath);
String repoNodeName = JcrUtils.replaceInvalidChars(name.getText());
if (uri.getText().startsWith("http")) {// http, https
URI checkedUri = new URI(uri.getText());
String checkedUriStr = checkedUri.toString();
- Hashtable<String, String> params = new Hashtable<String, String>();
- params.put(ArgeoJcrConstants.JCR_REPOSITORY_URI, checkedUriStr);
- Repository repository = ArgeoJcrUtils.getRepositoryByUri(repositoryFactory, checkedUriStr);
+ Repository repository = NodeUtils.getRepositoryByUri(repositoryFactory, checkedUriStr);
// FIXME make it more generic
String defaultWorkspace = "main";
if (username.getText().trim().equals("")) {// anonymous
session = repository.login(sc, defaultWorkspace);
}
} else {// alias
- Repository repository = ArgeoJcrUtils.getRepositoryByAlias(repositoryFactory, uri.getText());
+ Repository repository = NodeUtils.getRepositoryByAlias(repositoryFactory, uri.getText());
session = repository.login();
}
MessageDialog.openInformation(getShell(), "Success", "Connection to '" + uri.getText() + "' successful");
import javax.jcr.nodetype.NodeType;
import org.argeo.jcr.JcrUtils;
-import org.argeo.jcr.UserJcrUtils;
+import org.argeo.node.NodeUtils;
import org.argeo.slc.SlcException;
/**
*/
public static String getSlcResultsBasePath(Session session) {
try {
- Node userHome = UserJcrUtils.getUserHome(session);
+ Node userHome = NodeUtils.getUserHome(session);
if (userHome == null)
throw new SlcException("No user home available for "
+ session.getUserID());
*/
public static String getMyResultsBasePath(Session session) {
try {
- Node userHome = UserJcrUtils.getUserHome(session);
+ Node userHome = NodeUtils.getUserHome(session);
if (userHome == null)
throw new SlcException("No user home available for "
+ session.getUserID());
import javax.jcr.nodetype.NodeType;
import org.argeo.jcr.JcrUtils;
-import org.argeo.jcr.UserJcrUtils;
+import org.argeo.node.NodeUtils;
import org.argeo.slc.DefaultNameVersion;
import org.argeo.slc.NameVersion;
import org.argeo.slc.SlcException;
/** Get the base for the user processi. */
public static String getSlcProcessesBasePath(Session session) {
try {
- Node userHome = UserJcrUtils.getUserHome(session);
+ Node userHome = NodeUtils.getUserHome(session);
if (userHome == null)
throw new SlcException("No user home available for "
+ session.getUserID());
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.argeo.jcr.ArgeoNames;
import org.argeo.jcr.JcrUtils;
import org.argeo.jcr.proxy.AbstractUrlProxy;
+import org.argeo.node.ArgeoNames;
import org.argeo.slc.SlcConstants;
import org.argeo.slc.SlcException;
import org.argeo.slc.jcr.SlcNames;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.argeo.ArgeoMonitor;
-import org.argeo.jcr.ArgeoJcrUtils;
import org.argeo.jcr.JcrUtils;
+import org.argeo.node.NodeUtils;
import org.argeo.slc.SlcException;
import org.xml.sax.SAXException;
// Setup
if (sourceRepository == null)
- sourceRepository = ArgeoJcrUtils.getRepositoryByUri(
+ sourceRepository = NodeUtils.getRepositoryByUri(
repositoryFactory, sourceRepoUri);
if (sourceCredentials == null && sourceUsername != null)
sourceCredentials = new SimpleCredentials(sourceUsername,
sourceDefaultSession = sourceRepository.login(sourceCredentials);
if (targetRepository == null)
- targetRepository = ArgeoJcrUtils.getRepositoryByUri(
+ targetRepository = NodeUtils.getRepositoryByUri(
repositoryFactory, targetRepoUri);
if (targetCredentials == null && targetUsername != null)
targetCredentials = new SimpleCredentials(targetUsername,
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.argeo.ArgeoMonitor;
-import org.argeo.jcr.ArgeoJcrUtils;
-import org.argeo.jcr.ArgeoNames;
-import org.argeo.jcr.ArgeoTypes;
import org.argeo.jcr.JcrUtils;
+import org.argeo.node.ArgeoNames;
+import org.argeo.node.ArgeoTypes;
+import org.argeo.node.NodeUtils;
import org.argeo.slc.DefaultNameVersion;
import org.argeo.slc.NameVersion;
import org.argeo.slc.SlcException;
import org.argeo.slc.jcr.SlcTypes;
import org.argeo.slc.repo.maven.MavenConventionsUtils;
import org.argeo.util.security.Keyring;
-import org.osgi.framework.Constants;
import org.eclipse.aether.artifact.Artifact;
import org.eclipse.aether.artifact.DefaultArtifact;
+import org.osgi.framework.Constants;
/** Utilities around repo */
public class RepoUtils implements ArgeoNames, SlcNames {
if (repoNode.isNodeType(ArgeoTypes.ARGEO_REMOTE_REPOSITORY)) {
String uri = repoNode.getProperty(ARGEO_URI).getString();
if (uri.startsWith("http")) {// http, https
- repository = ArgeoJcrUtils.getRepositoryByUri(
+ repository = NodeUtils.getRepositoryByUri(
repositoryFactory, uri);
} else if (uri.startsWith("vm:")) {// alias
- repository = ArgeoJcrUtils.getRepositoryByUri(
+ repository = NodeUtils.getRepositoryByUri(
repositoryFactory, uri);
} else {
throw new SlcException("Unsupported repository uri " + uri);
// Anonymous URI only workspace
if (repoNode == null)
// Anonymous
- currRepo = ArgeoJcrUtils.getRepositoryByUri(repositoryFactory,
- uri);
+ currRepo = NodeUtils.getRepositoryByUri(repositoryFactory, uri);
else {
currRepo = RepoUtils.getRepository(repositoryFactory, keyring,
repoNode);
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.argeo.jcr.ArgeoNames;
import org.argeo.jcr.JcrUtils;
import org.argeo.jcr.proxy.AbstractUrlProxy;
+import org.argeo.node.ArgeoNames;
import org.argeo.slc.SlcConstants;
import org.argeo.slc.SlcException;
import org.argeo.slc.jcr.SlcNames;
import org.apache.commons.vfs2.FileSelector;
import org.apache.commons.vfs2.FileSystemException;
import org.apache.commons.vfs2.FileSystemManager;
-import org.argeo.jcr.ArgeoJcrUtils;
import org.argeo.jcr.JcrUtils;
+import org.argeo.node.NodeUtils;
import org.argeo.slc.SlcException;
/** Backups a JCR repository */
if (hasDatastore())
backupDataStore(archiveRoot.resolveFile(datastoreFolderName));
- Repository sourceRepository = ArgeoJcrUtils.getRepositoryByUri(
+ Repository sourceRepository = NodeUtils.getRepositoryByUri(
repositoryFactory, sourceRepo);
Credentials sourceCredentials = null;
if (sourceUsername != null)