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=6187f40ee3ffdaa66ab35b7e143573db2697c5fb;hpb=9884b3225a86b831917b10376925eebcbf99e513;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 6187f40ee..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,5 +1,5 @@ /* - * Copyright (C) 2007-2012 Mathieu Baudier + * 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. @@ -26,6 +26,7 @@ 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; @@ -69,6 +70,7 @@ public class AddRemoteRepository extends AbstractHandler implements RemoteRepositoryLoginDialog dlg = new RemoteRepositoryLoginDialog( Display.getDefault().getActiveShell()); if (dlg.open() == Dialog.OK) { + CommandUtils.callCommand(Refresh.ID); } return null; } @@ -111,7 +113,7 @@ 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"); @@ -162,8 +164,9 @@ public class AddRemoteRepository extends AbstractHandler implements @Override protected void okPressed() { + Session nodeSession = null; try { - Session nodeSession = nodeRepository.login(); + nodeSession = nodeRepository.login(); Node home = UserJcrUtils.getUserHome(nodeSession); Node remote = home.hasNode(ARGEO_REMOTE) ? home @@ -192,6 +195,8 @@ public class AddRemoteRepository extends AbstractHandler implements super.okPressed(); } catch (Exception e) { ErrorFeedback.show("Cannot add remote repository", e); + } finally { + JcrUtils.logoutQuietly(nodeSession); } }