From 2db415932b071525adb52c6374e021174512a924 Mon Sep 17 00:00:00 2001
From: Mathieu Baudier <mbaudier@argeo.org>
Date: Tue, 17 Feb 2015 08:32:37 +0000
Subject: [PATCH] SLC UI building (except Dist)

git-svn-id: https://svn.argeo.org/slc/trunk@7907 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc
---
 demo/modules/org.argeo.slc.demo.ant/bnd.bnd   |  0
 demo/modules/org.argeo.slc.demo.basic/bnd.bnd |  0
 .../org.argeo.slc.demo.minimal/bnd.bnd        |  0
 demo/modules/pom.xml                          | 27 ++------
 dep/org.argeo.slc.dep.eclipse/bnd.bnd         |  0
 dep/org.argeo.slc.dep.eclipse/pom.xml         | 10 +--
 dep/org.argeo.slc.dep.rap/bnd.bnd             |  0
 dep/org.argeo.slc.dep.rap/pom.xml             | 20 +++---
 dep/org.argeo.slc.dep.rcp/bnd.bnd             |  0
 dep/org.argeo.slc.dep.rcp/pom.xml             |  2 +-
 dep/pom.xml                                   | 15 +++--
 org.argeo.slc.client.rap/bnd.bnd              | 11 ++++
 org.argeo.slc.client.rap/pom.xml              | 50 ++-------------
 .../slc/client/rap/OpenJcrFileService.java    |  9 +--
 .../argeo/slc/client/rap/SlcRapPlugin.java    |  0
 .../argeo/slc/client/rap/SlcSecureRap.java    |  0
 .../slc/client/ui/specific/OpenJcrFile.java   |  9 +--
 .../client/ui/specific/OpenJcrFileCmdId.java  |  0
 org.argeo.slc.client.ui.dist/bnd.bnd          | 12 ++++
 org.argeo.slc.client.ui.dist/pom.xml          | 59 ++---------------
 .../AnonymousDistributionPerspective.java     |  0
 .../slc/client/ui/dist/DistConstants.java     |  0
 .../argeo/slc/client/ui/dist/DistImages.java  |  0
 .../argeo/slc/client/ui/dist/DistLabels.java  |  0
 .../argeo/slc/client/ui/dist/DistPlugin.java  |  0
 .../ui/dist/DistributionPerspective.java      |  0
 .../slc/client/ui/dist/PrivilegedJob.java     |  4 +-
 .../client/ui/dist/commands/BndProcess.java   |  0
 .../dist/commands/CopyLocalJavaWorkspace.java |  0
 .../ui/dist/commands/CopyWorkspace.java       |  0
 .../commands/CreateLocalJavaWorkspace.java    |  2 +-
 .../ui/dist/commands/CreateWorkspace.java     |  2 +-
 .../ui/dist/commands/DeleteArtifacts.java     |  0
 .../ui/dist/commands/DeleteWorkspace.java     |  0
 .../dist/commands/DisplayRepoInformation.java |  0
 .../client/ui/dist/commands/DoNothing.java    |  0
 .../slc/client/ui/dist/commands/Fetch.java    |  0
 .../ui/dist/commands/ManageWorkspaceAuth.java |  0
 .../ui/dist/commands/MergeWorkspaces.java     |  0
 .../dist/commands/NormalizeDistribution.java  |  4 +-
 .../ui/dist/commands/NormalizeWorkspace.java  |  0
 .../commands/OpenGenerateBinariesWizard.java  |  0
 .../ui/dist/commands/OpenModuleEditor.java    |  0
 .../ui/dist/commands/OpenWorkspaceEditor.java |  0
 .../ui/dist/commands/PublishWorkspace.java    |  0
 .../dist/commands/RefreshArtifactBrowser.java |  0
 .../commands/RefreshDistributionsView.java    |  0
 .../ui/dist/commands/RegisterRepository.java  |  0
 .../client/ui/dist/commands/RunInOsgi.java    |  4 +-
 .../ui/dist/commands/ShowSizeColumn.java      |  0
 .../dist/commands/UnregisterRemoteRepo.java   |  2 +-
 .../slc/client/ui/dist/commands/package.html  |  0
 .../AnonymousDistTreeContentProvider.java     |  0
 .../controllers/ArtifactLabelProvider.java    |  0
 .../ArtifactsTreeContentProvider.java         |  0
 .../dist/controllers/DistSessionFactory.java  |  0
 .../dist/controllers/DistTreeComparator.java  |  0
 .../ui/dist/controllers/DistTreeComparer.java |  0
 .../controllers/DistTreeContentProvider.java  |  0
 .../DistTreeDoubleClickListener.java          |  2 +-
 .../controllers/DistTreeLabelProvider.java    |  0
 .../dist/editors/ArtifactVersionEditor.java   |  0
 .../ui/dist/editors/BundleDependencyPage.java |  2 +-
 .../ui/dist/editors/BundleDetailPage.java     |  2 +-
 .../client/ui/dist/editors/BundleRawPage.java |  0
 .../ui/dist/editors/DistWkspBrowserPage.java  |  2 +-
 .../ui/dist/editors/DistWkspEditorInput.java  |  0
 .../ui/dist/editors/DistWkspSearchPage.java   |  2 +-
 .../ui/dist/editors/DistWorkspaceEditor.java  |  0
 .../editors/ModularDistVersionDetailPage.java |  0
 .../editors/ModularDistVersionEditor.java     |  0
 .../ModularDistVersionOverviewPage.java       |  6 +-
 .../ui/dist/editors/ModuleEditorInput.java    |  0
 .../client/ui/dist/editors/RunInOsgiPage.java |  0
 .../editors/WkspCategoryBaseListPage.java     |  2 +-
 .../client/ui/dist/model/DistParentElem.java  |  0
 .../client/ui/dist/model/GroupBaseElem.java   |  0
 .../model/ModularDistVersionBaseElem.java     |  0
 .../ui/dist/model/ModularDistVersionElem.java |  0
 .../slc/client/ui/dist/model/RepoElem.java    |  0
 .../client/ui/dist/model/WkspGroupElem.java   |  0
 .../client/ui/dist/model/WorkspaceElem.java   |  0
 .../dist/utils/AbstractHyperlinkListener.java |  0
 .../dist/utils/ArtifactsTableConfigurer.java  |  0
 .../client/ui/dist/utils/CommandHelpers.java  |  0
 .../dist/utils/DistNodeViewerComparator.java  |  0
 .../client/ui/dist/utils/DistUiHelpers.java   |  0
 .../ui/dist/utils/NameVersionComparator.java  |  0
 .../ui/dist/utils/VersionComparator.java      |  0
 .../slc/client/ui/dist/utils/ViewerUtils.java |  0
 .../views/AbstractQueryArtifactsView.java     |  0
 .../views/AnonymousDistributionsView.java     |  0
 .../ui/dist/views/ArtifactsBrowser.java       |  0
 .../ui/dist/views/DistributionsView.java      |  2 +-
 .../slc/client/ui/dist/views/HelpView.java    |  0
 .../ui/dist/views/QueryArtifactsForm.java     |  0
 .../ui/dist/views/QueryArtifactsText.java     |  0
 .../ui/dist/views/QueryBundlesForm.java       |  0
 .../ui/dist/wizards/ChangeRightsWizard.java   |  0
 .../ui/dist/wizards/ChooseRightsPage.java     |  0
 .../client/ui/dist/wizards/FetchWizard.java   |  0
 .../dist/wizards/GenerateBinariesWizard.java  |  2 +-
 .../ui/dist/wizards/RegisterRepoWizard.java   |  2 +-
 org.argeo.slc.client.ui/bnd.bnd               |  8 +++
 org.argeo.slc.client.ui/pom.xml               | 64 +++----------------
 .../argeo/slc/client/ui/ClientUiPlugin.java   |  0
 .../client/ui/SlcExecutionPerspective.java    |  0
 .../org/argeo/slc/client/ui/SlcImages.java    |  0
 .../argeo/slc/client/ui/SlcUiConstants.java   |  0
 .../client/ui/commands/AddResultFolder.java   |  2 +-
 .../slc/client/ui/commands/DeleteItems.java   |  0
 .../ui/commands/RefreshJcrResultTreeView.java |  0
 .../ui/commands/RenameResultFolder.java       |  0
 .../client/ui/commands/RenameResultNode.java  |  0
 .../slc/client/ui/commands/RunSlcFlow.java    |  0
 .../slc/client/ui/commands/UpdateModule.java  |  0
 .../ui/controllers/ProcessController.java     |  0
 .../ui/decorators/ResultFailedDecorator.java  |  0
 .../client/ui/editors/ProcessBuilderPage.java |  0
 .../slc/client/ui/editors/ProcessEditor.java  |  2 +-
 .../client/ui/editors/ProcessEditorInput.java |  0
 .../ui/editors/ProcessEditorInputFactory.java |  0
 .../slc/client/ui/editors/ProcessLogPage.java |  0
 .../slc/client/ui/model/ParentNodeFolder.java |  0
 .../slc/client/ui/model/ResultFolder.java     |  0
 .../ui/model/ResultItemsComparator.java       |  0
 .../client/ui/model/ResultItemsComparer.java  |  0
 .../slc/client/ui/model/ResultParent.java     |  0
 .../client/ui/model/ResultParentUtils.java    |  0
 .../slc/client/ui/model/SingleResultNode.java |  0
 .../slc/client/ui/model/VirtualFolder.java    |  0
 .../providers/ResultTreeContentProvider.java  |  0
 .../ui/providers/ResultTreeLabelProvider.java |  0
 .../ui/views/JcrExecutionModulesView.java     |  0
 .../client/ui/views/JcrProcessListView.java   |  0
 .../client/ui/views/JcrResultListView.java    |  0
 .../client/ui/views/JcrResultTreeView.java    |  2 +-
 .../ui/wizards/ConfirmOverwriteWizard.java    |  0
 pom.xml                                       | 12 ++--
 .../argeo/slc/maven/ManualWagonProvider.java  |  2 +-
 .../org/argeo/slc/maven/MavenManager.java     | 26 ++++----
 141 files changed, 138 insertions(+), 246 deletions(-)
 create mode 100644 demo/modules/org.argeo.slc.demo.ant/bnd.bnd
 create mode 100644 demo/modules/org.argeo.slc.demo.basic/bnd.bnd
 create mode 100644 demo/modules/org.argeo.slc.demo.minimal/bnd.bnd
 create mode 100644 dep/org.argeo.slc.dep.eclipse/bnd.bnd
 create mode 100644 dep/org.argeo.slc.dep.rap/bnd.bnd
 create mode 100644 dep/org.argeo.slc.dep.rcp/bnd.bnd
 create mode 100644 org.argeo.slc.client.rap/bnd.bnd
 rename org.argeo.slc.client.rap/src/{main/java => }/org/argeo/slc/client/rap/OpenJcrFileService.java (89%)
 rename org.argeo.slc.client.rap/src/{main/java => }/org/argeo/slc/client/rap/SlcRapPlugin.java (100%)
 rename org.argeo.slc.client.rap/src/{main/java => }/org/argeo/slc/client/rap/SlcSecureRap.java (100%)
 rename org.argeo.slc.client.rap/src/{main/java => }/org/argeo/slc/client/ui/specific/OpenJcrFile.java (94%)
 rename org.argeo.slc.client.rap/src/{main/java => }/org/argeo/slc/client/ui/specific/OpenJcrFileCmdId.java (100%)
 create mode 100644 org.argeo.slc.client.ui.dist/bnd.bnd
 rename org.argeo.slc.client.ui.dist/src/{main/java => }/org/argeo/slc/client/ui/dist/AnonymousDistributionPerspective.java (100%)
 rename org.argeo.slc.client.ui.dist/src/{main/java => }/org/argeo/slc/client/ui/dist/DistConstants.java (100%)
 rename org.argeo.slc.client.ui.dist/src/{main/java => }/org/argeo/slc/client/ui/dist/DistImages.java (100%)
 rename org.argeo.slc.client.ui.dist/src/{main/java => }/org/argeo/slc/client/ui/dist/DistLabels.java (100%)
 rename org.argeo.slc.client.ui.dist/src/{main/java => }/org/argeo/slc/client/ui/dist/DistPlugin.java (100%)
 rename org.argeo.slc.client.ui.dist/src/{main/java => }/org/argeo/slc/client/ui/dist/DistributionPerspective.java (100%)
 rename org.argeo.slc.client.ui.dist/src/{main/java => }/org/argeo/slc/client/ui/dist/PrivilegedJob.java (89%)
 rename org.argeo.slc.client.ui.dist/src/{main/java => }/org/argeo/slc/client/ui/dist/commands/BndProcess.java (100%)
 rename org.argeo.slc.client.ui.dist/src/{main/java => }/org/argeo/slc/client/ui/dist/commands/CopyLocalJavaWorkspace.java (100%)
 rename org.argeo.slc.client.ui.dist/src/{main/java => }/org/argeo/slc/client/ui/dist/commands/CopyWorkspace.java (100%)
 rename org.argeo.slc.client.ui.dist/src/{main/java => }/org/argeo/slc/client/ui/dist/commands/CreateLocalJavaWorkspace.java (98%)
 rename org.argeo.slc.client.ui.dist/src/{main/java => }/org/argeo/slc/client/ui/dist/commands/CreateWorkspace.java (98%)
 rename org.argeo.slc.client.ui.dist/src/{main/java => }/org/argeo/slc/client/ui/dist/commands/DeleteArtifacts.java (100%)
 rename org.argeo.slc.client.ui.dist/src/{main/java => }/org/argeo/slc/client/ui/dist/commands/DeleteWorkspace.java (100%)
 rename org.argeo.slc.client.ui.dist/src/{main/java => }/org/argeo/slc/client/ui/dist/commands/DisplayRepoInformation.java (100%)
 rename org.argeo.slc.client.ui.dist/src/{main/java => }/org/argeo/slc/client/ui/dist/commands/DoNothing.java (100%)
 rename org.argeo.slc.client.ui.dist/src/{main/java => }/org/argeo/slc/client/ui/dist/commands/Fetch.java (100%)
 rename org.argeo.slc.client.ui.dist/src/{main/java => }/org/argeo/slc/client/ui/dist/commands/ManageWorkspaceAuth.java (100%)
 rename org.argeo.slc.client.ui.dist/src/{main/java => }/org/argeo/slc/client/ui/dist/commands/MergeWorkspaces.java (100%)
 rename org.argeo.slc.client.ui.dist/src/{main/java => }/org/argeo/slc/client/ui/dist/commands/NormalizeDistribution.java (99%)
 rename org.argeo.slc.client.ui.dist/src/{main/java => }/org/argeo/slc/client/ui/dist/commands/NormalizeWorkspace.java (100%)
 rename org.argeo.slc.client.ui.dist/src/{main/java => }/org/argeo/slc/client/ui/dist/commands/OpenGenerateBinariesWizard.java (100%)
 rename org.argeo.slc.client.ui.dist/src/{main/java => }/org/argeo/slc/client/ui/dist/commands/OpenModuleEditor.java (100%)
 rename org.argeo.slc.client.ui.dist/src/{main/java => }/org/argeo/slc/client/ui/dist/commands/OpenWorkspaceEditor.java (100%)
 rename org.argeo.slc.client.ui.dist/src/{main/java => }/org/argeo/slc/client/ui/dist/commands/PublishWorkspace.java (100%)
 rename org.argeo.slc.client.ui.dist/src/{main/java => }/org/argeo/slc/client/ui/dist/commands/RefreshArtifactBrowser.java (100%)
 rename org.argeo.slc.client.ui.dist/src/{main/java => }/org/argeo/slc/client/ui/dist/commands/RefreshDistributionsView.java (100%)
 rename org.argeo.slc.client.ui.dist/src/{main/java => }/org/argeo/slc/client/ui/dist/commands/RegisterRepository.java (100%)
 rename org.argeo.slc.client.ui.dist/src/{main/java => }/org/argeo/slc/client/ui/dist/commands/RunInOsgi.java (99%)
 rename org.argeo.slc.client.ui.dist/src/{main/java => }/org/argeo/slc/client/ui/dist/commands/ShowSizeColumn.java (100%)
 rename org.argeo.slc.client.ui.dist/src/{main/java => }/org/argeo/slc/client/ui/dist/commands/UnregisterRemoteRepo.java (98%)
 rename org.argeo.slc.client.ui.dist/src/{main/java => }/org/argeo/slc/client/ui/dist/commands/package.html (100%)
 rename org.argeo.slc.client.ui.dist/src/{main/java => }/org/argeo/slc/client/ui/dist/controllers/AnonymousDistTreeContentProvider.java (100%)
 rename org.argeo.slc.client.ui.dist/src/{main/java => }/org/argeo/slc/client/ui/dist/controllers/ArtifactLabelProvider.java (100%)
 rename org.argeo.slc.client.ui.dist/src/{main/java => }/org/argeo/slc/client/ui/dist/controllers/ArtifactsTreeContentProvider.java (100%)
 rename org.argeo.slc.client.ui.dist/src/{main/java => }/org/argeo/slc/client/ui/dist/controllers/DistSessionFactory.java (100%)
 rename org.argeo.slc.client.ui.dist/src/{main/java => }/org/argeo/slc/client/ui/dist/controllers/DistTreeComparator.java (100%)
 rename org.argeo.slc.client.ui.dist/src/{main/java => }/org/argeo/slc/client/ui/dist/controllers/DistTreeComparer.java (100%)
 rename org.argeo.slc.client.ui.dist/src/{main/java => }/org/argeo/slc/client/ui/dist/controllers/DistTreeContentProvider.java (100%)
 rename org.argeo.slc.client.ui.dist/src/{main/java => }/org/argeo/slc/client/ui/dist/controllers/DistTreeDoubleClickListener.java (98%)
 rename org.argeo.slc.client.ui.dist/src/{main/java => }/org/argeo/slc/client/ui/dist/controllers/DistTreeLabelProvider.java (100%)
 rename org.argeo.slc.client.ui.dist/src/{main/java => }/org/argeo/slc/client/ui/dist/editors/ArtifactVersionEditor.java (100%)
 rename org.argeo.slc.client.ui.dist/src/{main/java => }/org/argeo/slc/client/ui/dist/editors/BundleDependencyPage.java (99%)
 rename org.argeo.slc.client.ui.dist/src/{main/java => }/org/argeo/slc/client/ui/dist/editors/BundleDetailPage.java (99%)
 rename org.argeo.slc.client.ui.dist/src/{main/java => }/org/argeo/slc/client/ui/dist/editors/BundleRawPage.java (100%)
 rename org.argeo.slc.client.ui.dist/src/{main/java => }/org/argeo/slc/client/ui/dist/editors/DistWkspBrowserPage.java (99%)
 rename org.argeo.slc.client.ui.dist/src/{main/java => }/org/argeo/slc/client/ui/dist/editors/DistWkspEditorInput.java (100%)
 rename org.argeo.slc.client.ui.dist/src/{main/java => }/org/argeo/slc/client/ui/dist/editors/DistWkspSearchPage.java (99%)
 rename org.argeo.slc.client.ui.dist/src/{main/java => }/org/argeo/slc/client/ui/dist/editors/DistWorkspaceEditor.java (100%)
 rename org.argeo.slc.client.ui.dist/src/{main/java => }/org/argeo/slc/client/ui/dist/editors/ModularDistVersionDetailPage.java (100%)
 rename org.argeo.slc.client.ui.dist/src/{main/java => }/org/argeo/slc/client/ui/dist/editors/ModularDistVersionEditor.java (100%)
 rename org.argeo.slc.client.ui.dist/src/{main/java => }/org/argeo/slc/client/ui/dist/editors/ModularDistVersionOverviewPage.java (99%)
 rename org.argeo.slc.client.ui.dist/src/{main/java => }/org/argeo/slc/client/ui/dist/editors/ModuleEditorInput.java (100%)
 rename org.argeo.slc.client.ui.dist/src/{main/java => }/org/argeo/slc/client/ui/dist/editors/RunInOsgiPage.java (100%)
 rename org.argeo.slc.client.ui.dist/src/{main/java => }/org/argeo/slc/client/ui/dist/editors/WkspCategoryBaseListPage.java (99%)
 rename org.argeo.slc.client.ui.dist/src/{main/java => }/org/argeo/slc/client/ui/dist/model/DistParentElem.java (100%)
 rename org.argeo.slc.client.ui.dist/src/{main/java => }/org/argeo/slc/client/ui/dist/model/GroupBaseElem.java (100%)
 rename org.argeo.slc.client.ui.dist/src/{main/java => }/org/argeo/slc/client/ui/dist/model/ModularDistVersionBaseElem.java (100%)
 rename org.argeo.slc.client.ui.dist/src/{main/java => }/org/argeo/slc/client/ui/dist/model/ModularDistVersionElem.java (100%)
 rename org.argeo.slc.client.ui.dist/src/{main/java => }/org/argeo/slc/client/ui/dist/model/RepoElem.java (100%)
 rename org.argeo.slc.client.ui.dist/src/{main/java => }/org/argeo/slc/client/ui/dist/model/WkspGroupElem.java (100%)
 rename org.argeo.slc.client.ui.dist/src/{main/java => }/org/argeo/slc/client/ui/dist/model/WorkspaceElem.java (100%)
 rename org.argeo.slc.client.ui.dist/src/{main/java => }/org/argeo/slc/client/ui/dist/utils/AbstractHyperlinkListener.java (100%)
 rename org.argeo.slc.client.ui.dist/src/{main/java => }/org/argeo/slc/client/ui/dist/utils/ArtifactsTableConfigurer.java (100%)
 rename org.argeo.slc.client.ui.dist/src/{main/java => }/org/argeo/slc/client/ui/dist/utils/CommandHelpers.java (100%)
 rename org.argeo.slc.client.ui.dist/src/{main/java => }/org/argeo/slc/client/ui/dist/utils/DistNodeViewerComparator.java (100%)
 rename org.argeo.slc.client.ui.dist/src/{main/java => }/org/argeo/slc/client/ui/dist/utils/DistUiHelpers.java (100%)
 rename org.argeo.slc.client.ui.dist/src/{main/java => }/org/argeo/slc/client/ui/dist/utils/NameVersionComparator.java (100%)
 rename org.argeo.slc.client.ui.dist/src/{main/java => }/org/argeo/slc/client/ui/dist/utils/VersionComparator.java (100%)
 rename org.argeo.slc.client.ui.dist/src/{main/java => }/org/argeo/slc/client/ui/dist/utils/ViewerUtils.java (100%)
 rename org.argeo.slc.client.ui.dist/src/{main/java => }/org/argeo/slc/client/ui/dist/views/AbstractQueryArtifactsView.java (100%)
 rename org.argeo.slc.client.ui.dist/src/{main/java => }/org/argeo/slc/client/ui/dist/views/AnonymousDistributionsView.java (100%)
 rename org.argeo.slc.client.ui.dist/src/{main/java => }/org/argeo/slc/client/ui/dist/views/ArtifactsBrowser.java (100%)
 rename org.argeo.slc.client.ui.dist/src/{main/java => }/org/argeo/slc/client/ui/dist/views/DistributionsView.java (99%)
 rename org.argeo.slc.client.ui.dist/src/{main/java => }/org/argeo/slc/client/ui/dist/views/HelpView.java (100%)
 rename org.argeo.slc.client.ui.dist/src/{main/java => }/org/argeo/slc/client/ui/dist/views/QueryArtifactsForm.java (100%)
 rename org.argeo.slc.client.ui.dist/src/{main/java => }/org/argeo/slc/client/ui/dist/views/QueryArtifactsText.java (100%)
 rename org.argeo.slc.client.ui.dist/src/{main/java => }/org/argeo/slc/client/ui/dist/views/QueryBundlesForm.java (100%)
 rename org.argeo.slc.client.ui.dist/src/{main/java => }/org/argeo/slc/client/ui/dist/wizards/ChangeRightsWizard.java (100%)
 rename org.argeo.slc.client.ui.dist/src/{main/java => }/org/argeo/slc/client/ui/dist/wizards/ChooseRightsPage.java (100%)
 rename org.argeo.slc.client.ui.dist/src/{main/java => }/org/argeo/slc/client/ui/dist/wizards/FetchWizard.java (100%)
 rename org.argeo.slc.client.ui.dist/src/{main/java => }/org/argeo/slc/client/ui/dist/wizards/GenerateBinariesWizard.java (99%)
 rename org.argeo.slc.client.ui.dist/src/{main/java => }/org/argeo/slc/client/ui/dist/wizards/RegisterRepoWizard.java (99%)
 create mode 100644 org.argeo.slc.client.ui/bnd.bnd
 rename org.argeo.slc.client.ui/src/{main/java => }/org/argeo/slc/client/ui/ClientUiPlugin.java (100%)
 rename org.argeo.slc.client.ui/src/{main/java => }/org/argeo/slc/client/ui/SlcExecutionPerspective.java (100%)
 rename org.argeo.slc.client.ui/src/{main/java => }/org/argeo/slc/client/ui/SlcImages.java (100%)
 rename org.argeo.slc.client.ui/src/{main/java => }/org/argeo/slc/client/ui/SlcUiConstants.java (100%)
 rename org.argeo.slc.client.ui/src/{main/java => }/org/argeo/slc/client/ui/commands/AddResultFolder.java (98%)
 rename org.argeo.slc.client.ui/src/{main/java => }/org/argeo/slc/client/ui/commands/DeleteItems.java (100%)
 rename org.argeo.slc.client.ui/src/{main/java => }/org/argeo/slc/client/ui/commands/RefreshJcrResultTreeView.java (100%)
 rename org.argeo.slc.client.ui/src/{main/java => }/org/argeo/slc/client/ui/commands/RenameResultFolder.java (100%)
 rename org.argeo.slc.client.ui/src/{main/java => }/org/argeo/slc/client/ui/commands/RenameResultNode.java (100%)
 rename org.argeo.slc.client.ui/src/{main/java => }/org/argeo/slc/client/ui/commands/RunSlcFlow.java (100%)
 rename org.argeo.slc.client.ui/src/{main/java => }/org/argeo/slc/client/ui/commands/UpdateModule.java (100%)
 rename org.argeo.slc.client.ui/src/{main/java => }/org/argeo/slc/client/ui/controllers/ProcessController.java (100%)
 rename org.argeo.slc.client.ui/src/{main/java => }/org/argeo/slc/client/ui/decorators/ResultFailedDecorator.java (100%)
 rename org.argeo.slc.client.ui/src/{main/java => }/org/argeo/slc/client/ui/editors/ProcessBuilderPage.java (100%)
 rename org.argeo.slc.client.ui/src/{main/java => }/org/argeo/slc/client/ui/editors/ProcessEditor.java (99%)
 rename org.argeo.slc.client.ui/src/{main/java => }/org/argeo/slc/client/ui/editors/ProcessEditorInput.java (100%)
 rename org.argeo.slc.client.ui/src/{main/java => }/org/argeo/slc/client/ui/editors/ProcessEditorInputFactory.java (100%)
 rename org.argeo.slc.client.ui/src/{main/java => }/org/argeo/slc/client/ui/editors/ProcessLogPage.java (100%)
 rename org.argeo.slc.client.ui/src/{main/java => }/org/argeo/slc/client/ui/model/ParentNodeFolder.java (100%)
 rename org.argeo.slc.client.ui/src/{main/java => }/org/argeo/slc/client/ui/model/ResultFolder.java (100%)
 rename org.argeo.slc.client.ui/src/{main/java => }/org/argeo/slc/client/ui/model/ResultItemsComparator.java (100%)
 rename org.argeo.slc.client.ui/src/{main/java => }/org/argeo/slc/client/ui/model/ResultItemsComparer.java (100%)
 rename org.argeo.slc.client.ui/src/{main/java => }/org/argeo/slc/client/ui/model/ResultParent.java (100%)
 rename org.argeo.slc.client.ui/src/{main/java => }/org/argeo/slc/client/ui/model/ResultParentUtils.java (100%)
 rename org.argeo.slc.client.ui/src/{main/java => }/org/argeo/slc/client/ui/model/SingleResultNode.java (100%)
 rename org.argeo.slc.client.ui/src/{main/java => }/org/argeo/slc/client/ui/model/VirtualFolder.java (100%)
 rename org.argeo.slc.client.ui/src/{main/java => }/org/argeo/slc/client/ui/providers/ResultTreeContentProvider.java (100%)
 rename org.argeo.slc.client.ui/src/{main/java => }/org/argeo/slc/client/ui/providers/ResultTreeLabelProvider.java (100%)
 rename org.argeo.slc.client.ui/src/{main/java => }/org/argeo/slc/client/ui/views/JcrExecutionModulesView.java (100%)
 rename org.argeo.slc.client.ui/src/{main/java => }/org/argeo/slc/client/ui/views/JcrProcessListView.java (100%)
 rename org.argeo.slc.client.ui/src/{main/java => }/org/argeo/slc/client/ui/views/JcrResultListView.java (100%)
 rename org.argeo.slc.client.ui/src/{main/java => }/org/argeo/slc/client/ui/views/JcrResultTreeView.java (96%)
 rename org.argeo.slc.client.ui/src/{main/java => }/org/argeo/slc/client/ui/wizards/ConfirmOverwriteWizard.java (100%)

