X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;ds=sidebyside;f=org.argeo.cms.e4%2Fsrc%2Forg%2Fargeo%2Fcms%2Fe4%2Fjcr%2Fhandlers%2FAddRemoteRepository.java;h=aefa95dbf16a3f7bbea16f1482baa94ac5938c23;hb=4e5217621733b3f8b9c2427a688a18c68dbc1e5d;hp=e51c104ef6443d4fd821ffa1b1f1e8709de3bef9;hpb=453b971b83adf490d9f9ef2c0c30d5e48b5d8f94;p=lgpl%2Fargeo-commons.git

diff --git a/org.argeo.cms.e4/src/org/argeo/cms/e4/jcr/handlers/AddRemoteRepository.java b/org.argeo.cms.e4/src/org/argeo/cms/e4/jcr/handlers/AddRemoteRepository.java
index e51c104ef..aefa95dbf 100644
--- a/org.argeo.cms.e4/src/org/argeo/cms/e4/jcr/handlers/AddRemoteRepository.java
+++ b/org.argeo.cms.e4/src/org/argeo/cms/e4/jcr/handlers/AddRemoteRepository.java
@@ -26,16 +26,17 @@ import javax.jcr.RepositoryFactory;
 import javax.jcr.Session;
 import javax.jcr.SimpleCredentials;
 
+import org.argeo.api.NodeConstants;
+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.e4.jcr.JcrBrowserView;
 import org.argeo.eclipse.ui.EclipseUiException;
 import org.argeo.eclipse.ui.dialogs.ErrorFeedback;
 import org.argeo.jcr.JcrUtils;
-import org.argeo.node.NodeConstants;
-import org.argeo.node.NodeUtils;
-import org.argeo.node.security.Keyring;
 import org.eclipse.e4.core.di.annotations.Execute;
+import org.eclipse.e4.core.di.annotations.Optional;
 import org.eclipse.e4.ui.model.application.ui.basic.MPart;
 import org.eclipse.e4.ui.services.IServiceConstants;
 import org.eclipse.jface.dialogs.Dialog;
@@ -60,13 +61,14 @@ import org.eclipse.swt.widgets.Text;
  * Connect to a remote repository and, if successful publish it as an OSGi
  * service.
  */
-public class AddRemoteRepository implements ArgeoNames {
+public class AddRemoteRepository {
 
 	@Inject
 	private RepositoryFactory repositoryFactory;
 	@Inject
 	private Repository nodeRepository;
 	@Inject
+	@Optional
 	private Keyring keyring;
 
 	@Execute
@@ -171,15 +173,16 @@ public class AddRemoteRepository implements ArgeoNames {
 				nodeSession = nodeRepository.login();
 				Node home = NodeUtils.getUserHome(nodeSession);
 
-				Node remote = home.hasNode(ARGEO_REMOTE) ? home.getNode(ARGEO_REMOTE) : home.addNode(ARGEO_REMOTE);
+				Node remote = home.hasNode(ArgeoNames.ARGEO_REMOTE) ? home.getNode(ArgeoNames.ARGEO_REMOTE)
+						: home.addNode(ArgeoNames.ARGEO_REMOTE);
 				if (remote.hasNode(name.getText()))
 					throw new EclipseUiException("There is already a remote repository named " + name.getText());
 				Node remoteRepository = remote.addNode(name.getText(), ArgeoTypes.ARGEO_REMOTE_REPOSITORY);
-				remoteRepository.setProperty(ARGEO_URI, uri.getText());
-				remoteRepository.setProperty(ARGEO_USER_ID, username.getText());
+				remoteRepository.setProperty(ArgeoNames.ARGEO_URI, uri.getText());
+				remoteRepository.setProperty(ArgeoNames.ARGEO_USER_ID, username.getText());
 				nodeSession.save();
 				if (saveInKeyring.getSelection()) {
-					String pwdPath = remoteRepository.getPath() + '/' + ARGEO_PASSWORD;
+					String pwdPath = remoteRepository.getPath() + '/' + ArgeoNames.ARGEO_PASSWORD;
 					keyring.set(pwdPath, password.getText().toCharArray());
 				}
 				nodeSession.save();