From 4338fa5772c552075801aa689e5c2488b85d6756 Mon Sep 17 00:00:00 2001
From: Bruno Sinou <bsinou@argeo.org>
Date: Wed, 14 Sep 2016 19:56:58 +0000
Subject: [PATCH] Merge org.argeo.eclipse.ui.workbench in
 org.argeo.cms.ui.workbench

git-svn-id: https://svn.argeo.org/commons/trunk@9148 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc
---
 .../icons/active.gif                          | Bin
 .../icons/add.gif                             | Bin
 .../icons/addFolder.gif                       | Bin
 .../icons/addPrivileges.gif                   | Bin
 .../icons/addRepo.gif                         | Bin
 .../icons/addWorkspace.png                    | Bin
 .../icons/binary.png                          | Bin
 .../icons/browser.gif                         | Bin
 .../icons/bundles.gif                         | Bin
 .../icons/dumpNode.gif                        | Bin
 .../icons/file.gif                            | Bin
 .../icons/folder.gif                          | Bin
 .../icons/getSize.gif                         | Bin
 .../icons/import_fs.png                       | Bin
 .../icons/installed.gif                       | Bin
 .../icons/node.gif                            | Bin
 .../icons/nodes.gif                           | Bin
 .../icons/osgi_explorer.gif                   | Bin
 .../icons/query.png                           | Bin
 .../icons/refresh.png                         | Bin
 .../icons/remote_connected.gif                | Bin
 .../icons/remote_disconnected.gif             | Bin
 .../icons/remove.gif                          | Bin
 .../icons/removePrivileges.gif                | Bin
 .../icons/rename.gif                          | Bin
 .../icons/repositories.gif                    | Bin
 .../icons/repository_connected.gif            | Bin
 .../icons/repository_disconnected.gif         | Bin
 .../icons/resolved.gif                        | Bin
 .../icons/role.gif                            | Bin
 .../icons/service_published.gif               | Bin
 .../icons/service_referenced.gif              | Bin
 .../icons/sort.gif                            | Bin
 .../icons/starting.gif                        | Bin
 .../icons/user.gif                            | Bin
 .../icons/users.gif                           | Bin
 .../icons/workspace_connected.png             | Bin
 .../icons/workspace_disconnected.png          | Bin
 .../META-INF/spring/commands.xml              |  16 +
 .../META-INF/spring/jcr.xml                   |   0
 .../META-INF/spring/osgi.xml                  |  22 +-
 .../META-INF/spring/parts.xml                 |  26 +-
 org.argeo.cms.ui.workbench/bnd.bnd            |   2 +-
 org.argeo.cms.ui.workbench/plugin.xml         | 436 +++++++++++++++++-
 .../ui/workbench}/SecurityUiPlugin.java       |  71 ++-
 .../cms}/ui/workbench/messages.properties     |   0
 .../eclipse/ui/workbench/CommandUtils.java    |   3 +-
 .../eclipse/ui/workbench/ErrorFeedback.java   |   0
 .../ui/workbench/WorkbenchConstants.java      |   0
 .../ui/workbench/WorkbenchUiPlugin.java       | 109 +++++
 .../ui/workbench/commands/AddFolderNode.java  |   7 +-
 .../ui/workbench/commands/AddPrivileges.java  |   5 +-
 .../commands/AddRemoteRepository.java         |   0
 .../workbench/commands/CreateWorkspace.java   |   5 +-
 .../ui/workbench/commands/DeleteNodes.java    |   0
 .../ui/workbench/commands/DoNothing.java      |   4 +-
 .../ui/workbench/commands/DumpNode.java       |   8 +-
 .../ui/workbench/commands/EditNode.java       |   0
 .../ui/workbench/commands/GetNodeSize.java    |   4 +-
 .../workbench/commands/ImportFileSystem.java  |   4 +-
 .../commands/NodeConfigurableDump.java        |   4 +-
 .../ui/workbench/commands/OpenEditor.java     |   7 +-
 .../ui/workbench/commands/OpenFile.java       |   4 +-
 .../ui/workbench/commands/Refresh.java        |  12 +-
 .../workbench/commands/RemovePrivileges.java  |   9 +-
 .../commands/RemoveRemoteRepository.java      |   0
 .../ui/workbench/commands/RenameNode.java     |   4 +-
 .../ui/workbench/commands/SortChildNodes.java |   5 +-
 .../FullVersioningTreeContentProvider.java    |   0
 .../jcr/GenericNodeDoubleClickListener.java   |   4 +-
 .../internal/jcr/JcrBrowserUtils.java         |   0
 .../internal/jcr/NodeContentProvider.java     |   0
 .../internal/jcr/NodeLabelProvider.java       |   0
 .../jcr/PropertiesContentProvider.java        |   0
 .../internal/jcr/PropertyLabelProvider.java   |   0
 .../jcr/SingleNodeAsTreeContentProvider.java  |   0
 .../internal/jcr/VersionLabelProvider.java    |   0
 .../jcr/model/MaintainedRepositoryElem.java   |   0
 .../jcr/model/RemoteRepositoryElem.java       |   0
 .../internal/jcr/model/RepositoriesElem.java  |   0
 .../internal/jcr/model/RepositoryElem.java    |   0
 .../internal/jcr/model/SingleJcrNodeElem.java |   0
 .../internal/jcr/model/WorkspaceElem.java     |   0
 .../jcr/parts/AbstractJcrQueryEditor.java     |   0
 .../jcr/parts/AddPrivilegeWizard.java         |   0
 .../internal/jcr/parts/ChildNodesPage.java    |   8 +-
 .../internal/jcr/parts/ChooseNameDialog.java  |   0
 .../internal/jcr/parts/EmptyNodePage.java     |   0
 .../jcr/parts/GenericNodeEditorInput.java     |   0
 .../internal/jcr/parts/GenericNodePage.java   |   0
 .../jcr/parts/GenericPropertyPage.java        |   4 +-
 .../jcr/parts/ImportFileSystemWizard.java     |   0
 .../jcr/parts/JcrQueryEditorInput.java        |   0
 .../internal/jcr/parts/NodeEditorInput.java   |   0
 .../jcr/parts/NodePrivilegesPage.java         |  15 +-
 .../jcr/parts/NodeVersionHistoryPage.java     |  13 +-
 .../jcr/parts/StringNodeEditorInput.java      |   0
 .../workbench/internal/users/UsersImages.java |  10 +-
 .../workbench/internal/users/UsersUtils.java  |   0
 .../ui/workbench/jcr/DefaultNodeEditor.java   |  26 +-
 .../workbench/jcr/GenericJcrQueryEditor.java  |   4 +-
 .../workbench/jcr/JcrBrowserPerspective.java  |   7 +-
 .../ui/workbench/jcr/JcrBrowserView.java      |   5 +-
 .../eclipse/ui/workbench/jcr/JcrImages.java   |  30 +-
 .../ui/workbench/jcr/JcrPreferenceStore.java  |   0
 .../eclipse/ui/workbench/osgi/BundleNode.java |   0
 .../ui/workbench/osgi/BundlesView.java        |   4 +-
 .../ui/workbench/osgi/ModulesView.java        |   4 +-
 .../workbench/osgi/MultiplePackagesView.java  |   4 +-
 .../ui/workbench/osgi/OsgiExplorerImages.java |  14 +-
 .../osgi/OsgiExplorerPerspective.java         |   0
 .../workbench/osgi/ServiceReferenceNode.java  |   0
 .../ui/workbench/osgi/StateLabelProvider.java |   0
 .../ui/workbench/users/PickUpUserDialog.java  |   0
 .../eclipse/ui/workbench/users/UserLP.java    |   0
 .../security/ui/MaintenancePerspective.java   |   1 +
 .../security/ui/UserHomePerspective.java      |   1 +
 .../ui/admin/SecurityAdminImages.java         |   2 +-
 .../admin/internal/commands/DeleteGroups.java |   2 +-
 .../admin/internal/commands/DeleteUsers.java  |   2 +-
 .../ui/admin/internal/commands/NewGroup.java  |   2 +-
 .../ui/admin/internal/commands/NewUser.java   |   2 +-
 .../internal/commands/SaveArgeoUser.java      |   2 +-
 .../commands/UserTransactionHandler.java      |   2 +-
 .../ui/admin/internal/parts/GroupsView.java   |   2 +-
 .../ui/admin/internal/parts/UserEditor.java   |   2 +-
 .../ui/admin/internal/parts/UsersView.java    |   2 +-
 .../UserTableDefaultDClickListener.java       |   7 +-
 .../providers/UserTransactionProvider.java    |   2 +-
 .../argeo/security/ui/views/AdminLogView.java |   2 +-
 .../org/argeo/security/ui/views/LogView.java  |   2 +-
 .../argeo/security/ui/views/UserProfile.java  |   2 +-
 .../META-INF/spring/commands.xml              |  15 +-
 .../META-INF/spring/osgi.xml                  |  10 -
 org.argeo.eclipse.ui.workbench/plugin.xml     |  35 --
 .../ui/workbench/WorkbenchUiPlugin.java       | 116 -----
 pom.xml                                       |   2 +-
 137 files changed, 809 insertions(+), 325 deletions(-)
 rename {org.argeo.eclipse.ui.workbench => org.argeo.cms.ui.workbench.rap}/icons/active.gif (100%)
 rename {org.argeo.eclipse.ui.workbench => org.argeo.cms.ui.workbench.rap}/icons/add.gif (100%)
 rename {org.argeo.eclipse.ui.workbench => org.argeo.cms.ui.workbench.rap}/icons/addFolder.gif (100%)
 rename {org.argeo.eclipse.ui.workbench => org.argeo.cms.ui.workbench.rap}/icons/addPrivileges.gif (100%)
 rename {org.argeo.eclipse.ui.workbench => org.argeo.cms.ui.workbench.rap}/icons/addRepo.gif (100%)
 rename {org.argeo.eclipse.ui.workbench => org.argeo.cms.ui.workbench.rap}/icons/addWorkspace.png (100%)
 rename {org.argeo.eclipse.ui.workbench => org.argeo.cms.ui.workbench.rap}/icons/binary.png (100%)
 rename {org.argeo.eclipse.ui.workbench => org.argeo.cms.ui.workbench.rap}/icons/browser.gif (100%)
 rename {org.argeo.eclipse.ui.workbench => org.argeo.cms.ui.workbench.rap}/icons/bundles.gif (100%)
 rename {org.argeo.eclipse.ui.workbench => org.argeo.cms.ui.workbench.rap}/icons/dumpNode.gif (100%)
 rename {org.argeo.eclipse.ui.workbench => org.argeo.cms.ui.workbench.rap}/icons/file.gif (100%)
 rename {org.argeo.eclipse.ui.workbench => org.argeo.cms.ui.workbench.rap}/icons/folder.gif (100%)
 rename {org.argeo.eclipse.ui.workbench => org.argeo.cms.ui.workbench.rap}/icons/getSize.gif (100%)
 rename {org.argeo.eclipse.ui.workbench => org.argeo.cms.ui.workbench.rap}/icons/import_fs.png (100%)
 rename {org.argeo.eclipse.ui.workbench => org.argeo.cms.ui.workbench.rap}/icons/installed.gif (100%)
 rename {org.argeo.eclipse.ui.workbench => org.argeo.cms.ui.workbench.rap}/icons/node.gif (100%)
 rename {org.argeo.eclipse.ui.workbench => org.argeo.cms.ui.workbench.rap}/icons/nodes.gif (100%)
 rename {org.argeo.eclipse.ui.workbench => org.argeo.cms.ui.workbench.rap}/icons/osgi_explorer.gif (100%)
 rename {org.argeo.eclipse.ui.workbench => org.argeo.cms.ui.workbench.rap}/icons/query.png (100%)
 rename {org.argeo.eclipse.ui.workbench => org.argeo.cms.ui.workbench.rap}/icons/refresh.png (100%)
 rename {org.argeo.eclipse.ui.workbench => org.argeo.cms.ui.workbench.rap}/icons/remote_connected.gif (100%)
 rename {org.argeo.eclipse.ui.workbench => org.argeo.cms.ui.workbench.rap}/icons/remote_disconnected.gif (100%)
 rename {org.argeo.eclipse.ui.workbench => org.argeo.cms.ui.workbench.rap}/icons/remove.gif (100%)
 rename {org.argeo.eclipse.ui.workbench => org.argeo.cms.ui.workbench.rap}/icons/removePrivileges.gif (100%)
 rename {org.argeo.eclipse.ui.workbench => org.argeo.cms.ui.workbench.rap}/icons/rename.gif (100%)
 rename {org.argeo.eclipse.ui.workbench => org.argeo.cms.ui.workbench.rap}/icons/repositories.gif (100%)
 rename {org.argeo.eclipse.ui.workbench => org.argeo.cms.ui.workbench.rap}/icons/repository_connected.gif (100%)
 rename {org.argeo.eclipse.ui.workbench => org.argeo.cms.ui.workbench.rap}/icons/repository_disconnected.gif (100%)
 rename {org.argeo.eclipse.ui.workbench => org.argeo.cms.ui.workbench.rap}/icons/resolved.gif (100%)
 rename {org.argeo.eclipse.ui.workbench => org.argeo.cms.ui.workbench.rap}/icons/role.gif (100%)
 rename {org.argeo.eclipse.ui.workbench => org.argeo.cms.ui.workbench.rap}/icons/service_published.gif (100%)
 rename {org.argeo.eclipse.ui.workbench => org.argeo.cms.ui.workbench.rap}/icons/service_referenced.gif (100%)
 rename {org.argeo.eclipse.ui.workbench => org.argeo.cms.ui.workbench.rap}/icons/sort.gif (100%)
 rename {org.argeo.eclipse.ui.workbench => org.argeo.cms.ui.workbench.rap}/icons/starting.gif (100%)
 rename {org.argeo.eclipse.ui.workbench => org.argeo.cms.ui.workbench.rap}/icons/user.gif (100%)
 rename {org.argeo.eclipse.ui.workbench => org.argeo.cms.ui.workbench.rap}/icons/users.gif (100%)
 rename {org.argeo.eclipse.ui.workbench => org.argeo.cms.ui.workbench.rap}/icons/workspace_connected.png (100%)
 rename {org.argeo.eclipse.ui.workbench => org.argeo.cms.ui.workbench.rap}/icons/workspace_disconnected.png (100%)
 rename {org.argeo.eclipse.ui.workbench => org.argeo.cms.ui.workbench}/META-INF/spring/jcr.xml (100%)
 rename org.argeo.cms.ui.workbench/src/org/argeo/{security/ui => cms/ui/workbench}/SecurityUiPlugin.java (60%)
 rename {org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse => org.argeo.cms.ui.workbench/src/org/argeo/cms}/ui/workbench/messages.properties (100%)
 rename {org.argeo.eclipse.ui.workbench => org.argeo.cms.ui.workbench}/src/org/argeo/eclipse/ui/workbench/CommandUtils.java (97%)
 rename {org.argeo.eclipse.ui.workbench => org.argeo.cms.ui.workbench}/src/org/argeo/eclipse/ui/workbench/ErrorFeedback.java (100%)
 rename {org.argeo.eclipse.ui.workbench => org.argeo.cms.ui.workbench}/src/org/argeo/eclipse/ui/workbench/WorkbenchConstants.java (100%)
 create mode 100644 org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/WorkbenchUiPlugin.java
 rename {org.argeo.eclipse.ui.workbench => org.argeo.cms.ui.workbench}/src/org/argeo/eclipse/ui/workbench/commands/AddFolderNode.java (94%)
 rename {org.argeo.eclipse.ui.workbench => org.argeo.cms.ui.workbench}/src/org/argeo/eclipse/ui/workbench/commands/AddPrivileges.java (95%)
 rename {org.argeo.eclipse.ui.workbench => org.argeo.cms.ui.workbench}/src/org/argeo/eclipse/ui/workbench/commands/AddRemoteRepository.java (100%)
 rename {org.argeo.eclipse.ui.workbench => org.argeo.cms.ui.workbench}/src/org/argeo/eclipse/ui/workbench/commands/CreateWorkspace.java (94%)
 rename {org.argeo.eclipse.ui.workbench => org.argeo.cms.ui.workbench}/src/org/argeo/eclipse/ui/workbench/commands/DeleteNodes.java (100%)
 rename {org.argeo.eclipse.ui.workbench => org.argeo.cms.ui.workbench}/src/org/argeo/eclipse/ui/workbench/commands/DoNothing.java (76%)
 rename {org.argeo.eclipse.ui.workbench => org.argeo.cms.ui.workbench}/src/org/argeo/eclipse/ui/workbench/commands/DumpNode.java (94%)
 rename {org.argeo.eclipse.ui.workbench => org.argeo.cms.ui.workbench}/src/org/argeo/eclipse/ui/workbench/commands/EditNode.java (100%)
 rename {org.argeo.eclipse.ui.workbench => org.argeo.cms.ui.workbench}/src/org/argeo/eclipse/ui/workbench/commands/GetNodeSize.java (96%)
 rename {org.argeo.eclipse.ui.workbench => org.argeo.cms.ui.workbench}/src/org/argeo/eclipse/ui/workbench/commands/ImportFileSystem.java (96%)
 rename {org.argeo.eclipse.ui.workbench => org.argeo.cms.ui.workbench}/src/org/argeo/eclipse/ui/workbench/commands/NodeConfigurableDump.java (98%)
 rename {org.argeo.eclipse.ui.workbench => org.argeo.cms.ui.workbench}/src/org/argeo/eclipse/ui/workbench/commands/OpenEditor.java (91%)
 rename {org.argeo.eclipse.ui.workbench => org.argeo.cms.ui.workbench}/src/org/argeo/eclipse/ui/workbench/commands/OpenFile.java (95%)
 rename {org.argeo.eclipse.ui.workbench => org.argeo.cms.ui.workbench}/src/org/argeo/eclipse/ui/workbench/commands/Refresh.java (84%)
 rename {org.argeo.eclipse.ui.workbench => org.argeo.cms.ui.workbench}/src/org/argeo/eclipse/ui/workbench/commands/RemovePrivileges.java (96%)
 rename {org.argeo.eclipse.ui.workbench => org.argeo.cms.ui.workbench}/src/org/argeo/eclipse/ui/workbench/commands/RemoveRemoteRepository.java (100%)
 rename {org.argeo.eclipse.ui.workbench => org.argeo.cms.ui.workbench}/src/org/argeo/eclipse/ui/workbench/commands/RenameNode.java (95%)
 rename {org.argeo.eclipse.ui.workbench => org.argeo.cms.ui.workbench}/src/org/argeo/eclipse/ui/workbench/commands/SortChildNodes.java (92%)
 rename {org.argeo.eclipse.ui.workbench => org.argeo.cms.ui.workbench}/src/org/argeo/eclipse/ui/workbench/internal/jcr/FullVersioningTreeContentProvider.java (100%)
 rename {org.argeo.eclipse.ui.workbench => org.argeo.cms.ui.workbench}/src/org/argeo/eclipse/ui/workbench/internal/jcr/GenericNodeDoubleClickListener.java (97%)
 rename {org.argeo.eclipse.ui.workbench => org.argeo.cms.ui.workbench}/src/org/argeo/eclipse/ui/workbench/internal/jcr/JcrBrowserUtils.java (100%)
 rename {org.argeo.eclipse.ui.workbench => org.argeo.cms.ui.workbench}/src/org/argeo/eclipse/ui/workbench/internal/jcr/NodeContentProvider.java (100%)
 rename {org.argeo.eclipse.ui.workbench => org.argeo.cms.ui.workbench}/src/org/argeo/eclipse/ui/workbench/internal/jcr/NodeLabelProvider.java (100%)
 rename {org.argeo.eclipse.ui.workbench => org.argeo.cms.ui.workbench}/src/org/argeo/eclipse/ui/workbench/internal/jcr/PropertiesContentProvider.java (100%)
 rename {org.argeo.eclipse.ui.workbench => org.argeo.cms.ui.workbench}/src/org/argeo/eclipse/ui/workbench/internal/jcr/PropertyLabelProvider.java (100%)
 rename {org.argeo.eclipse.ui.workbench => org.argeo.cms.ui.workbench}/src/org/argeo/eclipse/ui/workbench/internal/jcr/SingleNodeAsTreeContentProvider.java (100%)
 rename {org.argeo.eclipse.ui.workbench => org.argeo.cms.ui.workbench}/src/org/argeo/eclipse/ui/workbench/internal/jcr/VersionLabelProvider.java (100%)
 rename {org.argeo.eclipse.ui.workbench => org.argeo.cms.ui.workbench}/src/org/argeo/eclipse/ui/workbench/internal/jcr/model/MaintainedRepositoryElem.java (100%)
 rename {org.argeo.eclipse.ui.workbench => org.argeo.cms.ui.workbench}/src/org/argeo/eclipse/ui/workbench/internal/jcr/model/RemoteRepositoryElem.java (100%)
 rename {org.argeo.eclipse.ui.workbench => org.argeo.cms.ui.workbench}/src/org/argeo/eclipse/ui/workbench/internal/jcr/model/RepositoriesElem.java (100%)
 rename {org.argeo.eclipse.ui.workbench => org.argeo.cms.ui.workbench}/src/org/argeo/eclipse/ui/workbench/internal/jcr/model/RepositoryElem.java (100%)
 rename {org.argeo.eclipse.ui.workbench => org.argeo.cms.ui.workbench}/src/org/argeo/eclipse/ui/workbench/internal/jcr/model/SingleJcrNodeElem.java (100%)
 rename {org.argeo.eclipse.ui.workbench => org.argeo.cms.ui.workbench}/src/org/argeo/eclipse/ui/workbench/internal/jcr/model/WorkspaceElem.java (100%)
 rename {org.argeo.eclipse.ui.workbench => org.argeo.cms.ui.workbench}/src/org/argeo/eclipse/ui/workbench/internal/jcr/parts/AbstractJcrQueryEditor.java (100%)
 rename {org.argeo.eclipse.ui.workbench => org.argeo.cms.ui.workbench}/src/org/argeo/eclipse/ui/workbench/internal/jcr/parts/AddPrivilegeWizard.java (100%)
 rename {org.argeo.eclipse.ui.workbench => org.argeo.cms.ui.workbench}/src/org/argeo/eclipse/ui/workbench/internal/jcr/parts/ChildNodesPage.java (94%)
 rename {org.argeo.eclipse.ui.workbench => org.argeo.cms.ui.workbench}/src/org/argeo/eclipse/ui/workbench/internal/jcr/parts/ChooseNameDialog.java (100%)
 rename {org.argeo.eclipse.ui.workbench => org.argeo.cms.ui.workbench}/src/org/argeo/eclipse/ui/workbench/internal/jcr/parts/EmptyNodePage.java (100%)
 rename {org.argeo.eclipse.ui.workbench => org.argeo.cms.ui.workbench}/src/org/argeo/eclipse/ui/workbench/internal/jcr/parts/GenericNodeEditorInput.java (100%)
 rename {org.argeo.eclipse.ui.workbench => org.argeo.cms.ui.workbench}/src/org/argeo/eclipse/ui/workbench/internal/jcr/parts/GenericNodePage.java (100%)
 rename {org.argeo.eclipse.ui.workbench => org.argeo.cms.ui.workbench}/src/org/argeo/eclipse/ui/workbench/internal/jcr/parts/GenericPropertyPage.java (98%)
 rename {org.argeo.eclipse.ui.workbench => org.argeo.cms.ui.workbench}/src/org/argeo/eclipse/ui/workbench/internal/jcr/parts/ImportFileSystemWizard.java (100%)
 rename {org.argeo.eclipse.ui.workbench => org.argeo.cms.ui.workbench}/src/org/argeo/eclipse/ui/workbench/internal/jcr/parts/JcrQueryEditorInput.java (100%)
 rename {org.argeo.eclipse.ui.workbench => org.argeo.cms.ui.workbench}/src/org/argeo/eclipse/ui/workbench/internal/jcr/parts/NodeEditorInput.java (100%)
 rename {org.argeo.eclipse.ui.workbench => org.argeo.cms.ui.workbench}/src/org/argeo/eclipse/ui/workbench/internal/jcr/parts/NodePrivilegesPage.java (96%)
 rename {org.argeo.eclipse.ui.workbench => org.argeo.cms.ui.workbench}/src/org/argeo/eclipse/ui/workbench/internal/jcr/parts/NodeVersionHistoryPage.java (96%)
 rename {org.argeo.eclipse.ui.workbench => org.argeo.cms.ui.workbench}/src/org/argeo/eclipse/ui/workbench/internal/jcr/parts/StringNodeEditorInput.java (100%)
 rename {org.argeo.eclipse.ui.workbench => org.argeo.cms.ui.workbench}/src/org/argeo/eclipse/ui/workbench/internal/users/UsersImages.java (74%)
 rename {org.argeo.eclipse.ui.workbench => org.argeo.cms.ui.workbench}/src/org/argeo/eclipse/ui/workbench/internal/users/UsersUtils.java (100%)
 rename {org.argeo.eclipse.ui.workbench => org.argeo.cms.ui.workbench}/src/org/argeo/eclipse/ui/workbench/jcr/DefaultNodeEditor.java (88%)
 rename {org.argeo.eclipse.ui.workbench => org.argeo.cms.ui.workbench}/src/org/argeo/eclipse/ui/workbench/jcr/GenericJcrQueryEditor.java (94%)
 rename {org.argeo.eclipse.ui.workbench => org.argeo.cms.ui.workbench}/src/org/argeo/eclipse/ui/workbench/jcr/JcrBrowserPerspective.java (83%)
 rename {org.argeo.eclipse.ui.workbench => org.argeo.cms.ui.workbench}/src/org/argeo/eclipse/ui/workbench/jcr/JcrBrowserView.java (98%)
 rename {org.argeo.eclipse.ui.workbench => org.argeo.cms.ui.workbench}/src/org/argeo/eclipse/ui/workbench/jcr/JcrImages.java (59%)
 rename {org.argeo.eclipse.ui.workbench => org.argeo.cms.ui.workbench}/src/org/argeo/eclipse/ui/workbench/jcr/JcrPreferenceStore.java (100%)
 rename {org.argeo.eclipse.ui.workbench => org.argeo.cms.ui.workbench}/src/org/argeo/eclipse/ui/workbench/osgi/BundleNode.java (100%)
 rename {org.argeo.eclipse.ui.workbench => org.argeo.cms.ui.workbench}/src/org/argeo/eclipse/ui/workbench/osgi/BundlesView.java (97%)
 rename {org.argeo.eclipse.ui.workbench => org.argeo.cms.ui.workbench}/src/org/argeo/eclipse/ui/workbench/osgi/ModulesView.java (96%)
 rename {org.argeo.eclipse.ui.workbench => org.argeo.cms.ui.workbench}/src/org/argeo/eclipse/ui/workbench/osgi/MultiplePackagesView.java (97%)
 rename {org.argeo.eclipse.ui.workbench => org.argeo.cms.ui.workbench}/src/org/argeo/eclipse/ui/workbench/osgi/OsgiExplorerImages.java (68%)
 rename {org.argeo.eclipse.ui.workbench => org.argeo.cms.ui.workbench}/src/org/argeo/eclipse/ui/workbench/osgi/OsgiExplorerPerspective.java (100%)
 rename {org.argeo.eclipse.ui.workbench => org.argeo.cms.ui.workbench}/src/org/argeo/eclipse/ui/workbench/osgi/ServiceReferenceNode.java (100%)
 rename {org.argeo.eclipse.ui.workbench => org.argeo.cms.ui.workbench}/src/org/argeo/eclipse/ui/workbench/osgi/StateLabelProvider.java (100%)
 rename {org.argeo.eclipse.ui.workbench => org.argeo.cms.ui.workbench}/src/org/argeo/eclipse/ui/workbench/users/PickUpUserDialog.java (100%)
 rename {org.argeo.eclipse.ui.workbench => org.argeo.cms.ui.workbench}/src/org/argeo/eclipse/ui/workbench/users/UserLP.java (100%)
 delete mode 100644 org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/WorkbenchUiPlugin.java

