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=3cebd6862d936a1164c89e9b39187cd8265345ca;hb=58b35f147f3c1c1a12a07c303105618f679c7161;hp=ac6c473a53a43de79d64f87490f2fd1a86102029;hpb=9e581505a7009f32cdc1eceb39dc89e77ce2a22f;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 ac6c473a5..3cebd6862 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 @@ -1,18 +1,3 @@ -/* - * Copyright (C) 2007-2012 Argeo GmbH - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ package org.argeo.slc.client.ui.dist.wizards; import java.net.URI; @@ -26,14 +11,14 @@ import javax.jcr.Session; import javax.jcr.SimpleCredentials; import javax.jcr.nodetype.NodeType; +import org.argeo.api.NodeUtils; +import org.argeo.api.security.Keyring; +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.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; @@ -73,7 +58,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 +239,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());