diff --git a/demo/modules/org.argeo.slc.demo.ant/bnd.bnd b/demo/modules/org.argeo.slc.demo.ant/bnd.bnd
new file mode 100644
index 000000000..e69de29bb
diff --git a/demo/modules/org.argeo.slc.demo.basic/bnd.bnd b/demo/modules/org.argeo.slc.demo.basic/bnd.bnd
new file mode 100644
index 000000000..e69de29bb
diff --git a/demo/modules/org.argeo.slc.demo.minimal/bnd.bnd b/demo/modules/org.argeo.slc.demo.minimal/bnd.bnd
new file mode 100644
index 000000000..e69de29bb
diff --git a/demo/modules/pom.xml b/demo/modules/pom.xml
index 7683e7722..442d5056a 100644
--- a/demo/modules/pom.xml
+++ b/demo/modules/pom.xml
@@ -1,4 +1,5 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.argeo.slc</groupId>
@@ -13,9 +14,9 @@
 	<modules>
 		<module>org.argeo.slc.demo.ant</module>
 		<module>org.argeo.slc.demo.basic</module>
-		<module>org.argeo.slc.demo.det</module>
-		<module>org.argeo.slc.demo.detached</module>
-		<module>org.argeo.slc.demo.maven</module>
+		<!-- <module>org.argeo.slc.demo.det</module> -->
+		<!-- <module>org.argeo.slc.demo.detached</module> -->
+		<!-- <module>org.argeo.slc.demo.maven</module> -->
 		<module>org.argeo.slc.demo.minimal</module>
 	</modules>
 	<properties>
