X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=server%2Fplugins%2Forg.argeo.jcr.ui.explorer%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fjcr%2Fui%2Fexplorer%2Fcommands%2FAddRemoteRepository.java;h=e41edfca875163fa11fdd3353442e08f0e0fd1f2;hb=3a3d316af102ba410d1d9e6de349d0c8f7ac044f;hp=e691b8fb65dd4a3740b90164da8b7a2265b0174c;hpb=82e079d95c38d7136944d79394b9efd82a2864dd;p=lgpl%2Fargeo-commons.git diff --git a/server/plugins/org.argeo.jcr.ui.explorer/src/main/java/org/argeo/jcr/ui/explorer/commands/AddRemoteRepository.java b/server/plugins/org.argeo.jcr.ui.explorer/src/main/java/org/argeo/jcr/ui/explorer/commands/AddRemoteRepository.java index e691b8fb6..e41edfca8 100644 --- a/server/plugins/org.argeo.jcr.ui.explorer/src/main/java/org/argeo/jcr/ui/explorer/commands/AddRemoteRepository.java +++ b/server/plugins/org.argeo.jcr.ui.explorer/src/main/java/org/argeo/jcr/ui/explorer/commands/AddRemoteRepository.java @@ -1,3 +1,18 @@ +/* + * 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.jcr.ui.explorer.commands; import java.net.URI; @@ -11,12 +26,14 @@ import javax.jcr.SimpleCredentials; import org.argeo.ArgeoException; import org.argeo.eclipse.ui.ErrorFeedback; +import org.argeo.eclipse.ui.utils.CommandUtils; import org.argeo.jcr.ArgeoJcrConstants; import org.argeo.jcr.ArgeoNames; import org.argeo.jcr.ArgeoTypes; import org.argeo.jcr.JcrUtils; -import org.argeo.jcr.security.JcrKeyring; +import org.argeo.jcr.UserJcrUtils; import org.argeo.jcr.ui.explorer.JcrExplorerConstants; +import org.argeo.util.security.Keyring; import org.eclipse.core.commands.AbstractHandler; import org.eclipse.core.commands.ExecutionEvent; import org.eclipse.core.commands.ExecutionException; @@ -37,7 +54,6 @@ import org.eclipse.swt.widgets.Display; import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.Shell; import org.eclipse.swt.widgets.Text; -import org.osgi.framework.BundleContext; /** * Connect to a remote repository and, if successful publish it as an OSGi @@ -47,37 +63,15 @@ public class AddRemoteRepository extends AbstractHandler implements JcrExplorerConstants, ArgeoNames { private RepositoryFactory repositoryFactory; - private BundleContext bundleContext; - - private JcrKeyring keyring; + private Repository nodeRepository; + private Keyring keyring; public Object execute(ExecutionEvent event) throws ExecutionException { - String uri = null; - if (event.getParameters().containsKey(PARAM_REPOSITORY_URI)) { - // FIXME remove this - uri = event.getParameter(PARAM_REPOSITORY_URI); - if (uri == null) - return null; - - try { - Hashtable params = new Hashtable(); - params.put(ArgeoJcrConstants.JCR_REPOSITORY_URI, uri); - // by default we use the URI as alias - params.put(ArgeoJcrConstants.JCR_REPOSITORY_ALIAS, uri); - Repository repository = repositoryFactory.getRepository(params); - bundleContext.registerService(Repository.class.getName(), - repository, params); - } catch (Exception e) { - ErrorFeedback.show("Cannot add remote repository " + uri, e); - } - } else { - RemoteRepositoryLoginDialog dlg = new RemoteRepositoryLoginDialog( - Display.getDefault().getActiveShell()); - if (dlg.open() == Dialog.OK) { - // uri = dlg.getUri(); - } + RemoteRepositoryLoginDialog dlg = new RemoteRepositoryLoginDialog( + Display.getDefault().getActiveShell()); + if (dlg.open() == Dialog.OK) { + CommandUtils.callCommand(Refresh.ID); } - return null; } @@ -85,12 +79,12 @@ public class AddRemoteRepository extends AbstractHandler implements this.repositoryFactory = repositoryFactory; } - public void setBundleContext(BundleContext bundleContext) { - this.bundleContext = bundleContext; + public void setKeyring(Keyring keyring) { + this.keyring = keyring; } - public void setKeyring(JcrKeyring keyring) { - this.keyring = keyring; + public void setNodeRepository(Repository nodeRepository) { + this.nodeRepository = nodeRepository; } class RemoteRepositoryLoginDialog extends TitleAreaDialog { @@ -98,6 +92,7 @@ public class AddRemoteRepository extends AbstractHandler implements private Text uri; private Text username; private Text password; + private Button saveInKeyring; public RemoteRepositoryLoginDialog(Shell parentShell) { super(parentShell); @@ -118,9 +113,11 @@ public class AddRemoteRepository extends AbstractHandler implements setMessage("Login to remote repository", IMessageProvider.NONE); name = createLT(composite, "Name", "remoteRepository"); uri = createLT(composite, "URI", - "http://localhost:7070/org.argeo.jcr.webapp/remoting/node"); + "http://localhost:7070/data/jcr/node"); username = createLT(composite, "User", ""); password = createLP(composite, "Password"); + + saveInKeyring = createLC(composite, "Remember password", false); parent.pack(); return composite; } @@ -144,9 +141,6 @@ public class AddRemoteRepository extends AbstractHandler implements Hashtable params = new Hashtable(); params.put(ArgeoJcrConstants.JCR_REPOSITORY_URI, checkedUriStr); - // by default we use the URI as alias - params.put(ArgeoJcrConstants.JCR_REPOSITORY_ALIAS, - checkedUriStr); Repository repository = repositoryFactory.getRepository(params); if (username.getText().trim().equals("")) {// anonymous session = repository.login(); @@ -170,9 +164,11 @@ public class AddRemoteRepository extends AbstractHandler implements @Override protected void okPressed() { + Session nodeSession = null; try { - Session nodeSession = keyring.getSession(); - Node home = JcrUtils.getUserHome(nodeSession); + nodeSession = nodeRepository.login(); + Node home = UserJcrUtils.getUserHome(nodeSession); + Node remote = home.hasNode(ARGEO_REMOTE) ? home .getNode(ARGEO_REMOTE) : home.addNode(ARGEO_REMOTE); if (remote.hasNode(name.getText())) @@ -183,19 +179,25 @@ public class AddRemoteRepository extends AbstractHandler implements ArgeoTypes.ARGEO_REMOTE_REPOSITORY); remoteRepository.setProperty(ARGEO_URI, uri.getText()); remoteRepository.setProperty(ARGEO_USER_ID, username.getText()); - Node pwd = remoteRepository.addNode(ARGEO_PASSWORD); - keyring.set(pwd.getPath(), password.getText().toCharArray()); + nodeSession.save(); + if (saveInKeyring.getSelection()) { + String pwdPath = remoteRepository.getPath() + '/' + + ARGEO_PASSWORD; + keyring.set(pwdPath, password.getText().toCharArray()); + } nodeSession.save(); MessageDialog.openInformation( getParentShell(), "Repository Added", "Remote repository '" + username.getText() + "@" + uri.getText() + "' added"); + + super.okPressed(); } catch (Exception e) { - // TODO Auto-generated catch block - e.printStackTrace(); + ErrorFeedback.show("Cannot add remote repository", e); + } finally { + JcrUtils.logoutQuietly(nodeSession); } - super.okPressed(); } /** Creates label and text. */ @@ -207,6 +209,16 @@ public class AddRemoteRepository extends AbstractHandler implements return text; } + /** Creates label and check. */ + protected Button createLC(Composite parent, String label, + Boolean initial) { + new Label(parent, SWT.NONE).setText(label); + Button check = new Button(parent, SWT.CHECK); + check.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true)); + check.setSelection(initial); + return check; + } + protected Text createLP(Composite parent, String label) { new Label(parent, SWT.NONE).setText(label); Text text = new Text(parent, SWT.SINGLE | SWT.LEAD | SWT.BORDER