X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.slc.client.ui.dist%2Fsrc%2Forg%2Fargeo%2Fslc%2Fclient%2Fui%2Fdist%2Fwizards%2FRegisterRepoWizard.java;h=8a814d94a52b0104b04086353472bd7f189cabec;hb=10e9f177944b2737ee018ed695338cfeff4fd0a3;hp=ead05c4cfd2756fca84f05ff8eb11d8c05533ca4;hpb=238213f74502908e6285a18bc92152719ecee7c6;p=gpl%2Fargeo-slc.git

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..8a814d94a 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;
@@ -27,16 +26,14 @@ import javax.jcr.Session;
 import javax.jcr.SimpleCredentials;
 import javax.jcr.nodetype.NodeType;
 
+import org.argeo.cms.ArgeoNames;
+import org.argeo.cms.ArgeoTypes;
 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.NodeUtils;
+import org.argeo.node.security.Keyring;
 import org.argeo.slc.SlcException;
 import org.argeo.slc.repo.RepoConstants;
-import org.argeo.util.security.Keyring;
 import org.eclipse.jface.dialogs.MessageDialog;
 import org.eclipse.jface.resource.JFaceResources;
 import org.eclipse.jface.wizard.Wizard;
@@ -76,7 +73,7 @@ public class RegisterRepoWizard extends Wizard {
 
 	// Default values
 	private final static String DEFAULT_NAME = "Argeo Public Repository";
-	private final static String DEFAULT_URI = "http://repo.argeo.org/data/pub/java";
+	private final static String DEFAULT_URI = "https://forge.argeo.org/jcr/java";
 	private final static String DEFAULT_USER_NAME = "anonymous";
 	private final static boolean DEFAULT_ANONYMOUS = true;
 
@@ -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,20 +253,16 @@ public class RegisterRepoWizard extends Wizard {
 			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);
-				// FIXME make it more generic
-				String defaultWorkspace = "main";
+				Repository repository = NodeUtils.getRepositoryByUri(repositoryFactory, checkedUriStr);
 				if (username.getText().trim().equals("")) {// anonymous
-					session = repository.login(defaultWorkspace);
+					session = repository.login(RepoConstants.DEFAULT_DEFAULT_WORKSPACE);
 				} else {
 					char[] pwd = password.getTextChars();
 					SimpleCredentials sc = new SimpleCredentials(username.getText(), pwd);
-					session = repository.login(sc, defaultWorkspace);
+					session = repository.login(sc, RepoConstants.DEFAULT_DEFAULT_WORKSPACE);
 				}
 			} 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");