@@ -25,20 +26,6 @@
 		</additionalImports.slc-lib>
 	</properties>
 	<build>
-		<resources>
-			<resource>
-				<directory>.</directory>
-				<includes>
-					<include>**</include>
-				</includes>
-				<excludes>
-					<exclude>.*</exclude>
-					<exclude>.*/**</exclude>
-					<exclude>pom.xml</exclude>
-					<exclude>build.properties</exclude>
-				</excludes>
-			</resource>
-		</resources>
 		<plugins>
 			<plugin>
 				<groupId>org.apache.felix</groupId>
@@ -48,7 +35,6 @@
 						<SLC-ExecutionModule>default</SLC-ExecutionModule>
 						<!-- Minimal imports + some optional convenience imports -->
 						<Import-Package>
-							*,
 							net.sf.cglib.core,
 							net.sf.cglib.proxy,
 							net.sf.cglib.reflect,
@@ -63,7 +49,8 @@
 							org.springframework.aop.scope,
 							org.springframework.beans.factory.config,
 							org.springframework.core.io,
-							${additionalImports.slc-lib}
+							${additionalImports.slc-lib},
+							*
 						</Import-Package>
 					</instructions>
 				</configuration>
diff --git a/dep/org.argeo.slc.dep.eclipse/bnd.bnd b/dep/org.argeo.slc.dep.eclipse/bnd.bnd
new file mode 100644
index 000000000..e69de29bb
diff --git a/dep/org.argeo.slc.dep.eclipse/pom.xml b/dep/org.argeo.slc.dep.eclipse/pom.xml
index 36c0075f2..a2de2acb5 100644
--- a/dep/org.argeo.slc.dep.eclipse/pom.xml
+++ b/dep/org.argeo.slc.dep.eclipse/pom.xml
@@ -31,11 +31,11 @@
 			<artifactId>org.argeo.slc.client.ui</artifactId>
 			<version>2.1.1-SNAPSHOT</version>
 		</dependency>
-		<dependency>
-			<groupId>org.argeo.slc</groupId>
-			<artifactId>org.argeo.slc.client.ui.dist</artifactId>
-			<version>2.1.1-SNAPSHOT</version>
-		</dependency>
+<!-- 		<dependency> -->
+<!-- 			<groupId>org.argeo.slc</groupId> -->
+<!-- 			<artifactId>org.argeo.slc.client.ui.dist</artifactId> -->
+<!-- 			<version>2.1.1-SNAPSHOT</version> -->
+<!-- 		</dependency> -->
 
 		<!-- Back-end Dependencies -->
 		<dependency>
diff --git a/dep/org.argeo.slc.dep.rap/bnd.bnd b/dep/org.argeo.slc.dep.rap/bnd.bnd
new file mode 100644
index 000000000..e69de29bb
diff --git a/dep/org.argeo.slc.dep.rap/pom.xml b/dep/org.argeo.slc.dep.rap/pom.xml
index 1112f70e2..0f68a548c 100644
--- a/dep/org.argeo.slc.dep.rap/pom.xml
+++ b/dep/org.argeo.slc.dep.rap/pom.xml
@@ -1,4 +1,5 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.argeo.slc</groupId>
@@ -48,7 +49,7 @@
 
 		<!-- Secure Application -->
 		<dependency>
-			<groupId>org.argeo.commons.security</groupId>
+			<groupId>org.argeo.commons</groupId>
 			<artifactId>org.argeo.security.dep.node.rap</artifactId>
 			<version>${version.argeo-commons}</version>
 		</dependency>
@@ -60,12 +61,12 @@
 			<version>2.1.1-SNAPSHOT</version>
 			<scope>test</scope>
 		</dependency>
-		<dependency>
-			<groupId>org.argeo.slc</groupId>
-			<artifactId>org.argeo.slc.support.maven</artifactId>
-			<version>2.1.1-SNAPSHOT</version>
-			<scope>test</scope>
-		</dependency>
+		<!-- <dependency> -->
+		<!-- <groupId>org.argeo.slc</groupId> -->
+		<!-- <artifactId>org.argeo.slc.support.maven</artifactId> -->
+		<!-- <version>2.1.1-SNAPSHOT</version> -->
+		<!-- <scope>test</scope> -->
+		<!-- </dependency> -->
 	</dependencies>
 	<profiles>
 		<profile>
@@ -140,7 +141,8 @@
 								<configuration>
 									<target>
 										<copy todir="${rpm.stagingRepository}" verbose="true">
-											<fileset dir="${project.build.directory}/rpm" includes="*/RPMS/**/*.rpm" />
+											<fileset dir="${project.build.directory}/rpm"
+												includes="*/RPMS/**/*.rpm" />
 											<flattenmapper />
 										</copy>
 									</target>
diff --git a/dep/org.argeo.slc.dep.rcp/bnd.bnd b/dep/org.argeo.slc.dep.rcp/bnd.bnd
new file mode 100644
index 000000000..e69de29bb
diff --git a/dep/org.argeo.slc.dep.rcp/pom.xml b/dep/org.argeo.slc.dep.rcp/pom.xml
index 2f4d26180..beef1ea53 100644
--- a/dep/org.argeo.slc.dep.rcp/pom.xml
+++ b/dep/org.argeo.slc.dep.rcp/pom.xml
@@ -49,7 +49,7 @@
 
 		<!-- Secure Application -->
 		<dependency>
-			<groupId>org.argeo.commons.security</groupId>
+			<groupId>org.argeo.commons</groupId>
 			<artifactId>org.argeo.security.dep.node.rcp</artifactId>
 			<version>${version.argeo-commons}</version>
 		</dependency>
diff --git a/dep/pom.xml b/dep/pom.xml
index 828867443..e6c33b168 100644
--- a/dep/pom.xml
+++ b/dep/pom.xml
@@ -1,4 +1,5 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.argeo.slc</groupId>
@@ -12,9 +13,9 @@
 	<modules>
 		<module>org.argeo.slc.dep.minimal</module>
 		<module>org.argeo.slc.dep.backend</module>
-<!-- 		<module>org.argeo.slc.dep.eclipse</module> -->
-<!-- 		<module>org.argeo.slc.dep.rcp</module> -->
-<!-- 		<module>org.argeo.slc.dep.rap</module> -->
+		<module>org.argeo.slc.dep.eclipse</module>
+		<module>org.argeo.slc.dep.rap</module>
+		<!-- <module>org.argeo.slc.dep.rcp</module> -->
 	</modules>
 	<build>
 		<plugins>
@@ -39,8 +40,10 @@
 								</goals>
 								<configuration>
 									<target>
-										<copy todir="${rpm.stagingRepository}" verbose="true" failonerror="false">
-											<fileset dir="${project.build.directory}/rpm" includes="*/RPMS/**/*.rpm" />
+										<copy todir="${rpm.stagingRepository}" verbose="true"
+											failonerror="false">
+											<fileset dir="${project.build.directory}/rpm"
+												includes="*/RPMS/**/*.rpm" />
 											<flattenmapper />
 										</copy>
 									</target>