diff --git a/org.argeo.eclipse.ui.workbench/icons/active.gif b/org.argeo.cms.ui.workbench.rap/icons/active.gif
similarity index 100%
rename from org.argeo.eclipse.ui.workbench/icons/active.gif
rename to org.argeo.cms.ui.workbench.rap/icons/active.gif
diff --git a/org.argeo.eclipse.ui.workbench/icons/add.gif b/org.argeo.cms.ui.workbench.rap/icons/add.gif
similarity index 100%
rename from org.argeo.eclipse.ui.workbench/icons/add.gif
rename to org.argeo.cms.ui.workbench.rap/icons/add.gif
diff --git a/org.argeo.eclipse.ui.workbench/icons/addFolder.gif b/org.argeo.cms.ui.workbench.rap/icons/addFolder.gif
similarity index 100%
rename from org.argeo.eclipse.ui.workbench/icons/addFolder.gif
rename to org.argeo.cms.ui.workbench.rap/icons/addFolder.gif
diff --git a/org.argeo.eclipse.ui.workbench/icons/addPrivileges.gif b/org.argeo.cms.ui.workbench.rap/icons/addPrivileges.gif
similarity index 100%
rename from org.argeo.eclipse.ui.workbench/icons/addPrivileges.gif
rename to org.argeo.cms.ui.workbench.rap/icons/addPrivileges.gif
diff --git a/org.argeo.eclipse.ui.workbench/icons/addRepo.gif b/org.argeo.cms.ui.workbench.rap/icons/addRepo.gif
similarity index 100%
rename from org.argeo.eclipse.ui.workbench/icons/addRepo.gif
rename to org.argeo.cms.ui.workbench.rap/icons/addRepo.gif
diff --git a/org.argeo.eclipse.ui.workbench/icons/addWorkspace.png b/org.argeo.cms.ui.workbench.rap/icons/addWorkspace.png
similarity index 100%
rename from org.argeo.eclipse.ui.workbench/icons/addWorkspace.png
rename to org.argeo.cms.ui.workbench.rap/icons/addWorkspace.png
diff --git a/org.argeo.eclipse.ui.workbench/icons/binary.png b/org.argeo.cms.ui.workbench.rap/icons/binary.png
similarity index 100%
rename from org.argeo.eclipse.ui.workbench/icons/binary.png
rename to org.argeo.cms.ui.workbench.rap/icons/binary.png
diff --git a/org.argeo.eclipse.ui.workbench/icons/browser.gif b/org.argeo.cms.ui.workbench.rap/icons/browser.gif
similarity index 100%
rename from org.argeo.eclipse.ui.workbench/icons/browser.gif
rename to org.argeo.cms.ui.workbench.rap/icons/browser.gif
diff --git a/org.argeo.eclipse.ui.workbench/icons/bundles.gif b/org.argeo.cms.ui.workbench.rap/icons/bundles.gif
similarity index 100%
rename from org.argeo.eclipse.ui.workbench/icons/bundles.gif
rename to org.argeo.cms.ui.workbench.rap/icons/bundles.gif
diff --git a/org.argeo.eclipse.ui.workbench/icons/dumpNode.gif b/org.argeo.cms.ui.workbench.rap/icons/dumpNode.gif
similarity index 100%
rename from org.argeo.eclipse.ui.workbench/icons/dumpNode.gif
rename to org.argeo.cms.ui.workbench.rap/icons/dumpNode.gif
diff --git a/org.argeo.eclipse.ui.workbench/icons/file.gif b/org.argeo.cms.ui.workbench.rap/icons/file.gif
similarity index 100%
rename from org.argeo.eclipse.ui.workbench/icons/file.gif
rename to org.argeo.cms.ui.workbench.rap/icons/file.gif
diff --git a/org.argeo.eclipse.ui.workbench/icons/folder.gif b/org.argeo.cms.ui.workbench.rap/icons/folder.gif
similarity index 100%
rename from org.argeo.eclipse.ui.workbench/icons/folder.gif
rename to org.argeo.cms.ui.workbench.rap/icons/folder.gif
diff --git a/org.argeo.eclipse.ui.workbench/icons/getSize.gif b/org.argeo.cms.ui.workbench.rap/icons/getSize.gif
similarity index 100%
rename from org.argeo.eclipse.ui.workbench/icons/getSize.gif
rename to org.argeo.cms.ui.workbench.rap/icons/getSize.gif
diff --git a/org.argeo.eclipse.ui.workbench/icons/import_fs.png b/org.argeo.cms.ui.workbench.rap/icons/import_fs.png
similarity index 100%
rename from org.argeo.eclipse.ui.workbench/icons/import_fs.png
rename to org.argeo.cms.ui.workbench.rap/icons/import_fs.png
diff --git a/org.argeo.eclipse.ui.workbench/icons/installed.gif b/org.argeo.cms.ui.workbench.rap/icons/installed.gif
similarity index 100%
rename from org.argeo.eclipse.ui.workbench/icons/installed.gif
rename to org.argeo.cms.ui.workbench.rap/icons/installed.gif
diff --git a/org.argeo.eclipse.ui.workbench/icons/node.gif b/org.argeo.cms.ui.workbench.rap/icons/node.gif
similarity index 100%
rename from org.argeo.eclipse.ui.workbench/icons/node.gif
rename to org.argeo.cms.ui.workbench.rap/icons/node.gif
diff --git a/org.argeo.eclipse.ui.workbench/icons/nodes.gif b/org.argeo.cms.ui.workbench.rap/icons/nodes.gif
similarity index 100%
rename from org.argeo.eclipse.ui.workbench/icons/nodes.gif
rename to org.argeo.cms.ui.workbench.rap/icons/nodes.gif
diff --git a/org.argeo.eclipse.ui.workbench/icons/osgi_explorer.gif b/org.argeo.cms.ui.workbench.rap/icons/osgi_explorer.gif
similarity index 100%
rename from org.argeo.eclipse.ui.workbench/icons/osgi_explorer.gif
rename to org.argeo.cms.ui.workbench.rap/icons/osgi_explorer.gif
diff --git a/org.argeo.eclipse.ui.workbench/icons/query.png b/org.argeo.cms.ui.workbench.rap/icons/query.png
similarity index 100%
rename from org.argeo.eclipse.ui.workbench/icons/query.png
rename to org.argeo.cms.ui.workbench.rap/icons/query.png
diff --git a/org.argeo.eclipse.ui.workbench/icons/refresh.png b/org.argeo.cms.ui.workbench.rap/icons/refresh.png
similarity index 100%
rename from org.argeo.eclipse.ui.workbench/icons/refresh.png
rename to org.argeo.cms.ui.workbench.rap/icons/refresh.png
diff --git a/org.argeo.eclipse.ui.workbench/icons/remote_connected.gif b/org.argeo.cms.ui.workbench.rap/icons/remote_connected.gif
similarity index 100%
rename from org.argeo.eclipse.ui.workbench/icons/remote_connected.gif
rename to org.argeo.cms.ui.workbench.rap/icons/remote_connected.gif
diff --git a/org.argeo.eclipse.ui.workbench/icons/remote_disconnected.gif b/org.argeo.cms.ui.workbench.rap/icons/remote_disconnected.gif
similarity index 100%
rename from org.argeo.eclipse.ui.workbench/icons/remote_disconnected.gif
rename to org.argeo.cms.ui.workbench.rap/icons/remote_disconnected.gif
diff --git a/org.argeo.eclipse.ui.workbench/icons/remove.gif b/org.argeo.cms.ui.workbench.rap/icons/remove.gif
similarity index 100%
rename from org.argeo.eclipse.ui.workbench/icons/remove.gif
rename to org.argeo.cms.ui.workbench.rap/icons/remove.gif
diff --git a/org.argeo.eclipse.ui.workbench/icons/removePrivileges.gif b/org.argeo.cms.ui.workbench.rap/icons/removePrivileges.gif
similarity index 100%
rename from org.argeo.eclipse.ui.workbench/icons/removePrivileges.gif
rename to org.argeo.cms.ui.workbench.rap/icons/removePrivileges.gif
diff --git a/org.argeo.eclipse.ui.workbench/icons/rename.gif b/org.argeo.cms.ui.workbench.rap/icons/rename.gif
similarity index 100%
rename from org.argeo.eclipse.ui.workbench/icons/rename.gif
rename to org.argeo.cms.ui.workbench.rap/icons/rename.gif
diff --git a/org.argeo.eclipse.ui.workbench/icons/repositories.gif b/org.argeo.cms.ui.workbench.rap/icons/repositories.gif
similarity index 100%
rename from org.argeo.eclipse.ui.workbench/icons/repositories.gif
rename to org.argeo.cms.ui.workbench.rap/icons/repositories.gif
diff --git a/org.argeo.eclipse.ui.workbench/icons/repository_connected.gif b/org.argeo.cms.ui.workbench.rap/icons/repository_connected.gif
similarity index 100%
rename from org.argeo.eclipse.ui.workbench/icons/repository_connected.gif
rename to org.argeo.cms.ui.workbench.rap/icons/repository_connected.gif
diff --git a/org.argeo.eclipse.ui.workbench/icons/repository_disconnected.gif b/org.argeo.cms.ui.workbench.rap/icons/repository_disconnected.gif
similarity index 100%
rename from org.argeo.eclipse.ui.workbench/icons/repository_disconnected.gif
rename to org.argeo.cms.ui.workbench.rap/icons/repository_disconnected.gif
diff --git a/org.argeo.eclipse.ui.workbench/icons/resolved.gif b/org.argeo.cms.ui.workbench.rap/icons/resolved.gif
similarity index 100%
rename from org.argeo.eclipse.ui.workbench/icons/resolved.gif
rename to org.argeo.cms.ui.workbench.rap/icons/resolved.gif
diff --git a/org.argeo.eclipse.ui.workbench/icons/role.gif b/org.argeo.cms.ui.workbench.rap/icons/role.gif
similarity index 100%
rename from org.argeo.eclipse.ui.workbench/icons/role.gif
rename to org.argeo.cms.ui.workbench.rap/icons/role.gif
diff --git a/org.argeo.eclipse.ui.workbench/icons/service_published.gif b/org.argeo.cms.ui.workbench.rap/icons/service_published.gif
similarity index 100%
rename from org.argeo.eclipse.ui.workbench/icons/service_published.gif
rename to org.argeo.cms.ui.workbench.rap/icons/service_published.gif
diff --git a/org.argeo.eclipse.ui.workbench/icons/service_referenced.gif b/org.argeo.cms.ui.workbench.rap/icons/service_referenced.gif
similarity index 100%
rename from org.argeo.eclipse.ui.workbench/icons/service_referenced.gif
rename to org.argeo.cms.ui.workbench.rap/icons/service_referenced.gif
diff --git a/org.argeo.eclipse.ui.workbench/icons/sort.gif b/org.argeo.cms.ui.workbench.rap/icons/sort.gif
similarity index 100%
rename from org.argeo.eclipse.ui.workbench/icons/sort.gif
rename to org.argeo.cms.ui.workbench.rap/icons/sort.gif
diff --git a/org.argeo.eclipse.ui.workbench/icons/starting.gif b/org.argeo.cms.ui.workbench.rap/icons/starting.gif
similarity index 100%
rename from org.argeo.eclipse.ui.workbench/icons/starting.gif
rename to org.argeo.cms.ui.workbench.rap/icons/starting.gif
diff --git a/org.argeo.eclipse.ui.workbench/icons/user.gif b/org.argeo.cms.ui.workbench.rap/icons/user.gif
similarity index 100%
rename from org.argeo.eclipse.ui.workbench/icons/user.gif
rename to org.argeo.cms.ui.workbench.rap/icons/user.gif
diff --git a/org.argeo.eclipse.ui.workbench/icons/users.gif b/org.argeo.cms.ui.workbench.rap/icons/users.gif
similarity index 100%
rename from org.argeo.eclipse.ui.workbench/icons/users.gif
rename to org.argeo.cms.ui.workbench.rap/icons/users.gif
diff --git a/org.argeo.eclipse.ui.workbench/icons/workspace_connected.png b/org.argeo.cms.ui.workbench.rap/icons/workspace_connected.png
similarity index 100%
rename from org.argeo.eclipse.ui.workbench/icons/workspace_connected.png
rename to org.argeo.cms.ui.workbench.rap/icons/workspace_connected.png
diff --git a/org.argeo.eclipse.ui.workbench/icons/workspace_disconnected.png b/org.argeo.cms.ui.workbench.rap/icons/workspace_disconnected.png
similarity index 100%
rename from org.argeo.eclipse.ui.workbench/icons/workspace_disconnected.png
rename to org.argeo.cms.ui.workbench.rap/icons/workspace_disconnected.png
diff --git a/org.argeo.cms.ui.workbench/META-INF/spring/commands.xml b/org.argeo.cms.ui.workbench/META-INF/spring/commands.xml
index 7d3987644..d51c0a2e9 100644
--- a/org.argeo.cms.ui.workbench/META-INF/spring/commands.xml
+++ b/org.argeo.cms.ui.workbench/META-INF/spring/commands.xml
@@ -36,4 +36,20 @@
 		scope="prototype">
 		<property name="userAdminWrapper" ref="userAdminWrapper" />
 	</bean>
