From: Bruno Sinou Date: Thu, 15 Sep 2016 13:39:42 +0000 (+0000) Subject: Adapt after JCR APIs to node.api bundle move X-Git-Tag: argeo-slc-2.1.7~38 X-Git-Url: http://git.argeo.org/?a=commitdiff_plain;h=9e581505a7009f32cdc1eceb39dc89e77ce2a22f;p=gpl%2Fargeo-slc.git Adapt after JCR APIs to node.api bundle move git-svn-id: https://svn.argeo.org/slc/trunk@9163 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc --- diff --git a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/OpenWorkspaceEditor.java b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/OpenWorkspaceEditor.java index 2221f215b..2b15f12c4 100644 --- a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/OpenWorkspaceEditor.java +++ b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/OpenWorkspaceEditor.java @@ -20,8 +20,8 @@ import javax.jcr.Repository; 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; 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 4203b94c7..b141e659a 100644 --- 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 @@ -18,7 +18,7 @@ package org.argeo.slc.client.ui.dist.commands; 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; diff --git a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/UnregisterRemoteRepo.java b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/UnregisterRemoteRepo.java index 4f386b263..6e4e267b8 100644 --- a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/UnregisterRemoteRepo.java +++ b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/UnregisterRemoteRepo.java @@ -22,8 +22,8 @@ import javax.jcr.RepositoryException; 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; 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 6eea82f3f..e83ca22da 100644 --- 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 @@ -13,11 +13,10 @@ import javax.jcr.Session; 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; @@ -47,7 +46,7 @@ public class DistTreeContentProvider implements ITreeContentProvider { dispose(); nodeSession = nodeRepository.login(); - String reposPath = UserJcrUtils.getUserHome(nodeSession).getPath() + String reposPath = NodeUtils.getUserHome(nodeSession).getPath() + RepoConstants.REPOSITORIES_BASE_PATH; if (!nodeSession.itemExists(reposPath)) @@ -105,7 +104,7 @@ public class DistTreeContentProvider implements ITreeContentProvider { 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."); @@ -117,7 +116,7 @@ public class DistTreeContentProvider implements ITreeContentProvider { // 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)) { 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 14446d3f5..ed659457f 100644 --- 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 @@ -9,9 +9,9 @@ import javax.jcr.RepositoryException; 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; @@ -84,7 +84,7 @@ public class RepoElem extends DistParentElem { 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); diff --git a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/views/AnonymousDistributionsView.java b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/views/AnonymousDistributionsView.java index 03cf395ca..036e64456 100644 --- a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/views/AnonymousDistributionsView.java +++ b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/views/AnonymousDistributionsView.java @@ -15,7 +15,7 @@ */ 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; diff --git a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/views/DistributionsView.java b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/views/DistributionsView.java index 8948bccfd..f109655cb 100644 --- a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/views/DistributionsView.java +++ b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/views/DistributionsView.java @@ -23,7 +23,7 @@ import javax.jcr.RepositoryException; 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; 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 81541d79c..a4e9dda18 100644 --- 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 @@ -30,10 +30,10 @@ import javax.jcr.Session; 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; @@ -642,7 +642,7 @@ public class FetchWizard extends Wizard { // populate available source repo list private Map getSourceRepoUris() { try { - Node repoList = currSession.getNode(UserJcrUtils.getUserHome( + Node repoList = currSession.getNode(NodeUtils.getUserHome( currSession).getPath() + RepoConstants.REPOSITORIES_BASE_PATH); 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 ead05c4cf..ac6c473a5 100644 --- 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 @@ -16,7 +16,6 @@ package org.argeo.slc.client.ui.dist.wizards; import java.net.URI; -import java.util.Hashtable; import javax.jcr.Node; import javax.jcr.NodeIterator; @@ -28,12 +27,10 @@ import javax.jcr.SimpleCredentials; 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; @@ -106,7 +103,7 @@ public class RegisterRepoWizard extends Wizard { 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()); @@ -256,9 +253,7 @@ public class RegisterRepoWizard extends Wizard { if (uri.getText().startsWith("http")) {// http, https URI checkedUri = new URI(uri.getText()); String checkedUriStr = checkedUri.toString(); - Hashtable params = new Hashtable(); - 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 @@ -269,7 +264,7 @@ public class RegisterRepoWizard extends Wizard { 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"); diff --git a/org.argeo.slc.core/src/org/argeo/slc/jcr/SlcJcrResultUtils.java b/org.argeo.slc.core/src/org/argeo/slc/jcr/SlcJcrResultUtils.java index 729c2d74b..8b41fce41 100644 --- a/org.argeo.slc.core/src/org/argeo/slc/jcr/SlcJcrResultUtils.java +++ b/org.argeo.slc.core/src/org/argeo/slc/jcr/SlcJcrResultUtils.java @@ -21,7 +21,7 @@ import javax.jcr.Session; 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; /** @@ -35,7 +35,7 @@ public class SlcJcrResultUtils { */ 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()); @@ -85,7 +85,7 @@ public class SlcJcrResultUtils { */ 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()); diff --git a/org.argeo.slc.core/src/org/argeo/slc/jcr/SlcJcrUtils.java b/org.argeo.slc.core/src/org/argeo/slc/jcr/SlcJcrUtils.java index 4c42661f9..02c1776ea 100644 --- a/org.argeo.slc.core/src/org/argeo/slc/jcr/SlcJcrUtils.java +++ b/org.argeo.slc.core/src/org/argeo/slc/jcr/SlcJcrUtils.java @@ -27,7 +27,7 @@ import javax.jcr.Session; 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; @@ -107,7 +107,7 @@ public class SlcJcrUtils implements SlcNames { /** 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()); diff --git a/org.argeo.slc.factory/src/org/argeo/slc/rpmfactory/core/RpmProxyServiceImpl.java b/org.argeo.slc.factory/src/org/argeo/slc/rpmfactory/core/RpmProxyServiceImpl.java index d331cc70a..a771859c6 100644 --- a/org.argeo.slc.factory/src/org/argeo/slc/rpmfactory/core/RpmProxyServiceImpl.java +++ b/org.argeo.slc.factory/src/org/argeo/slc/rpmfactory/core/RpmProxyServiceImpl.java @@ -27,9 +27,9 @@ import javax.jcr.security.AccessControlException; 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; 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 7f1e1e32d..0bdf6740f 100644 --- a/org.argeo.slc.repo/src/org/argeo/slc/repo/RepoSync.java +++ b/org.argeo.slc.repo/src/org/argeo/slc/repo/RepoSync.java @@ -45,8 +45,8 @@ 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.ArgeoJcrUtils; import org.argeo.jcr.JcrUtils; +import org.argeo.node.NodeUtils; import org.argeo.slc.SlcException; import org.xml.sax.SAXException; @@ -120,7 +120,7 @@ public class RepoSync implements Runnable { // Setup if (sourceRepository == null) - sourceRepository = ArgeoJcrUtils.getRepositoryByUri( + sourceRepository = NodeUtils.getRepositoryByUri( repositoryFactory, sourceRepoUri); if (sourceCredentials == null && sourceUsername != null) sourceCredentials = new SimpleCredentials(sourceUsername, @@ -128,7 +128,7 @@ public class RepoSync implements Runnable { sourceDefaultSession = sourceRepository.login(sourceCredentials); if (targetRepository == null) - targetRepository = ArgeoJcrUtils.getRepositoryByUri( + targetRepository = NodeUtils.getRepositoryByUri( repositoryFactory, targetRepoUri); if (targetCredentials == null && targetUsername != null) targetCredentials = new SimpleCredentials(targetUsername, 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 f03319ae3..3ac2f0b0b 100644 --- a/org.argeo.slc.repo/src/org/argeo/slc/repo/RepoUtils.java +++ b/org.argeo.slc.repo/src/org/argeo/slc/repo/RepoUtils.java @@ -52,10 +52,10 @@ 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.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; @@ -64,9 +64,9 @@ 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.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 { @@ -379,10 +379,10 @@ 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); @@ -445,8 +445,7 @@ public class RepoUtils implements ArgeoNames, SlcNames { // 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); diff --git a/org.argeo.slc.repo/src/org/argeo/slc/repo/maven/MavenProxyServiceImpl.java b/org.argeo.slc.repo/src/org/argeo/slc/repo/maven/MavenProxyServiceImpl.java index 0349f3587..445656c86 100644 --- a/org.argeo.slc.repo/src/org/argeo/slc/repo/maven/MavenProxyServiceImpl.java +++ b/org.argeo.slc.repo/src/org/argeo/slc/repo/maven/MavenProxyServiceImpl.java @@ -28,9 +28,9 @@ import javax.jcr.security.Privilege; 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; diff --git a/org.argeo.slc.support/src/org/argeo/slc/lib/jcr/JcrRepositoryBackup.java b/org.argeo.slc.support/src/org/argeo/slc/lib/jcr/JcrRepositoryBackup.java index d2bb56b2e..1b95ec517 100644 --- a/org.argeo.slc.support/src/org/argeo/slc/lib/jcr/JcrRepositoryBackup.java +++ b/org.argeo.slc.support/src/org/argeo/slc/lib/jcr/JcrRepositoryBackup.java @@ -37,8 +37,8 @@ import org.apache.commons.vfs2.FileSelectInfo; 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 */ @@ -69,7 +69,7 @@ public class JcrRepositoryBackup implements Runnable { if (hasDatastore()) backupDataStore(archiveRoot.resolveFile(datastoreFolderName)); - Repository sourceRepository = ArgeoJcrUtils.getRepositoryByUri( + Repository sourceRepository = NodeUtils.getRepositoryByUri( repositoryFactory, sourceRepo); Credentials sourceCredentials = null; if (sourceUsername != null)