diff --git a/org.argeo.slc.client.rap/bnd.bnd b/org.argeo.slc.client.rap/bnd.bnd
new file mode 100644
index 000000000..37cffce2e
--- /dev/null
+++ b/org.argeo.slc.client.rap/bnd.bnd
@@ -0,0 +1,11 @@
+Bundle-SymbolicName: org.argeo.slc.client.rap;singleton=true
+Bundle-ActivationPolicy: lazy
+
+Bundle-Activator: org.argeo.slc.client.rap.SlcRapPlugin
+Import-Package: javax.jcr.nodetype,\
+javax.servlet,\
+javax.servlet.http,\
+org.argeo.eclipse.spring,\
+org.argeo.slc.repo.core,\
+*
+							
\ No newline at end of file
diff --git a/org.argeo.slc.client.rap/pom.xml b/org.argeo.slc.client.rap/pom.xml
index a063ff5ad..132283a07 100644
--- a/org.argeo.slc.client.rap/pom.xml
+++ b/org.argeo.slc.client.rap/pom.xml
@@ -1,36 +1,15 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.argeo.slc</groupId>
-		<artifactId>plugins</artifactId>
+		<artifactId>argeo-slc</artifactId>
 		<version>2.1.1-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>org.argeo.slc.client.rap</artifactId>
 	<name>SLC Client RAP</name>
 	<packaging>jar</packaging>
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.apache.felix</groupId>
-				<artifactId>maven-bundle-plugin</artifactId>
-				<configuration>
-					<instructions>
-						<Bundle-Activator>org.argeo.slc.client.rap.SlcRapPlugin</Bundle-Activator>
-						<Require-Bundle>org.eclipse.rap.ui;resolution:=optional</Require-Bundle>
-						<Import-Package>
-							javax.jcr.nodetype,
-							javax.servlet,
-							javax.servlet.http,
-							org.argeo.eclipse.spring,
-							org.argeo.slc.repo.core,
-							*
-						</Import-Package>
-					</instructions>
-				</configuration>
-			</plugin>
-		</plugins>
-	</build>
 	<dependencies>
 		<!-- SLC -->
 		<dependency>
@@ -39,30 +18,9 @@
 			<version>2.1.1-SNAPSHOT</version>
 		</dependency>
 
-		<!-- Argeo common distribution for RAP projects -->
-		<dependency>
-			<groupId>org.argeo.commons.base</groupId>
-			<artifactId>org.argeo.eclipse.dep.rap</artifactId>
-			<version>${version.argeo-commons}</version>
-			<exclusions>
-				<exclusion>
-					<groupId>org.mortbay.jetty</groupId>
-					<artifactId>org.mortbay.jetty.server</artifactId>
-				</exclusion>
-				<exclusion>
-					<groupId>org.mortbay.jetty</groupId>
-					<artifactId>org.mortbay.jetty.server.util</artifactId>
-				</exclusion>
-				<exclusion>
-					<groupId>org.eclipse.equinox</groupId>
-					<artifactId>org.eclipse.equinox.http.jetty</artifactId>
-				</exclusion>
-			</exclusions>
-		</dependency>
-
 		<!-- Argeo common distribution for Secured UI -->
 		<dependency>
-			<groupId>org.argeo.commons.security</groupId>
+			<groupId>org.argeo.commons</groupId>
 			<artifactId>org.argeo.security.ui.rap</artifactId>
 			<version>${version.argeo-commons}</version>
 		</dependency>
diff --git a/org.argeo.slc.client.rap/src/main/java/org/argeo/slc/client/rap/OpenJcrFileService.java b/org.argeo.slc.client.rap/src/org/argeo/slc/client/rap/OpenJcrFileService.java
similarity index 89%
rename from org.argeo.slc.client.rap/src/main/java/org/argeo/slc/client/rap/OpenJcrFileService.java
rename to org.argeo.slc.client.rap/src/org/argeo/slc/client/rap/OpenJcrFileService.java
index a4dfaf42c..1830e4079 100644
--- a/org.argeo.slc.client.rap/src/main/java/org/argeo/slc/client/rap/OpenJcrFileService.java
+++ b/org.argeo.slc.client.rap/src/org/argeo/slc/client/rap/OpenJcrFileService.java
@@ -10,12 +10,13 @@ import javax.jcr.Session;
 import javax.jcr.nodetype.NodeType;
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpServletRequest;
 
 import org.apache.commons.io.IOUtils;
 import org.argeo.jcr.JcrUtils;
 import org.argeo.slc.SlcException;