+	
+	<!-- DATA EXPLORER -->
+	<bean id="addRemoteRepository"
+		class="org.argeo.eclipse.ui.workbench.commands.AddRemoteRepository">
+		<property name="repositoryFactory" ref="repositoryFactory" />
+		<property name="nodeRepository" ref="nodeRepository" />
+		<property name="keyring" ref="keyring" />
+	</bean>
+
+	<bean id="addPrivileges" class="org.argeo.eclipse.ui.workbench.commands.AddPrivileges">
+		<property name="userAdmin" ref="userAdmin" />
+	</bean>
+	<bean id="removePrivileges"
+		class="org.argeo.eclipse.ui.workbench.commands.RemovePrivileges">
+		<!-- <property name="userAdmin" ref="userAdmin" /> -->
+	</bean>
 </beans>
diff --git a/org.argeo.eclipse.ui.workbench/META-INF/spring/jcr.xml b/org.argeo.cms.ui.workbench/META-INF/spring/jcr.xml
similarity index 100%
rename from org.argeo.eclipse.ui.workbench/META-INF/spring/jcr.xml
rename to org.argeo.cms.ui.workbench/META-INF/spring/jcr.xml
diff --git a/org.argeo.cms.ui.workbench/META-INF/spring/osgi.xml b/org.argeo.cms.ui.workbench/META-INF/spring/osgi.xml
index e884f7838..8231a1119 100644
--- a/org.argeo.cms.ui.workbench/META-INF/spring/osgi.xml
+++ b/org.argeo.cms.ui.workbench/META-INF/spring/osgi.xml
@@ -8,24 +8,34 @@
        http://www.springframework.org/schema/beans/spring-beans-2.5.xsd"
 	osgi:default-timeout="30000">
 
-<!-- 	<reference id="nodeRepository" interface="javax.jcr.Repository" -->
-<!-- 		filter="(argeo.jcr.repository.alias=node)" /> -->
 
+	<list id="repositories" interface="javax.jcr.Repository"
+		cardinality="0..N">
+		<listener ref="repositoryRegister" bind-method="register"
+			unbind-method="unregister" />
+	</list>
+	<reference id="repositoryFactory" interface="javax.jcr.RepositoryFactory" />
+	<reference id="keyring" interface="org.argeo.util.security.CryptoKeyring" />
+
+	<!-- <reference id="nodeRepository" interface="javax.jcr.Repository" -->
+	<!-- filter="(argeo.jcr.repository.alias=node)" /> -->
 	<reference id="nodeRepository" interface="javax.jcr.Repository"
 		filter="(argeo.jcr.repository.alias=home)" />
 
-		
+
 	<!-- New user admin -->
 	<reference id="userAdmin" interface="org.osgi.service.useradmin.UserAdmin" />
 	<reference id="userTransaction" interface="javax.transaction.UserTransaction" />
-	
+
 	<reference id="secureLogger" interface="org.argeo.node.ArgeoLogger"
 		cardinality="0..1" />
 
 
 	<reference id="defaultCallbackHandler" interface="javax.security.auth.callback.CallbackHandler" />
 
+
+
+
 	<!-- SERVICES -->
-	<service interface="org.argeo.util.security.CryptoKeyring"
-		ref="keyring" />
+	<service interface="org.argeo.util.security.CryptoKeyring" ref="keyring" />
 </beans:beans>
\ No newline at end of file
diff --git a/org.argeo.cms.ui.workbench/META-INF/spring/parts.xml b/org.argeo.cms.ui.workbench/META-INF/spring/parts.xml
index cbc36e0c3..766348450 100644
--- a/org.argeo.cms.ui.workbench/META-INF/spring/parts.xml
+++ b/org.argeo.cms.ui.workbench/META-INF/spring/parts.xml
@@ -5,6 +5,8 @@
         http://www.springframework.org/schema/beans/spring-beans.xsd">
 
 
+	<!-- SECURITY  -->
+
 	<!-- Editors -->
 	<bean id="userEditor" class="org.argeo.security.ui.admin.internal.parts.UserEditor"
 		scope="prototype">
@@ -15,7 +17,7 @@
 		scope="prototype">
 		<property name="userAdminWrapper" ref="userAdminWrapper" />
 	</bean>
-
+	
 	<!-- Views -->
 	<bean id="usersView" class="org.argeo.security.ui.admin.internal.parts.UsersView"
 		scope="prototype">
@@ -26,4 +28,26 @@
 		<property name="userAdminWrapper" ref="userAdminWrapper" />
 	</bean>
 
+
+	<!-- DATA EXPLORER  -->
+	<!-- Editors -->
+	<bean id="genericJcrQueryEditor"
+		class="org.argeo.eclipse.ui.workbench.jcr.GenericJcrQueryEditor"
+		scope="prototype">
+		<property name="session" ref="nodeSession" />
+	</bean>
+	<bean id="defaultNodeEditor" class="org.argeo.eclipse.ui.workbench.jcr.DefaultNodeEditor"
+		scope="prototype">
+	</bean>
+
+	<!-- Views -->
+	<bean id="jcrBrowserView" class="org.argeo.eclipse.ui.workbench.jcr.JcrBrowserView"
+		scope="prototype">
+		<property name="repositoryRegister" ref="repositoryRegister" />
+		<property name="repositoryFactory" ref="repositoryFactory" />
+		<property name="nodeRepository" ref="nodeRepository" />
+		<property name="keyring" ref="keyring" />
+	</bean>
+
+
 </beans>
\ No newline at end of file
diff --git a/org.argeo.cms.ui.workbench/bnd.bnd b/org.argeo.cms.ui.workbench/bnd.bnd
index 3e0d1c69c..b80fb435f 100644
--- a/org.argeo.cms.ui.workbench/bnd.bnd
+++ b/org.argeo.cms.ui.workbench/bnd.bnd
@@ -1,5 +1,5 @@
 Bundle-SymbolicName: org.argeo.cms.ui.workbench;singleton:=true
-Bundle-Activator: org.argeo.security.ui.SecurityUiPlugin
+Bundle-Activator: org.argeo.cms.ui.workbench.SecurityUiPlugin
 Bundle-ActivationPolicy: lazy
 
 Require-Bundle:	org.eclipse.core.runtime,\
diff --git a/org.argeo.cms.ui.workbench/plugin.xml b/org.argeo.cms.ui.workbench/plugin.xml
index 2636818eb..5b2ead753 100644
--- a/org.argeo.cms.ui.workbench/plugin.xml
+++ b/org.argeo.cms.ui.workbench/plugin.xml
@@ -4,33 +4,68 @@
    <extension
          point="org.eclipse.ui.perspectives">
       <perspective
+            id="org.argeo.cms.ui.workbench.adminSecurityPerspective"
             class="org.argeo.security.ui.admin.SecurityAdminPerspective"
             icon="icons/security.gif"
-            id="org.argeo.cms.ui.workbench.adminSecurityPerspective"
             name="Security">
       </perspective>
       <perspective
+            id="org.argeo.cms.ui.workbench.userHomePerspective"
             class="org.argeo.security.ui.UserHomePerspective"
             icon="icons/home.gif"
-            id="org.argeo.cms.ui.workbench.userHomePerspective"
             name="Home">
       </perspective>
       <perspective
+            id="org.argeo.cms.ui.workbench.adminMaintenancePerspective"
             class="org.argeo.security.ui.MaintenancePerspective"
             icon="icons/maintenance.gif"
-            id="org.argeo.cms.ui.workbench.adminMaintenancePerspective"
             name="Maintenance">
+      </perspective>
+            <perspective
+            id="org.argeo.cms.ui.workbench.osgiPerspective"
+            class="org.argeo.eclipse.ui.workbench.osgi.OsgiExplorerPerspective"
+            name="Monitoring"
+            icon="icons/osgi_explorer.gif">
+      </perspective>
+      <perspective
+            id="org.argeo.cms.ui.workbench.jcrBrowserPerspective"
+            class="org.argeo.eclipse.ui.workbench.jcr.JcrBrowserPerspective"
+            name="Data Explorer"
+            icon="icons/nodes.gif">
       </perspective>
    </extension>
    
+    <!-- Definition of the OSGI perspective -->
+    <extension point="org.eclipse.ui.perspectiveExtensions"> 
+        <perspectiveExtension targetID="org.argeo.eclipse.ui.workbench.osgiPerspective"> 
+            <view 
+            	id="org.argeo.cms.ui.workbench.modulesView" 
+            	minimized="false"
+             	ratio="0.5" 
+             	relationship="left" 
+             	relative="org.eclipse.ui.editorss"/> 
+            <view 
+            	id="org.argeo.cms.ui.workbench.bundlesView" 
+            	minimized="false"
+             	relationship="stack" 
+             	relative="org.argeo.cms.ui.workbench.modulesView"/> 
+             <view 
+            	id="org.argeo.cms.ui.workbench.multiplePackagesView" 
+            	minimized="false"
+             	relationship="stack" 
+             	relative="org.argeo.cms.ui.workbench.bundlesView"/> 
+        </perspectiveExtension> 
+    </extension> 
+   
+   
    <!-- VIEWS -->
    <extension
 		point="org.eclipse.ui.views">
       <!-- Security -->
       <view
+            id="org.argeo.cms.ui.workbench.usersView"
             class="org.argeo.eclipse.spring.SpringExtensionFactory"
             icon="icons/users.gif"
-            id="org.argeo.cms.ui.workbench.usersView"
             name="Users"
             restorable="true">
       </view>
@@ -64,7 +99,32 @@
             icon="icons/adminLog.gif"
             restorable="true">
       </view>
-      
+	  <!-- OSGi Monitor -->
+      <view
+      		name="Modules"
+            id="org.argeo.cms.ui.workbench.modulesView"
+            icon="icons/service_published.gif"
+			class="org.argeo.eclipse.ui.workbench.osgi.ModulesView">
+		</view>
+		<view
+      		name="Bundles"
+            id="org.argeo.cms.ui.workbench.bundlesView" 
+            icon="icons/bundles.gif"
+            class="org.argeo.eclipse.ui.workbench.osgi.BundlesView">
+		</view>
+		<view
+      		name="Multiple Packages"
+            id="org.argeo.cms.ui.workbench.multiplePackagesView" 
+            icon="icons/node.gif"
+            class="org.argeo.eclipse.ui.workbench.osgi.MultiplePackagesView">
+		</view>
+		<!-- Data Explorer -->
+		<view
+          name="JCR Browser"
+          id="org.argeo.cms.ui.workbench.jcrBrowserView"
+          icon="icons/browser.gif"
+          class="org.argeo.eclipse.spring.SpringExtensionFactory">
+	   </view>
     </extension> 
 	
 	<!-- EDITORS -->
@@ -84,6 +144,22 @@
             icon="icons/users.gif"
             default="false">
 		</editor>
+		<!-- Data Explorer -->
+		<editor
+			name="JCR Query"
+			id="org.argeo.cms.ui.workbench.genericJcrQueryEditor"
+			icon="icons/query.png"
+			class="org.argeo.eclipse.spring.SpringExtensionFactory"
+			default="false">
+        </editor>
+		<editor
+			name="Node Editor"
+            id="org.argeo.cms.ui.workbench.defaultNodeEditor"
+			icon="icons/query.png"
+			class="org.argeo.eclipse.spring.SpringExtensionFactory"
+			default="false">
+		</editor>
+		
 	</extension>
     
     <extension
@@ -132,6 +208,110 @@
             id="org.argeo.cms.ui.workbench.forceRefresh"
             name="Force Refresh">
       </command>
+      <!-- Data Explorer -->
+      <command
+			defaultHandler="org.argeo.eclipse.ui.workbench.commands.OpenEditor"
+            id="org.argeo.cms.ui.workbench.openEditor"
+            name="Open an editor given its ID">
+            <commandParameter
+				id="param.jcrNodePath"
+				name="Node path">
+  	 		</commandParameter>
+            <!-- The path to the corresponding node if needed. -->
+            <commandParameter
+				id="param.jcrNodePath"
+				name="Node path">
+  	 		</commandParameter>
+		</command>
+    	<command
+			defaultHandler="org.argeo.eclipse.ui.workbench.commands.GetNodeSize"
+			id="org.argeo.cms.ui.workbench.getNodeSize"
+			name="Get node size">
+		</command>    
+    	<command
+			defaultHandler="org.argeo.eclipse.spring.SpringCommandHandler"
+			id="org.argeo.cms.ui.workbench.addRemoteRepository"
+			name="Add remote JCR repository">
+			<!-- <commandParameter
+				id="param.repositoryUri"
+				name="Repository URI">
+  	 		</commandParameter> -->
+		</command>    
+    	<command
+			defaultHandler="org.argeo.eclipse.ui.workbench.commands.RemoveRemoteRepository"
+			id="org.argeo.cms.ui.workbench.removeRemoteRepository"
+			name="Remove remote JCR repository">
+		</command>    
+		<command
+	        defaultHandler="org.argeo.eclipse.ui.workbench.commands.AddFolderNode"
+	        id="org.argeo.cms.ui.workbench.addFolderNode"
+	        name="Create a new folder">
+		</command>
+		<command
+			defaultHandler="org.argeo.eclipse.spring.SpringCommandHandler"
+			id="org.argeo.cms.ui.workbench.addPrivileges"
+			name="Add Privileges">
+		</command>
+		<command
+			defaultHandler="org.argeo.eclipse.spring.SpringCommandHandler"
+			id="org.argeo.cms.ui.workbench.removePrivileges"
+			name="Remove Privileges">
+		</command>
+		<command
+			defaultHandler="org.argeo.eclipse.ui.workbench.commands.CreateWorkspace"
+			id="org.argeo.cms.ui.workbench.createWorkspace"
+			name="Create a new workspace">
+		</command>
+		<command
+			defaultHandler="org.argeo.eclipse.ui.workbench.commands.Refresh"
+			id="org.argeo.cms.ui.workbench.refresh"
+			name="Refresh">
+		</command>
+		<command
+			defaultHandler="org.argeo.eclipse.ui.workbench.commands.DeleteNodes"
+			id="org.argeo.cms.ui.workbench.deleteNodes"
+			name="Delete nodes">
+		</command>
+		<command
+	        defaultHandler="org.argeo.eclipse.ui.workbench.commands.ImportFileSystem"
+	        id="org.argeo.cms.ui.workbench.importFileSystem"
+	        name="Import files...">
+		</command>
+		<!-- <command
+	        defaultHandler="org.argeo.eclipse.spring.SpringCommandHandler"
+	        id="org.argeo.cms.ui.workbench.openFile"
+	        name="Open current file">
+		</command> -->
+		<command
+	        defaultHandler="org.argeo.eclipse.ui.workbench.commands.DumpNode"
+	        id="org.argeo.cms.ui.workbench.dumpNode"
+	        name="Dump Current Selected Node">
+		</command>
+		<command
+	        defaultHandler="org.argeo.eclipse.ui.workbench.commands.RenameNode"
+	        id="org.argeo.cms.ui.workbench.renameNode"
+	        name="Rename Current Selected Node">
+		</command>
+		<command
+	        defaultHandler="org.argeo.eclipse.ui.workbench.commands.NodeConfigurableDump"
+	        id="org.argeo.cms.ui.workbench.nodeConfigurableDump"
+	        name="Configurable dump of the selected Node">
+		</command>
+		<command
+			defaultHandler="org.argeo.eclipse.ui.workbench.commands.SortChildNodes"
+			id="org.argeo.cms.ui.workbench.sortChildNodes"
+			name="Sort node tree">
+            <!-- FIXME: default value does not work -->
+            <state 
+				id="org.argeo.cms.ui.workbench.sortChildNodes.toggleState" 
+				class="org.eclipse.ui.handlers.RegistryToggleState:true" >
+				<!-- <class class="org.eclipse.jface.commands.ToggleState"> 
+					<parameter
+						name="default"
+               			value="true" />
+				</class> -->
+			</state>
+		</command>
 	</extension>
 	
 	<!-- MENU CONTRIBUTIONS -->
@@ -165,7 +345,7 @@
 							<equals value="status.active" />
 					</with>
 				</visibleWhen>
-			</command>
+			</command>			
 		</menuContribution>
     
     	<!-- UsersView specific toolbar menu -->
@@ -229,6 +409,235 @@
                   tooltip="Synchronize roles from LDAP">
             </command>
         </menuContribution> -->
+        <!-- Browser view specific menu --> 
+		<menuContribution
+			locationURI="menu:org.argeo.cms.ui.workbench.jcrBrowserView">
+            <!-- See bug 149 --> 
+            <!-- <command
+            	commandId="org.argeo.cms.ui.workbench.openGenericJcrQueryEditor"
+                icon="icons/query.png"
+                style="push">
+            </command> --> 
+            <command
+            	commandId="org.argeo.cms.ui.workbench.addRemoteRepository"
+                icon="icons/addRepo.gif"
+                style="push">
+            </command>
+             <command
+            	commandId="org.argeo.cms.ui.workbench.sortChildNodes"
+                icon="icons/sort.gif"
+                style="toggle"
+                label="Sort child nodes"
+                tooltip="NOTE: displaying unsorted nodes will enhance overall performances">
+            </command>
+		</menuContribution>
+		<!-- Browser view popup context menu --> 
+		<menuContribution
+			locationURI="popup:org.argeo.cms.ui.workbench.jcrBrowserView">
+			<command
+				commandId="org.argeo.cms.ui.workbench.refresh"
+				icon="icons/refresh.png"
+				style="push">
+			</command>
+			<command
+		         commandId="org.argeo.cms.ui.workbench.addFolderNode"
+		         icon="icons/addFolder.gif"
+		         label="Add Folder..."
+		         style="push">
+				<visibleWhen>
+					<iterate>
+				      <and>
+				         <or>
+				            <instanceof
+				                  value="org.argeo.eclipse.ui.workbench.internal.jcr.model.SingleJcrNodeElem">
+				            </instanceof>
+				            <instanceof
+				                  value="org.argeo.eclipse.ui.workbench.internal.jcr.model.WorkspaceElem">
+				            </instanceof>
+				         </or>
+             			<with variable="activeMenuSelection"><count value="1"/></with>
+				      </and>
+					</iterate>
+				</visibleWhen>
+			</command>
+			<command
+		         commandId="org.argeo.cms.ui.workbench.addPrivileges"
+		         icon="icons/addPrivileges.gif"
+		         label="Add Privileges..."
+		         style="push">
+				<visibleWhen>
+					<iterate>
+				      <and>
+				         <or>
+				            <instanceof
+				                  value="org.argeo.eclipse.ui.workbench.internal.jcr.model.SingleJcrNodeElem">
+				            </instanceof>
+				            <instanceof
+				                  value="org.argeo.eclipse.ui.workbench.internal.jcr.model.WorkspaceElem">
+				            </instanceof>
+				         </or>
+             			<with variable="activeMenuSelection"><count value="1"/></with>
+				      </and>
+					</iterate>
+				</visibleWhen>
+			</command>
+			<command
+		         commandId="org.argeo.cms.ui.workbench.removePrivileges"
+		         icon="icons/removePrivileges.gif"
+		         label="Remove Privileges..."
+		         style="push">
+				<visibleWhen>
+					<iterate>
+				      <and>
+				         <or>
+				            <instanceof
+				                  value="org.argeo.eclipse.ui.workbench.internal.jcr.model.SingleJcrNodeElem">
+				            </instanceof>
+				            <instanceof
+				                  value="org.argeo.eclipse.ui.workbench.internal.jcr.model.WorkspaceElem">
+				            </instanceof>
+				         </or>
+             			<with variable="activeMenuSelection"><count value="1"/></with>
+				      </and>
+					</iterate>
+				</visibleWhen>
+			</command>
+			<command
+		         commandId="org.argeo.cms.ui.workbench.createWorkspace"
+		         icon="icons/addWorkspace.png"
+		         label="Create Workspace..."
+		         style="push">
+				<visibleWhen>
+					<iterate>
+			      		<and>
+			         		<or>
+			            		<instanceof
+			                  		value="org.argeo.eclipse.ui.workbench.internal.jcr.model.RepositoryElem">
+			            		</instanceof>
+			         		</or>
+             				<with variable="activeMenuSelection"><count value="1"/></with>
+						</and>
+					</iterate>
+				</visibleWhen>
+			</command>
+			<command
+				commandId="org.argeo.cms.ui.workbench.deleteNodes"
+				icon="icons/remove.gif"
+				label="Delete Nodes"
+				style="push">
+				<visibleWhen>
+					<iterate>
+						<or>
+							<instanceof
+								value="org.argeo.eclipse.ui.workbench.internal.jcr.model.SingleJcrNodeElem" />
+							<instanceof
+								value="org.argeo.eclipse.ui.workbench.internal.jcr.model.WorkspaceElem" />
+						</or>
+					</iterate>
+				</visibleWhen>
+			</command>
+			<command
+				commandId="org.argeo.cms.ui.workbench.importFileSystem"
+				icon="icons/import_fs.png"
+				style="push"
+				tooltip="Import files from the files sytem">
+				<visibleWhen>
+					<iterate>
+						<and>
+							<or>
+								<instanceof
+									value="org.argeo.eclipse.ui.workbench.internal.jcr.model.SingleJcrNodeElem" />
+								<instanceof
+                          			value="org.argeo.eclipse.ui.workbench.internal.jcr.model.WorkspaceElem" />
+                 			</or>
+                 			<with variable="activeMenuSelection"><count value="1"/></with>
+						</and>
+					</iterate>
+				</visibleWhen>
+			</command>
+			<command
+				commandId="org.argeo.cms.ui.workbench.addRemoteRepository"
+				icon="icons/addRepo.gif"
+				style="push">
+					<visibleWhen>
+						<iterate> 
+							<or>
+								<instanceof
+                    				value="org.argeo.eclipse.ui.workbench.internal.jcr.model.RepositoriesElem" />
+								<instanceof
+									value="org.argeo.eclipse.ui.workbench.internal.jcr.model.RepositoryElem" />
+							</or> 
+						</iterate>
+					</visibleWhen>
+			</command>
+			<command
+				commandId="org.argeo.cms.ui.workbench.removeRemoteRepository"
+				icon="icons/remove.gif"
+				style="push">
+				<visibleWhen>
+					<iterate> 
+						<or>
+							<instanceof
+								value="org.argeo.eclipse.ui.workbench.internal.jcr.model.RemoteRepositoryElem" />
+						</or> 
+           			</iterate>
+				</visibleWhen>
+			</command>
+			<command
+				commandId="org.argeo.cms.ui.workbench.getNodeSize"
+				icon="icons/getSize.gif"
+				style="push">
+					<visibleWhen>
+						<iterate>
+							<or>
+								<instanceof
+									value="org.argeo.eclipse.ui.workbench.internal.jcr.model.SingleJcrNodeElem" />
+								<instanceof
+									value="org.argeo.eclipse.ui.workbench.internal.jcr.model.WorkspaceElem" />
+              				</or>
+           				</iterate>
+					</visibleWhen>
+			</command>
+			<command
+		        commandId="org.argeo.cms.ui.workbench.dumpNode"
+		        icon="icons/dumpNode.gif"
+				label="Dump Node"
+				style="push">
+				<visibleWhen>
+					<iterate> <and>
+						<instanceof value="org.argeo.eclipse.ui.workbench.internal.jcr.model.SingleJcrNodeElem"></instanceof>
+             			<with variable="activeMenuSelection"><count value="1"/></with>
+					</and> </iterate>
+				</visibleWhen>
+			</command>
+			<command
+		        commandId="org.argeo.cms.ui.workbench.renameNode"
+		        icon="icons/rename.gif"
+				label="Rename..."
+				style="push">
+				<visibleWhen>
+					<iterate> <and>
+						<instanceof value="org.argeo.eclipse.ui.workbench.internal.jcr.model.SingleJcrNodeElem"></instanceof>
+             			<with variable="activeMenuSelection"><count value="1"/></with>
+					</and> </iterate>
+				</visibleWhen>
+			</command>
+			<command
+		        commandId="org.argeo.cms.ui.workbench.nodeConfigurableDump"
+		        icon="icons/dumpNode.gif"
+				label="Configurable dump..."
+				style="push">
+				<visibleWhen>
+					<iterate> 
+						<and>
+							<instanceof value="org.argeo.eclipse.ui.workbench.internal.jcr.model.SingleJcrNodeElem"></instanceof>
+             				<with variable="activeMenuSelection"><count value="1"/></with>
+						</and> 
+					</iterate>
+				</visibleWhen>
+			</command>
+		</menuContribution>
+        
 	</extension>
 
 	<!-- SERVICES -->
