]> git.argeo.org Git - gpl/argeo-slc.git/blobdiff - plugins/org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/views/DistributionsView.java
Restructure Repo Dist UI
[gpl/argeo-slc.git] / plugins / org.argeo.slc.client.ui.dist / src / main / java / org / argeo / slc / client / ui / dist / views / DistributionsView.java
index 8cb1746a280157899435fe2a883f51d8b1234ad8..8d046f5adbede3b1e258bf6c560e7c122b6424ab 100644 (file)
@@ -21,17 +21,24 @@ import java.util.List;
 import java.util.Map;
 
 import javax.jcr.Credentials;
+import javax.jcr.Node;
+import javax.jcr.NodeIterator;
+import javax.jcr.Property;
 import javax.jcr.Repository;
 import javax.jcr.RepositoryException;
 import javax.jcr.RepositoryFactory;
 import javax.jcr.Session;
+import javax.jcr.SimpleCredentials;
+import javax.jcr.nodetype.NodeType;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.argeo.eclipse.ui.AbstractTreeContentProvider;
 import org.argeo.eclipse.ui.ErrorFeedback;
 import org.argeo.eclipse.ui.TreeParent;
+import org.argeo.jcr.ArgeoJcrUtils;
+import org.argeo.jcr.ArgeoNames;
+import org.argeo.jcr.ArgeoTypes;
 import org.argeo.jcr.JcrUtils;
+import org.argeo.jcr.UserJcrUtils;
+import org.argeo.slc.SlcException;
 import org.argeo.slc.client.ui.dist.DistPlugin;
 import org.argeo.slc.client.ui.dist.commands.CopyWorkspace;
 import org.argeo.slc.client.ui.dist.commands.CreateWorkspace;
@@ -42,6 +49,8 @@ import org.argeo.slc.client.ui.dist.editors.DistributionEditor;
 import org.argeo.slc.client.ui.dist.editors.DistributionEditorInput;
 import org.argeo.slc.client.ui.dist.utils.CommandHelpers;
 import org.argeo.slc.jcr.SlcNames;
+import org.argeo.slc.repo.RepoConstants;
+import org.argeo.util.security.Keyring;
 import org.eclipse.jface.action.IMenuListener;
 import org.eclipse.jface.action.IMenuManager;
 import org.eclipse.jface.action.MenuManager;
@@ -49,8 +58,10 @@ import org.eclipse.jface.viewers.ColumnLabelProvider;
 import org.eclipse.jface.viewers.DoubleClickEvent;
 import org.eclipse.jface.viewers.IDoubleClickListener;
 import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.ITreeContentProvider;
 import org.eclipse.jface.viewers.TreeViewer;
 import org.eclipse.jface.viewers.TreeViewerColumn;
+import org.eclipse.jface.viewers.Viewer;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Menu;
@@ -63,17 +74,21 @@ import org.eclipse.ui.part.ViewPart;
  * Browse and manipulate distributions (like merge, rename, etc.). Only support
  * one single repository currently.
  */
