Merge branch 'master' of https://github.com/argeo/argeo-slc.git

[gpl/argeo-slc.git] / org.argeo.slc.client.ui.dist / src / org / argeo / slc / client / ui / dist / wizards / RegisterRepoWizard.java

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 a59fd8d5b001883b5f676fbbaec4fccc45c3c0bf..8a814d94a52b0104b04086353472bd7f189cabec 100644 (file)
--- a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/wizards/RegisterRepoWizard.java
+++ b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/wizards/RegisterRepoWizard.java
@@ -26,10 +26,10 @@ 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.JcrUtils;
-import org.argeo.node.ArgeoNames;
-import org.argeo.node.ArgeoTypes;
 import org.argeo.node.NodeUtils;
 import org.argeo.node.security.Keyring;
 import org.argeo.slc.SlcException;
@@ -73,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;
 
@@ -254,14 +254,12 @@ public class RegisterRepoWizard extends Wizard {
                                URI checkedUri = new URI(uri.getText());
                                String checkedUriStr = checkedUri.toString();
                                Repository repository = NodeUtils.getRepositoryByUri(repositoryFactory, checkedUriStr);
-                               // FIXME make it more generic
-                               String defaultWorkspace = "main";
                                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 = NodeUtils.getRepositoryByAlias(repositoryFactory, uri.getText());