@@ -243,7 +652,7 @@
 	      	</variable>
 	   	</sourceProvider>
 	   	<sourceProvider
-              provider="org.argeo.cms.ui.workbench.RolesSourceProvider">
+              provider="org.argeo.security.ui.RolesSourceProvider">
            <variable
                  name="org.argeo.cms.ui.workbench.rolesVariable"
                  priorityLevel="workbench">
@@ -265,8 +674,19 @@
 			isEqualityPattern="true"
 			pattern="org.argeo.cms.ui.workbench/org.argeo.cms.ui.workbench.adminSecurityPerspective">
 		</activityPatternBinding>
+		 <activityPatternBinding
+			pattern="org.argeo.cms.ui.workbench/org.argeo.cms.ui.workbench.osgiPerspective"
+			isEqualityPattern="true"
+			activityId="org.argeo.security.ui.adminActivity">
+			<!-- activityId="org.argeo.security.ui.adminActivity" -->
+        </activityPatternBinding>
+        <activityPatternBinding
+			pattern="org.argeo.cms.ui.workbench/org.argeo.cms.ui.workbench.jcrBrowserPerspective"
+			isEqualityPattern="true"
+			activityId="org.argeo.security.ui.adminActivity">
+		</activityPatternBinding>
 		
-		        <activity
+		<activity
               description="Authenticated users"
               id="org.argeo.cms.ui.workbench.userActivity"
               name="User">
diff --git a/org.argeo.cms.ui.workbench/src/org/argeo/security/ui/SecurityUiPlugin.java b/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/SecurityUiPlugin.java
similarity index 60%
rename from org.argeo.cms.ui.workbench/src/org/argeo/security/ui/SecurityUiPlugin.java
rename to org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/SecurityUiPlugin.java
index 617fcec63..279a2b900 100644
--- a/org.argeo.cms.ui.workbench/src/org/argeo/security/ui/SecurityUiPlugin.java
+++ b/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/SecurityUiPlugin.java
@@ -13,16 +13,22 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.argeo.security.ui;
+package org.argeo.cms.ui.workbench;
 
 import java.io.IOException;
+import java.util.ResourceBundle;
 
 import javax.security.auth.callback.Callback;
 import javax.security.auth.callback.CallbackHandler;
 import javax.security.auth.callback.UnsupportedCallbackException;
 
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.argeo.cms.CmsException;
 import org.argeo.cms.widgets.auth.DefaultLoginDialog;
+import org.eclipse.core.runtime.ILogListener;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Platform;
 import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.swt.widgets.Display;
 import org.eclipse.ui.plugin.AbstractUIPlugin;
@@ -32,7 +38,12 @@ import org.osgi.framework.ServiceRegistration;
 /**
  * The activator class controls the plug-in life cycle
  */