-import org.eclipse.rwt.RWT;
-import org.eclipse.rwt.service.IServiceHandler;
+import org.eclipse.rap.rwt.RWT;
+import org.eclipse.rap.rwt.service.IServiceHandler;
 
 /**
  * Basic Default service handler that retrieves a file from a NT_FILE JCR node
@@ -30,12 +31,12 @@ public class OpenJcrFileService implements IServiceHandler {
 		this.fileNode = fileNode;
 	}
 
-	public void service() throws IOException, ServletException {
+	public void service(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException {
 		// Get the file content
 		byte[] download = getFileAsByteArray();
 
 		// Send the file in the response
-		HttpServletResponse response = RWT.getResponse();
+		//HttpServletResponse response = RWT.getResponse();
 		response.setContentType("application/octet-stream");
 		response.setContentLength(download.length);
 		String contentDisposition = null;
diff --git a/org.argeo.slc.client.rap/src/main/java/org/argeo/slc/client/rap/SlcRapPlugin.java b/org.argeo.slc.client.rap/src/org/argeo/slc/client/rap/SlcRapPlugin.java
similarity index 100%
rename from org.argeo.slc.client.rap/src/main/java/org/argeo/slc/client/rap/SlcRapPlugin.java
rename to org.argeo.slc.client.rap/src/org/argeo/slc/client/rap/SlcRapPlugin.java
diff --git a/org.argeo.slc.client.rap/src/main/java/org/argeo/slc/client/rap/SlcSecureRap.java b/org.argeo.slc.client.rap/src/org/argeo/slc/client/rap/SlcSecureRap.java
similarity index 100%
rename from org.argeo.slc.client.rap/src/main/java/org/argeo/slc/client/rap/SlcSecureRap.java
rename to org.argeo.slc.client.rap/src/org/argeo/slc/client/rap/SlcSecureRap.java
diff --git a/org.argeo.slc.client.rap/src/main/java/org/argeo/slc/client/ui/specific/OpenJcrFile.java b/org.argeo.slc.client.rap/src/org/argeo/slc/client/ui/specific/OpenJcrFile.java
similarity index 94%
rename from org.argeo.slc.client.rap/src/main/java/org/argeo/slc/client/ui/specific/OpenJcrFile.java
rename to org.argeo.slc.client.rap/src/org/argeo/slc/client/ui/specific/OpenJcrFile.java
index 6c971c119..2bfc5588e 100644
--- a/org.argeo.slc.client.rap/src/main/java/org/argeo/slc/client/ui/specific/OpenJcrFile.java
+++ b/org.argeo.slc.client.rap/src/org/argeo/slc/client/ui/specific/OpenJcrFile.java
@@ -28,9 +28,9 @@ import org.argeo.slc.repo.RepoService;
 import org.eclipse.core.commands.AbstractHandler;
 import org.eclipse.core.commands.ExecutionEvent;
 import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.rwt.RWT;
-import org.eclipse.rwt.service.IServiceHandler;
-import org.eclipse.rwt.service.IServiceManager;
+import org.eclipse.rap.rwt.RWT;
+import org.eclipse.rap.rwt.service.IServiceHandler;
+import org.eclipse.rap.rwt.service.IServiceManager;
 import org.eclipse.ui.PlatformUI;
 
 /**
@@ -102,7 +102,8 @@ public class OpenJcrFile extends AbstractHandler {
 
 		StringBuilder params = new StringBuilder();
 		params.append("?");
-		params.append(IServiceHandler.REQUEST_PARAM).append("=");
+		// FIXME commented out so that it builds
+		//params.append(IServiceHandler.REQUEST_PARAM).append("=");
 		params.append(serviceId);
 		String encodedURL = RWT.getResponse().encodeURL(params.toString());
 		url.append(encodedURL);
diff --git a/org.argeo.slc.client.rap/src/main/java/org/argeo/slc/client/ui/specific/OpenJcrFileCmdId.java b/org.argeo.slc.client.rap/src/org/argeo/slc/client/ui/specific/OpenJcrFileCmdId.java
similarity index 100%
rename from org.argeo.slc.client.rap/src/main/java/org/argeo/slc/client/ui/specific/OpenJcrFileCmdId.java
rename to org.argeo.slc.client.rap/src/org/argeo/slc/client/ui/specific/OpenJcrFileCmdId.java
diff --git a/org.argeo.slc.client.ui.dist/bnd.bnd b/org.argeo.slc.client.ui.dist/bnd.bnd
new file mode 100644
index 000000000..9ecad5935
--- /dev/null
+++ b/org.argeo.slc.client.ui.dist/bnd.bnd
@@ -0,0 +1,12 @@
+Bundle-SymbolicName: org.argeo.slc.client.ui.distp;singleton=true
+Bundle-ActivationPolicy: lazy
+Require-Bundle: org.eclipse.ui;resolution:=optional
+
+Bundle-Activator: org.argeo.slc.client.ui.dist.DistPlugin
+Import-Package: org.argeo.eclipse.spring,\
+javax.jcr.nodetype,\
+javax.jcr.security,\
+aQute.lib.*;resolution:=optional,\
+org.argeo.slc.client.ui.specific,\
+*
+							
\ No newline at end of file
diff --git a/org.argeo.slc.client.ui.dist/pom.xml b/org.argeo.slc.client.ui.dist/pom.xml
index 2225b17be..abcdeb80c 100644
--- a/org.argeo.slc.client.ui.dist/pom.xml
+++ b/org.argeo.slc.client.ui.dist/pom.xml
@@ -3,72 +3,30 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.argeo.slc</groupId>
-		<artifactId>plugins</artifactId>
+		<artifactId>argeo-slc</artifactId>
 		<version>2.1.1-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>org.argeo.slc.client.ui.dist</artifactId>
 	<name>SLC Client UI Distribution</name>
 	<packaging>jar</packaging>
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.apache.felix</groupId>
-				<artifactId>maven-bundle-plugin</artifactId>
-				<configuration>
-					<instructions>
-						<Bundle-Activator>org.argeo.slc.client.ui.dist.DistPlugin</Bundle-Activator>
-						<Require-Bundle>
-							org.eclipse.ui;resolution:=optional,
-							org.eclipse.rap.ui;resolution:=optional,
-							org.eclipse.core.runtime;resolution:=optional,
-							org.eclipse.rap.ui.workbench;resolution:=optional
- 						</Require-Bundle>
-						<Import-Package>
-							org.argeo.eclipse.spring,
-							javax.jcr.nodetype,
-							javax.jcr.security,
-							aQute.lib.*;resolution:=optional,
-							org.argeo.slc.client.ui.specific,
-							*
-						</Import-Package>
-					</instructions>
-				</configuration>
-			</plugin>
-		</plugins>
-	</build>
 	<dependencies>
-	
-		<!-- Single sourcing - we build against RCP  -->
-		<dependency>
-			<groupId>org.argeo.slc</groupId>
-			<artifactId>org.argeo.slc.client.rcp</artifactId>
-			<version>2.1.1-SNAPSHOT</version>
-			<scope>provided</scope>
-		</dependency>
-		
 		<!-- Commons UI -->
 		<dependency>
-			<groupId>org.argeo.commons.base</groupId>
+			<groupId>org.argeo.commons</groupId>
 			<artifactId>org.argeo.eclipse.ui</artifactId>
 			<version>${version.argeo-commons}</version>
 		</dependency>
 		<dependency>
-			<groupId>org.argeo.commons.base</groupId>
-			<artifactId>org.argeo.eclipse.ui.jcr</artifactId>
+			<groupId>org.argeo.commons</groupId>
+			<artifactId>org.argeo.eclipse.ui.workbench</artifactId>
 			<version>${version.argeo-commons}</version>
 		</dependency>
-		<dependency>
-			<groupId>org.argeo.commons.base</groupId>
-			<artifactId>org.argeo.eclipse.ui.rcp</artifactId>
-			<version>${version.argeo-commons}</version>
-			<scope>provided</scope>
-		</dependency>
 
 		<!-- SLC repo -->
 		<dependency>
 			<groupId>org.argeo.slc</groupId>
-			<artifactId>org.argeo.slc.specs</artifactId>
+			<artifactId>org.argeo.slc.api</artifactId>
 			<version>2.1.1-SNAPSHOT</version>
 		</dependency>
 		<dependency>
@@ -82,14 +40,9 @@
 			<version>2.1.1-SNAPSHOT</version>
 		</dependency>
 
-		<dependency>
-			<groupId>org.argeo.tp</groupId>
-			<artifactId>biz.aQute.bndlib</artifactId>
-		</dependency>
-		
 		<!--  Argeo Base dependencies -->
 		<dependency>
-			<groupId>org.argeo.commons.base</groupId>
+			<groupId>org.argeo.commons</groupId>
 			<artifactId>org.argeo.util</artifactId>
 			<version>${version.argeo-commons}</version>
 		</dependency>
diff --git a/org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/AnonymousDistributionPerspective.java b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/AnonymousDistributionPerspective.java
similarity index 100%
rename from org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/AnonymousDistributionPerspective.java
rename to org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/AnonymousDistributionPerspective.java
diff --git a/org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/DistConstants.java b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/DistConstants.java
similarity index 100%
rename from org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/DistConstants.java
rename to org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/DistConstants.java
diff --git a/org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/DistImages.java b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/DistImages.java
similarity index 100%
rename from org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/DistImages.java
rename to org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/DistImages.java
diff --git a/org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/DistLabels.java b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/DistLabels.java
similarity index 100%
rename from org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/DistLabels.java
rename to org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/DistLabels.java
diff --git a/org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/DistPlugin.java b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/DistPlugin.java
similarity index 100%
rename from org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/DistPlugin.java
rename to org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/DistPlugin.java
diff --git a/org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/DistributionPerspective.java b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/DistributionPerspective.java
similarity index 100%
rename from org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/DistributionPerspective.java
rename to org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/DistributionPerspective.java
diff --git a/org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/PrivilegedJob.java b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/PrivilegedJob.java
similarity index 89%
rename from org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/PrivilegedJob.java
rename to org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/PrivilegedJob.java
index c10f472a6..001dd8df5 100644
--- a/org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/PrivilegedJob.java
+++ b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/PrivilegedJob.java
@@ -8,8 +8,8 @@ import javax.security.auth.Subject;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.jobs.Job;
-import org.springframework.security.Authentication;
-import org.springframework.security.context.SecurityContextHolder;
+import org.springframework.security.authentication.Authentication;
+import org.springframework.security.core.context.SecurityContextHolder;
 
 /**
  * Propagate authentication to an eclipse job. Typically to execute a privileged
diff --git a/org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/commands/BndProcess.java b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/BndProcess.java
similarity index 100%
rename from org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/commands/BndProcess.java
rename to org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/BndProcess.java
diff --git a/org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/commands/CopyLocalJavaWorkspace.java b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/CopyLocalJavaWorkspace.java
similarity index 100%
rename from org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/commands/CopyLocalJavaWorkspace.java
rename to org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/CopyLocalJavaWorkspace.java
diff --git a/org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/commands/CopyWorkspace.java b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/CopyWorkspace.java
similarity index 100%
rename from org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/commands/CopyWorkspace.java
rename to org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/CopyWorkspace.java
diff --git a/org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/commands/CreateLocalJavaWorkspace.java b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/CreateLocalJavaWorkspace.java
similarity index 98%
rename from org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/commands/CreateLocalJavaWorkspace.java
rename to org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/CreateLocalJavaWorkspace.java
index f15ee77f6..d3af9b0ae 100644
--- a/org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/commands/CreateLocalJavaWorkspace.java
+++ b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/CreateLocalJavaWorkspace.java
@@ -17,7 +17,7 @@ package org.argeo.slc.client.ui.dist.commands;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.argeo.eclipse.ui.ErrorFeedback;
+import org.argeo.eclipse.ui.dialogs.ErrorFeedback;
 import org.argeo.slc.client.ui.dist.DistPlugin;
 import org.argeo.slc.client.ui.dist.utils.CommandHelpers;
 import org.argeo.slc.repo.JavaRepoManager;
diff --git a/org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/commands/CreateWorkspace.java b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/CreateWorkspace.java
similarity index 98%
rename from org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/commands/CreateWorkspace.java
rename to org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/CreateWorkspace.java
index 73de37384..09df5a691 100644
--- a/org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/commands/CreateWorkspace.java
+++ b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/CreateWorkspace.java
@@ -25,7 +25,7 @@ import javax.jcr.security.Privilege;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.argeo.eclipse.ui.ErrorFeedback;
+import org.argeo.eclipse.ui.dialogs.ErrorFeedback;
 import org.argeo.jcr.JcrUtils;
 import org.argeo.slc.SlcConstants;
 import org.argeo.slc.client.ui.dist.DistPlugin;
diff --git a/org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/commands/DeleteArtifacts.java b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/DeleteArtifacts.java
similarity index 100%
rename from org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/commands/DeleteArtifacts.java
rename to org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/DeleteArtifacts.java
diff --git a/org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/commands/DeleteWorkspace.java b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/DeleteWorkspace.java
similarity index 100%
rename from org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/commands/DeleteWorkspace.java
rename to org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/DeleteWorkspace.java
diff --git a/org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/commands/DisplayRepoInformation.java b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/DisplayRepoInformation.java
similarity index 100%
rename from org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/commands/DisplayRepoInformation.java
rename to org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/DisplayRepoInformation.java
diff --git a/org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/commands/DoNothing.java b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/DoNothing.java
similarity index 100%
rename from org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/commands/DoNothing.java
rename to org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/DoNothing.java
diff --git a/org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/commands/Fetch.java b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/Fetch.java
similarity index 100%
rename from org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/commands/Fetch.java
rename to org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/Fetch.java
diff --git a/org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/commands/ManageWorkspaceAuth.java b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/ManageWorkspaceAuth.java
similarity index 100%
rename from org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/commands/ManageWorkspaceAuth.java
rename to org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/ManageWorkspaceAuth.java
diff --git a/org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/commands/MergeWorkspaces.java b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/MergeWorkspaces.java
similarity index 100%
rename from org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/commands/MergeWorkspaces.java
rename to org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/MergeWorkspaces.java
diff --git a/org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/commands/NormalizeDistribution.java b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/NormalizeDistribution.java
similarity index 99%
rename from org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/commands/NormalizeDistribution.java
rename to org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/NormalizeDistribution.java
index a01cd7e51..6b849f9ee 100644
--- a/org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/commands/NormalizeDistribution.java
+++ b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/NormalizeDistribution.java
@@ -69,8 +69,8 @@ import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.Shell;
 import org.eclipse.swt.widgets.Text;
 import org.eclipse.ui.handlers.HandlerUtil;
-import org.sonatype.aether.artifact.Artifact;
-import org.sonatype.aether.util.artifact.DefaultArtifact;
+import org.eclipse.aether.artifact.Artifact;
+import org.eclipse.aether.artifact.DefaultArtifact;
 
 /** Legacy - Make sure than Maven and OSGi metadata are consistent */
 public class NormalizeDistribution extends AbstractHandler implements SlcNames {
diff --git a/org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/commands/NormalizeWorkspace.java b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/NormalizeWorkspace.java
similarity index 100%
rename from org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/commands/NormalizeWorkspace.java
rename to org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/NormalizeWorkspace.java
diff --git a/org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/commands/OpenGenerateBinariesWizard.java b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/OpenGenerateBinariesWizard.java
similarity index 100%
rename from org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/commands/OpenGenerateBinariesWizard.java
rename to org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/OpenGenerateBinariesWizard.java
diff --git a/org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/commands/OpenModuleEditor.java b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/OpenModuleEditor.java
similarity index 100%
rename from org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/commands/OpenModuleEditor.java
rename to org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/OpenModuleEditor.java
diff --git a/org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/commands/OpenWorkspaceEditor.java b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/OpenWorkspaceEditor.java
similarity index 100%
rename from org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/commands/OpenWorkspaceEditor.java
rename to org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/OpenWorkspaceEditor.java
diff --git a/org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/commands/PublishWorkspace.java b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/PublishWorkspace.java
similarity index 100%
rename from org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/commands/PublishWorkspace.java
rename to org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/PublishWorkspace.java
diff --git a/org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/commands/RefreshArtifactBrowser.java b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/RefreshArtifactBrowser.java
similarity index 100%
rename from org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/commands/RefreshArtifactBrowser.java
rename to org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/RefreshArtifactBrowser.java
diff --git a/org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/commands/RefreshDistributionsView.java b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/RefreshDistributionsView.java
similarity index 100%
rename from org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/commands/RefreshDistributionsView.java
rename to org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/RefreshDistributionsView.java
diff --git a/org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/commands/RegisterRepository.java b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/RegisterRepository.java
similarity index 100%
rename from org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/commands/RegisterRepository.java
rename to org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/RegisterRepository.java
diff --git a/org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/commands/RunInOsgi.java b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/RunInOsgi.java
similarity index 99%
rename from org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/commands/RunInOsgi.java
rename to org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/RunInOsgi.java
index f9e709103..8e0cc6396 100644
--- a/org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/commands/RunInOsgi.java
+++ b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/RunInOsgi.java
@@ -31,7 +31,7 @@ import org.apache.commons.io.FileUtils;
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.argeo.eclipse.ui.ErrorFeedback;
+import org.argeo.eclipse.ui.dialogs.ErrorFeedback;
 import org.argeo.jcr.JcrUtils;
 import org.argeo.slc.SlcException;
 import org.argeo.slc.client.ui.dist.DistPlugin;
@@ -47,7 +47,7 @@ import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
 import org.eclipse.core.runtime.jobs.Job;
 import org.eclipse.jface.resource.ImageDescriptor;
-import org.sonatype.aether.artifact.Artifact;
+import org.eclipse.aether.artifact.Artifact;
 
 /** <b>UNDER DEVELOPMENT</b>. Download and prepare an OSGi runtime */
 public class RunInOsgi extends AbstractHandler implements SlcNames {
diff --git a/org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/commands/ShowSizeColumn.java b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/ShowSizeColumn.java
similarity index 100%
rename from org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/commands/ShowSizeColumn.java
rename to org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/ShowSizeColumn.java
diff --git a/org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/commands/UnregisterRemoteRepo.java b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/UnregisterRemoteRepo.java
similarity index 98%
rename from org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/commands/UnregisterRemoteRepo.java
rename to org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/UnregisterRemoteRepo.java
index 1dab10f45..90d7ca7e4 100644
--- a/org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/commands/UnregisterRemoteRepo.java
+++ b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/UnregisterRemoteRepo.java
@@ -21,7 +21,7 @@ import javax.jcr.Repository;
 import javax.jcr.RepositoryException;
 import javax.jcr.Session;
 
-import org.argeo.eclipse.ui.utils.CommandUtils;
+import org.argeo.eclipse.ui.workbench.CommandUtils;
 import org.argeo.jcr.ArgeoTypes;
 import org.argeo.jcr.JcrUtils;
 import org.argeo.slc.SlcException;
diff --git a/org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/commands/package.html b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/package.html
similarity index 100%
rename from org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/commands/package.html
rename to org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/package.html
diff --git a/org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/controllers/AnonymousDistTreeContentProvider.java b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/controllers/AnonymousDistTreeContentProvider.java
similarity index 100%
rename from org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/controllers/AnonymousDistTreeContentProvider.java
rename to org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/controllers/AnonymousDistTreeContentProvider.java
diff --git a/org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/controllers/ArtifactLabelProvider.java b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/controllers/ArtifactLabelProvider.java
similarity index 100%
rename from org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/controllers/ArtifactLabelProvider.java
rename to org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/controllers/ArtifactLabelProvider.java
diff --git a/org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/controllers/ArtifactsTreeContentProvider.java b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/controllers/ArtifactsTreeContentProvider.java
similarity index 100%
rename from org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/controllers/ArtifactsTreeContentProvider.java
rename to org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/controllers/ArtifactsTreeContentProvider.java
diff --git a/org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/controllers/DistSessionFactory.java b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/controllers/DistSessionFactory.java
similarity index 100%
rename from org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/controllers/DistSessionFactory.java
rename to org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/controllers/DistSessionFactory.java
diff --git a/org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/controllers/DistTreeComparator.java b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/controllers/DistTreeComparator.java
similarity index 100%
rename from org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/controllers/DistTreeComparator.java
rename to org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/controllers/DistTreeComparator.java
diff --git a/org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/controllers/DistTreeComparer.java b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/controllers/DistTreeComparer.java
similarity index 100%
rename from org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/controllers/DistTreeComparer.java
rename to org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/controllers/DistTreeComparer.java
diff --git a/org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/controllers/DistTreeContentProvider.java b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/controllers/DistTreeContentProvider.java
similarity index 100%
rename from org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/controllers/DistTreeContentProvider.java
rename to org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/controllers/DistTreeContentProvider.java
diff --git a/org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/controllers/DistTreeDoubleClickListener.java b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/controllers/DistTreeDoubleClickListener.java
similarity index 98%
rename from org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/controllers/DistTreeDoubleClickListener.java
rename to org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/controllers/DistTreeDoubleClickListener.java
index c280a53e0..84a6bcb0c 100644
--- a/org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/controllers/DistTreeDoubleClickListener.java
+++ b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/controllers/DistTreeDoubleClickListener.java
@@ -6,7 +6,7 @@ import java.util.Map;
 import javax.jcr.Node;
 import javax.jcr.RepositoryException;
 
-import org.argeo.eclipse.ui.utils.CommandUtils;
+import org.argeo.eclipse.ui.workbench.CommandUtils;
 import org.argeo.slc.SlcException;
 import org.argeo.slc.client.ui.dist.commands.OpenModuleEditor;
 import org.argeo.slc.client.ui.dist.commands.OpenWorkspaceEditor;
diff --git a/org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/controllers/DistTreeLabelProvider.java b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/controllers/DistTreeLabelProvider.java
similarity index 100%
rename from org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/controllers/DistTreeLabelProvider.java
rename to org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/controllers/DistTreeLabelProvider.java
diff --git a/org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/editors/ArtifactVersionEditor.java b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/editors/ArtifactVersionEditor.java
similarity index 100%
rename from org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/editors/ArtifactVersionEditor.java
rename to org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/editors/ArtifactVersionEditor.java
diff --git a/org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/editors/BundleDependencyPage.java b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/editors/BundleDependencyPage.java
similarity index 99%
rename from org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/editors/BundleDependencyPage.java
rename to org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/editors/BundleDependencyPage.java
index 321ec8010..4752cc9a2 100644
--- a/org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/editors/BundleDependencyPage.java
+++ b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/editors/BundleDependencyPage.java
@@ -21,7 +21,7 @@ import javax.jcr.Node;
 import javax.jcr.NodeIterator;
 import javax.jcr.RepositoryException;
 
-import org.argeo.eclipse.ui.ErrorFeedback;
+import org.argeo.eclipse.ui.dialogs.ErrorFeedback;
 import org.argeo.jcr.JcrUtils;
 import org.argeo.slc.SlcException;
 import org.argeo.slc.client.ui.dist.DistConstants;
diff --git a/org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/editors/BundleDetailPage.java b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/editors/BundleDetailPage.java
similarity index 99%
rename from org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/editors/BundleDetailPage.java
rename to org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/editors/BundleDetailPage.java
index 57a3aac84..e43668aef 100644
--- a/org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/editors/BundleDetailPage.java
+++ b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/editors/BundleDetailPage.java
@@ -25,7 +25,7 @@ import javax.jcr.RepositoryException;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.argeo.ArgeoException;
-import org.argeo.eclipse.ui.utils.CommandUtils;
+import org.argeo.eclipse.ui.workbench.CommandUtils;
 import org.argeo.slc.SlcException;
 import org.argeo.slc.build.License;
 import org.argeo.slc.client.ui.dist.DistConstants;
diff --git a/org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/editors/BundleRawPage.java b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/editors/BundleRawPage.java
similarity index 100%
rename from org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/editors/BundleRawPage.java
rename to org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/editors/BundleRawPage.java
diff --git a/org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/editors/DistWkspBrowserPage.java b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/editors/DistWkspBrowserPage.java
similarity index 99%
rename from org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/editors/DistWkspBrowserPage.java
rename to org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/editors/DistWkspBrowserPage.java
index b04d1cf3d..157403875 100644
--- a/org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/editors/DistWkspBrowserPage.java
+++ b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/editors/DistWkspBrowserPage.java
@@ -31,7 +31,7 @@ import javax.jcr.query.qom.QueryObjectModel;
 import javax.jcr.query.qom.QueryObjectModelFactory;
 import javax.jcr.query.qom.Selector;
 
-import org.argeo.eclipse.ui.utils.CommandUtils;
+import org.argeo.eclipse.ui.workbench.CommandUtils;
 import org.argeo.jcr.JcrUtils;
 import org.argeo.slc.SlcException;
 import org.argeo.slc.client.ui.dist.DistConstants;
diff --git a/org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/editors/DistWkspEditorInput.java b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/editors/DistWkspEditorInput.java
similarity index 100%
rename from org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/editors/DistWkspEditorInput.java
rename to org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/editors/DistWkspEditorInput.java
diff --git a/org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/editors/DistWkspSearchPage.java b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/editors/DistWkspSearchPage.java
similarity index 99%
rename from org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/editors/DistWkspSearchPage.java
rename to org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/editors/DistWkspSearchPage.java
index ea1c20ef8..150de53c5 100644
--- a/org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/editors/DistWkspSearchPage.java
+++ b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/editors/DistWkspSearchPage.java
@@ -39,7 +39,7 @@ import javax.jcr.query.qom.StaticOperand;
 
 import org.argeo.ArgeoMonitor;
 import org.argeo.eclipse.ui.EclipseArgeoMonitor;
-import org.argeo.eclipse.ui.utils.CommandUtils;
+import org.argeo.eclipse.ui.workbench.CommandUtils;
 import org.argeo.jcr.JcrUtils;
 import org.argeo.slc.SlcException;
 import org.argeo.slc.client.ui.dist.DistConstants;
diff --git a/org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/editors/DistWorkspaceEditor.java b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/editors/DistWorkspaceEditor.java
similarity index 100%
rename from org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/editors/DistWorkspaceEditor.java
rename to org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/editors/DistWorkspaceEditor.java
diff --git a/org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/editors/ModularDistVersionDetailPage.java b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/editors/ModularDistVersionDetailPage.java
similarity index 100%
rename from org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/editors/ModularDistVersionDetailPage.java
rename to org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/editors/ModularDistVersionDetailPage.java
diff --git a/org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/editors/ModularDistVersionEditor.java b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/editors/ModularDistVersionEditor.java
similarity index 100%
rename from org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/editors/ModularDistVersionEditor.java
rename to org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/editors/ModularDistVersionEditor.java
diff --git a/org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/editors/ModularDistVersionOverviewPage.java b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/editors/ModularDistVersionOverviewPage.java
similarity index 99%
rename from org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/editors/ModularDistVersionOverviewPage.java
rename to org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/editors/ModularDistVersionOverviewPage.java
index c32f2bb9e..00a585252 100644
--- a/org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/editors/ModularDistVersionOverviewPage.java
+++ b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/editors/ModularDistVersionOverviewPage.java
@@ -36,7 +36,7 @@ import javax.jcr.query.qom.Selector;
 import javax.jcr.query.qom.StaticOperand;
 
 import org.argeo.eclipse.ui.EclipseUiUtils;
-import org.argeo.eclipse.ui.utils.CommandUtils;
+import org.argeo.eclipse.ui.workbench.CommandUtils;
 import org.argeo.jcr.JcrUtils;
 import org.argeo.slc.SlcException;
 import org.argeo.slc.client.ui.dist.DistConstants;
@@ -83,8 +83,8 @@ import org.eclipse.ui.forms.events.HyperlinkEvent;
 import org.eclipse.ui.forms.widgets.FormToolkit;
 import org.eclipse.ui.forms.widgets.Hyperlink;
 import org.eclipse.ui.forms.widgets.ScrolledForm;
-import org.sonatype.aether.artifact.Artifact;
-import org.sonatype.aether.util.artifact.DefaultArtifact;
+import org.eclipse.aether.artifact.Artifact;
+import org.eclipse.aether.artifact.DefaultArtifact;
 
 /**
  * Show all modules contained in a given modular distribution as filter-able
diff --git a/org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/editors/ModuleEditorInput.java b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/editors/ModuleEditorInput.java
similarity index 100%
rename from org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/editors/ModuleEditorInput.java
rename to org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/editors/ModuleEditorInput.java
diff --git a/org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/editors/RunInOsgiPage.java b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/editors/RunInOsgiPage.java
similarity index 100%
rename from org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/editors/RunInOsgiPage.java
rename to org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/editors/RunInOsgiPage.java
diff --git a/org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/editors/WkspCategoryBaseListPage.java b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/editors/WkspCategoryBaseListPage.java
similarity index 99%
rename from org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/editors/WkspCategoryBaseListPage.java
rename to org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/editors/WkspCategoryBaseListPage.java
index c1046adf6..ce46e5ebd 100644
--- a/org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/editors/WkspCategoryBaseListPage.java
+++ b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/editors/WkspCategoryBaseListPage.java
@@ -36,7 +36,7 @@ import javax.jcr.query.qom.Selector;
 import javax.jcr.query.qom.StaticOperand;
 
 import org.argeo.eclipse.ui.jcr.AsyncUiEventListener;
-import org.argeo.eclipse.ui.utils.CommandUtils;
+import org.argeo.eclipse.ui.workbench.CommandUtils;
 import org.argeo.jcr.JcrUtils;
 import org.argeo.slc.SlcException;
 import org.argeo.slc.client.ui.dist.DistConstants;
diff --git a/org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/model/DistParentElem.java b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/model/DistParentElem.java
similarity index 100%
rename from org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/model/DistParentElem.java
rename to org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/model/DistParentElem.java
diff --git a/org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/model/GroupBaseElem.java b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/model/GroupBaseElem.java
similarity index 100%
rename from org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/model/GroupBaseElem.java
rename to org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/model/GroupBaseElem.java
diff --git a/org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/model/ModularDistVersionBaseElem.java b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/model/ModularDistVersionBaseElem.java
similarity index 100%
rename from org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/model/ModularDistVersionBaseElem.java
rename to org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/model/ModularDistVersionBaseElem.java
diff --git a/org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/model/ModularDistVersionElem.java b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/model/ModularDistVersionElem.java
similarity index 100%
rename from org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/model/ModularDistVersionElem.java
rename to org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/model/ModularDistVersionElem.java
diff --git a/org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/model/RepoElem.java b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/model/RepoElem.java
similarity index 100%
rename from org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/model/RepoElem.java
rename to org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/model/RepoElem.java
diff --git a/org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/model/WkspGroupElem.java b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/model/WkspGroupElem.java
similarity index 100%
rename from org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/model/WkspGroupElem.java
rename to org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/model/WkspGroupElem.java
diff --git a/org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/model/WorkspaceElem.java b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/model/WorkspaceElem.java
similarity index 100%
rename from org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/model/WorkspaceElem.java
rename to org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/model/WorkspaceElem.java
diff --git a/org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/utils/AbstractHyperlinkListener.java b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/utils/AbstractHyperlinkListener.java
similarity index 100%
rename from org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/utils/AbstractHyperlinkListener.java
rename to org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/utils/AbstractHyperlinkListener.java
diff --git a/org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/utils/ArtifactsTableConfigurer.java b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/utils/ArtifactsTableConfigurer.java
similarity index 100%
rename from org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/utils/ArtifactsTableConfigurer.java
rename to org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/utils/ArtifactsTableConfigurer.java
diff --git a/org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/utils/CommandHelpers.java b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/utils/CommandHelpers.java
similarity index 100%
rename from org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/utils/CommandHelpers.java
rename to org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/utils/CommandHelpers.java
diff --git a/org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/utils/DistNodeViewerComparator.java b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/utils/DistNodeViewerComparator.java
similarity index 100%
rename from org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/utils/DistNodeViewerComparator.java
rename to org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/utils/DistNodeViewerComparator.java
diff --git a/org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/utils/DistUiHelpers.java b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/utils/DistUiHelpers.java
similarity index 100%
rename from org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/utils/DistUiHelpers.java
rename to org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/utils/DistUiHelpers.java
diff --git a/org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/utils/NameVersionComparator.java b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/utils/NameVersionComparator.java
similarity index 100%
rename from org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/utils/NameVersionComparator.java
rename to org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/utils/NameVersionComparator.java
diff --git a/org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/utils/VersionComparator.java b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/utils/VersionComparator.java
similarity index 100%
rename from org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/utils/VersionComparator.java
rename to org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/utils/VersionComparator.java
diff --git a/org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/utils/ViewerUtils.java b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/utils/ViewerUtils.java
similarity index 100%
rename from org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/utils/ViewerUtils.java
rename to org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/utils/ViewerUtils.java
diff --git a/org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/views/AbstractQueryArtifactsView.java b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/views/AbstractQueryArtifactsView.java
similarity index 100%
rename from org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/views/AbstractQueryArtifactsView.java
rename to org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/views/AbstractQueryArtifactsView.java
diff --git a/org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/views/AnonymousDistributionsView.java b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/views/AnonymousDistributionsView.java
similarity index 100%
rename from org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/views/AnonymousDistributionsView.java
rename to org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/views/AnonymousDistributionsView.java
diff --git a/org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/views/ArtifactsBrowser.java b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/views/ArtifactsBrowser.java
similarity index 100%
rename from org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/views/ArtifactsBrowser.java
rename to org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/views/ArtifactsBrowser.java
diff --git a/org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/views/DistributionsView.java b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/views/DistributionsView.java
similarity index 99%
rename from org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/views/DistributionsView.java
rename to org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/views/DistributionsView.java
index 37bd1f246..ee249b207 100644
--- a/org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/views/DistributionsView.java
+++ b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/views/DistributionsView.java
@@ -22,7 +22,7 @@ import javax.jcr.Repository;
 import javax.jcr.RepositoryException;
 
 import org.argeo.eclipse.ui.TreeParent;
-import org.argeo.eclipse.ui.utils.CommandUtils;
+import org.argeo.eclipse.ui.workbench.CommandUtils;
 import org.argeo.jcr.ArgeoNames;
 import org.argeo.slc.SlcException;
 import org.argeo.slc.client.ui.dist.DistPlugin;
diff --git a/org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/views/HelpView.java b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/views/HelpView.java
similarity index 100%
rename from org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/views/HelpView.java
rename to org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/views/HelpView.java
diff --git a/org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/views/QueryArtifactsForm.java b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/views/QueryArtifactsForm.java
similarity index 100%
rename from org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/views/QueryArtifactsForm.java
rename to org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/views/QueryArtifactsForm.java
diff --git a/org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/views/QueryArtifactsText.java b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/views/QueryArtifactsText.java
similarity index 100%
rename from org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/views/QueryArtifactsText.java
rename to org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/views/QueryArtifactsText.java
diff --git a/org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/views/QueryBundlesForm.java b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/views/QueryBundlesForm.java
similarity index 100%
rename from org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/views/QueryBundlesForm.java
rename to org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/views/QueryBundlesForm.java
diff --git a/org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/wizards/ChangeRightsWizard.java b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/wizards/ChangeRightsWizard.java
similarity index 100%
rename from org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/wizards/ChangeRightsWizard.java
rename to org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/wizards/ChangeRightsWizard.java
diff --git a/org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/wizards/ChooseRightsPage.java b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/wizards/ChooseRightsPage.java
similarity index 100%
rename from org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/wizards/ChooseRightsPage.java
rename to org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/wizards/ChooseRightsPage.java
diff --git a/org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/wizards/FetchWizard.java b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/wizards/FetchWizard.java
similarity index 100%
rename from org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/wizards/FetchWizard.java
rename to org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/wizards/FetchWizard.java
diff --git a/org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/wizards/GenerateBinariesWizard.java b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/wizards/GenerateBinariesWizard.java
similarity index 99%
rename from org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/wizards/GenerateBinariesWizard.java
rename to org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/wizards/GenerateBinariesWizard.java
index 4b7e9767f..3d7df051d 100644
--- a/org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/wizards/GenerateBinariesWizard.java
+++ b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/wizards/GenerateBinariesWizard.java
@@ -59,7 +59,7 @@ import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.Table;
 import org.eclipse.swt.widgets.Text;
-import org.sonatype.aether.artifact.Artifact;
+import org.eclipse.aether.artifact.Artifact;
 
 /**
  * Define parameters to asynchronously generate binaries, sources and sdk pom
diff --git a/org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/wizards/RegisterRepoWizard.java b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/wizards/RegisterRepoWizard.java
similarity index 99%
rename from org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/wizards/RegisterRepoWizard.java
rename to org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/wizards/RegisterRepoWizard.java
index 3f7f30c65..527fe008e 100644
--- a/org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/wizards/RegisterRepoWizard.java
+++ b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/wizards/RegisterRepoWizard.java
@@ -27,7 +27,7 @@ import javax.jcr.Session;
 import javax.jcr.SimpleCredentials;
 import javax.jcr.nodetype.NodeType;
 
-import org.argeo.eclipse.ui.ErrorFeedback;
+import org.argeo.eclipse.ui.dialogs.ErrorFeedback;
 import org.argeo.jcr.ArgeoJcrConstants;
 import org.argeo.jcr.ArgeoJcrUtils;
 import org.argeo.jcr.ArgeoNames;
diff --git a/org.argeo.slc.client.ui/bnd.bnd b/org.argeo.slc.client.ui/bnd.bnd
new file mode 100644
index 000000000..435d28a29
--- /dev/null
+++ b/org.argeo.slc.client.ui/bnd.bnd
@@ -0,0 +1,8 @@
+Bundle-SymbolicName: org.argeo.slc.client.ui;singleton=true
+Bundle-ActivationPolicy: lazy
+Require-Bundle: org.eclipse.ui;resolution:=optional
+
+Bundle-Activator: org.argeo.slc.client.ui.ClientUiPlugin
+Import-Package: org.argeo.eclipse.spring,\
+org.argeo.security.ui,\
+*
diff --git a/org.argeo.slc.client.ui/pom.xml b/org.argeo.slc.client.ui/pom.xml
index 39f0ce71a..e40d89754 100644
--- a/org.argeo.slc.client.ui/pom.xml
+++ b/org.argeo.slc.client.ui/pom.xml
@@ -1,88 +1,44 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.argeo.slc</groupId>
-		<artifactId>plugins</artifactId>
+		<artifactId>argeo-slc</artifactId>
 		<version>2.1.1-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>org.argeo.slc.client.ui</artifactId>
 	<name>SLC Client UI</name>
 	<packaging>jar</packaging>
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.apache.felix</groupId>
-				<artifactId>maven-bundle-plugin</artifactId>
-				<configuration>
-					<instructions>
-						<Bundle-Activator>org.argeo.slc.client.ui.ClientUiPlugin</Bundle-Activator>
-						<Require-Bundle>
-							org.eclipse.ui;resolution:=optional,
-							org.eclipse.core.runtime;resolution:=optional,
-							org.eclipse.rap.ui;resolution:=optional,
-							org.eclipse.rap.ui.workbench;resolution:=optional
-						</Require-Bundle>
-						<Import-Package>
-							org.argeo.eclipse.spring,
-							org.argeo.security.ui,
-							*
-						</Import-Package>
-					</instructions>
-				</configuration>
-			</plugin>
-		</plugins>
-	</build>
 	<dependencies>
-		<!-- Single sourcing - we build against RCP  -->
-		<dependency>
-			<groupId>org.argeo.slc</groupId>
-			<artifactId>org.argeo.slc.client.rcp</artifactId>
-			<version>2.1.1-SNAPSHOT</version>
-			<scope>provided</scope>
-		</dependency>
-	
 		<!-- SLC -->
 		<dependency>
 			<groupId>org.argeo.slc</groupId>
 			<artifactId>org.argeo.slc.core</artifactId>
 			<version>2.1.1-SNAPSHOT</version>
 		</dependency>
-		<dependency>
-			<groupId>org.argeo.slc</groupId>
-			<artifactId>org.argeo.slc.support.jcr</artifactId>
-			<version>2.1.1-SNAPSHOT</version>
-		</dependency>
 
 		<!-- Argeo Commons -->
 		<dependency>
-			<groupId>org.argeo.commons.base</groupId>
+			<groupId>org.argeo.commons</groupId>
 			<artifactId>org.argeo.eclipse.ui</artifactId>
 			<version>${version.argeo-commons}</version>
 		</dependency>
 		<dependency>
-			<groupId>org.argeo.commons.base</groupId>
-			<artifactId>org.argeo.eclipse.ui.jcr</artifactId>
-			<version>${version.argeo-commons}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.argeo.commons.security</groupId>
-			<artifactId>org.argeo.security.ui</artifactId>
+			<groupId>org.argeo.commons</groupId>
+			<artifactId>org.argeo.eclipse.ui.workbench</artifactId>
 			<version>${version.argeo-commons}</version>
 		</dependency>
-
-		<!-- Eclipse and RCP only dependency, needed at compile time -->
 		<dependency>
-			<groupId>org.argeo.commons.base</groupId>
-			<artifactId>org.argeo.eclipse.ui.rcp</artifactId>
+			<groupId>org.argeo.commons</groupId>
+			<artifactId>org.argeo.eclipse.ui.rap</artifactId>
 			<version>${version.argeo-commons}</version>
 			<scope>provided</scope>
 		</dependency>
 		<dependency>
-			<groupId>org.argeo.commons.base</groupId>
-			<artifactId>org.argeo.eclipse.dep.rcp</artifactId>
+			<groupId>org.argeo.commons</groupId>
+			<artifactId>org.argeo.security.ui</artifactId>
 			<version>${version.argeo-commons}</version>
-			<scope>provided</scope>
 		</dependency>
 	</dependencies>
 </project>
diff --git a/org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/ClientUiPlugin.java b/org.argeo.slc.client.ui/src/org/argeo/slc/client/ui/ClientUiPlugin.java
similarity index 100%
rename from org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/ClientUiPlugin.java
rename to org.argeo.slc.client.ui/src/org/argeo/slc/client/ui/ClientUiPlugin.java
diff --git a/org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/SlcExecutionPerspective.java b/org.argeo.slc.client.ui/src/org/argeo/slc/client/ui/SlcExecutionPerspective.java
similarity index 100%
rename from org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/SlcExecutionPerspective.java
rename to org.argeo.slc.client.ui/src/org/argeo/slc/client/ui/SlcExecutionPerspective.java
diff --git a/org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/SlcImages.java b/org.argeo.slc.client.ui/src/org/argeo/slc/client/ui/SlcImages.java
similarity index 100%
rename from org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/SlcImages.java
rename to org.argeo.slc.client.ui/src/org/argeo/slc/client/ui/SlcImages.java
diff --git a/org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/SlcUiConstants.java b/org.argeo.slc.client.ui/src/org/argeo/slc/client/ui/SlcUiConstants.java
similarity index 100%
rename from org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/SlcUiConstants.java
rename to org.argeo.slc.client.ui/src/org/argeo/slc/client/ui/SlcUiConstants.java
diff --git a/org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/commands/AddResultFolder.java b/org.argeo.slc.client.ui/src/org/argeo/slc/client/ui/commands/AddResultFolder.java
similarity index 98%
rename from org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/commands/AddResultFolder.java
rename to org.argeo.slc.client.ui/src/org/argeo/slc/client/ui/commands/AddResultFolder.java
index 8c2839a0d..749836da2 100644
--- a/org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/commands/AddResultFolder.java
+++ b/org.argeo.slc.client.ui/src/org/argeo/slc/client/ui/commands/AddResultFolder.java
@@ -18,7 +18,7 @@ package org.argeo.slc.client.ui.commands;
 import javax.jcr.Node;
 import javax.jcr.RepositoryException;
 
-import org.argeo.eclipse.ui.ErrorFeedback;
+import org.argeo.eclipse.ui.dialogs.ErrorFeedback;
 import org.argeo.eclipse.ui.dialogs.SingleValue;
 import org.argeo.slc.SlcException;
 import org.argeo.slc.client.ui.ClientUiPlugin;
diff --git a/org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/commands/DeleteItems.java b/org.argeo.slc.client.ui/src/org/argeo/slc/client/ui/commands/DeleteItems.java
similarity index 100%
rename from org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/commands/DeleteItems.java
rename to org.argeo.slc.client.ui/src/org/argeo/slc/client/ui/commands/DeleteItems.java
diff --git a/org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/commands/RefreshJcrResultTreeView.java b/org.argeo.slc.client.ui/src/org/argeo/slc/client/ui/commands/RefreshJcrResultTreeView.java
similarity index 100%
rename from org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/commands/RefreshJcrResultTreeView.java
rename to org.argeo.slc.client.ui/src/org/argeo/slc/client/ui/commands/RefreshJcrResultTreeView.java
diff --git a/org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/commands/RenameResultFolder.java b/org.argeo.slc.client.ui/src/org/argeo/slc/client/ui/commands/RenameResultFolder.java
similarity index 100%
rename from org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/commands/RenameResultFolder.java
rename to org.argeo.slc.client.ui/src/org/argeo/slc/client/ui/commands/RenameResultFolder.java
diff --git a/org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/commands/RenameResultNode.java b/org.argeo.slc.client.ui/src/org/argeo/slc/client/ui/commands/RenameResultNode.java
similarity index 100%
rename from org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/commands/RenameResultNode.java
rename to org.argeo.slc.client.ui/src/org/argeo/slc/client/ui/commands/RenameResultNode.java
diff --git a/org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/commands/RunSlcFlow.java b/org.argeo.slc.client.ui/src/org/argeo/slc/client/ui/commands/RunSlcFlow.java
similarity index 100%
rename from org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/commands/RunSlcFlow.java
rename to org.argeo.slc.client.ui/src/org/argeo/slc/client/ui/commands/RunSlcFlow.java
diff --git a/org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/commands/UpdateModule.java b/org.argeo.slc.client.ui/src/org/argeo/slc/client/ui/commands/UpdateModule.java
similarity index 100%
rename from org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/commands/UpdateModule.java
rename to org.argeo.slc.client.ui/src/org/argeo/slc/client/ui/commands/UpdateModule.java
diff --git a/org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/controllers/ProcessController.java b/org.argeo.slc.client.ui/src/org/argeo/slc/client/ui/controllers/ProcessController.java
similarity index 100%
rename from org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/controllers/ProcessController.java
rename to org.argeo.slc.client.ui/src/org/argeo/slc/client/ui/controllers/ProcessController.java
diff --git a/org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/decorators/ResultFailedDecorator.java b/org.argeo.slc.client.ui/src/org/argeo/slc/client/ui/decorators/ResultFailedDecorator.java
similarity index 100%
rename from org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/decorators/ResultFailedDecorator.java
rename to org.argeo.slc.client.ui/src/org/argeo/slc/client/ui/decorators/ResultFailedDecorator.java
diff --git a/org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/editors/ProcessBuilderPage.java b/org.argeo.slc.client.ui/src/org/argeo/slc/client/ui/editors/ProcessBuilderPage.java
similarity index 100%
rename from org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/editors/ProcessBuilderPage.java
rename to org.argeo.slc.client.ui/src/org/argeo/slc/client/ui/editors/ProcessBuilderPage.java
diff --git a/org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/editors/ProcessEditor.java b/org.argeo.slc.client.ui/src/org/argeo/slc/client/ui/editors/ProcessEditor.java
similarity index 99%
rename from org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/editors/ProcessEditor.java
rename to org.argeo.slc.client.ui/src/org/argeo/slc/client/ui/editors/ProcessEditor.java
index 59473c667..f70114fd0 100644
--- a/org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/editors/ProcessEditor.java
+++ b/org.argeo.slc.client.ui/src/org/argeo/slc/client/ui/editors/ProcessEditor.java
@@ -26,7 +26,7 @@ import javax.jcr.Repository;
 import javax.jcr.RepositoryException;
 import javax.jcr.Session;
 
-import org.argeo.eclipse.ui.ErrorFeedback;
+import org.argeo.eclipse.ui.dialogs.ErrorFeedback;
 import org.argeo.jcr.JcrUtils;
 import org.argeo.slc.SlcException;
 import org.argeo.slc.client.ui.ClientUiPlugin;
diff --git a/org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/editors/ProcessEditorInput.java b/org.argeo.slc.client.ui/src/org/argeo/slc/client/ui/editors/ProcessEditorInput.java
similarity index 100%
rename from org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/editors/ProcessEditorInput.java
rename to org.argeo.slc.client.ui/src/org/argeo/slc/client/ui/editors/ProcessEditorInput.java
diff --git a/org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/editors/ProcessEditorInputFactory.java b/org.argeo.slc.client.ui/src/org/argeo/slc/client/ui/editors/ProcessEditorInputFactory.java
similarity index 100%
rename from org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/editors/ProcessEditorInputFactory.java
rename to org.argeo.slc.client.ui/src/org/argeo/slc/client/ui/editors/ProcessEditorInputFactory.java
diff --git a/org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/editors/ProcessLogPage.java b/org.argeo.slc.client.ui/src/org/argeo/slc/client/ui/editors/ProcessLogPage.java
similarity index 100%
rename from org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/editors/ProcessLogPage.java
rename to org.argeo.slc.client.ui/src/org/argeo/slc/client/ui/editors/ProcessLogPage.java
diff --git a/org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/model/ParentNodeFolder.java b/org.argeo.slc.client.ui/src/org/argeo/slc/client/ui/model/ParentNodeFolder.java
similarity index 100%
rename from org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/model/ParentNodeFolder.java
rename to org.argeo.slc.client.ui/src/org/argeo/slc/client/ui/model/ParentNodeFolder.java
diff --git a/org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/model/ResultFolder.java b/org.argeo.slc.client.ui/src/org/argeo/slc/client/ui/model/ResultFolder.java
similarity index 100%
rename from org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/model/ResultFolder.java
rename to org.argeo.slc.client.ui/src/org/argeo/slc/client/ui/model/ResultFolder.java
diff --git a/org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/model/ResultItemsComparator.java b/org.argeo.slc.client.ui/src/org/argeo/slc/client/ui/model/ResultItemsComparator.java
similarity index 100%
rename from org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/model/ResultItemsComparator.java
rename to org.argeo.slc.client.ui/src/org/argeo/slc/client/ui/model/ResultItemsComparator.java
diff --git a/org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/model/ResultItemsComparer.java b/org.argeo.slc.client.ui/src/org/argeo/slc/client/ui/model/ResultItemsComparer.java
similarity index 100%
rename from org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/model/ResultItemsComparer.java
rename to org.argeo.slc.client.ui/src/org/argeo/slc/client/ui/model/ResultItemsComparer.java
diff --git a/org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/model/ResultParent.java b/org.argeo.slc.client.ui/src/org/argeo/slc/client/ui/model/ResultParent.java
similarity index 100%
rename from org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/model/ResultParent.java
rename to org.argeo.slc.client.ui/src/org/argeo/slc/client/ui/model/ResultParent.java
diff --git a/org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/model/ResultParentUtils.java b/org.argeo.slc.client.ui/src/org/argeo/slc/client/ui/model/ResultParentUtils.java
similarity index 100%
rename from org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/model/ResultParentUtils.java
rename to org.argeo.slc.client.ui/src/org/argeo/slc/client/ui/model/ResultParentUtils.java
diff --git a/org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/model/SingleResultNode.java b/org.argeo.slc.client.ui/src/org/argeo/slc/client/ui/model/SingleResultNode.java
similarity index 100%
rename from org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/model/SingleResultNode.java
rename to org.argeo.slc.client.ui/src/org/argeo/slc/client/ui/model/SingleResultNode.java
diff --git a/org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/model/VirtualFolder.java b/org.argeo.slc.client.ui/src/org/argeo/slc/client/ui/model/VirtualFolder.java
similarity index 100%
rename from org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/model/VirtualFolder.java
rename to org.argeo.slc.client.ui/src/org/argeo/slc/client/ui/model/VirtualFolder.java
diff --git a/org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/providers/ResultTreeContentProvider.java b/org.argeo.slc.client.ui/src/org/argeo/slc/client/ui/providers/ResultTreeContentProvider.java
similarity index 100%
rename from org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/providers/ResultTreeContentProvider.java
rename to org.argeo.slc.client.ui/src/org/argeo/slc/client/ui/providers/ResultTreeContentProvider.java
diff --git a/org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/providers/ResultTreeLabelProvider.java b/org.argeo.slc.client.ui/src/org/argeo/slc/client/ui/providers/ResultTreeLabelProvider.java
similarity index 100%
rename from org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/providers/ResultTreeLabelProvider.java
rename to org.argeo.slc.client.ui/src/org/argeo/slc/client/ui/providers/ResultTreeLabelProvider.java
diff --git a/org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/views/JcrExecutionModulesView.java b/org.argeo.slc.client.ui/src/org/argeo/slc/client/ui/views/JcrExecutionModulesView.java
similarity index 100%
rename from org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/views/JcrExecutionModulesView.java
rename to org.argeo.slc.client.ui/src/org/argeo/slc/client/ui/views/JcrExecutionModulesView.java
diff --git a/org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/views/JcrProcessListView.java b/org.argeo.slc.client.ui/src/org/argeo/slc/client/ui/views/JcrProcessListView.java
similarity index 100%
rename from org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/views/JcrProcessListView.java
rename to org.argeo.slc.client.ui/src/org/argeo/slc/client/ui/views/JcrProcessListView.java
diff --git a/org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/views/JcrResultListView.java b/org.argeo.slc.client.ui/src/org/argeo/slc/client/ui/views/JcrResultListView.java
similarity index 100%
rename from org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/views/JcrResultListView.java
rename to org.argeo.slc.client.ui/src/org/argeo/slc/client/ui/views/JcrResultListView.java
diff --git a/org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/views/JcrResultTreeView.java b/org.argeo.slc.client.ui/src/org/argeo/slc/client/ui/views/JcrResultTreeView.java
similarity index 96%
rename from org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/views/JcrResultTreeView.java
rename to org.argeo.slc.client.ui/src/org/argeo/slc/client/ui/views/JcrResultTreeView.java
index f0ec30ed9..97f78e4bd 100644
--- a/org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/views/JcrResultTreeView.java
+++ b/org.argeo.slc.client.ui/src/org/argeo/slc/client/ui/views/JcrResultTreeView.java
@@ -35,7 +35,7 @@ import javax.jcr.observation.ObservationManager;
 
 import org.argeo.ArgeoException;
 import org.argeo.eclipse.ui.jcr.AsyncUiEventListener;
-import org.argeo.eclipse.ui.utils.CommandUtils;
+import org.argeo.eclipse.ui.workbench.CommandUtils;
 import org.argeo.jcr.JcrUtils;
 import org.argeo.slc.SlcException;
 import org.argeo.slc.client.ui.ClientUiPlugin;
diff --git a/org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/wizards/ConfirmOverwriteWizard.java b/org.argeo.slc.client.ui/src/org/argeo/slc/client/ui/wizards/ConfirmOverwriteWizard.java
similarity index 100%
rename from org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/wizards/ConfirmOverwriteWizard.java
rename to org.argeo.slc.client.ui/src/org/argeo/slc/client/ui/wizards/ConfirmOverwriteWizard.java
diff --git a/pom.xml b/pom.xml
index a92d9f18e..b3f1eff57 100644
--- a/pom.xml
+++ b/pom.xml
@@ -26,22 +26,22 @@
 		<module>org.argeo.slc.support</module>
 		<module>org.argeo.slc.repo</module>
 		<module>org.argeo.slc.factory</module>
-		
+
 		<!-- Modules -->
 		<module>org.argeo.slc.agent</module>
 		<module>org.argeo.slc.node.jackrabbit</module>
 		<module>org.argeo.slc.agent.jcr</module>
 		<module>org.argeo.slc.server.repo</module>
 
-		<!-- <module>runtime</module> -->
-		<!-- <module>modules</module> -->
-		<!-- <module>plugins</module> -->
-		<!-- <module>archetypes</module> -->
+		<!-- UI -->
+		<module>org.argeo.slc.client.ui</module>
+		<!-- <module>org.argeo.slc.client.ui.dist</module> -->
+		<module>org.argeo.slc.client.rap</module>
 
 		<!-- <module>lib</module> -->
 		<module>dep</module>
 		<!-- <module>dist</module> -->
-		<!-- <module>demo</module> -->
+		<module>demo</module>
 	</modules>
 	<url>http://projects.argeo.org/slc/</url>
 	<scm>
diff --git a/runtime/org.argeo.slc.support.maven/src/main/java/org/argeo/slc/maven/ManualWagonProvider.java b/runtime/org.argeo.slc.support.maven/src/main/java/org/argeo/slc/maven/ManualWagonProvider.java
index 46e8d7f09..d264bb784 100644
--- a/runtime/org.argeo.slc.support.maven/src/main/java/org/argeo/slc/maven/ManualWagonProvider.java
+++ b/runtime/org.argeo.slc.support.maven/src/main/java/org/argeo/slc/maven/ManualWagonProvider.java
@@ -27,7 +27,7 @@ import org.apache.maven.wagon.Wagon;
 import org.apache.maven.wagon.providers.file.FileWagon;
 import org.apache.maven.wagon.providers.http.LightweightHttpWagon;
 import org.apache.maven.wagon.providers.webdav.WebDavWagon;
-import org.sonatype.aether.connector.wagon.WagonProvider;
+import org.eclipse.aether.connector.wagon.WagonProvider;
 
 public class ManualWagonProvider implements WagonProvider {
 
diff --git a/runtime/org.argeo.slc.support.maven/src/main/java/org/argeo/slc/maven/MavenManager.java b/runtime/org.argeo.slc.support.maven/src/main/java/org/argeo/slc/maven/MavenManager.java
index f239d4ad0..049ce8233 100644
--- a/runtime/org.argeo.slc.support.maven/src/main/java/org/argeo/slc/maven/MavenManager.java
+++ b/runtime/org.argeo.slc.support.maven/src/main/java/org/argeo/slc/maven/MavenManager.java
@@ -24,19 +24,19 @@ import org.argeo.slc.aether.AetherUtils;
 import org.argeo.slc.aether.ConsoleRepositoryListener;
 import org.argeo.slc.aether.ConsoleTransferListener;
 import org.codehaus.plexus.PlexusContainer;
-import org.sonatype.aether.RepositorySystem;
-import org.sonatype.aether.RepositorySystemSession;
-import org.sonatype.aether.artifact.Artifact;
-import org.sonatype.aether.collection.CollectRequest;
-import org.sonatype.aether.connector.wagon.WagonProvider;
-import org.sonatype.aether.connector.wagon.WagonRepositoryConnectorFactory;
-import org.sonatype.aether.graph.Dependency;
-import org.sonatype.aether.graph.DependencyNode;
-import org.sonatype.aether.repository.LocalRepository;
-import org.sonatype.aether.repository.RemoteRepository;
-import org.sonatype.aether.spi.connector.RepositoryConnectorFactory;
-import org.sonatype.aether.util.artifact.DefaultArtifact;
-import org.sonatype.aether.util.graph.PreorderNodeListGenerator;
+import org.eclipse.aether.RepositorySystem;
+import org.eclipse.aether.RepositorySystemSession;
+import org.eclipse.aether.artifact.Artifact;
+import org.eclipse.aether.collection.CollectRequest;
+import org.eclipse.aether.connector.wagon.WagonProvider;
+import org.eclipse.aether.connector.wagon.WagonRepositoryConnectorFactory;
+import org.eclipse.aether.graph.Dependency;
+import org.eclipse.aether.graph.DependencyNode;
+import org.eclipse.aether.repository.LocalRepository;
+import org.eclipse.aether.repository.RemoteRepository;
+import org.eclipse.aether.spi.connector.RepositoryConnectorFactory;
+import org.eclipse.aether.util.artifact.DefaultArtifact;
+import org.eclipse.aether.util.graph.PreorderNodeListGenerator;
 
 public class MavenManager {
 	private final static Log log = LogFactory.getLog(MavenManager.class);
-- 
2.39.2