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=b7d4e030a2439b9267f66158146e3517b69a2a09;hb=0450e423bd759c9e27b43044670e659271392d71;hp=6b5dfa8b0c490bafaa37059d6b38098b7e9e962b;hpb=a093e5c849e70bbc754fa4462dbb6c2b59979973;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 6b5dfa8b0..b7d4e030a 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
@@ -30,6 +30,7 @@ import org.argeo.jcr.ArgeoJcrConstants;
 import org.argeo.jcr.ArgeoNames;
 import org.argeo.jcr.ArgeoTypes;
 import org.argeo.jcr.JcrUtils;
+import org.argeo.jcr.UserJcrUtils;
 import org.argeo.jcr.security.JcrKeyring;
 import org.argeo.jcr.ui.explorer.JcrExplorerConstants;
 import org.eclipse.core.commands.AbstractHandler;
@@ -52,7 +53,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
@@ -62,37 +62,13 @@ public class AddRemoteRepository extends AbstractHandler implements
 		JcrExplorerConstants, ArgeoNames {
 
 	private RepositoryFactory repositoryFactory;
-	private BundleContext bundleContext;
-
 	private JcrKeyring 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<String, String> params = new Hashtable<String, String>();
-				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) {
 		}
-
 		return null;
 	}
 
@@ -100,10 +76,6 @@ public class AddRemoteRepository extends AbstractHandler implements
 		this.repositoryFactory = repositoryFactory;
 	}
 
-	public void setBundleContext(BundleContext bundleContext) {
-		this.bundleContext = bundleContext;
-	}
-
 	public void setKeyring(JcrKeyring keyring) {
 		this.keyring = keyring;
 	}
@@ -162,9 +134,6 @@ public class AddRemoteRepository extends AbstractHandler implements
 
 				Hashtable<String, String> params = new Hashtable<String, String>();
 				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();
@@ -190,12 +159,7 @@ public class AddRemoteRepository extends AbstractHandler implements
 		protected void okPressed() {
 			try {
 				Session nodeSession = keyring.getSession();
-				Node home = JcrUtils.getUserHome(nodeSession);
-
-				// FIXME better deal with non existing home dir
-				if (home == null)
-					home = JcrUtils.createUserHomeIfNeeded(nodeSession,
-							nodeSession.getUserID());
+				Node home = UserJcrUtils.getUserHome(nodeSession);
 
 				Node remote = home.hasNode(ARGEO_REMOTE) ? home
 						.getNode(ARGEO_REMOTE) : home.addNode(ARGEO_REMOTE);