-public class SecurityUiPlugin extends AbstractUIPlugin {
+public class SecurityUiPlugin extends AbstractUIPlugin implements ILogListener {
+
+	private final static Log log = LogFactory.getLog(SecurityUiPlugin.class);
+
+	private ResourceBundle messages;
+
 	private static BundleContext bundleContext;
 	public static InheritableThreadLocal<Display> display = new InheritableThreadLocal<Display>() {
 
@@ -51,12 +62,24 @@ public class SecurityUiPlugin extends AbstractUIPlugin {
 	private CallbackHandler defaultCallbackHandler;
 	private ServiceRegistration<CallbackHandler> defaultCallbackHandlerReg;
 
+	// The shared instance
+	private static SecurityUiPlugin plugin;
+
 	public void start(BundleContext context) throws Exception {
+		super.start(context);
+
 		bundleContext = context;
 
 		defaultCallbackHandler = new DefaultCallbackHandler();
 		defaultCallbackHandlerReg = context.registerService(
 				CallbackHandler.class, defaultCallbackHandler, null);
+
+		plugin = this;
+		messages = ResourceBundle.getBundle(PLUGIN_ID + ".messages");
+		Platform.addLogListener(this);
+		if (log.isTraceEnabled())
+			log.trace("Eclipse logging now directed to standard logging");
+
 	}
 
 	public void stop(BundleContext context) throws Exception {
@@ -68,6 +91,14 @@ public class SecurityUiPlugin extends AbstractUIPlugin {
 		return bundleContext;
 	}
 
+	// * Returns the shared instance
+	// *
+	// * @return the shared instance
+	// */
+	public static SecurityUiPlugin getDefault() {
+		return plugin;
+	}
+
 	protected class DefaultCallbackHandler implements CallbackHandler {
 		public void handle(final Callback[] callbacks) throws IOException,
 				UnsupportedCallbackException {
@@ -98,4 +129,40 @@ public class SecurityUiPlugin extends AbstractUIPlugin {
 	public static ImageDescriptor getImageDescriptor(String path) {
 		return imageDescriptorFromPlugin(PLUGIN_ID, path);
 	}
+
+	/** Returns the internationalized label for the given key */
+	public static String getMessage(String key) {
+		try {
+			return getDefault().messages.getString(key);
+		} catch (NullPointerException npe) {
+			log.warn(key + " not found.");
+			return key;
+		}
+	}
+
+	/**
+	 * Gives access to the internationalization message bundle. Returns null in
+	 * case this UiPlugin is not started (for JUnit tests, by instance)
+	 */
+	public static ResourceBundle getMessagesBundle() {
+		if (getDefault() != null)
+			// To avoid NPE
+			return getDefault().messages;
+		else
+			return null;
+	}
+
+	public void logging(IStatus status, String plugin) {
+		Log pluginLog = LogFactory.getLog(plugin);
+		Integer severity = status.getSeverity();
+		if (severity == IStatus.ERROR)
+			pluginLog.error(status.getMessage(), status.getException());
+		else if (severity == IStatus.WARNING)
+			pluginLog.warn(status.getMessage(), status.getException());
+		else if (severity == IStatus.INFO)
+			pluginLog.info(status.getMessage(), status.getException());
+		else if (severity == IStatus.CANCEL)
+			if (pluginLog.isDebugEnabled())
+				pluginLog.debug(status.getMessage(), status.getException());
+	}
 }
diff --git a/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/messages.properties b/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/messages.properties
similarity index 100%
rename from org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/messages.properties
rename to org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/messages.properties
diff --git a/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/CommandUtils.java b/org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/CommandUtils.java
similarity index 97%
rename from org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/CommandUtils.java
rename to org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/CommandUtils.java
index 36f12936d..1cb369eb1 100644
--- a/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/CommandUtils.java
+++ b/org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/CommandUtils.java
@@ -19,6 +19,7 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Map;
 
+import org.argeo.cms.ui.workbench.SecurityUiPlugin;
 import org.argeo.eclipse.ui.EclipseUiException;
 import org.eclipse.core.commands.Command;
 import org.eclipse.core.commands.Parameterization;
@@ -143,7 +144,7 @@ public class CommandUtils {
 	public static void callCommand(String commandID,
 			Map<String, String> paramMap) {
 		try {
-			IWorkbench iw = WorkbenchUiPlugin.getDefault().getWorkbench();
+			IWorkbench iw = SecurityUiPlugin.getDefault().getWorkbench();
 			IHandlerService handlerService = (IHandlerService) iw
 					.getService(IHandlerService.class);
 			ICommandService cmdService = (ICommandService) iw
diff --git a/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/ErrorFeedback.java b/org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/ErrorFeedback.java
similarity index 100%
rename from org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/ErrorFeedback.java
rename to org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/ErrorFeedback.java
diff --git a/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/WorkbenchConstants.java b/org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/WorkbenchConstants.java
similarity index 100%
rename from org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/WorkbenchConstants.java
rename to org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/WorkbenchConstants.java
diff --git a/org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/WorkbenchUiPlugin.java b/org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/WorkbenchUiPlugin.java
new file mode 100644
index 000000000..e45c9a050
--- /dev/null
+++ b/org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/WorkbenchUiPlugin.java
@@ -0,0 +1,109 @@
+/*
+ * 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.eclipse.ui.workbench;
+
+public class WorkbenchUiPlugin {
+}
+
+// /**
+// * The activator class controls the plug-in life cycle
+// */
+// public class SecurityUiPlugin extends AbstractUIPlugin implements
+// ILogListener {
+// private final static Log log = LogFactory.getLog(SecurityUiPlugin.class);
+// private ResourceBundle messages;
+//
+// // The plug-in ID
+//	public static final String ID = "org.argeo.eclipse.ui.workbench"; //$NON-NLS-1$
+//
+// // The shared instance
+// private static SecurityUiPlugin plugin;
+//
+// /**
+// * The constructor
+// */
+// public SecurityUiPlugin() {
+// }
+//
+// public void start(BundleContext context) throws Exception {
+// super.start(context);
+// plugin = this;
+// messages = ResourceBundle.getBundle(ID + ".messages");
+// Platform.addLogListener(this);
+// if (log.isTraceEnabled())
+// log.trace("Eclipse logging now directed to standard logging");
+// }
+//
+// public void stop(BundleContext context) throws Exception {
+// try {
+// Platform.removeLogListener(this);
+// if (log.isTraceEnabled())
+// log.trace("Eclipse logging not directed anymore to standard logging");
+// plugin = null;
+// } finally {
+// super.stop(context);
+// }
+// }
+//
+// /**
+// * Returns the shared instance
+// *
+// * @return the shared instance
+// */
+// public static SecurityUiPlugin getDefault() {
+// return plugin;
+// }
+//
+// public static ImageDescriptor getImageDescriptor(String path) {
+// return imageDescriptorFromPlugin(ID, path);
+// }
+//
+// /** Returns the internationalized label for the given key */
+// public static String getMessage(String key) {
+// try {
+// return getDefault().messages.getString(key);
+// } catch (NullPointerException npe) {
+// log.warn(key + " not found.");
+// return key;
+// }
+// }
+//
+// /**
+// * Gives access to the internationalization message bundle. Returns null in
+// * case this UiPlugin is not started (for JUnit tests, by instance)
+// */
+// public static ResourceBundle getMessagesBundle() {
+// if (getDefault() != null)
+// // To avoid NPE
+// return getDefault().messages;
+// else
+// return null;
+// }
+//
+// public void logging(IStatus status, String plugin) {
+// Log pluginLog = LogFactory.getLog(plugin);
+// Integer severity = status.getSeverity();
+// if (severity == IStatus.ERROR)
+// pluginLog.error(status.getMessage(), status.getException());
+// else if (severity == IStatus.WARNING)
+// pluginLog.warn(status.getMessage(), status.getException());
+// else if (severity == IStatus.INFO)
+// pluginLog.info(status.getMessage(), status.getException());
+// else if (severity == IStatus.CANCEL)
+// if (pluginLog.isDebugEnabled())
+// pluginLog.debug(status.getMessage(), status.getException());
+// }
+// }
diff --git a/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/commands/AddFolderNode.java b/org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/commands/AddFolderNode.java
similarity index 94%
rename from org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/commands/AddFolderNode.java
rename to org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/commands/AddFolderNode.java
index aa866956a..534d15f00 100644
--- a/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/commands/AddFolderNode.java
+++ b/org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/commands/AddFolderNode.java
@@ -19,10 +19,10 @@ import javax.jcr.Node;
 import javax.jcr.RepositoryException;
 import javax.jcr.nodetype.NodeType;
 
+import org.argeo.cms.ui.workbench.SecurityUiPlugin;
 import org.argeo.eclipse.ui.TreeParent;
 import org.argeo.eclipse.ui.dialogs.ErrorFeedback;
 import org.argeo.eclipse.ui.dialogs.SingleValue;
-import org.argeo.eclipse.ui.workbench.WorkbenchUiPlugin;
 import org.argeo.eclipse.ui.workbench.internal.jcr.model.SingleJcrNodeElem;
 import org.argeo.eclipse.ui.workbench.internal.jcr.model.WorkspaceElem;
 import org.argeo.eclipse.ui.workbench.jcr.JcrBrowserView;
@@ -44,7 +44,8 @@ import org.eclipse.ui.handlers.HandlerUtil;
  */
 public class AddFolderNode extends AbstractHandler {
 
-	public final static String ID = WorkbenchUiPlugin.ID + ".addFolderNode";
+	public final static String ID = SecurityUiPlugin.PLUGIN_ID
+			+ ".addFolderNode";
 
 	public Object execute(ExecutionEvent event) throws ExecutionException {
 
@@ -83,7 +84,7 @@ public class AddFolderNode extends AbstractHandler {
 				}
 			}
 		} else {
-			ErrorFeedback.show(WorkbenchUiPlugin
+			ErrorFeedback.show(SecurityUiPlugin
 					.getMessage("errorUnvalidNtFolderNodeType"));
 		}
 		return null;
diff --git a/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/commands/AddPrivileges.java b/org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/commands/AddPrivileges.java
similarity index 95%
rename from org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/commands/AddPrivileges.java
rename to org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/commands/AddPrivileges.java
index 8ad021f72..6deb673c8 100644
--- a/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/commands/AddPrivileges.java
+++ b/org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/commands/AddPrivileges.java
@@ -18,10 +18,10 @@ package org.argeo.eclipse.ui.workbench.commands;
 import javax.jcr.Node;
 import javax.jcr.RepositoryException;
 
+import org.argeo.cms.ui.workbench.SecurityUiPlugin;
 import org.argeo.eclipse.ui.EclipseUiException;
 import org.argeo.eclipse.ui.TreeParent;
 import org.argeo.eclipse.ui.dialogs.ErrorFeedback;
-import org.argeo.eclipse.ui.workbench.WorkbenchUiPlugin;
 import org.argeo.eclipse.ui.workbench.internal.jcr.model.SingleJcrNodeElem;
 import org.argeo.eclipse.ui.workbench.internal.jcr.model.WorkspaceElem;
 import org.argeo.eclipse.ui.workbench.internal.jcr.parts.AddPrivilegeWizard;
@@ -36,7 +36,8 @@ import org.osgi.service.useradmin.UserAdmin;
 
 /** Open a dialog to add privileges on the selected node to a chosen group */
 public class AddPrivileges extends AbstractHandler {
-	public final static String ID = WorkbenchUiPlugin.ID + ".addPrivileges";
+	public final static String ID = SecurityUiPlugin.PLUGIN_ID
+			+ ".addPrivileges";
 
 	/* DEPENDENCY INJECTION */
 	private UserAdmin userAdmin;
diff --git a/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/commands/AddRemoteRepository.java b/org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/commands/AddRemoteRepository.java
similarity index 100%
rename from org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/commands/AddRemoteRepository.java
rename to org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/commands/AddRemoteRepository.java
diff --git a/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/commands/CreateWorkspace.java b/org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/commands/CreateWorkspace.java
similarity index 94%
rename from org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/commands/CreateWorkspace.java
rename to org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/commands/CreateWorkspace.java
index 4b6057dbc..a4183bd11 100644
--- a/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/commands/CreateWorkspace.java
+++ b/org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/commands/CreateWorkspace.java
@@ -17,9 +17,9 @@ package org.argeo.eclipse.ui.workbench.commands;
 
 import java.util.Arrays;
 
+import org.argeo.cms.ui.workbench.SecurityUiPlugin;
 import org.argeo.eclipse.ui.dialogs.ErrorFeedback;
 import org.argeo.eclipse.ui.dialogs.SingleValue;
-import org.argeo.eclipse.ui.workbench.WorkbenchUiPlugin;
 import org.argeo.eclipse.ui.workbench.internal.jcr.model.RepositoryElem;
 import org.argeo.eclipse.ui.workbench.jcr.JcrBrowserView;
 import org.eclipse.core.commands.AbstractHandler;
@@ -32,7 +32,8 @@ import org.eclipse.ui.handlers.HandlerUtil;
 /** Create a new JCR workspace */
 public class CreateWorkspace extends AbstractHandler {
 
-	public final static String ID = WorkbenchUiPlugin.ID + ".addFolderNode";
+	public final static String ID = SecurityUiPlugin.PLUGIN_ID
+			+ ".addFolderNode";
 
 	public Object execute(ExecutionEvent event) throws ExecutionException {
 
diff --git a/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/commands/DeleteNodes.java b/org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/commands/DeleteNodes.java
similarity index 100%
rename from org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/commands/DeleteNodes.java
rename to org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/commands/DeleteNodes.java
diff --git a/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/commands/DoNothing.java b/org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/commands/DoNothing.java
similarity index 76%
rename from org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/commands/DoNothing.java
rename to org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/commands/DoNothing.java
index 2f8e56ceb..1a1808ae3 100644
--- a/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/commands/DoNothing.java
+++ b/org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/commands/DoNothing.java
@@ -1,13 +1,13 @@
 package org.argeo.eclipse.ui.workbench.commands;
 
-import org.argeo.eclipse.ui.workbench.WorkbenchUiPlugin;
+import org.argeo.cms.ui.workbench.SecurityUiPlugin;
 import org.eclipse.core.commands.AbstractHandler;
 import org.eclipse.core.commands.ExecutionEvent;
 import org.eclipse.core.commands.ExecutionException;
 
 /** Utilitary command to enable sub menus in various toolbars. Does nothing */
 public class DoNothing extends AbstractHandler {
-	public final static String ID = WorkbenchUiPlugin.ID + ".doNothing";
+	public final static String ID = SecurityUiPlugin.PLUGIN_ID + ".doNothing";
 
 	public Object execute(ExecutionEvent event) throws ExecutionException {
 		return null;
diff --git a/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/commands/DumpNode.java b/org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/commands/DumpNode.java
similarity index 94%
rename from org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/commands/DumpNode.java
rename to org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/commands/DumpNode.java
index f62a5c07e..0c7dda062 100644
--- a/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/commands/DumpNode.java
+++ b/org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/commands/DumpNode.java
@@ -29,9 +29,9 @@ import javax.jcr.Node;
 import javax.jcr.RepositoryException;
 import javax.jcr.Session;
 
+import org.argeo.cms.ui.workbench.SecurityUiPlugin;
 import org.argeo.eclipse.ui.EclipseUiException;
 import org.argeo.eclipse.ui.workbench.CommandUtils;
-import org.argeo.eclipse.ui.workbench.WorkbenchUiPlugin;
 import org.argeo.eclipse.ui.workbench.internal.jcr.model.SingleJcrNodeElem;
 import org.argeo.jcr.JcrUtils;
 import org.eclipse.core.commands.AbstractHandler;
@@ -51,7 +51,7 @@ import org.eclipse.ui.handlers.HandlerUtil;
  * single-sourced command.
  */
 public class DumpNode extends AbstractHandler {
-	public final static String ID = WorkbenchUiPlugin.ID + ".dumpNode";
+	public final static String ID = SecurityUiPlugin.PLUGIN_ID + ".dumpNode";
 
 	private final static DateFormat df = new SimpleDateFormat(
 			"yyyy-MM-dd_HH-mm");
@@ -92,8 +92,8 @@ public class DumpNode extends AbstractHandler {
 					throw new EclipseUiException(
 							"Unable to perform SystemExport on " + node, e);
 				} catch (IOException e) {
-					throw new EclipseUiException("Unable to SystemExport " + node,
-							e);
+					throw new EclipseUiException("Unable to SystemExport "
+							+ node, e);
 				}
 			}
 		}
diff --git a/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/commands/EditNode.java b/org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/commands/EditNode.java
similarity index 100%
rename from org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/commands/EditNode.java
rename to org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/commands/EditNode.java
diff --git a/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/commands/GetNodeSize.java b/org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/commands/GetNodeSize.java
similarity index 96%
rename from org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/commands/GetNodeSize.java
rename to org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/commands/GetNodeSize.java
index c8cad976d..85fa3cb38 100644
--- a/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/commands/GetNodeSize.java
+++ b/org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/commands/GetNodeSize.java
@@ -21,8 +21,8 @@ import java.util.List;
 
 import javax.jcr.Node;
 
+import org.argeo.cms.ui.workbench.SecurityUiPlugin;
 import org.argeo.eclipse.ui.dialogs.ErrorFeedback;
-import org.argeo.eclipse.ui.workbench.WorkbenchUiPlugin;
 import org.argeo.eclipse.ui.workbench.internal.jcr.model.SingleJcrNodeElem;
 import org.argeo.eclipse.ui.workbench.internal.jcr.model.WorkspaceElem;
 import org.argeo.jcr.JcrUtils;
@@ -39,7 +39,7 @@ import org.eclipse.ui.handlers.HandlerUtil;
 public class GetNodeSize extends AbstractHandler {
 	// private final static Log log = LogFactory.getLog(GetNodeSize.class);
 
-	public final static String ID = WorkbenchUiPlugin.ID + ".getNodeSize";
+	public final static String ID = SecurityUiPlugin.PLUGIN_ID + ".getNodeSize";
 
 	public Object execute(ExecutionEvent event) throws ExecutionException {
 
diff --git a/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/commands/ImportFileSystem.java b/org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/commands/ImportFileSystem.java
similarity index 96%
rename from org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/commands/ImportFileSystem.java
rename to org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/commands/ImportFileSystem.java
index 922f0257e..54e847a72 100644
--- a/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/commands/ImportFileSystem.java
+++ b/org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/commands/ImportFileSystem.java
@@ -17,9 +17,9 @@ package org.argeo.eclipse.ui.workbench.commands;
 
 import javax.jcr.Node;
 
+import org.argeo.cms.ui.workbench.SecurityUiPlugin;
 import org.argeo.eclipse.ui.TreeParent;
 import org.argeo.eclipse.ui.dialogs.ErrorFeedback;
-import org.argeo.eclipse.ui.workbench.WorkbenchUiPlugin;
 import org.argeo.eclipse.ui.workbench.internal.jcr.model.SingleJcrNodeElem;
 import org.argeo.eclipse.ui.workbench.internal.jcr.model.WorkspaceElem;
 import org.argeo.eclipse.ui.workbench.internal.jcr.parts.ImportFileSystemWizard;
@@ -50,7 +50,7 @@ public class ImportFileSystem extends AbstractHandler {
 				} else if (obj instanceof WorkspaceElem) {
 					folder = ((WorkspaceElem) obj).getRootNode();
 				} else {
-					ErrorFeedback.show(WorkbenchUiPlugin
+					ErrorFeedback.show(SecurityUiPlugin
 							.getMessage("warningInvalidNodeToImport"));
 				}
 				if (folder != null) {
diff --git a/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/commands/NodeConfigurableDump.java b/org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/commands/NodeConfigurableDump.java
similarity index 98%
rename from org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/commands/NodeConfigurableDump.java
rename to org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/commands/NodeConfigurableDump.java
index 81f5a60fe..5e77bef6d 100644
--- a/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/commands/NodeConfigurableDump.java
+++ b/org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/commands/NodeConfigurableDump.java
@@ -31,9 +31,9 @@ import javax.jcr.Node;
 import javax.jcr.NodeIterator;
 import javax.jcr.RepositoryException;
 
+import org.argeo.cms.ui.workbench.SecurityUiPlugin;
 import org.argeo.eclipse.ui.EclipseUiException;
 import org.argeo.eclipse.ui.EclipseUiUtils;
-import org.argeo.eclipse.ui.workbench.WorkbenchUiPlugin;
 import org.argeo.eclipse.ui.workbench.internal.jcr.model.SingleJcrNodeElem;
 import org.argeo.jcr.JcrUtils;
 import org.eclipse.core.commands.AbstractHandler;
@@ -64,7 +64,7 @@ import org.eclipse.ui.handlers.HandlerUtil;
  * retrieve business data from live systems to prepare migration or test locally
  */
 public class NodeConfigurableDump extends AbstractHandler {
-	public final static String ID = WorkbenchUiPlugin.ID
+	public final static String ID = SecurityUiPlugin.PLUGIN_ID
 			+ ".nodeConfigurableDump";
 
 	private final static DateFormat df = new SimpleDateFormat(
diff --git a/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/commands/OpenEditor.java b/org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/commands/OpenEditor.java
similarity index 91%
rename from org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/commands/OpenEditor.java
rename to org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/commands/OpenEditor.java
index 57ae9f28d..eb7deb02d 100644
--- a/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/commands/OpenEditor.java
+++ b/org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/commands/OpenEditor.java
@@ -17,8 +17,8 @@ package org.argeo.eclipse.ui.workbench.commands;
 
 import javax.jcr.Node;
 
+import org.argeo.cms.ui.workbench.SecurityUiPlugin;
 import org.argeo.eclipse.ui.EclipseUiException;
-import org.argeo.eclipse.ui.workbench.WorkbenchUiPlugin;
 import org.argeo.eclipse.ui.workbench.internal.jcr.parts.JcrQueryEditorInput;
 import org.argeo.eclipse.ui.workbench.internal.jcr.parts.NodeEditorInput;
 import org.argeo.eclipse.ui.workbench.jcr.DefaultNodeEditor;
@@ -32,7 +32,7 @@ import org.eclipse.ui.handlers.HandlerUtil;
 
 /** Open a {@link Node} editor of a specific type given the node path */
 public class OpenEditor extends AbstractHandler {
-	public final static String ID = WorkbenchUiPlugin.ID + ".openEditor";
+	public final static String ID = SecurityUiPlugin.PLUGIN_ID + ".openEditor";
 
 	public final static String PARAM_PATH = "param.jcrNodePath";
 	public final static String PARAM_EDITOR_ID = "param.editorId";
@@ -52,7 +52,8 @@ public class OpenEditor extends AbstractHandler {
 				activePage.openEditor(editorInput, editorId);
 			}
 		} catch (PartInitException e) {
-			throw new EclipseUiException("Cannot open editor of ID " + editorId, e);
+			throw new EclipseUiException(
+					"Cannot open editor of ID " + editorId, e);
 		}
 		return null;
 	}
diff --git a/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/commands/OpenFile.java b/org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/commands/OpenFile.java
similarity index 95%
rename from org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/commands/OpenFile.java
rename to org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/commands/OpenFile.java
index 7bd6e15e8..c6129db3d 100644
--- a/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/commands/OpenFile.java
+++ b/org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/commands/OpenFile.java
@@ -15,8 +15,8 @@
  */
 package org.argeo.eclipse.ui.workbench.commands;
 
+import org.argeo.cms.ui.workbench.SecurityUiPlugin;
 import org.argeo.eclipse.ui.specific.OpenFileService;
-import org.argeo.eclipse.ui.workbench.WorkbenchUiPlugin;
 import org.eclipse.core.commands.AbstractHandler;
 import org.eclipse.core.commands.ExecutionEvent;
 import org.eclipse.core.commands.ExecutionException;
@@ -48,7 +48,7 @@ public class OpenFile extends AbstractHandler {
 	/* DEPENDENCY INJECTION */
 	private String openFileServiceId;
 
-	public final static String ID = WorkbenchUiPlugin.ID + ".openFile";
+	public final static String ID = SecurityUiPlugin.PLUGIN_ID + ".openFile";
 	public final static String PARAM_FILE_NAME = OpenFileService.PARAM_FILE_NAME;
 	public final static String PARAM_FILE_URI = OpenFileService.PARAM_FILE_URI; // "param.fileURI";
 
diff --git a/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/commands/Refresh.java b/org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/commands/Refresh.java
similarity index 84%
rename from org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/commands/Refresh.java
rename to org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/commands/Refresh.java
index ffb398ac2..b08736270 100644
--- a/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/commands/Refresh.java
+++ b/org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/commands/Refresh.java
@@ -17,8 +17,8 @@ package org.argeo.eclipse.ui.workbench.commands;
 
 import java.util.Iterator;
 
+import org.argeo.cms.ui.workbench.SecurityUiPlugin;
 import org.argeo.eclipse.ui.TreeParent;
-import org.argeo.eclipse.ui.workbench.WorkbenchUiPlugin;
 import org.argeo.eclipse.ui.workbench.internal.jcr.JcrBrowserUtils;
 import org.argeo.eclipse.ui.workbench.jcr.JcrBrowserView;
 import org.eclipse.core.commands.AbstractHandler;
@@ -37,15 +37,15 @@ import org.eclipse.jface.viewers.IStructuredSelection;
  */
 public class Refresh extends AbstractHandler {
 
-	public final static String ID = WorkbenchUiPlugin.ID + ".refresh";
+	public final static String ID = SecurityUiPlugin.PLUGIN_ID + ".refresh";
 
 	public Object execute(ExecutionEvent event) throws ExecutionException {
 
-		JcrBrowserView view = (JcrBrowserView) WorkbenchUiPlugin
-				.getDefault().getWorkbench().getActiveWorkbenchWindow()
-				.getActivePage().getActivePart();//
+		JcrBrowserView view = (JcrBrowserView) SecurityUiPlugin.getDefault()
+				.getWorkbench().getActiveWorkbenchWindow().getActivePage()
+				.getActivePart();//
 
-		ISelection selection = WorkbenchUiPlugin.getDefault().getWorkbench()
+		ISelection selection = SecurityUiPlugin.getDefault().getWorkbench()
 				.getActiveWorkbenchWindow().getActivePage().getSelection();
 
 		if (selection != null && selection instanceof IStructuredSelection
diff --git a/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/commands/RemovePrivileges.java b/org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/commands/RemovePrivileges.java
similarity index 96%
rename from org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/commands/RemovePrivileges.java
rename to org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/commands/RemovePrivileges.java
index f706a6453..9a6841d31 100644
--- a/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/commands/RemovePrivileges.java
+++ b/org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/commands/RemovePrivileges.java
@@ -25,11 +25,11 @@ import javax.jcr.security.AccessControlList;
 import javax.jcr.security.AccessControlManager;
 import javax.jcr.security.Privilege;
 
+import org.argeo.cms.ui.workbench.SecurityUiPlugin;
 import org.argeo.eclipse.ui.EclipseUiException;
 import org.argeo.eclipse.ui.EclipseUiUtils;
 import org.argeo.eclipse.ui.TreeParent;
 import org.argeo.eclipse.ui.dialogs.ErrorFeedback;
-import org.argeo.eclipse.ui.workbench.WorkbenchUiPlugin;
 import org.argeo.eclipse.ui.workbench.internal.jcr.model.SingleJcrNodeElem;
 import org.argeo.eclipse.ui.workbench.internal.jcr.model.WorkspaceElem;
 import org.argeo.eclipse.ui.workbench.jcr.JcrImages;
@@ -57,7 +57,8 @@ import org.eclipse.ui.handlers.HandlerUtil;
 
 /** Open a dialog to remove privileges from the selected node */
 public class RemovePrivileges extends AbstractHandler {
-	public final static String ID = WorkbenchUiPlugin.ID + ".removePrivileges";
+	public final static String ID = SecurityUiPlugin.PLUGIN_ID
+			+ ".removePrivileges";
 
 	public Object execute(ExecutionEvent event) throws ExecutionException {
 
@@ -145,8 +146,8 @@ public class RemovePrivileges extends AbstractHandler {
 							IMessageProvider.INFORMATION);
 				}
 			} catch (RepositoryException e) {
-				throw new EclipseUiException(
-						"Unable to list privileges on " + path, e);
+				throw new EclipseUiException("Unable to list privileges on "
+						+ path, e);
 			}
 			body.layout(true, true);
 		}
diff --git a/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/commands/RemoveRemoteRepository.java b/org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/commands/RemoveRemoteRepository.java
similarity index 100%
rename from org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/commands/RemoveRemoteRepository.java
rename to org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/commands/RemoveRemoteRepository.java
diff --git a/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/commands/RenameNode.java b/org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/commands/RenameNode.java
similarity index 95%
rename from org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/commands/RenameNode.java
rename to org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/commands/RenameNode.java
index b9d2c287d..6710a0abc 100644
--- a/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/commands/RenameNode.java
+++ b/org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/commands/RenameNode.java
@@ -21,9 +21,9 @@ import javax.jcr.Node;
 import javax.jcr.RepositoryException;
 import javax.jcr.Session;
 
+import org.argeo.cms.ui.workbench.SecurityUiPlugin;
 import org.argeo.eclipse.ui.EclipseUiException;
 import org.argeo.eclipse.ui.dialogs.SingleValue;
-import org.argeo.eclipse.ui.workbench.WorkbenchUiPlugin;
 import org.argeo.eclipse.ui.workbench.internal.jcr.model.SingleJcrNodeElem;
 import org.argeo.eclipse.ui.workbench.jcr.JcrBrowserView;
 import org.argeo.jcr.JcrUtils;
@@ -42,7 +42,7 @@ import org.eclipse.ui.handlers.HandlerUtil;
  * The user must then fill a new name in and confirm
  */
 public class RenameNode extends AbstractHandler {
-	public final static String ID = WorkbenchUiPlugin.ID + ".renameNode";
+	public final static String ID = SecurityUiPlugin.PLUGIN_ID + ".renameNode";
 
 	public Object execute(ExecutionEvent event) throws ExecutionException {
 		IWorkbenchPage iwp = HandlerUtil.getActiveWorkbenchWindow(event)
diff --git a/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/commands/SortChildNodes.java b/org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/commands/SortChildNodes.java
similarity index 92%
rename from org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/commands/SortChildNodes.java
rename to org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/commands/SortChildNodes.java
index 8eaac9f85..4d2ca6fdc 100644
--- a/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/commands/SortChildNodes.java
+++ b/org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/commands/SortChildNodes.java
@@ -15,7 +15,7 @@
  */
 package org.argeo.eclipse.ui.workbench.commands;
 
-import org.argeo.eclipse.ui.workbench.WorkbenchUiPlugin;
+import org.argeo.cms.ui.workbench.SecurityUiPlugin;
 import org.argeo.eclipse.ui.workbench.jcr.JcrBrowserView;
 import org.eclipse.core.commands.AbstractHandler;
 import org.eclipse.core.commands.Command;
@@ -28,7 +28,8 @@ import org.eclipse.ui.handlers.HandlerUtil;
 
 /** Change isSorted state of the DataExplorer Browser */
 public class SortChildNodes extends AbstractHandler {
-	public final static String ID = WorkbenchUiPlugin.ID + ".sortChildNodes";
+	public final static String ID = SecurityUiPlugin.PLUGIN_ID
+			+ ".sortChildNodes";
 
 	public Object execute(ExecutionEvent event) throws ExecutionException {
 		JcrBrowserView view = (JcrBrowserView) HandlerUtil
diff --git a/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/FullVersioningTreeContentProvider.java b/org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/FullVersioningTreeContentProvider.java
similarity index 100%
rename from org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/FullVersioningTreeContentProvider.java
rename to org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/FullVersioningTreeContentProvider.java
diff --git a/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/GenericNodeDoubleClickListener.java b/org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/GenericNodeDoubleClickListener.java
similarity index 97%
rename from org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/GenericNodeDoubleClickListener.java
rename to org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/GenericNodeDoubleClickListener.java
index 7d898fd8e..03721af39 100644
--- a/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/GenericNodeDoubleClickListener.java
+++ b/org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/GenericNodeDoubleClickListener.java
@@ -19,8 +19,8 @@ import javax.jcr.Node;
 import javax.jcr.RepositoryException;
 import javax.jcr.nodetype.NodeType;
 
+import org.argeo.cms.ui.workbench.SecurityUiPlugin;
 import org.argeo.eclipse.ui.EclipseUiException;
-import org.argeo.eclipse.ui.workbench.WorkbenchUiPlugin;
 import org.argeo.eclipse.ui.workbench.internal.jcr.model.RepositoryElem;
 import org.argeo.eclipse.ui.workbench.internal.jcr.model.SingleJcrNodeElem;
 import org.argeo.eclipse.ui.workbench.internal.jcr.model.WorkspaceElem;
@@ -99,7 +99,7 @@ public class GenericNodeDoubleClickListener implements IDoubleClickListener {
 					// fileHandler.openFile(name, id);
 				}
 				GenericNodeEditorInput gnei = new GenericNodeEditorInput(node);
-				WorkbenchUiPlugin.getDefault().getWorkbench()
+				SecurityUiPlugin.getDefault().getWorkbench()
 						.getActiveWorkbenchWindow().getActivePage()
 						.openEditor(gnei, DefaultNodeEditor.ID);
 			} catch (RepositoryException re) {
diff --git a/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/JcrBrowserUtils.java b/org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/JcrBrowserUtils.java
similarity index 100%
rename from org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/JcrBrowserUtils.java
rename to org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/JcrBrowserUtils.java
diff --git a/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/NodeContentProvider.java b/org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/NodeContentProvider.java
similarity index 100%
rename from org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/NodeContentProvider.java
rename to org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/NodeContentProvider.java
diff --git a/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/NodeLabelProvider.java b/org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/NodeLabelProvider.java
similarity index 100%
rename from org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/NodeLabelProvider.java
rename to org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/NodeLabelProvider.java
diff --git a/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/PropertiesContentProvider.java b/org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/PropertiesContentProvider.java
similarity index 100%
rename from org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/PropertiesContentProvider.java
rename to org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/PropertiesContentProvider.java
diff --git a/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/PropertyLabelProvider.java b/org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/PropertyLabelProvider.java
similarity index 100%
rename from org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/PropertyLabelProvider.java
rename to org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/PropertyLabelProvider.java
diff --git a/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/SingleNodeAsTreeContentProvider.java b/org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/SingleNodeAsTreeContentProvider.java
similarity index 100%
rename from org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/SingleNodeAsTreeContentProvider.java
rename to org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/SingleNodeAsTreeContentProvider.java
diff --git a/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/VersionLabelProvider.java b/org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/VersionLabelProvider.java
similarity index 100%
rename from org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/VersionLabelProvider.java
rename to org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/VersionLabelProvider.java
diff --git a/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/model/MaintainedRepositoryElem.java b/org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/model/MaintainedRepositoryElem.java
similarity index 100%
rename from org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/model/MaintainedRepositoryElem.java
rename to org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/model/MaintainedRepositoryElem.java
diff --git a/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/model/RemoteRepositoryElem.java b/org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/model/RemoteRepositoryElem.java
similarity index 100%
rename from org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/model/RemoteRepositoryElem.java
rename to org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/model/RemoteRepositoryElem.java
diff --git a/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/model/RepositoriesElem.java b/org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/model/RepositoriesElem.java
similarity index 100%
rename from org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/model/RepositoriesElem.java
rename to org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/model/RepositoriesElem.java
diff --git a/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/model/RepositoryElem.java b/org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/model/RepositoryElem.java
similarity index 100%
rename from org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/model/RepositoryElem.java
rename to org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/model/RepositoryElem.java
diff --git a/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/model/SingleJcrNodeElem.java b/org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/model/SingleJcrNodeElem.java
similarity index 100%
rename from org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/model/SingleJcrNodeElem.java
rename to org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/model/SingleJcrNodeElem.java
diff --git a/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/model/WorkspaceElem.java b/org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/model/WorkspaceElem.java
similarity index 100%
rename from org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/model/WorkspaceElem.java
rename to org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/model/WorkspaceElem.java
diff --git a/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/parts/AbstractJcrQueryEditor.java b/org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/parts/AbstractJcrQueryEditor.java
similarity index 100%
rename from org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/parts/AbstractJcrQueryEditor.java
rename to org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/parts/AbstractJcrQueryEditor.java
diff --git a/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/parts/AddPrivilegeWizard.java b/org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/parts/AddPrivilegeWizard.java
similarity index 100%
rename from org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/parts/AddPrivilegeWizard.java
rename to org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/parts/AddPrivilegeWizard.java
diff --git a/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/parts/ChildNodesPage.java b/org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/parts/ChildNodesPage.java
similarity index 94%
rename from org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/parts/ChildNodesPage.java
rename to org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/parts/ChildNodesPage.java
index 90ae7b5e9..a115e6140 100644
--- a/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/parts/ChildNodesPage.java
+++ b/org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/parts/ChildNodesPage.java
@@ -17,9 +17,9 @@ package org.argeo.eclipse.ui.workbench.internal.jcr.parts;
 
 import javax.jcr.Node;
 
+import org.argeo.cms.ui.workbench.SecurityUiPlugin;
 import org.argeo.eclipse.ui.EclipseUiException;
 import org.argeo.eclipse.ui.EclipseUiUtils;
-import org.argeo.eclipse.ui.workbench.WorkbenchUiPlugin;
 import org.argeo.eclipse.ui.workbench.internal.jcr.NodeLabelProvider;
 import org.argeo.eclipse.ui.workbench.internal.jcr.SingleNodeAsTreeContentProvider;
 import org.argeo.eclipse.ui.workbench.jcr.DefaultNodeEditor;
@@ -60,14 +60,14 @@ public class ChildNodesPage extends FormPage {
 	protected void createFormContent(IManagedForm managedForm) {
 		try {
 			ScrolledForm form = managedForm.getForm();
-			form.setText(WorkbenchUiPlugin.getMessage("childNodesPageTitle"));
+			form.setText(SecurityUiPlugin.getMessage("childNodesPageTitle"));
 			Composite body = form.getBody();
 			GridLayout twt = new GridLayout(1, false);
 			twt.marginWidth = twt.marginHeight = 5;
 			body.setLayout(twt);
 			if (!currentNode.hasNodes()) {
 				managedForm.getToolkit().createLabel(body,
-						WorkbenchUiPlugin.getMessage("warningNoChildNode"));
+						SecurityUiPlugin.getMessage("warningNoChildNode"));
 			} else {
 				nodeContentProvider = new SingleNodeAsTreeContentProvider();
 				nodesViewer = createNodeViewer(body, nodeContentProvider);
@@ -104,7 +104,7 @@ public class ChildNodesPage extends FormPage {
 				try {
 					GenericNodeEditorInput gnei = new GenericNodeEditorInput(
 							node);
-					WorkbenchUiPlugin.getDefault().getWorkbench()
+					SecurityUiPlugin.getDefault().getWorkbench()
 							.getActiveWorkbenchWindow().getActivePage()
 							.openEditor(gnei, DefaultNodeEditor.ID);
 				} catch (PartInitException pie) {
diff --git a/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/parts/ChooseNameDialog.java b/org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/parts/ChooseNameDialog.java
similarity index 100%
rename from org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/parts/ChooseNameDialog.java
rename to org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/parts/ChooseNameDialog.java
diff --git a/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/parts/EmptyNodePage.java b/org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/parts/EmptyNodePage.java
similarity index 100%
rename from org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/parts/EmptyNodePage.java
rename to org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/parts/EmptyNodePage.java
diff --git a/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/parts/GenericNodeEditorInput.java b/org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/parts/GenericNodeEditorInput.java
similarity index 100%
rename from org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/parts/GenericNodeEditorInput.java
rename to org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/parts/GenericNodeEditorInput.java
diff --git a/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/parts/GenericNodePage.java b/org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/parts/GenericNodePage.java
similarity index 100%
rename from org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/parts/GenericNodePage.java
rename to org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/parts/GenericNodePage.java
diff --git a/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/parts/GenericPropertyPage.java b/org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/parts/GenericPropertyPage.java
similarity index 98%
rename from org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/parts/GenericPropertyPage.java
rename to org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/parts/GenericPropertyPage.java
index 17afa7d14..6aad31526 100644
--- a/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/parts/GenericPropertyPage.java
+++ b/org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/parts/GenericPropertyPage.java
@@ -24,9 +24,9 @@ import javax.jcr.PropertyIterator;
 import javax.jcr.RepositoryException;
 import javax.jcr.Value;
 
+import org.argeo.cms.ui.workbench.SecurityUiPlugin;
 import org.argeo.eclipse.ui.EclipseUiException;
 import org.argeo.eclipse.ui.workbench.WorkbenchConstants;
-import org.argeo.eclipse.ui.workbench.WorkbenchUiPlugin;
 import org.argeo.eclipse.ui.workbench.internal.jcr.PropertyLabelProvider;
 import org.eclipse.jface.layout.TreeColumnLayout;
 import org.eclipse.jface.viewers.ColumnWeightData;
@@ -61,7 +61,7 @@ public class GenericPropertyPage extends FormPage implements WorkbenchConstants
 
 	protected void createFormContent(IManagedForm managedForm) {
 		ScrolledForm form = managedForm.getForm();
-		form.setText(WorkbenchUiPlugin.getMessage("genericNodePageTitle"));
+		form.setText(SecurityUiPlugin.getMessage("genericNodePageTitle"));
 
 		Composite body = form.getBody();
 		FillLayout layout = new FillLayout();
diff --git a/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/parts/ImportFileSystemWizard.java b/org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/parts/ImportFileSystemWizard.java
similarity index 100%
rename from org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/parts/ImportFileSystemWizard.java
rename to org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/parts/ImportFileSystemWizard.java
diff --git a/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/parts/JcrQueryEditorInput.java b/org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/parts/JcrQueryEditorInput.java
similarity index 100%
rename from org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/parts/JcrQueryEditorInput.java
rename to org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/parts/JcrQueryEditorInput.java
diff --git a/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/parts/NodeEditorInput.java b/org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/parts/NodeEditorInput.java
similarity index 100%
rename from org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/parts/NodeEditorInput.java
rename to org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/parts/NodeEditorInput.java
diff --git a/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/parts/NodePrivilegesPage.java b/org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/parts/NodePrivilegesPage.java
similarity index 96%
rename from org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/parts/NodePrivilegesPage.java
rename to org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/parts/NodePrivilegesPage.java
index 1732fa439..0d53c53c7 100644
--- a/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/parts/NodePrivilegesPage.java
+++ b/org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/parts/NodePrivilegesPage.java
@@ -23,8 +23,8 @@ import javax.jcr.NodeIterator;
 import javax.jcr.RepositoryException;
 import javax.jcr.Value;
 
+import org.argeo.cms.ui.workbench.SecurityUiPlugin;
 import org.argeo.eclipse.ui.EclipseUiException;
-import org.argeo.eclipse.ui.workbench.WorkbenchUiPlugin;
 import org.eclipse.jface.viewers.ColumnLabelProvider;
 import org.eclipse.jface.viewers.IStructuredContentProvider;
 import org.eclipse.jface.viewers.TableViewer;
@@ -59,7 +59,7 @@ public class NodePrivilegesPage extends FormPage {
 
 	protected void createFormContent(IManagedForm managedForm) {
 		ScrolledForm form = managedForm.getForm();
-		form.setText(WorkbenchUiPlugin
+		form.setText(SecurityUiPlugin
 				.getMessage("nodeRightsManagementPageTitle"));
 		FillLayout layout = new FillLayout();
 		layout.marginHeight = 5;
@@ -150,7 +150,8 @@ public class NodePrivilegesPage extends FormPage {
 				try {
 					return node.getParent().getParent().getPath();
 				} catch (RepositoryException e) {
-					throw new EclipseUiException("Unable get path for " + node, e);
+					throw new EclipseUiException("Unable get path for " + node,
+							e);
 				}
 			}
 
@@ -232,8 +233,8 @@ public class NodePrivilegesPage extends FormPage {
 
 				return privs.toArray();
 			} catch (Exception e) {
-				throw new EclipseUiException("Cannot retrieve authorization for "
-						+ context, e);
+				throw new EclipseUiException(
+						"Cannot retrieve authorization for " + context, e);
 			}
 		}
 	}
@@ -244,8 +245,8 @@ public class NodePrivilegesPage extends FormPage {
 			String cname = context.getSession().getClass().getName();
 			return cname.startsWith("org.apache.jackrabbit");
 		} catch (RepositoryException e) {
-			throw new EclipseUiException("Cannot check JCR implementation used on "
-					+ context, e);
+			throw new EclipseUiException(
+					"Cannot check JCR implementation used on " + context, e);
 		}
 	}
 
diff --git a/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/parts/NodeVersionHistoryPage.java b/org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/parts/NodeVersionHistoryPage.java
similarity index 96%
rename from org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/parts/NodeVersionHistoryPage.java
rename to org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/parts/NodeVersionHistoryPage.java
index f91e3987c..76a81c7c6 100644
--- a/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/parts/NodeVersionHistoryPage.java
+++ b/org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/parts/NodeVersionHistoryPage.java
@@ -33,9 +33,9 @@ import javax.jcr.version.VersionHistory;
 import javax.jcr.version.VersionIterator;
 import javax.jcr.version.VersionManager;
 
+import org.argeo.cms.ui.workbench.SecurityUiPlugin;
 import org.argeo.eclipse.ui.EclipseUiException;
 import org.argeo.eclipse.ui.workbench.WorkbenchConstants;
-import org.argeo.eclipse.ui.workbench.WorkbenchUiPlugin;
 import org.argeo.eclipse.ui.workbench.internal.jcr.FullVersioningTreeContentProvider;
 import org.argeo.eclipse.ui.workbench.internal.jcr.GenericNodeDoubleClickListener;
 import org.argeo.eclipse.ui.workbench.internal.jcr.VersionLabelProvider;
@@ -88,8 +88,7 @@ public class NodeVersionHistoryPage extends FormPage implements
 
 	protected void createFormContent(IManagedForm managedForm) {
 		ScrolledForm form = managedForm.getForm();
-		form.setText(WorkbenchUiPlugin
-				.getMessage("nodeVersionHistoryPageTitle"));
+		form.setText(SecurityUiPlugin.getMessage("nodeVersionHistoryPageTitle"));
 		tk = managedForm.getToolkit();
 		GridLayout twt = new GridLayout(1, false);
 		twt.marginWidth = twt.marginHeight = 5;
@@ -98,8 +97,8 @@ public class NodeVersionHistoryPage extends FormPage implements
 
 		try {
 			if (!currentNode.isNodeType(NodeType.MIX_VERSIONABLE)) {
-				tk.createLabel(body, WorkbenchUiPlugin
-						.getMessage("warningUnversionableNode"));
+				tk.createLabel(body,
+						SecurityUiPlugin.getMessage("warningUnversionableNode"));
 			} else {
 				createHistorySection(form.getBody());
 				createTreeSection(form.getBody());
@@ -114,7 +113,7 @@ public class NodeVersionHistoryPage extends FormPage implements
 		// Section Layout & MetaData
 		Section section = tk.createSection(parent, Section.TWISTIE);
 		section.setLayoutData(new GridData(GridData.FILL_BOTH));
-		section.setText(WorkbenchUiPlugin.getMessage("versionTreeSectionTitle"));
+		section.setText(SecurityUiPlugin.getMessage("versionTreeSectionTitle"));
 
 		// Section Body
 		Composite body = tk.createComposite(section, SWT.FILL);
@@ -156,7 +155,7 @@ public class NodeVersionHistoryPage extends FormPage implements
 		section.setLayout(twt);
 
 		// Set title of the section
-		section.setText(WorkbenchUiPlugin
+		section.setText(SecurityUiPlugin
 				.getMessage("versionHistorySectionTitle"));
 
 		final Text styledText = tk.createText(section, "", SWT.FULL_SELECTION
diff --git a/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/parts/StringNodeEditorInput.java b/org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/parts/StringNodeEditorInput.java
similarity index 100%
rename from org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/parts/StringNodeEditorInput.java
rename to org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/parts/StringNodeEditorInput.java
diff --git a/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/users/UsersImages.java b/org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/users/UsersImages.java
similarity index 74%
rename from org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/users/UsersImages.java
rename to org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/users/UsersImages.java
index 22f8b488a..c1b4d5753 100644
--- a/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/users/UsersImages.java
+++ b/org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/users/UsersImages.java
@@ -15,17 +15,17 @@
  */
 package org.argeo.eclipse.ui.workbench.internal.users;
 
-import org.argeo.eclipse.ui.workbench.WorkbenchUiPlugin;
+import org.argeo.cms.ui.workbench.SecurityUiPlugin;
 import org.eclipse.swt.graphics.Image;
 
 /** Specific users icons. TODO centralize and use an image registry */
 public class UsersImages {
 	private final static String PREFIX = "icons/";
 
-	public final static Image ICON_USER = WorkbenchUiPlugin.getImageDescriptor(
+	public final static Image ICON_USER = SecurityUiPlugin.getImageDescriptor(
 			PREFIX + "user.gif").createImage();
-	public final static Image ICON_GROUP = WorkbenchUiPlugin
-			.getImageDescriptor(PREFIX + "users.gif").createImage();
-	public final static Image ICON_ROLE = WorkbenchUiPlugin.getImageDescriptor(
+	public final static Image ICON_GROUP = SecurityUiPlugin.getImageDescriptor(
+			PREFIX + "users.gif").createImage();
+	public final static Image ICON_ROLE = SecurityUiPlugin.getImageDescriptor(
 			PREFIX + "role.gif").createImage();
 }
diff --git a/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/users/UsersUtils.java b/org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/users/UsersUtils.java
similarity index 100%
rename from org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/users/UsersUtils.java
rename to org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/users/UsersUtils.java
diff --git a/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/jcr/DefaultNodeEditor.java b/org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/jcr/DefaultNodeEditor.java
similarity index 88%
rename from org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/jcr/DefaultNodeEditor.java
rename to org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/jcr/DefaultNodeEditor.java
index e103bf61f..fd7302569 100644
--- a/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/jcr/DefaultNodeEditor.java
+++ b/org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/jcr/DefaultNodeEditor.java
@@ -24,8 +24,8 @@ import javax.jcr.nodetype.NodeType;
 import javax.jcr.security.AccessControlManager;
 import javax.jcr.security.Privilege;
 
+import org.argeo.cms.ui.workbench.SecurityUiPlugin;
 import org.argeo.eclipse.ui.EclipseUiException;
-import org.argeo.eclipse.ui.workbench.WorkbenchUiPlugin;
 import org.argeo.eclipse.ui.workbench.internal.jcr.parts.ChildNodesPage;
 import org.argeo.eclipse.ui.workbench.internal.jcr.parts.GenericNodeEditorInput;
 import org.argeo.eclipse.ui.workbench.internal.jcr.parts.GenericNodePage;
@@ -45,7 +45,8 @@ public class DefaultNodeEditor extends FormEditor {
 
 	// private final static Log log =
 	// LogFactory.getLog(GenericNodeEditor.class);
-	public final static String ID = WorkbenchUiPlugin.ID + ".defaultNodeEditor";
+	public final static String ID = SecurityUiPlugin.PLUGIN_ID
+			+ ".defaultNodeEditor";
 
 	private Node currentNode;
 
@@ -67,12 +68,12 @@ public class DefaultNodeEditor extends FormEditor {
 	protected void addPages() {
 		try {
 			genericPropertyPage = new GenericPropertyPage(this,
-					WorkbenchUiPlugin.getMessage("genericNodePageTitle"),
+					SecurityUiPlugin.getMessage("genericNodePageTitle"),
 					currentNode);
 			addPage(genericPropertyPage);
 
 			childNodesPage = new ChildNodesPage(this,
-					WorkbenchUiPlugin.getMessage("childNodesPageTitle"),
+					SecurityUiPlugin.getMessage("childNodesPageTitle"),
 					currentNode);
 			addPage(childNodesPage);
 
@@ -84,14 +85,14 @@ public class DefaultNodeEditor extends FormEditor {
 			if (accessControlManager.hasPrivileges(currentNode.getPath(),
 					privileges.toArray(new Privilege[0]))) {
 				nodeRightsManagementPage = new NodePrivilegesPage(this,
-						WorkbenchUiPlugin
+						SecurityUiPlugin
 								.getMessage("nodeRightsManagementPageTitle"),
 						currentNode);
 				addPage(nodeRightsManagementPage);
 			}
 			if (currentNode.isNodeType(NodeType.MIX_VERSIONABLE)) {
 				nodeVersionHistoryPage = new NodeVersionHistoryPage(this,
-						WorkbenchUiPlugin
+						SecurityUiPlugin
 								.getMessage("nodeVersionHistoryPageTitle"),
 						currentNode);
 				addPage(nodeVersionHistoryPage);
@@ -102,18 +103,19 @@ public class DefaultNodeEditor extends FormEditor {
 					.privilegeFromName(Privilege.JCR_ALL));
 			if (accessControlManager.hasPrivileges(currentNode.getPath(),
 					privileges.toArray(new Privilege[0]))) {
-				genericNodePage = new GenericNodePage(this,
-						WorkbenchUiPlugin.getMessage("propertyEditorPageTitle"),
+				genericNodePage = new GenericNodePage(
+						this,
+						SecurityUiPlugin.getMessage("propertyEditorPageTitle"),
 						currentNode);
 				addPage(genericNodePage);
 			}
 
 		} catch (RepositoryException e) {
-			throw new EclipseUiException("Cannot get node info for " + currentNode,
-					e);
-		} catch (PartInitException e) {
-			throw new EclipseUiException("Cannot add page " + "on node editor for "
+			throw new EclipseUiException("Cannot get node info for "
 					+ currentNode, e);
+		} catch (PartInitException e) {
+			throw new EclipseUiException("Cannot add page "
+					+ "on node editor for " + currentNode, e);
 		}
 	}
 
diff --git a/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/jcr/GenericJcrQueryEditor.java b/org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/jcr/GenericJcrQueryEditor.java
similarity index 94%
rename from org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/jcr/GenericJcrQueryEditor.java
rename to org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/jcr/GenericJcrQueryEditor.java
index 48ef15c1f..653db977b 100644
--- a/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/jcr/GenericJcrQueryEditor.java
+++ b/org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/jcr/GenericJcrQueryEditor.java
@@ -15,7 +15,7 @@
  */
 package org.argeo.eclipse.ui.workbench.jcr;
 
-import org.argeo.eclipse.ui.workbench.WorkbenchUiPlugin;
+import org.argeo.cms.ui.workbench.SecurityUiPlugin;
 import org.argeo.eclipse.ui.workbench.internal.jcr.parts.AbstractJcrQueryEditor;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.layout.GridData;
@@ -28,7 +28,7 @@ import org.eclipse.swt.widgets.Text;
 
 /** Enables end user to type and execute any JCR query. */
 public class GenericJcrQueryEditor extends AbstractJcrQueryEditor {
-	public final static String ID = WorkbenchUiPlugin.ID
+	public final static String ID = SecurityUiPlugin.PLUGIN_ID
 			+ ".genericJcrQueryEditor";
 
 	private Text queryField;
diff --git a/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/jcr/JcrBrowserPerspective.java b/org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/jcr/JcrBrowserPerspective.java
similarity index 83%
rename from org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/jcr/JcrBrowserPerspective.java
rename to org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/jcr/JcrBrowserPerspective.java
index a7e4ecf7b..065ae524e 100644
--- a/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/jcr/JcrBrowserPerspective.java
+++ b/org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/jcr/JcrBrowserPerspective.java
@@ -15,7 +15,7 @@
  */
 package org.argeo.eclipse.ui.workbench.jcr;
 
-import org.argeo.eclipse.ui.workbench.WorkbenchUiPlugin;
+import org.argeo.cms.ui.workbench.SecurityUiPlugin;
 import org.eclipse.ui.IFolderLayout;
 import org.eclipse.ui.IPageLayout;
 import org.eclipse.ui.IPerspectiveFactory;
@@ -25,8 +25,9 @@ public class JcrBrowserPerspective implements IPerspectiveFactory {
 
 	public void createInitialLayout(IPageLayout layout) {
 		layout.setEditorAreaVisible(true);
-		IFolderLayout upperLeft = layout.createFolder(WorkbenchUiPlugin.ID
-				+ ".upperLeft", IPageLayout.LEFT, 0.4f, layout.getEditorArea());
+		IFolderLayout upperLeft = layout.createFolder(
+				SecurityUiPlugin.PLUGIN_ID + ".upperLeft", IPageLayout.LEFT,
+				0.4f, layout.getEditorArea());
 		upperLeft.addView(JcrBrowserView.ID);
 
 	}
diff --git a/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/jcr/JcrBrowserView.java b/org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/jcr/JcrBrowserView.java
similarity index 98%
rename from org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/jcr/JcrBrowserView.java
rename to org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/jcr/JcrBrowserView.java
index b98553559..92deb71a1 100644
--- a/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/jcr/JcrBrowserView.java
+++ b/org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/jcr/JcrBrowserView.java
@@ -28,11 +28,11 @@ import javax.jcr.observation.Event;
 import javax.jcr.observation.EventListener;
 import javax.jcr.observation.ObservationManager;
 
+import org.argeo.cms.ui.workbench.SecurityUiPlugin;
 import org.argeo.eclipse.ui.EclipseUiException;
 import org.argeo.eclipse.ui.TreeParent;
 import org.argeo.eclipse.ui.jcr.AsyncUiEventListener;
 import org.argeo.eclipse.ui.jcr.utils.NodeViewerComparer;
-import org.argeo.eclipse.ui.workbench.WorkbenchUiPlugin;
 import org.argeo.eclipse.ui.workbench.internal.jcr.GenericNodeDoubleClickListener;
 import org.argeo.eclipse.ui.workbench.internal.jcr.JcrBrowserUtils;
 import org.argeo.eclipse.ui.workbench.internal.jcr.NodeContentProvider;
@@ -66,7 +66,8 @@ import org.eclipse.ui.part.ViewPart;
  * repository environment
  */
 public class JcrBrowserView extends ViewPart {
-	public final static String ID = WorkbenchUiPlugin.ID + ".jcrBrowserView";
+	public final static String ID = SecurityUiPlugin.PLUGIN_ID
+			+ ".jcrBrowserView";
 	private boolean sortChildNodes = true;
 
 	/* DEPENDENCY INJECTION */
diff --git a/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/jcr/JcrImages.java b/org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/jcr/JcrImages.java
similarity index 59%
rename from org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/jcr/JcrImages.java
rename to org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/jcr/JcrImages.java
index 2da973a47..d117f6e18 100644
--- a/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/jcr/JcrImages.java
+++ b/org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/jcr/JcrImages.java
@@ -15,41 +15,41 @@
  */
 package org.argeo.eclipse.ui.workbench.jcr;
 
-import org.argeo.eclipse.ui.workbench.WorkbenchUiPlugin;
+import org.argeo.cms.ui.workbench.SecurityUiPlugin;
 import org.eclipse.swt.graphics.Image;
 
 /** Shared icons. */
 public class JcrImages {
-	public final static Image NODE = WorkbenchUiPlugin.getImageDescriptor(
+	public final static Image NODE = SecurityUiPlugin.getImageDescriptor(
 			"icons/node.gif").createImage();
-	public final static Image FOLDER = WorkbenchUiPlugin.getImageDescriptor(
+	public final static Image FOLDER = SecurityUiPlugin.getImageDescriptor(
 			"icons/folder.gif").createImage();
-	public final static Image FILE = WorkbenchUiPlugin.getImageDescriptor(
+	public final static Image FILE = SecurityUiPlugin.getImageDescriptor(
 			"icons/file.gif").createImage();
-	public final static Image BINARY = WorkbenchUiPlugin.getImageDescriptor(
+	public final static Image BINARY = SecurityUiPlugin.getImageDescriptor(
 			"icons/binary.png").createImage();
-	public final static Image HOME = WorkbenchUiPlugin.getImageDescriptor(
+	public final static Image HOME = SecurityUiPlugin.getImageDescriptor(
 			"icons/home.gif").createImage();
-	public final static Image SORT = WorkbenchUiPlugin.getImageDescriptor(
+	public final static Image SORT = SecurityUiPlugin.getImageDescriptor(
 			"icons/sort.gif").createImage();
-	public final static Image REMOVE = WorkbenchUiPlugin.getImageDescriptor(
+	public final static Image REMOVE = SecurityUiPlugin.getImageDescriptor(
 			"icons/remove.gif").createImage();
 
-	public final static Image REPOSITORIES = WorkbenchUiPlugin
+	public final static Image REPOSITORIES = SecurityUiPlugin
 			.getImageDescriptor("icons/repositories.gif").createImage();
-	public final static Image REPOSITORY_DISCONNECTED = WorkbenchUiPlugin
+	public final static Image REPOSITORY_DISCONNECTED = SecurityUiPlugin
 			.getImageDescriptor("icons/repository_disconnected.gif")
 			.createImage();
-	public final static Image REPOSITORY_CONNECTED = WorkbenchUiPlugin
+	public final static Image REPOSITORY_CONNECTED = SecurityUiPlugin
 			.getImageDescriptor("icons/repository_connected.gif").createImage();
-	public final static Image REMOTE_DISCONNECTED = WorkbenchUiPlugin
+	public final static Image REMOTE_DISCONNECTED = SecurityUiPlugin
 			.getImageDescriptor("icons/remote_disconnected.gif").createImage();
-	public final static Image REMOTE_CONNECTED = WorkbenchUiPlugin
+	public final static Image REMOTE_CONNECTED = SecurityUiPlugin
 			.getImageDescriptor("icons/remote_connected.gif").createImage();
-	public final static Image WORKSPACE_DISCONNECTED = WorkbenchUiPlugin
+	public final static Image WORKSPACE_DISCONNECTED = SecurityUiPlugin
 			.getImageDescriptor("icons/workspace_disconnected.png")
 			.createImage();
-	public final static Image WORKSPACE_CONNECTED = WorkbenchUiPlugin
+	public final static Image WORKSPACE_CONNECTED = SecurityUiPlugin
 			.getImageDescriptor("icons/workspace_connected.png").createImage();
 
 }
diff --git a/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/jcr/JcrPreferenceStore.java b/org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/jcr/JcrPreferenceStore.java
similarity index 100%
rename from org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/jcr/JcrPreferenceStore.java
rename to org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/jcr/JcrPreferenceStore.java
diff --git a/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/osgi/BundleNode.java b/org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/osgi/BundleNode.java
similarity index 100%
rename from org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/osgi/BundleNode.java
rename to org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/osgi/BundleNode.java
diff --git a/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/osgi/BundlesView.java b/org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/osgi/BundlesView.java
similarity index 97%
rename from org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/osgi/BundlesView.java
rename to org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/osgi/BundlesView.java
index 5ebd73791..3894810f6 100644
--- a/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/osgi/BundlesView.java
+++ b/org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/osgi/BundlesView.java
@@ -20,9 +20,9 @@ package org.argeo.eclipse.ui.workbench.osgi;
 
 import java.util.Comparator;
 
+import org.argeo.cms.ui.workbench.SecurityUiPlugin;
 import org.argeo.eclipse.ui.ColumnViewerComparator;
 import org.argeo.eclipse.ui.specific.EclipseUiSpecificUtils;
-import org.argeo.eclipse.ui.workbench.WorkbenchUiPlugin;
 import org.eclipse.jface.viewers.ColumnLabelProvider;
 import org.eclipse.jface.viewers.IStructuredContentProvider;
 import org.eclipse.jface.viewers.TableViewer;
@@ -113,7 +113,7 @@ public class BundlesView extends ViewPart {
 			}
 		});
 
-		viewer.setInput(WorkbenchUiPlugin.getDefault().getBundle()
+		viewer.setInput(SecurityUiPlugin.getDefault().getBundle()
 				.getBundleContext());
 
 	}
diff --git a/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/osgi/ModulesView.java b/org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/osgi/ModulesView.java
similarity index 96%
rename from org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/osgi/ModulesView.java
rename to org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/osgi/ModulesView.java
index 5e4e3a2b8..dec1b2b14 100644
--- a/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/osgi/ModulesView.java
+++ b/org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/osgi/ModulesView.java
@@ -18,8 +18,8 @@ package org.argeo.eclipse.ui.workbench.osgi;
 import java.util.ArrayList;
 import java.util.List;
 
+import org.argeo.cms.ui.workbench.SecurityUiPlugin;
 import org.argeo.eclipse.ui.TreeParent;
-import org.argeo.eclipse.ui.workbench.WorkbenchUiPlugin;
 import org.eclipse.jface.viewers.ITreeContentProvider;
 import org.eclipse.jface.viewers.TreeViewer;
 import org.eclipse.jface.viewers.Viewer;
@@ -38,7 +38,7 @@ public class ModulesView extends ViewPart {
 		viewer = new TreeViewer(parent, SWT.MULTI | SWT.H_SCROLL | SWT.V_SCROLL);
 		viewer.setContentProvider(new ModulesContentProvider());
 		viewer.setLabelProvider(new ModulesLabelProvider());
-		viewer.setInput(WorkbenchUiPlugin.getDefault().getBundle()
+		viewer.setInput(SecurityUiPlugin.getDefault().getBundle()
 				.getBundleContext());
 	}
 
diff --git a/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/osgi/MultiplePackagesView.java b/org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/osgi/MultiplePackagesView.java
similarity index 97%
rename from org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/osgi/MultiplePackagesView.java
rename to org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/osgi/MultiplePackagesView.java
index 83338250e..b6a18c483 100644
--- a/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/osgi/MultiplePackagesView.java
+++ b/org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/osgi/MultiplePackagesView.java
@@ -24,8 +24,8 @@ import java.util.Set;
 import java.util.TreeMap;
 import java.util.TreeSet;
 
+import org.argeo.cms.ui.workbench.SecurityUiPlugin;
 import org.argeo.eclipse.ui.TreeParent;
-import org.argeo.eclipse.ui.workbench.WorkbenchUiPlugin;
 import org.eclipse.jface.viewers.ITreeContentProvider;
 import org.eclipse.jface.viewers.LabelProvider;
 import org.eclipse.jface.viewers.TreeViewer;
@@ -58,7 +58,7 @@ public class MultiplePackagesView extends ViewPart {
 		viewer = new TreeViewer(parent, SWT.MULTI | SWT.H_SCROLL | SWT.V_SCROLL);
 		viewer.setContentProvider(new ModulesContentProvider());
 		viewer.setLabelProvider(new LabelProvider());
-		viewer.setInput(WorkbenchUiPlugin.getDefault().getBundle()
+		viewer.setInput(SecurityUiPlugin.getDefault().getBundle()
 				.getBundleContext());
 	}
 
diff --git a/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/osgi/OsgiExplorerImages.java b/org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/osgi/OsgiExplorerImages.java
similarity index 68%
rename from org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/osgi/OsgiExplorerImages.java
rename to org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/osgi/OsgiExplorerImages.java
index 7f58ed0e2..1070c9013 100644
--- a/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/osgi/OsgiExplorerImages.java
+++ b/org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/osgi/OsgiExplorerImages.java
@@ -15,21 +15,21 @@
  */
 package org.argeo.eclipse.ui.workbench.osgi;
 
-import org.argeo.eclipse.ui.workbench.WorkbenchUiPlugin;
+import org.argeo.cms.ui.workbench.SecurityUiPlugin;
 import org.eclipse.swt.graphics.Image;
 
 /** Shared icons. */
 public class OsgiExplorerImages {
-	public final static Image INSTALLED = WorkbenchUiPlugin.getImageDescriptor(
+	public final static Image INSTALLED = SecurityUiPlugin.getImageDescriptor(
 			"icons/installed.gif").createImage();
-	public final static Image RESOLVED = WorkbenchUiPlugin.getImageDescriptor(
+	public final static Image RESOLVED = SecurityUiPlugin.getImageDescriptor(
 			"icons/resolved.gif").createImage();
-	public final static Image STARTING = WorkbenchUiPlugin.getImageDescriptor(
+	public final static Image STARTING = SecurityUiPlugin.getImageDescriptor(
 			"icons/starting.gif").createImage();
-	public final static Image ACTIVE = WorkbenchUiPlugin.getImageDescriptor(
+	public final static Image ACTIVE = SecurityUiPlugin.getImageDescriptor(
 			"icons/active.gif").createImage();
-	public final static Image SERVICE_PUBLISHED = WorkbenchUiPlugin
+	public final static Image SERVICE_PUBLISHED = SecurityUiPlugin
 			.getImageDescriptor("icons/service_published.gif").createImage();
-	public final static Image SERVICE_REFERENCED = WorkbenchUiPlugin
+	public final static Image SERVICE_REFERENCED = SecurityUiPlugin
 			.getImageDescriptor("icons/service_referenced.gif").createImage();
 }
diff --git a/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/osgi/OsgiExplorerPerspective.java b/org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/osgi/OsgiExplorerPerspective.java
similarity index 100%
rename from org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/osgi/OsgiExplorerPerspective.java
rename to org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/osgi/OsgiExplorerPerspective.java
diff --git a/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/osgi/ServiceReferenceNode.java b/org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/osgi/ServiceReferenceNode.java
similarity index 100%
rename from org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/osgi/ServiceReferenceNode.java
rename to org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/osgi/ServiceReferenceNode.java
diff --git a/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/osgi/StateLabelProvider.java b/org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/osgi/StateLabelProvider.java
similarity index 100%
rename from org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/osgi/StateLabelProvider.java
rename to org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/osgi/StateLabelProvider.java
diff --git a/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/users/PickUpUserDialog.java b/org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/users/PickUpUserDialog.java
similarity index 100%
rename from org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/users/PickUpUserDialog.java
rename to org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/users/PickUpUserDialog.java
diff --git a/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/users/UserLP.java b/org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/users/UserLP.java
similarity index 100%
rename from org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/users/UserLP.java
rename to org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/users/UserLP.java
diff --git a/org.argeo.cms.ui.workbench/src/org/argeo/security/ui/MaintenancePerspective.java b/org.argeo.cms.ui.workbench/src/org/argeo/security/ui/MaintenancePerspective.java
index 86307abd2..5a1ff66fe 100644
--- a/org.argeo.cms.ui.workbench/src/org/argeo/security/ui/MaintenancePerspective.java
+++ b/org.argeo.cms.ui.workbench/src/org/argeo/security/ui/MaintenancePerspective.java
@@ -15,6 +15,7 @@
  */
 package org.argeo.security.ui;
 
+import org.argeo.cms.ui.workbench.SecurityUiPlugin;
 import org.argeo.security.ui.views.AdminLogView;
 import org.argeo.security.ui.views.UserProfile;
 import org.eclipse.ui.IFolderLayout;
diff --git a/org.argeo.cms.ui.workbench/src/org/argeo/security/ui/UserHomePerspective.java b/org.argeo.cms.ui.workbench/src/org/argeo/security/ui/UserHomePerspective.java
index 119549ffd..9f4ee1066 100644
--- a/org.argeo.cms.ui.workbench/src/org/argeo/security/ui/UserHomePerspective.java
+++ b/org.argeo.cms.ui.workbench/src/org/argeo/security/ui/UserHomePerspective.java
@@ -15,6 +15,7 @@
  */
 package org.argeo.security.ui;
 
+import org.argeo.cms.ui.workbench.SecurityUiPlugin;
 import org.argeo.security.ui.views.LogView;
 import org.argeo.security.ui.views.UserProfile;
 import org.eclipse.ui.IFolderLayout;
diff --git a/org.argeo.cms.ui.workbench/src/org/argeo/security/ui/admin/SecurityAdminImages.java b/org.argeo.cms.ui.workbench/src/org/argeo/security/ui/admin/SecurityAdminImages.java
index 6cccb08a8..e2bb69920 100644
--- a/org.argeo.cms.ui.workbench/src/org/argeo/security/ui/admin/SecurityAdminImages.java
+++ b/org.argeo.cms.ui.workbench/src/org/argeo/security/ui/admin/SecurityAdminImages.java
@@ -26,7 +26,7 @@
  */
 package org.argeo.security.ui.admin;
 
-import org.argeo.security.ui.SecurityUiPlugin;
+import org.argeo.cms.ui.workbench.SecurityUiPlugin;
 import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.swt.graphics.Image;
 
diff --git a/org.argeo.cms.ui.workbench/src/org/argeo/security/ui/admin/internal/commands/DeleteGroups.java b/org.argeo.cms.ui.workbench/src/org/argeo/security/ui/admin/internal/commands/DeleteGroups.java
index 5a9b033bb..ff6ff038d 100644
--- a/org.argeo.cms.ui.workbench/src/org/argeo/security/ui/admin/internal/commands/DeleteGroups.java
+++ b/org.argeo.cms.ui.workbench/src/org/argeo/security/ui/admin/internal/commands/DeleteGroups.java
@@ -19,8 +19,8 @@ import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 
+import org.argeo.cms.ui.workbench.SecurityUiPlugin;
 import org.argeo.cms.util.useradmin.UserAdminUtils;
-import org.argeo.security.ui.SecurityUiPlugin;
 import org.argeo.security.ui.admin.internal.UserAdminWrapper;
 import org.argeo.security.ui.admin.internal.parts.UserEditorInput;
 import org.eclipse.core.commands.AbstractHandler;
diff --git a/org.argeo.cms.ui.workbench/src/org/argeo/security/ui/admin/internal/commands/DeleteUsers.java b/org.argeo.cms.ui.workbench/src/org/argeo/security/ui/admin/internal/commands/DeleteUsers.java
index 3618be187..cb2fcb071 100644
--- a/org.argeo.cms.ui.workbench/src/org/argeo/security/ui/admin/internal/commands/DeleteUsers.java
+++ b/org.argeo.cms.ui.workbench/src/org/argeo/security/ui/admin/internal/commands/DeleteUsers.java
@@ -19,8 +19,8 @@ import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 
+import org.argeo.cms.ui.workbench.SecurityUiPlugin;
 import org.argeo.cms.util.useradmin.UserAdminUtils;
-import org.argeo.security.ui.SecurityUiPlugin;
 import org.argeo.security.ui.admin.internal.UserAdminWrapper;
 import org.argeo.security.ui.admin.internal.parts.UserEditorInput;
 import org.eclipse.core.commands.AbstractHandler;
diff --git a/org.argeo.cms.ui.workbench/src/org/argeo/security/ui/admin/internal/commands/NewGroup.java b/org.argeo.cms.ui.workbench/src/org/argeo/security/ui/admin/internal/commands/NewGroup.java
index 755f05bf3..92aa7b1f8 100644
--- a/org.argeo.cms.ui.workbench/src/org/argeo/security/ui/admin/internal/commands/NewGroup.java
+++ b/org.argeo.cms.ui.workbench/src/org/argeo/security/ui/admin/internal/commands/NewGroup.java
@@ -19,12 +19,12 @@ import java.util.Dictionary;
 import java.util.Map;
 
 import org.argeo.cms.CmsException;
+import org.argeo.cms.ui.workbench.SecurityUiPlugin;
 import org.argeo.eclipse.ui.EclipseUiUtils;
 import org.argeo.eclipse.ui.dialogs.ErrorFeedback;
 import org.argeo.jcr.ArgeoNames;
 import org.argeo.osgi.useradmin.LdifName;
 import org.argeo.osgi.useradmin.UserAdminConf;
-import org.argeo.security.ui.SecurityUiPlugin;
 import org.argeo.security.ui.admin.internal.UserAdminWrapper;
 import org.eclipse.core.commands.AbstractHandler;
 import org.eclipse.core.commands.ExecutionEvent;
diff --git a/org.argeo.cms.ui.workbench/src/org/argeo/security/ui/admin/internal/commands/NewUser.java b/org.argeo.cms.ui.workbench/src/org/argeo/security/ui/admin/internal/commands/NewUser.java
index 8289d59bf..70afd8fd0 100644
--- a/org.argeo.cms.ui.workbench/src/org/argeo/security/ui/admin/internal/commands/NewUser.java
+++ b/org.argeo.cms.ui.workbench/src/org/argeo/security/ui/admin/internal/commands/NewUser.java
@@ -24,13 +24,13 @@ import javax.naming.ldap.LdapName;
 import javax.naming.ldap.Rdn;
 
 import org.argeo.cms.CmsException;
+import org.argeo.cms.ui.workbench.SecurityUiPlugin;
 import org.argeo.cms.util.useradmin.UserAdminUtils;
 import org.argeo.eclipse.ui.EclipseUiUtils;
 import org.argeo.eclipse.ui.dialogs.ErrorFeedback;
 import org.argeo.jcr.ArgeoNames;
 import org.argeo.osgi.useradmin.LdifName;
 import org.argeo.osgi.useradmin.UserAdminConf;
-import org.argeo.security.ui.SecurityUiPlugin;
 import org.argeo.security.ui.admin.internal.UserAdminWrapper;
 import org.eclipse.core.commands.AbstractHandler;
 import org.eclipse.core.commands.ExecutionEvent;
diff --git a/org.argeo.cms.ui.workbench/src/org/argeo/security/ui/admin/internal/commands/SaveArgeoUser.java b/org.argeo.cms.ui.workbench/src/org/argeo/security/ui/admin/internal/commands/SaveArgeoUser.java
index c2c78f90c..b5b394c3d 100644
--- a/org.argeo.cms.ui.workbench/src/org/argeo/security/ui/admin/internal/commands/SaveArgeoUser.java
+++ b/org.argeo.cms.ui.workbench/src/org/argeo/security/ui/admin/internal/commands/SaveArgeoUser.java
@@ -15,7 +15,7 @@
  */
 package org.argeo.security.ui.admin.internal.commands;
 
-import org.argeo.security.ui.SecurityUiPlugin;
+import org.argeo.cms.ui.workbench.SecurityUiPlugin;
 import org.eclipse.core.commands.AbstractHandler;
 import org.eclipse.core.commands.ExecutionEvent;
 import org.eclipse.core.commands.ExecutionException;
diff --git a/org.argeo.cms.ui.workbench/src/org/argeo/security/ui/admin/internal/commands/UserTransactionHandler.java b/org.argeo.cms.ui.workbench/src/org/argeo/security/ui/admin/internal/commands/UserTransactionHandler.java
index 6f04635af..85e44c1b3 100644
--- a/org.argeo.cms.ui.workbench/src/org/argeo/security/ui/admin/internal/commands/UserTransactionHandler.java
+++ b/org.argeo.cms.ui.workbench/src/org/argeo/security/ui/admin/internal/commands/UserTransactionHandler.java
@@ -19,7 +19,7 @@ import javax.transaction.Status;
 import javax.transaction.UserTransaction;
 
 import org.argeo.cms.CmsException;
-import org.argeo.security.ui.SecurityUiPlugin;
+import org.argeo.cms.ui.workbench.SecurityUiPlugin;
 import org.argeo.security.ui.admin.internal.UiAdminUtils;
 import org.argeo.security.ui.admin.internal.UserAdminWrapper;
 import org.eclipse.core.commands.AbstractHandler;
diff --git a/org.argeo.cms.ui.workbench/src/org/argeo/security/ui/admin/internal/parts/GroupsView.java b/org.argeo.cms.ui.workbench/src/org/argeo/security/ui/admin/internal/parts/GroupsView.java
index 7225ef865..88f163326 100644
--- a/org.argeo.cms.ui.workbench/src/org/argeo/security/ui/admin/internal/parts/GroupsView.java
+++ b/org.argeo.cms.ui.workbench/src/org/argeo/security/ui/admin/internal/parts/GroupsView.java
@@ -22,13 +22,13 @@ import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.argeo.cms.CmsException;
 import org.argeo.cms.auth.AuthConstants;
+import org.argeo.cms.ui.workbench.SecurityUiPlugin;
 import org.argeo.cms.util.useradmin.UserAdminUtils;
 import org.argeo.eclipse.ui.ColumnDefinition;
 import org.argeo.eclipse.ui.EclipseUiUtils;
 import org.argeo.eclipse.ui.parts.LdifUsersTable;
 import org.argeo.jcr.ArgeoNames;
 import org.argeo.osgi.useradmin.LdifName;
-import org.argeo.security.ui.SecurityUiPlugin;
 import org.argeo.security.ui.admin.internal.UiUserAdminListener;
 import org.argeo.security.ui.admin.internal.UserAdminWrapper;
 import org.argeo.security.ui.admin.internal.providers.CommonNameLP;
diff --git a/org.argeo.cms.ui.workbench/src/org/argeo/security/ui/admin/internal/parts/UserEditor.java b/org.argeo.cms.ui.workbench/src/org/argeo/security/ui/admin/internal/parts/UserEditor.java
index d6cae1a1a..f750e67bb 100644
--- a/org.argeo.cms.ui.workbench/src/org/argeo/security/ui/admin/internal/parts/UserEditor.java
+++ b/org.argeo.cms.ui.workbench/src/org/argeo/security/ui/admin/internal/parts/UserEditor.java
@@ -19,9 +19,9 @@ import java.util.ArrayList;
 import java.util.List;
 
 import org.argeo.cms.CmsException;
+import org.argeo.cms.ui.workbench.SecurityUiPlugin;
 import org.argeo.cms.util.useradmin.UserAdminUtils;
 import org.argeo.osgi.useradmin.LdifName;
-import org.argeo.security.ui.SecurityUiPlugin;
 import org.argeo.security.ui.admin.internal.UiUserAdminListener;
 import org.argeo.security.ui.admin.internal.UserAdminWrapper;
 import org.eclipse.core.runtime.IProgressMonitor;
diff --git a/org.argeo.cms.ui.workbench/src/org/argeo/security/ui/admin/internal/parts/UsersView.java b/org.argeo.cms.ui.workbench/src/org/argeo/security/ui/admin/internal/parts/UsersView.java
index 86fb439ff..2503223b6 100644
--- a/org.argeo.cms.ui.workbench/src/org/argeo/security/ui/admin/internal/parts/UsersView.java
+++ b/org.argeo.cms.ui.workbench/src/org/argeo/security/ui/admin/internal/parts/UsersView.java
@@ -20,13 +20,13 @@ import java.util.List;
 
 import org.argeo.cms.CmsException;
 import org.argeo.cms.auth.AuthConstants;
+import org.argeo.cms.ui.workbench.SecurityUiPlugin;
 import org.argeo.cms.util.useradmin.UserAdminUtils;
 import org.argeo.eclipse.ui.ColumnDefinition;
 import org.argeo.eclipse.ui.EclipseUiUtils;
 import org.argeo.eclipse.ui.parts.LdifUsersTable;
 import org.argeo.jcr.ArgeoNames;
 import org.argeo.osgi.useradmin.LdifName;
-import org.argeo.security.ui.SecurityUiPlugin;
 import org.argeo.security.ui.admin.internal.UiUserAdminListener;
 import org.argeo.security.ui.admin.internal.UserAdminWrapper;
 import org.argeo.security.ui.admin.internal.providers.CommonNameLP;
diff --git a/org.argeo.cms.ui.workbench/src/org/argeo/security/ui/admin/internal/providers/UserTableDefaultDClickListener.java b/org.argeo.cms.ui.workbench/src/org/argeo/security/ui/admin/internal/providers/UserTableDefaultDClickListener.java
index 8f4a35a18..10337bebd 100644
--- a/org.argeo.cms.ui.workbench/src/org/argeo/security/ui/admin/internal/providers/UserTableDefaultDClickListener.java
+++ b/org.argeo.cms.ui.workbench/src/org/argeo/security/ui/admin/internal/providers/UserTableDefaultDClickListener.java
@@ -1,7 +1,7 @@
 package org.argeo.security.ui.admin.internal.providers;
 
 import org.argeo.cms.CmsException;
-import org.argeo.eclipse.ui.workbench.WorkbenchUiPlugin;
+import org.argeo.cms.ui.workbench.SecurityUiPlugin;
 import org.argeo.security.ui.admin.internal.parts.UserEditor;
 import org.argeo.security.ui.admin.internal.parts.UserEditorInput;
 import org.eclipse.jface.viewers.DoubleClickEvent;
@@ -24,7 +24,7 @@ public class UserTableDefaultDClickListener implements IDoubleClickListener {
 		Object obj = ((IStructuredSelection) evt.getSelection())
 				.getFirstElement();
 		User user = (User) obj;
-		IWorkbenchWindow iww = WorkbenchUiPlugin.getDefault().getWorkbench()
+		IWorkbenchWindow iww = SecurityUiPlugin.getDefault().getWorkbench()
 				.getActiveWorkbenchWindow();
 		IWorkbenchPage iwp = iww.getActivePage();
 		UserEditorInput uei = new UserEditorInput(user.getName());
@@ -37,8 +37,7 @@ public class UserTableDefaultDClickListener implements IDoubleClickListener {
 			else
 				iwp.openEditor(uei, UserEditor.USER_EDITOR_ID);
 		} catch (PartInitException pie) {
-			throw new CmsException("Unable to open UserEditor for " + user,
-					pie);
+			throw new CmsException("Unable to open UserEditor for " + user, pie);
 		}
 	}
 }
\ No newline at end of file
diff --git a/org.argeo.cms.ui.workbench/src/org/argeo/security/ui/admin/internal/providers/UserTransactionProvider.java b/org.argeo.cms.ui.workbench/src/org/argeo/security/ui/admin/internal/providers/UserTransactionProvider.java
index d4a53fcff..33b3cb7c8 100644
--- a/org.argeo.cms.ui.workbench/src/org/argeo/security/ui/admin/internal/providers/UserTransactionProvider.java
+++ b/org.argeo.cms.ui.workbench/src/org/argeo/security/ui/admin/internal/providers/UserTransactionProvider.java
@@ -9,7 +9,7 @@ import javax.transaction.UserTransaction;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.argeo.cms.CmsException;
-import org.argeo.security.ui.SecurityUiPlugin;
+import org.argeo.cms.ui.workbench.SecurityUiPlugin;
 import org.eclipse.ui.AbstractSourceProvider;
 import org.eclipse.ui.ISources;
 
diff --git a/org.argeo.cms.ui.workbench/src/org/argeo/security/ui/views/AdminLogView.java b/org.argeo.cms.ui.workbench/src/org/argeo/security/ui/views/AdminLogView.java
index 61efc8cb6..cb3b02f41 100644
--- a/org.argeo.cms.ui.workbench/src/org/argeo/security/ui/views/AdminLogView.java
+++ b/org.argeo.cms.ui.workbench/src/org/argeo/security/ui/views/AdminLogView.java
@@ -17,8 +17,8 @@ package org.argeo.security.ui.views;
 
 import java.util.ArrayList;
 
+import org.argeo.cms.ui.workbench.SecurityUiPlugin;
 import org.argeo.node.ArgeoLogger;
-import org.argeo.security.ui.SecurityUiPlugin;
 import org.eclipse.jface.resource.JFaceResources;
 import org.eclipse.jface.viewers.LabelProvider;
 import org.eclipse.jface.viewers.TableViewer;
diff --git a/org.argeo.cms.ui.workbench/src/org/argeo/security/ui/views/LogView.java b/org.argeo.cms.ui.workbench/src/org/argeo/security/ui/views/LogView.java
index f9e197ac0..50d44416b 100644
--- a/org.argeo.cms.ui.workbench/src/org/argeo/security/ui/views/LogView.java
+++ b/org.argeo.cms.ui.workbench/src/org/argeo/security/ui/views/LogView.java
@@ -17,9 +17,9 @@ package org.argeo.security.ui.views;
 
 import java.util.ArrayList;
 
+import org.argeo.cms.ui.workbench.SecurityUiPlugin;
 import org.argeo.node.ArgeoLogListener;
 import org.argeo.node.ArgeoLogger;
-import org.argeo.security.ui.SecurityUiPlugin;
 import org.eclipse.jface.resource.JFaceResources;
 import org.eclipse.jface.viewers.LabelProvider;
 import org.eclipse.jface.viewers.TableViewer;
diff --git a/org.argeo.cms.ui.workbench/src/org/argeo/security/ui/views/UserProfile.java b/org.argeo.cms.ui.workbench/src/org/argeo/security/ui/views/UserProfile.java
index 49f5bea5a..b7b929b88 100644
--- a/org.argeo.cms.ui.workbench/src/org/argeo/security/ui/views/UserProfile.java
+++ b/org.argeo.cms.ui.workbench/src/org/argeo/security/ui/views/UserProfile.java
@@ -18,8 +18,8 @@ package org.argeo.security.ui.views;
 import java.util.TreeSet;
 
 import org.argeo.cms.auth.CurrentUser;
+import org.argeo.cms.ui.workbench.SecurityUiPlugin;
 import org.argeo.eclipse.ui.EclipseUiUtils;
-import org.argeo.security.ui.SecurityUiPlugin;
 import org.eclipse.jface.viewers.IStructuredContentProvider;
 import org.eclipse.jface.viewers.LabelProvider;
 import org.eclipse.jface.viewers.TableViewer;
diff --git a/org.argeo.eclipse.ui.workbench/META-INF/spring/commands.xml b/org.argeo.eclipse.ui.workbench/META-INF/spring/commands.xml
index 39ab24243..cbc152edc 100644
--- a/org.argeo.eclipse.ui.workbench/META-INF/spring/commands.xml
+++ b/org.argeo.eclipse.ui.workbench/META-INF/spring/commands.xml
@@ -4,19 +4,6 @@
 	xsi:schemaLocation="http://www.springframework.org/schema/beans
         http://www.springframework.org/schema/beans/spring-beans.xsd">
 
-	<bean id="addRemoteRepository"
-		class="org.argeo.eclipse.ui.workbench.commands.AddRemoteRepository">
-		<property name="repositoryFactory" ref="repositoryFactory" />
-		<property name="nodeRepository" ref="nodeRepository" />
-		<property name="keyring" ref="keyring" />
-	</bean>
-
-	<bean id="addPrivileges" class="org.argeo.eclipse.ui.workbench.commands.AddPrivileges">
-		<property name="userAdmin" ref="userAdmin" />
-	</bean>
-	<bean id="removePrivileges"
-		class="org.argeo.eclipse.ui.workbench.commands.RemovePrivileges">
-		<!-- <property name="userAdmin" ref="userAdmin" /> -->
-	</bean>
+	
 
 </beans>
\ No newline at end of file
diff --git a/org.argeo.eclipse.ui.workbench/META-INF/spring/osgi.xml b/org.argeo.eclipse.ui.workbench/META-INF/spring/osgi.xml
index feede4d6e..ca60895b8 100644
--- a/org.argeo.eclipse.ui.workbench/META-INF/spring/osgi.xml
+++ b/org.argeo.eclipse.ui.workbench/META-INF/spring/osgi.xml
@@ -8,16 +8,6 @@
        http://www.springframework.org/schema/beans/spring-beans-2.5.xsd"
 	osgi:default-timeout="30000">
 
-	<list id="repositories" interface="javax.jcr.Repository"
-		cardinality="0..N">
-		<listener ref="repositoryRegister" bind-method="register"
-			unbind-method="unregister" />
-	</list>
 
-	<reference id="nodeRepository" interface="javax.jcr.Repository"
-		filter="(argeo.jcr.repository.alias=home)" />
-	<reference id="repositoryFactory" interface="javax.jcr.RepositoryFactory" />
-	<reference id="keyring" interface="org.argeo.util.security.CryptoKeyring" />
-	<reference id="userAdmin" interface="org.osgi.service.useradmin.UserAdmin" />
 
 </beans:beans>
\ No newline at end of file
diff --git a/org.argeo.eclipse.ui.workbench/plugin.xml b/org.argeo.eclipse.ui.workbench/plugin.xml
index 215f1203d..8bbcee8ec 100644
--- a/org.argeo.eclipse.ui.workbench/plugin.xml
+++ b/org.argeo.eclipse.ui.workbench/plugin.xml
@@ -18,27 +18,6 @@
       </perspective>
 	</extension>
     
-    <!-- Definition of the OSGI perspective -->
-    <extension point="org.eclipse.ui.perspectiveExtensions"> 
-        <perspectiveExtension targetID="org.argeo.eclipse.ui.workbench.osgiPerspective"> 
-            <view 
-            	id="org.argeo.eclipse.ui.workbench.modulesView" 
-            	minimized="false"
-             	ratio="0.5" 
-             	relationship="left" 
-             	relative="org.eclipse.ui.editorss"/> 
-            <view 
-            	id="org.argeo.eclipse.ui.workbench.bundlesView" 
-            	minimized="false"
-             	relationship="stack" 
-             	relative="org.argeo.eclipse.ui.workbench.modulesView"/> 
-             <view 
-            	id="org.argeo.eclipse.ui.workbench.multiplePackagesView" 
-            	minimized="false"
-             	relationship="stack" 
-             	relative="org.argeo.eclipse.ui.workbench.bundlesView"/> 
-        </perspectiveExtension> 
-    </extension> 
    
    	<!-- VIEWS --> 
    	<extension
@@ -72,20 +51,6 @@
    <!-- EDITORS --> 
    <extension
 		point="org.eclipse.ui.editors">
-		<editor
-			name="JCR Query"
-			id="org.argeo.eclipse.ui.workbench.genericJcrQueryEditor"
-			icon="icons/query.png"
-			class="org.argeo.eclipse.spring.SpringExtensionFactory"
-			default="false">
-        </editor>
-		<editor
-			name="Node Editor"
-            id="org.argeo.eclipse.ui.workbench.defaultNodeEditor"
-			icon="icons/query.png"
-			class="org.argeo.eclipse.spring.SpringExtensionFactory"
-			default="false">
-		</editor>
 	</extension>
    	
    	<!-- COMMANDS --> 
diff --git a/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/WorkbenchUiPlugin.java b/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/WorkbenchUiPlugin.java
deleted file mode 100644
index 6fd8e5d3b..000000000
--- a/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/WorkbenchUiPlugin.java
+++ /dev/null
@@ -1,116 +0,0 @@
-/*
- * 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.eclipse.ui.workbench;
-
-import java.util.ResourceBundle;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.eclipse.core.runtime.ILogListener;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.osgi.framework.BundleContext;
-
-/**
- * The activator class controls the plug-in life cycle
- */
-public class WorkbenchUiPlugin extends AbstractUIPlugin implements ILogListener {
-	private final static Log log = LogFactory.getLog(WorkbenchUiPlugin.class);
-	private ResourceBundle messages;
-
-	// The plug-in ID
-	public static final String ID = "org.argeo.eclipse.ui.workbench"; //$NON-NLS-1$
-
-	// The shared instance
-	private static WorkbenchUiPlugin plugin;
-
-	/**
-	 * The constructor
-	 */
-	public WorkbenchUiPlugin() {
-	}
-
-	public void start(BundleContext context) throws Exception {
-		super.start(context);
-		plugin = this;
-		messages = ResourceBundle.getBundle(ID + ".messages");
-		Platform.addLogListener(this);
-		if (log.isTraceEnabled())
-			log.trace("Eclipse logging now directed to standard logging");
-	}
-
-	public void stop(BundleContext context) throws Exception {
-		try {
-			Platform.removeLogListener(this);
-			if (log.isTraceEnabled())
-				log.trace("Eclipse logging not directed anymore to standard logging");
-			plugin = null;
-		} finally {
-			super.stop(context);
-		}
-	}
-
-	/**
-	 * Returns the shared instance
-	 * 
-	 * @return the shared instance
-	 */
-	public static WorkbenchUiPlugin getDefault() {
-		return plugin;
-	}
-
-	public static ImageDescriptor getImageDescriptor(String path) {
-		return imageDescriptorFromPlugin(ID, path);
-	}
-
-	/** Returns the internationalized label for the given key */
-	public static String getMessage(String key) {
-		try {
-			return getDefault().messages.getString(key);
-		} catch (NullPointerException npe) {
-			log.warn(key + " not found.");
-			return key;
-		}
-	}
-
-	/**
-	 * Gives access to the internationalization message bundle. Returns null in
-	 * case this UiPlugin is not started (for JUnit tests, by instance)
-	 */
-	public static ResourceBundle getMessagesBundle() {
-		if (getDefault() != null)
-			// To avoid NPE
-			return getDefault().messages;
-		else
-			return null;
-	}
-
-	public void logging(IStatus status, String plugin) {
-		Log pluginLog = LogFactory.getLog(plugin);
-		Integer severity = status.getSeverity();
-		if (severity == IStatus.ERROR)
-			pluginLog.error(status.getMessage(), status.getException());
-		else if (severity == IStatus.WARNING)
-			pluginLog.warn(status.getMessage(), status.getException());
-		else if (severity == IStatus.INFO)
-			pluginLog.info(status.getMessage(), status.getException());
-		else if (severity == IStatus.CANCEL)
-			if (pluginLog.isDebugEnabled())
-				pluginLog.debug(status.getMessage(), status.getException());
-	}
-}
diff --git a/pom.xml b/pom.xml
index 9c1f8aec7..521ee519e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,7 +28,7 @@
 		<!-- Eclipse -->
 		<module>org.argeo.eclipse.ui</module>
 		<module>org.argeo.eclipse.ui.rap</module>
-		<module>org.argeo.eclipse.ui.workbench</module>
+<!-- 		<module>org.argeo.eclipse.ui.workbench</module> -->
 		<!-- CMS -->
 		<module>org.argeo.node.api</module>
 		<module>org.argeo.cms</module>
-- 
2.30.2