-
-public class DistributionsView extends ViewPart implements SlcNames {
-       private final static Log log = LogFactory.getLog(DistributionsView.class);
+public class DistributionsView extends ViewPart implements SlcNames, ArgeoNames {
+       // private final static Log log =
+       // LogFactory.getLog(DistributionsView.class);
        public final static String ID = DistPlugin.ID + ".distributionsView";
 
-       private Repository repository;
+       private Repository nodeRepository;
        private RepositoryFactory repositoryFactory;
+       private Keyring keyring;
 
        private TreeViewer viewer;
 
-       private List<RepositoryElem> repositories = new ArrayList<DistributionsView.RepositoryElem>();
+       // private List<RepositoryElem> repositories = new
+       // ArrayList<DistributionsView.RepositoryElem>();
+
+       // private Session nodeSession = null;
 
        @Override
        public void createPartControl(Composite parent) {
@@ -83,17 +98,19 @@ public class DistributionsView extends ViewPart implements SlcNames {
 
                TreeViewerColumn col = new TreeViewerColumn(viewer, SWT.NONE);
                col.getColumn().setWidth(200);
-               col.getColumn().setText("Workspace");
+               // col.getColumn().setText("Workspace");
                col.setLabelProvider(new ColumnLabelProvider() {
                        @Override
                        public String getText(Object element) {
+                               if (element instanceof RepoElem)
+                                       return ((RepoElem) element).getLabel();
                                return element.toString();
                        }
                });
 
                final Tree table = viewer.getTree();
-               table.setHeaderVisible(true);
-               table.setLinesVisible(true);
+               table.setHeaderVisible(false);
+               table.setLinesVisible(false);
 
                viewer.setContentProvider(new DistributionsContentProvider());
                viewer.addDoubleClickListener(new DistributionsDCL());
@@ -108,39 +125,103 @@ public class DistributionsView extends ViewPart implements SlcNames {
                viewer.getTree().setMenu(menu);
                getSite().registerContextMenu(menuManager, viewer);
 
-               // Initializes repositories
-               // TODO make it more generic, with remote repositories etc.
-               repositories.add(new RepositoryElem("java", repository, null));
+               Session nodeSession = null;
+               try {
+                       nodeSession = nodeRepository.login();
+
+                       // make sure base directory is available
+                       Node repos = JcrUtils.mkdirs(nodeSession,
+                                       UserJcrUtils.getUserHome(nodeSession).getPath()
+                                                       + RepoConstants.REPOSITORIES_BASE_PATH);
+                       nodeSession.save();
+
+                       // register default local java repository
+                       String alias = RepoConstants.DEFAULT_JAVA_REPOSITORY_ALIAS;
+                       Repository javaRepository = ArgeoJcrUtils.getRepositoryByAlias(
+                                       repositoryFactory, alias);
+                       if (javaRepository != null) {
+                               if (!repos.hasNode(alias)) {
+                                       Node repoNode = repos.addNode(alias,
+                                                       ArgeoTypes.ARGEO_REMOTE_REPOSITORY);
+                                       repoNode.setProperty(ARGEO_URI, alias);
+                                       repoNode.addMixin(NodeType.MIX_TITLE);
+                                       repoNode.setProperty(Property.JCR_TITLE, "vm://" + alias);
+                                       nodeSession.save();
+                               }
+                       }
+               } catch (RepositoryException e) {
+                       throw new SlcException("Cannot register repository", e);
+               } finally {
+                       JcrUtils.logoutQuietly(nodeSession);
+               }
+               //
+               // try {
+               // nodeSession = nodeRepository.login();
+               // NodeIterator repos = JcrUtils.mkdirs(
+               // nodeSession,
+               // UserJcrUtils.getUserHome(nodeSession).getPath()
+               // + RepoConstants.REPOSITORIES_BASE_PATH).getNodes();
+               // while (repos.hasNext()) {
+               // Node repository = repos.nextNode();
+               // String label = null;
+               // if (repository.isNodeType(NodeType.MIX_TITLE)) {
+               // label = repository.getProperty(Property.JCR_TITLE)
+               // .getString();
+               // }
+               //
+               // if (repository.isNodeType(ArgeoTypes.ARGEO_REMOTE_REPOSITORY)) {
+               // String uri = repository.getProperty(ARGEO_URI).getString();
+               // Credentials credentials = null;
+               // if (repository.hasProperty(ARGEO_USER_ID)) {
+               // String userId = repository.getProperty(ARGEO_USER_ID)
+               // .getString();
+               // credentials = new SimpleCredentials(userId,
+               // "".toCharArray());
+               // }
+               // Repository remoteRepository = ArgeoJcrUtils
+               // .getRepositoryByUri(repositoryFactory, uri);
+               // if (label == null)
+               // label = repository.getName();
+               // repositories.add(new RepositoryElem(label,
+               // remoteRepository, credentials));
+               // }
+               // }
+               // } catch (RepositoryException e) {
+               // throw new ArgeoException("Cannot read registered repositories", e);
+               // }
 
                // Remote
-//             String uri = null;
-//             Credentials credentials = null;
-//             Repository remoteRepository = null;
-
-//             try {
-//                     uri = "http://dev.argeo.org/org.argeo.jcr.webapp/pub/java";
-//                     credentials = new GuestCredentials();
-//                     remoteRepository = ArgeoJcrUtils.getRepositoryByUri(repositoryFactory, uri);
-//                     repositories.add(new RepositoryElem("anonymous@dev.argeo.org//java",
-//                                     remoteRepository, credentials));
-//             } catch (Exception e) {
-//                     e.printStackTrace();
-//             }
-
-//             uri = "http://localhost:7070/org.argeo.jcr.webapp/pub/java";
-//             credentials = new GuestCredentials();
-//             remoteRepository = ArgeoJcrUtils.getRepositoryByUri(repositoryFactory, uri);
-//             repositories.add(new RepositoryElem("anonymous@localhost//java",
-//                             remoteRepository, credentials));
-
-//             uri = "http://localhost:7070/org.argeo.jcr.webapp/remoting/java";
-//             credentials = new SimpleCredentials(System.getProperty("user.name"),
-//                             "".toCharArray());
-//             remoteRepository = ArgeoJcrUtils.getRepositoryByUri(repositoryFactory, uri);
-//             repositories.add(new RepositoryElem("@localhost//java",
-//                             remoteRepository, credentials));
-
-               viewer.setInput(getSite());
+               // String uri = null;
+               // Credentials credentials = null;
+               // Repository remoteRepository = null;
+
+               // try {
+               // uri = "http://dev.argeo.org/org.argeo.jcr.webapp/pub/java";
+               // credentials = new GuestCredentials();
+               // remoteRepository =
+               // ArgeoJcrUtils.getRepositoryByUri(repositoryFactory, uri);
+               // repositories.add(new RepositoryElem("anonymous@dev.argeo.org//java",
+               // remoteRepository, credentials));
+               // } catch (Exception e) {
+               // e.printStackTrace();
+               // }
+
+               // uri = "http://localhost:7070/org.argeo.jcr.webapp/pub/java";
+               // credentials = new GuestCredentials();
+               // remoteRepository =
+               // ArgeoJcrUtils.getRepositoryByUri(repositoryFactory, uri);
+               // repositories.add(new RepositoryElem("anonymous@localhost//java",
+               // remoteRepository, credentials));
+
+               // uri = "http://localhost:7070/org.argeo.jcr.webapp/remoting/java";
+               // credentials = new SimpleCredentials(System.getProperty("user.name"),
+               // "".toCharArray());
+               // remoteRepository =
+               // ArgeoJcrUtils.getRepositoryByUri(repositoryFactory, uri);
+               // repositories.add(new RepositoryElem("@localhost//java",
+               // remoteRepository, credentials));
+
+               viewer.setInput(nodeRepository);
 
        }
 
@@ -156,14 +237,18 @@ public class DistributionsView extends ViewPart implements SlcNames {
                viewer.setContentProvider(new DistributionsContentProvider());
        }
 
-       public void setRepository(Repository repository) {
-               this.repository = repository;
+       public void setNodeRepository(Repository repository) {
+               this.nodeRepository = repository;
        }
 
        public void setRepositoryFactory(RepositoryFactory repositoryFactory) {
                this.repositoryFactory = repositoryFactory;
        }
 
+       public void setKeyring(Keyring keyring) {
+               this.keyring = keyring;
+       }
+
        /** Programatically configure the context menu */
        protected void contextMenuAboutToShow(IMenuManager menuManager) {
                IWorkbenchWindow window = DistPlugin.getDefault().getWorkbench()
@@ -190,8 +275,7 @@ public class DistributionsView extends ViewPart implements SlcNames {
                        // create workspace
                        CommandHelpers.refreshCommand(menuManager, window,
                                        CreateWorkspace.ID, CreateWorkspace.DEFAULT_LABEL,
-                                       CreateWorkspace.DEFAULT_ICON_PATH,
-                                       tp instanceof RepositoryElem);
+                                       CreateWorkspace.DEFAULT_ICON_PATH, !isDistribElem);
 
                        // Normalize workspace
                        Map<String, String> params = new HashMap<String, String>();
@@ -226,44 +310,187 @@ public class DistributionsView extends ViewPart implements SlcNames {
                }
        }
 
-       private class DistributionsContentProvider extends
-                       AbstractTreeContentProvider {
+       private class DistributionsContentProvider implements ITreeContentProvider {
+               Session nodeSession;
+               List<RepoElem> repositories = new ArrayList<RepoElem>();
 
-               public Object[] getElements(Object arg0) {
+               public Object[] getElements(Object input) {
+                       Repository nodeRepository = (Repository) input;
+                       try {
+                               if (nodeSession != null)
+                                       dispose();
+                               nodeSession = nodeRepository.login();
+
+                               String reposPath = UserJcrUtils.getUserHome(nodeSession)
+                                               .getPath() + RepoConstants.REPOSITORIES_BASE_PATH;
+                               NodeIterator repos = nodeSession.getNode(reposPath).getNodes();
+                               while (repos.hasNext()) {
+                                       Node repoNode = repos.nextNode();
+                                       if (repoNode.isNodeType(ArgeoTypes.ARGEO_REMOTE_REPOSITORY)) {
+                                               repositories.add(new RepoElem(repoNode));
+                                       }
+                               }
+                       } catch (RepositoryException e) {
+                               throw new SlcException("Cannot get base elements", e);
+                       }
                        return repositories.toArray();
                }
 
+               public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
+
+               }
+
+               public Object[] getChildren(Object parentElement) {
+                       if (parentElement instanceof RepoElem) {
+                               return ((RepoElem) parentElement).getChildren();
+                       } else if (parentElement instanceof DistributionElem) {
+                               return ((DistributionElem) parentElement).getChildren();
+                       }
+                       return null;
+               }
+
+               public Object getParent(Object element) {
+                       // TODO register repo elem in distirbution elem?
+                       return null;
+               }
+
+               public boolean hasChildren(Object element) {
+                       if (element instanceof RepoElem) {
+                               return true;
+                       } else if (element instanceof DistributionElem) {
+                               return false;
+                       }
+                       return false;
+               }
+
+               public void dispose() {
+                       for (RepoElem repoElem : repositories)
+                               repoElem.dispose();
+                       repositories = new ArrayList<RepoElem>();
+                       JcrUtils.logoutQuietly(nodeSession);
+               }
+
        }
 
-       /** Wraps a repository **/
-       private static class RepositoryElem extends TreeParent {
-               // private final Repository repository;
-               private Session defaultSession;
+       // private class DistributionsContentProvider extends
+       // AbstractTreeContentProvider {
+       //
+       // public Object[] getElements(Object arg0) {
+       // return repositories.toArray();
+       // }
+       //
+       // }
 
-               public RepositoryElem(String name, Repository repository,
-                               Credentials credentials) {
-                       super(name);
+       private class RepoElem {
+               private Node repoNode;
+
+               private Repository repository;
+               private Credentials credentials;
+               private Session defaultSession = null;
+
+               public RepoElem(Node repoNode) {
+                       this.repoNode = repoNode;
+               }
+
+               /** Lazily connects to repository */
+               protected void connect() {
+                       if (defaultSession != null)
+                               return;
+
+                       try {
+                               if (repoNode.isNodeType(ArgeoTypes.ARGEO_REMOTE_REPOSITORY)) {
+                                       String uri = repoNode.getProperty(ARGEO_URI).getString();
+                                       if (uri.startsWith("http")) {// http, https
+                                               if (repoNode.hasProperty(ARGEO_USER_ID)) {
+                                                       String userId = repoNode.getProperty(ARGEO_USER_ID)
+                                                                       .getString();
+                                                       char[] password = keyring.getAsChars(repoNode
+                                                                       .getPath() + '/' + ARGEO_PASSWORD);
+                                                       credentials = new SimpleCredentials(userId,
+                                                                       password);
+                                               }
+                                               repository = ArgeoJcrUtils.getRepositoryByUri(
+                                                               repositoryFactory, uri);
+                                       } else {// alias
+                                               String alias = uri;
+                                               repository = ArgeoJcrUtils.getRepositoryByAlias(
+                                                               repositoryFactory, alias);
+                                               credentials = null;
+                                       }
+                                       defaultSession = repository.login(credentials);
+                               }
+                       } catch (RepositoryException e) {
+                               throw new SlcException("Cannot connect to repository "
+                                               + repoNode, e);
+                       }
+               }
+
+               public String getLabel() {
+                       try {
+                               if (repoNode.isNodeType(NodeType.MIX_TITLE)) {
+                                       return repoNode.getProperty(Property.JCR_TITLE).getString();
+                               } else {
+                                       return repoNode.getName();
+                               }
+                       } catch (RepositoryException e) {
+                               throw new SlcException("Cannot read label of " + repoNode, e);
+                       }
+               }
+
+               public String toString() {
+                       return repoNode.toString();
+               }
+
+               public Object[] getChildren() {
+                       connect();
                        try {
-                               defaultSession = repository.login(credentials);
                                String[] workspaceNames = defaultSession.getWorkspace()
                                                .getAccessibleWorkspaceNames();
+                               List<DistributionElem> distributionElems = new ArrayList<DistributionElem>();
                                for (String workspace : workspaceNames)
-                                       addChild(new DistributionElem(repository, workspace,
-                                                       credentials));
+                                       distributionElems.add(new DistributionElem(repository,
+                                                       workspace, credentials));
+                               return distributionElems.toArray();
                        } catch (RepositoryException e) {
-                               ErrorFeedback.show("Cannot log to repository", e);
+                               throw new SlcException(
+                                               "Cannot list workspaces for " + repoNode, e);
                        }
                }
 
-               @Override
-               public synchronized void dispose() {
-                       if (log.isTraceEnabled())
-                               log.trace("Disposing RepositoryElement");
+               public void dispose() {
                        JcrUtils.logoutQuietly(defaultSession);
-                       super.dispose();
                }
        }
 
+       /** Wraps a repository **/
+       // private static class RepositoryElem extends TreeParent {
+       // // private final Repository repository;
+       // private Session defaultSession;
+       //
+       // public RepositoryElem(String name, Repository repository,
+       // Credentials credentials) {
+       // super(name);
+       // try {
+       // defaultSession = repository.login(credentials);
+       // String[] workspaceNames = defaultSession.getWorkspace()
+       // .getAccessibleWorkspaceNames();
+       // for (String workspace : workspaceNames)
+       // addChild(new DistributionElem(repository, workspace,
+       // credentials));
+       // } catch (RepositoryException e) {
+       // ErrorFeedback.show("Cannot log to repository", e);
+       // }
+       // }
+       //
+       // @Override
+       // public synchronized void dispose() {
+       // if (log.isTraceEnabled())
+       // log.trace("Disposing RepositoryElement");
+       // JcrUtils.logoutQuietly(defaultSession);
+       // super.dispose();
+       // }
+       // }
+
        private static class DistributionElem extends TreeParent {
                private final String workspaceName;
                private final Repository repository;
@@ -292,8 +519,8 @@ public class DistributionsView extends ViewPart implements SlcNames {
 
        @Override
        public void dispose() {
-               for (RepositoryElem re : repositories)
-                       re.dispose();
+               // for (RepositoryElem re : repositories)
+               // re.dispose();
                super.dispose();
        }