-/*
- * 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.util.ArrayList;
import javax.jcr.RepositoryFactory;
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.api.NodeUtils;
+import org.argeo.api.security.Keyring;
+import org.argeo.cms.ArgeoNames;
+import org.argeo.cms.ArgeoTypes;
+import org.argeo.cms.ui.workbench.util.PrivilegedJob;
+import org.argeo.eclipse.ui.EclipseJcrMonitor;
+import org.argeo.jcr.JcrMonitor;
import org.argeo.jcr.JcrUtils;
-import org.argeo.jcr.UserJcrUtils;
-import org.argeo.security.ui.PrivilegedJob;
import org.argeo.slc.SlcException;
import org.argeo.slc.client.ui.dist.DistPlugin;
import org.argeo.slc.client.ui.dist.utils.ViewerUtils;
import org.argeo.slc.repo.RepoConstants;
import org.argeo.slc.repo.RepoSync;
import org.argeo.slc.repo.RepoUtils;
-import org.argeo.util.security.Keyring;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Status;
@Override
protected IStatus doRun(IProgressMonitor progressMonitor) {
try {
- ArgeoMonitor monitor = new EclipseArgeoMonitor(progressMonitor);
+ JcrMonitor monitor = new EclipseJcrMonitor(progressMonitor);
repoSync.setMonitor(monitor);
repoSync.run();
} catch (Exception e) {
// reset workspace list
wkspViewer.setAllChecked(false);
workspaces.clear();
- session = currSourceRepo.login(currSourceCred);
+ // FIXME make it more generic
+ session = currSourceRepo.login(currSourceCred,RepoConstants.DEFAULT_DEFAULT_WORKSPACE);
// remove unvalid elements
for (String name : session.getWorkspace()
.getAccessibleWorkspaceNames())
// 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);